l10n: git.pot: v1.8.3 round 2 (44 new, 12 removed)

Generate po/git.pot from v1.8.3-rc0-19-g7e6a0 for git v1.8.3
l10n round 2.

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

1 files changed, 670 insertions, 505 deletions

diff --git a/po/git.pot b/po/git.pot
index 9a3e0a8ccc..4a9d4efed9 100644
--- a/po/git.pot
+++ b/po/git.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2013-04-10 15:16+0800\n"
+"POT-Creation-Date: 2013-04-30 08:25+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"
@@ -60,7 +60,7 @@ msgstr ""
 msgid "archive format"
 msgstr ""
 
-#: archive.c:324 builtin/log.c:1117
+#: archive.c:324 builtin/log.c:1126
 msgid "prefix"
 msgstr ""
 
@@ -68,10 +68,10 @@ msgstr ""
 msgid "prepend prefix to each pathname in the archive"
 msgstr ""
 
-#: archive.c:326 builtin/archive.c:88 builtin/blame.c:2366
-#: builtin/blame.c:2367 builtin/config.c:55 builtin/fast-export.c:659
-#: builtin/fast-export.c:661 builtin/grep.c:715 builtin/hash-object.c:77
-#: builtin/ls-files.c:497 builtin/ls-files.c:500 builtin/notes.c:536
+#: archive.c:326 builtin/archive.c:88 builtin/blame.c:2371
+#: builtin/blame.c:2372 builtin/config.c:55 builtin/fast-export.c:665
+#: builtin/fast-export.c:667 builtin/grep.c:715 builtin/hash-object.c:77
+#: builtin/ls-files.c:490 builtin/ls-files.c:493 builtin/notes.c:536
 #: builtin/notes.c:693 builtin/read-tree.c:107 parse-options.h:149
 msgid "file"
 msgstr ""
@@ -126,6 +126,75 @@ msgid ""
 "Use '\\!' for literal leading exclamation."
 msgstr ""
 
+#: branch.c:60
+#, c-format
+msgid "Not setting branch %s as its own upstream."
+msgstr ""
+
+#: branch.c:82
+#, c-format
+msgid "Branch %s set up to track remote branch %s from %s by rebasing."
+msgstr ""
+
+#: branch.c:83
+#, c-format
+msgid "Branch %s set up to track remote branch %s from %s."
+msgstr ""
+
+#: branch.c:87
+#, c-format
+msgid "Branch %s set up to track local branch %s by rebasing."
+msgstr ""
+
+#: branch.c:88
+#, c-format
+msgid "Branch %s set up to track local branch %s."
+msgstr ""
+
+#: branch.c:92
+#, c-format
+msgid "Branch %s set up to track remote ref %s by rebasing."
+msgstr ""
+
+#: branch.c:93
+#, c-format
+msgid "Branch %s set up to track remote ref %s."
+msgstr ""
+
+#: branch.c:97
+#, c-format
+msgid "Branch %s set up to track local ref %s by rebasing."
+msgstr ""
+
+#: branch.c:98
+#, c-format
+msgid "Branch %s set up to track local ref %s."
+msgstr ""
+
+#: branch.c:118
+#, c-format
+msgid "Tracking not set up: name too long: %s"
+msgstr ""
+
+#: branch.c:137
+#, c-format
+msgid "Not tracking: ambiguous information for ref %s"
+msgstr ""
+
+#: branch.c:182
+#, c-format
+msgid "'%s' is not a valid branch name."
+msgstr ""
+
+#: branch.c:187
+#, c-format
+msgid "A branch named '%s' already exists."
+msgstr ""
+
+#: branch.c:195
+msgid "Cannot force update the current branch."
+msgstr ""
+
 #: branch.c:201
 #, c-format
 msgid "Cannot setup tracking information; starting point '%s' is not a branch."
@@ -148,6 +217,29 @@ msgid ""
 "\"git push -u\" to set the upstream config as you push."
 msgstr ""
 
+#: branch.c:250
+#, c-format
+msgid "Not a valid object name: '%s'."
+msgstr ""
+
+#: branch.c:270
+#, c-format
+msgid "Ambiguous object name: '%s'."
+msgstr ""
+
+#: branch.c:275
+#, c-format
+msgid "Not a valid branch point: '%s'."
+msgstr ""
+
+#: branch.c:281
+msgid "Failed to lock ref for update"
+msgstr ""
+
+#: branch.c:299
+msgid "Failed to write ref"
+msgstr ""
+
 #: bundle.c:36
 #, c-format
 msgid "'%s' does not look like a v2 bundle file"
@@ -167,9 +259,9 @@ msgstr ""
 msgid "Repository lacks these prerequisite commits:"
 msgstr ""
 
