l10n: git.pot: v2.2.0 round 1 (62 new, 23 removed)

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

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

diff --git a/po/git.pot b/po/git.pot
index 1c8309a887491e35113e4fb7de39dec8115edd58..2d4608f6e084bf3400a3660f970363b79ecf991e 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-08-04 14:48+0800\n"
+"POT-Creation-Date: 2014-11-01 07:46+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"


@@ -26,101 +26,100 @@ msgstr ""
 #: advice.c:88
 msgid ""
 "Fix them up in the work tree, and then use 'git add/rm <file>'\n"
 #: advice.c:88
 msgid ""
 "Fix them up in the work tree, and then use 'git add/rm <file>'\n"

-"as appropriate to mark resolution and make a commit, or use\n"
-"'git commit -a'."
+"as appropriate to mark resolution and make a commit."

 msgstr ""
 
 msgstr ""
 

-#: archive.c:10
+#: archive.c:11

 msgid "git archive [options] <tree-ish> [<path>...]"
 msgstr ""
 
 msgid "git archive [options] <tree-ish> [<path>...]"
 msgstr ""
 

-#: archive.c:11
+#: archive.c:12

 msgid "git archive --list"
 msgstr ""
 
 msgid "git archive --list"
 msgstr ""
 

-#: archive.c:12
+#: archive.c:13

 msgid ""
 "git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [<path>...]"
 msgstr ""
 
 msgid ""
 "git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [<path>...]"
 msgstr ""
 

-#: archive.c:13
+#: archive.c:14

 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:427 builtin/rm.c:328
+#: archive.c:334 builtin/add.c:137 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 ""
 

-#: archive.c:328
+#: archive.c:419

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

-#: archive.c:328
+#: archive.c:419

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

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

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

-#: archive.c:330
+#: archive.c:421

 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: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
+#: archive.c:422 builtin/archive.c:88 builtin/blame.c:2517
+#: builtin/blame.c:2518 builtin/config.c:57 builtin/fast-export.c:986
+#: builtin/fast-export.c:988 builtin/grep.c:712 builtin/hash-object.c:101
+#: builtin/ls-files.c:489 builtin/ls-files.c:492 builtin/notes.c:411
+#: builtin/notes.c:568 builtin/read-tree.c:109 parse-options.h:151

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

-#: archive.c:332 builtin/archive.c:89
+#: archive.c:423 builtin/archive.c:89

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

-#: archive.c:334
+#: archive.c:425

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

-#: archive.c:335
+#: archive.c:426

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

-#: archive.c:336
+#: archive.c:427

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

-#: archive.c:337
+#: archive.c:428

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

-#: archive.c:345
+#: archive.c:436

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

-#: archive.c:348
+#: archive.c:439

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

-#: archive.c:350 builtin/archive.c:90 builtin/clone.c:84
+#: archive.c:441 builtin/archive.c:90 builtin/clone.c:85

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

-#: archive.c:351 builtin/archive.c:91
+#: archive.c:442 builtin/archive.c:91

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

-#: archive.c:352 builtin/archive.c:92 builtin/notes.c:491
+#: archive.c:443 builtin/archive.c:92 builtin/notes.c:490

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

-#: archive.c:353 builtin/archive.c:93
+#: archive.c:444 builtin/archive.c:93

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

-#: attr.c:259
+#: attr.c:258

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


@@ -176,31 +175,31 @@ msgstr ""
 msgid "Not tracking: ambiguous information for ref %s"
 msgstr ""
 
 msgid "Not tracking: ambiguous information for ref %s"
 msgstr ""
 

-#: branch.c:178
+#: branch.c:162

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

-#: branch.c:183
+#: branch.c:167

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

-#: branch.c:191
+#: branch.c:175

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

-#: branch.c:211
+#: branch.c:195

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

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

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

-#: branch.c:215
+#: branch.c:199

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


@@ -212,107 +211,105 @@ msgid ""
 "\"git push -u\" to set the upstream config as you push."
 msgstr ""
 
 "\"git push -u\" to set the upstream config as you push."
 msgstr ""
 

-#: branch.c:260
+#: branch.c:243

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

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

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

-#: branch.c:285
+#: branch.c:268

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

-#: branch.c:291
-msgid "Failed to lock ref for update"
-msgstr ""
-
-#: branch.c:309
-msgid "Failed to write ref"
-msgstr ""
-
-#: bundle.c:33
+#: bundle.c:34

 #, c-format
 msgid "'%s' does not look like a v2 bundle file"
 msgstr ""
 
 #, c-format
 msgid "'%s' does not look like a v2 bundle file"
 msgstr ""
 

-#: bundle.c:60
+#: bundle.c:61

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

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

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

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

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

-#: 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
+#: bundle.c:163 sequencer.c:641 sequencer.c:1096 builtin/blame.c:2706
+#: builtin/branch.c:652 builtin/commit.c:1085 builtin/log.c:330
+#: builtin/log.c:823 builtin/log.c:1432 builtin/log.c:1669 builtin/merge.c:357

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

-#: bundle.c:184
+#: bundle.c:185

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

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

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

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

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

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

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

-#: bundle.c:295 builtin/log.c:1339 builtin/shortlog.c:261
+#: bundle.c:298 builtin/log.c:153 builtin/log.c:1342 builtin/shortlog.c:261

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

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

 #, 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:375
+#: bundle.c:378

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

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

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

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

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

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

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

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

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

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

 #: commit.c:40
 #, c-format
 msgid "could not parse %s"
 #: commit.c:40
 #, c-format
 msgid "could not parse %s"


@@ -327,16 +324,69 @@ msgstr ""
 msgid "memory exhausted"
 msgstr ""
 
 msgid "memory exhausted"
 msgstr ""
 

-#: connected.c:70
+#: config.c:469 config.c:471
+#, c-format
+msgid "bad config file line %d in %s"
+msgstr ""
+
+#: config.c:587
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in %s: %s"
+msgstr ""
+
+#: config.c:589
+#, c-format
+msgid "bad numeric config value '%s' for '%s': %s"
+msgstr ""
+
+#: config.c:674
+#, c-format
+msgid "failed to expand user dir in: '%s'"
+msgstr ""
+
+#: config.c:752 config.c:763
+#, c-format
+msgid "bad zlib compression level %d"
+msgstr ""
+
+#: config.c:885
+#, c-format
+msgid "invalid mode for object creation: %s"
+msgstr ""
+
+#: config.c:1201
+msgid "unable to parse command-line config"
+msgstr ""
+
+#: config.c:1262
+msgid "unknown error occured while reading the configuration files"
+msgstr ""
+
+#: config.c:1586
+#, c-format
+msgid "unable to parse '%s' from command-line config"
+msgstr ""
+
+#: config.c:1588
+#, c-format
+msgid "bad config variable '%s' in file '%s' at line %d"
+msgstr ""
+
+#: config.c:1647
+#, c-format
+msgid "%s has multiple values"
+msgstr ""
+
+#: connected.c:69

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

-#: connected.c:90
+#: connected.c:89

 #, c-format
 msgid "failed write to rev-list: %s"
 msgstr ""
 
 #, c-format
 msgid "failed write to rev-list: %s"
 msgstr ""
 

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

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


@@ -414,7 +464,7 @@ msgstr[1] ""
 msgid "failed to read orderfile '%s'"
 msgstr ""
 
 msgid "failed to read orderfile '%s'"
 msgstr ""
 

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

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


@@ -433,67 +483,67 @@ msgstr ""
 msgid "Unknown value for 'diff.submodule' config variable: '%s'"
 msgstr ""
 
 msgid "Unknown value for 'diff.submodule' config variable: '%s'"
 msgstr ""
 

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

 #, 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:2934
+#: diff.c:2957

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

-#: diff.c:3329
+#: diff.c:3352

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

-#: diff.c:3492
+#: diff.c:3515

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

 #, 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:73 gpg-interface.c:145
+#: gpg-interface.c:129 gpg-interface.c:200

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

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

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

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

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

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

 #, 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:132
+#: gpg-interface.c:188

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

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

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

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

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

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

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


@@ -554,256 +604,264 @@ msgstr[1] ""
 msgid "%s: %s - %s"
 msgstr ""
 
 msgid "%s: %s - %s"
 msgstr ""
 

-#: merge.c:40
+#: lockfile.c:275
+msgid "BUG: reopen a lockfile that is still open"
+msgstr ""
+
+#: lockfile.c:277
+msgid "BUG: reopen a lockfile that has been committed"
+msgstr ""
+
+#: merge.c:41

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

-#: merge.c:93 builtin/checkout.c:356 builtin/checkout.c:556
-#: builtin/clone.c:661
+#: merge.c:94 builtin/checkout.c:356 builtin/checkout.c:562
+#: builtin/clone.c:659

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

-#: merge-recursive.c:190
+#: merge-recursive.c:189

 #, c-format
 msgid "(bad commit)\n"
 msgstr ""
 
 #, c-format
 msgid "(bad commit)\n"
 msgstr ""
 

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

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

-#: merge-recursive.c:271
+#: merge-recursive.c:270

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-#: merge-recursive.c:1037 merge-recursive.c:1051
+#: merge-recursive.c:1036 merge-recursive.c:1050

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-#: merge-recursive.c:1478 merge-recursive.c:1676
+#: merge-recursive.c:1477 merge-recursive.c:1675

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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


@@ -828,33 +886,33 @@ msgstr ""
 msgid "Bad %s value: '%s'"
 msgstr ""
 
 msgid "Bad %s value: '%s'"
 msgstr ""
 

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

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

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

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

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

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

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

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

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

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

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


@@ -918,69 +976,73 @@ msgid ""
 "Perhaps you forgot to add either ':/' or '.' ?"
 msgstr ""
 
 "Perhaps you forgot to add either ':/' or '.' ?"
 msgstr ""
 

+#: pretty.c:968
+msgid "unable to parse --pretty format"
+msgstr ""
+

 #: progress.c:225
 msgid "done"
 msgstr ""
 
 #: progress.c:225
 msgid "done"
 msgstr ""
 

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

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

 #, 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:753
+#: remote.c:782

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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


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

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

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

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

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


@@ -1003,266 +1065,270 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
 msgstr[0] ""
 msgstr[1] ""
 

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

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

-#: run-command.c:80
+#: run-command.c:87

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

-#: run-command.c:82
+#: run-command.c:89

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

-#: sequencer.c:171 builtin/merge.c:782 builtin/merge.c:893
-#: builtin/merge.c:1003 builtin/merge.c:1013
+#: send-pack.c:265
+msgid "failed to sign the push certificate"
+msgstr ""
+
+#: send-pack.c:322
+msgid "the receiving end does not support --signed push"
+msgstr ""
+
+#: sequencer.c:172 builtin/merge.c:781 builtin/merge.c:892
+#: builtin/merge.c:1002 builtin/merge.c:1012

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

-#: sequencer.c:173 builtin/merge.c:343 builtin/merge.c:785
-#: builtin/merge.c:1005 builtin/merge.c:1018
+#: sequencer.c:174 builtin/merge.c:343 builtin/merge.c:784
+#: builtin/merge.c:1004 builtin/merge.c:1017

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

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

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

 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:210 sequencer.c:841 sequencer.c:924
+#: sequencer.c:211 sequencer.c:852 sequencer.c:935

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

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

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

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

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

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

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

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

 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:293
+#: sequencer.c:304

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 #, 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:506
+#: sequencer.c:517

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-#: sequencer.c:843 sequencer.c:928
+#: sequencer.c:854 sequencer.c:939

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

-#: sequencer.c:862 sequencer.c:998
+#: sequencer.c:873 sequencer.c:1009

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

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

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

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

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

-#: sequencer.c:888 builtin/apply.c:4062
+#: sequencer.c:899 builtin/apply.c:4128

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 msgid ""
 "Git normally never creates a ref that ends with 40 hex characters\n"
 "because it will be ignored when you just specify 40-hex. These refs\n"
 msgid ""
 "Git normally never creates a ref that ends with 40 hex characters\n"
 "because it will be ignored when you just specify 40-hex. These refs\n"


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

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

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

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

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

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

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

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

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


@@ -1317,16 +1383,41 @@ msgstr ""
 msgid "staging updated .gitmodules failed"
 msgstr ""
 
 msgid "staging updated .gitmodules failed"
 msgstr ""
 

-#: submodule.c:1118 builtin/init-db.c:363
+#: submodule.c:1111 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:1129
+#: submodule.c:1122

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

+#: trailer.c:500 trailer.c:504 trailer.c:508 trailer.c:562 trailer.c:566
+#: trailer.c:570
+#, c-format
+msgid "unknown value '%s' for key '%s'"
+msgstr ""
+
+#: trailer.c:552 trailer.c:557 builtin/remote.c:288
+#, c-format
+msgid "more than one %s"
+msgstr ""
+
+#: trailer.c:587
+#, c-format
+msgid "empty trailer token in trailer '%s'"
+msgstr ""
+
+#: trailer.c:706
+#, c-format
+msgid "could not read input file '%s'"
+msgstr ""
+
+#: trailer.c:709
+msgid "could not read from stdin"
+msgstr ""
+

 #: unpack-trees.c:202
 msgid "Checking out files"
 msgstr ""
 #: unpack-trees.c:202
 msgid "Checking out files"
 msgstr ""


@@ -1360,25 +1451,29 @@ msgstr ""
 msgid "invalid '..' path segment"
 msgstr ""
 
 msgid "invalid '..' path segment"
 msgstr ""
 

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

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

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

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

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

 #, 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:493
+#: wrapper.c:542

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

+#: wrapper.c:550
+msgid "unable to get current working directory"
+msgstr ""
+

 #: wt-status.c:150
 msgid "Unmerged paths:"
 msgstr ""
 #: wt-status.c:150
 msgid "Unmerged paths:"
 msgstr ""


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

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

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

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

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

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

 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:936
+#: wt-status.c:933

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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


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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-#: wt-status.c:1555 wt-status.c:1563
+#: wt-status.c:1552 wt-status.c:1560

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

-#: compat/precompose_utf8.c:55 builtin/clone.c:356
+#: compat/precompose_utf8.c:55 builtin/clone.c:357

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

-#: builtin/add.c:21
+#: builtin/add.c:22

 msgid "git add [options] [--] <pathspec>..."
 msgstr ""
 
 msgid "git add [options] [--] <pathspec>..."
 msgstr ""
 

-#: builtin/add.c:64
+#: builtin/add.c:65

 #, c-format
 msgid "unexpected diff status %c"
 msgstr ""
 
 #, c-format
 msgid "unexpected diff status %c"
 msgstr ""
 

-#: builtin/add.c:69 builtin/commit.c:261
+#: builtin/add.c:70 builtin/commit.c:275

 msgid "updating files failed"
 msgstr ""
 
 msgid "updating files failed"
 msgstr ""
 

-#: builtin/add.c:79
+#: builtin/add.c:80

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

-#: builtin/add.c:133
+#: builtin/add.c:134

 msgid "Unstaged changes after refreshing the index:"
 msgstr ""
 
 msgid "Unstaged changes after refreshing the index:"
 msgstr ""
 

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

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

-#: builtin/add.c:204
+#: builtin/add.c:205

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

-#: builtin/add.c:208
+#: builtin/add.c:209

 msgid "Could not write patch"
 msgstr ""
 
 msgid "Could not write patch"
 msgstr ""
 

-#: builtin/add.c:213
+#: builtin/add.c:214

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

-#: builtin/add.c:215
+#: builtin/add.c:216

 msgid "Empty patch. Aborted."
 msgstr ""
 
 msgid "Empty patch. Aborted."
 msgstr ""
 


@@ -1839,15 +1934,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:875 builtin/fetch.c:108 builtin/mv.c:70
-#: builtin/prune-packed.c:77 builtin/push.c:488 builtin/remote.c:1367
+#: builtin/add.c:248 builtin/clean.c:875 builtin/fetch.c:108 builtin/mv.c:110
+#: builtin/prune-packed.c:55 builtin/push.c:499 builtin/remote.c:1375

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

-#: 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
+#: builtin/add.c:249 builtin/apply.c:4415 builtin/check-ignore.c:19
+#: builtin/commit.c:1362 builtin/count-objects.c:63 builtin/fsck.c:608
+#: builtin/log.c:1617 builtin/mv.c:109 builtin/read-tree.c:114

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


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

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

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


@@ -1927,74 +2022,74 @@ msgid "Maybe you wanted to say 'git add .'?\n"
 msgstr ""
 
 #: builtin/add.c:363 builtin/check-ignore.c:172 builtin/clean.c:919
 msgstr ""
 
 #: 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
+#: builtin/commit.c:333 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:299

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

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

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

-#: builtin/apply.c:57
+#: builtin/apply.c:58

 msgid "git apply [options] [<patch>...]"
 msgstr ""
 
 msgid "git apply [options] [<patch>...]"
 msgstr ""
 

-#: builtin/apply.c:110
+#: builtin/apply.c:111

 #, c-format
 msgid "unrecognized whitespace option '%s'"
 msgstr ""
 
 #, c-format
 msgid "unrecognized whitespace option '%s'"
 msgstr ""
 

-#: builtin/apply.c:125
+#: builtin/apply.c:126

 #, c-format
 msgid "unrecognized whitespace ignore option '%s'"
 msgstr ""
 
 #, c-format
 msgid "unrecognized whitespace ignore option '%s'"
 msgstr ""
 

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

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

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

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

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

 #, 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:947
+#: builtin/apply.c:948

 #, 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:951
+#: builtin/apply.c:952

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

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

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

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

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

-#: builtin/apply.c:1422
+#: builtin/apply.c:1423

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

-#: builtin/apply.c:1479
+#: builtin/apply.c:1480

 #, c-format
 msgid "patch fragment without header at line %d: %.*s"
 msgstr ""
 
 #, c-format
 msgid "patch fragment without header at line %d: %.*s"
 msgstr ""
 

-#: builtin/apply.c:1496
+#: builtin/apply.c:1497

 #, c-format
 msgid ""
 "git diff header lacks filename information when removing %d leading pathname "
 #, c-format
 msgid ""
 "git diff header lacks filename information when removing %d leading pathname "


@@ -2005,394 +2100,394 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
 msgstr[0] ""
 msgstr[1] ""
 

-#: builtin/apply.c:1656
+#: builtin/apply.c:1657

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

-#: builtin/apply.c:1658
+#: builtin/apply.c:1659

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

-#: builtin/apply.c:1684
+#: builtin/apply.c:1685

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

-#: builtin/apply.c:1720
+#: builtin/apply.c:1721

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

-#: builtin/apply.c:1722
+#: builtin/apply.c:1723

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

-#: builtin/apply.c:1725
+#: builtin/apply.c:1726

 #, c-format
 msgid "** warning: file %s becomes empty but is not deleted"
 msgstr ""
 
 #, c-format
 msgid "** warning: file %s becomes empty but is not deleted"
 msgstr ""
 

-#: builtin/apply.c:1871
+#: builtin/apply.c:1872

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

-#: builtin/apply.c:1900
+#: builtin/apply.c:1901

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

-#: builtin/apply.c:1986
+#: builtin/apply.c:2052

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

-#: builtin/apply.c:2076
+#: builtin/apply.c:2142

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

-#: builtin/apply.c:2080
+#: builtin/apply.c:2146

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

-#: builtin/apply.c:2688
+#: builtin/apply.c:2754

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

-#: builtin/apply.c:2806
+#: builtin/apply.c:2872

 #, c-format
 msgid "Hunk #%d succeeded at %d (offset %d line)."
 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
 msgid "Hunk #%d succeeded at %d (offset %d line)."
 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
 msgstr[0] ""
 msgstr[1] ""
 

-#: builtin/apply.c:2818
+#: builtin/apply.c:2884

 #, c-format
 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
 msgstr ""
 
 #, c-format
 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
 msgstr ""
 

-#: builtin/apply.c:2824
+#: builtin/apply.c:2890

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

-#: builtin/apply.c:2843
+#: builtin/apply.c:2909

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

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

 #, 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:2950
+#: builtin/apply.c:3016

 #, 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:2971
+#: builtin/apply.c:3037

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

-#: builtin/apply.c:3095
+#: builtin/apply.c:3161

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

-#: builtin/apply.c:3140 builtin/apply.c:3149 builtin/apply.c:3194
+#: builtin/apply.c:3206 builtin/apply.c:3215 builtin/apply.c:3260

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

-#: builtin/apply.c:3174 builtin/apply.c:3396
+#: builtin/apply.c:3240 builtin/apply.c:3462

 #, c-format
 msgid "path %s has been renamed/deleted"
 msgstr ""
 
 #, c-format
 msgid "path %s has been renamed/deleted"
 msgstr ""
 

-#: builtin/apply.c:3255 builtin/apply.c:3410
+#: builtin/apply.c:3321 builtin/apply.c:3476

 #, c-format
 msgid "%s: does not exist in index"
 msgstr ""
 
 #, c-format
 msgid "%s: does not exist in index"
 msgstr ""
 

-#: builtin/apply.c:3259 builtin/apply.c:3402 builtin/apply.c:3424
+#: builtin/apply.c:3325 builtin/apply.c:3468 builtin/apply.c:3490

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

-#: builtin/apply.c:3264 builtin/apply.c:3418
+#: builtin/apply.c:3330 builtin/apply.c:3484

 #, c-format
 msgid "%s: does not match index"
 msgstr ""
 
 #, c-format
 msgid "%s: does not match index"
 msgstr ""
 

-#: builtin/apply.c:3366
+#: builtin/apply.c:3432

 msgid "removal patch leaves file contents"
 msgstr ""
 
 msgid "removal patch leaves file contents"
 msgstr ""
 

-#: builtin/apply.c:3435
+#: builtin/apply.c:3501

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

-#: builtin/apply.c:3437
+#: builtin/apply.c:3503

 #, c-format
 msgid "%s has type %o, expected %o"
 msgstr ""
 
 #, c-format
 msgid "%s has type %o, expected %o"
 msgstr ""
 

-#: builtin/apply.c:3538
+#: builtin/apply.c:3604

 #, c-format
 msgid "%s: already exists in index"
 msgstr ""
 
 #, c-format
 msgid "%s: already exists in index"
 msgstr ""
 

-#: builtin/apply.c:3541
+#: builtin/apply.c:3607

 #, c-format
 msgid "%s: already exists in working directory"
 msgstr ""
 
 #, c-format
 msgid "%s: already exists in working directory"
 msgstr ""
 

-#: builtin/apply.c:3561
+#: builtin/apply.c:3627

 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o)"
 msgstr ""
 
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o)"
 msgstr ""
 

-#: builtin/apply.c:3566
+#: builtin/apply.c:3632

 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
 msgstr ""
 
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
 msgstr ""
 

-#: builtin/apply.c:3574
+#: builtin/apply.c:3640

 #, c-format
 msgid "%s: patch does not apply"
 msgstr ""
 
 #, c-format
 msgid "%s: patch does not apply"
 msgstr ""
 

-#: builtin/apply.c:3587
+#: builtin/apply.c:3653

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

-#: builtin/apply.c:3680 builtin/checkout.c:213 builtin/reset.c:134
+#: builtin/apply.c:3746 builtin/checkout.c:213 builtin/reset.c:135

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

-#: builtin/apply.c:3823
+#: builtin/apply.c:3889

 #, c-format
 msgid "unable to remove %s from index"
 msgstr ""
 
 #, c-format
 msgid "unable to remove %s from index"
 msgstr ""
 

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

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

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

 #, 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:3861
+#: builtin/apply.c:3927

 #, 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:3864 builtin/apply.c:3972
+#: builtin/apply.c:3930 builtin/apply.c:4038

 #, 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:3897
+#: builtin/apply.c:3963

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

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

 #, 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:4033
+#: builtin/apply.c:4099

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

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

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

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

 #, 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:4054
+#: builtin/apply.c:4120

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

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

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

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

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

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

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

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

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

-#: builtin/apply.c:4358 builtin/apply.c:4361 builtin/clone.c:90
+#: builtin/apply.c:4362 builtin/apply.c:4365 builtin/clone.c:91

 #: builtin/fetch.c:93
 msgid "path"
 msgstr ""
 
 #: builtin/fetch.c:93
 msgid "path"
 msgstr ""
 

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

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

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

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

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

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

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

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

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

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

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

 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:4374
+#: builtin/apply.c:4378

 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:4376
+#: builtin/apply.c:4380

 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:4378
+#: builtin/apply.c:4382

 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:4380
+#: builtin/apply.c:4384

 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:4382
+#: builtin/apply.c:4386

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

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

 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:4386
+#: builtin/apply.c:4390

 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:4388
+#: builtin/apply.c:4392

 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:4390 builtin/checkout-index.c:198 builtin/ls-files.c:455
+#: builtin/apply.c:4394 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:4393
+#: builtin/apply.c:4397

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

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

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

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

 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:4398 builtin/apply.c:4401
+#: builtin/apply.c:4402 builtin/apply.c:4405

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

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

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

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

 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:4408
+#: builtin/apply.c:4412

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

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

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

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

 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:4416
+#: builtin/apply.c:4420

 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:4418
+#: builtin/apply.c:4422

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

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

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

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

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

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

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

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

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

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

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

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

 #, 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:4488 builtin/apply.c:4498
+#: builtin/apply.c:4492 builtin/apply.c:4502

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


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

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

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


@@ -2572,371 +2667,371 @@ msgstr ""
 msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>"
 msgstr ""
 
 msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>"
 msgstr ""
 

-#: builtin/branch.c:150
+#: builtin/branch.c:152

 #, c-format
 msgid ""
 "deleting branch '%s' that has been merged to\n"
 "         '%s', but not yet merged to HEAD."
 msgstr ""
 
 #, c-format
 msgid ""
 "deleting branch '%s' that has been merged to\n"
 "         '%s', but not yet merged to HEAD."
 msgstr ""
 

-#: builtin/branch.c:154
+#: builtin/branch.c:156

 #, c-format
 msgid ""
 "not deleting branch '%s' that is not yet merged to\n"
 "         '%s', even though it is merged to HEAD."
 msgstr ""
 
 #, c-format
 msgid ""
 "not deleting branch '%s' that is not yet merged to\n"
 "         '%s', even though it is merged to HEAD."
 msgstr ""
 

-#: builtin/branch.c:168
+#: builtin/branch.c:170

 #, c-format
 msgid "Couldn't look up commit object for '%s'"
 msgstr ""
 
 #, c-format
 msgid "Couldn't look up commit object for '%s'"
 msgstr ""
 

