l10n: git.pot: v2.1.0 round 1 (38 new, 9 removed)

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

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

diff --git a/po/git.pot b/po/git.pot
index 1407f06e8da8bcba41046fbbd25a9e365bcb20ea..1c8309a887491e35113e4fb7de39dec8115edd58 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: 2014-04-19 12:50+0800\n"
+"POT-Creation-Date: 2014-08-04 14:48+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"


@@ -23,12 +23,11 @@ msgstr ""
 msgid "hint: %.*s\n"
 msgstr ""
 
 msgid "hint: %.*s\n"
 msgstr ""
 

-#: advice.c:85
+#: advice.c:88

 msgid ""
 msgid ""

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

 msgstr ""
 
 #: archive.c:10
 msgstr ""
 
 #: archive.c:10


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

-#: archive.c:243 builtin/add.c:136 builtin/add.c:428 builtin/rm.c:328
+#: archive.c:243 builtin/add.c:136 builtin/add.c:427 builtin/rm.c:328

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


@@ -61,7 +60,7 @@ msgstr ""
 msgid "archive format"
 msgstr ""
 
 msgid "archive format"
 msgstr ""
 

-#: archive.c:329 builtin/log.c:1193
+#: archive.c:329 builtin/log.c:1201

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


@@ -69,9 +68,9 @@ msgstr ""
 msgid "prepend prefix to each pathname in the archive"
 msgstr ""
 
 msgid "prepend prefix to each pathname in the archive"
 msgstr ""
 

-#: archive.c:331 builtin/archive.c:88 builtin/blame.c:2258
-#: builtin/blame.c:2259 builtin/config.c:57 builtin/fast-export.c:680
-#: builtin/fast-export.c:682 builtin/grep.c:714 builtin/hash-object.c:77
+#: archive.c:331 builtin/archive.c:88 builtin/blame.c:2517
+#: builtin/blame.c:2518 builtin/config.c:57 builtin/fast-export.c:709
+#: builtin/fast-export.c:711 builtin/grep.c:712 builtin/hash-object.c:77

 #: builtin/ls-files.c:489 builtin/ls-files.c:492 builtin/notes.c:412
 #: builtin/notes.c:569 builtin/read-tree.c:108 parse-options.h:151
 msgid "file"
 #: builtin/ls-files.c:489 builtin/ls-files.c:492 builtin/notes.c:412
 #: builtin/notes.c:569 builtin/read-tree.c:108 parse-options.h:151
 msgid "file"


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

-#: bundle.c:86 builtin/commit.c:706
+#: bundle.c:86 builtin/commit.c:755

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


@@ -255,8 +254,8 @@ msgstr ""
 msgid "Repository lacks these prerequisite commits:"
 msgstr ""
 
 msgid "Repository lacks these prerequisite commits:"
 msgstr ""
 

-#: bundle.c:162 sequencer.c:669 sequencer.c:1123 builtin/log.c:332
-#: builtin/log.c:821 builtin/log.c:1418 builtin/log.c:1644 builtin/merge.c:357
+#: bundle.c:162 sequencer.c:630 sequencer.c:1085 builtin/log.c:330
+#: builtin/log.c:821 builtin/log.c:1428 builtin/log.c:1665 builtin/merge.c:357

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


@@ -279,47 +278,47 @@ msgid_plural "The bundle requires these %d refs:"
 msgstr[0] ""
 msgstr[1] ""
 
 msgstr[0] ""
 msgstr[1] ""
 

-#: bundle.c:293
+#: bundle.c:289

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

-#: bundle.c:299 builtin/log.c:1329 builtin/shortlog.c:261
+#: bundle.c:295 builtin/log.c:1339 builtin/shortlog.c:261

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

-#: bundle.c:334
+#: bundle.c:330

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

-#: bundle.c:379
+#: bundle.c:375

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

-#: bundle.c:395
+#: bundle.c:390

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

-#: bundle.c:413
+#: bundle.c:408

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

-#: bundle.c:416
+#: bundle.c:411

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

-#: bundle.c:438
+#: bundle.c:433

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

-#: commit.c:54
+#: commit.c:40

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

-#: commit.c:56
+#: commit.c:42

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


@@ -415,91 +414,100 @@ msgstr[1] ""
 msgid "failed to read orderfile '%s'"
 msgstr ""
 
 msgid "failed to read orderfile '%s'"
 msgstr ""
 

-#: diffcore-rename.c:517
+#: diffcore-rename.c:514

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

-#: diff.c:113
+#: diff.c:114

 #, c-format
 msgid "  Failed to parse dirstat cut-off percentage '%s'\n"
 msgstr ""
 
 #, c-format
 msgid "  Failed to parse dirstat cut-off percentage '%s'\n"
 msgstr ""
 

-#: diff.c:118
+#: diff.c:119

 #, c-format
 msgid "  Unknown dirstat parameter '%s'\n"
 msgstr ""
 
 #, c-format
 msgid "  Unknown dirstat parameter '%s'\n"
 msgstr ""
 

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

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

-#: diff.c:263
+#: diff.c:267

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

-#: diff.c:3495
+#: diff.c:2934
+#, c-format
+msgid "external diff died, stopping at %s"
+msgstr ""
+
+#: diff.c:3329
+msgid "--follow requires exactly one pathspec"
+msgstr ""
+
+#: diff.c:3492

 #, 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:3509
+#: diff.c:3506

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

-#: gpg-interface.c:59 gpg-interface.c:131
+#: gpg-interface.c:73 gpg-interface.c:145

 msgid "could not run gpg."
 msgstr ""
 
 msgid "could not run gpg."
 msgstr ""
 

-#: gpg-interface.c:71
+#: gpg-interface.c:85

 msgid "gpg did not accept the data"
 msgstr ""
 
 msgid "gpg did not accept the data"
 msgstr ""
 

-#: gpg-interface.c:82
+#: gpg-interface.c:96

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

-#: gpg-interface.c:115
+#: gpg-interface.c:129

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

-#: gpg-interface.c:118
+#: gpg-interface.c:132

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

-#: grep.c:1698
+#: grep.c:1703

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

-#: grep.c:1715
+#: grep.c:1720

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

-#: grep.c:1726
+#: grep.c:1731

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

-#: help.c:209
+#: help.c:207

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

-#: help.c:216
+#: help.c:214

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

-#: help.c:232
+#: help.c:230

 msgid "The most commonly used git commands are:"
 msgstr ""
 
 msgid "The most commonly used git commands are:"
 msgstr ""
 


@@ -531,7 +539,7 @@ msgstr ""
 msgid "git: '%s' is not a git command. See 'git --help'."
 msgstr ""
 
 msgid "git: '%s' is not a git command. See 'git --help'."
 msgstr ""
 

-#: help.c:384 help.c:443
+#: help.c:384 help.c:444

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


@@ -541,16 +549,16 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
 msgstr[0] ""
 msgstr[1] ""
 

-#: help.c:439
+#: help.c:440

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

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

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

-#: merge.c:110 builtin/checkout.c:357 builtin/checkout.c:558
+#: merge.c:93 builtin/checkout.c:356 builtin/checkout.c:556

 #: builtin/clone.c:661
 msgid "unable to write new index file"
 msgstr ""
 #: builtin/clone.c:661
 msgid "unable to write new index file"
 msgstr ""


@@ -560,7 +568,7 @@ msgstr ""
 msgid "(bad commit)\n"
 msgstr ""
 
 msgid "(bad commit)\n"
 msgstr ""
 

-#: merge-recursive.c:208
+#: merge-recursive.c:210

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


@@ -569,284 +577,284 @@ msgstr ""
 msgid "error building trees"
 msgstr ""
 
 msgid "error building trees"
 msgstr ""
 

-#: merge-recursive.c:675
+#: merge-recursive.c:692

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

-#: merge-recursive.c:686
+#: merge-recursive.c:703

 #, 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:700 merge-recursive.c:721
+#: merge-recursive.c:717 merge-recursive.c:738

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

-#: merge-recursive.c:711
+#: merge-recursive.c:728

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

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

-#: merge-recursive.c:753
+#: merge-recursive.c:770

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

-#: merge-recursive.c:776 builtin/clone.c:317
+#: merge-recursive.c:793 builtin/clone.c:317

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

-#: merge-recursive.c:784
+#: merge-recursive.c:801

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

-#: merge-recursive.c:787
+#: merge-recursive.c:804

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

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

-#: merge-recursive.c:929
+#: merge-recursive.c:946

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

-#: merge-recursive.c:945
+#: merge-recursive.c:962

 msgid "unsupported object type in the tree"
 msgstr ""
 
 msgid "unsupported object type in the tree"
 msgstr ""
 

-#: merge-recursive.c:1024 merge-recursive.c:1038
+#: merge-recursive.c:1037 merge-recursive.c:1051

 #, 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:1030 merge-recursive.c:1043
+#: merge-recursive.c:1043 merge-recursive.c:1056

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

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

-#: merge-recursive.c:1084
+#: merge-recursive.c:1097

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

-#: merge-recursive.c:1140
+#: merge-recursive.c:1153

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

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

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

-#: merge-recursive.c:1221
+#: merge-recursive.c:1234

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

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

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

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

-#: merge-recursive.c:1465 merge-recursive.c:1663
+#: merge-recursive.c:1478 merge-recursive.c:1676

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

-#: merge-recursive.c:1516
+#: merge-recursive.c:1529

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

-#: merge-recursive.c:1519
+#: merge-recursive.c:1532

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

-#: merge-recursive.c:1567
+#: merge-recursive.c:1580

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

-#: merge-recursive.c:1567
+#: merge-recursive.c:1580

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

-#: merge-recursive.c:1577
+#: merge-recursive.c:1590

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

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

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

-#: merge-recursive.c:1618
+#: merge-recursive.c:1631

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

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

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

-#: merge-recursive.c:1636 git-submodule.sh:1149
+#: merge-recursive.c:1649 git-submodule.sh:1150

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

-#: merge-recursive.c:1637
+#: merge-recursive.c:1650

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

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

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

-#: merge-recursive.c:1752
+#: merge-recursive.c:1765

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

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

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

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

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

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

-#: merge-recursive.c:1790
+#: merge-recursive.c:1803

 msgid "Fatal merge failure, shouldn't happen."
 msgstr ""
 
 msgid "Fatal merge failure, shouldn't happen."
 msgstr ""
 

-#: merge-recursive.c:1809
+#: merge-recursive.c:1822

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

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

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

 #, c-format
 msgid "Unprocessed path??? %s"
 msgstr ""
 
 #, c-format
 msgid "Unprocessed path??? %s"
 msgstr ""
 

-#: merge-recursive.c:1893
+#: merge-recursive.c:1906

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

-#: merge-recursive.c:1906
+#: merge-recursive.c:1919

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

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

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

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

-#: merge-recursive.c:2012 builtin/merge.c:668
+#: merge-recursive.c:2024 builtin/merge.c:666

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

-#: notes-utils.c:40
+#: notes-utils.c:41

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

-#: notes-utils.c:81
+#: notes-utils.c:83

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

-#: notes-utils.c:91
+#: notes-utils.c:93

 #, c-format
 msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
 msgstr ""
 
 #. TRANSLATORS: The first %s is the name of the
 #. environment variable, the second %s is its value
 #, c-format
 msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
 msgstr ""
 
 #. TRANSLATORS: The first %s is the name of the
 #. environment variable, the second %s is its value

-#: notes-utils.c:118
+#: notes-utils.c:120

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

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

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

-#: parse-options.c:532
+#: parse-options.c:534

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

-#: parse-options.c:550
+#: parse-options.c:552

 #, c-format
 msgid "usage: %s"
 msgstr ""
 
 #. TRANSLATORS: the colon here should align with the
 #. one in "usage: %s" translation
 #, c-format
 msgid "usage: %s"
 msgstr ""
 
 #. TRANSLATORS: the colon here should align with the
 #. one in "usage: %s" translation

-#: parse-options.c:554
+#: parse-options.c:556

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

-#: parse-options.c:557
+#: parse-options.c:559

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

-#: parse-options.c:591
+#: parse-options.c:593

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


@@ -899,80 +907,80 @@ msgstr ""
 msgid "%s: pathspec magic not supported by this command: %s"
 msgstr ""
 
 msgid "%s: pathspec magic not supported by this command: %s"
 msgstr ""
 

-#: pathspec.c:433
+#: pathspec.c:432

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

-#: pathspec.c:442
+#: pathspec.c:441

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

-#: progress.c:224
+#: progress.c:225

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

-#: read-cache.c:1238
+#: read-cache.c:1260

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

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

-#: remote.c:758
+#: remote.c:753

 #, 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:762
+#: remote.c:757

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

-#: remote.c:766
+#: remote.c:761

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

-#: remote.c:774
+#: remote.c:769

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

-#: remote.c:1948
+#: remote.c:1943

 #, 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:1952
+#: remote.c:1947

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

-#: remote.c:1955
+#: remote.c:1950

 #, 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:1959
+#: remote.c:1954

 #, 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:1965
+#: remote.c:1960

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

-#: remote.c:1968
+#: remote.c:1963

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


@@ -980,11 +988,11 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
 msgstr[0] ""
 msgstr[1] ""
 

-#: remote.c:1976
+#: remote.c:1971

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

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

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


@@ -995,7 +1003,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
 msgstr[0] ""
 msgstr[1] ""
 

-#: remote.c:1989
+#: remote.c:1984

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


@@ -1008,245 +1016,249 @@ msgstr ""
 msgid "dup2(%d,%d) failed"
 msgstr ""
 
 msgid "dup2(%d,%d) failed"
 msgstr ""
 

-#: sequencer.c:206 builtin/merge.c:786 builtin/merge.c:899
-#: builtin/merge.c:1009 builtin/merge.c:1019
+#: sequencer.c:171 builtin/merge.c:782 builtin/merge.c:893
+#: builtin/merge.c:1003 builtin/merge.c:1013

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

-#: sequencer.c:208 builtin/merge.c:343 builtin/merge.c:789
-#: builtin/merge.c:1011 builtin/merge.c:1024
+#: sequencer.c:173 builtin/merge.c:343 builtin/merge.c:785
+#: builtin/merge.c:1005 builtin/merge.c:1018

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

-#: sequencer.c:229
+#: sequencer.c:194

 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:232
+#: sequencer.c:197

 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:245 sequencer.c:879 sequencer.c:962
+#: sequencer.c:210 sequencer.c:841 sequencer.c:924

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

-#: sequencer.c:248
+#: sequencer.c:213

 #, c-format
 msgid "Error wrapping up %s"
 msgstr ""
 
 #, c-format
 msgid "Error wrapping up %s"
 msgstr ""
 

-#: sequencer.c:263
+#: sequencer.c:228

 msgid "Your local changes would be overwritten by cherry-pick."
 msgstr ""
 
 msgid "Your local changes would be overwritten by cherry-pick."
 msgstr ""
 

-#: sequencer.c:265
+#: sequencer.c:230

 msgid "Your local changes would be overwritten by revert."
 msgstr ""
 
 msgid "Your local changes would be overwritten by revert."
 msgstr ""
 

-#: sequencer.c:268
+#: sequencer.c:233

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

+#: sequencer.c:250
+msgid "Failed to lock HEAD during fast_forward_to"
+msgstr ""
+

 #. TRANSLATORS: %s will be "revert" or "cherry-pick"
 #. TRANSLATORS: %s will be "revert" or "cherry-pick"

-#: sequencer.c:325
+#: sequencer.c:293

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

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

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

-#: sequencer.c:378
+#: sequencer.c:344

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

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

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

-#: sequencer.c:435
+#: sequencer.c:396

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

-#: sequencer.c:501
+#: sequencer.c:462

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

-#: sequencer.c:520
+#: sequencer.c:481

 #, 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:528
+#: sequencer.c:489

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

-#: sequencer.c:532
+#: sequencer.c:493

 #, c-format
 msgid "Mainline was specified but commit %s is not a merge."
 msgstr ""
 
 #. TRANSLATORS: The first %s will be "revert" or
 #. "cherry-pick", the second %s a SHA1
 #, c-format
 msgid "Mainline was specified but commit %s is not a merge."
 msgstr ""
 
 #. TRANSLATORS: The first %s will be "revert" or
 #. "cherry-pick", the second %s a SHA1

-#: sequencer.c:545
+#: sequencer.c:506

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

-#: sequencer.c:549
+#: sequencer.c:510

 #, c-format
 msgid "Cannot get commit message for %s"
 msgstr ""
 
 #, c-format
 msgid "Cannot get commit message for %s"
 msgstr ""
 

-#: sequencer.c:635
+#: sequencer.c:596

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

-#: sequencer.c:636
+#: sequencer.c:597

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

-#: sequencer.c:672
+#: sequencer.c:633

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

-#: sequencer.c:680
+#: sequencer.c:641

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

-#: sequencer.c:685
+#: sequencer.c:645

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

-#: sequencer.c:743
+#: sequencer.c:705

 #, c-format
 msgid "Cannot %s during a %s"
 msgstr ""
 
 #, c-format
 msgid "Cannot %s during a %s"
 msgstr ""
 

-#: sequencer.c:765
+#: sequencer.c:727

 #, c-format
 msgid "Could not parse line %d."
 msgstr ""
 
 #, c-format
 msgid "Could not parse line %d."
 msgstr ""
 

-#: sequencer.c:770
+#: sequencer.c:732

 msgid "No commits parsed."
 msgstr ""
 
 msgid "No commits parsed."
 msgstr ""
 

-#: sequencer.c:783
+#: sequencer.c:745

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

-#: sequencer.c:787
+#: sequencer.c:749

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

-#: sequencer.c:794
+#: sequencer.c:756

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

-#: sequencer.c:824
+#: sequencer.c:786

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

-#: sequencer.c:827
+#: sequencer.c:789

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

-#: sequencer.c:839
+#: sequencer.c:801

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

-#: sequencer.c:860
+#: sequencer.c:822

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

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

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

-#: sequencer.c:865
+#: sequencer.c:827

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

-#: sequencer.c:881 sequencer.c:966
+#: sequencer.c:843 sequencer.c:928

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

-#: sequencer.c:900 sequencer.c:1036
+#: sequencer.c:862 sequencer.c:998

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

-#: sequencer.c:902
+#: sequencer.c:864

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

-#: sequencer.c:904
+#: sequencer.c:866

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

-#: sequencer.c:926 builtin/apply.c:4061
+#: sequencer.c:888 builtin/apply.c:4062

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

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

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

-#: sequencer.c:930
+#: sequencer.c:892

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

-#: sequencer.c:936
+#: sequencer.c:898

 #, 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:959
+#: sequencer.c:921

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

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

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

-#: sequencer.c:1107
+#: sequencer.c:1069

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

-#: sequencer.c:1141
+#: sequencer.c:1103

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

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

 msgid "Can't cherry-pick into empty head"
 msgstr ""
 
 msgid "Can't cherry-pick into empty head"
 msgstr ""
 


@@ -1263,21 +1275,21 @@ msgid ""
 "running \"git config advice.objectNameWarning false\""
 msgstr ""
 
 "running \"git config advice.objectNameWarning false\""
 msgstr ""
 

-#: sha1_name.c:1072
+#: sha1_name.c:1060

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

-#: sha1_name.c:1075
+#: sha1_name.c:1063

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

-#: sha1_name.c:1077
+#: sha1_name.c:1065

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

-#: sha1_name.c:1081
+#: sha1_name.c:1069

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


@@ -1305,17 +1317,17 @@ msgstr ""
 msgid "staging updated .gitmodules failed"
 msgstr ""
 
 msgid "staging updated .gitmodules failed"
 msgstr ""
 

-#: submodule.c:1121 builtin/init-db.c:363
+#: submodule.c:1118 builtin/init-db.c:363

 #, c-format
 msgid "Could not create git link %s"
 msgstr ""
 
 #, c-format
 msgid "Could not create git link %s"
 msgstr ""
 

-#: submodule.c:1132
+#: submodule.c:1129

 #, c-format
 msgid "Could not set core.worktree in %s"
 msgstr ""
 
 #, c-format
 msgid "Could not set core.worktree in %s"
 msgstr ""
 

-#: unpack-trees.c:206
+#: unpack-trees.c:202

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


@@ -1348,22 +1360,22 @@ msgstr ""
 msgid "invalid '..' path segment"
 msgstr ""
 
 msgid "invalid '..' path segment"
 msgstr ""
 

-#: wrapper.c:422
+#: wrapper.c:460

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

-#: wrapper.c:443
+#: wrapper.c:481

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

-#: wrapper.c:454
+#: wrapper.c:492

 #, c-format
 msgid "unable to look up current user in the passwd file: %s"
 msgstr ""
 
 #, c-format
 msgid "unable to look up current user in the passwd file: %s"
 msgstr ""
 

-#: wrapper.c:455
+#: wrapper.c:493

 msgid "no such user"
 msgstr ""
 
 msgid "no such user"
 msgstr ""
 


@@ -1504,193 +1516,193 @@ msgstr ""
 msgid "bug: unhandled diff status %c"
 msgstr ""
 
 msgid "bug: unhandled diff status %c"
 msgstr ""
 

-#: wt-status.c:765
+#: wt-status.c:764

 msgid "Submodules changed but not updated:"
 msgstr ""
 
 msgid "Submodules changed but not updated:"
 msgstr ""
 

-#: wt-status.c:767
+#: wt-status.c:766

 msgid "Submodule changes to be committed:"
 msgstr ""
 
 msgid "Submodule changes to be committed:"
 msgstr ""
 

-#: wt-status.c:846
+#: wt-status.c:845

 msgid ""
 "Do not touch the line above.\n"
 "Everything below will be removed."
 msgstr ""
 
 msgid ""
 "Do not touch the line above.\n"
 "Everything below will be removed."
 msgstr ""
 

-#: wt-status.c:937
+#: wt-status.c:936

 msgid "You have unmerged paths."
 msgstr ""
 
 msgid "You have unmerged paths."
 msgstr ""
 

-#: wt-status.c:940
+#: wt-status.c:939

 msgid "  (fix conflicts and run \"git commit\")"
 msgstr ""
 
 msgid "  (fix conflicts and run \"git commit\")"
 msgstr ""
 

-#: wt-status.c:943
+#: wt-status.c:942

 msgid "All conflicts fixed but you are still merging."
 msgstr ""
 
 msgid "All conflicts fixed but you are still merging."
 msgstr ""
 

-#: wt-status.c:946
+#: wt-status.c:945

 msgid "  (use \"git commit\" to conclude merge)"
 msgstr ""
 
 msgid "  (use \"git commit\" to conclude merge)"
 msgstr ""
 

-#: wt-status.c:956
+#: wt-status.c:955

 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:959
+#: wt-status.c:958

 msgid "The current patch is empty."
 msgstr ""
 
 msgid "The current patch is empty."
 msgstr ""
 

-#: wt-status.c:963
+#: wt-status.c:962

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

-#: wt-status.c:965
+#: wt-status.c:964

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

-#: wt-status.c:967
+#: wt-status.c:966

 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:1027 wt-status.c:1044
+#: wt-status.c:1026 wt-status.c:1043

 #, 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:1032 wt-status.c:1049
+#: wt-status.c:1031 wt-status.c:1048

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

-#: wt-status.c:1035
+#: wt-status.c:1034

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

-#: wt-status.c:1037
+#: wt-status.c:1036

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

-#: wt-status.c:1039
+#: wt-status.c:1038

 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:1052
+#: wt-status.c:1051

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

-#: wt-status.c:1056
+#: wt-status.c:1055

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

 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:1064
+#: wt-status.c:1063

 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:1068
+#: wt-status.c:1067

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

 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:1076
+#: wt-status.c:1075

 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:1078
+#: wt-status.c:1077

 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:1088
+#: wt-status.c:1087

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

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

-#: wt-status.c:1096
+#: wt-status.c:1095

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

-#: wt-status.c:1098
+#: wt-status.c:1097

 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:1107
+#: wt-status.c:1106

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

-#: wt-status.c:1112
+#: wt-status.c:1111

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

-#: wt-status.c:1115
+#: wt-status.c:1114

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

-#: wt-status.c:1117
+#: wt-status.c:1116

 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:1128
+#: wt-status.c:1127

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

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

-#: wt-status.c:1135
+#: wt-status.c:1134

 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:1310
+#: wt-status.c:1309

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

-#: wt-status.c:1317
+#: wt-status.c:1316

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

-#: wt-status.c:1324
+#: wt-status.c:1323

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

-#: wt-status.c:1326
+#: wt-status.c:1325

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

-#: wt-status.c:1329
+#: wt-status.c:1328

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

-#: wt-status.c:1346
+#: wt-status.c:1345

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

-#: wt-status.c:1360
+#: wt-status.c:1359

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

-#: wt-status.c:1362
+#: wt-status.c:1361

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

-#: wt-status.c:1366
+#: wt-status.c:1365

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


@@ -1698,74 +1710,74 @@ msgid ""
 "new files yourself (see 'git help status')."
 msgstr ""
 
 "new files yourself (see 'git help status')."
 msgstr ""
 

-#: wt-status.c:1372
+#: wt-status.c:1371

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

-#: wt-status.c:1374
+#: wt-status.c:1373

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

-#: wt-status.c:1380
+#: wt-status.c:1379

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

-#: wt-status.c:1385
+#: wt-status.c:1384

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

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

-#: wt-status.c:1391
+#: wt-status.c:1390

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

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

 #, 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:1400 wt-status.c:1405
+#: wt-status.c:1399 wt-status.c:1404

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

-#: wt-status.c:1403
+#: wt-status.c:1402

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

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

-#: wt-status.c:1516
+#: wt-status.c:1515

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

-#: wt-status.c:1522
+#: wt-status.c:1521

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

-#: wt-status.c:1554
+#: wt-status.c:1553

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

-#: wt-status.c:1556 wt-status.c:1564
+#: wt-status.c:1555 wt-status.c:1563

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


@@ -1796,7 +1808,7 @@ msgstr ""
 msgid "Unstaged changes after refreshing the index:"
 msgstr ""
 
 msgid "Unstaged changes after refreshing the index:"
 msgstr ""
 

-#: builtin/add.c:193
+#: builtin/add.c:193 builtin/rev-parse.c:781

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


@@ -1827,15 +1839,15 @@ msgstr ""
 msgid "The following paths are ignored by one of your .gitignore files:\n"
 msgstr ""
 
 msgid "The following paths are ignored by one of your .gitignore files:\n"
 msgstr ""
 

-#: builtin/add.c:248 builtin/clean.c:876 builtin/fetch.c:93 builtin/mv.c:70
-#: builtin/prune-packed.c:77 builtin/push.c:489 builtin/remote.c:1344
+#: builtin/add.c:248 builtin/clean.c:875 builtin/fetch.c:108 builtin/mv.c:70
+#: builtin/prune-packed.c:77 builtin/push.c:488 builtin/remote.c:1367

 #: builtin/rm.c:269
 msgid "dry run"
 msgstr ""
 
 #: builtin/rm.c:269
 msgid "dry run"
 msgstr ""
 

-#: builtin/add.c:249 builtin/apply.c:4410 builtin/check-ignore.c:19
-#: builtin/commit.c:1256 builtin/count-objects.c:95 builtin/fsck.c:612
-#: builtin/log.c:1592 builtin/mv.c:69 builtin/read-tree.c:113
+#: builtin/add.c:249 builtin/apply.c:4411 builtin/check-ignore.c:19
+#: builtin/commit.c:1328 builtin/count-objects.c:95 builtin/fsck.c:606
+#: builtin/log.c:1613 builtin/mv.c:69 builtin/read-tree.c:113

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


@@ -1843,7 +1855,7 @@ msgstr ""
 msgid "interactive picking"
 msgstr ""
 
 msgid "interactive picking"
 msgstr ""
 

-#: builtin/add.c:252 builtin/checkout.c:1108 builtin/reset.c:283
+#: builtin/add.c:252 builtin/checkout.c:1102 builtin/reset.c:285

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


@@ -1896,30 +1908,30 @@ msgstr ""
 msgid "adding files failed"
 msgstr ""
 
 msgid "adding files failed"
 msgstr ""
 

-#: builtin/add.c:330
+#: builtin/add.c:329

 msgid "-A and -u are mutually incompatible"
 msgstr ""
 
 msgid "-A and -u are mutually incompatible"
 msgstr ""
 

-#: builtin/add.c:337
+#: builtin/add.c:336

 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:358
+#: builtin/add.c:357

 #, c-format
 msgid "Nothing specified, nothing added.\n"
 msgstr ""
 
 #, c-format
 msgid "Nothing specified, nothing added.\n"
 msgstr ""
 

-#: builtin/add.c:359
+#: builtin/add.c:358

 #, 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:364 builtin/check-ignore.c:172 builtin/clean.c:920
-#: builtin/commit.c:320 builtin/mv.c:90 builtin/reset.c:234 builtin/rm.c:299
+#: builtin/add.c:363 builtin/check-ignore.c:172 builtin/clean.c:919
+#: builtin/commit.c:319 builtin/mv.c:90 builtin/reset.c:234 builtin/rm.c:299

 msgid "index file corrupt"
 msgstr ""
 
 msgid "index file corrupt"
 msgstr ""
 