-#: bundle.c:164 sequencer.c:651 sequencer.c:1083 builtin/log.c:300
-#: builtin/log.c:754 builtin/log.c:1350 builtin/log.c:1566 builtin/merge.c:349
-#: builtin/shortlog.c:157
+#: bundle.c:164 sequencer.c:651 sequencer.c:1101 builtin/log.c:300
+#: builtin/log.c:770 builtin/log.c:1344 builtin/log.c:1570 builtin/merge.c:349
+#: builtin/shortlog.c:155
 msgid "revision walk setup failed"
 msgstr ""
 
@@ -195,7 +287,7 @@ msgstr[1] ""
 msgid "rev-list died"
 msgstr ""
 
-#: bundle.c:300 builtin/log.c:1246 builtin/shortlog.c:260
+#: bundle.c:300 builtin/log.c:1255 builtin/shortlog.c:258
 #, c-format
 msgid "unrecognized argument: %s"
 msgstr ""
@@ -343,14 +435,14 @@ msgid ""
 "%s"
 msgstr ""
 
-#: diff.c:3480
+#: diff.c:3481
 #, c-format
 msgid ""
 "Failed to parse --dirstat/-X option parameter:\n"
 "%s"
 msgstr ""
 
-#: diff.c:3494
+#: diff.c:3495
 #, c-format
 msgid "Failed to parse --submodule option parameter: '%s'"
 msgstr ""
@@ -447,8 +539,8 @@ msgstr[1] ""
 msgid "failed to read the cache"
 msgstr ""
 
-#: merge.c:110 builtin/checkout.c:362 builtin/checkout.c:563
-#: builtin/clone.c:635
+#: merge.c:110 builtin/checkout.c:365 builtin/checkout.c:566
+#: builtin/clone.c:645
 msgid "unable to write new index file"
 msgstr ""
 
@@ -497,7 +589,7 @@ msgstr ""
 msgid "blob expected for %s '%s'"
 msgstr ""
 
-#: merge-recursive.c:773 builtin/clone.c:303
+#: merge-recursive.c:773 builtin/clone.c:313
 #, c-format
 msgid "failed to open '%s'"
 msgstr ""
@@ -1000,11 +1092,21 @@ msgstr ""
 msgid "Could not format %s."
 msgstr ""
 
-#: sequencer.c:1101
+#: sequencer.c:1083
+#, c-format
+msgid "%s: can't cherry-pick a %s"
+msgstr ""
+
+#: sequencer.c:1085
+#, c-format
+msgid "%s: bad revision"
+msgstr ""
+
+#: sequencer.c:1119
 msgid "Can't revert as initial commit"
 msgstr ""
 
-#: sequencer.c:1102
+#: sequencer.c:1120
 msgid "Can't cherry-pick into empty head"
 msgstr ""
 
@@ -1190,254 +1292,249 @@ msgstr ""
 msgid "bug: unhandled diff status %c"
 msgstr ""
 
-#: wt-status.c:805
+#: wt-status.c:803
 msgid "You have unmerged paths."
 msgstr ""
 
-#: wt-status.c:808 wt-status.c:960
+#: wt-status.c:806 wt-status.c:958
 msgid "  (fix conflicts and run \"git commit\")"
 msgstr ""
 
-#: wt-status.c:811
+#: wt-status.c:809
 msgid "All conflicts fixed but you are still merging."
 msgstr ""
 
-#: wt-status.c:814
+#: wt-status.c:812
 msgid "  (use \"git commit\" to conclude merge)"
 msgstr ""
 
-#: wt-status.c:824
+#: wt-status.c:822
 msgid "You are in the middle of an am session."
 msgstr ""
 
-#: wt-status.c:827
+#: wt-status.c:825
 msgid "The current patch is empty."
 msgstr ""
 
-#: wt-status.c:831
+#: wt-status.c:829
 msgid "  (fix conflicts and then run \"git am --resolved\")"
 msgstr ""
 
-#: wt-status.c:833
+#: wt-status.c:831
 msgid "  (use \"git am --skip\" to skip this patch)"
 msgstr ""
 
-#: wt-status.c:835
+#: wt-status.c:833
 msgid "  (use \"git am --abort\" to restore the original branch)"
 msgstr ""
 
-#: wt-status.c:895 wt-status.c:912
+#: wt-status.c:893 wt-status.c:910
 #, c-format
 msgid "You are currently rebasing branch '%s' on '%s'."
 msgstr ""
 
-#: wt-status.c:900 wt-status.c:917
+#: wt-status.c:898 wt-status.c:915
 msgid "You are currently rebasing."
 msgstr ""
 
-#: wt-status.c:903
+#: wt-status.c:901
 msgid "  (fix conflicts and then run \"git rebase --continue\")"
 msgstr ""
 
-#: wt-status.c:905
+#: wt-status.c:903
 msgid "  (use \"git rebase --skip\" to skip this patch)"
 msgstr ""
 
-#: wt-status.c:907
+#: wt-status.c:905
 msgid "  (use \"git rebase --abort\" to check out the original branch)"
 msgstr ""
 
-#: wt-status.c:920
+#: wt-status.c:918
 msgid "  (all conflicts fixed: run \"git rebase --continue\")"
 msgstr ""
 