-#: builtin/branch.c:172
+#: builtin/branch.c:174

 #, c-format
 msgid ""
 "The branch '%s' is not fully merged.\n"
 "If you are sure you want to delete it, run 'git branch -D %s'."
 msgstr ""
 
 #, c-format
 msgid ""
 "The branch '%s' is not fully merged.\n"
 "If you are sure you want to delete it, run 'git branch -D %s'."
 msgstr ""
 

-#: builtin/branch.c:185
+#: builtin/branch.c:187

 msgid "Update of config-file failed"
 msgstr ""
 
 msgid "Update of config-file failed"
 msgstr ""
 

-#: builtin/branch.c:213
+#: builtin/branch.c:215

 msgid "cannot use -a with -d"
 msgstr ""
 
 msgid "cannot use -a with -d"
 msgstr ""
 

-#: builtin/branch.c:219
+#: builtin/branch.c:221

 msgid "Couldn't look up commit object for HEAD"
 msgstr ""
 
 msgid "Couldn't look up commit object for HEAD"
 msgstr ""
 

-#: builtin/branch.c:227
+#: builtin/branch.c:229

 #, c-format
 msgid "Cannot delete the branch '%s' which you are currently on."
 msgstr ""
 
 #, c-format
 msgid "Cannot delete the branch '%s' which you are currently on."
 msgstr ""
 

-#: builtin/branch.c:240
+#: builtin/branch.c:245

 #, c-format
 msgid "remote branch '%s' not found."
 msgstr ""
 
 #, c-format
 msgid "remote branch '%s' not found."
 msgstr ""
 

-#: builtin/branch.c:241
+#: builtin/branch.c:246

 #, c-format
 msgid "branch '%s' not found."
 msgstr ""
 
 #, c-format
 msgid "branch '%s' not found."
 msgstr ""
 

-#: builtin/branch.c:255
+#: builtin/branch.c:260

 #, c-format
 msgid "Error deleting remote branch '%s'"
 msgstr ""
 
 #, c-format
 msgid "Error deleting remote branch '%s'"
 msgstr ""
 

-#: builtin/branch.c:256
+#: builtin/branch.c:261

 #, c-format
 msgid "Error deleting branch '%s'"
 msgstr ""
 
 #, c-format
 msgid "Error deleting branch '%s'"
 msgstr ""
 

-#: builtin/branch.c:263
+#: builtin/branch.c:268

 #, c-format
 msgid "Deleted remote branch %s (was %s).\n"
 msgstr ""
 
 #, c-format
 msgid "Deleted remote branch %s (was %s).\n"
 msgstr ""
 

-#: builtin/branch.c:264
+#: builtin/branch.c:269

 #, c-format
 msgid "Deleted branch %s (was %s).\n"
 msgstr ""
 
 #, c-format
 msgid "Deleted branch %s (was %s).\n"
 msgstr ""
 

-#: builtin/branch.c:366
+#: builtin/branch.c:370

 #, c-format
 msgid "branch '%s' does not point at a commit"
 msgstr ""
 
 #, c-format
 msgid "branch '%s' does not point at a commit"
 msgstr ""
 

-#: builtin/branch.c:454
+#: builtin/branch.c:459

 #, c-format
 msgid "[%s: gone]"
 msgstr ""
 
 #, c-format
 msgid "[%s: gone]"
 msgstr ""
 

-#: builtin/branch.c:459
+#: builtin/branch.c:464

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

-#: builtin/branch.c:464
+#: builtin/branch.c:469

 #, c-format
 msgid "[%s: behind %d]"
 msgstr ""
 
 #, c-format
 msgid "[%s: behind %d]"
 msgstr ""
 

-#: builtin/branch.c:466
+#: builtin/branch.c:471

 #, c-format
 msgid "[behind %d]"
 msgstr ""
 
 #, c-format
 msgid "[behind %d]"
 msgstr ""
 

-#: builtin/branch.c:470
+#: builtin/branch.c:475

 #, c-format
 msgid "[%s: ahead %d]"
 msgstr ""
 
 #, c-format
 msgid "[%s: ahead %d]"
 msgstr ""
 

-#: builtin/branch.c:472
+#: builtin/branch.c:477

 #, c-format
 msgid "[ahead %d]"
 msgstr ""
 
 #, c-format
 msgid "[ahead %d]"
 msgstr ""
 

-#: builtin/branch.c:475
+#: builtin/branch.c:480

 #, c-format
 msgid "[%s: ahead %d, behind %d]"
 msgstr ""
 
 #, c-format
 msgid "[%s: ahead %d, behind %d]"
 msgstr ""
 

-#: builtin/branch.c:478
+#: builtin/branch.c:483

 #, c-format
 msgid "[ahead %d, behind %d]"
 msgstr ""
 
 #, c-format
 msgid "[ahead %d, behind %d]"
 msgstr ""
 

-#: builtin/branch.c:502
+#: builtin/branch.c:496

 msgid " **** invalid ref ****"
 msgstr ""
 
 msgid " **** invalid ref ****"
 msgstr ""
 

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

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

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

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

-#: builtin/branch.c:600
+#: builtin/branch.c:593

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

-#: builtin/branch.c:603
+#: builtin/branch.c:596

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

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

 #, c-format
 msgid "object '%s' does not point to a commit"
 msgstr ""
 
 #, c-format
 msgid "object '%s' does not point to a commit"
 msgstr ""
 

-#: builtin/branch.c:681
+#: builtin/branch.c:691

 msgid "some refs could not be read"
 msgstr ""
 
 msgid "some refs could not be read"
 msgstr ""
 

-#: builtin/branch.c:694
+#: builtin/branch.c:704

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

-#: builtin/branch.c:704
+#: builtin/branch.c:714

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

-#: builtin/branch.c:719
+#: builtin/branch.c:729

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

-#: builtin/branch.c:723
+#: builtin/branch.c:733

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

-#: builtin/branch.c:727
+#: builtin/branch.c:737

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

-#: builtin/branch.c:734
+#: builtin/branch.c:744

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

-#: builtin/branch.c:749
+#: builtin/branch.c:759

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

-#: builtin/branch.c:773
+#: builtin/branch.c:783

 #, c-format
 msgid "could not write branch description template: %s"
 msgstr ""
 
 #, c-format
 msgid "could not write branch description template: %s"
 msgstr ""
 

-#: builtin/branch.c:803
+#: builtin/branch.c:813

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

-#: builtin/branch.c:805
+#: builtin/branch.c:815

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

-#: builtin/branch.c:806
+#: builtin/branch.c:816

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

-#: builtin/branch.c:807
+#: builtin/branch.c:817

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

-#: builtin/branch.c:809
+#: builtin/branch.c:819

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

-#: builtin/branch.c:813
+#: builtin/branch.c:823

 msgid "use colored output"
 msgstr ""
 
 msgid "use colored output"
 msgstr ""
 

-#: builtin/branch.c:814
+#: builtin/branch.c:824

 msgid "act on remote-tracking branches"
 msgstr ""
 
 msgid "act on remote-tracking branches"
 msgstr ""
 

-#: builtin/branch.c:817 builtin/branch.c:823 builtin/branch.c:844
-#: 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
+#: builtin/branch.c:827 builtin/branch.c:833 builtin/branch.c:854
+#: builtin/branch.c:860 builtin/commit.c:1622 builtin/commit.c:1623
+#: builtin/commit.c:1624 builtin/commit.c:1625 builtin/tag.c:616
+#: builtin/tag.c:622

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

-#: builtin/branch.c:818 builtin/branch.c:824
+#: builtin/branch.c:828 builtin/branch.c:834

 msgid "print only branches that contain the commit"
 msgstr ""
 
 msgid "print only branches that contain the commit"
 msgstr ""
 

-#: builtin/branch.c:830
+#: builtin/branch.c:840

 msgid "Specific git-branch actions:"
 msgstr ""
 
 msgid "Specific git-branch actions:"
 msgstr ""
 

-#: builtin/branch.c:831
+#: builtin/branch.c:841

 msgid "list both remote-tracking and local branches"
 msgstr ""
 
 msgid "list both remote-tracking and local branches"
 msgstr ""
 

-#: builtin/branch.c:833
+#: builtin/branch.c:843

 msgid "delete fully merged branch"
 msgstr ""
 
 msgid "delete fully merged branch"
 msgstr ""
 

-#: builtin/branch.c:834
+#: builtin/branch.c:844

 msgid "delete branch (even if not merged)"
 msgstr ""
 
 msgid "delete branch (even if not merged)"
 msgstr ""
 

-#: builtin/branch.c:835
+#: builtin/branch.c:845

 msgid "move/rename a branch and its reflog"
 msgstr ""
 
 msgid "move/rename a branch and its reflog"
 msgstr ""
 

-#: builtin/branch.c:836
+#: builtin/branch.c:846

 msgid "move/rename a branch, even if target exists"
 msgstr ""
 
 msgid "move/rename a branch, even if target exists"
 msgstr ""
 

-#: builtin/branch.c:837
+#: builtin/branch.c:847

 msgid "list branch names"
 msgstr ""
 
 msgid "list branch names"
 msgstr ""
 

-#: builtin/branch.c:838
+#: builtin/branch.c:848

 msgid "create the branch's reflog"
 msgstr ""
 
 msgid "create the branch's reflog"
 msgstr ""
 

-#: builtin/branch.c:840
+#: builtin/branch.c:850

 msgid "edit the description for the branch"
 msgstr ""
 
 msgid "edit the description for the branch"
 msgstr ""
 

-#: builtin/branch.c:841
+#: builtin/branch.c:851

 msgid "force creation (when already exists)"
 msgstr ""
 
 msgid "force creation (when already exists)"
 msgstr ""
 

-#: builtin/branch.c:844
+#: builtin/branch.c:854

 msgid "print only not merged branches"
 msgstr ""
 
 msgid "print only not merged branches"
 msgstr ""
 

-#: builtin/branch.c:850
+#: builtin/branch.c:860

 msgid "print only merged branches"
 msgstr ""
 
 msgid "print only merged branches"
 msgstr ""
 

-#: builtin/branch.c:854
+#: builtin/branch.c:864

 msgid "list branches in columns"
 msgstr ""
 
 msgid "list branches in columns"
 msgstr ""
 

-#: builtin/branch.c:867
+#: builtin/branch.c:877

 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:636
+#: builtin/branch.c:881 builtin/clone.c:634

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

-#: builtin/branch.c:896
+#: builtin/branch.c:903

 msgid "--column and --verbose are incompatible"
 msgstr ""
 
 msgid "--column and --verbose are incompatible"
 msgstr ""
 

-#: builtin/branch.c:902 builtin/branch.c:941
+#: builtin/branch.c:909 builtin/branch.c:948

 msgid "branch name required"
 msgstr ""
 
 msgid "branch name required"
 msgstr ""
 

-#: builtin/branch.c:917
+#: builtin/branch.c:924

 msgid "Cannot give description to detached HEAD"
 msgstr ""
 
 msgid "Cannot give description to detached HEAD"
 msgstr ""
 

-#: builtin/branch.c:922
+#: builtin/branch.c:929

 msgid "cannot edit description of more than one branch"
 msgstr ""
 
 msgid "cannot edit description of more than one branch"
 msgstr ""
 

-#: builtin/branch.c:929
+#: builtin/branch.c:936

 #, c-format
 msgid "No commit on branch '%s' yet."
 msgstr ""
 
 #, c-format
 msgid "No commit on branch '%s' yet."
 msgstr ""
 

-#: builtin/branch.c:932
+#: builtin/branch.c:939

 #, c-format
 msgid "No branch named '%s'."
 msgstr ""
 
 #, c-format
 msgid "No branch named '%s'."
 msgstr ""
 

-#: builtin/branch.c:947
+#: builtin/branch.c:954

 msgid "too many branches for a rename operation"
 msgstr ""
 
 msgid "too many branches for a rename operation"
 msgstr ""
 

-#: builtin/branch.c:952
+#: builtin/branch.c:959

 msgid "too many branches to set new upstream"
 msgstr ""
 
 msgid "too many branches to set new upstream"
 msgstr ""
 

-#: builtin/branch.c:956
+#: builtin/branch.c:963

 #, c-format
 msgid ""
 "could not set upstream of HEAD to %s when it does not point to any branch."
 msgstr ""
 
 #, c-format
 msgid ""
 "could not set upstream of HEAD to %s when it does not point to any branch."
 msgstr ""
 

-#: builtin/branch.c:959 builtin/branch.c:981 builtin/branch.c:1002
+#: builtin/branch.c:966 builtin/branch.c:988 builtin/branch.c:1009

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

-#: builtin/branch.c:963
+#: builtin/branch.c:970

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

-#: builtin/branch.c:975
+#: builtin/branch.c:982

 msgid "too many branches to unset upstream"
 msgstr ""
 
 msgid "too many branches to unset upstream"
 msgstr ""
 

-#: builtin/branch.c:979
+#: builtin/branch.c:986

 msgid "could not unset upstream of HEAD when it does not point to any branch."
 msgstr ""
 
 msgid "could not unset upstream of HEAD when it does not point to any branch."
 msgstr ""
 

-#: builtin/branch.c:985
+#: builtin/branch.c:992

 #, c-format
 msgid "Branch '%s' has no upstream information"
 msgstr ""
 
 #, c-format
 msgid "Branch '%s' has no upstream information"
 msgstr ""
 

-#: builtin/branch.c:999
+#: builtin/branch.c:1006

 msgid "it does not make sense to create 'HEAD' manually"
 msgstr ""
 
 msgid "it does not make sense to create 'HEAD' manually"
 msgstr ""
 

-#: builtin/branch.c:1005
+#: builtin/branch.c:1012

 msgid "-a and -r options to 'git branch' do not make sense with a branch name"
 msgstr ""
 
 msgid "-a and -r options to 'git branch' do not make sense with a branch name"
 msgstr ""
 

-#: builtin/branch.c:1008
+#: builtin/branch.c:1015

 #, c-format
 msgid ""
 "The --set-upstream flag is deprecated and will be removed. Consider using --"
 "track or --set-upstream-to\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "The --set-upstream flag is deprecated and will be removed. Consider using --"
 "track or --set-upstream-to\n"
 msgstr ""
 

-#: builtin/branch.c:1025
+#: builtin/branch.c:1032

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


@@ -2944,12 +3039,12 @@ msgid ""
 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-#: builtin/branch.c:1026
+#: builtin/branch.c:1033

 #, c-format
 msgid "    git branch -d %s\n"
 msgstr ""
 
 #, c-format
 msgid "    git branch -d %s\n"
 msgstr ""
 

-#: builtin/branch.c:1027
+#: builtin/branch.c:1034

 #, c-format
 msgid "    git branch --set-upstream-to %s\n"
 msgstr ""
 #, c-format
 msgid "    git branch --set-upstream-to %s\n"
 msgstr ""


@@ -2967,43 +3062,43 @@ msgstr ""
 msgid "Need a repository to unbundle."
 msgstr ""
 
 msgid "Need a repository to unbundle."
 msgstr ""
 

-#: builtin/cat-file.c:331
+#: builtin/cat-file.c:332

 msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>"
 msgstr ""
 
 msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>"
 msgstr ""
 

-#: builtin/cat-file.c:332
+#: builtin/cat-file.c:333

 msgid "git cat-file (--batch|--batch-check) < <list_of_objects>"
 msgstr ""
 
 msgid "git cat-file (--batch|--batch-check) < <list_of_objects>"
 msgstr ""
 

-#: builtin/cat-file.c:369
+#: builtin/cat-file.c:370

 msgid "<type> can be one of: blob, tree, commit, tag"
 msgstr ""
 
 msgid "<type> can be one of: blob, tree, commit, tag"
 msgstr ""
 

-#: builtin/cat-file.c:370
+#: builtin/cat-file.c:371

 msgid "show object type"
 msgstr ""
 
 msgid "show object type"
 msgstr ""
 

-#: builtin/cat-file.c:371
+#: builtin/cat-file.c:372

 msgid "show object size"
 msgstr ""
 
 msgid "show object size"
 msgstr ""
 

-#: builtin/cat-file.c:373
+#: builtin/cat-file.c:374

 msgid "exit with zero when there's no error"
 msgstr ""
 
 msgid "exit with zero when there's no error"
 msgstr ""
 

-#: builtin/cat-file.c:374
+#: builtin/cat-file.c:375

 msgid "pretty-print object's content"
 msgstr ""
 
 msgid "pretty-print object's content"
 msgstr ""
 

-#: builtin/cat-file.c:376
+#: builtin/cat-file.c:377

 msgid "for blob objects, run textconv on object's content"
 msgstr ""
 
 msgid "for blob objects, run textconv on object's content"
 msgstr ""
 

-#: builtin/cat-file.c:378
+#: builtin/cat-file.c:379

 msgid "show info and content of objects fed from the standard input"
 msgstr ""
 
 msgid "show info and content of objects fed from the standard input"
 msgstr ""
 

-#: builtin/cat-file.c:381
+#: builtin/cat-file.c:382

 msgid "show info about objects fed from the standard input"
 msgstr ""
 
 msgid "show info about objects fed from the standard input"
 msgstr ""
 


@@ -3023,7 +3118,7 @@ msgstr ""
 msgid "use .gitattributes only from the index"
 msgstr ""
 
 msgid "use .gitattributes only from the index"
 msgstr ""
 

-#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:75
+#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:98

 msgid "read file names from stdin"
 msgstr ""
 
 msgid "read file names from stdin"
 msgstr ""
 


@@ -3031,7 +3126,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:1083 builtin/gc.c:285
+#: builtin/check-ignore.c:18 builtin/checkout.c:1089 builtin/gc.c:274

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


@@ -3195,46 +3290,46 @@ msgstr ""
 msgid "you need to resolve your current index first"
 msgstr ""
 
 msgid "you need to resolve your current index first"
 msgstr ""
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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


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

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

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


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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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


@@ -3532,7 +3627,7 @@ msgstr ""
 msgid "remove whole directories"
 msgstr ""
 
 msgid "remove whole directories"
 msgstr ""
 

-#: builtin/clean.c:880 builtin/describe.c:406 builtin/grep.c:714
+#: builtin/clean.c:880 builtin/describe.c:407 builtin/grep.c:714

 #: builtin/ls-files.c:486 builtin/name-rev.c:311 builtin/show-ref.c:185
 msgid "pattern"
 msgstr ""
 #: builtin/ls-files.c:486 builtin/name-rev.c:311 builtin/show-ref.c:185
 msgid "pattern"
 msgstr ""


@@ -3565,145 +3660,145 @@ msgid ""
 "refusing to clean"
 msgstr ""
 
 "refusing to clean"
 msgstr ""
 

-#: builtin/clone.c:36
+#: builtin/clone.c:37

 msgid "git clone [options] [--] <repo> [<dir>]"
 msgstr ""
 
 msgid "git clone [options] [--] <repo> [<dir>]"
 msgstr ""
 

-#: builtin/clone.c:64 builtin/fetch.c:112 builtin/merge.c:222
-#: builtin/push.c:503
+#: builtin/clone.c:65 builtin/fetch.c:112 builtin/merge.c:223
+#: builtin/push.c:514

 msgid "force progress reporting"
 msgstr ""
 
 msgid "force progress reporting"
 msgstr ""
 

-#: builtin/clone.c:66
+#: builtin/clone.c:67

 msgid "don't create a checkout"
 msgstr ""
 
 msgid "don't create a checkout"
 msgstr ""
 

-#: builtin/clone.c:67 builtin/clone.c:69 builtin/init-db.c:486
+#: builtin/clone.c:68 builtin/clone.c:70 builtin/init-db.c:488

 msgid "create a bare repository"
 msgstr ""
 
 msgid "create a bare repository"
 msgstr ""
 

-#: builtin/clone.c:71
+#: builtin/clone.c:72

 msgid "create a mirror repository (implies bare)"
 msgstr ""
 
 msgid "create a mirror repository (implies bare)"
 msgstr ""
 

-#: builtin/clone.c:73
+#: builtin/clone.c:74

 msgid "to clone from a local repository"
 msgstr ""
 
 msgid "to clone from a local repository"
 msgstr ""
 

-#: builtin/clone.c:75
+#: builtin/clone.c:76

 msgid "don't use local hardlinks, always copy"
 msgstr ""
 
 msgid "don't use local hardlinks, always copy"
 msgstr ""
 

-#: builtin/clone.c:77
+#: builtin/clone.c:78

 msgid "setup as shared repository"
 msgstr ""
 
 msgid "setup as shared repository"
 msgstr ""
 

-#: builtin/clone.c:79 builtin/clone.c:81
+#: builtin/clone.c:80 builtin/clone.c:82

 msgid "initialize submodules in the clone"
 msgstr ""
 
 msgid "initialize submodules in the clone"
 msgstr ""
 

-#: builtin/clone.c:82 builtin/init-db.c:483
+#: builtin/clone.c:83 builtin/init-db.c:485

 msgid "template-directory"
 msgstr ""
 
 msgid "template-directory"
 msgstr ""
 

-#: builtin/clone.c:83 builtin/init-db.c:484
+#: builtin/clone.c:84 builtin/init-db.c:486

 msgid "directory from which templates will be used"
 msgstr ""
 
 msgid "directory from which templates will be used"
 msgstr ""
 

-#: builtin/clone.c:85
+#: builtin/clone.c:86

 msgid "reference repository"
 msgstr ""
 
 msgid "reference repository"
 msgstr ""
 

-#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44
+#: builtin/clone.c:87 builtin/column.c:26 builtin/merge-file.c:44

 msgid "name"
 msgstr ""
 
 msgid "name"
 msgstr ""
 

-#: builtin/clone.c:87
+#: builtin/clone.c:88

 msgid "use <name> instead of 'origin' to track upstream"
 msgstr ""
 
 msgid "use <name> instead of 'origin' to track upstream"
 msgstr ""
 

-#: builtin/clone.c:89
+#: builtin/clone.c:90

 msgid "checkout <branch> instead of the remote's HEAD"
 msgstr ""
 
 msgid "checkout <branch> instead of the remote's HEAD"
 msgstr ""
 

-#: builtin/clone.c:91
+#: builtin/clone.c:92

 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:113 builtin/grep.c:659
+#: builtin/clone.c:93 builtin/fetch.c:113 builtin/grep.c:659

 msgid "depth"
 msgstr ""
 
 msgid "depth"
 msgstr ""
 

-#: builtin/clone.c:93
+#: builtin/clone.c:94

 msgid "create a shallow clone of that depth"
 msgstr ""
 
 msgid "create a shallow clone of that depth"
 msgstr ""
 

-#: builtin/clone.c:95
+#: builtin/clone.c:96

 msgid "clone only one branch, HEAD or --branch"
 msgstr ""
 
 msgid "clone only one branch, HEAD or --branch"
 msgstr ""
 

-#: builtin/clone.c:96 builtin/init-db.c:492
+#: builtin/clone.c:97 builtin/init-db.c:494

 msgid "gitdir"
 msgstr ""
 
 msgid "gitdir"
 msgstr ""
 

-#: builtin/clone.c:97 builtin/init-db.c:493
+#: builtin/clone.c:98 builtin/init-db.c:495

 msgid "separate git dir from working tree"
 msgstr ""
 
 msgid "separate git dir from working tree"
 msgstr ""
 

-#: builtin/clone.c:98
+#: builtin/clone.c:99

 msgid "key=value"
 msgstr ""
 
 msgid "key=value"
 msgstr ""
 

-#: builtin/clone.c:99
+#: builtin/clone.c:100

 msgid "set config inside the new repository"
 msgstr ""
 
 msgid "set config inside the new repository"
 msgstr ""
 

-#: builtin/clone.c:252
+#: builtin/clone.c:253

 #, c-format
 msgid "reference repository '%s' is not a local repository."
 msgstr ""
 
 #, c-format
 msgid "reference repository '%s' is not a local repository."
 msgstr ""
 

-#: builtin/clone.c:256
+#: builtin/clone.c:257

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

-#: builtin/clone.c:259
+#: builtin/clone.c:260

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

-#: builtin/clone.c:321
+#: builtin/clone.c:322

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

-#: builtin/clone.c:323 builtin/diff.c:83
+#: builtin/clone.c:324 builtin/diff.c:84

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

-#: builtin/clone.c:325
+#: builtin/clone.c:326

 #, c-format
 msgid "%s exists and is not a directory"
 msgstr ""
 
 #, c-format
 msgid "%s exists and is not a directory"
 msgstr ""
 

-#: builtin/clone.c:339
+#: builtin/clone.c:340

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

-#: builtin/clone.c:361
+#: builtin/clone.c:362

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

-#: builtin/clone.c:365
+#: builtin/clone.c:366

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

-#: builtin/clone.c:388 builtin/clone.c:565
+#: builtin/clone.c:389 builtin/clone.c:563

 #, c-format
 msgid "done.\n"
 msgstr ""
 #, c-format
 msgid "done.\n"
 msgstr ""


@@ -3715,108 +3810,108 @@ msgid ""
 "and retry the checkout with 'git checkout -f HEAD'\n"
 msgstr ""
 
 "and retry the checkout with 'git checkout -f HEAD'\n"
 msgstr ""
 

-#: builtin/clone.c:480
+#: builtin/clone.c:478

 #, c-format
 msgid "Could not find remote branch %s to clone."
 msgstr ""
 
 #, c-format
 msgid "Could not find remote branch %s to clone."
 msgstr ""
 

-#: builtin/clone.c:560
+#: builtin/clone.c:558

 #, c-format
 msgid "Checking connectivity... "
 msgstr ""
 
 #, c-format
 msgid "Checking connectivity... "
 msgstr ""
 

-#: builtin/clone.c:563
+#: builtin/clone.c:561

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

-#: builtin/clone.c:627
+#: builtin/clone.c:625

 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:658
+#: builtin/clone.c:656

 msgid "unable to checkout working tree"
 msgstr ""
 
 msgid "unable to checkout working tree"
 msgstr ""
 

-#: builtin/clone.c:768
+#: builtin/clone.c:765

 msgid "Too many arguments."
 msgstr ""
 
 msgid "Too many arguments."
 msgstr ""
 

-#: builtin/clone.c:772
+#: builtin/clone.c:769

 msgid "You must specify a repository to clone."
 msgstr ""
 
 msgid "You must specify a repository to clone."
 msgstr ""
 

-#: builtin/clone.c:783
+#: builtin/clone.c:780

 #, 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:786
+#: builtin/clone.c:783

 msgid "--bare and --separate-git-dir are incompatible."
 msgstr ""
 
 msgid "--bare and --separate-git-dir are incompatible."
 msgstr ""
 

-#: builtin/clone.c:799
+#: builtin/clone.c:796

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

-#: builtin/clone.c:805 builtin/fetch.c:1143
+#: builtin/clone.c:802 builtin/fetch.c:1155

 #, 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:815
