git p4 test: wait longer for p4d to start and test its pid

diff --git a/po/git.pot b/po/git.pot
index 67acae411646befb342b238485aa4b45c62fa3a1..b6665060de23353efecb6307830d4ae11689dcca 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: 2012-04-28 20:33+0800\n"
+"POT-Creation-Date: 2012-06-08 10:20+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,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: advice.c:34
+#: advice.c:40
 #, c-format
 msgid "hint: %.*s\n"
 msgstr ""
@@ -27,7 +27,7 @@ msgstr ""
 #. * Message used both when 'git commit' fails and when
 #. * other commands doing a merge do.
 #.
-#: advice.c:64
+#: advice.c:70
 msgid ""
 "Fix them up in the work tree,\n"
 "and then use 'git add/rm <file>' as\n"
@@ -35,12 +35,86 @@ msgid ""
 "or use 'git commit -a'."
 msgstr ""
 
-#: commit.c:47
+#: bundle.c:36
+#, c-format
+msgid "'%s' does not look like a v2 bundle file"
+msgstr ""
+
+#: bundle.c:63
+#, c-format
+msgid "unrecognized header: %s%s (%d)"
+msgstr ""
+
+#: bundle.c:89 builtin/commit.c:696
+#, c-format
+msgid "could not open '%s'"
+msgstr ""
+
+#: bundle.c:140
+msgid "Repository lacks these prerequisite commits:"
+msgstr ""
+
+#: bundle.c:164 sequencer.c:550 sequencer.c:982 builtin/log.c:289
+#: builtin/log.c:720 builtin/log.c:1309 builtin/log.c:1528 builtin/merge.c:347
+#: builtin/shortlog.c:181
+msgid "revision walk setup failed"
+msgstr ""
+
+#: bundle.c:186
+#, c-format
+msgid "The bundle contains %d ref"
+msgid_plural "The bundle contains %d refs"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bundle.c:192
+#, c-format
+msgid "The bundle requires this ref"
+msgid_plural "The bundle requires these %d refs"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bundle.c:290
+msgid "rev-list died"
+msgstr ""
+
+#: bundle.c:296 builtin/log.c:1205 builtin/shortlog.c:284
+#, c-format
+msgid "unrecognized argument: %s"
+msgstr ""
+
+#: bundle.c:331
+#, c-format
+msgid "ref '%s' is excluded by the rev-list options"
+msgstr ""
+
+#: bundle.c:376
+msgid "Refusing to create empty bundle."
+msgstr ""
+
+#: bundle.c:394
+msgid "Could not spawn pack-objects"
+msgstr ""
+
+#: bundle.c:412
+msgid "pack-objects died"
+msgstr ""
+
+#: bundle.c:415
+#, c-format
+msgid "cannot create '%s'"
+msgstr ""
+
+#: bundle.c:437
+msgid "index-pack died"
+msgstr ""
+
+#: commit.c:48
 #, c-format
 msgid "could not parse %s"
 msgstr ""
 
-#: commit.c:49
+#: commit.c:50
 #, c-format
 msgid "%s %s is not a commit!"
 msgstr ""
@@ -63,6 +137,73 @@ msgstr ""
 msgid "failed to close rev-list's stdin: %s"
 msgstr ""
 
+#: date.c:95
+msgid "in the future"
+msgstr ""
+
+#: date.c:101
+#, c-format
+msgid "%lu second ago"
+msgid_plural "%lu seconds ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: date.c:108
+#, c-format
+msgid "%lu minute ago"
+msgid_plural "%lu minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: date.c:115
+#, c-format
+msgid "%lu hour ago"
+msgid_plural "%lu hours ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: date.c:122
+#, c-format
+msgid "%lu day ago"
+msgid_plural "%lu days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: date.c:128
+#, c-format
+msgid "%lu week ago"
+msgid_plural "%lu weeks ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: date.c:135
+#, c-format
+msgid "%lu month ago"
+msgid_plural "%lu months ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: date.c:146
+#, c-format
+msgid "%lu year"
+msgid_plural "%lu years"
+msgstr[0] ""
+msgstr[1] ""
+
+#: date.c:149
+#, c-format
+msgid "%s, %lu month ago"
+msgid_plural "%s, %lu months ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: date.c:154 date.c:159
+#, c-format
+msgid "%lu year ago"
+msgid_plural "%lu years ago"
+msgstr[0] ""
+msgstr[1] ""
+
 #: diff.c:105
 #, c-format
 msgid "  Failed to parse dirstat cut-off percentage '%.*s'\n"
@@ -105,7 +246,7 @@ msgid_plural ", %d deletions(-)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: diff.c:3435
+#: diff.c:3478
 #, c-format
 msgid ""
 "Failed to parse --dirstat/-X option parameter:\n"
@@ -124,36 +265,97 @@ msgstr ""
 msgid "gpg failed to sign the data"
 msgstr ""
 
-#: grep.c:1280
+#: grep.c:1320
 #, c-format
 msgid "'%s': unable to read %s"
 msgstr ""
 
-#: grep.c:1297
+#: grep.c:1337
 #, c-format
 msgid "'%s': %s"
 msgstr ""
 
-#: grep.c:1308
+#: grep.c:1348
 #, c-format
 msgid "'%s': short read %s"
 msgstr ""
 
-#: help.c:287
+#: help.c:207
+#, c-format
+msgid "available git commands in '%s'"
+msgstr ""
+
+#: help.c:214
+msgid "git commands available from elsewhere on your $PATH"
+msgstr ""
+
+#: help.c:270
 #, c-format
 msgid ""
 "'%s' appears to be a git command, but we were not\n"
 "able to execute it. Maybe git-%s is broken?"
 msgstr ""
 
-#: remote.c:1607
+#: help.c:327
+msgid "Uh oh. Your system reports no Git commands at all."
+msgstr ""
+
+#: help.c:349
+#, c-format
+msgid ""
+"WARNING: You called a Git command named '%s', which does not exist.\n"
+"Continuing under the assumption that you meant '%s'"
+msgstr ""
+
+#: help.c:354
+#, c-format
+msgid "in %0.1f seconds automatically..."
+msgstr ""
+
+#: help.c:361
+#, c-format
+msgid "git: '%s' is not a git command. See 'git --help'."
+msgstr ""
+
+#: help.c:365
+msgid ""
+"\n"
+"Did you mean this?"
+msgid_plural ""
+"\n"
+"Did you mean one of these?"
+msgstr[0] ""
+msgstr[1] ""
+
+#: parse-options.c:493
+msgid "..."
+msgstr ""
+
+#: parse-options.c:511
+#, c-format
+msgid "usage: %s"
+msgstr ""
+
+#. TRANSLATORS: the colon here should align with the
+#. one in "usage: %s" translation
+#: parse-options.c:515
+#, c-format
+msgid "   or: %s"
+msgstr ""
+
+#: parse-options.c:518
+#, c-format
+msgid "    %s"
+msgstr ""
+
+#: remote.c:1629
 #, 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:1613
+#: remote.c:1635
 #, c-format
 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
 msgid_plural ""
@@ -161,7 +363,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: remote.c:1621
+#: remote.c:1643
 #, c-format
 msgid ""
 "Your branch and '%s' have diverged,\n"
@@ -172,456 +374,496 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: sequencer.c:120 builtin/merge.c:864 builtin/merge.c:985
-#: builtin/merge.c:1095 builtin/merge.c:1105
+#: sequencer.c:121 builtin/merge.c:865 builtin/merge.c:978
+#: builtin/merge.c:1088 builtin/merge.c:1098
 #, c-format
 msgid "Could not open '%s' for writing"
 msgstr ""
 
-#: sequencer.c:122 builtin/merge.c:334 builtin/merge.c:867
-#: builtin/merge.c:1097 builtin/merge.c:1110
+#: sequencer.c:123 builtin/merge.c:333 builtin/merge.c:868
+#: builtin/merge.c:1090 builtin/merge.c:1103
 #, c-format
 msgid "Could not write to '%s'"
 msgstr ""
 
-#: sequencer.c:143
+#: sequencer.c:144
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'"
 msgstr ""
 
-#: sequencer.c:146
+#: sequencer.c:147
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'\n"
 "and commit the result with 'git commit'"
 msgstr ""
 
-#: sequencer.c:159 sequencer.c:685 sequencer.c:768
+#: sequencer.c:160 sequencer.c:758 sequencer.c:841
 #, c-format
 msgid "Could not write to %s"
 msgstr ""
 
-#: sequencer.c:162
+#: sequencer.c:163
 #, c-format
 msgid "Error wrapping up %s"
 msgstr ""
 
-#: sequencer.c:177
+#: sequencer.c:178
 msgid "Your local changes would be overwritten by cherry-pick."
 msgstr ""
 
-#: sequencer.c:179
+#: sequencer.c:180
 msgid "Your local changes would be overwritten by revert."
 msgstr ""
 
-#: sequencer.c:182
+#: sequencer.c:183
 msgid "Commit your changes or stash them to proceed."
 msgstr ""
 
 #. TRANSLATORS: %s will be "revert" or "cherry-pick"
-#: sequencer.c:232
+#: sequencer.c:233
 #, c-format
 msgid "%s: Unable to write new index file"
 msgstr ""
 
-#: sequencer.c:298
+#: sequencer.c:261
+msgid "Could not resolve HEAD commit\n"
+msgstr ""
+
+#: sequencer.c:282
+msgid "Unable to update cache tree\n"
+msgstr ""
+
+#: sequencer.c:324
+#, c-format
+msgid "Could not parse commit %s\n"
+msgstr ""
+
+#: sequencer.c:329
+#, c-format
+msgid "Could not parse parent commit %s\n"
+msgstr ""
+
+#: sequencer.c:395
 msgid "Your index file is unmerged."
 msgstr ""
 
-#: sequencer.c:301
+#: sequencer.c:398
 msgid "You do not have a valid HEAD"
 msgstr ""
 
-#: sequencer.c:316
+#: sequencer.c:413
 #, c-format
 msgid "Commit %s is a merge but no -m option was given."
 msgstr ""
 
-#: sequencer.c:324
+#: sequencer.c:421
 #, c-format
 msgid "Commit %s does not have parent %d"
 msgstr ""
 
-#: sequencer.c:328
+#: sequencer.c:425
 #, c-format
 msgid "Mainline was specified but commit %s is not a merge."
 msgstr ""
 
 #. TRANSLATORS: The first %s will be "revert" or
 #. "cherry-pick", the second %s a SHA1
-#: sequencer.c:339
+#: sequencer.c:436
 #, c-format
 msgid "%s: cannot parse parent commit %s"
 msgstr ""
 
-#: sequencer.c:343
+#: sequencer.c:440
 #, c-format
 msgid "Cannot get commit message for %s"
 msgstr ""
 
-#: sequencer.c:427
+#: sequencer.c:524
 #, c-format
 msgid "could not revert %s... %s"
 msgstr ""
 
-#: sequencer.c:428
+#: sequencer.c:525
 #, c-format
 msgid "could not apply %s... %s"
 msgstr ""
 
-#: sequencer.c:450 sequencer.c:909 builtin/log.c:288 builtin/log.c:713
-#: builtin/log.c:1329 builtin/log.c:1548 builtin/merge.c:348
-#: builtin/shortlog.c:181
-msgid "revision walk setup failed"
-msgstr ""
-
-#: sequencer.c:453
+#: sequencer.c:553
 msgid "empty commit set passed"
 msgstr ""
 
-#: sequencer.c:461
+#: sequencer.c:561
 #, c-format
 msgid "git %s: failed to read the index"
 msgstr ""
 
-#: sequencer.c:466
+#: sequencer.c:566
 #, c-format
 msgid "git %s: failed to refresh the index"
 msgstr ""
 
-#: sequencer.c:551
+#: sequencer.c:624
 #, c-format
 msgid "Cannot %s during a %s"
 msgstr ""
 
-#: sequencer.c:573
+#: sequencer.c:646
 #, c-format
 msgid "Could not parse line %d."
 msgstr ""
 
-#: sequencer.c:578
+#: sequencer.c:651
 msgid "No commits parsed."
 msgstr ""
 
-#: sequencer.c:591
+#: sequencer.c:664
 #, c-format
 msgid "Could not open %s"
 msgstr ""
 
-#: sequencer.c:595
+#: sequencer.c:668
 #, c-format
 msgid "Could not read %s."
 msgstr ""
 
-#: sequencer.c:602
+#: sequencer.c:675
 #, c-format
 msgid "Unusable instruction sheet: %s"
 msgstr ""
 
-#: sequencer.c:630
+#: sequencer.c:703
 #, c-format
 msgid "Invalid key: %s"
 msgstr ""
 
-#: sequencer.c:633
+#: sequencer.c:706
 #, c-format
 msgid "Invalid value for %s: %s"
 msgstr ""
 
-#: sequencer.c:645
+#: sequencer.c:718
 #, c-format
 msgid "Malformed options sheet: %s"
 msgstr ""
 
-#: sequencer.c:666
+#: sequencer.c:739
 msgid "a cherry-pick or revert is already in progress"
 msgstr ""
 
-#: sequencer.c:667
+#: sequencer.c:740
 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
 msgstr ""
 
-#: sequencer.c:671
+#: sequencer.c:744
 #, c-format
 msgid "Could not create sequencer directory %s"
 msgstr ""
 
-#: sequencer.c:687 sequencer.c:772
+#: sequencer.c:760 sequencer.c:845
 #, c-format
 msgid "Error wrapping up %s."
 msgstr ""
 
-#: sequencer.c:706 sequencer.c:840
+#: sequencer.c:779 sequencer.c:913
 msgid "no cherry-pick or revert in progress"
 msgstr ""
 
-#: sequencer.c:708
+#: sequencer.c:781
 msgid "cannot resolve HEAD"
 msgstr ""
 
-#: sequencer.c:710
+#: sequencer.c:783
 msgid "cannot abort from a branch yet to be born"
 msgstr ""
 
-#: sequencer.c:732
+#: sequencer.c:805 builtin/apply.c:3697
 #, c-format
 msgid "cannot open %s: %s"
 msgstr ""
 
-#: sequencer.c:735
+#: sequencer.c:808
 #, c-format
 msgid "cannot read %s: %s"
 msgstr ""
 
-#: sequencer.c:736
+#: sequencer.c:809
 msgid "unexpected end of file"
 msgstr ""
 
-#: sequencer.c:742
+#: sequencer.c:815
 #, c-format
 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
 msgstr ""
 
-#: sequencer.c:765
+#: sequencer.c:838
 #, c-format
 msgid "Could not format %s."
 msgstr ""
 
-#: sequencer.c:927
+#: sequencer.c:1000
 msgid "Can't revert as initial commit"
 msgstr ""
 
-#: sequencer.c:928
+#: sequencer.c:1001
 msgid "Can't cherry-pick into empty head"
 msgstr ""
 
-#: wt-status.c:134
+#: sha1_name.c:864
+msgid "HEAD does not point to a branch"
+msgstr ""
+
+#: sha1_name.c:867
+#, c-format
+msgid "No such branch: '%s'"
+msgstr ""
+
+#: sha1_name.c:869
+#, c-format
+msgid "No upstream configured for branch '%s'"
+msgstr ""
+
+#: sha1_name.c:872
+#, c-format
+msgid "Upstream branch '%s' not stored as a remote-tracking branch"
+msgstr ""
+
+#: wrapper.c:413
+#, c-format
+msgid "unable to look up current user in the passwd file: %s"
+msgstr ""
+
+#: wrapper.c:414
+msgid "no such user"
+msgstr ""
+
+#: wt-status.c:135
 msgid "Unmerged paths:"
 msgstr ""
 
-#: wt-status.c:140 wt-status.c:157
+#: wt-status.c:141 wt-status.c:158
 #, c-format
 msgid "  (use \"git reset %s <file>...\" to unstage)"
 msgstr ""
 
-#: wt-status.c:142 wt-status.c:159
+#: wt-status.c:143 wt-status.c:160
 msgid "  (use \"git rm --cached <file>...\" to unstage)"
 msgstr ""
 
-#: wt-status.c:143
+#: wt-status.c:144
 msgid "  (use \"git add/rm <file>...\" as appropriate to mark resolution)"
 msgstr ""
 
-#: wt-status.c:151
+#: wt-status.c:152
 msgid "Changes to be committed:"
 msgstr ""
 
-#: wt-status.c:169
+#: wt-status.c:170
 msgid "Changes not staged for commit:"
 msgstr ""
 
-#: wt-status.c:173
+#: wt-status.c:174
 msgid "  (use \"git add <file>...\" to update what will be committed)"
 msgstr ""
 
-#: wt-status.c:175
+#: wt-status.c:176
 msgid "  (use \"git add/rm <file>...\" to update what will be committed)"
 msgstr ""
 
-#: wt-status.c:176
+#: wt-status.c:177
 msgid ""
 "  (use \"git checkout -- <file>...\" to discard changes in working directory)"
 msgstr ""
 
-#: wt-status.c:178
+#: wt-status.c:179
 msgid "  (commit or discard the untracked or modified content in submodules)"
 msgstr ""
 
-#: wt-status.c:187
+#: wt-status.c:188
 #, c-format
 msgid "%s files:"
 msgstr ""
 
-#: wt-status.c:190
+#: wt-status.c:191
 #, c-format
 msgid "  (use \"git %s <file>...\" to include in what will be committed)"
 msgstr ""
 
-#: wt-status.c:207
+#: wt-status.c:208
 msgid "bug"
 msgstr ""
 
-#: wt-status.c:212
+#: wt-status.c:213
 msgid "both deleted:"
 msgstr ""
 
-#: wt-status.c:213
+#: wt-status.c:214
 msgid "added by us:"
 msgstr ""
 
-#: wt-status.c:214
+#: wt-status.c:215
 msgid "deleted by them:"
 msgstr ""
 
-#: wt-status.c:215
+#: wt-status.c:216
 msgid "added by them:"
 msgstr ""
 
-#: wt-status.c:216
+#: wt-status.c:217
 msgid "deleted by us:"
 msgstr ""
 
-#: wt-status.c:217
+#: wt-status.c:218
 msgid "both added:"
 msgstr ""
 
-#: wt-status.c:218
+#: wt-status.c:219
 msgid "both modified:"
 msgstr ""
 
-#: wt-status.c:248
+#: wt-status.c:249
 msgid "new commits, "
 msgstr ""
 
-#: wt-status.c:250
+#: wt-status.c:251
 msgid "modified content, "
 msgstr ""
 
-#: wt-status.c:252
+#: wt-status.c:253
 msgid "untracked content, "
 msgstr ""
 
-#: wt-status.c:266
+#: wt-status.c:267
 #, c-format
 msgid "new file:   %s"
 msgstr ""
 
-#: wt-status.c:269
+#: wt-status.c:270
 #, c-format
 msgid "copied:     %s -> %s"
 msgstr ""
 
-#: wt-status.c:272
+#: wt-status.c:273
 #, c-format
 msgid "deleted:    %s"
 msgstr ""
 
-#: wt-status.c:275
+#: wt-status.c:276
 #, c-format
 msgid "modified:   %s"
 msgstr ""
 
-#: wt-status.c:278
+#: wt-status.c:279
 #, c-format
 msgid "renamed:    %s -> %s"
 msgstr ""
 
-#: wt-status.c:281
+#: wt-status.c:282
 #, c-format
 msgid "typechange: %s"
 msgstr ""
 
-#: wt-status.c:284
+#: wt-status.c:285
 #, c-format
 msgid "unknown:    %s"
 msgstr ""
 
-#: wt-status.c:287
+#: wt-status.c:288
 #, c-format
 msgid "unmerged:   %s"
 msgstr ""
 
-#: wt-status.c:290
+#: wt-status.c:291
 #, c-format
 msgid "bug: unhandled diff status %c"
 msgstr ""
 
-#: wt-status.c:713
+#: wt-status.c:737
 msgid "On branch "
 msgstr ""
 
-#: wt-status.c:720
+#: wt-status.c:744
 msgid "Not currently on any branch."
 msgstr ""
 
-#: wt-status.c:731
+#: wt-status.c:755
 msgid "Initial commit"
 msgstr ""
 
-#: wt-status.c:745
+#: wt-status.c:769
 msgid "Untracked"
 msgstr ""
 