-#: wt-status.c:924
+#: wt-status.c:922
 #, c-format
 msgid ""
 "You are currently splitting a commit while rebasing branch '%s' on '%s'."
 msgstr ""
 
-#: wt-status.c:929
+#: wt-status.c:927
 msgid "You are currently splitting a commit during a rebase."
 msgstr ""
 
-#: wt-status.c:932
+#: wt-status.c:930
 msgid "  (Once your working directory is clean, run \"git rebase --continue\")"
 msgstr ""
 
-#: wt-status.c:936
+#: wt-status.c:934
 #, c-format
 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
 msgstr ""
 
-#: wt-status.c:941
+#: wt-status.c:939
 msgid "You are currently editing a commit during a rebase."
 msgstr ""
 
-#: wt-status.c:944
+#: wt-status.c:942
 msgid "  (use \"git commit --amend\" to amend the current commit)"
 msgstr ""
 
-#: wt-status.c:946
+#: wt-status.c:944
 msgid ""
 "  (use \"git rebase --continue\" once you are satisfied with your changes)"
 msgstr ""
 
-#: wt-status.c:956
+#: wt-status.c:954
 msgid "You are currently cherry-picking."
 msgstr ""
 
-#: wt-status.c:963
+#: wt-status.c:961
 msgid "  (all conflicts fixed: run \"git commit\")"
 msgstr ""
 
-#: wt-status.c:972
+#: wt-status.c:970
 #, c-format
 msgid "You are currently reverting commit %s."
 msgstr ""
 
-#: wt-status.c:977
+#: wt-status.c:975
 msgid "  (fix conflicts and run \"git revert --continue\")"
 msgstr ""
 
-#: wt-status.c:980
+#: wt-status.c:978
 msgid "  (all conflicts fixed: run \"git revert --continue\")"
 msgstr ""
 
-#: wt-status.c:982
+#: wt-status.c:980
 msgid "  (use \"git revert --abort\" to cancel the revert operation)"
 msgstr ""
 
-#: wt-status.c:993
+#: wt-status.c:991
 #, c-format
 msgid "You are currently bisecting, started from branch '%s'."
 msgstr ""
 
-#: wt-status.c:997
+#: wt-status.c:995
 msgid "You are currently bisecting."
 msgstr ""
 
-#: wt-status.c:1000
+#: wt-status.c:998
 msgid "  (use \"git bisect reset\" to get back to the original branch)"
 msgstr ""
 
-#: wt-status.c:1175
+#: wt-status.c:1173
 msgid "On branch "
 msgstr ""
 
-#: wt-status.c:1186
+#: wt-status.c:1184
 msgid "HEAD detached at "
 msgstr ""
 
-#: wt-status.c:1188
+#: wt-status.c:1186
 msgid "HEAD detached from "
 msgstr ""
 
-#: wt-status.c:1191
+#: wt-status.c:1189
 msgid "Not currently on any branch."
 msgstr ""
 
-#: wt-status.c:1208
+#: wt-status.c:1206
 msgid "Initial commit"
 msgstr ""
 
-#: wt-status.c:1222
+#: wt-status.c:1220
 msgid "Untracked files"
 msgstr ""
 
-#: wt-status.c:1224
+#: wt-status.c:1222
 msgid "Ignored files"
 msgstr ""
 
-#: wt-status.c:1228
+#: wt-status.c:1226
 #, c-format
-msgid "It took %.2f seconds to enumerate untracked files.  'status -uno'"
+msgid ""
+"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
+"may speed it up, but you have to be careful not to forget to add\n"
+"new files yourself (see 'git help status')."
 msgstr ""
 
 #: wt-status.c:1232
-msgid "may speed it up, but you have to be careful not to forget to add"
-msgstr ""
-
-#: wt-status.c:1235
-msgid "new files yourself (see 'git help status')."
-msgstr ""
-
-#: wt-status.c:1238
 #, c-format
 msgid "Untracked files not listed%s"
 msgstr ""
 
-#: wt-status.c:1240
+#: wt-status.c:1234
 msgid " (use -u option to show untracked files)"
 msgstr ""
 
-#: wt-status.c:1246
+#: wt-status.c:1240
 msgid "No changes"
 msgstr ""
 
-#: wt-status.c:1251
+#: wt-status.c:1245
 #, c-format
 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
 msgstr ""
 
-#: wt-status.c:1254
+#: wt-status.c:1248
 #, c-format
 msgid "no changes added to commit\n"
 msgstr ""
 
-#: wt-status.c:1257
+#: wt-status.c:1251
 #, c-format
 msgid ""
 "nothing added to commit but untracked files present (use \"git add\" to "
 "track)\n"
 msgstr ""
 
-#: wt-status.c:1260
+#: wt-status.c:1254
 #, c-format
 msgid "nothing added to commit but untracked files present\n"
 msgstr ""
 
-#: wt-status.c:1263
+#: wt-status.c:1257
 #, c-format
 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
 msgstr ""
 