+#: builtin/clone.c:812

 #, 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:825
+#: builtin/clone.c:822

 #, c-format
 msgid "working tree '%s' already exists."
 msgstr ""
 
 #, c-format
 msgid "working tree '%s' already exists."
 msgstr ""
 

-#: builtin/clone.c:838 builtin/clone.c:850
+#: builtin/clone.c:835 builtin/clone.c:847

 #, 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:841
+#: builtin/clone.c:838

 #, 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:860
+#: builtin/clone.c:857

 #, c-format
 msgid "Cloning into bare repository '%s'...\n"
 msgstr ""
 
 #, c-format
 msgid "Cloning into bare repository '%s'...\n"
 msgstr ""
 

-#: builtin/clone.c:862
+#: builtin/clone.c:859

 #, c-format
 msgid "Cloning into '%s'...\n"
 msgstr ""
 
 #, c-format
 msgid "Cloning into '%s'...\n"
 msgstr ""
 

-#: builtin/clone.c:898
+#: builtin/clone.c:895

 msgid "--depth is ignored in local clones; use file:// instead."
 msgstr ""
 
 msgid "--depth is ignored in local clones; use file:// instead."
 msgstr ""
 

-#: builtin/clone.c:901
+#: builtin/clone.c:898

 msgid "source repository is shallow, ignoring --local"
 msgstr ""
 
 msgid "source repository is shallow, ignoring --local"
 msgstr ""
 

-#: builtin/clone.c:906
+#: builtin/clone.c:903

 msgid "--local is ignored"
 msgstr ""
 
 msgid "--local is ignored"
 msgstr ""
 

-#: builtin/clone.c:910
+#: builtin/clone.c:907

 #, 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:961 builtin/clone.c:969
+#: builtin/clone.c:958 builtin/clone.c:966

 #, 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:972
+#: builtin/clone.c:969

 msgid "You appear to have cloned an empty repository."
 msgstr ""
 
 msgid "You appear to have cloned an empty repository."
 msgstr ""
 


@@ -3852,15 +3947,30 @@ msgstr ""
 msgid "--command must be the first argument"
 msgstr ""
 
 msgid "--command must be the first argument"
 msgstr ""
 

-#: builtin/commit.c:36
+#: builtin/commit.c:37

 msgid "git commit [options] [--] <pathspec>..."
 msgstr ""
 
 msgid "git commit [options] [--] <pathspec>..."
 msgstr ""
 

-#: builtin/commit.c:41
+#: builtin/commit.c:42

 msgid "git status [options] [--] <pathspec>..."
 msgstr ""
 
 msgid "git status [options] [--] <pathspec>..."
 msgstr ""
 

-#: builtin/commit.c:46
+#: builtin/commit.c:47
+msgid ""
+"Your name and email address were configured automatically based\n"
+"on your username and hostname. Please check that they are accurate.\n"
+"You can suppress this message by setting them explicitly. Run the\n"
+"following command and follow the instructions in your editor to edit\n"
+"your configuration file:\n"
+"\n"
+"    git config --global --edit\n"
+"\n"
+"After doing this, you may fix the identity used for this commit with:\n"
+"\n"
+"    git commit --amend --reset-author\n"
+msgstr ""
+
+#: builtin/commit.c:60

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


@@ -3874,14 +3984,14 @@ msgid ""
 "    git commit --amend --reset-author\n"
 msgstr ""
 
 "    git commit --amend --reset-author\n"
 msgstr ""
 

-#: builtin/commit.c:58
+#: builtin/commit.c:72

 msgid ""
 "You asked to amend the most recent commit, but doing so would make\n"
 "it empty. You can repeat your command with --allow-empty, or you can\n"
 "remove the commit entirely with \"git reset HEAD^\".\n"
 msgstr ""
 
 msgid ""
 "You asked to amend the most recent commit, but doing so would make\n"
 "it empty. You can repeat your command with --allow-empty, or you can\n"
 "remove the commit entirely with \"git reset HEAD^\".\n"
 msgstr ""
 

-#: builtin/commit.c:63
+#: builtin/commit.c:77

 msgid ""
 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
 "If you wish to commit it anyway, use:\n"
 msgid ""
 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
 "If you wish to commit it anyway, use:\n"


@@ -3890,11 +4000,11 @@ msgid ""
 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-#: builtin/commit.c:70
+#: builtin/commit.c:84

 msgid "Otherwise, please use 'git reset'\n"
 msgstr ""
 
 msgid "Otherwise, please use 'git reset'\n"
 msgstr ""
 

-#: builtin/commit.c:73
+#: builtin/commit.c:87

 msgid ""
 "If you wish to skip this commit, use:\n"
 "\n"
 msgid ""
 "If you wish to skip this commit, use:\n"
 "\n"


@@ -3904,100 +4014,117 @@ msgid ""
 "the remaining commits.\n"
 msgstr ""
 
 "the remaining commits.\n"
 msgstr ""
 

-#: builtin/commit.c:288
+#: builtin/commit.c:302

 msgid "failed to unpack HEAD tree object"
 msgstr ""
 
 msgid "failed to unpack HEAD tree object"
 msgstr ""
 

-#: builtin/commit.c:328
+#: builtin/commit.c:342

 msgid "unable to create temporary index"
 msgstr ""
 
 msgid "unable to create temporary index"
 msgstr ""
 

-#: builtin/commit.c:334
+#: builtin/commit.c:348

 msgid "interactive add failed"
 msgstr ""
 
 msgid "interactive add failed"
 msgstr ""
 

-#: builtin/commit.c:366 builtin/commit.c:387 builtin/commit.c:435
+#: builtin/commit.c:359
+msgid "unable to write index file"
+msgstr ""
+
+#: builtin/commit.c:361
+msgid "unable to update temporary index"
+msgstr ""
+
+#: builtin/commit.c:363
+msgid "Failed to update main cache tree"
+msgstr ""
+
+#: builtin/commit.c:387 builtin/commit.c:412 builtin/commit.c:461

 msgid "unable to write new_index file"
 msgstr ""
 
 msgid "unable to write new_index file"
 msgstr ""
 

-#: builtin/commit.c:418
+#: builtin/commit.c:443

 msgid "cannot do a partial commit during a merge."
 msgstr ""
 
 msgid "cannot do a partial commit during a merge."
 msgstr ""
 

-#: builtin/commit.c:420
+#: builtin/commit.c:445

 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:429
+#: builtin/commit.c:454

 msgid "cannot read the index"
 msgstr ""
 
 msgid "cannot read the index"
 msgstr ""
 

-#: builtin/commit.c:447
+#: builtin/commit.c:473

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

-#: builtin/commit.c:557 builtin/commit.c:563
+#: builtin/commit.c:592
+#, c-format
+msgid "commit '%s' lacks author header"
+msgstr ""
+
+#: builtin/commit.c:594

 #, c-format
 #, c-format

-msgid "invalid commit: %s"
+msgid "commit '%s' has malformed author line"

 msgstr ""
 
 msgstr ""
 

-#: builtin/commit.c:585
+#: builtin/commit.c:613

 msgid "malformed --author parameter"
 msgstr ""
 
 msgid "malformed --author parameter"
 msgstr ""
 

-#: builtin/commit.c:592
+#: builtin/commit.c:621

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

-#: builtin/commit.c:609
+#: builtin/commit.c:642

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

-#: builtin/commit.c:642
+#: builtin/commit.c:675

 msgid ""
 "unable to select a comment character that is not used\n"
 "in the current commit message"
 msgstr ""
 
 msgid ""
 "unable to select a comment character that is not used\n"
 "in the current commit message"
 msgstr ""
 

-#: builtin/commit.c:679 builtin/commit.c:712 builtin/commit.c:1086
+#: builtin/commit.c:712 builtin/commit.c:745 builtin/commit.c:1120

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

-#: builtin/commit.c:691 builtin/shortlog.c:273
+#: builtin/commit.c:724 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:693
+#: builtin/commit.c:726

 msgid "could not read log from standard input"
 msgstr ""
 
 msgid "could not read log from standard input"
 msgstr ""
 

-#: builtin/commit.c:697
+#: builtin/commit.c:730

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

-#: builtin/commit.c:719
+#: builtin/commit.c:752

 msgid "could not read MERGE_MSG"
 msgstr ""
 
 msgid "could not read MERGE_MSG"
 msgstr ""
 

-#: builtin/commit.c:723
+#: builtin/commit.c:756

 msgid "could not read SQUASH_MSG"
 msgstr ""
 
 msgid "could not read SQUASH_MSG"
 msgstr ""
 

-#: builtin/commit.c:727
+#: builtin/commit.c:760

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

-#: builtin/commit.c:798
+#: builtin/commit.c:831

 msgid "could not write commit template"
 msgstr ""
 
 msgid "could not write commit template"
 msgstr ""
 

-#: builtin/commit.c:816
+#: builtin/commit.c:849

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


@@ -4007,7 +4134,7 @@ msgid ""
 "and try again.\n"
 msgstr ""
 
 "and try again.\n"
 msgstr ""
 

-#: builtin/commit.c:821
+#: builtin/commit.c:854

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


@@ -4017,14 +4144,14 @@ msgid ""
 "and try again.\n"
 msgstr ""
 
 "and try again.\n"
 msgstr ""
 

-#: builtin/commit.c:834
+#: builtin/commit.c:867

 #, 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:841
+#: builtin/commit.c:874

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


@@ -4032,359 +4159,351 @@ msgid ""
 "An empty message aborts the commit.\n"
 msgstr ""
 
 "An empty message aborts the commit.\n"
 msgstr ""
 

-#: builtin/commit.c:855
+#: builtin/commit.c:888

 #, c-format
 msgid "%sAuthor:    %.*s <%.*s>"
 msgstr ""
 
 #, c-format
 msgid "%sAuthor:    %.*s <%.*s>"
 msgstr ""
 

-#: builtin/commit.c:863
+#: builtin/commit.c:896

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

-#: builtin/commit.c:870
+#: builtin/commit.c:903

 #, c-format
 msgid "%sCommitter: %.*s <%.*s>"
 msgstr ""
 
 #, c-format
 msgid "%sCommitter: %.*s <%.*s>"
 msgstr ""
 

-#: builtin/commit.c:888
+#: builtin/commit.c:921

 msgid "Cannot read index"
 msgstr ""
 
 msgid "Cannot read index"
 msgstr ""
 

-#: builtin/commit.c:945
+#: builtin/commit.c:978

 msgid "Error building trees"
 msgstr ""
 
 msgid "Error building trees"
 msgstr ""
 

-#: builtin/commit.c:960 builtin/tag.c:495
+#: builtin/commit.c:993 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:1061
+#: builtin/commit.c:1095

 #, c-format
 msgid "No existing author found with '%s'"
 msgstr ""
 
 #, c-format
 msgid "No existing author found with '%s'"
 msgstr ""
 

-#: builtin/commit.c:1076 builtin/commit.c:1316
+#: builtin/commit.c:1110 builtin/commit.c:1350

 #, c-format
 msgid "Invalid untracked files mode '%s'"
 msgstr ""
 
 #, c-format
 msgid "Invalid untracked files mode '%s'"
 msgstr ""
 

-#: builtin/commit.c:1113
+#: builtin/commit.c:1147

 msgid "--long and -z are incompatible"
 msgstr ""
 
 msgid "--long and -z are incompatible"
 msgstr ""
 

-#: builtin/commit.c:1143
+#: builtin/commit.c:1177

 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:1152
+#: builtin/commit.c:1186

 msgid "You have nothing to amend."
 msgstr ""
 
 msgid "You have nothing to amend."
 msgstr ""
 

-#: builtin/commit.c:1155
+#: builtin/commit.c:1189

 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:1157
+#: builtin/commit.c:1191

 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:1160
+#: builtin/commit.c:1194

 msgid "Options --squash and --fixup cannot be used together"
 msgstr ""
 
 msgid "Options --squash and --fixup cannot be used together"
 msgstr ""
 

-#: builtin/commit.c:1170
+#: builtin/commit.c:1204

 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:1172
+#: builtin/commit.c:1206

 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:1180
+#: builtin/commit.c:1214

 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:1197
+#: builtin/commit.c:1231

 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:1199
+#: builtin/commit.c:1233

 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:1201
+#: builtin/commit.c:1235

 msgid "Clever... amending the last one with dirty index."
 msgstr ""
 
 msgid "Clever... amending the last one with dirty index."
 msgstr ""
 

-#: builtin/commit.c:1203
+#: builtin/commit.c:1237

 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:1215 builtin/tag.c:727
+#: builtin/commit.c:1249 builtin/tag.c:728

 #, c-format
 msgid "Invalid cleanup mode %s"
 msgstr ""
 
 #, c-format
 msgid "Invalid cleanup mode %s"
 msgstr ""
 

-#: builtin/commit.c:1220
+#: builtin/commit.c:1254

 msgid "Paths with -a does not make sense."
 msgstr ""
 
 msgid "Paths with -a does not make sense."
 msgstr ""
 

-#: builtin/commit.c:1330 builtin/commit.c:1595
+#: builtin/commit.c:1364 builtin/commit.c:1644

 msgid "show status concisely"
 msgstr ""
 
 msgid "show status concisely"
 msgstr ""
 

-#: builtin/commit.c:1332 builtin/commit.c:1597
+#: builtin/commit.c:1366 builtin/commit.c:1646

 msgid "show branch information"
 msgstr ""
 
 msgid "show branch information"
 msgstr ""
 

-#: builtin/commit.c:1334 builtin/commit.c:1599 builtin/push.c:489
+#: builtin/commit.c:1368 builtin/commit.c:1648 builtin/push.c:500

 msgid "machine-readable output"
 msgstr ""
 
 msgid "machine-readable output"
 msgstr ""
 

-#: builtin/commit.c:1337 builtin/commit.c:1601
+#: builtin/commit.c:1371 builtin/commit.c:1650

 msgid "show status in long format (default)"
 msgstr ""
 
 msgid "show status in long format (default)"
 msgstr ""
 

-#: builtin/commit.c:1340 builtin/commit.c:1604
+#: builtin/commit.c:1374 builtin/commit.c:1653

 msgid "terminate entries with NUL"
 msgstr ""
 
 msgid "terminate entries with NUL"
 msgstr ""
 

-#: builtin/commit.c:1342 builtin/commit.c:1607 builtin/fast-export.c:703
-#: builtin/fast-export.c:706 builtin/tag.c:602
+#: builtin/commit.c:1376 builtin/commit.c:1656 builtin/fast-export.c:980
+#: builtin/fast-export.c:983 builtin/tag.c:603

 msgid "mode"
 msgstr ""
 
 msgid "mode"
 msgstr ""
 

-#: builtin/commit.c:1343 builtin/commit.c:1607
+#: builtin/commit.c:1377 builtin/commit.c:1656

 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:1346
+#: builtin/commit.c:1380

 msgid "show ignored files"
 msgstr ""
 
 msgid "show ignored files"
 msgstr ""
 

-#: builtin/commit.c:1347 parse-options.h:153
+#: builtin/commit.c:1381 parse-options.h:153

 msgid "when"
 msgstr ""
 
 msgid "when"
 msgstr ""
 

-#: builtin/commit.c:1348
+#: builtin/commit.c:1382

 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:1350
+#: builtin/commit.c:1384

 msgid "list untracked files in columns"
 msgstr ""
 
 msgid "list untracked files in columns"
 msgstr ""
 

-#: builtin/commit.c:1419
+#: builtin/commit.c:1471

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

-#: builtin/commit.c:1421
+#: builtin/commit.c:1473

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

-#: builtin/commit.c:1469
+#: builtin/commit.c:1518

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

-#: builtin/commit.c:1471
+#: builtin/commit.c:1521

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

-#: builtin/commit.c:1565
+#: builtin/commit.c:1614

 msgid "suppress summary after successful commit"
 msgstr ""
 
 msgid "suppress summary after successful commit"
 msgstr ""
 

-#: builtin/commit.c:1566
+#: builtin/commit.c:1615

 msgid "show diff in commit message template"
 msgstr ""
 
 msgid "show diff in commit message template"
 msgstr ""
 

-#: builtin/commit.c:1568
+#: builtin/commit.c:1617

 msgid "Commit message options"
 msgstr ""
 
 msgid "Commit message options"
 msgstr ""
 

-#: builtin/commit.c:1569 builtin/tag.c:600
+#: builtin/commit.c:1618 builtin/tag.c:601

 msgid "read message from file"
 msgstr ""
 
 msgid "read message from file"
 msgstr ""
 

-#: builtin/commit.c:1570
+#: builtin/commit.c:1619

 msgid "author"
 msgstr ""
 
 msgid "author"
 msgstr ""
 

-#: builtin/commit.c:1570
+#: builtin/commit.c:1619

 msgid "override author for commit"
 msgstr ""
 
 msgid "override author for commit"
 msgstr ""
 

-#: builtin/commit.c:1571 builtin/gc.c:286
+#: builtin/commit.c:1620 builtin/gc.c:275

 msgid "date"
 msgstr ""
 
 msgid "date"
 msgstr ""
 

-#: builtin/commit.c:1571
+#: builtin/commit.c:1620

 msgid "override date for commit"
 msgstr ""
 
 msgid "override date for commit"
 msgstr ""
 

-#: builtin/commit.c:1572 builtin/merge.c:216 builtin/notes.c:409
-#: builtin/notes.c:566 builtin/tag.c:598
+#: builtin/commit.c:1621 builtin/merge.c:217 builtin/notes.c:408
+#: builtin/notes.c:565 builtin/tag.c:599

 msgid "message"
 msgstr ""
 
 msgid "message"
 msgstr ""
 

-#: builtin/commit.c:1572
+#: builtin/commit.c:1621

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

-#: builtin/commit.c:1573
+#: builtin/commit.c:1622

 msgid "reuse and edit message from specified commit"
 msgstr ""
 
 msgid "reuse and edit message from specified commit"
 msgstr ""
 

-#: builtin/commit.c:1574
+#: builtin/commit.c:1623

 msgid "reuse message from specified commit"
 msgstr ""
 
 msgid "reuse message from specified commit"
 msgstr ""
 

-#: builtin/commit.c:1575
+#: builtin/commit.c:1624

 msgid "use autosquash formatted message to fixup specified commit"
 msgstr ""
 
 msgid "use autosquash formatted message to fixup specified commit"
 msgstr ""
 

-#: builtin/commit.c:1576
+#: builtin/commit.c:1625

 msgid "use autosquash formatted message to squash specified commit"
 msgstr ""
 
 msgid "use autosquash formatted message to squash specified commit"
 msgstr ""
 

-#: builtin/commit.c:1577
+#: builtin/commit.c:1626

 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:1578 builtin/log.c:1188 builtin/revert.c:86
+#: builtin/commit.c:1627 builtin/log.c:1191 builtin/revert.c:86

 msgid "add Signed-off-by:"
 msgstr ""
 
 msgid "add Signed-off-by:"
 msgstr ""
 

-#: builtin/commit.c:1579
+#: builtin/commit.c:1628

 msgid "use specified template file"
 msgstr ""
 
 msgid "use specified template file"
 msgstr ""
 

-#: builtin/commit.c:1580
+#: builtin/commit.c:1629

 msgid "force edit of commit"
 msgstr ""
 
 msgid "force edit of commit"
 msgstr ""
 

-#: builtin/commit.c:1581
+#: builtin/commit.c:1630

 msgid "default"
 msgstr ""
 
 msgid "default"
 msgstr ""
 

-#: builtin/commit.c:1581 builtin/tag.c:603
+#: builtin/commit.c:1630 builtin/tag.c:604

 msgid "how to strip spaces and #comments from message"
 msgstr ""
 
 msgid "how to strip spaces and #comments from message"
 msgstr ""
 

-#: builtin/commit.c:1582
+#: builtin/commit.c:1631

 msgid "include status in commit message template"
 msgstr ""
 
 msgid "include status in commit message template"
 msgstr ""
 

-#: builtin/commit.c:1583 builtin/merge.c:223 builtin/revert.c:92
-#: builtin/tag.c:604
+#: builtin/commit.c:1632 builtin/merge.c:224 builtin/revert.c:92
+#: builtin/tag.c:605

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

-#: builtin/commit.c:1584 builtin/merge.c:224 builtin/revert.c:93
+#: builtin/commit.c:1633 builtin/merge.c:225 builtin/revert.c:93

 msgid "GPG sign commit"
 msgstr ""
 
 msgid "GPG sign commit"
 msgstr ""
 

-#: builtin/commit.c:1587
+#: builtin/commit.c:1636

 msgid "Commit contents options"
 msgstr ""
 
 msgid "Commit contents options"
 msgstr ""
 

-#: builtin/commit.c:1588
+#: builtin/commit.c:1637

 msgid "commit all changed files"
 msgstr ""
 
 msgid "commit all changed files"
 msgstr ""
 

-#: builtin/commit.c:1589
+#: builtin/commit.c:1638

 msgid "add specified files to index for commit"
 msgstr ""
 
 msgid "add specified files to index for commit"
 msgstr ""
 

-#: builtin/commit.c:1590
+#: builtin/commit.c:1639

 msgid "interactively add files"
 msgstr ""
 
 msgid "interactively add files"
 msgstr ""
 

-#: builtin/commit.c:1591
+#: builtin/commit.c:1640

 msgid "interactively add changes"
 msgstr ""
 
 msgid "interactively add changes"
 msgstr ""
 

-#: builtin/commit.c:1592
+#: builtin/commit.c:1641

 msgid "commit only specified files"
 msgstr ""
 
 msgid "commit only specified files"
 msgstr ""
 

-#: builtin/commit.c:1593
+#: builtin/commit.c:1642

 msgid "bypass pre-commit hook"
 msgstr ""
 
 msgid "bypass pre-commit hook"
 msgstr ""
 

-#: builtin/commit.c:1594
+#: builtin/commit.c:1643

 msgid "show what would be committed"
 msgstr ""
 
 msgid "show what would be committed"
 msgstr ""
 

-#: builtin/commit.c:1605
+#: builtin/commit.c:1654

 msgid "amend previous commit"
 msgstr ""
 
 msgid "amend previous commit"
 msgstr ""
 

-#: builtin/commit.c:1606
+#: builtin/commit.c:1655

 msgid "bypass post-rewrite hook"
 msgstr ""
 
 msgid "bypass post-rewrite hook"
 msgstr ""
 

-#: builtin/commit.c:1611
+#: builtin/commit.c:1660

 msgid "ok to record an empty change"
 msgstr ""
 
 msgid "ok to record an empty change"
 msgstr ""
 

-#: builtin/commit.c:1613
+#: builtin/commit.c:1662

 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:1641
+#: builtin/commit.c:1691

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

-#: builtin/commit.c:1680 builtin/merge.c:518
+#: builtin/commit.c:1730 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:1687
+#: builtin/commit.c:1737

 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr ""
 
 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr ""
 

-#: builtin/commit.c:1694
+#: builtin/commit.c:1744

 msgid "could not read MERGE_MODE"
 msgstr ""
 
 msgid "could not read MERGE_MODE"
 msgstr ""
 

-#: builtin/commit.c:1713
+#: builtin/commit.c:1763

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

-#: builtin/commit.c:1724
+#: builtin/commit.c:1774

 #, 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:1729
+#: builtin/commit.c:1779

 #, 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:1744 builtin/merge.c:851 builtin/merge.c:876
+#: builtin/commit.c:1794 builtin/merge.c:850 builtin/merge.c:875

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

-#: builtin/commit.c:1756
-msgid "cannot lock HEAD ref"
-msgstr ""
-
-#: builtin/commit.c:1769
-msgid "cannot update HEAD ref"
-msgstr ""
-
-#: builtin/commit.c:1780
+#: builtin/commit.c:1827

 msgid ""
 "Repository has been updated, but unable to write\n"
 msgid ""
 "Repository has been updated, but unable to write\n"

-"new_index file. Check that disk is not full or quota is\n"
+"new_index file. Check that disk is not full and quota is\n"

 "not exceeded, and then \"git reset HEAD\" to recover."
 msgstr ""
 
 "not exceeded, and then \"git reset HEAD\" to recover."
 msgstr ""
 


@@ -4516,225 +4635,248 @@ msgstr ""
 msgid "respect include directives on lookup"
 msgstr ""
 
 msgid "respect include directives on lookup"
 msgstr ""
 

-#: builtin/count-objects.c:82
+#: builtin/config.c:315
+msgid "unable to parse default color value"
+msgstr ""
+
+#: builtin/config.c:455
+#, c-format
+msgid ""
+"# This is Git's per-user configuration file.\n"
+"[core]\n"
+"# Please adapt and uncomment the following lines:\n"
+"#\tuser = %s\n"
+"#\temail = %s\n"
+msgstr ""
+
+#: builtin/config.c:590
+#, c-format
+msgid "cannot create configuration file %s"
+msgstr ""
+
+#: builtin/count-objects.c:55

 msgid "git count-objects [-v] [-H | --human-readable]"
 msgstr ""
 
 msgid "git count-objects [-v] [-H | --human-readable]"
 msgstr ""
 

-#: builtin/count-objects.c:97
+#: builtin/count-objects.c:65

 msgid "print sizes in human readable format"
 msgstr ""
 
 msgid "print sizes in human readable format"
 msgstr ""
 

-#: builtin/describe.c:16
+#: builtin/describe.c:17

 msgid "git describe [options] <commit-ish>*"
 msgstr ""
 
 msgid "git describe [options] <commit-ish>*"
 msgstr ""
 

-#: builtin/describe.c:17
+#: builtin/describe.c:18

 msgid "git describe [options] --dirty"
 msgstr ""
 
 msgid "git describe [options] --dirty"
 msgstr ""
 

-#: builtin/describe.c:216
+#: builtin/describe.c:217

 #, c-format
 msgid "annotated tag %s not available"
 msgstr ""
 
 #, c-format
 msgid "annotated tag %s not available"
 msgstr ""
 

-#: builtin/describe.c:220
+#: builtin/describe.c:221

 #, 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:222
+#: builtin/describe.c:223

 #, c-format
 msgid "tag '%s' is really '%s' here"
 msgstr ""
 
 #, c-format
 msgid "tag '%s' is really '%s' here"
 msgstr ""
 

-#: builtin/describe.c:249
+#: builtin/describe.c:250 builtin/log.c:452

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

-#: builtin/describe.c:252
+#: builtin/describe.c:253

 #, 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:269
+#: builtin/describe.c:270

 #, c-format
 msgid "no tag exactly matches '%s'"
 msgstr ""
 
 #, c-format
 msgid "no tag exactly matches '%s'"
 msgstr ""
 