-#: builtin/add.c:448 builtin/apply.c:4506 builtin/mv.c:280 builtin/rm.c:432
+#: builtin/add.c:446 builtin/apply.c:4506 builtin/mv.c:280 builtin/rm.c:431

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


@@ -1937,37 +1949,37 @@ msgstr ""
 msgid "unrecognized whitespace ignore option '%s'"
 msgstr ""
 
 msgid "unrecognized whitespace ignore option '%s'"
 msgstr ""
 

-#: builtin/apply.c:823
+#: builtin/apply.c:825

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

-#: builtin/apply.c:832
+#: builtin/apply.c:834

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

-#: builtin/apply.c:913
+#: builtin/apply.c:915

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

-#: builtin/apply.c:945
+#: builtin/apply.c:947

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

-#: builtin/apply.c:949
+#: builtin/apply.c:951

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

-#: builtin/apply.c:950
+#: builtin/apply.c:952

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

-#: builtin/apply.c:957
+#: builtin/apply.c:959

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


@@ -2075,17 +2087,17 @@ msgstr ""
 msgid "missing binary patch data for '%s'"
 msgstr ""
 
 msgid "missing binary patch data for '%s'"
 msgstr ""
 

-#: builtin/apply.c:2946
+#: builtin/apply.c:2944

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

-#: builtin/apply.c:2952
+#: builtin/apply.c:2950

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

-#: builtin/apply.c:2973
+#: builtin/apply.c:2971

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


@@ -2174,213 +2186,213 @@ msgstr ""
 msgid "unable to remove %s from index"
 msgstr ""
 
 msgid "unable to remove %s from index"
 msgstr ""
 

-#: builtin/apply.c:3851
+#: builtin/apply.c:3852

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

-#: builtin/apply.c:3855
+#: builtin/apply.c:3856

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

-#: builtin/apply.c:3860
+#: builtin/apply.c:3861

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

-#: builtin/apply.c:3863 builtin/apply.c:3971
+#: builtin/apply.c:3864 builtin/apply.c:3972

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

-#: builtin/apply.c:3896
+#: builtin/apply.c:3897

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

-#: builtin/apply.c:3945
+#: builtin/apply.c:3946

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

-#: builtin/apply.c:4032
+#: builtin/apply.c:4033

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

-#: builtin/apply.c:4040
+#: builtin/apply.c:4041

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

-#: builtin/apply.c:4043
+#: builtin/apply.c:4044

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

-#: builtin/apply.c:4053
+#: builtin/apply.c:4054

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

-#: builtin/apply.c:4074
+#: builtin/apply.c:4075

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

-#: builtin/apply.c:4077
+#: builtin/apply.c:4078

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

-#: builtin/apply.c:4227
+#: builtin/apply.c:4228

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

-#: builtin/apply.c:4238
+#: builtin/apply.c:4239

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

-#: builtin/apply.c:4357 builtin/apply.c:4360 builtin/clone.c:90
-#: builtin/fetch.c:78
+#: builtin/apply.c:4358 builtin/apply.c:4361 builtin/clone.c:90
+#: builtin/fetch.c:93

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

-#: builtin/apply.c:4358
+#: builtin/apply.c:4359

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

-#: builtin/apply.c:4361
+#: builtin/apply.c:4362

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

-#: builtin/apply.c:4363
+#: builtin/apply.c:4364

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

-#: builtin/apply.c:4364
+#: builtin/apply.c:4365

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

-#: builtin/apply.c:4367
+#: builtin/apply.c:4368

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

-#: builtin/apply.c:4369
+#: builtin/apply.c:4370

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

-#: builtin/apply.c:4373
+#: builtin/apply.c:4374

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

-#: builtin/apply.c:4375
+#: builtin/apply.c:4376

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

-#: builtin/apply.c:4377
+#: builtin/apply.c:4378

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

-#: builtin/apply.c:4379
+#: builtin/apply.c:4380

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

-#: builtin/apply.c:4381
+#: builtin/apply.c:4382

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

-#: builtin/apply.c:4383
+#: builtin/apply.c:4384

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

-#: builtin/apply.c:4385
+#: builtin/apply.c:4386

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

-#: builtin/apply.c:4387
+#: builtin/apply.c:4388

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

-#: builtin/apply.c:4389 builtin/checkout-index.c:197 builtin/ls-files.c:455
+#: builtin/apply.c:4390 builtin/checkout-index.c:198 builtin/ls-files.c:455

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

-#: builtin/apply.c:4392
+#: builtin/apply.c:4393

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

-#: builtin/apply.c:4393
+#: builtin/apply.c:4394

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

-#: builtin/apply.c:4394
+#: builtin/apply.c:4395

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

-#: builtin/apply.c:4397 builtin/apply.c:4400
+#: builtin/apply.c:4398 builtin/apply.c:4401

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

-#: builtin/apply.c:4403
+#: builtin/apply.c:4404

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

-#: builtin/apply.c:4405
+#: builtin/apply.c:4406

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

-#: builtin/apply.c:4407
+#: builtin/apply.c:4408

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

-#: builtin/apply.c:4409
+#: builtin/apply.c:4410

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

-#: builtin/apply.c:4412
+#: builtin/apply.c:4413

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

-#: builtin/apply.c:4415
+#: builtin/apply.c:4416

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

-#: builtin/apply.c:4417
+#: builtin/apply.c:4418

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

-#: builtin/apply.c:4418
+#: builtin/apply.c:4419

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

-#: builtin/apply.c:4440
+#: builtin/apply.c:4441

 msgid "--3way outside a repository"
 msgstr ""
 
 msgid "--3way outside a repository"
 msgstr ""
 

-#: builtin/apply.c:4448
+#: builtin/apply.c:4449

 msgid "--index outside a repository"
 msgstr ""
 
 msgid "--index outside a repository"
 msgstr ""
 

-#: builtin/apply.c:4451
+#: builtin/apply.c:4452

 msgid "--cached outside a repository"
 msgstr ""
 
 msgid "--cached outside a repository"
 msgstr ""
 

-#: builtin/apply.c:4467
+#: builtin/apply.c:4468

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

-#: builtin/apply.c:4481
+#: builtin/apply.c:4482

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

-#: builtin/apply.c:4487 builtin/apply.c:4497
+#: builtin/apply.c:4488 builtin/apply.c:4498

 #, c-format
 msgid "%d line adds whitespace errors."
 msgid_plural "%d lines add whitespace errors."
 #, c-format
 msgid "%d line adds whitespace errors."
 msgid_plural "%d lines add whitespace errors."


@@ -2434,106 +2446,116 @@ msgstr ""
 msgid "update BISECT_HEAD instead of checking out the current commit"
 msgstr ""
 
 msgid "update BISECT_HEAD instead of checking out the current commit"
 msgstr ""
 

-#: builtin/blame.c:27
+#: builtin/blame.c:30

 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:35

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

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

-#: builtin/blame.c:2243
+#: builtin/blame.c:2502

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

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

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

-#: builtin/blame.c:2246
+#: builtin/blame.c:2505

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

-#: builtin/blame.c:2247
+#: builtin/blame.c:2506

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

-#: builtin/blame.c:2248
+#: builtin/blame.c:2507

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

-#: builtin/blame.c:2249
+#: builtin/blame.c:2508

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

-#: builtin/blame.c:2250
+#: builtin/blame.c:2509

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

-#: builtin/blame.c:2251
+#: builtin/blame.c:2510

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

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

-#: builtin/blame.c:2253
+#: builtin/blame.c:2512

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

-#: builtin/blame.c:2254
+#: builtin/blame.c:2513

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

-#: builtin/blame.c:2255
+#: builtin/blame.c:2514

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

-#: builtin/blame.c:2256
+#: builtin/blame.c:2515

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

-#: builtin/blame.c:2257
+#: builtin/blame.c:2516

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

-#: builtin/blame.c:2258
+#: builtin/blame.c:2517

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

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

-#: builtin/blame.c:2260 builtin/blame.c:2261
+#: builtin/blame.c:2519 builtin/blame.c:2520

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

-#: builtin/blame.c:2260
+#: builtin/blame.c:2519

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

-#: builtin/blame.c:2261
+#: builtin/blame.c:2520

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

-#: builtin/blame.c:2262
+#: builtin/blame.c:2521

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

-#: builtin/blame.c:2262
+#: builtin/blame.c:2521

 msgid "Process only line range n,m, counting from 1"
 msgstr ""
 
 msgid "Process only line range n,m, counting from 1"
 msgstr ""
 

+#. TRANSLATORS: This string is used to tell us the maximum
+#. display width for a relative timestamp in "git blame"
+#. output.  For C locale, "4 years, 11 months ago", which
+#. takes 22 places, is the longest among various forms of
+#. relative timestamps, but your language may need more or
+#. fewer display columns.
+#: builtin/blame.c:2599
+msgid "4 years, 11 months ago"
+msgstr ""
+

 #: builtin/branch.c:24
 msgid "git branch [options] [-r | -a] [--merged | --no-merged]"
 msgstr ""
 #: builtin/branch.c:24
 msgid "git branch [options] [-r | -a] [--merged | --no-merged]"
 msgstr ""


@@ -2766,9 +2788,9 @@ msgid "act on remote-tracking branches"
 msgstr ""
 
 #: builtin/branch.c:817 builtin/branch.c:823 builtin/branch.c:844
 msgstr ""
 
 #: builtin/branch.c:817 builtin/branch.c:823 builtin/branch.c:844

-#: builtin/branch.c:850 builtin/commit.c:1494 builtin/commit.c:1495
-#: builtin/commit.c:1496 builtin/commit.c:1497 builtin/tag.c:527
-#: builtin/tag.c:533
+#: builtin/branch.c:850 builtin/commit.c:1573 builtin/commit.c:1574
+#: builtin/commit.c:1575 builtin/commit.c:1576 builtin/tag.c:615
+#: builtin/tag.c:621

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


@@ -2832,7 +2854,7 @@ msgstr ""
 msgid "Failed to resolve HEAD as a valid ref."
 msgstr ""
 
 msgid "Failed to resolve HEAD as a valid ref."
 msgstr ""
 

-#: builtin/branch.c:872 builtin/clone.c:635
+#: builtin/branch.c:872 builtin/clone.c:636

 msgid "HEAD not found below refs/heads!"
 msgstr ""
 
 msgid "HEAD not found below refs/heads!"
 msgstr ""
 


@@ -3009,7 +3031,7 @@ msgstr ""
 msgid "terminate input and output records by a NUL character"
 msgstr ""
 
 msgid "terminate input and output records by a NUL character"
 msgstr ""
 

-#: builtin/check-ignore.c:18 builtin/checkout.c:1089 builtin/gc.c:271
+#: builtin/check-ignore.c:18 builtin/checkout.c:1083 builtin/gc.c:285

 msgid "suppress progress reporting"
 msgstr ""
 
 msgid "suppress progress reporting"
 msgstr ""
 


@@ -3066,43 +3088,43 @@ msgstr ""
 msgid "git checkout-index [options] [--] [<file>...]"
 msgstr ""
 
 msgid "git checkout-index [options] [--] [<file>...]"
 msgstr ""
 

-#: builtin/checkout-index.c:187
+#: builtin/checkout-index.c:188

 msgid "check out all files in the index"
 msgstr ""
 
 msgid "check out all files in the index"
 msgstr ""
 

-#: builtin/checkout-index.c:188
+#: builtin/checkout-index.c:189

 msgid "force overwrite of existing files"
 msgstr ""
 
 msgid "force overwrite of existing files"
 msgstr ""
 

-#: builtin/checkout-index.c:190
+#: builtin/checkout-index.c:191

 msgid "no warning for existing files and files not in index"
 msgstr ""
 
 msgid "no warning for existing files and files not in index"
 msgstr ""
 

-#: builtin/checkout-index.c:192
+#: builtin/checkout-index.c:193

 msgid "don't checkout new files"
 msgstr ""
 
 msgid "don't checkout new files"
 msgstr ""
 

-#: builtin/checkout-index.c:194
+#: builtin/checkout-index.c:195

 msgid "update stat information in the index file"
 msgstr ""
 
 msgid "update stat information in the index file"
 msgstr ""
 

-#: builtin/checkout-index.c:200
+#: builtin/checkout-index.c:201

 msgid "read list of paths from the standard input"
 msgstr ""
 
 msgid "read list of paths from the standard input"
 msgstr ""
 

-#: builtin/checkout-index.c:202
+#: builtin/checkout-index.c:203

 msgid "write the content to temporary files"
 msgstr ""
 
 msgid "write the content to temporary files"
 msgstr ""
 

-#: builtin/checkout-index.c:203 builtin/column.c:30
+#: builtin/checkout-index.c:204 builtin/column.c:30

 msgid "string"
 msgstr ""
 
 msgid "string"
 msgstr ""
 

-#: builtin/checkout-index.c:204
+#: builtin/checkout-index.c:205

 msgid "when creating files, prepend <string>"
 msgstr ""
 
 msgid "when creating files, prepend <string>"
 msgstr ""
 

-#: builtin/checkout-index.c:207
+#: builtin/checkout-index.c:208

 msgid "copy out the files from named stage"
 msgstr ""
 
 msgid "copy out the files from named stage"
 msgstr ""
 


@@ -3144,75 +3166,75 @@ msgstr ""
 msgid "Unable to add merge result for '%s'"
 msgstr ""
 
 msgid "Unable to add merge result for '%s'"
 msgstr ""
 

-#: builtin/checkout.c:232 builtin/checkout.c:235 builtin/checkout.c:238
-#: builtin/checkout.c:241
+#: builtin/checkout.c:231 builtin/checkout.c:234 builtin/checkout.c:237
+#: builtin/checkout.c:240

 #, c-format
 msgid "'%s' cannot be used with updating paths"
 msgstr ""
 
 #, c-format
 msgid "'%s' cannot be used with updating paths"
 msgstr ""
 

-#: builtin/checkout.c:244 builtin/checkout.c:247
+#: builtin/checkout.c:243 builtin/checkout.c:246

 #, c-format
 msgid "'%s' cannot be used with %s"
 msgstr ""
 
 #, c-format
 msgid "'%s' cannot be used with %s"
 msgstr ""
 

-#: builtin/checkout.c:250
+#: builtin/checkout.c:249

 #, c-format
 msgid "Cannot update paths and switch to branch '%s' at the same time."
 msgstr ""
 
 #, c-format
 msgid "Cannot update paths and switch to branch '%s' at the same time."
 msgstr ""
 

-#: builtin/checkout.c:261 builtin/checkout.c:450
+#: builtin/checkout.c:260 builtin/checkout.c:449

 msgid "corrupt index file"
 msgstr ""
 
 msgid "corrupt index file"
 msgstr ""
 

-#: builtin/checkout.c:321 builtin/checkout.c:328
+#: builtin/checkout.c:320 builtin/checkout.c:327

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

-#: builtin/checkout.c:472
+#: builtin/checkout.c:471

 msgid "you need to resolve your current index first"
 msgstr ""
 
 msgid "you need to resolve your current index first"
 msgstr ""
 

-#: builtin/checkout.c:593
+#: builtin/checkout.c:591

 #, c-format
 msgid "Can not do reflog for '%s'\n"
 msgstr ""
 
 #, c-format
 msgid "Can not do reflog for '%s'\n"
 msgstr ""
 

-#: builtin/checkout.c:631
+#: builtin/checkout.c:629

 msgid "HEAD is now at"
 msgstr ""
 
 msgid "HEAD is now at"
 msgstr ""
 

-#: builtin/checkout.c:638
+#: builtin/checkout.c:636

 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr ""
 
 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr ""
 

-#: builtin/checkout.c:641
+#: builtin/checkout.c:639

 #, c-format
 msgid "Already on '%s'\n"
 msgstr ""
 
 #, c-format
 msgid "Already on '%s'\n"
 msgstr ""
 

-#: builtin/checkout.c:645
+#: builtin/checkout.c:643

 #, 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:647 builtin/checkout.c:1032
+#: builtin/checkout.c:645 builtin/checkout.c:1026

 #, 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:649
+#: builtin/checkout.c:647

 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr ""
 
 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr ""
 

-#: builtin/checkout.c:705
+#: builtin/checkout.c:699

 #, c-format
 msgid " ... and %d more.\n"
 msgstr ""
 
 #, c-format
 msgid " ... and %d more.\n"
 msgstr ""
 

-#: builtin/checkout.c:711
+#: builtin/checkout.c:705

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


@@ -3227,7 +3249,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
 msgstr[0] ""
 msgstr[1] ""
 

-#: builtin/checkout.c:729
+#: builtin/checkout.c:723

 #, c-format
 msgid ""
 "If you want to keep them by creating a new branch, this may be a good time\n"
 #, c-format
 msgid ""
 "If you want to keep them by creating a new branch, this may be a good time\n"


@@ -3237,151 +3259,151 @@ msgid ""
 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-#: builtin/checkout.c:759
+#: builtin/checkout.c:753

 msgid "internal error in revision walk"
 msgstr ""
 
 msgid "internal error in revision walk"
 msgstr ""
 

-#: builtin/checkout.c:763
+#: builtin/checkout.c:757

 msgid "Previous HEAD position was"
 msgstr ""
 
 msgid "Previous HEAD position was"
 msgstr ""
 

-#: builtin/checkout.c:790 builtin/checkout.c:1027
+#: builtin/checkout.c:784 builtin/checkout.c:1021

 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:934
+#: builtin/checkout.c:928

 #, c-format
 msgid "only one reference expected, %d given."
 msgstr ""
 
 #, c-format
 msgid "only one reference expected, %d given."
 msgstr ""
 

-#: builtin/checkout.c:973
+#: builtin/checkout.c:967

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

-#: builtin/checkout.c:1002
+#: builtin/checkout.c:996

 #, c-format
 msgid "reference is not a tree: %s"
 msgstr ""
 
 #, c-format
 msgid "reference is not a tree: %s"
 msgstr ""
 

-#: builtin/checkout.c:1041
+#: builtin/checkout.c:1035

 msgid "paths cannot be used with switching branches"
 msgstr ""
 
 msgid "paths cannot be used with switching branches"
 msgstr ""
 

-#: builtin/checkout.c:1044 builtin/checkout.c:1048
+#: builtin/checkout.c:1038 builtin/checkout.c:1042

 #, 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:1052 builtin/checkout.c:1055 builtin/checkout.c:1060
-#: builtin/checkout.c:1063
+#: builtin/checkout.c:1046 builtin/checkout.c:1049 builtin/checkout.c:1054
+#: builtin/checkout.c:1057

 #, c-format
 msgid "'%s' cannot be used with '%s'"
 msgstr ""
 
 #, c-format
 msgid "'%s' cannot be used with '%s'"
 msgstr ""
 

-#: builtin/checkout.c:1068
+#: builtin/checkout.c:1062

 #, 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:1090 builtin/checkout.c:1092 builtin/clone.c:88
+#: builtin/checkout.c:1084 builtin/checkout.c:1086 builtin/clone.c:88

 #: builtin/remote.c:159 builtin/remote.c:161
 msgid "branch"
 msgstr ""
 
 #: builtin/remote.c:159 builtin/remote.c:161
 msgid "branch"
 msgstr ""
 

-#: builtin/checkout.c:1091
+#: builtin/checkout.c:1085

 msgid "create and checkout a new branch"
 msgstr ""
 
 msgid "create and checkout a new branch"
 msgstr ""
 

-#: builtin/checkout.c:1093
+#: builtin/checkout.c:1087

 msgid "create/reset and checkout a branch"
 msgstr ""
 
 msgid "create/reset and checkout a branch"
 msgstr ""
 

-#: builtin/checkout.c:1094
+#: builtin/checkout.c:1088

 msgid "create reflog for new branch"
 msgstr ""
 
 msgid "create reflog for new branch"
 msgstr ""
 

-#: builtin/checkout.c:1095
+#: builtin/checkout.c:1089

 msgid "detach the HEAD at named commit"
 msgstr ""
 
 msgid "detach the HEAD at named commit"
 msgstr ""
 

-#: builtin/checkout.c:1096
+#: builtin/checkout.c:1090

 msgid "set upstream info for new branch"
 msgstr ""
 
 msgid "set upstream info for new branch"
 msgstr ""
 

-#: builtin/checkout.c:1098
+#: builtin/checkout.c:1092

 msgid "new-branch"
 msgstr ""
 
 msgid "new-branch"
 msgstr ""
 

-#: builtin/checkout.c:1098
+#: builtin/checkout.c:1092

 msgid "new unparented branch"
 msgstr ""
 
 msgid "new unparented branch"
 msgstr ""
 

-#: builtin/checkout.c:1099
+#: builtin/checkout.c:1093

 msgid "checkout our version for unmerged files"
 msgstr ""
 
 msgid "checkout our version for unmerged files"
 msgstr ""
 

-#: builtin/checkout.c:1101
+#: builtin/checkout.c:1095

 msgid "checkout their version for unmerged files"
 msgstr ""
 
 msgid "checkout their version for unmerged files"
 msgstr ""
 

-#: builtin/checkout.c:1103
+#: builtin/checkout.c:1097

 msgid "force checkout (throw away local modifications)"
 msgstr ""
 
 msgid "force checkout (throw away local modifications)"
 msgstr ""
 

-#: builtin/checkout.c:1104
+#: builtin/checkout.c:1098

 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:1105 builtin/merge.c:225
+#: builtin/checkout.c:1099 builtin/merge.c:225

 msgid "update ignored files (default)"
 msgstr ""
 
 msgid "update ignored files (default)"
 msgstr ""
 

-#: builtin/checkout.c:1106 builtin/log.c:1228 parse-options.h:245
+#: builtin/checkout.c:1100 builtin/log.c:1236 parse-options.h:245

 msgid "style"
 msgstr ""
 
 msgid "style"
 msgstr ""
 

-#: builtin/checkout.c:1107
+#: builtin/checkout.c:1101

 msgid "conflict style (merge or diff3)"
 msgstr ""
 
 msgid "conflict style (merge or diff3)"
 msgstr ""
 

-#: builtin/checkout.c:1110
+#: builtin/checkout.c:1104

 msgid "do not limit pathspecs to sparse entries only"
 msgstr ""
 
 msgid "do not limit pathspecs to sparse entries only"
 msgstr ""
 

-#: builtin/checkout.c:1112
+#: builtin/checkout.c:1106

 msgid "second guess 'git checkout no-such-branch'"
 msgstr ""
 
 msgid "second guess 'git checkout no-such-branch'"
 msgstr ""
 

-#: builtin/checkout.c:1135
+#: builtin/checkout.c:1129

 msgid "-b, -B and --orphan are mutually exclusive"
 msgstr ""
 
 msgid "-b, -B and --orphan are mutually exclusive"
 msgstr ""
 

-#: builtin/checkout.c:1152
+#: builtin/checkout.c:1146

 msgid "--track needs a branch name"
 msgstr ""
 
 msgid "--track needs a branch name"
 msgstr ""
 

-#: builtin/checkout.c:1159
+#: builtin/checkout.c:1153

 msgid "Missing branch name; try -b"
 msgstr ""
 
 msgid "Missing branch name; try -b"
 msgstr ""
 

-#: builtin/checkout.c:1196
+#: builtin/checkout.c:1190

 msgid "invalid path specification"
 msgstr ""
 
 msgid "invalid path specification"
 msgstr ""
 

-#: builtin/checkout.c:1203
+#: builtin/checkout.c:1197

 #, c-format
 msgid ""
 "Cannot update paths and switch to branch '%s' at the same time.\n"
 "Did you intend to checkout '%s' which can not be resolved as commit?"
 msgstr ""
 
 #, c-format
 msgid ""
 "Cannot update paths and switch to branch '%s' at the same time.\n"
 "Did you intend to checkout '%s' which can not be resolved as commit?"
 msgstr ""
 

-#: builtin/checkout.c:1208
+#: builtin/checkout.c:1202

 #, 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:1212
+#: builtin/checkout.c:1206

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


@@ -3442,30 +3464,30 @@ msgstr ""
 msgid "Huh (%s)?"
 msgstr ""
 
 msgid "Huh (%s)?"
 msgstr ""
 

-#: builtin/clean.c:660
+#: builtin/clean.c:659

 #, c-format
 msgid "Input ignore patterns>> "
 msgstr ""
 
 #, c-format
 msgid "Input ignore patterns>> "
 msgstr ""
 

-#: builtin/clean.c:697
+#: builtin/clean.c:696

 #, c-format
 msgid "WARNING: Cannot find items matched by: %s"
 msgstr ""
 
 #, c-format
 msgid "WARNING: Cannot find items matched by: %s"
 msgstr ""
 

-#: builtin/clean.c:718
+#: builtin/clean.c:717

 msgid "Select items to delete"
 msgstr ""
 
 msgid "Select items to delete"
 msgstr ""
 

-#: builtin/clean.c:758
+#: builtin/clean.c:757

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

-#: builtin/clean.c:783
+#: builtin/clean.c:782

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

-#: builtin/clean.c:791
+#: builtin/clean.c:790

 msgid ""
 "clean               - start cleaning\n"
 "filter by pattern   - exclude items from deletion\n"
 msgid ""
 "clean               - start cleaning\n"
 "filter by pattern   - exclude items from deletion\n"


@@ -3476,68 +3498,68 @@ msgid ""
 "?                   - help for prompt selection"
 msgstr ""
 
 "?                   - help for prompt selection"
 msgstr ""
 

-#: builtin/clean.c:818
+#: builtin/clean.c:817

 msgid "*** Commands ***"
 msgstr ""
 
 msgid "*** Commands ***"
 msgstr ""
 

-#: builtin/clean.c:819
+#: builtin/clean.c:818

 msgid "What now"
 msgstr ""
 
 msgid "What now"
 msgstr ""
 

-#: builtin/clean.c:827
+#: builtin/clean.c:826

 msgid "Would remove the following item:"
 msgid_plural "Would remove the following items:"
 msgstr[0] ""
 msgstr[1] ""
 
 msgid "Would remove the following item:"
 msgid_plural "Would remove the following items:"
 msgstr[0] ""
 msgstr[1] ""
 

-#: builtin/clean.c:844
+#: builtin/clean.c:843

 msgid "No more files to clean, exiting."
 msgstr ""
 
 msgid "No more files to clean, exiting."
 msgstr ""
 

-#: builtin/clean.c:875
+#: builtin/clean.c:874

 msgid "do not print names of files removed"
 msgstr ""
 
 msgid "do not print names of files removed"
 msgstr ""
 

-#: builtin/clean.c:877
+#: builtin/clean.c:876

 msgid "force"
 msgstr ""
 
 msgid "force"
 msgstr ""
 

-#: builtin/clean.c:878
+#: builtin/clean.c:877

 msgid "interactive cleaning"
 msgstr ""
 
 msgid "interactive cleaning"
 msgstr ""
 

-#: builtin/clean.c:880
+#: builtin/clean.c:879

 msgid "remove whole directories"
 msgstr ""
 
 msgid "remove whole directories"
 msgstr ""
 

-#: builtin/clean.c:881 builtin/describe.c:415 builtin/grep.c:716
-#: builtin/ls-files.c:486 builtin/name-rev.c:314 builtin/show-ref.c:185
+#: builtin/clean.c:880 builtin/describe.c:406 builtin/grep.c:714
+#: builtin/ls-files.c:486 builtin/name-rev.c:311 builtin/show-ref.c:185

 msgid "pattern"
 msgstr ""
 
 msgid "pattern"
 msgstr ""
 

-#: builtin/clean.c:882
+#: builtin/clean.c:881

 msgid "add <pattern> to ignore rules"
 msgstr ""
 
 msgid "add <pattern> to ignore rules"
 msgstr ""
 

-#: builtin/clean.c:883
+#: builtin/clean.c:882

 msgid "remove ignored files, too"
 msgstr ""
 
 msgid "remove ignored files, too"
 msgstr ""
 

-#: builtin/clean.c:885
+#: builtin/clean.c:884

 msgid "remove only ignored files"
 msgstr ""
 
 msgid "remove only ignored files"
 msgstr ""
 

-#: builtin/clean.c:903
+#: builtin/clean.c:902

 msgid "-x and -X cannot be used together"
 msgstr ""
 
 msgid "-x and -X cannot be used together"
 msgstr ""
 

-#: builtin/clean.c:907
+#: builtin/clean.c:906

 msgid ""
 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
 "clean"
 msgstr ""
 
 msgid ""
 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
 "clean"
 msgstr ""
 

-#: builtin/clean.c:910
+#: builtin/clean.c:909

 msgid ""
 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
 "refusing to clean"
 msgid ""
 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
 "refusing to clean"


@@ -3547,8 +3569,8 @@ msgstr ""
 msgid "git clone [options] [--] <repo> [<dir>]"
 msgstr ""
 
 msgid "git clone [options] [--] <repo> [<dir>]"
 msgstr ""
 