-#: wt-status.c:1266 wt-status.c:1271
+#: wt-status.c:1260 wt-status.c:1265
 #, c-format
 msgid "nothing to commit\n"
 msgstr ""
 
-#: wt-status.c:1269
+#: wt-status.c:1263
 #, c-format
 msgid "nothing to commit (use -u to show untracked files)\n"
 msgstr ""
 
-#: wt-status.c:1273
+#: wt-status.c:1267
 #, c-format
 msgid "nothing to commit, working directory clean\n"
 msgstr ""
 
-#: wt-status.c:1381
+#: wt-status.c:1375
 msgid "HEAD (no branch)"
 msgstr ""
 
-#: wt-status.c:1387
+#: wt-status.c:1381
 msgid "Initial commit on "
 msgstr ""
 
-#: wt-status.c:1402
+#: wt-status.c:1396
 msgid "behind "
 msgstr ""
 
-#: wt-status.c:1405 wt-status.c:1408
+#: wt-status.c:1399 wt-status.c:1402
 msgid "ahead "
 msgstr ""
 
-#: wt-status.c:1410
+#: wt-status.c:1404
 msgid ", behind "
 msgstr ""
 
-#: compat/precompose_utf8.c:58 builtin/clone.c:342
+#: compat/precompose_utf8.c:58 builtin/clone.c:352
 #, c-format
 msgid "failed to unlink '%s'"
 msgstr ""
@@ -1446,179 +1543,200 @@ msgstr ""
 msgid "git add [options] [--] <pathspec>..."
 msgstr ""
 
-#: builtin/add.c:63
+#.
+#. * To be consistent with "git add -p" and most Git
+#. * commands, we should default to being tree-wide, but
+#. * this is not the original behavior and can't be
+#. * changed until users trained themselves not to type
+#. * "git add -u" or "git add -A". For now, we warn and
+#. * keep the old behavior. Later, the behavior can be changed
+#. * to tree-wide, keeping the warning for a while, and
+#. * eventually we can drop the warning.
+#.
+#: builtin/add.c:58
+#, c-format
+msgid ""
+"The behavior of 'git add %s (or %s)' with no path argument from a\n"
+"subdirectory of the tree will change in Git 2.0 and should not be used "
+"anymore.\n"
+"To add content for the whole tree, run:\n"
+"\n"
+"  git add %s :/\n"
+"  (or git add %s :/)\n"
+"\n"
+"To restrict the command to the current directory, run:\n"
+"\n"
+"  git add %s .\n"
+"  (or git add %s .)\n"
+"\n"
+"With the current Git version, the command is restricted to the current "
+"directory.\n"
+msgstr ""
+
+#: builtin/add.c:100
+#, c-format
+msgid ""
+"You ran 'git add' with neither '-A (--all)' or '--ignore-removal',\n"
+"whose behaviour will change in Git 2.0 with respect to paths you removed.\n"
+"Paths like '%s' that are\n"
+"removed from your working tree are ignored with this version of Git.\n"
+"\n"
+"* 'git add --ignore-removal <pathspec>', which is the current default,\n"
+"  ignores paths you removed from your working tree.\n"
+"\n"
+"* 'git add --all <pathspec>' will let you also record the removals.\n"
+"\n"
+"Run 'git status' to check the paths you removed from your working tree.\n"
+msgstr ""
+
+#: builtin/add.c:144
 #, c-format
 msgid "unexpected diff status %c"
 msgstr ""
 
-#: builtin/add.c:68 builtin/commit.c:233
+#: builtin/add.c:149 builtin/commit.c:233
 msgid "updating files failed"
 msgstr ""
 
-#: builtin/add.c:78
+#: builtin/add.c:163
 #, c-format
 msgid "remove '%s'\n"
 msgstr ""
 
-#: builtin/add.c:148
+#: builtin/add.c:253
 msgid "Unstaged changes after refreshing the index:"
 msgstr ""
 
-#: builtin/add.c:151 builtin/add.c:460 builtin/rm.c:275
+#: builtin/add.c:256 builtin/add.c:572 builtin/rm.c:275
 #, c-format
 msgid "pathspec '%s' did not match any files"
 msgstr ""
 
-#: builtin/add.c:234
+#: builtin/add.c:339
 msgid "Could not read the index"
 msgstr ""
 
-#: builtin/add.c:244
+#: builtin/add.c:349
 #, c-format
 msgid "Could not open '%s' for writing."
 msgstr ""
 
-#: builtin/add.c:248
+#: builtin/add.c:353
 msgid "Could not write patch"
 msgstr ""
 
-#: builtin/add.c:253
+#: builtin/add.c:358
 #, c-format
 msgid "Could not stat '%s'"
 msgstr ""
 
-#: builtin/add.c:255
+#: builtin/add.c:360
 msgid "Empty patch. Aborted."
 msgstr ""
 
-#: builtin/add.c:261
+#: builtin/add.c:366
 #, c-format
 msgid "Could not apply '%s'"
 msgstr ""
 