-#: builtin/describe.c:271
+#: builtin/describe.c:272

 #, c-format
 msgid "searching to describe %s\n"
 msgstr ""
 
 #, c-format
 msgid "searching to describe %s\n"
 msgstr ""
 

-#: builtin/describe.c:318
+#: builtin/describe.c:319

 #, c-format
 msgid "finished search at %s\n"
 msgstr ""
 
 #, c-format
 msgid "finished search at %s\n"
 msgstr ""
 

-#: builtin/describe.c:345
+#: builtin/describe.c:346

 #, 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:349
+#: builtin/describe.c:350

 #, 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:370
+#: builtin/describe.c:371

 #, c-format
 msgid "traversed %lu commits\n"
 msgstr ""
 
 #, c-format
 msgid "traversed %lu commits\n"
 msgstr ""
 

-#: builtin/describe.c:373
+#: builtin/describe.c:374

 #, 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:395
+#: builtin/describe.c:396

 msgid "find the tag that comes after the commit"
 msgstr ""
 
 msgid "find the tag that comes after the commit"
 msgstr ""
 

-#: builtin/describe.c:396
+#: builtin/describe.c:397

 msgid "debug search strategy on stderr"
 msgstr ""
 
 msgid "debug search strategy on stderr"
 msgstr ""
 

-#: builtin/describe.c:397
+#: builtin/describe.c:398

 msgid "use any ref"
 msgstr ""
 
 msgid "use any ref"
 msgstr ""
 

-#: builtin/describe.c:398
+#: builtin/describe.c:399

 msgid "use any tag, even unannotated"
 msgstr ""
 
 msgid "use any tag, even unannotated"
 msgstr ""
 

-#: builtin/describe.c:399
+#: builtin/describe.c:400

 msgid "always use long format"
 msgstr ""
 
 msgid "always use long format"
 msgstr ""
 

-#: builtin/describe.c:400
+#: builtin/describe.c:401

 msgid "only follow first parent"
 msgstr ""
 
 msgid "only follow first parent"
 msgstr ""
 

-#: builtin/describe.c:403
+#: builtin/describe.c:404

 msgid "only output exact matches"
 msgstr ""
 
 msgid "only output exact matches"
 msgstr ""
 

-#: builtin/describe.c:405
+#: builtin/describe.c:406

 msgid "consider <n> most recent tags (default: 10)"
 msgstr ""
 
 msgid "consider <n> most recent tags (default: 10)"
 msgstr ""
 

-#: builtin/describe.c:407
+#: builtin/describe.c:408

 msgid "only consider tags matching <pattern>"
 msgstr ""
 
 msgid "only consider tags matching <pattern>"
 msgstr ""
 

-#: builtin/describe.c:409 builtin/name-rev.c:318
+#: builtin/describe.c:410 builtin/name-rev.c:318

 msgid "show abbreviated commit object as fallback"
 msgstr ""
 
 msgid "show abbreviated commit object as fallback"
 msgstr ""
 

-#: builtin/describe.c:410
+#: builtin/describe.c:411

 msgid "mark"
 msgstr ""
 
 msgid "mark"
 msgstr ""
 

-#: builtin/describe.c:411
+#: builtin/describe.c:412

 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
 msgstr ""
 
 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
 msgstr ""
 

-#: builtin/describe.c:429
+#: builtin/describe.c:430

 msgid "--long is incompatible with --abbrev=0"
 msgstr ""
 
 msgid "--long is incompatible with --abbrev=0"
 msgstr ""
 

-#: builtin/describe.c:455
+#: builtin/describe.c:456

 msgid "No names found, cannot describe anything."
 msgstr ""
 
 msgid "No names found, cannot describe anything."
 msgstr ""
 

-#: builtin/describe.c:475
+#: builtin/describe.c:476

 msgid "--dirty is incompatible with commit-ishes"
 msgstr ""
 
 msgid "--dirty is incompatible with commit-ishes"
 msgstr ""
 

-#: builtin/diff.c:85
+#: builtin/diff.c:86

 #, c-format
 msgid "'%s': not a regular file or symlink"
 msgstr ""
 
 #, c-format
 msgid "'%s': not a regular file or symlink"
 msgstr ""
 

-#: builtin/diff.c:236
+#: builtin/diff.c:237

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

-#: builtin/diff.c:357
+#: builtin/diff.c:358

 msgid "Not a git repository"
 msgstr ""
 
 msgid "Not a git repository"
 msgstr ""
 

-#: builtin/diff.c:400
+#: builtin/diff.c:401

 #, c-format
 msgid "invalid object '%s' given."
 msgstr ""
 
 #, c-format
 msgid "invalid object '%s' given."
 msgstr ""
 

-#: builtin/diff.c:409
+#: builtin/diff.c:410

 #, c-format
 msgid "more than two blobs given: '%s'"
 msgstr ""
 
 #, c-format
 msgid "more than two blobs given: '%s'"
 msgstr ""
 

-#: builtin/diff.c:416
+#: builtin/diff.c:417

 #, c-format
 msgid "unhandled object '%s' given."
 msgstr ""
 
 #, c-format
 msgid "unhandled object '%s' given."
 msgstr ""
 

-#: builtin/fast-export.c:23
+#: builtin/fast-export.c:24

 msgid "git fast-export [rev-list-opts]"
 msgstr ""
 
 msgid "git fast-export [rev-list-opts]"
 msgstr ""
 

-#: builtin/fast-export.c:702
+#: builtin/fast-export.c:979

 msgid "show progress after <n> objects"
 msgstr ""
 
 msgid "show progress after <n> objects"
 msgstr ""
 

-#: builtin/fast-export.c:704
+#: builtin/fast-export.c:981

 msgid "select handling of signed tags"
 msgstr ""
 
 msgid "select handling of signed tags"
 msgstr ""
 

-#: builtin/fast-export.c:707
+#: builtin/fast-export.c:984

 msgid "select handling of tags that tag filtered objects"
 msgstr ""
 
 msgid "select handling of tags that tag filtered objects"
 msgstr ""
 

-#: builtin/fast-export.c:710
+#: builtin/fast-export.c:987

 msgid "Dump marks to this file"
 msgstr ""
 
 msgid "Dump marks to this file"
 msgstr ""
 

-#: builtin/fast-export.c:712
+#: builtin/fast-export.c:989

 msgid "Import marks from this file"
 msgstr ""
 
 msgid "Import marks from this file"
 msgstr ""
 

-#: builtin/fast-export.c:714
+#: builtin/fast-export.c:991

 msgid "Fake a tagger when tags lack one"
 msgstr ""
 
 msgid "Fake a tagger when tags lack one"
 msgstr ""
 

-#: builtin/fast-export.c:716
+#: builtin/fast-export.c:993

 msgid "Output full tree for each commit"
 msgstr ""
 
 msgid "Output full tree for each commit"
 msgstr ""
 

-#: builtin/fast-export.c:718
+#: builtin/fast-export.c:995

 msgid "Use the done feature to terminate the stream"
 msgstr ""
 
 msgid "Use the done feature to terminate the stream"
 msgstr ""
 

-#: builtin/fast-export.c:719
+#: builtin/fast-export.c:996

 msgid "Skip output of blob data"
 msgstr ""
 
 msgid "Skip output of blob data"
 msgstr ""
 

-#: builtin/fast-export.c:720
+#: builtin/fast-export.c:997

 msgid "refspec"
 msgstr ""
 
 msgid "refspec"
 msgstr ""
 

-#: builtin/fast-export.c:721
+#: builtin/fast-export.c:998

 msgid "Apply refspec to exported refs"
 msgstr ""
 
 msgid "Apply refspec to exported refs"
 msgstr ""
 

+#: builtin/fast-export.c:999
+msgid "anonymize output"
+msgstr ""
+

 #: builtin/fetch.c:20
 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
 msgstr ""
 #: builtin/fetch.c:20
 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
 msgstr ""


@@ -4807,7 +4949,7 @@ msgstr ""
 msgid "convert to a complete repository"
 msgstr ""
 
 msgid "convert to a complete repository"
 msgstr ""
 

-#: builtin/fetch.c:118 builtin/log.c:1205
+#: builtin/fetch.c:118 builtin/log.c:1208

 msgid "dir"
 msgstr ""
 
 msgid "dir"
 msgstr ""
 


@@ -4835,163 +4977,163 @@ msgstr ""
 msgid "Couldn't find remote ref HEAD"
 msgstr ""
 
 msgid "Couldn't find remote ref HEAD"
 msgstr ""
 

-#: builtin/fetch.c:440
+#: builtin/fetch.c:454

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

-#: builtin/fetch.c:445
+#: builtin/fetch.c:459

 msgid "[up to date]"
 msgstr ""
 
 msgid "[up to date]"
 msgstr ""
 

-#: builtin/fetch.c:459
+#: builtin/fetch.c:473

 #, 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:460 builtin/fetch.c:546
+#: builtin/fetch.c:474 builtin/fetch.c:560

 msgid "[rejected]"
 msgstr ""
 
 msgid "[rejected]"
 msgstr ""
 

-#: builtin/fetch.c:471
+#: builtin/fetch.c:485

 msgid "[tag update]"
 msgstr ""
 
 msgid "[tag update]"
 msgstr ""
 

-#: builtin/fetch.c:473 builtin/fetch.c:508 builtin/fetch.c:526
+#: builtin/fetch.c:487 builtin/fetch.c:522 builtin/fetch.c:540

 msgid "  (unable to update local ref)"
 msgstr ""
 
 msgid "  (unable to update local ref)"
 msgstr ""
 

-#: builtin/fetch.c:491
+#: builtin/fetch.c:505

 msgid "[new tag]"
 msgstr ""
 
 msgid "[new tag]"
 msgstr ""
 

-#: builtin/fetch.c:494
+#: builtin/fetch.c:508

 msgid "[new branch]"
 msgstr ""
 
 msgid "[new branch]"
 msgstr ""
 

-#: builtin/fetch.c:497
+#: builtin/fetch.c:511

 msgid "[new ref]"
 msgstr ""
 
 msgid "[new ref]"
 msgstr ""
 

-#: builtin/fetch.c:542
+#: builtin/fetch.c:556

 msgid "unable to update local ref"
 msgstr ""
 
 msgid "unable to update local ref"
 msgstr ""
 

-#: builtin/fetch.c:542
+#: builtin/fetch.c:556

 msgid "forced update"
 msgstr ""
 
 msgid "forced update"
 msgstr ""
 

-#: builtin/fetch.c:548
+#: builtin/fetch.c:562

 msgid "(non-fast-forward)"
 msgstr ""
 
 msgid "(non-fast-forward)"
 msgstr ""
 

-#: builtin/fetch.c:581 builtin/fetch.c:814
+#: builtin/fetch.c:595 builtin/fetch.c:828

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

-#: builtin/fetch.c:590
+#: builtin/fetch.c:604

 #, 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:608
+#: builtin/fetch.c:622

 #, 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:696 builtin/fetch.c:779
+#: builtin/fetch.c:710 builtin/fetch.c:793

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

-#: builtin/fetch.c:707
+#: builtin/fetch.c:721

 #, 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:759
+#: builtin/fetch.c:773

 #, c-format
 msgid "   (%s will become dangling)"
 msgstr ""
 
 #, c-format
 msgid "   (%s will become dangling)"
 msgstr ""
 

-#: builtin/fetch.c:760
+#: builtin/fetch.c:774

 #, c-format
 msgid "   (%s has become dangling)"
 msgstr ""
 
 #, c-format
 msgid "   (%s has become dangling)"
 msgstr ""
 

-#: builtin/fetch.c:784
+#: builtin/fetch.c:798

 msgid "[deleted]"
 msgstr ""
 
 msgid "[deleted]"
 msgstr ""
 

-#: builtin/fetch.c:785 builtin/remote.c:1059
+#: builtin/fetch.c:799 builtin/remote.c:1063

 msgid "(none)"
 msgstr ""
 
 msgid "(none)"
 msgstr ""
 

-#: builtin/fetch.c:804
+#: builtin/fetch.c:818

 #, 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:823
+#: builtin/fetch.c:837

 #, 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:826
+#: builtin/fetch.c:840

 #, 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:882
+#: builtin/fetch.c:896

 #, 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:1044
+#: builtin/fetch.c:1058

 #, c-format
 msgid "Fetching %s\n"
 msgstr ""
 
 #, c-format
 msgid "Fetching %s\n"
 msgstr ""
 

-#: builtin/fetch.c:1046 builtin/remote.c:90
+#: builtin/fetch.c:1060 builtin/remote.c:90

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

-#: builtin/fetch.c:1064
+#: builtin/fetch.c:1078

 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:1087
+#: builtin/fetch.c:1101

 msgid "You need to specify a tag name."
 msgstr ""
 
 msgid "You need to specify a tag name."
 msgstr ""
 

-#: builtin/fetch.c:1131
+#: builtin/fetch.c:1143

 msgid "--depth and --unshallow cannot be used together"
 msgstr ""
 
 msgid "--depth and --unshallow cannot be used together"
 msgstr ""
 

-#: builtin/fetch.c:1133
+#: builtin/fetch.c:1145

 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:1156
+#: builtin/fetch.c:1168

 msgid "fetch --all does not take a repository argument"
 msgstr ""
 
 msgid "fetch --all does not take a repository argument"
 msgstr ""
 

-#: builtin/fetch.c:1158
+#: builtin/fetch.c:1170

 msgid "fetch --all does not make sense with refspecs"
 msgstr ""
 
 msgid "fetch --all does not make sense with refspecs"
 msgstr ""
 

-#: builtin/fetch.c:1169
+#: builtin/fetch.c:1181

 #, 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:1177
+#: builtin/fetch.c:1189

 msgid "Fetching a group and specifying refspecs does not make sense"
 msgstr ""
 
 msgid "Fetching a group and specifying refspecs does not make sense"
 msgstr ""
 


@@ -5000,8 +5142,8 @@ 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:698
 msgstr ""
 
 #: 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
+#: builtin/merge.c:197 builtin/repack.c:179 builtin/repack.c:183
+#: builtin/show-branch.c:654 builtin/show-ref.c:178 builtin/tag.c:590

 #: parse-options.h:132 parse-options.h:239
 msgid "n"
 msgstr ""
 #: parse-options.h:132 parse-options.h:239
 msgid "n"
 msgstr ""


@@ -5026,99 +5168,103 @@ msgstr ""
 msgid "file to read from"
 msgstr ""
 
 msgid "file to read from"
 msgstr ""
 

-#: builtin/for-each-ref.c:1051
+#: builtin/for-each-ref.c:676
+msgid "unable to parse format"
+msgstr ""
+
+#: builtin/for-each-ref.c:1057

 msgid "git for-each-ref [options] [<pattern>]"
 msgstr ""
 
 msgid "git for-each-ref [options] [<pattern>]"
 msgstr ""
 

-#: builtin/for-each-ref.c:1066
+#: builtin/for-each-ref.c:1072

 msgid "quote placeholders suitably for shells"
 msgstr ""
 
 msgid "quote placeholders suitably for shells"
 msgstr ""
 

-#: builtin/for-each-ref.c:1068
+#: builtin/for-each-ref.c:1074

 msgid "quote placeholders suitably for perl"
 msgstr ""
 
 msgid "quote placeholders suitably for perl"
 msgstr ""
 

-#: builtin/for-each-ref.c:1070
+#: builtin/for-each-ref.c:1076

 msgid "quote placeholders suitably for python"
 msgstr ""
 
 msgid "quote placeholders suitably for python"
 msgstr ""
 

-#: builtin/for-each-ref.c:1072
+#: builtin/for-each-ref.c:1078

 msgid "quote placeholders suitably for tcl"
 msgstr ""
 
 msgid "quote placeholders suitably for tcl"
 msgstr ""
 

-#: builtin/for-each-ref.c:1075
+#: builtin/for-each-ref.c:1081

 msgid "show only <n> matched refs"
 msgstr ""
 
 msgid "show only <n> matched refs"
 msgstr ""
 

-#: builtin/for-each-ref.c:1076 builtin/replace.c:435
+#: builtin/for-each-ref.c:1082 builtin/replace.c:438

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

-#: builtin/for-each-ref.c:1076
+#: builtin/for-each-ref.c:1082

 msgid "format to use for the output"
 msgstr ""
 
 msgid "format to use for the output"
 msgstr ""
 

-#: builtin/for-each-ref.c:1077
+#: builtin/for-each-ref.c:1083

 msgid "key"
 msgstr ""
 
 msgid "key"
 msgstr ""
 

-#: builtin/for-each-ref.c:1078
+#: builtin/for-each-ref.c:1084

 msgid "field name to sort on"
 msgstr ""
 
 msgid "field name to sort on"
 msgstr ""
 

-#: builtin/fsck.c:147 builtin/prune.c:172
+#: builtin/fsck.c:147 builtin/prune.c:136

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

-#: builtin/fsck.c:538
+#: builtin/fsck.c:540

 msgid "Checking object directories"
 msgstr ""
 
 msgid "Checking object directories"
 msgstr ""
 

-#: builtin/fsck.c:601
+#: builtin/fsck.c:603

 msgid "git fsck [options] [<object>...]"
 msgstr ""
 
 msgid "git fsck [options] [<object>...]"
 msgstr ""
 

-#: builtin/fsck.c:607
+#: builtin/fsck.c:609

 msgid "show unreachable objects"
 msgstr ""
 
 msgid "show unreachable objects"
 msgstr ""
 

-#: builtin/fsck.c:608
+#: builtin/fsck.c:610

 msgid "show dangling objects"
 msgstr ""
 
 msgid "show dangling objects"
 msgstr ""
 

-#: builtin/fsck.c:609
+#: builtin/fsck.c:611

 msgid "report tags"
 msgstr ""
 
 msgid "report tags"
 msgstr ""
 

-#: builtin/fsck.c:610
+#: builtin/fsck.c:612

 msgid "report root nodes"
 msgstr ""
 
 msgid "report root nodes"
 msgstr ""
 

-#: builtin/fsck.c:611
+#: builtin/fsck.c:613

 msgid "make index objects head nodes"
 msgstr ""
 
 msgid "make index objects head nodes"
 msgstr ""
 

-#: builtin/fsck.c:612
+#: builtin/fsck.c:614

 msgid "make reflogs head nodes (default)"
 msgstr ""
 
 msgid "make reflogs head nodes (default)"
 msgstr ""
 

-#: builtin/fsck.c:613
+#: builtin/fsck.c:615

 msgid "also consider packs and alternate objects"
 msgstr ""
 
 msgid "also consider packs and alternate objects"
 msgstr ""
 

-#: builtin/fsck.c:614
+#: builtin/fsck.c:616

 msgid "enable more strict checking"
 msgstr ""
 
 msgid "enable more strict checking"
 msgstr ""
 

-#: builtin/fsck.c:616
+#: builtin/fsck.c:618

 msgid "write dangling objects in .git/lost-found"
 msgstr ""
 
 msgid "write dangling objects in .git/lost-found"
 msgstr ""
 

-#: builtin/fsck.c:617 builtin/prune.c:144
+#: builtin/fsck.c:619 builtin/prune.c:108

 msgid "show progress"
 msgstr ""
 
 msgid "show progress"
 msgstr ""
 

-#: builtin/fsck.c:667
+#: builtin/fsck.c:669

 msgid "Checking objects"
 msgstr ""
 
 msgid "Checking objects"
 msgstr ""
 


@@ -5126,54 +5272,54 @@ msgstr ""
 msgid "git gc [options]"
 msgstr ""
 
 msgid "git gc [options]"
 msgstr ""
 

-#: builtin/gc.c:91
+#: builtin/gc.c:79

 #, c-format
 #, c-format

-msgid "Invalid %s: '%s'"
+msgid "Invalid gc.pruneexpire: '%s'"

 msgstr ""
 
 msgstr ""
 

-#: builtin/gc.c:118
+#: builtin/gc.c:107

 #, c-format
 msgid "insanely long object directory %.*s"
 msgstr ""
 
 #, c-format
 msgid "insanely long object directory %.*s"
 msgstr ""
 

-#: builtin/gc.c:287
+#: builtin/gc.c:276

 msgid "prune unreferenced objects"
 msgstr ""
 
 msgid "prune unreferenced objects"
 msgstr ""
 

-#: builtin/gc.c:289
+#: builtin/gc.c:278

 msgid "be more thorough (increased runtime)"
 msgstr ""
 
 msgid "be more thorough (increased runtime)"
 msgstr ""
 

-#: builtin/gc.c:290
+#: builtin/gc.c:279

 msgid "enable auto-gc mode"
 msgstr ""
 
 msgid "enable auto-gc mode"
 msgstr ""
 

-#: builtin/gc.c:291
+#: builtin/gc.c:280

 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:332
+#: builtin/gc.c:321

 #, 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:334
+#: builtin/gc.c:323

 #, 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:335
+#: builtin/gc.c:324

 #, 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:353
+#: builtin/gc.c:342

 #, 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:375
+#: builtin/gc.c:364

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


@@ -5403,37 +5549,42 @@ msgstr ""
 msgid "both --cached and trees are given."
 msgstr ""
 
 msgid "both --cached and trees are given."
 msgstr ""
 

-#: builtin/hash-object.c:60
+#: builtin/hash-object.c:82

 msgid ""
 "git hash-object [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] "
 "<file>..."
 msgstr ""
 
 msgid ""
 "git hash-object [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] "
 "<file>..."
 msgstr ""
 

-#: builtin/hash-object.c:61
+#: builtin/hash-object.c:83

 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:609
+#: builtin/hash-object.c:94 builtin/tag.c:610

 msgid "type"
 msgstr ""
 
 msgid "type"
 msgstr ""
 

-#: builtin/hash-object.c:72
+#: builtin/hash-object.c:94

 msgid "object type"
 msgstr ""
 
 msgid "object type"
 msgstr ""
 

-#: builtin/hash-object.c:73
+#: builtin/hash-object.c:95

 msgid "write the object into the object database"
 msgstr ""
 
 msgid "write the object into the object database"
 msgstr ""
 

-#: builtin/hash-object.c:74
+#: builtin/hash-object.c:97

 msgid "read the object from stdin"
 msgstr ""
 
 msgid "read the object from stdin"
 msgstr ""
 

-#: builtin/hash-object.c:76
+#: builtin/hash-object.c:99

 msgid "store file as is without filters"
 msgstr ""
 
 msgid "store file as is without filters"
 msgstr ""
 

-#: builtin/hash-object.c:77
+#: builtin/hash-object.c:100
+msgid ""
+"just hash any random garbage to create corrupt objects for debugging Git"
+msgstr ""
+
+#: builtin/hash-object.c:101

 msgid "process file as it were from this path"
 msgstr ""
 
 msgid "process file as it were from this path"
 msgstr ""
 


@@ -5466,55 +5617,59 @@ msgstr ""
 msgid "unrecognized help format '%s'"
 msgstr ""
 
 msgid "unrecognized help format '%s'"
 msgstr ""
 

-#: builtin/help.c:92
+#: builtin/help.c:91

 msgid "Failed to start emacsclient."
 msgstr ""
 
 msgid "Failed to start emacsclient."
 msgstr ""
 

-#: builtin/help.c:105
+#: builtin/help.c:104

 msgid "Failed to parse emacsclient version."
 msgstr ""
 
 msgid "Failed to parse emacsclient version."
 msgstr ""
 

-#: builtin/help.c:113
+#: builtin/help.c:112

 #, c-format
 msgid "emacsclient version '%d' too old (< 22)."
 msgstr ""
 
 #, c-format
 msgid "emacsclient version '%d' too old (< 22)."
 msgstr ""
 

-#: builtin/help.c:131 builtin/help.c:159 builtin/help.c:168 builtin/help.c:176
+#: builtin/help.c:130 builtin/help.c:158 builtin/help.c:167 builtin/help.c:175

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

-#: builtin/help.c:216
+#: builtin/help.c:215

 #, c-format
 msgid ""
 "'%s': path for unsupported man viewer.\n"
 "Please consider using 'man.<tool>.cmd' instead."
 msgstr ""
 
 #, c-format
 msgid ""
 "'%s': path for unsupported man viewer.\n"
 "Please consider using 'man.<tool>.cmd' instead."
 msgstr ""
 

-#: builtin/help.c:228
+#: builtin/help.c:227

 #, c-format
 msgid ""
 "'%s': cmd for supported man viewer.\n"
 "Please consider using 'man.<tool>.path' instead."
 msgstr ""
 
 #, c-format
 msgid ""
 "'%s': cmd for supported man viewer.\n"
 "Please consider using 'man.<tool>.path' instead."
 msgstr ""
 

-#: builtin/help.c:353
+#: builtin/help.c:352

 #, c-format
 msgid "'%s': unknown man viewer."
 msgstr ""
 
 #, c-format
 msgid "'%s': unknown man viewer."
 msgstr ""
 

-#: builtin/help.c:370
+#: builtin/help.c:369

 msgid "no man viewer handled the request"
 msgstr ""
 
 msgid "no man viewer handled the request"
 msgstr ""
 

-#: builtin/help.c:378
+#: builtin/help.c:377

 msgid "no info viewer handled the request"
 msgstr ""
 
 msgid "no info viewer handled the request"
 msgstr ""
 

-#: builtin/help.c:424
+#: builtin/help.c:423

 msgid "Defining attributes per path"
 msgstr ""
 
 msgid "Defining attributes per path"
 msgstr ""
 

+#: builtin/help.c:424
+msgid "Everyday Git With 20 Commands Or So"
+msgstr ""
+

 #: builtin/help.c:425
 msgid "A Git glossary"
 msgstr ""
 #: builtin/help.c:425
 msgid "A Git glossary"
 msgstr ""


@@ -5553,291 +5708,291 @@ msgstr ""
 msgid "`git %s' is aliased to `%s'"
 msgstr ""
 
 msgid "`git %s' is aliased to `%s'"
 msgstr ""
 

-#: builtin/index-pack.c:145
+#: builtin/index-pack.c:150

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

-#: builtin/index-pack.c:191
+#: builtin/index-pack.c:200

 #, c-format
 msgid "object type mismatch at %s"
 msgstr ""
 
 #, c-format
 msgid "object type mismatch at %s"
 msgstr ""
 

-#: builtin/index-pack.c:211
+#: builtin/index-pack.c:220

 #, c-format
 msgid "did not receive expected object %s"
 msgstr ""
 
 #, c-format
 msgid "did not receive expected object %s"
 msgstr ""
 

-#: builtin/index-pack.c:214
+#: builtin/index-pack.c:223

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

-#: builtin/index-pack.c:256
+#: builtin/index-pack.c:265

 #, 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:266
