ident: add the ability to provide a "fallback identity"

diff --git a/po/git.pot b/po/git.pot
index cf1e44633079895608a3b0da3ff27c986e8903ac..1313d20ca77f350297c1e9a1152c02eb794de903 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"
-"POT-Creation-Date: 2013-08-06 14:10+0800\n"
+"POT-Creation-Date: 2018-12-02 10:55+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"
@@ -18,9854 +18,19752 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: advice.c:57
+#: advice.c:99
 #, c-format
-msgid "hint: %.*s\n"
+msgid "%shint: %.*s%s\n"
 msgstr ""
 
-#.
-#. * Message used both when 'git commit' fails and when
-#. * other commands doing a merge do.
-#.
-#: advice.c:87
-msgid ""
-"Fix them up in the work tree,\n"
-"and then use 'git add/rm <file>' as\n"
-"appropriate to mark resolution and make a commit,\n"
-"or use 'git commit -a'."
-msgstr ""
-
-#: archive.c:10
-msgid "git archive [options] <tree-ish> [<path>...]"
-msgstr ""
-
-#: archive.c:11
-msgid "git archive --list"
+#: advice.c:152
+msgid "Cherry-picking is not possible because you have unmerged files."
 msgstr ""
 
-#: archive.c:12
-msgid ""
-"git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [<path>...]"
+#: advice.c:154
+msgid "Committing is not possible because you have unmerged files."
 msgstr ""
 
-#: archive.c:13
-msgid "git archive --remote <repo> [--exec <cmd>] --list"
+#: advice.c:156
+msgid "Merging is not possible because you have unmerged files."
 msgstr ""
 
-#: archive.c:323
-msgid "fmt"
+#: advice.c:158
+msgid "Pulling is not possible because you have unmerged files."
 msgstr ""
 
-#: archive.c:323
-msgid "archive format"
+#: advice.c:160
+msgid "Reverting is not possible because you have unmerged files."
 msgstr ""
 
-#: archive.c:324 builtin/log.c:1173
-msgid "prefix"
+#: advice.c:162
+#, c-format
+msgid "It is not possible to %s because you have unmerged files."
 msgstr ""
 
-#: archive.c:325
-msgid "prepend prefix to each pathname in the archive"
+#: advice.c:170
+msgid ""
+"Fix them up in the work tree, and then use 'git add/rm <file>'\n"
+"as appropriate to mark resolution and make a commit."
 msgstr ""
 
-#: archive.c:326 builtin/archive.c:88 builtin/blame.c:2292
-#: builtin/blame.c:2293 builtin/config.c:56 builtin/fast-export.c:673
-#: builtin/fast-export.c:675 builtin/grep.c:714 builtin/hash-object.c:77
-#: builtin/ls-files.c:496 builtin/ls-files.c:499 builtin/notes.c:408
-#: builtin/notes.c:565 builtin/read-tree.c:108 parse-options.h:152
-msgid "file"
+#: advice.c:178
+msgid "Exiting because of an unresolved conflict."
 msgstr ""
 
-#: archive.c:327 builtin/archive.c:89
-msgid "write the archive to this file"
+#: advice.c:183 builtin/merge.c:1289
+msgid "You have not concluded your merge (MERGE_HEAD exists)."
 msgstr ""
 
-#: archive.c:329
-msgid "read .gitattributes in working directory"
+#: advice.c:185
+msgid "Please, commit your changes before merging."
 msgstr ""
 
-#: archive.c:330
-msgid "report archived files on stderr"
+#: advice.c:186
+msgid "Exiting because of unfinished merge."
 msgstr ""
 
-#: archive.c:331
-msgid "store only"
+#: advice.c:192
+#, c-format
+msgid ""
+"Note: checking out '%s'.\n"
+"\n"
+"You are in 'detached HEAD' state. You can look around, make experimental\n"
+"changes and commit them, and you can discard any commits you make in this\n"
+"state without impacting any branches by performing another checkout.\n"
+"\n"
+"If you want to create a new branch to retain commits you create, you may\n"
+"do so (now or later) by using -b with the checkout command again. Example:\n"
+"\n"
+"  git checkout -b <new-branch-name>\n"
+"\n"
 msgstr ""
 
-#: archive.c:332
-msgid "compress faster"
+#: apply.c:59
+#, c-format
+msgid "unrecognized whitespace option '%s'"
 msgstr ""
 
-#: archive.c:340
-msgid "compress better"
+#: apply.c:75
+#, c-format
+msgid "unrecognized whitespace ignore option '%s'"
 msgstr ""
 
-#: archive.c:343
-msgid "list supported archive formats"
+#: apply.c:125
+msgid "--reject and --3way cannot be used together."
 msgstr ""
 
-#: archive.c:345 builtin/archive.c:90 builtin/clone.c:85
-msgid "repo"
+#: apply.c:127
+msgid "--cached and --3way cannot be used together."
 msgstr ""
 
-#: archive.c:346 builtin/archive.c:91
-msgid "retrieve the archive from remote repository <repo>"
+#: apply.c:130
+msgid "--3way outside a repository"
 msgstr ""
 
-#: archive.c:347 builtin/archive.c:92 builtin/notes.c:487
-msgid "command"
+#: apply.c:141
+msgid "--index outside a repository"
 msgstr ""
 
-#: archive.c:348 builtin/archive.c:93
-msgid "path to the remote git-upload-archive command"
+#: apply.c:144
+msgid "--cached outside a repository"
 msgstr ""
 
-#: attr.c:259
-msgid ""
-"Negative patterns are ignored in git attributes\n"
-"Use '\\!' for literal leading exclamation."
+#: apply.c:826
+#, c-format
+msgid "Cannot prepare timestamp regexp %s"
 msgstr ""
 
-#: branch.c:60
+#: apply.c:835
 #, c-format
-msgid "Not setting branch %s as its own upstream."
+msgid "regexec returned %d for input: %s"
 msgstr ""
 
-#: branch.c:82
+#: apply.c:909
 #, c-format
-msgid "Branch %s set up to track remote branch %s from %s by rebasing."
+msgid "unable to find filename in patch at line %d"
 msgstr ""
 
-#: branch.c:83
+#: apply.c:947
 #, c-format
-msgid "Branch %s set up to track remote branch %s from %s."
+msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
 msgstr ""
 
-#: branch.c:87
+#: apply.c:953
 #, c-format
-msgid "Branch %s set up to track local branch %s by rebasing."
+msgid "git apply: bad git-diff - inconsistent new filename on line %d"
 msgstr ""
 
-#: branch.c:88
+#: apply.c:954
 #, c-format
-msgid "Branch %s set up to track local branch %s."
+msgid "git apply: bad git-diff - inconsistent old filename on line %d"
 msgstr ""
 
-#: branch.c:92
+#: apply.c:959
 #, c-format
-msgid "Branch %s set up to track remote ref %s by rebasing."
+msgid "git apply: bad git-diff - expected /dev/null on line %d"
 msgstr ""
 
-#: branch.c:93
+#: apply.c:988
 #, c-format
-msgid "Branch %s set up to track remote ref %s."
+msgid "invalid mode on line %d: %s"
 msgstr ""
 
-#: branch.c:97
+#: apply.c:1307
 #, c-format
-msgid "Branch %s set up to track local ref %s by rebasing."
+msgid "inconsistent header lines %d and %d"
 msgstr ""
 
-#: branch.c:98
+#: apply.c:1479
 #, c-format
-msgid "Branch %s set up to track local ref %s."
+msgid "recount: unexpected line: %.*s"
 msgstr ""
 
-#: branch.c:118
+#: apply.c:1548
 #, c-format
-msgid "Tracking not set up: name too long: %s"
+msgid "patch fragment without header at line %d: %.*s"
 msgstr ""
 
-#: branch.c:137
+#: apply.c:1568
 #, c-format
-msgid "Not tracking: ambiguous information for ref %s"
-msgstr ""
+msgid ""
+"git diff header lacks filename information when removing %d leading pathname "
+"component (line %d)"
+msgid_plural ""
+"git diff header lacks filename information when removing %d leading pathname "
+"components (line %d)"
+msgstr[0] ""
+msgstr[1] ""
 
-#: branch.c:182
+#: apply.c:1581
 #, c-format
-msgid "'%s' is not a valid branch name."
+msgid "git diff header lacks filename information (line %d)"
 msgstr ""
 
-#: branch.c:187
-#, c-format
-msgid "A branch named '%s' already exists."
+#: apply.c:1769
+msgid "new file depends on old contents"
 msgstr ""
 
-#: branch.c:195
-msgid "Cannot force update the current branch."
+#: apply.c:1771
+msgid "deleted file still has contents"
 msgstr ""
 
-#: branch.c:216
+#: apply.c:1805
 #, c-format
-msgid "Cannot setup tracking information; starting point '%s' is not a branch."
+msgid "corrupt patch at line %d"
 msgstr ""
 
-#: branch.c:218
+#: apply.c:1842
 #, c-format
-msgid "the requested upstream branch '%s' does not exist"
+msgid "new file %s depends on old contents"
 msgstr ""
 
-#: branch.c:220
-msgid ""
-"\n"
-"If you are planning on basing your work on an upstream\n"
-"branch that already exists at the remote, you may need to\n"
-"run \"git fetch\" to retrieve it.\n"
-"\n"
-"If you are planning to push out a new local branch that\n"
-"will track its remote counterpart, you may want to use\n"
-"\"git push -u\" to set the upstream config as you push."
+#: apply.c:1844
+#, c-format
+msgid "deleted file %s still has contents"
 msgstr ""
 
-#: branch.c:265
+#: apply.c:1847
 #, c-format
-msgid "Not a valid object name: '%s'."
+msgid "** warning: file %s becomes empty but is not deleted"
 msgstr ""
 
-#: branch.c:285
+#: apply.c:1994
 #, c-format
-msgid "Ambiguous object name: '%s'."
+msgid "corrupt binary patch at line %d: %.*s"
 msgstr ""
 
-#: branch.c:290
+#: apply.c:2031
 #, c-format
-msgid "Not a valid branch point: '%s'."
+msgid "unrecognized binary patch at line %d"
 msgstr ""
 
-#: branch.c:296
-msgid "Failed to lock ref for update"
+#: apply.c:2193
+#, c-format
+msgid "patch with only garbage at line %d"
 msgstr ""
 
-#: branch.c:314
-msgid "Failed to write ref"
+#: apply.c:2279
+#, c-format
+msgid "unable to read symlink %s"
 msgstr ""
 
-#: bundle.c:36
+#: apply.c:2283
 #, c-format
-msgid "'%s' does not look like a v2 bundle file"
+msgid "unable to open or read %s"
 msgstr ""
 
-#: bundle.c:63
+#: apply.c:2942
 #, c-format
-msgid "unrecognized header: %s%s (%d)"
+msgid "invalid start of line: '%c'"
 msgstr ""
 
-#: bundle.c:89 builtin/commit.c:697
+#: apply.c:3063
 #, c-format
-msgid "could not open '%s'"
-msgstr ""
+msgid "Hunk #%d succeeded at %d (offset %d line)."
+msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
+msgstr[0] ""
+msgstr[1] ""
 
-#: bundle.c:140
-msgid "Repository lacks these prerequisite commits:"
+#: apply.c:3075
+#, c-format
+msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
 msgstr ""
 
-#: bundle.c:164 sequencer.c:661 sequencer.c:1111 builtin/log.c:331
-#: builtin/log.c:801 builtin/log.c:1399 builtin/log.c:1625 builtin/merge.c:364
-#: builtin/shortlog.c:156
-msgid "revision walk setup failed"
+#: apply.c:3081
+#, c-format
+msgid ""
+"while searching for:\n"
+"%.*s"
 msgstr ""
 
-#: bundle.c:186
+#: apply.c:3103
 #, c-format
-msgid "The bundle contains this ref:"
-msgid_plural "The bundle contains these %d refs:"
-msgstr[0] ""
-msgstr[1] ""
-
-#: bundle.c:193
-msgid "The bundle records a complete history."
+msgid "missing binary patch data for '%s'"
 msgstr ""
 
-#: bundle.c:195
+#: apply.c:3111
 #, c-format
-msgid "The bundle requires this ref:"
-msgid_plural "The bundle requires these %d refs:"
-msgstr[0] ""
-msgstr[1] ""
-
-#: bundle.c:294
-msgid "rev-list died"
+msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
 msgstr ""
 
-#: bundle.c:300 builtin/log.c:1310 builtin/shortlog.c:259
+#: apply.c:3158
 #, c-format
-msgid "unrecognized argument: %s"
+msgid "cannot apply binary patch to '%s' without full index line"
 msgstr ""
 
-#: bundle.c:335
+#: apply.c:3168
 #, c-format
-msgid "ref '%s' is excluded by the rev-list options"
+msgid ""
+"the patch applies to '%s' (%s), which does not match the current contents."
 msgstr ""
 
-#: bundle.c:380
-msgid "Refusing to create empty bundle."
+#: apply.c:3176
+#, c-format
+msgid "the patch applies to an empty '%s' but it is not empty"
 msgstr ""
 
-#: bundle.c:398
-msgid "Could not spawn pack-objects"
+#: apply.c:3194
+#, c-format
+msgid "the necessary postimage %s for '%s' cannot be read"
 msgstr ""
 
-#: bundle.c:416
-msgid "pack-objects died"
+#: apply.c:3207
+#, c-format
+msgid "binary patch does not apply to '%s'"
 msgstr ""
 
-#: bundle.c:419
+#: apply.c:3213
 #, c-format
-msgid "cannot create '%s'"
+msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
 msgstr ""
 
-#: bundle.c:441
-msgid "index-pack died"
+#: apply.c:3234
+#, c-format
+msgid "patch failed: %s:%ld"
 msgstr ""
 
-#: commit.c:53
+#: apply.c:3356
 #, c-format
-msgid "could not parse %s"
+msgid "cannot checkout %s"
 msgstr ""
 
-#: commit.c:55
+#: apply.c:3408 apply.c:3419 apply.c:3465 midx.c:58 setup.c:278
 #, c-format
-msgid "%s %s is not a commit!"
+msgid "failed to read %s"
 msgstr ""
 
-#: compat/obstack.c:406 compat/obstack.c:408
-msgid "memory exhausted"
+#: apply.c:3416
+#, c-format
+msgid "reading from '%s' beyond a symbolic link"
 msgstr ""
 
-#: connected.c:60
-msgid "Could not run 'git rev-list'"
+#: apply.c:3445 apply.c:3688
+#, c-format
+msgid "path %s has been renamed/deleted"
 msgstr ""
 
-#: connected.c:80
+#: apply.c:3531 apply.c:3703
 #, c-format
-msgid "failed write to rev-list: %s"
+msgid "%s: does not exist in index"
 msgstr ""
 
-#: connected.c:88
+#: apply.c:3540 apply.c:3711
 #, c-format
-msgid "failed to close rev-list's stdin: %s"
+msgid "%s: does not match index"
 msgstr ""
 
-#: date.c:95
-msgid "in the future"
+#: apply.c:3575
+msgid "repository lacks the necessary blob to fall back on 3-way merge."
 msgstr ""
 
-#: date.c:101
+#: apply.c:3578
 #, c-format
-msgid "%lu second ago"
-msgid_plural "%lu seconds ago"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Falling back to three-way merge...\n"
+msgstr ""
 
-#: date.c:108
+#: apply.c:3594 apply.c:3598
 #, c-format
-msgid "%lu minute ago"
-msgid_plural "%lu minutes ago"
-msgstr[0] ""
-msgstr[1] ""
+msgid "cannot read the current contents of '%s'"
+msgstr ""
 
-#: date.c:115
+#: apply.c:3610
 #, c-format
-msgid "%lu hour ago"
-msgid_plural "%lu hours ago"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Failed to fall back on three-way merge...\n"
+msgstr ""
 
-#: date.c:122
+#: apply.c:3624
 #, c-format
-msgid "%lu day ago"
-msgid_plural "%lu days ago"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Applied patch to '%s' with conflicts.\n"
+msgstr ""
 
-#: date.c:128
+#: apply.c:3629
 #, c-format
-msgid "%lu week ago"
-msgid_plural "%lu weeks ago"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Applied patch to '%s' cleanly.\n"
+msgstr ""
 
-#: date.c:135
-#, c-format
-msgid "%lu month ago"
-msgid_plural "%lu months ago"
-msgstr[0] ""
-msgstr[1] ""
+#: apply.c:3655
+msgid "removal patch leaves file contents"
+msgstr ""
 
-#: date.c:146
+#: apply.c:3728
 #, c-format
-msgid "%lu year"
-msgid_plural "%lu years"
-msgstr[0] ""
-msgstr[1] ""
+msgid "%s: wrong type"
+msgstr ""
 
-#: date.c:149
+#: apply.c:3730
 #, c-format
-msgid "%s, %lu month ago"
-msgid_plural "%s, %lu months ago"
-msgstr[0] ""
-msgstr[1] ""
+msgid "%s has type %o, expected %o"
+msgstr ""
 
-#: date.c:154 date.c:159
+#: apply.c:3881 apply.c:3883
 #, c-format
-msgid "%lu year ago"
-msgid_plural "%lu years ago"
-msgstr[0] ""
-msgstr[1] ""
+msgid "invalid path '%s'"
+msgstr ""
 
-#: diff.c:112
+#: apply.c:3939
 #, c-format
-msgid "  Failed to parse dirstat cut-off percentage '%s'\n"
+msgid "%s: already exists in index"
 msgstr ""
 
-#: diff.c:117
+#: apply.c:3942
 #, c-format
-msgid "  Unknown dirstat parameter '%s'\n"
+msgid "%s: already exists in working directory"
 msgstr ""
 
-#: diff.c:210
+#: apply.c:3962
 #, c-format
-msgid "Unknown value for 'diff.submodule' config variable: '%s'"
+msgid "new mode (%o) of %s does not match old mode (%o)"
 msgstr ""
 
-#: diff.c:260
+#: apply.c:3967
 #, c-format
-msgid ""
-"Found errors in 'diff.dirstat' config variable:\n"
-"%s"
+msgid "new mode (%o) of %s does not match old mode (%o) of %s"
 msgstr ""
 
-#: diff.c:3487
+#: apply.c:3987
 #, c-format
-msgid ""
-"Failed to parse --dirstat/-X option parameter:\n"
-"%s"
+msgid "affected file '%s' is beyond a symbolic link"
 msgstr ""
 
-#: diff.c:3501
+#: apply.c:3991
 #, c-format
-msgid "Failed to parse --submodule option parameter: '%s'"
+msgid "%s: patch does not apply"
 msgstr ""
 
-#: gpg-interface.c:59 gpg-interface.c:131
-msgid "could not run gpg."
+#: apply.c:4006
+#, c-format
+msgid "Checking patch %s..."
 msgstr ""
 
-#: gpg-interface.c:71
-msgid "gpg did not accept the data"
+#: apply.c:4098
+#, c-format
+msgid "sha1 information is lacking or useless for submodule %s"
 msgstr ""
 
-#: gpg-interface.c:82
-msgid "gpg failed to sign the data"
+#: apply.c:4105
+#, c-format
+msgid "mode change for %s, which is not in current HEAD"
 msgstr ""
 
-#: gpg-interface.c:115
+#: apply.c:4108
 #, c-format
-msgid "could not create temporary file '%s': %s"
+msgid "sha1 information is lacking or useless (%s)."
 msgstr ""
 
-#: gpg-interface.c:118
+#: apply.c:4113 builtin/checkout.c:244 builtin/reset.c:142
 #, c-format
-msgid "failed writing detached signature to '%s': %s"
+msgid "make_cache_entry failed for path '%s'"
 msgstr ""
 
-#: grep.c:1623
+#: apply.c:4117
 #, c-format
-msgid "'%s': unable to read %s"
+msgid "could not add %s to temporary index"
 msgstr ""
 
-#: grep.c:1640
+#: apply.c:4127
 #, c-format
-msgid "'%s': %s"
+msgid "could not write temporary index to %s"
 msgstr ""
 
-#: grep.c:1651
+#: apply.c:4265
 #, c-format
-msgid "'%s': short read %s"
+msgid "unable to remove %s from index"
 msgstr ""
 
-#: help.c:210
+#: apply.c:4299
 #, c-format
-msgid "available git commands in '%s'"
+msgid "corrupt patch for submodule %s"
 msgstr ""
 
-#: help.c:217
-msgid "git commands available from elsewhere on your $PATH"
+#: apply.c:4305
+#, c-format
+msgid "unable to stat newly created file '%s'"
 msgstr ""
 
-#: help.c:233
-msgid "The most commonly used git commands are:"
+#: apply.c:4313
+#, c-format
+msgid "unable to create backing store for newly created file %s"
 msgstr ""
 
-#: help.c:290
+#: apply.c:4319 apply.c:4464
 #, c-format
-msgid ""
-"'%s' appears to be a git command, but we were not\n"
-"able to execute it. Maybe git-%s is broken?"
+msgid "unable to add cache entry for %s"
 msgstr ""
 
-#: help.c:347
-msgid "Uh oh. Your system reports no Git commands at all."
+#: apply.c:4362
+#, c-format
+msgid "failed to write to '%s'"
 msgstr ""
 
-#: help.c:369
+#: apply.c:4366
 #, c-format
-msgid ""
-"WARNING: You called a Git command named '%s', which does not exist.\n"
-"Continuing under the assumption that you meant '%s'"
+msgid "closing file '%s'"
 msgstr ""
 
-#: help.c:374
+#: apply.c:4436
 #, c-format
-msgid "in %0.1f seconds automatically..."
+msgid "unable to write file '%s' mode %o"
 msgstr ""
 
-#: help.c:381
+#: apply.c:4534
 #, c-format
-msgid "git: '%s' is not a git command. See 'git --help'."
+msgid "Applied patch %s cleanly."
 msgstr ""
 
-#: help.c:385 help.c:444
-msgid ""
-"\n"
-"Did you mean this?"
-msgid_plural ""
-"\n"
-"Did you mean one of these?"
+#: apply.c:4542
+msgid "internal error"
+msgstr ""
+
+#: apply.c:4545
+#, c-format
+msgid "Applying patch %%s with %d reject..."
+msgid_plural "Applying patch %%s with %d rejects..."
 msgstr[0] ""
 msgstr[1] ""
 
-#: help.c:440
+#: apply.c:4556
 #, c-format
-msgid "%s: %s - %s"
+msgid "truncating .rej filename to %.*s.rej"
 msgstr ""
 
-#: merge.c:56
-msgid "failed to read the cache"
+#: apply.c:4564 builtin/fetch.c:843 builtin/fetch.c:1122
+#, c-format
+msgid "cannot open %s"
 msgstr ""
 
-#: merge.c:110 builtin/checkout.c:365 builtin/checkout.c:566
-#: builtin/clone.c:656
-msgid "unable to write new index file"
+#: apply.c:4578
+#, c-format
+msgid "Hunk #%d applied cleanly."
 msgstr ""
 
-#: merge-recursive.c:190
+#: apply.c:4582
 #, c-format
-msgid "(bad commit)\n"
+msgid "Rejected hunk #%d."
 msgstr ""
 
-#: merge-recursive.c:206
+#: apply.c:4692
 #, c-format
-msgid "addinfo_cache failed for path '%s'"
+msgid "Skipped patch '%s'."
 msgstr ""
 
-#: merge-recursive.c:269
-msgid "error building trees"
+#: apply.c:4700
+msgid "unrecognized input"
 msgstr ""
 
-#: merge-recursive.c:673
-#, c-format
-msgid "failed to create path '%s'%s"
+#: apply.c:4719
+msgid "unable to read index file"
 msgstr ""
 
-#: merge-recursive.c:684
+#: apply.c:4874
 #, c-format
-msgid "Removing %s to make room for subdirectory\n"
-msgstr ""
-
-#. something else exists
-#. .. but not some other error (who really cares what?)
-#: merge-recursive.c:698 merge-recursive.c:719
-msgid ": perhaps a D/F conflict?"
+msgid "can't open patch '%s': %s"
 msgstr ""
 
-#: merge-recursive.c:709
+#: apply.c:4901
 #, c-format
-msgid "refusing to lose untracked file at '%s'"
-msgstr ""
+msgid "squelched %d whitespace error"
+msgid_plural "squelched %d whitespace errors"
+msgstr[0] ""
+msgstr[1] ""
 
-#: merge-recursive.c:749
+#: apply.c:4907 apply.c:4922
 #, c-format
-msgid "cannot read object %s '%s'"
-msgstr ""
+msgid "%d line adds whitespace errors."
+msgid_plural "%d lines add whitespace errors."
+msgstr[0] ""
+msgstr[1] ""
 
-#: merge-recursive.c:751
+#: apply.c:4915
 #, c-format
-msgid "blob expected for %s '%s'"
-msgstr ""
+msgid "%d line applied after fixing whitespace errors."
+msgid_plural "%d lines applied after fixing whitespace errors."
+msgstr[0] ""
+msgstr[1] ""
 
-#: merge-recursive.c:774 builtin/clone.c:312
-#, c-format
-msgid "failed to open '%s'"
+#: apply.c:4931 builtin/add.c:538 builtin/mv.c:300 builtin/rm.c:389
+msgid "Unable to write new index file"
 msgstr ""
 
-#: merge-recursive.c:782
-#, c-format
-msgid "failed to symlink '%s'"
+#: apply.c:4958 apply.c:4961 builtin/am.c:2209 builtin/am.c:2212
+#: builtin/clone.c:121 builtin/fetch.c:118 builtin/merge.c:262
+#: builtin/pull.c:199 builtin/submodule--helper.c:406
+#: builtin/submodule--helper.c:1362 builtin/submodule--helper.c:1365
+#: builtin/submodule--helper.c:1846 builtin/submodule--helper.c:1849
+#: builtin/submodule--helper.c:2088 git-add--interactive.perl:197
+msgid "path"
 msgstr ""
 
-#: merge-recursive.c:785
-#, c-format
-msgid "do not know what to do with %06o %s '%s'"
+#: apply.c:4959
+msgid "don't apply changes matching the given path"
 msgstr ""
 
-#: merge-recursive.c:923
-msgid "Failed to execute internal merge"
+#: apply.c:4962
+msgid "apply changes matching the given path"
 msgstr ""
 
-#: merge-recursive.c:927
-#, c-format
-msgid "Unable to add %s to database"
+#: apply.c:4964 builtin/am.c:2218
+msgid "num"
 msgstr ""
 
-#: merge-recursive.c:943
-msgid "unsupported object type in the tree"
+#: apply.c:4965
+msgid "remove <num> leading slashes from traditional diff paths"
 msgstr ""
 
-#: merge-recursive.c:1022 merge-recursive.c:1036
-#, c-format
-msgid ""
-"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
-"in tree."
+#: apply.c:4968
+msgid "ignore additions made by the patch"
 msgstr ""
 
-#: merge-recursive.c:1028 merge-recursive.c:1041
-#, c-format
-msgid ""
-"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
-"in tree at %s."
+#: apply.c:4970
+msgid "instead of applying the patch, output diffstat for the input"
 msgstr ""
 
-#: merge-recursive.c:1082
-msgid "rename"
+#: apply.c:4974
+msgid "show number of added and deleted lines in decimal notation"
 msgstr ""
 
-#: merge-recursive.c:1082
-msgid "renamed"
+#: apply.c:4976
+msgid "instead of applying the patch, output a summary for the input"
 msgstr ""
 
-#: merge-recursive.c:1138
-#, c-format
-msgid "%s is a directory in %s adding as %s instead"
+#: apply.c:4978
+msgid "instead of applying the patch, see if the patch is applicable"
 msgstr ""
 
-#: merge-recursive.c:1160
-#, c-format
-msgid ""
-"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
-"\"->\"%s\" in \"%s\"%s"
+#: apply.c:4980
+msgid "make sure the patch is applicable to the current index"
 msgstr ""
 
-#: merge-recursive.c:1165
-msgid " (left unresolved)"
+#: apply.c:4982
+msgid "mark new files with `git add --intent-to-add`"
 msgstr ""
 
-#: merge-recursive.c:1219
-#, c-format
-msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
+#: apply.c:4984
+msgid "apply a patch without touching the working tree"
 msgstr ""
 
-#: merge-recursive.c:1249
-#, c-format
-msgid "Renaming %s to %s and %s to %s instead"
+#: apply.c:4986
+msgid "accept a patch that touches outside the working area"
 msgstr ""
 
-#: merge-recursive.c:1448
-#, c-format
-msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
+#: apply.c:4989
+msgid "also apply the patch (use with --stat/--summary/--check)"
 msgstr ""
 
-#: merge-recursive.c:1458
-#, c-format
-msgid "Adding merged %s"
+#: apply.c:4991
+msgid "attempt three-way merge if a patch does not apply"
 msgstr ""
 
-#: merge-recursive.c:1463 merge-recursive.c:1661
-#, c-format
-msgid "Adding as %s instead"
+#: apply.c:4993
+msgid "build a temporary index based on embedded index information"
 msgstr ""
 
-#: merge-recursive.c:1514
-#, c-format
-msgid "cannot read object %s"
+#: apply.c:4996 builtin/checkout-index.c:170 builtin/ls-files.c:523
+msgid "paths are separated with NUL character"
 msgstr ""
 
-#: merge-recursive.c:1517
-#, c-format
-msgid "object %s is not a blob"
+#: apply.c:4998
+msgid "ensure at least <n> lines of context match"
 msgstr ""
 
-#: merge-recursive.c:1565
-msgid "modify"
+#: apply.c:4999 builtin/am.c:2197 builtin/interpret-trailers.c:97
+#: builtin/interpret-trailers.c:99 builtin/interpret-trailers.c:101
+#: builtin/pack-objects.c:3312 builtin/rebase.c:857
+msgid "action"
 msgstr ""
 
-#: merge-recursive.c:1565
-msgid "modified"
+#: apply.c:5000
+msgid "detect new or modified lines that have whitespace errors"
 msgstr ""
 
-#: merge-recursive.c:1575
-msgid "content"
+#: apply.c:5003 apply.c:5006
+msgid "ignore changes in whitespace when finding context"
 msgstr ""
 
-#: merge-recursive.c:1582
-msgid "add/add"
+#: apply.c:5009
+msgid "apply the patch in reverse"
 msgstr ""
 
-#: merge-recursive.c:1616
-#, c-format
-msgid "Skipped %s (merged same as existing)"
+#: apply.c:5011
+msgid "don't expect at least one line of context"
 msgstr ""
 
-#: merge-recursive.c:1630
-#, c-format
-msgid "Auto-merging %s"
+#: apply.c:5013
+msgid "leave the rejected hunks in corresponding *.rej files"
 msgstr ""
 
-#: merge-recursive.c:1634 git-submodule.sh:1118
-msgid "submodule"
+#: apply.c:5015
+msgid "allow overlapping hunks"
 msgstr ""
 
-#: merge-recursive.c:1635
-#, c-format
-msgid "CONFLICT (%s): Merge conflict in %s"
+#: apply.c:5016 builtin/add.c:290 builtin/check-ignore.c:21
+#: builtin/commit.c:1309 builtin/count-objects.c:98 builtin/fsck.c:698
+#: builtin/log.c:2023 builtin/mv.c:122 builtin/read-tree.c:127
+#: builtin/rebase--interactive.c:157
+msgid "be verbose"
 msgstr ""
 
-#: merge-recursive.c:1725
-#, c-format
-msgid "Removing %s"
+#: apply.c:5018
+msgid "tolerate incorrectly detected missing new-line at the end of file"
 msgstr ""
 
-#: merge-recursive.c:1750
-msgid "file/directory"
+#: apply.c:5021
+msgid "do not trust the line counts in the hunk headers"
 msgstr ""
 
-#: merge-recursive.c:1756
-msgid "directory/file"
+#: apply.c:5023 builtin/am.c:2206
+msgid "root"
 msgstr ""
 
-#: merge-recursive.c:1761
-#, c-format
-msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
+#: apply.c:5024
+msgid "prepend <root> to all filenames"
 msgstr ""
 
-#: merge-recursive.c:1771
-#, c-format
-msgid "Adding %s"
+#: archive.c:14
+msgid "git archive [<options>] <tree-ish> [<path>...]"
 msgstr ""
 
-#: merge-recursive.c:1788
-msgid "Fatal merge failure, shouldn't happen."
+#: archive.c:15
+msgid "git archive --list"
 msgstr ""
 
-#: merge-recursive.c:1807
-msgid "Already up-to-date!"
+#: archive.c:16
+msgid ""
+"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
 msgstr ""
 
-#: merge-recursive.c:1816
-#, c-format
-msgid "merging of trees %s and %s failed"
+#: archive.c:17
+msgid "git archive --remote <repo> [--exec <cmd>] --list"
 msgstr ""
 
-#: merge-recursive.c:1846
+#: archive.c:370 builtin/add.c:176 builtin/add.c:514 builtin/rm.c:298
 #, c-format
-msgid "Unprocessed path??? %s"
+msgid "pathspec '%s' did not match any files"
 msgstr ""
 
-#: merge-recursive.c:1891
-msgid "Merging:"
+#: archive.c:453
+msgid "fmt"
 msgstr ""
 
-#: merge-recursive.c:1904
-#, c-format
-msgid "found %u common ancestor:"
-msgid_plural "found %u common ancestors:"
-msgstr[0] ""
-msgstr[1] ""
+#: archive.c:453
+msgid "archive format"
+msgstr ""
 
-#: merge-recursive.c:1941
-msgid "merge returned no commit"
+#: archive.c:454 builtin/log.c:1536
+msgid "prefix"
 msgstr ""
 
-#: merge-recursive.c:1998
-#, c-format
-msgid "Could not parse object '%s'"
+#: archive.c:455
+msgid "prepend prefix to each pathname in the archive"
 msgstr ""
 
-#: merge-recursive.c:2010 builtin/merge.c:672
-msgid "Unable to write index."
+#: archive.c:456 builtin/blame.c:820 builtin/blame.c:821 builtin/config.c:129
+#: builtin/fast-export.c:1013 builtin/fast-export.c:1015 builtin/grep.c:884
+#: builtin/hash-object.c:104 builtin/ls-files.c:559 builtin/ls-files.c:562
+#: builtin/notes.c:412 builtin/notes.c:575 builtin/read-tree.c:122
+#: parse-options.h:162
+msgid "file"
 msgstr ""
 
-#: notes-utils.c:40
-msgid "Cannot commit uninitialized/unreferenced notes tree"
+#: archive.c:457 builtin/archive.c:89
+msgid "write the archive to this file"
 msgstr ""
 
-#: notes-utils.c:81
-#, c-format
-msgid "Bad notes.rewriteMode value: '%s'"
+#: archive.c:459
+msgid "read .gitattributes in working directory"
 msgstr ""
 
-#: notes-utils.c:91
-#, c-format
-msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
+#: archive.c:460
+msgid "report archived files on stderr"
 msgstr ""
 
-#. TRANSLATORS: The first %s is the name of the
-#. environment variable, the second %s is its value
-#: notes-utils.c:118
-#, c-format
-msgid "Bad %s value: '%s'"
+#: archive.c:461
+msgid "store only"
 msgstr ""
 
-#: object.c:204
-#, c-format
-msgid "unable to parse object: %s"
+#: archive.c:462
+msgid "compress faster"
 msgstr ""
 
-#: parse-options.c:489
-msgid "..."
+#: archive.c:470
+msgid "compress better"
 msgstr ""
 
-#: parse-options.c:507
-#, c-format
-msgid "usage: %s"
+#: archive.c:473
+msgid "list supported archive formats"
 msgstr ""
 
-#. TRANSLATORS: the colon here should align with the
-#. one in "usage: %s" translation
-#: parse-options.c:511
-#, c-format
-msgid "   or: %s"
+#: archive.c:475 builtin/archive.c:90 builtin/clone.c:111 builtin/clone.c:114
+#: builtin/submodule--helper.c:1374 builtin/submodule--helper.c:1855
+msgid "repo"
 msgstr ""
 
-#: parse-options.c:514
-#, c-format
-msgid "    %s"
+#: archive.c:476 builtin/archive.c:91
+msgid "retrieve the archive from remote repository <repo>"
 msgstr ""
 
-#: parse-options.c:548
-msgid "-NUM"
+#: archive.c:477 builtin/archive.c:92 builtin/difftool.c:714
+#: builtin/notes.c:496
+msgid "command"
 msgstr ""
 
-#: pathspec.c:83
-#, c-format
-msgid "Path '%s' is in submodule '%.*s'"
+#: archive.c:478 builtin/archive.c:93
+msgid "path to the remote git-upload-archive command"
 msgstr ""
 
-#: pathspec.c:99
-#, c-format
-msgid "'%s' is beyond a symbolic link"
+#: archive.c:485
+msgid "Unexpected option --remote"
 msgstr ""
 
-#: remote.c:1788
-#, 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] ""
+#: archive.c:487
+msgid "Option --exec can only be used together with --remote"
+msgstr ""
 
-#: remote.c:1794
-msgid "  (use \"git push\" to publish your local commits)\n"
+#: archive.c:489
+msgid "Unexpected option --output"
 msgstr ""
 
-#: remote.c:1797
+#: archive.c:511
 #, c-format
-msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
-msgid_plural ""
-"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: remote.c:1805
-msgid "  (use \"git pull\" to update your local branch)\n"
+msgid "Unknown archive format '%s'"
 msgstr ""
 
-#: remote.c:1808
+#: archive.c:518
 #, c-format
-msgid ""
-"Your branch and '%s' have diverged,\n"
-"and have %d and %d different commit each, respectively.\n"
-msgid_plural ""
-"Your branch and '%s' have diverged,\n"
-"and have %d and %d different commits each, respectively.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: remote.c:1818
-msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
+msgid "Argument not supported for format '%s': -%d"
 msgstr ""
 
-#: run-command.c:80
-msgid "open /dev/null failed"
+#: archive-tar.c:125 archive-zip.c:345
+#, c-format
+msgid "cannot stream blob %s"
 msgstr ""
 
-#: run-command.c:82
+#: archive-tar.c:260 archive-zip.c:363
 #, c-format
-msgid "dup2(%d,%d) failed"
+msgid "unsupported file mode: 0%o (SHA1: %s)"
 msgstr ""
 
-#: sequencer.c:206 builtin/merge.c:790 builtin/merge.c:903
-#: builtin/merge.c:1013 builtin/merge.c:1023
+#: archive-tar.c:287 archive-zip.c:353
 #, c-format
-msgid "Could not open '%s' for writing"
+msgid "cannot read %s"
 msgstr ""
 
-#: sequencer.c:208 builtin/merge.c:350 builtin/merge.c:793
-#: builtin/merge.c:1015 builtin/merge.c:1028
+#: archive-tar.c:458
 #, c-format
-msgid "Could not write to '%s'"
+msgid "unable to start '%s' filter"
 msgstr ""
 
-#: sequencer.c:229
-msgid ""
-"after resolving the conflicts, mark the corrected paths\n"
-"with 'git add <paths>' or 'git rm <paths>'"
+#: archive-tar.c:461
+msgid "unable to redirect descriptor"
 msgstr ""
 
-#: sequencer.c:232
-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'"
+#: archive-tar.c:468
+#, c-format
+msgid "'%s' filter reported error"
 msgstr ""
 
-#: sequencer.c:245 sequencer.c:869 sequencer.c:952
+#: archive-zip.c:314
 #, c-format
-msgid "Could not write to %s"
+msgid "path is not valid UTF-8: %s"
 msgstr ""
 
-#: sequencer.c:248
+#: archive-zip.c:318
 #, c-format
-msgid "Error wrapping up %s"
+msgid "path too long (%d chars, SHA1: %s): %s"
 msgstr ""
 
-#: sequencer.c:263
-msgid "Your local changes would be overwritten by cherry-pick."
+#: archive-zip.c:474 builtin/pack-objects.c:224 builtin/pack-objects.c:227
+#, c-format
+msgid "deflate error (%d)"
 msgstr ""
 
-#: sequencer.c:265
-msgid "Your local changes would be overwritten by revert."
+#: archive-zip.c:609
+#, c-format
+msgid "timestamp too large for this system: %<PRIuMAX>"
 msgstr ""
 
-#: sequencer.c:268
-msgid "Commit your changes or stash them to proceed."
+#: attr.c:212
+#, c-format
+msgid "%.*s is not a valid attribute name"
 msgstr ""
 
-#. TRANSLATORS: %s will be "revert" or "cherry-pick"
-#: sequencer.c:324
-#, c-format
-msgid "%s: Unable to write new index file"
+#: attr.c:409
+msgid ""
+"Negative patterns are ignored in git attributes\n"
+"Use '\\!' for literal leading exclamation."
 msgstr ""
 
-#: sequencer.c:355
-msgid "Could not resolve HEAD commit\n"
+#: bisect.c:468
+#, c-format
+msgid "Badly quoted content in file '%s': %s"
 msgstr ""
 
-#: sequencer.c:377
-msgid "Unable to update cache tree\n"
+#: bisect.c:676
+#, c-format
+msgid "We cannot bisect more!\n"
 msgstr ""
 
-#: sequencer.c:422
+#: bisect.c:730
 #, c-format
-msgid "Could not parse commit %s\n"
+msgid "Not a valid commit name %s"
 msgstr ""
 
-#: sequencer.c:427
+#: bisect.c:754
 #, c-format
-msgid "Could not parse parent commit %s\n"
+msgid ""
+"The merge base %s is bad.\n"
+"This means the bug has been fixed between %s and [%s].\n"
 msgstr ""
 
-#: sequencer.c:493
-msgid "Your index file is unmerged."
+#: bisect.c:759
+#, c-format
+msgid ""
+"The merge base %s is new.\n"
+"The property has changed between %s and [%s].\n"
 msgstr ""
 
-#: sequencer.c:512
+#: bisect.c:764
 #, c-format
-msgid "Commit %s is a merge but no -m option was given."
+msgid ""
+"The merge base %s is %s.\n"
+"This means the first '%s' commit is between %s and [%s].\n"
 msgstr ""
 
-#: sequencer.c:520
+#: bisect.c:772
 #, c-format
-msgid "Commit %s does not have parent %d"
+msgid ""
+"Some %s revs are not ancestors of the %s rev.\n"
+"git bisect cannot work properly in this case.\n"
+"Maybe you mistook %s and %s revs?\n"
 msgstr ""
 
-#: sequencer.c:524
+#: bisect.c:785
 #, c-format
-msgid "Mainline was specified but commit %s is not a merge."
+msgid ""
+"the merge base between %s and [%s] must be skipped.\n"
+"So we cannot be sure the first %s commit is between %s and %s.\n"
+"We continue anyway."
 msgstr ""
 
-#. TRANSLATORS: The first %s will be "revert" or
-#. "cherry-pick", the second %s a SHA1
-#: sequencer.c:537
+#: bisect.c:818
 #, c-format
-msgid "%s: cannot parse parent commit %s"
+msgid "Bisecting: a merge base must be tested\n"
 msgstr ""
 
-#: sequencer.c:541
+#: bisect.c:858
 #, c-format
-msgid "Cannot get commit message for %s"
+msgid "a %s revision is needed"
 msgstr ""
 
-#: sequencer.c:627
+#: bisect.c:877 builtin/notes.c:177 builtin/tag.c:237
 #, c-format
-msgid "could not revert %s... %s"
+msgid "could not create file '%s'"
 msgstr ""
 
-#: sequencer.c:628
+#: bisect.c:928 builtin/merge.c:138
 #, c-format
-msgid "could not apply %s... %s"
+msgid "could not read file '%s'"
 msgstr ""
 
-#: sequencer.c:664
-msgid "empty commit set passed"
+#: bisect.c:958
+msgid "reading bisect refs failed"
 msgstr ""
 
-#: sequencer.c:672
+#: bisect.c:977
 #, c-format
-msgid "git %s: failed to read the index"
+msgid "%s was both %s and %s\n"
 msgstr ""
 
-#: sequencer.c:677
+#: bisect.c:985
 #, c-format
-msgid "git %s: failed to refresh the index"
+msgid ""
+"No testable commit found.\n"
+"Maybe you started with bad path parameters?\n"
 msgstr ""
 
-#: sequencer.c:735
+#: bisect.c:1004
 #, c-format
-msgid "Cannot %s during a %s"
-msgstr ""
+msgid "(roughly %d step)"
+msgid_plural "(roughly %d steps)"
+msgstr[0] ""
+msgstr[1] ""
 
-#: sequencer.c:757
+#. TRANSLATORS: the last %s will be replaced with "(roughly %d
+#. steps)" translation.
+#.
+#: bisect.c:1010
 #, c-format
-msgid "Could not parse line %d."
+msgid "Bisecting: %d revision left to test after this %s\n"
+msgid_plural "Bisecting: %d revisions left to test after this %s\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: blame.c:1787
+msgid "--contents and --reverse do not blend well."
 msgstr ""
 
-#: sequencer.c:762
-msgid "No commits parsed."
+#: blame.c:1801
+msgid "cannot use --contents with final commit object name"
 msgstr ""
 
-#: sequencer.c:775
-#, c-format
-msgid "Could not open %s"
+#: blame.c:1822
+msgid "--reverse and --first-parent together require specified latest commit"
 msgstr ""
 
-#: sequencer.c:779
-#, c-format
-msgid "Could not read %s."
+#: blame.c:1831 bundle.c:162 ref-filter.c:2046 sequencer.c:1963
+#: sequencer.c:4002 builtin/commit.c:1001 builtin/log.c:377 builtin/log.c:932
+#: builtin/log.c:1407 builtin/log.c:1783 builtin/log.c:2072 builtin/merge.c:406
+#: builtin/pack-objects.c:3137 builtin/pack-objects.c:3152
+#: builtin/shortlog.c:192
+msgid "revision walk setup failed"
 msgstr ""
 
-#: sequencer.c:786
-#, c-format
-msgid "Unusable instruction sheet: %s"
+#: blame.c:1849
+msgid ""
+"--reverse --first-parent together require range along first-parent chain"
 msgstr ""
 
-#: sequencer.c:814
+#: blame.c:1860
 #, c-format
-msgid "Invalid key: %s"
+msgid "no such path %s in %s"
 msgstr ""
 
-#: sequencer.c:817
+#: blame.c:1871
 #, c-format
-msgid "Invalid value for %s: %s"
+msgid "cannot read blob %s for path %s"
 msgstr ""
 
-#: sequencer.c:829
+#: branch.c:52
 #, c-format
-msgid "Malformed options sheet: %s"
+msgid ""
+"\n"
+"After fixing the error cause you may try to fix up\n"
+"the remote tracking information by invoking\n"
+"\"git branch --set-upstream-to=%s%s%s\"."
 msgstr ""
 
-#: sequencer.c:850
-msgid "a cherry-pick or revert is already in progress"
+#: branch.c:66
+#, c-format
+msgid "Not setting branch %s as its own upstream."
 msgstr ""
 
-#: sequencer.c:851
-msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
+#: branch.c:92
+#, c-format
+msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
 msgstr ""
 
-#: sequencer.c:855
+#: branch.c:93
 #, c-format
-msgid "Could not create sequencer directory %s"
+msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
 msgstr ""
 
-#: sequencer.c:871 sequencer.c:956
+#: branch.c:97
 #, c-format
-msgid "Error wrapping up %s."
+msgid "Branch '%s' set up to track local branch '%s' by rebasing."
 msgstr ""
 
-#: sequencer.c:890 sequencer.c:1024
-msgid "no cherry-pick or revert in progress"
+#: branch.c:98
+#, c-format
+msgid "Branch '%s' set up to track local branch '%s'."
 msgstr ""
 
-#: sequencer.c:892
-msgid "cannot resolve HEAD"
+#: branch.c:103
+#, c-format
+msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
 msgstr ""
 
-#: sequencer.c:894
-msgid "cannot abort from a branch yet to be born"
+#: branch.c:104
+#, c-format
+msgid "Branch '%s' set up to track remote ref '%s'."
 msgstr ""
 
-#: sequencer.c:916 builtin/apply.c:4061
+#: branch.c:108
 #, c-format
-msgid "cannot open %s: %s"
+msgid "Branch '%s' set up to track local ref '%s' by rebasing."
 msgstr ""
 
-#: sequencer.c:919
+#: branch.c:109
 #, c-format
-msgid "cannot read %s: %s"
+msgid "Branch '%s' set up to track local ref '%s'."
 msgstr ""
 
-#: sequencer.c:920
-msgid "unexpected end of file"
+#: branch.c:118
+msgid "Unable to write upstream branch configuration"
 msgstr ""
 
-#: sequencer.c:926
+#: branch.c:155
 #, c-format
-msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
+msgid "Not tracking: ambiguous information for ref %s"
 msgstr ""
 
-#: sequencer.c:949
+#: branch.c:188
 #, c-format
-msgid "Could not format %s."
+msgid "'%s' is not a valid branch name."
 msgstr ""
 
-#: sequencer.c:1092
+#: branch.c:207
 #, c-format
-msgid "%s: can't cherry-pick a %s"
+msgid "A branch named '%s' already exists."
 msgstr ""
 
-#: sequencer.c:1095
-#, c-format
-msgid "%s: bad revision"
+#: branch.c:212
+msgid "Cannot force update the current branch."
 msgstr ""
 
-#: sequencer.c:1129
-msgid "Can't revert as initial commit"
+#: branch.c:232
+#, c-format
+msgid "Cannot setup tracking information; starting point '%s' is not a branch."
 msgstr ""
 
-#: sequencer.c:1130
-msgid "Can't cherry-pick into empty head"
+#: branch.c:234
+#, c-format
+msgid "the requested upstream branch '%s' does not exist"
 msgstr ""
 
-#: sha1_name.c:440
+#: branch.c:236
 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"
-"may be created by mistake. For example,\n"
 "\n"
-"  git checkout -b $br $(git rev-parse ...)\n"
+"If you are planning on basing your work on an upstream\n"
+"branch that already exists at the remote, you may need to\n"
+"run \"git fetch\" to retrieve it.\n"
 "\n"
-"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
-"examine these refs and maybe delete them. Turn this message off by\n"
-"running \"git config advice.objectNameWarning false\""
+"If you are planning to push out a new local branch that\n"
+"will track its remote counterpart, you may want to use\n"
+"\"git push -u\" to set the upstream config as you push."
 msgstr ""
 
-#: sha1_name.c:1097
-msgid "HEAD does not point to a branch"
+#: branch.c:279
+#, c-format
+msgid "Not a valid object name: '%s'."
 msgstr ""
 
-#: sha1_name.c:1100
+#: branch.c:299
 #, c-format
-msgid "No such branch: '%s'"
+msgid "Ambiguous object name: '%s'."
 msgstr ""
 
-#: sha1_name.c:1102
+#: branch.c:304
 #, c-format
-msgid "No upstream configured for branch '%s'"
+msgid "Not a valid branch point: '%s'."
 msgstr ""
 
-#: sha1_name.c:1106
+#: branch.c:358
 #, c-format
-msgid "Upstream branch '%s' not stored as a remote-tracking branch"
+msgid "'%s' is already checked out at '%s'"
 msgstr ""
 
-#: wrapper.c:408
+#: branch.c:381
 #, c-format
-msgid "unable to access '%s': %s"
+msgid "HEAD of working tree %s is not updated"
 msgstr ""
 
-#: wrapper.c:429
+#: bundle.c:36
 #, c-format
-msgid "unable to access '%s'"
+msgid "'%s' does not look like a v2 bundle file"
 msgstr ""
 
-#: wrapper.c:440
+#: bundle.c:64
 #, c-format
-msgid "unable to look up current user in the passwd file: %s"
+msgid "unrecognized header: %s%s (%d)"
 msgstr ""
 
-#: wrapper.c:441
-msgid "no such user"
+#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2182 sequencer.c:2722
+#: builtin/commit.c:774
+#, c-format
+msgid "could not open '%s'"
 msgstr ""
 
-#: wt-status.c:141
-msgid "Unmerged paths:"
+#: bundle.c:141
+msgid "Repository lacks these prerequisite commits:"
 msgstr ""
 
-#: wt-status.c:168 wt-status.c:195
+#: bundle.c:192
 #, c-format
-msgid "  (use \"git reset %s <file>...\" to unstage)"
-msgstr ""
+msgid "The bundle contains this ref:"
+msgid_plural "The bundle contains these %d refs:"
+msgstr[0] ""
+msgstr[1] ""
 
-#: wt-status.c:170 wt-status.c:197
-msgid "  (use \"git rm --cached <file>...\" to unstage)"
+#: bundle.c:199
+msgid "The bundle records a complete history."
 msgstr ""
 
-#: wt-status.c:174
-msgid "  (use \"git add <file>...\" to mark resolution)"
+#: bundle.c:201
+#, c-format
+msgid "The bundle requires this ref:"
+msgid_plural "The bundle requires these %d refs:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bundle.c:267
+msgid "unable to dup bundle descriptor"
 msgstr ""
 
-#: wt-status.c:176 wt-status.c:180
-msgid "  (use \"git add/rm <file>...\" as appropriate to mark resolution)"
+#: bundle.c:274
+msgid "Could not spawn pack-objects"
 msgstr ""
 
-#: wt-status.c:178
-msgid "  (use \"git rm <file>...\" to mark resolution)"
+#: bundle.c:285
+msgid "pack-objects died"
 msgstr ""
 
-#: wt-status.c:189
-msgid "Changes to be committed:"
+#: bundle.c:327
+msgid "rev-list died"
 msgstr ""
 
-#: wt-status.c:207
-msgid "Changes not staged for commit:"
+#: bundle.c:376
+#, c-format
+msgid "ref '%s' is excluded by the rev-list options"
 msgstr ""
 
-#: wt-status.c:211
-msgid "  (use \"git add <file>...\" to update what will be committed)"
+#: bundle.c:456 builtin/log.c:192 builtin/log.c:1688 builtin/shortlog.c:304
+#, c-format
+msgid "unrecognized argument: %s"
 msgstr ""
 
-#: wt-status.c:213
-msgid "  (use \"git add/rm <file>...\" to update what will be committed)"
+#: bundle.c:464
+msgid "Refusing to create empty bundle."
 msgstr ""
 
-#: wt-status.c:214
-msgid ""
-"  (use \"git checkout -- <file>...\" to discard changes in working directory)"
+#: bundle.c:474
+#, c-format
+msgid "cannot create '%s'"
 msgstr ""
 
-#: wt-status.c:216
-msgid "  (commit or discard the untracked or modified content in submodules)"
+#: bundle.c:498
+msgid "index-pack died"
 msgstr ""
 
-#: wt-status.c:228
+#: color.c:296
 #, c-format
-msgid "  (use \"git %s <file>...\" to include in what will be committed)"
+msgid "invalid color value: %.*s"
 msgstr ""
 
-#: wt-status.c:245
-msgid "bug"
+#: commit.c:50 sequencer.c:2528 builtin/am.c:370 builtin/am.c:414
+#: builtin/am.c:1390 builtin/am.c:2025 builtin/replace.c:376
+#: builtin/replace.c:448
+#, c-format
+msgid "could not parse %s"
 msgstr ""
 
-#: wt-status.c:250
-msgid "both deleted:"
+#: commit.c:52
+#, c-format
+msgid "%s %s is not a commit!"
 msgstr ""
 
-#: wt-status.c:251
-msgid "added by us:"
+#: commit.c:193
+msgid ""
+"Support for <GIT_DIR>/info/grafts is deprecated\n"
+"and will be removed in a future Git version.\n"
+"\n"
+"Please use \"git replace --convert-graft-file\"\n"
+"to convert the grafts into replace refs.\n"
+"\n"
+"Turn this message off by running\n"
+"\"git config advice.graftFileDeprecated false\""
 msgstr ""
 
-#: wt-status.c:252
-msgid "deleted by them:"
+#: commit.c:1115
+#, c-format
+msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
 msgstr ""
 
-#: wt-status.c:253
-msgid "added by them:"
+#: commit.c:1118
+#, c-format
+msgid "Commit %s has a bad GPG signature allegedly by %s."
 msgstr ""
 
-#: wt-status.c:254
-msgid "deleted by us:"
+#: commit.c:1121
+#, c-format
+msgid "Commit %s does not have a GPG signature."
 msgstr ""
 
-#: wt-status.c:255
-msgid "both added:"
+#: commit.c:1124
+#, c-format
+msgid "Commit %s has a good GPG signature by %s\n"
 msgstr ""
 
-#: wt-status.c:256
-msgid "both modified:"
+#: commit.c:1378
+msgid ""
+"Warning: commit message did not conform to UTF-8.\n"
+"You may want to amend it after fixing the message, or set the config\n"
+"variable i18n.commitencoding to the encoding your project uses.\n"
 msgstr ""
 
-#: wt-status.c:286
-msgid "new commits, "
+#: commit-graph.c:108
+#, c-format
+msgid "graph file %s is too small"
 msgstr ""
 
-#: wt-status.c:288
-msgid "modified content, "
+#: commit-graph.c:115
+#, c-format
+msgid "graph signature %X does not match signature %X"
 msgstr ""
 
-#: wt-status.c:290
-msgid "untracked content, "
+#: commit-graph.c:122
+#, c-format
+msgid "graph version %X does not match version %X"
 msgstr ""
 
-#: wt-status.c:307
+#: commit-graph.c:129
 #, c-format
-msgid "new file:   %s"
+msgid "hash version %X does not match version %X"
 msgstr ""
 
-#: wt-status.c:310
+#: commit-graph.c:153
 #, c-format
-msgid "copied:     %s -> %s"
+msgid "improper chunk offset %08x%08x"
 msgstr ""
 
-#: wt-status.c:313
+#: commit-graph.c:189
 #, c-format
-msgid "deleted:    %s"
+msgid "chunk id %08x appears multiple times"
 msgstr ""
 
-#: wt-status.c:316
+#: commit-graph.c:308
 #, c-format
-msgid "modified:   %s"
+msgid "could not find commit %s"
 msgstr ""
 
-#: wt-status.c:319
+#: commit-graph.c:617 builtin/pack-objects.c:2652
 #, c-format
-msgid "renamed:    %s -> %s"
+msgid "unable to get type of object %s"
 msgstr ""
 
-#: wt-status.c:322
-#, c-format
-msgid "typechange: %s"
+#: commit-graph.c:651
+msgid "Annotating commits in commit graph"
+msgstr ""
+
+#: commit-graph.c:691
+msgid "Computing commit graph generation numbers"
 msgstr ""
 
-#: wt-status.c:325
+#: commit-graph.c:803 commit-graph.c:826 commit-graph.c:852
+msgid "Finding commits for commit graph"
+msgstr ""
+
+#: commit-graph.c:812
 #, c-format
-msgid "unknown:    %s"
+msgid "error adding pack %s"
 msgstr ""
 
-#: wt-status.c:328
+#: commit-graph.c:814
 #, c-format
-msgid "unmerged:   %s"
+msgid "error opening index for %s"
 msgstr ""
 
-#: wt-status.c:331
+#: commit-graph.c:868
 #, c-format
-msgid "bug: unhandled diff status %c"
+msgid "the commit graph format cannot write %d commits"
 msgstr ""
 
-#: wt-status.c:803
-msgid "You have unmerged paths."
+#: commit-graph.c:895
+msgid "too many commits to write graph"
 msgstr ""
 
-#: wt-status.c:806
-msgid "  (fix conflicts and run \"git commit\")"
+#: commit-graph.c:902 midx.c:769
+#, c-format
+msgid "unable to create leading directories of %s"
 msgstr ""
 
-#: wt-status.c:809
-msgid "All conflicts fixed but you are still merging."
+#: commit-graph.c:1002
+msgid "the commit-graph file has incorrect checksum and is likely corrupt"
 msgstr ""
 
-#: wt-status.c:812
-msgid "  (use \"git commit\" to conclude merge)"
+#: commit-graph.c:1046
+msgid "Verifying commits in commit graph"
 msgstr ""
 
-#: wt-status.c:822
-msgid "You are in the middle of an am session."
+#: compat/obstack.c:405 compat/obstack.c:407
+msgid "memory exhausted"
 msgstr ""
 
-#: wt-status.c:825
-msgid "The current patch is empty."
+#: config.c:123
+#, c-format
+msgid ""
+"exceeded maximum include depth (%d) while including\n"
+"\t%s\n"
+"from\n"
+"\t%s\n"
+"This might be due to circular includes."
 msgstr ""
 
-#: wt-status.c:829
-msgid "  (fix conflicts and then run \"git am --continue\")"
+#: config.c:139
+#, c-format
+msgid "could not expand include path '%s'"
 msgstr ""
 
-#: wt-status.c:831
-msgid "  (use \"git am --skip\" to skip this patch)"
+#: config.c:150
+msgid "relative config includes must come from files"
 msgstr ""
 
-#: wt-status.c:833
-msgid "  (use \"git am --abort\" to restore the original branch)"
+#: config.c:190
+msgid "relative config include conditionals must come from files"
 msgstr ""
 
-#: wt-status.c:893 wt-status.c:910
+#: config.c:348
 #, c-format
-msgid "You are currently rebasing branch '%s' on '%s'."
+msgid "key does not contain a section: %s"
 msgstr ""
 
-#: wt-status.c:898 wt-status.c:915
-msgid "You are currently rebasing."
+#: config.c:354
+#, c-format
+msgid "key does not contain variable name: %s"
 msgstr ""
 
-#: wt-status.c:901
-msgid "  (fix conflicts and then run \"git rebase --continue\")"
+#: config.c:378 sequencer.c:2296
+#, c-format
+msgid "invalid key: %s"
 msgstr ""
 
-#: wt-status.c:903
-msgid "  (use \"git rebase --skip\" to skip this patch)"
+#: config.c:384
+#, c-format
+msgid "invalid key (newline): %s"
 msgstr ""
 
-#: wt-status.c:905
-msgid "  (use \"git rebase --abort\" to check out the original branch)"
+#: config.c:420 config.c:432
+#, c-format
+msgid "bogus config parameter: %s"
 msgstr ""
 
-#: wt-status.c:918
-msgid "  (all conflicts fixed: run \"git rebase --continue\")"
+#: config.c:467
+#, c-format
+msgid "bogus format in %s"
 msgstr ""
 
-#: wt-status.c:922
+#: config.c:793
 #, c-format
-msgid ""
-"You are currently splitting a commit while rebasing branch '%s' on '%s'."
+msgid "bad config line %d in blob %s"
 msgstr ""
 
-#: wt-status.c:927
-msgid "You are currently splitting a commit during a rebase."
+#: config.c:797
+#, c-format
+msgid "bad config line %d in file %s"
 msgstr ""
 
-#: wt-status.c:930
-msgid "  (Once your working directory is clean, run \"git rebase --continue\")"
+#: config.c:801
+#, c-format
+msgid "bad config line %d in standard input"
 msgstr ""
 
-#: wt-status.c:934
+#: config.c:805
 #, c-format
-msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
+msgid "bad config line %d in submodule-blob %s"
 msgstr ""
 
-#: wt-status.c:939
-msgid "You are currently editing a commit during a rebase."
+#: config.c:809
+#, c-format
+msgid "bad config line %d in command line %s"
 msgstr ""
 
-#: wt-status.c:942
-msgid "  (use \"git commit --amend\" to amend the current commit)"
+#: config.c:813
+#, c-format
+msgid "bad config line %d in %s"
 msgstr ""
 
-#: wt-status.c:944
-msgid ""
-"  (use \"git rebase --continue\" once you are satisfied with your changes)"
+#: config.c:952
+msgid "out of range"
 msgstr ""
 
-#: wt-status.c:954
-msgid "You are currently cherry-picking."
+#: config.c:952
+msgid "invalid unit"
 msgstr ""
 
-#: wt-status.c:958
-msgid "  (fix conflicts and run \"git cherry-pick --continue\")"
+#: config.c:958
+#, c-format
+msgid "bad numeric config value '%s' for '%s': %s"
 msgstr ""
 
-#: wt-status.c:961
-msgid "  (all conflicts fixed: run \"git cherry-pick --continue\")"
+#: config.c:963
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
 msgstr ""
 
-#: wt-status.c:963
-msgid "  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
+#: config.c:966
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in file %s: %s"
 msgstr ""
 
-#: wt-status.c:972
+#: config.c:969
 #, c-format
-msgid "You are currently reverting commit %s."
+msgid "bad numeric config value '%s' for '%s' in standard input: %s"
 msgstr ""
 
-#: wt-status.c:977
-msgid "  (fix conflicts and run \"git revert --continue\")"
+#: config.c:972
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
 msgstr ""
 
-#: wt-status.c:980
-msgid "  (all conflicts fixed: run \"git revert --continue\")"
+#: config.c:975
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
 msgstr ""
 
-#: wt-status.c:982
-msgid "  (use \"git revert --abort\" to cancel the revert operation)"
+#: config.c:978
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in %s: %s"
 msgstr ""
 
-#: wt-status.c:993
+#: config.c:1073
 #, c-format
-msgid "You are currently bisecting, started from branch '%s'."
+msgid "failed to expand user dir in: '%s'"
 msgstr ""
 
-#: wt-status.c:997
-msgid "You are currently bisecting."
+#: config.c:1082
+#, c-format
+msgid "'%s' for '%s' is not a valid timestamp"
 msgstr ""
 
-#: wt-status.c:1000
-msgid "  (use \"git bisect reset\" to get back to the original branch)"
+#: config.c:1173
+#, c-format
+msgid "abbrev length out of range: %d"
 msgstr ""
 
-#: wt-status.c:1173
-msgid "On branch "
+#: config.c:1187 config.c:1198
+#, c-format
+msgid "bad zlib compression level %d"
 msgstr ""
 
-#: wt-status.c:1180
-msgid "rebase in progress; onto "
+#: config.c:1290
+msgid "core.commentChar should only be one character"
 msgstr ""
 
-#: wt-status.c:1187
-msgid "HEAD detached at "
+#: config.c:1323
+#, c-format
+msgid "invalid mode for object creation: %s"
 msgstr ""
 
-#: wt-status.c:1189
-msgid "HEAD detached from "
+#: config.c:1395
+#, c-format
+msgid "malformed value for %s"
 msgstr ""
 
-#: wt-status.c:1192
-msgid "Not currently on any branch."
+#: config.c:1421
+#, c-format
+msgid "malformed value for %s: %s"
 msgstr ""
 
-#: wt-status.c:1209
-msgid "Initial commit"
+#: config.c:1422
+msgid "must be one of nothing, matching, simple, upstream or current"
 msgstr ""
 
-#: wt-status.c:1223
-msgid "Untracked files"
+#: config.c:1481 builtin/pack-objects.c:3391
+#, c-format
+msgid "bad pack compression level %d"
 msgstr ""
 
-#: wt-status.c:1225
-msgid "Ignored files"
+#: config.c:1602
+#, c-format
+msgid "unable to load config blob object '%s'"
 msgstr ""
 
-#: wt-status.c:1229
+#: config.c:1605
 #, c-format
-msgid ""
-"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
-"may speed it up, but you have to be careful not to forget to add\n"
-"new files yourself (see 'git help status')."
+msgid "reference '%s' does not point to a blob"
 msgstr ""
 
-#: wt-status.c:1235
+#: config.c:1622
 #, c-format
-msgid "Untracked files not listed%s"
+msgid "unable to resolve config blob '%s'"
 msgstr ""
 
-#: wt-status.c:1237
-msgid " (use -u option to show untracked files)"
+#: config.c:1652
+#, c-format
+msgid "failed to parse %s"
 msgstr ""
 
-#: wt-status.c:1243
-msgid "No changes"
+#: config.c:1705
+msgid "unable to parse command-line config"
+msgstr ""
+
+#: config.c:2037
+msgid "unknown error occurred while reading the configuration files"
 msgstr ""
 
-#: wt-status.c:1248
+#: config.c:2207
 #, c-format
-msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
+msgid "Invalid %s: '%s'"
 msgstr ""
 
-#: wt-status.c:1251
+#: config.c:2250
 #, c-format
-msgid "no changes added to commit\n"
+msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
 msgstr ""
 
-#: wt-status.c:1254
+#: config.c:2276
 #, c-format
-msgid ""
-"nothing added to commit but untracked files present (use \"git add\" to "
-"track)\n"
+msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
 msgstr ""
 
-#: wt-status.c:1257
+#: config.c:2322
 #, c-format
-msgid "nothing added to commit but untracked files present\n"
+msgid "unable to parse '%s' from command-line config"
 msgstr ""
 
-#: wt-status.c:1260
+#: config.c:2324
 #, c-format
-msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
+msgid "bad config variable '%s' in file '%s' at line %d"
 msgstr ""
 
-#: wt-status.c:1263 wt-status.c:1268
+#: config.c:2405
 #, c-format
-msgid "nothing to commit\n"
+msgid "invalid section name '%s'"
 msgstr ""
 
-#: wt-status.c:1266
+#: config.c:2437
 #, c-format
-msgid "nothing to commit (use -u to show untracked files)\n"
+msgid "%s has multiple values"
 msgstr ""
 
-#: wt-status.c:1270
+#: config.c:2466
 #, c-format
-msgid "nothing to commit, working directory clean\n"
+msgid "failed to write new configuration file %s"
 msgstr ""
 
-#: wt-status.c:1378
-msgid "HEAD (no branch)"
+#: config.c:2717 config.c:3041
+#, c-format
+msgid "could not lock config file %s"
 msgstr ""
 
-#: wt-status.c:1384
-msgid "Initial commit on "
+#: config.c:2728
+#, c-format
+msgid "opening %s"
 msgstr ""
 
-#: wt-status.c:1399
-msgid "behind "
+#: config.c:2763 builtin/config.c:327
+#, c-format
+msgid "invalid pattern: %s"
 msgstr ""
 
-#: wt-status.c:1402 wt-status.c:1405
-msgid "ahead "
+#: config.c:2788
+#, c-format
+msgid "invalid config file %s"
 msgstr ""
 
-#: wt-status.c:1407
-msgid ", behind "
+#: config.c:2801 config.c:3054
+#, c-format
+msgid "fstat on %s failed"
 msgstr ""
 
-#: compat/precompose_utf8.c:58 builtin/clone.c:351
+#: config.c:2812
 #, c-format
-msgid "failed to unlink '%s'"
+msgid "unable to mmap '%s'"
 msgstr ""
 
-#: builtin/add.c:20
-msgid "git add [options] [--] <pathspec>..."
+#: config.c:2821 config.c:3059
+#, c-format
+msgid "chmod on %s failed"
 msgstr ""
 
-#.
-#. * To be consistent with "git add -p" and most Git
-#. * commands, we should default to being tree-wide, but
-#. * this is not the original behavior and can't be
-#. * changed until users trained themselves not to type
-#. * "git add -u" or "git add -A". For now, we warn and
-#. * keep the old behavior. Later, the behavior can be changed
-#. * to tree-wide, keeping the warning for a while, and
-#. * eventually we can drop the warning.
-#.
-#: builtin/add.c:58
+#: config.c:2906 config.c:3156
 #, c-format
-msgid ""
-"The behavior of 'git add %s (or %s)' with no path argument from a\n"
-"subdirectory of the tree will change in Git 2.0 and should not be used "
-"anymore.\n"
-"To add content for the whole tree, run:\n"
-"\n"
-"  git add %s :/\n"
-"  (or git add %s :/)\n"
-"\n"
-"To restrict the command to the current directory, run:\n"
-"\n"
-"  git add %s .\n"
-"  (or git add %s .)\n"
-"\n"
-"With the current Git version, the command is restricted to the current "
-"directory.\n"
+msgid "could not write config file %s"
 msgstr ""
 
-#: builtin/add.c:100
+#: config.c:2940
 #, c-format
-msgid ""
-"You ran 'git add' with neither '-A (--all)' or '--ignore-removal',\n"
-"whose behaviour will change in Git 2.0 with respect to paths you removed.\n"
-"Paths like '%s' that are\n"
-"removed from your working tree are ignored with this version of Git.\n"
-"\n"
-"* 'git add --ignore-removal <pathspec>', which is the current default,\n"
-"  ignores paths you removed from your working tree.\n"
-"\n"
-"* 'git add --all <pathspec>' will let you also record the removals.\n"
-"\n"
-"Run 'git status' to check the paths you removed from your working tree.\n"
+msgid "could not set '%s' to '%s'"
 msgstr ""
 
-#: builtin/add.c:144
+#: config.c:2942 builtin/remote.c:782
 #, c-format
-msgid "unexpected diff status %c"
+msgid "could not unset '%s'"
 msgstr ""
 
-#: builtin/add.c:149 builtin/commit.c:252
-msgid "updating files failed"
+#: config.c:3032
+#, c-format
+msgid "invalid section name: %s"
 msgstr ""
 
-#: builtin/add.c:163
+#: config.c:3199
 #, c-format
-msgid "remove '%s'\n"
+msgid "missing value for '%s'"
 msgstr ""
 
-#: builtin/add.c:253
-msgid "Unstaged changes after refreshing the index:"
+#: connect.c:61
+msgid "the remote end hung up upon initial contact"
 msgstr ""
 
-#: builtin/add.c:256 builtin/add.c:573 builtin/rm.c:337
-#, c-format
-msgid "pathspec '%s' did not match any files"
+#: connect.c:63
+msgid ""
+"Could not read from remote repository.\n"
+"\n"
+"Please make sure you have the correct access rights\n"
+"and the repository exists."
 msgstr ""
 
-#: builtin/add.c:339
-msgid "Could not read the index"
+#: connect.c:81
+#, c-format
+msgid "server doesn't support '%s'"
 msgstr ""
 
-#: builtin/add.c:350
+#: connect.c:103
 #, c-format
-msgid "Could not open '%s' for writing."
+msgid "server doesn't support feature '%s'"
 msgstr ""
 
-#: builtin/add.c:354
-msgid "Could not write patch"
+#: connect.c:114
+msgid "expected flush after capabilities"
 msgstr ""
 
-#: builtin/add.c:359
+#: connect.c:233
 #, c-format
-msgid "Could not stat '%s'"
+msgid "ignoring capabilities after first line '%s'"
 msgstr ""
 
-#: builtin/add.c:361
-msgid "Empty patch. Aborted."
+#: connect.c:252
+msgid "protocol error: unexpected capabilities^{}"
 msgstr ""
 
-#: builtin/add.c:367
+#: connect.c:273
 #, c-format
-msgid "Could not apply '%s'"
+msgid "protocol error: expected shallow sha-1, got '%s'"
 msgstr ""
 
-#: builtin/add.c:377
-msgid "The following paths are ignored by one of your .gitignore files:\n"
+#: connect.c:275
+msgid "repository on the other end cannot be shallow"
 msgstr ""
 
-#: builtin/add.c:394 builtin/clean.c:875 builtin/fetch.c:78 builtin/mv.c:63
-#: builtin/prune-packed.c:73 builtin/push.c:451 builtin/remote.c:1253
-#: builtin/rm.c:268
-msgid "dry run"
+#: connect.c:310 fetch-pack.c:182 builtin/archive.c:63
+#, c-format
+msgid "remote error: %s"
 msgstr ""
 
-#: builtin/add.c:395 builtin/apply.c:4410 builtin/check-ignore.c:19
-#: builtin/commit.c:1220 builtin/count-objects.c:95 builtin/fsck.c:613
-#: builtin/log.c:1573 builtin/mv.c:62 builtin/read-tree.c:113
-msgid "be verbose"
+#: connect.c:316
+msgid "invalid packet"
 msgstr ""
 
-#: builtin/add.c:397
-msgid "interactive picking"
+#: connect.c:336
+#, c-format
+msgid "protocol error: unexpected '%s'"
 msgstr ""
 
-#: builtin/add.c:398 builtin/checkout.c:1073 builtin/reset.c:261
-msgid "select hunks interactively"
+#: connect.c:444
+#, c-format
+msgid "invalid ls-refs response: %s"
 msgstr ""
 
-#: builtin/add.c:399
-msgid "edit current diff and apply"
+#: connect.c:448
+msgid "expected flush after ref listing"
 msgstr ""
 
-#: builtin/add.c:400
-msgid "allow adding otherwise ignored files"
+#: connect.c:547
+#, c-format
+msgid "protocol '%s' is not supported"
 msgstr ""
 
-#: builtin/add.c:401
-msgid "update tracked files"
+#: connect.c:598
+msgid "unable to set SO_KEEPALIVE on socket"
 msgstr ""
 
-#: builtin/add.c:402
-msgid "record only the fact that the path will be added later"
+#: connect.c:638 connect.c:701
+#, c-format
+msgid "Looking up %s ... "
 msgstr ""
 
-#: builtin/add.c:403
-msgid "add changes from all tracked and untracked files"
+#: connect.c:642
+#, c-format
+msgid "unable to look up %s (port %s) (%s)"
 msgstr ""
 
-#. takes no arguments
-#: builtin/add.c:406
-msgid "ignore paths removed in the working tree (same as --no-all)"
+#. TRANSLATORS: this is the end of "Looking up %s ... "
+#: connect.c:646 connect.c:717
+#, c-format
+msgid ""
+"done.\n"
+"Connecting to %s (port %s) ... "
 msgstr ""
 
-#: builtin/add.c:408
-msgid "don't add, only refresh the index"
+#: connect.c:668 connect.c:745
+#, c-format
+msgid ""
+"unable to connect to %s:\n"
+"%s"
 msgstr ""
 
-#: builtin/add.c:409
-msgid "just skip files which cannot be added because of errors"
+#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
+#: connect.c:674 connect.c:751
+msgid "done."
 msgstr ""
 
-#: builtin/add.c:410
-msgid "check if - even missing - files are ignored in dry run"
+#: connect.c:705
+#, c-format
+msgid "unable to look up %s (%s)"
 msgstr ""
 
-#: builtin/add.c:432
+#: connect.c:711
 #, c-format
-msgid "Use -f if you really want to add them.\n"
+msgid "unknown port %s"
 msgstr ""
 
-#: builtin/add.c:433
-msgid "no files added"
+#: connect.c:848 connect.c:1174
+#, c-format
+msgid "strange hostname '%s' blocked"
 msgstr ""
 
-#: builtin/add.c:439
-msgid "adding files failed"
+#: connect.c:850
+#, c-format
+msgid "strange port '%s' blocked"
 msgstr ""
 
-#: builtin/add.c:478
-msgid "-A and -u are mutually incompatible"
+#: connect.c:860
+#, c-format
+msgid "cannot start proxy %s"
 msgstr ""
 
-#: builtin/add.c:496
-msgid "Option --ignore-missing can only be used together with --dry-run"
+#: connect.c:927
+msgid "no path specified; see 'git help pull' for valid url syntax"
 msgstr ""
 
-#: builtin/add.c:526
-#, c-format
-msgid "Nothing specified, nothing added.\n"
+#: connect.c:1122
+msgid "ssh variant 'simple' does not support -4"
 msgstr ""
 
-#: builtin/add.c:527
-#, c-format
-msgid "Maybe you wanted to say 'git add .'?\n"
+#: connect.c:1134
+msgid "ssh variant 'simple' does not support -6"
 msgstr ""
 
-#: builtin/add.c:533 builtin/check-ignore.c:161 builtin/clean.c:919
-#: builtin/commit.c:312 builtin/mv.c:82 builtin/rm.c:297
-msgid "index file corrupt"
+#: connect.c:1151
+msgid "ssh variant 'simple' does not support setting port"
 msgstr ""
 
-#: builtin/add.c:605 builtin/apply.c:4506 builtin/mv.c:229 builtin/rm.c:432
-msgid "Unable to write new index file"
+#: connect.c:1262
+#, c-format
+msgid "strange pathname '%s' blocked"
 msgstr ""
 
-#: builtin/apply.c:57
-msgid "git apply [options] [<patch>...]"
+#: connect.c:1307
+msgid "unable to fork"
 msgstr ""
 
-#: builtin/apply.c:110
-#, c-format
-msgid "unrecognized whitespace option '%s'"
+#: connected.c:68 builtin/fsck.c:202 builtin/prune.c:147
+msgid "Checking connectivity"
 msgstr ""
 
-#: builtin/apply.c:125
-#, c-format
-msgid "unrecognized whitespace ignore option '%s'"
+#: connected.c:80
+msgid "Could not run 'git rev-list'"
 msgstr ""
 
-#: builtin/apply.c:823
-#, c-format
-msgid "Cannot prepare timestamp regexp %s"
+#: connected.c:100
+msgid "failed write to rev-list"
+msgstr ""
+
+#: connected.c:107
+msgid "failed to close rev-list's stdin"
 msgstr ""
 
-#: builtin/apply.c:832
+#: convert.c:194
 #, c-format
-msgid "regexec returned %d for input: %s"
+msgid "illegal crlf_action %d"
 msgstr ""
 
-#: builtin/apply.c:913
+#: convert.c:207
 #, c-format
-msgid "unable to find filename in patch at line %d"
+msgid "CRLF would be replaced by LF in %s"
 msgstr ""
 
-#: builtin/apply.c:945
+#: convert.c:209
 #, c-format
-msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
+msgid ""
+"CRLF will be replaced by LF in %s.\n"
+"The file will have its original line endings in your working directory"
 msgstr ""
 
-#: builtin/apply.c:949
+#: convert.c:217
 #, c-format
-msgid "git apply: bad git-diff - inconsistent new filename on line %d"
+msgid "LF would be replaced by CRLF in %s"
 msgstr ""
 
-#: builtin/apply.c:950
+#: convert.c:219
 #, c-format
-msgid "git apply: bad git-diff - inconsistent old filename on line %d"
+msgid ""
+"LF will be replaced by CRLF in %s.\n"
+"The file will have its original line endings in your working directory"
 msgstr ""
 
-#: builtin/apply.c:957
+#: convert.c:280
 #, c-format
-msgid "git apply: bad git-diff - expected /dev/null on line %d"
+msgid "BOM is prohibited in '%s' if encoded as %s"
 msgstr ""
 
-#: builtin/apply.c:1422
+#: convert.c:287
 #, c-format
-msgid "recount: unexpected line: %.*s"
+msgid ""
+"The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-"
+"tree-encoding."
 msgstr ""
 
-#: builtin/apply.c:1479
+#: convert.c:305
 #, c-format
-msgid "patch fragment without header at line %d: %.*s"
+msgid "BOM is required in '%s' if encoded as %s"
 msgstr ""
 
-#: builtin/apply.c:1496
+#: convert.c:307
 #, c-format
 msgid ""
-"git diff header lacks filename information when removing %d leading pathname "
-"component (line %d)"
-msgid_plural ""
-"git diff header lacks filename information when removing %d leading pathname "
-"components (line %d)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/apply.c:1656
-msgid "new file depends on old contents"
+"The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-"
+"%sLE (depending on the byte order) as working-tree-encoding."
 msgstr ""
 
-#: builtin/apply.c:1658
-msgid "deleted file still has contents"
+#: convert.c:425 convert.c:496
+#, c-format
+msgid "failed to encode '%s' from %s to %s"
 msgstr ""
 
-#: builtin/apply.c:1684
+#: convert.c:468
 #, c-format
-msgid "corrupt patch at line %d"
+msgid "encoding '%s' from %s to %s and back is not the same"
 msgstr ""
 
-#: builtin/apply.c:1720
+#: convert.c:674
 #, c-format
-msgid "new file %s depends on old contents"
+msgid "cannot fork to run external filter '%s'"
 msgstr ""
 
-#: builtin/apply.c:1722
+#: convert.c:694
 #, c-format
-msgid "deleted file %s still has contents"
+msgid "cannot feed the input to external filter '%s'"
 msgstr ""
 
-#: builtin/apply.c:1725
+#: convert.c:701
 #, c-format
-msgid "** warning: file %s becomes empty but is not deleted"
+msgid "external filter '%s' failed %d"
 msgstr ""
 
-#: builtin/apply.c:1871
+#: convert.c:736 convert.c:739
 #, c-format
-msgid "corrupt binary patch at line %d: %.*s"
+msgid "read from external filter '%s' failed"
 msgstr ""
 
-#. there has to be one hunk (forward hunk)
-#: builtin/apply.c:1900
+#: convert.c:742 convert.c:796
 #, c-format
-msgid "unrecognized binary patch at line %d"
+msgid "external filter '%s' failed"
 msgstr ""
 
-#: builtin/apply.c:1986
-#, c-format
-msgid "patch with only garbage at line %d"
+#: convert.c:844
+msgid "unexpected filter type"
+msgstr ""
+
+#: convert.c:855
+msgid "path name too long for external filter"
 msgstr ""
 
-#: builtin/apply.c:2076
+#: convert.c:929
 #, c-format
-msgid "unable to read symlink %s"
+msgid ""
+"external filter '%s' is not available anymore although not all paths have "
+"been filtered"
+msgstr ""
+
+#: convert.c:1228
+msgid "true/false are no valid working-tree-encodings"
 msgstr ""
 
-#: builtin/apply.c:2080
+#: convert.c:1398 convert.c:1432
 #, c-format
-msgid "unable to open or read %s"
+msgid "%s: clean filter '%s' failed"
 msgstr ""
 
-#: builtin/apply.c:2688
+#: convert.c:1476
 #, c-format
-msgid "invalid start of line: '%c'"
+msgid "%s: smudge filter %s failed"
+msgstr ""
+
+#: date.c:116
+msgid "in the future"
 msgstr ""
 
-#: builtin/apply.c:2806
+#: date.c:122
 #, c-format
-msgid "Hunk #%d succeeded at %d (offset %d line)."
-msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
+msgid "%<PRIuMAX> second ago"
+msgid_plural "%<PRIuMAX> seconds ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: builtin/apply.c:2818
+#: date.c:129
 #, c-format
-msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
-msgstr ""
+msgid "%<PRIuMAX> minute ago"
+msgid_plural "%<PRIuMAX> minutes ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: builtin/apply.c:2824
+#: date.c:136
 #, c-format
-msgid ""
-"while searching for:\n"
-"%.*s"
-msgstr ""
+msgid "%<PRIuMAX> hour ago"
+msgid_plural "%<PRIuMAX> hours ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: builtin/apply.c:2843
+#: date.c:143
 #, c-format
-msgid "missing binary patch data for '%s'"
-msgstr ""
+msgid "%<PRIuMAX> day ago"
+msgid_plural "%<PRIuMAX> days ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: builtin/apply.c:2946
+#: date.c:149
 #, c-format
-msgid "binary patch does not apply to '%s'"
-msgstr ""
+msgid "%<PRIuMAX> week ago"
+msgid_plural "%<PRIuMAX> weeks ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: builtin/apply.c:2952
+#: date.c:156
 #, c-format
-msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
-msgstr ""
+msgid "%<PRIuMAX> month ago"
+msgid_plural "%<PRIuMAX> months ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: builtin/apply.c:2973
+#: date.c:167
 #, c-format
-msgid "patch failed: %s:%ld"
-msgstr ""
+msgid "%<PRIuMAX> year"
+msgid_plural "%<PRIuMAX> years"
+msgstr[0] ""
+msgstr[1] ""
 
-#: builtin/apply.c:3095
+#. TRANSLATORS: "%s" is "<n> years"
+#: date.c:170
 #, c-format
-msgid "cannot checkout %s"
+msgid "%s, %<PRIuMAX> month ago"
+msgid_plural "%s, %<PRIuMAX> months ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: date.c:175 date.c:180
+#, c-format
+msgid "%<PRIuMAX> year ago"
+msgid_plural "%<PRIuMAX> years ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: delta-islands.c:268
+msgid "Propagating island marks"
 msgstr ""
 
-#: builtin/apply.c:3140 builtin/apply.c:3149 builtin/apply.c:3194
+#: delta-islands.c:286
 #, c-format
-msgid "read of %s failed"
+msgid "bad tree object %s"
 msgstr ""
 
-#: builtin/apply.c:3174 builtin/apply.c:3396
+#: delta-islands.c:330
 #, c-format
-msgid "path %s has been renamed/deleted"
+msgid "failed to load island regex for '%s': %s"
 msgstr ""
 
-#: builtin/apply.c:3255 builtin/apply.c:3410
+#: delta-islands.c:386
 #, c-format
-msgid "%s: does not exist in index"
+msgid "island regex from config has too many capture groups (max=%d)"
 msgstr ""
 
-#: builtin/apply.c:3259 builtin/apply.c:3402 builtin/apply.c:3424
+#: delta-islands.c:462
 #, c-format
-msgid "%s: %s"
+msgid "Marked %d islands, done.\n"
 msgstr ""
 
-#: builtin/apply.c:3264 builtin/apply.c:3418
+#: diffcore-order.c:24
 #, c-format
-msgid "%s: does not match index"
+msgid "failed to read orderfile '%s'"
 msgstr ""
 
-#: builtin/apply.c:3366
-msgid "removal patch leaves file contents"
+#: diffcore-rename.c:544
+msgid "Performing inexact rename detection"
 msgstr ""
 
-#: builtin/apply.c:3435
+#: diff.c:108
 #, c-format
-msgid "%s: wrong type"
+msgid "option '%s' requires a value"
 msgstr ""
 
-#: builtin/apply.c:3437
+#: diff.c:158
 #, c-format
-msgid "%s has type %o, expected %o"
+msgid "  Failed to parse dirstat cut-off percentage '%s'\n"
 msgstr ""
 
-#: builtin/apply.c:3538
+#: diff.c:163
 #, c-format
-msgid "%s: already exists in index"
+msgid "  Unknown dirstat parameter '%s'\n"
 msgstr ""
 
-#: builtin/apply.c:3541
+#: diff.c:291
+msgid ""
+"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
+"'dimmed-zebra', 'plain'"
+msgstr ""
+
+#: diff.c:316
 #, c-format
-msgid "%s: already exists in working directory"
+msgid "ignoring unknown color-moved-ws mode '%s'"
 msgstr ""
 
-#: builtin/apply.c:3561
+#: diff.c:323
+msgid ""
+"color-moved-ws: allow-indentation-change cannot be combined with other white "
+"space modes"
+msgstr ""
+
+#: diff.c:394
 #, c-format
-msgid "new mode (%o) of %s does not match old mode (%o)"
+msgid "Unknown value for 'diff.submodule' config variable: '%s'"
 msgstr ""
 
-#: builtin/apply.c:3566
+#: diff.c:454
 #, c-format
-msgid "new mode (%o) of %s does not match old mode (%o) of %s"
+msgid ""
+"Found errors in 'diff.dirstat' config variable:\n"
+"%s"
 msgstr ""
 
-#: builtin/apply.c:3574
+#: diff.c:4140
 #, c-format
-msgid "%s: patch does not apply"
+msgid "external diff died, stopping at %s"
+msgstr ""
+
+#: diff.c:4482
+msgid "--name-only, --name-status, --check and -s are mutually exclusive"
 msgstr ""
 
-#: builtin/apply.c:3587
+#: diff.c:4485
+msgid "-G, -S and --find-object are mutually exclusive"
+msgstr ""
+
+#: diff.c:4563
+msgid "--follow requires exactly one pathspec"
+msgstr ""
+
+#: diff.c:4729
 #, c-format
-msgid "Checking patch %s..."
+msgid ""
+"Failed to parse --dirstat/-X option parameter:\n"
+"%s"
 msgstr ""
 
-#: builtin/apply.c:3680 builtin/checkout.c:216 builtin/reset.c:127
+#: diff.c:4743
 #, c-format
-msgid "make_cache_entry failed for path '%s'"
+msgid "Failed to parse --submodule option parameter: '%s'"
+msgstr ""
+
+#: diff.c:5823
+msgid "inexact rename detection was skipped due to too many files."
 msgstr ""
 
-#: builtin/apply.c:3823
+#: diff.c:5826
+msgid "only found copies from modified paths due to too many files."
+msgstr ""
+
+#: diff.c:5829
 #, c-format
-msgid "unable to remove %s from index"
+msgid ""
+"you may want to set your %s variable to at least %d and retry the command."
 msgstr ""
 
-#: builtin/apply.c:3851
+#: dir.c:576
 #, c-format
-msgid "corrupt patch for submodule %s"
+msgid "pathspec '%s' did not match any file(s) known to git"
 msgstr ""
 
-#: builtin/apply.c:3855
+#: dir.c:965
 #, c-format
-msgid "unable to stat newly created file '%s'"
+msgid "cannot use %s as an exclude file"
 msgstr ""
 
-#: builtin/apply.c:3860
+#: dir.c:1880
 #, c-format
-msgid "unable to create backing store for newly created file %s"
+msgid "could not open directory '%s'"
+msgstr ""
+
+#: dir.c:2122
+msgid "failed to get kernel name and information"
+msgstr ""
+
+#: dir.c:2246
+msgid "untracked cache is disabled on this system or location"
 msgstr ""
 
-#: builtin/apply.c:3863 builtin/apply.c:3971
+#: dir.c:3047
 #, c-format
-msgid "unable to add cache entry for %s"
+msgid "index file corrupt in repo %s"
 msgstr ""
 
-#: builtin/apply.c:3896
+#: dir.c:3092 dir.c:3097
 #, c-format
-msgid "closing file '%s'"
+msgid "could not create directories for %s"
 msgstr ""
 
-#: builtin/apply.c:3945
+#: dir.c:3126
 #, c-format
-msgid "unable to write file '%s' mode %o"
+msgid "could not migrate git directory from '%s' to '%s'"
 msgstr ""
 
-#: builtin/apply.c:4032
+#: editor.c:73
 #, c-format
-msgid "Applied patch %s cleanly."
+msgid "hint: Waiting for your editor to close the file...%c"
 msgstr ""
 
-#: builtin/apply.c:4040
-msgid "internal error"
+#: entry.c:178
+msgid "Filtering content"
 msgstr ""
 
-#. Say this even without --verbose
-#: builtin/apply.c:4043
+#: entry.c:465
 #, c-format
-msgid "Applying patch %%s with %d reject..."
-msgid_plural "Applying patch %%s with %d rejects..."
-msgstr[0] ""
-msgstr[1] ""
+msgid "could not stat file '%s'"
+msgstr ""
 
-#: builtin/apply.c:4053
+#: environment.c:150
 #, c-format
-msgid "truncating .rej filename to %.*s.rej"
+msgid "bad git namespace path \"%s\""
 msgstr ""
 
-#: builtin/apply.c:4074
+#: environment.c:332
 #, c-format
-msgid "Hunk #%d applied cleanly."
+msgid "could not set GIT_DIR to '%s'"
 msgstr ""
 
-#: builtin/apply.c:4077
+#: exec-cmd.c:361
 #, c-format
-msgid "Rejected hunk #%d."
+msgid "too many args to run %s"
 msgstr ""
 
-#: builtin/apply.c:4227
-msgid "unrecognized input"
+#: fetch-object.c:17
+msgid "Remote with no URL"
 msgstr ""
 
-#: builtin/apply.c:4238
-msgid "unable to read index file"
+#: fetch-pack.c:151
+msgid "git fetch-pack: expected shallow list"
 msgstr ""
 
-#: builtin/apply.c:4357 builtin/apply.c:4360 builtin/clone.c:91
-#: builtin/fetch.c:63
-msgid "path"
+#: fetch-pack.c:163
+msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
 msgstr ""
 
-#: builtin/apply.c:4358
-msgid "don't apply changes matching the given path"
+#: fetch-pack.c:183
+#, c-format
+msgid "git fetch-pack: expected ACK/NAK, got '%s'"
 msgstr ""
 
-#: builtin/apply.c:4361
-msgid "apply changes matching the given path"
+#: fetch-pack.c:253
+msgid "--stateless-rpc requires multi_ack_detailed"
 msgstr ""
 
-#: builtin/apply.c:4363
-msgid "num"
+#: fetch-pack.c:347 fetch-pack.c:1277
+#, c-format
+msgid "invalid shallow line: %s"
 msgstr ""
 
-#: builtin/apply.c:4364
-msgid "remove <num> leading slashes from traditional diff paths"
+#: fetch-pack.c:353 fetch-pack.c:1283
+#, c-format
+msgid "invalid unshallow line: %s"
 msgstr ""
 
-#: builtin/apply.c:4367
-msgid "ignore additions made by the patch"
+#: fetch-pack.c:355 fetch-pack.c:1285
+#, c-format
+msgid "object not found: %s"
 msgstr ""
 
-#: builtin/apply.c:4369
-msgid "instead of applying the patch, output diffstat for the input"
+#: fetch-pack.c:358 fetch-pack.c:1288
+#, c-format
+msgid "error in object: %s"
 msgstr ""
 
-#: builtin/apply.c:4373
-msgid "show number of added and deleted lines in decimal notation"
+#: fetch-pack.c:360 fetch-pack.c:1290
+#, c-format
+msgid "no shallow found: %s"
 msgstr ""
 
-#: builtin/apply.c:4375
-msgid "instead of applying the patch, output a summary for the input"
+#: fetch-pack.c:363 fetch-pack.c:1293
+#, c-format
+msgid "expected shallow/unshallow, got %s"
 msgstr ""
 
-#: builtin/apply.c:4377
-msgid "instead of applying the patch, see if the patch is applicable"
+#: fetch-pack.c:404
+#, c-format
+msgid "got %s %d %s"
 msgstr ""
 
-#: builtin/apply.c:4379
-msgid "make sure the patch is applicable to the current index"
+#: fetch-pack.c:421
+#, c-format
+msgid "invalid commit %s"
 msgstr ""
 
-#: builtin/apply.c:4381
-msgid "apply a patch without touching the working tree"
+#: fetch-pack.c:452
+msgid "giving up"
 msgstr ""
 
-#: builtin/apply.c:4383
-msgid "also apply the patch (use with --stat/--summary/--check)"
+#: fetch-pack.c:464 progress.c:229
+msgid "done"
 msgstr ""
 
-#: builtin/apply.c:4385
-msgid "attempt three-way merge if a patch does not apply"
+#: fetch-pack.c:476
+#, c-format
+msgid "got %s (%d) %s"
 msgstr ""
 
-#: builtin/apply.c:4387
-msgid "build a temporary index based on embedded index information"
+#: fetch-pack.c:522
+#, c-format
+msgid "Marking %s as complete"
 msgstr ""
 
-#: builtin/apply.c:4389 builtin/checkout-index.c:197 builtin/ls-files.c:462
-msgid "paths are separated with NUL character"
+#: fetch-pack.c:764
+#, c-format
+msgid "already have %s (%s)"
 msgstr ""
 
-#: builtin/apply.c:4392
-msgid "ensure at least <n> lines of context match"
+#: fetch-pack.c:803
+msgid "fetch-pack: unable to fork off sideband demultiplexer"
 msgstr ""
 
-#: builtin/apply.c:4393
-msgid "action"
+#: fetch-pack.c:811
+msgid "protocol error: bad pack header"
 msgstr ""
 
-#: builtin/apply.c:4394
-msgid "detect new or modified lines that have whitespace errors"
+#: fetch-pack.c:879
+#, c-format
+msgid "fetch-pack: unable to fork off %s"
 msgstr ""
 
-#: builtin/apply.c:4397 builtin/apply.c:4400
-msgid "ignore changes in whitespace when finding context"
+#: fetch-pack.c:895
+#, c-format
+msgid "%s failed"
 msgstr ""
 
-#: builtin/apply.c:4403
-msgid "apply the patch in reverse"
+#: fetch-pack.c:897
+msgid "error in sideband demultiplexer"
 msgstr ""
 
-#: builtin/apply.c:4405
-msgid "don't expect at least one line of context"
+#: fetch-pack.c:926
+msgid "Server does not support shallow clients"
 msgstr ""
 
-#: builtin/apply.c:4407
-msgid "leave the rejected hunks in corresponding *.rej files"
+#: fetch-pack.c:930
+msgid "Server supports multi_ack_detailed"
 msgstr ""
 
-#: builtin/apply.c:4409
-msgid "allow overlapping hunks"
+#: fetch-pack.c:933
+msgid "Server supports no-done"
 msgstr ""
 
-#: builtin/apply.c:4412
-msgid "tolerate incorrectly detected missing new-line at the end of file"
+#: fetch-pack.c:939
+msgid "Server supports multi_ack"
 msgstr ""
 
-#: builtin/apply.c:4415
-msgid "do not trust the line counts in the hunk headers"
+#: fetch-pack.c:943
+msgid "Server supports side-band-64k"
 msgstr ""
 
-#: builtin/apply.c:4417
-msgid "root"
+#: fetch-pack.c:947
+msgid "Server supports side-band"
 msgstr ""
 
-#: builtin/apply.c:4418
-msgid "prepend <root> to all filenames"
+#: fetch-pack.c:951
+msgid "Server supports allow-tip-sha1-in-want"
 msgstr ""
 
-#: builtin/apply.c:4440
-msgid "--3way outside a repository"
+#: fetch-pack.c:955
+msgid "Server supports allow-reachable-sha1-in-want"
 msgstr ""
 
-#: builtin/apply.c:4448
-msgid "--index outside a repository"
+#: fetch-pack.c:965
+msgid "Server supports ofs-delta"
 msgstr ""
 
-#: builtin/apply.c:4451
-msgid "--cached outside a repository"
+#: fetch-pack.c:971 fetch-pack.c:1158
+msgid "Server supports filter"
 msgstr ""
 
-#: builtin/apply.c:4467
+#: fetch-pack.c:979
 #, c-format
-msgid "can't open patch '%s'"
+msgid "Server version is %.*s"
 msgstr ""
 
-#: builtin/apply.c:4481
-#, c-format
-msgid "squelched %d whitespace error"
-msgid_plural "squelched %d whitespace errors"
-msgstr[0] ""
-msgstr[1] ""
+#: fetch-pack.c:985
+msgid "Server does not support --shallow-since"
+msgstr ""
 
-#: builtin/apply.c:4487 builtin/apply.c:4497
-#, c-format
-msgid "%d line adds whitespace errors."
-msgid_plural "%d lines add whitespace errors."
-msgstr[0] ""
-msgstr[1] ""
+#: fetch-pack.c:989
+msgid "Server does not support --shallow-exclude"
+msgstr ""
 
-#: builtin/archive.c:17
-#, c-format
-msgid "could not create archive file '%s'"
+#: fetch-pack.c:991
+msgid "Server does not support --deepen"
 msgstr ""
 
-#: builtin/archive.c:20
-msgid "could not redirect output"
+#: fetch-pack.c:1008
+msgid "no common commits"
 msgstr ""
 
-#: builtin/archive.c:37
-msgid "git archive: Remote with no URL"
+#: fetch-pack.c:1020 fetch-pack.c:1418
+msgid "git fetch-pack: fetch failed."
 msgstr ""
 
-#: builtin/archive.c:58
-msgid "git archive: expected ACK/NAK, got EOF"
+#: fetch-pack.c:1153
+msgid "Server does not support shallow requests"
 msgstr ""
 
-#: builtin/archive.c:61
+#: fetch-pack.c:1199
 #, c-format
-msgid "git archive: NACK %s"
+msgid "error reading section header '%s'"
 msgstr ""
 
-#: builtin/archive.c:63
+#: fetch-pack.c:1205
 #, c-format
-msgid "remote error: %s"
+msgid "expected '%s', received '%s'"
 msgstr ""
 
-#: builtin/archive.c:64
-msgid "git archive: protocol error"
+#: fetch-pack.c:1244
+#, c-format
+msgid "unexpected acknowledgment line: '%s'"
 msgstr ""
 
-#: builtin/archive.c:68
-msgid "git archive: expected a flush"
+#: fetch-pack.c:1249
+#, c-format
+msgid "error processing acks: %d"
 msgstr ""
 
-#: builtin/bisect--helper.c:7
-msgid "git bisect--helper --next-all [--no-checkout]"
-msgstr ""
-
-#: builtin/bisect--helper.c:17
-msgid "perform 'git bisect next'"
+#: fetch-pack.c:1259
+msgid "expected packfile to be sent after 'ready'"
 msgstr ""
 
-#: builtin/bisect--helper.c:19
-msgid "update BISECT_HEAD instead of checking out the current commit"
+#: fetch-pack.c:1261
+msgid "expected no other sections to be sent after no 'ready'"
 msgstr ""
 
-#: builtin/blame.c:26
-msgid "git blame [options] [rev-opts] [rev] [--] file"
+#: fetch-pack.c:1298
+#, c-format
+msgid "error processing shallow info: %d"
 msgstr ""
 
-#: builtin/blame.c:31
-msgid "[rev-opts] are documented in git-rev-list(1)"
+#: fetch-pack.c:1314
+#, c-format
+msgid "expected wanted-ref, got '%s'"
 msgstr ""
 
-#: builtin/blame.c:2276
-msgid "Show blame entries as we find them, incrementally"
+#: fetch-pack.c:1324
+#, c-format
+msgid "unexpected wanted-ref: '%s'"
 msgstr ""
 
-#: builtin/blame.c:2277
-msgid "Show blank SHA-1 for boundary commits (Default: off)"
+#: fetch-pack.c:1328
+#, c-format
+msgid "error processing wanted refs: %d"
 msgstr ""
 
-#: builtin/blame.c:2278
-msgid "Do not treat root commits as boundaries (Default: off)"
+#: fetch-pack.c:1642
+msgid "no matching remote head"
 msgstr ""
 
-#: builtin/blame.c:2279
-msgid "Show work cost statistics"
+#: fetch-pack.c:1660 builtin/clone.c:664
+msgid "remote did not send all necessary objects"
 msgstr ""
 
-#: builtin/blame.c:2280
-msgid "Show output score for blame entries"
+#: fetch-pack.c:1686
+#, c-format
+msgid "no such remote ref %s"
 msgstr ""
 
-#: builtin/blame.c:2281
-msgid "Show original filename (Default: auto)"
+#: fetch-pack.c:1689
+#, c-format
+msgid "Server does not allow request for unadvertised object %s"
 msgstr ""
 
-#: builtin/blame.c:2282
-msgid "Show original linenumber (Default: off)"
+#: gpg-interface.c:318
+msgid "gpg failed to sign the data"
 msgstr ""
 
-#: builtin/blame.c:2283
-msgid "Show in a format designed for machine consumption"
+#: gpg-interface.c:344
+msgid "could not create temporary file"
 msgstr ""
 
-#: builtin/blame.c:2284
-msgid "Show porcelain format with per-line commit information"
+#: gpg-interface.c:347
+#, c-format
+msgid "failed writing detached signature to '%s'"
 msgstr ""
 
-#: builtin/blame.c:2285
-msgid "Use the same output mode as git-annotate (Default: off)"
+#: graph.c:97
+#, c-format
+msgid "ignore invalid color '%.*s' in log.graphColors"
 msgstr ""
 
-#: builtin/blame.c:2286
-msgid "Show raw timestamp (Default: off)"
+#: grep.c:2113
+#, c-format
+msgid "'%s': unable to read %s"
 msgstr ""
 
-#: builtin/blame.c:2287
-msgid "Show long commit SHA1 (Default: off)"
+#: grep.c:2130 setup.c:164 builtin/clone.c:410 builtin/diff.c:81
+#: builtin/rm.c:134
+#, c-format
+msgid "failed to stat '%s'"
 msgstr ""
 
-#: builtin/blame.c:2288
-msgid "Suppress author name and timestamp (Default: off)"
+#: grep.c:2141
+#, c-format
+msgid "'%s': short read"
 msgstr ""
 
-#: builtin/blame.c:2289
-msgid "Show author email instead of name (Default: off)"
+#: help.c:23
+msgid "start a working area (see also: git help tutorial)"
 msgstr ""
 
-#: builtin/blame.c:2290
-msgid "Ignore whitespace differences"
+#: help.c:24
+msgid "work on the current change (see also: git help everyday)"
 msgstr ""
 
-#: builtin/blame.c:2291
-msgid "Spend extra cycles to find better match"
+#: help.c:25
+msgid "examine the history and state (see also: git help revisions)"
 msgstr ""
 
-#: builtin/blame.c:2292
-msgid "Use revisions from <file> instead of calling git-rev-list"
+#: help.c:26
+msgid "grow, mark and tweak your common history"
 msgstr ""
 
-#: builtin/blame.c:2293
-msgid "Use <file>'s contents as the final image"
+#: help.c:27
+msgid "collaborate (see also: git help workflows)"
 msgstr ""
 
-#: builtin/blame.c:2294 builtin/blame.c:2295
-msgid "score"
+#: help.c:31
+msgid "Main Porcelain Commands"
 msgstr ""
 
-#: builtin/blame.c:2294
-msgid "Find line copies within and across files"
+#: help.c:32
+msgid "Ancillary Commands / Manipulators"
 msgstr ""
 
-#: builtin/blame.c:2295
-msgid "Find line movements within and across files"
+#: help.c:33
+msgid "Ancillary Commands / Interrogators"
 msgstr ""
 
-#: builtin/blame.c:2296
-msgid "n,m"
+#: help.c:34
+msgid "Interacting with Others"
 msgstr ""
 
-#: builtin/blame.c:2296
-msgid "Process only line range n,m, counting from 1"
+#: help.c:35
+msgid "Low-level Commands / Manipulators"
 msgstr ""
 
-#: builtin/branch.c:24
-msgid "git branch [options] [-r | -a] [--merged | --no-merged]"
+#: help.c:36
+msgid "Low-level Commands / Interrogators"
 msgstr ""
 
-#: builtin/branch.c:25
-msgid "git branch [options] [-l] [-f] <branchname> [<start-point>]"
+#: help.c:37
+msgid "Low-level Commands / Synching Repositories"
 msgstr ""
 
-#: builtin/branch.c:26
-msgid "git branch [options] [-r] (-d | -D) <branchname>..."
+#: help.c:38
+msgid "Low-level Commands / Internal Helpers"
 msgstr ""
 
-#: builtin/branch.c:27
-msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>"
+#: help.c:296
+#, c-format
+msgid "available git commands in '%s'"
 msgstr ""
 
-#: builtin/branch.c:150
-#, c-format
-msgid ""
-"deleting branch '%s' that has been merged to\n"
-"         '%s', but not yet merged to HEAD."
+#: help.c:303
+msgid "git commands available from elsewhere on your $PATH"
 msgstr ""
 
-#: builtin/branch.c:154
-#, c-format
-msgid ""
-"not deleting branch '%s' that is not yet merged to\n"
-"         '%s', even though it is merged to HEAD."
+#: help.c:312
+msgid "These are common Git commands used in various situations:"
 msgstr ""
 
-#: builtin/branch.c:168
+#: help.c:361 git.c:90
 #, c-format
-msgid "Couldn't look up commit object for '%s'"
+msgid "unsupported command listing type '%s'"
 msgstr ""
 
-#: builtin/branch.c:172
-#, 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'."
+#: help.c:408
+msgid "The common Git guides are:"
 msgstr ""
 
-#: builtin/branch.c:185
-msgid "Update of config-file failed"
+#: help.c:517
+msgid "See 'git help <command>' to read about a specific subcommand"
 msgstr ""
 
-#: builtin/branch.c:213
-msgid "cannot use -a with -d"
+#: help.c:522
+msgid "External commands"
 msgstr ""
 
-#: builtin/branch.c:219
-msgid "Couldn't look up commit object for HEAD"
+#: help.c:530
+msgid "Command aliases"
 msgstr ""
 
-#: builtin/branch.c:227
+#: help.c:594
 #, c-format
-msgid "Cannot delete the branch '%s' which you are currently on."
+msgid ""
+"'%s' appears to be a git command, but we were not\n"
+"able to execute it. Maybe git-%s is broken?"
 msgstr ""
 
-#: builtin/branch.c:240
-#, c-format
-msgid "remote branch '%s' not found."
+#: help.c:653
+msgid "Uh oh. Your system reports no Git commands at all."
 msgstr ""
 
-#: builtin/branch.c:241
+#: help.c:675
 #, c-format
-msgid "branch '%s' not found."
+msgid "WARNING: You called a Git command named '%s', which does not exist."
 msgstr ""
 
-#: builtin/branch.c:255
+#: help.c:680
 #, c-format
-msgid "Error deleting remote branch '%s'"
+msgid "Continuing under the assumption that you meant '%s'."
 msgstr ""
 
-#: builtin/branch.c:256
+#: help.c:685
 #, c-format
-msgid "Error deleting branch '%s'"
+msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
 msgstr ""
 
-#: builtin/branch.c:263
+#: help.c:693
 #, c-format
-msgid "Deleted remote branch %s (was %s).\n"
+msgid "git: '%s' is not a git command. See 'git --help'."
 msgstr ""
 
-#: builtin/branch.c:264
-#, c-format
-msgid "Deleted branch %s (was %s).\n"
+#: help.c:697
+msgid ""
+"\n"
+"The most similar command is"
+msgid_plural ""
+"\n"
+"The most similar commands are"
+msgstr[0] ""
+msgstr[1] ""
+
+#: help.c:712
+msgid "git version [<options>]"
 msgstr ""
 
-#: builtin/branch.c:366
+#: help.c:780
 #, c-format
-msgid "branch '%s' does not point at a commit"
+msgid "%s: %s - %s"
 msgstr ""
 
-#: builtin/branch.c:453
-#, c-format
-msgid "[%s: behind %d]"
+#: help.c:784
+msgid ""
+"\n"
+"Did you mean this?"
+msgid_plural ""
+"\n"
+"Did you mean one of these?"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ident.c:345
+msgid ""
+"\n"
+"*** Please tell me who you are.\n"
+"\n"
+"Run\n"
+"\n"
+"  git config --global user.email \"you@example.com\"\n"
+"  git config --global user.name \"Your Name\"\n"
+"\n"
+"to set your account's default identity.\n"
+"Omit --global to set the identity only in this repository.\n"
+"\n"
 msgstr ""
 
-#: builtin/branch.c:455
-#, c-format
-msgid "[behind %d]"
+#: ident.c:369
+msgid "no email was given and auto-detection is disabled"
 msgstr ""
 
-#: builtin/branch.c:459
+#: ident.c:374
 #, c-format
-msgid "[%s: ahead %d]"
+msgid "unable to auto-detect email address (got '%s')"
 msgstr ""
 
-#: builtin/branch.c:461
-#, c-format
-msgid "[ahead %d]"
+#: ident.c:384
+msgid "no name was given and auto-detection is disabled"
 msgstr ""
 
-#: builtin/branch.c:464
+#: ident.c:390
 #, c-format
-msgid "[%s: ahead %d, behind %d]"
+msgid "unable to auto-detect name (got '%s')"
 msgstr ""
 
-#: builtin/branch.c:467
+#: ident.c:398
 #, c-format
-msgid "[ahead %d, behind %d]"
+msgid "empty ident name (for <%s>) not allowed"
 msgstr ""
 
-#: builtin/branch.c:490
-msgid " **** invalid ref ****"
+#: ident.c:404
+#, c-format
+msgid "name consists only of disallowed characters: %s"
 msgstr ""
 
-#: builtin/branch.c:582
+#: ident.c:419 builtin/commit.c:606
 #, c-format
-msgid "(no branch, rebasing %s)"
+msgid "invalid date format: %s"
 msgstr ""
 
-#: builtin/branch.c:585
-#, c-format
-msgid "(no branch, bisect started on %s)"
+#: list-objects-filter-options.c:35
+msgid "multiple filter-specs cannot be combined"
 msgstr ""
 
-#: builtin/branch.c:588
-#, c-format
-msgid "(detached from %s)"
+#: list-objects-filter-options.c:58
+msgid "only 'tree:0' is supported"
 msgstr ""
 
-#: builtin/branch.c:591
-msgid "(no branch)"
+#: list-objects-filter-options.c:137
+msgid "cannot change partial clone promisor remote"
 msgstr ""
 
-#: builtin/branch.c:637
+#: lockfile.c:151
 #, c-format
-msgid "object '%s' does not point to a commit"
+msgid ""
+"Unable to create '%s.lock': %s.\n"
+"\n"
+"Another git process seems to be running in this repository, e.g.\n"
+"an editor opened by 'git commit'. Please make sure all processes\n"
+"are terminated then try again. If it still fails, a git process\n"
+"may have crashed in this repository earlier:\n"
+"remove the file manually to continue."
 msgstr ""
 
-#: builtin/branch.c:669
-msgid "some refs could not be read"
+#: lockfile.c:159
+#, c-format
+msgid "Unable to create '%s.lock': %s"
 msgstr ""
 
-#: builtin/branch.c:682
-msgid "cannot rename the current branch while not on any."
+#: merge.c:41
+msgid "failed to read the cache"
 msgstr ""
 
-#: builtin/branch.c:692
-#, c-format
-msgid "Invalid branch name: '%s'"
+#: merge.c:107 rerere.c:720 builtin/am.c:1899 builtin/am.c:1933
+#: builtin/checkout.c:387 builtin/checkout.c:708 builtin/clone.c:764
+msgid "unable to write new index file"
 msgstr ""
 
-#: builtin/branch.c:707
-msgid "Branch rename failed"
+#: merge-recursive.c:323
+msgid "(bad commit)\n"
 msgstr ""
 
-#: builtin/branch.c:711
+#: merge-recursive.c:345
 #, c-format
-msgid "Renamed a misnamed branch '%s' away"
+msgid "add_cacheinfo failed for path '%s'; merge aborting."
 msgstr ""
 
-#: builtin/branch.c:715
+#: merge-recursive.c:353
 #, c-format
-msgid "Branch renamed to %s, but HEAD is not updated!"
+msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
 msgstr ""
 
-#: builtin/branch.c:722
-msgid "Branch is renamed, but update of config-file failed"
+#: merge-recursive.c:435
+msgid "error building trees"
 msgstr ""
 
-#: builtin/branch.c:737
+#: merge-recursive.c:906
 #, c-format
-msgid "malformed object name %s"
+msgid "failed to create path '%s'%s"
 msgstr ""
 
-#: builtin/branch.c:761
+#: merge-recursive.c:917
 #, c-format
-msgid "could not write branch description template: %s"
+msgid "Removing %s to make room for subdirectory\n"
 msgstr ""
 
-#: builtin/branch.c:791
-msgid "Generic options"
+#: merge-recursive.c:931 merge-recursive.c:950
+msgid ": perhaps a D/F conflict?"
 msgstr ""
 
-#: builtin/branch.c:793
-msgid "show hash and subject, give twice for upstream branch"
+#: merge-recursive.c:940
+#, c-format
+msgid "refusing to lose untracked file at '%s'"
 msgstr ""
 
-#: builtin/branch.c:794
-msgid "suppress informational messages"
+#: merge-recursive.c:982 builtin/cat-file.c:39
+#, c-format
+msgid "cannot read object %s '%s'"
 msgstr ""
 
-#: builtin/branch.c:795
-msgid "set up tracking mode (see git-pull(1))"
+#: merge-recursive.c:984
+#, c-format
+msgid "blob expected for %s '%s'"
 msgstr ""
 
-#: builtin/branch.c:797
-msgid "change upstream info"
+#: merge-recursive.c:1008
+#, c-format
+msgid "failed to open '%s': %s"
 msgstr ""
 
-#: builtin/branch.c:801
-msgid "use colored output"
+#: merge-recursive.c:1019
+#, c-format
+msgid "failed to symlink '%s': %s"
 msgstr ""
 
-#: builtin/branch.c:802
-msgid "act on remote-tracking branches"
+#: merge-recursive.c:1024
+#, c-format
+msgid "do not know what to do with %06o %s '%s'"
 msgstr ""
 
-#: builtin/branch.c:805 builtin/branch.c:811 builtin/branch.c:832
-#: builtin/branch.c:838 builtin/commit.c:1433 builtin/commit.c:1434
-#: builtin/commit.c:1435 builtin/commit.c:1436 builtin/tag.c:468
-msgid "commit"
+#: merge-recursive.c:1212
+#, c-format
+msgid "Failed to merge submodule %s (not checked out)"
 msgstr ""
 
-#: builtin/branch.c:806 builtin/branch.c:812
-msgid "print only branches that contain the commit"
+#: merge-recursive.c:1219
+#, c-format
+msgid "Failed to merge submodule %s (commits not present)"
 msgstr ""
 
-#: builtin/branch.c:818
-msgid "Specific git-branch actions:"
+#: merge-recursive.c:1226
+#, c-format
+msgid "Failed to merge submodule %s (commits don't follow merge-base)"
 msgstr ""
 
-#: builtin/branch.c:819
-msgid "list both remote-tracking and local branches"
+#: merge-recursive.c:1234 merge-recursive.c:1246
+#, c-format
+msgid "Fast-forwarding submodule %s to the following commit:"
 msgstr ""
 
-#: builtin/branch.c:821
-msgid "delete fully merged branch"
+#: merge-recursive.c:1237 merge-recursive.c:1249
+#, c-format
+msgid "Fast-forwarding submodule %s"
 msgstr ""
 
-#: builtin/branch.c:822
-msgid "delete branch (even if not merged)"
+#: merge-recursive.c:1271
+#, c-format
+msgid "Failed to merge submodule %s (merge following commits not found)"
 msgstr ""
 
-#: builtin/branch.c:823
-msgid "move/rename a branch and its reflog"
+#: merge-recursive.c:1275
+#, c-format
+msgid "Failed to merge submodule %s (not fast-forward)"
 msgstr ""
 
-#: builtin/branch.c:824
-msgid "move/rename a branch, even if target exists"
+#: merge-recursive.c:1276
+msgid "Found a possible merge resolution for the submodule:\n"
 msgstr ""
 
-#: builtin/branch.c:825
-msgid "list branch names"
+#: merge-recursive.c:1279
+#, c-format
+msgid ""
+"If this is correct simply add it to the index for example\n"
+"by using:\n"
+"\n"
+"  git update-index --cacheinfo 160000 %s \"%s\"\n"
+"\n"
+"which will accept this suggestion.\n"
 msgstr ""
 
-#: builtin/branch.c:826
-msgid "create the branch's reflog"
+#: merge-recursive.c:1288
+#, c-format
+msgid "Failed to merge submodule %s (multiple merges found)"
 msgstr ""
 
-#: builtin/branch.c:828
-msgid "edit the description for the branch"
+#: merge-recursive.c:1358
+msgid "Failed to execute internal merge"
 msgstr ""
 
-#: builtin/branch.c:829
-msgid "force creation (when already exists)"
+#: merge-recursive.c:1363
+#, c-format
+msgid "Unable to add %s to database"
 msgstr ""
 
-#: builtin/branch.c:832
-msgid "print only not merged branches"
+#: merge-recursive.c:1395
+#, c-format
+msgid "Auto-merging %s"
 msgstr ""
 
-#: builtin/branch.c:838
-msgid "print only merged branches"
+#: merge-recursive.c:1416
+#, c-format
+msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
 msgstr ""
 
-#: builtin/branch.c:842
-msgid "list branches in columns"
+#: merge-recursive.c:1483
+#, c-format
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
+"in tree."
 msgstr ""
 
-#: builtin/branch.c:855
-msgid "Failed to resolve HEAD as a valid ref."
+#: merge-recursive.c:1488
+#, c-format
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
+"left in tree."
 msgstr ""
 
-#: builtin/branch.c:860 builtin/clone.c:630
-msgid "HEAD not found below refs/heads!"
+#: merge-recursive.c:1495
+#, c-format
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
+"in tree at %s."
 msgstr ""
 
-#: builtin/branch.c:883
-msgid "--column and --verbose are incompatible"
+#: merge-recursive.c:1500
+#, c-format
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
+"left in tree at %s."
 msgstr ""
 
-#: builtin/branch.c:889 builtin/branch.c:928
-msgid "branch name required"
+#: merge-recursive.c:1534
+msgid "rename"
 msgstr ""
 
-#: builtin/branch.c:904
-msgid "Cannot give description to detached HEAD"
+#: merge-recursive.c:1534
+msgid "renamed"
 msgstr ""
 
-#: builtin/branch.c:909
-msgid "cannot edit description of more than one branch"
+#: merge-recursive.c:1588 merge-recursive.c:1737 merge-recursive.c:2369
+#: merge-recursive.c:3124
+#, c-format
+msgid "Refusing to lose dirty file at %s"
 msgstr ""
 
-#: builtin/branch.c:916
+#: merge-recursive.c:1602
 #, c-format
-msgid "No commit on branch '%s' yet."
+msgid "%s is a directory in %s adding as %s instead"
 msgstr ""
 
-#: builtin/branch.c:919
+#: merge-recursive.c:1607
 #, c-format
-msgid "No branch named '%s'."
+msgid "Refusing to lose untracked file at %s; adding as %s instead"
 msgstr ""
 
-#: builtin/branch.c:934
-msgid "too many branches for a rename operation"
+#: merge-recursive.c:1633
+#, c-format
+msgid ""
+"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
+"\"->\"%s\" in \"%s\"%s"
 msgstr ""
 
-#: builtin/branch.c:939
-msgid "too many branches to set new upstream"
+#: merge-recursive.c:1638
+msgid " (left unresolved)"
 msgstr ""
 
-#: builtin/branch.c:943
+#: merge-recursive.c:1699
 #, c-format
-msgid ""
-"could not set upstream of HEAD to %s when it does not point to any branch."
+msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
 msgstr ""
 
-#: builtin/branch.c:946 builtin/branch.c:968 builtin/branch.c:990
+#: merge-recursive.c:1734
 #, c-format
-msgid "no such branch '%s'"
+msgid "Renaming %s to %s and %s to %s instead"
 msgstr ""
 
-#: builtin/branch.c:950
+#: merge-recursive.c:1746
 #, c-format
-msgid "branch '%s' does not exist"
-msgstr ""
-
-#: builtin/branch.c:962
-msgid "too many branches to unset upstream"
+msgid "Refusing to lose untracked file at %s, even though it's in the way."
 msgstr ""
 
-#: builtin/branch.c:966
-msgid "could not unset upstream of HEAD when it does not point to any branch."
+#: merge-recursive.c:1952
+#, c-format
+msgid ""
+"CONFLICT (directory rename split): Unclear where to place %s because "
+"directory %s was renamed to multiple other directories, with no destination "
+"getting a majority of the files."
 msgstr ""
 
-#: builtin/branch.c:972
+#: merge-recursive.c:1984
 #, c-format
-msgid "Branch '%s' has no upstream information"
+msgid ""
+"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
+"implicit directory rename(s) putting the following path(s) there: %s."
 msgstr ""
 
-#: builtin/branch.c:987
-msgid "it does not make sense to create 'HEAD' manually"
+#: merge-recursive.c:1994
+#, c-format
+msgid ""
+"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
+"implicit directory renames tried to put these paths there: %s"
 msgstr ""
 
-#: builtin/branch.c:993
-msgid "-a and -r options to 'git branch' do not make sense with a branch name"
+#: merge-recursive.c:2086
+#, c-format
+msgid ""
+"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
+">%s in %s"
 msgstr ""
 
-#: builtin/branch.c:996
+#: merge-recursive.c:2331
 #, c-format
 msgid ""
-"The --set-upstream flag is deprecated and will be removed. Consider using --"
-"track or --set-upstream-to\n"
+"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
+"renamed."
 msgstr ""
 
-#: builtin/branch.c:1013
+#: merge-recursive.c:2737
 #, c-format
-msgid ""
-"\n"
-"If you wanted to make '%s' track '%s', do this:\n"
-"\n"
+msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
 msgstr ""
 
-#: builtin/branch.c:1014
+#: merge-recursive.c:2763
 #, c-format
-msgid "    git branch -d %s\n"
+msgid "Adding merged %s"
 msgstr ""
 
-#: builtin/branch.c:1015
+#: merge-recursive.c:2770 merge-recursive.c:3127
 #, c-format
-msgid "    git branch --set-upstream-to %s\n"
+msgid "Adding as %s instead"
 msgstr ""
 
-#: builtin/bundle.c:47
+#: merge-recursive.c:2934
 #, c-format
-msgid "%s is okay\n"
+msgid "cannot read object %s"
 msgstr ""
 
-#: builtin/bundle.c:56
-msgid "Need a repository to create a bundle."
+#: merge-recursive.c:2937
+#, c-format
+msgid "object %s is not a blob"
 msgstr ""
 
-#: builtin/bundle.c:60
-msgid "Need a repository to unbundle."
+#: merge-recursive.c:3006
+msgid "modify"
 msgstr ""
 
-#: builtin/cat-file.c:285
-msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>"
+#: merge-recursive.c:3006
+msgid "modified"
 msgstr ""
 
-#: builtin/cat-file.c:286
-msgid "git cat-file (--batch|--batch-check) < <list_of_objects>"
+#: merge-recursive.c:3017
+msgid "content"
 msgstr ""
 
-#: builtin/cat-file.c:323
-msgid "<type> can be one of: blob, tree, commit, tag"
+#: merge-recursive.c:3024
+msgid "add/add"
 msgstr ""
 
-#: builtin/cat-file.c:324
-msgid "show object type"
+#: merge-recursive.c:3071
+#, c-format
+msgid "Skipped %s (merged same as existing)"
 msgstr ""
 
-#: builtin/cat-file.c:325
-msgid "show object size"
+#: merge-recursive.c:3093 git-submodule.sh:858
+msgid "submodule"
 msgstr ""
 
-#: builtin/cat-file.c:327
-msgid "exit with zero when there's no error"
+#: merge-recursive.c:3094
+#, c-format
+msgid "CONFLICT (%s): Merge conflict in %s"
 msgstr ""
 
-#: builtin/cat-file.c:328
-msgid "pretty-print object's content"
+#: merge-recursive.c:3216
+#, c-format
+msgid "Removing %s"
 msgstr ""
 
-#: builtin/cat-file.c:330
-msgid "for blob objects, run textconv on object's content"
+#: merge-recursive.c:3242
+msgid "file/directory"
 msgstr ""
 
-#: builtin/cat-file.c:332
-msgid "show info and content of objects fed from the standard input"
+#: merge-recursive.c:3248
+msgid "directory/file"
 msgstr ""
 
-#: builtin/cat-file.c:335
-msgid "show info about objects fed from the standard input"
+#: merge-recursive.c:3255
+#, c-format
+msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
 msgstr ""
 
-#: builtin/check-attr.c:11
-msgid "git check-attr [-a | --all | attr...] [--] pathname..."
+#: merge-recursive.c:3264
+#, c-format
+msgid "Adding %s"
 msgstr ""
 
-#: builtin/check-attr.c:12
-msgid "git check-attr --stdin [-z] [-a | --all | attr...] < <list-of-paths>"
+#: merge-recursive.c:3300
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"  %s"
 msgstr ""
 
-#: builtin/check-attr.c:19
-msgid "report all attributes set on file"
+#: merge-recursive.c:3311
+msgid "Already up to date!"
 msgstr ""
 
-#: builtin/check-attr.c:20
-msgid "use .gitattributes only from the index"
+#: merge-recursive.c:3320
+#, c-format
+msgid "merging of trees %s and %s failed"
 msgstr ""
 
-#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:75
-msgid "read file names from stdin"
+#: merge-recursive.c:3419
+msgid "Merging:"
 msgstr ""
 
-#: builtin/check-attr.c:23 builtin/check-ignore.c:24
-msgid "input paths are terminated by a null character"
+#: merge-recursive.c:3432
+#, c-format
+msgid "found %u common ancestor:"
+msgid_plural "found %u common ancestors:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: merge-recursive.c:3471
+msgid "merge returned no commit"
 msgstr ""
 
-#: builtin/check-ignore.c:18 builtin/checkout.c:1054 builtin/gc.c:177
-msgid "suppress progress reporting"
+#: merge-recursive.c:3537
+#, c-format
+msgid "Could not parse object '%s'"
 msgstr ""
 
-#: builtin/check-ignore.c:26
-msgid "show non-matching input paths"
+#: merge-recursive.c:3553 builtin/merge.c:691 builtin/merge.c:849
+msgid "Unable to write index."
 msgstr ""
 
-#: builtin/check-ignore.c:143
-msgid "cannot specify pathnames with --stdin"
+#: midx.c:65
+#, c-format
+msgid "multi-pack-index file %s is too small"
 msgstr ""
 
-#: builtin/check-ignore.c:146
-msgid "-z only makes sense with --stdin"
+#: midx.c:81
+#, c-format
+msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
 msgstr ""
 
-#: builtin/check-ignore.c:148
-msgid "no path specified"
+#: midx.c:86
+#, c-format
+msgid "multi-pack-index version %d not recognized"
 msgstr ""
 
-#: builtin/check-ignore.c:152
-msgid "--quiet is only valid with a single pathname"
+#: midx.c:91
+#, c-format
+msgid "hash version %u does not match"
 msgstr ""
 
-#: builtin/check-ignore.c:154
-msgid "cannot have both --quiet and --verbose"
+#: midx.c:105
+msgid "invalid chunk offset (too large)"
 msgstr ""
 
-#: builtin/check-ignore.c:157
-msgid "--non-matching is only valid with --verbose"
+#: midx.c:129
+msgid "terminating multi-pack-index chunk id appears earlier than expected"
 msgstr ""
 
-#: builtin/check-mailmap.c:8
-msgid "git check-mailmap [options] <contact>..."
+#: midx.c:142
+msgid "multi-pack-index missing required pack-name chunk"
 msgstr ""
 
-#: builtin/check-mailmap.c:13
-msgid "also read contacts from stdin"
+#: midx.c:144
+msgid "multi-pack-index missing required OID fanout chunk"
 msgstr ""
 
-#: builtin/check-mailmap.c:24
-#, c-format
-msgid "unable to parse contact: %s"
+#: midx.c:146
+msgid "multi-pack-index missing required OID lookup chunk"
 msgstr ""
 
-#: builtin/check-mailmap.c:47
-msgid "no contacts specified"
+#: midx.c:148
+msgid "multi-pack-index missing required object offsets chunk"
 msgstr ""
 
-#: builtin/checkout-index.c:126
-msgid "git checkout-index [options] [--] [<file>...]"
+#: midx.c:162
+#, c-format
+msgid "multi-pack-index pack names out of order: '%s' before '%s'"
 msgstr ""
 
-#: builtin/checkout-index.c:187
-msgid "check out all files in the index"
+#: midx.c:205
+#, c-format
+msgid "bad pack-int-id: %u (%u total packs)"
 msgstr ""
 
-#: builtin/checkout-index.c:188
-msgid "force overwrite of existing files"
+#: midx.c:246
+msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
 msgstr ""
 
-#: builtin/checkout-index.c:190
-msgid "no warning for existing files and files not in index"
+#: midx.c:271
+msgid "error preparing packfile from multi-pack-index"
 msgstr ""
 
-#: builtin/checkout-index.c:192
-msgid "don't checkout new files"
+#: midx.c:407
+#, c-format
+msgid "failed to add packfile '%s'"
 msgstr ""
 
-#: builtin/checkout-index.c:194
-msgid "update stat information in the index file"
+#: midx.c:413
+#, c-format
+msgid "failed to open pack-index '%s'"
 msgstr ""
 
-#: builtin/checkout-index.c:200
-msgid "read list of paths from the standard input"
+#: midx.c:507
+#, c-format
+msgid "failed to locate object %d in packfile"
 msgstr ""
 
-#: builtin/checkout-index.c:202
-msgid "write the content to temporary files"
+#: midx.c:943
+#, c-format
+msgid "failed to clear multi-pack-index at %s"
 msgstr ""
 
-#: builtin/checkout-index.c:203 builtin/column.c:30
-msgid "string"
+#: midx.c:981
+#, c-format
+msgid ""
+"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
 msgstr ""
 
-#: builtin/checkout-index.c:204
-msgid "when creating files, prepend <string>"
+#: midx.c:992
+#, c-format
+msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
 msgstr ""
 
-#: builtin/checkout-index.c:207
-msgid "copy out the files from named stage"
+#: midx.c:996
+msgid "Verifying object offsets"
 msgstr ""
 
-#: builtin/checkout.c:25
-msgid "git checkout [options] <branch>"
+#: midx.c:1004
+#, c-format
+msgid "failed to load pack entry for oid[%d] = %s"
 msgstr ""
 
-#: builtin/checkout.c:26
-msgid "git checkout [options] [<branch>] -- <file>..."
+#: midx.c:1010
+#, c-format
+msgid "failed to load pack-index for packfile %s"
 msgstr ""
 
-#: builtin/checkout.c:117 builtin/checkout.c:150
+#: midx.c:1019
 #, c-format
-msgid "path '%s' does not have our version"
+msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
 msgstr ""
 
-#: builtin/checkout.c:119 builtin/checkout.c:152
+#: name-hash.c:532
 #, c-format
-msgid "path '%s' does not have their version"
+msgid "unable to create lazy_dir thread: %s"
 msgstr ""
 
-#: builtin/checkout.c:135
+#: name-hash.c:554
 #, c-format
-msgid "path '%s' does not have all necessary versions"
+msgid "unable to create lazy_name thread: %s"
 msgstr ""
 
-#: builtin/checkout.c:179
+#: name-hash.c:560
 #, c-format
-msgid "path '%s' does not have necessary versions"
+msgid "unable to join lazy_name thread: %s"
 msgstr ""
 
-#: builtin/checkout.c:196
+#: notes-merge.c:275
 #, c-format
-msgid "path '%s': cannot merge"
+msgid ""
+"You have not concluded your previous notes merge (%s exists).\n"
+"Please, use 'git notes merge --commit' or 'git notes merge --abort' to "
+"commit/abort the previous merge before you start a new notes merge."
 msgstr ""
 
-#: builtin/checkout.c:213
+#: notes-merge.c:282
 #, c-format
-msgid "Unable to add merge result for '%s'"
+msgid "You have not concluded your notes merge (%s exists)."
 msgstr ""
 
-#: builtin/checkout.c:237 builtin/checkout.c:240 builtin/checkout.c:243
-#: builtin/checkout.c:246
+#: notes-utils.c:45
+msgid "Cannot commit uninitialized/unreferenced notes tree"
+msgstr ""
+
+#: notes-utils.c:104
 #, c-format
-msgid "'%s' cannot be used with updating paths"
+msgid "Bad notes.rewriteMode value: '%s'"
 msgstr ""
 
-#: builtin/checkout.c:249 builtin/checkout.c:252
+#: notes-utils.c:114
 #, c-format
-msgid "'%s' cannot be used with %s"
+msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
 msgstr ""
 
-#: builtin/checkout.c:255
+#. TRANSLATORS: The first %s is the name of
+#. the environment variable, the second %s is
+#. its value.
+#.
+#: notes-utils.c:144
 #, c-format
-msgid "Cannot update paths and switch to branch '%s' at the same time."
+msgid "Bad %s value: '%s'"
 msgstr ""
 
-#: builtin/checkout.c:266 builtin/checkout.c:458
-msgid "corrupt index file"
+#: object.c:54
+#, c-format
+msgid "invalid object type \"%s\""
 msgstr ""
 
-#: builtin/checkout.c:329 builtin/checkout.c:336
+#: object.c:173
 #, c-format
-msgid "path '%s' is unmerged"
+msgid "object %s is a %s, not a %s"
 msgstr ""
 
-#: builtin/checkout.c:480
-msgid "you need to resolve your current index first"
+#: object.c:233
+#, c-format
+msgid "object %s has unknown type id %d"
 msgstr ""
 
-#: builtin/checkout.c:601
+#: object.c:246
 #, c-format
-msgid "Can not do reflog for '%s'\n"
+msgid "unable to parse object: %s"
 msgstr ""
 
-#: builtin/checkout.c:639
-msgid "HEAD is now at"
+#: object.c:266 object.c:277
+#, c-format
+msgid "sha1 mismatch %s"
+msgstr ""
+
+#: packfile.c:607
+msgid "offset before end of packfile (broken .idx?)"
 msgstr ""
 
-#: builtin/checkout.c:646
+#: packfile.c:1864
 #, c-format
-msgid "Reset branch '%s'\n"
+msgid "offset before start of pack index for %s (corrupt index?)"
 msgstr ""
 
-#: builtin/checkout.c:649
+#: packfile.c:1868
 #, c-format
-msgid "Already on '%s'\n"
+msgid "offset beyond end of pack index for %s (truncated index?)"
+msgstr ""
+
+#: parse-options.c:672
+msgid "..."
 msgstr ""
 
-#: builtin/checkout.c:653
+#: parse-options.c:691
 #, c-format
-msgid "Switched to and reset branch '%s'\n"
+msgid "usage: %s"
 msgstr ""
 
-#: builtin/checkout.c:655 builtin/checkout.c:997
+#. TRANSLATORS: the colon here should align with the
+#. one in "usage: %s" translation.
+#.
+#: parse-options.c:697
 #, c-format
-msgid "Switched to a new branch '%s'\n"
+msgid "   or: %s"
 msgstr ""
 
-#: builtin/checkout.c:657
+#: parse-options.c:700
 #, c-format
-msgid "Switched to branch '%s'\n"
+msgid "    %s"
 msgstr ""
 
-#: builtin/checkout.c:713
+#: parse-options.c:739
+msgid "-NUM"
+msgstr ""
+
+#: parse-options-cb.c:37
 #, c-format
-msgid " ... and %d more.\n"
+msgid "malformed expiration date '%s'"
 msgstr ""
 
-#. The singular version
-#: builtin/checkout.c:719
+#: parse-options-cb.c:109
 #, c-format
-msgid ""
-"Warning: you are leaving %d commit behind, not connected to\n"
-"any of your branches:\n"
-"\n"
-"%s\n"
-msgid_plural ""
-"Warning: you are leaving %d commits behind, not connected to\n"
-"any of your branches:\n"
-"\n"
-"%s\n"
-msgstr[0] ""
-msgstr[1] ""
+msgid "malformed object name '%s'"
+msgstr ""
 
-#: builtin/checkout.c:737
+#: path.c:894
 #, c-format
-msgid ""
-"If you want to keep them by creating a new branch, this may be a good time\n"
-"to do so with:\n"
-"\n"
-" git branch new_branch_name %s\n"
-"\n"
+msgid "Could not make %s writable by group"
 msgstr ""
 
-#: builtin/checkout.c:767
-msgid "internal error in revision walk"
+#: pathspec.c:129
+msgid "Escape character '\\' not allowed as last character in attr value"
 msgstr ""
 
-#: builtin/checkout.c:771
-msgid "Previous HEAD position was"
+#: pathspec.c:147
+msgid "Only one 'attr:' specification is allowed."
 msgstr ""
 
-#: builtin/checkout.c:798 builtin/checkout.c:992
-msgid "You are on a branch yet to be born"
+#: pathspec.c:150
+msgid "attr spec must not be empty"
 msgstr ""
 
-#. case (1)
-#: builtin/checkout.c:928
+#: pathspec.c:193
 #, c-format
-msgid "invalid reference: %s"
+msgid "invalid attribute name %s"
 msgstr ""
 
-#. case (1): want a tree
-#: builtin/checkout.c:967
-#, c-format
-msgid "reference is not a tree: %s"
+#: pathspec.c:258
+msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
 msgstr ""
 
-#: builtin/checkout.c:1006
-msgid "paths cannot be used with switching branches"
+#: pathspec.c:265
+msgid ""
+"global 'literal' pathspec setting is incompatible with all other global "
+"pathspec settings"
 msgstr ""
 
-#: builtin/checkout.c:1009 builtin/checkout.c:1013
+#: pathspec.c:305
+msgid "invalid parameter for pathspec magic 'prefix'"
+msgstr ""
+
+#: pathspec.c:326
 #, c-format
-msgid "'%s' cannot be used with switching branches"
+msgid "Invalid pathspec magic '%.*s' in '%s'"
 msgstr ""
 
-#: builtin/checkout.c:1017 builtin/checkout.c:1020 builtin/checkout.c:1025
-#: builtin/checkout.c:1028
+#: pathspec.c:331
 #, c-format
-msgid "'%s' cannot be used with '%s'"
+msgid "Missing ')' at the end of pathspec magic in '%s'"
 msgstr ""
 
-#: builtin/checkout.c:1033
+#: pathspec.c:369
 #, c-format
-msgid "Cannot switch branch to a non-commit '%s'"
+msgid "Unimplemented pathspec magic '%c' in '%s'"
 msgstr ""
 
-#: builtin/checkout.c:1055 builtin/checkout.c:1057 builtin/clone.c:89
-#: builtin/remote.c:169 builtin/remote.c:171
-msgid "branch"
+#: pathspec.c:428
+#, c-format
+msgid "%s: 'literal' and 'glob' are incompatible"
 msgstr ""
 
-#: builtin/checkout.c:1056
-msgid "create and checkout a new branch"
+#: pathspec.c:441
+#, c-format
+msgid "%s: '%s' is outside repository"
 msgstr ""
 
-#: builtin/checkout.c:1058
-msgid "create/reset and checkout a branch"
+#: pathspec.c:515
+#, c-format
+msgid "'%s' (mnemonic: '%c')"
 msgstr ""
 
-#: builtin/checkout.c:1059
-msgid "create reflog for new branch"
+#: pathspec.c:525
+#, c-format
+msgid "%s: pathspec magic not supported by this command: %s"
 msgstr ""
 
-#: builtin/checkout.c:1060
-msgid "detach the HEAD at named commit"
+#: pathspec.c:592
+#, c-format
+msgid "pathspec '%s' is beyond a symbolic link"
 msgstr ""
 
-#: builtin/checkout.c:1061
-msgid "set upstream info for new branch"
+#: pkt-line.c:104
+msgid "flush packet write failed"
 msgstr ""
 
-#: builtin/checkout.c:1063
-msgid "new branch"
+#: pkt-line.c:142 pkt-line.c:228
+msgid "protocol error: impossibly long line"
 msgstr ""
 
-#: builtin/checkout.c:1063
-msgid "new unparented branch"
+#: pkt-line.c:158 pkt-line.c:160
+msgid "packet write with format failed"
 msgstr ""
 
-#: builtin/checkout.c:1064
-msgid "checkout our version for unmerged files"
+#: pkt-line.c:192
+msgid "packet write failed - data exceeds max packet size"
 msgstr ""
 
-#: builtin/checkout.c:1066
-msgid "checkout their version for unmerged files"
+#: pkt-line.c:199 pkt-line.c:206
+msgid "packet write failed"
 msgstr ""
 
-#: builtin/checkout.c:1068
-msgid "force checkout (throw away local modifications)"
+#: pkt-line.c:291
+msgid "read error"
 msgstr ""
 
-#: builtin/checkout.c:1069
-msgid "perform a 3-way merge with the new branch"
+#: pkt-line.c:299
+msgid "the remote end hung up unexpectedly"
 msgstr ""
 
-#: builtin/checkout.c:1070 builtin/merge.c:232
-msgid "update ignored files (default)"
+#: pkt-line.c:327
+#, c-format
+msgid "protocol error: bad line length character: %.4s"
 msgstr ""
 
-#: builtin/checkout.c:1071 builtin/log.c:1208 parse-options.h:249
-msgid "style"
+#: pkt-line.c:337 pkt-line.c:342
+#, c-format
+msgid "protocol error: bad line length %d"
 msgstr ""
 
-#: builtin/checkout.c:1072
-msgid "conflict style (merge or diff3)"
+#: preload-index.c:118
+msgid "Refreshing index"
 msgstr ""
 
-#: builtin/checkout.c:1075
-msgid "do not limit pathspecs to sparse entries only"
+#: preload-index.c:137
+#, c-format
+msgid "unable to create threaded lstat: %s"
 msgstr ""
 
-#: builtin/checkout.c:1077
-msgid "second guess 'git checkout no-such-branch'"
+#: pretty.c:962
+msgid "unable to parse --pretty format"
 msgstr ""
 
-#: builtin/checkout.c:1101
-msgid "-b, -B and --orphan are mutually exclusive"
+#: range-diff.c:56
+msgid "could not start `log`"
 msgstr ""
 
-#: builtin/checkout.c:1118
-msgid "--track needs a branch name"
+#: range-diff.c:59
+msgid "could not read `log` output"
 msgstr ""
 
-#: builtin/checkout.c:1125
-msgid "Missing branch name; try -b"
+#: range-diff.c:74 sequencer.c:4764
+#, c-format
+msgid "could not parse commit '%s'"
 msgstr ""
 
-#: builtin/checkout.c:1160
-msgid "invalid path specification"
+#: range-diff.c:224
+msgid "failed to generate diff"
 msgstr ""
 
-#: builtin/checkout.c:1167
+#: range-diff.c:455 range-diff.c:457
 #, 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?"
+msgid "could not parse log for '%s'"
 msgstr ""
 
-#: builtin/checkout.c:1172
-#, c-format
-msgid "git checkout: --detach does not take a path argument '%s'"
+#: read-cache.c:1490
+msgid "Refresh index"
 msgstr ""
 
-#: builtin/checkout.c:1176
+#: read-cache.c:1604
+#, c-format
 msgid ""
-"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
-"checking out of the index."
+"index.version set, but the value is invalid.\n"
+"Using version %i"
 msgstr ""
 
-#: builtin/clean.c:25
+#: read-cache.c:1614
+#, c-format
 msgid ""
-"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
+"GIT_INDEX_VERSION set, but the value is invalid.\n"
+"Using version %i"
 msgstr ""
 
-#: builtin/clean.c:29
+#: read-cache.c:1792
 #, c-format
-msgid "Removing %s\n"
+msgid "malformed name field in the index, near path '%s'"
 msgstr ""
 
-#: builtin/clean.c:30
-#, c-format
-msgid "Would remove %s\n"
+#: read-cache.c:1960 rerere.c:565 rerere.c:599 rerere.c:1111 builtin/add.c:458
+#: builtin/check-ignore.c:177 builtin/checkout.c:289 builtin/checkout.c:585
+#: builtin/checkout.c:953 builtin/clean.c:954 builtin/commit.c:343
+#: builtin/diff-tree.c:115 builtin/grep.c:489 builtin/mv.c:144
+#: builtin/reset.c:244 builtin/rm.c:270 builtin/submodule--helper.c:329
+msgid "index file corrupt"
 msgstr ""
 
-#: builtin/clean.c:31
+#: read-cache.c:2101
 #, c-format
-msgid "Skipping repository %s\n"
+msgid "unable to create load_cache_entries thread: %s"
 msgstr ""
 
-#: builtin/clean.c:32
+#: read-cache.c:2114
 #, c-format
-msgid "Would skip repository %s\n"
+msgid "unable to join load_cache_entries thread: %s"
 msgstr ""
 
-#: builtin/clean.c:33
+#: read-cache.c:2201
 #, c-format
-msgid "failed to remove %s"
+msgid "unable to create load_index_extensions thread: %s"
 msgstr ""
 
-#: builtin/clean.c:293
-msgid ""
-"Prompt help:\n"
-"1          - select a numbered item\n"
-"foo        - select item based on unique prefix\n"
-"           - (empty) select nothing"
+#: read-cache.c:2228
+#, c-format
+msgid "unable to join load_index_extensions thread: %s"
 msgstr ""
 
-#: builtin/clean.c:297
-msgid ""
-"Prompt help:\n"
-"1          - select a single item\n"
-"3-5        - select a range of items\n"
-"2-3,6-9    - select multiple ranges\n"
-"foo        - select item based on unique prefix\n"
-"-...       - unselect specified items\n"
-"*          - choose all items\n"
-"           - (empty) finish selecting"
+#: read-cache.c:2982 sequencer.c:4727 wrapper.c:658 builtin/merge.c:1086
+#, c-format
+msgid "could not close '%s'"
 msgstr ""
 
-#: builtin/clean.c:515
+#: read-cache.c:3055 sequencer.c:2203 sequencer.c:3592
 #, c-format
-msgid "Huh (%s)?"
+msgid "could not stat '%s'"
 msgstr ""
 
-#: builtin/clean.c:658
+#: read-cache.c:3068
 #, c-format
-msgid "Input ignore patterns>> "
+msgid "unable to open git dir: %s"
 msgstr ""
 
-#: builtin/clean.c:695
+#: read-cache.c:3080
 #, c-format
-msgid "WARNING: Cannot find items matched by: %s"
+msgid "unable to unlink: %s"
 msgstr ""
 
-#: builtin/clean.c:716
-msgid "Select items to delete"
+#: rebase-interactive.c:10
+msgid ""
+"\n"
+"Commands:\n"
+"p, pick <commit> = use commit\n"
+"r, reword <commit> = use commit, but edit the commit message\n"
+"e, edit <commit> = use commit, but stop for amending\n"
+"s, squash <commit> = use commit, but meld into previous commit\n"
+"f, fixup <commit> = like \"squash\", but discard this commit's log message\n"
+"x, exec <command> = run command (the rest of the line) using shell\n"
+"b, break = stop here (continue rebase later with 'git rebase --continue')\n"
+"d, drop <commit> = remove commit\n"
+"l, label <label> = label current HEAD with a name\n"
+"t, reset <label> = reset HEAD to a label\n"
+"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
+".       create a merge commit using the original merge commit's\n"
+".       message (or the oneline, if no original merge commit was\n"
+".       specified). Use -c <commit> to reword the commit message.\n"
+"\n"
+"These lines can be re-ordered; they are executed from top to bottom.\n"
 msgstr ""
 
-#: builtin/clean.c:756
-#, c-format
-msgid "remove %s? "
+#: rebase-interactive.c:31 git-rebase--preserve-merges.sh:173
+msgid ""
+"\n"
+"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
 msgstr ""
 
-#: builtin/clean.c:781
-msgid "Bye."
+#: rebase-interactive.c:34 git-rebase--preserve-merges.sh:177
+msgid ""
+"\n"
+"If you remove a line here THAT COMMIT WILL BE LOST.\n"
 msgstr ""
 
-#: builtin/clean.c:789
+#: rebase-interactive.c:40 git-rebase--preserve-merges.sh:816
 msgid ""
-"clean               - start cleaning\n"
-"filter by pattern   - exclude items from deletion\n"
-"select by numbers   - select items to be deleted by numbers\n"
-"ask each            - confirm each deletion (like \"rm -i\")\n"
-"quit                - stop cleaning\n"
-"help                - this screen\n"
-"?                   - help for prompt selection"
+"\n"
+"You are editing the todo file of an ongoing interactive rebase.\n"
+"To continue rebase after editing, run:\n"
+"    git rebase --continue\n"
+"\n"
 msgstr ""
 
-#: builtin/clean.c:816
-msgid "*** Commands ***"
+#: rebase-interactive.c:45 git-rebase--preserve-merges.sh:893
+msgid ""
+"\n"
+"However, if you remove everything, the rebase will be aborted.\n"
+"\n"
 msgstr ""
 
-#: builtin/clean.c:817
-msgid "What now"
+#: rebase-interactive.c:51 git-rebase--preserve-merges.sh:900
+msgid "Note that empty commits are commented out"
 msgstr ""
 
-#: builtin/clean.c:825
-msgid "Would remove the following item:"
-msgid_plural "Would remove the following items:"
-msgstr[0] ""
-msgstr[1] ""
+#: rebase-interactive.c:62 rebase-interactive.c:75 sequencer.c:2186
+#: sequencer.c:4505 sequencer.c:4561 sequencer.c:4836
+#, c-format
+msgid "could not read '%s'."
+msgstr ""
 
-#: builtin/clean.c:842
-msgid "No more files to clean, exiting."
+#: refs.c:192
+#, c-format
+msgid "%s does not point to a valid object!"
 msgstr ""
 
-#: builtin/clean.c:874
-msgid "do not print names of files removed"
+#: refs.c:583
+#, c-format
+msgid "ignoring dangling symref %s"
 msgstr ""
 
-#: builtin/clean.c:876
-msgid "force"
+#: refs.c:585 ref-filter.c:1951
+#, c-format
+msgid "ignoring broken ref %s"
 msgstr ""
 
-#: builtin/clean.c:877
-msgid "interactive cleaning"
+#: refs.c:711
+#, c-format
+msgid "could not open '%s' for writing: %s"
 msgstr ""
 
-#: builtin/clean.c:879
-msgid "remove whole directories"
+#: refs.c:721 refs.c:772
+#, c-format
+msgid "could not read ref '%s'"
 msgstr ""
 
-#: builtin/clean.c:880 builtin/describe.c:420 builtin/grep.c:716
-#: builtin/ls-files.c:493 builtin/name-rev.c:315 builtin/show-ref.c:186
-msgid "pattern"
+#: refs.c:727
+#, c-format
+msgid "ref '%s' already exists"
 msgstr ""
 
-#: builtin/clean.c:881
-msgid "add <pattern> to ignore rules"
+#: refs.c:732
+#, c-format
+msgid "unexpected object ID when writing '%s'"
 msgstr ""
 
-#: builtin/clean.c:882
-msgid "remove ignored files, too"
+#: refs.c:740 sequencer.c:394 sequencer.c:2510 sequencer.c:2636
+#: sequencer.c:2650 sequencer.c:2877 sequencer.c:4725 sequencer.c:4788
+#: wrapper.c:656
+#, c-format
+msgid "could not write to '%s'"
 msgstr ""
 
-#: builtin/clean.c:884
-msgid "remove only ignored files"
+#: refs.c:767 sequencer.c:4723 sequencer.c:4782 wrapper.c:225 wrapper.c:395
+#: builtin/am.c:728
+#, c-format
+msgid "could not open '%s' for writing"
 msgstr ""
 
-#: builtin/clean.c:902
-msgid "-x and -X cannot be used together"
+#: refs.c:774
+#, c-format
+msgid "unexpected object ID when deleting '%s'"
 msgstr ""
 
-#: builtin/clean.c:906
-msgid ""
-"clean.requireForce set to true and neither -i, -n nor -f given; refusing to "
-"clean"
+#: refs.c:905
+#, c-format
+msgid "log for ref %s has gap after %s"
 msgstr ""
 
-#: builtin/clean.c:909
-msgid ""
-"clean.requireForce defaults to true and neither -i, -n nor -f given; "
-"refusing to clean"
+#: refs.c:911
+#, c-format
+msgid "log for ref %s unexpectedly ended on %s"
 msgstr ""
 
-#: builtin/clone.c:36
-msgid "git clone [options] [--] <repo> [<dir>]"
+#: refs.c:969
+#, c-format
+msgid "log for %s is empty"
 msgstr ""
 
-#: builtin/clone.c:64 builtin/fetch.c:82 builtin/merge.c:229
-#: builtin/push.c:462
-msgid "force progress reporting"
+#: refs.c:1061
+#, c-format
+msgid "refusing to update ref with bad name '%s'"
 msgstr ""
 
-#: builtin/clone.c:66
-msgid "don't create a checkout"
+#: refs.c:1137
+#, c-format
+msgid "update_ref failed for ref '%s': %s"
 msgstr ""
 
-#: builtin/clone.c:67 builtin/clone.c:69 builtin/init-db.c:488
-msgid "create a bare repository"
-msgstr ""
-
-#: builtin/clone.c:72
-msgid "create a mirror repository (implies bare)"
+#: refs.c:1911
+#, c-format
+msgid "multiple updates for ref '%s' not allowed"
 msgstr ""
 
-#: builtin/clone.c:74
-msgid "to clone from a local repository"
+#: refs.c:1943
+msgid "ref updates forbidden inside quarantine environment"
 msgstr ""
 
-#: builtin/clone.c:76
-msgid "don't use local hardlinks, always copy"
+#: refs.c:2039 refs.c:2069
+#, c-format
+msgid "'%s' exists; cannot create '%s'"
 msgstr ""
 
-#: builtin/clone.c:78
-msgid "setup as shared repository"
+#: refs.c:2045 refs.c:2080
+#, c-format
+msgid "cannot process '%s' and '%s' at the same time"
 msgstr ""
 
-#: builtin/clone.c:80 builtin/clone.c:82
-msgid "initialize submodules in the clone"
+#: refs/files-backend.c:1228
+#, c-format
+msgid "could not remove reference %s"
 msgstr ""
 
-#: builtin/clone.c:83 builtin/init-db.c:485
-msgid "template-directory"
+#: refs/files-backend.c:1242 refs/packed-backend.c:1532
+#: refs/packed-backend.c:1542
+#, c-format
+msgid "could not delete reference %s: %s"
 msgstr ""
 
-#: builtin/clone.c:84 builtin/init-db.c:486
-msgid "directory from which templates will be used"
+#: refs/files-backend.c:1245 refs/packed-backend.c:1545
+#, c-format
+msgid "could not delete references: %s"
 msgstr ""
 
-#: builtin/clone.c:86
-msgid "reference repository"
+#: refspec.c:137
+#, c-format
+msgid "invalid refspec '%s'"
 msgstr ""
 
-#: builtin/clone.c:87 builtin/column.c:26 builtin/merge-file.c:44
-msgid "name"
+#: ref-filter.c:39 wt-status.c:1855
+msgid "gone"
 msgstr ""
 
-#: builtin/clone.c:88
-msgid "use <name> instead of 'origin' to track upstream"
+#: ref-filter.c:40
+#, c-format
+msgid "ahead %d"
 msgstr ""
 
-#: builtin/clone.c:90
-msgid "checkout <branch> instead of the remote's HEAD"
+#: ref-filter.c:41
+#, c-format
+msgid "behind %d"
 msgstr ""
 
-#: builtin/clone.c:92
-msgid "path to git-upload-pack on the remote"
+#: ref-filter.c:42
+#, c-format
+msgid "ahead %d, behind %d"
 msgstr ""
 
-#: builtin/clone.c:93 builtin/fetch.c:83 builtin/grep.c:661
-msgid "depth"
+#: ref-filter.c:138
+#, c-format
+msgid "expected format: %%(color:<color>)"
 msgstr ""
 
-#: builtin/clone.c:94
-msgid "create a shallow clone of that depth"
+#: ref-filter.c:140
+#, c-format
+msgid "unrecognized color: %%(color:%s)"
 msgstr ""
 
-#: builtin/clone.c:96
-msgid "clone only one branch, HEAD or --branch"
+#: ref-filter.c:162
+#, c-format
+msgid "Integer value expected refname:lstrip=%s"
 msgstr ""
 
-#: builtin/clone.c:97 builtin/init-db.c:494
-msgid "gitdir"
+#: ref-filter.c:166
+#, c-format
+msgid "Integer value expected refname:rstrip=%s"
 msgstr ""
 
-#: builtin/clone.c:98 builtin/init-db.c:495
-msgid "separate git dir from working tree"
+#: ref-filter.c:168
+#, c-format
+msgid "unrecognized %%(%s) argument: %s"
 msgstr ""
 
-#: builtin/clone.c:99
-msgid "key=value"
+#: ref-filter.c:223
+#, c-format
+msgid "%%(objecttype) does not take arguments"
 msgstr ""
 
-#: builtin/clone.c:100
-msgid "set config inside the new repository"
+#: ref-filter.c:235
+#, c-format
+msgid "%%(objectsize) does not take arguments"
 msgstr ""
 
-#: builtin/clone.c:253
+#: ref-filter.c:247
 #, c-format
-msgid "reference repository '%s' is not a local repository."
+msgid "%%(body) does not take arguments"
 msgstr ""
 
-#: builtin/clone.c:316
+#: ref-filter.c:256
 #, c-format
-msgid "failed to create directory '%s'"
+msgid "%%(subject) does not take arguments"
 msgstr ""
 
-#: builtin/clone.c:318 builtin/diff.c:77
+#: ref-filter.c:278
 #, c-format
-msgid "failed to stat '%s'"
+msgid "unknown %%(trailers) argument: %s"
 msgstr ""
 
-#: builtin/clone.c:320
+#: ref-filter.c:307
 #, c-format
-msgid "%s exists and is not a directory"
+msgid "positive value expected contents:lines=%s"
 msgstr ""
 
-#: builtin/clone.c:334
+#: ref-filter.c:309
 #, c-format
-msgid "failed to stat %s\n"
+msgid "unrecognized %%(contents) argument: %s"
 msgstr ""
 
-#: builtin/clone.c:356
+#: ref-filter.c:324
 #, c-format
-msgid "failed to create link '%s'"
+msgid "positive value expected objectname:short=%s"
 msgstr ""
 
-#: builtin/clone.c:360
+#: ref-filter.c:328
 #, c-format
-msgid "failed to copy file to '%s'"
+msgid "unrecognized %%(objectname) argument: %s"
 msgstr ""
 
-#: builtin/clone.c:383
+#: ref-filter.c:358
 #, c-format
-msgid "done.\n"
+msgid "expected format: %%(align:<width>,<position>)"
 msgstr ""
 
-#: builtin/clone.c:396
-msgid ""
-"Clone succeeded, but checkout failed.\n"
-"You can inspect what was checked out with 'git status'\n"
-"and retry the checkout with 'git checkout -f HEAD'\n"
+#: ref-filter.c:370
+#, c-format
+msgid "unrecognized position:%s"
 msgstr ""
 
-#: builtin/clone.c:475
+#: ref-filter.c:377
 #, c-format
-msgid "Could not find remote branch %s to clone."
+msgid "unrecognized width:%s"
 msgstr ""
 
-#: builtin/clone.c:555
+#: ref-filter.c:386
 #, c-format
-msgid "Checking connectivity... "
+msgid "unrecognized %%(align) argument: %s"
 msgstr ""
 
-#: builtin/clone.c:558
-msgid "remote did not send all necessary objects"
+#: ref-filter.c:394
+#, c-format
+msgid "positive width expected with the %%(align) atom"
 msgstr ""
 
-#: builtin/clone.c:560
+#: ref-filter.c:412
 #, c-format
-msgid "done\n"
+msgid "unrecognized %%(if) argument: %s"
 msgstr ""
 
-#: builtin/clone.c:621
-msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
+#: ref-filter.c:508
+#, c-format
+msgid "malformed field name: %.*s"
 msgstr ""
 
-#: builtin/clone.c:652
-msgid "unable to checkout working tree"
+#: ref-filter.c:535
+#, c-format
+msgid "unknown field name: %.*s"
 msgstr ""
 
-#: builtin/clone.c:760
-msgid "Too many arguments."
+#: ref-filter.c:539
+#, c-format
+msgid ""
+"not a git repository, but the field '%.*s' requires access to object data"
 msgstr ""
 
-#: builtin/clone.c:764
-msgid "You must specify a repository to clone."
+#: ref-filter.c:663
+#, c-format
+msgid "format: %%(if) atom used without a %%(then) atom"
 msgstr ""
 
-#: builtin/clone.c:775
+#: ref-filter.c:726
 #, c-format
-msgid "--bare and --origin %s options are incompatible."
+msgid "format: %%(then) atom used without an %%(if) atom"
 msgstr ""
 
-#: builtin/clone.c:778
-msgid "--bare and --separate-git-dir are incompatible."
+#: ref-filter.c:728
+#, c-format
+msgid "format: %%(then) atom used more than once"
 msgstr ""
 
-#: builtin/clone.c:791
+#: ref-filter.c:730
 #, c-format
-msgid "repository '%s' does not exist"
+msgid "format: %%(then) atom used after %%(else)"
 msgstr ""
 
-#: builtin/clone.c:796
-msgid "--depth is ignored in local clones; use file:// instead."
+#: ref-filter.c:758
+#, c-format
+msgid "format: %%(else) atom used without an %%(if) atom"
 msgstr ""
 
-#: builtin/clone.c:798
-msgid "--local is ignored"
+#: ref-filter.c:760
+#, c-format
+msgid "format: %%(else) atom used without a %%(then) atom"
 msgstr ""
 
-#: builtin/clone.c:808
+#: ref-filter.c:762
 #, c-format
-msgid "destination path '%s' already exists and is not an empty directory."
+msgid "format: %%(else) atom used more than once"
 msgstr ""
 
-#: builtin/clone.c:818
+#: ref-filter.c:777
 #, c-format
-msgid "working tree '%s' already exists."
+msgid "format: %%(end) atom used without corresponding atom"
 msgstr ""
 
-#: builtin/clone.c:831 builtin/clone.c:843
+#: ref-filter.c:834
 #, c-format
-msgid "could not create leading directories of '%s'"
+msgid "malformed format string %s"
 msgstr ""
 
-#: builtin/clone.c:834
+#: ref-filter.c:1424
 #, c-format
-msgid "could not create work tree dir '%s'."
+msgid "(no branch, rebasing %s)"
 msgstr ""
 
-#: builtin/clone.c:853
+#: ref-filter.c:1427
 #, c-format
-msgid "Cloning into bare repository '%s'...\n"
+msgid "(no branch, rebasing detached HEAD %s)"
 msgstr ""
 
-#: builtin/clone.c:855
+#: ref-filter.c:1430
 #, c-format
-msgid "Cloning into '%s'...\n"
+msgid "(no branch, bisect started on %s)"
 msgstr ""
 
-#: builtin/clone.c:890
+#. TRANSLATORS: make sure this matches "HEAD
+#. detached at " in wt-status.c
+#.
+#: ref-filter.c:1438
 #, c-format
-msgid "Don't know how to clone %s"
+msgid "(HEAD detached at %s)"
 msgstr ""
 
-#: builtin/clone.c:942
+#. TRANSLATORS: make sure this matches "HEAD
+#. detached from " in wt-status.c
+#.
+#: ref-filter.c:1445
 #, c-format
-msgid "Remote branch %s not found in upstream %s"
+msgid "(HEAD detached from %s)"
 msgstr ""
 
-#: builtin/clone.c:949
-msgid "You appear to have cloned an empty repository."
+#: ref-filter.c:1449
+msgid "(no branch)"
 msgstr ""
 
-#: builtin/column.c:9
-msgid "git column [options]"
+#: ref-filter.c:1483 ref-filter.c:1638
+#, c-format
+msgid "missing object %s for %s"
 msgstr ""
 
-#: builtin/column.c:26
-msgid "lookup config vars"
+#: ref-filter.c:1491
+#, c-format
+msgid "parse_object_buffer failed on %s for %s"
 msgstr ""
 
-#: builtin/column.c:27 builtin/column.c:28
-msgid "layout to use"
+#: ref-filter.c:1857
+#, c-format
+msgid "malformed object at '%s'"
 msgstr ""
 
-#: builtin/column.c:29
-msgid "Maximum width"
+#: ref-filter.c:1946
+#, c-format
+msgid "ignoring ref with broken name %s"
 msgstr ""
 
-#: builtin/column.c:30
-msgid "Padding space on left border"
+#: ref-filter.c:2232
+#, c-format
+msgid "format: %%(end) atom missing"
 msgstr ""
 
-#: builtin/column.c:31
-msgid "Padding space on right border"
+#: ref-filter.c:2338
+#, c-format
+msgid "malformed object name %s"
 msgstr ""
 
-#: builtin/column.c:32
-msgid "Padding space between columns"
+#: remote.c:607
+#, c-format
+msgid "Cannot fetch both %s and %s to %s"
 msgstr ""
 
-#: builtin/column.c:51
-msgid "--command must be the first argument"
+#: remote.c:611
+#, c-format
+msgid "%s usually tracks %s, not %s"
 msgstr ""
 
-#: builtin/commit.c:35
-msgid "git commit [options] [--] <pathspec>..."
+#: remote.c:615
+#, c-format
+msgid "%s tracks both %s and %s"
 msgstr ""
 
-#: builtin/commit.c:40
-msgid "git status [options] [--] <pathspec>..."
+#: remote.c:623
+msgid "Internal error"
 msgstr ""
 
-#: builtin/commit.c:45
-msgid ""
-"Your name and email address were configured automatically based\n"
-"on your username and hostname. Please check that they are accurate.\n"
-"You can suppress this message by setting them explicitly:\n"
-"\n"
-"    git config --global user.name \"Your Name\"\n"
-"    git config --global user.email you@example.com\n"
-"\n"
-"After doing this, you may fix the identity used for this commit with:\n"
-"\n"
-"    git commit --amend --reset-author\n"
+#: remote.c:1569 remote.c:1670
+msgid "HEAD does not point to a branch"
 msgstr ""
 
-#: builtin/commit.c:57
-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"
+#: remote.c:1578
+#, c-format
+msgid "no such branch: '%s'"
 msgstr ""
 
-#: builtin/commit.c:62
-msgid ""
-"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
-"If you wish to commit it anyway, use:\n"
-"\n"
-"    git commit --allow-empty\n"
-"\n"
+#: remote.c:1581
+#, c-format
+msgid "no upstream configured for branch '%s'"
 msgstr ""
 
-#: builtin/commit.c:69
-msgid "Otherwise, please use 'git reset'\n"
+#: remote.c:1587
+#, c-format
+msgid "upstream branch '%s' not stored as a remote-tracking branch"
 msgstr ""
 
-#: builtin/commit.c:72
-msgid ""
-"If you wish to skip this commit, use:\n"
-"\n"
-"    git reset\n"
-"\n"
-"Then \"git cherry-pick --continue\" will resume cherry-picking\n"
-"the remaining commits.\n"
+#: remote.c:1602
+#, c-format
+msgid "push destination '%s' on remote '%s' has no local tracking branch"
 msgstr ""
 
-#: builtin/commit.c:279
-msgid "failed to unpack HEAD tree object"
+#: remote.c:1614
+#, c-format
+msgid "branch '%s' has no remote for pushing"
 msgstr ""
 
-#: builtin/commit.c:321
-msgid "unable to create temporary index"
+#: remote.c:1624
+#, c-format
+msgid "push refspecs for '%s' do not include '%s'"
 msgstr ""
 
-#: builtin/commit.c:327
-msgid "interactive add failed"
+#: remote.c:1637
+msgid "push has no destination (push.default is 'nothing')"
 msgstr ""
 
-#: builtin/commit.c:360 builtin/commit.c:381 builtin/commit.c:431
-msgid "unable to write new_index file"
+#: remote.c:1659
+msgid "cannot resolve 'simple' push to a single destination"
 msgstr ""
 
-#: builtin/commit.c:412
-msgid "cannot do a partial commit during a merge."
+#: remote.c:1935
+#, c-format
+msgid "Your branch is based on '%s', but the upstream is gone.\n"
 msgstr ""
 
-#: builtin/commit.c:414
-msgid "cannot do a partial commit during a cherry-pick."
+#: remote.c:1939
+msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
 msgstr ""
 
-#: builtin/commit.c:424
-msgid "cannot read the index"
+#: remote.c:1942
+#, c-format
+msgid "Your branch is up to date with '%s'.\n"
 msgstr ""
 
-#: builtin/commit.c:444
-msgid "unable to write temporary index file"
+#: remote.c:1946
+#, c-format
+msgid "Your branch and '%s' refer to different commits.\n"
 msgstr ""
 
-#: builtin/commit.c:535 builtin/commit.c:541
+#: remote.c:1949
 #, c-format
-msgid "invalid commit: %s"
+msgid "  (use \"%s\" for details)\n"
 msgstr ""
 
-#: builtin/commit.c:563
-msgid "malformed --author parameter"
+#: remote.c:1953
+#, 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:1959
+msgid "  (use \"git push\" to publish your local commits)\n"
 msgstr ""
 
-#: builtin/commit.c:583
+#: remote.c:1962
 #, c-format
-msgid "Malformed ident string: '%s'"
+msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
+msgid_plural ""
+"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: remote.c:1970
+msgid "  (use \"git pull\" to update your local branch)\n"
 msgstr ""
 
-#: builtin/commit.c:621 builtin/commit.c:654 builtin/commit.c:982
+#: remote.c:1973
 #, c-format
-msgid "could not lookup commit %s"
+msgid ""
+"Your branch and '%s' have diverged,\n"
+"and have %d and %d different commit each, respectively.\n"
+msgid_plural ""
+"Your branch and '%s' have diverged,\n"
+"and have %d and %d different commits each, respectively.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: remote.c:1983
+msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
 msgstr ""
 
-#: builtin/commit.c:633 builtin/shortlog.c:271
+#: replace-object.c:21
 #, c-format
-msgid "(reading log message from standard input)\n"
+msgid "bad replace ref name: %s"
 msgstr ""
 
-#: builtin/commit.c:635
-msgid "could not read log from standard input"
+#: replace-object.c:30
+#, c-format
+msgid "duplicate replace ref: %s"
 msgstr ""
 
-#: builtin/commit.c:639
+#: replace-object.c:73
 #, c-format
-msgid "could not read log file '%s'"
+msgid "replace depth too high for object %s"
 msgstr ""
 
-#: builtin/commit.c:645
-msgid "commit has empty message"
+#: rerere.c:217 rerere.c:226 rerere.c:229
+msgid "corrupt MERGE_RR"
 msgstr ""
 
-#: builtin/commit.c:661
-msgid "could not read MERGE_MSG"
+#: rerere.c:264 rerere.c:269
+msgid "unable to write rerere record"
 msgstr ""
 
-#: builtin/commit.c:665
-msgid "could not read SQUASH_MSG"
+#: rerere.c:485 rerere.c:692 sequencer.c:3136 sequencer.c:3162
+#, c-format
+msgid "could not write '%s'"
 msgstr ""
 
-#: builtin/commit.c:669
+#: rerere.c:495
 #, c-format
-msgid "could not read '%s'"
+msgid "there were errors while writing '%s' (%s)"
 msgstr ""
 
-#: builtin/commit.c:730
-msgid "could not write commit template"
+#: rerere.c:498
+#, c-format
+msgid "failed to flush '%s'"
 msgstr ""
 
-#: builtin/commit.c:741
+#: rerere.c:503 rerere.c:1039
 #, c-format
-msgid ""
-"\n"
-"It looks like you may be committing a merge.\n"
-"If this is not correct, please remove the file\n"
-"\t%s\n"
-"and try again.\n"
+msgid "could not parse conflict hunks in '%s'"
 msgstr ""
 
-#: builtin/commit.c:746
+#: rerere.c:684
 #, c-format
-msgid ""
-"\n"
-"It looks like you may be committing a cherry-pick.\n"
-"If this is not correct, please remove the file\n"
-"\t%s\n"
-"and try again.\n"
+msgid "failed utime() on '%s'"
 msgstr ""
 
-#: builtin/commit.c:758
+#: rerere.c:694
 #, 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"
+msgid "writing '%s' failed"
 msgstr ""
 
-#: builtin/commit.c:763
+#: rerere.c:714
 #, c-format
-msgid ""
-"Please enter the commit message for your changes. Lines starting\n"
-"with '%c' will be kept; you may remove them yourself if you want to.\n"
-"An empty message aborts the commit.\n"
+msgid "Staged '%s' using previous resolution."
 msgstr ""
 
-#: builtin/commit.c:776
+#: rerere.c:753
 #, c-format
-msgid "%sAuthor:    %s"
+msgid "Recorded resolution for '%s'."
 msgstr ""
 
-#: builtin/commit.c:783
+#: rerere.c:788
 #, c-format
-msgid "%sCommitter: %s"
+msgid "Resolved '%s' using previous resolution."
 msgstr ""
 
-#: builtin/commit.c:803
-msgid "Cannot read index"
+#: rerere.c:803
+#, c-format
+msgid "cannot unlink stray '%s'"
 msgstr ""
 
-#: builtin/commit.c:845
-msgid "Error building trees"
+#: rerere.c:807
+#, c-format
+msgid "Recorded preimage for '%s'"
 msgstr ""
 
-#: builtin/commit.c:860 builtin/tag.c:359
+#: rerere.c:881 submodule.c:1763 builtin/submodule--helper.c:1413
+#: builtin/submodule--helper.c:1423
 #, c-format
-msgid "Please supply the message using either -m or -F option.\n"
+msgid "could not create directory '%s'"
 msgstr ""
 
-#: builtin/commit.c:957
+#: rerere.c:1057
 #, c-format
-msgid "No existing author found with '%s'"
+msgid "failed to update conflicted state in '%s'"
 msgstr ""
 
-#: builtin/commit.c:972 builtin/commit.c:1208
+#: rerere.c:1068 rerere.c:1075
 #, c-format
-msgid "Invalid untracked files mode '%s'"
+msgid "no remembered resolution for '%s'"
 msgstr ""
 
-#: builtin/commit.c:1009
-msgid "--long and -z are incompatible"
+#: rerere.c:1077
+#, c-format
+msgid "cannot unlink '%s'"
 msgstr ""
 
-#: builtin/commit.c:1039
-msgid "Using both --reset-author and --author does not make sense"
+#: rerere.c:1087
+#, c-format
+msgid "Updated preimage for '%s'"
 msgstr ""
 
-#: builtin/commit.c:1050
-msgid "You have nothing to amend."
+#: rerere.c:1096
+#, c-format
+msgid "Forgot resolution for '%s'\n"
 msgstr ""
 
-#: builtin/commit.c:1053
-msgid "You are in the middle of a merge -- cannot amend."
+#: rerere.c:1199
+msgid "unable to open rr-cache directory"
 msgstr ""
 
-#: builtin/commit.c:1055
-msgid "You are in the middle of a cherry-pick -- cannot amend."
+#: revision.c:2324
+msgid "your current branch appears to be broken"
 msgstr ""
 
-#: builtin/commit.c:1058
-msgid "Options --squash and --fixup cannot be used together"
+#: revision.c:2327
+#, c-format
+msgid "your current branch '%s' does not have any commits yet"
 msgstr ""
 
-#: builtin/commit.c:1068
-msgid "Only one of -c/-C/-F/--fixup can be used."
+#: revision.c:2523
+msgid "--first-parent is incompatible with --bisect"
 msgstr ""
 
-#: builtin/commit.c:1070
-msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
+#: run-command.c:740
+msgid "open /dev/null failed"
 msgstr ""
 
-#: builtin/commit.c:1078
-msgid "--reset-author can be used only with -C, -c or --amend."
+#: run-command.c:1229
+#, c-format
+msgid "cannot create async thread: %s"
 msgstr ""
 
-#: builtin/commit.c:1095
-msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
+#: run-command.c:1293
+#, c-format
+msgid ""
+"The '%s' hook was ignored because it's not set as executable.\n"
+"You can disable this warning with `git config advice.ignoredHook false`."
 msgstr ""
 
-#: builtin/commit.c:1097
-msgid "No paths with --include/--only does not make sense."
+#: send-pack.c:142
+msgid "unexpected flush packet while reading remote unpack status"
 msgstr ""
 
-#: builtin/commit.c:1099
-msgid "Clever... amending the last one with dirty index."
+#: send-pack.c:144
+#, c-format
+msgid "unable to parse remote unpack status: %s"
 msgstr ""
 
-#: builtin/commit.c:1101
-msgid "Explicit paths specified without -i nor -o; assuming --only paths..."
+#: send-pack.c:146
+#, c-format
+msgid "remote unpack failed: %s"
 msgstr ""
 
-#: builtin/commit.c:1111 builtin/tag.c:575
-#, c-format
-msgid "Invalid cleanup mode %s"
+#: send-pack.c:308
+msgid "failed to sign the push certificate"
 msgstr ""
 
-#: builtin/commit.c:1116
-msgid "Paths with -a does not make sense."
+#: send-pack.c:421
+msgid "the receiving end does not support --signed push"
 msgstr ""
 
-#: builtin/commit.c:1222 builtin/commit.c:1455
-msgid "show status concisely"
+#: send-pack.c:423
+msgid ""
+"not sending a push certificate since the receiving end does not support --"
+"signed push"
 msgstr ""
 
-#: builtin/commit.c:1224 builtin/commit.c:1457
-msgid "show branch information"
+#: send-pack.c:435
+msgid "the receiving end does not support --atomic push"
 msgstr ""
 
-#: builtin/commit.c:1226 builtin/commit.c:1459 builtin/push.c:452
-msgid "machine-readable output"
+#: send-pack.c:440
+msgid "the receiving end does not support push options"
 msgstr ""
 
-#: builtin/commit.c:1229 builtin/commit.c:1461
-msgid "show status in long format (default)"
+#: sequencer.c:183
+#, c-format
+msgid "invalid commit message cleanup mode '%s'"
 msgstr ""
 
-#: builtin/commit.c:1232 builtin/commit.c:1464
-msgid "terminate entries with NUL"
+#: sequencer.c:287
+#, c-format
+msgid "could not delete '%s'"
 msgstr ""
 
-#: builtin/commit.c:1234 builtin/commit.c:1467 builtin/fast-export.c:667
-#: builtin/fast-export.c:670 builtin/tag.c:459
-msgid "mode"
+#: sequencer.c:313
+msgid "revert"
 msgstr ""
 
-#: builtin/commit.c:1235 builtin/commit.c:1467
-msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
+#: sequencer.c:315
+msgid "cherry-pick"
 msgstr ""
 
-#: builtin/commit.c:1238
-msgid "show ignored files"
+#: sequencer.c:317
+msgid "rebase -i"
 msgstr ""
 
-#: builtin/commit.c:1239 parse-options.h:154
-msgid "when"
+#: sequencer.c:319
+#, c-format
+msgid "unknown action: %d"
 msgstr ""
 
-#: builtin/commit.c:1240
+#: sequencer.c:376
 msgid ""
-"ignore changes to submodules, optional when: all, dirty, untracked. "
-"(Default: all)"
+"after resolving the conflicts, mark the corrected paths\n"
+"with 'git add <paths>' or 'git rm <paths>'"
 msgstr ""
 
-#: builtin/commit.c:1242
-msgid "list untracked files in columns"
+#: sequencer.c:379
+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 ""
 
-#: builtin/commit.c:1313
-msgid "couldn't look up newly created commit"
+#: sequencer.c:392 sequencer.c:2632
+#, c-format
+msgid "could not lock '%s'"
 msgstr ""
 
-#: builtin/commit.c:1315
-msgid "could not parse newly created commit"
+#: sequencer.c:399
+#, c-format
+msgid "could not write eol to '%s'"
 msgstr ""
 
-#: builtin/commit.c:1356
-msgid "detached HEAD"
+#: sequencer.c:404 sequencer.c:2515 sequencer.c:2638 sequencer.c:2652
+#: sequencer.c:2885
+#, c-format
+msgid "failed to finalize '%s'"
 msgstr ""
 
-#: builtin/commit.c:1358
-msgid " (root-commit)"
+#: sequencer.c:427 sequencer.c:921 sequencer.c:1594 sequencer.c:2535
+#: sequencer.c:2867 sequencer.c:2974 builtin/am.c:260 builtin/commit.c:746
+#: builtin/merge.c:1084 builtin/rebase.c:152
+#, c-format
+msgid "could not read '%s'"
 msgstr ""
 
-#: builtin/commit.c:1425
-msgid "suppress summary after successful commit"
+#: sequencer.c:453
+#, c-format
+msgid "your local changes would be overwritten by %s."
 msgstr ""
 
-#: builtin/commit.c:1426
-msgid "show diff in commit message template"
+#: sequencer.c:457
+msgid "commit your changes or stash them to proceed."
 msgstr ""
 
-#: builtin/commit.c:1428
-msgid "Commit message options"
+#: sequencer.c:486
+#, c-format
+msgid "%s: fast-forward"
 msgstr ""
 
-#: builtin/commit.c:1429 builtin/tag.c:457
-msgid "read message from file"
+#. TRANSLATORS: %s will be "revert", "cherry-pick" or
+#. "rebase -i".
+#.
+#: sequencer.c:575
+#, c-format
+msgid "%s: Unable to write new index file"
 msgstr ""
 
-#: builtin/commit.c:1430
-msgid "author"
+#: sequencer.c:591
+msgid "unable to update cache tree"
 msgstr ""
 
-#: builtin/commit.c:1430
-msgid "override author for commit"
+#: sequencer.c:604
+msgid "could not resolve HEAD commit"
 msgstr ""
 
-#: builtin/commit.c:1431 builtin/gc.c:178
-msgid "date"
+#: sequencer.c:684
+#, c-format
+msgid "no key present in '%.*s'"
 msgstr ""
 
-#: builtin/commit.c:1431
-msgid "override date for commit"
+#: sequencer.c:695
+#, c-format
+msgid "unable to dequote value of '%s'"
 msgstr ""
 
-#: builtin/commit.c:1432 builtin/merge.c:223 builtin/notes.c:405
-#: builtin/notes.c:562 builtin/tag.c:455
-msgid "message"
+#: sequencer.c:732 wrapper.c:227 wrapper.c:397 builtin/am.c:719
+#: builtin/am.c:811 builtin/merge.c:1081
+#, c-format
+msgid "could not open '%s' for reading"
 msgstr ""
 
-#: builtin/commit.c:1432
-msgid "commit message"
+#: sequencer.c:742
+msgid "'GIT_AUTHOR_NAME' already given"
 msgstr ""
 
-#: builtin/commit.c:1433
-msgid "reuse and edit message from specified commit"
+#: sequencer.c:747
+msgid "'GIT_AUTHOR_EMAIL' already given"
 msgstr ""
 
-#: builtin/commit.c:1434
-msgid "reuse message from specified commit"
+#: sequencer.c:752
+msgid "'GIT_AUTHOR_DATE' already given"
 msgstr ""
 
-#: builtin/commit.c:1435
-msgid "use autosquash formatted message to fixup specified commit"
+#: sequencer.c:756
+#, c-format
+msgid "unknown variable '%s'"
 msgstr ""
 
-#: builtin/commit.c:1436
-msgid "use autosquash formatted message to squash specified commit"
+#: sequencer.c:761
+msgid "missing 'GIT_AUTHOR_NAME'"
 msgstr ""
 
-#: builtin/commit.c:1437
-msgid "the commit is authored by me now (used with -C/-c/--amend)"
+#: sequencer.c:763
+msgid "missing 'GIT_AUTHOR_EMAIL'"
 msgstr ""
 
-#: builtin/commit.c:1438 builtin/log.c:1160 builtin/revert.c:111
-msgid "add Signed-off-by:"
+#: sequencer.c:765
+msgid "missing 'GIT_AUTHOR_DATE'"
 msgstr ""
 
-#: builtin/commit.c:1439
-msgid "use specified template file"
+#: sequencer.c:825
+#, c-format
+msgid "invalid date format '%s' in '%s'"
 msgstr ""
 
-#: builtin/commit.c:1440
-msgid "force edit of commit"
+#: sequencer.c:842
+#, c-format
+msgid ""
+"you have staged changes in your working tree\n"
+"If these changes are meant to be squashed into the previous commit, run:\n"
+"\n"
+"  git commit --amend %s\n"
+"\n"
+"If they are meant to go into a new commit, run:\n"
+"\n"
+"  git commit %s\n"
+"\n"
+"In both cases, once you're done, continue with:\n"
+"\n"
+"  git rebase --continue\n"
 msgstr ""
 
-#: builtin/commit.c:1441
-msgid "default"
+#: sequencer.c:935
+msgid "writing root commit"
 msgstr ""
 
-#: builtin/commit.c:1441 builtin/tag.c:460
-msgid "how to strip spaces and #comments from message"
+#: sequencer.c:1142
+msgid "'prepare-commit-msg' hook failed"
 msgstr ""
 
-#: builtin/commit.c:1442
-msgid "include status in commit message template"
+#: sequencer.c:1149
+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:1443 builtin/merge.c:230 builtin/tag.c:461
-msgid "key id"
+#: sequencer.c:1162
+msgid ""
+"Your name and email address were configured automatically based\n"
+"on your username and hostname. Please check that they are accurate.\n"
+"You can suppress this message by setting them explicitly:\n"
+"\n"
+"    git config --global user.name \"Your Name\"\n"
+"    git config --global user.email you@example.com\n"
+"\n"
+"After doing this, you may fix the identity used for this commit with:\n"
+"\n"
+"    git commit --amend --reset-author\n"
 msgstr ""
 
-#: builtin/commit.c:1444 builtin/merge.c:231
-msgid "GPG sign commit"
+#: sequencer.c:1202
+msgid "couldn't look up newly created commit"
 msgstr ""
 
-#. end commit message options
-#: builtin/commit.c:1447
-msgid "Commit contents options"
+#: sequencer.c:1204
+msgid "could not parse newly created commit"
 msgstr ""
 
-#: builtin/commit.c:1448
-msgid "commit all changed files"
+#: sequencer.c:1250
+msgid "unable to resolve HEAD after creating commit"
 msgstr ""
 
-#: builtin/commit.c:1449
-msgid "add specified files to index for commit"
+#: sequencer.c:1252
+msgid "detached HEAD"
 msgstr ""
 
-#: builtin/commit.c:1450
-msgid "interactively add files"
+#: sequencer.c:1256
+msgid " (root-commit)"
 msgstr ""
 
-#: builtin/commit.c:1451
-msgid "interactively add changes"
+#: sequencer.c:1277
+msgid "could not parse HEAD"
 msgstr ""
 
-#: builtin/commit.c:1452
-msgid "commit only specified files"
+#: sequencer.c:1279
+#, c-format
+msgid "HEAD %s is not a commit!"
 msgstr ""
 
-#: builtin/commit.c:1453
-msgid "bypass pre-commit hook"
+#: sequencer.c:1283 builtin/commit.c:1543
+msgid "could not parse HEAD commit"
 msgstr ""
 
-#: builtin/commit.c:1454
-msgid "show what would be committed"
+#: sequencer.c:1334 sequencer.c:1934
+msgid "unable to parse commit author"
 msgstr ""
 
-#: builtin/commit.c:1465
-msgid "amend previous commit"
+#: sequencer.c:1344 builtin/am.c:1585 builtin/merge.c:677
+msgid "git write-tree failed to write a tree"
 msgstr ""
 
-#: builtin/commit.c:1466
-msgid "bypass post-rewrite hook"
+#: sequencer.c:1361 sequencer.c:1416
+#, c-format
+msgid "unable to read commit message from '%s'"
 msgstr ""
 
-#: builtin/commit.c:1471
-msgid "ok to record an empty change"
+#: sequencer.c:1383 builtin/am.c:1606 builtin/commit.c:1646 builtin/merge.c:858
+#: builtin/merge.c:883
+msgid "failed to write commit object"
 msgstr ""
 
-#: builtin/commit.c:1474
-msgid "ok to record a change with an empty message"
+#: sequencer.c:1443
+#, c-format
+msgid "could not parse commit %s"
 msgstr ""
 
-#: builtin/commit.c:1507
-msgid "could not parse HEAD commit"
+#: sequencer.c:1448
+#, c-format
+msgid "could not parse parent commit %s"
 msgstr ""
 
-#: builtin/commit.c:1545 builtin/merge.c:525
+#: sequencer.c:1546 sequencer.c:1654
 #, c-format
-msgid "could not open '%s' for reading"
+msgid "unknown command: %d"
 msgstr ""
 
-#: builtin/commit.c:1552
+#: sequencer.c:1601 sequencer.c:1626
 #, c-format
-msgid "Corrupt MERGE_HEAD file (%s)"
+msgid "This is a combination of %d commits."
 msgstr ""
 
-#: builtin/commit.c:1559
-msgid "could not read MERGE_MODE"
+#: sequencer.c:1611 sequencer.c:4744
+msgid "need a HEAD to fixup"
 msgstr ""
 
-#: builtin/commit.c:1578
-#, c-format
-msgid "could not read commit message: %s"
+#: sequencer.c:1613 sequencer.c:2912
+msgid "could not read HEAD"
 msgstr ""
 
-#: builtin/commit.c:1592
-#, c-format
-msgid "Aborting commit; you did not edit the message.\n"
+#: sequencer.c:1615
+msgid "could not read HEAD's commit message"
 msgstr ""
 
-#: builtin/commit.c:1597
+#: sequencer.c:1621
 #, c-format
-msgid "Aborting commit due to empty commit message.\n"
+msgid "cannot write '%s'"
 msgstr ""
 
-#: builtin/commit.c:1612 builtin/merge.c:861 builtin/merge.c:886
-msgid "failed to write commit object"
+#: sequencer.c:1628 git-rebase--preserve-merges.sh:441
+msgid "This is the 1st commit message:"
 msgstr ""
 
-#: builtin/commit.c:1633
-msgid "cannot lock HEAD ref"
+#: sequencer.c:1636
+#, c-format
+msgid "could not read commit message of %s"
 msgstr ""
 
-#: builtin/commit.c:1637
-msgid "cannot update HEAD ref"
+#: sequencer.c:1643
+#, c-format
+msgid "This is the commit message #%d:"
 msgstr ""
 
-#: builtin/commit.c:1648
-msgid ""
-"Repository has been updated, but unable to write\n"
-"new_index file. Check that disk is not full or quota is\n"
-"not exceeded, and then \"git reset HEAD\" to recover."
+#: sequencer.c:1649
+#, c-format
+msgid "The commit message #%d will be skipped:"
 msgstr ""
 
-#: builtin/config.c:7
-msgid "git config [options]"
+#: sequencer.c:1732
+msgid "your index file is unmerged."
 msgstr ""
 
-#: builtin/config.c:52
-msgid "Config file location"
+#: sequencer.c:1739
+msgid "cannot fixup root commit"
 msgstr ""
 
-#: builtin/config.c:53
-msgid "use global config file"
+#: sequencer.c:1758
+#, c-format
+msgid "commit %s is a merge but no -m option was given."
 msgstr ""
 
-#: builtin/config.c:54
-msgid "use system config file"
+#: sequencer.c:1766
+#, c-format
+msgid "commit %s does not have parent %d"
 msgstr ""
 
-#: builtin/config.c:55
-msgid "use repository config file"
+#: sequencer.c:1770
+#, c-format
+msgid "mainline was specified but commit %s is not a merge."
 msgstr ""
 
-#: builtin/config.c:56
-msgid "use given config file"
+#: sequencer.c:1776
+#, c-format
+msgid "cannot get commit message for %s"
 msgstr ""
 
-#: builtin/config.c:57
-msgid "blob-id"
+#. TRANSLATORS: The first %s will be a "todo" command like
+#. "revert" or "pick", the second %s a SHA1.
+#: sequencer.c:1795
+#, c-format
+msgid "%s: cannot parse parent commit %s"
 msgstr ""
 
-#: builtin/config.c:57
-msgid "read config from given blob object"
+#: sequencer.c:1860
+#, c-format
+msgid "could not rename '%s' to '%s'"
 msgstr ""
 
-#: builtin/config.c:58
-msgid "Action"
+#: sequencer.c:1915
+#, c-format
+msgid "could not revert %s... %s"
 msgstr ""
 
-#: builtin/config.c:59
-msgid "get value: name [value-regex]"
+#: sequencer.c:1916
+#, c-format
+msgid "could not apply %s... %s"
 msgstr ""
 
-#: builtin/config.c:60
-msgid "get all values: key [value-regex]"
+#: sequencer.c:1974
+#, c-format
+msgid "git %s: failed to read the index"
 msgstr ""
 
-#: builtin/config.c:61
-msgid "get values for regexp: name-regex [value-regex]"
+#: sequencer.c:1981
+#, c-format
+msgid "git %s: failed to refresh the index"
 msgstr ""
 
-#: builtin/config.c:62
-msgid "replace all matching variables: name value [value_regex]"
+#: sequencer.c:2062
+#, c-format
+msgid "%s does not accept arguments: '%s'"
 msgstr ""
 
-#: builtin/config.c:63
-msgid "add a new variable: name value"
+#: sequencer.c:2071
+#, c-format
+msgid "missing arguments for %s"
 msgstr ""
 
-#: builtin/config.c:64
-msgid "remove a variable: name [value-regex]"
+#: sequencer.c:2130
+#, c-format
+msgid "invalid line %d: %.*s"
 msgstr ""
 
-#: builtin/config.c:65
-msgid "remove all matches: name [value-regex]"
+#: sequencer.c:2138
+#, c-format
+msgid "cannot '%s' without a previous commit"
 msgstr ""
 
-#: builtin/config.c:66
-msgid "rename section: old-name new-name"
+#: sequencer.c:2209
+msgid "please fix this using 'git rebase --edit-todo'."
 msgstr ""
 
-#: builtin/config.c:67
-msgid "remove a section: name"
+#: sequencer.c:2211
+#, c-format
+msgid "unusable instruction sheet: '%s'"
 msgstr ""
 
-#: builtin/config.c:68
-msgid "list all"
+#: sequencer.c:2216
+msgid "no commits parsed."
 msgstr ""
 
-#: builtin/config.c:69
-msgid "open an editor"
+#: sequencer.c:2227
+msgid "cannot cherry-pick during a revert."
 msgstr ""
 
-#: builtin/config.c:70 builtin/config.c:71
-msgid "slot"
+#: sequencer.c:2229
+msgid "cannot revert during a cherry-pick."
 msgstr ""
 
-#: builtin/config.c:70
-msgid "find the color configured: [default]"
+#: sequencer.c:2299
+#, c-format
+msgid "invalid value for %s: %s"
 msgstr ""
 
-#: builtin/config.c:71
-msgid "find the color setting: [stdout-is-tty]"
+#: sequencer.c:2380
+msgid "unusable squash-onto"
 msgstr ""
 
-#: builtin/config.c:72
-msgid "Type"
+#: sequencer.c:2396
+#, c-format
+msgid "malformed options sheet: '%s'"
 msgstr ""
 
-#: builtin/config.c:73
-msgid "value is \"true\" or \"false\""
+#: sequencer.c:2479 sequencer.c:4005
+msgid "empty commit set passed"
 msgstr ""
 
-#: builtin/config.c:74
-msgid "value is decimal number"
+#: sequencer.c:2487
+msgid "a cherry-pick or revert is already in progress"
 msgstr ""
 
-#: builtin/config.c:75
-msgid "value is --bool or --int"
+#: sequencer.c:2488
+msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
 msgstr ""
 
-#: builtin/config.c:76
-msgid "value is a path (file or directory name)"
+#: sequencer.c:2491
+#, c-format
+msgid "could not create sequencer directory '%s'"
 msgstr ""
 
-#: builtin/config.c:77
-msgid "Other"
+#: sequencer.c:2505
+msgid "could not lock HEAD"
 msgstr ""
 
-#: builtin/config.c:78
-msgid "terminate values with NUL byte"
+#: sequencer.c:2560 sequencer.c:3761
+msgid "no cherry-pick or revert in progress"
 msgstr ""
 
-#: builtin/config.c:79
-msgid "respect include directives on lookup"
+#: sequencer.c:2562
+msgid "cannot resolve HEAD"
 msgstr ""
 
-#: builtin/count-objects.c:82
-msgid "git count-objects [-v] [-H | --human-readable]"
+#: sequencer.c:2564 sequencer.c:2599
+msgid "cannot abort from a branch yet to be born"
 msgstr ""
 
-#: builtin/count-objects.c:97
-msgid "print sizes in human readable format"
+#: sequencer.c:2585 builtin/grep.c:721
+#, c-format
+msgid "cannot open '%s'"
 msgstr ""
 
-#: builtin/describe.c:16
-msgid "git describe [options] <committish>*"
+#: sequencer.c:2587
+#, c-format
+msgid "cannot read '%s': %s"
 msgstr ""
 
-#: builtin/describe.c:17
-msgid "git describe [options] --dirty"
+#: sequencer.c:2588
+msgid "unexpected end of file"
 msgstr ""
 
-#: builtin/describe.c:237
+#: sequencer.c:2594
 #, c-format
-msgid "annotated tag %s not available"
+msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
 msgstr ""
 
-#: builtin/describe.c:241
-#, c-format
-msgid "annotated tag %s has no embedded name"
+#: sequencer.c:2605
+msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
 msgstr ""
 
-#: builtin/describe.c:243
+#: sequencer.c:2709 sequencer.c:3679
 #, c-format
-msgid "tag '%s' is really '%s' here"
+msgid "could not update %s"
 msgstr ""
 
-#: builtin/describe.c:270
-#, c-format
-msgid "Not a valid object name %s"
+#: sequencer.c:2747 sequencer.c:3659
+msgid "cannot read HEAD"
 msgstr ""
 
-#: builtin/describe.c:273
+#: sequencer.c:2762
 #, c-format
-msgid "%s is not a valid '%s' object"
+msgid "unable to copy '%s' to '%s'"
 msgstr ""
 
-#: builtin/describe.c:290
+#: sequencer.c:2770
 #, c-format
-msgid "no tag exactly matches '%s'"
+msgid ""
+"You can amend the commit now, with\n"
+"\n"
+"  git commit --amend %s\n"
+"\n"
+"Once you are satisfied with your changes, run\n"
+"\n"
+"  git rebase --continue\n"
 msgstr ""
 
-#: builtin/describe.c:292
+#: sequencer.c:2780
 #, c-format
-msgid "searching to describe %s\n"
+msgid "Could not apply %s... %.*s"
 msgstr ""
 
-#: builtin/describe.c:332
+#: sequencer.c:2787
 #, c-format
-msgid "finished search at %s\n"
+msgid "Could not merge %.*s"
 msgstr ""
 
-#: builtin/describe.c:359
+#: sequencer.c:2798 sequencer.c:2802 builtin/difftool.c:640
 #, c-format
-msgid ""
-"No annotated tags can describe '%s'.\n"
-"However, there were unannotated tags: try --tags."
+msgid "could not copy '%s' to '%s'"
+msgstr ""
+
+#: sequencer.c:2824 sequencer.c:3242 builtin/rebase.c:580 builtin/rebase.c:1019
+#: builtin/rebase.c:1372 builtin/rebase.c:1426
+msgid "could not read index"
 msgstr ""
 
-#: builtin/describe.c:363
+#: sequencer.c:2829
 #, c-format
 msgid ""
-"No tags can describe '%s'.\n"
-"Try --always, or create some tags."
+"execution failed: %s\n"
+"%sYou can fix the problem, and then run\n"
+"\n"
+"  git rebase --continue\n"
+"\n"
 msgstr ""
 
-#: builtin/describe.c:384
-#, c-format
-msgid "traversed %lu commits\n"
+#: sequencer.c:2835
+msgid "and made changes to the index and/or the working tree\n"
 msgstr ""
 
-#: builtin/describe.c:387
+#: sequencer.c:2841
 #, c-format
 msgid ""
-"more than %i tags found; listed %i most recent\n"
-"gave up search at %s\n"
+"execution succeeded: %s\n"
+"but left changes to the index and/or the working tree\n"
+"Commit or stash your changes, and then run\n"
+"\n"
+"  git rebase --continue\n"
+"\n"
 msgstr ""
 
-#: builtin/describe.c:409
-msgid "find the tag that comes after the commit"
+#: sequencer.c:2902
+#, c-format
+msgid "illegal label name: '%.*s'"
 msgstr ""
 
-#: builtin/describe.c:410
-msgid "debug search strategy on stderr"
+#: sequencer.c:2954
+msgid "writing fake root commit"
 msgstr ""
 
-#: builtin/describe.c:411
-msgid "use any ref"
+#: sequencer.c:2959
+msgid "writing squash-onto"
 msgstr ""
 
-#: builtin/describe.c:412
-msgid "use any tag, even unannotated"
+#: sequencer.c:2997 builtin/rebase.c:585 builtin/rebase.c:591
+#, c-format
+msgid "failed to find tree of %s"
 msgstr ""
 
-#: builtin/describe.c:413
-msgid "always use long format"
+#: sequencer.c:3015 builtin/rebase.c:604
+msgid "could not write index"
 msgstr ""
 
-#: builtin/describe.c:414
-msgid "only follow first parent"
+#: sequencer.c:3042
+#, c-format
+msgid "could not resolve '%s'"
 msgstr ""
 
-#: builtin/describe.c:417
-msgid "only output exact matches"
+#: sequencer.c:3068
+msgid "cannot merge without a current revision"
 msgstr ""
 
-#: builtin/describe.c:419
-msgid "consider <n> most recent tags (default: 10)"
+#: sequencer.c:3090
+#, c-format
+msgid "unable to parse '%.*s'"
 msgstr ""
 
-#: builtin/describe.c:421
-msgid "only consider tags matching <pattern>"
+#: sequencer.c:3099
+#, c-format
+msgid "nothing to merge: '%.*s'"
 msgstr ""
 
-#: builtin/describe.c:423 builtin/name-rev.c:322
-msgid "show abbreviated commit object as fallback"
+#: sequencer.c:3111
+msgid "octopus merge cannot be executed on top of a [new root]"
 msgstr ""
 
-#: builtin/describe.c:424
-msgid "mark"
+#: sequencer.c:3126
+#, c-format
+msgid "could not get commit message of '%s'"
 msgstr ""
 
-#: builtin/describe.c:425
-msgid "append <mark> on dirty working tree (default: \"-dirty\")"
+#: sequencer.c:3274
+#, c-format
+msgid "could not even attempt to merge '%.*s'"
 msgstr ""
 
-#: builtin/describe.c:443
-msgid "--long is incompatible with --abbrev=0"
+#: sequencer.c:3290
+msgid "merge: Unable to write new index file"
 msgstr ""
 
-#: builtin/describe.c:469
-msgid "No names found, cannot describe anything."
+#: sequencer.c:3358 builtin/rebase.c:268
+#, c-format
+msgid "Applied autostash.\n"
 msgstr ""
 
-#: builtin/describe.c:489
-msgid "--dirty is incompatible with committishes"
+#: sequencer.c:3370
+#, c-format
+msgid "cannot store %s"
 msgstr ""
 
-#: builtin/diff.c:79
+#: sequencer.c:3373 builtin/rebase.c:284
 #, c-format
-msgid "'%s': not a regular file or symlink"
+msgid ""
+"Applying autostash resulted in conflicts.\n"
+"Your changes are safe in the stash.\n"
+"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
 msgstr ""
 
-#: builtin/diff.c:230
+#: sequencer.c:3427
 #, c-format
-msgid "invalid option: %s"
+msgid "could not checkout %s"
 msgstr ""
 
-#: builtin/diff.c:307
-msgid "Not a git repository"
+#: sequencer.c:3441
+#, c-format
+msgid "%s: not a valid OID"
 msgstr ""
 
-#: builtin/diff.c:350
+#: sequencer.c:3446 git-rebase--preserve-merges.sh:724
+msgid "could not detach HEAD"
+msgstr ""
+
+#: sequencer.c:3461
 #, c-format
-msgid "invalid object '%s' given."
+msgid "Stopped at HEAD\n"
 msgstr ""
 
-#: builtin/diff.c:359
+#: sequencer.c:3463
 #, c-format
-msgid "more than two blobs given: '%s'"
+msgid "Stopped at %s\n"
 msgstr ""
 
-#: builtin/diff.c:366
+#: sequencer.c:3471
 #, c-format
-msgid "unhandled object '%s' given."
+msgid ""
+"Could not execute the todo command\n"
+"\n"
+"    %.*s\n"
+"It has been rescheduled; To edit the command before continuing, please\n"
+"edit the todo list first:\n"
+"\n"
+"    git rebase --edit-todo\n"
+"    git rebase --continue\n"
 msgstr ""
 
-#: builtin/fast-export.c:22
-msgid "git fast-export [rev-list-opts]"
+#: sequencer.c:3543
+#, c-format
+msgid "Stopped at %s...  %.*s\n"
 msgstr ""
 
-#: builtin/fast-export.c:666
-msgid "show progress after <n> objects"
+#: sequencer.c:3622
+#, c-format
+msgid "unknown command %d"
 msgstr ""
 
-#: builtin/fast-export.c:668
-msgid "select handling of signed tags"
+#: sequencer.c:3667
+msgid "could not read orig-head"
 msgstr ""
 
-#: builtin/fast-export.c:671
-msgid "select handling of tags that tag filtered objects"
+#: sequencer.c:3672 sequencer.c:4741
+msgid "could not read 'onto'"
 msgstr ""
 
-#: builtin/fast-export.c:674
-msgid "Dump marks to this file"
+#: sequencer.c:3686
+#, c-format
+msgid "could not update HEAD to %s"
 msgstr ""
 
-#: builtin/fast-export.c:676
-msgid "Import marks from this file"
-msgstr ""
-
-#: builtin/fast-export.c:678
-msgid "Fake a tagger when tags lack one"
+#: sequencer.c:3772
+msgid "cannot rebase: You have unstaged changes."
 msgstr ""
 
-#: builtin/fast-export.c:680
-msgid "Output full tree for each commit"
+#: sequencer.c:3781
+msgid "cannot amend non-existing commit"
 msgstr ""
 
-#: builtin/fast-export.c:682
-msgid "Use the done feature to terminate the stream"
+#: sequencer.c:3783
+#, c-format
+msgid "invalid file: '%s'"
 msgstr ""
 
-#: builtin/fast-export.c:683
-msgid "Skip output of blob data"
+#: sequencer.c:3785
+#, c-format
+msgid "invalid contents: '%s'"
 msgstr ""
 
-#: builtin/fetch.c:20
-msgid "git fetch [<options>] [<repository> [<refspec>...]]"
+#: sequencer.c:3788
+msgid ""
+"\n"
+"You have uncommitted changes in your working tree. Please, commit them\n"
+"first and then run 'git rebase --continue' again."
 msgstr ""
 
-#: builtin/fetch.c:21
-msgid "git fetch [<options>] <group>"
+#: sequencer.c:3824 sequencer.c:3862
+#, c-format
+msgid "could not write file: '%s'"
 msgstr ""
 
-#: builtin/fetch.c:22
-msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
+#: sequencer.c:3877
+msgid "could not remove CHERRY_PICK_HEAD"
 msgstr ""
 
-#: builtin/fetch.c:23
-msgid "git fetch --all [<options>]"
+#: sequencer.c:3884
+msgid "could not commit staged changes."
 msgstr ""
 
-#: builtin/fetch.c:60
-msgid "fetch from all remotes"
+#: sequencer.c:3982
+#, c-format
+msgid "%s: can't cherry-pick a %s"
 msgstr ""
 
-#: builtin/fetch.c:62
-msgid "append to .git/FETCH_HEAD instead of overwriting"
+#: sequencer.c:3986
+#, c-format
+msgid "%s: bad revision"
 msgstr ""
 
-#: builtin/fetch.c:64
-msgid "path to upload pack on remote end"
+#: sequencer.c:4021
+msgid "can't revert as initial commit"
 msgstr ""
 
-#: builtin/fetch.c:65
-msgid "force overwrite of local branch"
+#: sequencer.c:4466
+msgid "make_script: unhandled options"
 msgstr ""
 
-#: builtin/fetch.c:67
-msgid "fetch from multiple remotes"
+#: sequencer.c:4469
+msgid "make_script: error preparing revisions"
 msgstr ""
 
-#: builtin/fetch.c:69
-msgid "fetch all tags and associated objects"
+#: sequencer.c:4509 sequencer.c:4565 sequencer.c:4840
+#, c-format
+msgid "unusable todo list: '%s'"
 msgstr ""
 
-#: builtin/fetch.c:71
-msgid "do not fetch all tags (--no-tags)"
+#: sequencer.c:4620
+#, c-format
+msgid ""
+"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
 msgstr ""
 
-#: builtin/fetch.c:73
-msgid "prune remote-tracking branches no longer on remote"
+#: sequencer.c:4690
+#, c-format
+msgid ""
+"Warning: some commits may have been dropped accidentally.\n"
+"Dropped commits (newer to older):\n"
 msgstr ""
 
-#: builtin/fetch.c:74
-msgid "on-demand"
+#: sequencer.c:4697
+#, c-format
+msgid ""
+"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
+"\n"
+"Use 'git config rebase.missingCommitsCheck' to change the level of "
+"warnings.\n"
+"The possible behaviours are: ignore, warn, error.\n"
+"\n"
 msgstr ""
 
-#: builtin/fetch.c:75
-msgid "control recursive fetching of submodules"
+#: sequencer.c:4710
+#, c-format
+msgid ""
+"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
+"continue'.\n"
+"Or you can abort the rebase with 'git rebase --abort'.\n"
 msgstr ""
 
-#: builtin/fetch.c:79
-msgid "keep downloaded pack"
+#: sequencer.c:4848 sequencer.c:4886
+msgid "nothing to do"
 msgstr ""
 
-#: builtin/fetch.c:81
-msgid "allow updating of HEAD ref"
-msgstr ""
+#: sequencer.c:4852
+#, c-format
+msgid "Rebase %s onto %s (%d command)"
+msgid_plural "Rebase %s onto %s (%d commands)"
+msgstr[0] ""
+msgstr[1] ""
 
-#: builtin/fetch.c:84
-msgid "deepen history of shallow clone"
+#: sequencer.c:4864
+#, c-format
+msgid "could not copy '%s' to '%s'."
 msgstr ""
 
-#: builtin/fetch.c:86
-msgid "convert to a complete repository"
+#: sequencer.c:4868 sequencer.c:4897
+msgid "could not transform the todo list"
 msgstr ""
 
-#: builtin/fetch.c:88 builtin/log.c:1177
-msgid "dir"
+#: sequencer.c:4900
+msgid "could not skip unnecessary pick commands"
 msgstr ""
 
-#: builtin/fetch.c:89
-msgid "prepend this to submodule path output"
+#: sequencer.c:4983
+msgid "the script was already rearranged."
 msgstr ""
 
-#: builtin/fetch.c:92
-msgid "default mode for recursion"
+#: setup.c:123
+#, c-format
+msgid "'%s' is outside repository"
 msgstr ""
 
-#: builtin/fetch.c:220
-msgid "Couldn't find remote ref HEAD"
+#: setup.c:172
+#, c-format
+msgid ""
+"%s: no such path in the working tree.\n"
+"Use 'git <command> -- <path>...' to specify paths that do not exist locally."
 msgstr ""
 
-#: builtin/fetch.c:273
+#: setup.c:185
 #, c-format
-msgid "object %s not found"
+msgid ""
+"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
+"Use '--' to separate paths from revisions, like this:\n"
+"'git <command> [<revision>...] -- [<file>...]'"
 msgstr ""
 
-#: builtin/fetch.c:278
-msgid "[up to date]"
+#: setup.c:234
+#, c-format
+msgid "option '%s' must come before non-option arguments"
 msgstr ""
 
-#: builtin/fetch.c:292
+#: setup.c:253
 #, c-format
-msgid "! %-*s %-*s -> %s  (can't fetch in current branch)"
+msgid ""
+"ambiguous argument '%s': both revision and filename\n"
+"Use '--' to separate paths from revisions, like this:\n"
+"'git <command> [<revision>...] -- [<file>...]'"
 msgstr ""
 
-#: builtin/fetch.c:293 builtin/fetch.c:379
-msgid "[rejected]"
+#: setup.c:389
+msgid "unable to set up work tree using invalid config"
 msgstr ""
 
-#: builtin/fetch.c:304
-msgid "[tag update]"
+#: setup.c:393
+msgid "this operation must be run in a work tree"
 msgstr ""
 
-#: builtin/fetch.c:306 builtin/fetch.c:341 builtin/fetch.c:359
-msgid "  (unable to update local ref)"
+#: setup.c:527
+#, c-format
+msgid "Expected git repo version <= %d, found %d"
 msgstr ""
 
-#: builtin/fetch.c:324
-msgid "[new tag]"
+#: setup.c:535
+msgid "unknown repository extensions found:"
 msgstr ""
 
-#: builtin/fetch.c:327
-msgid "[new branch]"
+#: setup.c:554
+#, c-format
+msgid "error opening '%s'"
 msgstr ""
 
-#: builtin/fetch.c:330
-msgid "[new ref]"
+#: setup.c:556
+#, c-format
+msgid "too large to be a .git file: '%s'"
 msgstr ""
 
-#: builtin/fetch.c:375
-msgid "unable to update local ref"
+#: setup.c:558
+#, c-format
+msgid "error reading %s"
 msgstr ""
 
-#: builtin/fetch.c:375
-msgid "forced update"
+#: setup.c:560
+#, c-format
+msgid "invalid gitfile format: %s"
 msgstr ""
 
-#: builtin/fetch.c:381
-msgid "(non-fast-forward)"
+#: setup.c:562
+#, c-format
+msgid "no path in gitfile: %s"
 msgstr ""
 
-#: builtin/fetch.c:412 builtin/fetch.c:718
+#: setup.c:564
 #, c-format
-msgid "cannot open %s: %s\n"
+msgid "not a git repository: %s"
 msgstr ""
 
-#: builtin/fetch.c:421
+#: setup.c:663
 #, c-format
-msgid "%s did not send all necessary objects\n"
+msgid "'$%s' too big"
 msgstr ""
 
-#: builtin/fetch.c:520
+#: setup.c:677
 #, c-format
-msgid "From %.*s\n"
+msgid "not a git repository: '%s'"
 msgstr ""
 
-#: builtin/fetch.c:531
+#: setup.c:706 setup.c:708 setup.c:739
 #, c-format
-msgid ""
-"some local refs could not be updated; try running\n"
-" 'git remote prune %s' to remove any old, conflicting branches"
+msgid "cannot chdir to '%s'"
 msgstr ""
 
-#: builtin/fetch.c:581
-#, c-format
-msgid "   (%s will become dangling)"
+#: setup.c:711 setup.c:767 setup.c:777 setup.c:816 setup.c:824 setup.c:839
+msgid "cannot come back to cwd"
 msgstr ""
 
-#: builtin/fetch.c:582
+#: setup.c:837
 #, c-format
-msgid "   (%s has become dangling)"
+msgid "not a git repository (or any of the parent directories): %s"
 msgstr ""
 
-#: builtin/fetch.c:589
-msgid "[deleted]"
+#: setup.c:848
+#, c-format
+msgid "failed to stat '%*s%s%s'"
 msgstr ""
 
-#: builtin/fetch.c:590 builtin/remote.c:1055
-msgid "(none)"
+#: setup.c:1078
+msgid "Unable to read current working directory"
 msgstr ""
 
-#: builtin/fetch.c:708
+#: setup.c:1090 setup.c:1096
 #, c-format
-msgid "Refusing to fetch into current branch %s of non-bare repository"
+msgid "cannot change to '%s'"
 msgstr ""
 
-#: builtin/fetch.c:742
+#: setup.c:1109
 #, c-format
-msgid "Don't know how to fetch from %s"
+msgid ""
+"not a git repository (or any parent up to mount point %s)\n"
+"Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."
 msgstr ""
 
-#: builtin/fetch.c:823
+#: setup.c:1192
 #, c-format
-msgid "Option \"%s\" value \"%s\" is not valid for %s"
+msgid ""
+"problem with core.sharedRepository filemode value (0%.3o).\n"
+"The owner of files must always have read and write permissions."
 msgstr ""
 
-#: builtin/fetch.c:826
-#, c-format
-msgid "Option \"%s\" is ignored for %s\n"
+#: setup.c:1235
+msgid "open /dev/null or dup failed"
+msgstr ""
+
+#: setup.c:1250
+msgid "fork failed"
+msgstr ""
+
+#: setup.c:1255
+msgid "setsid failed"
 msgstr ""
 
-#: builtin/fetch.c:928
+#: sha1-file.c:381
 #, c-format
-msgid "Fetching %s\n"
+msgid "object directory %s does not exist; check .git/objects/info/alternates"
 msgstr ""
 
-#: builtin/fetch.c:930 builtin/remote.c:100
+#: sha1-file.c:432
 #, c-format
-msgid "Could not fetch %s"
+msgid "unable to normalize alternate object path: %s"
 msgstr ""
 
-#: builtin/fetch.c:949
-msgid ""
-"No remote repository specified.  Please, specify either a URL or a\n"
-"remote name from which new revisions should be fetched."
+#: sha1-file.c:503
+#, c-format
+msgid "%s: ignoring alternate object stores, nesting too deep"
 msgstr ""
 
-#: builtin/fetch.c:969
-msgid "You need to specify a tag name."
+#: sha1-file.c:510
+#, c-format
+msgid "unable to normalize object directory: %s"
 msgstr ""
 
-#: builtin/fetch.c:1015
-msgid "--depth and --unshallow cannot be used together"
+#: sha1-file.c:565
+msgid "unable to fdopen alternates lockfile"
 msgstr ""
 
-#: builtin/fetch.c:1017
-msgid "--unshallow on a complete repository does not make sense"
+#: sha1-file.c:583
+msgid "unable to read alternates file"
 msgstr ""
 
-#: builtin/fetch.c:1036
-msgid "fetch --all does not take a repository argument"
+#: sha1-file.c:590
+msgid "unable to move new alternates file into place"
 msgstr ""
 
-#: builtin/fetch.c:1038
-msgid "fetch --all does not make sense with refspecs"
+#: sha1-file.c:625
+#, c-format
+msgid "path '%s' does not exist"
 msgstr ""
 
-#: builtin/fetch.c:1049
+#: sha1-file.c:651
 #, c-format
-msgid "No such remote or remote group: %s"
+msgid "reference repository '%s' as a linked checkout is not supported yet."
 msgstr ""
 
-#: builtin/fetch.c:1057
-msgid "Fetching a group and specifying refspecs does not make sense"
+#: sha1-file.c:657
+#, c-format
+msgid "reference repository '%s' is not a local repository."
 msgstr ""
 
-#: builtin/fmt-merge-msg.c:13
-msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"
+#: sha1-file.c:663
+#, c-format
+msgid "reference repository '%s' is shallow"
 msgstr ""
 
-#: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:700
-#: builtin/merge.c:203 builtin/show-branch.c:655 builtin/show-ref.c:179
-#: builtin/tag.c:446 parse-options.h:133 parse-options.h:243
-msgid "n"
+#: sha1-file.c:671
+#, c-format
+msgid "reference repository '%s' is grafted"
 msgstr ""
 
-#: builtin/fmt-merge-msg.c:664
-msgid "populate log with at most <n> entries from shortlog"
+#: sha1-file.c:781
+#, c-format
+msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
 msgstr ""
 
-#: builtin/fmt-merge-msg.c:667
-msgid "alias for --log (deprecated)"
+#: sha1-file.c:806
+msgid "mmap failed"
 msgstr ""
 
-#: builtin/fmt-merge-msg.c:670
-msgid "text"
+#: sha1-file.c:973
+#, c-format
+msgid "object file %s is empty"
 msgstr ""
 
-#: builtin/fmt-merge-msg.c:671
-msgid "use <text> as start of message"
+#: sha1-file.c:1093 sha1-file.c:2215
+#, c-format
+msgid "corrupt loose object '%s'"
 msgstr ""
 
-#: builtin/fmt-merge-msg.c:672
-msgid "file to read from"
+#: sha1-file.c:1095 sha1-file.c:2219
+#, c-format
+msgid "garbage at end of loose object '%s'"
 msgstr ""
 
-#: builtin/for-each-ref.c:979
-msgid "git for-each-ref [options] [<pattern>]"
+#: sha1-file.c:1137
+msgid "invalid object type"
 msgstr ""
 
-#: builtin/for-each-ref.c:994
-msgid "quote placeholders suitably for shells"
+#: sha1-file.c:1219
+#, c-format
+msgid "unable to unpack %s header with --allow-unknown-type"
 msgstr ""
 
-#: builtin/for-each-ref.c:996
-msgid "quote placeholders suitably for perl"
+#: sha1-file.c:1222
+#, c-format
+msgid "unable to unpack %s header"
 msgstr ""
 
-#: builtin/for-each-ref.c:998
-msgid "quote placeholders suitably for python"
+#: sha1-file.c:1228
+#, c-format
+msgid "unable to parse %s header with --allow-unknown-type"
 msgstr ""
 
-#: builtin/for-each-ref.c:1000
-msgid "quote placeholders suitably for tcl"
+#: sha1-file.c:1231
+#, c-format
+msgid "unable to parse %s header"
 msgstr ""
 
-#: builtin/for-each-ref.c:1003
-msgid "show only <n> matched refs"
+#: sha1-file.c:1422
+#, c-format
+msgid "failed to read object %s"
 msgstr ""
 
-#: builtin/for-each-ref.c:1004
-msgid "format"
+#: sha1-file.c:1426
+#, c-format
+msgid "replacement %s not found for %s"
 msgstr ""
 
-#: builtin/for-each-ref.c:1004
-msgid "format to use for the output"
+#: sha1-file.c:1430
+#, c-format
+msgid "loose object %s (stored in %s) is corrupt"
 msgstr ""
 
-#: builtin/for-each-ref.c:1005
-msgid "key"
+#: sha1-file.c:1434
+#, c-format
+msgid "packed object %s (stored in %s) is corrupt"
 msgstr ""
 
-#: builtin/for-each-ref.c:1006
-msgid "field name to sort on"
+#: sha1-file.c:1536
+#, c-format
+msgid "unable to write sha1 filename %s"
 msgstr ""
 
-#: builtin/fsck.c:608
-msgid "git fsck [options] [<object>...]"
+#: sha1-file.c:1543
+#, c-format
+msgid "unable to set permission to '%s'"
 msgstr ""
 
-#: builtin/fsck.c:614
-msgid "show unreachable objects"
+#: sha1-file.c:1550
+msgid "file write error"
 msgstr ""
 
-#: builtin/fsck.c:615
-msgid "show dangling objects"
+#: sha1-file.c:1569
+msgid "error when closing sha1 file"
 msgstr ""
 
-#: builtin/fsck.c:616
-msgid "report tags"
+#: sha1-file.c:1635
+#, c-format
+msgid "insufficient permission for adding an object to repository database %s"
 msgstr ""
 
-#: builtin/fsck.c:617
-msgid "report root nodes"
+#: sha1-file.c:1637
+msgid "unable to create temporary file"
 msgstr ""
 
-#: builtin/fsck.c:618
-msgid "make index objects head nodes"
+#: sha1-file.c:1661
+msgid "unable to write sha1 file"
 msgstr ""
 
-#: builtin/fsck.c:619
-msgid "make reflogs head nodes (default)"
+#: sha1-file.c:1667
+#, c-format
+msgid "unable to deflate new object %s (%d)"
 msgstr ""
 
-#: builtin/fsck.c:620
-msgid "also consider packs and alternate objects"
+#: sha1-file.c:1671
+#, c-format
+msgid "deflateEnd on object %s failed (%d)"
 msgstr ""
 
-#: builtin/fsck.c:621
-msgid "enable more strict checking"
+#: sha1-file.c:1675
+#, c-format
+msgid "confused by unstable object source data for %s"
 msgstr ""
 
-#: builtin/fsck.c:623
-msgid "write dangling objects in .git/lost-found"
+#: sha1-file.c:1685 builtin/pack-objects.c:918
+#, c-format
+msgid "failed utime() on %s"
 msgstr ""
 
-#: builtin/fsck.c:624 builtin/prune.c:134
-msgid "show progress"
+#: sha1-file.c:1760
+#, c-format
+msgid "cannot read sha1_file for %s"
 msgstr ""
 
-#: builtin/gc.c:22
-msgid "git gc [options]"
+#: sha1-file.c:1805
+msgid "corrupt commit"
 msgstr ""
 
-#: builtin/gc.c:63
-#, c-format
-msgid "Invalid %s: '%s'"
+#: sha1-file.c:1813
+msgid "corrupt tag"
 msgstr ""
 
-#: builtin/gc.c:90
+#: sha1-file.c:1912
 #, c-format
-msgid "insanely long object directory %.*s"
+msgid "read error while indexing %s"
 msgstr ""
 
-#: builtin/gc.c:179
-msgid "prune unreferenced objects"
+#: sha1-file.c:1915
+#, c-format
+msgid "short read while indexing %s"
 msgstr ""
 
-#: builtin/gc.c:181
-msgid "be more thorough (increased runtime)"
+#: sha1-file.c:1988 sha1-file.c:1997
+#, c-format
+msgid "%s: failed to insert into database"
 msgstr ""
 
-#: builtin/gc.c:182
-msgid "enable auto-gc mode"
+#: sha1-file.c:2003
+#, c-format
+msgid "%s: unsupported file type"
 msgstr ""
 
-#: builtin/gc.c:222
+#: sha1-file.c:2027
 #, c-format
-msgid ""
-"Auto packing the repository for optimum performance. You may also\n"
-"run \"git gc\" manually. See \"git help gc\" for more information.\n"
+msgid "%s is not a valid object"
 msgstr ""
 
-#: builtin/gc.c:249
-msgid ""
-"There are too many unreachable loose objects; run 'git prune' to remove them."
+#: sha1-file.c:2029
+#, c-format
+msgid "%s is not a valid '%s' object"
 msgstr ""
 
-#: builtin/grep.c:22
-msgid "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]"
+#: sha1-file.c:2056 builtin/index-pack.c:154
+#, c-format
+msgid "unable to open %s"
 msgstr ""
 
-#: builtin/grep.c:217
+#: sha1-file.c:2226 sha1-file.c:2278
 #, c-format
-msgid "grep: failed to create thread: %s"
+msgid "sha1 mismatch for %s (expected %s)"
 msgstr ""
 
-#: builtin/grep.c:364
+#: sha1-file.c:2250
 #, c-format
-msgid "Failed to chdir: %s"
+msgid "unable to mmap %s"
 msgstr ""
 
-#: builtin/grep.c:442 builtin/grep.c:477
+#: sha1-file.c:2255
 #, c-format
-msgid "unable to read tree (%s)"
+msgid "unable to unpack header of %s"
 msgstr ""
 
-#: builtin/grep.c:492
+#: sha1-file.c:2261
 #, c-format
-msgid "unable to grep from object of type %s"
+msgid "unable to parse header of %s"
 msgstr ""
 
-#: builtin/grep.c:550
+#: sha1-file.c:2272
 #, c-format
-msgid "switch `%c' expects a numerical value"
+msgid "unable to unpack contents of %s"
 msgstr ""
 
-#: builtin/grep.c:567
+#: sha1-name.c:476
 #, c-format
-msgid "cannot open '%s'"
+msgid "short SHA1 %s is ambiguous"
 msgstr ""
 
-#: builtin/grep.c:642
-msgid "search in index instead of in the work tree"
+#: sha1-name.c:487
+msgid "The candidates are:"
 msgstr ""
 
-#: builtin/grep.c:644
-msgid "find in contents not managed by git"
+#: sha1-name.c:770
+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"
+"may be created by mistake. For example,\n"
+"\n"
+"  git checkout -b $br $(git rev-parse ...)\n"
+"\n"
+"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
+"examine these refs and maybe delete them. Turn this message off by\n"
+"running \"git config advice.objectNameWarning false\""
 msgstr ""
 
-#: builtin/grep.c:646
-msgid "search in both tracked and untracked files"
+#: submodule.c:116 submodule.c:145
+msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
 msgstr ""
 
-#: builtin/grep.c:648
-msgid "search also in ignored files"
+#: submodule.c:120 submodule.c:149
+#, c-format
+msgid "Could not find section in .gitmodules where path=%s"
 msgstr ""
 
-#: builtin/grep.c:651
-msgid "show non-matching lines"
+#: submodule.c:156
+#, c-format
+msgid "Could not remove .gitmodules entry for %s"
 msgstr ""
 
-#: builtin/grep.c:653
-msgid "case insensitive matching"
+#: submodule.c:167
+msgid "staging updated .gitmodules failed"
 msgstr ""
 
-#: builtin/grep.c:655
-msgid "match patterns only at word boundaries"
+#: submodule.c:329
+#, c-format
+msgid "in unpopulated submodule '%s'"
 msgstr ""
 
-#: builtin/grep.c:657
-msgid "process binary files as text"
+#: submodule.c:360
+#, c-format
+msgid "Pathspec '%s' is in submodule '%.*s'"
 msgstr ""
 
-#: builtin/grep.c:659
-msgid "don't match patterns in binary files"
+#: submodule.c:857
+#, c-format
+msgid "submodule entry '%s' (%s) is a %s, not a commit"
 msgstr ""
 
-#: builtin/grep.c:662
-msgid "descend at most <depth> levels"
+#: submodule.c:1097 builtin/branch.c:656 builtin/submodule--helper.c:1985
+msgid "Failed to resolve HEAD as a valid ref."
 msgstr ""
 
-#: builtin/grep.c:666
-msgid "use extended POSIX regular expressions"
+#: submodule.c:1404
+#, c-format
+msgid "'%s' not recognized as a git repository"
 msgstr ""
 
-#: builtin/grep.c:669
-msgid "use basic POSIX regular expressions (default)"
+#: submodule.c:1542
+#, c-format
+msgid "could not start 'git status' in submodule '%s'"
 msgstr ""
 
-#: builtin/grep.c:672
-msgid "interpret patterns as fixed strings"
+#: submodule.c:1555
+#, c-format
+msgid "could not run 'git status' in submodule '%s'"
 msgstr ""
 
-#: builtin/grep.c:675
-msgid "use Perl-compatible regular expressions"
+#: submodule.c:1648
+#, c-format
+msgid "submodule '%s' has dirty index"
 msgstr ""
 
-#: builtin/grep.c:678
-msgid "show line numbers"
+#: submodule.c:1700
+#, c-format
+msgid "Submodule '%s' could not be updated."
 msgstr ""
 
-#: builtin/grep.c:679
-msgid "don't show filenames"
+#: submodule.c:1747
+#, c-format
+msgid ""
+"relocate_gitdir for submodule '%s' with more than one worktree not supported"
 msgstr ""
 
-#: builtin/grep.c:680
-msgid "show filenames"
+#: submodule.c:1759 submodule.c:1815
+#, c-format
+msgid "could not lookup name for submodule '%s'"
 msgstr ""
 
-#: builtin/grep.c:682
-msgid "show filenames relative to top directory"
+#: submodule.c:1766
+#, c-format
+msgid ""
+"Migrating git directory of '%s%s' from\n"
+"'%s' to\n"
+"'%s'\n"
 msgstr ""
 
-#: builtin/grep.c:684
-msgid "show only filenames instead of matching lines"
+#: submodule.c:1850
+#, c-format
+msgid "could not recurse into submodule '%s'"
 msgstr ""
 
-#: builtin/grep.c:686
-msgid "synonym for --files-with-matches"
+#: submodule.c:1894
+msgid "could not start ls-files in .."
 msgstr ""
 
-#: builtin/grep.c:689
-msgid "show only the names of files without match"
+#: submodule.c:1933
+#, c-format
+msgid "ls-tree returned unexpected return code %d"
 msgstr ""
 
-#: builtin/grep.c:691
-msgid "print NUL after filenames"
+#: submodule-config.c:232
+#, c-format
+msgid "ignoring suspicious submodule name: %s"
 msgstr ""
 
-#: builtin/grep.c:693
-msgid "show the number of matches instead of matching lines"
+#: submodule-config.c:296
+msgid "negative values not allowed for submodule.fetchjobs"
 msgstr ""
 
-#: builtin/grep.c:694
-msgid "highlight matches"
+#: submodule-config.c:390
+#, c-format
+msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
 msgstr ""
 
-#: builtin/grep.c:696
-msgid "print empty line between matches from different files"
+#: submodule-config.c:479
+#, c-format
+msgid "invalid value for %s"
 msgstr ""
 
-#: builtin/grep.c:698
-msgid "show filename only once above matches from same file"
+#: submodule-config.c:754
+#, c-format
+msgid "Could not update .gitmodules entry %s"
 msgstr ""
 
-#: builtin/grep.c:701
-msgid "show <n> context lines before and after matches"
+#: trailer.c:238
+#, c-format
+msgid "running trailer command '%s' failed"
 msgstr ""
 
-#: builtin/grep.c:704
-msgid "show <n> context lines before matches"
+#: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553
+#: trailer.c:557
+#, c-format
+msgid "unknown value '%s' for key '%s'"
 msgstr ""
 
-#: builtin/grep.c:706
-msgid "show <n> context lines after matches"
+#: trailer.c:539 trailer.c:544 builtin/remote.c:295
+#, c-format
+msgid "more than one %s"
 msgstr ""
 
-#: builtin/grep.c:707
-msgid "shortcut for -C NUM"
+#: trailer.c:730
+#, c-format
+msgid "empty trailer token in trailer '%.*s'"
 msgstr ""
 
-#: builtin/grep.c:710
-msgid "show a line with the function name before matches"
+#: trailer.c:750
+#, c-format
+msgid "could not read input file '%s'"
 msgstr ""
 
-#: builtin/grep.c:712
-msgid "show the surrounding function"
+#: trailer.c:753
+msgid "could not read from stdin"
 msgstr ""
 
-#: builtin/grep.c:715
-msgid "read patterns from file"
+#: trailer.c:1011 builtin/am.c:47
+#, c-format
+msgid "could not stat %s"
 msgstr ""
 
-#: builtin/grep.c:717
-msgid "match <pattern>"
+#: trailer.c:1013
+#, c-format
+msgid "file %s is not a regular file"
 msgstr ""
 
-#: builtin/grep.c:719
-msgid "combine patterns specified with -e"
+#: trailer.c:1015
+#, c-format
+msgid "file %s is not writable by user"
 msgstr ""
 
-#: builtin/grep.c:731
-msgid "indicate hit with exit status without output"
+#: trailer.c:1027
+msgid "could not open temporary file"
 msgstr ""
 
-#: builtin/grep.c:733
-msgid "show only matches from files that match all patterns"
-msgstr ""
-
-#: builtin/grep.c:735
-msgid "show parse tree for grep expression"
+#: trailer.c:1067
+#, c-format
+msgid "could not rename temporary file to %s"
 msgstr ""
 
-#: builtin/grep.c:739
-msgid "pager"
+#: transport.c:116
+#, c-format
+msgid "Would set upstream of '%s' to '%s' of '%s'\n"
 msgstr ""
 
-#: builtin/grep.c:739
-msgid "show matching files in the pager"
+#: transport.c:142
+#, c-format
+msgid "could not read bundle '%s'"
 msgstr ""
 
-#: builtin/grep.c:742
-msgid "allow calling of grep(1) (ignored by this build)"
+#: transport.c:208
+#, c-format
+msgid "transport: invalid depth option '%s'"
 msgstr ""
 
-#: builtin/grep.c:743 builtin/show-ref.c:188
-msgid "show usage"
+#: transport.c:616
+msgid "could not parse transport.color.* config"
 msgstr ""
 
-#: builtin/grep.c:810
-msgid "no pattern given."
+#: transport.c:689
+msgid "support for protocol v2 not implemented yet"
 msgstr ""
 
-#: builtin/grep.c:865
-msgid "--open-files-in-pager only works on the worktree"
+#: transport.c:816
+#, c-format
+msgid "unknown value for config '%s': %s"
 msgstr ""
 
-#: builtin/grep.c:888
-msgid "--cached or --untracked cannot be used with --no-index."
+#: transport.c:882
+#, c-format
+msgid "transport '%s' not allowed"
 msgstr ""
 
-#: builtin/grep.c:893
-msgid "--no-index or --untracked cannot be used with revs."
+#: transport.c:936
+msgid "git-over-rsync is no longer supported"
 msgstr ""
 
-#: builtin/grep.c:896
-msgid "--[no-]exclude-standard cannot be used for tracked contents."
+#: transport.c:1031
+#, c-format
+msgid ""
+"The following submodule paths contain changes that can\n"
+"not be found on any remote:\n"
 msgstr ""
 
-#: builtin/grep.c:904
-msgid "both --cached and trees are given."
+#: transport.c:1035
+#, c-format
+msgid ""
+"\n"
+"Please try\n"
+"\n"
+"\tgit push --recurse-submodules=on-demand\n"
+"\n"
+"or cd to the path and use\n"
+"\n"
+"\tgit push\n"
+"\n"
+"to push them to a remote.\n"
+"\n"
 msgstr ""
 
-#: builtin/hash-object.c:60
-msgid ""
-"git hash-object [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] "
-"<file>..."
+#: transport.c:1043
+msgid "Aborting."
 msgstr ""
 
-#: builtin/hash-object.c:61
-msgid "git hash-object  --stdin-paths < <list-of-paths>"
+#: transport.c:1182
+msgid "failed to push all needed submodules"
 msgstr ""
 
-#: builtin/hash-object.c:72
-msgid "type"
+#: transport.c:1315 transport-helper.c:643
+msgid "operation not supported by protocol"
 msgstr ""
 
-#: builtin/hash-object.c:72
-msgid "object type"
+#: transport.c:1419
+#, c-format
+msgid "invalid line while parsing alternate refs: %s"
 msgstr ""
 
-#: builtin/hash-object.c:73
-msgid "write the object into the object database"
+#: transport-helper.c:51 transport-helper.c:80
+msgid "full write to remote helper failed"
 msgstr ""
 
-#: builtin/hash-object.c:74
-msgid "read the object from stdin"
+#: transport-helper.c:132
+#, c-format
+msgid "unable to find remote helper for '%s'"
 msgstr ""
 
-#: builtin/hash-object.c:76
-msgid "store file as is without filters"
+#: transport-helper.c:148 transport-helper.c:557
+msgid "can't dup helper output fd"
 msgstr ""
 
-#: builtin/hash-object.c:77
-msgid "process file as it were from this path"
+#: transport-helper.c:199
+#, c-format
+msgid ""
+"unknown mandatory capability %s; this remote helper probably needs newer "
+"version of Git"
 msgstr ""
 
-#: builtin/help.c:41
-msgid "print all available commands"
+#: transport-helper.c:205
+msgid "this remote helper should implement refspec capability"
 msgstr ""
 
-#: builtin/help.c:42
-msgid "print list of useful guides"
+#: transport-helper.c:272 transport-helper.c:412
+#, c-format
+msgid "%s unexpectedly said: '%s'"
 msgstr ""
 
-#: builtin/help.c:43
-msgid "show man page"
+#: transport-helper.c:401
+#, c-format
+msgid "%s also locked %s"
 msgstr ""
 
-#: builtin/help.c:44
-msgid "show manual in web browser"
+#: transport-helper.c:479
+msgid "couldn't run fast-import"
 msgstr ""
 
-#: builtin/help.c:46
-msgid "show info page"
+#: transport-helper.c:502
+msgid "error while running fast-import"
 msgstr ""
 
-#: builtin/help.c:52
-msgid "git help [--all] [--guides] [--man|--web|--info] [command]"
+#: transport-helper.c:531 transport-helper.c:1091
+#, c-format
+msgid "could not read ref %s"
 msgstr ""
 
-#: builtin/help.c:64
+#: transport-helper.c:576
 #, c-format
-msgid "unrecognized help format '%s'"
+msgid "unknown response to connect: %s"
 msgstr ""
 
-#: builtin/help.c:92
-msgid "Failed to start emacsclient."
+#: transport-helper.c:598
+msgid "setting remote service path not supported by protocol"
 msgstr ""
 
-#: builtin/help.c:105
-msgid "Failed to parse emacsclient version."
+#: transport-helper.c:600
+msgid "invalid remote service path"
 msgstr ""
 
-#: builtin/help.c:113
+#: transport-helper.c:646
 #, c-format
-msgid "emacsclient version '%d' too old (< 22)."
+msgid "can't connect to subservice %s"
 msgstr ""
 
-#: builtin/help.c:131 builtin/help.c:159 builtin/help.c:168 builtin/help.c:176
+#: transport-helper.c:713
 #, c-format
-msgid "failed to exec '%s': %s"
+msgid "expected ok/error, helper said '%s'"
 msgstr ""
 
-#: builtin/help.c:216
+#: transport-helper.c:766
 #, c-format
-msgid ""
-"'%s': path for unsupported man viewer.\n"
-"Please consider using 'man.<tool>.cmd' instead."
+msgid "helper reported unexpected status of %s"
 msgstr ""
 
-#: builtin/help.c:228
+#: transport-helper.c:827
 #, c-format
-msgid ""
-"'%s': cmd for supported man viewer.\n"
-"Please consider using 'man.<tool>.path' instead."
+msgid "helper %s does not support dry-run"
 msgstr ""
 
-#: builtin/help.c:349
+#: transport-helper.c:830
 #, c-format
-msgid "'%s': unknown man viewer."
+msgid "helper %s does not support --signed"
 msgstr ""
 
-#: builtin/help.c:366
-msgid "no man viewer handled the request"
+#: transport-helper.c:833
+#, c-format
+msgid "helper %s does not support --signed=if-asked"
 msgstr ""
 
-#: builtin/help.c:374
-msgid "no info viewer handled the request"
+#: transport-helper.c:840
+#, c-format
+msgid "helper %s does not support 'push-option'"
 msgstr ""
 
-#: builtin/help.c:420
-msgid "Defining attributes per path"
+#: transport-helper.c:932
+msgid "remote-helper doesn't support push; refspec needed"
 msgstr ""
 
-#: builtin/help.c:421
-msgid "A Git glossary"
+#: transport-helper.c:937
+#, c-format
+msgid "helper %s does not support 'force'"
 msgstr ""
 
-#: builtin/help.c:422
-msgid "Specifies intentionally untracked files to ignore"
+#: transport-helper.c:984
+msgid "couldn't run fast-export"
 msgstr ""
 
-#: builtin/help.c:423
-msgid "Defining submodule properties"
+#: transport-helper.c:989
+msgid "error while running fast-export"
 msgstr ""
 
-#: builtin/help.c:424
-msgid "Specifying revisions and ranges for Git"
+#: transport-helper.c:1014
+#, c-format
+msgid ""
+"No refs in common and none specified; doing nothing.\n"
+"Perhaps you should specify a branch such as 'master'.\n"
 msgstr ""
 
-#: builtin/help.c:425
-msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
+#: transport-helper.c:1077
+#, c-format
+msgid "malformed response in ref list: %s"
 msgstr ""
 
-#: builtin/help.c:426
-msgid "An overview of recommended workflows with Git"
+#: transport-helper.c:1231
+#, c-format
+msgid "read(%s) failed"
 msgstr ""
 
-#: builtin/help.c:438
-msgid "The common Git guides are:\n"
+#: transport-helper.c:1258
+#, c-format
+msgid "write(%s) failed"
 msgstr ""
 
-#: builtin/help.c:460 builtin/help.c:476
+#: transport-helper.c:1307
 #, c-format
-msgid "usage: %s%s"
+msgid "%s thread failed"
 msgstr ""
 
-#: builtin/help.c:492
+#: transport-helper.c:1311
 #, c-format
-msgid "`git %s' is aliased to `%s'"
+msgid "%s thread failed to join: %s"
 msgstr ""
 
-#: builtin/index-pack.c:184
+#: transport-helper.c:1330 transport-helper.c:1334
 #, c-format
-msgid "object type mismatch at %s"
+msgid "can't start thread for copying data: %s"
 msgstr ""
 
-#: builtin/index-pack.c:204
-msgid "object of unexpected type"
+#: transport-helper.c:1371
+#, c-format
+msgid "%s process failed to wait"
 msgstr ""
 
-#: builtin/index-pack.c:244
+#: transport-helper.c:1375
 #, c-format
-msgid "cannot fill %d byte"
-msgid_plural "cannot fill %d bytes"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/index-pack.c:254
-msgid "early EOF"
+msgid "%s process failed"
 msgstr ""
 
-#: builtin/index-pack.c:255
-msgid "read error on input"
+#: transport-helper.c:1393 transport-helper.c:1402
+msgid "can't start thread for copying data"
 msgstr ""
 
-#: builtin/index-pack.c:267
-msgid "used more bytes than were available"
+#: tree-walk.c:33
+msgid "too-short tree object"
 msgstr ""
 
-#: builtin/index-pack.c:274
-msgid "pack too large for current definition of off_t"
+#: tree-walk.c:39
+msgid "malformed mode in tree entry"
 msgstr ""
 
-#: builtin/index-pack.c:290
-#, c-format
-msgid "unable to create '%s'"
+#: tree-walk.c:43
+msgid "empty filename in tree entry"
 msgstr ""
 
-#: builtin/index-pack.c:295
-#, c-format
-msgid "cannot open packfile '%s'"
+#: tree-walk.c:115
+msgid "too-short tree file"
 msgstr ""
 
-#: builtin/index-pack.c:309
-msgid "pack signature mismatch"
+#: unpack-trees.c:112
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by checkout:\n"
+"%%sPlease commit your changes or stash them before you switch branches."
 msgstr ""
 
-#: builtin/index-pack.c:311
+#: unpack-trees.c:114
 #, c-format
-msgid "pack version %<PRIu32> unsupported"
+msgid ""
+"Your local changes to the following files would be overwritten by checkout:\n"
+"%%s"
 msgstr ""
 
-#: builtin/index-pack.c:329
+#: unpack-trees.c:117
 #, c-format
-msgid "pack has bad object at offset %lu: %s"
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"%%sPlease commit your changes or stash them before you merge."
 msgstr ""
 
-#: builtin/index-pack.c:451
+#: unpack-trees.c:119
 #, c-format
-msgid "inflate returned %d"
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"%%s"
 msgstr ""
 
-#: builtin/index-pack.c:500
-msgid "offset value overflow for delta base object"
+#: unpack-trees.c:122
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by %s:\n"
+"%%sPlease commit your changes or stash them before you %s."
 msgstr ""
 
-#: builtin/index-pack.c:508
-msgid "delta base offset is out of bound"
+#: unpack-trees.c:124
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by %s:\n"
+"%%s"
 msgstr ""
 
-#: builtin/index-pack.c:516
+#: unpack-trees.c:129
 #, c-format
-msgid "unknown object type %d"
+msgid ""
+"Updating the following directories would lose untracked files in them:\n"
+"%s"
 msgstr ""
 
-#: builtin/index-pack.c:547
-msgid "cannot pread pack file"
+#: unpack-trees.c:133
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%sPlease move or remove them before you switch branches."
 msgstr ""
 
-#: builtin/index-pack.c:549
+#: unpack-trees.c:135
 #, c-format
-msgid "premature end of pack file, %lu byte missing"
-msgid_plural "premature end of pack file, %lu bytes missing"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/index-pack.c:575
-msgid "serious inflate inconsistency"
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%s"
 msgstr ""
 
-#: builtin/index-pack.c:666 builtin/index-pack.c:672 builtin/index-pack.c:695
-#: builtin/index-pack.c:729 builtin/index-pack.c:738
+#: unpack-trees.c:138
 #, c-format
-msgid "SHA1 COLLISION FOUND WITH %s !"
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%sPlease move or remove them before you merge."
 msgstr ""
 
-#: builtin/index-pack.c:669 builtin/pack-objects.c:170
-#: builtin/pack-objects.c:262
+#: unpack-trees.c:140
 #, c-format
-msgid "unable to read %s"
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%s"
 msgstr ""
 
-#: builtin/index-pack.c:735
+#: unpack-trees.c:143
 #, c-format
-msgid "cannot read existing object %s"
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%sPlease move or remove them before you %s."
 msgstr ""
 
-#: builtin/index-pack.c:749
+#: unpack-trees.c:145
 #, c-format
-msgid "invalid blob object %s"
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%s"
 msgstr ""
 
-#: builtin/index-pack.c:763
+#: unpack-trees.c:151
 #, c-format
-msgid "invalid %s"
+msgid ""
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%sPlease move or remove them before you switch branches."
 msgstr ""
 
-#: builtin/index-pack.c:766
-msgid "Error in object"
+#: unpack-trees.c:153
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%s"
 msgstr ""
 
-#: builtin/index-pack.c:768
+#: unpack-trees.c:156
 #, c-format
-msgid "Not all child objects of %s are reachable"
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%sPlease move or remove them before you merge."
 msgstr ""
 
-#: builtin/index-pack.c:838 builtin/index-pack.c:868
-msgid "failed to apply delta"
+#: unpack-trees.c:158
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%s"
 msgstr ""
 
-#: builtin/index-pack.c:1009
-msgid "Receiving objects"
+#: unpack-trees.c:161
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%sPlease move or remove them before you %s."
 msgstr ""
 
-#: builtin/index-pack.c:1009
-msgid "Indexing objects"
+#: unpack-trees.c:163
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%s"
 msgstr ""
 
-#: builtin/index-pack.c:1035
-msgid "pack is corrupted (SHA1 mismatch)"
+#: unpack-trees.c:171
+#, c-format
+msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
 msgstr ""
 
-#: builtin/index-pack.c:1040
-msgid "cannot fstat packfile"
+#: unpack-trees.c:174
+#, c-format
+msgid ""
+"Cannot update sparse checkout: the following entries are not up to date:\n"
+"%s"
 msgstr ""
 
-#: builtin/index-pack.c:1043
-msgid "pack has junk at the end"
+#: unpack-trees.c:176
+#, c-format
+msgid ""
+"The following working tree files would be overwritten by sparse checkout "
+"update:\n"
+"%s"
 msgstr ""
 
-#: builtin/index-pack.c:1054
-msgid "confusion beyond insanity in parse_pack_objects()"
+#: unpack-trees.c:178
+#, c-format
+msgid ""
+"The following working tree files would be removed by sparse checkout "
+"update:\n"
+"%s"
 msgstr ""
 
-#: builtin/index-pack.c:1077
-msgid "Resolving deltas"
+#: unpack-trees.c:180
+#, c-format
+msgid ""
+"Cannot update submodule:\n"
+"%s"
 msgstr ""
 
-#: builtin/index-pack.c:1087
+#: unpack-trees.c:254
 #, c-format
-msgid "unable to create thread: %s"
+msgid "Aborting\n"
 msgstr ""
 
-#: builtin/index-pack.c:1129
-msgid "confusion beyond insanity"
+#: unpack-trees.c:336
+msgid "Checking out files"
 msgstr ""
 
-#: builtin/index-pack.c:1137
-#, c-format
-msgid "completed with %d local objects"
+#: unpack-trees.c:368
+msgid ""
+"the following paths have collided (e.g. case-sensitive paths\n"
+"on a case-insensitive filesystem) and only one from the same\n"
+"colliding group is in the working tree:\n"
 msgstr ""
 
-#: builtin/index-pack.c:1147
-#, c-format
-msgid "Unexpected tail checksum for %s (disk corruption?)"
+#: urlmatch.c:163
+msgid "invalid URL scheme name or missing '://' suffix"
 msgstr ""
 
-#: builtin/index-pack.c:1151
-#, c-format
-msgid "pack has %d unresolved delta"
-msgid_plural "pack has %d unresolved deltas"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/index-pack.c:1176
+#: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405
 #, c-format
-msgid "unable to deflate appended object (%d)"
+msgid "invalid %XX escape sequence"
 msgstr ""
 
-#: builtin/index-pack.c:1255
-#, c-format
-msgid "local object %s is corrupt"
+#: urlmatch.c:215
+msgid "missing host and scheme is not 'file:'"
 msgstr ""
 
-#: builtin/index-pack.c:1279
-msgid "error while closing pack file"
+#: urlmatch.c:232
+msgid "a 'file:' URL may not have a port number"
 msgstr ""
 
-#: builtin/index-pack.c:1292
-#, c-format
-msgid "cannot write keep file '%s'"
+#: urlmatch.c:247
+msgid "invalid characters in host name"
 msgstr ""
 
-#: builtin/index-pack.c:1300
-#, c-format
-msgid "cannot close written keep file '%s'"
+#: urlmatch.c:292 urlmatch.c:303
+msgid "invalid port number"
 msgstr ""
 
-#: builtin/index-pack.c:1313
-msgid "cannot store pack file"
+#: urlmatch.c:371
+msgid "invalid '..' path segment"
 msgstr ""
 
-#: builtin/index-pack.c:1324
-msgid "cannot store index file"
+#: worktree.c:249 builtin/am.c:2100
+#, c-format
+msgid "failed to read '%s'"
 msgstr ""
 
-#: builtin/index-pack.c:1357
+#: worktree.c:295
 #, c-format
-msgid "bad pack.indexversion=%<PRIu32>"
+msgid "'%s' at main working tree is not the repository directory"
 msgstr ""
 
-#: builtin/index-pack.c:1363
+#: worktree.c:306
 #, c-format
-msgid "invalid number of threads specified (%d)"
+msgid "'%s' file does not contain absolute path to the working tree location"
 msgstr ""
 
-#: builtin/index-pack.c:1367 builtin/index-pack.c:1545
+#: worktree.c:318
 #, c-format
-msgid "no threads support, ignoring %s"
+msgid "'%s' does not exist"
 msgstr ""
 
-#: builtin/index-pack.c:1425
+#: worktree.c:324
 #, c-format
-msgid "Cannot open existing pack file '%s'"
+msgid "'%s' is not a .git file, error code %d"
 msgstr ""
 
-#: builtin/index-pack.c:1427
+#: worktree.c:332
 #, c-format
-msgid "Cannot open existing pack idx file for '%s'"
+msgid "'%s' does not point back to '%s'"
 msgstr ""
 
-#: builtin/index-pack.c:1474
+#: wrapper.c:223 wrapper.c:393
 #, c-format
-msgid "non delta: %d object"
-msgid_plural "non delta: %d objects"
-msgstr[0] ""
-msgstr[1] ""
+msgid "could not open '%s' for reading and writing"
+msgstr ""
 
-#: builtin/index-pack.c:1481
+#: wrapper.c:424 wrapper.c:624
 #, c-format
-msgid "chain length = %d: %lu object"
-msgid_plural "chain length = %d: %lu objects"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/index-pack.c:1509
-msgid "Cannot come back to cwd"
+msgid "unable to access '%s'"
 msgstr ""
 
-#: builtin/index-pack.c:1557 builtin/index-pack.c:1560
-#: builtin/index-pack.c:1572 builtin/index-pack.c:1576
-#, c-format
-msgid "bad %s"
+#: wrapper.c:632
+msgid "unable to get current working directory"
 msgstr ""
 
-#: builtin/index-pack.c:1590
-msgid "--fix-thin cannot be used without --stdin"
+#: wt-status.c:154
+msgid "Unmerged paths:"
 msgstr ""
 
-#: builtin/index-pack.c:1594 builtin/index-pack.c:1604
+#: wt-status.c:181 wt-status.c:208
 #, c-format
-msgid "packfile name '%s' does not end with '.pack'"
+msgid "  (use \"git reset %s <file>...\" to unstage)"
 msgstr ""
 
-#: builtin/index-pack.c:1613
-msgid "--verify with no packfile name given"
+#: wt-status.c:183 wt-status.c:210
+msgid "  (use \"git rm --cached <file>...\" to unstage)"
 msgstr ""
 
-#: builtin/init-db.c:35
-#, c-format
-msgid "Could not make %s writable by group"
+#: wt-status.c:187
+msgid "  (use \"git add <file>...\" to mark resolution)"
 msgstr ""
 
-#: builtin/init-db.c:62
-#, c-format
-msgid "insanely long template name %s"
+#: wt-status.c:189 wt-status.c:193
+msgid "  (use \"git add/rm <file>...\" as appropriate to mark resolution)"
 msgstr ""
 
-#: builtin/init-db.c:67
-#, c-format
-msgid "cannot stat '%s'"
+#: wt-status.c:191
+msgid "  (use \"git rm <file>...\" to mark resolution)"
 msgstr ""
 
-#: builtin/init-db.c:73
-#, c-format
-msgid "cannot stat template '%s'"
+#: wt-status.c:202 wt-status.c:1042
+msgid "Changes to be committed:"
 msgstr ""
 
-#: builtin/init-db.c:80
-#, c-format
-msgid "cannot opendir '%s'"
+#: wt-status.c:220 wt-status.c:1051
+msgid "Changes not staged for commit:"
 msgstr ""
 
-#: builtin/init-db.c:97
-#, c-format
-msgid "cannot readlink '%s'"
+#: wt-status.c:224
+msgid "  (use \"git add <file>...\" to update what will be committed)"
 msgstr ""
 
-#: builtin/init-db.c:99
-#, c-format
-msgid "insanely long symlink %s"
+#: wt-status.c:226
+msgid "  (use \"git add/rm <file>...\" to update what will be committed)"
 msgstr ""
 
-#: builtin/init-db.c:102
-#, c-format
-msgid "cannot symlink '%s' '%s'"
+#: wt-status.c:227
+msgid ""
+"  (use \"git checkout -- <file>...\" to discard changes in working directory)"
 msgstr ""
 
-#: builtin/init-db.c:106
-#, c-format
-msgid "cannot copy '%s' to '%s'"
+#: wt-status.c:229
+msgid "  (commit or discard the untracked or modified content in submodules)"
 msgstr ""
 
-#: builtin/init-db.c:110
+#: wt-status.c:241
 #, c-format
-msgid "ignoring template %s"
+msgid "  (use \"git %s <file>...\" to include in what will be committed)"
 msgstr ""
 
-#: builtin/init-db.c:133
-#, c-format
-msgid "insanely long template path %s"
+#: wt-status.c:256
+msgid "both deleted:"
 msgstr ""
 
-#: builtin/init-db.c:141
-#, c-format
-msgid "templates not found %s"
+#: wt-status.c:258
+msgid "added by us:"
 msgstr ""
 
-#: builtin/init-db.c:154
-#, c-format
-msgid "not copying templates of a wrong format version %d from '%s'"
+#: wt-status.c:260
+msgid "deleted by them:"
 msgstr ""
 
-#: builtin/init-db.c:192
-#, c-format
-msgid "insane git directory %s"
+#: wt-status.c:262
+msgid "added by them:"
 msgstr ""
 
-#: builtin/init-db.c:323 builtin/init-db.c:326
-#, c-format
-msgid "%s already exists"
+#: wt-status.c:264
+msgid "deleted by us:"
 msgstr ""
 
-#: builtin/init-db.c:355
-#, c-format
-msgid "unable to handle file type %d"
+#: wt-status.c:266
+msgid "both added:"
 msgstr ""
 
-#: builtin/init-db.c:358
-#, c-format
-msgid "unable to move %s to %s"
+#: wt-status.c:268
+msgid "both modified:"
 msgstr ""
 
-#: builtin/init-db.c:363
-#, c-format
-msgid "Could not create git link %s"
+#: wt-status.c:278
+msgid "new file:"
 msgstr ""
 
-#.
-#. * TRANSLATORS: The first '%s' is either "Reinitialized
-#. * existing" or "Initialized empty", the second " shared" or
-#. * "", and the last '%s%s' is the verbatim directory name.
-#.
-#: builtin/init-db.c:420
-#, c-format
-msgid "%s%s Git repository in %s%s\n"
+#: wt-status.c:280
+msgid "copied:"
 msgstr ""
 
-#: builtin/init-db.c:421
-msgid "Reinitialized existing"
+#: wt-status.c:282
+msgid "deleted:"
 msgstr ""
 
-#: builtin/init-db.c:421
-msgid "Initialized empty"
+#: wt-status.c:284
+msgid "modified:"
 msgstr ""
 
-#: builtin/init-db.c:422
-msgid " shared"
+#: wt-status.c:286
+msgid "renamed:"
 msgstr ""
 
-#: builtin/init-db.c:441
-msgid "cannot tell cwd"
+#: wt-status.c:288
+msgid "typechange:"
 msgstr ""
 
-#: builtin/init-db.c:467
-msgid ""
-"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
-"shared[=<permissions>]] [directory]"
+#: wt-status.c:290
+msgid "unknown:"
 msgstr ""
 
-#: builtin/init-db.c:490
-msgid "permissions"
+#: wt-status.c:292
+msgid "unmerged:"
 msgstr ""
 
-#: builtin/init-db.c:491
-msgid "specify that the git repository is to be shared amongst several users"
+#: wt-status.c:372
+msgid "new commits, "
 msgstr ""
 
-#: builtin/init-db.c:493 builtin/prune-packed.c:75
-msgid "be quiet"
+#: wt-status.c:374
+msgid "modified content, "
 msgstr ""
 
-#: builtin/init-db.c:522 builtin/init-db.c:529
-#, c-format
-msgid "cannot mkdir %s"
+#: wt-status.c:376
+msgid "untracked content, "
 msgstr ""
 
-#: builtin/init-db.c:533
+#: wt-status.c:880
 #, c-format
-msgid "cannot chdir to %s"
-msgstr ""
+msgid "Your stash currently has %d entry"
+msgid_plural "Your stash currently has %d entries"
+msgstr[0] ""
+msgstr[1] ""
 
-#: builtin/init-db.c:555
-#, c-format
-msgid ""
-"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
-"dir=<directory>)"
+#: wt-status.c:912
+msgid "Submodules changed but not updated:"
 msgstr ""
 
-#: builtin/init-db.c:579
-msgid "Cannot access current working directory"
+#: wt-status.c:914
+msgid "Submodule changes to be committed:"
 msgstr ""
 
-#: builtin/init-db.c:586
-#, c-format
-msgid "Cannot access work tree '%s'"
+#: wt-status.c:996
+msgid ""
+"Do not modify or remove the line above.\n"
+"Everything below it will be ignored."
 msgstr ""
 
-#: builtin/log.c:41
-msgid "git log [<options>] [<revision range>] [[--] <path>...]\n"
+#: wt-status.c:1097
+msgid "You have unmerged paths."
 msgstr ""
 
-#: builtin/log.c:42
-msgid "   or: git show [options] <object>..."
+#: wt-status.c:1100
+msgid "  (fix conflicts and run \"git commit\")"
 msgstr ""
 
-#: builtin/log.c:124
-msgid "suppress diff output"
+#: wt-status.c:1102
+msgid "  (use \"git merge --abort\" to abort the merge)"
 msgstr ""
 
-#: builtin/log.c:125
-msgid "show source"
+#: wt-status.c:1106
+msgid "All conflicts fixed but you are still merging."
 msgstr ""
 
-#: builtin/log.c:126
-msgid "Use mail map file"
+#: wt-status.c:1109
+msgid "  (use \"git commit\" to conclude merge)"
 msgstr ""
 
-#: builtin/log.c:127
-msgid "decorate options"
+#: wt-status.c:1118
+msgid "You are in the middle of an am session."
 msgstr ""
 
-#: builtin/log.c:230
-#, c-format
-msgid "Final output: %d %s\n"
+#: wt-status.c:1121
+msgid "The current patch is empty."
 msgstr ""
 
-#: builtin/log.c:453 builtin/log.c:545
-#, c-format
-msgid "Could not read object %s"
+#: wt-status.c:1125
+msgid "  (fix conflicts and then run \"git am --continue\")"
 msgstr ""
 
-#: builtin/log.c:569
-#, c-format
-msgid "Unknown type: %d"
+#: wt-status.c:1127
+msgid "  (use \"git am --skip\" to skip this patch)"
 msgstr ""
 
-#: builtin/log.c:669
-msgid "format.headers without value"
+#: wt-status.c:1129
+msgid "  (use \"git am --abort\" to restore the original branch)"
 msgstr ""
 
-#: builtin/log.c:751
-msgid "name of output directory is too long"
+#: wt-status.c:1260
+msgid "git-rebase-todo is missing."
 msgstr ""
 
-#: builtin/log.c:767
-#, c-format
-msgid "Cannot open patch file %s"
+#: wt-status.c:1262
+msgid "No commands done."
 msgstr ""
 
-#: builtin/log.c:781
-msgid "Need exactly one range."
-msgstr ""
+#: wt-status.c:1265
+#, c-format
+msgid "Last command done (%d command done):"
+msgid_plural "Last commands done (%d commands done):"
+msgstr[0] ""
+msgstr[1] ""
 
-#: builtin/log.c:789
-msgid "Not a range."
+#: wt-status.c:1276
+#, c-format
+msgid "  (see more in file %s)"
 msgstr ""
 
-#: builtin/log.c:891
-msgid "Cover letter needs email format"
+#: wt-status.c:1281
+msgid "No commands remaining."
 msgstr ""
 
-#: builtin/log.c:967
+#: wt-status.c:1284
 #, c-format
-msgid "insane in-reply-to: %s"
+msgid "Next command to do (%d remaining command):"
+msgid_plural "Next commands to do (%d remaining commands):"
+msgstr[0] ""
+msgstr[1] ""
+
+#: wt-status.c:1292
+msgid "  (use \"git rebase --edit-todo\" to view and edit)"
 msgstr ""
 
-#: builtin/log.c:995
-msgid "git format-patch [options] [<since> | <revision range>]"
+#: wt-status.c:1304
+#, c-format
+msgid "You are currently rebasing branch '%s' on '%s'."
 msgstr ""
 
-#: builtin/log.c:1040
-msgid "Two output directories?"
+#: wt-status.c:1309
+msgid "You are currently rebasing."
 msgstr ""
 
-#: builtin/log.c:1155
-msgid "use [PATCH n/m] even with a single patch"
+#: wt-status.c:1322
+msgid "  (fix conflicts and then run \"git rebase --continue\")"
 msgstr ""
 
-#: builtin/log.c:1158
-msgid "use [PATCH] even with multiple patches"
+#: wt-status.c:1324
+msgid "  (use \"git rebase --skip\" to skip this patch)"
 msgstr ""
 
-#: builtin/log.c:1162
-msgid "print patches to standard out"
+#: wt-status.c:1326
+msgid "  (use \"git rebase --abort\" to check out the original branch)"
 msgstr ""
 
-#: builtin/log.c:1164
-msgid "generate a cover letter"
+#: wt-status.c:1333
+msgid "  (all conflicts fixed: run \"git rebase --continue\")"
 msgstr ""
 
-#: builtin/log.c:1166
-msgid "use simple number sequence for output file names"
+#: wt-status.c:1337
+#, c-format
+msgid ""
+"You are currently splitting a commit while rebasing branch '%s' on '%s'."
 msgstr ""
 
-#: builtin/log.c:1167
-msgid "sfx"
+#: wt-status.c:1342
+msgid "You are currently splitting a commit during a rebase."
 msgstr ""
 
-#: builtin/log.c:1168
-msgid "use <sfx> instead of '.patch'"
+#: wt-status.c:1345
+msgid "  (Once your working directory is clean, run \"git rebase --continue\")"
 msgstr ""
 
-#: builtin/log.c:1170
-msgid "start numbering patches at <n> instead of 1"
+#: wt-status.c:1349
+#, c-format
+msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
 msgstr ""
 
-#: builtin/log.c:1172
-msgid "mark the series as Nth re-roll"
+#: wt-status.c:1354
+msgid "You are currently editing a commit during a rebase."
 msgstr ""
 
-#: builtin/log.c:1174
-msgid "Use [<prefix>] instead of [PATCH]"
+#: wt-status.c:1357
+msgid "  (use \"git commit --amend\" to amend the current commit)"
 msgstr ""
 
-#: builtin/log.c:1177
-msgid "store resulting files in <dir>"
+#: wt-status.c:1359
+msgid ""
+"  (use \"git rebase --continue\" once you are satisfied with your changes)"
 msgstr ""
 
-#: builtin/log.c:1180
-msgid "don't strip/add [PATCH]"
+#: wt-status.c:1368
+#, c-format
+msgid "You are currently cherry-picking commit %s."
 msgstr ""
 
-#: builtin/log.c:1183
-msgid "don't output binary diffs"
+#: wt-status.c:1373
+msgid "  (fix conflicts and run \"git cherry-pick --continue\")"
 msgstr ""
 
-#: builtin/log.c:1185
-msgid "don't include a patch matching a commit upstream"
+#: wt-status.c:1376
+msgid "  (all conflicts fixed: run \"git cherry-pick --continue\")"
 msgstr ""
 
-#: builtin/log.c:1187
-msgid "show patch format instead of default (patch + stat)"
+#: wt-status.c:1378
+msgid "  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
 msgstr ""
 
-#: builtin/log.c:1189
-msgid "Messaging"
+#: wt-status.c:1386
+#, c-format
+msgid "You are currently reverting commit %s."
 msgstr ""
 
-#: builtin/log.c:1190
-msgid "header"
+#: wt-status.c:1391
+msgid "  (fix conflicts and run \"git revert --continue\")"
 msgstr ""
 
-#: builtin/log.c:1191
-msgid "add email header"
+#: wt-status.c:1394
+msgid "  (all conflicts fixed: run \"git revert --continue\")"
 msgstr ""
 
-#: builtin/log.c:1192 builtin/log.c:1194
-msgid "email"
+#: wt-status.c:1396
+msgid "  (use \"git revert --abort\" to cancel the revert operation)"
 msgstr ""
 
-#: builtin/log.c:1192
-msgid "add To: header"
+#: wt-status.c:1406
+#, c-format
+msgid "You are currently bisecting, started from branch '%s'."
 msgstr ""
 
-#: builtin/log.c:1194
-msgid "add Cc: header"
+#: wt-status.c:1410
+msgid "You are currently bisecting."
 msgstr ""
 
-#: builtin/log.c:1196
-msgid "ident"
+#: wt-status.c:1413
+msgid "  (use \"git bisect reset\" to get back to the original branch)"
 msgstr ""
 
-#: builtin/log.c:1197
-msgid "set From address to <ident> (or committer ident if absent)"
+#: wt-status.c:1611
+msgid "On branch "
 msgstr ""
 
-#: builtin/log.c:1199
-msgid "message-id"
+#: wt-status.c:1618
+msgid "interactive rebase in progress; onto "
 msgstr ""
 
-#: builtin/log.c:1200
-msgid "make first mail a reply to <message-id>"
+#: wt-status.c:1620
+msgid "rebase in progress; onto "
 msgstr ""
 
-#: builtin/log.c:1201 builtin/log.c:1204
-msgid "boundary"
+#: wt-status.c:1625
+msgid "HEAD detached at "
 msgstr ""
 
-#: builtin/log.c:1202
-msgid "attach the patch"
+#: wt-status.c:1627
+msgid "HEAD detached from "
 msgstr ""
 
-#: builtin/log.c:1205
-msgid "inline the patch"
+#: wt-status.c:1630
+msgid "Not currently on any branch."
 msgstr ""
 
-#: builtin/log.c:1209
-msgid "enable message threading, styles: shallow, deep"
+#: wt-status.c:1647
+msgid "Initial commit"
 msgstr ""
 
-#: builtin/log.c:1211
-msgid "signature"
+#: wt-status.c:1648
+msgid "No commits yet"
 msgstr ""
 
-#: builtin/log.c:1212
-msgid "add a signature"
+#: wt-status.c:1662
+msgid "Untracked files"
 msgstr ""
 
-#: builtin/log.c:1214
-msgid "don't print the patch filenames"
+#: wt-status.c:1664
+msgid "Ignored files"
 msgstr ""
 
-#: builtin/log.c:1288
+#: wt-status.c:1668
 #, c-format
-msgid "invalid ident line: %s"
+msgid ""
+"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
+"may speed it up, but you have to be careful not to forget to add\n"
+"new files yourself (see 'git help status')."
 msgstr ""
 
-#: builtin/log.c:1303
-msgid "-n and -k are mutually exclusive."
+#: wt-status.c:1674
+#, c-format
+msgid "Untracked files not listed%s"
 msgstr ""
 
-#: builtin/log.c:1305
-msgid "--subject-prefix and -k are mutually exclusive."
+#: wt-status.c:1676
+msgid " (use -u option to show untracked files)"
 msgstr ""
 
-#: builtin/log.c:1313
-msgid "--name-only does not make sense"
+#: wt-status.c:1682
+msgid "No changes"
 msgstr ""
 
-#: builtin/log.c:1315
-msgid "--name-status does not make sense"
+#: wt-status.c:1687
+#, c-format
+msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
 msgstr ""
 
-#: builtin/log.c:1317
-msgid "--check does not make sense"
+#: wt-status.c:1690
+#, c-format
+msgid "no changes added to commit\n"
 msgstr ""
 
-#: builtin/log.c:1340
-msgid "standard output, or directory, which one?"
+#: wt-status.c:1693
+#, c-format
+msgid ""
+"nothing added to commit but untracked files present (use \"git add\" to "
+"track)\n"
 msgstr ""
 
-#: builtin/log.c:1342
+#: wt-status.c:1696
 #, c-format
-msgid "Could not create directory '%s'"
+msgid "nothing added to commit but untracked files present\n"
 msgstr ""
 
-#: builtin/log.c:1490
-msgid "Failed to create output files"
+#: wt-status.c:1699
+#, c-format
+msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
 msgstr ""
 
-#: builtin/log.c:1539
-msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
+#: wt-status.c:1702 wt-status.c:1707
+#, c-format
+msgid "nothing to commit\n"
 msgstr ""
 
-#: builtin/log.c:1594
+#: wt-status.c:1705
 #, c-format
-msgid ""
-"Could not find a tracked remote branch, please specify <upstream> manually.\n"
+msgid "nothing to commit (use -u to show untracked files)\n"
 msgstr ""
 
-#: builtin/log.c:1607 builtin/log.c:1609 builtin/log.c:1621
+#: wt-status.c:1709
 #, c-format
-msgid "Unknown commit %s"
+msgid "nothing to commit, working tree clean\n"
 msgstr ""
 
-#: builtin/ls-files.c:408
-msgid "git ls-files [options] [<file>...]"
+#: wt-status.c:1822
+msgid "No commits yet on "
 msgstr ""
 
-#: builtin/ls-files.c:465
-msgid "identify the file status with tags"
+#: wt-status.c:1826
+msgid "HEAD (no branch)"
 msgstr ""
 
-#: builtin/ls-files.c:467
-msgid "use lowercase letters for 'assume unchanged' files"
+#: wt-status.c:1857
+msgid "different"
 msgstr ""
 
-#: builtin/ls-files.c:469
-msgid "show cached files in the output (default)"
+#: wt-status.c:1859 wt-status.c:1867
+msgid "behind "
 msgstr ""
 
-#: builtin/ls-files.c:471
-msgid "show deleted files in the output"
+#: wt-status.c:1862 wt-status.c:1865
+msgid "ahead "
 msgstr ""
 
-#: builtin/ls-files.c:473
-msgid "show modified files in the output"
+#. TRANSLATORS: the action is e.g. "pull with rebase"
+#: wt-status.c:2374
+#, c-format
+msgid "cannot %s: You have unstaged changes."
 msgstr ""
 
-#: builtin/ls-files.c:475
-msgid "show other files in the output"
+#: wt-status.c:2380
+msgid "additionally, your index contains uncommitted changes."
 msgstr ""
 
-#: builtin/ls-files.c:477
-msgid "show ignored files in the output"
+#: wt-status.c:2382
+#, c-format
+msgid "cannot %s: Your index contains uncommitted changes."
 msgstr ""
 
-#: builtin/ls-files.c:480
-msgid "show staged contents' object name in the output"
+#: builtin/add.c:24
+msgid "git add [<options>] [--] <pathspec>..."
 msgstr ""
 
-#: builtin/ls-files.c:482
-msgid "show files on the filesystem that need to be removed"
+#: builtin/add.c:83
+#, c-format
+msgid "unexpected diff status %c"
 msgstr ""
 
-#: builtin/ls-files.c:484
-msgid "show 'other' directories' name only"
+#: builtin/add.c:88 builtin/commit.c:284
+msgid "updating files failed"
 msgstr ""
 
-#: builtin/ls-files.c:487
-msgid "don't show empty directories"
+#: builtin/add.c:98
+#, c-format
+msgid "remove '%s'\n"
 msgstr ""
 
-#: builtin/ls-files.c:490
-msgid "show unmerged files in the output"
+#: builtin/add.c:173
+msgid "Unstaged changes after refreshing the index:"
 msgstr ""
 
-#: builtin/ls-files.c:492
-msgid "show resolve-undo information"
+#: builtin/add.c:233 builtin/rev-parse.c:895
+msgid "Could not read the index"
 msgstr ""
 
-#: builtin/ls-files.c:494
-msgid "skip files matching pattern"
+#: builtin/add.c:244
+#, c-format
+msgid "Could not open '%s' for writing."
 msgstr ""
 
-#: builtin/ls-files.c:497
-msgid "exclude patterns are read from <file>"
+#: builtin/add.c:248
+msgid "Could not write patch"
 msgstr ""
 
-#: builtin/ls-files.c:500
-msgid "read additional per-directory exclude patterns in <file>"
+#: builtin/add.c:251
+msgid "editing patch failed"
 msgstr ""
 
-#: builtin/ls-files.c:502
-msgid "add the standard git exclusions"
+#: builtin/add.c:254
+#, c-format
+msgid "Could not stat '%s'"
 msgstr ""
 
-#: builtin/ls-files.c:505
-msgid "make the output relative to the project top directory"
+#: builtin/add.c:256
+msgid "Empty patch. Aborted."
 msgstr ""
 
-#: builtin/ls-files.c:508
-msgid "if any <file> is not in the index, treat this as an error"
+#: builtin/add.c:261
+#, c-format
+msgid "Could not apply '%s'"
 msgstr ""
 
-#: builtin/ls-files.c:509
-msgid "tree-ish"
+#: builtin/add.c:269
+msgid "The following paths are ignored by one of your .gitignore files:\n"
 msgstr ""
 
-#: builtin/ls-files.c:510
-msgid "pretend that paths removed since <tree-ish> are still present"
+#: builtin/add.c:289 builtin/clean.c:907 builtin/fetch.c:137 builtin/mv.c:123
+#: builtin/prune-packed.c:56 builtin/pull.c:213 builtin/push.c:557
+#: builtin/remote.c:1345 builtin/rm.c:240 builtin/send-pack.c:165
+msgid "dry run"
 msgstr ""
 
-#: builtin/ls-files.c:512
-msgid "show debugging data"
+#: builtin/add.c:292
+msgid "interactive picking"
 msgstr ""
 
-#: builtin/ls-tree.c:27
-msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
+#: builtin/add.c:293 builtin/checkout.c:1258 builtin/reset.c:305
+msgid "select hunks interactively"
 msgstr ""
 
-#: builtin/ls-tree.c:125
-msgid "only show trees"
+#: builtin/add.c:294
+msgid "edit current diff and apply"
 msgstr ""
 
-#: builtin/ls-tree.c:127
-msgid "recurse into subtrees"
+#: builtin/add.c:295
+msgid "allow adding otherwise ignored files"
 msgstr ""
 
-#: builtin/ls-tree.c:129
-msgid "show trees when recursing"
+#: builtin/add.c:296
+msgid "update tracked files"
 msgstr ""
 
-#: builtin/ls-tree.c:132
-msgid "terminate entries with NUL byte"
+#: builtin/add.c:297
+msgid "renormalize EOL of tracked files (implies -u)"
 msgstr ""
 
-#: builtin/ls-tree.c:133
-msgid "include object size"
+#: builtin/add.c:298
+msgid "record only the fact that the path will be added later"
 msgstr ""
 
-#: builtin/ls-tree.c:135 builtin/ls-tree.c:137
-msgid "list only filenames"
+#: builtin/add.c:299
+msgid "add changes from all tracked and untracked files"
 msgstr ""
 
-#: builtin/ls-tree.c:140
-msgid "use full path names"
+#: builtin/add.c:302
+msgid "ignore paths removed in the working tree (same as --no-all)"
 msgstr ""
 
-#: builtin/ls-tree.c:142
-msgid "list entire tree; not just current directory (implies --full-name)"
+#: builtin/add.c:304
+msgid "don't add, only refresh the index"
 msgstr ""
 
-#: builtin/merge.c:43
-msgid "git merge [options] [<commit>...]"
+#: builtin/add.c:305
+msgid "just skip files which cannot be added because of errors"
 msgstr ""
 
-#: builtin/merge.c:44
-msgid "git merge [options] <msg> HEAD <commit>"
+#: builtin/add.c:306
+msgid "check if - even missing - files are ignored in dry run"
 msgstr ""
 
-#: builtin/merge.c:45
-msgid "git merge --abort"
+#: builtin/add.c:308 builtin/update-index.c:990
+msgid "override the executable bit of the listed files"
 msgstr ""
 
-#: builtin/merge.c:98
-msgid "switch `m' requires a value"
+#: builtin/add.c:310
+msgid "warn when adding an embedded repository"
 msgstr ""
 
-#: builtin/merge.c:135
+#: builtin/add.c:325
 #, c-format
-msgid "Could not find merge strategy '%s'.\n"
+msgid ""
+"You've added another git repository inside your current repository.\n"
+"Clones of the outer repository will not contain the contents of\n"
+"the embedded repository and will not know how to obtain it.\n"
+"If you meant to add a submodule, use:\n"
+"\n"
+"\tgit submodule add <url> %s\n"
+"\n"
+"If you added this path by mistake, you can remove it from the\n"
+"index with:\n"
+"\n"
+"\tgit rm --cached %s\n"
+"\n"
+"See \"git help submodule\" for more information."
 msgstr ""
 
-#: builtin/merge.c:136
+#: builtin/add.c:353
 #, c-format
-msgid "Available strategies are:"
+msgid "adding embedded git repository: %s"
 msgstr ""
 
-#: builtin/merge.c:141
+#: builtin/add.c:371
 #, c-format
-msgid "Available custom strategies are:"
+msgid "Use -f if you really want to add them.\n"
 msgstr ""
 
-#: builtin/merge.c:198
-msgid "do not show a diffstat at the end of the merge"
+#: builtin/add.c:379
+msgid "adding files failed"
 msgstr ""
 
-#: builtin/merge.c:201
-msgid "show a diffstat at the end of the merge"
+#: builtin/add.c:417
+msgid "-A and -u are mutually incompatible"
 msgstr ""
 
-#: builtin/merge.c:202
-msgid "(synonym to --stat)"
+#: builtin/add.c:424
+msgid "Option --ignore-missing can only be used together with --dry-run"
 msgstr ""
 
-#: builtin/merge.c:204
-msgid "add (at most <n>) entries from shortlog to merge commit message"
+#: builtin/add.c:428
+#, c-format
+msgid "--chmod param '%s' must be either -x or +x"
 msgstr ""
 
-#: builtin/merge.c:207
-msgid "create a single commit instead of doing a merge"
+#: builtin/add.c:443
+#, c-format
+msgid "Nothing specified, nothing added.\n"
 msgstr ""
 
-#: builtin/merge.c:209
-msgid "perform a commit if the merge succeeds (default)"
+#: builtin/add.c:444
+#, c-format
+msgid "Maybe you wanted to say 'git add .'?\n"
 msgstr ""
 
-#: builtin/merge.c:211
-msgid "edit message before committing"
+#: builtin/am.c:363
+msgid "could not parse author script"
 msgstr ""
 
-#: builtin/merge.c:212
-msgid "allow fast-forward (default)"
+#: builtin/am.c:447
+#, c-format
+msgid "'%s' was deleted by the applypatch-msg hook"
 msgstr ""
 
-#: builtin/merge.c:214
-msgid "abort if fast-forward is not possible"
+#: builtin/am.c:488
+#, c-format
+msgid "Malformed input line: '%s'."
 msgstr ""
 
-#: builtin/merge.c:218
-msgid "Verify that the named commit has a valid GPG signature"
+#: builtin/am.c:525
+#, c-format
+msgid "Failed to copy notes from '%s' to '%s'"
 msgstr ""
 
-#: builtin/merge.c:219 builtin/notes.c:738 builtin/revert.c:114
-msgid "strategy"
+#: builtin/am.c:551
+msgid "fseek failed"
 msgstr ""
 
-#: builtin/merge.c:220
-msgid "merge strategy to use"
+#: builtin/am.c:739
+#, c-format
+msgid "could not parse patch '%s'"
 msgstr ""
 
-#: builtin/merge.c:221
-msgid "option=value"
+#: builtin/am.c:804
+msgid "Only one StGIT patch series can be applied at once"
 msgstr ""
 
-#: builtin/merge.c:222
-msgid "option for selected merge strategy"
+#: builtin/am.c:852
+msgid "invalid timestamp"
 msgstr ""
 
-#: builtin/merge.c:224
-msgid "merge commit message (for a non-fast-forward merge)"
+#: builtin/am.c:857 builtin/am.c:869
+msgid "invalid Date line"
 msgstr ""
 
-#: builtin/merge.c:228
-msgid "abort the current in-progress merge"
+#: builtin/am.c:864
+msgid "invalid timezone offset"
 msgstr ""
 
-#: builtin/merge.c:257
-msgid "could not run stash."
+#: builtin/am.c:957
+msgid "Patch format detection failed."
 msgstr ""
 
-#: builtin/merge.c:262
-msgid "stash failed"
+#: builtin/am.c:962 builtin/clone.c:408
+#, c-format
+msgid "failed to create directory '%s'"
 msgstr ""
 
-#: builtin/merge.c:267
-#, c-format
-msgid "not a valid object: %s"
+#: builtin/am.c:967
+msgid "Failed to split patches."
 msgstr ""
 
-#: builtin/merge.c:286 builtin/merge.c:303
-msgid "read-tree failed"
+#: builtin/am.c:1097 builtin/commit.c:369
+msgid "unable to write index file"
 msgstr ""
 
-#: builtin/merge.c:333
-msgid " (nothing to squash)"
+#: builtin/am.c:1111
+#, c-format
+msgid "When you have resolved this problem, run \"%s --continue\"."
 msgstr ""
 
-#: builtin/merge.c:346
+#: builtin/am.c:1112
 #, c-format
-msgid "Squash commit -- not updating HEAD\n"
+msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
 msgstr ""
 
-#: builtin/merge.c:378
-msgid "Writing SQUASH_MSG"
+#: builtin/am.c:1113
+#, c-format
+msgid "To restore the original branch and stop patching, run \"%s --abort\"."
 msgstr ""
 
-#: builtin/merge.c:380
-msgid "Finishing SQUASH_MSG"
+#: builtin/am.c:1196
+msgid "Patch sent with format=flowed; space at the end of lines might be lost."
 msgstr ""
 
-#: builtin/merge.c:403
-#, c-format
-msgid "No merge message -- not updating HEAD\n"
+#: builtin/am.c:1224
+msgid "Patch is empty."
 msgstr ""
 
-#: builtin/merge.c:453
+#: builtin/am.c:1290
 #, c-format
-msgid "'%s' does not point to a commit"
+msgid "invalid ident line: %.*s"
 msgstr ""
 
-#: builtin/merge.c:565
+#: builtin/am.c:1312
 #, c-format
-msgid "Bad branch.%s.mergeoptions string: %s"
+msgid "unable to parse commit %s"
 msgstr ""
 
-#: builtin/merge.c:657
-msgid "git write-tree failed to write a tree"
+#: builtin/am.c:1508
+msgid "Repository lacks necessary blobs to fall back on 3-way merge."
 msgstr ""
 
-#: builtin/merge.c:685
-msgid "Not handling anything other than two heads merge."
+#: builtin/am.c:1510
+msgid "Using index info to reconstruct a base tree..."
 msgstr ""
 
-#: builtin/merge.c:699
-#, c-format
-msgid "Unknown option for merge-recursive: -X%s"
+#: builtin/am.c:1529
+msgid ""
+"Did you hand edit your patch?\n"
+"It does not apply to blobs recorded in its index."
 msgstr ""
 
-#: builtin/merge.c:713
-#, c-format
-msgid "unable to write %s"
+#: builtin/am.c:1535
+msgid "Falling back to patching base and 3-way merge..."
 msgstr ""
 
-#: builtin/merge.c:802
-#, c-format
-msgid "Could not read from '%s'"
+#: builtin/am.c:1561
+msgid "Failed to merge in the changes."
 msgstr ""
 
-#: builtin/merge.c:811
-#, c-format
-msgid "Not committing merge; use 'git commit' to complete the merge.\n"
+#: builtin/am.c:1593
+msgid "applying to an empty history"
 msgstr ""
 
-#: builtin/merge.c:817
+#: builtin/am.c:1639 builtin/am.c:1643
 #, c-format
-msgid ""
-"Please enter a commit message to explain why this merge is necessary,\n"
-"especially if it merges an updated upstream into a topic branch.\n"
-"\n"
-"Lines starting with '%c' will be ignored, and an empty message aborts\n"
-"the commit.\n"
+msgid "cannot resume: %s does not exist."
 msgstr ""
 
-#: builtin/merge.c:841
-msgid "Empty commit message."
+#: builtin/am.c:1659
+msgid "cannot be interactive without stdin connected to a terminal."
+msgstr ""
+
+#: builtin/am.c:1664
+msgid "Commit Body is:"
 msgstr ""
 
-#: builtin/merge.c:853
+#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
+#. in your translation. The program will only accept English
+#. input at this point.
+#.
+#: builtin/am.c:1674
+msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
+msgstr ""
+
+#: builtin/am.c:1724
 #, c-format
-msgid "Wonderful.\n"
+msgid "Dirty index: cannot apply patches (dirty: %s)"
 msgstr ""
 
-#: builtin/merge.c:918
+#: builtin/am.c:1764 builtin/am.c:1832
 #, c-format
-msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
+msgid "Applying: %.*s"
 msgstr ""
 
-#: builtin/merge.c:934
+#: builtin/am.c:1781
+msgid "No changes -- Patch already applied."
+msgstr ""
+
+#: builtin/am.c:1787
 #, c-format
-msgid "'%s' is not a commit"
+msgid "Patch failed at %s %.*s"
 msgstr ""
 
-#: builtin/merge.c:975
-msgid "No current branch."
+#: builtin/am.c:1791
+msgid "Use 'git am --show-current-patch' to see the failed patch"
 msgstr ""
 
-#: builtin/merge.c:977
-msgid "No remote for the current branch."
+#: builtin/am.c:1835
+msgid ""
+"No changes - did you forget to use 'git add'?\n"
+"If there is nothing left to stage, chances are that something else\n"
+"already introduced the same changes; you might want to skip this patch."
 msgstr ""
 
-#: builtin/merge.c:979
-msgid "No default upstream defined for the current branch."
+#: builtin/am.c:1842
+msgid ""
+"You still have unmerged paths in your index.\n"
+"You should 'git add' each file with resolved conflicts to mark them as "
+"such.\n"
+"You might run `git rm` on a file to accept \"deleted by them\" for it."
 msgstr ""
 
-#: builtin/merge.c:984
+#: builtin/am.c:1949 builtin/am.c:1953 builtin/am.c:1965 builtin/reset.c:328
+#: builtin/reset.c:336
 #, c-format
-msgid "No remote-tracking branch for %s from %s"
+msgid "Could not parse object '%s'."
 msgstr ""
 
-#: builtin/merge.c:1140
-msgid "There is no merge to abort (MERGE_HEAD missing)."
+#: builtin/am.c:2001
+msgid "failed to clean index"
 msgstr ""
 
-#: builtin/merge.c:1156 git-pull.sh:31
+#: builtin/am.c:2036
 msgid ""
-"You have not concluded your merge (MERGE_HEAD exists).\n"
-"Please, commit your changes before you can merge."
+"You seem to have moved HEAD since the last 'am' failure.\n"
+"Not rewinding to ORIG_HEAD"
 msgstr ""
 
-#: builtin/merge.c:1159 git-pull.sh:34
-msgid "You have not concluded your merge (MERGE_HEAD exists)."
+#: builtin/am.c:2129
+#, c-format
+msgid "Invalid value for --patch-format: %s"
 msgstr ""
 
-#: builtin/merge.c:1163
-msgid ""
-"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
-"Please, commit your changes before you can merge."
+#: builtin/am.c:2165
+msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
 msgstr ""
 
-#: builtin/merge.c:1166
-msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
+#: builtin/am.c:2166
+msgid "git am [<options>] (--continue | --skip | --abort)"
 msgstr ""
 
-#: builtin/merge.c:1175
-msgid "You cannot combine --squash with --no-ff."
+#: builtin/am.c:2172
+msgid "run interactively"
 msgstr ""
 
-#: builtin/merge.c:1184
-msgid "No commit specified and merge.defaultToUpstream not set."
+#: builtin/am.c:2174
+msgid "historical option -- no-op"
 msgstr ""
 
-#: builtin/merge.c:1216
-msgid "Can merge only exactly one commit into empty head"
+#: builtin/am.c:2176
+msgid "allow fall back on 3way merging if needed"
 msgstr ""
 
-#: builtin/merge.c:1219
-msgid "Squash commit into empty head not supported yet"
+#: builtin/am.c:2177 builtin/init-db.c:486 builtin/prune-packed.c:58
+#: builtin/repack.c:306
+msgid "be quiet"
 msgstr ""
 
-#: builtin/merge.c:1221
-msgid "Non-fast-forward commit does not make sense into an empty head"
+#: builtin/am.c:2179
+msgid "add a Signed-off-by line to the commit message"
 msgstr ""
 
-#: builtin/merge.c:1226
-#, c-format
-msgid "%s - not something we can merge"
+#: builtin/am.c:2182
+msgid "recode into utf8 (default)"
 msgstr ""
 
-#: builtin/merge.c:1277
-#, c-format
-msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
+#: builtin/am.c:2184
+msgid "pass -k flag to git-mailinfo"
 msgstr ""
 
-#: builtin/merge.c:1280
-#, c-format
-msgid "Commit %s has a bad GPG signature allegedly by %s."
+#: builtin/am.c:2186
+msgid "pass -b flag to git-mailinfo"
 msgstr ""
 
-#. 'N'
-#: builtin/merge.c:1283
-#, c-format
-msgid "Commit %s does not have a GPG signature."
+#: builtin/am.c:2188
+msgid "pass -m flag to git-mailinfo"
 msgstr ""
 
-#: builtin/merge.c:1286
-#, c-format
-msgid "Commit %s has a good GPG signature by %s\n"
+#: builtin/am.c:2190
+msgid "pass --keep-cr flag to git-mailsplit for mbox format"
 msgstr ""
 
-#: builtin/merge.c:1370
-#, c-format
-msgid "Updating %s..%s\n"
+#: builtin/am.c:2193
+msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
 msgstr ""
 
-#: builtin/merge.c:1409
-#, c-format
-msgid "Trying really trivial in-index merge...\n"
+#: builtin/am.c:2196
+msgid "strip everything before a scissors line"
 msgstr ""
 
-#: builtin/merge.c:1416
-#, c-format
-msgid "Nope.\n"
+#: builtin/am.c:2198 builtin/am.c:2201 builtin/am.c:2204 builtin/am.c:2207
+#: builtin/am.c:2210 builtin/am.c:2213 builtin/am.c:2216 builtin/am.c:2219
+#: builtin/am.c:2225
+msgid "pass it through git-apply"
 msgstr ""
 
-#: builtin/merge.c:1448
-msgid "Not possible to fast-forward, aborting."
+#: builtin/am.c:2215 builtin/commit.c:1340 builtin/fmt-merge-msg.c:671
+#: builtin/fmt-merge-msg.c:674 builtin/grep.c:868 builtin/merge.c:239
+#: builtin/pull.c:151 builtin/pull.c:209 builtin/rebase.c:854
+#: builtin/repack.c:317 builtin/repack.c:321 builtin/repack.c:323
+#: builtin/show-branch.c:651 builtin/show-ref.c:171 builtin/tag.c:386
+#: parse-options.h:144 parse-options.h:146 parse-options.h:268
+msgid "n"
 msgstr ""
 
-#: builtin/merge.c:1471 builtin/merge.c:1550
-#, c-format
-msgid "Rewinding the tree to pristine...\n"
+#: builtin/am.c:2221 builtin/branch.c:637 builtin/for-each-ref.c:38
+#: builtin/replace.c:544 builtin/tag.c:422 builtin/verify-tag.c:39
+msgid "format"
 msgstr ""
 
-#: builtin/merge.c:1475
-#, c-format
-msgid "Trying merge strategy %s...\n"
+#: builtin/am.c:2222
+msgid "format the patch(es) are in"
 msgstr ""
 
-#: builtin/merge.c:1541
-#, c-format
-msgid "No merge strategy handled the merge.\n"
+#: builtin/am.c:2228
+msgid "override error message when patch failure occurs"
 msgstr ""
 
-#: builtin/merge.c:1543
-#, c-format
-msgid "Merge with strategy %s failed.\n"
+#: builtin/am.c:2230
+msgid "continue applying patches after resolving a conflict"
 msgstr ""
 
-#: builtin/merge.c:1552
-#, c-format
-msgid "Using the %s to prepare resolving by hand.\n"
+#: builtin/am.c:2233
+msgid "synonyms for --continue"
 msgstr ""
 
-#: builtin/merge.c:1564
-#, c-format
-msgid "Automatic merge went well; stopped before committing as requested\n"
+#: builtin/am.c:2236
+msgid "skip the current patch"
 msgstr ""
 
-#: builtin/merge-base.c:26
-msgid "git merge-base [-a|--all] <commit> <commit>..."
+#: builtin/am.c:2239
+msgid "restore the original branch and abort the patching operation."
 msgstr ""
 
-#: builtin/merge-base.c:27
-msgid "git merge-base [-a|--all] --octopus <commit>..."
+#: builtin/am.c:2242
+msgid "abort the patching operation but keep HEAD where it is."
 msgstr ""
 
-#: builtin/merge-base.c:28
-msgid "git merge-base --independent <commit>..."
+#: builtin/am.c:2245
+msgid "show the patch being applied."
 msgstr ""
 
-#: builtin/merge-base.c:29
-msgid "git merge-base --is-ancestor <commit> <commit>"
+#: builtin/am.c:2249
+msgid "lie about committer date"
 msgstr ""
 
-#: builtin/merge-base.c:98
-msgid "output all common ancestors"
+#: builtin/am.c:2251
+msgid "use current timestamp for author date"
 msgstr ""
 
-#: builtin/merge-base.c:99
-msgid "find ancestors for a single n-way merge"
+#: builtin/am.c:2253 builtin/commit.c:1483 builtin/merge.c:273
+#: builtin/pull.c:184 builtin/rebase.c:898 builtin/rebase--interactive.c:183
+#: builtin/revert.c:113 builtin/tag.c:402
+msgid "key-id"
 msgstr ""
 
-#: builtin/merge-base.c:100
-msgid "list revs not reachable from others"
+#: builtin/am.c:2254 builtin/rebase.c:899 builtin/rebase--interactive.c:184
+msgid "GPG-sign commits"
 msgstr ""
 
-#: builtin/merge-base.c:102
-msgid "is the first one ancestor of the other?"
+#: builtin/am.c:2257
+msgid "(internal use for git-rebase)"
 msgstr ""
 
-#: builtin/merge-file.c:8
+#: builtin/am.c:2275
 msgid ""
-"git merge-file [options] [-L name1 [-L orig [-L name2]]] file1 orig_file "
-"file2"
+"The -b/--binary option has been a no-op for long time, and\n"
+"it will be removed. Please do not use it anymore."
 msgstr ""
 
-#: builtin/merge-file.c:33
-msgid "send results to standard output"
+#: builtin/am.c:2282
+msgid "failed to read the index"
 msgstr ""
 
-#: builtin/merge-file.c:34
-msgid "use a diff3 based merge"
+#: builtin/am.c:2297
+#, c-format
+msgid "previous rebase directory %s still exists but mbox given."
 msgstr ""
 
-#: builtin/merge-file.c:35
-msgid "for conflicts, use our version"
+#: builtin/am.c:2321
+#, c-format
+msgid ""
+"Stray %s directory found.\n"
+"Use \"git am --abort\" to remove it."
 msgstr ""
 
-#: builtin/merge-file.c:37
-msgid "for conflicts, use their version"
+#: builtin/am.c:2327
+msgid "Resolve operation not in progress, we are not resuming."
 msgstr ""
 
-#: builtin/merge-file.c:39
-msgid "for conflicts, use a union version"
+#: builtin/apply.c:8
+msgid "git apply [<options>] [<patch>...]"
 msgstr ""
 
-#: builtin/merge-file.c:42
-msgid "for conflicts, use this marker size"
+#: builtin/archive.c:17
+#, c-format
+msgid "could not create archive file '%s'"
 msgstr ""
 
-#: builtin/merge-file.c:43
-msgid "do not warn about conflicts"
+#: builtin/archive.c:20
+msgid "could not redirect output"
 msgstr ""
 
-#: builtin/merge-file.c:45
-msgid "set labels for file1/orig_file/file2"
+#: builtin/archive.c:37
+msgid "git archive: Remote with no URL"
 msgstr ""
 
-#: builtin/mktree.c:67
-msgid "git mktree [-z] [--missing] [--batch]"
+#: builtin/archive.c:58
+msgid "git archive: expected ACK/NAK, got a flush packet"
 msgstr ""
 
-#: builtin/mktree.c:153
-msgid "input is NUL terminated"
+#: builtin/archive.c:61
+#, c-format
+msgid "git archive: NACK %s"
 msgstr ""
 
-#: builtin/mktree.c:154 builtin/write-tree.c:24
-msgid "allow missing objects"
+#: builtin/archive.c:64
+msgid "git archive: protocol error"
 msgstr ""
 
-#: builtin/mktree.c:155
-msgid "allow creation of more than one tree"
+#: builtin/archive.c:68
+msgid "git archive: expected a flush"
 msgstr ""
 
-#: builtin/mv.c:14
-msgid "git mv [options] <source>... <destination>"
+#: builtin/bisect--helper.c:12
+msgid "git bisect--helper --next-all [--no-checkout]"
 msgstr ""
 
-#: builtin/mv.c:64
-msgid "force move/rename even if target exists"
+#: builtin/bisect--helper.c:13
+msgid "git bisect--helper --write-terms <bad_term> <good_term>"
 msgstr ""
 
-#: builtin/mv.c:65
-msgid "skip move/rename errors"
+#: builtin/bisect--helper.c:14
+msgid "git bisect--helper --bisect-clean-state"
 msgstr ""
 
-#: builtin/mv.c:108
+#: builtin/bisect--helper.c:46
 #, c-format
-msgid "Checking rename of '%s' to '%s'\n"
+msgid "'%s' is not a valid term"
 msgstr ""
 
-#: builtin/mv.c:112
-msgid "bad source"
+#: builtin/bisect--helper.c:50
+#, c-format
+msgid "can't use the builtin command '%s' as a term"
 msgstr ""
 
-#: builtin/mv.c:115
-msgid "can not move directory into itself"
+#: builtin/bisect--helper.c:60
+#, c-format
+msgid "can't change the meaning of the term '%s'"
 msgstr ""
 
-#: builtin/mv.c:118
-msgid "cannot move directory over file"
+#: builtin/bisect--helper.c:71
+msgid "please use two different terms"
 msgstr ""
 
-#: builtin/mv.c:128
-#, c-format
-msgid "Huh? %.*s is in index?"
+#: builtin/bisect--helper.c:78
+msgid "could not open the file BISECT_TERMS"
 msgstr ""
 
-#: builtin/mv.c:140
-msgid "source directory is empty"
+#: builtin/bisect--helper.c:120
+msgid "perform 'git bisect next'"
 msgstr ""
 
-#: builtin/mv.c:171
-msgid "not under version control"
+#: builtin/bisect--helper.c:122
+msgid "write the terms to .git/BISECT_TERMS"
 msgstr ""
 
-#: builtin/mv.c:173
-msgid "destination exists"
+#: builtin/bisect--helper.c:124
+msgid "cleanup the bisection state"
 msgstr ""
 
-#: builtin/mv.c:181
-#, c-format
-msgid "overwriting '%s'"
+#: builtin/bisect--helper.c:126
+msgid "check for expected revs"
 msgstr ""
 
-#: builtin/mv.c:184
-msgid "Cannot overwrite"
+#: builtin/bisect--helper.c:128
+msgid "update BISECT_HEAD instead of checking out the current commit"
 msgstr ""
 
-#: builtin/mv.c:187
-msgid "multiple sources for the same target"
+#: builtin/bisect--helper.c:143
+msgid "--write-terms requires two arguments"
 msgstr ""
 
-#: builtin/mv.c:202
-#, c-format
-msgid "%s, source=%s, destination=%s"
+#: builtin/bisect--helper.c:147
+msgid "--bisect-clean-state requires no arguments"
 msgstr ""
 
-#: builtin/mv.c:212
-#, c-format
-msgid "Renaming %s to %s\n"
+#: builtin/blame.c:31
+msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
 msgstr ""
 
-#: builtin/mv.c:215 builtin/remote.c:731
+#: builtin/blame.c:36
+msgid "<rev-opts> are documented in git-rev-list(1)"
+msgstr ""
+
+#: builtin/blame.c:406
 #, c-format
-msgid "renaming '%s' failed"
+msgid "expecting a color: %s"
 msgstr ""
 
-#: builtin/name-rev.c:259
-msgid "git name-rev [options] <commit>..."
+#: builtin/blame.c:413
+msgid "must end with a color"
 msgstr ""
 
-#: builtin/name-rev.c:260
-msgid "git name-rev [options] --all"
+#: builtin/blame.c:700
+#, c-format
+msgid "invalid color '%s' in color.blame.repeatedLines"
 msgstr ""
 
-#: builtin/name-rev.c:261
-msgid "git name-rev [options] --stdin"
+#: builtin/blame.c:718
+msgid "invalid value for blame.coloring"
 msgstr ""
 
-#: builtin/name-rev.c:313
-msgid "print only names (no SHA-1)"
+#: builtin/blame.c:793
+msgid "Show blame entries as we find them, incrementally"
 msgstr ""
 
-#: builtin/name-rev.c:314
-msgid "only use tags to name the commits"
+#: builtin/blame.c:794
+msgid "Show blank SHA-1 for boundary commits (Default: off)"
 msgstr ""
 
-#: builtin/name-rev.c:316
-msgid "only use refs matching <pattern>"
+#: builtin/blame.c:795
+msgid "Do not treat root commits as boundaries (Default: off)"
 msgstr ""
 
-#: builtin/name-rev.c:318
-msgid "list all commits reachable from all refs"
+#: builtin/blame.c:796
+msgid "Show work cost statistics"
 msgstr ""
 
-#: builtin/name-rev.c:319
-msgid "read from stdin"
+#: builtin/blame.c:797
+msgid "Force progress reporting"
 msgstr ""
 
-#: builtin/name-rev.c:320
-msgid "allow to print `undefined` names"
+#: builtin/blame.c:798
+msgid "Show output score for blame entries"
 msgstr ""
 
-#: builtin/name-rev.c:326
-msgid "dereference tags in the input (internal use)"
+#: builtin/blame.c:799
+msgid "Show original filename (Default: auto)"
 msgstr ""
 
-#: builtin/notes.c:24
-msgid "git notes [--ref <notes_ref>] [list [<object>]]"
+#: builtin/blame.c:800
+msgid "Show original linenumber (Default: off)"
 msgstr ""
 
-#: builtin/notes.c:25
-msgid ""
-"git notes [--ref <notes_ref>] add [-f] [-m <msg> | -F <file> | (-c | -C) "
-"<object>] [<object>]"
+#: builtin/blame.c:801
+msgid "Show in a format designed for machine consumption"
 msgstr ""
 
-#: builtin/notes.c:26
-msgid "git notes [--ref <notes_ref>] copy [-f] <from-object> <to-object>"
+#: builtin/blame.c:802
+msgid "Show porcelain format with per-line commit information"
 msgstr ""
 
-#: builtin/notes.c:27
-msgid ""
-"git notes [--ref <notes_ref>] append [-m <msg> | -F <file> | (-c | -C) "
-"<object>] [<object>]"
+#: builtin/blame.c:803
+msgid "Use the same output mode as git-annotate (Default: off)"
 msgstr ""
 
-#: builtin/notes.c:28
-msgid "git notes [--ref <notes_ref>] edit [<object>]"
+#: builtin/blame.c:804
+msgid "Show raw timestamp (Default: off)"
 msgstr ""
 
-#: builtin/notes.c:29
-msgid "git notes [--ref <notes_ref>] show [<object>]"
+#: builtin/blame.c:805
+msgid "Show long commit SHA1 (Default: off)"
 msgstr ""
 
-#: builtin/notes.c:30
-msgid ""
-"git notes [--ref <notes_ref>] merge [-v | -q] [-s <strategy> ] <notes_ref>"
+#: builtin/blame.c:806
+msgid "Suppress author name and timestamp (Default: off)"
 msgstr ""
 
-#: builtin/notes.c:31
-msgid "git notes merge --commit [-v | -q]"
+#: builtin/blame.c:807
+msgid "Show author email instead of name (Default: off)"
 msgstr ""
 
-#: builtin/notes.c:32
-msgid "git notes merge --abort [-v | -q]"
+#: builtin/blame.c:808
+msgid "Ignore whitespace differences"
 msgstr ""
 
-#: builtin/notes.c:33
-msgid "git notes [--ref <notes_ref>] remove [<object>...]"
+#: builtin/blame.c:809
+msgid "color redundant metadata from previous line differently"
 msgstr ""
 
-#: builtin/notes.c:34
-msgid "git notes [--ref <notes_ref>] prune [-n | -v]"
+#: builtin/blame.c:810
+msgid "color lines by age"
 msgstr ""
 
-#: builtin/notes.c:35
-msgid "git notes [--ref <notes_ref>] get-ref"
+#: builtin/blame.c:817
+msgid "Use an experimental heuristic to improve diffs"
 msgstr ""
 
-#: builtin/notes.c:40
-msgid "git notes [list [<object>]]"
+#: builtin/blame.c:819
+msgid "Spend extra cycles to find better match"
 msgstr ""
 
-#: builtin/notes.c:45
-msgid "git notes add [<options>] [<object>]"
+#: builtin/blame.c:820
+msgid "Use revisions from <file> instead of calling git-rev-list"
 msgstr ""
 
-#: builtin/notes.c:50
-msgid "git notes copy [<options>] <from-object> <to-object>"
+#: builtin/blame.c:821
+msgid "Use <file>'s contents as the final image"
 msgstr ""
 
-#: builtin/notes.c:51
-msgid "git notes copy --stdin [<from-object> <to-object>]..."
+#: builtin/blame.c:822 builtin/blame.c:823
+msgid "score"
 msgstr ""
 
-#: builtin/notes.c:56
-msgid "git notes append [<options>] [<object>]"
+#: builtin/blame.c:822
+msgid "Find line copies within and across files"
 msgstr ""
 
-#: builtin/notes.c:61
-msgid "git notes edit [<object>]"
+#: builtin/blame.c:823
+msgid "Find line movements within and across files"
 msgstr ""
 
-#: builtin/notes.c:66
-msgid "git notes show [<object>]"
+#: builtin/blame.c:824
+msgid "n,m"
 msgstr ""
 
-#: builtin/notes.c:71
-msgid "git notes merge [<options>] <notes_ref>"
+#: builtin/blame.c:824
+msgid "Process only line range n,m, counting from 1"
 msgstr ""
 
-#: builtin/notes.c:72
-msgid "git notes merge --commit [<options>]"
+#: builtin/blame.c:873
+msgid "--progress can't be used with --incremental or porcelain formats"
 msgstr ""
 
-#: builtin/notes.c:73
-msgid "git notes merge --abort [<options>]"
+#. TRANSLATORS: This string is used to tell us the
+#. maximum display width for a relative timestamp in
+#. "git blame" output.  For C locale, "4 years, 11
+#. months ago", which takes 22 places, is the longest
+#. among various forms of relative timestamps, but
+#. your language may need more or fewer display
+#. columns.
+#.
+#: builtin/blame.c:924
+msgid "4 years, 11 months ago"
 msgstr ""
 
-#: builtin/notes.c:78
-msgid "git notes remove [<object>]"
+#: builtin/blame.c:1011
+#, c-format
+msgid "file %s has only %lu line"
+msgid_plural "file %s has only %lu lines"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/blame.c:1057
+msgid "Blaming lines"
 msgstr ""
 
-#: builtin/notes.c:83
-msgid "git notes prune [<options>]"
+#: builtin/branch.c:29
+msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
 msgstr ""
 
-#: builtin/notes.c:88
-msgid "git notes get-ref"
+#: builtin/branch.c:30
+msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
 msgstr ""
 
-#: builtin/notes.c:137
-#, c-format
-msgid "unable to start 'show' for object '%s'"
+#: builtin/branch.c:31
+msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
 msgstr ""
 
-#: builtin/notes.c:141
-msgid "could not read 'show' output"
+#: builtin/branch.c:32
+msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
+msgstr ""
+
+#: builtin/branch.c:33
+msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
+msgstr ""
+
+#: builtin/branch.c:34
+msgid "git branch [<options>] [-r | -a] [--points-at]"
+msgstr ""
+
+#: builtin/branch.c:35
+msgid "git branch [<options>] [-r | -a] [--format]"
 msgstr ""
 
-#: builtin/notes.c:149
+#: builtin/branch.c:151
 #, c-format
-msgid "failed to finish 'show' for object '%s'"
+msgid ""
+"deleting branch '%s' that has been merged to\n"
+"         '%s', but not yet merged to HEAD."
 msgstr ""
 
-#: builtin/notes.c:167 builtin/tag.c:341
+#: builtin/branch.c:155
 #, c-format
-msgid "could not create file '%s'"
+msgid ""
+"not deleting branch '%s' that is not yet merged to\n"
+"         '%s', even though it is merged to HEAD."
 msgstr ""
 
-#: builtin/notes.c:186
-msgid "Please supply the note contents using either -m or -F option"
+#: builtin/branch.c:169
+#, c-format
+msgid "Couldn't look up commit object for '%s'"
 msgstr ""
 
-#: builtin/notes.c:207 builtin/notes.c:844
+#: builtin/branch.c:173
 #, c-format
-msgid "Removing note for object %s\n"
+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/notes.c:212
-msgid "unable to write note object"
+#: builtin/branch.c:186
+msgid "Update of config-file failed"
 msgstr ""
 
-#: builtin/notes.c:214
+#: builtin/branch.c:217
+msgid "cannot use -a with -d"
+msgstr ""
+
+#: builtin/branch.c:223
+msgid "Couldn't look up commit object for HEAD"
+msgstr ""
+
+#: builtin/branch.c:237
 #, c-format
-msgid "The note contents has been left in %s"
+msgid "Cannot delete branch '%s' checked out at '%s'"
 msgstr ""
 
-#: builtin/notes.c:248 builtin/tag.c:540
+#: builtin/branch.c:252
 #, c-format
-msgid "cannot read '%s'"
+msgid "remote-tracking branch '%s' not found."
 msgstr ""
 
-#: builtin/notes.c:250 builtin/tag.c:543
+#: builtin/branch.c:253
 #, c-format
-msgid "could not open or read '%s'"
+msgid "branch '%s' not found."
 msgstr ""
 
-#: builtin/notes.c:269 builtin/notes.c:316 builtin/notes.c:318
-#: builtin/notes.c:378 builtin/notes.c:432 builtin/notes.c:515
-#: builtin/notes.c:520 builtin/notes.c:595 builtin/notes.c:637
-#: builtin/notes.c:839 builtin/tag.c:556
+#: builtin/branch.c:268
 #, c-format
-msgid "Failed to resolve '%s' as a valid ref."
+msgid "Error deleting remote-tracking branch '%s'"
 msgstr ""
 
-#: builtin/notes.c:272
+#: builtin/branch.c:269
 #, c-format
-msgid "Failed to read object '%s'."
+msgid "Error deleting branch '%s'"
 msgstr ""
 
-#: builtin/notes.c:312
+#: builtin/branch.c:276
 #, c-format
-msgid "Malformed input line: '%s'."
+msgid "Deleted remote-tracking branch %s (was %s).\n"
 msgstr ""
 
-#: builtin/notes.c:327
+#: builtin/branch.c:277
 #, c-format
-msgid "Failed to copy notes from '%s' to '%s'"
+msgid "Deleted branch %s (was %s).\n"
 msgstr ""
 
-#: builtin/notes.c:371 builtin/notes.c:425 builtin/notes.c:498
-#: builtin/notes.c:510 builtin/notes.c:583 builtin/notes.c:630
-#: builtin/notes.c:904
-msgid "too many parameters"
+#: builtin/branch.c:421 builtin/tag.c:59
+msgid "unable to parse format string"
 msgstr ""
 
-#: builtin/notes.c:384 builtin/notes.c:643
+#: builtin/branch.c:458
 #, c-format
-msgid "No note found for object %s."
+msgid "Branch %s is being rebased at %s"
 msgstr ""
 
-#: builtin/notes.c:406 builtin/notes.c:563
-msgid "note contents as a string"
+#: builtin/branch.c:462
+#, c-format
+msgid "Branch %s is being bisected at %s"
 msgstr ""
 
-#: builtin/notes.c:409 builtin/notes.c:566
-msgid "note contents in a file"
+#: builtin/branch.c:479
+msgid "cannot copy the current branch while not on any."
 msgstr ""
 
-#: builtin/notes.c:411 builtin/notes.c:414 builtin/notes.c:568
-#: builtin/notes.c:571 builtin/tag.c:474
-msgid "object"
+#: builtin/branch.c:481
+msgid "cannot rename the current branch while not on any."
 msgstr ""
 
-#: builtin/notes.c:412 builtin/notes.c:569
-msgid "reuse and edit specified note object"
+#: builtin/branch.c:492
+#, c-format
+msgid "Invalid branch name: '%s'"
 msgstr ""
 
-#: builtin/notes.c:415 builtin/notes.c:572
-msgid "reuse specified note object"
+#: builtin/branch.c:519
+msgid "Branch rename failed"
 msgstr ""
 
-#: builtin/notes.c:417 builtin/notes.c:485
-msgid "replace existing notes"
+#: builtin/branch.c:521
+msgid "Branch copy failed"
 msgstr ""
 
-#: builtin/notes.c:451
+#: builtin/branch.c:525
 #, c-format
-msgid ""
-"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
-"existing notes"
+msgid "Created a copy of a misnamed branch '%s'"
 msgstr ""
 
-#: builtin/notes.c:456 builtin/notes.c:533
+#: builtin/branch.c:528
 #, c-format
-msgid "Overwriting existing notes for object %s\n"
+msgid "Renamed a misnamed branch '%s' away"
 msgstr ""
 
-#: builtin/notes.c:486
-msgid "read objects from stdin"
+#: builtin/branch.c:534
+#, c-format
+msgid "Branch renamed to %s, but HEAD is not updated!"
 msgstr ""
 
-#: builtin/notes.c:488
-msgid "load rewriting config for <command> (implies --stdin)"
+#: builtin/branch.c:543
+msgid "Branch is renamed, but update of config-file failed"
 msgstr ""
 
-#: builtin/notes.c:506
-msgid "too few parameters"
+#: builtin/branch.c:545
+msgid "Branch is copied, but update of config-file failed"
 msgstr ""
 
-#: builtin/notes.c:527
+#: builtin/branch.c:561
 #, c-format
 msgid ""
-"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
-"existing notes"
+"Please edit the description for the branch\n"
+"  %s\n"
+"Lines starting with '%c' will be stripped.\n"
 msgstr ""
 
-#: builtin/notes.c:539
-#, c-format
-msgid "Missing notes on source object %s. Cannot copy."
+#: builtin/branch.c:594
+msgid "Generic options"
 msgstr ""
 
-#: builtin/notes.c:588
-#, 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"
+#: builtin/branch.c:596
+msgid "show hash and subject, give twice for upstream branch"
 msgstr ""
 
-#: builtin/notes.c:735
-msgid "General options"
+#: builtin/branch.c:597
+msgid "suppress informational messages"
 msgstr ""
 
-#: builtin/notes.c:737
-msgid "Merge options"
+#: builtin/branch.c:598
+msgid "set up tracking mode (see git-pull(1))"
 msgstr ""
 
-#: builtin/notes.c:739
-msgid ""
-"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
-"cat_sort_uniq)"
+#: builtin/branch.c:600
+msgid "do not use"
 msgstr ""
 
-#: builtin/notes.c:741
-msgid "Committing unmerged notes"
+#: builtin/branch.c:602 builtin/rebase--interactive.c:180
+msgid "upstream"
 msgstr ""
 
-#: builtin/notes.c:743
-msgid "finalize notes merge by committing unmerged notes"
+#: builtin/branch.c:602
+msgid "change the upstream info"
 msgstr ""
 
-#: builtin/notes.c:745
-msgid "Aborting notes merge resolution"
+#: builtin/branch.c:603
+msgid "Unset the upstream info"
 msgstr ""
 
-#: builtin/notes.c:747
-msgid "abort notes merge"
+#: builtin/branch.c:604
+msgid "use colored output"
 msgstr ""
 
-#: builtin/notes.c:842
-#, c-format
-msgid "Object %s has no note\n"
+#: builtin/branch.c:605
+msgid "act on remote-tracking branches"
 msgstr ""
 
-#: builtin/notes.c:854
-msgid "attempt to remove non-existent note is not an error"
+#: builtin/branch.c:607 builtin/branch.c:609
+msgid "print only branches that contain the commit"
 msgstr ""
 
-#: builtin/notes.c:857
-msgid "read object names from the standard input"
+#: builtin/branch.c:608 builtin/branch.c:610
+msgid "print only branches that don't contain the commit"
 msgstr ""
 
-#: builtin/notes.c:938
-msgid "notes_ref"
+#: builtin/branch.c:613
+msgid "Specific git-branch actions:"
 msgstr ""
 
-#: builtin/notes.c:939
-msgid "use notes from <notes_ref>"
+#: builtin/branch.c:614
+msgid "list both remote-tracking and local branches"
 msgstr ""
 
-#: builtin/notes.c:974 builtin/remote.c:1598
-#, c-format
-msgid "Unknown subcommand: %s"
+#: builtin/branch.c:616
+msgid "delete fully merged branch"
 msgstr ""
 
-#: builtin/pack-objects.c:23
-msgid "git pack-objects --stdout [options...] [< ref-list | < object-list]"
+#: builtin/branch.c:617
+msgid "delete branch (even if not merged)"
 msgstr ""
 
-#: builtin/pack-objects.c:24
-msgid "git pack-objects [options...] base-name [< ref-list | < object-list]"
+#: builtin/branch.c:618
+msgid "move/rename a branch and its reflog"
 msgstr ""
 
-#: builtin/pack-objects.c:183 builtin/pack-objects.c:186
-#, c-format
-msgid "deflate error (%d)"
+#: builtin/branch.c:619
+msgid "move/rename a branch, even if target exists"
 msgstr ""
 
-#: builtin/pack-objects.c:2397
-#, c-format
-msgid "unsupported index version %s"
+#: builtin/branch.c:620
+msgid "copy a branch and its reflog"
 msgstr ""
 
-#: builtin/pack-objects.c:2401
-#, c-format
-msgid "bad index version '%s'"
+#: builtin/branch.c:621
+msgid "copy a branch, even if target exists"
 msgstr ""
 
-#: builtin/pack-objects.c:2424
-#, c-format
-msgid "option %s does not accept negative form"
+#: builtin/branch.c:622
+msgid "list branch names"
 msgstr ""
 
-#: builtin/pack-objects.c:2428
-#, c-format
-msgid "unable to parse value '%s' for option %s"
+#: builtin/branch.c:623
+msgid "create the branch's reflog"
 msgstr ""
 
-#: builtin/pack-objects.c:2447
-msgid "do not show progress meter"
+#: builtin/branch.c:625
+msgid "edit the description for the branch"
 msgstr ""
 
-#: builtin/pack-objects.c:2449
-msgid "show progress meter"
+#: builtin/branch.c:626
+msgid "force creation, move/rename, deletion"
 msgstr ""
 
-#: builtin/pack-objects.c:2451
-msgid "show progress meter during object writing phase"
+#: builtin/branch.c:627
+msgid "print only branches that are merged"
 msgstr ""
 
-#: builtin/pack-objects.c:2454
-msgid "similar to --all-progress when progress meter is shown"
+#: builtin/branch.c:628
+msgid "print only branches that are not merged"
 msgstr ""
 
-#: builtin/pack-objects.c:2455
-msgid "version[,offset]"
+#: builtin/branch.c:629
+msgid "list branches in columns"
 msgstr ""
 
-#: builtin/pack-objects.c:2456
-msgid "write the pack index file in the specified idx format version"
+#: builtin/branch.c:630 builtin/for-each-ref.c:40 builtin/ls-remote.c:70
+#: builtin/tag.c:415
+msgid "key"
 msgstr ""
 
-#: builtin/pack-objects.c:2459
-msgid "maximum size of each output pack file"
+#: builtin/branch.c:631 builtin/for-each-ref.c:41 builtin/ls-remote.c:71
+#: builtin/tag.c:416
+msgid "field name to sort on"
 msgstr ""
 
-#: builtin/pack-objects.c:2461
-msgid "ignore borrowed objects from alternate object store"
+#: builtin/branch.c:633 builtin/for-each-ref.c:43 builtin/notes.c:415
+#: builtin/notes.c:418 builtin/notes.c:578 builtin/notes.c:581
+#: builtin/tag.c:418
+msgid "object"
 msgstr ""
 
-#: builtin/pack-objects.c:2463
-msgid "ignore packed objects"
+#: builtin/branch.c:634
+msgid "print only branches of the object"
 msgstr ""
 
-#: builtin/pack-objects.c:2465
-msgid "limit pack window by objects"
+#: builtin/branch.c:636 builtin/for-each-ref.c:49 builtin/tag.c:425
+msgid "sorting and filtering are case insensitive"
 msgstr ""
 
-#: builtin/pack-objects.c:2467
-msgid "limit pack window by memory in addition to object limit"
+#: builtin/branch.c:637 builtin/for-each-ref.c:38 builtin/tag.c:423
+#: builtin/verify-tag.c:39
+msgid "format to use for the output"
 msgstr ""
 
-#: builtin/pack-objects.c:2469
-msgid "maximum length of delta chain allowed in the resulting pack"
+#: builtin/branch.c:660 builtin/clone.c:739
+msgid "HEAD not found below refs/heads!"
 msgstr ""
 
-#: builtin/pack-objects.c:2471
-msgid "reuse existing deltas"
+#: builtin/branch.c:683
+msgid "--column and --verbose are incompatible"
 msgstr ""
 
-#: builtin/pack-objects.c:2473
-msgid "reuse existing objects"
+#: builtin/branch.c:698 builtin/branch.c:749 builtin/branch.c:758
+msgid "branch name required"
 msgstr ""
 
-#: builtin/pack-objects.c:2475
-msgid "use OFS_DELTA objects"
+#: builtin/branch.c:725
+msgid "Cannot give description to detached HEAD"
 msgstr ""
 
-#: builtin/pack-objects.c:2477
-msgid "use threads when searching for best delta matches"
+#: builtin/branch.c:730
+msgid "cannot edit description of more than one branch"
 msgstr ""
 
-#: builtin/pack-objects.c:2479
-msgid "do not create an empty pack output"
+#: builtin/branch.c:737
+#, c-format
+msgid "No commit on branch '%s' yet."
 msgstr ""
 
-#: builtin/pack-objects.c:2481
-msgid "read revision arguments from standard input"
+#: builtin/branch.c:740
+#, c-format
+msgid "No branch named '%s'."
 msgstr ""
 
-#: builtin/pack-objects.c:2483
-msgid "limit the objects to those that are not yet packed"
+#: builtin/branch.c:755
+msgid "too many branches for a copy operation"
 msgstr ""
 
-#: builtin/pack-objects.c:2486
-msgid "include objects reachable from any reference"
+#: builtin/branch.c:764
+msgid "too many arguments for a rename operation"
 msgstr ""
 
-#: builtin/pack-objects.c:2489
-msgid "include objects referred by reflog entries"
+#: builtin/branch.c:769
+msgid "too many arguments to set new upstream"
 msgstr ""
 
-#: builtin/pack-objects.c:2492
-msgid "output pack to stdout"
+#: builtin/branch.c:773
+#, c-format
+msgid ""
+"could not set upstream of HEAD to %s when it does not point to any branch."
 msgstr ""
 
-#: builtin/pack-objects.c:2494
-msgid "include tag objects that refer to objects to be packed"
+#: builtin/branch.c:776 builtin/branch.c:798
+#, c-format
+msgid "no such branch '%s'"
 msgstr ""
 
-#: builtin/pack-objects.c:2496
-msgid "keep unreachable objects"
+#: builtin/branch.c:780
+#, c-format
+msgid "branch '%s' does not exist"
 msgstr ""
 
-#: builtin/pack-objects.c:2497 parse-options.h:141
-msgid "time"
+#: builtin/branch.c:792
+msgid "too many arguments to unset upstream"
 msgstr ""
 
-#: builtin/pack-objects.c:2498
-msgid "unpack unreachable objects newer than <time>"
+#: builtin/branch.c:796
+msgid "could not unset upstream of HEAD when it does not point to any branch."
 msgstr ""
 
-#: builtin/pack-objects.c:2501
-msgid "create thin packs"
+#: builtin/branch.c:802
+#, c-format
+msgid "Branch '%s' has no upstream information"
 msgstr ""
 
-#: builtin/pack-objects.c:2503
-msgid "ignore packs that have companion .keep file"
+#: builtin/branch.c:812
+msgid "-a and -r options to 'git branch' do not make sense with a branch name"
 msgstr ""
 
-#: builtin/pack-objects.c:2505
-msgid "pack compression level"
+#: builtin/branch.c:815
+msgid ""
+"the '--set-upstream' option is no longer supported. Please use '--track' or "
+"'--set-upstream-to' instead."
 msgstr ""
 
-#: builtin/pack-objects.c:2507
-msgid "do not hide commits by grafts"
+#: builtin/bundle.c:45
+#, c-format
+msgid "%s is okay\n"
 msgstr ""
 
-#: builtin/pack-refs.c:6
-msgid "git pack-refs [options]"
+#: builtin/bundle.c:58
+msgid "Need a repository to create a bundle."
 msgstr ""
 
-#: builtin/pack-refs.c:14
-msgid "pack everything"
+#: builtin/bundle.c:62
+msgid "Need a repository to unbundle."
 msgstr ""
 
-#: builtin/pack-refs.c:15
-msgid "prune loose refs (default)"
+#: builtin/cat-file.c:587
+msgid ""
+"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
+"p | <type> | --textconv | --filters) [--path=<path>] <object>"
 msgstr ""
 
-#: builtin/prune-packed.c:7
-msgid "git prune-packed [-n|--dry-run] [-q|--quiet]"
+#: builtin/cat-file.c:588
+msgid ""
+"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
+"filters]"
 msgstr ""
 
-#: builtin/prune.c:12
-msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
+#: builtin/cat-file.c:609
+msgid "only one batch option may be specified"
 msgstr ""
 
-#: builtin/prune.c:132
-msgid "do not remove, show only"
+#: builtin/cat-file.c:627
+msgid "<type> can be one of: blob, tree, commit, tag"
 msgstr ""
 
-#: builtin/prune.c:133
-msgid "report pruned objects"
+#: builtin/cat-file.c:628
+msgid "show object type"
 msgstr ""
 
-#: builtin/prune.c:136
-msgid "expire objects older than <time>"
+#: builtin/cat-file.c:629
+msgid "show object size"
 msgstr ""
 
-#: builtin/push.c:14
-msgid "git push [<options>] [<repository> [<refspec>...]]"
+#: builtin/cat-file.c:631
+msgid "exit with zero when there's no error"
 msgstr ""
 
-#: builtin/push.c:45
-msgid "tag shorthand without <tag>"
+#: builtin/cat-file.c:632
+msgid "pretty-print object's content"
 msgstr ""
 
-#: builtin/push.c:64
-msgid "--delete only accepts plain target ref names"
+#: builtin/cat-file.c:634
+msgid "for blob objects, run textconv on object's content"
 msgstr ""
 
-#: builtin/push.c:99
-msgid ""
-"\n"
-"To choose either option permanently, see push.default in 'git help config'."
+#: builtin/cat-file.c:636
+msgid "for blob objects, run filters on object's content"
 msgstr ""
 
-#: builtin/push.c:102
-#, c-format
-msgid ""
-"The upstream branch of your current branch does not match\n"
-"the name of your current branch.  To push to the upstream branch\n"
-"on the remote, use\n"
-"\n"
-"    git push %s HEAD:%s\n"
-"\n"
-"To push to the branch of the same name on the remote, use\n"
-"\n"
-"    git push %s %s\n"
-"%s"
+#: builtin/cat-file.c:637 git-submodule.sh:857
+msgid "blob"
 msgstr ""
 
-#: builtin/push.c:117
-#, c-format
-msgid ""
-"You are not currently on a branch.\n"
-"To push the history leading to the current (detached HEAD)\n"
-"state now, use\n"
-"\n"
-"    git push %s HEAD:<name-of-remote-branch>\n"
+#: builtin/cat-file.c:638
+msgid "use a specific path for --textconv/--filters"
 msgstr ""
 
-#: builtin/push.c:131
-#, c-format
-msgid ""
-"The current branch %s has no upstream branch.\n"
-"To push the current branch and set the remote as upstream, use\n"
-"\n"
-"    git push --set-upstream %s %s\n"
+#: builtin/cat-file.c:640
+msgid "allow -s and -t to work with broken/corrupt objects"
 msgstr ""
 
-#: builtin/push.c:139
-#, c-format
-msgid "The current branch %s has multiple upstream branches, refusing to push."
+#: builtin/cat-file.c:641
+msgid "buffer --batch output"
 msgstr ""
 
-#: builtin/push.c:142
-#, c-format
-msgid ""
-"You are pushing to remote '%s', which is not the upstream of\n"
-"your current branch '%s', without telling me what to push\n"
-"to update which remote branch."
+#: builtin/cat-file.c:643
+msgid "show info and content of objects fed from the standard input"
 msgstr ""
 
-#: builtin/push.c:165
-msgid ""
-"push.default is unset; its implicit value is changing in\n"
-"Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
-"and maintain the current behavior after the default changes, use:\n"
-"\n"
-"  git config --global push.default matching\n"
-"\n"
-"To squelch this message and adopt the new behavior now, use:\n"
-"\n"
-"  git config --global push.default simple\n"
-"\n"
-"See 'git help config' and search for 'push.default' for further "
-"information.\n"
-"(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"
-"'current' instead of 'simple' if you sometimes use older versions of Git)"
+#: builtin/cat-file.c:647
+msgid "show info about objects fed from the standard input"
 msgstr ""
 
-#: builtin/push.c:225
-msgid ""
-"You didn't specify any refspecs to push, and push.default is \"nothing\"."
+#: builtin/cat-file.c:651
+msgid "follow in-tree symlinks (used with --batch or --batch-check)"
 msgstr ""
 
-#: builtin/push.c:232
-msgid ""
-"Updates were rejected because the tip of your current branch is behind\n"
-"its remote counterpart. Integrate the remote changes (e.g.\n"
-"'git pull ...') before pushing again.\n"
-"See the 'Note about fast-forwards' in 'git push --help' for details."
+#: builtin/cat-file.c:653
+msgid "show all objects with --batch or --batch-check"
 msgstr ""
 
-#: builtin/push.c:238
-msgid ""
-"Updates were rejected because a pushed branch tip is behind its remote\n"
-"counterpart. If you did not intend to push that branch, you may want to\n"
-"specify branches to push or set the 'push.default' configuration variable\n"
-"to 'simple', 'current' or 'upstream' to push only the current branch."
+#: builtin/cat-file.c:655
+msgid "do not order --batch-all-objects output"
 msgstr ""
 
-#: builtin/push.c:244
-msgid ""
-"Updates were rejected because a pushed branch tip is behind its remote\n"
-"counterpart. Check out this branch and integrate the remote changes\n"
-"(e.g. 'git pull ...') before pushing again.\n"
-"See the 'Note about fast-forwards' in 'git push --help' for details."
+#: builtin/check-attr.c:12
+msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
 msgstr ""
 
-#: builtin/push.c:250
-msgid ""
-"Updates were rejected because the remote contains work that you do\n"
+#: builtin/check-attr.c:13
+msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
+msgstr ""
+
+#: builtin/check-attr.c:20
+msgid "report all attributes set on file"
+msgstr ""
+
+#: builtin/check-attr.c:21
+msgid "use .gitattributes only from the index"
+msgstr ""
+
+#: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:101
+msgid "read file names from stdin"
+msgstr ""
+
+#: builtin/check-attr.c:24 builtin/check-ignore.c:26
+msgid "terminate input and output records by a NUL character"
+msgstr ""
+
+#: builtin/check-ignore.c:20 builtin/checkout.c:1234 builtin/gc.c:517
+#: builtin/worktree.c:495
+msgid "suppress progress reporting"
+msgstr ""
+
+#: builtin/check-ignore.c:28
+msgid "show non-matching input paths"
+msgstr ""
+
+#: builtin/check-ignore.c:30
+msgid "ignore index when checking"
+msgstr ""
+
+#: builtin/check-ignore.c:159
+msgid "cannot specify pathnames with --stdin"
+msgstr ""
+
+#: builtin/check-ignore.c:162
+msgid "-z only makes sense with --stdin"
+msgstr ""
+
+#: builtin/check-ignore.c:164
+msgid "no path specified"
+msgstr ""
+
+#: builtin/check-ignore.c:168
+msgid "--quiet is only valid with a single pathname"
+msgstr ""
+
+#: builtin/check-ignore.c:170
+msgid "cannot have both --quiet and --verbose"
+msgstr ""
+
+#: builtin/check-ignore.c:173
+msgid "--non-matching is only valid with --verbose"
+msgstr ""
+
+#: builtin/check-mailmap.c:9
+msgid "git check-mailmap [<options>] <contact>..."
+msgstr ""
+
+#: builtin/check-mailmap.c:14
+msgid "also read contacts from stdin"
+msgstr ""
+
+#: builtin/check-mailmap.c:25
+#, c-format
+msgid "unable to parse contact: %s"
+msgstr ""
+
+#: builtin/check-mailmap.c:48
+msgid "no contacts specified"
+msgstr ""
+
+#: builtin/checkout-index.c:128
+msgid "git checkout-index [<options>] [--] [<file>...]"
+msgstr ""
+
+#: builtin/checkout-index.c:145
+msgid "stage should be between 1 and 3 or all"
+msgstr ""
+
+#: builtin/checkout-index.c:161
+msgid "check out all files in the index"
+msgstr ""
+
+#: builtin/checkout-index.c:162
+msgid "force overwrite of existing files"
+msgstr ""
+
+#: builtin/checkout-index.c:164
+msgid "no warning for existing files and files not in index"
+msgstr ""
+
+#: builtin/checkout-index.c:166
+msgid "don't checkout new files"
+msgstr ""
+
+#: builtin/checkout-index.c:168
+msgid "update stat information in the index file"
+msgstr ""
+
+#: builtin/checkout-index.c:172
+msgid "read list of paths from the standard input"
+msgstr ""
+
+#: builtin/checkout-index.c:174
+msgid "write the content to temporary files"
+msgstr ""
+
+#: builtin/checkout-index.c:175 builtin/column.c:31
+#: builtin/submodule--helper.c:1368 builtin/submodule--helper.c:1371
+#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1853
+#: builtin/worktree.c:668
+msgid "string"
+msgstr ""
+
+#: builtin/checkout-index.c:176
+msgid "when creating files, prepend <string>"
+msgstr ""
+
+#: builtin/checkout-index.c:178
+msgid "copy out the files from named stage"
+msgstr ""
+
+#: builtin/checkout.c:31
+msgid "git checkout [<options>] <branch>"
+msgstr ""
+
+#: builtin/checkout.c:32
+msgid "git checkout [<options>] [<branch>] -- <file>..."
+msgstr ""
+
+#: builtin/checkout.c:144 builtin/checkout.c:177
+#, c-format
+msgid "path '%s' does not have our version"
+msgstr ""
+
+#: builtin/checkout.c:146 builtin/checkout.c:179
+#, c-format
+msgid "path '%s' does not have their version"
+msgstr ""
+
+#: builtin/checkout.c:162
+#, c-format
+msgid "path '%s' does not have all necessary versions"
+msgstr ""
+
+#: builtin/checkout.c:206
+#, c-format
+msgid "path '%s' does not have necessary versions"
+msgstr ""
+
+#: builtin/checkout.c:224
+#, c-format
+msgid "path '%s': cannot merge"
+msgstr ""
+
+#: builtin/checkout.c:240
+#, c-format
+msgid "Unable to add merge result for '%s'"
+msgstr ""
+
+#: builtin/checkout.c:262 builtin/checkout.c:265 builtin/checkout.c:268
+#: builtin/checkout.c:271
+#, c-format
+msgid "'%s' cannot be used with updating paths"
+msgstr ""
+
+#: builtin/checkout.c:274 builtin/checkout.c:277
+#, c-format
+msgid "'%s' cannot be used with %s"
+msgstr ""
+
+#: builtin/checkout.c:280
+#, c-format
+msgid "Cannot update paths and switch to branch '%s' at the same time."
+msgstr ""
+
+#: builtin/checkout.c:349 builtin/checkout.c:356
+#, c-format
+msgid "path '%s' is unmerged"
+msgstr ""
+
+#: builtin/checkout.c:608
+msgid "you need to resolve your current index first"
+msgstr ""
+
+#: builtin/checkout.c:745
+#, c-format
+msgid "Can not do reflog for '%s': %s\n"
+msgstr ""
+
+#: builtin/checkout.c:786
+msgid "HEAD is now at"
+msgstr ""
+
+#: builtin/checkout.c:790 builtin/clone.c:692
+msgid "unable to update HEAD"
+msgstr ""
+
+#: builtin/checkout.c:794
+#, c-format
+msgid "Reset branch '%s'\n"
+msgstr ""
+
+#: builtin/checkout.c:797
+#, c-format
+msgid "Already on '%s'\n"
+msgstr ""
+
+#: builtin/checkout.c:801
+#, c-format
+msgid "Switched to and reset branch '%s'\n"
+msgstr ""
+
+#: builtin/checkout.c:803 builtin/checkout.c:1166
+#, c-format
+msgid "Switched to a new branch '%s'\n"
+msgstr ""
+
+#: builtin/checkout.c:805
+#, c-format
+msgid "Switched to branch '%s'\n"
+msgstr ""
+
+#: builtin/checkout.c:856
+#, c-format
+msgid " ... and %d more.\n"
+msgstr ""
+
+#: builtin/checkout.c:862
+#, c-format
+msgid ""
+"Warning: you are leaving %d commit behind, not connected to\n"
+"any of your branches:\n"
+"\n"
+"%s\n"
+msgid_plural ""
+"Warning: you are leaving %d commits behind, not connected to\n"
+"any of your branches:\n"
+"\n"
+"%s\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/checkout.c:881
+#, c-format
+msgid ""
+"If you want to keep it by creating a new branch, this may be a good time\n"
+"to do so with:\n"
+"\n"
+" git branch <new-branch-name> %s\n"
+"\n"
+msgid_plural ""
+"If you want to keep them by creating a new branch, this may be a good time\n"
+"to do so with:\n"
+"\n"
+" git branch <new-branch-name> %s\n"
+"\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/checkout.c:913
+msgid "internal error in revision walk"
+msgstr ""
+
+#: builtin/checkout.c:917
+msgid "Previous HEAD position was"
+msgstr ""
+
+#: builtin/checkout.c:945 builtin/checkout.c:1161
+msgid "You are on a branch yet to be born"
+msgstr ""
+
+#: builtin/checkout.c:1066
+#, c-format
+msgid "only one reference expected, %d given."
+msgstr ""
+
+#: builtin/checkout.c:1107 builtin/worktree.c:289 builtin/worktree.c:444
+#, c-format
+msgid "invalid reference: %s"
+msgstr ""
+
+#: builtin/checkout.c:1136
+#, c-format
+msgid "reference is not a tree: %s"
+msgstr ""
+
+#: builtin/checkout.c:1175
+msgid "paths cannot be used with switching branches"
+msgstr ""
+
+#: builtin/checkout.c:1178 builtin/checkout.c:1182
+#, c-format
+msgid "'%s' cannot be used with switching branches"
+msgstr ""
+
+#: builtin/checkout.c:1186 builtin/checkout.c:1189 builtin/checkout.c:1194
+#: builtin/checkout.c:1197
+#, c-format
+msgid "'%s' cannot be used with '%s'"
+msgstr ""
+
+#: builtin/checkout.c:1202
+#, c-format
+msgid "Cannot switch branch to a non-commit '%s'"
+msgstr ""
+
+#: builtin/checkout.c:1235 builtin/checkout.c:1237 builtin/clone.c:119
+#: builtin/remote.c:169 builtin/remote.c:171 builtin/worktree.c:488
+#: builtin/worktree.c:490
+msgid "branch"
+msgstr ""
+
+#: builtin/checkout.c:1236
+msgid "create and checkout a new branch"
+msgstr ""
+
+#: builtin/checkout.c:1238
+msgid "create/reset and checkout a branch"
+msgstr ""
+
+#: builtin/checkout.c:1239
+msgid "create reflog for new branch"
+msgstr ""
+
+#: builtin/checkout.c:1240 builtin/worktree.c:492
+msgid "detach HEAD at named commit"
+msgstr ""
+
+#: builtin/checkout.c:1241
+msgid "set upstream info for new branch"
+msgstr ""
+
+#: builtin/checkout.c:1243
+msgid "new-branch"
+msgstr ""
+
+#: builtin/checkout.c:1243
+msgid "new unparented branch"
+msgstr ""
+
+#: builtin/checkout.c:1245
+msgid "checkout our version for unmerged files"
+msgstr ""
+
+#: builtin/checkout.c:1248
+msgid "checkout their version for unmerged files"
+msgstr ""
+
+#: builtin/checkout.c:1250
+msgid "force checkout (throw away local modifications)"
+msgstr ""
+
+#: builtin/checkout.c:1252
+msgid "perform a 3-way merge with the new branch"
+msgstr ""
+
+#: builtin/checkout.c:1254 builtin/merge.c:275
+msgid "update ignored files (default)"
+msgstr ""
+
+#: builtin/checkout.c:1256 builtin/log.c:1573 parse-options.h:274
+msgid "style"
+msgstr ""
+
+#: builtin/checkout.c:1257
+msgid "conflict style (merge or diff3)"
+msgstr ""
+
+#: builtin/checkout.c:1260
+msgid "do not limit pathspecs to sparse entries only"
+msgstr ""
+
+#: builtin/checkout.c:1262
+msgid "second guess 'git checkout <no-such-branch>'"
+msgstr ""
+
+#: builtin/checkout.c:1264
+msgid "do not check if another worktree is holding the given ref"
+msgstr ""
+
+#: builtin/checkout.c:1268 builtin/clone.c:86 builtin/fetch.c:141
+#: builtin/merge.c:272 builtin/pull.c:129 builtin/push.c:572
+#: builtin/send-pack.c:174
+msgid "force progress reporting"
+msgstr ""
+
+#: builtin/checkout.c:1298
+msgid "-b, -B and --orphan are mutually exclusive"
+msgstr ""
+
+#: builtin/checkout.c:1315
+msgid "--track needs a branch name"
+msgstr ""
+
+#: builtin/checkout.c:1320
+msgid "missing branch name; try -b"
+msgstr ""
+
+#: builtin/checkout.c:1357
+msgid "invalid path specification"
+msgstr ""
+
+#: builtin/checkout.c:1364
+#, c-format
+msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
+msgstr ""
+
+#: builtin/checkout.c:1368
+#, c-format
+msgid "git checkout: --detach does not take a path argument '%s'"
+msgstr ""
+
+#: builtin/checkout.c:1372
+msgid ""
+"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
+"checking out of the index."
+msgstr ""
+
+#: builtin/checkout.c:1392
+#, c-format
+msgid ""
+"'%s' matched more than one remote tracking branch.\n"
+"We found %d remotes with a reference that matched. So we fell back\n"
+"on trying to resolve the argument as a path, but failed there too!\n"
+"\n"
+"If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
+"you can do so by fully qualifying the name with the --track option:\n"
+"\n"
+"    git checkout --track origin/<name>\n"
+"\n"
+"If you'd like to always have checkouts of an ambiguous <name> prefer\n"
+"one remote, e.g. the 'origin' remote, consider setting\n"
+"checkout.defaultRemote=origin in your config."
+msgstr ""
+
+#: builtin/clean.c:27
+msgid ""
+"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
+msgstr ""
+
+#: builtin/clean.c:31
+#, c-format
+msgid "Removing %s\n"
+msgstr ""
+
+#: builtin/clean.c:32
+#, c-format
+msgid "Would remove %s\n"
+msgstr ""
+
+#: builtin/clean.c:33
+#, c-format
+msgid "Skipping repository %s\n"
+msgstr ""
+
+#: builtin/clean.c:34
+#, c-format
+msgid "Would skip repository %s\n"
+msgstr ""
+
+#: builtin/clean.c:35
+#, c-format
+msgid "failed to remove %s"
+msgstr ""
+
+#: builtin/clean.c:298 git-add--interactive.perl:579
+#, c-format
+msgid ""
+"Prompt help:\n"
+"1          - select a numbered item\n"
+"foo        - select item based on unique prefix\n"
+"           - (empty) select nothing\n"
+msgstr ""
+
+#: builtin/clean.c:302 git-add--interactive.perl:588
+#, c-format
+msgid ""
+"Prompt help:\n"
+"1          - select a single item\n"
+"3-5        - select a range of items\n"
+"2-3,6-9    - select multiple ranges\n"
+"foo        - select item based on unique prefix\n"
+"-...       - unselect specified items\n"
+"*          - choose all items\n"
+"           - (empty) finish selecting\n"
+msgstr ""
+
+#: builtin/clean.c:518 git-add--interactive.perl:554
+#: git-add--interactive.perl:559
+#, c-format, perl-format
+msgid "Huh (%s)?\n"
+msgstr ""
+
+#: builtin/clean.c:660
+#, c-format
+msgid "Input ignore patterns>> "
+msgstr ""
+
+#: builtin/clean.c:697
+#, c-format
+msgid "WARNING: Cannot find items matched by: %s"
+msgstr ""
+
+#: builtin/clean.c:718
+msgid "Select items to delete"
+msgstr ""
+
+#. TRANSLATORS: Make sure to keep [y/N] as is
+#: builtin/clean.c:759
+#, c-format
+msgid "Remove %s [y/N]? "
+msgstr ""
+
+#: builtin/clean.c:784 git-add--interactive.perl:1717
+#, c-format
+msgid "Bye.\n"
+msgstr ""
+
+#: builtin/clean.c:792
+msgid ""
+"clean               - start cleaning\n"
+"filter by pattern   - exclude items from deletion\n"
+"select by numbers   - select items to be deleted by numbers\n"
+"ask each            - confirm each deletion (like \"rm -i\")\n"
+"quit                - stop cleaning\n"
+"help                - this screen\n"
+"?                   - help for prompt selection"
+msgstr ""
+
+#: builtin/clean.c:819 git-add--interactive.perl:1793
+msgid "*** Commands ***"
+msgstr ""
+
+#: builtin/clean.c:820 git-add--interactive.perl:1790
+msgid "What now"
+msgstr ""
+
+#: builtin/clean.c:828
+msgid "Would remove the following item:"
+msgid_plural "Would remove the following items:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/clean.c:844
+msgid "No more files to clean, exiting."
+msgstr ""
+
+#: builtin/clean.c:906
+msgid "do not print names of files removed"
+msgstr ""
+
+#: builtin/clean.c:908
+msgid "force"
+msgstr ""
+
+#: builtin/clean.c:909
+msgid "interactive cleaning"
+msgstr ""
+
+#: builtin/clean.c:911
+msgid "remove whole directories"
+msgstr ""
+
+#: builtin/clean.c:912 builtin/describe.c:545 builtin/describe.c:547
+#: builtin/grep.c:886 builtin/log.c:166 builtin/log.c:168
+#: builtin/ls-files.c:556 builtin/name-rev.c:415 builtin/name-rev.c:417
+#: builtin/show-ref.c:178
+msgid "pattern"
+msgstr ""
+
+#: builtin/clean.c:913
+msgid "add <pattern> to ignore rules"
+msgstr ""
+
+#: builtin/clean.c:914
+msgid "remove ignored files, too"
+msgstr ""
+
+#: builtin/clean.c:916
+msgid "remove only ignored files"
+msgstr ""
+
+#: builtin/clean.c:934
+msgid "-x and -X cannot be used together"
+msgstr ""
+
+#: builtin/clean.c:938
+msgid ""
+"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
+"clean"
+msgstr ""
+
+#: builtin/clean.c:941
+msgid ""
+"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
+"refusing to clean"
+msgstr ""
+
+#: builtin/clone.c:43
+msgid "git clone [<options>] [--] <repo> [<dir>]"
+msgstr ""
+
+#: builtin/clone.c:88
+msgid "don't create a checkout"
+msgstr ""
+
+#: builtin/clone.c:89 builtin/clone.c:91 builtin/init-db.c:481
+msgid "create a bare repository"
+msgstr ""
+
+#: builtin/clone.c:93
+msgid "create a mirror repository (implies bare)"
+msgstr ""
+
+#: builtin/clone.c:95
+msgid "to clone from a local repository"
+msgstr ""
+
+#: builtin/clone.c:97
+msgid "don't use local hardlinks, always copy"
+msgstr ""
+
+#: builtin/clone.c:99
+msgid "setup as shared repository"
+msgstr ""
+
+#: builtin/clone.c:101 builtin/clone.c:105
+msgid "pathspec"
+msgstr ""
+
+#: builtin/clone.c:101 builtin/clone.c:105
+msgid "initialize submodules in the clone"
+msgstr ""
+
+#: builtin/clone.c:108
+msgid "number of submodules cloned in parallel"
+msgstr ""
+
+#: builtin/clone.c:109 builtin/init-db.c:478
+msgid "template-directory"
+msgstr ""
+
+#: builtin/clone.c:110 builtin/init-db.c:479
+msgid "directory from which templates will be used"
+msgstr ""
+
+#: builtin/clone.c:112 builtin/clone.c:114 builtin/submodule--helper.c:1375
+#: builtin/submodule--helper.c:1856
+msgid "reference repository"
+msgstr ""
+
+#: builtin/clone.c:116 builtin/submodule--helper.c:1377
+#: builtin/submodule--helper.c:1858
+msgid "use --reference only while cloning"
+msgstr ""
+
+#: builtin/clone.c:117 builtin/column.c:27 builtin/merge-file.c:46
+#: builtin/pack-objects.c:3301 builtin/repack.c:329
+msgid "name"
+msgstr ""
+
+#: builtin/clone.c:118
+msgid "use <name> instead of 'origin' to track upstream"
+msgstr ""
+
+#: builtin/clone.c:120
+msgid "checkout <branch> instead of the remote's HEAD"
+msgstr ""
+
+#: builtin/clone.c:122
+msgid "path to git-upload-pack on the remote"
+msgstr ""
+
+#: builtin/clone.c:123 builtin/fetch.c:142 builtin/grep.c:825
+#: builtin/pull.c:217
+msgid "depth"
+msgstr ""
+
+#: builtin/clone.c:124
+msgid "create a shallow clone of that depth"
+msgstr ""
+
+#: builtin/clone.c:125 builtin/fetch.c:144 builtin/pack-objects.c:3292
+msgid "time"
+msgstr ""
+
+#: builtin/clone.c:126
+msgid "create a shallow clone since a specific time"
+msgstr ""
+
+#: builtin/clone.c:127 builtin/fetch.c:146 builtin/fetch.c:169
+#: builtin/rebase.c:831
+msgid "revision"
+msgstr ""
+
+#: builtin/clone.c:128 builtin/fetch.c:147
+msgid "deepen history of shallow clone, excluding rev"
+msgstr ""
+
+#: builtin/clone.c:130
+msgid "clone only one branch, HEAD or --branch"
+msgstr ""
+
+#: builtin/clone.c:132
+msgid "don't clone any tags, and make later fetches not to follow them"
+msgstr ""
+
+#: builtin/clone.c:134
+msgid "any cloned submodules will be shallow"
+msgstr ""
+
+#: builtin/clone.c:135 builtin/init-db.c:487
+msgid "gitdir"
+msgstr ""
+
+#: builtin/clone.c:136 builtin/init-db.c:488
+msgid "separate git dir from working tree"
+msgstr ""
+
+#: builtin/clone.c:137
+msgid "key=value"
+msgstr ""
+
+#: builtin/clone.c:138
+msgid "set config inside the new repository"
+msgstr ""
+
+#: builtin/clone.c:139 builtin/fetch.c:165 builtin/pull.c:230
+#: builtin/push.c:583
+msgid "use IPv4 addresses only"
+msgstr ""
+
+#: builtin/clone.c:141 builtin/fetch.c:167 builtin/pull.c:233
+#: builtin/push.c:585
+msgid "use IPv6 addresses only"
+msgstr ""
+
+#: builtin/clone.c:279
+msgid ""
+"No directory name could be guessed.\n"
+"Please specify a directory on the command line"
+msgstr ""
+
+#: builtin/clone.c:332
+#, c-format
+msgid "info: Could not add alternate for '%s': %s\n"
+msgstr ""
+
+#: builtin/clone.c:404
+#, c-format
+msgid "failed to open '%s'"
+msgstr ""
+
+#: builtin/clone.c:412
+#, c-format
+msgid "%s exists and is not a directory"
+msgstr ""
+
+#: builtin/clone.c:426
+#, c-format
+msgid "failed to stat %s\n"
+msgstr ""
+
+#: builtin/clone.c:443
+#, c-format
+msgid "failed to unlink '%s'"
+msgstr ""
+
+#: builtin/clone.c:448
+#, c-format
+msgid "failed to create link '%s'"
+msgstr ""
+
+#: builtin/clone.c:452
+#, c-format
+msgid "failed to copy file to '%s'"
+msgstr ""
+
+#: builtin/clone.c:478
+#, c-format
+msgid "done.\n"
+msgstr ""
+
+#: builtin/clone.c:492
+msgid ""
+"Clone succeeded, but checkout failed.\n"
+"You can inspect what was checked out with 'git status'\n"
+"and retry the checkout with 'git checkout -f HEAD'\n"
+msgstr ""
+
+#: builtin/clone.c:569
+#, c-format
+msgid "Could not find remote branch %s to clone."
+msgstr ""
+
+#: builtin/clone.c:680
+#, c-format
+msgid "unable to update %s"
+msgstr ""
+
+#: builtin/clone.c:730
+msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
+msgstr ""
+
+#: builtin/clone.c:761
+msgid "unable to checkout working tree"
+msgstr ""
+
+#: builtin/clone.c:806
+msgid "unable to write parameters to config file"
+msgstr ""
+
+#: builtin/clone.c:869
+msgid "cannot repack to clean up"
+msgstr ""
+
+#: builtin/clone.c:871
+msgid "cannot unlink temporary alternates file"
+msgstr ""
+
+#: builtin/clone.c:911 builtin/receive-pack.c:1941
+msgid "Too many arguments."
+msgstr ""
+
+#: builtin/clone.c:915
+msgid "You must specify a repository to clone."
+msgstr ""
+
+#: builtin/clone.c:928
+#, c-format
+msgid "--bare and --origin %s options are incompatible."
+msgstr ""
+
+#: builtin/clone.c:931
+msgid "--bare and --separate-git-dir are incompatible."
+msgstr ""
+
+#: builtin/clone.c:944
+#, c-format
+msgid "repository '%s' does not exist"
+msgstr ""
+
+#: builtin/clone.c:950 builtin/fetch.c:1606
+#, c-format
+msgid "depth %s is not a positive number"
+msgstr ""
+
+#: builtin/clone.c:960
+#, c-format
+msgid "destination path '%s' already exists and is not an empty directory."
+msgstr ""
+
+#: builtin/clone.c:970
+#, c-format
+msgid "working tree '%s' already exists."
+msgstr ""
+
+#: builtin/clone.c:985 builtin/clone.c:1006 builtin/difftool.c:271
+#: builtin/worktree.c:295 builtin/worktree.c:325
+#, c-format
+msgid "could not create leading directories of '%s'"
+msgstr ""
+
+#: builtin/clone.c:990
+#, c-format
+msgid "could not create work tree dir '%s'"
+msgstr ""
+
+#: builtin/clone.c:1010
+#, c-format
+msgid "Cloning into bare repository '%s'...\n"
+msgstr ""
+
+#: builtin/clone.c:1012
+#, c-format
+msgid "Cloning into '%s'...\n"
+msgstr ""
+
+#: builtin/clone.c:1036
+msgid ""
+"clone --recursive is not compatible with both --reference and --reference-if-"
+"able"
+msgstr ""
+
+#: builtin/clone.c:1097
+msgid "--depth is ignored in local clones; use file:// instead."
+msgstr ""
+
+#: builtin/clone.c:1099
+msgid "--shallow-since is ignored in local clones; use file:// instead."
+msgstr ""
+
+#: builtin/clone.c:1101
+msgid "--shallow-exclude is ignored in local clones; use file:// instead."
+msgstr ""
+
+#: builtin/clone.c:1103
+msgid "--filter is ignored in local clones; use file:// instead."
+msgstr ""
+
+#: builtin/clone.c:1106
+msgid "source repository is shallow, ignoring --local"
+msgstr ""
+
+#: builtin/clone.c:1111
+msgid "--local is ignored"
+msgstr ""
+
+#: builtin/clone.c:1181 builtin/clone.c:1189
+#, c-format
+msgid "Remote branch %s not found in upstream %s"
+msgstr ""
+
+#: builtin/clone.c:1192
+msgid "You appear to have cloned an empty repository."
+msgstr ""
+
+#: builtin/column.c:10
+msgid "git column [<options>]"
+msgstr ""
+
+#: builtin/column.c:27
+msgid "lookup config vars"
+msgstr ""
+
+#: builtin/column.c:28 builtin/column.c:29
+msgid "layout to use"
+msgstr ""
+
+#: builtin/column.c:30
+msgid "Maximum width"
+msgstr ""
+
+#: builtin/column.c:31
+msgid "Padding space on left border"
+msgstr ""
+
+#: builtin/column.c:32
+msgid "Padding space on right border"
+msgstr ""
+
+#: builtin/column.c:33
+msgid "Padding space between columns"
+msgstr ""
+
+#: builtin/column.c:51
+msgid "--command must be the first argument"
+msgstr ""
+
+#: builtin/commit.c:40
+msgid "git commit [<options>] [--] <pathspec>..."
+msgstr ""
+
+#: builtin/commit.c:45
+msgid "git status [<options>] [--] <pathspec>..."
+msgstr ""
+
+#: builtin/commit.c:50
+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:55
+msgid ""
+"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
+"If you wish to commit it anyway, use:\n"
+"\n"
+"    git commit --allow-empty\n"
+"\n"
+msgstr ""
+
+#: builtin/commit.c:62
+msgid "Otherwise, please use 'git reset'\n"
+msgstr ""
+
+#: builtin/commit.c:65
+msgid ""
+"If you wish to skip this commit, use:\n"
+"\n"
+"    git reset\n"
+"\n"
+"Then \"git cherry-pick --continue\" will resume cherry-picking\n"
+"the remaining commits.\n"
+msgstr ""
+
+#: builtin/commit.c:311
+msgid "failed to unpack HEAD tree object"
+msgstr ""
+
+#: builtin/commit.c:352
+msgid "unable to create temporary index"
+msgstr ""
+
+#: builtin/commit.c:358
+msgid "interactive add failed"
+msgstr ""
+
+#: builtin/commit.c:371
+msgid "unable to update temporary index"
+msgstr ""
+
+#: builtin/commit.c:373
+msgid "Failed to update main cache tree"
+msgstr ""
+
+#: builtin/commit.c:398 builtin/commit.c:421 builtin/commit.c:467
+msgid "unable to write new_index file"
+msgstr ""
+
+#: builtin/commit.c:450
+msgid "cannot do a partial commit during a merge."
+msgstr ""
+
+#: builtin/commit.c:452
+msgid "cannot do a partial commit during a cherry-pick."
+msgstr ""
+
+#: builtin/commit.c:460
+msgid "cannot read the index"
+msgstr ""
+
+#: builtin/commit.c:479
+msgid "unable to write temporary index file"
+msgstr ""
+
+#: builtin/commit.c:577
+#, c-format
+msgid "commit '%s' lacks author header"
+msgstr ""
+
+#: builtin/commit.c:579
+#, c-format
+msgid "commit '%s' has malformed author line"
+msgstr ""
+
+#: builtin/commit.c:598
+msgid "malformed --author parameter"
+msgstr ""
+
+#: builtin/commit.c:650
+msgid ""
+"unable to select a comment character that is not used\n"
+"in the current commit message"
+msgstr ""
+
+#: builtin/commit.c:687 builtin/commit.c:720 builtin/commit.c:1049
+#, c-format
+msgid "could not lookup commit %s"
+msgstr ""
+
+#: builtin/commit.c:699 builtin/shortlog.c:317
+#, c-format
+msgid "(reading log message from standard input)\n"
+msgstr ""
+
+#: builtin/commit.c:701
+msgid "could not read log from standard input"
+msgstr ""
+
+#: builtin/commit.c:705
+#, c-format
+msgid "could not read log file '%s'"
+msgstr ""
+
+#: builtin/commit.c:734 builtin/commit.c:742
+msgid "could not read SQUASH_MSG"
+msgstr ""
+
+#: builtin/commit.c:739
+msgid "could not read MERGE_MSG"
+msgstr ""
+
+#: builtin/commit.c:793
+msgid "could not write commit template"
+msgstr ""
+
+#: builtin/commit.c:811
+#, c-format
+msgid ""
+"\n"
+"It looks like you may be committing a merge.\n"
+"If this is not correct, please remove the file\n"
+"\t%s\n"
+"and try again.\n"
+msgstr ""
+
+#: builtin/commit.c:816
+#, c-format
+msgid ""
+"\n"
+"It looks like you may be committing a cherry-pick.\n"
+"If this is not correct, please remove the file\n"
+"\t%s\n"
+"and try again.\n"
+msgstr ""
+
+#: builtin/commit.c:829
+#, 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:837
+#, c-format
+msgid ""
+"Please enter the commit message for your changes. Lines starting\n"
+"with '%c' will be kept; you may remove them yourself if you want to.\n"
+"An empty message aborts the commit.\n"
+msgstr ""
+
+#: builtin/commit.c:854
+#, c-format
+msgid "%sAuthor:    %.*s <%.*s>"
+msgstr ""
+
+#: builtin/commit.c:862
+#, c-format
+msgid "%sDate:      %s"
+msgstr ""
+
+#: builtin/commit.c:869
+#, c-format
+msgid "%sCommitter: %.*s <%.*s>"
+msgstr ""
+
+#: builtin/commit.c:887
+msgid "Cannot read index"
+msgstr ""
+
+#: builtin/commit.c:953
+msgid "Error building trees"
+msgstr ""
+
+#: builtin/commit.c:967 builtin/tag.c:258
+#, c-format
+msgid "Please supply the message using either -m or -F option.\n"
+msgstr ""
+
+#: builtin/commit.c:1011
+#, c-format
+msgid "--author '%s' is not 'Name <email>' and matches no existing author"
+msgstr ""
+
+#: builtin/commit.c:1025
+#, c-format
+msgid "Invalid ignored mode '%s'"
+msgstr ""
+
+#: builtin/commit.c:1039 builtin/commit.c:1276
+#, c-format
+msgid "Invalid untracked files mode '%s'"
+msgstr ""
+
+#: builtin/commit.c:1077
+msgid "--long and -z are incompatible"
+msgstr ""
+
+#: builtin/commit.c:1110
+msgid "Using both --reset-author and --author does not make sense"
+msgstr ""
+
+#: builtin/commit.c:1119
+msgid "You have nothing to amend."
+msgstr ""
+
+#: builtin/commit.c:1122
+msgid "You are in the middle of a merge -- cannot amend."
+msgstr ""
+
+#: builtin/commit.c:1124
+msgid "You are in the middle of a cherry-pick -- cannot amend."
+msgstr ""
+
+#: builtin/commit.c:1127
+msgid "Options --squash and --fixup cannot be used together"
+msgstr ""
+
+#: builtin/commit.c:1137
+msgid "Only one of -c/-C/-F/--fixup can be used."
+msgstr ""
+
+#: builtin/commit.c:1139
+msgid "Option -m cannot be combined with -c/-C/-F."
+msgstr ""
+
+#: builtin/commit.c:1147
+msgid "--reset-author can be used only with -C, -c or --amend."
+msgstr ""
+
+#: builtin/commit.c:1164
+msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
+msgstr ""
+
+#: builtin/commit.c:1166
+msgid "No paths with --include/--only does not make sense."
+msgstr ""
+
+#: builtin/commit.c:1180 builtin/tag.c:546
+#, c-format
+msgid "Invalid cleanup mode %s"
+msgstr ""
+
+#: builtin/commit.c:1185
+msgid "Paths with -a does not make sense."
+msgstr ""
+
+#: builtin/commit.c:1311 builtin/commit.c:1495
+msgid "show status concisely"
+msgstr ""
+
+#: builtin/commit.c:1313 builtin/commit.c:1497
+msgid "show branch information"
+msgstr ""
+
+#: builtin/commit.c:1315
+msgid "show stash information"
+msgstr ""
+
+#: builtin/commit.c:1317 builtin/commit.c:1499
+msgid "compute full ahead/behind values"
+msgstr ""
+
+#: builtin/commit.c:1319
+msgid "version"
+msgstr ""
+
+#: builtin/commit.c:1319 builtin/commit.c:1501 builtin/push.c:558
+#: builtin/worktree.c:639
+msgid "machine-readable output"
+msgstr ""
+
+#: builtin/commit.c:1322 builtin/commit.c:1503
+msgid "show status in long format (default)"
+msgstr ""
+
+#: builtin/commit.c:1325 builtin/commit.c:1506
+msgid "terminate entries with NUL"
+msgstr ""
+
+#: builtin/commit.c:1327 builtin/commit.c:1331 builtin/commit.c:1509
+#: builtin/fast-export.c:1007 builtin/fast-export.c:1010 builtin/rebase.c:910
+#: builtin/tag.c:400
+msgid "mode"
+msgstr ""
+
+#: builtin/commit.c:1328 builtin/commit.c:1509
+msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
+msgstr ""
+
+#: builtin/commit.c:1332
+msgid ""
+"show ignored files, optional modes: traditional, matching, no. (Default: "
+"traditional)"
+msgstr ""
+
+#: builtin/commit.c:1334 parse-options.h:164
+msgid "when"
+msgstr ""
+
+#: builtin/commit.c:1335
+msgid ""
+"ignore changes to submodules, optional when: all, dirty, untracked. "
+"(Default: all)"
+msgstr ""
+
+#: builtin/commit.c:1337
+msgid "list untracked files in columns"
+msgstr ""
+
+#: builtin/commit.c:1338
+msgid "do not detect renames"
+msgstr ""
+
+#: builtin/commit.c:1340
+msgid "detect renames, optionally set similarity index"
+msgstr ""
+
+#: builtin/commit.c:1360
+msgid "Unsupported combination of ignored and untracked-files arguments"
+msgstr ""
+
+#: builtin/commit.c:1465
+msgid "suppress summary after successful commit"
+msgstr ""
+
+#: builtin/commit.c:1466
+msgid "show diff in commit message template"
+msgstr ""
+
+#: builtin/commit.c:1468
+msgid "Commit message options"
+msgstr ""
+
+#: builtin/commit.c:1469 builtin/merge.c:263 builtin/tag.c:397
+msgid "read message from file"
+msgstr ""
+
+#: builtin/commit.c:1470
+msgid "author"
+msgstr ""
+
+#: builtin/commit.c:1470
+msgid "override author for commit"
+msgstr ""
+
+#: builtin/commit.c:1471 builtin/gc.c:518
+msgid "date"
+msgstr ""
+
+#: builtin/commit.c:1471
+msgid "override date for commit"
+msgstr ""
+
+#: builtin/commit.c:1472 builtin/merge.c:259 builtin/notes.c:409
+#: builtin/notes.c:572 builtin/tag.c:395
+msgid "message"
+msgstr ""
+
+#: builtin/commit.c:1472
+msgid "commit message"
+msgstr ""
+
+#: builtin/commit.c:1473 builtin/commit.c:1474 builtin/commit.c:1475
+#: builtin/commit.c:1476 ref-filter.h:92 parse-options.h:280
+msgid "commit"
+msgstr ""
+
+#: builtin/commit.c:1473
+msgid "reuse and edit message from specified commit"
+msgstr ""
+
+#: builtin/commit.c:1474
+msgid "reuse message from specified commit"
+msgstr ""
+
+#: builtin/commit.c:1475
+msgid "use autosquash formatted message to fixup specified commit"
+msgstr ""
+
+#: builtin/commit.c:1476
+msgid "use autosquash formatted message to squash specified commit"
+msgstr ""
+
+#: builtin/commit.c:1477
+msgid "the commit is authored by me now (used with -C/-c/--amend)"
+msgstr ""
+
+#: builtin/commit.c:1478 builtin/log.c:1520 builtin/merge.c:276
+#: builtin/pull.c:155 builtin/revert.c:106
+msgid "add Signed-off-by:"
+msgstr ""
+
+#: builtin/commit.c:1479
+msgid "use specified template file"
+msgstr ""
+
+#: builtin/commit.c:1480
+msgid "force edit of commit"
+msgstr ""
+
+#: builtin/commit.c:1481
+msgid "default"
+msgstr ""
+
+#: builtin/commit.c:1481 builtin/tag.c:401
+msgid "how to strip spaces and #comments from message"
+msgstr ""
+
+#: builtin/commit.c:1482
+msgid "include status in commit message template"
+msgstr ""
+
+#: builtin/commit.c:1484 builtin/merge.c:274 builtin/pull.c:185
+#: builtin/revert.c:114
+msgid "GPG sign commit"
+msgstr ""
+
+#: builtin/commit.c:1487
+msgid "Commit contents options"
+msgstr ""
+
+#: builtin/commit.c:1488
+msgid "commit all changed files"
+msgstr ""
+
+#: builtin/commit.c:1489
+msgid "add specified files to index for commit"
+msgstr ""
+
+#: builtin/commit.c:1490
+msgid "interactively add files"
+msgstr ""
+
+#: builtin/commit.c:1491
+msgid "interactively add changes"
+msgstr ""
+
+#: builtin/commit.c:1492
+msgid "commit only specified files"
+msgstr ""
+
+#: builtin/commit.c:1493
+msgid "bypass pre-commit and commit-msg hooks"
+msgstr ""
+
+#: builtin/commit.c:1494
+msgid "show what would be committed"
+msgstr ""
+
+#: builtin/commit.c:1507
+msgid "amend previous commit"
+msgstr ""
+
+#: builtin/commit.c:1508
+msgid "bypass post-rewrite hook"
+msgstr ""
+
+#: builtin/commit.c:1513
+msgid "ok to record an empty change"
+msgstr ""
+
+#: builtin/commit.c:1515
+msgid "ok to record a change with an empty message"
+msgstr ""
+
+#: builtin/commit.c:1588
+#, c-format
+msgid "Corrupt MERGE_HEAD file (%s)"
+msgstr ""
+
+#: builtin/commit.c:1595
+msgid "could not read MERGE_MODE"
+msgstr ""
+
+#: builtin/commit.c:1614
+#, c-format
+msgid "could not read commit message: %s"
+msgstr ""
+
+#: builtin/commit.c:1625
+#, c-format
+msgid "Aborting commit due to empty commit message.\n"
+msgstr ""
+
+#: builtin/commit.c:1630
+#, c-format
+msgid "Aborting commit; you did not edit the message.\n"
+msgstr ""
+
+#: builtin/commit.c:1665
+msgid ""
+"repository has been updated, but unable to write\n"
+"new_index file. Check that disk is not full and quota is\n"
+"not exceeded, and then \"git reset HEAD\" to recover."
+msgstr ""
+
+#: builtin/commit-graph.c:10
+msgid "git commit-graph [--object-dir <objdir>]"
+msgstr ""
+
+#: builtin/commit-graph.c:11 builtin/commit-graph.c:23
+msgid "git commit-graph read [--object-dir <objdir>]"
+msgstr ""
+
+#: builtin/commit-graph.c:12 builtin/commit-graph.c:18
+msgid "git commit-graph verify [--object-dir <objdir>]"
+msgstr ""
+
+#: builtin/commit-graph.c:13 builtin/commit-graph.c:28
+msgid ""
+"git commit-graph write [--object-dir <objdir>] [--append] [--reachable|--"
+"stdin-packs|--stdin-commits]"
+msgstr ""
+
+#: builtin/commit-graph.c:48 builtin/commit-graph.c:78
+#: builtin/commit-graph.c:132 builtin/commit-graph.c:190 builtin/fetch.c:153
+#: builtin/log.c:1540
+msgid "dir"
+msgstr ""
+
+#: builtin/commit-graph.c:49 builtin/commit-graph.c:79
+#: builtin/commit-graph.c:133 builtin/commit-graph.c:191
+msgid "The object directory to store the graph"
+msgstr ""
+
+#: builtin/commit-graph.c:135
+msgid "start walk at all refs"
+msgstr ""
+
+#: builtin/commit-graph.c:137
+msgid "scan pack-indexes listed by stdin for commits"
+msgstr ""
+
+#: builtin/commit-graph.c:139
+msgid "start walk at commits listed by stdin"
+msgstr ""
+
+#: builtin/commit-graph.c:141
+msgid "include all commits already in the commit-graph file"
+msgstr ""
+
+#: builtin/commit-graph.c:150
+msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
+msgstr ""
+
+#: builtin/config.c:11
+msgid "git config [<options>]"
+msgstr ""
+
+#: builtin/config.c:103
+#, c-format
+msgid "unrecognized --type argument, %s"
+msgstr ""
+
+#: builtin/config.c:115
+msgid "only one type at a time"
+msgstr ""
+
+#: builtin/config.c:124
+msgid "Config file location"
+msgstr ""
+
+#: builtin/config.c:125
+msgid "use global config file"
+msgstr ""
+
+#: builtin/config.c:126
+msgid "use system config file"
+msgstr ""
+
+#: builtin/config.c:127
+msgid "use repository config file"
+msgstr ""
+
+#: builtin/config.c:128
+msgid "use per-worktree config file"
+msgstr ""
+
+#: builtin/config.c:129
+msgid "use given config file"
+msgstr ""
+
+#: builtin/config.c:130
+msgid "blob-id"
+msgstr ""
+
+#: builtin/config.c:130
+msgid "read config from given blob object"
+msgstr ""
+
+#: builtin/config.c:131
+msgid "Action"
+msgstr ""
+
+#: builtin/config.c:132
+msgid "get value: name [value-regex]"
+msgstr ""
+
+#: builtin/config.c:133
+msgid "get all values: key [value-regex]"
+msgstr ""
+
+#: builtin/config.c:134
+msgid "get values for regexp: name-regex [value-regex]"
+msgstr ""
+
+#: builtin/config.c:135
+msgid "get value specific for the URL: section[.var] URL"
+msgstr ""
+
+#: builtin/config.c:136
+msgid "replace all matching variables: name value [value_regex]"
+msgstr ""
+
+#: builtin/config.c:137
+msgid "add a new variable: name value"
+msgstr ""
+
+#: builtin/config.c:138
+msgid "remove a variable: name [value-regex]"
+msgstr ""
+
+#: builtin/config.c:139
+msgid "remove all matches: name [value-regex]"
+msgstr ""
+
+#: builtin/config.c:140
+msgid "rename section: old-name new-name"
+msgstr ""
+
+#: builtin/config.c:141
+msgid "remove a section: name"
+msgstr ""
+
+#: builtin/config.c:142
+msgid "list all"
+msgstr ""
+
+#: builtin/config.c:143
+msgid "open an editor"
+msgstr ""
+
+#: builtin/config.c:144
+msgid "find the color configured: slot [default]"
+msgstr ""
+
+#: builtin/config.c:145
+msgid "find the color setting: slot [stdout-is-tty]"
+msgstr ""
+
+#: builtin/config.c:146
+msgid "Type"
+msgstr ""
+
+#: builtin/config.c:147
+msgid "value is given this type"
+msgstr ""
+
+#: builtin/config.c:148
+msgid "value is \"true\" or \"false\""
+msgstr ""
+
+#: builtin/config.c:149
+msgid "value is decimal number"
+msgstr ""
+
+#: builtin/config.c:150
+msgid "value is --bool or --int"
+msgstr ""
+
+#: builtin/config.c:151
+msgid "value is a path (file or directory name)"
+msgstr ""
+
+#: builtin/config.c:152
+msgid "value is an expiry date"
+msgstr ""
+
+#: builtin/config.c:153
+msgid "Other"
+msgstr ""
+
+#: builtin/config.c:154
+msgid "terminate values with NUL byte"
+msgstr ""
+
+#: builtin/config.c:155
+msgid "show variable names only"
+msgstr ""
+
+#: builtin/config.c:156
+msgid "respect include directives on lookup"
+msgstr ""
+
+#: builtin/config.c:157
+msgid "show origin of config (file, standard input, blob, command line)"
+msgstr ""
+
+#: builtin/config.c:158
+msgid "value"
+msgstr ""
+
+#: builtin/config.c:158
+msgid "with --get, use default value when missing entry"
+msgstr ""
+
+#: builtin/config.c:171
+#, c-format
+msgid "wrong number of arguments, should be %d"
+msgstr ""
+
+#: builtin/config.c:173
+#, c-format
+msgid "wrong number of arguments, should be from %d to %d"
+msgstr ""
+
+#: builtin/config.c:307
+#, c-format
+msgid "invalid key pattern: %s"
+msgstr ""
+
+#: builtin/config.c:343
+#, c-format
+msgid "failed to format default config value: %s"
+msgstr ""
+
+#: builtin/config.c:400
+#, c-format
+msgid "cannot parse color '%s'"
+msgstr ""
+
+#: builtin/config.c:442
+msgid "unable to parse default color value"
+msgstr ""
+
+#: builtin/config.c:495 builtin/config.c:741
+msgid "not in a git directory"
+msgstr ""
+
+#: builtin/config.c:498
+msgid "writing to stdin is not supported"
+msgstr ""
+
+#: builtin/config.c:501
+msgid "writing config blobs is not supported"
+msgstr ""
+
+#: builtin/config.c:586
+#, c-format
+msgid ""
+"# This is Git's per-user configuration file.\n"
+"[user]\n"
+"# Please adapt and uncomment the following lines:\n"
+"#\tname = %s\n"
+"#\temail = %s\n"
+msgstr ""
+
+#: builtin/config.c:610
+msgid "only one config file at a time"
+msgstr ""
+
+#: builtin/config.c:615
+msgid "--local can only be used inside a git repository"
+msgstr ""
+
+#: builtin/config.c:618
+msgid "--blob can only be used inside a git repository"
+msgstr ""
+
+#: builtin/config.c:637
+msgid "$HOME not set"
+msgstr ""
+
+#: builtin/config.c:657
+msgid ""
+"--worktree cannot be used with multiple working trees unless the config\n"
+"extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n"
+"section in \"git help worktree\" for details"
+msgstr ""
+
+#: builtin/config.c:687
+msgid "--get-color and variable type are incoherent"
+msgstr ""
+
+#: builtin/config.c:692
+msgid "only one action at a time"
+msgstr ""
+
+#: builtin/config.c:705
+msgid "--name-only is only applicable to --list or --get-regexp"
+msgstr ""
+
+#: builtin/config.c:711
+msgid ""
+"--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
+"list"
+msgstr ""
+
+#: builtin/config.c:717
+msgid "--default is only applicable to --get"
+msgstr ""
+
+#: builtin/config.c:730
+#, c-format
+msgid "unable to read config file '%s'"
+msgstr ""
+
+#: builtin/config.c:733
+msgid "error processing config file(s)"
+msgstr ""
+
+#: builtin/config.c:743
+msgid "editing stdin is not supported"
+msgstr ""
+
+#: builtin/config.c:745
+msgid "editing blobs is not supported"
+msgstr ""
+
+#: builtin/config.c:759
+#, c-format
+msgid "cannot create configuration file %s"
+msgstr ""
+
+#: builtin/config.c:772
+#, c-format
+msgid ""
+"cannot overwrite multiple values with a single value\n"
+"       Use a regexp, --add or --replace-all to change %s."
+msgstr ""
+
+#: builtin/config.c:846 builtin/config.c:857
+#, c-format
+msgid "no such section: %s"
+msgstr ""
+
+#: builtin/count-objects.c:90
+msgid "git count-objects [-v] [-H | --human-readable]"
+msgstr ""
+
+#: builtin/count-objects.c:100
+msgid "print sizes in human readable format"
+msgstr ""
+
+#: builtin/describe.c:26
+msgid "git describe [<options>] [<commit-ish>...]"
+msgstr ""
+
+#: builtin/describe.c:27
+msgid "git describe [<options>] --dirty"
+msgstr ""
+
+#: builtin/describe.c:62
+msgid "head"
+msgstr ""
+
+#: builtin/describe.c:62
+msgid "lightweight"
+msgstr ""
+
+#: builtin/describe.c:62
+msgid "annotated"
+msgstr ""
+
+#: builtin/describe.c:272
+#, c-format
+msgid "annotated tag %s not available"
+msgstr ""
+
+#: builtin/describe.c:276
+#, c-format
+msgid "annotated tag %s has no embedded name"
+msgstr ""
+
+#: builtin/describe.c:278
+#, c-format
+msgid "tag '%s' is really '%s' here"
+msgstr ""
+
+#: builtin/describe.c:322
+#, c-format
+msgid "no tag exactly matches '%s'"
+msgstr ""
+
+#: builtin/describe.c:324
+#, c-format
+msgid "No exact match on refs or tags, searching to describe\n"
+msgstr ""
+
+#: builtin/describe.c:378
+#, c-format
+msgid "finished search at %s\n"
+msgstr ""
+
+#: builtin/describe.c:404
+#, c-format
+msgid ""
+"No annotated tags can describe '%s'.\n"
+"However, there were unannotated tags: try --tags."
+msgstr ""
+
+#: builtin/describe.c:408
+#, c-format
+msgid ""
+"No tags can describe '%s'.\n"
+"Try --always, or create some tags."
+msgstr ""
+
+#: builtin/describe.c:438
+#, c-format
+msgid "traversed %lu commits\n"
+msgstr ""
+
+#: builtin/describe.c:441
+#, c-format
+msgid ""
+"more than %i tags found; listed %i most recent\n"
+"gave up search at %s\n"
+msgstr ""
+
+#: builtin/describe.c:509
+#, c-format
+msgid "describe %s\n"
+msgstr ""
+
+#: builtin/describe.c:512 builtin/log.c:513
+#, c-format
+msgid "Not a valid object name %s"
+msgstr ""
+
+#: builtin/describe.c:520
+#, c-format
+msgid "%s is neither a commit nor blob"
+msgstr ""
+
+#: builtin/describe.c:534
+msgid "find the tag that comes after the commit"
+msgstr ""
+
+#: builtin/describe.c:535
+msgid "debug search strategy on stderr"
+msgstr ""
+
+#: builtin/describe.c:536
+msgid "use any ref"
+msgstr ""
+
+#: builtin/describe.c:537
+msgid "use any tag, even unannotated"
+msgstr ""
+
+#: builtin/describe.c:538
+msgid "always use long format"
+msgstr ""
+
+#: builtin/describe.c:539
+msgid "only follow first parent"
+msgstr ""
+
+#: builtin/describe.c:542
+msgid "only output exact matches"
+msgstr ""
+
+#: builtin/describe.c:544
+msgid "consider <n> most recent tags (default: 10)"
+msgstr ""
+
+#: builtin/describe.c:546
+msgid "only consider tags matching <pattern>"
+msgstr ""
+
+#: builtin/describe.c:548
+msgid "do not consider tags matching <pattern>"
+msgstr ""
+
+#: builtin/describe.c:550 builtin/name-rev.c:424
+msgid "show abbreviated commit object as fallback"
+msgstr ""
+
+#: builtin/describe.c:551 builtin/describe.c:554
+msgid "mark"
+msgstr ""
+
+#: builtin/describe.c:552
+msgid "append <mark> on dirty working tree (default: \"-dirty\")"
+msgstr ""
+
+#: builtin/describe.c:555
+msgid "append <mark> on broken working tree (default: \"-broken\")"
+msgstr ""
+
+#: builtin/describe.c:573
+msgid "--long is incompatible with --abbrev=0"
+msgstr ""
+
+#: builtin/describe.c:602
+msgid "No names found, cannot describe anything."
+msgstr ""
+
+#: builtin/describe.c:652
+msgid "--dirty is incompatible with commit-ishes"
+msgstr ""
+
+#: builtin/describe.c:654
+msgid "--broken is incompatible with commit-ishes"
+msgstr ""
+
+#: builtin/diff.c:83
+#, c-format
+msgid "'%s': not a regular file or symlink"
+msgstr ""
+
+#: builtin/diff.c:234
+#, c-format
+msgid "invalid option: %s"
+msgstr ""
+
+#: builtin/diff.c:363
+msgid "Not a git repository"
+msgstr ""
+
+#: builtin/diff.c:407
+#, c-format
+msgid "invalid object '%s' given."
+msgstr ""
+
+#: builtin/diff.c:416
+#, c-format
+msgid "more than two blobs given: '%s'"
+msgstr ""
+
+#: builtin/diff.c:421
+#, c-format
+msgid "unhandled object '%s' given."
+msgstr ""
+
+#: builtin/difftool.c:30
+msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
+msgstr ""
+
+#: builtin/difftool.c:260
+#, c-format
+msgid "failed: %d"
+msgstr ""
+
+#: builtin/difftool.c:302
+#, c-format
+msgid "could not read symlink %s"
+msgstr ""
+
+#: builtin/difftool.c:304
+#, c-format
+msgid "could not read symlink file %s"
+msgstr ""
+
+#: builtin/difftool.c:312
+#, c-format
+msgid "could not read object %s for symlink %s"
+msgstr ""
+
+#: builtin/difftool.c:413
+msgid ""
+"combined diff formats('-c' and '--cc') are not supported in\n"
+"directory diff mode('-d' and '--dir-diff')."
+msgstr ""
+
+#: builtin/difftool.c:633
+#, c-format
+msgid "both files modified: '%s' and '%s'."
+msgstr ""
+
+#: builtin/difftool.c:635
+msgid "working tree file has been left."
+msgstr ""
+
+#: builtin/difftool.c:646
+#, c-format
+msgid "temporary files exist in '%s'."
+msgstr ""
+
+#: builtin/difftool.c:647
+msgid "you may want to cleanup or recover these."
+msgstr ""
+
+#: builtin/difftool.c:696
+msgid "use `diff.guitool` instead of `diff.tool`"
+msgstr ""
+
+#: builtin/difftool.c:698
+msgid "perform a full-directory diff"
+msgstr ""
+
+#: builtin/difftool.c:700
+msgid "do not prompt before launching a diff tool"
+msgstr ""
+
+#: builtin/difftool.c:705
+msgid "use symlinks in dir-diff mode"
+msgstr ""
+
+#: builtin/difftool.c:706
+msgid "tool"
+msgstr ""
+
+#: builtin/difftool.c:707
+msgid "use the specified diff tool"
+msgstr ""
+
+#: builtin/difftool.c:709
+msgid "print a list of diff tools that may be used with `--tool`"
+msgstr ""
+
+#: builtin/difftool.c:712
+msgid ""
+"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
+"code"
+msgstr ""
+
+#: builtin/difftool.c:715
+msgid "specify a custom command for viewing diffs"
+msgstr ""
+
+#: builtin/difftool.c:739
+msgid "no <tool> given for --tool=<tool>"
+msgstr ""
+
+#: builtin/difftool.c:746
+msgid "no <cmd> given for --extcmd=<cmd>"
+msgstr ""
+
+#: builtin/fast-export.c:29
+msgid "git fast-export [rev-list-opts]"
+msgstr ""
+
+#: builtin/fast-export.c:1006
+msgid "show progress after <n> objects"
+msgstr ""
+
+#: builtin/fast-export.c:1008
+msgid "select handling of signed tags"
+msgstr ""
+
+#: builtin/fast-export.c:1011
+msgid "select handling of tags that tag filtered objects"
+msgstr ""
+
+#: builtin/fast-export.c:1014
+msgid "Dump marks to this file"
+msgstr ""
+
+#: builtin/fast-export.c:1016
+msgid "Import marks from this file"
+msgstr ""
+
+#: builtin/fast-export.c:1018
+msgid "Fake a tagger when tags lack one"
+msgstr ""
+
+#: builtin/fast-export.c:1020
+msgid "Output full tree for each commit"
+msgstr ""
+
+#: builtin/fast-export.c:1022
+msgid "Use the done feature to terminate the stream"
+msgstr ""
+
+#: builtin/fast-export.c:1023
+msgid "Skip output of blob data"
+msgstr ""
+
+#: builtin/fast-export.c:1024 builtin/log.c:1588
+msgid "refspec"
+msgstr ""
+
+#: builtin/fast-export.c:1025
+msgid "Apply refspec to exported refs"
+msgstr ""
+
+#: builtin/fast-export.c:1026
+msgid "anonymize output"
+msgstr ""
+
+#: builtin/fetch.c:28
+msgid "git fetch [<options>] [<repository> [<refspec>...]]"
+msgstr ""
+
+#: builtin/fetch.c:29
+msgid "git fetch [<options>] <group>"
+msgstr ""
+
+#: builtin/fetch.c:30
+msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
+msgstr ""
+
+#: builtin/fetch.c:31
+msgid "git fetch --all [<options>]"
+msgstr ""
+
+#: builtin/fetch.c:115 builtin/pull.c:194
+msgid "fetch from all remotes"
+msgstr ""
+
+#: builtin/fetch.c:117 builtin/pull.c:197
+msgid "append to .git/FETCH_HEAD instead of overwriting"
+msgstr ""
+
+#: builtin/fetch.c:119 builtin/pull.c:200
+msgid "path to upload pack on remote end"
+msgstr ""
+
+#: builtin/fetch.c:120
+msgid "force overwrite of local reference"
+msgstr ""
+
+#: builtin/fetch.c:122
+msgid "fetch from multiple remotes"
+msgstr ""
+
+#: builtin/fetch.c:124 builtin/pull.c:204
+msgid "fetch all tags and associated objects"
+msgstr ""
+
+#: builtin/fetch.c:126
+msgid "do not fetch all tags (--no-tags)"
+msgstr ""
+
+#: builtin/fetch.c:128
+msgid "number of submodules fetched in parallel"
+msgstr ""
+
+#: builtin/fetch.c:130 builtin/pull.c:207
+msgid "prune remote-tracking branches no longer on remote"
+msgstr ""
+
+#: builtin/fetch.c:132
+msgid "prune local tags no longer on remote and clobber changed tags"
+msgstr ""
+
+#: builtin/fetch.c:133 builtin/fetch.c:156 builtin/pull.c:132
+msgid "on-demand"
+msgstr ""
+
+#: builtin/fetch.c:134
+msgid "control recursive fetching of submodules"
+msgstr ""
+
+#: builtin/fetch.c:138 builtin/pull.c:215
+msgid "keep downloaded pack"
+msgstr ""
+
+#: builtin/fetch.c:140
+msgid "allow updating of HEAD ref"
+msgstr ""
+
+#: builtin/fetch.c:143 builtin/fetch.c:149 builtin/pull.c:218
+msgid "deepen history of shallow clone"
+msgstr ""
+
+#: builtin/fetch.c:145
+msgid "deepen history of shallow repository based on time"
+msgstr ""
+
+#: builtin/fetch.c:151 builtin/pull.c:221
+msgid "convert to a complete repository"
+msgstr ""
+
+#: builtin/fetch.c:154
+msgid "prepend this to submodule path output"
+msgstr ""
+
+#: builtin/fetch.c:157
+msgid ""
+"default for recursive fetching of submodules (lower priority than config "
+"files)"
+msgstr ""
+
+#: builtin/fetch.c:161 builtin/pull.c:224
+msgid "accept refs that update .git/shallow"
+msgstr ""
+
+#: builtin/fetch.c:162 builtin/pull.c:226
+msgid "refmap"
+msgstr ""
+
+#: builtin/fetch.c:163 builtin/pull.c:227
+msgid "specify fetch refmap"
+msgstr ""
+
+#: builtin/fetch.c:164 builtin/ls-remote.c:77 builtin/push.c:582
+#: builtin/send-pack.c:172
+msgid "server-specific"
+msgstr ""
+
+#: builtin/fetch.c:164 builtin/ls-remote.c:77 builtin/push.c:582
+#: builtin/send-pack.c:173
+msgid "option to transmit"
+msgstr ""
+
+#: builtin/fetch.c:170
+msgid "report that we have only objects reachable from this object"
+msgstr ""
+
+#: builtin/fetch.c:470
+msgid "Couldn't find remote ref HEAD"
+msgstr ""
+
+#: builtin/fetch.c:609
+#, c-format
+msgid "configuration fetch.output contains invalid value %s"
+msgstr ""
+
+#: builtin/fetch.c:702
+#, c-format
+msgid "object %s not found"
+msgstr ""
+
+#: builtin/fetch.c:706
+msgid "[up to date]"
+msgstr ""
+
+#: builtin/fetch.c:719 builtin/fetch.c:735 builtin/fetch.c:807
+msgid "[rejected]"
+msgstr ""
+
+#: builtin/fetch.c:720
+msgid "can't fetch in current branch"
+msgstr ""
+
+#: builtin/fetch.c:730
+msgid "[tag update]"
+msgstr ""
+
+#: builtin/fetch.c:731 builtin/fetch.c:771 builtin/fetch.c:787
+#: builtin/fetch.c:802
+msgid "unable to update local ref"
+msgstr ""
+
+#: builtin/fetch.c:735
+msgid "would clobber existing tag"
+msgstr ""
+
+#: builtin/fetch.c:757
+msgid "[new tag]"
+msgstr ""
+
+#: builtin/fetch.c:760
+msgid "[new branch]"
+msgstr ""
+
+#: builtin/fetch.c:763
+msgid "[new ref]"
+msgstr ""
+
+#: builtin/fetch.c:802
+msgid "forced update"
+msgstr ""
+
+#: builtin/fetch.c:807
+msgid "non-fast-forward"
+msgstr ""
+
+#: builtin/fetch.c:853
+#, c-format
+msgid "%s did not send all necessary objects\n"
+msgstr ""
+
+#: builtin/fetch.c:874
+#, c-format
+msgid "reject %s because shallow roots are not allowed to be updated"
+msgstr ""
+
+#: builtin/fetch.c:963 builtin/fetch.c:1085
+#, c-format
+msgid "From %.*s\n"
+msgstr ""
+
+#: builtin/fetch.c:974
+#, 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:1055
+#, c-format
+msgid "   (%s will become dangling)"
+msgstr ""
+
+#: builtin/fetch.c:1056
+#, c-format
+msgid "   (%s has become dangling)"
+msgstr ""
+
+#: builtin/fetch.c:1088
+msgid "[deleted]"
+msgstr ""
+
+#: builtin/fetch.c:1089 builtin/remote.c:1036
+msgid "(none)"
+msgstr ""
+
+#: builtin/fetch.c:1112
+#, c-format
+msgid "Refusing to fetch into current branch %s of non-bare repository"
+msgstr ""
+
+#: builtin/fetch.c:1131
+#, c-format
+msgid "Option \"%s\" value \"%s\" is not valid for %s"
+msgstr ""
+
+#: builtin/fetch.c:1134
+#, c-format
+msgid "Option \"%s\" is ignored for %s\n"
+msgstr ""
+
+#: builtin/fetch.c:1433
+#, c-format
+msgid "Fetching %s\n"
+msgstr ""
+
+#: builtin/fetch.c:1435 builtin/remote.c:100
+#, c-format
+msgid "Could not fetch %s"
+msgstr ""
+
+#: builtin/fetch.c:1481 builtin/fetch.c:1649
+msgid ""
+"--filter can only be used with the remote configured in core.partialClone"
+msgstr ""
+
+#: builtin/fetch.c:1504
+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:1541
+msgid "You need to specify a tag name."
+msgstr ""
+
+#: builtin/fetch.c:1590
+msgid "Negative depth in --deepen is not supported"
+msgstr ""
+
+#: builtin/fetch.c:1592
+msgid "--deepen and --depth are mutually exclusive"
+msgstr ""
+
+#: builtin/fetch.c:1597
+msgid "--depth and --unshallow cannot be used together"
+msgstr ""
+
+#: builtin/fetch.c:1599
+msgid "--unshallow on a complete repository does not make sense"
+msgstr ""
+
+#: builtin/fetch.c:1615
+msgid "fetch --all does not take a repository argument"
+msgstr ""
+
+#: builtin/fetch.c:1617
+msgid "fetch --all does not make sense with refspecs"
+msgstr ""
+
+#: builtin/fetch.c:1626
+#, c-format
+msgid "No such remote or remote group: %s"
+msgstr ""
+
+#: builtin/fetch.c:1633
+msgid "Fetching a group and specifying refspecs does not make sense"
+msgstr ""
+
+#: builtin/fmt-merge-msg.c:18
+msgid ""
+"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
+msgstr ""
+
+#: builtin/fmt-merge-msg.c:672
+msgid "populate log with at most <n> entries from shortlog"
+msgstr ""
+
+#: builtin/fmt-merge-msg.c:675
+msgid "alias for --log (deprecated)"
+msgstr ""
+
+#: builtin/fmt-merge-msg.c:678
+msgid "text"
+msgstr ""
+
+#: builtin/fmt-merge-msg.c:679
+msgid "use <text> as start of message"
+msgstr ""
+
+#: builtin/fmt-merge-msg.c:680
+msgid "file to read from"
+msgstr ""
+
+#: builtin/for-each-ref.c:10
+msgid "git for-each-ref [<options>] [<pattern>]"
+msgstr ""
+
+#: builtin/for-each-ref.c:11
+msgid "git for-each-ref [--points-at <object>]"
+msgstr ""
+
+#: builtin/for-each-ref.c:12
+msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]"
+msgstr ""
+
+#: builtin/for-each-ref.c:13
+msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
+msgstr ""
+
+#: builtin/for-each-ref.c:28
+msgid "quote placeholders suitably for shells"
+msgstr ""
+
+#: builtin/for-each-ref.c:30
+msgid "quote placeholders suitably for perl"
+msgstr ""
+
+#: builtin/for-each-ref.c:32
+msgid "quote placeholders suitably for python"
+msgstr ""
+
+#: builtin/for-each-ref.c:34
+msgid "quote placeholders suitably for Tcl"
+msgstr ""
+
+#: builtin/for-each-ref.c:37
+msgid "show only <n> matched refs"
+msgstr ""
+
+#: builtin/for-each-ref.c:39 builtin/tag.c:424
+msgid "respect format colors"
+msgstr ""
+
+#: builtin/for-each-ref.c:43
+msgid "print only refs which points at the given object"
+msgstr ""
+
+#: builtin/for-each-ref.c:45
+msgid "print only refs that are merged"
+msgstr ""
+
+#: builtin/for-each-ref.c:46
+msgid "print only refs that are not merged"
+msgstr ""
+
+#: builtin/for-each-ref.c:47
+msgid "print only refs which contain the commit"
+msgstr ""
+
+#: builtin/for-each-ref.c:48
+msgid "print only refs which don't contain the commit"
+msgstr ""
+
+#: builtin/fsck.c:598
+msgid "Checking object directories"
+msgstr ""
+
+#: builtin/fsck.c:693
+msgid "git fsck [<options>] [<object>...]"
+msgstr ""
+
+#: builtin/fsck.c:699
+msgid "show unreachable objects"
+msgstr ""
+
+#: builtin/fsck.c:700
+msgid "show dangling objects"
+msgstr ""
+
+#: builtin/fsck.c:701
+msgid "report tags"
+msgstr ""
+
+#: builtin/fsck.c:702
+msgid "report root nodes"
+msgstr ""
+
+#: builtin/fsck.c:703
+msgid "make index objects head nodes"
+msgstr ""
+
+#: builtin/fsck.c:704
+msgid "make reflogs head nodes (default)"
+msgstr ""
+
+#: builtin/fsck.c:705
+msgid "also consider packs and alternate objects"
+msgstr ""
+
+#: builtin/fsck.c:706
+msgid "check only connectivity"
+msgstr ""
+
+#: builtin/fsck.c:707
+msgid "enable more strict checking"
+msgstr ""
+
+#: builtin/fsck.c:709
+msgid "write dangling objects in .git/lost-found"
+msgstr ""
+
+#: builtin/fsck.c:710 builtin/prune.c:110
+msgid "show progress"
+msgstr ""
+
+#: builtin/fsck.c:711
+msgid "show verbose names for reachable objects"
+msgstr ""
+
+#: builtin/fsck.c:776
+msgid "Checking objects"
+msgstr ""
+
+#: builtin/gc.c:34
+msgid "git gc [<options>]"
+msgstr ""
+
+#: builtin/gc.c:90
+#, c-format
+msgid "Failed to fstat %s: %s"
+msgstr ""
+
+#: builtin/gc.c:461 builtin/init-db.c:55
+#, c-format
+msgid "cannot stat '%s'"
+msgstr ""
+
+#: builtin/gc.c:470 builtin/notes.c:240 builtin/tag.c:510
+#, c-format
+msgid "cannot read '%s'"
+msgstr ""
+
+#: builtin/gc.c:477
+#, c-format
+msgid ""
+"The last gc run reported the following. Please correct the root cause\n"
+"and remove %s.\n"
+"Automatic cleanup will not be performed until the file is removed.\n"
+"\n"
+"%s"
+msgstr ""
+
+#: builtin/gc.c:519
+msgid "prune unreferenced objects"
+msgstr ""
+
+#: builtin/gc.c:521
+msgid "be more thorough (increased runtime)"
+msgstr ""
+
+#: builtin/gc.c:522
+msgid "enable auto-gc mode"
+msgstr ""
+
+#: builtin/gc.c:525
+msgid "force running gc even if there may be another gc running"
+msgstr ""
+
+#: builtin/gc.c:528
+msgid "repack all other packs except the largest pack"
+msgstr ""
+
+#: builtin/gc.c:545
+#, c-format
+msgid "failed to parse gc.logexpiry value %s"
+msgstr ""
+
+#: builtin/gc.c:556
+#, c-format
+msgid "failed to parse prune expiry value %s"
+msgstr ""
+
+#: builtin/gc.c:576
+#, c-format
+msgid "Auto packing the repository in background for optimum performance.\n"
+msgstr ""
+
+#: builtin/gc.c:578
+#, c-format
+msgid "Auto packing the repository for optimum performance.\n"
+msgstr ""
+
+#: builtin/gc.c:579
+#, c-format
+msgid "See \"git help gc\" for manual housekeeping.\n"
+msgstr ""
+
+#: builtin/gc.c:619
+#, c-format
+msgid ""
+"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
+msgstr ""
+
+#: builtin/gc.c:670
+msgid ""
+"There are too many unreachable loose objects; run 'git prune' to remove them."
+msgstr ""
+
+#: builtin/grep.c:28
+msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
+msgstr ""
+
+#: builtin/grep.c:224
+#, c-format
+msgid "grep: failed to create thread: %s"
+msgstr ""
+
+#: builtin/grep.c:278
+#, c-format
+msgid "invalid number of threads specified (%d) for %s"
+msgstr ""
+
+#. TRANSLATORS: %s is the configuration
+#. variable for tweaking threads, currently
+#. grep.threads
+#.
+#: builtin/grep.c:286 builtin/index-pack.c:1506 builtin/index-pack.c:1697
+#: builtin/pack-objects.c:2719
+#, c-format
+msgid "no threads support, ignoring %s"
+msgstr ""
+
+#: builtin/grep.c:458 builtin/grep.c:579 builtin/grep.c:620
+#, c-format
+msgid "unable to read tree (%s)"
+msgstr ""
+
+#: builtin/grep.c:635
+#, c-format
+msgid "unable to grep from object of type %s"
+msgstr ""
+
+#: builtin/grep.c:701
+#, c-format
+msgid "switch `%c' expects a numerical value"
+msgstr ""
+
+#: builtin/grep.c:800
+msgid "search in index instead of in the work tree"
+msgstr ""
+
+#: builtin/grep.c:802
+msgid "find in contents not managed by git"
+msgstr ""
+
+#: builtin/grep.c:804
+msgid "search in both tracked and untracked files"
+msgstr ""
+
+#: builtin/grep.c:806
+msgid "ignore files specified via '.gitignore'"
+msgstr ""
+
+#: builtin/grep.c:808
+msgid "recursively search in each submodule"
+msgstr ""
+
+#: builtin/grep.c:811
+msgid "show non-matching lines"
+msgstr ""
+
+#: builtin/grep.c:813
+msgid "case insensitive matching"
+msgstr ""
+
+#: builtin/grep.c:815
+msgid "match patterns only at word boundaries"
+msgstr ""
+
+#: builtin/grep.c:817
+msgid "process binary files as text"
+msgstr ""
+
+#: builtin/grep.c:819
+msgid "don't match patterns in binary files"
+msgstr ""
+
+#: builtin/grep.c:822
+msgid "process binary files with textconv filters"
+msgstr ""
+
+#: builtin/grep.c:824
+msgid "search in subdirectories (default)"
+msgstr ""
+
+#: builtin/grep.c:826
+msgid "descend at most <depth> levels"
+msgstr ""
+
+#: builtin/grep.c:830
+msgid "use extended POSIX regular expressions"
+msgstr ""
+
+#: builtin/grep.c:833
+msgid "use basic POSIX regular expressions (default)"
+msgstr ""
+
+#: builtin/grep.c:836
+msgid "interpret patterns as fixed strings"
+msgstr ""
+
+#: builtin/grep.c:839
+msgid "use Perl-compatible regular expressions"
+msgstr ""
+
+#: builtin/grep.c:842
+msgid "show line numbers"
+msgstr ""
+
+#: builtin/grep.c:843
+msgid "show column number of first match"
+msgstr ""
+
+#: builtin/grep.c:844
+msgid "don't show filenames"
+msgstr ""
+
+#: builtin/grep.c:845
+msgid "show filenames"
+msgstr ""
+
+#: builtin/grep.c:847
+msgid "show filenames relative to top directory"
+msgstr ""
+
+#: builtin/grep.c:849
+msgid "show only filenames instead of matching lines"
+msgstr ""
+
+#: builtin/grep.c:851
+msgid "synonym for --files-with-matches"
+msgstr ""
+
+#: builtin/grep.c:854
+msgid "show only the names of files without match"
+msgstr ""
+
+#: builtin/grep.c:856
+msgid "print NUL after filenames"
+msgstr ""
+
+#: builtin/grep.c:859
+msgid "show only matching parts of a line"
+msgstr ""
+
+#: builtin/grep.c:861
+msgid "show the number of matches instead of matching lines"
+msgstr ""
+
+#: builtin/grep.c:862
+msgid "highlight matches"
+msgstr ""
+
+#: builtin/grep.c:864
+msgid "print empty line between matches from different files"
+msgstr ""
+
+#: builtin/grep.c:866
+msgid "show filename only once above matches from same file"
+msgstr ""
+
+#: builtin/grep.c:869
+msgid "show <n> context lines before and after matches"
+msgstr ""
+
+#: builtin/grep.c:872
+msgid "show <n> context lines before matches"
+msgstr ""
+
+#: builtin/grep.c:874
+msgid "show <n> context lines after matches"
+msgstr ""
+
+#: builtin/grep.c:876
+msgid "use <n> worker threads"
+msgstr ""
+
+#: builtin/grep.c:877
+msgid "shortcut for -C NUM"
+msgstr ""
+
+#: builtin/grep.c:880
+msgid "show a line with the function name before matches"
+msgstr ""
+
+#: builtin/grep.c:882
+msgid "show the surrounding function"
+msgstr ""
+
+#: builtin/grep.c:885
+msgid "read patterns from file"
+msgstr ""
+
+#: builtin/grep.c:887
+msgid "match <pattern>"
+msgstr ""
+
+#: builtin/grep.c:889
+msgid "combine patterns specified with -e"
+msgstr ""
+
+#: builtin/grep.c:901
+msgid "indicate hit with exit status without output"
+msgstr ""
+
+#: builtin/grep.c:903
+msgid "show only matches from files that match all patterns"
+msgstr ""
+
+#: builtin/grep.c:905
+msgid "show parse tree for grep expression"
+msgstr ""
+
+#: builtin/grep.c:909
+msgid "pager"
+msgstr ""
+
+#: builtin/grep.c:909
+msgid "show matching files in the pager"
+msgstr ""
+
+#: builtin/grep.c:913
+msgid "allow calling of grep(1) (ignored by this build)"
+msgstr ""
+
+#: builtin/grep.c:977
+msgid "no pattern given"
+msgstr ""
+
+#: builtin/grep.c:1013
+msgid "--no-index or --untracked cannot be used with revs"
+msgstr ""
+
+#: builtin/grep.c:1020
+#, c-format
+msgid "unable to resolve revision: %s"
+msgstr ""
+
+#: builtin/grep.c:1051
+msgid "invalid option combination, ignoring --threads"
+msgstr ""
+
+#: builtin/grep.c:1054 builtin/pack-objects.c:3397
+msgid "no threads support, ignoring --threads"
+msgstr ""
+
+#: builtin/grep.c:1057 builtin/index-pack.c:1503 builtin/pack-objects.c:2716
+#, c-format
+msgid "invalid number of threads specified (%d)"
+msgstr ""
+
+#: builtin/grep.c:1080
+msgid "--open-files-in-pager only works on the worktree"
+msgstr ""
+
+#: builtin/grep.c:1103
+msgid "option not supported with --recurse-submodules"
+msgstr ""
+
+#: builtin/grep.c:1109
+msgid "--cached or --untracked cannot be used with --no-index"
+msgstr ""
+
+#: builtin/grep.c:1115
+msgid "--[no-]exclude-standard cannot be used for tracked contents"
+msgstr ""
+
+#: builtin/grep.c:1123
+msgid "both --cached and trees are given"
+msgstr ""
+
+#: builtin/hash-object.c:84
+msgid ""
+"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
+"[--] <file>..."
+msgstr ""
+
+#: builtin/hash-object.c:85
+msgid "git hash-object  --stdin-paths"
+msgstr ""
+
+#: builtin/hash-object.c:97
+msgid "type"
+msgstr ""
+
+#: builtin/hash-object.c:97
+msgid "object type"
+msgstr ""
+
+#: builtin/hash-object.c:98
+msgid "write the object into the object database"
+msgstr ""
+
+#: builtin/hash-object.c:100
+msgid "read the object from stdin"
+msgstr ""
+
+#: builtin/hash-object.c:102
+msgid "store file as is without filters"
+msgstr ""
+
+#: builtin/hash-object.c:103
+msgid ""
+"just hash any random garbage to create corrupt objects for debugging Git"
+msgstr ""
+
+#: builtin/hash-object.c:104
+msgid "process file as it were from this path"
+msgstr ""
+
+#: builtin/help.c:46
+msgid "print all available commands"
+msgstr ""
+
+#: builtin/help.c:47
+msgid "exclude guides"
+msgstr ""
+
+#: builtin/help.c:48
+msgid "print list of useful guides"
+msgstr ""
+
+#: builtin/help.c:49
+msgid "print all configuration variable names"
+msgstr ""
+
+#: builtin/help.c:51
+msgid "show man page"
+msgstr ""
+
+#: builtin/help.c:52
+msgid "show manual in web browser"
+msgstr ""
+
+#: builtin/help.c:54
+msgid "show info page"
+msgstr ""
+
+#: builtin/help.c:56
+msgid "print command description"
+msgstr ""
+
+#: builtin/help.c:61
+msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
+msgstr ""
+
+#: builtin/help.c:73
+#, c-format
+msgid "unrecognized help format '%s'"
+msgstr ""
+
+#: builtin/help.c:100
+msgid "Failed to start emacsclient."
+msgstr ""
+
+#: builtin/help.c:113
+msgid "Failed to parse emacsclient version."
+msgstr ""
+
+#: builtin/help.c:121
+#, c-format
+msgid "emacsclient version '%d' too old (< 22)."
+msgstr ""
+
+#: builtin/help.c:139 builtin/help.c:161 builtin/help.c:171 builtin/help.c:179
+#, c-format
+msgid "failed to exec '%s'"
+msgstr ""
+
+#: builtin/help.c:217
+#, c-format
+msgid ""
+"'%s': path for unsupported man viewer.\n"
+"Please consider using 'man.<tool>.cmd' instead."
+msgstr ""
+
+#: builtin/help.c:229
+#, c-format
+msgid ""
+"'%s': cmd for supported man viewer.\n"
+"Please consider using 'man.<tool>.path' instead."
+msgstr ""
+
+#: builtin/help.c:346
+#, c-format
+msgid "'%s': unknown man viewer."
+msgstr ""
+
+#: builtin/help.c:363
+msgid "no man viewer handled the request"
+msgstr ""
+
+#: builtin/help.c:371
+msgid "no info viewer handled the request"
+msgstr ""
+
+#: builtin/help.c:430 builtin/help.c:441 git.c:322
+#, c-format
+msgid "'%s' is aliased to '%s'"
+msgstr ""
+
+#: builtin/help.c:444
+#, c-format
+msgid "bad alias.%s string: %s"
+msgstr ""
+
+#: builtin/help.c:473 builtin/help.c:503
+#, c-format
+msgid "usage: %s%s"
+msgstr ""
+
+#: builtin/help.c:487
+msgid "'git help config' for more information"
+msgstr ""
+
+#: builtin/index-pack.c:184
+#, c-format
+msgid "object type mismatch at %s"
+msgstr ""
+
+#: builtin/index-pack.c:204
+#, c-format
+msgid "did not receive expected object %s"
+msgstr ""
+
+#: builtin/index-pack.c:207
+#, c-format
+msgid "object %s: expected type %s, found %s"
+msgstr ""
+
+#: builtin/index-pack.c:249
+#, c-format
+msgid "cannot fill %d byte"
+msgid_plural "cannot fill %d bytes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/index-pack.c:259
+msgid "early EOF"
+msgstr ""
+
+#: builtin/index-pack.c:260
+msgid "read error on input"
+msgstr ""
+
+#: builtin/index-pack.c:272
+msgid "used more bytes than were available"
+msgstr ""
+
+#: builtin/index-pack.c:279 builtin/pack-objects.c:598
+msgid "pack too large for current definition of off_t"
+msgstr ""
+
+#: builtin/index-pack.c:282 builtin/unpack-objects.c:94
+msgid "pack exceeds maximum allowed size"
+msgstr ""
+
+#: builtin/index-pack.c:297
+#, c-format
+msgid "unable to create '%s'"
+msgstr ""
+
+#: builtin/index-pack.c:303
+#, c-format
+msgid "cannot open packfile '%s'"
+msgstr ""
+
+#: builtin/index-pack.c:317
+msgid "pack signature mismatch"
+msgstr ""
+
+#: builtin/index-pack.c:319
+#, c-format
+msgid "pack version %<PRIu32> unsupported"
+msgstr ""
+
+#: builtin/index-pack.c:337
+#, c-format
+msgid "pack has bad object at offset %<PRIuMAX>: %s"
+msgstr ""
+
+#: builtin/index-pack.c:457
+#, c-format
+msgid "inflate returned %d"
+msgstr ""
+
+#: builtin/index-pack.c:506
+msgid "offset value overflow for delta base object"
+msgstr ""
+
+#: builtin/index-pack.c:514
+msgid "delta base offset is out of bound"
+msgstr ""
+
+#: builtin/index-pack.c:522
+#, c-format
+msgid "unknown object type %d"
+msgstr ""
+
+#: builtin/index-pack.c:553
+msgid "cannot pread pack file"
+msgstr ""
+
+#: builtin/index-pack.c:555
+#, c-format
+msgid "premature end of pack file, %<PRIuMAX> byte missing"
+msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/index-pack.c:581
+msgid "serious inflate inconsistency"
+msgstr ""
+
+#: builtin/index-pack.c:726 builtin/index-pack.c:732 builtin/index-pack.c:755
+#: builtin/index-pack.c:794 builtin/index-pack.c:803
+#, c-format
+msgid "SHA1 COLLISION FOUND WITH %s !"
+msgstr ""
+
+#: builtin/index-pack.c:729 builtin/pack-objects.c:151
+#: builtin/pack-objects.c:211 builtin/pack-objects.c:305
+#, c-format
+msgid "unable to read %s"
+msgstr ""
+
+#: builtin/index-pack.c:792
+#, c-format
+msgid "cannot read existing object info %s"
+msgstr ""
+
+#: builtin/index-pack.c:800
+#, c-format
+msgid "cannot read existing object %s"
+msgstr ""
+
+#: builtin/index-pack.c:814
+#, c-format
+msgid "invalid blob object %s"
+msgstr ""
+
+#: builtin/index-pack.c:817 builtin/index-pack.c:836
+msgid "fsck error in packed object"
+msgstr ""
+
+#: builtin/index-pack.c:833
+#, c-format
+msgid "invalid %s"
+msgstr ""
+
+#: builtin/index-pack.c:838
+#, c-format
+msgid "Not all child objects of %s are reachable"
+msgstr ""
+
+#: builtin/index-pack.c:910 builtin/index-pack.c:941
+msgid "failed to apply delta"
+msgstr ""
+
+#: builtin/index-pack.c:1109
+msgid "Receiving objects"
+msgstr ""
+
+#: builtin/index-pack.c:1109
+msgid "Indexing objects"
+msgstr ""
+
+#: builtin/index-pack.c:1143
+msgid "pack is corrupted (SHA1 mismatch)"
+msgstr ""
+
+#: builtin/index-pack.c:1148
+msgid "cannot fstat packfile"
+msgstr ""
+
+#: builtin/index-pack.c:1151
+msgid "pack has junk at the end"
+msgstr ""
+
+#: builtin/index-pack.c:1163
+msgid "confusion beyond insanity in parse_pack_objects()"
+msgstr ""
+
+#: builtin/index-pack.c:1186
+msgid "Resolving deltas"
+msgstr ""
+
+#: builtin/index-pack.c:1196 builtin/pack-objects.c:2492
+#, c-format
+msgid "unable to create thread: %s"
+msgstr ""
+
+#: builtin/index-pack.c:1237
+msgid "confusion beyond insanity"
+msgstr ""
+
+#: builtin/index-pack.c:1243
+#, c-format
+msgid "completed with %d local object"
+msgid_plural "completed with %d local objects"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/index-pack.c:1255
+#, c-format
+msgid "Unexpected tail checksum for %s (disk corruption?)"
+msgstr ""
+
+#: builtin/index-pack.c:1259
+#, c-format
+msgid "pack has %d unresolved delta"
+msgid_plural "pack has %d unresolved deltas"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/index-pack.c:1283
+#, c-format
+msgid "unable to deflate appended object (%d)"
+msgstr ""
+
+#: builtin/index-pack.c:1360
+#, c-format
+msgid "local object %s is corrupt"
+msgstr ""
+
+#: builtin/index-pack.c:1374
+#, c-format
+msgid "packfile name '%s' does not end with '.pack'"
+msgstr ""
+
+#: builtin/index-pack.c:1399
+#, c-format
+msgid "cannot write %s file '%s'"
+msgstr ""
+
+#: builtin/index-pack.c:1407
+#, c-format
+msgid "cannot close written %s file '%s'"
+msgstr ""
+
+#: builtin/index-pack.c:1431
+msgid "error while closing pack file"
+msgstr ""
+
+#: builtin/index-pack.c:1445
+msgid "cannot store pack file"
+msgstr ""
+
+#: builtin/index-pack.c:1453
+msgid "cannot store index file"
+msgstr ""
+
+#: builtin/index-pack.c:1497 builtin/pack-objects.c:2727
+#, c-format
+msgid "bad pack.indexversion=%<PRIu32>"
+msgstr ""
+
+#: builtin/index-pack.c:1565
+#, c-format
+msgid "Cannot open existing pack file '%s'"
+msgstr ""
+
+#: builtin/index-pack.c:1567
+#, c-format
+msgid "Cannot open existing pack idx file for '%s'"
+msgstr ""
+
+#: builtin/index-pack.c:1615
+#, c-format
+msgid "non delta: %d object"
+msgid_plural "non delta: %d objects"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/index-pack.c:1622
+#, c-format
+msgid "chain length = %d: %lu object"
+msgid_plural "chain length = %d: %lu objects"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/index-pack.c:1659
+msgid "Cannot come back to cwd"
+msgstr ""
+
+#: builtin/index-pack.c:1708 builtin/index-pack.c:1711
+#: builtin/index-pack.c:1727 builtin/index-pack.c:1731
+#, c-format
+msgid "bad %s"
+msgstr ""
+
+#: builtin/index-pack.c:1747
+msgid "--fix-thin cannot be used without --stdin"
+msgstr ""
+
+#: builtin/index-pack.c:1749
+msgid "--stdin requires a git repository"
+msgstr ""
+
+#: builtin/index-pack.c:1755
+msgid "--verify with no packfile name given"
+msgstr ""
+
+#: builtin/index-pack.c:1803 builtin/unpack-objects.c:580
+msgid "fsck error in pack objects"
+msgstr ""
+
+#: builtin/init-db.c:61
+#, c-format
+msgid "cannot stat template '%s'"
+msgstr ""
+
+#: builtin/init-db.c:66
+#, c-format
+msgid "cannot opendir '%s'"
+msgstr ""
+
+#: builtin/init-db.c:78
+#, c-format
+msgid "cannot readlink '%s'"
+msgstr ""
+
+#: builtin/init-db.c:80
+#, c-format
+msgid "cannot symlink '%s' '%s'"
+msgstr ""
+
+#: builtin/init-db.c:86
+#, c-format
+msgid "cannot copy '%s' to '%s'"
+msgstr ""
+
+#: builtin/init-db.c:90
+#, c-format
+msgid "ignoring template %s"
+msgstr ""
+
+#: builtin/init-db.c:121
+#, c-format
+msgid "templates not found in %s"
+msgstr ""
+
+#: builtin/init-db.c:136
+#, c-format
+msgid "not copying templates from '%s': %s"
+msgstr ""
+
+#: builtin/init-db.c:329
+#, c-format
+msgid "unable to handle file type %d"
+msgstr ""
+
+#: builtin/init-db.c:332
+#, c-format
+msgid "unable to move %s to %s"
+msgstr ""
+
+#: builtin/init-db.c:349 builtin/init-db.c:352
+#, c-format
+msgid "%s already exists"
+msgstr ""
+
+#: builtin/init-db.c:405
+#, c-format
+msgid "Reinitialized existing shared Git repository in %s%s\n"
+msgstr ""
+
+#: builtin/init-db.c:406
+#, c-format
+msgid "Reinitialized existing Git repository in %s%s\n"
+msgstr ""
+
+#: builtin/init-db.c:410
+#, c-format
+msgid "Initialized empty shared Git repository in %s%s\n"
+msgstr ""
+
+#: builtin/init-db.c:411
+#, c-format
+msgid "Initialized empty Git repository in %s%s\n"
+msgstr ""
+
+#: builtin/init-db.c:460
+msgid ""
+"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
+"shared[=<permissions>]] [<directory>]"
+msgstr ""
+
+#: builtin/init-db.c:483
+msgid "permissions"
+msgstr ""
+
+#: builtin/init-db.c:484
+msgid "specify that the git repository is to be shared amongst several users"
+msgstr ""
+
+#: builtin/init-db.c:518 builtin/init-db.c:523
+#, c-format
+msgid "cannot mkdir %s"
+msgstr ""
+
+#: builtin/init-db.c:527
+#, c-format
+msgid "cannot chdir to %s"
+msgstr ""
+
+#: builtin/init-db.c:548
+#, c-format
+msgid ""
+"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
+"dir=<directory>)"
+msgstr ""
+
+#: builtin/init-db.c:576
+#, c-format
+msgid "Cannot access work tree '%s'"
+msgstr ""
+
+#: builtin/interpret-trailers.c:15
+msgid ""
+"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
+"<token>[(=|:)<value>])...] [<file>...]"
+msgstr ""
+
+#: builtin/interpret-trailers.c:94
+msgid "edit files in place"
+msgstr ""
+
+#: builtin/interpret-trailers.c:95
+msgid "trim empty trailers"
+msgstr ""
+
+#: builtin/interpret-trailers.c:98
+msgid "where to place the new trailer"
+msgstr ""
+
+#: builtin/interpret-trailers.c:100
+msgid "action if trailer already exists"
+msgstr ""
+
+#: builtin/interpret-trailers.c:102
+msgid "action if trailer is missing"
+msgstr ""
+
+#: builtin/interpret-trailers.c:104
+msgid "output only the trailers"
+msgstr ""
+
+#: builtin/interpret-trailers.c:105
+msgid "do not apply config rules"
+msgstr ""
+
+#: builtin/interpret-trailers.c:106
+msgid "join whitespace-continued values"
+msgstr ""
+
+#: builtin/interpret-trailers.c:107
+msgid "set parsing options"
+msgstr ""
+
+#: builtin/interpret-trailers.c:109
+msgid "do not treat --- specially"
+msgstr ""
+
+#: builtin/interpret-trailers.c:110
+msgid "trailer"
+msgstr ""
+
+#: builtin/interpret-trailers.c:111
+msgid "trailer(s) to add"
+msgstr ""
+
+#: builtin/interpret-trailers.c:120
+msgid "--trailer with --only-input does not make sense"
+msgstr ""
+
+#: builtin/interpret-trailers.c:130
+msgid "no input file given for in-place editing"
+msgstr ""
+
+#: builtin/log.c:54
+msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
+msgstr ""
+
+#: builtin/log.c:55
+msgid "git show [<options>] <object>..."
+msgstr ""
+
+#: builtin/log.c:99
+#, c-format
+msgid "invalid --decorate option: %s"
+msgstr ""
+
+#: builtin/log.c:162
+msgid "suppress diff output"
+msgstr ""
+
+#: builtin/log.c:163
+msgid "show source"
+msgstr ""
+
+#: builtin/log.c:164
+msgid "Use mail map file"
+msgstr ""
+
+#: builtin/log.c:166
+msgid "only decorate refs that match <pattern>"
+msgstr ""
+
+#: builtin/log.c:168
+msgid "do not decorate refs that match <pattern>"
+msgstr ""
+
+#: builtin/log.c:169
+msgid "decorate options"
+msgstr ""
+
+#: builtin/log.c:172
+msgid "Process line range n,m in file, counting from 1"
+msgstr ""
+
+#: builtin/log.c:270
+#, c-format
+msgid "Final output: %d %s\n"
+msgstr ""
+
+#: builtin/log.c:522
+#, c-format
+msgid "git show %s: bad file"
+msgstr ""
+
+#: builtin/log.c:537 builtin/log.c:631
+#, c-format
+msgid "Could not read object %s"
+msgstr ""
+
+#: builtin/log.c:655
+#, c-format
+msgid "Unknown type: %d"
+msgstr ""
+
+#: builtin/log.c:776
+msgid "format.headers without value"
+msgstr ""
+
+#: builtin/log.c:877
+msgid "name of output directory is too long"
+msgstr ""
+
+#: builtin/log.c:893
+#, c-format
+msgid "Cannot open patch file %s"
+msgstr ""
+
+#: builtin/log.c:910
+msgid "Need exactly one range."
+msgstr ""
+
+#: builtin/log.c:920
+msgid "Not a range."
+msgstr ""
+
+#: builtin/log.c:1043
+msgid "Cover letter needs email format"
+msgstr ""
+
+#: builtin/log.c:1119
+#, c-format
+msgid "insane in-reply-to: %s"
+msgstr ""
+
+#: builtin/log.c:1146
+msgid "git format-patch [<options>] [<since> | <revision-range>]"
+msgstr ""
+
+#: builtin/log.c:1204
+msgid "Two output directories?"
+msgstr ""
+
+#: builtin/log.c:1311 builtin/log.c:2054 builtin/log.c:2056 builtin/log.c:2068
+#, c-format
+msgid "Unknown commit %s"
+msgstr ""
+
+#: builtin/log.c:1321 builtin/notes.c:894 builtin/tag.c:526
+#, c-format
+msgid "Failed to resolve '%s' as a valid ref."
+msgstr ""
+
+#: builtin/log.c:1326
+msgid "Could not find exact merge base."
+msgstr ""
+
+#: builtin/log.c:1330
+msgid ""
+"Failed to get upstream, if you want to record base commit automatically,\n"
+"please use git branch --set-upstream-to to track a remote branch.\n"
+"Or you could specify base commit by --base=<base-commit-id> manually."
+msgstr ""
+
+#: builtin/log.c:1350
+msgid "Failed to find exact merge base"
+msgstr ""
+
+#: builtin/log.c:1361
+msgid "base commit should be the ancestor of revision list"
+msgstr ""
+
+#: builtin/log.c:1365
+msgid "base commit shouldn't be in revision list"
+msgstr ""
+
+#: builtin/log.c:1418
+msgid "cannot get patch id"
+msgstr ""
+
+#: builtin/log.c:1470
+msgid "failed to infer range-diff ranges"
+msgstr ""
+
+#: builtin/log.c:1515
+msgid "use [PATCH n/m] even with a single patch"
+msgstr ""
+
+#: builtin/log.c:1518
+msgid "use [PATCH] even with multiple patches"
+msgstr ""
+
+#: builtin/log.c:1522
+msgid "print patches to standard out"
+msgstr ""
+
+#: builtin/log.c:1524
+msgid "generate a cover letter"
+msgstr ""
+
+#: builtin/log.c:1526
+msgid "use simple number sequence for output file names"
+msgstr ""
+
+#: builtin/log.c:1527
+msgid "sfx"
+msgstr ""
+
+#: builtin/log.c:1528
+msgid "use <sfx> instead of '.patch'"
+msgstr ""
+
+#: builtin/log.c:1530
+msgid "start numbering patches at <n> instead of 1"
+msgstr ""
+
+#: builtin/log.c:1532
+msgid "mark the series as Nth re-roll"
+msgstr ""
+
+#: builtin/log.c:1534
+msgid "Use [RFC PATCH] instead of [PATCH]"
+msgstr ""
+
+#: builtin/log.c:1537
+msgid "Use [<prefix>] instead of [PATCH]"
+msgstr ""
+
+#: builtin/log.c:1540
+msgid "store resulting files in <dir>"
+msgstr ""
+
+#: builtin/log.c:1543
+msgid "don't strip/add [PATCH]"
+msgstr ""
+
+#: builtin/log.c:1546
+msgid "don't output binary diffs"
+msgstr ""
+
+#: builtin/log.c:1548
+msgid "output all-zero hash in From header"
+msgstr ""
+
+#: builtin/log.c:1550
+msgid "don't include a patch matching a commit upstream"
+msgstr ""
+
+#: builtin/log.c:1552
+msgid "show patch format instead of default (patch + stat)"
+msgstr ""
+
+#: builtin/log.c:1554
+msgid "Messaging"
+msgstr ""
+
+#: builtin/log.c:1555
+msgid "header"
+msgstr ""
+
+#: builtin/log.c:1556
+msgid "add email header"
+msgstr ""
+
+#: builtin/log.c:1557 builtin/log.c:1559
+msgid "email"
+msgstr ""
+
+#: builtin/log.c:1557
+msgid "add To: header"
+msgstr ""
+
+#: builtin/log.c:1559
+msgid "add Cc: header"
+msgstr ""
+
+#: builtin/log.c:1561
+msgid "ident"
+msgstr ""
+
+#: builtin/log.c:1562
+msgid "set From address to <ident> (or committer ident if absent)"
+msgstr ""
+
+#: builtin/log.c:1564
+msgid "message-id"
+msgstr ""
+
+#: builtin/log.c:1565
+msgid "make first mail a reply to <message-id>"
+msgstr ""
+
+#: builtin/log.c:1566 builtin/log.c:1569
+msgid "boundary"
+msgstr ""
+
+#: builtin/log.c:1567
+msgid "attach the patch"
+msgstr ""
+
+#: builtin/log.c:1570
+msgid "inline the patch"
+msgstr ""
+
+#: builtin/log.c:1574
+msgid "enable message threading, styles: shallow, deep"
+msgstr ""
+
+#: builtin/log.c:1576
+msgid "signature"
+msgstr ""
+
+#: builtin/log.c:1577
+msgid "add a signature"
+msgstr ""
+
+#: builtin/log.c:1578
+msgid "base-commit"
+msgstr ""
+
+#: builtin/log.c:1579
+msgid "add prerequisite tree info to the patch series"
+msgstr ""
+
+#: builtin/log.c:1581
+msgid "add a signature from a file"
+msgstr ""
+
+#: builtin/log.c:1582
+msgid "don't print the patch filenames"
+msgstr ""
+
+#: builtin/log.c:1584
+msgid "show progress while generating patches"
+msgstr ""
+
+#: builtin/log.c:1585
+msgid "rev"
+msgstr ""
+
+#: builtin/log.c:1586
+msgid "show changes against <rev> in cover letter or single patch"
+msgstr ""
+
+#: builtin/log.c:1589
+msgid "show changes against <refspec> in cover letter or single patch"
+msgstr ""
+
+#: builtin/log.c:1591
+msgid "percentage by which creation is weighted"
+msgstr ""
+
+#: builtin/log.c:1666
+#, c-format
+msgid "invalid ident line: %s"
+msgstr ""
+
+#: builtin/log.c:1681
+msgid "-n and -k are mutually exclusive"
+msgstr ""
+
+#: builtin/log.c:1683
+msgid "--subject-prefix/--rfc and -k are mutually exclusive"
+msgstr ""
+
+#: builtin/log.c:1691
+msgid "--name-only does not make sense"
+msgstr ""
+
+#: builtin/log.c:1693
+msgid "--name-status does not make sense"
+msgstr ""
+
+#: builtin/log.c:1695
+msgid "--check does not make sense"
+msgstr ""
+
+#: builtin/log.c:1727
+msgid "standard output, or directory, which one?"
+msgstr ""
+
+#: builtin/log.c:1729
+#, c-format
+msgid "Could not create directory '%s'"
+msgstr ""
+
+#: builtin/log.c:1816
+msgid "--interdiff requires --cover-letter or single patch"
+msgstr ""
+
+#: builtin/log.c:1820
+msgid "Interdiff:"
+msgstr ""
+
+#: builtin/log.c:1821
+#, c-format
+msgid "Interdiff against v%d:"
+msgstr ""
+
+#: builtin/log.c:1827
+msgid "--creation-factor requires --range-diff"
+msgstr ""
+
+#: builtin/log.c:1831
+msgid "--range-diff requires --cover-letter or single patch"
+msgstr ""
+
+#: builtin/log.c:1839
+msgid "Range-diff:"
+msgstr ""
+
+#: builtin/log.c:1840
+#, c-format
+msgid "Range-diff against v%d:"
+msgstr ""
+
+#: builtin/log.c:1851
+#, c-format
+msgid "unable to read signature file '%s'"
+msgstr ""
+
+#: builtin/log.c:1887
+msgid "Generating patches"
+msgstr ""
+
+#: builtin/log.c:1931
+msgid "Failed to create output files"
+msgstr ""
+
+#: builtin/log.c:1989
+msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
+msgstr ""
+
+#: builtin/log.c:2043
+#, c-format
+msgid ""
+"Could not find a tracked remote branch, please specify <upstream> manually.\n"
+msgstr ""
+
+#: builtin/ls-files.c:469
+msgid "git ls-files [<options>] [<file>...]"
+msgstr ""
+
+#: builtin/ls-files.c:525
+msgid "identify the file status with tags"
+msgstr ""
+
+#: builtin/ls-files.c:527
+msgid "use lowercase letters for 'assume unchanged' files"
+msgstr ""
+
+#: builtin/ls-files.c:529
+msgid "use lowercase letters for 'fsmonitor clean' files"
+msgstr ""
+
+#: builtin/ls-files.c:531
+msgid "show cached files in the output (default)"
+msgstr ""
+
+#: builtin/ls-files.c:533
+msgid "show deleted files in the output"
+msgstr ""
+
+#: builtin/ls-files.c:535
+msgid "show modified files in the output"
+msgstr ""
+
+#: builtin/ls-files.c:537
+msgid "show other files in the output"
+msgstr ""
+
+#: builtin/ls-files.c:539
+msgid "show ignored files in the output"
+msgstr ""
+
+#: builtin/ls-files.c:542
+msgid "show staged contents' object name in the output"
+msgstr ""
+
+#: builtin/ls-files.c:544
+msgid "show files on the filesystem that need to be removed"
+msgstr ""
+
+#: builtin/ls-files.c:546
+msgid "show 'other' directories' names only"
+msgstr ""
+
+#: builtin/ls-files.c:548
+msgid "show line endings of files"
+msgstr ""
+
+#: builtin/ls-files.c:550
+msgid "don't show empty directories"
+msgstr ""
+
+#: builtin/ls-files.c:553
+msgid "show unmerged files in the output"
+msgstr ""
+
+#: builtin/ls-files.c:555
+msgid "show resolve-undo information"
+msgstr ""
+
+#: builtin/ls-files.c:557
+msgid "skip files matching pattern"
+msgstr ""
+
+#: builtin/ls-files.c:560
+msgid "exclude patterns are read from <file>"
+msgstr ""
+
+#: builtin/ls-files.c:563
+msgid "read additional per-directory exclude patterns in <file>"
+msgstr ""
+
+#: builtin/ls-files.c:565
+msgid "add the standard git exclusions"
+msgstr ""
+
+#: builtin/ls-files.c:569
+msgid "make the output relative to the project top directory"
+msgstr ""
+
+#: builtin/ls-files.c:572
+msgid "recurse through submodules"
+msgstr ""
+
+#: builtin/ls-files.c:574
+msgid "if any <file> is not in the index, treat this as an error"
+msgstr ""
+
+#: builtin/ls-files.c:575
+msgid "tree-ish"
+msgstr ""
+
+#: builtin/ls-files.c:576
+msgid "pretend that paths removed since <tree-ish> are still present"
+msgstr ""
+
+#: builtin/ls-files.c:578
+msgid "show debugging data"
+msgstr ""
+
+#: builtin/ls-remote.c:9
+msgid ""
+"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
+"                     [-q | --quiet] [--exit-code] [--get-url]\n"
+"                     [--symref] [<repository> [<refs>...]]"
+msgstr ""
+
+#: builtin/ls-remote.c:59
+msgid "do not print remote URL"
+msgstr ""
+
+#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:903
+msgid "exec"
+msgstr ""
+
+#: builtin/ls-remote.c:61 builtin/ls-remote.c:63
+msgid "path of git-upload-pack on the remote host"
+msgstr ""
+
+#: builtin/ls-remote.c:65
+msgid "limit to tags"
+msgstr ""
+
+#: builtin/ls-remote.c:66
+msgid "limit to heads"
+msgstr ""
+
+#: builtin/ls-remote.c:67
+msgid "do not show peeled tags"
+msgstr ""
+
+#: builtin/ls-remote.c:69
+msgid "take url.<base>.insteadOf into account"
+msgstr ""
+
+#: builtin/ls-remote.c:73
+msgid "exit with exit code 2 if no matching refs are found"
+msgstr ""
+
+#: builtin/ls-remote.c:76
+msgid "show underlying ref in addition to the object pointed by it"
+msgstr ""
+
+#: builtin/ls-tree.c:30
+msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
+msgstr ""
+
+#: builtin/ls-tree.c:128
+msgid "only show trees"
+msgstr ""
+
+#: builtin/ls-tree.c:130
+msgid "recurse into subtrees"
+msgstr ""
+
+#: builtin/ls-tree.c:132
+msgid "show trees when recursing"
+msgstr ""
+
+#: builtin/ls-tree.c:135
+msgid "terminate entries with NUL byte"
+msgstr ""
+
+#: builtin/ls-tree.c:136
+msgid "include object size"
+msgstr ""
+
+#: builtin/ls-tree.c:138 builtin/ls-tree.c:140
+msgid "list only filenames"
+msgstr ""
+
+#: builtin/ls-tree.c:143
+msgid "use full path names"
+msgstr ""
+
+#: builtin/ls-tree.c:145
+msgid "list entire tree; not just current directory (implies --full-name)"
+msgstr ""
+
+#: builtin/mailsplit.c:241
+#, c-format
+msgid "empty mbox: '%s'"
+msgstr ""
+
+#: builtin/merge.c:52
+msgid "git merge [<options>] [<commit>...]"
+msgstr ""
+
+#: builtin/merge.c:53
+msgid "git merge --abort"
+msgstr ""
+
+#: builtin/merge.c:54
+msgid "git merge --continue"
+msgstr ""
+
+#: builtin/merge.c:111
+msgid "switch `m' requires a value"
+msgstr ""
+
+#: builtin/merge.c:177
+#, c-format
+msgid "Could not find merge strategy '%s'.\n"
+msgstr ""
+
+#: builtin/merge.c:178
+#, c-format
+msgid "Available strategies are:"
+msgstr ""
+
+#: builtin/merge.c:183
+#, c-format
+msgid "Available custom strategies are:"
+msgstr ""
+
+#: builtin/merge.c:234 builtin/pull.c:143
+msgid "do not show a diffstat at the end of the merge"
+msgstr ""
+
+#: builtin/merge.c:237 builtin/pull.c:146
+msgid "show a diffstat at the end of the merge"
+msgstr ""
+
+#: builtin/merge.c:238 builtin/pull.c:149
+msgid "(synonym to --stat)"
+msgstr ""
+
+#: builtin/merge.c:240 builtin/pull.c:152
+msgid "add (at most <n>) entries from shortlog to merge commit message"
+msgstr ""
+
+#: builtin/merge.c:243 builtin/pull.c:158
+msgid "create a single commit instead of doing a merge"
+msgstr ""
+
+#: builtin/merge.c:245 builtin/pull.c:161
+msgid "perform a commit if the merge succeeds (default)"
+msgstr ""
+
+#: builtin/merge.c:247 builtin/pull.c:164
+msgid "edit message before committing"
+msgstr ""
+
+#: builtin/merge.c:248
+msgid "allow fast-forward (default)"
+msgstr ""
+
+#: builtin/merge.c:250 builtin/pull.c:170
+msgid "abort if fast-forward is not possible"
+msgstr ""
+
+#: builtin/merge.c:254 builtin/pull.c:173
+msgid "verify that the named commit has a valid GPG signature"
+msgstr ""
+
+#: builtin/merge.c:255 builtin/notes.c:784 builtin/pull.c:177
+#: builtin/rebase.c:916 builtin/rebase--interactive.c:186 builtin/revert.c:110
+msgid "strategy"
+msgstr ""
+
+#: builtin/merge.c:256 builtin/pull.c:178
+msgid "merge strategy to use"
+msgstr ""
+
+#: builtin/merge.c:257 builtin/pull.c:181
+msgid "option=value"
+msgstr ""
+
+#: builtin/merge.c:258 builtin/pull.c:182
+msgid "option for selected merge strategy"
+msgstr ""
+
+#: builtin/merge.c:260
+msgid "merge commit message (for a non-fast-forward merge)"
+msgstr ""
+
+#: builtin/merge.c:267
+msgid "abort the current in-progress merge"
+msgstr ""
+
+#: builtin/merge.c:269
+msgid "continue the current in-progress merge"
+msgstr ""
+
+#: builtin/merge.c:271 builtin/pull.c:189
+msgid "allow merging unrelated histories"
+msgstr ""
+
+#: builtin/merge.c:277
+msgid "verify commit-msg hook"
+msgstr ""
+
+#: builtin/merge.c:302
+msgid "could not run stash."
+msgstr ""
+
+#: builtin/merge.c:307
+msgid "stash failed"
+msgstr ""
+
+#: builtin/merge.c:312
+#, c-format
+msgid "not a valid object: %s"
+msgstr ""
+
+#: builtin/merge.c:334 builtin/merge.c:351
+msgid "read-tree failed"
+msgstr ""
+
+#: builtin/merge.c:381
+msgid " (nothing to squash)"
+msgstr ""
+
+#: builtin/merge.c:392
+#, c-format
+msgid "Squash commit -- not updating HEAD\n"
+msgstr ""
+
+#: builtin/merge.c:442
+#, c-format
+msgid "No merge message -- not updating HEAD\n"
+msgstr ""
+
+#: builtin/merge.c:493
+#, c-format
+msgid "'%s' does not point to a commit"
+msgstr ""
+
+#: builtin/merge.c:580
+#, c-format
+msgid "Bad branch.%s.mergeoptions string: %s"
+msgstr ""
+
+#: builtin/merge.c:701
+msgid "Not handling anything other than two heads merge."
+msgstr ""
+
+#: builtin/merge.c:715
+#, c-format
+msgid "Unknown option for merge-recursive: -X%s"
+msgstr ""
+
+#: builtin/merge.c:730
+#, c-format
+msgid "unable to write %s"
+msgstr ""
+
+#: builtin/merge.c:782
+#, c-format
+msgid "Could not read from '%s'"
+msgstr ""
+
+#: builtin/merge.c:791
+#, c-format
+msgid "Not committing merge; use 'git commit' to complete the merge.\n"
+msgstr ""
+
+#: builtin/merge.c:797
+#, c-format
+msgid ""
+"Please enter a commit message to explain why this merge is necessary,\n"
+"especially if it merges an updated upstream into a topic branch.\n"
+"\n"
+"Lines starting with '%c' will be ignored, and an empty message aborts\n"
+"the commit.\n"
+msgstr ""
+
+#: builtin/merge.c:833
+msgid "Empty commit message."
+msgstr ""
+
+#: builtin/merge.c:852
+#, c-format
+msgid "Wonderful.\n"
+msgstr ""
+
+#: builtin/merge.c:905
+#, c-format
+msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
+msgstr ""
+
+#: builtin/merge.c:944
+msgid "No current branch."
+msgstr ""
+
+#: builtin/merge.c:946
+msgid "No remote for the current branch."
+msgstr ""
+
+#: builtin/merge.c:948
+msgid "No default upstream defined for the current branch."
+msgstr ""
+
+#: builtin/merge.c:953
+#, c-format
+msgid "No remote-tracking branch for %s from %s"
+msgstr ""
+
+#: builtin/merge.c:1010
+#, c-format
+msgid "Bad value '%s' in environment '%s'"
+msgstr ""
+
+#: builtin/merge.c:1113
+#, c-format
+msgid "not something we can merge in %s: %s"
+msgstr ""
+
+#: builtin/merge.c:1147
+msgid "not something we can merge"
+msgstr ""
+
+#: builtin/merge.c:1250
+msgid "--abort expects no arguments"
+msgstr ""
+
+#: builtin/merge.c:1254
+msgid "There is no merge to abort (MERGE_HEAD missing)."
+msgstr ""
+
+#: builtin/merge.c:1266
+msgid "--continue expects no arguments"
+msgstr ""
+
+#: builtin/merge.c:1270
+msgid "There is no merge in progress (MERGE_HEAD missing)."
+msgstr ""
+
+#: builtin/merge.c:1286
+msgid ""
+"You have not concluded your merge (MERGE_HEAD exists).\n"
+"Please, commit your changes before you merge."
+msgstr ""
+
+#: builtin/merge.c:1293
+msgid ""
+"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
+"Please, commit your changes before you merge."
+msgstr ""
+
+#: builtin/merge.c:1296
+msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
+msgstr ""
+
+#: builtin/merge.c:1305
+msgid "You cannot combine --squash with --no-ff."
+msgstr ""
+
+#: builtin/merge.c:1313
+msgid "No commit specified and merge.defaultToUpstream not set."
+msgstr ""
+
+#: builtin/merge.c:1330
+msgid "Squash commit into empty head not supported yet"
+msgstr ""
+
+#: builtin/merge.c:1332
+msgid "Non-fast-forward commit does not make sense into an empty head"
+msgstr ""
+
+#: builtin/merge.c:1337
+#, c-format
+msgid "%s - not something we can merge"
+msgstr ""
+
+#: builtin/merge.c:1339
+msgid "Can merge only exactly one commit into empty head"
+msgstr ""
+
+#: builtin/merge.c:1421
+msgid "refusing to merge unrelated histories"
+msgstr ""
+
+#: builtin/merge.c:1430
+msgid "Already up to date."
+msgstr ""
+
+#: builtin/merge.c:1440
+#, c-format
+msgid "Updating %s..%s\n"
+msgstr ""
+
+#: builtin/merge.c:1482
+#, c-format
+msgid "Trying really trivial in-index merge...\n"
+msgstr ""
+
+#: builtin/merge.c:1489
+#, c-format
+msgid "Nope.\n"
+msgstr ""
+
+#: builtin/merge.c:1514
+msgid "Already up to date. Yeeah!"
+msgstr ""
+
+#: builtin/merge.c:1520
+msgid "Not possible to fast-forward, aborting."
+msgstr ""
+
+#: builtin/merge.c:1543 builtin/merge.c:1622
+#, c-format
+msgid "Rewinding the tree to pristine...\n"
+msgstr ""
+
+#: builtin/merge.c:1547
+#, c-format
+msgid "Trying merge strategy %s...\n"
+msgstr ""
+
+#: builtin/merge.c:1613
+#, c-format
+msgid "No merge strategy handled the merge.\n"
+msgstr ""
+
+#: builtin/merge.c:1615
+#, c-format
+msgid "Merge with strategy %s failed.\n"
+msgstr ""
+
+#: builtin/merge.c:1624
+#, c-format
+msgid "Using the %s to prepare resolving by hand.\n"
+msgstr ""
+
+#: builtin/merge.c:1636
+#, c-format
+msgid "Automatic merge went well; stopped before committing as requested\n"
+msgstr ""
+
+#: builtin/merge-base.c:32
+msgid "git merge-base [-a | --all] <commit> <commit>..."
+msgstr ""
+
+#: builtin/merge-base.c:33
+msgid "git merge-base [-a | --all] --octopus <commit>..."
+msgstr ""
+
+#: builtin/merge-base.c:34
+msgid "git merge-base --independent <commit>..."
+msgstr ""
+
+#: builtin/merge-base.c:35
+msgid "git merge-base --is-ancestor <commit> <commit>"
+msgstr ""
+
+#: builtin/merge-base.c:36
+msgid "git merge-base --fork-point <ref> [<commit>]"
+msgstr ""
+
+#: builtin/merge-base.c:153
+msgid "output all common ancestors"
+msgstr ""
+
+#: builtin/merge-base.c:155
+msgid "find ancestors for a single n-way merge"
+msgstr ""
+
+#: builtin/merge-base.c:157
+msgid "list revs not reachable from others"
+msgstr ""
+
+#: builtin/merge-base.c:159
+msgid "is the first one ancestor of the other?"
+msgstr ""
+
+#: builtin/merge-base.c:161
+msgid "find where <commit> forked from reflog of <ref>"
+msgstr ""
+
+#: builtin/merge-file.c:9
+msgid ""
+"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
+"<orig-file> <file2>"
+msgstr ""
+
+#: builtin/merge-file.c:35
+msgid "send results to standard output"
+msgstr ""
+
+#: builtin/merge-file.c:36
+msgid "use a diff3 based merge"
+msgstr ""
+
+#: builtin/merge-file.c:37
+msgid "for conflicts, use our version"
+msgstr ""
+
+#: builtin/merge-file.c:39
+msgid "for conflicts, use their version"
+msgstr ""
+
+#: builtin/merge-file.c:41
+msgid "for conflicts, use a union version"
+msgstr ""
+
+#: builtin/merge-file.c:44
+msgid "for conflicts, use this marker size"
+msgstr ""
+
+#: builtin/merge-file.c:45
+msgid "do not warn about conflicts"
+msgstr ""
+
+#: builtin/merge-file.c:47
+msgid "set labels for file1/orig-file/file2"
+msgstr ""
+
+#: builtin/merge-recursive.c:45
+#, c-format
+msgid "unknown option %s"
+msgstr ""
+
+#: builtin/merge-recursive.c:51
+#, c-format
+msgid "could not parse object '%s'"
+msgstr ""
+
+#: builtin/merge-recursive.c:55
+#, c-format
+msgid "cannot handle more than %d base. Ignoring %s."
+msgid_plural "cannot handle more than %d bases. Ignoring %s."
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/merge-recursive.c:63
+msgid "not handling anything other than two heads merge."
+msgstr ""
+
+#: builtin/merge-recursive.c:69 builtin/merge-recursive.c:71
+#, c-format
+msgid "could not resolve ref '%s'"
+msgstr ""
+
+#: builtin/merge-recursive.c:77
+#, c-format
+msgid "Merging %s with %s\n"
+msgstr ""
+
+#: builtin/mktree.c:66
+msgid "git mktree [-z] [--missing] [--batch]"
+msgstr ""
+
+#: builtin/mktree.c:154
+msgid "input is NUL terminated"
+msgstr ""
+
+#: builtin/mktree.c:155 builtin/write-tree.c:25
+msgid "allow missing objects"
+msgstr ""
+
+#: builtin/mktree.c:156
+msgid "allow creation of more than one tree"
+msgstr ""
+
+#: builtin/multi-pack-index.c:8
+msgid "git multi-pack-index [--object-dir=<dir>] (write|verify)"
+msgstr ""
+
+#: builtin/multi-pack-index.c:21
+msgid "object directory containing set of packfile and pack-index pairs"
+msgstr ""
+
+#: builtin/multi-pack-index.c:39
+msgid "too many arguments"
+msgstr ""
+
+#: builtin/multi-pack-index.c:48
+#, c-format
+msgid "unrecognized verb: %s"
+msgstr ""
+
+#: builtin/mv.c:17
+msgid "git mv [<options>] <source>... <destination>"
+msgstr ""
+
+#: builtin/mv.c:82
+#, c-format
+msgid "Directory %s is in index and no submodule?"
+msgstr ""
+
+#: builtin/mv.c:84
+msgid "Please stage your changes to .gitmodules or stash them to proceed"
+msgstr ""
+
+#: builtin/mv.c:102
+#, c-format
+msgid "%.*s is in index"
+msgstr ""
+
+#: builtin/mv.c:124
+msgid "force move/rename even if target exists"
+msgstr ""
+
+#: builtin/mv.c:126
+msgid "skip move/rename errors"
+msgstr ""
+
+#: builtin/mv.c:168
+#, c-format
+msgid "destination '%s' is not a directory"
+msgstr ""
+
+#: builtin/mv.c:179
+#, c-format
+msgid "Checking rename of '%s' to '%s'\n"
+msgstr ""
+
+#: builtin/mv.c:183
+msgid "bad source"
+msgstr ""
+
+#: builtin/mv.c:186
+msgid "can not move directory into itself"
+msgstr ""
+
+#: builtin/mv.c:189
+msgid "cannot move directory over file"
+msgstr ""
+
+#: builtin/mv.c:198
+msgid "source directory is empty"
+msgstr ""
+
+#: builtin/mv.c:223
+msgid "not under version control"
+msgstr ""
+
+#: builtin/mv.c:226
+msgid "destination exists"
+msgstr ""
+
+#: builtin/mv.c:234
+#, c-format
+msgid "overwriting '%s'"
+msgstr ""
+
+#: builtin/mv.c:237
+msgid "Cannot overwrite"
+msgstr ""
+
+#: builtin/mv.c:240
+msgid "multiple sources for the same target"
+msgstr ""
+
+#: builtin/mv.c:242
+msgid "destination directory does not exist"
+msgstr ""
+
+#: builtin/mv.c:249
+#, c-format
+msgid "%s, source=%s, destination=%s"
+msgstr ""
+
+#: builtin/mv.c:270
+#, c-format
+msgid "Renaming %s to %s\n"
+msgstr ""
+
+#: builtin/mv.c:276 builtin/remote.c:717 builtin/repack.c:511
+#, c-format
+msgid "renaming '%s' failed"
+msgstr ""
+
+#: builtin/name-rev.c:355
+msgid "git name-rev [<options>] <commit>..."
+msgstr ""
+
+#: builtin/name-rev.c:356
+msgid "git name-rev [<options>] --all"
+msgstr ""
+
+#: builtin/name-rev.c:357
+msgid "git name-rev [<options>] --stdin"
+msgstr ""
+
+#: builtin/name-rev.c:413
+msgid "print only names (no SHA-1)"
+msgstr ""
+
+#: builtin/name-rev.c:414
+msgid "only use tags to name the commits"
+msgstr ""
+
+#: builtin/name-rev.c:416
+msgid "only use refs matching <pattern>"
+msgstr ""
+
+#: builtin/name-rev.c:418
+msgid "ignore refs matching <pattern>"
+msgstr ""
+
+#: builtin/name-rev.c:420
+msgid "list all commits reachable from all refs"
+msgstr ""
+
+#: builtin/name-rev.c:421
+msgid "read from stdin"
+msgstr ""
+
+#: builtin/name-rev.c:422
+msgid "allow to print `undefined` names (default)"
+msgstr ""
+
+#: builtin/name-rev.c:428
+msgid "dereference tags in the input (internal use)"
+msgstr ""
+
+#: builtin/notes.c:28
+msgid "git notes [--ref <notes-ref>] [list [<object>]]"
+msgstr ""
+
+#: builtin/notes.c:29
+msgid ""
+"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
+"| (-c | -C) <object>] [<object>]"
+msgstr ""
+
+#: builtin/notes.c:30
+msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
+msgstr ""
+
+#: builtin/notes.c:31
+msgid ""
+"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
+"(-c | -C) <object>] [<object>]"
+msgstr ""
+
+#: builtin/notes.c:32
+msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
+msgstr ""
+
+#: builtin/notes.c:33
+msgid "git notes [--ref <notes-ref>] show [<object>]"
+msgstr ""
+
+#: builtin/notes.c:34
+msgid ""
+"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
+msgstr ""
+
+#: builtin/notes.c:35
+msgid "git notes merge --commit [-v | -q]"
+msgstr ""
+
+#: builtin/notes.c:36
+msgid "git notes merge --abort [-v | -q]"
+msgstr ""
+
+#: builtin/notes.c:37
+msgid "git notes [--ref <notes-ref>] remove [<object>...]"
+msgstr ""
+
+#: builtin/notes.c:38
+msgid "git notes [--ref <notes-ref>] prune [-n] [-v]"
+msgstr ""
+
+#: builtin/notes.c:39
+msgid "git notes [--ref <notes-ref>] get-ref"
+msgstr ""
+
+#: builtin/notes.c:44
+msgid "git notes [list [<object>]]"
+msgstr ""
+
+#: builtin/notes.c:49
+msgid "git notes add [<options>] [<object>]"
+msgstr ""
+
+#: builtin/notes.c:54
+msgid "git notes copy [<options>] <from-object> <to-object>"
+msgstr ""
+
+#: builtin/notes.c:55
+msgid "git notes copy --stdin [<from-object> <to-object>]..."
+msgstr ""
+
+#: builtin/notes.c:60
+msgid "git notes append [<options>] [<object>]"
+msgstr ""
+
+#: builtin/notes.c:65
+msgid "git notes edit [<object>]"
+msgstr ""
+
+#: builtin/notes.c:70
+msgid "git notes show [<object>]"
+msgstr ""
+
+#: builtin/notes.c:75
+msgid "git notes merge [<options>] <notes-ref>"
+msgstr ""
+
+#: builtin/notes.c:76
+msgid "git notes merge --commit [<options>]"
+msgstr ""
+
+#: builtin/notes.c:77
+msgid "git notes merge --abort [<options>]"
+msgstr ""
+
+#: builtin/notes.c:82
+msgid "git notes remove [<object>]"
+msgstr ""
+
+#: builtin/notes.c:87
+msgid "git notes prune [<options>]"
+msgstr ""
+
+#: builtin/notes.c:92
+msgid "git notes get-ref"
+msgstr ""
+
+#: builtin/notes.c:97
+msgid "Write/edit the notes for the following object:"
+msgstr ""
+
+#: builtin/notes.c:150
+#, c-format
+msgid "unable to start 'show' for object '%s'"
+msgstr ""
+
+#: builtin/notes.c:154
+msgid "could not read 'show' output"
+msgstr ""
+
+#: builtin/notes.c:162
+#, c-format
+msgid "failed to finish 'show' for object '%s'"
+msgstr ""
+
+#: builtin/notes.c:197
+msgid "please supply the note contents using either -m or -F option"
+msgstr ""
+
+#: builtin/notes.c:206
+msgid "unable to write note object"
+msgstr ""
+
+#: builtin/notes.c:208
+#, c-format
+msgid "the note contents have been left in %s"
+msgstr ""
+
+#: builtin/notes.c:242 builtin/tag.c:513
+#, c-format
+msgid "could not open or read '%s'"
+msgstr ""
+
+#: builtin/notes.c:263 builtin/notes.c:313 builtin/notes.c:315
+#: builtin/notes.c:383 builtin/notes.c:438 builtin/notes.c:524
+#: builtin/notes.c:529 builtin/notes.c:607 builtin/notes.c:669
+#, c-format
+msgid "failed to resolve '%s' as a valid ref."
+msgstr ""
+
+#: builtin/notes.c:265
+#, c-format
+msgid "failed to read object '%s'."
+msgstr ""
+
+#: builtin/notes.c:268
+#, c-format
+msgid "cannot read note data from non-blob object '%s'."
+msgstr ""
+
+#: builtin/notes.c:309
+#, c-format
+msgid "malformed input line: '%s'."
+msgstr ""
+
+#: builtin/notes.c:324
+#, c-format
+msgid "failed to copy notes from '%s' to '%s'"
+msgstr ""
+
+#. TRANSLATORS: the first %s will be replaced by a git
+#. notes command: 'add', 'merge', 'remove', etc.
+#.
+#: builtin/notes.c:356
+#, c-format
+msgid "refusing to %s notes in %s (outside of refs/notes/)"
+msgstr ""
+
+#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:507
+#: builtin/notes.c:519 builtin/notes.c:595 builtin/notes.c:662
+#: builtin/notes.c:812 builtin/notes.c:959 builtin/notes.c:980
+msgid "too many parameters"
+msgstr ""
+
+#: builtin/notes.c:389 builtin/notes.c:675
+#, c-format
+msgid "no note found for object %s."
+msgstr ""
+
+#: builtin/notes.c:410 builtin/notes.c:573
+msgid "note contents as a string"
+msgstr ""
+
+#: builtin/notes.c:413 builtin/notes.c:576
+msgid "note contents in a file"
+msgstr ""
+
+#: builtin/notes.c:416 builtin/notes.c:579
+msgid "reuse and edit specified note object"
+msgstr ""
+
+#: builtin/notes.c:419 builtin/notes.c:582
+msgid "reuse specified note object"
+msgstr ""
+
+#: builtin/notes.c:422 builtin/notes.c:585
+msgid "allow storing empty note"
+msgstr ""
+
+#: builtin/notes.c:423 builtin/notes.c:494
+msgid "replace existing notes"
+msgstr ""
+
+#: builtin/notes.c:448
+#, c-format
+msgid ""
+"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
+"existing notes"
+msgstr ""
+
+#: builtin/notes.c:463 builtin/notes.c:542
+#, c-format
+msgid "Overwriting existing notes for object %s\n"
+msgstr ""
+
+#: builtin/notes.c:474 builtin/notes.c:634 builtin/notes.c:899
+#, c-format
+msgid "Removing note for object %s\n"
+msgstr ""
+
+#: builtin/notes.c:495
+msgid "read objects from stdin"
+msgstr ""
+
+#: builtin/notes.c:497
+msgid "load rewriting config for <command> (implies --stdin)"
+msgstr ""
+
+#: builtin/notes.c:515
+msgid "too few parameters"
+msgstr ""
+
+#: builtin/notes.c:536
+#, c-format
+msgid ""
+"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
+"existing notes"
+msgstr ""
+
+#: builtin/notes.c:548
+#, c-format
+msgid "missing notes on source object %s. Cannot copy."
+msgstr ""
+
+#: builtin/notes.c:600
+#, 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:695
+msgid "failed to delete ref NOTES_MERGE_PARTIAL"
+msgstr ""
+
+#: builtin/notes.c:697
+msgid "failed to delete ref NOTES_MERGE_REF"
+msgstr ""
+
+#: builtin/notes.c:699
+msgid "failed to remove 'git notes merge' worktree"
+msgstr ""
+
+#: builtin/notes.c:719
+msgid "failed to read ref NOTES_MERGE_PARTIAL"
+msgstr ""
+
+#: builtin/notes.c:721
+msgid "could not find commit from NOTES_MERGE_PARTIAL."
+msgstr ""
+
+#: builtin/notes.c:723
+msgid "could not parse commit from NOTES_MERGE_PARTIAL."
+msgstr ""
+
+#: builtin/notes.c:736
+msgid "failed to resolve NOTES_MERGE_REF"
+msgstr ""
+
+#: builtin/notes.c:739
+msgid "failed to finalize notes merge"
+msgstr ""
+
+#: builtin/notes.c:765
+#, c-format
+msgid "unknown notes merge strategy %s"
+msgstr ""
+
+#: builtin/notes.c:781
+msgid "General options"
+msgstr ""
+
+#: builtin/notes.c:783
+msgid "Merge options"
+msgstr ""
+
+#: builtin/notes.c:785
+msgid ""
+"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
+"cat_sort_uniq)"
+msgstr ""
+
+#: builtin/notes.c:787
+msgid "Committing unmerged notes"
+msgstr ""
+
+#: builtin/notes.c:789
+msgid "finalize notes merge by committing unmerged notes"
+msgstr ""
+
+#: builtin/notes.c:791
+msgid "Aborting notes merge resolution"
+msgstr ""
+
+#: builtin/notes.c:793
+msgid "abort notes merge"
+msgstr ""
+
+#: builtin/notes.c:804
+msgid "cannot mix --commit, --abort or -s/--strategy"
+msgstr ""
+
+#: builtin/notes.c:809
+msgid "must specify a notes ref to merge"
+msgstr ""
+
+#: builtin/notes.c:833
+#, c-format
+msgid "unknown -s/--strategy: %s"
+msgstr ""
+
+#: builtin/notes.c:870
+#, c-format
+msgid "a notes merge into %s is already in-progress at %s"
+msgstr ""
+
+#: builtin/notes.c:873
+#, c-format
+msgid "failed to store link to current notes ref (%s)"
+msgstr ""
+
+#: builtin/notes.c:875
+#, c-format
+msgid ""
+"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
+"'git notes merge --commit', or abort the merge with 'git notes merge --"
+"abort'.\n"
+msgstr ""
+
+#: builtin/notes.c:897
+#, c-format
+msgid "Object %s has no note\n"
+msgstr ""
+
+#: builtin/notes.c:909
+msgid "attempt to remove non-existent note is not an error"
+msgstr ""
+
+#: builtin/notes.c:912
+msgid "read object names from the standard input"
+msgstr ""
+
+#: builtin/notes.c:950 builtin/prune.c:108 builtin/worktree.c:164
+msgid "do not remove, show only"
+msgstr ""
+
+#: builtin/notes.c:951
+msgid "report pruned notes"
+msgstr ""
+
+#: builtin/notes.c:993
+msgid "notes-ref"
+msgstr ""
+
+#: builtin/notes.c:994
+msgid "use notes from <notes-ref>"
+msgstr ""
+
+#: builtin/notes.c:1029
+#, c-format
+msgid "unknown subcommand: %s"
+msgstr ""
+
+#: builtin/pack-objects.c:51
+msgid ""
+"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
+msgstr ""
+
+#: builtin/pack-objects.c:52
+msgid ""
+"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
+msgstr ""
+
+#: builtin/pack-objects.c:422
+#, c-format
+msgid "bad packed object CRC for %s"
+msgstr ""
+
+#: builtin/pack-objects.c:433
+#, c-format
+msgid "corrupt packed object for %s"
+msgstr ""
+
+#: builtin/pack-objects.c:564
+#, c-format
+msgid "recursive delta detected for object %s"
+msgstr ""
+
+#: builtin/pack-objects.c:775
+#, c-format
+msgid "ordered %u objects, expected %<PRIu32>"
+msgstr ""
+
+#: builtin/pack-objects.c:788
+#, c-format
+msgid "packfile is invalid: %s"
+msgstr ""
+
+#: builtin/pack-objects.c:792
+#, c-format
+msgid "unable to open packfile for reuse: %s"
+msgstr ""
+
+#: builtin/pack-objects.c:796
+msgid "unable to seek in reused packfile"
+msgstr ""
+
+#: builtin/pack-objects.c:807
+msgid "unable to read from reused packfile"
+msgstr ""
+
+#: builtin/pack-objects.c:835
+msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
+msgstr ""
+
+#: builtin/pack-objects.c:848
+msgid "Writing objects"
+msgstr ""
+
+#: builtin/pack-objects.c:910 builtin/update-index.c:88
+#, c-format
+msgid "failed to stat %s"
+msgstr ""
+
+#: builtin/pack-objects.c:963
+#, c-format
+msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
+msgstr ""
+
+#: builtin/pack-objects.c:1157
+msgid "disabling bitmap writing, as some objects are not being packed"
+msgstr ""
+
+#: builtin/pack-objects.c:1585
+#, c-format
+msgid "delta base offset overflow in pack for %s"
+msgstr ""
+
+#: builtin/pack-objects.c:1594
+#, c-format
+msgid "delta base offset out of bound for %s"
+msgstr ""
+
+#: builtin/pack-objects.c:1863
+msgid "Counting objects"
+msgstr ""
+
+#: builtin/pack-objects.c:1998
+#, c-format
+msgid "unable to get size of %s"
+msgstr ""
+
+#: builtin/pack-objects.c:2013
+#, c-format
+msgid "unable to parse object header of %s"
+msgstr ""
+
+#: builtin/pack-objects.c:2083 builtin/pack-objects.c:2099
+#: builtin/pack-objects.c:2109
+#, c-format
+msgid "object %s cannot be read"
+msgstr ""
+
+#: builtin/pack-objects.c:2086 builtin/pack-objects.c:2113
+#, c-format
+msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
+msgstr ""
+
+#: builtin/pack-objects.c:2123
+msgid "suboptimal pack - out of memory"
+msgstr ""
+
+#: builtin/pack-objects.c:2451
+#, c-format
+msgid "Delta compression using up to %d threads"
+msgstr ""
+
+#: builtin/pack-objects.c:2583
+#, c-format
+msgid "unable to pack objects reachable from tag %s"
+msgstr ""
+
+#: builtin/pack-objects.c:2670
+msgid "Compressing objects"
+msgstr ""
+
+#: builtin/pack-objects.c:2676
+msgid "inconsistency with delta count"
+msgstr ""
+
+#: builtin/pack-objects.c:2753
+#, c-format
+msgid ""
+"expected edge object ID, got garbage:\n"
+" %s"
+msgstr ""
+
+#: builtin/pack-objects.c:2759
+#, c-format
+msgid ""
+"expected object ID, got garbage:\n"
+" %s"
+msgstr ""
+
+#: builtin/pack-objects.c:2857
+msgid "invalid value for --missing"
+msgstr ""
+
+#: builtin/pack-objects.c:2916 builtin/pack-objects.c:3024
+msgid "cannot open pack index"
+msgstr ""
+
+#: builtin/pack-objects.c:2947
+#, c-format
+msgid "loose object at %s could not be examined"
+msgstr ""
+
+#: builtin/pack-objects.c:3032
+msgid "unable to force loose object"
+msgstr ""
+
+#: builtin/pack-objects.c:3122
+#, c-format
+msgid "not a rev '%s'"
+msgstr ""
+
+#: builtin/pack-objects.c:3125
+#, c-format
+msgid "bad revision '%s'"
+msgstr ""
+
+#: builtin/pack-objects.c:3150
+msgid "unable to add recent objects"
+msgstr ""
+
+#: builtin/pack-objects.c:3203
+#, c-format
+msgid "unsupported index version %s"
+msgstr ""
+
+#: builtin/pack-objects.c:3207
+#, c-format
+msgid "bad index version '%s'"
+msgstr ""
+
+#: builtin/pack-objects.c:3237
+msgid "do not show progress meter"
+msgstr ""
+
+#: builtin/pack-objects.c:3239
+msgid "show progress meter"
+msgstr ""
+
+#: builtin/pack-objects.c:3241
+msgid "show progress meter during object writing phase"
+msgstr ""
+
+#: builtin/pack-objects.c:3244
+msgid "similar to --all-progress when progress meter is shown"
+msgstr ""
+
+#: builtin/pack-objects.c:3245
+msgid "<version>[,<offset>]"
+msgstr ""
+
+#: builtin/pack-objects.c:3246
+msgid "write the pack index file in the specified idx format version"
+msgstr ""
+
+#: builtin/pack-objects.c:3249
+msgid "maximum size of each output pack file"
+msgstr ""
+
+#: builtin/pack-objects.c:3251
+msgid "ignore borrowed objects from alternate object store"
+msgstr ""
+
+#: builtin/pack-objects.c:3253
+msgid "ignore packed objects"
+msgstr ""
+
+#: builtin/pack-objects.c:3255
+msgid "limit pack window by objects"
+msgstr ""
+
+#: builtin/pack-objects.c:3257
+msgid "limit pack window by memory in addition to object limit"
+msgstr ""
+
+#: builtin/pack-objects.c:3259
+msgid "maximum length of delta chain allowed in the resulting pack"
+msgstr ""
+
+#: builtin/pack-objects.c:3261
+msgid "reuse existing deltas"
+msgstr ""
+
+#: builtin/pack-objects.c:3263
+msgid "reuse existing objects"
+msgstr ""
+
+#: builtin/pack-objects.c:3265
+msgid "use OFS_DELTA objects"
+msgstr ""
+
+#: builtin/pack-objects.c:3267
+msgid "use threads when searching for best delta matches"
+msgstr ""
+
+#: builtin/pack-objects.c:3269
+msgid "do not create an empty pack output"
+msgstr ""
+
+#: builtin/pack-objects.c:3271
+msgid "read revision arguments from standard input"
+msgstr ""
+
+#: builtin/pack-objects.c:3273
+msgid "limit the objects to those that are not yet packed"
+msgstr ""
+
+#: builtin/pack-objects.c:3276
+msgid "include objects reachable from any reference"
+msgstr ""
+
+#: builtin/pack-objects.c:3279
+msgid "include objects referred by reflog entries"
+msgstr ""
+
+#: builtin/pack-objects.c:3282
+msgid "include objects referred to by the index"
+msgstr ""
+
+#: builtin/pack-objects.c:3285
+msgid "output pack to stdout"
+msgstr ""
+
+#: builtin/pack-objects.c:3287
+msgid "include tag objects that refer to objects to be packed"
+msgstr ""
+
+#: builtin/pack-objects.c:3289
+msgid "keep unreachable objects"
+msgstr ""
+
+#: builtin/pack-objects.c:3291
+msgid "pack loose unreachable objects"
+msgstr ""
+
+#: builtin/pack-objects.c:3293
+msgid "unpack unreachable objects newer than <time>"
+msgstr ""
+
+#: builtin/pack-objects.c:3296
+msgid "create thin packs"
+msgstr ""
+
+#: builtin/pack-objects.c:3298
+msgid "create packs suitable for shallow fetches"
+msgstr ""
+
+#: builtin/pack-objects.c:3300
+msgid "ignore packs that have companion .keep file"
+msgstr ""
+
+#: builtin/pack-objects.c:3302
+msgid "ignore this pack"
+msgstr ""
+
+#: builtin/pack-objects.c:3304
+msgid "pack compression level"
+msgstr ""
+
+#: builtin/pack-objects.c:3306
+msgid "do not hide commits by grafts"
+msgstr ""
+
+#: builtin/pack-objects.c:3308
+msgid "use a bitmap index if available to speed up counting objects"
+msgstr ""
+
+#: builtin/pack-objects.c:3310
+msgid "write a bitmap index together with the pack index"
+msgstr ""
+
+#: builtin/pack-objects.c:3313
+msgid "handling for missing objects"
+msgstr ""
+
+#: builtin/pack-objects.c:3316
+msgid "do not pack objects in promisor packfiles"
+msgstr ""
+
+#: builtin/pack-objects.c:3318
+msgid "respect islands during delta compression"
+msgstr ""
+
+#: builtin/pack-objects.c:3342
+#, c-format
+msgid "delta chain depth %d is too deep, forcing %d"
+msgstr ""
+
+#: builtin/pack-objects.c:3347
+#, c-format
+msgid "pack.deltaCacheLimit is too high, forcing %d"
+msgstr ""
+
+#: builtin/pack-objects.c:3401
+msgid "--max-pack-size cannot be used to build a pack for transfer"
+msgstr ""
+
+#: builtin/pack-objects.c:3403
+msgid "minimum pack size limit is 1 MiB"
+msgstr ""
+
+#: builtin/pack-objects.c:3408
+msgid "--thin cannot be used to build an indexable pack"
+msgstr ""
+
+#: builtin/pack-objects.c:3411
+msgid "--keep-unreachable and --unpack-unreachable are incompatible"
+msgstr ""
+
+#: builtin/pack-objects.c:3417
+msgid "cannot use --filter without --stdout"
+msgstr ""
+
+#: builtin/pack-objects.c:3476
+msgid "Enumerating objects"
+msgstr ""
+
+#: builtin/pack-objects.c:3495
+#, c-format
+msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)"
+msgstr ""
+
+#: builtin/pack-refs.c:7
+msgid "git pack-refs [<options>]"
+msgstr ""
+
+#: builtin/pack-refs.c:15
+msgid "pack everything"
+msgstr ""
+
+#: builtin/pack-refs.c:16
+msgid "prune loose refs (default)"
+msgstr ""
+
+#: builtin/prune-packed.c:9
+msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
+msgstr ""
+
+#: builtin/prune-packed.c:42
+msgid "Removing duplicate objects"
+msgstr ""
+
+#: builtin/prune.c:12
+msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
+msgstr ""
+
+#: builtin/prune.c:109
+msgid "report pruned objects"
+msgstr ""
+
+#: builtin/prune.c:112
+msgid "expire objects older than <time>"
+msgstr ""
+
+#: builtin/prune.c:114
+msgid "limit traversal to objects outside promisor packfiles"
+msgstr ""
+
+#: builtin/prune.c:129
+msgid "cannot prune in a precious-objects repo"
+msgstr ""
+
+#: builtin/pull.c:60 builtin/pull.c:62
+#, c-format
+msgid "Invalid value for %s: %s"
+msgstr ""
+
+#: builtin/pull.c:82
+msgid "git pull [<options>] [<repository> [<refspec>...]]"
+msgstr ""
+
+#: builtin/pull.c:133
+msgid "control for recursive fetching of submodules"
+msgstr ""
+
+#: builtin/pull.c:137
+msgid "Options related to merging"
+msgstr ""
+
+#: builtin/pull.c:140
+msgid "incorporate changes by rebasing rather than merging"
+msgstr ""
+
+#: builtin/pull.c:167 builtin/rebase--interactive.c:147 builtin/revert.c:122
+msgid "allow fast-forward"
+msgstr ""
+
+#: builtin/pull.c:176
+msgid "automatically stash/stash pop before and after rebase"
+msgstr ""
+
+#: builtin/pull.c:192
+msgid "Options related to fetching"
+msgstr ""
+
+#: builtin/pull.c:202
+msgid "force overwrite of local branch"
+msgstr ""
+
+#: builtin/pull.c:210
+msgid "number of submodules pulled in parallel"
+msgstr ""
+
+#: builtin/pull.c:305
+#, c-format
+msgid "Invalid value for pull.ff: %s"
+msgstr ""
+
+#: builtin/pull.c:421
+msgid ""
+"There is no candidate for rebasing against among the refs that you just "
+"fetched."
+msgstr ""
+
+#: builtin/pull.c:423
+msgid ""
+"There are no candidates for merging among the refs that you just fetched."
+msgstr ""
+
+#: builtin/pull.c:424
+msgid ""
+"Generally this means that you provided a wildcard refspec which had no\n"
+"matches on the remote end."
+msgstr ""
+
+#: builtin/pull.c:427
+#, c-format
+msgid ""
+"You asked to pull from the remote '%s', but did not specify\n"
+"a branch. Because this is not the default configured remote\n"
+"for your current branch, you must specify a branch on the command line."
+msgstr ""
+
+#: builtin/pull.c:432 builtin/rebase.c:761 git-parse-remote.sh:73
+msgid "You are not currently on a branch."
+msgstr ""
+
+#: builtin/pull.c:434 builtin/pull.c:449 git-parse-remote.sh:79
+msgid "Please specify which branch you want to rebase against."
+msgstr ""
+
+#: builtin/pull.c:436 builtin/pull.c:451 git-parse-remote.sh:82
+msgid "Please specify which branch you want to merge with."
+msgstr ""
+
+#: builtin/pull.c:437 builtin/pull.c:452
+msgid "See git-pull(1) for details."
+msgstr ""
+
+#: builtin/pull.c:439 builtin/pull.c:445 builtin/pull.c:454
+#: builtin/rebase.c:767 git-parse-remote.sh:64
+msgid "<remote>"
+msgstr ""
+
+#: builtin/pull.c:439 builtin/pull.c:454 builtin/pull.c:459
+#: git-legacy-rebase.sh:556 git-parse-remote.sh:65
+msgid "<branch>"
+msgstr ""
+
+#: builtin/pull.c:447 builtin/rebase.c:759 git-parse-remote.sh:75
+msgid "There is no tracking information for the current branch."
+msgstr ""
+
+#: builtin/pull.c:456 git-parse-remote.sh:95
+msgid ""
+"If you wish to set tracking information for this branch you can do so with:"
+msgstr ""
+
+#: builtin/pull.c:461
+#, c-format
+msgid ""
+"Your configuration specifies to merge with the ref '%s'\n"
+"from the remote, but no such ref was fetched."
+msgstr ""
+
+#: builtin/pull.c:565
+#, c-format
+msgid "unable to access commit %s"
+msgstr ""
+
+#: builtin/pull.c:843
+msgid "ignoring --verify-signatures for rebase"
+msgstr ""
+
+#: builtin/pull.c:891
+msgid "--[no-]autostash option is only valid with --rebase."
+msgstr ""
+
+#: builtin/pull.c:899
+msgid "Updating an unborn branch with changes added to the index."
+msgstr ""
+
+#: builtin/pull.c:902
+msgid "pull with rebase"
+msgstr ""
+
+#: builtin/pull.c:903
+msgid "please commit or stash them."
+msgstr ""
+
+#: builtin/pull.c:928
+#, c-format
+msgid ""
+"fetch updated the current branch head.\n"
+"fast-forwarding your working tree from\n"
+"commit %s."
+msgstr ""
+
+#: builtin/pull.c:934
+#, c-format
+msgid ""
+"Cannot fast-forward your working tree.\n"
+"After making sure that you saved anything precious from\n"
+"$ git diff %s\n"
+"output, run\n"
+"$ git reset --hard\n"
+"to recover."
+msgstr ""
+
+#: builtin/pull.c:949
+msgid "Cannot merge multiple branches into empty head."
+msgstr ""
+
+#: builtin/pull.c:953
+msgid "Cannot rebase onto multiple branches."
+msgstr ""
+
+#: builtin/pull.c:960
+msgid "cannot rebase with locally recorded submodule modifications"
+msgstr ""
+
+#: builtin/push.c:19
+msgid "git push [<options>] [<repository> [<refspec>...]]"
+msgstr ""
+
+#: builtin/push.c:111
+msgid "tag shorthand without <tag>"
+msgstr ""
+
+#: builtin/push.c:121
+msgid "--delete only accepts plain target ref names"
+msgstr ""
+
+#: builtin/push.c:165
+msgid ""
+"\n"
+"To choose either option permanently, see push.default in 'git help config'."
+msgstr ""
+
+#: builtin/push.c:168
+#, c-format
+msgid ""
+"The upstream branch of your current branch does not match\n"
+"the name of your current branch.  To push to the upstream branch\n"
+"on the remote, use\n"
+"\n"
+"    git push %s HEAD:%s\n"
+"\n"
+"To push to the branch of the same name on the remote, use\n"
+"\n"
+"    git push %s HEAD\n"
+"%s"
+msgstr ""
+
+#: builtin/push.c:183
+#, c-format
+msgid ""
+"You are not currently on a branch.\n"
+"To push the history leading to the current (detached HEAD)\n"
+"state now, use\n"
+"\n"
+"    git push %s HEAD:<name-of-remote-branch>\n"
+msgstr ""
+
+#: builtin/push.c:197
+#, c-format
+msgid ""
+"The current branch %s has no upstream branch.\n"
+"To push the current branch and set the remote as upstream, use\n"
+"\n"
+"    git push --set-upstream %s %s\n"
+msgstr ""
+
+#: builtin/push.c:205
+#, c-format
+msgid "The current branch %s has multiple upstream branches, refusing to push."
+msgstr ""
+
+#: builtin/push.c:208
+#, c-format
+msgid ""
+"You are pushing to remote '%s', which is not the upstream of\n"
+"your current branch '%s', without telling me what to push\n"
+"to update which remote branch."
+msgstr ""
+
+#: builtin/push.c:267
+msgid ""
+"You didn't specify any refspecs to push, and push.default is \"nothing\"."
+msgstr ""
+
+#: builtin/push.c:274
+msgid ""
+"Updates were rejected because the tip of your current branch is behind\n"
+"its remote counterpart. Integrate the remote changes (e.g.\n"
+"'git pull ...') before pushing again.\n"
+"See the 'Note about fast-forwards' in 'git push --help' for details."
+msgstr ""
+
+#: builtin/push.c:280
+msgid ""
+"Updates were rejected because a pushed branch tip is behind its remote\n"
+"counterpart. Check out this branch and integrate the remote changes\n"
+"(e.g. 'git pull ...') before pushing again.\n"
+"See the 'Note about fast-forwards' in 'git push --help' for details."
+msgstr ""
+
+#: builtin/push.c:286
+msgid ""
+"Updates were rejected because the remote contains work that you do\n"
 "not have locally. This is usually caused by another repository pushing\n"
 "to the same ref. You may want to first integrate the remote changes\n"
 "(e.g., 'git pull ...') before pushing again.\n"
 "See the 'Note about fast-forwards' in 'git push --help' for details."
 msgstr ""
 
-#: builtin/push.c:257
-msgid "Updates were rejected because the tag already exists in the remote."
+#: builtin/push.c:293
+msgid "Updates were rejected because the tag already exists in the remote."
+msgstr ""
+
+#: builtin/push.c:296
+msgid ""
+"You cannot update a remote ref that points at a non-commit object,\n"
+"or update a remote ref to make it point at a non-commit object,\n"
+"without using the '--force' option.\n"
+msgstr ""
+
+#: builtin/push.c:357
+#, c-format
+msgid "Pushing to %s\n"
+msgstr ""
+
+#: builtin/push.c:361
+#, c-format
+msgid "failed to push some refs to '%s'"
+msgstr ""
+
+#: builtin/push.c:395
+#, c-format
+msgid "bad repository '%s'"
+msgstr ""
+
+#: builtin/push.c:396
+msgid ""
+"No configured push destination.\n"
+"Either specify the URL from the command-line or configure a remote "
+"repository using\n"
+"\n"
+"    git remote add <name> <url>\n"
+"\n"
+"and then push using the remote name\n"
+"\n"
+"    git push <name>\n"
+msgstr ""
+
+#: builtin/push.c:551
+msgid "repository"
+msgstr ""
+
+#: builtin/push.c:552 builtin/send-pack.c:164
+msgid "push all refs"
+msgstr ""
+
+#: builtin/push.c:553 builtin/send-pack.c:166
+msgid "mirror all refs"
+msgstr ""
+
+#: builtin/push.c:555
+msgid "delete refs"
+msgstr ""
+
+#: builtin/push.c:556
+msgid "push tags (can't be used with --all or --mirror)"
+msgstr ""
+
+#: builtin/push.c:559 builtin/send-pack.c:167
+msgid "force updates"
+msgstr ""
+
+#: builtin/push.c:561 builtin/send-pack.c:181
+msgid "<refname>:<expect>"
+msgstr ""
+
+#: builtin/push.c:562 builtin/send-pack.c:182
+msgid "require old value of ref to be at this value"
+msgstr ""
+
+#: builtin/push.c:565
+msgid "control recursive pushing of submodules"
+msgstr ""
+
+#: builtin/push.c:567 builtin/send-pack.c:175
+msgid "use thin pack"
+msgstr ""
+
+#: builtin/push.c:568 builtin/push.c:569 builtin/send-pack.c:161
+#: builtin/send-pack.c:162
+msgid "receive pack program"
+msgstr ""
+
+#: builtin/push.c:570
+msgid "set upstream for git pull/status"
+msgstr ""
+
+#: builtin/push.c:573
+msgid "prune locally removed refs"
+msgstr ""
+
+#: builtin/push.c:575
+msgid "bypass pre-push hook"
+msgstr ""
+
+#: builtin/push.c:576
+msgid "push missing but relevant tags"
+msgstr ""
+
+#: builtin/push.c:579 builtin/send-pack.c:169
+msgid "GPG sign the push"
+msgstr ""
+
+#: builtin/push.c:581 builtin/send-pack.c:176
+msgid "request atomic transaction on remote side"
+msgstr ""
+
+#: builtin/push.c:599
+msgid "--delete is incompatible with --all, --mirror and --tags"
+msgstr ""
+
+#: builtin/push.c:601
+msgid "--delete doesn't make sense without any refs"
+msgstr ""
+
+#: builtin/push.c:604
+msgid "--all and --tags are incompatible"
+msgstr ""
+
+#: builtin/push.c:606
+msgid "--all can't be combined with refspecs"
+msgstr ""
+
+#: builtin/push.c:610
+msgid "--mirror and --tags are incompatible"
+msgstr ""
+
+#: builtin/push.c:612
+msgid "--mirror can't be combined with refspecs"
+msgstr ""
+
+#: builtin/push.c:615
+msgid "--all and --mirror are incompatible"
+msgstr ""
+
+#: builtin/push.c:634
+msgid "push options must not have new line characters"
+msgstr ""
+
+#: builtin/range-diff.c:8
+msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>"
+msgstr ""
+
+#: builtin/range-diff.c:9
+msgid "git range-diff [<options>] <old-tip>...<new-tip>"
+msgstr ""
+
+#: builtin/range-diff.c:10
+msgid "git range-diff [<options>] <base> <old-tip> <new-tip>"
+msgstr ""
+
+#: builtin/range-diff.c:21
+msgid "Percentage by which creation is weighted"
+msgstr ""
+
+#: builtin/range-diff.c:23
+msgid "use simple diff colors"
+msgstr ""
+
+#: builtin/range-diff.c:61 builtin/range-diff.c:65
+#, c-format
+msgid "no .. in range: '%s'"
+msgstr ""
+
+#: builtin/range-diff.c:75
+msgid "single arg format must be symmetric range"
+msgstr ""
+
+#: builtin/range-diff.c:90
+msgid "need two commit ranges"
+msgstr ""
+
+#: builtin/read-tree.c:40
+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:123
+msgid "write resulting index to <file>"
+msgstr ""
+
+#: builtin/read-tree.c:126
+msgid "only empty the index"
+msgstr ""
+
+#: builtin/read-tree.c:128
+msgid "Merging"
+msgstr ""
+
+#: builtin/read-tree.c:130
+msgid "perform a merge in addition to a read"
+msgstr ""
+
+#: builtin/read-tree.c:132
+msgid "3-way merge if no file level merging required"
+msgstr ""
+
+#: builtin/read-tree.c:134
+msgid "3-way merge in presence of adds and removes"
+msgstr ""
+
+#: builtin/read-tree.c:136
+msgid "same as -m, but discard unmerged entries"
+msgstr ""
+
+#: builtin/read-tree.c:137
+msgid "<subdirectory>/"
+msgstr ""
+
+#: builtin/read-tree.c:138
+msgid "read the tree into the index under <subdirectory>/"
+msgstr ""
+
+#: builtin/read-tree.c:141
+msgid "update working tree with merge result"
+msgstr ""
+
+#: builtin/read-tree.c:143
+msgid "gitignore"
+msgstr ""
+
+#: builtin/read-tree.c:144
+msgid "allow explicitly ignored files to be overwritten"
+msgstr ""
+
+#: builtin/read-tree.c:147
+msgid "don't check the working tree after merging"
+msgstr ""
+
+#: builtin/read-tree.c:148
+msgid "don't update the index or the work tree"
+msgstr ""
+
+#: builtin/read-tree.c:150
+msgid "skip applying sparse checkout filter"
+msgstr ""
+
+#: builtin/read-tree.c:152
+msgid "debug unpack-trees"
+msgstr ""
+
+#: builtin/rebase.c:29
+msgid ""
+"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] "
+"[<branch>]"
+msgstr ""
+
+#: builtin/rebase.c:31
+msgid ""
+"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]"
+msgstr ""
+
+#: builtin/rebase.c:33
+msgid "git rebase --continue | --abort | --skip | --edit-todo"
+msgstr ""
+
+#: builtin/rebase.c:119
+#, c-format
+msgid "%s requires an interactive rebase"
+msgstr ""
+
+#: builtin/rebase.c:171
+#, c-format
+msgid "could not get 'onto': '%s'"
+msgstr ""
+
+#: builtin/rebase.c:186
+#, c-format
+msgid "invalid orig-head: '%s'"
+msgstr ""
+
+#: builtin/rebase.c:214
+#, c-format
+msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
+msgstr ""
+
+#: builtin/rebase.c:259
+#, c-format
+msgid "Could not read '%s'"
+msgstr ""
+
+#: builtin/rebase.c:277
+#, c-format
+msgid "Cannot store %s"
+msgstr ""
+
+#: builtin/rebase.c:337
+msgid ""
+"Resolve all conflicts manually, mark them as resolved with\n"
+"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
+"You can instead skip this commit: run \"git rebase --skip\".\n"
+"To abort and get back to the state before \"git rebase\", run \"git rebase --"
+"abort\"."
+msgstr ""
+
+#: builtin/rebase.c:561
+msgid "could not determine HEAD revision"
+msgstr ""
+
+#: builtin/rebase.c:753
+#, c-format
+msgid ""
+"%s\n"
+"Please specify which branch you want to rebase against.\n"
+"See git-rebase(1) for details.\n"
+"\n"
+"    git rebase '<branch>'\n"
+"\n"
+msgstr ""
+
+#: builtin/rebase.c:769
+#, c-format
+msgid ""
+"If you wish to set tracking information for this branch you can do so with:\n"
+"\n"
+"    git branch --set-upstream-to=%s/<branch> %s\n"
+"\n"
+msgstr ""
+
+#: builtin/rebase.c:832
+msgid "rebase onto given branch instead of upstream"
+msgstr ""
+
+#: builtin/rebase.c:834
+msgid "allow pre-rebase hook to run"
+msgstr ""
+
+#: builtin/rebase.c:836
+msgid "be quiet. implies --no-stat"
+msgstr ""
+
+#: builtin/rebase.c:839
+msgid "display a diffstat of what changed upstream"
+msgstr ""
+
+#: builtin/rebase.c:842
+msgid "do not show diffstat of what changed upstream"
+msgstr ""
+
+#: builtin/rebase.c:845
+msgid "add a Signed-off-by: line to each commit"
+msgstr ""
+
+#: builtin/rebase.c:847 builtin/rebase.c:851 builtin/rebase.c:853
+msgid "passed to 'git am'"
+msgstr ""
+
+#: builtin/rebase.c:855 builtin/rebase.c:857
+msgid "passed to 'git apply'"
+msgstr ""
+
+#: builtin/rebase.c:859 builtin/rebase.c:862
+msgid "cherry-pick all commits, even if unchanged"
+msgstr ""
+
+#: builtin/rebase.c:864
+msgid "continue"
+msgstr ""
+
+#: builtin/rebase.c:867
+msgid "skip current patch and continue"
+msgstr ""
+
+#: builtin/rebase.c:869
+msgid "abort and check out the original branch"
+msgstr ""
+
+#: builtin/rebase.c:872
+msgid "abort but keep HEAD where it is"
+msgstr ""
+
+#: builtin/rebase.c:873
+msgid "edit the todo list during an interactive rebase"
+msgstr ""
+
+#: builtin/rebase.c:876
+msgid "show the patch file being applied or merged"
+msgstr ""
+
+#: builtin/rebase.c:879
+msgid "use merging strategies to rebase"
+msgstr ""
+
+#: builtin/rebase.c:883
+msgid "let the user edit the list of commits to rebase"
+msgstr ""
+
+#: builtin/rebase.c:887
+msgid "try to recreate merges instead of ignoring them"
+msgstr ""
+
+#: builtin/rebase.c:891
+msgid "allow rerere to update index with resolved conflict"
+msgstr ""
+
+#: builtin/rebase.c:894
+msgid "preserve empty commits during rebase"
+msgstr ""
+
+#: builtin/rebase.c:896
+msgid "move commits that begin with squash!/fixup! under -i"
+msgstr ""
+
+#: builtin/rebase.c:902
+msgid "automatically stash/stash pop before and after"
+msgstr ""
+
+#: builtin/rebase.c:904
+msgid "add exec lines after each commit of the editable list"
+msgstr ""
+
+#: builtin/rebase.c:908
+msgid "allow rebasing commits with empty messages"
+msgstr ""
+
+#: builtin/rebase.c:911
+msgid "try to rebase merges instead of skipping them"
+msgstr ""
+
+#: builtin/rebase.c:914
+msgid "use 'merge-base --fork-point' to refine upstream"
+msgstr ""
+
+#: builtin/rebase.c:916
+msgid "use the given merge strategy"
+msgstr ""
+
+#: builtin/rebase.c:918 builtin/revert.c:111
+msgid "option"
+msgstr ""
+
+#: builtin/rebase.c:919
+msgid "pass the argument through to the merge strategy"
+msgstr ""
+
+#: builtin/rebase.c:922
+msgid "rebase all reachable commits up to the root(s)"
+msgstr ""
+
+#: builtin/rebase.c:938
+#, c-format
+msgid "could not exec %s"
+msgstr ""
+
+#: builtin/rebase.c:956 git-legacy-rebase.sh:213
+msgid "It looks like 'git am' is in progress. Cannot rebase."
+msgstr ""
+
+#: builtin/rebase.c:997 git-legacy-rebase.sh:395
+msgid "No rebase in progress?"
+msgstr ""
+
+#: builtin/rebase.c:1001 git-legacy-rebase.sh:406
+msgid "The --edit-todo action can only be used during interactive rebase."
+msgstr ""
+
+#: builtin/rebase.c:1015 git-legacy-rebase.sh:413
+msgid "Cannot read HEAD"
+msgstr ""
+
+#: builtin/rebase.c:1028 git-legacy-rebase.sh:416
+msgid ""
+"You must edit all merge conflicts and then\n"
+"mark them as resolved using git add"
+msgstr ""
+
+#: builtin/rebase.c:1047
+msgid "could not discard worktree changes"
+msgstr ""
+
+#: builtin/rebase.c:1066
+#, c-format
+msgid "could not move back to %s"
+msgstr ""
+
+#: builtin/rebase.c:1077 builtin/rm.c:368
+#, c-format
+msgid "could not remove '%s'"
+msgstr ""
+
+#: builtin/rebase.c:1103
+#, c-format
+msgid ""
+"It seems that there is already a %s directory, and\n"
+"I wonder if you are in the middle of another rebase.  If that is the\n"
+"case, please try\n"
+"\t%s\n"
+"If that is not the case, please\n"
+"\t%s\n"
+"and run me again.  I am stopping in case you still have something\n"
+"valuable there.\n"
+msgstr ""
+
+#: builtin/rebase.c:1124
+msgid "switch `C' expects a numerical value"
+msgstr ""
+
+#: builtin/rebase.c:1161
+#, c-format
+msgid "Unknown mode: %s"
+msgstr ""
+
+#: builtin/rebase.c:1183
+msgid "--strategy requires --merge or --interactive"
+msgstr ""
+
+#: builtin/rebase.c:1226
+#, c-format
+msgid ""
+"error: cannot combine interactive options (--interactive, --exec, --rebase-"
+"merges, --preserve-merges, --keep-empty, --root + --onto) with am options "
+"(%s)"
+msgstr ""
+
+#: builtin/rebase.c:1231
+#, c-format
+msgid ""
+"error: cannot combine merge options (--merge, --strategy, --strategy-option) "
+"with am options (%s)"
+msgstr ""
+
+#: builtin/rebase.c:1251 git-legacy-rebase.sh:536
+msgid "error: cannot combine '--preserve-merges' with '--rebase-merges'"
+msgstr ""
+
+#: builtin/rebase.c:1256 git-legacy-rebase.sh:542
+msgid "error: cannot combine '--rebase-merges' with '--strategy-option'"
+msgstr ""
+
+#: builtin/rebase.c:1259 git-legacy-rebase.sh:544
+msgid "error: cannot combine '--rebase-merges' with '--strategy'"
+msgstr ""
+
+#: builtin/rebase.c:1283
+#, c-format
+msgid "invalid upstream '%s'"
+msgstr ""
+
+#: builtin/rebase.c:1289
+msgid "Could not create new root commit"
+msgstr ""
+
+#: builtin/rebase.c:1307
+#, c-format
+msgid "'%s': need exactly one merge base"
+msgstr ""
+
+#: builtin/rebase.c:1314
+#, c-format
+msgid "Does not point to a valid commit '%s'"
+msgstr ""
+
+#: builtin/rebase.c:1339
+#, c-format
+msgid "fatal: no such branch/commit '%s'"
+msgstr ""
+
+#: builtin/rebase.c:1347 builtin/submodule--helper.c:37
+#: builtin/submodule--helper.c:1930
+#, c-format
+msgid "No such ref: %s"
+msgstr ""
+
+#: builtin/rebase.c:1359
+msgid "Could not resolve HEAD to a revision"
+msgstr ""
+
+#: builtin/rebase.c:1399 git-legacy-rebase.sh:665
+msgid "Cannot autostash"
+msgstr ""
+
+#: builtin/rebase.c:1402
+#, c-format
+msgid "Unexpected stash response: '%s'"
+msgstr ""
+
+#: builtin/rebase.c:1408
+#, c-format
+msgid "Could not create directory for '%s'"
+msgstr ""
+
+#: builtin/rebase.c:1411
+#, c-format
+msgid "Created autostash: %s\n"
+msgstr ""
+
+#: builtin/rebase.c:1414
+msgid "could not reset --hard"
+msgstr ""
+
+#: builtin/rebase.c:1415 builtin/reset.c:113
+#, c-format
+msgid "HEAD is now at %s"
+msgstr ""
+
+#: builtin/rebase.c:1431 git-legacy-rebase.sh:674
+msgid "Please commit or stash them."
+msgstr ""
+
+#: builtin/rebase.c:1458
+#, c-format
+msgid "could not parse '%s'"
+msgstr ""
+
+#: builtin/rebase.c:1470
+#, c-format
+msgid "could not switch to %s"
+msgstr ""
+
+#: builtin/rebase.c:1481 git-legacy-rebase.sh:697
+#, sh-format
+msgid "HEAD is up to date."
+msgstr ""
+
+#: builtin/rebase.c:1483
+#, c-format
+msgid "Current branch %s is up to date.\n"
+msgstr ""
+
+#: builtin/rebase.c:1491 git-legacy-rebase.sh:707
+#, sh-format
+msgid "HEAD is up to date, rebase forced."
+msgstr ""
+
+#: builtin/rebase.c:1493
+#, c-format
+msgid "Current branch %s is up to date, rebase forced.\n"
+msgstr ""
+
+#: builtin/rebase.c:1501 git-legacy-rebase.sh:208
+msgid "The pre-rebase hook refused to rebase."
+msgstr ""
+
+#: builtin/rebase.c:1508
+#, c-format
+msgid "Changes to %s:\n"
+msgstr ""
+
+#: builtin/rebase.c:1511
+#, c-format
+msgid "Changes from %s to %s:\n"
+msgstr ""
+
+#: builtin/rebase.c:1536
+#, c-format
+msgid "First, rewinding head to replay your work on top of it...\n"
+msgstr ""
+
+#: builtin/rebase.c:1543
+msgid "Could not detach HEAD"
+msgstr ""
+
+#: builtin/rebase.c:1552
+#, c-format
+msgid "Fast-forwarded %s to %s.\n"
+msgstr ""
+
+#: builtin/rebase--interactive.c:24
+msgid "no HEAD?"
+msgstr ""
+
+#: builtin/rebase--interactive.c:51
+#, c-format
+msgid "could not create temporary %s"
+msgstr ""
+
+#: builtin/rebase--interactive.c:57
+msgid "could not mark as interactive"
+msgstr ""
+
+#: builtin/rebase--interactive.c:101
+#, c-format
+msgid "could not open %s"
+msgstr ""
+
+#: builtin/rebase--interactive.c:114
+msgid "could not generate todo list"
+msgstr ""
+
+#: builtin/rebase--interactive.c:129
+msgid "git rebase--interactive [<options>]"
+msgstr ""
+
+#: builtin/rebase--interactive.c:148
+msgid "keep empty commits"
+msgstr ""
+
+#: builtin/rebase--interactive.c:150 builtin/revert.c:124
+msgid "allow commits with empty messages"
+msgstr ""
+
+#: builtin/rebase--interactive.c:151
+msgid "rebase merge commits"
+msgstr ""
+
+#: builtin/rebase--interactive.c:153
+msgid "keep original branch points of cousins"
+msgstr ""
+
+#: builtin/rebase--interactive.c:155
+msgid "move commits that begin with squash!/fixup!"
+msgstr ""
+
+#: builtin/rebase--interactive.c:156
+msgid "sign commits"
+msgstr ""
+
+#: builtin/rebase--interactive.c:158
+msgid "continue rebase"
+msgstr ""
+
+#: builtin/rebase--interactive.c:160
+msgid "skip commit"
+msgstr ""
+
+#: builtin/rebase--interactive.c:161
+msgid "edit the todo list"
+msgstr ""
+
+#: builtin/rebase--interactive.c:163
+msgid "show the current patch"
+msgstr ""
+
+#: builtin/rebase--interactive.c:166
+msgid "shorten commit ids in the todo list"
+msgstr ""
+
+#: builtin/rebase--interactive.c:168
+msgid "expand commit ids in the todo list"
+msgstr ""
+
+#: builtin/rebase--interactive.c:170
+msgid "check the todo list"
+msgstr ""
+
+#: builtin/rebase--interactive.c:172
+msgid "rearrange fixup/squash lines"
+msgstr ""
+
+#: builtin/rebase--interactive.c:174
+msgid "insert exec commands in todo list"
+msgstr ""
+
+#: builtin/rebase--interactive.c:175
+msgid "onto"
+msgstr ""
+
+#: builtin/rebase--interactive.c:177
+msgid "restrict-revision"
+msgstr ""
+
+#: builtin/rebase--interactive.c:177
+msgid "restrict revision"
+msgstr ""
+
+#: builtin/rebase--interactive.c:178
+msgid "squash-onto"
+msgstr ""
+
+#: builtin/rebase--interactive.c:179
+msgid "squash onto"
+msgstr ""
+
+#: builtin/rebase--interactive.c:181
+msgid "the upstream commit"
+msgstr ""
+
+#: builtin/rebase--interactive.c:182
+msgid "head-name"
+msgstr ""
+
+#: builtin/rebase--interactive.c:182
+msgid "head name"
+msgstr ""
+
+#: builtin/rebase--interactive.c:187
+msgid "rebase strategy"
+msgstr ""
+
+#: builtin/rebase--interactive.c:188
+msgid "strategy-opts"
+msgstr ""
+
+#: builtin/rebase--interactive.c:189
+msgid "strategy options"
+msgstr ""
+
+#: builtin/rebase--interactive.c:190
+msgid "switch-to"
+msgstr ""
+
+#: builtin/rebase--interactive.c:191
+msgid "the branch or commit to checkout"
+msgstr ""
+
+#: builtin/rebase--interactive.c:192
+msgid "onto-name"
+msgstr ""
+
+#: builtin/rebase--interactive.c:192
+msgid "onto name"
+msgstr ""
+
+#: builtin/rebase--interactive.c:193
+msgid "cmd"
+msgstr ""
+
+#: builtin/rebase--interactive.c:193
+msgid "the command to run"
+msgstr ""
+
+#: builtin/rebase--interactive.c:220
+msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
+msgstr ""
+
+#: builtin/rebase--interactive.c:226
+msgid "a base commit must be provided with --upstream or --onto"
+msgstr ""
+
+#: builtin/receive-pack.c:33
+msgid "git receive-pack <git-dir>"
+msgstr ""
+
+#: builtin/receive-pack.c:830
+msgid ""
+"By default, updating the current branch in a non-bare repository\n"
+"is denied, because it will make the index and work tree inconsistent\n"
+"with what you pushed, and will require 'git reset --hard' to match\n"
+"the work tree to HEAD.\n"
+"\n"
+"You can set the 'receive.denyCurrentBranch' configuration variable\n"
+"to 'ignore' or 'warn' in the remote repository to allow pushing into\n"
+"its current branch; however, this is not recommended unless you\n"
+"arranged to update its work tree to match what you pushed in some\n"
+"other way.\n"
+"\n"
+"To squelch this message and still keep the default behaviour, set\n"
+"'receive.denyCurrentBranch' configuration variable to 'refuse'."
+msgstr ""
+
+#: builtin/receive-pack.c:850
+msgid ""
+"By default, deleting the current branch is denied, because the next\n"
+"'git clone' won't result in any file checked out, causing confusion.\n"
+"\n"
+"You can set 'receive.denyDeleteCurrent' configuration variable to\n"
+"'warn' or 'ignore' in the remote repository to allow deleting the\n"
+"current branch, with or without a warning message.\n"
+"\n"
+"To squelch this message, you can set it to 'refuse'."
+msgstr ""
+
+#: builtin/receive-pack.c:1929
+msgid "quiet"
+msgstr ""
+
+#: builtin/receive-pack.c:1943
+msgid "You must specify a directory."
+msgstr ""
+
+#: builtin/reflog.c:563 builtin/reflog.c:568
+#, c-format
+msgid "'%s' is not a valid timestamp"
+msgstr ""
+
+#: builtin/remote.c:16
+msgid "git remote [-v | --verbose]"
+msgstr ""
+
+#: builtin/remote.c:17
+msgid ""
+"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
+"mirror=<fetch|push>] <name> <url>"
+msgstr ""
+
+#: builtin/remote.c:18 builtin/remote.c:38
+msgid "git remote rename <old> <new>"
+msgstr ""
+
+#: builtin/remote.c:19 builtin/remote.c:43
+msgid "git remote remove <name>"
+msgstr ""
+
+#: builtin/remote.c:20 builtin/remote.c:48
+msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
+msgstr ""
+
+#: builtin/remote.c:21
+msgid "git remote [-v | --verbose] show [-n] <name>"
+msgstr ""
+
+#: builtin/remote.c:22
+msgid "git remote prune [-n | --dry-run] <name>"
+msgstr ""
+
+#: builtin/remote.c:23
+msgid ""
+"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
+msgstr ""
+
+#: builtin/remote.c:24
+msgid "git remote set-branches [--add] <name> <branch>..."
+msgstr ""
+
+#: builtin/remote.c:25 builtin/remote.c:74
+msgid "git remote get-url [--push] [--all] <name>"
+msgstr ""
+
+#: builtin/remote.c:26 builtin/remote.c:79
+msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
+msgstr ""
+
+#: builtin/remote.c:27 builtin/remote.c:80
+msgid "git remote set-url --add <name> <newurl>"
+msgstr ""
+
+#: builtin/remote.c:28 builtin/remote.c:81
+msgid "git remote set-url --delete <name> <url>"
+msgstr ""
+
+#: builtin/remote.c:33
+msgid "git remote add [<options>] <name> <url>"
+msgstr ""
+
+#: builtin/remote.c:53
+msgid "git remote set-branches <name> <branch>..."
+msgstr ""
+
+#: builtin/remote.c:54
+msgid "git remote set-branches --add <name> <branch>..."
+msgstr ""
+
+#: builtin/remote.c:59
+msgid "git remote show [<options>] <name>"
+msgstr ""
+
+#: builtin/remote.c:64
+msgid "git remote prune [<options>] <name>"
+msgstr ""
+
+#: builtin/remote.c:69
+msgid "git remote update [<options>] [<group> | <remote>]..."
+msgstr ""
+
+#: builtin/remote.c:98
+#, c-format
+msgid "Updating %s"
+msgstr ""
+
+#: builtin/remote.c:130
+msgid ""
+"--mirror is dangerous and deprecated; please\n"
+"\t use --mirror=fetch or --mirror=push instead"
+msgstr ""
+
+#: builtin/remote.c:147
+#, c-format
+msgid "unknown mirror argument: %s"
+msgstr ""
+
+#: builtin/remote.c:163
+msgid "fetch the remote branches"
+msgstr ""
+
+#: builtin/remote.c:165
+msgid "import all tags and associated objects when fetching"
+msgstr ""
+
+#: builtin/remote.c:168
+msgid "or do not fetch any tag at all (--no-tags)"
+msgstr ""
+
+#: builtin/remote.c:170
+msgid "branch(es) to track"
+msgstr ""
+
+#: builtin/remote.c:171
+msgid "master branch"
+msgstr ""
+
+#: builtin/remote.c:173
+msgid "set up remote as a mirror to push to or fetch from"
+msgstr ""
+
+#: builtin/remote.c:185
+msgid "specifying a master branch makes no sense with --mirror"
+msgstr ""
+
+#: builtin/remote.c:187
+msgid "specifying branches to track makes sense only with fetch mirrors"
+msgstr ""
+
+#: builtin/remote.c:194 builtin/remote.c:636
+#, c-format
+msgid "remote %s already exists."
+msgstr ""
+
+#: builtin/remote.c:198 builtin/remote.c:640
+#, c-format
+msgid "'%s' is not a valid remote name"
+msgstr ""
+
+#: builtin/remote.c:238
+#, c-format
+msgid "Could not setup master '%s'"
+msgstr ""
+
+#: builtin/remote.c:344
+#, c-format
+msgid "Could not get fetch map for refspec %s"
+msgstr ""
+
+#: builtin/remote.c:443 builtin/remote.c:451
+msgid "(matching)"
+msgstr ""
+
+#: builtin/remote.c:455
+msgid "(delete)"
+msgstr ""
+
+#: builtin/remote.c:629 builtin/remote.c:765 builtin/remote.c:864
+#, c-format
+msgid "No such remote: '%s'"
+msgstr ""
+
+#: builtin/remote.c:646
+#, c-format
+msgid "Could not rename config section '%s' to '%s'"
+msgstr ""
+
+#: builtin/remote.c:666
+#, c-format
+msgid ""
+"Not updating non-default fetch refspec\n"
+"\t%s\n"
+"\tPlease update the configuration manually if necessary."
+msgstr ""
+
+#: builtin/remote.c:702
+#, c-format
+msgid "deleting '%s' failed"
+msgstr ""
+
+#: builtin/remote.c:736
+#, c-format
+msgid "creating '%s' failed"
+msgstr ""
+
+#: builtin/remote.c:802
+msgid ""
+"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
+"to delete it, use:"
+msgid_plural ""
+"Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
+"to delete them, use:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/remote.c:816
+#, c-format
+msgid "Could not remove config section '%s'"
+msgstr ""
+
+#: builtin/remote.c:917
+#, c-format
+msgid " new (next fetch will store in remotes/%s)"
+msgstr ""
+
+#: builtin/remote.c:920
+msgid " tracked"
+msgstr ""
+
+#: builtin/remote.c:922
+msgid " stale (use 'git remote prune' to remove)"
+msgstr ""
+
+#: builtin/remote.c:924
+msgid " ???"
+msgstr ""
+
+#: builtin/remote.c:965
+#, c-format
+msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
+msgstr ""
+
+#: builtin/remote.c:974
+#, c-format
+msgid "rebases interactively onto remote %s"
+msgstr ""
+
+#: builtin/remote.c:976
+#, c-format
+msgid "rebases interactively (with merges) onto remote %s"
+msgstr ""
+
+#: builtin/remote.c:979
+#, c-format
+msgid "rebases onto remote %s"
+msgstr ""
+
+#: builtin/remote.c:983
+#, c-format
+msgid " merges with remote %s"
+msgstr ""
+
+#: builtin/remote.c:986
+#, c-format
+msgid "merges with remote %s"
+msgstr ""
+
+#: builtin/remote.c:989
+#, c-format
+msgid "%-*s    and with remote %s\n"
+msgstr ""
+
+#: builtin/remote.c:1032
+msgid "create"
+msgstr ""
+
+#: builtin/remote.c:1035
+msgid "delete"
+msgstr ""
+
+#: builtin/remote.c:1039
+msgid "up to date"
+msgstr ""
+
+#: builtin/remote.c:1042
+msgid "fast-forwardable"
+msgstr ""
+
+#: builtin/remote.c:1045
+msgid "local out of date"
+msgstr ""
+
+#: builtin/remote.c:1052
+#, c-format
+msgid "    %-*s forces to %-*s (%s)"
+msgstr ""
+
+#: builtin/remote.c:1055
+#, c-format
+msgid "    %-*s pushes to %-*s (%s)"
+msgstr ""
+
+#: builtin/remote.c:1059
+#, c-format
+msgid "    %-*s forces to %s"
+msgstr ""
+
+#: builtin/remote.c:1062
+#, c-format
+msgid "    %-*s pushes to %s"
+msgstr ""
+
+#: builtin/remote.c:1130
+msgid "do not query remotes"
+msgstr ""
+
+#: builtin/remote.c:1157
+#, c-format
+msgid "* remote %s"
+msgstr ""
+
+#: builtin/remote.c:1158
+#, c-format
+msgid "  Fetch URL: %s"
+msgstr ""
+
+#: builtin/remote.c:1159 builtin/remote.c:1175 builtin/remote.c:1314
+msgid "(no URL)"
+msgstr ""
+
+#. TRANSLATORS: the colon ':' should align
+#. with the one in " Fetch URL: %s"
+#. translation.
+#.
+#: builtin/remote.c:1173 builtin/remote.c:1175
+#, c-format
+msgid "  Push  URL: %s"
+msgstr ""
+
+#: builtin/remote.c:1177 builtin/remote.c:1179 builtin/remote.c:1181
+#, c-format
+msgid "  HEAD branch: %s"
+msgstr ""
+
+#: builtin/remote.c:1177
+msgid "(not queried)"
+msgstr ""
+
+#: builtin/remote.c:1179
+msgid "(unknown)"
+msgstr ""
+
+#: builtin/remote.c:1183
+#, c-format
+msgid ""
+"  HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
+msgstr ""
+
+#: builtin/remote.c:1195
+#, c-format
+msgid "  Remote branch:%s"
+msgid_plural "  Remote branches:%s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/remote.c:1198 builtin/remote.c:1224
+msgid " (status not queried)"
+msgstr ""
+
+#: builtin/remote.c:1207
+msgid "  Local branch configured for 'git pull':"
+msgid_plural "  Local branches configured for 'git pull':"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/remote.c:1215
+msgid "  Local refs will be mirrored by 'git push'"
+msgstr ""
+
+#: builtin/remote.c:1221
+#, 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:1242
+msgid "set refs/remotes/<name>/HEAD according to remote"
+msgstr ""
+
+#: builtin/remote.c:1244
+msgid "delete refs/remotes/<name>/HEAD"
+msgstr ""
+
+#: builtin/remote.c:1259
+msgid "Cannot determine remote HEAD"
+msgstr ""
+
+#: builtin/remote.c:1261
+msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
+msgstr ""
+
+#: builtin/remote.c:1271
+#, c-format
+msgid "Could not delete %s"
+msgstr ""
+
+#: builtin/remote.c:1279
+#, c-format
+msgid "Not a valid ref: %s"
+msgstr ""
+
+#: builtin/remote.c:1281
+#, c-format
+msgid "Could not setup %s"
+msgstr ""
+
+#: builtin/remote.c:1299
+#, c-format
+msgid " %s will become dangling!"
+msgstr ""
+
+#: builtin/remote.c:1300
+#, c-format
+msgid " %s has become dangling!"
+msgstr ""
+
+#: builtin/remote.c:1310
+#, c-format
+msgid "Pruning %s"
+msgstr ""
+
+#: builtin/remote.c:1311
+#, c-format
+msgid "URL: %s"
+msgstr ""
+
+#: builtin/remote.c:1327
+#, c-format
+msgid " * [would prune] %s"
+msgstr ""
+
+#: builtin/remote.c:1330
+#, c-format
+msgid " * [pruned] %s"
+msgstr ""
+
+#: builtin/remote.c:1375
+msgid "prune remotes after fetching"
+msgstr ""
+
+#: builtin/remote.c:1438 builtin/remote.c:1492 builtin/remote.c:1560
+#, c-format
+msgid "No such remote '%s'"
+msgstr ""
+
+#: builtin/remote.c:1454
+msgid "add branch"
+msgstr ""
+
+#: builtin/remote.c:1461
+msgid "no remote specified"
+msgstr ""
+
+#: builtin/remote.c:1478
+msgid "query push URLs rather than fetch URLs"
+msgstr ""
+
+#: builtin/remote.c:1480
+msgid "return all URLs"
+msgstr ""
+
+#: builtin/remote.c:1508
+#, c-format
+msgid "no URLs configured for remote '%s'"
+msgstr ""
+
+#: builtin/remote.c:1534
+msgid "manipulate push URLs"
+msgstr ""
+
+#: builtin/remote.c:1536
+msgid "add URL"
+msgstr ""
+
+#: builtin/remote.c:1538
+msgid "delete URLs"
+msgstr ""
+
+#: builtin/remote.c:1545
+msgid "--add --delete doesn't make sense"
+msgstr ""
+
+#: builtin/remote.c:1584
+#, c-format
+msgid "Invalid old URL pattern: %s"
+msgstr ""
+
+#: builtin/remote.c:1592
+#, c-format
+msgid "No such URL found: %s"
+msgstr ""
+
+#: builtin/remote.c:1594
+msgid "Will not delete all non-push URLs"
+msgstr ""
+
+#: builtin/remote.c:1610
+msgid "be verbose; must be placed before a subcommand"
+msgstr ""
+
+#: builtin/remote.c:1641
+#, c-format
+msgid "Unknown subcommand: %s"
+msgstr ""
+
+#: builtin/repack.c:22
+msgid "git repack [<options>]"
+msgstr ""
+
+#: builtin/repack.c:27
+msgid ""
+"Incremental repacks are incompatible with bitmap indexes.  Use\n"
+"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
+msgstr ""
+
+#: builtin/repack.c:294
+msgid "pack everything in a single pack"
+msgstr ""
+
+#: builtin/repack.c:296
+msgid "same as -a, and turn unreachable objects loose"
+msgstr ""
+
+#: builtin/repack.c:299
+msgid "remove redundant packs, and run git-prune-packed"
+msgstr ""
+
+#: builtin/repack.c:301
+msgid "pass --no-reuse-delta to git-pack-objects"
+msgstr ""
+
+#: builtin/repack.c:303
+msgid "pass --no-reuse-object to git-pack-objects"
+msgstr ""
+
+#: builtin/repack.c:305
+msgid "do not run git-update-server-info"
+msgstr ""
+
+#: builtin/repack.c:308
+msgid "pass --local to git-pack-objects"
+msgstr ""
+
+#: builtin/repack.c:310
+msgid "write bitmap index"
+msgstr ""
+
+#: builtin/repack.c:312
+msgid "pass --delta-islands to git-pack-objects"
+msgstr ""
+
+#: builtin/repack.c:313
+msgid "approxidate"
+msgstr ""
+
+#: builtin/repack.c:314
+msgid "with -A, do not loosen objects older than this"
+msgstr ""
+
+#: builtin/repack.c:316
+msgid "with -a, repack unreachable objects"
+msgstr ""
+
+#: builtin/repack.c:318
+msgid "size of the window used for delta compression"
+msgstr ""
+
+#: builtin/repack.c:319 builtin/repack.c:325
+msgid "bytes"
+msgstr ""
+
+#: builtin/repack.c:320
+msgid "same as the above, but limit memory size instead of entries count"
+msgstr ""
+
+#: builtin/repack.c:322
+msgid "limits the maximum delta depth"
+msgstr ""
+
+#: builtin/repack.c:324
+msgid "limits the maximum number of threads"
+msgstr ""
+
+#: builtin/repack.c:326
+msgid "maximum size of each packfile"
+msgstr ""
+
+#: builtin/repack.c:328
+msgid "repack objects in packs marked with .keep"
+msgstr ""
+
+#: builtin/repack.c:330
+msgid "do not repack this pack"
+msgstr ""
+
+#: builtin/repack.c:340
+msgid "cannot delete packs in a precious-objects repo"
+msgstr ""
+
+#: builtin/repack.c:344
+msgid "--keep-unreachable and -A are incompatible"
+msgstr ""
+
+#: builtin/repack.c:527
+#, c-format
+msgid "failed to remove '%s'"
+msgstr ""
+
+#: builtin/replace.c:22
+msgid "git replace [-f] <object> <replacement>"
+msgstr ""
+
+#: builtin/replace.c:23
+msgid "git replace [-f] --edit <object>"
+msgstr ""
+
+#: builtin/replace.c:24
+msgid "git replace [-f] --graft <commit> [<parent>...]"
+msgstr ""
+
+#: builtin/replace.c:25
+msgid "git replace [-f] --convert-graft-file"
+msgstr ""
+
+#: builtin/replace.c:26
+msgid "git replace -d <object>..."
+msgstr ""
+
+#: builtin/replace.c:27
+msgid "git replace [--format=<format>] [-l [<pattern>]]"
+msgstr ""
+
+#: builtin/replace.c:58 builtin/replace.c:203 builtin/replace.c:206
+#, c-format
+msgid "failed to resolve '%s' as a valid ref"
+msgstr ""
+
+#: builtin/replace.c:86
+#, c-format
+msgid ""
+"invalid replace format '%s'\n"
+"valid formats are 'short', 'medium' and 'long'"
+msgstr ""
+
+#: builtin/replace.c:121
+#, c-format
+msgid "replace ref '%s' not found"
+msgstr ""
+
+#: builtin/replace.c:137
+#, c-format
+msgid "Deleted replace ref '%s'"
+msgstr ""
+
+#: builtin/replace.c:149
+#, c-format
+msgid "'%s' is not a valid ref name"
+msgstr ""
+
+#: builtin/replace.c:154
+#, c-format
+msgid "replace ref '%s' already exists"
+msgstr ""
+
+#: builtin/replace.c:174
+#, c-format
+msgid ""
+"Objects must be of the same type.\n"
+"'%s' points to a replaced object of type '%s'\n"
+"while '%s' points to a replacement object of type '%s'."
+msgstr ""
+
+#: builtin/replace.c:225
+#, c-format
+msgid "unable to open %s for writing"
+msgstr ""
+
+#: builtin/replace.c:238
+msgid "cat-file reported failure"
+msgstr ""
+
+#: builtin/replace.c:254
+#, c-format
+msgid "unable to open %s for reading"
+msgstr ""
+
+#: builtin/replace.c:268
+msgid "unable to spawn mktree"
+msgstr ""
+
+#: builtin/replace.c:272
+msgid "unable to read from mktree"
+msgstr ""
+
+#: builtin/replace.c:281
+msgid "mktree reported failure"
+msgstr ""
+
+#: builtin/replace.c:285
+msgid "mktree did not return an object name"
+msgstr ""
+
+#: builtin/replace.c:294
+#, c-format
+msgid "unable to fstat %s"
+msgstr ""
+
+#: builtin/replace.c:299
+msgid "unable to write object to database"
+msgstr ""
+
+#: builtin/replace.c:318 builtin/replace.c:371 builtin/replace.c:415
+#: builtin/replace.c:445
+#, c-format
+msgid "not a valid object name: '%s'"
+msgstr ""
+
+#: builtin/replace.c:322
+#, c-format
+msgid "unable to get object type for %s"
+msgstr ""
+
+#: builtin/replace.c:338
+msgid "editing object file failed"
+msgstr ""
+
+#: builtin/replace.c:347
+#, c-format
+msgid "new object is the same as the old one: '%s'"
+msgstr ""
+
+#: builtin/replace.c:407
+#, c-format
+msgid "bad mergetag in commit '%s'"
+msgstr ""
+
+#: builtin/replace.c:409
+#, c-format
+msgid "malformed mergetag in commit '%s'"
+msgstr ""
+
+#: builtin/replace.c:421
+#, c-format
+msgid ""
+"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
+"instead of --graft"
+msgstr ""
+
+#: builtin/replace.c:460
+#, c-format
+msgid "the original commit '%s' has a gpg signature"
+msgstr ""
+
+#: builtin/replace.c:461
+msgid "the signature will be removed in the replacement commit!"
+msgstr ""
+
+#: builtin/replace.c:471
+#, c-format
+msgid "could not write replacement commit for: '%s'"
+msgstr ""
+
+#: builtin/replace.c:479
+#, c-format
+msgid "graft for '%s' unnecessary"
+msgstr ""
+
+#: builtin/replace.c:482
+#, c-format
+msgid "new commit is the same as the old one: '%s'"
+msgstr ""
+
+#: builtin/replace.c:515
+#, c-format
+msgid ""
+"could not convert the following graft(s):\n"
+"%s"
+msgstr ""
+
+#: builtin/replace.c:536
+msgid "list replace refs"
+msgstr ""
+
+#: builtin/replace.c:537
+msgid "delete replace refs"
+msgstr ""
+
+#: builtin/replace.c:538
+msgid "edit existing object"
+msgstr ""
+
+#: builtin/replace.c:539
+msgid "change a commit's parents"
+msgstr ""
+
+#: builtin/replace.c:540
+msgid "convert existing graft file"
+msgstr ""
+
+#: builtin/replace.c:541
+msgid "replace the ref if it exists"
+msgstr ""
+
+#: builtin/replace.c:543
+msgid "do not pretty-print contents for --edit"
+msgstr ""
+
+#: builtin/replace.c:544
+msgid "use this format"
+msgstr ""
+
+#: builtin/replace.c:557
+msgid "--format cannot be used when not listing"
+msgstr ""
+
+#: builtin/replace.c:565
+msgid "-f only makes sense when writing a replacement"
+msgstr ""
+
+#: builtin/replace.c:569
+msgid "--raw only makes sense with --edit"
+msgstr ""
+
+#: builtin/replace.c:575
+msgid "-d needs at least one argument"
+msgstr ""
+
+#: builtin/replace.c:581
+msgid "bad number of arguments"
+msgstr ""
+
+#: builtin/replace.c:587
+msgid "-e needs exactly one argument"
+msgstr ""
+
+#: builtin/replace.c:593
+msgid "-g needs at least one argument"
+msgstr ""
+
+#: builtin/replace.c:599
+msgid "--convert-graft-file takes no argument"
+msgstr ""
+
+#: builtin/replace.c:605
+msgid "only one pattern can be given with -l"
+msgstr ""
+
+#: builtin/rerere.c:13
+msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
+msgstr ""
+
+#: builtin/rerere.c:60
+msgid "register clean resolutions in index"
+msgstr ""
+
+#: builtin/rerere.c:79
+msgid "'git rerere forget' without paths is deprecated"
+msgstr ""
+
+#: builtin/rerere.c:111
+#, c-format
+msgid "unable to generate diff for '%s'"
+msgstr ""
+
+#: builtin/reset.c:31
+msgid ""
+"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
+msgstr ""
+
+#: builtin/reset.c:32
+msgid "git reset [-q] [<tree-ish>] [--] <paths>..."
+msgstr ""
+
+#: builtin/reset.c:33
+msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
+msgstr ""
+
+#: builtin/reset.c:39
+msgid "mixed"
+msgstr ""
+
+#: builtin/reset.c:39
+msgid "soft"
+msgstr ""
+
+#: builtin/reset.c:39
+msgid "hard"
+msgstr ""
+
+#: builtin/reset.c:39
+msgid "merge"
+msgstr ""
+
+#: builtin/reset.c:39
+msgid "keep"
+msgstr ""
+
+#: builtin/reset.c:80
+msgid "You do not have a valid HEAD."
+msgstr ""
+
+#: builtin/reset.c:82
+msgid "Failed to find tree of HEAD."
+msgstr ""
+
+#: builtin/reset.c:88
+#, c-format
+msgid "Failed to find tree of %s."
+msgstr ""
+
+#: builtin/reset.c:192
+#, c-format
+msgid "Cannot do a %s reset in the middle of a merge."
+msgstr ""
+
+#: builtin/reset.c:292
+msgid "be quiet, only report errors"
+msgstr ""
+
+#: builtin/reset.c:294
+msgid "reset HEAD and index"
+msgstr ""
+
+#: builtin/reset.c:295
+msgid "reset only HEAD"
+msgstr ""
+
+#: builtin/reset.c:297 builtin/reset.c:299
+msgid "reset HEAD, index and working tree"
+msgstr ""
+
+#: builtin/reset.c:301
+msgid "reset HEAD but keep local changes"
+msgstr ""
+
+#: builtin/reset.c:307
+msgid "record only the fact that removed paths will be added later"
+msgstr ""
+
+#: builtin/reset.c:325
+#, c-format
+msgid "Failed to resolve '%s' as a valid revision."
+msgstr ""
+
+#: builtin/reset.c:333
+#, c-format
+msgid "Failed to resolve '%s' as a valid tree."
+msgstr ""
+
+#: builtin/reset.c:342
+msgid "--patch is incompatible with --{hard,mixed,soft}"
+msgstr ""
+
+#: builtin/reset.c:351
+msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
+msgstr ""
+
+#: builtin/reset.c:353
+#, c-format
+msgid "Cannot do %s reset with paths."
+msgstr ""
+
+#: builtin/reset.c:363
+#, c-format
+msgid "%s reset is not allowed in a bare repository"
+msgstr ""
+
+#: builtin/reset.c:367
+msgid "-N can only be used with --mixed"
+msgstr ""
+
+#: builtin/reset.c:387
+msgid "Unstaged changes after reset:"
+msgstr ""
+
+#: builtin/reset.c:390
+#, c-format
+msgid ""
+"\n"
+"It took %.2f seconds to enumerate unstaged changes after reset.  You can\n"
+"use '--quiet' to avoid this.  Set the config setting reset.quiet to true\n"
+"to make this the default.\n"
+msgstr ""
+
+#: builtin/reset.c:400
+#, c-format
+msgid "Could not reset index file to revision '%s'."
+msgstr ""
+
+#: builtin/reset.c:404
+msgid "Could not write new index file."
+msgstr ""
+
+#: builtin/rev-list.c:403
+msgid "cannot combine --exclude-promisor-objects and --missing"
+msgstr ""
+
+#: builtin/rev-list.c:461
+msgid "object filtering requires --objects"
+msgstr ""
+
+#: builtin/rev-list.c:464
+#, c-format
+msgid "invalid sparse value '%s'"
+msgstr ""
+
+#: builtin/rev-list.c:505
+msgid "rev-list does not support display of notes"
+msgstr ""
+
+#: builtin/rev-list.c:508
+msgid "cannot combine --use-bitmap-index with object filtering"
+msgstr ""
+
+#: builtin/rev-parse.c:407
+msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
+msgstr ""
+
+#: builtin/rev-parse.c:412
+msgid "keep the `--` passed as an arg"
+msgstr ""
+
+#: builtin/rev-parse.c:414
+msgid "stop parsing after the first non-option argument"
+msgstr ""
+
+#: builtin/rev-parse.c:417
+msgid "output in stuck long form"
+msgstr ""
+
+#: builtin/rev-parse.c:550
+msgid ""
+"git rev-parse --parseopt [<options>] -- [<args>...]\n"
+"   or: git rev-parse --sq-quote [<arg>...]\n"
+"   or: git rev-parse [<options>] [<arg>...]\n"
+"\n"
+"Run \"git rev-parse --parseopt -h\" for more information on the first usage."
+msgstr ""
+
+#: builtin/revert.c:24
+msgid "git revert [<options>] <commit-ish>..."
+msgstr ""
+
+#: builtin/revert.c:25
+msgid "git revert <subcommand>"
+msgstr ""
+
+#: builtin/revert.c:30
+msgid "git cherry-pick [<options>] <commit-ish>..."
+msgstr ""
+
+#: builtin/revert.c:31
+msgid "git cherry-pick <subcommand>"
+msgstr ""
+
+#: builtin/revert.c:91
+#, c-format
+msgid "%s: %s cannot be used with %s"
+msgstr ""
+
+#: builtin/revert.c:100
+msgid "end revert or cherry-pick sequence"
+msgstr ""
+
+#: builtin/revert.c:101
+msgid "resume revert or cherry-pick sequence"
+msgstr ""
+
+#: builtin/revert.c:102
+msgid "cancel revert or cherry-pick sequence"
+msgstr ""
+
+#: builtin/revert.c:103
+msgid "don't automatically commit"
+msgstr ""
+
+#: builtin/revert.c:104
+msgid "edit the commit message"
+msgstr ""
+
+#: builtin/revert.c:107
+msgid "parent-number"
+msgstr ""
+
+#: builtin/revert.c:108
+msgid "select mainline parent"
+msgstr ""
+
+#: builtin/revert.c:110
+msgid "merge strategy"
+msgstr ""
+
+#: builtin/revert.c:112
+msgid "option for merge strategy"
+msgstr ""
+
+#: builtin/revert.c:121
+msgid "append commit name"
+msgstr ""
+
+#: builtin/revert.c:123
+msgid "preserve initially empty commits"
+msgstr ""
+
+#: builtin/revert.c:125
+msgid "keep redundant, empty commits"
+msgstr ""
+
+#: builtin/revert.c:219
+msgid "revert failed"
+msgstr ""
+
+#: builtin/revert.c:232
+msgid "cherry-pick failed"
+msgstr ""
+
+#: builtin/rm.c:18
+msgid "git rm [<options>] [--] <file>..."
+msgstr ""
+
+#: builtin/rm.c:206
+msgid ""
+"the following file has staged content different from both the\n"
+"file and the HEAD:"
+msgid_plural ""
+"the following files have staged content different from both the\n"
+"file and the HEAD:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/rm.c:211
+msgid ""
+"\n"
+"(use -f to force removal)"
+msgstr ""
+
+#: builtin/rm.c:215
+msgid "the following file has changes staged in the index:"
+msgid_plural "the following files have changes staged in the index:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/rm.c:219 builtin/rm.c:228
+msgid ""
+"\n"
+"(use --cached to keep the file, or -f to force removal)"
+msgstr ""
+
+#: builtin/rm.c:225
+msgid "the following file has local modifications:"
+msgid_plural "the following files have local modifications:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/rm.c:241
+msgid "do not list removed files"
+msgstr ""
+
+#: builtin/rm.c:242
+msgid "only remove from the index"
+msgstr ""
+
+#: builtin/rm.c:243
+msgid "override the up-to-date check"
+msgstr ""
+
+#: builtin/rm.c:244
+msgid "allow recursive removal"
+msgstr ""
+
+#: builtin/rm.c:246
+msgid "exit with a zero status even if nothing matched"
+msgstr ""
+
+#: builtin/rm.c:288
+msgid "please stage your changes to .gitmodules or stash them to proceed"
+msgstr ""
+
+#: builtin/rm.c:306
+#, c-format
+msgid "not removing '%s' recursively without -r"
+msgstr ""
+
+#: builtin/rm.c:345
+#, c-format
+msgid "git rm: unable to remove %s"
+msgstr ""
+
+#: builtin/send-pack.c:20
+msgid ""
+"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
+"receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
+"[<ref>...]\n"
+"  --all and explicit <ref> specification are mutually exclusive."
+msgstr ""
+
+#: builtin/send-pack.c:163
+msgid "remote name"
+msgstr ""
+
+#: builtin/send-pack.c:177
+msgid "use stateless RPC protocol"
+msgstr ""
+
+#: builtin/send-pack.c:178
+msgid "read refs from stdin"
+msgstr ""
+
+#: builtin/send-pack.c:179
+msgid "print status from remote helper"
+msgstr ""
+
+#: builtin/serve.c:7
+msgid "git serve [<options>]"
+msgstr ""
+
+#: builtin/serve.c:17 builtin/upload-pack.c:23
+msgid "quit after a single request/response exchange"
+msgstr ""
+
+#: builtin/serve.c:19
+msgid "exit immediately after advertising capabilities"
+msgstr ""
+
+#: builtin/shortlog.c:14
+msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]"
+msgstr ""
+
+#: builtin/shortlog.c:15
+msgid "git log --pretty=short | git shortlog [<options>]"
+msgstr ""
+
+#: builtin/shortlog.c:264
+msgid "Group by committer rather than author"
+msgstr ""
+
+#: builtin/shortlog.c:266
+msgid "sort output according to the number of commits per author"
+msgstr ""
+
+#: builtin/shortlog.c:268
+msgid "Suppress commit descriptions, only provides commit count"
+msgstr ""
+
+#: builtin/shortlog.c:270
+msgid "Show the email address of each author"
+msgstr ""
+
+#: builtin/shortlog.c:271
+msgid "<w>[,<i1>[,<i2>]]"
+msgstr ""
+
+#: builtin/shortlog.c:272
+msgid "Linewrap output"
+msgstr ""
+
+#: builtin/shortlog.c:299
+msgid "too many arguments given outside repository"
+msgstr ""
+
+#: builtin/show-branch.c:13
+msgid ""
+"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
+"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
+"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
+"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
+msgstr ""
+
+#: builtin/show-branch.c:17
+msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
+msgstr ""
+
+#: builtin/show-branch.c:395
+#, c-format
+msgid "ignoring %s; cannot handle more than %d ref"
+msgid_plural "ignoring %s; cannot handle more than %d refs"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/show-branch.c:549
+#, c-format
+msgid "no matching refs with %s"
+msgstr ""
+
+#: builtin/show-branch.c:646
+msgid "show remote-tracking and local branches"
+msgstr ""
+
+#: builtin/show-branch.c:648
+msgid "show remote-tracking branches"
+msgstr ""
+
+#: builtin/show-branch.c:650
+msgid "color '*!+-' corresponding to the branch"
+msgstr ""
+
+#: builtin/show-branch.c:652
+msgid "show <n> more commits after the common ancestor"
+msgstr ""
+
+#: builtin/show-branch.c:654
+msgid "synonym to more=-1"
+msgstr ""
+
+#: builtin/show-branch.c:655
+msgid "suppress naming strings"
+msgstr ""
+
+#: builtin/show-branch.c:657
+msgid "include the current branch"
+msgstr ""
+
+#: builtin/show-branch.c:659
+msgid "name commits with their object names"
+msgstr ""
+
+#: builtin/show-branch.c:661
+msgid "show possible merge bases"
+msgstr ""
+
+#: builtin/show-branch.c:663
+msgid "show refs unreachable from any other ref"
+msgstr ""
+
+#: builtin/show-branch.c:665
+msgid "show commits in topological order"
+msgstr ""
+
+#: builtin/show-branch.c:668
+msgid "show only commits not on the first branch"
+msgstr ""
+
+#: builtin/show-branch.c:670
+msgid "show merges reachable from only one tip"
+msgstr ""
+
+#: builtin/show-branch.c:672
+msgid "topologically sort, maintaining date order where possible"
+msgstr ""
+
+#: builtin/show-branch.c:675
+msgid "<n>[,<base>]"
+msgstr ""
+
+#: builtin/show-branch.c:676
+msgid "show <n> most recent ref-log entries starting at base"
+msgstr ""
+
+#: builtin/show-branch.c:712
+msgid ""
+"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
+msgstr ""
+
+#: builtin/show-branch.c:736
+msgid "no branches given, and HEAD is not valid"
+msgstr ""
+
+#: builtin/show-branch.c:739
+msgid "--reflog option needs one branch name"
+msgstr ""
+
+#: builtin/show-branch.c:742
+#, c-format
+msgid "only %d entry can be shown at one time."
+msgid_plural "only %d entries can be shown at one time."
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/show-branch.c:746
+#, c-format
+msgid "no such ref %s"
+msgstr ""
+
+#: builtin/show-branch.c:830
+#, c-format
+msgid "cannot handle more than %d rev."
+msgid_plural "cannot handle more than %d revs."
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/show-branch.c:834
+#, c-format
+msgid "'%s' is not a valid ref."
+msgstr ""
+
+#: builtin/show-branch.c:837
+#, c-format
+msgid "cannot find commit %s (%s)"
+msgstr ""
+
+#: builtin/show-ref.c:11
+msgid ""
+"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
+"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
+msgstr ""
+
+#: builtin/show-ref.c:12
+msgid "git show-ref --exclude-existing[=<pattern>]"
+msgstr ""
+
+#: builtin/show-ref.c:161
+msgid "only show tags (can be combined with heads)"
+msgstr ""
+
+#: builtin/show-ref.c:162
+msgid "only show heads (can be combined with tags)"
+msgstr ""
+
+#: builtin/show-ref.c:163
+msgid "stricter reference checking, requires exact ref path"
+msgstr ""
+
+#: builtin/show-ref.c:166 builtin/show-ref.c:168
+msgid "show the HEAD reference, even if it would be filtered out"
+msgstr ""
+
+#: builtin/show-ref.c:170
+msgid "dereference tags into object IDs"
+msgstr ""
+
+#: builtin/show-ref.c:172
+msgid "only show SHA1 hash using <n> digits"
+msgstr ""
+
+#: builtin/show-ref.c:176
+msgid "do not print results to stdout (useful with --verify)"
+msgstr ""
+
+#: builtin/show-ref.c:178
+msgid "show refs from stdin that aren't in local repository"
+msgstr ""
+
+#: builtin/stripspace.c:18
+msgid "git stripspace [-s | --strip-comments]"
+msgstr ""
+
+#: builtin/stripspace.c:19
+msgid "git stripspace [-c | --comment-lines]"
+msgstr ""
+
+#: builtin/stripspace.c:36
+msgid "skip and remove all lines starting with comment character"
+msgstr ""
+
+#: builtin/stripspace.c:39
+msgid "prepend comment character and space to each line"
+msgstr ""
+
+#: builtin/submodule--helper.c:44 builtin/submodule--helper.c:1939
+#, c-format
+msgid "Expecting a full ref name, got %s"
+msgstr ""
+
+#: builtin/submodule--helper.c:61
+msgid "submodule--helper print-default-remote takes no arguments"
+msgstr ""
+
+#: builtin/submodule--helper.c:99
+#, c-format
+msgid "cannot strip one component off url '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:407 builtin/submodule--helper.c:1363
+msgid "alternative anchor for relative paths"
+msgstr ""
+
+#: builtin/submodule--helper.c:412
+msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
+msgstr ""
+
+#: builtin/submodule--helper.c:469 builtin/submodule--helper.c:626
+#: builtin/submodule--helper.c:649
+#, c-format
+msgid "No url found for submodule path '%s' in .gitmodules"
+msgstr ""
+
+#: builtin/submodule--helper.c:521
+#, c-format
+msgid "Entering '%s'\n"
+msgstr ""
+
+#: builtin/submodule--helper.c:524
+#, c-format
+msgid ""
+"run_command returned non-zero status for %s\n"
+"."
+msgstr ""
+
+#: builtin/submodule--helper.c:545
+#, c-format
+msgid ""
+"run_command returned non-zero status while recursing in the nested "
+"submodules of %s\n"
+"."
+msgstr ""
+
+#: builtin/submodule--helper.c:561
+msgid "Suppress output of entering each submodule command"
+msgstr ""
+
+#: builtin/submodule--helper.c:563 builtin/submodule--helper.c:1048
+msgid "Recurse into nested submodules"
+msgstr ""
+
+#: builtin/submodule--helper.c:568
+msgid "git submodule--helper foreach [--quiet] [--recursive] <command>"
+msgstr ""
+
+#: builtin/submodule--helper.c:595
+#, c-format
+msgid ""
+"could not look up configuration '%s'. Assuming this repository is its own "
+"authoritative upstream."
+msgstr ""
+
+#: builtin/submodule--helper.c:663
+#, c-format
+msgid "Failed to register url for submodule path '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:667
+#, c-format
+msgid "Submodule '%s' (%s) registered for path '%s'\n"
+msgstr ""
+
+#: builtin/submodule--helper.c:677
+#, c-format
+msgid "warning: command update mode suggested for submodule '%s'\n"
+msgstr ""
+
+#: builtin/submodule--helper.c:684
+#, c-format
+msgid "Failed to register update mode for submodule path '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:706
+msgid "Suppress output for initializing a submodule"
+msgstr ""
+
+#: builtin/submodule--helper.c:711
+msgid "git submodule--helper init [<path>]"
+msgstr ""
+
+#: builtin/submodule--helper.c:783 builtin/submodule--helper.c:909
+#, c-format
+msgid "no submodule mapping found in .gitmodules for path '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:822
+#, c-format
+msgid "could not resolve HEAD ref inside the submodule '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:849 builtin/submodule--helper.c:1018
+#, c-format
+msgid "failed to recurse into submodule '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:873 builtin/submodule--helper.c:1182
+msgid "Suppress submodule status output"
+msgstr ""
+
+#: builtin/submodule--helper.c:874
+msgid ""
+"Use commit stored in the index instead of the one stored in the submodule "
+"HEAD"
+msgstr ""
+
+#: builtin/submodule--helper.c:875
+msgid "recurse into nested submodules"
+msgstr ""
+
+#: builtin/submodule--helper.c:880
+msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
+msgstr ""
+
+#: builtin/submodule--helper.c:904
+msgid "git submodule--helper name <path>"
+msgstr ""
+
+#: builtin/submodule--helper.c:968
+#, c-format
+msgid "Synchronizing submodule url for '%s'\n"
+msgstr ""
+
+#: builtin/submodule--helper.c:974
+#, c-format
+msgid "failed to register url for submodule path '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:988
+#, c-format
+msgid "failed to get the default remote for submodule '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:999
+#, c-format
+msgid "failed to update remote for submodule '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:1046
+msgid "Suppress output of synchronizing submodule url"
+msgstr ""
+
+#: builtin/submodule--helper.c:1053
+msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
+msgstr ""
+
+#: builtin/submodule--helper.c:1107
+#, c-format
+msgid ""
+"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
+"really want to remove it including all of its history)"
+msgstr ""
+
+#: builtin/submodule--helper.c:1119
+#, c-format
+msgid ""
+"Submodule work tree '%s' contains local modifications; use '-f' to discard "
+"them"
+msgstr ""
+
+#: builtin/submodule--helper.c:1127
+#, c-format
+msgid "Cleared directory '%s'\n"
+msgstr ""
+
+#: builtin/submodule--helper.c:1129
+#, c-format
+msgid "Could not remove submodule work tree '%s'\n"
+msgstr ""
+
+#: builtin/submodule--helper.c:1138
+#, c-format
+msgid "could not create empty submodule directory %s"
+msgstr ""
+
+#: builtin/submodule--helper.c:1154
+#, c-format
+msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
+msgstr ""
+
+#: builtin/submodule--helper.c:1183
+msgid "Remove submodule working trees even if they contain local changes"
+msgstr ""
+
+#: builtin/submodule--helper.c:1184
+msgid "Unregister all submodules"
+msgstr ""
+
+#: builtin/submodule--helper.c:1189
+msgid ""
+"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
+msgstr ""
+
+#: builtin/submodule--helper.c:1203
+msgid "Use '--all' if you really want to deinitialize all submodules"
+msgstr ""
+
+#: builtin/submodule--helper.c:1297 builtin/submodule--helper.c:1300
+#, c-format
+msgid "submodule '%s' cannot add alternate: %s"
+msgstr ""
+
+#: builtin/submodule--helper.c:1336
+#, c-format
+msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
+msgstr ""
+
+#: builtin/submodule--helper.c:1343
+#, c-format
+msgid "Value '%s' for submodule.alternateLocation is not recognized"
+msgstr ""
+
+#: builtin/submodule--helper.c:1366
+msgid "where the new submodule will be cloned to"
+msgstr ""
+
+#: builtin/submodule--helper.c:1369
+msgid "name of the new submodule"
+msgstr ""
+
+#: builtin/submodule--helper.c:1372
+msgid "url where to clone the submodule from"
+msgstr ""
+
+#: builtin/submodule--helper.c:1380
+msgid "depth for shallow clones"
+msgstr ""
+
+#: builtin/submodule--helper.c:1383 builtin/submodule--helper.c:1868
+msgid "force cloning progress"
+msgstr ""
+
+#: builtin/submodule--helper.c:1388
+msgid ""
+"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
+"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
+msgstr ""
+
+#: builtin/submodule--helper.c:1419
+#, c-format
+msgid "clone of '%s' into submodule path '%s' failed"
+msgstr ""
+
+#: builtin/submodule--helper.c:1433
+#, c-format
+msgid "could not get submodule directory for '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:1469
+#, c-format
+msgid "Invalid update mode '%s' for submodule path '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:1473
+#, c-format
+msgid "Invalid update mode '%s' configured for submodule path '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:1566
+#, c-format
+msgid "Submodule path '%s' not initialized"
+msgstr ""
+
+#: builtin/submodule--helper.c:1570
+msgid "Maybe you want to use 'update --init'?"
+msgstr ""
+
+#: builtin/submodule--helper.c:1600
+#, c-format
+msgid "Skipping unmerged submodule %s"
+msgstr ""
+
+#: builtin/submodule--helper.c:1629
+#, c-format
+msgid "Skipping submodule '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:1773
+#, c-format
+msgid "Failed to clone '%s'. Retry scheduled"
+msgstr ""
+
+#: builtin/submodule--helper.c:1784
+#, c-format
+msgid "Failed to clone '%s' a second time, aborting"
+msgstr ""
+
+#: builtin/submodule--helper.c:1847 builtin/submodule--helper.c:2089
+msgid "path into the working tree"
+msgstr ""
+
+#: builtin/submodule--helper.c:1850
+msgid "path into the working tree, across nested submodule boundaries"
+msgstr ""
+
+#: builtin/submodule--helper.c:1854
+msgid "rebase, merge, checkout or none"
+msgstr ""
+
+#: builtin/submodule--helper.c:1860
+msgid "Create a shallow clone truncated to the specified number of revisions"
+msgstr ""
+
+#: builtin/submodule--helper.c:1863
+msgid "parallel jobs"
+msgstr ""
+
+#: builtin/submodule--helper.c:1865
+msgid "whether the initial clone should follow the shallow recommendation"
+msgstr ""
+
+#: builtin/submodule--helper.c:1866
+msgid "don't print cloning progress"
+msgstr ""
+
+#: builtin/submodule--helper.c:1873
+msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
+msgstr ""
+
+#: builtin/submodule--helper.c:1886
+msgid "bad value for update parameter"
+msgstr ""
+
+#: builtin/submodule--helper.c:1934
+#, c-format
+msgid ""
+"Submodule (%s) branch configured to inherit branch from superproject, but "
+"the superproject is not on any branch"
+msgstr ""
+
+#: builtin/submodule--helper.c:2057
+#, c-format
+msgid "could not get a repository handle for submodule '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:2090
+msgid "recurse into submodules"
+msgstr ""
+
+#: builtin/submodule--helper.c:2096
+msgid "git submodule--helper embed-git-dir [<path>...]"
+msgstr ""
+
+#: builtin/submodule--helper.c:2152
+msgid "check if it is safe to write to the .gitmodules file"
+msgstr ""
+
+#: builtin/submodule--helper.c:2157
+msgid "git submodule--helper config name [value]"
+msgstr ""
+
+#: builtin/submodule--helper.c:2158
+msgid "git submodule--helper config --check-writeable"
+msgstr ""
+
+#: builtin/submodule--helper.c:2175 git-submodule.sh:169
+#, sh-format
+msgid "please make sure that the .gitmodules file is in the working tree"
+msgstr ""
+
+#: builtin/submodule--helper.c:2225
+#, c-format
+msgid "%s doesn't support --super-prefix"
+msgstr ""
+
+#: builtin/submodule--helper.c:2231
+#, c-format
+msgid "'%s' is not a valid submodule--helper subcommand"
+msgstr ""
+
+#: builtin/symbolic-ref.c:8
+msgid "git symbolic-ref [<options>] <name> [<ref>]"
+msgstr ""
+
+#: builtin/symbolic-ref.c:9
+msgid "git symbolic-ref -d [-q] <name>"
+msgstr ""
+
+#: builtin/symbolic-ref.c:40
+msgid "suppress error message for non-symbolic (detached) refs"
+msgstr ""
+
+#: builtin/symbolic-ref.c:41
+msgid "delete symbolic ref"
+msgstr ""
+
+#: builtin/symbolic-ref.c:42
+msgid "shorten ref output"
+msgstr ""
+
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363
+msgid "reason"
+msgstr ""
+
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363
+msgid "reason of the update"
+msgstr ""
+
+#: builtin/tag.c:25
+msgid ""
+"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
+"[<head>]"
+msgstr ""
+
+#: builtin/tag.c:26
+msgid "git tag -d <tagname>..."
+msgstr ""
+
+#: builtin/tag.c:27
+msgid ""
+"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
+"points-at <object>]\n"
+"\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]"
+msgstr ""
+
+#: builtin/tag.c:29
+msgid "git tag -v [--format=<format>] <tagname>..."
+msgstr ""
+
+#: builtin/tag.c:87
+#, c-format
+msgid "tag '%s' not found."
+msgstr ""
+
+#: builtin/tag.c:103
+#, c-format
+msgid "Deleted tag '%s' (was %s)\n"
+msgstr ""
+
+#: builtin/tag.c:133
+#, c-format
+msgid ""
+"\n"
+"Write a message for tag:\n"
+"  %s\n"
+"Lines starting with '%c' will be ignored.\n"
+msgstr ""
+
+#: builtin/tag.c:137
+#, c-format
+msgid ""
+"\n"
+"Write a message for tag:\n"
+"  %s\n"
+"Lines starting with '%c' will be kept; you may remove them yourself if you "
+"want to.\n"
+msgstr ""
+
+#: builtin/tag.c:191
+msgid "unable to sign the tag"
+msgstr ""
+
+#: builtin/tag.c:193
+msgid "unable to write tag file"
+msgstr ""
+
+#: builtin/tag.c:218
+msgid "bad object type."
+msgstr ""
+
+#: builtin/tag.c:267
+msgid "no tag message?"
+msgstr ""
+
+#: builtin/tag.c:274
+#, c-format
+msgid "The tag message has been left in %s\n"
+msgstr ""
+
+#: builtin/tag.c:385
+msgid "list tag names"
+msgstr ""
+
+#: builtin/tag.c:387
+msgid "print <n> lines of each tag message"
+msgstr ""
+
+#: builtin/tag.c:389
+msgid "delete tags"
+msgstr ""
+
+#: builtin/tag.c:390
+msgid "verify tags"
+msgstr ""
+
+#: builtin/tag.c:392
+msgid "Tag creation options"
+msgstr ""
+
+#: builtin/tag.c:394
+msgid "annotated tag, needs a message"
+msgstr ""
+
+#: builtin/tag.c:396
+msgid "tag message"
+msgstr ""
+
+#: builtin/tag.c:398
+msgid "force edit of tag message"
+msgstr ""
+
+#: builtin/tag.c:399
+msgid "annotated and GPG-signed tag"
+msgstr ""
+
+#: builtin/tag.c:403
+msgid "use another key to sign the tag"
+msgstr ""
+
+#: builtin/tag.c:404
+msgid "replace the tag if exists"
+msgstr ""
+
+#: builtin/tag.c:405 builtin/update-ref.c:369
+msgid "create a reflog"
+msgstr ""
+
+#: builtin/tag.c:407
+msgid "Tag listing options"
+msgstr ""
+
+#: builtin/tag.c:408
+msgid "show tag list in columns"
+msgstr ""
+
+#: builtin/tag.c:409 builtin/tag.c:411
+msgid "print only tags that contain the commit"
+msgstr ""
+
+#: builtin/tag.c:410 builtin/tag.c:412
+msgid "print only tags that don't contain the commit"
+msgstr ""
+
+#: builtin/tag.c:413
+msgid "print only tags that are merged"
+msgstr ""
+
+#: builtin/tag.c:414
+msgid "print only tags that are not merged"
+msgstr ""
+
+#: builtin/tag.c:419
+msgid "print only tags of the object"
+msgstr ""
+
+#: builtin/tag.c:463
+msgid "--column and -n are incompatible"
+msgstr ""
+
+#: builtin/tag.c:485
+msgid "-n option is only allowed in list mode"
+msgstr ""
+
+#: builtin/tag.c:487
+msgid "--contains option is only allowed in list mode"
+msgstr ""
+
+#: builtin/tag.c:489
+msgid "--no-contains option is only allowed in list mode"
+msgstr ""
+
+#: builtin/tag.c:491
+msgid "--points-at option is only allowed in list mode"
+msgstr ""
+
+#: builtin/tag.c:493
+msgid "--merged and --no-merged options are only allowed in list mode"
+msgstr ""
+
+#: builtin/tag.c:504
+msgid "only one -F or -m option is allowed."
+msgstr ""
+
+#: builtin/tag.c:523
+msgid "too many params"
+msgstr ""
+
+#: builtin/tag.c:529
+#, c-format
+msgid "'%s' is not a valid tag name."
+msgstr ""
+
+#: builtin/tag.c:534
+#, c-format
+msgid "tag '%s' already exists"
+msgstr ""
+
+#: builtin/tag.c:565
+#, c-format
+msgid "Updated tag '%s' (was %s)\n"
+msgstr ""
+
+#: builtin/unpack-objects.c:500
+msgid "Unpacking objects"
+msgstr ""
+
+#: builtin/update-index.c:82
+#, c-format
+msgid "failed to create directory %s"
+msgstr ""
+
+#: builtin/update-index.c:98
+#, c-format
+msgid "failed to create file %s"
+msgstr ""
+
+#: builtin/update-index.c:106
+#, c-format
+msgid "failed to delete file %s"
+msgstr ""
+
+#: builtin/update-index.c:113 builtin/update-index.c:219
+#, c-format
+msgid "failed to delete directory %s"
+msgstr ""
+
+#: builtin/update-index.c:138
+#, c-format
+msgid "Testing mtime in '%s' "
+msgstr ""
+
+#: builtin/update-index.c:152
+msgid "directory stat info does not change after adding a new file"
+msgstr ""
+
+#: builtin/update-index.c:165
+msgid "directory stat info does not change after adding a new directory"
+msgstr ""
+
+#: builtin/update-index.c:178
+msgid "directory stat info changes after updating a file"
+msgstr ""
+
+#: builtin/update-index.c:189
+msgid "directory stat info changes after adding a file inside subdirectory"
+msgstr ""
+
+#: builtin/update-index.c:200
+msgid "directory stat info does not change after deleting a file"
+msgstr ""
+
+#: builtin/update-index.c:213
+msgid "directory stat info does not change after deleting a directory"
+msgstr ""
+
+#: builtin/update-index.c:220
+msgid " OK"
+msgstr ""
+
+#: builtin/update-index.c:588
+msgid "git update-index [<options>] [--] [<file>...]"
+msgstr ""
+
+#: builtin/update-index.c:961
+msgid "continue refresh even when index needs update"
+msgstr ""
+
+#: builtin/update-index.c:964
+msgid "refresh: ignore submodules"
+msgstr ""
+
+#: builtin/update-index.c:967
+msgid "do not ignore new files"
+msgstr ""
+
+#: builtin/update-index.c:969
+msgid "let files replace directories and vice-versa"
+msgstr ""
+
+#: builtin/update-index.c:971
+msgid "notice files missing from worktree"
+msgstr ""
+
+#: builtin/update-index.c:973
+msgid "refresh even if index contains unmerged entries"
+msgstr ""
+
+#: builtin/update-index.c:976
+msgid "refresh stat information"
+msgstr ""
+
+#: builtin/update-index.c:980
+msgid "like --refresh, but ignore assume-unchanged setting"
+msgstr ""
+
+#: builtin/update-index.c:984
+msgid "<mode>,<object>,<path>"
+msgstr ""
+
+#: builtin/update-index.c:985
+msgid "add the specified entry to the index"
+msgstr ""
+
+#: builtin/update-index.c:994
+msgid "mark files as \"not changing\""
+msgstr ""
+
+#: builtin/update-index.c:997
+msgid "clear assumed-unchanged bit"
+msgstr ""
+
+#: builtin/update-index.c:1000
+msgid "mark files as \"index-only\""
+msgstr ""
+
+#: builtin/update-index.c:1003
+msgid "clear skip-worktree bit"
+msgstr ""
+
+#: builtin/update-index.c:1006
+msgid "add to index only; do not add content to object database"
+msgstr ""
+
+#: builtin/update-index.c:1008
+msgid "remove named paths even if present in worktree"
+msgstr ""
+
+#: builtin/update-index.c:1010
+msgid "with --stdin: input lines are terminated by null bytes"
+msgstr ""
+
+#: builtin/update-index.c:1012
+msgid "read list of paths to be updated from standard input"
+msgstr ""
+
+#: builtin/update-index.c:1016
+msgid "add entries from standard input to the index"
+msgstr ""
+
+#: builtin/update-index.c:1020
+msgid "repopulate stages #2 and #3 for the listed paths"
+msgstr ""
+
+#: builtin/update-index.c:1024
+msgid "only update entries that differ from HEAD"
+msgstr ""
+
+#: builtin/update-index.c:1028
+msgid "ignore files missing from worktree"
+msgstr ""
+
+#: builtin/update-index.c:1031
+msgid "report actions to standard output"
+msgstr ""
+
+#: builtin/update-index.c:1033
+msgid "(for porcelains) forget saved unresolved conflicts"
+msgstr ""
+
+#: builtin/update-index.c:1037
+msgid "write index in this format"
+msgstr ""
+
+#: builtin/update-index.c:1039
+msgid "enable or disable split index"
+msgstr ""
+
+#: builtin/update-index.c:1041
+msgid "enable/disable untracked cache"
+msgstr ""
+
+#: builtin/update-index.c:1043
+msgid "test if the filesystem supports untracked cache"
+msgstr ""
+
+#: builtin/update-index.c:1045
+msgid "enable untracked cache without testing the filesystem"
 msgstr ""
 
-#: builtin/push.c:260
+#: builtin/update-index.c:1047
+msgid "write out the index even if is not flagged as changed"
+msgstr ""
+
+#: builtin/update-index.c:1049
+msgid "enable or disable file system monitor"
+msgstr ""
+
+#: builtin/update-index.c:1051
+msgid "mark files as fsmonitor valid"
+msgstr ""
+
+#: builtin/update-index.c:1054
+msgid "clear fsmonitor valid bit"
+msgstr ""
+
+#: builtin/update-index.c:1153
 msgid ""
-"You cannot update a remote ref that points at a non-commit object,\n"
-"or update a remote ref to make it point at a non-commit object,\n"
-"without using the '--force' option.\n"
+"core.splitIndex is set to false; remove or change it, if you really want to "
+"enable split index"
 msgstr ""
 
-#: builtin/push.c:320
-#, c-format
-msgid "Pushing to %s\n"
+#: builtin/update-index.c:1162
+msgid ""
+"core.splitIndex is set to true; remove or change it, if you really want to "
+"disable split index"
 msgstr ""
 
-#: builtin/push.c:324
-#, c-format
-msgid "failed to push some refs to '%s'"
+#: builtin/update-index.c:1173
+msgid ""
+"core.untrackedCache is set to true; remove or change it, if you really want "
+"to disable the untracked cache"
 msgstr ""
 
-#: builtin/push.c:357
+#: builtin/update-index.c:1177
+msgid "Untracked cache disabled"
+msgstr ""
+
+#: builtin/update-index.c:1185
+msgid ""
+"core.untrackedCache is set to false; remove or change it, if you really want "
+"to enable the untracked cache"
+msgstr ""
+
+#: builtin/update-index.c:1189
 #, c-format
-msgid "bad repository '%s'"
+msgid "Untracked cache enabled for '%s'"
 msgstr ""
 
-#: builtin/push.c:358
+#: builtin/update-index.c:1197
+msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
+msgstr ""
+
+#: builtin/update-index.c:1201
+msgid "fsmonitor enabled"
+msgstr ""
+
+#: builtin/update-index.c:1204
 msgid ""
-"No configured push destination.\n"
-"Either specify the URL from the command-line or configure a remote "
-"repository using\n"
-"\n"
-"    git remote add <name> <url>\n"
-"\n"
-"and then push using the remote name\n"
-"\n"
-"    git push <name>\n"
+"core.fsmonitor is set; remove it if you really want to disable fsmonitor"
 msgstr ""
 
-#: builtin/push.c:373
-msgid "--all and --tags are incompatible"
+#: builtin/update-index.c:1208
+msgid "fsmonitor disabled"
 msgstr ""
 
-#: builtin/push.c:374
-msgid "--all can't be combined with refspecs"
+#: builtin/update-ref.c:10
+msgid "git update-ref [<options>] -d <refname> [<old-val>]"
 msgstr ""
 
-#: builtin/push.c:379
-msgid "--mirror and --tags are incompatible"
+#: builtin/update-ref.c:11
+msgid "git update-ref [<options>]    <refname> <new-val> [<old-val>]"
 msgstr ""
 
-#: builtin/push.c:380
-msgid "--mirror can't be combined with refspecs"
+#: builtin/update-ref.c:12
+msgid "git update-ref [<options>] --stdin [-z]"
 msgstr ""
 
-#: builtin/push.c:385
-msgid "--all and --mirror are incompatible"
+#: builtin/update-ref.c:364
+msgid "delete the reference"
 msgstr ""
 
-#: builtin/push.c:445
-msgid "repository"
+#: builtin/update-ref.c:366
+msgid "update <refname> not the one it points to"
 msgstr ""
 
-#: builtin/push.c:446
-msgid "push all refs"
+#: builtin/update-ref.c:367
+msgid "stdin has NUL-terminated arguments"
 msgstr ""
 
-#: builtin/push.c:447
-msgid "mirror all refs"
+#: builtin/update-ref.c:368
+msgid "read updates from stdin"
 msgstr ""
 
-#: builtin/push.c:449
-msgid "delete refs"
+#: builtin/update-server-info.c:7
+msgid "git update-server-info [--force]"
 msgstr ""
 
-#: builtin/push.c:450
-msgid "push tags (can't be used with --all or --mirror)"
+#: builtin/update-server-info.c:15
+msgid "update the info files from scratch"
 msgstr ""
 
-#: builtin/push.c:453
-msgid "force updates"
+#: builtin/upload-pack.c:11
+msgid "git upload-pack [<options>] <dir>"
 msgstr ""
 
-#: builtin/push.c:454
-msgid "check"
+#: builtin/upload-pack.c:25
+msgid "exit immediately after initial ref advertisement"
 msgstr ""
 
-#: builtin/push.c:455
-msgid "control recursive pushing of submodules"
+#: builtin/upload-pack.c:27
+msgid "do not try <directory>/.git/ if <directory> is no Git directory"
 msgstr ""
 
-#: builtin/push.c:457
-msgid "use thin pack"
+#: builtin/upload-pack.c:29
+msgid "interrupt transfer after <n> seconds of inactivity"
 msgstr ""
 
-#: builtin/push.c:458 builtin/push.c:459
-msgid "receive pack program"
+#: builtin/verify-commit.c:20
+msgid "git verify-commit [-v | --verbose] <commit>..."
 msgstr ""
 
-#: builtin/push.c:460
-msgid "set upstream for git pull/status"
+#: builtin/verify-commit.c:76
+msgid "print commit contents"
 msgstr ""
 
-#: builtin/push.c:463
-msgid "prune locally removed refs"
+#: builtin/verify-commit.c:77 builtin/verify-tag.c:38
+msgid "print raw gpg status output"
 msgstr ""
 
-#: builtin/push.c:465
-msgid "bypass pre-push hook"
+#: builtin/verify-pack.c:55
+msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
 msgstr ""
 
-#: builtin/push.c:466
-msgid "push missing but relevant tags"
+#: builtin/verify-pack.c:65
+msgid "verbose"
 msgstr ""
 
-#: builtin/push.c:476
-msgid "--delete is incompatible with --all, --mirror and --tags"
+#: builtin/verify-pack.c:67
+msgid "show statistics only"
 msgstr ""
 
-#: builtin/push.c:478
-msgid "--delete doesn't make sense without any refs"
+#: builtin/verify-tag.c:19
+msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
+msgstr ""
+
+#: builtin/verify-tag.c:37
+msgid "print tag contents"
+msgstr ""
+
+#: builtin/worktree.c:17
+msgid "git worktree add [<options>] <path> [<commit-ish>]"
+msgstr ""
+
+#: builtin/worktree.c:18
+msgid "git worktree list [<options>]"
+msgstr ""
+
+#: builtin/worktree.c:19
+msgid "git worktree lock [<options>] <path>"
+msgstr ""
+
+#: builtin/worktree.c:20
+msgid "git worktree move <worktree> <new-path>"
+msgstr ""
+
+#: builtin/worktree.c:21
+msgid "git worktree prune [<options>]"
+msgstr ""
+
+#: builtin/worktree.c:22
+msgid "git worktree remove [<options>] <worktree>"
+msgstr ""
+
+#: builtin/worktree.c:23
+msgid "git worktree unlock <path>"
 msgstr ""
 
-#: builtin/read-tree.c:36
+#: builtin/worktree.c:60 builtin/worktree.c:871
+#, c-format
+msgid "failed to delete '%s'"
+msgstr ""
+
+#: builtin/worktree.c:79
+#, c-format
+msgid "Removing worktrees/%s: not a valid directory"
+msgstr ""
+
+#: builtin/worktree.c:85
+#, c-format
+msgid "Removing worktrees/%s: gitdir file does not exist"
+msgstr ""
+
+#: builtin/worktree.c:90 builtin/worktree.c:99
+#, c-format
+msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
+msgstr ""
+
+#: builtin/worktree.c:109
+#, c-format
 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>]])"
+"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
+"%<PRIuMAX>)"
 msgstr ""
 
-#: builtin/read-tree.c:109
-msgid "write resulting index to <file>"
+#: builtin/worktree.c:117
+#, c-format
+msgid "Removing worktrees/%s: invalid gitdir file"
 msgstr ""
 
-#: builtin/read-tree.c:112
-msgid "only empty the index"
+#: builtin/worktree.c:126
+#, c-format
+msgid "Removing worktrees/%s: gitdir file points to non-existent location"
 msgstr ""
 
-#: builtin/read-tree.c:114
-msgid "Merging"
+#: builtin/worktree.c:165
+msgid "report pruned working trees"
 msgstr ""
 
-#: builtin/read-tree.c:116
-msgid "perform a merge in addition to a read"
+#: builtin/worktree.c:167
+msgid "expire working trees older than <time>"
 msgstr ""
 
-#: builtin/read-tree.c:118
-msgid "3-way merge if no file level merging required"
+#: builtin/worktree.c:234
+#, c-format
+msgid "'%s' already exists"
 msgstr ""
 
-#: builtin/read-tree.c:120
-msgid "3-way merge in presence of adds and removes"
+#: builtin/worktree.c:251
+#, c-format
+msgid "unable to re-add worktree '%s'"
 msgstr ""
 
-#: builtin/read-tree.c:122
-msgid "same as -m, but discard unmerged entries"
+#: builtin/worktree.c:256
+#, c-format
+msgid ""
+"'%s' is a missing but locked worktree;\n"
+"use 'add -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear"
 msgstr ""
 
-#: builtin/read-tree.c:123
-msgid "<subdirectory>/"
+#: builtin/worktree.c:258
+#, c-format
+msgid ""
+"'%s' is a missing but already registered worktree;\n"
+"use 'add -f' to override, or 'prune' or 'remove' to clear"
 msgstr ""
 
-#: builtin/read-tree.c:124
-msgid "read the tree into the index under <subdirectory>/"
+#: builtin/worktree.c:309
+#, c-format
+msgid "could not create directory of '%s'"
 msgstr ""
 
-#: builtin/read-tree.c:127
-msgid "update working tree with merge result"
+#: builtin/worktree.c:428 builtin/worktree.c:434
+#, c-format
+msgid "Preparing worktree (new branch '%s')"
 msgstr ""
 
-#: builtin/read-tree.c:129
-msgid "gitignore"
+#: builtin/worktree.c:430
+#, c-format
+msgid "Preparing worktree (resetting branch '%s'; was at %s)"
 msgstr ""
 
-#: builtin/read-tree.c:130
-msgid "allow explicitly ignored files to be overwritten"
+#: builtin/worktree.c:439
+#, c-format
+msgid "Preparing worktree (checking out '%s')"
 msgstr ""
 
-#: builtin/read-tree.c:133
-msgid "don't check the working tree after merging"
+#: builtin/worktree.c:445
+#, c-format
+msgid "Preparing worktree (detached HEAD %s)"
 msgstr ""
 
-#: builtin/read-tree.c:134
-msgid "don't update the index or the work tree"
+#: builtin/worktree.c:486
+msgid "checkout <branch> even if already checked out in other worktree"
 msgstr ""
 
-#: builtin/read-tree.c:136
-msgid "skip applying sparse checkout filter"
+#: builtin/worktree.c:489
+msgid "create a new branch"
 msgstr ""
 
-#: builtin/read-tree.c:138
-msgid "debug unpack-trees"
+#: builtin/worktree.c:491
+msgid "create or reset a branch"
+msgstr ""
+
+#: builtin/worktree.c:493
+msgid "populate the new working tree"
+msgstr ""
+
+#: builtin/worktree.c:494
+msgid "keep the new working tree locked"
+msgstr ""
+
+#: builtin/worktree.c:497
+msgid "set up tracking mode (see git-branch(1))"
+msgstr ""
+
+#: builtin/worktree.c:500
+msgid "try to match the new branch name with a remote-tracking branch"
+msgstr ""
+
+#: builtin/worktree.c:508
+msgid "-b, -B, and --detach are mutually exclusive"
+msgstr ""
+
+#: builtin/worktree.c:569
+msgid "--[no-]track can only be used if a new branch is created"
+msgstr ""
+
+#: builtin/worktree.c:669
+msgid "reason for locking"
+msgstr ""
+
+#: builtin/worktree.c:681 builtin/worktree.c:714 builtin/worktree.c:772
+#: builtin/worktree.c:899
+#, c-format
+msgid "'%s' is not a working tree"
+msgstr ""
+
+#: builtin/worktree.c:683 builtin/worktree.c:716
+msgid "The main working tree cannot be locked or unlocked"
 msgstr ""
 
-#: builtin/reflog.c:500
+#: builtin/worktree.c:688
 #, c-format
-msgid "%s' for '%s' is not a valid timestamp"
+msgid "'%s' is already locked, reason: %s"
 msgstr ""
 
-#: builtin/reflog.c:616 builtin/reflog.c:621
+#: builtin/worktree.c:690
 #, c-format
-msgid "'%s' is not a valid timestamp"
+msgid "'%s' is already locked"
 msgstr ""
 
-#: builtin/remote.c:11
-msgid "git remote [-v | --verbose]"
+#: builtin/worktree.c:718
+#, c-format
+msgid "'%s' is not locked"
+msgstr ""
+
+#: builtin/worktree.c:743
+msgid "working trees containing submodules cannot be moved or removed"
+msgstr ""
+
+#: builtin/worktree.c:751
+msgid "force move even if worktree is dirty or locked"
+msgstr ""
+
+#: builtin/worktree.c:774 builtin/worktree.c:901
+#, c-format
+msgid "'%s' is a main working tree"
+msgstr ""
+
+#: builtin/worktree.c:779
+#, c-format
+msgid "could not figure out destination name from '%s'"
+msgstr ""
+
+#: builtin/worktree.c:785
+#, c-format
+msgid "target '%s' already exists"
 msgstr ""
 
-#: builtin/remote.c:12
+#: builtin/worktree.c:793
+#, c-format
 msgid ""
-"git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--"
-"mirror=<fetch|push>] <name> <url>"
+"cannot move a locked working tree, lock reason: %s\n"
+"use 'move -f -f' to override or unlock first"
 msgstr ""
 
-#: builtin/remote.c:13 builtin/remote.c:32
-msgid "git remote rename <old> <new>"
+#: builtin/worktree.c:795
+msgid ""
+"cannot move a locked working tree;\n"
+"use 'move -f -f' to override or unlock first"
 msgstr ""
 
-#: builtin/remote.c:14 builtin/remote.c:37
-msgid "git remote remove <name>"
+#: builtin/worktree.c:798
+#, c-format
+msgid "validation failed, cannot move working tree: %s"
 msgstr ""
 
-#: builtin/remote.c:15 builtin/remote.c:42
-msgid "git remote set-head <name> (-a | -d | <branch>)"
+#: builtin/worktree.c:803
+#, c-format
+msgid "failed to move '%s' to '%s'"
 msgstr ""
 
-#: builtin/remote.c:16
-msgid "git remote [-v | --verbose] show [-n] <name>"
+#: builtin/worktree.c:851
+#, c-format
+msgid "failed to run 'git status' on '%s'"
 msgstr ""
 
-#: builtin/remote.c:17
-msgid "git remote prune [-n | --dry-run] <name>"
+#: builtin/worktree.c:855
+#, c-format
+msgid "'%s' is dirty, use --force to delete it"
+msgstr ""
+
+#: builtin/worktree.c:860
+#, c-format
+msgid "failed to run 'git status' on '%s', code %d"
 msgstr ""
 
-#: builtin/remote.c:18
+#: builtin/worktree.c:883
+msgid "force removal even if worktree is dirty or locked"
+msgstr ""
+
+#: builtin/worktree.c:906
+#, c-format
 msgid ""
-"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
+"cannot remove a locked working tree, lock reason: %s\n"
+"use 'remove -f -f' to override or unlock first"
 msgstr ""
 
-#: builtin/remote.c:19
-msgid "git remote set-branches [--add] <name> <branch>..."
+#: builtin/worktree.c:908
+msgid ""
+"cannot remove a locked working tree;\n"
+"use 'remove -f -f' to override or unlock first"
 msgstr ""
 
-#: builtin/remote.c:20 builtin/remote.c:68
-msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
+#: builtin/worktree.c:911
+#, c-format
+msgid "validation failed, cannot remove working tree: %s"
 msgstr ""
 
-#: builtin/remote.c:21 builtin/remote.c:69
-msgid "git remote set-url --add <name> <newurl>"
+#: builtin/write-tree.c:14
+msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
 msgstr ""
 
-#: builtin/remote.c:22 builtin/remote.c:70
-msgid "git remote set-url --delete <name> <url>"
+#: builtin/write-tree.c:27
+msgid "<prefix>/"
 msgstr ""
 
-#: builtin/remote.c:27
-msgid "git remote add [<options>] <name> <url>"
+#: builtin/write-tree.c:28
+msgid "write tree object for a subdirectory <prefix>"
 msgstr ""
 
-#: builtin/remote.c:47
-msgid "git remote set-branches <name> <branch>..."
+#: builtin/write-tree.c:30
+msgid "only useful for debugging"
 msgstr ""
 
-#: builtin/remote.c:48
-msgid "git remote set-branches --add <name> <branch>..."
+#: credential-cache--daemon.c:222
+#, c-format
+msgid ""
+"The permissions on your socket directory are too loose; other\n"
+"users may be able to read your cached credentials. Consider running:\n"
+"\n"
+"\tchmod 0700 %s"
 msgstr ""
 
-#: builtin/remote.c:53
-msgid "git remote show [<options>] <name>"
+#: credential-cache--daemon.c:271
+msgid "print debugging messages to stderr"
 msgstr ""
 
-#: builtin/remote.c:58
-msgid "git remote prune [<options>] <name>"
+#: t/helper/test-reach.c:152
+#, c-format
+msgid "commit %s is not marked reachable"
 msgstr ""
 
-#: builtin/remote.c:63
-msgid "git remote update [<options>] [<group> | <remote>]..."
+#: t/helper/test-reach.c:162
+msgid "too many commits marked reachable"
+msgstr ""
+
+#: git.c:27
+msgid ""
+"git [--version] [--help] [-C <path>] [-c <name>=<value>]\n"
+"           [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n"
+"           [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
+"bare]\n"
+"           [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
+"           <command> [<args>]"
+msgstr ""
+
+#: git.c:34
+msgid ""
+"'git help -a' and 'git help -g' list available subcommands and some\n"
+"concept guides. See 'git help <command>' or 'git help <concept>'\n"
+"to read about a specific subcommand or concept."
+msgstr ""
+
+#: git.c:173
+#, c-format
+msgid "no directory given for --git-dir\n"
+msgstr ""
+
+#: git.c:187
+#, c-format
+msgid "no namespace given for --namespace\n"
+msgstr ""
+
+#: git.c:201
+#, c-format
+msgid "no directory given for --work-tree\n"
 msgstr ""
 
-#: builtin/remote.c:98
+#: git.c:215
 #, c-format
-msgid "Updating %s"
+msgid "no prefix given for --super-prefix\n"
 msgstr ""
 
-#: builtin/remote.c:130
-msgid ""
-"--mirror is dangerous and deprecated; please\n"
-"\t use --mirror=fetch or --mirror=push instead"
+#: git.c:237
+#, c-format
+msgid "-c expects a configuration string\n"
 msgstr ""
 
-#: builtin/remote.c:147
+#: git.c:275
 #, c-format
-msgid "unknown mirror argument: %s"
+msgid "no directory given for -C\n"
 msgstr ""
 
-#: builtin/remote.c:163
-msgid "fetch the remote branches"
+#: git.c:300
+#, c-format
+msgid "unknown option: %s\n"
 msgstr ""
 
-#: builtin/remote.c:165
-msgid "import all tags and associated objects when fetching"
+#: git.c:719
+#, c-format
+msgid "alias loop detected: expansion of '%s' does not terminate:%s"
 msgstr ""
 
-#: builtin/remote.c:168
-msgid "or do not fetch any tag at all (--no-tags)"
+#: git.c:802
+#, c-format
+msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
 msgstr ""
 
-#: builtin/remote.c:170
-msgid "branch(es) to track"
+#: git.c:814
+#, c-format
+msgid "failed to run command '%s': %s\n"
 msgstr ""
 
-#: builtin/remote.c:171
-msgid "master branch"
+#: http.c:374
+#, c-format
+msgid "negative value for http.postbuffer; defaulting to %d"
 msgstr ""
 
-#: builtin/remote.c:172
-msgid "push|fetch"
+#: http.c:395
+msgid "Delegation control is not supported with cURL < 7.22.0"
 msgstr ""
 
-#: builtin/remote.c:173
-msgid "set up remote as a mirror to push to or fetch from"
+#: http.c:404
+msgid "Public key pinning not supported with cURL < 7.44.0"
 msgstr ""
 
-#: builtin/remote.c:185
-msgid "specifying a master branch makes no sense with --mirror"
+#: http.c:837
+msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
 msgstr ""
 
-#: builtin/remote.c:187
-msgid "specifying branches to track makes sense only with fetch mirrors"
+#: http.c:910
+msgid "Protocol restrictions not supported with cURL < 7.19.4"
 msgstr ""
 
-#: builtin/remote.c:195 builtin/remote.c:646
+#: http.c:1046
 #, c-format
-msgid "remote %s already exists."
+msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
 msgstr ""
 
-#: builtin/remote.c:199 builtin/remote.c:650
+#: http.c:1053
 #, c-format
-msgid "'%s' is not a valid remote name"
+msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
 msgstr ""
 
-#: builtin/remote.c:243
+#: http.c:1057
 #, c-format
-msgid "Could not setup master '%s'"
+msgid "Could not set SSL backend to '%s': already set"
 msgstr ""
 
-#: builtin/remote.c:299
+#: http.c:1921
 #, c-format
-msgid "more than one %s"
+msgid ""
+"unable to update url base from redirection:\n"
+"  asked for: %s\n"
+"   redirect: %s"
 msgstr ""
 
-#: builtin/remote.c:339
+#: remote-curl.c:401
 #, c-format
-msgid "Could not get fetch map for refspec %s"
+msgid "redirecting to %s"
 msgstr ""
 
-#: builtin/remote.c:440 builtin/remote.c:448
-msgid "(matching)"
+#: list-objects-filter-options.h:60
+msgid "args"
 msgstr ""
 
-#: builtin/remote.c:452
-msgid "(delete)"
+#: list-objects-filter-options.h:61
+msgid "object filtering"
 msgstr ""
 
-#: builtin/remote.c:595 builtin/remote.c:601 builtin/remote.c:607
-#, c-format
-msgid "Could not append '%s' to '%s'"
+#: parse-options.h:154
+msgid "expiry-date"
 msgstr ""
 
-#: builtin/remote.c:639 builtin/remote.c:792 builtin/remote.c:890
-#, c-format
-msgid "No such remote: %s"
+#: parse-options.h:169
+msgid "no-op (backward compatibility)"
 msgstr ""
 
-#: builtin/remote.c:656
-#, c-format
-msgid "Could not rename config section '%s' to '%s'"
+#: parse-options.h:261
+msgid "be more verbose"
 msgstr ""
 
-#: builtin/remote.c:662 builtin/remote.c:799
-#, c-format
-msgid "Could not remove config section '%s'"
+#: parse-options.h:263
+msgid "be more quiet"
 msgstr ""
 
-#: builtin/remote.c:677
-#, c-format
-msgid ""
-"Not updating non-default fetch refspec\n"
-"\t%s\n"
-"\tPlease update the configuration manually if necessary."
+#: parse-options.h:269
+msgid "use <n> digits to display SHA-1s"
 msgstr ""
 
-#: builtin/remote.c:683
-#, c-format
-msgid "Could not append '%s'"
+#: command-list.h:50
+msgid "Add file contents to the index"
 msgstr ""
 
-#: builtin/remote.c:694
-#, c-format
-msgid "Could not set '%s'"
+#: command-list.h:51
+msgid "Apply a series of patches from a mailbox"
 msgstr ""
 
-#: builtin/remote.c:716
-#, c-format
-msgid "deleting '%s' failed"
+#: command-list.h:52
+msgid "Annotate file lines with commit information"
 msgstr ""
 
-#: builtin/remote.c:750
-#, c-format
-msgid "creating '%s' failed"
+#: command-list.h:53
+msgid "Apply a patch to files and/or to the index"
 msgstr ""
 
-#: builtin/remote.c:764
-#, c-format
-msgid "Could not remove branch %s"
+#: command-list.h:54
+msgid "Import a GNU Arch repository into Git"
 msgstr ""
 
-#: builtin/remote.c:834
-msgid ""
-"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
-"to delete it, use:"
-msgid_plural ""
-"Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
-"to delete them, use:"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/remote.c:943
-#, c-format
-msgid " new (next fetch will store in remotes/%s)"
+#: command-list.h:55
+msgid "Create an archive of files from a named tree"
 msgstr ""
 
-#: builtin/remote.c:946
-msgid " tracked"
+#: command-list.h:56
+msgid "Use binary search to find the commit that introduced a bug"
 msgstr ""
 
-#: builtin/remote.c:948
-msgid " stale (use 'git remote prune' to remove)"
+#: command-list.h:57
+msgid "Show what revision and author last modified each line of a file"
 msgstr ""
 
-#: builtin/remote.c:950
-msgid " ???"
+#: command-list.h:58
+msgid "List, create, or delete branches"
 msgstr ""
 
-#: builtin/remote.c:991
-#, c-format
-msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
+#: command-list.h:59
+msgid "Move objects and refs by archive"
 msgstr ""
 
-#: builtin/remote.c:998
-#, c-format
-msgid "rebases onto remote %s"
+#: command-list.h:60
+msgid "Provide content or type and size information for repository objects"
 msgstr ""
 
-#: builtin/remote.c:1001
-#, c-format
-msgid " merges with remote %s"
+#: command-list.h:61
+msgid "Display gitattributes information"
 msgstr ""
 
-#: builtin/remote.c:1002
-msgid "    and with remote"
+#: command-list.h:62
+msgid "Debug gitignore / exclude files"
 msgstr ""
 
-#: builtin/remote.c:1004
-#, c-format
-msgid "merges with remote %s"
+#: command-list.h:63
+msgid "Show canonical names and email addresses of contacts"
 msgstr ""
 
-#: builtin/remote.c:1005
-msgid "   and with remote"
+#: command-list.h:64
+msgid "Switch branches or restore working tree files"
 msgstr ""
 
-#: builtin/remote.c:1051
-msgid "create"
+#: command-list.h:65
+msgid "Copy files from the index to the working tree"
 msgstr ""
 
-#: builtin/remote.c:1054
-msgid "delete"
+#: command-list.h:66
+msgid "Ensures that a reference name is well formed"
 msgstr ""
 
-#: builtin/remote.c:1058
-msgid "up to date"
+#: command-list.h:67
+msgid "Find commits yet to be applied to upstream"
 msgstr ""
 
-#: builtin/remote.c:1061
-msgid "fast-forwardable"
+#: command-list.h:68
+msgid "Apply the changes introduced by some existing commits"
 msgstr ""
 
-#: builtin/remote.c:1064
-msgid "local out of date"
+#: command-list.h:69
+msgid "Graphical alternative to git-commit"
 msgstr ""
 
-#: builtin/remote.c:1071
-#, c-format
-msgid "    %-*s forces to %-*s (%s)"
+#: command-list.h:70
+msgid "Remove untracked files from the working tree"
 msgstr ""
 
-#: builtin/remote.c:1074
-#, c-format
-msgid "    %-*s pushes to %-*s (%s)"
+#: command-list.h:71
+msgid "Clone a repository into a new directory"
 msgstr ""
 
-#: builtin/remote.c:1078
-#, c-format
-msgid "    %-*s forces to %s"
+#: command-list.h:72
+msgid "Display data in columns"
 msgstr ""
 
-#: builtin/remote.c:1081
-#, c-format
-msgid "    %-*s pushes to %s"
+#: command-list.h:73
+msgid "Record changes to the repository"
 msgstr ""
 
-#: builtin/remote.c:1091
-msgid "do not query remotes"
+#: command-list.h:74
+msgid "Write and verify Git commit-graph files"
 msgstr ""
 
-#: builtin/remote.c:1118
-#, c-format
-msgid "* remote %s"
+#: command-list.h:75
+msgid "Create a new commit object"
 msgstr ""
 
-#: builtin/remote.c:1119
-#, c-format
-msgid "  Fetch URL: %s"
+#: command-list.h:76
+msgid "Get and set repository or global options"
 msgstr ""
 
-#: builtin/remote.c:1120 builtin/remote.c:1285
-msgid "(no URL)"
+#: command-list.h:77
+msgid "Count unpacked number of objects and their disk consumption"
 msgstr ""
 
-#: builtin/remote.c:1129 builtin/remote.c:1131
-#, c-format
-msgid "  Push  URL: %s"
+#: command-list.h:78
+msgid "Retrieve and store user credentials"
 msgstr ""
 
-#: builtin/remote.c:1133 builtin/remote.c:1135 builtin/remote.c:1137
-#, c-format
-msgid "  HEAD branch: %s"
+#: command-list.h:79
+msgid "Helper to temporarily store passwords in memory"
 msgstr ""
 
-#: builtin/remote.c:1139
-#, c-format
-msgid ""
-"  HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
+#: command-list.h:80
+msgid "Helper to store credentials on disk"
 msgstr ""
 
-#: builtin/remote.c:1151
-#, c-format
-msgid "  Remote branch:%s"
-msgid_plural "  Remote branches:%s"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/remote.c:1154 builtin/remote.c:1181
-msgid " (status not queried)"
+#: command-list.h:81
+msgid "Export a single commit to a CVS checkout"
 msgstr ""
 
-#: builtin/remote.c:1163
-msgid "  Local branch configured for 'git pull':"
-msgid_plural "  Local branches configured for 'git pull':"
-msgstr[0] ""
-msgstr[1] ""
+#: command-list.h:82
+msgid "Salvage your data out of another SCM people love to hate"
+msgstr ""
 
-#: builtin/remote.c:1171
-msgid "  Local refs will be mirrored by 'git push'"
+#: command-list.h:83
+msgid "A CVS server emulator for Git"
 msgstr ""
 
-#: builtin/remote.c:1178
-#, c-format
-msgid "  Local ref configured for 'git push'%s:"
-msgid_plural "  Local refs configured for 'git push'%s:"
-msgstr[0] ""
-msgstr[1] ""
+#: command-list.h:84
+msgid "A really simple server for Git repositories"
+msgstr ""
 
-#: builtin/remote.c:1199
-msgid "set refs/remotes/<name>/HEAD according to remote"
+#: command-list.h:85
+msgid "Give an object a human readable name based on an available ref"
 msgstr ""
 
-#: builtin/remote.c:1201
-msgid "delete refs/remotes/<name>/HEAD"
+#: command-list.h:86
+msgid "Show changes between commits, commit and working tree, etc"
 msgstr ""
 
-#: builtin/remote.c:1216
-msgid "Cannot determine remote HEAD"
+#: command-list.h:87
+msgid "Compares files in the working tree and the index"
 msgstr ""
 
-#: builtin/remote.c:1218
-msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
+#: command-list.h:88
+msgid "Compare a tree to the working tree or index"
 msgstr ""
 
-#: builtin/remote.c:1228
-#, c-format
-msgid "Could not delete %s"
+#: command-list.h:89
+msgid "Compares the content and mode of blobs found via two tree objects"
 msgstr ""
 
-#: builtin/remote.c:1236
-#, c-format
-msgid "Not a valid ref: %s"
+#: command-list.h:90
+msgid "Show changes using common diff tools"
 msgstr ""
 
-#: builtin/remote.c:1238
-#, c-format
-msgid "Could not setup %s"
+#: command-list.h:91
+msgid "Git data exporter"
 msgstr ""
 
-#: builtin/remote.c:1274
-#, c-format
-msgid " %s will become dangling!"
+#: command-list.h:92
+msgid "Backend for fast Git data importers"
 msgstr ""
 
-#: builtin/remote.c:1275
-#, c-format
-msgid " %s has become dangling!"
+#: command-list.h:93
+msgid "Download objects and refs from another repository"
 msgstr ""
 
-#: builtin/remote.c:1281
-#, c-format
-msgid "Pruning %s"
+#: command-list.h:94
+msgid "Receive missing objects from another repository"
 msgstr ""
 
-#: builtin/remote.c:1282
-#, c-format
-msgid "URL: %s"
+#: command-list.h:95
+msgid "Rewrite branches"
 msgstr ""
 
-#: builtin/remote.c:1295
-#, c-format
-msgid " * [would prune] %s"
+#: command-list.h:96
+msgid "Produce a merge commit message"
 msgstr ""
 
-#: builtin/remote.c:1298
-#, c-format
-msgid " * [pruned] %s"
+#: command-list.h:97
+msgid "Output information on each ref"
 msgstr ""
 
-#: builtin/remote.c:1321
-msgid "prune remotes after fetching"
+#: command-list.h:98
+msgid "Prepare patches for e-mail submission"
 msgstr ""
 
-#: builtin/remote.c:1387 builtin/remote.c:1461
-#, c-format
-msgid "No such remote '%s'"
+#: command-list.h:99
+msgid "Verifies the connectivity and validity of the objects in the database"
 msgstr ""
 
-#: builtin/remote.c:1407
-msgid "add branch"
+#: command-list.h:100
+msgid "Cleanup unnecessary files and optimize the local repository"
 msgstr ""
 
-#: builtin/remote.c:1414
-msgid "no remote specified"
+#: command-list.h:101
+msgid "Extract commit ID from an archive created using git-archive"
 msgstr ""
 
-#: builtin/remote.c:1436
-msgid "manipulate push URLs"
+#: command-list.h:102
+msgid "Print lines matching a pattern"
 msgstr ""
 
-#: builtin/remote.c:1438
-msgid "add URL"
+#: command-list.h:103
+msgid "A portable graphical interface to Git"
 msgstr ""
 
-#: builtin/remote.c:1440
-msgid "delete URLs"
+#: command-list.h:104
+msgid "Compute object ID and optionally creates a blob from a file"
 msgstr ""
 
-#: builtin/remote.c:1447
-msgid "--add --delete doesn't make sense"
+#: command-list.h:105
+msgid "Display help information about Git"
 msgstr ""
 
-#: builtin/remote.c:1487
-#, c-format
-msgid "Invalid old URL pattern: %s"
+#: command-list.h:106
+msgid "Server side implementation of Git over HTTP"
 msgstr ""
 
-#: builtin/remote.c:1495
-#, c-format
-msgid "No such URL found: %s"
+#: command-list.h:107
+msgid "Download from a remote Git repository via HTTP"
 msgstr ""
 
-#: builtin/remote.c:1497
-msgid "Will not delete all non-push URLs"
+#: command-list.h:108
+msgid "Push objects over HTTP/DAV to another repository"
 msgstr ""
 
-#: builtin/remote.c:1569
-msgid "be verbose; must be placed before a subcommand"
+#: command-list.h:109
+msgid "Send a collection of patches from stdin to an IMAP folder"
 msgstr ""
 
-#: builtin/replace.c:17
-msgid "git replace [-f] <object> <replacement>"
+#: command-list.h:110
+msgid "Build pack index file for an existing packed archive"
 msgstr ""
 
-#: builtin/replace.c:18
-msgid "git replace -d <object>..."
+#: command-list.h:111
+msgid "Create an empty Git repository or reinitialize an existing one"
 msgstr ""
 
-#: builtin/replace.c:19
-msgid "git replace -l [<pattern>]"
+#: command-list.h:112
+msgid "Instantly browse your working repository in gitweb"
 msgstr ""
 
-#: builtin/replace.c:121
-msgid "list replace refs"
+#: command-list.h:113
+msgid "add or parse structured information in commit messages"
 msgstr ""
 
-#: builtin/replace.c:122
-msgid "delete replace refs"
+#: command-list.h:114
+msgid "The Git repository browser"
 msgstr ""
 
-#: builtin/replace.c:123
-msgid "replace the ref if it exists"
+#: command-list.h:115
+msgid "Show commit logs"
 msgstr ""
 
-#: builtin/rerere.c:11
-msgid "git rerere [clear | forget path... | status | remaining | diff | gc]"
+#: command-list.h:116
+msgid "Show information about files in the index and the working tree"
 msgstr ""
 
-#: builtin/rerere.c:56
-msgid "register clean resolutions in index"
+#: command-list.h:117
+msgid "List references in a remote repository"
 msgstr ""
 
-#: builtin/reset.c:25
-msgid ""
-"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
+#: command-list.h:118
+msgid "List the contents of a tree object"
 msgstr ""
 
-#: builtin/reset.c:26
-msgid "git reset [-q] <tree-ish> [--] <paths>..."
+#: command-list.h:119
+msgid "Extracts patch and authorship from a single e-mail message"
 msgstr ""
 
-#: builtin/reset.c:27
-msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
+#: command-list.h:120
+msgid "Simple UNIX mbox splitter program"
 msgstr ""
 
-#: builtin/reset.c:33
-msgid "mixed"
+#: command-list.h:121
+msgid "Join two or more development histories together"
 msgstr ""
 
-#: builtin/reset.c:33
-msgid "soft"
+#: command-list.h:122
+msgid "Find as good common ancestors as possible for a merge"
 msgstr ""
 
-#: builtin/reset.c:33
-msgid "hard"
+#: command-list.h:123
+msgid "Run a three-way file merge"
 msgstr ""
 
-#: builtin/reset.c:33
-msgid "merge"
+#: command-list.h:124
+msgid "Run a merge for files needing merging"
 msgstr ""
 
-#: builtin/reset.c:33
-msgid "keep"
+#: command-list.h:125
+msgid "The standard helper program to use with git-merge-index"
 msgstr ""
 
-#: builtin/reset.c:73
-msgid "You do not have a valid HEAD."
+#: command-list.h:126
+msgid "Run merge conflict resolution tools to resolve merge conflicts"
 msgstr ""
 
-#: builtin/reset.c:75
-msgid "Failed to find tree of HEAD."
+#: command-list.h:127
+msgid "Show three-way merge without touching index"
 msgstr ""
 
-#: builtin/reset.c:81
-#, c-format
-msgid "Failed to find tree of %s."
+#: command-list.h:128
+msgid "Write and verify multi-pack-indexes"
 msgstr ""
 
-#: builtin/reset.c:99
-#, c-format
-msgid "HEAD is now at %s"
+#: command-list.h:129
+msgid "Creates a tag object"
 msgstr ""
 
-#: builtin/reset.c:172
-#, c-format
-msgid "Cannot do a %s reset in the middle of a merge."
+#: command-list.h:130
+msgid "Build a tree-object from ls-tree formatted text"
 msgstr ""
 
-#: builtin/reset.c:251
-msgid "be quiet, only report errors"
+#: command-list.h:131
+msgid "Move or rename a file, a directory, or a symlink"
 msgstr ""
 
-#: builtin/reset.c:253
-msgid "reset HEAD and index"
+#: command-list.h:132
+msgid "Find symbolic names for given revs"
 msgstr ""
 
-#: builtin/reset.c:254
-msgid "reset only HEAD"
+#: command-list.h:133
+msgid "Add or inspect object notes"
 msgstr ""
 
-#: builtin/reset.c:256 builtin/reset.c:258
-msgid "reset HEAD, index and working tree"
+#: command-list.h:134
+msgid "Import from and submit to Perforce repositories"
 msgstr ""
 
-#: builtin/reset.c:260
-msgid "reset HEAD but keep local changes"
+#: command-list.h:135
+msgid "Create a packed archive of objects"
 msgstr ""
 
-#: builtin/reset.c:278
-#, c-format
-msgid "Failed to resolve '%s' as a valid revision."
+#: command-list.h:136
+msgid "Find redundant pack files"
 msgstr ""
 
-#: builtin/reset.c:281 builtin/reset.c:289
-#, c-format
-msgid "Could not parse object '%s'."
+#: command-list.h:137
+msgid "Pack heads and tags for efficient repository access"
 msgstr ""
 
-#: builtin/reset.c:286
-#, c-format
-msgid "Failed to resolve '%s' as a valid tree."
+#: command-list.h:138
+msgid "Routines to help parsing remote repository access parameters"
 msgstr ""
 
-#: builtin/reset.c:295
-msgid "--patch is incompatible with --{hard,mixed,soft}"
+#: command-list.h:139
+msgid "Compute unique ID for a patch"
 msgstr ""
 
-#: builtin/reset.c:304
-msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
+#: command-list.h:140
+msgid "Prune all unreachable objects from the object database"
 msgstr ""
 
-#: builtin/reset.c:306
-#, c-format
-msgid "Cannot do %s reset with paths."
+#: command-list.h:141
+msgid "Remove extra objects that are already in pack files"
 msgstr ""
 
-#: builtin/reset.c:316
-#, c-format
-msgid "%s reset is not allowed in a bare repository"
+#: command-list.h:142
+msgid "Fetch from and integrate with another repository or a local branch"
 msgstr ""
 
-#: builtin/reset.c:336
-#, c-format
-msgid "Could not reset index file to revision '%s'."
+#: command-list.h:143
+msgid "Update remote refs along with associated objects"
 msgstr ""
 
-#: builtin/reset.c:342
-msgid "Unstaged changes after reset:"
+#: command-list.h:144
+msgid "Applies a quilt patchset onto the current branch"
 msgstr ""
 
-#: builtin/reset.c:347
-msgid "Could not write new index file."
+#: command-list.h:145
+msgid "Compare two commit ranges (e.g. two versions of a branch)"
 msgstr ""
 
-#: builtin/rev-parse.c:345
-msgid "git rev-parse --parseopt [options] -- [<args>...]"
+#: command-list.h:146
+msgid "Reads tree information into the index"
 msgstr ""
 
-#: builtin/rev-parse.c:350
-msgid "keep the `--` passed as an arg"
+#: command-list.h:147
+msgid "Reapply commits on top of another base tip"
 msgstr ""
 
-#: builtin/rev-parse.c:352
-msgid "stop parsing after the first non-option argument"
+#: command-list.h:148
+msgid "Receive what is pushed into the repository"
 msgstr ""
 
-#: builtin/rev-parse.c:470
-msgid ""
-"git rev-parse --parseopt [options] -- [<args>...]\n"
-"   or: git rev-parse --sq-quote [<arg>...]\n"
-"   or: git rev-parse [options] [<arg>...]\n"
-"\n"
-"Run \"git rev-parse --parseopt -h\" for more information on the first usage."
+#: command-list.h:149
+msgid "Manage reflog information"
 msgstr ""
 
-#: builtin/revert.c:22
-msgid "git revert [options] <commit-ish>..."
+#: command-list.h:150
+msgid "Manage set of tracked repositories"
 msgstr ""
 
-#: builtin/revert.c:23
-msgid "git revert <subcommand>"
+#: command-list.h:151
+msgid "Pack unpacked objects in a repository"
 msgstr ""
 
-#: builtin/revert.c:28
-msgid "git cherry-pick [options] <commit-ish>..."
+#: command-list.h:152
+msgid "Create, list, delete refs to replace objects"
 msgstr ""
 
-#: builtin/revert.c:29
-msgid "git cherry-pick <subcommand>"
+#: command-list.h:153
+msgid "Generates a summary of pending changes"
 msgstr ""
 
-#: builtin/revert.c:71 builtin/revert.c:94
-#, c-format
-msgid "%s: %s cannot be used with %s"
+#: command-list.h:154
+msgid "Reuse recorded resolution of conflicted merges"
 msgstr ""
 
-#: builtin/revert.c:105
-msgid "end revert or cherry-pick sequence"
+#: command-list.h:155
+msgid "Reset current HEAD to the specified state"
 msgstr ""
 
-#: builtin/revert.c:106
-msgid "resume revert or cherry-pick sequence"
+#: command-list.h:156
+msgid "Revert some existing commits"
 msgstr ""
 
-#: builtin/revert.c:107
-msgid "cancel revert or cherry-pick sequence"
+#: command-list.h:157
+msgid "Lists commit objects in reverse chronological order"
 msgstr ""
 
-#: builtin/revert.c:108
-msgid "don't automatically commit"
+#: command-list.h:158
+msgid "Pick out and massage parameters"
 msgstr ""
 
-#: builtin/revert.c:109
-msgid "edit the commit message"
+#: command-list.h:159
+msgid "Remove files from the working tree and from the index"
 msgstr ""
 
-#: builtin/revert.c:112
-msgid "parent number"
+#: command-list.h:160
+msgid "Send a collection of patches as emails"
 msgstr ""
 
-#: builtin/revert.c:114
-msgid "merge strategy"
+#: command-list.h:161
+msgid "Push objects over Git protocol to another repository"
 msgstr ""
 
-#: builtin/revert.c:115
-msgid "option"
+#: command-list.h:162
+msgid "Restricted login shell for Git-only SSH access"
 msgstr ""
 
-#: builtin/revert.c:116
-msgid "option for merge strategy"
+#: command-list.h:163
+msgid "Summarize 'git log' output"
 msgstr ""
 
-#: builtin/revert.c:127
-msgid "append commit name"
+#: command-list.h:164
+msgid "Show various types of objects"
 msgstr ""
 
-#: builtin/revert.c:128
-msgid "allow fast-forward"
+#: command-list.h:165
+msgid "Show branches and their commits"
 msgstr ""
 
-#: builtin/revert.c:129
-msgid "preserve initially empty commits"
+#: command-list.h:166
+msgid "Show packed archive index"
 msgstr ""
 
-#: builtin/revert.c:130
-msgid "allow commits with empty messages"
+#: command-list.h:167
+msgid "List references in a local repository"
 msgstr ""
 
-#: builtin/revert.c:131
-msgid "keep redundant, empty commits"
+#: command-list.h:168
+msgid "Git's i18n setup code for shell scripts"
 msgstr ""
 
-#: builtin/revert.c:135
-msgid "program error"
+#: command-list.h:169
+msgid "Common Git shell script setup code"
 msgstr ""
 
-#: builtin/revert.c:225
-msgid "revert failed"
+#: command-list.h:170
+msgid "Stash the changes in a dirty working directory away"
 msgstr ""
 
-#: builtin/revert.c:240
-msgid "cherry-pick failed"
+#: command-list.h:171
+msgid "Add file contents to the staging area"
 msgstr ""
 
-#: builtin/rm.c:16
-msgid "git rm [options] [--] <file>..."
+#: command-list.h:172
+msgid "Show the working tree status"
 msgstr ""
 
-#: builtin/rm.c:64
-msgid ""
-"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"
-"use a .git directory:"
-msgstr[0] ""
-msgstr[1] ""
+#: command-list.h:173
+msgid "Remove unnecessary whitespace"
+msgstr ""
 
-#: builtin/rm.c:70
-msgid ""
-"\n"
-"(use 'rm -rf' if you really want to remove it including all of its history)"
+#: command-list.h:174
+msgid "Initialize, update or inspect submodules"
 msgstr ""
 
-#: builtin/rm.c:230
-msgid ""
-"the following file has staged content different from both the\n"
-"file and the HEAD:"
-msgid_plural ""
-"the following files have staged content different from both the\n"
-"file and the HEAD:"
-msgstr[0] ""
-msgstr[1] ""
+#: command-list.h:175
+msgid "Bidirectional operation between a Subversion repository and Git"
+msgstr ""
 
-#: builtin/rm.c:235
-msgid ""
-"\n"
-"(use -f to force removal)"
+#: command-list.h:176
+msgid "Read, modify and delete symbolic refs"
 msgstr ""
 
-#: builtin/rm.c:239
-msgid "the following file has changes staged in the index:"
-msgid_plural "the following files have changes staged in the index:"
-msgstr[0] ""
-msgstr[1] ""
+#: command-list.h:177
+msgid "Create, list, delete or verify a tag object signed with GPG"
+msgstr ""
 
-#: builtin/rm.c:243 builtin/rm.c:254
-msgid ""
-"\n"
-"(use --cached to keep the file, or -f to force removal)"
+#: command-list.h:178
+msgid "Creates a temporary file with a blob's contents"
 msgstr ""
 
-#: builtin/rm.c:251
-msgid "the following file has local modifications:"
-msgid_plural "the following files have local modifications:"
-msgstr[0] ""
-msgstr[1] ""
+#: command-list.h:179
+msgid "Unpack objects from a packed archive"
+msgstr ""
 
-#: builtin/rm.c:269
-msgid "do not list removed files"
+#: command-list.h:180
+msgid "Register file contents in the working tree to the index"
 msgstr ""
 
-#: builtin/rm.c:270
-msgid "only remove from the index"
+#: command-list.h:181
+msgid "Update the object name stored in a ref safely"
 msgstr ""
 
-#: builtin/rm.c:271
-msgid "override the up-to-date check"
+#: command-list.h:182
+msgid "Update auxiliary info file to help dumb servers"
 msgstr ""
 
-#: builtin/rm.c:272
-msgid "allow recursive removal"
+#: command-list.h:183
+msgid "Send archive back to git-archive"
 msgstr ""
 
-#: builtin/rm.c:274
-msgid "exit with a zero status even if nothing matched"
+#: command-list.h:184
+msgid "Send objects packed back to git-fetch-pack"
 msgstr ""
 
-#: builtin/rm.c:345
-#, c-format
-msgid "not removing '%s' recursively without -r"
+#: command-list.h:185
+msgid "Show a Git logical variable"
 msgstr ""
 
-#: builtin/rm.c:384
-#, c-format
-msgid "git rm: unable to remove %s"
+#: command-list.h:186
+msgid "Check the GPG signature of commits"
 msgstr ""
 
-#: builtin/shortlog.c:13
-msgid "git shortlog [<options>] [<revision range>] [[--] [<path>...]]"
+#: command-list.h:187
+msgid "Validate packed Git archive files"
 msgstr ""
 
-#: builtin/shortlog.c:131
-#, c-format
-msgid "Missing author: %s"
+#: command-list.h:188
+msgid "Check the GPG signature of tags"
 msgstr ""
 
-#: builtin/shortlog.c:228
-msgid "sort output according to the number of commits per author"
+#: command-list.h:189
+msgid "Git web interface (web frontend to Git repositories)"
 msgstr ""
 
-#: builtin/shortlog.c:230
-msgid "Suppress commit descriptions, only provides commit count"
+#: command-list.h:190
+msgid "Show logs with difference each commit introduces"
 msgstr ""
 
-#: builtin/shortlog.c:232
-msgid "Show the email address of each author"
+#: command-list.h:191
+msgid "Manage multiple working trees"
 msgstr ""
 
-#: builtin/shortlog.c:233
-msgid "w[,i1[,i2]]"
+#: command-list.h:192
+msgid "Create a tree object from the current index"
 msgstr ""
 
-#: builtin/shortlog.c:234
-msgid "Linewrap output"
+#: command-list.h:193
+msgid "Defining attributes per path"
 msgstr ""
 
-#: builtin/show-branch.c:9
-msgid ""
-"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--"
-"current] [--color[=<when>] | --no-color] [--sparse] [--more=<n> | --list | --"
-"independent | --merge-base] [--no-name | --sha1-name] [--topics] [(<rev> | "
-"<glob>)...]"
+#: command-list.h:194
+msgid "Git command-line interface and conventions"
 msgstr ""
 
-#: builtin/show-branch.c:10
-msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]"
+#: command-list.h:195
+msgid "A Git core tutorial for developers"
 msgstr ""
 
-#: builtin/show-branch.c:650
-msgid "show remote-tracking and local branches"
+#: command-list.h:196
+msgid "Git for CVS users"
 msgstr ""
 
-#: builtin/show-branch.c:652
-msgid "show remote-tracking branches"
+#: command-list.h:197
+msgid "Tweaking diff output"
 msgstr ""
 
-#: builtin/show-branch.c:654
-msgid "color '*!+-' corresponding to the branch"
+#: command-list.h:198
+msgid "A useful minimum set of commands for Everyday Git"
 msgstr ""
 
-#: builtin/show-branch.c:656
-msgid "show <n> more commits after the common ancestor"
+#: command-list.h:199
+msgid "A Git Glossary"
 msgstr ""
 
-#: builtin/show-branch.c:658
-msgid "synonym to more=-1"
+#: command-list.h:200
+msgid "Hooks used by Git"
 msgstr ""
 
-#: builtin/show-branch.c:659
-msgid "suppress naming strings"
+#: command-list.h:201
+msgid "Specifies intentionally untracked files to ignore"
 msgstr ""
 
-#: builtin/show-branch.c:661
-msgid "include the current branch"
+#: command-list.h:202
+msgid "Defining submodule properties"
 msgstr ""
 
-#: builtin/show-branch.c:663
-msgid "name commits with their object names"
+#: command-list.h:203
+msgid "Git namespaces"
 msgstr ""
 
-#: builtin/show-branch.c:665
-msgid "show possible merge bases"
+#: command-list.h:204
+msgid "Git Repository Layout"
 msgstr ""
 
-#: builtin/show-branch.c:667
-msgid "show refs unreachable from any other ref"
+#: command-list.h:205
+msgid "Specifying revisions and ranges for Git"
 msgstr ""
 
-#: builtin/show-branch.c:669
-msgid "show commits in topological order"
+#: command-list.h:206
+msgid "A tutorial introduction to Git: part two"
 msgstr ""
 
-#: builtin/show-branch.c:672
-msgid "show only commits not on the first branch"
+#: command-list.h:207
+msgid "A tutorial introduction to Git"
 msgstr ""
 
-#: builtin/show-branch.c:674
-msgid "show merges reachable from only one tip"
+#: command-list.h:208
+msgid "An overview of recommended workflows with Git"
 msgstr ""
 
-#: builtin/show-branch.c:676
-msgid "topologically sort, maintaining date order where possible"
+#: rerere.h:44
+msgid "update the index with reused conflict resolution if possible"
 msgstr ""
 
-#: builtin/show-branch.c:679
-msgid "<n>[,<base>]"
+#: git-bisect.sh:54
+msgid "You need to start by \"git bisect start\""
 msgstr ""
 
-#: builtin/show-branch.c:680
-msgid "show <n> most recent ref-log entries starting at base"
+#. TRANSLATORS: Make sure to include [Y] and [n] in your
+#. translation. The program will only accept English input
+#. at this point.
+#: git-bisect.sh:60
+msgid "Do you want me to do it for you [Y/n]? "
 msgstr ""
 
-#: builtin/show-ref.c:10
-msgid ""
-"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--"
-"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] "
+#: git-bisect.sh:121
+#, sh-format
+msgid "unrecognised option: '$arg'"
 msgstr ""
 
-#: builtin/show-ref.c:11
-msgid "git show-ref --exclude-existing[=pattern] < ref-list"
+#: git-bisect.sh:125
+#, sh-format
+msgid "'$arg' does not appear to be a valid revision"
 msgstr ""
 
-#: builtin/show-ref.c:168
-msgid "only show tags (can be combined with heads)"
+#: git-bisect.sh:154
+msgid "Bad HEAD - I need a HEAD"
 msgstr ""
 
-#: builtin/show-ref.c:169
-msgid "only show heads (can be combined with tags)"
+#: git-bisect.sh:167
+#, sh-format
+msgid ""
+"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
 msgstr ""
 
-#: builtin/show-ref.c:170
-msgid "stricter reference checking, requires exact ref path"
+#: git-bisect.sh:177
+msgid "won't bisect on cg-seek'ed tree"
 msgstr ""
 
-#: builtin/show-ref.c:173 builtin/show-ref.c:176
-msgid "show the HEAD reference, even if it would be filtered out"
+#: git-bisect.sh:181
+msgid "Bad HEAD - strange symbolic ref"
 msgstr ""
 
-#: builtin/show-ref.c:178
-msgid "dereference tags into object IDs"
+#: git-bisect.sh:233
+#, sh-format
+msgid "Bad bisect_write argument: $state"
 msgstr ""
 
-#: builtin/show-ref.c:180
-msgid "only show SHA1 hash using <n> digits"
+#: git-bisect.sh:246
+#, sh-format
+msgid "Bad rev input: $arg"
 msgstr ""
 
-#: builtin/show-ref.c:184
-msgid "do not print results to stdout (useful with --verify)"
+#: git-bisect.sh:265
+#, sh-format
+msgid "Bad rev input: $bisected_head"
 msgstr ""
 
-#: builtin/show-ref.c:186
-msgid "show refs from stdin that aren't in local repository"
+#: git-bisect.sh:274
+#, sh-format
+msgid "Bad rev input: $rev"
 msgstr ""
 
-#: builtin/symbolic-ref.c:7
-msgid "git symbolic-ref [options] name [ref]"
+#: git-bisect.sh:283
+#, sh-format
+msgid "'git bisect $TERM_BAD' can take only one argument."
 msgstr ""
 
-#: builtin/symbolic-ref.c:8
-msgid "git symbolic-ref -d [-q] name"
+#: git-bisect.sh:306
+#, sh-format
+msgid "Warning: bisecting only with a $TERM_BAD commit."
 msgstr ""
 
-#: builtin/symbolic-ref.c:40
-msgid "suppress error message for non-symbolic (detached) refs"
+#. TRANSLATORS: Make sure to include [Y] and [n] in your
+#. translation. The program will only accept English input
+#. at this point.
+#: git-bisect.sh:312
+msgid "Are you sure [Y/n]? "
 msgstr ""
 
-#: builtin/symbolic-ref.c:41
-msgid "delete symbolic ref"
+#: git-bisect.sh:324
+#, sh-format
+msgid ""
+"You need to give me at least one $bad_syn and one $good_syn revision.\n"
+"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
 msgstr ""
 
-#: builtin/symbolic-ref.c:42
-msgid "shorten ref output"
+#: git-bisect.sh:327
+#, sh-format
+msgid ""
+"You need to start by \"git bisect start\".\n"
+"You then need to give me at least one $good_syn and one $bad_syn revision.\n"
+"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
 msgstr ""
 
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:18
-msgid "reason"
+#: git-bisect.sh:398 git-bisect.sh:512
+msgid "We are not bisecting."
 msgstr ""
 
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:18
-msgid "reason of the update"
+#: git-bisect.sh:405
+#, sh-format
+msgid "'$invalid' is not a valid commit"
 msgstr ""
 
-#: builtin/tag.c:22
+#: git-bisect.sh:414
+#, sh-format
 msgid ""
-"git tag [-a|-s|-u <key-id>] [-f] [-m <msg>|-F <file>] <tagname> [<head>]"
+"Could not check out original HEAD '$branch'.\n"
+"Try 'git bisect reset <commit>'."
 msgstr ""
 
-#: builtin/tag.c:23
-msgid "git tag -d <tagname>..."
+#: git-bisect.sh:422
+msgid "No logfile given"
 msgstr ""
 
-#: builtin/tag.c:24
-msgid ""
-"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>] \n"
-"\t\t[<pattern>...]"
+#: git-bisect.sh:423
+#, sh-format
+msgid "cannot read $file for replaying"
 msgstr ""
 
-#: builtin/tag.c:26
-msgid "git tag -v <tagname>..."
+#: git-bisect.sh:444
+msgid "?? what are you talking about?"
 msgstr ""
 
-#: builtin/tag.c:60
-#, c-format
-msgid "malformed object at '%s'"
+#: git-bisect.sh:453
+msgid "bisect run failed: no command provided."
 msgstr ""
 
-#: builtin/tag.c:207
-#, c-format
-msgid "tag name too long: %.*s..."
+#: git-bisect.sh:458
+#, sh-format
+msgid "running $command"
 msgstr ""
 
-#: builtin/tag.c:212
-#, c-format
-msgid "tag '%s' not found."
+#: git-bisect.sh:465
+#, sh-format
+msgid ""
+"bisect run failed:\n"
+"exit code $res from '$command' is < 0 or >= 128"
 msgstr ""
 
-#: builtin/tag.c:227
-#, c-format
-msgid "Deleted tag '%s' (was %s)\n"
+#: git-bisect.sh:491
+msgid "bisect run cannot continue any more"
 msgstr ""
 
-#: builtin/tag.c:239
-#, c-format
-msgid "could not verify the tag '%s'"
+#: git-bisect.sh:497
+#, sh-format
+msgid ""
+"bisect run failed:\n"
+"'bisect_state $state' exited with error code $res"
 msgstr ""
 
-#: builtin/tag.c:249
-#, c-format
-msgid ""
-"\n"
-"Write a tag message\n"
-"Lines starting with '%c' will be ignored.\n"
+#: git-bisect.sh:504
+msgid "bisect run success"
 msgstr ""
 
-#: builtin/tag.c:253
-#, c-format
-msgid ""
-"\n"
-"Write a tag message\n"
-"Lines starting with '%c' will be kept; you may remove them yourself if you "
-"want to.\n"
+#: git-bisect.sh:533
+#, sh-format
+msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect."
 msgstr ""
 
-#: builtin/tag.c:292
-msgid "unable to sign the tag"
+#: git-bisect.sh:567
+msgid "no terms defined"
 msgstr ""
 
-#: builtin/tag.c:294
-msgid "unable to write tag file"
+#: git-bisect.sh:584
+#, sh-format
+msgid ""
+"invalid argument $arg for 'git bisect terms'.\n"
+"Supported options are: --term-good|--term-old and --term-bad|--term-new."
 msgstr ""
 
-#: builtin/tag.c:319
-msgid "bad object type."
+#: git-merge-octopus.sh:46
+msgid ""
+"Error: Your local changes to the following files would be overwritten by "
+"merge"
 msgstr ""
 
-#: builtin/tag.c:332
-msgid "tag header too big."
+#: git-merge-octopus.sh:61
+msgid "Automated merge did not work."
 msgstr ""
 
-#: builtin/tag.c:368
-msgid "no tag message?"
+#: git-merge-octopus.sh:62
+msgid "Should not be doing an octopus."
 msgstr ""
 
-#: builtin/tag.c:374
-#, c-format
-msgid "The tag message has been left in %s\n"
+#: git-merge-octopus.sh:73
+#, sh-format
+msgid "Unable to find common commit with $pretty_name"
 msgstr ""
 
-#: builtin/tag.c:423
-msgid "switch 'points-at' requires an object"
+#: git-merge-octopus.sh:77
+#, sh-format
+msgid "Already up to date with $pretty_name"
 msgstr ""
 
-#: builtin/tag.c:425
-#, c-format
-msgid "malformed object name '%s'"
+#: git-merge-octopus.sh:89
+#, sh-format
+msgid "Fast-forwarding to: $pretty_name"
 msgstr ""
 
-#: builtin/tag.c:445
-msgid "list tag names"
+#: git-merge-octopus.sh:97
+#, sh-format
+msgid "Trying simple merge with $pretty_name"
 msgstr ""
 
-#: builtin/tag.c:447
-msgid "print <n> lines of each tag message"
+#: git-merge-octopus.sh:102
+msgid "Simple merge did not work, trying automatic merge."
 msgstr ""
 
-#: builtin/tag.c:449
-msgid "delete tags"
+#: git-legacy-rebase.sh:434
+#, sh-format
+msgid "Could not move back to $head_name"
 msgstr ""
 
-#: builtin/tag.c:450
-msgid "verify tags"
+#: git-legacy-rebase.sh:460
+#, sh-format
+msgid ""
+"It seems that there is already a $state_dir_base directory, and\n"
+"I wonder if you are in the middle of another rebase.  If that is the\n"
+"case, please try\n"
+"\t$cmd_live_rebase\n"
+"If that is not the case, please\n"
+"\t$cmd_clear_stale_rebase\n"
+"and run me again.  I am stopping in case you still have something\n"
+"valuable there."
 msgstr ""
 
-#: builtin/tag.c:452
-msgid "Tag creation options"
+#: git-legacy-rebase.sh:525
+msgid "error: cannot combine '--signoff' with '--preserve-merges'"
 msgstr ""
 
-#: builtin/tag.c:454
-msgid "annotated tag, needs a message"
+#: git-legacy-rebase.sh:570
+#, sh-format
+msgid "invalid upstream '$upstream_name'"
 msgstr ""
 
-#: builtin/tag.c:456
-msgid "tag message"
+#: git-legacy-rebase.sh:594
+#, sh-format
+msgid "$onto_name: there are more than one merge bases"
 msgstr ""
 
-#: builtin/tag.c:458
-msgid "annotated and GPG-signed tag"
+#: git-legacy-rebase.sh:597 git-legacy-rebase.sh:601
+#, sh-format
+msgid "$onto_name: there is no merge base"
 msgstr ""
 
-#: builtin/tag.c:462
-msgid "use another key to sign the tag"
+#: git-legacy-rebase.sh:606
+#, sh-format
+msgid "Does not point to a valid commit: $onto_name"
 msgstr ""
 
-#: builtin/tag.c:463
-msgid "replace the tag if exists"
+#: git-legacy-rebase.sh:632
+#, sh-format
+msgid "fatal: no such branch/commit '$branch_name'"
 msgstr ""
 
-#: builtin/tag.c:464
-msgid "show tag list in columns"
+#: git-legacy-rebase.sh:670
+#, sh-format
+msgid "Created autostash: $stash_abbrev"
 msgstr ""
 
-#: builtin/tag.c:466
-msgid "Tag listing options"
+#: git-legacy-rebase.sh:699
+#, sh-format
+msgid "Current branch $branch_name is up to date."
 msgstr ""
 
-#: builtin/tag.c:469
-msgid "print only tags that contain the commit"
+#: git-legacy-rebase.sh:709
+#, sh-format
+msgid "Current branch $branch_name is up to date, rebase forced."
 msgstr ""
 
-#: builtin/tag.c:475
-msgid "print only tags of the object"
+#: git-legacy-rebase.sh:723
+#, sh-format
+msgid "Changes to $onto:"
 msgstr ""
 
-#: builtin/tag.c:504
-msgid "--column and -n are incompatible"
+#: git-legacy-rebase.sh:725
+#, sh-format
+msgid "Changes from $mb to $onto:"
 msgstr ""
 
-#: builtin/tag.c:521
-msgid "-n option is only allowed with -l."
+#: git-legacy-rebase.sh:736
+msgid "First, rewinding head to replay your work on top of it..."
 msgstr ""
 
-#: builtin/tag.c:523
-msgid "--contains option is only allowed with -l."
+#: git-legacy-rebase.sh:746
+#, sh-format
+msgid "Fast-forwarded $branch_name to $onto_name."
 msgstr ""
 
-#: builtin/tag.c:525
-msgid "--points-at option is only allowed with -l."
+#: git-stash.sh:61
+msgid "git stash clear with parameters is unimplemented"
 msgstr ""
 
-#: builtin/tag.c:533
-msgid "only one -F or -m option is allowed."
+#: git-stash.sh:108
+msgid "You do not have the initial commit yet"
 msgstr ""
 
-#: builtin/tag.c:553
-msgid "too many params"
+#: git-stash.sh:123
+msgid "Cannot save the current index state"
 msgstr ""
 
-#: builtin/tag.c:559
-#, c-format
-msgid "'%s' is not a valid tag name."
+#: git-stash.sh:138
+msgid "Cannot save the untracked files"
 msgstr ""
 
-#: builtin/tag.c:564
-#, c-format
-msgid "tag '%s' already exists"
+#: git-stash.sh:158 git-stash.sh:171
+msgid "Cannot save the current worktree state"
 msgstr ""
 
-#: builtin/tag.c:582
-#, c-format
-msgid "%s: cannot lock the ref"
+#: git-stash.sh:175
+msgid "No changes selected"
 msgstr ""
 
-#: builtin/tag.c:584
-#, c-format
-msgid "%s: cannot update the ref"
+#: git-stash.sh:178
+msgid "Cannot remove temporary index (can't happen)"
 msgstr ""
 
-#: builtin/tag.c:586
-#, c-format
-msgid "Updated tag '%s' (was %s)\n"
+#: git-stash.sh:191
+msgid "Cannot record working tree state"
 msgstr ""
 
-#: builtin/update-index.c:401
-msgid "git update-index [options] [--] [<file>...]"
+#: git-stash.sh:229
+#, sh-format
+msgid "Cannot update $ref_stash with $w_commit"
 msgstr ""
 
-#: builtin/update-index.c:718
-msgid "continue refresh even when index needs update"
+#: git-stash.sh:281
+#, sh-format
+msgid "error: unknown option for 'stash push': $option"
 msgstr ""
 
-#: builtin/update-index.c:721
-msgid "refresh: ignore submodules"
+#: git-stash.sh:295
+msgid "Can't use --patch and --include-untracked or --all at the same time"
 msgstr ""
 
-#: builtin/update-index.c:724
-msgid "do not ignore new files"
+#: git-stash.sh:303
+msgid "No local changes to save"
 msgstr ""
 
-#: builtin/update-index.c:726
-msgid "let files replace directories and vice-versa"
+#: git-stash.sh:308
+msgid "Cannot initialize stash"
 msgstr ""
 
-#: builtin/update-index.c:728
-msgid "notice files missing from worktree"
+#: git-stash.sh:312
+msgid "Cannot save the current status"
 msgstr ""
 
-#: builtin/update-index.c:730
-msgid "refresh even if index contains unmerged entries"
+#: git-stash.sh:313
+#, sh-format
+msgid "Saved working directory and index state $stash_msg"
 msgstr ""
 
-#: builtin/update-index.c:733
-msgid "refresh stat information"
+#: git-stash.sh:342
+msgid "Cannot remove worktree changes"
 msgstr ""
 
-#: builtin/update-index.c:737
-msgid "like --refresh, but ignore assume-unchanged setting"
+#: git-stash.sh:490
+#, sh-format
+msgid "unknown option: $opt"
 msgstr ""
 
-#: builtin/update-index.c:741
-msgid "<mode> <object> <path>"
+#: git-stash.sh:503
+msgid "No stash entries found."
 msgstr ""
 
-#: builtin/update-index.c:742
-msgid "add the specified entry to the index"
+#: git-stash.sh:510
+#, sh-format
+msgid "Too many revisions specified: $REV"
 msgstr ""
 
-#: builtin/update-index.c:746
-msgid "(+/-)x"
+#: git-stash.sh:525
+#, sh-format
+msgid "$reference is not a valid reference"
 msgstr ""
 
-#: builtin/update-index.c:747
-msgid "override the executable bit of the listed files"
+#: git-stash.sh:553
+#, sh-format
+msgid "'$args' is not a stash-like commit"
 msgstr ""
 
-#: builtin/update-index.c:751
-msgid "mark files as \"not changing\""
+#: git-stash.sh:564
+#, sh-format
+msgid "'$args' is not a stash reference"
 msgstr ""
 
-#: builtin/update-index.c:754
-msgid "clear assumed-unchanged bit"
+#: git-stash.sh:572
+msgid "unable to refresh index"
 msgstr ""
 
-#: builtin/update-index.c:757
-msgid "mark files as \"index-only\""
+#: git-stash.sh:576
+msgid "Cannot apply a stash in the middle of a merge"
 msgstr ""
 
-#: builtin/update-index.c:760
-msgid "clear skip-worktree bit"
+#: git-stash.sh:584
+msgid "Conflicts in index. Try without --index."
 msgstr ""
 
-#: builtin/update-index.c:763
-msgid "add to index only; do not add content to object database"
+#: git-stash.sh:586
+msgid "Could not save index tree"
 msgstr ""
 
-#: builtin/update-index.c:765
-msgid "remove named paths even if present in worktree"
+#: git-stash.sh:595
+msgid "Could not restore untracked files from stash entry"
 msgstr ""
 
-#: builtin/update-index.c:767
-msgid "with --stdin: input lines are terminated by null bytes"
+#: git-stash.sh:620
+msgid "Cannot unstage modified files"
 msgstr ""
 
-#: builtin/update-index.c:769
-msgid "read list of paths to be updated from standard input"
+#: git-stash.sh:635
+msgid "Index was not unstashed."
 msgstr ""
 
-#: builtin/update-index.c:773
-msgid "add entries from standard input to the index"
+#: git-stash.sh:649
+msgid "The stash entry is kept in case you need it again."
 msgstr ""
 
-#: builtin/update-index.c:777
-msgid "repopulate stages #2 and #3 for the listed paths"
+#: git-stash.sh:658
+#, sh-format
+msgid "Dropped ${REV} ($s)"
 msgstr ""
 
-#: builtin/update-index.c:781
-msgid "only update entries that differ from HEAD"
+#: git-stash.sh:659
+#, sh-format
+msgid "${REV}: Could not drop stash entry"
 msgstr ""
 
-#: builtin/update-index.c:785
-msgid "ignore files missing from worktree"
+#: git-stash.sh:667
+msgid "No branch name specified"
 msgstr ""
 
-#: builtin/update-index.c:788
-msgid "report actions to standard output"
+#: git-stash.sh:746
+msgid "(To restore them type \"git stash apply\")"
 msgstr ""
 
-#: builtin/update-index.c:790
-msgid "(for porcelains) forget saved unresolved conflicts"
+#: git-submodule.sh:198
+msgid "Relative path can only be used from the toplevel of the working tree"
 msgstr ""
 
-#: builtin/update-index.c:794
-msgid "write index in this format"
+#: git-submodule.sh:208
+#, sh-format
+msgid "repo URL: '$repo' must be absolute or begin with ./|../"
 msgstr ""
 
-#: builtin/update-ref.c:7
-msgid "git update-ref [options] -d <refname> [<oldval>]"
+#: git-submodule.sh:227
+#, sh-format
+msgid "'$sm_path' already exists in the index"
 msgstr ""
 
-#: builtin/update-ref.c:8
-msgid "git update-ref [options]    <refname> <newval> [<oldval>]"
+#: git-submodule.sh:230
+#, sh-format
+msgid "'$sm_path' already exists in the index and is not a submodule"
 msgstr ""
 
-#: builtin/update-ref.c:19
-msgid "delete the reference"
+#: git-submodule.sh:236
+#, sh-format
+msgid ""
+"The following path is ignored by one of your .gitignore files:\n"
+"$sm_path\n"
+"Use -f if you really want to add it."
 msgstr ""
 
-#: builtin/update-ref.c:21
-msgid "update <refname> not the one it points to"
+#: git-submodule.sh:259
+#, sh-format
+msgid "Adding existing repo at '$sm_path' to the index"
 msgstr ""
 
-#: builtin/update-server-info.c:6
-msgid "git update-server-info [--force]"
+#: git-submodule.sh:261
+#, sh-format
+msgid "'$sm_path' already exists and is not a valid git repo"
 msgstr ""
 
-#: builtin/update-server-info.c:14
-msgid "update the info files from scratch"
+#: git-submodule.sh:269
+#, sh-format
+msgid "A git directory for '$sm_name' is found locally with remote(s):"
 msgstr ""
 
-#: builtin/verify-pack.c:56
-msgid "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..."
+#: git-submodule.sh:271
+#, sh-format
+msgid ""
+"If you want to reuse this local git directory instead of cloning again from\n"
+"  $realrepo\n"
+"use the '--force' option. If the local git directory is not the correct "
+"repo\n"
+"or you are unsure what this means choose another name with the '--name' "
+"option."
 msgstr ""
 
-#: builtin/verify-pack.c:66
-msgid "verbose"
+#: git-submodule.sh:277
+#, sh-format
+msgid "Reactivating local git directory for submodule '$sm_name'."
 msgstr ""
 
-#: builtin/verify-pack.c:68
-msgid "show statistics only"
+#: git-submodule.sh:289
+#, sh-format
+msgid "Unable to checkout submodule '$sm_path'"
 msgstr ""
 
-#: builtin/verify-tag.c:17
-msgid "git verify-tag [-v|--verbose] <tag>..."
+#: git-submodule.sh:294
+#, sh-format
+msgid "Failed to add submodule '$sm_path'"
 msgstr ""
 
-#: builtin/verify-tag.c:73
-msgid "print tag contents"
+#: git-submodule.sh:303
+#, sh-format
+msgid "Failed to register submodule '$sm_path'"
 msgstr ""
 
-#: builtin/write-tree.c:13
-msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
+#: git-submodule.sh:563
+#, sh-format
+msgid "Unable to find current revision in submodule path '$displaypath'"
 msgstr ""
 
-#: builtin/write-tree.c:26
-msgid "<prefix>/"
+#: git-submodule.sh:573
+#, sh-format
+msgid "Unable to fetch in submodule path '$sm_path'"
 msgstr ""
 
-#: builtin/write-tree.c:27
-msgid "write tree object for a subdirectory <prefix>"
+#: git-submodule.sh:578
+#, sh-format
+msgid ""
+"Unable to find current ${remote_name}/${branch} revision in submodule path "
+"'$sm_path'"
 msgstr ""
 
-#: builtin/write-tree.c:30
-msgid "only useful for debugging"
+#: git-submodule.sh:596
+#, sh-format
+msgid "Unable to fetch in submodule path '$displaypath'"
 msgstr ""
 
-#: git.c:17
+#: git-submodule.sh:602
+#, sh-format
 msgid ""
-"'git help -a' and 'git help -g' lists available subcommands and some\n"
-"concept guides. See 'git help <command>' or 'git help <concept>'\n"
-"to read about a specific subcommand or concept."
+"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
+"Direct fetching of that commit failed."
 msgstr ""
 
-#: parse-options.h:144
-msgid "expiry date"
+#: git-submodule.sh:609
+#, sh-format
+msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
 msgstr ""
 
-#: parse-options.h:159
-msgid "no-op (backward compatibility)"
+#: git-submodule.sh:610
+#, sh-format
+msgid "Submodule path '$displaypath': checked out '$sha1'"
 msgstr ""
 
-#: parse-options.h:236
-msgid "be more verbose"
+#: git-submodule.sh:614
+#, sh-format
+msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
 msgstr ""
 
-#: parse-options.h:238
-msgid "be more quiet"
+#: git-submodule.sh:615
+#, sh-format
+msgid "Submodule path '$displaypath': rebased into '$sha1'"
 msgstr ""
 
-#: parse-options.h:244
-msgid "use <n> digits to display SHA-1s"
+#: git-submodule.sh:620
+#, sh-format
+msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
 msgstr ""
 
-#: common-cmds.h:8
-msgid "Add file contents to the index"
+#: git-submodule.sh:621
+#, sh-format
+msgid "Submodule path '$displaypath': merged in '$sha1'"
 msgstr ""
 
-#: common-cmds.h:9
-msgid "Find by binary search the change that introduced a bug"
+#: git-submodule.sh:626
+#, sh-format
+msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
 msgstr ""
 
-#: common-cmds.h:10
-msgid "List, create, or delete branches"
+#: git-submodule.sh:627
+#, sh-format
+msgid "Submodule path '$displaypath': '$command $sha1'"
 msgstr ""
 
-#: common-cmds.h:11
-msgid "Checkout a branch or paths to the working tree"
+#: git-submodule.sh:658
+#, sh-format
+msgid "Failed to recurse into submodule path '$displaypath'"
 msgstr ""
 
-#: common-cmds.h:12
-msgid "Clone a repository into a new directory"
+#: git-submodule.sh:754
+msgid "The --cached option cannot be used with the --files option"
 msgstr ""
 
-#: common-cmds.h:13
-msgid "Record changes to the repository"
+#: git-submodule.sh:806
+#, sh-format
+msgid "unexpected mode $mod_dst"
 msgstr ""
 
-#: common-cmds.h:14
-msgid "Show changes between commits, commit and working tree, etc"
+#: git-submodule.sh:826
+#, sh-format
+msgid "  Warn: $display_name doesn't contain commit $sha1_src"
 msgstr ""
 
-#: common-cmds.h:15
-msgid "Download objects and refs from another repository"
+#: git-submodule.sh:829
+#, sh-format
+msgid "  Warn: $display_name doesn't contain commit $sha1_dst"
 msgstr ""
 
-#: common-cmds.h:16
-msgid "Print lines matching a pattern"
+#: git-submodule.sh:832
+#, sh-format
+msgid "  Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
 msgstr ""
 
-#: common-cmds.h:17
-msgid "Create an empty Git repository or reinitialize an existing one"
+#: git-parse-remote.sh:89
+#, sh-format
+msgid "See git-${cmd}(1) for details."
 msgstr ""
 
-#: common-cmds.h:18
-msgid "Show commit logs"
+#: git-rebase--preserve-merges.sh:136
+#, sh-format
+msgid "Rebasing ($new_count/$total)"
 msgstr ""
 
-#: common-cmds.h:19
-msgid "Join two or more development histories together"
+#: git-rebase--preserve-merges.sh:152
+msgid ""
+"\n"
+"Commands:\n"
+"p, pick <commit> = use commit\n"
+"r, reword <commit> = use commit, but edit the commit message\n"
+"e, edit <commit> = use commit, but stop for amending\n"
+"s, squash <commit> = use commit, but meld into previous commit\n"
+"f, fixup <commit> = like \"squash\", but discard this commit's log message\n"
+"x, exec <commit> = run command (the rest of the line) using shell\n"
+"d, drop <commit> = remove commit\n"
+"l, label <label> = label current HEAD with a name\n"
+"t, reset <label> = reset HEAD to a label\n"
+"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
+".       create a merge commit using the original merge commit's\n"
+".       message (or the oneline, if no original merge commit was\n"
+".       specified). Use -c <commit> to reword the commit message.\n"
+"\n"
+"These lines can be re-ordered; they are executed from top to bottom.\n"
 msgstr ""
 
-#: common-cmds.h:20
-msgid "Move or rename a file, a directory, or a symlink"
+#: git-rebase--preserve-merges.sh:215
+#, sh-format
+msgid ""
+"You can amend the commit now, with\n"
+"\n"
+"\tgit commit --amend $gpg_sign_opt_quoted\n"
+"\n"
+"Once you are satisfied with your changes, run\n"
+"\n"
+"\tgit rebase --continue"
 msgstr ""
 
-#: common-cmds.h:21
-msgid "Fetch from and integrate with another repository or a local branch"
+#: git-rebase--preserve-merges.sh:240
+#, sh-format
+msgid "$sha1: not a commit that can be picked"
 msgstr ""
 
-#: common-cmds.h:22
-msgid "Update remote refs along with associated objects"
+#: git-rebase--preserve-merges.sh:279
+#, sh-format
+msgid "Invalid commit name: $sha1"
 msgstr ""
 
-#: common-cmds.h:23
-msgid "Forward-port local commits to the updated upstream head"
+#: git-rebase--preserve-merges.sh:309
+msgid "Cannot write current commit's replacement sha1"
 msgstr ""
 
-#: common-cmds.h:24
-msgid "Reset current HEAD to the specified state"
+#: git-rebase--preserve-merges.sh:360
+#, sh-format
+msgid "Fast-forward to $sha1"
 msgstr ""
 
-#: common-cmds.h:25
-msgid "Remove files from the working tree and from the index"
+#: git-rebase--preserve-merges.sh:362
+#, sh-format
+msgid "Cannot fast-forward to $sha1"
 msgstr ""
 
-#: common-cmds.h:26
-msgid "Show various types of objects"
+#: git-rebase--preserve-merges.sh:371
+#, sh-format
+msgid "Cannot move HEAD to $first_parent"
 msgstr ""
 
-#: common-cmds.h:27
-msgid "Show the working tree status"
+#: git-rebase--preserve-merges.sh:376
+#, sh-format
+msgid "Refusing to squash a merge: $sha1"
 msgstr ""
 
-#: common-cmds.h:28
-msgid "Create, list, delete or verify a tag object signed with GPG"
+#: git-rebase--preserve-merges.sh:394
+#, sh-format
+msgid "Error redoing merge $sha1"
 msgstr ""
 
-#: git-am.sh:50
-msgid "You need to set your committer info first"
+#: git-rebase--preserve-merges.sh:403
+#, sh-format
+msgid "Could not pick $sha1"
 msgstr ""
 
-#: git-am.sh:95
-msgid ""
-"You seem to have moved HEAD since the last 'am' failure.\n"
-"Not rewinding to ORIG_HEAD"
+#: git-rebase--preserve-merges.sh:412
+#, sh-format
+msgid "This is the commit message #${n}:"
 msgstr ""
 
-#: git-am.sh:105
+#: git-rebase--preserve-merges.sh:417
 #, sh-format
-msgid ""
-"When you have resolved this problem, run \"$cmdline --continue\".\n"
-"If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n"
-"To restore the original branch and stop patching, run \"$cmdline --abort\"."
+msgid "The commit message #${n} will be skipped:"
 msgstr ""
 
-#: git-am.sh:121
-msgid "Cannot fall back to three-way merge."
+#: git-rebase--preserve-merges.sh:428
+#, sh-format
+msgid "This is a combination of $count commit."
+msgid_plural "This is a combination of $count commits."
+msgstr[0] ""
+msgstr[1] ""
+
+#: git-rebase--preserve-merges.sh:437
+#, sh-format
+msgid "Cannot write $fixup_msg"
 msgstr ""
 
-#: git-am.sh:137
-msgid "Repository lacks necessary blobs to fall back on 3-way merge."
+#: git-rebase--preserve-merges.sh:440
+msgid "This is a combination of 2 commits."
 msgstr ""
 
-#: git-am.sh:139
-msgid "Using index info to reconstruct a base tree..."
+#: git-rebase--preserve-merges.sh:481 git-rebase--preserve-merges.sh:524
+#: git-rebase--preserve-merges.sh:527
+#, sh-format
+msgid "Could not apply $sha1... $rest"
 msgstr ""
 
-#: git-am.sh:154
+#: git-rebase--preserve-merges.sh:556
+#, sh-format
 msgid ""
-"Did you hand edit your patch?\n"
-"It does not apply to blobs recorded in its index."
+"Could not amend commit after successfully picking $sha1... $rest\n"
+"This is most likely due to an empty commit message, or the pre-commit hook\n"
+"failed. If the pre-commit hook failed, you may need to resolve the issue "
+"before\n"
+"you are able to reword the commit."
 msgstr ""
 
-#: git-am.sh:163
-msgid "Falling back to patching base and 3-way merge..."
+#: git-rebase--preserve-merges.sh:571
+#, sh-format
+msgid "Stopped at $sha1_abbrev... $rest"
 msgstr ""
 
-#: git-am.sh:179
-msgid "Failed to merge in the changes."
+#: git-rebase--preserve-merges.sh:586
+#, sh-format
+msgid "Cannot '$squash_style' without a previous commit"
 msgstr ""
 
-#: git-am.sh:274
-msgid "Only one StGIT patch series can be applied at once"
+#: git-rebase--preserve-merges.sh:628
+#, sh-format
+msgid "Executing: $rest"
 msgstr ""
 
-#: git-am.sh:361
+#: git-rebase--preserve-merges.sh:636
 #, sh-format
-msgid "Patch format $patch_format is not supported."
+msgid "Execution failed: $rest"
 msgstr ""
 
-#: git-am.sh:363
-msgid "Patch format detection failed."
+#: git-rebase--preserve-merges.sh:638
+msgid "and made changes to the index and/or the working tree"
 msgstr ""
 
-#: git-am.sh:389
+#: git-rebase--preserve-merges.sh:640
 msgid ""
-"The -b/--binary option has been a no-op for long time, and\n"
-"it will be removed. Please do not use it anymore."
+"You can fix the problem, and then run\n"
+"\n"
+"\tgit rebase --continue"
+msgstr ""
+
+#. TRANSLATORS: after these lines is a command to be issued by the user
+#: git-rebase--preserve-merges.sh:653
+#, sh-format
+msgid ""
+"Execution succeeded: $rest\n"
+"but left changes to the index and/or the working tree\n"
+"Commit or stash your changes, and then run\n"
+"\n"
+"\tgit rebase --continue"
 msgstr ""
 
-#: git-am.sh:479
+#: git-rebase--preserve-merges.sh:664
 #, sh-format
-msgid "previous rebase directory $dotest still exists but mbox given."
+msgid "Unknown command: $command $sha1 $rest"
 msgstr ""
 
-#: git-am.sh:484
-msgid "Please make up your mind. --skip or --abort?"
+#: git-rebase--preserve-merges.sh:665
+msgid "Please fix this using 'git rebase --edit-todo'."
 msgstr ""
 
-#: git-am.sh:520
+#: git-rebase--preserve-merges.sh:700
 #, sh-format
-msgid ""
-"Stray $dotest directory found.\n"
-"Use \"git am --abort\" to remove it."
+msgid "Successfully rebased and updated $head_name."
 msgstr ""
 
-#: git-am.sh:528
-msgid "Resolve operation not in progress, we are not resuming."
+#: git-rebase--preserve-merges.sh:757
+msgid "Could not remove CHERRY_PICK_HEAD"
 msgstr ""
 
-#: git-am.sh:594
+#: git-rebase--preserve-merges.sh:762
 #, sh-format
-msgid "Dirty index: cannot apply patches (dirty: $files)"
+msgid ""
+"You have staged changes in your working tree.\n"
+"If these changes are meant to be\n"
+"squashed into the previous commit, run:\n"
+"\n"
+"  git commit --amend $gpg_sign_opt_quoted\n"
+"\n"
+"If they are meant to go into a new commit, run:\n"
+"\n"
+"  git commit $gpg_sign_opt_quoted\n"
+"\n"
+"In both cases, once you're done, continue with:\n"
+"\n"
+"  git rebase --continue\n"
 msgstr ""
 
-#: git-am.sh:698
-#, sh-format
+#: git-rebase--preserve-merges.sh:779
+msgid "Error trying to find the author identity to amend commit"
+msgstr ""
+
+#: git-rebase--preserve-merges.sh:784
 msgid ""
-"Patch is empty.  Was it split wrong?\n"
-"If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"
-"To restore the original branch and stop patching run \"$cmdline --abort\"."
+"You have uncommitted changes in your working tree. Please commit them\n"
+"first and then run 'git rebase --continue' again."
 msgstr ""
 
-#: git-am.sh:725
-msgid "Patch does not have a valid e-mail address."
+#: git-rebase--preserve-merges.sh:789 git-rebase--preserve-merges.sh:793
+msgid "Could not commit staged changes."
 msgstr ""
 
-#: git-am.sh:772
-msgid "cannot be interactive without stdin connected to a terminal."
+#: git-rebase--preserve-merges.sh:824 git-rebase--preserve-merges.sh:910
+msgid "Could not execute editor"
 msgstr ""
 
-#: git-am.sh:776
-msgid "Commit Body is:"
+#: git-rebase--preserve-merges.sh:845
+#, sh-format
+msgid "Could not checkout $switch_to"
 msgstr ""
 
-#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
-#. in your translation. The program will only accept English
-#. input at this point.
-#: git-am.sh:783
-msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
+#: git-rebase--preserve-merges.sh:852
+msgid "No HEAD?"
 msgstr ""
 
-#: git-am.sh:819
+#: git-rebase--preserve-merges.sh:853
 #, sh-format
-msgid "Applying: $FIRSTLINE"
+msgid "Could not create temporary $state_dir"
 msgstr ""
 
-#: git-am.sh:840
-msgid ""
-"No changes - did you forget to use 'git add'?\n"
-"If there is nothing left to stage, chances are that something else\n"
-"already introduced the same changes; you might want to skip this patch."
+#: git-rebase--preserve-merges.sh:856
+msgid "Could not mark as interactive"
 msgstr ""
 
-#: git-am.sh:848
-msgid ""
-"You still have unmerged paths in your index\n"
-"did you forget to use 'git add'?"
+#: git-rebase--preserve-merges.sh:888
+#, sh-format
+msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
+msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: git-rebase--preserve-merges.sh:942 git-rebase--preserve-merges.sh:947
+msgid "Could not init rewritten commits"
 msgstr ""
 
-#: git-am.sh:864
-msgid "No changes -- Patch already applied."
+#: git-sh-setup.sh:89 git-sh-setup.sh:94
+#, sh-format
+msgid "usage: $dashless $USAGE"
 msgstr ""
 
-#: git-am.sh:874
+#: git-sh-setup.sh:190
 #, sh-format
-msgid "Patch failed at $msgnum $FIRSTLINE"
+msgid "Cannot chdir to $cdup, the toplevel of the working tree"
 msgstr ""
 
-#: git-am.sh:877
+#: git-sh-setup.sh:199 git-sh-setup.sh:206
 #, sh-format
-msgid ""
-"The copy of the patch that failed is found in:\n"
-"   $dotest/patch"
+msgid "fatal: $program_name cannot be used without a working tree."
 msgstr ""
 
-#: git-am.sh:895
-msgid "applying to an empty history"
+#: git-sh-setup.sh:220
+msgid "Cannot rebase: You have unstaged changes."
 msgstr ""
 
-#: git-bisect.sh:48
-msgid "You need to start by \"git bisect start\""
+#: git-sh-setup.sh:223
+msgid "Cannot rewrite branches: You have unstaged changes."
 msgstr ""
 
-#. TRANSLATORS: Make sure to include [Y] and [n] in your
-#. translation. The program will only accept English input
-#. at this point.
-#: git-bisect.sh:54
-msgid "Do you want me to do it for you [Y/n]? "
+#: git-sh-setup.sh:226
+msgid "Cannot pull with rebase: You have unstaged changes."
 msgstr ""
 
-#: git-bisect.sh:95
+#: git-sh-setup.sh:229
 #, sh-format
-msgid "unrecognised option: '$arg'"
+msgid "Cannot $action: You have unstaged changes."
 msgstr ""
 
-#: git-bisect.sh:99
-#, sh-format
-msgid "'$arg' does not appear to be a valid revision"
+#: git-sh-setup.sh:242
+msgid "Cannot rebase: Your index contains uncommitted changes."
 msgstr ""
 
-#: git-bisect.sh:117
-msgid "Bad HEAD - I need a HEAD"
+#: git-sh-setup.sh:245
+msgid "Cannot pull with rebase: Your index contains uncommitted changes."
 msgstr ""
 
-#: git-bisect.sh:130
+#: git-sh-setup.sh:248
 #, sh-format
-msgid ""
-"Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'."
+msgid "Cannot $action: Your index contains uncommitted changes."
+msgstr ""
+
+#: git-sh-setup.sh:252
+msgid "Additionally, your index contains uncommitted changes."
 msgstr ""
 
-#: git-bisect.sh:140
-msgid "won't bisect on seeked tree"
+#: git-sh-setup.sh:372
+msgid "You need to run this command from the toplevel of the working tree."
 msgstr ""
 
-#: git-bisect.sh:144
-msgid "Bad HEAD - strange symbolic ref"
+#: git-sh-setup.sh:377
+msgid "Unable to determine absolute path of git directory"
 msgstr ""
 
-#: git-bisect.sh:189
-#, sh-format
-msgid "Bad bisect_write argument: $state"
+#. TRANSLATORS: you can adjust this to align "git add -i" status menu
+#: git-add--interactive.perl:196
+#, perl-format
+msgid "%12s %12s %s"
 msgstr ""
 
-#: git-bisect.sh:218
-#, sh-format
-msgid "Bad rev input: $arg"
+#: git-add--interactive.perl:197
+msgid "staged"
 msgstr ""
 
-#: git-bisect.sh:232
-msgid "Please call 'bisect_state' with at least one argument."
+#: git-add--interactive.perl:197
+msgid "unstaged"
 msgstr ""
 
-#: git-bisect.sh:244
-#, sh-format
-msgid "Bad rev input: $rev"
+#: git-add--interactive.perl:253 git-add--interactive.perl:278
+msgid "binary"
 msgstr ""
 
-#: git-bisect.sh:250
-msgid "'git bisect bad' can take only one argument."
+#: git-add--interactive.perl:262 git-add--interactive.perl:316
+msgid "nothing"
 msgstr ""
 
-#. have bad but not good.  we could bisect although
-#. this is less optimum.
-#: git-bisect.sh:273
-msgid "Warning: bisecting only with a bad commit."
+#: git-add--interactive.perl:298 git-add--interactive.perl:313
+msgid "unchanged"
 msgstr ""
 
-#. TRANSLATORS: Make sure to include [Y] and [n] in your
-#. translation. The program will only accept English input
-#. at this point.
-#: git-bisect.sh:279
-msgid "Are you sure [Y/n]? "
+#: git-add--interactive.perl:609
+#, perl-format
+msgid "added %d path\n"
+msgid_plural "added %d paths\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: git-add--interactive.perl:612
+#, perl-format
+msgid "updated %d path\n"
+msgid_plural "updated %d paths\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: git-add--interactive.perl:615
+#, perl-format
+msgid "reverted %d path\n"
+msgid_plural "reverted %d paths\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: git-add--interactive.perl:618
+#, perl-format
+msgid "touched %d path\n"
+msgid_plural "touched %d paths\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: git-add--interactive.perl:627
+msgid "Update"
 msgstr ""
 
-#: git-bisect.sh:289
-msgid ""
-"You need to give me at least one good and one bad revisions.\n"
-"(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
+#: git-add--interactive.perl:639
+msgid "Revert"
 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 can use \"git bisect bad\" and \"git bisect good\" for that.)"
+#: git-add--interactive.perl:662
+#, perl-format
+msgid "note: %s is untracked now.\n"
 msgstr ""
 
-#: git-bisect.sh:363 git-bisect.sh:490
-msgid "We are not bisecting."
+#: git-add--interactive.perl:673
+msgid "Add untracked"
 msgstr ""
 
-#: git-bisect.sh:370
-#, sh-format
-msgid "'$invalid' is not a valid commit"
+#: git-add--interactive.perl:679
+msgid "No untracked files.\n"
 msgstr ""
 
-#: git-bisect.sh:379
-#, sh-format
+#: git-add--interactive.perl:1033
 msgid ""
-"Could not check out original HEAD '$branch'.\n"
-"Try 'git bisect reset <commit>'."
+"If the patch applies cleanly, the edited hunk will immediately be\n"
+"marked for staging."
 msgstr ""
 
-#: git-bisect.sh:406
-msgid "No logfile given"
+#: git-add--interactive.perl:1036
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be\n"
+"marked for stashing."
 msgstr ""
 
-#: git-bisect.sh:407
-#, sh-format
-msgid "cannot read $file for replaying"
+#: git-add--interactive.perl:1039
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be\n"
+"marked for unstaging."
 msgstr ""
 
-#: git-bisect.sh:424
-msgid "?? what are you talking about?"
+#: git-add--interactive.perl:1042 git-add--interactive.perl:1051
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be\n"
+"marked for applying."
 msgstr ""
 
-#: git-bisect.sh:436
-#, sh-format
-msgid "running $command"
+#: git-add--interactive.perl:1045 git-add--interactive.perl:1048
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be\n"
+"marked for discarding."
 msgstr ""
 
-#: git-bisect.sh:443
-#, sh-format
-msgid ""
-"bisect run failed:\n"
-"exit code $res from '$command' is < 0 or >= 128"
+#: git-add--interactive.perl:1085
+#, perl-format
+msgid "failed to open hunk edit file for writing: %s"
 msgstr ""
 
-#: git-bisect.sh:469
-msgid "bisect run cannot continue any more"
+#: git-add--interactive.perl:1086
+msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
 msgstr ""
 
-#: git-bisect.sh:475
-#, sh-format
+#: git-add--interactive.perl:1092
+#, perl-format
 msgid ""
-"bisect run failed:\n"
-"'bisect_state $state' exited with error code $res"
+"---\n"
+"To remove '%s' lines, make them ' ' lines (context).\n"
+"To remove '%s' lines, delete them.\n"
+"Lines starting with %s will be removed.\n"
 msgstr ""
 
-#: git-bisect.sh:482
-msgid "bisect run success"
+#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
+#: git-add--interactive.perl:1100
+msgid ""
+"If it does not apply cleanly, you will be given an opportunity to\n"
+"edit again.  If all lines of the hunk are removed, then the edit is\n"
+"aborted and the hunk is left unchanged.\n"
 msgstr ""
 
-#: git-pull.sh:21
-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'."
+#: git-add--interactive.perl:1114
+#, perl-format
+msgid "failed to open hunk edit file for reading: %s"
 msgstr ""
 
-#: git-pull.sh:25
-msgid "Pull is not possible because you have unmerged files."
+#. TRANSLATORS: do not translate [y/n]
+#. The program will only accept that input
+#. at this point.
+#. Consider translating (saying "no" discards!) as
+#. (saying "n" for "no" discards!) if the translation
+#. of the word "no" does not start with n.
+#: git-add--interactive.perl:1213
+msgid ""
+"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
 msgstr ""
 
-#: git-pull.sh:203
-msgid "updating an unborn branch with changes added to the index"
+#: git-add--interactive.perl:1222
+msgid ""
+"y - stage this hunk\n"
+"n - do not stage this hunk\n"
+"q - quit; do not stage this hunk or any of the remaining ones\n"
+"a - stage this hunk and all later hunks in the file\n"
+"d - do not stage this hunk or any of the later hunks in the file"
 msgstr ""
 
-#. The fetch involved updating the current branch.
-#. The working tree and the index file is still based on the
-#. $orig_head commit, but we are merging into $curr_head.
-#. First update the working tree to match $curr_head.
-#: git-pull.sh:235
-#, sh-format
+#: git-add--interactive.perl:1228
 msgid ""
-"Warning: fetch updated the current branch head.\n"
-"Warning: fast-forwarding your working tree from\n"
-"Warning: commit $orig_head."
+"y - stash this hunk\n"
+"n - do not stash this hunk\n"
+"q - quit; do not stash this hunk or any of the remaining ones\n"
+"a - stash this hunk and all later hunks in the file\n"
+"d - do not stash this hunk or any of the later hunks in the file"
 msgstr ""
 
-#: git-pull.sh:260
-msgid "Cannot merge multiple branches into empty head"
+#: git-add--interactive.perl:1234
+msgid ""
+"y - unstage this hunk\n"
+"n - do not unstage this hunk\n"
+"q - quit; do not unstage this hunk or any of the remaining ones\n"
+"a - unstage this hunk and all later hunks in the file\n"
+"d - do not unstage this hunk or any of the later hunks in the file"
 msgstr ""
 
-#: git-pull.sh:264
-msgid "Cannot rebase onto multiple branches"
+#: git-add--interactive.perl:1240
+msgid ""
+"y - apply this hunk to index\n"
+"n - do not apply this hunk to index\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file"
 msgstr ""
 
-#: git-rebase.sh:54
+#: git-add--interactive.perl:1246
 msgid ""
-"When you have resolved this problem, run \"git rebase --continue\".\n"
-"If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
-"To check out the original branch and stop rebasing, run \"git rebase --abort"
-"\"."
+"y - discard this hunk from worktree\n"
+"n - do not discard this hunk from worktree\n"
+"q - quit; do not discard this hunk or any of the remaining ones\n"
+"a - discard this hunk and all later hunks in the file\n"
+"d - do not discard this hunk or any of the later hunks in the file"
 msgstr ""
 
-#: git-rebase.sh:156
-msgid "Applied autostash."
+#: git-add--interactive.perl:1252
+msgid ""
+"y - discard this hunk from index and worktree\n"
+"n - do not discard this hunk from index and worktree\n"
+"q - quit; do not discard this hunk or any of the remaining ones\n"
+"a - discard this hunk and all later hunks in the file\n"
+"d - do not discard this hunk or any of the later hunks in the file"
 msgstr ""
 
-#: git-rebase.sh:159
-#, sh-format
-msgid "Cannot store $stash_sha1"
+#: git-add--interactive.perl:1258
+msgid ""
+"y - apply this hunk to index and worktree\n"
+"n - do not apply this hunk to index and worktree\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file"
 msgstr ""
 
-#: git-rebase.sh:160
+#: git-add--interactive.perl:1273
 msgid ""
-"Applying autostash resulted in conflicts.\n"
-"Your changes are safe in the stash.\n"
-"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
+"g - select a hunk to go to\n"
+"/ - search for a hunk matching the given regex\n"
+"j - leave this hunk undecided, see next undecided hunk\n"
+"J - leave this hunk undecided, see next hunk\n"
+"k - leave this hunk undecided, see previous undecided hunk\n"
+"K - leave this hunk undecided, see previous hunk\n"
+"s - split the current hunk into smaller hunks\n"
+"e - manually edit the current hunk\n"
+"? - print help\n"
 msgstr ""
 
-#: git-rebase.sh:190
-msgid "The pre-rebase hook refused to rebase."
+#: git-add--interactive.perl:1304
+msgid "The selected hunks do not apply to the index!\n"
 msgstr ""
 
-#: git-rebase.sh:195
-msgid "It looks like git-am is in progress. Cannot rebase."
+#: git-add--interactive.perl:1305
+msgid "Apply them to the worktree anyway? "
 msgstr ""
 
-#: git-rebase.sh:329
-msgid "The --exec option must be used with the --interactive option"
+#: git-add--interactive.perl:1308
+msgid "Nothing was applied.\n"
 msgstr ""
 
-#: git-rebase.sh:334
-msgid "No rebase in progress?"
+#: git-add--interactive.perl:1319
+#, perl-format
+msgid "ignoring unmerged: %s\n"
 msgstr ""
 
-#: git-rebase.sh:345
-msgid "The --edit-todo action can only be used during interactive rebase."
+#: git-add--interactive.perl:1328
+msgid "Only binary files changed.\n"
 msgstr ""
 
-#: git-rebase.sh:352
-msgid "Cannot read HEAD"
+#: git-add--interactive.perl:1330
+msgid "No changes.\n"
 msgstr ""
 
-#: git-rebase.sh:355
-msgid ""
-"You must edit all merge conflicts and then\n"
-"mark them as resolved using git add"
+#: git-add--interactive.perl:1338
+msgid "Patch update"
 msgstr ""
 
-#: git-rebase.sh:373
-#, sh-format
-msgid "Could not move back to $head_name"
+#: git-add--interactive.perl:1390
+#, perl-format
+msgid "Stage mode change [y,n,q,a,d%s,?]? "
 msgstr ""
 
-#: git-rebase.sh:392
-#, sh-format
-msgid ""
-"It seems that there is already a $state_dir_base directory, and\n"
-"I wonder if you are in the middle of another rebase.  If that is the\n"
-"case, please try\n"
-"\t$cmd_live_rebase\n"
-"If that is not the case, please\n"
-"\t$cmd_clear_stale_rebase\n"
-"and run me again.  I am stopping in case you still have something\n"
-"valuable there."
+#: git-add--interactive.perl:1391
+#, perl-format
+msgid "Stage deletion [y,n,q,a,d%s,?]? "
 msgstr ""
 
-#: git-rebase.sh:437
-#, sh-format
-msgid "invalid upstream $upstream_name"
+#: git-add--interactive.perl:1392
+#, perl-format
+msgid "Stage this hunk [y,n,q,a,d%s,?]? "
 msgstr ""
 
-#: git-rebase.sh:461
-#, sh-format
-msgid "$onto_name: there are more than one merge bases"
+#: git-add--interactive.perl:1395
+#, perl-format
+msgid "Stash mode change [y,n,q,a,d%s,?]? "
 msgstr ""
 
-#: git-rebase.sh:464 git-rebase.sh:468
-#, sh-format
-msgid "$onto_name: there is no merge base"
+#: git-add--interactive.perl:1396
+#, perl-format
+msgid "Stash deletion [y,n,q,a,d%s,?]? "
 msgstr ""
 
-#: git-rebase.sh:473
-#, sh-format
-msgid "Does not point to a valid commit: $onto_name"
+#: git-add--interactive.perl:1397
+#, perl-format
+msgid "Stash this hunk [y,n,q,a,d%s,?]? "
 msgstr ""
 
-#: git-rebase.sh:496
-#, sh-format
-msgid "fatal: no such branch: $branch_name"
+#: git-add--interactive.perl:1400
+#, perl-format
+msgid "Unstage mode change [y,n,q,a,d%s,?]? "
 msgstr ""
 
-#: git-rebase.sh:519
-msgid "Cannot autostash"
+#: git-add--interactive.perl:1401
+#, perl-format
+msgid "Unstage deletion [y,n,q,a,d%s,?]? "
 msgstr ""
 
-#: git-rebase.sh:524
-#, sh-format
-msgid "Created autostash: $stash_abbrev"
+#: git-add--interactive.perl:1402
+#, perl-format
+msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
 msgstr ""
 
-#: git-rebase.sh:528
-msgid "Please commit or stash them."
+#: git-add--interactive.perl:1405
+#, perl-format
+msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
 msgstr ""
 
-#: git-rebase.sh:548
-#, sh-format
-msgid "Current branch $branch_name is up to date."
+#: git-add--interactive.perl:1406
+#, perl-format
+msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
 msgstr ""
 
-#: git-rebase.sh:552
-#, sh-format
-msgid "Current branch $branch_name is up to date, rebase forced."
+#: git-add--interactive.perl:1407
+#, perl-format
+msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
 msgstr ""
 
-#: git-rebase.sh:563
-#, sh-format
-msgid "Changes from $mb to $onto:"
+#: git-add--interactive.perl:1410
+#, perl-format
+msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 
-#. Detach HEAD and reset the tree
-#: git-rebase.sh:572
-msgid "First, rewinding head to replay your work on top of it..."
+#: git-add--interactive.perl:1411
+#, perl-format
+msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 
-#: git-rebase.sh:582
-#, sh-format
-msgid "Fast-forwarded $branch_name to $onto_name."
+#: git-add--interactive.perl:1412
+#, perl-format
+msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 
-#: git-stash.sh:51
-msgid "git stash clear with parameters is unimplemented"
+#: git-add--interactive.perl:1415
+#, perl-format
+msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 
-#: git-stash.sh:74
-msgid "You do not have the initial commit yet"
+#: git-add--interactive.perl:1416
+#, perl-format
+msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 
-#: git-stash.sh:89
-msgid "Cannot save the current index state"
+#: git-add--interactive.perl:1417
+#, perl-format
+msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 
-#: git-stash.sh:123 git-stash.sh:136
-msgid "Cannot save the current worktree state"
+#: git-add--interactive.perl:1420
+#, perl-format
+msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 
-#: git-stash.sh:140
-msgid "No changes selected"
+#: git-add--interactive.perl:1421
+#, perl-format
+msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 
-#: git-stash.sh:143
-msgid "Cannot remove temporary index (can't happen)"
+#: git-add--interactive.perl:1422
+#, perl-format
+msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 
-#: git-stash.sh:156
-msgid "Cannot record working tree state"
+#: git-add--interactive.perl:1522
+msgid "No other hunks to goto\n"
 msgstr ""
 
-#: git-stash.sh:190
-#, sh-format
-msgid "Cannot update $ref_stash with $w_commit"
+#: git-add--interactive.perl:1529
+msgid "go to which hunk (<ret> to see more)? "
 msgstr ""
 
-#. TRANSLATORS: $option is an invalid option, like
-#. `--blah-blah'. The 7 spaces at the beginning of the
-#. second line correspond to "error: ". So you should line
-#. up the second line with however many characters the
-#. translation of "error: " takes in your language. E.g. in
-#. English this is:
-#.
-#. $ git stash save --blah-blah 2>&1 | head -n 2
-#. error: unknown option for 'stash save': --blah-blah
-#. To provide a message, use git stash save -- '--blah-blah'
-#: git-stash.sh:241
-#, sh-format
-msgid ""
-"error: unknown option for 'stash save': $option\n"
-"       To provide a message, use git stash save -- '$option'"
+#: git-add--interactive.perl:1531
+msgid "go to which hunk? "
 msgstr ""
 
-#: git-stash.sh:262
-msgid "No local changes to save"
+#: git-add--interactive.perl:1540
+#, perl-format
+msgid "Invalid number: '%s'\n"
 msgstr ""
 
-#: git-stash.sh:268
-msgid ""
-"The following untracked files would NOT be saved but need to be removed by "
-"stash save:"
+#: git-add--interactive.perl:1545
+#, perl-format
+msgid "Sorry, only %d hunk available.\n"
+msgid_plural "Sorry, only %d hunks available.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: git-add--interactive.perl:1571
+msgid "No other hunks to search\n"
 msgstr ""
 
-#: git-stash.sh:270
-msgid ""
-"Aborting. Consider using either the --force or --include-untracked option."
+#: git-add--interactive.perl:1575
+msgid "search for regex? "
 msgstr ""
 
-#: git-stash.sh:274
-msgid "Cannot initialize stash"
+#: git-add--interactive.perl:1588
+#, perl-format
+msgid "Malformed search regexp %s: %s\n"
 msgstr ""
 
-#: git-stash.sh:278
-msgid "Cannot save the current status"
+#: git-add--interactive.perl:1598
+msgid "No hunk matches the given pattern\n"
 msgstr ""
 
-#: git-stash.sh:296
-msgid "Cannot remove worktree changes"
+#: git-add--interactive.perl:1610 git-add--interactive.perl:1632
+msgid "No previous hunk\n"
 msgstr ""
 
-#: git-stash.sh:395
-msgid "No stash found."
+#: git-add--interactive.perl:1619 git-add--interactive.perl:1638
+msgid "No next hunk\n"
 msgstr ""
 
-#: git-stash.sh:402
-#, sh-format
-msgid "Too many revisions specified: $REV"
+#: git-add--interactive.perl:1644
+msgid "Sorry, cannot split this hunk\n"
 msgstr ""
 
-#: git-stash.sh:408
-#, sh-format
-msgid "$reference is not valid reference"
+#: git-add--interactive.perl:1650
+#, perl-format
+msgid "Split into %d hunk.\n"
+msgid_plural "Split into %d hunks.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: git-add--interactive.perl:1660
+msgid "Sorry, cannot edit this hunk\n"
 msgstr ""
 
-#: git-stash.sh:436
-#, sh-format
-msgid "'$args' is not a stash-like commit"
+#: git-add--interactive.perl:1706
+msgid "Review diff"
 msgstr ""
 
-#: git-stash.sh:447
-#, sh-format
-msgid "'$args' is not a stash reference"
+#. TRANSLATORS: please do not translate the command names
+#. 'status', 'update', 'revert', etc.
+#: git-add--interactive.perl:1725
+msgid ""
+"status        - show paths with changes\n"
+"update        - add working tree state to the staged set of changes\n"
+"revert        - revert staged set of changes back to the HEAD version\n"
+"patch         - pick hunks and update selectively\n"
+"diff          - view diff between HEAD and index\n"
+"add untracked - add contents of untracked files to the staged set of "
+"changes\n"
 msgstr ""
 
-#: git-stash.sh:455
-msgid "unable to refresh index"
+#: git-add--interactive.perl:1742 git-add--interactive.perl:1747
+#: git-add--interactive.perl:1750 git-add--interactive.perl:1757
+#: git-add--interactive.perl:1761 git-add--interactive.perl:1767
+msgid "missing --"
 msgstr ""
 
-#: git-stash.sh:459
-msgid "Cannot apply a stash in the middle of a merge"
+#: git-add--interactive.perl:1763
+#, perl-format
+msgid "unknown --patch mode: %s"
 msgstr ""
 
-#: git-stash.sh:467
-msgid "Conflicts in index. Try without --index."
+#: git-add--interactive.perl:1769 git-add--interactive.perl:1775
+#, perl-format
+msgid "invalid argument %s, expecting --"
 msgstr ""
 
-#: git-stash.sh:469
-msgid "Could not save index tree"
+#: git-send-email.perl:138
+msgid "local zone differs from GMT by a non-minute interval\n"
 msgstr ""
 
-#: git-stash.sh:503
-msgid "Cannot unstage modified files"
+#: git-send-email.perl:145 git-send-email.perl:151
+msgid "local time offset greater than or equal to 24 hours\n"
 msgstr ""
 
-#: git-stash.sh:518
-msgid "Index was not unstashed."
+#: git-send-email.perl:219 git-send-email.perl:225
+msgid "the editor exited uncleanly, aborting everything"
 msgstr ""
 
-#: git-stash.sh:535
-#, sh-format
-msgid "Dropped ${REV} ($s)"
+#: git-send-email.perl:302
+#, perl-format
+msgid ""
+"'%s' contains an intermediate version of the email you were composing.\n"
 msgstr ""
 
-#: git-stash.sh:536
-#, sh-format
-msgid "${REV}: Could not drop stash entry"
+#: git-send-email.perl:307
+#, perl-format
+msgid "'%s.final' contains the composed email.\n"
 msgstr ""
 
-#: git-stash.sh:543
-msgid "No branch name specified"
+#: git-send-email.perl:326
+msgid "--dump-aliases incompatible with other options\n"
 msgstr ""
 
-#: git-stash.sh:615
-msgid "(To restore them type \"git stash apply\")"
+#: git-send-email.perl:395 git-send-email.perl:650
+msgid "Cannot run git format-patch from outside a repository\n"
 msgstr ""
 
-#: git-submodule.sh:95
-#, sh-format
-msgid "cannot strip one component off url '$remoteurl'"
+#: git-send-email.perl:398
+msgid ""
+"`batch-size` and `relogin` must be specified together (via command-line or "
+"configuration option)\n"
 msgstr ""
 
-#: git-submodule.sh:237
-#, sh-format
-msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
+#: git-send-email.perl:468
+#, perl-format
+msgid "Unknown --suppress-cc field: '%s'\n"
 msgstr ""
 
-#: git-submodule.sh:281
-#, sh-format
-msgid "Clone of '$url' into submodule path '$sm_path' failed"
+#: git-send-email.perl:497
+#, perl-format
+msgid "Unknown --confirm setting: '%s'\n"
 msgstr ""
 
-#: git-submodule.sh:293
-#, sh-format
-msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
+#: git-send-email.perl:525
+#, perl-format
+msgid "warning: sendmail alias with quotes is not supported: %s\n"
 msgstr ""
 
-#: git-submodule.sh:403
-msgid "Relative path can only be used from the toplevel of the working tree"
+#: git-send-email.perl:527
+#, perl-format
+msgid "warning: `:include:` not supported: %s\n"
 msgstr ""
 
-#: git-submodule.sh:413
-#, sh-format
-msgid "repo URL: '$repo' must be absolute or begin with ./|../"
+#: git-send-email.perl:529
+#, perl-format
+msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
 msgstr ""
 
-#: git-submodule.sh:430
-#, sh-format
-msgid "'$sm_path' already exists in the index"
+#: git-send-email.perl:534
+#, perl-format
+msgid "warning: sendmail line is not recognized: %s\n"
 msgstr ""
 
-#: git-submodule.sh:434
-#, sh-format
+#: git-send-email.perl:616
+#, perl-format
 msgid ""
-"The following path is ignored by one of your .gitignore files:\n"
-"$sm_path\n"
-"Use -f if you really want to add it."
+"File '%s' exists but it could also be the range of commits\n"
+"to produce patches for.  Please disambiguate by...\n"
+"\n"
+"    * Saying \"./%s\" if you mean a file; or\n"
+"    * Giving --format-patch option if you mean a range.\n"
 msgstr ""
 
-#: git-submodule.sh:452
-#, sh-format
-msgid "Adding existing repo at '$sm_path' to the index"
+#: git-send-email.perl:637
+#, perl-format
+msgid "Failed to opendir %s: %s"
 msgstr ""
 
-#: git-submodule.sh:454
-#, sh-format
-msgid "'$sm_path' already exists and is not a valid git repo"
+#: git-send-email.perl:661
+#, perl-format
+msgid ""
+"fatal: %s: %s\n"
+"warning: no patches were sent\n"
 msgstr ""
 
-#: git-submodule.sh:462
-#, sh-format
-msgid "A git directory for '$sm_name' is found locally with remote(s):"
+#: git-send-email.perl:672
+msgid ""
+"\n"
+"No patch files specified!\n"
+"\n"
 msgstr ""
 
-#: git-submodule.sh:464
-#, sh-format
-msgid ""
-"If you want to reuse this local git directory instead of cloning again from"
+#: git-send-email.perl:685
+#, perl-format
+msgid "No subject line in %s?"
 msgstr ""
 
-#: git-submodule.sh:466
-#, sh-format
-msgid ""
-"use the '--force' option. If the local git directory is not the correct repo"
+#: git-send-email.perl:695
+#, perl-format
+msgid "Failed to open for writing %s: %s"
 msgstr ""
 
-#: git-submodule.sh:467
-#, sh-format
+#: git-send-email.perl:706
 msgid ""
-"or you are unsure what this means choose another name with the '--name' "
-"option."
+"Lines beginning in \"GIT:\" will be removed.\n"
+"Consider including an overall diffstat or table of contents\n"
+"for the patch you are writing.\n"
+"\n"
+"Clear the body content if you don't wish to send a summary.\n"
 msgstr ""
 
-#: git-submodule.sh:469
-#, sh-format
-msgid "Reactivating local git directory for submodule '$sm_name'."
+#: git-send-email.perl:730
+#, perl-format
+msgid "Failed to open %s: %s"
 msgstr ""
 
-#: git-submodule.sh:481
-#, sh-format
-msgid "Unable to checkout submodule '$sm_path'"
+#: git-send-email.perl:747
+#, perl-format
+msgid "Failed to open %s.final: %s"
 msgstr ""
 
-#: git-submodule.sh:486
-#, sh-format
-msgid "Failed to add submodule '$sm_path'"
+#: git-send-email.perl:790
+msgid "Summary email is empty, skipping it\n"
 msgstr ""
 
-#: git-submodule.sh:495
-#, sh-format
-msgid "Failed to register submodule '$sm_path'"
+#. TRANSLATORS: please keep [y/N] as is.
+#: git-send-email.perl:825
+#, perl-format
+msgid "Are you sure you want to use <%s> [y/N]? "
 msgstr ""
 
-#: git-submodule.sh:539
-#, sh-format
-msgid "Entering '$prefix$displaypath'"
+#: git-send-email.perl:880
+msgid ""
+"The following files are 8bit, but do not declare a Content-Transfer-"
+"Encoding.\n"
 msgstr ""
 
-#: git-submodule.sh:554
-#, sh-format
-msgid "Stopping at '$prefix$displaypath'; script returned non-zero status."
+#: git-send-email.perl:885
+msgid "Which 8bit encoding should I declare [UTF-8]? "
 msgstr ""
 
-#: git-submodule.sh:600
-#, sh-format
-msgid "No url found for submodule path '$displaypath' in .gitmodules"
+#: git-send-email.perl:893
+#, perl-format
+msgid ""
+"Refusing to send because the patch\n"
+"\t%s\n"
+"has the template subject '*** SUBJECT HERE ***'. Pass --force if you really "
+"want to send.\n"
 msgstr ""
 
-#: git-submodule.sh:609
-#, sh-format
-msgid "Failed to register url for submodule path '$displaypath'"
+#: git-send-email.perl:912
+msgid "To whom should the emails be sent (if anyone)?"
 msgstr ""
 
-#: git-submodule.sh:611
-#, sh-format
-msgid "Submodule '$name' ($url) registered for path '$displaypath'"
+#: git-send-email.perl:930
+#, perl-format
+msgid "fatal: alias '%s' expands to itself\n"
 msgstr ""
 
-#: git-submodule.sh:619
-#, sh-format
-msgid "Failed to register update mode for submodule path '$displaypath'"
+#: git-send-email.perl:942
+msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
 msgstr ""
 
-#: git-submodule.sh:656
-#, sh-format
-msgid "Use '.' if you really want to deinitialize all submodules"
+#: git-send-email.perl:1000 git-send-email.perl:1008
+#, perl-format
+msgid "error: unable to extract a valid address from: %s\n"
 msgstr ""
 
-#: git-submodule.sh:673
-#, sh-format
-msgid "Submodule work tree '$displaypath' contains a .git directory"
+#. TRANSLATORS: Make sure to include [q] [d] [e] in your
+#. translation. The program will only accept English input
+#. at this point.
+#: git-send-email.perl:1012
+msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
 msgstr ""
 
-#: git-submodule.sh:674
-#, sh-format
-msgid ""
-"(use 'rm -rf' if you really want to remove it including all of its history)"
+#: git-send-email.perl:1329
+#, perl-format
+msgid "CA path \"%s\" does not exist"
 msgstr ""
 
-#: git-submodule.sh:680
-#, sh-format
+#: git-send-email.perl:1412
 msgid ""
-"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
-"discard them"
+"    The Cc list above has been expanded by additional\n"
+"    addresses found in the patch commit message. By default\n"
+"    send-email prompts before sending whenever this occurs.\n"
+"    This behavior is controlled by the sendemail.confirm\n"
+"    configuration setting.\n"
+"\n"
+"    For additional information, run 'git send-email --help'.\n"
+"    To retain the current behavior, but squelch this message,\n"
+"    run 'git config --global sendemail.confirm auto'.\n"
+"\n"
 msgstr ""
 
-#: git-submodule.sh:683
-#, sh-format
-msgid "Cleared directory '$displaypath'"
+#. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your
+#. translation. The program will only accept English input
+#. at this point.
+#: git-send-email.perl:1427
+msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
 msgstr ""
 
-#: git-submodule.sh:684
-#, sh-format
-msgid "Could not remove submodule work tree '$displaypath'"
+#: git-send-email.perl:1430
+msgid "Send this email reply required"
 msgstr ""
 
-#: git-submodule.sh:687
-#, sh-format
-msgid "Could not create empty submodule directory '$displaypath'"
+#: git-send-email.perl:1458
+msgid "The required SMTP server is not properly defined."
 msgstr ""
 
-#: git-submodule.sh:696
-#, sh-format
-msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
+#: git-send-email.perl:1505
+#, perl-format
+msgid "Server does not support STARTTLS! %s"
 msgstr ""
 
-#: git-submodule.sh:811
-#, sh-format
-msgid ""
-"Submodule path '$displaypath' not initialized\n"
-"Maybe you want to use 'update --init'?"
+#: git-send-email.perl:1510 git-send-email.perl:1514
+#, perl-format
+msgid "STARTTLS failed! %s"
 msgstr ""
 
-#: git-submodule.sh:824
-#, sh-format
-msgid "Unable to find current revision in submodule path '$displaypath'"
+#: git-send-email.perl:1523
+msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
 msgstr ""
 
-#: git-submodule.sh:833
-#, sh-format
-msgid "Unable to fetch in submodule path '$sm_path'"
+#: git-send-email.perl:1541
+#, perl-format
+msgid "Failed to send %s\n"
 msgstr ""
 
-#: git-submodule.sh:857
-#, sh-format
-msgid "Unable to fetch in submodule path '$displaypath'"
+#: git-send-email.perl:1544
+#, perl-format
+msgid "Dry-Sent %s\n"
 msgstr ""
 
-#: git-submodule.sh:871
-#, sh-format
-msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
+#: git-send-email.perl:1544
+#, perl-format
+msgid "Sent %s\n"
 msgstr ""
 
-#: git-submodule.sh:872
-#, sh-format
-msgid "Submodule path '$displaypath': rebased into '$sha1'"
+#: git-send-email.perl:1546
+msgid "Dry-OK. Log says:\n"
 msgstr ""
 
-#: git-submodule.sh:877
-#, sh-format
-msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
+#: git-send-email.perl:1546
+msgid "OK. Log says:\n"
 msgstr ""
 
-#: git-submodule.sh:878
-#, sh-format
-msgid "Submodule path '$displaypath': merged in '$sha1'"
+#: git-send-email.perl:1558
+msgid "Result: "
 msgstr ""
 
-#: git-submodule.sh:883
-#, sh-format
-msgid ""
-"Execution of '$command $sha1' failed in submodule  path '$prefix$sm_path'"
+#: git-send-email.perl:1561
+msgid "Result: OK\n"
 msgstr ""
 
-#: git-submodule.sh:884
-#, sh-format
-msgid "Submodule path '$prefix$sm_path': '$command $sha1'"
+#: git-send-email.perl:1579
+#, perl-format
+msgid "can't open file %s"
 msgstr ""
 
-#: git-submodule.sh:889
-#, sh-format
-msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
+#: git-send-email.perl:1626 git-send-email.perl:1646
+#, perl-format
+msgid "(mbox) Adding cc: %s from line '%s'\n"
 msgstr ""
 
-#: git-submodule.sh:890
-#, sh-format
-msgid "Submodule path '$displaypath': checked out '$sha1'"
+#: git-send-email.perl:1632
+#, perl-format
+msgid "(mbox) Adding to: %s from line '%s'\n"
 msgstr ""
 
-#: git-submodule.sh:917
-#, sh-format
-msgid "Failed to recurse into submodule path '$displaypath'"
+#: git-send-email.perl:1685
+#, perl-format
+msgid "(non-mbox) Adding cc: %s from line '%s'\n"
 msgstr ""
 
-#: git-submodule.sh:1025
-msgid "The --cached option cannot be used with the --files option"
+#: git-send-email.perl:1720
+#, perl-format
+msgid "(body) Adding cc: %s from line '%s'\n"
 msgstr ""
 
-#. unexpected type
-#: git-submodule.sh:1066
-#, sh-format
-msgid "unexpected mode $mod_dst"
+#: git-send-email.perl:1831
+#, perl-format
+msgid "(%s) Could not execute '%s'"
 msgstr ""
 
-#: git-submodule.sh:1086
-#, sh-format
-msgid "  Warn: $display_name doesn't contain commit $sha1_src"
+#: git-send-email.perl:1838
+#, perl-format
+msgid "(%s) Adding %s: %s from: '%s'\n"
 msgstr ""
 
-#: git-submodule.sh:1089
-#, sh-format
-msgid "  Warn: $display_name doesn't contain commit $sha1_dst"
+#: git-send-email.perl:1842
+#, perl-format
+msgid "(%s) failed to close pipe to '%s'"
 msgstr ""
 
-#: git-submodule.sh:1092
-#, sh-format
-msgid "  Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
+#: git-send-email.perl:1872
+msgid "cannot send message as 7bit"
 msgstr ""
 
-#: git-submodule.sh:1117
-msgid "blob"
+#: git-send-email.perl:1880
+msgid "invalid transfer encoding"
 msgstr ""
 
-#: git-submodule.sh:1155
-msgid "Submodules changed but not updated:"
+#: git-send-email.perl:1921 git-send-email.perl:1973 git-send-email.perl:1983
+#, perl-format
+msgid "unable to open %s: %s\n"
 msgstr ""
 
-#: git-submodule.sh:1157
-msgid "Submodule changes to be committed:"
+#: git-send-email.perl:1924
+#, perl-format
+msgid "%s: patch contains a line longer than 998 characters"
 msgstr ""
 
-#: git-submodule.sh:1242
-#, sh-format
-msgid "Failed to recurse into submodule path '$sm_path'"
+#: git-send-email.perl:1941
+#, perl-format
+msgid "Skipping %s with backup suffix '%s'.\n"
 msgstr ""
 
-#: git-submodule.sh:1306
-#, sh-format
-msgid "Synchronizing submodule url for '$displaypath'"
+#. TRANSLATORS: please keep "[y|N]" as is.
+#: git-send-email.perl:1945
+#, perl-format
+msgid "Do you really want to send %s? [y|N]: "
 msgstr ""