-#: builtin/add.c:271
+#: builtin/add.c:376
 msgid "The following paths are ignored by one of your .gitignore files:\n"
 msgstr ""
 
-#: builtin/add.c:277 builtin/clean.c:161 builtin/fetch.c:78 builtin/mv.c:63
+#: builtin/add.c:393 builtin/clean.c:161 builtin/fetch.c:78 builtin/mv.c:63
 #: builtin/prune-packed.c:76 builtin/push.c:425 builtin/remote.c:1253
 #: builtin/rm.c:206
 msgid "dry run"
 msgstr ""
 
-#: builtin/add.c:278 builtin/apply.c:4409 builtin/check-ignore.c:19
+#: builtin/add.c:394 builtin/apply.c:4409 builtin/check-ignore.c:19
 #: builtin/commit.c:1152 builtin/count-objects.c:95 builtin/fsck.c:613
-#: builtin/log.c:1514 builtin/mv.c:62 builtin/read-tree.c:112
+#: builtin/log.c:1518 builtin/mv.c:62 builtin/read-tree.c:112
 msgid "be verbose"
 msgstr ""
 
-#: builtin/add.c:280
+#: builtin/add.c:396
 msgid "interactive picking"
 msgstr ""
 
-#: builtin/add.c:281 builtin/checkout.c:1060 builtin/reset.c:258
+#: builtin/add.c:397 builtin/checkout.c:1063 builtin/reset.c:258
 msgid "select hunks interactively"
 msgstr ""
 
-#: builtin/add.c:282
+#: builtin/add.c:398
 msgid "edit current diff and apply"
 msgstr ""
 
-#: builtin/add.c:283
+#: builtin/add.c:399
 msgid "allow adding otherwise ignored files"
 msgstr ""
 
-#: builtin/add.c:284
+#: builtin/add.c:400
 msgid "update tracked files"
 msgstr ""
 
-#: builtin/add.c:285
+#: builtin/add.c:401
 msgid "record only the fact that the path will be added later"
 msgstr ""
 
-#: builtin/add.c:286
+#: builtin/add.c:402
 msgid "add changes from all tracked and untracked files"
 msgstr ""
 
-#: builtin/add.c:287
+#. takes no arguments
+#: builtin/add.c:405
+msgid "ignore paths removed in the working tree (same as --no-all)"
+msgstr ""
+
+#: builtin/add.c:407
 msgid "don't add, only refresh the index"
 msgstr ""
 
-#: builtin/add.c:288
+#: builtin/add.c:408
 msgid "just skip files which cannot be added because of errors"
 msgstr ""
 
-#: builtin/add.c:289
+#: builtin/add.c:409
 msgid "check if - even missing - files are ignored in dry run"
 msgstr ""
 
-#: builtin/add.c:311
+#: builtin/add.c:431
 #, c-format
 msgid "Use -f if you really want to add them.\n"
 msgstr ""
 
-#: builtin/add.c:312
+#: builtin/add.c:432
 msgid "no files added"
 msgstr ""
 
-#: builtin/add.c:318
+#: builtin/add.c:438
 msgid "adding files failed"
 msgstr ""
 
-#.
-#. * To be consistent with "git add -p" and most Git
-#. * commands, we should default to being tree-wide, but
-#. * this is not the original behavior and can't be
-#. * changed until users trained themselves not to type
-#. * "git add -u" or "git add -A". For now, we warn and
-#. * keep the old behavior. Later, the behavior can be changed
-#. * to tree-wide, keeping the warning for a while, and
-#. * eventually we can drop the warning.
-#.
-#: builtin/add.c:335
-#, c-format
-msgid ""
-"The behavior of 'git add %s (or %s)' with no path argument from a\n"
-"subdirectory of the tree will change in Git 2.0 and should not be used "
-"anymore.\n"
-"To add content for the whole tree, run:\n"
-"\n"
-"  git add %s :/\n"
-"  (or git add %s :/)\n"
-"\n"
-"To restrict the command to the current directory, run:\n"
-"\n"
-"  git add %s .\n"
-"  (or git add %s .)\n"
-"\n"
-"With the current Git version, the command is restricted to the current "
-"directory."
-msgstr ""
-
-#: builtin/add.c:381
+#: builtin/add.c:477
 msgid "-A and -u are mutually incompatible"
 msgstr ""
 
-#: builtin/add.c:383
+#: builtin/add.c:495
 msgid "Option --ignore-missing can only be used together with --dry-run"
 msgstr ""
 
-#: builtin/add.c:414
+#: builtin/add.c:525
 #, c-format
 msgid "Nothing specified, nothing added.\n"
 msgstr ""
 
-#: builtin/add.c:415
+#: builtin/add.c:526
 #, c-format
 msgid "Maybe you wanted to say 'git add .'?\n"
 msgstr ""
 
-#: builtin/add.c:421 builtin/check-ignore.c:67 builtin/clean.c:204
+#: builtin/add.c:532 builtin/check-ignore.c:66 builtin/clean.c:204
 #: builtin/commit.c:293 builtin/mv.c:82 builtin/rm.c:235
 msgid "index file corrupt"
 msgstr ""
 