+#: builtin/index-pack.c:275

 msgid "early EOF"
 msgstr ""
 
 msgid "early EOF"
 msgstr ""
 

-#: builtin/index-pack.c:267
+#: builtin/index-pack.c:276

 msgid "read error on input"
 msgstr ""
 
 msgid "read error on input"
 msgstr ""
 

-#: builtin/index-pack.c:279
+#: builtin/index-pack.c:288

 msgid "used more bytes than were available"
 msgstr ""
 
 msgid "used more bytes than were available"
 msgstr ""
 

-#: builtin/index-pack.c:286
+#: builtin/index-pack.c:295

 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:302
+#: builtin/index-pack.c:311

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

-#: builtin/index-pack.c:307
+#: builtin/index-pack.c:316

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

-#: builtin/index-pack.c:321
+#: builtin/index-pack.c:330

 msgid "pack signature mismatch"
 msgstr ""
 
 msgid "pack signature mismatch"
 msgstr ""
 

-#: builtin/index-pack.c:323
+#: builtin/index-pack.c:332

 #, c-format
 msgid "pack version %<PRIu32> unsupported"
 msgstr ""
 
 #, c-format
 msgid "pack version %<PRIu32> unsupported"
 msgstr ""
 

-#: builtin/index-pack.c:341
+#: builtin/index-pack.c:350

 #, 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:462
+#: builtin/index-pack.c:471

 #, c-format
 msgid "inflate returned %d"
 msgstr ""
 
 #, c-format
 msgid "inflate returned %d"
 msgstr ""
 

-#: builtin/index-pack.c:511
+#: builtin/index-pack.c:520

 msgid "offset value overflow for delta base object"
 msgstr ""
 
 msgid "offset value overflow for delta base object"
 msgstr ""
 

-#: builtin/index-pack.c:519
+#: builtin/index-pack.c:528

 msgid "delta base offset is out of bound"
 msgstr ""
 
 msgid "delta base offset is out of bound"
 msgstr ""
 

-#: builtin/index-pack.c:527
+#: builtin/index-pack.c:536

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

-#: builtin/index-pack.c:558
+#: builtin/index-pack.c:567

 msgid "cannot pread pack file"
 msgstr ""
 
 msgid "cannot pread pack file"
 msgstr ""
 

-#: builtin/index-pack.c:560
+#: builtin/index-pack.c:569

 #, 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:586
+#: builtin/index-pack.c:595

 msgid "serious inflate inconsistency"
 msgstr ""
 
 msgid "serious inflate inconsistency"
 msgstr ""
 

-#: 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
+#: builtin/index-pack.c:686 builtin/index-pack.c:692 builtin/index-pack.c:715
+#: builtin/index-pack.c:749 builtin/index-pack.c:758

 #, c-format
 msgid "SHA1 COLLISION FOUND WITH %s !"
 msgstr ""
 
 #, c-format
 msgid "SHA1 COLLISION FOUND WITH %s !"
 msgstr ""
 

-#: builtin/index-pack.c:680 builtin/pack-objects.c:162
-#: builtin/pack-objects.c:254
+#: builtin/index-pack.c:689 builtin/pack-objects.c:164
+#: builtin/pack-objects.c:256

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

-#: builtin/index-pack.c:746
+#: builtin/index-pack.c:755

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

-#: builtin/index-pack.c:760
+#: builtin/index-pack.c:769

 #, c-format
 msgid "invalid blob object %s"
 msgstr ""
 
 #, c-format
 msgid "invalid blob object %s"
 msgstr ""
 

-#: builtin/index-pack.c:774
+#: builtin/index-pack.c:783

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

-#: builtin/index-pack.c:777
+#: builtin/index-pack.c:787

 msgid "Error in object"
 msgstr ""
 
 msgid "Error in object"
 msgstr ""
 

-#: builtin/index-pack.c:779
+#: builtin/index-pack.c:789

 #, 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:851 builtin/index-pack.c:881
+#: builtin/index-pack.c:861 builtin/index-pack.c:890

 msgid "failed to apply delta"
 msgstr ""
 
 msgid "failed to apply delta"
 msgstr ""
 

-#: builtin/index-pack.c:1022
+#: builtin/index-pack.c:1055

 msgid "Receiving objects"
 msgstr ""
 
 msgid "Receiving objects"
 msgstr ""
 

-#: builtin/index-pack.c:1022
+#: builtin/index-pack.c:1055

 msgid "Indexing objects"
 msgstr ""
 
 msgid "Indexing objects"
 msgstr ""
 

-#: builtin/index-pack.c:1048
+#: builtin/index-pack.c:1081

 msgid "pack is corrupted (SHA1 mismatch)"
 msgstr ""
 
 msgid "pack is corrupted (SHA1 mismatch)"
 msgstr ""
 

-#: builtin/index-pack.c:1053
+#: builtin/index-pack.c:1086

 msgid "cannot fstat packfile"
 msgstr ""
 
 msgid "cannot fstat packfile"
 msgstr ""
 

-#: builtin/index-pack.c:1056
+#: builtin/index-pack.c:1089

 msgid "pack has junk at the end"
 msgstr ""
 
 msgid "pack has junk at the end"
 msgstr ""
 

-#: builtin/index-pack.c:1067
+#: builtin/index-pack.c:1100

 msgid "confusion beyond insanity in parse_pack_objects()"
 msgstr ""
 
 msgid "confusion beyond insanity in parse_pack_objects()"
 msgstr ""
 

-#: builtin/index-pack.c:1090
+#: builtin/index-pack.c:1123

 msgid "Resolving deltas"
 msgstr ""
 
 msgid "Resolving deltas"
 msgstr ""
 

-#: builtin/index-pack.c:1100
+#: builtin/index-pack.c:1133

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

-#: builtin/index-pack.c:1142
+#: builtin/index-pack.c:1175

 msgid "confusion beyond insanity"
 msgstr ""
 
 msgid "confusion beyond insanity"
 msgstr ""
 

-#: builtin/index-pack.c:1150
+#: builtin/index-pack.c:1181

 #, c-format
 msgid "completed with %d local objects"
 msgstr ""
 
 #, c-format
 msgid "completed with %d local objects"
 msgstr ""
 

-#: builtin/index-pack.c:1160
+#: builtin/index-pack.c:1191

 #, 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:1164
+#: builtin/index-pack.c:1195

 #, 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:1189
+#: builtin/index-pack.c:1220

 #, c-format
 msgid "unable to deflate appended object (%d)"
 msgstr ""
 
 #, c-format
 msgid "unable to deflate appended object (%d)"
 msgstr ""
 

-#: builtin/index-pack.c:1268
+#: builtin/index-pack.c:1299

 #, c-format
 msgid "local object %s is corrupt"
 msgstr ""
 
 #, c-format
 msgid "local object %s is corrupt"
 msgstr ""
 

-#: builtin/index-pack.c:1292
+#: builtin/index-pack.c:1323

 msgid "error while closing pack file"
 msgstr ""
 
 msgid "error while closing pack file"
 msgstr ""
 

-#: builtin/index-pack.c:1305
+#: builtin/index-pack.c:1336

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

-#: builtin/index-pack.c:1313
+#: builtin/index-pack.c:1344

 #, c-format
 msgid "cannot close written keep file '%s'"
 msgstr ""
 
 #, c-format
 msgid "cannot close written keep file '%s'"
 msgstr ""
 

-#: builtin/index-pack.c:1326
+#: builtin/index-pack.c:1357

 msgid "cannot store pack file"
 msgstr ""
 
 msgid "cannot store pack file"
 msgstr ""
 

-#: builtin/index-pack.c:1337
+#: builtin/index-pack.c:1368

 msgid "cannot store index file"
 msgstr ""
 
 msgid "cannot store index file"
 msgstr ""
 

-#: builtin/index-pack.c:1370
+#: builtin/index-pack.c:1401

 #, c-format
 msgid "bad pack.indexversion=%<PRIu32>"
 msgstr ""
 
 #, c-format
 msgid "bad pack.indexversion=%<PRIu32>"
 msgstr ""
 

-#: builtin/index-pack.c:1376
+#: builtin/index-pack.c:1407

 #, c-format
 msgid "invalid number of threads specified (%d)"
 msgstr ""
 
 #, c-format
 msgid "invalid number of threads specified (%d)"
 msgstr ""
 

-#: builtin/index-pack.c:1380 builtin/index-pack.c:1559
+#: builtin/index-pack.c:1411 builtin/index-pack.c:1590

 #, c-format
 msgid "no threads support, ignoring %s"
 msgstr ""
 
 #, c-format
 msgid "no threads support, ignoring %s"
 msgstr ""
 

-#: builtin/index-pack.c:1438
+#: builtin/index-pack.c:1469

 #, c-format
 msgid "Cannot open existing pack file '%s'"
 msgstr ""
 
 #, c-format
 msgid "Cannot open existing pack file '%s'"
 msgstr ""
 

-#: builtin/index-pack.c:1440
+#: builtin/index-pack.c:1471

 #, 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:1487
+#: builtin/index-pack.c:1518

 #, 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:1494
+#: builtin/index-pack.c:1525

 #, 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:1523
+#: builtin/index-pack.c:1554

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

-#: builtin/index-pack.c:1571 builtin/index-pack.c:1574
-#: builtin/index-pack.c:1586 builtin/index-pack.c:1590
+#: builtin/index-pack.c:1602 builtin/index-pack.c:1605
+#: builtin/index-pack.c:1617 builtin/index-pack.c:1621

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

-#: builtin/index-pack.c:1604
+#: builtin/index-pack.c:1635

 msgid "--fix-thin cannot be used without --stdin"
 msgstr ""
 
 msgid "--fix-thin cannot be used without --stdin"
 msgstr ""
 

-#: builtin/index-pack.c:1608 builtin/index-pack.c:1617
+#: builtin/index-pack.c:1639 builtin/index-pack.c:1648

 #, 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:1625
+#: builtin/index-pack.c:1656

 msgid "--verify with no packfile name given"
 msgstr ""
 
 msgid "--verify with no packfile name given"
 msgstr ""
 


@@ -5946,54 +6101,64 @@ msgstr ""
 msgid " shared"
 msgstr ""
 
 msgid " shared"
 msgstr ""
 

-#: builtin/init-db.c:439
-msgid "cannot tell cwd"
-msgstr ""
-
-#: builtin/init-db.c:465
+#: builtin/init-db.c:467

 msgid ""
 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
 "shared[=<permissions>]] [directory]"
 msgstr ""
 
 msgid ""
 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
 "shared[=<permissions>]] [directory]"
 msgstr ""
 

-#: builtin/init-db.c:488
+#: builtin/init-db.c:490

 msgid "permissions"
 msgstr ""
 
 msgid "permissions"
 msgstr ""
 

-#: builtin/init-db.c:489
+#: builtin/init-db.c:491

 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:172
+#: builtin/init-db.c:493 builtin/prune-packed.c:57 builtin/repack.c:172

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

-#: builtin/init-db.c:523 builtin/init-db.c:528
+#: builtin/init-db.c:525 builtin/init-db.c:530

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

-#: builtin/init-db.c:532
+#: builtin/init-db.c:534

 #, c-format
 msgid "cannot chdir to %s"
 msgstr ""
 
 #, c-format
 msgid "cannot chdir to %s"
 msgstr ""
 

-#: builtin/init-db.c:554
+#: builtin/init-db.c:555

 #, c-format
 msgid ""
 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
 "dir=<directory>)"
 msgstr ""
 
 #, c-format
 msgid ""
 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
 "dir=<directory>)"
 msgstr ""
 

-#: builtin/init-db.c:578
-msgid "Cannot access current working directory"
-msgstr ""
-
-#: builtin/init-db.c:585
+#: builtin/init-db.c:583

 #, c-format
 msgid "Cannot access work tree '%s'"
 msgstr ""
 
 #, c-format
 msgid "Cannot access work tree '%s'"
 msgstr ""
 

+#: builtin/interpret-trailers.c:15
+msgid ""
+"git interpret-trailers [--trim-empty] [(--trailer <token>[(=|:)<value>])...] "
+"[<file>...]"
+msgstr ""
+
+#: builtin/interpret-trailers.c:25
+msgid "trim empty trailers"
+msgstr ""
+
+#: builtin/interpret-trailers.c:26
+msgid "trailer"
+msgstr ""
+
+#: builtin/interpret-trailers.c:27
+msgid "trailer(s) to add"
+msgstr ""
+

 #: builtin/log.c:41
 msgid "git log [<options>] [<revision range>] [[--] <path>...]\n"
 msgstr ""
 #: builtin/log.c:41
 msgid "git log [<options>] [<revision range>] [[--] <path>...]\n"
 msgstr ""


@@ -6002,6 +6167,11 @@ msgstr ""
 msgid "   or: git show [options] <object>..."
 msgstr ""
 
 msgid "   or: git show [options] <object>..."
 msgstr ""
 

+#: builtin/log.c:81
+#, c-format
+msgid "invalid --decorate option: %s"
+msgstr ""
+

 #: builtin/log.c:127
 msgid "suppress diff output"
 msgstr ""
 #: builtin/log.c:127
 msgid "suppress diff output"
 msgstr ""


@@ -6018,245 +6188,254 @@ msgstr ""
 msgid "decorate options"
 msgstr ""
 
 msgid "decorate options"
 msgstr ""
 

+#: builtin/log.c:133
+msgid "Process line range n,m in file, counting from 1"
+msgstr ""
+

 #: builtin/log.c:229
 #, c-format
 msgid "Final output: %d %s\n"
 msgstr ""
 
 #: builtin/log.c:229
 #, c-format
 msgid "Final output: %d %s\n"
 msgstr ""
 

-#: builtin/log.c:470 builtin/log.c:562
+#: builtin/log.c:458
+#, c-format
+msgid "git show %s: bad file"
+msgstr ""
+
+#: builtin/log.c:472 builtin/log.c:564

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

-#: builtin/log.c:586
+#: builtin/log.c:588

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

-#: builtin/log.c:687
+#: builtin/log.c:689

 msgid "format.headers without value"
 msgstr ""
 
 msgid "format.headers without value"
 msgstr ""
 

-#: builtin/log.c:771
+#: builtin/log.c:773

 msgid "name of output directory is too long"
 msgstr ""
 
 msgid "name of output directory is too long"
 msgstr ""
 

-#: builtin/log.c:787
+#: builtin/log.c:789

 #, c-format
 msgid "Cannot open patch file %s"
 msgstr ""
 
 #, c-format
 msgid "Cannot open patch file %s"
 msgstr ""
 

-#: builtin/log.c:801
+#: builtin/log.c:803

 msgid "Need exactly one range."
 msgstr ""
 
 msgid "Need exactly one range."
 msgstr ""
 

-#: builtin/log.c:809
+#: builtin/log.c:811

 msgid "Not a range."
 msgstr ""
 
 msgid "Not a range."
 msgstr ""
 

-#: builtin/log.c:916
+#: builtin/log.c:919

 msgid "Cover letter needs email format"
 msgstr ""
 
 msgid "Cover letter needs email format"
 msgstr ""
 

-#: builtin/log.c:995
+#: builtin/log.c:998

 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr ""
 
 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr ""
 

-#: builtin/log.c:1023
+#: builtin/log.c:1026

 msgid "git format-patch [options] [<since> | <revision range>]"
 msgstr ""
 
 msgid "git format-patch [options] [<since> | <revision range>]"
 msgstr ""
 

-#: builtin/log.c:1068
+#: builtin/log.c:1071

 msgid "Two output directories?"
 msgstr ""
 
 msgid "Two output directories?"
 msgstr ""
 

-#: builtin/log.c:1183
+#: builtin/log.c:1186

 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:1186
+#: builtin/log.c:1189

 msgid "use [PATCH] even with multiple patches"
 msgstr ""
 
 msgid "use [PATCH] even with multiple patches"
 msgstr ""
 

-#: builtin/log.c:1190
+#: builtin/log.c:1193

 msgid "print patches to standard out"
 msgstr ""
 
 msgid "print patches to standard out"
 msgstr ""
 

-#: builtin/log.c:1192
+#: builtin/log.c:1195

 msgid "generate a cover letter"
 msgstr ""
 
 msgid "generate a cover letter"
 msgstr ""
 

-#: builtin/log.c:1194
+#: builtin/log.c:1197

 msgid "use simple number sequence for output file names"
 msgstr ""
 
 msgid "use simple number sequence for output file names"
 msgstr ""
 

-#: builtin/log.c:1195
+#: builtin/log.c:1198

 msgid "sfx"
 msgstr ""
 
 msgid "sfx"
 msgstr ""
 

-#: builtin/log.c:1196
+#: builtin/log.c:1199

 msgid "use <sfx> instead of '.patch'"
 msgstr ""
 
 msgid "use <sfx> instead of '.patch'"
 msgstr ""
 

-#: builtin/log.c:1198
+#: builtin/log.c:1201

 msgid "start numbering patches at <n> instead of 1"
 msgstr ""
 
 msgid "start numbering patches at <n> instead of 1"
 msgstr ""
 

-#: builtin/log.c:1200
+#: builtin/log.c:1203

 msgid "mark the series as Nth re-roll"
 msgstr ""
 
 msgid "mark the series as Nth re-roll"
 msgstr ""
 

-#: builtin/log.c:1202
+#: builtin/log.c:1205

 msgid "Use [<prefix>] instead of [PATCH]"
 msgstr ""
 
 msgid "Use [<prefix>] instead of [PATCH]"
 msgstr ""
 

-#: builtin/log.c:1205
+#: builtin/log.c:1208

 msgid "store resulting files in <dir>"
 msgstr ""
 
 msgid "store resulting files in <dir>"
 msgstr ""
 

-#: builtin/log.c:1208
+#: builtin/log.c:1211

 msgid "don't strip/add [PATCH]"
 msgstr ""
 
 msgid "don't strip/add [PATCH]"
 msgstr ""
 

-#: builtin/log.c:1211
+#: builtin/log.c:1214

 msgid "don't output binary diffs"
 msgstr ""
 
 msgid "don't output binary diffs"
 msgstr ""
 

-#: builtin/log.c:1213
+#: builtin/log.c:1216

 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:1215
+#: builtin/log.c:1218

 msgid "show patch format instead of default (patch + stat)"
 msgstr ""
 
 msgid "show patch format instead of default (patch + stat)"
 msgstr ""
 

-#: builtin/log.c:1217
+#: builtin/log.c:1220

 msgid "Messaging"
 msgstr ""
 
 msgid "Messaging"
 msgstr ""
 

-#: builtin/log.c:1218
+#: builtin/log.c:1221

 msgid "header"
 msgstr ""
 
 msgid "header"
 msgstr ""
 

-#: builtin/log.c:1219
+#: builtin/log.c:1222

 msgid "add email header"
 msgstr ""
 
 msgid "add email header"
 msgstr ""
 

-#: builtin/log.c:1220 builtin/log.c:1222
+#: builtin/log.c:1223 builtin/log.c:1225

 msgid "email"
 msgstr ""
 
 msgid "email"
 msgstr ""
 

-#: builtin/log.c:1220
+#: builtin/log.c:1223

 msgid "add To: header"
 msgstr ""
 
 msgid "add To: header"
 msgstr ""
 

-#: builtin/log.c:1222
+#: builtin/log.c:1225

 msgid "add Cc: header"
 msgstr ""
 
 msgid "add Cc: header"
 msgstr ""
 

-#: builtin/log.c:1224
+#: builtin/log.c:1227

 msgid "ident"
 msgstr ""
 
 msgid "ident"
 msgstr ""
 

-#: builtin/log.c:1225
+#: builtin/log.c:1228

 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:1227
+#: builtin/log.c:1230

 msgid "message-id"
 msgstr ""
 
 msgid "message-id"
 msgstr ""
 

-#: builtin/log.c:1228
+#: builtin/log.c:1231

 msgid "make first mail a reply to <message-id>"
 msgstr ""
 
 msgid "make first mail a reply to <message-id>"
 msgstr ""
 

-#: builtin/log.c:1229 builtin/log.c:1232
+#: builtin/log.c:1232 builtin/log.c:1235

 msgid "boundary"
 msgstr ""
 
 msgid "boundary"
 msgstr ""
 

-#: builtin/log.c:1230
+#: builtin/log.c:1233

 msgid "attach the patch"
 msgstr ""
 
 msgid "attach the patch"
 msgstr ""
 

-#: builtin/log.c:1233
+#: builtin/log.c:1236

 msgid "inline the patch"
 msgstr ""
 
 msgid "inline the patch"
 msgstr ""
 

-#: builtin/log.c:1237
+#: builtin/log.c:1240

 msgid "enable message threading, styles: shallow, deep"
 msgstr ""
 
 msgid "enable message threading, styles: shallow, deep"
 msgstr ""
 

-#: builtin/log.c:1239
+#: builtin/log.c:1242

 msgid "signature"
 msgstr ""
 
 msgid "signature"
 msgstr ""
 

-#: builtin/log.c:1240
+#: builtin/log.c:1243

 msgid "add a signature"
 msgstr ""
 
 msgid "add a signature"
 msgstr ""
 

-#: builtin/log.c:1242
+#: builtin/log.c:1245

 msgid "add a signature from a file"
 msgstr ""
 
 msgid "add a signature from a file"
 msgstr ""
 

-#: builtin/log.c:1243
+#: builtin/log.c:1246

 msgid "don't print the patch filenames"
 msgstr ""
 
 msgid "don't print the patch filenames"
 msgstr ""
 

-#: builtin/log.c:1317
+#: builtin/log.c:1320

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

-#: builtin/log.c:1332
+#: builtin/log.c:1335

 msgid "-n and -k are mutually exclusive."
 msgstr ""
 
 msgid "-n and -k are mutually exclusive."
 msgstr ""
 

-#: builtin/log.c:1334
+#: builtin/log.c:1337

 msgid "--subject-prefix and -k are mutually exclusive."
 msgstr ""
 
 msgid "--subject-prefix and -k are mutually exclusive."
 msgstr ""
 

-#: builtin/log.c:1342
+#: builtin/log.c:1345

 msgid "--name-only does not make sense"
 msgstr ""
 
 msgid "--name-only does not make sense"
 msgstr ""
 

-#: builtin/log.c:1344
+#: builtin/log.c:1347

 msgid "--name-status does not make sense"
 msgstr ""
 
 msgid "--name-status does not make sense"
 msgstr ""
 

-#: builtin/log.c:1346
+#: builtin/log.c:1349

 msgid "--check does not make sense"
 msgstr ""
 
 msgid "--check does not make sense"
 msgstr ""
 

-#: builtin/log.c:1369
+#: builtin/log.c:1372

 msgid "standard output, or directory, which one?"
 msgstr ""
 
 msgid "standard output, or directory, which one?"
 msgstr ""
 

-#: builtin/log.c:1371
+#: builtin/log.c:1374

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

-#: builtin/log.c:1468
+#: builtin/log.c:1472

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

-#: builtin/log.c:1531
+#: builtin/log.c:1535

 msgid "Failed to create output files"
 msgstr ""
 
 msgid "Failed to create output files"
 msgstr ""
 

-#: builtin/log.c:1579
+#: builtin/log.c:1583

 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
 msgstr ""
 
 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
 msgstr ""
 

-#: builtin/log.c:1634
+#: builtin/log.c:1638

 #, 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:1647 builtin/log.c:1649 builtin/log.c:1661
+#: builtin/log.c:1651 builtin/log.c:1653 builtin/log.c:1665

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


@@ -6302,7 +6481,7 @@ msgid "show files on the filesystem that need to be removed"
 msgstr ""
 
 #: builtin/ls-files.c:477
 msgstr ""
 
 #: builtin/ls-files.c:477

-msgid "show 'other' directories' name only"
+msgid "show 'other' directories' names only"

 msgstr ""
 
 #: builtin/ls-files.c:480
 msgstr ""
 
 #: builtin/ls-files.c:480


@@ -6389,98 +6568,98 @@ msgstr ""
 msgid "list entire tree; not just current directory (implies --full-name)"
 msgstr ""
 
 msgid "list entire tree; not just current directory (implies --full-name)"
 msgstr ""
 

-#: builtin/merge.c:43
+#: builtin/merge.c:44

 msgid "git merge [options] [<commit>...]"
 msgstr ""
 
 msgid "git merge [options] [<commit>...]"
 msgstr ""
 

-#: builtin/merge.c:44
+#: builtin/merge.c:45

 msgid "git merge [options] <msg> HEAD <commit>"
 msgstr ""
 
 msgid "git merge [options] <msg> HEAD <commit>"
 msgstr ""
 

-#: builtin/merge.c:45
+#: builtin/merge.c:46

 msgid "git merge --abort"
 msgstr ""
 
 msgid "git merge --abort"
 msgstr ""
 

-#: builtin/merge.c:98
+#: builtin/merge.c:99

 msgid "switch `m' requires a value"
 msgstr ""
 
 msgid "switch `m' requires a value"
 msgstr ""
 

-#: builtin/merge.c:135
+#: builtin/merge.c:136

 #, c-format
 msgid "Could not find merge strategy '%s'.\n"
 msgstr ""
 
 #, c-format
 msgid "Could not find merge strategy '%s'.\n"
 msgstr ""
 

-#: builtin/merge.c:136
+#: builtin/merge.c:137

 #, c-format
 msgid "Available strategies are:"
 msgstr ""
 
 #, c-format
 msgid "Available strategies are:"
 msgstr ""
 

-#: builtin/merge.c:141
+#: builtin/merge.c:142

 #, c-format
 msgid "Available custom strategies are:"
 msgstr ""
 
 #, c-format
 msgid "Available custom strategies are:"
 msgstr ""
 

-#: builtin/merge.c:191
+#: builtin/merge.c:192

 msgid "do not show a diffstat at the end of the merge"
 msgstr ""
 
 msgid "do not show a diffstat at the end of the merge"
 msgstr ""
 

-#: builtin/merge.c:194
+#: builtin/merge.c:195

 msgid "show a diffstat at the end of the merge"
 msgstr ""
 
 msgid "show a diffstat at the end of the merge"
 msgstr ""
 

-#: builtin/merge.c:195
+#: builtin/merge.c:196

 msgid "(synonym to --stat)"
 msgstr ""
 
 msgid "(synonym to --stat)"
 msgstr ""
 

-#: builtin/merge.c:197
+#: builtin/merge.c:198

 msgid "add (at most <n>) entries from shortlog to merge commit message"
 msgstr ""
 
 msgid "add (at most <n>) entries from shortlog to merge commit message"
 msgstr ""
 

