msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2012-07-03 10:23+0800\n"
+"POT-Creation-Date: 2015-04-03 08:13+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:40
+#: advice.c:55
#, c-format
msgid "hint: %.*s\n"
msgstr ""
-#.
-#. * Message used both when 'git commit' fails and when
-#. * other commands doing a merge do.
-#.
-#: advice.c:70
+#: advice.c:88
+msgid ""
+"Fix them up in the work tree, and then use 'git add/rm <file>'\n"
+"as appropriate to mark resolution and make a commit."
+msgstr ""
+
+#: archive.c:11
+msgid "git archive [<options>] <tree-ish> [<path>...]"
+msgstr ""
+
+#: archive.c:12
+msgid "git archive --list"
+msgstr ""
+
+#: archive.c:13
+msgid ""
+"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
+msgstr ""
+
+#: archive.c:14
+msgid "git archive --remote <repo> [--exec <cmd>] --list"
+msgstr ""
+
+#: archive.c:342 builtin/add.c:137 builtin/add.c:427 builtin/rm.c:328
+#, c-format
+msgid "pathspec '%s' did not match any files"
+msgstr ""
+
+#: archive.c:427
+msgid "fmt"
+msgstr ""
+
+#: archive.c:427
+msgid "archive format"
+msgstr ""
+
+#: archive.c:428 builtin/log.c:1204
+msgid "prefix"
+msgstr ""
+
+#: archive.c:429
+msgid "prepend prefix to each pathname in the archive"
+msgstr ""
+
+#: archive.c:430 builtin/archive.c:88 builtin/blame.c:2516
+#: builtin/blame.c:2517 builtin/config.c:57 builtin/fast-export.c:986
+#: builtin/fast-export.c:988 builtin/grep.c:712 builtin/hash-object.c:101
+#: builtin/ls-files.c:446 builtin/ls-files.c:449 builtin/notes.c:394
+#: builtin/notes.c:557 builtin/read-tree.c:109 parse-options.h:151
+msgid "file"
+msgstr ""
+
+#: archive.c:431 builtin/archive.c:89
+msgid "write the archive to this file"
+msgstr ""
+
+#: archive.c:433
+msgid "read .gitattributes in working directory"
+msgstr ""
+
+#: archive.c:434
+msgid "report archived files on stderr"
+msgstr ""
+
+#: archive.c:435
+msgid "store only"
+msgstr ""
+
+#: archive.c:436
+msgid "compress faster"
+msgstr ""
+
+#: archive.c:444
+msgid "compress better"
+msgstr ""
+
+#: archive.c:447
+msgid "list supported archive formats"
+msgstr ""
+
+#: archive.c:449 builtin/archive.c:90 builtin/clone.c:86
+msgid "repo"
+msgstr ""
+
+#: archive.c:450 builtin/archive.c:91
+msgid "retrieve the archive from remote repository <repo>"
+msgstr ""
+
+#: archive.c:451 builtin/archive.c:92 builtin/notes.c:478
+msgid "command"
+msgstr ""
+
+#: archive.c:452 builtin/archive.c:93
+msgid "path to the remote git-upload-archive command"
+msgstr ""
+
+#: attr.c:264
+msgid ""
+"Negative patterns are ignored in git attributes\n"
+"Use '\\!' for literal leading exclamation."
+msgstr ""
+
+#: branch.c:60
+#, c-format
+msgid "Not setting branch %s as its own upstream."
+msgstr ""
+
+#: branch.c:83
+#, c-format
+msgid "Branch %s set up to track remote branch %s from %s by rebasing."
+msgstr ""
+
+#: branch.c:84
+#, c-format
+msgid "Branch %s set up to track remote branch %s from %s."
+msgstr ""
+
+#: branch.c:88
+#, c-format
+msgid "Branch %s set up to track local branch %s by rebasing."
+msgstr ""
+
+#: branch.c:89
+#, c-format
+msgid "Branch %s set up to track local branch %s."
+msgstr ""
+
+#: branch.c:94
+#, c-format
+msgid "Branch %s set up to track remote ref %s by rebasing."
+msgstr ""
+
+#: branch.c:95
+#, c-format
+msgid "Branch %s set up to track remote ref %s."
+msgstr ""
+
+#: branch.c:99
+#, c-format
+msgid "Branch %s set up to track local ref %s by rebasing."
+msgstr ""
+
+#: branch.c:100
+#, c-format
+msgid "Branch %s set up to track local ref %s."
+msgstr ""
+
+#: branch.c:133
+#, c-format
+msgid "Not tracking: ambiguous information for ref %s"
+msgstr ""
+
+#: branch.c:162
+#, c-format
+msgid "'%s' is not a valid branch name."
+msgstr ""
+
+#: branch.c:167
+#, c-format
+msgid "A branch named '%s' already exists."
+msgstr ""
+
+#: branch.c:175
+msgid "Cannot force update the current branch."
+msgstr ""
+
+#: branch.c:195
+#, c-format
+msgid "Cannot setup tracking information; starting point '%s' is not a branch."
+msgstr ""
+
+#: branch.c:197
+#, c-format
+msgid "the requested upstream branch '%s' does not exist"
+msgstr ""
+
+#: branch.c:199
msgid ""
-"Fix them up in the work tree,\n"
-"and then use 'git add/rm <file>' as\n"
-"appropriate to mark resolution and make a commit,\n"
-"or use 'git commit -a'."
+"\n"
+"If you are planning on basing your work on an upstream\n"
+"branch that already exists at the remote, you may need to\n"
+"run \"git fetch\" to retrieve it.\n"
+"\n"
+"If you are planning to push out a new local branch that\n"
+"will track its remote counterpart, you may want to use\n"
+"\"git push -u\" to set the upstream config as you push."
+msgstr ""
+
+#: branch.c:243
+#, c-format
+msgid "Not a valid object name: '%s'."
+msgstr ""
+
+#: branch.c:263
+#, c-format
+msgid "Ambiguous object name: '%s'."
+msgstr ""
+
+#: branch.c:268
+#, c-format
+msgid "Not a valid branch point: '%s'."
msgstr ""
-#: bundle.c:36
+#: bundle.c:34
#, c-format
msgid "'%s' does not look like a v2 bundle file"
msgstr ""
-#: bundle.c:63
+#: bundle.c:61
#, c-format
msgid "unrecognized header: %s%s (%d)"
msgstr ""
-#: bundle.c:89 builtin/commit.c:696
+#: bundle.c:87 builtin/commit.c:766
#, c-format
msgid "could not open '%s'"
msgstr ""
-#: bundle.c:140
+#: bundle.c:139
msgid "Repository lacks these prerequisite commits:"
msgstr ""
-#: bundle.c:164 sequencer.c:550 sequencer.c:982 builtin/log.c:290
-#: builtin/log.c:721 builtin/log.c:1310 builtin/log.c:1529 builtin/merge.c:347
-#: builtin/shortlog.c:181
+#: bundle.c:163 sequencer.c:650 sequencer.c:1105 builtin/blame.c:2705
+#: builtin/branch.c:659 builtin/commit.c:1045 builtin/log.c:330
+#: builtin/log.c:823 builtin/log.c:1432 builtin/log.c:1669 builtin/merge.c:358
+#: builtin/shortlog.c:158
msgid "revision walk setup failed"
msgstr ""
-#: bundle.c:186
+#: bundle.c:185
#, c-format
-msgid "The bundle contains %d ref"
-msgid_plural "The bundle contains %d refs"
+msgid "The bundle contains this ref:"
+msgid_plural "The bundle contains these %d refs:"
msgstr[0] ""
msgstr[1] ""
msgid "The bundle records a complete history."
msgstr ""
-#: bundle.c:195
+#: bundle.c:194
#, c-format
-msgid "The bundle requires this ref"
-msgid_plural "The bundle requires these %d refs"
+msgid "The bundle requires this ref:"
+msgid_plural "The bundle requires these %d refs:"
msgstr[0] ""
msgstr[1] ""
-#: bundle.c:294
-msgid "rev-list died"
+#: bundle.c:251
+msgid "Could not spawn pack-objects"
msgstr ""
-#: bundle.c:300 builtin/log.c:1206 builtin/shortlog.c:284
-#, c-format
-msgid "unrecognized argument: %s"
+#: bundle.c:269
+msgid "pack-objects died"
msgstr ""
-#: bundle.c:335
-#, c-format
-msgid "ref '%s' is excluded by the rev-list options"
+#: bundle.c:309
+msgid "rev-list died"
msgstr ""
-#: bundle.c:380
-msgid "Refusing to create empty bundle."
+#: bundle.c:358
+#, c-format
+msgid "ref '%s' is excluded by the rev-list options"
msgstr ""
-#: bundle.c:398
-msgid "Could not spawn pack-objects"
+#: bundle.c:437 builtin/log.c:153 builtin/log.c:1342 builtin/shortlog.c:261
+#, c-format
+msgid "unrecognized argument: %s"
msgstr ""
-#: bundle.c:416
-msgid "pack-objects died"
+#: bundle.c:443
+msgid "Refusing to create empty bundle."
msgstr ""
-#: bundle.c:419
+#: bundle.c:453
#, c-format
msgid "cannot create '%s'"
msgstr ""
-#: bundle.c:441
+#: bundle.c:474
msgid "index-pack died"
msgstr ""
-#: commit.c:48
+#: color.c:260
+#, c-format
+msgid "invalid color value: %.*s"
+msgstr ""
+
+#: commit.c:40
#, c-format
msgid "could not parse %s"
msgstr ""
-#: commit.c:50
+#: commit.c:42
#, c-format
msgid "%s %s is not a commit!"
msgstr ""
msgid "memory exhausted"
msgstr ""
-#: connected.c:39
+#: config.c:474 config.c:476
+#, c-format
+msgid "bad config file line %d in %s"
+msgstr ""
+
+#: config.c:592
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in %s: %s"
+msgstr ""
+
+#: config.c:594
+#, c-format
+msgid "bad numeric config value '%s' for '%s': %s"
+msgstr ""
+
+#: config.c:679
+#, c-format
+msgid "failed to expand user dir in: '%s'"
+msgstr ""
+
+#: config.c:757 config.c:768
+#, c-format
+msgid "bad zlib compression level %d"
+msgstr ""
+
+#: config.c:890
+#, c-format
+msgid "invalid mode for object creation: %s"
+msgstr ""
+
+#: config.c:1216
+msgid "unable to parse command-line config"
+msgstr ""
+
+#: config.c:1277
+msgid "unknown error occured while reading the configuration files"
+msgstr ""
+
+#: config.c:1601
+#, c-format
+msgid "unable to parse '%s' from command-line config"
+msgstr ""
+
+#: config.c:1603
+#, c-format
+msgid "bad config variable '%s' in file '%s' at line %d"
+msgstr ""
+
+#: config.c:1662
+#, c-format
+msgid "%s has multiple values"
+msgstr ""
+
+#: connected.c:69
msgid "Could not run 'git rev-list'"
msgstr ""
-#: connected.c:48
+#: connected.c:89
#, c-format
msgid "failed write to rev-list: %s"
msgstr ""
-#: connected.c:56
+#: connected.c:97
#, c-format
msgid "failed to close rev-list's stdin: %s"
msgstr ""
msgstr[0] ""
msgstr[1] ""
+#. TRANSLATORS: "%s" is "<n> years"
#: date.c:149
#, c-format
msgid "%s, %lu month ago"
msgstr[0] ""
msgstr[1] ""
-#: diff.c:105
+#: diffcore-order.c:24
#, c-format
-msgid " Failed to parse dirstat cut-off percentage '%.*s'\n"
+msgid "failed to read orderfile '%s'"
msgstr ""
-#: diff.c:110
-#, c-format
-msgid " Unknown dirstat parameter '%.*s'\n"
+#: diffcore-rename.c:536
+msgid "Performing inexact rename detection"
msgstr ""
-#: diff.c:210
+#: diff.c:114
#, c-format
-msgid ""
-"Found errors in 'diff.dirstat' config variable:\n"
-"%s"
+msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr ""
-#: diff.c:1400
-msgid " 0 files changed\n"
+#: diff.c:119
+#, c-format
+msgid " Unknown dirstat parameter '%s'\n"
msgstr ""
-#: diff.c:1404
+#: diff.c:214
#, c-format
-msgid " %d file changed"
-msgid_plural " %d files changed"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Unknown value for 'diff.submodule' config variable: '%s'"
+msgstr ""
-#: diff.c:1421
+#: diff.c:266
#, c-format
-msgid ", %d insertion(+)"
-msgid_plural ", %d insertions(+)"
-msgstr[0] ""
-msgstr[1] ""
+msgid ""
+"Found errors in 'diff.dirstat' config variable:\n"
+"%s"
+msgstr ""
-#: diff.c:1432
+#: diff.c:2956
#, c-format
-msgid ", %d deletion(-)"
-msgid_plural ", %d deletions(-)"
-msgstr[0] ""
-msgstr[1] ""
+msgid "external diff died, stopping at %s"
+msgstr ""
-#: diff.c:3478
+#: diff.c:3351
+msgid "--follow requires exactly one pathspec"
+msgstr ""
+
+#: diff.c:3514
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
"%s"
msgstr ""
-#: gpg-interface.c:59
+#: diff.c:3528
+#, c-format
+msgid "Failed to parse --submodule option parameter: '%s'"
+msgstr ""
+
+#: gpg-interface.c:129 gpg-interface.c:200
msgid "could not run gpg."
msgstr ""
-#: gpg-interface.c:71
+#: gpg-interface.c:141
msgid "gpg did not accept the data"
msgstr ""
-#: gpg-interface.c:82
+#: gpg-interface.c:152
msgid "gpg failed to sign the data"
msgstr ""
-#: grep.c:1320
+#: gpg-interface.c:185
+#, c-format
+msgid "could not create temporary file '%s': %s"
+msgstr ""
+
+#: gpg-interface.c:188
+#, c-format
+msgid "failed writing detached signature to '%s': %s"
+msgstr ""
+
+#: grep.c:1718
#, c-format
msgid "'%s': unable to read %s"
msgstr ""
-#: grep.c:1337
+#: grep.c:1735
#, c-format
msgid "'%s': %s"
msgstr ""
-#: grep.c:1348
+#: grep.c:1746
#, c-format
msgid "'%s': short read %s"
msgstr ""
-#: help.c:208
+#: help.c:207
#, c-format
msgid "available git commands in '%s'"
msgstr ""
-#: help.c:215
+#: help.c:214
msgid "git commands available from elsewhere on your $PATH"
msgstr ""
-#: help.c:271
+#: help.c:230
+msgid "The most commonly used git commands are:"
+msgstr ""
+
+#: help.c:289
#, 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:328
+#: help.c:346
msgid "Uh oh. Your system reports no Git commands at all."
msgstr ""
-#: help.c:350
+#: help.c:368
#, 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:355
+#: help.c:373
#, c-format
msgid "in %0.1f seconds automatically..."
msgstr ""
-#: help.c:362
+#: help.c:380
#, c-format
msgid "git: '%s' is not a git command. See 'git --help'."
msgstr ""
-#: help.c:366
+#: help.c:384 help.c:444
msgid ""
"\n"
"Did you mean this?"
msgstr[0] ""
msgstr[1] ""
-#: parse-options.c:493
-msgid "..."
+#: help.c:440
+#, c-format
+msgid "%s: %s - %s"
msgstr ""
-#: parse-options.c:511
-#, c-format
-msgid "usage: %s"
+#: lockfile.c:283
+msgid "BUG: reopen a lockfile that is still open"
msgstr ""
-#. TRANSLATORS: the colon here should align with the
-#. one in "usage: %s" translation
-#: parse-options.c:515
-#, c-format
-msgid " or: %s"
+#: lockfile.c:285
+msgid "BUG: reopen a lockfile that has been committed"
msgstr ""
-#: parse-options.c:518
-#, c-format
-msgid " %s"
+#: merge.c:41
+msgid "failed to read the cache"
msgstr ""
-#: remote.c:1629
-#, c-format
-msgid "Your branch is ahead of '%s' by %d commit.\n"
-msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
-msgstr[0] ""
-msgstr[1] ""
+#: merge.c:94 builtin/checkout.c:374 builtin/checkout.c:580
+#: builtin/clone.c:662
+msgid "unable to write new index file"
+msgstr ""
-#: remote.c:1635
+#: merge-recursive.c:189
#, c-format
-msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
-msgid_plural ""
-"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
-msgstr[0] ""
-msgstr[1] ""
+msgid "(bad commit)\n"
+msgstr ""
-#: remote.c:1643
+#: merge-recursive.c:209
#, c-format
-msgid ""
-"Your branch and '%s' have diverged,\n"
-"and have %d and %d different commit each, respectively.\n"
-msgid_plural ""
-"Your branch and '%s' have diverged,\n"
-"and have %d and %d different commits each, respectively.\n"
-msgstr[0] ""
-msgstr[1] ""
+msgid "addinfo_cache failed for path '%s'"
+msgstr ""
-#: sequencer.c:121 builtin/merge.c:865 builtin/merge.c:978
-#: builtin/merge.c:1088 builtin/merge.c:1098
-#, c-format
-msgid "Could not open '%s' for writing"
+#: merge-recursive.c:270
+msgid "error building trees"
msgstr ""
-#: sequencer.c:123 builtin/merge.c:333 builtin/merge.c:868
-#: builtin/merge.c:1090 builtin/merge.c:1103
+#: merge-recursive.c:688
#, c-format
-msgid "Could not write to '%s'"
+msgid "failed to create path '%s'%s"
msgstr ""
-#: sequencer.c:144
-msgid ""
-"after resolving the conflicts, mark the corrected paths\n"
-"with 'git add <paths>' or 'git rm <paths>'"
+#: merge-recursive.c:699
+#, c-format
+msgid "Removing %s to make room for subdirectory\n"
msgstr ""
-#: sequencer.c:147
-msgid ""
-"after resolving the conflicts, mark the corrected paths\n"
-"with 'git add <paths>' or 'git rm <paths>'\n"
-"and commit the result with 'git commit'"
+#: merge-recursive.c:713 merge-recursive.c:734
+msgid ": perhaps a D/F conflict?"
msgstr ""
-#: sequencer.c:160 sequencer.c:758 sequencer.c:841
+#: merge-recursive.c:724
#, c-format
-msgid "Could not write to %s"
+msgid "refusing to lose untracked file at '%s'"
msgstr ""
-#: sequencer.c:163
+#: merge-recursive.c:764
#, c-format
-msgid "Error wrapping up %s"
+msgid "cannot read object %s '%s'"
msgstr ""
-#: sequencer.c:178
-msgid "Your local changes would be overwritten by cherry-pick."
+#: merge-recursive.c:766
+#, c-format
+msgid "blob expected for %s '%s'"
msgstr ""
-#: sequencer.c:180
-msgid "Your local changes would be overwritten by revert."
+#: merge-recursive.c:789 builtin/clone.c:321
+#, c-format
+msgid "failed to open '%s'"
msgstr ""
-#: sequencer.c:183
-msgid "Commit your changes or stash them to proceed."
+#: merge-recursive.c:797
+#, c-format
+msgid "failed to symlink '%s'"
msgstr ""
-#. TRANSLATORS: %s will be "revert" or "cherry-pick"
-#: sequencer.c:233
+#: merge-recursive.c:800
#, c-format
-msgid "%s: Unable to write new index file"
+msgid "do not know what to do with %06o %s '%s'"
msgstr ""
-#: sequencer.c:261
-msgid "Could not resolve HEAD commit\n"
+#: merge-recursive.c:938
+msgid "Failed to execute internal merge"
msgstr ""
-#: sequencer.c:282
-msgid "Unable to update cache tree\n"
+#: merge-recursive.c:942
+#, c-format
+msgid "Unable to add %s to database"
msgstr ""
-#: sequencer.c:324
+#: merge-recursive.c:958
+msgid "unsupported object type in the tree"
+msgstr ""
+
+#: merge-recursive.c:1033 merge-recursive.c:1047
#, c-format
-msgid "Could not parse commit %s\n"
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
+"in tree."
msgstr ""
-#: sequencer.c:329
+#: merge-recursive.c:1039 merge-recursive.c:1052
#, c-format
-msgid "Could not parse parent commit %s\n"
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
+"in tree at %s."
msgstr ""
-#: sequencer.c:395
-msgid "Your index file is unmerged."
+#: merge-recursive.c:1093
+msgid "rename"
msgstr ""
-#: sequencer.c:398
-msgid "You do not have a valid HEAD"
+#: merge-recursive.c:1093
+msgid "renamed"
msgstr ""
-#: sequencer.c:413
+#: merge-recursive.c:1149
#, c-format
-msgid "Commit %s is a merge but no -m option was given."
+msgid "%s is a directory in %s adding as %s instead"
msgstr ""
-#: sequencer.c:421
+#: merge-recursive.c:1171
#, c-format
-msgid "Commit %s does not have parent %d"
+msgid ""
+"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
+"\"->\"%s\" in \"%s\"%s"
msgstr ""
-#: sequencer.c:425
-#, c-format
-msgid "Mainline was specified but commit %s is not a merge."
+#: merge-recursive.c:1176
+msgid " (left unresolved)"
msgstr ""
-#. TRANSLATORS: The first %s will be "revert" or
-#. "cherry-pick", the second %s a SHA1
-#: sequencer.c:436
+#: merge-recursive.c:1230
#, c-format
-msgid "%s: cannot parse parent commit %s"
+msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr ""
-#: sequencer.c:440
+#: merge-recursive.c:1260
#, c-format
-msgid "Cannot get commit message for %s"
+msgid "Renaming %s to %s and %s to %s instead"
msgstr ""
-#: sequencer.c:524
+#: merge-recursive.c:1459
#, c-format
-msgid "could not revert %s... %s"
+msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
msgstr ""
-#: sequencer.c:525
+#: merge-recursive.c:1469
#, c-format
-msgid "could not apply %s... %s"
+msgid "Adding merged %s"
msgstr ""
-#: sequencer.c:553
-msgid "empty commit set passed"
+#: merge-recursive.c:1474 merge-recursive.c:1672
+#, c-format
+msgid "Adding as %s instead"
msgstr ""
-#: sequencer.c:561
+#: merge-recursive.c:1525
#, c-format
-msgid "git %s: failed to read the index"
+msgid "cannot read object %s"
msgstr ""
-#: sequencer.c:566
+#: merge-recursive.c:1528
#, c-format
-msgid "git %s: failed to refresh the index"
+msgid "object %s is not a blob"
msgstr ""
-#: sequencer.c:624
-#, c-format
-msgid "Cannot %s during a %s"
+#: merge-recursive.c:1576
+msgid "modify"
msgstr ""
-#: sequencer.c:646
-#, c-format
-msgid "Could not parse line %d."
+#: merge-recursive.c:1576
+msgid "modified"
msgstr ""
-#: sequencer.c:651
-msgid "No commits parsed."
+#: merge-recursive.c:1586
+msgid "content"
msgstr ""
-#: sequencer.c:664
-#, c-format
-msgid "Could not open %s"
+#: merge-recursive.c:1593
+msgid "add/add"
msgstr ""
-#: sequencer.c:668
+#: merge-recursive.c:1627
#, c-format
-msgid "Could not read %s."
+msgid "Skipped %s (merged same as existing)"
msgstr ""
-#: sequencer.c:675
+#: merge-recursive.c:1641
#, c-format
-msgid "Unusable instruction sheet: %s"
+msgid "Auto-merging %s"
msgstr ""
-#: sequencer.c:703
-#, c-format
-msgid "Invalid key: %s"
+#: merge-recursive.c:1645 git-submodule.sh:1150
+msgid "submodule"
msgstr ""
-#: sequencer.c:706
+#: merge-recursive.c:1646
#, c-format
-msgid "Invalid value for %s: %s"
+msgid "CONFLICT (%s): Merge conflict in %s"
msgstr ""
-#: sequencer.c:718
+#: merge-recursive.c:1732
#, c-format
-msgid "Malformed options sheet: %s"
+msgid "Removing %s"
msgstr ""
-#: sequencer.c:739
-msgid "a cherry-pick or revert is already in progress"
+#: merge-recursive.c:1757
+msgid "file/directory"
msgstr ""
-#: sequencer.c:740
-msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
+#: merge-recursive.c:1763
+msgid "directory/file"
msgstr ""
-#: sequencer.c:744
+#: merge-recursive.c:1768
#, c-format
-msgid "Could not create sequencer directory %s"
+msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
msgstr ""
-#: sequencer.c:760 sequencer.c:845
+#: merge-recursive.c:1778
#, c-format
-msgid "Error wrapping up %s."
+msgid "Adding %s"
msgstr ""
-#: sequencer.c:779 sequencer.c:913
-msgid "no cherry-pick or revert in progress"
-msgstr ""
-
-#: sequencer.c:781
-msgid "cannot resolve HEAD"
+#: merge-recursive.c:1795
+msgid "Fatal merge failure, shouldn't happen."
msgstr ""
-#: sequencer.c:783
-msgid "cannot abort from a branch yet to be born"
+#: merge-recursive.c:1814
+msgid "Already up-to-date!"
msgstr ""
-#: sequencer.c:805 builtin/apply.c:3697
+#: merge-recursive.c:1823
#, c-format
-msgid "cannot open %s: %s"
+msgid "merging of trees %s and %s failed"
msgstr ""
-#: sequencer.c:808
+#: merge-recursive.c:1853
#, c-format
-msgid "cannot read %s: %s"
+msgid "Unprocessed path??? %s"
msgstr ""
-#: sequencer.c:809
-msgid "unexpected end of file"
+#: merge-recursive.c:1901
+msgid "Merging:"
msgstr ""
-#: sequencer.c:815
+#: merge-recursive.c:1914
#, c-format
-msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
-msgstr ""
+msgid "found %u common ancestor:"
+msgid_plural "found %u common ancestors:"
+msgstr[0] ""
+msgstr[1] ""
-#: sequencer.c:838
-#, c-format
-msgid "Could not format %s."
+#: merge-recursive.c:1951
+msgid "merge returned no commit"
msgstr ""
-#: sequencer.c:1000
-msgid "Can't revert as initial commit"
+#: merge-recursive.c:2008
+#, c-format
+msgid "Could not parse object '%s'"
msgstr ""
-#: sequencer.c:1001
-msgid "Can't cherry-pick into empty head"
+#: merge-recursive.c:2019 builtin/merge.c:667
+msgid "Unable to write index."
msgstr ""
-#: sha1_name.c:864
-msgid "HEAD does not point to a branch"
+#: notes-utils.c:41
+msgid "Cannot commit uninitialized/unreferenced notes tree"
msgstr ""
-#: sha1_name.c:867
+#: notes-utils.c:82
#, c-format
-msgid "No such branch: '%s'"
+msgid "Bad notes.rewriteMode value: '%s'"
msgstr ""
-#: sha1_name.c:869
+#: notes-utils.c:92
#, c-format
-msgid "No upstream configured for branch '%s'"
+msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
msgstr ""
-#: sha1_name.c:872
+#. TRANSLATORS: The first %s is the name of the
+#. environment variable, the second %s is its value
+#: notes-utils.c:119
#, c-format
-msgid "Upstream branch '%s' not stored as a remote-tracking branch"
+msgid "Bad %s value: '%s'"
msgstr ""
-#: wrapper.c:413
+#: object.c:241
#, c-format
-msgid "unable to look up current user in the passwd file: %s"
+msgid "unable to parse object: %s"
msgstr ""
-#: wrapper.c:414
-msgid "no such user"
+#: parse-options.c:546
+msgid "..."
msgstr ""
-#: wt-status.c:141
-msgid "Unmerged paths:"
+#: parse-options.c:564
+#, c-format
+msgid "usage: %s"
msgstr ""
-#: wt-status.c:168 wt-status.c:195
+#. TRANSLATORS: the colon here should align with the
+#. one in "usage: %s" translation
+#: parse-options.c:568
#, c-format
-msgid " (use \"git reset %s <file>...\" to unstage)"
+msgid " or: %s"
msgstr ""
-#: wt-status.c:170 wt-status.c:197
-msgid " (use \"git rm --cached <file>...\" to unstage)"
+#: parse-options.c:571
+#, c-format
+msgid " %s"
msgstr ""
-#: wt-status.c:174
-msgid " (use \"git add <file>...\" to mark resolution)"
+#: parse-options.c:605
+msgid "-NUM"
msgstr ""
-#: wt-status.c:176 wt-status.c:180
-msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
+#: pathspec.c:133
+msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
msgstr ""
-#: wt-status.c:178
-msgid " (use \"git rm <file>...\" to mark resolution)"
+#: pathspec.c:143
+msgid ""
+"global 'literal' pathspec setting is incompatible with all other global "
+"pathspec settings"
msgstr ""
-#: wt-status.c:189
-msgid "Changes to be committed:"
+#: pathspec.c:177
+msgid "invalid parameter for pathspec magic 'prefix'"
msgstr ""
-#: wt-status.c:207
-msgid "Changes not staged for commit:"
+#: pathspec.c:183
+#, c-format
+msgid "Invalid pathspec magic '%.*s' in '%s'"
msgstr ""
-#: wt-status.c:211
-msgid " (use \"git add <file>...\" to update what will be committed)"
+#: pathspec.c:187
+#, c-format
+msgid "Missing ')' at the end of pathspec magic in '%s'"
msgstr ""
-#: wt-status.c:213
-msgid " (use \"git add/rm <file>...\" to update what will be committed)"
+#: pathspec.c:205
+#, c-format
+msgid "Unimplemented pathspec magic '%c' in '%s'"
msgstr ""
-#: wt-status.c:214
-msgid ""
-" (use \"git checkout -- <file>...\" to discard changes in working directory)"
+#: pathspec.c:230
+#, c-format
+msgid "%s: 'literal' and 'glob' are incompatible"
msgstr ""
-#: wt-status.c:216
-msgid " (commit or discard the untracked or modified content in submodules)"
+#: pathspec.c:241
+#, c-format
+msgid "%s: '%s' is outside repository"
msgstr ""
-#: wt-status.c:225
+#: pathspec.c:291
#, c-format
-msgid "%s files:"
+msgid "Pathspec '%s' is in submodule '%.*s'"
msgstr ""
-#: wt-status.c:228
+#: pathspec.c:353
#, c-format
-msgid " (use \"git %s <file>...\" to include in what will be committed)"
+msgid "%s: pathspec magic not supported by this command: %s"
msgstr ""
-#: wt-status.c:245
-msgid "bug"
+#: pathspec.c:432
+#, c-format
+msgid "pathspec '%s' is beyond a symbolic link"
msgstr ""
-#: wt-status.c:250
-msgid "both deleted:"
+#: pathspec.c:441
+msgid ""
+"There is nothing to exclude from by :(exclude) patterns.\n"
+"Perhaps you forgot to add either ':/' or '.' ?"
msgstr ""
-#: wt-status.c:251
-msgid "added by us:"
+#: pretty.c:968
+msgid "unable to parse --pretty format"
msgstr ""
-#: wt-status.c:252
-msgid "deleted by them:"
+#: progress.c:225
+msgid "done"
msgstr ""
-#: wt-status.c:253
-msgid "added by them:"
+#: read-cache.c:1275
+#, c-format
+msgid ""
+"index.version set, but the value is invalid.\n"
+"Using version %i"
msgstr ""
-#: wt-status.c:254
-msgid "deleted by us:"
+#: read-cache.c:1285
+#, c-format
+msgid ""
+"GIT_INDEX_VERSION set, but the value is invalid.\n"
+"Using version %i"
msgstr ""
-#: wt-status.c:255
-msgid "both added:"
+#: remote.c:782
+#, c-format
+msgid "Cannot fetch both %s and %s to %s"
msgstr ""
-#: wt-status.c:256
-msgid "both modified:"
+#: remote.c:786
+#, c-format
+msgid "%s usually tracks %s, not %s"
msgstr ""
-#: wt-status.c:286
-msgid "new commits, "
+#: remote.c:790
+#, c-format
+msgid "%s tracks both %s and %s"
msgstr ""
-#: wt-status.c:288
-msgid "modified content, "
+#: remote.c:798
+msgid "Internal error"
msgstr ""
-#: wt-status.c:290
-msgid "untracked content, "
+#: remote.c:1980
+#, c-format
+msgid "Your branch is based on '%s', but the upstream is gone.\n"
msgstr ""
-#: wt-status.c:304
-#, c-format
-msgid "new file: %s"
+#: remote.c:1984
+msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr ""
-#: wt-status.c:307
+#: remote.c:1987
#, c-format
-msgid "copied: %s -> %s"
+msgid "Your branch is up-to-date with '%s'.\n"
msgstr ""
-#: wt-status.c:310
+#: remote.c:1991
#, c-format
-msgid "deleted: %s"
+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:1997
+msgid " (use \"git push\" to publish your local commits)\n"
msgstr ""
-#: wt-status.c:313
+#: remote.c:2000
#, c-format
-msgid "modified: %s"
+msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
+msgid_plural ""
+"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: remote.c:2008
+msgid " (use \"git pull\" to update your local branch)\n"
msgstr ""
-#: wt-status.c:316
+#: remote.c:2011
#, c-format
-msgid "renamed: %s -> %s"
+msgid ""
+"Your branch and '%s' have diverged,\n"
+"and have %d and %d different commit each, respectively.\n"
+msgid_plural ""
+"Your branch and '%s' have diverged,\n"
+"and have %d and %d different commits each, respectively.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: remote.c:2021
+msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr ""
-#: wt-status.c:319
-#, c-format
-msgid "typechange: %s"
+#: revision.c:2348
+msgid "--first-parent is incompatible with --bisect"
msgstr ""
-#: wt-status.c:322
-#, c-format
-msgid "unknown: %s"
+#: run-command.c:83
+msgid "open /dev/null failed"
msgstr ""
-#: wt-status.c:325
+#: run-command.c:85
#, c-format
-msgid "unmerged: %s"
+msgid "dup2(%d,%d) failed"
msgstr ""
-#: wt-status.c:328
-#, c-format
-msgid "bug: unhandled diff status %c"
+#: send-pack.c:272
+msgid "failed to sign the push certificate"
msgstr ""
-#: wt-status.c:786
-msgid "You have unmerged paths."
+#: send-pack.c:356
+msgid "the receiving end does not support --signed push"
msgstr ""
-#: wt-status.c:789 wt-status.c:913
-msgid " (fix conflicts and run \"git commit\")"
+#: send-pack.c:366
+msgid "the receiving end does not support --atomic push"
msgstr ""
-#: wt-status.c:792
-msgid "All conflicts fixed but you are still merging."
+#: sequencer.c:172 builtin/merge.c:782 builtin/merge.c:893 builtin/merge.c:995
+#: builtin/merge.c:1005
+#, c-format
+msgid "Could not open '%s' for writing"
msgstr ""
-#: wt-status.c:795
-msgid " (use \"git commit\" to conclude merge)"
+#: sequencer.c:174 builtin/merge.c:344 builtin/merge.c:785 builtin/merge.c:997
+#: builtin/merge.c:1010
+#, c-format
+msgid "Could not write to '%s'"
msgstr ""
-#: wt-status.c:805
-msgid "You are in the middle of an am session."
+#: sequencer.c:195
+msgid ""
+"after resolving the conflicts, mark the corrected paths\n"
+"with 'git add <paths>' or 'git rm <paths>'"
msgstr ""
-#: wt-status.c:808
-msgid "The current patch is empty."
+#: sequencer.c:198
+msgid ""
+"after resolving the conflicts, mark the corrected paths\n"
+"with 'git add <paths>' or 'git rm <paths>'\n"
+"and commit the result with 'git commit'"
msgstr ""
-#: wt-status.c:812
-msgid " (fix conflicts and then run \"git am --resolved\")"
+#: sequencer.c:211 sequencer.c:861 sequencer.c:944
+#, c-format
+msgid "Could not write to %s"
msgstr ""
-#: wt-status.c:814
-msgid " (use \"git am --skip\" to skip this patch)"
+#: sequencer.c:214
+#, c-format
+msgid "Error wrapping up %s"
msgstr ""
-#: wt-status.c:816
-msgid " (use \"git am --abort\" to restore the original branch)"
+#: sequencer.c:229
+msgid "Your local changes would be overwritten by cherry-pick."
msgstr ""
-#: wt-status.c:874 wt-status.c:884
-msgid "You are currently rebasing."
+#: sequencer.c:231
+msgid "Your local changes would be overwritten by revert."
msgstr ""
-#: wt-status.c:877
-msgid " (fix conflicts and then run \"git rebase --continue\")"
+#: sequencer.c:234
+msgid "Commit your changes or stash them to proceed."
msgstr ""
-#: wt-status.c:879
-msgid " (use \"git rebase --skip\" to skip this patch)"
+#. TRANSLATORS: %s will be "revert" or "cherry-pick"
+#: sequencer.c:321
+#, c-format
+msgid "%s: Unable to write new index file"
msgstr ""
-#: wt-status.c:881
-msgid " (use \"git rebase --abort\" to check out the original branch)"
+#: sequencer.c:339
+msgid "Could not resolve HEAD commit\n"
msgstr ""
-#: wt-status.c:887
-msgid " (all conflicts fixed: run \"git rebase --continue\")"
+#: sequencer.c:359
+msgid "Unable to update cache tree\n"
msgstr ""
-#: wt-status.c:889
-msgid "You are currently splitting a commit during a rebase."
+#: sequencer.c:411
+#, c-format
+msgid "Could not parse commit %s\n"
msgstr ""
-#: wt-status.c:892
-msgid " (Once your working directory is clean, run \"git rebase --continue\")"
+#: sequencer.c:416
+#, c-format
+msgid "Could not parse parent commit %s\n"
msgstr ""
-#: wt-status.c:894
-msgid "You are currently editing a commit during a rebase."
+#: sequencer.c:482
+msgid "Your index file is unmerged."
msgstr ""
-#: wt-status.c:897
-msgid " (use \"git commit --amend\" to amend the current commit)"
+#: sequencer.c:501
+#, c-format
+msgid "Commit %s is a merge but no -m option was given."
msgstr ""
-#: wt-status.c:899
-msgid ""
-" (use \"git rebase --continue\" once you are satisfied with your changes)"
+#: sequencer.c:509
+#, c-format
+msgid "Commit %s does not have parent %d"
msgstr ""
-#: wt-status.c:909
-msgid "You are currently cherry-picking."
+#: sequencer.c:513
+#, c-format
+msgid "Mainline was specified but commit %s is not a merge."
msgstr ""
-#: wt-status.c:916
-msgid " (all conflicts fixed: run \"git commit\")"
+#. TRANSLATORS: The first %s will be "revert" or
+#. "cherry-pick", the second %s a SHA1
+#: sequencer.c:526
+#, c-format
+msgid "%s: cannot parse parent commit %s"
msgstr ""
-#: wt-status.c:925
-msgid "You are currently bisecting."
+#: sequencer.c:530
+#, c-format
+msgid "Cannot get commit message for %s"
msgstr ""
-#: wt-status.c:928
-msgid " (use \"git bisect reset\" to get back to the original branch)"
+#: sequencer.c:616
+#, c-format
+msgid "could not revert %s... %s"
msgstr ""
-#: wt-status.c:979
-msgid "On branch "
+#: sequencer.c:617
+#, c-format
+msgid "could not apply %s... %s"
msgstr ""
-#: wt-status.c:986
-msgid "Not currently on any branch."
+#: sequencer.c:653
+msgid "empty commit set passed"
msgstr ""
-#: wt-status.c:998
-msgid "Initial commit"
+#: sequencer.c:661
+#, c-format
+msgid "git %s: failed to read the index"
msgstr ""
-#: wt-status.c:1012
-msgid "Untracked"
+#: sequencer.c:665
+#, c-format
+msgid "git %s: failed to refresh the index"
msgstr ""
-#: wt-status.c:1014
-msgid "Ignored"
+#: sequencer.c:725
+#, c-format
+msgid "Cannot %s during a %s"
msgstr ""
-#: wt-status.c:1016
+#: sequencer.c:747
#, c-format
-msgid "Untracked files not listed%s"
+msgid "Could not parse line %d."
msgstr ""
-#: wt-status.c:1018
-msgid " (use -u option to show untracked files)"
+#: sequencer.c:752
+msgid "No commits parsed."
msgstr ""
-#: wt-status.c:1024
-msgid "No changes"
+#: sequencer.c:765
+#, c-format
+msgid "Could not open %s"
msgstr ""
-#: wt-status.c:1028
+#: sequencer.c:769
#, c-format
-msgid "no changes added to commit%s\n"
+msgid "Could not read %s."
msgstr ""
-#: wt-status.c:1030
-msgid " (use \"git add\" and/or \"git commit -a\")"
+#: sequencer.c:776
+#, c-format
+msgid "Unusable instruction sheet: %s"
msgstr ""
-#: wt-status.c:1032
+#: sequencer.c:806
#, c-format
-msgid "nothing added to commit but untracked files present%s\n"
+msgid "Invalid key: %s"
msgstr ""
-#: wt-status.c:1034
-msgid " (use \"git add\" to track)"
+#: sequencer.c:809
+#, c-format
+msgid "Invalid value for %s: %s"
msgstr ""
-#: wt-status.c:1036 wt-status.c:1039 wt-status.c:1042
+#: sequencer.c:821
#, c-format
-msgid "nothing to commit%s\n"
+msgid "Malformed options sheet: %s"
msgstr ""
-#: wt-status.c:1037
-msgid " (create/copy files and use \"git add\" to track)"
+#: sequencer.c:842
+msgid "a cherry-pick or revert is already in progress"
msgstr ""
-#: wt-status.c:1040
-msgid " (use -u to show untracked files)"
+#: sequencer.c:843
+msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
msgstr ""
-#: wt-status.c:1043
-msgid " (working directory clean)"
+#: sequencer.c:847
+#, c-format
+msgid "Could not create sequencer directory %s"
msgstr ""
-#: wt-status.c:1151
-msgid "HEAD (no branch)"
+#: sequencer.c:863 sequencer.c:948
+#, c-format
+msgid "Error wrapping up %s."
msgstr ""
-#: wt-status.c:1157
-msgid "Initial commit on "
+#: sequencer.c:882 sequencer.c:1018
+msgid "no cherry-pick or revert in progress"
msgstr ""
-#: wt-status.c:1172
-msgid "behind "
+#: sequencer.c:884
+msgid "cannot resolve HEAD"
msgstr ""
-#: wt-status.c:1175 wt-status.c:1178
-msgid "ahead "
+#: sequencer.c:886
+msgid "cannot abort from a branch yet to be born"
msgstr ""
-#: wt-status.c:1180
-msgid ", behind "
+#: sequencer.c:908 builtin/apply.c:4288
+#, c-format
+msgid "cannot open %s: %s"
msgstr ""
-#: builtin/add.c:62
+#: sequencer.c:911
#, c-format
-msgid "unexpected diff status %c"
+msgid "cannot read %s: %s"
msgstr ""
-#: builtin/add.c:67 builtin/commit.c:226
-msgid "updating files failed"
+#: sequencer.c:912
+msgid "unexpected end of file"
msgstr ""
-#: builtin/add.c:77
+#: sequencer.c:918
#, c-format
-msgid "remove '%s'\n"
+msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr ""
-#: builtin/add.c:176
+#: sequencer.c:941
#, c-format
-msgid "Path '%s' is in submodule '%.*s'"
+msgid "Could not format %s."
msgstr ""
-#: builtin/add.c:192
-msgid "Unstaged changes after refreshing the index:"
+#: sequencer.c:1086
+#, c-format
+msgid "%s: can't cherry-pick a %s"
msgstr ""
-#: builtin/add.c:195 builtin/add.c:459 builtin/rm.c:186
+#: sequencer.c:1089
#, c-format
-msgid "pathspec '%s' did not match any files"
+msgid "%s: bad revision"
msgstr ""
-#: builtin/add.c:209
-#, c-format
-msgid "'%s' is beyond a symbolic link"
+#: sequencer.c:1123
+msgid "Can't revert as initial commit"
msgstr ""
-#: builtin/add.c:276
-msgid "Could not read the index"
+#: sequencer.c:1124
+msgid "Can't cherry-pick into empty head"
msgstr ""
-#: builtin/add.c:286
-#, c-format
-msgid "Could not open '%s' for writing."
+#: sha1_name.c:440
+msgid ""
+"Git normally never creates a ref that ends with 40 hex characters\n"
+"because it will be ignored when you just specify 40-hex. These refs\n"
+"may be created by mistake. For example,\n"
+"\n"
+" git checkout -b $br $(git rev-parse ...)\n"
+"\n"
+"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
+"examine these refs and maybe delete them. Turn this message off by\n"
+"running \"git config advice.objectNameWarning false\""
msgstr ""
-#: builtin/add.c:290
-msgid "Could not write patch"
+#: sha1_name.c:1068
+msgid "HEAD does not point to a branch"
msgstr ""
-#: builtin/add.c:295
+#: sha1_name.c:1071
#, c-format
-msgid "Could not stat '%s'"
+msgid "No such branch: '%s'"
msgstr ""
-#: builtin/add.c:297
-msgid "Empty patch. Aborted."
+#: sha1_name.c:1073
+#, c-format
+msgid "No upstream configured for branch '%s'"
msgstr ""
-#: builtin/add.c:303
+#: sha1_name.c:1077
#, c-format
-msgid "Could not apply '%s'"
+msgid "Upstream branch '%s' not stored as a remote-tracking branch"
msgstr ""
-#: builtin/add.c:312
-msgid "The following paths are ignored by one of your .gitignore files:\n"
+#: submodule.c:64 submodule.c:98
+msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
msgstr ""
-#: builtin/add.c:352
+#: submodule.c:68 submodule.c:102
#, c-format
-msgid "Use -f if you really want to add them.\n"
+msgid "Could not find section in .gitmodules where path=%s"
msgstr ""
-#: builtin/add.c:353
-msgid "no files added"
+#: submodule.c:76
+#, c-format
+msgid "Could not update .gitmodules entry %s"
msgstr ""
-#: builtin/add.c:359
-msgid "adding files failed"
+#: submodule.c:109
+#, c-format
+msgid "Could not remove .gitmodules entry for %s"
msgstr ""
-#: builtin/add.c:391
-msgid "-A and -u are mutually incompatible"
+#: submodule.c:120
+msgid "staging updated .gitmodules failed"
msgstr ""
-#: builtin/add.c:393
-msgid "Option --ignore-missing can only be used together with --dry-run"
+#: submodule.c:1109 builtin/init-db.c:371
+#, c-format
+msgid "Could not create git link %s"
msgstr ""
-#: builtin/add.c:413
+#: submodule.c:1120
#, c-format
-msgid "Nothing specified, nothing added.\n"
+msgid "Could not set core.worktree in %s"
msgstr ""
-#: builtin/add.c:414
+#: trailer.c:491 trailer.c:495 trailer.c:499 trailer.c:553 trailer.c:557
+#: trailer.c:561
#, c-format
-msgid "Maybe you wanted to say 'git add .'?\n"
+msgid "unknown value '%s' for key '%s'"
msgstr ""
-#: builtin/add.c:420 builtin/clean.c:95 builtin/commit.c:286 builtin/mv.c:82
-#: builtin/rm.c:162
-msgid "index file corrupt"
+#: trailer.c:543 trailer.c:548 builtin/remote.c:290
+#, c-format
+msgid "more than one %s"
msgstr ""
-#: builtin/add.c:480 builtin/apply.c:4108 builtin/mv.c:229 builtin/rm.c:260
-msgid "Unable to write new index file"
+#: trailer.c:581
+#, c-format
+msgid "empty trailer token in trailer '%.*s'"
msgstr ""
-#: builtin/apply.c:53
-msgid "git apply [options] [<patch>...]"
+#: trailer.c:701
+#, c-format
+msgid "could not read input file '%s'"
msgstr ""
-#: builtin/apply.c:106
-#, c-format
-msgid "unrecognized whitespace option '%s'"
+#: trailer.c:704
+msgid "could not read from stdin"
msgstr ""
-#: builtin/apply.c:121
-#, c-format
-msgid "unrecognized whitespace ignore option '%s'"
+#: unpack-trees.c:202
+msgid "Checking out files"
msgstr ""
-#: builtin/apply.c:815
-#, c-format
-msgid "Cannot prepare timestamp regexp %s"
+#: urlmatch.c:120
+msgid "invalid URL scheme name or missing '://' suffix"
msgstr ""
-#: builtin/apply.c:824
+#: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356
#, c-format
-msgid "regexec returned %d for input: %s"
+msgid "invalid %XX escape sequence"
msgstr ""
-#: builtin/apply.c:905
-#, c-format
-msgid "unable to find filename in patch at line %d"
+#: urlmatch.c:172
+msgid "missing host and scheme is not 'file:'"
msgstr ""
-#: builtin/apply.c:937
-#, c-format
-msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
+#: urlmatch.c:189
+msgid "a 'file:' URL may not have a port number"
msgstr ""
-#: builtin/apply.c:941
-#, c-format
-msgid "git apply: bad git-diff - inconsistent new filename on line %d"
+#: urlmatch.c:199
+msgid "invalid characters in host name"
msgstr ""
-#: builtin/apply.c:942
-#, c-format
-msgid "git apply: bad git-diff - inconsistent old filename on line %d"
+#: urlmatch.c:244 urlmatch.c:255
+msgid "invalid port number"
msgstr ""
-#: builtin/apply.c:949
-#, c-format
-msgid "git apply: bad git-diff - expected /dev/null on line %d"
+#: urlmatch.c:322
+msgid "invalid '..' path segment"
msgstr ""
-#: builtin/apply.c:1394
+#: wrapper.c:523
#, c-format
-msgid "recount: unexpected line: %.*s"
+msgid "unable to access '%s': %s"
msgstr ""
-#: builtin/apply.c:1451
+#: wrapper.c:544
#, c-format
-msgid "patch fragment without header at line %d: %.*s"
+msgid "unable to access '%s'"
msgstr ""
-#: builtin/apply.c:1468
+#: wrapper.c:555
#, c-format
-msgid ""
-"git diff header lacks filename information when removing %d leading pathname "
-"component (line %d)"
-msgid_plural ""
-"git diff header lacks filename information when removing %d leading pathname "
-"components (line %d)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/apply.c:1628
-msgid "new file depends on old contents"
+msgid "unable to look up current user in the passwd file: %s"
msgstr ""
-#: builtin/apply.c:1630
-msgid "deleted file still has contents"
+#: wrapper.c:556
+msgid "no such user"
msgstr ""
-#: builtin/apply.c:1656
-#, c-format
-msgid "corrupt patch at line %d"
+#: wrapper.c:564
+msgid "unable to get current working directory"
msgstr ""
-#: builtin/apply.c:1692
-#, c-format
-msgid "new file %s depends on old contents"
+#: wt-status.c:150
+msgid "Unmerged paths:"
msgstr ""
-#: builtin/apply.c:1694
+#: wt-status.c:177 wt-status.c:204
#, c-format
-msgid "deleted file %s still has contents"
+msgid " (use \"git reset %s <file>...\" to unstage)"
msgstr ""
-#: builtin/apply.c:1697
-#, c-format
-msgid "** warning: file %s becomes empty but is not deleted"
+#: wt-status.c:179 wt-status.c:206
+msgid " (use \"git rm --cached <file>...\" to unstage)"
msgstr ""
-#: builtin/apply.c:1843
-#, c-format
-msgid "corrupt binary patch at line %d: %.*s"
+#: wt-status.c:183
+msgid " (use \"git add <file>...\" to mark resolution)"
msgstr ""
-#. there has to be one hunk (forward hunk)
-#: builtin/apply.c:1872
-#, c-format
-msgid "unrecognized binary patch at line %d"
+#: wt-status.c:185 wt-status.c:189
+msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
msgstr ""
-#: builtin/apply.c:1958
-#, c-format
-msgid "patch with only garbage at line %d"
+#: wt-status.c:187
+msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr ""
-#: builtin/apply.c:2048
-#, c-format
-msgid "unable to read symlink %s"
+#: wt-status.c:198 wt-status.c:878
+msgid "Changes to be committed:"
msgstr ""
-#: builtin/apply.c:2052
-#, c-format
-msgid "unable to open or read %s"
+#: wt-status.c:216 wt-status.c:887
+msgid "Changes not staged for commit:"
msgstr ""
-#: builtin/apply.c:2123
-msgid "oops"
+#: wt-status.c:220
+msgid " (use \"git add <file>...\" to update what will be committed)"
msgstr ""
-#: builtin/apply.c:2645
-#, c-format
-msgid "invalid start of line: '%c'"
+#: wt-status.c:222
+msgid " (use \"git add/rm <file>...\" to update what will be committed)"
msgstr ""
-#: builtin/apply.c:2763
-#, c-format
-msgid "Hunk #%d succeeded at %d (offset %d line)."
-msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
-msgstr[0] ""
-msgstr[1] ""
+#: wt-status.c:223
+msgid ""
+" (use \"git checkout -- <file>...\" to discard changes in working directory)"
+msgstr ""
-#: builtin/apply.c:2775
-#, c-format
-msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
+#: wt-status.c:225
+msgid " (commit or discard the untracked or modified content in submodules)"
msgstr ""
-#: builtin/apply.c:2781
+#: wt-status.c:237
#, c-format
-msgid ""
-"while searching for:\n"
-"%.*s"
+msgid " (use \"git %s <file>...\" to include in what will be committed)"
msgstr ""
-#: builtin/apply.c:2800
-#, c-format
-msgid "missing binary patch data for '%s'"
+#: wt-status.c:252
+msgid "both deleted:"
msgstr ""
-#: builtin/apply.c:2903
-#, c-format
-msgid "binary patch does not apply to '%s'"
+#: wt-status.c:254
+msgid "added by us:"
msgstr ""
-#: builtin/apply.c:2909
-#, c-format
-msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
+#: wt-status.c:256
+msgid "deleted by them:"
msgstr ""
-#: builtin/apply.c:2930
-#, c-format
-msgid "patch failed: %s:%ld"
+#: wt-status.c:258
+msgid "added by them:"
msgstr ""
-#: builtin/apply.c:3045
-#, c-format
-msgid "patch %s has been renamed/deleted"
+#: wt-status.c:260
+msgid "deleted by us:"
msgstr ""
-#: builtin/apply.c:3052 builtin/apply.c:3069
-#, c-format
-msgid "read of %s failed"
+#: wt-status.c:262
+msgid "both added:"
msgstr ""
-#: builtin/apply.c:3084
-msgid "removal patch leaves file contents"
+#: wt-status.c:264
+msgid "both modified:"
msgstr ""
-#: builtin/apply.c:3105
+#: wt-status.c:266
#, c-format
-msgid "%s: already exists in working directory"
+msgid "bug: unhandled unmerged status %x"
msgstr ""
-#: builtin/apply.c:3143
-#, c-format
-msgid "%s: has been deleted/renamed"
+#: wt-status.c:274
+msgid "new file:"
msgstr ""
-#: builtin/apply.c:3148 builtin/apply.c:3179
-#, c-format
-msgid "%s: %s"
+#: wt-status.c:276
+msgid "copied:"
msgstr ""
-#: builtin/apply.c:3159
-#, c-format
-msgid "%s: does not exist in index"
+#: wt-status.c:278
+msgid "deleted:"
msgstr ""
-#: builtin/apply.c:3173
-#, c-format
-msgid "%s: does not match index"
+#: wt-status.c:280
+msgid "modified:"
msgstr ""
-#: builtin/apply.c:3190
-#, c-format
-msgid "%s: wrong type"
+#: wt-status.c:282
+msgid "renamed:"
msgstr ""
-#: builtin/apply.c:3192
-#, c-format
-msgid "%s has type %o, expected %o"
+#: wt-status.c:284
+msgid "typechange:"
msgstr ""
-#: builtin/apply.c:3247
-#, c-format
-msgid "%s: already exists in index"
+#: wt-status.c:286
+msgid "unknown:"
msgstr ""
-#: builtin/apply.c:3267
-#, c-format
-msgid "new mode (%o) of %s does not match old mode (%o)"
+#: wt-status.c:288
+msgid "unmerged:"
msgstr ""
-#: builtin/apply.c:3272
-#, c-format
-msgid "new mode (%o) of %s does not match old mode (%o) of %s"
+#: wt-status.c:370
+msgid "new commits, "
msgstr ""
-#: builtin/apply.c:3280
-#, c-format
-msgid "%s: patch does not apply"
+#: wt-status.c:372
+msgid "modified content, "
msgstr ""
-#: builtin/apply.c:3293
-#, c-format
-msgid "Checking patch %s..."
+#: wt-status.c:374
+msgid "untracked content, "
msgstr ""
-#: builtin/apply.c:3348 builtin/checkout.c:212 builtin/reset.c:158
+#: wt-status.c:391
#, c-format
-msgid "make_cache_entry failed for path '%s'"
+msgid "bug: unhandled diff status %c"
msgstr ""
-#: builtin/apply.c:3491
-#, c-format
-msgid "unable to remove %s from index"
+#: wt-status.c:753
+msgid "Submodules changed but not updated:"
msgstr ""
-#: builtin/apply.c:3518
-#, c-format
-msgid "corrupt patch for subproject %s"
+#: wt-status.c:755
+msgid "Submodule changes to be committed:"
msgstr ""
-#: builtin/apply.c:3522
-#, c-format
-msgid "unable to stat newly created file '%s'"
+#: wt-status.c:835
+msgid ""
+"Do not touch the line above.\n"
+"Everything below will be removed."
msgstr ""
-#: builtin/apply.c:3527
-#, c-format
-msgid "unable to create backing store for newly created file %s"
+#: wt-status.c:946
+msgid "You have unmerged paths."
msgstr ""
-#: builtin/apply.c:3530
-#, c-format
-msgid "unable to add cache entry for %s"
+#: wt-status.c:949
+msgid " (fix conflicts and run \"git commit\")"
msgstr ""
-#: builtin/apply.c:3563
-#, c-format
-msgid "closing file '%s'"
+#: wt-status.c:952
+msgid "All conflicts fixed but you are still merging."
msgstr ""
-#: builtin/apply.c:3612
-#, c-format
-msgid "unable to write file '%s' mode %o"
+#: wt-status.c:955
+msgid " (use \"git commit\" to conclude merge)"
msgstr ""
-#: builtin/apply.c:3668
-#, c-format
-msgid "Applied patch %s cleanly."
+#: wt-status.c:965
+msgid "You are in the middle of an am session."
msgstr ""
-#: builtin/apply.c:3676
-msgid "internal error"
+#: wt-status.c:968
+msgid "The current patch is empty."
msgstr ""
-#. Say this even without --verbose
-#: builtin/apply.c:3679
-#, c-format
-msgid "Applying patch %%s with %d reject..."
-msgid_plural "Applying patch %%s with %d rejects..."
-msgstr[0] ""
-msgstr[1] ""
+#: wt-status.c:972
+msgid " (fix conflicts and then run \"git am --continue\")"
+msgstr ""
-#: builtin/apply.c:3689
-#, c-format
-msgid "truncating .rej filename to %.*s.rej"
+#: wt-status.c:974
+msgid " (use \"git am --skip\" to skip this patch)"
msgstr ""
-#: builtin/apply.c:3710
-#, c-format
-msgid "Hunk #%d applied cleanly."
+#: wt-status.c:976
+msgid " (use \"git am --abort\" to restore the original branch)"
msgstr ""
-#: builtin/apply.c:3713
+#: wt-status.c:1036 wt-status.c:1053
#, c-format
-msgid "Rejected hunk #%d."
+msgid "You are currently rebasing branch '%s' on '%s'."
msgstr ""
-#: builtin/apply.c:3844
-msgid "unrecognized input"
+#: wt-status.c:1041 wt-status.c:1058
+msgid "You are currently rebasing."
msgstr ""
-#: builtin/apply.c:3855
-msgid "unable to read index file"
+#: wt-status.c:1044
+msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr ""
-#: builtin/apply.c:3970 builtin/apply.c:3973
-msgid "path"
+#: wt-status.c:1046
+msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr ""
-#: builtin/apply.c:3971
-msgid "don't apply changes matching the given path"
+#: wt-status.c:1048
+msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr ""
-#: builtin/apply.c:3974
-msgid "apply changes matching the given path"
+#: wt-status.c:1061
+msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr ""
-#: builtin/apply.c:3976
-msgid "num"
+#: wt-status.c:1065
+#, c-format
+msgid ""
+"You are currently splitting a commit while rebasing branch '%s' on '%s'."
msgstr ""
-#: builtin/apply.c:3977
-msgid "remove <num> leading slashes from traditional diff paths"
+#: wt-status.c:1070
+msgid "You are currently splitting a commit during a rebase."
msgstr ""
-#: builtin/apply.c:3980
-msgid "ignore additions made by the patch"
+#: wt-status.c:1073
+msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr ""
-#: builtin/apply.c:3982
-msgid "instead of applying the patch, output diffstat for the input"
+#: wt-status.c:1077
+#, c-format
+msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr ""
-#: builtin/apply.c:3986
-msgid "shows number of added and deleted lines in decimal notation"
+#: wt-status.c:1082
+msgid "You are currently editing a commit during a rebase."
msgstr ""
-#: builtin/apply.c:3988
-msgid "instead of applying the patch, output a summary for the input"
+#: wt-status.c:1085
+msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr ""
-#: builtin/apply.c:3990
-msgid "instead of applying the patch, see if the patch is applicable"
+#: wt-status.c:1087
+msgid ""
+" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr ""
-#: builtin/apply.c:3992
-msgid "make sure the patch is applicable to the current index"
+#: wt-status.c:1097
+#, c-format
+msgid "You are currently cherry-picking commit %s."
msgstr ""
-#: builtin/apply.c:3994
-msgid "apply a patch without touching the working tree"
+#: wt-status.c:1102
+msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr ""
-#: builtin/apply.c:3996
-msgid "also apply the patch (use with --stat/--summary/--check)"
+#: wt-status.c:1105
+msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr ""
-#: builtin/apply.c:3998
-msgid "build a temporary index based on embedded index information"
+#: wt-status.c:1107
+msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr ""
-#: builtin/apply.c:4000
-msgid "paths are separated with NUL character"
+#: wt-status.c:1116
+#, c-format
+msgid "You are currently reverting commit %s."
msgstr ""
-#: builtin/apply.c:4003
-msgid "ensure at least <n> lines of context match"
+#: wt-status.c:1121
+msgid " (fix conflicts and run \"git revert --continue\")"
msgstr ""
-#: builtin/apply.c:4004
-msgid "action"
+#: wt-status.c:1124
+msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr ""
-#: builtin/apply.c:4005
-msgid "detect new or modified lines that have whitespace errors"
+#: wt-status.c:1126
+msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr ""
-#: builtin/apply.c:4008 builtin/apply.c:4011
-msgid "ignore changes in whitespace when finding context"
+#: wt-status.c:1137
+#, c-format
+msgid "You are currently bisecting, started from branch '%s'."
msgstr ""
-#: builtin/apply.c:4014
-msgid "apply the patch in reverse"
+#: wt-status.c:1141
+msgid "You are currently bisecting."
msgstr ""
-#: builtin/apply.c:4016
-msgid "don't expect at least one line of context"
+#: wt-status.c:1144
+msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr ""
-#: builtin/apply.c:4018
-msgid "leave the rejected hunks in corresponding *.rej files"
+#: wt-status.c:1321
+msgid "On branch "
msgstr ""
-#: builtin/apply.c:4020
-msgid "allow overlapping hunks"
+#: wt-status.c:1328
+msgid "rebase in progress; onto "
msgstr ""
-#: builtin/apply.c:4021
-msgid "be verbose"
+#: wt-status.c:1333
+msgid "HEAD detached at "
msgstr ""
-#: builtin/apply.c:4023
-msgid "tolerate incorrectly detected missing new-line at the end of file"
+#: wt-status.c:1335
+msgid "HEAD detached from "
msgstr ""
-#: builtin/apply.c:4026
-msgid "do not trust the line counts in the hunk headers"
+#: wt-status.c:1338
+msgid "Not currently on any branch."
msgstr ""
-#: builtin/apply.c:4028
-msgid "root"
+#: wt-status.c:1355
+msgid "Initial commit"
msgstr ""
-#: builtin/apply.c:4029
-msgid "prepend <root> to all filenames"
+#: wt-status.c:1369
+msgid "Untracked files"
msgstr ""
-#: builtin/apply.c:4050
-msgid "--index outside a repository"
+#: wt-status.c:1371
+msgid "Ignored files"
msgstr ""
-#: builtin/apply.c:4053
-msgid "--cached outside a repository"
+#: wt-status.c:1375
+#, c-format
+msgid ""
+"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
+"may speed it up, but you have to be careful not to forget to add\n"
+"new files yourself (see 'git help status')."
msgstr ""
-#: builtin/apply.c:4069
+#: wt-status.c:1381
#, c-format
-msgid "can't open patch '%s'"
+msgid "Untracked files not listed%s"
+msgstr ""
+
+#: wt-status.c:1383
+msgid " (use -u option to show untracked files)"
msgstr ""
-#: builtin/apply.c:4083
+#: wt-status.c:1389
+msgid "No changes"
+msgstr ""
+
+#: wt-status.c:1394
#, c-format
-msgid "squelched %d whitespace error"
-msgid_plural "squelched %d whitespace errors"
-msgstr[0] ""
-msgstr[1] ""
+msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
+msgstr ""
-#: builtin/apply.c:4089 builtin/apply.c:4099
+#: wt-status.c:1397
#, c-format
-msgid "%d line adds whitespace errors."
-msgid_plural "%d lines add whitespace errors."
-msgstr[0] ""
-msgstr[1] ""
+msgid "no changes added to commit\n"
+msgstr ""
-#: builtin/archive.c:17
+#: wt-status.c:1400
#, c-format
-msgid "could not create archive file '%s'"
+msgid ""
+"nothing added to commit but untracked files present (use \"git add\" to "
+"track)\n"
msgstr ""
-#: builtin/archive.c:20
-msgid "could not redirect output"
+#: wt-status.c:1403
+#, c-format
+msgid "nothing added to commit but untracked files present\n"
msgstr ""
-#: builtin/archive.c:37
-msgid "git archive: Remote with no URL"
+#: wt-status.c:1406
+#, c-format
+msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr ""
-#: builtin/archive.c:58
-msgid "git archive: expected ACK/NAK, got EOF"
+#: wt-status.c:1409 wt-status.c:1414
+#, c-format
+msgid "nothing to commit\n"
msgstr ""
-#: builtin/archive.c:63
+#: wt-status.c:1412
#, c-format
-msgid "git archive: NACK %s"
+msgid "nothing to commit (use -u to show untracked files)\n"
msgstr ""
-#: builtin/archive.c:65
+#: wt-status.c:1416
#, c-format
-msgid "remote error: %s"
+msgid "nothing to commit, working directory clean\n"
msgstr ""
-#: builtin/archive.c:66
-msgid "git archive: protocol error"
+#: wt-status.c:1525
+msgid "HEAD (no branch)"
msgstr ""
-#: builtin/archive.c:71
-msgid "git archive: expected a flush"
+#: wt-status.c:1531
+msgid "Initial commit on "
msgstr ""
-#: builtin/branch.c:144
-#, c-format
-msgid ""
-"deleting branch '%s' that has been merged to\n"
-" '%s', but not yet merged to HEAD."
+#: wt-status.c:1563
+msgid "gone"
msgstr ""
-#: builtin/branch.c:148
-#, c-format
-msgid ""
-"not deleting branch '%s' that is not yet merged to\n"
-" '%s', even though it is merged to HEAD."
+#: wt-status.c:1565 wt-status.c:1573
+msgid "behind "
msgstr ""
-#: builtin/branch.c:180
-msgid "cannot use -a with -d"
+#: compat/precompose_utf8.c:55 builtin/clone.c:360
+#, c-format
+msgid "failed to unlink '%s'"
msgstr ""
-#: builtin/branch.c:186
-msgid "Couldn't look up commit object for HEAD"
+#: builtin/add.c:22
+msgid "git add [<options>] [--] <pathspec>..."
msgstr ""
-#: builtin/branch.c:191
+#: builtin/add.c:65
#, c-format
-msgid "Cannot delete the branch '%s' which you are currently on."
+msgid "unexpected diff status %c"
msgstr ""
-#: builtin/branch.c:202
-#, c-format
-msgid "remote branch '%s' not found."
+#: builtin/add.c:70 builtin/commit.c:277
+msgid "updating files failed"
msgstr ""
-#: builtin/branch.c:203
+#: builtin/add.c:80
#, c-format
-msgid "branch '%s' not found."
+msgid "remove '%s'\n"
msgstr ""
-#: builtin/branch.c:210
-#, c-format
-msgid "Couldn't look up commit object for '%s'"
+#: builtin/add.c:134
+msgid "Unstaged changes after refreshing the index:"
msgstr ""
-#: builtin/branch.c:216
-#, c-format
-msgid ""
-"The branch '%s' is not fully merged.\n"
-"If you are sure you want to delete it, run 'git branch -D %s'."
+#: builtin/add.c:194 builtin/rev-parse.c:785
+msgid "Could not read the index"
msgstr ""
-#: builtin/branch.c:225
+#: builtin/add.c:205
#, c-format
-msgid "Error deleting remote branch '%s'"
+msgid "Could not open '%s' for writing."
msgstr ""
-#: builtin/branch.c:226
-#, c-format
-msgid "Error deleting branch '%s'"
+#: builtin/add.c:209
+msgid "Could not write patch"
msgstr ""
-#: builtin/branch.c:233
+#: builtin/add.c:214
#, c-format
-msgid "Deleted remote branch %s (was %s).\n"
+msgid "Could not stat '%s'"
msgstr ""
-#: builtin/branch.c:234
+#: builtin/add.c:216
+msgid "Empty patch. Aborted."
+msgstr ""
+
+#: builtin/add.c:221
#, c-format
-msgid "Deleted branch %s (was %s).\n"
+msgid "Could not apply '%s'"
msgstr ""
-#: builtin/branch.c:239
-msgid "Update of config-file failed"
+#: builtin/add.c:231
+msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr ""
-#: builtin/branch.c:337
-#, c-format
-msgid "branch '%s' does not point at a commit"
+#: builtin/add.c:248 builtin/clean.c:876 builtin/fetch.c:107 builtin/mv.c:110
+#: builtin/prune-packed.c:55 builtin/push.c:508 builtin/remote.c:1372
+#: builtin/rm.c:269
+msgid "dry run"
msgstr ""
-#: builtin/branch.c:409
-#, c-format
-msgid "[%s: behind %d]"
+#: builtin/add.c:249 builtin/apply.c:4577 builtin/check-ignore.c:19
+#: builtin/commit.c:1322 builtin/count-objects.c:63 builtin/fsck.c:608
+#: builtin/log.c:1617 builtin/mv.c:109 builtin/read-tree.c:114
+msgid "be verbose"
msgstr ""
-#: builtin/branch.c:411
-#, c-format
-msgid "[behind %d]"
+#: builtin/add.c:251
+msgid "interactive picking"
msgstr ""
-#: builtin/branch.c:415
-#, c-format
-msgid "[%s: ahead %d]"
+#: builtin/add.c:252 builtin/checkout.c:1126 builtin/reset.c:286
+msgid "select hunks interactively"
msgstr ""
-#: builtin/branch.c:417
-#, c-format
-msgid "[ahead %d]"
+#: builtin/add.c:253
+msgid "edit current diff and apply"
msgstr ""
-#: builtin/branch.c:420
-#, c-format
-msgid "[%s: ahead %d, behind %d]"
+#: builtin/add.c:254
+msgid "allow adding otherwise ignored files"
msgstr ""
-#: builtin/branch.c:423
-#, c-format
-msgid "[ahead %d, behind %d]"
+#: builtin/add.c:255
+msgid "update tracked files"
msgstr ""
-#: builtin/branch.c:535
-msgid "(no branch)"
+#: builtin/add.c:256
+msgid "record only the fact that the path will be added later"
msgstr ""
-#: builtin/branch.c:600
-msgid "some refs could not be read"
+#: builtin/add.c:257
+msgid "add changes from all tracked and untracked files"
msgstr ""
-#: builtin/branch.c:613
-msgid "cannot rename the current branch while not on any."
+#: builtin/add.c:260
+msgid "ignore paths removed in the working tree (same as --no-all)"
msgstr ""
-#: builtin/branch.c:623
-#, c-format
-msgid "Invalid branch name: '%s'"
+#: builtin/add.c:262
+msgid "don't add, only refresh the index"
msgstr ""
-#: builtin/branch.c:638
-msgid "Branch rename failed"
+#: builtin/add.c:263
+msgid "just skip files which cannot be added because of errors"
msgstr ""
-#: builtin/branch.c:642
-#, c-format
-msgid "Renamed a misnamed branch '%s' away"
+#: builtin/add.c:264
+msgid "check if - even missing - files are ignored in dry run"
msgstr ""
-#: builtin/branch.c:646
+#: builtin/add.c:286
#, c-format
-msgid "Branch renamed to %s, but HEAD is not updated!"
+msgid "Use -f if you really want to add them.\n"
msgstr ""
-#: builtin/branch.c:653
-msgid "Branch is renamed, but update of config-file failed"
+#: builtin/add.c:293
+msgid "adding files failed"
+msgstr ""
+
+#: builtin/add.c:329
+msgid "-A and -u are mutually incompatible"
+msgstr ""
+
+#: builtin/add.c:336
+msgid "Option --ignore-missing can only be used together with --dry-run"
msgstr ""
-#: builtin/branch.c:668
+#: builtin/add.c:357
#, c-format
-msgid "malformed object name %s"
+msgid "Nothing specified, nothing added.\n"
msgstr ""
-#: builtin/branch.c:692
+#: builtin/add.c:358
#, c-format
-msgid "could not write branch description template: %s"
+msgid "Maybe you wanted to say 'git add .'?\n"
msgstr ""
-#: builtin/branch.c:783
-msgid "Failed to resolve HEAD as a valid ref."
+#: builtin/add.c:363 builtin/check-ignore.c:172 builtin/clean.c:920
+#: builtin/commit.c:335 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:299
+msgid "index file corrupt"
msgstr ""
-#: builtin/branch.c:788 builtin/clone.c:558
-msgid "HEAD not found below refs/heads!"
+#: builtin/add.c:446 builtin/apply.c:4675 builtin/mv.c:279 builtin/rm.c:431
+msgid "Unable to write new index file"
msgstr ""
-#: builtin/branch.c:808
-msgid "--column and --verbose are incompatible"
+#: builtin/apply.c:59
+msgid "git apply [<options>] [<patch>...]"
msgstr ""
-#: builtin/branch.c:857
-msgid "-a and -r options to 'git branch' do not make sense with a branch name"
+#: builtin/apply.c:112
+#, c-format
+msgid "unrecognized whitespace option '%s'"
msgstr ""
-#: builtin/bundle.c:47
+#: builtin/apply.c:127
#, c-format
-msgid "%s is okay\n"
+msgid "unrecognized whitespace ignore option '%s'"
msgstr ""
-#: builtin/bundle.c:56
-msgid "Need a repository to create a bundle."
+#: builtin/apply.c:822
+#, c-format
+msgid "Cannot prepare timestamp regexp %s"
msgstr ""
-#: builtin/bundle.c:60
-msgid "Need a repository to unbundle."
+#: builtin/apply.c:831
+#, c-format
+msgid "regexec returned %d for input: %s"
msgstr ""
-#: builtin/checkout.c:113 builtin/checkout.c:146
+#: builtin/apply.c:912
#, c-format
-msgid "path '%s' does not have our version"
+msgid "unable to find filename in patch at line %d"
msgstr ""
-#: builtin/checkout.c:115 builtin/checkout.c:148
+#: builtin/apply.c:944
#, c-format
-msgid "path '%s' does not have their version"
+msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
msgstr ""
-#: builtin/checkout.c:131
+#: builtin/apply.c:948
#, c-format
-msgid "path '%s' does not have all necessary versions"
+msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr ""
-#: builtin/checkout.c:175
+#: builtin/apply.c:949
#, c-format
-msgid "path '%s' does not have necessary versions"
+msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr ""
-#: builtin/checkout.c:192
+#: builtin/apply.c:956
#, c-format
-msgid "path '%s': cannot merge"
+msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr ""
-#: builtin/checkout.c:209
+#: builtin/apply.c:1419
#, c-format
-msgid "Unable to add merge result for '%s'"
+msgid "recount: unexpected line: %.*s"
msgstr ""
-#: builtin/checkout.c:234 builtin/checkout.c:392
-msgid "corrupt index file"
+#: builtin/apply.c:1476
+#, c-format
+msgid "patch fragment without header at line %d: %.*s"
msgstr ""
-#: builtin/checkout.c:264 builtin/checkout.c:271
+#: builtin/apply.c:1493
#, c-format
-msgid "path '%s' is unmerged"
+msgid ""
+"git diff header lacks filename information when removing %d leading pathname "
+"component (line %d)"
+msgid_plural ""
+"git diff header lacks filename information when removing %d leading pathname "
+"components (line %d)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/apply.c:1656
+msgid "new file depends on old contents"
msgstr ""
-#: builtin/checkout.c:302 builtin/checkout.c:498 builtin/clone.c:583
-#: builtin/merge.c:812
-msgid "unable to write new index file"
+#: builtin/apply.c:1658
+msgid "deleted file still has contents"
msgstr ""
-#: builtin/checkout.c:319 builtin/diff.c:302 builtin/merge.c:408
-msgid "diff_setup_done failed"
+#: builtin/apply.c:1684
+#, c-format
+msgid "corrupt patch at line %d"
msgstr ""
-#: builtin/checkout.c:414
-msgid "you need to resolve your current index first"
+#: builtin/apply.c:1720
+#, c-format
+msgid "new file %s depends on old contents"
msgstr ""
-#: builtin/checkout.c:533
+#: builtin/apply.c:1722
#, c-format
-msgid "Can not do reflog for '%s'\n"
+msgid "deleted file %s still has contents"
msgstr ""
-#: builtin/checkout.c:566
-msgid "HEAD is now at"
+#: builtin/apply.c:1725
+#, c-format
+msgid "** warning: file %s becomes empty but is not deleted"
msgstr ""
-#: builtin/checkout.c:573
+#: builtin/apply.c:1871
#, c-format
-msgid "Reset branch '%s'\n"
+msgid "corrupt binary patch at line %d: %.*s"
msgstr ""
-#: builtin/checkout.c:576
+#: builtin/apply.c:1900
#, c-format
-msgid "Already on '%s'\n"
+msgid "unrecognized binary patch at line %d"
msgstr ""
-#: builtin/checkout.c:580
+#: builtin/apply.c:2051
#, c-format
-msgid "Switched to and reset branch '%s'\n"
+msgid "patch with only garbage at line %d"
msgstr ""
-#: builtin/checkout.c:582
+#: builtin/apply.c:2141
#, c-format
-msgid "Switched to a new branch '%s'\n"
+msgid "unable to read symlink %s"
msgstr ""
-#: builtin/checkout.c:584
+#: builtin/apply.c:2145
#, c-format
-msgid "Switched to branch '%s'\n"
+msgid "unable to open or read %s"
msgstr ""
-#: builtin/checkout.c:640
+#: builtin/apply.c:2778
#, c-format
-msgid " ... and %d more.\n"
+msgid "invalid start of line: '%c'"
msgstr ""
-#. The singular version
-#: builtin/checkout.c:646
+#: builtin/apply.c:2897
#, c-format
-msgid ""
-"Warning: you are leaving %d commit behind, not connected to\n"
-"any of your branches:\n"
-"\n"
-"%s\n"
-msgid_plural ""
-"Warning: you are leaving %d commits behind, not connected to\n"
-"any of your branches:\n"
-"\n"
-"%s\n"
+msgid "Hunk #%d succeeded at %d (offset %d line)."
+msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
msgstr[0] ""
msgstr[1] ""
-#: builtin/checkout.c:664
+#: builtin/apply.c:2909
+#, c-format
+msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
+msgstr ""
+
+#: builtin/apply.c:2915
#, c-format
msgid ""
-"If you want to keep them by creating a new branch, this may be a good time\n"
-"to do so with:\n"
-"\n"
-" git branch new_branch_name %s\n"
-"\n"
+"while searching for:\n"
+"%.*s"
msgstr ""
-#: builtin/checkout.c:694
-msgid "internal error in revision walk"
+#: builtin/apply.c:2935
+#, c-format
+msgid "missing binary patch data for '%s'"
msgstr ""
-#: builtin/checkout.c:698
-msgid "Previous HEAD position was"
+#: builtin/apply.c:3036
+#, c-format
+msgid "binary patch does not apply to '%s'"
msgstr ""
-#: builtin/checkout.c:724
-msgid "You are on a branch yet to be born"
+#: builtin/apply.c:3042
+#, c-format
+msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr ""
-#. case (1)
-#: builtin/checkout.c:855
+#: builtin/apply.c:3063
#, c-format
-msgid "invalid reference: %s"
+msgid "patch failed: %s:%ld"
msgstr ""
-#. case (1): want a tree
-#: builtin/checkout.c:894
+#: builtin/apply.c:3187
#, c-format
-msgid "reference is not a tree: %s"
+msgid "cannot checkout %s"
msgstr ""
-#: builtin/checkout.c:974
-msgid "-B cannot be used with -b"
+#: builtin/apply.c:3232 builtin/apply.c:3243 builtin/apply.c:3288
+#, c-format
+msgid "read of %s failed"
msgstr ""
-#: builtin/checkout.c:983
-msgid "--patch is incompatible with all other options"
+#: builtin/apply.c:3240
+#, c-format
+msgid "reading from '%s' beyond a symbolic link"
msgstr ""
-#: builtin/checkout.c:986
-msgid "--detach cannot be used with -b/-B/--orphan"
+#: builtin/apply.c:3268 builtin/apply.c:3490
+#, c-format
+msgid "path %s has been renamed/deleted"
msgstr ""
-#: builtin/checkout.c:988
-msgid "--detach cannot be used with -t"
+#: builtin/apply.c:3349 builtin/apply.c:3504
+#, c-format
+msgid "%s: does not exist in index"
msgstr ""
-#: builtin/checkout.c:994
-msgid "--track needs a branch name"
+#: builtin/apply.c:3353 builtin/apply.c:3496 builtin/apply.c:3518
+#, c-format
+msgid "%s: %s"
msgstr ""
-#: builtin/checkout.c:1001
-msgid "Missing branch name; try -b"
+#: builtin/apply.c:3358 builtin/apply.c:3512
+#, c-format
+msgid "%s: does not match index"
msgstr ""
-#: builtin/checkout.c:1007
-msgid "--orphan and -b|-B are mutually exclusive"
+#: builtin/apply.c:3460
+msgid "removal patch leaves file contents"
msgstr ""
-#: builtin/checkout.c:1009
-msgid "--orphan cannot be used with -t"
+#: builtin/apply.c:3529
+#, c-format
+msgid "%s: wrong type"
msgstr ""
-#: builtin/checkout.c:1019
-msgid "git checkout: -f and -m are incompatible"
+#: builtin/apply.c:3531
+#, c-format
+msgid "%s has type %o, expected %o"
msgstr ""
-#: builtin/checkout.c:1053
-msgid "invalid path specification"
+#: builtin/apply.c:3690 builtin/apply.c:3692
+#, c-format
+msgid "invalid path '%s'"
msgstr ""
-#: builtin/checkout.c:1061
+#: builtin/apply.c:3747
#, c-format
-msgid ""
-"git checkout: updating paths is incompatible with switching branches.\n"
-"Did you intend to checkout '%s' which can not be resolved as commit?"
+msgid "%s: already exists in index"
msgstr ""
-#: builtin/checkout.c:1063
-msgid "git checkout: updating paths is incompatible with switching branches."
+#: builtin/apply.c:3750
+#, c-format
+msgid "%s: already exists in working directory"
msgstr ""
-#: builtin/checkout.c:1068
-msgid "git checkout: --detach does not take a path argument"
+#: builtin/apply.c:3770
+#, c-format
+msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr ""
-#: builtin/checkout.c:1071
-msgid ""
-"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
-"checking out of the index."
+#: builtin/apply.c:3775
+#, c-format
+msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr ""
-#: builtin/checkout.c:1090
-msgid "Cannot switch branch to a non-commit."
+#: builtin/apply.c:3795
+#, c-format
+msgid "affected file '%s' is beyond a symbolic link"
msgstr ""
-#: builtin/checkout.c:1093
-msgid "--ours/--theirs is incompatible with switching branches."
+#: builtin/apply.c:3799
+#, c-format
+msgid "%s: patch does not apply"
msgstr ""
-#: builtin/clean.c:78
-msgid "-x and -X cannot be used together"
+#: builtin/apply.c:3813
+#, c-format
+msgid "Checking patch %s..."
msgstr ""
-#: builtin/clean.c:82
-msgid ""
-"clean.requireForce set to true and neither -n nor -f given; refusing to clean"
+#: builtin/apply.c:3906 builtin/checkout.c:231 builtin/reset.c:135
+#, c-format
+msgid "make_cache_entry failed for path '%s'"
msgstr ""
-#: builtin/clean.c:85
-msgid ""
-"clean.requireForce defaults to true and neither -n nor -f given; refusing to "
-"clean"
+#: builtin/apply.c:4049
+#, c-format
+msgid "unable to remove %s from index"
msgstr ""
-#: builtin/clean.c:155 builtin/clean.c:176
+#: builtin/apply.c:4078
#, c-format
-msgid "Would remove %s\n"
+msgid "corrupt patch for submodule %s"
msgstr ""
-#: builtin/clean.c:159 builtin/clean.c:179
+#: builtin/apply.c:4082
#, c-format
-msgid "Removing %s\n"
+msgid "unable to stat newly created file '%s'"
msgstr ""
-#: builtin/clean.c:162 builtin/clean.c:182
+#: builtin/apply.c:4087
#, c-format
-msgid "failed to remove %s"
+msgid "unable to create backing store for newly created file %s"
msgstr ""
-#: builtin/clean.c:166
+#: builtin/apply.c:4090 builtin/apply.c:4198
#, c-format
-msgid "Would not remove %s\n"
+msgid "unable to add cache entry for %s"
msgstr ""
-#: builtin/clean.c:168
+#: builtin/apply.c:4123
#, c-format
-msgid "Not removing %s\n"
+msgid "closing file '%s'"
msgstr ""
-#: builtin/clone.c:243
+#: builtin/apply.c:4172
#, c-format
-msgid "reference repository '%s' is not a local directory."
+msgid "unable to write file '%s' mode %o"
msgstr ""
-#: builtin/clone.c:302
+#: builtin/apply.c:4259
#, c-format
-msgid "failed to open '%s'"
+msgid "Applied patch %s cleanly."
msgstr ""
-#: builtin/clone.c:306
-#, c-format
-msgid "failed to create directory '%s'"
+#: builtin/apply.c:4267
+msgid "internal error"
msgstr ""
-#: builtin/clone.c:308 builtin/diff.c:75
+#: builtin/apply.c:4270
#, c-format
-msgid "failed to stat '%s'"
-msgstr ""
+msgid "Applying patch %%s with %d reject..."
+msgid_plural "Applying patch %%s with %d rejects..."
+msgstr[0] ""
+msgstr[1] ""
-#: builtin/clone.c:310
+#: builtin/apply.c:4280
#, c-format
-msgid "%s exists and is not a directory"
+msgid "truncating .rej filename to %.*s.rej"
msgstr ""
-#: builtin/clone.c:324
+#: builtin/apply.c:4301
#, c-format
-msgid "failed to stat %s\n"
+msgid "Hunk #%d applied cleanly."
msgstr ""
-#: builtin/clone.c:341
+#: builtin/apply.c:4304
#, c-format
-msgid "failed to unlink '%s'"
+msgid "Rejected hunk #%d."
msgstr ""
-#: builtin/clone.c:346
-#, c-format
-msgid "failed to create link '%s'"
+#: builtin/apply.c:4394
+msgid "unrecognized input"
msgstr ""
-#: builtin/clone.c:350
-#, c-format
-msgid "failed to copy file to '%s'"
+#: builtin/apply.c:4405
+msgid "unable to read index file"
msgstr ""
-#: builtin/clone.c:373
-#, c-format
-msgid "done.\n"
+#: builtin/apply.c:4522 builtin/apply.c:4525 builtin/clone.c:92
+#: builtin/fetch.c:92
+msgid "path"
msgstr ""
-#: builtin/clone.c:440
-#, c-format
-msgid "Could not find remote branch %s to clone."
+#: builtin/apply.c:4523
+msgid "don't apply changes matching the given path"
msgstr ""
-#: builtin/clone.c:549
-msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
+#: builtin/apply.c:4526
+msgid "apply changes matching the given path"
msgstr ""
-#: builtin/clone.c:639
-msgid "Too many arguments."
+#: builtin/apply.c:4528
+msgid "num"
msgstr ""
-#: builtin/clone.c:643
-msgid "You must specify a repository to clone."
+#: builtin/apply.c:4529
+msgid "remove <num> leading slashes from traditional diff paths"
msgstr ""
-#: builtin/clone.c:654
-#, c-format
-msgid "--bare and --origin %s options are incompatible."
+#: builtin/apply.c:4532
+msgid "ignore additions made by the patch"
msgstr ""
-#: builtin/clone.c:668
-#, c-format
-msgid "repository '%s' does not exist"
+#: builtin/apply.c:4534
+msgid "instead of applying the patch, output diffstat for the input"
msgstr ""
-#: builtin/clone.c:673
-msgid "--depth is ignored in local clones; use file:// instead."
+#: builtin/apply.c:4538
+msgid "show number of added and deleted lines in decimal notation"
msgstr ""
-#: builtin/clone.c:683
-#, c-format
-msgid "destination path '%s' already exists and is not an empty directory."
+#: builtin/apply.c:4540
+msgid "instead of applying the patch, output a summary for the input"
msgstr ""
-#: builtin/clone.c:693
-#, c-format
-msgid "working tree '%s' already exists."
+#: builtin/apply.c:4542
+msgid "instead of applying the patch, see if the patch is applicable"
msgstr ""
-#: builtin/clone.c:706 builtin/clone.c:720
-#, c-format
-msgid "could not create leading directories of '%s'"
+#: builtin/apply.c:4544
+msgid "make sure the patch is applicable to the current index"
msgstr ""
-#: builtin/clone.c:709
-#, c-format
-msgid "could not create work tree dir '%s'."
+#: builtin/apply.c:4546
+msgid "apply a patch without touching the working tree"
msgstr ""
-#: builtin/clone.c:728
-#, c-format
-msgid "Cloning into bare repository '%s'...\n"
+#: builtin/apply.c:4548
+msgid "accept a patch that touches outside the working area"
msgstr ""
-#: builtin/clone.c:730
-#, c-format
-msgid "Cloning into '%s'...\n"
+#: builtin/apply.c:4550
+msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr ""
-#: builtin/clone.c:786
-#, c-format
-msgid "Don't know how to clone %s"
+#: builtin/apply.c:4552
+msgid "attempt three-way merge if a patch does not apply"
msgstr ""
-#: builtin/clone.c:835
-#, c-format
-msgid "Remote branch %s not found in upstream %s"
+#: builtin/apply.c:4554
+msgid "build a temporary index based on embedded index information"
msgstr ""
-#: builtin/clone.c:842
-msgid "You appear to have cloned an empty repository."
+#: builtin/apply.c:4556 builtin/checkout-index.c:198 builtin/ls-files.c:412
+msgid "paths are separated with NUL character"
msgstr ""
-#: builtin/column.c:51
-msgid "--command must be the first argument"
+#: builtin/apply.c:4559
+msgid "ensure at least <n> lines of context match"
msgstr ""
-#: builtin/commit.c:43
-msgid ""
-"Your name and email address were configured automatically based\n"
-"on your username and hostname. Please check that they are accurate.\n"
-"You can suppress this message by setting them explicitly:\n"
-"\n"
-" git config --global user.name \"Your Name\"\n"
-" git config --global user.email you@example.com\n"
-"\n"
-"After doing this, you may fix the identity used for this commit with:\n"
-"\n"
-" git commit --amend --reset-author\n"
+#: builtin/apply.c:4560
+msgid "action"
msgstr ""
-#: builtin/commit.c:55
-msgid ""
-"You asked to amend the most recent commit, but doing so would make\n"
-"it empty. You can repeat your command with --allow-empty, or you can\n"
-"remove the commit entirely with \"git reset HEAD^\".\n"
+#: builtin/apply.c:4561
+msgid "detect new or modified lines that have whitespace errors"
msgstr ""
-#: builtin/commit.c:60
-msgid ""
-"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
-"If you wish to commit it anyway, use:\n"
-"\n"
-" git commit --allow-empty\n"
-"\n"
-"Otherwise, please use 'git reset'\n"
+#: builtin/apply.c:4564 builtin/apply.c:4567
+msgid "ignore changes in whitespace when finding context"
msgstr ""
-#: builtin/commit.c:253
-msgid "failed to unpack HEAD tree object"
+#: builtin/apply.c:4570
+msgid "apply the patch in reverse"
msgstr ""
-#: builtin/commit.c:295
-msgid "unable to create temporary index"
+#: builtin/apply.c:4572
+msgid "don't expect at least one line of context"
msgstr ""
-#: builtin/commit.c:301
-msgid "interactive add failed"
+#: builtin/apply.c:4574
+msgid "leave the rejected hunks in corresponding *.rej files"
msgstr ""
-#: builtin/commit.c:334 builtin/commit.c:355 builtin/commit.c:405
-msgid "unable to write new_index file"
+#: builtin/apply.c:4576
+msgid "allow overlapping hunks"
msgstr ""
-#: builtin/commit.c:386
-msgid "cannot do a partial commit during a merge."
+#: builtin/apply.c:4579
+msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr ""
-#: builtin/commit.c:388
-msgid "cannot do a partial commit during a cherry-pick."
+#: builtin/apply.c:4582
+msgid "do not trust the line counts in the hunk headers"
msgstr ""
-#: builtin/commit.c:398
-msgid "cannot read the index"
+#: builtin/apply.c:4584
+msgid "root"
msgstr ""
-#: builtin/commit.c:418
-msgid "unable to write temporary index file"
+#: builtin/apply.c:4585
+msgid "prepend <root> to all filenames"
msgstr ""
-#: builtin/commit.c:493 builtin/commit.c:499
-#, c-format
-msgid "invalid commit: %s"
+#: builtin/apply.c:4607
+msgid "--3way outside a repository"
msgstr ""
-#: builtin/commit.c:522
-msgid "malformed --author parameter"
+#: builtin/apply.c:4615
+msgid "--index outside a repository"
msgstr ""
-#: builtin/commit.c:582
-#, c-format
-msgid "Malformed ident string: '%s'"
+#: builtin/apply.c:4618
+msgid "--cached outside a repository"
msgstr ""
-#: builtin/commit.c:620 builtin/commit.c:653 builtin/commit.c:967
+#: builtin/apply.c:4637
#, c-format
-msgid "could not lookup commit %s"
+msgid "can't open patch '%s'"
msgstr ""
-#: builtin/commit.c:632 builtin/shortlog.c:296
+#: builtin/apply.c:4651
#, c-format
-msgid "(reading log message from standard input)\n"
-msgstr ""
+msgid "squelched %d whitespace error"
+msgid_plural "squelched %d whitespace errors"
+msgstr[0] ""
+msgstr[1] ""
-#: builtin/commit.c:634
-msgid "could not read log from standard input"
-msgstr ""
+#: builtin/apply.c:4657 builtin/apply.c:4667
+#, c-format
+msgid "%d line adds whitespace errors."
+msgid_plural "%d lines add whitespace errors."
+msgstr[0] ""
+msgstr[1] ""
-#: builtin/commit.c:638
+#: builtin/archive.c:17
#, c-format
-msgid "could not read log file '%s'"
+msgid "could not create archive file '%s'"
msgstr ""
-#: builtin/commit.c:644
-msgid "commit has empty message"
+#: builtin/archive.c:20
+msgid "could not redirect output"
msgstr ""
-#: builtin/commit.c:660
-msgid "could not read MERGE_MSG"
+#: builtin/archive.c:37
+msgid "git archive: Remote with no URL"
msgstr ""
-#: builtin/commit.c:664
-msgid "could not read SQUASH_MSG"
+#: builtin/archive.c:58
+msgid "git archive: expected ACK/NAK, got EOF"
msgstr ""
-#: builtin/commit.c:668
+#: builtin/archive.c:61
#, c-format
-msgid "could not read '%s'"
+msgid "git archive: NACK %s"
msgstr ""
-#: builtin/commit.c:720
-msgid "could not write commit template"
+#: builtin/archive.c:63
+#, c-format
+msgid "remote error: %s"
msgstr ""
-#: builtin/commit.c:731
-#, c-format
-msgid ""
-"\n"
-"It looks like you may be committing a merge.\n"
-"If this is not correct, please remove the file\n"
-"\t%s\n"
-"and try again.\n"
+#: builtin/archive.c:64
+msgid "git archive: protocol error"
msgstr ""
-#: builtin/commit.c:736
-#, c-format
-msgid ""
-"\n"
-"It looks like you may be committing a cherry-pick.\n"
-"If this is not correct, please remove the file\n"
-"\t%s\n"
-"and try again.\n"
+#: builtin/archive.c:68
+msgid "git archive: expected a flush"
msgstr ""
-#: builtin/commit.c:748
-msgid ""
-"Please enter the commit message for your changes. Lines starting\n"
-"with '#' will be ignored, and an empty message aborts the commit.\n"
+#: builtin/bisect--helper.c:7
+msgid "git bisect--helper --next-all [--no-checkout]"
msgstr ""
-#: builtin/commit.c:753
-msgid ""
-"Please enter the commit message for your changes. Lines starting\n"
-"with '#' will be kept; you may remove them yourself if you want to.\n"
-"An empty message aborts the commit.\n"
+#: builtin/bisect--helper.c:17
+msgid "perform 'git bisect next'"
msgstr ""
-#: builtin/commit.c:766
-#, c-format
-msgid "%sAuthor: %s"
+#: builtin/bisect--helper.c:19
+msgid "update BISECT_HEAD instead of checking out the current commit"
msgstr ""
-#: builtin/commit.c:773
-#, c-format
-msgid "%sCommitter: %s"
+#: builtin/blame.c:30
+msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] file"
msgstr ""
-#: builtin/commit.c:793
-msgid "Cannot read index"
+#: builtin/blame.c:35
+msgid "<rev-opts> are documented in git-rev-list(1)"
msgstr ""
-#: builtin/commit.c:830
-msgid "Error building trees"
+#: builtin/blame.c:2500
+msgid "Show blame entries as we find them, incrementally"
msgstr ""
-#: builtin/commit.c:845 builtin/tag.c:361
-#, c-format
-msgid "Please supply the message using either -m or -F option.\n"
+#: builtin/blame.c:2501
+msgid "Show blank SHA-1 for boundary commits (Default: off)"
msgstr ""
-#: builtin/commit.c:942
-#, c-format
-msgid "No existing author found with '%s'"
+#: builtin/blame.c:2502
+msgid "Do not treat root commits as boundaries (Default: off)"
msgstr ""
-#: builtin/commit.c:957 builtin/commit.c:1157
-#, c-format
-msgid "Invalid untracked files mode '%s'"
+#: builtin/blame.c:2503
+msgid "Show work cost statistics"
msgstr ""
-#: builtin/commit.c:997
-msgid "Using both --reset-author and --author does not make sense"
+#: builtin/blame.c:2504
+msgid "Show output score for blame entries"
msgstr ""
-#: builtin/commit.c:1008
-msgid "You have nothing to amend."
+#: builtin/blame.c:2505
+msgid "Show original filename (Default: auto)"
msgstr ""
-#: builtin/commit.c:1011
-msgid "You are in the middle of a merge -- cannot amend."
+#: builtin/blame.c:2506
+msgid "Show original linenumber (Default: off)"
msgstr ""
-#: builtin/commit.c:1013
-msgid "You are in the middle of a cherry-pick -- cannot amend."
+#: builtin/blame.c:2507
+msgid "Show in a format designed for machine consumption"
msgstr ""
-#: builtin/commit.c:1016
-msgid "Options --squash and --fixup cannot be used together"
+#: builtin/blame.c:2508
+msgid "Show porcelain format with per-line commit information"
msgstr ""
-#: builtin/commit.c:1026
-msgid "Only one of -c/-C/-F/--fixup can be used."
+#: builtin/blame.c:2509
+msgid "Use the same output mode as git-annotate (Default: off)"
msgstr ""
-#: builtin/commit.c:1028
-msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
+#: builtin/blame.c:2510
+msgid "Show raw timestamp (Default: off)"
msgstr ""
-#: builtin/commit.c:1036
-msgid "--reset-author can be used only with -C, -c or --amend."
+#: builtin/blame.c:2511
+msgid "Show long commit SHA1 (Default: off)"
msgstr ""
-#: builtin/commit.c:1053
-msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
+#: builtin/blame.c:2512
+msgid "Suppress author name and timestamp (Default: off)"
msgstr ""
-#: builtin/commit.c:1055
-msgid "No paths with --include/--only does not make sense."
+#: builtin/blame.c:2513
+msgid "Show author email instead of name (Default: off)"
msgstr ""
-#: builtin/commit.c:1057
-msgid "Clever... amending the last one with dirty index."
+#: builtin/blame.c:2514
+msgid "Ignore whitespace differences"
msgstr ""
-#: builtin/commit.c:1059
-msgid "Explicit paths specified without -i nor -o; assuming --only paths..."
+#: builtin/blame.c:2515
+msgid "Spend extra cycles to find better match"
msgstr ""
-#: builtin/commit.c:1069 builtin/tag.c:577
-#, c-format
-msgid "Invalid cleanup mode %s"
+#: builtin/blame.c:2516
+msgid "Use revisions from <file> instead of calling git-rev-list"
msgstr ""
-#: builtin/commit.c:1074
-msgid "Paths with -a does not make sense."
+#: builtin/blame.c:2517
+msgid "Use <file>'s contents as the final image"
msgstr ""
-#: builtin/commit.c:1257
-msgid "couldn't look up newly created commit"
+#: builtin/blame.c:2518 builtin/blame.c:2519
+msgid "score"
msgstr ""
-#: builtin/commit.c:1259
-msgid "could not parse newly created commit"
+#: builtin/blame.c:2518
+msgid "Find line copies within and across files"
msgstr ""
-#: builtin/commit.c:1300
-msgid "detached HEAD"
+#: builtin/blame.c:2519
+msgid "Find line movements within and across files"
msgstr ""
-#: builtin/commit.c:1302
-msgid " (root-commit)"
+#: builtin/blame.c:2520
+msgid "n,m"
msgstr ""
-#: builtin/commit.c:1446
-msgid "could not parse HEAD commit"
+#: builtin/blame.c:2520
+msgid "Process only line range n,m, counting from 1"
msgstr ""
-#: builtin/commit.c:1484 builtin/merge.c:509
-#, c-format
-msgid "could not open '%s' for reading"
+#. TRANSLATORS: This string is used to tell us the maximum
+#. display width for a relative timestamp in "git blame"
+#. output. For C locale, "4 years, 11 months ago", which
+#. takes 22 places, is the longest among various forms of
+#. relative timestamps, but your language may need more or
+#. fewer display columns.
+#: builtin/blame.c:2601
+msgid "4 years, 11 months ago"
msgstr ""
-#: builtin/commit.c:1491
-#, c-format
-msgid "Corrupt MERGE_HEAD file (%s)"
+#: builtin/branch.c:24
+msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
msgstr ""
-#: builtin/commit.c:1498
-msgid "could not read MERGE_MODE"
+#: builtin/branch.c:25
+msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
+msgstr ""
+
+#: builtin/branch.c:26
+msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
+msgstr ""
+
+#: builtin/branch.c:27
+msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
msgstr ""
-#: builtin/commit.c:1517
+#: builtin/branch.c:152
#, c-format
-msgid "could not read commit message: %s"
+msgid ""
+"deleting branch '%s' that has been merged to\n"
+" '%s', but not yet merged to HEAD."
msgstr ""
-#: builtin/commit.c:1531
+#: builtin/branch.c:156
#, c-format
-msgid "Aborting commit; you did not edit the message.\n"
+msgid ""
+"not deleting branch '%s' that is not yet merged to\n"
+" '%s', even though it is merged to HEAD."
msgstr ""
-#: builtin/commit.c:1536
+#: builtin/branch.c:170
#, c-format
-msgid "Aborting commit due to empty commit message.\n"
+msgid "Couldn't look up commit object for '%s'"
msgstr ""
-#: builtin/commit.c:1551 builtin/merge.c:936 builtin/merge.c:961
-msgid "failed to write commit object"
+#: builtin/branch.c:174
+#, c-format
+msgid ""
+"The branch '%s' is not fully merged.\n"
+"If you are sure you want to delete it, run 'git branch -D %s'."
msgstr ""
-#: builtin/commit.c:1572
-msgid "cannot lock HEAD ref"
+#: builtin/branch.c:187
+msgid "Update of config-file failed"
msgstr ""
-#: builtin/commit.c:1576
-msgid "cannot update HEAD ref"
+#: builtin/branch.c:215
+msgid "cannot use -a with -d"
msgstr ""
-#: builtin/commit.c:1587
-msgid ""
-"Repository has been updated, but unable to write\n"
-"new_index file. Check that disk is not full or quota is\n"
-"not exceeded, and then \"git reset HEAD\" to recover."
+#: builtin/branch.c:221
+msgid "Couldn't look up commit object for HEAD"
msgstr ""
-#: builtin/describe.c:234
+#: builtin/branch.c:229
#, c-format
-msgid "annotated tag %s not available"
+msgid "Cannot delete the branch '%s' which you are currently on."
msgstr ""
-#: builtin/describe.c:238
+#: builtin/branch.c:245
#, c-format
-msgid "annotated tag %s has no embedded name"
+msgid "remote branch '%s' not found."
msgstr ""
-#: builtin/describe.c:240
+#: builtin/branch.c:246
#, c-format
-msgid "tag '%s' is really '%s' here"
+msgid "branch '%s' not found."
msgstr ""
-#: builtin/describe.c:267
+#: builtin/branch.c:260
#, c-format
-msgid "Not a valid object name %s"
+msgid "Error deleting remote branch '%s'"
msgstr ""
-#: builtin/describe.c:270
+#: builtin/branch.c:261
#, c-format
-msgid "%s is not a valid '%s' object"
+msgid "Error deleting branch '%s'"
msgstr ""
-#: builtin/describe.c:287
+#: builtin/branch.c:268
#, c-format
-msgid "no tag exactly matches '%s'"
+msgid "Deleted remote branch %s (was %s).\n"
msgstr ""
-#: builtin/describe.c:289
+#: builtin/branch.c:269
#, c-format
-msgid "searching to describe %s\n"
+msgid "Deleted branch %s (was %s).\n"
msgstr ""
-#: builtin/describe.c:329
+#: builtin/branch.c:370
#, c-format
-msgid "finished search at %s\n"
+msgid "branch '%s' does not point at a commit"
msgstr ""
-#: builtin/describe.c:353
+#: builtin/branch.c:459
#, c-format
-msgid ""
-"No annotated tags can describe '%s'.\n"
-"However, there were unannotated tags: try --tags."
+msgid "[%s: gone]"
msgstr ""
-#: builtin/describe.c:357
+#: builtin/branch.c:464
#, c-format
-msgid ""
-"No tags can describe '%s'.\n"
-"Try --always, or create some tags."
+msgid "[%s]"
msgstr ""
-#: builtin/describe.c:378
+#: builtin/branch.c:469
#, c-format
-msgid "traversed %lu commits\n"
+msgid "[%s: behind %d]"
msgstr ""
-#: builtin/describe.c:381
+#: builtin/branch.c:471
#, c-format
-msgid ""
-"more than %i tags found; listed %i most recent\n"
-"gave up search at %s\n"
-msgstr ""
-
-#: builtin/describe.c:436
-msgid "--long is incompatible with --abbrev=0"
+msgid "[behind %d]"
msgstr ""
-#: builtin/describe.c:462
-msgid "No names found, cannot describe anything."
+#: builtin/branch.c:475
+#, c-format
+msgid "[%s: ahead %d]"
msgstr ""
-#: builtin/describe.c:482
-msgid "--dirty is incompatible with committishes"
+#: builtin/branch.c:477
+#, c-format
+msgid "[ahead %d]"
msgstr ""
-#: builtin/diff.c:77
+#: builtin/branch.c:480
#, c-format
-msgid "'%s': not a regular file or symlink"
+msgid "[%s: ahead %d, behind %d]"
msgstr ""
-#: builtin/diff.c:220
+#: builtin/branch.c:483
#, c-format
-msgid "invalid option: %s"
+msgid "[ahead %d, behind %d]"
msgstr ""
-#: builtin/diff.c:297
-msgid "Not a git repository"
+#: builtin/branch.c:496
+msgid " **** invalid ref ****"
msgstr ""
-#: builtin/diff.c:341
+#: builtin/branch.c:587
#, c-format
-msgid "invalid object '%s' given."
+msgid "(no branch, rebasing %s)"
msgstr ""
-#: builtin/diff.c:346
+#: builtin/branch.c:590
#, c-format
-msgid "more than %d trees given: '%s'"
+msgid "(no branch, bisect started on %s)"
msgstr ""
-#: builtin/diff.c:356
+#: builtin/branch.c:596
#, c-format
-msgid "more than two blobs given: '%s'"
+msgid "(HEAD detached at %s)"
msgstr ""
-#: builtin/diff.c:364
+#: builtin/branch.c:599
#, c-format
-msgid "unhandled object '%s' given."
+msgid "(HEAD detached from %s)"
msgstr ""
-#: builtin/fetch.c:200
-msgid "Couldn't find remote ref HEAD"
+#: builtin/branch.c:603
+msgid "(no branch)"
msgstr ""
-#: builtin/fetch.c:253
+#: builtin/branch.c:650
#, c-format
-msgid "object %s not found"
+msgid "object '%s' does not point to a commit"
msgstr ""
-#: builtin/fetch.c:259
-msgid "[up to date]"
+#: builtin/branch.c:698
+msgid "some refs could not be read"
msgstr ""
-#: builtin/fetch.c:273
-#, c-format
-msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
+#: builtin/branch.c:711
+msgid "cannot rename the current branch while not on any."
msgstr ""
-#: builtin/fetch.c:274 builtin/fetch.c:360
-msgid "[rejected]"
+#: builtin/branch.c:721
+#, c-format
+msgid "Invalid branch name: '%s'"
msgstr ""
-#: builtin/fetch.c:285
-msgid "[tag update]"
+#: builtin/branch.c:736
+msgid "Branch rename failed"
msgstr ""
-#: builtin/fetch.c:287 builtin/fetch.c:322 builtin/fetch.c:340
-msgid " (unable to update local ref)"
+#: builtin/branch.c:740
+#, c-format
+msgid "Renamed a misnamed branch '%s' away"
msgstr ""
-#: builtin/fetch.c:305
-msgid "[new tag]"
+#: builtin/branch.c:744
+#, c-format
+msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr ""
-#: builtin/fetch.c:308
-msgid "[new branch]"
+#: builtin/branch.c:751
+msgid "Branch is renamed, but update of config-file failed"
msgstr ""
-#: builtin/fetch.c:311
-msgid "[new ref]"
+#: builtin/branch.c:766
+#, c-format
+msgid "malformed object name %s"
msgstr ""
-#: builtin/fetch.c:356
-msgid "unable to update local ref"
+#: builtin/branch.c:790
+#, c-format
+msgid "could not write branch description template: %s"
msgstr ""
-#: builtin/fetch.c:356
-msgid "forced update"
+#: builtin/branch.c:820
+msgid "Generic options"
msgstr ""
-#: builtin/fetch.c:362
-msgid "(non-fast-forward)"
+#: builtin/branch.c:822
+msgid "show hash and subject, give twice for upstream branch"
msgstr ""
-#: builtin/fetch.c:393 builtin/fetch.c:685
-#, c-format
-msgid "cannot open %s: %s\n"
+#: builtin/branch.c:823
+msgid "suppress informational messages"
msgstr ""
-#: builtin/fetch.c:402
-#, c-format
-msgid "%s did not send all necessary objects\n"
+#: builtin/branch.c:824
+msgid "set up tracking mode (see git-pull(1))"
msgstr ""
-#: builtin/fetch.c:488
-#, c-format
-msgid "From %.*s\n"
+#: builtin/branch.c:826
+msgid "change upstream info"
msgstr ""
-#: builtin/fetch.c:499
-#, c-format
-msgid ""
-"some local refs could not be updated; try running\n"
-" 'git remote prune %s' to remove any old, conflicting branches"
+#: builtin/branch.c:830
+msgid "use colored output"
msgstr ""
-#: builtin/fetch.c:549
-#, c-format
-msgid " (%s will become dangling)"
+#: builtin/branch.c:831
+msgid "act on remote-tracking branches"
msgstr ""
-#: builtin/fetch.c:550
-#, c-format
-msgid " (%s has become dangling)"
+#: builtin/branch.c:834 builtin/branch.c:840 builtin/branch.c:861
+#: builtin/branch.c:867 builtin/commit.c:1582 builtin/commit.c:1583
+#: builtin/commit.c:1584 builtin/commit.c:1585 builtin/tag.c:616
+#: builtin/tag.c:622
+msgid "commit"
msgstr ""
-#: builtin/fetch.c:557
-msgid "[deleted]"
+#: builtin/branch.c:835 builtin/branch.c:841
+msgid "print only branches that contain the commit"
msgstr ""
-#: builtin/fetch.c:558 builtin/remote.c:1055
-msgid "(none)"
+#: builtin/branch.c:847
+msgid "Specific git-branch actions:"
msgstr ""
-#: builtin/fetch.c:675
-#, c-format
-msgid "Refusing to fetch into current branch %s of non-bare repository"
+#: builtin/branch.c:848
+msgid "list both remote-tracking and local branches"
msgstr ""
-#: builtin/fetch.c:709
-#, c-format
-msgid "Don't know how to fetch from %s"
+#: builtin/branch.c:850
+msgid "delete fully merged branch"
msgstr ""
-#: builtin/fetch.c:786
-#, c-format
-msgid "Option \"%s\" value \"%s\" is not valid for %s"
+#: builtin/branch.c:851
+msgid "delete branch (even if not merged)"
msgstr ""
-#: builtin/fetch.c:789
-#, c-format
-msgid "Option \"%s\" is ignored for %s\n"
+#: builtin/branch.c:852
+msgid "move/rename a branch and its reflog"
msgstr ""
-#: builtin/fetch.c:888
-#, c-format
-msgid "Fetching %s\n"
+#: builtin/branch.c:853
+msgid "move/rename a branch, even if target exists"
msgstr ""
-#: builtin/fetch.c:890 builtin/remote.c:100
-#, c-format
-msgid "Could not fetch %s"
+#: builtin/branch.c:854
+msgid "list branch names"
msgstr ""
-#: builtin/fetch.c:907
-msgid ""
-"No remote repository specified. Please, specify either a URL or a\n"
-"remote name from which new revisions should be fetched."
+#: builtin/branch.c:855
+msgid "create the branch's reflog"
msgstr ""
-#: builtin/fetch.c:927
-msgid "You need to specify a tag name."
+#: builtin/branch.c:857
+msgid "edit the description for the branch"
msgstr ""
-#: builtin/fetch.c:979
-msgid "fetch --all does not take a repository argument"
+#: builtin/branch.c:858
+msgid "force creation, move/rename, deletion"
msgstr ""
-#: builtin/fetch.c:981
-msgid "fetch --all does not make sense with refspecs"
+#: builtin/branch.c:861
+msgid "print only not merged branches"
msgstr ""
-#: builtin/fetch.c:992
-#, c-format
-msgid "No such remote or remote group: %s"
+#: builtin/branch.c:867
+msgid "print only merged branches"
msgstr ""
-#: builtin/fetch.c:1000
-msgid "Fetching a group and specifying refspecs does not make sense"
+#: builtin/branch.c:871
+msgid "list branches in columns"
msgstr ""
-#: builtin/gc.c:63
-#, c-format
-msgid "Invalid %s: '%s'"
+#: builtin/branch.c:884
+msgid "Failed to resolve HEAD as a valid ref."
msgstr ""
-#: builtin/gc.c:90
-#, c-format
-msgid "insanely long object directory %.*s"
+#: builtin/branch.c:888 builtin/clone.c:637
+msgid "HEAD not found below refs/heads!"
msgstr ""
-#: builtin/gc.c:221
-#, c-format
-msgid "Auto packing the repository for optimum performance.\n"
+#: builtin/branch.c:910
+msgid "--column and --verbose are incompatible"
msgstr ""
-#: builtin/gc.c:224
-#, 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"
+#: builtin/branch.c:921 builtin/branch.c:960
+msgid "branch name required"
msgstr ""
-#: builtin/gc.c:251
-msgid ""
-"There are too many unreachable loose objects; run 'git prune' to remove them."
+#: builtin/branch.c:936
+msgid "Cannot give description to detached HEAD"
msgstr ""
-#: builtin/grep.c:216
-#, c-format
-msgid "grep: failed to create thread: %s"
+#: builtin/branch.c:941
+msgid "cannot edit description of more than one branch"
msgstr ""
-#: builtin/grep.c:402
+#: builtin/branch.c:948
#, c-format
-msgid "Failed to chdir: %s"
+msgid "No commit on branch '%s' yet."
msgstr ""
-#: builtin/grep.c:478 builtin/grep.c:512
+#: builtin/branch.c:951
#, c-format
-msgid "unable to read tree (%s)"
+msgid "No branch named '%s'."
msgstr ""
-#: builtin/grep.c:526
-#, c-format
-msgid "unable to grep from object of type %s"
+#: builtin/branch.c:966
+msgid "too many branches for a rename operation"
msgstr ""
-#: builtin/grep.c:584
-#, c-format
-msgid "switch `%c' expects a numerical value"
+#: builtin/branch.c:971
+msgid "too many branches to set new upstream"
msgstr ""
-#: builtin/grep.c:601
+#: builtin/branch.c:975
#, c-format
-msgid "cannot open '%s'"
+msgid ""
+"could not set upstream of HEAD to %s when it does not point to any branch."
msgstr ""
-#: builtin/grep.c:885
-msgid "no pattern given."
+#: builtin/branch.c:978 builtin/branch.c:1000 builtin/branch.c:1021
+#, c-format
+msgid "no such branch '%s'"
msgstr ""
-#: builtin/grep.c:899
+#: builtin/branch.c:982
#, c-format
-msgid "bad object %s"
+msgid "branch '%s' does not exist"
msgstr ""
-#: builtin/grep.c:940
-msgid "--open-files-in-pager only works on the worktree"
+#: builtin/branch.c:994
+msgid "too many branches to unset upstream"
msgstr ""
-#: builtin/grep.c:963
-msgid "--cached or --untracked cannot be used with --no-index."
+#: builtin/branch.c:998
+msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr ""
-#: builtin/grep.c:968
-msgid "--no-index or --untracked cannot be used with revs."
+#: builtin/branch.c:1004
+#, c-format
+msgid "Branch '%s' has no upstream information"
msgstr ""
-#: builtin/grep.c:971
-msgid "--[no-]exclude-standard cannot be used for tracked contents."
+#: builtin/branch.c:1018
+msgid "it does not make sense to create 'HEAD' manually"
msgstr ""
-#: builtin/grep.c:979
-msgid "both --cached and trees are given."
+#: builtin/branch.c:1024
+msgid "-a and -r options to 'git branch' do not make sense with a branch name"
msgstr ""
-#: builtin/help.c:63
+#: builtin/branch.c:1027
#, c-format
-msgid "unrecognized help format '%s'"
+msgid ""
+"The --set-upstream flag is deprecated and will be removed. Consider using --"
+"track or --set-upstream-to\n"
msgstr ""
-#: builtin/help.c:91
-msgid "Failed to start emacsclient."
+#: builtin/branch.c:1044
+#, c-format
+msgid ""
+"\n"
+"If you wanted to make '%s' track '%s', do this:\n"
+"\n"
msgstr ""
-#: builtin/help.c:104
-msgid "Failed to parse emacsclient version."
+#: builtin/branch.c:1045
+#, c-format
+msgid " git branch -d %s\n"
msgstr ""
-#: builtin/help.c:112
+#: builtin/branch.c:1046
#, c-format
-msgid "emacsclient version '%d' too old (< 22)."
+msgid " git branch --set-upstream-to %s\n"
msgstr ""
-#: builtin/help.c:130 builtin/help.c:158 builtin/help.c:167 builtin/help.c:175
+#: builtin/bundle.c:47
#, c-format
-msgid "failed to exec '%s': %s"
+msgid "%s is okay\n"
msgstr ""
-#: builtin/help.c:215
-#, c-format
-msgid ""
-"'%s': path for unsupported man viewer.\n"
-"Please consider using 'man.<tool>.cmd' instead."
+#: builtin/bundle.c:56
+msgid "Need a repository to create a bundle."
msgstr ""
-#: builtin/help.c:227
-#, c-format
-msgid ""
-"'%s': cmd for supported man viewer.\n"
-"Please consider using 'man.<tool>.path' instead."
+#: builtin/bundle.c:60
+msgid "Need a repository to unbundle."
msgstr ""
-#: builtin/help.c:291
-msgid "The most commonly used git commands are:"
+#: builtin/cat-file.c:326
+msgid "git cat-file (-t | -s | -e | -p | <type> | --textconv) <object>"
msgstr ""
-#: builtin/help.c:359
-#, c-format
-msgid "'%s': unknown man viewer."
+#: builtin/cat-file.c:327
+msgid "git cat-file (--batch | --batch-check) < <list-of-objects>"
msgstr ""
-#: builtin/help.c:376
-msgid "no man viewer handled the request"
+#: builtin/cat-file.c:364
+msgid "<type> can be one of: blob, tree, commit, tag"
msgstr ""
-#: builtin/help.c:384
-msgid "no info viewer handled the request"
+#: builtin/cat-file.c:365
+msgid "show object type"
msgstr ""
-#: builtin/help.c:395
-#, c-format
-msgid "'%s': not a documentation directory."
+#: builtin/cat-file.c:366
+msgid "show object size"
msgstr ""
-#: builtin/help.c:436 builtin/help.c:443
-#, c-format
-msgid "usage: %s%s"
+#: builtin/cat-file.c:368
+msgid "exit with zero when there's no error"
msgstr ""
-#: builtin/help.c:459
-#, c-format
-msgid "`git %s' is aliased to `%s'"
+#: builtin/cat-file.c:369
+msgid "pretty-print object's content"
msgstr ""
-#: builtin/index-pack.c:170
-#, c-format
-msgid "object type mismatch at %s"
+#: builtin/cat-file.c:371
+msgid "for blob objects, run textconv on object's content"
msgstr ""
-#: builtin/index-pack.c:190
-msgid "object of unexpected type"
+#: builtin/cat-file.c:373
+msgid "show info and content of objects fed from the standard input"
msgstr ""
-#: builtin/index-pack.c:227
-#, c-format
-msgid "cannot fill %d byte"
-msgid_plural "cannot fill %d bytes"
-msgstr[0] ""
-msgstr[1] ""
+#: builtin/cat-file.c:376
+msgid "show info about objects fed from the standard input"
+msgstr ""
-#: builtin/index-pack.c:237
-msgid "early EOF"
+#: builtin/check-attr.c:11
+msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
msgstr ""
-#: builtin/index-pack.c:238
-msgid "read error on input"
+#: builtin/check-attr.c:12
+msgid "git check-attr --stdin [-z] [-a | --all | <attr>...] < <list-of-paths>"
msgstr ""
-#: builtin/index-pack.c:250
-msgid "used more bytes than were available"
+#: builtin/check-attr.c:19
+msgid "report all attributes set on file"
msgstr ""
-#: builtin/index-pack.c:257
-msgid "pack too large for current definition of off_t"
+#: builtin/check-attr.c:20
+msgid "use .gitattributes only from the index"
msgstr ""
-#: builtin/index-pack.c:273
-#, c-format
-msgid "unable to create '%s'"
+#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:98
+msgid "read file names from stdin"
msgstr ""
-#: builtin/index-pack.c:278
-#, c-format
-msgid "cannot open packfile '%s'"
+#: builtin/check-attr.c:23 builtin/check-ignore.c:24
+msgid "terminate input and output records by a NUL character"
msgstr ""
-#: builtin/index-pack.c:292
-msgid "pack signature mismatch"
+#: builtin/check-ignore.c:18 builtin/checkout.c:1107 builtin/gc.c:274
+msgid "suppress progress reporting"
msgstr ""
-#: builtin/index-pack.c:312
-#, c-format
-msgid "pack has bad object at offset %lu: %s"
+#: builtin/check-ignore.c:26
+msgid "show non-matching input paths"
msgstr ""
-#: builtin/index-pack.c:434
-#, c-format
-msgid "inflate returned %d"
+#: builtin/check-ignore.c:28
+msgid "ignore index when checking"
msgstr ""
-#: builtin/index-pack.c:483
-msgid "offset value overflow for delta base object"
+#: builtin/check-ignore.c:154
+msgid "cannot specify pathnames with --stdin"
msgstr ""
-#: builtin/index-pack.c:491
-msgid "delta base offset is out of bound"
+#: builtin/check-ignore.c:157
+msgid "-z only makes sense with --stdin"
msgstr ""
-#: builtin/index-pack.c:499
-#, c-format
-msgid "unknown object type %d"
+#: builtin/check-ignore.c:159
+msgid "no path specified"
msgstr ""
-#: builtin/index-pack.c:531
-msgid "cannot pread pack file"
+#: builtin/check-ignore.c:163
+msgid "--quiet is only valid with a single pathname"
msgstr ""
-#: builtin/index-pack.c:533
-#, c-format
-msgid "premature end of pack file, %lu byte missing"
-msgid_plural "premature end of pack file, %lu bytes missing"
-msgstr[0] ""
-msgstr[1] ""
+#: builtin/check-ignore.c:165
+msgid "cannot have both --quiet and --verbose"
+msgstr ""
-#: builtin/index-pack.c:555
-msgid "serious inflate inconsistency"
+#: builtin/check-ignore.c:168
+msgid "--non-matching is only valid with --verbose"
msgstr ""
-#: builtin/index-pack.c:646 builtin/index-pack.c:652 builtin/index-pack.c:675
-#: builtin/index-pack.c:709 builtin/index-pack.c:718
-#, c-format
-msgid "SHA1 COLLISION FOUND WITH %s !"
+#: builtin/check-mailmap.c:8
+msgid "git check-mailmap [<options>] <contact>..."
msgstr ""
-#: builtin/index-pack.c:649 builtin/pack-objects.c:170
-#: builtin/pack-objects.c:262
-#, c-format
-msgid "unable to read %s"
+#: builtin/check-mailmap.c:13
+msgid "also read contacts from stdin"
msgstr ""
-#: builtin/index-pack.c:715
+#: builtin/check-mailmap.c:24
#, c-format
-msgid "cannot read existing object %s"
+msgid "unable to parse contact: %s"
msgstr ""
-#: builtin/index-pack.c:729
-#, c-format
-msgid "invalid blob object %s"
+#: builtin/check-mailmap.c:47
+msgid "no contacts specified"
msgstr ""
-#: builtin/index-pack.c:744
-#, c-format
-msgid "invalid %s"
+#: builtin/checkout-index.c:126
+msgid "git checkout-index [<options>] [--] [<file>...]"
msgstr ""
-#: builtin/index-pack.c:746
-msgid "Error in object"
+#: builtin/checkout-index.c:188
+msgid "check out all files in the index"
msgstr ""
-#: builtin/index-pack.c:748
-#, c-format
-msgid "Not all child objects of %s are reachable"
+#: builtin/checkout-index.c:189
+msgid "force overwrite of existing files"
msgstr ""
-#: builtin/index-pack.c:818 builtin/index-pack.c:844
-msgid "failed to apply delta"
+#: builtin/checkout-index.c:191
+msgid "no warning for existing files and files not in index"
msgstr ""
-#: builtin/index-pack.c:983
-msgid "Receiving objects"
+#: builtin/checkout-index.c:193
+msgid "don't checkout new files"
msgstr ""
-#: builtin/index-pack.c:983
-msgid "Indexing objects"
+#: builtin/checkout-index.c:195
+msgid "update stat information in the index file"
msgstr ""
-#: builtin/index-pack.c:1009
-msgid "pack is corrupted (SHA1 mismatch)"
+#: builtin/checkout-index.c:201
+msgid "read list of paths from the standard input"
msgstr ""
-#: builtin/index-pack.c:1014
-msgid "cannot fstat packfile"
+#: builtin/checkout-index.c:203
+msgid "write the content to temporary files"
msgstr ""
-#: builtin/index-pack.c:1017
-msgid "pack has junk at the end"
+#: builtin/checkout-index.c:204 builtin/column.c:30
+msgid "string"
msgstr ""
-#: builtin/index-pack.c:1028
-msgid "confusion beyond insanity in parse_pack_objects()"
+#: builtin/checkout-index.c:205
+msgid "when creating files, prepend <string>"
msgstr ""
-#: builtin/index-pack.c:1051
-msgid "Resolving deltas"
+#: builtin/checkout-index.c:208
+msgid "copy out the files from named stage"
msgstr ""
-#: builtin/index-pack.c:1102
-msgid "confusion beyond insanity"
+#: builtin/checkout.c:25
+msgid "git checkout [<options>] <branch>"
msgstr ""
-#: builtin/index-pack.c:1121
-#, c-format
-msgid "pack has %d unresolved delta"
-msgid_plural "pack has %d unresolved deltas"
-msgstr[0] ""
-msgstr[1] ""
+#: builtin/checkout.c:26
+msgid "git checkout [<options>] [<branch>] -- <file>..."
+msgstr ""
-#: builtin/index-pack.c:1146
+#: builtin/checkout.c:132 builtin/checkout.c:165
#, c-format
-msgid "unable to deflate appended object (%d)"
+msgid "path '%s' does not have our version"
msgstr ""
-#: builtin/index-pack.c:1225
+#: builtin/checkout.c:134 builtin/checkout.c:167
#, c-format
-msgid "local object %s is corrupt"
+msgid "path '%s' does not have their version"
msgstr ""
-#: builtin/index-pack.c:1249
-msgid "error while closing pack file"
+#: builtin/checkout.c:150
+#, c-format
+msgid "path '%s' does not have all necessary versions"
msgstr ""
-#: builtin/index-pack.c:1262
+#: builtin/checkout.c:194
#, c-format
-msgid "cannot write keep file '%s'"
+msgid "path '%s' does not have necessary versions"
msgstr ""
-#: builtin/index-pack.c:1270
+#: builtin/checkout.c:211
#, c-format
-msgid "cannot close written keep file '%s'"
+msgid "path '%s': cannot merge"
msgstr ""
-#: builtin/index-pack.c:1283
-msgid "cannot store pack file"
+#: builtin/checkout.c:228
+#, c-format
+msgid "Unable to add merge result for '%s'"
msgstr ""
-#: builtin/index-pack.c:1294
-msgid "cannot store index file"
+#: builtin/checkout.c:249 builtin/checkout.c:252 builtin/checkout.c:255
+#: builtin/checkout.c:258
+#, c-format
+msgid "'%s' cannot be used with updating paths"
msgstr ""
-#: builtin/index-pack.c:1395
+#: builtin/checkout.c:261 builtin/checkout.c:264
+#, c-format
+msgid "'%s' cannot be used with %s"
+msgstr ""
+
+#: builtin/checkout.c:267
+#, c-format
+msgid "Cannot update paths and switch to branch '%s' at the same time."
+msgstr ""
+
+#: builtin/checkout.c:278 builtin/checkout.c:467
+msgid "corrupt index file"
+msgstr ""
+
+#: builtin/checkout.c:338 builtin/checkout.c:345
+#, c-format
+msgid "path '%s' is unmerged"
+msgstr ""
+
+#: builtin/checkout.c:489
+msgid "you need to resolve your current index first"
+msgstr ""
+
+#: builtin/checkout.c:615
+#, c-format
+msgid "Can not do reflog for '%s'\n"
+msgstr ""
+
+#: builtin/checkout.c:653
+msgid "HEAD is now at"
+msgstr ""
+
+#: builtin/checkout.c:660
+#, c-format
+msgid "Reset branch '%s'\n"
+msgstr ""
+
+#: builtin/checkout.c:663
+#, c-format
+msgid "Already on '%s'\n"
+msgstr ""
+
+#: builtin/checkout.c:667
+#, c-format
+msgid "Switched to and reset branch '%s'\n"
+msgstr ""
+
+#: builtin/checkout.c:669 builtin/checkout.c:1050
+#, c-format
+msgid "Switched to a new branch '%s'\n"
+msgstr ""
+
+#: builtin/checkout.c:671
+#, c-format
+msgid "Switched to branch '%s'\n"
+msgstr ""
+
+#: builtin/checkout.c:723
+#, c-format
+msgid " ... and %d more.\n"
+msgstr ""
+
+#: builtin/checkout.c:729
+#, c-format
+msgid ""
+"Warning: you are leaving %d commit behind, not connected to\n"
+"any of your branches:\n"
+"\n"
+"%s\n"
+msgid_plural ""
+"Warning: you are leaving %d commits behind, not connected to\n"
+"any of your branches:\n"
+"\n"
+"%s\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/checkout.c:747
+#, c-format
+msgid ""
+"If you want to keep them by creating a new branch, this may be a good time\n"
+"to do so with:\n"
+"\n"
+" git branch <new-branch-name> %s\n"
+"\n"
+msgstr ""
+
+#: builtin/checkout.c:777
+msgid "internal error in revision walk"
+msgstr ""
+
+#: builtin/checkout.c:781
+msgid "Previous HEAD position was"
+msgstr ""
+
+#: builtin/checkout.c:808 builtin/checkout.c:1045
+msgid "You are on a branch yet to be born"
+msgstr ""
+
+#: builtin/checkout.c:952
+#, c-format
+msgid "only one reference expected, %d given."
+msgstr ""
+
+#: builtin/checkout.c:991
+#, c-format
+msgid "invalid reference: %s"
+msgstr ""
+
+#: builtin/checkout.c:1020
+#, c-format
+msgid "reference is not a tree: %s"
+msgstr ""
+
+#: builtin/checkout.c:1059
+msgid "paths cannot be used with switching branches"
+msgstr ""
+
+#: builtin/checkout.c:1062 builtin/checkout.c:1066
+#, c-format
+msgid "'%s' cannot be used with switching branches"
+msgstr ""
+
+#: builtin/checkout.c:1070 builtin/checkout.c:1073 builtin/checkout.c:1078
+#: builtin/checkout.c:1081
+#, c-format
+msgid "'%s' cannot be used with '%s'"
+msgstr ""
+
+#: builtin/checkout.c:1086
+#, c-format
+msgid "Cannot switch branch to a non-commit '%s'"
+msgstr ""
+
+#: builtin/checkout.c:1108 builtin/checkout.c:1110 builtin/clone.c:90
+#: builtin/remote.c:159 builtin/remote.c:161
+msgid "branch"
+msgstr ""
+
+#: builtin/checkout.c:1109
+msgid "create and checkout a new branch"
+msgstr ""
+
+#: builtin/checkout.c:1111
+msgid "create/reset and checkout a branch"
+msgstr ""
+
+#: builtin/checkout.c:1112
+msgid "create reflog for new branch"
+msgstr ""
+
+#: builtin/checkout.c:1113
+msgid "detach the HEAD at named commit"
+msgstr ""
+
+#: builtin/checkout.c:1114
+msgid "set upstream info for new branch"
+msgstr ""
+
+#: builtin/checkout.c:1116
+msgid "new-branch"
+msgstr ""
+
+#: builtin/checkout.c:1116
+msgid "new unparented branch"
+msgstr ""
+
+#: builtin/checkout.c:1117
+msgid "checkout our version for unmerged files"
+msgstr ""
+
+#: builtin/checkout.c:1119
+msgid "checkout their version for unmerged files"
+msgstr ""
+
+#: builtin/checkout.c:1121
+msgid "force checkout (throw away local modifications)"
+msgstr ""
+
+#: builtin/checkout.c:1122
+msgid "perform a 3-way merge with the new branch"
+msgstr ""
+
+#: builtin/checkout.c:1123 builtin/merge.c:227
+msgid "update ignored files (default)"
+msgstr ""
+
+#: builtin/checkout.c:1124 builtin/log.c:1239 parse-options.h:245
+msgid "style"
+msgstr ""
+
+#: builtin/checkout.c:1125
+msgid "conflict style (merge or diff3)"
+msgstr ""
+
+#: builtin/checkout.c:1128
+msgid "do not limit pathspecs to sparse entries only"
+msgstr ""
+
+#: builtin/checkout.c:1130
+msgid "second guess 'git checkout <no-such-branch>'"
+msgstr ""
+
+#: builtin/checkout.c:1153
+msgid "-b, -B and --orphan are mutually exclusive"
+msgstr ""
+
+#: builtin/checkout.c:1170
+msgid "--track needs a branch name"
+msgstr ""
+
+#: builtin/checkout.c:1175
+msgid "Missing branch name; try -b"
+msgstr ""
+
+#: builtin/checkout.c:1212
+msgid "invalid path specification"
+msgstr ""
+
+#: builtin/checkout.c:1219
+#, 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:1224
+#, c-format
+msgid "git checkout: --detach does not take a path argument '%s'"
+msgstr ""
+
+#: builtin/checkout.c:1228
+msgid ""
+"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
+"checking out of the index."
+msgstr ""
+
+#: builtin/clean.c:26
+msgid ""
+"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
+msgstr ""
+
+#: builtin/clean.c:30
+#, c-format
+msgid "Removing %s\n"
+msgstr ""
+
+#: builtin/clean.c:31
+#, c-format
+msgid "Would remove %s\n"
+msgstr ""
+
+#: builtin/clean.c:32
+#, c-format
+msgid "Skipping repository %s\n"
+msgstr ""
+
+#: builtin/clean.c:33
+#, c-format
+msgid "Would skip repository %s\n"
+msgstr ""
+
+#: builtin/clean.c:34
+#, c-format
+msgid "failed to remove %s"
+msgstr ""
+
+#: builtin/clean.c:295
+msgid ""
+"Prompt help:\n"
+"1 - select a numbered item\n"
+"foo - select item based on unique prefix\n"
+" - (empty) select nothing"
+msgstr ""
+
+#: builtin/clean.c:299
+msgid ""
+"Prompt help:\n"
+"1 - select a single item\n"
+"3-5 - select a range of items\n"
+"2-3,6-9 - select multiple ranges\n"
+"foo - select item based on unique prefix\n"
+"-... - unselect specified items\n"
+"* - choose all items\n"
+" - (empty) finish selecting"
+msgstr ""
+
+#: builtin/clean.c:517
+#, c-format
+msgid "Huh (%s)?"
+msgstr ""
+
+#: builtin/clean.c:659
+#, c-format
+msgid "Input ignore patterns>> "
+msgstr ""
+
+#: builtin/clean.c:696
+#, c-format
+msgid "WARNING: Cannot find items matched by: %s"
+msgstr ""
+
+#: builtin/clean.c:717
+msgid "Select items to delete"
+msgstr ""
+
+#. TRANSLATORS: Make sure to keep [y/N] as is
+#: builtin/clean.c:758
+#, c-format
+msgid "Remove %s [y/N]? "
+msgstr ""
+
+#: builtin/clean.c:783
+msgid "Bye."
+msgstr ""
+
+#: builtin/clean.c:791
+msgid ""
+"clean - start cleaning\n"
+"filter by pattern - exclude items from deletion\n"
+"select by numbers - select items to be deleted by numbers\n"
+"ask each - confirm each deletion (like \"rm -i\")\n"
+"quit - stop cleaning\n"
+"help - this screen\n"
+"? - help for prompt selection"
+msgstr ""
+
+#: builtin/clean.c:818
+msgid "*** Commands ***"
+msgstr ""
+
+#: builtin/clean.c:819
+msgid "What now"
+msgstr ""
+
+#: builtin/clean.c:827
+msgid "Would remove the following item:"
+msgid_plural "Would remove the following items:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/clean.c:844
+msgid "No more files to clean, exiting."
+msgstr ""
+
+#: builtin/clean.c:875
+msgid "do not print names of files removed"
+msgstr ""
+
+#: builtin/clean.c:877
+msgid "force"
+msgstr ""
+
+#: builtin/clean.c:878
+msgid "interactive cleaning"
+msgstr ""
+
+#: builtin/clean.c:880
+msgid "remove whole directories"
+msgstr ""
+
+#: builtin/clean.c:881 builtin/describe.c:407 builtin/grep.c:714
+#: builtin/ls-files.c:443 builtin/name-rev.c:311 builtin/show-ref.c:185
+msgid "pattern"
+msgstr ""
+
+#: builtin/clean.c:882
+msgid "add <pattern> to ignore rules"
+msgstr ""
+
+#: builtin/clean.c:883
+msgid "remove ignored files, too"
+msgstr ""
+
+#: builtin/clean.c:885
+msgid "remove only ignored files"
+msgstr ""
+
+#: builtin/clean.c:903
+msgid "-x and -X cannot be used together"
+msgstr ""
+
+#: builtin/clean.c:907
+msgid ""
+"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
+"clean"
+msgstr ""
+
+#: builtin/clean.c:910
+msgid ""
+"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
+"refusing to clean"
+msgstr ""
+
+#: builtin/clone.c:37
+msgid "git clone [<options>] [--] <repo> [<dir>]"
+msgstr ""
+
+#: builtin/clone.c:66 builtin/fetch.c:111 builtin/merge.c:224
+#: builtin/push.c:523
+msgid "force progress reporting"
+msgstr ""
+
+#: builtin/clone.c:68
+msgid "don't create a checkout"
+msgstr ""
+
+#: builtin/clone.c:69 builtin/clone.c:71 builtin/init-db.c:496
+msgid "create a bare repository"
+msgstr ""
+
+#: builtin/clone.c:73
+msgid "create a mirror repository (implies bare)"
+msgstr ""
+
+#: builtin/clone.c:75
+msgid "to clone from a local repository"
+msgstr ""
+
+#: builtin/clone.c:77
+msgid "don't use local hardlinks, always copy"
+msgstr ""
+
+#: builtin/clone.c:79
+msgid "setup as shared repository"
+msgstr ""
+
+#: builtin/clone.c:81 builtin/clone.c:83
+msgid "initialize submodules in the clone"
+msgstr ""
+
+#: builtin/clone.c:84 builtin/init-db.c:493
+msgid "template-directory"
+msgstr ""
+
+#: builtin/clone.c:85 builtin/init-db.c:494
+msgid "directory from which templates will be used"
+msgstr ""
+
+#: builtin/clone.c:87
+msgid "reference repository"
+msgstr ""
+
+#: builtin/clone.c:88 builtin/column.c:26 builtin/merge-file.c:44
+msgid "name"
+msgstr ""
+
+#: builtin/clone.c:89
+msgid "use <name> instead of 'origin' to track upstream"
+msgstr ""
+
+#: builtin/clone.c:91
+msgid "checkout <branch> instead of the remote's HEAD"
+msgstr ""
+
+#: builtin/clone.c:93
+msgid "path to git-upload-pack on the remote"
+msgstr ""
+
+#: builtin/clone.c:94 builtin/fetch.c:112 builtin/grep.c:659
+msgid "depth"
+msgstr ""
+
+#: builtin/clone.c:95
+msgid "create a shallow clone of that depth"
+msgstr ""
+
+#: builtin/clone.c:97
+msgid "clone only one branch, HEAD or --branch"
+msgstr ""
+
+#: builtin/clone.c:99
+msgid "use --reference only while cloning"
+msgstr ""
+
+#: builtin/clone.c:100 builtin/init-db.c:502
+msgid "gitdir"
+msgstr ""
+
+#: builtin/clone.c:101 builtin/init-db.c:503
+msgid "separate git dir from working tree"
+msgstr ""
+
+#: builtin/clone.c:102
+msgid "key=value"
+msgstr ""
+
+#: builtin/clone.c:103
+msgid "set config inside the new repository"
+msgstr ""
+
+#: builtin/clone.c:256
+#, c-format
+msgid "reference repository '%s' is not a local repository."
+msgstr ""
+
+#: builtin/clone.c:260
+#, c-format
+msgid "reference repository '%s' is shallow"
+msgstr ""
+
+#: builtin/clone.c:263
+#, c-format
+msgid "reference repository '%s' is grafted"
+msgstr ""
+
+#: builtin/clone.c:325
+#, c-format
+msgid "failed to create directory '%s'"
+msgstr ""
+
+#: builtin/clone.c:327 builtin/diff.c:84
+#, c-format
+msgid "failed to stat '%s'"
+msgstr ""
+
+#: builtin/clone.c:329
+#, c-format
+msgid "%s exists and is not a directory"
+msgstr ""
+
+#: builtin/clone.c:343
+#, c-format
+msgid "failed to stat %s\n"
+msgstr ""
+
+#: builtin/clone.c:365
+#, c-format
+msgid "failed to create link '%s'"
+msgstr ""
+
+#: builtin/clone.c:369
+#, c-format
+msgid "failed to copy file to '%s'"
+msgstr ""
+
+#: builtin/clone.c:392 builtin/clone.c:566
+#, c-format
+msgid "done.\n"
+msgstr ""
+
+#: builtin/clone.c:404
+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:481
+#, c-format
+msgid "Could not find remote branch %s to clone."
+msgstr ""
+
+#: builtin/clone.c:561
+#, c-format
+msgid "Checking connectivity... "
+msgstr ""
+
+#: builtin/clone.c:564
+msgid "remote did not send all necessary objects"
+msgstr ""
+
+#: builtin/clone.c:628
+msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
+msgstr ""
+
+#: builtin/clone.c:659
+msgid "unable to checkout working tree"
+msgstr ""
+
+#: builtin/clone.c:746
+msgid "cannot repack to clean up"
+msgstr ""
+
+#: builtin/clone.c:748
+msgid "cannot unlink temporary alternates file"
+msgstr ""
+
+#: builtin/clone.c:778
+msgid "Too many arguments."
+msgstr ""
+
+#: builtin/clone.c:782
+msgid "You must specify a repository to clone."
+msgstr ""
+
+#: builtin/clone.c:793
+#, c-format
+msgid "--bare and --origin %s options are incompatible."
+msgstr ""
+
+#: builtin/clone.c:796
+msgid "--bare and --separate-git-dir are incompatible."
+msgstr ""
+
+#: builtin/clone.c:809
+#, c-format
+msgid "repository '%s' does not exist"
+msgstr ""
+
+#: builtin/clone.c:815 builtin/fetch.c:1156
+#, c-format
+msgid "depth %s is not a positive number"
+msgstr ""
+
+#: builtin/clone.c:825
+#, c-format
+msgid "destination path '%s' already exists and is not an empty directory."
+msgstr ""
+
+#: builtin/clone.c:835
+#, c-format
+msgid "working tree '%s' already exists."
+msgstr ""
+
+#: builtin/clone.c:850 builtin/clone.c:861
+#, c-format
+msgid "could not create leading directories of '%s'"
+msgstr ""
+
+#: builtin/clone.c:853
+#, c-format
+msgid "could not create work tree dir '%s'"
+msgstr ""
+
+#: builtin/clone.c:871
+#, c-format
+msgid "Cloning into bare repository '%s'...\n"
+msgstr ""
+
+#: builtin/clone.c:873
+#, c-format
+msgid "Cloning into '%s'...\n"
+msgstr ""
+
+#: builtin/clone.c:898
+msgid "--dissociate given, but there is no --reference"
+msgstr ""
+
+#: builtin/clone.c:913
+msgid "--depth is ignored in local clones; use file:// instead."
+msgstr ""
+
+#: builtin/clone.c:916
+msgid "source repository is shallow, ignoring --local"
+msgstr ""
+
+#: builtin/clone.c:921
+msgid "--local is ignored"
+msgstr ""
+
+#: builtin/clone.c:925
+#, c-format
+msgid "Don't know how to clone %s"
+msgstr ""
+
+#: builtin/clone.c:976 builtin/clone.c:984
+#, c-format
+msgid "Remote branch %s not found in upstream %s"
+msgstr ""
+
+#: builtin/clone.c:987
+msgid "You appear to have cloned an empty repository."
+msgstr ""
+
+#: builtin/column.c:9
+msgid "git column [<options>]"
+msgstr ""
+
+#: builtin/column.c:26
+msgid "lookup config vars"
+msgstr ""
+
+#: builtin/column.c:27 builtin/column.c:28
+msgid "layout to use"
+msgstr ""
+
+#: builtin/column.c:29
+msgid "Maximum width"
+msgstr ""
+
+#: builtin/column.c:30
+msgid "Padding space on left border"
+msgstr ""
+
+#: builtin/column.c:31
+msgid "Padding space on right border"
+msgstr ""
+
+#: builtin/column.c:32
+msgid "Padding space between columns"
+msgstr ""
+
+#: builtin/column.c:51
+msgid "--command must be the first argument"
+msgstr ""
+
+#: builtin/commit.c:37
+msgid "git commit [<options>] [--] <pathspec>..."
+msgstr ""
+
+#: builtin/commit.c:42
+msgid "git status [<options>] [--] <pathspec>..."
+msgstr ""
+
+#: builtin/commit.c:47
+msgid ""
+"Your name and email address were configured automatically based\n"
+"on your username and hostname. Please check that they are accurate.\n"
+"You can suppress this message by setting them explicitly. Run the\n"
+"following command and follow the instructions in your editor to edit\n"
+"your configuration file:\n"
+"\n"
+" git config --global --edit\n"
+"\n"
+"After doing this, you may fix the identity used for this commit with:\n"
+"\n"
+" git commit --amend --reset-author\n"
+msgstr ""
+
+#: builtin/commit.c:60
+msgid ""
+"Your name and email address were configured automatically based\n"
+"on your username and hostname. Please check that they are accurate.\n"
+"You can suppress this message by setting them explicitly:\n"
+"\n"
+" git config --global user.name \"Your Name\"\n"
+" git config --global user.email you@example.com\n"
+"\n"
+"After doing this, you may fix the identity used for this commit with:\n"
+"\n"
+" git commit --amend --reset-author\n"
+msgstr ""
+
+#: builtin/commit.c:72
+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:77
+msgid ""
+"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
+"If you wish to commit it anyway, use:\n"
+"\n"
+" git commit --allow-empty\n"
+"\n"
+msgstr ""
+
+#: builtin/commit.c:84
+msgid "Otherwise, please use 'git reset'\n"
+msgstr ""
+
+#: builtin/commit.c:87
+msgid ""
+"If you wish to skip this commit, use:\n"
+"\n"
+" git reset\n"
+"\n"
+"Then \"git cherry-pick --continue\" will resume cherry-picking\n"
+"the remaining commits.\n"
+msgstr ""
+
+#: builtin/commit.c:304
+msgid "failed to unpack HEAD tree object"
+msgstr ""
+
+#: builtin/commit.c:344
+msgid "unable to create temporary index"
+msgstr ""
+
+#: builtin/commit.c:350
+msgid "interactive add failed"
+msgstr ""
+
+#: builtin/commit.c:361
+msgid "unable to write index file"
+msgstr ""
+
+#: builtin/commit.c:363
+msgid "unable to update temporary index"
+msgstr ""
+
+#: builtin/commit.c:365
+msgid "Failed to update main cache tree"
+msgstr ""
+
+#: builtin/commit.c:389 builtin/commit.c:414 builtin/commit.c:463
+msgid "unable to write new_index file"
+msgstr ""
+
+#: builtin/commit.c:445
+msgid "cannot do a partial commit during a merge."
+msgstr ""
+
+#: builtin/commit.c:447
+msgid "cannot do a partial commit during a cherry-pick."
+msgstr ""
+
+#: builtin/commit.c:456
+msgid "cannot read the index"
+msgstr ""
+
+#: builtin/commit.c:475
+msgid "unable to write temporary index file"
+msgstr ""
+
+#: builtin/commit.c:580
+#, c-format
+msgid "commit '%s' lacks author header"
+msgstr ""
+
+#: builtin/commit.c:582
+#, c-format
+msgid "commit '%s' has malformed author line"
+msgstr ""
+
+#: builtin/commit.c:601
+msgid "malformed --author parameter"
+msgstr ""
+
+#: builtin/commit.c:609
+#, c-format
+msgid "invalid date format: %s"
+msgstr ""
+
+#: builtin/commit.c:653
+msgid ""
+"unable to select a comment character that is not used\n"
+"in the current commit message"
+msgstr ""
+
+#: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080
+#, c-format
+msgid "could not lookup commit %s"
+msgstr ""
+
+#: builtin/commit.c:702 builtin/shortlog.c:273
+#, c-format
+msgid "(reading log message from standard input)\n"
+msgstr ""
+
+#: builtin/commit.c:704
+msgid "could not read log from standard input"
+msgstr ""
+
+#: builtin/commit.c:708
+#, c-format
+msgid "could not read log file '%s'"
+msgstr ""
+
+#: builtin/commit.c:730
+msgid "could not read MERGE_MSG"
+msgstr ""
+
+#: builtin/commit.c:734
+msgid "could not read SQUASH_MSG"
+msgstr ""
+
+#: builtin/commit.c:738
+#, c-format
+msgid "could not read '%s'"
+msgstr ""
+
+#: builtin/commit.c:785
+msgid "could not write commit template"
+msgstr ""
+
+#: builtin/commit.c:803
+#, c-format
+msgid ""
+"\n"
+"It looks like you may be committing a merge.\n"
+"If this is not correct, please remove the file\n"
+"\t%s\n"
+"and try again.\n"
+msgstr ""
+
+#: builtin/commit.c:808
+#, c-format
+msgid ""
+"\n"
+"It looks like you may be committing a cherry-pick.\n"
+"If this is not correct, please remove the file\n"
+"\t%s\n"
+"and try again.\n"
+msgstr ""
+
+#: builtin/commit.c:821
+#, 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:828
+#, c-format
+msgid ""
+"Please enter the commit message for your changes. Lines starting\n"
+"with '%c' will be kept; you may remove them yourself if you want to.\n"
+"An empty message aborts the commit.\n"
+msgstr ""
+
+#: builtin/commit.c:848
+#, c-format
+msgid "%sAuthor: %.*s <%.*s>"
+msgstr ""
+
+#: builtin/commit.c:856
+#, c-format
+msgid "%sDate: %s"
+msgstr ""
+
+#: builtin/commit.c:863
+#, c-format
+msgid "%sCommitter: %.*s <%.*s>"
+msgstr ""
+
+#: builtin/commit.c:881
+msgid "Cannot read index"
+msgstr ""
+
+#: builtin/commit.c:938
+msgid "Error building trees"
+msgstr ""
+
+#: builtin/commit.c:953 builtin/tag.c:495
+#, c-format
+msgid "Please supply the message using either -m or -F option.\n"
+msgstr ""
+
+#: builtin/commit.c:1055
+#, c-format
+msgid "--author '%s' is not 'Name <email>' and matches no existing author"
+msgstr ""
+
+#: builtin/commit.c:1070 builtin/commit.c:1310
+#, c-format
+msgid "Invalid untracked files mode '%s'"
+msgstr ""
+
+#: builtin/commit.c:1107
+msgid "--long and -z are incompatible"
+msgstr ""
+
+#: builtin/commit.c:1137
+msgid "Using both --reset-author and --author does not make sense"
+msgstr ""
+
+#: builtin/commit.c:1146
+msgid "You have nothing to amend."
+msgstr ""
+
+#: builtin/commit.c:1149
+msgid "You are in the middle of a merge -- cannot amend."
+msgstr ""
+
+#: builtin/commit.c:1151
+msgid "You are in the middle of a cherry-pick -- cannot amend."
+msgstr ""
+
+#: builtin/commit.c:1154
+msgid "Options --squash and --fixup cannot be used together"
+msgstr ""
+
+#: builtin/commit.c:1164
+msgid "Only one of -c/-C/-F/--fixup can be used."
+msgstr ""
+
+#: builtin/commit.c:1166
+msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
+msgstr ""
+
+#: builtin/commit.c:1174
+msgid "--reset-author can be used only with -C, -c or --amend."
+msgstr ""
+
+#: builtin/commit.c:1191
+msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
+msgstr ""
+
+#: builtin/commit.c:1193
+msgid "No paths with --include/--only does not make sense."
+msgstr ""
+
+#: builtin/commit.c:1195
+msgid "Clever... amending the last one with dirty index."
+msgstr ""
+
+#: builtin/commit.c:1197
+msgid "Explicit paths specified without -i or -o; assuming --only paths..."
+msgstr ""
+
+#: builtin/commit.c:1209 builtin/tag.c:728
+#, c-format
+msgid "Invalid cleanup mode %s"
+msgstr ""
+
+#: builtin/commit.c:1214
+msgid "Paths with -a does not make sense."
+msgstr ""
+
+#: builtin/commit.c:1324 builtin/commit.c:1604
+msgid "show status concisely"
+msgstr ""
+
+#: builtin/commit.c:1326 builtin/commit.c:1606
+msgid "show branch information"
+msgstr ""
+
+#: builtin/commit.c:1328 builtin/commit.c:1608 builtin/push.c:509
+msgid "machine-readable output"
+msgstr ""
+
+#: builtin/commit.c:1331 builtin/commit.c:1610
+msgid "show status in long format (default)"
+msgstr ""
+
+#: builtin/commit.c:1334 builtin/commit.c:1613
+msgid "terminate entries with NUL"
+msgstr ""
+
+#: builtin/commit.c:1336 builtin/commit.c:1616 builtin/fast-export.c:980
+#: builtin/fast-export.c:983 builtin/tag.c:603
+msgid "mode"
+msgstr ""
+
+#: builtin/commit.c:1337 builtin/commit.c:1616
+msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
+msgstr ""
+
+#: builtin/commit.c:1340
+msgid "show ignored files"
+msgstr ""
+
+#: builtin/commit.c:1341 parse-options.h:153
+msgid "when"
+msgstr ""
+
+#: builtin/commit.c:1342
+msgid ""
+"ignore changes to submodules, optional when: all, dirty, untracked. "
+"(Default: all)"
+msgstr ""
+
+#: builtin/commit.c:1344
+msgid "list untracked files in columns"
+msgstr ""
+
+#: builtin/commit.c:1431
+msgid "couldn't look up newly created commit"
+msgstr ""
+
+#: builtin/commit.c:1433
+msgid "could not parse newly created commit"
+msgstr ""
+
+#: builtin/commit.c:1478
+msgid "detached HEAD"
+msgstr ""
+
+#: builtin/commit.c:1481
+msgid " (root-commit)"
+msgstr ""
+
+#: builtin/commit.c:1574
+msgid "suppress summary after successful commit"
+msgstr ""
+
+#: builtin/commit.c:1575
+msgid "show diff in commit message template"
+msgstr ""
+
+#: builtin/commit.c:1577
+msgid "Commit message options"
+msgstr ""
+
+#: builtin/commit.c:1578 builtin/tag.c:601
+msgid "read message from file"
+msgstr ""
+
+#: builtin/commit.c:1579
+msgid "author"
+msgstr ""
+
+#: builtin/commit.c:1579
+msgid "override author for commit"
+msgstr ""
+
+#: builtin/commit.c:1580 builtin/gc.c:275
+msgid "date"
+msgstr ""
+
+#: builtin/commit.c:1580
+msgid "override date for commit"
+msgstr ""
+
+#: builtin/commit.c:1581 builtin/merge.c:218 builtin/notes.c:391
+#: builtin/notes.c:554 builtin/tag.c:599
+msgid "message"
+msgstr ""
+
+#: builtin/commit.c:1581
+msgid "commit message"
+msgstr ""
+
+#: builtin/commit.c:1582
+msgid "reuse and edit message from specified commit"
+msgstr ""
+
+#: builtin/commit.c:1583
+msgid "reuse message from specified commit"
+msgstr ""
+
+#: builtin/commit.c:1584
+msgid "use autosquash formatted message to fixup specified commit"
+msgstr ""
+
+#: builtin/commit.c:1585
+msgid "use autosquash formatted message to squash specified commit"
+msgstr ""
+
+#: builtin/commit.c:1586
+msgid "the commit is authored by me now (used with -C/-c/--amend)"
+msgstr ""
+
+#: builtin/commit.c:1587 builtin/log.c:1191 builtin/revert.c:86
+msgid "add Signed-off-by:"
+msgstr ""
+
+#: builtin/commit.c:1588
+msgid "use specified template file"
+msgstr ""
+
+#: builtin/commit.c:1589
+msgid "force edit of commit"
+msgstr ""
+
+#: builtin/commit.c:1590
+msgid "default"
+msgstr ""
+
+#: builtin/commit.c:1590 builtin/tag.c:604
+msgid "how to strip spaces and #comments from message"
+msgstr ""
+
+#: builtin/commit.c:1591
+msgid "include status in commit message template"
+msgstr ""
+
+#: builtin/commit.c:1592 builtin/merge.c:225 builtin/revert.c:92
+#: builtin/tag.c:605
+msgid "key-id"
+msgstr ""
+
+#: builtin/commit.c:1593 builtin/merge.c:226 builtin/revert.c:93
+msgid "GPG sign commit"
+msgstr ""
+
+#: builtin/commit.c:1596
+msgid "Commit contents options"
+msgstr ""
+
+#: builtin/commit.c:1597
+msgid "commit all changed files"
+msgstr ""
+
+#: builtin/commit.c:1598
+msgid "add specified files to index for commit"
+msgstr ""
+
+#: builtin/commit.c:1599
+msgid "interactively add files"
+msgstr ""
+
+#: builtin/commit.c:1600
+msgid "interactively add changes"
+msgstr ""
+
+#: builtin/commit.c:1601
+msgid "commit only specified files"
+msgstr ""
+
+#: builtin/commit.c:1602
+msgid "bypass pre-commit hook"
+msgstr ""
+
+#: builtin/commit.c:1603
+msgid "show what would be committed"
+msgstr ""
+
+#: builtin/commit.c:1614
+msgid "amend previous commit"
+msgstr ""
+
+#: builtin/commit.c:1615
+msgid "bypass post-rewrite hook"
+msgstr ""
+
+#: builtin/commit.c:1620
+msgid "ok to record an empty change"
+msgstr ""
+
+#: builtin/commit.c:1622
+msgid "ok to record a change with an empty message"
+msgstr ""
+
+#: builtin/commit.c:1651
+msgid "could not parse HEAD commit"
+msgstr ""
+
+#: builtin/commit.c:1690 builtin/merge.c:519
+#, c-format
+msgid "could not open '%s' for reading"
+msgstr ""
+
+#: builtin/commit.c:1697
+#, c-format
+msgid "Corrupt MERGE_HEAD file (%s)"
+msgstr ""
+
+#: builtin/commit.c:1704
+msgid "could not read MERGE_MODE"
+msgstr ""
+
+#: builtin/commit.c:1723
+#, c-format
+msgid "could not read commit message: %s"
+msgstr ""
+
+#: builtin/commit.c:1734
+#, c-format
+msgid "Aborting commit; you did not edit the message.\n"
+msgstr ""
+
+#: builtin/commit.c:1739
+#, c-format
+msgid "Aborting commit due to empty commit message.\n"
+msgstr ""
+
+#: builtin/commit.c:1754 builtin/merge.c:851 builtin/merge.c:876
+msgid "failed to write commit object"
+msgstr ""
+
+#: builtin/commit.c:1787
+msgid ""
+"Repository has been updated, but unable to write\n"
+"new_index file. Check that disk is not full and quota is\n"
+"not exceeded, and then \"git reset HEAD\" to recover."
+msgstr ""
+
+#: builtin/config.c:8
+msgid "git config [<options>]"
+msgstr ""
+
+#: builtin/config.c:53
+msgid "Config file location"
+msgstr ""
+
+#: builtin/config.c:54
+msgid "use global config file"
+msgstr ""
+
+#: builtin/config.c:55
+msgid "use system config file"
+msgstr ""
+
+#: builtin/config.c:56
+msgid "use repository config file"
+msgstr ""
+
+#: builtin/config.c:57
+msgid "use given config file"
+msgstr ""
+
+#: builtin/config.c:58
+msgid "blob-id"
+msgstr ""
+
+#: builtin/config.c:58
+msgid "read config from given blob object"
+msgstr ""
+
+#: builtin/config.c:59
+msgid "Action"
+msgstr ""
+
+#: builtin/config.c:60
+msgid "get value: name [value-regex]"
+msgstr ""
+
+#: builtin/config.c:61
+msgid "get all values: key [value-regex]"
+msgstr ""
+
+#: builtin/config.c:62
+msgid "get values for regexp: name-regex [value-regex]"
+msgstr ""
+
+#: builtin/config.c:63
+msgid "get value specific for the URL: section[.var] URL"
+msgstr ""
+
+#: builtin/config.c:64
+msgid "replace all matching variables: name value [value_regex]"
+msgstr ""
+
+#: builtin/config.c:65
+msgid "add a new variable: name value"
+msgstr ""
+
+#: builtin/config.c:66
+msgid "remove a variable: name [value-regex]"
+msgstr ""
+
+#: builtin/config.c:67
+msgid "remove all matches: name [value-regex]"
+msgstr ""
+
+#: builtin/config.c:68
+msgid "rename section: old-name new-name"
+msgstr ""
+
+#: builtin/config.c:69
+msgid "remove a section: name"
+msgstr ""
+
+#: builtin/config.c:70
+msgid "list all"
+msgstr ""
+
+#: builtin/config.c:71
+msgid "open an editor"
+msgstr ""
+
+#: builtin/config.c:72
+msgid "find the color configured: slot [default]"
+msgstr ""
+
+#: builtin/config.c:73
+msgid "find the color setting: slot [stdout-is-tty]"
+msgstr ""
+
+#: builtin/config.c:74
+msgid "Type"
+msgstr ""
+
+#: builtin/config.c:75
+msgid "value is \"true\" or \"false\""
+msgstr ""
+
+#: builtin/config.c:76
+msgid "value is decimal number"
+msgstr ""
+
+#: builtin/config.c:77
+msgid "value is --bool or --int"
+msgstr ""
+
+#: builtin/config.c:78
+msgid "value is a path (file or directory name)"
+msgstr ""
+
+#: builtin/config.c:79
+msgid "Other"
+msgstr ""
+
+#: builtin/config.c:80
+msgid "terminate values with NUL byte"
+msgstr ""
+
+#: builtin/config.c:81
+msgid "respect include directives on lookup"
+msgstr ""
+
+#: builtin/config.c:316
+msgid "unable to parse default color value"
+msgstr ""
+
+#: builtin/config.c:457
+#, c-format
+msgid ""
+"# This is Git's per-user configuration file.\n"
+"[core]\n"
+"# Please adapt and uncomment the following lines:\n"
+"#\tuser = %s\n"
+"#\temail = %s\n"
+msgstr ""
+
+#: builtin/config.c:589
+#, c-format
+msgid "cannot create configuration file %s"
+msgstr ""
+
+#: builtin/count-objects.c:55
+msgid "git count-objects [-v] [-H | --human-readable]"
+msgstr ""
+
+#: builtin/count-objects.c:65
+msgid "print sizes in human readable format"
+msgstr ""
+
+#: builtin/describe.c:17
+msgid "git describe [<options>] [<commit-ish>...]"
+msgstr ""
+
+#: builtin/describe.c:18
+msgid "git describe [<options>] --dirty"
+msgstr ""
+
+#: builtin/describe.c:217
+#, c-format
+msgid "annotated tag %s not available"
+msgstr ""
+
+#: builtin/describe.c:221
+#, c-format
+msgid "annotated tag %s has no embedded name"
+msgstr ""
+
+#: builtin/describe.c:223
+#, c-format
+msgid "tag '%s' is really '%s' here"
+msgstr ""
+
+#: builtin/describe.c:250 builtin/log.c:452
+#, c-format
+msgid "Not a valid object name %s"
+msgstr ""
+
+#: builtin/describe.c:253
+#, c-format
+msgid "%s is not a valid '%s' object"
+msgstr ""
+
+#: builtin/describe.c:270
+#, c-format
+msgid "no tag exactly matches '%s'"
+msgstr ""
+
+#: builtin/describe.c:272
+#, c-format
+msgid "searching to describe %s\n"
+msgstr ""
+
+#: builtin/describe.c:319
+#, c-format
+msgid "finished search at %s\n"
+msgstr ""
+
+#: builtin/describe.c:346
+#, c-format
+msgid ""
+"No annotated tags can describe '%s'.\n"
+"However, there were unannotated tags: try --tags."
+msgstr ""
+
+#: builtin/describe.c:350
+#, c-format
+msgid ""
+"No tags can describe '%s'.\n"
+"Try --always, or create some tags."
+msgstr ""
+
+#: builtin/describe.c:371
+#, c-format
+msgid "traversed %lu commits\n"
+msgstr ""
+
+#: builtin/describe.c:374
+#, c-format
+msgid ""
+"more than %i tags found; listed %i most recent\n"
+"gave up search at %s\n"
+msgstr ""
+
+#: builtin/describe.c:396
+msgid "find the tag that comes after the commit"
+msgstr ""
+
+#: builtin/describe.c:397
+msgid "debug search strategy on stderr"
+msgstr ""
+
+#: builtin/describe.c:398
+msgid "use any ref"
+msgstr ""
+
+#: builtin/describe.c:399
+msgid "use any tag, even unannotated"
+msgstr ""
+
+#: builtin/describe.c:400
+msgid "always use long format"
+msgstr ""
+
+#: builtin/describe.c:401
+msgid "only follow first parent"
+msgstr ""
+
+#: builtin/describe.c:404
+msgid "only output exact matches"
+msgstr ""
+
+#: builtin/describe.c:406
+msgid "consider <n> most recent tags (default: 10)"
+msgstr ""
+
+#: builtin/describe.c:408
+msgid "only consider tags matching <pattern>"
+msgstr ""
+
+#: builtin/describe.c:410 builtin/name-rev.c:318
+msgid "show abbreviated commit object as fallback"
+msgstr ""
+
+#: builtin/describe.c:411
+msgid "mark"
+msgstr ""
+
+#: builtin/describe.c:412
+msgid "append <mark> on dirty working tree (default: \"-dirty\")"
+msgstr ""
+
+#: builtin/describe.c:430
+msgid "--long is incompatible with --abbrev=0"
+msgstr ""
+
+#: builtin/describe.c:456
+msgid "No names found, cannot describe anything."
+msgstr ""
+
+#: builtin/describe.c:476
+msgid "--dirty is incompatible with commit-ishes"
+msgstr ""
+
+#: builtin/diff.c:86
+#, c-format
+msgid "'%s': not a regular file or symlink"
+msgstr ""
+
+#: builtin/diff.c:237
+#, c-format
+msgid "invalid option: %s"
+msgstr ""
+
+#: builtin/diff.c:358
+msgid "Not a git repository"
+msgstr ""
+
+#: builtin/diff.c:401
+#, c-format
+msgid "invalid object '%s' given."
+msgstr ""
+
+#: builtin/diff.c:410
+#, c-format
+msgid "more than two blobs given: '%s'"
+msgstr ""
+
+#: builtin/diff.c:417
+#, c-format
+msgid "unhandled object '%s' given."
+msgstr ""
+
+#: builtin/fast-export.c:24
+msgid "git fast-export [rev-list-opts]"
+msgstr ""
+
+#: builtin/fast-export.c:979
+msgid "show progress after <n> objects"
+msgstr ""
+
+#: builtin/fast-export.c:981
+msgid "select handling of signed tags"
+msgstr ""
+
+#: builtin/fast-export.c:984
+msgid "select handling of tags that tag filtered objects"
+msgstr ""
+
+#: builtin/fast-export.c:987
+msgid "Dump marks to this file"
+msgstr ""
+
+#: builtin/fast-export.c:989
+msgid "Import marks from this file"
+msgstr ""
+
+#: builtin/fast-export.c:991
+msgid "Fake a tagger when tags lack one"
+msgstr ""
+
+#: builtin/fast-export.c:993
+msgid "Output full tree for each commit"
+msgstr ""
+
+#: builtin/fast-export.c:995
+msgid "Use the done feature to terminate the stream"
+msgstr ""
+
+#: builtin/fast-export.c:996
+msgid "Skip output of blob data"
+msgstr ""
+
+#: builtin/fast-export.c:997
+msgid "refspec"
+msgstr ""
+
+#: builtin/fast-export.c:998
+msgid "Apply refspec to exported refs"
+msgstr ""
+
+#: builtin/fast-export.c:999
+msgid "anonymize output"
+msgstr ""
+
+#: builtin/fetch.c:19
+msgid "git fetch [<options>] [<repository> [<refspec>...]]"
+msgstr ""
+
+#: builtin/fetch.c:20
+msgid "git fetch [<options>] <group>"
+msgstr ""
+
+#: builtin/fetch.c:21
+msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
+msgstr ""
+
+#: builtin/fetch.c:22
+msgid "git fetch --all [<options>]"
+msgstr ""
+
+#: builtin/fetch.c:89
+msgid "fetch from all remotes"
+msgstr ""
+
+#: builtin/fetch.c:91
+msgid "append to .git/FETCH_HEAD instead of overwriting"
+msgstr ""
+
+#: builtin/fetch.c:93
+msgid "path to upload pack on remote end"
+msgstr ""
+
+#: builtin/fetch.c:94
+msgid "force overwrite of local branch"
+msgstr ""
+
+#: builtin/fetch.c:96
+msgid "fetch from multiple remotes"
+msgstr ""
+
+#: builtin/fetch.c:98
+msgid "fetch all tags and associated objects"
+msgstr ""
+
+#: builtin/fetch.c:100
+msgid "do not fetch all tags (--no-tags)"
+msgstr ""
+
+#: builtin/fetch.c:102
+msgid "prune remote-tracking branches no longer on remote"
+msgstr ""
+
+#: builtin/fetch.c:103
+msgid "on-demand"
+msgstr ""
+
+#: builtin/fetch.c:104
+msgid "control recursive fetching of submodules"
+msgstr ""
+
+#: builtin/fetch.c:108
+msgid "keep downloaded pack"
+msgstr ""
+
+#: builtin/fetch.c:110
+msgid "allow updating of HEAD ref"
+msgstr ""
+
+#: builtin/fetch.c:113
+msgid "deepen history of shallow clone"
+msgstr ""
+
+#: builtin/fetch.c:115
+msgid "convert to a complete repository"
+msgstr ""
+
+#: builtin/fetch.c:117 builtin/log.c:1208
+msgid "dir"
+msgstr ""
+
+#: builtin/fetch.c:118
+msgid "prepend this to submodule path output"
+msgstr ""
+
+#: builtin/fetch.c:121
+msgid "default mode for recursion"
+msgstr ""
+
+#: builtin/fetch.c:123
+msgid "accept refs that update .git/shallow"
+msgstr ""
+
+#: builtin/fetch.c:124
+msgid "refmap"
+msgstr ""
+
+#: builtin/fetch.c:125
+msgid "specify fetch refmap"
+msgstr ""
+
+#: builtin/fetch.c:375
+msgid "Couldn't find remote ref HEAD"
+msgstr ""
+
+#: builtin/fetch.c:455
+#, c-format
+msgid "object %s not found"
+msgstr ""
+
+#: builtin/fetch.c:460
+msgid "[up to date]"
+msgstr ""
+
+#: builtin/fetch.c:474
+#, c-format
+msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
+msgstr ""
+
+#: builtin/fetch.c:475 builtin/fetch.c:561
+msgid "[rejected]"
+msgstr ""
+
+#: builtin/fetch.c:486
+msgid "[tag update]"
+msgstr ""
+
+#: builtin/fetch.c:488 builtin/fetch.c:523 builtin/fetch.c:541
+msgid " (unable to update local ref)"
+msgstr ""
+
+#: builtin/fetch.c:506
+msgid "[new tag]"
+msgstr ""
+
+#: builtin/fetch.c:509
+msgid "[new branch]"
+msgstr ""
+
+#: builtin/fetch.c:512
+msgid "[new ref]"
+msgstr ""
+
+#: builtin/fetch.c:557
+msgid "unable to update local ref"
+msgstr ""
+
+#: builtin/fetch.c:557
+msgid "forced update"
+msgstr ""
+
+#: builtin/fetch.c:563
+msgid "(non-fast-forward)"
+msgstr ""
+
+#: builtin/fetch.c:596 builtin/fetch.c:829
+#, c-format
+msgid "cannot open %s: %s\n"
+msgstr ""
+
+#: builtin/fetch.c:605
+#, c-format
+msgid "%s did not send all necessary objects\n"
+msgstr ""
+
+#: builtin/fetch.c:623
+#, c-format
+msgid "reject %s because shallow roots are not allowed to be updated"
+msgstr ""
+
+#: builtin/fetch.c:711 builtin/fetch.c:794
+#, c-format
+msgid "From %.*s\n"
+msgstr ""
+
+#: builtin/fetch.c:722
+#, 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:774
+#, c-format
+msgid " (%s will become dangling)"
+msgstr ""
+
+#: builtin/fetch.c:775
+#, c-format
+msgid " (%s has become dangling)"
+msgstr ""
+
+#: builtin/fetch.c:799
+msgid "[deleted]"
+msgstr ""
+
+#: builtin/fetch.c:800 builtin/remote.c:1060
+msgid "(none)"
+msgstr ""
+
+#: builtin/fetch.c:819
+#, c-format
+msgid "Refusing to fetch into current branch %s of non-bare repository"
+msgstr ""
+
+#: builtin/fetch.c:838
+#, c-format
+msgid "Option \"%s\" value \"%s\" is not valid for %s"
+msgstr ""
+
+#: builtin/fetch.c:841
+#, c-format
+msgid "Option \"%s\" is ignored for %s\n"
+msgstr ""
+
+#: builtin/fetch.c:897
+#, c-format
+msgid "Don't know how to fetch from %s"
+msgstr ""
+
+#: builtin/fetch.c:1059
+#, c-format
+msgid "Fetching %s\n"
+msgstr ""
+
+#: builtin/fetch.c:1061 builtin/remote.c:90
+#, c-format
+msgid "Could not fetch %s"
+msgstr ""
+
+#: builtin/fetch.c:1079
+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:1102
+msgid "You need to specify a tag name."
+msgstr ""
+
+#: builtin/fetch.c:1144
+msgid "--depth and --unshallow cannot be used together"
+msgstr ""
+
+#: builtin/fetch.c:1146
+msgid "--unshallow on a complete repository does not make sense"
+msgstr ""
+
+#: builtin/fetch.c:1169
+msgid "fetch --all does not take a repository argument"
+msgstr ""
+
+#: builtin/fetch.c:1171
+msgid "fetch --all does not make sense with refspecs"
+msgstr ""
+
+#: builtin/fetch.c:1182
+#, c-format
+msgid "No such remote or remote group: %s"
+msgstr ""
+
+#: builtin/fetch.c:1190
+msgid "Fetching a group and specifying refspecs does not make sense"
+msgstr ""
+
+#: builtin/fmt-merge-msg.c:13
+msgid ""
+"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
+msgstr ""
+
+#: builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665 builtin/grep.c:698
+#: builtin/merge.c:198 builtin/repack.c:178 builtin/repack.c:182
+#: builtin/show-branch.c:657 builtin/show-ref.c:178 builtin/tag.c:590
+#: parse-options.h:132 parse-options.h:239
+msgid "n"
+msgstr ""
+
+#: builtin/fmt-merge-msg.c:663
+msgid "populate log with at most <n> entries from shortlog"
+msgstr ""
+
+#: builtin/fmt-merge-msg.c:666
+msgid "alias for --log (deprecated)"
+msgstr ""
+
+#: builtin/fmt-merge-msg.c:669
+msgid "text"
+msgstr ""
+
+#: builtin/fmt-merge-msg.c:670
+msgid "use <text> as start of message"
+msgstr ""
+
+#: builtin/fmt-merge-msg.c:671
+msgid "file to read from"
+msgstr ""
+
+#: builtin/for-each-ref.c:675
+msgid "unable to parse format"
+msgstr ""
+
+#: builtin/for-each-ref.c:1063
+msgid "git for-each-ref [<options>] [<pattern>]"
+msgstr ""
+
+#: builtin/for-each-ref.c:1078
+msgid "quote placeholders suitably for shells"
+msgstr ""
+
+#: builtin/for-each-ref.c:1080
+msgid "quote placeholders suitably for perl"
+msgstr ""
+
+#: builtin/for-each-ref.c:1082
+msgid "quote placeholders suitably for python"
+msgstr ""
+
+#: builtin/for-each-ref.c:1084
+msgid "quote placeholders suitably for Tcl"
+msgstr ""
+
+#: builtin/for-each-ref.c:1087
+msgid "show only <n> matched refs"
+msgstr ""
+
+#: builtin/for-each-ref.c:1088 builtin/replace.c:438
+msgid "format"
+msgstr ""
+
+#: builtin/for-each-ref.c:1088
+msgid "format to use for the output"
+msgstr ""
+
+#: builtin/for-each-ref.c:1089
+msgid "key"
+msgstr ""
+
+#: builtin/for-each-ref.c:1090
+msgid "field name to sort on"
+msgstr ""
+
+#: builtin/fsck.c:147 builtin/prune.c:137
+msgid "Checking connectivity"
+msgstr ""
+
+#: builtin/fsck.c:540
+msgid "Checking object directories"
+msgstr ""
+
+#: builtin/fsck.c:603
+msgid "git fsck [<options>] [<object>...]"
+msgstr ""
+
+#: builtin/fsck.c:609
+msgid "show unreachable objects"
+msgstr ""
+
+#: builtin/fsck.c:610
+msgid "show dangling objects"
+msgstr ""
+
+#: builtin/fsck.c:611
+msgid "report tags"
+msgstr ""
+
+#: builtin/fsck.c:612
+msgid "report root nodes"
+msgstr ""
+
+#: builtin/fsck.c:613
+msgid "make index objects head nodes"
+msgstr ""
+
+#: builtin/fsck.c:614
+msgid "make reflogs head nodes (default)"
+msgstr ""
+
+#: builtin/fsck.c:615
+msgid "also consider packs and alternate objects"
+msgstr ""
+
+#: builtin/fsck.c:616
+msgid "enable more strict checking"
+msgstr ""
+
+#: builtin/fsck.c:618
+msgid "write dangling objects in .git/lost-found"
+msgstr ""
+
+#: builtin/fsck.c:619 builtin/prune.c:108
+msgid "show progress"
+msgstr ""
+
+#: builtin/fsck.c:669
+msgid "Checking objects"
+msgstr ""
+
+#: builtin/gc.c:24
+msgid "git gc [<options>]"
+msgstr ""
+
+#: builtin/gc.c:79
+#, c-format
+msgid "Invalid gc.pruneexpire: '%s'"
+msgstr ""
+
+#: builtin/gc.c:107
+#, c-format
+msgid "insanely long object directory %.*s"
+msgstr ""
+
+#: builtin/gc.c:276
+msgid "prune unreferenced objects"
+msgstr ""
+
+#: builtin/gc.c:278
+msgid "be more thorough (increased runtime)"
+msgstr ""
+
+#: builtin/gc.c:279
+msgid "enable auto-gc mode"
+msgstr ""
+
+#: builtin/gc.c:280
+msgid "force running gc even if there may be another gc running"
+msgstr ""
+
+#: builtin/gc.c:321
+#, c-format
+msgid "Auto packing the repository in background for optimum performance.\n"
+msgstr ""
+
+#: builtin/gc.c:323
+#, c-format
+msgid "Auto packing the repository for optimum performance.\n"
+msgstr ""
+
+#: builtin/gc.c:324
+#, c-format
+msgid "See \"git help gc\" for manual housekeeping.\n"
+msgstr ""
+
+#: builtin/gc.c:342
+#, c-format
+msgid ""
+"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
+msgstr ""
+
+#: builtin/gc.c:364
+msgid ""
+"There are too many unreachable loose objects; run 'git prune' to remove them."
+msgstr ""
+
+#: builtin/grep.c:23
+msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
+msgstr ""
+
+#: builtin/grep.c:218
+#, c-format
+msgid "grep: failed to create thread: %s"
+msgstr ""
+
+#: builtin/grep.c:441 builtin/grep.c:476
+#, c-format
+msgid "unable to read tree (%s)"
+msgstr ""
+
+#: builtin/grep.c:491
+#, c-format
+msgid "unable to grep from object of type %s"
+msgstr ""
+
+#: builtin/grep.c:547
+#, c-format
+msgid "switch `%c' expects a numerical value"
+msgstr ""
+
+#: builtin/grep.c:564
+#, c-format
+msgid "cannot open '%s'"
+msgstr ""
+
+#: builtin/grep.c:638
+msgid "search in index instead of in the work tree"
+msgstr ""
+
+#: builtin/grep.c:640
+msgid "find in contents not managed by git"
+msgstr ""
+
+#: builtin/grep.c:642
+msgid "search in both tracked and untracked files"
+msgstr ""
+
+#: builtin/grep.c:644
+msgid "ignore files specified via '.gitignore'"
+msgstr ""
+
+#: builtin/grep.c:647
+msgid "show non-matching lines"
+msgstr ""
+
+#: builtin/grep.c:649
+msgid "case insensitive matching"
+msgstr ""
+
+#: builtin/grep.c:651
+msgid "match patterns only at word boundaries"
+msgstr ""
+
+#: builtin/grep.c:653
+msgid "process binary files as text"
+msgstr ""
+
+#: builtin/grep.c:655
+msgid "don't match patterns in binary files"
+msgstr ""
+
+#: builtin/grep.c:658
+msgid "process binary files with textconv filters"
+msgstr ""
+
+#: builtin/grep.c:660
+msgid "descend at most <depth> levels"
+msgstr ""
+
+#: builtin/grep.c:664
+msgid "use extended POSIX regular expressions"
+msgstr ""
+
+#: builtin/grep.c:667
+msgid "use basic POSIX regular expressions (default)"
+msgstr ""
+
+#: builtin/grep.c:670
+msgid "interpret patterns as fixed strings"
+msgstr ""
+
+#: builtin/grep.c:673
+msgid "use Perl-compatible regular expressions"
+msgstr ""
+
+#: builtin/grep.c:676
+msgid "show line numbers"
+msgstr ""
+
+#: builtin/grep.c:677
+msgid "don't show filenames"
+msgstr ""
+
+#: builtin/grep.c:678
+msgid "show filenames"
+msgstr ""
+
+#: builtin/grep.c:680
+msgid "show filenames relative to top directory"
+msgstr ""
+
+#: builtin/grep.c:682
+msgid "show only filenames instead of matching lines"
+msgstr ""
+
+#: builtin/grep.c:684
+msgid "synonym for --files-with-matches"
+msgstr ""
+
+#: builtin/grep.c:687
+msgid "show only the names of files without match"
+msgstr ""
+
+#: builtin/grep.c:689
+msgid "print NUL after filenames"
+msgstr ""
+
+#: builtin/grep.c:691
+msgid "show the number of matches instead of matching lines"
+msgstr ""
+
+#: builtin/grep.c:692
+msgid "highlight matches"
+msgstr ""
+
+#: builtin/grep.c:694
+msgid "print empty line between matches from different files"
+msgstr ""
+
+#: builtin/grep.c:696
+msgid "show filename only once above matches from same file"
+msgstr ""
+
+#: builtin/grep.c:699
+msgid "show <n> context lines before and after matches"
+msgstr ""
+
+#: builtin/grep.c:702
+msgid "show <n> context lines before matches"
+msgstr ""
+
+#: builtin/grep.c:704
+msgid "show <n> context lines after matches"
+msgstr ""
+
+#: builtin/grep.c:705
+msgid "shortcut for -C NUM"
+msgstr ""
+
+#: builtin/grep.c:708
+msgid "show a line with the function name before matches"
+msgstr ""
+
+#: builtin/grep.c:710
+msgid "show the surrounding function"
+msgstr ""
+
+#: builtin/grep.c:713
+msgid "read patterns from file"
+msgstr ""
+
+#: builtin/grep.c:715
+msgid "match <pattern>"
+msgstr ""
+
+#: builtin/grep.c:717
+msgid "combine patterns specified with -e"
+msgstr ""
+
+#: builtin/grep.c:729
+msgid "indicate hit with exit status without output"
+msgstr ""
+
+#: builtin/grep.c:731
+msgid "show only matches from files that match all patterns"
+msgstr ""
+
+#: builtin/grep.c:733
+msgid "show parse tree for grep expression"
+msgstr ""
+
+#: builtin/grep.c:737
+msgid "pager"
+msgstr ""
+
+#: builtin/grep.c:737
+msgid "show matching files in the pager"
+msgstr ""
+
+#: builtin/grep.c:740
+msgid "allow calling of grep(1) (ignored by this build)"
+msgstr ""
+
+#: builtin/grep.c:741 builtin/show-ref.c:187
+msgid "show usage"
+msgstr ""
+
+#: builtin/grep.c:808
+msgid "no pattern given."
+msgstr ""
+
+#: builtin/grep.c:866
+msgid "--open-files-in-pager only works on the worktree"
+msgstr ""
+
+#: builtin/grep.c:892
+msgid "--cached or --untracked cannot be used with --no-index."
+msgstr ""
+
+#: builtin/grep.c:897
+msgid "--no-index or --untracked cannot be used with revs."
+msgstr ""
+
+#: builtin/grep.c:900
+msgid "--[no-]exclude-standard cannot be used for tracked contents."
+msgstr ""
+
+#: builtin/grep.c:908
+msgid "both --cached and trees are given."
+msgstr ""
+
+#: builtin/hash-object.c:82
+msgid ""
+"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
+"[--] <file>..."
+msgstr ""
+
+#: builtin/hash-object.c:83
+msgid "git hash-object --stdin-paths < <list-of-paths>"
+msgstr ""
+
+#: builtin/hash-object.c:94 builtin/tag.c:612
+msgid "type"
+msgstr ""
+
+#: builtin/hash-object.c:94
+msgid "object type"
+msgstr ""
+
+#: builtin/hash-object.c:95
+msgid "write the object into the object database"
+msgstr ""
+
+#: builtin/hash-object.c:97
+msgid "read the object from stdin"
+msgstr ""
+
+#: builtin/hash-object.c:99
+msgid "store file as is without filters"
+msgstr ""
+
+#: builtin/hash-object.c:100
+msgid ""
+"just hash any random garbage to create corrupt objects for debugging Git"
+msgstr ""
+
+#: builtin/hash-object.c:101
+msgid "process file as it were from this path"
+msgstr ""
+
+#: builtin/help.c:41
+msgid "print all available commands"
+msgstr ""
+
+#: builtin/help.c:42
+msgid "print list of useful guides"
+msgstr ""
+
+#: builtin/help.c:43
+msgid "show man page"
+msgstr ""
+
+#: builtin/help.c:44
+msgid "show manual in web browser"
+msgstr ""
+
+#: builtin/help.c:46
+msgid "show info page"
+msgstr ""
+
+#: builtin/help.c:52
+msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
+msgstr ""
+
+#: builtin/help.c:64
+#, c-format
+msgid "unrecognized help format '%s'"
+msgstr ""
+
+#: builtin/help.c:91
+msgid "Failed to start emacsclient."
+msgstr ""
+
+#: builtin/help.c:104
+msgid "Failed to parse emacsclient version."
+msgstr ""
+
+#: builtin/help.c:112
+#, c-format
+msgid "emacsclient version '%d' too old (< 22)."
+msgstr ""
+
+#: builtin/help.c:130 builtin/help.c:158 builtin/help.c:167 builtin/help.c:175
+#, c-format
+msgid "failed to exec '%s': %s"
+msgstr ""
+
+#: builtin/help.c:215
+#, c-format
+msgid ""
+"'%s': path for unsupported man viewer.\n"
+"Please consider using 'man.<tool>.cmd' instead."
+msgstr ""
+
+#: builtin/help.c:227
+#, c-format
+msgid ""
+"'%s': cmd for supported man viewer.\n"
+"Please consider using 'man.<tool>.path' instead."
+msgstr ""
+
+#: builtin/help.c:354
+#, c-format
+msgid "'%s': unknown man viewer."
+msgstr ""
+
+#: builtin/help.c:371
+msgid "no man viewer handled the request"
+msgstr ""
+
+#: builtin/help.c:379
+msgid "no info viewer handled the request"
+msgstr ""
+
+#: builtin/help.c:428
+msgid "Defining attributes per path"
+msgstr ""
+
+#: builtin/help.c:429
+msgid "Everyday Git With 20 Commands Or So"
+msgstr ""
+
+#: builtin/help.c:430
+msgid "A Git glossary"
+msgstr ""
+
+#: builtin/help.c:431
+msgid "Specifies intentionally untracked files to ignore"
+msgstr ""
+
+#: builtin/help.c:432
+msgid "Defining submodule properties"
+msgstr ""
+
+#: builtin/help.c:433
+msgid "Specifying revisions and ranges for Git"
+msgstr ""
+
+#: builtin/help.c:434
+msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
+msgstr ""
+
+#: builtin/help.c:435
+msgid "An overview of recommended workflows with Git"
+msgstr ""
+
+#: builtin/help.c:447
+msgid "The common Git guides are:\n"
+msgstr ""
+
+#: builtin/help.c:468 builtin/help.c:485
+#, c-format
+msgid "usage: %s%s"
+msgstr ""
+
+#: builtin/help.c:501
+#, c-format
+msgid "`git %s' is aliased to `%s'"
+msgstr ""
+
+#: builtin/index-pack.c:150
+#, c-format
+msgid "unable to open %s"
+msgstr ""
+
+#: builtin/index-pack.c:200
+#, c-format
+msgid "object type mismatch at %s"
+msgstr ""
+
+#: builtin/index-pack.c:220
+#, c-format
+msgid "did not receive expected object %s"
+msgstr ""
+
+#: builtin/index-pack.c:223
+#, c-format
+msgid "object %s: expected type %s, found %s"
+msgstr ""
+
+#: builtin/index-pack.c:265
+#, c-format
+msgid "cannot fill %d byte"
+msgid_plural "cannot fill %d bytes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/index-pack.c:275
+msgid "early EOF"
+msgstr ""
+
+#: builtin/index-pack.c:276
+msgid "read error on input"
+msgstr ""
+
+#: builtin/index-pack.c:288
+msgid "used more bytes than were available"
+msgstr ""
+
+#: builtin/index-pack.c:295
+msgid "pack too large for current definition of off_t"
+msgstr ""
+
+#: builtin/index-pack.c:311
+#, c-format
+msgid "unable to create '%s'"
+msgstr ""
+
+#: builtin/index-pack.c:316
+#, c-format
+msgid "cannot open packfile '%s'"
+msgstr ""
+
+#: builtin/index-pack.c:330
+msgid "pack signature mismatch"
+msgstr ""
+
+#: builtin/index-pack.c:332
+#, c-format
+msgid "pack version %<PRIu32> unsupported"
+msgstr ""
+
+#: builtin/index-pack.c:350
+#, c-format
+msgid "pack has bad object at offset %lu: %s"
+msgstr ""
+
+#: builtin/index-pack.c:471
+#, c-format
+msgid "inflate returned %d"
+msgstr ""
+
+#: builtin/index-pack.c:520
+msgid "offset value overflow for delta base object"
+msgstr ""
+
+#: builtin/index-pack.c:528
+msgid "delta base offset is out of bound"
+msgstr ""
+
+#: builtin/index-pack.c:536
+#, c-format
+msgid "unknown object type %d"
+msgstr ""
+
+#: builtin/index-pack.c:567
+msgid "cannot pread pack file"
+msgstr ""
+
+#: builtin/index-pack.c:569
+#, c-format
+msgid "premature end of pack file, %lu byte missing"
+msgid_plural "premature end of pack file, %lu bytes missing"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/index-pack.c:595
+msgid "serious inflate inconsistency"
+msgstr ""
+
+#: builtin/index-pack.c:686 builtin/index-pack.c:692 builtin/index-pack.c:715
+#: builtin/index-pack.c:749 builtin/index-pack.c:758
+#, c-format
+msgid "SHA1 COLLISION FOUND WITH %s !"
+msgstr ""
+
+#: builtin/index-pack.c:689 builtin/pack-objects.c:162
+#: builtin/pack-objects.c:254
+#, c-format
+msgid "unable to read %s"
+msgstr ""
+
+#: builtin/index-pack.c:755
+#, c-format
+msgid "cannot read existing object %s"
+msgstr ""
+
+#: builtin/index-pack.c:769
+#, c-format
+msgid "invalid blob object %s"
+msgstr ""
+
+#: builtin/index-pack.c:783
+#, c-format
+msgid "invalid %s"
+msgstr ""
+
+#: builtin/index-pack.c:787
+msgid "Error in object"
+msgstr ""
+
+#: builtin/index-pack.c:789
+#, c-format
+msgid "Not all child objects of %s are reachable"
+msgstr ""
+
+#: builtin/index-pack.c:861 builtin/index-pack.c:890
+msgid "failed to apply delta"
+msgstr ""
+
+#: builtin/index-pack.c:1055
+msgid "Receiving objects"
+msgstr ""
+
+#: builtin/index-pack.c:1055
+msgid "Indexing objects"
+msgstr ""
+
+#: builtin/index-pack.c:1081
+msgid "pack is corrupted (SHA1 mismatch)"
+msgstr ""
+
+#: builtin/index-pack.c:1086
+msgid "cannot fstat packfile"
+msgstr ""
+
+#: builtin/index-pack.c:1089
+msgid "pack has junk at the end"
+msgstr ""
+
+#: builtin/index-pack.c:1100
+msgid "confusion beyond insanity in parse_pack_objects()"
+msgstr ""
+
+#: builtin/index-pack.c:1123
+msgid "Resolving deltas"
+msgstr ""
+
+#: builtin/index-pack.c:1133
+#, c-format
+msgid "unable to create thread: %s"
+msgstr ""
+
+#: builtin/index-pack.c:1175
+msgid "confusion beyond insanity"
+msgstr ""
+
+#: builtin/index-pack.c:1181
+#, c-format
+msgid "completed with %d local objects"
+msgstr ""
+
+#: builtin/index-pack.c:1191
+#, c-format
+msgid "Unexpected tail checksum for %s (disk corruption?)"
+msgstr ""
+
+#: builtin/index-pack.c:1195
+#, c-format
+msgid "pack has %d unresolved delta"
+msgid_plural "pack has %d unresolved deltas"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/index-pack.c:1219
+#, c-format
+msgid "unable to deflate appended object (%d)"
+msgstr ""
+
+#: builtin/index-pack.c:1298
+#, c-format
+msgid "local object %s is corrupt"
+msgstr ""
+
+#: builtin/index-pack.c:1322
+msgid "error while closing pack file"
+msgstr ""
+
+#: builtin/index-pack.c:1335
+#, c-format
+msgid "cannot write keep file '%s'"
+msgstr ""
+
+#: builtin/index-pack.c:1343
+#, c-format
+msgid "cannot close written keep file '%s'"
+msgstr ""
+
+#: builtin/index-pack.c:1356
+msgid "cannot store pack file"
+msgstr ""
+
+#: builtin/index-pack.c:1367
+msgid "cannot store index file"
+msgstr ""
+
+#: builtin/index-pack.c:1400
+#, c-format
+msgid "bad pack.indexversion=%<PRIu32>"
+msgstr ""
+
+#: builtin/index-pack.c:1406
+#, c-format
+msgid "invalid number of threads specified (%d)"
+msgstr ""
+
+#: builtin/index-pack.c:1410 builtin/index-pack.c:1589
+#, c-format
+msgid "no threads support, ignoring %s"
+msgstr ""
+
+#: builtin/index-pack.c:1468
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr ""
-#: builtin/index-pack.c:1397
-#, c-format
-msgid "Cannot open existing pack idx file for '%s'"
+#: builtin/index-pack.c:1470
+#, c-format
+msgid "Cannot open existing pack idx file for '%s'"
+msgstr ""
+
+#: builtin/index-pack.c:1517
+#, c-format
+msgid "non delta: %d object"
+msgid_plural "non delta: %d objects"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/index-pack.c:1524
+#, c-format
+msgid "chain length = %d: %lu object"
+msgid_plural "chain length = %d: %lu objects"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/index-pack.c:1553
+msgid "Cannot come back to cwd"
+msgstr ""
+
+#: builtin/index-pack.c:1601 builtin/index-pack.c:1604
+#: builtin/index-pack.c:1616 builtin/index-pack.c:1620
+#, c-format
+msgid "bad %s"
+msgstr ""
+
+#: builtin/index-pack.c:1634
+msgid "--fix-thin cannot be used without --stdin"
+msgstr ""
+
+#: builtin/index-pack.c:1638 builtin/index-pack.c:1647
+#, c-format
+msgid "packfile name '%s' does not end with '.pack'"
+msgstr ""
+
+#: builtin/index-pack.c:1655
+msgid "--verify with no packfile name given"
+msgstr ""
+
+#: builtin/init-db.c:35
+#, c-format
+msgid "Could not make %s writable by group"
+msgstr ""
+
+#: builtin/init-db.c:62
+#, c-format
+msgid "insanely long template name %s"
+msgstr ""
+
+#: builtin/init-db.c:67
+#, c-format
+msgid "cannot stat '%s'"
+msgstr ""
+
+#: builtin/init-db.c:73
+#, c-format
+msgid "cannot stat template '%s'"
+msgstr ""
+
+#: builtin/init-db.c:80
+#, c-format
+msgid "cannot opendir '%s'"
+msgstr ""
+
+#: builtin/init-db.c:97
+#, c-format
+msgid "cannot readlink '%s'"
+msgstr ""
+
+#: builtin/init-db.c:99
+#, c-format
+msgid "insanely long symlink %s"
+msgstr ""
+
+#: builtin/init-db.c:102
+#, c-format
+msgid "cannot symlink '%s' '%s'"
+msgstr ""
+
+#: builtin/init-db.c:106
+#, c-format
+msgid "cannot copy '%s' to '%s'"
+msgstr ""
+
+#: builtin/init-db.c:110
+#, c-format
+msgid "ignoring template %s"
+msgstr ""
+
+#: builtin/init-db.c:136
+#, c-format
+msgid "insanely long template path %s"
+msgstr ""
+
+#: builtin/init-db.c:144
+#, c-format
+msgid "templates not found %s"
+msgstr ""
+
+#: builtin/init-db.c:157
+#, c-format
+msgid "not copying templates of a wrong format version %d from '%s'"
+msgstr ""
+
+#: builtin/init-db.c:197
+#, c-format
+msgid "insane git directory %s"
+msgstr ""
+
+#: builtin/init-db.c:331 builtin/init-db.c:334
+#, c-format
+msgid "%s already exists"
+msgstr ""
+
+#: builtin/init-db.c:363
+#, c-format
+msgid "unable to handle file type %d"
+msgstr ""
+
+#: builtin/init-db.c:366
+#, c-format
+msgid "unable to move %s to %s"
+msgstr ""
+
+#. TRANSLATORS: The first '%s' is either "Reinitialized
+#. existing" or "Initialized empty", the second " shared" or
+#. "", and the last '%s%s' is the verbatim directory name.
+#: builtin/init-db.c:426
+#, c-format
+msgid "%s%s Git repository in %s%s\n"
+msgstr ""
+
+#: builtin/init-db.c:427
+msgid "Reinitialized existing"
+msgstr ""
+
+#: builtin/init-db.c:427
+msgid "Initialized empty"
+msgstr ""
+
+#: builtin/init-db.c:428
+msgid " shared"
+msgstr ""
+
+#: builtin/init-db.c:475
+msgid ""
+"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
+"shared[=<permissions>]] [<directory>]"
+msgstr ""
+
+#: builtin/init-db.c:498
+msgid "permissions"
+msgstr ""
+
+#: builtin/init-db.c:499
+msgid "specify that the git repository is to be shared amongst several users"
+msgstr ""
+
+#: builtin/init-db.c:501 builtin/prune-packed.c:57 builtin/repack.c:171
+msgid "be quiet"
+msgstr ""
+
+#: builtin/init-db.c:533 builtin/init-db.c:538
+#, c-format
+msgid "cannot mkdir %s"
+msgstr ""
+
+#: builtin/init-db.c:542
+#, c-format
+msgid "cannot chdir to %s"
+msgstr ""
+
+#: builtin/init-db.c:563
+#, c-format
+msgid ""
+"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
+"dir=<directory>)"
+msgstr ""
+
+#: builtin/init-db.c:591
+#, c-format
+msgid "Cannot access work tree '%s'"
+msgstr ""
+
+#: builtin/interpret-trailers.c:15
+msgid ""
+"git interpret-trailers [--trim-empty] [(--trailer <token>[(=|:)<value>])...] "
+"[<file>...]"
+msgstr ""
+
+#: builtin/interpret-trailers.c:25
+msgid "trim empty trailers"
+msgstr ""
+
+#: builtin/interpret-trailers.c:26
+msgid "trailer"
+msgstr ""
+
+#: builtin/interpret-trailers.c:27
+msgid "trailer(s) to add"
+msgstr ""
+
+#: builtin/log.c:41
+msgid "git log [<options>] [<revision range>] [[--] <path>...]"
+msgstr ""
+
+#: builtin/log.c:42
+msgid "git show [<options>] <object>..."
+msgstr ""
+
+#: builtin/log.c:81
+#, c-format
+msgid "invalid --decorate option: %s"
+msgstr ""
+
+#: builtin/log.c:127
+msgid "suppress diff output"
+msgstr ""
+
+#: builtin/log.c:128
+msgid "show source"
+msgstr ""
+
+#: builtin/log.c:129
+msgid "Use mail map file"
+msgstr ""
+
+#: builtin/log.c:130
+msgid "decorate options"
+msgstr ""
+
+#: builtin/log.c:133
+msgid "Process line range n,m in file, counting from 1"
+msgstr ""
+
+#: builtin/log.c:229
+#, c-format
+msgid "Final output: %d %s\n"
+msgstr ""
+
+#: builtin/log.c:458
+#, c-format
+msgid "git show %s: bad file"
+msgstr ""
+
+#: builtin/log.c:472 builtin/log.c:564
+#, c-format
+msgid "Could not read object %s"
+msgstr ""
+
+#: builtin/log.c:588
+#, c-format
+msgid "Unknown type: %d"
+msgstr ""
+
+#: builtin/log.c:689
+msgid "format.headers without value"
+msgstr ""
+
+#: builtin/log.c:773
+msgid "name of output directory is too long"
+msgstr ""
+
+#: builtin/log.c:789
+#, c-format
+msgid "Cannot open patch file %s"
+msgstr ""
+
+#: builtin/log.c:803
+msgid "Need exactly one range."
+msgstr ""
+
+#: builtin/log.c:811
+msgid "Not a range."
+msgstr ""
+
+#: builtin/log.c:919
+msgid "Cover letter needs email format"
+msgstr ""
+
+#: builtin/log.c:998
+#, c-format
+msgid "insane in-reply-to: %s"
+msgstr ""
+
+#: builtin/log.c:1026
+msgid "git format-patch [<options>] [<since> | <revision-range>]"
+msgstr ""
+
+#: builtin/log.c:1071
+msgid "Two output directories?"
+msgstr ""
+
+#: builtin/log.c:1186
+msgid "use [PATCH n/m] even with a single patch"
+msgstr ""
+
+#: builtin/log.c:1189
+msgid "use [PATCH] even with multiple patches"
+msgstr ""
+
+#: builtin/log.c:1193
+msgid "print patches to standard out"
+msgstr ""
+
+#: builtin/log.c:1195
+msgid "generate a cover letter"
+msgstr ""
+
+#: builtin/log.c:1197
+msgid "use simple number sequence for output file names"
+msgstr ""
+
+#: builtin/log.c:1198
+msgid "sfx"
+msgstr ""
+
+#: builtin/log.c:1199
+msgid "use <sfx> instead of '.patch'"
+msgstr ""
+
+#: builtin/log.c:1201
+msgid "start numbering patches at <n> instead of 1"
+msgstr ""
+
+#: builtin/log.c:1203
+msgid "mark the series as Nth re-roll"
+msgstr ""
+
+#: builtin/log.c:1205
+msgid "Use [<prefix>] instead of [PATCH]"
+msgstr ""
+
+#: builtin/log.c:1208
+msgid "store resulting files in <dir>"
+msgstr ""
+
+#: builtin/log.c:1211
+msgid "don't strip/add [PATCH]"
+msgstr ""
+
+#: builtin/log.c:1214
+msgid "don't output binary diffs"
+msgstr ""
+
+#: builtin/log.c:1216
+msgid "don't include a patch matching a commit upstream"
+msgstr ""
+
+#: builtin/log.c:1218
+msgid "show patch format instead of default (patch + stat)"
+msgstr ""
+
+#: builtin/log.c:1220
+msgid "Messaging"
+msgstr ""
+
+#: builtin/log.c:1221
+msgid "header"
+msgstr ""
+
+#: builtin/log.c:1222
+msgid "add email header"
+msgstr ""
+
+#: builtin/log.c:1223 builtin/log.c:1225
+msgid "email"
+msgstr ""
+
+#: builtin/log.c:1223
+msgid "add To: header"
+msgstr ""
+
+#: builtin/log.c:1225
+msgid "add Cc: header"
+msgstr ""
+
+#: builtin/log.c:1227
+msgid "ident"
+msgstr ""
+
+#: builtin/log.c:1228
+msgid "set From address to <ident> (or committer ident if absent)"
+msgstr ""
+
+#: builtin/log.c:1230
+msgid "message-id"
+msgstr ""
+
+#: builtin/log.c:1231
+msgid "make first mail a reply to <message-id>"
+msgstr ""
+
+#: builtin/log.c:1232 builtin/log.c:1235
+msgid "boundary"
+msgstr ""
+
+#: builtin/log.c:1233
+msgid "attach the patch"
+msgstr ""
+
+#: builtin/log.c:1236
+msgid "inline the patch"
+msgstr ""
+
+#: builtin/log.c:1240
+msgid "enable message threading, styles: shallow, deep"
+msgstr ""
+
+#: builtin/log.c:1242
+msgid "signature"
+msgstr ""
+
+#: builtin/log.c:1243
+msgid "add a signature"
+msgstr ""
+
+#: builtin/log.c:1245
+msgid "add a signature from a file"
+msgstr ""
+
+#: builtin/log.c:1246
+msgid "don't print the patch filenames"
+msgstr ""
+
+#: builtin/log.c:1320
+#, c-format
+msgid "invalid ident line: %s"
+msgstr ""
+
+#: builtin/log.c:1335
+msgid "-n and -k are mutually exclusive."
+msgstr ""
+
+#: builtin/log.c:1337
+msgid "--subject-prefix and -k are mutually exclusive."
+msgstr ""
+
+#: builtin/log.c:1345
+msgid "--name-only does not make sense"
+msgstr ""
+
+#: builtin/log.c:1347
+msgid "--name-status does not make sense"
+msgstr ""
+
+#: builtin/log.c:1349
+msgid "--check does not make sense"
+msgstr ""
+
+#: builtin/log.c:1372
+msgid "standard output, or directory, which one?"
+msgstr ""
+
+#: builtin/log.c:1374
+#, c-format
+msgid "Could not create directory '%s'"
+msgstr ""
+
+#: builtin/log.c:1472
+#, c-format
+msgid "unable to read signature file '%s'"
+msgstr ""
+
+#: builtin/log.c:1535
+msgid "Failed to create output files"
+msgstr ""
+
+#: builtin/log.c:1583
+msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
+msgstr ""
+
+#: builtin/log.c:1638
+#, c-format
+msgid ""
+"Could not find a tracked remote branch, please specify <upstream> manually.\n"
+msgstr ""
+
+#: builtin/log.c:1651 builtin/log.c:1653 builtin/log.c:1665
+#, c-format
+msgid "Unknown commit %s"
+msgstr ""
+
+#: builtin/ls-files.c:358
+msgid "git ls-files [<options>] [<file>...]"
+msgstr ""
+
+#: builtin/ls-files.c:415
+msgid "identify the file status with tags"
+msgstr ""
+
+#: builtin/ls-files.c:417
+msgid "use lowercase letters for 'assume unchanged' files"
+msgstr ""
+
+#: builtin/ls-files.c:419
+msgid "show cached files in the output (default)"
+msgstr ""
+
+#: builtin/ls-files.c:421
+msgid "show deleted files in the output"
+msgstr ""
+
+#: builtin/ls-files.c:423
+msgid "show modified files in the output"
+msgstr ""
+
+#: builtin/ls-files.c:425
+msgid "show other files in the output"
+msgstr ""
+
+#: builtin/ls-files.c:427
+msgid "show ignored files in the output"
+msgstr ""
+
+#: builtin/ls-files.c:430
+msgid "show staged contents' object name in the output"
+msgstr ""
+
+#: builtin/ls-files.c:432
+msgid "show files on the filesystem that need to be removed"
+msgstr ""
+
+#: builtin/ls-files.c:434
+msgid "show 'other' directories' names only"
+msgstr ""
+
+#: builtin/ls-files.c:437
+msgid "don't show empty directories"
+msgstr ""
+
+#: builtin/ls-files.c:440
+msgid "show unmerged files in the output"
+msgstr ""
+
+#: builtin/ls-files.c:442
+msgid "show resolve-undo information"
+msgstr ""
+
+#: builtin/ls-files.c:444
+msgid "skip files matching pattern"
+msgstr ""
+
+#: builtin/ls-files.c:447
+msgid "exclude patterns are read from <file>"
+msgstr ""
+
+#: builtin/ls-files.c:450
+msgid "read additional per-directory exclude patterns in <file>"
+msgstr ""
+
+#: builtin/ls-files.c:452
+msgid "add the standard git exclusions"
+msgstr ""
+
+#: builtin/ls-files.c:455
+msgid "make the output relative to the project top directory"
+msgstr ""
+
+#: builtin/ls-files.c:458
+msgid "if any <file> is not in the index, treat this as an error"
+msgstr ""
+
+#: builtin/ls-files.c:459
+msgid "tree-ish"
+msgstr ""
+
+#: builtin/ls-files.c:460
+msgid "pretend that paths removed since <tree-ish> are still present"
+msgstr ""
+
+#: builtin/ls-files.c:462
+msgid "show debugging data"
+msgstr ""
+
+#: builtin/ls-tree.c:28
+msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
+msgstr ""
+
+#: builtin/ls-tree.c:127
+msgid "only show trees"
+msgstr ""
+
+#: builtin/ls-tree.c:129
+msgid "recurse into subtrees"
+msgstr ""
+
+#: builtin/ls-tree.c:131
+msgid "show trees when recursing"
+msgstr ""
+
+#: builtin/ls-tree.c:134
+msgid "terminate entries with NUL byte"
+msgstr ""
+
+#: builtin/ls-tree.c:135
+msgid "include object size"
+msgstr ""
+
+#: builtin/ls-tree.c:137 builtin/ls-tree.c:139
+msgid "list only filenames"
+msgstr ""
+
+#: builtin/ls-tree.c:142
+msgid "use full path names"
+msgstr ""
+
+#: builtin/ls-tree.c:144
+msgid "list entire tree; not just current directory (implies --full-name)"
+msgstr ""
+
+#: builtin/merge.c:45
+msgid "git merge [<options>] [<commit>...]"
+msgstr ""
+
+#: builtin/merge.c:46
+msgid "git merge [<options>] <msg> HEAD <commit>"
+msgstr ""
+
+#: builtin/merge.c:47
+msgid "git merge --abort"
+msgstr ""
+
+#: builtin/merge.c:100
+msgid "switch `m' requires a value"
+msgstr ""
+
+#: builtin/merge.c:137
+#, c-format
+msgid "Could not find merge strategy '%s'.\n"
+msgstr ""
+
+#: builtin/merge.c:138
+#, c-format
+msgid "Available strategies are:"
+msgstr ""
+
+#: builtin/merge.c:143
+#, c-format
+msgid "Available custom strategies are:"
+msgstr ""
+
+#: builtin/merge.c:193
+msgid "do not show a diffstat at the end of the merge"
+msgstr ""
+
+#: builtin/merge.c:196
+msgid "show a diffstat at the end of the merge"
+msgstr ""
+
+#: builtin/merge.c:197
+msgid "(synonym to --stat)"
+msgstr ""
+
+#: builtin/merge.c:199
+msgid "add (at most <n>) entries from shortlog to merge commit message"
+msgstr ""
+
+#: builtin/merge.c:202
+msgid "create a single commit instead of doing a merge"
+msgstr ""
+
+#: builtin/merge.c:204
+msgid "perform a commit if the merge succeeds (default)"
+msgstr ""
+
+#: builtin/merge.c:206
+msgid "edit message before committing"
+msgstr ""
+
+#: builtin/merge.c:207
+msgid "allow fast-forward (default)"
+msgstr ""
+
+#: builtin/merge.c:209
+msgid "abort if fast-forward is not possible"
+msgstr ""
+
+#: builtin/merge.c:213
+msgid "Verify that the named commit has a valid GPG signature"
+msgstr ""
+
+#: builtin/merge.c:214 builtin/notes.c:753 builtin/revert.c:89
+msgid "strategy"
+msgstr ""
+
+#: builtin/merge.c:215
+msgid "merge strategy to use"
+msgstr ""
+
+#: builtin/merge.c:216
+msgid "option=value"
+msgstr ""
+
+#: builtin/merge.c:217
+msgid "option for selected merge strategy"
+msgstr ""
+
+#: builtin/merge.c:219
+msgid "merge commit message (for a non-fast-forward merge)"
+msgstr ""
+
+#: builtin/merge.c:223
+msgid "abort the current in-progress merge"
+msgstr ""
+
+#: builtin/merge.c:251
+msgid "could not run stash."
+msgstr ""
+
+#: builtin/merge.c:256
+msgid "stash failed"
+msgstr ""
+
+#: builtin/merge.c:261
+#, c-format
+msgid "not a valid object: %s"
+msgstr ""
+
+#: builtin/merge.c:280 builtin/merge.c:297
+msgid "read-tree failed"
+msgstr ""
+
+#: builtin/merge.c:327
+msgid " (nothing to squash)"
+msgstr ""
+
+#: builtin/merge.c:340
+#, c-format
+msgid "Squash commit -- not updating HEAD\n"
+msgstr ""
+
+#: builtin/merge.c:372
+msgid "Writing SQUASH_MSG"
+msgstr ""
+
+#: builtin/merge.c:374
+msgid "Finishing SQUASH_MSG"
+msgstr ""
+
+#: builtin/merge.c:397
+#, c-format
+msgid "No merge message -- not updating HEAD\n"
+msgstr ""
+
+#: builtin/merge.c:447
+#, c-format
+msgid "'%s' does not point to a commit"
+msgstr ""
+
+#: builtin/merge.c:559
+#, c-format
+msgid "Bad branch.%s.mergeoptions string: %s"
+msgstr ""
+
+#: builtin/merge.c:654
+msgid "git write-tree failed to write a tree"
+msgstr ""
+
+#: builtin/merge.c:678
+msgid "Not handling anything other than two heads merge."
+msgstr ""
+
+#: builtin/merge.c:692
+#, c-format
+msgid "Unknown option for merge-recursive: -X%s"
+msgstr ""
+
+#: builtin/merge.c:705
+#, c-format
+msgid "unable to write %s"
+msgstr ""
+
+#: builtin/merge.c:794
+#, c-format
+msgid "Could not read from '%s'"
+msgstr ""
+
+#: builtin/merge.c:803
+#, c-format
+msgid "Not committing merge; use 'git commit' to complete the merge.\n"
+msgstr ""
+
+#: builtin/merge.c:809
+#, c-format
+msgid ""
+"Please enter a commit message to explain why this merge is necessary,\n"
+"especially if it merges an updated upstream into a topic branch.\n"
+"\n"
+"Lines starting with '%c' will be ignored, and an empty message aborts\n"
+"the commit.\n"
+msgstr ""
+
+#: builtin/merge.c:833
+msgid "Empty commit message."
+msgstr ""
+
+#: builtin/merge.c:845
+#, c-format
+msgid "Wonderful.\n"
+msgstr ""
+
+#: builtin/merge.c:900
+#, c-format
+msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
+msgstr ""
+
+#: builtin/merge.c:916
+#, c-format
+msgid "'%s' is not a commit"
+msgstr ""
+
+#: builtin/merge.c:957
+msgid "No current branch."
+msgstr ""
+
+#: builtin/merge.c:959
+msgid "No remote for the current branch."
+msgstr ""
+
+#: builtin/merge.c:961
+msgid "No default upstream defined for the current branch."
+msgstr ""
+
+#: builtin/merge.c:966
+#, c-format
+msgid "No remote-tracking branch for %s from %s"
+msgstr ""
+
+#: builtin/merge.c:1122
+msgid "There is no merge to abort (MERGE_HEAD missing)."
+msgstr ""
+
+#: builtin/merge.c:1138
+msgid ""
+"You have not concluded your merge (MERGE_HEAD exists).\n"
+"Please, commit your changes before you merge."
+msgstr ""
+
+#: builtin/merge.c:1141 git-pull.sh:34
+msgid "You have not concluded your merge (MERGE_HEAD exists)."
+msgstr ""
+
+#: builtin/merge.c:1145
+msgid ""
+"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
+"Please, commit your changes before you merge."
+msgstr ""
+
+#: builtin/merge.c:1148
+msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
+msgstr ""
+
+#: builtin/merge.c:1157
+msgid "You cannot combine --squash with --no-ff."
+msgstr ""
+
+#: builtin/merge.c:1166
+msgid "No commit specified and merge.defaultToUpstream not set."
+msgstr ""
+
+#: builtin/merge.c:1198
+msgid "Can merge only exactly one commit into empty head"
+msgstr ""
+
+#: builtin/merge.c:1201
+msgid "Squash commit into empty head not supported yet"
+msgstr ""
+
+#: builtin/merge.c:1203
+msgid "Non-fast-forward commit does not make sense into an empty head"
+msgstr ""
+
+#: builtin/merge.c:1208
+#, c-format
+msgid "%s - not something we can merge"
+msgstr ""
+
+#: builtin/merge.c:1259
+#, c-format
+msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
+msgstr ""
+
+#: builtin/merge.c:1262
+#, c-format
+msgid "Commit %s has a bad GPG signature allegedly by %s."
+msgstr ""
+
+#: builtin/merge.c:1265
+#, c-format
+msgid "Commit %s does not have a GPG signature."
+msgstr ""
+
+#: builtin/merge.c:1268
+#, c-format
+msgid "Commit %s has a good GPG signature by %s\n"
+msgstr ""
+
+#: builtin/merge.c:1349
+#, c-format
+msgid "Updating %s..%s\n"
+msgstr ""
+
+#: builtin/merge.c:1388
+#, c-format
+msgid "Trying really trivial in-index merge...\n"
+msgstr ""
+
+#: builtin/merge.c:1395
+#, c-format
+msgid "Nope.\n"
+msgstr ""
+
+#: builtin/merge.c:1427
+msgid "Not possible to fast-forward, aborting."
+msgstr ""
+
+#: builtin/merge.c:1450 builtin/merge.c:1529
+#, c-format
+msgid "Rewinding the tree to pristine...\n"
+msgstr ""
+
+#: builtin/merge.c:1454
+#, c-format
+msgid "Trying merge strategy %s...\n"
+msgstr ""
+
+#: builtin/merge.c:1520
+#, c-format
+msgid "No merge strategy handled the merge.\n"
+msgstr ""
+
+#: builtin/merge.c:1522
+#, c-format
+msgid "Merge with strategy %s failed.\n"
+msgstr ""
+
+#: builtin/merge.c:1531
+#, c-format
+msgid "Using the %s to prepare resolving by hand.\n"
+msgstr ""
+
+#: builtin/merge.c:1543
+#, c-format
+msgid "Automatic merge went well; stopped before committing as requested\n"
+msgstr ""
+
+#: builtin/merge-base.c:29
+msgid "git merge-base [-a | --all] <commit> <commit>..."
+msgstr ""
+
+#: builtin/merge-base.c:30
+msgid "git merge-base [-a | --all] --octopus <commit>..."
+msgstr ""
+
+#: builtin/merge-base.c:31
+msgid "git merge-base --independent <commit>..."
+msgstr ""
+
+#: builtin/merge-base.c:32
+msgid "git merge-base --is-ancestor <commit> <commit>"
+msgstr ""
+
+#: builtin/merge-base.c:33
+msgid "git merge-base --fork-point <ref> [<commit>]"
+msgstr ""
+
+#: builtin/merge-base.c:214
+msgid "output all common ancestors"
+msgstr ""
+
+#: builtin/merge-base.c:216
+msgid "find ancestors for a single n-way merge"
+msgstr ""
+
+#: builtin/merge-base.c:218
+msgid "list revs not reachable from others"
+msgstr ""
+
+#: builtin/merge-base.c:220
+msgid "is the first one ancestor of the other?"
+msgstr ""
+
+#: builtin/merge-base.c:222
+msgid "find where <commit> forked from reflog of <ref>"
+msgstr ""
+
+#: builtin/merge-file.c:8
+msgid ""
+"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
+"<orig-file> <file2>"
+msgstr ""
+
+#: builtin/merge-file.c:33
+msgid "send results to standard output"
+msgstr ""
+
+#: builtin/merge-file.c:34
+msgid "use a diff3 based merge"
+msgstr ""
+
+#: builtin/merge-file.c:35
+msgid "for conflicts, use our version"
+msgstr ""
+
+#: builtin/merge-file.c:37
+msgid "for conflicts, use their version"
+msgstr ""
+
+#: builtin/merge-file.c:39
+msgid "for conflicts, use a union version"
+msgstr ""
+
+#: builtin/merge-file.c:42
+msgid "for conflicts, use this marker size"
+msgstr ""
+
+#: builtin/merge-file.c:43
+msgid "do not warn about conflicts"
+msgstr ""
+
+#: builtin/merge-file.c:45
+msgid "set labels for file1/orig-file/file2"
+msgstr ""
+
+#: builtin/mktree.c:64
+msgid "git mktree [-z] [--missing] [--batch]"
+msgstr ""
+
+#: builtin/mktree.c:150
+msgid "input is NUL terminated"
+msgstr ""
+
+#: builtin/mktree.c:151 builtin/write-tree.c:24
+msgid "allow missing objects"
+msgstr ""
+
+#: builtin/mktree.c:152
+msgid "allow creation of more than one tree"
+msgstr ""
+
+#: builtin/mv.c:15
+msgid "git mv [<options>] <source>... <destination>"
+msgstr ""
+
+#: builtin/mv.c:69
+#, c-format
+msgid "Directory %s is in index and no submodule?"
+msgstr ""
+
+#: builtin/mv.c:71
+msgid "Please stage your changes to .gitmodules or stash them to proceed"
+msgstr ""
+
+#: builtin/mv.c:89
+#, c-format
+msgid "%.*s is in index"
+msgstr ""
+
+#: builtin/mv.c:111
+msgid "force move/rename even if target exists"
+msgstr ""
+
+#: builtin/mv.c:112
+msgid "skip move/rename errors"
+msgstr ""
+
+#: builtin/mv.c:151
+#, c-format
+msgid "destination '%s' is not a directory"
+msgstr ""
+
+#: builtin/mv.c:162
+#, c-format
+msgid "Checking rename of '%s' to '%s'\n"
+msgstr ""
+
+#: builtin/mv.c:166
+msgid "bad source"
+msgstr ""
+
+#: builtin/mv.c:169
+msgid "can not move directory into itself"
+msgstr ""
+
+#: builtin/mv.c:172
+msgid "cannot move directory over file"
+msgstr ""
+
+#: builtin/mv.c:181
+msgid "source directory is empty"
+msgstr ""
+
+#: builtin/mv.c:206
+msgid "not under version control"
+msgstr ""
+
+#: builtin/mv.c:209
+msgid "destination exists"
+msgstr ""
+
+#: builtin/mv.c:217
+#, c-format
+msgid "overwriting '%s'"
+msgstr ""
+
+#: builtin/mv.c:220
+msgid "Cannot overwrite"
+msgstr ""
+
+#: builtin/mv.c:223
+msgid "multiple sources for the same target"
+msgstr ""
+
+#: builtin/mv.c:225
+msgid "destination directory does not exist"
+msgstr ""
+
+#: builtin/mv.c:232
+#, c-format
+msgid "%s, source=%s, destination=%s"
+msgstr ""
+
+#: builtin/mv.c:253
+#, c-format
+msgid "Renaming %s to %s\n"
+msgstr ""
+
+#: builtin/mv.c:256 builtin/remote.c:728 builtin/repack.c:359
+#, c-format
+msgid "renaming '%s' failed"
+msgstr ""
+
+#: builtin/name-rev.c:255
+msgid "git name-rev [<options>] <commit>..."
+msgstr ""
+
+#: builtin/name-rev.c:256
+msgid "git name-rev [<options>] --all"
+msgstr ""
+
+#: builtin/name-rev.c:257
+msgid "git name-rev [<options>] --stdin"
+msgstr ""
+
+#: builtin/name-rev.c:309
+msgid "print only names (no SHA-1)"
+msgstr ""
+
+#: builtin/name-rev.c:310
+msgid "only use tags to name the commits"
+msgstr ""
+
+#: builtin/name-rev.c:312
+msgid "only use refs matching <pattern>"
+msgstr ""
+
+#: builtin/name-rev.c:314
+msgid "list all commits reachable from all refs"
+msgstr ""
+
+#: builtin/name-rev.c:315
+msgid "read from stdin"
+msgstr ""
+
+#: builtin/name-rev.c:316
+msgid "allow to print `undefined` names (default)"
+msgstr ""
+
+#: builtin/name-rev.c:322
+msgid "dereference tags in the input (internal use)"
+msgstr ""
+
+#: builtin/notes.c:24
+msgid "git notes [--ref <notes-ref>] [list [<object>]]"
+msgstr ""
+
+#: builtin/notes.c:25
+msgid ""
+"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
+"| (-c | -C) <object>] [<object>]"
+msgstr ""
+
+#: builtin/notes.c:26
+msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
+msgstr ""
+
+#: builtin/notes.c:27
+msgid ""
+"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
+"(-c | -C) <object>] [<object>]"
+msgstr ""
+
+#: builtin/notes.c:28
+msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
+msgstr ""
+
+#: builtin/notes.c:29
+msgid "git notes [--ref <notes-ref>] show [<object>]"
+msgstr ""
+
+#: builtin/notes.c:30
+msgid ""
+"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
+msgstr ""
+
+#: builtin/notes.c:31
+msgid "git notes merge --commit [-v | -q]"
+msgstr ""
+
+#: builtin/notes.c:32
+msgid "git notes merge --abort [-v | -q]"
+msgstr ""
+
+#: builtin/notes.c:33
+msgid "git notes [--ref <notes-ref>] remove [<object>...]"
+msgstr ""
+
+#: builtin/notes.c:34
+msgid "git notes [--ref <notes-ref>] prune [-n | -v]"
+msgstr ""
+
+#: builtin/notes.c:35
+msgid "git notes [--ref <notes-ref>] get-ref"
+msgstr ""
+
+#: builtin/notes.c:40
+msgid "git notes [list [<object>]]"
+msgstr ""
+
+#: builtin/notes.c:45
+msgid "git notes add [<options>] [<object>]"
+msgstr ""
+
+#: builtin/notes.c:50
+msgid "git notes copy [<options>] <from-object> <to-object>"
+msgstr ""
+
+#: builtin/notes.c:51
+msgid "git notes copy --stdin [<from-object> <to-object>]..."
+msgstr ""
+
+#: builtin/notes.c:56
+msgid "git notes append [<options>] [<object>]"
+msgstr ""
+
+#: builtin/notes.c:61
+msgid "git notes edit [<object>]"
+msgstr ""
+
+#: builtin/notes.c:66
+msgid "git notes show [<object>]"
+msgstr ""
+
+#: builtin/notes.c:71
+msgid "git notes merge [<options>] <notes-ref>"
+msgstr ""
+
+#: builtin/notes.c:72
+msgid "git notes merge --commit [<options>]"
+msgstr ""
+
+#: builtin/notes.c:73
+msgid "git notes merge --abort [<options>]"
+msgstr ""
+
+#: builtin/notes.c:78
+msgid "git notes remove [<object>]"
+msgstr ""
+
+#: builtin/notes.c:83
+msgid "git notes prune [<options>]"
+msgstr ""
+
+#: builtin/notes.c:88
+msgid "git notes get-ref"
+msgstr ""
+
+#: builtin/notes.c:146
+#, c-format
+msgid "unable to start 'show' for object '%s'"
+msgstr ""
+
+#: builtin/notes.c:150
+msgid "could not read 'show' output"
+msgstr ""
+
+#: builtin/notes.c:158
+#, c-format
+msgid "failed to finish 'show' for object '%s'"
+msgstr ""
+
+#: builtin/notes.c:173 builtin/tag.c:477
+#, c-format
+msgid "could not create file '%s'"
+msgstr ""
+
+#: builtin/notes.c:192
+msgid "Please supply the note contents using either -m or -F option"
+msgstr ""
+
+#: builtin/notes.c:201
+msgid "unable to write note object"
+msgstr ""
+
+#: builtin/notes.c:203
+#, c-format
+msgid "The note contents have been left in %s"
+msgstr ""
+
+#: builtin/notes.c:231 builtin/tag.c:693
+#, c-format
+msgid "cannot read '%s'"
+msgstr ""
+
+#: builtin/notes.c:233 builtin/tag.c:696
+#, c-format
+msgid "could not open or read '%s'"
+msgstr ""
+
+#: builtin/notes.c:252 builtin/notes.c:303 builtin/notes.c:305
+#: builtin/notes.c:365 builtin/notes.c:420 builtin/notes.c:506
+#: builtin/notes.c:511 builtin/notes.c:589 builtin/notes.c:652
+#: builtin/notes.c:854 builtin/tag.c:709
+#, c-format
+msgid "Failed to resolve '%s' as a valid ref."
+msgstr ""
+
+#: builtin/notes.c:255
+#, c-format
+msgid "Failed to read object '%s'."
+msgstr ""
+
+#: builtin/notes.c:259
+#, c-format
+msgid "Cannot read note data from non-blob object '%s'."
+msgstr ""
+
+#: builtin/notes.c:299
+#, c-format
+msgid "Malformed input line: '%s'."
+msgstr ""
+
+#: builtin/notes.c:314
+#, c-format
+msgid "Failed to copy notes from '%s' to '%s'"
+msgstr ""
+
+#: builtin/notes.c:358 builtin/notes.c:413 builtin/notes.c:489
+#: builtin/notes.c:501 builtin/notes.c:577 builtin/notes.c:645
+#: builtin/notes.c:919
+msgid "too many parameters"
+msgstr ""
+
+#: builtin/notes.c:371 builtin/notes.c:658
+#, c-format
+msgid "No note found for object %s."
+msgstr ""
+
+#: builtin/notes.c:392 builtin/notes.c:555
+msgid "note contents as a string"
+msgstr ""
+
+#: builtin/notes.c:395 builtin/notes.c:558
+msgid "note contents in a file"
+msgstr ""
+
+#: builtin/notes.c:397 builtin/notes.c:400 builtin/notes.c:560
+#: builtin/notes.c:563 builtin/tag.c:628
+msgid "object"
+msgstr ""
+
+#: builtin/notes.c:398 builtin/notes.c:561
+msgid "reuse and edit specified note object"
+msgstr ""
+
+#: builtin/notes.c:401 builtin/notes.c:564
+msgid "reuse specified note object"
+msgstr ""
+
+#: builtin/notes.c:404 builtin/notes.c:567
+msgid "allow storing empty note"
+msgstr ""
+
+#: builtin/notes.c:405 builtin/notes.c:476
+msgid "replace existing notes"
+msgstr ""
+
+#: builtin/notes.c:430
+#, c-format
+msgid ""
+"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
+"existing notes"
+msgstr ""
+
+#: builtin/notes.c:445 builtin/notes.c:524
+#, c-format
+msgid "Overwriting existing notes for object %s\n"
+msgstr ""
+
+#: builtin/notes.c:456 builtin/notes.c:617 builtin/notes.c:859
+#, c-format
+msgid "Removing note for object %s\n"
+msgstr ""
+
+#: builtin/notes.c:477
+msgid "read objects from stdin"
+msgstr ""
+
+#: builtin/notes.c:479
+msgid "load rewriting config for <command> (implies --stdin)"
+msgstr ""
+
+#: builtin/notes.c:497
+msgid "too few parameters"
+msgstr ""
+
+#: builtin/notes.c:518
+#, c-format
+msgid ""
+"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
+"existing notes"
+msgstr ""
+
+#: builtin/notes.c:530
+#, c-format
+msgid "Missing notes on source object %s. Cannot copy."
+msgstr ""
+
+#: builtin/notes.c:582
+#, 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:750
+msgid "General options"
+msgstr ""
+
+#: builtin/notes.c:752
+msgid "Merge options"
+msgstr ""
+
+#: builtin/notes.c:754
+msgid ""
+"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
+"cat_sort_uniq)"
+msgstr ""
+
+#: builtin/notes.c:756
+msgid "Committing unmerged notes"
+msgstr ""
+
+#: builtin/notes.c:758
+msgid "finalize notes merge by committing unmerged notes"
+msgstr ""
+
+#: builtin/notes.c:760
+msgid "Aborting notes merge resolution"
+msgstr ""
+
+#: builtin/notes.c:762
+msgid "abort notes merge"
+msgstr ""
+
+#: builtin/notes.c:857
+#, c-format
+msgid "Object %s has no note\n"
+msgstr ""
+
+#: builtin/notes.c:869
+msgid "attempt to remove non-existent note is not an error"
+msgstr ""
+
+#: builtin/notes.c:872
+msgid "read object names from the standard input"
+msgstr ""
+
+#: builtin/notes.c:953
+msgid "notes-ref"
+msgstr ""
+
+#: builtin/notes.c:954
+msgid "use notes from <notes-ref>"
+msgstr ""
+
+#: builtin/notes.c:989 builtin/remote.c:1621
+#, c-format
+msgid "Unknown subcommand: %s"
+msgstr ""
+
+#: builtin/pack-objects.c:28
+msgid "git pack-objects --stdout [options...] [< ref-list | < object-list]"
+msgstr ""
+
+#: builtin/pack-objects.c:29
+msgid "git pack-objects [options...] base-name [< ref-list | < object-list]"
+msgstr ""
+
+#: builtin/pack-objects.c:175 builtin/pack-objects.c:178
+#, c-format
+msgid "deflate error (%d)"
+msgstr ""
+
+#: builtin/pack-objects.c:771
+msgid "Writing objects"
+msgstr ""
+
+#: builtin/pack-objects.c:1013
+msgid "disabling bitmap writing, as some objects are not being packed"
+msgstr ""
+
+#: builtin/pack-objects.c:2173
+msgid "Compressing objects"
+msgstr ""
+
+#: builtin/pack-objects.c:2570
+#, c-format
+msgid "unsupported index version %s"
+msgstr ""
+
+#: builtin/pack-objects.c:2574
+#, c-format
+msgid "bad index version '%s'"
+msgstr ""
+
+#: builtin/pack-objects.c:2597
+#, c-format
+msgid "option %s does not accept negative form"
+msgstr ""
+
+#: builtin/pack-objects.c:2601
+#, c-format
+msgid "unable to parse value '%s' for option %s"
+msgstr ""
+
+#: builtin/pack-objects.c:2621
+msgid "do not show progress meter"
+msgstr ""
+
+#: builtin/pack-objects.c:2623
+msgid "show progress meter"
+msgstr ""
+
+#: builtin/pack-objects.c:2625
+msgid "show progress meter during object writing phase"
+msgstr ""
+
+#: builtin/pack-objects.c:2628
+msgid "similar to --all-progress when progress meter is shown"
+msgstr ""
+
+#: builtin/pack-objects.c:2629
+msgid "version[,offset]"
+msgstr ""
+
+#: builtin/pack-objects.c:2630
+msgid "write the pack index file in the specified idx format version"
+msgstr ""
+
+#: builtin/pack-objects.c:2633
+msgid "maximum size of each output pack file"
+msgstr ""
+
+#: builtin/pack-objects.c:2635
+msgid "ignore borrowed objects from alternate object store"
+msgstr ""
+
+#: builtin/pack-objects.c:2637
+msgid "ignore packed objects"
+msgstr ""
+
+#: builtin/pack-objects.c:2639
+msgid "limit pack window by objects"
+msgstr ""
+
+#: builtin/pack-objects.c:2641
+msgid "limit pack window by memory in addition to object limit"
+msgstr ""
+
+#: builtin/pack-objects.c:2643
+msgid "maximum length of delta chain allowed in the resulting pack"
+msgstr ""
+
+#: builtin/pack-objects.c:2645
+msgid "reuse existing deltas"
+msgstr ""
+
+#: builtin/pack-objects.c:2647
+msgid "reuse existing objects"
+msgstr ""
+
+#: builtin/pack-objects.c:2649
+msgid "use OFS_DELTA objects"
+msgstr ""
+
+#: builtin/pack-objects.c:2651
+msgid "use threads when searching for best delta matches"
+msgstr ""
+
+#: builtin/pack-objects.c:2653
+msgid "do not create an empty pack output"
+msgstr ""
+
+#: builtin/pack-objects.c:2655
+msgid "read revision arguments from standard input"
+msgstr ""
+
+#: builtin/pack-objects.c:2657
+msgid "limit the objects to those that are not yet packed"
+msgstr ""
+
+#: builtin/pack-objects.c:2660
+msgid "include objects reachable from any reference"
+msgstr ""
+
+#: builtin/pack-objects.c:2663
+msgid "include objects referred by reflog entries"
+msgstr ""
+
+#: builtin/pack-objects.c:2666
+msgid "include objects referred to by the index"
+msgstr ""
+
+#: builtin/pack-objects.c:2669
+msgid "output pack to stdout"
+msgstr ""
+
+#: builtin/pack-objects.c:2671
+msgid "include tag objects that refer to objects to be packed"
+msgstr ""
+
+#: builtin/pack-objects.c:2673
+msgid "keep unreachable objects"
+msgstr ""
+
+#: builtin/pack-objects.c:2674 parse-options.h:140
+msgid "time"
+msgstr ""
+
+#: builtin/pack-objects.c:2675
+msgid "unpack unreachable objects newer than <time>"
+msgstr ""
+
+#: builtin/pack-objects.c:2678
+msgid "create thin packs"
+msgstr ""
+
+#: builtin/pack-objects.c:2680
+msgid "create packs suitable for shallow fetches"
+msgstr ""
+
+#: builtin/pack-objects.c:2682
+msgid "ignore packs that have companion .keep file"
+msgstr ""
+
+#: builtin/pack-objects.c:2684
+msgid "pack compression level"
+msgstr ""
+
+#: builtin/pack-objects.c:2686
+msgid "do not hide commits by grafts"
+msgstr ""
+
+#: builtin/pack-objects.c:2688
+msgid "use a bitmap index if available to speed up counting objects"
+msgstr ""
+
+#: builtin/pack-objects.c:2690
+msgid "write a bitmap index together with the pack index"
+msgstr ""
+
+#: builtin/pack-objects.c:2781
+msgid "Counting objects"
+msgstr ""
+
+#: builtin/pack-refs.c:6
+msgid "git pack-refs [<options>]"
+msgstr ""
+
+#: builtin/pack-refs.c:14
+msgid "pack everything"
+msgstr ""
+
+#: builtin/pack-refs.c:15
+msgid "prune loose refs (default)"
+msgstr ""
+
+#: builtin/prune-packed.c:7
+msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
+msgstr ""
+
+#: builtin/prune-packed.c:40
+msgid "Removing duplicate objects"
+msgstr ""
+
+#: builtin/prune.c:12
+msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
+msgstr ""
+
+#: builtin/prune.c:106
+msgid "do not remove, show only"
+msgstr ""
+
+#: builtin/prune.c:107
+msgid "report pruned objects"
+msgstr ""
+
+#: builtin/prune.c:110
+msgid "expire objects older than <time>"
+msgstr ""
+
+#: builtin/push.c:14
+msgid "git push [<options>] [<repository> [<refspec>...]]"
+msgstr ""
+
+#: builtin/push.c:85
+msgid "tag shorthand without <tag>"
+msgstr ""
+
+#: builtin/push.c:95
+msgid "--delete only accepts plain target ref names"
+msgstr ""
+
+#: builtin/push.c:139
+msgid ""
+"\n"
+"To choose either option permanently, see push.default in 'git help config'."
+msgstr ""
+
+#: builtin/push.c:142
+#, c-format
+msgid ""
+"The upstream branch of your current branch does not match\n"
+"the name of your current branch. To push to the upstream branch\n"
+"on the remote, use\n"
+"\n"
+" git push %s HEAD:%s\n"
+"\n"
+"To push to the branch of the same name on the remote, use\n"
+"\n"
+" git push %s %s\n"
+"%s"
+msgstr ""
+
+#: builtin/push.c:157
+#, c-format
+msgid ""
+"You are not currently on a branch.\n"
+"To push the history leading to the current (detached HEAD)\n"
+"state now, use\n"
+"\n"
+" git push %s HEAD:<name-of-remote-branch>\n"
+msgstr ""
+
+#: builtin/push.c:171
+#, c-format
+msgid ""
+"The current branch %s has no upstream branch.\n"
+"To push the current branch and set the remote as upstream, use\n"
+"\n"
+" git push --set-upstream %s %s\n"
+msgstr ""
+
+#: builtin/push.c:179
+#, c-format
+msgid "The current branch %s has multiple upstream branches, refusing to push."
+msgstr ""
+
+#: builtin/push.c:182
+#, c-format
+msgid ""
+"You are pushing to remote '%s', which is not the upstream of\n"
+"your current branch '%s', without telling me what to push\n"
+"to update which remote branch."
+msgstr ""
+
+#: builtin/push.c:205
+msgid ""
+"push.default is unset; its implicit value has changed in\n"
+"Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
+"and maintain the traditional behavior, use:\n"
+"\n"
+" git config --global push.default matching\n"
+"\n"
+"To squelch this message and adopt the new behavior now, use:\n"
+"\n"
+" git config --global push.default simple\n"
+"\n"
+"When push.default is set to 'matching', git will push local branches\n"
+"to the remote branches that already exist with the same name.\n"
+"\n"
+"Since Git 2.0, Git defaults to the more conservative 'simple'\n"
+"behavior, which only pushes the current branch to the corresponding\n"
+"remote branch that 'git pull' uses to update the current branch.\n"
+"\n"
+"See 'git help config' and search for 'push.default' for further "
+"information.\n"
+"(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"
+"'current' instead of 'simple' if you sometimes use older versions of Git)"
+msgstr ""
+
+#: builtin/push.c:272
+msgid ""
+"You didn't specify any refspecs to push, and push.default is \"nothing\"."
+msgstr ""
+
+#: builtin/push.c:279
+msgid ""
+"Updates were rejected because the tip of your current branch is behind\n"
+"its remote counterpart. Integrate the remote changes (e.g.\n"
+"'git pull ...') before pushing again.\n"
+"See the 'Note about fast-forwards' in 'git push --help' for details."
+msgstr ""
+
+#: builtin/push.c:285
+msgid ""
+"Updates were rejected because a pushed branch tip is behind its remote\n"
+"counterpart. Check out this branch and integrate the remote changes\n"
+"(e.g. 'git pull ...') before pushing again.\n"
+"See the 'Note about fast-forwards' in 'git push --help' for details."
+msgstr ""
+
+#: builtin/push.c:291
+msgid ""
+"Updates were rejected because the remote contains work that you do\n"
+"not have locally. This is usually caused by another repository pushing\n"
+"to the same ref. You may want to first integrate the remote changes\n"
+"(e.g., 'git pull ...') before pushing again.\n"
+"See the 'Note about fast-forwards' in 'git push --help' for details."
+msgstr ""
+
+#: builtin/push.c:298
+msgid "Updates were rejected because the tag already exists in the remote."
+msgstr ""
+
+#: builtin/push.c:301
+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:360
+#, c-format
+msgid "Pushing to %s\n"
+msgstr ""
+
+#: builtin/push.c:364
+#, c-format
+msgid "failed to push some refs to '%s'"
+msgstr ""
+
+#: builtin/push.c:394
+#, c-format
+msgid "bad repository '%s'"
+msgstr ""
+
+#: builtin/push.c:395
+msgid ""
+"No configured push destination.\n"
+"Either specify the URL from the command-line or configure a remote "
+"repository using\n"
+"\n"
+" git remote add <name> <url>\n"
+"\n"
+"and then push using the remote name\n"
+"\n"
+" git push <name>\n"
+msgstr ""
+
+#: builtin/push.c:410
+msgid "--all and --tags are incompatible"
+msgstr ""
+
+#: builtin/push.c:411
+msgid "--all can't be combined with refspecs"
+msgstr ""
+
+#: builtin/push.c:416
+msgid "--mirror and --tags are incompatible"
+msgstr ""
+
+#: builtin/push.c:417
+msgid "--mirror can't be combined with refspecs"
+msgstr ""
+
+#: builtin/push.c:422
+msgid "--all and --mirror are incompatible"
+msgstr ""
+
+#: builtin/push.c:502
+msgid "repository"
+msgstr ""
+
+#: builtin/push.c:503
+msgid "push all refs"
+msgstr ""
+
+#: builtin/push.c:504
+msgid "mirror all refs"
+msgstr ""
+
+#: builtin/push.c:506
+msgid "delete refs"
+msgstr ""
+
+#: builtin/push.c:507
+msgid "push tags (can't be used with --all or --mirror)"
+msgstr ""
+
+#: builtin/push.c:510
+msgid "force updates"
+msgstr ""
+
+#: builtin/push.c:512
+msgid "refname>:<expect"
+msgstr ""
+
+#: builtin/push.c:513
+msgid "require old value of ref to be at this value"
+msgstr ""
+
+#: builtin/push.c:516
+msgid "control recursive pushing of submodules"
+msgstr ""
+
+#: builtin/push.c:518
+msgid "use thin pack"
+msgstr ""
+
+#: builtin/push.c:519 builtin/push.c:520
+msgid "receive pack program"
+msgstr ""
+
+#: builtin/push.c:521
+msgid "set upstream for git pull/status"
+msgstr ""
+
+#: builtin/push.c:524
+msgid "prune locally removed refs"
+msgstr ""
+
+#: builtin/push.c:526
+msgid "bypass pre-push hook"
+msgstr ""
+
+#: builtin/push.c:527
+msgid "push missing but relevant tags"
+msgstr ""
+
+#: builtin/push.c:529
+msgid "GPG sign the push"
+msgstr ""
+
+#: builtin/push.c:530
+msgid "request atomic transaction on remote side"
+msgstr ""
+
+#: builtin/push.c:539
+msgid "--delete is incompatible with --all, --mirror and --tags"
+msgstr ""
+
+#: builtin/push.c:541
+msgid "--delete doesn't make sense without any refs"
+msgstr ""
+
+#: builtin/read-tree.c:37
+msgid ""
+"git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] "
+"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
+"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
+msgstr ""
+
+#: builtin/read-tree.c:110
+msgid "write resulting index to <file>"
+msgstr ""
+
+#: builtin/read-tree.c:113
+msgid "only empty the index"
+msgstr ""
+
+#: builtin/read-tree.c:115
+msgid "Merging"
+msgstr ""
+
+#: builtin/read-tree.c:117
+msgid "perform a merge in addition to a read"
+msgstr ""
+
+#: builtin/read-tree.c:119
+msgid "3-way merge if no file level merging required"
+msgstr ""
+
+#: builtin/read-tree.c:121
+msgid "3-way merge in presence of adds and removes"
+msgstr ""
+
+#: builtin/read-tree.c:123
+msgid "same as -m, but discard unmerged entries"
+msgstr ""
+
+#: builtin/read-tree.c:124
+msgid "<subdirectory>/"
+msgstr ""
+
+#: builtin/read-tree.c:125
+msgid "read the tree into the index under <subdirectory>/"
+msgstr ""
+
+#: builtin/read-tree.c:128
+msgid "update working tree with merge result"
+msgstr ""
+
+#: builtin/read-tree.c:130
+msgid "gitignore"
+msgstr ""
+
+#: builtin/read-tree.c:131
+msgid "allow explicitly ignored files to be overwritten"
+msgstr ""
+
+#: builtin/read-tree.c:134
+msgid "don't check the working tree after merging"
+msgstr ""
+
+#: builtin/read-tree.c:135
+msgid "don't update the index or the work tree"
+msgstr ""
+
+#: builtin/read-tree.c:137
+msgid "skip applying sparse checkout filter"
msgstr ""
-#: builtin/index-pack.c:1444
+#: builtin/read-tree.c:139
+msgid "debug unpack-trees"
+msgstr ""
+
+#: builtin/reflog.c:429
#, c-format
-msgid "non delta: %d object"
-msgid_plural "non delta: %d objects"
-msgstr[0] ""
-msgstr[1] ""
+msgid "%s' for '%s' is not a valid timestamp"
+msgstr ""
-#: builtin/index-pack.c:1451
+#: builtin/reflog.c:546 builtin/reflog.c:551
#, c-format
-msgid "chain length = %d: %lu object"
-msgid_plural "chain length = %d: %lu objects"
-msgstr[0] ""
-msgstr[1] ""
+msgid "'%s' is not a valid timestamp"
+msgstr ""
-#: builtin/index-pack.c:1478
-msgid "Cannot come back to cwd"
+#: builtin/remote.c:12
+msgid "git remote [-v | --verbose]"
+msgstr ""
+
+#: builtin/remote.c:13
+msgid ""
+"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
+"mirror=<fetch|push>] <name> <url>"
+msgstr ""
+
+#: builtin/remote.c:14 builtin/remote.c:33
+msgid "git remote rename <old> <new>"
+msgstr ""
+
+#: builtin/remote.c:15 builtin/remote.c:38
+msgid "git remote remove <name>"
+msgstr ""
+
+#: builtin/remote.c:16 builtin/remote.c:43
+msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
+msgstr ""
+
+#: builtin/remote.c:17
+msgid "git remote [-v | --verbose] show [-n] <name>"
+msgstr ""
+
+#: builtin/remote.c:18
+msgid "git remote prune [-n | --dry-run] <name>"
+msgstr ""
+
+#: builtin/remote.c:19
+msgid ""
+"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
+msgstr ""
+
+#: builtin/remote.c:20
+msgid "git remote set-branches [--add] <name> <branch>..."
+msgstr ""
+
+#: builtin/remote.c:21 builtin/remote.c:69
+msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
+msgstr ""
+
+#: builtin/remote.c:22 builtin/remote.c:70
+msgid "git remote set-url --add <name> <newurl>"
+msgstr ""
+
+#: builtin/remote.c:23 builtin/remote.c:71
+msgid "git remote set-url --delete <name> <url>"
+msgstr ""
+
+#: builtin/remote.c:28
+msgid "git remote add [<options>] <name> <url>"
+msgstr ""
+
+#: builtin/remote.c:48
+msgid "git remote set-branches <name> <branch>..."
+msgstr ""
+
+#: builtin/remote.c:49
+msgid "git remote set-branches --add <name> <branch>..."
+msgstr ""
+
+#: builtin/remote.c:54
+msgid "git remote show [<options>] <name>"
+msgstr ""
+
+#: builtin/remote.c:59
+msgid "git remote prune [<options>] <name>"
+msgstr ""
+
+#: builtin/remote.c:64
+msgid "git remote update [<options>] [<group> | <remote>]..."
msgstr ""
-#: builtin/index-pack.c:1522 builtin/index-pack.c:1525
-#: builtin/index-pack.c:1537 builtin/index-pack.c:1541
+#: builtin/remote.c:88
#, c-format
-msgid "bad %s"
+msgid "Updating %s"
msgstr ""
-#: builtin/index-pack.c:1555
-msgid "--fix-thin cannot be used without --stdin"
+#: builtin/remote.c:120
+msgid ""
+"--mirror is dangerous and deprecated; please\n"
+"\t use --mirror=fetch or --mirror=push instead"
msgstr ""
-#: builtin/index-pack.c:1559 builtin/index-pack.c:1569
+#: builtin/remote.c:137
#, c-format
-msgid "packfile name '%s' does not end with '.pack'"
+msgid "unknown mirror argument: %s"
msgstr ""
-#: builtin/index-pack.c:1578
-msgid "--verify with no packfile name given"
+#: builtin/remote.c:153
+msgid "fetch the remote branches"
msgstr ""
-#: builtin/init-db.c:35
+#: builtin/remote.c:155
+msgid "import all tags and associated objects when fetching"
+msgstr ""
+
+#: builtin/remote.c:158
+msgid "or do not fetch any tag at all (--no-tags)"
+msgstr ""
+
+#: builtin/remote.c:160
+msgid "branch(es) to track"
+msgstr ""
+
+#: builtin/remote.c:161
+msgid "master branch"
+msgstr ""
+
+#: builtin/remote.c:162
+msgid "push|fetch"
+msgstr ""
+
+#: builtin/remote.c:163
+msgid "set up remote as a mirror to push to or fetch from"
+msgstr ""
+
+#: builtin/remote.c:175
+msgid "specifying a master branch makes no sense with --mirror"
+msgstr ""
+
+#: builtin/remote.c:177
+msgid "specifying branches to track makes sense only with fetch mirrors"
+msgstr ""
+
+#: builtin/remote.c:187 builtin/remote.c:643
#, c-format
-msgid "Could not make %s writable by group"
+msgid "remote %s already exists."
msgstr ""
-#: builtin/init-db.c:62
+#: builtin/remote.c:191 builtin/remote.c:647
#, c-format
-msgid "insanely long template name %s"
+msgid "'%s' is not a valid remote name"
msgstr ""
-#: builtin/init-db.c:67
+#: builtin/remote.c:235
#, c-format
-msgid "cannot stat '%s'"
+msgid "Could not setup master '%s'"
msgstr ""
-#: builtin/init-db.c:73
+#: builtin/remote.c:335
#, c-format
-msgid "cannot stat template '%s'"
+msgid "Could not get fetch map for refspec %s"
msgstr ""
-#: builtin/init-db.c:80
+#: builtin/remote.c:436 builtin/remote.c:444
+msgid "(matching)"
+msgstr ""
+
+#: builtin/remote.c:448
+msgid "(delete)"
+msgstr ""
+
+#: builtin/remote.c:592 builtin/remote.c:598 builtin/remote.c:604
#, c-format
-msgid "cannot opendir '%s'"
+msgid "Could not append '%s' to '%s'"
msgstr ""
-#: builtin/init-db.c:97
+#: builtin/remote.c:636 builtin/remote.c:795 builtin/remote.c:895
#, c-format
-msgid "cannot readlink '%s'"
+msgid "No such remote: %s"
msgstr ""
-#: builtin/init-db.c:99
+#: builtin/remote.c:653
#, c-format
-msgid "insanely long symlink %s"
+msgid "Could not rename config section '%s' to '%s'"
msgstr ""
-#: builtin/init-db.c:102
+#: builtin/remote.c:659 builtin/remote.c:847
#, c-format
-msgid "cannot symlink '%s' '%s'"
+msgid "Could not remove config section '%s'"
msgstr ""
-#: builtin/init-db.c:106
+#: builtin/remote.c:674
#, c-format
-msgid "cannot copy '%s' to '%s'"
+msgid ""
+"Not updating non-default fetch refspec\n"
+"\t%s\n"
+"\tPlease update the configuration manually if necessary."
msgstr ""
-#: builtin/init-db.c:110
+#: builtin/remote.c:680
#, c-format
-msgid "ignoring template %s"
+msgid "Could not append '%s'"
msgstr ""
-#: builtin/init-db.c:133
+#: builtin/remote.c:691
#, c-format
-msgid "insanely long template path %s"
+msgid "Could not set '%s'"
msgstr ""
-#: builtin/init-db.c:141
+#: builtin/remote.c:713
#, c-format
-msgid "templates not found %s"
+msgid "deleting '%s' failed"
msgstr ""
-#: builtin/init-db.c:154
+#: builtin/remote.c:747
#, c-format
-msgid "not copying templates of a wrong format version %d from '%s'"
+msgid "creating '%s' failed"
msgstr ""
-#: builtin/init-db.c:192
+#: builtin/remote.c:766
#, c-format
-msgid "insane git directory %s"
+msgid "Could not remove branch %s"
msgstr ""
-#: builtin/init-db.c:322 builtin/init-db.c:325
+#: builtin/remote.c:833
+msgid ""
+"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
+"to delete it, use:"
+msgid_plural ""
+"Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
+"to delete them, use:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/remote.c:948
#, c-format
-msgid "%s already exists"
+msgid " new (next fetch will store in remotes/%s)"
+msgstr ""
+
+#: builtin/remote.c:951
+msgid " tracked"
+msgstr ""
+
+#: builtin/remote.c:953
+msgid " stale (use 'git remote prune' to remove)"
+msgstr ""
+
+#: builtin/remote.c:955
+msgid " ???"
msgstr ""
-#: builtin/init-db.c:354
+#: builtin/remote.c:996
#, c-format
-msgid "unable to handle file type %d"
+msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
msgstr ""
-#: builtin/init-db.c:357
+#: builtin/remote.c:1003
#, c-format
-msgid "unable to move %s to %s"
+msgid "rebases onto remote %s"
msgstr ""
-#: builtin/init-db.c:362
+#: builtin/remote.c:1006
#, c-format
-msgid "Could not create git link %s"
+msgid " merges with remote %s"
msgstr ""
-#.
-#. * TRANSLATORS: The first '%s' is either "Reinitialized
-#. * existing" or "Initialized empty", the second " shared" or
-#. * "", and the last '%s%s' is the verbatim directory name.
-#.
-#: builtin/init-db.c:419
+#: builtin/remote.c:1007
+msgid " and with remote"
+msgstr ""
+
+#: builtin/remote.c:1009
#, c-format
-msgid "%s%s Git repository in %s%s\n"
+msgid "merges with remote %s"
msgstr ""
-#: builtin/init-db.c:420
-msgid "Reinitialized existing"
+#: builtin/remote.c:1010
+msgid " and with remote"
msgstr ""
-#: builtin/init-db.c:420
-msgid "Initialized empty"
+#: builtin/remote.c:1056
+msgid "create"
msgstr ""
-#: builtin/init-db.c:421
-msgid " shared"
+#: builtin/remote.c:1059
+msgid "delete"
+msgstr ""
+
+#: builtin/remote.c:1063
+msgid "up to date"
+msgstr ""
+
+#: builtin/remote.c:1066
+msgid "fast-forwardable"
msgstr ""
-#: builtin/init-db.c:440
-msgid "cannot tell cwd"
+#: builtin/remote.c:1069
+msgid "local out of date"
msgstr ""
-#: builtin/init-db.c:521 builtin/init-db.c:528
+#: builtin/remote.c:1076
#, c-format
-msgid "cannot mkdir %s"
+msgid " %-*s forces to %-*s (%s)"
msgstr ""
-#: builtin/init-db.c:532
+#: builtin/remote.c:1079
#, c-format
-msgid "cannot chdir to %s"
+msgid " %-*s pushes to %-*s (%s)"
msgstr ""
-#: builtin/init-db.c:554
+#: builtin/remote.c:1083
#, c-format
-msgid ""
-"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
-"dir=<directory>)"
+msgid " %-*s forces to %s"
+msgstr ""
+
+#: builtin/remote.c:1086
+#, c-format
+msgid " %-*s pushes to %s"
msgstr ""
-#: builtin/init-db.c:578
-msgid "Cannot access current working directory"
+#: builtin/remote.c:1154
+msgid "do not query remotes"
msgstr ""
-#: builtin/init-db.c:585
+#: builtin/remote.c:1181
#, c-format
-msgid "Cannot access work tree '%s'"
+msgid "* remote %s"
msgstr ""
-#: builtin/log.c:189
+#: builtin/remote.c:1182
#, c-format
-msgid "Final output: %d %s\n"
+msgid " Fetch URL: %s"
+msgstr ""
+
+#: builtin/remote.c:1183 builtin/remote.c:1334
+msgid "(no URL)"
msgstr ""
-#: builtin/log.c:402 builtin/log.c:490
+#: builtin/remote.c:1192 builtin/remote.c:1194
#, c-format
-msgid "Could not read object %s"
+msgid " Push URL: %s"
msgstr ""
-#: builtin/log.c:514
+#: builtin/remote.c:1196 builtin/remote.c:1198 builtin/remote.c:1200
#, c-format
-msgid "Unknown type: %d"
+msgid " HEAD branch: %s"
msgstr ""
-#: builtin/log.c:603
-msgid "format.headers without value"
+#: builtin/remote.c:1202
+#, c-format
+msgid ""
+" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
msgstr ""
-#: builtin/log.c:677
-msgid "name of output directory is too long"
+#: builtin/remote.c:1214
+#, c-format
+msgid " Remote branch:%s"
+msgid_plural " Remote branches:%s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/remote.c:1217 builtin/remote.c:1244
+msgid " (status not queried)"
+msgstr ""
+
+#: builtin/remote.c:1226
+msgid " Local branch configured for 'git pull':"
+msgid_plural " Local branches configured for 'git pull':"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/remote.c:1234
+msgid " Local refs will be mirrored by 'git push'"
msgstr ""
-#: builtin/log.c:688
+#: builtin/remote.c:1241
#, c-format
-msgid "Cannot open patch file %s"
+msgid " Local ref configured for 'git push'%s:"
+msgid_plural " Local refs configured for 'git push'%s:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/remote.c:1262
+msgid "set refs/remotes/<name>/HEAD according to remote"
+msgstr ""
+
+#: builtin/remote.c:1264
+msgid "delete refs/remotes/<name>/HEAD"
+msgstr ""
+
+#: builtin/remote.c:1279
+msgid "Cannot determine remote HEAD"
+msgstr ""
+
+#: builtin/remote.c:1281
+msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
+msgstr ""
+
+#: builtin/remote.c:1291
+#, c-format
+msgid "Could not delete %s"
+msgstr ""
+
+#: builtin/remote.c:1299
+#, c-format
+msgid "Not a valid ref: %s"
+msgstr ""
+
+#: builtin/remote.c:1301
+#, c-format
+msgid "Could not setup %s"
msgstr ""
-#: builtin/log.c:702
-msgid "Need exactly one range."
+#: builtin/remote.c:1319
+#, c-format
+msgid " %s will become dangling!"
msgstr ""
-#: builtin/log.c:710
-msgid "Not a range."
+#: builtin/remote.c:1320
+#, c-format
+msgid " %s has become dangling!"
msgstr ""
-#: builtin/log.c:787
-msgid "Cover letter needs email format"
+#: builtin/remote.c:1330
+#, c-format
+msgid "Pruning %s"
msgstr ""
-#: builtin/log.c:860
+#: builtin/remote.c:1331
#, c-format
-msgid "insane in-reply-to: %s"
+msgid "URL: %s"
msgstr ""
-#: builtin/log.c:933
-msgid "Two output directories?"
+#: builtin/remote.c:1354
+#, c-format
+msgid " * [would prune] %s"
msgstr ""
-#: builtin/log.c:1154
+#: builtin/remote.c:1357
#, c-format
-msgid "bogus committer info %s"
+msgid " * [pruned] %s"
msgstr ""
-#: builtin/log.c:1199
-msgid "-n and -k are mutually exclusive."
+#: builtin/remote.c:1402
+msgid "prune remotes after fetching"
msgstr ""
-#: builtin/log.c:1201
-msgid "--subject-prefix and -k are mutually exclusive."
+#: builtin/remote.c:1468 builtin/remote.c:1542
+#, c-format
+msgid "No such remote '%s'"
msgstr ""
-#: builtin/log.c:1209
-msgid "--name-only does not make sense"
+#: builtin/remote.c:1488
+msgid "add branch"
msgstr ""
-#: builtin/log.c:1211
-msgid "--name-status does not make sense"
+#: builtin/remote.c:1495
+msgid "no remote specified"
msgstr ""
-#: builtin/log.c:1213
-msgid "--check does not make sense"
+#: builtin/remote.c:1517
+msgid "manipulate push URLs"
msgstr ""
-#: builtin/log.c:1236
-msgid "standard output, or directory, which one?"
+#: builtin/remote.c:1519
+msgid "add URL"
msgstr ""
-#: builtin/log.c:1238
-#, c-format
-msgid "Could not create directory '%s'"
+#: builtin/remote.c:1521
+msgid "delete URLs"
msgstr ""
-#: builtin/log.c:1391
-msgid "Failed to create output files"
+#: builtin/remote.c:1528
+msgid "--add --delete doesn't make sense"
msgstr ""
-#: builtin/log.c:1495
+#: builtin/remote.c:1568
#, c-format
-msgid ""
-"Could not find a tracked remote branch, please specify <upstream> manually.\n"
+msgid "Invalid old URL pattern: %s"
msgstr ""
-#: builtin/log.c:1511 builtin/log.c:1513 builtin/log.c:1525
+#: builtin/remote.c:1576
#, c-format
-msgid "Unknown commit %s"
+msgid "No such URL found: %s"
msgstr ""
-#: builtin/merge.c:90
-msgid "switch `m' requires a value"
+#: builtin/remote.c:1578
+msgid "Will not delete all non-push URLs"
msgstr ""
-#: builtin/merge.c:127
-#, c-format
-msgid "Could not find merge strategy '%s'.\n"
+#: builtin/remote.c:1592
+msgid "be verbose; must be placed before a subcommand"
msgstr ""
-#: builtin/merge.c:128
-#, c-format
-msgid "Available strategies are:"
+#: builtin/repack.c:17
+msgid "git repack [<options>]"
msgstr ""
-#: builtin/merge.c:133
-#, c-format
-msgid "Available custom strategies are:"
+#: builtin/repack.c:159
+msgid "pack everything in a single pack"
msgstr ""
-#: builtin/merge.c:240
-msgid "could not run stash."
+#: builtin/repack.c:161
+msgid "same as -a, and turn unreachable objects loose"
msgstr ""
-#: builtin/merge.c:245
-msgid "stash failed"
+#: builtin/repack.c:164
+msgid "remove redundant packs, and run git-prune-packed"
msgstr ""
-#: builtin/merge.c:250
-#, c-format
-msgid "not a valid object: %s"
+#: builtin/repack.c:166
+msgid "pass --no-reuse-delta to git-pack-objects"
msgstr ""
-#: builtin/merge.c:269 builtin/merge.c:286
-msgid "read-tree failed"
+#: builtin/repack.c:168
+msgid "pass --no-reuse-object to git-pack-objects"
msgstr ""
-#: builtin/merge.c:316
-msgid " (nothing to squash)"
+#: builtin/repack.c:170
+msgid "do not run git-update-server-info"
msgstr ""
-#: builtin/merge.c:329
-#, c-format
-msgid "Squash commit -- not updating HEAD\n"
+#: builtin/repack.c:173
+msgid "pass --local to git-pack-objects"
msgstr ""
-#: builtin/merge.c:361
-msgid "Writing SQUASH_MSG"
+#: builtin/repack.c:175
+msgid "write bitmap index"
msgstr ""
-#: builtin/merge.c:363
-msgid "Finishing SQUASH_MSG"
+#: builtin/repack.c:176
+msgid "approxidate"
msgstr ""
-#: builtin/merge.c:386
-#, c-format
-msgid "No merge message -- not updating HEAD\n"
+#: builtin/repack.c:177
+msgid "with -A, do not loosen objects older than this"
msgstr ""
-#: builtin/merge.c:437
-#, c-format
-msgid "'%s' does not point to a commit"
+#: builtin/repack.c:179
+msgid "size of the window used for delta compression"
msgstr ""
-#: builtin/merge.c:536
-#, c-format
-msgid "Bad branch.%s.mergeoptions string: %s"
+#: builtin/repack.c:180 builtin/repack.c:184
+msgid "bytes"
msgstr ""
-#: builtin/merge.c:629
-msgid "git write-tree failed to write a tree"
+#: builtin/repack.c:181
+msgid "same as the above, but limit memory size instead of entries count"
msgstr ""
-#: builtin/merge.c:679
-msgid "failed to read the cache"
+#: builtin/repack.c:183
+msgid "limits the maximum delta depth"
msgstr ""
-#: builtin/merge.c:697
-msgid "Unable to write index."
+#: builtin/repack.c:185
+msgid "maximum size of each packfile"
msgstr ""
-#: builtin/merge.c:710
-msgid "Not handling anything other than two heads merge."
+#: builtin/repack.c:187
+msgid "repack objects in packs marked with .keep"
msgstr ""
-#: builtin/merge.c:724
+#: builtin/repack.c:375
#, c-format
-msgid "Unknown option for merge-recursive: -X%s"
+msgid "removing '%s' failed"
msgstr ""
-#: builtin/merge.c:738
-#, c-format
-msgid "unable to write %s"
+#: builtin/replace.c:19
+msgid "git replace [-f] <object> <replacement>"
msgstr ""
-#: builtin/merge.c:877
-#, c-format
-msgid "Could not read from '%s'"
+#: builtin/replace.c:20
+msgid "git replace [-f] --edit <object>"
msgstr ""
-#: builtin/merge.c:886
-#, c-format
-msgid "Not committing merge; use 'git commit' to complete the merge.\n"
+#: builtin/replace.c:21
+msgid "git replace [-f] --graft <commit> [<parent>...]"
msgstr ""
-#: builtin/merge.c:892
-msgid ""
-"Please enter a commit message to explain why this merge is necessary,\n"
-"especially if it merges an updated upstream into a topic branch.\n"
-"\n"
-"Lines starting with '#' will be ignored, and an empty message aborts\n"
-"the commit.\n"
+#: builtin/replace.c:22
+msgid "git replace -d <object>..."
msgstr ""
-#: builtin/merge.c:916
-msgid "Empty commit message."
+#: builtin/replace.c:23
+msgid "git replace [--format=<format>] [-l [<pattern>]]"
msgstr ""
-#: builtin/merge.c:928
+#: builtin/replace.c:325 builtin/replace.c:363 builtin/replace.c:391
#, c-format
-msgid "Wonderful.\n"
+msgid "Not a valid object name: '%s'"
msgstr ""
-#: builtin/merge.c:993
+#: builtin/replace.c:355
#, c-format
-msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
+msgid "bad mergetag in commit '%s'"
msgstr ""
-#: builtin/merge.c:1009
+#: builtin/replace.c:357
#, c-format
-msgid "'%s' is not a commit"
-msgstr ""
-
-#: builtin/merge.c:1050
-msgid "No current branch."
-msgstr ""
-
-#: builtin/merge.c:1052
-msgid "No remote for the current branch."
-msgstr ""
-
-#: builtin/merge.c:1054
-msgid "No default upstream defined for the current branch."
+msgid "malformed mergetag in commit '%s'"
msgstr ""
-#: builtin/merge.c:1059
+#: builtin/replace.c:368
#, c-format
-msgid "No remote tracking branch for %s from %s"
+msgid ""
+"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
+"instead of --graft"
msgstr ""
-#: builtin/merge.c:1146 builtin/merge.c:1303
+#: builtin/replace.c:401
#, c-format
-msgid "%s - not something we can merge"
+msgid "the original commit '%s' has a gpg signature."
msgstr ""
-#: builtin/merge.c:1214
-msgid "There is no merge to abort (MERGE_HEAD missing)."
+#: builtin/replace.c:402
+msgid "the signature will be removed in the replacement commit!"
msgstr ""
-#: builtin/merge.c:1230 git-pull.sh:31
-msgid ""
-"You have not concluded your merge (MERGE_HEAD exists).\n"
-"Please, commit your changes before you can merge."
+#: builtin/replace.c:408
+#, c-format
+msgid "could not write replacement commit for: '%s'"
msgstr ""
-#: builtin/merge.c:1233 git-pull.sh:34
-msgid "You have not concluded your merge (MERGE_HEAD exists)."
+#: builtin/replace.c:432
+msgid "list replace refs"
msgstr ""
-#: builtin/merge.c:1237
-msgid ""
-"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
-"Please, commit your changes before you can merge."
+#: builtin/replace.c:433
+msgid "delete replace refs"
msgstr ""
-#: builtin/merge.c:1240
-msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
+#: builtin/replace.c:434
+msgid "edit existing object"
msgstr ""
-#: builtin/merge.c:1249
-msgid "You cannot combine --squash with --no-ff."
+#: builtin/replace.c:435
+msgid "change a commit's parents"
msgstr ""
-#: builtin/merge.c:1254
-msgid "You cannot combine --no-ff with --ff-only."
+#: builtin/replace.c:436
+msgid "replace the ref if it exists"
msgstr ""
-#: builtin/merge.c:1261
-msgid "No commit specified and merge.defaultToUpstream not set."
+#: builtin/replace.c:437
+msgid "do not pretty-print contents for --edit"
msgstr ""
-#: builtin/merge.c:1293
-msgid "Can merge only exactly one commit into empty head"
+#: builtin/replace.c:438
+msgid "use this format"
msgstr ""
-#: builtin/merge.c:1296
-msgid "Squash commit into empty head not supported yet"
+#: builtin/rerere.c:12
+msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
msgstr ""
-#: builtin/merge.c:1298
-msgid "Non-fast-forward commit does not make sense into an empty head"
+#: builtin/rerere.c:57
+msgid "register clean resolutions in index"
msgstr ""
-#: builtin/merge.c:1413
-#, c-format
-msgid "Updating %s..%s\n"
+#: builtin/reset.c:26
+msgid ""
+"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
msgstr ""
-#: builtin/merge.c:1451
-#, c-format
-msgid "Trying really trivial in-index merge...\n"
+#: builtin/reset.c:27
+msgid "git reset [-q] <tree-ish> [--] <paths>..."
msgstr ""
-#: builtin/merge.c:1458
-#, c-format
-msgid "Nope.\n"
+#: builtin/reset.c:28
+msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
msgstr ""
-#: builtin/merge.c:1490
-msgid "Not possible to fast-forward, aborting."
+#: builtin/reset.c:34
+msgid "mixed"
msgstr ""
-#: builtin/merge.c:1513 builtin/merge.c:1592
-#, c-format
-msgid "Rewinding the tree to pristine...\n"
+#: builtin/reset.c:34
+msgid "soft"
msgstr ""
-#: builtin/merge.c:1517
-#, c-format
-msgid "Trying merge strategy %s...\n"
+#: builtin/reset.c:34
+msgid "hard"
msgstr ""
-#: builtin/merge.c:1583
-#, c-format
-msgid "No merge strategy handled the merge.\n"
+#: builtin/reset.c:34
+msgid "merge"
msgstr ""
-#: builtin/merge.c:1585
-#, c-format
-msgid "Merge with strategy %s failed.\n"
+#: builtin/reset.c:34
+msgid "keep"
msgstr ""
-#: builtin/merge.c:1594
-#, c-format
-msgid "Using the %s to prepare resolving by hand.\n"
+#: builtin/reset.c:74
+msgid "You do not have a valid HEAD."
msgstr ""
-#: builtin/merge.c:1606
-#, c-format
-msgid "Automatic merge went well; stopped before committing as requested\n"
+#: builtin/reset.c:76
+msgid "Failed to find tree of HEAD."
msgstr ""
-#: builtin/mv.c:108
+#: builtin/reset.c:82
#, c-format
-msgid "Checking rename of '%s' to '%s'\n"
-msgstr ""
-
-#: builtin/mv.c:112
-msgid "bad source"
-msgstr ""
-
-#: builtin/mv.c:115
-msgid "can not move directory into itself"
+msgid "Failed to find tree of %s."
msgstr ""
-#: builtin/mv.c:118
-msgid "cannot move directory over file"
+#: builtin/reset.c:100
+#, c-format
+msgid "HEAD is now at %s"
msgstr ""
-#: builtin/mv.c:128
+#: builtin/reset.c:183
#, c-format
-msgid "Huh? %.*s is in index?"
+msgid "Cannot do a %s reset in the middle of a merge."
msgstr ""
-#: builtin/mv.c:140
-msgid "source directory is empty"
+#: builtin/reset.c:276
+msgid "be quiet, only report errors"
msgstr ""
-#: builtin/mv.c:171
-msgid "not under version control"
+#: builtin/reset.c:278
+msgid "reset HEAD and index"
msgstr ""
-#: builtin/mv.c:173
-msgid "destination exists"
+#: builtin/reset.c:279
+msgid "reset only HEAD"
msgstr ""
-#: builtin/mv.c:181
-#, c-format
-msgid "overwriting '%s'"
+#: builtin/reset.c:281 builtin/reset.c:283
+msgid "reset HEAD, index and working tree"
msgstr ""
-#: builtin/mv.c:184
-msgid "Cannot overwrite"
+#: builtin/reset.c:285
+msgid "reset HEAD but keep local changes"
msgstr ""
-#: builtin/mv.c:187
-msgid "multiple sources for the same target"
+#: builtin/reset.c:288
+msgid "record only the fact that removed paths will be added later"
msgstr ""
-#: builtin/mv.c:202
+#: builtin/reset.c:305
#, c-format
-msgid "%s, source=%s, destination=%s"
+msgid "Failed to resolve '%s' as a valid revision."
msgstr ""
-#: builtin/mv.c:212
+#: builtin/reset.c:308 builtin/reset.c:316
#, c-format
-msgid "Renaming %s to %s\n"
+msgid "Could not parse object '%s'."
msgstr ""
-#: builtin/mv.c:215 builtin/remote.c:731
+#: builtin/reset.c:313
#, c-format
-msgid "renaming '%s' failed"
+msgid "Failed to resolve '%s' as a valid tree."
msgstr ""
-#: builtin/notes.c:139
-#, c-format
-msgid "unable to start 'show' for object '%s'"
+#: builtin/reset.c:322
+msgid "--patch is incompatible with --{hard,mixed,soft}"
msgstr ""
-#: builtin/notes.c:145
-msgid "can't fdopen 'show' output fd"
+#: builtin/reset.c:331
+msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
msgstr ""
-#: builtin/notes.c:155
+#: builtin/reset.c:333
#, c-format
-msgid "failed to close pipe to 'show' for object '%s'"
+msgid "Cannot do %s reset with paths."
msgstr ""
-#: builtin/notes.c:158
+#: builtin/reset.c:343
#, c-format
-msgid "failed to finish 'show' for object '%s'"
+msgid "%s reset is not allowed in a bare repository"
msgstr ""
-#: builtin/notes.c:175 builtin/tag.c:347
-#, c-format
-msgid "could not create file '%s'"
+#: builtin/reset.c:347
+msgid "-N can only be used with --mixed"
msgstr ""
-#: builtin/notes.c:189
-msgid "Please supply the note contents using either -m or -F option"
+#: builtin/reset.c:364
+msgid "Unstaged changes after reset:"
msgstr ""
-#: builtin/notes.c:210 builtin/notes.c:973
+#: builtin/reset.c:370
#, c-format
-msgid "Removing note for object %s\n"
+msgid "Could not reset index file to revision '%s'."
msgstr ""
-#: builtin/notes.c:215
-msgid "unable to write note object"
+#: builtin/reset.c:374
+msgid "Could not write new index file."
msgstr ""
-#: builtin/notes.c:217
-#, c-format
-msgid "The note contents has been left in %s"
+#: builtin/rev-parse.c:361
+msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
msgstr ""
-#: builtin/notes.c:251 builtin/tag.c:542
-#, c-format
-msgid "cannot read '%s'"
+#: builtin/rev-parse.c:366
+msgid "keep the `--` passed as an arg"
msgstr ""
-#: builtin/notes.c:253 builtin/tag.c:545
-#, c-format
-msgid "could not open or read '%s'"
+#: builtin/rev-parse.c:368
+msgid "stop parsing after the first non-option argument"
msgstr ""
-#: builtin/notes.c:272 builtin/notes.c:445 builtin/notes.c:447
-#: builtin/notes.c:507 builtin/notes.c:561 builtin/notes.c:644
-#: builtin/notes.c:649 builtin/notes.c:724 builtin/notes.c:766
-#: builtin/notes.c:968 builtin/reset.c:293 builtin/tag.c:558
-#, c-format
-msgid "Failed to resolve '%s' as a valid ref."
+#: builtin/rev-parse.c:371
+msgid "output in stuck long form"
msgstr ""
-#: builtin/notes.c:275
-#, c-format
-msgid "Failed to read object '%s'."
+#: builtin/rev-parse.c:499
+msgid ""
+"git rev-parse --parseopt [<options>] -- [<args>...]\n"
+" or: git rev-parse --sq-quote [<arg>...]\n"
+" or: git rev-parse [<options>] [<arg>...]\n"
+"\n"
+"Run \"git rev-parse --parseopt -h\" for more information on the first usage."
msgstr ""
-#: builtin/notes.c:299
-msgid "Cannot commit uninitialized/unreferenced notes tree"
+#: builtin/revert.c:22
+msgid "git revert [<options>] <commit-ish>..."
msgstr ""
-#: builtin/notes.c:340
-#, c-format
-msgid "Bad notes.rewriteMode value: '%s'"
+#: builtin/revert.c:23
+msgid "git revert <subcommand>"
msgstr ""
-#: builtin/notes.c:350
-#, c-format
-msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
+#: builtin/revert.c:28
+msgid "git cherry-pick [<options>] <commit-ish>..."
msgstr ""
-#. TRANSLATORS: The first %s is the name of the
-#. environment variable, the second %s is its value
-#: builtin/notes.c:377
-#, c-format
-msgid "Bad %s value: '%s'"
+#: builtin/revert.c:29
+msgid "git cherry-pick <subcommand>"
msgstr ""
-#: builtin/notes.c:441
+#: builtin/revert.c:71
#, c-format
-msgid "Malformed input line: '%s'."
+msgid "%s: %s cannot be used with %s"
msgstr ""
-#: builtin/notes.c:456
-#, c-format
-msgid "Failed to copy notes from '%s' to '%s'"
+#: builtin/revert.c:80
+msgid "end revert or cherry-pick sequence"
msgstr ""
-#: builtin/notes.c:500 builtin/notes.c:554 builtin/notes.c:627
-#: builtin/notes.c:639 builtin/notes.c:712 builtin/notes.c:759
-#: builtin/notes.c:1033
-msgid "too many parameters"
+#: builtin/revert.c:81
+msgid "resume revert or cherry-pick sequence"
msgstr ""
-#: builtin/notes.c:513 builtin/notes.c:772
-#, c-format
-msgid "No note found for object %s."
+#: builtin/revert.c:82
+msgid "cancel revert or cherry-pick sequence"
msgstr ""
-#: builtin/notes.c:580
-#, c-format
-msgid ""
-"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
-"existing notes"
+#: builtin/revert.c:83
+msgid "don't automatically commit"
msgstr ""
-#: builtin/notes.c:585 builtin/notes.c:662
-#, c-format
-msgid "Overwriting existing notes for object %s\n"
+#: builtin/revert.c:84
+msgid "edit the commit message"
msgstr ""
-#: builtin/notes.c:635
-msgid "too few parameters"
+#: builtin/revert.c:87
+msgid "parent number"
msgstr ""
-#: builtin/notes.c:656
-#, c-format
-msgid ""
-"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
-"existing notes"
+#: builtin/revert.c:89
+msgid "merge strategy"
msgstr ""
-#: builtin/notes.c:668
-#, c-format
-msgid "Missing notes on source object %s. Cannot copy."
+#: builtin/revert.c:90
+msgid "option"
msgstr ""
-#: builtin/notes.c:717
-#, c-format
-msgid ""
-"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
-"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
+#: builtin/revert.c:91
+msgid "option for merge strategy"
msgstr ""
-#: builtin/notes.c:971
-#, c-format
-msgid "Object %s has no note\n"
+#: builtin/revert.c:104
+msgid "append commit name"
msgstr ""
-#: builtin/notes.c:1103 builtin/remote.c:1598
-#, c-format
-msgid "Unknown subcommand: %s"
+#: builtin/revert.c:105
+msgid "allow fast-forward"
msgstr ""
-#: builtin/pack-objects.c:183 builtin/pack-objects.c:186
-#, c-format
-msgid "deflate error (%d)"
+#: builtin/revert.c:106
+msgid "preserve initially empty commits"
msgstr ""
-#: builtin/pack-objects.c:2398
-#, c-format
-msgid "unsupported index version %s"
+#: builtin/revert.c:107
+msgid "allow commits with empty messages"
msgstr ""
-#: builtin/pack-objects.c:2402
-#, c-format
-msgid "bad index version '%s'"
+#: builtin/revert.c:108
+msgid "keep redundant, empty commits"
msgstr ""
-#: builtin/pack-objects.c:2425
-#, c-format
-msgid "option %s does not accept negative form"
+#: builtin/revert.c:112
+msgid "program error"
msgstr ""
-#: builtin/pack-objects.c:2429
-#, c-format
-msgid "unable to parse value '%s' for option %s"
+#: builtin/revert.c:197
+msgid "revert failed"
msgstr ""
-#: builtin/push.c:45
-msgid "tag shorthand without <tag>"
+#: builtin/revert.c:212
+msgid "cherry-pick failed"
msgstr ""
-#: builtin/push.c:64
-msgid "--delete only accepts plain target ref names"
+#: builtin/rm.c:17
+msgid "git rm [<options>] [--] <file>..."
msgstr ""
-#: builtin/push.c:99
+#: builtin/rm.c:65
msgid ""
-"\n"
-"To choose either option permanently, see push.default in 'git help config'."
-msgstr ""
+"the following submodule (or one of its nested submodules)\n"
+"uses a .git directory:"
+msgid_plural ""
+"the following submodules (or one of their nested submodules)\n"
+"use a .git directory:"
+msgstr[0] ""
+msgstr[1] ""
-#: builtin/push.c:102
-#, c-format
+#: builtin/rm.c:71
msgid ""
-"The upstream branch of your current branch does not match\n"
-"the name of your current branch. To push to the upstream branch\n"
-"on the remote, use\n"
-"\n"
-" git push %s HEAD:%s\n"
-"\n"
-"To push to the branch of the same name on the remote, use\n"
"\n"
-" git push %s %s\n"
-"%s"
+"(use 'rm -rf' if you really want to remove it including all of its history)"
msgstr ""
-#: builtin/push.c:121
-#, c-format
+#: builtin/rm.c:231
+msgid ""
+"the following file has staged content different from both the\n"
+"file and the HEAD:"
+msgid_plural ""
+"the following files have staged content different from both the\n"
+"file and the HEAD:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/rm.c:236
msgid ""
-"You are not currently on a branch.\n"
-"To push the history leading to the current (detached HEAD)\n"
-"state now, use\n"
"\n"
-" git push %s HEAD:<name-of-remote-branch>\n"
+"(use -f to force removal)"
msgstr ""
-#: builtin/push.c:128
-#, c-format
+#: 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:244 builtin/rm.c:255
msgid ""
-"The current branch %s has no upstream branch.\n"
-"To push the current branch and set the remote as upstream, use\n"
"\n"
-" git push --set-upstream %s %s\n"
+"(use --cached to keep the file, or -f to force removal)"
msgstr ""
-#: builtin/push.c:136
-#, c-format
-msgid "The current branch %s has multiple upstream branches, refusing to push."
+#: 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:270
+msgid "do not list removed files"
msgstr ""
-#: builtin/push.c:139
-#, c-format
-msgid ""
-"You are pushing to remote '%s', which is not the upstream of\n"
-"your current branch '%s', without telling me what to push\n"
-"to update which remote branch."
+#: builtin/rm.c:271
+msgid "only remove from the index"
msgstr ""
-#: builtin/push.c:174
-msgid ""
-"You didn't specify any refspecs to push, and push.default is \"nothing\"."
+#: builtin/rm.c:272
+msgid "override the up-to-date check"
msgstr ""
-#: builtin/push.c:181
-msgid ""
-"Updates were rejected because the tip of your current branch is behind\n"
-"its remote counterpart. Merge the remote changes (e.g. 'git pull')\n"
-"before pushing again.\n"
-"See the 'Note about fast-forwards' in 'git push --help' for details."
+#: builtin/rm.c:273
+msgid "allow recursive removal"
msgstr ""
-#: builtin/push.c:187
-msgid ""
-"Updates were rejected because a pushed branch tip is behind its remote\n"
-"counterpart. If you did not intend to push that branch, you may want to\n"
-"specify branches to push or set the 'push.default' configuration\n"
-"variable to 'current' or 'upstream' to push only the current branch."
+#: builtin/rm.c:275
+msgid "exit with a zero status even if nothing matched"
msgstr ""
-#: builtin/push.c:193
-msgid ""
-"Updates were rejected because a pushed branch tip is behind its remote\n"
-"counterpart. Check out this branch and merge the remote changes\n"
-"(e.g. 'git pull') before pushing again.\n"
-"See the 'Note about fast-forwards' in 'git push --help' for details."
+#: builtin/rm.c:318
+msgid "Please, stage your changes to .gitmodules or stash them to proceed"
msgstr ""
-#: builtin/push.c:233
+#: builtin/rm.c:336
#, c-format
-msgid "Pushing to %s\n"
+msgid "not removing '%s' recursively without -r"
msgstr ""
-#: builtin/push.c:237
+#: builtin/rm.c:375
#, c-format
-msgid "failed to push some refs to '%s'"
+msgid "git rm: unable to remove %s"
msgstr ""
-#: builtin/push.c:269
-#, c-format
-msgid "bad repository '%s'"
+#: builtin/shortlog.c:13
+msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
msgstr ""
-#: builtin/push.c:270
-msgid ""
-"No configured push destination.\n"
-"Either specify the URL from the command-line or configure a remote "
-"repository using\n"
-"\n"
-" git remote add <name> <url>\n"
-"\n"
-"and then push using the remote name\n"
-"\n"
-" git push <name>\n"
+#: builtin/shortlog.c:131
+#, c-format
+msgid "Missing author: %s"
msgstr ""
-#: builtin/push.c:285
-msgid "--all and --tags are incompatible"
+#: builtin/shortlog.c:230
+msgid "sort output according to the number of commits per author"
msgstr ""
-#: builtin/push.c:286
-msgid "--all can't be combined with refspecs"
+#: builtin/shortlog.c:232
+msgid "Suppress commit descriptions, only provides commit count"
msgstr ""
-#: builtin/push.c:291
-msgid "--mirror and --tags are incompatible"
+#: builtin/shortlog.c:234
+msgid "Show the email address of each author"
msgstr ""
-#: builtin/push.c:292
-msgid "--mirror can't be combined with refspecs"
+#: builtin/shortlog.c:235
+msgid "w[,i1[,i2]]"
msgstr ""
-#: builtin/push.c:297
-msgid "--all and --mirror are incompatible"
+#: builtin/shortlog.c:236
+msgid "Linewrap output"
msgstr ""
-#: builtin/push.c:385
-msgid "--delete is incompatible with --all, --mirror and --tags"
+#: builtin/show-branch.c:9
+msgid ""
+"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
+"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
+"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
+"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
msgstr ""
-#: builtin/push.c:387
-msgid "--delete doesn't make sense without any refs"
+#: builtin/show-branch.c:13
+msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
msgstr ""
-#: builtin/remote.c:98
-#, c-format
-msgid "Updating %s"
+#: builtin/show-branch.c:652
+msgid "show remote-tracking and local branches"
msgstr ""
-#: builtin/remote.c:130
-msgid ""
-"--mirror is dangerous and deprecated; please\n"
-"\t use --mirror=fetch or --mirror=push instead"
+#: builtin/show-branch.c:654
+msgid "show remote-tracking branches"
msgstr ""
-#: builtin/remote.c:147
-#, c-format
-msgid "unknown mirror argument: %s"
+#: builtin/show-branch.c:656
+msgid "color '*!+-' corresponding to the branch"
msgstr ""
-#: builtin/remote.c:185
-msgid "specifying a master branch makes no sense with --mirror"
+#: builtin/show-branch.c:658
+msgid "show <n> more commits after the common ancestor"
msgstr ""
-#: builtin/remote.c:187
-msgid "specifying branches to track makes sense only with fetch mirrors"
+#: builtin/show-branch.c:660
+msgid "synonym to more=-1"
msgstr ""
-#: builtin/remote.c:195 builtin/remote.c:646
-#, c-format
-msgid "remote %s already exists."
+#: builtin/show-branch.c:661
+msgid "suppress naming strings"
msgstr ""
-#: builtin/remote.c:199 builtin/remote.c:650
-#, c-format
-msgid "'%s' is not a valid remote name"
+#: builtin/show-branch.c:663
+msgid "include the current branch"
msgstr ""
-#: builtin/remote.c:243
-#, c-format
-msgid "Could not setup master '%s'"
+#: builtin/show-branch.c:665
+msgid "name commits with their object names"
msgstr ""
-#: builtin/remote.c:299
-#, c-format
-msgid "more than one %s"
+#: builtin/show-branch.c:667
+msgid "show possible merge bases"
msgstr ""
-#: builtin/remote.c:339
-#, c-format
-msgid "Could not get fetch map for refspec %s"
+#: builtin/show-branch.c:669
+msgid "show refs unreachable from any other ref"
msgstr ""
-#: builtin/remote.c:440 builtin/remote.c:448
-msgid "(matching)"
+#: builtin/show-branch.c:671
+msgid "show commits in topological order"
msgstr ""
-#: builtin/remote.c:452
-msgid "(delete)"
+#: builtin/show-branch.c:674
+msgid "show only commits not on the first branch"
msgstr ""
-#: builtin/remote.c:595 builtin/remote.c:601 builtin/remote.c:607
-#, c-format
-msgid "Could not append '%s' to '%s'"
+#: builtin/show-branch.c:676
+msgid "show merges reachable from only one tip"
msgstr ""
-#: builtin/remote.c:639 builtin/remote.c:792 builtin/remote.c:890
-#, c-format
-msgid "No such remote: %s"
+#: builtin/show-branch.c:678
+msgid "topologically sort, maintaining date order where possible"
msgstr ""
-#: builtin/remote.c:656
-#, c-format
-msgid "Could not rename config section '%s' to '%s'"
+#: builtin/show-branch.c:681
+msgid "<n>[,<base>]"
msgstr ""
-#: builtin/remote.c:662 builtin/remote.c:799
-#, c-format
-msgid "Could not remove config section '%s'"
+#: builtin/show-branch.c:682
+msgid "show <n> most recent ref-log entries starting at base"
msgstr ""
-#: builtin/remote.c:677
-#, c-format
+#: builtin/show-ref.c:10
msgid ""
-"Not updating non-default fetch refspec\n"
-"\t%s\n"
-"\tPlease update the configuration manually if necessary."
+"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
+"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
msgstr ""
-#: builtin/remote.c:683
-#, c-format
-msgid "Could not append '%s'"
+#: builtin/show-ref.c:11
+msgid "git show-ref --exclude-existing[=pattern] < ref-list"
msgstr ""
-#: builtin/remote.c:694
-#, c-format
-msgid "Could not set '%s'"
+#: builtin/show-ref.c:168
+msgid "only show tags (can be combined with heads)"
msgstr ""
-#: builtin/remote.c:716
-#, c-format
-msgid "deleting '%s' failed"
+#: builtin/show-ref.c:169
+msgid "only show heads (can be combined with tags)"
msgstr ""
-#: builtin/remote.c:750
-#, c-format
-msgid "creating '%s' failed"
+#: builtin/show-ref.c:170
+msgid "stricter reference checking, requires exact ref path"
msgstr ""
-#: builtin/remote.c:764
-#, c-format
-msgid "Could not remove branch %s"
+#: builtin/show-ref.c:173 builtin/show-ref.c:175
+msgid "show the HEAD reference, even if it would be filtered out"
msgstr ""
-#: builtin/remote.c:834
-msgid ""
-"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
-"to delete it, use:"
-msgid_plural ""
-"Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
-"to delete them, use:"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/remote.c:943
-#, c-format
-msgid " new (next fetch will store in remotes/%s)"
+#: builtin/show-ref.c:177
+msgid "dereference tags into object IDs"
msgstr ""
-#: builtin/remote.c:946
-msgid " tracked"
+#: builtin/show-ref.c:179
+msgid "only show SHA1 hash using <n> digits"
msgstr ""
-#: builtin/remote.c:948
-msgid " stale (use 'git remote prune' to remove)"
+#: builtin/show-ref.c:183
+msgid "do not print results to stdout (useful with --verify)"
msgstr ""
-#: builtin/remote.c:950
-msgid " ???"
+#: builtin/show-ref.c:185
+msgid "show refs from stdin that aren't in local repository"
msgstr ""
-#: builtin/remote.c:991
-#, c-format
-msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
+#: builtin/symbolic-ref.c:7
+msgid "git symbolic-ref [<options>] <name> [<ref>]"
msgstr ""
-#: builtin/remote.c:998
-#, c-format
-msgid "rebases onto remote %s"
+#: builtin/symbolic-ref.c:8
+msgid "git symbolic-ref -d [-q] <name>"
msgstr ""
-#: builtin/remote.c:1001
-#, c-format
-msgid " merges with remote %s"
+#: builtin/symbolic-ref.c:40
+msgid "suppress error message for non-symbolic (detached) refs"
msgstr ""
-#: builtin/remote.c:1002
-msgid " and with remote"
+#: builtin/symbolic-ref.c:41
+msgid "delete symbolic ref"
msgstr ""
-#: builtin/remote.c:1004
-#, c-format
-msgid "merges with remote %s"
+#: builtin/symbolic-ref.c:42
+msgid "shorten ref output"
msgstr ""
-#: builtin/remote.c:1005
-msgid " and with remote"
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:358
+msgid "reason"
msgstr ""
-#: builtin/remote.c:1051
-msgid "create"
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:358
+msgid "reason of the update"
msgstr ""
-#: builtin/remote.c:1054
-msgid "delete"
+#: builtin/tag.c:22
+msgid ""
+"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
+"[<head>]"
msgstr ""
-#: builtin/remote.c:1058
-msgid "up to date"
+#: builtin/tag.c:23
+msgid "git tag -d <tagname>..."
msgstr ""
-#: builtin/remote.c:1061
-msgid "fast-forwardable"
+#: builtin/tag.c:24
+msgid ""
+"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>]\n"
+"\t\t[<pattern>...]"
msgstr ""
-#: builtin/remote.c:1064
-msgid "local out of date"
+#: builtin/tag.c:26
+msgid "git tag -v <tagname>..."
msgstr ""
-#: builtin/remote.c:1071
+#: builtin/tag.c:69
#, c-format
-msgid " %-*s forces to %-*s (%s)"
+msgid "malformed object at '%s'"
msgstr ""
-#: builtin/remote.c:1074
+#: builtin/tag.c:301
#, c-format
-msgid " %-*s pushes to %-*s (%s)"
+msgid "tag name too long: %.*s..."
msgstr ""
-#: builtin/remote.c:1078
+#: builtin/tag.c:306
#, c-format
-msgid " %-*s forces to %s"
+msgid "tag '%s' not found."
msgstr ""
-#: builtin/remote.c:1081
+#: builtin/tag.c:321
#, c-format
-msgid " %-*s pushes to %s"
+msgid "Deleted tag '%s' (was %s)\n"
msgstr ""
-#: builtin/remote.c:1118
+#: builtin/tag.c:333
#, c-format
-msgid "* remote %s"
+msgid "could not verify the tag '%s'"
msgstr ""
-#: builtin/remote.c:1119
+#: builtin/tag.c:343
#, c-format
-msgid " Fetch URL: %s"
-msgstr ""
-
-#: builtin/remote.c:1120 builtin/remote.c:1285
-msgid "(no URL)"
+msgid ""
+"\n"
+"Write a message for tag:\n"
+" %s\n"
+"Lines starting with '%c' will be ignored.\n"
msgstr ""
-#: builtin/remote.c:1129 builtin/remote.c:1131
+#: builtin/tag.c:347
#, c-format
-msgid " Push URL: %s"
+msgid ""
+"\n"
+"Write a message for tag:\n"
+" %s\n"
+"Lines starting with '%c' will be kept; you may remove them yourself if you "
+"want to.\n"
msgstr ""
-#: builtin/remote.c:1133 builtin/remote.c:1135 builtin/remote.c:1137
+#: builtin/tag.c:371
#, c-format
-msgid " HEAD branch: %s"
+msgid "unsupported sort specification '%s'"
msgstr ""
-#: builtin/remote.c:1139
+#: builtin/tag.c:373
#, c-format
-msgid ""
-" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
+msgid "unsupported sort specification '%s' in variable '%s'"
msgstr ""
-#: builtin/remote.c:1151
-#, c-format
-msgid " Remote branch:%s"
-msgid_plural " Remote branches:%s"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/remote.c:1154 builtin/remote.c:1181
-msgid " (status not queried)"
+#: builtin/tag.c:428
+msgid "unable to sign the tag"
msgstr ""
-#: builtin/remote.c:1163
-msgid " Local branch configured for 'git pull':"
-msgid_plural " Local branches configured for 'git pull':"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/remote.c:1171
-msgid " Local refs will be mirrored by 'git push'"
+#: builtin/tag.c:430
+msgid "unable to write tag file"
msgstr ""
-#: builtin/remote.c:1178
-#, c-format
-msgid " Local ref configured for 'git push'%s:"
-msgid_plural " Local refs configured for 'git push'%s:"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/remote.c:1216
-msgid "Cannot determine remote HEAD"
+#: builtin/tag.c:455
+msgid "bad object type."
msgstr ""
-#: builtin/remote.c:1218
-msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
+#: builtin/tag.c:468
+msgid "tag header too big."
msgstr ""
-#: builtin/remote.c:1228
-#, c-format
-msgid "Could not delete %s"
+#: builtin/tag.c:504
+msgid "no tag message?"
msgstr ""
-#: builtin/remote.c:1236
+#: builtin/tag.c:510
#, c-format
-msgid "Not a valid ref: %s"
+msgid "The tag message has been left in %s\n"
msgstr ""
-#: builtin/remote.c:1238
-#, c-format
-msgid "Could not setup %s"
+#: builtin/tag.c:559
+msgid "switch 'points-at' requires an object"
msgstr ""
-#: builtin/remote.c:1274
+#: builtin/tag.c:561
#, c-format
-msgid " %s will become dangling!"
+msgid "malformed object name '%s'"
msgstr ""
-#: builtin/remote.c:1275
-#, c-format
-msgid " %s has become dangling!"
+#: builtin/tag.c:589
+msgid "list tag names"
msgstr ""
-#: builtin/remote.c:1281
-#, c-format
-msgid "Pruning %s"
+#: builtin/tag.c:591
+msgid "print <n> lines of each tag message"
msgstr ""
-#: builtin/remote.c:1282
-#, c-format
-msgid "URL: %s"
+#: builtin/tag.c:593
+msgid "delete tags"
msgstr ""
-#: builtin/remote.c:1295
-#, c-format
-msgid " * [would prune] %s"
+#: builtin/tag.c:594
+msgid "verify tags"
msgstr ""
-#: builtin/remote.c:1298
-#, c-format
-msgid " * [pruned] %s"
+#: builtin/tag.c:596
+msgid "Tag creation options"
msgstr ""
-#: builtin/remote.c:1387 builtin/remote.c:1461
-#, c-format
-msgid "No such remote '%s'"
+#: builtin/tag.c:598
+msgid "annotated tag, needs a message"
msgstr ""
-#: builtin/remote.c:1414
-msgid "no remote specified"
+#: builtin/tag.c:600
+msgid "tag message"
msgstr ""
-#: builtin/remote.c:1447
-msgid "--add --delete doesn't make sense"
+#: builtin/tag.c:602
+msgid "annotated and GPG-signed tag"
msgstr ""
-#: builtin/remote.c:1487
-#, c-format
-msgid "Invalid old URL pattern: %s"
+#: builtin/tag.c:606
+msgid "use another key to sign the tag"
msgstr ""
-#: builtin/remote.c:1495
-#, c-format
-msgid "No such URL found: %s"
+#: builtin/tag.c:607
+msgid "replace the tag if exists"
msgstr ""
-#: builtin/remote.c:1497
-msgid "Will not delete all non-push URLs"
+#: builtin/tag.c:609
+msgid "Tag listing options"
msgstr ""
-#: builtin/reset.c:33
-msgid "mixed"
+#: builtin/tag.c:610
+msgid "show tag list in columns"
msgstr ""
-#: builtin/reset.c:33
-msgid "soft"
+#: builtin/tag.c:612
+msgid "sort tags"
msgstr ""
-#: builtin/reset.c:33
-msgid "hard"
+#: builtin/tag.c:617 builtin/tag.c:623
+msgid "print only tags that contain the commit"
msgstr ""
-#: builtin/reset.c:33
-msgid "merge"
+#: builtin/tag.c:629
+msgid "print only tags of the object"
msgstr ""
-#: builtin/reset.c:33
-msgid "keep"
+#: builtin/tag.c:655
+msgid "--column and -n are incompatible"
msgstr ""
-#: builtin/reset.c:77
-msgid "You do not have a valid HEAD."
+#: builtin/tag.c:667
+msgid "--sort and -n are incompatible"
msgstr ""
-#: builtin/reset.c:79
-msgid "Failed to find tree of HEAD."
+#: builtin/tag.c:674
+msgid "-n option is only allowed with -l."
msgstr ""
-#: builtin/reset.c:85
-#, c-format
-msgid "Failed to find tree of %s."
+#: builtin/tag.c:676
+msgid "--contains option is only allowed with -l."
msgstr ""
-#: builtin/reset.c:96
-msgid "Could not write new index file."
+#: builtin/tag.c:678
+msgid "--points-at option is only allowed with -l."
msgstr ""
-#: builtin/reset.c:106
-#, c-format
-msgid "HEAD is now at %s"
+#: builtin/tag.c:686
+msgid "only one -F or -m option is allowed."
msgstr ""
-#: builtin/reset.c:130
-msgid "Could not read index"
+#: builtin/tag.c:706
+msgid "too many params"
msgstr ""
-#: builtin/reset.c:133
-msgid "Unstaged changes after reset:"
+#: builtin/tag.c:712
+#, c-format
+msgid "'%s' is not a valid tag name."
msgstr ""
-#: builtin/reset.c:223
+#: builtin/tag.c:717
#, c-format
-msgid "Cannot do a %s reset in the middle of a merge."
+msgid "tag '%s' already exists"
msgstr ""
-#: builtin/reset.c:297
+#: builtin/tag.c:741
#, c-format
-msgid "Could not parse object '%s'."
+msgid "Updated tag '%s' (was %s)\n"
msgstr ""
-#: builtin/reset.c:302
-msgid "--patch is incompatible with --{hard,mixed,soft}"
+#: builtin/unpack-objects.c:489
+msgid "Unpacking objects"
msgstr ""
-#: builtin/reset.c:311
-msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
+#: builtin/update-index.c:403
+msgid "git update-index [<options>] [--] [<file>...]"
+msgstr ""
+
+#: builtin/update-index.c:757
+msgid "continue refresh even when index needs update"
+msgstr ""
+
+#: builtin/update-index.c:760
+msgid "refresh: ignore submodules"
msgstr ""
-#: builtin/reset.c:313
-#, c-format
-msgid "Cannot do %s reset with paths."
+#: builtin/update-index.c:763
+msgid "do not ignore new files"
msgstr ""
-#: builtin/reset.c:325
-#, c-format
-msgid "%s reset is not allowed in a bare repository"
+#: builtin/update-index.c:765
+msgid "let files replace directories and vice-versa"
msgstr ""
-#: builtin/reset.c:341
-#, c-format
-msgid "Could not reset index file to revision '%s'."
+#: builtin/update-index.c:767
+msgid "notice files missing from worktree"
msgstr ""
-#: builtin/revert.c:70 builtin/revert.c:92
-#, c-format
-msgid "%s: %s cannot be used with %s"
+#: builtin/update-index.c:769
+msgid "refresh even if index contains unmerged entries"
msgstr ""
-#: builtin/revert.c:131
-msgid "program error"
+#: builtin/update-index.c:772
+msgid "refresh stat information"
msgstr ""
-#: builtin/revert.c:221
-msgid "revert failed"
+#: builtin/update-index.c:776
+msgid "like --refresh, but ignore assume-unchanged setting"
msgstr ""
-#: builtin/revert.c:236
-msgid "cherry-pick failed"
+#: builtin/update-index.c:780
+msgid "<mode>,<object>,<path>"
msgstr ""
-#: builtin/rm.c:109
-#, c-format
-msgid ""
-"'%s' has staged content different from both the file and the HEAD\n"
-"(use -f to force removal)"
+#: builtin/update-index.c:781
+msgid "add the specified entry to the index"
msgstr ""
-#: builtin/rm.c:115
-#, c-format
-msgid ""
-"'%s' has changes staged in the index\n"
-"(use --cached to keep the file, or -f to force removal)"
+#: builtin/update-index.c:785
+msgid "(+/-)x"
msgstr ""
-#: builtin/rm.c:119
-#, c-format
-msgid ""
-"'%s' has local modifications\n"
-"(use --cached to keep the file, or -f to force removal)"
+#: builtin/update-index.c:786
+msgid "override the executable bit of the listed files"
msgstr ""
-#: builtin/rm.c:194
-#, c-format
-msgid "not removing '%s' recursively without -r"
+#: builtin/update-index.c:790
+msgid "mark files as \"not changing\""
msgstr ""
-#: builtin/rm.c:230
-#, c-format
-msgid "git rm: unable to remove %s"
+#: builtin/update-index.c:793
+msgid "clear assumed-unchanged bit"
msgstr ""
-#: builtin/shortlog.c:157
-#, c-format
-msgid "Missing author: %s"
+#: builtin/update-index.c:796
+msgid "mark files as \"index-only\""
msgstr ""
-#: builtin/tag.c:60
-#, c-format
-msgid "malformed object at '%s'"
+#: builtin/update-index.c:799
+msgid "clear skip-worktree bit"
msgstr ""
-#: builtin/tag.c:207
-#, c-format
-msgid "tag name too long: %.*s..."
+#: builtin/update-index.c:802
+msgid "add to index only; do not add content to object database"
msgstr ""
-#: builtin/tag.c:212
-#, c-format
-msgid "tag '%s' not found."
+#: builtin/update-index.c:804
+msgid "remove named paths even if present in worktree"
msgstr ""
-#: builtin/tag.c:227
-#, c-format
-msgid "Deleted tag '%s' (was %s)\n"
+#: builtin/update-index.c:806
+msgid "with --stdin: input lines are terminated by null bytes"
msgstr ""
-#: builtin/tag.c:239
-#, c-format
-msgid "could not verify the tag '%s'"
+#: builtin/update-index.c:808
+msgid "read list of paths to be updated from standard input"
msgstr ""
-#: builtin/tag.c:249
-msgid ""
-"\n"
-"#\n"
-"# Write a tag message\n"
-"# Lines starting with '#' will be ignored.\n"
-"#\n"
+#: builtin/update-index.c:812
+msgid "add entries from standard input to the index"
msgstr ""
-#: builtin/tag.c:256
-msgid ""
-"\n"
-"#\n"
-"# Write a tag message\n"
-"# Lines starting with '#' will be kept; you may remove them yourself if you "
-"want to.\n"
-"#\n"
+#: builtin/update-index.c:816
+msgid "repopulate stages #2 and #3 for the listed paths"
msgstr ""
-#: builtin/tag.c:298
-msgid "unable to sign the tag"
+#: builtin/update-index.c:820
+msgid "only update entries that differ from HEAD"
msgstr ""
-#: builtin/tag.c:300
-msgid "unable to write tag file"
+#: builtin/update-index.c:824
+msgid "ignore files missing from worktree"
msgstr ""
-#: builtin/tag.c:325
-msgid "bad object type."
+#: builtin/update-index.c:827
+msgid "report actions to standard output"
msgstr ""
-#: builtin/tag.c:338
-msgid "tag header too big."
+#: builtin/update-index.c:829
+msgid "(for porcelains) forget saved unresolved conflicts"
msgstr ""
-#: builtin/tag.c:370
-msgid "no tag message?"
+#: builtin/update-index.c:833
+msgid "write index in this format"
msgstr ""
-#: builtin/tag.c:376
-#, c-format
-msgid "The tag message has been left in %s\n"
+#: builtin/update-index.c:835
+msgid "enable or disable split index"
msgstr ""
-#: builtin/tag.c:425
-msgid "switch 'points-at' requires an object"
+#: builtin/update-ref.c:9
+msgid "git update-ref [<options>] -d <refname> [<old-val>]"
msgstr ""
-#: builtin/tag.c:427
-#, c-format
-msgid "malformed object name '%s'"
+#: builtin/update-ref.c:10
+msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]"
msgstr ""
-#: builtin/tag.c:506
-msgid "--column and -n are incompatible"
+#: builtin/update-ref.c:11
+msgid "git update-ref [<options>] --stdin [-z]"
msgstr ""
-#: builtin/tag.c:523
-msgid "-n option is only allowed with -l."
+#: builtin/update-ref.c:359
+msgid "delete the reference"
msgstr ""
-#: builtin/tag.c:525
-msgid "--contains option is only allowed with -l."
+#: builtin/update-ref.c:361
+msgid "update <refname> not the one it points to"
msgstr ""
-#: builtin/tag.c:527
-msgid "--points-at option is only allowed with -l."
+#: builtin/update-ref.c:362
+msgid "stdin has NUL-terminated arguments"
msgstr ""
-#: builtin/tag.c:535
-msgid "only one -F or -m option is allowed."
+#: builtin/update-ref.c:363
+msgid "read updates from stdin"
msgstr ""
-#: builtin/tag.c:555
-msgid "too many params"
+#: builtin/update-server-info.c:6
+msgid "git update-server-info [--force]"
msgstr ""
-#: builtin/tag.c:561
-#, c-format
-msgid "'%s' is not a valid tag name."
+#: builtin/update-server-info.c:14
+msgid "update the info files from scratch"
msgstr ""
-#: builtin/tag.c:566
-#, c-format
-msgid "tag '%s' already exists"
+#: builtin/verify-commit.c:17
+msgid "git verify-commit [-v | --verbose] <commit>..."
msgstr ""
-#: builtin/tag.c:584
-#, c-format
-msgid "%s: cannot lock the ref"
+#: builtin/verify-commit.c:75
+msgid "print commit contents"
msgstr ""
-#: builtin/tag.c:586
-#, c-format
-msgid "%s: cannot update the ref"
+#: builtin/verify-pack.c:54
+msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
msgstr ""
-#: builtin/tag.c:588
-#, c-format
-msgid "Updated tag '%s' (was %s)\n"
+#: builtin/verify-pack.c:64
+msgid "verbose"
msgstr ""
-#: git.c:16
-msgid "See 'git help <command>' for more information on a specific command."
+#: builtin/verify-pack.c:66
+msgid "show statistics only"
msgstr ""
-#: parse-options.h:133 parse-options.h:235
-msgid "n"
+#: builtin/verify-tag.c:17
+msgid "git verify-tag [-v | --verbose] <tag>..."
msgstr ""
-#: parse-options.h:141
-msgid "time"
+#: builtin/verify-tag.c:73
+msgid "print tag contents"
msgstr ""
-#: parse-options.h:149
-msgid "file"
+#: builtin/write-tree.c:13
+msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
msgstr ""
-#: parse-options.h:151
-msgid "when"
+#: builtin/write-tree.c:26
+msgid "<prefix>/"
msgstr ""
-#: parse-options.h:156
-msgid "no-op (backward compatibility)"
+#: builtin/write-tree.c:27
+msgid "write tree object for a subdirectory <prefix>"
msgstr ""
-#: parse-options.h:228
-msgid "be more verbose"
+#: builtin/write-tree.c:30
+msgid "only useful for debugging"
msgstr ""
-#: parse-options.h:230
-msgid "be more quiet"
+#: credential-cache--daemon.c:267
+msgid "print debugging messages to stderr"
msgstr ""
-#: parse-options.h:236
-msgid "use <n> digits to display SHA-1s"
+#: git.c:14
+msgid ""
+"'git help -a' and 'git help -g' list available subcommands and some\n"
+"concept guides. See 'git help <command>' or 'git help <concept>'\n"
+"to read about a specific subcommand or concept."
msgstr ""
#: common-cmds.h:8
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 ""
#: common-cmds.h:21
-msgid "Fetch from and merge with another repository or a local branch"
+msgid "Fetch from and integrate with another repository or a local branch"
msgstr ""
#: common-cmds.h:22
msgid "Create, list, delete or verify a tag object signed with GPG"
msgstr ""
-#: git-am.sh:50
+#: parse-options.h:143
+msgid "expiry-date"
+msgstr ""
+
+#: parse-options.h:158
+msgid "no-op (backward compatibility)"
+msgstr ""
+
+#: parse-options.h:232
+msgid "be more verbose"
+msgstr ""
+
+#: parse-options.h:234
+msgid "be more quiet"
+msgstr ""
+
+#: parse-options.h:240
+msgid "use <n> digits to display SHA-1s"
+msgstr ""
+
+#: rerere.h:27
+msgid "update the index with reused conflict resolution if possible"
+msgstr ""
+
+#: git-am.sh:53
msgid "You need to set your committer info first"
msgstr ""
-#: git-am.sh:95
+#: git-am.sh:98
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
msgstr ""
-#: git-am.sh:105
+#: git-am.sh:108
#, sh-format
msgid ""
-"When you have resolved this problem run \"$cmdline --resolved\".\n"
-"If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"
-"To restore the original branch and stop patching run \"$cmdline --abort\"."
+"When you have resolved this problem, run \"$cmdline --continue\".\n"
+"If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n"
+"To restore the original branch and stop patching, run \"$cmdline --abort\"."
msgstr ""
-#: git-am.sh:121
+#: git-am.sh:124
msgid "Cannot fall back to three-way merge."
msgstr ""
-#: git-am.sh:137
+#: git-am.sh:140
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr ""
-#: git-am.sh:154
+#: git-am.sh:142
+msgid "Using index info to reconstruct a base tree..."
+msgstr ""
+
+#: git-am.sh:157
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
msgstr ""
-#: git-am.sh:163
+#: git-am.sh:166
msgid "Falling back to patching base and 3-way merge..."
msgstr ""
-#: git-am.sh:275
+#: git-am.sh:182
+msgid "Failed to merge in the changes."
+msgstr ""
+
+#: git-am.sh:277
msgid "Only one StGIT patch series can be applied at once"
msgstr ""
-#: git-am.sh:362
+#: git-am.sh:364
#, sh-format
msgid "Patch format $patch_format is not supported."
msgstr ""
-#: git-am.sh:364
+#: git-am.sh:366
msgid "Patch format detection failed."
msgstr ""
-#: git-am.sh:418
-msgid "-d option is no longer supported. Do not use."
+#: git-am.sh:398
+msgid ""
+"The -b/--binary option has been a no-op for long time, and\n"
+"it will be removed. Please do not use it anymore."
msgstr ""
-#: git-am.sh:481
+#: git-am.sh:496
#, sh-format
msgid "previous rebase directory $dotest still exists but mbox given."
msgstr ""
-#: git-am.sh:486
+#: git-am.sh:501
msgid "Please make up your mind. --skip or --abort?"
msgstr ""
-#: git-am.sh:513
+#: git-am.sh:537
+#, sh-format
+msgid ""
+"Stray $dotest directory found.\n"
+"Use \"git am --abort\" to remove it."
+msgstr ""
+
+#: git-am.sh:545
msgid "Resolve operation not in progress, we are not resuming."
msgstr ""
-#: git-am.sh:579
+#: git-am.sh:612
#, sh-format
msgid "Dirty index: cannot apply patches (dirty: $files)"
msgstr ""
-#: git-am.sh:671
+#: git-am.sh:722
#, sh-format
msgid ""
"Patch is empty. Was it split wrong?\n"
"To restore the original branch and stop patching run \"$cmdline --abort\"."
msgstr ""
-#: git-am.sh:708
+#: git-am.sh:749
msgid "Patch does not have a valid e-mail address."
msgstr ""
-#: git-am.sh:755
+#: git-am.sh:796
msgid "cannot be interactive without stdin connected to a terminal."
msgstr ""
-#: git-am.sh:759
+#: git-am.sh:800
msgid "Commit Body is:"
msgstr ""
#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
#. in your translation. The program will only accept English
#. input at this point.
-#: git-am.sh:766
+#: git-am.sh:807
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
msgstr ""
-#: git-am.sh:802
+#: git-am.sh:843
#, sh-format
msgid "Applying: $FIRSTLINE"
msgstr ""
-#: git-am.sh:823
+#: git-am.sh:864
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
"already introduced the same changes; you might want to skip this patch."
msgstr ""
-#: git-am.sh:831
+#: git-am.sh:872
msgid ""
"You still have unmerged paths in your index\n"
"did you forget to use 'git add'?"
msgstr ""
-#: git-am.sh:847
+#: git-am.sh:888
msgid "No changes -- Patch already applied."
msgstr ""
-#: git-am.sh:857
+#: git-am.sh:898
#, sh-format
msgid "Patch failed at $msgnum $FIRSTLINE"
msgstr ""
-#: git-am.sh:873
+#: git-am.sh:901
+#, sh-format
+msgid ""
+"The copy of the patch that failed is found in:\n"
+" $dotest/patch"
+msgstr ""
+
+#: git-am.sh:919
msgid "applying to an empty history"
msgstr ""
#: git-bisect.sh:130
#, sh-format
msgid ""
-"Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'."
+"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
msgstr ""
#: git-bisect.sh:140
-msgid "won't bisect on seeked tree"
+msgid "won't bisect on cg-seek'ed tree"
msgstr ""
#: git-bisect.sh:144
msgid "Bad rev input: $rev"
msgstr ""
-#: git-bisect.sh:250
+#: git-bisect.sh:253
msgid "'git bisect bad' can take only one argument."
msgstr ""
-#. have bad but not good. we could bisect although
-#. this is less optimum.
-#: git-bisect.sh:273
+#: git-bisect.sh:276
msgid "Warning: bisecting only with a bad commit."
msgstr ""
#. TRANSLATORS: Make sure to include [Y] and [n] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-bisect.sh:279
+#: git-bisect.sh:282
msgid "Are you sure [Y/n]? "
msgstr ""
-#: git-bisect.sh:289
+#: git-bisect.sh:292
msgid ""
-"You need to give me at least one good and one bad revisions.\n"
+"You need to give me at least one good and one bad revision.\n"
"(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
msgstr ""
-#: git-bisect.sh:292
+#: git-bisect.sh:295
msgid ""
"You need to start by \"git bisect start\".\n"
-"You then need to give me at least one good and one bad revisions.\n"
+"You then need to give me at least one good and one bad revision.\n"
"(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
msgstr ""
-#: git-bisect.sh:347 git-bisect.sh:474
+#: git-bisect.sh:366 git-bisect.sh:493
msgid "We are not bisecting."
msgstr ""
-#: git-bisect.sh:354
+#: git-bisect.sh:373
#, sh-format
msgid "'$invalid' is not a valid commit"
msgstr ""
-#: git-bisect.sh:363
+#: git-bisect.sh:382
#, sh-format
msgid ""
"Could not check out original HEAD '$branch'.\n"
"Try 'git bisect reset <commit>'."
msgstr ""
-#: git-bisect.sh:390
+#: git-bisect.sh:409
msgid "No logfile given"
msgstr ""
-#: git-bisect.sh:391
+#: git-bisect.sh:410
#, sh-format
msgid "cannot read $file for replaying"
msgstr ""
-#: git-bisect.sh:408
+#: git-bisect.sh:427
msgid "?? what are you talking about?"
msgstr ""
-#: git-bisect.sh:420
+#: git-bisect.sh:439
#, sh-format
msgid "running $command"
msgstr ""
-#: git-bisect.sh:427
+#: git-bisect.sh:446
#, sh-format
msgid ""
"bisect run failed:\n"
"exit code $res from '$command' is < 0 or >= 128"
msgstr ""
-#: git-bisect.sh:453
+#: git-bisect.sh:472
msgid "bisect run cannot continue any more"
msgstr ""
-#: git-bisect.sh:459
+#: git-bisect.sh:478
#, sh-format
msgid ""
"bisect run failed:\n"
"'bisect_state $state' exited with error code $res"
msgstr ""
-#: git-bisect.sh:466
+#: git-bisect.sh:485
msgid "bisect run success"
msgstr ""
msgid ""
"Pull is not possible because you have unmerged files.\n"
"Please, fix them up in the work tree, and then use 'git add/rm <file>'\n"
-"as appropriate to mark resolution, or use 'git commit -a'."
+"as appropriate to mark resolution and make a commit."
msgstr ""
#: git-pull.sh:25
msgid "Pull is not possible because you have unmerged files."
msgstr ""
-#: git-pull.sh:197
+#: git-pull.sh:31
+msgid ""
+"You have not concluded your merge (MERGE_HEAD exists).\n"
+"Please, commit your changes before you can merge."
+msgstr ""
+
+#: git-pull.sh:245
msgid "updating an unborn branch with changes added to the index"
msgstr ""
-#. The fetch involved updating the current branch.
-#. The working tree and the index file is still based on the
-#. $orig_head commit, but we are merging into $curr_head.
-#. First update the working tree to match $curr_head.
-#: git-pull.sh:228
+#: git-pull.sh:269
#, sh-format
msgid ""
"Warning: fetch updated the current branch head.\n"
"Warning: commit $orig_head."
msgstr ""
-#: git-pull.sh:253
+#: git-pull.sh:294
msgid "Cannot merge multiple branches into empty head"
msgstr ""
-#: git-pull.sh:257
+#: git-pull.sh:298
msgid "Cannot rebase onto multiple branches"
msgstr ""
+#: git-rebase.sh:57
+msgid ""
+"When you have resolved this problem, run \"git rebase --continue\".\n"
+"If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
+"To check out the original branch and stop rebasing, run \"git rebase --abort"
+"\"."
+msgstr ""
+
+#: git-rebase.sh:165
+msgid "Applied autostash."
+msgstr ""
+
+#: git-rebase.sh:168
+#, sh-format
+msgid "Cannot store $stash_sha1"
+msgstr ""
+
+#: git-rebase.sh:169
+msgid ""
+"Applying autostash resulted in conflicts.\n"
+"Your changes are safe in the stash.\n"
+"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
+msgstr ""
+
+#: git-rebase.sh:208
+msgid "The pre-rebase hook refused to rebase."
+msgstr ""
+
+#: git-rebase.sh:213
+msgid "It looks like git-am is in progress. Cannot rebase."
+msgstr ""
+
+#: git-rebase.sh:351
+msgid "The --exec option must be used with the --interactive option"
+msgstr ""
+
+#: git-rebase.sh:356
+msgid "No rebase in progress?"
+msgstr ""
+
+#: git-rebase.sh:367
+msgid "The --edit-todo action can only be used during interactive rebase."
+msgstr ""
+
+#: git-rebase.sh:374
+msgid "Cannot read HEAD"
+msgstr ""
+
+#: git-rebase.sh:377
+msgid ""
+"You must edit all merge conflicts and then\n"
+"mark them as resolved using git add"
+msgstr ""
+
+#: git-rebase.sh:395
+#, sh-format
+msgid "Could not move back to $head_name"
+msgstr ""
+
+#: git-rebase.sh:414
+#, sh-format
+msgid ""
+"It seems that there is already a $state_dir_base directory, and\n"
+"I wonder if you are in the middle of another rebase. If that is the\n"
+"case, please try\n"
+"\t$cmd_live_rebase\n"
+"If that is not the case, please\n"
+"\t$cmd_clear_stale_rebase\n"
+"and run me again. I am stopping in case you still have something\n"
+"valuable there."
+msgstr ""
+
+#: git-rebase.sh:465
+#, sh-format
+msgid "invalid upstream $upstream_name"
+msgstr ""
+
+#: git-rebase.sh:489
+#, sh-format
+msgid "$onto_name: there are more than one merge bases"
+msgstr ""
+
+#: git-rebase.sh:492 git-rebase.sh:496
+#, sh-format
+msgid "$onto_name: there is no merge base"
+msgstr ""
+
+#: git-rebase.sh:501
+#, sh-format
+msgid "Does not point to a valid commit: $onto_name"
+msgstr ""
+
+#: git-rebase.sh:524
+#, sh-format
+msgid "fatal: no such branch: $branch_name"
+msgstr ""
+
+#: git-rebase.sh:557
+msgid "Cannot autostash"
+msgstr ""
+
+#: git-rebase.sh:562
+#, sh-format
+msgid "Created autostash: $stash_abbrev"
+msgstr ""
+
+#: git-rebase.sh:566
+msgid "Please commit or stash them."
+msgstr ""
+
+#: git-rebase.sh:586
+#, sh-format
+msgid "Current branch $branch_name is up to date."
+msgstr ""
+
+#: git-rebase.sh:590
+#, sh-format
+msgid "Current branch $branch_name is up to date, rebase forced."
+msgstr ""
+
+#: git-rebase.sh:601
+#, sh-format
+msgid "Changes from $mb to $onto:"
+msgstr ""
+
+#: git-rebase.sh:610
+msgid "First, rewinding head to replay your work on top of it..."
+msgstr ""
+
+#: git-rebase.sh:620
+#, sh-format
+msgid "Fast-forwarded $branch_name to $onto_name."
+msgstr ""
+
#: git-stash.sh:51
msgid "git stash clear with parameters is unimplemented"
msgstr ""
msgid "Cannot save the current index state"
msgstr ""
-#: git-stash.sh:123 git-stash.sh:136
+#: git-stash.sh:124 git-stash.sh:137
msgid "Cannot save the current worktree state"
msgstr ""
-#: git-stash.sh:140
+#: git-stash.sh:141
msgid "No changes selected"
msgstr ""
-#: git-stash.sh:143
+#: git-stash.sh:144
msgid "Cannot remove temporary index (can't happen)"
msgstr ""
-#: git-stash.sh:156
+#: git-stash.sh:157
msgid "Cannot record working tree state"
msgstr ""
+#: git-stash.sh:191
+#, sh-format
+msgid "Cannot update $ref_stash with $w_commit"
+msgstr ""
+
#. TRANSLATORS: $option is an invalid option, like
#. `--blah-blah'. The 7 spaces at the beginning of the
#. second line correspond to "error: ". So you should line
#. $ git stash save --blah-blah 2>&1 | head -n 2
#. error: unknown option for 'stash save': --blah-blah
#. To provide a message, use git stash save -- '--blah-blah'
-#: git-stash.sh:202
+#: git-stash.sh:238
#, sh-format
msgid ""
"error: unknown option for 'stash save': $option\n"
" To provide a message, use git stash save -- '$option'"
msgstr ""
-#: git-stash.sh:223
+#: git-stash.sh:259
msgid "No local changes to save"
msgstr ""
-#: git-stash.sh:227
+#: git-stash.sh:263
msgid "Cannot initialize stash"
msgstr ""
-#: git-stash.sh:235
+#: git-stash.sh:267
msgid "Cannot save the current status"
msgstr ""
-#: git-stash.sh:253
+#: git-stash.sh:285
msgid "Cannot remove worktree changes"
msgstr ""
-#: git-stash.sh:352
+#: git-stash.sh:384
msgid "No stash found."
msgstr ""
-#: git-stash.sh:359
+#: git-stash.sh:391
#, sh-format
msgid "Too many revisions specified: $REV"
msgstr ""
-#: git-stash.sh:365
+#: git-stash.sh:397
#, sh-format
-msgid "$reference is not valid reference"
+msgid "$reference is not a valid reference"
msgstr ""
-#: git-stash.sh:393
+#: git-stash.sh:425
#, sh-format
msgid "'$args' is not a stash-like commit"
msgstr ""
-#: git-stash.sh:404
+#: git-stash.sh:436
#, sh-format
msgid "'$args' is not a stash reference"
msgstr ""
-#: git-stash.sh:412
+#: git-stash.sh:444
msgid "unable to refresh index"
msgstr ""
-#: git-stash.sh:416
+#: git-stash.sh:448
msgid "Cannot apply a stash in the middle of a merge"
msgstr ""
-#: git-stash.sh:424
+#: git-stash.sh:456
msgid "Conflicts in index. Try without --index."
msgstr ""
-#: git-stash.sh:426
+#: git-stash.sh:458
msgid "Could not save index tree"
msgstr ""
-#: git-stash.sh:460
+#: git-stash.sh:492
msgid "Cannot unstage modified files"
msgstr ""
-#: git-stash.sh:474
+#: git-stash.sh:507
msgid "Index was not unstashed."
msgstr ""
-#: git-stash.sh:491
+#: git-stash.sh:530
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr ""
-#: git-stash.sh:492
+#: git-stash.sh:531
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr ""
-#: git-stash.sh:499
+#: git-stash.sh:539
msgid "No branch name specified"
msgstr ""
-#: git-stash.sh:570
+#: git-stash.sh:611
msgid "(To restore them type \"git stash apply\")"
msgstr ""
-#: git-submodule.sh:88
+#: git-submodule.sh:95
#, sh-format
msgid "cannot strip one component off url '$remoteurl'"
msgstr ""
-#: git-submodule.sh:145
+#: git-submodule.sh:237
#, sh-format
msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
msgstr ""
-#: git-submodule.sh:186
+#: git-submodule.sh:287
#, sh-format
msgid "Clone of '$url' into submodule path '$sm_path' failed"
msgstr ""
-#: git-submodule.sh:196
+#: git-submodule.sh:296
#, sh-format
msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
msgstr ""
-#: git-submodule.sh:285
+#: git-submodule.sh:406
+msgid "Relative path can only be used from the toplevel of the working tree"
+msgstr ""
+
+#: git-submodule.sh:416
#, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
msgstr ""
-#: git-submodule.sh:302
+#: git-submodule.sh:433
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr ""
-#: git-submodule.sh:306
+#: git-submodule.sh:437
#, sh-format
msgid ""
"The following path is ignored by one of your .gitignore files:\n"
"Use -f if you really want to add it."
msgstr ""
-#: git-submodule.sh:317
+#: git-submodule.sh:455
#, sh-format
msgid "Adding existing repo at '$sm_path' to the index"
msgstr ""
-#: git-submodule.sh:319
+#: git-submodule.sh:457
#, sh-format
msgid "'$sm_path' already exists and is not a valid git repo"
msgstr ""
-#: git-submodule.sh:333
+#: git-submodule.sh:465
+#, sh-format
+msgid "A git directory for '$sm_name' is found locally with remote(s):"
+msgstr ""
+
+#: git-submodule.sh:467
+#, sh-format
+msgid ""
+"If you want to reuse this local git directory instead of cloning again from"
+msgstr ""
+
+#: git-submodule.sh:469
+#, sh-format
+msgid ""
+"use the '--force' option. If the local git directory is not the correct repo"
+msgstr ""
+
+#: git-submodule.sh:470
+#, sh-format
+msgid ""
+"or you are unsure what this means choose another name with the '--name' "
+"option."
+msgstr ""
+
+#: git-submodule.sh:472
+#, sh-format
+msgid "Reactivating local git directory for submodule '$sm_name'."
+msgstr ""
+
+#: git-submodule.sh:484
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
msgstr ""
-#: git-submodule.sh:338
+#: git-submodule.sh:489
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr ""
-#: git-submodule.sh:343
+#: git-submodule.sh:498
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr ""
-#: git-submodule.sh:385
+#: git-submodule.sh:542
+#, sh-format
+msgid "Entering '$prefix$displaypath'"
+msgstr ""
+
+#: git-submodule.sh:562
+#, sh-format
+msgid "Stopping at '$prefix$displaypath'; script returned non-zero status."
+msgstr ""
+
+#: git-submodule.sh:608
+#, sh-format
+msgid "No url found for submodule path '$displaypath' in .gitmodules"
+msgstr ""
+
+#: git-submodule.sh:617
+#, sh-format
+msgid "Failed to register url for submodule path '$displaypath'"
+msgstr ""
+
+#: git-submodule.sh:619
+#, sh-format
+msgid "Submodule '$name' ($url) registered for path '$displaypath'"
+msgstr ""
+
+#: git-submodule.sh:636
+#, sh-format
+msgid "Failed to register update mode for submodule path '$displaypath'"
+msgstr ""
+
+#: git-submodule.sh:674
+#, sh-format
+msgid "Use '.' if you really want to deinitialize all submodules"
+msgstr ""
+
+#: git-submodule.sh:691
+#, sh-format
+msgid "Submodule work tree '$displaypath' contains a .git directory"
+msgstr ""
+
+#: git-submodule.sh:692
#, sh-format
-msgid "Entering '$prefix$sm_path'"
+msgid ""
+"(use 'rm -rf' if you really want to remove it including all of its history)"
msgstr ""
-#: git-submodule.sh:399
+#: git-submodule.sh:698
#, sh-format
-msgid "Stopping at '$sm_path'; script returned non-zero status."
+msgid ""
+"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
+"discard them"
msgstr ""
-#: git-submodule.sh:442
+#: git-submodule.sh:701
#, sh-format
-msgid "No url found for submodule path '$sm_path' in .gitmodules"
+msgid "Cleared directory '$displaypath'"
msgstr ""
-#: git-submodule.sh:451
+#: git-submodule.sh:702
#, sh-format
-msgid "Failed to register url for submodule path '$sm_path'"
+msgid "Could not remove submodule work tree '$displaypath'"
msgstr ""
-#: git-submodule.sh:453
+#: git-submodule.sh:705
#, sh-format
-msgid "Submodule '$name' ($url) registered for path '$sm_path'"
+msgid "Could not create empty submodule directory '$displaypath'"
msgstr ""
-#: git-submodule.sh:461
+#: git-submodule.sh:714
#, sh-format
-msgid "Failed to register update mode for submodule path '$sm_path'"
+msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
msgstr ""
-#: git-submodule.sh:560
+#: git-submodule.sh:830
#, sh-format
msgid ""
-"Submodule path '$sm_path' not initialized\n"
+"Submodule path '$displaypath' not initialized\n"
"Maybe you want to use 'update --init'?"
msgstr ""
-#: git-submodule.sh:573
+#: git-submodule.sh:843
#, sh-format
-msgid "Unable to find current revision in submodule path '$sm_path'"
+msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:592
+#: git-submodule.sh:852
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr ""
-#: git-submodule.sh:606
+#: git-submodule.sh:876
#, sh-format
-msgid "Unable to rebase '$sha1' in submodule path '$sm_path'"
+msgid "Unable to fetch in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:607
+#: git-submodule.sh:890
#, sh-format
-msgid "Submodule path '$sm_path': rebased into '$sha1'"
+msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:612
+#: git-submodule.sh:891
#, sh-format
-msgid "Unable to merge '$sha1' in submodule path '$sm_path'"
+msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr ""
-#: git-submodule.sh:613
+#: git-submodule.sh:895
#, sh-format
-msgid "Submodule path '$sm_path': merged in '$sha1'"
+msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:618
+#: git-submodule.sh:896
#, sh-format
-msgid "Unable to checkout '$sha1' in submodule path '$sm_path'"
+msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr ""
-#: git-submodule.sh:619
+#: git-submodule.sh:901
#, sh-format
-msgid "Submodule path '$sm_path': checked out '$sha1'"
+msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:641 git-submodule.sh:964
+#: git-submodule.sh:902
#, sh-format
-msgid "Failed to recurse into submodule path '$sm_path'"
+msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr ""
-#: git-submodule.sh:749
-msgid "--cached cannot be used with --files"
+#: git-submodule.sh:907
+#, sh-format
+msgid ""
+"Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'"
msgstr ""
-#. unexpected type
-#: git-submodule.sh:789
+#: git-submodule.sh:908
#, sh-format
-msgid "unexpected mode $mod_dst"
+msgid "Submodule path '$prefix$sm_path': '$command $sha1'"
msgstr ""
-#: git-submodule.sh:807
+#: git-submodule.sh:938
#, sh-format
-msgid " Warn: $name doesn't contain commit $sha1_src"
+msgid "Failed to recurse into submodule path '$displaypath'"
+msgstr ""
+
+#: git-submodule.sh:1046
+msgid "The --cached option cannot be used with the --files option"
msgstr ""
-#: git-submodule.sh:810
+#: git-submodule.sh:1098
#, sh-format
-msgid " Warn: $name doesn't contain commit $sha1_dst"
+msgid "unexpected mode $mod_dst"
msgstr ""
-#: git-submodule.sh:813
+#: git-submodule.sh:1118
#, sh-format
-msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst"
+msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr ""
-#: git-submodule.sh:838
-msgid "blob"
+#: git-submodule.sh:1121
+#, sh-format
+msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr ""
-#: git-submodule.sh:839
-msgid "submodule"
+#: git-submodule.sh:1124
+#, sh-format
+msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
msgstr ""
-#: git-submodule.sh:876
-msgid "# Submodules changed but not updated:"
+#: git-submodule.sh:1149
+msgid "blob"
msgstr ""
-#: git-submodule.sh:878
-msgid "# Submodule changes to be committed:"
+#: git-submodule.sh:1267
+#, sh-format
+msgid "Failed to recurse into submodule path '$sm_path'"
msgstr ""
-#: git-submodule.sh:1022
+#: git-submodule.sh:1331
#, sh-format
-msgid "Synchronizing submodule url for '$name'"
+msgid "Synchronizing submodule url for '$displaypath'"
msgstr ""