-#: builtin/add.c:481 builtin/apply.c:4505 builtin/mv.c:229 builtin/rm.c:370
+#: builtin/add.c:604 builtin/apply.c:4505 builtin/mv.c:229 builtin/rm.c:370
 msgid "Unable to write new index file"
 msgstr ""
 
@@ -1864,7 +1982,7 @@ msgstr ""
 msgid "Checking patch %s..."
 msgstr ""
 
-#: builtin/apply.c:3679 builtin/checkout.c:215 builtin/reset.c:124
+#: builtin/apply.c:3679 builtin/checkout.c:216 builtin/reset.c:124
 #, c-format
 msgid "make_cache_entry failed for path '%s'"
 msgstr ""
@@ -2005,7 +2123,7 @@ msgstr ""
 msgid "build a temporary index based on embedded index information"
 msgstr ""
 
-#: builtin/apply.c:4388 builtin/checkout-index.c:197 builtin/ls-files.c:463
+#: builtin/apply.c:4388 builtin/checkout-index.c:197 builtin/ls-files.c:456
 msgid "paths are separated with NUL character"
 msgstr ""
 
@@ -2139,99 +2257,99 @@ msgstr ""
 msgid "git blame [options] [rev-opts] [rev] [--] file"
 msgstr ""
 
-#: builtin/blame.c:30 builtin/shortlog.c:15
+#: builtin/blame.c:30
 msgid "[rev-opts] are documented in git-rev-list(1)"
 msgstr ""
 
-#: builtin/blame.c:2350
+#: builtin/blame.c:2355
 msgid "Show blame entries as we find them, incrementally"
 msgstr ""
 
-#: builtin/blame.c:2351
+#: builtin/blame.c:2356
 msgid "Show blank SHA-1 for boundary commits (Default: off)"
 msgstr ""
 
-#: builtin/blame.c:2352
+#: builtin/blame.c:2357
 msgid "Do not treat root commits as boundaries (Default: off)"
 msgstr ""
 
-#: builtin/blame.c:2353
+#: builtin/blame.c:2358
 msgid "Show work cost statistics"
 msgstr ""
 
-#: builtin/blame.c:2354
+#: builtin/blame.c:2359
 msgid "Show output score for blame entries"
 msgstr ""
 
-#: builtin/blame.c:2355
+#: builtin/blame.c:2360
 msgid "Show original filename (Default: auto)"
 msgstr ""
 
-#: builtin/blame.c:2356
+#: builtin/blame.c:2361
 msgid "Show original linenumber (Default: off)"
 msgstr ""
 
-#: builtin/blame.c:2357
+#: builtin/blame.c:2362
 msgid "Show in a format designed for machine consumption"
 msgstr ""
 
-#: builtin/blame.c:2358
+#: builtin/blame.c:2363
 msgid "Show porcelain format with per-line commit information"
 msgstr ""
 
-#: builtin/blame.c:2359
+#: builtin/blame.c:2364
 msgid "Use the same output mode as git-annotate (Default: off)"
 msgstr ""
 
-#: builtin/blame.c:2360
+#: builtin/blame.c:2365
 msgid "Show raw timestamp (Default: off)"
 msgstr ""
 
-#: builtin/blame.c:2361
+#: builtin/blame.c:2366
 msgid "Show long commit SHA1 (Default: off)"
 msgstr ""
 
-#: builtin/blame.c:2362
+#: builtin/blame.c:2367
 msgid "Suppress author name and timestamp (Default: off)"
 msgstr ""
 
-#: builtin/blame.c:2363
+#: builtin/blame.c:2368
 msgid "Show author email instead of name (Default: off)"
 msgstr ""
 
-#: builtin/blame.c:2364
+#: builtin/blame.c:2369
 msgid "Ignore whitespace differences"
 msgstr ""
 
-#: builtin/blame.c:2365
+#: builtin/blame.c:2370
 msgid "Spend extra cycles to find better match"
 msgstr ""
 
-#: builtin/blame.c:2366
+#: builtin/blame.c:2371
 msgid "Use revisions from <file> instead of calling git-rev-list"
 msgstr ""
 
-#: builtin/blame.c:2367
+#: builtin/blame.c:2372
 msgid "Use <file>'s contents as the final image"
 msgstr ""
 
-#: builtin/blame.c:2368 builtin/blame.c:2369
+#: builtin/blame.c:2373 builtin/blame.c:2374
 msgid "score"
 msgstr ""
 
-#: builtin/blame.c:2368
+#: builtin/blame.c:2373
 msgid "Find line copies within and across files"
 msgstr ""
 
-#: builtin/blame.c:2369
+#: builtin/blame.c:2374
 msgid "Find line movements within and across files"
 msgstr ""
 
-#: builtin/blame.c:2370
+#: builtin/blame.c:2375
 msgid "n,m"
 msgstr ""
 