-#: builtin/merge.c:200
+#: builtin/merge.c:201

 msgid "create a single commit instead of doing a merge"
 msgstr ""
 
 msgid "create a single commit instead of doing a merge"
 msgstr ""
 

-#: builtin/merge.c:202
+#: builtin/merge.c:203

 msgid "perform a commit if the merge succeeds (default)"
 msgstr ""
 
 msgid "perform a commit if the merge succeeds (default)"
 msgstr ""
 

-#: builtin/merge.c:204
+#: builtin/merge.c:205

 msgid "edit message before committing"
 msgstr ""
 
 msgid "edit message before committing"
 msgstr ""
 

-#: builtin/merge.c:205
+#: builtin/merge.c:206

 msgid "allow fast-forward (default)"
 msgstr ""
 
 msgid "allow fast-forward (default)"
 msgstr ""
 

-#: builtin/merge.c:207
+#: builtin/merge.c:208

 msgid "abort if fast-forward is not possible"
 msgstr ""
 
 msgid "abort if fast-forward is not possible"
 msgstr ""
 

-#: builtin/merge.c:211
+#: builtin/merge.c:212

 msgid "Verify that the named commit has a valid GPG signature"
 msgstr ""
 
 msgid "Verify that the named commit has a valid GPG signature"
 msgstr ""
 

-#: builtin/merge.c:212 builtin/notes.c:742 builtin/revert.c:89
+#: builtin/merge.c:213 builtin/notes.c:741 builtin/revert.c:89

 msgid "strategy"
 msgstr ""
 
 msgid "strategy"
 msgstr ""
 

-#: builtin/merge.c:213
+#: builtin/merge.c:214

 msgid "merge strategy to use"
 msgstr ""
 
 msgid "merge strategy to use"
 msgstr ""
 

-#: builtin/merge.c:214
+#: builtin/merge.c:215

 msgid "option=value"
 msgstr ""
 
 msgid "option=value"
 msgstr ""
 

-#: builtin/merge.c:215
+#: builtin/merge.c:216

 msgid "option for selected merge strategy"
 msgstr ""
 
 msgid "option for selected merge strategy"
 msgstr ""
 

-#: builtin/merge.c:217
+#: builtin/merge.c:218

 msgid "merge commit message (for a non-fast-forward merge)"
 msgstr ""
 
 msgid "merge commit message (for a non-fast-forward merge)"
 msgstr ""
 

-#: builtin/merge.c:221
+#: builtin/merge.c:222

 msgid "abort the current in-progress merge"
 msgstr ""
 
 msgid "abort the current in-progress merge"
 msgstr ""
 


@@ -6537,31 +6716,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:678
+#: builtin/merge.c:677

 msgid "Not handling anything other than two heads merge."
 msgstr ""
 
 msgid "Not handling anything other than two heads merge."
 msgstr ""
 

-#: builtin/merge.c:692
+#: builtin/merge.c:691

 #, 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:705
+#: builtin/merge.c:704

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

-#: builtin/merge.c:794
+#: builtin/merge.c:793

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

-#: builtin/merge.c:803
+#: builtin/merge.c:802

 #, 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:809
+#: builtin/merge.c:808

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


@@ -6571,156 +6750,156 @@ msgid ""
 "the commit.\n"
 msgstr ""
 
 "the commit.\n"
 msgstr ""
 

-#: builtin/merge.c:833
+#: builtin/merge.c:832

 msgid "Empty commit message."
 msgstr ""
 
 msgid "Empty commit message."
 msgstr ""
 

-#: builtin/merge.c:845
+#: builtin/merge.c:844

 #, c-format
 msgid "Wonderful.\n"
 msgstr ""
 
 #, c-format
 msgid "Wonderful.\n"
 msgstr ""
 

-#: builtin/merge.c:908
+#: builtin/merge.c:907

 #, 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:924
+#: builtin/merge.c:923

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

-#: builtin/merge.c:965
+#: builtin/merge.c:964

 msgid "No current branch."
 msgstr ""
 
 msgid "No current branch."
 msgstr ""
 

-#: builtin/merge.c:967
+#: builtin/merge.c:966

 msgid "No remote for the current branch."
 msgstr ""
 
 msgid "No remote for the current branch."
 msgstr ""
 

-#: builtin/merge.c:969
+#: builtin/merge.c:968

 msgid "No default upstream defined for the current branch."
 msgstr ""
 
 msgid "No default upstream defined for the current branch."
 msgstr ""
 

-#: builtin/merge.c:974
+#: builtin/merge.c:973

 #, 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:1130
+#: builtin/merge.c:1129

 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:1146 git-pull.sh:31
+#: builtin/merge.c:1145

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

-"Please, commit your changes before you can merge."
+"Please, commit your changes before you merge."

 msgstr ""
 
 msgstr ""
 

-#: builtin/merge.c:1149 git-pull.sh:34
+#: builtin/merge.c:1148 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:1153
+#: builtin/merge.c:1152

 msgid ""
 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
 msgid ""
 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"

-"Please, commit your changes before you can merge."
+"Please, commit your changes before you merge."

 msgstr ""
 
 msgstr ""
 

-#: builtin/merge.c:1156
+#: builtin/merge.c:1155

 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:1165
+#: builtin/merge.c:1164

 msgid "You cannot combine --squash with --no-ff."
 msgstr ""
 
 msgid "You cannot combine --squash with --no-ff."
 msgstr ""
 

-#: builtin/merge.c:1174
+#: builtin/merge.c:1173

 msgid "No commit specified and merge.defaultToUpstream not set."
 msgstr ""
 
 msgid "No commit specified and merge.defaultToUpstream not set."
 msgstr ""
 

-#: builtin/merge.c:1206
+#: builtin/merge.c:1205

 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:1209
+#: builtin/merge.c:1208

 msgid "Squash commit into empty head not supported yet"
 msgstr ""
 
 msgid "Squash commit into empty head not supported yet"
 msgstr ""
 

-#: builtin/merge.c:1211
+#: builtin/merge.c:1210

 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:1216
+#: builtin/merge.c:1215

 #, c-format
 msgid "%s - not something we can merge"
 msgstr ""
 
 #, c-format
 msgid "%s - not something we can merge"
 msgstr ""
 

-#: builtin/merge.c:1267
+#: builtin/merge.c:1266

 #, 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:1270
+#: builtin/merge.c:1269

 #, 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:1273
+#: builtin/merge.c:1272

 #, 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:1276
+#: builtin/merge.c:1275

 #, 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:1357
+#: builtin/merge.c:1356

 #, c-format
 msgid "Updating %s..%s\n"
 msgstr ""
 
 #, c-format
 msgid "Updating %s..%s\n"
 msgstr ""
 

-#: builtin/merge.c:1396
+#: builtin/merge.c:1395

 #, 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:1403
+#: builtin/merge.c:1402

 #, c-format
 msgid "Nope.\n"
 msgstr ""
 
 #, c-format
 msgid "Nope.\n"
 msgstr ""
 

-#: builtin/merge.c:1435
+#: builtin/merge.c:1434

 msgid "Not possible to fast-forward, aborting."
 msgstr ""
 
 msgid "Not possible to fast-forward, aborting."
 msgstr ""
 

-#: builtin/merge.c:1458 builtin/merge.c:1537
+#: builtin/merge.c:1457 builtin/merge.c:1536

 #, c-format
 msgid "Rewinding the tree to pristine...\n"
 msgstr ""
 
 #, c-format
 msgid "Rewinding the tree to pristine...\n"
 msgstr ""
 

-#: builtin/merge.c:1462
+#: builtin/merge.c:1461

 #, c-format
 msgid "Trying merge strategy %s...\n"
 msgstr ""
 
 #, c-format
 msgid "Trying merge strategy %s...\n"
 msgstr ""
 

-#: builtin/merge.c:1528
+#: builtin/merge.c:1527

 #, 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:1530
+#: builtin/merge.c:1529

 #, c-format
 msgid "Merge with strategy %s failed.\n"
 msgstr ""
 
 #, c-format
 msgid "Merge with strategy %s failed.\n"
 msgstr ""
 

-#: builtin/merge.c:1539
+#: builtin/merge.c:1538

 #, 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:1551
+#: builtin/merge.c:1550

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


@@ -6823,85 +7002,90 @@ msgstr ""
 msgid "git mv [options] <source>... <destination>"
 msgstr ""
 
 msgid "git mv [options] <source>... <destination>"
 msgstr ""
 

-#: builtin/mv.c:71
-msgid "force move/rename even if target exists"
+#: builtin/mv.c:69
+#, c-format
+msgid "Directory %s is in index and no submodule?"

 msgstr ""
 
 msgstr ""
 

-#: builtin/mv.c:72
-msgid "skip move/rename errors"
+#: builtin/mv.c:71
+msgid "Please stage your changes to .gitmodules or stash them to proceed"

 msgstr ""
 
 msgstr ""
 

-#: builtin/mv.c:122
+#: builtin/mv.c:89

 #, c-format
 #, c-format

-msgid "Checking rename of '%s' to '%s'\n"
+msgid "%.*s is in index"

 msgstr ""
 
 msgstr ""
 

-#: builtin/mv.c:126
-msgid "bad source"
+#: builtin/mv.c:111
+msgid "force move/rename even if target exists"

 msgstr ""
 
 msgstr ""
 

-#: builtin/mv.c:129
-msgid "can not move directory into itself"
+#: builtin/mv.c:112
+msgid "skip move/rename errors"

 msgstr ""
 
 msgstr ""
 

-#: builtin/mv.c:132
-msgid "cannot move directory over file"
+#: builtin/mv.c:151
+#, c-format
+msgid "destination '%s' is not a directory"

 msgstr ""
 
 msgstr ""
 

-#: builtin/mv.c:138
+#: builtin/mv.c:162

 #, c-format
 #, c-format

-msgid "Huh? Directory %s is in index and no submodule?"
+msgid "Checking rename of '%s' to '%s'\n"

 msgstr ""
 
 msgstr ""
 

-#: builtin/mv.c:140 builtin/rm.c:318
-msgid "Please, stage your changes to .gitmodules or stash them to proceed"
+#: builtin/mv.c:166
+msgid "bad source"

 msgstr ""
 
 msgstr ""
 

-#: builtin/mv.c:156
-#, c-format
-msgid "Huh? %.*s is in index?"
+#: builtin/mv.c:169
+msgid "can not move directory into itself"

 msgstr ""
 
 msgstr ""
 

-#: builtin/mv.c:169
+#: builtin/mv.c:172
+msgid "cannot move directory over file"
+msgstr ""
+
+#: builtin/mv.c:181

 msgid "source directory is empty"
 msgstr ""
 
 msgid "source directory is empty"
 msgstr ""
 

-#: builtin/mv.c:205
+#: builtin/mv.c:206

 msgid "not under version control"
 msgstr ""
 
 msgid "not under version control"
 msgstr ""
 

-#: builtin/mv.c:208
+#: builtin/mv.c:209

 msgid "destination exists"
 msgstr ""
 
 msgid "destination exists"
 msgstr ""
 

-#: builtin/mv.c:216
+#: builtin/mv.c:217

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

-#: builtin/mv.c:219
+#: builtin/mv.c:220

 msgid "Cannot overwrite"
 msgstr ""
 
 msgid "Cannot overwrite"
 msgstr ""
 

-#: builtin/mv.c:222
+#: builtin/mv.c:223

 msgid "multiple sources for the same target"
 msgstr ""
 
 msgid "multiple sources for the same target"
 msgstr ""
 

-#: builtin/mv.c:224
+#: builtin/mv.c:225

 msgid "destination directory does not exist"
 msgstr ""
 
 msgid "destination directory does not exist"
 msgstr ""
 

-#: builtin/mv.c:244
+#: builtin/mv.c:232

 #, c-format
 msgid "%s, source=%s, destination=%s"
 msgstr ""
 
 #, c-format
 msgid "%s, source=%s, destination=%s"
 msgstr ""
 

-#: builtin/mv.c:254
+#: builtin/mv.c:253

 #, c-format
 msgid "Renaming %s to %s\n"
 msgstr ""
 
 #, c-format
 msgid "Renaming %s to %s\n"
 msgstr ""
 

-#: builtin/mv.c:257 builtin/remote.c:725 builtin/repack.c:358
+#: builtin/mv.c:256 builtin/remote.c:726 builtin/repack.c:358

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


@@ -7051,390 +7235,394 @@ msgstr ""
 msgid "git notes get-ref"
 msgstr ""
 
 msgid "git notes get-ref"
 msgstr ""
 

-#: builtin/notes.c:137
+#: builtin/notes.c:136

 #, c-format
 msgid "unable to start 'show' for object '%s'"
 msgstr ""
 
 #, c-format
 msgid "unable to start 'show' for object '%s'"
 msgstr ""
 

-#: builtin/notes.c:141
+#: builtin/notes.c:140

 msgid "could not read 'show' output"
 msgstr ""
 
 msgid "could not read 'show' output"
 msgstr ""
 

-#: builtin/notes.c:149
+#: builtin/notes.c:148

 #, c-format
 msgid "failed to finish 'show' for object '%s'"
 msgstr ""
 
 #, c-format
 msgid "failed to finish 'show' for object '%s'"
 msgstr ""
 

-#: builtin/notes.c:167 builtin/tag.c:477
+#: builtin/notes.c:166 builtin/tag.c:477

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

-#: builtin/notes.c:186
+#: builtin/notes.c:185

 msgid "Please supply the note contents using either -m or -F option"
 msgstr ""
 
 msgid "Please supply the note contents using either -m or -F option"
 msgstr ""
 

-#: builtin/notes.c:207 builtin/notes.c:848
+#: builtin/notes.c:206 builtin/notes.c:847

 #, c-format
 msgid "Removing note for object %s\n"
 msgstr ""
 
 #, c-format
 msgid "Removing note for object %s\n"
 msgstr ""
 

-#: builtin/notes.c:212
+#: builtin/notes.c:211

 msgid "unable to write note object"
 msgstr ""
 
 msgid "unable to write note object"
 msgstr ""
 

-#: builtin/notes.c:214
+#: builtin/notes.c:213

 #, c-format
 #, c-format

-msgid "The note contents has been left in %s"
+msgid "The note contents have been left in %s"

 msgstr ""
 
 msgstr ""
 

-#: builtin/notes.c:248 builtin/tag.c:692
+#: builtin/notes.c:247 builtin/tag.c:693

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

-#: builtin/notes.c:250 builtin/tag.c:695
+#: builtin/notes.c:249 builtin/tag.c:696

 #, c-format
 msgid "could not open or read '%s'"
 msgstr ""
 
 #, c-format
 msgid "could not open or read '%s'"
 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:843 builtin/tag.c:708
+#: builtin/notes.c:268 builtin/notes.c:319 builtin/notes.c:321
+#: builtin/notes.c:381 builtin/notes.c:435 builtin/notes.c:518
+#: builtin/notes.c:523 builtin/notes.c:598 builtin/notes.c:640
+#: builtin/notes.c:842 builtin/tag.c:709

 #, c-format
 msgid "Failed to resolve '%s' as a valid ref."
 msgstr ""
 
 #, c-format
 msgid "Failed to resolve '%s' as a valid ref."
 msgstr ""
 

-#: builtin/notes.c:272
+#: builtin/notes.c:271

 #, c-format
 msgid "Failed to read object '%s'."
 msgstr ""
 
 #, c-format
 msgid "Failed to read object '%s'."
 msgstr ""
 

-#: builtin/notes.c:276
+#: builtin/notes.c:275

 #, c-format
 msgid "Cannot read note data from non-blob object '%s'."
 msgstr ""
 
 #, c-format
 msgid "Cannot read note data from non-blob object '%s'."
 msgstr ""
 

-#: builtin/notes.c:316
+#: builtin/notes.c:315

 #, c-format
 msgid "Malformed input line: '%s'."
 msgstr ""
 
 #, c-format
 msgid "Malformed input line: '%s'."
 msgstr ""
 

-#: builtin/notes.c:331
+#: builtin/notes.c:330

 #, c-format
 msgid "Failed to copy notes from '%s' to '%s'"
 msgstr ""
 
 #, c-format
 msgid "Failed to copy notes from '%s' to '%s'"
 msgstr ""
 

-#: builtin/notes.c:375 builtin/notes.c:429 builtin/notes.c:502
-#: builtin/notes.c:514 builtin/notes.c:587 builtin/notes.c:634
-#: builtin/notes.c:908
+#: builtin/notes.c:374 builtin/notes.c:428 builtin/notes.c:501
+#: builtin/notes.c:513 builtin/notes.c:586 builtin/notes.c:633
+#: builtin/notes.c:907

 msgid "too many parameters"
 msgstr ""
 
 msgid "too many parameters"
 msgstr ""
 

-#: builtin/notes.c:388 builtin/notes.c:647
+#: builtin/notes.c:387 builtin/notes.c:646

 #, c-format
 msgid "No note found for object %s."
 msgstr ""
 
 #, c-format
 msgid "No note found for object %s."
 msgstr ""
 

-#: builtin/notes.c:410 builtin/notes.c:567
+#: builtin/notes.c:409 builtin/notes.c:566

 msgid "note contents as a string"
 msgstr ""
 
 msgid "note contents as a string"
 msgstr ""
 

-#: builtin/notes.c:413 builtin/notes.c:570
+#: builtin/notes.c:412 builtin/notes.c:569

 msgid "note contents in a file"
 msgstr ""
 
 msgid "note contents in a file"
 msgstr ""
 

-#: builtin/notes.c:415 builtin/notes.c:418 builtin/notes.c:572
-#: builtin/notes.c:575 builtin/tag.c:627
+#: builtin/notes.c:414 builtin/notes.c:417 builtin/notes.c:571
+#: builtin/notes.c:574 builtin/tag.c:628

 msgid "object"
 msgstr ""
 
 msgid "object"
 msgstr ""
 

-#: builtin/notes.c:416 builtin/notes.c:573
+#: builtin/notes.c:415 builtin/notes.c:572

 msgid "reuse and edit specified note object"
 msgstr ""
 
 msgid "reuse and edit specified note object"
 msgstr ""
 

-#: builtin/notes.c:419 builtin/notes.c:576
+#: builtin/notes.c:418 builtin/notes.c:575

 msgid "reuse specified note object"
 msgstr ""
 
 msgid "reuse specified note object"
 msgstr ""
 

-#: builtin/notes.c:421 builtin/notes.c:489
+#: builtin/notes.c:420 builtin/notes.c:488

 msgid "replace existing notes"
 msgstr ""
 
 msgid "replace existing notes"
 msgstr ""
 

-#: builtin/notes.c:455
+#: builtin/notes.c:454

 #, c-format
 msgid ""
 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
 "existing notes"
 msgstr ""
 
 #, c-format
 msgid ""
 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
 "existing notes"
 msgstr ""
 

-#: builtin/notes.c:460 builtin/notes.c:537
+#: builtin/notes.c:459 builtin/notes.c:536

 #, c-format
 msgid "Overwriting existing notes for object %s\n"
 msgstr ""
 
 #, c-format
 msgid "Overwriting existing notes for object %s\n"
 msgstr ""
 

-#: builtin/notes.c:490
+#: builtin/notes.c:489

 msgid "read objects from stdin"
 msgstr ""
 
 msgid "read objects from stdin"
 msgstr ""
 

-#: builtin/notes.c:492
+#: builtin/notes.c:491

 msgid "load rewriting config for <command> (implies --stdin)"
 msgstr ""
 
 msgid "load rewriting config for <command> (implies --stdin)"
 msgstr ""
 

-#: builtin/notes.c:510
+#: builtin/notes.c:509

 msgid "too few parameters"
 msgstr ""
 
 msgid "too few parameters"
 msgstr ""
 

-#: builtin/notes.c:531
+#: builtin/notes.c:530

 #, c-format
 msgid ""
 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
 "existing notes"
 msgstr ""
 
 #, c-format
 msgid ""
 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
 "existing notes"
 msgstr ""
 

-#: builtin/notes.c:543
+#: builtin/notes.c:542

 #, c-format
 msgid "Missing notes on source object %s. Cannot copy."
 msgstr ""
 
 #, c-format
 msgid "Missing notes on source object %s. Cannot copy."
 msgstr ""
 

-#: builtin/notes.c:592
+#: builtin/notes.c:591

 #, c-format
 msgid ""
 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
 "Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
 "Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
 msgstr ""
 

-#: builtin/notes.c:739
+#: builtin/notes.c:738

 msgid "General options"
 msgstr ""
 
 msgid "General options"
 msgstr ""
 

-#: builtin/notes.c:741
+#: builtin/notes.c:740

 msgid "Merge options"
 msgstr ""
 
 msgid "Merge options"
 msgstr ""
 

-#: builtin/notes.c:743
+#: builtin/notes.c:742

 msgid ""
 "resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
 "cat_sort_uniq)"
 msgstr ""
 
 msgid ""
 "resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
 "cat_sort_uniq)"
 msgstr ""
 

-#: builtin/notes.c:745
+#: builtin/notes.c:744

 msgid "Committing unmerged notes"
 msgstr ""
 
 msgid "Committing unmerged notes"
 msgstr ""
 

-#: builtin/notes.c:747
+#: builtin/notes.c:746

 msgid "finalize notes merge by committing unmerged notes"
 msgstr ""
 
 msgid "finalize notes merge by committing unmerged notes"
 msgstr ""
 

-#: builtin/notes.c:749
+#: builtin/notes.c:748

 msgid "Aborting notes merge resolution"
 msgstr ""
 
 msgid "Aborting notes merge resolution"
 msgstr ""
 

-#: builtin/notes.c:751
+#: builtin/notes.c:750

 msgid "abort notes merge"
 msgstr ""
 
 msgid "abort notes merge"
 msgstr ""
 

-#: builtin/notes.c:846
+#: builtin/notes.c:845

 #, c-format
 msgid "Object %s has no note\n"
 msgstr ""
 
 #, c-format
 msgid "Object %s has no note\n"
 msgstr ""
 

-#: builtin/notes.c:858
+#: builtin/notes.c:857

 msgid "attempt to remove non-existent note is not an error"
 msgstr ""
 
 msgid "attempt to remove non-existent note is not an error"
 msgstr ""
 

-#: builtin/notes.c:861
+#: builtin/notes.c:860

 msgid "read object names from the standard input"
 msgstr ""
 
 msgid "read object names from the standard input"
 msgstr ""
 

-#: builtin/notes.c:942
+#: builtin/notes.c:941

 msgid "notes-ref"
 msgstr ""
 
 msgid "notes-ref"
 msgstr ""
 

-#: builtin/notes.c:943
+#: builtin/notes.c:942

 msgid "use notes from <notes_ref>"
 msgstr ""
 
 msgid "use notes from <notes_ref>"
 msgstr ""
 

-#: builtin/notes.c:978 builtin/remote.c:1616
+#: builtin/notes.c:977 builtin/remote.c:1624

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

-#: builtin/pack-objects.c:25
+#: builtin/pack-objects.c:28

 msgid "git pack-objects --stdout [options...] [< ref-list | < object-list]"
 msgstr ""
 
 msgid "git pack-objects --stdout [options...] [< ref-list | < object-list]"
 msgstr ""
 

-#: builtin/pack-objects.c:26
+#: builtin/pack-objects.c:29

 msgid "git pack-objects [options...] base-name [< ref-list | < object-list]"
 msgstr ""
 
 msgid "git pack-objects [options...] base-name [< ref-list | < object-list]"
 msgstr ""
 

-#: builtin/pack-objects.c:175 builtin/pack-objects.c:178
+#: builtin/pack-objects.c:177 builtin/pack-objects.c:180

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

-#: builtin/pack-objects.c:771
+#: builtin/pack-objects.c:773

 msgid "Writing objects"
 msgstr ""
 
 msgid "Writing objects"
 msgstr ""
 

-#: builtin/pack-objects.c:1012
+#: builtin/pack-objects.c:1015

 msgid "disabling bitmap writing, as some objects are not being packed"
 msgstr ""
 
 msgid "disabling bitmap writing, as some objects are not being packed"
 msgstr ""
 

-#: builtin/pack-objects.c:2174
+#: builtin/pack-objects.c:2175

 msgid "Compressing objects"
 msgstr ""
 
 msgid "Compressing objects"
 msgstr ""
 

-#: builtin/pack-objects.c:2526
+#: builtin/pack-objects.c:2572

 #, c-format
 msgid "unsupported index version %s"
 msgstr ""
 
 #, c-format
 msgid "unsupported index version %s"
 msgstr ""
 

-#: builtin/pack-objects.c:2530
+#: builtin/pack-objects.c:2576

 #, c-format
 msgid "bad index version '%s'"
 msgstr ""
 
 #, c-format
 msgid "bad index version '%s'"
 msgstr ""
 

-#: builtin/pack-objects.c:2553
+#: builtin/pack-objects.c:2599

 #, 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:2557
+#: builtin/pack-objects.c:2603

 #, 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:2576
+#: builtin/pack-objects.c:2622

 msgid "do not show progress meter"
 msgstr ""
 
 msgid "do not show progress meter"
 msgstr ""
 

-#: builtin/pack-objects.c:2578
+#: builtin/pack-objects.c:2624

 msgid "show progress meter"
 msgstr ""
 
 msgid "show progress meter"
 msgstr ""
 

-#: builtin/pack-objects.c:2580
+#: builtin/pack-objects.c:2626

 msgid "show progress meter during object writing phase"
 msgstr ""
 
 msgid "show progress meter during object writing phase"
 msgstr ""
 

-#: builtin/pack-objects.c:2583
+#: builtin/pack-objects.c:2629

 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:2584
+#: builtin/pack-objects.c:2630

 msgid "version[,offset]"
 msgstr ""
 
 msgid "version[,offset]"
 msgstr ""
 

-#: builtin/pack-objects.c:2585
+#: builtin/pack-objects.c:2631

 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:2588
+#: builtin/pack-objects.c:2634

 msgid "maximum size of each output pack file"
 msgstr ""
 
 msgid "maximum size of each output pack file"
 msgstr ""
 

-#: builtin/pack-objects.c:2590
+#: builtin/pack-objects.c:2636

 msgid "ignore borrowed objects from alternate object store"
 msgstr ""
 
 msgid "ignore borrowed objects from alternate object store"
 msgstr ""
 

-#: builtin/pack-objects.c:2592
+#: builtin/pack-objects.c:2638

 msgid "ignore packed objects"
 msgstr ""
 
 msgid "ignore packed objects"
 msgstr ""
 

-#: builtin/pack-objects.c:2594
+#: builtin/pack-objects.c:2640

 msgid "limit pack window by objects"
 msgstr ""
 
 msgid "limit pack window by objects"
 msgstr ""
 