-#: builtin/clone.c:64 builtin/fetch.c:97 builtin/merge.c:222
-#: builtin/push.c:504
+#: builtin/clone.c:64 builtin/fetch.c:112 builtin/merge.c:222
+#: builtin/push.c:503

 msgid "force progress reporting"
 msgstr ""
 
 msgid "force progress reporting"
 msgstr ""
 


@@ -3608,7 +3630,7 @@ msgstr ""
 msgid "path to git-upload-pack on the remote"
 msgstr ""
 
 msgid "path to git-upload-pack on the remote"
 msgstr ""
 

-#: builtin/clone.c:92 builtin/fetch.c:98 builtin/grep.c:661
+#: builtin/clone.c:92 builtin/fetch.c:113 builtin/grep.c:659

 msgid "depth"
 msgstr ""
 
 msgid "depth"
 msgstr ""
 


@@ -3707,94 +3729,94 @@ msgstr ""
 msgid "remote did not send all necessary objects"
 msgstr ""
 
 msgid "remote did not send all necessary objects"
 msgstr ""
 

-#: builtin/clone.c:626
+#: builtin/clone.c:627

 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:657
+#: builtin/clone.c:658

 msgid "unable to checkout working tree"
 msgstr ""
 
 msgid "unable to checkout working tree"
 msgstr ""
 

-#: builtin/clone.c:765
+#: builtin/clone.c:768

 msgid "Too many arguments."
 msgstr ""
 
 msgid "Too many arguments."
 msgstr ""
 

-#: builtin/clone.c:769
+#: builtin/clone.c:772

 msgid "You must specify a repository to clone."
 msgstr ""
 
 msgid "You must specify a repository to clone."
 msgstr ""
 

-#: builtin/clone.c:780
+#: builtin/clone.c:783

 #, 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:783
+#: builtin/clone.c:786

 msgid "--bare and --separate-git-dir are incompatible."
 msgstr ""
 
 msgid "--bare and --separate-git-dir are incompatible."
 msgstr ""
 

-#: builtin/clone.c:796
+#: builtin/clone.c:799

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

-#: builtin/clone.c:802
-msgid "--depth is ignored in local clones; use file:// instead."
-msgstr ""
-
-#: builtin/clone.c:805
-msgid "source repository is shallow, ignoring --local"
-msgstr ""
-
-#: builtin/clone.c:810
-msgid "--local is ignored"
-msgstr ""
-
-#: builtin/clone.c:814 builtin/fetch.c:1119
+#: builtin/clone.c:805 builtin/fetch.c:1143

 #, 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:824
+#: builtin/clone.c:815

 #, 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:834
+#: builtin/clone.c:825

 #, c-format
 msgid "working tree '%s' already exists."
 msgstr ""
 
 #, c-format
 msgid "working tree '%s' already exists."
 msgstr ""
 

-#: builtin/clone.c:847 builtin/clone.c:859
+#: builtin/clone.c:838 builtin/clone.c:850

 #, 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:850
+#: builtin/clone.c:841

 #, 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:869
+#: builtin/clone.c:860

 #, c-format
 msgid "Cloning into bare repository '%s'...\n"
 msgstr ""
 
 #, c-format
 msgid "Cloning into bare repository '%s'...\n"
 msgstr ""
 

-#: builtin/clone.c:871
+#: builtin/clone.c:862

 #, c-format
 msgid "Cloning into '%s'...\n"
 msgstr ""
 
 #, c-format
 msgid "Cloning into '%s'...\n"
 msgstr ""
 

+#: builtin/clone.c:898
+msgid "--depth is ignored in local clones; use file:// instead."
+msgstr ""
+
+#: builtin/clone.c:901
+msgid "source repository is shallow, ignoring --local"
+msgstr ""
+

 #: builtin/clone.c:906
 #: builtin/clone.c:906

+msgid "--local is ignored"
+msgstr ""
+
+#: builtin/clone.c:910

 #, c-format
 msgid "Don't know how to clone %s"
 msgstr ""
 
 #, c-format
 msgid "Don't know how to clone %s"
 msgstr ""
 

-#: builtin/clone.c:957 builtin/clone.c:965
+#: builtin/clone.c:961 builtin/clone.c:969

 #, c-format
 msgid "Remote branch %s not found in upstream %s"
 msgstr ""
 
 #, c-format
 msgid "Remote branch %s not found in upstream %s"
 msgstr ""
 

-#: builtin/clone.c:968
+#: builtin/clone.c:972

 msgid "You appear to have cloned an empty repository."
 msgstr ""
 
 msgid "You appear to have cloned an empty repository."
 msgstr ""
 


@@ -3886,89 +3908,96 @@ msgstr ""
 msgid "failed to unpack HEAD tree object"
 msgstr ""
 
 msgid "failed to unpack HEAD tree object"
 msgstr ""
 

-#: builtin/commit.c:330
+#: builtin/commit.c:328

 msgid "unable to create temporary index"
 msgstr ""
 
 msgid "unable to create temporary index"
 msgstr ""
 

-#: builtin/commit.c:336
+#: builtin/commit.c:334

 msgid "interactive add failed"
 msgstr ""
 
 msgid "interactive add failed"
 msgstr ""
 

-#: builtin/commit.c:369 builtin/commit.c:390 builtin/commit.c:440
+#: builtin/commit.c:366 builtin/commit.c:387 builtin/commit.c:435

 msgid "unable to write new_index file"
 msgstr ""
 
 msgid "unable to write new_index file"
 msgstr ""
 

-#: builtin/commit.c:421
+#: builtin/commit.c:418

 msgid "cannot do a partial commit during a merge."
 msgstr ""
 
 msgid "cannot do a partial commit during a merge."
 msgstr ""
 

-#: builtin/commit.c:423
+#: builtin/commit.c:420

 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:433
+#: builtin/commit.c:429

 msgid "cannot read the index"
 msgstr ""
 
 msgid "cannot read the index"
 msgstr ""
 

-#: builtin/commit.c:453
+#: builtin/commit.c:447

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

-#: builtin/commit.c:544 builtin/commit.c:550
+#: builtin/commit.c:557 builtin/commit.c:563

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

-#: builtin/commit.c:572
+#: builtin/commit.c:585

 msgid "malformed --author parameter"
 msgstr ""
 
 #: builtin/commit.c:592
 #, c-format
 msgid "malformed --author parameter"
 msgstr ""
 
 #: builtin/commit.c:592
 #, c-format

+msgid "invalid date format: %s"
+msgstr ""
+
+#: builtin/commit.c:609
+#, c-format

 msgid "Malformed ident string: '%s'"
 msgstr ""
 
 msgid "Malformed ident string: '%s'"
 msgstr ""
 

-#: builtin/commit.c:629 builtin/commit.c:663 builtin/commit.c:1014
+#: builtin/commit.c:642
+msgid ""
+"unable to select a comment character that is not used\n"
+"in the current commit message"
+msgstr ""
+
+#: builtin/commit.c:679 builtin/commit.c:712 builtin/commit.c:1086

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

-#: builtin/commit.c:641 builtin/shortlog.c:273
+#: builtin/commit.c:691 builtin/shortlog.c:273

 #, 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:643
+#: builtin/commit.c:693

 msgid "could not read log from standard input"
 msgstr ""
 
 msgid "could not read log from standard input"
 msgstr ""
 

-#: builtin/commit.c:647
+#: builtin/commit.c:697

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

-#: builtin/commit.c:654
-msgid "commit has empty message"
-msgstr ""
-
-#: builtin/commit.c:670
+#: builtin/commit.c:719

 msgid "could not read MERGE_MSG"
 msgstr ""
 
 msgid "could not read MERGE_MSG"
 msgstr ""
 

-#: builtin/commit.c:674
+#: builtin/commit.c:723

 msgid "could not read SQUASH_MSG"
 msgstr ""
 
 msgid "could not read SQUASH_MSG"
 msgstr ""
 

-#: builtin/commit.c:678
+#: builtin/commit.c:727

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

-#: builtin/commit.c:749
+#: builtin/commit.c:798

 msgid "could not write commit template"
 msgstr ""
 
 msgid "could not write commit template"
 msgstr ""
 

-#: builtin/commit.c:764
+#: builtin/commit.c:816

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


@@ -3978,7 +4007,7 @@ msgid ""
 "and try again.\n"
 msgstr ""
 
 "and try again.\n"
 msgstr ""
 

-#: builtin/commit.c:769
+#: builtin/commit.c:821

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


@@ -3988,14 +4017,14 @@ msgid ""
 "and try again.\n"
 msgstr ""
 
 "and try again.\n"
 msgstr ""
 

-#: builtin/commit.c:782
+#: builtin/commit.c:834

 #, 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:789
+#: builtin/commit.c:841

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


@@ -4003,351 +4032,356 @@ msgid ""
 "An empty message aborts the commit.\n"
 msgstr ""
 
 "An empty message aborts the commit.\n"
 msgstr ""
 

-#: builtin/commit.c:802
+#: builtin/commit.c:855
+#, c-format
+msgid "%sAuthor:    %.*s <%.*s>"
+msgstr ""
+
+#: builtin/commit.c:863

 #, c-format
 #, c-format

-msgid "%sAuthor:    %s"
+msgid "%sDate:      %s"

 msgstr ""
 
 msgstr ""
 

-#: builtin/commit.c:809
+#: builtin/commit.c:870

 #, c-format
 #, c-format

-msgid "%sCommitter: %s"
+msgid "%sCommitter: %.*s <%.*s>"

 msgstr ""
 
 msgstr ""
 

-#: builtin/commit.c:829
+#: builtin/commit.c:888

 msgid "Cannot read index"
 msgstr ""
 
 msgid "Cannot read index"
 msgstr ""
 

-#: builtin/commit.c:872
+#: builtin/commit.c:945

 msgid "Error building trees"
 msgstr ""
 
 msgid "Error building trees"
 msgstr ""
 

-#: builtin/commit.c:887 builtin/tag.c:391
+#: builtin/commit.c:960 builtin/tag.c:495

 #, 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:989
+#: builtin/commit.c:1061

 #, c-format
 msgid "No existing author found with '%s'"
 msgstr ""
 
 #, c-format
 msgid "No existing author found with '%s'"
 msgstr ""
 

-#: builtin/commit.c:1004 builtin/commit.c:1244
+#: builtin/commit.c:1076 builtin/commit.c:1316

 #, c-format
 msgid "Invalid untracked files mode '%s'"
 msgstr ""
 
 #, c-format
 msgid "Invalid untracked files mode '%s'"
 msgstr ""
 

-#: builtin/commit.c:1041
+#: builtin/commit.c:1113

 msgid "--long and -z are incompatible"
 msgstr ""
 
 msgid "--long and -z are incompatible"
 msgstr ""
 

-#: builtin/commit.c:1071
+#: builtin/commit.c:1143

 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:1080
+#: builtin/commit.c:1152

 msgid "You have nothing to amend."
 msgstr ""
 
 msgid "You have nothing to amend."
 msgstr ""
 

-#: builtin/commit.c:1083
+#: builtin/commit.c:1155

 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:1085
+#: builtin/commit.c:1157

 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:1088
+#: builtin/commit.c:1160

 msgid "Options --squash and --fixup cannot be used together"
 msgstr ""
 
 msgid "Options --squash and --fixup cannot be used together"
 msgstr ""
 

-#: builtin/commit.c:1098
+#: builtin/commit.c:1170

 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:1100
+#: builtin/commit.c:1172

 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
 msgstr ""
 
 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
 msgstr ""
 

-#: builtin/commit.c:1108
+#: builtin/commit.c:1180

 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:1125
+#: builtin/commit.c:1197

 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:1127
+#: builtin/commit.c:1199

 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:1129
+#: builtin/commit.c:1201

 msgid "Clever... amending the last one with dirty index."
 msgstr ""
 
 msgid "Clever... amending the last one with dirty index."
 msgstr ""
 

-#: builtin/commit.c:1131
+#: builtin/commit.c:1203

 msgid "Explicit paths specified without -i or -o; assuming --only paths..."
 msgstr ""
 
 msgid "Explicit paths specified without -i or -o; assuming --only paths..."
 msgstr ""
 

-#: builtin/commit.c:1143 builtin/tag.c:639
+#: builtin/commit.c:1215 builtin/tag.c:727

 #, c-format
 msgid "Invalid cleanup mode %s"
 msgstr ""
 
 #, c-format
 msgid "Invalid cleanup mode %s"
 msgstr ""
 

-#: builtin/commit.c:1148
+#: builtin/commit.c:1220

 msgid "Paths with -a does not make sense."
 msgstr ""
 
 msgid "Paths with -a does not make sense."
 msgstr ""
 

-#: builtin/commit.c:1258 builtin/commit.c:1516
+#: builtin/commit.c:1330 builtin/commit.c:1595

 msgid "show status concisely"
 msgstr ""
 
 msgid "show status concisely"
 msgstr ""
 

-#: builtin/commit.c:1260 builtin/commit.c:1518
+#: builtin/commit.c:1332 builtin/commit.c:1597

 msgid "show branch information"
 msgstr ""
 
 msgid "show branch information"
 msgstr ""
 

-#: builtin/commit.c:1262 builtin/commit.c:1520 builtin/push.c:490
+#: builtin/commit.c:1334 builtin/commit.c:1599 builtin/push.c:489

 msgid "machine-readable output"
 msgstr ""
 
 msgid "machine-readable output"
 msgstr ""
 

-#: builtin/commit.c:1265 builtin/commit.c:1522
+#: builtin/commit.c:1337 builtin/commit.c:1601

 msgid "show status in long format (default)"
 msgstr ""
 
 msgid "show status in long format (default)"
 msgstr ""
 

-#: builtin/commit.c:1268 builtin/commit.c:1525
+#: builtin/commit.c:1340 builtin/commit.c:1604

 msgid "terminate entries with NUL"
 msgstr ""
 
 msgid "terminate entries with NUL"
 msgstr ""
 

-#: builtin/commit.c:1270 builtin/commit.c:1528 builtin/fast-export.c:674
-#: builtin/fast-export.c:677 builtin/tag.c:514
+#: builtin/commit.c:1342 builtin/commit.c:1607 builtin/fast-export.c:703
+#: builtin/fast-export.c:706 builtin/tag.c:602

 msgid "mode"
 msgstr ""
 
 msgid "mode"
 msgstr ""
 

-#: builtin/commit.c:1271 builtin/commit.c:1528
+#: builtin/commit.c:1343 builtin/commit.c:1607

 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:1274
+#: builtin/commit.c:1346

 msgid "show ignored files"
 msgstr ""
 
 msgid "show ignored files"
 msgstr ""
 

-#: builtin/commit.c:1275 parse-options.h:153
+#: builtin/commit.c:1347 parse-options.h:153

 msgid "when"
 msgstr ""
 
 msgid "when"
 msgstr ""
 

-#: builtin/commit.c:1276
+#: builtin/commit.c:1348

 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:1278
+#: builtin/commit.c:1350

 msgid "list untracked files in columns"
 msgstr ""
 
 msgid "list untracked files in columns"
 msgstr ""
 

-#: builtin/commit.c:1347
+#: builtin/commit.c:1419

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

-#: builtin/commit.c:1349
+#: builtin/commit.c:1421

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

-#: builtin/commit.c:1390
+#: builtin/commit.c:1469

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

-#: builtin/commit.c:1392
+#: builtin/commit.c:1471

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

-#: builtin/commit.c:1486
+#: builtin/commit.c:1565

 msgid "suppress summary after successful commit"
 msgstr ""
 
 msgid "suppress summary after successful commit"
 msgstr ""
 

-#: builtin/commit.c:1487
+#: builtin/commit.c:1566

 msgid "show diff in commit message template"
 msgstr ""
 
 msgid "show diff in commit message template"
 msgstr ""
 

-#: builtin/commit.c:1489
+#: builtin/commit.c:1568

 msgid "Commit message options"
 msgstr ""
 
 msgid "Commit message options"
 msgstr ""
 

-#: builtin/commit.c:1490 builtin/tag.c:512
+#: builtin/commit.c:1569 builtin/tag.c:600

 msgid "read message from file"
 msgstr ""
 
 msgid "read message from file"
 msgstr ""
 

-#: builtin/commit.c:1491
+#: builtin/commit.c:1570

 msgid "author"
 msgstr ""
 
 msgid "author"
 msgstr ""
 

-#: builtin/commit.c:1491
+#: builtin/commit.c:1570

 msgid "override author for commit"
 msgstr ""
 
 msgid "override author for commit"
 msgstr ""
 

-#: builtin/commit.c:1492 builtin/gc.c:272
+#: builtin/commit.c:1571 builtin/gc.c:286

 msgid "date"
 msgstr ""
 
 msgid "date"
 msgstr ""
 

-#: builtin/commit.c:1492
+#: builtin/commit.c:1571

 msgid "override date for commit"
 msgstr ""
 
 msgid "override date for commit"
 msgstr ""
 

-#: builtin/commit.c:1493 builtin/merge.c:216 builtin/notes.c:409
-#: builtin/notes.c:566 builtin/tag.c:510
+#: builtin/commit.c:1572 builtin/merge.c:216 builtin/notes.c:409
+#: builtin/notes.c:566 builtin/tag.c:598

 msgid "message"
 msgstr ""
 
 msgid "message"
 msgstr ""
 

-#: builtin/commit.c:1493
+#: builtin/commit.c:1572

 msgid "commit message"
 msgstr ""
 
 msgid "commit message"
 msgstr ""
 

-#: builtin/commit.c:1494
+#: builtin/commit.c:1573

 msgid "reuse and edit message from specified commit"
 msgstr ""
 
 msgid "reuse and edit message from specified commit"
 msgstr ""
 

-#: builtin/commit.c:1495
+#: builtin/commit.c:1574

 msgid "reuse message from specified commit"
 msgstr ""
 
 msgid "reuse message from specified commit"
 msgstr ""
 

-#: builtin/commit.c:1496
+#: builtin/commit.c:1575

 msgid "use autosquash formatted message to fixup specified commit"
 msgstr ""
 
 msgid "use autosquash formatted message to fixup specified commit"
 msgstr ""
 

-#: builtin/commit.c:1497
+#: builtin/commit.c:1576

 msgid "use autosquash formatted message to squash specified commit"
 msgstr ""
 
 msgid "use autosquash formatted message to squash specified commit"
 msgstr ""
 

-#: builtin/commit.c:1498
+#: builtin/commit.c:1577

 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:1499 builtin/log.c:1180 builtin/revert.c:86
+#: builtin/commit.c:1578 builtin/log.c:1188 builtin/revert.c:86

 msgid "add Signed-off-by:"
 msgstr ""
 
 msgid "add Signed-off-by:"
 msgstr ""
 

-#: builtin/commit.c:1500
+#: builtin/commit.c:1579

 msgid "use specified template file"
 msgstr ""
 
 msgid "use specified template file"
 msgstr ""
 

-#: builtin/commit.c:1501
+#: builtin/commit.c:1580

 msgid "force edit of commit"
 msgstr ""
 
 msgid "force edit of commit"
 msgstr ""
 

-#: builtin/commit.c:1502
+#: builtin/commit.c:1581

 msgid "default"
 msgstr ""
 
 msgid "default"
 msgstr ""
 

-#: builtin/commit.c:1502 builtin/tag.c:515
+#: builtin/commit.c:1581 builtin/tag.c:603

 msgid "how to strip spaces and #comments from message"
 msgstr ""
 
 msgid "how to strip spaces and #comments from message"
 msgstr ""
 

-#: builtin/commit.c:1503
+#: builtin/commit.c:1582

 msgid "include status in commit message template"
 msgstr ""
 
 msgid "include status in commit message template"
 msgstr ""
 

-#: builtin/commit.c:1504 builtin/merge.c:223 builtin/revert.c:92
-#: builtin/tag.c:516
+#: builtin/commit.c:1583 builtin/merge.c:223 builtin/revert.c:92
+#: builtin/tag.c:604

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

-#: builtin/commit.c:1505 builtin/merge.c:224 builtin/revert.c:93
+#: builtin/commit.c:1584 builtin/merge.c:224 builtin/revert.c:93

 msgid "GPG sign commit"
 msgstr ""
 
 msgid "GPG sign commit"
 msgstr ""
 

-#: builtin/commit.c:1508
+#: builtin/commit.c:1587

 msgid "Commit contents options"
 msgstr ""
 
 msgid "Commit contents options"
 msgstr ""
 

-#: builtin/commit.c:1509
+#: builtin/commit.c:1588

 msgid "commit all changed files"
 msgstr ""
 
 msgid "commit all changed files"
 msgstr ""
 

-#: builtin/commit.c:1510
+#: builtin/commit.c:1589

 msgid "add specified files to index for commit"
 msgstr ""
 
 msgid "add specified files to index for commit"
 msgstr ""
 

-#: builtin/commit.c:1511
+#: builtin/commit.c:1590

 msgid "interactively add files"
 msgstr ""
 
 msgid "interactively add files"
 msgstr ""
 

-#: builtin/commit.c:1512
+#: builtin/commit.c:1591

 msgid "interactively add changes"
 msgstr ""
 
 msgid "interactively add changes"
 msgstr ""
 

-#: builtin/commit.c:1513
+#: builtin/commit.c:1592

 msgid "commit only specified files"
 msgstr ""
 
 msgid "commit only specified files"
 msgstr ""
 

-#: builtin/commit.c:1514
+#: builtin/commit.c:1593

 msgid "bypass pre-commit hook"
 msgstr ""
 
 msgid "bypass pre-commit hook"
 msgstr ""
 

-#: builtin/commit.c:1515
+#: builtin/commit.c:1594

 msgid "show what would be committed"
 msgstr ""
 
 msgid "show what would be committed"
 msgstr ""
 

-#: builtin/commit.c:1526
+#: builtin/commit.c:1605

 msgid "amend previous commit"
 msgstr ""
 
 msgid "amend previous commit"
 msgstr ""
 

-#: builtin/commit.c:1527
+#: builtin/commit.c:1606

 msgid "bypass post-rewrite hook"
 msgstr ""
 
 msgid "bypass post-rewrite hook"
 msgstr ""
 

-#: builtin/commit.c:1532
+#: builtin/commit.c:1611

 msgid "ok to record an empty change"
 msgstr ""
 
 msgid "ok to record an empty change"
 msgstr ""
 

-#: builtin/commit.c:1534
+#: builtin/commit.c:1613

 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:1562
+#: builtin/commit.c:1641

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

-#: builtin/commit.c:1601 builtin/merge.c:518
+#: builtin/commit.c:1680 builtin/merge.c:518

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

-#: builtin/commit.c:1608
+#: builtin/commit.c:1687

 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr ""
 
 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr ""
 

-#: builtin/commit.c:1615
+#: builtin/commit.c:1694

 msgid "could not read MERGE_MODE"
 msgstr ""
 
 msgid "could not read MERGE_MODE"
 msgstr ""
 

-#: builtin/commit.c:1634
+#: builtin/commit.c:1713

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

-#: builtin/commit.c:1645
+#: builtin/commit.c:1724

 #, c-format
 msgid "Aborting commit; you did not edit the message.\n"
 msgstr ""
 
 #, c-format
 msgid "Aborting commit; you did not edit the message.\n"
 msgstr ""
 

-#: builtin/commit.c:1650
+#: builtin/commit.c:1729

 #, 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:1665 builtin/merge.c:857 builtin/merge.c:882
+#: builtin/commit.c:1744 builtin/merge.c:851 builtin/merge.c:876

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

-#: builtin/commit.c:1686
+#: builtin/commit.c:1756

 msgid "cannot lock HEAD ref"
 msgstr ""
 
 msgid "cannot lock HEAD ref"
 msgstr ""
 

-#: builtin/commit.c:1690
+#: builtin/commit.c:1769

 msgid "cannot update HEAD ref"
 msgstr ""
 
 msgid "cannot update HEAD ref"
 msgstr ""
 

-#: builtin/commit.c:1701
+#: builtin/commit.c:1780

 msgid ""
 "Repository has been updated, but unable to write\n"
 "new_index file. Check that disk is not full or quota is\n"
 msgid ""
 "Repository has been updated, but unable to write\n"
 "new_index file. Check that disk is not full or quota is\n"


@@ -4498,129 +4532,129 @@ msgstr ""
 msgid "git describe [options] --dirty"
 msgstr ""
 
 msgid "git describe [options] --dirty"
 msgstr ""
 

-#: builtin/describe.c:225
+#: builtin/describe.c:216

 #, c-format
 msgid "annotated tag %s not available"
 msgstr ""
 
 #, c-format
 msgid "annotated tag %s not available"
 msgstr ""
 

-#: builtin/describe.c:229
+#: builtin/describe.c:220

 #, c-format
 msgid "annotated tag %s has no embedded name"
 msgstr ""
 
 #, c-format
 msgid "annotated tag %s has no embedded name"
 msgstr ""
 

-#: builtin/describe.c:231
+#: builtin/describe.c:222

 #, c-format
 msgid "tag '%s' is really '%s' here"
 msgstr ""
 
 #, c-format
 msgid "tag '%s' is really '%s' here"
 msgstr ""
 

-#: builtin/describe.c:258
+#: builtin/describe.c:249

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

-#: builtin/describe.c:261
+#: builtin/describe.c:252

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

-#: builtin/describe.c:278
+#: builtin/describe.c:269

 #, c-format
 msgid "no tag exactly matches '%s'"
 msgstr ""
 
 #, c-format
 msgid "no tag exactly matches '%s'"
 msgstr ""
 

-#: builtin/describe.c:280
+#: builtin/describe.c:271

 #, c-format
 msgid "searching to describe %s\n"
 msgstr ""
 
 #, c-format
 msgid "searching to describe %s\n"
 msgstr ""
 

-#: builtin/describe.c:327
+#: builtin/describe.c:318

 #, c-format
 msgid "finished search at %s\n"
 msgstr ""
 
 #, c-format
 msgid "finished search at %s\n"
 msgstr ""
 

-#: builtin/describe.c:354
+#: builtin/describe.c:345

 #, c-format
 msgid ""
 "No annotated tags can describe '%s'.\n"
 "However, there were unannotated tags: try --tags."
 msgstr ""
 
 #, c-format
 msgid ""
 "No annotated tags can describe '%s'.\n"
 "However, there were unannotated tags: try --tags."
 msgstr ""
 

-#: builtin/describe.c:358
+#: builtin/describe.c:349

 #, c-format
 msgid ""
 "No tags can describe '%s'.\n"
 "Try --always, or create some tags."
 msgstr ""
 
 #, c-format
 msgid ""
 "No tags can describe '%s'.\n"
 "Try --always, or create some tags."
 msgstr ""
 

-#: builtin/describe.c:379
+#: builtin/describe.c:370

 #, c-format
 msgid "traversed %lu commits\n"
 msgstr ""
 
 #, c-format
 msgid "traversed %lu commits\n"
 msgstr ""
 

-#: builtin/describe.c:382
+#: builtin/describe.c:373

 #, c-format
 msgid ""
 "more than %i tags found; listed %i most recent\n"
 "gave up search at %s\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "more than %i tags found; listed %i most recent\n"
 "gave up search at %s\n"
 msgstr ""
 

-#: builtin/describe.c:404
+#: builtin/describe.c:395

 msgid "find the tag that comes after the commit"
 msgstr ""
 
 msgid "find the tag that comes after the commit"
 msgstr ""
 

-#: builtin/describe.c:405
+#: builtin/describe.c:396

 msgid "debug search strategy on stderr"
 msgstr ""
 
 msgid "debug search strategy on stderr"
 msgstr ""
 

-#: builtin/describe.c:406
+#: builtin/describe.c:397

 msgid "use any ref"
 msgstr ""
 
 msgid "use any ref"
 msgstr ""
 

-#: builtin/describe.c:407
+#: builtin/describe.c:398

 msgid "use any tag, even unannotated"
 msgstr ""
 
 msgid "use any tag, even unannotated"
 msgstr ""
 

-#: builtin/describe.c:408
+#: builtin/describe.c:399

 msgid "always use long format"
 msgstr ""
 
 msgid "always use long format"
 msgstr ""
 

-#: builtin/describe.c:409
+#: builtin/describe.c:400

 msgid "only follow first parent"
 msgstr ""
 
 msgid "only follow first parent"
 msgstr ""
 

-#: builtin/describe.c:412
+#: builtin/describe.c:403

 msgid "only output exact matches"
 msgstr ""
 
 msgid "only output exact matches"
 msgstr ""
 

-#: builtin/describe.c:414
+#: builtin/describe.c:405

 msgid "consider <n> most recent tags (default: 10)"
 msgstr ""
 
 msgid "consider <n> most recent tags (default: 10)"
 msgstr ""
 

-#: builtin/describe.c:416
+#: builtin/describe.c:407

 msgid "only consider tags matching <pattern>"
 msgstr ""
 
 msgid "only consider tags matching <pattern>"
 msgstr ""
 

