aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiang Xin <worldhello.net@gmail.com>2013-11-02 08:08:26 +0800
committerJiang Xin <worldhello.net@gmail.com>2013-11-02 08:08:26 +0800
commit727b9576eb4a2006c4a9cdbe9e405370abb0dea3 (patch)
tree16564091a715ab5c1aada2de79f6618c17cce311
parentaa2706463fdeb51d6f9d0e267113b251888cf7f5 (diff)
downloadgit-727b9576eb4a2006c4a9cdbe9e405370abb0dea3.tar.gz
git-727b9576eb4a2006c4a9cdbe9e405370abb0dea3.tar.xz
l10n: git.pot: v1.8.5 round 1 (68 new, 9 removed)
Generate po/git.pot from v1.8.5-rc0-23-gaa27064 for git v1.8.5 l10n round 1. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
-rw-r--r--po/git.pot2664
1 files changed, 1463 insertions, 1201 deletions
diff --git a/po/git.pot b/po/git.pot
index c91e19752..58af01a21 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-08-06 14:10+0800\n"
+"POT-Creation-Date: 2013-11-02 08:06+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"
@@ -52,71 +52,76 @@ msgstr ""
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr ""
-#: archive.c:323
+#: archive.c:242 builtin/add.c:240 builtin/add.c:556 builtin/rm.c:328
+#, c-format
+msgid "pathspec '%s' did not match any files"
+msgstr ""
+
+#: archive.c:327
msgid "fmt"
msgstr ""
-#: archive.c:323
+#: archive.c:327
msgid "archive format"
msgstr ""
-#: archive.c:324 builtin/log.c:1173
+#: archive.c:328 builtin/log.c:1193
msgid "prefix"
msgstr ""
-#: archive.c:325
+#: archive.c:329
msgid "prepend prefix to each pathname in the archive"
msgstr ""
-#: archive.c:326 builtin/archive.c:88 builtin/blame.c:2292
-#: builtin/blame.c:2293 builtin/config.c:56 builtin/fast-export.c:673
-#: builtin/fast-export.c:675 builtin/grep.c:714 builtin/hash-object.c:77
-#: builtin/ls-files.c:496 builtin/ls-files.c:499 builtin/notes.c:408
-#: builtin/notes.c:565 builtin/read-tree.c:108 parse-options.h:152
+#: archive.c:330 builtin/archive.c:88 builtin/blame.c:2264
+#: builtin/blame.c:2265 builtin/config.c:58 builtin/fast-export.c:680
+#: builtin/fast-export.c:682 builtin/grep.c:716 builtin/hash-object.c:77
+#: builtin/ls-files.c:486 builtin/ls-files.c:489 builtin/notes.c:408
+#: builtin/notes.c:565 builtin/read-tree.c:108 parse-options.h:154
msgid "file"
msgstr ""
-#: archive.c:327 builtin/archive.c:89
+#: archive.c:331 builtin/archive.c:89
msgid "write the archive to this file"
msgstr ""
-#: archive.c:329
+#: archive.c:333
msgid "read .gitattributes in working directory"
msgstr ""
-#: archive.c:330
+#: archive.c:334
msgid "report archived files on stderr"
msgstr ""
-#: archive.c:331
+#: archive.c:335
msgid "store only"
msgstr ""
-#: archive.c:332
+#: archive.c:336
msgid "compress faster"
msgstr ""
-#: archive.c:340
+#: archive.c:344
msgid "compress better"
msgstr ""
-#: archive.c:343
+#: archive.c:347
msgid "list supported archive formats"
msgstr ""
-#: archive.c:345 builtin/archive.c:90 builtin/clone.c:85
+#: archive.c:349 builtin/archive.c:90 builtin/clone.c:84
msgid "repo"
msgstr ""
-#: archive.c:346 builtin/archive.c:91
+#: archive.c:350 builtin/archive.c:91
msgid "retrieve the archive from remote repository <repo>"
msgstr ""
-#: archive.c:347 builtin/archive.c:92 builtin/notes.c:487
+#: archive.c:351 builtin/archive.c:92 builtin/notes.c:487
msgid "command"
msgstr ""
-#: archive.c:348 builtin/archive.c:93
+#: archive.c:352 builtin/archive.c:93
msgid "path to the remote git-upload-archive command"
msgstr ""
@@ -195,17 +200,17 @@ msgstr ""
msgid "Cannot force update the current branch."
msgstr ""
-#: branch.c:216
+#: branch.c:215
#, c-format
msgid "Cannot setup tracking information; starting point '%s' is not a branch."
msgstr ""
-#: branch.c:218
+#: branch.c:217
#, c-format
msgid "the requested upstream branch '%s' does not exist"
msgstr ""
-#: branch.c:220
+#: branch.c:219
msgid ""
"\n"
"If you are planning on basing your work on an upstream\n"
@@ -217,26 +222,26 @@ msgid ""
"\"git push -u\" to set the upstream config as you push."
msgstr ""
-#: branch.c:265
+#: branch.c:264
#, c-format
msgid "Not a valid object name: '%s'."
msgstr ""
-#: branch.c:285
+#: branch.c:284
#, c-format
msgid "Ambiguous object name: '%s'."
msgstr ""
-#: branch.c:290
+#: branch.c:289
#, c-format
msgid "Not a valid branch point: '%s'."
msgstr ""
-#: branch.c:296
+#: branch.c:295
msgid "Failed to lock ref for update"
msgstr ""
-#: branch.c:314
+#: branch.c:313
msgid "Failed to write ref"
msgstr ""
@@ -250,7 +255,7 @@ msgstr ""
msgid "unrecognized header: %s%s (%d)"
msgstr ""
-#: bundle.c:89 builtin/commit.c:697
+#: bundle.c:89 builtin/commit.c:706
#, c-format
msgid "could not open '%s'"
msgstr ""
@@ -259,9 +264,9 @@ msgstr ""
msgid "Repository lacks these prerequisite commits:"
msgstr ""
-#: bundle.c:164 sequencer.c:661 sequencer.c:1111 builtin/log.c:331
-#: builtin/log.c:801 builtin/log.c:1399 builtin/log.c:1625 builtin/merge.c:364
-#: builtin/shortlog.c:156
+#: bundle.c:164 sequencer.c:662 sequencer.c:1112 builtin/log.c:332
+#: builtin/log.c:821 builtin/log.c:1418 builtin/log.c:1644 builtin/merge.c:364
+#: builtin/shortlog.c:158
msgid "revision walk setup failed"
msgstr ""
@@ -287,7 +292,7 @@ msgstr[1] ""
msgid "rev-list died"
msgstr ""
-#: bundle.c:300 builtin/log.c:1310 builtin/shortlog.c:259
+#: bundle.c:300 builtin/log.c:1329 builtin/shortlog.c:261
#, c-format
msgid "unrecognized argument: %s"
msgstr ""
@@ -435,14 +440,14 @@ msgid ""
"%s"
msgstr ""
-#: diff.c:3487
+#: diff.c:3490
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
"%s"
msgstr ""
-#: diff.c:3501
+#: diff.c:3504
#, c-format
msgid "Failed to parse --submodule option parameter: '%s'"
msgstr ""
@@ -469,17 +474,17 @@ msgstr ""
msgid "failed writing detached signature to '%s': %s"
msgstr ""
-#: grep.c:1623
+#: grep.c:1695
#, c-format
msgid "'%s': unable to read %s"
msgstr ""
-#: grep.c:1640
+#: grep.c:1712
#, c-format
msgid "'%s': %s"
msgstr ""
-#: grep.c:1651
+#: grep.c:1723
#, c-format
msgid "'%s': short read %s"
msgstr ""
@@ -544,8 +549,8 @@ msgstr ""
msgid "failed to read the cache"
msgstr ""
-#: merge.c:110 builtin/checkout.c:365 builtin/checkout.c:566
-#: builtin/clone.c:656
+#: merge.c:110 builtin/checkout.c:358 builtin/checkout.c:559
+#: builtin/clone.c:655
msgid "unable to write new index file"
msgstr ""
@@ -594,7 +599,7 @@ msgstr ""
msgid "blob expected for %s '%s'"
msgstr ""
-#: merge-recursive.c:774 builtin/clone.c:312
+#: merge-recursive.c:774 builtin/clone.c:311
#, c-format
msgid "failed to open '%s'"
msgstr ""
@@ -721,7 +726,7 @@ msgstr ""
msgid "Auto-merging %s"
msgstr ""
-#: merge-recursive.c:1634 git-submodule.sh:1118
+#: merge-recursive.c:1634 git-submodule.sh:1125
msgid "submodule"
msgstr ""
@@ -816,58 +821,121 @@ msgstr ""
msgid "Bad %s value: '%s'"
msgstr ""
-#: object.c:204
+#: object.c:202
#, c-format
msgid "unable to parse object: %s"
msgstr ""
-#: parse-options.c:489
+#: parse-options.c:537
msgid "..."
msgstr ""
-#: parse-options.c:507
+#: parse-options.c:555
#, c-format
msgid "usage: %s"
msgstr ""
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation
-#: parse-options.c:511
+#: parse-options.c:559
#, c-format
msgid " or: %s"
msgstr ""
-#: parse-options.c:514
+#: parse-options.c:562
#, c-format
msgid " %s"
msgstr ""
-#: parse-options.c:548
+#: parse-options.c:596
msgid "-NUM"
msgstr ""
-#: pathspec.c:83
+#: pathspec.c:118
+msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
+msgstr ""
+
+#: pathspec.c:128
+msgid ""
+"global 'literal' pathspec setting is incompatible with all other global "
+"pathspec settings"
+msgstr ""
+
+#: pathspec.c:158
+msgid "invalid parameter for pathspec magic 'prefix'"
+msgstr ""
+
+#: pathspec.c:164
+#, c-format
+msgid "Invalid pathspec magic '%.*s' in '%s'"
+msgstr ""
+
+#: pathspec.c:168
+#, c-format
+msgid "Missing ')' at the end of pathspec magic in '%s'"
+msgstr ""
+
+#: pathspec.c:186
+#, c-format
+msgid "Unimplemented pathspec magic '%c' in '%s'"
+msgstr ""
+
+#: pathspec.c:211
+#, c-format
+msgid "%s: 'literal' and 'glob' are incompatible"
+msgstr ""
+
+#: pathspec.c:222
+#, c-format
+msgid "%s: '%s' is outside repository"
+msgstr ""
+
+#: pathspec.c:278
+#, c-format
+msgid "Pathspec '%s' is in submodule '%.*s'"
+msgstr ""
+
+#.
+#. * We may want to substitute "this command" with a command
+#. * name. E.g. when add--interactive dies when running
+#. * "checkout -p"
+#.
+#: pathspec.c:340
+#, c-format
+msgid "%s: pathspec magic not supported by this command: %s"
+msgstr ""
+
+#: pathspec.c:415
#, c-format
-msgid "Path '%s' is in submodule '%.*s'"
+msgid "pathspec '%s' is beyond a symbolic link"
msgstr ""
-#: pathspec.c:99
+#: remote.c:1833
#, c-format
-msgid "'%s' is beyond a symbolic link"
+msgid "Your branch is based on '%s', but the upstream is gone.\n"
+msgstr ""
+
+#: remote.c:1837
+msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr ""
-#: remote.c:1788
+#: remote.c:1840
+#, c-format
+msgid "Your branch is up-to-date with '%s'.\n"
+msgstr ""
+
+#: remote.c:1844
#, 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:1794
+#: remote.c:1850
msgid " (use \"git push\" to publish your local commits)\n"
msgstr ""
-#: remote.c:1797
+#: remote.c:1853
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
@@ -875,11 +943,11 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: remote.c:1805
+#: remote.c:1861
msgid " (use \"git pull\" to update your local branch)\n"
msgstr ""
-#: remote.c:1808
+#: remote.c:1864
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
@@ -890,7 +958,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: remote.c:1818
+#: remote.c:1874
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr ""
@@ -928,7 +996,7 @@ msgid ""
"and commit the result with 'git commit'"
msgstr ""
-#: sequencer.c:245 sequencer.c:869 sequencer.c:952
+#: sequencer.c:245 sequencer.c:870 sequencer.c:953
#, c-format
msgid "Could not write to %s"
msgstr ""
@@ -951,197 +1019,197 @@ msgid "Commit your changes or stash them to proceed."
msgstr ""
#. TRANSLATORS: %s will be "revert" or "cherry-pick"
-#: sequencer.c:324
+#: sequencer.c:325
#, c-format
msgid "%s: Unable to write new index file"
msgstr ""
-#: sequencer.c:355
+#: sequencer.c:356
msgid "Could not resolve HEAD commit\n"
msgstr ""
-#: sequencer.c:377
+#: sequencer.c:378
msgid "Unable to update cache tree\n"
msgstr ""
-#: sequencer.c:422
+#: sequencer.c:423
#, c-format
msgid "Could not parse commit %s\n"
msgstr ""
-#: sequencer.c:427
+#: sequencer.c:428
#, c-format
msgid "Could not parse parent commit %s\n"
msgstr ""
-#: sequencer.c:493
+#: sequencer.c:494
msgid "Your index file is unmerged."
msgstr ""
-#: sequencer.c:512
+#: sequencer.c:513
#, c-format
msgid "Commit %s is a merge but no -m option was given."
msgstr ""
-#: sequencer.c:520
+#: sequencer.c:521
#, c-format
msgid "Commit %s does not have parent %d"
msgstr ""
-#: sequencer.c:524
+#: sequencer.c:525
#, 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:537
+#: sequencer.c:538
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr ""
-#: sequencer.c:541
+#: sequencer.c:542
#, c-format
msgid "Cannot get commit message for %s"
msgstr ""
-#: sequencer.c:627
+#: sequencer.c:628
#, c-format
msgid "could not revert %s... %s"
msgstr ""
-#: sequencer.c:628
+#: sequencer.c:629
#, c-format
msgid "could not apply %s... %s"
msgstr ""
-#: sequencer.c:664
+#: sequencer.c:665
msgid "empty commit set passed"
msgstr ""
-#: sequencer.c:672
+#: sequencer.c:673
#, c-format
msgid "git %s: failed to read the index"
msgstr ""
-#: sequencer.c:677
+#: sequencer.c:678
#, c-format
msgid "git %s: failed to refresh the index"
msgstr ""
-#: sequencer.c:735
+#: sequencer.c:736
#, c-format
msgid "Cannot %s during a %s"
msgstr ""
-#: sequencer.c:757
+#: sequencer.c:758
#, c-format
msgid "Could not parse line %d."
msgstr ""
-#: sequencer.c:762
+#: sequencer.c:763
msgid "No commits parsed."
msgstr ""
-#: sequencer.c:775
+#: sequencer.c:776
#, c-format
msgid "Could not open %s"
msgstr ""
-#: sequencer.c:779
+#: sequencer.c:780
#, c-format
msgid "Could not read %s."
msgstr ""
-#: sequencer.c:786
+#: sequencer.c:787
#, c-format
msgid "Unusable instruction sheet: %s"
msgstr ""
-#: sequencer.c:814
+#: sequencer.c:815
#, c-format
msgid "Invalid key: %s"
msgstr ""
-#: sequencer.c:817
+#: sequencer.c:818
#, c-format
msgid "Invalid value for %s: %s"
msgstr ""
-#: sequencer.c:829
+#: sequencer.c:830
#, c-format
msgid "Malformed options sheet: %s"
msgstr ""
-#: sequencer.c:850
+#: sequencer.c:851
msgid "a cherry-pick or revert is already in progress"
msgstr ""
-#: sequencer.c:851
+#: sequencer.c:852
msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
msgstr ""
-#: sequencer.c:855
+#: sequencer.c:856
#, c-format
msgid "Could not create sequencer directory %s"
msgstr ""
-#: sequencer.c:871 sequencer.c:956
+#: sequencer.c:872 sequencer.c:957
#, c-format
msgid "Error wrapping up %s."
msgstr ""
-#: sequencer.c:890 sequencer.c:1024
+#: sequencer.c:891 sequencer.c:1025
msgid "no cherry-pick or revert in progress"
msgstr ""
-#: sequencer.c:892
+#: sequencer.c:893
msgid "cannot resolve HEAD"
msgstr ""
-#: sequencer.c:894
+#: sequencer.c:895
msgid "cannot abort from a branch yet to be born"
msgstr ""
-#: sequencer.c:916 builtin/apply.c:4061
+#: sequencer.c:917 builtin/apply.c:4061
#, c-format
msgid "cannot open %s: %s"
msgstr ""
-#: sequencer.c:919
+#: sequencer.c:920
#, c-format
msgid "cannot read %s: %s"
msgstr ""
-#: sequencer.c:920
+#: sequencer.c:921
msgid "unexpected end of file"
msgstr ""
-#: sequencer.c:926
+#: sequencer.c:927
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr ""
-#: sequencer.c:949
+#: sequencer.c:950
#, c-format
msgid "Could not format %s."
msgstr ""
-#: sequencer.c:1092
+#: sequencer.c:1093
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr ""
-#: sequencer.c:1095
+#: sequencer.c:1096
#, c-format
msgid "%s: bad revision"
msgstr ""
-#: sequencer.c:1129
+#: sequencer.c:1130
msgid "Can't revert as initial commit"
msgstr ""
-#: sequencer.c:1130
+#: sequencer.c:1131
msgid "Can't cherry-pick into empty head"
msgstr ""
@@ -1158,360 +1226,453 @@ msgid ""
"running \"git config advice.objectNameWarning false\""
msgstr ""
-#: sha1_name.c:1097
+#: sha1_name.c:1112
msgid "HEAD does not point to a branch"
msgstr ""
-#: sha1_name.c:1100
+#: sha1_name.c:1115
#, c-format
msgid "No such branch: '%s'"
msgstr ""
-#: sha1_name.c:1102
+#: sha1_name.c:1117
#, c-format
msgid "No upstream configured for branch '%s'"
msgstr ""
-#: sha1_name.c:1106
+#: sha1_name.c:1121
#, c-format
msgid "Upstream branch '%s' not stored as a remote-tracking branch"
msgstr ""
-#: wrapper.c:408
+#: submodule.c:64 submodule.c:98
+msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
+msgstr ""
+
+#: submodule.c:68 submodule.c:102
+#, c-format
+msgid "Could not find section in .gitmodules where path=%s"
+msgstr ""
+
+#. Maybe the user already did that, don't error out here
+#: submodule.c:76
+#, c-format
+msgid "Could not update .gitmodules entry %s"
+msgstr ""
+
+#. Maybe the user already did that, don't error out here
+#: submodule.c:109
+#, c-format
+msgid "Could not remove .gitmodules entry for %s"
+msgstr ""
+
+#: submodule.c:127
+msgid "could not find .gitmodules in index"
+msgstr ""
+
+#: submodule.c:133
+msgid "reading updated .gitmodules failed"
+msgstr ""
+
+#: submodule.c:135
+msgid "unable to stat updated .gitmodules"
+msgstr ""
+
+#: submodule.c:139
+msgid "unable to remove .gitmodules from index"
+msgstr ""
+
+#: submodule.c:141
+msgid "adding updated .gitmodules failed"
+msgstr ""
+
+#: submodule.c:143
+msgid "staging updated .gitmodules failed"
+msgstr ""
+
+#: submodule.c:1144 builtin/init-db.c:363
+#, c-format
+msgid "Could not create git link %s"
+msgstr ""
+
+#: submodule.c:1155
+#, c-format
+msgid "Could not set core.worktree in %s"
+msgstr ""
+
+#: urlmatch.c:120
+msgid "invalid URL scheme name or missing '://' suffix"
+msgstr ""
+
+#: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356
+#, c-format
+msgid "invalid %XX escape sequence"
+msgstr ""
+
+#: urlmatch.c:172
+msgid "missing host and scheme is not 'file:'"
+msgstr ""
+
+#: urlmatch.c:189
+msgid "a 'file:' URL may not have a port number"
+msgstr ""
+
+#: urlmatch.c:199
+msgid "invalid characters in host name"
+msgstr ""
+
+#: urlmatch.c:244 urlmatch.c:255
+msgid "invalid port number"
+msgstr ""
+
+#: urlmatch.c:322
+msgid "invalid '..' path segment"
+msgstr ""
+
+#: wrapper.c:422
#, c-format
msgid "unable to access '%s': %s"
msgstr ""
-#: wrapper.c:429
+#: wrapper.c:443
#, c-format
msgid "unable to access '%s'"
msgstr ""
-#: wrapper.c:440
+#: wrapper.c:454
#, c-format
msgid "unable to look up current user in the passwd file: %s"
msgstr ""
-#: wrapper.c:441
+#: wrapper.c:455
msgid "no such user"
msgstr ""
-#: wt-status.c:141
+#: wt-status.c:146
msgid "Unmerged paths:"
msgstr ""
-#: wt-status.c:168 wt-status.c:195
+#: wt-status.c:173 wt-status.c:200
#, c-format
msgid " (use \"git reset %s <file>...\" to unstage)"
msgstr ""
-#: wt-status.c:170 wt-status.c:197
+#: wt-status.c:175 wt-status.c:202
msgid " (use \"git rm --cached <file>...\" to unstage)"
msgstr ""
-#: wt-status.c:174
+#: wt-status.c:179
msgid " (use \"git add <file>...\" to mark resolution)"
msgstr ""
-#: wt-status.c:176 wt-status.c:180
+#: wt-status.c:181 wt-status.c:185
msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
msgstr ""
-#: wt-status.c:178
+#: wt-status.c:183
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr ""
-#: wt-status.c:189
+#: wt-status.c:194
msgid "Changes to be committed:"
msgstr ""
-#: wt-status.c:207
+#: wt-status.c:212
msgid "Changes not staged for commit:"
msgstr ""
-#: wt-status.c:211
+#: wt-status.c:216
msgid " (use \"git add <file>...\" to update what will be committed)"
msgstr ""
-#: wt-status.c:213
+#: wt-status.c:218
msgid " (use \"git add/rm <file>...\" to update what will be committed)"
msgstr ""
-#: wt-status.c:214
+#: wt-status.c:219
msgid ""
" (use \"git checkout -- <file>...\" to discard changes in working directory)"
msgstr ""
-#: wt-status.c:216
+#: wt-status.c:221
msgid " (commit or discard the untracked or modified content in submodules)"
msgstr ""
-#: wt-status.c:228
+#: wt-status.c:233
#, c-format
msgid " (use \"git %s <file>...\" to include in what will be committed)"
msgstr ""
-#: wt-status.c:245
+#: wt-status.c:250
msgid "bug"
msgstr ""
-#: wt-status.c:250
+#: wt-status.c:255
msgid "both deleted:"
msgstr ""
-#: wt-status.c:251
+#: wt-status.c:256
msgid "added by us:"
msgstr ""
-#: wt-status.c:252
+#: wt-status.c:257
msgid "deleted by them:"
msgstr ""
-#: wt-status.c:253
+#: wt-status.c:258
msgid "added by them:"
msgstr ""
-#: wt-status.c:254
+#: wt-status.c:259
msgid "deleted by us:"
msgstr ""
-#: wt-status.c:255
+#: wt-status.c:260
msgid "both added:"
msgstr ""
-#: wt-status.c:256
+#: wt-status.c:261
msgid "both modified:"
msgstr ""
-#: wt-status.c:286
+#: wt-status.c:291
msgid "new commits, "
msgstr ""
-#: wt-status.c:288
+#: wt-status.c:293
msgid "modified content, "
msgstr ""
-#: wt-status.c:290
+#: wt-status.c:295
msgid "untracked content, "
msgstr ""
-#: wt-status.c:307
+#: wt-status.c:312
#, c-format
msgid "new file: %s"
msgstr ""
-#: wt-status.c:310
+#: wt-status.c:315
#, c-format
msgid "copied: %s -> %s"
msgstr ""
-#: wt-status.c:313
+#: wt-status.c:318
#, c-format
msgid "deleted: %s"
msgstr ""
-#: wt-status.c:316
+#: wt-status.c:321
#, c-format
msgid "modified: %s"
msgstr ""
-#: wt-status.c:319
+#: wt-status.c:324
#, c-format
msgid "renamed: %s -> %s"
msgstr ""
-#: wt-status.c:322
+#: wt-status.c:327
#, c-format
msgid "typechange: %s"
msgstr ""
-#: wt-status.c:325
+#: wt-status.c:330
#, c-format
msgid "unknown: %s"
msgstr ""
-#: wt-status.c:328
+#: wt-status.c:333
#, c-format
msgid "unmerged: %s"
msgstr ""
-#: wt-status.c:331
+#: wt-status.c:336
#, c-format
msgid "bug: unhandled diff status %c"
msgstr ""
-#: wt-status.c:803
+#: wt-status.c:703
+msgid "Submodules changed but not updated:"
+msgstr ""
+
+#: wt-status.c:705
+msgid "Submodule changes to be committed:"
+msgstr ""
+
+#: wt-status.c:848
msgid "You have unmerged paths."
msgstr ""
-#: wt-status.c:806
+#: wt-status.c:851
msgid " (fix conflicts and run \"git commit\")"
msgstr ""
-#: wt-status.c:809
+#: wt-status.c:854
msgid "All conflicts fixed but you are still merging."
msgstr ""
-#: wt-status.c:812
+#: wt-status.c:857
msgid " (use \"git commit\" to conclude merge)"
msgstr ""
-#: wt-status.c:822
+#: wt-status.c:867
msgid "You are in the middle of an am session."
msgstr ""
-#: wt-status.c:825
+#: wt-status.c:870
msgid "The current patch is empty."
msgstr ""
-#: wt-status.c:829
+#: wt-status.c:874
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr ""
-#: wt-status.c:831
+#: wt-status.c:876
msgid " (use \"git am --skip\" to skip this patch)"
msgstr ""
-#: wt-status.c:833
+#: wt-status.c:878
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr ""
-#: wt-status.c:893 wt-status.c:910
+#: wt-status.c:938 wt-status.c:955
#, c-format
msgid "You are currently rebasing branch '%s' on '%s'."
msgstr ""
-#: wt-status.c:898 wt-status.c:915
+#: wt-status.c:943 wt-status.c:960
msgid "You are currently rebasing."
msgstr ""
-#: wt-status.c:901
+#: wt-status.c:946
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr ""
-#: wt-status.c:903
+#: wt-status.c:948
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr ""
-#: wt-status.c:905
+#: wt-status.c:950
msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr ""
-#: wt-status.c:918
+#: wt-status.c:963
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr ""
-#: wt-status.c:922
+#: wt-status.c:967
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
msgstr ""
-#: wt-status.c:927
+#: wt-status.c:972
msgid "You are currently splitting a commit during a rebase."
msgstr ""
-#: wt-status.c:930
+#: wt-status.c:975
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr ""
-#: wt-status.c:934
+#: wt-status.c:979
#, c-format
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr ""
-#: wt-status.c:939
+#: wt-status.c:984
msgid "You are currently editing a commit during a rebase."
msgstr ""
-#: wt-status.c:942
+#: wt-status.c:987
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr ""
-#: wt-status.c:944
+#: wt-status.c:989
msgid ""
" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr ""
-#: wt-status.c:954
-msgid "You are currently cherry-picking."
+#: wt-status.c:999
+#, c-format
+msgid "You are currently cherry-picking commit %s."
msgstr ""
-#: wt-status.c:958
+#: wt-status.c:1004
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr ""
-#: wt-status.c:961
+#: wt-status.c:1007
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr ""
-#: wt-status.c:963
+#: wt-status.c:1009
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr ""
-#: wt-status.c:972
+#: wt-status.c:1018
#, c-format
msgid "You are currently reverting commit %s."
msgstr ""
-#: wt-status.c:977
+#: wt-status.c:1023
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr ""
-#: wt-status.c:980
+#: wt-status.c:1026
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr ""
-#: wt-status.c:982
+#: wt-status.c:1028
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr ""
-#: wt-status.c:993
+#: wt-status.c:1039
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
msgstr ""
-#: wt-status.c:997
+#: wt-status.c:1043
msgid "You are currently bisecting."
msgstr ""
-#: wt-status.c:1000
+#: wt-status.c:1046
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr ""
-#: wt-status.c:1173
+#: wt-status.c:1221
msgid "On branch "
msgstr ""
-#: wt-status.c:1180
+#: wt-status.c:1228
msgid "rebase in progress; onto "
msgstr ""
-#: wt-status.c:1187
+#: wt-status.c:1235
msgid "HEAD detached at "
msgstr ""
-#: wt-status.c:1189
+#: wt-status.c:1237
msgid "HEAD detached from "
msgstr ""
-#: wt-status.c:1192
+#: wt-status.c:1240
msgid "Not currently on any branch."
msgstr ""
-#: wt-status.c:1209
+#: wt-status.c:1257
msgid "Initial commit"
msgstr ""
-#: wt-status.c:1223
+#: wt-status.c:1271
msgid "Untracked files"
msgstr ""
-#: wt-status.c:1225
+#: wt-status.c:1273
msgid "Ignored files"
msgstr ""
-#: wt-status.c:1229
+#: wt-status.c:1277
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -1519,82 +1680,86 @@ msgid ""
"new files yourself (see 'git help status')."
msgstr ""
-#: wt-status.c:1235
+#: wt-status.c:1283
#, c-format
msgid "Untracked files not listed%s"
msgstr ""
-#: wt-status.c:1237
+#: wt-status.c:1285
msgid " (use -u option to show untracked files)"
msgstr ""
-#: wt-status.c:1243
+#: wt-status.c:1291
msgid "No changes"
msgstr ""
-#: wt-status.c:1248
+#: wt-status.c:1296
#, c-format
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr ""
-#: wt-status.c:1251
+#: wt-status.c:1299
#, c-format
msgid "no changes added to commit\n"
msgstr ""
-#: wt-status.c:1254
+#: wt-status.c:1302
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
"track)\n"
msgstr ""
-#: wt-status.c:1257
+#: wt-status.c:1305
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr ""
-#: wt-status.c:1260
+#: wt-status.c:1308
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr ""
-#: wt-status.c:1263 wt-status.c:1268
+#: wt-status.c:1311 wt-status.c:1316
#, c-format
msgid "nothing to commit\n"
msgstr ""
-#: wt-status.c:1266
+#: wt-status.c:1314
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr ""
-#: wt-status.c:1270
+#: wt-status.c:1318
#, c-format
msgid "nothing to commit, working directory clean\n"
msgstr ""
-#: wt-status.c:1378
+#: wt-status.c:1427
msgid "HEAD (no branch)"
msgstr ""
-#: wt-status.c:1384
+#: wt-status.c:1433
msgid "Initial commit on "
msgstr ""
-#: wt-status.c:1399
+#: wt-status.c:1463
+msgid "gone"
+msgstr ""
+
+#: wt-status.c:1465
msgid "behind "
msgstr ""
-#: wt-status.c:1402 wt-status.c:1405
+#: wt-status.c:1468 wt-status.c:1471
msgid "ahead "
msgstr ""
-#: wt-status.c:1407
+#: wt-status.c:1473
msgid ", behind "
msgstr ""
-#: compat/precompose_utf8.c:58 builtin/clone.c:351
+#: compat/precompose_utf8.c:55 builtin/clone.c:350
#, c-format
msgid "failed to unlink '%s'"
msgstr ""
@@ -1654,7 +1819,7 @@ msgstr ""
msgid "unexpected diff status %c"
msgstr ""
-#: builtin/add.c:149 builtin/commit.c:252
+#: builtin/add.c:149 builtin/commit.c:260
msgid "updating files failed"
msgstr ""
@@ -1663,140 +1828,135 @@ msgstr ""
msgid "remove '%s'\n"
msgstr ""
-#: builtin/add.c:253
+#: builtin/add.c:237
msgid "Unstaged changes after refreshing the index:"
msgstr ""
-#: builtin/add.c:256 builtin/add.c:573 builtin/rm.c:337
-#, c-format
-msgid "pathspec '%s' did not match any files"
-msgstr ""
-
-#: builtin/add.c:339
+#: builtin/add.c:299
msgid "Could not read the index"
msgstr ""
-#: builtin/add.c:350
+#: builtin/add.c:310
#, c-format
msgid "Could not open '%s' for writing."
msgstr ""
-#: builtin/add.c:354
+#: builtin/add.c:314
msgid "Could not write patch"
msgstr ""
-#: builtin/add.c:359
+#: builtin/add.c:319
#, c-format
msgid "Could not stat '%s'"
msgstr ""
-#: builtin/add.c:361
+#: builtin/add.c:321
msgid "Empty patch. Aborted."
msgstr ""
-#: builtin/add.c:367
+#: builtin/add.c:327
#, c-format
msgid "Could not apply '%s'"
msgstr ""
-#: builtin/add.c:377
+#: builtin/add.c:337
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr ""
-#: builtin/add.c:394 builtin/clean.c:875 builtin/fetch.c:78 builtin/mv.c:63
-#: builtin/prune-packed.c:73 builtin/push.c:451 builtin/remote.c:1253
-#: builtin/rm.c:268
+#: builtin/add.c:354 builtin/clean.c:875 builtin/fetch.c:92 builtin/mv.c:66
+#: builtin/prune-packed.c:73 builtin/push.c:459 builtin/remote.c:1253
+#: builtin/rm.c:269
msgid "dry run"
msgstr ""
-#: builtin/add.c:395 builtin/apply.c:4410 builtin/check-ignore.c:19
-#: builtin/commit.c:1220 builtin/count-objects.c:95 builtin/fsck.c:613
-#: builtin/log.c:1573 builtin/mv.c:62 builtin/read-tree.c:113
+#: builtin/add.c:355 builtin/apply.c:4410 builtin/check-ignore.c:19
+#: builtin/commit.c:1249 builtin/count-objects.c:95 builtin/fsck.c:612
+#: builtin/log.c:1592 builtin/mv.c:65 builtin/read-tree.c:113
msgid "be verbose"
msgstr ""
-#: builtin/add.c:397
+#: builtin/add.c:357
msgid "interactive picking"
msgstr ""
-#: builtin/add.c:398 builtin/checkout.c:1073 builtin/reset.c:261
+#: builtin/add.c:358 builtin/checkout.c:1109 builtin/reset.c:272
msgid "select hunks interactively"
msgstr ""
-#: builtin/add.c:399
+#: builtin/add.c:359
msgid "edit current diff and apply"
msgstr ""
-#: builtin/add.c:400
+#: builtin/add.c:360
msgid "allow adding otherwise ignored files"
msgstr ""
-#: builtin/add.c:401
+#: builtin/add.c:361
msgid "update tracked files"
msgstr ""
-#: builtin/add.c:402
+#: builtin/add.c:362
msgid "record only the fact that the path will be added later"
msgstr ""
-#: builtin/add.c:403
+#: builtin/add.c:363
msgid "add changes from all tracked and untracked files"
msgstr ""
#. takes no arguments
-#: builtin/add.c:406
+#: builtin/add.c:366
msgid "ignore paths removed in the working tree (same as --no-all)"
msgstr ""
-#: builtin/add.c:408
+#: builtin/add.c:368
msgid "don't add, only refresh the index"
msgstr ""
-#: builtin/add.c:409
+#: builtin/add.c:369
msgid "just skip files which cannot be added because of errors"
msgstr ""
-#: builtin/add.c:410
+#: builtin/add.c:370
msgid "check if - even missing - files are ignored in dry run"
msgstr ""
-#: builtin/add.c:432
+#: builtin/add.c:392
#, c-format
msgid "Use -f if you really want to add them.\n"
msgstr ""
-#: builtin/add.c:433
+#: builtin/add.c:393
msgid "no files added"
msgstr ""
-#: builtin/add.c:439
+#: builtin/add.c:399
msgid "adding files failed"
msgstr ""
-#: builtin/add.c:478
+#: builtin/add.c:438
msgid "-A and -u are mutually incompatible"
msgstr ""
-#: builtin/add.c:496
+#: builtin/add.c:456
msgid "Option --ignore-missing can only be used together with --dry-run"
msgstr ""
-#: builtin/add.c:526
+#: builtin/add.c:486
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr ""
-#: builtin/add.c:527
+#: builtin/add.c:487
#, c-format
msgid "Maybe you wanted to say 'git add .'?\n"
msgstr ""
-#: builtin/add.c:533 builtin/check-ignore.c:161 builtin/clean.c:919
-#: builtin/commit.c:312 builtin/mv.c:82 builtin/rm.c:297
+#: builtin/add.c:492 builtin/check-ignore.c:172 builtin/clean.c:919
+#: builtin/commit.c:320 builtin/mv.c:86 builtin/reset.c:224 builtin/rm.c:299
msgid "index file corrupt"
msgstr ""
-#: builtin/add.c:605 builtin/apply.c:4506 builtin/mv.c:229 builtin/rm.c:432
+#: builtin/add.c:589 builtin/apply.c:4506 builtin/mv.c:259 builtin/rm.c:432
msgid "Unable to write new index file"
msgstr ""
@@ -2042,7 +2202,7 @@ msgstr ""
msgid "Checking patch %s..."
msgstr ""
-#: builtin/apply.c:3680 builtin/checkout.c:216 builtin/reset.c:127
+#: builtin/apply.c:3680 builtin/checkout.c:213 builtin/reset.c:127
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr ""
@@ -2122,8 +2282,8 @@ msgstr ""
msgid "unable to read index file"
msgstr ""
-#: builtin/apply.c:4357 builtin/apply.c:4360 builtin/clone.c:91
-#: builtin/fetch.c:63
+#: builtin/apply.c:4357 builtin/apply.c:4360 builtin/clone.c:90
+#: builtin/fetch.c:77
msgid "path"
msgstr ""
@@ -2183,7 +2343,7 @@ msgstr ""
msgid "build a temporary index based on embedded index information"
msgstr ""
-#: builtin/apply.c:4389 builtin/checkout-index.c:197 builtin/ls-files.c:462
+#: builtin/apply.c:4389 builtin/checkout-index.c:197 builtin/ls-files.c:452
msgid "paths are separated with NUL character"
msgstr ""
@@ -2313,103 +2473,103 @@ msgstr ""
msgid "update BISECT_HEAD instead of checking out the current commit"
msgstr ""
-#: builtin/blame.c:26
+#: builtin/blame.c:27
msgid "git blame [options] [rev-opts] [rev] [--] file"
msgstr ""
-#: builtin/blame.c:31
+#: builtin/blame.c:32
msgid "[rev-opts] are documented in git-rev-list(1)"
msgstr ""
-#: builtin/blame.c:2276
+#: builtin/blame.c:2248
msgid "Show blame entries as we find them, incrementally"
msgstr ""
-#: builtin/blame.c:2277
+#: builtin/blame.c:2249
msgid "Show blank SHA-1 for boundary commits (Default: off)"
msgstr ""
-#: builtin/blame.c:2278
+#: builtin/blame.c:2250
msgid "Do not treat root commits as boundaries (Default: off)"
msgstr ""
-#: builtin/blame.c:2279
+#: builtin/blame.c:2251
msgid "Show work cost statistics"
msgstr ""
-#: builtin/blame.c:2280
+#: builtin/blame.c:2252
msgid "Show output score for blame entries"
msgstr ""
-#: builtin/blame.c:2281
+#: builtin/blame.c:2253
msgid "Show original filename (Default: auto)"
msgstr ""
-#: builtin/blame.c:2282
+#: builtin/blame.c:2254
msgid "Show original linenumber (Default: off)"
msgstr ""
-#: builtin/blame.c:2283
+#: builtin/blame.c:2255
msgid "Show in a format designed for machine consumption"
msgstr ""
-#: builtin/blame.c:2284
+#: builtin/blame.c:2256
msgid "Show porcelain format with per-line commit information"
msgstr ""
-#: builtin/blame.c:2285
+#: builtin/blame.c:2257
msgid "Use the same output mode as git-annotate (Default: off)"
msgstr ""
-#: builtin/blame.c:2286
+#: builtin/blame.c:2258
msgid "Show raw timestamp (Default: off)"
msgstr ""
-#: builtin/blame.c:2287
+#: builtin/blame.c:2259
msgid "Show long commit SHA1 (Default: off)"
msgstr ""
-#: builtin/blame.c:2288
+#: builtin/blame.c:2260
msgid "Suppress author name and timestamp (Default: off)"
msgstr ""
-#: builtin/blame.c:2289
+#: builtin/blame.c:2261
msgid "Show author email instead of name (Default: off)"
msgstr ""
-#: builtin/blame.c:2290
+#: builtin/blame.c:2262
msgid "Ignore whitespace differences"
msgstr ""
-#: builtin/blame.c:2291
+#: builtin/blame.c:2263
msgid "Spend extra cycles to find better match"
msgstr ""
-#: builtin/blame.c:2292
+#: builtin/blame.c:2264
msgid "Use revisions from <file> instead of calling git-rev-list"
msgstr ""
-#: builtin/blame.c:2293
+#: builtin/blame.c:2265
msgid "Use <file>'s contents as the final image"
msgstr ""
-#: builtin/blame.c:2294 builtin/blame.c:2295
+#: builtin/blame.c:2266 builtin/blame.c:2267
msgid "score"
msgstr ""
-#: builtin/blame.c:2294
+#: builtin/blame.c:2266
msgid "Find line copies within and across files"
msgstr ""
-#: builtin/blame.c:2295
+#: builtin/blame.c:2267
msgid "Find line movements within and across files"
msgstr ""
-#: builtin/blame.c:2296
+#: builtin/blame.c:2268
msgid "n,m"
msgstr ""
-#: builtin/blame.c:2296
+#: builtin/blame.c:2268
msgid "Process only line range n,m, counting from 1"
msgstr ""
@@ -2509,280 +2669,290 @@ msgstr ""
#: builtin/branch.c:453
#, c-format
+msgid "[%s: gone]"
+msgstr ""
+
+#: builtin/branch.c:456
+#, c-format
+msgid "[%s]"
+msgstr ""
+
+#: builtin/branch.c:459
+#, c-format
msgid "[%s: behind %d]"
msgstr ""
-#: builtin/branch.c:455
+#: builtin/branch.c:461
#, c-format
msgid "[behind %d]"
msgstr ""
-#: builtin/branch.c:459
+#: builtin/branch.c:465
#, c-format
msgid "[%s: ahead %d]"
msgstr ""
-#: builtin/branch.c:461
+#: builtin/branch.c:467
#, c-format
msgid "[ahead %d]"
msgstr ""
-#: builtin/branch.c:464
+#: builtin/branch.c:470
#, c-format
msgid "[%s: ahead %d, behind %d]"
msgstr ""
-#: builtin/branch.c:467
+#: builtin/branch.c:473
#, c-format
msgid "[ahead %d, behind %d]"
msgstr ""
-#: builtin/branch.c:490
+#: builtin/branch.c:496
msgid " **** invalid ref ****"
msgstr ""
-#: builtin/branch.c:582
+#: builtin/branch.c:588
#, c-format
msgid "(no branch, rebasing %s)"
msgstr ""
-#: builtin/branch.c:585
+#: builtin/branch.c:591
#, c-format
msgid "(no branch, bisect started on %s)"
msgstr ""
-#: builtin/branch.c:588
+#: builtin/branch.c:594
#, c-format
msgid "(detached from %s)"
msgstr ""
-#: builtin/branch.c:591
+#: builtin/branch.c:597
msgid "(no branch)"
msgstr ""
-#: builtin/branch.c:637
+#: builtin/branch.c:643
#, c-format
msgid "object '%s' does not point to a commit"
msgstr ""
-#: builtin/branch.c:669
+#: builtin/branch.c:675
msgid "some refs could not be read"
msgstr ""
-#: builtin/branch.c:682
+#: builtin/branch.c:688
msgid "cannot rename the current branch while not on any."
msgstr ""
-#: builtin/branch.c:692
+#: builtin/branch.c:698
#, c-format
msgid "Invalid branch name: '%s'"
msgstr ""
-#: builtin/branch.c:707
+#: builtin/branch.c:713
msgid "Branch rename failed"
msgstr ""
-#: builtin/branch.c:711
+#: builtin/branch.c:717
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr ""
-#: builtin/branch.c:715
+#: builtin/branch.c:721
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr ""
-#: builtin/branch.c:722
+#: builtin/branch.c:728
msgid "Branch is renamed, but update of config-file failed"
msgstr ""
-#: builtin/branch.c:737
+#: builtin/branch.c:743
#, c-format
msgid "malformed object name %s"
msgstr ""
-#: builtin/branch.c:761
+#: builtin/branch.c:767
#, c-format
msgid "could not write branch description template: %s"
msgstr ""
-#: builtin/branch.c:791
+#: builtin/branch.c:797
msgid "Generic options"
msgstr ""
-#: builtin/branch.c:793
+#: builtin/branch.c:799
msgid "show hash and subject, give twice for upstream branch"
msgstr ""
-#: builtin/branch.c:794
+#: builtin/branch.c:800
msgid "suppress informational messages"
msgstr ""
-#: builtin/branch.c:795
+#: builtin/branch.c:801
msgid "set up tracking mode (see git-pull(1))"
msgstr ""
-#: builtin/branch.c:797
+#: builtin/branch.c:803
msgid "change upstream info"
msgstr ""
-#: builtin/branch.c:801
+#: builtin/branch.c:807
msgid "use colored output"
msgstr ""
-#: builtin/branch.c:802
+#: builtin/branch.c:808
msgid "act on remote-tracking branches"
msgstr ""
-#: builtin/branch.c:805 builtin/branch.c:811 builtin/branch.c:832
-#: builtin/branch.c:838 builtin/commit.c:1433 builtin/commit.c:1434
-#: builtin/commit.c:1435 builtin/commit.c:1436 builtin/tag.c:468
+#: builtin/branch.c:811 builtin/branch.c:817 builtin/branch.c:838
+#: builtin/branch.c:844 builtin/commit.c:1460 builtin/commit.c:1461
+#: builtin/commit.c:1462 builtin/commit.c:1463 builtin/tag.c:468
msgid "commit"
msgstr ""
-#: builtin/branch.c:806 builtin/branch.c:812
+#: builtin/branch.c:812 builtin/branch.c:818
msgid "print only branches that contain the commit"
msgstr ""
-#: builtin/branch.c:818
+#: builtin/branch.c:824
msgid "Specific git-branch actions:"
msgstr ""
-#: builtin/branch.c:819
+#: builtin/branch.c:825
msgid "list both remote-tracking and local branches"
msgstr ""
-#: builtin/branch.c:821
+#: builtin/branch.c:827
msgid "delete fully merged branch"
msgstr ""
-#: builtin/branch.c:822
+#: builtin/branch.c:828
msgid "delete branch (even if not merged)"
msgstr ""
-#: builtin/branch.c:823
+#: builtin/branch.c:829
msgid "move/rename a branch and its reflog"
msgstr ""
-#: builtin/branch.c:824
+#: builtin/branch.c:830
msgid "move/rename a branch, even if target exists"
msgstr ""
-#: builtin/branch.c:825
+#: builtin/branch.c:831
msgid "list branch names"
msgstr ""
-#: builtin/branch.c:826
+#: builtin/branch.c:832
msgid "create the branch's reflog"
msgstr ""
-#: builtin/branch.c:828
+#: builtin/branch.c:834
msgid "edit the description for the branch"
msgstr ""
-#: builtin/branch.c:829
+#: builtin/branch.c:835
msgid "force creation (when already exists)"
msgstr ""
-#: builtin/branch.c:832
+#: builtin/branch.c:838
msgid "print only not merged branches"
msgstr ""
-#: builtin/branch.c:838
+#: builtin/branch.c:844
msgid "print only merged branches"
msgstr ""
-#: builtin/branch.c:842
+#: builtin/branch.c:848
msgid "list branches in columns"
msgstr ""
-#: builtin/branch.c:855
+#: builtin/branch.c:861
msgid "Failed to resolve HEAD as a valid ref."
msgstr ""
-#: builtin/branch.c:860 builtin/clone.c:630
+#: builtin/branch.c:866 builtin/clone.c:629
msgid "HEAD not found below refs/heads!"
msgstr ""
-#: builtin/branch.c:883
+#: builtin/branch.c:890
msgid "--column and --verbose are incompatible"
msgstr ""
-#: builtin/branch.c:889 builtin/branch.c:928
+#: builtin/branch.c:896 builtin/branch.c:935
msgid "branch name required"
msgstr ""
-#: builtin/branch.c:904
+#: builtin/branch.c:911
msgid "Cannot give description to detached HEAD"
msgstr ""
-#: builtin/branch.c:909
+#: builtin/branch.c:916
msgid "cannot edit description of more than one branch"
msgstr ""
-#: builtin/branch.c:916
+#: builtin/branch.c:923
#, c-format
msgid "No commit on branch '%s' yet."
msgstr ""
-#: builtin/branch.c:919
+#: builtin/branch.c:926
#, c-format
msgid "No branch named '%s'."
msgstr ""
-#: builtin/branch.c:934
+#: builtin/branch.c:941
msgid "too many branches for a rename operation"
msgstr ""
-#: builtin/branch.c:939
+#: builtin/branch.c:946
msgid "too many branches to set new upstream"
msgstr ""
-#: builtin/branch.c:943
+#: builtin/branch.c:950
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
msgstr ""
-#: builtin/branch.c:946 builtin/branch.c:968 builtin/branch.c:990
+#: builtin/branch.c:953 builtin/branch.c:975 builtin/branch.c:997
#, c-format
msgid "no such branch '%s'"
msgstr ""
-#: builtin/branch.c:950
+#: builtin/branch.c:957
#, c-format
msgid "branch '%s' does not exist"
msgstr ""
-#: builtin/branch.c:962
+#: builtin/branch.c:969
msgid "too many branches to unset upstream"
msgstr ""
-#: builtin/branch.c:966
+#: builtin/branch.c:973
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr ""
-#: builtin/branch.c:972
+#: builtin/branch.c:979
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr ""
-#: builtin/branch.c:987
+#: builtin/branch.c:994
msgid "it does not make sense to create 'HEAD' manually"
msgstr ""
-#: builtin/branch.c:993
+#: builtin/branch.c:1000
msgid "-a and -r options to 'git branch' do not make sense with a branch name"
msgstr ""
-#: builtin/branch.c:996
+#: builtin/branch.c:1003
#, c-format
msgid ""
"The --set-upstream flag is deprecated and will be removed. Consider using --"
"track or --set-upstream-to\n"
msgstr ""
-#: builtin/branch.c:1013
+#: builtin/branch.c:1020
#, c-format
msgid ""
"\n"
@@ -2790,12 +2960,12 @@ msgid ""
"\n"
msgstr ""
-#: builtin/branch.c:1014
+#: builtin/branch.c:1021
#, c-format
msgid " git branch -d %s\n"
msgstr ""
-#: builtin/branch.c:1015
+#: builtin/branch.c:1022
#, c-format
msgid " git branch --set-upstream-to %s\n"
msgstr ""
@@ -2813,43 +2983,43 @@ msgstr ""
msgid "Need a repository to unbundle."
msgstr ""
-#: builtin/cat-file.c:285
+#: builtin/cat-file.c:312
msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>"
msgstr ""
-#: builtin/cat-file.c:286
+#: builtin/cat-file.c:313
msgid "git cat-file (--batch|--batch-check) < <list_of_objects>"
msgstr ""
-#: builtin/cat-file.c:323
+#: builtin/cat-file.c:350
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr ""
-#: builtin/cat-file.c:324
+#: builtin/cat-file.c:351
msgid "show object type"
msgstr ""
-#: builtin/cat-file.c:325
+#: builtin/cat-file.c:352
msgid "show object size"
msgstr ""
-#: builtin/cat-file.c:327
+#: builtin/cat-file.c:354
msgid "exit with zero when there's no error"
msgstr ""
-#: builtin/cat-file.c:328
+#: builtin/cat-file.c:355
msgid "pretty-print object's content"
msgstr ""
-#: builtin/cat-file.c:330
+#: builtin/cat-file.c:357
msgid "for blob objects, run textconv on object's content"
msgstr ""
-#: builtin/cat-file.c:332
+#: builtin/cat-file.c:359
msgid "show info and content of objects fed from the standard input"
msgstr ""
-#: builtin/cat-file.c:335
+#: builtin/cat-file.c:362
msgid "show info about objects fed from the standard input"
msgstr ""
@@ -2874,10 +3044,10 @@ msgid "read file names from stdin"
msgstr ""
#: builtin/check-attr.c:23 builtin/check-ignore.c:24
-msgid "input paths are terminated by a null character"
+msgid "terminate input and output records by a NUL character"
msgstr ""
-#: builtin/check-ignore.c:18 builtin/checkout.c:1054 builtin/gc.c:177
+#: builtin/check-ignore.c:18 builtin/checkout.c:1090 builtin/gc.c:259
msgid "suppress progress reporting"
msgstr ""
@@ -2885,27 +3055,31 @@ msgstr ""
msgid "show non-matching input paths"
msgstr ""
-#: builtin/check-ignore.c:143
+#: builtin/check-ignore.c:28
+msgid "ignore index when checking"
+msgstr ""
+
+#: builtin/check-ignore.c:154
msgid "cannot specify pathnames with --stdin"
msgstr ""
-#: builtin/check-ignore.c:146
+#: builtin/check-ignore.c:157
msgid "-z only makes sense with --stdin"
msgstr ""
-#: builtin/check-ignore.c:148
+#: builtin/check-ignore.c:159
msgid "no path specified"
msgstr ""
-#: builtin/check-ignore.c:152
+#: builtin/check-ignore.c:163
msgid "--quiet is only valid with a single pathname"
msgstr ""
-#: builtin/check-ignore.c:154
+#: builtin/check-ignore.c:165
msgid "cannot have both --quiet and --verbose"
msgstr ""
-#: builtin/check-ignore.c:157
+#: builtin/check-ignore.c:168
msgid "--non-matching is only valid with --verbose"
msgstr ""
@@ -2978,106 +3152,106 @@ msgstr ""
msgid "git checkout [options] [<branch>] -- <file>..."
msgstr ""
-#: builtin/checkout.c:117 builtin/checkout.c:150
+#: builtin/checkout.c:114 builtin/checkout.c:147
#, c-format
msgid "path '%s' does not have our version"
msgstr ""
-#: builtin/checkout.c:119 builtin/checkout.c:152
+#: builtin/checkout.c:116 builtin/checkout.c:149
#, c-format
msgid "path '%s' does not have their version"
msgstr ""
-#: builtin/checkout.c:135
+#: builtin/checkout.c:132
#, c-format
msgid "path '%s' does not have all necessary versions"
msgstr ""
-#: builtin/checkout.c:179
+#: builtin/checkout.c:176
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr ""
-#: builtin/checkout.c:196
+#: builtin/checkout.c:193
#, c-format
msgid "path '%s': cannot merge"
msgstr ""
-#: builtin/checkout.c:213
+#: builtin/checkout.c:210
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr ""
-#: builtin/checkout.c:237 builtin/checkout.c:240 builtin/checkout.c:243
-#: builtin/checkout.c:246
+#: builtin/checkout.c:232 builtin/checkout.c:235 builtin/checkout.c:238
+#: builtin/checkout.c:241
#, c-format
msgid "'%s' cannot be used with updating paths"
msgstr ""
-#: builtin/checkout.c:249 builtin/checkout.c:252
+#: builtin/checkout.c:244 builtin/checkout.c:247
#, c-format
msgid "'%s' cannot be used with %s"
msgstr ""
-#: builtin/checkout.c:255
+#: builtin/checkout.c:250
#, c-format
msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr ""
-#: builtin/checkout.c:266 builtin/checkout.c:458
+#: builtin/checkout.c:261 builtin/checkout.c:451
msgid "corrupt index file"
msgstr ""
-#: builtin/checkout.c:329 builtin/checkout.c:336
+#: builtin/checkout.c:322 builtin/checkout.c:329
#, c-format
msgid "path '%s' is unmerged"
msgstr ""
-#: builtin/checkout.c:480
+#: builtin/checkout.c:473
msgid "you need to resolve your current index first"
msgstr ""
-#: builtin/checkout.c:601
+#: builtin/checkout.c:594
#, c-format
msgid "Can not do reflog for '%s'\n"
msgstr ""
-#: builtin/checkout.c:639
+#: builtin/checkout.c:632
msgid "HEAD is now at"
msgstr ""
-#: builtin/checkout.c:646
+#: builtin/checkout.c:639
#, c-format
msgid "Reset branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:649
+#: builtin/checkout.c:642
#, c-format
msgid "Already on '%s'\n"
msgstr ""
-#: builtin/checkout.c:653
+#: builtin/checkout.c:646
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:655 builtin/checkout.c:997
+#: builtin/checkout.c:648 builtin/checkout.c:1033
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:657
+#: builtin/checkout.c:650
#, c-format
msgid "Switched to branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:713
+#: builtin/checkout.c:706
#, c-format
msgid " ... and %d more.\n"
msgstr ""
#. The singular version
-#: builtin/checkout.c:719
+#: builtin/checkout.c:712
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -3092,7 +3266,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: builtin/checkout.c:737
+#: builtin/checkout.c:730
#, c-format
msgid ""
"If you want to keep them by creating a new branch, this may be a good time\n"
@@ -3102,184 +3276,188 @@ msgid ""
"\n"
msgstr ""
-#: builtin/checkout.c:767
+#: builtin/checkout.c:760
msgid "internal error in revision walk"
msgstr ""
-#: builtin/checkout.c:771
+#: builtin/checkout.c:764
msgid "Previous HEAD position was"
msgstr ""
-#: builtin/checkout.c:798 builtin/checkout.c:992
+#: builtin/checkout.c:791 builtin/checkout.c:1028
msgid "You are on a branch yet to be born"
msgstr ""
-#. case (1)
-#: builtin/checkout.c:928
+#: builtin/checkout.c:935
+#, c-format
+msgid "only one reference expected, %d given."
+msgstr ""
+
+#: builtin/checkout.c:974
#, c-format
msgid "invalid reference: %s"
msgstr ""
#. case (1): want a tree
-#: builtin/checkout.c:967
+#: builtin/checkout.c:1003
#, c-format
msgid "reference is not a tree: %s"
msgstr ""
-#: builtin/checkout.c:1006
+#: builtin/checkout.c:1042
msgid "paths cannot be used with switching branches"
msgstr ""
-#: builtin/checkout.c:1009 builtin/checkout.c:1013
+#: builtin/checkout.c:1045 builtin/checkout.c:1049
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr ""
-#: builtin/checkout.c:1017 builtin/checkout.c:1020 builtin/checkout.c:1025
-#: builtin/checkout.c:1028
+#: builtin/checkout.c:1053 builtin/checkout.c:1056 builtin/checkout.c:1061
+#: builtin/checkout.c:1064
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr ""
-#: builtin/checkout.c:1033
+#: builtin/checkout.c:1069
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr ""
-#: builtin/checkout.c:1055 builtin/checkout.c:1057 builtin/clone.c:89
+#: builtin/checkout.c:1091 builtin/checkout.c:1093 builtin/clone.c:88
#: builtin/remote.c:169 builtin/remote.c:171
msgid "branch"
msgstr ""
-#: builtin/checkout.c:1056
+#: builtin/checkout.c:1092
msgid "create and checkout a new branch"
msgstr ""
-#: builtin/checkout.c:1058
+#: builtin/checkout.c:1094
msgid "create/reset and checkout a branch"
msgstr ""
-#: builtin/checkout.c:1059
+#: builtin/checkout.c:1095
msgid "create reflog for new branch"
msgstr ""
-#: builtin/checkout.c:1060
+#: builtin/checkout.c:1096
msgid "detach the HEAD at named commit"
msgstr ""
-#: builtin/checkout.c:1061
+#: builtin/checkout.c:1097
msgid "set upstream info for new branch"
msgstr ""
-#: builtin/checkout.c:1063
+#: builtin/checkout.c:1099
msgid "new branch"
msgstr ""
-#: builtin/checkout.c:1063
+#: builtin/checkout.c:1099
msgid "new unparented branch"
msgstr ""
-#: builtin/checkout.c:1064
+#: builtin/checkout.c:1100
msgid "checkout our version for unmerged files"
msgstr ""
-#: builtin/checkout.c:1066
+#: builtin/checkout.c:1102
msgid "checkout their version for unmerged files"
msgstr ""
-#: builtin/checkout.c:1068
+#: builtin/checkout.c:1104
msgid "force checkout (throw away local modifications)"
msgstr ""
-#: builtin/checkout.c:1069
+#: builtin/checkout.c:1105
msgid "perform a 3-way merge with the new branch"
msgstr ""
-#: builtin/checkout.c:1070 builtin/merge.c:232
+#: builtin/checkout.c:1106 builtin/merge.c:232
msgid "update ignored files (default)"
msgstr ""
-#: builtin/checkout.c:1071 builtin/log.c:1208 parse-options.h:249
+#: builtin/checkout.c:1107 builtin/log.c:1228 parse-options.h:251
msgid "style"
msgstr ""
-#: builtin/checkout.c:1072
+#: builtin/checkout.c:1108
msgid "conflict style (merge or diff3)"
msgstr ""
-#: builtin/checkout.c:1075
+#: builtin/checkout.c:1111
msgid "do not limit pathspecs to sparse entries only"
msgstr ""
-#: builtin/checkout.c:1077
+#: builtin/checkout.c:1113
msgid "second guess 'git checkout no-such-branch'"
msgstr ""
-#: builtin/checkout.c:1101
+#: builtin/checkout.c:1136
msgid "-b, -B and --orphan are mutually exclusive"
msgstr ""
-#: builtin/checkout.c:1118
+#: builtin/checkout.c:1153
msgid "--track needs a branch name"
msgstr ""
-#: builtin/checkout.c:1125
+#: builtin/checkout.c:1160
msgid "Missing branch name; try -b"
msgstr ""
-#: builtin/checkout.c:1160
+#: builtin/checkout.c:1197
msgid "invalid path specification"
msgstr ""
-#: builtin/checkout.c:1167
+#: builtin/checkout.c:1204
#, c-format
msgid ""
"Cannot update paths and switch to branch '%s' at the same time.\n"
"Did you intend to checkout '%s' which can not be resolved as commit?"
msgstr ""
-#: builtin/checkout.c:1172
+#: builtin/checkout.c:1209
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr ""
-#: builtin/checkout.c:1176
+#: builtin/checkout.c:1213
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
msgstr ""
-#: builtin/clean.c:25
+#: builtin/clean.c:26
msgid ""
"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
msgstr ""
-#: builtin/clean.c:29
+#: builtin/clean.c:30
#, c-format
msgid "Removing %s\n"
msgstr ""
-#: builtin/clean.c:30
+#: builtin/clean.c:31
#, c-format
msgid "Would remove %s\n"
msgstr ""
-#: builtin/clean.c:31
+#: builtin/clean.c:32
#, c-format
msgid "Skipping repository %s\n"
msgstr ""
-#: builtin/clean.c:32
+#: builtin/clean.c:33
#, c-format
msgid "Would skip repository %s\n"
msgstr ""
-#: builtin/clean.c:33
+#: builtin/clean.c:34
#, c-format
msgid "failed to remove %s"
msgstr ""
-#: builtin/clean.c:293
+#: builtin/clean.c:294
msgid ""
"Prompt help:\n"
"1 - select a numbered item\n"
@@ -3287,7 +3465,7 @@ msgid ""
" - (empty) select nothing"
msgstr ""
-#: builtin/clean.c:297
+#: builtin/clean.c:298
msgid ""
"Prompt help:\n"
"1 - select a single item\n"
@@ -3299,35 +3477,35 @@ msgid ""
" - (empty) finish selecting"
msgstr ""
-#: builtin/clean.c:515
+#: builtin/clean.c:516
#, c-format
msgid "Huh (%s)?"
msgstr ""
-#: builtin/clean.c:658
+#: builtin/clean.c:659
#, c-format
msgid "Input ignore patterns>> "
msgstr ""
-#: builtin/clean.c:695
+#: builtin/clean.c:696
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
msgstr ""
-#: builtin/clean.c:716
+#: builtin/clean.c:717
msgid "Select items to delete"
msgstr ""
-#: builtin/clean.c:756
+#: builtin/clean.c:757
#, c-format
msgid "remove %s? "
msgstr ""
-#: builtin/clean.c:781
+#: builtin/clean.c:782
msgid "Bye."
msgstr ""
-#: builtin/clean.c:789
+#: builtin/clean.c:790
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
@@ -3338,21 +3516,21 @@ msgid ""
"? - help for prompt selection"
msgstr ""
-#: builtin/clean.c:816
+#: builtin/clean.c:817
msgid "*** Commands ***"
msgstr ""
-#: builtin/clean.c:817
+#: builtin/clean.c:818
msgid "What now"
msgstr ""
-#: builtin/clean.c:825
+#: builtin/clean.c:826
msgid "Would remove the following item:"
msgid_plural "Would remove the following items:"
msgstr[0] ""
msgstr[1] ""
-#: builtin/clean.c:842
+#: builtin/clean.c:843
msgid "No more files to clean, exiting."
msgstr ""
@@ -3372,8 +3550,8 @@ msgstr ""
msgid "remove whole directories"
msgstr ""
-#: builtin/clean.c:880 builtin/describe.c:420 builtin/grep.c:716
-#: builtin/ls-files.c:493 builtin/name-rev.c:315 builtin/show-ref.c:186
+#: builtin/clean.c:880 builtin/describe.c:420 builtin/grep.c:718
+#: builtin/ls-files.c:483 builtin/name-rev.c:315 builtin/show-ref.c:185
msgid "pattern"
msgstr ""
@@ -3409,8 +3587,8 @@ msgstr ""
msgid "git clone [options] [--] <repo> [<dir>]"
msgstr ""
-#: builtin/clone.c:64 builtin/fetch.c:82 builtin/merge.c:229
-#: builtin/push.c:462
+#: builtin/clone.c:64 builtin/fetch.c:96 builtin/merge.c:229
+#: builtin/push.c:474
msgid "force progress reporting"
msgstr ""
@@ -3422,227 +3600,222 @@ msgstr ""
msgid "create a bare repository"
msgstr ""
-#: builtin/clone.c:72
+#: builtin/clone.c:71
msgid "create a mirror repository (implies bare)"
msgstr ""
-#: builtin/clone.c:74
+#: builtin/clone.c:73
msgid "to clone from a local repository"
msgstr ""
-#: builtin/clone.c:76
+#: builtin/clone.c:75
msgid "don't use local hardlinks, always copy"
msgstr ""
-#: builtin/clone.c:78
+#: builtin/clone.c:77
msgid "setup as shared repository"
msgstr ""
-#: builtin/clone.c:80 builtin/clone.c:82
+#: builtin/clone.c:79 builtin/clone.c:81
msgid "initialize submodules in the clone"
msgstr ""
-#: builtin/clone.c:83 builtin/init-db.c:485
+#: builtin/clone.c:82 builtin/init-db.c:485
msgid "template-directory"
msgstr ""
-#: builtin/clone.c:84 builtin/init-db.c:486
+#: builtin/clone.c:83 builtin/init-db.c:486
msgid "directory from which templates will be used"
msgstr ""
-#: builtin/clone.c:86
+#: builtin/clone.c:85
msgid "reference repository"
msgstr ""
-#: builtin/clone.c:87 builtin/column.c:26 builtin/merge-file.c:44
+#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44
msgid "name"
msgstr ""
-#: builtin/clone.c:88
+#: builtin/clone.c:87
msgid "use <name> instead of 'origin' to track upstream"
msgstr ""
-#: builtin/clone.c:90
+#: builtin/clone.c:89
msgid "checkout <branch> instead of the remote's HEAD"
msgstr ""
-#: builtin/clone.c:92
+#: builtin/clone.c:91
msgid "path to git-upload-pack on the remote"
msgstr ""
-#: builtin/clone.c:93 builtin/fetch.c:83 builtin/grep.c:661
+#: builtin/clone.c:92 builtin/fetch.c:97 builtin/grep.c:663
msgid "depth"
msgstr ""
-#: builtin/clone.c:94
+#: builtin/clone.c:93
msgid "create a shallow clone of that depth"
msgstr ""
-#: builtin/clone.c:96
+#: builtin/clone.c:95
msgid "clone only one branch, HEAD or --branch"
msgstr ""
-#: builtin/clone.c:97 builtin/init-db.c:494
+#: builtin/clone.c:96 builtin/init-db.c:494
msgid "gitdir"
msgstr ""
-#: builtin/clone.c:98 builtin/init-db.c:495
+#: builtin/clone.c:97 builtin/init-db.c:495
msgid "separate git dir from working tree"
msgstr ""
-#: builtin/clone.c:99
+#: builtin/clone.c:98
msgid "key=value"
msgstr ""
-#: builtin/clone.c:100
+#: builtin/clone.c:99
msgid "set config inside the new repository"
msgstr ""
-#: builtin/clone.c:253
+#: builtin/clone.c:252
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr ""
-#: builtin/clone.c:316
+#: builtin/clone.c:315
#, c-format
msgid "failed to create directory '%s'"
msgstr ""
-#: builtin/clone.c:318 builtin/diff.c:77
+#: builtin/clone.c:317 builtin/diff.c:77
#, c-format
msgid "failed to stat '%s'"
msgstr ""
-#: builtin/clone.c:320
+#: builtin/clone.c:319
#, c-format
msgid "%s exists and is not a directory"
msgstr ""
-#: builtin/clone.c:334
+#: builtin/clone.c:333
#, c-format
msgid "failed to stat %s\n"
msgstr ""
-#: builtin/clone.c:356
+#: builtin/clone.c:355
#, c-format
msgid "failed to create link '%s'"
msgstr ""
-#: builtin/clone.c:360
+#: builtin/clone.c:359
#, c-format
msgid "failed to copy file to '%s'"
msgstr ""
-#: builtin/clone.c:383
+#: builtin/clone.c:382 builtin/clone.c:559
#, c-format
msgid "done.\n"
msgstr ""
-#: builtin/clone.c:396
+#: builtin/clone.c:395
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
"and retry the checkout with 'git checkout -f HEAD'\n"
msgstr ""
-#: builtin/clone.c:475
+#: builtin/clone.c:474
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr ""
-#: builtin/clone.c:555
+#: builtin/clone.c:554
#, c-format
msgid "Checking connectivity... "
msgstr ""
-#: builtin/clone.c:558
+#: builtin/clone.c:557
msgid "remote did not send all necessary objects"
msgstr ""
-#: builtin/clone.c:560
-#, c-format
-msgid "done\n"
-msgstr ""
-
-#: builtin/clone.c:621
+#: builtin/clone.c:620
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr ""
-#: builtin/clone.c:652
+#: builtin/clone.c:651
msgid "unable to checkout working tree"
msgstr ""
-#: builtin/clone.c:760
+#: builtin/clone.c:759
msgid "Too many arguments."
msgstr ""
-#: builtin/clone.c:764
+#: builtin/clone.c:763
msgid "You must specify a repository to clone."
msgstr ""
-#: builtin/clone.c:775
+#: builtin/clone.c:774
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr ""
-#: builtin/clone.c:778
+#: builtin/clone.c:777
msgid "--bare and --separate-git-dir are incompatible."
msgstr ""
-#: builtin/clone.c:791
+#: builtin/clone.c:790
#, c-format
msgid "repository '%s' does not exist"
msgstr ""
-#: builtin/clone.c:796
+#: builtin/clone.c:795
msgid "--depth is ignored in local clones; use file:// instead."
msgstr ""
-#: builtin/clone.c:798
+#: builtin/clone.c:797
msgid "--local is ignored"
msgstr ""
-#: builtin/clone.c:808
+#: builtin/clone.c:807
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr ""
-#: builtin/clone.c:818
+#: builtin/clone.c:817
#, c-format
msgid "working tree '%s' already exists."
msgstr ""
-#: builtin/clone.c:831 builtin/clone.c:843
+#: builtin/clone.c:830 builtin/clone.c:842
#, c-format
msgid "could not create leading directories of '%s'"
msgstr ""
-#: builtin/clone.c:834
+#: builtin/clone.c:833
#, c-format
msgid "could not create work tree dir '%s'."
msgstr ""
-#: builtin/clone.c:853
+#: builtin/clone.c:852
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr ""
-#: builtin/clone.c:855
+#: builtin/clone.c:854
#, c-format
msgid "Cloning into '%s'...\n"
msgstr ""
-#: builtin/clone.c:890
+#: builtin/clone.c:888
#, c-format
msgid "Don't know how to clone %s"
msgstr ""
-#: builtin/clone.c:942
+#: builtin/clone.c:939 builtin/clone.c:947
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr ""
-#: builtin/clone.c:949
+#: builtin/clone.c:950
msgid "You appear to have cloned an empty repository."
msgstr ""
@@ -3678,15 +3851,15 @@ msgstr ""
msgid "--command must be the first argument"
msgstr ""
-#: builtin/commit.c:35
+#: builtin/commit.c:36
msgid "git commit [options] [--] <pathspec>..."
msgstr ""
-#: builtin/commit.c:40
+#: builtin/commit.c:41
msgid "git status [options] [--] <pathspec>..."
msgstr ""
-#: builtin/commit.c:45
+#: builtin/commit.c:46
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -3700,14 +3873,14 @@ msgid ""
" git commit --amend --reset-author\n"
msgstr ""
-#: builtin/commit.c:57
+#: builtin/commit.c:58
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:62
+#: builtin/commit.c:63
msgid ""
"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
"If you wish to commit it anyway, use:\n"
@@ -3716,11 +3889,11 @@ msgid ""
"\n"
msgstr ""
-#: builtin/commit.c:69
+#: builtin/commit.c:70
msgid "Otherwise, please use 'git reset'\n"
msgstr ""
-#: builtin/commit.c:72
+#: builtin/commit.c:73
msgid ""
"If you wish to skip this commit, use:\n"
"\n"
@@ -3730,93 +3903,93 @@ msgid ""
"the remaining commits.\n"
msgstr ""
-#: builtin/commit.c:279
+#: builtin/commit.c:287
msgid "failed to unpack HEAD tree object"
msgstr ""
-#: builtin/commit.c:321
+#: builtin/commit.c:329
msgid "unable to create temporary index"
msgstr ""
-#: builtin/commit.c:327
+#: builtin/commit.c:335
msgid "interactive add failed"
msgstr ""
-#: builtin/commit.c:360 builtin/commit.c:381 builtin/commit.c:431
+#: builtin/commit.c:368 builtin/commit.c:389 builtin/commit.c:439
msgid "unable to write new_index file"
msgstr ""
-#: builtin/commit.c:412
+#: builtin/commit.c:420
msgid "cannot do a partial commit during a merge."
msgstr ""
-#: builtin/commit.c:414
+#: builtin/commit.c:422
msgid "cannot do a partial commit during a cherry-pick."
msgstr ""
-#: builtin/commit.c:424
+#: builtin/commit.c:432
msgid "cannot read the index"
msgstr ""
-#: builtin/commit.c:444
+#: builtin/commit.c:452
msgid "unable to write temporary index file"
msgstr ""
-#: builtin/commit.c:535 builtin/commit.c:541
+#: builtin/commit.c:543 builtin/commit.c:549
#, c-format
msgid "invalid commit: %s"
msgstr ""
-#: builtin/commit.c:563
+#: builtin/commit.c:571
msgid "malformed --author parameter"
msgstr ""
-#: builtin/commit.c:583
+#: builtin/commit.c:591
#, c-format
msgid "Malformed ident string: '%s'"
msgstr ""
-#: builtin/commit.c:621 builtin/commit.c:654 builtin/commit.c:982
+#: builtin/commit.c:630 builtin/commit.c:663 builtin/commit.c:1007
#, c-format
msgid "could not lookup commit %s"
msgstr ""
-#: builtin/commit.c:633 builtin/shortlog.c:271
+#: builtin/commit.c:642 builtin/shortlog.c:273
#, c-format
msgid "(reading log message from standard input)\n"
msgstr ""
-#: builtin/commit.c:635
+#: builtin/commit.c:644
msgid "could not read log from standard input"
msgstr ""
-#: builtin/commit.c:639
+#: builtin/commit.c:648
#, c-format
msgid "could not read log file '%s'"
msgstr ""
-#: builtin/commit.c:645
+#: builtin/commit.c:654
msgid "commit has empty message"
msgstr ""
-#: builtin/commit.c:661
+#: builtin/commit.c:670
msgid "could not read MERGE_MSG"
msgstr ""
-#: builtin/commit.c:665
+#: builtin/commit.c:674
msgid "could not read SQUASH_MSG"
msgstr ""
-#: builtin/commit.c:669
+#: builtin/commit.c:678
#, c-format
msgid "could not read '%s'"
msgstr ""
-#: builtin/commit.c:730
+#: builtin/commit.c:749
msgid "could not write commit template"
msgstr ""
-#: builtin/commit.c:741
+#: builtin/commit.c:760
#, c-format
msgid ""
"\n"
@@ -3826,7 +3999,7 @@ msgid ""
"and try again.\n"
msgstr ""
-#: builtin/commit.c:746
+#: builtin/commit.c:765
#, c-format
msgid ""
"\n"
@@ -3836,14 +4009,14 @@ msgid ""
"and try again.\n"
msgstr ""
-#: builtin/commit.c:758
+#: builtin/commit.c:777
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
"with '%c' will be ignored, and an empty message aborts the commit.\n"
msgstr ""
-#: builtin/commit.c:763
+#: builtin/commit.c:782
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -3851,478 +4024,482 @@ msgid ""
"An empty message aborts the commit.\n"
msgstr ""
-#: builtin/commit.c:776
+#: builtin/commit.c:795
#, c-format
msgid "%sAuthor: %s"
msgstr ""
-#: builtin/commit.c:783
+#: builtin/commit.c:802
#, c-format
msgid "%sCommitter: %s"
msgstr ""
-#: builtin/commit.c:803
+#: builtin/commit.c:822
msgid "Cannot read index"
msgstr ""
-#: builtin/commit.c:845
+#: builtin/commit.c:865
msgid "Error building trees"
msgstr ""
-#: builtin/commit.c:860 builtin/tag.c:359
+#: builtin/commit.c:880 builtin/tag.c:359
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr ""
-#: builtin/commit.c:957
+#: builtin/commit.c:982
#, c-format
msgid "No existing author found with '%s'"
msgstr ""
-#: builtin/commit.c:972 builtin/commit.c:1208
+#: builtin/commit.c:997 builtin/commit.c:1237
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr ""
-#: builtin/commit.c:1009
+#: builtin/commit.c:1034
msgid "--long and -z are incompatible"
msgstr ""
-#: builtin/commit.c:1039
+#: builtin/commit.c:1064
msgid "Using both --reset-author and --author does not make sense"
msgstr ""
-#: builtin/commit.c:1050
+#: builtin/commit.c:1075
msgid "You have nothing to amend."
msgstr ""
-#: builtin/commit.c:1053
+#: builtin/commit.c:1078
msgid "You are in the middle of a merge -- cannot amend."
msgstr ""
-#: builtin/commit.c:1055
+#: builtin/commit.c:1080
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr ""
-#: builtin/commit.c:1058
+#: builtin/commit.c:1083
msgid "Options --squash and --fixup cannot be used together"
msgstr ""
-#: builtin/commit.c:1068
+#: builtin/commit.c:1093
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr ""
-#: builtin/commit.c:1070
+#: builtin/commit.c:1095
msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
msgstr ""
-#: builtin/commit.c:1078
+#: builtin/commit.c:1103
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr ""
-#: builtin/commit.c:1095
+#: builtin/commit.c:1120
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr ""
-#: builtin/commit.c:1097
+#: builtin/commit.c:1122
msgid "No paths with --include/--only does not make sense."
msgstr ""
-#: builtin/commit.c:1099
+#: builtin/commit.c:1124
msgid "Clever... amending the last one with dirty index."
msgstr ""
-#: builtin/commit.c:1101
+#: builtin/commit.c:1126
msgid "Explicit paths specified without -i nor -o; assuming --only paths..."
msgstr ""
-#: builtin/commit.c:1111 builtin/tag.c:575
+#: builtin/commit.c:1136 builtin/tag.c:572
#, c-format
msgid "Invalid cleanup mode %s"
msgstr ""
-#: builtin/commit.c:1116
+#: builtin/commit.c:1141
msgid "Paths with -a does not make sense."
msgstr ""
-#: builtin/commit.c:1222 builtin/commit.c:1455
+#: builtin/commit.c:1251 builtin/commit.c:1482
msgid "show status concisely"
msgstr ""
-#: builtin/commit.c:1224 builtin/commit.c:1457
+#: builtin/commit.c:1253 builtin/commit.c:1484
msgid "show branch information"
msgstr ""
-#: builtin/commit.c:1226 builtin/commit.c:1459 builtin/push.c:452
+#: builtin/commit.c:1255 builtin/commit.c:1486 builtin/push.c:460
msgid "machine-readable output"
msgstr ""
-#: builtin/commit.c:1229 builtin/commit.c:1461
+#: builtin/commit.c:1258 builtin/commit.c:1488
msgid "show status in long format (default)"
msgstr ""
-#: builtin/commit.c:1232 builtin/commit.c:1464
+#: builtin/commit.c:1261 builtin/commit.c:1491
msgid "terminate entries with NUL"
msgstr ""
-#: builtin/commit.c:1234 builtin/commit.c:1467 builtin/fast-export.c:667
-#: builtin/fast-export.c:670 builtin/tag.c:459
+#: builtin/commit.c:1263 builtin/commit.c:1494 builtin/fast-export.c:674
+#: builtin/fast-export.c:677 builtin/tag.c:459
msgid "mode"
msgstr ""
-#: builtin/commit.c:1235 builtin/commit.c:1467
+#: builtin/commit.c:1264 builtin/commit.c:1494
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr ""
-#: builtin/commit.c:1238
+#: builtin/commit.c:1267
msgid "show ignored files"
msgstr ""
-#: builtin/commit.c:1239 parse-options.h:154
+#: builtin/commit.c:1268 parse-options.h:156
msgid "when"
msgstr ""
-#: builtin/commit.c:1240
+#: builtin/commit.c:1269
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
msgstr ""
-#: builtin/commit.c:1242
+#: builtin/commit.c:1271
msgid "list untracked files in columns"
msgstr ""
-#: builtin/commit.c:1313
+#: builtin/commit.c:1340
msgid "couldn't look up newly created commit"
msgstr ""
-#: builtin/commit.c:1315
+#: builtin/commit.c:1342
msgid "could not parse newly created commit"
msgstr ""
-#: builtin/commit.c:1356
+#: builtin/commit.c:1383
msgid "detached HEAD"
msgstr ""
-#: builtin/commit.c:1358
+#: builtin/commit.c:1385
msgid " (root-commit)"
msgstr ""
-#: builtin/commit.c:1425
+#: builtin/commit.c:1452
msgid "suppress summary after successful commit"
msgstr ""
-#: builtin/commit.c:1426
+#: builtin/commit.c:1453
msgid "show diff in commit message template"
msgstr ""
-#: builtin/commit.c:1428
+#: builtin/commit.c:1455
msgid "Commit message options"
msgstr ""
-#: builtin/commit.c:1429 builtin/tag.c:457
+#: builtin/commit.c:1456 builtin/tag.c:457
msgid "read message from file"
msgstr ""
-#: builtin/commit.c:1430
+#: builtin/commit.c:1457
msgid "author"
msgstr ""
-#: builtin/commit.c:1430
+#: builtin/commit.c:1457
msgid "override author for commit"
msgstr ""
-#: builtin/commit.c:1431 builtin/gc.c:178
+#: builtin/commit.c:1458 builtin/gc.c:260
msgid "date"
msgstr ""
-#: builtin/commit.c:1431
+#: builtin/commit.c:1458
msgid "override date for commit"
msgstr ""
-#: builtin/commit.c:1432 builtin/merge.c:223 builtin/notes.c:405
+#: builtin/commit.c:1459 builtin/merge.c:223 builtin/notes.c:405
#: builtin/notes.c:562 builtin/tag.c:455
msgid "message"
msgstr ""
-#: builtin/commit.c:1432
+#: builtin/commit.c:1459
msgid "commit message"
msgstr ""
-#: builtin/commit.c:1433
+#: builtin/commit.c:1460
msgid "reuse and edit message from specified commit"
msgstr ""
-#: builtin/commit.c:1434
+#: builtin/commit.c:1461
msgid "reuse message from specified commit"
msgstr ""
-#: builtin/commit.c:1435
+#: builtin/commit.c:1462
msgid "use autosquash formatted message to fixup specified commit"
msgstr ""
-#: builtin/commit.c:1436
+#: builtin/commit.c:1463
msgid "use autosquash formatted message to squash specified commit"
msgstr ""
-#: builtin/commit.c:1437
+#: builtin/commit.c:1464
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr ""
-#: builtin/commit.c:1438 builtin/log.c:1160 builtin/revert.c:111
+#: builtin/commit.c:1465 builtin/log.c:1180 builtin/revert.c:86
msgid "add Signed-off-by:"
msgstr ""
-#: builtin/commit.c:1439
+#: builtin/commit.c:1466
msgid "use specified template file"
msgstr ""
-#: builtin/commit.c:1440
+#: builtin/commit.c:1467
msgid "force edit of commit"
msgstr ""
-#: builtin/commit.c:1441
+#: builtin/commit.c:1468
msgid "default"
msgstr ""
-#: builtin/commit.c:1441 builtin/tag.c:460
+#: builtin/commit.c:1468 builtin/tag.c:460
msgid "how to strip spaces and #comments from message"
msgstr ""
-#: builtin/commit.c:1442
+#: builtin/commit.c:1469
msgid "include status in commit message template"
msgstr ""
-#: builtin/commit.c:1443 builtin/merge.c:230 builtin/tag.c:461
+#: builtin/commit.c:1470 builtin/merge.c:230 builtin/tag.c:461
msgid "key id"
msgstr ""
-#: builtin/commit.c:1444 builtin/merge.c:231
+#: builtin/commit.c:1471 builtin/merge.c:231
msgid "GPG sign commit"
msgstr ""
#. end commit message options
-#: builtin/commit.c:1447
+#: builtin/commit.c:1474
msgid "Commit contents options"
msgstr ""
-#: builtin/commit.c:1448
+#: builtin/commit.c:1475
msgid "commit all changed files"
msgstr ""
-#: builtin/commit.c:1449
+#: builtin/commit.c:1476
msgid "add specified files to index for commit"
msgstr ""
-#: builtin/commit.c:1450
+#: builtin/commit.c:1477
msgid "interactively add files"
msgstr ""
-#: builtin/commit.c:1451
+#: builtin/commit.c:1478
msgid "interactively add changes"
msgstr ""
-#: builtin/commit.c:1452
+#: builtin/commit.c:1479
msgid "commit only specified files"
msgstr ""
-#: builtin/commit.c:1453
+#: builtin/commit.c:1480
msgid "bypass pre-commit hook"
msgstr ""
-#: builtin/commit.c:1454
+#: builtin/commit.c:1481
msgid "show what would be committed"
msgstr ""
-#: builtin/commit.c:1465
+#: builtin/commit.c:1492
msgid "amend previous commit"
msgstr ""
-#: builtin/commit.c:1466
+#: builtin/commit.c:1493
msgid "bypass post-rewrite hook"
msgstr ""
-#: builtin/commit.c:1471
+#: builtin/commit.c:1498
msgid "ok to record an empty change"
msgstr ""
-#: builtin/commit.c:1474
+#: builtin/commit.c:1500
msgid "ok to record a change with an empty message"
msgstr ""
-#: builtin/commit.c:1507
+#: builtin/commit.c:1529
msgid "could not parse HEAD commit"
msgstr ""
-#: builtin/commit.c:1545 builtin/merge.c:525
+#: builtin/commit.c:1567 builtin/merge.c:525
#, c-format
msgid "could not open '%s' for reading"
msgstr ""
-#: builtin/commit.c:1552
+#: builtin/commit.c:1574
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr ""
-#: builtin/commit.c:1559
+#: builtin/commit.c:1581
msgid "could not read MERGE_MODE"
msgstr ""
-#: builtin/commit.c:1578
+#: builtin/commit.c:1600
#, c-format
msgid "could not read commit message: %s"
msgstr ""
-#: builtin/commit.c:1592
+#: builtin/commit.c:1614
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr ""
-#: builtin/commit.c:1597
+#: builtin/commit.c:1619
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr ""
-#: builtin/commit.c:1612 builtin/merge.c:861 builtin/merge.c:886
+#: builtin/commit.c:1634 builtin/merge.c:861 builtin/merge.c:886
msgid "failed to write commit object"
msgstr ""
-#: builtin/commit.c:1633
+#: builtin/commit.c:1655
msgid "cannot lock HEAD ref"
msgstr ""
-#: builtin/commit.c:1637
+#: builtin/commit.c:1659
msgid "cannot update HEAD ref"
msgstr ""
-#: builtin/commit.c:1648
+#: builtin/commit.c:1670
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/config.c:7
+#: builtin/config.c:8
msgid "git config [options]"
msgstr ""
-#: builtin/config.c:52
+#: builtin/config.c:54
msgid "Config file location"
msgstr ""
-#: builtin/config.c:53
+#: builtin/config.c:55
msgid "use global config file"
msgstr ""
-#: builtin/config.c:54
+#: builtin/config.c:56
msgid "use system config file"
msgstr ""
-#: builtin/config.c:55
+#: builtin/config.c:57
msgid "use repository config file"
msgstr ""
-#: builtin/config.c:56
+#: builtin/config.c:58
msgid "use given config file"
msgstr ""
-#: builtin/config.c:57
+#: builtin/config.c:59
msgid "blob-id"
msgstr ""
-#: builtin/config.c:57
+#: builtin/config.c:59
msgid "read config from given blob object"
msgstr ""
-#: builtin/config.c:58
+#: builtin/config.c:60
msgid "Action"
msgstr ""
-#: builtin/config.c:59
+#: builtin/config.c:61
msgid "get value: name [value-regex]"
msgstr ""
-#: builtin/config.c:60
+#: builtin/config.c:62
msgid "get all values: key [value-regex]"
msgstr ""
-#: builtin/config.c:61
+#: builtin/config.c:63
msgid "get values for regexp: name-regex [value-regex]"
msgstr ""
-#: builtin/config.c:62
+#: builtin/config.c:64
+msgid "get value specific for the URL: section[.var] URL"
+msgstr ""
+
+#: builtin/config.c:65
msgid "replace all matching variables: name value [value_regex]"
msgstr ""
-#: builtin/config.c:63
+#: builtin/config.c:66
msgid "add a new variable: name value"
msgstr ""
-#: builtin/config.c:64
+#: builtin/config.c:67
msgid "remove a variable: name [value-regex]"
msgstr ""
-#: builtin/config.c:65
+#: builtin/config.c:68
msgid "remove all matches: name [value-regex]"
msgstr ""
-#: builtin/config.c:66
+#: builtin/config.c:69
msgid "rename section: old-name new-name"
msgstr ""
-#: builtin/config.c:67
+#: builtin/config.c:70
msgid "remove a section: name"
msgstr ""
-#: builtin/config.c:68
+#: builtin/config.c:71
msgid "list all"
msgstr ""
-#: builtin/config.c:69
+#: builtin/config.c:72
msgid "open an editor"
msgstr ""
-#: builtin/config.c:70 builtin/config.c:71
+#: builtin/config.c:73 builtin/config.c:74
msgid "slot"
msgstr ""
-#: builtin/config.c:70
+#: builtin/config.c:73
msgid "find the color configured: [default]"
msgstr ""
-#: builtin/config.c:71
+#: builtin/config.c:74
msgid "find the color setting: [stdout-is-tty]"
msgstr ""
-#: builtin/config.c:72
+#: builtin/config.c:75
msgid "Type"
msgstr ""
-#: builtin/config.c:73
+#: builtin/config.c:76
msgid "value is \"true\" or \"false\""
msgstr ""
-#: builtin/config.c:74
+#: builtin/config.c:77
msgid "value is decimal number"
msgstr ""
-#: builtin/config.c:75
+#: builtin/config.c:78
msgid "value is --bool or --int"
msgstr ""
-#: builtin/config.c:76
+#: builtin/config.c:79
msgid "value is a path (file or directory name)"
msgstr ""
-#: builtin/config.c:77
+#: builtin/config.c:80
msgid "Other"
msgstr ""
-#: builtin/config.c:78
+#: builtin/config.c:81
msgid "terminate values with NUL byte"
msgstr ""
-#: builtin/config.c:79
+#: builtin/config.c:82
msgid "respect include directives on lookup"
msgstr ""
@@ -4501,39 +4678,39 @@ msgstr ""
msgid "git fast-export [rev-list-opts]"
msgstr ""
-#: builtin/fast-export.c:666
+#: builtin/fast-export.c:673
msgid "show progress after <n> objects"
msgstr ""
-#: builtin/fast-export.c:668
+#: builtin/fast-export.c:675
msgid "select handling of signed tags"
msgstr ""
-#: builtin/fast-export.c:671
+#: builtin/fast-export.c:678
msgid "select handling of tags that tag filtered objects"
msgstr ""
-#: builtin/fast-export.c:674
+#: builtin/fast-export.c:681
msgid "Dump marks to this file"
msgstr ""
-#: builtin/fast-export.c:676
+#: builtin/fast-export.c:683
msgid "Import marks from this file"
msgstr ""
-#: builtin/fast-export.c:678
+#: builtin/fast-export.c:685
msgid "Fake a tagger when tags lack one"
msgstr ""
-#: builtin/fast-export.c:680
+#: builtin/fast-export.c:687
msgid "Output full tree for each commit"
msgstr ""
-#: builtin/fast-export.c:682
+#: builtin/fast-export.c:689
msgid "Use the done feature to terminate the stream"
msgstr ""
-#: builtin/fast-export.c:683
+#: builtin/fast-export.c:690
msgid "Skip output of blob data"
msgstr ""
@@ -4553,230 +4730,230 @@ msgstr ""
msgid "git fetch --all [<options>]"
msgstr ""
-#: builtin/fetch.c:60
+#: builtin/fetch.c:74
msgid "fetch from all remotes"
msgstr ""
-#: builtin/fetch.c:62
+#: builtin/fetch.c:76
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr ""
-#: builtin/fetch.c:64
+#: builtin/fetch.c:78
msgid "path to upload pack on remote end"
msgstr ""
-#: builtin/fetch.c:65
+#: builtin/fetch.c:79
msgid "force overwrite of local branch"
msgstr ""
-#: builtin/fetch.c:67
+#: builtin/fetch.c:81
msgid "fetch from multiple remotes"
msgstr ""
-#: builtin/fetch.c:69
+#: builtin/fetch.c:83
msgid "fetch all tags and associated objects"
msgstr ""
-#: builtin/fetch.c:71
+#: builtin/fetch.c:85
msgid "do not fetch all tags (--no-tags)"
msgstr ""
-#: builtin/fetch.c:73
+#: builtin/fetch.c:87
msgid "prune remote-tracking branches no longer on remote"
msgstr ""
-#: builtin/fetch.c:74
+#: builtin/fetch.c:88
msgid "on-demand"
msgstr ""
-#: builtin/fetch.c:75
+#: builtin/fetch.c:89
msgid "control recursive fetching of submodules"
msgstr ""
-#: builtin/fetch.c:79
+#: builtin/fetch.c:93
msgid "keep downloaded pack"
msgstr ""
-#: builtin/fetch.c:81
+#: builtin/fetch.c:95
msgid "allow updating of HEAD ref"
msgstr ""
-#: builtin/fetch.c:84
+#: builtin/fetch.c:98
msgid "deepen history of shallow clone"
msgstr ""
-#: builtin/fetch.c:86
+#: builtin/fetch.c:100
msgid "convert to a complete repository"
msgstr ""
-#: builtin/fetch.c:88 builtin/log.c:1177
+#: builtin/fetch.c:102 builtin/log.c:1197
msgid "dir"
msgstr ""
-#: builtin/fetch.c:89
+#: builtin/fetch.c:103
msgid "prepend this to submodule path output"
msgstr ""
-#: builtin/fetch.c:92
+#: builtin/fetch.c:106
msgid "default mode for recursion"
msgstr ""
-#: builtin/fetch.c:220
+#: builtin/fetch.c:236
msgid "Couldn't find remote ref HEAD"
msgstr ""
-#: builtin/fetch.c:273
+#: builtin/fetch.c:290
#, c-format
msgid "object %s not found"
msgstr ""
-#: builtin/fetch.c:278
+#: builtin/fetch.c:295
msgid "[up to date]"
msgstr ""
-#: builtin/fetch.c:292
+#: builtin/fetch.c:309
#, c-format
msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
msgstr ""
-#: builtin/fetch.c:293 builtin/fetch.c:379
+#: builtin/fetch.c:310 builtin/fetch.c:396
msgid "[rejected]"
msgstr ""
-#: builtin/fetch.c:304
+#: builtin/fetch.c:321
msgid "[tag update]"
msgstr ""
-#: builtin/fetch.c:306 builtin/fetch.c:341 builtin/fetch.c:359
+#: builtin/fetch.c:323 builtin/fetch.c:358 builtin/fetch.c:376
msgid " (unable to update local ref)"
msgstr ""
-#: builtin/fetch.c:324
+#: builtin/fetch.c:341
msgid "[new tag]"
msgstr ""
-#: builtin/fetch.c:327
+#: builtin/fetch.c:344
msgid "[new branch]"
msgstr ""
-#: builtin/fetch.c:330
+#: builtin/fetch.c:347
msgid "[new ref]"
msgstr ""
-#: builtin/fetch.c:375
+#: builtin/fetch.c:392
msgid "unable to update local ref"
msgstr ""
-#: builtin/fetch.c:375
+#: builtin/fetch.c:392
msgid "forced update"
msgstr ""
-#: builtin/fetch.c:381
+#: builtin/fetch.c:398
msgid "(non-fast-forward)"
msgstr ""
-#: builtin/fetch.c:412 builtin/fetch.c:718
+#: builtin/fetch.c:429 builtin/fetch.c:735
#, c-format
msgid "cannot open %s: %s\n"
msgstr ""
-#: builtin/fetch.c:421
+#: builtin/fetch.c:438
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr ""
-#: builtin/fetch.c:520
+#: builtin/fetch.c:537
#, c-format
msgid "From %.*s\n"
msgstr ""
-#: builtin/fetch.c:531
+#: builtin/fetch.c:548
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
" 'git remote prune %s' to remove any old, conflicting branches"
msgstr ""
-#: builtin/fetch.c:581
+#: builtin/fetch.c:598
#, c-format
msgid " (%s will become dangling)"
msgstr ""
-#: builtin/fetch.c:582
+#: builtin/fetch.c:599
#, c-format
msgid " (%s has become dangling)"
msgstr ""
-#: builtin/fetch.c:589
+#: builtin/fetch.c:606
msgid "[deleted]"
msgstr ""
-#: builtin/fetch.c:590 builtin/remote.c:1055
+#: builtin/fetch.c:607 builtin/remote.c:1055
msgid "(none)"
msgstr ""
-#: builtin/fetch.c:708
+#: builtin/fetch.c:725
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr ""
-#: builtin/fetch.c:742
+#: builtin/fetch.c:744
#, c-format
-msgid "Don't know how to fetch from %s"
+msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr ""
-#: builtin/fetch.c:823
+#: builtin/fetch.c:747
#, c-format
-msgid "Option \"%s\" value \"%s\" is not valid for %s"
+msgid "Option \"%s\" is ignored for %s\n"
msgstr ""
-#: builtin/fetch.c:826
+#: builtin/fetch.c:801
#, c-format
-msgid "Option \"%s\" is ignored for %s\n"
+msgid "Don't know how to fetch from %s"
msgstr ""
-#: builtin/fetch.c:928
+#: builtin/fetch.c:976
#, c-format
msgid "Fetching %s\n"
msgstr ""
-#: builtin/fetch.c:930 builtin/remote.c:100
+#: builtin/fetch.c:978 builtin/remote.c:100
#, c-format
msgid "Could not fetch %s"
msgstr ""
-#: builtin/fetch.c:949
+#: builtin/fetch.c:997
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
msgstr ""
-#: builtin/fetch.c:969
+#: builtin/fetch.c:1020
msgid "You need to specify a tag name."
msgstr ""
-#: builtin/fetch.c:1015
+#: builtin/fetch.c:1068
msgid "--depth and --unshallow cannot be used together"
msgstr ""
-#: builtin/fetch.c:1017
+#: builtin/fetch.c:1070
msgid "--unshallow on a complete repository does not make sense"
msgstr ""
-#: builtin/fetch.c:1036
+#: builtin/fetch.c:1089
msgid "fetch --all does not take a repository argument"
msgstr ""
-#: builtin/fetch.c:1038
+#: builtin/fetch.c:1091
msgid "fetch --all does not make sense with refspecs"
msgstr ""
-#: builtin/fetch.c:1049
+#: builtin/fetch.c:1102
#, c-format
msgid "No such remote or remote group: %s"
msgstr ""
-#: builtin/fetch.c:1057
+#: builtin/fetch.c:1110
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr ""
@@ -4784,9 +4961,9 @@ msgstr ""
msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"
msgstr ""
-#: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:700
-#: builtin/merge.c:203 builtin/show-branch.c:655 builtin/show-ref.c:179
-#: builtin/tag.c:446 parse-options.h:133 parse-options.h:243
+#: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:702
+#: builtin/merge.c:203 builtin/show-branch.c:655 builtin/show-ref.c:178
+#: builtin/tag.c:446 parse-options.h:135 parse-options.h:245
msgid "n"
msgstr ""
@@ -4810,158 +4987,169 @@ msgstr ""
msgid "file to read from"
msgstr ""
-#: builtin/for-each-ref.c:979
+#: builtin/for-each-ref.c:995
msgid "git for-each-ref [options] [<pattern>]"
msgstr ""
-#: builtin/for-each-ref.c:994
+#: builtin/for-each-ref.c:1010
msgid "quote placeholders suitably for shells"
msgstr ""
-#: builtin/for-each-ref.c:996
+#: builtin/for-each-ref.c:1012
msgid "quote placeholders suitably for perl"
msgstr ""
-#: builtin/for-each-ref.c:998
+#: builtin/for-each-ref.c:1014
msgid "quote placeholders suitably for python"
msgstr ""
-#: builtin/for-each-ref.c:1000
+#: builtin/for-each-ref.c:1016
msgid "quote placeholders suitably for tcl"
msgstr ""
-#: builtin/for-each-ref.c:1003
+#: builtin/for-each-ref.c:1019
msgid "show only <n> matched refs"
msgstr ""
-#: builtin/for-each-ref.c:1004
+#: builtin/for-each-ref.c:1020
msgid "format"
msgstr ""
-#: builtin/for-each-ref.c:1004
+#: builtin/for-each-ref.c:1020
msgid "format to use for the output"
msgstr ""
-#: builtin/for-each-ref.c:1005
+#: builtin/for-each-ref.c:1021
msgid "key"
msgstr ""
-#: builtin/for-each-ref.c:1006
+#: builtin/for-each-ref.c:1022
msgid "field name to sort on"
msgstr ""
-#: builtin/fsck.c:608
+#: builtin/fsck.c:607
msgid "git fsck [options] [<object>...]"
msgstr ""
-#: builtin/fsck.c:614
+#: builtin/fsck.c:613
msgid "show unreachable objects"
msgstr ""
-#: builtin/fsck.c:615
+#: builtin/fsck.c:614
msgid "show dangling objects"
msgstr ""
-#: builtin/fsck.c:616
+#: builtin/fsck.c:615
msgid "report tags"
msgstr ""
-#: builtin/fsck.c:617
+#: builtin/fsck.c:616
msgid "report root nodes"
msgstr ""
-#: builtin/fsck.c:618
+#: builtin/fsck.c:617
msgid "make index objects head nodes"
msgstr ""
-#: builtin/fsck.c:619
+#: builtin/fsck.c:618
msgid "make reflogs head nodes (default)"
msgstr ""
-#: builtin/fsck.c:620
+#: builtin/fsck.c:619
msgid "also consider packs and alternate objects"
msgstr ""
-#: builtin/fsck.c:621
+#: builtin/fsck.c:620
msgid "enable more strict checking"
msgstr ""
-#: builtin/fsck.c:623
+#: builtin/fsck.c:622
msgid "write dangling objects in .git/lost-found"
msgstr ""
-#: builtin/fsck.c:624 builtin/prune.c:134
+#: builtin/fsck.c:623 builtin/prune.c:134
msgid "show progress"
msgstr ""
-#: builtin/gc.c:22
+#: builtin/gc.c:23
msgid "git gc [options]"
msgstr ""
-#: builtin/gc.c:63
+#: builtin/gc.c:79
#, c-format
msgid "Invalid %s: '%s'"
msgstr ""
-#: builtin/gc.c:90
+#: builtin/gc.c:106
#, c-format
msgid "insanely long object directory %.*s"
msgstr ""
-#: builtin/gc.c:179
+#: builtin/gc.c:261
msgid "prune unreferenced objects"
msgstr ""
-#: builtin/gc.c:181
+#: builtin/gc.c:263
msgid "be more thorough (increased runtime)"
msgstr ""
-#: builtin/gc.c:182
+#: builtin/gc.c:264
msgid "enable auto-gc mode"
msgstr ""
-#: builtin/gc.c:222
+#: builtin/gc.c:265
+msgid "force running gc even if there may be another gc running"
+msgstr ""
+
+#: builtin/gc.c:305
#, 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"
msgstr ""
-#: builtin/gc.c:249
+#. be quiet on --auto
+#: builtin/gc.c:315
+#, c-format
+msgid ""
+"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
+msgstr ""
+
+#: builtin/gc.c:340
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr ""
-#: builtin/grep.c:22
+#: builtin/grep.c:23
msgid "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]"
msgstr ""
-#: builtin/grep.c:217
+#: builtin/grep.c:218
#, c-format
msgid "grep: failed to create thread: %s"
msgstr ""
-#: builtin/grep.c:364
+#: builtin/grep.c:365
#, c-format
msgid "Failed to chdir: %s"
msgstr ""
-#: builtin/grep.c:442 builtin/grep.c:477
+#: builtin/grep.c:443 builtin/grep.c:478
#, c-format
msgid "unable to read tree (%s)"
msgstr ""
-#: builtin/grep.c:492
+#: builtin/grep.c:493
#, c-format
msgid "unable to grep from object of type %s"
msgstr ""
-#: builtin/grep.c:550
+#: builtin/grep.c:551
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr ""
-#: builtin/grep.c:567
+#: builtin/grep.c:568
#, c-format
msgid "cannot open '%s'"
msgstr ""
@@ -5003,158 +5191,162 @@ msgid "don't match patterns in binary files"
msgstr ""
#: builtin/grep.c:662
+msgid "process binary files with textconv filters"
+msgstr ""
+
+#: builtin/grep.c:664
msgid "descend at most <depth> levels"
msgstr ""
-#: builtin/grep.c:666
+#: builtin/grep.c:668
msgid "use extended POSIX regular expressions"
msgstr ""
-#: builtin/grep.c:669
+#: builtin/grep.c:671
msgid "use basic POSIX regular expressions (default)"
msgstr ""
-#: builtin/grep.c:672
+#: builtin/grep.c:674
msgid "interpret patterns as fixed strings"
msgstr ""
-#: builtin/grep.c:675
+#: builtin/grep.c:677
msgid "use Perl-compatible regular expressions"
msgstr ""
-#: builtin/grep.c:678
+#: builtin/grep.c:680
msgid "show line numbers"
msgstr ""
-#: builtin/grep.c:679
+#: builtin/grep.c:681
msgid "don't show filenames"
msgstr ""
-#: builtin/grep.c:680
+#: builtin/grep.c:682
msgid "show filenames"
msgstr ""
-#: builtin/grep.c:682
+#: builtin/grep.c:684
msgid "show filenames relative to top directory"
msgstr ""
-#: builtin/grep.c:684
+#: builtin/grep.c:686
msgid "show only filenames instead of matching lines"
msgstr ""
-#: builtin/grep.c:686
+#: builtin/grep.c:688
msgid "synonym for --files-with-matches"
msgstr ""
-#: builtin/grep.c:689
+#: builtin/grep.c:691
msgid "show only the names of files without match"
msgstr ""
-#: builtin/grep.c:691
+#: builtin/grep.c:693
msgid "print NUL after filenames"
msgstr ""
-#: builtin/grep.c:693
+#: builtin/grep.c:695
msgid "show the number of matches instead of matching lines"
msgstr ""
-#: builtin/grep.c:694
+#: builtin/grep.c:696
msgid "highlight matches"
msgstr ""
-#: builtin/grep.c:696
+#: builtin/grep.c:698
msgid "print empty line between matches from different files"
msgstr ""
-#: builtin/grep.c:698
+#: builtin/grep.c:700
msgid "show filename only once above matches from same file"
msgstr ""
-#: builtin/grep.c:701
+#: builtin/grep.c:703
msgid "show <n> context lines before and after matches"
msgstr ""
-#: builtin/grep.c:704
+#: builtin/grep.c:706
msgid "show <n> context lines before matches"
msgstr ""
-#: builtin/grep.c:706
+#: builtin/grep.c:708
msgid "show <n> context lines after matches"
msgstr ""
-#: builtin/grep.c:707
+#: builtin/grep.c:709
msgid "shortcut for -C NUM"
msgstr ""
-#: builtin/grep.c:710
+#: builtin/grep.c:712
msgid "show a line with the function name before matches"
msgstr ""
-#: builtin/grep.c:712
+#: builtin/grep.c:714
msgid "show the surrounding function"
msgstr ""
-#: builtin/grep.c:715
+#: builtin/grep.c:717
msgid "read patterns from file"
msgstr ""
-#: builtin/grep.c:717
+#: builtin/grep.c:719
msgid "match <pattern>"
msgstr ""
-#: builtin/grep.c:719
+#: builtin/grep.c:721
msgid "combine patterns specified with -e"
msgstr ""
-#: builtin/grep.c:731
+#: builtin/grep.c:733
msgid "indicate hit with exit status without output"
msgstr ""
-#: builtin/grep.c:733
+#: builtin/grep.c:735
msgid "show only matches from files that match all patterns"
msgstr ""
-#: builtin/grep.c:735
+#: builtin/grep.c:737
msgid "show parse tree for grep expression"
msgstr ""
-#: builtin/grep.c:739
+#: builtin/grep.c:741
msgid "pager"
msgstr ""
-#: builtin/grep.c:739
+#: builtin/grep.c:741
msgid "show matching files in the pager"
msgstr ""
-#: builtin/grep.c:742
+#: builtin/grep.c:744
msgid "allow calling of grep(1) (ignored by this build)"
msgstr ""
-#: builtin/grep.c:743 builtin/show-ref.c:188
+#: builtin/grep.c:745 builtin/show-ref.c:187
msgid "show usage"
msgstr ""
-#: builtin/grep.c:810
+#: builtin/grep.c:812
msgid "no pattern given."
msgstr ""
-#: builtin/grep.c:865
+#: builtin/grep.c:870
msgid "--open-files-in-pager only works on the worktree"
msgstr ""
-#: builtin/grep.c:888
+#: builtin/grep.c:893
msgid "--cached or --untracked cannot be used with --no-index."
msgstr ""
-#: builtin/grep.c:893
+#: builtin/grep.c:898
msgid "--no-index or --untracked cannot be used with revs."
msgstr ""
-#: builtin/grep.c:896
+#: builtin/grep.c:901
msgid "--[no-]exclude-standard cannot be used for tracked contents."
msgstr ""
-#: builtin/grep.c:904
+#: builtin/grep.c:909
msgid "both --cached and trees are given."
msgstr ""
@@ -5403,8 +5595,8 @@ msgstr ""
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr ""
-#: builtin/index-pack.c:669 builtin/pack-objects.c:170
-#: builtin/pack-objects.c:262
+#: builtin/index-pack.c:669 builtin/pack-objects.c:171
+#: builtin/pack-objects.c:263
#, c-format
msgid "unable to read %s"
msgstr ""
@@ -5433,155 +5625,155 @@ msgstr ""
msgid "Not all child objects of %s are reachable"
msgstr ""
-#: builtin/index-pack.c:838 builtin/index-pack.c:868
+#: builtin/index-pack.c:839 builtin/index-pack.c:869
msgid "failed to apply delta"
msgstr ""
-#: builtin/index-pack.c:1009
+#: builtin/index-pack.c:1010
msgid "Receiving objects"
msgstr ""
-#: builtin/index-pack.c:1009
+#: builtin/index-pack.c:1010
msgid "Indexing objects"
msgstr ""
-#: builtin/index-pack.c:1035
+#: builtin/index-pack.c:1036
msgid "pack is corrupted (SHA1 mismatch)"
msgstr ""
-#: builtin/index-pack.c:1040
+#: builtin/index-pack.c:1041
msgid "cannot fstat packfile"
msgstr ""
-#: builtin/index-pack.c:1043
+#: builtin/index-pack.c:1044
msgid "pack has junk at the end"
msgstr ""
-#: builtin/index-pack.c:1054
+#: builtin/index-pack.c:1055
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr ""
-#: builtin/index-pack.c:1077
+#: builtin/index-pack.c:1078
msgid "Resolving deltas"
msgstr ""
-#: builtin/index-pack.c:1087
+#: builtin/index-pack.c:1088
#, c-format
msgid "unable to create thread: %s"
msgstr ""
-#: builtin/index-pack.c:1129
+#: builtin/index-pack.c:1130
msgid "confusion beyond insanity"
msgstr ""
-#: builtin/index-pack.c:1137
+#: builtin/index-pack.c:1138
#, c-format
msgid "completed with %d local objects"
msgstr ""
-#: builtin/index-pack.c:1147
+#: builtin/index-pack.c:1148
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr ""
-#: builtin/index-pack.c:1151
+#: builtin/index-pack.c:1152
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:1176
+#: builtin/index-pack.c:1177
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr ""
-#: builtin/index-pack.c:1255
+#: builtin/index-pack.c:1256
#, c-format
msgid "local object %s is corrupt"
msgstr ""
-#: builtin/index-pack.c:1279
+#: builtin/index-pack.c:1280
msgid "error while closing pack file"
msgstr ""
-#: builtin/index-pack.c:1292
+#: builtin/index-pack.c:1293
#, c-format
msgid "cannot write keep file '%s'"
msgstr ""
-#: builtin/index-pack.c:1300
+#: builtin/index-pack.c:1301
#, c-format
msgid "cannot close written keep file '%s'"
msgstr ""
-#: builtin/index-pack.c:1313
+#: builtin/index-pack.c:1314
msgid "cannot store pack file"
msgstr ""
-#: builtin/index-pack.c:1324
+#: builtin/index-pack.c:1325
msgid "cannot store index file"
msgstr ""
-#: builtin/index-pack.c:1357
+#: builtin/index-pack.c:1358
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr ""
-#: builtin/index-pack.c:1363
+#: builtin/index-pack.c:1364
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr ""
-#: builtin/index-pack.c:1367 builtin/index-pack.c:1545
+#: builtin/index-pack.c:1368 builtin/index-pack.c:1546
#, c-format
msgid "no threads support, ignoring %s"
msgstr ""
-#: builtin/index-pack.c:1425
+#: builtin/index-pack.c:1426
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr ""
-#: builtin/index-pack.c:1427
+#: builtin/index-pack.c:1428
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr ""
-#: builtin/index-pack.c:1474
+#: builtin/index-pack.c:1475
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:1481
+#: builtin/index-pack.c:1482
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:1509
+#: builtin/index-pack.c:1510
msgid "Cannot come back to cwd"
msgstr ""
-#: builtin/index-pack.c:1557 builtin/index-pack.c:1560
-#: builtin/index-pack.c:1572 builtin/index-pack.c:1576
+#: builtin/index-pack.c:1558 builtin/index-pack.c:1561
+#: builtin/index-pack.c:1573 builtin/index-pack.c:1577
#, c-format
msgid "bad %s"
msgstr ""
-#: builtin/index-pack.c:1590
+#: builtin/index-pack.c:1591
msgid "--fix-thin cannot be used without --stdin"
msgstr ""
-#: builtin/index-pack.c:1594 builtin/index-pack.c:1604
+#: builtin/index-pack.c:1595 builtin/index-pack.c:1605
#, c-format
msgid "packfile name '%s' does not end with '.pack'"
msgstr ""
-#: builtin/index-pack.c:1613
+#: builtin/index-pack.c:1614
msgid "--verify with no packfile name given"
msgstr ""
@@ -5670,11 +5862,6 @@ msgstr ""
msgid "unable to move %s to %s"
msgstr ""
-#: builtin/init-db.c:363
-#, c-format
-msgid "Could not create git link %s"
-msgstr ""
-
#.
#. * TRANSLATORS: The first '%s' is either "Reinitialized
#. * existing" or "Initialized empty", the second " shared" or
@@ -5715,7 +5902,7 @@ msgstr ""
msgid "specify that the git repository is to be shared amongst several users"
msgstr ""
-#: builtin/init-db.c:493 builtin/prune-packed.c:75
+#: builtin/init-db.c:493 builtin/prune-packed.c:75 builtin/repack.c:155
msgid "be quiet"
msgstr ""
@@ -5753,381 +5940,381 @@ msgstr ""
msgid " or: git show [options] <object>..."
msgstr ""
-#: builtin/log.c:124
+#: builtin/log.c:125
msgid "suppress diff output"
msgstr ""
-#: builtin/log.c:125
+#: builtin/log.c:126
msgid "show source"
msgstr ""
-#: builtin/log.c:126
+#: builtin/log.c:127
msgid "Use mail map file"
msgstr ""
-#: builtin/log.c:127
+#: builtin/log.c:128
msgid "decorate options"
msgstr ""
-#: builtin/log.c:230
+#: builtin/log.c:231
#, c-format
msgid "Final output: %d %s\n"
msgstr ""
-#: builtin/log.c:453 builtin/log.c:545
+#: builtin/log.c:473 builtin/log.c:565
#, c-format
msgid "Could not read object %s"
msgstr ""
-#: builtin/log.c:569
+#: builtin/log.c:589
#, c-format
msgid "Unknown type: %d"
msgstr ""
-#: builtin/log.c:669
+#: builtin/log.c:689
msgid "format.headers without value"
msgstr ""
-#: builtin/log.c:751
+#: builtin/log.c:771
msgid "name of output directory is too long"
msgstr ""
-#: builtin/log.c:767
+#: builtin/log.c:787
#, c-format
msgid "Cannot open patch file %s"
msgstr ""
-#: builtin/log.c:781
+#: builtin/log.c:801
msgid "Need exactly one range."
msgstr ""
-#: builtin/log.c:789
+#: builtin/log.c:809
msgid "Not a range."
msgstr ""
-#: builtin/log.c:891
+#: builtin/log.c:911
msgid "Cover letter needs email format"
msgstr ""
-#: builtin/log.c:967
+#: builtin/log.c:987
#, c-format
msgid "insane in-reply-to: %s"
msgstr ""
-#: builtin/log.c:995
+#: builtin/log.c:1015
msgid "git format-patch [options] [<since> | <revision range>]"
msgstr ""
-#: builtin/log.c:1040
+#: builtin/log.c:1060
msgid "Two output directories?"
msgstr ""
-#: builtin/log.c:1155
+#: builtin/log.c:1175
msgid "use [PATCH n/m] even with a single patch"
msgstr ""
-#: builtin/log.c:1158
+#: builtin/log.c:1178
msgid "use [PATCH] even with multiple patches"
msgstr ""
-#: builtin/log.c:1162
+#: builtin/log.c:1182
msgid "print patches to standard out"
msgstr ""
-#: builtin/log.c:1164
+#: builtin/log.c:1184
msgid "generate a cover letter"
msgstr ""
-#: builtin/log.c:1166
+#: builtin/log.c:1186
msgid "use simple number sequence for output file names"
msgstr ""
-#: builtin/log.c:1167
+#: builtin/log.c:1187
msgid "sfx"
msgstr ""
-#: builtin/log.c:1168
+#: builtin/log.c:1188
msgid "use <sfx> instead of '.patch'"
msgstr ""
-#: builtin/log.c:1170
+#: builtin/log.c:1190
msgid "start numbering patches at <n> instead of 1"
msgstr ""
-#: builtin/log.c:1172
+#: builtin/log.c:1192
msgid "mark the series as Nth re-roll"
msgstr ""
-#: builtin/log.c:1174
+#: builtin/log.c:1194
msgid "Use [<prefix>] instead of [PATCH]"
msgstr ""
-#: builtin/log.c:1177
+#: builtin/log.c:1197
msgid "store resulting files in <dir>"
msgstr ""
-#: builtin/log.c:1180
+#: builtin/log.c:1200
msgid "don't strip/add [PATCH]"
msgstr ""
-#: builtin/log.c:1183
+#: builtin/log.c:1203
msgid "don't output binary diffs"
msgstr ""
-#: builtin/log.c:1185
+#: builtin/log.c:1205
msgid "don't include a patch matching a commit upstream"
msgstr ""
-#: builtin/log.c:1187
+#: builtin/log.c:1207
msgid "show patch format instead of default (patch + stat)"
msgstr ""
-#: builtin/log.c:1189
+#: builtin/log.c:1209
msgid "Messaging"
msgstr ""
-#: builtin/log.c:1190
+#: builtin/log.c:1210
msgid "header"
msgstr ""
-#: builtin/log.c:1191
+#: builtin/log.c:1211
msgid "add email header"
msgstr ""
-#: builtin/log.c:1192 builtin/log.c:1194
+#: builtin/log.c:1212 builtin/log.c:1214
msgid "email"
msgstr ""
-#: builtin/log.c:1192
+#: builtin/log.c:1212
msgid "add To: header"
msgstr ""
-#: builtin/log.c:1194
+#: builtin/log.c:1214
msgid "add Cc: header"
msgstr ""
-#: builtin/log.c:1196
+#: builtin/log.c:1216
msgid "ident"
msgstr ""
-#: builtin/log.c:1197
+#: builtin/log.c:1217
msgid "set From address to <ident> (or committer ident if absent)"
msgstr ""
-#: builtin/log.c:1199
+#: builtin/log.c:1219
msgid "message-id"
msgstr ""
-#: builtin/log.c:1200
+#: builtin/log.c:1220
msgid "make first mail a reply to <message-id>"
msgstr ""
-#: builtin/log.c:1201 builtin/log.c:1204
+#: builtin/log.c:1221 builtin/log.c:1224
msgid "boundary"
msgstr ""
-#: builtin/log.c:1202
+#: builtin/log.c:1222
msgid "attach the patch"
msgstr ""
-#: builtin/log.c:1205
+#: builtin/log.c:1225
msgid "inline the patch"
msgstr ""
-#: builtin/log.c:1209
+#: builtin/log.c:1229
msgid "enable message threading, styles: shallow, deep"
msgstr ""
-#: builtin/log.c:1211
+#: builtin/log.c:1231
msgid "signature"
msgstr ""
-#: builtin/log.c:1212
+#: builtin/log.c:1232
msgid "add a signature"
msgstr ""
-#: builtin/log.c:1214
+#: builtin/log.c:1233
msgid "don't print the patch filenames"
msgstr ""
-#: builtin/log.c:1288
+#: builtin/log.c:1307
#, c-format
msgid "invalid ident line: %s"
msgstr ""
-#: builtin/log.c:1303
+#: builtin/log.c:1322
msgid "-n and -k are mutually exclusive."
msgstr ""
-#: builtin/log.c:1305
+#: builtin/log.c:1324
msgid "--subject-prefix and -k are mutually exclusive."
msgstr ""
-#: builtin/log.c:1313
+#: builtin/log.c:1332
msgid "--name-only does not make sense"
msgstr ""
-#: builtin/log.c:1315
+#: builtin/log.c:1334
msgid "--name-status does not make sense"
msgstr ""
-#: builtin/log.c:1317
+#: builtin/log.c:1336
msgid "--check does not make sense"
msgstr ""
-#: builtin/log.c:1340
+#: builtin/log.c:1359
msgid "standard output, or directory, which one?"
msgstr ""
-#: builtin/log.c:1342
+#: builtin/log.c:1361
#, c-format
msgid "Could not create directory '%s'"
msgstr ""
-#: builtin/log.c:1490
+#: builtin/log.c:1509
msgid "Failed to create output files"
msgstr ""
-#: builtin/log.c:1539
+#: builtin/log.c:1558
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr ""
-#: builtin/log.c:1594
+#: builtin/log.c:1613
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
msgstr ""
-#: builtin/log.c:1607 builtin/log.c:1609 builtin/log.c:1621
+#: builtin/log.c:1626 builtin/log.c:1628 builtin/log.c:1640
#, c-format
msgid "Unknown commit %s"
msgstr ""
-#: builtin/ls-files.c:408
+#: builtin/ls-files.c:398
msgid "git ls-files [options] [<file>...]"
msgstr ""
-#: builtin/ls-files.c:465
+#: builtin/ls-files.c:455
msgid "identify the file status with tags"
msgstr ""
-#: builtin/ls-files.c:467
+#: builtin/ls-files.c:457
msgid "use lowercase letters for 'assume unchanged' files"
msgstr ""
-#: builtin/ls-files.c:469
+#: builtin/ls-files.c:459
msgid "show cached files in the output (default)"
msgstr ""
-#: builtin/ls-files.c:471
+#: builtin/ls-files.c:461
msgid "show deleted files in the output"
msgstr ""
-#: builtin/ls-files.c:473
+#: builtin/ls-files.c:463
msgid "show modified files in the output"
msgstr ""
-#: builtin/ls-files.c:475
+#: builtin/ls-files.c:465
msgid "show other files in the output"
msgstr ""
-#: builtin/ls-files.c:477
+#: builtin/ls-files.c:467
msgid "show ignored files in the output"
msgstr ""
-#: builtin/ls-files.c:480
+#: builtin/ls-files.c:470
msgid "show staged contents' object name in the output"
msgstr ""
-#: builtin/ls-files.c:482
+#: builtin/ls-files.c:472
msgid "show files on the filesystem that need to be removed"
msgstr ""
-#: builtin/ls-files.c:484
+#: builtin/ls-files.c:474
msgid "show 'other' directories' name only"
msgstr ""
-#: builtin/ls-files.c:487
+#: builtin/ls-files.c:477
msgid "don't show empty directories"
msgstr ""
-#: builtin/ls-files.c:490
+#: builtin/ls-files.c:480
msgid "show unmerged files in the output"
msgstr ""
-#: builtin/ls-files.c:492
+#: builtin/ls-files.c:482
msgid "show resolve-undo information"
msgstr ""
-#: builtin/ls-files.c:494
+#: builtin/ls-files.c:484
msgid "skip files matching pattern"
msgstr ""
-#: builtin/ls-files.c:497
+#: builtin/ls-files.c:487
msgid "exclude patterns are read from <file>"
msgstr ""
-#: builtin/ls-files.c:500
+#: builtin/ls-files.c:490
msgid "read additional per-directory exclude patterns in <file>"
msgstr ""
-#: builtin/ls-files.c:502
+#: builtin/ls-files.c:492
msgid "add the standard git exclusions"
msgstr ""
-#: builtin/ls-files.c:505
+#: builtin/ls-files.c:495
msgid "make the output relative to the project top directory"
msgstr ""
-#: builtin/ls-files.c:508
+#: builtin/ls-files.c:498
msgid "if any <file> is not in the index, treat this as an error"
msgstr ""
-#: builtin/ls-files.c:509
+#: builtin/ls-files.c:499
msgid "tree-ish"
msgstr ""
-#: builtin/ls-files.c:510
+#: builtin/ls-files.c:500
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr ""
-#: builtin/ls-files.c:512
+#: builtin/ls-files.c:502
msgid "show debugging data"
msgstr ""
-#: builtin/ls-tree.c:27
+#: builtin/ls-tree.c:28
msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
msgstr ""
-#: builtin/ls-tree.c:125
+#: builtin/ls-tree.c:126
msgid "only show trees"
msgstr ""
-#: builtin/ls-tree.c:127
+#: builtin/ls-tree.c:128
msgid "recurse into subtrees"
msgstr ""
-#: builtin/ls-tree.c:129
+#: builtin/ls-tree.c:130
msgid "show trees when recursing"
msgstr ""
-#: builtin/ls-tree.c:132
+#: builtin/ls-tree.c:133
msgid "terminate entries with NUL byte"
msgstr ""
-#: builtin/ls-tree.c:133
+#: builtin/ls-tree.c:134
msgid "include object size"
msgstr ""
-#: builtin/ls-tree.c:135 builtin/ls-tree.c:137
+#: builtin/ls-tree.c:136 builtin/ls-tree.c:138
msgid "list only filenames"
msgstr ""
-#: builtin/ls-tree.c:140
+#: builtin/ls-tree.c:141
msgid "use full path names"
msgstr ""
-#: builtin/ls-tree.c:142
+#: builtin/ls-tree.c:143
msgid "list entire tree; not just current directory (implies --full-name)"
msgstr ""
@@ -6202,7 +6389,7 @@ msgstr ""
msgid "Verify that the named commit has a valid GPG signature"
msgstr ""
-#: builtin/merge.c:219 builtin/notes.c:738 builtin/revert.c:114
+#: builtin/merge.c:219 builtin/notes.c:738 builtin/revert.c:89
msgid "strategy"
msgstr ""
@@ -6554,76 +6741,85 @@ msgstr ""
msgid "allow creation of more than one tree"
msgstr ""
-#: builtin/mv.c:14
+#: builtin/mv.c:15
msgid "git mv [options] <source>... <destination>"
msgstr ""
-#: builtin/mv.c:64
+#: builtin/mv.c:67
msgid "force move/rename even if target exists"
msgstr ""
-#: builtin/mv.c:65
+#: builtin/mv.c:68
msgid "skip move/rename errors"
msgstr ""
-#: builtin/mv.c:108
+#: builtin/mv.c:113
#, c-format
msgid "Checking rename of '%s' to '%s'\n"
msgstr ""
-#: builtin/mv.c:112
+#: builtin/mv.c:117
msgid "bad source"
msgstr ""
-#: builtin/mv.c:115
+#: builtin/mv.c:120
msgid "can not move directory into itself"
msgstr ""
-#: builtin/mv.c:118
+#: builtin/mv.c:123
msgid "cannot move directory over file"
msgstr ""
-#: builtin/mv.c:128
+#: builtin/mv.c:129
+#, c-format
+msgid "Huh? Directory %s is in index and no submodule?"
+msgstr ""
+
+#: builtin/mv.c:131 builtin/rm.c:318
+msgid "Please, stage your changes to .gitmodules or stash them to proceed"
+msgstr ""
+
+#: builtin/mv.c:147
#, c-format
msgid "Huh? %.*s is in index?"
msgstr ""
-#: builtin/mv.c:140
+#: builtin/mv.c:159
msgid "source directory is empty"
msgstr ""
-#: builtin/mv.c:171
+#: builtin/mv.c:191
msgid "not under version control"
msgstr ""
-#: builtin/mv.c:173
+#: builtin/mv.c:193
msgid "destination exists"
msgstr ""
-#: builtin/mv.c:181
+#: builtin/mv.c:201
#, c-format
msgid "overwriting '%s'"
msgstr ""
-#: builtin/mv.c:184
+#: builtin/mv.c:204
msgid "Cannot overwrite"
msgstr ""
-#: builtin/mv.c:187
+#: builtin/mv.c:207
msgid "multiple sources for the same target"
msgstr ""
-#: builtin/mv.c:202
+#: builtin/mv.c:222
#, c-format
msgid "%s, source=%s, destination=%s"
msgstr ""
-#: builtin/mv.c:212
+#: builtin/mv.c:232
#, c-format
msgid "Renaming %s to %s\n"
msgstr ""
-#: builtin/mv.c:215 builtin/remote.c:731
+#: builtin/mv.c:235 builtin/remote.c:731 builtin/repack.c:330
#, c-format
msgid "renaming '%s' failed"
msgstr ""
@@ -6661,7 +6857,7 @@ msgid "read from stdin"
msgstr ""
#: builtin/name-rev.c:320
-msgid "allow to print `undefined` names"
+msgid "allow to print `undefined` names (default)"
msgstr ""
#: builtin/name-rev.c:326
@@ -6810,12 +7006,12 @@ msgstr ""
msgid "The note contents has been left in %s"
msgstr ""
-#: builtin/notes.c:248 builtin/tag.c:540
+#: builtin/notes.c:248 builtin/tag.c:537
#, c-format
msgid "cannot read '%s'"
msgstr ""
-#: builtin/notes.c:250 builtin/tag.c:543
+#: builtin/notes.c:250 builtin/tag.c:540
#, c-format
msgid "could not open or read '%s'"
msgstr ""
@@ -6823,7 +7019,7 @@ msgstr ""
#: builtin/notes.c:269 builtin/notes.c:316 builtin/notes.c:318
#: builtin/notes.c:378 builtin/notes.c:432 builtin/notes.c:515
#: builtin/notes.c:520 builtin/notes.c:595 builtin/notes.c:637
-#: builtin/notes.c:839 builtin/tag.c:556
+#: builtin/notes.c:839 builtin/tag.c:553
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr ""
@@ -6986,148 +7182,148 @@ msgstr ""
msgid "git pack-objects [options...] base-name [< ref-list | < object-list]"
msgstr ""
-#: builtin/pack-objects.c:183 builtin/pack-objects.c:186
+#: builtin/pack-objects.c:184 builtin/pack-objects.c:187
#, c-format
msgid "deflate error (%d)"
msgstr ""
-#: builtin/pack-objects.c:2397
+#: builtin/pack-objects.c:2398
#, c-format
msgid "unsupported index version %s"
msgstr ""
-#: builtin/pack-objects.c:2401
+#: builtin/pack-objects.c:2402
#, c-format
msgid "bad index version '%s'"
msgstr ""
-#: builtin/pack-objects.c:2424
+#: builtin/pack-objects.c:2425
#, c-format
msgid "option %s does not accept negative form"
msgstr ""
-#: builtin/pack-objects.c:2428
+#: builtin/pack-objects.c:2429
#, c-format
msgid "unable to parse value '%s' for option %s"
msgstr ""
-#: builtin/pack-objects.c:2447
+#: builtin/pack-objects.c:2448
msgid "do not show progress meter"
msgstr ""
-#: builtin/pack-objects.c:2449
+#: builtin/pack-objects.c:2450
msgid "show progress meter"
msgstr ""
-#: builtin/pack-objects.c:2451
+#: builtin/pack-objects.c:2452
msgid "show progress meter during object writing phase"
msgstr ""
-#: builtin/pack-objects.c:2454
+#: builtin/pack-objects.c:2455
msgid "similar to --all-progress when progress meter is shown"
msgstr ""
-#: builtin/pack-objects.c:2455
+#: builtin/pack-objects.c:2456
msgid "version[,offset]"
msgstr ""
-#: builtin/pack-objects.c:2456
+#: builtin/pack-objects.c:2457
msgid "write the pack index file in the specified idx format version"
msgstr ""
-#: builtin/pack-objects.c:2459
+#: builtin/pack-objects.c:2460
msgid "maximum size of each output pack file"
msgstr ""
-#: builtin/pack-objects.c:2461
+#: builtin/pack-objects.c:2462
msgid "ignore borrowed objects from alternate object store"
msgstr ""
-#: builtin/pack-objects.c:2463
+#: builtin/pack-objects.c:2464
msgid "ignore packed objects"
msgstr ""
-#: builtin/pack-objects.c:2465
+#: builtin/pack-objects.c:2466
msgid "limit pack window by objects"
msgstr ""
-#: builtin/pack-objects.c:2467
+#: builtin/pack-objects.c:2468
msgid "limit pack window by memory in addition to object limit"
msgstr ""
-#: builtin/pack-objects.c:2469
+#: builtin/pack-objects.c:2470
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr ""
-#: builtin/pack-objects.c:2471
+#: builtin/pack-objects.c:2472
msgid "reuse existing deltas"
msgstr ""
-#: builtin/pack-objects.c:2473
+#: builtin/pack-objects.c:2474
msgid "reuse existing objects"
msgstr ""
-#: builtin/pack-objects.c:2475
+#: builtin/pack-objects.c:2476
msgid "use OFS_DELTA objects"
msgstr ""
-#: builtin/pack-objects.c:2477
+#: builtin/pack-objects.c:2478
msgid "use threads when searching for best delta matches"
msgstr ""
-#: builtin/pack-objects.c:2479
+#: builtin/pack-objects.c:2480
msgid "do not create an empty pack output"
msgstr ""
-#: builtin/pack-objects.c:2481
+#: builtin/pack-objects.c:2482
msgid "read revision arguments from standard input"
msgstr ""
-#: builtin/pack-objects.c:2483
+#: builtin/pack-objects.c:2484
msgid "limit the objects to those that are not yet packed"
msgstr ""
-#: builtin/pack-objects.c:2486
+#: builtin/pack-objects.c:2487
msgid "include objects reachable from any reference"
msgstr ""
-#: builtin/pack-objects.c:2489
+#: builtin/pack-objects.c:2490
msgid "include objects referred by reflog entries"
msgstr ""
-#: builtin/pack-objects.c:2492
+#: builtin/pack-objects.c:2493
msgid "output pack to stdout"
msgstr ""
-#: builtin/pack-objects.c:2494
+#: builtin/pack-objects.c:2495
msgid "include tag objects that refer to objects to be packed"
msgstr ""
-#: builtin/pack-objects.c:2496
+#: builtin/pack-objects.c:2497
msgid "keep unreachable objects"
msgstr ""
-#: builtin/pack-objects.c:2497 parse-options.h:141
+#: builtin/pack-objects.c:2498 parse-options.h:143
msgid "time"
msgstr ""
-#: builtin/pack-objects.c:2498
+#: builtin/pack-objects.c:2499
msgid "unpack unreachable objects newer than <time>"
msgstr ""
-#: builtin/pack-objects.c:2501
+#: builtin/pack-objects.c:2502
msgid "create thin packs"
msgstr ""
-#: builtin/pack-objects.c:2503
+#: builtin/pack-objects.c:2504
msgid "ignore packs that have companion .keep file"
msgstr ""
-#: builtin/pack-objects.c:2505
+#: builtin/pack-objects.c:2506
msgid "pack compression level"
msgstr ""
-#: builtin/pack-objects.c:2507
+#: builtin/pack-objects.c:2508
msgid "do not hide commits by grafts"
msgstr ""
@@ -7167,21 +7363,21 @@ msgstr ""
msgid "git push [<options>] [<repository> [<refspec>...]]"
msgstr ""
-#: builtin/push.c:45
+#: builtin/push.c:47
msgid "tag shorthand without <tag>"
msgstr ""
-#: builtin/push.c:64
+#: builtin/push.c:66
msgid "--delete only accepts plain target ref names"
msgstr ""
-#: builtin/push.c:99
+#: builtin/push.c:101
msgid ""
"\n"
"To choose either option permanently, see push.default in 'git help config'."
msgstr ""
-#: builtin/push.c:102
+#: builtin/push.c:104
#, c-format
msgid ""
"The upstream branch of your current branch does not match\n"
@@ -7196,7 +7392,7 @@ msgid ""
"%s"
msgstr ""
-#: builtin/push.c:117
+#: builtin/push.c:119
#, c-format
msgid ""
"You are not currently on a branch.\n"
@@ -7206,7 +7402,7 @@ msgid ""
" git push %s HEAD:<name-of-remote-branch>\n"
msgstr ""
-#: builtin/push.c:131
+#: builtin/push.c:133
#, c-format
msgid ""
"The current branch %s has no upstream branch.\n"
@@ -7215,12 +7411,12 @@ msgid ""
" git push --set-upstream %s %s\n"
msgstr ""
-#: builtin/push.c:139
+#: builtin/push.c:141
#, c-format
msgid "The current branch %s has multiple upstream branches, refusing to push."
msgstr ""
-#: builtin/push.c:142
+#: builtin/push.c:144
#, c-format
msgid ""
"You are pushing to remote '%s', which is not the upstream of\n"
@@ -7228,7 +7424,7 @@ msgid ""
"to update which remote branch."
msgstr ""
-#: builtin/push.c:165
+#: builtin/push.c:167
msgid ""
"push.default is unset; its implicit value is changing in\n"
"Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
@@ -7246,12 +7442,12 @@ msgid ""
"'current' instead of 'simple' if you sometimes use older versions of Git)"
msgstr ""
-#: builtin/push.c:225
+#: builtin/push.c:227
msgid ""
"You didn't specify any refspecs to push, and push.default is \"nothing\"."
msgstr ""
-#: builtin/push.c:232
+#: builtin/push.c:234
msgid ""
"Updates were rejected because the tip of your current branch is behind\n"
"its remote counterpart. Integrate the remote changes (e.g.\n"
@@ -7259,7 +7455,7 @@ msgid ""
"See the 'Note about fast-forwards' in 'git push --help' for details."
msgstr ""
-#: builtin/push.c:238
+#: builtin/push.c:240
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"
@@ -7267,7 +7463,7 @@ msgid ""
"to 'simple', 'current' or 'upstream' to push only the current branch."
msgstr ""
-#: builtin/push.c:244
+#: builtin/push.c:246
msgid ""
"Updates were rejected because a pushed branch tip is behind its remote\n"
"counterpart. Check out this branch and integrate the remote changes\n"
@@ -7275,7 +7471,7 @@ msgid ""
"See the 'Note about fast-forwards' in 'git push --help' for details."
msgstr ""
-#: builtin/push.c:250
+#: builtin/push.c:252
msgid ""
"Updates were rejected because the remote contains work that you do\n"
"not have locally. This is usually caused by another repository pushing\n"
@@ -7284,33 +7480,33 @@ msgid ""
"See the 'Note about fast-forwards' in 'git push --help' for details."
msgstr ""
-#: builtin/push.c:257
+#: builtin/push.c:259
msgid "Updates were rejected because the tag already exists in the remote."
msgstr ""
-#: builtin/push.c:260
+#: builtin/push.c:262
msgid ""
"You cannot update a remote ref that points at a non-commit object,\n"
"or update a remote ref to make it point at a non-commit object,\n"
"without using the '--force' option.\n"
msgstr ""
-#: builtin/push.c:320
+#: builtin/push.c:328
#, c-format
msgid "Pushing to %s\n"
msgstr ""
-#: builtin/push.c:324
+#: builtin/push.c:332
#, c-format
msgid "failed to push some refs to '%s'"
msgstr ""
-#: builtin/push.c:357
+#: builtin/push.c:365
#, c-format
msgid "bad repository '%s'"
msgstr ""
-#: builtin/push.c:358
+#: builtin/push.c:366
msgid ""
"No configured push destination.\n"
"Either specify the URL from the command-line or configure a remote "
@@ -7323,87 +7519,95 @@ msgid ""
" git push <name>\n"
msgstr ""
-#: builtin/push.c:373
+#: builtin/push.c:381
msgid "--all and --tags are incompatible"
msgstr ""
-#: builtin/push.c:374
+#: builtin/push.c:382
msgid "--all can't be combined with refspecs"
msgstr ""
-#: builtin/push.c:379
+#: builtin/push.c:387
msgid "--mirror and --tags are incompatible"
msgstr ""
-#: builtin/push.c:380
+#: builtin/push.c:388
msgid "--mirror can't be combined with refspecs"
msgstr ""
-#: builtin/push.c:385
+#: builtin/push.c:393
msgid "--all and --mirror are incompatible"
msgstr ""
-#: builtin/push.c:445
+#: builtin/push.c:453
msgid "repository"
msgstr ""
-#: builtin/push.c:446
+#: builtin/push.c:454
msgid "push all refs"
msgstr ""
-#: builtin/push.c:447
+#: builtin/push.c:455
msgid "mirror all refs"
msgstr ""
-#: builtin/push.c:449
+#: builtin/push.c:457
msgid "delete refs"
msgstr ""
-#: builtin/push.c:450
+#: builtin/push.c:458
msgid "push tags (can't be used with --all or --mirror)"
msgstr ""
-#: builtin/push.c:453
+#: builtin/push.c:461
msgid "force updates"
msgstr ""
-#: builtin/push.c:454
+#: builtin/push.c:463
+msgid "refname>:<expect"
+msgstr ""
+
+#: builtin/push.c:464
+msgid "require old value of ref to be at this value"
+msgstr ""
+
+#: builtin/push.c:466
msgid "check"
msgstr ""
-#: builtin/push.c:455
+#: builtin/push.c:467
msgid "control recursive pushing of submodules"
msgstr ""
-#: builtin/push.c:457
+#: builtin/push.c:469
msgid "use thin pack"
msgstr ""
-#: builtin/push.c:458 builtin/push.c:459
+#: builtin/push.c:470 builtin/push.c:471
msgid "receive pack program"
msgstr ""
-#: builtin/push.c:460
+#: builtin/push.c:472
msgid "set upstream for git pull/status"
msgstr ""
-#: builtin/push.c:463
+#: builtin/push.c:475
msgid "prune locally removed refs"
msgstr ""
-#: builtin/push.c:465
+#: builtin/push.c:477
msgid "bypass pre-push hook"
msgstr ""
-#: builtin/push.c:466
+#: builtin/push.c:478
msgid "push missing but relevant tags"
msgstr ""
-#: builtin/push.c:476
+#: builtin/push.c:488
msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr ""
-#: builtin/push.c:478
+#: builtin/push.c:490
msgid "--delete doesn't make sense without any refs"
msgstr ""
@@ -7478,12 +7682,12 @@ msgstr ""
msgid "debug unpack-trees"
msgstr ""
-#: builtin/reflog.c:500
+#: builtin/reflog.c:499
#, c-format
msgid "%s' for '%s' is not a valid timestamp"
msgstr ""
-#: builtin/reflog.c:616 builtin/reflog.c:621
+#: builtin/reflog.c:615 builtin/reflog.c:620
#, c-format
msgid "'%s' is not a valid timestamp"
msgstr ""
@@ -7506,8 +7710,8 @@ msgstr ""
msgid "git remote remove <name>"
msgstr ""
-#: builtin/remote.c:15 builtin/remote.c:42
-msgid "git remote set-head <name> (-a | -d | <branch>)"
+#: builtin/remote.c:15
+msgid "git remote set-head <name> (-a | --auto | -d | --delete |<branch>)"
msgstr ""
#: builtin/remote.c:16
@@ -7543,6 +7747,10 @@ msgstr ""
msgid "git remote add [<options>] <name> <url>"
msgstr ""
+#: builtin/remote.c:42
+msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
+msgstr ""
+
#: builtin/remote.c:47
msgid "git remote set-branches <name> <branch>..."
msgstr ""
@@ -7970,6 +8178,67 @@ msgstr ""
msgid "be verbose; must be placed before a subcommand"
msgstr ""
+#: builtin/repack.c:15
+msgid "git repack [options]"
+msgstr ""
+
+#: builtin/repack.c:143
+msgid "pack everything in a single pack"
+msgstr ""
+
+#: builtin/repack.c:145
+msgid "same as -a, and turn unreachable objects loose"
+msgstr ""
+
+#: builtin/repack.c:148
+msgid "remove redundant packs, and run git-prune-packed"
+msgstr ""
+
+#: builtin/repack.c:150
+msgid "pass --no-reuse-delta to git-pack-objects"
+msgstr ""
+
+#: builtin/repack.c:152
+msgid "pass --no-reuse-object to git-pack-objects"
+msgstr ""
+
+#: builtin/repack.c:154
+msgid "do not run git-update-server-info"
+msgstr ""
+
+#: builtin/repack.c:157
+msgid "pass --local to git-pack-objects"
+msgstr ""
+
+#: builtin/repack.c:158
+msgid "approxidate"
+msgstr ""
+
+#: builtin/repack.c:159
+msgid "with -A, do not loosen objects older than this"
+msgstr ""
+
+#: builtin/repack.c:161
+msgid "size of the window used for delta compression"
+msgstr ""
+
+#: builtin/repack.c:163
+msgid "same as the above, but limit memory size instead of entries count"
+msgstr ""
+
+#: builtin/repack.c:165
+msgid "limits the maximum delta depth"
+msgstr ""
+
+#: builtin/repack.c:167
+msgid "maximum size of each packfile"
+msgstr ""
+
+#: builtin/repack.c:345
+#, c-format
+msgid "removing '%s' failed"
+msgstr ""
+
#: builtin/replace.c:17
msgid "git replace [-f] <object> <replacement>"
msgstr ""
@@ -7982,23 +8251,23 @@ msgstr ""
msgid "git replace -l [<pattern>]"
msgstr ""
-#: builtin/replace.c:121
+#: builtin/replace.c:131
msgid "list replace refs"
msgstr ""
-#: builtin/replace.c:122
+#: builtin/replace.c:132
msgid "delete replace refs"
msgstr ""
-#: builtin/replace.c:123
+#: builtin/replace.c:133
msgid "replace the ref if it exists"
msgstr ""
-#: builtin/rerere.c:11
+#: builtin/rerere.c:12
msgid "git rerere [clear | forget path... | status | remaining | diff | gc]"
msgstr ""
-#: builtin/rerere.c:56
+#: builtin/rerere.c:57
msgid "register clean resolutions in index"
msgstr ""
@@ -8058,69 +8327,69 @@ msgstr ""
msgid "Cannot do a %s reset in the middle of a merge."
msgstr ""
-#: builtin/reset.c:251
+#: builtin/reset.c:262
msgid "be quiet, only report errors"
msgstr ""
-#: builtin/reset.c:253
+#: builtin/reset.c:264
msgid "reset HEAD and index"
msgstr ""
-#: builtin/reset.c:254
+#: builtin/reset.c:265
msgid "reset only HEAD"
msgstr ""
-#: builtin/reset.c:256 builtin/reset.c:258
+#: builtin/reset.c:267 builtin/reset.c:269
msgid "reset HEAD, index and working tree"
msgstr ""
-#: builtin/reset.c:260
+#: builtin/reset.c:271
msgid "reset HEAD but keep local changes"
msgstr ""
-#: builtin/reset.c:278
+#: builtin/reset.c:289
#, c-format
msgid "Failed to resolve '%s' as a valid revision."
msgstr ""
-#: builtin/reset.c:281 builtin/reset.c:289
+#: builtin/reset.c:292 builtin/reset.c:300
#, c-format
msgid "Could not parse object '%s'."
msgstr ""
-#: builtin/reset.c:286
+#: builtin/reset.c:297
#, c-format
msgid "Failed to resolve '%s' as a valid tree."
msgstr ""
-#: builtin/reset.c:295
+#: builtin/reset.c:306
msgid "--patch is incompatible with --{hard,mixed,soft}"
msgstr ""
-#: builtin/reset.c:304
+#: builtin/reset.c:315
msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
msgstr ""
-#: builtin/reset.c:306
+#: builtin/reset.c:317
#, c-format
msgid "Cannot do %s reset with paths."
msgstr ""
-#: builtin/reset.c:316
+#: builtin/reset.c:327
#, c-format
msgid "%s reset is not allowed in a bare repository"
msgstr ""
-#: builtin/reset.c:336
-#, c-format
-msgid "Could not reset index file to revision '%s'."
+#: builtin/reset.c:344
+msgid "Unstaged changes after reset:"
msgstr ""
-#: builtin/reset.c:342
-msgid "Unstaged changes after reset:"
+#: builtin/reset.c:350
+#, c-format
+msgid "Could not reset index file to revision '%s'."
msgstr ""
-#: builtin/reset.c:347
+#: builtin/reset.c:355
msgid "Could not write new index file."
msgstr ""
@@ -8161,84 +8430,84 @@ msgstr ""
msgid "git cherry-pick <subcommand>"
msgstr ""
-#: builtin/revert.c:71 builtin/revert.c:94
+#: builtin/revert.c:71
#, c-format
msgid "%s: %s cannot be used with %s"
msgstr ""
-#: builtin/revert.c:105
+#: builtin/revert.c:80
msgid "end revert or cherry-pick sequence"
msgstr ""
-#: builtin/revert.c:106
+#: builtin/revert.c:81
msgid "resume revert or cherry-pick sequence"
msgstr ""
-#: builtin/revert.c:107
+#: builtin/revert.c:82
msgid "cancel revert or cherry-pick sequence"
msgstr ""
-#: builtin/revert.c:108
+#: builtin/revert.c:83
msgid "don't automatically commit"
msgstr ""
-#: builtin/revert.c:109
+#: builtin/revert.c:84
msgid "edit the commit message"
msgstr ""
-#: builtin/revert.c:112
+#: builtin/revert.c:87
msgid "parent number"
msgstr ""
-#: builtin/revert.c:114
+#: builtin/revert.c:89
msgid "merge strategy"
msgstr ""
-#: builtin/revert.c:115
+#: builtin/revert.c:90
msgid "option"
msgstr ""
-#: builtin/revert.c:116
+#: builtin/revert.c:91
msgid "option for merge strategy"
msgstr ""
-#: builtin/revert.c:127
+#: builtin/revert.c:102
msgid "append commit name"
msgstr ""
-#: builtin/revert.c:128
+#: builtin/revert.c:103
msgid "allow fast-forward"
msgstr ""
-#: builtin/revert.c:129
+#: builtin/revert.c:104
msgid "preserve initially empty commits"
msgstr ""
-#: builtin/revert.c:130
+#: builtin/revert.c:105
msgid "allow commits with empty messages"
msgstr ""
-#: builtin/revert.c:131
+#: builtin/revert.c:106
msgid "keep redundant, empty commits"
msgstr ""
-#: builtin/revert.c:135
+#: builtin/revert.c:110
msgid "program error"
msgstr ""
-#: builtin/revert.c:225
+#: builtin/revert.c:195
msgid "revert failed"
msgstr ""
-#: builtin/revert.c:240
+#: builtin/revert.c:210
msgid "cherry-pick failed"
msgstr ""
-#: builtin/rm.c:16
+#: builtin/rm.c:17
msgid "git rm [options] [--] <file>..."
msgstr ""
-#: builtin/rm.c:64
+#: builtin/rm.c:65
msgid ""
"the following submodule (or one of its nested submodules)\n"
"uses a .git directory:"
@@ -8248,13 +8517,13 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: builtin/rm.c:70
+#: builtin/rm.c:71
msgid ""
"\n"
"(use 'rm -rf' if you really want to remove it including all of its history)"
msgstr ""
-#: builtin/rm.c:230
+#: builtin/rm.c:231
msgid ""
"the following file has staged content different from both the\n"
"file and the HEAD:"
@@ -8264,56 +8533,56 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: builtin/rm.c:235
+#: builtin/rm.c:236
msgid ""
"\n"
"(use -f to force removal)"
msgstr ""
-#: builtin/rm.c:239
+#: builtin/rm.c:240
msgid "the following file has changes staged in the index:"
msgid_plural "the following files have changes staged in the index:"
msgstr[0] ""
msgstr[1] ""
-#: builtin/rm.c:243 builtin/rm.c:254
+#: builtin/rm.c:244 builtin/rm.c:255
msgid ""
"\n"
"(use --cached to keep the file, or -f to force removal)"
msgstr ""
-#: builtin/rm.c:251
+#: builtin/rm.c:252
msgid "the following file has local modifications:"
msgid_plural "the following files have local modifications:"
msgstr[0] ""
msgstr[1] ""
-#: builtin/rm.c:269
+#: builtin/rm.c:270
msgid "do not list removed files"
msgstr ""
-#: builtin/rm.c:270
+#: builtin/rm.c:271
msgid "only remove from the index"
msgstr ""
-#: builtin/rm.c:271
+#: builtin/rm.c:272
msgid "override the up-to-date check"
msgstr ""
-#: builtin/rm.c:272
+#: builtin/rm.c:273
msgid "allow recursive removal"
msgstr ""
-#: builtin/rm.c:274
+#: builtin/rm.c:275
msgid "exit with a zero status even if nothing matched"
msgstr ""
-#: builtin/rm.c:345
+#: builtin/rm.c:336
#, c-format
msgid "not removing '%s' recursively without -r"
msgstr ""
-#: builtin/rm.c:384
+#: builtin/rm.c:375
#, c-format
msgid "git rm: unable to remove %s"
msgstr ""
@@ -8327,23 +8596,23 @@ msgstr ""
msgid "Missing author: %s"
msgstr ""
-#: builtin/shortlog.c:228
+#: builtin/shortlog.c:230
msgid "sort output according to the number of commits per author"
msgstr ""
-#: builtin/shortlog.c:230
+#: builtin/shortlog.c:232
msgid "Suppress commit descriptions, only provides commit count"
msgstr ""
-#: builtin/shortlog.c:232
+#: builtin/shortlog.c:234
msgid "Show the email address of each author"
msgstr ""
-#: builtin/shortlog.c:233
+#: builtin/shortlog.c:235
msgid "w[,i1[,i2]]"
msgstr ""
-#: builtin/shortlog.c:234
+#: builtin/shortlog.c:236
msgid "Linewrap output"
msgstr ""
@@ -8445,23 +8714,23 @@ msgstr ""
msgid "stricter reference checking, requires exact ref path"
msgstr ""
-#: builtin/show-ref.c:173 builtin/show-ref.c:176
+#: builtin/show-ref.c:173 builtin/show-ref.c:175
msgid "show the HEAD reference, even if it would be filtered out"
msgstr ""
-#: builtin/show-ref.c:178
+#: builtin/show-ref.c:177
msgid "dereference tags into object IDs"
msgstr ""
-#: builtin/show-ref.c:180
+#: builtin/show-ref.c:179
msgid "only show SHA1 hash using <n> digits"
msgstr ""
-#: builtin/show-ref.c:184
+#: builtin/show-ref.c:183
msgid "do not print results to stdout (useful with --verify)"
msgstr ""
-#: builtin/show-ref.c:186
+#: builtin/show-ref.c:185
msgid "show refs from stdin that aren't in local repository"
msgstr ""
@@ -8485,11 +8754,11 @@ msgstr ""
msgid "shorten ref output"
msgstr ""
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:18
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:254
msgid "reason"
msgstr ""
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:18
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:254
msgid "reason of the update"
msgstr ""
@@ -8644,183 +8913,195 @@ msgstr ""
msgid "print only tags of the object"
msgstr ""
-#: builtin/tag.c:504
+#: builtin/tag.c:501
msgid "--column and -n are incompatible"
msgstr ""
-#: builtin/tag.c:521
+#: builtin/tag.c:518
msgid "-n option is only allowed with -l."
msgstr ""
-#: builtin/tag.c:523
+#: builtin/tag.c:520
msgid "--contains option is only allowed with -l."
msgstr ""
-#: builtin/tag.c:525
+#: builtin/tag.c:522
msgid "--points-at option is only allowed with -l."
msgstr ""
-#: builtin/tag.c:533
+#: builtin/tag.c:530
msgid "only one -F or -m option is allowed."
msgstr ""
-#: builtin/tag.c:553
+#: builtin/tag.c:550
msgid "too many params"
msgstr ""
-#: builtin/tag.c:559
+#: builtin/tag.c:556
#, c-format
msgid "'%s' is not a valid tag name."
msgstr ""
-#: builtin/tag.c:564
+#: builtin/tag.c:561
#, c-format
msgid "tag '%s' already exists"
msgstr ""
-#: builtin/tag.c:582
+#: builtin/tag.c:579
#, c-format
msgid "%s: cannot lock the ref"
msgstr ""
-#: builtin/tag.c:584
+#: builtin/tag.c:581
#, c-format
msgid "%s: cannot update the ref"
msgstr ""
-#: builtin/tag.c:586
+#: builtin/tag.c:583
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr ""
-#: builtin/update-index.c:401
+#: builtin/update-index.c:402
msgid "git update-index [options] [--] [<file>...]"
msgstr ""
-#: builtin/update-index.c:718
+#: builtin/update-index.c:720
msgid "continue refresh even when index needs update"
msgstr ""
-#: builtin/update-index.c:721
+#: builtin/update-index.c:723
msgid "refresh: ignore submodules"
msgstr ""
-#: builtin/update-index.c:724
+#: builtin/update-index.c:726
msgid "do not ignore new files"
msgstr ""
-#: builtin/update-index.c:726
+#: builtin/update-index.c:728
msgid "let files replace directories and vice-versa"
msgstr ""
-#: builtin/update-index.c:728
+#: builtin/update-index.c:730
msgid "notice files missing from worktree"
msgstr ""
-#: builtin/update-index.c:730
+#: builtin/update-index.c:732
msgid "refresh even if index contains unmerged entries"
msgstr ""
-#: builtin/update-index.c:733
+#: builtin/update-index.c:735
msgid "refresh stat information"
msgstr ""
-#: builtin/update-index.c:737
+#: builtin/update-index.c:739
msgid "like --refresh, but ignore assume-unchanged setting"
msgstr ""
-#: builtin/update-index.c:741
+#: builtin/update-index.c:743
msgid "<mode> <object> <path>"
msgstr ""
-#: builtin/update-index.c:742
+#: builtin/update-index.c:744
msgid "add the specified entry to the index"
msgstr ""
-#: builtin/update-index.c:746
+#: builtin/update-index.c:748
msgid "(+/-)x"
msgstr ""
-#: builtin/update-index.c:747
+#: builtin/update-index.c:749
msgid "override the executable bit of the listed files"
msgstr ""
-#: builtin/update-index.c:751
+#: builtin/update-index.c:753
msgid "mark files as \"not changing\""
msgstr ""
-#: builtin/update-index.c:754
+#: builtin/update-index.c:756
msgid "clear assumed-unchanged bit"
msgstr ""
-#: builtin/update-index.c:757
+#: builtin/update-index.c:759
msgid "mark files as \"index-only\""
msgstr ""
-#: builtin/update-index.c:760
+#: builtin/update-index.c:762
msgid "clear skip-worktree bit"
msgstr ""
-#: builtin/update-index.c:763
+#: builtin/update-index.c:765
msgid "add to index only; do not add content to object database"
msgstr ""
-#: builtin/update-index.c:765
+#: builtin/update-index.c:767
msgid "remove named paths even if present in worktree"
msgstr ""
-#: builtin/update-index.c:767
+#: builtin/update-index.c:769
msgid "with --stdin: input lines are terminated by null bytes"
msgstr ""
-#: builtin/update-index.c:769
+#: builtin/update-index.c:771
msgid "read list of paths to be updated from standard input"
msgstr ""
-#: builtin/update-index.c:773
+#: builtin/update-index.c:775
msgid "add entries from standard input to the index"
msgstr ""
-#: builtin/update-index.c:777
+#: builtin/update-index.c:779
msgid "repopulate stages #2 and #3 for the listed paths"
msgstr ""
-#: builtin/update-index.c:781
+#: builtin/update-index.c:783
msgid "only update entries that differ from HEAD"
msgstr ""
-#: builtin/update-index.c:785
+#: builtin/update-index.c:787
msgid "ignore files missing from worktree"
msgstr ""
-#: builtin/update-index.c:788
+#: builtin/update-index.c:790
msgid "report actions to standard output"
msgstr ""
-#: builtin/update-index.c:790
+#: builtin/update-index.c:792
msgid "(for porcelains) forget saved unresolved conflicts"
msgstr ""
-#: builtin/update-index.c:794
+#: builtin/update-index.c:796
msgid "write index in this format"
msgstr ""
-#: builtin/update-ref.c:7
+#: builtin/update-ref.c:9
msgid "git update-ref [options] -d <refname> [<oldval>]"
msgstr ""
-#: builtin/update-ref.c:8
+#: builtin/update-ref.c:10
msgid "git update-ref [options] <refname> <newval> [<oldval>]"
msgstr ""
-#: builtin/update-ref.c:19
+#: builtin/update-ref.c:11
+msgid "git update-ref [options] --stdin [-z]"
+msgstr ""
+
+#: builtin/update-ref.c:255
msgid "delete the reference"
msgstr ""
-#: builtin/update-ref.c:21
+#: builtin/update-ref.c:257
msgid "update <refname> not the one it points to"
msgstr ""
+#: builtin/update-ref.c:258
+msgid "stdin has NUL-terminated arguments"
+msgstr ""
+
+#: builtin/update-ref.c:259
+msgid "read updates from stdin"
+msgstr ""
+
#: builtin/update-server-info.c:6
msgid "git update-server-info [--force]"
msgstr ""
@@ -8872,23 +9153,23 @@ msgid ""
"to read about a specific subcommand or concept."
msgstr ""
-#: parse-options.h:144
+#: parse-options.h:146
msgid "expiry date"
msgstr ""
-#: parse-options.h:159
+#: parse-options.h:161
msgid "no-op (backward compatibility)"
msgstr ""
-#: parse-options.h:236
+#: parse-options.h:238
msgid "be more verbose"
msgstr ""
-#: parse-options.h:238
+#: parse-options.h:240
msgid "be more quiet"
msgstr ""
-#: parse-options.h:244
+#: parse-options.h:246
msgid "use <n> digits to display SHA-1s"
msgstr ""
@@ -9284,7 +9565,7 @@ msgstr ""
msgid "Pull is not possible because you have unmerged files."
msgstr ""
-#: git-pull.sh:203
+#: git-pull.sh:223
msgid "updating an unborn branch with changes added to the index"
msgstr ""
@@ -9292,7 +9573,7 @@ msgstr ""
#. The working tree and the index file is still based on the
#. $orig_head commit, but we are merging into $curr_head.
#. First update the working tree to match $curr_head.
-#: git-pull.sh:235
+#: git-pull.sh:255
#, sh-format
msgid ""
"Warning: fetch updated the current branch head.\n"
@@ -9300,11 +9581,11 @@ msgid ""
"Warning: commit $orig_head."
msgstr ""
-#: git-pull.sh:260
+#: git-pull.sh:280
msgid "Cannot merge multiple branches into empty head"
msgstr ""
-#: git-pull.sh:264
+#: git-pull.sh:284
msgid "Cannot rebase onto multiple branches"
msgstr ""
@@ -9332,42 +9613,42 @@ msgid ""
"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
msgstr ""
-#: git-rebase.sh:190
+#: git-rebase.sh:199
msgid "The pre-rebase hook refused to rebase."
msgstr ""
-#: git-rebase.sh:195
+#: git-rebase.sh:204
msgid "It looks like git-am is in progress. Cannot rebase."
msgstr ""
-#: git-rebase.sh:329
+#: git-rebase.sh:338
msgid "The --exec option must be used with the --interactive option"
msgstr ""
-#: git-rebase.sh:334
+#: git-rebase.sh:343
msgid "No rebase in progress?"
msgstr ""
-#: git-rebase.sh:345
+#: git-rebase.sh:354
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr ""
-#: git-rebase.sh:352
+#: git-rebase.sh:361
msgid "Cannot read HEAD"
msgstr ""
-#: git-rebase.sh:355
+#: git-rebase.sh:364
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
msgstr ""
-#: git-rebase.sh:373
+#: git-rebase.sh:382
#, sh-format
msgid "Could not move back to $head_name"
msgstr ""
-#: git-rebase.sh:392
+#: git-rebase.sh:401
#, sh-format
msgid ""
"It seems that there is already a $state_dir_base directory, and\n"
@@ -9380,65 +9661,65 @@ msgid ""
"valuable there."
msgstr ""
-#: git-rebase.sh:437
+#: git-rebase.sh:446
#, sh-format
msgid "invalid upstream $upstream_name"
msgstr ""
-#: git-rebase.sh:461
+#: git-rebase.sh:470
#, sh-format
msgid "$onto_name: there are more than one merge bases"
msgstr ""
-#: git-rebase.sh:464 git-rebase.sh:468
+#: git-rebase.sh:473 git-rebase.sh:477
#, sh-format
msgid "$onto_name: there is no merge base"
msgstr ""
-#: git-rebase.sh:473
+#: git-rebase.sh:482
#, sh-format
msgid "Does not point to a valid commit: $onto_name"
msgstr ""
-#: git-rebase.sh:496
+#: git-rebase.sh:505
#, sh-format
msgid "fatal: no such branch: $branch_name"
msgstr ""
-#: git-rebase.sh:519
+#: git-rebase.sh:528
msgid "Cannot autostash"
msgstr ""
-#: git-rebase.sh:524
+#: git-rebase.sh:533
#, sh-format
msgid "Created autostash: $stash_abbrev"
msgstr ""
-#: git-rebase.sh:528
+#: git-rebase.sh:537
msgid "Please commit or stash them."
msgstr ""
-#: git-rebase.sh:548
+#: git-rebase.sh:557
#, sh-format
msgid "Current branch $branch_name is up to date."
msgstr ""
-#: git-rebase.sh:552
+#: git-rebase.sh:561
#, sh-format
msgid "Current branch $branch_name is up to date, rebase forced."
msgstr ""
-#: git-rebase.sh:563
+#: git-rebase.sh:572
#, sh-format
msgid "Changes from $mb to $onto:"
msgstr ""
#. Detach HEAD and reset the tree
-#: git-rebase.sh:572
+#: git-rebase.sh:581
msgid "First, rewinding head to replay your work on top of it..."
msgstr ""
-#: git-rebase.sh:582
+#: git-rebase.sh:591
#, sh-format
msgid "Fast-forwarded $branch_name to $onto_name."
msgstr ""
@@ -9486,103 +9767,92 @@ msgstr ""
#. $ git stash save --blah-blah 2>&1 | head -n 2
#. error: unknown option for 'stash save': --blah-blah
#. To provide a message, use git stash save -- '--blah-blah'
-#: git-stash.sh:241
+#: git-stash.sh:237
#, sh-format
msgid ""
"error: unknown option for 'stash save': $option\n"
" To provide a message, use git stash save -- '$option'"
msgstr ""
-#: git-stash.sh:262
+#: git-stash.sh:258
msgid "No local changes to save"
msgstr ""
-#: git-stash.sh:268
-msgid ""
-"The following untracked files would NOT be saved but need to be removed by "
-"stash save:"
-msgstr ""
-
-#: git-stash.sh:270
-msgid ""
-"Aborting. Consider using either the --force or --include-untracked option."
-msgstr ""
-
-#: git-stash.sh:274
+#: git-stash.sh:262
msgid "Cannot initialize stash"
msgstr ""
-#: git-stash.sh:278
+#: git-stash.sh:266
msgid "Cannot save the current status"
msgstr ""
-#: git-stash.sh:296
+#: git-stash.sh:284
msgid "Cannot remove worktree changes"
msgstr ""
-#: git-stash.sh:395
+#: git-stash.sh:383
msgid "No stash found."
msgstr ""
-#: git-stash.sh:402
+#: git-stash.sh:390
#, sh-format
msgid "Too many revisions specified: $REV"
msgstr ""
-#: git-stash.sh:408
+#: git-stash.sh:396
#, sh-format
msgid "$reference is not valid reference"
msgstr ""
-#: git-stash.sh:436
+#: git-stash.sh:424
#, sh-format
msgid "'$args' is not a stash-like commit"
msgstr ""
-#: git-stash.sh:447
+#: git-stash.sh:435
#, sh-format
msgid "'$args' is not a stash reference"
msgstr ""
-#: git-stash.sh:455
+#: git-stash.sh:443
msgid "unable to refresh index"
msgstr ""
-#: git-stash.sh:459
+#: git-stash.sh:447
msgid "Cannot apply a stash in the middle of a merge"
msgstr ""
-#: git-stash.sh:467
+#: git-stash.sh:455
msgid "Conflicts in index. Try without --index."
msgstr ""
-#: git-stash.sh:469
+#: git-stash.sh:457
msgid "Could not save index tree"
msgstr ""
-#: git-stash.sh:503
+#: git-stash.sh:491
msgid "Cannot unstage modified files"
msgstr ""
-#: git-stash.sh:518
+#: git-stash.sh:506
msgid "Index was not unstashed."
msgstr ""
-#: git-stash.sh:535
+#: git-stash.sh:523
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr ""
-#: git-stash.sh:536
+#: git-stash.sh:524
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr ""
-#: git-stash.sh:543
+#: git-stash.sh:531
msgid "No branch name specified"
msgstr ""
-#: git-stash.sh:615
+#: git-stash.sh:603
msgid "(To restore them type \"git stash apply\")"
msgstr ""
@@ -9828,44 +10098,36 @@ msgid "The --cached option cannot be used with the --files option"
msgstr ""
#. unexpected type
-#: git-submodule.sh:1066
+#: git-submodule.sh:1073
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr ""
-#: git-submodule.sh:1086
+#: git-submodule.sh:1093
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr ""
-#: git-submodule.sh:1089
+#: git-submodule.sh:1096
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr ""
-#: git-submodule.sh:1092
+#: git-submodule.sh:1099
#, sh-format
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
msgstr ""
-#: git-submodule.sh:1117
+#: git-submodule.sh:1124
msgid "blob"
msgstr ""
-#: git-submodule.sh:1155
-msgid "Submodules changed but not updated:"
-msgstr ""
-
-#: git-submodule.sh:1157
-msgid "Submodule changes to be committed:"
-msgstr ""
-
-#: git-submodule.sh:1242
+#: git-submodule.sh:1238
#, sh-format
msgid "Failed to recurse into submodule path '$sm_path'"
msgstr ""
-#: git-submodule.sh:1306
+#: git-submodule.sh:1302
#, sh-format
msgid "Synchronizing submodule url for '$displaypath'"
msgstr ""