-#: wt-status.c:747
+#: wt-status.c:771
 msgid "Ignored"
 msgstr ""
 
-#: wt-status.c:749
+#: wt-status.c:773
 #, c-format
 msgid "Untracked files not listed%s"
 msgstr ""
 
-#: wt-status.c:751
+#: wt-status.c:775
 msgid " (use -u option to show untracked files)"
 msgstr ""
 
-#: wt-status.c:757
+#: wt-status.c:781
 msgid "No changes"
 msgstr ""
 
-#: wt-status.c:761
+#: wt-status.c:785
 #, c-format
 msgid "no changes added to commit%s\n"
 msgstr ""
 
-#: wt-status.c:763
+#: wt-status.c:787
 msgid " (use \"git add\" and/or \"git commit -a\")"
 msgstr ""
 
-#: wt-status.c:765
+#: wt-status.c:789
 #, c-format
 msgid "nothing added to commit but untracked files present%s\n"
 msgstr ""
 
-#: wt-status.c:767
+#: wt-status.c:791
 msgid " (use \"git add\" to track)"
 msgstr ""
 
-#: wt-status.c:769 wt-status.c:772 wt-status.c:775
+#: wt-status.c:793 wt-status.c:796 wt-status.c:799
 #, c-format
 msgid "nothing to commit%s\n"
 msgstr ""
 
-#: wt-status.c:770
+#: wt-status.c:794
 msgid " (create/copy files and use \"git add\" to track)"
 msgstr ""
 
-#: wt-status.c:773
+#: wt-status.c:797
 msgid " (use -u to show untracked files)"
 msgstr ""
 
-#: wt-status.c:776
+#: wt-status.c:800
 msgid " (working directory clean)"
 msgstr ""
 
-#: wt-status.c:884
+#: wt-status.c:908
 msgid "HEAD (no branch)"
 msgstr ""
 
-#: wt-status.c:890
+#: wt-status.c:914
 msgid "Initial commit on "
 msgstr ""
 
-#: wt-status.c:905
+#: wt-status.c:929
 msgid "behind "
 msgstr ""
 
-#: wt-status.c:908 wt-status.c:911
+#: wt-status.c:932 wt-status.c:935
 msgid "ahead "
 msgstr ""
 
-#: wt-status.c:913
+#: wt-status.c:937
 msgid ", behind "
 msgstr ""
 
@@ -630,7 +872,7 @@ msgstr ""
 msgid "unexpected diff status %c"
 msgstr ""
 
-#: builtin/add.c:67 builtin/commit.c:298
+#: builtin/add.c:67 builtin/commit.c:226
 msgid "updating files failed"
 msgstr ""
 
@@ -720,2082 +962,3245 @@ msgstr ""
 msgid "Maybe you wanted to say 'git add .'?\n"
 msgstr ""
 
-#: builtin/add.c:420 builtin/clean.c:95 builtin/commit.c:358 builtin/mv.c:82
+#: builtin/add.c:420 builtin/clean.c:95 builtin/commit.c:286 builtin/mv.c:82
 #: builtin/rm.c:162
 msgid "index file corrupt"
 msgstr ""
 
-#: builtin/add.c:476 builtin/mv.c:229 builtin/rm.c:260
+#: builtin/add.c:476 builtin/apply.c:4108 builtin/mv.c:229 builtin/rm.c:260
 msgid "Unable to write new index file"
 msgstr ""
 
-#: builtin/archive.c:17
-#, c-format
-msgid "could not create archive file '%s'"
-msgstr ""
-
-#: builtin/archive.c:20
-msgid "could not redirect output"
+#: builtin/apply.c:53
+msgid "git apply [options] [<patch>...]"
 msgstr ""
 
-#: builtin/archive.c:37
-msgid "git archive: Remote with no URL"
+#: builtin/apply.c:106
+#, c-format
+msgid "unrecognized whitespace option '%s'"
 msgstr ""
 
-#: builtin/archive.c:58
-msgid "git archive: expected ACK/NAK, got EOF"
+#: builtin/apply.c:121
+#, c-format
+msgid "unrecognized whitespace ignore option '%s'"
 msgstr ""
 
-#: builtin/archive.c:63
+#: builtin/apply.c:815
 #, c-format
-msgid "git archive: NACK %s"
+msgid "Cannot prepare timestamp regexp %s"
 msgstr ""
 
-#: builtin/archive.c:65
+#: builtin/apply.c:824
 #, c-format
-msgid "remote error: %s"
+msgid "regexec returned %d for input: %s"
 msgstr ""
 
-#: builtin/archive.c:66
-msgid "git archive: protocol error"
+#: builtin/apply.c:905
+#, c-format
+msgid "unable to find filename in patch at line %d"
 msgstr ""
 
-#: builtin/archive.c:71
-msgid "git archive: expected a flush"
+#: builtin/apply.c:937
+#, c-format
+msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
 msgstr ""
 
-#: builtin/branch.c:137
+#: builtin/apply.c:941
 #, c-format
-msgid ""
-"deleting branch '%s' that has been merged to\n"
-"         '%s', but not yet merged to HEAD."
+msgid "git apply: bad git-diff - inconsistent new filename on line %d"
 msgstr ""
 
-#: builtin/branch.c:141
+#: builtin/apply.c:942
 #, c-format
-msgid ""
-"not deleting branch '%s' that is not yet merged to\n"
-"         '%s', even though it is merged to HEAD."
+msgid "git apply: bad git-diff - inconsistent old filename on line %d"
 msgstr ""
 
-#. TRANSLATORS: This is "remote " in "remote branch '%s' not found"
-#: builtin/branch.c:163
-msgid "remote "
+#: builtin/apply.c:949
+#, c-format
+msgid "git apply: bad git-diff - expected /dev/null on line %d"
 msgstr ""
 
-#: builtin/branch.c:171
-msgid "cannot use -a with -d"
+#: builtin/apply.c:1394
+#, c-format
+msgid "recount: unexpected line: %.*s"
 msgstr ""
 
-#: builtin/branch.c:177
-msgid "Couldn't look up commit object for HEAD"
+#: builtin/apply.c:1451
+#, c-format
+msgid "patch fragment without header at line %d: %.*s"
 msgstr ""
 
-#: builtin/branch.c:182
+#: builtin/apply.c:1468
 #, c-format
-msgid "Cannot delete the branch '%s' which you are currently on."
+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:1628
+msgid "new file depends on old contents"
 msgstr ""
 
-#: builtin/branch.c:192
-#, c-format
-msgid "%sbranch '%s' not found."
+#: builtin/apply.c:1630
+msgid "deleted file still has contents"
 msgstr ""
 
-#: builtin/branch.c:200
+#: builtin/apply.c:1656
 #, c-format
-msgid "Couldn't look up commit object for '%s'"
+msgid "corrupt patch at line %d"
 msgstr ""
 
-#: builtin/branch.c:206
+#: builtin/apply.c:1692
 #, 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'."
+msgid "new file %s depends on old contents"
 msgstr ""
 
-#: builtin/branch.c:214
+#: builtin/apply.c:1694
 #, c-format
-msgid "Error deleting %sbranch '%s'"
+msgid "deleted file %s still has contents"
 msgstr ""
 
-#: builtin/branch.c:219
+#: builtin/apply.c:1697
 #, c-format
-msgid "Deleted %sbranch %s (was %s).\n"
+msgid "** warning: file %s becomes empty but is not deleted"
 msgstr ""
 
-#: builtin/branch.c:224
-msgid "Update of config-file failed"
+#: builtin/apply.c:1843
+#, c-format
+msgid "corrupt binary patch at line %d: %.*s"
 msgstr ""
 
-#: builtin/branch.c:322
+#. there has to be one hunk (forward hunk)
+#: builtin/apply.c:1872
 #, c-format
-msgid "branch '%s' does not point at a commit"
+msgid "unrecognized binary patch at line %d"
 msgstr ""
 
-#: builtin/branch.c:394
+#: builtin/apply.c:1958
 #, c-format
-msgid "behind %d] "
+msgid "patch with only garbage at line %d"
 msgstr ""
 
-#: builtin/branch.c:396
+#: builtin/apply.c:2048
 #, c-format
-msgid "ahead %d] "
+msgid "unable to read symlink %s"
 msgstr ""
 
-#: builtin/branch.c:398
+#: builtin/apply.c:2052
 #, c-format
-msgid "ahead %d, behind %d] "
+msgid "unable to open or read %s"
 msgstr ""
 
-#: builtin/branch.c:501
-msgid "(no branch)"
+#: builtin/apply.c:2123
+msgid "oops"
 msgstr ""
 
-#: builtin/branch.c:566
-msgid "some refs could not be read"
+#: builtin/apply.c:2645
+#, c-format
+msgid "invalid start of line: '%c'"
 msgstr ""
 
-#: builtin/branch.c:579
-msgid "cannot rename the current branch while not on any."
-msgstr ""
+#: builtin/apply.c:2763
+#, c-format
+msgid "Hunk #%d succeeded at %d (offset %d line)."
+msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
+msgstr[0] ""
+msgstr[1] ""
 
-#: builtin/branch.c:589
+#: builtin/apply.c:2775
 #, c-format
-msgid "Invalid branch name: '%s'"
+msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
 msgstr ""
 
-#: builtin/branch.c:604
-msgid "Branch rename failed"
+#: builtin/apply.c:2781
+#, c-format
+msgid ""
+"while searching for:\n"
+"%.*s"
 msgstr ""
 
-#: builtin/branch.c:608
+#: builtin/apply.c:2800
 #, c-format
-msgid "Renamed a misnamed branch '%s' away"
+msgid "missing binary patch data for '%s'"
 msgstr ""
 
-#: builtin/branch.c:612
+#: builtin/apply.c:2903
 #, c-format
-msgid "Branch renamed to %s, but HEAD is not updated!"
+msgid "binary patch does not apply to '%s'"
 msgstr ""
 
-#: builtin/branch.c:619
-msgid "Branch is renamed, but update of config-file failed"
+#: builtin/apply.c:2909
+#, c-format
+msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
 msgstr ""
 
-#: builtin/branch.c:634
+#: builtin/apply.c:2930
 #, c-format
-msgid "malformed object name %s"
+msgid "patch failed: %s:%ld"
 msgstr ""
 
-#: builtin/branch.c:658
+#: builtin/apply.c:3045
 #, c-format
-msgid "could not write branch description template: %s\n"
+msgid "patch %s has been renamed/deleted"
 msgstr ""
 
-#: builtin/branch.c:746
-msgid "Failed to resolve HEAD as a valid ref."
+#: builtin/apply.c:3052 builtin/apply.c:3069
+#, c-format
+msgid "read of %s failed"
 msgstr ""
 
-#: builtin/branch.c:751 builtin/clone.c:558
-msgid "HEAD not found below refs/heads!"
+#: builtin/apply.c:3084
+msgid "removal patch leaves file contents"
 msgstr ""
 
-#: builtin/branch.c:809
-msgid "-a and -r options to 'git branch' do not make sense with a branch name"
+#: builtin/apply.c:3105
+#, c-format
+msgid "%s: already exists in working directory"
 msgstr ""
 
-#: builtin/bundle.c:47
+#: builtin/apply.c:3143
 #, c-format
-msgid "%s is okay\n"
+msgid "%s: has been deleted/renamed"
 msgstr ""
 
-#: builtin/bundle.c:56
-msgid "Need a repository to create a bundle."
+#: builtin/apply.c:3148 builtin/apply.c:3179
+#, c-format
+msgid "%s: %s"
 msgstr ""
 
-#: builtin/bundle.c:60
-msgid "Need a repository to unbundle."
+#: builtin/apply.c:3159
+#, c-format
+msgid "%s: does not exist in index"
 msgstr ""
 
-#: builtin/checkout.c:113 builtin/checkout.c:146
+#: builtin/apply.c:3173
 #, c-format
-msgid "path '%s' does not have our version"
+msgid "%s: does not match index"
 msgstr ""
 
-#: builtin/checkout.c:115 builtin/checkout.c:148
+#: builtin/apply.c:3190
 #, c-format
-msgid "path '%s' does not have their version"
+msgid "%s: wrong type"
 msgstr ""
 
-#: builtin/checkout.c:131
+#: builtin/apply.c:3192
 #, c-format
-msgid "path '%s' does not have all necessary versions"
+msgid "%s has type %o, expected %o"
 msgstr ""
 
-#: builtin/checkout.c:175
+#: builtin/apply.c:3247
 #, c-format
-msgid "path '%s' does not have necessary versions"
+msgid "%s: already exists in index"
 msgstr ""
 
-#: builtin/checkout.c:192
+#: builtin/apply.c:3267
 #, c-format
-msgid "path '%s': cannot merge"
+msgid "new mode (%o) of %s does not match old mode (%o)"
 msgstr ""
 
-#: builtin/checkout.c:209
+#: builtin/apply.c:3272
 #, c-format
-msgid "Unable to add merge result for '%s'"
+msgid "new mode (%o) of %s does not match old mode (%o) of %s"
 msgstr ""
 
-#: builtin/checkout.c:212 builtin/reset.c:158
+#: builtin/apply.c:3280
 #, c-format
-msgid "make_cache_entry failed for path '%s'"
+msgid "%s: patch does not apply"
 msgstr ""
 
-#: builtin/checkout.c:234 builtin/checkout.c:392
-msgid "corrupt index file"
+#: builtin/apply.c:3293
+#, c-format
+msgid "Checking patch %s..."
 msgstr ""
 
-#: builtin/checkout.c:264 builtin/checkout.c:271
+#: builtin/apply.c:3348 builtin/checkout.c:212 builtin/reset.c:158
 #, c-format
-msgid "path '%s' is unmerged"
+msgid "make_cache_entry failed for path '%s'"
 msgstr ""
 
-#: builtin/checkout.c:302 builtin/checkout.c:498 builtin/clone.c:583
-#: builtin/merge.c:811
-msgid "unable to write new index file"
+#: builtin/apply.c:3491
+#, c-format
+msgid "unable to remove %s from index"
 msgstr ""
 
-#: builtin/checkout.c:319 builtin/diff.c:302 builtin/merge.c:408
-msgid "diff_setup_done failed"
+#: builtin/apply.c:3518
+#, c-format
+msgid "corrupt patch for subproject %s"
 msgstr ""
 
-#: builtin/checkout.c:414
-msgid "you need to resolve your current index first"
+#: builtin/apply.c:3522
+#, c-format
+msgid "unable to stat newly created file '%s'"
 msgstr ""
 
-#: builtin/checkout.c:533
+#: builtin/apply.c:3527
 #, c-format
-msgid "Can not do reflog for '%s'\n"
+msgid "unable to create backing store for newly created file %s"
 msgstr ""
 
-#: builtin/checkout.c:565
-msgid "HEAD is now at"
+#: builtin/apply.c:3530
+#, c-format
+msgid "unable to add cache entry for %s"
 msgstr ""
 
-#: builtin/checkout.c:572
+#: builtin/apply.c:3563
 #, c-format
-msgid "Reset branch '%s'\n"
+msgid "closing file '%s'"
 msgstr ""
 
-#: builtin/checkout.c:575
+#: builtin/apply.c:3612
 #, c-format
-msgid "Already on '%s'\n"
+msgid "unable to write file '%s' mode %o"
 msgstr ""
 
-#: builtin/checkout.c:579
+#: builtin/apply.c:3668
 #, c-format
-msgid "Switched to and reset branch '%s'\n"
+msgid "Applied patch %s cleanly."
 msgstr ""
 
-#: builtin/checkout.c:581
-#, c-format
-msgid "Switched to a new branch '%s'\n"
+#: builtin/apply.c:3676
+msgid "internal error"
 msgstr ""
 
-#: builtin/checkout.c:583
+#. Say this even without --verbose
+#: builtin/apply.c:3679
 #, c-format
-msgid "Switched to branch '%s'\n"
-msgstr ""
+msgid "Applying patch %%s with %d reject..."
+msgid_plural "Applying patch %%s with %d rejects..."
+msgstr[0] ""
+msgstr[1] ""
 
-#: builtin/checkout.c:639
+#: builtin/apply.c:3689
 #, c-format
-msgid " ... and %d more.\n"
+msgid "truncating .rej filename to %.*s.rej"
 msgstr ""
 
-#. The singular version
-#: builtin/checkout.c:645
+#: builtin/apply.c:3710
 #, 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 "Hunk #%d applied cleanly."
+msgstr ""
 
-#: builtin/checkout.c:663
+#: builtin/apply.c:3713
 #, 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 "Rejected hunk #%d."
 msgstr ""
 
-#: builtin/checkout.c:692
-msgid "internal error in revision walk"
+#: builtin/apply.c:3844
+msgid "unrecognized input"
 msgstr ""
 
-#: builtin/checkout.c:696
-msgid "Previous HEAD position was"
+#: builtin/apply.c:3855
+msgid "unable to read index file"
 msgstr ""
 
-#: builtin/checkout.c:722
-msgid "You are on a branch yet to be born"
+#: builtin/apply.c:3970 builtin/apply.c:3973
+msgid "path"
 msgstr ""
 
-#. case (1)
-#: builtin/checkout.c:853
-#, c-format
-msgid "invalid reference: %s"
+#: builtin/apply.c:3971
+msgid "don't apply changes matching the given path"
 msgstr ""
 
-#. case (1): want a tree
-#: builtin/checkout.c:892
-#, c-format
-msgid "reference is not a tree: %s"
+#: builtin/apply.c:3974
+msgid "apply changes matching the given path"
 msgstr ""
 
-#: builtin/checkout.c:972
-msgid "-B cannot be used with -b"
+#: builtin/apply.c:3976
+msgid "num"
 msgstr ""
 
-#: builtin/checkout.c:981
-msgid "--patch is incompatible with all other options"
+#: builtin/apply.c:3977
+msgid "remove <num> leading slashes from traditional diff paths"
 msgstr ""
 
-#: builtin/checkout.c:984
-msgid "--detach cannot be used with -b/-B/--orphan"
+#: builtin/apply.c:3980
+msgid "ignore additions made by the patch"
 msgstr ""
 
-#: builtin/checkout.c:986
-msgid "--detach cannot be used with -t"
+#: builtin/apply.c:3982
+msgid "instead of applying the patch, output diffstat for the input"
 msgstr ""
 
-#: builtin/checkout.c:992
-msgid "--track needs a branch name"
+#: builtin/apply.c:3986
+msgid "shows number of added and deleted lines in decimal notation"
 msgstr ""
 
-#: builtin/checkout.c:999
-msgid "Missing branch name; try -b"
+#: builtin/apply.c:3988
+msgid "instead of applying the patch, output a summary for the input"
 msgstr ""
 
-#: builtin/checkout.c:1005
-msgid "--orphan and -b|-B are mutually exclusive"
+#: builtin/apply.c:3990
+msgid "instead of applying the patch, see if the patch is applicable"
 msgstr ""
 
-#: builtin/checkout.c:1007
-msgid "--orphan cannot be used with -t"
+#: builtin/apply.c:3992
+msgid "make sure the patch is applicable to the current index"
 msgstr ""
 
-#: builtin/checkout.c:1017
-msgid "git checkout: -f and -m are incompatible"
+#: builtin/apply.c:3994
+msgid "apply a patch without touching the working tree"
 msgstr ""
 
-#: builtin/checkout.c:1051
-msgid "invalid path specification"
+#: builtin/apply.c:3996
+msgid "also apply the patch (use with --stat/--summary/--check)"
 msgstr ""
 
-#: builtin/checkout.c:1059
-#, c-format
-msgid ""
-"git checkout: updating paths is incompatible with switching branches.\n"
-"Did you intend to checkout '%s' which can not be resolved as commit?"
+#: builtin/apply.c:3998
+msgid "build a temporary index based on embedded index information"
 msgstr ""
 
-#: builtin/checkout.c:1061
-msgid "git checkout: updating paths is incompatible with switching branches."
+#: builtin/apply.c:4000
+msgid "paths are separated with NUL character"
 msgstr ""
 
-#: builtin/checkout.c:1066
-msgid "git checkout: --detach does not take a path argument"
+#: builtin/apply.c:4003
+msgid "ensure at least <n> lines of context match"
 msgstr ""
 