-#: builtin/describe.c:418 builtin/name-rev.c:321
+#: builtin/describe.c:409 builtin/name-rev.c:318

 msgid "show abbreviated commit object as fallback"
 msgstr ""
 
 msgid "show abbreviated commit object as fallback"
 msgstr ""
 

-#: builtin/describe.c:419
+#: builtin/describe.c:410

 msgid "mark"
 msgstr ""
 
 msgid "mark"
 msgstr ""
 

-#: builtin/describe.c:420
+#: builtin/describe.c:411

 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
 msgstr ""
 
 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
 msgstr ""
 

-#: builtin/describe.c:438
+#: builtin/describe.c:429

 msgid "--long is incompatible with --abbrev=0"
 msgstr ""
 
 msgid "--long is incompatible with --abbrev=0"
 msgstr ""
 

-#: builtin/describe.c:464
+#: builtin/describe.c:455

 msgid "No names found, cannot describe anything."
 msgstr ""
 
 msgid "No names found, cannot describe anything."
 msgstr ""
 

-#: builtin/describe.c:484
+#: builtin/describe.c:475

 msgid "--dirty is incompatible with commit-ishes"
 msgstr ""
 
 msgid "--dirty is incompatible with commit-ishes"
 msgstr ""
 


@@ -4653,46 +4687,54 @@ msgstr ""
 msgid "unhandled object '%s' given."
 msgstr ""
 
 msgid "unhandled object '%s' given."
 msgstr ""
 

-#: builtin/fast-export.c:22
+#: builtin/fast-export.c:23

 msgid "git fast-export [rev-list-opts]"
 msgstr ""
 
 msgid "git fast-export [rev-list-opts]"
 msgstr ""
 

-#: builtin/fast-export.c:673
+#: builtin/fast-export.c:702

 msgid "show progress after <n> objects"
 msgstr ""
 
 msgid "show progress after <n> objects"
 msgstr ""
 

-#: builtin/fast-export.c:675
+#: builtin/fast-export.c:704

 msgid "select handling of signed tags"
 msgstr ""
 
 msgid "select handling of signed tags"
 msgstr ""
 

-#: builtin/fast-export.c:678
+#: builtin/fast-export.c:707

 msgid "select handling of tags that tag filtered objects"
 msgstr ""
 
 msgid "select handling of tags that tag filtered objects"
 msgstr ""
 

-#: builtin/fast-export.c:681
+#: builtin/fast-export.c:710

 msgid "Dump marks to this file"
 msgstr ""
 
 msgid "Dump marks to this file"
 msgstr ""
 

-#: builtin/fast-export.c:683
+#: builtin/fast-export.c:712

 msgid "Import marks from this file"
 msgstr ""
 
 msgid "Import marks from this file"
 msgstr ""
 

-#: builtin/fast-export.c:685
+#: builtin/fast-export.c:714

 msgid "Fake a tagger when tags lack one"
 msgstr ""
 
 msgid "Fake a tagger when tags lack one"
 msgstr ""
 

-#: builtin/fast-export.c:687
+#: builtin/fast-export.c:716

 msgid "Output full tree for each commit"
 msgstr ""
 
 msgid "Output full tree for each commit"
 msgstr ""
 

-#: builtin/fast-export.c:689
+#: builtin/fast-export.c:718

 msgid "Use the done feature to terminate the stream"
 msgstr ""
 
 msgid "Use the done feature to terminate the stream"
 msgstr ""
 

-#: builtin/fast-export.c:690
+#: builtin/fast-export.c:719

 msgid "Skip output of blob data"
 msgstr ""
 
 msgid "Skip output of blob data"
 msgstr ""
 

+#: builtin/fast-export.c:720
+msgid "refspec"
+msgstr ""
+
+#: builtin/fast-export.c:721
+msgid "Apply refspec to exported refs"
+msgstr ""
+

 #: builtin/fetch.c:20
 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
 msgstr ""
 #: builtin/fetch.c:20
 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
 msgstr ""


@@ -4709,239 +4751,247 @@ msgstr ""
 msgid "git fetch --all [<options>]"
 msgstr ""
 
 msgid "git fetch --all [<options>]"
 msgstr ""
 

-#: builtin/fetch.c:75
+#: builtin/fetch.c:90

 msgid "fetch from all remotes"
 msgstr ""
 
 msgid "fetch from all remotes"
 msgstr ""
 

-#: builtin/fetch.c:77
+#: builtin/fetch.c:92

 msgid "append to .git/FETCH_HEAD instead of overwriting"
 msgstr ""
 
 msgid "append to .git/FETCH_HEAD instead of overwriting"
 msgstr ""
 

-#: builtin/fetch.c:79
+#: builtin/fetch.c:94

 msgid "path to upload pack on remote end"
 msgstr ""
 
 msgid "path to upload pack on remote end"
 msgstr ""
 

-#: builtin/fetch.c:80
+#: builtin/fetch.c:95

 msgid "force overwrite of local branch"
 msgstr ""
 
 msgid "force overwrite of local branch"
 msgstr ""
 

-#: builtin/fetch.c:82
+#: builtin/fetch.c:97

 msgid "fetch from multiple remotes"
 msgstr ""
 
 msgid "fetch from multiple remotes"
 msgstr ""
 

-#: builtin/fetch.c:84
+#: builtin/fetch.c:99

 msgid "fetch all tags and associated objects"
 msgstr ""
 
 msgid "fetch all tags and associated objects"
 msgstr ""
 

-#: builtin/fetch.c:86
+#: builtin/fetch.c:101

 msgid "do not fetch all tags (--no-tags)"
 msgstr ""
 
 msgid "do not fetch all tags (--no-tags)"
 msgstr ""
 

-#: builtin/fetch.c:88
+#: builtin/fetch.c:103

 msgid "prune remote-tracking branches no longer on remote"
 msgstr ""
 
 msgid "prune remote-tracking branches no longer on remote"
 msgstr ""
 

-#: builtin/fetch.c:89
+#: builtin/fetch.c:104

 msgid "on-demand"
 msgstr ""
 
 msgid "on-demand"
 msgstr ""
 

-#: builtin/fetch.c:90
+#: builtin/fetch.c:105

 msgid "control recursive fetching of submodules"
 msgstr ""
 
 msgid "control recursive fetching of submodules"
 msgstr ""
 

-#: builtin/fetch.c:94
+#: builtin/fetch.c:109

 msgid "keep downloaded pack"
 msgstr ""
 
 msgid "keep downloaded pack"
 msgstr ""
 

-#: builtin/fetch.c:96
+#: builtin/fetch.c:111

 msgid "allow updating of HEAD ref"
 msgstr ""
 
 msgid "allow updating of HEAD ref"
 msgstr ""
 

-#: builtin/fetch.c:99
+#: builtin/fetch.c:114

 msgid "deepen history of shallow clone"
 msgstr ""
 
 msgid "deepen history of shallow clone"
 msgstr ""
 

-#: builtin/fetch.c:101
+#: builtin/fetch.c:116

 msgid "convert to a complete repository"
 msgstr ""
 
 msgid "convert to a complete repository"
 msgstr ""
 

-#: builtin/fetch.c:103 builtin/log.c:1197
+#: builtin/fetch.c:118 builtin/log.c:1205

 msgid "dir"
 msgstr ""
 
 msgid "dir"
 msgstr ""
 

-#: builtin/fetch.c:104
+#: builtin/fetch.c:119

 msgid "prepend this to submodule path output"
 msgstr ""
 
 msgid "prepend this to submodule path output"
 msgstr ""
 

-#: builtin/fetch.c:107
+#: builtin/fetch.c:122

 msgid "default mode for recursion"
 msgstr ""
 
 msgid "default mode for recursion"
 msgstr ""
 

-#: builtin/fetch.c:109
+#: builtin/fetch.c:124

 msgid "accept refs that update .git/shallow"
 msgstr ""
 
 msgid "accept refs that update .git/shallow"
 msgstr ""
 

-#: builtin/fetch.c:347
+#: builtin/fetch.c:125
+msgid "refmap"
+msgstr ""
+
+#: builtin/fetch.c:126
+msgid "specify fetch refmap"
+msgstr ""
+
+#: builtin/fetch.c:376

 msgid "Couldn't find remote ref HEAD"
 msgstr ""
 
 msgid "Couldn't find remote ref HEAD"
 msgstr ""
 

-#: builtin/fetch.c:411
+#: builtin/fetch.c:440

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

-#: builtin/fetch.c:416
+#: builtin/fetch.c:445

 msgid "[up to date]"
 msgstr ""
 
 msgid "[up to date]"
 msgstr ""
 

-#: builtin/fetch.c:430
+#: builtin/fetch.c:459

 #, c-format
 msgid "! %-*s %-*s -> %s  (can't fetch in current branch)"
 msgstr ""
 
 #, c-format
 msgid "! %-*s %-*s -> %s  (can't fetch in current branch)"
 msgstr ""
 

-#: builtin/fetch.c:431 builtin/fetch.c:517
+#: builtin/fetch.c:460 builtin/fetch.c:546

 msgid "[rejected]"
 msgstr ""
 
 msgid "[rejected]"
 msgstr ""
 

-#: builtin/fetch.c:442
+#: builtin/fetch.c:471

 msgid "[tag update]"
 msgstr ""
 
 msgid "[tag update]"
 msgstr ""
 

-#: builtin/fetch.c:444 builtin/fetch.c:479 builtin/fetch.c:497
+#: builtin/fetch.c:473 builtin/fetch.c:508 builtin/fetch.c:526

 msgid "  (unable to update local ref)"
 msgstr ""
 
 msgid "  (unable to update local ref)"
 msgstr ""
 

-#: builtin/fetch.c:462
+#: builtin/fetch.c:491

 msgid "[new tag]"
 msgstr ""
 
 msgid "[new tag]"
 msgstr ""
 

-#: builtin/fetch.c:465
+#: builtin/fetch.c:494

 msgid "[new branch]"
 msgstr ""
 
 msgid "[new branch]"
 msgstr ""
 

-#: builtin/fetch.c:468
+#: builtin/fetch.c:497

 msgid "[new ref]"
 msgstr ""
 
 msgid "[new ref]"
 msgstr ""
 

-#: builtin/fetch.c:513
+#: builtin/fetch.c:542

 msgid "unable to update local ref"
 msgstr ""
 
 msgid "unable to update local ref"
 msgstr ""
 

-#: builtin/fetch.c:513
+#: builtin/fetch.c:542

 msgid "forced update"
 msgstr ""
 
 msgid "forced update"
 msgstr ""
 

-#: builtin/fetch.c:519
+#: builtin/fetch.c:548

 msgid "(non-fast-forward)"
 msgstr ""
 
 msgid "(non-fast-forward)"
 msgstr ""
 

-#: builtin/fetch.c:552 builtin/fetch.c:785
+#: builtin/fetch.c:581 builtin/fetch.c:814

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

-#: builtin/fetch.c:561
+#: builtin/fetch.c:590

 #, 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:579
+#: builtin/fetch.c:608

 #, 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:667 builtin/fetch.c:750
+#: builtin/fetch.c:696 builtin/fetch.c:779

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

-#: builtin/fetch.c:678
+#: builtin/fetch.c:707

 #, 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:730
+#: builtin/fetch.c:759

 #, c-format
 msgid "   (%s will become dangling)"
 msgstr ""
 
 #, c-format
 msgid "   (%s will become dangling)"
 msgstr ""
 

-#: builtin/fetch.c:731
+#: builtin/fetch.c:760

 #, c-format
 msgid "   (%s has become dangling)"
 msgstr ""
 
 #, c-format
 msgid "   (%s has become dangling)"
 msgstr ""
 

-#: builtin/fetch.c:755
+#: builtin/fetch.c:784

 msgid "[deleted]"
 msgstr ""
 
 msgid "[deleted]"
 msgstr ""
 

-#: builtin/fetch.c:756 builtin/remote.c:1050
+#: builtin/fetch.c:785 builtin/remote.c:1059

 msgid "(none)"
 msgstr ""
 
 msgid "(none)"
 msgstr ""
 

-#: builtin/fetch.c:775
+#: builtin/fetch.c:804

 #, 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:794
+#: builtin/fetch.c:823

 #, 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:797
+#: builtin/fetch.c:826

 #, 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:853
+#: builtin/fetch.c:882

 #, c-format
 msgid "Don't know how to fetch from %s"
 msgstr ""
 
 #, c-format
 msgid "Don't know how to fetch from %s"
 msgstr ""
 

-#: builtin/fetch.c:1015
+#: builtin/fetch.c:1044

 #, c-format
 msgid "Fetching %s\n"
 msgstr ""
 
 #, c-format
 msgid "Fetching %s\n"
 msgstr ""
 

-#: builtin/fetch.c:1017 builtin/remote.c:90
+#: builtin/fetch.c:1046 builtin/remote.c:90

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

-#: builtin/fetch.c:1035
+#: builtin/fetch.c:1064

 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:1059
+#: builtin/fetch.c:1087

 msgid "You need to specify a tag name."
 msgstr ""
 
 msgid "You need to specify a tag name."
 msgstr ""
 

-#: builtin/fetch.c:1107
+#: builtin/fetch.c:1131

 msgid "--depth and --unshallow cannot be used together"
 msgstr ""
 
 msgid "--depth and --unshallow cannot be used together"
 msgstr ""
 

-#: builtin/fetch.c:1109
+#: builtin/fetch.c:1133

 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:1132
+#: builtin/fetch.c:1156

 msgid "fetch --all does not take a repository argument"
 msgstr ""
 
 msgid "fetch --all does not take a repository argument"
 msgstr ""
 

-#: builtin/fetch.c:1134
+#: builtin/fetch.c:1158

 msgid "fetch --all does not make sense with refspecs"
 msgstr ""
 
 msgid "fetch --all does not make sense with refspecs"
 msgstr ""
 

-#: builtin/fetch.c:1145
+#: builtin/fetch.c:1169

 #, 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:1153
+#: builtin/fetch.c:1177

 msgid "Fetching a group and specifying refspecs does not make sense"
 msgstr ""
 
 msgid "Fetching a group and specifying refspecs does not make sense"
 msgstr ""
 


@@ -4949,9 +4999,9 @@ msgstr ""
 msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"
 msgstr ""
 
 msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"
 msgstr ""
 

-#: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:700
-#: builtin/merge.c:196 builtin/repack.c:175 builtin/repack.c:179
-#: builtin/show-branch.c:654 builtin/show-ref.c:178 builtin/tag.c:501
+#: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:698
+#: builtin/merge.c:196 builtin/repack.c:179 builtin/repack.c:183
+#: builtin/show-branch.c:654 builtin/show-ref.c:178 builtin/tag.c:589

 #: parse-options.h:132 parse-options.h:239
 msgid "n"
 msgstr ""
 #: parse-options.h:132 parse-options.h:239
 msgid "n"
 msgstr ""


@@ -4976,43 +5026,43 @@ msgstr ""
 msgid "file to read from"
 msgstr ""
 
 msgid "file to read from"
 msgstr ""
 

-#: builtin/for-each-ref.c:1063
+#: builtin/for-each-ref.c:1051

 msgid "git for-each-ref [options] [<pattern>]"
 msgstr ""
 
 msgid "git for-each-ref [options] [<pattern>]"
 msgstr ""
 

-#: builtin/for-each-ref.c:1078
+#: builtin/for-each-ref.c:1066

 msgid "quote placeholders suitably for shells"
 msgstr ""
 
 msgid "quote placeholders suitably for shells"
 msgstr ""
 

-#: builtin/for-each-ref.c:1080
+#: builtin/for-each-ref.c:1068

 msgid "quote placeholders suitably for perl"
 msgstr ""
 
 msgid "quote placeholders suitably for perl"
 msgstr ""
 

-#: builtin/for-each-ref.c:1082
+#: builtin/for-each-ref.c:1070

 msgid "quote placeholders suitably for python"
 msgstr ""
 
 msgid "quote placeholders suitably for python"
 msgstr ""
 

-#: builtin/for-each-ref.c:1084
+#: builtin/for-each-ref.c:1072

 msgid "quote placeholders suitably for tcl"
 msgstr ""
 
 msgid "quote placeholders suitably for tcl"
 msgstr ""
 

-#: builtin/for-each-ref.c:1087
+#: builtin/for-each-ref.c:1075

 msgid "show only <n> matched refs"
 msgstr ""
 
 msgid "show only <n> matched refs"
 msgstr ""
 

-#: builtin/for-each-ref.c:1088 builtin/replace.c:177
+#: builtin/for-each-ref.c:1076 builtin/replace.c:435

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

-#: builtin/for-each-ref.c:1088
+#: builtin/for-each-ref.c:1076

 msgid "format to use for the output"
 msgstr ""
 
 msgid "format to use for the output"
 msgstr ""
 

-#: builtin/for-each-ref.c:1089
+#: builtin/for-each-ref.c:1077

 msgid "key"
 msgstr ""
 
 msgid "key"
 msgstr ""
 

-#: builtin/for-each-ref.c:1090
+#: builtin/for-each-ref.c:1078

 msgid "field name to sort on"
 msgstr ""
 
 msgid "field name to sort on"
 msgstr ""
 


@@ -5020,55 +5070,55 @@ msgstr ""
 msgid "Checking connectivity"
 msgstr ""
 
 msgid "Checking connectivity"
 msgstr ""
 

-#: builtin/fsck.c:544
+#: builtin/fsck.c:538

 msgid "Checking object directories"
 msgstr ""
 
 msgid "Checking object directories"
 msgstr ""
 

-#: builtin/fsck.c:607
+#: builtin/fsck.c:601

 msgid "git fsck [options] [<object>...]"
 msgstr ""
 
 msgid "git fsck [options] [<object>...]"
 msgstr ""
 

-#: builtin/fsck.c:613
+#: builtin/fsck.c:607

 msgid "show unreachable objects"
 msgstr ""
 
 msgid "show unreachable objects"
 msgstr ""
 

-#: builtin/fsck.c:614
+#: builtin/fsck.c:608

 msgid "show dangling objects"
 msgstr ""
 
 msgid "show dangling objects"
 msgstr ""
 

-#: builtin/fsck.c:615
+#: builtin/fsck.c:609

 msgid "report tags"
 msgstr ""
 
 msgid "report tags"
 msgstr ""
 

-#: builtin/fsck.c:616
+#: builtin/fsck.c:610

 msgid "report root nodes"
 msgstr ""
 
 msgid "report root nodes"
 msgstr ""
 

-#: builtin/fsck.c:617
+#: builtin/fsck.c:611

 msgid "make index objects head nodes"
 msgstr ""
 
 msgid "make index objects head nodes"
 msgstr ""
 

-#: builtin/fsck.c:618
+#: builtin/fsck.c:612

 msgid "make reflogs head nodes (default)"
 msgstr ""
 
 msgid "make reflogs head nodes (default)"
 msgstr ""
 

-#: builtin/fsck.c:619
+#: builtin/fsck.c:613

 msgid "also consider packs and alternate objects"
 msgstr ""
 
 msgid "also consider packs and alternate objects"
 msgstr ""
 

-#: builtin/fsck.c:620
+#: builtin/fsck.c:614

 msgid "enable more strict checking"
 msgstr ""
 
 msgid "enable more strict checking"
 msgstr ""
 

-#: builtin/fsck.c:622
+#: builtin/fsck.c:616

 msgid "write dangling objects in .git/lost-found"
 msgstr ""
 
 msgid "write dangling objects in .git/lost-found"
 msgstr ""
 

-#: builtin/fsck.c:623 builtin/prune.c:144
+#: builtin/fsck.c:617 builtin/prune.c:144

 msgid "show progress"
 msgstr ""
 
 msgid "show progress"
 msgstr ""
 

-#: builtin/fsck.c:673
+#: builtin/fsck.c:667

 msgid "Checking objects"
 msgstr ""
 
 msgid "Checking objects"
 msgstr ""
 


@@ -5076,54 +5126,54 @@ msgstr ""
 msgid "git gc [options]"
 msgstr ""
 
 msgid "git gc [options]"
 msgstr ""
 

-#: builtin/gc.c:90
+#: builtin/gc.c:91

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

-#: builtin/gc.c:117
+#: builtin/gc.c:118

 #, c-format
 msgid "insanely long object directory %.*s"
 msgstr ""
 
 #, c-format
 msgid "insanely long object directory %.*s"
 msgstr ""
 

-#: builtin/gc.c:273
+#: builtin/gc.c:287

 msgid "prune unreferenced objects"
 msgstr ""
 
 msgid "prune unreferenced objects"
 msgstr ""
 

-#: builtin/gc.c:275
+#: builtin/gc.c:289

 msgid "be more thorough (increased runtime)"
 msgstr ""
 
 msgid "be more thorough (increased runtime)"
 msgstr ""
 

-#: builtin/gc.c:276
+#: builtin/gc.c:290

 msgid "enable auto-gc mode"
 msgstr ""
 
 msgid "enable auto-gc mode"
 msgstr ""
 

-#: builtin/gc.c:277
+#: builtin/gc.c:291

 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:318
+#: builtin/gc.c:332

 #, 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:320
+#: builtin/gc.c:334

 #, 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:321
+#: builtin/gc.c:335

 #, 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:336
+#: builtin/gc.c:353

 #, 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:361
+#: builtin/gc.c:375

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


@@ -5137,224 +5187,219 @@ msgstr ""
 msgid "grep: failed to create thread: %s"
 msgstr ""
 
 msgid "grep: failed to create thread: %s"
 msgstr ""
 

-#: builtin/grep.c:365
-#, c-format
-msgid "Failed to chdir: %s"
-msgstr ""
-
-#: builtin/grep.c:443 builtin/grep.c:478
+#: builtin/grep.c:441 builtin/grep.c:476

 #, c-format
 msgid "unable to read tree (%s)"
 msgstr ""
 
 #, c-format
 msgid "unable to read tree (%s)"
 msgstr ""
 

-#: builtin/grep.c:493
+#: builtin/grep.c:491

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

-#: builtin/grep.c:549
+#: builtin/grep.c:547

 #, c-format
 msgid "switch `%c' expects a numerical value"
 msgstr ""
 
 #, c-format
 msgid "switch `%c' expects a numerical value"
 msgstr ""
 

-#: builtin/grep.c:566
+#: builtin/grep.c:564

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

-#: builtin/grep.c:640
+#: builtin/grep.c:638

 msgid "search in index instead of in the work tree"
 msgstr ""
 
 msgid "search in index instead of in the work tree"
 msgstr ""
 

-#: builtin/grep.c:642
+#: builtin/grep.c:640

 msgid "find in contents not managed by git"
 msgstr ""
 
 msgid "find in contents not managed by git"
 msgstr ""
 

-#: builtin/grep.c:644
+#: builtin/grep.c:642

 msgid "search in both tracked and untracked files"
 msgstr ""
 
 msgid "search in both tracked and untracked files"
 msgstr ""
 

-#: builtin/grep.c:646
+#: builtin/grep.c:644

 msgid "search also in ignored files"
 msgstr ""
 
 msgid "search also in ignored files"
 msgstr ""
 

-#: builtin/grep.c:649
+#: builtin/grep.c:647

 msgid "show non-matching lines"
 msgstr ""
 
 msgid "show non-matching lines"
 msgstr ""
 

-#: builtin/grep.c:651
+#: builtin/grep.c:649

 msgid "case insensitive matching"
 msgstr ""
 
 msgid "case insensitive matching"
 msgstr ""
 

-#: builtin/grep.c:653
+#: builtin/grep.c:651

 msgid "match patterns only at word boundaries"
 msgstr ""
 
 msgid "match patterns only at word boundaries"
 msgstr ""
 

-#: builtin/grep.c:655
+#: builtin/grep.c:653

 msgid "process binary files as text"
 msgstr ""
 
 msgid "process binary files as text"
 msgstr ""
 

-#: builtin/grep.c:657
+#: builtin/grep.c:655

 msgid "don't match patterns in binary files"
 msgstr ""
 
 msgid "don't match patterns in binary files"
 msgstr ""
 

-#: builtin/grep.c:660
+#: builtin/grep.c:658

 msgid "process binary files with textconv filters"
 msgstr ""
 
 msgid "process binary files with textconv filters"
 msgstr ""
 

-#: builtin/grep.c:662
+#: builtin/grep.c:660

 msgid "descend at most <depth> levels"
 msgstr ""
 
 msgid "descend at most <depth> levels"
 msgstr ""
 

-#: builtin/grep.c:666
+#: builtin/grep.c:664

 msgid "use extended POSIX regular expressions"
 msgstr ""
 
 msgid "use extended POSIX regular expressions"
 msgstr ""
 

-#: builtin/grep.c:669
+#: builtin/grep.c:667

 msgid "use basic POSIX regular expressions (default)"
 msgstr ""
 
 msgid "use basic POSIX regular expressions (default)"
 msgstr ""
 

-#: builtin/grep.c:672
+#: builtin/grep.c:670

 msgid "interpret patterns as fixed strings"
 msgstr ""
 
 msgid "interpret patterns as fixed strings"
 msgstr ""
 

-#: builtin/grep.c:675
+#: builtin/grep.c:673

 msgid "use Perl-compatible regular expressions"
 msgstr ""
 
 msgid "use Perl-compatible regular expressions"
 msgstr ""
 

-#: builtin/grep.c:678
+#: builtin/grep.c:676

 msgid "show line numbers"
 msgstr ""
 
 msgid "show line numbers"
 msgstr ""
 

-#: builtin/grep.c:679
+#: builtin/grep.c:677

 msgid "don't show filenames"
 msgstr ""
 
 msgid "don't show filenames"
 msgstr ""
 

-#: builtin/grep.c:680
+#: builtin/grep.c:678

 msgid "show filenames"
 msgstr ""
 
 msgid "show filenames"
 msgstr ""
 

-#: builtin/grep.c:682
+#: builtin/grep.c:680

 msgid "show filenames relative to top directory"
 msgstr ""
 
 msgid "show filenames relative to top directory"
 msgstr ""
 

-#: builtin/grep.c:684
+#: builtin/grep.c:682

 msgid "show only filenames instead of matching lines"
 msgstr ""
 
 msgid "show only filenames instead of matching lines"
 msgstr ""
 

-#: builtin/grep.c:686
+#: builtin/grep.c:684

 msgid "synonym for --files-with-matches"
 msgstr ""
 
 msgid "synonym for --files-with-matches"
 msgstr ""
 

-#: builtin/grep.c:689
+#: builtin/grep.c:687

 msgid "show only the names of files without match"
 msgstr ""
 
 msgid "show only the names of files without match"
 msgstr ""
 

-#: builtin/grep.c:691
+#: builtin/grep.c:689

 msgid "print NUL after filenames"
 msgstr ""
 
 msgid "print NUL after filenames"
 msgstr ""
 

-#: builtin/grep.c:693
+#: builtin/grep.c:691

 msgid "show the number of matches instead of matching lines"
 msgstr ""
 
 msgid "show the number of matches instead of matching lines"
 msgstr ""
 

-#: builtin/grep.c:694
+#: builtin/grep.c:692

 msgid "highlight matches"
 msgstr ""
 
 msgid "highlight matches"
 msgstr ""
 

-#: builtin/grep.c:696
+#: builtin/grep.c:694

 msgid "print empty line between matches from different files"
 msgstr ""
 
 msgid "print empty line between matches from different files"
 msgstr ""
 

-#: builtin/grep.c:698
+#: builtin/grep.c:696

 msgid "show filename only once above matches from same file"
 msgstr ""
 
 msgid "show filename only once above matches from same file"
 msgstr ""
 

-#: builtin/grep.c:701
+#: builtin/grep.c:699

 msgid "show <n> context lines before and after matches"
 msgstr ""
 
 msgid "show <n> context lines before and after matches"
 msgstr ""
 

-#: builtin/grep.c:704
+#: builtin/grep.c:702

 msgid "show <n> context lines before matches"
 msgstr ""
 
 msgid "show <n> context lines before matches"
 msgstr ""
 

-#: builtin/grep.c:706
+#: builtin/grep.c:704

 msgid "show <n> context lines after matches"
 msgstr ""
 
 msgid "show <n> context lines after matches"
 msgstr ""
 

-#: builtin/grep.c:707
+#: builtin/grep.c:705

 msgid "shortcut for -C NUM"
 msgstr ""
 
 msgid "shortcut for -C NUM"
 msgstr ""
 

-#: builtin/grep.c:710
+#: builtin/grep.c:708

 msgid "show a line with the function name before matches"
 msgstr ""
 
 msgid "show a line with the function name before matches"
 msgstr ""
 

-#: builtin/grep.c:712
+#: builtin/grep.c:710

 msgid "show the surrounding function"
 msgstr ""
 
 msgid "show the surrounding function"
 msgstr ""
 

-#: builtin/grep.c:715
+#: builtin/grep.c:713

 msgid "read patterns from file"
 msgstr ""
 
 msgid "read patterns from file"
 msgstr ""
 

-#: builtin/grep.c:717
+#: builtin/grep.c:715

 msgid "match <pattern>"
 msgstr ""
 
 msgid "match <pattern>"
 msgstr ""
 