-#: builtin/pack-objects.c:2596
+#: builtin/pack-objects.c:2642

 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:2598
+#: builtin/pack-objects.c:2644

 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:2600
+#: builtin/pack-objects.c:2646

 msgid "reuse existing deltas"
 msgstr ""
 
 msgid "reuse existing deltas"
 msgstr ""
 

-#: builtin/pack-objects.c:2602
+#: builtin/pack-objects.c:2648

 msgid "reuse existing objects"
 msgstr ""
 
 msgid "reuse existing objects"
 msgstr ""
 

-#: builtin/pack-objects.c:2604
+#: builtin/pack-objects.c:2650

 msgid "use OFS_DELTA objects"
 msgstr ""
 
 msgid "use OFS_DELTA objects"
 msgstr ""
 

-#: builtin/pack-objects.c:2606
+#: builtin/pack-objects.c:2652

 msgid "use threads when searching for best delta matches"
 msgstr ""
 
 msgid "use threads when searching for best delta matches"
 msgstr ""
 

-#: builtin/pack-objects.c:2608
+#: builtin/pack-objects.c:2654

 msgid "do not create an empty pack output"
 msgstr ""
 
 msgid "do not create an empty pack output"
 msgstr ""
 

-#: builtin/pack-objects.c:2610
+#: builtin/pack-objects.c:2656

 msgid "read revision arguments from standard input"
 msgstr ""
 
 msgid "read revision arguments from standard input"
 msgstr ""
 

-#: builtin/pack-objects.c:2612
+#: builtin/pack-objects.c:2658

 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:2615
+#: builtin/pack-objects.c:2661

 msgid "include objects reachable from any reference"
 msgstr ""
 
 msgid "include objects reachable from any reference"
 msgstr ""
 

-#: builtin/pack-objects.c:2618
+#: builtin/pack-objects.c:2664

 msgid "include objects referred by reflog entries"
 msgstr ""
 
 msgid "include objects referred by reflog entries"
 msgstr ""
 

-#: builtin/pack-objects.c:2621
+#: builtin/pack-objects.c:2667
+msgid "include objects referred to by the index"
+msgstr ""
+
+#: builtin/pack-objects.c:2670

 msgid "output pack to stdout"
 msgstr ""
 
 msgid "output pack to stdout"
 msgstr ""
 

-#: builtin/pack-objects.c:2623
+#: builtin/pack-objects.c:2672

 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:2625
+#: builtin/pack-objects.c:2674

 msgid "keep unreachable objects"
 msgstr ""
 
 msgid "keep unreachable objects"
 msgstr ""
 

-#: builtin/pack-objects.c:2626 parse-options.h:140
+#: builtin/pack-objects.c:2675 parse-options.h:140

 msgid "time"
 msgstr ""
 
 msgid "time"
 msgstr ""
 

-#: builtin/pack-objects.c:2627
+#: builtin/pack-objects.c:2676

 msgid "unpack unreachable objects newer than <time>"
 msgstr ""
 
 msgid "unpack unreachable objects newer than <time>"
 msgstr ""
 

-#: builtin/pack-objects.c:2630
+#: builtin/pack-objects.c:2679

 msgid "create thin packs"
 msgstr ""
 
 msgid "create thin packs"
 msgstr ""
 

-#: builtin/pack-objects.c:2632
+#: builtin/pack-objects.c:2681

 msgid "ignore packs that have companion .keep file"
 msgstr ""
 
 msgid "ignore packs that have companion .keep file"
 msgstr ""
 

-#: builtin/pack-objects.c:2634
+#: builtin/pack-objects.c:2683

 msgid "pack compression level"
 msgstr ""
 
 msgid "pack compression level"
 msgstr ""
 

-#: builtin/pack-objects.c:2636
+#: builtin/pack-objects.c:2685

 msgid "do not hide commits by grafts"
 msgstr ""
 
 msgid "do not hide commits by grafts"
 msgstr ""
 

-#: builtin/pack-objects.c:2638
+#: builtin/pack-objects.c:2687

 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:2640
+#: builtin/pack-objects.c:2689

 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:2719
+#: builtin/pack-objects.c:2778

 msgid "Counting objects"
 msgstr ""
 
 msgid "Counting objects"
 msgstr ""
 


@@ -7454,7 +7642,7 @@ msgstr ""
 msgid "git prune-packed [-n|--dry-run] [-q|--quiet]"
 msgstr ""
 
 msgid "git prune-packed [-n|--dry-run] [-q|--quiet]"
 msgstr ""
 

-#: builtin/prune-packed.c:49
+#: builtin/prune-packed.c:40

 msgid "Removing duplicate objects"
 msgstr ""
 
 msgid "Removing duplicate objects"
 msgstr ""
 


@@ -7462,15 +7650,15 @@ msgstr ""
 msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
 msgstr ""
 
 msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
 msgstr ""
 

-#: builtin/prune.c:142
+#: builtin/prune.c:106

 msgid "do not remove, show only"
 msgstr ""
 
 msgid "do not remove, show only"
 msgstr ""
 

-#: builtin/prune.c:143
+#: builtin/prune.c:107

 msgid "report pruned objects"
 msgstr ""
 
 msgid "report pruned objects"
 msgstr ""
 

-#: builtin/prune.c:146
+#: builtin/prune.c:110

 msgid "expire objects older than <time>"
 msgstr ""
 
 msgid "expire objects older than <time>"
 msgstr ""
 


@@ -7653,146 +7841,150 @@ msgstr ""
 msgid "--all and --mirror are incompatible"
 msgstr ""
 
 msgid "--all and --mirror are incompatible"
 msgstr ""
 

-#: builtin/push.c:482
+#: builtin/push.c:493

 msgid "repository"
 msgstr ""
 
 msgid "repository"
 msgstr ""
 

-#: builtin/push.c:483
+#: builtin/push.c:494

 msgid "push all refs"
 msgstr ""
 
 msgid "push all refs"
 msgstr ""
 

-#: builtin/push.c:484
+#: builtin/push.c:495

 msgid "mirror all refs"
 msgstr ""
 
 msgid "mirror all refs"
 msgstr ""
 

-#: builtin/push.c:486
+#: builtin/push.c:497

 msgid "delete refs"
 msgstr ""
 
 msgid "delete refs"
 msgstr ""
 

-#: builtin/push.c:487
+#: builtin/push.c:498

 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:490
+#: builtin/push.c:501

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

-#: builtin/push.c:492
+#: builtin/push.c:503

 msgid "refname>:<expect"
 msgstr ""
 
 msgid "refname>:<expect"
 msgstr ""
 

-#: builtin/push.c:493
+#: builtin/push.c:504

 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:495
+#: builtin/push.c:506

 msgid "check"
 msgstr ""
 
 msgid "check"
 msgstr ""
 

-#: builtin/push.c:496
+#: builtin/push.c:507

 msgid "control recursive pushing of submodules"
 msgstr ""
 
 msgid "control recursive pushing of submodules"
 msgstr ""
 

-#: builtin/push.c:498
+#: builtin/push.c:509

 msgid "use thin pack"
 msgstr ""
 
 msgid "use thin pack"
 msgstr ""
 

-#: builtin/push.c:499 builtin/push.c:500
+#: builtin/push.c:510 builtin/push.c:511

 msgid "receive pack program"
 msgstr ""
 
 msgid "receive pack program"
 msgstr ""
 

-#: builtin/push.c:501
+#: builtin/push.c:512

 msgid "set upstream for git pull/status"
 msgstr ""
 
 msgid "set upstream for git pull/status"
 msgstr ""
 

-#: builtin/push.c:504
+#: builtin/push.c:515

 msgid "prune locally removed refs"
 msgstr ""
 
 msgid "prune locally removed refs"
 msgstr ""
 

-#: builtin/push.c:506
+#: builtin/push.c:517

 msgid "bypass pre-push hook"
 msgstr ""
 
 msgid "bypass pre-push hook"
 msgstr ""
 

-#: builtin/push.c:507
+#: builtin/push.c:518

 msgid "push missing but relevant tags"
 msgstr ""
 
 msgid "push missing but relevant tags"
 msgstr ""
 

-#: builtin/push.c:517
+#: builtin/push.c:520
+msgid "GPG sign the push"
+msgstr ""
+
+#: builtin/push.c:529

 msgid "--delete is incompatible with --all, --mirror and --tags"
 msgstr ""
 
 msgid "--delete is incompatible with --all, --mirror and --tags"
 msgstr ""
 

-#: builtin/push.c:519
+#: builtin/push.c:531

 msgid "--delete doesn't make sense without any refs"
 msgstr ""
 
 msgid "--delete doesn't make sense without any refs"
 msgstr ""
 

-#: builtin/read-tree.c:36
+#: builtin/read-tree.c:37

 msgid ""
 "git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] "
 "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
 "index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
 msgstr ""
 
 msgid ""
 "git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] "
 "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
 "index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
 msgstr ""
 

-#: builtin/read-tree.c:109
+#: builtin/read-tree.c:110

 msgid "write resulting index to <file>"
 msgstr ""
 
 msgid "write resulting index to <file>"
 msgstr ""
 

-#: builtin/read-tree.c:112
+#: builtin/read-tree.c:113

 msgid "only empty the index"
 msgstr ""
 
 msgid "only empty the index"
 msgstr ""
 

-#: builtin/read-tree.c:114
+#: builtin/read-tree.c:115

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

-#: builtin/read-tree.c:116
+#: builtin/read-tree.c:117

 msgid "perform a merge in addition to a read"
 msgstr ""
 
 msgid "perform a merge in addition to a read"
 msgstr ""
 

-#: builtin/read-tree.c:118
+#: builtin/read-tree.c:119

 msgid "3-way merge if no file level merging required"
 msgstr ""
 
 msgid "3-way merge if no file level merging required"
 msgstr ""
 

-#: builtin/read-tree.c:120
+#: builtin/read-tree.c:121

 msgid "3-way merge in presence of adds and removes"
 msgstr ""
 
 msgid "3-way merge in presence of adds and removes"
 msgstr ""
 

-#: builtin/read-tree.c:122
+#: builtin/read-tree.c:123

 msgid "same as -m, but discard unmerged entries"
 msgstr ""
 
 msgid "same as -m, but discard unmerged entries"
 msgstr ""
 

-#: builtin/read-tree.c:123
+#: builtin/read-tree.c:124

 msgid "<subdirectory>/"
 msgstr ""
 
 msgid "<subdirectory>/"
 msgstr ""
 

-#: builtin/read-tree.c:124
+#: builtin/read-tree.c:125

 msgid "read the tree into the index under <subdirectory>/"
 msgstr ""
 
 msgid "read the tree into the index under <subdirectory>/"
 msgstr ""
 

-#: builtin/read-tree.c:127
+#: builtin/read-tree.c:128

 msgid "update working tree with merge result"
 msgstr ""
 
 msgid "update working tree with merge result"
 msgstr ""
 

-#: builtin/read-tree.c:129
+#: builtin/read-tree.c:130

 msgid "gitignore"
 msgstr ""
 
 msgid "gitignore"
 msgstr ""
 

-#: builtin/read-tree.c:130
+#: builtin/read-tree.c:131

 msgid "allow explicitly ignored files to be overwritten"
 msgstr ""
 
 msgid "allow explicitly ignored files to be overwritten"
 msgstr ""
 

-#: builtin/read-tree.c:133
+#: builtin/read-tree.c:134

 msgid "don't check the working tree after merging"
 msgstr ""
 
 msgid "don't check the working tree after merging"
 msgstr ""
 

-#: builtin/read-tree.c:134
+#: builtin/read-tree.c:135

 msgid "don't update the index or the work tree"
 msgstr ""
 
 msgid "don't update the index or the work tree"
 msgstr ""
 

-#: builtin/read-tree.c:136
+#: builtin/read-tree.c:137

 msgid "skip applying sparse checkout filter"
 msgstr ""
 
 msgid "skip applying sparse checkout filter"
 msgstr ""
 

-#: builtin/read-tree.c:138
+#: builtin/read-tree.c:139

 msgid "debug unpack-trees"
 msgstr ""
 
 msgid "debug unpack-trees"
 msgstr ""
 


@@ -7937,12 +8129,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:640
+#: builtin/remote.c:185 builtin/remote.c:641

 #, c-format
 msgid "remote %s already exists."
 msgstr ""
 
 #, c-format
 msgid "remote %s already exists."
 msgstr ""
 

-#: builtin/remote.c:189 builtin/remote.c:644
+#: builtin/remote.c:189 builtin/remote.c:645

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


@@ -7952,11 +8144,6 @@ msgstr ""
 msgid "Could not setup master '%s'"
 msgstr ""
 
 msgid "Could not setup master '%s'"
 msgstr ""
 

-#: builtin/remote.c:288
-#, c-format
-msgid "more than one %s"
-msgstr ""
-

 #: builtin/remote.c:333
 #, c-format
 msgid "Could not get fetch map for refspec %s"
 #: builtin/remote.c:333
 #, c-format
 msgid "Could not get fetch map for refspec %s"


@@ -7970,27 +8157,27 @@ msgstr ""
 msgid "(delete)"
 msgstr ""
 
 msgid "(delete)"
 msgstr ""
 

-#: builtin/remote.c:589 builtin/remote.c:595 builtin/remote.c:601
+#: builtin/remote.c:590 builtin/remote.c:596 builtin/remote.c:602

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

-#: builtin/remote.c:633 builtin/remote.c:794 builtin/remote.c:894
+#: builtin/remote.c:634 builtin/remote.c:798 builtin/remote.c:898

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

-#: builtin/remote.c:650
+#: builtin/remote.c:651

 #, 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:656 builtin/remote.c:846
+#: builtin/remote.c:657 builtin/remote.c:850

 #, c-format
 msgid "Could not remove config section '%s'"
 msgstr ""
 
 #, c-format
 msgid "Could not remove config section '%s'"
 msgstr ""
 

-#: builtin/remote.c:671
+#: builtin/remote.c:672

 #, c-format
 msgid ""
 "Not updating non-default fetch refspec\n"
 #, c-format
 msgid ""
 "Not updating non-default fetch refspec\n"


@@ -7998,32 +8185,32 @@ msgid ""
 "\tPlease update the configuration manually if necessary."
 msgstr ""
 
 "\tPlease update the configuration manually if necessary."
 msgstr ""
 

-#: builtin/remote.c:677
+#: builtin/remote.c:678

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

-#: builtin/remote.c:688
+#: builtin/remote.c:689

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

-#: builtin/remote.c:710
+#: builtin/remote.c:711

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

-#: builtin/remote.c:744
+#: builtin/remote.c:745

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

-#: builtin/remote.c:765
+#: builtin/remote.c:769

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

-#: builtin/remote.c:832
+#: builtin/remote.c:836

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


@@ -8033,262 +8220,262 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
 msgstr[0] ""
 msgstr[1] ""
 

-#: builtin/remote.c:947
+#: builtin/remote.c:951

 #, 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:950
+#: builtin/remote.c:954

 msgid " tracked"
 msgstr ""
 
 msgid " tracked"
 msgstr ""
 

-#: builtin/remote.c:952
+#: builtin/remote.c:956

 msgid " stale (use 'git remote prune' to remove)"
 msgstr ""
 
 msgid " stale (use 'git remote prune' to remove)"
 msgstr ""
 

-#: builtin/remote.c:954
+#: builtin/remote.c:958

 msgid " ???"
 msgstr ""
 
 msgid " ???"
 msgstr ""
 

-#: builtin/remote.c:995
+#: builtin/remote.c:999

 #, 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:1002
+#: builtin/remote.c:1006

 #, c-format
 msgid "rebases onto remote %s"
 msgstr ""
 
 #, c-format
 msgid "rebases onto remote %s"
 msgstr ""
 

-#: builtin/remote.c:1005
+#: builtin/remote.c:1009

 #, c-format
 msgid " merges with remote %s"
 msgstr ""
 
 #, c-format
 msgid " merges with remote %s"
 msgstr ""
 

-#: builtin/remote.c:1006
+#: builtin/remote.c:1010

 msgid "    and with remote"
 msgstr ""
 
 msgid "    and with remote"
 msgstr ""
 

-#: builtin/remote.c:1008
+#: builtin/remote.c:1012

 #, c-format
 msgid "merges with remote %s"
 msgstr ""
 
 #, c-format
 msgid "merges with remote %s"
 msgstr ""
 

-#: builtin/remote.c:1009
+#: builtin/remote.c:1013

 msgid "   and with remote"
 msgstr ""
 
 msgid "   and with remote"
 msgstr ""
 

-#: builtin/remote.c:1055
+#: builtin/remote.c:1059

 msgid "create"
 msgstr ""
 
 msgid "create"
 msgstr ""
 

-#: builtin/remote.c:1058
+#: builtin/remote.c:1062

 msgid "delete"
 msgstr ""
 
 msgid "delete"
 msgstr ""
 

-#: builtin/remote.c:1062
+#: builtin/remote.c:1066

 msgid "up to date"
 msgstr ""
 
 msgid "up to date"
 msgstr ""
 

-#: builtin/remote.c:1065
+#: builtin/remote.c:1069

 msgid "fast-forwardable"
 msgstr ""
 
 msgid "fast-forwardable"
 msgstr ""
 

-#: builtin/remote.c:1068
+#: builtin/remote.c:1072

 msgid "local out of date"
 msgstr ""
 
 msgid "local out of date"
 msgstr ""
 

-#: builtin/remote.c:1075
+#: builtin/remote.c:1079

 #, c-format
 msgid "    %-*s forces to %-*s (%s)"
 msgstr ""
 
 #, c-format
 msgid "    %-*s forces to %-*s (%s)"
 msgstr ""
 

-#: builtin/remote.c:1078
+#: builtin/remote.c:1082

 #, c-format
 msgid "    %-*s pushes to %-*s (%s)"
 msgstr ""
 
 #, c-format
 msgid "    %-*s pushes to %-*s (%s)"
 msgstr ""
 

-#: builtin/remote.c:1082
+#: builtin/remote.c:1086

 #, c-format
 msgid "    %-*s forces to %s"
 msgstr ""
 
 #, c-format
 msgid "    %-*s forces to %s"
 msgstr ""
 

-#: builtin/remote.c:1085
+#: builtin/remote.c:1089

 #, c-format
 msgid "    %-*s pushes to %s"
 msgstr ""
 
 #, c-format
 msgid "    %-*s pushes to %s"
 msgstr ""
 

-#: builtin/remote.c:1153
+#: builtin/remote.c:1157

 msgid "do not query remotes"
 msgstr ""
 
 msgid "do not query remotes"
 msgstr ""
 

-#: builtin/remote.c:1180
+#: builtin/remote.c:1184

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

-#: builtin/remote.c:1181
+#: builtin/remote.c:1185

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

-#: builtin/remote.c:1182 builtin/remote.c:1329
+#: builtin/remote.c:1186 builtin/remote.c:1333

 msgid "(no URL)"
 msgstr ""
 
 msgid "(no URL)"
 msgstr ""
 

-#: builtin/remote.c:1191 builtin/remote.c:1193
+#: builtin/remote.c:1195 builtin/remote.c:1197

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

-#: builtin/remote.c:1195 builtin/remote.c:1197 builtin/remote.c:1199
+#: builtin/remote.c:1199 builtin/remote.c:1201 builtin/remote.c:1203

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

-#: builtin/remote.c:1201
+#: builtin/remote.c:1205

 #, 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:1213
+#: builtin/remote.c:1217

 #, 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:1216 builtin/remote.c:1243
+#: builtin/remote.c:1220 builtin/remote.c:1247

 msgid " (status not queried)"
 msgstr ""
 
 msgid " (status not queried)"
 msgstr ""
 

-#: builtin/remote.c:1225
+#: builtin/remote.c:1229

 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:1233
+#: builtin/remote.c:1237

 msgid "  Local refs will be mirrored by 'git push'"
 msgstr ""
 
 msgid "  Local refs will be mirrored by 'git push'"
 msgstr ""
 

-#: builtin/remote.c:1240
+#: builtin/remote.c:1244

 #, 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:1261
+#: builtin/remote.c:1265

 msgid "set refs/remotes/<name>/HEAD according to remote"
 msgstr ""
 
 msgid "set refs/remotes/<name>/HEAD according to remote"
 msgstr ""
 

-#: builtin/remote.c:1263
+#: builtin/remote.c:1267

 msgid "delete refs/remotes/<name>/HEAD"
 msgstr ""
 
 msgid "delete refs/remotes/<name>/HEAD"
 msgstr ""
 

-#: builtin/remote.c:1278
+#: builtin/remote.c:1282

 msgid "Cannot determine remote HEAD"
 msgstr ""
 
 msgid "Cannot determine remote HEAD"
 msgstr ""
 

-#: builtin/remote.c:1280
+#: builtin/remote.c:1284

 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:1290
+#: builtin/remote.c:1294

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

-#: builtin/remote.c:1298
+#: builtin/remote.c:1302

 #, c-format
 msgid "Not a valid ref: %s"
 msgstr ""
 
 #, c-format
 msgid "Not a valid ref: %s"
 msgstr ""
 

-#: builtin/remote.c:1300
+#: builtin/remote.c:1304

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

-#: builtin/remote.c:1318
+#: builtin/remote.c:1322

 #, c-format
 msgid " %s will become dangling!"
 msgstr ""
 
 #, c-format
 msgid " %s will become dangling!"
 msgstr ""
 

-#: builtin/remote.c:1319
+#: builtin/remote.c:1323

 #, c-format
 msgid " %s has become dangling!"
 msgstr ""
 
 #, c-format
 msgid " %s has become dangling!"
 msgstr ""
 

-#: builtin/remote.c:1325
+#: builtin/remote.c:1329

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

-#: builtin/remote.c:1326
+#: builtin/remote.c:1330

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

-#: builtin/remote.c:1349
+#: builtin/remote.c:1357

 #, c-format
 msgid " * [would prune] %s"
 msgstr ""
 
 #, c-format
 msgid " * [would prune] %s"
 msgstr ""
 

-#: builtin/remote.c:1352
+#: builtin/remote.c:1360

 #, c-format
 msgid " * [pruned] %s"
 msgstr ""
 
 #, c-format
 msgid " * [pruned] %s"
 msgstr ""
 

-#: builtin/remote.c:1397
+#: builtin/remote.c:1405

 msgid "prune remotes after fetching"
 msgstr ""
 
 msgid "prune remotes after fetching"
 msgstr ""
 

-#: builtin/remote.c:1463 builtin/remote.c:1537
+#: builtin/remote.c:1471 builtin/remote.c:1545

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

-#: builtin/remote.c:1483
+#: builtin/remote.c:1491

 msgid "add branch"
 msgstr ""
 
 msgid "add branch"
 msgstr ""
 

-#: builtin/remote.c:1490
+#: builtin/remote.c:1498

 msgid "no remote specified"
 msgstr ""
 
 msgid "no remote specified"
 msgstr ""
 

-#: builtin/remote.c:1512
+#: builtin/remote.c:1520

 msgid "manipulate push URLs"
 msgstr ""
 
 msgid "manipulate push URLs"
 msgstr ""
 

-#: builtin/remote.c:1514
+#: builtin/remote.c:1522

 msgid "add URL"
 msgstr ""
 
 msgid "add URL"
 msgstr ""
 

-#: builtin/remote.c:1516
+#: builtin/remote.c:1524

 msgid "delete URLs"
 msgstr ""
 
 msgid "delete URLs"
 msgstr ""
 

-#: builtin/remote.c:1523
+#: builtin/remote.c:1531

 msgid "--add --delete doesn't make sense"
 msgstr ""
 
 msgid "--add --delete doesn't make sense"
 msgstr ""
 

-#: builtin/remote.c:1563
+#: builtin/remote.c:1571

 #, c-format
 msgid "Invalid old URL pattern: %s"
 msgstr ""
 
 #, c-format
 msgid "Invalid old URL pattern: %s"
 msgstr ""
 

-#: builtin/remote.c:1571
+#: builtin/remote.c:1579

 #, c-format
 msgid "No such URL found: %s"
 msgstr ""
 
 #, c-format
 msgid "No such URL found: %s"
 msgstr ""
 

-#: builtin/remote.c:1573
+#: builtin/remote.c:1581

 msgid "Will not delete all non-push URLs"
 msgstr ""
 
 msgid "Will not delete all non-push URLs"
 msgstr ""
 

-#: builtin/remote.c:1587
+#: builtin/remote.c:1595

 msgid "be verbose; must be placed before a subcommand"
 msgstr ""
 
 msgid "be verbose; must be placed before a subcommand"
 msgstr ""
 


@@ -8385,67 +8572,67 @@ msgstr ""
 msgid "git replace [--format=<format>] [-l [<pattern>]]"
 msgstr ""
 
 msgid "git replace [--format=<format>] [-l [<pattern>]]"
 msgstr ""
 

-#: builtin/replace.c:322 builtin/replace.c:360 builtin/replace.c:388
+#: builtin/replace.c:325 builtin/replace.c:363 builtin/replace.c:391

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

-#: builtin/replace.c:352
+#: builtin/replace.c:355

 #, c-format
 msgid "bad mergetag in commit '%s'"
 msgstr ""
 
 #, c-format
 msgid "bad mergetag in commit '%s'"
 msgstr ""
 

-#: builtin/replace.c:354
+#: builtin/replace.c:357

 #, c-format
 msgid "malformed mergetag in commit '%s'"
 msgstr ""
 
 #, c-format
 msgid "malformed mergetag in commit '%s'"
 msgstr ""
 

-#: builtin/replace.c:365
+#: builtin/replace.c:368

 #, c-format
 msgid ""
 "original commit '%s' contains mergetag '%s' that is discarded; use --edit "
 "instead of --graft"
 msgstr ""
 
 #, c-format
 msgid ""
 "original commit '%s' contains mergetag '%s' that is discarded; use --edit "
 "instead of --graft"
 msgstr ""
 

-#: builtin/replace.c:398
+#: builtin/replace.c:401

 #, c-format
 msgid "the original commit '%s' has a gpg signature."
 msgstr ""
 
 #, c-format
 msgid "the original commit '%s' has a gpg signature."
 msgstr ""
 

-#: builtin/replace.c:399
+#: builtin/replace.c:402

 msgid "the signature will be removed in the replacement commit!"
 msgstr ""
 
 msgid "the signature will be removed in the replacement commit!"
 msgstr ""
 

-#: builtin/replace.c:405
+#: builtin/replace.c:408

 #, c-format
 msgid "could not write replacement commit for: '%s'"
 msgstr ""
 
 #, c-format
 msgid "could not write replacement commit for: '%s'"
 msgstr ""
 