-#: builtin/checkout.c:1069
-msgid ""
-"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
-"checking out of the index."
+#: builtin/apply.c:4004
+msgid "action"
 msgstr ""
 
-#: builtin/checkout.c:1088
-msgid "Cannot switch branch to a non-commit."
+#: builtin/apply.c:4005
+msgid "detect new or modified lines that have whitespace errors"
 msgstr ""
 
-#: builtin/checkout.c:1091
-msgid "--ours/--theirs is incompatible with switching branches."
+#: builtin/apply.c:4008 builtin/apply.c:4011
+msgid "ignore changes in whitespace when finding context"
 msgstr ""
 
-#: builtin/clean.c:78
-msgid "-x and -X cannot be used together"
+#: builtin/apply.c:4014
+msgid "apply the patch in reverse"
 msgstr ""
 
-#: builtin/clean.c:82
-msgid ""
-"clean.requireForce set to true and neither -n nor -f given; refusing to clean"
+#: builtin/apply.c:4016
+msgid "don't expect at least one line of context"
 msgstr ""
 
-#: builtin/clean.c:85
-msgid ""
-"clean.requireForce defaults to true and neither -n nor -f given; refusing to "
-"clean"
+#: builtin/apply.c:4018
+msgid "leave the rejected hunks in corresponding *.rej files"
 msgstr ""
 
-#: builtin/clean.c:155 builtin/clean.c:176
-#, c-format
-msgid "Would remove %s\n"
+#: builtin/apply.c:4020
+msgid "allow overlapping hunks"
 msgstr ""
 
-#: builtin/clean.c:159 builtin/clean.c:179
-#, c-format
-msgid "Removing %s\n"
+#: builtin/apply.c:4021
+msgid "be verbose"
 msgstr ""
 
-#: builtin/clean.c:162 builtin/clean.c:182
-#, c-format
-msgid "failed to remove %s"
+#: builtin/apply.c:4023
+msgid "tolerate incorrectly detected missing new-line at the end of file"
 msgstr ""
 
-#: builtin/clean.c:166
-#, c-format
-msgid "Would not remove %s\n"
+#: builtin/apply.c:4026
+msgid "do not trust the line counts in the hunk headers"
 msgstr ""
 
-#: builtin/clean.c:168
-#, c-format
-msgid "Not removing %s\n"
+#: builtin/apply.c:4028
+msgid "root"
 msgstr ""
 
-#: builtin/clone.c:243
-#, c-format
-msgid "reference repository '%s' is not a local directory."
+#: builtin/apply.c:4029
+msgid "prepend <root> to all filenames"
 msgstr ""
 
-#: builtin/clone.c:302
-#, c-format
-msgid "failed to open '%s'"
+#: builtin/apply.c:4050
+msgid "--index outside a repository"
 msgstr ""
 
-#: builtin/clone.c:306
-#, c-format
-msgid "failed to create directory '%s'"
+#: builtin/apply.c:4053
+msgid "--cached outside a repository"
 msgstr ""
 
-#: builtin/clone.c:308 builtin/diff.c:75
+#: builtin/apply.c:4069
 #, c-format
-msgid "failed to stat '%s'"
+msgid "can't open patch '%s'"
 msgstr ""
 
-#: builtin/clone.c:310
+#: builtin/apply.c:4083
 #, c-format
-msgid "%s exists and is not a directory"
-msgstr ""
+msgid "squelched %d whitespace error"
+msgid_plural "squelched %d whitespace errors"
+msgstr[0] ""
+msgstr[1] ""
 
-#: builtin/clone.c:324
+#: builtin/apply.c:4089 builtin/apply.c:4099
 #, c-format
-msgid "failed to stat %s\n"
-msgstr ""
+msgid "%d line adds whitespace errors."
+msgid_plural "%d lines add whitespace errors."
+msgstr[0] ""
+msgstr[1] ""
 
-#: builtin/clone.c:341
+#: builtin/archive.c:17
 #, c-format
-msgid "failed to unlink '%s'"
+msgid "could not create archive file '%s'"
 msgstr ""
 
-#: builtin/clone.c:346
-#, c-format
-msgid "failed to create link '%s'"
+#: builtin/archive.c:20
+msgid "could not redirect output"
 msgstr ""
 
-#: builtin/clone.c:350
-#, c-format
-msgid "failed to copy file to '%s'"
+#: builtin/archive.c:37
+msgid "git archive: Remote with no URL"
 msgstr ""
 
-#: builtin/clone.c:373
-#, c-format
-msgid "done.\n"
+#: builtin/archive.c:58
+msgid "git archive: expected ACK/NAK, got EOF"
 msgstr ""
 
-#: builtin/clone.c:440
+#: builtin/archive.c:63
 #, c-format
-msgid "Could not find remote branch %s to clone."
+msgid "git archive: NACK %s"
 msgstr ""
 
-#: builtin/clone.c:549
-msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
+#: builtin/archive.c:65
+#, c-format
+msgid "remote error: %s"
 msgstr ""
 
-#: builtin/clone.c:639
-msgid "Too many arguments."
+#: builtin/archive.c:66
+msgid "git archive: protocol error"
 msgstr ""
 
-#: builtin/clone.c:643
-msgid "You must specify a repository to clone."
+#: builtin/archive.c:71
+msgid "git archive: expected a flush"
 msgstr ""
 
-#: builtin/clone.c:654
+#: builtin/branch.c:144
 #, c-format
-msgid "--bare and --origin %s options are incompatible."
+msgid ""
+"deleting branch '%s' that has been merged to\n"
+"         '%s', but not yet merged to HEAD."
 msgstr ""
 
-#: builtin/clone.c:668
+#: builtin/branch.c:148
 #, c-format
-msgid "repository '%s' does not exist"
+msgid ""
+"not deleting branch '%s' that is not yet merged to\n"
+"         '%s', even though it is merged to HEAD."
 msgstr ""
 
-#: builtin/clone.c:673
-msgid "--depth is ignored in local clones; use file:// instead."
+#: builtin/branch.c:180
+msgid "cannot use -a with -d"
 msgstr ""
 
-#: builtin/clone.c:683
-#, c-format
-msgid "destination path '%s' already exists and is not an empty directory."
+#: builtin/branch.c:186
+msgid "Couldn't look up commit object for HEAD"
 msgstr ""
 
-#: builtin/clone.c:693
+#: builtin/branch.c:191
 #, c-format
-msgid "working tree '%s' already exists."
+msgid "Cannot delete the branch '%s' which you are currently on."
 msgstr ""
 
-#: builtin/clone.c:706 builtin/clone.c:720
+#: builtin/branch.c:202
 #, c-format
-msgid "could not create leading directories of '%s'"
+msgid "remote branch '%s' not found."
 msgstr ""
 
-#: builtin/clone.c:709
+#: builtin/branch.c:203
 #, c-format
-msgid "could not create work tree dir '%s'."
+msgid "branch '%s' not found."
 msgstr ""
 
-#: builtin/clone.c:728
+#: builtin/branch.c:210
 #, c-format
-msgid "Cloning into bare repository '%s'...\n"
+msgid "Couldn't look up commit object for '%s'"
 msgstr ""
 
-#: builtin/clone.c:730
+#: builtin/branch.c:216
 #, c-format
-msgid "Cloning into '%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/clone.c:786
+#: builtin/branch.c:225
 #, c-format
-msgid "Don't know how to clone %s"
+msgid "Error deleting remote branch '%s'"
 msgstr ""
 
-#: builtin/clone.c:835
+#: builtin/branch.c:226
 #, c-format
-msgid "Remote branch %s not found in upstream %s"
+msgid "Error deleting branch '%s'"
 msgstr ""
 
-#: builtin/clone.c:842
-msgid "You appear to have cloned an empty repository."
+#: builtin/branch.c:233
+#, c-format
+msgid "Deleted remote branch %s (was %s).\n"
 msgstr ""
 
-#: builtin/commit.c:42
-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"
+#: builtin/branch.c:234
+#, c-format
+msgid "Deleted branch %s (was %s).\n"
 msgstr ""
 
-#: builtin/commit.c:54
-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"
+#: builtin/branch.c:239
+msgid "Update of config-file failed"
 msgstr ""
 
-#: builtin/commit.c:59
-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"
-"Otherwise, please use 'git reset'\n"
+#: builtin/branch.c:337
+#, c-format
+msgid "branch '%s' does not point at a commit"
 msgstr ""
 
-#: builtin/commit.c:205 builtin/reset.c:33
-msgid "merge"
+#: builtin/branch.c:409
+#, c-format
+msgid "[%s: behind %d]"
 msgstr ""
 
-#: builtin/commit.c:208
-msgid "cherry-pick"
+#: builtin/branch.c:411
+#, c-format
+msgid "[behind %d]"
 msgstr ""
 
-#: builtin/commit.c:325
-msgid "failed to unpack HEAD tree object"
+#: builtin/branch.c:415
+#, c-format
+msgid "[%s: ahead %d]"
 msgstr ""
 
-#: builtin/commit.c:367
-msgid "unable to create temporary index"
+#: builtin/branch.c:417
+#, c-format
+msgid "[ahead %d]"
 msgstr ""
 
-#: builtin/commit.c:373
-msgid "interactive add failed"
+#: builtin/branch.c:420
+#, c-format
+msgid "[%s: ahead %d, behind %d]"
 msgstr ""
 
-#: builtin/commit.c:406 builtin/commit.c:427 builtin/commit.c:473
-msgid "unable to write new_index file"
+#: builtin/branch.c:423
+#, c-format
+msgid "[ahead %d, behind %d]"
 msgstr ""
 
-#: builtin/commit.c:457
-#, c-format
-msgid "cannot do a partial commit during a %s."
+#: builtin/branch.c:535
+msgid "(no branch)"
 msgstr ""
 
-#: builtin/commit.c:466
-msgid "cannot read the index"
+#: builtin/branch.c:600
+msgid "some refs could not be read"
 msgstr ""
 
-#: builtin/commit.c:486
-msgid "unable to write temporary index file"
+#: builtin/branch.c:613
+msgid "cannot rename the current branch while not on any."
 msgstr ""
 
-#: builtin/commit.c:561 builtin/commit.c:567
+#: builtin/branch.c:623
 #, c-format
-msgid "invalid commit: %s"
+msgid "Invalid branch name: '%s'"
 msgstr ""
 
-#: builtin/commit.c:590
-msgid "malformed --author parameter"
+#: builtin/branch.c:638
+msgid "Branch rename failed"
 msgstr ""
 
-#: builtin/commit.c:651
+#: builtin/branch.c:642
 #, c-format
-msgid "Malformed ident string: '%s'"
+msgid "Renamed a misnamed branch '%s' away"
 msgstr ""
 
-#: builtin/commit.c:689 builtin/commit.c:722 builtin/commit.c:1033
+#: builtin/branch.c:646
 #, c-format
-msgid "could not lookup commit %s"
+msgid "Branch renamed to %s, but HEAD is not updated!"
 msgstr ""
 
-#: builtin/commit.c:701 builtin/shortlog.c:296
-#, c-format
-msgid "(reading log message from standard input)\n"
+#: builtin/branch.c:653
+msgid "Branch is renamed, but update of config-file failed"
 msgstr ""
 
-#: builtin/commit.c:703
+#: builtin/branch.c:668
+#, c-format
+msgid "malformed object name %s"
+msgstr ""
+
+#: builtin/branch.c:692
+#, c-format
+msgid "could not write branch description template: %s"
+msgstr ""
+
+#: builtin/branch.c:783
+msgid "Failed to resolve HEAD as a valid ref."
+msgstr ""
+
+#: builtin/branch.c:788 builtin/clone.c:558
+msgid "HEAD not found below refs/heads!"
+msgstr ""
+
+#: builtin/branch.c:808
+msgid "--column and --verbose are incompatible"
+msgstr ""
+
+#: builtin/branch.c:857
+msgid "-a and -r options to 'git branch' do not make sense with a branch name"
+msgstr ""
+
+#: builtin/bundle.c:47
+#, c-format
+msgid "%s is okay\n"
+msgstr ""
+
+#: builtin/bundle.c:56
+msgid "Need a repository to create a bundle."
+msgstr ""
+
+#: builtin/bundle.c:60
+msgid "Need a repository to unbundle."
+msgstr ""
+
+#: builtin/checkout.c:113 builtin/checkout.c:146
+#, c-format
+msgid "path '%s' does not have our version"
+msgstr ""
+
+#: builtin/checkout.c:115 builtin/checkout.c:148
+#, c-format
+msgid "path '%s' does not have their version"
+msgstr ""
+
+#: builtin/checkout.c:131
+#, c-format
+msgid "path '%s' does not have all necessary versions"
+msgstr ""
+
+#: builtin/checkout.c:175
+#, c-format
+msgid "path '%s' does not have necessary versions"
+msgstr ""
+
+#: builtin/checkout.c:192
+#, c-format
+msgid "path '%s': cannot merge"
+msgstr ""
+
+#: builtin/checkout.c:209
+#, c-format
+msgid "Unable to add merge result for '%s'"
+msgstr ""
+
+#: builtin/checkout.c:234 builtin/checkout.c:392
+msgid "corrupt index file"
+msgstr ""
+
+#: builtin/checkout.c:264 builtin/checkout.c:271
+#, c-format
+msgid "path '%s' is unmerged"
+msgstr ""
+
+#: builtin/checkout.c:302 builtin/checkout.c:498 builtin/clone.c:583
+#: builtin/merge.c:812
+msgid "unable to write new index file"
+msgstr ""
+
+#: builtin/checkout.c:319 builtin/diff.c:302 builtin/merge.c:408
+msgid "diff_setup_done failed"
+msgstr ""
+
+#: builtin/checkout.c:414
+msgid "you need to resolve your current index first"
+msgstr ""
+
+#: builtin/checkout.c:533
+#, c-format
+msgid "Can not do reflog for '%s'\n"
+msgstr ""
+
+#: builtin/checkout.c:566
+msgid "HEAD is now at"
+msgstr ""
+
+#: builtin/checkout.c:573
+#, c-format
+msgid "Reset branch '%s'\n"
+msgstr ""
+
+#: builtin/checkout.c:576
+#, c-format
+msgid "Already on '%s'\n"
+msgstr ""
+
+#: builtin/checkout.c:580
+#, c-format
+msgid "Switched to and reset branch '%s'\n"
+msgstr ""
+
+#: builtin/checkout.c:582
+#, c-format
+msgid "Switched to a new branch '%s'\n"
+msgstr ""
+
+#: builtin/checkout.c:584
+#, c-format
+msgid "Switched to branch '%s'\n"
+msgstr ""
+
+#: builtin/checkout.c:640
+#, c-format
+msgid " ... and %d more.\n"
+msgstr ""
+
+#. The singular version
+#: builtin/checkout.c:646
+#, 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:664
+#, 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"
+msgstr ""
+
+#: builtin/checkout.c:694
+msgid "internal error in revision walk"
+msgstr ""
+
+#: builtin/checkout.c:698
+msgid "Previous HEAD position was"
+msgstr ""
+
+#: builtin/checkout.c:724
+msgid "You are on a branch yet to be born"
+msgstr ""
+
+#. case (1)
+#: builtin/checkout.c:855
+#, c-format
+msgid "invalid reference: %s"
+msgstr ""
+
+#. case (1): want a tree
+#: builtin/checkout.c:894
+#, c-format
+msgid "reference is not a tree: %s"
+msgstr ""
+
+#: builtin/checkout.c:974
+msgid "-B cannot be used with -b"
+msgstr ""
+
+#: builtin/checkout.c:983
+msgid "--patch is incompatible with all other options"
+msgstr ""
+
+#: builtin/checkout.c:986
+msgid "--detach cannot be used with -b/-B/--orphan"
+msgstr ""
+
+#: builtin/checkout.c:988
+msgid "--detach cannot be used with -t"
+msgstr ""
+
+#: builtin/checkout.c:994
+msgid "--track needs a branch name"
+msgstr ""
+
+#: builtin/checkout.c:1001
+msgid "Missing branch name; try -b"
+msgstr ""
+
+#: builtin/checkout.c:1007
+msgid "--orphan and -b|-B are mutually exclusive"
+msgstr ""
+
+#: builtin/checkout.c:1009
+msgid "--orphan cannot be used with -t"
+msgstr ""
+
+#: builtin/checkout.c:1019
+msgid "git checkout: -f and -m are incompatible"
+msgstr ""
+
+#: builtin/checkout.c:1053
+msgid "invalid path specification"
+msgstr ""
+
+#: builtin/checkout.c:1061
+#, c-format
+msgid ""
+"git checkout: updating paths is incompatible with switching branches.\n"
+"Did you intend to checkout '%s' which can not be resolved as commit?"
+msgstr ""
+
+#: builtin/checkout.c:1063
+msgid "git checkout: updating paths is incompatible with switching branches."
+msgstr ""
+
+#: builtin/checkout.c:1068
+msgid "git checkout: --detach does not take a path argument"
+msgstr ""
+
+#: builtin/checkout.c:1071
+msgid ""
+"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
+"checking out of the index."
+msgstr ""
+
+#: builtin/checkout.c:1090
+msgid "Cannot switch branch to a non-commit."
+msgstr ""
+
+#: builtin/checkout.c:1093
+msgid "--ours/--theirs is incompatible with switching branches."
+msgstr ""
+
+#: builtin/clean.c:78
+msgid "-x and -X cannot be used together"
+msgstr ""
+
+#: builtin/clean.c:82
+msgid ""
+"clean.requireForce set to true and neither -n nor -f given; refusing to clean"
+msgstr ""
+
+#: builtin/clean.c:85
+msgid ""
+"clean.requireForce defaults to true and neither -n nor -f given; refusing to "
+"clean"
+msgstr ""
+
+#: builtin/clean.c:155 builtin/clean.c:176
+#, c-format
+msgid "Would remove %s\n"
+msgstr ""
+
+#: builtin/clean.c:159 builtin/clean.c:179
+#, c-format
+msgid "Removing %s\n"
+msgstr ""
+
+#: builtin/clean.c:162 builtin/clean.c:182
+#, c-format
+msgid "failed to remove %s"
+msgstr ""
+
+#: builtin/clean.c:166
+#, c-format
+msgid "Would not remove %s\n"
+msgstr ""
+
+#: builtin/clean.c:168
+#, c-format
+msgid "Not removing %s\n"
+msgstr ""
+
+#: builtin/clone.c:243
+#, c-format
+msgid "reference repository '%s' is not a local directory."
+msgstr ""
+
+#: builtin/clone.c:302
+#, c-format
+msgid "failed to open '%s'"
+msgstr ""
+
+#: builtin/clone.c:306
+#, c-format
+msgid "failed to create directory '%s'"
+msgstr ""
+
+#: builtin/clone.c:308 builtin/diff.c:75
+#, c-format
+msgid "failed to stat '%s'"
+msgstr ""
+
+#: builtin/clone.c:310
+#, c-format
+msgid "%s exists and is not a directory"
+msgstr ""
+
+#: builtin/clone.c:324
+#, c-format
+msgid "failed to stat %s\n"
+msgstr ""
+
+#: builtin/clone.c:341
+#, c-format
+msgid "failed to unlink '%s'"
+msgstr ""
+
+#: builtin/clone.c:346
+#, c-format
+msgid "failed to create link '%s'"
+msgstr ""
+
+#: builtin/clone.c:350
+#, c-format
+msgid "failed to copy file to '%s'"
+msgstr ""
+
+#: builtin/clone.c:373
+#, c-format
+msgid "done.\n"
+msgstr ""
+
+#: builtin/clone.c:440
+#, c-format
+msgid "Could not find remote branch %s to clone."
+msgstr ""
+
+#: builtin/clone.c:549
+msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
+msgstr ""
+
+#: builtin/clone.c:639
+msgid "Too many arguments."
+msgstr ""
+
+#: builtin/clone.c:643
+msgid "You must specify a repository to clone."
+msgstr ""
+
+#: builtin/clone.c:654
+#, c-format
+msgid "--bare and --origin %s options are incompatible."
+msgstr ""
+
+#: builtin/clone.c:668
+#, c-format
+msgid "repository '%s' does not exist"
+msgstr ""
+
+#: builtin/clone.c:673
+msgid "--depth is ignored in local clones; use file:// instead."
+msgstr ""
+
+#: builtin/clone.c:683
+#, c-format
+msgid "destination path '%s' already exists and is not an empty directory."
+msgstr ""
+
+#: builtin/clone.c:693
+#, c-format
+msgid "working tree '%s' already exists."
+msgstr ""
+
+#: builtin/clone.c:706 builtin/clone.c:720
+#, c-format
+msgid "could not create leading directories of '%s'"
+msgstr ""
+
+#: builtin/clone.c:709
+#, c-format
+msgid "could not create work tree dir '%s'."
+msgstr ""
+
+#: builtin/clone.c:728
+#, c-format
+msgid "Cloning into bare repository '%s'...\n"
+msgstr ""
+
+#: builtin/clone.c:730
+#, c-format
+msgid "Cloning into '%s'...\n"
+msgstr ""
+
+#: builtin/clone.c:786
+#, c-format
+msgid "Don't know how to clone %s"
+msgstr ""
+
+#: builtin/clone.c:835
+#, c-format
+msgid "Remote branch %s not found in upstream %s"
+msgstr ""
+
+#: builtin/clone.c:842
+msgid "You appear to have cloned an empty repository."
+msgstr ""
+
+#: builtin/column.c:51
+msgid "--command must be the first argument"
+msgstr ""
+
+#: builtin/commit.c:43
+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:55
+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:60
+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"
+"Otherwise, please use 'git reset'\n"
+msgstr ""
+
+#: builtin/commit.c:253
+msgid "failed to unpack HEAD tree object"
+msgstr ""
+
+#: builtin/commit.c:295
+msgid "unable to create temporary index"
+msgstr ""
+
+#: builtin/commit.c:301
+msgid "interactive add failed"
+msgstr ""
+
+#: builtin/commit.c:334 builtin/commit.c:355 builtin/commit.c:405
+msgid "unable to write new_index file"
+msgstr ""
+
+#: builtin/commit.c:386
+msgid "cannot do a partial commit during a merge."
+msgstr ""
+
+#: builtin/commit.c:388
+msgid "cannot do a partial commit during a cherry-pick."
+msgstr ""
+
+#: builtin/commit.c:398
+msgid "cannot read the index"
+msgstr ""
+
+#: builtin/commit.c:418
+msgid "unable to write temporary index file"
+msgstr ""
+
+#: builtin/commit.c:493 builtin/commit.c:499
+#, c-format
+msgid "invalid commit: %s"
+msgstr ""
+
+#: builtin/commit.c:522
+msgid "malformed --author parameter"
+msgstr ""
+
+#: builtin/commit.c:582
+#, c-format
+msgid "Malformed ident string: '%s'"
+msgstr ""
+
+#: builtin/commit.c:620 builtin/commit.c:653 builtin/commit.c:967
+#, c-format
+msgid "could not lookup commit %s"
+msgstr ""
+
+#: builtin/commit.c:632 builtin/shortlog.c:296
+#, c-format
+msgid "(reading log message from standard input)\n"
+msgstr ""
+
+#: builtin/commit.c:634
 msgid "could not read log from standard input"
 msgstr ""
 