-#: builtin/grep.c:719
+#: builtin/grep.c:717

 msgid "combine patterns specified with -e"
 msgstr ""
 
 msgid "combine patterns specified with -e"
 msgstr ""
 

-#: builtin/grep.c:731
+#: builtin/grep.c:729

 msgid "indicate hit with exit status without output"
 msgstr ""
 
 msgid "indicate hit with exit status without output"
 msgstr ""
 

-#: builtin/grep.c:733
+#: builtin/grep.c:731

 msgid "show only matches from files that match all patterns"
 msgstr ""
 
 msgid "show only matches from files that match all patterns"
 msgstr ""
 

-#: builtin/grep.c:735
+#: builtin/grep.c:733

 msgid "show parse tree for grep expression"
 msgstr ""
 
 msgid "show parse tree for grep expression"
 msgstr ""
 

-#: builtin/grep.c:739
+#: builtin/grep.c:737

 msgid "pager"
 msgstr ""
 
 msgid "pager"
 msgstr ""
 

-#: builtin/grep.c:739
+#: builtin/grep.c:737

 msgid "show matching files in the pager"
 msgstr ""
 
 msgid "show matching files in the pager"
 msgstr ""
 

-#: builtin/grep.c:742
+#: builtin/grep.c:740

 msgid "allow calling of grep(1) (ignored by this build)"
 msgstr ""
 
 msgid "allow calling of grep(1) (ignored by this build)"
 msgstr ""
 

-#: builtin/grep.c:743 builtin/show-ref.c:187
+#: builtin/grep.c:741 builtin/show-ref.c:187

 msgid "show usage"
 msgstr ""
 
 msgid "show usage"
 msgstr ""
 

-#: builtin/grep.c:810
+#: builtin/grep.c:808

 msgid "no pattern given."
 msgstr ""
 
 msgid "no pattern given."
 msgstr ""
 

-#: builtin/grep.c:868
+#: builtin/grep.c:866

 msgid "--open-files-in-pager only works on the worktree"
 msgstr ""
 
 msgid "--open-files-in-pager only works on the worktree"
 msgstr ""
 

-#: builtin/grep.c:891
+#: builtin/grep.c:892

 msgid "--cached or --untracked cannot be used with --no-index."
 msgstr ""
 
 msgid "--cached or --untracked cannot be used with --no-index."
 msgstr ""
 

-#: builtin/grep.c:896
+#: builtin/grep.c:897

 msgid "--no-index or --untracked cannot be used with revs."
 msgstr ""
 
 msgid "--no-index or --untracked cannot be used with revs."
 msgstr ""
 

-#: builtin/grep.c:899
+#: builtin/grep.c:900

 msgid "--[no-]exclude-standard cannot be used for tracked contents."
 msgstr ""
 
 msgid "--[no-]exclude-standard cannot be used for tracked contents."
 msgstr ""
 

-#: builtin/grep.c:907
+#: builtin/grep.c:908

 msgid "both --cached and trees are given."
 msgstr ""
 
 msgid "both --cached and trees are given."
 msgstr ""
 


@@ -5368,7 +5413,7 @@ msgstr ""
 msgid "git hash-object  --stdin-paths < <list-of-paths>"
 msgstr ""
 
 msgid "git hash-object  --stdin-paths < <list-of-paths>"
 msgstr ""
 

-#: builtin/hash-object.c:72 builtin/tag.c:521
+#: builtin/hash-object.c:72 builtin/tag.c:609

 msgid "type"
 msgstr ""
 
 msgid "type"
 msgstr ""
 


@@ -5508,280 +5553,291 @@ msgstr ""
 msgid "`git %s' is aliased to `%s'"
 msgstr ""
 
 msgid "`git %s' is aliased to `%s'"
 msgstr ""
 

-#: builtin/index-pack.c:184
+#: builtin/index-pack.c:145
+#, c-format
+msgid "unable to open %s"
+msgstr ""
+
+#: builtin/index-pack.c:191

 #, c-format
 msgid "object type mismatch at %s"
 msgstr ""
 
 #, c-format
 msgid "object type mismatch at %s"
 msgstr ""
 

-#: builtin/index-pack.c:204
-msgid "object of unexpected type"
+#: builtin/index-pack.c:211
+#, c-format
+msgid "did not receive expected object %s"
+msgstr ""
+
+#: builtin/index-pack.c:214
+#, c-format
+msgid "object %s: expected type %s, found %s"

 msgstr ""
 
 msgstr ""
 

-#: builtin/index-pack.c:244
+#: builtin/index-pack.c:256

 #, 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:254
+#: builtin/index-pack.c:266

 msgid "early EOF"
 msgstr ""
 
 msgid "early EOF"
 msgstr ""
 

-#: builtin/index-pack.c:255
+#: builtin/index-pack.c:267

 msgid "read error on input"
 msgstr ""
 
 msgid "read error on input"
 msgstr ""
 

-#: builtin/index-pack.c:267
+#: builtin/index-pack.c:279

 msgid "used more bytes than were available"
 msgstr ""
 
 msgid "used more bytes than were available"
 msgstr ""
 

-#: builtin/index-pack.c:274
+#: builtin/index-pack.c:286

 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:290
+#: builtin/index-pack.c:302

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

-#: builtin/index-pack.c:295
+#: builtin/index-pack.c:307

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

-#: builtin/index-pack.c:309
+#: builtin/index-pack.c:321

 msgid "pack signature mismatch"
 msgstr ""
 
 msgid "pack signature mismatch"
 msgstr ""
 

-#: builtin/index-pack.c:311
+#: builtin/index-pack.c:323

 #, c-format
 msgid "pack version %<PRIu32> unsupported"
 msgstr ""
 
 #, c-format
 msgid "pack version %<PRIu32> unsupported"
 msgstr ""
 

-#: builtin/index-pack.c:329
+#: builtin/index-pack.c:341

 #, c-format
 msgid "pack has bad object at offset %lu: %s"
 msgstr ""
 
 #, c-format
 msgid "pack has bad object at offset %lu: %s"
 msgstr ""
 

-#: builtin/index-pack.c:451
+#: builtin/index-pack.c:462

 #, c-format
 msgid "inflate returned %d"
 msgstr ""
 
 #, c-format
 msgid "inflate returned %d"
 msgstr ""
 

-#: builtin/index-pack.c:500
+#: builtin/index-pack.c:511

 msgid "offset value overflow for delta base object"
 msgstr ""
 
 msgid "offset value overflow for delta base object"
 msgstr ""
 

-#: builtin/index-pack.c:508
+#: builtin/index-pack.c:519

 msgid "delta base offset is out of bound"
 msgstr ""
 
 msgid "delta base offset is out of bound"
 msgstr ""
 

-#: builtin/index-pack.c:516
+#: builtin/index-pack.c:527

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

-#: builtin/index-pack.c:547
+#: builtin/index-pack.c:558

 msgid "cannot pread pack file"
 msgstr ""
 
 msgid "cannot pread pack file"
 msgstr ""
 

-#: builtin/index-pack.c:549
+#: builtin/index-pack.c:560

 #, c-format
 msgid "premature end of pack file, %lu byte missing"
 msgid_plural "premature end of pack file, %lu bytes missing"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
 msgid "premature end of pack file, %lu byte missing"
 msgid_plural "premature end of pack file, %lu bytes missing"
 msgstr[0] ""
 msgstr[1] ""
 

-#: builtin/index-pack.c:575
+#: builtin/index-pack.c:586

 msgid "serious inflate inconsistency"
 msgstr ""
 
 msgid "serious inflate inconsistency"
 msgstr ""
 

-#: builtin/index-pack.c:666 builtin/index-pack.c:672 builtin/index-pack.c:695
-#: builtin/index-pack.c:729 builtin/index-pack.c:738
+#: builtin/index-pack.c:677 builtin/index-pack.c:683 builtin/index-pack.c:706
+#: builtin/index-pack.c:740 builtin/index-pack.c:749

 #, c-format
 msgid "SHA1 COLLISION FOUND WITH %s !"
 msgstr ""
 
 #, c-format
 msgid "SHA1 COLLISION FOUND WITH %s !"
 msgstr ""
 

-#: builtin/index-pack.c:669 builtin/pack-objects.c:162
+#: builtin/index-pack.c:680 builtin/pack-objects.c:162

 #: builtin/pack-objects.c:254
 #, c-format
 msgid "unable to read %s"
 msgstr ""
 
 #: builtin/pack-objects.c:254
 #, c-format
 msgid "unable to read %s"
 msgstr ""
 

-#: builtin/index-pack.c:735
+#: builtin/index-pack.c:746

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

-#: builtin/index-pack.c:749
+#: builtin/index-pack.c:760

 #, c-format
 msgid "invalid blob object %s"
 msgstr ""
 
 #, c-format
 msgid "invalid blob object %s"
 msgstr ""
 

-#: builtin/index-pack.c:763
+#: builtin/index-pack.c:774

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

-#: builtin/index-pack.c:766
+#: builtin/index-pack.c:777

 msgid "Error in object"
 msgstr ""
 
 msgid "Error in object"
 msgstr ""
 

-#: builtin/index-pack.c:768
+#: builtin/index-pack.c:779

 #, 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:839 builtin/index-pack.c:869
+#: builtin/index-pack.c:851 builtin/index-pack.c:881

 msgid "failed to apply delta"
 msgstr ""
 
 msgid "failed to apply delta"
 msgstr ""
 

-#: builtin/index-pack.c:1010
+#: builtin/index-pack.c:1022

 msgid "Receiving objects"
 msgstr ""
 
 msgid "Receiving objects"
 msgstr ""
 

-#: builtin/index-pack.c:1010
+#: builtin/index-pack.c:1022

 msgid "Indexing objects"
 msgstr ""
 
 msgid "Indexing objects"
 msgstr ""
 

-#: builtin/index-pack.c:1036
+#: builtin/index-pack.c:1048

 msgid "pack is corrupted (SHA1 mismatch)"
 msgstr ""
 
 msgid "pack is corrupted (SHA1 mismatch)"
 msgstr ""
 

-#: builtin/index-pack.c:1041
+#: builtin/index-pack.c:1053

 msgid "cannot fstat packfile"
 msgstr ""
 
 msgid "cannot fstat packfile"
 msgstr ""
 

-#: builtin/index-pack.c:1044
+#: builtin/index-pack.c:1056

 msgid "pack has junk at the end"
 msgstr ""
 
 msgid "pack has junk at the end"
 msgstr ""
 

-#: builtin/index-pack.c:1055
+#: builtin/index-pack.c:1067

 msgid "confusion beyond insanity in parse_pack_objects()"
 msgstr ""
 
 msgid "confusion beyond insanity in parse_pack_objects()"
 msgstr ""
 

-#: builtin/index-pack.c:1078
+#: builtin/index-pack.c:1090

 msgid "Resolving deltas"
 msgstr ""
 
 msgid "Resolving deltas"
 msgstr ""
 

-#: builtin/index-pack.c:1088
+#: builtin/index-pack.c:1100

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

-#: builtin/index-pack.c:1130
+#: builtin/index-pack.c:1142

 msgid "confusion beyond insanity"
 msgstr ""
 
 msgid "confusion beyond insanity"
 msgstr ""
 

-#: builtin/index-pack.c:1138
+#: builtin/index-pack.c:1150

 #, c-format
 msgid "completed with %d local objects"
 msgstr ""
 
 #, c-format
 msgid "completed with %d local objects"
 msgstr ""
 

-#: builtin/index-pack.c:1148
+#: builtin/index-pack.c:1160

 #, 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:1152
+#: builtin/index-pack.c:1164

 #, 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:1177
+#: builtin/index-pack.c:1189

 #, c-format
 msgid "unable to deflate appended object (%d)"
 msgstr ""
 
 #, c-format
 msgid "unable to deflate appended object (%d)"
 msgstr ""
 

-#: builtin/index-pack.c:1256
+#: builtin/index-pack.c:1268

 #, c-format
 msgid "local object %s is corrupt"
 msgstr ""
 
 #, c-format
 msgid "local object %s is corrupt"
 msgstr ""
 

-#: builtin/index-pack.c:1280
+#: builtin/index-pack.c:1292

 msgid "error while closing pack file"
 msgstr ""
 
 msgid "error while closing pack file"
 msgstr ""
 

-#: builtin/index-pack.c:1293
+#: builtin/index-pack.c:1305

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

-#: builtin/index-pack.c:1301
+#: builtin/index-pack.c:1313

 #, c-format
 msgid "cannot close written keep file '%s'"
 msgstr ""
 
 #, c-format
 msgid "cannot close written keep file '%s'"
 msgstr ""
 

-#: builtin/index-pack.c:1314
+#: builtin/index-pack.c:1326

 msgid "cannot store pack file"
 msgstr ""
 
 msgid "cannot store pack file"
 msgstr ""
 

-#: builtin/index-pack.c:1325
+#: builtin/index-pack.c:1337

 msgid "cannot store index file"
 msgstr ""
 
 msgid "cannot store index file"
 msgstr ""
 

-#: builtin/index-pack.c:1358
+#: builtin/index-pack.c:1370

 #, c-format
 msgid "bad pack.indexversion=%<PRIu32>"
 msgstr ""
 
 #, c-format
 msgid "bad pack.indexversion=%<PRIu32>"
 msgstr ""
 

-#: builtin/index-pack.c:1364
+#: builtin/index-pack.c:1376

 #, c-format
 msgid "invalid number of threads specified (%d)"
 msgstr ""
 
 #, c-format
 msgid "invalid number of threads specified (%d)"
 msgstr ""
 

-#: builtin/index-pack.c:1368 builtin/index-pack.c:1546
+#: builtin/index-pack.c:1380 builtin/index-pack.c:1559

 #, c-format
 msgid "no threads support, ignoring %s"
 msgstr ""
 
 #, c-format
 msgid "no threads support, ignoring %s"
 msgstr ""
 

-#: builtin/index-pack.c:1426
+#: builtin/index-pack.c:1438

 #, c-format
 msgid "Cannot open existing pack file '%s'"
 msgstr ""
 
 #, c-format
 msgid "Cannot open existing pack file '%s'"
 msgstr ""
 

-#: builtin/index-pack.c:1428
+#: builtin/index-pack.c:1440

 #, 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:1475
+#: builtin/index-pack.c:1487

 #, 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:1482
+#: builtin/index-pack.c:1494

 #, 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:1510
+#: builtin/index-pack.c:1523

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

-#: builtin/index-pack.c:1558 builtin/index-pack.c:1561
-#: builtin/index-pack.c:1573 builtin/index-pack.c:1577
+#: builtin/index-pack.c:1571 builtin/index-pack.c:1574
+#: builtin/index-pack.c:1586 builtin/index-pack.c:1590

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

-#: builtin/index-pack.c:1591
+#: builtin/index-pack.c:1604

 msgid "--fix-thin cannot be used without --stdin"
 msgstr ""
 
 msgid "--fix-thin cannot be used without --stdin"
 msgstr ""
 

-#: builtin/index-pack.c:1595 builtin/index-pack.c:1605
+#: builtin/index-pack.c:1608 builtin/index-pack.c:1617

 #, 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:1614
+#: builtin/index-pack.c:1625

 msgid "--verify with no packfile name given"
 msgstr ""
 
 msgid "--verify with no packfile name given"
 msgstr ""
 


@@ -5908,7 +5964,7 @@ 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:491 builtin/prune-packed.c:79 builtin/repack.c:168
+#: builtin/init-db.c:491 builtin/prune-packed.c:79 builtin/repack.c:172

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


@@ -5946,38 +6002,38 @@ msgstr ""
 msgid "   or: git show [options] <object>..."
 msgstr ""
 
 msgid "   or: git show [options] <object>..."
 msgstr ""
 

-#: builtin/log.c:125
+#: builtin/log.c:127

 msgid "suppress diff output"
 msgstr ""
 
 msgid "suppress diff output"
 msgstr ""
 

-#: builtin/log.c:126
+#: builtin/log.c:128

 msgid "show source"
 msgstr ""
 
 msgid "show source"
 msgstr ""
 

-#: builtin/log.c:127
+#: builtin/log.c:129

 msgid "Use mail map file"
 msgstr ""
 
 msgid "Use mail map file"
 msgstr ""
 

-#: builtin/log.c:128
+#: builtin/log.c:130

 msgid "decorate options"
 msgstr ""
 
 msgid "decorate options"
 msgstr ""
 

-#: builtin/log.c:231
+#: builtin/log.c:229

 #, c-format
 msgid "Final output: %d %s\n"
 msgstr ""
 
 #, c-format
 msgid "Final output: %d %s\n"
 msgstr ""
 

-#: builtin/log.c:473 builtin/log.c:565
+#: builtin/log.c:470 builtin/log.c:562

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

-#: builtin/log.c:589
+#: builtin/log.c:586

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

-#: builtin/log.c:689
+#: builtin/log.c:687

 msgid "format.headers without value"
 msgstr ""
 
 msgid "format.headers without value"
 msgstr ""
 


@@ -5998,200 +6054,209 @@ msgstr ""
 msgid "Not a range."
 msgstr ""
 
 msgid "Not a range."
 msgstr ""
 

-#: builtin/log.c:911
+#: builtin/log.c:916

 msgid "Cover letter needs email format"
 msgstr ""
 
 msgid "Cover letter needs email format"
 msgstr ""
 

-#: builtin/log.c:987
+#: builtin/log.c:995

 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr ""
 
 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr ""
 

-#: builtin/log.c:1015
+#: builtin/log.c:1023

 msgid "git format-patch [options] [<since> | <revision range>]"
 msgstr ""
 
 msgid "git format-patch [options] [<since> | <revision range>]"
 msgstr ""
 

-#: builtin/log.c:1060
+#: builtin/log.c:1068

 msgid "Two output directories?"
 msgstr ""
 
 msgid "Two output directories?"
 msgstr ""
 

-#: builtin/log.c:1175
+#: builtin/log.c:1183

 msgid "use [PATCH n/m] even with a single patch"
 msgstr ""
 
 msgid "use [PATCH n/m] even with a single patch"
 msgstr ""
 

-#: builtin/log.c:1178
+#: builtin/log.c:1186

 msgid "use [PATCH] even with multiple patches"
 msgstr ""
 
 msgid "use [PATCH] even with multiple patches"
 msgstr ""
 

-#: builtin/log.c:1182
+#: builtin/log.c:1190

 msgid "print patches to standard out"
 msgstr ""
 
 msgid "print patches to standard out"
 msgstr ""
 

-#: builtin/log.c:1184
+#: builtin/log.c:1192

 msgid "generate a cover letter"
 msgstr ""
 
 msgid "generate a cover letter"
 msgstr ""
 

-#: builtin/log.c:1186
+#: builtin/log.c:1194

 msgid "use simple number sequence for output file names"
 msgstr ""
 
 msgid "use simple number sequence for output file names"
 msgstr ""
 

-#: builtin/log.c:1187
+#: builtin/log.c:1195

 msgid "sfx"
 msgstr ""
 
 msgid "sfx"
 msgstr ""
 

-#: builtin/log.c:1188
+#: builtin/log.c:1196

 msgid "use <sfx> instead of '.patch'"
 msgstr ""
 
 msgid "use <sfx> instead of '.patch'"
 msgstr ""
 

-#: builtin/log.c:1190
+#: builtin/log.c:1198

 msgid "start numbering patches at <n> instead of 1"
 msgstr ""
 
 msgid "start numbering patches at <n> instead of 1"
 msgstr ""
 

-#: builtin/log.c:1192
+#: builtin/log.c:1200

 msgid "mark the series as Nth re-roll"
 msgstr ""
 
 msgid "mark the series as Nth re-roll"
 msgstr ""
 

-#: builtin/log.c:1194
+#: builtin/log.c:1202

 msgid "Use [<prefix>] instead of [PATCH]"
 msgstr ""
 
 msgid "Use [<prefix>] instead of [PATCH]"
 msgstr ""
 

-#: builtin/log.c:1197
+#: builtin/log.c:1205

 msgid "store resulting files in <dir>"
 msgstr ""
 
 msgid "store resulting files in <dir>"
 msgstr ""
 

-#: builtin/log.c:1200
+#: builtin/log.c:1208

 msgid "don't strip/add [PATCH]"
 msgstr ""
 
 msgid "don't strip/add [PATCH]"
 msgstr ""
 

-#: builtin/log.c:1203
+#: builtin/log.c:1211

 msgid "don't output binary diffs"
 msgstr ""
 
 msgid "don't output binary diffs"
 msgstr ""
 

-#: builtin/log.c:1205
+#: builtin/log.c:1213

 msgid "don't include a patch matching a commit upstream"
 msgstr ""
 
 msgid "don't include a patch matching a commit upstream"
 msgstr ""
 

-#: builtin/log.c:1207
+#: builtin/log.c:1215

 msgid "show patch format instead of default (patch + stat)"
 msgstr ""
 
 msgid "show patch format instead of default (patch + stat)"
 msgstr ""
 

-#: builtin/log.c:1209
+#: builtin/log.c:1217

 msgid "Messaging"
 msgstr ""
 
 msgid "Messaging"
 msgstr ""
 

-#: builtin/log.c:1210
+#: builtin/log.c:1218

 msgid "header"
 msgstr ""
 
 msgid "header"
 msgstr ""
 

-#: builtin/log.c:1211
+#: builtin/log.c:1219

 msgid "add email header"
 msgstr ""
 
 msgid "add email header"
 msgstr ""
 

-#: builtin/log.c:1212 builtin/log.c:1214
+#: builtin/log.c:1220 builtin/log.c:1222

 msgid "email"
 msgstr ""
 
 msgid "email"
 msgstr ""
 

-#: builtin/log.c:1212
+#: builtin/log.c:1220

 msgid "add To: header"
 msgstr ""
 
 msgid "add To: header"
 msgstr ""
 

-#: builtin/log.c:1214
+#: builtin/log.c:1222

 msgid "add Cc: header"
 msgstr ""
 
 msgid "add Cc: header"
 msgstr ""
 

-#: builtin/log.c:1216
+#: builtin/log.c:1224

 msgid "ident"
 msgstr ""
 
 msgid "ident"
 msgstr ""
 

-#: builtin/log.c:1217
+#: builtin/log.c:1225

 msgid "set From address to <ident> (or committer ident if absent)"
 msgstr ""
 
 msgid "set From address to <ident> (or committer ident if absent)"
 msgstr ""
 

-#: builtin/log.c:1219
+#: builtin/log.c:1227

 msgid "message-id"
 msgstr ""
 
 msgid "message-id"
 msgstr ""
 

-#: builtin/log.c:1220
+#: builtin/log.c:1228

 msgid "make first mail a reply to <message-id>"
 msgstr ""
 
 msgid "make first mail a reply to <message-id>"
 msgstr ""
 

-#: builtin/log.c:1221 builtin/log.c:1224
+#: builtin/log.c:1229 builtin/log.c:1232

 msgid "boundary"
 msgstr ""
 
 msgid "boundary"
 msgstr ""
 

-#: builtin/log.c:1222
+#: builtin/log.c:1230

 msgid "attach the patch"
 msgstr ""
 
 msgid "attach the patch"
 msgstr ""
 

-#: builtin/log.c:1225
+#: builtin/log.c:1233

 msgid "inline the patch"
 msgstr ""
 
 msgid "inline the patch"
 msgstr ""
 

-#: builtin/log.c:1229
+#: builtin/log.c:1237

 msgid "enable message threading, styles: shallow, deep"
 msgstr ""
 
 msgid "enable message threading, styles: shallow, deep"
 msgstr ""
 

-#: builtin/log.c:1231
+#: builtin/log.c:1239

 msgid "signature"
 msgstr ""
 
 msgid "signature"
 msgstr ""
 

-#: builtin/log.c:1232
+#: builtin/log.c:1240

 msgid "add a signature"
 msgstr ""
 
 msgid "add a signature"
 msgstr ""
 

-#: builtin/log.c:1233
+#: builtin/log.c:1242
+msgid "add a signature from a file"
+msgstr ""
+
+#: builtin/log.c:1243

 msgid "don't print the patch filenames"
 msgstr ""
 
 msgid "don't print the patch filenames"
 msgstr ""
 

-#: builtin/log.c:1307
+#: builtin/log.c:1317

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

-#: builtin/log.c:1322
+#: builtin/log.c:1332

 msgid "-n and -k are mutually exclusive."
 msgstr ""
 
 msgid "-n and -k are mutually exclusive."
 msgstr ""
 

-#: builtin/log.c:1324
+#: builtin/log.c:1334

 msgid "--subject-prefix and -k are mutually exclusive."
 msgstr ""
 
 msgid "--subject-prefix and -k are mutually exclusive."
 msgstr ""
 

-#: builtin/log.c:1332
+#: builtin/log.c:1342

 msgid "--name-only does not make sense"
 msgstr ""
 
 msgid "--name-only does not make sense"
 msgstr ""
 

-#: builtin/log.c:1334
+#: builtin/log.c:1344

 msgid "--name-status does not make sense"
 msgstr ""
 
 msgid "--name-status does not make sense"
 msgstr ""
 

-#: builtin/log.c:1336
+#: builtin/log.c:1346

 msgid "--check does not make sense"
 msgstr ""
 
 msgid "--check does not make sense"
 msgstr ""
 

-#: builtin/log.c:1359
+#: builtin/log.c:1369

 msgid "standard output, or directory, which one?"
 msgstr ""
 
 msgid "standard output, or directory, which one?"
 msgstr ""
 

-#: builtin/log.c:1361
+#: builtin/log.c:1371

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

-#: builtin/log.c:1509
+#: builtin/log.c:1468
+#, c-format
+msgid "unable to read signature file '%s'"
+msgstr ""
+
+#: builtin/log.c:1531

 msgid "Failed to create output files"
 msgstr ""
 
 msgid "Failed to create output files"
 msgstr ""
 

-#: builtin/log.c:1558
+#: builtin/log.c:1579

 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
 msgstr ""
 
 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
 msgstr ""
 

-#: builtin/log.c:1613
+#: builtin/log.c:1634

 #, c-format
 msgid ""
 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
 msgstr ""
 

-#: builtin/log.c:1626 builtin/log.c:1628 builtin/log.c:1640
+#: builtin/log.c:1647 builtin/log.c:1649 builtin/log.c:1661

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


@@ -6472,31 +6537,31 @@ msgstr ""
 msgid "git write-tree failed to write a tree"
 msgstr ""
 
 msgid "git write-tree failed to write a tree"
 msgstr ""
 

-#: builtin/merge.c:681
+#: builtin/merge.c:678

 msgid "Not handling anything other than two heads merge."
 msgstr ""
 
 msgid "Not handling anything other than two heads merge."
 msgstr ""
 

-#: builtin/merge.c:695
+#: builtin/merge.c:692

 #, c-format
 msgid "Unknown option for merge-recursive: -X%s"
 msgstr ""
 
 #, c-format
 msgid "Unknown option for merge-recursive: -X%s"
 msgstr ""
 

-#: builtin/merge.c:709
+#: builtin/merge.c:705

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

-#: builtin/merge.c:798
+#: builtin/merge.c:794

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

-#: builtin/merge.c:807
+#: builtin/merge.c:803

 #, 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:813
+#: builtin/merge.c:809

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


@@ -6506,156 +6571,156 @@ msgid ""
 "the commit.\n"
 msgstr ""
 
 "the commit.\n"
 msgstr ""
 

-#: builtin/merge.c:837
+#: builtin/merge.c:833

 msgid "Empty commit message."
 msgstr ""
 
 msgid "Empty commit message."
 msgstr ""
 

-#: builtin/merge.c:849
+#: builtin/merge.c:845

 #, c-format
 msgid "Wonderful.\n"
 msgstr ""
 
 #, c-format
 msgid "Wonderful.\n"
 msgstr ""
 

-#: builtin/merge.c:914
+#: builtin/merge.c:908

 #, 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:930
+#: builtin/merge.c:924

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

-#: builtin/merge.c:971
+#: builtin/merge.c:965

 msgid "No current branch."
 msgstr ""
 
 msgid "No current branch."
 msgstr ""
 

-#: builtin/merge.c:973
+#: builtin/merge.c:967

 msgid "No remote for the current branch."
 msgstr ""
 
 msgid "No remote for the current branch."
 msgstr ""
 

-#: builtin/merge.c:975
+#: builtin/merge.c:969

 msgid "No default upstream defined for the current branch."
 msgstr ""
 
 msgid "No default upstream defined for the current branch."
 msgstr ""
 

-#: builtin/merge.c:980
+#: builtin/merge.c:974

 #, 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:1136
+#: builtin/merge.c:1130

 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:1152 git-pull.sh:31
+#: builtin/merge.c:1146 git-pull.sh:31

 msgid ""
 "You have not concluded your merge (MERGE_HEAD exists).\n"
 "Please, commit your changes before you can merge."
 msgstr ""
 
 msgid ""
 "You have not concluded your merge (MERGE_HEAD exists).\n"
 "Please, commit your changes before you can merge."
 msgstr ""
 