-#: builtin/blame.c:2370
+#: builtin/blame.c:2375
 msgid "Process only line range n,m, counting from 1"
 msgstr ""
 
@@ -2251,360 +2369,360 @@ msgstr ""
 msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>"
 msgstr ""
 
-#: builtin/branch.c:146
+#: builtin/branch.c:150
 #, c-format
 msgid ""
 "deleting branch '%s' that has been merged to\n"
 "         '%s', but not yet merged to HEAD."
 msgstr ""
 
-#: builtin/branch.c:150
+#: builtin/branch.c:154
 #, c-format
 msgid ""
 "not deleting branch '%s' that is not yet merged to\n"
 "         '%s', even though it is merged to HEAD."
 msgstr ""
 
-#: builtin/branch.c:164
+#: builtin/branch.c:168
 #, c-format
 msgid "Couldn't look up commit object for '%s'"
 msgstr ""
 
-#: builtin/branch.c:168
+#: builtin/branch.c:172
 #, c-format
 msgid ""
 "The branch '%s' is not fully merged.\n"
 "If you are sure you want to delete it, run 'git branch -D %s'."
 msgstr ""
 
-#: builtin/branch.c:181
+#: builtin/branch.c:185
 msgid "Update of config-file failed"
 msgstr ""
 
-#: builtin/branch.c:209
+#: builtin/branch.c:213
 msgid "cannot use -a with -d"
 msgstr ""
 
-#: builtin/branch.c:215
+#: builtin/branch.c:219
 msgid "Couldn't look up commit object for HEAD"
 msgstr ""
 
-#: builtin/branch.c:223
+#: builtin/branch.c:227
 #, c-format
 msgid "Cannot delete the branch '%s' which you are currently on."
 msgstr ""
 
-#: builtin/branch.c:236
+#: builtin/branch.c:240
 #, c-format
 msgid "remote branch '%s' not found."
 msgstr ""
 
-#: builtin/branch.c:237
+#: builtin/branch.c:241
 #, c-format
 msgid "branch '%s' not found."
 msgstr ""
 
-#: builtin/branch.c:251
+#: builtin/branch.c:255
 #, c-format
 msgid "Error deleting remote branch '%s'"
 msgstr ""
 
-#: builtin/branch.c:252
+#: builtin/branch.c:256
 #, c-format
 msgid "Error deleting branch '%s'"
 msgstr ""
 
-#: builtin/branch.c:259
+#: builtin/branch.c:263
 #, c-format
 msgid "Deleted remote branch %s (was %s).\n"
 msgstr ""
 
-#: builtin/branch.c:260
+#: builtin/branch.c:264
 #, c-format
 msgid "Deleted branch %s (was %s).\n"
 msgstr ""
 
-#: builtin/branch.c:362
+#: builtin/branch.c:366
 #, c-format
 msgid "branch '%s' does not point at a commit"
 msgstr ""
 
-#: builtin/branch.c:434
+#: builtin/branch.c:453
 #, c-format
 msgid "[%s: behind %d]"
 msgstr ""
 
-#: builtin/branch.c:436
+#: builtin/branch.c:455
 #, c-format
 msgid "[behind %d]"
 msgstr ""
 
-#: builtin/branch.c:440
+#: builtin/branch.c:459
 #, c-format
 msgid "[%s: ahead %d]"
 msgstr ""
 
-#: builtin/branch.c:442
+#: builtin/branch.c:461
 #, c-format
 msgid "[ahead %d]"
 msgstr ""
 
-#: builtin/branch.c:445
+#: builtin/branch.c:464
 #, c-format
 msgid "[%s: ahead %d, behind %d]"
 msgstr ""
 
-#: builtin/branch.c:448
+#: builtin/branch.c:467
 #, c-format
 msgid "[ahead %d, behind %d]"
 msgstr ""
 
-#: builtin/branch.c:470
+#: builtin/branch.c:490
 msgid " **** invalid ref ****"
 msgstr ""
 
-#: builtin/branch.c:562
+#: builtin/branch.c:582
 #, c-format
 msgid "(no branch, rebasing %s)"
 msgstr ""
 
-#: builtin/branch.c:565
+#: builtin/branch.c:585
 #, c-format
 msgid "(no branch, bisect started on %s)"
 msgstr ""
 
-#: builtin/branch.c:568
+#: builtin/branch.c:588
 #, c-format
 msgid "(detached from %s)"
 msgstr ""
 
-#: builtin/branch.c:571
+#: builtin/branch.c:591
 msgid "(no branch)"
 msgstr ""
 
-#: builtin/branch.c:617
+#: builtin/branch.c:637
 #, c-format
 msgid "object '%s' does not point to a commit"
 msgstr ""
 
-#: builtin/branch.c:649
+#: builtin/branch.c:669
 msgid "some refs could not be read"
 msgstr ""
 
-#: builtin/branch.c:662
+#: builtin/branch.c:682
 msgid "cannot rename the current branch while not on any."
 msgstr ""
 