-#: builtin/commit.c:707
+#: builtin/commit.c:638
+#, c-format
+msgid "could not read log file '%s'"
+msgstr ""
+
+#: builtin/commit.c:644
+msgid "commit has empty message"
+msgstr ""
+
+#: builtin/commit.c:660
+msgid "could not read MERGE_MSG"
+msgstr ""
+
+#: builtin/commit.c:664
+msgid "could not read SQUASH_MSG"
+msgstr ""
+
+#: builtin/commit.c:668
+#, c-format
+msgid "could not read '%s'"
+msgstr ""
+
+#: builtin/commit.c:720
+msgid "could not write commit template"
+msgstr ""
+
+#: builtin/commit.c:731
+#, 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:736
+#, 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:748
+msgid ""
+"Please enter the commit message for your changes. Lines starting\n"
+"with '#' will be ignored, and an empty message aborts the commit.\n"
+msgstr ""
+
+#: builtin/commit.c:753
+msgid ""
+"Please enter the commit message for your changes. Lines starting\n"
+"with '#' will be kept; you may remove them yourself if you want to.\n"
+"An empty message aborts the commit.\n"
+msgstr ""
+
+#: builtin/commit.c:766
+#, c-format
+msgid "%sAuthor:    %s"
+msgstr ""
+
+#: builtin/commit.c:773
+#, c-format
+msgid "%sCommitter: %s"
+msgstr ""
+
+#: builtin/commit.c:793
+msgid "Cannot read index"
+msgstr ""
+
+#: builtin/commit.c:830
+msgid "Error building trees"
+msgstr ""
+
+#: builtin/commit.c:845 builtin/tag.c:361
+#, c-format
+msgid "Please supply the message using either -m or -F option.\n"
+msgstr ""
+
+#: builtin/commit.c:942
+#, c-format
+msgid "No existing author found with '%s'"
+msgstr ""
+
+#: builtin/commit.c:957 builtin/commit.c:1157
+#, c-format
+msgid "Invalid untracked files mode '%s'"
+msgstr ""
+
+#: builtin/commit.c:997
+msgid "Using both --reset-author and --author does not make sense"
+msgstr ""
+
+#: builtin/commit.c:1008
+msgid "You have nothing to amend."
+msgstr ""
+
+#: builtin/commit.c:1011
+msgid "You are in the middle of a merge -- cannot amend."
+msgstr ""
+
+#: builtin/commit.c:1013
+msgid "You are in the middle of a cherry-pick -- cannot amend."
+msgstr ""
+
+#: builtin/commit.c:1016
+msgid "Options --squash and --fixup cannot be used together"
+msgstr ""
+
+#: builtin/commit.c:1026
+msgid "Only one of -c/-C/-F/--fixup can be used."
+msgstr ""
+
+#: builtin/commit.c:1028
+msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
+msgstr ""
+
+#: builtin/commit.c:1036
+msgid "--reset-author can be used only with -C, -c or --amend."
+msgstr ""
+
+#: builtin/commit.c:1053
+msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
+msgstr ""
+
+#: builtin/commit.c:1055
+msgid "No paths with --include/--only does not make sense."
+msgstr ""
+
+#: builtin/commit.c:1057
+msgid "Clever... amending the last one with dirty index."
+msgstr ""
+
+#: builtin/commit.c:1059
+msgid "Explicit paths specified without -i nor -o; assuming --only paths..."
+msgstr ""
+
+#: builtin/commit.c:1069 builtin/tag.c:577
+#, c-format
+msgid "Invalid cleanup mode %s"
+msgstr ""
+
+#: builtin/commit.c:1074
+msgid "Paths with -a does not make sense."
+msgstr ""
+
+#: builtin/commit.c:1257
+msgid "couldn't look up newly created commit"
+msgstr ""
+
+#: builtin/commit.c:1259
+msgid "could not parse newly created commit"
+msgstr ""
+
+#: builtin/commit.c:1300
+msgid "detached HEAD"
+msgstr ""
+
+#: builtin/commit.c:1302
+msgid " (root-commit)"
+msgstr ""
+
+#: builtin/commit.c:1446
+msgid "could not parse HEAD commit"
+msgstr ""
+
+#: builtin/commit.c:1484 builtin/merge.c:509
+#, c-format
+msgid "could not open '%s' for reading"
+msgstr ""
+
+#: builtin/commit.c:1491
+#, c-format
+msgid "Corrupt MERGE_HEAD file (%s)"
+msgstr ""
+
+#: builtin/commit.c:1498
+msgid "could not read MERGE_MODE"
+msgstr ""
+
+#: builtin/commit.c:1517
+#, c-format
+msgid "could not read commit message: %s"
+msgstr ""
+
+#: builtin/commit.c:1531
+#, c-format
+msgid "Aborting commit; you did not edit the message.\n"
+msgstr ""
+
+#: builtin/commit.c:1536
+#, c-format
+msgid "Aborting commit due to empty commit message.\n"
+msgstr ""
+
+#: builtin/commit.c:1551 builtin/merge.c:936 builtin/merge.c:961
+msgid "failed to write commit object"
+msgstr ""
+
+#: builtin/commit.c:1572
+msgid "cannot lock HEAD ref"
+msgstr ""
+
+#: builtin/commit.c:1576
+msgid "cannot update HEAD ref"
+msgstr ""
+
+#: builtin/commit.c:1587
+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."
+msgstr ""
+
+#: builtin/describe.c:234
+#, c-format
+msgid "annotated tag %s not available"
+msgstr ""
+
+#: builtin/describe.c:238
+#, c-format
+msgid "annotated tag %s has no embedded name"
+msgstr ""
+
+#: builtin/describe.c:240
+#, c-format
+msgid "tag '%s' is really '%s' here"
+msgstr ""
+
+#: builtin/describe.c:267
+#, c-format
+msgid "Not a valid object name %s"
+msgstr ""
+
+#: builtin/describe.c:270
+#, c-format
+msgid "%s is not a valid '%s' object"
+msgstr ""
+
+#: builtin/describe.c:287
+#, c-format
+msgid "no tag exactly matches '%s'"
+msgstr ""
+
+#: builtin/describe.c:289
+#, c-format
+msgid "searching to describe %s\n"
+msgstr ""
+
+#: builtin/describe.c:329
+#, c-format
+msgid "finished search at %s\n"
+msgstr ""
+
+#: builtin/describe.c:353
+#, c-format
+msgid ""
+"No annotated tags can describe '%s'.\n"
+"However, there were unannotated tags: try --tags."
+msgstr ""
+
+#: builtin/describe.c:357
+#, c-format
+msgid ""
+"No tags can describe '%s'.\n"
+"Try --always, or create some tags."
+msgstr ""
+
+#: builtin/describe.c:378
+#, c-format
+msgid "traversed %lu commits\n"
+msgstr ""
+
+#: builtin/describe.c:381
+#, c-format
+msgid ""
+"more than %i tags found; listed %i most recent\n"
+"gave up search at %s\n"
+msgstr ""
+
+#: builtin/describe.c:436
+msgid "--long is incompatible with --abbrev=0"
+msgstr ""
+
+#: builtin/describe.c:462
+msgid "No names found, cannot describe anything."
+msgstr ""
+
+#: builtin/describe.c:482
+msgid "--dirty is incompatible with committishes"
+msgstr ""
+
+#: builtin/diff.c:77
+#, c-format
+msgid "'%s': not a regular file or symlink"
+msgstr ""
+
+#: builtin/diff.c:220
+#, c-format
+msgid "invalid option: %s"
+msgstr ""
+
+#: builtin/diff.c:297
+msgid "Not a git repository"
+msgstr ""
+
+#: builtin/diff.c:347
+#, c-format
+msgid "invalid object '%s' given."
+msgstr ""
+
+#: builtin/diff.c:352
+#, c-format
+msgid "more than %d trees given: '%s'"
+msgstr ""
+
+#: builtin/diff.c:362
+#, c-format
+msgid "more than two blobs given: '%s'"
+msgstr ""
+
+#: builtin/diff.c:370
+#, c-format
+msgid "unhandled object '%s' given."
+msgstr ""
+
+#: builtin/fetch.c:200
+msgid "Couldn't find remote ref HEAD"
+msgstr ""
+
+#: builtin/fetch.c:253
+#, c-format
+msgid "object %s not found"
+msgstr ""
+
+#: builtin/fetch.c:259
+msgid "[up to date]"
+msgstr ""
+
+#: builtin/fetch.c:273
 #, c-format
-msgid "could not read log file '%s'"
+msgid "! %-*s %-*s -> %s  (can't fetch in current branch)"
 msgstr ""
 
-#: builtin/commit.c:713
-msgid "commit has empty message"
+#: builtin/fetch.c:274 builtin/fetch.c:360
+msgid "[rejected]"
 msgstr ""
 
-#: builtin/commit.c:729
-msgid "could not read MERGE_MSG"
+#: builtin/fetch.c:285
+msgid "[tag update]"
 msgstr ""
 
-#: builtin/commit.c:733
-msgid "could not read SQUASH_MSG"
+#: builtin/fetch.c:287 builtin/fetch.c:322 builtin/fetch.c:340
+msgid "  (unable to update local ref)"
+msgstr ""
+
+#: builtin/fetch.c:305
+msgid "[new tag]"
 msgstr ""
 
-#: builtin/commit.c:737
+#: builtin/fetch.c:308
+msgid "[new branch]"
+msgstr ""
+
+#: builtin/fetch.c:311
+msgid "[new ref]"
+msgstr ""
+
+#: builtin/fetch.c:356
+msgid "unable to update local ref"
+msgstr ""
+
+#: builtin/fetch.c:356
+msgid "forced update"
+msgstr ""
+
+#: builtin/fetch.c:362
+msgid "(non-fast-forward)"
+msgstr ""
+
+#: builtin/fetch.c:393 builtin/fetch.c:685
 #, c-format
-msgid "could not read '%s'"
+msgid "cannot open %s: %s\n"
 msgstr ""
 
-#: builtin/commit.c:765
+#: builtin/fetch.c:402
 #, c-format
-msgid "could not open '%s'"
+msgid "%s did not send all necessary objects\n"
 msgstr ""
 
-#: builtin/commit.c:789
-msgid "could not write commit template"
+#: builtin/fetch.c:488
+#, c-format
+msgid "From %.*s\n"
 msgstr ""
 
-#: builtin/commit.c:799
+#: builtin/fetch.c:499
 #, c-format
 msgid ""
-"\n"
-"It looks like you may be committing a %s.\n"
-"If this is not correct, please remove the file\n"
-"\t%s\n"
-"and try again.\n"
+"some local refs could not be updated; try running\n"
+" 'git remote prune %s' to remove any old, conflicting branches"
+msgstr ""
+
+#: builtin/fetch.c:549
+#, c-format
+msgid "   (%s will become dangling)"
+msgstr ""
+
+#: builtin/fetch.c:550
+#, c-format
+msgid "   (%s has become dangling)"
+msgstr ""
+
+#: builtin/fetch.c:557
+msgid "[deleted]"
+msgstr ""
+
+#: builtin/fetch.c:558 builtin/remote.c:1055
+msgid "(none)"
+msgstr ""
+
+#: builtin/fetch.c:675
+#, c-format
+msgid "Refusing to fetch into current branch %s of non-bare repository"
+msgstr ""
+
+#: builtin/fetch.c:709
+#, c-format
+msgid "Don't know how to fetch from %s"
 msgstr ""
 
-#: builtin/commit.c:812
-msgid "Please enter the commit message for your changes."
+#: builtin/fetch.c:786
+#, c-format
+msgid "Option \"%s\" value \"%s\" is not valid for %s"
+msgstr ""
+
+#: builtin/fetch.c:789
+#, c-format
+msgid "Option \"%s\" is ignored for %s\n"
+msgstr ""
+
+#: builtin/fetch.c:888
+#, c-format
+msgid "Fetching %s\n"
+msgstr ""
+
+#: builtin/fetch.c:890 builtin/remote.c:100
+#, c-format
+msgid "Could not fetch %s"
 msgstr ""
 
-#: builtin/commit.c:815
+#: builtin/fetch.c:907
 msgid ""
-" Lines starting\n"
-"with '#' will be ignored, and an empty message aborts the commit.\n"
+"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:927
+msgid "You need to specify a tag name."
+msgstr ""
+
+#: builtin/fetch.c:979
+msgid "fetch --all does not take a repository argument"
+msgstr ""
+
+#: builtin/fetch.c:981
+msgid "fetch --all does not make sense with refspecs"
+msgstr ""
+
+#: builtin/fetch.c:992
+#, c-format
+msgid "No such remote or remote group: %s"
+msgstr ""
+
+#: builtin/fetch.c:1000
+msgid "Fetching a group and specifying refspecs does not make sense"
+msgstr ""
+
+#: builtin/gc.c:63
+#, c-format
+msgid "Invalid %s: '%s'"
+msgstr ""
+
+#: builtin/gc.c:90
+#, c-format
+msgid "insanely long object directory %.*s"
+msgstr ""
+
+#: builtin/gc.c:221
+#, c-format
+msgid "Auto packing the repository for optimum performance.\n"
 msgstr ""
 
-#: builtin/commit.c:820
+#: builtin/gc.c:224
+#, c-format
 msgid ""
-" Lines starting\n"
-"with '#' will be kept; you may remove them yourself if you want to.\n"
-"An empty message aborts the commit.\n"
+"Auto packing the repository for optimum performance. You may also\n"
+"run \"git gc\" manually. See \"git help gc\" for more information.\n"
+msgstr ""
+
+#: builtin/gc.c:251
+msgid ""
+"There are too many unreachable loose objects; run 'git prune' to remove them."
 msgstr ""
 
-#: builtin/commit.c:832
+#: builtin/grep.c:216
 #, c-format
-msgid "%sAuthor:    %s"
+msgid "grep: failed to create thread: %s"
 msgstr ""
 
-#: builtin/commit.c:839
+#: builtin/grep.c:402
 #, c-format
-msgid "%sCommitter: %s"
+msgid "Failed to chdir: %s"
 msgstr ""
 
-#: builtin/commit.c:859
-msgid "Cannot read index"
+#: builtin/grep.c:478 builtin/grep.c:512
+#, c-format
+msgid "unable to read tree (%s)"
 msgstr ""
 
-#: builtin/commit.c:896
-msgid "Error building trees"
+#: builtin/grep.c:526
+#, c-format
+msgid "unable to grep from object of type %s"
 msgstr ""
 
-#: builtin/commit.c:911 builtin/tag.c:357
+#: builtin/grep.c:584
 #, c-format
-msgid "Please supply the message using either -m or -F option.\n"
+msgid "switch `%c' expects a numerical value"
 msgstr ""
 
-#: builtin/commit.c:1008
+#: builtin/grep.c:601
 #, c-format
-msgid "No existing author found with '%s'"
+msgid "cannot open '%s'"
 msgstr ""
 
-#: builtin/commit.c:1023 builtin/commit.c:1217
+#: builtin/grep.c:885
+msgid "no pattern given."
+msgstr ""
+
+#: builtin/grep.c:899
 #, c-format
-msgid "Invalid untracked files mode '%s'"
+msgid "bad object %s"
 msgstr ""
 
-#: builtin/commit.c:1063
-msgid "Using both --reset-author and --author does not make sense"
+#: builtin/grep.c:940
+msgid "--open-files-in-pager only works on the worktree"
 msgstr ""
 
-#: builtin/commit.c:1074
-msgid "You have nothing to amend."
+#: builtin/grep.c:963
+msgid "--cached or --untracked cannot be used with --no-index."
+msgstr ""
+
+#: builtin/grep.c:968
+msgid "--no-index or --untracked cannot be used with revs."
+msgstr ""
+
+#: builtin/grep.c:971
+msgid "--[no-]exclude-standard cannot be used for tracked contents."
+msgstr ""
+
+#: builtin/grep.c:979
+msgid "both --cached and trees are given."
 msgstr ""
 
-#: builtin/commit.c:1076
+#: builtin/help.c:59
 #, c-format
-msgid "You are in the middle of a %s -- cannot amend."
+msgid "unrecognized help format '%s'"
 msgstr ""
 
-#: builtin/commit.c:1078
-msgid "Options --squash and --fixup cannot be used together"
+#: builtin/help.c:87
+msgid "Failed to start emacsclient."
 msgstr ""
 
-#: builtin/commit.c:1088
-msgid "Only one of -c/-C/-F/--fixup can be used."
+#: builtin/help.c:100
+msgid "Failed to parse emacsclient version."
 msgstr ""
 
-#: builtin/commit.c:1090
-msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
+#: builtin/help.c:108
+#, c-format
+msgid "emacsclient version '%d' too old (< 22)."
 msgstr ""
 
-#: builtin/commit.c:1098
-msgid "--reset-author can be used only with -C, -c or --amend."
+#: builtin/help.c:126 builtin/help.c:154 builtin/help.c:163 builtin/help.c:171
+#, c-format
+msgid "failed to exec '%s': %s"
 msgstr ""
 