-#: builtin/merge.c:1155 git-pull.sh:34
+#: builtin/merge.c:1149 git-pull.sh:34

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

-#: builtin/merge.c:1159
+#: builtin/merge.c:1153

 msgid ""
 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
 "Please, commit your changes before you can merge."
 msgstr ""
 
 msgid ""
 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
 "Please, commit your changes before you can merge."
 msgstr ""
 

-#: builtin/merge.c:1162
+#: builtin/merge.c:1156

 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:1171
+#: builtin/merge.c:1165

 msgid "You cannot combine --squash with --no-ff."
 msgstr ""
 
 msgid "You cannot combine --squash with --no-ff."
 msgstr ""
 

-#: builtin/merge.c:1180
+#: builtin/merge.c:1174

 msgid "No commit specified and merge.defaultToUpstream not set."
 msgstr ""
 
 msgid "No commit specified and merge.defaultToUpstream not set."
 msgstr ""
 

-#: builtin/merge.c:1212
+#: builtin/merge.c:1206

 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:1215
+#: builtin/merge.c:1209

 msgid "Squash commit into empty head not supported yet"
 msgstr ""
 
 msgid "Squash commit into empty head not supported yet"
 msgstr ""
 

-#: builtin/merge.c:1217
+#: builtin/merge.c:1211

 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:1222
+#: builtin/merge.c:1216

 #, c-format
 msgid "%s - not something we can merge"
 msgstr ""
 
 #, c-format
 msgid "%s - not something we can merge"
 msgstr ""
 

-#: builtin/merge.c:1273
+#: builtin/merge.c:1267

 #, 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:1276
+#: builtin/merge.c:1270

 #, 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:1279
+#: builtin/merge.c:1273

 #, 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:1282
+#: builtin/merge.c:1276

 #, 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:1366
+#: builtin/merge.c:1357

 #, c-format
 msgid "Updating %s..%s\n"
 msgstr ""
 
 #, c-format
 msgid "Updating %s..%s\n"
 msgstr ""
 

-#: builtin/merge.c:1405
+#: builtin/merge.c:1396

 #, 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:1412
+#: builtin/merge.c:1403

 #, c-format
 msgid "Nope.\n"
 msgstr ""
 
 #, c-format
 msgid "Nope.\n"
 msgstr ""
 

-#: builtin/merge.c:1444
+#: builtin/merge.c:1435

 msgid "Not possible to fast-forward, aborting."
 msgstr ""
 
 msgid "Not possible to fast-forward, aborting."
 msgstr ""
 

-#: builtin/merge.c:1467 builtin/merge.c:1546
+#: builtin/merge.c:1458 builtin/merge.c:1537

 #, c-format
 msgid "Rewinding the tree to pristine...\n"
 msgstr ""
 
 #, c-format
 msgid "Rewinding the tree to pristine...\n"
 msgstr ""
 

-#: builtin/merge.c:1471
+#: builtin/merge.c:1462

 #, c-format
 msgid "Trying merge strategy %s...\n"
 msgstr ""
 
 #, c-format
 msgid "Trying merge strategy %s...\n"
 msgstr ""
 

-#: builtin/merge.c:1537
+#: builtin/merge.c:1528

 #, 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:1539
+#: builtin/merge.c:1530

 #, c-format
 msgid "Merge with strategy %s failed.\n"
 msgstr ""
 
 #, c-format
 msgid "Merge with strategy %s failed.\n"
 msgstr ""
 

-#: builtin/merge.c:1548
+#: builtin/merge.c:1539

 #, 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:1560
+#: builtin/merge.c:1551

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


@@ -6805,79 +6870,79 @@ msgstr ""
 msgid "not under version control"
 msgstr ""
 
 msgid "not under version control"
 msgstr ""
 

-#: builtin/mv.c:207
+#: builtin/mv.c:208

 msgid "destination exists"
 msgstr ""
 
 msgid "destination exists"
 msgstr ""
 

-#: builtin/mv.c:215
+#: builtin/mv.c:216

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

-#: builtin/mv.c:218
+#: builtin/mv.c:219

 msgid "Cannot overwrite"
 msgstr ""
 
 msgid "Cannot overwrite"
 msgstr ""
 

-#: builtin/mv.c:221
+#: builtin/mv.c:222

 msgid "multiple sources for the same target"
 msgstr ""
 
 msgid "multiple sources for the same target"
 msgstr ""
 

-#: builtin/mv.c:223
+#: builtin/mv.c:224

 msgid "destination directory does not exist"
 msgstr ""
 
 msgid "destination directory does not exist"
 msgstr ""
 

-#: builtin/mv.c:243
+#: builtin/mv.c:244

 #, c-format
 msgid "%s, source=%s, destination=%s"
 msgstr ""
 
 #, c-format
 msgid "%s, source=%s, destination=%s"
 msgstr ""
 

-#: builtin/mv.c:253
+#: builtin/mv.c:254

 #, c-format
 msgid "Renaming %s to %s\n"
 msgstr ""
 
 #, c-format
 msgid "Renaming %s to %s\n"
 msgstr ""
 

-#: builtin/mv.c:256 builtin/remote.c:726 builtin/repack.c:355
+#: builtin/mv.c:257 builtin/remote.c:725 builtin/repack.c:358

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

-#: builtin/name-rev.c:258
+#: builtin/name-rev.c:255

 msgid "git name-rev [options] <commit>..."
 msgstr ""
 
 msgid "git name-rev [options] <commit>..."
 msgstr ""
 

-#: builtin/name-rev.c:259
+#: builtin/name-rev.c:256

 msgid "git name-rev [options] --all"
 msgstr ""
 
 msgid "git name-rev [options] --all"
 msgstr ""
 

-#: builtin/name-rev.c:260
+#: builtin/name-rev.c:257

 msgid "git name-rev [options] --stdin"
 msgstr ""
 
 msgid "git name-rev [options] --stdin"
 msgstr ""
 

-#: builtin/name-rev.c:312
+#: builtin/name-rev.c:309

 msgid "print only names (no SHA-1)"
 msgstr ""
 
 msgid "print only names (no SHA-1)"
 msgstr ""
 

-#: builtin/name-rev.c:313
+#: builtin/name-rev.c:310

 msgid "only use tags to name the commits"
 msgstr ""
 
 msgid "only use tags to name the commits"
 msgstr ""
 

-#: builtin/name-rev.c:315
+#: builtin/name-rev.c:312

 msgid "only use refs matching <pattern>"
 msgstr ""
 
 msgid "only use refs matching <pattern>"
 msgstr ""
 

-#: builtin/name-rev.c:317
+#: builtin/name-rev.c:314

 msgid "list all commits reachable from all refs"
 msgstr ""
 
 msgid "list all commits reachable from all refs"
 msgstr ""
 

-#: builtin/name-rev.c:318
+#: builtin/name-rev.c:315

 msgid "read from stdin"
 msgstr ""
 
 msgid "read from stdin"
 msgstr ""
 

-#: builtin/name-rev.c:319
+#: builtin/name-rev.c:316

 msgid "allow to print `undefined` names (default)"
 msgstr ""
 
 msgid "allow to print `undefined` names (default)"
 msgstr ""
 

-#: builtin/name-rev.c:325
+#: builtin/name-rev.c:322

 msgid "dereference tags in the input (internal use)"
 msgstr ""
 
 msgid "dereference tags in the input (internal use)"
 msgstr ""
 


@@ -7000,7 +7065,7 @@ msgstr ""
 msgid "failed to finish 'show' for object '%s'"
 msgstr ""
 
 msgid "failed to finish 'show' for object '%s'"
 msgstr ""
 

-#: builtin/notes.c:167 builtin/tag.c:373
+#: builtin/notes.c:167 builtin/tag.c:477

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


@@ -7023,12 +7088,12 @@ msgstr ""
 msgid "The note contents has been left in %s"
 msgstr ""
 
 msgid "The note contents has been left in %s"
 msgstr ""
 

-#: builtin/notes.c:248 builtin/tag.c:604
+#: builtin/notes.c:248 builtin/tag.c:692

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

-#: builtin/notes.c:250 builtin/tag.c:607
+#: builtin/notes.c:250 builtin/tag.c:695

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


@@ -7036,7 +7101,7 @@ msgstr ""
 #: builtin/notes.c:269 builtin/notes.c:320 builtin/notes.c:322
 #: builtin/notes.c:382 builtin/notes.c:436 builtin/notes.c:519
 #: builtin/notes.c:524 builtin/notes.c:599 builtin/notes.c:641
 #: builtin/notes.c:269 builtin/notes.c:320 builtin/notes.c:322
 #: builtin/notes.c:382 builtin/notes.c:436 builtin/notes.c:519
 #: builtin/notes.c:524 builtin/notes.c:599 builtin/notes.c:641

-#: builtin/notes.c:843 builtin/tag.c:620
+#: builtin/notes.c:843 builtin/tag.c:708

 #, c-format
 msgid "Failed to resolve '%s' as a valid ref."
 msgstr ""
 #, c-format
 msgid "Failed to resolve '%s' as a valid ref."
 msgstr ""


@@ -7081,7 +7146,7 @@ msgid "note contents in a file"
 msgstr ""
 
 #: builtin/notes.c:415 builtin/notes.c:418 builtin/notes.c:572
 msgstr ""
 
 #: builtin/notes.c:415 builtin/notes.c:418 builtin/notes.c:572

-#: builtin/notes.c:575 builtin/tag.c:539
+#: builtin/notes.c:575 builtin/tag.c:627

 msgid "object"
 msgstr ""
 
 msgid "object"
 msgstr ""
 


@@ -7191,7 +7256,7 @@ msgstr ""
 msgid "use notes from <notes_ref>"
 msgstr ""
 
 msgid "use notes from <notes_ref>"
 msgstr ""
 

-#: builtin/notes.c:978 builtin/remote.c:1593
+#: builtin/notes.c:978 builtin/remote.c:1616

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


@@ -7221,155 +7286,155 @@ msgstr ""
 msgid "Compressing objects"
 msgstr ""
 
 msgid "Compressing objects"
 msgstr ""
 

-#: builtin/pack-objects.c:2530
+#: builtin/pack-objects.c:2526

 #, c-format
 msgid "unsupported index version %s"
 msgstr ""
 
 #, c-format
 msgid "unsupported index version %s"
 msgstr ""
 

-#: builtin/pack-objects.c:2534
+#: builtin/pack-objects.c:2530

 #, c-format
 msgid "bad index version '%s'"
 msgstr ""
 
 #, c-format
 msgid "bad index version '%s'"
 msgstr ""
 

-#: builtin/pack-objects.c:2557
+#: builtin/pack-objects.c:2553

 #, c-format
 msgid "option %s does not accept negative form"
 msgstr ""
 
 #, c-format
 msgid "option %s does not accept negative form"
 msgstr ""
 

-#: builtin/pack-objects.c:2561
+#: builtin/pack-objects.c:2557

 #, c-format
 msgid "unable to parse value '%s' for option %s"
 msgstr ""
 
 #, c-format
 msgid "unable to parse value '%s' for option %s"
 msgstr ""
 

-#: builtin/pack-objects.c:2580
+#: builtin/pack-objects.c:2576

 msgid "do not show progress meter"
 msgstr ""
 
 msgid "do not show progress meter"
 msgstr ""
 

-#: builtin/pack-objects.c:2582
+#: builtin/pack-objects.c:2578

 msgid "show progress meter"
 msgstr ""
 
 msgid "show progress meter"
 msgstr ""
 

-#: builtin/pack-objects.c:2584
+#: builtin/pack-objects.c:2580

 msgid "show progress meter during object writing phase"
 msgstr ""
 
 msgid "show progress meter during object writing phase"
 msgstr ""
 

-#: builtin/pack-objects.c:2587
+#: builtin/pack-objects.c:2583

 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:2588
+#: builtin/pack-objects.c:2584

 msgid "version[,offset]"
 msgstr ""
 
 msgid "version[,offset]"
 msgstr ""
 

-#: builtin/pack-objects.c:2589
+#: builtin/pack-objects.c:2585

 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:2592
+#: builtin/pack-objects.c:2588

 msgid "maximum size of each output pack file"
 msgstr ""
 
 msgid "maximum size of each output pack file"
 msgstr ""
 

-#: builtin/pack-objects.c:2594
+#: builtin/pack-objects.c:2590

 msgid "ignore borrowed objects from alternate object store"
 msgstr ""
 
 msgid "ignore borrowed objects from alternate object store"
 msgstr ""
 

-#: builtin/pack-objects.c:2596
+#: builtin/pack-objects.c:2592

 msgid "ignore packed objects"
 msgstr ""
 
 msgid "ignore packed objects"
 msgstr ""
 

-#: builtin/pack-objects.c:2598
+#: builtin/pack-objects.c:2594

 msgid "limit pack window by objects"
 msgstr ""
 
 msgid "limit pack window by objects"
 msgstr ""
 

-#: builtin/pack-objects.c:2600
+#: builtin/pack-objects.c:2596

 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:2602
+#: builtin/pack-objects.c:2598

 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:2604
+#: builtin/pack-objects.c:2600

 msgid "reuse existing deltas"
 msgstr ""
 
 msgid "reuse existing deltas"
 msgstr ""
 

-#: builtin/pack-objects.c:2606
+#: builtin/pack-objects.c:2602

 msgid "reuse existing objects"
 msgstr ""
 
 msgid "reuse existing objects"
 msgstr ""
 

-#: builtin/pack-objects.c:2608
+#: builtin/pack-objects.c:2604

 msgid "use OFS_DELTA objects"
 msgstr ""
 
 msgid "use OFS_DELTA objects"
 msgstr ""
 

-#: builtin/pack-objects.c:2610
+#: builtin/pack-objects.c:2606

 msgid "use threads when searching for best delta matches"
 msgstr ""
 
 msgid "use threads when searching for best delta matches"
 msgstr ""
 

-#: builtin/pack-objects.c:2612
+#: builtin/pack-objects.c:2608

 msgid "do not create an empty pack output"
 msgstr ""
 
 msgid "do not create an empty pack output"
 msgstr ""
 

-#: builtin/pack-objects.c:2614
+#: builtin/pack-objects.c:2610

 msgid "read revision arguments from standard input"
 msgstr ""
 
 msgid "read revision arguments from standard input"
 msgstr ""
 

-#: builtin/pack-objects.c:2616
+#: builtin/pack-objects.c:2612

 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:2619
+#: builtin/pack-objects.c:2615

 msgid "include objects reachable from any reference"
 msgstr ""
 
 msgid "include objects reachable from any reference"
 msgstr ""
 

-#: builtin/pack-objects.c:2622
+#: builtin/pack-objects.c:2618

 msgid "include objects referred by reflog entries"
 msgstr ""
 
 msgid "include objects referred by reflog entries"
 msgstr ""
 

-#: builtin/pack-objects.c:2625
+#: builtin/pack-objects.c:2621

 msgid "output pack to stdout"
 msgstr ""
 
 msgid "output pack to stdout"
 msgstr ""
 

-#: builtin/pack-objects.c:2627
+#: builtin/pack-objects.c:2623

 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:2629
+#: builtin/pack-objects.c:2625

 msgid "keep unreachable objects"
 msgstr ""
 
 msgid "keep unreachable objects"
 msgstr ""
 

-#: builtin/pack-objects.c:2630 parse-options.h:140
+#: builtin/pack-objects.c:2626 parse-options.h:140

 msgid "time"
 msgstr ""
 
 msgid "time"
 msgstr ""
 

-#: builtin/pack-objects.c:2631
+#: builtin/pack-objects.c:2627

 msgid "unpack unreachable objects newer than <time>"
 msgstr ""
 
 msgid "unpack unreachable objects newer than <time>"
 msgstr ""
 

-#: builtin/pack-objects.c:2634
+#: builtin/pack-objects.c:2630

 msgid "create thin packs"
 msgstr ""
 
 msgid "create thin packs"
 msgstr ""
 

-#: builtin/pack-objects.c:2636
+#: builtin/pack-objects.c:2632

 msgid "ignore packs that have companion .keep file"
 msgstr ""
 
 msgid "ignore packs that have companion .keep file"
 msgstr ""
 

-#: builtin/pack-objects.c:2638
+#: builtin/pack-objects.c:2634

 msgid "pack compression level"
 msgstr ""
 
 msgid "pack compression level"
 msgstr ""
 

-#: builtin/pack-objects.c:2640
+#: builtin/pack-objects.c:2636

 msgid "do not hide commits by grafts"
 msgstr ""
 
 msgid "do not hide commits by grafts"
 msgstr ""
 

-#: builtin/pack-objects.c:2642
+#: builtin/pack-objects.c:2638

 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:2644
+#: builtin/pack-objects.c:2640

 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:2723
+#: builtin/pack-objects.c:2719

 msgid "Counting objects"
 msgstr ""
 
 msgid "Counting objects"
 msgstr ""
 


@@ -7421,13 +7486,13 @@ msgstr ""
 msgid "--delete only accepts plain target ref names"
 msgstr ""
 
 msgid "--delete only accepts plain target ref names"
 msgstr ""
 

-#: builtin/push.c:140
+#: builtin/push.c:139

 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:143
+#: builtin/push.c:142

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


@@ -7442,7 +7507,7 @@ msgid ""
 "%s"
 msgstr ""
 
 "%s"
 msgstr ""
 

-#: builtin/push.c:158
+#: builtin/push.c:157

 #, c-format
 msgid ""
 "You are not currently on a branch.\n"
 #, c-format
 msgid ""
 "You are not currently on a branch.\n"


@@ -7452,7 +7517,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:172
+#: builtin/push.c:171

 #, c-format
 msgid ""
 "The current branch %s has no upstream branch.\n"
 #, c-format
 msgid ""
 "The current branch %s has no upstream branch.\n"


@@ -7461,12 +7526,12 @@ msgid ""
 "    git push --set-upstream %s %s\n"
 msgstr ""
 
 "    git push --set-upstream %s %s\n"
 msgstr ""
 

-#: builtin/push.c:180
+#: builtin/push.c:179

 #, 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:183
+#: builtin/push.c:182

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


@@ -7474,7 +7539,7 @@ msgid ""
 "to update which remote branch."
 msgstr ""
 
 "to update which remote branch."
 msgstr ""
 

-#: builtin/push.c:206
+#: builtin/push.c:205

 msgid ""
 "push.default is unset; its implicit value has changed in\n"
 "Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
 msgid ""
 "push.default is unset; its implicit value has changed in\n"
 "Git 2.0 from 'matching' to 'simple'. To squelch this message\n"


@@ -7499,12 +7564,12 @@ msgid ""
 "'current' instead of 'simple' if you sometimes use older versions of Git)"
 msgstr ""
 
 "'current' instead of 'simple' if you sometimes use older versions of Git)"
 msgstr ""
 

-#: builtin/push.c:273
+#: builtin/push.c:272

 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:280
+#: builtin/push.c:279

 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"


@@ -7512,7 +7577,7 @@ msgid ""
 "See the 'Note about fast-forwards' in 'git push --help' for details."
 msgstr ""
 
 "See the 'Note about fast-forwards' in 'git push --help' for details."
 msgstr ""
 

-#: builtin/push.c:286
+#: builtin/push.c:285

 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"


@@ -7520,7 +7585,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:292
+#: builtin/push.c:291

 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"


@@ -7529,33 +7594,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:299
+#: builtin/push.c:298

 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:302
+#: builtin/push.c:301

 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:361
+#: builtin/push.c:360

 #, c-format
 msgid "Pushing to %s\n"
 msgstr ""
 
 #, c-format
 msgid "Pushing to %s\n"
 msgstr ""
 

-#: builtin/push.c:365
+#: builtin/push.c:364

 #, c-format
 msgid "failed to push some refs to '%s'"
 msgstr ""
 
 #, c-format
 msgid "failed to push some refs to '%s'"
 msgstr ""
 

-#: builtin/push.c:395
+#: builtin/push.c:394

 #, c-format
 msgid "bad repository '%s'"
 msgstr ""
 
 #, c-format
 msgid "bad repository '%s'"
 msgstr ""
 

-#: builtin/push.c:396
+#: builtin/push.c:395

 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 "


@@ -7568,95 +7633,95 @@ msgid ""
 "    git push <name>\n"
 msgstr ""
 
 "    git push <name>\n"
 msgstr ""
 

-#: builtin/push.c:411
+#: builtin/push.c:410

 msgid "--all and --tags are incompatible"
 msgstr ""
 
 msgid "--all and --tags are incompatible"
 msgstr ""
 

-#: builtin/push.c:412
+#: builtin/push.c:411

 msgid "--all can't be combined with refspecs"
 msgstr ""
 
 msgid "--all can't be combined with refspecs"
 msgstr ""
 

-#: builtin/push.c:417
+#: builtin/push.c:416

 msgid "--mirror and --tags are incompatible"
 msgstr ""
 
 msgid "--mirror and --tags are incompatible"
 msgstr ""
 

-#: builtin/push.c:418
+#: builtin/push.c:417

 msgid "--mirror can't be combined with refspecs"
 msgstr ""
 
 msgid "--mirror can't be combined with refspecs"
 msgstr ""
 

-#: builtin/push.c:423
+#: builtin/push.c:422

 msgid "--all and --mirror are incompatible"
 msgstr ""
 
 msgid "--all and --mirror are incompatible"
 msgstr ""
 

-#: builtin/push.c:483
+#: builtin/push.c:482

 msgid "repository"
 msgstr ""
 
 msgid "repository"
 msgstr ""
 

-#: builtin/push.c:484
+#: builtin/push.c:483

 msgid "push all refs"
 msgstr ""
 
 msgid "push all refs"
 msgstr ""
 

-#: builtin/push.c:485
+#: builtin/push.c:484

 msgid "mirror all refs"
 msgstr ""
 
 msgid "mirror all refs"
 msgstr ""
 

-#: builtin/push.c:487
+#: builtin/push.c:486

 msgid "delete refs"
 msgstr ""
 
 msgid "delete refs"
 msgstr ""
 

-#: builtin/push.c:488
+#: builtin/push.c:487

 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:491
+#: builtin/push.c:490

 msgid "force updates"
 msgstr ""
 
 msgid "force updates"
 msgstr ""
 

-#: builtin/push.c:493
+#: builtin/push.c:492

 msgid "refname>:<expect"
 msgstr ""
 
 msgid "refname>:<expect"
 msgstr ""
 

-#: builtin/push.c:494
+#: builtin/push.c:493

 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:496
+#: builtin/push.c:495

 msgid "check"
 msgstr ""
 
 msgid "check"
 msgstr ""
 

-#: builtin/push.c:497
+#: builtin/push.c:496

 msgid "control recursive pushing of submodules"
 msgstr ""
 
 msgid "control recursive pushing of submodules"
 msgstr ""
 

-#: builtin/push.c:499
+#: builtin/push.c:498

 msgid "use thin pack"
 msgstr ""
 
 msgid "use thin pack"
 msgstr ""
 

-#: builtin/push.c:500 builtin/push.c:501
+#: builtin/push.c:499 builtin/push.c:500

 msgid "receive pack program"
 msgstr ""
 
 msgid "receive pack program"
 msgstr ""
 

-#: builtin/push.c:502
+#: builtin/push.c:501

 msgid "set upstream for git pull/status"
 msgstr ""
 
 msgid "set upstream for git pull/status"
 msgstr ""
 

-#: builtin/push.c:505
+#: builtin/push.c:504

 msgid "prune locally removed refs"
 msgstr ""
 
 msgid "prune locally removed refs"
 msgstr ""
 

-#: builtin/push.c:507
+#: builtin/push.c:506

 msgid "bypass pre-push hook"
 msgstr ""
 
 msgid "bypass pre-push hook"
 msgstr ""
 

-#: builtin/push.c:508
+#: builtin/push.c:507

 msgid "push missing but relevant tags"
 msgstr ""
 
 msgid "push missing but relevant tags"
 msgstr ""
 

-#: builtin/push.c:518
+#: builtin/push.c:517

 msgid "--delete is incompatible with --all, --mirror and --tags"
 msgstr ""
 
 msgid "--delete is incompatible with --all, --mirror and --tags"
 msgstr ""
 

-#: builtin/push.c:520
+#: builtin/push.c:519

 msgid "--delete doesn't make sense without any refs"
 msgstr ""
 
 msgid "--delete doesn't make sense without any refs"
 msgstr ""
 


@@ -7872,12 +7937,12 @@ msgstr ""
 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:185 builtin/remote.c:641
+#: builtin/remote.c:185 builtin/remote.c:640

 #, c-format
 msgid "remote %s already exists."
 msgstr ""
 
 #, c-format
 msgid "remote %s already exists."
 msgstr ""
 

-#: builtin/remote.c:189 builtin/remote.c:645
+#: builtin/remote.c:189 builtin/remote.c:644

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


@@ -7887,45 +7952,45 @@ msgstr ""
 msgid "Could not setup master '%s'"
 msgstr ""
 
 msgid "Could not setup master '%s'"
 msgstr ""
 

-#: builtin/remote.c:289
+#: builtin/remote.c:288

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

-#: builtin/remote.c:334
+#: builtin/remote.c:333

 #, 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:435 builtin/remote.c:443
+#: builtin/remote.c:434 builtin/remote.c:442

 msgid "(matching)"
 msgstr ""
 
 msgid "(matching)"
 msgstr ""
 

-#: builtin/remote.c:447
+#: builtin/remote.c:446

 msgid "(delete)"
 msgstr ""
 
 msgid "(delete)"
 msgstr ""
 

-#: builtin/remote.c:590 builtin/remote.c:596 builtin/remote.c:602
+#: builtin/remote.c:589 builtin/remote.c:595 builtin/remote.c:601

 #, c-format
 msgid "Could not append '%s' to '%s'"
 msgstr ""
 
 #, c-format
 msgid "Could not append '%s' to '%s'"
 msgstr ""
 

-#: builtin/remote.c:634 builtin/remote.c:787 builtin/remote.c:885
+#: builtin/remote.c:633 builtin/remote.c:794 builtin/remote.c:894

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

-#: builtin/remote.c:651
+#: builtin/remote.c:650

 #, 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:657 builtin/remote.c:794
+#: builtin/remote.c:656 builtin/remote.c:846

 #, c-format
 msgid "Could not remove config section '%s'"
 msgstr ""
 
 #, c-format
 msgid "Could not remove config section '%s'"
 msgstr ""
 

-#: builtin/remote.c:672
+#: builtin/remote.c:671

 #, c-format
 msgid ""
 "Not updating non-default fetch refspec\n"
 #, c-format
 msgid ""
 "Not updating non-default fetch refspec\n"


@@ -7933,32 +7998,32 @@ msgid ""
 "\tPlease update the configuration manually if necessary."
 msgstr ""
 
 "\tPlease update the configuration manually if necessary."
 msgstr ""
 

-#: builtin/remote.c:678
+#: builtin/remote.c:677

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

-#: builtin/remote.c:689
+#: builtin/remote.c:688

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

-#: builtin/remote.c:711
+#: builtin/remote.c:710

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

-#: builtin/remote.c:745
+#: builtin/remote.c:744

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

-#: builtin/remote.c:759
+#: builtin/remote.c:765

 #, c-format
 msgid "Could not remove branch %s"
 msgstr ""
 
 #, c-format
 msgid "Could not remove branch %s"
 msgstr ""
 

-#: builtin/remote.c:829
+#: builtin/remote.c:832

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


@@ -7968,363 +8033,419 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
 msgstr[0] ""
 msgstr[1] ""
 

-#: builtin/remote.c:938
+#: builtin/remote.c:947

 #, 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:941
+#: builtin/remote.c:950

 msgid " tracked"
 msgstr ""
 
 msgid " tracked"
 msgstr ""
 

-#: builtin/remote.c:943
+#: builtin/remote.c:952

 msgid " stale (use 'git remote prune' to remove)"
 msgstr ""
 
 msgid " stale (use 'git remote prune' to remove)"
 msgstr ""
 

-#: builtin/remote.c:945
+#: builtin/remote.c:954

 msgid " ???"
 msgstr ""
 
 msgid " ???"
 msgstr ""
 

-#: builtin/remote.c:986
+#: builtin/remote.c:995

 #, 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:993
+#: builtin/remote.c:1002

 #, c-format
 msgid "rebases onto remote %s"
 msgstr ""
 
 #, c-format
 msgid "rebases onto remote %s"
 msgstr ""
 

-#: builtin/remote.c:996
+#: builtin/remote.c:1005

 #, c-format
 msgid " merges with remote %s"
 msgstr ""
 
 #, c-format
 msgid " merges with remote %s"
 msgstr ""
 

-#: builtin/remote.c:997
+#: builtin/remote.c:1006

 msgid "    and with remote"
 msgstr ""
 
 msgid "    and with remote"
 msgstr ""
 