-#: builtin/replace.c:429
+#: builtin/replace.c:432

 msgid "list replace refs"
 msgstr ""
 
 msgid "list replace refs"
 msgstr ""
 

-#: builtin/replace.c:430
+#: builtin/replace.c:433

 msgid "delete replace refs"
 msgstr ""
 
 msgid "delete replace refs"
 msgstr ""
 

-#: builtin/replace.c:431
+#: builtin/replace.c:434

 msgid "edit existing object"
 msgstr ""
 
 msgid "edit existing object"
 msgstr ""
 

-#: builtin/replace.c:432
+#: builtin/replace.c:435

 msgid "change a commit's parents"
 msgstr ""
 
 msgid "change a commit's parents"
 msgstr ""
 

-#: builtin/replace.c:433
+#: builtin/replace.c:436

 msgid "replace the ref if it exists"
 msgstr ""
 
 msgid "replace the ref if it exists"
 msgstr ""
 

-#: builtin/replace.c:434
+#: builtin/replace.c:437

 msgid "do not pretty-print contents for --edit"
 msgstr ""
 
 msgid "do not pretty-print contents for --edit"
 msgstr ""
 

-#: builtin/replace.c:435
+#: builtin/replace.c:438

 msgid "use this format"
 msgstr ""
 
 msgid "use this format"
 msgstr ""
 


@@ -8457,153 +8644,153 @@ msgstr ""
 msgid "register clean resolutions in index"
 msgstr ""
 
 msgid "register clean resolutions in index"
 msgstr ""
 

-#: builtin/reset.c:25
+#: builtin/reset.c:26

 msgid ""
 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
 msgstr ""
 
 msgid ""
 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
 msgstr ""
 

-#: builtin/reset.c:26
+#: builtin/reset.c:27

 msgid "git reset [-q] <tree-ish> [--] <paths>..."
 msgstr ""
 
 msgid "git reset [-q] <tree-ish> [--] <paths>..."
 msgstr ""
 

-#: builtin/reset.c:27
+#: builtin/reset.c:28

 msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
 msgstr ""
 
 msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
 msgstr ""
 

-#: builtin/reset.c:33
+#: builtin/reset.c:34

 msgid "mixed"
 msgstr ""
 
 msgid "mixed"
 msgstr ""
 

-#: builtin/reset.c:33
+#: builtin/reset.c:34

 msgid "soft"
 msgstr ""
 
 msgid "soft"
 msgstr ""
 

-#: builtin/reset.c:33
+#: builtin/reset.c:34

 msgid "hard"
 msgstr ""
 
 msgid "hard"
 msgstr ""
 

-#: builtin/reset.c:33
+#: builtin/reset.c:34

 msgid "merge"
 msgstr ""
 
 msgid "merge"
 msgstr ""
 

-#: builtin/reset.c:33
+#: builtin/reset.c:34

 msgid "keep"
 msgstr ""
 
 msgid "keep"
 msgstr ""
 

-#: builtin/reset.c:73
+#: builtin/reset.c:74

 msgid "You do not have a valid HEAD."
 msgstr ""
 
 msgid "You do not have a valid HEAD."
 msgstr ""
 

-#: builtin/reset.c:75
+#: builtin/reset.c:76

 msgid "Failed to find tree of HEAD."
 msgstr ""
 
 msgid "Failed to find tree of HEAD."
 msgstr ""
 

-#: builtin/reset.c:81
+#: builtin/reset.c:82

 #, c-format
 msgid "Failed to find tree of %s."
 msgstr ""
 
 #, c-format
 msgid "Failed to find tree of %s."
 msgstr ""
 

-#: builtin/reset.c:99
+#: builtin/reset.c:100

 #, c-format
 msgid "HEAD is now at %s"
 msgstr ""
 
 #, c-format
 msgid "HEAD is now at %s"
 msgstr ""
 

-#: builtin/reset.c:182
+#: builtin/reset.c:183

 #, c-format
 msgid "Cannot do a %s reset in the middle of a merge."
 msgstr ""
 
 #, c-format
 msgid "Cannot do a %s reset in the middle of a merge."
 msgstr ""
 

-#: builtin/reset.c:275
+#: builtin/reset.c:276

 msgid "be quiet, only report errors"
 msgstr ""
 
 msgid "be quiet, only report errors"
 msgstr ""
 

-#: builtin/reset.c:277
+#: builtin/reset.c:278

 msgid "reset HEAD and index"
 msgstr ""
 
 msgid "reset HEAD and index"
 msgstr ""
 

-#: builtin/reset.c:278
+#: builtin/reset.c:279

 msgid "reset only HEAD"
 msgstr ""
 
 msgid "reset only HEAD"
 msgstr ""
 

-#: builtin/reset.c:280 builtin/reset.c:282
+#: builtin/reset.c:281 builtin/reset.c:283

 msgid "reset HEAD, index and working tree"
 msgstr ""
 
 msgid "reset HEAD, index and working tree"
 msgstr ""
 

-#: builtin/reset.c:284
+#: builtin/reset.c:285

 msgid "reset HEAD but keep local changes"
 msgstr ""
 
 msgid "reset HEAD but keep local changes"
 msgstr ""
 

-#: builtin/reset.c:287
+#: builtin/reset.c:288

 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:304
+#: builtin/reset.c:305

 #, 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:307 builtin/reset.c:315
+#: builtin/reset.c:308 builtin/reset.c:316

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

-#: builtin/reset.c:312
+#: builtin/reset.c:313

 #, 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:321
+#: builtin/reset.c:322

 msgid "--patch is incompatible with --{hard,mixed,soft}"
 msgstr ""
 
 msgid "--patch is incompatible with --{hard,mixed,soft}"
 msgstr ""
 

-#: builtin/reset.c:330
+#: builtin/reset.c:331

 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:332
+#: builtin/reset.c:333

 #, c-format
 msgid "Cannot do %s reset with paths."
 msgstr ""
 
 #, c-format
 msgid "Cannot do %s reset with paths."
 msgstr ""
 

-#: builtin/reset.c:342
+#: builtin/reset.c:343

 #, 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:346
+#: builtin/reset.c:347

 msgid "-N can only be used with --mixed"
 msgstr ""
 
 msgid "-N can only be used with --mixed"
 msgstr ""
 

-#: builtin/reset.c:363
+#: builtin/reset.c:364

 msgid "Unstaged changes after reset:"
 msgstr ""
 
 msgid "Unstaged changes after reset:"
 msgstr ""
 

-#: builtin/reset.c:369
+#: builtin/reset.c:370

 #, 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:373
+#: builtin/reset.c:374

 msgid "Could not write new index file."
 msgstr ""
 
 msgid "Could not write new index file."
 msgstr ""
 

-#: builtin/rev-parse.c:360
+#: builtin/rev-parse.c:361

 msgid "git rev-parse --parseopt [options] -- [<args>...]"
 msgstr ""
 
 msgid "git rev-parse --parseopt [options] -- [<args>...]"
 msgstr ""
 

-#: builtin/rev-parse.c:365
+#: builtin/rev-parse.c:366

 msgid "keep the `--` passed as an arg"
 msgstr ""
 
 msgid "keep the `--` passed as an arg"
 msgstr ""
 

-#: builtin/rev-parse.c:367
+#: builtin/rev-parse.c:368

 msgid "stop parsing after the first non-option argument"
 msgstr ""
 
 msgid "stop parsing after the first non-option argument"
 msgstr ""
 

-#: builtin/rev-parse.c:370
+#: builtin/rev-parse.c:371

 msgid "output in stuck long form"
 msgstr ""
 
 msgid "output in stuck long form"
 msgstr ""
 

-#: builtin/rev-parse.c:498
+#: builtin/rev-parse.c:499

 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"


@@ -8710,7 +8897,7 @@ msgid ""
 "the following submodule (or one of its nested submodules)\n"
 "uses a .git directory:"
 msgid_plural ""
 "the following submodule (or one of its nested submodules)\n"
 "uses a .git directory:"
 msgid_plural ""

-"the following submodules (or one of its nested submodules)\n"
+"the following submodules (or one of their nested submodules)\n"

 "use a .git directory:"
 msgstr[0] ""
 msgstr[1] ""
 "use a .git directory:"
 msgstr[0] ""
 msgstr[1] ""


@@ -8775,6 +8962,10 @@ msgstr ""
 msgid "exit with a zero status even if nothing matched"
 msgstr ""
 
 msgid "exit with a zero status even if nothing matched"
 msgstr ""
 

+#: builtin/rm.c:318
+msgid "Please, stage your changes to .gitmodules or stash them to proceed"
+msgstr ""
+

 #: builtin/rm.c:336
 #, c-format
 msgid "not removing '%s' recursively without -r"
 #: builtin/rm.c:336
 #, c-format
 msgid "not removing '%s' recursively without -r"


@@ -8952,11 +9143,11 @@ msgstr ""
 msgid "shorten ref output"
 msgstr ""
 
 msgid "shorten ref output"
 msgstr ""
 

-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:349
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362

 msgid "reason"
 msgstr ""
 
 msgid "reason"
 msgstr ""
 

-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:349
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362

 msgid "reason of the update"
 msgstr ""
 
 msgid "reason of the update"
 msgstr ""
 


@@ -9067,236 +9258,226 @@ msgstr ""
 msgid "malformed object name '%s'"
 msgstr ""
 
 msgid "malformed object name '%s'"
 msgstr ""
 

-#: builtin/tag.c:588
+#: builtin/tag.c:589

 msgid "list tag names"
 msgstr ""
 
 msgid "list tag names"
 msgstr ""
 

-#: builtin/tag.c:590
+#: builtin/tag.c:591

 msgid "print <n> lines of each tag message"
 msgstr ""
 
 msgid "print <n> lines of each tag message"
 msgstr ""
 

-#: builtin/tag.c:592
+#: builtin/tag.c:593

 msgid "delete tags"
 msgstr ""
 
 msgid "delete tags"
 msgstr ""
 

-#: builtin/tag.c:593
+#: builtin/tag.c:594

 msgid "verify tags"
 msgstr ""
 
 msgid "verify tags"
 msgstr ""
 

-#: builtin/tag.c:595
+#: builtin/tag.c:596

 msgid "Tag creation options"
 msgstr ""
 
 msgid "Tag creation options"
 msgstr ""
 

-#: builtin/tag.c:597
+#: builtin/tag.c:598

 msgid "annotated tag, needs a message"
 msgstr ""
 
 msgid "annotated tag, needs a message"
 msgstr ""
 

-#: builtin/tag.c:599
+#: builtin/tag.c:600

 msgid "tag message"
 msgstr ""
 
 msgid "tag message"
 msgstr ""
 

-#: builtin/tag.c:601
+#: builtin/tag.c:602

 msgid "annotated and GPG-signed tag"
 msgstr ""
 
 msgid "annotated and GPG-signed tag"
 msgstr ""
 

-#: builtin/tag.c:605
+#: builtin/tag.c:606

 msgid "use another key to sign the tag"
 msgstr ""
 
 msgid "use another key to sign the tag"
 msgstr ""
 

-#: builtin/tag.c:606
+#: builtin/tag.c:607

 msgid "replace the tag if exists"
 msgstr ""
 
 msgid "replace the tag if exists"
 msgstr ""
 

-#: builtin/tag.c:607
+#: builtin/tag.c:608

 msgid "show tag list in columns"
 msgstr ""
 
 msgid "show tag list in columns"
 msgstr ""
 

-#: builtin/tag.c:609
+#: builtin/tag.c:610

 msgid "sort tags"
 msgstr ""
 
 msgid "sort tags"
 msgstr ""
 

-#: builtin/tag.c:613
+#: builtin/tag.c:614

 msgid "Tag listing options"
 msgstr ""
 
 msgid "Tag listing options"
 msgstr ""
 

-#: builtin/tag.c:616 builtin/tag.c:622
+#: builtin/tag.c:617 builtin/tag.c:623

 msgid "print only tags that contain the commit"
 msgstr ""
 
 msgid "print only tags that contain the commit"
 msgstr ""
 

-#: builtin/tag.c:628
+#: builtin/tag.c:629

 msgid "print only tags of the object"
 msgstr ""
 
 msgid "print only tags of the object"
 msgstr ""
 

-#: builtin/tag.c:654
+#: builtin/tag.c:655

 msgid "--column and -n are incompatible"
 msgstr ""
 
 msgid "--column and -n are incompatible"
 msgstr ""
 

-#: builtin/tag.c:666
+#: builtin/tag.c:667

 msgid "--sort and -n are incompatible"
 msgstr ""
 
 msgid "--sort and -n are incompatible"
 msgstr ""
 

-#: builtin/tag.c:673
+#: builtin/tag.c:674

 msgid "-n option is only allowed with -l."
 msgstr ""
 
 msgid "-n option is only allowed with -l."
 msgstr ""
 

-#: builtin/tag.c:675
+#: builtin/tag.c:676

 msgid "--contains option is only allowed with -l."
 msgstr ""
 
 msgid "--contains option is only allowed with -l."
 msgstr ""
 

-#: builtin/tag.c:677
+#: builtin/tag.c:678

 msgid "--points-at option is only allowed with -l."
 msgstr ""
 
 msgid "--points-at option is only allowed with -l."
 msgstr ""
 

-#: builtin/tag.c:685
+#: builtin/tag.c:686

 msgid "only one -F or -m option is allowed."
 msgstr ""
 
 msgid "only one -F or -m option is allowed."
 msgstr ""
 

-#: builtin/tag.c:705
+#: builtin/tag.c:706

 msgid "too many params"
 msgstr ""
 
 msgid "too many params"
 msgstr ""
 

-#: builtin/tag.c:711
+#: builtin/tag.c:712

 #, 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:716
+#: builtin/tag.c:717

 #, c-format
 msgid "tag '%s' already exists"
 msgstr ""
 
 #, c-format
 msgid "tag '%s' already exists"
 msgstr ""
 

-#: builtin/tag.c:734
-#, c-format
-msgid "%s: cannot lock the ref"
-msgstr ""
-
-#: builtin/tag.c:736
-#, c-format
-msgid "%s: cannot update the ref"
-msgstr ""
-
-#: builtin/tag.c:738
+#: builtin/tag.c:741

 #, c-format
 msgid "Updated tag '%s' (was %s)\n"
 msgstr ""
 
 #, c-format
 msgid "Updated tag '%s' (was %s)\n"
 msgstr ""
 

-#: builtin/unpack-objects.c:483
+#: builtin/unpack-objects.c:489

 msgid "Unpacking objects"
 msgstr ""
 
 msgid "Unpacking objects"
 msgstr ""
 

-#: builtin/update-index.c:402
+#: builtin/update-index.c:403

 msgid "git update-index [options] [--] [<file>...]"
 msgstr ""
 
 msgid "git update-index [options] [--] [<file>...]"
 msgstr ""
 

-#: builtin/update-index.c:755
+#: builtin/update-index.c:756

 msgid "continue refresh even when index needs update"
 msgstr ""
 
 msgid "continue refresh even when index needs update"
 msgstr ""
 

-#: builtin/update-index.c:758
+#: builtin/update-index.c:759

 msgid "refresh: ignore submodules"
 msgstr ""
 
 msgid "refresh: ignore submodules"
 msgstr ""
 

-#: builtin/update-index.c:761
+#: builtin/update-index.c:762

 msgid "do not ignore new files"
 msgstr ""
 
 msgid "do not ignore new files"
 msgstr ""
 

-#: builtin/update-index.c:763
+#: builtin/update-index.c:764

 msgid "let files replace directories and vice-versa"
 msgstr ""
 
 msgid "let files replace directories and vice-versa"
 msgstr ""
 

-#: builtin/update-index.c:765
+#: builtin/update-index.c:766

 msgid "notice files missing from worktree"
 msgstr ""
 
 msgid "notice files missing from worktree"
 msgstr ""
 

-#: builtin/update-index.c:767
+#: builtin/update-index.c:768

 msgid "refresh even if index contains unmerged entries"
 msgstr ""
 
 msgid "refresh even if index contains unmerged entries"
 msgstr ""
 

-#: builtin/update-index.c:770
+#: builtin/update-index.c:771

 msgid "refresh stat information"
 msgstr ""
 
 msgid "refresh stat information"
 msgstr ""
 

-#: builtin/update-index.c:774
+#: builtin/update-index.c:775

 msgid "like --refresh, but ignore assume-unchanged setting"
 msgstr ""
 
 msgid "like --refresh, but ignore assume-unchanged setting"
 msgstr ""
 

-#: builtin/update-index.c:778
+#: builtin/update-index.c:779

 msgid "<mode>,<object>,<path>"
 msgstr ""
 
 msgid "<mode>,<object>,<path>"
 msgstr ""
 

-#: builtin/update-index.c:779
+#: builtin/update-index.c:780

 msgid "add the specified entry to the index"
 msgstr ""
 
 msgid "add the specified entry to the index"
 msgstr ""
 

-#: builtin/update-index.c:783
+#: builtin/update-index.c:784

 msgid "(+/-)x"
 msgstr ""
 
 msgid "(+/-)x"
 msgstr ""
 

-#: builtin/update-index.c:784
+#: builtin/update-index.c:785

 msgid "override the executable bit of the listed files"
 msgstr ""
 
 msgid "override the executable bit of the listed files"
 msgstr ""
 

-#: builtin/update-index.c:788
+#: builtin/update-index.c:789

 msgid "mark files as \"not changing\""
 msgstr ""
 
 msgid "mark files as \"not changing\""
 msgstr ""
 

-#: builtin/update-index.c:791
+#: builtin/update-index.c:792

 msgid "clear assumed-unchanged bit"
 msgstr ""
 
 msgid "clear assumed-unchanged bit"
 msgstr ""
 

-#: builtin/update-index.c:794
+#: builtin/update-index.c:795

 msgid "mark files as \"index-only\""
 msgstr ""
 
 msgid "mark files as \"index-only\""
 msgstr ""
 

-#: builtin/update-index.c:797
+#: builtin/update-index.c:798

 msgid "clear skip-worktree bit"
 msgstr ""
 
 msgid "clear skip-worktree bit"
 msgstr ""
 

-#: builtin/update-index.c:800
+#: builtin/update-index.c:801

 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:802
+#: builtin/update-index.c:803

 msgid "remove named paths even if present in worktree"
 msgstr ""
 
 msgid "remove named paths even if present in worktree"
 msgstr ""
 

-#: builtin/update-index.c:804
+#: builtin/update-index.c:805

 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:806
+#: builtin/update-index.c:807

 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:810
+#: builtin/update-index.c:811

 msgid "add entries from standard input to the index"
 msgstr ""
 
 msgid "add entries from standard input to the index"
 msgstr ""
 

-#: builtin/update-index.c:814
+#: builtin/update-index.c:815

 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:818
+#: builtin/update-index.c:819

 msgid "only update entries that differ from HEAD"
 msgstr ""
 
 msgid "only update entries that differ from HEAD"
 msgstr ""
 

-#: builtin/update-index.c:822
+#: builtin/update-index.c:823

 msgid "ignore files missing from worktree"
 msgstr ""
 
 msgid "ignore files missing from worktree"
 msgstr ""
 

-#: builtin/update-index.c:825
+#: builtin/update-index.c:826

 msgid "report actions to standard output"
 msgstr ""
 
 msgid "report actions to standard output"
 msgstr ""
 

-#: builtin/update-index.c:827
+#: builtin/update-index.c:828

 msgid "(for porcelains) forget saved unresolved conflicts"
 msgstr ""
 
 msgid "(for porcelains) forget saved unresolved conflicts"
 msgstr ""
 

-#: builtin/update-index.c:831
+#: builtin/update-index.c:832

 msgid "write index in this format"
 msgstr ""
 
 msgid "write index in this format"
 msgstr ""
 

-#: builtin/update-index.c:833
+#: builtin/update-index.c:834

 msgid "enable or disable split index"
 msgstr ""
 
 msgid "enable or disable split index"
 msgstr ""
 


@@ -9312,19 +9493,19 @@ msgstr ""
 msgid "git update-ref [options] --stdin [-z]"
 msgstr ""
 
 msgid "git update-ref [options] --stdin [-z]"
 msgstr ""
 

-#: builtin/update-ref.c:350
+#: builtin/update-ref.c:363

 msgid "delete the reference"
 msgstr ""
 
 msgid "delete the reference"
 msgstr ""
 

-#: builtin/update-ref.c:352
+#: builtin/update-ref.c:365

 msgid "update <refname> not the one it points to"
 msgstr ""
 
 msgid "update <refname> not the one it points to"
 msgstr ""
 

-#: builtin/update-ref.c:353
+#: builtin/update-ref.c:366

 msgid "stdin has NUL-terminated arguments"
 msgstr ""
 
 msgid "stdin has NUL-terminated arguments"
 msgstr ""
 

-#: builtin/update-ref.c:354
+#: builtin/update-ref.c:367

 msgid "read updates from stdin"
 msgstr ""
 
 msgid "read updates from stdin"
 msgstr ""
 


@@ -9344,15 +9525,15 @@ msgstr ""
 msgid "print commit contents"
 msgstr ""
 
 msgid "print commit contents"
 msgstr ""
 

-#: builtin/verify-pack.c:55
+#: builtin/verify-pack.c:54

 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:65
+#: builtin/verify-pack.c:64

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

-#: builtin/verify-pack.c:67
+#: builtin/verify-pack.c:66

 msgid "show statistics only"
 msgstr ""
 
 msgid "show statistics only"
 msgstr ""
 


@@ -9380,33 +9561,17 @@ msgstr ""
 msgid "only useful for debugging"
 msgstr ""
 
 msgid "only useful for debugging"
 msgstr ""
 

+#: credential-cache--daemon.c:267
+msgid "print debugging messages to stderr"
+msgstr ""
+

 #: git.c:17
 msgid ""
 #: git.c:17
 msgid ""

-"'git help -a' and 'git help -g' lists available subcommands and some\n"
+"'git help -a' and 'git help -g' list available subcommands and some\n"

 "concept guides. See 'git help <command>' or 'git help <concept>'\n"
 "to read about a specific subcommand or concept."
 msgstr ""
 
 "concept guides. See 'git help <command>' or 'git help <concept>'\n"
 "to read about a specific subcommand or concept."
 msgstr ""
 

-#: parse-options.h:143
-msgid "expiry-date"
-msgstr ""
-
-#: parse-options.h:158
-msgid "no-op (backward compatibility)"
-msgstr ""
-
-#: parse-options.h:232
-msgid "be more verbose"
-msgstr ""
-
-#: parse-options.h:234
-msgid "be more quiet"
-msgstr ""
-
-#: parse-options.h:240
-msgid "use <n> digits to display SHA-1s"
-msgstr ""
-

 #: common-cmds.h:8
 msgid "Add file contents to the index"
 msgstr ""
 #: common-cmds.h:8
 msgid "Add file contents to the index"
 msgstr ""


@@ -9491,6 +9656,30 @@ msgstr ""
 msgid "Create, list, delete or verify a tag object signed with GPG"
 msgstr ""
 
 msgid "Create, list, delete or verify a tag object signed with GPG"
 msgstr ""
 

+#: parse-options.h:143
+msgid "expiry-date"
+msgstr ""
+
+#: parse-options.h:158
+msgid "no-op (backward compatibility)"
+msgstr ""
+
+#: parse-options.h:232
+msgid "be more verbose"
+msgstr ""
+
+#: parse-options.h:234
+msgid "be more quiet"
+msgstr ""
+
+#: parse-options.h:240
+msgid "use <n> digits to display SHA-1s"
+msgstr ""
+
+#: rerere.h:27
+msgid "update the index with reused conflict resolution if possible"
+msgstr ""
+

 #: git-am.sh:52
 msgid "You need to set your committer info first"
 msgstr ""
 #: git-am.sh:52
 msgid "You need to set your committer info first"
 msgstr ""


@@ -9719,14 +9908,14 @@ msgstr ""
 
 #: git-bisect.sh:289
 msgid ""
 
 #: git-bisect.sh:289
 msgid ""

-"You need to give me at least one good and one bad revisions.\n"
+"You need to give me at least one good and one bad revision.\n"

 "(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
 msgstr ""
 
 #: git-bisect.sh:292
 msgid ""
 "You need to start by \"git bisect start\".\n"
 "(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
 msgstr ""
 
 #: git-bisect.sh:292
 msgid ""
 "You need to start by \"git bisect start\".\n"

-"You then need to give me at least one good and one bad revisions.\n"
+"You then need to give me at least one good and one bad revision.\n"

 "(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
 msgstr ""
 
 "(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
 msgstr ""
 


@@ -9790,13 +9979,19 @@ msgstr ""
 msgid ""
 "Pull is not possible because you have unmerged files.\n"
 "Please, fix them up in the work tree, and then use 'git add/rm <file>'\n"
 msgid ""
 "Pull is not possible because you have unmerged files.\n"
 "Please, fix them up in the work tree, and then use 'git add/rm <file>'\n"

-"as appropriate to mark resolution, or use 'git commit -a'."
+"as appropriate to mark resolution and make a commit."

 msgstr ""
 
 #: git-pull.sh:25
 msgid "Pull is not possible because you have unmerged files."
 msgstr ""
 
 msgstr ""
 
 #: git-pull.sh:25
 msgid "Pull is not possible because you have unmerged files."
 msgstr ""
 

+#: git-pull.sh:31
+msgid ""
+"You have not concluded your merge (MERGE_HEAD exists).\n"
+"Please, commit your changes before you can merge."
+msgstr ""
+

 #: git-pull.sh:245
 msgid "updating an unborn branch with changes added to the index"
 msgstr ""
 #: git-pull.sh:245
 msgid "updating an unborn branch with changes added to the index"
 msgstr ""


@@ -10028,7 +10223,7 @@ msgstr ""
 
 #: git-stash.sh:397
 #, sh-format
 
 #: git-stash.sh:397
 #, sh-format

-msgid "$reference is not valid reference"
+msgid "$reference is not a valid reference"

 msgstr ""
 
 #: git-stash.sh:425
 msgstr ""
 
 #: git-stash.sh:425


@@ -10075,11 +10270,11 @@ msgstr ""
 msgid "${REV}: Could not drop stash entry"
 msgstr ""
 
 msgid "${REV}: Could not drop stash entry"
 msgstr ""
 

-#: git-stash.sh:538
+#: git-stash.sh:539

 msgid "No branch name specified"
 msgstr ""
 
 msgid "No branch name specified"
 msgstr ""
 

-#: git-stash.sh:610
+#: git-stash.sh:611

 msgid "(To restore them type \"git stash apply\")"
 msgstr ""
 
 msgid "(To restore them type \"git stash apply\")"
 msgstr ""