-#: builtin/commit.c:1115
-msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
+#: builtin/help.c:211
+#, c-format
+msgid ""
+"'%s': path for unsupported man viewer.\n"
+"Please consider using 'man.<tool>.cmd' instead."
 msgstr ""
 
-#: builtin/commit.c:1117
-msgid "No paths with --include/--only does not make sense."
+#: builtin/help.c:223
+#, c-format
+msgid ""
+"'%s': cmd for supported man viewer.\n"
+"Please consider using 'man.<tool>.path' instead."
 msgstr ""
 
-#: builtin/commit.c:1119
-msgid "Clever... amending the last one with dirty index."
+#: builtin/help.c:287
+msgid "The most commonly used git commands are:"
 msgstr ""
 
-#: builtin/commit.c:1121
-msgid "Explicit paths specified without -i nor -o; assuming --only paths..."
+#: builtin/help.c:355
+#, c-format
+msgid "'%s': unknown man viewer."
+msgstr ""
+
+#: builtin/help.c:372
+msgid "no man viewer handled the request"
+msgstr ""
+
+#: builtin/help.c:380
+msgid "no info viewer handled the request"
 msgstr ""
 
-#: builtin/commit.c:1131 builtin/tag.c:556
+#: builtin/help.c:391
 #, c-format
-msgid "Invalid cleanup mode %s"
+msgid "'%s': not a documentation directory."
 msgstr ""
 
-#: builtin/commit.c:1136
-msgid "Paths with -a does not make sense."
+#: builtin/help.c:432 builtin/help.c:439
+#, c-format
+msgid "usage: %s%s"
 msgstr ""
 
-#: builtin/commit.c:1315
-msgid "couldn't look up newly created commit"
+#: builtin/help.c:453
+#, c-format
+msgid "`git %s' is aliased to `%s'"
 msgstr ""
 
-#: builtin/commit.c:1317
-msgid "could not parse newly created commit"
+#: builtin/index-pack.c:169
+#, c-format
+msgid "object type mismatch at %s"
 msgstr ""
 
-#: builtin/commit.c:1358
-msgid "detached HEAD"
+#: builtin/index-pack.c:189
+msgid "object of unexpected type"
 msgstr ""
 
-#: builtin/commit.c:1360
-msgid " (root-commit)"
+#: builtin/index-pack.c:226
+#, c-format
+msgid "cannot fill %d byte"
+msgid_plural "cannot fill %d bytes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/index-pack.c:236
+msgid "early EOF"
+msgstr ""
+
+#: builtin/index-pack.c:237
+msgid "read error on input"
+msgstr ""
+
+#: builtin/index-pack.c:249
+msgid "used more bytes than were available"
+msgstr ""
+
+#: builtin/index-pack.c:256
+msgid "pack too large for current definition of off_t"
+msgstr ""
+
+#: builtin/index-pack.c:272
+#, c-format
+msgid "unable to create '%s'"
+msgstr ""
+
+#: builtin/index-pack.c:277
+#, c-format
+msgid "cannot open packfile '%s'"
+msgstr ""
+
+#: builtin/index-pack.c:291
+msgid "pack signature mismatch"
+msgstr ""
+
+#: builtin/index-pack.c:311
+#, c-format
+msgid "pack has bad object at offset %lu: %s"
+msgstr ""
+
+#: builtin/index-pack.c:405
+#, c-format
+msgid "inflate returned %d"
+msgstr ""
+
+#: builtin/index-pack.c:450
+msgid "offset value overflow for delta base object"
+msgstr ""
+
+#: builtin/index-pack.c:458
+msgid "delta base offset is out of bound"
+msgstr ""
+
+#: builtin/index-pack.c:466
+#, c-format
+msgid "unknown object type %d"
+msgstr ""
+
+#: builtin/index-pack.c:495
+msgid "cannot pread pack file"
+msgstr ""
+
+#: builtin/index-pack.c:497
+#, 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:510
+msgid "serious inflate inconsistency"
+msgstr ""
+
+#: builtin/index-pack.c:583
+#, c-format
+msgid "cannot read existing object %s"
+msgstr ""
+
+#: builtin/index-pack.c:586
+#, c-format
+msgid "SHA1 COLLISION FOUND WITH %s !"
+msgstr ""
+
+#: builtin/index-pack.c:598
+#, c-format
+msgid "invalid blob object %s"
+msgstr ""
+
+#: builtin/index-pack.c:610
+#, c-format
+msgid "invalid %s"
+msgstr ""
+
+#: builtin/index-pack.c:612
+msgid "Error in object"
+msgstr ""
+
+#: builtin/index-pack.c:614
+#, c-format
+msgid "Not all child objects of %s are reachable"
+msgstr ""
+
+#: builtin/index-pack.c:687 builtin/index-pack.c:713
+msgid "failed to apply delta"
+msgstr ""
+
+#: builtin/index-pack.c:850
+msgid "Receiving objects"
+msgstr ""
+
+#: builtin/index-pack.c:850
+msgid "Indexing objects"
+msgstr ""
+
+#: builtin/index-pack.c:872
+msgid "pack is corrupted (SHA1 mismatch)"
+msgstr ""
+
+#: builtin/index-pack.c:877
+msgid "cannot fstat packfile"
+msgstr ""
+
+#: builtin/index-pack.c:880
+msgid "pack has junk at the end"
 msgstr ""
 
-#: builtin/commit.c:1450
-msgid "could not parse HEAD commit"
+#: builtin/index-pack.c:903
+msgid "Resolving deltas"
 msgstr ""
 
-#: builtin/commit.c:1487 builtin/merge.c:509
-#, c-format
-msgid "could not open '%s' for reading"
+#: builtin/index-pack.c:954
+msgid "confusion beyond insanity"
 msgstr ""
 
-#: builtin/commit.c:1494
+#: builtin/index-pack.c:973
 #, c-format
-msgid "Corrupt MERGE_HEAD file (%s)"
-msgstr ""
+msgid "pack has %d unresolved delta"
+msgid_plural "pack has %d unresolved deltas"
+msgstr[0] ""
+msgstr[1] ""
 
-#: builtin/commit.c:1501
-msgid "could not read MERGE_MODE"
+#: builtin/index-pack.c:998
+#, c-format
+msgid "unable to deflate appended object (%d)"
 msgstr ""
 
-#: builtin/commit.c:1520
+#: builtin/index-pack.c:1077
 #, c-format
-msgid "could not read commit message: %s"
+msgid "local object %s is corrupt"
 msgstr ""
 
-#: builtin/commit.c:1534
-#, c-format
-msgid "Aborting commit; you did not edit the message.\n"
+#: builtin/index-pack.c:1101
+msgid "error while closing pack file"
 msgstr ""
 
-#: builtin/commit.c:1539
+#: builtin/index-pack.c:1114
 #, c-format
-msgid "Aborting commit due to empty commit message.\n"
+msgid "cannot write keep file '%s'"
 msgstr ""
 
-#: builtin/commit.c:1554 builtin/merge.c:935 builtin/merge.c:968
-msgid "failed to write commit object"
+#: builtin/index-pack.c:1122
+#, c-format
+msgid "cannot close written keep file '%s'"
 msgstr ""
 
-#: builtin/commit.c:1575
-msgid "cannot lock HEAD ref"
+#: builtin/index-pack.c:1135
+msgid "cannot store pack file"
 msgstr ""
 
-#: builtin/commit.c:1579
-msgid "cannot update HEAD ref"
+#: builtin/index-pack.c:1146
+msgid "cannot store index file"
 msgstr ""
 
-#: builtin/commit.c:1590
-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."
+#: builtin/index-pack.c:1247
+#, c-format
+msgid "Cannot open existing pack file '%s'"
 msgstr ""
 
-#: builtin/describe.c:234
+#: builtin/index-pack.c:1249
 #, c-format
-msgid "annotated tag %s not available"
+msgid "Cannot open existing pack idx file for '%s'"
 msgstr ""
 
-#: builtin/describe.c:238
+#: builtin/index-pack.c:1296
 #, c-format
-msgid "annotated tag %s has no embedded name"
-msgstr ""
+msgid "non delta: %d object"
+msgid_plural "non delta: %d objects"
+msgstr[0] ""
+msgstr[1] ""
 
-#: builtin/describe.c:240
+#: builtin/index-pack.c:1303
 #, c-format
-msgid "tag '%s' is really '%s' here"
+msgid "chain length = %d: %lu object"
+msgid_plural "chain length = %d: %lu objects"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/index-pack.c:1330
+msgid "Cannot come back to cwd"
 msgstr ""
 
-#: builtin/describe.c:267
+#: builtin/index-pack.c:1374 builtin/index-pack.c:1377
+#: builtin/index-pack.c:1389 builtin/index-pack.c:1393
 #, c-format
-msgid "Not a valid object name %s"
+msgid "bad %s"
 msgstr ""
 
-#: builtin/describe.c:270
-#, c-format
-msgid "%s is not a valid '%s' object"
+#: builtin/index-pack.c:1407
+msgid "--fix-thin cannot be used without --stdin"
 msgstr ""
 
-#: builtin/describe.c:287
+#: builtin/index-pack.c:1411 builtin/index-pack.c:1421
 #, c-format
-msgid "no tag exactly matches '%s'"
+msgid "packfile name '%s' does not end with '.pack'"
 msgstr ""
 
-#: builtin/describe.c:289
-#, c-format
-msgid "searching to describe %s\n"
+#: builtin/index-pack.c:1430
+msgid "--verify with no packfile name given"
 msgstr ""
 
-#: builtin/describe.c:329
+#: builtin/init-db.c:35
 #, c-format
-msgid "finished search at %s\n"
+msgid "Could not make %s writable by group"
 msgstr ""
 
-#: builtin/describe.c:353
+#: builtin/init-db.c:62
 #, c-format
-msgid ""
-"No annotated tags can describe '%s'.\n"
-"However, there were unannotated tags: try --tags."
+msgid "insanely long template name %s"
 msgstr ""
 
-#: builtin/describe.c:357
+#: builtin/init-db.c:67
 #, c-format
-msgid ""
-"No tags can describe '%s'.\n"
-"Try --always, or create some tags."
+msgid "cannot stat '%s'"
 msgstr ""
 
-#: builtin/describe.c:378
+#: builtin/init-db.c:73
 #, c-format
-msgid "traversed %lu commits\n"
+msgid "cannot stat template '%s'"
 msgstr ""
 
-#: builtin/describe.c:381
+#: builtin/init-db.c:80
 #, c-format
-msgid ""
-"more than %i tags found; listed %i most recent\n"
-"gave up search at %s\n"
+msgid "cannot opendir '%s'"
 msgstr ""
 
-#: builtin/describe.c:436
-msgid "--long is incompatible with --abbrev=0"
+#: builtin/init-db.c:97
+#, c-format
+msgid "cannot readlink '%s'"
 msgstr ""
 
-#: builtin/describe.c:462
-msgid "No names found, cannot describe anything."
+#: builtin/init-db.c:99
+#, c-format
+msgid "insanely long symlink %s"
 msgstr ""
 
-#: builtin/describe.c:482
-msgid "--dirty is incompatible with committishes"
+#: builtin/init-db.c:102
+#, c-format
+msgid "cannot symlink '%s' '%s'"
 msgstr ""
 
-#: builtin/diff.c:77
+#: builtin/init-db.c:106
 #, c-format
-msgid "'%s': not a regular file or symlink"
+msgid "cannot copy '%s' to '%s'"
 msgstr ""
 
-#: builtin/diff.c:220
+#: builtin/init-db.c:110
 #, c-format
-msgid "invalid option: %s"
+msgid "ignoring template %s"
 msgstr ""
 
-#: builtin/diff.c:297
-msgid "Not a git repository"
+#: builtin/init-db.c:133
+#, c-format
+msgid "insanely long template path %s"
 msgstr ""
 
-#: builtin/diff.c:347
+#: builtin/init-db.c:141
 #, c-format
-msgid "invalid object '%s' given."
+msgid "templates not found %s"
 msgstr ""
 
-#: builtin/diff.c:352
+#: builtin/init-db.c:154
 #, c-format
-msgid "more than %d trees given: '%s'"
+msgid "not copying templates of a wrong format version %d from '%s'"
 msgstr ""
 
-#: builtin/diff.c:362
+#: builtin/init-db.c:192
 #, c-format
-msgid "more than two blobs given: '%s'"
+msgid "insane git directory %s"
 msgstr ""
 
-#: builtin/diff.c:370
+#: builtin/init-db.c:322 builtin/init-db.c:325
 #, c-format
-msgid "unhandled object '%s' given."
+msgid "%s already exists"
 msgstr ""
 
-#: builtin/fetch.c:200
-msgid "Couldn't find remote ref HEAD"
+#: builtin/init-db.c:354
+#, c-format
+msgid "unable to handle file type %d"
 msgstr ""
 
-#: builtin/fetch.c:252
+#: builtin/init-db.c:357
 #, c-format
-msgid "object %s not found"
+msgid "unable to move %s to %s"
 msgstr ""
 
-#: builtin/fetch.c:258
-msgid "[up to date]"
+#: builtin/init-db.c:362
+#, c-format
+msgid "Could not create git link %s"
 msgstr ""
 
-#: builtin/fetch.c:272
+#.
+#. * 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:419
 #, c-format
-msgid "! %-*s %-*s -> %s  (can't fetch in current branch)"
+msgid "%s%s Git repository in %s%s\n"
 msgstr ""
 
-#: builtin/fetch.c:273 builtin/fetch.c:351
-msgid "[rejected]"
+#: builtin/init-db.c:420
+msgid "Reinitialized existing"
 msgstr ""
 
-#: builtin/fetch.c:284
-msgid "[tag update]"
+#: builtin/init-db.c:420
+msgid "Initialized empty"
 msgstr ""
 
-#: builtin/fetch.c:286 builtin/fetch.c:313 builtin/fetch.c:331
-msgid "  (unable to update local ref)"
+#: builtin/init-db.c:421
+msgid " shared"
 msgstr ""
 
-#: builtin/fetch.c:298
-msgid "[new tag]"
+#: builtin/init-db.c:440
+msgid "cannot tell cwd"
 msgstr ""
 
-#: builtin/fetch.c:302
-msgid "[new branch]"
+#: builtin/init-db.c:521 builtin/init-db.c:528
+#, c-format
+msgid "cannot mkdir %s"
 msgstr ""
 
-#: builtin/fetch.c:347
-msgid "unable to update local ref"
+#: builtin/init-db.c:532
+#, c-format
+msgid "cannot chdir to %s"
 msgstr ""
 
-#: builtin/fetch.c:347
-msgid "forced update"
+#: builtin/init-db.c:554
+#, c-format
+msgid ""
+"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
+"dir=<directory>)"
 msgstr ""
 
-#: builtin/fetch.c:353
-msgid "(non-fast-forward)"
+#: builtin/init-db.c:578
+msgid "Cannot access current working directory"
 msgstr ""
 
-#: builtin/fetch.c:384 builtin/fetch.c:676
+#: builtin/init-db.c:585
 #, c-format
-msgid "cannot open %s: %s\n"
+msgid "Cannot access work tree '%s'"
 msgstr ""
 
-#: builtin/fetch.c:393
+#: builtin/log.c:188
 #, c-format
-msgid "%s did not send all necessary objects\n"
+msgid "Final output: %d %s\n"
 msgstr ""
 
-#: builtin/fetch.c:479
+#: builtin/log.c:401 builtin/log.c:489
 #, c-format
-msgid "From %.*s\n"
+msgid "Could not read object %s"
 msgstr ""
 
-#: builtin/fetch.c:490
+#: builtin/log.c:513
 #, c-format
-msgid ""
-"some local refs could not be updated; try running\n"
-" 'git remote prune %s' to remove any old, conflicting branches"
+msgid "Unknown type: %d"
 msgstr ""
 
-#: builtin/fetch.c:540
-#, c-format
-msgid "   (%s will become dangling)\n"
+#: builtin/log.c:602
+msgid "format.headers without value"
 msgstr ""
 
-#: builtin/fetch.c:541
+#: builtin/log.c:676
+msgid "name of output directory is too long"
+msgstr ""
+
+#: builtin/log.c:687
 #, c-format
-msgid "   (%s has become dangling)\n"
+msgid "Cannot open patch file %s"
 msgstr ""
 
-#: builtin/fetch.c:548
-msgid "[deleted]"
+#: builtin/log.c:701
+msgid "Need exactly one range."
 msgstr ""
 
-#: builtin/fetch.c:549
-msgid "(none)"
+#: builtin/log.c:709
+msgid "Not a range."
 msgstr ""
 
-#: builtin/fetch.c:666
-#, c-format
-msgid "Refusing to fetch into current branch %s of non-bare repository"
+#: builtin/log.c:786
+msgid "Cover letter needs email format"
 msgstr ""
 
-#: builtin/fetch.c:700
+#: builtin/log.c:859
 #, c-format
-msgid "Don't know how to fetch from %s"
+msgid "insane in-reply-to: %s"
 msgstr ""
 
-#: builtin/fetch.c:777
-#, c-format
-msgid "Option \"%s\" value \"%s\" is not valid for %s"
+#: builtin/log.c:932
+msgid "Two output directories?"
 msgstr ""
 
-#: builtin/fetch.c:780
+#: builtin/log.c:1153
 #, c-format
-msgid "Option \"%s\" is ignored for %s\n"
+msgid "bogus committer info %s"
 msgstr ""
 
-#: builtin/fetch.c:879
-#, c-format
-msgid "Fetching %s\n"
+#: builtin/log.c:1198
+msgid "-n and -k are mutually exclusive."
 msgstr ""
 
-#: builtin/fetch.c:881
-#, c-format
-msgid "Could not fetch %s"
+#: builtin/log.c:1200
+msgid "--subject-prefix and -k are mutually exclusive."
 msgstr ""
 
-#: builtin/fetch.c:898
-msgid ""
-"No remote repository specified.  Please, specify either a URL or a\n"
-"remote name from which new revisions should be fetched."
+#: builtin/log.c:1208
+msgid "--name-only does not make sense"
 msgstr ""
 
-#: builtin/fetch.c:918
-msgid "You need to specify a tag name."
+#: builtin/log.c:1210
+msgid "--name-status does not make sense"
 msgstr ""
 
-#: builtin/fetch.c:970
-msgid "fetch --all does not take a repository argument"
+#: builtin/log.c:1212
+msgid "--check does not make sense"
 msgstr ""
 
-#: builtin/fetch.c:972
-msgid "fetch --all does not make sense with refspecs"
+#: builtin/log.c:1235
+msgid "standard output, or directory, which one?"
 msgstr ""
 
-#: builtin/fetch.c:983
+#: builtin/log.c:1237
 #, c-format
-msgid "No such remote or remote group: %s"
+msgid "Could not create directory '%s'"
 msgstr ""
 
-#: builtin/fetch.c:991
-msgid "Fetching a group and specifying refspecs does not make sense"
+#: builtin/log.c:1390
+msgid "Failed to create output files"
 msgstr ""
 
-#: builtin/gc.c:63
+#: builtin/log.c:1494
 #, c-format
-msgid "Invalid %s: '%s'"
+msgid ""
+"Could not find a tracked remote branch, please specify <upstream> manually.\n"
+msgstr ""
+
+#: builtin/log.c:1510 builtin/log.c:1512 builtin/log.c:1524
+#, c-format
+msgid "Unknown commit %s"
 msgstr ""
 
-#: builtin/gc.c:78
-msgid "Too many options specified"
+#: builtin/merge.c:90
+msgid "switch `m' requires a value"
 msgstr ""
 
-#: builtin/gc.c:103
+#: builtin/merge.c:127
 #, c-format
-msgid "insanely long object directory %.*s"
+msgid "Could not find merge strategy '%s'.\n"
 msgstr ""
 
-#: builtin/gc.c:223
+#: builtin/merge.c:128
 #, c-format
-msgid "Auto packing the repository for optimum performance.\n"
+msgid "Available strategies are:"
 msgstr ""
 
-#: builtin/gc.c:226
+#: builtin/merge.c:133
 #, 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 "Available custom strategies are:"
 msgstr ""
 
-#: builtin/gc.c:256
-msgid ""
-"There are too many unreachable loose objects; run 'git prune' to remove them."
+#: builtin/merge.c:240
+msgid "could not run stash."
 msgstr ""
 