-#: builtin/remote.c:999
+#: builtin/remote.c:1008

 #, c-format
 msgid "merges with remote %s"
 msgstr ""
 
 #, c-format
 msgid "merges with remote %s"
 msgstr ""
 

-#: builtin/remote.c:1000
+#: builtin/remote.c:1009

 msgid "   and with remote"
 msgstr ""
 
 msgid "   and with remote"
 msgstr ""
 

-#: builtin/remote.c:1046
+#: builtin/remote.c:1055

 msgid "create"
 msgstr ""
 
 msgid "create"
 msgstr ""
 

-#: builtin/remote.c:1049
+#: builtin/remote.c:1058

 msgid "delete"
 msgstr ""
 
 msgid "delete"
 msgstr ""
 

-#: builtin/remote.c:1053
+#: builtin/remote.c:1062

 msgid "up to date"
 msgstr ""
 
 msgid "up to date"
 msgstr ""
 

-#: builtin/remote.c:1056
+#: builtin/remote.c:1065

 msgid "fast-forwardable"
 msgstr ""
 
 msgid "fast-forwardable"
 msgstr ""
 

-#: builtin/remote.c:1059
+#: builtin/remote.c:1068

 msgid "local out of date"
 msgstr ""
 
 msgid "local out of date"
 msgstr ""
 

-#: builtin/remote.c:1066
+#: builtin/remote.c:1075

 #, c-format
 msgid "    %-*s forces to %-*s (%s)"
 msgstr ""
 
 #, c-format
 msgid "    %-*s forces to %-*s (%s)"
 msgstr ""
 

-#: builtin/remote.c:1069
+#: builtin/remote.c:1078

 #, c-format
 msgid "    %-*s pushes to %-*s (%s)"
 msgstr ""
 
 #, c-format
 msgid "    %-*s pushes to %-*s (%s)"
 msgstr ""
 

-#: builtin/remote.c:1073
+#: builtin/remote.c:1082

 #, c-format
 msgid "    %-*s forces to %s"
 msgstr ""
 
 #, c-format
 msgid "    %-*s forces to %s"
 msgstr ""
 

-#: builtin/remote.c:1076
+#: builtin/remote.c:1085

 #, c-format
 msgid "    %-*s pushes to %s"
 msgstr ""
 
 #, c-format
 msgid "    %-*s pushes to %s"
 msgstr ""
 

-#: builtin/remote.c:1144
+#: builtin/remote.c:1153

 msgid "do not query remotes"
 msgstr ""
 
 msgid "do not query remotes"
 msgstr ""
 

-#: builtin/remote.c:1171
+#: builtin/remote.c:1180

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

-#: builtin/remote.c:1172
+#: builtin/remote.c:1181

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

-#: builtin/remote.c:1173 builtin/remote.c:1318
+#: builtin/remote.c:1182 builtin/remote.c:1329

 msgid "(no URL)"
 msgstr ""
 
 msgid "(no URL)"
 msgstr ""
 

-#: builtin/remote.c:1182 builtin/remote.c:1184
+#: builtin/remote.c:1191 builtin/remote.c:1193

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

-#: builtin/remote.c:1186 builtin/remote.c:1188 builtin/remote.c:1190
+#: builtin/remote.c:1195 builtin/remote.c:1197 builtin/remote.c:1199

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

-#: builtin/remote.c:1192
+#: builtin/remote.c:1201

 #, 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:1204
+#: builtin/remote.c:1213

 #, 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:1207 builtin/remote.c:1234
+#: builtin/remote.c:1216 builtin/remote.c:1243

 msgid " (status not queried)"
 msgstr ""
 
 msgid " (status not queried)"
 msgstr ""
 

-#: builtin/remote.c:1216
+#: builtin/remote.c:1225

 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:1224
+#: builtin/remote.c:1233

 msgid "  Local refs will be mirrored by 'git push'"
 msgstr ""
 
 msgid "  Local refs will be mirrored by 'git push'"
 msgstr ""
 

-#: builtin/remote.c:1231
+#: builtin/remote.c:1240

 #, 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:1252
+#: builtin/remote.c:1261

 msgid "set refs/remotes/<name>/HEAD according to remote"
 msgstr ""
 
 msgid "set refs/remotes/<name>/HEAD according to remote"
 msgstr ""
 

-#: builtin/remote.c:1254
+#: builtin/remote.c:1263

 msgid "delete refs/remotes/<name>/HEAD"
 msgstr ""
 
 msgid "delete refs/remotes/<name>/HEAD"
 msgstr ""
 

-#: builtin/remote.c:1269
+#: builtin/remote.c:1278

 msgid "Cannot determine remote HEAD"
 msgstr ""
 
 msgid "Cannot determine remote HEAD"
 msgstr ""
 

-#: builtin/remote.c:1271
+#: builtin/remote.c:1280

 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:1281
+#: builtin/remote.c:1290

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

-#: builtin/remote.c:1289
+#: builtin/remote.c:1298

 #, c-format
 msgid "Not a valid ref: %s"
 msgstr ""
 
 #, c-format
 msgid "Not a valid ref: %s"
 msgstr ""
 

-#: builtin/remote.c:1291
+#: builtin/remote.c:1300

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

-#: builtin/remote.c:1307
+#: builtin/remote.c:1318

 #, c-format
 msgid " %s will become dangling!"
 msgstr ""
 
 #, c-format
 msgid " %s will become dangling!"
 msgstr ""
 

-#: builtin/remote.c:1308
+#: builtin/remote.c:1319

 #, c-format
 msgid " %s has become dangling!"
 msgstr ""
 
 #, c-format
 msgid " %s has become dangling!"
 msgstr ""
 

-#: builtin/remote.c:1314
+#: builtin/remote.c:1325

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

-#: builtin/remote.c:1315
+#: builtin/remote.c:1326

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

-#: builtin/remote.c:1328
+#: builtin/remote.c:1349

 #, c-format
 msgid " * [would prune] %s"
 msgstr ""
 
 #, c-format
 msgid " * [would prune] %s"
 msgstr ""
 

-#: builtin/remote.c:1331
+#: builtin/remote.c:1352

 #, c-format
 msgid " * [pruned] %s"
 msgstr ""
 
 #, c-format
 msgid " * [pruned] %s"
 msgstr ""
 

-#: builtin/remote.c:1374
+#: builtin/remote.c:1397

 msgid "prune remotes after fetching"
 msgstr ""
 
 msgid "prune remotes after fetching"
 msgstr ""
 

-#: builtin/remote.c:1440 builtin/remote.c:1514
+#: builtin/remote.c:1463 builtin/remote.c:1537

 #, c-format
 msgid "No such remote '%s'"
 msgstr ""
 
 #, c-format
 msgid "No such remote '%s'"
 msgstr ""
 

-#: builtin/remote.c:1460
+#: builtin/remote.c:1483

 msgid "add branch"
 msgstr ""
 
 msgid "add branch"
 msgstr ""
 

-#: builtin/remote.c:1467
+#: builtin/remote.c:1490

 msgid "no remote specified"
 msgstr ""
 
 msgid "no remote specified"
 msgstr ""
 

-#: builtin/remote.c:1489
+#: builtin/remote.c:1512

 msgid "manipulate push URLs"
 msgstr ""
 
 msgid "manipulate push URLs"
 msgstr ""
 

-#: builtin/remote.c:1491
+#: builtin/remote.c:1514

 msgid "add URL"
 msgstr ""
 
 msgid "add URL"
 msgstr ""
 

-#: builtin/remote.c:1493
+#: builtin/remote.c:1516

 msgid "delete URLs"
 msgstr ""
 
 msgid "delete URLs"
 msgstr ""
 

-#: builtin/remote.c:1500
+#: builtin/remote.c:1523

 msgid "--add --delete doesn't make sense"
 msgstr ""
 
 msgid "--add --delete doesn't make sense"
 msgstr ""
 

-#: builtin/remote.c:1540
+#: builtin/remote.c:1563

 #, c-format
 msgid "Invalid old URL pattern: %s"
 msgstr ""
 
 #, c-format
 msgid "Invalid old URL pattern: %s"
 msgstr ""
 

-#: builtin/remote.c:1548
+#: builtin/remote.c:1571

 #, c-format
 msgid "No such URL found: %s"
 msgstr ""
 
 #, c-format
 msgid "No such URL found: %s"
 msgstr ""
 

-#: builtin/remote.c:1550
+#: builtin/remote.c:1573

 msgid "Will not delete all non-push URLs"
 msgstr ""
 
 msgid "Will not delete all non-push URLs"
 msgstr ""
 

-#: builtin/remote.c:1564
+#: builtin/remote.c:1587

 msgid "be verbose; must be placed before a subcommand"
 msgstr ""
 
 msgid "be verbose; must be placed before a subcommand"
 msgstr ""
 

-#: builtin/repack.c:16
+#: builtin/repack.c:17

 msgid "git repack [options]"
 msgstr ""
 
 msgid "git repack [options]"
 msgstr ""
 

-#: builtin/repack.c:156
+#: builtin/repack.c:160

 msgid "pack everything in a single pack"
 msgstr ""
 
 msgid "pack everything in a single pack"
 msgstr ""
 

-#: builtin/repack.c:158
+#: builtin/repack.c:162

 msgid "same as -a, and turn unreachable objects loose"
 msgstr ""
 
 msgid "same as -a, and turn unreachable objects loose"
 msgstr ""
 

-#: builtin/repack.c:161
+#: builtin/repack.c:165

 msgid "remove redundant packs, and run git-prune-packed"
 msgstr ""
 
 msgid "remove redundant packs, and run git-prune-packed"
 msgstr ""
 

-#: builtin/repack.c:163
+#: builtin/repack.c:167

 msgid "pass --no-reuse-delta to git-pack-objects"
 msgstr ""
 
 msgid "pass --no-reuse-delta to git-pack-objects"
 msgstr ""
 

-#: builtin/repack.c:165
+#: builtin/repack.c:169

 msgid "pass --no-reuse-object to git-pack-objects"
 msgstr ""
 
 msgid "pass --no-reuse-object to git-pack-objects"
 msgstr ""
 

-#: builtin/repack.c:167
+#: builtin/repack.c:171

 msgid "do not run git-update-server-info"
 msgstr ""
 
 msgid "do not run git-update-server-info"
 msgstr ""
 

-#: builtin/repack.c:170
+#: builtin/repack.c:174

 msgid "pass --local to git-pack-objects"
 msgstr ""
 
 msgid "pass --local to git-pack-objects"
 msgstr ""
 

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

 msgid "write bitmap index"
 msgstr ""
 
 msgid "write bitmap index"
 msgstr ""
 

-#: builtin/repack.c:173
+#: builtin/repack.c:177

 msgid "approxidate"
 msgstr ""
 
 msgid "approxidate"
 msgstr ""
 

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

 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:176
+#: builtin/repack.c:180

 msgid "size of the window used for delta compression"
 msgstr ""
 
 msgid "size of the window used for delta compression"
 msgstr ""
 

-#: builtin/repack.c:177 builtin/repack.c:181
+#: builtin/repack.c:181 builtin/repack.c:185

 msgid "bytes"
 msgstr ""
 
 msgid "bytes"
 msgstr ""
 

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

 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:180
+#: builtin/repack.c:184

 msgid "limits the maximum delta depth"
 msgstr ""
 
 msgid "limits the maximum delta depth"
 msgstr ""
 

-#: builtin/repack.c:182
+#: builtin/repack.c:186

 msgid "maximum size of each packfile"
 msgstr ""
 
 msgid "maximum size of each packfile"
 msgstr ""
 

-#: builtin/repack.c:184
+#: builtin/repack.c:188

 msgid "repack objects in packs marked with .keep"
 msgstr ""
 
 msgid "repack objects in packs marked with .keep"
 msgstr ""
 

-#: builtin/repack.c:371
+#: builtin/repack.c:374

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

-#: builtin/replace.c:17
+#: builtin/replace.c:19

 msgid "git replace [-f] <object> <replacement>"
 msgstr ""
 
 msgid "git replace [-f] <object> <replacement>"
 msgstr ""
 

-#: builtin/replace.c:18
+#: builtin/replace.c:20
+msgid "git replace [-f] --edit <object>"
+msgstr ""
+
+#: builtin/replace.c:21
+msgid "git replace [-f] --graft <commit> [<parent>...]"
+msgstr ""
+
+#: builtin/replace.c:22

 msgid "git replace -d <object>..."
 msgstr ""
 
 msgid "git replace -d <object>..."
 msgstr ""
 

-#: builtin/replace.c:19
+#: builtin/replace.c:23

 msgid "git replace [--format=<format>] [-l [<pattern>]]"
 msgstr ""
 
 msgid "git replace [--format=<format>] [-l [<pattern>]]"
 msgstr ""
 

-#: builtin/replace.c:174
+#: builtin/replace.c:322 builtin/replace.c:360 builtin/replace.c:388
+#, c-format
+msgid "Not a valid object name: '%s'"
+msgstr ""
+
+#: builtin/replace.c:352
+#, c-format
+msgid "bad mergetag in commit '%s'"
+msgstr ""
+
+#: builtin/replace.c:354
+#, c-format
+msgid "malformed mergetag in commit '%s'"
+msgstr ""
+
+#: builtin/replace.c:365
+#, c-format
+msgid ""
+"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
+"instead of --graft"
+msgstr ""
+
+#: builtin/replace.c:398
+#, c-format
+msgid "the original commit '%s' has a gpg signature."
+msgstr ""
+
+#: builtin/replace.c:399
+msgid "the signature will be removed in the replacement commit!"
+msgstr ""
+
+#: builtin/replace.c:405
+#, c-format
+msgid "could not write replacement commit for: '%s'"
+msgstr ""
+
+#: builtin/replace.c:429

 msgid "list replace refs"
 msgstr ""
 
 msgid "list replace refs"
 msgstr ""
 

-#: builtin/replace.c:175
+#: builtin/replace.c:430

 msgid "delete replace refs"
 msgstr ""
 
 msgid "delete replace refs"
 msgstr ""
 

-#: builtin/replace.c:176
+#: builtin/replace.c:431
+msgid "edit existing object"
+msgstr ""
+
+#: builtin/replace.c:432
+msgid "change a commit's parents"
+msgstr ""
+
+#: builtin/replace.c:433

 msgid "replace the ref if it exists"
 msgstr ""
 
 msgid "replace the ref if it exists"
 msgstr ""
 

-#: builtin/replace.c:177
+#: builtin/replace.c:434
+msgid "do not pretty-print contents for --edit"
+msgstr ""
+
+#: builtin/replace.c:435

 msgid "use this format"
 msgstr ""
 
 msgid "use this format"
 msgstr ""
 


@@ -8392,97 +8513,97 @@ msgstr ""
 msgid "Cannot do a %s reset in the middle of a merge."
 msgstr ""
 
 msgid "Cannot do a %s reset in the middle of a merge."
 msgstr ""
 

-#: builtin/reset.c:273
+#: builtin/reset.c:275

 msgid "be quiet, only report errors"
 msgstr ""
 
 msgid "be quiet, only report errors"
 msgstr ""
 

-#: builtin/reset.c:275
+#: builtin/reset.c:277

 msgid "reset HEAD and index"
 msgstr ""
 
 msgid "reset HEAD and index"
 msgstr ""
 

-#: builtin/reset.c:276
+#: builtin/reset.c:278

 msgid "reset only HEAD"
 msgstr ""
 
 msgid "reset only HEAD"
 msgstr ""
 

-#: builtin/reset.c:278 builtin/reset.c:280
+#: builtin/reset.c:280 builtin/reset.c:282

 msgid "reset HEAD, index and working tree"
 msgstr ""
 
 msgid "reset HEAD, index and working tree"
 msgstr ""
 

-#: builtin/reset.c:282
+#: builtin/reset.c:284

 msgid "reset HEAD but keep local changes"
 msgstr ""
 
 msgid "reset HEAD but keep local changes"
 msgstr ""
 

-#: builtin/reset.c:285
+#: builtin/reset.c:287

 msgid "record only the fact that removed paths will be added later"
 msgstr ""
 
 msgid "record only the fact that removed paths will be added later"
 msgstr ""
 

-#: builtin/reset.c:302
+#: builtin/reset.c:304

 #, c-format
 msgid "Failed to resolve '%s' as a valid revision."
 msgstr ""
 
 #, c-format
 msgid "Failed to resolve '%s' as a valid revision."
 msgstr ""
 

-#: builtin/reset.c:305 builtin/reset.c:313
+#: builtin/reset.c:307 builtin/reset.c:315

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

-#: builtin/reset.c:310
+#: builtin/reset.c:312

 #, c-format
 msgid "Failed to resolve '%s' as a valid tree."
 msgstr ""
 
 #, c-format
 msgid "Failed to resolve '%s' as a valid tree."
 msgstr ""
 

-#: builtin/reset.c:319
+#: builtin/reset.c:321

 msgid "--patch is incompatible with --{hard,mixed,soft}"
 msgstr ""
 
 msgid "--patch is incompatible with --{hard,mixed,soft}"
 msgstr ""
 

-#: builtin/reset.c:328
+#: builtin/reset.c:330

 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
 msgstr ""
 
 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
 msgstr ""
 

-#: builtin/reset.c:330
+#: builtin/reset.c:332

 #, c-format
 msgid "Cannot do %s reset with paths."
 msgstr ""
 
 #, c-format
 msgid "Cannot do %s reset with paths."
 msgstr ""
 

-#: builtin/reset.c:340
+#: builtin/reset.c:342

 #, c-format
 msgid "%s reset is not allowed in a bare repository"
 msgstr ""
 
 #, c-format
 msgid "%s reset is not allowed in a bare repository"
 msgstr ""
 

-#: builtin/reset.c:344
+#: builtin/reset.c:346

 msgid "-N can only be used with --mixed"
 msgstr ""
 
 msgid "-N can only be used with --mixed"
 msgstr ""
 

-#: builtin/reset.c:361
+#: builtin/reset.c:363

 msgid "Unstaged changes after reset:"
 msgstr ""
 
 msgid "Unstaged changes after reset:"
 msgstr ""
 

-#: builtin/reset.c:367
+#: builtin/reset.c:369

 #, c-format
 msgid "Could not reset index file to revision '%s'."
 msgstr ""
 
 #, c-format
 msgid "Could not reset index file to revision '%s'."
 msgstr ""
 

-#: builtin/reset.c:372
+#: builtin/reset.c:373

 msgid "Could not write new index file."
 msgstr ""
 
 msgid "Could not write new index file."
 msgstr ""
 

-#: builtin/rev-parse.c:359
+#: builtin/rev-parse.c:360

 msgid "git rev-parse --parseopt [options] -- [<args>...]"
 msgstr ""
 
 msgid "git rev-parse --parseopt [options] -- [<args>...]"
 msgstr ""
 

-#: builtin/rev-parse.c:364
+#: builtin/rev-parse.c:365

 msgid "keep the `--` passed as an arg"
 msgstr ""
 
 msgid "keep the `--` passed as an arg"
 msgstr ""
 

-#: builtin/rev-parse.c:366
+#: builtin/rev-parse.c:367

 msgid "stop parsing after the first non-option argument"
 msgstr ""
 
 msgid "stop parsing after the first non-option argument"
 msgstr ""
 

-#: builtin/rev-parse.c:369
+#: builtin/rev-parse.c:370

 msgid "output in stuck long form"
 msgstr ""
 
 msgid "output in stuck long form"
 msgstr ""
 

-#: builtin/rev-parse.c:497
+#: builtin/rev-parse.c:498

 msgid ""
 "git rev-parse --parseopt [options] -- [<args>...]\n"
 "   or: git rev-parse --sq-quote [<arg>...]\n"
 msgid ""
 "git rev-parse --parseopt [options] -- [<args>...]\n"
 "   or: git rev-parse --sq-quote [<arg>...]\n"


@@ -8831,11 +8952,11 @@ msgstr ""
 msgid "shorten ref output"
 msgstr ""
 
 msgid "shorten ref output"
 msgstr ""
 

-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:255
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:349

 msgid "reason"
 msgstr ""
 
 msgid "reason"
 msgstr ""
 

-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:255
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:349

 msgid "reason of the update"
 msgstr ""
 
 msgid "reason of the update"
 msgstr ""
 


@@ -8858,196 +8979,203 @@ msgstr ""
 msgid "git tag -v <tagname>..."
 msgstr ""
 
 msgid "git tag -v <tagname>..."
 msgstr ""
 

-#: builtin/tag.c:67
+#: builtin/tag.c:69

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

-#: builtin/tag.c:239
+#: builtin/tag.c:301

 #, c-format
 msgid "tag name too long: %.*s..."
 msgstr ""
 
 #, c-format
 msgid "tag name too long: %.*s..."
 msgstr ""
 

-#: builtin/tag.c:244
+#: builtin/tag.c:306

 #, c-format
 msgid "tag '%s' not found."
 msgstr ""
 
 #, c-format
 msgid "tag '%s' not found."
 msgstr ""
 

-#: builtin/tag.c:259
+#: builtin/tag.c:321

 #, c-format
 msgid "Deleted tag '%s' (was %s)\n"
 msgstr ""
 
 #, c-format
 msgid "Deleted tag '%s' (was %s)\n"
 msgstr ""
 

-#: builtin/tag.c:271
+#: builtin/tag.c:333

 #, c-format
 msgid "could not verify the tag '%s'"
 msgstr ""
 
 #, c-format
 msgid "could not verify the tag '%s'"
 msgstr ""
 

-#: builtin/tag.c:281
+#: builtin/tag.c:343

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

-"Write a tag message\n"
+"Write a message for tag:\n"
+"  %s\n"

 "Lines starting with '%c' will be ignored.\n"
 msgstr ""
 
 "Lines starting with '%c' will be ignored.\n"
 msgstr ""
 

-#: builtin/tag.c:285
+#: builtin/tag.c:347

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

-"Write a tag message\n"
+"Write a message for tag:\n"
+"  %s\n"

 "Lines starting with '%c' will be kept; you may remove them yourself if you "
 "want to.\n"
 msgstr ""
 
 "Lines starting with '%c' will be kept; you may remove them yourself if you "
 "want to.\n"
 msgstr ""
 

-#: builtin/tag.c:324
+#: builtin/tag.c:371
+#, c-format
+msgid "unsupported sort specification '%s'"
+msgstr ""
+
+#: builtin/tag.c:373
+#, c-format
+msgid "unsupported sort specification '%s' in variable '%s'"
+msgstr ""
+
+#: builtin/tag.c:428

 msgid "unable to sign the tag"
 msgstr ""
 
 msgid "unable to sign the tag"
 msgstr ""
 

-#: builtin/tag.c:326
+#: builtin/tag.c:430

 msgid "unable to write tag file"
 msgstr ""
 
 msgid "unable to write tag file"
 msgstr ""
 

-#: builtin/tag.c:351
+#: builtin/tag.c:455

 msgid "bad object type."
 msgstr ""
 
 msgid "bad object type."
 msgstr ""
 

-#: builtin/tag.c:364
+#: builtin/tag.c:468

 msgid "tag header too big."
 msgstr ""
 
 msgid "tag header too big."
 msgstr ""
 

-#: builtin/tag.c:400
+#: builtin/tag.c:504

 msgid "no tag message?"
 msgstr ""
 
 msgid "no tag message?"
 msgstr ""
 

-#: builtin/tag.c:406
+#: builtin/tag.c:510

 #, 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:455
+#: builtin/tag.c:559

 msgid "switch 'points-at' requires an object"
 msgstr ""
 
 msgid "switch 'points-at' requires an object"
 msgstr ""
 

-#: builtin/tag.c:457
+#: builtin/tag.c:561

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

-#: builtin/tag.c:480
-#, c-format
-msgid "unsupported sort specification %s"
-msgstr ""
-
-#: builtin/tag.c:500
+#: builtin/tag.c:588

 msgid "list tag names"
 msgstr ""
 
 msgid "list tag names"
 msgstr ""
 

-#: builtin/tag.c:502
+#: builtin/tag.c:590

 msgid "print <n> lines of each tag message"
 msgstr ""
 
 msgid "print <n> lines of each tag message"
 msgstr ""
 

-#: builtin/tag.c:504
+#: builtin/tag.c:592

 msgid "delete tags"
 msgstr ""
 
 msgid "delete tags"
 msgstr ""
 

-#: builtin/tag.c:505
+#: builtin/tag.c:593

 msgid "verify tags"
 msgstr ""
 
 msgid "verify tags"
 msgstr ""
 

-#: builtin/tag.c:507
+#: builtin/tag.c:595

 msgid "Tag creation options"
 msgstr ""
 
 msgid "Tag creation options"
 msgstr ""
 

-#: builtin/tag.c:509
+#: builtin/tag.c:597

 msgid "annotated tag, needs a message"
 msgstr ""
 
 msgid "annotated tag, needs a message"
 msgstr ""
 

-#: builtin/tag.c:511
+#: builtin/tag.c:599

 msgid "tag message"
 msgstr ""
 
 msgid "tag message"
 msgstr ""
 

-#: builtin/tag.c:513
+#: builtin/tag.c:601

 msgid "annotated and GPG-signed tag"
 msgstr ""
 
 msgid "annotated and GPG-signed tag"
 msgstr ""
 

-#: builtin/tag.c:517
+#: builtin/tag.c:605

 msgid "use another key to sign the tag"
 msgstr ""
 
 msgid "use another key to sign the tag"
 msgstr ""
 

-#: builtin/tag.c:518
+#: builtin/tag.c:606

 msgid "replace the tag if exists"
 msgstr ""
 
 msgid "replace the tag if exists"
 msgstr ""
 

-#: builtin/tag.c:519
+#: builtin/tag.c:607

 msgid "show tag list in columns"
 msgstr ""
 
 msgid "show tag list in columns"
 msgstr ""
 

-#: builtin/tag.c:521
+#: builtin/tag.c:609

 msgid "sort tags"
 msgstr ""
 
 msgid "sort tags"
 msgstr ""
 

-#: builtin/tag.c:525
+#: builtin/tag.c:613

 msgid "Tag listing options"
 msgstr ""
 
 msgid "Tag listing options"
 msgstr ""
 

-#: builtin/tag.c:528 builtin/tag.c:534
+#: builtin/tag.c:616 builtin/tag.c:622

 msgid "print only tags that contain the commit"
 msgstr ""
 
 msgid "print only tags that contain the commit"
 msgstr ""
 

-#: builtin/tag.c:540
+#: builtin/tag.c:628

 msgid "print only tags of the object"
 msgstr ""
 
 msgid "print only tags of the object"
 msgstr ""
 

-#: builtin/tag.c:566
+#: builtin/tag.c:654

 msgid "--column and -n are incompatible"
 msgstr ""
 
 msgid "--column and -n are incompatible"
 msgstr ""
 

-#: builtin/tag.c:578
+#: builtin/tag.c:666

 msgid "--sort and -n are incompatible"
 msgstr ""
 
 msgid "--sort and -n are incompatible"
 msgstr ""
 

-#: builtin/tag.c:585
+#: builtin/tag.c:673

 msgid "-n option is only allowed with -l."
 msgstr ""
 
 msgid "-n option is only allowed with -l."
 msgstr ""
 

-#: builtin/tag.c:587
+#: builtin/tag.c:675

 msgid "--contains option is only allowed with -l."
 msgstr ""
 
 msgid "--contains option is only allowed with -l."
 msgstr ""
 

-#: builtin/tag.c:589
+#: builtin/tag.c:677

 msgid "--points-at option is only allowed with -l."
 msgstr ""
 
 msgid "--points-at option is only allowed with -l."
 msgstr ""
 

-#: builtin/tag.c:597
+#: builtin/tag.c:685

 msgid "only one -F or -m option is allowed."
 msgstr ""
 
 msgid "only one -F or -m option is allowed."
 msgstr ""
 

-#: builtin/tag.c:617
+#: builtin/tag.c:705

 msgid "too many params"
 msgstr ""
 
 msgid "too many params"
 msgstr ""
 

-#: builtin/tag.c:623
+#: builtin/tag.c:711

 #, 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:628
+#: builtin/tag.c:716

 #, c-format
 msgid "tag '%s' already exists"
 msgstr ""
 
 #, c-format
 msgid "tag '%s' already exists"
 msgstr ""
 

-#: builtin/tag.c:646
+#: builtin/tag.c:734

 #, c-format
 msgid "%s: cannot lock the ref"
 msgstr ""
 
 #, c-format
 msgid "%s: cannot lock the ref"
 msgstr ""
 

-#: builtin/tag.c:648
+#: builtin/tag.c:736

 #, c-format
 msgid "%s: cannot update the ref"
 msgstr ""
 
 #, c-format
 msgid "%s: cannot update the ref"
 msgstr ""
 

-#: builtin/tag.c:650
+#: builtin/tag.c:738

 #, c-format
 msgid "Updated tag '%s' (was %s)\n"
 msgstr ""
 #, c-format
 msgid "Updated tag '%s' (was %s)\n"
 msgstr ""


@@ -9056,118 +9184,122 @@ msgstr ""
 msgid "Unpacking objects"
 msgstr ""
 
 msgid "Unpacking objects"
 msgstr ""
 