-#: builtin/branch.c:672
+#: builtin/branch.c:692
 #, c-format
 msgid "Invalid branch name: '%s'"
 msgstr ""
 
-#: builtin/branch.c:687
+#: builtin/branch.c:707
 msgid "Branch rename failed"
 msgstr ""
 
-#: builtin/branch.c:691
+#: builtin/branch.c:711
 #, c-format
 msgid "Renamed a misnamed branch '%s' away"
 msgstr ""
 
-#: builtin/branch.c:695
+#: builtin/branch.c:715
 #, c-format
 msgid "Branch renamed to %s, but HEAD is not updated!"
 msgstr ""
 
-#: builtin/branch.c:702
+#: builtin/branch.c:722
 msgid "Branch is renamed, but update of config-file failed"
 msgstr ""
 
-#: builtin/branch.c:717
+#: builtin/branch.c:737
 #, c-format
 msgid "malformed object name %s"
 msgstr ""
 
-#: builtin/branch.c:741
+#: builtin/branch.c:761
 #, c-format
 msgid "could not write branch description template: %s"
 msgstr ""
 
-#: builtin/branch.c:771
+#: builtin/branch.c:791
 msgid "Generic options"
 msgstr ""
 
-#: builtin/branch.c:773
+#: builtin/branch.c:793
 msgid "show hash and subject, give twice for upstream branch"
 msgstr ""
 
-#: builtin/branch.c:774
+#: builtin/branch.c:794
 msgid "suppress informational messages"
 msgstr ""
 
-#: builtin/branch.c:775
+#: builtin/branch.c:795
 msgid "set up tracking mode (see git-pull(1))"
 msgstr ""
 
-#: builtin/branch.c:777
+#: builtin/branch.c:797
 msgid "change upstream info"
 msgstr ""
 
-#: builtin/branch.c:781
+#: builtin/branch.c:801
 msgid "use colored output"
 msgstr ""
 
-#: builtin/branch.c:782
+#: builtin/branch.c:802
 msgid "act on remote-tracking branches"
 msgstr ""
 
-#: builtin/branch.c:785 builtin/branch.c:791 builtin/branch.c:812
-#: builtin/branch.c:818 builtin/commit.c:1368 builtin/commit.c:1369
+#: builtin/branch.c:805 builtin/branch.c:811 builtin/branch.c:832
+#: builtin/branch.c:838 builtin/commit.c:1368 builtin/commit.c:1369
 #: builtin/commit.c:1370 builtin/commit.c:1371 builtin/tag.c:468
 msgid "commit"
 msgstr ""
 
-#: builtin/branch.c:786 builtin/branch.c:792
+#: builtin/branch.c:806 builtin/branch.c:812
 msgid "print only branches that contain the commit"
 msgstr ""
 
-#: builtin/branch.c:798
+#: builtin/branch.c:818
 msgid "Specific git-branch actions:"
 msgstr ""
 
-#: builtin/branch.c:799
+#: builtin/branch.c:819
 msgid "list both remote-tracking and local branches"
 msgstr ""
 
-#: builtin/branch.c:801
+#: builtin/branch.c:821
 msgid "delete fully merged branch"
 msgstr ""
 
-#: builtin/branch.c:802
+#: builtin/branch.c:822
 msgid "delete branch (even if not merged)"
 msgstr ""
 
-#: builtin/branch.c:803
+#: builtin/branch.c:823
 msgid "move/rename a branch and its reflog"
 msgstr ""
 
-#: builtin/branch.c:804
+#: builtin/branch.c:824
 msgid "move/rename a branch, even if target exists"
 msgstr ""
 
-#: builtin/branch.c:805
+#: builtin/branch.c:825
 msgid "list branch names"
 msgstr ""
 
-#: builtin/branch.c:806
+#: builtin/branch.c:826
 msgid "create the branch's reflog"
 msgstr ""
 
-#: builtin/branch.c:808
+#: builtin/branch.c:828
 msgid "edit the description for the branch"
 msgstr ""
 
-#: builtin/branch.c:809
+#: builtin/branch.c:829
 msgid "force creation (when already exists)"
 msgstr ""
 
-#: builtin/branch.c:812
+#: builtin/branch.c:832
 msgid "print only not merged branches"
 msgstr ""
 
-#: builtin/branch.c:818
+#: builtin/branch.c:838
 msgid "print only merged branches"
 msgstr ""
 
-#: builtin/branch.c:822
+#: builtin/branch.c:842
 msgid "list branches in columns"
 msgstr ""
 
-#: builtin/branch.c:835
+#: builtin/branch.c:855
 msgid "Failed to resolve HEAD as a valid ref."
 msgstr ""
 
-#: builtin/branch.c:840 builtin/clone.c:609
+#: builtin/branch.c:860 builtin/clone.c:619
 msgid "HEAD not found below refs/heads!"
 msgstr ""
 
-#: builtin/branch.c:863
+#: builtin/branch.c:883
 msgid "--column and --verbose are incompatible"
 msgstr ""