msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2013-01-25 12:33+0800\n"
+"POT-Creation-Date: 2013-03-05 12:36+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"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
-#: advice.c:45
+#: advice.c:49
#, c-format
msgid "hint: %.*s\n"
msgstr ""
#. * Message used both when 'git commit' fails and when
#. * other commands doing a merge do.
#.
-#: advice.c:75
+#: advice.c:79
msgid ""
"Fix them up in the work tree,\n"
"and then use 'git add/rm <file>' as\n"
msgid "prepend prefix to each pathname in the archive"
msgstr ""
-#: archive.c:326 builtin/archive.c:91 builtin/blame.c:2380
-#: builtin/blame.c:2381 builtin/config.c:55 builtin/fast-export.c:653
+#: archive.c:326 builtin/archive.c:91 builtin/blame.c:2366
+#: builtin/blame.c:2367 builtin/config.c:55 builtin/fast-export.c:653
#: builtin/fast-export.c:655 builtin/grep.c:715 builtin/hash-object.c:77
-#: builtin/ls-files.c:494 builtin/ls-files.c:497 builtin/notes.c:540
-#: builtin/notes.c:697 builtin/read-tree.c:107 parse-options.h:149
+#: builtin/ls-files.c:497 builtin/ls-files.c:500 builtin/notes.c:536
+#: builtin/notes.c:693 builtin/read-tree.c:107 parse-options.h:149
msgid "file"
msgstr ""
msgid "retrieve the archive from remote repository <repo>"
msgstr ""
-#: archive.c:347 builtin/archive.c:95 builtin/notes.c:619
+#: archive.c:347 builtin/archive.c:95 builtin/notes.c:615
msgid "command"
msgstr ""
#: attr.c:259
msgid ""
-"Negative patterns are forbidden in git attributes\n"
+"Negative patterns are ignored in git attributes\n"
"Use '\\!' for literal leading exclamation."
msgstr ""
msgstr[0] ""
msgstr[1] ""
-#: diff.c:111
+#: diff.c:112
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr ""
-#: diff.c:116
+#: diff.c:117
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr ""
-#: diff.c:194
+#: diff.c:210
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr ""
-#: diff.c:237
+#: diff.c:260
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
"%s"
msgstr ""
-#: diff.c:3494
+#: diff.c:3468
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
"%s"
msgstr ""
-#: diff.c:3508
+#: diff.c:3482
#, c-format
msgid "Failed to parse --submodule option parameter: '%s'"
msgstr ""
-#: gpg-interface.c:59
+#: gpg-interface.c:59 gpg-interface.c:127
msgid "could not run gpg."
msgstr ""
msgid "gpg failed to sign the data"
msgstr ""
+#: gpg-interface.c:112
+#, c-format
+msgid "could not create temporary file '%s': %s"
+msgstr ""
+
+#: gpg-interface.c:115
+#, c-format
+msgid "failed writing detached signature to '%s': %s"
+msgstr ""
+
#: grep.c:1622
#, c-format
msgid "'%s': unable to read %s"
msgid "git commands available from elsewhere on your $PATH"
msgstr ""
-#: help.c:275
+#: help.c:235
+msgid "The most commonly used git commands are:"
+msgstr ""
+
+#: help.c:292
#, c-format
msgid ""
"'%s' appears to be a git command, but we were not\n"
"able to execute it. Maybe git-%s is broken?"
msgstr ""
-#: help.c:332
+#: help.c:349
msgid "Uh oh. Your system reports no Git commands at all."
msgstr ""
-#: help.c:354
+#: help.c:371
#, c-format
msgid ""
"WARNING: You called a Git command named '%s', which does not exist.\n"
"Continuing under the assumption that you meant '%s'"
msgstr ""
-#: help.c:359
+#: help.c:376
#, c-format
msgid "in %0.1f seconds automatically..."
msgstr ""
-#: help.c:366
+#: help.c:383
#, c-format
msgid "git: '%s' is not a git command. See 'git --help'."
msgstr ""
-#: help.c:370
+#: help.c:387
msgid ""
"\n"
"Did you mean this?"
msgid "Unable to write index."
msgstr ""
-#: parse-options.c:485
+#: parse-options.c:489
msgid "..."
msgstr ""
-#: parse-options.c:503
+#: parse-options.c:507
#, c-format
msgid "usage: %s"
msgstr ""
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation
-#: parse-options.c:507
+#: parse-options.c:511
#, c-format
msgid " or: %s"
msgstr ""
-#: parse-options.c:510
+#: parse-options.c:514
#, c-format
msgid " %s"
msgstr ""
-#: remote.c:1686
+#: parse-options.c:548
+msgid "-NUM"
+msgstr ""
+
+#: pathspec.c:83
+#, c-format
+msgid "Path '%s' is in submodule '%.*s'"
+msgstr ""
+
+#: pathspec.c:99
+#, c-format
+msgid "'%s' is beyond a symbolic link"
+msgstr ""
+
+#: remote.c:1653
#, 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:1692
+#: remote.c:1659
msgid " (use \"git push\" to publish your local commits)\n"
msgstr ""
-#: remote.c:1695
+#: remote.c:1662
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: remote.c:1703
+#: remote.c:1670
msgid " (use \"git pull\" to update your local branch)\n"
msgstr ""
-#: remote.c:1706
+#: remote.c:1673
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
msgstr[0] ""
msgstr[1] ""
-#: remote.c:1716
+#: remote.c:1683
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr ""
-#: sequencer.c:123 builtin/merge.c:761 builtin/merge.c:875 builtin/merge.c:985
-#: builtin/merge.c:995
+#: sequencer.c:123 builtin/merge.c:761 builtin/merge.c:874 builtin/merge.c:984
+#: builtin/merge.c:994
#, c-format
msgid "Could not open '%s' for writing"
msgstr ""
-#: sequencer.c:125 builtin/merge.c:333 builtin/merge.c:764 builtin/merge.c:987
-#: builtin/merge.c:1000
+#: sequencer.c:125 builtin/merge.c:333 builtin/merge.c:764 builtin/merge.c:986
+#: builtin/merge.c:999
#, c-format
msgid "Could not write to '%s'"
msgstr ""
msgid "cannot abort from a branch yet to be born"
msgstr ""
-#: sequencer.c:821 builtin/apply.c:4016
+#: sequencer.c:821 builtin/apply.c:4056
#, c-format
msgid "cannot open %s: %s"
msgstr ""
msgid "bug: unhandled diff status %c"
msgstr ""
-#: wt-status.c:787
+#: wt-status.c:789
msgid "You have unmerged paths."
msgstr ""
-#: wt-status.c:790 wt-status.c:914
+#: wt-status.c:792 wt-status.c:944
msgid " (fix conflicts and run \"git commit\")"
msgstr ""
-#: wt-status.c:793
+#: wt-status.c:795
msgid "All conflicts fixed but you are still merging."
msgstr ""
-#: wt-status.c:796
+#: wt-status.c:798
msgid " (use \"git commit\" to conclude merge)"
msgstr ""
-#: wt-status.c:806
+#: wt-status.c:808
msgid "You are in the middle of an am session."
msgstr ""
-#: wt-status.c:809
+#: wt-status.c:811
msgid "The current patch is empty."
msgstr ""
-#: wt-status.c:813
+#: wt-status.c:815
msgid " (fix conflicts and then run \"git am --resolved\")"
msgstr ""
-#: wt-status.c:815
+#: wt-status.c:817
msgid " (use \"git am --skip\" to skip this patch)"
msgstr ""
-#: wt-status.c:817
+#: wt-status.c:819
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr ""
-#: wt-status.c:875 wt-status.c:885
+#: wt-status.c:879 wt-status.c:896
+#, c-format
+msgid "You are currently rebasing branch '%s' on '%s'."
+msgstr ""
+
+#: wt-status.c:884 wt-status.c:901
msgid "You are currently rebasing."
msgstr ""
-#: wt-status.c:878
+#: wt-status.c:887
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr ""
-#: wt-status.c:880
+#: wt-status.c:889
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr ""
-#: wt-status.c:882
+#: wt-status.c:891
msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr ""
-#: wt-status.c:888
+#: wt-status.c:904
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr ""
-#: wt-status.c:890
+#: wt-status.c:908
+#, c-format
+msgid ""
+"You are currently splitting a commit while rebasing branch '%s' on '%s'."
+msgstr ""
+
+#: wt-status.c:913
msgid "You are currently splitting a commit during a rebase."
msgstr ""
-#: wt-status.c:893
+#: wt-status.c:916
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr ""
-#: wt-status.c:895
+#: wt-status.c:920
+#, c-format
+msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
+msgstr ""
+
+#: wt-status.c:925
msgid "You are currently editing a commit during a rebase."
msgstr ""
-#: wt-status.c:898
+#: wt-status.c:928
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr ""
-#: wt-status.c:900
+#: wt-status.c:930
msgid ""
" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr ""
-#: wt-status.c:910
+#: wt-status.c:940
msgid "You are currently cherry-picking."
msgstr ""
-#: wt-status.c:917
+#: wt-status.c:947
msgid " (all conflicts fixed: run \"git commit\")"
msgstr ""
-#: wt-status.c:926
+#: wt-status.c:958
+#, c-format
+msgid "You are currently bisecting branch '%s'."
+msgstr ""
+
+#: wt-status.c:962
msgid "You are currently bisecting."
msgstr ""
-#: wt-status.c:929
+#: wt-status.c:965
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr ""
-#: wt-status.c:980
+#: wt-status.c:1064
msgid "On branch "
msgstr ""
-#: wt-status.c:987
+#: wt-status.c:1071
msgid "Not currently on any branch."
msgstr ""
-#: wt-status.c:999
+#: wt-status.c:1083
msgid "Initial commit"
msgstr ""
-#: wt-status.c:1013
+#: wt-status.c:1097
msgid "Untracked files"
msgstr ""
-#: wt-status.c:1015
+#: wt-status.c:1099
msgid "Ignored files"
msgstr ""
-#: wt-status.c:1017
+#: wt-status.c:1101
#, c-format
msgid "Untracked files not listed%s"
msgstr ""
-#: wt-status.c:1019
+#: wt-status.c:1103
msgid " (use -u option to show untracked files)"
msgstr ""
-#: wt-status.c:1025
+#: wt-status.c:1109
msgid "No changes"
msgstr ""
-#: wt-status.c:1030
+#: wt-status.c:1114
#, c-format
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr ""
-#: wt-status.c:1033
+#: wt-status.c:1117
#, c-format
msgid "no changes added to commit\n"
msgstr ""
-#: wt-status.c:1036
+#: wt-status.c:1120
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
"track)\n"
msgstr ""
-#: wt-status.c:1039
+#: wt-status.c:1123
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr ""
-#: wt-status.c:1042
+#: wt-status.c:1126
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr ""
-#: wt-status.c:1045 wt-status.c:1050
+#: wt-status.c:1129 wt-status.c:1134
#, c-format
msgid "nothing to commit\n"
msgstr ""
-#: wt-status.c:1048
+#: wt-status.c:1132
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr ""
-#: wt-status.c:1052
+#: wt-status.c:1136
#, c-format
msgid "nothing to commit, working directory clean\n"
msgstr ""
-#: wt-status.c:1160
+#: wt-status.c:1244
msgid "HEAD (no branch)"
msgstr ""
-#: wt-status.c:1166
+#: wt-status.c:1250
msgid "Initial commit on "
msgstr ""
-#: wt-status.c:1181
+#: wt-status.c:1265
msgid "behind "
msgstr ""
-#: wt-status.c:1184 wt-status.c:1187
+#: wt-status.c:1268 wt-status.c:1271
msgid "ahead "
msgstr ""
-#: wt-status.c:1189
+#: wt-status.c:1273
msgid ", behind "
msgstr ""
-#: builtin/add.c:19
-msgid "git add [options] [--] <filepattern>..."
+#: compat/precompose_utf8.c:58 builtin/clone.c:341
+#, c-format
+msgid "failed to unlink '%s'"
+msgstr ""
+
+#: builtin/add.c:20
+msgid "git add [options] [--] <pathspec>..."
msgstr ""
-#: builtin/add.c:62
+#: builtin/add.c:63
#, c-format
msgid "unexpected diff status %c"
msgstr ""
-#: builtin/add.c:67 builtin/commit.c:231
+#: builtin/add.c:68 builtin/commit.c:231
msgid "updating files failed"
msgstr ""
-#: builtin/add.c:77
+#: builtin/add.c:78
#, c-format
msgid "remove '%s'\n"
msgstr ""
-#: builtin/add.c:176
-#, c-format
-msgid "Path '%s' is in submodule '%.*s'"
-msgstr ""
-
-#: builtin/add.c:192
+#: builtin/add.c:148
msgid "Unstaged changes after refreshing the index:"
msgstr ""
-#: builtin/add.c:195 builtin/add.c:460 builtin/rm.c:275
+#: builtin/add.c:151 builtin/add.c:460 builtin/rm.c:275
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr ""
-#: builtin/add.c:209
-#, c-format
-msgid "'%s' is beyond a symbolic link"
-msgstr ""
-
-#: builtin/add.c:276
+#: builtin/add.c:234
msgid "Could not read the index"
msgstr ""
-#: builtin/add.c:286
+#: builtin/add.c:244
#, c-format
msgid "Could not open '%s' for writing."
msgstr ""
-#: builtin/add.c:290
+#: builtin/add.c:248
msgid "Could not write patch"
msgstr ""
-#: builtin/add.c:295
+#: builtin/add.c:253
#, c-format
msgid "Could not stat '%s'"
msgstr ""
-#: builtin/add.c:297
+#: builtin/add.c:255
msgid "Empty patch. Aborted."
msgstr ""
-#: builtin/add.c:303
+#: builtin/add.c:261
#, c-format
msgid "Could not apply '%s'"
msgstr ""
-#: builtin/add.c:313
+#: builtin/add.c:271
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr ""
-#: builtin/add.c:319 builtin/clean.c:160 builtin/fetch.c:78 builtin/mv.c:63
-#: builtin/prune-packed.c:76 builtin/push.c:396 builtin/remote.c:1253
+#: builtin/add.c:277 builtin/clean.c:161 builtin/fetch.c:78 builtin/mv.c:63
+#: builtin/prune-packed.c:76 builtin/push.c:425 builtin/remote.c:1253
#: builtin/rm.c:206
msgid "dry run"
msgstr ""
-#: builtin/add.c:320 builtin/apply.c:4365 builtin/commit.c:1160
-#: builtin/count-objects.c:82 builtin/fsck.c:613 builtin/log.c:1522
-#: builtin/mv.c:62 builtin/read-tree.c:112
+#: builtin/add.c:278 builtin/apply.c:4405 builtin/check-ignore.c:19
+#: builtin/commit.c:1150 builtin/count-objects.c:82 builtin/fsck.c:613
+#: builtin/log.c:1522 builtin/mv.c:62 builtin/read-tree.c:112
msgid "be verbose"
msgstr ""
-#: builtin/add.c:322
+#: builtin/add.c:280
msgid "interactive picking"
msgstr ""
-#: builtin/add.c:323 builtin/checkout.c:1031 builtin/reset.c:258
+#: builtin/add.c:281 builtin/checkout.c:1031 builtin/reset.c:258
msgid "select hunks interactively"
msgstr ""
-#: builtin/add.c:324
+#: builtin/add.c:282
msgid "edit current diff and apply"
msgstr ""
-#: builtin/add.c:325
+#: builtin/add.c:283
msgid "allow adding otherwise ignored files"
msgstr ""
-#: builtin/add.c:326
+#: builtin/add.c:284
msgid "update tracked files"
msgstr ""
-#: builtin/add.c:327
+#: builtin/add.c:285
msgid "record only the fact that the path will be added later"
msgstr ""
-#: builtin/add.c:328
+#: builtin/add.c:286
msgid "add changes from all tracked and untracked files"
msgstr ""
-#: builtin/add.c:329
+#: builtin/add.c:287
msgid "don't add, only refresh the index"
msgstr ""
-#: builtin/add.c:330
+#: builtin/add.c:288
msgid "just skip files which cannot be added because of errors"
msgstr ""
-#: builtin/add.c:331
+#: builtin/add.c:289
msgid "check if - even missing - files are ignored in dry run"
msgstr ""
-#: builtin/add.c:353
+#: builtin/add.c:311
#, c-format
msgid "Use -f if you really want to add them.\n"
msgstr ""
-#: builtin/add.c:354
+#: builtin/add.c:312
msgid "no files added"
msgstr ""
-#: builtin/add.c:360
+#: builtin/add.c:318
msgid "adding files failed"
msgstr ""
-#: builtin/add.c:392
+#.
+#. * To be consistent with "git add -p" and most Git
+#. * commands, we should default to being tree-wide, but
+#. * this is not the original behavior and can't be
+#. * changed until users trained themselves not to type
+#. * "git add -u" or "git add -A". For now, we warn and
+#. * keep the old behavior. Later, this warning can be
+#. * turned into a die(...), and eventually we may
+#. * reallow the command with a new behavior.
+#.
+#: builtin/add.c:335
+#, c-format
+msgid ""
+"The behavior of 'git add %s (or %s)' with no path argument from a\n"
+"subdirectory of the tree will change in Git 2.0 and should not be used "
+"anymore.\n"
+"To add content for the whole tree, run:\n"
+"\n"
+" git add %s :/\n"
+" (or git add %s :/)\n"
+"\n"
+"To restrict the command to the current directory, run:\n"
+"\n"
+" git add %s .\n"
+" (or git add %s .)\n"
+"\n"
+"With the current Git version, the command is restricted to the current "
+"directory."
+msgstr ""
+
+#: builtin/add.c:381
msgid "-A and -u are mutually incompatible"
msgstr ""
-#: builtin/add.c:394
+#: builtin/add.c:383
msgid "Option --ignore-missing can only be used together with --dry-run"
msgstr ""
msgid "Maybe you wanted to say 'git add .'?\n"
msgstr ""
-#: builtin/add.c:421 builtin/clean.c:203 builtin/commit.c:291 builtin/mv.c:82
-#: builtin/rm.c:235
+#: builtin/add.c:421 builtin/check-ignore.c:67 builtin/clean.c:204
+#: builtin/commit.c:291 builtin/mv.c:82 builtin/rm.c:235
msgid "index file corrupt"
msgstr ""
-#: builtin/add.c:481 builtin/apply.c:4461 builtin/mv.c:229 builtin/rm.c:370
+#: builtin/add.c:481 builtin/apply.c:4501 builtin/mv.c:229 builtin/rm.c:370
msgid "Unable to write new index file"
msgstr ""
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr ""
-#: builtin/apply.c:1420
+#: builtin/apply.c:1422
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr ""
-#: builtin/apply.c:1477
+#: builtin/apply.c:1479
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr ""
-#: builtin/apply.c:1494
+#: builtin/apply.c:1496
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
msgstr[0] ""
msgstr[1] ""
-#: builtin/apply.c:1654
+#: builtin/apply.c:1656
msgid "new file depends on old contents"
msgstr ""
-#: builtin/apply.c:1656
+#: builtin/apply.c:1658
msgid "deleted file still has contents"
msgstr ""
-#: builtin/apply.c:1682
+#: builtin/apply.c:1684
#, c-format
msgid "corrupt patch at line %d"
msgstr ""
-#: builtin/apply.c:1718
+#: builtin/apply.c:1720
#, c-format
msgid "new file %s depends on old contents"
msgstr ""
-#: builtin/apply.c:1720
+#: builtin/apply.c:1722
#, c-format
msgid "deleted file %s still has contents"
msgstr ""
-#: builtin/apply.c:1723
+#: builtin/apply.c:1725
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr ""
-#: builtin/apply.c:1869
+#: builtin/apply.c:1871
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr ""
#. there has to be one hunk (forward hunk)
-#: builtin/apply.c:1898
+#: builtin/apply.c:1900
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr ""
-#: builtin/apply.c:1984
+#: builtin/apply.c:1986
#, c-format
msgid "patch with only garbage at line %d"
msgstr ""
-#: builtin/apply.c:2074
+#: builtin/apply.c:2076
#, c-format
msgid "unable to read symlink %s"
msgstr ""
-#: builtin/apply.c:2078
+#: builtin/apply.c:2080
#, c-format
msgid "unable to open or read %s"
msgstr ""
-#: builtin/apply.c:2682
+#: builtin/apply.c:2684
#, c-format
msgid "invalid start of line: '%c'"
msgstr ""
-#: builtin/apply.c:2800
+#: builtin/apply.c:2802
#, c-format
msgid "Hunk #%d succeeded at %d (offset %d line)."
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
msgstr[0] ""
msgstr[1] ""
-#: builtin/apply.c:2812
+#: builtin/apply.c:2814
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr ""
-#: builtin/apply.c:2818
+#: builtin/apply.c:2820
#, c-format
msgid ""
"while searching for:\n"
"%.*s"
msgstr ""
-#: builtin/apply.c:2837
+#: builtin/apply.c:2839
#, c-format
msgid "missing binary patch data for '%s'"
msgstr ""
-#: builtin/apply.c:2940
+#: builtin/apply.c:2942
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr ""
-#: builtin/apply.c:2946
+#: builtin/apply.c:2948
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr ""
-#: builtin/apply.c:2967
+#: builtin/apply.c:2969
#, c-format
msgid "patch failed: %s:%ld"
msgstr ""
-#: builtin/apply.c:3089
+#: builtin/apply.c:3091
#, c-format
msgid "cannot checkout %s"
msgstr ""
-#: builtin/apply.c:3134 builtin/apply.c:3143 builtin/apply.c:3187
+#: builtin/apply.c:3136 builtin/apply.c:3145 builtin/apply.c:3189
#, c-format
msgid "read of %s failed"
msgstr ""
-#: builtin/apply.c:3167 builtin/apply.c:3389
+#: builtin/apply.c:3169 builtin/apply.c:3391
#, c-format
msgid "path %s has been renamed/deleted"
msgstr ""
-#: builtin/apply.c:3248 builtin/apply.c:3403
+#: builtin/apply.c:3250 builtin/apply.c:3405
#, c-format
msgid "%s: does not exist in index"
msgstr ""
-#: builtin/apply.c:3252 builtin/apply.c:3395 builtin/apply.c:3417
+#: builtin/apply.c:3254 builtin/apply.c:3397 builtin/apply.c:3419
#, c-format
msgid "%s: %s"
msgstr ""
-#: builtin/apply.c:3257 builtin/apply.c:3411
+#: builtin/apply.c:3259 builtin/apply.c:3413
#, c-format
msgid "%s: does not match index"
msgstr ""
-#: builtin/apply.c:3359
+#: builtin/apply.c:3361
msgid "removal patch leaves file contents"
msgstr ""
-#: builtin/apply.c:3428
+#: builtin/apply.c:3430
#, c-format
msgid "%s: wrong type"
msgstr ""
-#: builtin/apply.c:3430
+#: builtin/apply.c:3432
#, c-format
msgid "%s has type %o, expected %o"
msgstr ""
-#: builtin/apply.c:3531
+#: builtin/apply.c:3533
#, c-format
msgid "%s: already exists in index"
msgstr ""
-#: builtin/apply.c:3534
+#: builtin/apply.c:3536
#, c-format
msgid "%s: already exists in working directory"
msgstr ""
-#: builtin/apply.c:3554
+#: builtin/apply.c:3556
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr ""
-#: builtin/apply.c:3559
+#: builtin/apply.c:3561
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr ""
-#: builtin/apply.c:3567
+#: builtin/apply.c:3569
#, c-format
msgid "%s: patch does not apply"
msgstr ""
-#: builtin/apply.c:3580
+#: builtin/apply.c:3582
#, c-format
msgid "Checking patch %s..."
msgstr ""
-#: builtin/apply.c:3635 builtin/checkout.c:215 builtin/reset.c:124
+#: builtin/apply.c:3675 builtin/checkout.c:215 builtin/reset.c:124
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr ""
-#: builtin/apply.c:3778
+#: builtin/apply.c:3818
#, c-format
msgid "unable to remove %s from index"
msgstr ""
-#: builtin/apply.c:3806
+#: builtin/apply.c:3846
#, c-format
msgid "corrupt patch for subproject %s"
msgstr ""
-#: builtin/apply.c:3810
+#: builtin/apply.c:3850
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr ""
-#: builtin/apply.c:3815
+#: builtin/apply.c:3855
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr ""
-#: builtin/apply.c:3818 builtin/apply.c:3926
+#: builtin/apply.c:3858 builtin/apply.c:3966
#, c-format
msgid "unable to add cache entry for %s"
msgstr ""
-#: builtin/apply.c:3851
+#: builtin/apply.c:3891
#, c-format
msgid "closing file '%s'"
msgstr ""
-#: builtin/apply.c:3900
+#: builtin/apply.c:3940
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr ""
-#: builtin/apply.c:3987
+#: builtin/apply.c:4027
#, c-format
msgid "Applied patch %s cleanly."
msgstr ""
-#: builtin/apply.c:3995
+#: builtin/apply.c:4035
msgid "internal error"
msgstr ""
#. Say this even without --verbose
-#: builtin/apply.c:3998
+#: builtin/apply.c:4038
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] ""
msgstr[1] ""
-#: builtin/apply.c:4008
+#: builtin/apply.c:4048
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr ""
-#: builtin/apply.c:4029
+#: builtin/apply.c:4069
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr ""
-#: builtin/apply.c:4032
+#: builtin/apply.c:4072
#, c-format
msgid "Rejected hunk #%d."
msgstr ""
-#: builtin/apply.c:4182
+#: builtin/apply.c:4222
msgid "unrecognized input"
msgstr ""
-#: builtin/apply.c:4193
+#: builtin/apply.c:4233
msgid "unable to read index file"
msgstr ""
-#: builtin/apply.c:4312 builtin/apply.c:4315 builtin/clone.c:91
+#: builtin/apply.c:4352 builtin/apply.c:4355 builtin/clone.c:91
#: builtin/fetch.c:63
msgid "path"
msgstr ""
-#: builtin/apply.c:4313
+#: builtin/apply.c:4353
msgid "don't apply changes matching the given path"
msgstr ""
-#: builtin/apply.c:4316
+#: builtin/apply.c:4356
msgid "apply changes matching the given path"
msgstr ""
-#: builtin/apply.c:4318
+#: builtin/apply.c:4358
msgid "num"
msgstr ""
-#: builtin/apply.c:4319
+#: builtin/apply.c:4359
msgid "remove <num> leading slashes from traditional diff paths"
msgstr ""
-#: builtin/apply.c:4322
+#: builtin/apply.c:4362
msgid "ignore additions made by the patch"
msgstr ""
-#: builtin/apply.c:4324
+#: builtin/apply.c:4364
msgid "instead of applying the patch, output diffstat for the input"
msgstr ""
-#: builtin/apply.c:4328
+#: builtin/apply.c:4368
msgid "show number of added and deleted lines in decimal notation"
msgstr ""
-#: builtin/apply.c:4330
+#: builtin/apply.c:4370
msgid "instead of applying the patch, output a summary for the input"
msgstr ""
-#: builtin/apply.c:4332
+#: builtin/apply.c:4372
msgid "instead of applying the patch, see if the patch is applicable"
msgstr ""
-#: builtin/apply.c:4334
+#: builtin/apply.c:4374
msgid "make sure the patch is applicable to the current index"
msgstr ""
-#: builtin/apply.c:4336
+#: builtin/apply.c:4376
msgid "apply a patch without touching the working tree"
msgstr ""
-#: builtin/apply.c:4338
+#: builtin/apply.c:4378
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr ""
-#: builtin/apply.c:4340
+#: builtin/apply.c:4380
msgid "attempt three-way merge if a patch does not apply"
msgstr ""
-#: builtin/apply.c:4342
+#: builtin/apply.c:4382
msgid "build a temporary index based on embedded index information"
msgstr ""
-#: builtin/apply.c:4344 builtin/checkout-index.c:197 builtin/ls-files.c:460
+#: builtin/apply.c:4384 builtin/checkout-index.c:197 builtin/ls-files.c:463
msgid "paths are separated with NUL character"
msgstr ""
-#: builtin/apply.c:4347
+#: builtin/apply.c:4387
msgid "ensure at least <n> lines of context match"
msgstr ""
-#: builtin/apply.c:4348
+#: builtin/apply.c:4388
msgid "action"
msgstr ""
-#: builtin/apply.c:4349
+#: builtin/apply.c:4389
msgid "detect new or modified lines that have whitespace errors"
msgstr ""
-#: builtin/apply.c:4352 builtin/apply.c:4355
+#: builtin/apply.c:4392 builtin/apply.c:4395
msgid "ignore changes in whitespace when finding context"
msgstr ""
-#: builtin/apply.c:4358
+#: builtin/apply.c:4398
msgid "apply the patch in reverse"
msgstr ""
-#: builtin/apply.c:4360
+#: builtin/apply.c:4400
msgid "don't expect at least one line of context"
msgstr ""
-#: builtin/apply.c:4362
+#: builtin/apply.c:4402
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr ""
-#: builtin/apply.c:4364
+#: builtin/apply.c:4404
msgid "allow overlapping hunks"
msgstr ""
-#: builtin/apply.c:4367
+#: builtin/apply.c:4407
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr ""
-#: builtin/apply.c:4370
+#: builtin/apply.c:4410
msgid "do not trust the line counts in the hunk headers"
msgstr ""
-#: builtin/apply.c:4372
+#: builtin/apply.c:4412
msgid "root"
msgstr ""
-#: builtin/apply.c:4373
+#: builtin/apply.c:4413
msgid "prepend <root> to all filenames"
msgstr ""
-#: builtin/apply.c:4395
+#: builtin/apply.c:4435
msgid "--3way outside a repository"
msgstr ""
-#: builtin/apply.c:4403
+#: builtin/apply.c:4443
msgid "--index outside a repository"
msgstr ""
-#: builtin/apply.c:4406
+#: builtin/apply.c:4446
msgid "--cached outside a repository"
msgstr ""
-#: builtin/apply.c:4422
+#: builtin/apply.c:4462
#, c-format
msgid "can't open patch '%s'"
msgstr ""
-#: builtin/apply.c:4436
+#: builtin/apply.c:4476
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] ""
msgstr[1] ""
-#: builtin/apply.c:4442 builtin/apply.c:4452
+#: builtin/apply.c:4482 builtin/apply.c:4492
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgid "[rev-opts] are documented in git-rev-list(1)"
msgstr ""
-#: builtin/blame.c:2364
+#: builtin/blame.c:2350
msgid "Show blame entries as we find them, incrementally"
msgstr ""
-#: builtin/blame.c:2365
+#: builtin/blame.c:2351
msgid "Show blank SHA-1 for boundary commits (Default: off)"
msgstr ""
-#: builtin/blame.c:2366
+#: builtin/blame.c:2352
msgid "Do not treat root commits as boundaries (Default: off)"
msgstr ""
-#: builtin/blame.c:2367
+#: builtin/blame.c:2353
msgid "Show work cost statistics"
msgstr ""
-#: builtin/blame.c:2368
+#: builtin/blame.c:2354
msgid "Show output score for blame entries"
msgstr ""
-#: builtin/blame.c:2369
+#: builtin/blame.c:2355
msgid "Show original filename (Default: auto)"
msgstr ""
-#: builtin/blame.c:2370
+#: builtin/blame.c:2356
msgid "Show original linenumber (Default: off)"
msgstr ""
-#: builtin/blame.c:2371
+#: builtin/blame.c:2357
msgid "Show in a format designed for machine consumption"
msgstr ""
-#: builtin/blame.c:2372
+#: builtin/blame.c:2358
msgid "Show porcelain format with per-line commit information"
msgstr ""
-#: builtin/blame.c:2373
+#: builtin/blame.c:2359
msgid "Use the same output mode as git-annotate (Default: off)"
msgstr ""
-#: builtin/blame.c:2374
+#: builtin/blame.c:2360
msgid "Show raw timestamp (Default: off)"
msgstr ""
-#: builtin/blame.c:2375
+#: builtin/blame.c:2361
msgid "Show long commit SHA1 (Default: off)"
msgstr ""
-#: builtin/blame.c:2376
+#: builtin/blame.c:2362
msgid "Suppress author name and timestamp (Default: off)"
msgstr ""
-#: builtin/blame.c:2377
+#: builtin/blame.c:2363
msgid "Show author email instead of name (Default: off)"
msgstr ""
-#: builtin/blame.c:2378
+#: builtin/blame.c:2364
msgid "Ignore whitespace differences"
msgstr ""
-#: builtin/blame.c:2379
+#: builtin/blame.c:2365
msgid "Spend extra cycles to find better match"
msgstr ""
-#: builtin/blame.c:2380
+#: builtin/blame.c:2366
msgid "Use revisions from <file> instead of calling git-rev-list"
msgstr ""
-#: builtin/blame.c:2381
+#: builtin/blame.c:2367
msgid "Use <file>'s contents as the final image"
msgstr ""
-#: builtin/blame.c:2382 builtin/blame.c:2383
+#: builtin/blame.c:2368 builtin/blame.c:2369
msgid "score"
msgstr ""
-#: builtin/blame.c:2382
+#: builtin/blame.c:2368
msgid "Find line copies within and across files"
msgstr ""
-#: builtin/blame.c:2383
+#: builtin/blame.c:2369
msgid "Find line movements within and across files"
msgstr ""
-#: builtin/blame.c:2384
+#: builtin/blame.c:2370
msgid "n,m"
msgstr ""
-#: builtin/blame.c:2384
+#: builtin/blame.c:2370
msgid "Process only line range n,m, counting from 1"
msgstr ""
msgid "[ahead %d, behind %d]"
msgstr ""
+#: builtin/branch.c:469
+msgid " **** invalid ref ****"
+msgstr ""
+
#: builtin/branch.c:560
msgid "(no branch)"
msgstr ""
+#: builtin/branch.c:593
+#, c-format
+msgid "object '%s' does not point to a commit"
+msgstr ""
+
#: builtin/branch.c:625
msgid "some refs could not be read"
msgstr ""
msgstr ""
#: builtin/branch.c:761 builtin/branch.c:767 builtin/branch.c:788
-#: builtin/branch.c:794 builtin/commit.c:1378 builtin/commit.c:1379
-#: builtin/commit.c:1380 builtin/commit.c:1381 builtin/tag.c:470
+#: builtin/branch.c:794 builtin/commit.c:1366 builtin/commit.c:1367
+#: builtin/commit.c:1368 builtin/commit.c:1369 builtin/tag.c:468
msgid "commit"
msgstr ""
msgid "HEAD not found below refs/heads!"
msgstr ""
-#: builtin/branch.c:836
+#: builtin/branch.c:839
msgid "--column and --verbose are incompatible"
msgstr ""
-#: builtin/branch.c:887
+#: builtin/branch.c:845
+msgid "branch name required"
+msgstr ""
+
+#: builtin/branch.c:860
+msgid "Cannot give description to detached HEAD"
+msgstr ""
+
+#: builtin/branch.c:865
+msgid "cannot edit description of more than one branch"
+msgstr ""
+
+#: builtin/branch.c:872
+#, c-format
+msgid "No commit on branch '%s' yet."
+msgstr ""
+
+#: builtin/branch.c:875
+#, c-format
+msgid "No branch named '%s'."
+msgstr ""
+
+#: builtin/branch.c:888
+msgid "too many branches for a rename operation"
+msgstr ""
+
+#: builtin/branch.c:893
#, c-format
msgid "branch '%s' does not exist"
msgstr ""
-#: builtin/branch.c:899
+#: builtin/branch.c:905
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr ""
-#: builtin/branch.c:914
+#: builtin/branch.c:920
msgid "-a and -r options to 'git branch' do not make sense with a branch name"
msgstr ""
-#: builtin/branch.c:917
+#: builtin/branch.c:923
#, 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:934
+#: builtin/branch.c:940
#, c-format
msgid ""
"\n"
"\n"
msgstr ""
-#: builtin/branch.c:935
+#: builtin/branch.c:941
#, c-format
msgid " git branch -d %s\n"
msgstr ""
-#: builtin/branch.c:936
+#: builtin/branch.c:942
#, c-format
msgid " git branch --set-upstream-to %s\n"
msgstr ""
msgid "use .gitattributes only from the index"
msgstr ""
-#: builtin/check-attr.c:21 builtin/hash-object.c:75
+#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:75
msgid "read file names from stdin"
msgstr ""
-#: builtin/check-attr.c:23
+#: builtin/check-attr.c:23 builtin/check-ignore.c:24
msgid "input paths are terminated by a null character"
msgstr ""
+#: builtin/check-ignore.c:18 builtin/checkout.c:1012 builtin/gc.c:177
+msgid "suppress progress reporting"
+msgstr ""
+
+#: builtin/check-ignore.c:151
+msgid "cannot specify pathnames with --stdin"
+msgstr ""
+
+#: builtin/check-ignore.c:154
+msgid "-z only makes sense with --stdin"
+msgstr ""
+
+#: builtin/check-ignore.c:156
+msgid "no path specified"
+msgstr ""
+
+#: builtin/check-ignore.c:160
+msgid "--quiet is only valid with a single pathname"
+msgstr ""
+
+#: builtin/check-ignore.c:162
+msgid "cannot have both --quiet and --verbose"
+msgstr ""
+
#: builtin/checkout-index.c:126
msgid "git checkout-index [options] [--] [<file>...]"
msgstr ""
msgid "Cannot switch branch to a non-commit '%s'"
msgstr ""
-#: builtin/checkout.c:1012 builtin/gc.c:177
-msgid "suppress progress reporting"
-msgstr ""
-
#: builtin/checkout.c:1013 builtin/checkout.c:1015 builtin/clone.c:89
#: builtin/remote.c:169 builtin/remote.c:171
msgid "branch"
msgid "failed to remove %s"
msgstr ""
-#: builtin/clean.c:159
+#: builtin/clean.c:160
msgid "do not print names of files removed"
msgstr ""
-#: builtin/clean.c:161
+#: builtin/clean.c:162
msgid "force"
msgstr ""
-#: builtin/clean.c:163
+#: builtin/clean.c:164
msgid "remove whole directories"
msgstr ""
-#: builtin/clean.c:164 builtin/describe.c:413 builtin/grep.c:717
-#: builtin/ls-files.c:491 builtin/name-rev.c:231 builtin/show-ref.c:182
+#: builtin/clean.c:165 builtin/describe.c:413 builtin/grep.c:717
+#: builtin/ls-files.c:494 builtin/name-rev.c:231 builtin/show-ref.c:182
msgid "pattern"
msgstr ""
-#: builtin/clean.c:165
+#: builtin/clean.c:166
msgid "add <pattern> to ignore rules"
msgstr ""
-#: builtin/clean.c:166
+#: builtin/clean.c:167
msgid "remove ignored files, too"
msgstr ""
-#: builtin/clean.c:168
+#: builtin/clean.c:169
msgid "remove only ignored files"
msgstr ""
-#: builtin/clean.c:186
+#: builtin/clean.c:187
msgid "-x and -X cannot be used together"
msgstr ""
-#: builtin/clean.c:190
+#: builtin/clean.c:191
msgid ""
"clean.requireForce set to true and neither -n nor -f given; refusing to clean"
msgstr ""
-#: builtin/clean.c:193
+#: builtin/clean.c:194
msgid ""
"clean.requireForce defaults to true and neither -n nor -f given; refusing to "
"clean"
msgstr ""
#: builtin/clone.c:64 builtin/fetch.c:82 builtin/merge.c:212
-#: builtin/push.c:407
+#: builtin/push.c:436
msgid "force progress reporting"
msgstr ""
msgid "failed to stat %s\n"
msgstr ""
-#: builtin/clone.c:341
-#, c-format
-msgid "failed to unlink '%s'"
-msgstr ""
-
#: builtin/clone.c:346
#, c-format
msgid "failed to create link '%s'"
msgid "working tree '%s' already exists."
msgstr ""
-#: builtin/clone.c:759 builtin/clone.c:773
+#: builtin/clone.c:759 builtin/clone.c:771
#, c-format
msgid "could not create leading directories of '%s'"
msgstr ""
msgid "could not create work tree dir '%s'."
msgstr ""
-#: builtin/clone.c:783
+#: builtin/clone.c:781
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr ""
-#: builtin/clone.c:785
+#: builtin/clone.c:783
#, c-format
msgid "Cloning into '%s'...\n"
msgstr ""
-#: builtin/clone.c:827
+#: builtin/clone.c:818
#, c-format
msgid "Don't know how to clone %s"
msgstr ""
-#: builtin/clone.c:876
+#: builtin/clone.c:867
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr ""
-#: builtin/clone.c:883
+#: builtin/clone.c:874
msgid "You appear to have cloned an empty repository."
msgstr ""
msgstr ""
#: builtin/commit.c:34
-msgid "git commit [options] [--] <filepattern>..."
+msgid "git commit [options] [--] <pathspec>..."
msgstr ""
#: builtin/commit.c:39
-msgid "git status [options] [--] <filepattern>..."
+msgid "git status [options] [--] <pathspec>..."
msgstr ""
#: builtin/commit.c:44
msgstr ""
#: builtin/commit.c:735
+#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
-"with '#' will be ignored, and an empty message aborts the commit.\n"
+"with '%c' will be ignored, and an empty message aborts the commit.\n"
msgstr ""
#: builtin/commit.c:740
+#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
-"with '#' will be kept; you may remove them yourself if you want to.\n"
+"with '%c' will be kept; you may remove them yourself if you want to.\n"
"An empty message aborts the commit.\n"
msgstr ""
msgid "Error building trees"
msgstr ""
-#: builtin/commit.c:832 builtin/tag.c:361
+#: builtin/commit.c:832 builtin/tag.c:359
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr ""
msgid "No existing author found with '%s'"
msgstr ""
-#: builtin/commit.c:944 builtin/commit.c:1148
+#: builtin/commit.c:944 builtin/commit.c:1138
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr ""
-#: builtin/commit.c:984
+#: builtin/commit.c:974
msgid "Using both --reset-author and --author does not make sense"
msgstr ""
-#: builtin/commit.c:995
+#: builtin/commit.c:985
msgid "You have nothing to amend."
msgstr ""
-#: builtin/commit.c:998
+#: builtin/commit.c:988
msgid "You are in the middle of a merge -- cannot amend."
msgstr ""
-#: builtin/commit.c:1000
+#: builtin/commit.c:990
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr ""
-#: builtin/commit.c:1003
+#: builtin/commit.c:993
msgid "Options --squash and --fixup cannot be used together"
msgstr ""
-#: builtin/commit.c:1013
+#: builtin/commit.c:1003
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr ""
-#: builtin/commit.c:1015
+#: builtin/commit.c:1005
msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
msgstr ""
-#: builtin/commit.c:1023
+#: builtin/commit.c:1013
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr ""
-#: builtin/commit.c:1040
+#: builtin/commit.c:1030
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr ""
-#: builtin/commit.c:1042
+#: builtin/commit.c:1032
msgid "No paths with --include/--only does not make sense."
msgstr ""
-#: builtin/commit.c:1044
+#: builtin/commit.c:1034
msgid "Clever... amending the last one with dirty index."
msgstr ""
-#: builtin/commit.c:1046
+#: builtin/commit.c:1036
msgid "Explicit paths specified without -i nor -o; assuming --only paths..."
msgstr ""
-#: builtin/commit.c:1056 builtin/tag.c:577
+#: builtin/commit.c:1046 builtin/tag.c:575
#, c-format
msgid "Invalid cleanup mode %s"
msgstr ""
-#: builtin/commit.c:1061
+#: builtin/commit.c:1051
msgid "Paths with -a does not make sense."
msgstr ""
-#: builtin/commit.c:1067 builtin/commit.c:1202
+#: builtin/commit.c:1057 builtin/commit.c:1192
msgid "--long and -z are incompatible"
msgstr ""
-#: builtin/commit.c:1162 builtin/commit.c:1400
+#: builtin/commit.c:1152 builtin/commit.c:1388
msgid "show status concisely"
msgstr ""
-#: builtin/commit.c:1164 builtin/commit.c:1402
+#: builtin/commit.c:1154 builtin/commit.c:1390
msgid "show branch information"
msgstr ""
-#: builtin/commit.c:1166 builtin/commit.c:1404 builtin/push.c:397
+#: builtin/commit.c:1156 builtin/commit.c:1392 builtin/push.c:426
msgid "machine-readable output"
msgstr ""
-#: builtin/commit.c:1169 builtin/commit.c:1406
+#: builtin/commit.c:1159 builtin/commit.c:1394
msgid "show status in long format (default)"
msgstr ""
-#: builtin/commit.c:1172 builtin/commit.c:1409
+#: builtin/commit.c:1162 builtin/commit.c:1397
msgid "terminate entries with NUL"
msgstr ""
-#: builtin/commit.c:1174 builtin/commit.c:1412 builtin/fast-export.c:647
-#: builtin/fast-export.c:650 builtin/tag.c:461
+#: builtin/commit.c:1164 builtin/commit.c:1400 builtin/fast-export.c:647
+#: builtin/fast-export.c:650 builtin/tag.c:459
msgid "mode"
msgstr ""
-#: builtin/commit.c:1175 builtin/commit.c:1412
+#: builtin/commit.c:1165 builtin/commit.c:1400
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr ""
-#: builtin/commit.c:1178
+#: builtin/commit.c:1168
msgid "show ignored files"
msgstr ""
-#: builtin/commit.c:1179 parse-options.h:151
+#: builtin/commit.c:1169 parse-options.h:151
msgid "when"
msgstr ""
-#: builtin/commit.c:1180
+#: builtin/commit.c:1170
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
msgstr ""
-#: builtin/commit.c:1182
+#: builtin/commit.c:1172
msgid "list untracked files in columns"
msgstr ""
-#: builtin/commit.c:1256
+#: builtin/commit.c:1246
msgid "couldn't look up newly created commit"
msgstr ""
-#: builtin/commit.c:1258
+#: builtin/commit.c:1248
msgid "could not parse newly created commit"
msgstr ""
-#: builtin/commit.c:1299
+#: builtin/commit.c:1289
msgid "detached HEAD"
msgstr ""
-#: builtin/commit.c:1301
+#: builtin/commit.c:1291
msgid " (root-commit)"
msgstr ""
-#: builtin/commit.c:1370
+#: builtin/commit.c:1358
msgid "suppress summary after successful commit"
msgstr ""
-#: builtin/commit.c:1371
+#: builtin/commit.c:1359
msgid "show diff in commit message template"
msgstr ""
-#: builtin/commit.c:1373
+#: builtin/commit.c:1361
msgid "Commit message options"
msgstr ""
-#: builtin/commit.c:1374 builtin/tag.c:459
+#: builtin/commit.c:1362 builtin/tag.c:457
msgid "read message from file"
msgstr ""
-#: builtin/commit.c:1375
+#: builtin/commit.c:1363
msgid "author"
msgstr ""
-#: builtin/commit.c:1375
+#: builtin/commit.c:1363
msgid "override author for commit"
msgstr ""
-#: builtin/commit.c:1376 builtin/gc.c:178
+#: builtin/commit.c:1364 builtin/gc.c:178
msgid "date"
msgstr ""
-#: builtin/commit.c:1376
+#: builtin/commit.c:1364
msgid "override date for commit"
msgstr ""
-#: builtin/commit.c:1377 builtin/merge.c:206 builtin/notes.c:537
-#: builtin/notes.c:694 builtin/tag.c:457
+#: builtin/commit.c:1365 builtin/merge.c:206 builtin/notes.c:533
+#: builtin/notes.c:690 builtin/tag.c:455
msgid "message"
msgstr ""
-#: builtin/commit.c:1377
+#: builtin/commit.c:1365
msgid "commit message"
msgstr ""
-#: builtin/commit.c:1378
+#: builtin/commit.c:1366
msgid "reuse and edit message from specified commit"
msgstr ""
-#: builtin/commit.c:1379
+#: builtin/commit.c:1367
msgid "reuse message from specified commit"
msgstr ""
-#: builtin/commit.c:1380
+#: builtin/commit.c:1368
msgid "use autosquash formatted message to fixup specified commit"
msgstr ""
-#: builtin/commit.c:1381
+#: builtin/commit.c:1369
msgid "use autosquash formatted message to squash specified commit"
msgstr ""
-#: builtin/commit.c:1382
+#: builtin/commit.c:1370
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr ""
-#: builtin/commit.c:1383 builtin/log.c:1102 builtin/revert.c:109
+#: builtin/commit.c:1371 builtin/log.c:1102 builtin/revert.c:109
msgid "add Signed-off-by:"
msgstr ""
-#: builtin/commit.c:1384
+#: builtin/commit.c:1372
msgid "use specified template file"
msgstr ""
-#: builtin/commit.c:1385
+#: builtin/commit.c:1373
msgid "force edit of commit"
msgstr ""
-#: builtin/commit.c:1386
+#: builtin/commit.c:1374
msgid "default"
msgstr ""
-#: builtin/commit.c:1386 builtin/tag.c:462
+#: builtin/commit.c:1374 builtin/tag.c:460
msgid "how to strip spaces and #comments from message"
msgstr ""
-#: builtin/commit.c:1387
+#: builtin/commit.c:1375
msgid "include status in commit message template"
msgstr ""
-#: builtin/commit.c:1388 builtin/merge.c:213 builtin/tag.c:463
+#: builtin/commit.c:1376 builtin/merge.c:213 builtin/tag.c:461
msgid "key id"
msgstr ""
-#: builtin/commit.c:1389 builtin/merge.c:214
+#: builtin/commit.c:1377 builtin/merge.c:214
msgid "GPG sign commit"
msgstr ""
#. end commit message options
-#: builtin/commit.c:1392
+#: builtin/commit.c:1380
msgid "Commit contents options"
msgstr ""
-#: builtin/commit.c:1393
+#: builtin/commit.c:1381
msgid "commit all changed files"
msgstr ""
-#: builtin/commit.c:1394
+#: builtin/commit.c:1382
msgid "add specified files to index for commit"
msgstr ""
-#: builtin/commit.c:1395
+#: builtin/commit.c:1383
msgid "interactively add files"
msgstr ""
-#: builtin/commit.c:1396
+#: builtin/commit.c:1384
msgid "interactively add changes"
msgstr ""
-#: builtin/commit.c:1397
+#: builtin/commit.c:1385
msgid "commit only specified files"
msgstr ""
-#: builtin/commit.c:1398
+#: builtin/commit.c:1386
msgid "bypass pre-commit hook"
msgstr ""
-#: builtin/commit.c:1399
+#: builtin/commit.c:1387
msgid "show what would be committed"
msgstr ""
-#: builtin/commit.c:1410
+#: builtin/commit.c:1398
msgid "amend previous commit"
msgstr ""
-#: builtin/commit.c:1411
+#: builtin/commit.c:1399
msgid "bypass post-rewrite hook"
msgstr ""
-#: builtin/commit.c:1416
+#: builtin/commit.c:1404
msgid "ok to record an empty change"
msgstr ""
-#: builtin/commit.c:1419
+#: builtin/commit.c:1407
msgid "ok to record a change with an empty message"
msgstr ""
-#: builtin/commit.c:1451
+#: builtin/commit.c:1439
msgid "could not parse HEAD commit"
msgstr ""
-#: builtin/commit.c:1489 builtin/merge.c:508
+#: builtin/commit.c:1477 builtin/merge.c:508
#, c-format
msgid "could not open '%s' for reading"
msgstr ""
-#: builtin/commit.c:1496
+#: builtin/commit.c:1484
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr ""
-#: builtin/commit.c:1503
+#: builtin/commit.c:1491
msgid "could not read MERGE_MODE"
msgstr ""
-#: builtin/commit.c:1522
+#: builtin/commit.c:1510
#, c-format
msgid "could not read commit message: %s"
msgstr ""
-#: builtin/commit.c:1536
+#: builtin/commit.c:1524
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr ""
-#: builtin/commit.c:1541
+#: builtin/commit.c:1529
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr ""
-#: builtin/commit.c:1556 builtin/merge.c:833 builtin/merge.c:858
+#: builtin/commit.c:1544 builtin/merge.c:832 builtin/merge.c:857
msgid "failed to write commit object"
msgstr ""
-#: builtin/commit.c:1577
+#: builtin/commit.c:1565
msgid "cannot lock HEAD ref"
msgstr ""
-#: builtin/commit.c:1581
+#: builtin/commit.c:1569
msgid "cannot update HEAD ref"
msgstr ""
-#: builtin/commit.c:1592
+#: builtin/commit.c:1580
msgid ""
"Repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full or quota is\n"
msgid "deepen history of shallow clone"
msgstr ""
-#: builtin/fetch.c:85 builtin/log.c:1119
+#: builtin/fetch.c:86
+msgid "convert to a complete repository"
+msgstr ""
+
+#: builtin/fetch.c:88 builtin/log.c:1119
msgid "dir"
msgstr ""
-#: builtin/fetch.c:86
+#: builtin/fetch.c:89
msgid "prepend this to submodule path output"
msgstr ""
-#: builtin/fetch.c:89
+#: builtin/fetch.c:92
msgid "default mode for recursion"
msgstr ""
-#: builtin/fetch.c:201
+#: builtin/fetch.c:204
msgid "Couldn't find remote ref HEAD"
msgstr ""
-#: builtin/fetch.c:254
+#: builtin/fetch.c:257
#, c-format
msgid "object %s not found"
msgstr ""
-#: builtin/fetch.c:259
+#: builtin/fetch.c:262
msgid "[up to date]"
msgstr ""
-#: builtin/fetch.c:273
+#: builtin/fetch.c:276
#, c-format
msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
msgstr ""
-#: builtin/fetch.c:274 builtin/fetch.c:360
+#: builtin/fetch.c:277 builtin/fetch.c:363
msgid "[rejected]"
msgstr ""
-#: builtin/fetch.c:285
+#: builtin/fetch.c:288
msgid "[tag update]"
msgstr ""
-#: builtin/fetch.c:287 builtin/fetch.c:322 builtin/fetch.c:340
+#: builtin/fetch.c:290 builtin/fetch.c:325 builtin/fetch.c:343
msgid " (unable to update local ref)"
msgstr ""
-#: builtin/fetch.c:305
+#: builtin/fetch.c:308
msgid "[new tag]"
msgstr ""
-#: builtin/fetch.c:308
+#: builtin/fetch.c:311
msgid "[new branch]"
msgstr ""
-#: builtin/fetch.c:311
+#: builtin/fetch.c:314
msgid "[new ref]"
msgstr ""
-#: builtin/fetch.c:356
+#: builtin/fetch.c:359
msgid "unable to update local ref"
msgstr ""
-#: builtin/fetch.c:356
+#: builtin/fetch.c:359
msgid "forced update"
msgstr ""
-#: builtin/fetch.c:362
+#: builtin/fetch.c:365
msgid "(non-fast-forward)"
msgstr ""
-#: builtin/fetch.c:393 builtin/fetch.c:685
+#: builtin/fetch.c:396 builtin/fetch.c:688
#, c-format
msgid "cannot open %s: %s\n"
msgstr ""
-#: builtin/fetch.c:402
+#: builtin/fetch.c:405
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr ""
-#: builtin/fetch.c:488
+#: builtin/fetch.c:491
#, c-format
msgid "From %.*s\n"
msgstr ""
-#: builtin/fetch.c:499
+#: builtin/fetch.c:502
#, 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:549
+#: builtin/fetch.c:552
#, c-format
msgid " (%s will become dangling)"
msgstr ""
-#: builtin/fetch.c:550
+#: builtin/fetch.c:553
#, c-format
msgid " (%s has become dangling)"
msgstr ""
-#: builtin/fetch.c:557
+#: builtin/fetch.c:560
msgid "[deleted]"
msgstr ""
-#: builtin/fetch.c:558 builtin/remote.c:1055
+#: builtin/fetch.c:561 builtin/remote.c:1055
msgid "(none)"
msgstr ""
-#: builtin/fetch.c:675
+#: builtin/fetch.c:678
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr ""
-#: builtin/fetch.c:709
+#: builtin/fetch.c:712
#, c-format
msgid "Don't know how to fetch from %s"
msgstr ""
-#: builtin/fetch.c:786
+#: builtin/fetch.c:789
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr ""
-#: builtin/fetch.c:789
+#: builtin/fetch.c:792
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr ""
-#: builtin/fetch.c:891
+#: builtin/fetch.c:894
#, c-format
msgid "Fetching %s\n"
msgstr ""
-#: builtin/fetch.c:893 builtin/remote.c:100
+#: builtin/fetch.c:896 builtin/remote.c:100
#, c-format
msgid "Could not fetch %s"
msgstr ""
-#: builtin/fetch.c:912
+#: builtin/fetch.c:915
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:932
+#: builtin/fetch.c:935
msgid "You need to specify a tag name."
msgstr ""
-#: builtin/fetch.c:984
+#: builtin/fetch.c:981
+msgid "--depth and --unshallow cannot be used together"
+msgstr ""
+
+#: builtin/fetch.c:983
+msgid "--unshallow on a complete repository does not make sense"
+msgstr ""
+
+#: builtin/fetch.c:1002
msgid "fetch --all does not take a repository argument"
msgstr ""
-#: builtin/fetch.c:986
+#: builtin/fetch.c:1004
msgid "fetch --all does not make sense with refspecs"
msgstr ""
-#: builtin/fetch.c:997
+#: builtin/fetch.c:1015
#, c-format
msgid "No such remote or remote group: %s"
msgstr ""
-#: builtin/fetch.c:1005
+#: builtin/fetch.c:1023
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr ""
#: builtin/fmt-merge-msg.c:659 builtin/fmt-merge-msg.c:662 builtin/grep.c:701
#: builtin/merge.c:188 builtin/show-branch.c:656 builtin/show-ref.c:175
-#: builtin/tag.c:448 parse-options.h:133 parse-options.h:239
+#: builtin/tag.c:446 parse-options.h:133 parse-options.h:239
msgid "n"
msgstr ""
msgid "bad object %s"
msgstr ""
-#: builtin/grep.c:866
+#: builtin/grep.c:868
msgid "--open-files-in-pager only works on the worktree"
msgstr ""
-#: builtin/grep.c:889
+#: builtin/grep.c:891
msgid "--cached or --untracked cannot be used with --no-index."
msgstr ""
-#: builtin/grep.c:894
+#: builtin/grep.c:896
msgid "--no-index or --untracked cannot be used with revs."
msgstr ""
-#: builtin/grep.c:897
+#: builtin/grep.c:899
msgid "--[no-]exclude-standard cannot be used for tracked contents."
msgstr ""
-#: builtin/grep.c:905
+#: builtin/grep.c:907
msgid "both --cached and trees are given."
msgstr ""
msgid "process file as it were from this path"
msgstr ""
-#: builtin/help.c:43
+#: builtin/help.c:42
msgid "print all available commands"
msgstr ""
-#: builtin/help.c:44
+#: builtin/help.c:43
msgid "show man page"
msgstr ""
-#: builtin/help.c:45
+#: builtin/help.c:44
msgid "show manual in web browser"
msgstr ""
-#: builtin/help.c:47
+#: builtin/help.c:46
msgid "show info page"
msgstr ""
-#: builtin/help.c:53
+#: builtin/help.c:52
msgid "git help [--all] [--man|--web|--info] [command]"
msgstr ""
-#: builtin/help.c:65
+#: builtin/help.c:64
#, c-format
msgid "unrecognized help format '%s'"
msgstr ""
-#: builtin/help.c:93
+#: builtin/help.c:92
msgid "Failed to start emacsclient."
msgstr ""
-#: builtin/help.c:106
+#: builtin/help.c:105
msgid "Failed to parse emacsclient version."
msgstr ""
-#: builtin/help.c:114
+#: builtin/help.c:113
#, c-format
msgid "emacsclient version '%d' too old (< 22)."
msgstr ""
-#: builtin/help.c:132 builtin/help.c:160 builtin/help.c:169 builtin/help.c:177
+#: builtin/help.c:131 builtin/help.c:159 builtin/help.c:168 builtin/help.c:176
#, c-format
msgid "failed to exec '%s': %s"
msgstr ""
-#: builtin/help.c:217
+#: builtin/help.c:216
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
"Please consider using 'man.<tool>.cmd' instead."
msgstr ""
-#: builtin/help.c:229
+#: builtin/help.c:228
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
"Please consider using 'man.<tool>.path' instead."
msgstr ""
-#: builtin/help.c:299
-msgid "The most commonly used git commands are:"
-msgstr ""
-
-#: builtin/help.c:367
+#: builtin/help.c:349
#, c-format
msgid "'%s': unknown man viewer."
msgstr ""
-#: builtin/help.c:384
+#: builtin/help.c:366
msgid "no man viewer handled the request"
msgstr ""
-#: builtin/help.c:392
+#: builtin/help.c:374
msgid "no info viewer handled the request"
msgstr ""
-#: builtin/help.c:447 builtin/help.c:454
+#: builtin/help.c:429 builtin/help.c:436
#, c-format
msgid "usage: %s%s"
msgstr ""
-#: builtin/help.c:470
+#: builtin/help.c:452
#, c-format
msgid "`git %s' is aliased to `%s'"
msgstr ""
#: builtin/init-db.c:467
msgid ""
-"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--shared"
-"[=<permissions>]] [directory]"
+"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
+"
shared[=<permissions>]] [directory]"
msgstr ""
#: builtin/init-db.c:490
msgid "Unknown commit %s"
msgstr ""
-#: builtin/ls-files.c:408
+#: builtin/ls-files.c:409
msgid "git ls-files [options] [<file>...]"
msgstr ""
-#: builtin/ls-files.c:463
+#: builtin/ls-files.c:466
msgid "identify the file status with tags"
msgstr ""
-#: builtin/ls-files.c:465
+#: builtin/ls-files.c:468
msgid "use lowercase letters for 'assume unchanged' files"
msgstr ""
-#: builtin/ls-files.c:467
+#: builtin/ls-files.c:470
msgid "show cached files in the output (default)"
msgstr ""
-#: builtin/ls-files.c:469
+#: builtin/ls-files.c:472
msgid "show deleted files in the output"
msgstr ""
-#: builtin/ls-files.c:471
+#: builtin/ls-files.c:474
msgid "show modified files in the output"
msgstr ""
-#: builtin/ls-files.c:473
+#: builtin/ls-files.c:476
msgid "show other files in the output"
msgstr ""
-#: builtin/ls-files.c:475
+#: builtin/ls-files.c:478
msgid "show ignored files in the output"
msgstr ""
-#: builtin/ls-files.c:478
+#: builtin/ls-files.c:481
msgid "show staged contents' object name in the output"
msgstr ""
-#: builtin/ls-files.c:480
+#: builtin/ls-files.c:483
msgid "show files on the filesystem that need to be removed"
msgstr ""
-#: builtin/ls-files.c:482
+#: builtin/ls-files.c:485
msgid "show 'other' directories' name only"
msgstr ""
-#: builtin/ls-files.c:485
+#: builtin/ls-files.c:488
msgid "don't show empty directories"
msgstr ""
-#: builtin/ls-files.c:488
+#: builtin/ls-files.c:491
msgid "show unmerged files in the output"
msgstr ""
-#: builtin/ls-files.c:490
+#: builtin/ls-files.c:493
msgid "show resolve-undo information"
msgstr ""
-#: builtin/ls-files.c:492
+#: builtin/ls-files.c:495
msgid "skip files matching pattern"
msgstr ""
-#: builtin/ls-files.c:495
+#: builtin/ls-files.c:498
msgid "exclude patterns are read from <file>"
msgstr ""
-#: builtin/ls-files.c:498
+#: builtin/ls-files.c:501
msgid "read additional per-directory exclude patterns in <file>"
msgstr ""
-#: builtin/ls-files.c:500
+#: builtin/ls-files.c:503
msgid "add the standard git exclusions"
msgstr ""
-#: builtin/ls-files.c:503
+#: builtin/ls-files.c:506
msgid "make the output relative to the project top directory"
msgstr ""
-#: builtin/ls-files.c:506
+#: builtin/ls-files.c:509
msgid "if any <file> is not in the index, treat this as an error"
msgstr ""
-#: builtin/ls-files.c:507
+#: builtin/ls-files.c:510
msgid "tree-ish"
msgstr ""
-#: builtin/ls-files.c:508
+#: builtin/ls-files.c:511
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr ""
-#: builtin/ls-files.c:510
+#: builtin/ls-files.c:513
msgid "show debugging data"
msgstr ""
msgid "abort if fast-forward is not possible"
msgstr ""
-#: builtin/merge.c:202 builtin/notes.c:870 builtin/revert.c:112
+#: builtin/merge.c:202 builtin/notes.c:866 builtin/revert.c:112
msgid "strategy"
msgstr ""
msgstr ""
#: builtin/merge.c:788
+#, c-format
msgid ""
"Please enter a commit message to explain why this merge is necessary,\n"
"especially if it merges an updated upstream into a topic branch.\n"
"\n"
-"Lines starting with '#' will be ignored, and an empty message aborts\n"
+"Lines starting with '%c' will be ignored, and an empty message aborts\n"
"the commit.\n"
msgstr ""
-#: builtin/merge.c:813
+#: builtin/merge.c:812
msgid "Empty commit message."
msgstr ""
-#: builtin/merge.c:825
+#: builtin/merge.c:824
#, c-format
msgid "Wonderful.\n"
msgstr ""
-#: builtin/merge.c:890
+#: builtin/merge.c:889
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr ""
-#: builtin/merge.c:906
+#: builtin/merge.c:905
#, c-format
msgid "'%s' is not a commit"
msgstr ""
-#: builtin/merge.c:947
+#: builtin/merge.c:946
msgid "No current branch."
msgstr ""
-#: builtin/merge.c:949
+#: builtin/merge.c:948
msgid "No remote for the current branch."
msgstr ""
-#: builtin/merge.c:951
+#: builtin/merge.c:950
msgid "No default upstream defined for the current branch."
msgstr ""
-#: builtin/merge.c:956
+#: builtin/merge.c:955
#, c-format
msgid "No remote tracking branch for %s from %s"
msgstr ""
-#: builtin/merge.c:1043 builtin/merge.c:1200
+#: builtin/merge.c:1042 builtin/merge.c:1199
#, c-format
msgid "%s - not something we can merge"
msgstr ""
-#: builtin/merge.c:1111
+#: builtin/merge.c:1110
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr ""
-#: builtin/merge.c:1127 git-pull.sh:31
+#: builtin/merge.c:1126 git-pull.sh:31
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you can merge."
msgstr ""
-#: builtin/merge.c:1130 git-pull.sh:34
+#: builtin/merge.c:1129 git-pull.sh:34
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr ""
-#: builtin/merge.c:1134
+#: builtin/merge.c:1133
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you can merge."
msgstr ""
-#: builtin/merge.c:1137
+#: builtin/merge.c:1136
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr ""
-#: builtin/merge.c:1146
+#: builtin/merge.c:1145
msgid "You cannot combine --squash with --no-ff."
msgstr ""
-#: builtin/merge.c:1151
+#: builtin/merge.c:1150
msgid "You cannot combine --no-ff with --ff-only."
msgstr ""
-#: builtin/merge.c:1158
+#: builtin/merge.c:1157
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr ""
-#: builtin/merge.c:1190
+#: builtin/merge.c:1189
msgid "Can merge only exactly one commit into empty head"
msgstr ""
-#: builtin/merge.c:1193
+#: builtin/merge.c:1192
msgid "Squash commit into empty head not supported yet"
msgstr ""
-#: builtin/merge.c:1195
+#: builtin/merge.c:1194
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr ""
-#: builtin/merge.c:1311
+#: builtin/merge.c:1310
#, c-format
msgid "Updating %s..%s\n"
msgstr ""
-#: builtin/merge.c:1350
+#: builtin/merge.c:1349
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr ""
-#: builtin/merge.c:1357
+#: builtin/merge.c:1356
#, c-format
msgid "Nope.\n"
msgstr ""
-#: builtin/merge.c:1389
+#: builtin/merge.c:1388
msgid "Not possible to fast-forward, aborting."
msgstr ""
-#: builtin/merge.c:1412 builtin/merge.c:1491
+#: builtin/merge.c:1411 builtin/merge.c:1490
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr ""
-#: builtin/merge.c:1416
+#: builtin/merge.c:1415
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr ""
-#: builtin/merge.c:1482
+#: builtin/merge.c:1481
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr ""
-#: builtin/merge.c:1484
+#: builtin/merge.c:1483
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr ""
-#: builtin/merge.c:1493
+#: builtin/merge.c:1492
#, c-format
msgid "Using the %s to prepare resolving by hand.\n"
msgstr ""
-#: builtin/merge.c:1505
+#: builtin/merge.c:1504
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
msgid "git notes get-ref"
msgstr ""
-#: builtin/notes.c:142
+#: builtin/notes.c:139
#, c-format
msgid "unable to start 'show' for object '%s'"
msgstr ""
-#: builtin/notes.c:148
-msgid "can't fdopen 'show' output fd"
-msgstr ""
-
-#: builtin/notes.c:158
-#, c-format
-msgid "failed to close pipe to 'show' for object '%s'"
+#: builtin/notes.c:143
+msgid "could not read 'show' output"
msgstr ""
-#: builtin/notes.c:161
+#: builtin/notes.c:151
#, c-format
msgid "failed to finish 'show' for object '%s'"
msgstr ""
-#: builtin/notes.c:178 builtin/tag.c:347
+#: builtin/notes.c:169 builtin/tag.c:341
#, c-format
msgid "could not create file '%s'"
msgstr ""
-#: builtin/notes.c:192
+#: builtin/notes.c:188
msgid "Please supply the note contents using either -m or -F option"
msgstr ""
-#: builtin/notes.c:213 builtin/notes.c:976
+#: builtin/notes.c:209 builtin/notes.c:972
#, c-format
msgid "Removing note for object %s\n"
msgstr ""
-#: builtin/notes.c:218
+#: builtin/notes.c:214
msgid "unable to write note object"
msgstr ""
-#: builtin/notes.c:220
+#: builtin/notes.c:216
#, c-format
msgid "The note contents has been left in %s"
msgstr ""
-#: builtin/notes.c:254 builtin/tag.c:542
+#: builtin/notes.c:250 builtin/tag.c:540
#, c-format
msgid "cannot read '%s'"
msgstr ""
-#: builtin/notes.c:256 builtin/tag.c:545
+#: builtin/notes.c:252 builtin/tag.c:543
#, c-format
msgid "could not open or read '%s'"
msgstr ""
-#: builtin/notes.c:275 builtin/notes.c:448 builtin/notes.c:450
-#: builtin/notes.c:510 builtin/notes.c:564 builtin/notes.c:647
-#: builtin/notes.c:652 builtin/notes.c:727 builtin/notes.c:769
-#: builtin/notes.c:971 builtin/tag.c:558
+#: builtin/notes.c:271 builtin/notes.c:444 builtin/notes.c:446
+#: builtin/notes.c:506 builtin/notes.c:560 builtin/notes.c:643
+#: builtin/notes.c:648 builtin/notes.c:723 builtin/notes.c:765
+#: builtin/notes.c:967 builtin/tag.c:556
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr ""
-#: builtin/notes.c:278
+#: builtin/notes.c:274
#, c-format
msgid "Failed to read object '%s'."
msgstr ""
-#: builtin/notes.c:302
+#: builtin/notes.c:298
msgid "Cannot commit uninitialized/unreferenced notes tree"
msgstr ""
-#: builtin/notes.c:343
+#: builtin/notes.c:339
#, c-format
msgid "Bad notes.rewriteMode value: '%s'"
msgstr ""
-#: builtin/notes.c:353
+#: builtin/notes.c:349
#, c-format
msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
msgstr ""
#. TRANSLATORS: The first %s is the name of the
#. environment variable, the second %s is its value
-#: builtin/notes.c:380
+#: builtin/notes.c:376
#, c-format
msgid "Bad %s value: '%s'"
msgstr ""
-#: builtin/notes.c:444
+#: builtin/notes.c:440
#, c-format
msgid "Malformed input line: '%s'."
msgstr ""
-#: builtin/notes.c:459
+#: builtin/notes.c:455
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr ""
-#: builtin/notes.c:503 builtin/notes.c:557 builtin/notes.c:630
-#: builtin/notes.c:642 builtin/notes.c:715 builtin/notes.c:762
-#: builtin/notes.c:1036
+#: builtin/notes.c:499 builtin/notes.c:553 builtin/notes.c:626
+#: builtin/notes.c:638 builtin/notes.c:711 builtin/notes.c:758
+#: builtin/notes.c:1032
msgid "too many parameters"
msgstr ""
-#: builtin/notes.c:516 builtin/notes.c:775
+#: builtin/notes.c:512 builtin/notes.c:771
#, c-format
msgid "No note found for object %s."
msgstr ""
-#: builtin/notes.c:538 builtin/notes.c:695
+#: builtin/notes.c:534 builtin/notes.c:691
msgid "note contents as a string"
msgstr ""
-#: builtin/notes.c:541 builtin/notes.c:698
+#: builtin/notes.c:537 builtin/notes.c:694
msgid "note contents in a file"
msgstr ""
-#: builtin/notes.c:543 builtin/notes.c:546 builtin/notes.c:700
-#: builtin/notes.c:703 builtin/tag.c:476
+#: builtin/notes.c:539 builtin/notes.c:542 builtin/notes.c:696
+#: builtin/notes.c:699 builtin/tag.c:474
msgid "object"
msgstr ""
-#: builtin/notes.c:544 builtin/notes.c:701
+#: builtin/notes.c:540 builtin/notes.c:697
msgid "reuse and edit specified note object"
msgstr ""
-#: builtin/notes.c:547 builtin/notes.c:704
+#: builtin/notes.c:543 builtin/notes.c:700
msgid "reuse specified note object"
msgstr ""
-#: builtin/notes.c:549 builtin/notes.c:617
+#: builtin/notes.c:545 builtin/notes.c:613
msgid "replace existing notes"
msgstr ""
-#: builtin/notes.c:583
+#: builtin/notes.c:579
#, c-format
msgid ""
"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
"existing notes"
msgstr ""
-#: builtin/notes.c:588 builtin/notes.c:665
+#: builtin/notes.c:584 builtin/notes.c:661
#, c-format
msgid "Overwriting existing notes for object %s\n"
msgstr ""
-#: builtin/notes.c:618
+#: builtin/notes.c:614
msgid "read objects from stdin"
msgstr ""
-#: builtin/notes.c:620
+#: builtin/notes.c:616
msgid "load rewriting config for <command> (implies --stdin)"
msgstr ""
-#: builtin/notes.c:638
+#: builtin/notes.c:634
msgid "too few parameters"
msgstr ""
-#: builtin/notes.c:659
+#: builtin/notes.c:655
#, c-format
msgid ""
"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
"existing notes"
msgstr ""
-#: builtin/notes.c:671
+#: builtin/notes.c:667
#, c-format
msgid "Missing notes on source object %s. Cannot copy."
msgstr ""
-#: builtin/notes.c:720
+#: builtin/notes.c:716
#, c-format
msgid ""
"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
msgstr ""
-#: builtin/notes.c:867
+#: builtin/notes.c:863
msgid "General options"
msgstr ""
-#: builtin/notes.c:869
+#: builtin/notes.c:865
msgid "Merge options"
msgstr ""
-#: builtin/notes.c:871
+#: builtin/notes.c:867
msgid ""
"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
"cat_sort_uniq)"
msgstr ""
-#: builtin/notes.c:873
+#: builtin/notes.c:869
msgid "Committing unmerged notes"
msgstr ""
-#: builtin/notes.c:875
+#: builtin/notes.c:871
msgid "finalize notes merge by committing unmerged notes"
msgstr ""
-#: builtin/notes.c:877
+#: builtin/notes.c:873
msgid "Aborting notes merge resolution"
msgstr ""
-#: builtin/notes.c:879
+#: builtin/notes.c:875
msgid "abort notes merge"
msgstr ""
-#: builtin/notes.c:974
+#: builtin/notes.c:970
#, c-format
msgid "Object %s has no note\n"
msgstr ""
-#: builtin/notes.c:986
+#: builtin/notes.c:982
msgid "attempt to remove non-existent note is not an error"
msgstr ""
-#: builtin/notes.c:989
+#: builtin/notes.c:985
msgid "read object names from the standard input"
msgstr ""
-#: builtin/notes.c:1070
+#: builtin/notes.c:1066
msgid "notes_ref"
msgstr ""
-#: builtin/notes.c:1071
+#: builtin/notes.c:1067
msgid "use notes from <notes_ref>"
msgstr ""
-#: builtin/notes.c:1106 builtin/remote.c:1598
+#: builtin/notes.c:1102 builtin/remote.c:1598
#, c-format
msgid "Unknown subcommand: %s"
msgstr ""
#: builtin/push.c:224
msgid ""
-"Updates were rejected because the destination reference already exists\n"
-"in the remote."
+"Updates were rejected because the remote contains work that you do\n"
+"not have locally. This is usually caused by another repository pushing\n"
+"to the same ref. You may want to first merge the remote changes (e.g.,\n"
+"'git pull') before pushing again.\n"
+"See the 'Note about fast-forwards' in 'git push --help' for details."
+msgstr ""
+
+#: builtin/push.c:231
+msgid "Updates were rejected because the tag already exists in the remote."
+msgstr ""
+
+#: builtin/push.c:234
+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:269
+#: builtin/push.c:294
#, c-format
msgid "Pushing to %s\n"
msgstr ""
-#: builtin/push.c:273
+#: builtin/push.c:298
#, c-format
msgid "failed to push some refs to '%s'"
msgstr ""
-#: builtin/push.c:302
+#: builtin/push.c:331
#, c-format
msgid "bad repository '%s'"
msgstr ""
-#: builtin/push.c:303
+#: builtin/push.c:332
msgid ""
"No configured push destination.\n"
"Either specify the URL from the command-line or configure a remote "
" git push <name>\n"
msgstr ""
-#: builtin/push.c:318
+#: builtin/push.c:347
msgid "--all and --tags are incompatible"
msgstr ""
-#: builtin/push.c:319
+#: builtin/push.c:348
msgid "--all can't be combined with refspecs"
msgstr ""
-#: builtin/push.c:324
+#: builtin/push.c:353
msgid "--mirror and --tags are incompatible"
msgstr ""
-#: builtin/push.c:325
+#: builtin/push.c:354
msgid "--mirror can't be combined with refspecs"
msgstr ""
-#: builtin/push.c:330
+#: builtin/push.c:359
msgid "--all and --mirror are incompatible"
msgstr ""
-#: builtin/push.c:390
+#: builtin/push.c:419
msgid "repository"
msgstr ""
-#: builtin/push.c:391
+#: builtin/push.c:420
msgid "push all refs"
msgstr ""
-#: builtin/push.c:392
+#: builtin/push.c:421
msgid "mirror all refs"
msgstr ""
-#: builtin/push.c:394
+#: builtin/push.c:423
msgid "delete refs"
msgstr ""
-#: builtin/push.c:395
+#: builtin/push.c:424
msgid "push tags (can't be used with --all or --mirror)"
msgstr ""
-#: builtin/push.c:398
+#: builtin/push.c:427
msgid "force updates"
msgstr ""
-#: builtin/push.c:399
+#: builtin/push.c:428
msgid "check"
msgstr ""
-#: builtin/push.c:400
+#: builtin/push.c:429
msgid "control recursive pushing of submodules"
msgstr ""
-#: builtin/push.c:402
+#: builtin/push.c:431
msgid "use thin pack"
msgstr ""
-#: builtin/push.c:403 builtin/push.c:404
+#: builtin/push.c:432 builtin/push.c:433
msgid "receive pack program"
msgstr ""
-#: builtin/push.c:405
+#: builtin/push.c:434
msgid "set upstream for git pull/status"
msgstr ""
-#: builtin/push.c:408
+#: builtin/push.c:437
msgid "prune locally removed refs"
msgstr ""
-#: builtin/push.c:418
+#: builtin/push.c:439
+msgid "bypass pre-push hook"
+msgstr ""
+
+#: builtin/push.c:448
msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr ""
-#: builtin/push.c:420
+#: builtin/push.c:450
msgid "--delete doesn't make sense without any refs"
msgstr ""
#: builtin/show-ref.c:10
msgid ""
-"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--hash"
-"[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] "
+"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--"
+"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] "
msgstr ""
#: builtin/show-ref.c:11
msgstr ""
#: builtin/tag.c:249
+#, c-format
msgid ""
"\n"
-"#\n"
-"# Write a tag message\n"
-"# Lines starting with '#' will be ignored.\n"
-"#\n"
+"Write a tag message\n"
+"Lines starting with '%c' will be ignored.\n"
msgstr ""
-#: builtin/tag.c:256
+#: builtin/tag.c:253
+#, c-format
msgid ""
"\n"
-"#\n"
-"# Write a tag message\n"
-"# Lines starting with '#' will be kept; you may remove them yourself if you "
+"Write a tag message\n"
+"Lines starting with '%c' will be kept; you may remove them yourself if you "
"want to.\n"
-"#\n"
msgstr ""
-#: builtin/tag.c:298
+#: builtin/tag.c:292
msgid "unable to sign the tag"
msgstr ""
-#: builtin/tag.c:300
+#: builtin/tag.c:294
msgid "unable to write tag file"
msgstr ""
-#: builtin/tag.c:325
+#: builtin/tag.c:319
msgid "bad object type."
msgstr ""
-#: builtin/tag.c:338
+#: builtin/tag.c:332
msgid "tag header too big."
msgstr ""
-#: builtin/tag.c:370
+#: builtin/tag.c:368
msgid "no tag message?"
msgstr ""
-#: builtin/tag.c:376
+#: builtin/tag.c:374
#, c-format
msgid "The tag message has been left in %s\n"
msgstr ""
-#: builtin/tag.c:425
+#: builtin/tag.c:423
msgid "switch 'points-at' requires an object"
msgstr ""
-#: builtin/tag.c:427
+#: builtin/tag.c:425
#, c-format
msgid "malformed object name '%s'"
msgstr ""
-#: builtin/tag.c:447
+#: builtin/tag.c:445
msgid "list tag names"
msgstr ""
-#: builtin/tag.c:449
+#: builtin/tag.c:447
msgid "print <n> lines of each tag message"
msgstr ""
-#: builtin/tag.c:451
+#: builtin/tag.c:449
msgid "delete tags"
msgstr ""
-#: builtin/tag.c:452
+#: builtin/tag.c:450
msgid "verify tags"
msgstr ""
-#: builtin/tag.c:454
+#: builtin/tag.c:452
msgid "Tag creation options"
msgstr ""
-#: builtin/tag.c:456
+#: builtin/tag.c:454
msgid "annotated tag, needs a message"
msgstr ""
-#: builtin/tag.c:458
+#: builtin/tag.c:456
msgid "tag message"
msgstr ""
-#: builtin/tag.c:460
+#: builtin/tag.c:458
msgid "annotated and GPG-signed tag"
msgstr ""
-#: builtin/tag.c:464
+#: builtin/tag.c:462
msgid "use another key to sign the tag"
msgstr ""
-#: builtin/tag.c:465
+#: builtin/tag.c:463
msgid "replace the tag if exists"
msgstr ""
-#: builtin/tag.c:466
+#: builtin/tag.c:464
msgid "show tag list in columns"
msgstr ""
-#: builtin/tag.c:468
+#: builtin/tag.c:466
msgid "Tag listing options"
msgstr ""
-#: builtin/tag.c:471
+#: builtin/tag.c:469
msgid "print only tags that contain the commit"
msgstr ""
-#: builtin/tag.c:477
+#: builtin/tag.c:475
msgid "print only tags of the object"
msgstr ""
-#: builtin/tag.c:506
+#: builtin/tag.c:504
msgid "--column and -n are incompatible"
msgstr ""
-#: builtin/tag.c:523
+#: builtin/tag.c:521
msgid "-n option is only allowed with -l."
msgstr ""
-#: builtin/tag.c:525
+#: builtin/tag.c:523
msgid "--contains option is only allowed with -l."
msgstr ""
-#: builtin/tag.c:527
+#: builtin/tag.c:525
msgid "--points-at option is only allowed with -l."
msgstr ""
-#: builtin/tag.c:535
+#: builtin/tag.c:533
msgid "only one -F or -m option is allowed."
msgstr ""
-#: builtin/tag.c:555
+#: builtin/tag.c:553
msgid "too many params"
msgstr ""
-#: builtin/tag.c:561
+#: builtin/tag.c:559
#, c-format
msgid "'%s' is not a valid tag name."
msgstr ""
-#: builtin/tag.c:566
+#: builtin/tag.c:564
#, c-format
msgid "tag '%s' already exists"
msgstr ""
-#: builtin/tag.c:584
+#: builtin/tag.c:582
#, c-format
msgid "%s: cannot lock the ref"
msgstr ""
-#: builtin/tag.c:586
+#: builtin/tag.c:584
#, c-format
msgid "%s: cannot update the ref"
msgstr ""
-#: builtin/tag.c:588
+#: builtin/tag.c:586
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr ""
msgstr ""
#: common-cmds.h:17
-msgid "Create an empty git repository or reinitialize an existing one"
+msgid "Create an empty Git repository or reinitialize an existing one"
msgstr ""
#: common-cmds.h:18
msgstr ""
#: git-submodule.sh:979
-msgid "# Submodules changed but not updated:"
+msgid "Submodules changed but not updated:"
msgstr ""
#: git-submodule.sh:981
-msgid "# Submodule changes to be committed:"
+msgid "Submodule changes to be committed:"
msgstr ""
#: git-submodule.sh:1129