-#: builtin/grep.c:216
-#, c-format
-msgid "grep: failed to create thread: %s"
+#: builtin/merge.c:245
+msgid "stash failed"
 msgstr ""
 
-#: builtin/grep.c:402
+#: builtin/merge.c:250
 #, c-format
-msgid "Failed to chdir: %s"
+msgid "not a valid object: %s"
 msgstr ""
 
-#: builtin/grep.c:478 builtin/grep.c:512
-#, c-format
-msgid "unable to read tree (%s)"
+#: builtin/merge.c:269 builtin/merge.c:286
+msgid "read-tree failed"
 msgstr ""
 
-#: builtin/grep.c:526
+#: builtin/merge.c:316
+msgid " (nothing to squash)"
+msgstr ""
+
+#: builtin/merge.c:329
 #, c-format
-msgid "unable to grep from object of type %s"
+msgid "Squash commit -- not updating HEAD\n"
+msgstr ""
+
+#: builtin/merge.c:361
+msgid "Writing SQUASH_MSG"
 msgstr ""
 
-#: builtin/grep.c:584
-#, c-format
-msgid "switch `%c' expects a numerical value"
+#: builtin/merge.c:363
+msgid "Finishing SQUASH_MSG"
 msgstr ""
 
-#: builtin/grep.c:601
+#: builtin/merge.c:386
 #, c-format
-msgid "cannot open '%s'"
+msgid "No merge message -- not updating HEAD\n"
 msgstr ""
 
-#: builtin/grep.c:888
-msgid "no pattern given."
+#: builtin/merge.c:437
+#, c-format
+msgid "'%s' does not point to a commit"
 msgstr ""
 
-#: builtin/grep.c:902
+#: builtin/merge.c:536
 #, c-format
-msgid "bad object %s"
+msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr ""
 
-#: builtin/grep.c:943
-msgid "--open-files-in-pager only works on the worktree"
+#: builtin/merge.c:629
+msgid "git write-tree failed to write a tree"
 msgstr ""
 
-#: builtin/grep.c:966
-msgid "--cached or --untracked cannot be used with --no-index."
+#: builtin/merge.c:679
+msgid "failed to read the cache"
 msgstr ""
 
-#: builtin/grep.c:971
-msgid "--no-index or --untracked cannot be used with revs."
+#: builtin/merge.c:697
+msgid "Unable to write index."
 msgstr ""
 
-#: builtin/grep.c:974
-msgid "--[no-]exclude-standard cannot be used for tracked contents."
+#: builtin/merge.c:710
+msgid "Not handling anything other than two heads merge."
 msgstr ""
 
-#: builtin/grep.c:982
-msgid "both --cached and trees are given."
+#: builtin/merge.c:724
+#, c-format
+msgid "Unknown option for merge-recursive: -X%s"
 msgstr ""
 
-#: builtin/init-db.c:35
+#: builtin/merge.c:738
 #, c-format
-msgid "Could not make %s writable by group"
+msgid "unable to write %s"
 msgstr ""
 
-#: builtin/init-db.c:62
+#: builtin/merge.c:877
 #, c-format
-msgid "insanely long template name %s"
+msgid "Could not read from '%s'"
 msgstr ""
 
-#: builtin/init-db.c:67
+#: builtin/merge.c:886
 #, c-format
-msgid "cannot stat '%s'"
+msgid "Not committing merge; use 'git commit' to complete the merge.\n"
 msgstr ""
 
-#: builtin/init-db.c:73
-#, c-format
-msgid "cannot stat template '%s'"
+#: builtin/merge.c:892
+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 '#' will be ignored, and an empty message aborts\n"
+"the commit.\n"
 msgstr ""
 
-#: builtin/init-db.c:80
-#, c-format
-msgid "cannot opendir '%s'"
+#: builtin/merge.c:916
+msgid "Empty commit message."
 msgstr ""
 
-#: builtin/init-db.c:97
+#: builtin/merge.c:928
 #, c-format
-msgid "cannot readlink '%s'"
+msgid "Wonderful.\n"
 msgstr ""
 
-#: builtin/init-db.c:99
+#: builtin/merge.c:993
 #, c-format
-msgid "insanely long symlink %s"
+msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
 msgstr ""
 
-#: builtin/init-db.c:102
+#: builtin/merge.c:1009
 #, c-format
-msgid "cannot symlink '%s' '%s'"
+msgid "'%s' is not a commit"
 msgstr ""
 
-#: builtin/init-db.c:106
-#, c-format
-msgid "cannot copy '%s' to '%s'"
+#: builtin/merge.c:1050
+msgid "No current branch."
 msgstr ""
 
-#: builtin/init-db.c:110
-#, c-format
-msgid "ignoring template %s"
+#: builtin/merge.c:1052
+msgid "No remote for the current branch."
 msgstr ""
 
-#: builtin/init-db.c:133
-#, c-format
-msgid "insanely long template path %s"
+#: builtin/merge.c:1054
+msgid "No default upstream defined for the current branch."
 msgstr ""
 
-#: builtin/init-db.c:141
+#: builtin/merge.c:1059
 #, c-format
-msgid "templates not found %s"
+msgid "No remote tracking branch for %s from %s"
 msgstr ""
 
-#: builtin/init-db.c:154
+#: builtin/merge.c:1146 builtin/merge.c:1303
 #, c-format
-msgid "not copying templates of a wrong format version %d from '%s'"
+msgid "%s - not something we can merge"
 msgstr ""
 
-#: builtin/init-db.c:192
-#, c-format
-msgid "insane git directory %s"
+#: builtin/merge.c:1214
+msgid "There is no merge to abort (MERGE_HEAD missing)."
 msgstr ""
 
-#: builtin/init-db.c:322 builtin/init-db.c:325
-#, c-format
-msgid "%s already exists"
+#: builtin/merge.c:1230 git-pull.sh:31
+msgid ""
+"You have not concluded your merge (MERGE_HEAD exists).\n"
+"Please, commit your changes before you can merge."
 msgstr ""
 
-#: builtin/init-db.c:354
-#, c-format
-msgid "unable to handle file type %d"
+#: builtin/merge.c:1233 git-pull.sh:34
+msgid "You have not concluded your merge (MERGE_HEAD exists)."
 msgstr ""
 
-#: builtin/init-db.c:357
-#, c-format
-msgid "unable to move %s to %s"
+#: builtin/merge.c:1237
+msgid ""
+"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
+"Please, commit your changes before you can merge."
 msgstr ""
 
-#: builtin/init-db.c:362
-#, c-format
-msgid "Could not create git link %s"
+#: builtin/merge.c:1240
+msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
 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:419
-#, c-format
-msgid "%s%s Git repository in %s%s\n"
+#: builtin/merge.c:1249
+msgid "You cannot combine --squash with --no-ff."
 msgstr ""
 
-#: builtin/init-db.c:420
-msgid "Reinitialized existing"
+#: builtin/merge.c:1254
+msgid "You cannot combine --no-ff with --ff-only."
 msgstr ""
 
-#: builtin/init-db.c:420
-msgid "Initialized empty"
+#: builtin/merge.c:1261
+msgid "No commit specified and merge.defaultToUpstream not set."
 msgstr ""
 
-#: builtin/init-db.c:421
-msgid " shared"
+#: builtin/merge.c:1293
+msgid "Can merge only exactly one commit into empty head"
 msgstr ""
 
-#: builtin/init-db.c:440
-msgid "cannot tell cwd"
+#: builtin/merge.c:1296
+msgid "Squash commit into empty head not supported yet"
 msgstr ""
 
-#: builtin/init-db.c:521 builtin/init-db.c:528
-#, c-format
-msgid "cannot mkdir %s"
+#: builtin/merge.c:1298
+msgid "Non-fast-forward commit does not make sense into an empty head"
 msgstr ""
 
-#: builtin/init-db.c:532
+#: builtin/merge.c:1413
 #, c-format
-msgid "cannot chdir to %s"
+msgid "Updating %s..%s\n"
 msgstr ""
 
-#: builtin/init-db.c:554
+#: builtin/merge.c:1451
 #, c-format
-msgid ""
-"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
-"dir=<directory>)"
+msgid "Trying really trivial in-index merge...\n"
 msgstr ""
 
-#: builtin/init-db.c:578
-msgid "Cannot access current working directory"
+#: builtin/merge.c:1458
+#, c-format
+msgid "Nope.\n"
 msgstr ""
 
-#: builtin/init-db.c:585
-#, c-format
-msgid "Cannot access work tree '%s'"
+#: builtin/merge.c:1490
+msgid "Not possible to fast-forward, aborting."
 msgstr ""
 
-#: builtin/log.c:187
+#: builtin/merge.c:1513 builtin/merge.c:1592
 #, c-format
-msgid "Final output: %d %s\n"
+msgid "Rewinding the tree to pristine...\n"
 msgstr ""
 
-#: builtin/log.c:395 builtin/log.c:483
+#: builtin/merge.c:1517
 #, c-format
-msgid "Could not read object %s"
+msgid "Trying merge strategy %s...\n"
 msgstr ""
 
-#: builtin/log.c:507
+#: builtin/merge.c:1583
 #, c-format
-msgid "Unknown type: %d"
+msgid "No merge strategy handled the merge.\n"
 msgstr ""
 
-#: builtin/log.c:596
-msgid "format.headers without value"
+#: builtin/merge.c:1585
+#, c-format
+msgid "Merge with strategy %s failed.\n"
 msgstr ""
 
-#: builtin/log.c:669
-msgid "name of output directory is too long"
+#: builtin/merge.c:1594
+#, c-format
+msgid "Using the %s to prepare resolving by hand.\n"
 msgstr ""
 
-#: builtin/log.c:680
+#: builtin/merge.c:1606
 #, c-format
-msgid "Cannot open patch file %s"
+msgid "Automatic merge went well; stopped before committing as requested\n"
 msgstr ""
 
-#: builtin/log.c:694
-msgid "Need exactly one range."
+#: builtin/mv.c:108
+#, c-format
+msgid "Checking rename of '%s' to '%s'\n"
 msgstr ""
 
-#: builtin/log.c:702
-msgid "Not a range."
+#: builtin/mv.c:112
+msgid "bad source"
 msgstr ""
 
-#: builtin/log.c:739
-msgid "Could not extract email from committer identity."
+#: builtin/mv.c:115
+msgid "can not move directory into itself"
 msgstr ""
 
-#: builtin/log.c:785
-msgid "Cover letter needs email format"
+#: builtin/mv.c:118
+msgid "cannot move directory over file"
 msgstr ""
 
-#: builtin/log.c:879
+#: builtin/mv.c:128
 #, c-format
-msgid "insane in-reply-to: %s"
-msgstr ""
-
-#: builtin/log.c:952
-msgid "Two output directories?"
+msgid "Huh? %.*s is in index?"
 msgstr ""
 
-#: builtin/log.c:1173
-#, c-format
-msgid "bogus committer info %s"
+#: builtin/mv.c:140
+msgid "source directory is empty"
 msgstr ""
 
-#: builtin/log.c:1218
-msgid "-n and -k are mutually exclusive."
+#: builtin/mv.c:171
+msgid "not under version control"
 msgstr ""
 
-#: builtin/log.c:1220
-msgid "--subject-prefix and -k are mutually exclusive."
+#: builtin/mv.c:173
+msgid "destination exists"
 msgstr ""
 
-#: builtin/log.c:1225 builtin/shortlog.c:284
+#: builtin/mv.c:181
 #, c-format
-msgid "unrecognized argument: %s"
-msgstr ""
-
-#: builtin/log.c:1228
-msgid "--name-only does not make sense"
-msgstr ""
-
-#: builtin/log.c:1230
-msgid "--name-status does not make sense"
+msgid "overwriting '%s'"
 msgstr ""
 
-#: builtin/log.c:1232
-msgid "--check does not make sense"
+#: builtin/mv.c:184
+msgid "Cannot overwrite"
 msgstr ""
 
-#: builtin/log.c:1255
-msgid "standard output, or directory, which one?"
+#: builtin/mv.c:187
+msgid "multiple sources for the same target"
 msgstr ""
 
-#: builtin/log.c:1257
+#: builtin/mv.c:202
 #, c-format
-msgid "Could not create directory '%s'"
+msgid "%s, source=%s, destination=%s"
 msgstr ""
 
-#: builtin/log.c:1410
-msgid "Failed to create output files"
+#: builtin/mv.c:212
+#, c-format
+msgid "Renaming %s to %s\n"
 msgstr ""
 
-#: builtin/log.c:1514
+#: builtin/mv.c:215 builtin/remote.c:731
 #, c-format
-msgid ""
-"Could not find a tracked remote branch, please specify <upstream> manually.\n"
+msgid "renaming '%s' failed"
 msgstr ""
 
-#: builtin/log.c:1530 builtin/log.c:1532 builtin/log.c:1544
+#: builtin/notes.c:139
 #, c-format
-msgid "Unknown commit %s"
+msgid "unable to start 'show' for object '%s'"
 msgstr ""
 
-#: builtin/merge.c:91
-msgid "switch `m' requires a value"
+#: builtin/notes.c:145
+msgid "can't fdopen 'show' output fd"
 msgstr ""
 
-#: builtin/merge.c:128
+#: builtin/notes.c:155
 #, c-format
-msgid "Could not find merge strategy '%s'.\n"
+msgid "failed to close pipe to 'show' for object '%s'"
 msgstr ""
 
-#: builtin/merge.c:129
+#: builtin/notes.c:158
 #, c-format
-msgid "Available strategies are:"
+msgid "failed to finish 'show' for object '%s'"
 msgstr ""
 
-#: builtin/merge.c:134
+#: builtin/notes.c:175 builtin/tag.c:347
 #, c-format
-msgid "Available custom strategies are:"
+msgid "could not create file '%s'"
 msgstr ""
 
-#: builtin/merge.c:241
-msgid "could not run stash."
+#: builtin/notes.c:189
+msgid "Please supply the note contents using either -m or -F option"
 msgstr ""
 
-#: builtin/merge.c:246
-msgid "stash failed"
+#: builtin/notes.c:210 builtin/notes.c:973
+#, c-format
+msgid "Removing note for object %s\n"
+msgstr ""
+
+#: builtin/notes.c:215
+msgid "unable to write note object"
 msgstr ""
 
-#: builtin/merge.c:251
+#: builtin/notes.c:217
 #, c-format
-msgid "not a valid object: %s"
+msgid "The note contents has been left in %s"
 msgstr ""
 
-#: builtin/merge.c:270 builtin/merge.c:287
-msgid "read-tree failed"
+#: builtin/notes.c:251 builtin/tag.c:542
+#, c-format
+msgid "cannot read '%s'"
 msgstr ""
 
-#: builtin/merge.c:317
-msgid " (nothing to squash)"
+#: builtin/notes.c:253 builtin/tag.c:545
+#, c-format
+msgid "could not open or read '%s'"
 msgstr ""
 
-#: builtin/merge.c:330
+#: builtin/notes.c:272 builtin/notes.c:445 builtin/notes.c:447
+#: builtin/notes.c:507 builtin/notes.c:561 builtin/notes.c:644
+#: builtin/notes.c:649 builtin/notes.c:724 builtin/notes.c:766
+#: builtin/notes.c:968 builtin/reset.c:293 builtin/tag.c:558
 #, c-format
-msgid "Squash commit -- not updating HEAD\n"
+msgid "Failed to resolve '%s' as a valid ref."
 msgstr ""
 
-#: builtin/merge.c:362
-msgid "Writing SQUASH_MSG"
+#: builtin/notes.c:275
+#, c-format
+msgid "Failed to read object '%s'."
 msgstr ""
 
-#: builtin/merge.c:364
-msgid "Finishing SQUASH_MSG"
+#: builtin/notes.c:299
+msgid "Cannot commit uninitialized/unreferenced notes tree"
 msgstr ""
 
-#: builtin/merge.c:386
+#: builtin/notes.c:340
 #, c-format
-msgid "No merge message -- not updating HEAD\n"
+msgid "Bad notes.rewriteMode value: '%s'"
 msgstr ""
 
-#: builtin/merge.c:437
+#: builtin/notes.c:350
 #, c-format
-msgid "'%s' does not point to a commit"
+msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
 msgstr ""
 
-#: builtin/merge.c:536
+#. TRANSLATORS: The first %s is the name of the
+#. environment variable, the second %s is its value
+#: builtin/notes.c:377
 #, c-format
-msgid "Bad branch.%s.mergeoptions string: %s"
+msgid "Bad %s value: '%s'"
 msgstr ""
 
-#: builtin/merge.c:629
-msgid "git write-tree failed to write a tree"
+#: builtin/notes.c:441
+#, c-format
+msgid "Malformed input line: '%s'."
 msgstr ""
 
-#: builtin/merge.c:679
-msgid "failed to read the cache"
+#: builtin/notes.c:456
+#, c-format
+msgid "Failed to copy notes from '%s' to '%s'"
 msgstr ""
 
-#: builtin/merge.c:696
-msgid "Unable to write index."
+#: builtin/notes.c:500 builtin/notes.c:554 builtin/notes.c:627
+#: builtin/notes.c:639 builtin/notes.c:712 builtin/notes.c:759
+#: builtin/notes.c:1033
+msgid "too many parameters"
 msgstr ""
 
-#: builtin/merge.c:709
-msgid "Not handling anything other than two heads merge."
+#: builtin/notes.c:513 builtin/notes.c:772
+#, c-format
+msgid "No note found for object %s."
 msgstr ""
 
-#: builtin/merge.c:723
+#: builtin/notes.c:580
 #, c-format
-msgid "Unknown option for merge-recursive: -X%s"
+msgid ""
+"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
+"existing notes"
 msgstr ""
 
-#: builtin/merge.c:737
+#: builtin/notes.c:585 builtin/notes.c:662
 #, c-format
-msgid "unable to write %s"
+msgid "Overwriting existing notes for object %s\n"
+msgstr ""
+
+#: builtin/notes.c:635
+msgid "too few parameters"
 msgstr ""
 
-#: builtin/merge.c:876
+#: builtin/notes.c:656
 #, c-format
-msgid "Could not read from '%s'"
+msgid ""
+"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
+"existing notes"
 msgstr ""
 
-#: builtin/merge.c:885
+#: builtin/notes.c:668
 #, c-format
-msgid "Not committing merge; use 'git commit' to complete the merge.\n"
+msgid "Missing notes on source object %s. Cannot copy."
 msgstr ""
 
-#: builtin/merge.c:891
+#: builtin/notes.c:717
+#, 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 '#' will be ignored, and an empty message aborts\n"
-"the commit.\n"
+"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/merge.c:915
-msgid "Empty commit message."
+#: builtin/notes.c:971
+#, c-format
+msgid "Object %s has no note\n"
 msgstr ""
 
-#: builtin/merge.c:927
+#: builtin/notes.c:1103 builtin/remote.c:1598
 #, c-format
-msgid "Wonderful.\n"
+msgid "Unknown subcommand: %s"
 msgstr ""
 
-#: builtin/merge.c:1000
+#: builtin/pack-objects.c:2337
 #, c-format
-msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
+msgid "unsupported index version %s"
 msgstr ""
 
-#: builtin/merge.c:1016
+#: builtin/pack-objects.c:2341
 #, c-format
-msgid "'%s' is not a commit"
+msgid "bad index version '%s'"
 msgstr ""
 
-#: builtin/merge.c:1057
-msgid "No current branch."
+#: builtin/pack-objects.c:2364
+#, c-format
+msgid "option %s does not accept negative form"
 msgstr ""
 
-#: builtin/merge.c:1059
-msgid "No remote for the current branch."
+#: builtin/pack-objects.c:2368
+#, c-format
+msgid "unable to parse value '%s' for option %s"
 msgstr ""
 
-#: builtin/merge.c:1061
-msgid "No default upstream defined for the current branch."
+#: builtin/push.c:45
+msgid "tag shorthand without <tag>"
 msgstr ""
 
-#: builtin/merge.c:1066
-#, c-format
-msgid "No remote tracking branch for %s from %s"
+#: builtin/push.c:64
+msgid "--delete only accepts plain target ref names"
 msgstr ""
 
