l10n: git.pot: v2.18.0 round 1 (108 new, 14 removed)

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

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

diff --git a/po/git.pot b/po/git.pot
index ab5d1796712b7317bf400cdd49608f13912044fe..2c5e3d07aca20dd5c4d6a537a0659b360eecc059 100644 (file)
--- a/po/git.pot
+++ b/po/git.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"

-"POT-Creation-Date: 2018-03-16 07:29+0800\n"
+"POT-Creation-Date: 2018-05-31 23:32+0800\n"

 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"


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

-#: advice.c:62
+#: advice.c:92

 #, c-format
 #, c-format

-msgid "hint: %.*s\n"
+msgid "%shint: %.*s%s\n"

 msgstr ""
 
 msgstr ""
 

-#: advice.c:90
+#: advice.c:137

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

-#: advice.c:92
+#: advice.c:139

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

-#: advice.c:94
+#: advice.c:141

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

-#: advice.c:96
+#: advice.c:143

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

-#: advice.c:98
+#: advice.c:145

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

-#: advice.c:100
+#: advice.c:147

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

-#: advice.c:108
+#: advice.c:155

 msgid ""
 "Fix them up in the work tree, and then use 'git add/rm <file>'\n"
 "as appropriate to mark resolution and make a commit."
 msgstr ""
 
 msgid ""
 "Fix them up in the work tree, and then use 'git add/rm <file>'\n"
 "as appropriate to mark resolution and make a commit."
 msgstr ""
 

-#: advice.c:116
+#: advice.c:163

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

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

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

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

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

-#: advice.c:124
+#: advice.c:171

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

-#: advice.c:130
+#: advice.c:177

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


@@ -315,7 +315,7 @@ msgstr ""
 msgid "cannot checkout %s"
 msgstr ""
 
 msgid "cannot checkout %s"
 msgstr ""
 

-#: apply.c:3396 apply.c:3407 apply.c:3453 setup.c:277
+#: apply.c:3396 apply.c:3407 apply.c:3453 setup.c:278

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


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

-#: apply.c:4545 builtin/fetch.c:775 builtin/fetch.c:1025
+#: apply.c:4545 builtin/fetch.c:786 builtin/fetch.c:1036

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


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

-#: apply.c:4894 builtin/add.c:539 builtin/mv.c:298 builtin/rm.c:390
+#: apply.c:4894 builtin/add.c:538 builtin/mv.c:300 builtin/rm.c:389

 msgid "Unable to write new index file"
 msgstr ""
 
 #: apply.c:4921 apply.c:4924 builtin/am.c:2254 builtin/am.c:2257
 msgid "Unable to write new index file"
 msgstr ""
 
 #: apply.c:4921 apply.c:4924 builtin/am.c:2254 builtin/am.c:2257

-#: builtin/clone.c:118 builtin/fetch.c:127 builtin/pull.c:193
-#: builtin/submodule--helper.c:403 builtin/submodule--helper.c:1197
-#: builtin/submodule--helper.c:1200 builtin/submodule--helper.c:1567
-#: builtin/submodule--helper.c:1570 builtin/submodule--helper.c:1787
+#: builtin/clone.c:120 builtin/fetch.c:126 builtin/pull.c:198
+#: builtin/submodule--helper.c:405 builtin/submodule--helper.c:1210
+#: builtin/submodule--helper.c:1213 builtin/submodule--helper.c:1584
+#: builtin/submodule--helper.c:1587 builtin/submodule--helper.c:1807

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


@@ -651,7 +651,7 @@ msgstr ""
 
 #: apply.c:4960 builtin/am.c:2242 builtin/interpret-trailers.c:95
 #: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99
 
 #: apply.c:4960 builtin/am.c:2242 builtin/interpret-trailers.c:95
 #: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99

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

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


@@ -679,9 +679,9 @@ msgstr ""
 msgid "allow overlapping hunks"
 msgstr ""
 
 msgid "allow overlapping hunks"
 msgstr ""
 

-#: apply.c:4977 builtin/add.c:292 builtin/check-ignore.c:21
-#: builtin/commit.c:1276 builtin/count-objects.c:96 builtin/fsck.c:665
-#: builtin/log.c:1901 builtin/mv.c:123 builtin/read-tree.c:125
+#: apply.c:4977 builtin/add.c:290 builtin/check-ignore.c:21
+#: builtin/commit.c:1301 builtin/count-objects.c:98 builtin/fsck.c:666
+#: builtin/log.c:1901 builtin/mv.c:122 builtin/read-tree.c:124

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


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

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

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


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

-#: archive.c:439 builtin/blame.c:702 builtin/blame.c:703 builtin/config.c:62
-#: builtin/fast-export.c:1005 builtin/fast-export.c:1007 builtin/grep.c:869
+#: archive.c:439 builtin/blame.c:813 builtin/blame.c:814 builtin/config.c:127
+#: builtin/fast-export.c:1007 builtin/fast-export.c:1009 builtin/grep.c:869

 #: builtin/hash-object.c:103 builtin/ls-files.c:551 builtin/ls-files.c:554
 #: builtin/hash-object.c:103 builtin/ls-files.c:551 builtin/ls-files.c:554

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

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


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

-#: archive.c:458 builtin/archive.c:90 builtin/clone.c:108 builtin/clone.c:111
-#: builtin/submodule--helper.c:1209 builtin/submodule--helper.c:1576
+#: archive.c:458 builtin/archive.c:90 builtin/clone.c:110 builtin/clone.c:113
+#: builtin/submodule--helper.c:1222 builtin/submodule--helper.c:1593

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


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

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

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

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

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

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

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

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

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

-#: bisect.c:751
+#: bisect.c:752

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

-#: bisect.c:756
+#: bisect.c:757

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

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

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


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

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

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


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

-#: bisect.c:810
+#: bisect.c:811

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

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

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

-#: bisect.c:869 builtin/notes.c:175 builtin/tag.c:235
+#: bisect.c:870 builtin/notes.c:175 builtin/tag.c:236

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

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

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

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

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

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

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

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

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

-#: bisect.c:996
+#: bisect.c:997

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


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

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

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

-#: blame.c:1758
+#: blame.c:1756

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

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

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

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

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

-#: blame.c:1798 bundle.c:160 ref-filter.c:1978 sequencer.c:1699
-#: sequencer.c:2901 builtin/commit.c:976 builtin/log.c:366 builtin/log.c:920
-#: builtin/log.c:1371 builtin/log.c:1702 builtin/log.c:1950 builtin/merge.c:370
-#: builtin/shortlog.c:191
+#: blame.c:1796 bundle.c:160 ref-filter.c:2075 sequencer.c:1860
+#: sequencer.c:3631 builtin/commit.c:981 builtin/log.c:366 builtin/log.c:920
+#: builtin/log.c:1371 builtin/log.c:1702 builtin/log.c:1950 builtin/merge.c:371
+#: builtin/shortlog.c:192

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

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

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

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

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

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

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

-#: branch.c:53
+#: branch.c:54

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


@@ -973,85 +973,85 @@ msgid ""
 "\"git branch --set-upstream-to=%s%s%s\"."
 msgstr ""
 
 "\"git branch --set-upstream-to=%s%s%s\"."
 msgstr ""
 

-#: branch.c:67
+#: branch.c:68

 #, c-format
 msgid "Not setting branch %s as its own upstream."
 msgstr ""
 
 #, c-format
 msgid "Not setting branch %s as its own upstream."
 msgstr ""
 

-#: branch.c:93
+#: branch.c:94

 #, c-format
 msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
 msgstr ""
 
 #, c-format
 msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
 msgstr ""
 

-#: branch.c:94
+#: branch.c:95

 #, c-format
 msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
 msgstr ""
 
 #, c-format
 msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
 msgstr ""
 

-#: branch.c:98
+#: branch.c:99

 #, c-format
 msgid "Branch '%s' set up to track local branch '%s' by rebasing."
 msgstr ""
 
 #, c-format
 msgid "Branch '%s' set up to track local branch '%s' by rebasing."
 msgstr ""
 

-#: branch.c:99
+#: branch.c:100

 #, c-format
 msgid "Branch '%s' set up to track local branch '%s'."
 msgstr ""
 
 #, c-format
 msgid "Branch '%s' set up to track local branch '%s'."
 msgstr ""
 

-#: branch.c:104
+#: branch.c:105

 #, c-format
 msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
 msgstr ""
 
 #, c-format
 msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
 msgstr ""
 

-#: branch.c:105
+#: branch.c:106

 #, c-format
 msgid "Branch '%s' set up to track remote ref '%s'."
 msgstr ""
 
 #, c-format
 msgid "Branch '%s' set up to track remote ref '%s'."
 msgstr ""
 

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

 #, c-format
 msgid "Branch '%s' set up to track local ref '%s' by rebasing."
 msgstr ""
 
 #, c-format
 msgid "Branch '%s' set up to track local ref '%s' by rebasing."
 msgstr ""
 

-#: branch.c:110
+#: branch.c:111

 #, c-format
 msgid "Branch '%s' set up to track local ref '%s'."
 msgstr ""
 
 #, c-format
 msgid "Branch '%s' set up to track local ref '%s'."
 msgstr ""
 

-#: branch.c:119
+#: branch.c:120

 msgid "Unable to write upstream branch configuration"
 msgstr ""
 
 msgid "Unable to write upstream branch configuration"
 msgstr ""
 

-#: branch.c:156
+#: branch.c:157

 #, c-format
 msgid "Not tracking: ambiguous information for ref %s"
 msgstr ""
 
 #, c-format
 msgid "Not tracking: ambiguous information for ref %s"
 msgstr ""
 

-#: branch.c:189
+#: branch.c:190

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

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

 #, c-format
 msgid "A branch named '%s' already exists."
 msgstr ""
 
 #, c-format
 msgid "A branch named '%s' already exists."
 msgstr ""
 

-#: branch.c:213
+#: branch.c:214

 msgid "Cannot force update the current branch."
 msgstr ""
 
 msgid "Cannot force update the current branch."
 msgstr ""
 

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

 #, c-format
 msgid "Cannot setup tracking information; starting point '%s' is not a branch."
 msgstr ""
 
 #, c-format
 msgid "Cannot setup tracking information; starting point '%s' is not a branch."
 msgstr ""
 

-#: branch.c:235
+#: branch.c:236

 #, c-format
 msgid "the requested upstream branch '%s' does not exist"
 msgstr ""
 
 #, c-format
 msgid "the requested upstream branch '%s' does not exist"
 msgstr ""
 

-#: branch.c:237
+#: branch.c:238

 msgid ""
 "\n"
 "If you are planning on basing your work on an upstream\n"
 msgid ""
 "\n"
 "If you are planning on basing your work on an upstream\n"


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

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

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

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

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

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

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

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

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

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

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


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

-#: bundle.c:88 sequencer.c:1879 sequencer.c:2337 builtin/commit.c:750
+#: bundle.c:88 sequencer.c:2080 sequencer.c:2557 builtin/commit.c:755

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


@@ -1142,7 +1142,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:450 builtin/log.c:183 builtin/log.c:1607 builtin/shortlog.c:296
+#: bundle.c:450 builtin/log.c:183 builtin/log.c:1607 builtin/shortlog.c:303

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


@@ -1165,188 +1165,215 @@ msgstr ""
 msgid "invalid color value: %.*s"
 msgstr ""
 
 msgid "invalid color value: %.*s"
 msgstr ""
 

-#: commit.c:41 sequencer.c:2141 builtin/am.c:421 builtin/am.c:465
-#: builtin/am.c:1436 builtin/am.c:2072
+#: commit.c:43 sequencer.c:2363 builtin/am.c:421 builtin/am.c:465
+#: builtin/am.c:1436 builtin/am.c:2072 builtin/replace.c:376
+#: builtin/replace.c:448

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

-#: commit.c:43
+#: commit.c:45

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

-#: commit.c:1506
+#: commit.c:182
+msgid ""
+"Support for <GIT_DIR>/info/grafts is deprecated\n"
+"and will be removed in a future Git version.\n"
+"\n"
+"Please use \"git replace --convert-graft-file\"\n"
+"to convert the grafts into replace refs.\n"
+"\n"
+"Turn this message off by running\n"
+"\"git config advice.graftFileDeprecated false\""
+msgstr ""
+
+#: commit.c:1537

 msgid ""
 "Warning: commit message did not conform to UTF-8.\n"
 "You may want to amend it after fixing the message, or set the config\n"
 "variable i18n.commitencoding to the encoding your project uses.\n"
 msgstr ""
 
 msgid ""
 "Warning: commit message did not conform to UTF-8.\n"
 "You may want to amend it after fixing the message, or set the config\n"
 "variable i18n.commitencoding to the encoding your project uses.\n"
 msgstr ""
 

+#: commit-graph.c:669
+#, c-format
+msgid "the commit graph format cannot write %d commits"
+msgstr ""
+
+#: commit-graph.c:696
+msgid "too many commits to write graph"
+msgstr ""
+
+#: commit-graph.c:707 builtin/init-db.c:516 builtin/init-db.c:521
+#, c-format
+msgid "cannot mkdir %s"
+msgstr ""
+

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

-#: config.c:186
+#: config.c:187

 msgid "relative config include conditionals must come from files"
 msgstr ""
 
 msgid "relative config include conditionals must come from files"
 msgstr ""
 

-#: config.c:720
+#: config.c:788

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

-#: config.c:724
+#: config.c:792

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

-#: config.c:728
+#: config.c:796

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

-#: config.c:732
+#: config.c:800

 #, 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:736
+#: config.c:804

 #, 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:740
+#: config.c:808

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

-#: config.c:868
+#: config.c:936

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

-#: config.c:868
+#: config.c:936

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

-#: config.c:874
+#: config.c:942

 #, 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:879
+#: config.c:947

 #, 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:882
+#: config.c:950

 #, 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:885
+#: config.c:953

 #, 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:888
+#: config.c:956

 #, 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:891
+#: config.c:959

 #, 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:894
+#: config.c:962

 #, 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:989
+#: config.c:1057

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

-#: config.c:998
+#: config.c:1066

 #, c-format
 msgid "'%s' for '%s' is not a valid timestamp"
 msgstr ""
 
 #, c-format
 msgid "'%s' for '%s' is not a valid timestamp"
 msgstr ""
 

-#: config.c:1094 config.c:1105
+#: config.c:1171 config.c:1182

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 #, 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:2197
+#: config.c:2296

 #, 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:2256
+#: config.c:2402

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

-#: config.c:2599 config.c:2816
+#: config.c:2766 config.c:3019

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

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

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

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

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

-#: connect.c:52
+#: connect.c:60

 msgid "The remote end hung up upon initial contact"
 msgstr ""
 
 msgid "The remote end hung up upon initial contact"
 msgstr ""
 

-#: connect.c:54
+#: connect.c:62

 msgid ""
 "Could not read from remote repository.\n"
 "\n"
 msgid ""
 "Could not read from remote repository.\n"
 "\n"


@@ -1354,7 +1381,7 @@ msgid ""
 "and the repository exists."
 msgstr ""
 
 "and the repository exists."
 msgstr ""
 

-#: connected.c:66 builtin/fsck.c:198 builtin/prune.c:144
+#: connected.c:66 builtin/fsck.c:201 builtin/prune.c:145

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


@@ -1370,30 +1397,68 @@ msgstr ""
 msgid "failed to close rev-list's stdin"
 msgstr ""
 
 msgid "failed to close rev-list's stdin"
 msgstr ""
 

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

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

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

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

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

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

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

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

+#: convert.c:279
+#, c-format
+msgid "BOM is prohibited in '%s' if encoded as %s"
+msgstr ""
+
+#: convert.c:286
+#, c-format
+msgid ""
+"The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-"
+"tree-encoding."
+msgstr ""
+
+#: convert.c:304
+#, c-format
+msgid "BOM is required in '%s' if encoded as %s"
+msgstr ""
+
+#: convert.c:306
+#, c-format
+msgid ""
+"The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-"
+"%sLE (depending on the byte order) as working-tree-encoding."
+msgstr ""
+
+#: convert.c:424
+#, c-format
+msgid "failed to encode '%s' from %s to %s"
+msgstr ""
+
+#: convert.c:467
+#, c-format
+msgid "encoding '%s' from %s to %s and back is not the same"
+msgstr ""
+
+#: convert.c:1225
+msgid "true/false are no valid working-tree-encodings"
+msgstr ""
+

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


@@ -1504,68 +1569,68 @@ msgid ""
 "%s"
 msgstr ""
 
 "%s"
 msgstr ""
 

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

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

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

 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:4149
+#: diff.c:4156

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

-#: diff.c:4237
+#: diff.c:4244

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

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

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

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

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

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

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

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

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

-#: dir.c:2108
+#: dir.c:2109

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

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

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

-#: dir.c:3024 dir.c:3029
+#: dir.c:3075 dir.c:3080

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

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

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


@@ -1588,201 +1653,205 @@ msgstr ""
 msgid "Remote with no URL"
 msgstr ""
 
 msgid "Remote with no URL"
 msgstr ""
 

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

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

-#: fetch-pack.c:265
+#: fetch-pack.c:266

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

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

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

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

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

-#: fetch-pack.c:337
+#: fetch-pack.c:338

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

-#: fetch-pack.c:428
+#: fetch-pack.c:429 fetch-pack.c:1310

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

-#: fetch-pack.c:434
+#: fetch-pack.c:435 fetch-pack.c:1316

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

-#: fetch-pack.c:436
+#: fetch-pack.c:437 fetch-pack.c:1318

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

-#: fetch-pack.c:439
+#: fetch-pack.c:440 fetch-pack.c:1321

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

-#: fetch-pack.c:441
+#: fetch-pack.c:442 fetch-pack.c:1323

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

-#: fetch-pack.c:444
+#: fetch-pack.c:445 fetch-pack.c:1326

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-#: fetch-pack.c:911
+#: fetch-pack.c:960

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-#: fetch-pack.c:985
+#: fetch-pack.c:1034 fetch-pack.c:1204

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

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

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

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

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

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

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

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

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

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

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

-#: fetch-pack.c:1028
+#: fetch-pack.c:1077 fetch-pack.c:1414

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

-#: fetch-pack.c:1190
+#: fetch-pack.c:1199
+msgid "Server does not support shallow requests"
+msgstr ""
+
+#: fetch-pack.c:1584

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

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

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

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

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

-#: gpg-interface.c:181
+#: gpg-interface.c:185

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

-#: gpg-interface.c:211
+#: gpg-interface.c:210

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

-#: gpg-interface.c:214
+#: gpg-interface.c:213

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


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

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

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

-#: grep.c:2039 setup.c:163 builtin/clone.c:407 builtin/diff.c:81
+#: grep.c:2037 setup.c:164 builtin/clone.c:409 builtin/diff.c:81

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

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

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


@@ -1924,7 +1993,7 @@ msgstr ""
 msgid "name consists only of disallowed characters: %s"
 msgstr ""
 
 msgid "name consists only of disallowed characters: %s"
 msgstr ""
 

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

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


@@ -1954,261 +2023,378 @@ msgstr ""
 msgid "Unable to create '%s.lock': %s"
 msgstr ""
 
 msgid "Unable to create '%s.lock': %s"
 msgstr ""
 

-#: merge.c:74
+#: merge.c:71

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

-#: merge.c:134 builtin/am.c:1946 builtin/am.c:1980 builtin/checkout.c:378
-#: builtin/checkout.c:599 builtin/clone.c:759
+#: merge.c:136 builtin/am.c:1946 builtin/am.c:1980 builtin/checkout.c:378
+#: builtin/checkout.c:606 builtin/clone.c:761

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

-#: merge-recursive.c:235
+#: merge-recursive.c:298

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

-#: merge-recursive.c:257 merge-recursive.c:265
+#: merge-recursive.c:320
+#, c-format
+msgid "add_cacheinfo failed for path '%s'; merge aborting."
+msgstr ""
+
+#: merge-recursive.c:328

 #, c-format
 #, c-format

-msgid "addinfo_cache failed for path '%s'"
+msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."

 msgstr ""
 
 msgstr ""
 

-#: merge-recursive.c:329
+#: merge-recursive.c:410

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 #, 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:1029
+#: merge-recursive.c:1186
+#, c-format
+msgid "Failed to merge submodule %s (not checked out)"
+msgstr ""
+
+#: merge-recursive.c:1193
+#, c-format
+msgid "Failed to merge submodule %s (commits not present)"
+msgstr ""
+
+#: merge-recursive.c:1200
+#, c-format
+msgid "Failed to merge submodule %s (commits don't follow merge-base)"
+msgstr ""
+
+#: merge-recursive.c:1208 merge-recursive.c:1220
+#, c-format
+msgid "Fast-forwarding submodule %s to the following commit:"
+msgstr ""
+
+#: merge-recursive.c:1211 merge-recursive.c:1223
+#, c-format
+msgid "Fast-forwarding submodule %s to %s"
+msgstr ""
+
+#: merge-recursive.c:1245
+#, c-format
+msgid "Failed to merge submodule %s (merge following commits not found)"
+msgstr ""
+
+#: merge-recursive.c:1249
+#, c-format
+msgid "Failed to merge submodule %s (not fast-forward)"
+msgstr ""
+
+#: merge-recursive.c:1250
+msgid "Found a possible merge resolution for the submodule:\n"
+msgstr ""
+
+#: merge-recursive.c:1253
+#, c-format
+msgid ""
+"If this is correct simply add it to the index for example\n"
+"by using:\n"
+"\n"
+"  git update-index --cacheinfo 160000 %s \"%s\"\n"
+"\n"
+"which will accept this suggestion.\n"
+msgstr ""
+
+#: merge-recursive.c:1262
+#, c-format
+msgid "Failed to merge submodule %s (multiple merges found)"
+msgstr ""
+
+#: merge-recursive.c:1321

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

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

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

-#: merge-recursive.c:1146
+#: merge-recursive.c:1358
+#, c-format
+msgid "Auto-merging %s"
+msgstr ""
+
+#: merge-recursive.c:1423
+#, c-format
+msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
+msgstr ""
+
+#: merge-recursive.c:1475

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

 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
 "left in tree."
 msgstr ""
 
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
 "left in tree."
 msgstr ""
 

-#: merge-recursive.c:1158
+#: merge-recursive.c:1487

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

 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
 "left in tree at %s."
 msgstr ""
 
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
 "left in tree at %s."
 msgstr ""
 

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

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

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

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

-#: merge-recursive.c:1254
+#: merge-recursive.c:1580 merge-recursive.c:1736 merge-recursive.c:2368
+#: merge-recursive.c:3086
+#, c-format
+msgid "Refusing to lose dirty file at %s"
+msgstr ""
+
+#: merge-recursive.c:1594

 #, 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:1279
+#: merge-recursive.c:1599
+#, c-format
+msgid "Refusing to lose untracked file at %s; adding as %s instead"
+msgstr ""
+
+#: merge-recursive.c:1625

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

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

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

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

 #, 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:1582
+#: merge-recursive.c:1745
+#, c-format
+msgid "Refusing to lose untracked file at %s, even though it's in the way."
+msgstr ""
+
+#: merge-recursive.c:1951
+#, c-format
+msgid ""
+"CONFLICT (directory rename split): Unclear where to place %s because "
+"directory %s was renamed to multiple other directories, with no destination "
+"getting a majority of the files."
+msgstr ""
+
+#: merge-recursive.c:1983
+#, c-format
+msgid ""
+"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
+"implicit directory rename(s) putting the following path(s) there: %s."
+msgstr ""
+
+#: merge-recursive.c:1993
+#, c-format
+msgid ""
+"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
+"implicit directory renames tried to put these paths there: %s"
+msgstr ""
+
+#: merge-recursive.c:2085
+#, c-format
+msgid ""
+"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
+">%s in %s"
+msgstr ""
+
+#: merge-recursive.c:2330
+#, c-format
+msgid ""
+"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
+"renamed."
+msgstr ""
+
+#: merge-recursive.c:2736

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

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

-#: merge-recursive.c:1604 merge-recursive.c:1834
+#: merge-recursive.c:2758 merge-recursive.c:3089

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-#: merge-recursive.c:1800
-#, c-format
-msgid "Auto-merging %s"
-msgstr ""
-
-#: merge-recursive.c:1804 git-submodule.sh:879
+#: merge-recursive.c:3055 git-submodule.sh:895

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-#: merge-recursive.c:2228 builtin/merge.c:657 builtin/merge.c:816
+#: merge-recursive.c:3511 builtin/merge.c:658 builtin/merge.c:815

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


@@ -2248,30 +2434,30 @@ msgstr ""
 msgid "Bad %s value: '%s'"
 msgstr ""
 
 msgid "Bad %s value: '%s'"
 msgstr ""
 

-#: object.c:239
+#: object.c:242

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

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

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

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

 #, c-format
 msgid "offset before start of pack index for %s (corrupt index?)"
 msgstr ""
 
 #, c-format
 msgid "offset before start of pack index for %s (corrupt index?)"
 msgstr ""
 

-#: packfile.c:1698
+#: packfile.c:1746

 #, c-format
 msgid "offset beyond end of pack index for %s (truncated index?)"
 msgstr ""
 
 #, c-format
 msgid "offset beyond end of pack index for %s (truncated index?)"
 msgstr ""
 

-#: parse-options.c:619
+#: parse-options.c:621

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

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

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


@@ -2279,26 +2465,31 @@ msgstr ""
 #. TRANSLATORS: the colon here should align with the
 #. one in "usage: %s" translation.
 #.
 #. TRANSLATORS: the colon here should align with the
 #. one in "usage: %s" translation.
 #.

-#: parse-options.c:644
+#: parse-options.c:646

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

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

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

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

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

-#: parse-options-cb.c:108
+#: parse-options-cb.c:44
+#, c-format
+msgid "malformed expiration date '%s'"
+msgstr ""
+
+#: parse-options-cb.c:112

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

-#: path.c:891
+#: path.c:892

 #, c-format
 msgid "Could not make %s writable by group"
 msgstr ""
 #, c-format
 msgid "Could not make %s writable by group"
 msgstr ""


@@ -2378,66 +2569,67 @@ msgstr ""
 msgid "unable to parse --pretty format"
 msgstr ""
 
 msgid "unable to parse --pretty format"
 msgstr ""
 

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

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

 #, c-format
 msgid ""
 "GIT_INDEX_VERSION set, but the value is invalid.\n"
 "Using version %i"
 msgstr ""
 
 #, c-format
 msgid ""
 "GIT_INDEX_VERSION set, but the value is invalid.\n"
 "Using version %i"
 msgstr ""
 

-#: read-cache.c:2375 sequencer.c:3248 wrapper.c:658 builtin/merge.c:1049
+#: read-cache.c:2404 sequencer.c:4337 wrapper.c:658 builtin/merge.c:1047

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

-#: read-cache.c:2448 sequencer.c:1900 sequencer.c:2627
+#: read-cache.c:2477 sequencer.c:2101 sequencer.c:3233

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

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

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

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

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

-#: refs.c:706
+#: refs.c:732 sequencer.c:4333 sequencer.c:4392 wrapper.c:225 wrapper.c:395
+#: builtin/am.c:779

 #, c-format
 #, c-format

-msgid "Could not open '%s' for writing"
+msgid "could not open '%s' for writing"

 msgstr ""
 
 msgstr ""
 

-#: refs.c:1850
+#: refs.c:1880

 msgid "ref updates forbidden inside quarantine environment"
 msgstr ""
 
 msgid "ref updates forbidden inside quarantine environment"
 msgstr ""
 

-#: refs/files-backend.c:1189
+#: refs/files-backend.c:1191

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

-#: refs/files-backend.c:1203 refs/packed-backend.c:1528
-#: refs/packed-backend.c:1538
+#: refs/files-backend.c:1205 refs/packed-backend.c:1531
+#: refs/packed-backend.c:1541

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

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

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

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

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


@@ -2456,157 +2648,162 @@ msgstr ""
 msgid "ahead %d, behind %d"
 msgstr ""
 
 msgid "ahead %d, behind %d"
 msgstr ""
 

-#: ref-filter.c:107
+#: ref-filter.c:121

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

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

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

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

 #, c-format
 msgid "Integer value expected refname:lstrip=%s"
 msgstr ""
 
 #, c-format
 msgid "Integer value expected refname:lstrip=%s"
 msgstr ""
 

-#: ref-filter.c:133
+#: ref-filter.c:149

 #, c-format
 msgid "Integer value expected refname:rstrip=%s"
 msgstr ""
 
 #, c-format
 msgid "Integer value expected refname:rstrip=%s"
 msgstr ""
 

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

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

-#: ref-filter.c:184
+#: ref-filter.c:206

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

-#: ref-filter.c:191
+#: ref-filter.c:215

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

-#: ref-filter.c:209
+#: ref-filter.c:235

 #, c-format
 msgid "unknown %%(trailers) argument: %s"
 msgstr ""
 
 #, c-format
 msgid "unknown %%(trailers) argument: %s"
 msgstr ""
 

-#: ref-filter.c:232
+#: ref-filter.c:264

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

-#: ref-filter.c:234
+#: ref-filter.c:266

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

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

 #, c-format
 msgid "positive value expected objectname:short=%s"
 msgstr ""
 
 #, c-format
 msgid "positive value expected objectname:short=%s"
 msgstr ""
 

-#: ref-filter.c:251
+#: ref-filter.c:285

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

-#: ref-filter.c:278
+#: ref-filter.c:315

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

-#: ref-filter.c:290
+#: ref-filter.c:327

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

-#: ref-filter.c:294
+#: ref-filter.c:334

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

-#: ref-filter.c:300
+#: ref-filter.c:343

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

-#: ref-filter.c:304
+#: ref-filter.c:351

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

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

-#: ref-filter.c:409
+#: ref-filter.c:464

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

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

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

-#: ref-filter.c:547
+#: ref-filter.c:608

 #, c-format
 msgid "format: %%(if) atom used without a %%(then) atom"
 msgstr ""
 
 #, c-format
 msgid "format: %%(if) atom used without a %%(then) atom"
 msgstr ""
 

-#: ref-filter.c:607
+#: ref-filter.c:671

 #, c-format
 msgid "format: %%(then) atom used without an %%(if) atom"
 msgstr ""
 
 #, c-format
 msgid "format: %%(then) atom used without an %%(if) atom"
 msgstr ""
 

-#: ref-filter.c:609
+#: ref-filter.c:673

 #, c-format
 msgid "format: %%(then) atom used more than once"
 msgstr ""
 
 #, c-format
 msgid "format: %%(then) atom used more than once"
 msgstr ""
 

-#: ref-filter.c:611
+#: ref-filter.c:675

 #, c-format
 msgid "format: %%(then) atom used after %%(else)"
 msgstr ""
 
 #, c-format
 msgid "format: %%(then) atom used after %%(else)"
 msgstr ""
 

-#: ref-filter.c:637
+#: ref-filter.c:703

 #, c-format
 msgid "format: %%(else) atom used without an %%(if) atom"
 msgstr ""
 
 #, c-format
 msgid "format: %%(else) atom used without an %%(if) atom"
 msgstr ""
 

-#: ref-filter.c:639
+#: ref-filter.c:705

 #, c-format
 msgid "format: %%(else) atom used without a %%(then) atom"
 msgstr ""
 
 #, c-format
 msgid "format: %%(else) atom used without a %%(then) atom"
 msgstr ""
 

-#: ref-filter.c:641
+#: ref-filter.c:707

 #, c-format
 msgid "format: %%(else) atom used more than once"
 msgstr ""
 
 #, c-format
 msgid "format: %%(else) atom used more than once"
 msgstr ""
 

-#: ref-filter.c:654
+#: ref-filter.c:722

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

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

-#: ref-filter.c:1313
+#: ref-filter.c:1387

 #, c-format
 msgid "(no branch, rebasing %s)"
 msgstr ""
 
 #, c-format
 msgid "(no branch, rebasing %s)"
 msgstr ""
 

-#: ref-filter.c:1316
+#: ref-filter.c:1390
+#, c-format
+msgid "(no branch, rebasing detached HEAD %s)"
+msgstr ""
+
+#: ref-filter.c:1393

 #, c-format
 msgid "(no branch, bisect started on %s)"
 msgstr ""
 #, c-format
 msgid "(no branch, bisect started on %s)"
 msgstr ""


@@ -2614,7 +2811,7 @@ msgstr ""
 #. TRANSLATORS: make sure this matches "HEAD
 #. detached at " in wt-status.c
 #.
 #. TRANSLATORS: make sure this matches "HEAD
 #. detached at " in wt-status.c
 #.

-#: ref-filter.c:1324
+#: ref-filter.c:1401

 #, c-format
 msgid "(HEAD detached at %s)"
 msgstr ""
 #, c-format
 msgid "(HEAD detached at %s)"
 msgstr ""


@@ -2622,147 +2819,147 @@ msgstr ""
 #. TRANSLATORS: make sure this matches "HEAD
 #. detached from " in wt-status.c
 #.
 #. TRANSLATORS: make sure this matches "HEAD
 #. detached from " in wt-status.c
 #.

-#: ref-filter.c:1331
+#: ref-filter.c:1408

 #, c-format
 msgid "(HEAD detached from %s)"
 msgstr ""
 
 #, c-format
 msgid "(HEAD detached from %s)"
 msgstr ""
 

-#: ref-filter.c:1335
+#: ref-filter.c:1412

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

-#: ref-filter.c:1364
+#: ref-filter.c:1442

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

-#: ref-filter.c:1367
+#: ref-filter.c:1445

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

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

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

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

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

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

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

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

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

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

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

 #, 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:799
+#: remote.c:609

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

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

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

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

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

-#: remote.c:1726 remote.c:1828
+#: remote.c:1534 remote.c:1635

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 #, 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:2143
+#: remote.c:1950

 #, c-format
 msgid "Your branch and '%s' refer to different commits.\n"
 msgstr ""
 
 #, c-format
 msgid "Your branch and '%s' refer to different commits.\n"
 msgstr ""
 

-#: remote.c:2146
+#: remote.c:1953

 #, c-format
 msgid "  (use \"%s\" for details)\n"
 msgstr ""
 
 #, c-format
 msgid "  (use \"%s\" for details)\n"
 msgstr ""
 

-#: remote.c:2150
+#: remote.c:1957

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

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

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

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


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

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

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

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

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


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

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

 msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
 msgstr ""
 
 msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
 msgstr ""
 

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

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

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

 #, c-format
 msgid "your current branch '%s' does not have any commits yet"
 msgstr ""
 
 #, c-format
 msgid "your current branch '%s' does not have any commits yet"
 msgstr ""
 

-#: revision.c:2477
+#: revision.c:2489

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

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

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

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

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


@@ -2849,78 +3046,85 @@ msgstr ""
 msgid "the receiving end does not support push options"
 msgstr ""
 
 msgid "the receiving end does not support push options"
 msgstr ""
 

-#: sequencer.c:158
+#: sequencer.c:174

 #, c-format
 msgid "invalid commit message cleanup mode '%s'"
 msgstr ""
 
 #, c-format
 msgid "invalid commit message cleanup mode '%s'"
 msgstr ""
 

-#: sequencer.c:267
+#: sequencer.c:274
+#, c-format
+msgid "could not delete '%s'"
+msgstr ""
+
+#: sequencer.c:300

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

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

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

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

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

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

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

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

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

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

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

-#: sequencer.c:349 sequencer.c:2124 sequencer.c:2250 sequencer.c:2264
-#: sequencer.c:3246 sequencer.c:3310 wrapper.c:656
+#: sequencer.c:381 sequencer.c:2345 sequencer.c:2471 sequencer.c:2485
+#: sequencer.c:2693 sequencer.c:4335 sequencer.c:4398 wrapper.c:656

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

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

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

-#: sequencer.c:356 sequencer.c:2128 sequencer.c:2252
+#: sequencer.c:391 sequencer.c:2350 sequencer.c:2473 sequencer.c:2487
+#: sequencer.c:2701

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

-#: sequencer.c:379 sequencer.c:1340 sequencer.c:2148 builtin/am.c:259
-#: builtin/commit.c:722 builtin/merge.c:1047
+#: sequencer.c:414 sequencer.c:803 sequencer.c:1492 sequencer.c:2370
+#: sequencer.c:2683 sequencer.c:2787 builtin/am.c:259 builtin/commit.c:727
+#: builtin/merge.c:1045

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

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

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

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

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

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


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

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

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

-#: sequencer.c:542
-msgid "could not resolve HEAD commit"
+#: sequencer.c:578
+msgid "unable to update cache tree"

 msgstr ""
 
 msgstr ""
 

-#: sequencer.c:562
-msgid "unable to update cache tree"
+#: sequencer.c:591
+msgid "could not resolve HEAD commit"

 msgstr ""
 
 msgstr ""
 

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

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


@@ -2958,11 +3162,15 @@ msgid ""
 "  git rebase --continue\n"
 msgstr ""
 
 "  git rebase --continue\n"
 msgstr ""
 

-#: sequencer.c:915
+#: sequencer.c:817
+msgid "writing root commit"
+msgstr ""
+
+#: sequencer.c:1042

 msgid "'prepare-commit-msg' hook failed"
 msgstr ""
 
 msgid "'prepare-commit-msg' hook failed"
 msgstr ""
 

-#: sequencer.c:922
+#: sequencer.c:1049

 msgid ""
 "Your name and email address were configured automatically based\n"
 "on your username and hostname. Please check that they are accurate.\n"
 msgid ""
 "Your name and email address were configured automatically based\n"
 "on your username and hostname. Please check that they are accurate.\n"


@@ -2977,7 +3185,7 @@ msgid ""
 "    git commit --amend --reset-author\n"
 msgstr ""
 
 "    git commit --amend --reset-author\n"
 msgstr ""
 

-#: sequencer.c:935
+#: sequencer.c:1062

 msgid ""
 "Your name and email address were configured automatically based\n"
 "on your username and hostname. Please check that they are accurate.\n"
 msgid ""
 "Your name and email address were configured automatically based\n"
 "on your username and hostname. Please check that they are accurate.\n"


@@ -2991,321 +3199,313 @@ msgid ""
 "    git commit --amend --reset-author\n"
 msgstr ""
 
 "    git commit --amend --reset-author\n"
 msgstr ""
 

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

 msgid "couldn't look up newly created commit"
 msgstr ""
 
 msgid "couldn't look up newly created commit"
 msgstr ""
 

-#: sequencer.c:977
+#: sequencer.c:1104

 msgid "could not parse newly created commit"
 msgstr ""
 
 msgid "could not parse newly created commit"
 msgstr ""
 

-#: sequencer.c:1023
+#: sequencer.c:1150

 msgid "unable to resolve HEAD after creating commit"
 msgstr ""
 
 msgid "unable to resolve HEAD after creating commit"
 msgstr ""
 

-#: sequencer.c:1025
+#: sequencer.c:1152

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

-#: sequencer.c:1029
+#: sequencer.c:1156

 msgid " (root-commit)"
 msgstr ""
 
 msgid " (root-commit)"
 msgstr ""
 

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

 msgid "could not parse HEAD"
 msgstr ""
 
 msgid "could not parse HEAD"
 msgstr ""
 

-#: sequencer.c:1052
+#: sequencer.c:1179

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

-#: sequencer.c:1056 builtin/commit.c:1491
+#: sequencer.c:1183 builtin/commit.c:1528

 msgid "could not parse HEAD commit"
 msgstr ""
 
 msgid "could not parse HEAD commit"
 msgstr ""
 

-#: sequencer.c:1107 sequencer.c:1673
+#: sequencer.c:1234 sequencer.c:1831

 msgid "unable to parse commit author"
 msgstr ""
 
 msgid "unable to parse commit author"
 msgstr ""
 

-#: sequencer.c:1117 builtin/am.c:1630 builtin/merge.c:643
+#: sequencer.c:1244 builtin/am.c:1630 builtin/merge.c:644

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

-#: sequencer.c:1134 sequencer.c:1186
+#: sequencer.c:1261 sequencer.c:1316

 #, c-format
 msgid "unable to read commit message from '%s'"
 msgstr ""
 
 #, c-format
 msgid "unable to read commit message from '%s'"
 msgstr ""
 

-#: sequencer.c:1154 builtin/am.c:1650 builtin/commit.c:1594 builtin/merge.c:826
-#: builtin/merge.c:851
+#: sequencer.c:1283 builtin/am.c:1650 builtin/commit.c:1631 builtin/merge.c:824
+#: builtin/merge.c:849

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

-#: sequencer.c:1213
+#: sequencer.c:1343

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

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

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

-#: sequencer.c:1347
-#, c-format
-msgid ""
-"unexpected 1st line of squash message:\n"
-"\n"
-"\t%.*s"
-msgstr ""
-
-#: sequencer.c:1353
-#, c-format
-msgid ""
-"invalid 1st line of squash message:\n"
-"\n"
-"\t%.*s"
-msgstr ""
-
-#: sequencer.c:1359 sequencer.c:1384
+#: sequencer.c:1499 sequencer.c:1524

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

-#: sequencer.c:1368 sequencer.c:3265
+#: sequencer.c:1509 sequencer.c:4354

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

-#: sequencer.c:1370
+#: sequencer.c:1511 sequencer.c:2728

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

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

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

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

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

-#: sequencer.c:1387 git-rebase--interactive.sh:452
+#: sequencer.c:1526 git-rebase--interactive.sh:457

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

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

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

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

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

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

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

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

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

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

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

-#: sequencer.c:1498
+#: sequencer.c:1637
+msgid "cannot fixup root commit"
+msgstr ""
+
+#: sequencer.c:1656

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

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

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

 #, 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:1516
+#: sequencer.c:1674

 #, c-format
 msgid "cannot get commit message for %s"
 msgstr ""
 
 #. TRANSLATORS: The first %s will be a "todo" command like
 #. "revert" or "pick", the second %s a SHA1.
 #, c-format
 msgid "cannot get commit message for %s"
 msgstr ""
 
 #. TRANSLATORS: The first %s will be a "todo" command like
 #. "revert" or "pick", the second %s a SHA1.

-#: sequencer.c:1535
+#: sequencer.c:1693

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

-#: sequencer.c:1600 sequencer.c:2397
+#: sequencer.c:1758

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-#: sequencer.c:1883 sequencer.c:3056 sequencer.c:3091
+#: sequencer.c:2084 sequencer.c:4137 sequencer.c:4172

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-#: sequencer.c:2062
+#: sequencer.c:2268
+msgid "unusable squash-onto"
+msgstr ""
+
+#: sequencer.c:2284

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

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

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

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

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

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

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

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

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

-#: sequencer.c:2173 sequencer.c:2761
+#: sequencer.c:2395 sequencer.c:3402

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

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

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

-#: sequencer.c:2177 sequencer.c:2212
+#: sequencer.c:2399 sequencer.c:2434

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

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

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

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

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

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

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

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

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

 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
 msgstr ""
 
 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
 msgstr ""
 

-#: sequencer.c:2324 sequencer.c:2679
+#: sequencer.c:2544 sequencer.c:3320

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

-#: sequencer.c:2362 sequencer.c:2659
+#: sequencer.c:2582 sequencer.c:3300

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

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

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

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

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

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

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


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

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

 msgid "and made changes to the index and/or the working tree\n"
 msgstr ""
 
 msgid "and made changes to the index and/or the working tree\n"
 msgstr ""
 

-#: sequencer.c:2438
+#: sequencer.c:2657

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


@@ -3330,17 +3530,62 @@ msgid ""
 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-#: sequencer.c:2497
+#: sequencer.c:2770
+msgid "writing fake root commit"
+msgstr ""
+
+#: sequencer.c:2775
+msgid "writing squash-onto"
+msgstr ""
+
+#: sequencer.c:2810
+#, c-format
+msgid "failed to find tree of %s"
+msgstr ""
+
+#: sequencer.c:2828
+msgid "could not write index"
+msgstr ""
+
+#: sequencer.c:2860
+msgid "cannot merge without a current revision"
+msgstr ""
+
+#: sequencer.c:2883
+#, c-format
+msgid "could not resolve '%s'"
+msgstr ""
+
+#: sequencer.c:2905
+#, c-format
+msgid "could not get commit message of '%s'"
+msgstr ""
+
+#: sequencer.c:2915 sequencer.c:2940
+#, c-format
+msgid "could not write '%s'"
+msgstr ""
+
+#: sequencer.c:3004
+#, c-format
+msgid "could not even attempt to merge '%.*s'"
+msgstr ""
+
+#: sequencer.c:3020
+msgid "merge: Unable to write new index file"
+msgstr ""
+
+#: sequencer.c:3087

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

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

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

-#: sequencer.c:2512 git-rebase.sh:178
+#: sequencer.c:3102 git-rebase.sh:188

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


@@ -3348,103 +3593,121 @@ msgid ""
 "You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
 msgstr ""
 
 "You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
 msgstr ""
 

-#: sequencer.c:2595
+#: sequencer.c:3133
+#, c-format
+msgid ""
+"Could not execute the todo command\n"
+"\n"
+"    %.*s\n"
+"It has been rescheduled; To edit the command before continuing, please\n"
+"edit the todo list first:\n"
+"\n"
+"    git rebase --edit-todo\n"
+"    git rebase --continue\n"
+msgstr ""
+
+#: sequencer.c:3201

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

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

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

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

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

-#: sequencer.c:2672 sequencer.c:3262
+#: sequencer.c:3313 sequencer.c:4351

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

-#: sequencer.c:2686
+#: sequencer.c:3327

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

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

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

-#: sequencer.c:2775
-msgid "could not remove CHERRY_PICK_HEAD"
-msgstr ""
-
-#: sequencer.c:2784
+#: sequencer.c:3422

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

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

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

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

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

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

 msgid ""
 "\n"
 "You have uncommitted changes in your working tree. Please, commit them\n"
 "first and then run 'git rebase --continue' again."
 msgstr ""
 
 msgid ""
 "\n"
 "You have uncommitted changes in your working tree. Please, commit them\n"
 "first and then run 'git rebase --continue' again."
 msgstr ""
 

-#: sequencer.c:2801
+#: sequencer.c:3454 sequencer.c:3492
+#, c-format
+msgid "could not write file: '%s'"
+msgstr ""
+
+#: sequencer.c:3507
+msgid "could not remove CHERRY_PICK_HEAD"
+msgstr ""
+
+#: sequencer.c:3514

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

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

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

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

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

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

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

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

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

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

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

-#: sequencer.c:3060 sequencer.c:3095
+#: sequencer.c:4141 sequencer.c:4176

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

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

 #, c-format
 msgid ""
 "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
 msgstr ""
 
 #, c-format
 msgid ""
 "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
 msgstr ""
 

-#: sequencer.c:3212
+#: sequencer.c:4301

 #, c-format
 msgid ""
 "Warning: some commits may have been dropped accidentally.\n"
 "Dropped commits (newer to older):\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "Warning: some commits may have been dropped accidentally.\n"
 "Dropped commits (newer to older):\n"
 msgstr ""
 

-#: sequencer.c:3219
+#: sequencer.c:4308

 #, c-format
 msgid ""
 "To avoid this message, use \"drop\" to explicitly remove a commit.\n"
 #, c-format
 msgid ""
 "To avoid this message, use \"drop\" to explicitly remove a commit.\n"


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

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

 #, c-format
 msgid ""
 "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
 #, c-format
 msgid ""
 "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"


@@ -3463,34 +3726,28 @@ msgid ""
 "Or you can abort the rebase with 'git rebase --abort'.\n"
 msgstr ""
 
 "Or you can abort the rebase with 'git rebase --abort'.\n"
 msgstr ""
 

-#: sequencer.c:3244 sequencer.c:3304 wrapper.c:225 wrapper.c:395
-#: builtin/am.c:779
-#, c-format
-msgid "could not open '%s' for writing"
-msgstr ""
-
-#: sequencer.c:3285
+#: sequencer.c:4374

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

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

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

-#: setup.c:122
+#: setup.c:123

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

-#: setup.c:171
+#: setup.c:172

 #, c-format
 msgid ""
 "%s: no such path in the working tree.\n"
 "Use 'git <command> -- <path>...' to specify paths that do not exist locally."
 msgstr ""
 
 #, c-format
 msgid ""
 "%s: no such path in the working tree.\n"
 "Use 'git <command> -- <path>...' to specify paths that do not exist locally."
 msgstr ""
 

-#: setup.c:184
+#: setup.c:185

 #, c-format
 msgid ""
 "ambiguous argument '%s': unknown revision or path not in the working tree.\n"
 #, c-format
 msgid ""
 "ambiguous argument '%s': unknown revision or path not in the working tree.\n"


@@ -3498,12 +3755,12 @@ msgid ""
 "'git <command> [<revision>...] -- [<file>...]'"
 msgstr ""
 
 "'git <command> [<revision>...] -- [<file>...]'"
 msgstr ""
 

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

 #, c-format
 msgid "option '%s' must come before non-option arguments"
 msgstr ""
 
 #, c-format
 msgid "option '%s' must come before non-option arguments"
 msgstr ""
 

-#: setup.c:252
+#: setup.c:253

 #, c-format
 msgid ""
 "ambiguous argument '%s': both revision and filename\n"
 #, c-format
 msgid ""
 "ambiguous argument '%s': both revision and filename\n"


@@ -3511,152 +3768,152 @@ msgid ""
 "'git <command> [<revision>...] -- [<file>...]'"
 msgstr ""
 
 "'git <command> [<revision>...] -- [<file>...]'"
 msgstr ""
 

-#: setup.c:388
+#: setup.c:389

 msgid "unable to set up work tree using invalid config"
 msgstr ""
 
 msgid "unable to set up work tree using invalid config"
 msgstr ""
 

-#: setup.c:395
+#: setup.c:393

 msgid "this operation must be run in a work tree"
 msgstr ""
 
 msgid "this operation must be run in a work tree"
 msgstr ""
 

-#: setup.c:506
+#: setup.c:503

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

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

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

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

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

-#: setup.c:535
+#: setup.c:532

 #, c-format
 msgid "too large to be a .git file: '%s'"
 msgstr ""
 
 #, c-format
 msgid "too large to be a .git file: '%s'"
 msgstr ""
 

-#: setup.c:537
+#: setup.c:534

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

-#: setup.c:539
+#: setup.c:536

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

-#: setup.c:541
+#: setup.c:538

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

-#: setup.c:543
+#: setup.c:540

 #, c-format
 msgid "not a git repository: %s"
 msgstr ""
 
 #, c-format
 msgid "not a git repository: %s"
 msgstr ""
 

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

 #, c-format
 msgid "'$%s' too big"
 msgstr ""
 
 #, c-format
 msgid "'$%s' too big"
 msgstr ""
 

-#: setup.c:656
+#: setup.c:653

 #, c-format
 msgid "not a git repository: '%s'"
 msgstr ""
 
 #, c-format
 msgid "not a git repository: '%s'"
 msgstr ""
 

-#: setup.c:685 setup.c:687 setup.c:718
+#: setup.c:682 setup.c:684 setup.c:715

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

-#: setup.c:690 setup.c:746 setup.c:756 setup.c:795 setup.c:803 setup.c:818
+#: setup.c:687 setup.c:743 setup.c:753 setup.c:792 setup.c:800 setup.c:815

 msgid "cannot come back to cwd"
 msgstr ""
 
 msgid "cannot come back to cwd"
 msgstr ""
 

-#: setup.c:816
+#: setup.c:813

 #, 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:827
+#: setup.c:824

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

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

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

-#: setup.c:1069 setup.c:1075
+#: setup.c:1066 setup.c:1072

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

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

 #, 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:1172
+#: setup.c:1168

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

-#: setup.c:1215
+#: setup.c:1211

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

-#: setup.c:1230
+#: setup.c:1226

 msgid "fork failed"
 msgstr ""
 
 msgid "fork failed"
 msgstr ""
 

-#: setup.c:1235
+#: setup.c:1231

 msgid "setsid failed"
 msgstr ""
 
 msgid "setsid failed"
 msgstr ""
 

-#: sha1_file.c:592
+#: sha1-file.c:625

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

-#: sha1_file.c:618
+#: sha1-file.c:651

 #, 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:624
+#: sha1-file.c:657

 #, 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:630
+#: sha1-file.c:663

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

-#: sha1_file.c:638
+#: sha1-file.c:671

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

-#: sha1_name.c:422
+#: sha1-name.c:442

 #, c-format
 msgid "short SHA1 %s is ambiguous"
 msgstr ""
 
 #, c-format
 msgid "short SHA1 %s is ambiguous"
 msgstr ""
 

-#: sha1_name.c:433
+#: sha1-name.c:453

 msgid "The candidates are:"
 msgstr ""
 
 msgid "The candidates are:"
 msgstr ""
 

-#: sha1_name.c:693
+#: sha1-name.c:695

 msgid ""
 "Git normally never creates a ref that ends with 40 hex characters\n"
 "because it will be ignored when you just specify 40-hex. These refs\n"
 msgid ""
 "Git normally never creates a ref that ends with 40 hex characters\n"
 "because it will be ignored when you just specify 40-hex. These refs\n"


@@ -3669,86 +3926,86 @@ msgid ""
 "running \"git config advice.objectNameWarning false\""
 msgstr ""
 
 "running \"git config advice.objectNameWarning false\""
 msgstr ""
 

-#: submodule.c:96 submodule.c:130
+#: submodule.c:97 submodule.c:131

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

-#: submodule.c:100 submodule.c:134
+#: submodule.c:101 submodule.c:135

 #, 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:108
+#: submodule.c:109

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

-#: submodule.c:141
+#: submodule.c:142

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

-#: submodule.c:152
+#: submodule.c:153

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

-#: submodule.c:312
+#: submodule.c:315

 #, c-format
 msgid "in unpopulated submodule '%s'"
 msgstr ""
 
 #, c-format
 msgid "in unpopulated submodule '%s'"
 msgstr ""
 

-#: submodule.c:343
+#: submodule.c:346

 #, c-format
 msgid "Pathspec '%s' is in submodule '%.*s'"
 msgstr ""
 
 #, c-format
 msgid "Pathspec '%s' is in submodule '%.*s'"
 msgstr ""
 

-#: submodule.c:833
+#: submodule.c:837

 #, c-format
 msgid "submodule entry '%s' (%s) is a %s, not a commit"
 msgstr ""
 
 #, c-format
 msgid "submodule entry '%s' (%s) is a %s, not a commit"
 msgstr ""
 

-#: submodule.c:1065 builtin/branch.c:648 builtin/submodule--helper.c:1724
+#: submodule.c:1069 builtin/branch.c:651 builtin/submodule--helper.c:1743

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

-#: submodule.c:1370
+#: submodule.c:1373

 #, c-format
 msgid "'%s' not recognized as a git repository"
 msgstr ""
 
 #, c-format
 msgid "'%s' not recognized as a git repository"
 msgstr ""
 

-#: submodule.c:1508
+#: submodule.c:1511

 #, c-format
 msgid "could not start 'git status' in submodule '%s'"
 msgstr ""
 
 #, c-format
 msgid "could not start 'git status' in submodule '%s'"
 msgstr ""
 

-#: submodule.c:1521
+#: submodule.c:1524

 #, c-format
 msgid "could not run 'git status' in submodule '%s'"
 msgstr ""
 
 #, c-format
 msgid "could not run 'git status' in submodule '%s'"
 msgstr ""
 

-#: submodule.c:1614
+#: submodule.c:1617

 #, c-format
 msgid "submodule '%s' has dirty index"
 msgstr ""
 
 #, c-format
 msgid "submodule '%s' has dirty index"
 msgstr ""
 

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

 #, c-format
 msgid ""
 "relocate_gitdir for submodule '%s' with more than one worktree not supported"
 msgstr ""
 
 #, c-format
 msgid ""
 "relocate_gitdir for submodule '%s' with more than one worktree not supported"
 msgstr ""
 

-#: submodule.c:1890 submodule.c:1946
+#: submodule.c:1728 submodule.c:1784

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

-#: submodule.c:1894 builtin/submodule--helper.c:1246
-#: builtin/submodule--helper.c:1256
+#: submodule.c:1732 builtin/submodule--helper.c:1261
+#: builtin/submodule--helper.c:1271

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

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

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


@@ -3756,29 +4013,30 @@ msgid ""
 "'%s'\n"
 msgstr ""
 
 "'%s'\n"
 msgstr ""
 

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

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

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

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

-#: submodule.c:2045
-msgid "BUG: returned path string doesn't match cwd?"
+#: submodule.c:1902
+#, c-format
+msgid "ls-tree returned unexpected return code %d"

 msgstr ""
 
 msgstr ""
 

-#: submodule.c:2064
+#: submodule-config.c:230

 #, c-format
 #, c-format

-msgid "ls-tree returned unexpected return code %d"
+msgid "ignoring suspicious submodule name: %s"

 msgstr ""
 
 msgstr ""
 

-#: submodule-config.c:263
+#: submodule-config.c:294

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

-#: submodule-config.c:436
+#: submodule-config.c:467

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


@@ -3794,7 +4052,7 @@ msgstr ""
 msgid "unknown value '%s' for key '%s'"
 msgstr ""
 
 msgid "unknown value '%s' for key '%s'"
 msgstr ""
 

-#: trailer.c:539 trailer.c:544 builtin/remote.c:290
+#: trailer.c:539 trailer.c:544 builtin/remote.c:293

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


@@ -3837,24 +4095,28 @@ msgstr ""
 msgid "could not rename temporary file to %s"
 msgstr ""
 
 msgid "could not rename temporary file to %s"
 msgstr ""
 

-#: transport.c:63
+#: transport.c:116

 #, c-format
 msgid "Would set upstream of '%s' to '%s' of '%s'\n"
 msgstr ""
 
 #, c-format
 msgid "Would set upstream of '%s' to '%s' of '%s'\n"
 msgstr ""
 

-#: transport.c:152
+#: transport.c:208

 #, c-format
 msgid "transport: invalid depth option '%s'"
 msgstr ""
 
 #, c-format
 msgid "transport: invalid depth option '%s'"
 msgstr ""
 

-#: transport.c:916
+#: transport.c:584
+msgid "could not parse transport.color.* config"
+msgstr ""
+
+#: transport.c:996

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

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


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

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

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

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

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


@@ -3891,102 +4153,102 @@ msgstr ""
 msgid "empty filename in tree entry"
 msgstr ""
 
 msgid "empty filename in tree entry"
 msgstr ""
 

-#: tree-walk.c:114
+#: tree-walk.c:113

 msgid "too-short tree file"
 msgstr ""
 
 msgid "too-short tree file"
 msgstr ""
 

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

 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
 "%%sPlease commit your changes or stash them before you switch branches."
 msgstr ""
 
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
 "%%sPlease commit your changes or stash them before you switch branches."
 msgstr ""
 

-#: unpack-trees.c:110
+#: unpack-trees.c:113

 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
 "%%s"
 msgstr ""
 
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
 "%%s"
 msgstr ""
 

-#: unpack-trees.c:113
+#: unpack-trees.c:116

 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
 "%%sPlease commit your changes or stash them before you merge."
 msgstr ""
 
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
 "%%sPlease commit your changes or stash them before you merge."
 msgstr ""
 

-#: unpack-trees.c:115
+#: unpack-trees.c:118

 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
 "%%s"
 msgstr ""
 
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
 "%%s"
 msgstr ""
 

-#: unpack-trees.c:118
+#: unpack-trees.c:121

 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
 "%%sPlease commit your changes or stash them before you %s."
 msgstr ""
 
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
 "%%sPlease commit your changes or stash them before you %s."
 msgstr ""
 

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

 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
 "%%s"
 msgstr ""
 
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
 "%%s"
 msgstr ""
 

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

 #, c-format
 msgid ""
 "Updating the following directories would lose untracked files in them:\n"
 "%s"
 msgstr ""
 
 #, c-format
 msgid ""
 "Updating the following directories would lose untracked files in them:\n"
 "%s"
 msgstr ""
 

-#: unpack-trees.c:129
+#: unpack-trees.c:132

 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
 "%%sPlease move or remove them before you switch branches."
 msgstr ""
 
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
 "%%sPlease move or remove them before you switch branches."
 msgstr ""
 

-#: unpack-trees.c:131
+#: unpack-trees.c:134

 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
 "%%s"
 msgstr ""
 
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
 "%%s"
 msgstr ""
 

-#: unpack-trees.c:134
+#: unpack-trees.c:137

 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
 "%%sPlease move or remove them before you merge."
 msgstr ""
 
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
 "%%sPlease move or remove them before you merge."
 msgstr ""
 

-#: unpack-trees.c:136
+#: unpack-trees.c:139

 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
 "%%s"
 msgstr ""
 
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
 "%%s"
 msgstr ""
 

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

 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
 "%%sPlease move or remove them before you %s."
 msgstr ""
 
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
 "%%sPlease move or remove them before you %s."
 msgstr ""
 

-#: unpack-trees.c:141
+#: unpack-trees.c:144

 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
 "%%s"
 msgstr ""
 
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
 "%%s"
 msgstr ""
 

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

 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "


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

 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "


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

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

 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
 "%%sPlease move or remove them before you merge."
 msgstr ""
 
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
 "%%sPlease move or remove them before you merge."
 msgstr ""
 

-#: unpack-trees.c:153
+#: unpack-trees.c:157

 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
 "%%s"
 msgstr ""
 
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
 "%%s"
 msgstr ""
 

-#: unpack-trees.c:156
+#: unpack-trees.c:160

 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
 "%%sPlease move or remove them before you %s."
 msgstr ""
 
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
 "%%sPlease move or remove them before you %s."
 msgstr ""
 

-#: unpack-trees.c:158
+#: unpack-trees.c:162

 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
 "%%s"
 msgstr ""
 
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
 "%%s"
 msgstr ""
 

-#: unpack-trees.c:165
+#: unpack-trees.c:170

 #, c-format
 msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
 msgstr ""
 
 #, c-format
 msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
 msgstr ""
 

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

 #, c-format
 msgid ""
 "Cannot update sparse checkout: the following entries are not up to date:\n"
 "%s"
 msgstr ""
 
 #, c-format
 msgid ""
 "Cannot update sparse checkout: the following entries are not up to date:\n"
 "%s"
 msgstr ""
 

-#: unpack-trees.c:170
+#: unpack-trees.c:175

 #, c-format
 msgid ""
 "The following working tree files would be overwritten by sparse checkout "
 #, c-format
 msgid ""
 "The following working tree files would be overwritten by sparse checkout "


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

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

 #, c-format
 msgid ""
 "The following working tree files would be removed by sparse checkout "
 #, c-format
 msgid ""
 "The following working tree files would be removed by sparse checkout "


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

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

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

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

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

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

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


@@ -4139,7 +4401,7 @@ msgid "could not open '%s' for reading and writing"
 msgstr ""
 
 #: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:770
 msgstr ""
 
 #: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:770

-#: builtin/am.c:862 builtin/merge.c:1044
+#: builtin/am.c:862 builtin/merge.c:1042

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


@@ -4153,374 +4415,374 @@ msgstr ""
 msgid "unable to get current working directory"
 msgstr ""
 
 msgid "unable to get current working directory"
 msgstr ""
 

-#: wt-status.c:151
+#: wt-status.c:154

 msgid "Unmerged paths:"
 msgstr ""
 
 msgid "Unmerged paths:"
 msgstr ""
 

-#: wt-status.c:178 wt-status.c:205
+#: wt-status.c:181 wt-status.c:208

 #, c-format
 msgid "  (use \"git reset %s <file>...\" to unstage)"
 msgstr ""
 
 #, c-format
 msgid "  (use \"git reset %s <file>...\" to unstage)"
 msgstr ""
 

-#: wt-status.c:180 wt-status.c:207
+#: wt-status.c:183 wt-status.c:210

 msgid "  (use \"git rm --cached <file>...\" to unstage)"
 msgstr ""
 
 msgid "  (use \"git rm --cached <file>...\" to unstage)"
 msgstr ""
 

-#: wt-status.c:184
+#: wt-status.c:187

 msgid "  (use \"git add <file>...\" to mark resolution)"
 msgstr ""
 
 msgid "  (use \"git add <file>...\" to mark resolution)"
 msgstr ""
 

-#: wt-status.c:186 wt-status.c:190
+#: wt-status.c:189 wt-status.c:193

 msgid "  (use \"git add/rm <file>...\" as appropriate to mark resolution)"
 msgstr ""
 
 msgid "  (use \"git add/rm <file>...\" as appropriate to mark resolution)"
 msgstr ""
 

-#: wt-status.c:188
+#: wt-status.c:191

 msgid "  (use \"git rm <file>...\" to mark resolution)"
 msgstr ""
 
 msgid "  (use \"git rm <file>...\" to mark resolution)"
 msgstr ""
 

-#: wt-status.c:199 wt-status.c:1007
+#: wt-status.c:202 wt-status.c:1015

 msgid "Changes to be committed:"
 msgstr ""
 
 msgid "Changes to be committed:"
 msgstr ""
 

-#: wt-status.c:217 wt-status.c:1016
+#: wt-status.c:220 wt-status.c:1024

 msgid "Changes not staged for commit:"
 msgstr ""
 
 msgid "Changes not staged for commit:"
 msgstr ""
 

-#: wt-status.c:221
+#: wt-status.c:224

 msgid "  (use \"git add <file>...\" to update what will be committed)"
 msgstr ""
 
 msgid "  (use \"git add <file>...\" to update what will be committed)"
 msgstr ""
 

-#: wt-status.c:223
+#: wt-status.c:226

 msgid "  (use \"git add/rm <file>...\" to update what will be committed)"
 msgstr ""
 
 msgid "  (use \"git add/rm <file>...\" to update what will be committed)"
 msgstr ""
 

-#: wt-status.c:224
+#: wt-status.c:227

 msgid ""
 "  (use \"git checkout -- <file>...\" to discard changes in working directory)"
 msgstr ""
 
 msgid ""
 "  (use \"git checkout -- <file>...\" to discard changes in working directory)"
 msgstr ""
 

-#: wt-status.c:226
+#: wt-status.c:229

 msgid "  (commit or discard the untracked or modified content in submodules)"
 msgstr ""
 
 msgid "  (commit or discard the untracked or modified content in submodules)"
 msgstr ""
 

-#: wt-status.c:238
+#: wt-status.c:241

 #, c-format
 msgid "  (use \"git %s <file>...\" to include in what will be committed)"
 msgstr ""
 
 #, c-format
 msgid "  (use \"git %s <file>...\" to include in what will be committed)"
 msgstr ""
 

-#: wt-status.c:253
+#: wt-status.c:256

 msgid "both deleted:"
 msgstr ""
 
 msgid "both deleted:"
 msgstr ""
 

-#: wt-status.c:255
+#: wt-status.c:258

 msgid "added by us:"
 msgstr ""
 
 msgid "added by us:"
 msgstr ""
 

-#: wt-status.c:257
+#: wt-status.c:260

 msgid "deleted by them:"
 msgstr ""
 
 msgid "deleted by them:"
 msgstr ""
 

-#: wt-status.c:259
+#: wt-status.c:262

 msgid "added by them:"
 msgstr ""
 
 msgid "added by them:"
 msgstr ""
 

-#: wt-status.c:261
+#: wt-status.c:264

 msgid "deleted by us:"
 msgstr ""
 
 msgid "deleted by us:"
 msgstr ""
 

-#: wt-status.c:263
+#: wt-status.c:266

 msgid "both added:"
 msgstr ""
 
 msgid "both added:"
 msgstr ""
 

-#: wt-status.c:265
+#: wt-status.c:268

 msgid "both modified:"
 msgstr ""
 
 msgid "both modified:"
 msgstr ""
 

-#: wt-status.c:275
+#: wt-status.c:278

 msgid "new file:"
 msgstr ""
 
 msgid "new file:"
 msgstr ""
 

-#: wt-status.c:277
+#: wt-status.c:280

 msgid "copied:"
 msgstr ""
 
 msgid "copied:"
 msgstr ""
 

-#: wt-status.c:279
+#: wt-status.c:282

 msgid "deleted:"
 msgstr ""
 
 msgid "deleted:"
 msgstr ""
 

-#: wt-status.c:281
+#: wt-status.c:284

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

-#: wt-status.c:283
+#: wt-status.c:286

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

-#: wt-status.c:285
+#: wt-status.c:288

 msgid "typechange:"
 msgstr ""
 
 msgid "typechange:"
 msgstr ""
 

-#: wt-status.c:287
+#: wt-status.c:290

 msgid "unknown:"
 msgstr ""
 
 msgid "unknown:"
 msgstr ""
 

-#: wt-status.c:289
+#: wt-status.c:292

 msgid "unmerged:"
 msgstr ""
 
 msgid "unmerged:"
 msgstr ""
 

-#: wt-status.c:369
+#: wt-status.c:372

 msgid "new commits, "
 msgstr ""
 
 msgid "new commits, "
 msgstr ""
 

-#: wt-status.c:371
+#: wt-status.c:374

 msgid "modified content, "
 msgstr ""
 
 msgid "modified content, "
 msgstr ""
 

-#: wt-status.c:373
+#: wt-status.c:376

 msgid "untracked content, "
 msgstr ""
 
 msgid "untracked content, "
 msgstr ""
 

-#: wt-status.c:847
+#: wt-status.c:853

 #, c-format
 msgid "Your stash currently has %d entry"
 msgid_plural "Your stash currently has %d entries"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
 msgid "Your stash currently has %d entry"
 msgid_plural "Your stash currently has %d entries"
 msgstr[0] ""
 msgstr[1] ""
 

-#: wt-status.c:879
+#: wt-status.c:885

 msgid "Submodules changed but not updated:"
 msgstr ""
 
 msgid "Submodules changed but not updated:"
 msgstr ""
 

-#: wt-status.c:881
+#: wt-status.c:887

 msgid "Submodule changes to be committed:"
 msgstr ""
 
 msgid "Submodule changes to be committed:"
 msgstr ""
 

-#: wt-status.c:963
+#: wt-status.c:969

 msgid ""
 "Do not modify or remove the line above.\n"
 "Everything below it will be ignored."
 msgstr ""
 
 msgid ""
 "Do not modify or remove the line above.\n"
 "Everything below it will be ignored."
 msgstr ""
 

-#: wt-status.c:1076
+#: wt-status.c:1084

 msgid "You have unmerged paths."
 msgstr ""
 
 msgid "You have unmerged paths."
 msgstr ""
 

-#: wt-status.c:1079
+#: wt-status.c:1087

 msgid "  (fix conflicts and run \"git commit\")"
 msgstr ""
 
 msgid "  (fix conflicts and run \"git commit\")"
 msgstr ""
 

-#: wt-status.c:1081
+#: wt-status.c:1089

 msgid "  (use \"git merge --abort\" to abort the merge)"
 msgstr ""
 
 msgid "  (use \"git merge --abort\" to abort the merge)"
 msgstr ""
 

-#: wt-status.c:1086
+#: wt-status.c:1094

 msgid "All conflicts fixed but you are still merging."
 msgstr ""
 
 msgid "All conflicts fixed but you are still merging."
 msgstr ""
 

-#: wt-status.c:1089
+#: wt-status.c:1097

 msgid "  (use \"git commit\" to conclude merge)"
 msgstr ""
 
 msgid "  (use \"git commit\" to conclude merge)"
 msgstr ""
 

-#: wt-status.c:1099
+#: wt-status.c:1107

 msgid "You are in the middle of an am session."
 msgstr ""
 
 msgid "You are in the middle of an am session."
 msgstr ""
 

-#: wt-status.c:1102
+#: wt-status.c:1110

 msgid "The current patch is empty."
 msgstr ""
 
 msgid "The current patch is empty."
 msgstr ""
 

-#: wt-status.c:1106
+#: wt-status.c:1114

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

-#: wt-status.c:1108
+#: wt-status.c:1116

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

-#: wt-status.c:1110
+#: wt-status.c:1118

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

 msgid "git-rebase-todo is missing."
 msgstr ""
 
 msgid "git-rebase-todo is missing."
 msgstr ""
 

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

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

-#: wt-status.c:1247
+#: wt-status.c:1255

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

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

-#: wt-status.c:1263
+#: wt-status.c:1271

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

-#: wt-status.c:1266
+#: wt-status.c:1274

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

 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:1287
+#: wt-status.c:1295

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

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

-#: wt-status.c:1306
+#: wt-status.c:1314

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

-#: wt-status.c:1308
+#: wt-status.c:1316

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

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

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

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

-#: wt-status.c:1320
+#: wt-status.c:1328

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

 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:1328
+#: wt-status.c:1336

 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:1332
+#: wt-status.c:1340

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

 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:1340
+#: wt-status.c:1348

 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:1342
+#: wt-status.c:1350

 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:1352
+#: wt-status.c:1360

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

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

-#: wt-status.c:1360
+#: wt-status.c:1368

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

-#: wt-status.c:1362
+#: wt-status.c:1370

 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:1371
+#: wt-status.c:1379

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

-#: wt-status.c:1376
+#: wt-status.c:1384

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

-#: wt-status.c:1379
+#: wt-status.c:1387

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

-#: wt-status.c:1381
+#: wt-status.c:1389

 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:1392
+#: wt-status.c:1400

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

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

-#: wt-status.c:1399
+#: wt-status.c:1407

 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:1596
+#: wt-status.c:1604

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

-#: wt-status.c:1602
+#: wt-status.c:1610

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

-#: wt-status.c:1604
+#: wt-status.c:1612

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

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

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

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

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

-#: wt-status.c:1614
+#: wt-status.c:1622

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

-#: wt-status.c:1634
+#: wt-status.c:1642

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

-#: wt-status.c:1635
+#: wt-status.c:1643

 msgid "No commits yet"
 msgstr ""
 
 msgid "No commits yet"
 msgstr ""
 

-#: wt-status.c:1649
+#: wt-status.c:1657

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

-#: wt-status.c:1651
+#: wt-status.c:1659

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

-#: wt-status.c:1655
+#: wt-status.c:1663

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


@@ -4528,97 +4790,97 @@ msgid ""
 "new files yourself (see 'git help status')."
 msgstr ""
 
 "new files yourself (see 'git help status')."
 msgstr ""
 

-#: wt-status.c:1661
+#: wt-status.c:1669

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

-#: wt-status.c:1663
+#: wt-status.c:1671

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

-#: wt-status.c:1669
+#: wt-status.c:1677

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

-#: wt-status.c:1674
+#: wt-status.c:1682

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

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

-#: wt-status.c:1680
+#: wt-status.c:1688

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

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

 #, 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:1689 wt-status.c:1694
+#: wt-status.c:1697 wt-status.c:1702

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

-#: wt-status.c:1692
+#: wt-status.c:1700

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

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

 msgid "No commits yet on "
 msgstr ""
 
 msgid "No commits yet on "
 msgstr ""
 

-#: wt-status.c:1813
+#: wt-status.c:1821

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

-#: wt-status.c:1844
+#: wt-status.c:1852

 msgid "different"
 msgstr ""
 
 msgid "different"
 msgstr ""
 

-#: wt-status.c:1846 wt-status.c:1854
+#: wt-status.c:1854 wt-status.c:1862

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

-#: wt-status.c:1849 wt-status.c:1852
+#: wt-status.c:1857 wt-status.c:1860

 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:2358
+#: wt-status.c:2366

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

-#: wt-status.c:2364
+#: wt-status.c:2372

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

-#: wt-status.c:2366
+#: wt-status.c:2374

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

-#: compat/precompose_utf8.c:58 builtin/clone.c:440
+#: compat/precompose_utf8.c:58 builtin/clone.c:442

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


@@ -4632,7 +4894,7 @@ msgstr ""
 msgid "unexpected diff status %c"
 msgstr ""
 
 msgid "unexpected diff status %c"
 msgstr ""
 

-#: builtin/add.c:88 builtin/commit.c:257
+#: builtin/add.c:88 builtin/commit.c:266

 msgid "updating files failed"
 msgstr ""
 
 msgid "updating files failed"
 msgstr ""
 


@@ -4676,77 +4938,77 @@ msgstr ""
 msgid "Could not apply '%s'"
 msgstr ""
 
 msgid "Could not apply '%s'"
 msgstr ""
 

-#: builtin/add.c:271
+#: builtin/add.c:269

 msgid "The following paths are ignored by one of your .gitignore files:\n"
 msgstr ""
 
 msgid "The following paths are ignored by one of your .gitignore files:\n"
 msgstr ""
 

-#: builtin/add.c:291 builtin/clean.c:911 builtin/fetch.c:146 builtin/mv.c:124
-#: builtin/prune-packed.c:55 builtin/pull.c:207 builtin/push.c:541
-#: builtin/remote.c:1333 builtin/rm.c:242 builtin/send-pack.c:164
+#: builtin/add.c:289 builtin/clean.c:911 builtin/fetch.c:145 builtin/mv.c:123
+#: builtin/prune-packed.c:55 builtin/pull.c:212 builtin/push.c:557
+#: builtin/remote.c:1342 builtin/rm.c:240 builtin/send-pack.c:165

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

-#: builtin/add.c:294
+#: builtin/add.c:292

 msgid "interactive picking"
 msgstr ""
 
 msgid "interactive picking"
 msgstr ""
 

-#: builtin/add.c:295 builtin/checkout.c:1128 builtin/reset.c:302
+#: builtin/add.c:293 builtin/checkout.c:1135 builtin/reset.c:302

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

-#: builtin/add.c:296
+#: builtin/add.c:294

 msgid "edit current diff and apply"
 msgstr ""
 
 msgid "edit current diff and apply"
 msgstr ""
 

-#: builtin/add.c:297
+#: builtin/add.c:295

 msgid "allow adding otherwise ignored files"
 msgstr ""
 
 msgid "allow adding otherwise ignored files"
 msgstr ""
 

-#: builtin/add.c:298
+#: builtin/add.c:296

 msgid "update tracked files"
 msgstr ""
 
 msgid "update tracked files"
 msgstr ""
 

-#: builtin/add.c:299
+#: builtin/add.c:297

 msgid "renormalize EOL of tracked files (implies -u)"
 msgstr ""
 
 msgid "renormalize EOL of tracked files (implies -u)"
 msgstr ""
 

-#: builtin/add.c:300
+#: builtin/add.c:298

 msgid "record only the fact that the path will be added later"
 msgstr ""
 
 msgid "record only the fact that the path will be added later"
 msgstr ""
 

-#: builtin/add.c:301
+#: builtin/add.c:299

 msgid "add changes from all tracked and untracked files"
 msgstr ""
 
 msgid "add changes from all tracked and untracked files"
 msgstr ""
 

-#: builtin/add.c:304
+#: builtin/add.c:302

 msgid "ignore paths removed in the working tree (same as --no-all)"
 msgstr ""
 
 msgid "ignore paths removed in the working tree (same as --no-all)"
 msgstr ""
 

-#: builtin/add.c:306
+#: builtin/add.c:304

 msgid "don't add, only refresh the index"
 msgstr ""
 
 msgid "don't add, only refresh the index"
 msgstr ""
 

-#: builtin/add.c:307
+#: builtin/add.c:305

 msgid "just skip files which cannot be added because of errors"
 msgstr ""
 
 msgid "just skip files which cannot be added because of errors"
 msgstr ""
 

-#: builtin/add.c:308
+#: builtin/add.c:306

 msgid "check if - even missing - files are ignored in dry run"
 msgstr ""
 
 msgid "check if - even missing - files are ignored in dry run"
 msgstr ""
 

-#: builtin/add.c:309 builtin/update-index.c:964
+#: builtin/add.c:307 builtin/update-index.c:974

 msgid "(+/-)x"
 msgstr ""
 
 msgid "(+/-)x"
 msgstr ""
 

-#: builtin/add.c:309 builtin/update-index.c:965
+#: builtin/add.c:307 builtin/update-index.c:975

 msgid "override the executable bit of the listed files"
 msgstr ""
 
 msgid "override the executable bit of the listed files"
 msgstr ""
 

-#: builtin/add.c:311
+#: builtin/add.c:309

 msgid "warn when adding an embedded repository"
 msgstr ""
 
 msgid "warn when adding an embedded repository"
 msgstr ""
 

-#: builtin/add.c:326
+#: builtin/add.c:324

 #, c-format
 msgid ""
 "You've added another git repository inside your current repository.\n"
 #, c-format
 msgid ""
 "You've added another git repository inside your current repository.\n"


@@ -4764,47 +5026,47 @@ msgid ""
 "See \"git help submodule\" for more information."
 msgstr ""
 
 "See \"git help submodule\" for more information."
 msgstr ""
 

-#: builtin/add.c:354
+#: builtin/add.c:352

 #, c-format
 msgid "adding embedded git repository: %s"
 msgstr ""
 
 #, c-format
 msgid "adding embedded git repository: %s"
 msgstr ""
 

-#: builtin/add.c:372
+#: builtin/add.c:370

 #, c-format
 msgid "Use -f if you really want to add them.\n"
 msgstr ""
 
 #, c-format
 msgid "Use -f if you really want to add them.\n"
 msgstr ""
 

-#: builtin/add.c:380
+#: builtin/add.c:378

 msgid "adding files failed"
 msgstr ""
 
 msgid "adding files failed"
 msgstr ""
 

-#: builtin/add.c:417
+#: builtin/add.c:416

 msgid "-A and -u are mutually incompatible"
 msgstr ""
 
 msgid "-A and -u are mutually incompatible"
 msgstr ""
 

-#: builtin/add.c:424
+#: builtin/add.c:423

 msgid "Option --ignore-missing can only be used together with --dry-run"
 msgstr ""
 
 msgid "Option --ignore-missing can only be used together with --dry-run"
 msgstr ""
 

-#: builtin/add.c:428
+#: builtin/add.c:427

 #, c-format
 msgid "--chmod param '%s' must be either -x or +x"
 msgstr ""
 
 #, c-format
 msgid "--chmod param '%s' must be either -x or +x"
 msgstr ""
 

-#: builtin/add.c:443
+#: builtin/add.c:442

 #, c-format
 msgid "Nothing specified, nothing added.\n"
 msgstr ""
 
 #, c-format
 msgid "Nothing specified, nothing added.\n"
 msgstr ""
 

-#: builtin/add.c:444
+#: builtin/add.c:443

 #, c-format
 msgid "Maybe you wanted to say 'git add .'?\n"
 msgstr ""
 
 #, c-format
 msgid "Maybe you wanted to say 'git add .'?\n"
 msgstr ""
 

-#: builtin/add.c:449 builtin/check-ignore.c:177 builtin/checkout.c:280
-#: builtin/checkout.c:483 builtin/clean.c:958 builtin/commit.c:316
+#: builtin/add.c:448 builtin/check-ignore.c:177 builtin/checkout.c:280
+#: builtin/checkout.c:483 builtin/clean.c:958 builtin/commit.c:325

 #: builtin/diff-tree.c:114 builtin/mv.c:144 builtin/reset.c:241
 #: builtin/diff-tree.c:114 builtin/mv.c:144 builtin/reset.c:241

-#: builtin/rm.c:271 builtin/submodule--helper.c:326
+#: builtin/rm.c:270 builtin/submodule--helper.c:328

 msgid "index file corrupt"
 msgstr ""
 
 msgid "index file corrupt"
 msgstr ""
 


@@ -4856,7 +5118,7 @@ msgstr ""
 msgid "Patch format detection failed."
 msgstr ""
 
 msgid "Patch format detection failed."
 msgstr ""
 

-#: builtin/am.c:1013 builtin/clone.c:405
+#: builtin/am.c:1013 builtin/clone.c:407

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


@@ -4865,7 +5127,7 @@ msgstr ""
 msgid "Failed to split patches."
 msgstr ""
 
 msgid "Failed to split patches."
 msgstr ""
 

-#: builtin/am.c:1148 builtin/commit.c:342
+#: builtin/am.c:1148 builtin/commit.c:351

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


@@ -5025,7 +5287,7 @@ msgid "allow fall back on 3way merging if needed"
 msgstr ""
 
 #: builtin/am.c:2222 builtin/init-db.c:484 builtin/prune-packed.c:57
 msgstr ""
 
 #: builtin/am.c:2222 builtin/init-db.c:484 builtin/prune-packed.c:57

-#: builtin/repack.c:182
+#: builtin/repack.c:192

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


@@ -5067,16 +5329,17 @@ msgstr ""
 msgid "pass it through git-apply"
 msgstr ""
 
 msgid "pass it through git-apply"
 msgstr ""
 

-#: builtin/am.c:2260 builtin/fmt-merge-msg.c:665 builtin/fmt-merge-msg.c:668
-#: builtin/grep.c:853 builtin/merge.c:206 builtin/pull.c:145 builtin/pull.c:203
-#: builtin/repack.c:191 builtin/repack.c:195 builtin/repack.c:197
-#: builtin/show-branch.c:631 builtin/show-ref.c:169 builtin/tag.c:382
-#: parse-options.h:144 parse-options.h:146 parse-options.h:257
+#: builtin/am.c:2260 builtin/commit.c:1332 builtin/fmt-merge-msg.c:665
+#: builtin/fmt-merge-msg.c:668 builtin/grep.c:853 builtin/merge.c:207
+#: builtin/pull.c:150 builtin/pull.c:208 builtin/repack.c:201
+#: builtin/repack.c:205 builtin/repack.c:207 builtin/show-branch.c:631
+#: builtin/show-ref.c:169 builtin/tag.c:383 parse-options.h:144
+#: parse-options.h:146 parse-options.h:258

 msgid "n"
 msgstr ""
 
 msgid "n"
 msgstr ""
 

-#: builtin/am.c:2266 builtin/branch.c:629 builtin/for-each-ref.c:38
-#: builtin/replace.c:445 builtin/tag.c:418 builtin/verify-tag.c:39
+#: builtin/am.c:2266 builtin/branch.c:632 builtin/for-each-ref.c:38
+#: builtin/replace.c:543 builtin/tag.c:419 builtin/verify-tag.c:39

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


@@ -5120,8 +5383,8 @@ msgstr ""
 msgid "use current timestamp for author date"
 msgstr ""
 
 msgid "use current timestamp for author date"
 msgstr ""
 

-#: builtin/am.c:2298 builtin/commit.c:1431 builtin/merge.c:237
-#: builtin/pull.c:178 builtin/revert.c:112 builtin/tag.c:398
+#: builtin/am.c:2298 builtin/commit.c:1468 builtin/merge.c:238
+#: builtin/pull.c:183 builtin/revert.c:112 builtin/tag.c:399

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


@@ -5256,115 +5519,141 @@ msgstr ""
 msgid "--bisect-clean-state requires no arguments"
 msgstr ""
 
 msgid "--bisect-clean-state requires no arguments"
 msgstr ""
 

-#: builtin/blame.c:27
+#: builtin/blame.c:29

 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
 msgstr ""
 
 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
 msgstr ""
 

-#: builtin/blame.c:32
+#: builtin/blame.c:34

 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:677
+#: builtin/blame.c:404
+#, c-format
+msgid "expecting a color: %s"
+msgstr ""
+
+#: builtin/blame.c:411
+msgid "must end with a color"
+msgstr ""
+
+#: builtin/blame.c:697
+#, c-format
+msgid "invalid color '%s' in color.blame.repeatedLines"
+msgstr ""
+
+#: builtin/blame.c:715
+msgid "invalid value for blame.coloring"
+msgstr ""
+
+#: builtin/blame.c:786

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

-#: builtin/blame.c:678
+#: builtin/blame.c:787

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

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

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

-#: builtin/blame.c:681
+#: builtin/blame.c:790

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

-#: builtin/blame.c:682
+#: builtin/blame.c:791

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

-#: builtin/blame.c:683
+#: builtin/blame.c:792

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

-#: builtin/blame.c:684
+#: builtin/blame.c:793

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

-#: builtin/blame.c:685
+#: builtin/blame.c:794

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

-#: builtin/blame.c:686
+#: builtin/blame.c:795

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

-#: builtin/blame.c:687
+#: builtin/blame.c:796

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

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

-#: builtin/blame.c:689
+#: builtin/blame.c:798

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

-#: builtin/blame.c:690
+#: builtin/blame.c:799

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

-#: builtin/blame.c:691
+#: builtin/blame.c:800

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

-#: builtin/blame.c:692
+#: builtin/blame.c:801

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

-#: builtin/blame.c:699
+#: builtin/blame.c:802
+msgid "color redundant metadata from previous line differently"
+msgstr ""
+
+#: builtin/blame.c:803
+msgid "color lines by age"
+msgstr ""
+
+#: builtin/blame.c:810

 msgid "Use an experimental heuristic to improve diffs"
 msgstr ""
 
 msgid "Use an experimental heuristic to improve diffs"
 msgstr ""
 

-#: builtin/blame.c:701
+#: builtin/blame.c:812

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

-#: builtin/blame.c:702
+#: builtin/blame.c:813

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

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

-#: builtin/blame.c:704 builtin/blame.c:705
+#: builtin/blame.c:815 builtin/blame.c:816

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

-#: builtin/blame.c:704
+#: builtin/blame.c:815

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

-#: builtin/blame.c:705
+#: builtin/blame.c:816

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

-#: builtin/blame.c:706
+#: builtin/blame.c:817

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

-#: builtin/blame.c:706
+#: builtin/blame.c:817

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

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


@@ -5376,18 +5665,18 @@ msgstr ""
 #. your language may need more or fewer display
 #. columns.
 #.
 #. your language may need more or fewer display
 #. columns.
 #.

-#: builtin/blame.c:804
+#: builtin/blame.c:917

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

-#: builtin/blame.c:890
+#: builtin/blame.c:1003

 #, c-format
 msgid "file %s has only %lu line"
 msgid_plural "file %s has only %lu lines"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
 msgid "file %s has only %lu line"
 msgid_plural "file %s has only %lu lines"
 msgstr[0] ""
 msgstr[1] ""
 

-#: builtin/blame.c:936
+#: builtin/blame.c:1049

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


@@ -5492,65 +5781,65 @@ msgstr ""
 msgid "Deleted branch %s (was %s).\n"
 msgstr ""
 
 msgid "Deleted branch %s (was %s).\n"
 msgstr ""
 

-#: builtin/branch.c:417 builtin/tag.c:58
+#: builtin/branch.c:416 builtin/tag.c:58

 msgid "unable to parse format string"
 msgstr ""
 
 msgid "unable to parse format string"
 msgstr ""
 

-#: builtin/branch.c:450
+#: builtin/branch.c:453

 #, 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:454
+#: builtin/branch.c:457

 #, 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:471
+#: builtin/branch.c:474

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

-#: builtin/branch.c:473
+#: builtin/branch.c:476

 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:484
+#: builtin/branch.c:487

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

-#: builtin/branch.c:511
+#: builtin/branch.c:514

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

-#: builtin/branch.c:513
+#: builtin/branch.c:516

 msgid "Branch copy failed"
 msgstr ""
 
 msgid "Branch copy failed"
 msgstr ""
 

-#: builtin/branch.c:517
+#: builtin/branch.c:520

 #, c-format
 msgid "Created a copy of a misnamed branch '%s'"
 msgstr ""
 
 #, c-format
 msgid "Created a copy of a misnamed branch '%s'"
 msgstr ""
 

-#: builtin/branch.c:520
+#: builtin/branch.c:523

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

-#: builtin/branch.c:526
+#: builtin/branch.c:529

 #, 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:535
+#: builtin/branch.c:538

 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:537
+#: builtin/branch.c:540

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

-#: builtin/branch.c:553
+#: builtin/branch.c:556

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


@@ -5558,217 +5847,219 @@ msgid ""
 "Lines starting with '%c' will be stripped.\n"
 msgstr ""
 
 "Lines starting with '%c' will be stripped.\n"
 msgstr ""
 

-#: builtin/branch.c:586
+#: builtin/branch.c:589

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

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

 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:589
+#: builtin/branch.c:592

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

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

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

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

 msgid "do not use"
 msgstr ""
 
 msgid "do not use"
 msgstr ""
 

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

 msgid "upstream"
 msgstr ""
 
 msgid "upstream"
 msgstr ""
 

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

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

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

 msgid "Unset the upstream info"
 msgstr ""
 
 msgid "Unset the upstream info"
 msgstr ""
 

-#: builtin/branch.c:596
+#: builtin/branch.c:599

 msgid "use colored output"
 msgstr ""
 
 msgid "use colored output"
 msgstr ""
 

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

 msgid "act on remote-tracking branches"
 msgstr ""
 
 msgid "act on remote-tracking branches"
 msgstr ""
 

-#: builtin/branch.c:599 builtin/branch.c:601
+#: builtin/branch.c:602 builtin/branch.c:604

 msgid "print only branches that contain the commit"
 msgstr ""
 
 msgid "print only branches that contain the commit"
 msgstr ""
 

-#: builtin/branch.c:600 builtin/branch.c:602
+#: builtin/branch.c:603 builtin/branch.c:605

 msgid "print only branches that don't contain the commit"
 msgstr ""
 
 msgid "print only branches that don't contain the commit"
 msgstr ""
 

-#: builtin/branch.c:605
+#: builtin/branch.c:608

 msgid "Specific git-branch actions:"
 msgstr ""
 
 msgid "Specific git-branch actions:"
 msgstr ""
 

-#: builtin/branch.c:606
+#: builtin/branch.c:609

 msgid "list both remote-tracking and local branches"
 msgstr ""
 
 msgid "list both remote-tracking and local branches"
 msgstr ""
 

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

 msgid "delete fully merged branch"
 msgstr ""
 
 msgid "delete fully merged branch"
 msgstr ""
 

-#: builtin/branch.c:609
+#: builtin/branch.c:612

 msgid "delete branch (even if not merged)"
 msgstr ""
 
 msgid "delete branch (even if not merged)"
 msgstr ""
 

-#: builtin/branch.c:610
+#: builtin/branch.c:613

 msgid "move/rename a branch and its reflog"
 msgstr ""
 
 msgid "move/rename a branch and its reflog"
 msgstr ""
 

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

 msgid "move/rename a branch, even if target exists"
 msgstr ""
 
 msgid "move/rename a branch, even if target exists"
 msgstr ""
 

-#: builtin/branch.c:612
+#: builtin/branch.c:615

 msgid "copy a branch and its reflog"
 msgstr ""
 
 msgid "copy a branch and its reflog"
 msgstr ""
 

-#: builtin/branch.c:613
+#: builtin/branch.c:616

 msgid "copy a branch, even if target exists"
 msgstr ""
 
 msgid "copy a branch, even if target exists"
 msgstr ""
 

-#: builtin/branch.c:614
+#: builtin/branch.c:617

 msgid "list branch names"
 msgstr ""
 
 msgid "list branch names"
 msgstr ""
 

-#: builtin/branch.c:615
+#: builtin/branch.c:618

 msgid "create the branch's reflog"
 msgstr ""
 
 msgid "create the branch's reflog"
 msgstr ""
 

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

 msgid "edit the description for the branch"
 msgstr ""
 
 msgid "edit the description for the branch"
 msgstr ""
 

-#: builtin/branch.c:618
+#: builtin/branch.c:621

 msgid "force creation, move/rename, deletion"
 msgstr ""
 
 msgid "force creation, move/rename, deletion"
 msgstr ""
 

-#: builtin/branch.c:619
+#: builtin/branch.c:622

 msgid "print only branches that are merged"
 msgstr ""
 
 msgid "print only branches that are merged"
 msgstr ""
 

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

 msgid "print only branches that are not merged"
 msgstr ""
 
 msgid "print only branches that are not merged"
 msgstr ""
 

-#: builtin/branch.c:621
+#: builtin/branch.c:624

 msgid "list branches in columns"
 msgstr ""
 
 msgid "list branches in columns"
 msgstr ""
 

-#: builtin/branch.c:622 builtin/for-each-ref.c:40 builtin/tag.c:411
+#: builtin/branch.c:625 builtin/for-each-ref.c:40 builtin/ls-remote.c:70
+#: builtin/tag.c:412

 msgid "key"
 msgstr ""
 
 msgid "key"
 msgstr ""
 

-#: builtin/branch.c:623 builtin/for-each-ref.c:41 builtin/tag.c:412
+#: builtin/branch.c:626 builtin/for-each-ref.c:41 builtin/ls-remote.c:71
+#: builtin/tag.c:413

 msgid "field name to sort on"
 msgstr ""
 
 msgid "field name to sort on"
 msgstr ""
 

-#: builtin/branch.c:625 builtin/for-each-ref.c:43 builtin/notes.c:408
+#: builtin/branch.c:628 builtin/for-each-ref.c:43 builtin/notes.c:408

 #: builtin/notes.c:411 builtin/notes.c:571 builtin/notes.c:574
 #: builtin/notes.c:411 builtin/notes.c:571 builtin/notes.c:574

-#: builtin/tag.c:414
+#: builtin/tag.c:415

 msgid "object"
 msgstr ""
 
 msgid "object"
 msgstr ""
 

-#: builtin/branch.c:626
+#: builtin/branch.c:629

 msgid "print only branches of the object"
 msgstr ""
 
 msgid "print only branches of the object"
 msgstr ""
 

-#: builtin/branch.c:628 builtin/for-each-ref.c:49 builtin/tag.c:421
+#: builtin/branch.c:631 builtin/for-each-ref.c:49 builtin/tag.c:422

 msgid "sorting and filtering are case insensitive"
 msgstr ""
 
 msgid "sorting and filtering are case insensitive"
 msgstr ""
 

-#: builtin/branch.c:629 builtin/for-each-ref.c:38 builtin/tag.c:419
+#: builtin/branch.c:632 builtin/for-each-ref.c:38 builtin/tag.c:420

 #: builtin/verify-tag.c:39
 msgid "format to use for the output"
 msgstr ""
 
 #: builtin/verify-tag.c:39
 msgid "format to use for the output"
 msgstr ""
 

-#: builtin/branch.c:652 builtin/clone.c:735
+#: builtin/branch.c:655 builtin/clone.c:737

 msgid "HEAD not found below refs/heads!"
 msgstr ""
 
 msgid "HEAD not found below refs/heads!"
 msgstr ""
 

-#: builtin/branch.c:675
+#: builtin/branch.c:678

 msgid "--column and --verbose are incompatible"
 msgstr ""
 
 msgid "--column and --verbose are incompatible"
 msgstr ""
 

-#: builtin/branch.c:690 builtin/branch.c:742 builtin/branch.c:751
+#: builtin/branch.c:693 builtin/branch.c:745 builtin/branch.c:754

 msgid "branch name required"
 msgstr ""
 
 msgid "branch name required"
 msgstr ""
 

-#: builtin/branch.c:718
+#: builtin/branch.c:721

 msgid "Cannot give description to detached HEAD"
 msgstr ""
 
 msgid "Cannot give description to detached HEAD"
 msgstr ""
 

-#: builtin/branch.c:723
+#: builtin/branch.c:726

 msgid "cannot edit description of more than one branch"
 msgstr ""
 
 msgid "cannot edit description of more than one branch"
 msgstr ""
 

-#: builtin/branch.c:730
+#: builtin/branch.c:733

 #, c-format
 msgid "No commit on branch '%s' yet."
 msgstr ""
 
 #, c-format
 msgid "No commit on branch '%s' yet."
 msgstr ""
 

-#: builtin/branch.c:733
+#: builtin/branch.c:736

 #, c-format
 msgid "No branch named '%s'."
 msgstr ""
 
 #, c-format
 msgid "No branch named '%s'."
 msgstr ""
 

-#: builtin/branch.c:748
+#: builtin/branch.c:751

 msgid "too many branches for a copy operation"
 msgstr ""
 
 msgid "too many branches for a copy operation"
 msgstr ""
 

-#: builtin/branch.c:757
+#: builtin/branch.c:760

 msgid "too many arguments for a rename operation"
 msgstr ""
 
 msgid "too many arguments for a rename operation"
 msgstr ""
 

-#: builtin/branch.c:762
+#: builtin/branch.c:765

 msgid "too many arguments to set new upstream"
 msgstr ""
 
 msgid "too many arguments to set new upstream"
 msgstr ""
 

-#: builtin/branch.c:766
+#: builtin/branch.c:769

 #, 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:769 builtin/branch.c:791 builtin/branch.c:807
+#: builtin/branch.c:772 builtin/branch.c:794 builtin/branch.c:810

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

-#: builtin/branch.c:773
+#: builtin/branch.c:776

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

-#: builtin/branch.c:785
+#: builtin/branch.c:788

 msgid "too many arguments to unset upstream"
 msgstr ""
 
 msgid "too many arguments to unset upstream"
 msgstr ""
 

-#: builtin/branch.c:789
+#: builtin/branch.c:792

 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:795
+#: builtin/branch.c:798

 #, c-format
 msgid "Branch '%s' has no upstream information"
 msgstr ""
 
 #, c-format
 msgid "Branch '%s' has no upstream information"
 msgstr ""
 

-#: builtin/branch.c:810
+#: builtin/branch.c:813

 msgid "-a and -r options to 'git branch' do not make sense with a branch name"
 msgstr ""
 
 msgid "-a and -r options to 'git branch' do not make sense with a branch name"
 msgstr ""
 

-#: builtin/branch.c:813
+#: builtin/branch.c:816

 msgid ""
 "the '--set-upstream' option is no longer supported. Please use '--track' or "
 "'--set-upstream-to' instead."
 msgid ""
 "the '--set-upstream' option is no longer supported. Please use '--track' or "
 "'--set-upstream-to' instead."


@@ -5787,75 +6078,75 @@ msgstr ""
 msgid "Need a repository to unbundle."
 msgstr ""
 
 msgid "Need a repository to unbundle."
 msgstr ""
 

-#: builtin/cat-file.c:523
+#: builtin/cat-file.c:525

 msgid ""
 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
 "p | <type> | --textconv | --filters) [--path=<path>] <object>"
 msgstr ""
 
 msgid ""
 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
 "p | <type> | --textconv | --filters) [--path=<path>] <object>"
 msgstr ""
 

-#: builtin/cat-file.c:524
+#: builtin/cat-file.c:526

 msgid ""
 "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
 "filters]"
 msgstr ""
 
 msgid ""
 "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
 "filters]"
 msgstr ""
 

-#: builtin/cat-file.c:561
+#: builtin/cat-file.c:563

 msgid "<type> can be one of: blob, tree, commit, tag"
 msgstr ""
 
 msgid "<type> can be one of: blob, tree, commit, tag"
 msgstr ""
 

-#: builtin/cat-file.c:562
+#: builtin/cat-file.c:564

 msgid "show object type"
 msgstr ""
 
 msgid "show object type"
 msgstr ""
 

-#: builtin/cat-file.c:563
+#: builtin/cat-file.c:565

 msgid "show object size"
 msgstr ""
 
 msgid "show object size"
 msgstr ""
 

-#: builtin/cat-file.c:565
+#: builtin/cat-file.c:567

 msgid "exit with zero when there's no error"
 msgstr ""
 
 msgid "exit with zero when there's no error"
 msgstr ""
 

-#: builtin/cat-file.c:566
+#: builtin/cat-file.c:568

 msgid "pretty-print object's content"
 msgstr ""
 
 msgid "pretty-print object's content"
 msgstr ""
 

-#: builtin/cat-file.c:568
+#: builtin/cat-file.c:570

 msgid "for blob objects, run textconv on object's content"
 msgstr ""
 
 msgid "for blob objects, run textconv on object's content"
 msgstr ""
 

-#: builtin/cat-file.c:570
+#: builtin/cat-file.c:572

 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:571 git-submodule.sh:878
+#: builtin/cat-file.c:573 git-submodule.sh:894

 msgid "blob"
 msgstr ""
 
 msgid "blob"
 msgstr ""
 

-#: builtin/cat-file.c:572
+#: builtin/cat-file.c:574

 msgid "use a specific path for --textconv/--filters"
 msgstr ""
 
 msgid "use a specific path for --textconv/--filters"
 msgstr ""
 

-#: builtin/cat-file.c:574
+#: builtin/cat-file.c:576

 msgid "allow -s and -t to work with broken/corrupt objects"
 msgstr ""
 
 msgid "allow -s and -t to work with broken/corrupt objects"
 msgstr ""
 

-#: builtin/cat-file.c:575
+#: builtin/cat-file.c:577

 msgid "buffer --batch output"
 msgstr ""
 
 msgid "buffer --batch output"
 msgstr ""
 

-#: builtin/cat-file.c:577
+#: builtin/cat-file.c:579

 msgid "show info and content of objects fed from the standard input"
 msgstr ""
 
 msgid "show info and content of objects fed from the standard input"
 msgstr ""
 

-#: builtin/cat-file.c:580
+#: builtin/cat-file.c:582

 msgid "show info about objects fed from the standard input"
 msgstr ""
 
 msgid "show info about objects fed from the standard input"
 msgstr ""
 

-#: builtin/cat-file.c:583
+#: builtin/cat-file.c:585

 msgid "follow in-tree symlinks (used with --batch or --batch-check)"
 msgstr ""
 
 msgid "follow in-tree symlinks (used with --batch or --batch-check)"
 msgstr ""
 

-#: builtin/cat-file.c:585
+#: builtin/cat-file.c:587

 msgid "show all objects with --batch or --batch-check"
 msgstr ""
 
 msgid "show all objects with --batch or --batch-check"
 msgstr ""
 


@@ -5883,7 +6174,7 @@ msgstr ""
 msgid "terminate input and output records by a NUL character"
 msgstr ""
 
 msgid "terminate input and output records by a NUL character"
 msgstr ""
 

-#: builtin/check-ignore.c:20 builtin/checkout.c:1106 builtin/gc.c:358
+#: builtin/check-ignore.c:20 builtin/checkout.c:1113 builtin/gc.c:500

 msgid "suppress progress reporting"
 msgstr ""
 
 msgid "suppress progress reporting"
 msgstr ""
 


@@ -5973,9 +6264,9 @@ msgid "write the content to temporary files"
 msgstr ""
 
 #: builtin/checkout-index.c:173 builtin/column.c:31
 msgstr ""
 
 #: builtin/checkout-index.c:173 builtin/column.c:31

-#: builtin/submodule--helper.c:1203 builtin/submodule--helper.c:1206
-#: builtin/submodule--helper.c:1212 builtin/submodule--helper.c:1574
-#: builtin/worktree.c:570
+#: builtin/submodule--helper.c:1216 builtin/submodule--helper.c:1219
+#: builtin/submodule--helper.c:1227 builtin/submodule--helper.c:1591
+#: builtin/worktree.c:610

 msgid "string"
 msgstr ""
 
 msgid "string"
 msgstr ""
 


@@ -6046,54 +6337,54 @@ msgstr ""
 msgid "path '%s' is unmerged"
 msgstr ""
 
 msgid "path '%s' is unmerged"
 msgstr ""
 

-#: builtin/checkout.c:505
+#: builtin/checkout.c:506

 msgid "you need to resolve your current index first"
 msgstr ""
 
 msgid "you need to resolve your current index first"
 msgstr ""
 

-#: builtin/checkout.c:636
+#: builtin/checkout.c:643

 #, 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:677
+#: builtin/checkout.c:684

 msgid "HEAD is now at"
 msgstr ""
 
 msgid "HEAD is now at"
 msgstr ""
 

-#: builtin/checkout.c:681 builtin/clone.c:689
+#: builtin/checkout.c:688 builtin/clone.c:691

 msgid "unable to update HEAD"
 msgstr ""
 
 msgid "unable to update HEAD"
 msgstr ""
 

-#: builtin/checkout.c:685
+#: builtin/checkout.c:692

 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr ""
 
 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr ""
 

-#: builtin/checkout.c:688
+#: builtin/checkout.c:695

 #, c-format
 msgid "Already on '%s'\n"
 msgstr ""
 
 #, c-format
 msgid "Already on '%s'\n"
 msgstr ""
 

-#: builtin/checkout.c:692
+#: builtin/checkout.c:699

 #, 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:694 builtin/checkout.c:1039
+#: builtin/checkout.c:701 builtin/checkout.c:1046

 #, 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:696
+#: builtin/checkout.c:703

 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr ""
 
 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr ""
 

-#: builtin/checkout.c:747
+#: builtin/checkout.c:754

 #, c-format
 msgid " ... and %d more.\n"
 msgstr ""
 
 #, c-format
 msgid " ... and %d more.\n"
 msgstr ""
 

-#: builtin/checkout.c:753
+#: builtin/checkout.c:760

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


@@ -6108,7 +6399,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
 msgstr[0] ""
 msgstr[1] ""
 

-#: builtin/checkout.c:772
+#: builtin/checkout.c:779

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


@@ -6125,160 +6416,160 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
 msgstr[0] ""
 msgstr[1] ""
 

-#: builtin/checkout.c:804
+#: builtin/checkout.c:811

 msgid "internal error in revision walk"
 msgstr ""
 
 msgid "internal error in revision walk"
 msgstr ""
 

-#: builtin/checkout.c:808
+#: builtin/checkout.c:815

 msgid "Previous HEAD position was"
 msgstr ""
 
 msgid "Previous HEAD position was"
 msgstr ""
 

-#: builtin/checkout.c:836 builtin/checkout.c:1034
+#: builtin/checkout.c:843 builtin/checkout.c:1041

 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:940
+#: builtin/checkout.c:947

 #, c-format
 msgid "only one reference expected, %d given."
 msgstr ""
 
 #, c-format
 msgid "only one reference expected, %d given."
 msgstr ""
 

-#: builtin/checkout.c:980 builtin/worktree.c:249
+#: builtin/checkout.c:987 builtin/worktree.c:240 builtin/worktree.c:389

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

-#: builtin/checkout.c:1009
+#: builtin/checkout.c:1016

 #, c-format
 msgid "reference is not a tree: %s"
 msgstr ""
 
 #, c-format
 msgid "reference is not a tree: %s"
 msgstr ""
 

-#: builtin/checkout.c:1048
+#: builtin/checkout.c:1055

 msgid "paths cannot be used with switching branches"
 msgstr ""
 
 msgid "paths cannot be used with switching branches"
 msgstr ""
 

-#: builtin/checkout.c:1051 builtin/checkout.c:1055
+#: builtin/checkout.c:1058 builtin/checkout.c:1062

 #, 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:1059 builtin/checkout.c:1062 builtin/checkout.c:1067
-#: builtin/checkout.c:1070
+#: builtin/checkout.c:1066 builtin/checkout.c:1069 builtin/checkout.c:1074
+#: builtin/checkout.c:1077

 #, c-format
 msgid "'%s' cannot be used with '%s'"
 msgstr ""
 
 #, c-format
 msgid "'%s' cannot be used with '%s'"
 msgstr ""
 

-#: builtin/checkout.c:1075
+#: builtin/checkout.c:1082

 #, 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:1107 builtin/checkout.c:1109 builtin/clone.c:116
-#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:387
-#: builtin/worktree.c:389
+#: builtin/checkout.c:1114 builtin/checkout.c:1116 builtin/clone.c:118
+#: builtin/remote.c:167 builtin/remote.c:169 builtin/worktree.c:433
+#: builtin/worktree.c:435

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

-#: builtin/checkout.c:1108
+#: builtin/checkout.c:1115

 msgid "create and checkout a new branch"
 msgstr ""
 
 msgid "create and checkout a new branch"
 msgstr ""
 

-#: builtin/checkout.c:1110
+#: builtin/checkout.c:1117

 msgid "create/reset and checkout a branch"
 msgstr ""
 
 msgid "create/reset and checkout a branch"
 msgstr ""
 

-#: builtin/checkout.c:1111
+#: builtin/checkout.c:1118

 msgid "create reflog for new branch"
 msgstr ""
 
 msgid "create reflog for new branch"
 msgstr ""
 

-#: builtin/checkout.c:1112 builtin/worktree.c:391
+#: builtin/checkout.c:1119 builtin/worktree.c:437

 msgid "detach HEAD at named commit"
 msgstr ""
 
 msgid "detach HEAD at named commit"
 msgstr ""
 

-#: builtin/checkout.c:1113
+#: builtin/checkout.c:1120

 msgid "set upstream info for new branch"
 msgstr ""
 
 msgid "set upstream info for new branch"
 msgstr ""
 

-#: builtin/checkout.c:1115
+#: builtin/checkout.c:1122

 msgid "new-branch"
 msgstr ""
 
 msgid "new-branch"
 msgstr ""
 

-#: builtin/checkout.c:1115
+#: builtin/checkout.c:1122

 msgid "new unparented branch"
 msgstr ""
 
 msgid "new unparented branch"
 msgstr ""
 

-#: builtin/checkout.c:1116
+#: builtin/checkout.c:1123

 msgid "checkout our version for unmerged files"
 msgstr ""
 
 msgid "checkout our version for unmerged files"
 msgstr ""
 

-#: builtin/checkout.c:1118
+#: builtin/checkout.c:1125

 msgid "checkout their version for unmerged files"
 msgstr ""
 
 msgid "checkout their version for unmerged files"
 msgstr ""
 

-#: builtin/checkout.c:1120
+#: builtin/checkout.c:1127

 msgid "force checkout (throw away local modifications)"
 msgstr ""
 
 msgid "force checkout (throw away local modifications)"
 msgstr ""
 

-#: builtin/checkout.c:1122
+#: builtin/checkout.c:1129

 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:1124 builtin/merge.c:239
+#: builtin/checkout.c:1131 builtin/merge.c:240

 msgid "update ignored files (default)"
 msgstr ""
 
 msgid "update ignored files (default)"
 msgstr ""
 

-#: builtin/checkout.c:1126 builtin/log.c:1499 parse-options.h:263
+#: builtin/checkout.c:1133 builtin/log.c:1499 parse-options.h:264

 msgid "style"
 msgstr ""
 
 msgid "style"
 msgstr ""
 

-#: builtin/checkout.c:1127
+#: builtin/checkout.c:1134

 msgid "conflict style (merge or diff3)"
 msgstr ""
 
 msgid "conflict style (merge or diff3)"
 msgstr ""
 

-#: builtin/checkout.c:1130
+#: builtin/checkout.c:1137

 msgid "do not limit pathspecs to sparse entries only"
 msgstr ""
 
 msgid "do not limit pathspecs to sparse entries only"
 msgstr ""
 

-#: builtin/checkout.c:1132
+#: builtin/checkout.c:1139

 msgid "second guess 'git checkout <no-such-branch>'"
 msgstr ""
 
 msgid "second guess 'git checkout <no-such-branch>'"
 msgstr ""
 

-#: builtin/checkout.c:1134
+#: builtin/checkout.c:1141

 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:1138 builtin/clone.c:83 builtin/fetch.c:150
-#: builtin/merge.c:236 builtin/pull.c:123 builtin/push.c:556
-#: builtin/send-pack.c:173
+#: builtin/checkout.c:1145 builtin/clone.c:85 builtin/fetch.c:149
+#: builtin/merge.c:237 builtin/pull.c:128 builtin/push.c:572
+#: builtin/send-pack.c:174

 msgid "force progress reporting"
 msgstr ""
 
 msgid "force progress reporting"
 msgstr ""
 

-#: builtin/checkout.c:1168
+#: builtin/checkout.c:1175

 msgid "-b, -B and --orphan are mutually exclusive"
 msgstr ""
 
 msgid "-b, -B and --orphan are mutually exclusive"
 msgstr ""
 

-#: builtin/checkout.c:1185
+#: builtin/checkout.c:1192

 msgid "--track needs a branch name"
 msgstr ""
 
 msgid "--track needs a branch name"
 msgstr ""
 

-#: builtin/checkout.c:1190
+#: builtin/checkout.c:1197

 msgid "Missing branch name; try -b"
 msgstr ""
 
 msgid "Missing branch name; try -b"
 msgstr ""
 

-#: builtin/checkout.c:1226
+#: builtin/checkout.c:1233

 msgid "invalid path specification"
 msgstr ""
 
 msgid "invalid path specification"
 msgstr ""
 

-#: builtin/checkout.c:1233
+#: builtin/checkout.c:1240

 #, c-format
 msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
 msgstr ""
 
 #, c-format
 msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
 msgstr ""
 

-#: builtin/checkout.c:1237
+#: builtin/checkout.c:1244

 #, 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:1241
+#: builtin/checkout.c:1248

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


@@ -6314,7 +6605,7 @@ msgstr ""
 msgid "failed to remove %s"
 msgstr ""
 
 msgid "failed to remove %s"
 msgstr ""
 

-#: builtin/clean.c:302 git-add--interactive.perl:572
+#: builtin/clean.c:302 git-add--interactive.perl:579

 #, c-format
 msgid ""
 "Prompt help:\n"
 #, c-format
 msgid ""
 "Prompt help:\n"


@@ -6323,7 +6614,7 @@ msgid ""
 "           - (empty) select nothing\n"
 msgstr ""
 
 "           - (empty) select nothing\n"
 msgstr ""
 

-#: builtin/clean.c:306 git-add--interactive.perl:581
+#: builtin/clean.c:306 git-add--interactive.perl:588

 #, c-format
 msgid ""
 "Prompt help:\n"
 #, c-format
 msgid ""
 "Prompt help:\n"


@@ -6336,8 +6627,8 @@ msgid ""
 "           - (empty) finish selecting\n"
 msgstr ""
 
 "           - (empty) finish selecting\n"
 msgstr ""
 

-#: builtin/clean.c:522 git-add--interactive.perl:547
-#: git-add--interactive.perl:552
+#: builtin/clean.c:522 git-add--interactive.perl:554
+#: git-add--interactive.perl:559

 #, c-format, perl-format
 msgid "Huh (%s)?\n"
 msgstr ""
 #, c-format, perl-format
 msgid "Huh (%s)?\n"
 msgstr ""


@@ -6362,7 +6653,7 @@ msgstr ""
 msgid "Remove %s [y/N]? "
 msgstr ""
 
 msgid "Remove %s [y/N]? "
 msgstr ""
 

-#: builtin/clean.c:788 git-add--interactive.perl:1710
+#: builtin/clean.c:788 git-add--interactive.perl:1717

 #, c-format
 msgid "Bye.\n"
 msgstr ""
 #, c-format
 msgid "Bye.\n"
 msgstr ""


@@ -6378,11 +6669,11 @@ msgid ""
 "?                   - help for prompt selection"
 msgstr ""
 
 "?                   - help for prompt selection"
 msgstr ""
 

-#: builtin/clean.c:823 git-add--interactive.perl:1786
+#: builtin/clean.c:823 git-add--interactive.perl:1793

 msgid "*** Commands ***"
 msgstr ""
 
 msgid "*** Commands ***"
 msgstr ""
 

-#: builtin/clean.c:824 git-add--interactive.perl:1783
+#: builtin/clean.c:824 git-add--interactive.perl:1790

 msgid "What now"
 msgstr ""
 
 msgid "What now"
 msgstr ""
 


@@ -6447,284 +6738,286 @@ msgid ""
 "refusing to clean"
 msgstr ""
 
 "refusing to clean"
 msgstr ""
 

-#: builtin/clone.c:40
+#: builtin/clone.c:42

 msgid "git clone [<options>] [--] <repo> [<dir>]"
 msgstr ""
 
 msgid "git clone [<options>] [--] <repo> [<dir>]"
 msgstr ""
 

-#: builtin/clone.c:85
+#: builtin/clone.c:87

 msgid "don't create a checkout"
 msgstr ""
 
 msgid "don't create a checkout"
 msgstr ""
 

-#: builtin/clone.c:86 builtin/clone.c:88 builtin/init-db.c:479
+#: builtin/clone.c:88 builtin/clone.c:90 builtin/init-db.c:479

 msgid "create a bare repository"
 msgstr ""
 
 msgid "create a bare repository"
 msgstr ""
 

-#: builtin/clone.c:90
+#: builtin/clone.c:92

 msgid "create a mirror repository (implies bare)"
 msgstr ""
 
 msgid "create a mirror repository (implies bare)"
 msgstr ""
 

-#: builtin/clone.c:92
+#: builtin/clone.c:94

 msgid "to clone from a local repository"
 msgstr ""
 
 msgid "to clone from a local repository"
 msgstr ""
 

-#: builtin/clone.c:94
+#: builtin/clone.c:96

 msgid "don't use local hardlinks, always copy"
 msgstr ""
 
 msgid "don't use local hardlinks, always copy"
 msgstr ""
 

-#: builtin/clone.c:96
+#: builtin/clone.c:98

 msgid "setup as shared repository"
 msgstr ""
 
 msgid "setup as shared repository"
 msgstr ""
 

-#: builtin/clone.c:98 builtin/clone.c:102
+#: builtin/clone.c:100 builtin/clone.c:104

 msgid "pathspec"
 msgstr ""
 
 msgid "pathspec"
 msgstr ""
 

-#: builtin/clone.c:98 builtin/clone.c:102
+#: builtin/clone.c:100 builtin/clone.c:104

 msgid "initialize submodules in the clone"
 msgstr ""
 
 msgid "initialize submodules in the clone"
 msgstr ""
 

-#: builtin/clone.c:105
+#: builtin/clone.c:107

 msgid "number of submodules cloned in parallel"
 msgstr ""
 
 msgid "number of submodules cloned in parallel"
 msgstr ""
 

-#: builtin/clone.c:106 builtin/init-db.c:476
+#: builtin/clone.c:108 builtin/init-db.c:476

 msgid "template-directory"
 msgstr ""
 
 msgid "template-directory"
 msgstr ""
 

-#: builtin/clone.c:107 builtin/init-db.c:477
+#: builtin/clone.c:109 builtin/init-db.c:477

 msgid "directory from which templates will be used"
 msgstr ""
 
 msgid "directory from which templates will be used"
 msgstr ""
 

-#: builtin/clone.c:109 builtin/clone.c:111 builtin/submodule--helper.c:1210
-#: builtin/submodule--helper.c:1577
+#: builtin/clone.c:111 builtin/clone.c:113 builtin/submodule--helper.c:1223
+#: builtin/submodule--helper.c:1594

 msgid "reference repository"
 msgstr ""
 
 msgid "reference repository"
 msgstr ""
 

-#: builtin/clone.c:113
+#: builtin/clone.c:115 builtin/submodule--helper.c:1225
+#: builtin/submodule--helper.c:1596

 msgid "use --reference only while cloning"
 msgstr ""
 
 msgid "use --reference only while cloning"
 msgstr ""
 

-#: builtin/clone.c:114 builtin/column.c:27 builtin/merge-file.c:44
+#: builtin/clone.c:116 builtin/column.c:27 builtin/merge-file.c:44
+#: builtin/pack-objects.c:3166 builtin/repack.c:213

 msgid "name"
 msgstr ""
 
 msgid "name"
 msgstr ""
 

-#: builtin/clone.c:115
+#: builtin/clone.c:117

 msgid "use <name> instead of 'origin' to track upstream"
 msgstr ""
 
 msgid "use <name> instead of 'origin' to track upstream"
 msgstr ""
 

-#: builtin/clone.c:117
+#: builtin/clone.c:119

 msgid "checkout <branch> instead of the remote's HEAD"
 msgstr ""
 
 msgid "checkout <branch> instead of the remote's HEAD"
 msgstr ""
 

-#: builtin/clone.c:119
+#: builtin/clone.c:121

 msgid "path to git-upload-pack on the remote"
 msgstr ""
 
 msgid "path to git-upload-pack on the remote"
 msgstr ""
 

-#: builtin/clone.c:120 builtin/fetch.c:151 builtin/grep.c:813
-#: builtin/pull.c:211
+#: builtin/clone.c:122 builtin/fetch.c:150 builtin/grep.c:813
+#: builtin/pull.c:216

 msgid "depth"
 msgstr ""
 
 msgid "depth"
 msgstr ""
 

-#: builtin/clone.c:121
+#: builtin/clone.c:123

 msgid "create a shallow clone of that depth"
 msgstr ""
 
 msgid "create a shallow clone of that depth"
 msgstr ""
 

-#: builtin/clone.c:122 builtin/fetch.c:153 builtin/pack-objects.c:3017
+#: builtin/clone.c:124 builtin/fetch.c:152 builtin/pack-objects.c:3157

 #: parse-options.h:154
 msgid "time"
 msgstr ""
 
 #: parse-options.h:154
 msgid "time"
 msgstr ""
 

-#: builtin/clone.c:123
+#: builtin/clone.c:125

 msgid "create a shallow clone since a specific time"
 msgstr ""
 
 msgid "create a shallow clone since a specific time"
 msgstr ""
 

-#: builtin/clone.c:124 builtin/fetch.c:155
+#: builtin/clone.c:126 builtin/fetch.c:154

 msgid "revision"
 msgstr ""
 
 msgid "revision"
 msgstr ""
 

-#: builtin/clone.c:125 builtin/fetch.c:156
+#: builtin/clone.c:127 builtin/fetch.c:155

 msgid "deepen history of shallow clone, excluding rev"
 msgstr ""
 
 msgid "deepen history of shallow clone, excluding rev"
 msgstr ""
 

-#: builtin/clone.c:127
+#: builtin/clone.c:129

 msgid "clone only one branch, HEAD or --branch"
 msgstr ""
 
 msgid "clone only one branch, HEAD or --branch"
 msgstr ""
 

-#: builtin/clone.c:129
+#: builtin/clone.c:131

 msgid "don't clone any tags, and make later fetches not to follow them"
 msgstr ""
 
 msgid "don't clone any tags, and make later fetches not to follow them"
 msgstr ""
 

-#: builtin/clone.c:131
+#: builtin/clone.c:133

 msgid "any cloned submodules will be shallow"
 msgstr ""
 
 msgid "any cloned submodules will be shallow"
 msgstr ""
 

-#: builtin/clone.c:132 builtin/init-db.c:485
+#: builtin/clone.c:134 builtin/init-db.c:485

 msgid "gitdir"
 msgstr ""
 
 msgid "gitdir"
 msgstr ""
 

-#: builtin/clone.c:133 builtin/init-db.c:486
+#: builtin/clone.c:135 builtin/init-db.c:486

 msgid "separate git dir from working tree"
 msgstr ""
 
 msgid "separate git dir from working tree"
 msgstr ""
 

-#: builtin/clone.c:134
+#: builtin/clone.c:136

 msgid "key=value"
 msgstr ""
 
 msgid "key=value"
 msgstr ""
 

-#: builtin/clone.c:135
+#: builtin/clone.c:137

 msgid "set config inside the new repository"
 msgstr ""
 
 msgid "set config inside the new repository"
 msgstr ""
 

-#: builtin/clone.c:136 builtin/fetch.c:173 builtin/pull.c:224
-#: builtin/push.c:567
+#: builtin/clone.c:138 builtin/fetch.c:173 builtin/pull.c:229
+#: builtin/push.c:583

 msgid "use IPv4 addresses only"
 msgstr ""
 
 msgid "use IPv4 addresses only"
 msgstr ""
 

-#: builtin/clone.c:138 builtin/fetch.c:175 builtin/pull.c:227
-#: builtin/push.c:569
+#: builtin/clone.c:140 builtin/fetch.c:175 builtin/pull.c:232
+#: builtin/push.c:585

 msgid "use IPv6 addresses only"
 msgstr ""
 
 msgid "use IPv6 addresses only"
 msgstr ""
 

-#: builtin/clone.c:276
+#: builtin/clone.c:278

 msgid ""
 "No directory name could be guessed.\n"
 "Please specify a directory on the command line"
 msgstr ""
 
 msgid ""
 "No directory name could be guessed.\n"
 "Please specify a directory on the command line"
 msgstr ""
 

-#: builtin/clone.c:329
+#: builtin/clone.c:331

 #, c-format
 msgid "info: Could not add alternate for '%s': %s\n"
 msgstr ""
 
 #, c-format
 msgid "info: Could not add alternate for '%s': %s\n"
 msgstr ""
 

-#: builtin/clone.c:401
+#: builtin/clone.c:403

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

-#: builtin/clone.c:409
+#: builtin/clone.c:411

 #, c-format
 msgid "%s exists and is not a directory"
 msgstr ""
 
 #, c-format
 msgid "%s exists and is not a directory"
 msgstr ""
 

-#: builtin/clone.c:423
+#: builtin/clone.c:425

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

-#: builtin/clone.c:445
+#: builtin/clone.c:447

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

-#: builtin/clone.c:449
+#: builtin/clone.c:451

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

-#: builtin/clone.c:475
+#: builtin/clone.c:477

 #, c-format
 msgid "done.\n"
 msgstr ""
 
 #, c-format
 msgid "done.\n"
 msgstr ""
 

-#: builtin/clone.c:489
+#: builtin/clone.c:491

 msgid ""
 "Clone succeeded, but checkout failed.\n"
 "You can inspect what was checked out with 'git status'\n"
 "and retry the checkout with 'git checkout -f HEAD'\n"
 msgstr ""
 
 msgid ""
 "Clone succeeded, but checkout failed.\n"
 "You can inspect what was checked out with 'git status'\n"
 "and retry the checkout with 'git checkout -f HEAD'\n"
 msgstr ""
 

-#: builtin/clone.c:566
+#: builtin/clone.c:568

 #, c-format
 msgid "Could not find remote branch %s to clone."
 msgstr ""
 
 #, c-format
 msgid "Could not find remote branch %s to clone."
 msgstr ""
 

-#: builtin/clone.c:661
+#: builtin/clone.c:663

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

-#: builtin/clone.c:677
+#: builtin/clone.c:679

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

-#: builtin/clone.c:726
+#: builtin/clone.c:728

 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
 msgstr ""
 
 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
 msgstr ""
 

-#: builtin/clone.c:756
+#: builtin/clone.c:758

 msgid "unable to checkout working tree"
 msgstr ""
 
 msgid "unable to checkout working tree"
 msgstr ""
 

-#: builtin/clone.c:801
+#: builtin/clone.c:803

 msgid "unable to write parameters to config file"
 msgstr ""
 
 msgid "unable to write parameters to config file"
 msgstr ""
 

-#: builtin/clone.c:864
+#: builtin/clone.c:866

 msgid "cannot repack to clean up"
 msgstr ""
 
 msgid "cannot repack to clean up"
 msgstr ""
 

-#: builtin/clone.c:866
+#: builtin/clone.c:868

 msgid "cannot unlink temporary alternates file"
 msgstr ""
 
 msgid "cannot unlink temporary alternates file"
 msgstr ""
 

-#: builtin/clone.c:906 builtin/receive-pack.c:1946
+#: builtin/clone.c:907 builtin/receive-pack.c:1947

 msgid "Too many arguments."
 msgstr ""
 
 msgid "Too many arguments."
 msgstr ""
 

-#: builtin/clone.c:910
+#: builtin/clone.c:911

 msgid "You must specify a repository to clone."
 msgstr ""
 
 msgid "You must specify a repository to clone."
 msgstr ""
 

-#: builtin/clone.c:923
+#: builtin/clone.c:924

 #, c-format
 msgid "--bare and --origin %s options are incompatible."
 msgstr ""
 
 #, c-format
 msgid "--bare and --origin %s options are incompatible."
 msgstr ""
 

-#: builtin/clone.c:926
+#: builtin/clone.c:927

 msgid "--bare and --separate-git-dir are incompatible."
 msgstr ""
 
 msgid "--bare and --separate-git-dir are incompatible."
 msgstr ""
 

-#: builtin/clone.c:939
+#: builtin/clone.c:940

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

-#: builtin/clone.c:945 builtin/fetch.c:1455
+#: builtin/clone.c:946 builtin/fetch.c:1460

 #, c-format
 msgid "depth %s is not a positive number"
 msgstr ""
 
 #, c-format
 msgid "depth %s is not a positive number"
 msgstr ""
 

-#: builtin/clone.c:955
+#: builtin/clone.c:956

 #, c-format
 msgid "destination path '%s' already exists and is not an empty directory."
 msgstr ""
 
 #, c-format
 msgid "destination path '%s' already exists and is not an empty directory."
 msgstr ""
 

-#: builtin/clone.c:965
+#: builtin/clone.c:966

 #, c-format
 msgid "working tree '%s' already exists."
 msgstr ""
 
 #, c-format
 msgid "working tree '%s' already exists."
 msgstr ""
 

-#: builtin/clone.c:980 builtin/clone.c:1001 builtin/difftool.c:270
-#: builtin/worktree.c:255 builtin/worktree.c:285
+#: builtin/clone.c:981 builtin/clone.c:1002 builtin/difftool.c:270
+#: builtin/worktree.c:246 builtin/worktree.c:276

 #, c-format
 msgid "could not create leading directories of '%s'"
 msgstr ""
 
 #, c-format
 msgid "could not create leading directories of '%s'"
 msgstr ""
 

-#: builtin/clone.c:985
+#: builtin/clone.c:986

 #, c-format
 msgid "could not create work tree dir '%s'"
 msgstr ""
 
 #, c-format
 msgid "could not create work tree dir '%s'"
 msgstr ""
 

-#: builtin/clone.c:1005
+#: builtin/clone.c:1006

 #, c-format
 msgid "Cloning into bare repository '%s'...\n"
 msgstr ""
 
 #, c-format
 msgid "Cloning into bare repository '%s'...\n"
 msgstr ""
 

-#: builtin/clone.c:1007
+#: builtin/clone.c:1008

 #, c-format
 msgid "Cloning into '%s'...\n"
 msgstr ""
 
 #, c-format
 msgid "Cloning into '%s'...\n"
 msgstr ""
 

-#: builtin/clone.c:1031
+#: builtin/clone.c:1032

 msgid ""
 "clone --recursive is not compatible with both --reference and --reference-if-"
 "able"
 msgid ""
 "clone --recursive is not compatible with both --reference and --reference-if-"
 "able"


@@ -6791,7 +7084,7 @@ msgstr ""
 msgid "Padding space between columns"
 msgstr ""
 
 msgid "Padding space between columns"
 msgstr ""
 

-#: builtin/column.c:52
+#: builtin/column.c:51

 msgid "--command must be the first argument"
 msgstr ""
 
 msgid "--command must be the first argument"
 msgstr ""
 


@@ -6833,98 +7126,98 @@ msgid ""
 "the remaining commits.\n"
 msgstr ""
 
 "the remaining commits.\n"
 msgstr ""
 

-#: builtin/commit.c:284
+#: builtin/commit.c:293

 msgid "failed to unpack HEAD tree object"
 msgstr ""
 
 msgid "failed to unpack HEAD tree object"
 msgstr ""
 

-#: builtin/commit.c:325
+#: builtin/commit.c:334

 msgid "unable to create temporary index"
 msgstr ""
 
 msgid "unable to create temporary index"
 msgstr ""
 

-#: builtin/commit.c:331
+#: builtin/commit.c:340

 msgid "interactive add failed"
 msgstr ""
 
 msgid "interactive add failed"
 msgstr ""
 

-#: builtin/commit.c:344
+#: builtin/commit.c:353

 msgid "unable to update temporary index"
 msgstr ""
 
 msgid "unable to update temporary index"
 msgstr ""
 

-#: builtin/commit.c:346
+#: builtin/commit.c:355

 msgid "Failed to update main cache tree"
 msgstr ""
 
 msgid "Failed to update main cache tree"
 msgstr ""
 

-#: builtin/commit.c:371 builtin/commit.c:395 builtin/commit.c:444
+#: builtin/commit.c:380 builtin/commit.c:403 builtin/commit.c:449

 msgid "unable to write new_index file"
 msgstr ""
 
 msgid "unable to write new_index file"
 msgstr ""
 

-#: builtin/commit.c:427
+#: builtin/commit.c:432

 msgid "cannot do a partial commit during a merge."
 msgstr ""
 
 msgid "cannot do a partial commit during a merge."
 msgstr ""
 

-#: builtin/commit.c:429
+#: builtin/commit.c:434

 msgid "cannot do a partial commit during a cherry-pick."
 msgstr ""
 
 msgid "cannot do a partial commit during a cherry-pick."
 msgstr ""
 

-#: builtin/commit.c:437
+#: builtin/commit.c:442

 msgid "cannot read the index"
 msgstr ""
 
 msgid "cannot read the index"
 msgstr ""
 

-#: builtin/commit.c:456
+#: builtin/commit.c:461

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

-#: builtin/commit.c:553
+#: builtin/commit.c:558

 #, c-format
 msgid "commit '%s' lacks author header"
 msgstr ""
 
 #, c-format
 msgid "commit '%s' lacks author header"
 msgstr ""
 

-#: builtin/commit.c:555
+#: builtin/commit.c:560

 #, c-format
 msgid "commit '%s' has malformed author line"
 msgstr ""
 
 #, c-format
 msgid "commit '%s' has malformed author line"
 msgstr ""
 

-#: builtin/commit.c:574
+#: builtin/commit.c:579

 msgid "malformed --author parameter"
 msgstr ""
 
 msgid "malformed --author parameter"
 msgstr ""
 

-#: builtin/commit.c:626
+#: builtin/commit.c:631

 msgid ""
 "unable to select a comment character that is not used\n"
 "in the current commit message"
 msgstr ""
 
 msgid ""
 "unable to select a comment character that is not used\n"
 "in the current commit message"
 msgstr ""
 

-#: builtin/commit.c:663 builtin/commit.c:696 builtin/commit.c:1024
+#: builtin/commit.c:668 builtin/commit.c:701 builtin/commit.c:1029

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

-#: builtin/commit.c:675 builtin/shortlog.c:309
+#: builtin/commit.c:680 builtin/shortlog.c:316

 #, c-format
 msgid "(reading log message from standard input)\n"
 msgstr ""
 
 #, c-format
 msgid "(reading log message from standard input)\n"
 msgstr ""
 

-#: builtin/commit.c:677
+#: builtin/commit.c:682

 msgid "could not read log from standard input"
 msgstr ""
 
 msgid "could not read log from standard input"
 msgstr ""
 

-#: builtin/commit.c:681
+#: builtin/commit.c:686

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

-#: builtin/commit.c:710 builtin/commit.c:718
+#: builtin/commit.c:715 builtin/commit.c:723

 msgid "could not read SQUASH_MSG"
 msgstr ""
 
 msgid "could not read SQUASH_MSG"
 msgstr ""
 

-#: builtin/commit.c:715
+#: builtin/commit.c:720

 msgid "could not read MERGE_MSG"
 msgstr ""
 
 msgid "could not read MERGE_MSG"
 msgstr ""
 

-#: builtin/commit.c:769
+#: builtin/commit.c:774

 msgid "could not write commit template"
 msgstr ""
 
 msgid "could not write commit template"
 msgstr ""
 

-#: builtin/commit.c:787
+#: builtin/commit.c:792

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


@@ -6934,7 +7227,7 @@ msgid ""
 "and try again.\n"
 msgstr ""
 
 "and try again.\n"
 msgstr ""
 

-#: builtin/commit.c:792
+#: builtin/commit.c:797

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


@@ -6944,14 +7237,14 @@ msgid ""
 "and try again.\n"
 msgstr ""
 
 "and try again.\n"
 msgstr ""
 

-#: builtin/commit.c:805
+#: builtin/commit.c:810

 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
 "with '%c' will be ignored, and an empty message aborts the commit.\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
 "with '%c' will be ignored, and an empty message aborts the commit.\n"
 msgstr ""
 

-#: builtin/commit.c:813
+#: builtin/commit.c:818

 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"


@@ -6959,484 +7252,554 @@ msgid ""
 "An empty message aborts the commit.\n"
 msgstr ""
 
 "An empty message aborts the commit.\n"
 msgstr ""
 

-#: builtin/commit.c:830
+#: builtin/commit.c:835

 #, c-format
 msgid "%sAuthor:    %.*s <%.*s>"
 msgstr ""
 
 #, c-format
 msgid "%sAuthor:    %.*s <%.*s>"
 msgstr ""
 

-#: builtin/commit.c:838
+#: builtin/commit.c:843

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

-#: builtin/commit.c:845
+#: builtin/commit.c:850

 #, c-format
 msgid "%sCommitter: %.*s <%.*s>"
 msgstr ""
 
 #, c-format
 msgid "%sCommitter: %.*s <%.*s>"
 msgstr ""
 

-#: builtin/commit.c:862
+#: builtin/commit.c:867

 msgid "Cannot read index"
 msgstr ""
 
 msgid "Cannot read index"
 msgstr ""
 

-#: builtin/commit.c:928
+#: builtin/commit.c:933

 msgid "Error building trees"
 msgstr ""
 
 msgid "Error building trees"
 msgstr ""
 

-#: builtin/commit.c:942 builtin/tag.c:256
+#: builtin/commit.c:947 builtin/tag.c:257

 #, c-format
 msgid "Please supply the message using either -m or -F option.\n"
 msgstr ""
 
 #, c-format
 msgid "Please supply the message using either -m or -F option.\n"
 msgstr ""
 

-#: builtin/commit.c:986
+#: builtin/commit.c:991

 #, c-format
 msgid "--author '%s' is not 'Name <email>' and matches no existing author"
 msgstr ""
 
 #, c-format
 msgid "--author '%s' is not 'Name <email>' and matches no existing author"
 msgstr ""
 

-#: builtin/commit.c:1000
+#: builtin/commit.c:1005

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

-#: builtin/commit.c:1014 builtin/commit.c:1264
+#: builtin/commit.c:1019 builtin/commit.c:1269

 #, c-format
 msgid "Invalid untracked files mode '%s'"
 msgstr ""
 
 #, c-format
 msgid "Invalid untracked files mode '%s'"
 msgstr ""
 

-#: builtin/commit.c:1052
+#: builtin/commit.c:1057

 msgid "--long and -z are incompatible"
 msgstr ""
 
 msgid "--long and -z are incompatible"
 msgstr ""
 

-#: builtin/commit.c:1085
+#: builtin/commit.c:1090

 msgid "Using both --reset-author and --author does not make sense"
 msgstr ""
 
 msgid "Using both --reset-author and --author does not make sense"
 msgstr ""
 

-#: builtin/commit.c:1094
+#: builtin/commit.c:1099

 msgid "You have nothing to amend."
 msgstr ""
 
 msgid "You have nothing to amend."
 msgstr ""
 

-#: builtin/commit.c:1097
+#: builtin/commit.c:1102

 msgid "You are in the middle of a merge -- cannot amend."
 msgstr ""
 
 msgid "You are in the middle of a merge -- cannot amend."
 msgstr ""
 

-#: builtin/commit.c:1099
+#: builtin/commit.c:1104

 msgid "You are in the middle of a cherry-pick -- cannot amend."
 msgstr ""
 
 msgid "You are in the middle of a cherry-pick -- cannot amend."
 msgstr ""
 

-#: builtin/commit.c:1102
+#: builtin/commit.c:1107

 msgid "Options --squash and --fixup cannot be used together"
 msgstr ""
 
 msgid "Options --squash and --fixup cannot be used together"
 msgstr ""
 

-#: builtin/commit.c:1112
+#: builtin/commit.c:1117

 msgid "Only one of -c/-C/-F/--fixup can be used."
 msgstr ""
 
 msgid "Only one of -c/-C/-F/--fixup can be used."
 msgstr ""
 

-#: builtin/commit.c:1114
+#: builtin/commit.c:1119

 msgid "Option -m cannot be combined with -c/-C/-F."
 msgstr ""
 
 msgid "Option -m cannot be combined with -c/-C/-F."
 msgstr ""
 

-#: builtin/commit.c:1122
+#: builtin/commit.c:1127

 msgid "--reset-author can be used only with -C, -c or --amend."
 msgstr ""
 
 msgid "--reset-author can be used only with -C, -c or --amend."
 msgstr ""
 

-#: builtin/commit.c:1139
+#: builtin/commit.c:1144

 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
 msgstr ""
 
 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
 msgstr ""
 

-#: builtin/commit.c:1141
+#: builtin/commit.c:1146

 msgid "No paths with --include/--only does not make sense."
 msgstr ""
 
 msgid "No paths with --include/--only does not make sense."
 msgstr ""
 

-#: builtin/commit.c:1155 builtin/tag.c:542
+#: builtin/commit.c:1160 builtin/tag.c:543

 #, c-format
 msgid "Invalid cleanup mode %s"
 msgstr ""
 
 #, c-format
 msgid "Invalid cleanup mode %s"
 msgstr ""
 

-#: builtin/commit.c:1160
+#: builtin/commit.c:1165

 msgid "Paths with -a does not make sense."
 msgstr ""
 
 msgid "Paths with -a does not make sense."
 msgstr ""
 

-#: builtin/commit.c:1278 builtin/commit.c:1443
+#: builtin/commit.c:1303 builtin/commit.c:1480

 msgid "show status concisely"
 msgstr ""
 
 msgid "show status concisely"
 msgstr ""
 

-#: builtin/commit.c:1280 builtin/commit.c:1445
+#: builtin/commit.c:1305 builtin/commit.c:1482

 msgid "show branch information"
 msgstr ""
 
 msgid "show branch information"
 msgstr ""
 

-#: builtin/commit.c:1282
+#: builtin/commit.c:1307

 msgid "show stash information"
 msgstr ""
 
 msgid "show stash information"
 msgstr ""
 

-#: builtin/commit.c:1284 builtin/commit.c:1447
+#: builtin/commit.c:1309 builtin/commit.c:1484

 msgid "compute full ahead/behind values"
 msgstr ""
 
 msgid "compute full ahead/behind values"
 msgstr ""
 

-#: builtin/commit.c:1286
+#: builtin/commit.c:1311

 msgid "version"
 msgstr ""
 
 msgid "version"
 msgstr ""
 

-#: builtin/commit.c:1286 builtin/commit.c:1449 builtin/push.c:542
-#: builtin/worktree.c:541
+#: builtin/commit.c:1311 builtin/commit.c:1486 builtin/push.c:558
+#: builtin/worktree.c:581

 msgid "machine-readable output"
 msgstr ""
 
 msgid "machine-readable output"
 msgstr ""
 

-#: builtin/commit.c:1289 builtin/commit.c:1451
+#: builtin/commit.c:1314 builtin/commit.c:1488

 msgid "show status in long format (default)"
 msgstr ""
 
 msgid "show status in long format (default)"
 msgstr ""
 

-#: builtin/commit.c:1292 builtin/commit.c:1454
+#: builtin/commit.c:1317 builtin/commit.c:1491

 msgid "terminate entries with NUL"
 msgstr ""
 
 msgid "terminate entries with NUL"
 msgstr ""
 

-#: builtin/commit.c:1294 builtin/commit.c:1298 builtin/commit.c:1457
-#: builtin/fast-export.c:999 builtin/fast-export.c:1002 builtin/tag.c:396
+#: builtin/commit.c:1319 builtin/commit.c:1323 builtin/commit.c:1494
+#: builtin/fast-export.c:1001 builtin/fast-export.c:1004 builtin/tag.c:397

 msgid "mode"
 msgstr ""
 
 msgid "mode"
 msgstr ""
 

-#: builtin/commit.c:1295 builtin/commit.c:1457
+#: builtin/commit.c:1320 builtin/commit.c:1494

 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:1299
+#: builtin/commit.c:1324

 msgid ""
 "show ignored files, optional modes: traditional, matching, no. (Default: "
 "traditional)"
 msgstr ""
 
 msgid ""
 "show ignored files, optional modes: traditional, matching, no. (Default: "
 "traditional)"
 msgstr ""
 

-#: builtin/commit.c:1301 parse-options.h:167
+#: builtin/commit.c:1326 parse-options.h:167

 msgid "when"
 msgstr ""
 
 msgid "when"
 msgstr ""
 

-#: builtin/commit.c:1302
+#: builtin/commit.c:1327

 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:1304
+#: builtin/commit.c:1329

 msgid "list untracked files in columns"
 msgstr ""
 
 msgid "list untracked files in columns"
 msgstr ""
 

-#: builtin/commit.c:1323
+#: builtin/commit.c:1330
+msgid "do not detect renames"
+msgstr ""
+
+#: builtin/commit.c:1332
+msgid "detect renames, optionally set similarity index"
+msgstr ""
+
+#: builtin/commit.c:1352

 msgid "Unsupported combination of ignored and untracked-files arguments"
 msgstr ""
 
 msgid "Unsupported combination of ignored and untracked-files arguments"
 msgstr ""
 

-#: builtin/commit.c:1413
+#: builtin/commit.c:1450

 msgid "suppress summary after successful commit"
 msgstr ""
 
 msgid "suppress summary after successful commit"
 msgstr ""
 

-#: builtin/commit.c:1414
+#: builtin/commit.c:1451

 msgid "show diff in commit message template"
 msgstr ""
 
 msgid "show diff in commit message template"
 msgstr ""
 

-#: builtin/commit.c:1416
+#: builtin/commit.c:1453

 msgid "Commit message options"
 msgstr ""
 
 msgid "Commit message options"
 msgstr ""
 

-#: builtin/commit.c:1417 builtin/tag.c:393
+#: builtin/commit.c:1454 builtin/tag.c:394

 msgid "read message from file"
 msgstr ""
 
 msgid "read message from file"
 msgstr ""
 

-#: builtin/commit.c:1418
+#: builtin/commit.c:1455

 msgid "author"
 msgstr ""
 
 msgid "author"
 msgstr ""
 

-#: builtin/commit.c:1418
+#: builtin/commit.c:1455

 msgid "override author for commit"
 msgstr ""
 
 msgid "override author for commit"
 msgstr ""
 

-#: builtin/commit.c:1419 builtin/gc.c:359
+#: builtin/commit.c:1456 builtin/gc.c:501

 msgid "date"
 msgstr ""
 
 msgid "date"
 msgstr ""
 

-#: builtin/commit.c:1419
+#: builtin/commit.c:1456

 msgid "override date for commit"
 msgstr ""
 
 msgid "override date for commit"
 msgstr ""
 

-#: builtin/commit.c:1420 builtin/merge.c:226 builtin/notes.c:402
-#: builtin/notes.c:565 builtin/tag.c:391
+#: builtin/commit.c:1457 builtin/merge.c:227 builtin/notes.c:402
+#: builtin/notes.c:565 builtin/tag.c:392

 msgid "message"
 msgstr ""
 
 msgid "message"
 msgstr ""
 

-#: builtin/commit.c:1420
+#: builtin/commit.c:1457

 msgid "commit message"
 msgstr ""
 
 msgid "commit message"
 msgstr ""
 

-#: builtin/commit.c:1421 builtin/commit.c:1422 builtin/commit.c:1423
-#: builtin/commit.c:1424 parse-options.h:269 ref-filter.h:92
+#: builtin/commit.c:1458 builtin/commit.c:1459 builtin/commit.c:1460
+#: builtin/commit.c:1461 parse-options.h:270 ref-filter.h:92

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

-#: builtin/commit.c:1421
+#: builtin/commit.c:1458

 msgid "reuse and edit message from specified commit"
 msgstr ""
 
 msgid "reuse and edit message from specified commit"
 msgstr ""
 

-#: builtin/commit.c:1422
+#: builtin/commit.c:1459

 msgid "reuse message from specified commit"
 msgstr ""
 
 msgid "reuse message from specified commit"
 msgstr ""
 

-#: builtin/commit.c:1423
+#: builtin/commit.c:1460

 msgid "use autosquash formatted message to fixup specified commit"
 msgstr ""
 
 msgid "use autosquash formatted message to fixup specified commit"
 msgstr ""
 

-#: builtin/commit.c:1424
+#: builtin/commit.c:1461

 msgid "use autosquash formatted message to squash specified commit"
 msgstr ""
 
 msgid "use autosquash formatted message to squash specified commit"
 msgstr ""
 

-#: builtin/commit.c:1425
+#: builtin/commit.c:1462

 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:1426 builtin/log.c:1446 builtin/merge.c:240
-#: builtin/pull.c:149 builtin/revert.c:105
+#: builtin/commit.c:1463 builtin/log.c:1446 builtin/merge.c:241
+#: builtin/pull.c:154 builtin/revert.c:105

 msgid "add Signed-off-by:"
 msgstr ""
 
 msgid "add Signed-off-by:"
 msgstr ""
 

-#: builtin/commit.c:1427
+#: builtin/commit.c:1464

 msgid "use specified template file"
 msgstr ""
 
 msgid "use specified template file"
 msgstr ""
 

-#: builtin/commit.c:1428
+#: builtin/commit.c:1465

 msgid "force edit of commit"
 msgstr ""
 
 msgid "force edit of commit"
 msgstr ""
 

-#: builtin/commit.c:1429
+#: builtin/commit.c:1466

 msgid "default"
 msgstr ""
 
 msgid "default"
 msgstr ""
 

-#: builtin/commit.c:1429 builtin/tag.c:397
+#: builtin/commit.c:1466 builtin/tag.c:398

 msgid "how to strip spaces and #comments from message"
 msgstr ""
 
 msgid "how to strip spaces and #comments from message"
 msgstr ""
 

-#: builtin/commit.c:1430
+#: builtin/commit.c:1467

 msgid "include status in commit message template"
 msgstr ""
 
 msgid "include status in commit message template"
 msgstr ""
 

-#: builtin/commit.c:1432 builtin/merge.c:238 builtin/pull.c:179
+#: builtin/commit.c:1469 builtin/merge.c:239 builtin/pull.c:184

 #: builtin/revert.c:113
 msgid "GPG sign commit"
 msgstr ""
 
 #: builtin/revert.c:113
 msgid "GPG sign commit"
 msgstr ""
 

-#: builtin/commit.c:1435
+#: builtin/commit.c:1472

 msgid "Commit contents options"
 msgstr ""
 
 msgid "Commit contents options"
 msgstr ""
 

-#: builtin/commit.c:1436
+#: builtin/commit.c:1473

 msgid "commit all changed files"
 msgstr ""
 
 msgid "commit all changed files"
 msgstr ""
 

-#: builtin/commit.c:1437
+#: builtin/commit.c:1474

 msgid "add specified files to index for commit"
 msgstr ""
 
 msgid "add specified files to index for commit"
 msgstr ""
 

-#: builtin/commit.c:1438
+#: builtin/commit.c:1475

 msgid "interactively add files"
 msgstr ""
 
 msgid "interactively add files"
 msgstr ""
 

-#: builtin/commit.c:1439
+#: builtin/commit.c:1476

 msgid "interactively add changes"
 msgstr ""
 
 msgid "interactively add changes"
 msgstr ""
 

-#: builtin/commit.c:1440
+#: builtin/commit.c:1477

 msgid "commit only specified files"
 msgstr ""
 
 msgid "commit only specified files"
 msgstr ""
 

-#: builtin/commit.c:1441
+#: builtin/commit.c:1478

 msgid "bypass pre-commit and commit-msg hooks"
 msgstr ""
 
 msgid "bypass pre-commit and commit-msg hooks"
 msgstr ""
 

-#: builtin/commit.c:1442
+#: builtin/commit.c:1479

 msgid "show what would be committed"
 msgstr ""
 
 msgid "show what would be committed"
 msgstr ""
 

-#: builtin/commit.c:1455
+#: builtin/commit.c:1492

 msgid "amend previous commit"
 msgstr ""
 
 msgid "amend previous commit"
 msgstr ""
 

-#: builtin/commit.c:1456
+#: builtin/commit.c:1493

 msgid "bypass post-rewrite hook"
 msgstr ""
 
 msgid "bypass post-rewrite hook"
 msgstr ""
 

-#: builtin/commit.c:1461
+#: builtin/commit.c:1498

 msgid "ok to record an empty change"
 msgstr ""
 
 msgid "ok to record an empty change"
 msgstr ""
 

-#: builtin/commit.c:1463
+#: builtin/commit.c:1500

 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:1536
+#: builtin/commit.c:1573

 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr ""
 
 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr ""
 

-#: builtin/commit.c:1543
+#: builtin/commit.c:1580

 msgid "could not read MERGE_MODE"
 msgstr ""
 
 msgid "could not read MERGE_MODE"
 msgstr ""
 

-#: builtin/commit.c:1562
+#: builtin/commit.c:1599

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

-#: builtin/commit.c:1573
+#: builtin/commit.c:1610

 #, 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:1578
+#: builtin/commit.c:1615

 #, 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:1613
+#: builtin/commit.c:1650

 msgid ""
 "Repository has been updated, but unable to write\n"
 "new_index file. Check that disk is not full and quota is\n"
 "not exceeded, and then \"git reset HEAD\" to recover."
 msgstr ""
 
 msgid ""
 "Repository has been updated, but unable to write\n"
 "new_index file. Check that disk is not full and quota is\n"
 "not exceeded, and then \"git reset HEAD\" to recover."
 msgstr ""
 

+#: builtin/commit-graph.c:9
+msgid "git commit-graph [--object-dir <objdir>]"
+msgstr ""
+
+#: builtin/commit-graph.c:10 builtin/commit-graph.c:16
+msgid "git commit-graph read [--object-dir <objdir>]"
+msgstr ""
+
+#: builtin/commit-graph.c:11 builtin/commit-graph.c:21
+msgid ""
+"git commit-graph write [--object-dir <objdir>] [--append] [--stdin-packs|--"
+"stdin-commits]"
+msgstr ""
+
+#: builtin/commit-graph.c:39 builtin/commit-graph.c:92
+#: builtin/commit-graph.c:147 builtin/fetch.c:161 builtin/log.c:1466
+msgid "dir"
+msgstr ""
+
+#: builtin/commit-graph.c:40 builtin/commit-graph.c:93
+#: builtin/commit-graph.c:148
+msgid "The object directory to store the graph"
+msgstr ""
+
+#: builtin/commit-graph.c:95
+msgid "scan pack-indexes listed by stdin for commits"
+msgstr ""
+
+#: builtin/commit-graph.c:97
+msgid "start walk at commits listed by stdin"
+msgstr ""
+
+#: builtin/commit-graph.c:99
+msgid "include all commits already in the commit-graph file"
+msgstr ""
+
+#: builtin/commit-graph.c:108
+msgid "cannot use both --stdin-commits and --stdin-packs"
+msgstr ""
+

 #: builtin/config.c:10
 msgid "git config [<options>]"
 msgstr ""
 
 #: builtin/config.c:10
 msgid "git config [<options>]"
 msgstr ""
 

-#: builtin/config.c:58
+#: builtin/config.c:101
+#, c-format
+msgid "unrecognized --type argument, %s"
+msgstr ""
+
+#: builtin/config.c:123

 msgid "Config file location"
 msgstr ""
 
 msgid "Config file location"
 msgstr ""
 

-#: builtin/config.c:59
+#: builtin/config.c:124

 msgid "use global config file"
 msgstr ""
 
 msgid "use global config file"
 msgstr ""
 

-#: builtin/config.c:60
+#: builtin/config.c:125

 msgid "use system config file"
 msgstr ""
 
 msgid "use system config file"
 msgstr ""
 

-#: builtin/config.c:61
+#: builtin/config.c:126

 msgid "use repository config file"
 msgstr ""
 
 msgid "use repository config file"
 msgstr ""
 

-#: builtin/config.c:62
+#: builtin/config.c:127

 msgid "use given config file"
 msgstr ""
 
 msgid "use given config file"
 msgstr ""
 

-#: builtin/config.c:63
+#: builtin/config.c:128

 msgid "blob-id"
 msgstr ""
 
 msgid "blob-id"
 msgstr ""
 

-#: builtin/config.c:63
+#: builtin/config.c:128

 msgid "read config from given blob object"
 msgstr ""
 
 msgid "read config from given blob object"
 msgstr ""
 

-#: builtin/config.c:64
+#: builtin/config.c:129

 msgid "Action"
 msgstr ""
 
 msgid "Action"
 msgstr ""
 

-#: builtin/config.c:65
+#: builtin/config.c:130

 msgid "get value: name [value-regex]"
 msgstr ""
 
 msgid "get value: name [value-regex]"
 msgstr ""
 

-#: builtin/config.c:66
+#: builtin/config.c:131

 msgid "get all values: key [value-regex]"
 msgstr ""
 
 msgid "get all values: key [value-regex]"
 msgstr ""
 

-#: builtin/config.c:67
+#: builtin/config.c:132

 msgid "get values for regexp: name-regex [value-regex]"
 msgstr ""
 
 msgid "get values for regexp: name-regex [value-regex]"
 msgstr ""
 

-#: builtin/config.c:68
+#: builtin/config.c:133

 msgid "get value specific for the URL: section[.var] URL"
 msgstr ""
 
 msgid "get value specific for the URL: section[.var] URL"
 msgstr ""
 

-#: builtin/config.c:69
+#: builtin/config.c:134

 msgid "replace all matching variables: name value [value_regex]"
 msgstr ""
 
 msgid "replace all matching variables: name value [value_regex]"
 msgstr ""
 

-#: builtin/config.c:70
+#: builtin/config.c:135

 msgid "add a new variable: name value"
 msgstr ""
 
 msgid "add a new variable: name value"
 msgstr ""
 

-#: builtin/config.c:71
+#: builtin/config.c:136

 msgid "remove a variable: name [value-regex]"
 msgstr ""
 
 msgid "remove a variable: name [value-regex]"
 msgstr ""
 

-#: builtin/config.c:72
+#: builtin/config.c:137

 msgid "remove all matches: name [value-regex]"
 msgstr ""
 
 msgid "remove all matches: name [value-regex]"
 msgstr ""
 

-#: builtin/config.c:73
+#: builtin/config.c:138

 msgid "rename section: old-name new-name"
 msgstr ""
 
 msgid "rename section: old-name new-name"
 msgstr ""
 

-#: builtin/config.c:74
+#: builtin/config.c:139

 msgid "remove a section: name"
 msgstr ""
 
 msgid "remove a section: name"
 msgstr ""
 

-#: builtin/config.c:75
+#: builtin/config.c:140

 msgid "list all"
 msgstr ""
 
 msgid "list all"
 msgstr ""
 

-#: builtin/config.c:76
+#: builtin/config.c:141

 msgid "open an editor"
 msgstr ""
 
 msgid "open an editor"
 msgstr ""
 

-#: builtin/config.c:77
+#: builtin/config.c:142

 msgid "find the color configured: slot [default]"
 msgstr ""
 
 msgid "find the color configured: slot [default]"
 msgstr ""
 

-#: builtin/config.c:78
+#: builtin/config.c:143

 msgid "find the color setting: slot [stdout-is-tty]"
 msgstr ""
 
 msgid "find the color setting: slot [stdout-is-tty]"
 msgstr ""
 

-#: builtin/config.c:79
+#: builtin/config.c:144

 msgid "Type"
 msgstr ""
 
 msgid "Type"
 msgstr ""
 

-#: builtin/config.c:80
+#: builtin/config.c:145
+msgid "value is given this type"
+msgstr ""
+
+#: builtin/config.c:146

 msgid "value is \"true\" or \"false\""
 msgstr ""
 
 msgid "value is \"true\" or \"false\""
 msgstr ""
 

-#: builtin/config.c:81
+#: builtin/config.c:147

 msgid "value is decimal number"
 msgstr ""
 
 msgid "value is decimal number"
 msgstr ""
 

-#: builtin/config.c:82
+#: builtin/config.c:148

 msgid "value is --bool or --int"
 msgstr ""
 
 msgid "value is --bool or --int"
 msgstr ""
 

-#: builtin/config.c:83
+#: builtin/config.c:149

 msgid "value is a path (file or directory name)"
 msgstr ""
 
 msgid "value is a path (file or directory name)"
 msgstr ""
 

-#: builtin/config.c:84
+#: builtin/config.c:150

 msgid "value is an expiry date"
 msgstr ""
 
 msgid "value is an expiry date"
 msgstr ""
 

-#: builtin/config.c:85
+#: builtin/config.c:151

 msgid "Other"
 msgstr ""
 
 msgid "Other"
 msgstr ""
 

-#: builtin/config.c:86
+#: builtin/config.c:152

 msgid "terminate values with NUL byte"
 msgstr ""
 
 msgid "terminate values with NUL byte"
 msgstr ""
 

-#: builtin/config.c:87
+#: builtin/config.c:153

 msgid "show variable names only"
 msgstr ""
 
 msgid "show variable names only"
 msgstr ""
 

-#: builtin/config.c:88
+#: builtin/config.c:154

 msgid "respect include directives on lookup"
 msgstr ""
 
 msgid "respect include directives on lookup"
 msgstr ""
 

-#: builtin/config.c:89
+#: builtin/config.c:155

 msgid "show origin of config (file, standard input, blob, command line)"
 msgstr ""
 
 msgid "show origin of config (file, standard input, blob, command line)"
 msgstr ""
 

-#: builtin/config.c:335
+#: builtin/config.c:156
+msgid "value"
+msgstr ""
+
+#: builtin/config.c:156
+msgid "with --get, use default value when missing entry"
+msgstr ""
+
+#: builtin/config.c:332
+#, c-format
+msgid "failed to format default config value: %s"
+msgstr ""
+
+#: builtin/config.c:431

 msgid "unable to parse default color value"
 msgstr ""
 
 msgid "unable to parse default color value"
 msgstr ""
 

-#: builtin/config.c:479
+#: builtin/config.c:575

 #, c-format
 msgid ""
 "# This is Git's per-user configuration file.\n"
 #, c-format
 msgid ""
 "# This is Git's per-user configuration file.\n"


@@ -7446,27 +7809,31 @@ msgid ""
 "#\temail = %s\n"
 msgstr ""
 
 "#\temail = %s\n"
 msgstr ""
 

-#: builtin/config.c:507
+#: builtin/config.c:603

 msgid "--local can only be used inside a git repository"
 msgstr ""
 
 msgid "--local can only be used inside a git repository"
 msgstr ""
 

-#: builtin/config.c:632
+#: builtin/config.c:606
+msgid "--blob can only be used inside a git repository"
+msgstr ""
+
+#: builtin/config.c:735

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

-#: builtin/config.c:645
+#: builtin/config.c:748

 #, c-format
 msgid ""
 "cannot overwrite multiple values with a single value\n"
 "       Use a regexp, --add or --replace-all to change %s."
 msgstr ""
 
 #, c-format
 msgid ""
 "cannot overwrite multiple values with a single value\n"
 "       Use a regexp, --add or --replace-all to change %s."
 msgstr ""
 

-#: builtin/count-objects.c:88
+#: builtin/count-objects.c:90

 msgid "git count-objects [-v] [-H | --human-readable]"
 msgstr ""
 
 msgid "git count-objects [-v] [-H | --human-readable]"
 msgstr ""
 

-#: builtin/count-objects.c:98
+#: builtin/count-objects.c:100

 msgid "print sizes in human readable format"
 msgstr ""
 
 msgid "print sizes in human readable format"
 msgstr ""
 


@@ -7760,333 +8127,339 @@ msgstr ""
 msgid "no <cmd> given for --extcmd=<cmd>"
 msgstr ""
 
 msgid "no <cmd> given for --extcmd=<cmd>"
 msgstr ""
 

-#: builtin/fast-export.c:26
+#: builtin/fast-export.c:27

 msgid "git fast-export [rev-list-opts]"
 msgstr ""
 
 msgid "git fast-export [rev-list-opts]"
 msgstr ""
 

-#: builtin/fast-export.c:998
+#: builtin/fast-export.c:1000

 msgid "show progress after <n> objects"
 msgstr ""
 
 msgid "show progress after <n> objects"
 msgstr ""
 

-#: builtin/fast-export.c:1000
+#: builtin/fast-export.c:1002

 msgid "select handling of signed tags"
 msgstr ""
 
 msgid "select handling of signed tags"
 msgstr ""
 

-#: builtin/fast-export.c:1003
+#: builtin/fast-export.c:1005

 msgid "select handling of tags that tag filtered objects"
 msgstr ""
 
 msgid "select handling of tags that tag filtered objects"
 msgstr ""
 

-#: builtin/fast-export.c:1006
+#: builtin/fast-export.c:1008

 msgid "Dump marks to this file"
 msgstr ""
 
 msgid "Dump marks to this file"
 msgstr ""
 

-#: builtin/fast-export.c:1008
+#: builtin/fast-export.c:1010

 msgid "Import marks from this file"
 msgstr ""
 
 msgid "Import marks from this file"
 msgstr ""
 

-#: builtin/fast-export.c:1010
+#: builtin/fast-export.c:1012

 msgid "Fake a tagger when tags lack one"
 msgstr ""
 
 msgid "Fake a tagger when tags lack one"
 msgstr ""
 

-#: builtin/fast-export.c:1012
+#: builtin/fast-export.c:1014

 msgid "Output full tree for each commit"
 msgstr ""
 
 msgid "Output full tree for each commit"
 msgstr ""
 

-#: builtin/fast-export.c:1014
+#: builtin/fast-export.c:1016

 msgid "Use the done feature to terminate the stream"
 msgstr ""
 
 msgid "Use the done feature to terminate the stream"
 msgstr ""
 

-#: builtin/fast-export.c:1015
+#: builtin/fast-export.c:1017

 msgid "Skip output of blob data"
 msgstr ""
 
 msgid "Skip output of blob data"
 msgstr ""
 

-#: builtin/fast-export.c:1016
+#: builtin/fast-export.c:1018

 msgid "refspec"
 msgstr ""
 
 msgid "refspec"
 msgstr ""
 

-#: builtin/fast-export.c:1017
+#: builtin/fast-export.c:1019

 msgid "Apply refspec to exported refs"
 msgstr ""
 
 msgid "Apply refspec to exported refs"
 msgstr ""
 

-#: builtin/fast-export.c:1018
+#: builtin/fast-export.c:1020

 msgid "anonymize output"
 msgstr ""
 
 msgid "anonymize output"
 msgstr ""
 

-#: builtin/fetch.c:25
+#: builtin/fetch.c:26

 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
 msgstr ""
 
 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
 msgstr ""
 

-#: builtin/fetch.c:26
+#: builtin/fetch.c:27

 msgid "git fetch [<options>] <group>"
 msgstr ""
 
 msgid "git fetch [<options>] <group>"
 msgstr ""
 

-#: builtin/fetch.c:27
+#: builtin/fetch.c:28

 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
 msgstr ""
 
 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
 msgstr ""
 

-#: builtin/fetch.c:28
+#: builtin/fetch.c:29

 msgid "git fetch --all [<options>]"
 msgstr ""
 
 msgid "git fetch --all [<options>]"
 msgstr ""
 

-#: builtin/fetch.c:124 builtin/pull.c:188
+#: builtin/fetch.c:123 builtin/pull.c:193

 msgid "fetch from all remotes"
 msgstr ""
 
 msgid "fetch from all remotes"
 msgstr ""
 

-#: builtin/fetch.c:126 builtin/pull.c:191
+#: builtin/fetch.c:125 builtin/pull.c:196

 msgid "append to .git/FETCH_HEAD instead of overwriting"
 msgstr ""
 
 msgid "append to .git/FETCH_HEAD instead of overwriting"
 msgstr ""
 

-#: builtin/fetch.c:128 builtin/pull.c:194
+#: builtin/fetch.c:127 builtin/pull.c:199

 msgid "path to upload pack on remote end"
 msgstr ""
 
 msgid "path to upload pack on remote end"
 msgstr ""
 

-#: builtin/fetch.c:129 builtin/pull.c:196
+#: builtin/fetch.c:128 builtin/pull.c:201

 msgid "force overwrite of local branch"
 msgstr ""
 
 msgid "force overwrite of local branch"
 msgstr ""
 

-#: builtin/fetch.c:131
+#: builtin/fetch.c:130

 msgid "fetch from multiple remotes"
 msgstr ""
 
 msgid "fetch from multiple remotes"
 msgstr ""
 

-#: builtin/fetch.c:133 builtin/pull.c:198
+#: builtin/fetch.c:132 builtin/pull.c:203

 msgid "fetch all tags and associated objects"
 msgstr ""
 
 msgid "fetch all tags and associated objects"
 msgstr ""
 

-#: builtin/fetch.c:135
+#: builtin/fetch.c:134

 msgid "do not fetch all tags (--no-tags)"
 msgstr ""
 
 msgid "do not fetch all tags (--no-tags)"
 msgstr ""
 

-#: builtin/fetch.c:137
+#: builtin/fetch.c:136

 msgid "number of submodules fetched in parallel"
 msgstr ""
 
 msgid "number of submodules fetched in parallel"
 msgstr ""
 

-#: builtin/fetch.c:139 builtin/pull.c:201
+#: builtin/fetch.c:138 builtin/pull.c:206

 msgid "prune remote-tracking branches no longer on remote"
 msgstr ""
 
 msgid "prune remote-tracking branches no longer on remote"
 msgstr ""
 

-#: builtin/fetch.c:141
+#: builtin/fetch.c:140

 msgid "prune local tags no longer on remote and clobber changed tags"
 msgstr ""
 
 msgid "prune local tags no longer on remote and clobber changed tags"
 msgstr ""
 

-#: builtin/fetch.c:142 builtin/fetch.c:165 builtin/pull.c:126
+#: builtin/fetch.c:141 builtin/fetch.c:164 builtin/pull.c:131

 msgid "on-demand"
 msgstr ""
 
 msgid "on-demand"
 msgstr ""
 

-#: builtin/fetch.c:143
+#: builtin/fetch.c:142

 msgid "control recursive fetching of submodules"
 msgstr ""
 
 msgid "control recursive fetching of submodules"
 msgstr ""
 

-#: builtin/fetch.c:147 builtin/pull.c:209
+#: builtin/fetch.c:146 builtin/pull.c:214

 msgid "keep downloaded pack"
 msgstr ""
 
 msgid "keep downloaded pack"
 msgstr ""
 

-#: builtin/fetch.c:149
+#: builtin/fetch.c:148

 msgid "allow updating of HEAD ref"
 msgstr ""
 
 msgid "allow updating of HEAD ref"
 msgstr ""
 

-#: builtin/fetch.c:152 builtin/fetch.c:158 builtin/pull.c:212
+#: builtin/fetch.c:151 builtin/fetch.c:157 builtin/pull.c:217

 msgid "deepen history of shallow clone"
 msgstr ""
 
 msgid "deepen history of shallow clone"
 msgstr ""
 

-#: builtin/fetch.c:154
+#: builtin/fetch.c:153

 msgid "deepen history of shallow repository based on time"
 msgstr ""
 
 msgid "deepen history of shallow repository based on time"
 msgstr ""
 

-#: builtin/fetch.c:160 builtin/pull.c:215
+#: builtin/fetch.c:159 builtin/pull.c:220

 msgid "convert to a complete repository"
 msgstr ""
 
 msgid "convert to a complete repository"
 msgstr ""
 

-#: builtin/fetch.c:162 builtin/log.c:1466
-msgid "dir"
-msgstr ""
-
-#: builtin/fetch.c:163
+#: builtin/fetch.c:162

 msgid "prepend this to submodule path output"
 msgstr ""
 
 msgid "prepend this to submodule path output"
 msgstr ""
 

-#: builtin/fetch.c:166
+#: builtin/fetch.c:165

 msgid ""
 "default for recursive fetching of submodules (lower priority than config "
 "files)"
 msgstr ""
 
 msgid ""
 "default for recursive fetching of submodules (lower priority than config "
 "files)"
 msgstr ""
 

-#: builtin/fetch.c:170 builtin/pull.c:218
+#: builtin/fetch.c:169 builtin/pull.c:223

 msgid "accept refs that update .git/shallow"
 msgstr ""
 
 msgid "accept refs that update .git/shallow"
 msgstr ""
 

-#: builtin/fetch.c:171 builtin/pull.c:220
+#: builtin/fetch.c:170 builtin/pull.c:225

 msgid "refmap"
 msgstr ""
 
 msgid "refmap"
 msgstr ""
 

-#: builtin/fetch.c:172 builtin/pull.c:221
+#: builtin/fetch.c:171 builtin/pull.c:226

 msgid "specify fetch refmap"
 msgstr ""
 
 msgid "specify fetch refmap"
 msgstr ""
 

-#: builtin/fetch.c:431
+#: builtin/fetch.c:172 builtin/ls-remote.c:77 builtin/push.c:582
+#: builtin/send-pack.c:172
+msgid "server-specific"
+msgstr ""
+
+#: builtin/fetch.c:172 builtin/ls-remote.c:77 builtin/push.c:582
+#: builtin/send-pack.c:173
+msgid "option to transmit"
+msgstr ""
+
+#: builtin/fetch.c:442

 msgid "Couldn't find remote ref HEAD"
 msgstr ""
 
 msgid "Couldn't find remote ref HEAD"
 msgstr ""
 

-#: builtin/fetch.c:549
+#: builtin/fetch.c:560

 #, 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:642
+#: builtin/fetch.c:653

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

-#: builtin/fetch.c:646
+#: builtin/fetch.c:657

 msgid "[up to date]"
 msgstr ""
 
 msgid "[up to date]"
 msgstr ""
 

-#: builtin/fetch.c:659 builtin/fetch.c:739
+#: builtin/fetch.c:670 builtin/fetch.c:750

 msgid "[rejected]"
 msgstr ""
 
 msgid "[rejected]"
 msgstr ""
 

-#: builtin/fetch.c:660
+#: builtin/fetch.c:671

 msgid "can't fetch in current branch"
 msgstr ""
 
 msgid "can't fetch in current branch"
 msgstr ""
 

-#: builtin/fetch.c:669
+#: builtin/fetch.c:680

 msgid "[tag update]"
 msgstr ""
 
 msgid "[tag update]"
 msgstr ""
 

-#: builtin/fetch.c:670 builtin/fetch.c:703 builtin/fetch.c:719
-#: builtin/fetch.c:734
+#: builtin/fetch.c:681 builtin/fetch.c:714 builtin/fetch.c:730
+#: builtin/fetch.c:745

 msgid "unable to update local ref"
 msgstr ""
 
 msgid "unable to update local ref"
 msgstr ""
 

-#: builtin/fetch.c:689
+#: builtin/fetch.c:700

 msgid "[new tag]"
 msgstr ""
 
 msgid "[new tag]"
 msgstr ""
 

-#: builtin/fetch.c:692
+#: builtin/fetch.c:703

 msgid "[new branch]"
 msgstr ""
 
 msgid "[new branch]"
 msgstr ""
 

-#: builtin/fetch.c:695
+#: builtin/fetch.c:706

 msgid "[new ref]"
 msgstr ""
 
 msgid "[new ref]"
 msgstr ""
 

-#: builtin/fetch.c:734
+#: builtin/fetch.c:745

 msgid "forced update"
 msgstr ""
 
 msgid "forced update"
 msgstr ""
 

-#: builtin/fetch.c:739
+#: builtin/fetch.c:750

 msgid "non-fast-forward"
 msgstr ""
 
 msgid "non-fast-forward"
 msgstr ""
 

-#: builtin/fetch.c:784
+#: builtin/fetch.c:795

 #, 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:804
+#: builtin/fetch.c:815

 #, 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:892 builtin/fetch.c:988
+#: builtin/fetch.c:903 builtin/fetch.c:999

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

-#: builtin/fetch.c:903
+#: builtin/fetch.c:914

 #, 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:958
+#: builtin/fetch.c:969

 #, c-format
 msgid "   (%s will become dangling)"
 msgstr ""
 
 #, c-format
 msgid "   (%s will become dangling)"
 msgstr ""
 

-#: builtin/fetch.c:959
+#: builtin/fetch.c:970

 #, c-format
 msgid "   (%s has become dangling)"
 msgstr ""
 
 #, c-format
 msgid "   (%s has become dangling)"
 msgstr ""
 

-#: builtin/fetch.c:991
+#: builtin/fetch.c:1002

 msgid "[deleted]"
 msgstr ""
 
 msgid "[deleted]"
 msgstr ""
 

-#: builtin/fetch.c:992 builtin/remote.c:1024
+#: builtin/fetch.c:1003 builtin/remote.c:1033

 msgid "(none)"
 msgstr ""
 
 msgid "(none)"
 msgstr ""
 

-#: builtin/fetch.c:1015
+#: builtin/fetch.c:1026

 #, 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:1034
+#: builtin/fetch.c:1045

 #, 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:1037
+#: builtin/fetch.c:1048

 #, 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:1277
+#: builtin/fetch.c:1287

 #, c-format
 msgid "Fetching %s\n"
 msgstr ""
 
 #, c-format
 msgid "Fetching %s\n"
 msgstr ""
 

-#: builtin/fetch.c:1279 builtin/remote.c:97
+#: builtin/fetch.c:1289 builtin/remote.c:98

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

-#: builtin/fetch.c:1325 builtin/fetch.c:1498
+#: builtin/fetch.c:1335 builtin/fetch.c:1503

 msgid ""
 "--filter can only be used with the remote configured in core.partialClone"
 msgstr ""
 
 msgid ""
 "--filter can only be used with the remote configured in core.partialClone"
 msgstr ""
 

-#: builtin/fetch.c:1350
+#: builtin/fetch.c:1358

 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:1394
+#: builtin/fetch.c:1395

 msgid "You need to specify a tag name."
 msgstr ""
 
 msgid "You need to specify a tag name."
 msgstr ""
 

-#: builtin/fetch.c:1439
+#: builtin/fetch.c:1444

 msgid "Negative depth in --deepen is not supported"
 msgstr ""
 
 msgid "Negative depth in --deepen is not supported"
 msgstr ""
 

-#: builtin/fetch.c:1441
+#: builtin/fetch.c:1446

 msgid "--deepen and --depth are mutually exclusive"
 msgstr ""
 
 msgid "--deepen and --depth are mutually exclusive"
 msgstr ""
 

-#: builtin/fetch.c:1446
+#: builtin/fetch.c:1451

 msgid "--depth and --unshallow cannot be used together"
 msgstr ""
 
 msgid "--depth and --unshallow cannot be used together"
 msgstr ""
 

-#: builtin/fetch.c:1448
+#: builtin/fetch.c:1453

 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:1464
+#: builtin/fetch.c:1469

 msgid "fetch --all does not take a repository argument"
 msgstr ""
 
 msgid "fetch --all does not take a repository argument"
 msgstr ""
 

-#: builtin/fetch.c:1466
+#: builtin/fetch.c:1471

 msgid "fetch --all does not make sense with refspecs"
 msgstr ""
 
 msgid "fetch --all does not make sense with refspecs"
 msgstr ""
 

-#: builtin/fetch.c:1475
+#: builtin/fetch.c:1480

 #, 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:1482
+#: builtin/fetch.c:1487

 msgid "Fetching a group and specifying refspecs does not make sense"
 msgstr ""
 
 msgid "Fetching a group and specifying refspecs does not make sense"
 msgstr ""
 


@@ -8151,7 +8524,7 @@ msgstr ""
 msgid "show only <n> matched refs"
 msgstr ""
 
 msgid "show only <n> matched refs"
 msgstr ""
 

-#: builtin/for-each-ref.c:39 builtin/tag.c:420
+#: builtin/for-each-ref.c:39 builtin/tag.c:421

 msgid "respect format colors"
 msgstr ""
 
 msgid "respect format colors"
 msgstr ""
 


@@ -8175,81 +8548,81 @@ msgstr ""
 msgid "print only refs which don't contain the commit"
 msgstr ""
 
 msgid "print only refs which don't contain the commit"
 msgstr ""
 

-#: builtin/fsck.c:568
+#: builtin/fsck.c:569

 msgid "Checking object directories"
 msgstr ""
 
 msgid "Checking object directories"
 msgstr ""
 

-#: builtin/fsck.c:660
+#: builtin/fsck.c:661

 msgid "git fsck [<options>] [<object>...]"
 msgstr ""
 
 msgid "git fsck [<options>] [<object>...]"
 msgstr ""
 

-#: builtin/fsck.c:666
+#: builtin/fsck.c:667

 msgid "show unreachable objects"
 msgstr ""
 
 msgid "show unreachable objects"
 msgstr ""
 

-#: builtin/fsck.c:667
+#: builtin/fsck.c:668

 msgid "show dangling objects"
 msgstr ""
 
 msgid "show dangling objects"
 msgstr ""
 

-#: builtin/fsck.c:668
+#: builtin/fsck.c:669

 msgid "report tags"
 msgstr ""
 
 msgid "report tags"
 msgstr ""
 

-#: builtin/fsck.c:669
+#: builtin/fsck.c:670

 msgid "report root nodes"
 msgstr ""
 
 msgid "report root nodes"
 msgstr ""
 

-#: builtin/fsck.c:670
+#: builtin/fsck.c:671

 msgid "make index objects head nodes"
 msgstr ""
 
 msgid "make index objects head nodes"
 msgstr ""
 

-#: builtin/fsck.c:671
+#: builtin/fsck.c:672

 msgid "make reflogs head nodes (default)"
 msgstr ""
 
 msgid "make reflogs head nodes (default)"
 msgstr ""
 

-#: builtin/fsck.c:672
+#: builtin/fsck.c:673

 msgid "also consider packs and alternate objects"
 msgstr ""
 
 msgid "also consider packs and alternate objects"
 msgstr ""
 

-#: builtin/fsck.c:673
+#: builtin/fsck.c:674

 msgid "check only connectivity"
 msgstr ""
 
 msgid "check only connectivity"
 msgstr ""
 

-#: builtin/fsck.c:674
+#: builtin/fsck.c:675

 msgid "enable more strict checking"
 msgstr ""
 
 msgid "enable more strict checking"
 msgstr ""
 

-#: builtin/fsck.c:676
+#: builtin/fsck.c:677

 msgid "write dangling objects in .git/lost-found"
 msgstr ""
 
 msgid "write dangling objects in .git/lost-found"
 msgstr ""
 

-#: builtin/fsck.c:677 builtin/prune.c:108
+#: builtin/fsck.c:678 builtin/prune.c:109

 msgid "show progress"
 msgstr ""
 
 msgid "show progress"
 msgstr ""
 

-#: builtin/fsck.c:678
+#: builtin/fsck.c:679

 msgid "show verbose names for reachable objects"
 msgstr ""
 
 msgid "show verbose names for reachable objects"
 msgstr ""
 

-#: builtin/fsck.c:742
+#: builtin/fsck.c:745

 msgid "Checking objects"
 msgstr ""
 
 msgid "Checking objects"
 msgstr ""
 

-#: builtin/gc.c:27
+#: builtin/gc.c:33

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

-#: builtin/gc.c:80
+#: builtin/gc.c:88

 #, c-format
 msgid "Failed to fstat %s: %s"
 msgstr ""
 
 #, c-format
 msgid "Failed to fstat %s: %s"
 msgstr ""
 

-#: builtin/gc.c:312
+#: builtin/gc.c:452

 #, c-format
 msgid "Can't stat %s"
 msgstr ""
 
 #, c-format
 msgid "Can't stat %s"
 msgstr ""
 

-#: builtin/gc.c:321
+#: builtin/gc.c:461

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


@@ -8259,63 +8632,72 @@ msgid ""
 "%s"
 msgstr ""
 
 "%s"
 msgstr ""
 

-#: builtin/gc.c:360
+#: builtin/gc.c:502

 msgid "prune unreferenced objects"
 msgstr ""
 
 msgid "prune unreferenced objects"
 msgstr ""
 

-#: builtin/gc.c:362
+#: builtin/gc.c:504

 msgid "be more thorough (increased runtime)"
 msgstr ""
 
 msgid "be more thorough (increased runtime)"
 msgstr ""
 

-#: builtin/gc.c:363
+#: builtin/gc.c:505

 msgid "enable auto-gc mode"
 msgstr ""
 
 msgid "enable auto-gc mode"
 msgstr ""
 

-#: builtin/gc.c:366
+#: builtin/gc.c:508

 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:384
+#: builtin/gc.c:511
+msgid "repack all other packs except the largest pack"
+msgstr ""
+
+#: builtin/gc.c:528
+#, c-format
+msgid "failed to parse gc.logexpiry value %s"
+msgstr ""
+
+#: builtin/gc.c:539

 #, c-format
 #, c-format

-msgid "Failed to parse gc.logexpiry value %s"
+msgid "failed to parse prune expiry value %s"

 msgstr ""
 
 msgstr ""
 

-#: builtin/gc.c:412
+#: builtin/gc.c:559

 #, 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:414
+#: builtin/gc.c:561

 #, 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:415
+#: builtin/gc.c:562

 #, 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:440
+#: builtin/gc.c:598

 #, 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:487
+#: builtin/gc.c:645

 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:27
+#: builtin/grep.c:28

 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
 msgstr ""
 
 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
 msgstr ""
 

-#: builtin/grep.c:225
+#: builtin/grep.c:226

 #, c-format
 msgid "grep: failed to create thread: %s"
 msgstr ""
 
 #, c-format
 msgid "grep: failed to create thread: %s"
 msgstr ""
 

-#: builtin/grep.c:283
+#: builtin/grep.c:284

 #, c-format
 msgid "invalid number of threads specified (%d) for %s"
 msgstr ""
 #, c-format
 msgid "invalid number of threads specified (%d) for %s"
 msgstr ""


@@ -8324,17 +8706,17 @@ msgstr ""
 #. variable for tweaking threads, currently
 #. grep.threads
 #.
 #. variable for tweaking threads, currently
 #. grep.threads
 #.

-#: builtin/grep.c:292 builtin/index-pack.c:1523 builtin/index-pack.c:1712
+#: builtin/grep.c:293 builtin/index-pack.c:1531 builtin/index-pack.c:1723

 #, c-format
 msgid "no threads support, ignoring %s"
 msgstr ""
 
 #, c-format
 msgid "no threads support, ignoring %s"
 msgstr ""
 

-#: builtin/grep.c:460 builtin/grep.c:580 builtin/grep.c:622
+#: builtin/grep.c:461 builtin/grep.c:582 builtin/grep.c:623

 #, c-format
 msgid "unable to read tree (%s)"
 msgstr ""
 
 #, c-format
 msgid "unable to read tree (%s)"
 msgstr ""
 

-#: builtin/grep.c:637
+#: builtin/grep.c:638

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


@@ -8533,7 +8915,7 @@ msgstr ""
 msgid "unable to resolve revision: %s"
 msgstr ""
 
 msgid "unable to resolve revision: %s"
 msgstr ""
 

-#: builtin/grep.c:1036 builtin/index-pack.c:1519
+#: builtin/grep.c:1036 builtin/index-pack.c:1527

 #, c-format
 msgid "invalid number of threads specified (%d)"
 msgstr ""
 #, c-format
 msgid "invalid number of threads specified (%d)"
 msgstr ""


@@ -8725,299 +9107,303 @@ msgstr ""
 msgid "usage: %s%s"
 msgstr ""
 
 msgid "usage: %s%s"
 msgstr ""
 

-#: builtin/index-pack.c:157
+#: builtin/index-pack.c:158

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

-#: builtin/index-pack.c:207
+#: builtin/index-pack.c:208

 #, c-format
 msgid "object type mismatch at %s"
 msgstr ""
 
 #, c-format
 msgid "object type mismatch at %s"
 msgstr ""
 

-#: builtin/index-pack.c:227
+#: builtin/index-pack.c:228

 #, c-format
 msgid "did not receive expected object %s"
 msgstr ""
 
 #, c-format
 msgid "did not receive expected object %s"
 msgstr ""
 

-#: builtin/index-pack.c:230
+#: builtin/index-pack.c:231

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

-#: builtin/index-pack.c:272
+#: builtin/index-pack.c:273

 #, c-format
 msgid "cannot fill %d byte"
 msgid_plural "cannot fill %d bytes"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
 msgid "cannot fill %d byte"
 msgid_plural "cannot fill %d bytes"
 msgstr[0] ""
 msgstr[1] ""
 

-#: builtin/index-pack.c:282
+#: builtin/index-pack.c:283

 msgid "early EOF"
 msgstr ""
 
 msgid "early EOF"
 msgstr ""
 

-#: builtin/index-pack.c:283
+#: builtin/index-pack.c:284

 msgid "read error on input"
 msgstr ""
 
 msgid "read error on input"
 msgstr ""
 

-#: builtin/index-pack.c:295
+#: builtin/index-pack.c:296

 msgid "used more bytes than were available"
 msgstr ""
 
 msgid "used more bytes than were available"
 msgstr ""
 

-#: builtin/index-pack.c:302
+#: builtin/index-pack.c:303

 msgid "pack too large for current definition of off_t"
 msgstr ""
 
 msgid "pack too large for current definition of off_t"
 msgstr ""
 

-#: builtin/index-pack.c:305 builtin/unpack-objects.c:93
+#: builtin/index-pack.c:306 builtin/unpack-objects.c:93

 msgid "pack exceeds maximum allowed size"
 msgstr ""
 
 msgid "pack exceeds maximum allowed size"
 msgstr ""
 

-#: builtin/index-pack.c:320
+#: builtin/index-pack.c:321

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

-#: builtin/index-pack.c:326
+#: builtin/index-pack.c:327

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

-#: builtin/index-pack.c:340
+#: builtin/index-pack.c:341

 msgid "pack signature mismatch"
 msgstr ""
 
 msgid "pack signature mismatch"
 msgstr ""
 

-#: builtin/index-pack.c:342
+#: builtin/index-pack.c:343

 #, c-format
 msgid "pack version %<PRIu32> unsupported"
 msgstr ""
 
 #, c-format
 msgid "pack version %<PRIu32> unsupported"
 msgstr ""
 

-#: builtin/index-pack.c:360
+#: builtin/index-pack.c:361

 #, c-format
 msgid "pack has bad object at offset %<PRIuMAX>: %s"
 msgstr ""
 
 #, c-format
 msgid "pack has bad object at offset %<PRIuMAX>: %s"
 msgstr ""
 

-#: builtin/index-pack.c:481
+#: builtin/index-pack.c:482

 #, c-format
 msgid "inflate returned %d"
 msgstr ""
 
 #, c-format
 msgid "inflate returned %d"
 msgstr ""
 

-#: builtin/index-pack.c:530
+#: builtin/index-pack.c:531

 msgid "offset value overflow for delta base object"
 msgstr ""
 
 msgid "offset value overflow for delta base object"
 msgstr ""
 

-#: builtin/index-pack.c:538
+#: builtin/index-pack.c:539

 msgid "delta base offset is out of bound"
 msgstr ""
 
 msgid "delta base offset is out of bound"
 msgstr ""
 

-#: builtin/index-pack.c:546
+#: builtin/index-pack.c:547

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

-#: builtin/index-pack.c:577
+#: builtin/index-pack.c:578

 msgid "cannot pread pack file"
 msgstr ""
 
 msgid "cannot pread pack file"
 msgstr ""
 

-#: builtin/index-pack.c:579
+#: builtin/index-pack.c:580

 #, c-format
 msgid "premature end of pack file, %<PRIuMAX> byte missing"
 msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
 msgid "premature end of pack file, %<PRIuMAX> byte missing"
 msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
 msgstr[0] ""
 msgstr[1] ""
 

-#: builtin/index-pack.c:605
+#: builtin/index-pack.c:606

 msgid "serious inflate inconsistency"
 msgstr ""
 
 msgid "serious inflate inconsistency"
 msgstr ""
 

-#: builtin/index-pack.c:750 builtin/index-pack.c:756 builtin/index-pack.c:779
-#: builtin/index-pack.c:818 builtin/index-pack.c:827
+#: builtin/index-pack.c:751 builtin/index-pack.c:757 builtin/index-pack.c:780
+#: builtin/index-pack.c:819 builtin/index-pack.c:828

 #, c-format
 msgid "SHA1 COLLISION FOUND WITH %s !"
 msgstr ""
 
 #, c-format
 msgid "SHA1 COLLISION FOUND WITH %s !"
 msgstr ""
 

-#: builtin/index-pack.c:753 builtin/pack-objects.c:182
-#: builtin/pack-objects.c:276
+#: builtin/index-pack.c:754 builtin/pack-objects.c:198
+#: builtin/pack-objects.c:292

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

-#: builtin/index-pack.c:816
+#: builtin/index-pack.c:817

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

-#: builtin/index-pack.c:824
+#: builtin/index-pack.c:825

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

-#: builtin/index-pack.c:838
+#: builtin/index-pack.c:839

 #, c-format
 msgid "invalid blob object %s"
 msgstr ""
 
 #, c-format
 msgid "invalid blob object %s"
 msgstr ""
 

-#: builtin/index-pack.c:853
-#, c-format
-msgid "invalid %s"
+#: builtin/index-pack.c:842 builtin/index-pack.c:860
+msgid "fsck error in packed object"

 msgstr ""
 
 msgstr ""
 

-#: builtin/index-pack.c:856
-msgid "Error in object"
+#: builtin/index-pack.c:857
+#, c-format
+msgid "invalid %s"

 msgstr ""
 
 msgstr ""
 

-#: builtin/index-pack.c:858
+#: builtin/index-pack.c:862

 #, 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:930 builtin/index-pack.c:961
+#: builtin/index-pack.c:934 builtin/index-pack.c:965

 msgid "failed to apply delta"
 msgstr ""
 
 msgid "failed to apply delta"
 msgstr ""
 

-#: builtin/index-pack.c:1131
+#: builtin/index-pack.c:1135

 msgid "Receiving objects"
 msgstr ""
 
 msgid "Receiving objects"
 msgstr ""
 

-#: builtin/index-pack.c:1131
+#: builtin/index-pack.c:1135

 msgid "Indexing objects"
 msgstr ""
 
 msgid "Indexing objects"
 msgstr ""
 

-#: builtin/index-pack.c:1165
+#: builtin/index-pack.c:1169

 msgid "pack is corrupted (SHA1 mismatch)"
 msgstr ""
 
 msgid "pack is corrupted (SHA1 mismatch)"
 msgstr ""
 

-#: builtin/index-pack.c:1170
+#: builtin/index-pack.c:1174

 msgid "cannot fstat packfile"
 msgstr ""
 
 msgid "cannot fstat packfile"
 msgstr ""
 

-#: builtin/index-pack.c:1173
+#: builtin/index-pack.c:1177

 msgid "pack has junk at the end"
 msgstr ""
 
 msgid "pack has junk at the end"
 msgstr ""
 

-#: builtin/index-pack.c:1185
+#: builtin/index-pack.c:1189

 msgid "confusion beyond insanity in parse_pack_objects()"
 msgstr ""
 
 msgid "confusion beyond insanity in parse_pack_objects()"
 msgstr ""
 

-#: builtin/index-pack.c:1208
+#: builtin/index-pack.c:1212

 msgid "Resolving deltas"
 msgstr ""
 
 msgid "Resolving deltas"
 msgstr ""
 

-#: builtin/index-pack.c:1219
+#: builtin/index-pack.c:1223

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

-#: builtin/index-pack.c:1261
+#: builtin/index-pack.c:1265

 msgid "confusion beyond insanity"
 msgstr ""
 
 msgid "confusion beyond insanity"
 msgstr ""
 

-#: builtin/index-pack.c:1267
+#: builtin/index-pack.c:1271

 #, 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:1279
+#: builtin/index-pack.c:1283

 #, 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:1283
+#: builtin/index-pack.c:1287

 #, 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:1307
+#: builtin/index-pack.c:1311

 #, c-format
 msgid "unable to deflate appended object (%d)"
 msgstr ""
 
 #, c-format
 msgid "unable to deflate appended object (%d)"
 msgstr ""
 

-#: builtin/index-pack.c:1383
+#: builtin/index-pack.c:1388

 #, c-format
 msgid "local object %s is corrupt"
 msgstr ""
 
 #, c-format
 msgid "local object %s is corrupt"
 msgstr ""
 

-#: builtin/index-pack.c:1397
+#: builtin/index-pack.c:1402

 #, 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:1422
+#: builtin/index-pack.c:1427

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

-#: builtin/index-pack.c:1430
+#: builtin/index-pack.c:1435

 #, c-format
 msgid "cannot close written %s file '%s'"
 msgstr ""
 
 #, c-format
 msgid "cannot close written %s file '%s'"
 msgstr ""
 

-#: builtin/index-pack.c:1454
+#: builtin/index-pack.c:1459

 msgid "error while closing pack file"
 msgstr ""
 
 msgid "error while closing pack file"
 msgstr ""
 

-#: builtin/index-pack.c:1468
+#: builtin/index-pack.c:1473

 msgid "cannot store pack file"
 msgstr ""
 
 msgid "cannot store pack file"
 msgstr ""
 

-#: builtin/index-pack.c:1476
+#: builtin/index-pack.c:1481

 msgid "cannot store index file"
 msgstr ""
 
 msgid "cannot store index file"
 msgstr ""
 

-#: builtin/index-pack.c:1513
+#: builtin/index-pack.c:1521

 #, c-format
 msgid "bad pack.indexversion=%<PRIu32>"
 msgstr ""
 
 #, c-format
 msgid "bad pack.indexversion=%<PRIu32>"
 msgstr ""
 

-#: builtin/index-pack.c:1581
+#: builtin/index-pack.c:1590

 #, c-format
 msgid "Cannot open existing pack file '%s'"
 msgstr ""
 
 #, c-format
 msgid "Cannot open existing pack file '%s'"
 msgstr ""
 

-#: builtin/index-pack.c:1583
+#: builtin/index-pack.c:1592

 #, 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:1631
+#: builtin/index-pack.c:1640

 #, 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:1638
+#: builtin/index-pack.c:1647

 #, 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:1675
+#: builtin/index-pack.c:1684

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

-#: builtin/index-pack.c:1724 builtin/index-pack.c:1727
-#: builtin/index-pack.c:1743 builtin/index-pack.c:1747
+#: builtin/index-pack.c:1735 builtin/index-pack.c:1738
+#: builtin/index-pack.c:1754 builtin/index-pack.c:1758

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

-#: builtin/index-pack.c:1763
+#: builtin/index-pack.c:1774

 msgid "--fix-thin cannot be used without --stdin"
 msgstr ""
 
 msgid "--fix-thin cannot be used without --stdin"
 msgstr ""
 

-#: builtin/index-pack.c:1765
+#: builtin/index-pack.c:1776

 msgid "--stdin requires a git repository"
 msgstr ""
 
 msgid "--stdin requires a git repository"
 msgstr ""
 

-#: builtin/index-pack.c:1771
+#: builtin/index-pack.c:1782

 msgid "--verify with no packfile name given"
 msgstr ""
 
 msgid "--verify with no packfile name given"
 msgstr ""
 

+#: builtin/index-pack.c:1832 builtin/unpack-objects.c:578
+msgid "fsck error in pack objects"
+msgstr ""
+

 #: builtin/init-db.c:55
 #, c-format
 msgid "cannot stat '%s'"
 #: builtin/init-db.c:55
 #, c-format
 msgid "cannot stat '%s'"


@@ -9112,11 +9498,6 @@ msgstr ""
 msgid "specify that the git repository is to be shared amongst several users"
 msgstr ""
 
 msgid "specify that the git repository is to be shared amongst several users"
 msgstr ""
 

-#: builtin/init-db.c:516 builtin/init-db.c:521
-#, c-format
-msgid "cannot mkdir %s"
-msgstr ""
-

 #: builtin/init-db.c:525
 #, c-format
 msgid "cannot chdir to %s"
 #: builtin/init-db.c:525
 #, c-format
 msgid "cannot chdir to %s"


@@ -9296,7 +9677,7 @@ msgstr ""
 msgid "Unknown commit %s"
 msgstr ""
 
 msgid "Unknown commit %s"
 msgstr ""
 

-#: builtin/log.c:1289 builtin/notes.c:887 builtin/tag.c:522
+#: builtin/log.c:1289 builtin/notes.c:887 builtin/tag.c:523

 #, c-format
 msgid "Failed to resolve '%s' as a valid ref."
 msgstr ""
 #, c-format
 msgid "Failed to resolve '%s' as a valid ref."
 msgstr ""


@@ -9641,46 +10022,46 @@ msgstr ""
 msgid "show debugging data"
 msgstr ""
 
 msgid "show debugging data"
 msgstr ""
 

-#: builtin/ls-remote.c:7
+#: builtin/ls-remote.c:9

 msgid ""
 "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
 "                     [-q | --quiet] [--exit-code] [--get-url]\n"
 "                     [--symref] [<repository> [<refs>...]]"
 msgstr ""
 
 msgid ""
 "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
 "                     [-q | --quiet] [--exit-code] [--get-url]\n"
 "                     [--symref] [<repository> [<refs>...]]"
 msgstr ""
 

-#: builtin/ls-remote.c:52
+#: builtin/ls-remote.c:59

 msgid "do not print remote URL"
 msgstr ""
 
 msgid "do not print remote URL"
 msgstr ""
 

-#: builtin/ls-remote.c:53 builtin/ls-remote.c:55
+#: builtin/ls-remote.c:60 builtin/ls-remote.c:62

 msgid "exec"
 msgstr ""
 
 msgid "exec"
 msgstr ""
 

-#: builtin/ls-remote.c:54 builtin/ls-remote.c:56
+#: builtin/ls-remote.c:61 builtin/ls-remote.c:63

 msgid "path of git-upload-pack on the remote host"
 msgstr ""
 
 msgid "path of git-upload-pack on the remote host"
 msgstr ""
 

-#: builtin/ls-remote.c:58
+#: builtin/ls-remote.c:65

 msgid "limit to tags"
 msgstr ""
 
 msgid "limit to tags"
 msgstr ""
 

-#: builtin/ls-remote.c:59
+#: builtin/ls-remote.c:66

 msgid "limit to heads"
 msgstr ""
 
 msgid "limit to heads"
 msgstr ""
 

-#: builtin/ls-remote.c:60
+#: builtin/ls-remote.c:67

 msgid "do not show peeled tags"
 msgstr ""
 
 msgid "do not show peeled tags"
 msgstr ""
 

-#: builtin/ls-remote.c:62
+#: builtin/ls-remote.c:69

 msgid "take url.<base>.insteadOf into account"
 msgstr ""
 
 msgid "take url.<base>.insteadOf into account"
 msgstr ""
 

-#: builtin/ls-remote.c:64
+#: builtin/ls-remote.c:73

 msgid "exit with exit code 2 if no matching refs are found"
 msgstr ""
 
 msgid "exit with exit code 2 if no matching refs are found"
 msgstr ""
 

-#: builtin/ls-remote.c:67
+#: builtin/ls-remote.c:76

 msgid "show underlying ref in addition to the object pointed by it"
 msgstr ""
 
 msgid "show underlying ref in addition to the object pointed by it"
 msgstr ""
 


@@ -9725,151 +10106,151 @@ msgstr ""
 msgid "empty mbox: '%s'"
 msgstr ""
 
 msgid "empty mbox: '%s'"
 msgstr ""
 

-#: builtin/merge.c:49
+#: builtin/merge.c:50

 msgid "git merge [<options>] [<commit>...]"
 msgstr ""
 
 msgid "git merge [<options>] [<commit>...]"
 msgstr ""
 

-#: builtin/merge.c:50
+#: builtin/merge.c:51

 msgid "git merge --abort"
 msgstr ""
 
 msgid "git merge --abort"
 msgstr ""
 

-#: builtin/merge.c:51
+#: builtin/merge.c:52

 msgid "git merge --continue"
 msgstr ""
 
 msgid "git merge --continue"
 msgstr ""
 

-#: builtin/merge.c:108
+#: builtin/merge.c:109

 msgid "switch `m' requires a value"
 msgstr ""
 
 msgid "switch `m' requires a value"
 msgstr ""
 

-#: builtin/merge.c:145
+#: builtin/merge.c:146

 #, 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:146
+#: builtin/merge.c:147

 #, c-format
 msgid "Available strategies are:"
 msgstr ""
 
 #, c-format
 msgid "Available strategies are:"
 msgstr ""
 

-#: builtin/merge.c:151
+#: builtin/merge.c:152

 #, c-format
 msgid "Available custom strategies are:"
 msgstr ""
 
 #, c-format
 msgid "Available custom strategies are:"
 msgstr ""
 

-#: builtin/merge.c:201 builtin/pull.c:137
+#: builtin/merge.c:202 builtin/pull.c:142

 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:204 builtin/pull.c:140
+#: builtin/merge.c:205 builtin/pull.c:145

 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:205 builtin/pull.c:143
+#: builtin/merge.c:206 builtin/pull.c:148

 msgid "(synonym to --stat)"
 msgstr ""
 
 msgid "(synonym to --stat)"
 msgstr ""
 

-#: builtin/merge.c:207 builtin/pull.c:146
+#: builtin/merge.c:208 builtin/pull.c:151

 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:210 builtin/pull.c:152
+#: builtin/merge.c:211 builtin/pull.c:157

 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:212 builtin/pull.c:155
+#: builtin/merge.c:213 builtin/pull.c:160

 msgid "perform a commit if the merge succeeds (default)"
 msgstr ""
 
 msgid "perform a commit if the merge succeeds (default)"
 msgstr ""
 

-#: builtin/merge.c:214 builtin/pull.c:158
+#: builtin/merge.c:215 builtin/pull.c:163

 msgid "edit message before committing"
 msgstr ""
 
 msgid "edit message before committing"
 msgstr ""
 

-#: builtin/merge.c:215
+#: builtin/merge.c:216

 msgid "allow fast-forward (default)"
 msgstr ""
 
 msgid "allow fast-forward (default)"
 msgstr ""
 

-#: builtin/merge.c:217 builtin/pull.c:164
+#: builtin/merge.c:218 builtin/pull.c:169

 msgid "abort if fast-forward is not possible"
 msgstr ""
 
 msgid "abort if fast-forward is not possible"
 msgstr ""
 

-#: builtin/merge.c:221 builtin/pull.c:167
+#: builtin/merge.c:222 builtin/pull.c:172

 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:222 builtin/notes.c:777 builtin/pull.c:171
+#: builtin/merge.c:223 builtin/notes.c:777 builtin/pull.c:176

 #: builtin/revert.c:109
 msgid "strategy"
 msgstr ""
 
 #: builtin/revert.c:109
 msgid "strategy"
 msgstr ""
 

-#: builtin/merge.c:223 builtin/pull.c:172
+#: builtin/merge.c:224 builtin/pull.c:177

 msgid "merge strategy to use"
 msgstr ""
 
 msgid "merge strategy to use"
 msgstr ""
 

-#: builtin/merge.c:224 builtin/pull.c:175
+#: builtin/merge.c:225 builtin/pull.c:180

 msgid "option=value"
 msgstr ""
 
 msgid "option=value"
 msgstr ""
 

-#: builtin/merge.c:225 builtin/pull.c:176
+#: builtin/merge.c:226 builtin/pull.c:181

 msgid "option for selected merge strategy"
 msgstr ""
 
 msgid "option for selected merge strategy"
 msgstr ""
 

-#: builtin/merge.c:227
+#: builtin/merge.c:228

 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:231
+#: builtin/merge.c:232

 msgid "abort the current in-progress merge"
 msgstr ""
 
 msgid "abort the current in-progress merge"
 msgstr ""
 

-#: builtin/merge.c:233
+#: builtin/merge.c:234

 msgid "continue the current in-progress merge"
 msgstr ""
 
 msgid "continue the current in-progress merge"
 msgstr ""
 

-#: builtin/merge.c:235 builtin/pull.c:183
+#: builtin/merge.c:236 builtin/pull.c:188

 msgid "allow merging unrelated histories"
 msgstr ""
 
 msgid "allow merging unrelated histories"
 msgstr ""
 

-#: builtin/merge.c:241
+#: builtin/merge.c:242

 msgid "verify commit-msg hook"
 msgstr ""
 
 msgid "verify commit-msg hook"
 msgstr ""
 

-#: builtin/merge.c:266
+#: builtin/merge.c:267

 msgid "could not run stash."
 msgstr ""
 
 msgid "could not run stash."
 msgstr ""
 

-#: builtin/merge.c:271
+#: builtin/merge.c:272

 msgid "stash failed"
 msgstr ""
 
 msgid "stash failed"
 msgstr ""
 

-#: builtin/merge.c:276
+#: builtin/merge.c:277

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

-#: builtin/merge.c:298 builtin/merge.c:315
+#: builtin/merge.c:299 builtin/merge.c:316

 msgid "read-tree failed"
 msgstr ""
 
 msgid "read-tree failed"
 msgstr ""
 

-#: builtin/merge.c:345
+#: builtin/merge.c:346

 msgid " (nothing to squash)"
 msgstr ""
 
 msgid " (nothing to squash)"
 msgstr ""
 

-#: builtin/merge.c:356
+#: builtin/merge.c:357

 #, c-format
 msgid "Squash commit -- not updating HEAD\n"
 msgstr ""
 
 #, c-format
 msgid "Squash commit -- not updating HEAD\n"
 msgstr ""
 

-#: builtin/merge.c:406
+#: builtin/merge.c:407

 #, 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:456
+#: builtin/merge.c:457

 #, 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:546
+#: builtin/merge.c:547

 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr ""
 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr ""


@@ -9888,17 +10269,17 @@ msgstr ""
 msgid "unable to write %s"
 msgstr ""
 
 msgid "unable to write %s"
 msgstr ""
 

-#: builtin/merge.c:749
+#: builtin/merge.c:748

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

-#: builtin/merge.c:758
+#: builtin/merge.c:757

 #, 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:764
+#: builtin/merge.c:763

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


@@ -9908,185 +10289,185 @@ msgid ""
 "the commit.\n"
 msgstr ""
 
 "the commit.\n"
 msgstr ""
 

-#: builtin/merge.c:800
+#: builtin/merge.c:799

 msgid "Empty commit message."
 msgstr ""
 
 msgid "Empty commit message."
 msgstr ""
 

-#: builtin/merge.c:820
+#: builtin/merge.c:818

 #, c-format
 msgid "Wonderful.\n"
 msgstr ""
 
 #, c-format
 msgid "Wonderful.\n"
 msgstr ""
 

-#: builtin/merge.c:873
+#: builtin/merge.c:871

 #, 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:912
+#: builtin/merge.c:910

 msgid "No current branch."
 msgstr ""
 
 msgid "No current branch."
 msgstr ""
 

-#: builtin/merge.c:914
+#: builtin/merge.c:912

 msgid "No remote for the current branch."
 msgstr ""
 
 msgid "No remote for the current branch."
 msgstr ""
 

-#: builtin/merge.c:916
+#: builtin/merge.c:914

 msgid "No default upstream defined for the current branch."
 msgstr ""
 
 msgid "No default upstream defined for the current branch."
 msgstr ""
 

-#: builtin/merge.c:921
+#: builtin/merge.c:919

 #, 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:974
+#: builtin/merge.c:972

 #, c-format
 msgid "Bad value '%s' in environment '%s'"
 msgstr ""
 
 #, c-format
 msgid "Bad value '%s' in environment '%s'"
 msgstr ""
 

-#: builtin/merge.c:1076
+#: builtin/merge.c:1074

 #, 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:1110
+#: builtin/merge.c:1108

 msgid "not something we can merge"
 msgstr ""
 
 msgid "not something we can merge"
 msgstr ""
 

-#: builtin/merge.c:1212
+#: builtin/merge.c:1210

 msgid "--abort expects no arguments"
 msgstr ""
 
 msgid "--abort expects no arguments"
 msgstr ""
 

-#: builtin/merge.c:1216
+#: builtin/merge.c:1214

 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:1228
+#: builtin/merge.c:1226

 msgid "--continue expects no arguments"
 msgstr ""
 
 msgid "--continue expects no arguments"
 msgstr ""
 

-#: builtin/merge.c:1232
+#: builtin/merge.c:1230

 msgid "There is no merge in progress (MERGE_HEAD missing)."
 msgstr ""
 
 msgid "There is no merge in progress (MERGE_HEAD missing)."
 msgstr ""
 

-#: builtin/merge.c:1248
+#: builtin/merge.c:1246

 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:1255
+#: builtin/merge.c:1253

 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:1258
+#: builtin/merge.c:1256

 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:1267
+#: builtin/merge.c:1265

 msgid "You cannot combine --squash with --no-ff."
 msgstr ""
 
 msgid "You cannot combine --squash with --no-ff."
 msgstr ""
 

-#: builtin/merge.c:1275
+#: builtin/merge.c:1273

 msgid "No commit specified and merge.defaultToUpstream not set."
 msgstr ""
 
 msgid "No commit specified and merge.defaultToUpstream not set."
 msgstr ""
 

-#: builtin/merge.c:1292
+#: builtin/merge.c:1290

 msgid "Squash commit into empty head not supported yet"
 msgstr ""
 
 msgid "Squash commit into empty head not supported yet"
 msgstr ""
 

-#: builtin/merge.c:1294
+#: builtin/merge.c:1292

 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:1299
+#: builtin/merge.c:1297

 #, c-format
 msgid "%s - not something we can merge"
 msgstr ""
 
 #, c-format
 msgid "%s - not something we can merge"
 msgstr ""
 

-#: builtin/merge.c:1301
+#: builtin/merge.c:1299

 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:1335
+#: builtin/merge.c:1333

 #, 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:1338
+#: builtin/merge.c:1336

 #, 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:1341
+#: builtin/merge.c:1339

 #, 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:1344
+#: builtin/merge.c:1342

 #, 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:1403
+#: builtin/merge.c:1401

 msgid "refusing to merge unrelated histories"
 msgstr ""
 
 msgid "refusing to merge unrelated histories"
 msgstr ""
 

-#: builtin/merge.c:1412
+#: builtin/merge.c:1410

 msgid "Already up to date."
 msgstr ""
 
 msgid "Already up to date."
 msgstr ""
 

-#: builtin/merge.c:1422
+#: builtin/merge.c:1420

 #, c-format
 msgid "Updating %s..%s\n"
 msgstr ""
 
 #, c-format
 msgid "Updating %s..%s\n"
 msgstr ""
 

-#: builtin/merge.c:1463
+#: builtin/merge.c:1461

 #, 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:1470
+#: builtin/merge.c:1468

 #, c-format
 msgid "Nope.\n"
 msgstr ""
 
 #, c-format
 msgid "Nope.\n"
 msgstr ""
 

-#: builtin/merge.c:1495
+#: builtin/merge.c:1493

 msgid "Already up to date. Yeeah!"
 msgstr ""
 
 msgid "Already up to date. Yeeah!"
 msgstr ""
 

-#: builtin/merge.c:1501
+#: builtin/merge.c:1499

 msgid "Not possible to fast-forward, aborting."
 msgstr ""
 
 msgid "Not possible to fast-forward, aborting."
 msgstr ""
 

-#: builtin/merge.c:1524 builtin/merge.c:1603
+#: builtin/merge.c:1522 builtin/merge.c:1601

 #, c-format
 msgid "Rewinding the tree to pristine...\n"
 msgstr ""
 
 #, c-format
 msgid "Rewinding the tree to pristine...\n"
 msgstr ""
 

-#: builtin/merge.c:1528
+#: builtin/merge.c:1526

 #, c-format
 msgid "Trying merge strategy %s...\n"
 msgstr ""
 
 #, c-format
 msgid "Trying merge strategy %s...\n"
 msgstr ""
 

-#: builtin/merge.c:1594
+#: builtin/merge.c:1592

 #, 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:1596
+#: builtin/merge.c:1594

 #, c-format
 msgid "Merge with strategy %s failed.\n"
 msgstr ""
 
 #, c-format
 msgid "Merge with strategy %s failed.\n"
 msgstr ""
 

-#: builtin/merge.c:1605
+#: builtin/merge.c:1603

 #, 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:1617
+#: builtin/merge.c:1615

 #, 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 ""


@@ -10220,25 +10601,25 @@ msgstr ""
 msgid "git mv [<options>] <source>... <destination>"
 msgstr ""
 
 msgid "git mv [<options>] <source>... <destination>"
 msgstr ""
 

-#: builtin/mv.c:83
+#: 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:85 builtin/rm.c:289
+#: builtin/mv.c:84 builtin/rm.c:288

 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:103
+#: builtin/mv.c:102

 #, c-format
 msgid "%.*s is in index"
 msgstr ""
 
 #, c-format
 msgid "%.*s is in index"
 msgstr ""
 

-#: builtin/mv.c:125
+#: 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:127
+#: builtin/mv.c:126

 msgid "skip move/rename errors"
 msgstr ""
 
 msgid "skip move/rename errors"
 msgstr ""
 


@@ -10303,7 +10684,7 @@ msgstr ""
 msgid "Renaming %s to %s\n"
 msgstr ""
 
 msgid "Renaming %s to %s\n"
 msgstr ""
 

-#: builtin/mv.c:276 builtin/remote.c:712 builtin/repack.c:394
+#: builtin/mv.c:276 builtin/remote.c:715 builtin/repack.c:409

 #, c-format
 msgid "renaming '%s' failed"
 msgstr ""
 #, c-format
 msgid "renaming '%s' failed"
 msgstr ""


@@ -10488,12 +10869,12 @@ msgstr ""
 msgid "the note contents have been left in %s"
 msgstr ""
 
 msgid "the note contents have been left in %s"
 msgstr ""
 

-#: builtin/notes.c:234 builtin/tag.c:506
+#: builtin/notes.c:234 builtin/tag.c:507

 #, c-format
 msgid "cannot read '%s'"
 msgstr ""
 
 #, c-format
 msgid "cannot read '%s'"
 msgstr ""
 

-#: builtin/notes.c:236 builtin/tag.c:509
+#: builtin/notes.c:236 builtin/tag.c:510

 #, c-format
 msgid "could not open or read '%s'"
 msgstr ""
 #, c-format
 msgid "could not open or read '%s'"
 msgstr ""


@@ -10727,7 +11108,7 @@ msgstr ""
 msgid "read object names from the standard input"
 msgstr ""
 
 msgid "read object names from the standard input"
 msgstr ""
 

-#: builtin/notes.c:943 builtin/prune.c:106 builtin/worktree.c:160
+#: builtin/notes.c:943 builtin/prune.c:107 builtin/worktree.c:151

 msgid "do not remove, show only"
 msgstr ""
 
 msgid "do not remove, show only"
 msgstr ""
 


@@ -10748,208 +11129,236 @@ msgstr ""
 msgid "unknown subcommand: %s"
 msgstr ""
 
 msgid "unknown subcommand: %s"
 msgstr ""
 

-#: builtin/pack-objects.c:33
+#: builtin/pack-objects.c:48

 msgid ""
 "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
 msgstr ""
 
 msgid ""
 "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
 msgstr ""
 

-#: builtin/pack-objects.c:34
+#: builtin/pack-objects.c:49

 msgid ""
 "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
 msgstr ""
 
 msgid ""
 "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
 msgstr ""
 

-#: builtin/pack-objects.c:195 builtin/pack-objects.c:198
+#: builtin/pack-objects.c:211 builtin/pack-objects.c:214

 #, c-format
 msgid "deflate error (%d)"
 msgstr ""
 
 #, c-format
 msgid "deflate error (%d)"
 msgstr ""
 

-#: builtin/pack-objects.c:791
+#: builtin/pack-objects.c:810

 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:804
+#: builtin/pack-objects.c:823

 msgid "Writing objects"
 msgstr ""
 
 msgid "Writing objects"
 msgstr ""
 

-#: builtin/pack-objects.c:1084
+#: builtin/pack-objects.c:1106

 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:2454
+#: builtin/pack-objects.c:1765
+msgid "Counting objects"
+msgstr ""
+
+#: builtin/pack-objects.c:1895
+#, c-format
+msgid "unable to get size of %s"
+msgstr ""
+
+#: builtin/pack-objects.c:1910
+#, c-format
+msgid "unable to parse object header of %s"
+msgstr ""
+
+#: builtin/pack-objects.c:2564

 msgid "Compressing objects"
 msgstr ""
 
 msgid "Compressing objects"
 msgstr ""
 

-#: builtin/pack-objects.c:2625
+#: builtin/pack-objects.c:2735

 msgid "invalid value for --missing"
 msgstr ""
 
 msgid "invalid value for --missing"
 msgstr ""
 

-#: builtin/pack-objects.c:2928
+#: builtin/pack-objects.c:3067

 #, c-format
 msgid "unsupported index version %s"
 msgstr ""
 
 #, c-format
 msgid "unsupported index version %s"
 msgstr ""
 

-#: builtin/pack-objects.c:2932
+#: builtin/pack-objects.c:3071

 #, c-format
 msgid "bad index version '%s'"
 msgstr ""
 
 #, c-format
 msgid "bad index version '%s'"
 msgstr ""
 

-#: builtin/pack-objects.c:2962
+#: builtin/pack-objects.c:3102

 msgid "do not show progress meter"
 msgstr ""
 
 msgid "do not show progress meter"
 msgstr ""
 

-#: builtin/pack-objects.c:2964
+#: builtin/pack-objects.c:3104

 msgid "show progress meter"
 msgstr ""
 
 msgid "show progress meter"
 msgstr ""
 

-#: builtin/pack-objects.c:2966
+#: builtin/pack-objects.c:3106

 msgid "show progress meter during object writing phase"
 msgstr ""
 
 msgid "show progress meter during object writing phase"
 msgstr ""
 

-#: builtin/pack-objects.c:2969
+#: builtin/pack-objects.c:3109

 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:2970
+#: builtin/pack-objects.c:3110

 msgid "version[,offset]"
 msgstr ""
 
 msgid "version[,offset]"
 msgstr ""
 

-#: builtin/pack-objects.c:2971
+#: builtin/pack-objects.c:3111

 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:2974
+#: builtin/pack-objects.c:3114

 msgid "maximum size of each output pack file"
 msgstr ""
 
 msgid "maximum size of each output pack file"
 msgstr ""
 

-#: builtin/pack-objects.c:2976
+#: builtin/pack-objects.c:3116

 msgid "ignore borrowed objects from alternate object store"
 msgstr ""
 
 msgid "ignore borrowed objects from alternate object store"
 msgstr ""
 

-#: builtin/pack-objects.c:2978
+#: builtin/pack-objects.c:3118

 msgid "ignore packed objects"
 msgstr ""
 
 msgid "ignore packed objects"
 msgstr ""
 

-#: builtin/pack-objects.c:2980
+#: builtin/pack-objects.c:3120

 msgid "limit pack window by objects"
 msgstr ""
 
 msgid "limit pack window by objects"
 msgstr ""
 

-#: builtin/pack-objects.c:2982
+#: builtin/pack-objects.c:3122

 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:2984
+#: builtin/pack-objects.c:3124

 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:2986
+#: builtin/pack-objects.c:3126

 msgid "reuse existing deltas"
 msgstr ""
 
 msgid "reuse existing deltas"
 msgstr ""
 

-#: builtin/pack-objects.c:2988
+#: builtin/pack-objects.c:3128

 msgid "reuse existing objects"
 msgstr ""
 
 msgid "reuse existing objects"
 msgstr ""
 

-#: builtin/pack-objects.c:2990
+#: builtin/pack-objects.c:3130

 msgid "use OFS_DELTA objects"
 msgstr ""
 
 msgid "use OFS_DELTA objects"
 msgstr ""
 

-#: builtin/pack-objects.c:2992
+#: builtin/pack-objects.c:3132

 msgid "use threads when searching for best delta matches"
 msgstr ""
 
 msgid "use threads when searching for best delta matches"
 msgstr ""
 

-#: builtin/pack-objects.c:2994
+#: builtin/pack-objects.c:3134

 msgid "do not create an empty pack output"
 msgstr ""
 
 msgid "do not create an empty pack output"
 msgstr ""
 

-#: builtin/pack-objects.c:2996
+#: builtin/pack-objects.c:3136

 msgid "read revision arguments from standard input"
 msgstr ""
 
 msgid "read revision arguments from standard input"
 msgstr ""
 

-#: builtin/pack-objects.c:2998
+#: builtin/pack-objects.c:3138

 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:3001
+#: builtin/pack-objects.c:3141

 msgid "include objects reachable from any reference"
 msgstr ""
 
 msgid "include objects reachable from any reference"
 msgstr ""
 

-#: builtin/pack-objects.c:3004
+#: builtin/pack-objects.c:3144

 msgid "include objects referred by reflog entries"
 msgstr ""
 
 msgid "include objects referred by reflog entries"
 msgstr ""
 

-#: builtin/pack-objects.c:3007
+#: builtin/pack-objects.c:3147

 msgid "include objects referred to by the index"
 msgstr ""
 
 msgid "include objects referred to by the index"
 msgstr ""
 

-#: builtin/pack-objects.c:3010
+#: builtin/pack-objects.c:3150

 msgid "output pack to stdout"
 msgstr ""
 
 msgid "output pack to stdout"
 msgstr ""
 

-#: builtin/pack-objects.c:3012
+#: builtin/pack-objects.c:3152

 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:3014
+#: builtin/pack-objects.c:3154

 msgid "keep unreachable objects"
 msgstr ""
 
 msgid "keep unreachable objects"
 msgstr ""
 

-#: builtin/pack-objects.c:3016
+#: builtin/pack-objects.c:3156

 msgid "pack loose unreachable objects"
 msgstr ""
 
 msgid "pack loose unreachable objects"
 msgstr ""
 

-#: builtin/pack-objects.c:3018
+#: builtin/pack-objects.c:3158

 msgid "unpack unreachable objects newer than <time>"
 msgstr ""
 
 msgid "unpack unreachable objects newer than <time>"
 msgstr ""
 

-#: builtin/pack-objects.c:3021
+#: builtin/pack-objects.c:3161

 msgid "create thin packs"
 msgstr ""
 
 msgid "create thin packs"
 msgstr ""
 

-#: builtin/pack-objects.c:3023
+#: builtin/pack-objects.c:3163

 msgid "create packs suitable for shallow fetches"
 msgstr ""
 
 msgid "create packs suitable for shallow fetches"
 msgstr ""
 

-#: builtin/pack-objects.c:3025
+#: builtin/pack-objects.c:3165

 msgid "ignore packs that have companion .keep file"
 msgstr ""
 
 msgid "ignore packs that have companion .keep file"
 msgstr ""
 

-#: builtin/pack-objects.c:3027
+#: builtin/pack-objects.c:3167
+msgid "ignore this pack"
+msgstr ""
+
+#: builtin/pack-objects.c:3169

 msgid "pack compression level"
 msgstr ""
 
 msgid "pack compression level"
 msgstr ""
 

-#: builtin/pack-objects.c:3029
+#: builtin/pack-objects.c:3171

 msgid "do not hide commits by grafts"
 msgstr ""
 
 msgid "do not hide commits by grafts"
 msgstr ""
 

-#: builtin/pack-objects.c:3031
+#: builtin/pack-objects.c:3173

 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:3033
+#: builtin/pack-objects.c:3175

 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:3036
+#: builtin/pack-objects.c:3178

 msgid "handling for missing objects"
 msgstr ""
 
 msgid "handling for missing objects"
 msgstr ""
 

-#: builtin/pack-objects.c:3039
+#: builtin/pack-objects.c:3181

 msgid "do not pack objects in promisor packfiles"
 msgstr ""
 
 msgid "do not pack objects in promisor packfiles"
 msgstr ""
 

-#: builtin/pack-objects.c:3178
-msgid "Counting objects"
+#: builtin/pack-objects.c:3205
+#, c-format
+msgid "delta chain depth %d is too deep, forcing %d"
+msgstr ""
+
+#: builtin/pack-objects.c:3210
+#, c-format
+msgid "pack.deltaCacheLimit is too high, forcing %d"

 msgstr ""
 
 msgstr ""
 

-#: builtin/pack-refs.c:6
+#: builtin/pack-objects.c:3338
+msgid "Enumerating objects"
+msgstr ""
+
+#: builtin/pack-refs.c:7

 msgid "git pack-refs [<options>]"
 msgstr ""
 
 msgid "git pack-refs [<options>]"
 msgstr ""
 

-#: builtin/pack-refs.c:14
+#: builtin/pack-refs.c:15

 msgid "pack everything"
 msgstr ""
 
 msgid "pack everything"
 msgstr ""
 

-#: builtin/pack-refs.c:15
+#: builtin/pack-refs.c:16

 msgid "prune loose refs (default)"
 msgstr ""
 
 msgid "prune loose refs (default)"
 msgstr ""
 


@@ -10965,82 +11374,82 @@ msgstr ""
 msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
 msgstr ""
 
 msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
 msgstr ""
 

-#: builtin/prune.c:107
+#: builtin/prune.c:108

 msgid "report pruned objects"
 msgstr ""
 
 msgid "report pruned objects"
 msgstr ""
 

-#: builtin/prune.c:110
+#: builtin/prune.c:111

 msgid "expire objects older than <time>"
 msgstr ""
 
 msgid "expire objects older than <time>"
 msgstr ""
 

-#: builtin/prune.c:112
+#: builtin/prune.c:113

 msgid "limit traversal to objects outside promisor packfiles"
 msgstr ""
 
 msgid "limit traversal to objects outside promisor packfiles"
 msgstr ""
 

-#: builtin/prune.c:126
+#: builtin/prune.c:127

 msgid "cannot prune in a precious-objects repo"
 msgstr ""
 
 msgid "cannot prune in a precious-objects repo"
 msgstr ""
 

-#: builtin/pull.c:54 builtin/pull.c:56
+#: builtin/pull.c:59 builtin/pull.c:61

 #, c-format
 msgid "Invalid value for %s: %s"
 msgstr ""
 
 #, c-format
 msgid "Invalid value for %s: %s"
 msgstr ""
 

-#: builtin/pull.c:76
+#: builtin/pull.c:81

 msgid "git pull [<options>] [<repository> [<refspec>...]]"
 msgstr ""
 
 msgid "git pull [<options>] [<repository> [<refspec>...]]"
 msgstr ""
 

-#: builtin/pull.c:127
+#: builtin/pull.c:132

 msgid "control for recursive fetching of submodules"
 msgstr ""
 
 msgid "control for recursive fetching of submodules"
 msgstr ""
 

-#: builtin/pull.c:131
+#: builtin/pull.c:136

 msgid "Options related to merging"
 msgstr ""
 
 msgid "Options related to merging"
 msgstr ""
 

-#: builtin/pull.c:134
+#: builtin/pull.c:139

 msgid "incorporate changes by rebasing rather than merging"
 msgstr ""
 
 msgid "incorporate changes by rebasing rather than merging"
 msgstr ""
 

-#: builtin/pull.c:161 builtin/rebase--helper.c:23 builtin/revert.c:121
+#: builtin/pull.c:166 builtin/rebase--helper.c:23 builtin/revert.c:121

 msgid "allow fast-forward"
 msgstr ""
 
 msgid "allow fast-forward"
 msgstr ""
 

-#: builtin/pull.c:170
+#: builtin/pull.c:175

 msgid "automatically stash/stash pop before and after rebase"
 msgstr ""
 
 msgid "automatically stash/stash pop before and after rebase"
 msgstr ""
 

-#: builtin/pull.c:186
+#: builtin/pull.c:191

 msgid "Options related to fetching"
 msgstr ""
 
 msgid "Options related to fetching"
 msgstr ""
 

-#: builtin/pull.c:204
+#: builtin/pull.c:209

 msgid "number of submodules pulled in parallel"
 msgstr ""
 
 msgid "number of submodules pulled in parallel"
 msgstr ""
 

-#: builtin/pull.c:299
+#: builtin/pull.c:304

 #, c-format
 msgid "Invalid value for pull.ff: %s"
 msgstr ""
 
 #, c-format
 msgid "Invalid value for pull.ff: %s"
 msgstr ""
 

-#: builtin/pull.c:415
+#: builtin/pull.c:420

 msgid ""
 "There is no candidate for rebasing against among the refs that you just "
 "fetched."
 msgstr ""
 
 msgid ""
 "There is no candidate for rebasing against among the refs that you just "
 "fetched."
 msgstr ""
 

-#: builtin/pull.c:417
+#: builtin/pull.c:422

 msgid ""
 "There are no candidates for merging among the refs that you just fetched."
 msgstr ""
 
 msgid ""
 "There are no candidates for merging among the refs that you just fetched."
 msgstr ""
 

-#: builtin/pull.c:418
+#: builtin/pull.c:423

 msgid ""
 "Generally this means that you provided a wildcard refspec which had no\n"
 "matches on the remote end."
 msgstr ""
 
 msgid ""
 "Generally this means that you provided a wildcard refspec which had no\n"
 "matches on the remote end."
 msgstr ""
 

-#: builtin/pull.c:421
+#: builtin/pull.c:426

 #, c-format
 msgid ""
 "You asked to pull from the remote '%s', but did not specify\n"
 #, c-format
 msgid ""
 "You asked to pull from the remote '%s', but did not specify\n"


@@ -11048,69 +11457,69 @@ msgid ""
 "for your current branch, you must specify a branch on the command line."
 msgstr ""
 
 "for your current branch, you must specify a branch on the command line."
 msgstr ""
 

-#: builtin/pull.c:426 git-parse-remote.sh:73
+#: builtin/pull.c:431 git-parse-remote.sh:73

 msgid "You are not currently on a branch."
 msgstr ""
 
 msgid "You are not currently on a branch."
 msgstr ""
 

-#: builtin/pull.c:428 builtin/pull.c:443 git-parse-remote.sh:79
+#: builtin/pull.c:433 builtin/pull.c:448 git-parse-remote.sh:79

 msgid "Please specify which branch you want to rebase against."
 msgstr ""
 
 msgid "Please specify which branch you want to rebase against."
 msgstr ""
 

-#: builtin/pull.c:430 builtin/pull.c:445 git-parse-remote.sh:82
+#: builtin/pull.c:435 builtin/pull.c:450 git-parse-remote.sh:82

 msgid "Please specify which branch you want to merge with."
 msgstr ""
 
 msgid "Please specify which branch you want to merge with."
 msgstr ""
 

-#: builtin/pull.c:431 builtin/pull.c:446
+#: builtin/pull.c:436 builtin/pull.c:451

 msgid "See git-pull(1) for details."
 msgstr ""
 
 msgid "See git-pull(1) for details."
 msgstr ""
 

-#: builtin/pull.c:433 builtin/pull.c:439 builtin/pull.c:448
+#: builtin/pull.c:438 builtin/pull.c:444 builtin/pull.c:453

 #: git-parse-remote.sh:64
 msgid "<remote>"
 msgstr ""
 
 #: git-parse-remote.sh:64
 msgid "<remote>"
 msgstr ""
 

-#: builtin/pull.c:433 builtin/pull.c:448 builtin/pull.c:453 git-rebase.sh:477
+#: builtin/pull.c:438 builtin/pull.c:453 builtin/pull.c:458 git-rebase.sh:523

 #: git-parse-remote.sh:65
 msgid "<branch>"
 msgstr ""
 
 #: git-parse-remote.sh:65
 msgid "<branch>"
 msgstr ""
 

-#: builtin/pull.c:441 git-parse-remote.sh:75
+#: builtin/pull.c:446 git-parse-remote.sh:75

 msgid "There is no tracking information for the current branch."
 msgstr ""
 
 msgid "There is no tracking information for the current branch."
 msgstr ""
 

-#: builtin/pull.c:450 git-parse-remote.sh:95
+#: builtin/pull.c:455 git-parse-remote.sh:95

 msgid ""
 "If you wish to set tracking information for this branch you can do so with:"
 msgstr ""
 
 msgid ""
 "If you wish to set tracking information for this branch you can do so with:"
 msgstr ""
 

-#: builtin/pull.c:455
+#: builtin/pull.c:460

 #, c-format
 msgid ""
 "Your configuration specifies to merge with the ref '%s'\n"
 "from the remote, but no such ref was fetched."
 msgstr ""
 
 #, c-format
 msgid ""
 "Your configuration specifies to merge with the ref '%s'\n"
 "from the remote, but no such ref was fetched."
 msgstr ""
 

-#: builtin/pull.c:819
+#: builtin/pull.c:826

 msgid "ignoring --verify-signatures for rebase"
 msgstr ""
 
 msgid "ignoring --verify-signatures for rebase"
 msgstr ""
 

-#: builtin/pull.c:867
+#: builtin/pull.c:874

 msgid "--[no-]autostash option is only valid with --rebase."
 msgstr ""
 
 msgid "--[no-]autostash option is only valid with --rebase."
 msgstr ""
 

-#: builtin/pull.c:875
+#: builtin/pull.c:882

 msgid "Updating an unborn branch with changes added to the index."
 msgstr ""
 
 msgid "Updating an unborn branch with changes added to the index."
 msgstr ""
 

-#: builtin/pull.c:878
+#: builtin/pull.c:885

 msgid "pull with rebase"
 msgstr ""
 
 msgid "pull with rebase"
 msgstr ""
 

-#: builtin/pull.c:879
+#: builtin/pull.c:886

 msgid "please commit or stash them."
 msgstr ""
 
 msgid "please commit or stash them."
 msgstr ""
 

-#: builtin/pull.c:904
+#: builtin/pull.c:911

 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"
 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"


@@ -11118,7 +11527,7 @@ msgid ""
 "commit %s."
 msgstr ""
 
 "commit %s."
 msgstr ""
 

-#: builtin/pull.c:909
+#: builtin/pull.c:916

 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"
 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"


@@ -11129,37 +11538,37 @@ msgid ""
 "to recover."
 msgstr ""
 
 "to recover."
 msgstr ""
 

-#: builtin/pull.c:924
+#: builtin/pull.c:931

 msgid "Cannot merge multiple branches into empty head."
 msgstr ""
 
 msgid "Cannot merge multiple branches into empty head."
 msgstr ""
 

-#: builtin/pull.c:928
+#: builtin/pull.c:935

 msgid "Cannot rebase onto multiple branches."
 msgstr ""
 
 msgid "Cannot rebase onto multiple branches."
 msgstr ""
 

-#: builtin/pull.c:935
+#: builtin/pull.c:942

 msgid "cannot rebase with locally recorded submodule modifications"
 msgstr ""
 
 msgid "cannot rebase with locally recorded submodule modifications"
 msgstr ""
 

-#: builtin/push.c:17
+#: builtin/push.c:19

 msgid "git push [<options>] [<repository> [<refspec>...]]"
 msgstr ""
 
 msgid "git push [<options>] [<repository> [<refspec>...]]"
 msgstr ""
 

-#: builtin/push.c:92
+#: builtin/push.c:111

 msgid "tag shorthand without <tag>"
 msgstr ""
 
 msgid "tag shorthand without <tag>"
 msgstr ""
 

-#: builtin/push.c:102
+#: builtin/push.c:121

 msgid "--delete only accepts plain target ref names"
 msgstr ""
 
 msgid "--delete only accepts plain target ref names"
 msgstr ""
 

-#: builtin/push.c:146
+#: builtin/push.c:165

 msgid ""
 "\n"
 "To choose either option permanently, see push.default in 'git help config'."
 msgstr ""
 
 msgid ""
 "\n"
 "To choose either option permanently, see push.default in 'git help config'."
 msgstr ""
 

-#: builtin/push.c:149
+#: builtin/push.c:168

 #, c-format
 msgid ""
 "The upstream branch of your current branch does not match\n"
 #, c-format
 msgid ""
 "The upstream branch of your current branch does not match\n"


@@ -11174,7 +11583,7 @@ msgid ""
 "%s"
 msgstr ""
 
 "%s"
 msgstr ""
 

-#: builtin/push.c:164
+#: builtin/push.c:183

 #, c-format
 msgid ""
 "You are not currently on a branch.\n"
 #, c-format
 msgid ""
 "You are not currently on a branch.\n"


@@ -11184,7 +11593,7 @@ msgid ""
 "    git push %s HEAD:<name-of-remote-branch>\n"
 msgstr ""
 
 "    git push %s HEAD:<name-of-remote-branch>\n"
 msgstr ""
 

-#: builtin/push.c:178
+#: builtin/push.c:197

 #, c-format
 msgid ""
 "The current branch %s has no upstream branch.\n"
 #, c-format
 msgid ""
 "The current branch %s has no upstream branch.\n"


@@ -11193,12 +11602,12 @@ msgid ""
 "    git push --set-upstream %s %s\n"
 msgstr ""
 
 "    git push --set-upstream %s %s\n"
 msgstr ""
 

-#: builtin/push.c:186
+#: builtin/push.c:205

 #, c-format
 msgid "The current branch %s has multiple upstream branches, refusing to push."
 msgstr ""
 
 #, c-format
 msgid "The current branch %s has multiple upstream branches, refusing to push."
 msgstr ""
 

-#: builtin/push.c:189
+#: builtin/push.c:208

 #, c-format
 msgid ""
 "You are pushing to remote '%s', which is not the upstream of\n"
 #, c-format
 msgid ""
 "You are pushing to remote '%s', which is not the upstream of\n"


@@ -11206,12 +11615,12 @@ msgid ""
 "to update which remote branch."
 msgstr ""
 
 "to update which remote branch."
 msgstr ""
 

-#: builtin/push.c:248
+#: builtin/push.c:267

 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:255
+#: builtin/push.c:274

 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"


@@ -11219,7 +11628,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:280

 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"


@@ -11227,7 +11636,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:267
+#: builtin/push.c:286

 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"


@@ -11236,33 +11645,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:274
+#: builtin/push.c:293

 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:277
+#: builtin/push.c:296

 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:337
+#: builtin/push.c:357

 #, c-format
 msgid "Pushing to %s\n"
 msgstr ""
 
 #, c-format
 msgid "Pushing to %s\n"
 msgstr ""
 

-#: builtin/push.c:341
+#: builtin/push.c:361

 #, 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:372
+#: builtin/push.c:395

 #, c-format
 msgid "bad repository '%s'"
 msgstr ""
 
 #, c-format
 msgid "bad repository '%s'"
 msgstr ""
 

-#: builtin/push.c:373
+#: builtin/push.c:396

 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 "


@@ -11275,112 +11684,104 @@ msgid ""
 "    git push <name>\n"
 msgstr ""
 
 "    git push <name>\n"
 msgstr ""
 

-#: builtin/push.c:391
-msgid "--all and --tags are incompatible"
-msgstr ""
-
-#: builtin/push.c:392
-msgid "--all can't be combined with refspecs"
-msgstr ""
-
-#: builtin/push.c:397
-msgid "--mirror and --tags are incompatible"
-msgstr ""
-
-#: builtin/push.c:398
-msgid "--mirror can't be combined with refspecs"
-msgstr ""
-
-#: builtin/push.c:403
-msgid "--all and --mirror are incompatible"
-msgstr ""
-
-#: builtin/push.c:535
+#: builtin/push.c:551

 msgid "repository"
 msgstr ""
 
 msgid "repository"
 msgstr ""
 

-#: builtin/push.c:536 builtin/send-pack.c:163
+#: builtin/push.c:552 builtin/send-pack.c:164

 msgid "push all refs"
 msgstr ""
 
 msgid "push all refs"
 msgstr ""
 

-#: builtin/push.c:537 builtin/send-pack.c:165
+#: builtin/push.c:553 builtin/send-pack.c:166

 msgid "mirror all refs"
 msgstr ""
 
 msgid "mirror all refs"
 msgstr ""
 

-#: builtin/push.c:539
+#: builtin/push.c:555

 msgid "delete refs"
 msgstr ""
 
 msgid "delete refs"
 msgstr ""
 

-#: builtin/push.c:540
+#: builtin/push.c:556

 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:543 builtin/send-pack.c:166
+#: builtin/push.c:559 builtin/send-pack.c:167

 msgid "force updates"
 msgstr ""
 
 msgid "force updates"
 msgstr ""
 

-#: builtin/push.c:545 builtin/send-pack.c:180
+#: builtin/push.c:561 builtin/send-pack.c:181

 msgid "refname>:<expect"
 msgstr ""
 
 msgid "refname>:<expect"
 msgstr ""
 

-#: builtin/push.c:546 builtin/send-pack.c:181
+#: builtin/push.c:562 builtin/send-pack.c:182

 msgid "require old value of ref to be at this value"
 msgstr ""
 
 msgid "require old value of ref to be at this value"
 msgstr ""
 

-#: builtin/push.c:549
+#: builtin/push.c:565

 msgid "control recursive pushing of submodules"
 msgstr ""
 
 msgid "control recursive pushing of submodules"
 msgstr ""
 

-#: builtin/push.c:551 builtin/send-pack.c:174
+#: builtin/push.c:567 builtin/send-pack.c:175

 msgid "use thin pack"
 msgstr ""
 
 msgid "use thin pack"
 msgstr ""
 

-#: builtin/push.c:552 builtin/push.c:553 builtin/send-pack.c:160
-#: builtin/send-pack.c:161
+#: builtin/push.c:568 builtin/push.c:569 builtin/send-pack.c:161
+#: builtin/send-pack.c:162

 msgid "receive pack program"
 msgstr ""
 
 msgid "receive pack program"
 msgstr ""
 

-#: builtin/push.c:554
+#: builtin/push.c:570

 msgid "set upstream for git pull/status"
 msgstr ""
 
 msgid "set upstream for git pull/status"
 msgstr ""
 

-#: builtin/push.c:557
+#: builtin/push.c:573

 msgid "prune locally removed refs"
 msgstr ""
 
 msgid "prune locally removed refs"
 msgstr ""
 

-#: builtin/push.c:559
+#: builtin/push.c:575

 msgid "bypass pre-push hook"
 msgstr ""
 
 msgid "bypass pre-push hook"
 msgstr ""
 

-#: builtin/push.c:560
+#: builtin/push.c:576

 msgid "push missing but relevant tags"
 msgstr ""
 
 msgid "push missing but relevant tags"
 msgstr ""
 

-#: builtin/push.c:563 builtin/send-pack.c:168
+#: builtin/push.c:579 builtin/send-pack.c:169

 msgid "GPG sign the push"
 msgstr ""
 
 msgid "GPG sign the push"
 msgstr ""
 

-#: builtin/push.c:565 builtin/send-pack.c:175
+#: builtin/push.c:581 builtin/send-pack.c:176

 msgid "request atomic transaction on remote side"
 msgstr ""
 
 msgid "request atomic transaction on remote side"
 msgstr ""
 

-#: builtin/push.c:566 builtin/send-pack.c:171
-msgid "server-specific"
+#: builtin/push.c:599
+msgid "--delete is incompatible with --all, --mirror and --tags"

 msgstr ""
 
 msgstr ""
 

-#: builtin/push.c:566 builtin/send-pack.c:172
-msgid "option to transmit"
+#: builtin/push.c:601
+msgid "--delete doesn't make sense without any refs"

 msgstr ""
 
 msgstr ""
 

-#: builtin/push.c:583
-msgid "--delete is incompatible with --all, --mirror and --tags"
+#: builtin/push.c:604
+msgid "--all and --tags are incompatible"

 msgstr ""
 
 msgstr ""
 

-#: builtin/push.c:585
-msgid "--delete doesn't make sense without any refs"
+#: builtin/push.c:606
+msgid "--all can't be combined with refspecs"

 msgstr ""
 
 msgstr ""
 

-#: builtin/push.c:604
+#: builtin/push.c:610
+msgid "--mirror and --tags are incompatible"
+msgstr ""
+
+#: builtin/push.c:612
+msgid "--mirror can't be combined with refspecs"
+msgstr ""
+
+#: builtin/push.c:615
+msgid "--all and --mirror are incompatible"
+msgstr ""
+
+#: builtin/push.c:634

 msgid "push options must not have new line characters"
 msgstr ""
 
 msgid "push options must not have new line characters"
 msgstr ""
 


@@ -11391,67 +11792,67 @@ msgid ""
 "index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
 msgstr ""
 
 "index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
 msgstr ""
 

-#: builtin/read-tree.c:121
+#: builtin/read-tree.c:120

 msgid "write resulting index to <file>"
 msgstr ""
 
 msgid "write resulting index to <file>"
 msgstr ""
 

-#: builtin/read-tree.c:124
+#: builtin/read-tree.c:123

 msgid "only empty the index"
 msgstr ""
 
 msgid "only empty the index"
 msgstr ""
 

-#: builtin/read-tree.c:126
+#: builtin/read-tree.c:125

 msgid "Merging"
 msgstr ""
 
 msgid "Merging"
 msgstr ""
 

-#: builtin/read-tree.c:128
+#: builtin/read-tree.c:127

 msgid "perform a merge in addition to a read"
 msgstr ""
 
 msgid "perform a merge in addition to a read"
 msgstr ""
 

-#: builtin/read-tree.c:130
+#: builtin/read-tree.c:129

 msgid "3-way merge if no file level merging required"
 msgstr ""
 
 msgid "3-way merge if no file level merging required"
 msgstr ""
 

-#: builtin/read-tree.c:132
+#: builtin/read-tree.c:131

 msgid "3-way merge in presence of adds and removes"
 msgstr ""
 
 msgid "3-way merge in presence of adds and removes"
 msgstr ""
 

-#: builtin/read-tree.c:134
+#: builtin/read-tree.c:133

 msgid "same as -m, but discard unmerged entries"
 msgstr ""
 
 msgid "same as -m, but discard unmerged entries"
 msgstr ""
 

-#: builtin/read-tree.c:135
+#: builtin/read-tree.c:134

 msgid "<subdirectory>/"
 msgstr ""
 
 msgid "<subdirectory>/"
 msgstr ""
 

-#: builtin/read-tree.c:136
+#: builtin/read-tree.c:135

 msgid "read the tree into the index under <subdirectory>/"
 msgstr ""
 
 msgid "read the tree into the index under <subdirectory>/"
 msgstr ""
 

-#: builtin/read-tree.c:139
+#: builtin/read-tree.c:138

 msgid "update working tree with merge result"
 msgstr ""
 
 msgid "update working tree with merge result"
 msgstr ""
 

-#: builtin/read-tree.c:141
+#: builtin/read-tree.c:140

 msgid "gitignore"
 msgstr ""
 
 msgid "gitignore"
 msgstr ""
 

-#: builtin/read-tree.c:142
+#: builtin/read-tree.c:141

 msgid "allow explicitly ignored files to be overwritten"
 msgstr ""
 
 msgid "allow explicitly ignored files to be overwritten"
 msgstr ""
 

-#: builtin/read-tree.c:145
+#: builtin/read-tree.c:144

 msgid "don't check the working tree after merging"
 msgstr ""
 
 msgid "don't check the working tree after merging"
 msgstr ""
 

-#: builtin/read-tree.c:146
+#: builtin/read-tree.c:145

 msgid "don't update the index or the work tree"
 msgstr ""
 
 msgid "don't update the index or the work tree"
 msgstr ""
 

-#: builtin/read-tree.c:148
+#: builtin/read-tree.c:147

 msgid "skip applying sparse checkout filter"
 msgstr ""
 
 msgid "skip applying sparse checkout filter"
 msgstr ""
 

-#: builtin/read-tree.c:150
+#: builtin/read-tree.c:149

 msgid "debug unpack-trees"
 msgstr ""
 
 msgid "debug unpack-trees"
 msgstr ""
 


@@ -11468,46 +11869,58 @@ msgid "allow commits with empty messages"
 msgstr ""
 
 #: builtin/rebase--helper.c:27
 msgstr ""
 
 #: builtin/rebase--helper.c:27

-msgid "continue rebase"
+msgid "rebase merge commits"

 msgstr ""
 
 #: builtin/rebase--helper.c:29
 msgstr ""
 
 #: builtin/rebase--helper.c:29

-msgid "abort rebase"
+msgid "keep original branch points of cousins"
+msgstr ""
+
+#: builtin/rebase--helper.c:30
+msgid "continue rebase"

 msgstr ""
 
 #: builtin/rebase--helper.c:32
 msgstr ""
 
 #: builtin/rebase--helper.c:32

+msgid "abort rebase"
+msgstr ""
+
+#: builtin/rebase--helper.c:35

 msgid "make rebase script"
 msgstr ""
 
 msgid "make rebase script"
 msgstr ""
 

-#: builtin/rebase--helper.c:34
+#: builtin/rebase--helper.c:37

 msgid "shorten commit ids in the todo list"
 msgstr ""
 
 msgid "shorten commit ids in the todo list"
 msgstr ""
 

-#: builtin/rebase--helper.c:36
+#: builtin/rebase--helper.c:39

 msgid "expand commit ids in the todo list"
 msgstr ""
 
 msgid "expand commit ids in the todo list"
 msgstr ""
 

-#: builtin/rebase--helper.c:38
+#: builtin/rebase--helper.c:41

 msgid "check the todo list"
 msgstr ""
 
 msgid "check the todo list"
 msgstr ""
 

-#: builtin/rebase--helper.c:40
+#: builtin/rebase--helper.c:43

 msgid "skip unnecessary picks"
 msgstr ""
 
 msgid "skip unnecessary picks"
 msgstr ""
 

-#: builtin/rebase--helper.c:42
+#: builtin/rebase--helper.c:45

 msgid "rearrange fixup/squash lines"
 msgstr ""
 
 msgid "rearrange fixup/squash lines"
 msgstr ""
 

-#: builtin/rebase--helper.c:44
+#: builtin/rebase--helper.c:47

 msgid "insert exec commands in todo list"
 msgstr ""
 
 msgid "insert exec commands in todo list"
 msgstr ""
 

-#: builtin/receive-pack.c:30
+#: builtin/rebase--helper.c:68
+msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
+msgstr ""
+
+#: builtin/receive-pack.c:31

 msgid "git receive-pack <git-dir>"
 msgstr ""
 
 msgid "git receive-pack <git-dir>"
 msgstr ""
 

-#: builtin/receive-pack.c:841
+#: builtin/receive-pack.c:842

 msgid ""
 "By default, updating the current branch in a non-bare repository\n"
 "is denied, because it will make the index and work tree inconsistent\n"
 msgid ""
 "By default, updating the current branch in a non-bare repository\n"
 "is denied, because it will make the index and work tree inconsistent\n"


@@ -11524,7 +11937,7 @@ msgid ""
 "'receive.denyCurrentBranch' configuration variable to 'refuse'."
 msgstr ""
 
 "'receive.denyCurrentBranch' configuration variable to 'refuse'."
 msgstr ""
 

-#: builtin/receive-pack.c:861
+#: builtin/receive-pack.c:862

 msgid ""
 "By default, deleting the current branch is denied, because the next\n"
 "'git clone' won't result in any file checked out, causing confusion.\n"
 msgid ""
 "By default, deleting the current branch is denied, because the next\n"
 "'git clone' won't result in any file checked out, causing confusion.\n"


@@ -11536,11 +11949,11 @@ msgid ""
 "To squelch this message, you can set it to 'refuse'."
 msgstr ""
 
 "To squelch this message, you can set it to 'refuse'."
 msgstr ""
 

-#: builtin/receive-pack.c:1934
+#: builtin/receive-pack.c:1935

 msgid "quiet"
 msgstr ""
 
 msgid "quiet"
 msgstr ""
 

-#: builtin/receive-pack.c:1948
+#: builtin/receive-pack.c:1949

 msgid "You must specify a directory."
 msgstr ""
 
 msgid "You must specify a directory."
 msgstr ""
 


@@ -11549,176 +11962,176 @@ msgstr ""
 msgid "'%s' is not a valid timestamp"
 msgstr ""
 
 msgid "'%s' is not a valid timestamp"
 msgstr ""
 

-#: builtin/remote.c:13
+#: builtin/remote.c:14

 msgid "git remote [-v | --verbose]"
 msgstr ""
 
 msgid "git remote [-v | --verbose]"
 msgstr ""
 

-#: builtin/remote.c:14
+#: builtin/remote.c:15

 msgid ""
 "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
 "mirror=<fetch|push>] <name> <url>"
 msgstr ""
 
 msgid ""
 "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
 "mirror=<fetch|push>] <name> <url>"
 msgstr ""
 

-#: builtin/remote.c:15 builtin/remote.c:35
+#: builtin/remote.c:16 builtin/remote.c:36

 msgid "git remote rename <old> <new>"
 msgstr ""
 
 msgid "git remote rename <old> <new>"
 msgstr ""
 

-#: builtin/remote.c:16 builtin/remote.c:40
+#: builtin/remote.c:17 builtin/remote.c:41

 msgid "git remote remove <name>"
 msgstr ""
 
 msgid "git remote remove <name>"
 msgstr ""
 

-#: builtin/remote.c:17 builtin/remote.c:45
+#: builtin/remote.c:18 builtin/remote.c:46

 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
 msgstr ""
 
 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
 msgstr ""
 

-#: builtin/remote.c:18
+#: builtin/remote.c:19

 msgid "git remote [-v | --verbose] show [-n] <name>"
 msgstr ""
 
 msgid "git remote [-v | --verbose] show [-n] <name>"
 msgstr ""
 

-#: builtin/remote.c:19
+#: builtin/remote.c:20

 msgid "git remote prune [-n | --dry-run] <name>"
 msgstr ""
 
 msgid "git remote prune [-n | --dry-run] <name>"
 msgstr ""
 

-#: builtin/remote.c:20
+#: builtin/remote.c:21

 msgid ""
 "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
 msgstr ""
 
 msgid ""
 "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
 msgstr ""
 

-#: builtin/remote.c:21
+#: builtin/remote.c:22

 msgid "git remote set-branches [--add] <name> <branch>..."
 msgstr ""
 
 msgid "git remote set-branches [--add] <name> <branch>..."
 msgstr ""
 

-#: builtin/remote.c:22 builtin/remote.c:71
+#: builtin/remote.c:23 builtin/remote.c:72

 msgid "git remote get-url [--push] [--all] <name>"
 msgstr ""
 
 msgid "git remote get-url [--push] [--all] <name>"
 msgstr ""
 

-#: builtin/remote.c:23 builtin/remote.c:76
+#: builtin/remote.c:24 builtin/remote.c:77

 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
 msgstr ""
 
 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
 msgstr ""
 

-#: builtin/remote.c:24 builtin/remote.c:77
+#: builtin/remote.c:25 builtin/remote.c:78

 msgid "git remote set-url --add <name> <newurl>"
 msgstr ""
 
 msgid "git remote set-url --add <name> <newurl>"
 msgstr ""
 

-#: builtin/remote.c:25 builtin/remote.c:78
+#: builtin/remote.c:26 builtin/remote.c:79

 msgid "git remote set-url --delete <name> <url>"
 msgstr ""
 
 msgid "git remote set-url --delete <name> <url>"
 msgstr ""
 

-#: builtin/remote.c:30
+#: builtin/remote.c:31

 msgid "git remote add [<options>] <name> <url>"
 msgstr ""
 
 msgid "git remote add [<options>] <name> <url>"
 msgstr ""
 

-#: builtin/remote.c:50
+#: builtin/remote.c:51

 msgid "git remote set-branches <name> <branch>..."
 msgstr ""
 
 msgid "git remote set-branches <name> <branch>..."
 msgstr ""
 

-#: builtin/remote.c:51
+#: builtin/remote.c:52

 msgid "git remote set-branches --add <name> <branch>..."
 msgstr ""
 
 msgid "git remote set-branches --add <name> <branch>..."
 msgstr ""
 

-#: builtin/remote.c:56
+#: builtin/remote.c:57

 msgid "git remote show [<options>] <name>"
 msgstr ""
 
 msgid "git remote show [<options>] <name>"
 msgstr ""
 

-#: builtin/remote.c:61
+#: builtin/remote.c:62

 msgid "git remote prune [<options>] <name>"
 msgstr ""
 
 msgid "git remote prune [<options>] <name>"
 msgstr ""
 

-#: builtin/remote.c:66
+#: builtin/remote.c:67

 msgid "git remote update [<options>] [<group> | <remote>]..."
 msgstr ""
 
 msgid "git remote update [<options>] [<group> | <remote>]..."
 msgstr ""
 

-#: builtin/remote.c:95
+#: builtin/remote.c:96

 #, c-format
 msgid "Updating %s"
 msgstr ""
 
 #, c-format
 msgid "Updating %s"
 msgstr ""
 

-#: builtin/remote.c:127
+#: builtin/remote.c:128

 msgid ""
 "--mirror is dangerous and deprecated; please\n"
 "\t use --mirror=fetch or --mirror=push instead"
 msgstr ""
 
 msgid ""
 "--mirror is dangerous and deprecated; please\n"
 "\t use --mirror=fetch or --mirror=push instead"
 msgstr ""
 

-#: builtin/remote.c:144
+#: builtin/remote.c:145

 #, c-format
 msgid "unknown mirror argument: %s"
 msgstr ""
 
 #, c-format
 msgid "unknown mirror argument: %s"
 msgstr ""
 

-#: builtin/remote.c:160
+#: builtin/remote.c:161

 msgid "fetch the remote branches"
 msgstr ""
 
 msgid "fetch the remote branches"
 msgstr ""
 

-#: builtin/remote.c:162
+#: builtin/remote.c:163

 msgid "import all tags and associated objects when fetching"
 msgstr ""
 
 msgid "import all tags and associated objects when fetching"
 msgstr ""
 

-#: builtin/remote.c:165
+#: builtin/remote.c:166

 msgid "or do not fetch any tag at all (--no-tags)"
 msgstr ""
 
 msgid "or do not fetch any tag at all (--no-tags)"
 msgstr ""
 

-#: builtin/remote.c:167
+#: builtin/remote.c:168

 msgid "branch(es) to track"
 msgstr ""
 
 msgid "branch(es) to track"
 msgstr ""
 

-#: builtin/remote.c:168
+#: builtin/remote.c:169

 msgid "master branch"
 msgstr ""
 
 msgid "master branch"
 msgstr ""
 

-#: builtin/remote.c:169
+#: builtin/remote.c:170

 msgid "push|fetch"
 msgstr ""
 
 msgid "push|fetch"
 msgstr ""
 

-#: builtin/remote.c:170
+#: builtin/remote.c:171

 msgid "set up remote as a mirror to push to or fetch from"
 msgstr ""
 
 msgid "set up remote as a mirror to push to or fetch from"
 msgstr ""
 

-#: builtin/remote.c:182
+#: builtin/remote.c:183

 msgid "specifying a master branch makes no sense with --mirror"
 msgstr ""
 
 msgid "specifying a master branch makes no sense with --mirror"
 msgstr ""
 

-#: builtin/remote.c:184
+#: builtin/remote.c:185

 msgid "specifying branches to track makes sense only with fetch mirrors"
 msgstr ""
 
 msgid "specifying branches to track makes sense only with fetch mirrors"
 msgstr ""
 

-#: builtin/remote.c:191 builtin/remote.c:631
+#: builtin/remote.c:192 builtin/remote.c:634

 #, c-format
 msgid "remote %s already exists."
 msgstr ""
 
 #, c-format
 msgid "remote %s already exists."
 msgstr ""
 

-#: builtin/remote.c:195 builtin/remote.c:635
+#: builtin/remote.c:196 builtin/remote.c:638

 #, c-format
 msgid "'%s' is not a valid remote name"
 msgstr ""
 
 #, c-format
 msgid "'%s' is not a valid remote name"
 msgstr ""
 

-#: builtin/remote.c:235
+#: builtin/remote.c:236

 #, c-format
 msgid "Could not setup master '%s'"
 msgstr ""
 
 #, c-format
 msgid "Could not setup master '%s'"
 msgstr ""
 

-#: builtin/remote.c:337
+#: builtin/remote.c:342

 #, c-format
 msgid "Could not get fetch map for refspec %s"
 msgstr ""
 
 #, c-format
 msgid "Could not get fetch map for refspec %s"
 msgstr ""
 

-#: builtin/remote.c:438 builtin/remote.c:446
+#: builtin/remote.c:441 builtin/remote.c:449

 msgid "(matching)"
 msgstr ""
 
 msgid "(matching)"
 msgstr ""
 

-#: builtin/remote.c:450
+#: builtin/remote.c:453

 msgid "(delete)"
 msgstr ""
 
 msgid "(delete)"
 msgstr ""
 

-#: builtin/remote.c:624 builtin/remote.c:759 builtin/remote.c:858
+#: builtin/remote.c:627 builtin/remote.c:762 builtin/remote.c:861

 #, c-format
 msgid "No such remote: %s"
 msgstr ""
 
 #, c-format
 msgid "No such remote: %s"
 msgstr ""
 

-#: builtin/remote.c:641
+#: builtin/remote.c:644

 #, c-format
 msgid "Could not rename config section '%s' to '%s'"
 msgstr ""
 
 #, c-format
 msgid "Could not rename config section '%s' to '%s'"
 msgstr ""
 

-#: builtin/remote.c:661
+#: builtin/remote.c:664

 #, c-format
 msgid ""
 "Not updating non-default fetch refspec\n"
 #, c-format
 msgid ""
 "Not updating non-default fetch refspec\n"


@@ -11726,17 +12139,17 @@ msgid ""
 "\tPlease update the configuration manually if necessary."
 msgstr ""
 
 "\tPlease update the configuration manually if necessary."
 msgstr ""
 

-#: builtin/remote.c:697
+#: builtin/remote.c:700

 #, c-format
 msgid "deleting '%s' failed"
 msgstr ""
 
 #, c-format
 msgid "deleting '%s' failed"
 msgstr ""
 

-#: builtin/remote.c:731
+#: builtin/remote.c:734

 #, c-format
 msgid "creating '%s' failed"
 msgstr ""
 
 #, c-format
 msgid "creating '%s' failed"
 msgstr ""
 

-#: builtin/remote.c:796
+#: builtin/remote.c:799

 msgid ""
 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
 "to delete it, use:"
 msgid ""
 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
 "to delete it, use:"


@@ -11746,113 +12159,118 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
 msgstr[0] ""
 msgstr[1] ""
 

-#: builtin/remote.c:810
+#: builtin/remote.c:813

 #, c-format
 msgid "Could not remove config section '%s'"
 msgstr ""
 
 #, c-format
 msgid "Could not remove config section '%s'"
 msgstr ""
 

-#: builtin/remote.c:911
+#: builtin/remote.c:914

 #, c-format
 msgid " new (next fetch will store in remotes/%s)"
 msgstr ""
 
 #, c-format
 msgid " new (next fetch will store in remotes/%s)"
 msgstr ""
 

-#: builtin/remote.c:914
+#: builtin/remote.c:917

 msgid " tracked"
 msgstr ""
 
 msgid " tracked"
 msgstr ""
 

-#: builtin/remote.c:916
+#: builtin/remote.c:919

 msgid " stale (use 'git remote prune' to remove)"
 msgstr ""
 
 msgid " stale (use 'git remote prune' to remove)"
 msgstr ""
 

-#: builtin/remote.c:918
+#: builtin/remote.c:921

 msgid " ???"
 msgstr ""
 
 msgid " ???"
 msgstr ""
 

-#: builtin/remote.c:959
+#: builtin/remote.c:962

 #, c-format
 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
 msgstr ""
 
 #, c-format
 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
 msgstr ""
 

-#: builtin/remote.c:967
+#: builtin/remote.c:971

 #, c-format
 msgid "rebases interactively onto remote %s"
 msgstr ""
 
 #, c-format
 msgid "rebases interactively onto remote %s"
 msgstr ""
 

-#: builtin/remote.c:968
+#: builtin/remote.c:973
+#, c-format
+msgid "rebases interactively (with merges) onto remote %s"
+msgstr ""
+
+#: builtin/remote.c:976

 #, c-format
 msgid "rebases onto remote %s"
 msgstr ""
 
 #, c-format
 msgid "rebases onto remote %s"
 msgstr ""
 

-#: builtin/remote.c:971
+#: builtin/remote.c:980

 #, c-format
 msgid " merges with remote %s"
 msgstr ""
 
 #, c-format
 msgid " merges with remote %s"
 msgstr ""
 

-#: builtin/remote.c:974
+#: builtin/remote.c:983

 #, c-format
 msgid "merges with remote %s"
 msgstr ""
 
 #, c-format
 msgid "merges with remote %s"
 msgstr ""
 

-#: builtin/remote.c:977
+#: builtin/remote.c:986

 #, c-format
 msgid "%-*s    and with remote %s\n"
 msgstr ""
 
 #, c-format
 msgid "%-*s    and with remote %s\n"
 msgstr ""
 

-#: builtin/remote.c:1020
+#: builtin/remote.c:1029

 msgid "create"
 msgstr ""
 
 msgid "create"
 msgstr ""
 

-#: builtin/remote.c:1023
+#: builtin/remote.c:1032

 msgid "delete"
 msgstr ""
 
 msgid "delete"
 msgstr ""
 

-#: builtin/remote.c:1027
+#: builtin/remote.c:1036

 msgid "up to date"
 msgstr ""
 
 msgid "up to date"
 msgstr ""
 

-#: builtin/remote.c:1030
+#: builtin/remote.c:1039

 msgid "fast-forwardable"
 msgstr ""
 
 msgid "fast-forwardable"
 msgstr ""
 

-#: builtin/remote.c:1033
+#: builtin/remote.c:1042

 msgid "local out of date"
 msgstr ""
 
 msgid "local out of date"
 msgstr ""
 

-#: builtin/remote.c:1040
+#: builtin/remote.c:1049

 #, c-format
 msgid "    %-*s forces to %-*s (%s)"
 msgstr ""
 
 #, c-format
 msgid "    %-*s forces to %-*s (%s)"
 msgstr ""
 

-#: builtin/remote.c:1043
+#: builtin/remote.c:1052

 #, c-format
 msgid "    %-*s pushes to %-*s (%s)"
 msgstr ""
 
 #, c-format
 msgid "    %-*s pushes to %-*s (%s)"
 msgstr ""
 

-#: builtin/remote.c:1047
+#: builtin/remote.c:1056

 #, c-format
 msgid "    %-*s forces to %s"
 msgstr ""
 
 #, c-format
 msgid "    %-*s forces to %s"
 msgstr ""
 

-#: builtin/remote.c:1050
+#: builtin/remote.c:1059

 #, c-format
 msgid "    %-*s pushes to %s"
 msgstr ""
 
 #, c-format
 msgid "    %-*s pushes to %s"
 msgstr ""
 

-#: builtin/remote.c:1118
+#: builtin/remote.c:1127

 msgid "do not query remotes"
 msgstr ""
 
 msgid "do not query remotes"
 msgstr ""
 

-#: builtin/remote.c:1145
+#: builtin/remote.c:1154

 #, c-format
 msgid "* remote %s"
 msgstr ""
 
 #, c-format
 msgid "* remote %s"
 msgstr ""
 

-#: builtin/remote.c:1146
+#: builtin/remote.c:1155

 #, c-format
 msgid "  Fetch URL: %s"
 msgstr ""
 
 #, c-format
 msgid "  Fetch URL: %s"
 msgstr ""
 

-#: builtin/remote.c:1147 builtin/remote.c:1163 builtin/remote.c:1302
+#: builtin/remote.c:1156 builtin/remote.c:1172 builtin/remote.c:1311

 msgid "(no URL)"
 msgstr ""
 
 msgid "(no URL)"
 msgstr ""
 


@@ -11860,184 +12278,184 @@ msgstr ""
 #. with the one in " Fetch URL: %s"
 #. translation.
 #.
 #. with the one in " Fetch URL: %s"
 #. translation.
 #.

-#: builtin/remote.c:1161 builtin/remote.c:1163
+#: builtin/remote.c:1170 builtin/remote.c:1172

 #, c-format
 msgid "  Push  URL: %s"
 msgstr ""
 
 #, c-format
 msgid "  Push  URL: %s"
 msgstr ""
 

-#: builtin/remote.c:1165 builtin/remote.c:1167 builtin/remote.c:1169
+#: builtin/remote.c:1174 builtin/remote.c:1176 builtin/remote.c:1178

 #, c-format
 msgid "  HEAD branch: %s"
 msgstr ""
 
 #, c-format
 msgid "  HEAD branch: %s"
 msgstr ""
 

-#: builtin/remote.c:1165
+#: builtin/remote.c:1174

 msgid "(not queried)"
 msgstr ""
 
 msgid "(not queried)"
 msgstr ""
 

-#: builtin/remote.c:1167
+#: builtin/remote.c:1176

 msgid "(unknown)"
 msgstr ""
 
 msgid "(unknown)"
 msgstr ""
 

-#: builtin/remote.c:1171
+#: builtin/remote.c:1180

 #, c-format
 msgid ""
 "  HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "  HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
 msgstr ""
 

-#: builtin/remote.c:1183
+#: builtin/remote.c:1192

 #, c-format
 msgid "  Remote branch:%s"
 msgid_plural "  Remote branches:%s"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
 msgid "  Remote branch:%s"
 msgid_plural "  Remote branches:%s"
 msgstr[0] ""
 msgstr[1] ""
 

-#: builtin/remote.c:1186 builtin/remote.c:1212
+#: builtin/remote.c:1195 builtin/remote.c:1221

 msgid " (status not queried)"
 msgstr ""
 
 msgid " (status not queried)"
 msgstr ""
 

-#: builtin/remote.c:1195
+#: builtin/remote.c:1204

 msgid "  Local branch configured for 'git pull':"
 msgid_plural "  Local branches configured for 'git pull':"
 msgstr[0] ""
 msgstr[1] ""
 
 msgid "  Local branch configured for 'git pull':"
 msgid_plural "  Local branches configured for 'git pull':"
 msgstr[0] ""
 msgstr[1] ""
 

-#: builtin/remote.c:1203
+#: builtin/remote.c:1212

 msgid "  Local refs will be mirrored by 'git push'"
 msgstr ""
 
 msgid "  Local refs will be mirrored by 'git push'"
 msgstr ""
 

-#: builtin/remote.c:1209
+#: builtin/remote.c:1218

 #, c-format
 msgid "  Local ref configured for 'git push'%s:"
 msgid_plural "  Local refs configured for 'git push'%s:"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
 msgid "  Local ref configured for 'git push'%s:"
 msgid_plural "  Local refs configured for 'git push'%s:"
 msgstr[0] ""
 msgstr[1] ""
 

-#: builtin/remote.c:1230
+#: builtin/remote.c:1239

 msgid "set refs/remotes/<name>/HEAD according to remote"
 msgstr ""
 
 msgid "set refs/remotes/<name>/HEAD according to remote"
 msgstr ""
 

-#: builtin/remote.c:1232
+#: builtin/remote.c:1241

 msgid "delete refs/remotes/<name>/HEAD"
 msgstr ""
 
 msgid "delete refs/remotes/<name>/HEAD"
 msgstr ""
 

-#: builtin/remote.c:1247
+#: builtin/remote.c:1256

 msgid "Cannot determine remote HEAD"
 msgstr ""
 
 msgid "Cannot determine remote HEAD"
 msgstr ""
 

-#: builtin/remote.c:1249
+#: builtin/remote.c:1258

 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
 msgstr ""
 
 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
 msgstr ""
 

-#: builtin/remote.c:1259
+#: builtin/remote.c:1268

 #, c-format
 msgid "Could not delete %s"
 msgstr ""
 
 #, c-format
 msgid "Could not delete %s"
 msgstr ""
 

-#: builtin/remote.c:1267
+#: builtin/remote.c:1276

 #, c-format
 msgid "Not a valid ref: %s"
 msgstr ""
 
 #, c-format
 msgid "Not a valid ref: %s"
 msgstr ""
 

-#: builtin/remote.c:1269
+#: builtin/remote.c:1278

 #, c-format
 msgid "Could not setup %s"
 msgstr ""
 
 #, c-format
 msgid "Could not setup %s"
 msgstr ""
 

-#: builtin/remote.c:1287
+#: builtin/remote.c:1296

 #, c-format
 msgid " %s will become dangling!"
 msgstr ""
 
 #, c-format
 msgid " %s will become dangling!"
 msgstr ""
 

-#: builtin/remote.c:1288
+#: builtin/remote.c:1297

 #, c-format
 msgid " %s has become dangling!"
 msgstr ""
 
 #, c-format
 msgid " %s has become dangling!"
 msgstr ""
 

-#: builtin/remote.c:1298
+#: builtin/remote.c:1307

 #, c-format
 msgid "Pruning %s"
 msgstr ""
 
 #, c-format
 msgid "Pruning %s"
 msgstr ""
 

-#: builtin/remote.c:1299
+#: builtin/remote.c:1308

 #, c-format
 msgid "URL: %s"
 msgstr ""
 
 #, c-format
 msgid "URL: %s"
 msgstr ""
 

-#: builtin/remote.c:1315
+#: builtin/remote.c:1324

 #, c-format
 msgid " * [would prune] %s"
 msgstr ""
 
 #, c-format
 msgid " * [would prune] %s"
 msgstr ""
 

-#: builtin/remote.c:1318
+#: builtin/remote.c:1327

 #, c-format
 msgid " * [pruned] %s"
 msgstr ""
 
 #, c-format
 msgid " * [pruned] %s"
 msgstr ""
 

-#: builtin/remote.c:1363
+#: builtin/remote.c:1372

 msgid "prune remotes after fetching"
 msgstr ""
 
 msgid "prune remotes after fetching"
 msgstr ""
 

-#: builtin/remote.c:1426 builtin/remote.c:1480 builtin/remote.c:1548
+#: builtin/remote.c:1435 builtin/remote.c:1489 builtin/remote.c:1557

 #, c-format
 msgid "No such remote '%s'"
 msgstr ""
 
 #, c-format
 msgid "No such remote '%s'"
 msgstr ""
 

-#: builtin/remote.c:1442
+#: builtin/remote.c:1451

 msgid "add branch"
 msgstr ""
 
 msgid "add branch"
 msgstr ""
 

-#: builtin/remote.c:1449
+#: builtin/remote.c:1458

 msgid "no remote specified"
 msgstr ""
 
 msgid "no remote specified"
 msgstr ""
 

-#: builtin/remote.c:1466
+#: builtin/remote.c:1475

 msgid "query push URLs rather than fetch URLs"
 msgstr ""
 
 msgid "query push URLs rather than fetch URLs"
 msgstr ""
 

-#: builtin/remote.c:1468
+#: builtin/remote.c:1477

 msgid "return all URLs"
 msgstr ""
 
 msgid "return all URLs"
 msgstr ""
 

-#: builtin/remote.c:1496
+#: builtin/remote.c:1505

 #, c-format
 msgid "no URLs configured for remote '%s'"
 msgstr ""
 
 #, c-format
 msgid "no URLs configured for remote '%s'"
 msgstr ""
 

-#: builtin/remote.c:1522
+#: builtin/remote.c:1531

 msgid "manipulate push URLs"
 msgstr ""
 
 msgid "manipulate push URLs"
 msgstr ""
 

-#: builtin/remote.c:1524
+#: builtin/remote.c:1533

 msgid "add URL"
 msgstr ""
 
 msgid "add URL"
 msgstr ""
 

-#: builtin/remote.c:1526
+#: builtin/remote.c:1535

 msgid "delete URLs"
 msgstr ""
 
 msgid "delete URLs"
 msgstr ""
 

-#: builtin/remote.c:1533
+#: builtin/remote.c:1542

 msgid "--add --delete doesn't make sense"
 msgstr ""
 
 msgid "--add --delete doesn't make sense"
 msgstr ""
 

-#: builtin/remote.c:1572
+#: builtin/remote.c:1581

 #, c-format
 msgid "Invalid old URL pattern: %s"
 msgstr ""
 
 #, c-format
 msgid "Invalid old URL pattern: %s"
 msgstr ""
 

-#: builtin/remote.c:1580
+#: builtin/remote.c:1589

 #, c-format
 msgid "No such URL found: %s"
 msgstr ""
 
 #, c-format
 msgid "No such URL found: %s"
 msgstr ""
 

-#: builtin/remote.c:1582
+#: builtin/remote.c:1591

 msgid "Will not delete all non-push URLs"
 msgstr ""
 
 msgid "Will not delete all non-push URLs"
 msgstr ""
 

-#: builtin/remote.c:1598
+#: builtin/remote.c:1607

 msgid "be verbose; must be placed before a subcommand"
 msgstr ""
 
 msgid "be verbose; must be placed before a subcommand"
 msgstr ""
 

-#: builtin/remote.c:1629
+#: builtin/remote.c:1638

 #, c-format
 msgid "Unknown subcommand: %s"
 msgstr ""
 #, c-format
 msgid "Unknown subcommand: %s"
 msgstr ""


@@ -12052,172 +12470,191 @@ msgid ""
 "--no-write-bitmap-index or disable the pack.writebitmaps configuration."
 msgstr ""
 
 "--no-write-bitmap-index or disable the pack.writebitmaps configuration."
 msgstr ""
 

-#: builtin/repack.c:170
+#: builtin/repack.c:180

 msgid "pack everything in a single pack"
 msgstr ""
 
 msgid "pack everything in a single pack"
 msgstr ""
 

-#: builtin/repack.c:172
+#: builtin/repack.c:182

 msgid "same as -a, and turn unreachable objects loose"
 msgstr ""
 
 msgid "same as -a, and turn unreachable objects loose"
 msgstr ""
 

-#: builtin/repack.c:175
+#: builtin/repack.c:185

 msgid "remove redundant packs, and run git-prune-packed"
 msgstr ""
 
 msgid "remove redundant packs, and run git-prune-packed"
 msgstr ""
 

-#: builtin/repack.c:177
+#: builtin/repack.c:187

 msgid "pass --no-reuse-delta to git-pack-objects"
 msgstr ""
 
 msgid "pass --no-reuse-delta to git-pack-objects"
 msgstr ""
 

-#: builtin/repack.c:179
+#: builtin/repack.c:189

 msgid "pass --no-reuse-object to git-pack-objects"
 msgstr ""
 
 msgid "pass --no-reuse-object to git-pack-objects"
 msgstr ""
 

-#: builtin/repack.c:181
+#: builtin/repack.c:191

 msgid "do not run git-update-server-info"
 msgstr ""
 
 msgid "do not run git-update-server-info"
 msgstr ""
 

-#: builtin/repack.c:184
+#: builtin/repack.c:194

 msgid "pass --local to git-pack-objects"
 msgstr ""
 
 msgid "pass --local to git-pack-objects"
 msgstr ""
 

-#: builtin/repack.c:186
+#: builtin/repack.c:196

 msgid "write bitmap index"
 msgstr ""
 
 msgid "write bitmap index"
 msgstr ""
 

-#: builtin/repack.c:187
+#: builtin/repack.c:197

 msgid "approxidate"
 msgstr ""
 
 msgid "approxidate"
 msgstr ""
 

-#: builtin/repack.c:188
+#: builtin/repack.c:198

 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:190
+#: builtin/repack.c:200

 msgid "with -a, repack unreachable objects"
 msgstr ""
 
 msgid "with -a, repack unreachable objects"
 msgstr ""
 

-#: builtin/repack.c:192
+#: builtin/repack.c:202

 msgid "size of the window used for delta compression"
 msgstr ""
 
 msgid "size of the window used for delta compression"
 msgstr ""
 

-#: builtin/repack.c:193 builtin/repack.c:199
+#: builtin/repack.c:203 builtin/repack.c:209

 msgid "bytes"
 msgstr ""
 
 msgid "bytes"
 msgstr ""
 

-#: builtin/repack.c:194
+#: builtin/repack.c:204

 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:196
+#: builtin/repack.c:206

 msgid "limits the maximum delta depth"
 msgstr ""
 
 msgid "limits the maximum delta depth"
 msgstr ""
 

-#: builtin/repack.c:198
+#: builtin/repack.c:208

 msgid "limits the maximum number of threads"
 msgstr ""
 
 msgid "limits the maximum number of threads"
 msgstr ""
 

-#: builtin/repack.c:200
+#: builtin/repack.c:210

 msgid "maximum size of each packfile"
 msgstr ""
 
 msgid "maximum size of each packfile"
 msgstr ""
 

-#: builtin/repack.c:202
+#: builtin/repack.c:212

 msgid "repack objects in packs marked with .keep"
 msgstr ""
 
 msgid "repack objects in packs marked with .keep"
 msgstr ""
 

-#: builtin/repack.c:212
+#: builtin/repack.c:214
+msgid "do not repack this pack"
+msgstr ""
+
+#: builtin/repack.c:224

 msgid "cannot delete packs in a precious-objects repo"
 msgstr ""
 
 msgid "cannot delete packs in a precious-objects repo"
 msgstr ""
 

-#: builtin/repack.c:216
+#: builtin/repack.c:228

 msgid "--keep-unreachable and -A are incompatible"
 msgstr ""
 
 msgid "--keep-unreachable and -A are incompatible"
 msgstr ""
 

-#: builtin/repack.c:410 builtin/worktree.c:148
+#: builtin/repack.c:425 builtin/worktree.c:139

 #, c-format
 msgid "failed to remove '%s'"
 msgstr ""
 
 #, c-format
 msgid "failed to remove '%s'"
 msgstr ""
 

-#: builtin/replace.c:20
+#: builtin/replace.c:22

 msgid "git replace [-f] <object> <replacement>"
 msgstr ""
 
 msgid "git replace [-f] <object> <replacement>"
 msgstr ""
 

-#: builtin/replace.c:21
+#: builtin/replace.c:23

 msgid "git replace [-f] --edit <object>"
 msgstr ""
 
 msgid "git replace [-f] --edit <object>"
 msgstr ""
 

-#: builtin/replace.c:22
+#: builtin/replace.c:24

 msgid "git replace [-f] --graft <commit> [<parent>...]"
 msgstr ""
 
 msgid "git replace [-f] --graft <commit> [<parent>...]"
 msgstr ""
 

-#: builtin/replace.c:23
+#: builtin/replace.c:25
+msgid "git replace [-f] --convert-graft-file"
+msgstr ""
+
+#: builtin/replace.c:26

 msgid "git replace -d <object>..."
 msgstr ""
 
 msgid "git replace -d <object>..."
 msgstr ""
 

-#: builtin/replace.c:24
+#: builtin/replace.c:27

 msgid "git replace [--format=<format>] [-l [<pattern>]]"
 msgstr ""
 
 msgid "git replace [--format=<format>] [-l [<pattern>]]"
 msgstr ""
 

-#: builtin/replace.c:331 builtin/replace.c:369 builtin/replace.c:397
+#: builtin/replace.c:371 builtin/replace.c:415 builtin/replace.c:445

 #, c-format
 msgid "Not a valid object name: '%s'"
 msgstr ""
 
 #, c-format
 msgid "Not a valid object name: '%s'"
 msgstr ""
 

-#: builtin/replace.c:361
+#: builtin/replace.c:407

 #, c-format
 msgid "bad mergetag in commit '%s'"
 msgstr ""
 
 #, c-format
 msgid "bad mergetag in commit '%s'"
 msgstr ""
 

-#: builtin/replace.c:363
+#: builtin/replace.c:409

 #, c-format
 msgid "malformed mergetag in commit '%s'"
 msgstr ""
 
 #, c-format
 msgid "malformed mergetag in commit '%s'"
 msgstr ""
 

-#: builtin/replace.c:374
+#: builtin/replace.c:421

 #, c-format
 msgid ""
 "original commit '%s' contains mergetag '%s' that is discarded; use --edit "
 "instead of --graft"
 msgstr ""
 
 #, c-format
 msgid ""
 "original commit '%s' contains mergetag '%s' that is discarded; use --edit "
 "instead of --graft"
 msgstr ""
 

-#: builtin/replace.c:407
+#: builtin/replace.c:460

 #, c-format
 msgid "the original commit '%s' has a gpg signature."
 msgstr ""
 
 #, c-format
 msgid "the original commit '%s' has a gpg signature."
 msgstr ""
 

-#: builtin/replace.c:408
+#: builtin/replace.c:461

 msgid "the signature will be removed in the replacement commit!"
 msgstr ""
 
 msgid "the signature will be removed in the replacement commit!"
 msgstr ""
 

-#: builtin/replace.c:414
+#: builtin/replace.c:471

 #, c-format
 msgid "could not write replacement commit for: '%s'"
 msgstr ""
 
 #, c-format
 msgid "could not write replacement commit for: '%s'"
 msgstr ""
 

-#: builtin/replace.c:438
+#: builtin/replace.c:514
+#, c-format
+msgid ""
+"could not convert the following graft(s):\n"
+"%s"
+msgstr ""
+
+#: builtin/replace.c:535

 msgid "list replace refs"
 msgstr ""
 
 msgid "list replace refs"
 msgstr ""
 

-#: builtin/replace.c:439
+#: builtin/replace.c:536

 msgid "delete replace refs"
 msgstr ""
 
 msgid "delete replace refs"
 msgstr ""
 

-#: builtin/replace.c:440
+#: builtin/replace.c:537

 msgid "edit existing object"
 msgstr ""
 
 msgid "edit existing object"
 msgstr ""
 

-#: builtin/replace.c:441
+#: builtin/replace.c:538

 msgid "change a commit's parents"
 msgstr ""
 
 msgid "change a commit's parents"
 msgstr ""
 

-#: builtin/replace.c:442
+#: builtin/replace.c:539
+msgid "convert existing graft file"
+msgstr ""
+
+#: builtin/replace.c:540

 msgid "replace the ref if it exists"
 msgstr ""
 
 msgid "replace the ref if it exists"
 msgstr ""
 

-#: builtin/replace.c:444
+#: builtin/replace.c:542

 msgid "do not pretty-print contents for --edit"
 msgstr ""
 
 msgid "do not pretty-print contents for --edit"
 msgstr ""
 

-#: builtin/replace.c:445
+#: builtin/replace.c:543

 msgid "use this format"
 msgstr ""
 
 msgid "use this format"
 msgstr ""
 


@@ -12519,42 +12956,42 @@ msgid_plural "the following files have local modifications:"
 msgstr[0] ""
 msgstr[1] ""
 
 msgstr[0] ""
 msgstr[1] ""
 

-#: builtin/rm.c:243
+#: builtin/rm.c:241

 msgid "do not list removed files"
 msgstr ""
 
 msgid "do not list removed files"
 msgstr ""
 

-#: builtin/rm.c:244
+#: builtin/rm.c:242

 msgid "only remove from the index"
 msgstr ""
 
 msgid "only remove from the index"
 msgstr ""
 

-#: builtin/rm.c:245
+#: builtin/rm.c:243

 msgid "override the up-to-date check"
 msgstr ""
 
 msgid "override the up-to-date check"
 msgstr ""
 

-#: builtin/rm.c:246
+#: builtin/rm.c:244

 msgid "allow recursive removal"
 msgstr ""
 
 msgid "allow recursive removal"
 msgstr ""
 

-#: builtin/rm.c:248
+#: builtin/rm.c:246

 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:307
+#: builtin/rm.c:306

 #, c-format
 msgid "not removing '%s' recursively without -r"
 msgstr ""
 
 #, c-format
 msgid "not removing '%s' recursively without -r"
 msgstr ""
 

-#: builtin/rm.c:346
+#: builtin/rm.c:345

 #, c-format
 msgid "git rm: unable to remove %s"
 msgstr ""
 
 #, c-format
 msgid "git rm: unable to remove %s"
 msgstr ""
 

-#: builtin/rm.c:369
+#: builtin/rm.c:368

 #, c-format
 msgid "could not remove '%s'"
 msgstr ""
 
 #, c-format
 msgid "could not remove '%s'"
 msgstr ""
 

-#: builtin/send-pack.c:19
+#: builtin/send-pack.c:20

 msgid ""
 "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
 "receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
 msgid ""
 "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
 "receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "


@@ -12562,50 +12999,70 @@ msgid ""
 "  --all and explicit <ref> specification are mutually exclusive."
 msgstr ""
 
 "  --all and explicit <ref> specification are mutually exclusive."
 msgstr ""
 

-#: builtin/send-pack.c:162
+#: builtin/send-pack.c:163

 msgid "remote name"
 msgstr ""
 
 msgid "remote name"
 msgstr ""
 

-#: builtin/send-pack.c:176
+#: builtin/send-pack.c:177

 msgid "use stateless RPC protocol"
 msgstr ""
 
 msgid "use stateless RPC protocol"
 msgstr ""
 

-#: builtin/send-pack.c:177
+#: builtin/send-pack.c:178

 msgid "read refs from stdin"
 msgstr ""
 
 msgid "read refs from stdin"
 msgstr ""
 

-#: builtin/send-pack.c:178
+#: builtin/send-pack.c:179

 msgid "print status from remote helper"
 msgstr ""
 
 msgid "print status from remote helper"
 msgstr ""
 

+#: builtin/serve.c:7
+msgid "git serve [<options>]"
+msgstr ""
+
+#: builtin/serve.c:17 builtin/upload-pack.c:23
+msgid "quit after a single request/response exchange"
+msgstr ""
+
+#: builtin/serve.c:19
+msgid "exit immediately after advertising capabilities"
+msgstr ""
+

 #: builtin/shortlog.c:14
 #: builtin/shortlog.c:14

-msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
+msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]"
+msgstr ""
+
+#: builtin/shortlog.c:15
+msgid "git log --pretty=short | git shortlog [<options>]"

 msgstr ""
 
 msgstr ""
 

-#: builtin/shortlog.c:263
+#: builtin/shortlog.c:264

 msgid "Group by committer rather than author"
 msgstr ""
 
 msgid "Group by committer rather than author"
 msgstr ""
 

-#: builtin/shortlog.c:265
+#: builtin/shortlog.c:266

 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:267
+#: builtin/shortlog.c:268

 msgid "Suppress commit descriptions, only provides commit count"
 msgstr ""
 
 msgid "Suppress commit descriptions, only provides commit count"
 msgstr ""
 

-#: builtin/shortlog.c:269
+#: builtin/shortlog.c:270

 msgid "Show the email address of each author"
 msgstr ""
 
 msgid "Show the email address of each author"
 msgstr ""
 

-#: builtin/shortlog.c:270
+#: builtin/shortlog.c:271

 msgid "w[,i1[,i2]]"
 msgstr ""
 
 msgid "w[,i1[,i2]]"
 msgstr ""
 

-#: builtin/shortlog.c:271
+#: builtin/shortlog.c:272

 msgid "Linewrap output"
 msgstr ""
 
 msgid "Linewrap output"
 msgstr ""
 

+#: builtin/shortlog.c:298
+msgid "too many arguments given outside repository"
+msgstr ""
+

 #: builtin/show-branch.c:12
 msgid ""
 "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
 #: builtin/show-branch.c:12
 msgid ""
 "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"


@@ -12794,330 +13251,330 @@ msgstr ""
 msgid "prepend comment character and space to each line"
 msgstr ""
 
 msgid "prepend comment character and space to each line"
 msgstr ""
 

-#: builtin/submodule--helper.c:35 builtin/submodule--helper.c:1669
+#: builtin/submodule--helper.c:37 builtin/submodule--helper.c:1688

 #, c-format
 msgid "No such ref: %s"
 msgstr ""
 
 #, c-format
 msgid "No such ref: %s"
 msgstr ""
 

-#: builtin/submodule--helper.c:42 builtin/submodule--helper.c:1678
+#: builtin/submodule--helper.c:44 builtin/submodule--helper.c:1697

 #, c-format
 msgid "Expecting a full ref name, got %s"
 msgstr ""
 
 #, c-format
 msgid "Expecting a full ref name, got %s"
 msgstr ""
 

-#: builtin/submodule--helper.c:59
+#: builtin/submodule--helper.c:61

 msgid "submodule--helper print-default-remote takes no arguments"
 msgstr ""
 
 msgid "submodule--helper print-default-remote takes no arguments"
 msgstr ""
 

-#: builtin/submodule--helper.c:96
+#: builtin/submodule--helper.c:98

 #, c-format
 msgid "cannot strip one component off url '%s'"
 msgstr ""
 
 #, c-format
 msgid "cannot strip one component off url '%s'"
 msgstr ""
 

-#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1198
+#: builtin/submodule--helper.c:406 builtin/submodule--helper.c:1211

 msgid "alternative anchor for relative paths"
 msgstr ""
 
 msgid "alternative anchor for relative paths"
 msgstr ""
 

-#: builtin/submodule--helper.c:409
+#: builtin/submodule--helper.c:411

 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
 msgstr ""
 
 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
 msgstr ""
 

-#: builtin/submodule--helper.c:460 builtin/submodule--helper.c:483
+#: builtin/submodule--helper.c:462 builtin/submodule--helper.c:485

 #, 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:498
+#: builtin/submodule--helper.c:500

 #, c-format
 msgid ""
 "could not lookup configuration '%s'. Assuming this repository is its own "
 "authoritative upstream."
 msgstr ""
 
 #, c-format
 msgid ""
 "could not lookup configuration '%s'. Assuming this repository is its own "
 "authoritative upstream."
 msgstr ""
 

-#: builtin/submodule--helper.c:509
+#: builtin/submodule--helper.c:511

 #, 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:513
+#: builtin/submodule--helper.c:515

 #, 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:523
+#: builtin/submodule--helper.c:525

 #, 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:530
+#: builtin/submodule--helper.c:532

 #, 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:552
+#: builtin/submodule--helper.c:554

 msgid "Suppress output for initializing a submodule"
 msgstr ""
 
 msgid "Suppress output for initializing a submodule"
 msgstr ""
 

-#: builtin/submodule--helper.c:557
+#: builtin/submodule--helper.c:559

 msgid "git submodule--helper init [<path>]"
 msgstr ""
 
 msgid "git submodule--helper init [<path>]"
 msgstr ""
 

-#: builtin/submodule--helper.c:625 builtin/submodule--helper.c:747
+#: builtin/submodule--helper.c:631 builtin/submodule--helper.c:757

 #, 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:660
+#: builtin/submodule--helper.c:670

 #, c-format
 msgid "could not resolve HEAD ref inside the submodule '%s'"
 msgstr ""
 
 #, c-format
 msgid "could not resolve HEAD ref inside the submodule '%s'"
 msgstr ""
 

-#: builtin/submodule--helper.c:687 builtin/submodule--helper.c:856
+#: builtin/submodule--helper.c:697 builtin/submodule--helper.c:866

 #, c-format
 msgid "failed to recurse into submodule '%s'"
 msgstr ""
 
 #, c-format
 msgid "failed to recurse into submodule '%s'"
 msgstr ""
 

-#: builtin/submodule--helper.c:711 builtin/submodule--helper.c:1021
+#: builtin/submodule--helper.c:721 builtin/submodule--helper.c:1031

 msgid "Suppress submodule status output"
 msgstr ""
 
 msgid "Suppress submodule status output"
 msgstr ""
 

-#: builtin/submodule--helper.c:712
+#: builtin/submodule--helper.c:722

 msgid ""
 "Use commit stored in the index instead of the one stored in the submodule "
 "HEAD"
 msgstr ""
 
 msgid ""
 "Use commit stored in the index instead of the one stored in the submodule "
 "HEAD"
 msgstr ""
 

-#: builtin/submodule--helper.c:713
+#: builtin/submodule--helper.c:723

 msgid "recurse into nested submodules"
 msgstr ""
 
 msgid "recurse into nested submodules"
 msgstr ""
 

-#: builtin/submodule--helper.c:718
+#: builtin/submodule--helper.c:728

 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
 msgstr ""
 
 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
 msgstr ""
 

-#: builtin/submodule--helper.c:742
+#: builtin/submodule--helper.c:752

 msgid "git submodule--helper name <path>"
 msgstr ""
 
 msgid "git submodule--helper name <path>"
 msgstr ""
 

-#: builtin/submodule--helper.c:806
+#: builtin/submodule--helper.c:816

 #, c-format
 msgid "Synchronizing submodule url for '%s'\n"
 msgstr ""
 
 #, c-format
 msgid "Synchronizing submodule url for '%s'\n"
 msgstr ""
 

-#: builtin/submodule--helper.c:812
+#: builtin/submodule--helper.c:822

 #, 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:826
+#: builtin/submodule--helper.c:836

 #, c-format
 msgid "failed to get the default remote for submodule '%s'"
 msgstr ""
 
 #, c-format
 msgid "failed to get the default remote for submodule '%s'"
 msgstr ""
 

-#: builtin/submodule--helper.c:837
+#: builtin/submodule--helper.c:847

 #, c-format
 msgid "failed to update remote for submodule '%s'"
 msgstr ""
 
 #, c-format
 msgid "failed to update remote for submodule '%s'"
 msgstr ""
 

-#: builtin/submodule--helper.c:885
+#: builtin/submodule--helper.c:895

 msgid "Suppress output of synchronizing submodule url"
 msgstr ""
 
 msgid "Suppress output of synchronizing submodule url"
 msgstr ""
 

-#: builtin/submodule--helper.c:887
+#: builtin/submodule--helper.c:897

 msgid "Recurse into nested submodules"
 msgstr ""
 
 msgid "Recurse into nested submodules"
 msgstr ""
 

-#: builtin/submodule--helper.c:892
+#: builtin/submodule--helper.c:902

 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
 msgstr ""
 
 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
 msgstr ""
 

-#: builtin/submodule--helper.c:946
+#: builtin/submodule--helper.c:956

 #, c-format
 msgid ""
 "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
 "really want to remove it including all of its history)"
 msgstr ""
 
 #, c-format
 msgid ""
 "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
 "really want to remove it including all of its history)"
 msgstr ""
 

-#: builtin/submodule--helper.c:958
+#: builtin/submodule--helper.c:968

 #, c-format
 msgid ""
 "Submodule work tree '%s' contains local modifications; use '-f' to discard "
 "them"
 msgstr ""
 
 #, c-format
 msgid ""
 "Submodule work tree '%s' contains local modifications; use '-f' to discard "
 "them"
 msgstr ""
 

-#: builtin/submodule--helper.c:966
+#: builtin/submodule--helper.c:976

 #, c-format
 msgid "Cleared directory '%s'\n"
 msgstr ""
 
 #, c-format
 msgid "Cleared directory '%s'\n"
 msgstr ""
 

-#: builtin/submodule--helper.c:968
+#: builtin/submodule--helper.c:978

 #, c-format
 msgid "Could not remove submodule work tree '%s'\n"
 msgstr ""
 
 #, c-format
 msgid "Could not remove submodule work tree '%s'\n"
 msgstr ""
 

-#: builtin/submodule--helper.c:977
+#: builtin/submodule--helper.c:987

 #, c-format
 msgid "could not create empty submodule directory %s"
 msgstr ""
 
 #, c-format
 msgid "could not create empty submodule directory %s"
 msgstr ""
 

-#: builtin/submodule--helper.c:993
+#: builtin/submodule--helper.c:1003

 #, c-format
 msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
 msgstr ""
 
 #, c-format
 msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
 msgstr ""
 

-#: builtin/submodule--helper.c:1022
+#: builtin/submodule--helper.c:1032

 msgid "Remove submodule working trees even if they contain local changes"
 msgstr ""
 
 msgid "Remove submodule working trees even if they contain local changes"
 msgstr ""
 

-#: builtin/submodule--helper.c:1023
+#: builtin/submodule--helper.c:1033

 msgid "Unregister all submodules"
 msgstr ""
 
 msgid "Unregister all submodules"
 msgstr ""
 

-#: builtin/submodule--helper.c:1028
+#: builtin/submodule--helper.c:1038

 msgid ""
 "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
 msgstr ""
 
 msgid ""
 "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
 msgstr ""
 

-#: builtin/submodule--helper.c:1042
+#: builtin/submodule--helper.c:1052

 msgid "Use '--all' if you really want to deinitialize all submodules"
 msgstr ""
 
 msgid "Use '--all' if you really want to deinitialize all submodules"
 msgstr ""
 

-#: builtin/submodule--helper.c:1133 builtin/submodule--helper.c:1136
+#: builtin/submodule--helper.c:1145 builtin/submodule--helper.c:1148

 #, c-format
 msgid "submodule '%s' cannot add alternate: %s"
 msgstr ""
 
 #, c-format
 msgid "submodule '%s' cannot add alternate: %s"
 msgstr ""
 

-#: builtin/submodule--helper.c:1172
+#: builtin/submodule--helper.c:1184

 #, 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:1179
+#: builtin/submodule--helper.c:1191

 #, 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:1201
+#: builtin/submodule--helper.c:1214

 msgid "where the new submodule will be cloned to"
 msgstr ""
 
 msgid "where the new submodule will be cloned to"
 msgstr ""
 

-#: builtin/submodule--helper.c:1204
+#: builtin/submodule--helper.c:1217

 msgid "name of the new submodule"
 msgstr ""
 
 msgid "name of the new submodule"
 msgstr ""
 

-#: builtin/submodule--helper.c:1207
+#: builtin/submodule--helper.c:1220

 msgid "url where to clone the submodule from"
 msgstr ""
 
 msgid "url where to clone the submodule from"
 msgstr ""
 

-#: builtin/submodule--helper.c:1213
+#: builtin/submodule--helper.c:1228

 msgid "depth for shallow clones"
 msgstr ""
 
 msgid "depth for shallow clones"
 msgstr ""
 

-#: builtin/submodule--helper.c:1216 builtin/submodule--helper.c:1587
+#: builtin/submodule--helper.c:1231 builtin/submodule--helper.c:1606

 msgid "force cloning progress"
 msgstr ""
 
 msgid "force cloning progress"
 msgstr ""
 

-#: builtin/submodule--helper.c:1221
+#: builtin/submodule--helper.c:1236

 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:1252
+#: builtin/submodule--helper.c:1267

 #, 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:1267
+#: builtin/submodule--helper.c:1281

 #, 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:1332
+#: builtin/submodule--helper.c:1347

 #, c-format
 msgid "Submodule path '%s' not initialized"
 msgstr ""
 
 #, c-format
 msgid "Submodule path '%s' not initialized"
 msgstr ""
 

-#: builtin/submodule--helper.c:1336
+#: builtin/submodule--helper.c:1351

 msgid "Maybe you want to use 'update --init'?"
 msgstr ""
 
 msgid "Maybe you want to use 'update --init'?"
 msgstr ""
 

-#: builtin/submodule--helper.c:1365
+#: builtin/submodule--helper.c:1380

 #, c-format
 msgid "Skipping unmerged submodule %s"
 msgstr ""
 
 #, c-format
 msgid "Skipping unmerged submodule %s"
 msgstr ""
 

-#: builtin/submodule--helper.c:1394
+#: builtin/submodule--helper.c:1409

 #, c-format
 msgid "Skipping submodule '%s'"
 msgstr ""
 
 #, c-format
 msgid "Skipping submodule '%s'"
 msgstr ""
 

-#: builtin/submodule--helper.c:1527
+#: builtin/submodule--helper.c:1544

 #, c-format
 msgid "Failed to clone '%s'. Retry scheduled"
 msgstr ""
 
 #, c-format
 msgid "Failed to clone '%s'. Retry scheduled"
 msgstr ""
 

-#: builtin/submodule--helper.c:1538
+#: builtin/submodule--helper.c:1555

 #, 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:1568 builtin/submodule--helper.c:1788
+#: builtin/submodule--helper.c:1585 builtin/submodule--helper.c:1808

 msgid "path into the working tree"
 msgstr ""
 
 msgid "path into the working tree"
 msgstr ""
 

-#: builtin/submodule--helper.c:1571
+#: builtin/submodule--helper.c:1588

 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:1575
+#: builtin/submodule--helper.c:1592

 msgid "rebase, merge, checkout or none"
 msgstr ""
 
 msgid "rebase, merge, checkout or none"
 msgstr ""
 

-#: builtin/submodule--helper.c:1579
+#: builtin/submodule--helper.c:1598

 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:1582
+#: builtin/submodule--helper.c:1601

 msgid "parallel jobs"
 msgstr ""
 
 msgid "parallel jobs"
 msgstr ""
 

-#: builtin/submodule--helper.c:1584
+#: builtin/submodule--helper.c:1603

 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:1585
+#: builtin/submodule--helper.c:1604

 msgid "don't print cloning progress"
 msgstr ""
 
 msgid "don't print cloning progress"
 msgstr ""
 

-#: builtin/submodule--helper.c:1592
+#: builtin/submodule--helper.c:1611

 msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
 msgstr ""
 
 msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
 msgstr ""
 

-#: builtin/submodule--helper.c:1605
+#: builtin/submodule--helper.c:1624

 msgid "bad value for update parameter"
 msgstr ""
 
 msgid "bad value for update parameter"
 msgstr ""
 

-#: builtin/submodule--helper.c:1673
+#: builtin/submodule--helper.c:1692

 #, 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:1789
+#: builtin/submodule--helper.c:1809

 msgid "recurse into submodules"
 msgstr ""
 
 msgid "recurse into submodules"
 msgstr ""
 

-#: builtin/submodule--helper.c:1795
+#: builtin/submodule--helper.c:1815

 msgid "git submodule--helper embed-git-dir [<path>...]"
 msgstr ""
 
 msgid "git submodule--helper embed-git-dir [<path>...]"
 msgstr ""
 

-#: builtin/submodule--helper.c:1857
+#: builtin/submodule--helper.c:1901

 #, c-format
 msgid "%s doesn't support --super-prefix"
 msgstr ""
 
 #, c-format
 msgid "%s doesn't support --super-prefix"
 msgstr ""
 

-#: builtin/submodule--helper.c:1863
+#: builtin/submodule--helper.c:1907

 #, c-format
 msgid "'%s' is not a valid submodule--helper subcommand"
 msgstr ""
 #, c-format
 msgid "'%s' is not a valid submodule--helper subcommand"
 msgstr ""


@@ -13181,7 +13638,7 @@ msgstr ""
 msgid "Deleted tag '%s' (was %s)\n"
 msgstr ""
 
 msgid "Deleted tag '%s' (was %s)\n"
 msgstr ""
 

-#: builtin/tag.c:131
+#: builtin/tag.c:132

 #, c-format
 msgid ""
 "\n"
 #, c-format
 msgid ""
 "\n"


@@ -13190,7 +13647,7 @@ msgid ""
 "Lines starting with '%c' will be ignored.\n"
 msgstr ""
 
 "Lines starting with '%c' will be ignored.\n"
 msgstr ""
 

-#: builtin/tag.c:135
+#: builtin/tag.c:136

 #, c-format
 msgid ""
 "\n"
 #, c-format
 msgid ""
 "\n"


@@ -13200,146 +13657,146 @@ msgid ""
 "want to.\n"
 msgstr ""
 
 "want to.\n"
 msgstr ""
 

-#: builtin/tag.c:189
+#: builtin/tag.c:190

 msgid "unable to sign the tag"
 msgstr ""
 
 msgid "unable to sign the tag"
 msgstr ""
 

-#: builtin/tag.c:191
+#: builtin/tag.c:192

 msgid "unable to write tag file"
 msgstr ""
 
 msgid "unable to write tag file"
 msgstr ""
 

-#: builtin/tag.c:216
+#: builtin/tag.c:217

 msgid "bad object type."
 msgstr ""
 
 msgid "bad object type."
 msgstr ""
 

-#: builtin/tag.c:265
+#: builtin/tag.c:266

 msgid "no tag message?"
 msgstr ""
 
 msgid "no tag message?"
 msgstr ""
 

-#: builtin/tag.c:272
+#: builtin/tag.c:273

 #, 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:381
+#: builtin/tag.c:382

 msgid "list tag names"
 msgstr ""
 
 msgid "list tag names"
 msgstr ""
 

-#: builtin/tag.c:383
+#: builtin/tag.c:384

 msgid "print <n> lines of each tag message"
 msgstr ""
 
 msgid "print <n> lines of each tag message"
 msgstr ""
 

-#: builtin/tag.c:385
+#: builtin/tag.c:386

 msgid "delete tags"
 msgstr ""
 
 msgid "delete tags"
 msgstr ""
 

-#: builtin/tag.c:386
+#: builtin/tag.c:387

 msgid "verify tags"
 msgstr ""
 
 msgid "verify tags"
 msgstr ""
 

-#: builtin/tag.c:388
+#: builtin/tag.c:389

 msgid "Tag creation options"
 msgstr ""
 
 msgid "Tag creation options"
 msgstr ""
 

-#: builtin/tag.c:390
+#: builtin/tag.c:391

 msgid "annotated tag, needs a message"
 msgstr ""
 
 msgid "annotated tag, needs a message"
 msgstr ""
 

-#: builtin/tag.c:392
+#: builtin/tag.c:393

 msgid "tag message"
 msgstr ""
 
 msgid "tag message"
 msgstr ""
 

-#: builtin/tag.c:394
+#: builtin/tag.c:395

 msgid "force edit of tag message"
 msgstr ""
 
 msgid "force edit of tag message"
 msgstr ""
 

-#: builtin/tag.c:395
+#: builtin/tag.c:396

 msgid "annotated and GPG-signed tag"
 msgstr ""
 
 msgid "annotated and GPG-signed tag"
 msgstr ""
 

-#: builtin/tag.c:399
+#: builtin/tag.c:400

 msgid "use another key to sign the tag"
 msgstr ""
 
 msgid "use another key to sign the tag"
 msgstr ""
 

-#: builtin/tag.c:400
+#: builtin/tag.c:401

 msgid "replace the tag if exists"
 msgstr ""
 
 msgid "replace the tag if exists"
 msgstr ""
 

-#: builtin/tag.c:401 builtin/update-ref.c:368
+#: builtin/tag.c:402 builtin/update-ref.c:368

 msgid "create a reflog"
 msgstr ""
 
 msgid "create a reflog"
 msgstr ""
 

-#: builtin/tag.c:403
+#: builtin/tag.c:404

 msgid "Tag listing options"
 msgstr ""
 
 msgid "Tag listing options"
 msgstr ""
 

-#: builtin/tag.c:404
+#: builtin/tag.c:405

 msgid "show tag list in columns"
 msgstr ""
 
 msgid "show tag list in columns"
 msgstr ""
 

-#: builtin/tag.c:405 builtin/tag.c:407
+#: builtin/tag.c:406 builtin/tag.c:408

 msgid "print only tags that contain the commit"
 msgstr ""
 
 msgid "print only tags that contain the commit"
 msgstr ""
 

-#: builtin/tag.c:406 builtin/tag.c:408
+#: builtin/tag.c:407 builtin/tag.c:409

 msgid "print only tags that don't contain the commit"
 msgstr ""
 
 msgid "print only tags that don't contain the commit"
 msgstr ""
 

-#: builtin/tag.c:409
+#: builtin/tag.c:410

 msgid "print only tags that are merged"
 msgstr ""
 
 msgid "print only tags that are merged"
 msgstr ""
 

-#: builtin/tag.c:410
+#: builtin/tag.c:411

 msgid "print only tags that are not merged"
 msgstr ""
 
 msgid "print only tags that are not merged"
 msgstr ""
 

-#: builtin/tag.c:415
+#: builtin/tag.c:416

 msgid "print only tags of the object"
 msgstr ""
 
 msgid "print only tags of the object"
 msgstr ""
 

-#: builtin/tag.c:459
+#: builtin/tag.c:460

 msgid "--column and -n are incompatible"
 msgstr ""
 
 msgid "--column and -n are incompatible"
 msgstr ""
 

-#: builtin/tag.c:481
+#: builtin/tag.c:482

 msgid "-n option is only allowed in list mode"
 msgstr ""
 
 msgid "-n option is only allowed in list mode"
 msgstr ""
 

-#: builtin/tag.c:483
+#: builtin/tag.c:484

 msgid "--contains option is only allowed in list mode"
 msgstr ""
 
 msgid "--contains option is only allowed in list mode"
 msgstr ""
 

-#: builtin/tag.c:485
+#: builtin/tag.c:486

 msgid "--no-contains option is only allowed in list mode"
 msgstr ""
 
 msgid "--no-contains option is only allowed in list mode"
 msgstr ""
 

-#: builtin/tag.c:487
+#: builtin/tag.c:488

 msgid "--points-at option is only allowed in list mode"
 msgstr ""
 
 msgid "--points-at option is only allowed in list mode"
 msgstr ""
 

-#: builtin/tag.c:489
+#: builtin/tag.c:490

 msgid "--merged and --no-merged options are only allowed in list mode"
 msgstr ""
 
 msgid "--merged and --no-merged options are only allowed in list mode"
 msgstr ""
 

-#: builtin/tag.c:500
+#: builtin/tag.c:501

 msgid "only one -F or -m option is allowed."
 msgstr ""
 
 msgid "only one -F or -m option is allowed."
 msgstr ""
 

-#: builtin/tag.c:519
+#: builtin/tag.c:520

 msgid "too many params"
 msgstr ""
 
 msgid "too many params"
 msgstr ""
 

-#: builtin/tag.c:525
+#: builtin/tag.c:526

 #, 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:530
+#: builtin/tag.c:531

 #, c-format
 msgid "tag '%s' already exists"
 msgstr ""
 
 #, c-format
 msgid "tag '%s' already exists"
 msgstr ""
 

-#: builtin/tag.c:561
+#: builtin/tag.c:562

 #, c-format
 msgid "Updated tag '%s' (was %s)\n"
 msgstr ""
 #, c-format
 msgid "Updated tag '%s' (was %s)\n"
 msgstr ""


@@ -13406,189 +13863,189 @@ msgstr ""
 msgid " OK"
 msgstr ""
 
 msgid " OK"
 msgstr ""
 

-#: builtin/update-index.c:579
+#: builtin/update-index.c:589

 msgid "git update-index [<options>] [--] [<file>...]"
 msgstr ""
 
 msgid "git update-index [<options>] [--] [<file>...]"
 msgstr ""
 

-#: builtin/update-index.c:936
+#: builtin/update-index.c:946

 msgid "continue refresh even when index needs update"
 msgstr ""
 
 msgid "continue refresh even when index needs update"
 msgstr ""
 

-#: builtin/update-index.c:939
+#: builtin/update-index.c:949

 msgid "refresh: ignore submodules"
 msgstr ""
 
 msgid "refresh: ignore submodules"
 msgstr ""
 

-#: builtin/update-index.c:942
+#: builtin/update-index.c:952

 msgid "do not ignore new files"
 msgstr ""
 
 msgid "do not ignore new files"
 msgstr ""
 

-#: builtin/update-index.c:944
+#: builtin/update-index.c:954

 msgid "let files replace directories and vice-versa"
 msgstr ""
 
 msgid "let files replace directories and vice-versa"
 msgstr ""
 

-#: builtin/update-index.c:946
+#: builtin/update-index.c:956

 msgid "notice files missing from worktree"
 msgstr ""
 
 msgid "notice files missing from worktree"
 msgstr ""
 

-#: builtin/update-index.c:948
+#: builtin/update-index.c:958

 msgid "refresh even if index contains unmerged entries"
 msgstr ""
 
 msgid "refresh even if index contains unmerged entries"
 msgstr ""
 

-#: builtin/update-index.c:951
+#: builtin/update-index.c:961

 msgid "refresh stat information"
 msgstr ""
 
 msgid "refresh stat information"
 msgstr ""
 

-#: builtin/update-index.c:955
+#: builtin/update-index.c:965

 msgid "like --refresh, but ignore assume-unchanged setting"
 msgstr ""
 
 msgid "like --refresh, but ignore assume-unchanged setting"
 msgstr ""
 

-#: builtin/update-index.c:959
+#: builtin/update-index.c:969

 msgid "<mode>,<object>,<path>"
 msgstr ""
 
 msgid "<mode>,<object>,<path>"
 msgstr ""
 

-#: builtin/update-index.c:960
+#: builtin/update-index.c:970

 msgid "add the specified entry to the index"
 msgstr ""
 
 msgid "add the specified entry to the index"
 msgstr ""
 

-#: builtin/update-index.c:969
+#: builtin/update-index.c:979

 msgid "mark files as \"not changing\""
 msgstr ""
 
 msgid "mark files as \"not changing\""
 msgstr ""
 

-#: builtin/update-index.c:972
+#: builtin/update-index.c:982

 msgid "clear assumed-unchanged bit"
 msgstr ""
 
 msgid "clear assumed-unchanged bit"
 msgstr ""
 

-#: builtin/update-index.c:975
+#: builtin/update-index.c:985

 msgid "mark files as \"index-only\""
 msgstr ""
 
 msgid "mark files as \"index-only\""
 msgstr ""
 

-#: builtin/update-index.c:978
+#: builtin/update-index.c:988

 msgid "clear skip-worktree bit"
 msgstr ""
 
 msgid "clear skip-worktree bit"
 msgstr ""
 

-#: builtin/update-index.c:981
+#: builtin/update-index.c:991

 msgid "add to index only; do not add content to object database"
 msgstr ""
 
 msgid "add to index only; do not add content to object database"
 msgstr ""
 

-#: builtin/update-index.c:983
+#: builtin/update-index.c:993

 msgid "remove named paths even if present in worktree"
 msgstr ""
 
 msgid "remove named paths even if present in worktree"
 msgstr ""
 

-#: builtin/update-index.c:985
+#: builtin/update-index.c:995

 msgid "with --stdin: input lines are terminated by null bytes"
 msgstr ""
 
 msgid "with --stdin: input lines are terminated by null bytes"
 msgstr ""
 

-#: builtin/update-index.c:987
+#: builtin/update-index.c:997

 msgid "read list of paths to be updated from standard input"
 msgstr ""
 
 msgid "read list of paths to be updated from standard input"
 msgstr ""
 

-#: builtin/update-index.c:991
+#: builtin/update-index.c:1001

 msgid "add entries from standard input to the index"
 msgstr ""
 
 msgid "add entries from standard input to the index"
 msgstr ""
 

-#: builtin/update-index.c:995
+#: builtin/update-index.c:1005

 msgid "repopulate stages #2 and #3 for the listed paths"
 msgstr ""
 
 msgid "repopulate stages #2 and #3 for the listed paths"
 msgstr ""
 

-#: builtin/update-index.c:999
+#: builtin/update-index.c:1009

 msgid "only update entries that differ from HEAD"
 msgstr ""
 
 msgid "only update entries that differ from HEAD"
 msgstr ""
 

-#: builtin/update-index.c:1003
+#: builtin/update-index.c:1013

 msgid "ignore files missing from worktree"
 msgstr ""
 
 msgid "ignore files missing from worktree"
 msgstr ""
 

-#: builtin/update-index.c:1006
+#: builtin/update-index.c:1016

 msgid "report actions to standard output"
 msgstr ""
 
 msgid "report actions to standard output"
 msgstr ""
 

-#: builtin/update-index.c:1008
+#: builtin/update-index.c:1018

 msgid "(for porcelains) forget saved unresolved conflicts"
 msgstr ""
 
 msgid "(for porcelains) forget saved unresolved conflicts"
 msgstr ""
 

-#: builtin/update-index.c:1012
+#: builtin/update-index.c:1022

 msgid "write index in this format"
 msgstr ""
 
 msgid "write index in this format"
 msgstr ""
 

-#: builtin/update-index.c:1014
+#: builtin/update-index.c:1024

 msgid "enable or disable split index"
 msgstr ""
 
 msgid "enable or disable split index"
 msgstr ""
 

-#: builtin/update-index.c:1016
+#: builtin/update-index.c:1026

 msgid "enable/disable untracked cache"
 msgstr ""
 
 msgid "enable/disable untracked cache"
 msgstr ""
 

-#: builtin/update-index.c:1018
+#: builtin/update-index.c:1028

 msgid "test if the filesystem supports untracked cache"
 msgstr ""
 
 msgid "test if the filesystem supports untracked cache"
 msgstr ""
 

-#: builtin/update-index.c:1020
+#: builtin/update-index.c:1030

 msgid "enable untracked cache without testing the filesystem"
 msgstr ""
 
 msgid "enable untracked cache without testing the filesystem"
 msgstr ""
 

-#: builtin/update-index.c:1022
+#: builtin/update-index.c:1032

 msgid "write out the index even if is not flagged as changed"
 msgstr ""
 
 msgid "write out the index even if is not flagged as changed"
 msgstr ""
 

-#: builtin/update-index.c:1024
+#: builtin/update-index.c:1034

 msgid "enable or disable file system monitor"
 msgstr ""
 
 msgid "enable or disable file system monitor"
 msgstr ""
 

-#: builtin/update-index.c:1026
+#: builtin/update-index.c:1036

 msgid "mark files as fsmonitor valid"
 msgstr ""
 
 msgid "mark files as fsmonitor valid"
 msgstr ""
 

-#: builtin/update-index.c:1029
+#: builtin/update-index.c:1039

 msgid "clear fsmonitor valid bit"
 msgstr ""
 
 msgid "clear fsmonitor valid bit"
 msgstr ""
 

-#: builtin/update-index.c:1127
+#: builtin/update-index.c:1138

 msgid ""
 "core.splitIndex is set to false; remove or change it, if you really want to "
 "enable split index"
 msgstr ""
 
 msgid ""
 "core.splitIndex is set to false; remove or change it, if you really want to "
 "enable split index"
 msgstr ""
 

-#: builtin/update-index.c:1136
+#: builtin/update-index.c:1147

 msgid ""
 "core.splitIndex is set to true; remove or change it, if you really want to "
 "disable split index"
 msgstr ""
 
 msgid ""
 "core.splitIndex is set to true; remove or change it, if you really want to "
 "disable split index"
 msgstr ""
 

-#: builtin/update-index.c:1147
+#: builtin/update-index.c:1158

 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:1151
+#: builtin/update-index.c:1162

 msgid "Untracked cache disabled"
 msgstr ""
 
 msgid "Untracked cache disabled"
 msgstr ""
 

-#: builtin/update-index.c:1159
+#: builtin/update-index.c:1170

 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:1163
+#: builtin/update-index.c:1174

 #, c-format
 msgid "Untracked cache enabled for '%s'"
 msgstr ""
 
 #, c-format
 msgid "Untracked cache enabled for '%s'"
 msgstr ""
 

-#: builtin/update-index.c:1171
+#: builtin/update-index.c:1182

 msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
 msgstr ""
 
 msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
 msgstr ""
 

-#: builtin/update-index.c:1175
+#: builtin/update-index.c:1186

 msgid "fsmonitor enabled"
 msgstr ""
 
 msgid "fsmonitor enabled"
 msgstr ""
 

-#: builtin/update-index.c:1178
+#: builtin/update-index.c:1189

 msgid ""
 "core.fsmonitor is set; remove it if you really want to disable fsmonitor"
 msgstr ""
 
 msgid ""
 "core.fsmonitor is set; remove it if you really want to disable fsmonitor"
 msgstr ""
 

-#: builtin/update-index.c:1182
+#: builtin/update-index.c:1193

 msgid "fsmonitor disabled"
 msgstr ""
 
 msgid "fsmonitor disabled"
 msgstr ""
 


@@ -13628,6 +14085,22 @@ msgstr ""
 msgid "update the info files from scratch"
 msgstr ""
 
 msgid "update the info files from scratch"
 msgstr ""
 

+#: builtin/upload-pack.c:11
+msgid "git upload-pack [<options>] <dir>"
+msgstr ""
+
+#: builtin/upload-pack.c:25
+msgid "exit immediately after initial ref advertisement"
+msgstr ""
+
+#: builtin/upload-pack.c:27
+msgid "do not try <directory>/.git/ if <directory> is no Git directory"
+msgstr ""
+
+#: builtin/upload-pack.c:29
+msgid "interrupt transfer after <n> seconds of inactivity"
+msgstr ""
+

 #: builtin/verify-commit.c:18
 msgid "git verify-commit [-v | --verbose] <commit>..."
 msgstr ""
 #: builtin/verify-commit.c:18
 msgid "git verify-commit [-v | --verbose] <commit>..."
 msgstr ""


@@ -13688,198 +14161,213 @@ msgstr ""
 msgid "git worktree unlock <path>"
 msgstr ""
 
 msgid "git worktree unlock <path>"
 msgstr ""
 

-#: builtin/worktree.c:60
+#: builtin/worktree.c:58

 #, c-format
 msgid "Removing worktrees/%s: not a valid directory"
 msgstr ""
 
 #, c-format
 msgid "Removing worktrees/%s: not a valid directory"
 msgstr ""
 

-#: builtin/worktree.c:66
+#: builtin/worktree.c:64

 #, c-format
 msgid "Removing worktrees/%s: gitdir file does not exist"
 msgstr ""
 
 #, c-format
 msgid "Removing worktrees/%s: gitdir file does not exist"
 msgstr ""
 

-#: builtin/worktree.c:71 builtin/worktree.c:80
+#: builtin/worktree.c:69 builtin/worktree.c:78

 #, c-format
 msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
 msgstr ""
 
 #, c-format
 msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
 msgstr ""
 

-#: builtin/worktree.c:90
+#: builtin/worktree.c:88

 #, c-format
 msgid ""
 "Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
 "%<PRIuMAX>)"
 msgstr ""
 
 #, c-format
 msgid ""
 "Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
 "%<PRIuMAX>)"
 msgstr ""
 

-#: builtin/worktree.c:98
+#: builtin/worktree.c:96

 #, c-format
 msgid "Removing worktrees/%s: invalid gitdir file"
 msgstr ""
 
 #, c-format
 msgid "Removing worktrees/%s: invalid gitdir file"
 msgstr ""
 

-#: builtin/worktree.c:114
+#: builtin/worktree.c:105

 #, c-format
 msgid "Removing worktrees/%s: gitdir file points to non-existent location"
 msgstr ""
 
 #, c-format
 msgid "Removing worktrees/%s: gitdir file points to non-existent location"
 msgstr ""
 

-#: builtin/worktree.c:161
+#: builtin/worktree.c:152

 msgid "report pruned working trees"
 msgstr ""
 
 msgid "report pruned working trees"
 msgstr ""
 

-#: builtin/worktree.c:163
+#: builtin/worktree.c:154

 msgid "expire working trees older than <time>"
 msgstr ""
 
 msgid "expire working trees older than <time>"
 msgstr ""
 

-#: builtin/worktree.c:238
+#: builtin/worktree.c:229

 #, c-format
 msgid "'%s' already exists"
 msgstr ""
 
 #, c-format
 msgid "'%s' already exists"
 msgstr ""
 

-#: builtin/worktree.c:269
+#: builtin/worktree.c:260

 #, c-format
 msgid "could not create directory of '%s'"
 msgstr ""
 
 #, c-format
 msgid "could not create directory of '%s'"
 msgstr ""
 

-#: builtin/worktree.c:308
+#: builtin/worktree.c:373 builtin/worktree.c:379
+#, c-format
+msgid "Preparing worktree (new branch '%s')"
+msgstr ""
+
+#: builtin/worktree.c:375
+#, c-format
+msgid "Preparing worktree (resetting branch '%s'; was at %s)"
+msgstr ""
+
+#: builtin/worktree.c:384
+#, c-format
+msgid "Preparing worktree (checking out '%s')"
+msgstr ""
+
+#: builtin/worktree.c:390

 #, c-format
 #, c-format

-msgid "Preparing %s (identifier %s)"
+msgid "Preparing worktree (detached HEAD %s)"

 msgstr ""
 
 msgstr ""
 

-#: builtin/worktree.c:385
+#: builtin/worktree.c:431

 msgid "checkout <branch> even if already checked out in other worktree"
 msgstr ""
 
 msgid "checkout <branch> even if already checked out in other worktree"
 msgstr ""
 

-#: builtin/worktree.c:388
+#: builtin/worktree.c:434

 msgid "create a new branch"
 msgstr ""
 
 msgid "create a new branch"
 msgstr ""
 

-#: builtin/worktree.c:390
+#: builtin/worktree.c:436

 msgid "create or reset a branch"
 msgstr ""
 
 msgid "create or reset a branch"
 msgstr ""
 

-#: builtin/worktree.c:392
+#: builtin/worktree.c:438

 msgid "populate the new working tree"
 msgstr ""
 
 msgid "populate the new working tree"
 msgstr ""
 

-#: builtin/worktree.c:393
+#: builtin/worktree.c:439

 msgid "keep the new working tree locked"
 msgstr ""
 
 msgid "keep the new working tree locked"
 msgstr ""
 

-#: builtin/worktree.c:395
+#: builtin/worktree.c:441

 msgid "set up tracking mode (see git-branch(1))"
 msgstr ""
 
 msgid "set up tracking mode (see git-branch(1))"
 msgstr ""
 

-#: builtin/worktree.c:398
+#: builtin/worktree.c:444

 msgid "try to match the new branch name with a remote-tracking branch"
 msgstr ""
 
 msgid "try to match the new branch name with a remote-tracking branch"
 msgstr ""
 

-#: builtin/worktree.c:406
+#: builtin/worktree.c:452

 msgid "-b, -B, and --detach are mutually exclusive"
 msgstr ""
 
 msgid "-b, -B, and --detach are mutually exclusive"
 msgstr ""
 

-#: builtin/worktree.c:471
+#: builtin/worktree.c:511

 msgid "--[no-]track can only be used if a new branch is created"
 msgstr ""
 
 msgid "--[no-]track can only be used if a new branch is created"
 msgstr ""
 

-#: builtin/worktree.c:571
+#: builtin/worktree.c:611

 msgid "reason for locking"
 msgstr ""
 
 msgid "reason for locking"
 msgstr ""
 

-#: builtin/worktree.c:583 builtin/worktree.c:616 builtin/worktree.c:670
-#: builtin/worktree.c:809
+#: builtin/worktree.c:623 builtin/worktree.c:656 builtin/worktree.c:710
+#: builtin/worktree.c:850

 #, c-format
 msgid "'%s' is not a working tree"
 msgstr ""
 
 #, c-format
 msgid "'%s' is not a working tree"
 msgstr ""
 

-#: builtin/worktree.c:585 builtin/worktree.c:618
+#: builtin/worktree.c:625 builtin/worktree.c:658

 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:590
+#: builtin/worktree.c:630

 #, c-format
 msgid "'%s' is already locked, reason: %s"
 msgstr ""
 
 #, c-format
 msgid "'%s' is already locked, reason: %s"
 msgstr ""
 

-#: builtin/worktree.c:592
+#: builtin/worktree.c:632

 #, c-format
 msgid "'%s' is already locked"
 msgstr ""
 
 #, c-format
 msgid "'%s' is already locked"
 msgstr ""
 

-#: builtin/worktree.c:620
+#: builtin/worktree.c:660

 #, c-format
 msgid "'%s' is not locked"
 msgstr ""
 
 #, c-format
 msgid "'%s' is not locked"
 msgstr ""
 

-#: builtin/worktree.c:645
+#: builtin/worktree.c:685

 msgid "working trees containing submodules cannot be moved or removed"
 msgstr ""
 
 msgid "working trees containing submodules cannot be moved or removed"
 msgstr ""
 

-#: builtin/worktree.c:672 builtin/worktree.c:811
+#: builtin/worktree.c:712 builtin/worktree.c:852

 #, c-format
 msgid "'%s' is a main working tree"
 msgstr ""
 
 #, c-format
 msgid "'%s' is a main working tree"
 msgstr ""
 

-#: builtin/worktree.c:677
+#: builtin/worktree.c:717

 #, c-format
 msgid "could not figure out destination name from '%s'"
 msgstr ""
 
 #, c-format
 msgid "could not figure out destination name from '%s'"
 msgstr ""
 

-#: builtin/worktree.c:683
+#: builtin/worktree.c:723

 #, c-format
 msgid "target '%s' already exists"
 msgstr ""
 
 #, c-format
 msgid "target '%s' already exists"
 msgstr ""
 

-#: builtin/worktree.c:690
+#: builtin/worktree.c:730

 #, c-format
 msgid "cannot move a locked working tree, lock reason: %s"
 msgstr ""
 
 #, c-format
 msgid "cannot move a locked working tree, lock reason: %s"
 msgstr ""
 

-#: builtin/worktree.c:692
+#: builtin/worktree.c:732

 msgid "cannot move a locked working tree"
 msgstr ""
 
 msgid "cannot move a locked working tree"
 msgstr ""
 

-#: builtin/worktree.c:695
+#: builtin/worktree.c:735

 #, c-format
 msgid "validation failed, cannot move working tree: %s"
 msgstr ""
 
 #, c-format
 msgid "validation failed, cannot move working tree: %s"
 msgstr ""
 

-#: builtin/worktree.c:700
+#: builtin/worktree.c:740

 #, c-format
 msgid "failed to move '%s' to '%s'"
 msgstr ""
 
 #, c-format
 msgid "failed to move '%s' to '%s'"
 msgstr ""
 

-#: builtin/worktree.c:748
+#: builtin/worktree.c:788

 #, c-format
 msgid "failed to run 'git status' on '%s'"
 msgstr ""
 
 #, c-format
 msgid "failed to run 'git status' on '%s'"
 msgstr ""
 

-#: builtin/worktree.c:752
+#: builtin/worktree.c:792

 #, c-format
 msgid "'%s' is dirty, use --force to delete it"
 msgstr ""
 
 #, c-format
 msgid "'%s' is dirty, use --force to delete it"
 msgstr ""
 

-#: builtin/worktree.c:757
+#: builtin/worktree.c:797

 #, c-format
 msgid "failed to run 'git status' on '%s', code %d"
 msgstr ""
 
 #, c-format
 msgid "failed to run 'git status' on '%s', code %d"
 msgstr ""
 

-#: builtin/worktree.c:768 builtin/worktree.c:782
+#: builtin/worktree.c:808 builtin/worktree.c:822

 #, c-format
 msgid "failed to delete '%s'"
 msgstr ""
 
 #, c-format
 msgid "failed to delete '%s'"
 msgstr ""
 

-#: builtin/worktree.c:794
+#: builtin/worktree.c:834

 msgid "force removing even if the worktree is dirty"
 msgstr ""
 
 msgid "force removing even if the worktree is dirty"
 msgstr ""
 

-#: builtin/worktree.c:815
+#: builtin/worktree.c:856

 #, c-format
 msgid "cannot remove a locked working tree, lock reason: %s"
 msgstr ""
 
 #, c-format
 msgid "cannot remove a locked working tree, lock reason: %s"
 msgstr ""
 

-#: builtin/worktree.c:817
+#: builtin/worktree.c:858

 msgid "cannot remove a locked working tree"
 msgstr ""
 
 msgid "cannot remove a locked working tree"
 msgstr ""
 

-#: builtin/worktree.c:820
+#: builtin/worktree.c:861

 #, c-format
 msgid "validation failed, cannot remove working tree: %s"
 msgstr ""
 #, c-format
 msgid "validation failed, cannot remove working tree: %s"
 msgstr ""


@@ -13900,26 +14388,6 @@ msgstr ""
 msgid "only useful for debugging"
 msgstr ""
 
 msgid "only useful for debugging"
 msgstr ""
 

-#: upload-pack.c:27
-msgid "git upload-pack [<options>] <dir>"
-msgstr ""
-
-#: upload-pack.c:1070
-msgid "quit after a single request/response exchange"
-msgstr ""
-
-#: upload-pack.c:1072
-msgid "exit immediately after initial ref advertisement"
-msgstr ""
-
-#: upload-pack.c:1074
-msgid "do not try <directory>/.git/ if <directory> is no Git directory"
-msgstr ""
-
-#: upload-pack.c:1076
-msgid "interrupt transfer after <n> seconds of inactivity"
-msgstr ""
-

 #: credential-cache--daemon.c:222
 #, c-format
 msgid ""
 #: credential-cache--daemon.c:222
 #, c-format
 msgid ""


@@ -13933,81 +14401,82 @@ msgstr ""
 msgid "print debugging messages to stderr"
 msgstr ""
 
 msgid "print debugging messages to stderr"
 msgstr ""
 

-#: git.c:8
+#: git.c:26

 msgid ""
 "git [--version] [--help] [-C <path>] [-c <name>=<value>]\n"
 "           [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n"
 msgid ""
 "git [--version] [--help] [-C <path>] [-c <name>=<value>]\n"
 "           [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n"

-"           [-p | --paginate | --no-pager] [--no-replace-objects] [--bare]\n"
+"           [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
+"bare]\n"

 "           [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
 "           <command> [<args>]"
 msgstr ""
 
 "           [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
 "           <command> [<args>]"
 msgstr ""
 

-#: git.c:15
+#: git.c:33

 msgid ""
 "'git help -a' and 'git help -g' list available subcommands and some\n"
 "concept guides. See 'git help <command>' or 'git help <concept>'\n"
 "to read about a specific subcommand or concept."
 msgstr ""
 
 msgid ""
 "'git help -a' and 'git help -g' list available subcommands and some\n"
 "concept guides. See 'git help <command>' or 'git help <concept>'\n"
 "to read about a specific subcommand or concept."
 msgstr ""
 

-#: git.c:95
+#: git.c:113

 #, c-format
 msgid "no directory given for --git-dir\n"
 msgstr ""
 
 #, c-format
 msgid "no directory given for --git-dir\n"
 msgstr ""
 

-#: git.c:109
+#: git.c:127

 #, c-format
 msgid "no namespace given for --namespace\n"
 msgstr ""
 
 #, c-format
 msgid "no namespace given for --namespace\n"
 msgstr ""
 

-#: git.c:123
+#: git.c:141

 #, c-format
 msgid "no directory given for --work-tree\n"
 msgstr ""
 
 #, c-format
 msgid "no directory given for --work-tree\n"
 msgstr ""
 

-#: git.c:137
+#: git.c:155

 #, c-format
 msgid "no prefix given for --super-prefix\n"
 msgstr ""
 
 #, c-format
 msgid "no prefix given for --super-prefix\n"
 msgstr ""
 

-#: git.c:159
+#: git.c:177

 #, c-format
 msgid "-c expects a configuration string\n"
 msgstr ""
 
 #, c-format
 msgid "-c expects a configuration string\n"
 msgstr ""
 

-#: git.c:197
+#: git.c:215

 #, c-format
 msgid "no directory given for -C\n"
 msgstr ""
 
 #, c-format
 msgid "no directory given for -C\n"
 msgstr ""
 

-#: git.c:212
+#: git.c:233

 #, c-format
 msgid "unknown option: %s\n"
 msgstr ""
 
 #, c-format
 msgid "unknown option: %s\n"
 msgstr ""
 

-#: git.c:687
+#: git.c:698

 #, c-format
 msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
 msgstr ""
 
 #, c-format
 msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
 msgstr ""
 

-#: git.c:699
+#: git.c:710

 #, c-format
 msgid "failed to run command '%s': %s\n"
 msgstr ""
 
 #, c-format
 msgid "failed to run command '%s': %s\n"
 msgstr ""
 

-#: http.c:342
+#: http.c:348

 #, c-format
 msgid "negative value for http.postbuffer; defaulting to %d"
 msgstr ""
 
 #, c-format
 msgid "negative value for http.postbuffer; defaulting to %d"
 msgstr ""
 

-#: http.c:363
+#: http.c:369

 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:372
+#: http.c:378

 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:1857
+#: http.c:1854

 #, c-format
 msgid ""
 "unable to update url base from redirection:\n"
 #, c-format
 msgid ""
 "unable to update url base from redirection:\n"


@@ -14015,7 +14484,7 @@ msgid ""
 "   redirect: %s"
 msgstr ""
 
 "   redirect: %s"
 msgstr ""
 

-#: remote-curl.c:345
+#: remote-curl.c:401

 #, c-format
 msgid "redirecting to %s"
 msgstr ""
 #, c-format
 msgid "redirecting to %s"
 msgstr ""


@@ -14140,15 +14609,15 @@ msgstr ""
 msgid "no-op (backward compatibility)"
 msgstr ""
 
 msgid "no-op (backward compatibility)"
 msgstr ""
 

-#: parse-options.h:250
+#: parse-options.h:251

 msgid "be more verbose"
 msgstr ""
 
 msgid "be more verbose"
 msgstr ""
 

-#: parse-options.h:252
+#: parse-options.h:253

 msgid "be more quiet"
 msgstr ""
 
 msgid "be more quiet"
 msgstr ""
 

-#: parse-options.h:258
+#: parse-options.h:259

 msgid "use <n> digits to display SHA-1s"
 msgstr ""
 
 msgid "use <n> digits to display SHA-1s"
 msgstr ""
 


@@ -14361,7 +14830,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:60
+#: git-rebase.sh:61

 msgid ""
 "Resolve all conflicts manually, mark them as resolved with\n"
 "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
 msgid ""
 "Resolve all conflicts manually, mark them as resolved with\n"
 "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"


@@ -14370,47 +14839,47 @@ msgid ""
 "abort\"."
 msgstr ""
 
 "abort\"."
 msgstr ""
 

-#: git-rebase.sh:163 git-rebase.sh:409
+#: git-rebase.sh:173 git-rebase.sh:442

 #, 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:174
+#: git-rebase.sh:184

 msgid "Applied autostash."
 msgstr ""
 
 msgid "Applied autostash."
 msgstr ""
 

-#: git-rebase.sh:177
+#: git-rebase.sh:187

 #, sh-format
 msgid "Cannot store $stash_sha1"
 msgstr ""
 
 #, sh-format
 msgid "Cannot store $stash_sha1"
 msgstr ""
 

-#: git-rebase.sh:218
+#: git-rebase.sh:229

 msgid "The pre-rebase hook refused to rebase."
 msgstr ""
 
 msgid "The pre-rebase hook refused to rebase."
 msgstr ""
 

-#: git-rebase.sh:223
+#: git-rebase.sh:234

 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:370
+#: git-rebase.sh:403

 msgid "No rebase in progress?"
 msgstr ""
 
 msgid "No rebase in progress?"
 msgstr ""
 

-#: git-rebase.sh:381
+#: git-rebase.sh:414

 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:388
+#: git-rebase.sh:421

 msgid "Cannot read HEAD"
 msgstr ""
 
 msgid "Cannot read HEAD"
 msgstr ""
 

-#: git-rebase.sh:391
+#: git-rebase.sh:424

 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:435
+#: git-rebase.sh:468

 #, 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"


@@ -14423,74 +14892,78 @@ msgid ""
 "valuable there."
 msgstr ""
 
 "valuable there."
 msgstr ""
 

-#: git-rebase.sh:491
+#: git-rebase.sh:509
+msgid "error: cannot combine '--signoff' with '--preserve-merges'"
+msgstr ""
+
+#: git-rebase.sh:537

 #, sh-format
 msgid "invalid upstream '$upstream_name'"
 msgstr ""
 
 #, sh-format
 msgid "invalid upstream '$upstream_name'"
 msgstr ""
 

-#: git-rebase.sh:515
+#: git-rebase.sh:561

 #, 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:518 git-rebase.sh:522
+#: git-rebase.sh:564 git-rebase.sh:568

 #, 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:527
+#: git-rebase.sh:573

 #, 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:553
+#: git-rebase.sh:599

 #, sh-format
 msgid "fatal: no such branch/commit '$branch_name'"
 msgstr ""
 
 #, sh-format
 msgid "fatal: no such branch/commit '$branch_name'"
 msgstr ""
 

-#: git-rebase.sh:586
+#: git-rebase.sh:632

 msgid "Cannot autostash"
 msgstr ""
 
 msgid "Cannot autostash"
 msgstr ""
 

-#: git-rebase.sh:591
+#: git-rebase.sh:637

 #, sh-format
 msgid "Created autostash: $stash_abbrev"
 msgstr ""
 
 #, sh-format
 msgid "Created autostash: $stash_abbrev"
 msgstr ""
 

-#: git-rebase.sh:595
+#: git-rebase.sh:641

 msgid "Please commit or stash them."
 msgstr ""
 
 msgid "Please commit or stash them."
 msgstr ""
 

-#: git-rebase.sh:618
+#: git-rebase.sh:664

 #, sh-format
 msgid "HEAD is up to date."
 msgstr ""
 
 #, sh-format
 msgid "HEAD is up to date."
 msgstr ""
 

-#: git-rebase.sh:620
+#: git-rebase.sh:666

 #, 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:628
+#: git-rebase.sh:674

 #, sh-format
 msgid "HEAD is up to date, rebase forced."
 msgstr ""
 
 #, sh-format
 msgid "HEAD is up to date, rebase forced."
 msgstr ""
 

-#: git-rebase.sh:630
+#: git-rebase.sh:676

 #, 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:642
+#: git-rebase.sh:688

 #, sh-format
 msgid "Changes from $mb to $onto:"
 msgstr ""
 
 #, sh-format
 msgid "Changes from $mb to $onto:"
 msgstr ""
 

-#: git-rebase.sh:651
+#: git-rebase.sh:697

 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:661
+#: git-rebase.sh:707

 #, sh-format
 msgid "Fast-forwarded $branch_name to $onto_name."
 msgstr ""
 #, sh-format
 msgid "Fast-forwarded $branch_name to $onto_name."
 msgstr ""


@@ -14558,109 +15031,109 @@ msgstr ""
 msgid "Saved working directory and index state $stash_msg"
 msgstr ""
 
 msgid "Saved working directory and index state $stash_msg"
 msgstr ""
 

-#: git-stash.sh:340
+#: git-stash.sh:342

 msgid "Cannot remove worktree changes"
 msgstr ""
 
 msgid "Cannot remove worktree changes"
 msgstr ""
 

-#: git-stash.sh:488
+#: git-stash.sh:490

 #, sh-format
 msgid "unknown option: $opt"
 msgstr ""
 
 #, sh-format
 msgid "unknown option: $opt"
 msgstr ""
 

-#: git-stash.sh:501
+#: git-stash.sh:503

 msgid "No stash entries found."
 msgstr ""
 
 msgid "No stash entries found."
 msgstr ""
 

-#: git-stash.sh:508
+#: git-stash.sh:510

 #, sh-format
 msgid "Too many revisions specified: $REV"
 msgstr ""
 
 #, sh-format
 msgid "Too many revisions specified: $REV"
 msgstr ""
 

-#: git-stash.sh:523
+#: git-stash.sh:525

 #, sh-format
 msgid "$reference is not a valid reference"
 msgstr ""
 
 #, sh-format
 msgid "$reference is not a valid reference"
 msgstr ""
 

-#: git-stash.sh:551
+#: git-stash.sh:553

 #, sh-format
 msgid "'$args' is not a stash-like commit"
 msgstr ""
 
 #, sh-format
 msgid "'$args' is not a stash-like commit"
 msgstr ""
 

-#: git-stash.sh:562
+#: git-stash.sh:564

 #, sh-format
 msgid "'$args' is not a stash reference"
 msgstr ""
 
 #, sh-format
 msgid "'$args' is not a stash reference"
 msgstr ""
 

-#: git-stash.sh:570
+#: git-stash.sh:572

 msgid "unable to refresh index"
 msgstr ""
 
 msgid "unable to refresh index"
 msgstr ""
 

-#: git-stash.sh:574
+#: git-stash.sh:576

 msgid "Cannot apply a stash in the middle of a merge"
 msgstr ""
 
 msgid "Cannot apply a stash in the middle of a merge"
 msgstr ""
 

-#: git-stash.sh:582
+#: git-stash.sh:584

 msgid "Conflicts in index. Try without --index."
 msgstr ""
 
 msgid "Conflicts in index. Try without --index."
 msgstr ""
 

-#: git-stash.sh:584
+#: git-stash.sh:586

 msgid "Could not save index tree"
 msgstr ""
 
 msgid "Could not save index tree"
 msgstr ""
 

-#: git-stash.sh:593
+#: git-stash.sh:595

 msgid "Could not restore untracked files from stash entry"
 msgstr ""
 
 msgid "Could not restore untracked files from stash entry"
 msgstr ""
 

-#: git-stash.sh:618
+#: git-stash.sh:620

 msgid "Cannot unstage modified files"
 msgstr ""
 
 msgid "Cannot unstage modified files"
 msgstr ""
 

-#: git-stash.sh:633
+#: git-stash.sh:635

 msgid "Index was not unstashed."
 msgstr ""
 
 msgid "Index was not unstashed."
 msgstr ""
 

-#: git-stash.sh:647
+#: git-stash.sh:649

 msgid "The stash entry is kept in case you need it again."
 msgstr ""
 
 msgid "The stash entry is kept in case you need it again."
 msgstr ""
 

-#: git-stash.sh:656
+#: git-stash.sh:658

 #, sh-format
 msgid "Dropped ${REV} ($s)"
 msgstr ""
 
 #, sh-format
 msgid "Dropped ${REV} ($s)"
 msgstr ""
 

-#: git-stash.sh:657
+#: git-stash.sh:659

 #, sh-format
 msgid "${REV}: Could not drop stash entry"
 msgstr ""
 
 #, sh-format
 msgid "${REV}: Could not drop stash entry"
 msgstr ""
 

-#: git-stash.sh:665
+#: git-stash.sh:667

 msgid "No branch name specified"
 msgstr ""
 
 msgid "No branch name specified"
 msgstr ""
 

-#: git-stash.sh:744
+#: git-stash.sh:746

 msgid "(To restore them type \"git stash apply\")"
 msgstr ""
 
 msgid "(To restore them type \"git stash apply\")"
 msgstr ""
 

-#: git-submodule.sh:181
+#: git-submodule.sh:188

 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:191
+#: git-submodule.sh:198

 #, 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:210
+#: git-submodule.sh:217

 #, 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:213
+#: git-submodule.sh:220

 #, sh-format
 msgid "'$sm_path' already exists in the index and is not a submodule"
 msgstr ""
 
 #, sh-format
 msgid "'$sm_path' already exists in the index and is not a submodule"
 msgstr ""
 

-#: git-submodule.sh:219
+#: git-submodule.sh:226

 #, 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"


@@ -14668,22 +15141,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:237
+#: git-submodule.sh:249

 #, 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:239
+#: git-submodule.sh:251

 #, 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:247
+#: git-submodule.sh:259

 #, 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:249
+#: git-submodule.sh:261

 #, 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"


@@ -14694,130 +15167,130 @@ msgid ""
 "option."
 msgstr ""
 
 "option."
 msgstr ""
 

-#: git-submodule.sh:255
+#: git-submodule.sh:267

 #, 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:267
+#: git-submodule.sh:279

 #, sh-format
 msgid "Unable to checkout submodule '$sm_path'"
 msgstr ""
 
 #, sh-format
 msgid "Unable to checkout submodule '$sm_path'"
 msgstr ""
 

-#: git-submodule.sh:272
+#: git-submodule.sh:284

 #, sh-format
 msgid "Failed to add submodule '$sm_path'"
 msgstr ""
 
 #, sh-format
 msgid "Failed to add submodule '$sm_path'"
 msgstr ""
 

-#: git-submodule.sh:281
+#: git-submodule.sh:293

 #, sh-format
 msgid "Failed to register submodule '$sm_path'"
 msgstr ""
 
 #, sh-format
 msgid "Failed to register submodule '$sm_path'"
 msgstr ""
 

-#: git-submodule.sh:342
+#: git-submodule.sh:354

 #, sh-format
 msgid "Entering '$displaypath'"
 msgstr ""
 
 #, sh-format
 msgid "Entering '$displaypath'"
 msgstr ""
 

-#: git-submodule.sh:362
+#: git-submodule.sh:374

 #, 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:584
+#: git-submodule.sh:600

 #, 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:594
+#: git-submodule.sh:610

 #, 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:599
+#: git-submodule.sh:615

 #, 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:617
+#: git-submodule.sh:633

 #, 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:623
+#: git-submodule.sh:639

 #, 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:630
+#: git-submodule.sh:646

 #, 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:631
+#: git-submodule.sh:647

 #, sh-format
 msgid "Submodule path '$displaypath': checked out '$sha1'"
 msgstr ""
 
 #, sh-format
 msgid "Submodule path '$displaypath': checked out '$sha1'"
 msgstr ""
 

-#: git-submodule.sh:635
+#: git-submodule.sh:651

 #, 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:636
+#: git-submodule.sh:652

 #, sh-format
 msgid "Submodule path '$displaypath': rebased into '$sha1'"
 msgstr ""
 
 #, sh-format
 msgid "Submodule path '$displaypath': rebased into '$sha1'"
 msgstr ""
 

-#: git-submodule.sh:641
+#: git-submodule.sh:657

 #, 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:642
+#: git-submodule.sh:658

 #, sh-format
 msgid "Submodule path '$displaypath': merged in '$sha1'"
 msgstr ""
 
 #, sh-format
 msgid "Submodule path '$displaypath': merged in '$sha1'"
 msgstr ""
 

-#: git-submodule.sh:647
+#: git-submodule.sh:663

 #, 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:648
+#: git-submodule.sh:664

 #, sh-format
 msgid "Submodule path '$displaypath': '$command $sha1'"
 msgstr ""
 
 #, sh-format
 msgid "Submodule path '$displaypath': '$command $sha1'"
 msgstr ""
 

-#: git-submodule.sh:679
+#: git-submodule.sh:695

 #, 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:775
+#: git-submodule.sh:791

 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:827
+#: git-submodule.sh:843

 #, sh-format
 msgid "unexpected mode $mod_dst"
 msgstr ""
 
 #, sh-format
 msgid "unexpected mode $mod_dst"
 msgstr ""
 

-#: git-submodule.sh:847
+#: git-submodule.sh:863

 #, 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:850
+#: git-submodule.sh:866

 #, 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:853
+#: git-submodule.sh:869

 #, 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 ""


@@ -14827,39 +15300,45 @@ msgstr ""
 msgid "See git-${cmd}(1) for details."
 msgstr ""
 
 msgid "See git-${cmd}(1) for details."
 msgstr ""
 

-#: git-rebase--interactive.sh:140
+#: git-rebase--interactive.sh:142

 #, sh-format
 msgid "Rebasing ($new_count/$total)"
 msgstr ""
 
 #, sh-format
 msgid "Rebasing ($new_count/$total)"
 msgstr ""
 

-#: git-rebase--interactive.sh:156
+#: git-rebase--interactive.sh:158

 msgid ""
 "\n"
 "Commands:\n"
 msgid ""
 "\n"
 "Commands:\n"

-"p, pick = use commit\n"
-"r, reword = use commit, but edit the commit message\n"
-"e, edit = use commit, but stop for amending\n"
-"s, squash = use commit, but meld into previous commit\n"
-"f, fixup = like \"squash\", but discard this commit's log message\n"
-"x, exec = run command (the rest of the line) using shell\n"
-"d, drop = remove commit\n"
+"p, pick <commit> = use commit\n"
+"r, reword <commit> = use commit, but edit the commit message\n"
+"e, edit <commit> = use commit, but stop for amending\n"
+"s, squash <commit> = use commit, but meld into previous commit\n"
+"f, fixup <commit> = like \"squash\", but discard this commit's log message\n"
+"x, exec <commit> = run command (the rest of the line) using shell\n"
+"d, drop <commit> = remove commit\n"
+"l, label <label> = label current HEAD with a name\n"
+"t, reset <label> = reset HEAD to a label\n"
+"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
+".       create a merge commit using the original merge commit's\n"
+".       message (or the oneline, if no original merge commit was\n"
+".       specified). Use -c <commit> to reword the commit message.\n"

 "\n"
 "These lines can be re-ordered; they are executed from top to bottom.\n"
 msgstr ""
 
 "\n"
 "These lines can be re-ordered; they are executed from top to bottom.\n"
 msgstr ""
 

-#: git-rebase--interactive.sh:171
+#: git-rebase--interactive.sh:179

 msgid ""
 "\n"
 "Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
 msgstr ""
 
 msgid ""
 "\n"
 "Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
 msgstr ""
 

-#: git-rebase--interactive.sh:175
+#: git-rebase--interactive.sh:183

 msgid ""
 "\n"
 "If you remove a line here THAT COMMIT WILL BE LOST.\n"
 msgstr ""
 
 msgid ""
 "\n"
 "If you remove a line here THAT COMMIT WILL BE LOST.\n"
 msgstr ""
 

-#: git-rebase--interactive.sh:213
+#: git-rebase--interactive.sh:221

 #, sh-format
 msgid ""
 "You can amend the commit now, with\n"
 #, sh-format
 msgid ""
 "You can amend the commit now, with\n"


@@ -14871,83 +15350,83 @@ msgid ""
 "\tgit rebase --continue"
 msgstr ""
 
 "\tgit rebase --continue"
 msgstr ""
 

-#: git-rebase--interactive.sh:238
+#: git-rebase--interactive.sh:246

 #, sh-format
 msgid "$sha1: not a commit that can be picked"
 msgstr ""
 
 #, sh-format
 msgid "$sha1: not a commit that can be picked"
 msgstr ""
 

-#: git-rebase--interactive.sh:277
+#: git-rebase--interactive.sh:285

 #, sh-format
 msgid "Invalid commit name: $sha1"
 msgstr ""
 
 #, sh-format
 msgid "Invalid commit name: $sha1"
 msgstr ""
 

-#: git-rebase--interactive.sh:319
+#: git-rebase--interactive.sh:325

 msgid "Cannot write current commit's replacement sha1"
 msgstr ""
 
 msgid "Cannot write current commit's replacement sha1"
 msgstr ""
 

-#: git-rebase--interactive.sh:371
+#: git-rebase--interactive.sh:376

 #, sh-format
 msgid "Fast-forward to $sha1"
 msgstr ""
 
 #, sh-format
 msgid "Fast-forward to $sha1"
 msgstr ""
 

-#: git-rebase--interactive.sh:373
+#: git-rebase--interactive.sh:378

 #, sh-format
 msgid "Cannot fast-forward to $sha1"
 msgstr ""
 
 #, sh-format
 msgid "Cannot fast-forward to $sha1"
 msgstr ""
 

-#: git-rebase--interactive.sh:382
+#: git-rebase--interactive.sh:387

 #, sh-format
 msgid "Cannot move HEAD to $first_parent"
 msgstr ""
 
 #, sh-format
 msgid "Cannot move HEAD to $first_parent"
 msgstr ""
 

-#: git-rebase--interactive.sh:387
+#: git-rebase--interactive.sh:392

 #, sh-format
 msgid "Refusing to squash a merge: $sha1"
 msgstr ""
 
 #, sh-format
 msgid "Refusing to squash a merge: $sha1"
 msgstr ""
 

-#: git-rebase--interactive.sh:405
+#: git-rebase--interactive.sh:410

 #, sh-format
 msgid "Error redoing merge $sha1"
 msgstr ""
 
 #, sh-format
 msgid "Error redoing merge $sha1"
 msgstr ""
 

-#: git-rebase--interactive.sh:414
+#: git-rebase--interactive.sh:419

 #, sh-format
 msgid "Could not pick $sha1"
 msgstr ""
 
 #, sh-format
 msgid "Could not pick $sha1"
 msgstr ""
 

-#: git-rebase--interactive.sh:423
+#: git-rebase--interactive.sh:428

 #, sh-format
 msgid "This is the commit message #${n}:"
 msgstr ""
 
 #, sh-format
 msgid "This is the commit message #${n}:"
 msgstr ""
 

-#: git-rebase--interactive.sh:428
+#: git-rebase--interactive.sh:433

 #, sh-format
 msgid "The commit message #${n} will be skipped:"
 msgstr ""
 
 #, sh-format
 msgid "The commit message #${n} will be skipped:"
 msgstr ""
 

-#: git-rebase--interactive.sh:439
+#: git-rebase--interactive.sh:444

 #, sh-format
 msgid "This is a combination of $count commit."
 msgid_plural "This is a combination of $count commits."
 msgstr[0] ""
 msgstr[1] ""
 
 #, sh-format
 msgid "This is a combination of $count commit."
 msgid_plural "This is a combination of $count commits."
 msgstr[0] ""
 msgstr[1] ""
 

-#: git-rebase--interactive.sh:448
+#: git-rebase--interactive.sh:453

 #, sh-format
 msgid "Cannot write $fixup_msg"
 msgstr ""
 
 #, sh-format
 msgid "Cannot write $fixup_msg"
 msgstr ""
 

-#: git-rebase--interactive.sh:451
+#: git-rebase--interactive.sh:456

 msgid "This is a combination of 2 commits."
 msgstr ""
 
 msgid "This is a combination of 2 commits."
 msgstr ""
 

-#: git-rebase--interactive.sh:492 git-rebase--interactive.sh:535
-#: git-rebase--interactive.sh:538
+#: git-rebase--interactive.sh:497 git-rebase--interactive.sh:540
+#: git-rebase--interactive.sh:543

 #, sh-format
 msgid "Could not apply $sha1... $rest"
 msgstr ""
 
 #, sh-format
 msgid "Could not apply $sha1... $rest"
 msgstr ""
 

-#: git-rebase--interactive.sh:567
+#: git-rebase--interactive.sh:572

 #, 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"


@@ -14957,31 +15436,31 @@ msgid ""
 "you are able to reword the commit."
 msgstr ""
 
 "you are able to reword the commit."
 msgstr ""
 

-#: git-rebase--interactive.sh:582
+#: git-rebase--interactive.sh:587

 #, sh-format
 msgid "Stopped at $sha1_abbrev... $rest"
 msgstr ""
 
 #, sh-format
 msgid "Stopped at $sha1_abbrev... $rest"
 msgstr ""
 

-#: git-rebase--interactive.sh:597
+#: git-rebase--interactive.sh:602

 #, 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:639
+#: git-rebase--interactive.sh:644

 #, sh-format
 msgid "Executing: $rest"
 msgstr ""
 
 #, sh-format
 msgid "Executing: $rest"
 msgstr ""
 

-#: git-rebase--interactive.sh:647
+#: git-rebase--interactive.sh:652

 #, sh-format
 msgid "Execution failed: $rest"
 msgstr ""
 
 #, sh-format
 msgid "Execution failed: $rest"
 msgstr ""
 

-#: git-rebase--interactive.sh:649
+#: git-rebase--interactive.sh:654

 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:651
+#: git-rebase--interactive.sh:656

 msgid ""
 "You can fix the problem, and then run\n"
 "\n"
 msgid ""
 "You can fix the problem, and then run\n"
 "\n"


@@ -14989,7 +15468,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:664
+#: git-rebase--interactive.sh:669

 #, sh-format
 msgid ""
 "Execution succeeded: $rest\n"
 #, sh-format
 msgid ""
 "Execution succeeded: $rest\n"


@@ -14999,29 +15478,29 @@ msgid ""
 "\tgit rebase --continue"
 msgstr ""
 
 "\tgit rebase --continue"
 msgstr ""
 

-#: git-rebase--interactive.sh:675
+#: git-rebase--interactive.sh:680

 #, sh-format
 msgid "Unknown command: $command $sha1 $rest"
 msgstr ""
 
 #, sh-format
 msgid "Unknown command: $command $sha1 $rest"
 msgstr ""
 

-#: git-rebase--interactive.sh:676
+#: git-rebase--interactive.sh:681

 msgid "Please fix this using 'git rebase --edit-todo'."
 msgstr ""
 
 msgid "Please fix this using 'git rebase --edit-todo'."
 msgstr ""
 

-#: git-rebase--interactive.sh:711
+#: git-rebase--interactive.sh:716

 #, sh-format
 msgid "Successfully rebased and updated $head_name."
 msgstr ""
 
 #, sh-format
 msgid "Successfully rebased and updated $head_name."
 msgstr ""
 

-#: git-rebase--interactive.sh:735
+#: git-rebase--interactive.sh:740

 msgid "could not detach HEAD"
 msgstr ""
 
 msgid "could not detach HEAD"
 msgstr ""
 

-#: git-rebase--interactive.sh:771
+#: git-rebase--interactive.sh:778

 msgid "Could not remove CHERRY_PICK_HEAD"
 msgstr ""
 
 msgid "Could not remove CHERRY_PICK_HEAD"
 msgstr ""
 

-#: git-rebase--interactive.sh:776
+#: git-rebase--interactive.sh:783

 #, sh-format
 msgid ""
 "You have staged changes in your working tree.\n"
 #, sh-format
 msgid ""
 "You have staged changes in your working tree.\n"


@@ -15039,21 +15518,21 @@ msgid ""
 "  git rebase --continue\n"
 msgstr ""
 
 "  git rebase --continue\n"
 msgstr ""
 

-#: git-rebase--interactive.sh:793
+#: git-rebase--interactive.sh:800

 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:798
+#: git-rebase--interactive.sh:805

 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:803 git-rebase--interactive.sh:807
+#: git-rebase--interactive.sh:810 git-rebase--interactive.sh:814

 msgid "Could not commit staged changes."
 msgstr ""
 
 msgid "Could not commit staged changes."
 msgstr ""
 

-#: git-rebase--interactive.sh:836
+#: git-rebase--interactive.sh:843

 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"


@@ -15062,54 +15541,55 @@ msgid ""
 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-#: git-rebase--interactive.sh:844 git-rebase--interactive.sh:1008
+#: git-rebase--interactive.sh:851 git-rebase--interactive.sh:937

 msgid "Could not execute editor"
 msgstr ""
 
 msgid "Could not execute editor"
 msgstr ""
 

-#: git-rebase--interactive.sh:860
+#: git-rebase--interactive.sh:872

 #, sh-format
 msgid "Could not checkout $switch_to"
 msgstr ""
 
 #, sh-format
 msgid "Could not checkout $switch_to"
 msgstr ""
 

-#: git-rebase--interactive.sh:865
+#: git-rebase--interactive.sh:879

 msgid "No HEAD?"
 msgstr ""
 
 msgid "No HEAD?"
 msgstr ""
 

-#: git-rebase--interactive.sh:866
+#: git-rebase--interactive.sh:880

 #, sh-format
 msgid "Could not create temporary $state_dir"
 msgstr ""
 
 #, sh-format
 msgid "Could not create temporary $state_dir"
 msgstr ""
 

-#: git-rebase--interactive.sh:869
+#: git-rebase--interactive.sh:883

 msgid "Could not mark as interactive"
 msgstr ""
 
 msgid "Could not mark as interactive"
 msgstr ""
 

-#: git-rebase--interactive.sh:879 git-rebase--interactive.sh:884
-msgid "Could not init rewritten commits"
-msgstr ""
-
-#: git-rebase--interactive.sh:910
-msgid "Could not generate todo list"
-msgstr ""
-
-#: git-rebase--interactive.sh:986
+#: git-rebase--interactive.sh:915

 #, 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:991
+#: git-rebase--interactive.sh:920

 msgid ""
 "\n"
 msgid ""
 "\n"

-"However, if you remove everything, the rebase will be aborted.\n"
+"\tHowever, if you remove everything, the rebase will be aborted.\n"

 "\n"
 "\n"

+"\t"

 msgstr ""
 
 msgstr ""
 

-#: git-rebase--interactive.sh:998
+#: git-rebase--interactive.sh:927

 msgid "Note that empty commits are commented out"
 msgstr ""
 
 msgid "Note that empty commits are commented out"
 msgstr ""
 

+#: git-rebase--interactive.sh:980
+msgid "Could not generate todo list"
+msgstr ""
+
+#: git-rebase--interactive.sh:1001 git-rebase--interactive.sh:1006
+msgid "Could not init rewritten commits"
+msgstr ""
+

 #: git-sh-setup.sh:89 git-sh-setup.sh:94
 #, sh-format
 msgid "usage: $dashless $USAGE"
 #: git-sh-setup.sh:89 git-sh-setup.sh:94
 #, sh-format
 msgid "usage: $dashless $USAGE"


@@ -15181,107 +15661,107 @@ msgstr ""
 msgid "unstaged"
 msgstr ""
 
 msgid "unstaged"
 msgstr ""
 

-#: git-add--interactive.perl:246 git-add--interactive.perl:271
+#: git-add--interactive.perl:253 git-add--interactive.perl:278

 msgid "binary"
 msgstr ""
 
 msgid "binary"
 msgstr ""
 

-#: git-add--interactive.perl:255 git-add--interactive.perl:309
+#: git-add--interactive.perl:262 git-add--interactive.perl:316

 msgid "nothing"
 msgstr ""
 
 msgid "nothing"
 msgstr ""
 

-#: git-add--interactive.perl:291 git-add--interactive.perl:306
+#: git-add--interactive.perl:298 git-add--interactive.perl:313

 msgid "unchanged"
 msgstr ""
 
 msgid "unchanged"
 msgstr ""
 

-#: git-add--interactive.perl:602
+#: git-add--interactive.perl:609

 #, perl-format
 msgid "added %d path\n"
 msgid_plural "added %d paths\n"
 msgstr[0] ""
 msgstr[1] ""
 
 #, perl-format
 msgid "added %d path\n"
 msgid_plural "added %d paths\n"
 msgstr[0] ""
 msgstr[1] ""
 

-#: git-add--interactive.perl:605
+#: git-add--interactive.perl:612

 #, perl-format
 msgid "updated %d path\n"
 msgid_plural "updated %d paths\n"
 msgstr[0] ""
 msgstr[1] ""
 
 #, perl-format
 msgid "updated %d path\n"
 msgid_plural "updated %d paths\n"
 msgstr[0] ""
 msgstr[1] ""
 

-#: git-add--interactive.perl:608
+#: git-add--interactive.perl:615

 #, perl-format
 msgid "reverted %d path\n"
 msgid_plural "reverted %d paths\n"
 msgstr[0] ""
 msgstr[1] ""
 
 #, perl-format
 msgid "reverted %d path\n"
 msgid_plural "reverted %d paths\n"
 msgstr[0] ""
 msgstr[1] ""
 

-#: git-add--interactive.perl:611
+#: git-add--interactive.perl:618

 #, perl-format
 msgid "touched %d path\n"
 msgid_plural "touched %d paths\n"
 msgstr[0] ""
 msgstr[1] ""
 
 #, perl-format
 msgid "touched %d path\n"
 msgid_plural "touched %d paths\n"
 msgstr[0] ""
 msgstr[1] ""
 

-#: git-add--interactive.perl:620
+#: git-add--interactive.perl:627

 msgid "Update"
 msgstr ""
 
 msgid "Update"
 msgstr ""
 

-#: git-add--interactive.perl:632
+#: git-add--interactive.perl:639

 msgid "Revert"
 msgstr ""
 
 msgid "Revert"
 msgstr ""
 

-#: git-add--interactive.perl:655
+#: git-add--interactive.perl:662

 #, perl-format
 msgid "note: %s is untracked now.\n"
 msgstr ""
 
 #, perl-format
 msgid "note: %s is untracked now.\n"
 msgstr ""
 

-#: git-add--interactive.perl:666
+#: git-add--interactive.perl:673

 msgid "Add untracked"
 msgstr ""
 
 msgid "Add untracked"
 msgstr ""
 

-#: git-add--interactive.perl:672
+#: git-add--interactive.perl:679

 msgid "No untracked files.\n"
 msgstr ""
 
 msgid "No untracked files.\n"
 msgstr ""
 

-#: git-add--interactive.perl:1026
+#: git-add--interactive.perl:1033

 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for staging."
 msgstr ""
 
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for staging."
 msgstr ""
 

-#: git-add--interactive.perl:1029
+#: git-add--interactive.perl:1036

 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for stashing."
 msgstr ""
 
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for stashing."
 msgstr ""
 

-#: git-add--interactive.perl:1032
+#: git-add--interactive.perl:1039

 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for unstaging."
 msgstr ""
 
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for unstaging."
 msgstr ""
 

-#: git-add--interactive.perl:1035 git-add--interactive.perl:1044
+#: git-add--interactive.perl:1042 git-add--interactive.perl:1051

 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for applying."
 msgstr ""
 
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for applying."
 msgstr ""
 

-#: git-add--interactive.perl:1038 git-add--interactive.perl:1041
+#: git-add--interactive.perl:1045 git-add--interactive.perl:1048

 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for discarding."
 msgstr ""
 
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for discarding."
 msgstr ""
 

-#: git-add--interactive.perl:1078
+#: git-add--interactive.perl:1085

 #, perl-format
 msgid "failed to open hunk edit file for writing: %s"
 msgstr ""
 
 #, perl-format
 msgid "failed to open hunk edit file for writing: %s"
 msgstr ""
 

-#: git-add--interactive.perl:1079
+#: git-add--interactive.perl:1086

 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
 msgstr ""
 
 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
 msgstr ""
 

-#: git-add--interactive.perl:1085
+#: git-add--interactive.perl:1092

 #, perl-format
 msgid ""
 "---\n"
 #, perl-format
 msgid ""
 "---\n"


@@ -15291,14 +15771,14 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
 msgstr ""
 
 #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.

-#: git-add--interactive.perl:1093
+#: git-add--interactive.perl:1100

 msgid ""
 "If it does not apply cleanly, you will be given an opportunity to\n"
 "edit again.  If all lines of the hunk are removed, then the edit is\n"
 "aborted and the hunk is left unchanged.\n"
 msgstr ""
 
 msgid ""
 "If it does not apply cleanly, you will be given an opportunity to\n"
 "edit again.  If all lines of the hunk are removed, then the edit is\n"
 "aborted and the hunk is left unchanged.\n"
 msgstr ""
 

-#: git-add--interactive.perl:1107
+#: git-add--interactive.perl:1114

 #, perl-format
 msgid "failed to open hunk edit file for reading: %s"
 msgstr ""
 #, perl-format
 msgid "failed to open hunk edit file for reading: %s"
 msgstr ""


@@ -15309,12 +15789,12 @@ msgstr ""
 #. Consider translating (saying "no" discards!) as
 #. (saying "n" for "no" discards!) if the translation
 #. of the word "no" does not start with n.
 #. Consider translating (saying "no" discards!) as
 #. (saying "n" for "no" discards!) if the translation
 #. of the word "no" does not start with n.

-#: git-add--interactive.perl:1206
+#: git-add--interactive.perl:1213

 msgid ""
 "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
 msgstr ""
 
 msgid ""
 "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
 msgstr ""
 

-#: git-add--interactive.perl:1215
+#: git-add--interactive.perl:1222

 msgid ""
 "y - stage this hunk\n"
 "n - do not stage this hunk\n"
 msgid ""
 "y - stage this hunk\n"
 "n - do not stage this hunk\n"


@@ -15323,7 +15803,7 @@ msgid ""
 "d - do not stage this hunk or any of the later hunks in the file"
 msgstr ""
 
 "d - do not stage this hunk or any of the later hunks in the file"
 msgstr ""
 

-#: git-add--interactive.perl:1221
+#: git-add--interactive.perl:1228

 msgid ""
 "y - stash this hunk\n"
 "n - do not stash this hunk\n"
 msgid ""
 "y - stash this hunk\n"
 "n - do not stash this hunk\n"


@@ -15332,7 +15812,7 @@ msgid ""
 "d - do not stash this hunk or any of the later hunks in the file"
 msgstr ""
 
 "d - do not stash this hunk or any of the later hunks in the file"
 msgstr ""
 

-#: git-add--interactive.perl:1227
+#: git-add--interactive.perl:1234

 msgid ""
 "y - unstage this hunk\n"
 "n - do not unstage this hunk\n"
 msgid ""
 "y - unstage this hunk\n"
 "n - do not unstage this hunk\n"


@@ -15341,7 +15821,7 @@ msgid ""
 "d - do not unstage this hunk or any of the later hunks in the file"
 msgstr ""
 
 "d - do not unstage this hunk or any of the later hunks in the file"
 msgstr ""
 

-#: git-add--interactive.perl:1233
+#: git-add--interactive.perl:1240

 msgid ""
 "y - apply this hunk to index\n"
 "n - do not apply this hunk to index\n"
 msgid ""
 "y - apply this hunk to index\n"
 "n - do not apply this hunk to index\n"


@@ -15350,7 +15830,7 @@ msgid ""
 "d - do not apply this hunk or any of the later hunks in the file"
 msgstr ""
 
 "d - do not apply this hunk or any of the later hunks in the file"
 msgstr ""
 

-#: git-add--interactive.perl:1239
+#: git-add--interactive.perl:1246

 msgid ""
 "y - discard this hunk from worktree\n"
 "n - do not discard this hunk from worktree\n"
 msgid ""
 "y - discard this hunk from worktree\n"
 "n - do not discard this hunk from worktree\n"


@@ -15359,7 +15839,7 @@ msgid ""
 "d - do not discard this hunk or any of the later hunks in the file"
 msgstr ""
 
 "d - do not discard this hunk or any of the later hunks in the file"
 msgstr ""
 

-#: git-add--interactive.perl:1245
+#: git-add--interactive.perl:1252

 msgid ""
 "y - discard this hunk from index and worktree\n"
 "n - do not discard this hunk from index and worktree\n"
 msgid ""
 "y - discard this hunk from index and worktree\n"
 "n - do not discard this hunk from index and worktree\n"


@@ -15368,7 +15848,7 @@ msgid ""
 "d - do not discard this hunk or any of the later hunks in the file"
 msgstr ""
 
 "d - do not discard this hunk or any of the later hunks in the file"
 msgstr ""
 

-#: git-add--interactive.perl:1251
+#: git-add--interactive.perl:1258

 msgid ""
 "y - apply this hunk to index and worktree\n"
 "n - do not apply this hunk to index and worktree\n"
 msgid ""
 "y - apply this hunk to index and worktree\n"
 "n - do not apply this hunk to index and worktree\n"


@@ -15377,7 +15857,7 @@ msgid ""
 "d - do not apply this hunk or any of the later hunks in the file"
 msgstr ""
 
 "d - do not apply this hunk or any of the later hunks in the file"
 msgstr ""
 

-#: git-add--interactive.perl:1266
+#: git-add--interactive.perl:1273

 msgid ""
 "g - select a hunk to go to\n"
 "/ - search for a hunk matching the given regex\n"
 msgid ""
 "g - select a hunk to go to\n"
 "/ - search for a hunk matching the given regex\n"


@@ -15390,211 +15870,211 @@ msgid ""
 "? - print help\n"
 msgstr ""
 
 "? - print help\n"
 msgstr ""
 

-#: git-add--interactive.perl:1297
+#: git-add--interactive.perl:1304

 msgid "The selected hunks do not apply to the index!\n"
 msgstr ""
 
 msgid "The selected hunks do not apply to the index!\n"
 msgstr ""
 

-#: git-add--interactive.perl:1298
+#: git-add--interactive.perl:1305

 msgid "Apply them to the worktree anyway? "
 msgstr ""
 
 msgid "Apply them to the worktree anyway? "
 msgstr ""
 

-#: git-add--interactive.perl:1301
+#: git-add--interactive.perl:1308

 msgid "Nothing was applied.\n"
 msgstr ""
 
 msgid "Nothing was applied.\n"
 msgstr ""
 

-#: git-add--interactive.perl:1312
+#: git-add--interactive.perl:1319

 #, perl-format
 msgid "ignoring unmerged: %s\n"
 msgstr ""
 
 #, perl-format
 msgid "ignoring unmerged: %s\n"
 msgstr ""
 

-#: git-add--interactive.perl:1321
+#: git-add--interactive.perl:1328

 msgid "Only binary files changed.\n"
 msgstr ""
 
 msgid "Only binary files changed.\n"
 msgstr ""
 

-#: git-add--interactive.perl:1323
+#: git-add--interactive.perl:1330

 msgid "No changes.\n"
 msgstr ""
 
 msgid "No changes.\n"
 msgstr ""
 

-#: git-add--interactive.perl:1331
+#: git-add--interactive.perl:1338

 msgid "Patch update"
 msgstr ""
 
 msgid "Patch update"
 msgstr ""
 

-#: git-add--interactive.perl:1383
+#: git-add--interactive.perl:1390

 #, perl-format
 msgid "Stage mode change [y,n,q,a,d%s,?]? "
 msgstr ""
 
 #, perl-format
 msgid "Stage mode change [y,n,q,a,d%s,?]? "
 msgstr ""
 

-#: git-add--interactive.perl:1384
+#: git-add--interactive.perl:1391

 #, perl-format
 msgid "Stage deletion [y,n,q,a,d%s,?]? "
 msgstr ""
 
 #, perl-format
 msgid "Stage deletion [y,n,q,a,d%s,?]? "
 msgstr ""
 

-#: git-add--interactive.perl:1385
+#: git-add--interactive.perl:1392

 #, perl-format
 msgid "Stage this hunk [y,n,q,a,d%s,?]? "
 msgstr ""
 
 #, perl-format
 msgid "Stage this hunk [y,n,q,a,d%s,?]? "
 msgstr ""
 

-#: git-add--interactive.perl:1388
+#: git-add--interactive.perl:1395

 #, perl-format
 msgid "Stash mode change [y,n,q,a,d%s,?]? "
 msgstr ""
 
 #, perl-format
 msgid "Stash mode change [y,n,q,a,d%s,?]? "
 msgstr ""
 

-#: git-add--interactive.perl:1389
+#: git-add--interactive.perl:1396

 #, perl-format
 msgid "Stash deletion [y,n,q,a,d%s,?]? "
 msgstr ""
 
 #, perl-format
 msgid "Stash deletion [y,n,q,a,d%s,?]? "
 msgstr ""
 

-#: git-add--interactive.perl:1390
+#: git-add--interactive.perl:1397

 #, perl-format
 msgid "Stash this hunk [y,n,q,a,d%s,?]? "
 msgstr ""
 
 #, perl-format
 msgid "Stash this hunk [y,n,q,a,d%s,?]? "
 msgstr ""
 

-#: git-add--interactive.perl:1393
+#: git-add--interactive.perl:1400

 #, perl-format
 msgid "Unstage mode change [y,n,q,a,d%s,?]? "
 msgstr ""
 
 #, perl-format
 msgid "Unstage mode change [y,n,q,a,d%s,?]? "
 msgstr ""
 

-#: git-add--interactive.perl:1394
+#: git-add--interactive.perl:1401

 #, perl-format
 msgid "Unstage deletion [y,n,q,a,d%s,?]? "
 msgstr ""
 
 #, perl-format
 msgid "Unstage deletion [y,n,q,a,d%s,?]? "
 msgstr ""
 

-#: git-add--interactive.perl:1395
+#: git-add--interactive.perl:1402

 #, perl-format
 msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
 msgstr ""
 
 #, perl-format
 msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
 msgstr ""
 

-#: git-add--interactive.perl:1398
+#: git-add--interactive.perl:1405

 #, perl-format
 msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
 msgstr ""
 
 #, perl-format
 msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
 msgstr ""
 

-#: git-add--interactive.perl:1399
+#: git-add--interactive.perl:1406

 #, perl-format
 msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
 msgstr ""
 
 #, perl-format
 msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
 msgstr ""
 

-#: git-add--interactive.perl:1400
+#: git-add--interactive.perl:1407

 #, perl-format
 msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
 msgstr ""
 
 #, perl-format
 msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
 msgstr ""
 

-#: git-add--interactive.perl:1403
+#: git-add--interactive.perl:1410

 #, perl-format
 msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 
 #, perl-format
 msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 

-#: git-add--interactive.perl:1404
+#: git-add--interactive.perl:1411

 #, perl-format
 msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 
 #, perl-format
 msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 

-#: git-add--interactive.perl:1405
+#: git-add--interactive.perl:1412

 #, perl-format
 msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 
 #, perl-format
 msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 

-#: git-add--interactive.perl:1408
+#: git-add--interactive.perl:1415

 #, perl-format
 msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 
 #, perl-format
 msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 

-#: git-add--interactive.perl:1409
+#: git-add--interactive.perl:1416

 #, perl-format
 msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 
 #, perl-format
 msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 

-#: git-add--interactive.perl:1410
+#: git-add--interactive.perl:1417

 #, perl-format
 msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 
 #, perl-format
 msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 

-#: git-add--interactive.perl:1413
+#: git-add--interactive.perl:1420

 #, perl-format
 msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 
 #, perl-format
 msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 

-#: git-add--interactive.perl:1414
+#: git-add--interactive.perl:1421

 #, perl-format
 msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 
 #, perl-format
 msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 

-#: git-add--interactive.perl:1415
+#: git-add--interactive.perl:1422

 #, perl-format
 msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 
 #, perl-format
 msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 

-#: git-add--interactive.perl:1515
+#: git-add--interactive.perl:1522

 msgid "No other hunks to goto\n"
 msgstr ""
 
 msgid "No other hunks to goto\n"
 msgstr ""
 

-#: git-add--interactive.perl:1522
+#: git-add--interactive.perl:1529

 msgid "go to which hunk (<ret> to see more)? "
 msgstr ""
 
 msgid "go to which hunk (<ret> to see more)? "
 msgstr ""
 

-#: git-add--interactive.perl:1524
+#: git-add--interactive.perl:1531

 msgid "go to which hunk? "
 msgstr ""
 
 msgid "go to which hunk? "
 msgstr ""
 

-#: git-add--interactive.perl:1533
+#: git-add--interactive.perl:1540

 #, perl-format
 msgid "Invalid number: '%s'\n"
 msgstr ""
 
 #, perl-format
 msgid "Invalid number: '%s'\n"
 msgstr ""
 

-#: git-add--interactive.perl:1538
+#: git-add--interactive.perl:1545

 #, perl-format
 msgid "Sorry, only %d hunk available.\n"
 msgid_plural "Sorry, only %d hunks available.\n"
 msgstr[0] ""
 msgstr[1] ""
 
 #, perl-format
 msgid "Sorry, only %d hunk available.\n"
 msgid_plural "Sorry, only %d hunks available.\n"
 msgstr[0] ""
 msgstr[1] ""
 

-#: git-add--interactive.perl:1564
+#: git-add--interactive.perl:1571

 msgid "No other hunks to search\n"
 msgstr ""
 
 msgid "No other hunks to search\n"
 msgstr ""
 

-#: git-add--interactive.perl:1568
+#: git-add--interactive.perl:1575

 msgid "search for regex? "
 msgstr ""
 
 msgid "search for regex? "
 msgstr ""
 

-#: git-add--interactive.perl:1581
+#: git-add--interactive.perl:1588

 #, perl-format
 msgid "Malformed search regexp %s: %s\n"
 msgstr ""
 
 #, perl-format
 msgid "Malformed search regexp %s: %s\n"
 msgstr ""
 

-#: git-add--interactive.perl:1591
+#: git-add--interactive.perl:1598

 msgid "No hunk matches the given pattern\n"
 msgstr ""
 
 msgid "No hunk matches the given pattern\n"
 msgstr ""
 

-#: git-add--interactive.perl:1603 git-add--interactive.perl:1625
+#: git-add--interactive.perl:1610 git-add--interactive.perl:1632

 msgid "No previous hunk\n"
 msgstr ""
 
 msgid "No previous hunk\n"
 msgstr ""
 

-#: git-add--interactive.perl:1612 git-add--interactive.perl:1631
+#: git-add--interactive.perl:1619 git-add--interactive.perl:1638

 msgid "No next hunk\n"
 msgstr ""
 
 msgid "No next hunk\n"
 msgstr ""
 

-#: git-add--interactive.perl:1637
+#: git-add--interactive.perl:1644

 msgid "Sorry, cannot split this hunk\n"
 msgstr ""
 
 msgid "Sorry, cannot split this hunk\n"
 msgstr ""
 

-#: git-add--interactive.perl:1643
+#: git-add--interactive.perl:1650

 #, perl-format
 msgid "Split into %d hunk.\n"
 msgid_plural "Split into %d hunks.\n"
 msgstr[0] ""
 msgstr[1] ""
 
 #, perl-format
 msgid "Split into %d hunk.\n"
 msgid_plural "Split into %d hunks.\n"
 msgstr[0] ""
 msgstr[1] ""
 

-#: git-add--interactive.perl:1653
+#: git-add--interactive.perl:1660

 msgid "Sorry, cannot edit this hunk\n"
 msgstr ""
 
 msgid "Sorry, cannot edit this hunk\n"
 msgstr ""
 

-#: git-add--interactive.perl:1699
+#: git-add--interactive.perl:1706

 msgid "Review diff"
 msgstr ""
 
 #. TRANSLATORS: please do not translate the command names
 #. 'status', 'update', 'revert', etc.
 msgid "Review diff"
 msgstr ""
 
 #. TRANSLATORS: please do not translate the command names
 #. 'status', 'update', 'revert', etc.

-#: git-add--interactive.perl:1718
+#: git-add--interactive.perl:1725

 msgid ""
 "status        - show paths with changes\n"
 "update        - add working tree state to the staged set of changes\n"
 msgid ""
 "status        - show paths with changes\n"
 "update        - add working tree state to the staged set of changes\n"


@@ -15605,18 +16085,18 @@ msgid ""
 "changes\n"
 msgstr ""
 
 "changes\n"
 msgstr ""
 

-#: git-add--interactive.perl:1735 git-add--interactive.perl:1740
-#: git-add--interactive.perl:1743 git-add--interactive.perl:1750
-#: git-add--interactive.perl:1754 git-add--interactive.perl:1760
+#: git-add--interactive.perl:1742 git-add--interactive.perl:1747
+#: git-add--interactive.perl:1750 git-add--interactive.perl:1757
+#: git-add--interactive.perl:1761 git-add--interactive.perl:1767

 msgid "missing --"
 msgstr ""
 
 msgid "missing --"
 msgstr ""
 

-#: git-add--interactive.perl:1756
+#: git-add--interactive.perl:1763

 #, perl-format
 msgid "unknown --patch mode: %s"
 msgstr ""
 
 #, perl-format
 msgid "unknown --patch mode: %s"
 msgstr ""
 

-#: git-add--interactive.perl:1762 git-add--interactive.perl:1768
+#: git-add--interactive.perl:1769 git-add--interactive.perl:1775

 #, perl-format
 msgid "invalid argument %s, expecting --"
 msgstr ""
 #, perl-format
 msgid "invalid argument %s, expecting --"
 msgstr ""


@@ -15805,7 +16285,7 @@ msgstr ""
 msgid "CA path \"%s\" does not exist"
 msgstr ""
 
 msgid "CA path \"%s\" does not exist"
 msgstr ""
 

-#: git-send-email.perl:1395
+#: git-send-email.perl:1400

 msgid ""
 "    The Cc list above has been expanded by additional\n"
 "    addresses found in the patch commit message. By default\n"
 msgid ""
 "    The Cc list above has been expanded by additional\n"
 "    addresses found in the patch commit message. By default\n"


@@ -15819,131 +16299,131 @@ msgid ""
 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-#. TRANSLATORS: Make sure to include [y] [n] [q] [a] in your
+#. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your

 #. translation. The program will only accept English input
 #. at this point.
 #. translation. The program will only accept English input
 #. at this point.

-#: git-send-email.perl:1410
-msgid "Send this email? ([y]es|[n]o|[q]uit|[a]ll): "
+#: git-send-email.perl:1415
+msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "

 msgstr ""
 
 msgstr ""
 

-#: git-send-email.perl:1413
+#: git-send-email.perl:1418

 msgid "Send this email reply required"
 msgstr ""
 
 msgid "Send this email reply required"
 msgstr ""
 

-#: git-send-email.perl:1439
+#: git-send-email.perl:1446

 msgid "The required SMTP server is not properly defined."
 msgstr ""
 
 msgid "The required SMTP server is not properly defined."
 msgstr ""
 

-#: git-send-email.perl:1486
+#: git-send-email.perl:1493

 #, perl-format
 msgid "Server does not support STARTTLS! %s"
 msgstr ""
 
 #, perl-format
 msgid "Server does not support STARTTLS! %s"
 msgstr ""
 

-#: git-send-email.perl:1491 git-send-email.perl:1495
+#: git-send-email.perl:1498 git-send-email.perl:1502

 #, perl-format
 msgid "STARTTLS failed! %s"
 msgstr ""
 
 #, perl-format
 msgid "STARTTLS failed! %s"
 msgstr ""
 

-#: git-send-email.perl:1505
+#: git-send-email.perl:1512

 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
 msgstr ""
 
 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
 msgstr ""
 

-#: git-send-email.perl:1523
+#: git-send-email.perl:1530

 #, perl-format
 msgid "Failed to send %s\n"
 msgstr ""
 
 #, perl-format
 msgid "Failed to send %s\n"
 msgstr ""
 

-#: git-send-email.perl:1526
+#: git-send-email.perl:1533

 #, perl-format
 msgid "Dry-Sent %s\n"
 msgstr ""
 
 #, perl-format
 msgid "Dry-Sent %s\n"
 msgstr ""
 

-#: git-send-email.perl:1526
+#: git-send-email.perl:1533

 #, perl-format
 msgid "Sent %s\n"
 msgstr ""
 
 #, perl-format
 msgid "Sent %s\n"
 msgstr ""
 

-#: git-send-email.perl:1528
+#: git-send-email.perl:1535

 msgid "Dry-OK. Log says:\n"
 msgstr ""
 
 msgid "Dry-OK. Log says:\n"
 msgstr ""
 

-#: git-send-email.perl:1528
+#: git-send-email.perl:1535

 msgid "OK. Log says:\n"
 msgstr ""
 
 msgid "OK. Log says:\n"
 msgstr ""
 

-#: git-send-email.perl:1540
+#: git-send-email.perl:1547

 msgid "Result: "
 msgstr ""
 
 msgid "Result: "
 msgstr ""
 

-#: git-send-email.perl:1543
+#: git-send-email.perl:1550

 msgid "Result: OK\n"
 msgstr ""
 
 msgid "Result: OK\n"
 msgstr ""
 

-#: git-send-email.perl:1556
+#: git-send-email.perl:1568

 #, perl-format
 msgid "can't open file %s"
 msgstr ""
 
 #, perl-format
 msgid "can't open file %s"
 msgstr ""
 

-#: git-send-email.perl:1603 git-send-email.perl:1623
+#: git-send-email.perl:1615 git-send-email.perl:1635

 #, perl-format
 msgid "(mbox) Adding cc: %s from line '%s'\n"
 msgstr ""
 
 #, perl-format
 msgid "(mbox) Adding cc: %s from line '%s'\n"
 msgstr ""
 

-#: git-send-email.perl:1609
+#: git-send-email.perl:1621

 #, perl-format
 msgid "(mbox) Adding to: %s from line '%s'\n"
 msgstr ""
 
 #, perl-format
 msgid "(mbox) Adding to: %s from line '%s'\n"
 msgstr ""
 

-#: git-send-email.perl:1657
+#: git-send-email.perl:1674

 #, perl-format
 msgid "(non-mbox) Adding cc: %s from line '%s'\n"
 msgstr ""
 
 #, perl-format
 msgid "(non-mbox) Adding cc: %s from line '%s'\n"
 msgstr ""
 

-#: git-send-email.perl:1682
+#: git-send-email.perl:1699

 #, perl-format
 msgid "(body) Adding cc: %s from line '%s'\n"
 msgstr ""
 
 #, perl-format
 msgid "(body) Adding cc: %s from line '%s'\n"
 msgstr ""
 

-#: git-send-email.perl:1788
+#: git-send-email.perl:1817

 #, perl-format
 msgid "(%s) Could not execute '%s'"
 msgstr ""
 
 #, perl-format
 msgid "(%s) Could not execute '%s'"
 msgstr ""
 

-#: git-send-email.perl:1795
+#: git-send-email.perl:1824

 #, perl-format
 msgid "(%s) Adding %s: %s from: '%s'\n"
 msgstr ""
 
 #, perl-format
 msgid "(%s) Adding %s: %s from: '%s'\n"
 msgstr ""
 

-#: git-send-email.perl:1799
+#: git-send-email.perl:1828

 #, perl-format
 msgid "(%s) failed to close pipe to '%s'"
 msgstr ""
 
 #, perl-format
 msgid "(%s) failed to close pipe to '%s'"
 msgstr ""
 

-#: git-send-email.perl:1826
+#: git-send-email.perl:1855

 msgid "cannot send message as 7bit"
 msgstr ""
 
 msgid "cannot send message as 7bit"
 msgstr ""
 

-#: git-send-email.perl:1834
+#: git-send-email.perl:1863

 msgid "invalid transfer encoding"
 msgstr ""
 
 msgid "invalid transfer encoding"
 msgstr ""
 

-#: git-send-email.perl:1872 git-send-email.perl:1923 git-send-email.perl:1933
+#: git-send-email.perl:1901 git-send-email.perl:1952 git-send-email.perl:1962

 #, perl-format
 msgid "unable to open %s: %s\n"
 msgstr ""
 
 #, perl-format
 msgid "unable to open %s: %s\n"
 msgstr ""
 

-#: git-send-email.perl:1875
+#: git-send-email.perl:1904

 #, perl-format
 msgid "%s: patch contains a line longer than 998 characters"
 msgstr ""
 
 #, perl-format
 msgid "%s: patch contains a line longer than 998 characters"
 msgstr ""
 

-#: git-send-email.perl:1891
+#: git-send-email.perl:1920

 #, perl-format
 msgid "Skipping %s with backup suffix '%s'.\n"
 msgstr ""
 
 #. TRANSLATORS: please keep "[y|N]" as is.
 #, perl-format
 msgid "Skipping %s with backup suffix '%s'.\n"
 msgstr ""
 
 #. TRANSLATORS: please keep "[y|N]" as is.

-#: git-send-email.perl:1895
+#: git-send-email.perl:1924

 #, perl-format
 msgid "Do you really want to send %s? [y|N]: "
 msgstr ""
 #, perl-format
 msgid "Do you really want to send %s? [y|N]: "
 msgstr ""