-#: builtin/update-index.c:399
+#: builtin/update-index.c:402

 msgid "git update-index [options] [--] [<file>...]"
 msgstr ""
 
 msgid "git update-index [options] [--] [<file>...]"
 msgstr ""
 

-#: builtin/update-index.c:748
+#: builtin/update-index.c:755

 msgid "continue refresh even when index needs update"
 msgstr ""
 
 msgid "continue refresh even when index needs update"
 msgstr ""
 

-#: builtin/update-index.c:751
+#: builtin/update-index.c:758

 msgid "refresh: ignore submodules"
 msgstr ""
 
 msgid "refresh: ignore submodules"
 msgstr ""
 

-#: builtin/update-index.c:754
+#: builtin/update-index.c:761

 msgid "do not ignore new files"
 msgstr ""
 
 msgid "do not ignore new files"
 msgstr ""
 

-#: builtin/update-index.c:756
+#: builtin/update-index.c:763

 msgid "let files replace directories and vice-versa"
 msgstr ""
 
 msgid "let files replace directories and vice-versa"
 msgstr ""
 

-#: builtin/update-index.c:758
+#: builtin/update-index.c:765

 msgid "notice files missing from worktree"
 msgstr ""
 
 msgid "notice files missing from worktree"
 msgstr ""
 

-#: builtin/update-index.c:760
+#: builtin/update-index.c:767

 msgid "refresh even if index contains unmerged entries"
 msgstr ""
 
 msgid "refresh even if index contains unmerged entries"
 msgstr ""
 

-#: builtin/update-index.c:763
+#: builtin/update-index.c:770

 msgid "refresh stat information"
 msgstr ""
 
 msgid "refresh stat information"
 msgstr ""
 

-#: builtin/update-index.c:767
+#: builtin/update-index.c:774

 msgid "like --refresh, but ignore assume-unchanged setting"
 msgstr ""
 
 msgid "like --refresh, but ignore assume-unchanged setting"
 msgstr ""
 

-#: builtin/update-index.c:771
+#: builtin/update-index.c:778

 msgid "<mode>,<object>,<path>"
 msgstr ""
 
 msgid "<mode>,<object>,<path>"
 msgstr ""
 

-#: builtin/update-index.c:772
+#: builtin/update-index.c:779

 msgid "add the specified entry to the index"
 msgstr ""
 
 msgid "add the specified entry to the index"
 msgstr ""
 

-#: builtin/update-index.c:776
+#: builtin/update-index.c:783

 msgid "(+/-)x"
 msgstr ""
 
 msgid "(+/-)x"
 msgstr ""
 

-#: builtin/update-index.c:777
+#: builtin/update-index.c:784

 msgid "override the executable bit of the listed files"
 msgstr ""
 
 msgid "override the executable bit of the listed files"
 msgstr ""
 

-#: builtin/update-index.c:781
+#: builtin/update-index.c:788

 msgid "mark files as \"not changing\""
 msgstr ""
 
 msgid "mark files as \"not changing\""
 msgstr ""
 

-#: builtin/update-index.c:784
+#: builtin/update-index.c:791

 msgid "clear assumed-unchanged bit"
 msgstr ""
 
 msgid "clear assumed-unchanged bit"
 msgstr ""
 

-#: builtin/update-index.c:787
+#: builtin/update-index.c:794

 msgid "mark files as \"index-only\""
 msgstr ""
 
 msgid "mark files as \"index-only\""
 msgstr ""
 

-#: builtin/update-index.c:790
+#: builtin/update-index.c:797

 msgid "clear skip-worktree bit"
 msgstr ""
 
 msgid "clear skip-worktree bit"
 msgstr ""
 

-#: builtin/update-index.c:793
+#: builtin/update-index.c:800

 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:795
+#: builtin/update-index.c:802

 msgid "remove named paths even if present in worktree"
 msgstr ""
 
 msgid "remove named paths even if present in worktree"
 msgstr ""
 

-#: builtin/update-index.c:797
+#: builtin/update-index.c:804

 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:799
+#: builtin/update-index.c:806

 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:803
+#: builtin/update-index.c:810

 msgid "add entries from standard input to the index"
 msgstr ""
 
 msgid "add entries from standard input to the index"
 msgstr ""
 

-#: builtin/update-index.c:807
+#: builtin/update-index.c:814

 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:811
+#: builtin/update-index.c:818

 msgid "only update entries that differ from HEAD"
 msgstr ""
 
 msgid "only update entries that differ from HEAD"
 msgstr ""
 

-#: builtin/update-index.c:815
+#: builtin/update-index.c:822

 msgid "ignore files missing from worktree"
 msgstr ""
 
 msgid "ignore files missing from worktree"
 msgstr ""
 

-#: builtin/update-index.c:818
+#: builtin/update-index.c:825

 msgid "report actions to standard output"
 msgstr ""
 
 msgid "report actions to standard output"
 msgstr ""
 

-#: builtin/update-index.c:820
+#: builtin/update-index.c:827

 msgid "(for porcelains) forget saved unresolved conflicts"
 msgstr ""
 
 msgid "(for porcelains) forget saved unresolved conflicts"
 msgstr ""
 

-#: builtin/update-index.c:824
+#: builtin/update-index.c:831

 msgid "write index in this format"
 msgstr ""
 
 msgid "write index in this format"
 msgstr ""
 

+#: builtin/update-index.c:833
+msgid "enable or disable split index"
+msgstr ""
+

 #: builtin/update-ref.c:9
 msgid "git update-ref [options] -d <refname> [<oldval>]"
 msgstr ""
 #: builtin/update-ref.c:9
 msgid "git update-ref [options] -d <refname> [<oldval>]"
 msgstr ""


@@ -9180,19 +9312,19 @@ msgstr ""
 msgid "git update-ref [options] --stdin [-z]"
 msgstr ""
 
 msgid "git update-ref [options] --stdin [-z]"
 msgstr ""
 

-#: builtin/update-ref.c:256
+#: builtin/update-ref.c:350

 msgid "delete the reference"
 msgstr ""
 
 msgid "delete the reference"
 msgstr ""
 

-#: builtin/update-ref.c:258
+#: builtin/update-ref.c:352

 msgid "update <refname> not the one it points to"
 msgstr ""
 
 msgid "update <refname> not the one it points to"
 msgstr ""
 

-#: builtin/update-ref.c:259
+#: builtin/update-ref.c:353

 msgid "stdin has NUL-terminated arguments"
 msgstr ""
 
 msgid "stdin has NUL-terminated arguments"
 msgstr ""
 

-#: builtin/update-ref.c:260
+#: builtin/update-ref.c:354

 msgid "read updates from stdin"
 msgstr ""
 
 msgid "read updates from stdin"
 msgstr ""
 


@@ -9204,15 +9336,23 @@ msgstr ""
 msgid "update the info files from scratch"
 msgstr ""
 
 msgid "update the info files from scratch"
 msgstr ""
 

-#: builtin/verify-pack.c:56
+#: builtin/verify-commit.c:17
+msgid "git verify-commit [-v|--verbose] <commit>..."
+msgstr ""
+
+#: builtin/verify-commit.c:75
+msgid "print commit contents"
+msgstr ""
+
+#: builtin/verify-pack.c:55

 msgid "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..."
 msgstr ""
 
 msgid "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..."
 msgstr ""
 

-#: builtin/verify-pack.c:66
+#: builtin/verify-pack.c:65

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

-#: builtin/verify-pack.c:68
+#: builtin/verify-pack.c:67

 msgid "show statistics only"
 msgstr ""
 
 msgid "show statistics only"
 msgstr ""
 


@@ -9657,11 +9797,11 @@ msgstr ""
 msgid "Pull is not possible because you have unmerged files."
 msgstr ""
 
 msgid "Pull is not possible because you have unmerged files."
 msgstr ""
 

-#: git-pull.sh:247
+#: git-pull.sh:245

 msgid "updating an unborn branch with changes added to the index"
 msgstr ""
 
 msgid "updating an unborn branch with changes added to the index"
 msgstr ""
 

-#: git-pull.sh:271
+#: git-pull.sh:269

 #, sh-format
 msgid ""
 "Warning: fetch updated the current branch head.\n"
 #, sh-format
 msgid ""
 "Warning: fetch updated the current branch head.\n"


@@ -9669,11 +9809,11 @@ msgid ""
 "Warning: commit $orig_head."
 msgstr ""
 
 "Warning: commit $orig_head."
 msgstr ""
 

-#: git-pull.sh:296
+#: git-pull.sh:294

 msgid "Cannot merge multiple branches into empty head"
 msgstr ""
 
 msgid "Cannot merge multiple branches into empty head"
 msgstr ""
 

-#: git-pull.sh:300
+#: git-pull.sh:298

 msgid "Cannot rebase onto multiple branches"
 msgstr ""
 
 msgid "Cannot rebase onto multiple branches"
 msgstr ""
 


@@ -9685,58 +9825,58 @@ msgid ""
 "\"."
 msgstr ""
 
 "\"."
 msgstr ""
 

-#: git-rebase.sh:164
+#: git-rebase.sh:165

 msgid "Applied autostash."
 msgstr ""
 
 msgid "Applied autostash."
 msgstr ""
 

-#: git-rebase.sh:167
+#: git-rebase.sh:168

 #, sh-format
 msgid "Cannot store $stash_sha1"
 msgstr ""
 
 #, sh-format
 msgid "Cannot store $stash_sha1"
 msgstr ""
 

-#: git-rebase.sh:168
+#: git-rebase.sh:169

 msgid ""
 "Applying autostash resulted in conflicts.\n"
 "Your changes are safe in the stash.\n"
 "You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
 msgstr ""
 
 msgid ""
 "Applying autostash resulted in conflicts.\n"
 "Your changes are safe in the stash.\n"
 "You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
 msgstr ""
 

-#: git-rebase.sh:207
+#: git-rebase.sh:208

 msgid "The pre-rebase hook refused to rebase."
 msgstr ""
 
 msgid "The pre-rebase hook refused to rebase."
 msgstr ""
 

-#: git-rebase.sh:212
+#: git-rebase.sh:213

 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:350
+#: git-rebase.sh:351

 msgid "The --exec option must be used with the --interactive option"
 msgstr ""
 
 msgid "The --exec option must be used with the --interactive option"
 msgstr ""
 

-#: git-rebase.sh:355
+#: git-rebase.sh:356

 msgid "No rebase in progress?"
 msgstr ""
 
 msgid "No rebase in progress?"
 msgstr ""
 

-#: git-rebase.sh:366
+#: git-rebase.sh:367

 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:373
+#: git-rebase.sh:374

 msgid "Cannot read HEAD"
 msgstr ""
 
 msgid "Cannot read HEAD"
 msgstr ""
 

-#: git-rebase.sh:376
+#: git-rebase.sh:377

 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:394
+#: git-rebase.sh:395

 #, 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:413
+#: git-rebase.sh:414

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


@@ -9749,64 +9889,64 @@ msgid ""
 "valuable there."
 msgstr ""
 
 "valuable there."
 msgstr ""
 

-#: git-rebase.sh:464
+#: git-rebase.sh:465

 #, sh-format
 msgid "invalid upstream $upstream_name"
 msgstr ""
 
 #, sh-format
 msgid "invalid upstream $upstream_name"
 msgstr ""
 

-#: git-rebase.sh:488
+#: git-rebase.sh:489

 #, 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:491 git-rebase.sh:495
+#: git-rebase.sh:492 git-rebase.sh:496

 #, 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:500
+#: git-rebase.sh:501

 #, 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:523
+#: git-rebase.sh:524

 #, sh-format
 msgid "fatal: no such branch: $branch_name"
 msgstr ""
 
 #, sh-format
 msgid "fatal: no such branch: $branch_name"
 msgstr ""
 

-#: git-rebase.sh:556
+#: git-rebase.sh:557

 msgid "Cannot autostash"
 msgstr ""
 
 msgid "Cannot autostash"
 msgstr ""
 

-#: git-rebase.sh:561
+#: git-rebase.sh:562

 #, sh-format
 msgid "Created autostash: $stash_abbrev"
 msgstr ""
 
 #, sh-format
 msgid "Created autostash: $stash_abbrev"
 msgstr ""
 

-#: git-rebase.sh:565
+#: git-rebase.sh:566

 msgid "Please commit or stash them."
 msgstr ""
 
 msgid "Please commit or stash them."
 msgstr ""
 

-#: git-rebase.sh:585
+#: git-rebase.sh:586

 #, 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:589
+#: git-rebase.sh:590

 #, 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:600
+#: git-rebase.sh:601

 #, sh-format
 msgid "Changes from $mb to $onto:"
 msgstr ""
 
 #, sh-format
 msgid "Changes from $mb to $onto:"
 msgstr ""
 

-#: git-rebase.sh:609
+#: git-rebase.sh:610

 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:619
+#: git-rebase.sh:620

 #, sh-format
 msgid "Fast-forwarded $branch_name to $onto_name."
 msgstr ""
 #, sh-format
 msgid "Fast-forwarded $branch_name to $onto_name."
 msgstr ""


@@ -9823,23 +9963,23 @@ msgstr ""
 msgid "Cannot save the current index state"
 msgstr ""
 
 msgid "Cannot save the current index state"
 msgstr ""
 

-#: git-stash.sh:123 git-stash.sh:136
+#: git-stash.sh:124 git-stash.sh:137

 msgid "Cannot save the current worktree state"
 msgstr ""
 
 msgid "Cannot save the current worktree state"
 msgstr ""
 

-#: git-stash.sh:140
+#: git-stash.sh:141

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

-#: git-stash.sh:143
+#: git-stash.sh:144

 msgid "Cannot remove temporary index (can't happen)"
 msgstr ""
 
 msgid "Cannot remove temporary index (can't happen)"
 msgstr ""
 

-#: git-stash.sh:156
+#: git-stash.sh:157

 msgid "Cannot record working tree state"
 msgstr ""
 
 msgid "Cannot record working tree state"
 msgstr ""
 

-#: git-stash.sh:190
+#: git-stash.sh:191

 #, sh-format
 msgid "Cannot update $ref_stash with $w_commit"
 msgstr ""
 #, sh-format
 msgid "Cannot update $ref_stash with $w_commit"
 msgstr ""


@@ -9854,92 +9994,92 @@ msgstr ""
 #. $ git stash save --blah-blah 2>&1 | head -n 2
 #. error: unknown option for 'stash save': --blah-blah
 #. To provide a message, use git stash save -- '--blah-blah'
 #. $ git stash save --blah-blah 2>&1 | head -n 2
 #. error: unknown option for 'stash save': --blah-blah
 #. To provide a message, use git stash save -- '--blah-blah'

-#: git-stash.sh:237
+#: git-stash.sh:238

 #, sh-format
 msgid ""
 "error: unknown option for 'stash save': $option\n"
 "       To provide a message, use git stash save -- '$option'"
 msgstr ""
 
 #, sh-format
 msgid ""
 "error: unknown option for 'stash save': $option\n"
 "       To provide a message, use git stash save -- '$option'"
 msgstr ""
 

-#: git-stash.sh:258
+#: git-stash.sh:259

 msgid "No local changes to save"
 msgstr ""
 
 msgid "No local changes to save"
 msgstr ""
 

-#: git-stash.sh:262
+#: git-stash.sh:263

 msgid "Cannot initialize stash"
 msgstr ""
 
 msgid "Cannot initialize stash"
 msgstr ""
 

-#: git-stash.sh:266
+#: git-stash.sh:267

 msgid "Cannot save the current status"
 msgstr ""
 
 msgid "Cannot save the current status"
 msgstr ""
 

-#: git-stash.sh:284
+#: git-stash.sh:285

 msgid "Cannot remove worktree changes"
 msgstr ""
 
 msgid "Cannot remove worktree changes"
 msgstr ""
 

-#: git-stash.sh:383
+#: git-stash.sh:384

 msgid "No stash found."
 msgstr ""
 
 msgid "No stash found."
 msgstr ""
 

-#: git-stash.sh:390
+#: git-stash.sh:391

 #, sh-format
 msgid "Too many revisions specified: $REV"
 msgstr ""
 
 #, sh-format
 msgid "Too many revisions specified: $REV"
 msgstr ""
 

-#: git-stash.sh:396
+#: git-stash.sh:397

 #, sh-format
 msgid "$reference is not valid reference"
 msgstr ""
 
 #, sh-format
 msgid "$reference is not valid reference"
 msgstr ""
 

-#: git-stash.sh:424
+#: git-stash.sh:425

 #, 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:435
+#: git-stash.sh:436

 #, sh-format
 msgid "'$args' is not a stash reference"
 msgstr ""
 
 #, sh-format
 msgid "'$args' is not a stash reference"
 msgstr ""
 

-#: git-stash.sh:443
+#: git-stash.sh:444

 msgid "unable to refresh index"
 msgstr ""
 
 msgid "unable to refresh index"
 msgstr ""
 

-#: git-stash.sh:447
+#: git-stash.sh:448

 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:455
+#: git-stash.sh:456

 msgid "Conflicts in index. Try without --index."
 msgstr ""
 
 msgid "Conflicts in index. Try without --index."
 msgstr ""
 

-#: git-stash.sh:457
+#: git-stash.sh:458

 msgid "Could not save index tree"
 msgstr ""
 
 msgid "Could not save index tree"
 msgstr ""
 

-#: git-stash.sh:491
+#: git-stash.sh:492

 msgid "Cannot unstage modified files"
 msgstr ""
 
 msgid "Cannot unstage modified files"
 msgstr ""
 

-#: git-stash.sh:506
+#: git-stash.sh:507

 msgid "Index was not unstashed."
 msgstr ""
 
 msgid "Index was not unstashed."
 msgstr ""
 

-#: git-stash.sh:529
+#: git-stash.sh:530

 #, sh-format
 msgid "Dropped ${REV} ($s)"
 msgstr ""
 
 #, sh-format
 msgid "Dropped ${REV} ($s)"
 msgstr ""
 

-#: git-stash.sh:530
+#: git-stash.sh:531

 #, sh-format
 msgid "${REV}: Could not drop stash entry"
 msgstr ""
 
 #, sh-format
 msgid "${REV}: Could not drop stash entry"
 msgstr ""
 

-#: git-stash.sh:537
+#: git-stash.sh:538

 msgid "No branch name specified"
 msgstr ""
 
 msgid "No branch name specified"
 msgstr ""
 

-#: git-stash.sh:609
+#: git-stash.sh:610

 msgid "(To restore them type \"git stash apply\")"
 msgstr ""
 
 msgid "(To restore them type \"git stash apply\")"
 msgstr ""
 


@@ -9958,26 +10098,26 @@ msgstr ""
 msgid "Clone of '$url' into submodule path '$sm_path' failed"
 msgstr ""
 
 msgid "Clone of '$url' into submodule path '$sm_path' failed"
 msgstr ""
 

-#: git-submodule.sh:299
+#: git-submodule.sh:296

 #, sh-format
 msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
 msgstr ""
 
 #, sh-format
 msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
 msgstr ""
 

-#: git-submodule.sh:409
+#: git-submodule.sh:406

 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:419
+#: git-submodule.sh:416

 #, 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:436
+#: git-submodule.sh:433

 #, 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:440
+#: git-submodule.sh:437

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


@@ -9985,235 +10125,235 @@ msgid ""
 "Use -f if you really want to add it."
 msgstr ""
 
 "Use -f if you really want to add it."
 msgstr ""
 

-#: git-submodule.sh:458
+#: git-submodule.sh:455

 #, 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:460
+#: git-submodule.sh:457

 #, 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:468
+#: git-submodule.sh:465

 #, 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:470
+#: git-submodule.sh:467

 #, sh-format
 msgid ""
 "If you want to reuse this local git directory instead of cloning again from"
 msgstr ""
 
 #, sh-format
 msgid ""
 "If you want to reuse this local git directory instead of cloning again from"
 msgstr ""
 

-#: git-submodule.sh:472
+#: git-submodule.sh:469

 #, sh-format
 msgid ""
 "use the '--force' option. If the local git directory is not the correct repo"
 msgstr ""
 
 #, sh-format
 msgid ""
 "use the '--force' option. If the local git directory is not the correct repo"
 msgstr ""
 

-#: git-submodule.sh:473
+#: git-submodule.sh:470

 #, sh-format
 msgid ""
 "or you are unsure what this means choose another name with the '--name' "
 "option."
 msgstr ""
 
 #, sh-format
 msgid ""
 "or you are unsure what this means choose another name with the '--name' "
 "option."
 msgstr ""
 

-#: git-submodule.sh:475
+#: git-submodule.sh:472

 #, 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:487
+#: git-submodule.sh:484

 #, sh-format
 msgid "Unable to checkout submodule '$sm_path'"
 msgstr ""
 
 #, sh-format
 msgid "Unable to checkout submodule '$sm_path'"
 msgstr ""
 

-#: git-submodule.sh:492
+#: git-submodule.sh:489

 #, sh-format
 msgid "Failed to add submodule '$sm_path'"
 msgstr ""
 
 #, sh-format
 msgid "Failed to add submodule '$sm_path'"
 msgstr ""
 

-#: git-submodule.sh:501
+#: git-submodule.sh:498

 #, sh-format
 msgid "Failed to register submodule '$sm_path'"
 msgstr ""
 
 #, sh-format
 msgid "Failed to register submodule '$sm_path'"
 msgstr ""
 

-#: git-submodule.sh:545
+#: git-submodule.sh:542

 #, sh-format
 msgid "Entering '$prefix$displaypath'"
 msgstr ""
 
 #, sh-format
 msgid "Entering '$prefix$displaypath'"
 msgstr ""
 

-#: git-submodule.sh:565
+#: git-submodule.sh:562

 #, sh-format
 msgid "Stopping at '$prefix$displaypath'; script returned non-zero status."
 msgstr ""
 
 #, sh-format
 msgid "Stopping at '$prefix$displaypath'; script returned non-zero status."
 msgstr ""
 

-#: git-submodule.sh:611
+#: git-submodule.sh:608

 #, sh-format
 msgid "No url found for submodule path '$displaypath' in .gitmodules"
 msgstr ""
 
 #, sh-format
 msgid "No url found for submodule path '$displaypath' in .gitmodules"
 msgstr ""
 

-#: git-submodule.sh:620
+#: git-submodule.sh:617

 #, sh-format
 msgid "Failed to register url for submodule path '$displaypath'"
 msgstr ""
 
 #, sh-format
 msgid "Failed to register url for submodule path '$displaypath'"
 msgstr ""
 

-#: git-submodule.sh:622
+#: git-submodule.sh:619

 #, sh-format
 msgid "Submodule '$name' ($url) registered for path '$displaypath'"
 msgstr ""
 
 #, sh-format
 msgid "Submodule '$name' ($url) registered for path '$displaypath'"
 msgstr ""
 

-#: git-submodule.sh:639
+#: git-submodule.sh:636

 #, sh-format
 msgid "Failed to register update mode for submodule path '$displaypath'"
 msgstr ""
 
 #, sh-format
 msgid "Failed to register update mode for submodule path '$displaypath'"
 msgstr ""
 

-#: git-submodule.sh:677
+#: git-submodule.sh:674

 #, sh-format
 msgid "Use '.' if you really want to deinitialize all submodules"
 msgstr ""
 
 #, sh-format
 msgid "Use '.' if you really want to deinitialize all submodules"
 msgstr ""
 

-#: git-submodule.sh:694
+#: git-submodule.sh:691

 #, sh-format
 msgid "Submodule work tree '$displaypath' contains a .git directory"
 msgstr ""
 
 #, sh-format
 msgid "Submodule work tree '$displaypath' contains a .git directory"
 msgstr ""
 

-#: git-submodule.sh:695
+#: git-submodule.sh:692

 #, sh-format
 msgid ""
 "(use 'rm -rf' if you really want to remove it including all of its history)"
 msgstr ""
 
 #, sh-format
 msgid ""
 "(use 'rm -rf' if you really want to remove it including all of its history)"
 msgstr ""
 

-#: git-submodule.sh:701
+#: git-submodule.sh:698

 #, sh-format
 msgid ""
 "Submodule work tree '$displaypath' contains local modifications; use '-f' to "
 "discard them"
 msgstr ""
 
 #, sh-format
 msgid ""
 "Submodule work tree '$displaypath' contains local modifications; use '-f' to "
 "discard them"
 msgstr ""
 

-#: git-submodule.sh:704
+#: git-submodule.sh:701

 #, sh-format
 msgid "Cleared directory '$displaypath'"
 msgstr ""
 
 #, sh-format
 msgid "Cleared directory '$displaypath'"
 msgstr ""
 

-#: git-submodule.sh:705
+#: git-submodule.sh:702

 #, sh-format
 msgid "Could not remove submodule work tree '$displaypath'"
 msgstr ""
 
 #, sh-format
 msgid "Could not remove submodule work tree '$displaypath'"
 msgstr ""
 

-#: git-submodule.sh:708
+#: git-submodule.sh:705

 #, sh-format
 msgid "Could not create empty submodule directory '$displaypath'"
 msgstr ""
 
 #, sh-format
 msgid "Could not create empty submodule directory '$displaypath'"
 msgstr ""
 

-#: git-submodule.sh:717
+#: git-submodule.sh:714

 #, sh-format
 msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
 msgstr ""
 
 #, sh-format
 msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
 msgstr ""
 

-#: git-submodule.sh:833
+#: git-submodule.sh:830

 #, sh-format
 msgid ""
 "Submodule path '$displaypath' not initialized\n"
 "Maybe you want to use 'update --init'?"
 msgstr ""
 
 #, sh-format
 msgid ""
 "Submodule path '$displaypath' not initialized\n"
 "Maybe you want to use 'update --init'?"
 msgstr ""
 

-#: git-submodule.sh:846
+#: git-submodule.sh:843

 #, 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:855
+#: git-submodule.sh:852

 #, 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:879
+#: git-submodule.sh:876

 #, 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:893
+#: git-submodule.sh:890

 #, 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:894
+#: git-submodule.sh:891

 #, sh-format
 msgid "Submodule path '$displaypath': checked out '$sha1'"
 msgstr ""
 
 #, sh-format
 msgid "Submodule path '$displaypath': checked out '$sha1'"
 msgstr ""
 

-#: git-submodule.sh:898
+#: git-submodule.sh:895

 #, 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:899
+#: git-submodule.sh:896

 #, sh-format
 msgid "Submodule path '$displaypath': rebased into '$sha1'"
 msgstr ""
 
 #, sh-format
 msgid "Submodule path '$displaypath': rebased into '$sha1'"
 msgstr ""
 

-#: git-submodule.sh:904
+#: git-submodule.sh:901

 #, 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:905
+#: git-submodule.sh:902

 #, sh-format
 msgid "Submodule path '$displaypath': merged in '$sha1'"
 msgstr ""
 
 #, sh-format
 msgid "Submodule path '$displaypath': merged in '$sha1'"
 msgstr ""
 

-#: git-submodule.sh:910
+#: git-submodule.sh:907

 #, sh-format
 msgid ""
 "Execution of '$command $sha1' failed in submodule  path '$prefix$sm_path'"
 msgstr ""
 
 #, sh-format
 msgid ""
 "Execution of '$command $sha1' failed in submodule  path '$prefix$sm_path'"
 msgstr ""
 

-#: git-submodule.sh:911
+#: git-submodule.sh:908

 #, sh-format
 msgid "Submodule path '$prefix$sm_path': '$command $sha1'"
 msgstr ""
 
 #, sh-format
 msgid "Submodule path '$prefix$sm_path': '$command $sha1'"
 msgstr ""
 

-#: git-submodule.sh:941
+#: git-submodule.sh:938

 #, 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:1049
+#: git-submodule.sh:1046

 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:1097
+#: git-submodule.sh:1098

 #, sh-format
 msgid "unexpected mode $mod_dst"
 msgstr ""
 
 #, sh-format
 msgid "unexpected mode $mod_dst"
 msgstr ""
 

-#: git-submodule.sh:1117
+#: git-submodule.sh:1118

 #, 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:1120
+#: git-submodule.sh:1121

 #, 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:1123
+#: git-submodule.sh:1124

 #, sh-format
 msgid "  Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
 msgstr ""
 
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
 msgstr ""
 

-#: git-submodule.sh:1148
+#: git-submodule.sh:1149

 msgid "blob"
 msgstr ""
 
 msgid "blob"
 msgstr ""
 

-#: git-submodule.sh:1262
+#: git-submodule.sh:1267

 #, sh-format
 msgid "Failed to recurse into submodule path '$sm_path'"
 msgstr ""
 
 #, sh-format
 msgid "Failed to recurse into submodule path '$sm_path'"
 msgstr ""
 

-#: git-submodule.sh:1326
+#: git-submodule.sh:1331

 #, sh-format
 msgid "Synchronizing submodule url for '$displaypath'"
 msgstr ""
 #, sh-format
 msgid "Synchronizing submodule url for '$displaypath'"
 msgstr ""