-#: builtin/merge.c:1188
-msgid "There is no merge to abort (MERGE_HEAD missing)."
+#: builtin/push.c:99
+msgid ""
+"\n"
+"To choose either option permanently, see push.default in 'git help config'."
 msgstr ""
 
-#: builtin/merge.c:1204 git-pull.sh:31
+#: builtin/push.c:102
+#, c-format
 msgid ""
-"You have not concluded your merge (MERGE_HEAD exists).\n"
-"Please, commit your changes before you can merge."
+"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"
 msgstr ""
 
-#: builtin/merge.c:1207 git-pull.sh:34
-msgid "You have not concluded your merge (MERGE_HEAD exists)."
+#: builtin/push.c:121
+#, 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/merge.c:1211
+#: builtin/push.c:128
+#, c-format
 msgid ""
-"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
-"Please, commit your changes before you can merge."
+"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/merge.c:1214
-msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
+#: builtin/push.c:136
+#, c-format
+msgid "The current branch %s has multiple upstream branches, refusing to push."
 msgstr ""
 
-#: builtin/merge.c:1223
-msgid "You cannot combine --squash with --no-ff."
+#: builtin/push.c:139
+#, 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/merge.c:1228
-msgid "You cannot combine --no-ff with --ff-only."
+#: builtin/push.c:174
+msgid ""
+"You didn't specify any refspecs to push, and push.default is \"nothing\"."
 msgstr ""
 
-#: builtin/merge.c:1235
-msgid "No commit specified and merge.defaultToUpstream not set."
+#: builtin/push.c:181
+msgid ""
+"Updates were rejected because the tip of your current branch is behind\n"
+"its remote counterpart. Merge the remote changes (e.g. 'git pull')\n"
+"before pushing again.\n"
+"See the 'Note about fast-forwards' in 'git push --help' for details."
 msgstr ""
 
-#: builtin/merge.c:1266
-msgid "Can merge only exactly one commit into empty head"
+#: builtin/push.c:187
+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\n"
+"variable to 'current' or 'upstream' to push only the current branch."
 msgstr ""
 
-#: builtin/merge.c:1269
-msgid "Squash commit into empty head not supported yet"
+#: builtin/push.c:193
+msgid ""
+"Updates were rejected because a pushed branch tip is behind its remote\n"
+"counterpart. Check out this branch and merge 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/merge.c:1271
-msgid "Non-fast-forward commit does not make sense into an empty head"
+#: builtin/push.c:233
+#, c-format
+msgid "Pushing to %s\n"
 msgstr ""
 
-#: builtin/merge.c:1275 builtin/merge.c:1319
+#: builtin/push.c:237
 #, c-format
-msgid "%s - not something we can merge"
+msgid "failed to push some refs to '%s'"
 msgstr ""
 
-#: builtin/merge.c:1382
+#: builtin/push.c:269
 #, c-format
-msgid "Updating %s..%s\n"
+msgid "bad repository '%s'"
 msgstr ""
 
-#: builtin/merge.c:1420
-#, c-format
-msgid "Trying really trivial in-index merge...\n"
+#: builtin/push.c:270
+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/merge.c:1427
-#, c-format
-msgid "Nope.\n"
+#: builtin/push.c:285
+msgid "--all and --tags are incompatible"
 msgstr ""
 
-#: builtin/merge.c:1459
-msgid "Not possible to fast-forward, aborting."
+#: builtin/push.c:286
+msgid "--all can't be combined with refspecs"
 msgstr ""
 
-#: builtin/merge.c:1482 builtin/merge.c:1559
-#, c-format
-msgid "Rewinding the tree to pristine...\n"
+#: builtin/push.c:291
+msgid "--mirror and --tags are incompatible"
 msgstr ""
 
-#: builtin/merge.c:1486
-#, c-format
-msgid "Trying merge strategy %s...\n"
+#: builtin/push.c:292
+msgid "--mirror can't be combined with refspecs"
 msgstr ""
 
-#: builtin/merge.c:1550
-#, c-format
-msgid "No merge strategy handled the merge.\n"
+#: builtin/push.c:297
+msgid "--all and --mirror are incompatible"
 msgstr ""
 
-#: builtin/merge.c:1552
-#, c-format
-msgid "Merge with strategy %s failed.\n"
+#: builtin/push.c:385
+msgid "--delete is incompatible with --all, --mirror and --tags"
 msgstr ""
 
-#: builtin/merge.c:1561
-#, c-format
-msgid "Using the %s to prepare resolving by hand.\n"
+#: builtin/push.c:387
+msgid "--delete doesn't make sense without any refs"
 msgstr ""
 
-#: builtin/merge.c:1572
+#: builtin/remote.c:98
 #, c-format
-msgid "Automatic merge went well; stopped before committing as requested\n"
+msgid "Updating %s"
 msgstr ""
 
-#: builtin/mv.c:108
-#, c-format
-msgid "Checking rename of '%s' to '%s'\n"
+#: builtin/remote.c:130
+msgid ""
+"--mirror is dangerous and deprecated; please\n"
+"\t use --mirror=fetch or --mirror=push instead"
 msgstr ""
 
-#: builtin/mv.c:112
-msgid "bad source"
+#: builtin/remote.c:147
+#, c-format
+msgid "unknown mirror argument: %s"
 msgstr ""
 
-#: builtin/mv.c:115
-msgid "can not move directory into itself"
+#: builtin/remote.c:185
+msgid "specifying a master branch makes no sense with --mirror"
 msgstr ""
 
-#: builtin/mv.c:118
-msgid "cannot move directory over file"
+#: builtin/remote.c:187
+msgid "specifying branches to track makes sense only with fetch mirrors"
 msgstr ""
 
-#: builtin/mv.c:128
+#: builtin/remote.c:195 builtin/remote.c:646
 #, c-format
-msgid "Huh? %.*s is in index?"
+msgid "remote %s already exists."
 msgstr ""
 
-#: builtin/mv.c:140
-msgid "source directory is empty"
+#: builtin/remote.c:199 builtin/remote.c:650
+#, c-format
+msgid "'%s' is not a valid remote name"
 msgstr ""
 
-#: builtin/mv.c:171
-msgid "not under version control"
+#: builtin/remote.c:243
+#, c-format
+msgid "Could not setup master '%s'"
 msgstr ""
 
-#: builtin/mv.c:173
-msgid "destination exists"
+#: builtin/remote.c:299
+#, c-format
+msgid "more than one %s"
 msgstr ""
 
-#: builtin/mv.c:181
+#: builtin/remote.c:339
 #, c-format
-msgid "overwriting '%s'"
+msgid "Could not get fetch map for refspec %s"
 msgstr ""
 
-#: builtin/mv.c:184
-msgid "Cannot overwrite"
+#: builtin/remote.c:440 builtin/remote.c:448
+msgid "(matching)"
 msgstr ""
 
-#: builtin/mv.c:187
-msgid "multiple sources for the same target"
+#: builtin/remote.c:452
+msgid "(delete)"
 msgstr ""
 
-#: builtin/mv.c:202
+#: builtin/remote.c:595 builtin/remote.c:601 builtin/remote.c:607
 #, c-format
-msgid "%s, source=%s, destination=%s"
+msgid "Could not append '%s' to '%s'"
 msgstr ""
 
-#: builtin/mv.c:212
+#: builtin/remote.c:639 builtin/remote.c:792 builtin/remote.c:890
 #, c-format
-msgid "Renaming %s to %s\n"
+msgid "No such remote: %s"
 msgstr ""
 
-#: builtin/mv.c:215
+#: builtin/remote.c:656
 #, c-format
-msgid "renaming '%s' failed"
+msgid "Could not rename config section '%s' to '%s'"
 msgstr ""
 
-#: builtin/notes.c:139
+#: builtin/remote.c:662 builtin/remote.c:799
 #, c-format
-msgid "unable to start 'show' for object '%s'"
+msgid "Could not remove config section '%s'"
 msgstr ""
 
-#: builtin/notes.c:145
-msgid "can't fdopen 'show' output fd"
-msgstr ""
-
-#: builtin/notes.c:155
+#: builtin/remote.c:677
 #, c-format
-msgid "failed to close pipe to 'show' for object '%s'"
+msgid ""
+"Not updating non-default fetch refspec\n"
+"\t%s\n"
+"\tPlease update the configuration manually if necessary."
 msgstr ""
 
-#: builtin/notes.c:158
+#: builtin/remote.c:683
 #, c-format
-msgid "failed to finish 'show' for object '%s'"
+msgid "Could not append '%s'"
 msgstr ""
 
-#: builtin/notes.c:175 builtin/tag.c:343
+#: builtin/remote.c:694
 #, c-format
-msgid "could not create file '%s'"
-msgstr ""
-
-#: builtin/notes.c:189
-msgid "Please supply the note contents using either -m or -F option"
+msgid "Could not set '%s'"
 msgstr ""
 
-#: builtin/notes.c:210 builtin/notes.c:973
+#: builtin/remote.c:716
 #, c-format
-msgid "Removing note for object %s\n"
-msgstr ""
-
-#: builtin/notes.c:215
-msgid "unable to write note object"
+msgid "deleting '%s' failed"
 msgstr ""
 
-#: builtin/notes.c:217
+#: builtin/remote.c:750
 #, c-format
-msgid "The note contents has been left in %s"
+msgid "creating '%s' failed"
 msgstr ""
 
-#: builtin/notes.c:251 builtin/tag.c:521
+#: builtin/remote.c:764
 #, c-format
-msgid "cannot read '%s'"
+msgid "Could not remove branch %s"
 msgstr ""
 
-#: builtin/notes.c:253 builtin/tag.c:524
+#: 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 "could not open or read '%s'"
+msgid " new (next fetch will store in remotes/%s)"
 msgstr ""
 
-#: builtin/notes.c:272 builtin/notes.c:445 builtin/notes.c:447
-#: builtin/notes.c:507 builtin/notes.c:561 builtin/notes.c:644
-#: builtin/notes.c:649 builtin/notes.c:724 builtin/notes.c:766
-#: builtin/notes.c:968 builtin/reset.c:293 builtin/tag.c:537
-#, c-format
-msgid "Failed to resolve '%s' as a valid ref."
+#: builtin/remote.c:946
+msgid " tracked"
 msgstr ""
 
-#: builtin/notes.c:275
-#, c-format
-msgid "Failed to read object '%s'."
+#: builtin/remote.c:948
+msgid " stale (use 'git remote prune' to remove)"
 msgstr ""
 
-#: builtin/notes.c:299
-msgid "Cannot commit uninitialized/unreferenced notes tree"
+#: builtin/remote.c:950
+msgid " ???"
 msgstr ""
 
-#: builtin/notes.c:340
+#: builtin/remote.c:991
 #, c-format
-msgid "Bad notes.rewriteMode value: '%s'"
+msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
 msgstr ""
 
-#: builtin/notes.c:350
+#: builtin/remote.c:998
 #, c-format
-msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
+msgid "rebases onto remote %s"
 msgstr ""
 
-#. TRANSLATORS: The first %s is the name of the
-#. environment variable, the second %s is its value
-#: builtin/notes.c:377
+#: builtin/remote.c:1001
 #, c-format
-msgid "Bad %s value: '%s'"
+msgid " merges with remote %s"
 msgstr ""
 
-#: builtin/notes.c:441
-#, c-format
-msgid "Malformed input line: '%s'."
+#: builtin/remote.c:1002
+msgid "    and with remote"
 msgstr ""
 
-#: builtin/notes.c:456
+#: builtin/remote.c:1004
 #, c-format
-msgid "Failed to copy notes from '%s' to '%s'"
+msgid "merges with remote %s"
 msgstr ""
 
-#: builtin/notes.c:500 builtin/notes.c:554 builtin/notes.c:627
-#: builtin/notes.c:639 builtin/notes.c:712 builtin/notes.c:759
-#: builtin/notes.c:1033
-msgid "too many parameters"
+#: builtin/remote.c:1005
+msgid "   and with remote"
 msgstr ""
 
-#: builtin/notes.c:513 builtin/notes.c:772
-#, c-format
-msgid "No note found for object %s."
+#: builtin/remote.c:1051
+msgid "create"
 msgstr ""
 
-#: builtin/notes.c:580
-#, c-format
-msgid ""
-"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
-"existing notes"
+#: builtin/remote.c:1054
+msgid "delete"
 msgstr ""
 
-#: builtin/notes.c:585 builtin/notes.c:662
-#, c-format
-msgid "Overwriting existing notes for object %s\n"
+#: builtin/remote.c:1058
+msgid "up to date"
 msgstr ""
 
-#: builtin/notes.c:635
-msgid "too few parameters"
+#: builtin/remote.c:1061
+msgid "fast-forwardable"
 msgstr ""
 
-#: builtin/notes.c:656
+#: builtin/remote.c:1064
+msgid "local out of date"
+msgstr ""
+
+#: builtin/remote.c:1071
 #, c-format
-msgid ""
-"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
-"existing notes"
+msgid "    %-*s forces to %-*s (%s)"
 msgstr ""
 
-#: builtin/notes.c:668
+#: builtin/remote.c:1074
 #, c-format
-msgid "Missing notes on source object %s. Cannot copy."
+msgid "    %-*s pushes to %-*s (%s)"
 msgstr ""
 
-#: builtin/notes.c:717
+#: builtin/remote.c:1078
 #, 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"
+msgid "    %-*s forces to %s"
 msgstr ""
 
-#: builtin/notes.c:971
+#: builtin/remote.c:1081
 #, c-format
-msgid "Object %s has no note\n"
+msgid "    %-*s pushes to %s"
 msgstr ""
 
-#: builtin/notes.c:1103
+#: builtin/remote.c:1118
 #, c-format
-msgid "Unknown subcommand: %s"
+msgid "* remote %s"
 msgstr ""
 
-#: builtin/pack-objects.c:2310
+#: builtin/remote.c:1119
 #, c-format
-msgid "unsupported index version %s"
+msgid "  Fetch URL: %s"
+msgstr ""
+
+#: builtin/remote.c:1120 builtin/remote.c:1285
+msgid "(no URL)"
 msgstr ""
 
-#: builtin/pack-objects.c:2314
+#: builtin/remote.c:1129 builtin/remote.c:1131
 #, c-format
-msgid "bad index version '%s'"
+msgid "  Push  URL: %s"
 msgstr ""
 
-#: builtin/pack-objects.c:2322
+#: builtin/remote.c:1133 builtin/remote.c:1135 builtin/remote.c:1137
 #, c-format
-msgid "option %s does not accept negative form"
+msgid "  HEAD branch: %s"
 msgstr ""
 
-#: builtin/pack-objects.c:2326
+#: builtin/remote.c:1139
 #, c-format
-msgid "unable to parse value '%s' for option %s"
+msgid ""
+"  HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
 msgstr ""
 
-#: builtin/push.c:44
-msgid "tag shorthand without <tag>"
+#: 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)"
 msgstr ""
 
-#: builtin/push.c:63
-msgid "--delete only accepts plain target ref names"
+#: builtin/remote.c:1163
+msgid "  Local branch configured for 'git pull':"
+msgid_plural "  Local branches configured for 'git pull':"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/remote.c:1171
+msgid "  Local refs will be mirrored by 'git push'"
 msgstr ""
 
-#: builtin/push.c:83
+#: builtin/remote.c:1178
 #, 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"
+msgid "  Local ref configured for 'git push'%s:"
+msgid_plural "  Local refs configured for 'git push'%s:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/remote.c:1216
+msgid "Cannot determine remote HEAD"
 msgstr ""
 
-#: builtin/push.c:90
-#, 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/remote.c:1218
+msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
 msgstr ""
 
-#: builtin/push.c:98
+#: builtin/remote.c:1228
 #, c-format
-msgid "The current branch %s has multiple upstream branches, refusing to push."
+msgid "Could not delete %s"
 msgstr ""
 
-#: builtin/push.c:101
+#: builtin/remote.c:1236
 #, 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."
+msgid "Not a valid ref: %s"
 msgstr ""
 
-#: builtin/push.c:127
-msgid ""
-"You didn't specify any refspecs to push, and push.default is \"nothing\"."
+#: builtin/remote.c:1238
+#, c-format
+msgid "Could not setup %s"
 msgstr ""
 
-#: builtin/push.c:147
+#: builtin/remote.c:1274
 #, c-format
-msgid "Pushing to %s\n"
+msgid " %s will become dangling!"
 msgstr ""
 
-#: builtin/push.c:151
+#: builtin/remote.c:1275
 #, c-format
-msgid "failed to push some refs to '%s'"
+msgid " %s has become dangling!"
 msgstr ""
 
-#: builtin/push.c:159
+#: builtin/remote.c:1281
 #, c-format
-msgid ""
-"To prevent you from losing history, non-fast-forward updates were rejected\n"
-"Merge the remote changes (e.g. 'git pull') before pushing again.  See the\n"
-"'Note about fast-forwards' section of 'git push --help' for details.\n"
+msgid "Pruning %s"
 msgstr ""
 
-#: builtin/push.c:176
+#: builtin/remote.c:1282
 #, c-format
-msgid "bad repository '%s'"
+msgid "URL: %s"
 msgstr ""
 
-#: builtin/push.c:177
-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"
+#: builtin/remote.c:1295
+#, c-format
+msgid " * [would prune] %s"
 msgstr ""
 
-#: builtin/push.c:192
-msgid "--all and --tags are incompatible"
+#: builtin/remote.c:1298
+#, c-format
+msgid " * [pruned] %s"
 msgstr ""
 
-#: builtin/push.c:193
-msgid "--all can't be combined with refspecs"
+#: builtin/remote.c:1387 builtin/remote.c:1461
+#, c-format
+msgid "No such remote '%s'"
 msgstr ""
 
-#: builtin/push.c:198
-msgid "--mirror and --tags are incompatible"
+#: builtin/remote.c:1414
+msgid "no remote specified"
 msgstr ""
 
-#: builtin/push.c:199
-msgid "--mirror can't be combined with refspecs"
+#: builtin/remote.c:1447
+msgid "--add --delete doesn't make sense"
 msgstr ""
 
-#: builtin/push.c:204
-msgid "--all and --mirror are incompatible"
+#: builtin/remote.c:1487
+#, c-format
+msgid "Invalid old URL pattern: %s"
 msgstr ""
 
-#: builtin/push.c:284
-msgid "--delete is incompatible with --all, --mirror and --tags"
+#: builtin/remote.c:1495
+#, c-format
+msgid "No such URL found: %s"
 msgstr ""
 
-#: builtin/push.c:286
-msgid "--delete doesn't make sense without any refs"
+#: builtin/remote.c:1497
+msgid "Will not delete all non-push URLs"
 msgstr ""
 
 #: builtin/reset.c:33
@@ -2810,6 +4215,10 @@ msgstr ""
 msgid "hard"
 msgstr ""
 
+#: builtin/reset.c:33
+msgid "merge"
+msgstr ""
+
 #: builtin/reset.c:33
 msgid "keep"
 msgstr ""
@@ -2877,20 +4286,20 @@ msgstr ""
 msgid "Could not reset index file to revision '%s'."
 msgstr ""
 
-#: builtin/revert.c:70 builtin/revert.c:91
+#: builtin/revert.c:70 builtin/revert.c:92
 #, c-format
 msgid "%s: %s cannot be used with %s"
 msgstr ""
 
-#: builtin/revert.c:126
+#: builtin/revert.c:131
 msgid "program error"
 msgstr ""
 
-#: builtin/revert.c:209
+#: builtin/revert.c:221
 msgid "revert failed"
 msgstr ""
 
-#: builtin/revert.c:224
+#: builtin/revert.c:236
 msgid "cherry-pick failed"
 msgstr ""
 
@@ -2930,32 +4339,32 @@ msgstr ""
 msgid "Missing author: %s"
 msgstr ""
 
-#: builtin/tag.c:58
+#: builtin/tag.c:60
 #, c-format
 msgid "malformed object at '%s'"
 msgstr ""
 
-#: builtin/tag.c:205
+#: builtin/tag.c:207
 #, c-format
 msgid "tag name too long: %.*s..."
 msgstr ""
 
-#: builtin/tag.c:210
+#: builtin/tag.c:212
 #, c-format
 msgid "tag '%s' not found."
 msgstr ""
 
-#: builtin/tag.c:225
+#: builtin/tag.c:227
 #, c-format
 msgid "Deleted tag '%s' (was %s)\n"
 msgstr ""
 
-#: builtin/tag.c:237
+#: builtin/tag.c:239
 #, c-format
 msgid "could not verify the tag '%s'"
 msgstr ""
 
-#: builtin/tag.c:247
+#: builtin/tag.c:249
 msgid ""
 "\n"
 "#\n"
@@ -2964,7 +4373,7 @@ msgid ""
 "#\n"
 msgstr ""
 
-#: builtin/tag.c:254
+#: builtin/tag.c:256
 msgid ""
 "\n"
 "#\n"
@@ -2974,162 +4383,342 @@ msgid ""
 "#\n"
 msgstr ""
 
-#: builtin/tag.c:294
+#: builtin/tag.c:298
 msgid "unable to sign the tag"
 msgstr ""
 
-#: builtin/tag.c:296
+#: builtin/tag.c:300
 msgid "unable to write tag file"
 msgstr ""
 
-#: builtin/tag.c:321
+#: builtin/tag.c:325
 msgid "bad object type."
 msgstr ""
 
-#: builtin/tag.c:334
+#: builtin/tag.c:338
 msgid "tag header too big."
 msgstr ""
 
-#: builtin/tag.c:366
+#: builtin/tag.c:370
 msgid "no tag message?"
 msgstr ""
 
-#: builtin/tag.c:372
+#: builtin/tag.c:376
 #, c-format
 msgid "The tag message has been left in %s\n"
 msgstr ""
 
-#: builtin/tag.c:421
+#: builtin/tag.c:425
 msgid "switch 'points-at' requires an object"
 msgstr ""
 
-#: builtin/tag.c:423
+#: builtin/tag.c:427
 #, c-format
 msgid "malformed object name '%s'"
 msgstr ""
 
-#: builtin/tag.c:502
+#: builtin/tag.c:506
+msgid "--column and -n are incompatible"
+msgstr ""
+
+#: builtin/tag.c:523
 msgid "-n option is only allowed with -l."
 msgstr ""
 
-#: builtin/tag.c:504
+#: builtin/tag.c:525
 msgid "--contains option is only allowed with -l."
 msgstr ""
 
-#: builtin/tag.c:506
+#: builtin/tag.c:527
 msgid "--points-at option is only allowed with -l."
 msgstr ""
 
-#: builtin/tag.c:514
+#: builtin/tag.c:535
 msgid "only one -F or -m option is allowed."
 msgstr ""
 
-#: builtin/tag.c:534
+#: builtin/tag.c:555
 msgid "too many params"
 msgstr ""
 
-#: builtin/tag.c:540
+#: builtin/tag.c:561
 #, c-format
 msgid "'%s' is not a valid tag name."
 msgstr ""
 
-#: builtin/tag.c:545
+#: builtin/tag.c:566
 #, c-format
 msgid "tag '%s' already exists"
 msgstr ""
 
-#: builtin/tag.c:563
+#: builtin/tag.c:584
 #, c-format
 msgid "%s: cannot lock the ref"
 msgstr ""
 
-#: builtin/tag.c:565
+#: builtin/tag.c:586
 #, c-format
 msgid "%s: cannot update the ref"
 msgstr ""
 
-#: builtin/tag.c:567
+#: builtin/tag.c:588
 #, c-format
 msgid "Updated tag '%s' (was %s)\n"
 msgstr ""
 
-#: git-am.sh:49
+#: git.c:16
+msgid "See 'git help <command>' for more information on a specific command."
+msgstr ""
+
+#: parse-options.h:133 parse-options.h:235
+msgid "n"
+msgstr ""
+
+#: parse-options.h:141
+msgid "time"
+msgstr ""
+
+#: parse-options.h:149
+msgid "file"
+msgstr ""
+
+#: parse-options.h:151
+msgid "when"
+msgstr ""
+
+#: parse-options.h:156
+msgid "no-op (backward compatibility)"
+msgstr ""
+
+#: parse-options.h:228
+msgid "be more verbose"
+msgstr ""
+
+#: parse-options.h:230
+msgid "be more quiet"
+msgstr ""
+
+#: parse-options.h:236
+msgid "use <n> digits to display SHA-1s"
+msgstr ""
+
+#: common-cmds.h:8
+msgid "Add file contents to the index"
+msgstr ""
+
+#: common-cmds.h:9
+msgid "Find by binary search the change that introduced a bug"
+msgstr ""
+
+#: common-cmds.h:10
+msgid "List, create, or delete branches"
+msgstr ""
+
+#: common-cmds.h:11
+msgid "Checkout a branch or paths to the working tree"
+msgstr ""
+
+#: common-cmds.h:12
+msgid "Clone a repository into a new directory"
+msgstr ""
+
+#: common-cmds.h:13
+msgid "Record changes to the repository"
+msgstr ""
+
+#: common-cmds.h:14
+msgid "Show changes between commits, commit and working tree, etc"
+msgstr ""
+
+#: common-cmds.h:15
+msgid "Download objects and refs from another repository"
+msgstr ""
+
+#: common-cmds.h:16
+msgid "Print lines matching a pattern"
+msgstr ""
+
+#: common-cmds.h:17
+msgid "Create an empty git repository or reinitialize an existing one"
+msgstr ""
+
+#: common-cmds.h:18
+msgid "Show commit logs"
+msgstr ""
+
+#: common-cmds.h:19
+msgid "Join two or more development histories together"
+msgstr ""
+
+#: common-cmds.h:20
+msgid "Move or rename a file, a directory, or a symlink"
+msgstr ""
+
+#: common-cmds.h:21
+msgid "Fetch from and merge with another repository or a local branch"
+msgstr ""
+
+#: common-cmds.h:22
+msgid "Update remote refs along with associated objects"
+msgstr ""
+
+#: common-cmds.h:23
+msgid "Forward-port local commits to the updated upstream head"
+msgstr ""
+
+#: common-cmds.h:24
+msgid "Reset current HEAD to the specified state"
+msgstr ""
+
+#: common-cmds.h:25
+msgid "Remove files from the working tree and from the index"
+msgstr ""
+
+#: common-cmds.h:26
+msgid "Show various types of objects"
+msgstr ""
+
+#: common-cmds.h:27
+msgid "Show the working tree status"
+msgstr ""
+
+#: common-cmds.h:28
+msgid "Create, list, delete or verify a tag object signed with GPG"
+msgstr ""
+
+#: git-am.sh:50
 msgid "You need to set your committer info first"
 msgstr ""
 
-#: git-am.sh:136
+#: git-am.sh:95
+msgid ""
+"You seem to have moved HEAD since the last 'am' failure.\n"
+"Not rewinding to ORIG_HEAD"
+msgstr ""
+
+#: git-am.sh:105
+#, sh-format
+msgid ""
+"When you have resolved this problem run \"$cmdline --resolved\".\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\"."
+msgstr ""
+
+#: git-am.sh:121
+msgid "Cannot fall back to three-way merge."
+msgstr ""
+
+#: git-am.sh:137
 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
 msgstr ""
 
-#: git-am.sh:147
+#: git-am.sh:154
 msgid ""
 "Did you hand edit your patch?\n"
 "It does not apply to blobs recorded in its index."
 msgstr ""
 
-#: git-am.sh:156
+#: git-am.sh:163
 msgid "Falling back to patching base and 3-way merge..."
 msgstr ""
 
-#: git-am.sh:268
+#: git-am.sh:275
 msgid "Only one StGIT patch series can be applied at once"
 msgstr ""
 
-#: git-am.sh:355
+#: git-am.sh:362
 #, sh-format
 msgid "Patch format $patch_format is not supported."
 msgstr ""
 
-#: git-am.sh:357
+#: git-am.sh:364
 msgid "Patch format detection failed."
 msgstr ""
 
-#: git-am.sh:411
+#: git-am.sh:418
 msgid "-d option is no longer supported.  Do not use."
 msgstr ""
 
-#: git-am.sh:474
+#: git-am.sh:481
 #, sh-format
 msgid "previous rebase directory $dotest still exists but mbox given."
 msgstr ""
 
-#: git-am.sh:479
+#: git-am.sh:486
 msgid "Please make up your mind. --skip or --abort?"
 msgstr ""
 
-#: git-am.sh:506
+#: git-am.sh:513
 msgid "Resolve operation not in progress, we are not resuming."
 msgstr ""
 
-#: git-am.sh:572
+#: git-am.sh:579
 #, sh-format
 msgid "Dirty index: cannot apply patches (dirty: $files)"
 msgstr ""
 
-#: git-am.sh:748
+#: git-am.sh:671
+#, sh-format
+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\"."
+msgstr ""
+
+#: git-am.sh:708
+msgid "Patch does not have a valid e-mail address."
+msgstr ""
+
+#: git-am.sh:755
 msgid "cannot be interactive without stdin connected to a terminal."
 msgstr ""
 
+#: git-am.sh:759
+msgid "Commit Body is:"
+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:759
+#: git-am.sh:766
 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
 msgstr ""
 
-#: git-am.sh:795
+#: git-am.sh:802
 #, sh-format
 msgid "Applying: $FIRSTLINE"
 msgstr ""
 
-#: git-am.sh:840
+#: git-am.sh:823
+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 ""
+
+#: git-am.sh:831
+msgid ""
+"You still have unmerged paths in your index\n"
+"did you forget to use 'git add'?"
+msgstr ""
+
+#: git-am.sh:847
 msgid "No changes -- Patch already applied."
 msgstr ""
 
-#: git-am.sh:866
+#: git-am.sh:857
+#, sh-format
+msgid "Patch failed at $msgnum $FIRSTLINE"
+msgstr ""
+
+#: git-am.sh:873
 msgid "applying to an empty history"
 msgstr ""
 
+#: git-bisect.sh:48
+msgid "You need to start by \"git bisect start\""
+msgstr ""
+
 #. TRANSLATORS: Make sure to include [Y] and [n] in your
 #. translation. The program will only accept English input
 #. at this point.
@@ -3188,6 +4777,12 @@ msgstr ""
 msgid "'git bisect bad' can take only one argument."
 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."
+msgstr ""
+
 #. TRANSLATORS: Make sure to include [Y] and [n] in your
 #. translation. The program will only accept English input
 #. at this point.
@@ -3195,6 +4790,23 @@ msgstr ""
 msgid "Are you sure [Y/n]? "
 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.)"
+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.)"
+msgstr ""
+
+#: git-bisect.sh:347 git-bisect.sh:474
+msgid "We are not bisecting."
+msgstr ""
+
 #: git-bisect.sh:354
 #, sh-format
 msgid "'$invalid' is not a valid commit"
@@ -3220,8 +4832,31 @@ msgstr ""
 msgid "?? what are you talking about?"
 msgstr ""
 
-#: git-bisect.sh:474
-msgid "We are not bisecting."
+#: git-bisect.sh:420
+#, sh-format
+msgid "running $command"
+msgstr ""
+
+#: git-bisect.sh:427
+#, sh-format
+msgid ""
+"bisect run failed:\n"
+"exit code $res from '$command' is < 0 or >= 128"
+msgstr ""
+
+#: git-bisect.sh:453
+msgid "bisect run cannot continue any more"
+msgstr ""
+
+#: git-bisect.sh:459
+#, sh-format
+msgid ""
+"bisect run failed:\n"
+"'bisect_state $state' exited with error code $res"
+msgstr ""
+
+#: git-bisect.sh:466
+msgid "bisect run success"
 msgstr ""
 
 #: git-pull.sh:21
@@ -3239,6 +4874,18 @@ msgstr ""
 msgid "updating an unborn branch with changes added to the index"
 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:228
+#, sh-format
+msgid ""
+"Warning: fetch updated the current branch head.\n"
+"Warning: fast-forwarding your working tree from\n"
+"Warning: commit $orig_head."
+msgstr ""
+
 #: git-pull.sh:253
 msgid "Cannot merge multiple branches into empty head"
 msgstr ""
@@ -3275,6 +4922,23 @@ msgstr ""
 msgid "Cannot record working tree state"
 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:202
+#, sh-format
+msgid ""
+"error: unknown option for 'stash save': $option\n"
+"       To provide a message, use git stash save -- '$option'"
+msgstr ""
+
 #: git-stash.sh:223
 msgid "No local changes to save"
 msgstr ""
@@ -3335,6 +4999,10 @@ msgstr ""
 msgid "Cannot unstage modified files"
 msgstr ""
 
+#: git-stash.sh:474
+msgid "Index was not unstashed."
+msgstr ""
+
 #: git-stash.sh:491
 #, sh-format
 msgid "Dropped ${REV} ($s)"
@@ -3358,161 +5026,188 @@ msgstr ""
 msgid "cannot strip one component off url '$remoteurl'"
 msgstr ""
 
-#: git-submodule.sh:108
+#: git-submodule.sh:109
 #, sh-format
-msgid "No submodule mapping found in .gitmodules for path '$path'"
+msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
 msgstr ""
 
-#: git-submodule.sh:149
+#: git-submodule.sh:150
 #, sh-format
-msgid "Clone of '$url' into submodule path '$path' failed"
+msgid "Clone of '$url' into submodule path '$sm_path' failed"
 msgstr ""
 
-#: git-submodule.sh:159
+#: git-submodule.sh:160
 #, sh-format
 msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
 msgstr ""
 
-#: git-submodule.sh:247
+#: git-submodule.sh:249
 #, sh-format
 msgid "repo URL: '$repo' must be absolute or begin with ./|../"
 msgstr ""
 
-#: git-submodule.sh:264
+#: git-submodule.sh:266
+#, sh-format
+msgid "'$sm_path' already exists in the index"
+msgstr ""
+
+#: git-submodule.sh:270
 #, sh-format
-msgid "'$path' already exists in the index"
+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 ""
 
 #: git-submodule.sh:281
 #, sh-format
-msgid "'$path' already exists and is not a valid git repo"
+msgid "Adding existing repo at '$sm_path' to the index"
 msgstr ""
 
-#: git-submodule.sh:295
+#: git-submodule.sh:283
 #, sh-format
-msgid "Unable to checkout submodule '$path'"
+msgid "'$sm_path' already exists and is not a valid git repo"
 msgstr ""
 
-#: git-submodule.sh:300
+#: git-submodule.sh:297
 #, sh-format
-msgid "Failed to add submodule '$path'"
+msgid "Unable to checkout submodule '$sm_path'"
 msgstr ""
 
-#: git-submodule.sh:305
+#: git-submodule.sh:302
 #, sh-format
-msgid "Failed to register submodule '$path'"
+msgid "Failed to add submodule '$sm_path'"
 msgstr ""
 
-#: git-submodule.sh:347
+#: git-submodule.sh:307
 #, sh-format
-msgid "Entering '$prefix$path'"
+msgid "Failed to register submodule '$sm_path'"
 msgstr ""
 
-#: git-submodule.sh:359
+#: git-submodule.sh:349
 #, sh-format
-msgid "Stopping at '$path'; script returned non-zero status."
+msgid "Entering '$prefix$sm_path'"
 msgstr ""
 
-#: git-submodule.sh:401
+#: git-submodule.sh:363
 #, sh-format
-msgid "No url found for submodule path '$path' in .gitmodules"
+msgid "Stopping at '$sm_path'; script returned non-zero status."
 msgstr ""
 
-#: git-submodule.sh:410
+#: git-submodule.sh:406
 #, sh-format
-msgid "Failed to register url for submodule path '$path'"
+msgid "No url found for submodule path '$sm_path' in .gitmodules"
 msgstr ""
 
-#: git-submodule.sh:418
+#: git-submodule.sh:415
 #, sh-format
-msgid "Failed to register update mode for submodule path '$path'"
+msgid "Failed to register url for submodule path '$sm_path'"
 msgstr ""
 
-#: git-submodule.sh:420
+#: git-submodule.sh:417
 #, sh-format
-msgid "Submodule '$name' ($url) registered for path '$path'"
+msgid "Submodule '$name' ($url) registered for path '$sm_path'"
 msgstr ""
 
-#: git-submodule.sh:519
+#: git-submodule.sh:425
 #, sh-format
-msgid ""
-"Submodule path '$path' not initialized\n"
-"Maybe you want to use 'update --init'?"
+msgid "Failed to register update mode for submodule path '$sm_path'"
 msgstr ""
 
-#: git-submodule.sh:532
+#: git-submodule.sh:524
 #, sh-format
-msgid "Unable to find current revision in submodule path '$path'"
+msgid ""
+"Submodule path '$sm_path' not initialized\n"
+"Maybe you want to use 'update --init'?"
 msgstr ""
 
-#: git-submodule.sh:551
+#: git-submodule.sh:537
 #, sh-format
-msgid "Unable to fetch in submodule path '$path'"
+msgid "Unable to find current revision in submodule path '$sm_path'"
 msgstr ""
 
-#: git-submodule.sh:565
+#: git-submodule.sh:556
 #, sh-format
-msgid "Unable to rebase '$sha1' in submodule path '$path'"
+msgid "Unable to fetch in submodule path '$sm_path'"
 msgstr ""
 
-#: git-submodule.sh:566
+#: git-submodule.sh:570
 #, sh-format
-msgid "Submodule path '$path': rebased into '$sha1'"
+msgid "Unable to rebase '$sha1' in submodule path '$sm_path'"
 msgstr ""
 
 #: git-submodule.sh:571
 #, sh-format
-msgid "Unable to merge '$sha1' in submodule path '$path'"
+msgid "Submodule path '$sm_path': rebased into '$sha1'"
 msgstr ""
 
-#: git-submodule.sh:572
+#: git-submodule.sh:576
 #, sh-format
-msgid "Submodule path '$path': merged in '$sha1'"
+msgid "Unable to merge '$sha1' in submodule path '$sm_path'"
 msgstr ""
 
 #: git-submodule.sh:577
 #, sh-format
-msgid "Unable to checkout '$sha1' in submodule path '$path'"
+msgid "Submodule path '$sm_path': merged in '$sha1'"
+msgstr ""
+
+#: git-submodule.sh:582
+#, sh-format
+msgid "Unable to checkout '$sha1' in submodule path '$sm_path'"
 msgstr ""
 
-#: git-submodule.sh:578
+#: git-submodule.sh:583
 #, sh-format
-msgid "Submodule path '$path': checked out '$sha1'"
+msgid "Submodule path '$sm_path': checked out '$sha1'"
 msgstr ""
 
-#: git-submodule.sh:600 git-submodule.sh:923
+#: git-submodule.sh:605 git-submodule.sh:928
 #, sh-format
-msgid "Failed to recurse into submodule path '$path'"
+msgid "Failed to recurse into submodule path '$sm_path'"
+msgstr ""
+
+#: git-submodule.sh:713
+msgid "--cached cannot be used with --files"
 msgstr ""
 
-#: git-submodule.sh:708
-msgid "--"
+#. unexpected type
+#: git-submodule.sh:753
+#, sh-format
+msgid "unexpected mode $mod_dst"
 msgstr ""
 
-#: git-submodule.sh:766
+#: git-submodule.sh:771
 #, sh-format
 msgid "  Warn: $name doesn't contain commit $sha1_src"
 msgstr ""
 
-#: git-submodule.sh:769
+#: git-submodule.sh:774
 #, sh-format
 msgid "  Warn: $name doesn't contain commit $sha1_dst"
 msgstr ""
 
-#: git-submodule.sh:772
+#: git-submodule.sh:777
 #, sh-format
 msgid "  Warn: $name doesn't contain commits $sha1_src and $sha1_dst"
 msgstr ""
 
-#: git-submodule.sh:797
+#: git-submodule.sh:802
 msgid "blob"
 msgstr ""
 
-#: git-submodule.sh:798
+#: git-submodule.sh:803
 msgid "submodule"
 msgstr ""
 
-#: git-submodule.sh:969
+#: git-submodule.sh:840
+msgid "# Submodules changed but not updated:"
+msgstr ""
+
+#: git-submodule.sh:842
+msgid "# Submodule changes to be committed:"
+msgstr ""
+
+#: git-submodule.sh:974
 #, sh-format
 msgid "Synchronizing submodule url for '$name'"
 msgstr ""