msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2016-08-27 23:21+0800\n"
+"POT-Creation-Date: 2017-02-18 01:00+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"
msgid "Exiting because of an unresolved conflict."
msgstr ""
-#: advice.c:114 builtin/merge.c:1181
+#: advice.c:114 builtin/merge.c:1206
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr ""
"\n"
msgstr ""
-#: archive.c:12
-msgid "git archive [<options>] <tree-ish> [<path>...]"
+#: apply.c:57
+#, c-format
+msgid "unrecognized whitespace option '%s'"
msgstr ""
-#: archive.c:13
-msgid "git archive --list"
+#: apply.c:73
+#, c-format
+msgid "unrecognized whitespace ignore option '%s'"
msgstr ""
-#: archive.c:14
-msgid ""
-"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
+#: apply.c:125
+msgid "--reject and --3way cannot be used together."
msgstr ""
-#: archive.c:15
-msgid "git archive --remote <repo> [--exec <cmd>] --list"
+#: apply.c:127
+msgid "--cached and --3way cannot be used together."
msgstr ""
-#: archive.c:344 builtin/add.c:139 builtin/add.c:435 builtin/rm.c:327
-#, c-format
-msgid "pathspec '%s' did not match any files"
+#: apply.c:130
+msgid "--3way outside a repository"
msgstr ""
-#: archive.c:429
-msgid "fmt"
+#: apply.c:141
+msgid "--index outside a repository"
msgstr ""
-#: archive.c:429
-msgid "archive format"
+#: apply.c:144
+msgid "--cached outside a repository"
msgstr ""
-#: archive.c:430 builtin/log.c:1422
-msgid "prefix"
+#: apply.c:845
+#, c-format
+msgid "Cannot prepare timestamp regexp %s"
msgstr ""
-#: archive.c:431
-msgid "prepend prefix to each pathname in the archive"
+#: apply.c:854
+#, c-format
+msgid "regexec returned %d for input: %s"
msgstr ""
-#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2553
-#: builtin/blame.c:2554 builtin/config.c:59 builtin/fast-export.c:987
-#: builtin/fast-export.c:989 builtin/grep.c:722 builtin/hash-object.c:100
-#: builtin/ls-files.c:460 builtin/ls-files.c:463 builtin/notes.c:399
-#: builtin/notes.c:562 builtin/read-tree.c:109 parse-options.h:153
-msgid "file"
+#: apply.c:938
+#, c-format
+msgid "unable to find filename in patch at line %d"
msgstr ""
-#: archive.c:433 builtin/archive.c:89
-msgid "write the archive to this file"
+#: apply.c:977
+#, c-format
+msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
msgstr ""
-#: archive.c:435
-msgid "read .gitattributes in working directory"
+#: apply.c:983
+#, c-format
+msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr ""
-#: archive.c:436
-msgid "report archived files on stderr"
+#: apply.c:984
+#, c-format
+msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr ""
-#: archive.c:437
-msgid "store only"
+#: apply.c:990
+#, c-format
+msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr ""
-#: archive.c:438
-msgid "compress faster"
+#: apply.c:1488
+#, c-format
+msgid "recount: unexpected line: %.*s"
msgstr ""
-#: archive.c:446
-msgid "compress better"
+#: apply.c:1557
+#, c-format
+msgid "patch fragment without header at line %d: %.*s"
msgstr ""
-#: archive.c:449
-msgid "list supported archive formats"
-msgstr ""
+#: apply.c:1577
+#, 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] ""
-#: archive.c:451 builtin/archive.c:90 builtin/clone.c:82
-#: builtin/submodule--helper.c:832
-msgid "repo"
+#: apply.c:1589
+#, c-format
+msgid "git diff header lacks filename information (line %d)"
msgstr ""
-#: archive.c:452 builtin/archive.c:91
-msgid "retrieve the archive from remote repository <repo>"
+#: apply.c:1759
+msgid "new file depends on old contents"
msgstr ""
-#: archive.c:453 builtin/archive.c:92 builtin/notes.c:483
-msgid "command"
+#: apply.c:1761
+msgid "deleted file still has contents"
msgstr ""
-#: archive.c:454 builtin/archive.c:93
-msgid "path to the remote git-upload-archive command"
+#: apply.c:1795
+#, c-format
+msgid "corrupt patch at line %d"
msgstr ""
-#: archive.c:461
-msgid "Unexpected option --remote"
+#: apply.c:1832
+#, c-format
+msgid "new file %s depends on old contents"
msgstr ""
-#: archive.c:463
-msgid "Option --exec can only be used together with --remote"
+#: apply.c:1834
+#, c-format
+msgid "deleted file %s still has contents"
msgstr ""
-#: archive.c:465
-msgid "Unexpected option --output"
+#: apply.c:1837
+#, c-format
+msgid "** warning: file %s becomes empty but is not deleted"
msgstr ""
-#: archive.c:487
+#: apply.c:1984
#, c-format
-msgid "Unknown archive format '%s'"
+msgid "corrupt binary patch at line %d: %.*s"
msgstr ""
-#: archive.c:494
+#: apply.c:2021
#, c-format
-msgid "Argument not supported for format '%s': -%d"
+msgid "unrecognized binary patch at line %d"
msgstr ""
-#: attr.c:263
-msgid ""
-"Negative patterns are ignored in git attributes\n"
-"Use '\\!' for literal leading exclamation."
+#: apply.c:2182
+#, c-format
+msgid "patch with only garbage at line %d"
msgstr ""
-#: bisect.c:441
+#: apply.c:2265
#, c-format
-msgid "Could not open file '%s'"
+msgid "unable to read symlink %s"
msgstr ""
-#: bisect.c:446
+#: apply.c:2269
#, c-format
-msgid "Badly quoted content in file '%s': %s"
+msgid "unable to open or read %s"
msgstr ""
-#: bisect.c:655
+#: apply.c:2922
#, c-format
-msgid "We cannot bisect more!\n"
+msgid "invalid start of line: '%c'"
msgstr ""
-#: bisect.c:708
+#: apply.c:3041
#, c-format
-msgid "Not a valid commit name %s"
+msgid "Hunk #%d succeeded at %d (offset %d line)."
+msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apply.c:3053
+#, c-format
+msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr ""
-#: bisect.c:732
+#: apply.c:3059
#, c-format
msgid ""
-"The merge base %s is bad.\n"
-"This means the bug has been fixed between %s and [%s].\n"
+"while searching for:\n"
+"%.*s"
msgstr ""
-#: bisect.c:737
+#: apply.c:3081
#, c-format
-msgid ""
-"The merge base %s is new.\n"
-"The property has changed between %s and [%s].\n"
+msgid "missing binary patch data for '%s'"
msgstr ""
-#: bisect.c:742
+#: apply.c:3089
#, c-format
-msgid ""
-"The merge base %s is %s.\n"
-"This means the first '%s' commit is between %s and [%s].\n"
+msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
msgstr ""
-#: bisect.c:750
+#: apply.c:3135
#, c-format
-msgid ""
-"Some %s revs are not ancestor of the %s rev.\n"
-"git bisect cannot work properly in this case.\n"
-"Maybe you mistook %s and %s revs?\n"
+msgid "cannot apply binary patch to '%s' without full index line"
msgstr ""
-#: bisect.c:763
+#: apply.c:3145
#, c-format
msgid ""
-"the merge base between %s and [%s] must be skipped.\n"
-"So we cannot be sure the first %s commit is between %s and %s.\n"
-"We continue anyway."
+"the patch applies to '%s' (%s), which does not match the current contents."
msgstr ""
-#: bisect.c:798
+#: apply.c:3153
#, c-format
-msgid "Bisecting: a merge base must be tested\n"
+msgid "the patch applies to an empty '%s' but it is not empty"
msgstr ""
-#: bisect.c:849
+#: apply.c:3171
#, c-format
-msgid "a %s revision is needed"
+msgid "the necessary postimage %s for '%s' cannot be read"
msgstr ""
-#: bisect.c:866 builtin/notes.c:174 builtin/tag.c:248
+#: apply.c:3184
#, c-format
-msgid "could not create file '%s'"
+msgid "binary patch does not apply to '%s'"
msgstr ""
-#: bisect.c:917
+#: apply.c:3190
#, c-format
-msgid "could not read file '%s'"
+msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr ""
-#: bisect.c:947
-msgid "reading bisect refs failed"
+#: apply.c:3211
+#, c-format
+msgid "patch failed: %s:%ld"
msgstr ""
-#: bisect.c:967
+#: apply.c:3333
#, c-format
-msgid "%s was both %s and %s\n"
+msgid "cannot checkout %s"
msgstr ""
-#: bisect.c:975
+#: apply.c:3381 apply.c:3392 apply.c:3438 setup.c:248
#, c-format
-msgid ""
-"No testable commit found.\n"
-"Maybe you started with bad path parameters?\n"
+msgid "failed to read %s"
msgstr ""
-#: bisect.c:994
+#: apply.c:3389
#, c-format
-msgid "(roughly %d step)"
-msgid_plural "(roughly %d steps)"
-msgstr[0] ""
-msgstr[1] ""
+msgid "reading from '%s' beyond a symbolic link"
+msgstr ""
-#. TRANSLATORS: the last %s will be replaced with
-#. "(roughly %d steps)" translation
-#: bisect.c:998
+#: apply.c:3418 apply.c:3658
#, c-format
-msgid "Bisecting: %d revision left to test after this %s\n"
-msgid_plural "Bisecting: %d revisions left to test after this %s\n"
-msgstr[0] ""
-msgstr[1] ""
+msgid "path %s has been renamed/deleted"
+msgstr ""
-#: branch.c:53
+#: apply.c:3501 apply.c:3672
#, c-format
-msgid ""
-"\n"
-"After fixing the error cause you may try to fix up\n"
-"the remote tracking information by invoking\n"
-"\"git branch --set-upstream-to=%s%s%s\"."
+msgid "%s: does not exist in index"
msgstr ""
-#: branch.c:67
+#: apply.c:3510 apply.c:3680
#, c-format
-msgid "Not setting branch %s as its own upstream."
+msgid "%s: does not match index"
msgstr ""
-#: branch.c:93
-#, c-format
-msgid "Branch %s set up to track remote branch %s from %s by rebasing."
+#: apply.c:3545
+msgid "repository lacks the necessary blob to fall back on 3-way merge."
msgstr ""
-#: branch.c:94
+#: apply.c:3548
#, c-format
-msgid "Branch %s set up to track remote branch %s from %s."
+msgid "Falling back to three-way merge...\n"
msgstr ""
-#: branch.c:98
+#: apply.c:3564 apply.c:3568
#, c-format
-msgid "Branch %s set up to track local branch %s by rebasing."
+msgid "cannot read the current contents of '%s'"
msgstr ""
-#: branch.c:99
+#: apply.c:3580
#, c-format
-msgid "Branch %s set up to track local branch %s."
+msgid "Failed to fall back on three-way merge...\n"
msgstr ""
-#: branch.c:104
+#: apply.c:3594
#, c-format
-msgid "Branch %s set up to track remote ref %s by rebasing."
+msgid "Applied patch to '%s' with conflicts.\n"
msgstr ""
-#: branch.c:105
+#: apply.c:3599
#, c-format
-msgid "Branch %s set up to track remote ref %s."
+msgid "Applied patch to '%s' cleanly.\n"
msgstr ""
-#: branch.c:109
-#, c-format
-msgid "Branch %s set up to track local ref %s by rebasing."
+#: apply.c:3625
+msgid "removal patch leaves file contents"
msgstr ""
-#: branch.c:110
+#: apply.c:3697
#, c-format
-msgid "Branch %s set up to track local ref %s."
+msgid "%s: wrong type"
msgstr ""
-#: branch.c:119
-msgid "Unable to write upstream branch configuration"
+#: apply.c:3699
+#, c-format
+msgid "%s has type %o, expected %o"
msgstr ""
-#: branch.c:156
+#: apply.c:3850 apply.c:3852
#, c-format
-msgid "Not tracking: ambiguous information for ref %s"
+msgid "invalid path '%s'"
msgstr ""
-#: branch.c:185
+#: apply.c:3908
#, c-format
-msgid "'%s' is not a valid branch name."
+msgid "%s: already exists in index"
msgstr ""
-#: branch.c:190
+#: apply.c:3911
#, c-format
-msgid "A branch named '%s' already exists."
+msgid "%s: already exists in working directory"
msgstr ""
-#: branch.c:198
-msgid "Cannot force update the current branch."
+#: apply.c:3931
+#, c-format
+msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr ""
-#: branch.c:218
+#: apply.c:3936
#, c-format
-msgid "Cannot setup tracking information; starting point '%s' is not a branch."
+msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr ""
-#: branch.c:220
+#: apply.c:3956
#, c-format
-msgid "the requested upstream branch '%s' does not exist"
+msgid "affected file '%s' is beyond a symbolic link"
msgstr ""
-#: branch.c:222
-msgid ""
-"\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."
+#: apply.c:3960
+#, c-format
+msgid "%s: patch does not apply"
msgstr ""
-#: branch.c:266
+#: apply.c:3975
#, c-format
-msgid "Not a valid object name: '%s'."
+msgid "Checking patch %s..."
msgstr ""
-#: branch.c:286
+#: apply.c:4066
#, c-format
-msgid "Ambiguous object name: '%s'."
+msgid "sha1 information is lacking or useless for submodule %s"
msgstr ""
-#: branch.c:291
+#: apply.c:4073
#, c-format
-msgid "Not a valid branch point: '%s'."
+msgid "mode change for %s, which is not in current HEAD"
msgstr ""
-#: branch.c:345
+#: apply.c:4076
#, c-format
-msgid "'%s' is already checked out at '%s'"
+msgid "sha1 information is lacking or useless (%s)."
msgstr ""
-#: branch.c:364
+#: apply.c:4081 builtin/checkout.c:233 builtin/reset.c:135
#, c-format
-msgid "HEAD of working tree %s is not updated"
+msgid "make_cache_entry failed for path '%s'"
msgstr ""
-#: bundle.c:34
+#: apply.c:4085
#, c-format
-msgid "'%s' does not look like a v2 bundle file"
+msgid "could not add %s to temporary index"
msgstr ""
-#: bundle.c:61
+#: apply.c:4095
#, c-format
-msgid "unrecognized header: %s%s (%d)"
+msgid "could not write temporary index to %s"
msgstr ""
-#: bundle.c:87 builtin/commit.c:778
+#: apply.c:4233
#, c-format
-msgid "could not open '%s'"
+msgid "unable to remove %s from index"
msgstr ""
-#: bundle.c:139
-msgid "Repository lacks these prerequisite commits:"
+#: apply.c:4268
+#, c-format
+msgid "corrupt patch for submodule %s"
msgstr ""
-#: bundle.c:163 ref-filter.c:1462 sequencer.c:630 sequencer.c:1085
-#: builtin/blame.c:2763 builtin/commit.c:1057 builtin/log.c:348
-#: builtin/log.c:890 builtin/log.c:1336 builtin/log.c:1659 builtin/log.c:1901
-#: builtin/merge.c:356 builtin/shortlog.c:170
-msgid "revision walk setup failed"
+#: apply.c:4274
+#, c-format
+msgid "unable to stat newly created file '%s'"
msgstr ""
-#: bundle.c:185
+#: apply.c:4282
#, c-format
-msgid "The bundle contains this ref:"
-msgid_plural "The bundle contains these %d refs:"
-msgstr[0] ""
-msgstr[1] ""
-
-#: bundle.c:192
-msgid "The bundle records a complete history."
+msgid "unable to create backing store for newly created file %s"
msgstr ""
-#: bundle.c:194
+#: apply.c:4288 apply.c:4432
#, c-format
-msgid "The bundle requires this ref:"
-msgid_plural "The bundle requires these %d refs:"
-msgstr[0] ""
-msgstr[1] ""
-
-#: bundle.c:253
-msgid "Could not spawn pack-objects"
+msgid "unable to add cache entry for %s"
msgstr ""
-#: bundle.c:264
-msgid "pack-objects died"
+#: apply.c:4329
+#, c-format
+msgid "failed to write to '%s'"
msgstr ""
-#: bundle.c:304
-msgid "rev-list died"
+#: apply.c:4333
+#, c-format
+msgid "closing file '%s'"
msgstr ""
-#: bundle.c:353
+#: apply.c:4403
#, c-format
-msgid "ref '%s' is excluded by the rev-list options"
+msgid "unable to write file '%s' mode %o"
msgstr ""
-#: bundle.c:443 builtin/log.c:165 builtin/log.c:1565 builtin/shortlog.c:273
+#: apply.c:4501
#, c-format
-msgid "unrecognized argument: %s"
+msgid "Applied patch %s cleanly."
msgstr ""
-#: bundle.c:451
-msgid "Refusing to create empty bundle."
+#: apply.c:4509
+msgid "internal error"
msgstr ""
-#: bundle.c:463
+#: apply.c:4512
#, c-format
-msgid "cannot create '%s'"
-msgstr ""
+msgid "Applying patch %%s with %d reject..."
+msgid_plural "Applying patch %%s with %d rejects..."
+msgstr[0] ""
+msgstr[1] ""
-#: bundle.c:491
-msgid "index-pack died"
+#: apply.c:4523
+#, c-format
+msgid "truncating .rej filename to %.*s.rej"
msgstr ""
-#: color.c:290
+#: apply.c:4531 builtin/fetch.c:737 builtin/fetch.c:986
#, c-format
-msgid "invalid color value: %.*s"
+msgid "cannot open %s"
msgstr ""
-#: commit.c:40 builtin/am.c:433 builtin/am.c:469 builtin/am.c:1505
-#: builtin/am.c:2119
+#: apply.c:4545
#, c-format
-msgid "could not parse %s"
+msgid "Hunk #%d applied cleanly."
msgstr ""
-#: commit.c:42
+#: apply.c:4549
#, c-format
-msgid "%s %s is not a commit!"
+msgid "Rejected hunk #%d."
msgstr ""
-#: compat/obstack.c:406 compat/obstack.c:408
-msgid "memory exhausted"
+#: apply.c:4659
+#, c-format
+msgid "Skipped patch '%s'."
msgstr ""
-#: config.c:516
-#, c-format
-msgid "bad config line %d in blob %s"
+#: apply.c:4667
+msgid "unrecognized input"
msgstr ""
-#: config.c:520
-#, c-format
-msgid "bad config line %d in file %s"
+#: apply.c:4686
+msgid "unable to read index file"
msgstr ""
-#: config.c:524
+#: apply.c:4824
#, c-format
-msgid "bad config line %d in standard input"
+msgid "can't open patch '%s': %s"
msgstr ""
-#: config.c:528
+#: apply.c:4849
#, c-format
-msgid "bad config line %d in submodule-blob %s"
-msgstr ""
+msgid "squelched %d whitespace error"
+msgid_plural "squelched %d whitespace errors"
+msgstr[0] ""
+msgstr[1] ""
-#: config.c:532
+#: apply.c:4855 apply.c:4870
#, c-format
-msgid "bad config line %d in command line %s"
-msgstr ""
+msgid "%d line adds whitespace errors."
+msgid_plural "%d lines add whitespace errors."
+msgstr[0] ""
+msgstr[1] ""
-#: config.c:536
+#: apply.c:4863
#, c-format
-msgid "bad config line %d in %s"
-msgstr ""
+msgid "%d line applied after fixing whitespace errors."
+msgid_plural "%d lines applied after fixing whitespace errors."
+msgstr[0] ""
+msgstr[1] ""
-#: config.c:655
-msgid "out of range"
+#: apply.c:4879 builtin/add.c:463 builtin/mv.c:298 builtin/rm.c:391
+msgid "Unable to write new index file"
msgstr ""
-#: config.c:655
-msgid "invalid unit"
+#: apply.c:4910 apply.c:4913 builtin/am.c:2277 builtin/am.c:2280
+#: builtin/clone.c:95 builtin/fetch.c:98 builtin/pull.c:180
+#: builtin/submodule--helper.c:281 builtin/submodule--helper.c:591
+#: builtin/submodule--helper.c:594 builtin/submodule--helper.c:960
+#: builtin/submodule--helper.c:963 builtin/submodule--helper.c:1104
+#: git-add--interactive.perl:239
+msgid "path"
msgstr ""
-#: config.c:661
-#, c-format
-msgid "bad numeric config value '%s' for '%s': %s"
+#: apply.c:4911
+msgid "don't apply changes matching the given path"
msgstr ""
-#: config.c:666
-#, c-format
-msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
+#: apply.c:4914
+msgid "apply changes matching the given path"
msgstr ""
-#: config.c:669
-#, c-format
-msgid "bad numeric config value '%s' for '%s' in file %s: %s"
+#: apply.c:4916 builtin/am.c:2286
+msgid "num"
msgstr ""
-#: config.c:672
-#, c-format
-msgid "bad numeric config value '%s' for '%s' in standard input: %s"
+#: apply.c:4917
+msgid "remove <num> leading slashes from traditional diff paths"
msgstr ""
-#: config.c:675
-#, c-format
-msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
+#: apply.c:4920
+msgid "ignore additions made by the patch"
msgstr ""
-#: config.c:678
-#, c-format
-msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
+#: apply.c:4922
+msgid "instead of applying the patch, output diffstat for the input"
msgstr ""
-#: config.c:681
-#, c-format
-msgid "bad numeric config value '%s' for '%s' in %s: %s"
+#: apply.c:4926
+msgid "show number of added and deleted lines in decimal notation"
msgstr ""
-#: config.c:768
-#, c-format
-msgid "failed to expand user dir in: '%s'"
+#: apply.c:4928
+msgid "instead of applying the patch, output a summary for the input"
msgstr ""
-#: config.c:849 config.c:860
-#, c-format
-msgid "bad zlib compression level %d"
+#: apply.c:4930
+msgid "instead of applying the patch, see if the patch is applicable"
msgstr ""
-#: config.c:978
-#, c-format
-msgid "invalid mode for object creation: %s"
+#: apply.c:4932
+msgid "make sure the patch is applicable to the current index"
msgstr ""
-#: config.c:1312
-msgid "unable to parse command-line config"
+#: apply.c:4934
+msgid "apply a patch without touching the working tree"
msgstr ""
-#: config.c:1362
-msgid "unknown error occurred while reading the configuration files"
+#: apply.c:4936
+msgid "accept a patch that touches outside the working area"
msgstr ""
-#: config.c:1716
-#, c-format
-msgid "unable to parse '%s' from command-line config"
+#: apply.c:4938
+msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr ""
-#: config.c:1718
-#, c-format
-msgid "bad config variable '%s' in file '%s' at line %d"
+#: apply.c:4940
+msgid "attempt three-way merge if a patch does not apply"
msgstr ""
-#: config.c:1777
-#, c-format
-msgid "%s has multiple values"
+#: apply.c:4942
+msgid "build a temporary index based on embedded index information"
msgstr ""
-#: config.c:2311
-#, c-format
-msgid "could not set '%s' to '%s'"
+#: apply.c:4945 builtin/checkout-index.c:169 builtin/ls-files.c:507
+msgid "paths are separated with NUL character"
msgstr ""
-#: config.c:2313
-#, c-format
-msgid "could not unset '%s'"
+#: apply.c:4947
+msgid "ensure at least <n> lines of context match"
msgstr ""
-#: connected.c:63 builtin/fsck.c:173 builtin/prune.c:140
-msgid "Checking connectivity"
+#: apply.c:4948 builtin/am.c:2265
+msgid "action"
msgstr ""
-#: connected.c:74
-msgid "Could not run 'git rev-list'"
+#: apply.c:4949
+msgid "detect new or modified lines that have whitespace errors"
msgstr ""
-#: connected.c:94
-msgid "failed write to rev-list"
+#: apply.c:4952 apply.c:4955
+msgid "ignore changes in whitespace when finding context"
msgstr ""
-#: connected.c:101
-msgid "failed to close rev-list's stdin"
+#: apply.c:4958
+msgid "apply the patch in reverse"
msgstr ""
-#: date.c:97
-msgid "in the future"
+#: apply.c:4960
+msgid "don't expect at least one line of context"
msgstr ""
-#: date.c:103
-#, c-format
-msgid "%lu second ago"
-msgid_plural "%lu seconds ago"
-msgstr[0] ""
-msgstr[1] ""
+#: apply.c:4962
+msgid "leave the rejected hunks in corresponding *.rej files"
+msgstr ""
-#: date.c:110
-#, c-format
-msgid "%lu minute ago"
-msgid_plural "%lu minutes ago"
-msgstr[0] ""
-msgstr[1] ""
+#: apply.c:4964
+msgid "allow overlapping hunks"
+msgstr ""
-#: date.c:117
-#, c-format
-msgid "%lu hour ago"
-msgid_plural "%lu hours ago"
-msgstr[0] ""
-msgstr[1] ""
+#: apply.c:4965 builtin/add.c:267 builtin/check-ignore.c:19
+#: builtin/commit.c:1337 builtin/count-objects.c:94 builtin/fsck.c:651
+#: builtin/log.c:1860 builtin/mv.c:122 builtin/read-tree.c:114
+msgid "be verbose"
+msgstr ""
-#: date.c:124
-#, c-format
-msgid "%lu day ago"
-msgid_plural "%lu days ago"
-msgstr[0] ""
-msgstr[1] ""
+#: apply.c:4967
+msgid "tolerate incorrectly detected missing new-line at the end of file"
+msgstr ""
-#: date.c:130
-#, c-format
-msgid "%lu week ago"
-msgid_plural "%lu weeks ago"
-msgstr[0] ""
-msgstr[1] ""
+#: apply.c:4970
+msgid "do not trust the line counts in the hunk headers"
+msgstr ""
-#: date.c:137
-#, c-format
-msgid "%lu month ago"
-msgid_plural "%lu months ago"
-msgstr[0] ""
-msgstr[1] ""
+#: apply.c:4972 builtin/am.c:2274
+msgid "root"
+msgstr ""
-#: date.c:148
-#, c-format
-msgid "%lu year"
-msgid_plural "%lu years"
-msgstr[0] ""
-msgstr[1] ""
+#: apply.c:4973
+msgid "prepend <root> to all filenames"
+msgstr ""
-#. TRANSLATORS: "%s" is "<n> years"
-#: date.c:151
-#, c-format
-msgid "%s, %lu month ago"
-msgid_plural "%s, %lu months ago"
-msgstr[0] ""
-msgstr[1] ""
+#: archive.c:12
+msgid "git archive [<options>] <tree-ish> [<path>...]"
+msgstr ""
-#: date.c:156 date.c:161
-#, c-format
-msgid "%lu year ago"
-msgid_plural "%lu years ago"
-msgstr[0] ""
-msgstr[1] ""
+#: archive.c:13
+msgid "git archive --list"
+msgstr ""
-#: diffcore-order.c:24
-#, c-format
-msgid "failed to read orderfile '%s'"
+#: archive.c:14
+msgid ""
+"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
msgstr ""
-#: diffcore-rename.c:540
-msgid "Performing inexact rename detection"
+#: archive.c:15
+msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr ""
-#: diff.c:116
+#: archive.c:344 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:300
#, c-format
-msgid " Failed to parse dirstat cut-off percentage '%s'\n"
+msgid "pathspec '%s' did not match any files"
msgstr ""
-#: diff.c:121
-#, c-format
-msgid " Unknown dirstat parameter '%s'\n"
+#: archive.c:429
+msgid "fmt"
msgstr ""
-#: diff.c:225
-#, c-format
-msgid "Unknown value for 'diff.submodule' config variable: '%s'"
+#: archive.c:429
+msgid "archive format"
msgstr ""
-#: diff.c:277
-#, c-format
-msgid ""
-"Found errors in 'diff.dirstat' config variable:\n"
-"%s"
+#: archive.c:430 builtin/log.c:1429
+msgid "prefix"
msgstr ""
-#: diff.c:3017
-#, c-format
-msgid "external diff died, stopping at %s"
+#: archive.c:431
+msgid "prepend prefix to each pathname in the archive"
msgstr ""
-#: diff.c:3415
-msgid "--follow requires exactly one pathspec"
+#: archive.c:432 builtin/blame.c:2607 builtin/blame.c:2608 builtin/config.c:59
+#: builtin/fast-export.c:987 builtin/fast-export.c:989 builtin/grep.c:1054
+#: builtin/hash-object.c:101 builtin/ls-files.c:541 builtin/ls-files.c:544
+#: builtin/notes.c:401 builtin/notes.c:564 builtin/read-tree.c:109
+#: parse-options.h:153
+msgid "file"
msgstr ""
-#: diff.c:3578
-#, c-format
-msgid ""
-"Failed to parse --dirstat/-X option parameter:\n"
-"%s"
+#: archive.c:433 builtin/archive.c:89
+msgid "write the archive to this file"
msgstr ""
-#: diff.c:3592
-#, c-format
-msgid "Failed to parse --submodule option parameter: '%s'"
+#: archive.c:435
+msgid "read .gitattributes in working directory"
msgstr ""
-#: dir.c:1823
-msgid "failed to get kernel name and information"
+#: archive.c:436
+msgid "report archived files on stderr"
msgstr ""
-#: dir.c:1942
-msgid "Untracked cache is disabled on this system or location."
+#: archive.c:437
+msgid "store only"
msgstr ""
-#: gpg-interface.c:178
-msgid "gpg failed to sign the data"
+#: archive.c:438
+msgid "compress faster"
msgstr ""
-#: gpg-interface.c:208
-msgid "could not create temporary file"
+#: archive.c:446
+msgid "compress better"
msgstr ""
-#: gpg-interface.c:210
-#, c-format
-msgid "failed writing detached signature to '%s'"
+#: archive.c:449
+msgid "list supported archive formats"
msgstr ""
-#: grep.c:1792
-#, c-format
-msgid "'%s': unable to read %s"
+#: archive.c:451 builtin/archive.c:90 builtin/clone.c:85 builtin/clone.c:88
+#: builtin/submodule--helper.c:603 builtin/submodule--helper.c:969
+msgid "repo"
msgstr ""
-#: grep.c:1809 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155
-#, c-format
-msgid "failed to stat '%s'"
+#: archive.c:452 builtin/archive.c:91
+msgid "retrieve the archive from remote repository <repo>"
msgstr ""
-#: grep.c:1820
-#, c-format
-msgid "'%s': short read"
+#: archive.c:453 builtin/archive.c:92 builtin/notes.c:485
+msgid "command"
msgstr ""
-#: help.c:205
-#, c-format
-msgid "available git commands in '%s'"
+#: archive.c:454 builtin/archive.c:93
+msgid "path to the remote git-upload-archive command"
msgstr ""
-#: help.c:212
-msgid "git commands available from elsewhere on your $PATH"
+#: archive.c:461
+msgid "Unexpected option --remote"
msgstr ""
-#: help.c:244
-msgid "These are common Git commands used in various situations:"
+#: archive.c:463
+msgid "Option --exec can only be used together with --remote"
msgstr ""
-#: help.c:309
-#, c-format
-msgid ""
-"'%s' appears to be a git command, but we were not\n"
-"able to execute it. Maybe git-%s is broken?"
+#: archive.c:465
+msgid "Unexpected option --output"
msgstr ""
-#: help.c:366
-msgid "Uh oh. Your system reports no Git commands at all."
+#: archive.c:487
+#, c-format
+msgid "Unknown archive format '%s'"
msgstr ""
-#: help.c:388
+#: archive.c:494
#, c-format
+msgid "Argument not supported for format '%s': -%d"
+msgstr ""
+
+#: attr.c:263
msgid ""
-"WARNING: You called a Git command named '%s', which does not exist.\n"
-"Continuing under the assumption that you meant '%s'"
+"Negative patterns are ignored in git attributes\n"
+"Use '\\!' for literal leading exclamation."
msgstr ""
-#: help.c:393
+#: bisect.c:441
#, c-format
-msgid "in %0.1f seconds automatically..."
+msgid "Could not open file '%s'"
msgstr ""
-#: help.c:400
+#: bisect.c:446
#, c-format
-msgid "git: '%s' is not a git command. See 'git --help'."
+msgid "Badly quoted content in file '%s': %s"
msgstr ""
-#: help.c:404 help.c:470
-msgid ""
-"\n"
-"Did you mean this?"
-msgid_plural ""
-"\n"
-"Did you mean one of these?"
-msgstr[0] ""
-msgstr[1] ""
+#: bisect.c:655
+#, c-format
+msgid "We cannot bisect more!\n"
+msgstr ""
-#: help.c:466
+#: bisect.c:708
#, c-format
-msgid "%s: %s - %s"
+msgid "Not a valid commit name %s"
msgstr ""
-#: lockfile.c:152
+#: bisect.c:732
#, c-format
msgid ""
-"Unable to create '%s.lock': %s.\n"
-"\n"
-"Another git process seems to be running in this repository, e.g.\n"
-"an editor opened by 'git commit'. Please make sure all processes\n"
-"are terminated then try again. If it still fails, a git process\n"
-"may have crashed in this repository earlier:\n"
-"remove the file manually to continue."
+"The merge base %s is bad.\n"
+"This means the bug has been fixed between %s and [%s].\n"
msgstr ""
-#: lockfile.c:160
+#: bisect.c:737
#, c-format
-msgid "Unable to create '%s.lock': %s"
+msgid ""
+"The merge base %s is new.\n"
+"The property has changed between %s and [%s].\n"
msgstr ""
-#: merge.c:41
-msgid "failed to read the cache"
+#: bisect.c:742
+#, c-format
+msgid ""
+"The merge base %s is %s.\n"
+"This means the first '%s' commit is between %s and [%s].\n"
msgstr ""
-#: merge.c:94 builtin/am.c:1992 builtin/am.c:2027 builtin/checkout.c:375
-#: builtin/checkout.c:589 builtin/clone.c:732
-msgid "unable to write new index file"
+#: bisect.c:750
+#, c-format
+msgid ""
+"Some %s revs are not ancestors of the %s rev.\n"
+"git bisect cannot work properly in this case.\n"
+"Maybe you mistook %s and %s revs?\n"
msgstr ""
-#: merge-recursive.c:209
-msgid "(bad commit)\n"
+#: bisect.c:763
+#, c-format
+msgid ""
+"the merge base between %s and [%s] must be skipped.\n"
+"So we cannot be sure the first %s commit is between %s and %s.\n"
+"We continue anyway."
msgstr ""
-#: merge-recursive.c:231
+#: bisect.c:798
#, c-format
-msgid "addinfo_cache failed for path '%s'"
+msgid "Bisecting: a merge base must be tested\n"
msgstr ""
-#: merge-recursive.c:301
-msgid "error building trees"
+#: bisect.c:849
+#, c-format
+msgid "a %s revision is needed"
msgstr ""
-#: merge-recursive.c:720
+#: bisect.c:866 builtin/notes.c:174 builtin/tag.c:262
#, c-format
-msgid "failed to create path '%s'%s"
+msgid "could not create file '%s'"
msgstr ""
-#: merge-recursive.c:731
+#: bisect.c:917
#, c-format
-msgid "Removing %s to make room for subdirectory\n"
+msgid "could not read file '%s'"
msgstr ""
-#: merge-recursive.c:745 merge-recursive.c:764
-msgid ": perhaps a D/F conflict?"
+#: bisect.c:947
+msgid "reading bisect refs failed"
msgstr ""
-#: merge-recursive.c:754
+#: bisect.c:967
#, c-format
-msgid "refusing to lose untracked file at '%s'"
+msgid "%s was both %s and %s\n"
msgstr ""
-#: merge-recursive.c:796
+#: bisect.c:975
#, c-format
-msgid "cannot read object %s '%s'"
+msgid ""
+"No testable commit found.\n"
+"Maybe you started with bad path parameters?\n"
msgstr ""
-#: merge-recursive.c:798
+#: bisect.c:994
#, c-format
-msgid "blob expected for %s '%s'"
-msgstr ""
+msgid "(roughly %d step)"
+msgid_plural "(roughly %d steps)"
+msgstr[0] ""
+msgstr[1] ""
-#: merge-recursive.c:822
+#. TRANSLATORS: the last %s will be replaced with
+#. "(roughly %d steps)" translation
+#: bisect.c:998
#, c-format
-msgid "failed to open '%s': %s"
-msgstr ""
+msgid "Bisecting: %d revision left to test after this %s\n"
+msgid_plural "Bisecting: %d revisions left to test after this %s\n"
+msgstr[0] ""
+msgstr[1] ""
-#: merge-recursive.c:833
+#: branch.c:53
#, c-format
-msgid "failed to symlink '%s': %s"
+msgid ""
+"\n"
+"After fixing the error cause you may try to fix up\n"
+"the remote tracking information by invoking\n"
+"\"git branch --set-upstream-to=%s%s%s\"."
msgstr ""
-#: merge-recursive.c:838
+#: branch.c:67
#, c-format
-msgid "do not know what to do with %06o %s '%s'"
-msgstr ""
-
-#: merge-recursive.c:978
-msgid "Failed to execute internal merge"
+msgid "Not setting branch %s as its own upstream."
msgstr ""
-#: merge-recursive.c:982
+#: branch.c:93
#, c-format
-msgid "Unable to add %s to database"
+msgid "Branch %s set up to track remote branch %s from %s by rebasing."
msgstr ""
-#: merge-recursive.c:1081 merge-recursive.c:1095
+#: branch.c:94
#, c-format
-msgid ""
-"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
-"in tree."
+msgid "Branch %s set up to track remote branch %s from %s."
msgstr ""
-#: merge-recursive.c:1087 merge-recursive.c:1100
+#: branch.c:98
#, c-format
-msgid ""
-"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
-"in tree at %s."
+msgid "Branch %s set up to track local branch %s by rebasing."
msgstr ""
-#: merge-recursive.c:1143
-msgid "rename"
+#: branch.c:99
+#, c-format
+msgid "Branch %s set up to track local branch %s."
msgstr ""
-#: merge-recursive.c:1143
-msgid "renamed"
+#: branch.c:104
+#, c-format
+msgid "Branch %s set up to track remote ref %s by rebasing."
msgstr ""
-#: merge-recursive.c:1200
+#: branch.c:105
#, c-format
-msgid "%s is a directory in %s adding as %s instead"
+msgid "Branch %s set up to track remote ref %s."
msgstr ""
-#: merge-recursive.c:1225
+#: branch.c:109
#, c-format
-msgid ""
-"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
-"\"->\"%s\" in \"%s\"%s"
+msgid "Branch %s set up to track local ref %s by rebasing."
msgstr ""
-#: merge-recursive.c:1230
-msgid " (left unresolved)"
+#: branch.c:110
+#, c-format
+msgid "Branch %s set up to track local ref %s."
msgstr ""
-#: merge-recursive.c:1292
-#, c-format
-msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
+#: branch.c:119
+msgid "Unable to write upstream branch configuration"
msgstr ""
-#: merge-recursive.c:1325
+#: branch.c:156
#, c-format
-msgid "Renaming %s to %s and %s to %s instead"
+msgid "Not tracking: ambiguous information for ref %s"
msgstr ""
-#: merge-recursive.c:1531
+#: branch.c:185
#, c-format
-msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
+msgid "'%s' is not a valid branch name."
msgstr ""
-#: merge-recursive.c:1546
+#: branch.c:190
#, c-format
-msgid "Adding merged %s"
+msgid "A branch named '%s' already exists."
msgstr ""
-#: merge-recursive.c:1553 merge-recursive.c:1766
-#, c-format
-msgid "Adding as %s instead"
+#: branch.c:198
+msgid "Cannot force update the current branch."
msgstr ""
-#: merge-recursive.c:1610
+#: branch.c:218
#, c-format
-msgid "cannot read object %s"
+msgid "Cannot setup tracking information; starting point '%s' is not a branch."
msgstr ""
-#: merge-recursive.c:1613
+#: branch.c:220
#, c-format
-msgid "object %s is not a blob"
+msgid "the requested upstream branch '%s' does not exist"
msgstr ""
-#: merge-recursive.c:1666
-msgid "modify"
+#: branch.c:222
+msgid ""
+"\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 ""
-#: merge-recursive.c:1666
-msgid "modified"
+#: branch.c:265
+#, c-format
+msgid "Not a valid object name: '%s'."
msgstr ""
-#: merge-recursive.c:1676
-msgid "content"
+#: branch.c:285
+#, c-format
+msgid "Ambiguous object name: '%s'."
msgstr ""
-#: merge-recursive.c:1683
-msgid "add/add"
+#: branch.c:290
+#, c-format
+msgid "Not a valid branch point: '%s'."
msgstr ""
-#: merge-recursive.c:1718
+#: branch.c:344
#, c-format
-msgid "Skipped %s (merged same as existing)"
+msgid "'%s' is already checked out at '%s'"
msgstr ""
-#: merge-recursive.c:1732
+#: branch.c:363
#, c-format
-msgid "Auto-merging %s"
+msgid "HEAD of working tree %s is not updated"
msgstr ""
-#: merge-recursive.c:1736 git-submodule.sh:919
-msgid "submodule"
-msgstr ""
-
-#: merge-recursive.c:1737
-#, c-format
-msgid "CONFLICT (%s): Merge conflict in %s"
-msgstr ""
-
-#: merge-recursive.c:1831
+#: bundle.c:34
#, c-format
-msgid "Removing %s"
-msgstr ""
-
-#: merge-recursive.c:1857
-msgid "file/directory"
-msgstr ""
-
-#: merge-recursive.c:1863
-msgid "directory/file"
+msgid "'%s' does not look like a v2 bundle file"
msgstr ""
-#: merge-recursive.c:1868
+#: bundle.c:61
#, c-format
-msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
+msgid "unrecognized header: %s%s (%d)"
msgstr ""
-#: merge-recursive.c:1877
+#: bundle.c:87 sequencer.c:1331 sequencer.c:1752 builtin/commit.c:777
#, c-format
-msgid "Adding %s"
-msgstr ""
-
-#: merge-recursive.c:1914
-msgid "Already up-to-date!"
+msgid "could not open '%s'"
msgstr ""
-#: merge-recursive.c:1923
-#, c-format
-msgid "merging of trees %s and %s failed"
+#: bundle.c:139
+msgid "Repository lacks these prerequisite commits:"
msgstr ""
-#: merge-recursive.c:2006
-msgid "Merging:"
+#: bundle.c:163 ref-filter.c:1499 sequencer.c:1154 sequencer.c:2290
+#: builtin/blame.c:2820 builtin/commit.c:1061 builtin/log.c:348
+#: builtin/log.c:890 builtin/log.c:1340 builtin/log.c:1666 builtin/log.c:1909
+#: builtin/merge.c:360 builtin/shortlog.c:177
+msgid "revision walk setup failed"
msgstr ""
-#: merge-recursive.c:2019
+#: bundle.c:185
#, c-format
-msgid "found %u common ancestor:"
-msgid_plural "found %u common ancestors:"
+msgid "The bundle contains this ref:"
+msgid_plural "The bundle contains these %d refs:"
msgstr[0] ""
msgstr[1] ""
-#: merge-recursive.c:2058
-msgid "merge returned no commit"
+#: bundle.c:192
+msgid "The bundle records a complete history."
msgstr ""
-#: merge-recursive.c:2121
+#: bundle.c:194
#, c-format
-msgid "Could not parse object '%s'"
-msgstr ""
-
-#: merge-recursive.c:2135 builtin/merge.c:641 builtin/merge.c:788
-msgid "Unable to write index."
-msgstr ""
+msgid "The bundle requires this ref:"
+msgid_plural "The bundle requires these %d refs:"
+msgstr[0] ""
+msgstr[1] ""
-#: notes-utils.c:41
-msgid "Cannot commit uninitialized/unreferenced notes tree"
+#: bundle.c:253
+msgid "Could not spawn pack-objects"
msgstr ""
-#: notes-utils.c:100
-#, c-format
-msgid "Bad notes.rewriteMode value: '%s'"
+#: bundle.c:264
+msgid "pack-objects died"
msgstr ""
-#: notes-utils.c:110
-#, c-format
-msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
+#: bundle.c:304
+msgid "rev-list died"
msgstr ""
-#. TRANSLATORS: The first %s is the name of the
-#. environment variable, the second %s is its value
-#: notes-utils.c:137
+#: bundle.c:353
#, c-format
-msgid "Bad %s value: '%s'"
+msgid "ref '%s' is excluded by the rev-list options"
msgstr ""
-#: object.c:242
+#: bundle.c:443 builtin/log.c:165 builtin/log.c:1572 builtin/shortlog.c:282
#, c-format
-msgid "unable to parse object: %s"
+msgid "unrecognized argument: %s"
msgstr ""
-#: parse-options.c:572
-msgid "..."
+#: bundle.c:451
+msgid "Refusing to create empty bundle."
msgstr ""
-#: parse-options.c:590
+#: bundle.c:463
#, c-format
-msgid "usage: %s"
+msgid "cannot create '%s'"
msgstr ""
-#. TRANSLATORS: the colon here should align with the
-#. one in "usage: %s" translation
-#: parse-options.c:594
-#, c-format
-msgid " or: %s"
+#: bundle.c:491
+msgid "index-pack died"
msgstr ""
-#: parse-options.c:597
+#: color.c:300
#, c-format
-msgid " %s"
-msgstr ""
-
-#: parse-options.c:631
-msgid "-NUM"
+msgid "invalid color value: %.*s"
msgstr ""
-#: parse-options-cb.c:108
+#: commit.c:40 sequencer.c:1564 builtin/am.c:421 builtin/am.c:457
+#: builtin/am.c:1493 builtin/am.c:2127
#, c-format
-msgid "malformed object name '%s'"
+msgid "could not parse %s"
msgstr ""
-#: path.c:798
+#: commit.c:42
#, c-format
-msgid "Could not make %s writable by group"
-msgstr ""
-
-#: pathspec.c:133
-msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
+msgid "%s %s is not a commit!"
msgstr ""
-#: pathspec.c:143
+#: commit.c:1514
msgid ""
-"global 'literal' pathspec setting is incompatible with all other global "
-"pathspec settings"
-msgstr ""
-
-#: pathspec.c:177
-msgid "invalid parameter for pathspec magic 'prefix'"
-msgstr ""
-
-#: pathspec.c:183
-#, c-format
-msgid "Invalid pathspec magic '%.*s' in '%s'"
+"Warning: commit message did not conform to UTF-8.\n"
+"You may want to amend it after fixing the message, or set the config\n"
+"variable i18n.commitencoding to the encoding your project uses.\n"
msgstr ""
-#: pathspec.c:187
-#, c-format
-msgid "Missing ')' at the end of pathspec magic in '%s'"
+#: compat/obstack.c:406 compat/obstack.c:408
+msgid "memory exhausted"
msgstr ""
-#: pathspec.c:205
+#: config.c:518
#, c-format
-msgid "Unimplemented pathspec magic '%c' in '%s'"
+msgid "bad config line %d in blob %s"
msgstr ""
-#: pathspec.c:230
+#: config.c:522
#, c-format
-msgid "%s: 'literal' and 'glob' are incompatible"
+msgid "bad config line %d in file %s"
msgstr ""
-#: pathspec.c:241
+#: config.c:526
#, c-format
-msgid "%s: '%s' is outside repository"
+msgid "bad config line %d in standard input"
msgstr ""
-#: pathspec.c:291
+#: config.c:530
#, c-format
-msgid "Pathspec '%s' is in submodule '%.*s'"
+msgid "bad config line %d in submodule-blob %s"
msgstr ""
-#: pathspec.c:353
+#: config.c:534
#, c-format
-msgid "%s: pathspec magic not supported by this command: %s"
+msgid "bad config line %d in command line %s"
msgstr ""
-#: pathspec.c:433
+#: config.c:538
#, c-format
-msgid "pathspec '%s' is beyond a symbolic link"
-msgstr ""
-
-#: pathspec.c:442
-msgid ""
-"There is nothing to exclude from by :(exclude) patterns.\n"
-"Perhaps you forgot to add either ':/' or '.' ?"
+msgid "bad config line %d in %s"
msgstr ""
-#: pretty.c:973
-msgid "unable to parse --pretty format"
+#: config.c:657
+msgid "out of range"
msgstr ""
-#: progress.c:235
-msgid "done"
+#: config.c:657
+msgid "invalid unit"
msgstr ""
-#: read-cache.c:1281
+#: config.c:663
#, c-format
-msgid ""
-"index.version set, but the value is invalid.\n"
-"Using version %i"
+msgid "bad numeric config value '%s' for '%s': %s"
msgstr ""
-#: read-cache.c:1291
+#: config.c:668
#, c-format
-msgid ""
-"GIT_INDEX_VERSION set, but the value is invalid.\n"
-"Using version %i"
+msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
msgstr ""
-#: refs.c:551 builtin/merge.c:840
+#: config.c:671
#, c-format
-msgid "Could not open '%s' for writing"
+msgid "bad numeric config value '%s' for '%s' in file %s: %s"
msgstr ""
-#: refs/files-backend.c:2534
+#: config.c:674
#, c-format
-msgid "could not delete reference %s: %s"
+msgid "bad numeric config value '%s' for '%s' in standard input: %s"
msgstr ""
-#: refs/files-backend.c:2537
+#: config.c:677
#, c-format
-msgid "could not delete references: %s"
+msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
msgstr ""
-#: refs/files-backend.c:2546
+#: config.c:680
#, c-format
-msgid "could not remove reference %s"
+msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
msgstr ""
-#: ref-filter.c:55
+#: config.c:683
#, c-format
-msgid "expected format: %%(color:<color>)"
+msgid "bad numeric config value '%s' for '%s' in %s: %s"
msgstr ""
-#: ref-filter.c:57
+#: config.c:770
#, c-format
-msgid "unrecognized color: %%(color:%s)"
+msgid "failed to expand user dir in: '%s'"
msgstr ""
-#: ref-filter.c:71
+#: config.c:865 config.c:876
#, c-format
-msgid "unrecognized format: %%(%s)"
+msgid "bad zlib compression level %d"
msgstr ""
-#: ref-filter.c:77
+#: config.c:993
#, c-format
-msgid "%%(body) does not take arguments"
+msgid "invalid mode for object creation: %s"
msgstr ""
-#: ref-filter.c:84
+#: config.c:1149
#, c-format
-msgid "%%(subject) does not take arguments"
+msgid "bad pack compression level %d"
msgstr ""
-#: ref-filter.c:101
-#, c-format
-msgid "positive value expected contents:lines=%s"
+#: config.c:1339
+msgid "unable to parse command-line config"
msgstr ""
-#: ref-filter.c:103
-#, c-format
-msgid "unrecognized %%(contents) argument: %s"
+#: config.c:1389
+msgid "unknown error occurred while reading the configuration files"
msgstr ""
-#: ref-filter.c:113
+#: config.c:1743
#, c-format
-msgid "unrecognized %%(objectname) argument: %s"
+msgid "unable to parse '%s' from command-line config"
msgstr ""
-#: ref-filter.c:135
+#: config.c:1745
#, c-format
-msgid "expected format: %%(align:<width>,<position>)"
+msgid "bad config variable '%s' in file '%s' at line %d"
msgstr ""
-#: ref-filter.c:147
+#: config.c:1804
#, c-format
-msgid "unrecognized position:%s"
+msgid "%s has multiple values"
msgstr ""
-#: ref-filter.c:151
+#: config.c:2225 config.c:2450
#, c-format
-msgid "unrecognized width:%s"
+msgid "fstat on %s failed"
msgstr ""
-#: ref-filter.c:157
+#: config.c:2343
#, c-format
-msgid "unrecognized %%(align) argument: %s"
+msgid "could not set '%s' to '%s'"
msgstr ""
-#: ref-filter.c:161
+#: config.c:2345
#, c-format
-msgid "positive width expected with the %%(align) atom"
+msgid "could not unset '%s'"
msgstr ""
-#: ref-filter.c:244
-#, c-format
-msgid "malformed field name: %.*s"
+#: connect.c:49
+msgid "The remote end hung up upon initial contact"
msgstr ""
-#: ref-filter.c:270
-#, c-format
-msgid "unknown field name: %.*s"
+#: connect.c:51
+msgid ""
+"Could not read from remote repository.\n"
+"\n"
+"Please make sure you have the correct access rights\n"
+"and the repository exists."
msgstr ""
-#: ref-filter.c:372
-#, c-format
-msgid "format: %%(end) atom used without corresponding atom"
+#: connected.c:63 builtin/fsck.c:190 builtin/prune.c:140
+msgid "Checking connectivity"
msgstr ""
-#: ref-filter.c:424
-#, c-format
-msgid "malformed format string %s"
+#: connected.c:75
+msgid "Could not run 'git rev-list'"
msgstr ""
-#: ref-filter.c:878
-msgid ":strip= requires a positive integer argument"
+#: connected.c:95
+msgid "failed write to rev-list"
msgstr ""
-#: ref-filter.c:883
-#, c-format
-msgid "ref '%s' does not have %ld components to :strip"
+#: connected.c:102
+msgid "failed to close rev-list's stdin"
msgstr ""
-#: ref-filter.c:1046
+#: convert.c:201
#, c-format
-msgid "unknown %.*s format %s"
+msgid ""
+"CRLF will be replaced by LF in %s.\n"
+"The file will have its original line endings in your working directory."
msgstr ""
-#: ref-filter.c:1066 ref-filter.c:1097
+#: convert.c:205
#, c-format
-msgid "missing object %s for %s"
+msgid "CRLF would be replaced by LF in %s."
msgstr ""
-#: ref-filter.c:1069 ref-filter.c:1100
+#: convert.c:211
#, c-format
-msgid "parse_object_buffer failed on %s for %s"
+msgid ""
+"LF will be replaced by CRLF in %s.\n"
+"The file will have its original line endings in your working directory."
msgstr ""
-#: ref-filter.c:1311
+#: convert.c:215
#, c-format
-msgid "malformed object at '%s'"
+msgid "LF would be replaced by CRLF in %s"
msgstr ""
-#: ref-filter.c:1373
-#, c-format
-msgid "ignoring ref with broken name %s"
+#: date.c:97
+msgid "in the future"
msgstr ""
-#: ref-filter.c:1378
+#: date.c:103
#, c-format
-msgid "ignoring broken ref %s"
-msgstr ""
+msgid "%lu second ago"
+msgid_plural "%lu seconds ago"
+msgstr[0] ""
+msgstr[1] ""
-#: ref-filter.c:1651
+#: date.c:110
#, c-format
-msgid "format: %%(end) atom missing"
-msgstr ""
+msgid "%lu minute ago"
+msgid_plural "%lu minutes ago"
+msgstr[0] ""
+msgstr[1] ""
-#: ref-filter.c:1705
+#: date.c:117
#, c-format
-msgid "malformed object name %s"
-msgstr ""
+msgid "%lu hour ago"
+msgid_plural "%lu hours ago"
+msgstr[0] ""
+msgstr[1] ""
-#: remote.c:746
+#: date.c:124
#, c-format
-msgid "Cannot fetch both %s and %s to %s"
-msgstr ""
+msgid "%lu day ago"
+msgid_plural "%lu days ago"
+msgstr[0] ""
+msgstr[1] ""
-#: remote.c:750
+#: date.c:130
#, c-format
-msgid "%s usually tracks %s, not %s"
-msgstr ""
+msgid "%lu week ago"
+msgid_plural "%lu weeks ago"
+msgstr[0] ""
+msgstr[1] ""
-#: remote.c:754
+#: date.c:137
#, c-format
-msgid "%s tracks both %s and %s"
-msgstr ""
-
-#: remote.c:762
-msgid "Internal error"
-msgstr ""
+msgid "%lu month ago"
+msgid_plural "%lu months ago"
+msgstr[0] ""
+msgstr[1] ""
-#: remote.c:1677 remote.c:1720
-msgid "HEAD does not point to a branch"
-msgstr ""
+#: date.c:148
+#, c-format
+msgid "%lu year"
+msgid_plural "%lu years"
+msgstr[0] ""
+msgstr[1] ""
-#: remote.c:1686
+#. TRANSLATORS: "%s" is "<n> years"
+#: date.c:151
#, c-format
-msgid "no such branch: '%s'"
-msgstr ""
+msgid "%s, %lu month ago"
+msgid_plural "%s, %lu months ago"
+msgstr[0] ""
+msgstr[1] ""
-#: remote.c:1689
+#: date.c:156 date.c:161
#, c-format
-msgid "no upstream configured for branch '%s'"
-msgstr ""
+msgid "%lu year ago"
+msgid_plural "%lu years ago"
+msgstr[0] ""
+msgstr[1] ""
-#: remote.c:1695
+#: diffcore-order.c:24
#, c-format
-msgid "upstream branch '%s' not stored as a remote-tracking branch"
+msgid "failed to read orderfile '%s'"
+msgstr ""
+
+#: diffcore-rename.c:536
+msgid "Performing inexact rename detection"
msgstr ""
-#: remote.c:1710
+#: diff.c:62
#, c-format
-msgid "push destination '%s' on remote '%s' has no local tracking branch"
+msgid "option '%s' requires a value"
msgstr ""
-#: remote.c:1725
+#: diff.c:124
#, c-format
-msgid "branch '%s' has no remote for pushing"
+msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr ""
-#: remote.c:1736
+#: diff.c:129
#, c-format
-msgid "push refspecs for '%s' do not include '%s'"
+msgid " Unknown dirstat parameter '%s'\n"
msgstr ""
-#: remote.c:1749
-msgid "push has no destination (push.default is 'nothing')"
+#: diff.c:281
+#, c-format
+msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr ""
-#: remote.c:1771
-msgid "cannot resolve 'simple' push to a single destination"
+#: diff.c:344
+#, c-format
+msgid ""
+"Found errors in 'diff.dirstat' config variable:\n"
+"%s"
msgstr ""
-#: remote.c:2073
+#: diff.c:3085
#, c-format
-msgid "Your branch is based on '%s', but the upstream is gone.\n"
+msgid "external diff died, stopping at %s"
msgstr ""
-#: remote.c:2077
-msgid " (use \"git branch --unset-upstream\" to fixup)\n"
+#: diff.c:3411
+msgid "--name-only, --name-status, --check and -s are mutually exclusive"
msgstr ""
-#: remote.c:2080
-#, c-format
-msgid "Your branch is up-to-date with '%s'.\n"
+#: diff.c:3501
+msgid "--follow requires exactly one pathspec"
msgstr ""
-#: remote.c:2084
+#: diff.c:3664
#, c-format
-msgid "Your branch is ahead of '%s' by %d commit.\n"
-msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: remote.c:2090
-msgid " (use \"git push\" to publish your local commits)\n"
+msgid ""
+"Failed to parse --dirstat/-X option parameter:\n"
+"%s"
msgstr ""
-#: remote.c:2093
+#: diff.c:3678
#, 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 "Failed to parse --submodule option parameter: '%s'"
+msgstr ""
-#: remote.c:2101
-msgid " (use \"git pull\" to update your local branch)\n"
+#: diff.c:4696
+msgid "inexact rename detection was skipped due to too many files."
+msgstr ""
+
+#: diff.c:4699
+msgid "only found copies from modified paths due to too many files."
msgstr ""
-#: remote.c:2104
+#: diff.c:4702
#, 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] ""
+"you may want to set your %s variable to at least %d and retry the command."
+msgstr ""
-#: remote.c:2114
-msgid " (use \"git pull\" to merge the remote branch into yours)\n"
+#: dir.c:1862
+msgid "failed to get kernel name and information"
msgstr ""
-#: revision.c:2132
-msgid "your current branch appears to be broken"
+#: dir.c:1981
+msgid "Untracked cache is disabled on this system or location."
msgstr ""
-#: revision.c:2135
+#: dir.c:2759
#, c-format
-msgid "your current branch '%s' does not have any commits yet"
+msgid "could not migrate git directory from '%s' to '%s'"
msgstr ""
-#: revision.c:2329
-msgid "--first-parent is incompatible with --bisect"
+#: fetch-pack.c:213
+msgid "git fetch-pack: expected shallow list"
msgstr ""
-#: run-command.c:92
-msgid "open /dev/null failed"
+#: fetch-pack.c:225
+msgid "git fetch-pack: expected ACK/NAK, got EOF"
msgstr ""
-#: run-command.c:94
+#: fetch-pack.c:243
#, c-format
-msgid "dup2(%d,%d) failed"
+msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr ""
-#: send-pack.c:298
-msgid "failed to sign the push certificate"
+#: fetch-pack.c:295
+msgid "--stateless-rpc requires multi_ack_detailed"
msgstr ""
-#: send-pack.c:411
-msgid "the receiving end does not support --signed push"
+#: fetch-pack.c:381
+#, c-format
+msgid "invalid shallow line: %s"
msgstr ""
-#: send-pack.c:413
-msgid ""
-"not sending a push certificate since the receiving end does not support --"
-"signed push"
+#: fetch-pack.c:387
+#, c-format
+msgid "invalid unshallow line: %s"
msgstr ""
-#: send-pack.c:425
-msgid "the receiving end does not support --atomic push"
+#: fetch-pack.c:389
+#, c-format
+msgid "object not found: %s"
msgstr ""
-#: send-pack.c:430
-msgid "the receiving end does not support push options"
+#: fetch-pack.c:392
+#, c-format
+msgid "error in object: %s"
msgstr ""
-#: sequencer.c:174
-msgid ""
-"after resolving the conflicts, mark the corrected paths\n"
-"with 'git add <paths>' or 'git rm <paths>'"
+#: fetch-pack.c:394
+#, c-format
+msgid "no shallow found: %s"
msgstr ""
-#: sequencer.c:177
-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'"
+#: fetch-pack.c:397
+#, c-format
+msgid "expected shallow/unshallow, got %s"
msgstr ""
-#: sequencer.c:190 sequencer.c:841 sequencer.c:924
+#: fetch-pack.c:436
#, c-format
-msgid "Could not write to %s"
+msgid "got %s %d %s"
msgstr ""
-#: sequencer.c:193 sequencer.c:843 sequencer.c:928
+#: fetch-pack.c:450
#, c-format
-msgid "Error wrapping up %s."
+msgid "invalid commit %s"
msgstr ""
-#: sequencer.c:208
-msgid "Your local changes would be overwritten by cherry-pick."
+#: fetch-pack.c:483
+msgid "giving up"
msgstr ""
-#: sequencer.c:210
-msgid "Your local changes would be overwritten by revert."
+#: fetch-pack.c:493 progress.c:235
+msgid "done"
msgstr ""
-#: sequencer.c:213
-msgid "Commit your changes or stash them to proceed."
+#: fetch-pack.c:505
+#, c-format
+msgid "got %s (%d) %s"
msgstr ""
-#: sequencer.c:228
+#: fetch-pack.c:551
#, c-format
-msgid "%s: fast-forward"
+msgid "Marking %s as complete"
msgstr ""
-#. TRANSLATORS: %s will be "revert" or "cherry-pick"
-#: sequencer.c:303
+#: fetch-pack.c:697
#, c-format
-msgid "%s: Unable to write new index file"
+msgid "already have %s (%s)"
msgstr ""
-#: sequencer.c:321
-msgid "Could not resolve HEAD commit\n"
+#: fetch-pack.c:735
+msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr ""
-#: sequencer.c:341
-msgid "Unable to update cache tree\n"
+#: fetch-pack.c:743
+msgid "protocol error: bad pack header"
msgstr ""
-#: sequencer.c:393
+#: fetch-pack.c:799
#, c-format
-msgid "Could not parse commit %s\n"
+msgid "fetch-pack: unable to fork off %s"
msgstr ""
-#: sequencer.c:398
+#: fetch-pack.c:815
#, c-format
-msgid "Could not parse parent commit %s\n"
+msgid "%s failed"
msgstr ""
-#: sequencer.c:463
-msgid "Your index file is unmerged."
+#: fetch-pack.c:817
+msgid "error in sideband demultiplexer"
msgstr ""
-#: sequencer.c:482
-#, c-format
-msgid "Commit %s is a merge but no -m option was given."
+#: fetch-pack.c:844
+msgid "Server does not support shallow clients"
msgstr ""
-#: sequencer.c:490
-#, c-format
-msgid "Commit %s does not have parent %d"
+#: fetch-pack.c:848
+msgid "Server supports multi_ack_detailed"
msgstr ""
-#: sequencer.c:494
-#, c-format
-msgid "Mainline was specified but commit %s is not a merge."
+#: fetch-pack.c:851
+msgid "Server supports no-done"
msgstr ""
-#. TRANSLATORS: The first %s will be "revert" or
-#. "cherry-pick", the second %s a SHA1
-#: sequencer.c:507
-#, c-format
-msgid "%s: cannot parse parent commit %s"
+#: fetch-pack.c:857
+msgid "Server supports multi_ack"
msgstr ""
-#: sequencer.c:511
-#, c-format
-msgid "Cannot get commit message for %s"
+#: fetch-pack.c:861
+msgid "Server supports side-band-64k"
msgstr ""
-#: sequencer.c:597
-#, c-format
-msgid "could not revert %s... %s"
+#: fetch-pack.c:865
+msgid "Server supports side-band"
msgstr ""
-#: sequencer.c:598
-#, c-format
-msgid "could not apply %s... %s"
+#: fetch-pack.c:869
+msgid "Server supports allow-tip-sha1-in-want"
msgstr ""
-#: sequencer.c:633
-msgid "empty commit set passed"
+#: fetch-pack.c:873
+msgid "Server supports allow-reachable-sha1-in-want"
msgstr ""
-#: sequencer.c:641
-#, c-format
-msgid "git %s: failed to read the index"
+#: fetch-pack.c:883
+msgid "Server supports ofs-delta"
msgstr ""
-#: sequencer.c:645
+#: fetch-pack.c:890
#, c-format
-msgid "git %s: failed to refresh the index"
+msgid "Server version is %.*s"
msgstr ""
-#: sequencer.c:705
-msgid "Cannot revert during another revert."
+#: fetch-pack.c:896
+msgid "Server does not support --shallow-since"
msgstr ""
-#: sequencer.c:706
-msgid "Cannot revert during a cherry-pick."
+#: fetch-pack.c:900
+msgid "Server does not support --shallow-exclude"
msgstr ""
-#: sequencer.c:709
-msgid "Cannot cherry-pick during a revert."
+#: fetch-pack.c:902
+msgid "Server does not support --deepen"
msgstr ""
-#: sequencer.c:710
-msgid "Cannot cherry-pick during another cherry-pick."
+#: fetch-pack.c:913
+msgid "no common commits"
msgstr ""
-#: sequencer.c:732
-#, c-format
-msgid "Could not parse line %d."
+#: fetch-pack.c:925
+msgid "git fetch-pack: fetch failed."
+msgstr ""
+
+#: fetch-pack.c:1087
+msgid "no matching remote head"
+msgstr ""
+
+#: gpg-interface.c:185
+msgid "gpg failed to sign the data"
msgstr ""
-#: sequencer.c:737
-msgid "No commits parsed."
+#: gpg-interface.c:215
+msgid "could not create temporary file"
msgstr ""
-#: sequencer.c:749
+#: gpg-interface.c:217
#, c-format
-msgid "Could not open %s"
+msgid "failed writing detached signature to '%s'"
msgstr ""
-#: sequencer.c:753
+#: graph.c:96
#, c-format
-msgid "Could not read %s."
+msgid "ignore invalid color '%.*s' in log.graphColors"
msgstr ""
-#: sequencer.c:760
+#: grep.c:1794
#, c-format
-msgid "Unusable instruction sheet: %s"
+msgid "'%s': unable to read %s"
msgstr ""
-#: sequencer.c:790
+#: grep.c:1811 builtin/clone.c:381 builtin/diff.c:81 builtin/rm.c:133
#, c-format
-msgid "Invalid key: %s"
+msgid "failed to stat '%s'"
msgstr ""
-#: sequencer.c:793 builtin/pull.c:50 builtin/pull.c:52
+#: grep.c:1822
#, c-format
-msgid "Invalid value for %s: %s"
+msgid "'%s': short read"
msgstr ""
-#: sequencer.c:803
+#: help.c:218
#, c-format
-msgid "Malformed options sheet: %s"
+msgid "available git commands in '%s'"
msgstr ""
-#: sequencer.c:822
-msgid "a cherry-pick or revert is already in progress"
+#: help.c:225
+msgid "git commands available from elsewhere on your $PATH"
msgstr ""
-#: sequencer.c:823
-msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
+#: help.c:256
+msgid "These are common Git commands used in various situations:"
msgstr ""
-#: sequencer.c:827
+#: help.c:321
#, c-format
-msgid "Could not create sequencer directory %s"
+msgid ""
+"'%s' appears to be a git command, but we were not\n"
+"able to execute it. Maybe git-%s is broken?"
msgstr ""
-#: sequencer.c:862 sequencer.c:998
-msgid "no cherry-pick or revert in progress"
+#: help.c:376
+msgid "Uh oh. Your system reports no Git commands at all."
msgstr ""
-#: sequencer.c:864
-msgid "cannot resolve HEAD"
+#: help.c:398
+#, 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 ""
-#: sequencer.c:866 sequencer.c:900
-msgid "cannot abort from a branch yet to be born"
+#: help.c:403
+#, c-format
+msgid "in %0.1f seconds automatically..."
msgstr ""
-#: sequencer.c:886 builtin/fetch.c:724 builtin/fetch.c:970
+#: help.c:410
#, c-format
-msgid "cannot open %s"
+msgid "git: '%s' is not a git command. See 'git --help'."
msgstr ""
-#: sequencer.c:888
+#: help.c:414 help.c:480
+msgid ""
+"\n"
+"Did you mean this?"
+msgid_plural ""
+"\n"
+"Did you mean one of these?"
+msgstr[0] ""
+msgstr[1] ""
+
+#: help.c:476
#, c-format
-msgid "cannot read %s: %s"
+msgid "%s: %s - %s"
msgstr ""
-#: sequencer.c:889
-msgid "unexpected end of file"
+#: ident.c:334
+msgid ""
+"\n"
+"*** Please tell me who you are.\n"
+"\n"
+"Run\n"
+"\n"
+" git config --global user.email \"you@example.com\"\n"
+" git config --global user.name \"Your Name\"\n"
+"\n"
+"to set your account's default identity.\n"
+"Omit --global to set the identity only in this repository.\n"
+"\n"
msgstr ""
-#: sequencer.c:895
+#: lockfile.c:152
#, c-format
-msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
+msgid ""
+"Unable to create '%s.lock': %s.\n"
+"\n"
+"Another git process seems to be running in this repository, e.g.\n"
+"an editor opened by 'git commit'. Please make sure all processes\n"
+"are terminated then try again. If it still fails, a git process\n"
+"may have crashed in this repository earlier:\n"
+"remove the file manually to continue."
msgstr ""
-#: sequencer.c:921
+#: lockfile.c:160
#, c-format
-msgid "Could not format %s."
+msgid "Unable to create '%s.lock': %s"
msgstr ""
-#: sequencer.c:1066
-#, c-format
-msgid "%s: can't cherry-pick a %s"
+#: merge.c:41
+msgid "failed to read the cache"
+msgstr ""
+
+#: merge.c:96 builtin/am.c:2000 builtin/am.c:2035 builtin/checkout.c:374
+#: builtin/checkout.c:588 builtin/clone.c:731
+msgid "unable to write new index file"
+msgstr ""
+
+#: merge-recursive.c:209
+msgid "(bad commit)\n"
msgstr ""
-#: sequencer.c:1069
+#: merge-recursive.c:231 merge-recursive.c:239
#, c-format
-msgid "%s: bad revision"
+msgid "addinfo_cache failed for path '%s'"
msgstr ""
-#: sequencer.c:1102
-msgid "Can't revert as initial commit"
+#: merge-recursive.c:303
+msgid "error building trees"
msgstr ""
-#: setup.c:160
+#: merge-recursive.c:727
#, c-format
-msgid ""
-"%s: no such path in the working tree.\n"
-"Use 'git <command> -- <path>...' to specify paths that do not exist locally."
+msgid "failed to create path '%s'%s"
msgstr ""
-#: setup.c:173
+#: merge-recursive.c:738
#, c-format
-msgid ""
-"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
-"Use '--' to separate paths from revisions, like this:\n"
-"'git <command> [<revision>...] -- [<file>...]'"
+msgid "Removing %s to make room for subdirectory\n"
msgstr ""
-#: setup.c:223
+#: merge-recursive.c:752 merge-recursive.c:771
+msgid ": perhaps a D/F conflict?"
+msgstr ""
+
+#: merge-recursive.c:761
#, c-format
-msgid ""
-"ambiguous argument '%s': both revision and filename\n"
-"Use '--' to separate paths from revisions, like this:\n"
-"'git <command> [<revision>...] -- [<file>...]'"
+msgid "refusing to lose untracked file at '%s'"
msgstr ""
-#: setup.c:248 builtin/apply.c:3362 builtin/apply.c:3373 builtin/apply.c:3419
+#: merge-recursive.c:803 builtin/cat-file.c:34
#, c-format
-msgid "failed to read %s"
+msgid "cannot read object %s '%s'"
msgstr ""
-#: setup.c:468
+#: merge-recursive.c:805
#, c-format
-msgid "Expected git repo version <= %d, found %d"
+msgid "blob expected for %s '%s'"
msgstr ""
-#: setup.c:476
-msgid "unknown repository extensions found:"
+#: merge-recursive.c:829
+#, c-format
+msgid "failed to open '%s': %s"
msgstr ""
-#: setup.c:762
+#: merge-recursive.c:840
#, c-format
-msgid "Not a git repository (or any of the parent directories): %s"
+msgid "failed to symlink '%s': %s"
msgstr ""
-#: setup.c:764 setup.c:915 builtin/index-pack.c:1641
-msgid "Cannot come back to cwd"
+#: merge-recursive.c:845
+#, c-format
+msgid "do not know what to do with %06o %s '%s'"
msgstr ""
-#: setup.c:845
-msgid "Unable to read current working directory"
+#: merge-recursive.c:985
+msgid "Failed to execute internal merge"
msgstr ""
-#: setup.c:920
+#: merge-recursive.c:989
#, c-format
-msgid ""
-"Not a git repository (or any parent up to mount point %s)\n"
-"Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."
+msgid "Unable to add %s to database"
msgstr ""
-#: setup.c:927
+#: merge-recursive.c:1088 merge-recursive.c:1102
#, c-format
-msgid "Cannot change to '%s/..'"
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
+"in tree."
msgstr ""
-#: setup.c:989
+#: merge-recursive.c:1094 merge-recursive.c:1107
#, c-format
msgid ""
-"Problem with core.sharedRepository filemode value (0%.3o).\n"
-"The owner of files must always have read and write permissions."
+"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
+"in tree at %s."
msgstr ""
-#: sha1_file.c:1046
-msgid "offset before end of packfile (broken .idx?)"
+#: merge-recursive.c:1150
+msgid "rename"
msgstr ""
-#: sha1_file.c:2434
-#, c-format
-msgid "offset before start of pack index for %s (corrupt index?)"
+#: merge-recursive.c:1150
+msgid "renamed"
msgstr ""
-#: sha1_file.c:2438
+#: merge-recursive.c:1207
#, c-format
-msgid "offset beyond end of pack index for %s (truncated index?)"
+msgid "%s is a directory in %s adding as %s instead"
msgstr ""
-#: sha1_name.c:462
+#: merge-recursive.c:1232
+#, c-format
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\""
+"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
+"\"->\"%s\" in \"%s\"%s"
msgstr ""
-#: submodule.c:64 submodule.c:98
-msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
+#: merge-recursive.c:1237
+msgid " (left unresolved)"
msgstr ""
-#: submodule.c:68 submodule.c:102
+#: merge-recursive.c:1299
#, c-format
-msgid "Could not find section in .gitmodules where path=%s"
+msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr ""
-#: submodule.c:76
+#: merge-recursive.c:1332
#, c-format
-msgid "Could not update .gitmodules entry %s"
+msgid "Renaming %s to %s and %s to %s instead"
msgstr ""
-#: submodule.c:109
+#: merge-recursive.c:1535
#, c-format
-msgid "Could not remove .gitmodules entry for %s"
+msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
msgstr ""
-#: submodule.c:120
-msgid "staging updated .gitmodules failed"
+#: merge-recursive.c:1550
+#, c-format
+msgid "Adding merged %s"
msgstr ""
-#: submodule.c:177
-msgid "negative values not allowed for submodule.fetchJobs"
+#: merge-recursive.c:1557 merge-recursive.c:1771
+#, c-format
+msgid "Adding as %s instead"
msgstr ""
-#: submodule-config.c:358
+#: merge-recursive.c:1614
#, c-format
-msgid "invalid value for %s"
+msgid "cannot read object %s"
msgstr ""
-#: trailer.c:237
+#: merge-recursive.c:1617
#, c-format
-msgid "running trailer command '%s' failed"
+msgid "object %s is not a blob"
msgstr ""
-#: trailer.c:492 trailer.c:496 trailer.c:500 trailer.c:554 trailer.c:558
-#: trailer.c:562
-#, c-format
-msgid "unknown value '%s' for key '%s'"
+#: merge-recursive.c:1670
+msgid "modify"
msgstr ""
-#: trailer.c:544 trailer.c:549 builtin/remote.c:289
-#, c-format
-msgid "more than one %s"
+#: merge-recursive.c:1670
+msgid "modified"
msgstr ""
-#: trailer.c:582
-#, c-format
-msgid "empty trailer token in trailer '%.*s'"
+#: merge-recursive.c:1680
+msgid "content"
msgstr ""
-#: trailer.c:702
-#, c-format
-msgid "could not read input file '%s'"
+#: merge-recursive.c:1687
+msgid "add/add"
msgstr ""
-#: trailer.c:705
-msgid "could not read from stdin"
+#: merge-recursive.c:1723
+#, c-format
+msgid "Skipped %s (merged same as existing)"
msgstr ""
-#: trailer.c:857 builtin/am.c:42
+#: merge-recursive.c:1737
#, c-format
-msgid "could not stat %s"
+msgid "Auto-merging %s"
msgstr ""
-#: trailer.c:859
+#: merge-recursive.c:1741 git-submodule.sh:930
+msgid "submodule"
+msgstr ""
+
+#: merge-recursive.c:1742
#, c-format
-msgid "file %s is not a regular file"
+msgid "CONFLICT (%s): Merge conflict in %s"
msgstr ""
-#: trailer.c:861
+#: merge-recursive.c:1836
#, c-format
-msgid "file %s is not writable by user"
+msgid "Removing %s"
msgstr ""
-#: trailer.c:873
-msgid "could not open temporary file"
+#: merge-recursive.c:1862
+msgid "file/directory"
msgstr ""
-#: trailer.c:912
-#, c-format
-msgid "could not rename temporary file to %s"
+#: merge-recursive.c:1868
+msgid "directory/file"
msgstr ""
-#: transport.c:62
+#: merge-recursive.c:1874
#, c-format
-msgid "Would set upstream of '%s' to '%s' of '%s'\n"
+msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
msgstr ""
-#: transport.c:151
+#: merge-recursive.c:1883
#, c-format
-msgid "transport: invalid depth option '%s'"
+msgid "Adding %s"
msgstr ""
-#: transport.c:771
-#, c-format
-msgid ""
-"The following submodule paths contain changes that can\n"
-"not be found on any remote:\n"
+#: merge-recursive.c:1920
+msgid "Already up-to-date!"
msgstr ""
-#: transport.c:775
+#: merge-recursive.c:1929
#, c-format
-msgid ""
-"\n"
-"Please try\n"
-"\n"
-"\tgit push --recurse-submodules=on-demand\n"
-"\n"
-"or cd to the path and use\n"
-"\n"
-"\tgit push\n"
-"\n"
-"to push them to a remote.\n"
-"\n"
+msgid "merging of trees %s and %s failed"
msgstr ""
-#: transport.c:783
-msgid "Aborting."
+#: merge-recursive.c:2012
+msgid "Merging:"
msgstr ""
-#: transport-helper.c:1041
+#: merge-recursive.c:2025
#, c-format
-msgid "Could not read ref %s"
+msgid "found %u common ancestor:"
+msgid_plural "found %u common ancestors:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: merge-recursive.c:2064
+msgid "merge returned no commit"
msgstr ""
-#: unpack-trees.c:64
+#: merge-recursive.c:2127
#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by checkout:\n"
-"%%sPlease commit your changes or stash them before you switch branches."
+msgid "Could not parse object '%s'"
msgstr ""
-#: unpack-trees.c:66
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by checkout:\n"
-"%%s"
+#: merge-recursive.c:2141 builtin/merge.c:645 builtin/merge.c:792
+msgid "Unable to write index."
msgstr ""
-#: unpack-trees.c:69
+#: notes-merge.c:273
#, c-format
msgid ""
-"Your local changes to the following files would be overwritten by merge:\n"
-"%%sPlease commit your changes or stash them before you merge."
+"You have not concluded your previous notes merge (%s exists).\n"
+"Please, use 'git notes merge --commit' or 'git notes merge --abort' to "
+"commit/abort the previous merge before you start a new notes merge."
msgstr ""
-#: unpack-trees.c:71
+#: notes-merge.c:280
#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by merge:\n"
-"%%s"
+msgid "You have not concluded your notes merge (%s exists)."
msgstr ""
-#: unpack-trees.c:74
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by %s:\n"
-"%%sPlease commit your changes or stash them before you %s."
+#: notes-utils.c:41
+msgid "Cannot commit uninitialized/unreferenced notes tree"
msgstr ""
-#: unpack-trees.c:76
+#: notes-utils.c:100
#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by %s:\n"
-"%%s"
+msgid "Bad notes.rewriteMode value: '%s'"
msgstr ""
-#: unpack-trees.c:81
+#: notes-utils.c:110
#, c-format
-msgid ""
-"Updating the following directories would lose untracked files in it:\n"
-"%s"
+msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
msgstr ""
-#: unpack-trees.c:85
+#. TRANSLATORS: The first %s is the name of the
+#. environment variable, the second %s is its value
+#: notes-utils.c:137
#, c-format
-msgid ""
-"The following untracked working tree files would be removed by checkout:\n"
-"%%sPlease move or remove them before you switch branches."
+msgid "Bad %s value: '%s'"
msgstr ""
-#: unpack-trees.c:87
+#: object.c:240
#, c-format
-msgid ""
-"The following untracked working tree files would be removed by checkout:\n"
-"%%s"
+msgid "unable to parse object: %s"
msgstr ""
-#: unpack-trees.c:90
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by merge:\n"
-"%%sPlease move or remove them before you merge."
+#: parse-options.c:572
+msgid "..."
msgstr ""
-#: unpack-trees.c:92
+#: parse-options.c:590
#, c-format
-msgid ""
-"The following untracked working tree files would be removed by merge:\n"
-"%%s"
+msgid "usage: %s"
msgstr ""
-#: unpack-trees.c:95
+#. TRANSLATORS: the colon here should align with the
+#. one in "usage: %s" translation
+#: parse-options.c:594
#, c-format
-msgid ""
-"The following untracked working tree files would be removed by %s:\n"
-"%%sPlease move or remove them before you %s."
+msgid " or: %s"
msgstr ""
-#: unpack-trees.c:97
+#: parse-options.c:597
#, c-format
-msgid ""
-"The following untracked working tree files would be removed by %s:\n"
-"%%s"
+msgid " %s"
msgstr ""
-#: unpack-trees.c:102
-#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by "
-"checkout:\n"
-"%%sPlease move or remove them before you switch branches."
+#: parse-options.c:631
+msgid "-NUM"
msgstr ""
-#: unpack-trees.c:104
+#: parse-options-cb.c:108
#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by "
-"checkout:\n"
-"%%s"
+msgid "malformed object name '%s'"
msgstr ""
-#: unpack-trees.c:107
+#: path.c:826
#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by merge:\n"
-"%%sPlease move or remove them before you merge."
+msgid "Could not make %s writable by group"
msgstr ""
-#: unpack-trees.c:109
-#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by merge:\n"
-"%%s"
+#: pathspec.c:142
+msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
msgstr ""
-#: unpack-trees.c:112
-#, c-format
+#: pathspec.c:149
msgid ""
-"The following untracked working tree files would be overwritten by %s:\n"
-"%%sPlease move or remove them before you %s."
+"global 'literal' pathspec setting is incompatible with all other global "
+"pathspec settings"
msgstr ""
-#: unpack-trees.c:114
-#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by %s:\n"
-"%%s"
+#: pathspec.c:188
+msgid "invalid parameter for pathspec magic 'prefix'"
msgstr ""
-#: unpack-trees.c:121
+#: pathspec.c:201
#, c-format
-msgid "Entry '%s' overlaps with '%s'. Cannot bind."
+msgid "Invalid pathspec magic '%.*s' in '%s'"
msgstr ""
-#: unpack-trees.c:124
+#: pathspec.c:206
#, c-format
-msgid ""
-"Cannot update sparse checkout: the following entries are not up-to-date:\n"
-"%s"
+msgid "Missing ')' at the end of pathspec magic in '%s'"
msgstr ""
-#: unpack-trees.c:126
+#: pathspec.c:238
#, c-format
-msgid ""
-"The following Working tree files would be overwritten by sparse checkout "
-"update:\n"
-"%s"
+msgid "Unimplemented pathspec magic '%c' in '%s'"
msgstr ""
-#: unpack-trees.c:128
+#: pathspec.c:293 pathspec.c:315
#, c-format
-msgid ""
-"The following Working tree files would be removed by sparse checkout "
-"update:\n"
-"%s"
+msgid "Pathspec '%s' is in submodule '%.*s'"
msgstr ""
-#: unpack-trees.c:205
+#: pathspec.c:350
#, c-format
-msgid "Aborting\n"
+msgid "%s: 'literal' and 'glob' are incompatible"
msgstr ""
-#: unpack-trees.c:237
-msgid "Checking out files"
+#: pathspec.c:363
+#, c-format
+msgid "%s: '%s' is outside repository"
msgstr ""
-#: urlmatch.c:120
-msgid "invalid URL scheme name or missing '://' suffix"
+#: pathspec.c:451
+#, c-format
+msgid "'%s' (mnemonic: '%c')"
msgstr ""
-#: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356
+#: pathspec.c:461
#, c-format
-msgid "invalid %XX escape sequence"
+msgid "%s: pathspec magic not supported by this command: %s"
msgstr ""
-#: urlmatch.c:172
-msgid "missing host and scheme is not 'file:'"
+#: pathspec.c:511
+msgid ""
+"empty strings as pathspecs will be made invalid in upcoming releases. please "
+"use . instead if you meant to match all paths"
msgstr ""
-#: urlmatch.c:189
-msgid "a 'file:' URL may not have a port number"
+#: pathspec.c:535
+#, c-format
+msgid "pathspec '%s' is beyond a symbolic link"
msgstr ""
-#: urlmatch.c:199
-msgid "invalid characters in host name"
+#: pathspec.c:544
+msgid ""
+"There is nothing to exclude from by :(exclude) patterns.\n"
+"Perhaps you forgot to add either ':/' or '.' ?"
msgstr ""
-#: urlmatch.c:244 urlmatch.c:255
-msgid "invalid port number"
+#: pretty.c:982
+msgid "unable to parse --pretty format"
msgstr ""
-#: urlmatch.c:322
-msgid "invalid '..' path segment"
+#: read-cache.c:1307
+#, c-format
+msgid ""
+"index.version set, but the value is invalid.\n"
+"Using version %i"
msgstr ""
-#: worktree.c:282
+#: read-cache.c:1317
#, c-format
-msgid "failed to read '%s'"
+msgid ""
+"GIT_INDEX_VERSION set, but the value is invalid.\n"
+"Using version %i"
msgstr ""
-#: wrapper.c:222 wrapper.c:392
+#: refs.c:576 builtin/merge.c:844
#, c-format
-msgid "could not open '%s' for reading and writing"
+msgid "Could not open '%s' for writing"
msgstr ""
-#: wrapper.c:224 wrapper.c:394 builtin/am.c:778
+#: refs/files-backend.c:2481
#, c-format
-msgid "could not open '%s' for writing"
+msgid "could not delete reference %s: %s"
msgstr ""
-#: wrapper.c:226 wrapper.c:396 builtin/am.c:324 builtin/am.c:771
-#: builtin/am.c:859 builtin/commit.c:1712 builtin/merge.c:1029
-#: builtin/pull.c:407
+#: refs/files-backend.c:2484
#, c-format
-msgid "could not open '%s' for reading"
+msgid "could not delete references: %s"
msgstr ""
-#: wrapper.c:605 wrapper.c:626
+#: refs/files-backend.c:2493
#, c-format
-msgid "unable to access '%s'"
+msgid "could not remove reference %s"
msgstr ""
-#: wrapper.c:634
-msgid "unable to get current working directory"
+#: ref-filter.c:56
+#, c-format
+msgid "expected format: %%(color:<color>)"
msgstr ""
-#: wrapper.c:658
+#: ref-filter.c:58
#, c-format
-msgid "could not write to %s"
+msgid "unrecognized color: %%(color:%s)"
msgstr ""
-#: wrapper.c:660
+#: ref-filter.c:72
#, c-format
-msgid "could not close %s"
+msgid "unrecognized format: %%(%s)"
msgstr ""
-#: wt-status.c:150
-msgid "Unmerged paths:"
+#: ref-filter.c:78
+#, c-format
+msgid "%%(body) does not take arguments"
msgstr ""
-#: wt-status.c:177 wt-status.c:204
+#: ref-filter.c:85
#, c-format
-msgid " (use \"git reset %s <file>...\" to unstage)"
+msgid "%%(subject) does not take arguments"
msgstr ""
-#: wt-status.c:179 wt-status.c:206
-msgid " (use \"git rm --cached <file>...\" to unstage)"
+#: ref-filter.c:92
+#, c-format
+msgid "%%(trailers) does not take arguments"
msgstr ""
-#: wt-status.c:183
-msgid " (use \"git add <file>...\" to mark resolution)"
+#: ref-filter.c:111
+#, c-format
+msgid "positive value expected contents:lines=%s"
msgstr ""
-#: wt-status.c:185 wt-status.c:189
-msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
+#: ref-filter.c:113
+#, c-format
+msgid "unrecognized %%(contents) argument: %s"
msgstr ""
-#: wt-status.c:187
-msgid " (use \"git rm <file>...\" to mark resolution)"
+#: ref-filter.c:123
+#, c-format
+msgid "unrecognized %%(objectname) argument: %s"
msgstr ""
-#: wt-status.c:198 wt-status.c:882
-msgid "Changes to be committed:"
+#: ref-filter.c:145
+#, c-format
+msgid "expected format: %%(align:<width>,<position>)"
msgstr ""
-#: wt-status.c:216 wt-status.c:891
-msgid "Changes not staged for commit:"
+#: ref-filter.c:157
+#, c-format
+msgid "unrecognized position:%s"
msgstr ""
-#: wt-status.c:220
-msgid " (use \"git add <file>...\" to update what will be committed)"
+#: ref-filter.c:161
+#, c-format
+msgid "unrecognized width:%s"
msgstr ""
-#: wt-status.c:222
-msgid " (use \"git add/rm <file>...\" to update what will be committed)"
+#: ref-filter.c:167
+#, c-format
+msgid "unrecognized %%(align) argument: %s"
msgstr ""
-#: wt-status.c:223
-msgid ""
-" (use \"git checkout -- <file>...\" to discard changes in working directory)"
+#: ref-filter.c:171
+#, c-format
+msgid "positive width expected with the %%(align) atom"
msgstr ""
-#: wt-status.c:225
-msgid " (commit or discard the untracked or modified content in submodules)"
+#: ref-filter.c:255
+#, c-format
+msgid "malformed field name: %.*s"
msgstr ""
-#: wt-status.c:237
+#: ref-filter.c:281
#, c-format
-msgid " (use \"git %s <file>...\" to include in what will be committed)"
+msgid "unknown field name: %.*s"
msgstr ""
-#: wt-status.c:252
-msgid "both deleted:"
+#: ref-filter.c:383
+#, c-format
+msgid "format: %%(end) atom used without corresponding atom"
msgstr ""
-#: wt-status.c:254
-msgid "added by us:"
+#: ref-filter.c:435
+#, c-format
+msgid "malformed format string %s"
msgstr ""
-#: wt-status.c:256
-msgid "deleted by them:"
+#: ref-filter.c:898
+msgid ":strip= requires a positive integer argument"
msgstr ""
-#: wt-status.c:258
-msgid "added by them:"
+#: ref-filter.c:903
+#, c-format
+msgid "ref '%s' does not have %ld components to :strip"
msgstr ""
-#: wt-status.c:260
-msgid "deleted by us:"
+#: ref-filter.c:1066
+#, c-format
+msgid "unknown %.*s format %s"
msgstr ""
-#: wt-status.c:262
-msgid "both added:"
+#: ref-filter.c:1086 ref-filter.c:1117
+#, c-format
+msgid "missing object %s for %s"
msgstr ""
-#: wt-status.c:264
-msgid "both modified:"
+#: ref-filter.c:1089 ref-filter.c:1120
+#, c-format
+msgid "parse_object_buffer failed on %s for %s"
msgstr ""
-#: wt-status.c:274
-msgid "new file:"
+#: ref-filter.c:1343
+#, c-format
+msgid "malformed object at '%s'"
msgstr ""
-#: wt-status.c:276
-msgid "copied:"
+#: ref-filter.c:1410
+#, c-format
+msgid "ignoring ref with broken name %s"
msgstr ""
-#: wt-status.c:278
-msgid "deleted:"
+#: ref-filter.c:1415
+#, c-format
+msgid "ignoring broken ref %s"
msgstr ""
-#: wt-status.c:280
-msgid "modified:"
+#: ref-filter.c:1670
+#, c-format
+msgid "format: %%(end) atom missing"
msgstr ""
-#: wt-status.c:282
-msgid "renamed:"
+#: ref-filter.c:1734
+#, c-format
+msgid "malformed object name %s"
msgstr ""
-#: wt-status.c:284
-msgid "typechange:"
+#: remote.c:754
+#, c-format
+msgid "Cannot fetch both %s and %s to %s"
msgstr ""
-#: wt-status.c:286
-msgid "unknown:"
+#: remote.c:758
+#, c-format
+msgid "%s usually tracks %s, not %s"
msgstr ""
-#: wt-status.c:288
-msgid "unmerged:"
+#: remote.c:762
+#, c-format
+msgid "%s tracks both %s and %s"
msgstr ""
-#: wt-status.c:370
-msgid "new commits, "
+#: remote.c:770
+msgid "Internal error"
msgstr ""
-#: wt-status.c:372
-msgid "modified content, "
+#: remote.c:1685 remote.c:1787
+msgid "HEAD does not point to a branch"
msgstr ""
-#: wt-status.c:374
-msgid "untracked content, "
+#: remote.c:1694
+#, c-format
+msgid "no such branch: '%s'"
msgstr ""
-#: wt-status.c:756
-msgid "Submodules changed but not updated:"
+#: remote.c:1697
+#, c-format
+msgid "no upstream configured for branch '%s'"
msgstr ""
-#: wt-status.c:758
-msgid "Submodule changes to be committed:"
+#: remote.c:1703
+#, c-format
+msgid "upstream branch '%s' not stored as a remote-tracking branch"
msgstr ""
-#: wt-status.c:839
-msgid ""
-"Do not touch the line above.\n"
-"Everything below will be removed."
+#: remote.c:1718
+#, c-format
+msgid "push destination '%s' on remote '%s' has no local tracking branch"
msgstr ""
-#: wt-status.c:950
-msgid "You have unmerged paths."
+#: remote.c:1730
+#, c-format
+msgid "branch '%s' has no remote for pushing"
msgstr ""
-#: wt-status.c:953
-msgid " (fix conflicts and run \"git commit\")"
+#: remote.c:1741
+#, c-format
+msgid "push refspecs for '%s' do not include '%s'"
msgstr ""
-#: wt-status.c:955
-msgid " (use \"git merge --abort\" to abort the merge)"
+#: remote.c:1754
+msgid "push has no destination (push.default is 'nothing')"
msgstr ""
-#: wt-status.c:960
-msgid "All conflicts fixed but you are still merging."
+#: remote.c:1776
+msgid "cannot resolve 'simple' push to a single destination"
msgstr ""
-#: wt-status.c:963
-msgid " (use \"git commit\" to conclude merge)"
+#: remote.c:2081
+#, c-format
+msgid "Your branch is based on '%s', but the upstream is gone.\n"
msgstr ""
-#: wt-status.c:973
-msgid "You are in the middle of an am session."
+#: remote.c:2085
+msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr ""
-#: wt-status.c:976
-msgid "The current patch is empty."
+#: remote.c:2088
+#, c-format
+msgid "Your branch is up-to-date with '%s'.\n"
msgstr ""
-#: wt-status.c:980
-msgid " (fix conflicts and then run \"git am --continue\")"
-msgstr ""
+#: remote.c:2092
+#, 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] ""
-#: wt-status.c:982
-msgid " (use \"git am --skip\" to skip this patch)"
+#: remote.c:2098
+msgid " (use \"git push\" to publish your local commits)\n"
msgstr ""
-#: wt-status.c:984
-msgid " (use \"git am --abort\" to restore the original branch)"
-msgstr ""
+#: remote.c:2101
+#, 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] ""
-#: wt-status.c:1109
-msgid "No commands done."
+#: remote.c:2109
+msgid " (use \"git pull\" to update your local branch)\n"
msgstr ""
-#: wt-status.c:1112
+#: remote.c:2112
#, c-format
-msgid "Last command done (%d command done):"
-msgid_plural "Last commands done (%d commands done):"
+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] ""
-#: wt-status.c:1123
-#, c-format
-msgid " (see more in file %s)"
+#: remote.c:2122
+msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr ""
-#: wt-status.c:1128
-msgid "No commands remaining."
+#: revision.c:2158
+msgid "your current branch appears to be broken"
msgstr ""
-#: wt-status.c:1131
+#: revision.c:2161
#, c-format
-msgid "Next command to do (%d remaining command):"
-msgid_plural "Next commands to do (%d remaining commands):"
-msgstr[0] ""
-msgstr[1] ""
+msgid "your current branch '%s' does not have any commits yet"
+msgstr ""
-#: wt-status.c:1139
-msgid " (use \"git rebase --edit-todo\" to view and edit)"
+#: revision.c:2355
+msgid "--first-parent is incompatible with --bisect"
msgstr ""
-#: wt-status.c:1152
-#, c-format
-msgid "You are currently rebasing branch '%s' on '%s'."
+#: run-command.c:125
+msgid "open /dev/null failed"
msgstr ""
-#: wt-status.c:1157
-msgid "You are currently rebasing."
+#: run-command.c:127
+#, c-format
+msgid "dup2(%d,%d) failed"
msgstr ""
-#: wt-status.c:1171
-msgid " (fix conflicts and then run \"git rebase --continue\")"
+#: send-pack.c:297
+msgid "failed to sign the push certificate"
msgstr ""
-#: wt-status.c:1173
-msgid " (use \"git rebase --skip\" to skip this patch)"
+#: send-pack.c:410
+msgid "the receiving end does not support --signed push"
msgstr ""
-#: wt-status.c:1175
-msgid " (use \"git rebase --abort\" to check out the original branch)"
+#: send-pack.c:412
+msgid ""
+"not sending a push certificate since the receiving end does not support --"
+"signed push"
msgstr ""
-#: wt-status.c:1181
-msgid " (all conflicts fixed: run \"git rebase --continue\")"
+#: send-pack.c:424
+msgid "the receiving end does not support --atomic push"
msgstr ""
-#: wt-status.c:1185
-#, c-format
-msgid ""
-"You are currently splitting a commit while rebasing branch '%s' on '%s'."
+#: send-pack.c:429
+msgid "the receiving end does not support push options"
msgstr ""
-#: wt-status.c:1190
-msgid "You are currently splitting a commit during a rebase."
+#: sequencer.c:215
+msgid "revert"
msgstr ""
-#: wt-status.c:1193
-msgid " (Once your working directory is clean, run \"git rebase --continue\")"
+#: sequencer.c:217
+msgid "cherry-pick"
msgstr ""
-#: wt-status.c:1197
-#, c-format
-msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
+#: sequencer.c:219
+msgid "rebase -i"
msgstr ""
-#: wt-status.c:1202
-msgid "You are currently editing a commit during a rebase."
+#: sequencer.c:221
+#, c-format
+msgid "Unknown action: %d"
msgstr ""
-#: wt-status.c:1205
-msgid " (use \"git commit --amend\" to amend the current commit)"
+#: sequencer.c:278
+msgid ""
+"after resolving the conflicts, mark the corrected paths\n"
+"with 'git add <paths>' or 'git rm <paths>'"
msgstr ""
-#: wt-status.c:1207
+#: sequencer.c:281
msgid ""
-" (use \"git rebase --continue\" once you are satisfied with your changes)"
+"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:1217
+#: sequencer.c:294 sequencer.c:1667
#, c-format
-msgid "You are currently cherry-picking commit %s."
+msgid "could not lock '%s'"
msgstr ""
-#: wt-status.c:1222
-msgid " (fix conflicts and run \"git cherry-pick --continue\")"
+#: sequencer.c:297 sequencer.c:1545 sequencer.c:1672 sequencer.c:1686
+#, c-format
+msgid "could not write to '%s'"
msgstr ""
-#: wt-status.c:1225
-msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
+#: sequencer.c:301
+#, c-format
+msgid "could not write eol to '%s'"
msgstr ""
-#: wt-status.c:1227
-msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
+#: sequencer.c:305 sequencer.c:1550 sequencer.c:1674
+#, c-format
+msgid "failed to finalize '%s'."
msgstr ""
-#: wt-status.c:1236
+#: sequencer.c:329 sequencer.c:808 sequencer.c:1571 builtin/am.c:259
+#: builtin/commit.c:749 builtin/merge.c:1036
#, c-format
-msgid "You are currently reverting commit %s."
+msgid "could not read '%s'"
msgstr ""
-#: wt-status.c:1241
-msgid " (fix conflicts and run \"git revert --continue\")"
+#: sequencer.c:355
+#, c-format
+msgid "your local changes would be overwritten by %s."
msgstr ""
-#: wt-status.c:1244
-msgid " (all conflicts fixed: run \"git revert --continue\")"
+#: sequencer.c:359
+msgid "commit your changes or stash them to proceed."
msgstr ""
-#: wt-status.c:1246
-msgid " (use \"git revert --abort\" to cancel the revert operation)"
+#: sequencer.c:388
+#, c-format
+msgid "%s: fast-forward"
msgstr ""
-#: wt-status.c:1257
+#. TRANSLATORS: %s will be "revert", "cherry-pick" or
+#. * "rebase -i".
+#.
+#: sequencer.c:470
#, c-format
-msgid "You are currently bisecting, started from branch '%s'."
+msgid "%s: Unable to write new index file"
msgstr ""
-#: wt-status.c:1261
-msgid "You are currently bisecting."
+#: sequencer.c:489
+msgid "could not resolve HEAD commit\n"
msgstr ""
-#: wt-status.c:1264
-msgid " (use \"git bisect reset\" to get back to the original branch)"
+#: sequencer.c:509
+msgid "unable to update cache tree\n"
msgstr ""
-#: wt-status.c:1464
-msgid "On branch "
+#: sequencer.c:592
+#, c-format
+msgid ""
+"you have staged changes in your working tree\n"
+"If these changes are meant to be squashed into the previous commit, run:\n"
+"\n"
+" git commit --amend %s\n"
+"\n"
+"If they are meant to go into a new commit, run:\n"
+"\n"
+" git commit %s\n"
+"\n"
+"In both cases, once you're done, continue with:\n"
+"\n"
+" git rebase --continue\n"
msgstr ""
-#: wt-status.c:1470
-msgid "interactive rebase in progress; onto "
+#: sequencer.c:688
+#, c-format
+msgid "could not parse commit %s\n"
msgstr ""
-#: wt-status.c:1472
-msgid "rebase in progress; onto "
+#: sequencer.c:693
+#, c-format
+msgid "could not parse parent commit %s\n"
msgstr ""
-#: wt-status.c:1477
-msgid "HEAD detached at "
+#: sequencer.c:815
+#, c-format
+msgid ""
+"unexpected 1st line of squash message:\n"
+"\n"
+"\t%.*s"
msgstr ""
-#: wt-status.c:1479
-msgid "HEAD detached from "
+#: sequencer.c:821
+#, c-format
+msgid ""
+"invalid 1st line of squash message:\n"
+"\n"
+"\t%.*s"
msgstr ""
-#: wt-status.c:1482
-msgid "Not currently on any branch."
+#: sequencer.c:827 sequencer.c:852
+#, c-format
+msgid "This is a combination of %d commits."
msgstr ""
-#: wt-status.c:1500
-msgid "Initial commit"
+#: sequencer.c:836
+msgid "need a HEAD to fixup"
msgstr ""
-#: wt-status.c:1514
-msgid "Untracked files"
+#: sequencer.c:838
+msgid "could not read HEAD"
msgstr ""
-#: wt-status.c:1516
-msgid "Ignored files"
+#: sequencer.c:840
+msgid "could not read HEAD's commit message"
msgstr ""
-#: wt-status.c:1520
+#: sequencer.c:846
#, 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')."
+msgid "cannot write '%s'"
msgstr ""
-#: wt-status.c:1526
-#, c-format
-msgid "Untracked files not listed%s"
+#: sequencer.c:855 git-rebase--interactive.sh:445
+msgid "This is the 1st commit message:"
msgstr ""
-#: wt-status.c:1528
-msgid " (use -u option to show untracked files)"
+#: sequencer.c:863
+#, c-format
+msgid "could not read commit message of %s"
msgstr ""
-#: wt-status.c:1534
-msgid "No changes"
+#: sequencer.c:870
+#, c-format
+msgid "This is the commit message #%d:"
msgstr ""
-#: wt-status.c:1539
+#: sequencer.c:875
#, c-format
-msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
+msgid "The commit message #%d will be skipped:"
msgstr ""
-#: wt-status.c:1542
+#: sequencer.c:880
#, c-format
-msgid "no changes added to commit\n"
+msgid "unknown command: %d"
msgstr ""
-#: wt-status.c:1545
+#: sequencer.c:946
+msgid "your index file is unmerged."
+msgstr ""
+
+#: sequencer.c:964
#, c-format
-msgid ""
-"nothing added to commit but untracked files present (use \"git add\" to "
-"track)\n"
+msgid "commit %s is a merge but no -m option was given."
msgstr ""
-#: wt-status.c:1548
+#: sequencer.c:972
#, c-format
-msgid "nothing added to commit but untracked files present\n"
+msgid "commit %s does not have parent %d"
msgstr ""
-#: wt-status.c:1551
+#: sequencer.c:976
#, c-format
-msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
+msgid "mainline was specified but commit %s is not a merge."
msgstr ""
-#: wt-status.c:1554 wt-status.c:1559
+#: sequencer.c:982
#, c-format
-msgid "nothing to commit\n"
+msgid "cannot get commit message for %s"
msgstr ""
-#: wt-status.c:1557
+#. TRANSLATORS: The first %s will be a "todo" command like
+#. "revert" or "pick", the second %s a SHA1.
+#: sequencer.c:1001
#, c-format
-msgid "nothing to commit (use -u to show untracked files)\n"
+msgid "%s: cannot parse parent commit %s"
msgstr ""
-#: wt-status.c:1561
+#: sequencer.c:1063 sequencer.c:1812
#, c-format
-msgid "nothing to commit, working tree clean\n"
+msgid "could not rename '%s' to '%s'"
msgstr ""
-#: wt-status.c:1668
-msgid "Initial commit on "
+#: sequencer.c:1114
+#, c-format
+msgid "could not revert %s... %s"
msgstr ""
-#: wt-status.c:1672
-msgid "HEAD (no branch)"
+#: sequencer.c:1115
+#, c-format
+msgid "could not apply %s... %s"
msgstr ""
-#: wt-status.c:1701
-msgid "gone"
+#: sequencer.c:1157
+msgid "empty commit set passed"
msgstr ""
-#: wt-status.c:1703 wt-status.c:1711
-msgid "behind "
+#: sequencer.c:1167
+#, c-format
+msgid "git %s: failed to read the index"
msgstr ""
-#: wt-status.c:1706 wt-status.c:1709
-msgid "ahead "
+#: sequencer.c:1174
+#, c-format
+msgid "git %s: failed to refresh the index"
msgstr ""
-#: compat/precompose_utf8.c:57 builtin/clone.c:415
+#: sequencer.c:1294
#, c-format
-msgid "failed to unlink '%s'"
+msgid "invalid line %d: %.*s"
msgstr ""
-#: builtin/add.c:22
-msgid "git add [<options>] [--] <pathspec>..."
+#: sequencer.c:1302
+#, c-format
+msgid "cannot '%s' without a previous commit"
msgstr ""
-#: builtin/add.c:65
+#: sequencer.c:1334
#, c-format
-msgid "unexpected diff status %c"
+msgid "could not read '%s'."
msgstr ""
-#: builtin/add.c:71 builtin/commit.c:281
-msgid "updating files failed"
+#: sequencer.c:1341
+msgid "please fix this using 'git rebase --edit-todo'."
msgstr ""
-#: builtin/add.c:81
+#: sequencer.c:1343
#, c-format
-msgid "remove '%s'\n"
+msgid "unusable instruction sheet: '%s'"
msgstr ""
-#: builtin/add.c:136
-msgid "Unstaged changes after refreshing the index:"
+#: sequencer.c:1348
+msgid "no commits parsed."
msgstr ""
-#: builtin/add.c:196 builtin/rev-parse.c:811
-msgid "Could not read the index"
+#: sequencer.c:1359
+msgid "cannot cherry-pick during a revert."
msgstr ""
-#: builtin/add.c:207
-#, c-format
-msgid "Could not open '%s' for writing."
+#: sequencer.c:1361
+msgid "cannot revert during a cherry-pick."
msgstr ""
-#: builtin/add.c:211
-msgid "Could not write patch"
+#: sequencer.c:1424
+#, c-format
+msgid "invalid key: %s"
msgstr ""
-#: builtin/add.c:214
-msgid "editing patch failed"
+#: sequencer.c:1427
+#, c-format
+msgid "invalid value for %s: %s"
msgstr ""
-#: builtin/add.c:217
+#: sequencer.c:1484
#, c-format
-msgid "Could not stat '%s'"
+msgid "malformed options sheet: '%s'"
msgstr ""
-#: builtin/add.c:219
-msgid "Empty patch. Aborted."
+#: sequencer.c:1522
+msgid "a cherry-pick or revert is already in progress"
msgstr ""
-#: builtin/add.c:224
-#, c-format
-msgid "Could not apply '%s'"
+#: sequencer.c:1523
+msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
msgstr ""
-#: builtin/add.c:234
-msgid "The following paths are ignored by one of your .gitignore files:\n"
+#: sequencer.c:1526
+#, c-format
+msgid "could not create sequencer directory '%s'"
msgstr ""
-#: builtin/add.c:253 builtin/clean.c:870 builtin/fetch.c:113 builtin/mv.c:111
-#: builtin/prune-packed.c:55 builtin/pull.c:197 builtin/push.c:521
-#: builtin/remote.c:1327 builtin/rm.c:268 builtin/send-pack.c:162
-msgid "dry run"
+#: sequencer.c:1540
+msgid "could not lock HEAD"
msgstr ""
-#: builtin/add.c:254 builtin/apply.c:4854 builtin/check-ignore.c:19
-#: builtin/commit.c:1334 builtin/count-objects.c:85 builtin/fsck.c:593
-#: builtin/log.c:1852 builtin/mv.c:110 builtin/read-tree.c:114
-msgid "be verbose"
+#: sequencer.c:1596 sequencer.c:2150
+msgid "no cherry-pick or revert in progress"
msgstr ""
-#: builtin/add.c:256
-msgid "interactive picking"
+#: sequencer.c:1598
+msgid "cannot resolve HEAD"
msgstr ""
-#: builtin/add.c:257 builtin/checkout.c:1157 builtin/reset.c:286
-msgid "select hunks interactively"
+#: sequencer.c:1600 sequencer.c:1634
+msgid "cannot abort from a branch yet to be born"
msgstr ""
-#: builtin/add.c:258
-msgid "edit current diff and apply"
+#: sequencer.c:1620 builtin/grep.c:904
+#, c-format
+msgid "cannot open '%s'"
msgstr ""
-#: builtin/add.c:259
-msgid "allow adding otherwise ignored files"
+#: sequencer.c:1622
+#, c-format
+msgid "cannot read '%s': %s"
msgstr ""
-#: builtin/add.c:260
-msgid "update tracked files"
+#: sequencer.c:1623
+msgid "unexpected end of file"
msgstr ""
-#: builtin/add.c:261
-msgid "record only the fact that the path will be added later"
+#: sequencer.c:1629
+#, c-format
+msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr ""
-#: builtin/add.c:262
-msgid "add changes from all tracked and untracked files"
+#: sequencer.c:1640
+msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr ""
-#: builtin/add.c:265
-msgid "ignore paths removed in the working tree (same as --no-all)"
+#: sequencer.c:1777 sequencer.c:2049
+msgid "cannot read HEAD"
msgstr ""
-#: builtin/add.c:267
-msgid "don't add, only refresh the index"
+#: sequencer.c:1817 builtin/difftool.c:574
+#, c-format
+msgid "could not copy '%s' to '%s'"
msgstr ""
-#: builtin/add.c:268
-msgid "just skip files which cannot be added because of errors"
+#: sequencer.c:1833
+msgid "could not read index"
msgstr ""
-#: builtin/add.c:269
-msgid "check if - even missing - files are ignored in dry run"
+#: sequencer.c:1838
+#, c-format
+msgid ""
+"execution failed: %s\n"
+"%sYou can fix the problem, and then run\n"
+"\n"
+" git rebase --continue\n"
+"\n"
msgstr ""
-#: builtin/add.c:270 builtin/update-index.c:958
-msgid "(+/-)x"
+#: sequencer.c:1844
+msgid "and made changes to the index and/or the working tree\n"
msgstr ""
-#: builtin/add.c:270 builtin/update-index.c:959
-msgid "override the executable bit of the listed files"
+#: sequencer.c:1850
+#, c-format
+msgid ""
+"execution succeeded: %s\n"
+"but left changes to the index and/or the working tree\n"
+"Commit or stash your changes, and then run\n"
+"\n"
+" git rebase --continue\n"
+"\n"
msgstr ""
-#: builtin/add.c:292
+#: sequencer.c:1905 git-rebase.sh:168
#, c-format
-msgid "Use -f if you really want to add them.\n"
+msgid "Applied autostash."
msgstr ""
-#: builtin/add.c:300
-msgid "adding files failed"
+#: sequencer.c:1917
+#, c-format
+msgid "cannot store %s"
msgstr ""
-#: builtin/add.c:336
-msgid "-A and -u are mutually incompatible"
+#: sequencer.c:1919 git-rebase.sh:172
+#, c-format
+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 ""
-#: builtin/add.c:343
-msgid "Option --ignore-missing can only be used together with --dry-run"
+#: sequencer.c:2000
+#, c-format
+msgid "stopped at %s... %.*s"
msgstr ""
-#: builtin/add.c:352
+#: sequencer.c:2027
#, c-format
-msgid "--chmod param '%s' must be either -x or +x"
+msgid "unknown command %d"
msgstr ""
-#: builtin/add.c:367
-#, c-format
-msgid "Nothing specified, nothing added.\n"
+#: sequencer.c:2057
+msgid "could not read orig-head"
+msgstr ""
+
+#: sequencer.c:2061
+msgid "could not read 'onto'"
msgstr ""
-#: builtin/add.c:368
+#: sequencer.c:2068
#, c-format
-msgid "Maybe you wanted to say 'git add .'?\n"
+msgid "could not update %s"
msgstr ""
-#: builtin/add.c:373 builtin/check-ignore.c:172 builtin/checkout.c:279
-#: builtin/checkout.c:473 builtin/clean.c:914 builtin/commit.c:340
-#: builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298
-#: builtin/submodule--helper.c:240
-msgid "index file corrupt"
+#: sequencer.c:2075
+#, c-format
+msgid "could not update HEAD to %s"
msgstr ""
-#: builtin/add.c:454 builtin/apply.c:4784 builtin/mv.c:286 builtin/rm.c:431
-msgid "Unable to write new index file"
+#: sequencer.c:2159
+msgid "cannot rebase: You have unstaged changes."
msgstr ""
-#: builtin/am.c:257 builtin/commit.c:750 builtin/merge.c:1032
-#, c-format
-msgid "could not read '%s'"
+#: sequencer.c:2164
+msgid "could not remove CHERRY_PICK_HEAD"
msgstr ""
-#: builtin/am.c:426
-msgid "could not parse author script"
+#: sequencer.c:2173
+msgid "cannot amend non-existing commit"
msgstr ""
-#: builtin/am.c:503
+#: sequencer.c:2175
#, c-format
-msgid "'%s' was deleted by the applypatch-msg hook"
+msgid "invalid file: '%s'"
msgstr ""
-#: builtin/am.c:544 builtin/notes.c:301
+#: sequencer.c:2177
#, c-format
-msgid "Malformed input line: '%s'."
+msgid "invalid contents: '%s'"
msgstr ""
-#: builtin/am.c:581 builtin/notes.c:316
-#, c-format
-msgid "Failed to copy notes from '%s' to '%s'"
+#: sequencer.c:2180
+msgid ""
+"\n"
+"You have uncommitted changes in your working tree. Please, commit them\n"
+"first and then run 'git rebase --continue' again."
msgstr ""
-#: builtin/am.c:607
-msgid "fseek failed"
+#: sequencer.c:2190
+msgid "could not commit staged changes."
msgstr ""
-#: builtin/am.c:787
+#: sequencer.c:2270
#, c-format
-msgid "could not parse patch '%s'"
+msgid "%s: can't cherry-pick a %s"
msgstr ""
-#: builtin/am.c:852
-msgid "Only one StGIT patch series can be applied at once"
+#: sequencer.c:2274
+#, c-format
+msgid "%s: bad revision"
msgstr ""
-#: builtin/am.c:899
-msgid "invalid timestamp"
+#: sequencer.c:2307
+msgid "can't revert as initial commit"
msgstr ""
-#: builtin/am.c:902 builtin/am.c:910
-msgid "invalid Date line"
+#: setup.c:160
+#, c-format
+msgid ""
+"%s: no such path in the working tree.\n"
+"Use 'git <command> -- <path>...' to specify paths that do not exist locally."
msgstr ""
-#: builtin/am.c:907
-msgid "invalid timezone offset"
+#: setup.c:173
+#, c-format
+msgid ""
+"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
+"Use '--' to separate paths from revisions, like this:\n"
+"'git <command> [<revision>...] -- [<file>...]'"
msgstr ""
-#: builtin/am.c:996
-msgid "Patch format detection failed."
+#: setup.c:223
+#, c-format
+msgid ""
+"ambiguous argument '%s': both revision and filename\n"
+"Use '--' to separate paths from revisions, like this:\n"
+"'git <command> [<revision>...] -- [<file>...]'"
msgstr ""
-#: builtin/am.c:1001 builtin/clone.c:380
+#: setup.c:470
#, c-format
-msgid "failed to create directory '%s'"
+msgid "Expected git repo version <= %d, found %d"
msgstr ""
-#: builtin/am.c:1005
-msgid "Failed to split patches."
+#: setup.c:478
+msgid "unknown repository extensions found:"
msgstr ""
-#: builtin/am.c:1137 builtin/commit.c:366
-msgid "unable to write index file"
+#: setup.c:768
+#, c-format
+msgid "Not a git repository (or any of the parent directories): %s"
msgstr ""
-#: builtin/am.c:1188
-#, c-format
-msgid "When you have resolved this problem, run \"%s --continue\"."
+#: setup.c:770 setup.c:922 builtin/index-pack.c:1643
+msgid "Cannot come back to cwd"
msgstr ""
-#: builtin/am.c:1189
-#, c-format
-msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
+#: setup.c:852
+msgid "Unable to read current working directory"
msgstr ""
-#: builtin/am.c:1190
+#: setup.c:927
#, c-format
-msgid "To restore the original branch and stop patching, run \"%s --abort\"."
+msgid ""
+"Not a git repository (or any parent up to mount point %s)\n"
+"Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."
msgstr ""
-#: builtin/am.c:1328
-msgid "Patch is empty. Was it split wrong?"
+#: setup.c:934
+#, c-format
+msgid "Cannot change to '%s/..'"
msgstr ""
-#: builtin/am.c:1402 builtin/log.c:1543
+#: setup.c:996
#, c-format
-msgid "invalid ident line: %s"
+msgid ""
+"Problem with core.sharedRepository filemode value (0%.3o).\n"
+"The owner of files must always have read and write permissions."
msgstr ""
-#: builtin/am.c:1429
+#: sha1_file.c:490
#, c-format
-msgid "unable to parse commit %s"
+msgid "path '%s' does not exist"
msgstr ""
-#: builtin/am.c:1602
-msgid "Repository lacks necessary blobs to fall back on 3-way merge."
+#: sha1_file.c:516
+#, c-format
+msgid "reference repository '%s' as a linked checkout is not supported yet."
msgstr ""
-#: builtin/am.c:1604
-msgid "Using index info to reconstruct a base tree..."
+#: sha1_file.c:522
+#, c-format
+msgid "reference repository '%s' is not a local repository."
msgstr ""
-#: builtin/am.c:1623
-msgid ""
-"Did you hand edit your patch?\n"
-"It does not apply to blobs recorded in its index."
+#: sha1_file.c:528
+#, c-format
+msgid "reference repository '%s' is shallow"
msgstr ""
-#: builtin/am.c:1629
-msgid "Falling back to patching base and 3-way merge..."
+#: sha1_file.c:536
+#, c-format
+msgid "reference repository '%s' is grafted"
msgstr ""
-#: builtin/am.c:1654
-msgid "Failed to merge in the changes."
+#: sha1_file.c:1176
+msgid "offset before end of packfile (broken .idx?)"
msgstr ""
-#: builtin/am.c:1679 builtin/merge.c:628
-msgid "git write-tree failed to write a tree"
+#: sha1_file.c:2637
+#, c-format
+msgid "offset before start of pack index for %s (corrupt index?)"
msgstr ""
-#: builtin/am.c:1686
-msgid "applying to an empty history"
+#: sha1_file.c:2641
+#, c-format
+msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr ""
-#: builtin/am.c:1699 builtin/commit.c:1776 builtin/merge.c:798
-#: builtin/merge.c:823
-msgid "failed to write commit object"
+#: sha1_name.c:407
+#, c-format
+msgid "short SHA1 %s is ambiguous"
msgstr ""
-#: builtin/am.c:1731 builtin/am.c:1735
-#, c-format
-msgid "cannot resume: %s does not exist."
+#: sha1_name.c:418
+msgid "The candidates are:"
msgstr ""
-#: builtin/am.c:1751
-msgid "cannot be interactive without stdin connected to a terminal."
+#: sha1_name.c:578
+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/am.c:1756
-msgid "Commit Body is:"
+#: submodule.c:65 submodule.c:99
+msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
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.
-#.
-#: builtin/am.c:1766
-msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
+#: submodule.c:69 submodule.c:103
+#, c-format
+msgid "Could not find section in .gitmodules where path=%s"
msgstr ""
-#: builtin/am.c:1816
+#: submodule.c:77
#, c-format
-msgid "Dirty index: cannot apply patches (dirty: %s)"
+msgid "Could not update .gitmodules entry %s"
msgstr ""
-#: builtin/am.c:1853 builtin/am.c:1925
+#: submodule.c:110
#, c-format
-msgid "Applying: %.*s"
+msgid "Could not remove .gitmodules entry for %s"
msgstr ""
-#: builtin/am.c:1869
-msgid "No changes -- Patch already applied."
+#: submodule.c:121
+msgid "staging updated .gitmodules failed"
msgstr ""
-#: builtin/am.c:1877
-#, c-format
-msgid "Patch failed at %s %.*s"
+#: submodule.c:159
+msgid "negative values not allowed for submodule.fetchJobs"
msgstr ""
-#: builtin/am.c:1883
+#: submodule.c:1184
#, c-format
-msgid "The copy of the patch that failed is found in: %s"
+msgid "could not start 'git status in submodule '%s'"
msgstr ""
-#: builtin/am.c:1928
-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."
+#: submodule.c:1197
+#, c-format
+msgid "could not run 'git status in submodule '%s'"
msgstr ""
-#: builtin/am.c:1935
+#: submodule.c:1398
+#, c-format
msgid ""
-"You still have unmerged paths in your index.\n"
-"Did you forget to use 'git add'?"
+"relocate_gitdir for submodule '%s' with more than one worktree not supported"
msgstr ""
-#: builtin/am.c:2043 builtin/am.c:2047 builtin/am.c:2059 builtin/reset.c:308
-#: builtin/reset.c:316
+#: submodule.c:1410 submodule.c:1471
#, c-format
-msgid "Could not parse object '%s'."
+msgid "could not lookup name for submodule '%s'"
msgstr ""
-#: builtin/am.c:2095
-msgid "failed to clean index"
+#: submodule.c:1414 submodule.c:1474 builtin/submodule--helper.c:640
+#: builtin/submodule--helper.c:650
+#, c-format
+msgid "could not create directory '%s'"
msgstr ""
-#: builtin/am.c:2129
+#: submodule.c:1420
+#, c-format
msgid ""
-"You seem to have moved HEAD since the last 'am' failure.\n"
-"Not rewinding to ORIG_HEAD"
+"Migrating git directory of '%s%s' from\n"
+"'%s' to\n"
+"'%s'\n"
msgstr ""
-#: builtin/am.c:2192
+#: submodule.c:1512
#, c-format
-msgid "Invalid value for --patch-format: %s"
+msgid "could not recurse into submodule '%s'"
msgstr ""
-#: builtin/am.c:2225
-msgid "git am [<options>] [(<mbox>|<Maildir>)...]"
+#: submodule-config.c:360
+#, c-format
+msgid "invalid value for %s"
msgstr ""
-#: builtin/am.c:2226
-msgid "git am [<options>] (--continue | --skip | --abort)"
+#: trailer.c:240
+#, c-format
+msgid "running trailer command '%s' failed"
msgstr ""
-#: builtin/am.c:2232
-msgid "run interactively"
+#: trailer.c:473 trailer.c:477 trailer.c:481 trailer.c:535 trailer.c:539
+#: trailer.c:543
+#, c-format
+msgid "unknown value '%s' for key '%s'"
msgstr ""
-#: builtin/am.c:2234
-msgid "historical option -- no-op"
+#: trailer.c:525 trailer.c:530 builtin/remote.c:289
+#, c-format
+msgid "more than one %s"
msgstr ""
-#: builtin/am.c:2236
-msgid "allow fall back on 3way merging if needed"
+#: trailer.c:702
+#, c-format
+msgid "empty trailer token in trailer '%.*s'"
msgstr ""
-#: builtin/am.c:2237 builtin/init-db.c:481 builtin/prune-packed.c:57
-#: builtin/repack.c:172
-msgid "be quiet"
+#: trailer.c:722
+#, c-format
+msgid "could not read input file '%s'"
msgstr ""
-#: builtin/am.c:2239
-msgid "add a Signed-off-by line to the commit message"
+#: trailer.c:725
+msgid "could not read from stdin"
msgstr ""
-#: builtin/am.c:2242
-msgid "recode into utf8 (default)"
+#: trailer.c:949 builtin/am.c:44
+#, c-format
+msgid "could not stat %s"
msgstr ""
-#: builtin/am.c:2244
-msgid "pass -k flag to git-mailinfo"
+#: trailer.c:951
+#, c-format
+msgid "file %s is not a regular file"
msgstr ""
-#: builtin/am.c:2246
-msgid "pass -b flag to git-mailinfo"
+#: trailer.c:953
+#, c-format
+msgid "file %s is not writable by user"
msgstr ""
-#: builtin/am.c:2248
-msgid "pass -m flag to git-mailinfo"
+#: trailer.c:965
+msgid "could not open temporary file"
msgstr ""
-#: builtin/am.c:2250
-msgid "pass --keep-cr flag to git-mailsplit for mbox format"
+#: trailer.c:1001
+#, c-format
+msgid "could not rename temporary file to %s"
msgstr ""
-#: builtin/am.c:2253
-msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
+#: transport.c:62
+#, c-format
+msgid "Would set upstream of '%s' to '%s' of '%s'\n"
msgstr ""
-#: builtin/am.c:2256
-msgid "strip everything before a scissors line"
+#: transport.c:151
+#, c-format
+msgid "transport: invalid depth option '%s'"
msgstr ""
-#: builtin/am.c:2257 builtin/apply.c:4837
-msgid "action"
+#: transport.c:885
+#, c-format
+msgid ""
+"The following submodule paths contain changes that can\n"
+"not be found on any remote:\n"
msgstr ""
-#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267
-#: builtin/am.c:2270 builtin/am.c:2273 builtin/am.c:2276 builtin/am.c:2279
-#: builtin/am.c:2285
-msgid "pass it through git-apply"
+#: transport.c:889
+#, c-format
+msgid ""
+"\n"
+"Please try\n"
+"\n"
+"\tgit push --recurse-submodules=on-demand\n"
+"\n"
+"or cd to the path and use\n"
+"\n"
+"\tgit push\n"
+"\n"
+"to push them to a remote.\n"
+"\n"
msgstr ""
-#: builtin/am.c:2266 builtin/apply.c:4861
-msgid "root"
+#: transport.c:897
+msgid "Aborting."
msgstr ""
-#: builtin/am.c:2269 builtin/am.c:2272 builtin/apply.c:4799
-#: builtin/apply.c:4802 builtin/clone.c:90 builtin/fetch.c:96
-#: builtin/pull.c:179 builtin/submodule--helper.c:277
-#: builtin/submodule--helper.c:402 builtin/submodule--helper.c:482
-#: builtin/submodule--helper.c:485 builtin/submodule--helper.c:823
-#: builtin/submodule--helper.c:826
-msgid "path"
+#: transport-helper.c:1082
+#, c-format
+msgid "Could not read ref %s"
msgstr ""
-#: builtin/am.c:2275 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669
-#: builtin/grep.c:706 builtin/merge.c:200 builtin/pull.c:134
-#: builtin/pull.c:193 builtin/repack.c:181 builtin/repack.c:185
-#: builtin/show-branch.c:645 builtin/show-ref.c:175 builtin/tag.c:340
-#: parse-options.h:132 parse-options.h:134 parse-options.h:244
-msgid "n"
+#: tree-walk.c:31
+msgid "too-short tree object"
msgstr ""
-#: builtin/am.c:2278 builtin/apply.c:4805
-msgid "num"
+#: tree-walk.c:37
+msgid "malformed mode in tree entry"
msgstr ""
-#: builtin/am.c:2281 builtin/for-each-ref.c:37 builtin/replace.c:438
-#: builtin/tag.c:372
-msgid "format"
+#: tree-walk.c:41
+msgid "empty filename in tree entry"
msgstr ""
-#: builtin/am.c:2282
-msgid "format the patch(es) are in"
+#: tree-walk.c:113
+msgid "too-short tree file"
msgstr ""
-#: builtin/am.c:2288
-msgid "override error message when patch failure occurs"
+#: unpack-trees.c:99
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by checkout:\n"
+"%%sPlease commit your changes or stash them before you switch branches."
msgstr ""
-#: builtin/am.c:2290
-msgid "continue applying patches after resolving a conflict"
+#: unpack-trees.c:101
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by checkout:\n"
+"%%s"
msgstr ""
-#: builtin/am.c:2293
-msgid "synonyms for --continue"
+#: unpack-trees.c:104
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"%%sPlease commit your changes or stash them before you merge."
msgstr ""
-#: builtin/am.c:2296
-msgid "skip the current patch"
+#: unpack-trees.c:106
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"%%s"
msgstr ""
-#: builtin/am.c:2299
-msgid "restore the original branch and abort the patching operation."
+#: unpack-trees.c:109
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by %s:\n"
+"%%sPlease commit your changes or stash them before you %s."
msgstr ""
-#: builtin/am.c:2303
-msgid "lie about committer date"
+#: unpack-trees.c:111
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by %s:\n"
+"%%s"
msgstr ""
-#: builtin/am.c:2305
-msgid "use current timestamp for author date"
+#: unpack-trees.c:116
+#, c-format
+msgid ""
+"Updating the following directories would lose untracked files in them:\n"
+"%s"
msgstr ""
-#: builtin/am.c:2307 builtin/commit.c:1610 builtin/merge.c:229
-#: builtin/pull.c:164 builtin/revert.c:92 builtin/tag.c:355
-msgid "key-id"
+#: unpack-trees.c:120
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%sPlease move or remove them before you switch branches."
msgstr ""
-#: builtin/am.c:2308
-msgid "GPG-sign commits"
+#: unpack-trees.c:122
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%s"
msgstr ""
-#: builtin/am.c:2311
-msgid "(internal use for git-rebase)"
+#: unpack-trees.c:125
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%sPlease move or remove them before you merge."
msgstr ""
-#: builtin/am.c:2326
+#: unpack-trees.c:127
+#, c-format
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."
+"The following untracked working tree files would be removed by merge:\n"
+"%%s"
msgstr ""
-#: builtin/am.c:2333
-msgid "failed to read the index"
+#: unpack-trees.c:130
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%sPlease move or remove them before you %s."
msgstr ""
-#: builtin/am.c:2348
+#: unpack-trees.c:132
#, c-format
-msgid "previous rebase directory %s still exists but mbox given."
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%s"
msgstr ""
-#: builtin/am.c:2372
+#: unpack-trees.c:137
#, c-format
msgid ""
-"Stray %s directory found.\n"
-"Use \"git am --abort\" to remove it."
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%sPlease move or remove them before you switch branches."
msgstr ""
-#: builtin/am.c:2378
-msgid "Resolve operation not in progress, we are not resuming."
+#: unpack-trees.c:139
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%s"
msgstr ""
-#: builtin/apply.c:122
-msgid "git apply [<options>] [<patch>...]"
+#: unpack-trees.c:142
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%sPlease move or remove them before you merge."
msgstr ""
-#: builtin/apply.c:153
+#: unpack-trees.c:144
#, c-format
-msgid "unrecognized whitespace option '%s'"
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%s"
msgstr ""
-#: builtin/apply.c:169
+#: unpack-trees.c:147
#, c-format
-msgid "unrecognized whitespace ignore option '%s'"
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%sPlease move or remove them before you %s."
msgstr ""
-#: builtin/apply.c:854
+#: unpack-trees.c:149
#, c-format
-msgid "Cannot prepare timestamp regexp %s"
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%s"
msgstr ""
-#: builtin/apply.c:863
+#: unpack-trees.c:156
#, c-format
-msgid "regexec returned %d for input: %s"
+msgid "Entry '%s' overlaps with '%s'. Cannot bind."
msgstr ""
-#: builtin/apply.c:947
+#: unpack-trees.c:159
#, c-format
-msgid "unable to find filename in patch at line %d"
+msgid ""
+"Cannot update sparse checkout: the following entries are not up-to-date:\n"
+"%s"
msgstr ""
-#: builtin/apply.c:984
+#: unpack-trees.c:161
#, c-format
-msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
+msgid ""
+"The following working tree files would be overwritten by sparse checkout "
+"update:\n"
+"%s"
msgstr ""
-#: builtin/apply.c:989
+#: unpack-trees.c:163
#, c-format
-msgid "git apply: bad git-diff - inconsistent new filename on line %d"
+msgid ""
+"The following working tree files would be removed by sparse checkout "
+"update:\n"
+"%s"
msgstr ""
-#: builtin/apply.c:990
+#: unpack-trees.c:240
#, c-format
-msgid "git apply: bad git-diff - inconsistent old filename on line %d"
+msgid "Aborting\n"
msgstr ""
-#: builtin/apply.c:995
-#, c-format
-msgid "git apply: bad git-diff - expected /dev/null on line %d"
+#: unpack-trees.c:270
+msgid "Checking out files"
msgstr ""
-#: builtin/apply.c:1489
-#, c-format
-msgid "recount: unexpected line: %.*s"
+#: urlmatch.c:120
+msgid "invalid URL scheme name or missing '://' suffix"
msgstr ""
-#: builtin/apply.c:1550
+#: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356
#, c-format
-msgid "patch fragment without header at line %d: %.*s"
+msgid "invalid %XX escape sequence"
msgstr ""
-#: builtin/apply.c:1567
-#, 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] ""
+#: urlmatch.c:172
+msgid "missing host and scheme is not 'file:'"
+msgstr ""
-#: builtin/apply.c:1743
-msgid "new file depends on old contents"
+#: urlmatch.c:189
+msgid "a 'file:' URL may not have a port number"
msgstr ""
-#: builtin/apply.c:1745
-msgid "deleted file still has contents"
+#: urlmatch.c:199
+msgid "invalid characters in host name"
msgstr ""
-#: builtin/apply.c:1774
-#, c-format
-msgid "corrupt patch at line %d"
+#: urlmatch.c:244 urlmatch.c:255
+msgid "invalid port number"
msgstr ""
-#: builtin/apply.c:1810
-#, c-format
-msgid "new file %s depends on old contents"
+#: urlmatch.c:322
+msgid "invalid '..' path segment"
msgstr ""
-#: builtin/apply.c:1812
+#: worktree.c:282
#, c-format
-msgid "deleted file %s still has contents"
+msgid "failed to read '%s'"
msgstr ""
-#: builtin/apply.c:1815
+#: wrapper.c:222 wrapper.c:392
#, c-format
-msgid "** warning: file %s becomes empty but is not deleted"
+msgid "could not open '%s' for reading and writing"
msgstr ""
-#: builtin/apply.c:1962
+#: wrapper.c:224 wrapper.c:394 builtin/am.c:766
#, c-format
-msgid "corrupt binary patch at line %d: %.*s"
+msgid "could not open '%s' for writing"
msgstr ""
-#: builtin/apply.c:1999
+#: wrapper.c:226 wrapper.c:396 builtin/am.c:320 builtin/am.c:759
+#: builtin/am.c:847 builtin/commit.c:1700 builtin/merge.c:1033
+#: builtin/pull.c:341
#, c-format
-msgid "unrecognized binary patch at line %d"
+msgid "could not open '%s' for reading"
msgstr ""
-#: builtin/apply.c:2154
+#: wrapper.c:605 wrapper.c:626
#, c-format
-msgid "patch with only garbage at line %d"
+msgid "unable to access '%s'"
msgstr ""
-#: builtin/apply.c:2244
-#, c-format
-msgid "unable to read symlink %s"
+#: wrapper.c:634
+msgid "unable to get current working directory"
msgstr ""
-#: builtin/apply.c:2248
+#: wrapper.c:658
#, c-format
-msgid "unable to open or read %s"
+msgid "could not write to %s"
msgstr ""
-#: builtin/apply.c:2901
+#: wrapper.c:660
#, c-format
-msgid "invalid start of line: '%c'"
+msgid "could not close %s"
msgstr ""
-#: builtin/apply.c:3020
-#, 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:151
+msgid "Unmerged paths:"
+msgstr ""
-#: builtin/apply.c:3032
+#: wt-status.c:178 wt-status.c:205
#, c-format
-msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
+msgid " (use \"git reset %s <file>...\" to unstage)"
msgstr ""
-#: builtin/apply.c:3038
-#, c-format
-msgid ""
-"while searching for:\n"
-"%.*s"
+#: wt-status.c:180 wt-status.c:207
+msgid " (use \"git rm --cached <file>...\" to unstage)"
msgstr ""
-#: builtin/apply.c:3060
-#, c-format
-msgid "missing binary patch data for '%s'"
+#: wt-status.c:184
+msgid " (use \"git add <file>...\" to mark resolution)"
msgstr ""
-#: builtin/apply.c:3163
-#, c-format
-msgid "binary patch does not apply to '%s'"
+#: wt-status.c:186 wt-status.c:190
+msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
msgstr ""
-#: builtin/apply.c:3169
-#, c-format
-msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
+#: wt-status.c:188
+msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr ""
-#: builtin/apply.c:3190
-#, c-format
-msgid "patch failed: %s:%ld"
+#: wt-status.c:199 wt-status.c:945
+msgid "Changes to be committed:"
msgstr ""
-#: builtin/apply.c:3314
-#, c-format
-msgid "cannot checkout %s"
+#: wt-status.c:217 wt-status.c:954
+msgid "Changes not staged for commit:"
msgstr ""
-#: builtin/apply.c:3370
-#, c-format
-msgid "reading from '%s' beyond a symbolic link"
+#: wt-status.c:221
+msgid " (use \"git add <file>...\" to update what will be committed)"
msgstr ""
-#: builtin/apply.c:3399 builtin/apply.c:3630
-#, c-format
-msgid "path %s has been renamed/deleted"
+#: wt-status.c:223
+msgid " (use \"git add/rm <file>...\" to update what will be committed)"
msgstr ""
-#: builtin/apply.c:3482 builtin/apply.c:3644
-#, c-format
-msgid "%s: does not exist in index"
+#: wt-status.c:224
+msgid ""
+" (use \"git checkout -- <file>...\" to discard changes in working directory)"
msgstr ""
-#: builtin/apply.c:3486 builtin/apply.c:3636 builtin/apply.c:3658
-#, c-format
-msgid "%s: %s"
+#: wt-status.c:226
+msgid " (commit or discard the untracked or modified content in submodules)"
msgstr ""
-#: builtin/apply.c:3491 builtin/apply.c:3652
+#: wt-status.c:238
#, c-format
-msgid "%s: does not match index"
+msgid " (use \"git %s <file>...\" to include in what will be committed)"
msgstr ""
-#: builtin/apply.c:3597
-msgid "removal patch leaves file contents"
+#: wt-status.c:253
+msgid "both deleted:"
msgstr ""
-#: builtin/apply.c:3669
-#, c-format
-msgid "%s: wrong type"
+#: wt-status.c:255
+msgid "added by us:"
msgstr ""
-#: builtin/apply.c:3671
-#, c-format
-msgid "%s has type %o, expected %o"
+#: wt-status.c:257
+msgid "deleted by them:"
msgstr ""
-#: builtin/apply.c:3822 builtin/apply.c:3824
-#, c-format
-msgid "invalid path '%s'"
+#: wt-status.c:259
+msgid "added by them:"
msgstr ""
-#: builtin/apply.c:3879
-#, c-format
-msgid "%s: already exists in index"
+#: wt-status.c:261
+msgid "deleted by us:"
msgstr ""
-#: builtin/apply.c:3882
-#, c-format
-msgid "%s: already exists in working directory"
+#: wt-status.c:263
+msgid "both added:"
msgstr ""
-#: builtin/apply.c:3902
-#, c-format
-msgid "new mode (%o) of %s does not match old mode (%o)"
+#: wt-status.c:265
+msgid "both modified:"
msgstr ""
-#: builtin/apply.c:3907
-#, c-format
-msgid "new mode (%o) of %s does not match old mode (%o) of %s"
+#: wt-status.c:275
+msgid "new file:"
msgstr ""
-#: builtin/apply.c:3927
-#, c-format
-msgid "affected file '%s' is beyond a symbolic link"
+#: wt-status.c:277
+msgid "copied:"
msgstr ""
-#: builtin/apply.c:3931
-#, c-format
-msgid "%s: patch does not apply"
+#: wt-status.c:279
+msgid "deleted:"
msgstr ""
-#: builtin/apply.c:3945
-#, c-format
-msgid "Checking patch %s..."
+#: wt-status.c:281
+msgid "modified:"
msgstr ""
-#: builtin/apply.c:4038 builtin/checkout.c:233 builtin/reset.c:135
-#, c-format
-msgid "make_cache_entry failed for path '%s'"
+#: wt-status.c:283
+msgid "renamed:"
msgstr ""
-#: builtin/apply.c:4182
-#, c-format
-msgid "unable to remove %s from index"
+#: wt-status.c:285
+msgid "typechange:"
msgstr ""
-#: builtin/apply.c:4215
-#, c-format
-msgid "corrupt patch for submodule %s"
+#: wt-status.c:287
+msgid "unknown:"
msgstr ""
-#: builtin/apply.c:4219
-#, c-format
-msgid "unable to stat newly created file '%s'"
+#: wt-status.c:289
+msgid "unmerged:"
msgstr ""
-#: builtin/apply.c:4224
-#, c-format
-msgid "unable to create backing store for newly created file %s"
+#: wt-status.c:371
+msgid "new commits, "
msgstr ""
-#: builtin/apply.c:4227 builtin/apply.c:4340
-#, c-format
-msgid "unable to add cache entry for %s"
+#: wt-status.c:373
+msgid "modified content, "
msgstr ""
-#: builtin/apply.c:4260
-#, c-format
-msgid "closing file '%s'"
+#: wt-status.c:375
+msgid "untracked content, "
msgstr ""
-#: builtin/apply.c:4313
-#, c-format
-msgid "unable to write file '%s' mode %o"
+#: wt-status.c:818
+msgid "Submodules changed but not updated:"
msgstr ""
-#: builtin/apply.c:4403
-#, c-format
-msgid "Applied patch %s cleanly."
+#: wt-status.c:820
+msgid "Submodule changes to be committed:"
msgstr ""
-#: builtin/apply.c:4411
-msgid "internal error"
+#: wt-status.c:901
+msgid ""
+"Do not touch the line above.\n"
+"Everything below will be removed."
msgstr ""
-#: builtin/apply.c:4414
-#, c-format
-msgid "Applying patch %%s with %d reject..."
-msgid_plural "Applying patch %%s with %d rejects..."
-msgstr[0] ""
-msgstr[1] ""
+#: wt-status.c:1013
+msgid "You have unmerged paths."
+msgstr ""
-#: builtin/apply.c:4424
-#, c-format
-msgid "truncating .rej filename to %.*s.rej"
+#: wt-status.c:1016
+msgid " (fix conflicts and run \"git commit\")"
msgstr ""
-#: builtin/apply.c:4432
-#, c-format
-msgid "cannot open %s: %s"
+#: wt-status.c:1018
+msgid " (use \"git merge --abort\" to abort the merge)"
msgstr ""
-#: builtin/apply.c:4445
-#, c-format
-msgid "Hunk #%d applied cleanly."
+#: wt-status.c:1023
+msgid "All conflicts fixed but you are still merging."
msgstr ""
-#: builtin/apply.c:4448
-#, c-format
-msgid "Rejected hunk #%d."
+#: wt-status.c:1026
+msgid " (use \"git commit\" to conclude merge)"
msgstr ""
-#: builtin/apply.c:4537
-#, c-format
-msgid "Skipped patch '%s'."
+#: wt-status.c:1036
+msgid "You are in the middle of an am session."
msgstr ""
-#: builtin/apply.c:4545
-msgid "unrecognized input"
+#: wt-status.c:1039
+msgid "The current patch is empty."
msgstr ""
-#: builtin/apply.c:4556
-msgid "unable to read index file"
+#: wt-status.c:1043
+msgid " (fix conflicts and then run \"git am --continue\")"
msgstr ""
-#: builtin/apply.c:4701
-msgid "--3way outside a repository"
+#: wt-status.c:1045
+msgid " (use \"git am --skip\" to skip this patch)"
msgstr ""
-#: builtin/apply.c:4709
-msgid "--index outside a repository"
+#: wt-status.c:1047
+msgid " (use \"git am --abort\" to restore the original branch)"
msgstr ""
-#: builtin/apply.c:4712
-msgid "--cached outside a repository"
+#: wt-status.c:1176
+msgid "git-rebase-todo is missing."
msgstr ""
-#: builtin/apply.c:4745
-#, c-format
-msgid "can't open patch '%s'"
+#: wt-status.c:1178
+msgid "No commands done."
msgstr ""
-#: builtin/apply.c:4760
+#: wt-status.c:1181
#, c-format
-msgid "squelched %d whitespace error"
-msgid_plural "squelched %d whitespace errors"
+msgid "Last command done (%d command done):"
+msgid_plural "Last commands done (%d commands done):"
msgstr[0] ""
msgstr[1] ""
-#: builtin/apply.c:4766 builtin/apply.c:4776
+#: wt-status.c:1192
#, c-format
-msgid "%d line adds whitespace errors."
-msgid_plural "%d lines add whitespace errors."
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/apply.c:4800
-msgid "don't apply changes matching the given path"
+msgid " (see more in file %s)"
msgstr ""
-#: builtin/apply.c:4803
-msgid "apply changes matching the given path"
+#: wt-status.c:1197
+msgid "No commands remaining."
msgstr ""
-#: builtin/apply.c:4806
-msgid "remove <num> leading slashes from traditional diff paths"
-msgstr ""
+#: wt-status.c:1200
+#, c-format
+msgid "Next command to do (%d remaining command):"
+msgid_plural "Next commands to do (%d remaining commands):"
+msgstr[0] ""
+msgstr[1] ""
-#: builtin/apply.c:4809
-msgid "ignore additions made by the patch"
+#: wt-status.c:1208
+msgid " (use \"git rebase --edit-todo\" to view and edit)"
msgstr ""
-#: builtin/apply.c:4811
-msgid "instead of applying the patch, output diffstat for the input"
+#: wt-status.c:1221
+#, c-format
+msgid "You are currently rebasing branch '%s' on '%s'."
msgstr ""
-#: builtin/apply.c:4815
-msgid "show number of added and deleted lines in decimal notation"
+#: wt-status.c:1226
+msgid "You are currently rebasing."
msgstr ""
-#: builtin/apply.c:4817
-msgid "instead of applying the patch, output a summary for the input"
+#: wt-status.c:1240
+msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr ""
-#: builtin/apply.c:4819
-msgid "instead of applying the patch, see if the patch is applicable"
+#: wt-status.c:1242
+msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr ""
-#: builtin/apply.c:4821
-msgid "make sure the patch is applicable to the current index"
+#: wt-status.c:1244
+msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr ""
-#: builtin/apply.c:4823
-msgid "apply a patch without touching the working tree"
+#: wt-status.c:1250
+msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr ""
-#: builtin/apply.c:4825
-msgid "accept a patch that touches outside the working area"
+#: wt-status.c:1254
+#, c-format
+msgid ""
+"You are currently splitting a commit while rebasing branch '%s' on '%s'."
msgstr ""
-#: builtin/apply.c:4827
-msgid "also apply the patch (use with --stat/--summary/--check)"
+#: wt-status.c:1259
+msgid "You are currently splitting a commit during a rebase."
msgstr ""
-#: builtin/apply.c:4829
-msgid "attempt three-way merge if a patch does not apply"
+#: wt-status.c:1262
+msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr ""
-#: builtin/apply.c:4831
-msgid "build a temporary index based on embedded index information"
+#: wt-status.c:1266
+#, c-format
+msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr ""
-#: builtin/apply.c:4834 builtin/checkout-index.c:169 builtin/ls-files.c:426
-msgid "paths are separated with NUL character"
+#: wt-status.c:1271
+msgid "You are currently editing a commit during a rebase."
msgstr ""
-#: builtin/apply.c:4836
-msgid "ensure at least <n> lines of context match"
+#: wt-status.c:1274
+msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr ""
-#: builtin/apply.c:4838
-msgid "detect new or modified lines that have whitespace errors"
+#: wt-status.c:1276
+msgid ""
+" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr ""
-#: builtin/apply.c:4841 builtin/apply.c:4844
-msgid "ignore changes in whitespace when finding context"
+#: wt-status.c:1286
+#, c-format
+msgid "You are currently cherry-picking commit %s."
msgstr ""
-#: builtin/apply.c:4847
-msgid "apply the patch in reverse"
+#: wt-status.c:1291
+msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr ""
-#: builtin/apply.c:4849
-msgid "don't expect at least one line of context"
+#: wt-status.c:1294
+msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr ""
-#: builtin/apply.c:4851
-msgid "leave the rejected hunks in corresponding *.rej files"
+#: wt-status.c:1296
+msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr ""
-#: builtin/apply.c:4853
-msgid "allow overlapping hunks"
+#: wt-status.c:1305
+#, c-format
+msgid "You are currently reverting commit %s."
msgstr ""
-#: builtin/apply.c:4856
-msgid "tolerate incorrectly detected missing new-line at the end of file"
+#: wt-status.c:1310
+msgid " (fix conflicts and run \"git revert --continue\")"
msgstr ""
-#: builtin/apply.c:4859
-msgid "do not trust the line counts in the hunk headers"
+#: wt-status.c:1313
+msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr ""
-#: builtin/apply.c:4862
-msgid "prepend <root> to all filenames"
+#: wt-status.c:1315
+msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr ""
-#: builtin/archive.c:17
+#: wt-status.c:1326
#, c-format
-msgid "could not create archive file '%s'"
+msgid "You are currently bisecting, started from branch '%s'."
msgstr ""
-#: builtin/archive.c:20
-msgid "could not redirect output"
+#: wt-status.c:1330
+msgid "You are currently bisecting."
msgstr ""
-#: builtin/archive.c:37
-msgid "git archive: Remote with no URL"
+#: wt-status.c:1333
+msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr ""
-#: builtin/archive.c:58
-msgid "git archive: expected ACK/NAK, got EOF"
+#: wt-status.c:1530
+msgid "On branch "
msgstr ""
-#: builtin/archive.c:61
-#, c-format
-msgid "git archive: NACK %s"
+#: wt-status.c:1536
+msgid "interactive rebase in progress; onto "
msgstr ""
-#: builtin/archive.c:63
-#, c-format
-msgid "remote error: %s"
+#: wt-status.c:1538
+msgid "rebase in progress; onto "
msgstr ""
-#: builtin/archive.c:64
-msgid "git archive: protocol error"
+#: wt-status.c:1543
+msgid "HEAD detached at "
msgstr ""
-#: builtin/archive.c:68
-msgid "git archive: expected a flush"
+#: wt-status.c:1545
+msgid "HEAD detached from "
msgstr ""
-#: builtin/bisect--helper.c:7
-msgid "git bisect--helper --next-all [--no-checkout]"
+#: wt-status.c:1548
+msgid "Not currently on any branch."
msgstr ""
-#: builtin/bisect--helper.c:17
-msgid "perform 'git bisect next'"
+#: wt-status.c:1566
+msgid "Initial commit"
msgstr ""
-#: builtin/bisect--helper.c:19
-msgid "update BISECT_HEAD instead of checking out the current commit"
+#: wt-status.c:1580
+msgid "Untracked files"
msgstr ""
-#: builtin/blame.c:33
-msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
+#: wt-status.c:1582
+msgid "Ignored files"
msgstr ""
-#: builtin/blame.c:38
-msgid "<rev-opts> are documented in git-rev-list(1)"
+#: wt-status.c:1586
+#, 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/blame.c:1781
-msgid "Blaming lines"
+#: wt-status.c:1592
+#, c-format
+msgid "Untracked files not listed%s"
msgstr ""
-#: builtin/blame.c:2536
-msgid "Show blame entries as we find them, incrementally"
+#: wt-status.c:1594
+msgid " (use -u option to show untracked files)"
msgstr ""
-#: builtin/blame.c:2537
-msgid "Show blank SHA-1 for boundary commits (Default: off)"
+#: wt-status.c:1600
+msgid "No changes"
msgstr ""
-#: builtin/blame.c:2538
-msgid "Do not treat root commits as boundaries (Default: off)"
+#: wt-status.c:1605
+#, c-format
+msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr ""
-#: builtin/blame.c:2539
-msgid "Show work cost statistics"
+#: wt-status.c:1608
+#, c-format
+msgid "no changes added to commit\n"
msgstr ""
-#: builtin/blame.c:2540
-msgid "Force progress reporting"
+#: wt-status.c:1611
+#, c-format
+msgid ""
+"nothing added to commit but untracked files present (use \"git add\" to "
+"track)\n"
msgstr ""
-#: builtin/blame.c:2541
-msgid "Show output score for blame entries"
+#: wt-status.c:1614
+#, c-format
+msgid "nothing added to commit but untracked files present\n"
msgstr ""
-#: builtin/blame.c:2542
-msgid "Show original filename (Default: auto)"
+#: wt-status.c:1617
+#, c-format
+msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr ""
-#: builtin/blame.c:2543
-msgid "Show original linenumber (Default: off)"
+#: wt-status.c:1620 wt-status.c:1625
+#, c-format
+msgid "nothing to commit\n"
msgstr ""
-#: builtin/blame.c:2544
-msgid "Show in a format designed for machine consumption"
+#: wt-status.c:1623
+#, c-format
+msgid "nothing to commit (use -u to show untracked files)\n"
msgstr ""
-#: builtin/blame.c:2545
-msgid "Show porcelain format with per-line commit information"
+#: wt-status.c:1627
+#, c-format
+msgid "nothing to commit, working tree clean\n"
msgstr ""
-#: builtin/blame.c:2546
-msgid "Use the same output mode as git-annotate (Default: off)"
+#: wt-status.c:1734
+msgid "Initial commit on "
msgstr ""
-#: builtin/blame.c:2547
-msgid "Show raw timestamp (Default: off)"
+#: wt-status.c:1738
+msgid "HEAD (no branch)"
msgstr ""
-#: builtin/blame.c:2548
-msgid "Show long commit SHA1 (Default: off)"
+#: wt-status.c:1767
+msgid "gone"
msgstr ""
-#: builtin/blame.c:2549
-msgid "Suppress author name and timestamp (Default: off)"
+#: wt-status.c:1769 wt-status.c:1777
+msgid "behind "
msgstr ""
-#: builtin/blame.c:2550
-msgid "Show author email instead of name (Default: off)"
+#: wt-status.c:1772 wt-status.c:1775
+msgid "ahead "
msgstr ""
-#: builtin/blame.c:2551
-msgid "Ignore whitespace differences"
+#. TRANSLATORS: the action is e.g. "pull with rebase"
+#: wt-status.c:2277
+#, c-format
+msgid "cannot %s: You have unstaged changes."
msgstr ""
-#: builtin/blame.c:2552
-msgid "Spend extra cycles to find better match"
+#: wt-status.c:2283
+msgid "additionally, your index contains uncommitted changes."
msgstr ""
-#: builtin/blame.c:2553
-msgid "Use revisions from <file> instead of calling git-rev-list"
+#: wt-status.c:2285
+#, c-format
+msgid "cannot %s: Your index contains uncommitted changes."
msgstr ""
-#: builtin/blame.c:2554
-msgid "Use <file>'s contents as the final image"
+#: compat/precompose_utf8.c:57 builtin/clone.c:414
+#, c-format
+msgid "failed to unlink '%s'"
msgstr ""
-#: builtin/blame.c:2555 builtin/blame.c:2556
-msgid "score"
+#: builtin/add.c:22
+msgid "git add [<options>] [--] <pathspec>..."
msgstr ""
-#: builtin/blame.c:2555
-msgid "Find line copies within and across files"
+#: builtin/add.c:80
+#, c-format
+msgid "unexpected diff status %c"
msgstr ""
-#: builtin/blame.c:2556
-msgid "Find line movements within and across files"
+#: builtin/add.c:85 builtin/commit.c:291
+msgid "updating files failed"
msgstr ""
-#: builtin/blame.c:2557
-msgid "n,m"
+#: builtin/add.c:95
+#, c-format
+msgid "remove '%s'\n"
msgstr ""
-#: builtin/blame.c:2557
-msgid "Process only line range n,m, counting from 1"
+#: builtin/add.c:149
+msgid "Unstaged changes after refreshing the index:"
msgstr ""
-#. 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:2649
-msgid "4 years, 11 months ago"
+#: builtin/add.c:209 builtin/rev-parse.c:845
+msgid "Could not read the index"
msgstr ""
-#: builtin/branch.c:26
-msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
+#: builtin/add.c:220
+#, c-format
+msgid "Could not open '%s' for writing."
msgstr ""
-#: builtin/branch.c:27
-msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
+#: builtin/add.c:224
+msgid "Could not write patch"
msgstr ""
-#: builtin/branch.c:28
-msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
+#: builtin/add.c:227
+msgid "editing patch failed"
msgstr ""
-#: builtin/branch.c:29
-msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
+#: builtin/add.c:230
+#, c-format
+msgid "Could not stat '%s'"
msgstr ""
-#: builtin/branch.c:30
-msgid "git branch [<options>] [-r | -a] [--points-at]"
+#: builtin/add.c:232
+msgid "Empty patch. Aborted."
msgstr ""
-#: builtin/branch.c:143
+#: builtin/add.c:237
#, c-format
-msgid ""
-"deleting branch '%s' that has been merged to\n"
-" '%s', but not yet merged to HEAD."
+msgid "Could not apply '%s'"
msgstr ""
-#: builtin/branch.c:147
-#, c-format
-msgid ""
-"not deleting branch '%s' that is not yet merged to\n"
-" '%s', even though it is merged to HEAD."
+#: builtin/add.c:247
+msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr ""
-#: builtin/branch.c:161
-#, c-format
-msgid "Couldn't look up commit object for '%s'"
+#: builtin/add.c:266 builtin/clean.c:870 builtin/fetch.c:115 builtin/mv.c:123
+#: builtin/prune-packed.c:55 builtin/pull.c:198 builtin/push.c:524
+#: builtin/remote.c:1326 builtin/rm.c:241 builtin/send-pack.c:162
+msgid "dry run"
msgstr ""
-#: builtin/branch.c:165
-#, 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:269
+msgid "interactive picking"
msgstr ""
-#: builtin/branch.c:178
-msgid "Update of config-file failed"
+#: builtin/add.c:270 builtin/checkout.c:1159 builtin/reset.c:286
+msgid "select hunks interactively"
msgstr ""
-#: builtin/branch.c:206
-msgid "cannot use -a with -d"
+#: builtin/add.c:271
+msgid "edit current diff and apply"
msgstr ""
-#: builtin/branch.c:212
-msgid "Couldn't look up commit object for HEAD"
+#: builtin/add.c:272
+msgid "allow adding otherwise ignored files"
msgstr ""
-#: builtin/branch.c:226
-#, c-format
-msgid "Cannot delete branch '%s' checked out at '%s'"
+#: builtin/add.c:273
+msgid "update tracked files"
msgstr ""
-#: builtin/branch.c:241
-#, c-format
-msgid "remote-tracking branch '%s' not found."
+#: builtin/add.c:274
+msgid "record only the fact that the path will be added later"
msgstr ""
-#: builtin/branch.c:242
-#, c-format
-msgid "branch '%s' not found."
+#: builtin/add.c:275
+msgid "add changes from all tracked and untracked files"
msgstr ""
-#: builtin/branch.c:257
-#, c-format
-msgid "Error deleting remote-tracking branch '%s'"
+#: builtin/add.c:278
+msgid "ignore paths removed in the working tree (same as --no-all)"
msgstr ""
-#: builtin/branch.c:258
-#, c-format
-msgid "Error deleting branch '%s'"
+#: builtin/add.c:280
+msgid "don't add, only refresh the index"
msgstr ""
-#: builtin/branch.c:265
-#, c-format
-msgid "Deleted remote-tracking branch %s (was %s).\n"
+#: builtin/add.c:281
+msgid "just skip files which cannot be added because of errors"
msgstr ""
-#: builtin/branch.c:266
-#, c-format
-msgid "Deleted branch %s (was %s).\n"
+#: builtin/add.c:282
+msgid "check if - even missing - files are ignored in dry run"
msgstr ""
-#: builtin/branch.c:312
-#, c-format
-msgid "[%s: gone]"
+#: builtin/add.c:283 builtin/update-index.c:947
+msgid "(+/-)x"
msgstr ""
-#: builtin/branch.c:317
-#, c-format
-msgid "[%s]"
+#: builtin/add.c:283 builtin/update-index.c:948
+msgid "override the executable bit of the listed files"
msgstr ""
-#: builtin/branch.c:322
+#: builtin/add.c:305
#, c-format
-msgid "[%s: behind %d]"
+msgid "Use -f if you really want to add them.\n"
msgstr ""
-#: builtin/branch.c:324
-#, c-format
-msgid "[behind %d]"
+#: builtin/add.c:312
+msgid "adding files failed"
msgstr ""
-#: builtin/branch.c:328
-#, c-format
-msgid "[%s: ahead %d]"
+#: builtin/add.c:348
+msgid "-A and -u are mutually incompatible"
msgstr ""
-#: builtin/branch.c:330
+#: builtin/add.c:355
+msgid "Option --ignore-missing can only be used together with --dry-run"
+msgstr ""
+
+#: builtin/add.c:359
#, c-format
-msgid "[ahead %d]"
+msgid "--chmod param '%s' must be either -x or +x"
msgstr ""
-#: builtin/branch.c:333
+#: builtin/add.c:374
#, c-format
-msgid "[%s: ahead %d, behind %d]"
+msgid "Nothing specified, nothing added.\n"
msgstr ""
-#: builtin/branch.c:336
+#: builtin/add.c:375
#, c-format
-msgid "[ahead %d, behind %d]"
+msgid "Maybe you wanted to say 'git add .'?\n"
msgstr ""
-#: builtin/branch.c:349
-msgid " **** invalid ref ****"
+#: builtin/add.c:380 builtin/check-ignore.c:172 builtin/checkout.c:279
+#: builtin/checkout.c:472 builtin/clean.c:914 builtin/commit.c:350
+#: builtin/mv.c:143 builtin/reset.c:235 builtin/rm.c:271
+#: builtin/submodule--helper.c:244
+msgid "index file corrupt"
msgstr ""
-#: builtin/branch.c:375
-#, c-format
-msgid "(no branch, rebasing %s)"
+#: builtin/am.c:414
+msgid "could not parse author script"
msgstr ""
-#: builtin/branch.c:378
+#: builtin/am.c:491
#, c-format
-msgid "(no branch, bisect started on %s)"
+msgid "'%s' was deleted by the applypatch-msg hook"
msgstr ""
-#. TRANSLATORS: make sure this matches
-#. "HEAD detached at " in wt-status.c
-#: builtin/branch.c:384
+#: builtin/am.c:532
#, c-format
-msgid "(HEAD detached at %s)"
+msgid "Malformed input line: '%s'."
msgstr ""
-#. TRANSLATORS: make sure this matches
-#. "HEAD detached from " in wt-status.c
-#: builtin/branch.c:389
+#: builtin/am.c:569
#, c-format
-msgid "(HEAD detached from %s)"
+msgid "Failed to copy notes from '%s' to '%s'"
msgstr ""
-#: builtin/branch.c:393
-msgid "(no branch)"
+#: builtin/am.c:595
+msgid "fseek failed"
msgstr ""
-#: builtin/branch.c:544
+#: builtin/am.c:775
#, c-format
-msgid "Branch %s is being rebased at %s"
+msgid "could not parse patch '%s'"
msgstr ""
-#: builtin/branch.c:548
-#, c-format
-msgid "Branch %s is being bisected at %s"
+#: builtin/am.c:840
+msgid "Only one StGIT patch series can be applied at once"
msgstr ""
-#: builtin/branch.c:563
-msgid "cannot rename the current branch while not on any."
+#: builtin/am.c:887
+msgid "invalid timestamp"
msgstr ""
-#: builtin/branch.c:573
-#, c-format
-msgid "Invalid branch name: '%s'"
+#: builtin/am.c:890 builtin/am.c:898
+msgid "invalid Date line"
msgstr ""
-#: builtin/branch.c:590
-msgid "Branch rename failed"
+#: builtin/am.c:895
+msgid "invalid timezone offset"
msgstr ""
-#: builtin/branch.c:594
-#, c-format
-msgid "Renamed a misnamed branch '%s' away"
+#: builtin/am.c:984
+msgid "Patch format detection failed."
msgstr ""
-#: builtin/branch.c:597
+#: builtin/am.c:989 builtin/clone.c:379
#, c-format
-msgid "Branch renamed to %s, but HEAD is not updated!"
+msgid "failed to create directory '%s'"
msgstr ""
-#: builtin/branch.c:604
-msgid "Branch is renamed, but update of config-file failed"
+#: builtin/am.c:993
+msgid "Failed to split patches."
msgstr ""
-#: builtin/branch.c:620
-#, c-format
-msgid ""
-"Please edit the description for the branch\n"
-" %s\n"
-"Lines starting with '%c' will be stripped.\n"
+#: builtin/am.c:1125 builtin/commit.c:376
+msgid "unable to write index file"
msgstr ""
-#: builtin/branch.c:651
-msgid "Generic options"
+#: builtin/am.c:1176
+#, c-format
+msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr ""
-#: builtin/branch.c:653
-msgid "show hash and subject, give twice for upstream branch"
+#: builtin/am.c:1177
+#, c-format
+msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr ""
-#: builtin/branch.c:654
-msgid "suppress informational messages"
+#: builtin/am.c:1178
+#, c-format
+msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr ""
-#: builtin/branch.c:655
-msgid "set up tracking mode (see git-pull(1))"
+#: builtin/am.c:1316
+msgid "Patch is empty. Was it split wrong?"
msgstr ""
-#: builtin/branch.c:657
-msgid "change upstream info"
+#: builtin/am.c:1390 builtin/log.c:1550
+#, c-format
+msgid "invalid ident line: %s"
msgstr ""
-#: builtin/branch.c:659
-msgid "upstream"
+#: builtin/am.c:1417
+#, c-format
+msgid "unable to parse commit %s"
msgstr ""
-#: builtin/branch.c:659
-msgid "change the upstream info"
+#: builtin/am.c:1610
+msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr ""
-#: builtin/branch.c:661
-msgid "use colored output"
+#: builtin/am.c:1612
+msgid "Using index info to reconstruct a base tree..."
msgstr ""
-#: builtin/branch.c:662
-msgid "act on remote-tracking branches"
+#: builtin/am.c:1631
+msgid ""
+"Did you hand edit your patch?\n"
+"It does not apply to blobs recorded in its index."
msgstr ""
-#: builtin/branch.c:664 builtin/branch.c:665
-msgid "print only branches that contain the commit"
+#: builtin/am.c:1637
+msgid "Falling back to patching base and 3-way merge..."
msgstr ""
-#: builtin/branch.c:668
-msgid "Specific git-branch actions:"
+#: builtin/am.c:1662
+msgid "Failed to merge in the changes."
msgstr ""
-#: builtin/branch.c:669
-msgid "list both remote-tracking and local branches"
+#: builtin/am.c:1686 builtin/merge.c:632
+msgid "git write-tree failed to write a tree"
msgstr ""
-#: builtin/branch.c:671
-msgid "delete fully merged branch"
+#: builtin/am.c:1693
+msgid "applying to an empty history"
msgstr ""
-#: builtin/branch.c:672
-msgid "delete branch (even if not merged)"
+#: builtin/am.c:1706 builtin/commit.c:1764 builtin/merge.c:802
+#: builtin/merge.c:827
+msgid "failed to write commit object"
msgstr ""
-#: builtin/branch.c:673
-msgid "move/rename a branch and its reflog"
+#: builtin/am.c:1739 builtin/am.c:1743
+#, c-format
+msgid "cannot resume: %s does not exist."
msgstr ""
-#: builtin/branch.c:674
-msgid "move/rename a branch, even if target exists"
+#: builtin/am.c:1759
+msgid "cannot be interactive without stdin connected to a terminal."
msgstr ""
-#: builtin/branch.c:675
-msgid "list branch names"
+#: builtin/am.c:1764
+msgid "Commit Body is:"
msgstr ""
-#: builtin/branch.c:676
-msgid "create the branch's reflog"
+#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
+#. in your translation. The program will only accept English
+#. input at this point.
+#.
+#: builtin/am.c:1774
+msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr ""
-#: builtin/branch.c:678
-msgid "edit the description for the branch"
+#: builtin/am.c:1824
+#, c-format
+msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr ""
-#: builtin/branch.c:679
-msgid "force creation, move/rename, deletion"
+#: builtin/am.c:1861 builtin/am.c:1933
+#, c-format
+msgid "Applying: %.*s"
msgstr ""
-#: builtin/branch.c:680
-msgid "print only branches that are merged"
+#: builtin/am.c:1877
+msgid "No changes -- Patch already applied."
msgstr ""
-#: builtin/branch.c:681
-msgid "print only branches that are not merged"
+#: builtin/am.c:1885
+#, c-format
+msgid "Patch failed at %s %.*s"
msgstr ""
-#: builtin/branch.c:682
-msgid "list branches in columns"
+#: builtin/am.c:1891
+#, c-format
+msgid "The copy of the patch that failed is found in: %s"
msgstr ""
-#: builtin/branch.c:683 builtin/for-each-ref.c:38 builtin/tag.c:366
-msgid "key"
+#: builtin/am.c:1936
+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 ""
-#: builtin/branch.c:684 builtin/for-each-ref.c:39 builtin/tag.c:367
-msgid "field name to sort on"
+#: builtin/am.c:1943
+msgid ""
+"You still have unmerged paths in your index.\n"
+"Did you forget to use 'git add'?"
msgstr ""
-#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:402
-#: builtin/notes.c:405 builtin/notes.c:565 builtin/notes.c:568
-#: builtin/tag.c:369
-msgid "object"
+#: builtin/am.c:2051 builtin/am.c:2055 builtin/am.c:2067 builtin/reset.c:308
+#: builtin/reset.c:316
+#, c-format
+msgid "Could not parse object '%s'."
msgstr ""
-#: builtin/branch.c:687
-msgid "print only branches of the object"
+#: builtin/am.c:2103
+msgid "failed to clean index"
msgstr ""
-#: builtin/branch.c:705
-msgid "Failed to resolve HEAD as a valid ref."
+#: builtin/am.c:2137
+msgid ""
+"You seem to have moved HEAD since the last 'am' failure.\n"
+"Not rewinding to ORIG_HEAD"
msgstr ""
-#: builtin/branch.c:709 builtin/clone.c:707
-msgid "HEAD not found below refs/heads!"
+#: builtin/am.c:2200
+#, c-format
+msgid "Invalid value for --patch-format: %s"
msgstr ""
-#: builtin/branch.c:729
-msgid "--column and --verbose are incompatible"
+#: builtin/am.c:2233
+msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr ""
-#: builtin/branch.c:740 builtin/branch.c:782
-msgid "branch name required"
+#: builtin/am.c:2234
+msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr ""
-#: builtin/branch.c:758
-msgid "Cannot give description to detached HEAD"
+#: builtin/am.c:2240
+msgid "run interactively"
msgstr ""
-#: builtin/branch.c:763
-msgid "cannot edit description of more than one branch"
+#: builtin/am.c:2242
+msgid "historical option -- no-op"
msgstr ""
-#: builtin/branch.c:770
-#, c-format
-msgid "No commit on branch '%s' yet."
+#: builtin/am.c:2244
+msgid "allow fall back on 3way merging if needed"
msgstr ""
-#: builtin/branch.c:773
-#, c-format
-msgid "No branch named '%s'."
+#: builtin/am.c:2245 builtin/init-db.c:483 builtin/prune-packed.c:57
+#: builtin/repack.c:178
+msgid "be quiet"
msgstr ""
-#: builtin/branch.c:788
-msgid "too many branches for a rename operation"
+#: builtin/am.c:2247
+msgid "add a Signed-off-by line to the commit message"
msgstr ""
-#: builtin/branch.c:793
-msgid "too many branches to set new upstream"
+#: builtin/am.c:2250
+msgid "recode into utf8 (default)"
msgstr ""
-#: builtin/branch.c:797
-#, c-format
-msgid ""
-"could not set upstream of HEAD to %s when it does not point to any branch."
+#: builtin/am.c:2252
+msgid "pass -k flag to git-mailinfo"
msgstr ""
-#: builtin/branch.c:800 builtin/branch.c:822 builtin/branch.c:843
-#, c-format
-msgid "no such branch '%s'"
+#: builtin/am.c:2254
+msgid "pass -b flag to git-mailinfo"
msgstr ""
-#: builtin/branch.c:804
-#, c-format
-msgid "branch '%s' does not exist"
+#: builtin/am.c:2256
+msgid "pass -m flag to git-mailinfo"
msgstr ""
-#: builtin/branch.c:816
-msgid "too many branches to unset upstream"
+#: builtin/am.c:2258
+msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr ""
-#: builtin/branch.c:820
-msgid "could not unset upstream of HEAD when it does not point to any branch."
+#: builtin/am.c:2261
+msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr ""
-#: builtin/branch.c:826
-#, c-format
-msgid "Branch '%s' has no upstream information"
+#: builtin/am.c:2264
+msgid "strip everything before a scissors line"
msgstr ""
-#: builtin/branch.c:840
-msgid "it does not make sense to create 'HEAD' manually"
+#: builtin/am.c:2266 builtin/am.c:2269 builtin/am.c:2272 builtin/am.c:2275
+#: builtin/am.c:2278 builtin/am.c:2281 builtin/am.c:2284 builtin/am.c:2287
+#: builtin/am.c:2293
+msgid "pass it through git-apply"
msgstr ""
-#: builtin/branch.c:846
-msgid "-a and -r options to 'git branch' do not make sense with a branch name"
+#: builtin/am.c:2283 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665
+#: builtin/grep.c:1038 builtin/merge.c:202 builtin/pull.c:135
+#: builtin/pull.c:194 builtin/repack.c:187 builtin/repack.c:191
+#: builtin/show-branch.c:644 builtin/show-ref.c:169 builtin/tag.c:355
+#: parse-options.h:132 parse-options.h:134 parse-options.h:245
+msgid "n"
msgstr ""
-#: builtin/branch.c:849
-#, c-format
-msgid ""
-"The --set-upstream flag is deprecated and will be removed. Consider using --"
-"track or --set-upstream-to\n"
+#: builtin/am.c:2289 builtin/for-each-ref.c:37 builtin/replace.c:438
+#: builtin/tag.c:387 builtin/verify-tag.c:38
+msgid "format"
msgstr ""
-#: builtin/branch.c:866
-#, c-format
-msgid ""
-"\n"
-"If you wanted to make '%s' track '%s', do this:\n"
-"\n"
+#: builtin/am.c:2290
+msgid "format the patch(es) are in"
msgstr ""
-#: builtin/bundle.c:51
-#, c-format
-msgid "%s is okay\n"
+#: builtin/am.c:2296
+msgid "override error message when patch failure occurs"
msgstr ""
-#: builtin/bundle.c:64
-msgid "Need a repository to create a bundle."
+#: builtin/am.c:2298
+msgid "continue applying patches after resolving a conflict"
msgstr ""
-#: builtin/bundle.c:68
-msgid "Need a repository to unbundle."
+#: builtin/am.c:2301
+msgid "synonyms for --continue"
msgstr ""
-#: builtin/cat-file.c:443
-msgid ""
-"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|"
-"<type>|--textconv) <object>"
+#: builtin/am.c:2304
+msgid "skip the current patch"
msgstr ""
-#: builtin/cat-file.c:444
-msgid "git cat-file (--batch | --batch-check) [--follow-symlinks]"
+#: builtin/am.c:2307
+msgid "restore the original branch and abort the patching operation."
msgstr ""
-#: builtin/cat-file.c:481
-msgid "<type> can be one of: blob, tree, commit, tag"
+#: builtin/am.c:2311
+msgid "lie about committer date"
msgstr ""
-#: builtin/cat-file.c:482
-msgid "show object type"
+#: builtin/am.c:2313
+msgid "use current timestamp for author date"
msgstr ""
-#: builtin/cat-file.c:483
-msgid "show object size"
+#: builtin/am.c:2315 builtin/commit.c:1600 builtin/merge.c:233
+#: builtin/pull.c:165 builtin/revert.c:92 builtin/tag.c:370
+msgid "key-id"
msgstr ""
-#: builtin/cat-file.c:485
-msgid "exit with zero when there's no error"
+#: builtin/am.c:2316
+msgid "GPG-sign commits"
msgstr ""
-#: builtin/cat-file.c:486
-msgid "pretty-print object's content"
+#: builtin/am.c:2319
+msgid "(internal use for git-rebase)"
msgstr ""
-#: builtin/cat-file.c:488
-msgid "for blob objects, run textconv on object's content"
+#: builtin/am.c:2334
+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 ""
-#: builtin/cat-file.c:490
-msgid "allow -s and -t to work with broken/corrupt objects"
+#: builtin/am.c:2341
+msgid "failed to read the index"
msgstr ""
-#: builtin/cat-file.c:491
-msgid "buffer --batch output"
+#: builtin/am.c:2356
+#, c-format
+msgid "previous rebase directory %s still exists but mbox given."
msgstr ""
-#: builtin/cat-file.c:493
-msgid "show info and content of objects fed from the standard input"
+#: builtin/am.c:2380
+#, c-format
+msgid ""
+"Stray %s directory found.\n"
+"Use \"git am --abort\" to remove it."
msgstr ""
-#: builtin/cat-file.c:496
-msgid "show info about objects fed from the standard input"
+#: builtin/am.c:2386
+msgid "Resolve operation not in progress, we are not resuming."
msgstr ""
-#: builtin/cat-file.c:499
-msgid "follow in-tree symlinks (used with --batch or --batch-check)"
+#: builtin/apply.c:8
+msgid "git apply [<options>] [<patch>...]"
msgstr ""
-#: builtin/cat-file.c:501
-msgid "show all objects with --batch or --batch-check"
+#: builtin/archive.c:17
+#, c-format
+msgid "could not create archive file '%s'"
msgstr ""
-#: builtin/check-attr.c:11
-msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
+#: builtin/archive.c:20
+msgid "could not redirect output"
msgstr ""
-#: builtin/check-attr.c:12
-msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
+#: builtin/archive.c:37
+msgid "git archive: Remote with no URL"
msgstr ""
-#: builtin/check-attr.c:19
-msgid "report all attributes set on file"
+#: builtin/archive.c:58
+msgid "git archive: expected ACK/NAK, got EOF"
msgstr ""
-#: builtin/check-attr.c:20
-msgid "use .gitattributes only from the index"
+#: builtin/archive.c:61
+#, c-format
+msgid "git archive: NACK %s"
msgstr ""
-#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:97
-msgid "read file names from stdin"
+#: builtin/archive.c:63
+#, c-format
+msgid "remote error: %s"
msgstr ""
-#: builtin/check-attr.c:23 builtin/check-ignore.c:24
-msgid "terminate input and output records by a NUL character"
+#: builtin/archive.c:64
+msgid "git archive: protocol error"
msgstr ""
-#: builtin/check-ignore.c:18 builtin/checkout.c:1138 builtin/gc.c:325
-msgid "suppress progress reporting"
+#: builtin/archive.c:68
+msgid "git archive: expected a flush"
msgstr ""
-#: builtin/check-ignore.c:26
-msgid "show non-matching input paths"
+#: builtin/bisect--helper.c:7
+msgid "git bisect--helper --next-all [--no-checkout]"
msgstr ""
-#: builtin/check-ignore.c:28
-msgid "ignore index when checking"
+#: builtin/bisect--helper.c:17
+msgid "perform 'git bisect next'"
msgstr ""
-#: builtin/check-ignore.c:154
-msgid "cannot specify pathnames with --stdin"
+#: builtin/bisect--helper.c:19
+msgid "update BISECT_HEAD instead of checking out the current commit"
msgstr ""
-#: builtin/check-ignore.c:157
-msgid "-z only makes sense with --stdin"
+#: builtin/blame.c:33
+msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
msgstr ""
-#: builtin/check-ignore.c:159
-msgid "no path specified"
+#: builtin/blame.c:38
+msgid "<rev-opts> are documented in git-rev-list(1)"
msgstr ""
-#: builtin/check-ignore.c:163
-msgid "--quiet is only valid with a single pathname"
+#: builtin/blame.c:1786
+msgid "Blaming lines"
msgstr ""
-#: builtin/check-ignore.c:165
-msgid "cannot have both --quiet and --verbose"
+#: builtin/blame.c:2582
+msgid "Show blame entries as we find them, incrementally"
msgstr ""
-#: builtin/check-ignore.c:168
-msgid "--non-matching is only valid with --verbose"
+#: builtin/blame.c:2583
+msgid "Show blank SHA-1 for boundary commits (Default: off)"
msgstr ""
-#: builtin/check-mailmap.c:8
-msgid "git check-mailmap [<options>] <contact>..."
+#: builtin/blame.c:2584
+msgid "Do not treat root commits as boundaries (Default: off)"
msgstr ""
-#: builtin/check-mailmap.c:13
-msgid "also read contacts from stdin"
+#: builtin/blame.c:2585
+msgid "Show work cost statistics"
msgstr ""
-#: builtin/check-mailmap.c:24
-#, c-format
-msgid "unable to parse contact: %s"
+#: builtin/blame.c:2586
+msgid "Force progress reporting"
msgstr ""
-#: builtin/check-mailmap.c:47
-msgid "no contacts specified"
+#: builtin/blame.c:2587
+msgid "Show output score for blame entries"
msgstr ""
-#: builtin/checkout-index.c:127
-msgid "git checkout-index [<options>] [--] [<file>...]"
+#: builtin/blame.c:2588
+msgid "Show original filename (Default: auto)"
msgstr ""
-#: builtin/checkout-index.c:144
-msgid "stage should be between 1 and 3 or all"
+#: builtin/blame.c:2589
+msgid "Show original linenumber (Default: off)"
msgstr ""
-#: builtin/checkout-index.c:160
-msgid "check out all files in the index"
+#: builtin/blame.c:2590
+msgid "Show in a format designed for machine consumption"
msgstr ""
-#: builtin/checkout-index.c:161
-msgid "force overwrite of existing files"
+#: builtin/blame.c:2591
+msgid "Show porcelain format with per-line commit information"
msgstr ""
-#: builtin/checkout-index.c:163
-msgid "no warning for existing files and files not in index"
+#: builtin/blame.c:2592
+msgid "Use the same output mode as git-annotate (Default: off)"
msgstr ""
-#: builtin/checkout-index.c:165
-msgid "don't checkout new files"
+#: builtin/blame.c:2593
+msgid "Show raw timestamp (Default: off)"
msgstr ""
-#: builtin/checkout-index.c:167
-msgid "update stat information in the index file"
+#: builtin/blame.c:2594
+msgid "Show long commit SHA1 (Default: off)"
msgstr ""
-#: builtin/checkout-index.c:171
-msgid "read list of paths from the standard input"
+#: builtin/blame.c:2595
+msgid "Suppress author name and timestamp (Default: off)"
msgstr ""
-#: builtin/checkout-index.c:173
-msgid "write the content to temporary files"
+#: builtin/blame.c:2596
+msgid "Show author email instead of name (Default: off)"
msgstr ""
-#: builtin/checkout-index.c:174 builtin/column.c:30
-#: builtin/submodule--helper.c:488 builtin/submodule--helper.c:491
-#: builtin/submodule--helper.c:494 builtin/submodule--helper.c:497
-#: builtin/submodule--helper.c:830 builtin/worktree.c:469
-msgid "string"
+#: builtin/blame.c:2597
+msgid "Ignore whitespace differences"
msgstr ""
-#: builtin/checkout-index.c:175
-msgid "when creating files, prepend <string>"
+#: builtin/blame.c:2604
+msgid "Use an experimental heuristic to improve diffs"
msgstr ""
-#: builtin/checkout-index.c:177
-msgid "copy out the files from named stage"
+#: builtin/blame.c:2606
+msgid "Spend extra cycles to find better match"
msgstr ""
-#: builtin/checkout.c:25
-msgid "git checkout [<options>] <branch>"
+#: builtin/blame.c:2607
+msgid "Use revisions from <file> instead of calling git-rev-list"
msgstr ""
-#: builtin/checkout.c:26
-msgid "git checkout [<options>] [<branch>] -- <file>..."
+#: builtin/blame.c:2608
+msgid "Use <file>'s contents as the final image"
msgstr ""
-#: builtin/checkout.c:134 builtin/checkout.c:167
-#, c-format
-msgid "path '%s' does not have our version"
+#: builtin/blame.c:2609 builtin/blame.c:2610
+msgid "score"
msgstr ""
-#: builtin/checkout.c:136 builtin/checkout.c:169
-#, c-format
-msgid "path '%s' does not have their version"
+#: builtin/blame.c:2609
+msgid "Find line copies within and across files"
msgstr ""
-#: builtin/checkout.c:152
-#, c-format
-msgid "path '%s' does not have all necessary versions"
+#: builtin/blame.c:2610
+msgid "Find line movements within and across files"
msgstr ""
-#: builtin/checkout.c:196
-#, c-format
-msgid "path '%s' does not have necessary versions"
+#: builtin/blame.c:2611
+msgid "n,m"
msgstr ""
-#: builtin/checkout.c:213
-#, c-format
-msgid "path '%s': cannot merge"
+#: builtin/blame.c:2611
+msgid "Process only line range n,m, counting from 1"
msgstr ""
-#: builtin/checkout.c:230
-#, c-format
-msgid "Unable to add merge result for '%s'"
+#: builtin/blame.c:2658
+msgid "--progress can't be used with --incremental or porcelain formats"
msgstr ""
-#: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256
-#: builtin/checkout.c:259
-#, c-format
-msgid "'%s' cannot be used with updating paths"
+#. 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:2706
+msgid "4 years, 11 months ago"
msgstr ""
-#: builtin/checkout.c:262 builtin/checkout.c:265
-#, c-format
-msgid "'%s' cannot be used with %s"
+#: builtin/blame.c:2786
+msgid "--contents and --reverse do not blend well."
msgstr ""
-#: builtin/checkout.c:268
-#, c-format
-msgid "Cannot update paths and switch to branch '%s' at the same time."
+#: builtin/blame.c:2806
+msgid "cannot use --contents with final commit object name"
msgstr ""
-#: builtin/checkout.c:339 builtin/checkout.c:346
-#, c-format
-msgid "path '%s' is unmerged"
+#: builtin/blame.c:2811
+msgid "--reverse and --first-parent together require specified latest commit"
msgstr ""
-#: builtin/checkout.c:495
-msgid "you need to resolve your current index first"
+#: builtin/blame.c:2838
+msgid ""
+"--reverse --first-parent together require range along first-parent chain"
msgstr ""
-#: builtin/checkout.c:625
+#: builtin/blame.c:2849
#, c-format
-msgid "Can not do reflog for '%s': %s\n"
+msgid "no such path %s in %s"
msgstr ""
-#: builtin/checkout.c:664
-msgid "HEAD is now at"
+#: builtin/blame.c:2860
+#, c-format
+msgid "cannot read blob %s for path %s"
msgstr ""
-#: builtin/checkout.c:668 builtin/clone.c:661
-msgid "unable to update HEAD"
+#: builtin/blame.c:2879
+#, c-format
+msgid "file %s has only %lu line"
+msgid_plural "file %s has only %lu lines"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/branch.c:26
+msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
msgstr ""
-#: builtin/checkout.c:672
-#, c-format
-msgid "Reset branch '%s'\n"
+#: builtin/branch.c:27
+msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
msgstr ""
-#: builtin/checkout.c:675
-#, c-format
-msgid "Already on '%s'\n"
+#: builtin/branch.c:28
+msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
msgstr ""
-#: builtin/checkout.c:679
-#, c-format
-msgid "Switched to and reset branch '%s'\n"
+#: builtin/branch.c:29
+msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
msgstr ""
-#: builtin/checkout.c:681 builtin/checkout.c:1070
-#, c-format
-msgid "Switched to a new branch '%s'\n"
+#: builtin/branch.c:30
+msgid "git branch [<options>] [-r | -a] [--points-at]"
msgstr ""
-#: builtin/checkout.c:683
+#: builtin/branch.c:143
#, c-format
-msgid "Switched to branch '%s'\n"
+msgid ""
+"deleting branch '%s' that has been merged to\n"
+" '%s', but not yet merged to HEAD."
msgstr ""
-#: builtin/checkout.c:734
+#: builtin/branch.c:147
#, c-format
-msgid " ... and %d more.\n"
+msgid ""
+"not deleting branch '%s' that is not yet merged to\n"
+" '%s', even though it is merged to HEAD."
msgstr ""
-#: builtin/checkout.c:740
+#: builtin/branch.c:161
#, c-format
-msgid ""
-"Warning: you are leaving %d commit behind, not connected to\n"
-"any of your branches:\n"
-"\n"
-"%s\n"
-msgid_plural ""
-"Warning: you are leaving %d commits behind, not connected to\n"
-"any of your branches:\n"
-"\n"
-"%s\n"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Couldn't look up commit object for '%s'"
+msgstr ""
-#: builtin/checkout.c:759
+#: builtin/branch.c:165
#, c-format
msgid ""
-"If you want to keep it by creating a new branch, this may be a good time\n"
-"to do so with:\n"
-"\n"
-" git branch <new-branch-name> %s\n"
-"\n"
-msgid_plural ""
-"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[0] ""
-msgstr[1] ""
+"The branch '%s' is not fully merged.\n"
+"If you are sure you want to delete it, run 'git branch -D %s'."
+msgstr ""
-#: builtin/checkout.c:795
-msgid "internal error in revision walk"
+#: builtin/branch.c:178
+msgid "Update of config-file failed"
msgstr ""
-#: builtin/checkout.c:799
-msgid "Previous HEAD position was"
+#: builtin/branch.c:206
+msgid "cannot use -a with -d"
msgstr ""
-#: builtin/checkout.c:826 builtin/checkout.c:1065
-msgid "You are on a branch yet to be born"
+#: builtin/branch.c:212
+msgid "Couldn't look up commit object for HEAD"
msgstr ""
-#: builtin/checkout.c:971
+#: builtin/branch.c:226
#, c-format
-msgid "only one reference expected, %d given."
+msgid "Cannot delete branch '%s' checked out at '%s'"
msgstr ""
-#: builtin/checkout.c:1011 builtin/worktree.c:214
+#: builtin/branch.c:241
#, c-format
-msgid "invalid reference: %s"
+msgid "remote-tracking branch '%s' not found."
msgstr ""
-#: builtin/checkout.c:1040
+#: builtin/branch.c:242
#, c-format
-msgid "reference is not a tree: %s"
+msgid "branch '%s' not found."
msgstr ""
-#: builtin/checkout.c:1079
-msgid "paths cannot be used with switching branches"
+#: builtin/branch.c:257
+#, c-format
+msgid "Error deleting remote-tracking branch '%s'"
msgstr ""
-#: builtin/checkout.c:1082 builtin/checkout.c:1086
+#: builtin/branch.c:258
#, c-format
-msgid "'%s' cannot be used with switching branches"
+msgid "Error deleting branch '%s'"
msgstr ""
-#: builtin/checkout.c:1090 builtin/checkout.c:1093 builtin/checkout.c:1098
-#: builtin/checkout.c:1101
+#: builtin/branch.c:265
#, c-format
-msgid "'%s' cannot be used with '%s'"
+msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr ""
-#: builtin/checkout.c:1106
+#: builtin/branch.c:266
#, c-format
-msgid "Cannot switch branch to a non-commit '%s'"
+msgid "Deleted branch %s (was %s).\n"
msgstr ""
-#: builtin/checkout.c:1139 builtin/checkout.c:1141 builtin/clone.c:88
-#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:324
-#: builtin/worktree.c:326
-msgid "branch"
+#: builtin/branch.c:312
+#, c-format
+msgid "[%s: gone]"
msgstr ""
-#: builtin/checkout.c:1140
-msgid "create and checkout a new branch"
+#: builtin/branch.c:317
+#, c-format
+msgid "[%s]"
msgstr ""
-#: builtin/checkout.c:1142
-msgid "create/reset and checkout a branch"
+#: builtin/branch.c:322
+#, c-format
+msgid "[%s: behind %d]"
msgstr ""
-#: builtin/checkout.c:1143
-msgid "create reflog for new branch"
+#: builtin/branch.c:324
+#, c-format
+msgid "[behind %d]"
msgstr ""
-#: builtin/checkout.c:1144 builtin/worktree.c:328
-msgid "detach HEAD at named commit"
+#: builtin/branch.c:328
+#, c-format
+msgid "[%s: ahead %d]"
msgstr ""
-#: builtin/checkout.c:1145
-msgid "set upstream info for new branch"
+#: builtin/branch.c:330
+#, c-format
+msgid "[ahead %d]"
msgstr ""
-#: builtin/checkout.c:1147
-msgid "new-branch"
+#: builtin/branch.c:333
+#, c-format
+msgid "[%s: ahead %d, behind %d]"
msgstr ""
-#: builtin/checkout.c:1147
-msgid "new unparented branch"
+#: builtin/branch.c:336
+#, c-format
+msgid "[ahead %d, behind %d]"
msgstr ""
-#: builtin/checkout.c:1148
-msgid "checkout our version for unmerged files"
+#: builtin/branch.c:349
+msgid " **** invalid ref ****"
msgstr ""
-#: builtin/checkout.c:1150
-msgid "checkout their version for unmerged files"
+#: builtin/branch.c:375
+#, c-format
+msgid "(no branch, rebasing %s)"
msgstr ""
-#: builtin/checkout.c:1152
-msgid "force checkout (throw away local modifications)"
+#: builtin/branch.c:378
+#, c-format
+msgid "(no branch, bisect started on %s)"
msgstr ""
-#: builtin/checkout.c:1153
-msgid "perform a 3-way merge with the new branch"
+#. TRANSLATORS: make sure this matches
+#. "HEAD detached at " in wt-status.c
+#: builtin/branch.c:384
+#, c-format
+msgid "(HEAD detached at %s)"
msgstr ""
-#: builtin/checkout.c:1154 builtin/merge.c:231
-msgid "update ignored files (default)"
+#. TRANSLATORS: make sure this matches
+#. "HEAD detached from " in wt-status.c
+#: builtin/branch.c:389
+#, c-format
+msgid "(HEAD detached from %s)"
msgstr ""
-#: builtin/checkout.c:1155 builtin/log.c:1459 parse-options.h:250
-msgid "style"
+#: builtin/branch.c:393
+msgid "(no branch)"
msgstr ""
-#: builtin/checkout.c:1156
-msgid "conflict style (merge or diff3)"
+#: builtin/branch.c:535
+#, c-format
+msgid "Branch %s is being rebased at %s"
msgstr ""
-#: builtin/checkout.c:1159
-msgid "do not limit pathspecs to sparse entries only"
+#: builtin/branch.c:539
+#, c-format
+msgid "Branch %s is being bisected at %s"
msgstr ""
-#: builtin/checkout.c:1161
-msgid "second guess 'git checkout <no-such-branch>'"
+#: builtin/branch.c:554
+msgid "cannot rename the current branch while not on any."
msgstr ""
-#: builtin/checkout.c:1163
-msgid "do not check if another worktree is holding the given ref"
+#: builtin/branch.c:564
+#, c-format
+msgid "Invalid branch name: '%s'"
msgstr ""
-#: builtin/checkout.c:1164 builtin/clone.c:60 builtin/fetch.c:117
-#: builtin/merge.c:228 builtin/pull.c:116 builtin/push.c:536
-#: builtin/send-pack.c:168
-msgid "force progress reporting"
+#: builtin/branch.c:581
+msgid "Branch rename failed"
msgstr ""
-#: builtin/checkout.c:1195
-msgid "-b, -B and --orphan are mutually exclusive"
+#: builtin/branch.c:585
+#, c-format
+msgid "Renamed a misnamed branch '%s' away"
msgstr ""
-#: builtin/checkout.c:1212
-msgid "--track needs a branch name"
+#: builtin/branch.c:588
+#, c-format
+msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr ""
-#: builtin/checkout.c:1217
-msgid "Missing branch name; try -b"
-msgstr ""
-
-#: builtin/checkout.c:1253
-msgid "invalid path specification"
+#: builtin/branch.c:595
+msgid "Branch is renamed, but update of config-file failed"
msgstr ""
-#: builtin/checkout.c:1260
+#: builtin/branch.c:611
#, 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?"
+"Please edit the description for the branch\n"
+" %s\n"
+"Lines starting with '%c' will be stripped.\n"
msgstr ""
-#: builtin/checkout.c:1265
-#, c-format
-msgid "git checkout: --detach does not take a path argument '%s'"
+#: builtin/branch.c:643
+msgid "Generic options"
msgstr ""
-#: builtin/checkout.c:1269
-msgid ""
-"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
-"checking out of the index."
+#: builtin/branch.c:645
+msgid "show hash and subject, give twice for upstream branch"
msgstr ""
-#: builtin/clean.c:25
-msgid ""
-"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
+#: builtin/branch.c:646
+msgid "suppress informational messages"
msgstr ""
-#: builtin/clean.c:29
-#, c-format
-msgid "Removing %s\n"
+#: builtin/branch.c:647
+msgid "set up tracking mode (see git-pull(1))"
msgstr ""
-#: builtin/clean.c:30
-#, c-format
-msgid "Would remove %s\n"
+#: builtin/branch.c:649
+msgid "change upstream info"
msgstr ""
-#: builtin/clean.c:31
-#, c-format
-msgid "Skipping repository %s\n"
+#: builtin/branch.c:651
+msgid "upstream"
msgstr ""
-#: builtin/clean.c:32
-#, c-format
-msgid "Would skip repository %s\n"
+#: builtin/branch.c:651
+msgid "change the upstream info"
msgstr ""
-#: builtin/clean.c:33
-#, c-format
-msgid "failed to remove %s"
+#: builtin/branch.c:652
+msgid "Unset the upstream info"
msgstr ""
-#: builtin/clean.c:291
-msgid ""
-"Prompt help:\n"
-"1 - select a numbered item\n"
-"foo - select item based on unique prefix\n"
-" - (empty) select nothing"
+#: builtin/branch.c:653
+msgid "use colored output"
msgstr ""
-#: builtin/clean.c:295
-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"
+#: builtin/branch.c:654
+msgid "act on remote-tracking branches"
msgstr ""
-#: builtin/clean.c:511
-#, c-format
-msgid "Huh (%s)?"
+#: builtin/branch.c:656 builtin/branch.c:657
+msgid "print only branches that contain the commit"
msgstr ""
-#: builtin/clean.c:653
-#, c-format
-msgid "Input ignore patterns>> "
+#: builtin/branch.c:660
+msgid "Specific git-branch actions:"
msgstr ""
-#: builtin/clean.c:690
-#, c-format
-msgid "WARNING: Cannot find items matched by: %s"
+#: builtin/branch.c:661
+msgid "list both remote-tracking and local branches"
msgstr ""
-#: builtin/clean.c:711
-msgid "Select items to delete"
+#: builtin/branch.c:663
+msgid "delete fully merged branch"
msgstr ""
-#. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:752
-#, c-format
-msgid "Remove %s [y/N]? "
+#: builtin/branch.c:664
+msgid "delete branch (even if not merged)"
msgstr ""
-#: builtin/clean.c:777
-msgid "Bye."
+#: builtin/branch.c:665
+msgid "move/rename a branch and its reflog"
msgstr ""
-#: builtin/clean.c:785
-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"
+#: builtin/branch.c:666
+msgid "move/rename a branch, even if target exists"
msgstr ""
-#: builtin/clean.c:812
-msgid "*** Commands ***"
+#: builtin/branch.c:667
+msgid "list branch names"
msgstr ""
-#: builtin/clean.c:813
-msgid "What now"
+#: builtin/branch.c:668
+msgid "create the branch's reflog"
msgstr ""
-#: builtin/clean.c:821
-msgid "Would remove the following item:"
-msgid_plural "Would remove the following items:"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/clean.c:838
-msgid "No more files to clean, exiting."
+#: builtin/branch.c:670
+msgid "edit the description for the branch"
msgstr ""
-#: builtin/clean.c:869
-msgid "do not print names of files removed"
+#: builtin/branch.c:671
+msgid "force creation, move/rename, deletion"
msgstr ""
-#: builtin/clean.c:871
-msgid "force"
+#: builtin/branch.c:672
+msgid "print only branches that are merged"
msgstr ""
-#: builtin/clean.c:872
-msgid "interactive cleaning"
+#: builtin/branch.c:673
+msgid "print only branches that are not merged"
msgstr ""
-#: builtin/clean.c:874
-msgid "remove whole directories"
+#: builtin/branch.c:674
+msgid "list branches in columns"
msgstr ""
-#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:724
-#: builtin/ls-files.c:457 builtin/name-rev.c:314 builtin/show-ref.c:182
-msgid "pattern"
+#: builtin/branch.c:675 builtin/for-each-ref.c:38 builtin/tag.c:381
+msgid "key"
msgstr ""
-#: builtin/clean.c:876
-msgid "add <pattern> to ignore rules"
+#: builtin/branch.c:676 builtin/for-each-ref.c:39 builtin/tag.c:382
+msgid "field name to sort on"
msgstr ""
-#: builtin/clean.c:877
-msgid "remove ignored files, too"
+#: builtin/branch.c:678 builtin/for-each-ref.c:41 builtin/notes.c:404
+#: builtin/notes.c:407 builtin/notes.c:567 builtin/notes.c:570
+#: builtin/tag.c:384
+msgid "object"
msgstr ""
-#: builtin/clean.c:879
-msgid "remove only ignored files"
+#: builtin/branch.c:679
+msgid "print only branches of the object"
msgstr ""
-#: builtin/clean.c:897
-msgid "-x and -X cannot be used together"
+#: builtin/branch.c:681 builtin/for-each-ref.c:46 builtin/tag.c:388
+msgid "sorting and filtering are case insensitive"
msgstr ""
-#: builtin/clean.c:901
-msgid ""
-"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
-"clean"
+#: builtin/branch.c:698
+msgid "Failed to resolve HEAD as a valid ref."
msgstr ""
-#: builtin/clean.c:904
-msgid ""
-"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
-"refusing to clean"
+#: builtin/branch.c:702 builtin/clone.c:706
+msgid "HEAD not found below refs/heads!"
msgstr ""
-#: builtin/clone.c:37
-msgid "git clone [<options>] [--] <repo> [<dir>]"
+#: builtin/branch.c:724
+msgid "--column and --verbose are incompatible"
msgstr ""
-#: builtin/clone.c:62
-msgid "don't create a checkout"
+#: builtin/branch.c:735 builtin/branch.c:787
+msgid "branch name required"
msgstr ""
-#: builtin/clone.c:63 builtin/clone.c:65 builtin/init-db.c:476
-msgid "create a bare repository"
+#: builtin/branch.c:763
+msgid "Cannot give description to detached HEAD"
msgstr ""
-#: builtin/clone.c:67
-msgid "create a mirror repository (implies bare)"
+#: builtin/branch.c:768
+msgid "cannot edit description of more than one branch"
msgstr ""
-#: builtin/clone.c:69
-msgid "to clone from a local repository"
+#: builtin/branch.c:775
+#, c-format
+msgid "No commit on branch '%s' yet."
msgstr ""
-#: builtin/clone.c:71
-msgid "don't use local hardlinks, always copy"
+#: builtin/branch.c:778
+#, c-format
+msgid "No branch named '%s'."
msgstr ""
-#: builtin/clone.c:73
-msgid "setup as shared repository"
+#: builtin/branch.c:793
+msgid "too many branches for a rename operation"
msgstr ""
-#: builtin/clone.c:75 builtin/clone.c:77
-msgid "initialize submodules in the clone"
+#: builtin/branch.c:798
+msgid "too many branches to set new upstream"
msgstr ""
-#: builtin/clone.c:79
-msgid "number of submodules cloned in parallel"
+#: builtin/branch.c:802
+#, c-format
+msgid ""
+"could not set upstream of HEAD to %s when it does not point to any branch."
msgstr ""
-#: builtin/clone.c:80 builtin/init-db.c:473
-msgid "template-directory"
+#: builtin/branch.c:805 builtin/branch.c:827 builtin/branch.c:848
+#, c-format
+msgid "no such branch '%s'"
msgstr ""
-#: builtin/clone.c:81 builtin/init-db.c:474
-msgid "directory from which templates will be used"
+#: builtin/branch.c:809
+#, c-format
+msgid "branch '%s' does not exist"
msgstr ""
-#: builtin/clone.c:83 builtin/submodule--helper.c:495
-#: builtin/submodule--helper.c:833
-msgid "reference repository"
+#: builtin/branch.c:821
+msgid "too many branches to unset upstream"
msgstr ""
-#: builtin/clone.c:85
-msgid "use --reference only while cloning"
+#: builtin/branch.c:825
+msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr ""
-#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44
-msgid "name"
+#: builtin/branch.c:831
+#, c-format
+msgid "Branch '%s' has no upstream information"
msgstr ""
-#: builtin/clone.c:87
-msgid "use <name> instead of 'origin' to track upstream"
+#: builtin/branch.c:845
+msgid "it does not make sense to create 'HEAD' manually"
msgstr ""
-#: builtin/clone.c:89
-msgid "checkout <branch> instead of the remote's HEAD"
+#: builtin/branch.c:851
+msgid "-a and -r options to 'git branch' do not make sense with a branch name"
msgstr ""
-#: builtin/clone.c:91
-msgid "path to git-upload-pack on the remote"
+#: builtin/branch.c:854
+#, c-format
+msgid ""
+"The --set-upstream flag is deprecated and will be removed. Consider using --"
+"track or --set-upstream-to\n"
msgstr ""
-#: builtin/clone.c:92 builtin/fetch.c:118 builtin/grep.c:667
-#: builtin/pull.c:201
-msgid "depth"
+#: builtin/branch.c:871
+#, c-format
+msgid ""
+"\n"
+"If you wanted to make '%s' track '%s', do this:\n"
+"\n"
msgstr ""
-#: builtin/clone.c:93
-msgid "create a shallow clone of that depth"
+#: builtin/bundle.c:51
+#, c-format
+msgid "%s is okay\n"
msgstr ""
-#: builtin/clone.c:95
-msgid "clone only one branch, HEAD or --branch"
+#: builtin/bundle.c:64
+msgid "Need a repository to create a bundle."
msgstr ""
-#: builtin/clone.c:97
-msgid "any cloned submodules will be shallow"
+#: builtin/bundle.c:68
+msgid "Need a repository to unbundle."
msgstr ""
-#: builtin/clone.c:98 builtin/init-db.c:482
-msgid "gitdir"
+#: builtin/cat-file.c:513
+msgid ""
+"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
+"p | <type> | --textconv | --filters) [--path=<path>] <object>"
msgstr ""
-#: builtin/clone.c:99 builtin/init-db.c:483
-msgid "separate git dir from working tree"
+#: builtin/cat-file.c:514
+msgid ""
+"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
+"filters]"
msgstr ""
-#: builtin/clone.c:100
-msgid "key=value"
+#: builtin/cat-file.c:551
+msgid "<type> can be one of: blob, tree, commit, tag"
msgstr ""
-#: builtin/clone.c:101
-msgid "set config inside the new repository"
+#: builtin/cat-file.c:552
+msgid "show object type"
msgstr ""
-#: builtin/clone.c:102 builtin/fetch.c:132 builtin/push.c:547
-msgid "use IPv4 addresses only"
+#: builtin/cat-file.c:553
+msgid "show object size"
msgstr ""
-#: builtin/clone.c:104 builtin/fetch.c:134 builtin/push.c:549
-msgid "use IPv6 addresses only"
+#: builtin/cat-file.c:555
+msgid "exit with zero when there's no error"
msgstr ""
-#: builtin/clone.c:241
-msgid ""
-"No directory name could be guessed.\n"
-"Please specify a directory on the command line"
+#: builtin/cat-file.c:556
+msgid "pretty-print object's content"
msgstr ""
-#: builtin/clone.c:307
-#, c-format
-msgid "reference repository '%s' as a linked checkout is not supported yet."
+#: builtin/cat-file.c:558
+msgid "for blob objects, run textconv on object's content"
msgstr ""
-#: builtin/clone.c:309
-#, c-format
-msgid "reference repository '%s' is not a local repository."
+#: builtin/cat-file.c:560
+msgid "for blob objects, run filters on object's content"
msgstr ""
-#: builtin/clone.c:314
-#, c-format
-msgid "reference repository '%s' is shallow"
+#: builtin/cat-file.c:561 git-submodule.sh:929
+msgid "blob"
msgstr ""
-#: builtin/clone.c:317
-#, c-format
-msgid "reference repository '%s' is grafted"
+#: builtin/cat-file.c:562
+msgid "use a specific path for --textconv/--filters"
msgstr ""
-#: builtin/clone.c:376
-#, c-format
-msgid "failed to open '%s'"
+#: builtin/cat-file.c:564
+msgid "allow -s and -t to work with broken/corrupt objects"
msgstr ""
-#: builtin/clone.c:384
-#, c-format
-msgid "%s exists and is not a directory"
+#: builtin/cat-file.c:565
+msgid "buffer --batch output"
msgstr ""
-#: builtin/clone.c:398
-#, c-format
-msgid "failed to stat %s\n"
+#: builtin/cat-file.c:567
+msgid "show info and content of objects fed from the standard input"
msgstr ""
-#: builtin/clone.c:420
-#, c-format
-msgid "failed to create link '%s'"
+#: builtin/cat-file.c:570
+msgid "show info about objects fed from the standard input"
msgstr ""
-#: builtin/clone.c:424
-#, c-format
-msgid "failed to copy file to '%s'"
+#: builtin/cat-file.c:573
+msgid "follow in-tree symlinks (used with --batch or --batch-check)"
msgstr ""
-#: builtin/clone.c:449
-#, c-format
-msgid "done.\n"
+#: builtin/cat-file.c:575
+msgid "show all objects with --batch or --batch-check"
msgstr ""
-#: builtin/clone.c:461
-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"
+#: builtin/check-attr.c:11
+msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
msgstr ""
-#: builtin/clone.c:538
-#, c-format
-msgid "Could not find remote branch %s to clone."
-msgstr ""
-
-#: builtin/clone.c:633
-msgid "remote did not send all necessary objects"
-msgstr ""
-
-#: builtin/clone.c:649
-#, c-format
-msgid "unable to update %s"
-msgstr ""
-
-#: builtin/clone.c:698
-msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
+#: builtin/check-attr.c:12
+msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
msgstr ""
-#: builtin/clone.c:729
-msgid "unable to checkout working tree"
+#: builtin/check-attr.c:19
+msgid "report all attributes set on file"
msgstr ""
-#: builtin/clone.c:766
-msgid "unable to write parameters to config file"
+#: builtin/check-attr.c:20
+msgid "use .gitattributes only from the index"
msgstr ""
-#: builtin/clone.c:829
-msgid "cannot repack to clean up"
+#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:98
+msgid "read file names from stdin"
msgstr ""
-#: builtin/clone.c:831
-msgid "cannot unlink temporary alternates file"
+#: builtin/check-attr.c:23 builtin/check-ignore.c:24
+msgid "terminate input and output records by a NUL character"
msgstr ""
-#: builtin/clone.c:863 builtin/receive-pack.c:1855
-msgid "Too many arguments."
+#: builtin/check-ignore.c:18 builtin/checkout.c:1140 builtin/gc.c:332
+msgid "suppress progress reporting"
msgstr ""
-#: builtin/clone.c:867
-msgid "You must specify a repository to clone."
+#: builtin/check-ignore.c:26
+msgid "show non-matching input paths"
msgstr ""
-#: builtin/clone.c:878
-#, c-format
-msgid "--bare and --origin %s options are incompatible."
+#: builtin/check-ignore.c:28
+msgid "ignore index when checking"
msgstr ""
-#: builtin/clone.c:881
-msgid "--bare and --separate-git-dir are incompatible."
+#: builtin/check-ignore.c:154
+msgid "cannot specify pathnames with --stdin"
msgstr ""
-#: builtin/clone.c:894
-#, c-format
-msgid "repository '%s' does not exist"
+#: builtin/check-ignore.c:157
+msgid "-z only makes sense with --stdin"
msgstr ""
-#: builtin/clone.c:900 builtin/fetch.c:1293
-#, c-format
-msgid "depth %s is not a positive number"
+#: builtin/check-ignore.c:159
+msgid "no path specified"
msgstr ""
-#: builtin/clone.c:910
-#, c-format
-msgid "destination path '%s' already exists and is not an empty directory."
+#: builtin/check-ignore.c:163
+msgid "--quiet is only valid with a single pathname"
msgstr ""
-#: builtin/clone.c:920
-#, c-format
-msgid "working tree '%s' already exists."
+#: builtin/check-ignore.c:165
+msgid "cannot have both --quiet and --verbose"
msgstr ""
-#: builtin/clone.c:935 builtin/clone.c:946 builtin/submodule--helper.c:544
-#: builtin/worktree.c:222 builtin/worktree.c:249
-#, c-format
-msgid "could not create leading directories of '%s'"
+#: builtin/check-ignore.c:168
+msgid "--non-matching is only valid with --verbose"
msgstr ""
-#: builtin/clone.c:938
-#, c-format
-msgid "could not create work tree dir '%s'"
+#: builtin/check-mailmap.c:8
+msgid "git check-mailmap [<options>] <contact>..."
msgstr ""
-#: builtin/clone.c:956
-#, c-format
-msgid "Cloning into bare repository '%s'...\n"
+#: builtin/check-mailmap.c:13
+msgid "also read contacts from stdin"
msgstr ""
-#: builtin/clone.c:958
+#: builtin/check-mailmap.c:24
#, c-format
-msgid "Cloning into '%s'...\n"
-msgstr ""
-
-#: builtin/clone.c:997
-msgid "--depth is ignored in local clones; use file:// instead."
-msgstr ""
-
-#: builtin/clone.c:1000
-msgid "source repository is shallow, ignoring --local"
-msgstr ""
-
-#: builtin/clone.c:1005
-msgid "--local is ignored"
+msgid "unable to parse contact: %s"
msgstr ""
-#: builtin/clone.c:1009
-#, c-format
-msgid "Don't know how to clone %s"
+#: builtin/check-mailmap.c:47
+msgid "no contacts specified"
msgstr ""
-#: builtin/clone.c:1058 builtin/clone.c:1066
-#, c-format
-msgid "Remote branch %s not found in upstream %s"
+#: builtin/checkout-index.c:127
+msgid "git checkout-index [<options>] [--] [<file>...]"
msgstr ""
-#: builtin/clone.c:1069
-msgid "You appear to have cloned an empty repository."
+#: builtin/checkout-index.c:144
+msgid "stage should be between 1 and 3 or all"
msgstr ""
-#: builtin/column.c:9
-msgid "git column [<options>]"
+#: builtin/checkout-index.c:160
+msgid "check out all files in the index"
msgstr ""
-#: builtin/column.c:26
-msgid "lookup config vars"
+#: builtin/checkout-index.c:161
+msgid "force overwrite of existing files"
msgstr ""
-#: builtin/column.c:27 builtin/column.c:28
-msgid "layout to use"
+#: builtin/checkout-index.c:163
+msgid "no warning for existing files and files not in index"
msgstr ""
-#: builtin/column.c:29
-msgid "Maximum width"
+#: builtin/checkout-index.c:165
+msgid "don't checkout new files"
msgstr ""
-#: builtin/column.c:30
-msgid "Padding space on left border"
+#: builtin/checkout-index.c:167
+msgid "update stat information in the index file"
msgstr ""
-#: builtin/column.c:31
-msgid "Padding space on right border"
+#: builtin/checkout-index.c:171
+msgid "read list of paths from the standard input"
msgstr ""
-#: builtin/column.c:32
-msgid "Padding space between columns"
+#: builtin/checkout-index.c:173
+msgid "write the content to temporary files"
msgstr ""
-#: builtin/column.c:51
-msgid "--command must be the first argument"
+#: builtin/checkout-index.c:174 builtin/column.c:30
+#: builtin/submodule--helper.c:597 builtin/submodule--helper.c:600
+#: builtin/submodule--helper.c:606 builtin/submodule--helper.c:967
+#: builtin/worktree.c:471
+msgid "string"
msgstr ""
-#: builtin/commit.c:38
-msgid "git commit [<options>] [--] <pathspec>..."
+#: builtin/checkout-index.c:175
+msgid "when creating files, prepend <string>"
msgstr ""
-#: builtin/commit.c:43
-msgid "git status [<options>] [--] <pathspec>..."
+#: builtin/checkout-index.c:177
+msgid "copy out the files from named stage"
msgstr ""
-#: builtin/commit.c:48
-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"
+#: builtin/checkout.c:25
+msgid "git checkout [<options>] <branch>"
msgstr ""
-#: builtin/commit.c:61
-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/checkout.c:26
+msgid "git checkout [<options>] [<branch>] -- <file>..."
msgstr ""
-#: builtin/commit.c:73
-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/checkout.c:134 builtin/checkout.c:167
+#, c-format
+msgid "path '%s' does not have our version"
msgstr ""
-#: builtin/commit.c:78
-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"
+#: builtin/checkout.c:136 builtin/checkout.c:169
+#, c-format
+msgid "path '%s' does not have their version"
msgstr ""
-#: builtin/commit.c:85
-msgid "Otherwise, please use 'git reset'\n"
+#: builtin/checkout.c:152
+#, c-format
+msgid "path '%s' does not have all necessary versions"
msgstr ""
-#: builtin/commit.c:88
-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"
+#: builtin/checkout.c:196
+#, c-format
+msgid "path '%s' does not have necessary versions"
msgstr ""
-#: builtin/commit.c:308
-msgid "failed to unpack HEAD tree object"
+#: builtin/checkout.c:213
+#, c-format
+msgid "path '%s': cannot merge"
msgstr ""
-#: builtin/commit.c:349
-msgid "unable to create temporary index"
+#: builtin/checkout.c:230
+#, c-format
+msgid "Unable to add merge result for '%s'"
msgstr ""
-#: builtin/commit.c:355
-msgid "interactive add failed"
+#: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256
+#: builtin/checkout.c:259
+#, c-format
+msgid "'%s' cannot be used with updating paths"
msgstr ""
-#: builtin/commit.c:368
-msgid "unable to update temporary index"
+#: builtin/checkout.c:262 builtin/checkout.c:265
+#, c-format
+msgid "'%s' cannot be used with %s"
msgstr ""
-#: builtin/commit.c:370
-msgid "Failed to update main cache tree"
+#: builtin/checkout.c:268
+#, c-format
+msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr ""
-#: builtin/commit.c:394 builtin/commit.c:417 builtin/commit.c:466
-msgid "unable to write new_index file"
+#: builtin/checkout.c:339 builtin/checkout.c:346
+#, c-format
+msgid "path '%s' is unmerged"
msgstr ""
-#: builtin/commit.c:448
-msgid "cannot do a partial commit during a merge."
+#: builtin/checkout.c:494
+msgid "you need to resolve your current index first"
msgstr ""
-#: builtin/commit.c:450
-msgid "cannot do a partial commit during a cherry-pick."
+#: builtin/checkout.c:625
+#, c-format
+msgid "Can not do reflog for '%s': %s\n"
msgstr ""
-#: builtin/commit.c:459
-msgid "cannot read the index"
+#: builtin/checkout.c:666
+msgid "HEAD is now at"
msgstr ""
-#: builtin/commit.c:478
-msgid "unable to write temporary index file"
+#: builtin/checkout.c:670 builtin/clone.c:660
+msgid "unable to update HEAD"
msgstr ""
-#: builtin/commit.c:583
+#: builtin/checkout.c:674
#, c-format
-msgid "commit '%s' lacks author header"
+msgid "Reset branch '%s'\n"
msgstr ""
-#: builtin/commit.c:585
+#: builtin/checkout.c:677
#, c-format
-msgid "commit '%s' has malformed author line"
-msgstr ""
-
-#: builtin/commit.c:604
-msgid "malformed --author parameter"
+msgid "Already on '%s'\n"
msgstr ""
-#: builtin/commit.c:612
+#: builtin/checkout.c:681
#, c-format
-msgid "invalid date format: %s"
-msgstr ""
-
-#: builtin/commit.c:656
-msgid ""
-"unable to select a comment character that is not used\n"
-"in the current commit message"
+msgid "Switched to and reset branch '%s'\n"
msgstr ""
-#: builtin/commit.c:693 builtin/commit.c:726 builtin/commit.c:1092
+#: builtin/checkout.c:683 builtin/checkout.c:1072
#, c-format
-msgid "could not lookup commit %s"
+msgid "Switched to a new branch '%s'\n"
msgstr ""
-#: builtin/commit.c:705 builtin/shortlog.c:286
+#: builtin/checkout.c:685
#, c-format
-msgid "(reading log message from standard input)\n"
-msgstr ""
-
-#: builtin/commit.c:707
-msgid "could not read log from standard input"
+msgid "Switched to branch '%s'\n"
msgstr ""
-#: builtin/commit.c:711
+#: builtin/checkout.c:736
#, c-format
-msgid "could not read log file '%s'"
-msgstr ""
-
-#: builtin/commit.c:738 builtin/commit.c:746
-msgid "could not read SQUASH_MSG"
-msgstr ""
-
-#: builtin/commit.c:743
-msgid "could not read MERGE_MSG"
+msgid " ... and %d more.\n"
msgstr ""
-#: builtin/commit.c:797
-msgid "could not write commit template"
-msgstr ""
-
-#: builtin/commit.c:815
+#: builtin/checkout.c:742
#, c-format
msgid ""
+"Warning: you are leaving %d commit behind, not connected to\n"
+"any of your branches:\n"
"\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 ""
+"%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/commit.c:820
+#: builtin/checkout.c:761
#, c-format
msgid ""
+"If you want to keep it by creating a new branch, this may be a good time\n"
+"to do so with:\n"
"\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 ""
+" git branch <new-branch-name> %s\n"
+"\n"
+msgid_plural ""
+"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[0] ""
+msgstr[1] ""
-#: builtin/commit.c:833
-#, 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"
+#: builtin/checkout.c:797
+msgid "internal error in revision walk"
msgstr ""
-#: builtin/commit.c:840
-#, 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"
+#: builtin/checkout.c:801
+msgid "Previous HEAD position was"
msgstr ""
-#: builtin/commit.c:860
-#, c-format
-msgid "%sAuthor: %.*s <%.*s>"
+#: builtin/checkout.c:828 builtin/checkout.c:1067
+msgid "You are on a branch yet to be born"
msgstr ""
-#: builtin/commit.c:868
+#: builtin/checkout.c:973
#, c-format
-msgid "%sDate: %s"
+msgid "only one reference expected, %d given."
msgstr ""
-#: builtin/commit.c:875
+#: builtin/checkout.c:1013 builtin/worktree.c:214
#, c-format
-msgid "%sCommitter: %.*s <%.*s>"
+msgid "invalid reference: %s"
msgstr ""
-#: builtin/commit.c:893
-msgid "Cannot read index"
+#: builtin/checkout.c:1042
+#, c-format
+msgid "reference is not a tree: %s"
msgstr ""
-#: builtin/commit.c:950
-msgid "Error building trees"
+#: builtin/checkout.c:1081
+msgid "paths cannot be used with switching branches"
msgstr ""
-#: builtin/commit.c:965 builtin/tag.c:266
+#: builtin/checkout.c:1084 builtin/checkout.c:1088
#, c-format
-msgid "Please supply the message using either -m or -F option.\n"
+msgid "'%s' cannot be used with switching branches"
msgstr ""
-#: builtin/commit.c:1067
+#: builtin/checkout.c:1092 builtin/checkout.c:1095 builtin/checkout.c:1100
+#: builtin/checkout.c:1103
#, c-format
-msgid "--author '%s' is not 'Name <email>' and matches no existing author"
+msgid "'%s' cannot be used with '%s'"
msgstr ""
-#: builtin/commit.c:1082 builtin/commit.c:1322
+#: builtin/checkout.c:1108
#, c-format
-msgid "Invalid untracked files mode '%s'"
-msgstr ""
-
-#: builtin/commit.c:1119
-msgid "--long and -z are incompatible"
+msgid "Cannot switch branch to a non-commit '%s'"
msgstr ""
-#: builtin/commit.c:1149
-msgid "Using both --reset-author and --author does not make sense"
+#: builtin/checkout.c:1141 builtin/checkout.c:1143 builtin/clone.c:93
+#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:324
+#: builtin/worktree.c:326
+msgid "branch"
msgstr ""
-#: builtin/commit.c:1158
-msgid "You have nothing to amend."
+#: builtin/checkout.c:1142
+msgid "create and checkout a new branch"
msgstr ""
-#: builtin/commit.c:1161
-msgid "You are in the middle of a merge -- cannot amend."
+#: builtin/checkout.c:1144
+msgid "create/reset and checkout a branch"
msgstr ""
-#: builtin/commit.c:1163
-msgid "You are in the middle of a cherry-pick -- cannot amend."
+#: builtin/checkout.c:1145
+msgid "create reflog for new branch"
msgstr ""
-#: builtin/commit.c:1166
-msgid "Options --squash and --fixup cannot be used together"
+#: builtin/checkout.c:1146 builtin/worktree.c:328
+msgid "detach HEAD at named commit"
msgstr ""
-#: builtin/commit.c:1176
-msgid "Only one of -c/-C/-F/--fixup can be used."
+#: builtin/checkout.c:1147
+msgid "set upstream info for new branch"
msgstr ""
-#: builtin/commit.c:1178
-msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
+#: builtin/checkout.c:1149
+msgid "new-branch"
msgstr ""
-#: builtin/commit.c:1186
-msgid "--reset-author can be used only with -C, -c or --amend."
+#: builtin/checkout.c:1149
+msgid "new unparented branch"
msgstr ""
-#: builtin/commit.c:1203
-msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
+#: builtin/checkout.c:1150
+msgid "checkout our version for unmerged files"
msgstr ""
-#: builtin/commit.c:1205
-msgid "No paths with --include/--only does not make sense."
+#: builtin/checkout.c:1152
+msgid "checkout their version for unmerged files"
msgstr ""
-#: builtin/commit.c:1207
-msgid "Clever... amending the last one with dirty index."
+#: builtin/checkout.c:1154
+msgid "force checkout (throw away local modifications)"
msgstr ""
-#: builtin/commit.c:1209
-msgid "Explicit paths specified without -i or -o; assuming --only paths..."
+#: builtin/checkout.c:1155
+msgid "perform a 3-way merge with the new branch"
msgstr ""
-#: builtin/commit.c:1221 builtin/tag.c:474
-#, c-format
-msgid "Invalid cleanup mode %s"
+#: builtin/checkout.c:1156 builtin/merge.c:235
+msgid "update ignored files (default)"
msgstr ""
-#: builtin/commit.c:1226
-msgid "Paths with -a does not make sense."
+#: builtin/checkout.c:1157 builtin/log.c:1466 parse-options.h:251
+msgid "style"
msgstr ""
-#: builtin/commit.c:1336 builtin/commit.c:1622
-msgid "show status concisely"
+#: builtin/checkout.c:1158
+msgid "conflict style (merge or diff3)"
msgstr ""
-#: builtin/commit.c:1338 builtin/commit.c:1624
-msgid "show branch information"
+#: builtin/checkout.c:1161
+msgid "do not limit pathspecs to sparse entries only"
msgstr ""
-#: builtin/commit.c:1340 builtin/commit.c:1626 builtin/push.c:522
-#: builtin/worktree.c:440
-msgid "machine-readable output"
+#: builtin/checkout.c:1163
+msgid "second guess 'git checkout <no-such-branch>'"
msgstr ""
-#: builtin/commit.c:1343 builtin/commit.c:1628
-msgid "show status in long format (default)"
+#: builtin/checkout.c:1165
+msgid "do not check if another worktree is holding the given ref"
msgstr ""
-#: builtin/commit.c:1346 builtin/commit.c:1631
-msgid "terminate entries with NUL"
+#: builtin/checkout.c:1166 builtin/clone.c:63 builtin/fetch.c:119
+#: builtin/merge.c:232 builtin/pull.c:117 builtin/push.c:539
+#: builtin/send-pack.c:168
+msgid "force progress reporting"
msgstr ""
-#: builtin/commit.c:1348 builtin/commit.c:1634 builtin/fast-export.c:981
-#: builtin/fast-export.c:984 builtin/tag.c:353
-msgid "mode"
+#: builtin/checkout.c:1197
+msgid "-b, -B and --orphan are mutually exclusive"
msgstr ""
-#: builtin/commit.c:1349 builtin/commit.c:1634
-msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
+#: builtin/checkout.c:1214
+msgid "--track needs a branch name"
msgstr ""
-#: builtin/commit.c:1352
-msgid "show ignored files"
+#: builtin/checkout.c:1219
+msgid "Missing branch name; try -b"
msgstr ""
-#: builtin/commit.c:1353 parse-options.h:155
-msgid "when"
+#: builtin/checkout.c:1255
+msgid "invalid path specification"
msgstr ""
-#: builtin/commit.c:1354
+#: builtin/checkout.c:1262
+#, c-format
msgid ""
-"ignore changes to submodules, optional when: all, dirty, untracked. "
-"(Default: all)"
+"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/commit.c:1356
-msgid "list untracked files in columns"
+#: builtin/checkout.c:1267
+#, c-format
+msgid "git checkout: --detach does not take a path argument '%s'"
msgstr ""
-#: builtin/commit.c:1442
-msgid "couldn't look up newly created commit"
+#: builtin/checkout.c:1271
+msgid ""
+"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
+"checking out of the index."
msgstr ""
-#: builtin/commit.c:1444
-msgid "could not parse newly created commit"
+#: builtin/clean.c:25
+msgid ""
+"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
msgstr ""
-#: builtin/commit.c:1489
-msgid "detached HEAD"
+#: builtin/clean.c:29
+#, c-format
+msgid "Removing %s\n"
msgstr ""
-#: builtin/commit.c:1492
-msgid " (root-commit)"
+#: builtin/clean.c:30
+#, c-format
+msgid "Would remove %s\n"
msgstr ""
-#: builtin/commit.c:1592
-msgid "suppress summary after successful commit"
+#: builtin/clean.c:31
+#, c-format
+msgid "Skipping repository %s\n"
msgstr ""
-#: builtin/commit.c:1593
-msgid "show diff in commit message template"
+#: builtin/clean.c:32
+#, c-format
+msgid "Would skip repository %s\n"
msgstr ""
-#: builtin/commit.c:1595
-msgid "Commit message options"
+#: builtin/clean.c:33
+#, c-format
+msgid "failed to remove %s"
msgstr ""
-#: builtin/commit.c:1596 builtin/tag.c:351
-msgid "read message from file"
+#: builtin/clean.c:291 git-add--interactive.perl:623
+#, c-format
+msgid ""
+"Prompt help:\n"
+"1 - select a numbered item\n"
+"foo - select item based on unique prefix\n"
+" - (empty) select nothing\n"
msgstr ""
-#: builtin/commit.c:1597
-msgid "author"
+#: builtin/clean.c:295 git-add--interactive.perl:632
+#, c-format
+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\n"
msgstr ""
-#: builtin/commit.c:1597
-msgid "override author for commit"
+#: builtin/clean.c:511 git-add--interactive.perl:598
+#: git-add--interactive.perl:603
+#, c-format, perl-format
+msgid "Huh (%s)?\n"
msgstr ""
-#: builtin/commit.c:1598 builtin/gc.c:326
-msgid "date"
+#: builtin/clean.c:653
+#, c-format
+msgid "Input ignore patterns>> "
msgstr ""
-#: builtin/commit.c:1598
-msgid "override date for commit"
+#: builtin/clean.c:690
+#, c-format
+msgid "WARNING: Cannot find items matched by: %s"
msgstr ""
-#: builtin/commit.c:1599 builtin/merge.c:220 builtin/notes.c:396
-#: builtin/notes.c:559 builtin/tag.c:349
-msgid "message"
+#: builtin/clean.c:711
+msgid "Select items to delete"
msgstr ""
-#: builtin/commit.c:1599
-msgid "commit message"
+#. TRANSLATORS: Make sure to keep [y/N] as is
+#: builtin/clean.c:752
+#, c-format
+msgid "Remove %s [y/N]? "
msgstr ""
-#: builtin/commit.c:1600 builtin/commit.c:1601 builtin/commit.c:1602
-#: builtin/commit.c:1603 parse-options.h:256 ref-filter.h:79
-msgid "commit"
+#: builtin/clean.c:777 git-add--interactive.perl:1669
+#, c-format
+msgid "Bye.\n"
msgstr ""
-#: builtin/commit.c:1600
-msgid "reuse and edit message from specified commit"
+#: builtin/clean.c:785
+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/commit.c:1601
-msgid "reuse message from specified commit"
+#: builtin/clean.c:812 git-add--interactive.perl:1745
+msgid "*** Commands ***"
msgstr ""
-#: builtin/commit.c:1602
-msgid "use autosquash formatted message to fixup specified commit"
+#: builtin/clean.c:813 git-add--interactive.perl:1742
+msgid "What now"
msgstr ""
-#: builtin/commit.c:1603
-msgid "use autosquash formatted message to squash specified commit"
+#: builtin/clean.c:821
+msgid "Would remove the following item:"
+msgid_plural "Would remove the following items:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/clean.c:838
+msgid "No more files to clean, exiting."
msgstr ""
-#: builtin/commit.c:1604
-msgid "the commit is authored by me now (used with -C/-c/--amend)"
+#: builtin/clean.c:869
+msgid "do not print names of files removed"
msgstr ""
-#: builtin/commit.c:1605 builtin/log.c:1409 builtin/revert.c:86
-msgid "add Signed-off-by:"
+#: builtin/clean.c:871
+msgid "force"
msgstr ""
-#: builtin/commit.c:1606
-msgid "use specified template file"
+#: builtin/clean.c:872
+msgid "interactive cleaning"
msgstr ""
-#: builtin/commit.c:1607
-msgid "force edit of commit"
+#: builtin/clean.c:874
+msgid "remove whole directories"
msgstr ""
-#: builtin/commit.c:1608
-msgid "default"
+#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:1056
+#: builtin/ls-files.c:538 builtin/name-rev.c:313 builtin/show-ref.c:176
+msgid "pattern"
msgstr ""
-#: builtin/commit.c:1608 builtin/tag.c:354
-msgid "how to strip spaces and #comments from message"
+#: builtin/clean.c:876
+msgid "add <pattern> to ignore rules"
msgstr ""
-#: builtin/commit.c:1609
-msgid "include status in commit message template"
+#: builtin/clean.c:877
+msgid "remove ignored files, too"
msgstr ""
-#: builtin/commit.c:1611 builtin/merge.c:230 builtin/pull.c:165
-#: builtin/revert.c:93
-msgid "GPG sign commit"
+#: builtin/clean.c:879
+msgid "remove only ignored files"
msgstr ""
-#: builtin/commit.c:1614
-msgid "Commit contents options"
+#: builtin/clean.c:897
+msgid "-x and -X cannot be used together"
msgstr ""
-#: builtin/commit.c:1615
-msgid "commit all changed files"
+#: builtin/clean.c:901
+msgid ""
+"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
+"clean"
msgstr ""
-#: builtin/commit.c:1616
-msgid "add specified files to index for commit"
+#: builtin/clean.c:904
+msgid ""
+"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
+"refusing to clean"
msgstr ""
-#: builtin/commit.c:1617
-msgid "interactively add files"
+#: builtin/clone.c:37
+msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr ""
-#: builtin/commit.c:1618
-msgid "interactively add changes"
+#: builtin/clone.c:65
+msgid "don't create a checkout"
msgstr ""
-#: builtin/commit.c:1619
-msgid "commit only specified files"
+#: builtin/clone.c:66 builtin/clone.c:68 builtin/init-db.c:478
+msgid "create a bare repository"
msgstr ""
-#: builtin/commit.c:1620
-msgid "bypass pre-commit and commit-msg hooks"
+#: builtin/clone.c:70
+msgid "create a mirror repository (implies bare)"
msgstr ""
-#: builtin/commit.c:1621
-msgid "show what would be committed"
+#: builtin/clone.c:72
+msgid "to clone from a local repository"
msgstr ""
-#: builtin/commit.c:1632
-msgid "amend previous commit"
+#: builtin/clone.c:74
+msgid "don't use local hardlinks, always copy"
msgstr ""
-#: builtin/commit.c:1633
-msgid "bypass post-rewrite hook"
+#: builtin/clone.c:76
+msgid "setup as shared repository"
msgstr ""
-#: builtin/commit.c:1638
-msgid "ok to record an empty change"
+#: builtin/clone.c:78 builtin/clone.c:80
+msgid "initialize submodules in the clone"
msgstr ""
-#: builtin/commit.c:1640
-msgid "ok to record a change with an empty message"
+#: builtin/clone.c:82
+msgid "number of submodules cloned in parallel"
msgstr ""
-#: builtin/commit.c:1669
-msgid "could not parse HEAD commit"
+#: builtin/clone.c:83 builtin/init-db.c:475
+msgid "template-directory"
msgstr ""
-#: builtin/commit.c:1719
-#, c-format
-msgid "Corrupt MERGE_HEAD file (%s)"
+#: builtin/clone.c:84 builtin/init-db.c:476
+msgid "directory from which templates will be used"
msgstr ""
-#: builtin/commit.c:1726
-msgid "could not read MERGE_MODE"
+#: builtin/clone.c:86 builtin/clone.c:88 builtin/submodule--helper.c:604
+#: builtin/submodule--helper.c:970
+msgid "reference repository"
msgstr ""
-#: builtin/commit.c:1745
-#, c-format
-msgid "could not read commit message: %s"
+#: builtin/clone.c:90
+msgid "use --reference only while cloning"
msgstr ""
-#: builtin/commit.c:1756
-#, c-format
-msgid "Aborting commit; you did not edit the message.\n"
+#: builtin/clone.c:91 builtin/column.c:26 builtin/merge-file.c:44
+msgid "name"
msgstr ""
-#: builtin/commit.c:1761
-#, c-format
-msgid "Aborting commit due to empty commit message.\n"
+#: builtin/clone.c:92
+msgid "use <name> instead of 'origin' to track upstream"
msgstr ""
-#: builtin/commit.c:1809
-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."
+#: builtin/clone.c:94
+msgid "checkout <branch> instead of the remote's HEAD"
msgstr ""
-#: builtin/config.c:9
-msgid "git config [<options>]"
+#: builtin/clone.c:96
+msgid "path to git-upload-pack on the remote"
msgstr ""
-#: builtin/config.c:55
-msgid "Config file location"
+#: builtin/clone.c:97 builtin/fetch.c:120 builtin/grep.c:999
+#: builtin/pull.c:202
+msgid "depth"
msgstr ""
-#: builtin/config.c:56
-msgid "use global config file"
+#: builtin/clone.c:98
+msgid "create a shallow clone of that depth"
msgstr ""
-#: builtin/config.c:57
-msgid "use system config file"
+#: builtin/clone.c:99 builtin/fetch.c:122 builtin/pack-objects.c:2836
+#: parse-options.h:142
+msgid "time"
msgstr ""
-#: builtin/config.c:58
-msgid "use repository config file"
+#: builtin/clone.c:100
+msgid "create a shallow clone since a specific time"
msgstr ""
-#: builtin/config.c:59
-msgid "use given config file"
+#: builtin/clone.c:101 builtin/fetch.c:124
+msgid "revision"
msgstr ""
-#: builtin/config.c:60
-msgid "blob-id"
+#: builtin/clone.c:102 builtin/fetch.c:125
+msgid "deepen history of shallow clone, excluding rev"
msgstr ""
-#: builtin/config.c:60
-msgid "read config from given blob object"
+#: builtin/clone.c:104
+msgid "clone only one branch, HEAD or --branch"
msgstr ""
-#: builtin/config.c:61
-msgid "Action"
+#: builtin/clone.c:106
+msgid "any cloned submodules will be shallow"
msgstr ""
-#: builtin/config.c:62
-msgid "get value: name [value-regex]"
+#: builtin/clone.c:107 builtin/init-db.c:484
+msgid "gitdir"
msgstr ""
-#: builtin/config.c:63
-msgid "get all values: key [value-regex]"
+#: builtin/clone.c:108 builtin/init-db.c:485
+msgid "separate git dir from working tree"
msgstr ""
-#: builtin/config.c:64
-msgid "get values for regexp: name-regex [value-regex]"
+#: builtin/clone.c:109
+msgid "key=value"
msgstr ""
-#: builtin/config.c:65
-msgid "get value specific for the URL: section[.var] URL"
+#: builtin/clone.c:110
+msgid "set config inside the new repository"
msgstr ""
-#: builtin/config.c:66
-msgid "replace all matching variables: name value [value_regex]"
+#: builtin/clone.c:111 builtin/fetch.c:140 builtin/push.c:550
+msgid "use IPv4 addresses only"
msgstr ""
-#: builtin/config.c:67
-msgid "add a new variable: name value"
+#: builtin/clone.c:113 builtin/fetch.c:142 builtin/push.c:552
+msgid "use IPv6 addresses only"
msgstr ""
-#: builtin/config.c:68
-msgid "remove a variable: name [value-regex]"
+#: builtin/clone.c:250
+msgid ""
+"No directory name could be guessed.\n"
+"Please specify a directory on the command line"
msgstr ""
-#: builtin/config.c:69
-msgid "remove all matches: name [value-regex]"
+#: builtin/clone.c:303
+#, c-format
+msgid "info: Could not add alternate for '%s': %s\n"
msgstr ""
-#: builtin/config.c:70
-msgid "rename section: old-name new-name"
+#: builtin/clone.c:375
+#, c-format
+msgid "failed to open '%s'"
msgstr ""
-#: builtin/config.c:71
-msgid "remove a section: name"
+#: builtin/clone.c:383
+#, c-format
+msgid "%s exists and is not a directory"
msgstr ""
-#: builtin/config.c:72
-msgid "list all"
+#: builtin/clone.c:397
+#, c-format
+msgid "failed to stat %s\n"
msgstr ""
-#: builtin/config.c:73
-msgid "open an editor"
+#: builtin/clone.c:419
+#, c-format
+msgid "failed to create link '%s'"
msgstr ""
-#: builtin/config.c:74
-msgid "find the color configured: slot [default]"
+#: builtin/clone.c:423
+#, c-format
+msgid "failed to copy file to '%s'"
msgstr ""
-#: builtin/config.c:75
-msgid "find the color setting: slot [stdout-is-tty]"
+#: builtin/clone.c:448
+#, c-format
+msgid "done.\n"
msgstr ""
-#: builtin/config.c:76
-msgid "Type"
+#: builtin/clone.c:460
+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/config.c:77
-msgid "value is \"true\" or \"false\""
+#: builtin/clone.c:537
+#, c-format
+msgid "Could not find remote branch %s to clone."
msgstr ""
-#: builtin/config.c:78
-msgid "value is decimal number"
+#: builtin/clone.c:632
+msgid "remote did not send all necessary objects"
msgstr ""
-#: builtin/config.c:79
-msgid "value is --bool or --int"
+#: builtin/clone.c:648
+#, c-format
+msgid "unable to update %s"
msgstr ""
-#: builtin/config.c:80
-msgid "value is a path (file or directory name)"
+#: builtin/clone.c:697
+msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr ""
-#: builtin/config.c:81
-msgid "Other"
+#: builtin/clone.c:728
+msgid "unable to checkout working tree"
msgstr ""
-#: builtin/config.c:82
-msgid "terminate values with NUL byte"
+#: builtin/clone.c:768
+msgid "unable to write parameters to config file"
msgstr ""
-#: builtin/config.c:83
-msgid "show variable names only"
+#: builtin/clone.c:831
+msgid "cannot repack to clean up"
msgstr ""
-#: builtin/config.c:84
-msgid "respect include directives on lookup"
+#: builtin/clone.c:833
+msgid "cannot unlink temporary alternates file"
msgstr ""
-#: builtin/config.c:85
-msgid "show origin of config (file, standard input, blob, command line)"
+#: builtin/clone.c:866 builtin/receive-pack.c:1895
+msgid "Too many arguments."
msgstr ""
-#: builtin/config.c:327
-msgid "unable to parse default color value"
+#: builtin/clone.c:870
+msgid "You must specify a repository to clone."
msgstr ""
-#: builtin/config.c:471
+#: builtin/clone.c:883
#, c-format
-msgid ""
-"# This is Git's per-user configuration file.\n"
-"[user]\n"
-"# Please adapt and uncomment the following lines:\n"
-"#\tname = %s\n"
-"#\temail = %s\n"
+msgid "--bare and --origin %s options are incompatible."
msgstr ""
-#: builtin/config.c:613
-#, c-format
-msgid "cannot create configuration file %s"
+#: builtin/clone.c:886
+msgid "--bare and --separate-git-dir are incompatible."
msgstr ""
-#: builtin/count-objects.c:77
-msgid "git count-objects [-v] [-H | --human-readable]"
+#: builtin/clone.c:899
+#, c-format
+msgid "repository '%s' does not exist"
msgstr ""
-#: builtin/count-objects.c:87
-msgid "print sizes in human readable format"
+#: builtin/clone.c:905 builtin/fetch.c:1335
+#, c-format
+msgid "depth %s is not a positive number"
msgstr ""
-#: builtin/describe.c:17
-msgid "git describe [<options>] [<commit-ish>...]"
+#: builtin/clone.c:915
+#, c-format
+msgid "destination path '%s' already exists and is not an empty directory."
msgstr ""
-#: builtin/describe.c:18
-msgid "git describe [<options>] --dirty"
+#: builtin/clone.c:925
+#, c-format
+msgid "working tree '%s' already exists."
msgstr ""
-#: builtin/describe.c:217
+#: builtin/clone.c:940 builtin/clone.c:951 builtin/difftool.c:252
+#: builtin/submodule--helper.c:659 builtin/worktree.c:222
+#: builtin/worktree.c:249
#, c-format
-msgid "annotated tag %s not available"
+msgid "could not create leading directories of '%s'"
msgstr ""
-#: builtin/describe.c:221
+#: builtin/clone.c:943
#, c-format
-msgid "annotated tag %s has no embedded name"
+msgid "could not create work tree dir '%s'"
msgstr ""
-#: builtin/describe.c:223
+#: builtin/clone.c:955
#, c-format
-msgid "tag '%s' is really '%s' here"
+msgid "Cloning into bare repository '%s'...\n"
msgstr ""
-#: builtin/describe.c:250 builtin/log.c:480
+#: builtin/clone.c:957
#, c-format
-msgid "Not a valid object name %s"
+msgid "Cloning into '%s'...\n"
msgstr ""
-#: builtin/describe.c:253
-#, c-format
-msgid "%s is not a valid '%s' object"
+#: builtin/clone.c:963
+msgid ""
+"clone --recursive is not compatible with both --reference and --reference-if-"
+"able"
msgstr ""
-#: builtin/describe.c:270
-#, c-format
-msgid "no tag exactly matches '%s'"
+#: builtin/clone.c:1019
+msgid "--depth is ignored in local clones; use file:// instead."
msgstr ""
-#: builtin/describe.c:272
-#, c-format
-msgid "searching to describe %s\n"
+#: builtin/clone.c:1021
+msgid "--shallow-since is ignored in local clones; use file:// instead."
msgstr ""
-#: builtin/describe.c:319
-#, c-format
-msgid "finished search at %s\n"
+#: builtin/clone.c:1023
+msgid "--shallow-exclude is ignored in local clones; use file:// instead."
msgstr ""
-#: builtin/describe.c:346
-#, c-format
-msgid ""
-"No annotated tags can describe '%s'.\n"
-"However, there were unannotated tags: try --tags."
+#: builtin/clone.c:1026
+msgid "source repository is shallow, ignoring --local"
msgstr ""
-#: builtin/describe.c:350
-#, c-format
-msgid ""
-"No tags can describe '%s'.\n"
-"Try --always, or create some tags."
+#: builtin/clone.c:1031
+msgid "--local is ignored"
msgstr ""
-#: builtin/describe.c:371
+#: builtin/clone.c:1035
#, c-format
-msgid "traversed %lu commits\n"
+msgid "Don't know how to clone %s"
msgstr ""
-#: builtin/describe.c:374
+#: builtin/clone.c:1090 builtin/clone.c:1098
#, c-format
-msgid ""
-"more than %i tags found; listed %i most recent\n"
-"gave up search at %s\n"
+msgid "Remote branch %s not found in upstream %s"
msgstr ""
-#: builtin/describe.c:396
-msgid "find the tag that comes after the commit"
+#: builtin/clone.c:1101
+msgid "You appear to have cloned an empty repository."
msgstr ""
-#: builtin/describe.c:397
-msgid "debug search strategy on stderr"
+#: builtin/column.c:9
+msgid "git column [<options>]"
msgstr ""
-#: builtin/describe.c:398
-msgid "use any ref"
+#: builtin/column.c:26
+msgid "lookup config vars"
msgstr ""
-#: builtin/describe.c:399
-msgid "use any tag, even unannotated"
+#: builtin/column.c:27 builtin/column.c:28
+msgid "layout to use"
msgstr ""
-#: builtin/describe.c:400
-msgid "always use long format"
+#: builtin/column.c:29
+msgid "Maximum width"
msgstr ""
-#: builtin/describe.c:401
-msgid "only follow first parent"
+#: builtin/column.c:30
+msgid "Padding space on left border"
msgstr ""
-#: builtin/describe.c:404
-msgid "only output exact matches"
+#: builtin/column.c:31
+msgid "Padding space on right border"
msgstr ""
-#: builtin/describe.c:406
-msgid "consider <n> most recent tags (default: 10)"
+#: builtin/column.c:32
+msgid "Padding space between columns"
msgstr ""
-#: builtin/describe.c:408
-msgid "only consider tags matching <pattern>"
+#: builtin/column.c:51
+msgid "--command must be the first argument"
msgstr ""
-#: builtin/describe.c:410 builtin/name-rev.c:321
-msgid "show abbreviated commit object as fallback"
+#: builtin/commit.c:38
+msgid "git commit [<options>] [--] <pathspec>..."
msgstr ""
-#: builtin/describe.c:411
-msgid "mark"
+#: builtin/commit.c:43
+msgid "git status [<options>] [--] <pathspec>..."
msgstr ""
-#: builtin/describe.c:412
-msgid "append <mark> on dirty working tree (default: \"-dirty\")"
+#: builtin/commit.c:48
+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/describe.c:430
-msgid "--long is incompatible with --abbrev=0"
+#: builtin/commit.c:61
+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/describe.c:456
-msgid "No names found, cannot describe anything."
+#: builtin/commit.c:73
+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/describe.c:476
-msgid "--dirty is incompatible with commit-ishes"
+#: builtin/commit.c:78
+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/diff.c:86
-#, c-format
-msgid "'%s': not a regular file or symlink"
+#: builtin/commit.c:85
+msgid "Otherwise, please use 'git reset'\n"
msgstr ""
-#: builtin/diff.c:237
-#, c-format
-msgid "invalid option: %s"
+#: builtin/commit.c:88
+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/diff.c:360
-msgid "Not a git repository"
+#: builtin/commit.c:318
+msgid "failed to unpack HEAD tree object"
msgstr ""
-#: builtin/diff.c:403
-#, c-format
-msgid "invalid object '%s' given."
+#: builtin/commit.c:359
+msgid "unable to create temporary index"
msgstr ""
-#: builtin/diff.c:412
-#, c-format
-msgid "more than two blobs given: '%s'"
+#: builtin/commit.c:365
+msgid "interactive add failed"
msgstr ""
-#: builtin/diff.c:419
-#, c-format
-msgid "unhandled object '%s' given."
+#: builtin/commit.c:378
+msgid "unable to update temporary index"
msgstr ""
-#: builtin/fast-export.c:25
-msgid "git fast-export [rev-list-opts]"
+#: builtin/commit.c:380
+msgid "Failed to update main cache tree"
msgstr ""
-#: builtin/fast-export.c:980
-msgid "show progress after <n> objects"
+#: builtin/commit.c:404 builtin/commit.c:427 builtin/commit.c:476
+msgid "unable to write new_index file"
msgstr ""
-#: builtin/fast-export.c:982
-msgid "select handling of signed tags"
+#: builtin/commit.c:458
+msgid "cannot do a partial commit during a merge."
msgstr ""
-#: builtin/fast-export.c:985
-msgid "select handling of tags that tag filtered objects"
+#: builtin/commit.c:460
+msgid "cannot do a partial commit during a cherry-pick."
msgstr ""
-#: builtin/fast-export.c:988
-msgid "Dump marks to this file"
+#: builtin/commit.c:469
+msgid "cannot read the index"
msgstr ""
-#: builtin/fast-export.c:990
-msgid "Import marks from this file"
+#: builtin/commit.c:488
+msgid "unable to write temporary index file"
msgstr ""
-#: builtin/fast-export.c:992
-msgid "Fake a tagger when tags lack one"
+#: builtin/commit.c:582
+#, c-format
+msgid "commit '%s' lacks author header"
msgstr ""
-#: builtin/fast-export.c:994
-msgid "Output full tree for each commit"
+#: builtin/commit.c:584
+#, c-format
+msgid "commit '%s' has malformed author line"
msgstr ""
-#: builtin/fast-export.c:996
-msgid "Use the done feature to terminate the stream"
+#: builtin/commit.c:603
+msgid "malformed --author parameter"
msgstr ""
-#: builtin/fast-export.c:997
-msgid "Skip output of blob data"
+#: builtin/commit.c:611
+#, c-format
+msgid "invalid date format: %s"
msgstr ""
-#: builtin/fast-export.c:998
-msgid "refspec"
+#: builtin/commit.c:655
+msgid ""
+"unable to select a comment character that is not used\n"
+"in the current commit message"
msgstr ""
-#: builtin/fast-export.c:999
-msgid "Apply refspec to exported refs"
+#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1096
+#, c-format
+msgid "could not lookup commit %s"
msgstr ""
-#: builtin/fast-export.c:1000
-msgid "anonymize output"
+#: builtin/commit.c:704 builtin/shortlog.c:295
+#, c-format
+msgid "(reading log message from standard input)\n"
msgstr ""
-#: builtin/fetch.c:21
-msgid "git fetch [<options>] [<repository> [<refspec>...]]"
+#: builtin/commit.c:706
+msgid "could not read log from standard input"
msgstr ""
-#: builtin/fetch.c:22
-msgid "git fetch [<options>] <group>"
+#: builtin/commit.c:710
+#, c-format
+msgid "could not read log file '%s'"
msgstr ""
-#: builtin/fetch.c:23
-msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
+#: builtin/commit.c:737 builtin/commit.c:745
+msgid "could not read SQUASH_MSG"
msgstr ""
-#: builtin/fetch.c:24
-msgid "git fetch --all [<options>]"
+#: builtin/commit.c:742
+msgid "could not read MERGE_MSG"
msgstr ""
-#: builtin/fetch.c:93 builtin/pull.c:174
-msgid "fetch from all remotes"
+#: builtin/commit.c:796
+msgid "could not write commit template"
msgstr ""
-#: builtin/fetch.c:95 builtin/pull.c:177
-msgid "append to .git/FETCH_HEAD instead of overwriting"
+#: builtin/commit.c:814
+#, 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/fetch.c:97 builtin/pull.c:180
-msgid "path to upload pack on remote end"
+#: builtin/commit.c:819
+#, 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/fetch.c:98 builtin/pull.c:182
-msgid "force overwrite of local branch"
+#: builtin/commit.c:832
+#, 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/fetch.c:100
-msgid "fetch from multiple remotes"
+#: builtin/commit.c:839
+#, 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/fetch.c:102 builtin/pull.c:184
-msgid "fetch all tags and associated objects"
+#: builtin/commit.c:859
+#, c-format
+msgid "%sAuthor: %.*s <%.*s>"
msgstr ""
-#: builtin/fetch.c:104
-msgid "do not fetch all tags (--no-tags)"
+#: builtin/commit.c:867
+#, c-format
+msgid "%sDate: %s"
msgstr ""
-#: builtin/fetch.c:106
-msgid "number of submodules fetched in parallel"
+#: builtin/commit.c:874
+#, c-format
+msgid "%sCommitter: %.*s <%.*s>"
msgstr ""
-#: builtin/fetch.c:108 builtin/pull.c:187
-msgid "prune remote-tracking branches no longer on remote"
+#: builtin/commit.c:892
+msgid "Cannot read index"
msgstr ""
-#: builtin/fetch.c:109 builtin/pull.c:190
-msgid "on-demand"
+#: builtin/commit.c:954
+msgid "Error building trees"
msgstr ""
-#: builtin/fetch.c:110 builtin/pull.c:191
-msgid "control recursive fetching of submodules"
+#: builtin/commit.c:968 builtin/tag.c:280
+#, c-format
+msgid "Please supply the message using either -m or -F option.\n"
msgstr ""
-#: builtin/fetch.c:114 builtin/pull.c:199
-msgid "keep downloaded pack"
+#: builtin/commit.c:1071
+#, c-format
+msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr ""
-#: builtin/fetch.c:116
-msgid "allow updating of HEAD ref"
+#: builtin/commit.c:1086 builtin/commit.c:1325
+#, c-format
+msgid "Invalid untracked files mode '%s'"
msgstr ""
-#: builtin/fetch.c:119 builtin/pull.c:202
-msgid "deepen history of shallow clone"
+#: builtin/commit.c:1124
+msgid "--long and -z are incompatible"
msgstr ""
-#: builtin/fetch.c:121 builtin/pull.c:205
-msgid "convert to a complete repository"
+#: builtin/commit.c:1154
+msgid "Using both --reset-author and --author does not make sense"
msgstr ""
-#: builtin/fetch.c:123 builtin/log.c:1426
-msgid "dir"
+#: builtin/commit.c:1163
+msgid "You have nothing to amend."
msgstr ""
-#: builtin/fetch.c:124
-msgid "prepend this to submodule path output"
+#: builtin/commit.c:1166
+msgid "You are in the middle of a merge -- cannot amend."
msgstr ""
-#: builtin/fetch.c:127
-msgid "default mode for recursion"
+#: builtin/commit.c:1168
+msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr ""
-#: builtin/fetch.c:129 builtin/pull.c:208
-msgid "accept refs that update .git/shallow"
+#: builtin/commit.c:1171
+msgid "Options --squash and --fixup cannot be used together"
msgstr ""
-#: builtin/fetch.c:130 builtin/pull.c:210
-msgid "refmap"
+#: builtin/commit.c:1181
+msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr ""
-#: builtin/fetch.c:131 builtin/pull.c:211
-msgid "specify fetch refmap"
+#: builtin/commit.c:1183
+msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
msgstr ""
-#: builtin/fetch.c:387
-msgid "Couldn't find remote ref HEAD"
+#: builtin/commit.c:1191
+msgid "--reset-author can be used only with -C, -c or --amend."
msgstr ""
-#: builtin/fetch.c:503
-#, c-format
-msgid "configuration fetch.output contains invalid value %s"
+#: builtin/commit.c:1208
+msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr ""
-#: builtin/fetch.c:592
-#, c-format
-msgid "object %s not found"
+#: builtin/commit.c:1210
+msgid "No paths with --include/--only does not make sense."
msgstr ""
-#: builtin/fetch.c:596
-msgid "[up to date]"
+#: builtin/commit.c:1212
+msgid "Explicit paths specified without -i or -o; assuming --only paths..."
msgstr ""
-#: builtin/fetch.c:609 builtin/fetch.c:689
-msgid "[rejected]"
+#: builtin/commit.c:1224 builtin/tag.c:495
+#, c-format
+msgid "Invalid cleanup mode %s"
msgstr ""
-#: builtin/fetch.c:610
-msgid "can't fetch in current branch"
+#: builtin/commit.c:1229
+msgid "Paths with -a does not make sense."
msgstr ""
-#: builtin/fetch.c:619
-msgid "[tag update]"
+#: builtin/commit.c:1339 builtin/commit.c:1612
+msgid "show status concisely"
msgstr ""
-#: builtin/fetch.c:620 builtin/fetch.c:653 builtin/fetch.c:669
-#: builtin/fetch.c:684
-msgid "unable to update local ref"
+#: builtin/commit.c:1341 builtin/commit.c:1614
+msgid "show branch information"
msgstr ""
-#: builtin/fetch.c:639
-msgid "[new tag]"
+#: builtin/commit.c:1343
+msgid "version"
msgstr ""
-#: builtin/fetch.c:642
-msgid "[new branch]"
+#: builtin/commit.c:1343 builtin/commit.c:1616 builtin/push.c:525
+#: builtin/worktree.c:442
+msgid "machine-readable output"
msgstr ""
-#: builtin/fetch.c:645
-msgid "[new ref]"
+#: builtin/commit.c:1346 builtin/commit.c:1618
+msgid "show status in long format (default)"
msgstr ""
-#: builtin/fetch.c:684
-msgid "forced update"
+#: builtin/commit.c:1349 builtin/commit.c:1621
+msgid "terminate entries with NUL"
msgstr ""
-#: builtin/fetch.c:689
-msgid "non-fast-forward"
+#: builtin/commit.c:1351 builtin/commit.c:1624 builtin/fast-export.c:981
+#: builtin/fast-export.c:984 builtin/tag.c:368
+msgid "mode"
msgstr ""
-#: builtin/fetch.c:733
-#, c-format
-msgid "%s did not send all necessary objects\n"
+#: builtin/commit.c:1352 builtin/commit.c:1624
+msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr ""
-#: builtin/fetch.c:753
-#, c-format
-msgid "reject %s because shallow roots are not allowed to be updated"
+#: builtin/commit.c:1355
+msgid "show ignored files"
msgstr ""
-#: builtin/fetch.c:839 builtin/fetch.c:934
-#, c-format
-msgid "From %.*s\n"
+#: builtin/commit.c:1356 parse-options.h:155
+msgid "when"
msgstr ""
-#: builtin/fetch.c:850
-#, c-format
+#: builtin/commit.c:1357
msgid ""
-"some local refs could not be updated; try running\n"
-" 'git remote prune %s' to remove any old, conflicting branches"
+"ignore changes to submodules, optional when: all, dirty, untracked. "
+"(Default: all)"
msgstr ""
-#: builtin/fetch.c:904
-#, c-format
-msgid " (%s will become dangling)"
+#: builtin/commit.c:1359
+msgid "list untracked files in columns"
msgstr ""
-#: builtin/fetch.c:905
-#, c-format
-msgid " (%s has become dangling)"
+#: builtin/commit.c:1435
+msgid "couldn't look up newly created commit"
msgstr ""
-#: builtin/fetch.c:937
-msgid "[deleted]"
+#: builtin/commit.c:1437
+msgid "could not parse newly created commit"
msgstr ""
-#: builtin/fetch.c:938 builtin/remote.c:1020
-msgid "(none)"
+#: builtin/commit.c:1482
+msgid "detached HEAD"
msgstr ""
-#: builtin/fetch.c:960
-#, c-format
-msgid "Refusing to fetch into current branch %s of non-bare repository"
+#: builtin/commit.c:1485
+msgid " (root-commit)"
msgstr ""
-#: builtin/fetch.c:979
-#, c-format
-msgid "Option \"%s\" value \"%s\" is not valid for %s"
+#: builtin/commit.c:1582
+msgid "suppress summary after successful commit"
msgstr ""
-#: builtin/fetch.c:982
-#, c-format
-msgid "Option \"%s\" is ignored for %s\n"
+#: builtin/commit.c:1583
+msgid "show diff in commit message template"
msgstr ""
-#: builtin/fetch.c:1039
-#, c-format
-msgid "Don't know how to fetch from %s"
+#: builtin/commit.c:1585
+msgid "Commit message options"
msgstr ""
-#: builtin/fetch.c:1199
-#, c-format
-msgid "Fetching %s\n"
+#: builtin/commit.c:1586 builtin/tag.c:366
+msgid "read message from file"
msgstr ""
-#: builtin/fetch.c:1201 builtin/remote.c:96
-#, c-format
-msgid "Could not fetch %s"
+#: builtin/commit.c:1587
+msgid "author"
msgstr ""
-#: builtin/fetch.c:1219
-msgid ""
-"No remote repository specified. Please, specify either a URL or a\n"
-"remote name from which new revisions should be fetched."
+#: builtin/commit.c:1587
+msgid "override author for commit"
msgstr ""
-#: builtin/fetch.c:1242
-msgid "You need to specify a tag name."
+#: builtin/commit.c:1588 builtin/gc.c:333
+msgid "date"
msgstr ""
-#: builtin/fetch.c:1284
-msgid "--depth and --unshallow cannot be used together"
+#: builtin/commit.c:1588
+msgid "override date for commit"
msgstr ""
-#: builtin/fetch.c:1286
-msgid "--unshallow on a complete repository does not make sense"
+#: builtin/commit.c:1589 builtin/merge.c:222 builtin/notes.c:398
+#: builtin/notes.c:561 builtin/tag.c:364
+msgid "message"
msgstr ""
-#: builtin/fetch.c:1306
-msgid "fetch --all does not take a repository argument"
+#: builtin/commit.c:1589
+msgid "commit message"
msgstr ""
-#: builtin/fetch.c:1308
-msgid "fetch --all does not make sense with refspecs"
+#: builtin/commit.c:1590 builtin/commit.c:1591 builtin/commit.c:1592
+#: builtin/commit.c:1593 parse-options.h:257 ref-filter.h:81
+msgid "commit"
msgstr ""
-#: builtin/fetch.c:1319
-#, c-format
-msgid "No such remote or remote group: %s"
+#: builtin/commit.c:1590
+msgid "reuse and edit message from specified commit"
msgstr ""
-#: builtin/fetch.c:1327
-msgid "Fetching a group and specifying refspecs does not make sense"
+#: builtin/commit.c:1591
+msgid "reuse message from specified commit"
msgstr ""
-#: builtin/fmt-merge-msg.c:14
-msgid ""
-"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
+#: builtin/commit.c:1592
+msgid "use autosquash formatted message to fixup specified commit"
msgstr ""
-#: builtin/fmt-merge-msg.c:667
-msgid "populate log with at most <n> entries from shortlog"
+#: builtin/commit.c:1593
+msgid "use autosquash formatted message to squash specified commit"
msgstr ""
-#: builtin/fmt-merge-msg.c:670
-msgid "alias for --log (deprecated)"
+#: builtin/commit.c:1594
+msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr ""
-#: builtin/fmt-merge-msg.c:673
-msgid "text"
+#: builtin/commit.c:1595 builtin/log.c:1413 builtin/revert.c:86
+msgid "add Signed-off-by:"
msgstr ""
-#: builtin/fmt-merge-msg.c:674
-msgid "use <text> as start of message"
+#: builtin/commit.c:1596
+msgid "use specified template file"
msgstr ""
-#: builtin/fmt-merge-msg.c:675
-msgid "file to read from"
+#: builtin/commit.c:1597
+msgid "force edit of commit"
msgstr ""
-#: builtin/for-each-ref.c:9
-msgid "git for-each-ref [<options>] [<pattern>]"
+#: builtin/commit.c:1598
+msgid "default"
msgstr ""
-#: builtin/for-each-ref.c:10
-msgid "git for-each-ref [--points-at <object>]"
+#: builtin/commit.c:1598 builtin/tag.c:369
+msgid "how to strip spaces and #comments from message"
msgstr ""
-#: builtin/for-each-ref.c:11
-msgid "git for-each-ref [(--merged | --no-merged) [<object>]]"
+#: builtin/commit.c:1599
+msgid "include status in commit message template"
msgstr ""
-#: builtin/for-each-ref.c:12
-msgid "git for-each-ref [--contains [<object>]]"
+#: builtin/commit.c:1601 builtin/merge.c:234 builtin/pull.c:166
+#: builtin/revert.c:93
+msgid "GPG sign commit"
msgstr ""
-#: builtin/for-each-ref.c:27
-msgid "quote placeholders suitably for shells"
+#: builtin/commit.c:1604
+msgid "Commit contents options"
msgstr ""
-#: builtin/for-each-ref.c:29
-msgid "quote placeholders suitably for perl"
+#: builtin/commit.c:1605
+msgid "commit all changed files"
msgstr ""
-#: builtin/for-each-ref.c:31
-msgid "quote placeholders suitably for python"
+#: builtin/commit.c:1606
+msgid "add specified files to index for commit"
msgstr ""
-#: builtin/for-each-ref.c:33
-msgid "quote placeholders suitably for Tcl"
+#: builtin/commit.c:1607
+msgid "interactively add files"
msgstr ""
-#: builtin/for-each-ref.c:36
-msgid "show only <n> matched refs"
+#: builtin/commit.c:1608
+msgid "interactively add changes"
msgstr ""
-#: builtin/for-each-ref.c:37 builtin/tag.c:372
-msgid "format to use for the output"
+#: builtin/commit.c:1609
+msgid "commit only specified files"
msgstr ""
-#: builtin/for-each-ref.c:41
-msgid "print only refs which points at the given object"
+#: builtin/commit.c:1610
+msgid "bypass pre-commit and commit-msg hooks"
msgstr ""
-#: builtin/for-each-ref.c:43
-msgid "print only refs that are merged"
+#: builtin/commit.c:1611
+msgid "show what would be committed"
msgstr ""
-#: builtin/for-each-ref.c:44
-msgid "print only refs that are not merged"
+#: builtin/commit.c:1622
+msgid "amend previous commit"
msgstr ""
-#: builtin/for-each-ref.c:45
-msgid "print only refs which contain the commit"
+#: builtin/commit.c:1623
+msgid "bypass post-rewrite hook"
msgstr ""
-#: builtin/fsck.c:519
-msgid "Checking object directories"
+#: builtin/commit.c:1628
+msgid "ok to record an empty change"
msgstr ""
-#: builtin/fsck.c:588
-msgid "git fsck [<options>] [<object>...]"
+#: builtin/commit.c:1630
+msgid "ok to record a change with an empty message"
msgstr ""
-#: builtin/fsck.c:594
-msgid "show unreachable objects"
+#: builtin/commit.c:1659
+msgid "could not parse HEAD commit"
msgstr ""
-#: builtin/fsck.c:595
-msgid "show dangling objects"
+#: builtin/commit.c:1707
+#, c-format
+msgid "Corrupt MERGE_HEAD file (%s)"
msgstr ""
-#: builtin/fsck.c:596
-msgid "report tags"
+#: builtin/commit.c:1714
+msgid "could not read MERGE_MODE"
msgstr ""
-#: builtin/fsck.c:597
-msgid "report root nodes"
+#: builtin/commit.c:1733
+#, c-format
+msgid "could not read commit message: %s"
msgstr ""
-#: builtin/fsck.c:598
-msgid "make index objects head nodes"
+#: builtin/commit.c:1744
+#, c-format
+msgid "Aborting commit; you did not edit the message.\n"
msgstr ""
-#: builtin/fsck.c:599
-msgid "make reflogs head nodes (default)"
+#: builtin/commit.c:1749
+#, c-format
+msgid "Aborting commit due to empty commit message.\n"
msgstr ""
-#: builtin/fsck.c:600
-msgid "also consider packs and alternate objects"
+#: builtin/commit.c:1797
+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/fsck.c:601
-msgid "check only connectivity"
+#: builtin/config.c:9
+msgid "git config [<options>]"
msgstr ""
-#: builtin/fsck.c:602
-msgid "enable more strict checking"
+#: builtin/config.c:55
+msgid "Config file location"
msgstr ""
-#: builtin/fsck.c:604
-msgid "write dangling objects in .git/lost-found"
+#: builtin/config.c:56
+msgid "use global config file"
msgstr ""
-#: builtin/fsck.c:605 builtin/prune.c:107
-msgid "show progress"
+#: builtin/config.c:57
+msgid "use system config file"
msgstr ""
-#: builtin/fsck.c:606
-msgid "show verbose names for reachable objects"
+#: builtin/config.c:58
+msgid "use repository config file"
msgstr ""
-#: builtin/fsck.c:671
-msgid "Checking objects"
+#: builtin/config.c:59
+msgid "use given config file"
msgstr ""
-#: builtin/gc.c:25
-msgid "git gc [<options>]"
+#: builtin/config.c:60
+msgid "blob-id"
msgstr ""
-#: builtin/gc.c:72
-#, c-format
-msgid "Invalid %s: '%s'"
+#: builtin/config.c:60
+msgid "read config from given blob object"
msgstr ""
-#: builtin/gc.c:139
-#, c-format
-msgid "insanely long object directory %.*s"
+#: builtin/config.c:61
+msgid "Action"
msgstr ""
-#: builtin/gc.c:290
-#, c-format
-msgid ""
-"The last gc run reported the following. Please correct the root cause\n"
-"and remove %s.\n"
-"Automatic cleanup will not be performed until the file is removed.\n"
-"\n"
-"%s"
+#: builtin/config.c:62
+msgid "get value: name [value-regex]"
msgstr ""
-#: builtin/gc.c:327
-msgid "prune unreferenced objects"
+#: builtin/config.c:63
+msgid "get all values: key [value-regex]"
msgstr ""
-#: builtin/gc.c:329
-msgid "be more thorough (increased runtime)"
+#: builtin/config.c:64
+msgid "get values for regexp: name-regex [value-regex]"
msgstr ""
-#: builtin/gc.c:330
-msgid "enable auto-gc mode"
+#: builtin/config.c:65
+msgid "get value specific for the URL: section[.var] URL"
msgstr ""
-#: builtin/gc.c:331
-msgid "force running gc even if there may be another gc running"
+#: builtin/config.c:66
+msgid "replace all matching variables: name value [value_regex]"
msgstr ""
-#: builtin/gc.c:373
-#, c-format
-msgid "Auto packing the repository in background for optimum performance.\n"
+#: builtin/config.c:67
+msgid "add a new variable: name value"
msgstr ""
-#: builtin/gc.c:375
-#, c-format
-msgid "Auto packing the repository for optimum performance.\n"
+#: builtin/config.c:68
+msgid "remove a variable: name [value-regex]"
msgstr ""
-#: builtin/gc.c:376
-#, c-format
-msgid "See \"git help gc\" for manual housekeeping.\n"
+#: builtin/config.c:69
+msgid "remove all matches: name [value-regex]"
msgstr ""
-#: builtin/gc.c:397
-#, c-format
-msgid ""
-"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
+#: builtin/config.c:70
+msgid "rename section: old-name new-name"
msgstr ""
-#: builtin/gc.c:441
-msgid ""
-"There are too many unreachable loose objects; run 'git prune' to remove them."
+#: builtin/config.c:71
+msgid "remove a section: name"
msgstr ""
-#: builtin/grep.c:23
-msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
+#: builtin/config.c:72
+msgid "list all"
msgstr ""
-#: builtin/grep.c:219
-#, c-format
-msgid "grep: failed to create thread: %s"
+#: builtin/config.c:73
+msgid "open an editor"
msgstr ""
-#: builtin/grep.c:277
-#, c-format
-msgid "invalid number of threads specified (%d) for %s"
+#: builtin/config.c:74
+msgid "find the color configured: slot [default]"
msgstr ""
-#: builtin/grep.c:452 builtin/grep.c:487
-#, c-format
-msgid "unable to read tree (%s)"
+#: builtin/config.c:75
+msgid "find the color setting: slot [stdout-is-tty]"
msgstr ""
-#: builtin/grep.c:502
-#, c-format
-msgid "unable to grep from object of type %s"
+#: builtin/config.c:76
+msgid "Type"
msgstr ""
-#: builtin/grep.c:560
-#, c-format
-msgid "switch `%c' expects a numerical value"
+#: builtin/config.c:77
+msgid "value is \"true\" or \"false\""
msgstr ""
-#: builtin/grep.c:577
-#, c-format
-msgid "cannot open '%s'"
+#: builtin/config.c:78
+msgid "value is decimal number"
msgstr ""
-#: builtin/grep.c:646
-msgid "search in index instead of in the work tree"
+#: builtin/config.c:79
+msgid "value is --bool or --int"
msgstr ""
-#: builtin/grep.c:648
-msgid "find in contents not managed by git"
+#: builtin/config.c:80
+msgid "value is a path (file or directory name)"
msgstr ""
-#: builtin/grep.c:650
-msgid "search in both tracked and untracked files"
-msgstr ""
-
-#: builtin/grep.c:652
-msgid "ignore files specified via '.gitignore'"
+#: builtin/config.c:81
+msgid "Other"
msgstr ""
-#: builtin/grep.c:655
-msgid "show non-matching lines"
+#: builtin/config.c:82
+msgid "terminate values with NUL byte"
msgstr ""
-#: builtin/grep.c:657
-msgid "case insensitive matching"
+#: builtin/config.c:83
+msgid "show variable names only"
msgstr ""
-#: builtin/grep.c:659
-msgid "match patterns only at word boundaries"
+#: builtin/config.c:84
+msgid "respect include directives on lookup"
msgstr ""
-#: builtin/grep.c:661
-msgid "process binary files as text"
+#: builtin/config.c:85
+msgid "show origin of config (file, standard input, blob, command line)"
msgstr ""
-#: builtin/grep.c:663
-msgid "don't match patterns in binary files"
+#: builtin/config.c:327
+msgid "unable to parse default color value"
msgstr ""
-#: builtin/grep.c:666
-msgid "process binary files with textconv filters"
+#: builtin/config.c:471
+#, c-format
+msgid ""
+"# This is Git's per-user configuration file.\n"
+"[user]\n"
+"# Please adapt and uncomment the following lines:\n"
+"#\tname = %s\n"
+"#\temail = %s\n"
msgstr ""
-#: builtin/grep.c:668
-msgid "descend at most <depth> levels"
+#: builtin/config.c:613
+#, c-format
+msgid "cannot create configuration file %s"
msgstr ""
-#: builtin/grep.c:672
-msgid "use extended POSIX regular expressions"
+#: builtin/config.c:625
+#, c-format
+msgid ""
+"cannot overwrite multiple values with a single value\n"
+" Use a regexp, --add or --replace-all to change %s."
msgstr ""
-#: builtin/grep.c:675
-msgid "use basic POSIX regular expressions (default)"
+#: builtin/count-objects.c:86
+msgid "git count-objects [-v] [-H | --human-readable]"
msgstr ""
-#: builtin/grep.c:678
-msgid "interpret patterns as fixed strings"
+#: builtin/count-objects.c:96
+msgid "print sizes in human readable format"
msgstr ""
-#: builtin/grep.c:681
-msgid "use Perl-compatible regular expressions"
+#: builtin/describe.c:17
+msgid "git describe [<options>] [<commit-ish>...]"
msgstr ""
-#: builtin/grep.c:684
-msgid "show line numbers"
+#: builtin/describe.c:18
+msgid "git describe [<options>] --dirty"
msgstr ""
-#: builtin/grep.c:685
-msgid "don't show filenames"
+#: builtin/describe.c:217
+#, c-format
+msgid "annotated tag %s not available"
msgstr ""
-#: builtin/grep.c:686
-msgid "show filenames"
+#: builtin/describe.c:221
+#, c-format
+msgid "annotated tag %s has no embedded name"
msgstr ""
-#: builtin/grep.c:688
-msgid "show filenames relative to top directory"
+#: builtin/describe.c:223
+#, c-format
+msgid "tag '%s' is really '%s' here"
msgstr ""
-#: builtin/grep.c:690
-msgid "show only filenames instead of matching lines"
+#: builtin/describe.c:250 builtin/log.c:480
+#, c-format
+msgid "Not a valid object name %s"
msgstr ""
-#: builtin/grep.c:692
-msgid "synonym for --files-with-matches"
+#: builtin/describe.c:253
+#, c-format
+msgid "%s is not a valid '%s' object"
msgstr ""
-#: builtin/grep.c:695
-msgid "show only the names of files without match"
+#: builtin/describe.c:270
+#, c-format
+msgid "no tag exactly matches '%s'"
msgstr ""
-#: builtin/grep.c:697
-msgid "print NUL after filenames"
+#: builtin/describe.c:272
+#, c-format
+msgid "searching to describe %s\n"
msgstr ""
-#: builtin/grep.c:699
-msgid "show the number of matches instead of matching lines"
+#: builtin/describe.c:319
+#, c-format
+msgid "finished search at %s\n"
msgstr ""
-#: builtin/grep.c:700
-msgid "highlight matches"
+#: builtin/describe.c:346
+#, c-format
+msgid ""
+"No annotated tags can describe '%s'.\n"
+"However, there were unannotated tags: try --tags."
msgstr ""
-#: builtin/grep.c:702
-msgid "print empty line between matches from different files"
+#: builtin/describe.c:350
+#, c-format
+msgid ""
+"No tags can describe '%s'.\n"
+"Try --always, or create some tags."
msgstr ""
-#: builtin/grep.c:704
-msgid "show filename only once above matches from same file"
+#: builtin/describe.c:371
+#, c-format
+msgid "traversed %lu commits\n"
msgstr ""
-#: builtin/grep.c:707
-msgid "show <n> context lines before and after matches"
+#: 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/grep.c:710
-msgid "show <n> context lines before matches"
+#: builtin/describe.c:396
+msgid "find the tag that comes after the commit"
msgstr ""
-#: builtin/grep.c:712
-msgid "show <n> context lines after matches"
+#: builtin/describe.c:397
+msgid "debug search strategy on stderr"
msgstr ""
-#: builtin/grep.c:714
-msgid "use <n> worker threads"
+#: builtin/describe.c:398
+msgid "use any ref"
msgstr ""
-#: builtin/grep.c:715
-msgid "shortcut for -C NUM"
+#: builtin/describe.c:399
+msgid "use any tag, even unannotated"
msgstr ""
-#: builtin/grep.c:718
-msgid "show a line with the function name before matches"
+#: builtin/describe.c:400
+msgid "always use long format"
msgstr ""
-#: builtin/grep.c:720
-msgid "show the surrounding function"
+#: builtin/describe.c:401
+msgid "only follow first parent"
msgstr ""
-#: builtin/grep.c:723
-msgid "read patterns from file"
+#: builtin/describe.c:404
+msgid "only output exact matches"
msgstr ""
-#: builtin/grep.c:725
-msgid "match <pattern>"
+#: builtin/describe.c:406
+msgid "consider <n> most recent tags (default: 10)"
msgstr ""
-#: builtin/grep.c:727
-msgid "combine patterns specified with -e"
+#: builtin/describe.c:408
+msgid "only consider tags matching <pattern>"
msgstr ""
-#: builtin/grep.c:739
-msgid "indicate hit with exit status without output"
+#: builtin/describe.c:410 builtin/name-rev.c:320
+msgid "show abbreviated commit object as fallback"
msgstr ""
-#: builtin/grep.c:741
-msgid "show only matches from files that match all patterns"
+#: builtin/describe.c:411
+msgid "mark"
msgstr ""
-#: builtin/grep.c:743
-msgid "show parse tree for grep expression"
+#: builtin/describe.c:412
+msgid "append <mark> on dirty working tree (default: \"-dirty\")"
msgstr ""
-#: builtin/grep.c:747
-msgid "pager"
+#: builtin/describe.c:430
+msgid "--long is incompatible with --abbrev=0"
msgstr ""
-#: builtin/grep.c:747
-msgid "show matching files in the pager"
+#: builtin/describe.c:456
+msgid "No names found, cannot describe anything."
msgstr ""
-#: builtin/grep.c:750
-msgid "allow calling of grep(1) (ignored by this build)"
+#: builtin/describe.c:476
+msgid "--dirty is incompatible with commit-ishes"
msgstr ""
-#: builtin/grep.c:813
-msgid "no pattern given."
+#: builtin/diff.c:83
+#, c-format
+msgid "'%s': not a regular file or symlink"
msgstr ""
-#: builtin/grep.c:845 builtin/index-pack.c:1479
+#: builtin/diff.c:234
#, c-format
-msgid "invalid number of threads specified (%d)"
+msgid "invalid option: %s"
msgstr ""
-#: builtin/grep.c:875
-msgid "--open-files-in-pager only works on the worktree"
+#: builtin/diff.c:358
+msgid "Not a git repository"
msgstr ""
-#: builtin/grep.c:901
-msgid "--cached or --untracked cannot be used with --no-index."
+#: builtin/diff.c:401
+#, c-format
+msgid "invalid object '%s' given."
msgstr ""
-#: builtin/grep.c:906
-msgid "--no-index or --untracked cannot be used with revs."
+#: builtin/diff.c:410
+#, c-format
+msgid "more than two blobs given: '%s'"
msgstr ""
-#: builtin/grep.c:909
-msgid "--[no-]exclude-standard cannot be used for tracked contents."
+#: builtin/diff.c:417
+#, c-format
+msgid "unhandled object '%s' given."
msgstr ""
-#: builtin/grep.c:917
-msgid "both --cached and trees are given."
+#: builtin/difftool.c:28
+msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
msgstr ""
-#: builtin/hash-object.c:81
-msgid ""
-"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
-"[--] <file>..."
+#: builtin/difftool.c:241
+#, c-format
+msgid "failed: %d"
msgstr ""
-#: builtin/hash-object.c:82
-msgid "git hash-object --stdin-paths"
+#: builtin/difftool.c:342
+msgid ""
+"combined diff formats('-c' and '--cc') are not supported in\n"
+"directory diff mode('-d' and '--dir-diff')."
msgstr ""
-#: builtin/hash-object.c:93
-msgid "type"
+#: builtin/difftool.c:567
+#, c-format
+msgid "both files modified: '%s' and '%s'."
msgstr ""
-#: builtin/hash-object.c:93
-msgid "object type"
+#: builtin/difftool.c:569
+msgid "working tree file has been left."
msgstr ""
-#: builtin/hash-object.c:94
-msgid "write the object into the object database"
+#: builtin/difftool.c:580
+#, c-format
+msgid "temporary files exist in '%s'."
msgstr ""
-#: builtin/hash-object.c:96
-msgid "read the object from stdin"
+#: builtin/difftool.c:581
+msgid "you may want to cleanup or recover these."
msgstr ""
-#: builtin/hash-object.c:98
-msgid "store file as is without filters"
+#: builtin/difftool.c:626
+msgid "use `diff.guitool` instead of `diff.tool`"
msgstr ""
-#: builtin/hash-object.c:99
-msgid ""
-"just hash any random garbage to create corrupt objects for debugging Git"
+#: builtin/difftool.c:628
+msgid "perform a full-directory diff"
msgstr ""
-#: builtin/hash-object.c:100
-msgid "process file as it were from this path"
+#: builtin/difftool.c:630
+msgid "do not prompt before launching a diff tool"
msgstr ""
-#: builtin/help.c:41
-msgid "print all available commands"
+#: builtin/difftool.c:636
+msgid "use symlinks in dir-diff mode"
msgstr ""
-#: builtin/help.c:42
-msgid "print list of useful guides"
+#: builtin/difftool.c:637
+msgid "<tool>"
msgstr ""
-#: builtin/help.c:43
-msgid "show man page"
+#: builtin/difftool.c:638
+msgid "use the specified diff tool"
msgstr ""
-#: builtin/help.c:44
-msgid "show manual in web browser"
+#: builtin/difftool.c:640
+msgid "print a list of diff tools that may be used with `--tool`"
msgstr ""
-#: builtin/help.c:46
-msgid "show info page"
+#: builtin/difftool.c:643
+msgid ""
+"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
+"code"
msgstr ""
-#: builtin/help.c:52
-msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
+#: builtin/difftool.c:645
+msgid "<command>"
msgstr ""
-#: builtin/help.c:64
-#, c-format
-msgid "unrecognized help format '%s'"
+#: builtin/difftool.c:646
+msgid "specify a custom command for viewing diffs"
msgstr ""
-#: builtin/help.c:91
-msgid "Failed to start emacsclient."
+#: builtin/difftool.c:670
+msgid "no <tool> given for --tool=<tool>"
msgstr ""
-#: builtin/help.c:104
-msgid "Failed to parse emacsclient version."
+#: builtin/difftool.c:677
+msgid "no <cmd> given for --extcmd=<cmd>"
msgstr ""
-#: builtin/help.c:112
-#, c-format
-msgid "emacsclient version '%d' too old (< 22)."
+#: builtin/fast-export.c:25
+msgid "git fast-export [rev-list-opts]"
msgstr ""
-#: builtin/help.c:130 builtin/help.c:151 builtin/help.c:160 builtin/help.c:168
-#, c-format
-msgid "failed to exec '%s'"
+#: builtin/fast-export.c:980
+msgid "show progress after <n> objects"
msgstr ""
-#: builtin/help.c:205
-#, c-format
-msgid ""
-"'%s': path for unsupported man viewer.\n"
-"Please consider using 'man.<tool>.cmd' instead."
+#: builtin/fast-export.c:982
+msgid "select handling of signed tags"
msgstr ""
-#: builtin/help.c:217
-#, c-format
-msgid ""
-"'%s': cmd for supported man viewer.\n"
-"Please consider using 'man.<tool>.path' instead."
+#: builtin/fast-export.c:985
+msgid "select handling of tags that tag filtered objects"
msgstr ""
-#: builtin/help.c:334
-#, c-format
-msgid "'%s': unknown man viewer."
+#: builtin/fast-export.c:988
+msgid "Dump marks to this file"
msgstr ""
-#: builtin/help.c:351
-msgid "no man viewer handled the request"
+#: builtin/fast-export.c:990
+msgid "Import marks from this file"
msgstr ""
-#: builtin/help.c:359
-msgid "no info viewer handled the request"
+#: builtin/fast-export.c:992
+msgid "Fake a tagger when tags lack one"
msgstr ""
-#: builtin/help.c:401
-msgid "Defining attributes per path"
+#: builtin/fast-export.c:994
+msgid "Output full tree for each commit"
msgstr ""
-#: builtin/help.c:402
-msgid "Everyday Git With 20 Commands Or So"
+#: builtin/fast-export.c:996
+msgid "Use the done feature to terminate the stream"
msgstr ""
-#: builtin/help.c:403
-msgid "A Git glossary"
+#: builtin/fast-export.c:997
+msgid "Skip output of blob data"
msgstr ""
-#: builtin/help.c:404
-msgid "Specifies intentionally untracked files to ignore"
+#: builtin/fast-export.c:998
+msgid "refspec"
msgstr ""
-#: builtin/help.c:405
-msgid "Defining submodule properties"
+#: builtin/fast-export.c:999
+msgid "Apply refspec to exported refs"
msgstr ""
-#: builtin/help.c:406
-msgid "Specifying revisions and ranges for Git"
+#: builtin/fast-export.c:1000
+msgid "anonymize output"
msgstr ""
-#: builtin/help.c:407
-msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
+#: builtin/fetch.c:21
+msgid "git fetch [<options>] [<repository> [<refspec>...]]"
msgstr ""
-#: builtin/help.c:408
-msgid "An overview of recommended workflows with Git"
+#: builtin/fetch.c:22
+msgid "git fetch [<options>] <group>"
msgstr ""
-#: builtin/help.c:420
-msgid "The common Git guides are:\n"
+#: builtin/fetch.c:23
+msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
msgstr ""
-#: builtin/help.c:441 builtin/help.c:458
-#, c-format
-msgid "usage: %s%s"
+#: builtin/fetch.c:24
+msgid "git fetch --all [<options>]"
msgstr ""
-#: builtin/help.c:474
-#, c-format
-msgid "`git %s' is aliased to `%s'"
+#: builtin/fetch.c:95 builtin/pull.c:175
+msgid "fetch from all remotes"
msgstr ""
-#: builtin/index-pack.c:153
-#, c-format
-msgid "unable to open %s"
+#: builtin/fetch.c:97 builtin/pull.c:178
+msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr ""
-#: builtin/index-pack.c:203
-#, c-format
-msgid "object type mismatch at %s"
+#: builtin/fetch.c:99 builtin/pull.c:181
+msgid "path to upload pack on remote end"
msgstr ""
-#: builtin/index-pack.c:223
-#, c-format
-msgid "did not receive expected object %s"
+#: builtin/fetch.c:100 builtin/pull.c:183
+msgid "force overwrite of local branch"
msgstr ""
-#: builtin/index-pack.c:226
-#, c-format
-msgid "object %s: expected type %s, found %s"
+#: builtin/fetch.c:102
+msgid "fetch from multiple remotes"
msgstr ""
-#: builtin/index-pack.c:268
-#, c-format
-msgid "cannot fill %d byte"
-msgid_plural "cannot fill %d bytes"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/index-pack.c:278
-msgid "early EOF"
+#: builtin/fetch.c:104 builtin/pull.c:185
+msgid "fetch all tags and associated objects"
msgstr ""
-#: builtin/index-pack.c:279
-msgid "read error on input"
+#: builtin/fetch.c:106
+msgid "do not fetch all tags (--no-tags)"
msgstr ""
-#: builtin/index-pack.c:291
-msgid "used more bytes than were available"
+#: builtin/fetch.c:108
+msgid "number of submodules fetched in parallel"
msgstr ""
-#: builtin/index-pack.c:298
-msgid "pack too large for current definition of off_t"
+#: builtin/fetch.c:110 builtin/pull.c:188
+msgid "prune remote-tracking branches no longer on remote"
msgstr ""
-#: builtin/index-pack.c:314
-#, c-format
-msgid "unable to create '%s'"
+#: builtin/fetch.c:111 builtin/pull.c:191
+msgid "on-demand"
msgstr ""
-#: builtin/index-pack.c:319
-#, c-format
-msgid "cannot open packfile '%s'"
+#: builtin/fetch.c:112 builtin/pull.c:192
+msgid "control recursive fetching of submodules"
msgstr ""
-#: builtin/index-pack.c:333
-msgid "pack signature mismatch"
+#: builtin/fetch.c:116 builtin/pull.c:200
+msgid "keep downloaded pack"
msgstr ""
-#: builtin/index-pack.c:335
-#, c-format
-msgid "pack version %<PRIu32> unsupported"
+#: builtin/fetch.c:118
+msgid "allow updating of HEAD ref"
msgstr ""
-#: builtin/index-pack.c:353
-#, c-format
-msgid "pack has bad object at offset %<PRIuMAX>: %s"
+#: builtin/fetch.c:121 builtin/fetch.c:127 builtin/pull.c:203
+msgid "deepen history of shallow clone"
msgstr ""
-#: builtin/index-pack.c:475
-#, c-format
-msgid "inflate returned %d"
+#: builtin/fetch.c:123
+msgid "deepen history of shallow repository based on time"
msgstr ""
-#: builtin/index-pack.c:524
-msgid "offset value overflow for delta base object"
+#: builtin/fetch.c:129 builtin/pull.c:206
+msgid "convert to a complete repository"
msgstr ""
-#: builtin/index-pack.c:532
-msgid "delta base offset is out of bound"
+#: builtin/fetch.c:131 builtin/log.c:1433
+msgid "dir"
msgstr ""
-#: builtin/index-pack.c:540
-#, c-format
-msgid "unknown object type %d"
+#: builtin/fetch.c:132
+msgid "prepend this to submodule path output"
msgstr ""
-#: builtin/index-pack.c:571
-msgid "cannot pread pack file"
+#: builtin/fetch.c:135
+msgid "default mode for recursion"
msgstr ""
-#: builtin/index-pack.c:573
-#, c-format
-msgid "premature end of pack file, %<PRIuMAX> byte missing"
-msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/index-pack.c:599
-msgid "serious inflate inconsistency"
+#: builtin/fetch.c:137 builtin/pull.c:209
+msgid "accept refs that update .git/shallow"
msgstr ""
-#: builtin/index-pack.c:745 builtin/index-pack.c:751 builtin/index-pack.c:774
-#: builtin/index-pack.c:808 builtin/index-pack.c:817
-#, c-format
-msgid "SHA1 COLLISION FOUND WITH %s !"
+#: builtin/fetch.c:138 builtin/pull.c:211
+msgid "refmap"
msgstr ""
-#: builtin/index-pack.c:748 builtin/pack-objects.c:164
-#: builtin/pack-objects.c:256
-#, c-format
-msgid "unable to read %s"
+#: builtin/fetch.c:139 builtin/pull.c:212
+msgid "specify fetch refmap"
msgstr ""
-#: builtin/index-pack.c:814
-#, c-format
-msgid "cannot read existing object %s"
+#: builtin/fetch.c:395
+msgid "Couldn't find remote ref HEAD"
msgstr ""
-#: builtin/index-pack.c:828
+#: builtin/fetch.c:511
#, c-format
-msgid "invalid blob object %s"
+msgid "configuration fetch.output contains invalid value %s"
msgstr ""
-#: builtin/index-pack.c:842
+#: builtin/fetch.c:604
#, c-format
-msgid "invalid %s"
+msgid "object %s not found"
msgstr ""
-#: builtin/index-pack.c:845
-msgid "Error in object"
+#: builtin/fetch.c:608
+msgid "[up to date]"
msgstr ""
-#: builtin/index-pack.c:847
-#, c-format
-msgid "Not all child objects of %s are reachable"
+#: builtin/fetch.c:621 builtin/fetch.c:701
+msgid "[rejected]"
msgstr ""
-#: builtin/index-pack.c:919 builtin/index-pack.c:950
-msgid "failed to apply delta"
+#: builtin/fetch.c:622
+msgid "can't fetch in current branch"
msgstr ""
-#: builtin/index-pack.c:1120
-msgid "Receiving objects"
+#: builtin/fetch.c:631
+msgid "[tag update]"
msgstr ""
-#: builtin/index-pack.c:1120
-msgid "Indexing objects"
+#: builtin/fetch.c:632 builtin/fetch.c:665 builtin/fetch.c:681
+#: builtin/fetch.c:696
+msgid "unable to update local ref"
msgstr ""
-#: builtin/index-pack.c:1152
-msgid "pack is corrupted (SHA1 mismatch)"
+#: builtin/fetch.c:651
+msgid "[new tag]"
msgstr ""
-#: builtin/index-pack.c:1157
-msgid "cannot fstat packfile"
+#: builtin/fetch.c:654
+msgid "[new branch]"
msgstr ""
-#: builtin/index-pack.c:1160
-msgid "pack has junk at the end"
+#: builtin/fetch.c:657
+msgid "[new ref]"
msgstr ""
-#: builtin/index-pack.c:1171
-msgid "confusion beyond insanity in parse_pack_objects()"
+#: builtin/fetch.c:696
+msgid "forced update"
msgstr ""
-#: builtin/index-pack.c:1196
-msgid "Resolving deltas"
+#: builtin/fetch.c:701
+msgid "non-fast-forward"
msgstr ""
-#: builtin/index-pack.c:1207
+#: builtin/fetch.c:746
#, c-format
-msgid "unable to create thread: %s"
-msgstr ""
-
-#: builtin/index-pack.c:1249
-msgid "confusion beyond insanity"
+msgid "%s did not send all necessary objects\n"
msgstr ""
-#: builtin/index-pack.c:1255
-#, c-format
-msgid "completed with %d local object"
-msgid_plural "completed with %d local objects"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/index-pack.c:1267
+#: builtin/fetch.c:766
#, c-format
-msgid "Unexpected tail checksum for %s (disk corruption?)"
+msgid "reject %s because shallow roots are not allowed to be updated"
msgstr ""
-#: builtin/index-pack.c:1271
-#, c-format
-msgid "pack has %d unresolved delta"
-msgid_plural "pack has %d unresolved deltas"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/index-pack.c:1295
+#: builtin/fetch.c:853 builtin/fetch.c:949
#, c-format
-msgid "unable to deflate appended object (%d)"
+msgid "From %.*s\n"
msgstr ""
-#: builtin/index-pack.c:1371
+#: builtin/fetch.c:864
#, c-format
-msgid "local object %s is corrupt"
-msgstr ""
-
-#: builtin/index-pack.c:1395
-msgid "error while closing pack file"
+msgid ""
+"some local refs could not be updated; try running\n"
+" 'git remote prune %s' to remove any old, conflicting branches"
msgstr ""
-#: builtin/index-pack.c:1408
+#: builtin/fetch.c:919
#, c-format
-msgid "cannot write keep file '%s'"
+msgid " (%s will become dangling)"
msgstr ""
-#: builtin/index-pack.c:1416
+#: builtin/fetch.c:920
#, c-format
-msgid "cannot close written keep file '%s'"
+msgid " (%s has become dangling)"
msgstr ""
-#: builtin/index-pack.c:1429
-msgid "cannot store pack file"
+#: builtin/fetch.c:952
+msgid "[deleted]"
msgstr ""
-#: builtin/index-pack.c:1440
-msgid "cannot store index file"
+#: builtin/fetch.c:953 builtin/remote.c:1020
+msgid "(none)"
msgstr ""
-#: builtin/index-pack.c:1473
+#: builtin/fetch.c:976
#, c-format
-msgid "bad pack.indexversion=%<PRIu32>"
+msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr ""
-#: builtin/index-pack.c:1483 builtin/index-pack.c:1681
+#: builtin/fetch.c:995
#, c-format
-msgid "no threads support, ignoring %s"
+msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr ""
-#: builtin/index-pack.c:1542
+#: builtin/fetch.c:998
#, c-format
-msgid "Cannot open existing pack file '%s'"
+msgid "Option \"%s\" is ignored for %s\n"
msgstr ""
-#: builtin/index-pack.c:1544
+#: builtin/fetch.c:1074
#, c-format
-msgid "Cannot open existing pack idx file for '%s'"
+msgid "Don't know how to fetch from %s"
msgstr ""
-#: builtin/index-pack.c:1591
+#: builtin/fetch.c:1234
#, c-format
-msgid "non delta: %d object"
-msgid_plural "non delta: %d objects"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Fetching %s\n"
+msgstr ""
-#: builtin/index-pack.c:1598
+#: builtin/fetch.c:1236 builtin/remote.c:96
#, c-format
-msgid "chain length = %d: %lu object"
-msgid_plural "chain length = %d: %lu objects"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Could not fetch %s"
+msgstr ""
-#: builtin/index-pack.c:1611
-#, c-format
-msgid "packfile name '%s' does not end with '.pack'"
+#: builtin/fetch.c:1254
+msgid ""
+"No remote repository specified. Please, specify either a URL or a\n"
+"remote name from which new revisions should be fetched."
msgstr ""
-#: builtin/index-pack.c:1693 builtin/index-pack.c:1696
-#: builtin/index-pack.c:1712 builtin/index-pack.c:1716
-#, c-format
-msgid "bad %s"
+#: builtin/fetch.c:1277
+msgid "You need to specify a tag name."
msgstr ""
-#: builtin/index-pack.c:1730
-msgid "--fix-thin cannot be used without --stdin"
+#: builtin/fetch.c:1319
+msgid "Negative depth in --deepen is not supported"
msgstr ""
-#: builtin/index-pack.c:1738
-msgid "--verify with no packfile name given"
+#: builtin/fetch.c:1321
+msgid "--deepen and --depth are mutually exclusive"
msgstr ""
-#: builtin/init-db.c:55
-#, c-format
-msgid "cannot stat '%s'"
+#: builtin/fetch.c:1326
+msgid "--depth and --unshallow cannot be used together"
msgstr ""
-#: builtin/init-db.c:61
-#, c-format
-msgid "cannot stat template '%s'"
+#: builtin/fetch.c:1328
+msgid "--unshallow on a complete repository does not make sense"
msgstr ""
-#: builtin/init-db.c:66
-#, c-format
-msgid "cannot opendir '%s'"
+#: builtin/fetch.c:1350
+msgid "fetch --all does not take a repository argument"
msgstr ""
-#: builtin/init-db.c:77
-#, c-format
-msgid "cannot readlink '%s'"
+#: builtin/fetch.c:1352
+msgid "fetch --all does not make sense with refspecs"
msgstr ""
-#: builtin/init-db.c:79
+#: builtin/fetch.c:1363
#, c-format
-msgid "cannot symlink '%s' '%s'"
+msgid "No such remote or remote group: %s"
msgstr ""
-#: builtin/init-db.c:85
-#, c-format
-msgid "cannot copy '%s' to '%s'"
+#: builtin/fetch.c:1371
+msgid "Fetching a group and specifying refspecs does not make sense"
msgstr ""
-#: builtin/init-db.c:89
-#, c-format
-msgid "ignoring template %s"
+#: builtin/fmt-merge-msg.c:14
+msgid ""
+"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
msgstr ""
-#: builtin/init-db.c:120
-#, c-format
-msgid "templates not found %s"
+#: builtin/fmt-merge-msg.c:663
+msgid "populate log with at most <n> entries from shortlog"
msgstr ""
-#: builtin/init-db.c:135
-#, c-format
-msgid "not copying templates from '%s': %s"
+#: builtin/fmt-merge-msg.c:666
+msgid "alias for --log (deprecated)"
msgstr ""
-#: builtin/init-db.c:312 builtin/init-db.c:315
-#, c-format
-msgid "%s already exists"
+#: builtin/fmt-merge-msg.c:669
+msgid "text"
msgstr ""
-#: builtin/init-db.c:344
-#, c-format
-msgid "unable to handle file type %d"
+#: builtin/fmt-merge-msg.c:670
+msgid "use <text> as start of message"
msgstr ""
-#: builtin/init-db.c:347
-#, c-format
-msgid "unable to move %s to %s"
+#: builtin/fmt-merge-msg.c:671
+msgid "file to read from"
msgstr ""
-#: builtin/init-db.c:402
-#, c-format
-msgid "Reinitialized existing shared Git repository in %s%s\n"
+#: builtin/for-each-ref.c:9
+msgid "git for-each-ref [<options>] [<pattern>]"
msgstr ""
-#: builtin/init-db.c:403
-#, c-format
-msgid "Reinitialized existing Git repository in %s%s\n"
+#: builtin/for-each-ref.c:10
+msgid "git for-each-ref [--points-at <object>]"
msgstr ""
-#: builtin/init-db.c:407
-#, c-format
-msgid "Initialized empty shared Git repository in %s%s\n"
+#: builtin/for-each-ref.c:11
+msgid "git for-each-ref [(--merged | --no-merged) [<object>]]"
msgstr ""
-#: builtin/init-db.c:408
-#, c-format
-msgid "Initialized empty Git repository in %s%s\n"
+#: builtin/for-each-ref.c:12
+msgid "git for-each-ref [--contains [<object>]]"
msgstr ""
-#: builtin/init-db.c:455
-msgid ""
-"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
-"shared[=<permissions>]] [<directory>]"
+#: builtin/for-each-ref.c:27
+msgid "quote placeholders suitably for shells"
msgstr ""
-#: builtin/init-db.c:478
-msgid "permissions"
+#: builtin/for-each-ref.c:29
+msgid "quote placeholders suitably for perl"
msgstr ""
-#: builtin/init-db.c:479
-msgid "specify that the git repository is to be shared amongst several users"
+#: builtin/for-each-ref.c:31
+msgid "quote placeholders suitably for python"
msgstr ""
-#: builtin/init-db.c:513 builtin/init-db.c:518
-#, c-format
-msgid "cannot mkdir %s"
+#: builtin/for-each-ref.c:33
+msgid "quote placeholders suitably for Tcl"
msgstr ""
-#: builtin/init-db.c:522
-#, c-format
-msgid "cannot chdir to %s"
+#: builtin/for-each-ref.c:36
+msgid "show only <n> matched refs"
msgstr ""
-#: builtin/init-db.c:543
-#, c-format
-msgid ""
-"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
-"dir=<directory>)"
+#: builtin/for-each-ref.c:37 builtin/tag.c:387 builtin/verify-tag.c:38
+msgid "format to use for the output"
msgstr ""
-#: builtin/init-db.c:571
-#, c-format
-msgid "Cannot access work tree '%s'"
+#: builtin/for-each-ref.c:41
+msgid "print only refs which points at the given object"
msgstr ""
-#: builtin/interpret-trailers.c:15
-msgid ""
-"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
-"<token>[(=|:)<value>])...] [<file>...]"
+#: builtin/for-each-ref.c:43
+msgid "print only refs that are merged"
msgstr ""
-#: builtin/interpret-trailers.c:26
-msgid "edit files in place"
+#: builtin/for-each-ref.c:44
+msgid "print only refs that are not merged"
msgstr ""
-#: builtin/interpret-trailers.c:27
-msgid "trim empty trailers"
+#: builtin/for-each-ref.c:45
+msgid "print only refs which contain the commit"
msgstr ""
-#: builtin/interpret-trailers.c:28
-msgid "trailer"
+#: builtin/fsck.c:554
+msgid "Checking object directories"
msgstr ""
-#: builtin/interpret-trailers.c:29
-msgid "trailer(s) to add"
+#: builtin/fsck.c:646
+msgid "git fsck [<options>] [<object>...]"
msgstr ""
-#: builtin/interpret-trailers.c:42
-msgid "no input file given for in-place editing"
+#: builtin/fsck.c:652
+msgid "show unreachable objects"
msgstr ""
-#: builtin/log.c:44
-msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
+#: builtin/fsck.c:653
+msgid "show dangling objects"
msgstr ""
-#: builtin/log.c:45
-msgid "git show [<options>] <object>..."
+#: builtin/fsck.c:654
+msgid "report tags"
msgstr ""
-#: builtin/log.c:84
-#, c-format
-msgid "invalid --decorate option: %s"
+#: builtin/fsck.c:655
+msgid "report root nodes"
msgstr ""
-#: builtin/log.c:139
-msgid "suppress diff output"
+#: builtin/fsck.c:656
+msgid "make index objects head nodes"
msgstr ""
-#: builtin/log.c:140
-msgid "show source"
+#: builtin/fsck.c:657
+msgid "make reflogs head nodes (default)"
msgstr ""
-#: builtin/log.c:141
-msgid "Use mail map file"
+#: builtin/fsck.c:658
+msgid "also consider packs and alternate objects"
msgstr ""
-#: builtin/log.c:142
-msgid "decorate options"
+#: builtin/fsck.c:659
+msgid "check only connectivity"
msgstr ""
-#: builtin/log.c:145
-msgid "Process line range n,m in file, counting from 1"
+#: builtin/fsck.c:660
+msgid "enable more strict checking"
msgstr ""
-#: builtin/log.c:241
-#, c-format
-msgid "Final output: %d %s\n"
+#: builtin/fsck.c:662
+msgid "write dangling objects in .git/lost-found"
msgstr ""
-#: builtin/log.c:486
-#, c-format
-msgid "git show %s: bad file"
+#: builtin/fsck.c:663 builtin/prune.c:107
+msgid "show progress"
msgstr ""
-#: builtin/log.c:500 builtin/log.c:594
-#, c-format
-msgid "Could not read object %s"
+#: builtin/fsck.c:664
+msgid "show verbose names for reachable objects"
msgstr ""
-#: builtin/log.c:618
-#, c-format
-msgid "Unknown type: %d"
+#: builtin/fsck.c:725
+msgid "Checking objects"
msgstr ""
-#: builtin/log.c:739
-msgid "format.headers without value"
+#: builtin/gc.c:25
+msgid "git gc [<options>]"
msgstr ""
-#: builtin/log.c:839
-msgid "name of output directory is too long"
+#: builtin/gc.c:72
+#, c-format
+msgid "Invalid %s: '%s'"
msgstr ""
-#: builtin/log.c:854
+#: builtin/gc.c:139
#, c-format
-msgid "Cannot open patch file %s"
+msgid "insanely long object directory %.*s"
msgstr ""
-#: builtin/log.c:868
-msgid "Need exactly one range."
+#: builtin/gc.c:297
+#, c-format
+msgid ""
+"The last gc run reported the following. Please correct the root cause\n"
+"and remove %s.\n"
+"Automatic cleanup will not be performed until the file is removed.\n"
+"\n"
+"%s"
msgstr ""
-#: builtin/log.c:878
-msgid "Not a range."
+#: builtin/gc.c:334
+msgid "prune unreferenced objects"
msgstr ""
-#: builtin/log.c:984
-msgid "Cover letter needs email format"
+#: builtin/gc.c:336
+msgid "be more thorough (increased runtime)"
msgstr ""
-#: builtin/log.c:1064
-#, c-format
-msgid "insane in-reply-to: %s"
+#: builtin/gc.c:337
+msgid "enable auto-gc mode"
msgstr ""
-#: builtin/log.c:1092
-msgid "git format-patch [<options>] [<since> | <revision-range>]"
+#: builtin/gc.c:338
+msgid "force running gc even if there may be another gc running"
msgstr ""
-#: builtin/log.c:1137
-msgid "Two output directories?"
+#: builtin/gc.c:380
+#, c-format
+msgid "Auto packing the repository in background for optimum performance.\n"
msgstr ""
-#: builtin/log.c:1244 builtin/log.c:1883 builtin/log.c:1885 builtin/log.c:1897
+#: builtin/gc.c:382
#, c-format
-msgid "Unknown commit %s"
+msgid "Auto packing the repository for optimum performance.\n"
msgstr ""
-#: builtin/log.c:1254 builtin/notes.c:254 builtin/notes.c:305
-#: builtin/notes.c:307 builtin/notes.c:370 builtin/notes.c:425
-#: builtin/notes.c:511 builtin/notes.c:516 builtin/notes.c:594
-#: builtin/notes.c:657 builtin/notes.c:882 builtin/tag.c:455
+#: builtin/gc.c:383
#, c-format
-msgid "Failed to resolve '%s' as a valid ref."
+msgid "See \"git help gc\" for manual housekeeping.\n"
msgstr ""
-#: builtin/log.c:1259
-msgid "Could not find exact merge base."
+#: builtin/gc.c:404
+#, c-format
+msgid ""
+"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
msgstr ""
-#: builtin/log.c:1263
+#: builtin/gc.c:448
msgid ""
-"Failed to get upstream, if you want to record base commit automatically,\n"
-"please use git branch --set-upstream-to to track a remote branch.\n"
-"Or you could specify base commit by --base=<base-commit-id> manually."
+"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr ""
-#: builtin/log.c:1283
-msgid "Failed to find exact merge base"
+#: builtin/grep.c:25
+msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
msgstr ""
-#: builtin/log.c:1294
-msgid "base commit should be the ancestor of revision list"
+#: builtin/grep.c:232
+#, c-format
+msgid "grep: failed to create thread: %s"
msgstr ""
-#: builtin/log.c:1298
-msgid "base commit shouldn't be in revision list"
+#: builtin/grep.c:290
+#, c-format
+msgid "invalid number of threads specified (%d) for %s"
msgstr ""
-#: builtin/log.c:1347
-msgid "cannot get patch id"
+#: builtin/grep.c:763 builtin/grep.c:804
+#, c-format
+msgid "unable to read tree (%s)"
msgstr ""
-#: builtin/log.c:1404
-msgid "use [PATCH n/m] even with a single patch"
+#: builtin/grep.c:823
+#, c-format
+msgid "unable to grep from object of type %s"
msgstr ""
-#: builtin/log.c:1407
-msgid "use [PATCH] even with multiple patches"
+#: builtin/grep.c:887
+#, c-format
+msgid "switch `%c' expects a numerical value"
msgstr ""
-#: builtin/log.c:1411
-msgid "print patches to standard out"
+#: builtin/grep.c:973
+msgid "search in index instead of in the work tree"
msgstr ""
-#: builtin/log.c:1413
-msgid "generate a cover letter"
+#: builtin/grep.c:975
+msgid "find in contents not managed by git"
msgstr ""
-#: builtin/log.c:1415
-msgid "use simple number sequence for output file names"
+#: builtin/grep.c:977
+msgid "search in both tracked and untracked files"
msgstr ""
-#: builtin/log.c:1416
-msgid "sfx"
+#: builtin/grep.c:979
+msgid "ignore files specified via '.gitignore'"
msgstr ""
-#: builtin/log.c:1417
-msgid "use <sfx> instead of '.patch'"
+#: builtin/grep.c:981
+msgid "recursivley search in each submodule"
msgstr ""
-#: builtin/log.c:1419
-msgid "start numbering patches at <n> instead of 1"
+#: builtin/grep.c:983
+msgid "basename"
msgstr ""
-#: builtin/log.c:1421
-msgid "mark the series as Nth re-roll"
+#: builtin/grep.c:984
+msgid "prepend parent project's basename to output"
msgstr ""
-#: builtin/log.c:1423
-msgid "Use [<prefix>] instead of [PATCH]"
+#: builtin/grep.c:987
+msgid "show non-matching lines"
msgstr ""
-#: builtin/log.c:1426
-msgid "store resulting files in <dir>"
+#: builtin/grep.c:989
+msgid "case insensitive matching"
msgstr ""
-#: builtin/log.c:1429
-msgid "don't strip/add [PATCH]"
+#: builtin/grep.c:991
+msgid "match patterns only at word boundaries"
msgstr ""
-#: builtin/log.c:1432
-msgid "don't output binary diffs"
+#: builtin/grep.c:993
+msgid "process binary files as text"
msgstr ""
-#: builtin/log.c:1434
-msgid "output all-zero hash in From header"
+#: builtin/grep.c:995
+msgid "don't match patterns in binary files"
msgstr ""
-#: builtin/log.c:1436
-msgid "don't include a patch matching a commit upstream"
+#: builtin/grep.c:998
+msgid "process binary files with textconv filters"
msgstr ""
-#: builtin/log.c:1438
-msgid "show patch format instead of default (patch + stat)"
+#: builtin/grep.c:1000
+msgid "descend at most <depth> levels"
msgstr ""
-#: builtin/log.c:1440
-msgid "Messaging"
+#: builtin/grep.c:1004
+msgid "use extended POSIX regular expressions"
msgstr ""
-#: builtin/log.c:1441
-msgid "header"
+#: builtin/grep.c:1007
+msgid "use basic POSIX regular expressions (default)"
msgstr ""
-#: builtin/log.c:1442
-msgid "add email header"
+#: builtin/grep.c:1010
+msgid "interpret patterns as fixed strings"
msgstr ""
-#: builtin/log.c:1443 builtin/log.c:1445
-msgid "email"
+#: builtin/grep.c:1013
+msgid "use Perl-compatible regular expressions"
msgstr ""
-#: builtin/log.c:1443
-msgid "add To: header"
+#: builtin/grep.c:1016
+msgid "show line numbers"
msgstr ""
-#: builtin/log.c:1445
-msgid "add Cc: header"
+#: builtin/grep.c:1017
+msgid "don't show filenames"
msgstr ""
-#: builtin/log.c:1447
-msgid "ident"
+#: builtin/grep.c:1018
+msgid "show filenames"
msgstr ""
-#: builtin/log.c:1448
-msgid "set From address to <ident> (or committer ident if absent)"
+#: builtin/grep.c:1020
+msgid "show filenames relative to top directory"
msgstr ""
-#: builtin/log.c:1450
-msgid "message-id"
+#: builtin/grep.c:1022
+msgid "show only filenames instead of matching lines"
msgstr ""
-#: builtin/log.c:1451
-msgid "make first mail a reply to <message-id>"
+#: builtin/grep.c:1024
+msgid "synonym for --files-with-matches"
msgstr ""
-#: builtin/log.c:1452 builtin/log.c:1455
-msgid "boundary"
+#: builtin/grep.c:1027
+msgid "show only the names of files without match"
msgstr ""
-#: builtin/log.c:1453
-msgid "attach the patch"
+#: builtin/grep.c:1029
+msgid "print NUL after filenames"
msgstr ""
-#: builtin/log.c:1456
-msgid "inline the patch"
+#: builtin/grep.c:1031
+msgid "show the number of matches instead of matching lines"
msgstr ""
-#: builtin/log.c:1460
-msgid "enable message threading, styles: shallow, deep"
+#: builtin/grep.c:1032
+msgid "highlight matches"
msgstr ""
-#: builtin/log.c:1462
-msgid "signature"
+#: builtin/grep.c:1034
+msgid "print empty line between matches from different files"
msgstr ""
-#: builtin/log.c:1463
-msgid "add a signature"
+#: builtin/grep.c:1036
+msgid "show filename only once above matches from same file"
msgstr ""
-#: builtin/log.c:1464
-msgid "base-commit"
+#: builtin/grep.c:1039
+msgid "show <n> context lines before and after matches"
msgstr ""
-#: builtin/log.c:1465
-msgid "add prerequisite tree info to the patch series"
+#: builtin/grep.c:1042
+msgid "show <n> context lines before matches"
msgstr ""
-#: builtin/log.c:1467
-msgid "add a signature from a file"
+#: builtin/grep.c:1044
+msgid "show <n> context lines after matches"
msgstr ""
-#: builtin/log.c:1468
-msgid "don't print the patch filenames"
+#: builtin/grep.c:1046
+msgid "use <n> worker threads"
msgstr ""
-#: builtin/log.c:1558
-msgid "-n and -k are mutually exclusive."
+#: builtin/grep.c:1047
+msgid "shortcut for -C NUM"
msgstr ""
-#: builtin/log.c:1560
-msgid "--subject-prefix and -k are mutually exclusive."
+#: builtin/grep.c:1050
+msgid "show a line with the function name before matches"
msgstr ""
-#: builtin/log.c:1568
-msgid "--name-only does not make sense"
+#: builtin/grep.c:1052
+msgid "show the surrounding function"
msgstr ""
-#: builtin/log.c:1570
-msgid "--name-status does not make sense"
+#: builtin/grep.c:1055
+msgid "read patterns from file"
msgstr ""
-#: builtin/log.c:1572
-msgid "--check does not make sense"
+#: builtin/grep.c:1057
+msgid "match <pattern>"
msgstr ""
-#: builtin/log.c:1602
-msgid "standard output, or directory, which one?"
+#: builtin/grep.c:1059
+msgid "combine patterns specified with -e"
msgstr ""
-#: builtin/log.c:1604
-#, c-format
-msgid "Could not create directory '%s'"
+#: builtin/grep.c:1071
+msgid "indicate hit with exit status without output"
msgstr ""
-#: builtin/log.c:1698
-#, c-format
-msgid "unable to read signature file '%s'"
+#: builtin/grep.c:1073
+msgid "show only matches from files that match all patterns"
msgstr ""
-#: builtin/log.c:1769
-msgid "Failed to create output files"
+#: builtin/grep.c:1075
+msgid "show parse tree for grep expression"
msgstr ""
-#: builtin/log.c:1818
-msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
+#: builtin/grep.c:1079
+msgid "pager"
msgstr ""
-#: builtin/log.c:1872
-#, c-format
-msgid ""
-"Could not find a tracked remote branch, please specify <upstream> manually.\n"
+#: builtin/grep.c:1079
+msgid "show matching files in the pager"
msgstr ""
-#: builtin/ls-files.c:379
-msgid "git ls-files [<options>] [<file>...]"
+#: builtin/grep.c:1082
+msgid "allow calling of grep(1) (ignored by this build)"
msgstr ""
-#: builtin/ls-files.c:428
-msgid "identify the file status with tags"
+#: builtin/grep.c:1146
+msgid "no pattern given."
msgstr ""
-#: builtin/ls-files.c:430
-msgid "use lowercase letters for 'assume unchanged' files"
+#: builtin/grep.c:1178 builtin/index-pack.c:1482
+#, c-format
+msgid "invalid number of threads specified (%d)"
msgstr ""
-#: builtin/ls-files.c:432
-msgid "show cached files in the output (default)"
+#: builtin/grep.c:1215
+msgid "--open-files-in-pager only works on the worktree"
msgstr ""
-#: builtin/ls-files.c:434
-msgid "show deleted files in the output"
+#: builtin/grep.c:1238
+msgid "option not supported with --recurse-submodules."
msgstr ""
-#: builtin/ls-files.c:436
-msgid "show modified files in the output"
+#: builtin/grep.c:1244
+msgid "--cached or --untracked cannot be used with --no-index."
msgstr ""
-#: builtin/ls-files.c:438
-msgid "show other files in the output"
+#: builtin/grep.c:1249
+msgid "--no-index or --untracked cannot be used with revs."
msgstr ""
-#: builtin/ls-files.c:440
-msgid "show ignored files in the output"
-msgstr ""
-
-#: builtin/ls-files.c:443
-msgid "show staged contents' object name in the output"
-msgstr ""
-
-#: builtin/ls-files.c:445
-msgid "show files on the filesystem that need to be removed"
-msgstr ""
-
-#: builtin/ls-files.c:447
-msgid "show 'other' directories' names only"
+#: builtin/grep.c:1252
+msgid "--[no-]exclude-standard cannot be used for tracked contents."
msgstr ""
-#: builtin/ls-files.c:449
-msgid "show line endings of files"
+#: builtin/grep.c:1260
+msgid "both --cached and trees are given."
msgstr ""
-#: builtin/ls-files.c:451
-msgid "don't show empty directories"
+#: builtin/hash-object.c:81
+msgid ""
+"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
+"[--] <file>..."
msgstr ""
-#: builtin/ls-files.c:454
-msgid "show unmerged files in the output"
+#: builtin/hash-object.c:82
+msgid "git hash-object --stdin-paths"
msgstr ""
-#: builtin/ls-files.c:456
-msgid "show resolve-undo information"
+#: builtin/hash-object.c:94
+msgid "type"
msgstr ""
-#: builtin/ls-files.c:458
-msgid "skip files matching pattern"
+#: builtin/hash-object.c:94
+msgid "object type"
msgstr ""
-#: builtin/ls-files.c:461
-msgid "exclude patterns are read from <file>"
+#: builtin/hash-object.c:95
+msgid "write the object into the object database"
msgstr ""
-#: builtin/ls-files.c:464
-msgid "read additional per-directory exclude patterns in <file>"
+#: builtin/hash-object.c:97
+msgid "read the object from stdin"
msgstr ""
-#: builtin/ls-files.c:466
-msgid "add the standard git exclusions"
+#: builtin/hash-object.c:99
+msgid "store file as is without filters"
msgstr ""
-#: builtin/ls-files.c:469
-msgid "make the output relative to the project top directory"
+#: builtin/hash-object.c:100
+msgid ""
+"just hash any random garbage to create corrupt objects for debugging Git"
msgstr ""
-#: builtin/ls-files.c:472
-msgid "if any <file> is not in the index, treat this as an error"
+#: builtin/hash-object.c:101
+msgid "process file as it were from this path"
msgstr ""
-#: builtin/ls-files.c:473
-msgid "tree-ish"
+#: builtin/help.c:42
+msgid "print all available commands"
msgstr ""
-#: builtin/ls-files.c:474
-msgid "pretend that paths removed since <tree-ish> are still present"
+#: builtin/help.c:43
+msgid "exclude guides"
msgstr ""
-#: builtin/ls-files.c:476
-msgid "show debugging data"
+#: builtin/help.c:44
+msgid "print list of useful guides"
msgstr ""
-#: builtin/ls-remote.c:7
-msgid ""
-"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
-" [-q | --quiet] [--exit-code] [--get-url]\n"
-" [--symref] [<repository> [<refs>...]]"
+#: builtin/help.c:45
+msgid "show man page"
msgstr ""
-#: builtin/ls-remote.c:50
-msgid "do not print remote URL"
+#: builtin/help.c:46
+msgid "show manual in web browser"
msgstr ""
-#: builtin/ls-remote.c:51 builtin/ls-remote.c:53
-msgid "exec"
+#: builtin/help.c:48
+msgid "show info page"
msgstr ""
-#: builtin/ls-remote.c:52 builtin/ls-remote.c:54
-msgid "path of git-upload-pack on the remote host"
+#: builtin/help.c:54
+msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
msgstr ""
-#: builtin/ls-remote.c:56
-msgid "limit to tags"
+#: builtin/help.c:66
+#, c-format
+msgid "unrecognized help format '%s'"
msgstr ""
-#: builtin/ls-remote.c:57
-msgid "limit to heads"
+#: builtin/help.c:93
+msgid "Failed to start emacsclient."
msgstr ""
-#: builtin/ls-remote.c:58
-msgid "do not show peeled tags"
+#: builtin/help.c:106
+msgid "Failed to parse emacsclient version."
msgstr ""
-#: builtin/ls-remote.c:60
-msgid "take url.<base>.insteadOf into account"
+#: builtin/help.c:114
+#, c-format
+msgid "emacsclient version '%d' too old (< 22)."
msgstr ""
-#: builtin/ls-remote.c:62
-msgid "exit with exit code 2 if no matching refs are found"
+#: builtin/help.c:132 builtin/help.c:153 builtin/help.c:162 builtin/help.c:170
+#, c-format
+msgid "failed to exec '%s'"
msgstr ""
-#: builtin/ls-remote.c:64
-msgid "show underlying ref in addition to the object pointed by it"
+#: builtin/help.c:207
+#, c-format
+msgid ""
+"'%s': path for unsupported man viewer.\n"
+"Please consider using 'man.<tool>.cmd' instead."
msgstr ""
-#: builtin/ls-tree.c:28
-msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
+#: builtin/help.c:219
+#, c-format
+msgid ""
+"'%s': cmd for supported man viewer.\n"
+"Please consider using 'man.<tool>.path' instead."
msgstr ""
-#: builtin/ls-tree.c:128
-msgid "only show trees"
+#: builtin/help.c:336
+#, c-format
+msgid "'%s': unknown man viewer."
msgstr ""
-#: builtin/ls-tree.c:130
-msgid "recurse into subtrees"
+#: builtin/help.c:353
+msgid "no man viewer handled the request"
msgstr ""
-#: builtin/ls-tree.c:132
-msgid "show trees when recursing"
+#: builtin/help.c:361
+msgid "no info viewer handled the request"
msgstr ""
-#: builtin/ls-tree.c:135
-msgid "terminate entries with NUL byte"
+#: builtin/help.c:403
+msgid "Defining attributes per path"
msgstr ""
-#: builtin/ls-tree.c:136
-msgid "include object size"
+#: builtin/help.c:404
+msgid "Everyday Git With 20 Commands Or So"
msgstr ""
-#: builtin/ls-tree.c:138 builtin/ls-tree.c:140
-msgid "list only filenames"
+#: builtin/help.c:405
+msgid "A Git glossary"
msgstr ""
-#: builtin/ls-tree.c:143
-msgid "use full path names"
+#: builtin/help.c:406
+msgid "Specifies intentionally untracked files to ignore"
msgstr ""
-#: builtin/ls-tree.c:145
-msgid "list entire tree; not just current directory (implies --full-name)"
+#: builtin/help.c:407
+msgid "Defining submodule properties"
msgstr ""
-#: builtin/merge.c:46
-msgid "git merge [<options>] [<commit>...]"
+#: builtin/help.c:408
+msgid "Specifying revisions and ranges for Git"
msgstr ""
-#: builtin/merge.c:47
-msgid "git merge [<options>] <msg> HEAD <commit>"
+#: builtin/help.c:409
+msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
msgstr ""
-#: builtin/merge.c:48
-msgid "git merge --abort"
+#: builtin/help.c:410
+msgid "An overview of recommended workflows with Git"
msgstr ""
-#: builtin/merge.c:102
-msgid "switch `m' requires a value"
+#: builtin/help.c:422
+msgid "The common Git guides are:\n"
msgstr ""
-#: builtin/merge.c:139
+#: builtin/help.c:440
#, c-format
-msgid "Could not find merge strategy '%s'.\n"
+msgid "`git %s' is aliased to `%s'"
msgstr ""
-#: builtin/merge.c:140
+#: builtin/help.c:462 builtin/help.c:479
#, c-format
-msgid "Available strategies are:"
+msgid "usage: %s%s"
msgstr ""
-#: builtin/merge.c:145
+#: builtin/index-pack.c:154
#, c-format
-msgid "Available custom strategies are:"
-msgstr ""
-
-#: builtin/merge.c:195 builtin/pull.c:126
-msgid "do not show a diffstat at the end of the merge"
-msgstr ""
-
-#: builtin/merge.c:198 builtin/pull.c:129
-msgid "show a diffstat at the end of the merge"
+msgid "unable to open %s"
msgstr ""
-#: builtin/merge.c:199 builtin/pull.c:132
-msgid "(synonym to --stat)"
+#: builtin/index-pack.c:204
+#, c-format
+msgid "object type mismatch at %s"
msgstr ""
-#: builtin/merge.c:201 builtin/pull.c:135
-msgid "add (at most <n>) entries from shortlog to merge commit message"
+#: builtin/index-pack.c:224
+#, c-format
+msgid "did not receive expected object %s"
msgstr ""
-#: builtin/merge.c:204 builtin/pull.c:138
-msgid "create a single commit instead of doing a merge"
+#: builtin/index-pack.c:227
+#, c-format
+msgid "object %s: expected type %s, found %s"
msgstr ""
-#: builtin/merge.c:206 builtin/pull.c:141
-msgid "perform a commit if the merge succeeds (default)"
-msgstr ""
+#: builtin/index-pack.c:269
+#, c-format
+msgid "cannot fill %d byte"
+msgid_plural "cannot fill %d bytes"
+msgstr[0] ""
+msgstr[1] ""
-#: builtin/merge.c:208 builtin/pull.c:144
-msgid "edit message before committing"
+#: builtin/index-pack.c:279
+msgid "early EOF"
msgstr ""
-#: builtin/merge.c:209
-msgid "allow fast-forward (default)"
+#: builtin/index-pack.c:280
+msgid "read error on input"
msgstr ""
-#: builtin/merge.c:211 builtin/pull.c:150
-msgid "abort if fast-forward is not possible"
+#: builtin/index-pack.c:292
+msgid "used more bytes than were available"
msgstr ""
-#: builtin/merge.c:215 builtin/pull.c:153
-msgid "verify that the named commit has a valid GPG signature"
+#: builtin/index-pack.c:299
+msgid "pack too large for current definition of off_t"
msgstr ""
-#: builtin/merge.c:216 builtin/notes.c:772 builtin/pull.c:157
-#: builtin/revert.c:89
-msgid "strategy"
+#: builtin/index-pack.c:302 builtin/unpack-objects.c:92
+msgid "pack exceeds maximum allowed size"
msgstr ""
-#: builtin/merge.c:217 builtin/pull.c:158
-msgid "merge strategy to use"
+#: builtin/index-pack.c:317
+#, c-format
+msgid "unable to create '%s'"
msgstr ""
-#: builtin/merge.c:218 builtin/pull.c:161
-msgid "option=value"
+#: builtin/index-pack.c:322
+#, c-format
+msgid "cannot open packfile '%s'"
msgstr ""
-#: builtin/merge.c:219 builtin/pull.c:162
-msgid "option for selected merge strategy"
+#: builtin/index-pack.c:336
+msgid "pack signature mismatch"
msgstr ""
-#: builtin/merge.c:221
-msgid "merge commit message (for a non-fast-forward merge)"
+#: builtin/index-pack.c:338
+#, c-format
+msgid "pack version %<PRIu32> unsupported"
msgstr ""
-#: builtin/merge.c:225
-msgid "abort the current in-progress merge"
+#: builtin/index-pack.c:356
+#, c-format
+msgid "pack has bad object at offset %<PRIuMAX>: %s"
msgstr ""
-#: builtin/merge.c:227 builtin/pull.c:169
-msgid "allow merging unrelated histories"
+#: builtin/index-pack.c:478
+#, c-format
+msgid "inflate returned %d"
msgstr ""
-#: builtin/merge.c:255
-msgid "could not run stash."
+#: builtin/index-pack.c:527
+msgid "offset value overflow for delta base object"
msgstr ""
-#: builtin/merge.c:260
-msgid "stash failed"
+#: builtin/index-pack.c:535
+msgid "delta base offset is out of bound"
msgstr ""
-#: builtin/merge.c:265
+#: builtin/index-pack.c:543
#, c-format
-msgid "not a valid object: %s"
-msgstr ""
-
-#: builtin/merge.c:284 builtin/merge.c:301
-msgid "read-tree failed"
+msgid "unknown object type %d"
msgstr ""
-#: builtin/merge.c:331
-msgid " (nothing to squash)"
+#: builtin/index-pack.c:574
+msgid "cannot pread pack file"
msgstr ""
-#: builtin/merge.c:342
+#: builtin/index-pack.c:576
#, c-format
-msgid "Squash commit -- not updating HEAD\n"
-msgstr ""
+msgid "premature end of pack file, %<PRIuMAX> byte missing"
+msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
+msgstr[0] ""
+msgstr[1] ""
-#: builtin/merge.c:392
-#, c-format
-msgid "No merge message -- not updating HEAD\n"
+#: builtin/index-pack.c:602
+msgid "serious inflate inconsistency"
msgstr ""
-#: builtin/merge.c:443
+#: builtin/index-pack.c:748 builtin/index-pack.c:754 builtin/index-pack.c:777
+#: builtin/index-pack.c:813 builtin/index-pack.c:822
#, c-format
-msgid "'%s' does not point to a commit"
+msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr ""
-#: builtin/merge.c:533
+#: builtin/index-pack.c:751 builtin/pack-objects.c:164
+#: builtin/pack-objects.c:256
#, c-format
-msgid "Bad branch.%s.mergeoptions string: %s"
+msgid "unable to read %s"
msgstr ""
-#: builtin/merge.c:652
-msgid "Not handling anything other than two heads merge."
+#: builtin/index-pack.c:819
+#, c-format
+msgid "cannot read existing object %s"
msgstr ""
-#: builtin/merge.c:666
+#: builtin/index-pack.c:833
#, c-format
-msgid "Unknown option for merge-recursive: -X%s"
+msgid "invalid blob object %s"
msgstr ""
-#: builtin/merge.c:681
+#: builtin/index-pack.c:847
#, c-format
-msgid "unable to write %s"
+msgid "invalid %s"
msgstr ""
-#: builtin/merge.c:733
-#, c-format
-msgid "Could not read from '%s'"
+#: builtin/index-pack.c:850
+msgid "Error in object"
msgstr ""
-#: builtin/merge.c:742
+#: builtin/index-pack.c:852
#, c-format
-msgid "Not committing merge; use 'git commit' to complete the merge.\n"
+msgid "Not all child objects of %s are reachable"
msgstr ""
-#: builtin/merge.c:748
-#, 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"
+#: builtin/index-pack.c:924 builtin/index-pack.c:955
+msgid "failed to apply delta"
msgstr ""
-#: builtin/merge.c:772
-msgid "Empty commit message."
+#: builtin/index-pack.c:1125
+msgid "Receiving objects"
msgstr ""
-#: builtin/merge.c:792
-#, c-format
-msgid "Wonderful.\n"
+#: builtin/index-pack.c:1125
+msgid "Indexing objects"
msgstr ""
-#: builtin/merge.c:847
-#, c-format
-msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
+#: builtin/index-pack.c:1157
+msgid "pack is corrupted (SHA1 mismatch)"
msgstr ""
-#: builtin/merge.c:863
-#, c-format
-msgid "'%s' is not a commit"
+#: builtin/index-pack.c:1162
+msgid "cannot fstat packfile"
msgstr ""
-#: builtin/merge.c:904
-msgid "No current branch."
+#: builtin/index-pack.c:1165
+msgid "pack has junk at the end"
msgstr ""
-#: builtin/merge.c:906
-msgid "No remote for the current branch."
+#: builtin/index-pack.c:1176
+msgid "confusion beyond insanity in parse_pack_objects()"
msgstr ""
-#: builtin/merge.c:908
-msgid "No default upstream defined for the current branch."
+#: builtin/index-pack.c:1199
+msgid "Resolving deltas"
msgstr ""
-#: builtin/merge.c:913
+#: builtin/index-pack.c:1210
#, c-format
-msgid "No remote-tracking branch for %s from %s"
+msgid "unable to create thread: %s"
msgstr ""
-#: builtin/merge.c:960
-#, c-format
-msgid "Bad value '%s' in environment '%s'"
+#: builtin/index-pack.c:1252
+msgid "confusion beyond insanity"
msgstr ""
-#: builtin/merge.c:1034
+#: builtin/index-pack.c:1258
#, c-format
-msgid "could not close '%s'"
-msgstr ""
+msgid "completed with %d local object"
+msgid_plural "completed with %d local objects"
+msgstr[0] ""
+msgstr[1] ""
-#: builtin/merge.c:1061
+#: builtin/index-pack.c:1270
#, c-format
-msgid "not something we can merge in %s: %s"
+msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr ""
-#: builtin/merge.c:1095
-msgid "not something we can merge"
-msgstr ""
+#: builtin/index-pack.c:1274
+#, c-format
+msgid "pack has %d unresolved delta"
+msgid_plural "pack has %d unresolved deltas"
+msgstr[0] ""
+msgstr[1] ""
-#: builtin/merge.c:1162
-msgid "There is no merge to abort (MERGE_HEAD missing)."
+#: builtin/index-pack.c:1298
+#, c-format
+msgid "unable to deflate appended object (%d)"
msgstr ""
-#: builtin/merge.c:1178
-msgid ""
-"You have not concluded your merge (MERGE_HEAD exists).\n"
-"Please, commit your changes before you merge."
+#: builtin/index-pack.c:1374
+#, c-format
+msgid "local object %s is corrupt"
msgstr ""
-#: builtin/merge.c:1185
-msgid ""
-"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
-"Please, commit your changes before you merge."
+#: builtin/index-pack.c:1398
+msgid "error while closing pack file"
msgstr ""
-#: builtin/merge.c:1188
-msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
+#: builtin/index-pack.c:1411
+#, c-format
+msgid "cannot write keep file '%s'"
msgstr ""
-#: builtin/merge.c:1197
-msgid "You cannot combine --squash with --no-ff."
+#: builtin/index-pack.c:1419
+#, c-format
+msgid "cannot close written keep file '%s'"
msgstr ""
-#: builtin/merge.c:1205
-msgid "No commit specified and merge.defaultToUpstream not set."
+#: builtin/index-pack.c:1432
+msgid "cannot store pack file"
msgstr ""
-#: builtin/merge.c:1222
-msgid "Squash commit into empty head not supported yet"
+#: builtin/index-pack.c:1443
+msgid "cannot store index file"
msgstr ""
-#: builtin/merge.c:1224
-msgid "Non-fast-forward commit does not make sense into an empty head"
+#: builtin/index-pack.c:1476
+#, c-format
+msgid "bad pack.indexversion=%<PRIu32>"
msgstr ""
-#: builtin/merge.c:1229
+#: builtin/index-pack.c:1486 builtin/index-pack.c:1683
#, c-format
-msgid "%s - not something we can merge"
+msgid "no threads support, ignoring %s"
msgstr ""
-#: builtin/merge.c:1231
-msgid "Can merge only exactly one commit into empty head"
+#: builtin/index-pack.c:1544
+#, c-format
+msgid "Cannot open existing pack file '%s'"
msgstr ""
-#: builtin/merge.c:1287
+#: builtin/index-pack.c:1546
#, c-format
-msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
+msgid "Cannot open existing pack idx file for '%s'"
msgstr ""
-#: builtin/merge.c:1290
+#: builtin/index-pack.c:1593
#, c-format
-msgid "Commit %s has a bad GPG signature allegedly by %s."
-msgstr ""
+msgid "non delta: %d object"
+msgid_plural "non delta: %d objects"
+msgstr[0] ""
+msgstr[1] ""
-#: builtin/merge.c:1293
+#: builtin/index-pack.c:1600
#, c-format
-msgid "Commit %s does not have a GPG signature."
+msgid "chain length = %d: %lu object"
+msgid_plural "chain length = %d: %lu objects"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/index-pack.c:1613
+#, c-format
+msgid "packfile name '%s' does not end with '.pack'"
msgstr ""
-#: builtin/merge.c:1296
+#: builtin/index-pack.c:1695 builtin/index-pack.c:1698
+#: builtin/index-pack.c:1714 builtin/index-pack.c:1718
#, c-format
-msgid "Commit %s has a good GPG signature by %s\n"
+msgid "bad %s"
msgstr ""
-#: builtin/merge.c:1358
-msgid "refusing to merge unrelated histories"
+#: builtin/index-pack.c:1734
+msgid "--fix-thin cannot be used without --stdin"
msgstr ""
-#: builtin/merge.c:1367
-msgid "Already up-to-date."
+#: builtin/index-pack.c:1736
+msgid "--stdin requires a git repository"
msgstr ""
-#: builtin/merge.c:1382
+#: builtin/index-pack.c:1744
+msgid "--verify with no packfile name given"
+msgstr ""
+
+#: builtin/init-db.c:54
#, c-format
-msgid "Updating %s..%s\n"
+msgid "cannot stat '%s'"
msgstr ""
-#: builtin/merge.c:1419
+#: builtin/init-db.c:60
#, c-format
-msgid "Trying really trivial in-index merge...\n"
+msgid "cannot stat template '%s'"
msgstr ""
-#: builtin/merge.c:1426
+#: builtin/init-db.c:65
#, c-format
-msgid "Nope.\n"
+msgid "cannot opendir '%s'"
msgstr ""
-#: builtin/merge.c:1451
-msgid "Already up-to-date. Yeeah!"
+#: builtin/init-db.c:76
+#, c-format
+msgid "cannot readlink '%s'"
msgstr ""
-#: builtin/merge.c:1457
-msgid "Not possible to fast-forward, aborting."
+#: builtin/init-db.c:78
+#, c-format
+msgid "cannot symlink '%s' '%s'"
msgstr ""
-#: builtin/merge.c:1480 builtin/merge.c:1559
+#: builtin/init-db.c:84
#, c-format
-msgid "Rewinding the tree to pristine...\n"
+msgid "cannot copy '%s' to '%s'"
msgstr ""
-#: builtin/merge.c:1484
+#: builtin/init-db.c:88
#, c-format
-msgid "Trying merge strategy %s...\n"
+msgid "ignoring template %s"
msgstr ""
-#: builtin/merge.c:1550
+#: builtin/init-db.c:119
#, c-format
-msgid "No merge strategy handled the merge.\n"
+msgid "templates not found %s"
msgstr ""
-#: builtin/merge.c:1552
+#: builtin/init-db.c:134
#, c-format
-msgid "Merge with strategy %s failed.\n"
+msgid "not copying templates from '%s': %s"
msgstr ""
-#: builtin/merge.c:1561
+#: builtin/init-db.c:327
#, c-format
-msgid "Using the %s to prepare resolving by hand.\n"
+msgid "unable to handle file type %d"
msgstr ""
-#: builtin/merge.c:1573
+#: builtin/init-db.c:330
#, c-format
-msgid "Automatic merge went well; stopped before committing as requested\n"
+msgid "unable to move %s to %s"
msgstr ""
-#: builtin/merge-base.c:29
-msgid "git merge-base [-a | --all] <commit> <commit>..."
+#: builtin/init-db.c:347 builtin/init-db.c:350
+#, c-format
+msgid "%s already exists"
msgstr ""
-#: builtin/merge-base.c:30
-msgid "git merge-base [-a | --all] --octopus <commit>..."
+#: builtin/init-db.c:403
+#, c-format
+msgid "Reinitialized existing shared Git repository in %s%s\n"
msgstr ""
-#: builtin/merge-base.c:31
-msgid "git merge-base --independent <commit>..."
+#: builtin/init-db.c:404
+#, c-format
+msgid "Reinitialized existing Git repository in %s%s\n"
msgstr ""
-#: builtin/merge-base.c:32
-msgid "git merge-base --is-ancestor <commit> <commit>"
+#: builtin/init-db.c:408
+#, c-format
+msgid "Initialized empty shared Git repository in %s%s\n"
msgstr ""
-#: builtin/merge-base.c:33
-msgid "git merge-base --fork-point <ref> [<commit>]"
+#: builtin/init-db.c:409
+#, c-format
+msgid "Initialized empty Git repository in %s%s\n"
msgstr ""
-#: builtin/merge-base.c:214
-msgid "output all common ancestors"
+#: builtin/init-db.c:457
+msgid ""
+"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
+"shared[=<permissions>]] [<directory>]"
msgstr ""
-#: builtin/merge-base.c:216
-msgid "find ancestors for a single n-way merge"
+#: builtin/init-db.c:480
+msgid "permissions"
msgstr ""
-#: builtin/merge-base.c:218
-msgid "list revs not reachable from others"
+#: builtin/init-db.c:481
+msgid "specify that the git repository is to be shared amongst several users"
msgstr ""
-#: builtin/merge-base.c:220
-msgid "is the first one ancestor of the other?"
+#: builtin/init-db.c:515 builtin/init-db.c:520
+#, c-format
+msgid "cannot mkdir %s"
msgstr ""
-#: builtin/merge-base.c:222
-msgid "find where <commit> forked from reflog of <ref>"
+#: builtin/init-db.c:524
+#, c-format
+msgid "cannot chdir to %s"
msgstr ""
-#: builtin/merge-file.c:8
+#: builtin/init-db.c:545
+#, c-format
msgid ""
-"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
-"<orig-file> <file2>"
+"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
+"dir=<directory>)"
msgstr ""
-#: builtin/merge-file.c:33
-msgid "send results to standard output"
+#: builtin/init-db.c:573
+#, c-format
+msgid "Cannot access work tree '%s'"
msgstr ""
-#: builtin/merge-file.c:34
-msgid "use a diff3 based merge"
+#: builtin/interpret-trailers.c:15
+msgid ""
+"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
+"<token>[(=|:)<value>])...] [<file>...]"
msgstr ""
-#: builtin/merge-file.c:35
-msgid "for conflicts, use our version"
+#: builtin/interpret-trailers.c:26
+msgid "edit files in place"
msgstr ""
-#: builtin/merge-file.c:37
-msgid "for conflicts, use their version"
+#: builtin/interpret-trailers.c:27
+msgid "trim empty trailers"
msgstr ""
-#: builtin/merge-file.c:39
-msgid "for conflicts, use a union version"
+#: builtin/interpret-trailers.c:28
+msgid "trailer"
msgstr ""
-#: builtin/merge-file.c:42
-msgid "for conflicts, use this marker size"
+#: builtin/interpret-trailers.c:29
+msgid "trailer(s) to add"
msgstr ""
-#: builtin/merge-file.c:43
-msgid "do not warn about conflicts"
+#: builtin/interpret-trailers.c:42
+msgid "no input file given for in-place editing"
msgstr ""
-#: builtin/merge-file.c:45
-msgid "set labels for file1/orig-file/file2"
+#: builtin/log.c:44
+msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
msgstr ""
-#: builtin/mktree.c:65
-msgid "git mktree [-z] [--missing] [--batch]"
+#: builtin/log.c:45
+msgid "git show [<options>] <object>..."
msgstr ""
-#: builtin/mktree.c:152
-msgid "input is NUL terminated"
+#: builtin/log.c:84
+#, c-format
+msgid "invalid --decorate option: %s"
msgstr ""
-#: builtin/mktree.c:153 builtin/write-tree.c:24
-msgid "allow missing objects"
+#: builtin/log.c:139
+msgid "suppress diff output"
msgstr ""
-#: builtin/mktree.c:154
-msgid "allow creation of more than one tree"
+#: builtin/log.c:140
+msgid "show source"
msgstr ""
-#: builtin/mv.c:15
-msgid "git mv [<options>] <source>... <destination>"
+#: builtin/log.c:141
+msgid "Use mail map file"
msgstr ""
-#: builtin/mv.c:70
-#, c-format
-msgid "Directory %s is in index and no submodule?"
+#: builtin/log.c:142
+msgid "decorate options"
msgstr ""
-#: builtin/mv.c:72 builtin/rm.c:317
-msgid "Please stage your changes to .gitmodules or stash them to proceed"
+#: builtin/log.c:145
+msgid "Process line range n,m in file, counting from 1"
msgstr ""
-#: builtin/mv.c:90
+#: builtin/log.c:241
#, c-format
-msgid "%.*s is in index"
-msgstr ""
-
-#: builtin/mv.c:112
-msgid "force move/rename even if target exists"
+msgid "Final output: %d %s\n"
msgstr ""
-#: builtin/mv.c:113
-msgid "skip move/rename errors"
+#: builtin/log.c:486
+#, c-format
+msgid "git show %s: bad file"
msgstr ""
-#: builtin/mv.c:155
+#: builtin/log.c:500 builtin/log.c:594
#, c-format
-msgid "destination '%s' is not a directory"
+msgid "Could not read object %s"
msgstr ""
-#: builtin/mv.c:166
+#: builtin/log.c:618
#, c-format
-msgid "Checking rename of '%s' to '%s'\n"
+msgid "Unknown type: %d"
msgstr ""
-#: builtin/mv.c:170
-msgid "bad source"
+#: builtin/log.c:739
+msgid "format.headers without value"
msgstr ""
-#: builtin/mv.c:173
-msgid "can not move directory into itself"
+#: builtin/log.c:839
+msgid "name of output directory is too long"
msgstr ""
-#: builtin/mv.c:176
-msgid "cannot move directory over file"
+#: builtin/log.c:854
+#, c-format
+msgid "Cannot open patch file %s"
msgstr ""
-#: builtin/mv.c:185
-msgid "source directory is empty"
+#: builtin/log.c:868
+msgid "Need exactly one range."
msgstr ""
-#: builtin/mv.c:210
-msgid "not under version control"
+#: builtin/log.c:878
+msgid "Not a range."
msgstr ""
-#: builtin/mv.c:213
-msgid "destination exists"
+#: builtin/log.c:984
+msgid "Cover letter needs email format"
msgstr ""
-#: builtin/mv.c:221
+#: builtin/log.c:1063
#, c-format
-msgid "overwriting '%s'"
+msgid "insane in-reply-to: %s"
msgstr ""
-#: builtin/mv.c:224
-msgid "Cannot overwrite"
+#: builtin/log.c:1091
+msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr ""
-#: builtin/mv.c:227
-msgid "multiple sources for the same target"
+#: builtin/log.c:1141
+msgid "Two output directories?"
msgstr ""
-#: builtin/mv.c:229
-msgid "destination directory does not exist"
+#: builtin/log.c:1248 builtin/log.c:1891 builtin/log.c:1893 builtin/log.c:1905
+#, c-format
+msgid "Unknown commit %s"
msgstr ""
-#: builtin/mv.c:236
+#: builtin/log.c:1258 builtin/notes.c:884 builtin/tag.c:476
#, c-format
-msgid "%s, source=%s, destination=%s"
+msgid "Failed to resolve '%s' as a valid ref."
msgstr ""
-#: builtin/mv.c:257
-#, c-format
-msgid "Renaming %s to %s\n"
+#: builtin/log.c:1263
+msgid "Could not find exact merge base."
msgstr ""
-#: builtin/mv.c:263 builtin/remote.c:710 builtin/repack.c:375
-#, c-format
-msgid "renaming '%s' failed"
+#: builtin/log.c:1267
+msgid ""
+"Failed to get upstream, if you want to record base commit automatically,\n"
+"please use git branch --set-upstream-to to track a remote branch.\n"
+"Or you could specify base commit by --base=<base-commit-id> manually."
msgstr ""
-#: builtin/name-rev.c:258
-msgid "git name-rev [<options>] <commit>..."
+#: builtin/log.c:1287
+msgid "Failed to find exact merge base"
msgstr ""
-#: builtin/name-rev.c:259
-msgid "git name-rev [<options>] --all"
+#: builtin/log.c:1298
+msgid "base commit should be the ancestor of revision list"
msgstr ""
-#: builtin/name-rev.c:260
-msgid "git name-rev [<options>] --stdin"
+#: builtin/log.c:1302
+msgid "base commit shouldn't be in revision list"
msgstr ""
-#: builtin/name-rev.c:312
-msgid "print only names (no SHA-1)"
+#: builtin/log.c:1351
+msgid "cannot get patch id"
msgstr ""
-#: builtin/name-rev.c:313
-msgid "only use tags to name the commits"
+#: builtin/log.c:1408
+msgid "use [PATCH n/m] even with a single patch"
msgstr ""
-#: builtin/name-rev.c:315
-msgid "only use refs matching <pattern>"
+#: builtin/log.c:1411
+msgid "use [PATCH] even with multiple patches"
msgstr ""
-#: builtin/name-rev.c:317
-msgid "list all commits reachable from all refs"
+#: builtin/log.c:1415
+msgid "print patches to standard out"
msgstr ""
-#: builtin/name-rev.c:318
-msgid "read from stdin"
+#: builtin/log.c:1417
+msgid "generate a cover letter"
msgstr ""
-#: builtin/name-rev.c:319
-msgid "allow to print `undefined` names (default)"
+#: builtin/log.c:1419
+msgid "use simple number sequence for output file names"
msgstr ""
-#: builtin/name-rev.c:325
-msgid "dereference tags in the input (internal use)"
+#: builtin/log.c:1420
+msgid "sfx"
msgstr ""
-#: builtin/notes.c:25
-msgid "git notes [--ref <notes-ref>] [list [<object>]]"
+#: builtin/log.c:1421
+msgid "use <sfx> instead of '.patch'"
msgstr ""
-#: builtin/notes.c:26
-msgid ""
-"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
-"| (-c | -C) <object>] [<object>]"
+#: builtin/log.c:1423
+msgid "start numbering patches at <n> instead of 1"
msgstr ""
-#: builtin/notes.c:27
-msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
+#: builtin/log.c:1425
+msgid "mark the series as Nth re-roll"
msgstr ""
-#: builtin/notes.c:28
-msgid ""
-"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
-"(-c | -C) <object>] [<object>]"
+#: builtin/log.c:1427
+msgid "Use [RFC PATCH] instead of [PATCH]"
msgstr ""
-#: builtin/notes.c:29
-msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
+#: builtin/log.c:1430
+msgid "Use [<prefix>] instead of [PATCH]"
msgstr ""
-#: builtin/notes.c:30
-msgid "git notes [--ref <notes-ref>] show [<object>]"
+#: builtin/log.c:1433
+msgid "store resulting files in <dir>"
msgstr ""
-#: builtin/notes.c:31
-msgid ""
-"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
+#: builtin/log.c:1436
+msgid "don't strip/add [PATCH]"
msgstr ""
-#: builtin/notes.c:32
-msgid "git notes merge --commit [-v | -q]"
+#: builtin/log.c:1439
+msgid "don't output binary diffs"
msgstr ""
-#: builtin/notes.c:33
-msgid "git notes merge --abort [-v | -q]"
+#: builtin/log.c:1441
+msgid "output all-zero hash in From header"
msgstr ""
-#: builtin/notes.c:34
-msgid "git notes [--ref <notes-ref>] remove [<object>...]"
+#: builtin/log.c:1443
+msgid "don't include a patch matching a commit upstream"
msgstr ""
-#: builtin/notes.c:35
-msgid "git notes [--ref <notes-ref>] prune [-n | -v]"
+#: builtin/log.c:1445
+msgid "show patch format instead of default (patch + stat)"
msgstr ""
-#: builtin/notes.c:36
-msgid "git notes [--ref <notes-ref>] get-ref"
+#: builtin/log.c:1447
+msgid "Messaging"
msgstr ""
-#: builtin/notes.c:41
-msgid "git notes [list [<object>]]"
+#: builtin/log.c:1448
+msgid "header"
msgstr ""
-#: builtin/notes.c:46
-msgid "git notes add [<options>] [<object>]"
+#: builtin/log.c:1449
+msgid "add email header"
msgstr ""
-#: builtin/notes.c:51
-msgid "git notes copy [<options>] <from-object> <to-object>"
+#: builtin/log.c:1450 builtin/log.c:1452
+msgid "email"
msgstr ""
-#: builtin/notes.c:52
-msgid "git notes copy --stdin [<from-object> <to-object>]..."
+#: builtin/log.c:1450
+msgid "add To: header"
msgstr ""
-#: builtin/notes.c:57
-msgid "git notes append [<options>] [<object>]"
+#: builtin/log.c:1452
+msgid "add Cc: header"
msgstr ""
-#: builtin/notes.c:62
-msgid "git notes edit [<object>]"
+#: builtin/log.c:1454
+msgid "ident"
msgstr ""
-#: builtin/notes.c:67
-msgid "git notes show [<object>]"
+#: builtin/log.c:1455
+msgid "set From address to <ident> (or committer ident if absent)"
msgstr ""
-#: builtin/notes.c:72
-msgid "git notes merge [<options>] <notes-ref>"
+#: builtin/log.c:1457
+msgid "message-id"
msgstr ""
-#: builtin/notes.c:73
-msgid "git notes merge --commit [<options>]"
+#: builtin/log.c:1458
+msgid "make first mail a reply to <message-id>"
msgstr ""
-#: builtin/notes.c:74
-msgid "git notes merge --abort [<options>]"
+#: builtin/log.c:1459 builtin/log.c:1462
+msgid "boundary"
msgstr ""
-#: builtin/notes.c:79
-msgid "git notes remove [<object>]"
+#: builtin/log.c:1460
+msgid "attach the patch"
msgstr ""
-#: builtin/notes.c:84
-msgid "git notes prune [<options>]"
+#: builtin/log.c:1463
+msgid "inline the patch"
msgstr ""
-#: builtin/notes.c:89
-msgid "git notes get-ref"
+#: builtin/log.c:1467
+msgid "enable message threading, styles: shallow, deep"
msgstr ""
-#: builtin/notes.c:94
-msgid "Write/edit the notes for the following object:"
+#: builtin/log.c:1469
+msgid "signature"
msgstr ""
-#: builtin/notes.c:147
-#, c-format
-msgid "unable to start 'show' for object '%s'"
+#: builtin/log.c:1470
+msgid "add a signature"
msgstr ""
-#: builtin/notes.c:151
-msgid "could not read 'show' output"
+#: builtin/log.c:1471
+msgid "base-commit"
msgstr ""
-#: builtin/notes.c:159
-#, c-format
-msgid "failed to finish 'show' for object '%s'"
+#: builtin/log.c:1472
+msgid "add prerequisite tree info to the patch series"
msgstr ""
-#: builtin/notes.c:194
-msgid "Please supply the note contents using either -m or -F option"
+#: builtin/log.c:1474
+msgid "add a signature from a file"
msgstr ""
-#: builtin/notes.c:203
-msgid "unable to write note object"
+#: builtin/log.c:1475
+msgid "don't print the patch filenames"
msgstr ""
-#: builtin/notes.c:205
-#, c-format
-msgid "The note contents have been left in %s"
+#: builtin/log.c:1565
+msgid "-n and -k are mutually exclusive."
msgstr ""
-#: builtin/notes.c:233 builtin/tag.c:439
-#, c-format
-msgid "cannot read '%s'"
+#: builtin/log.c:1567
+msgid "--subject-prefix/--rfc and -k are mutually exclusive."
msgstr ""
-#: builtin/notes.c:235 builtin/tag.c:442
-#, c-format
-msgid "could not open or read '%s'"
+#: builtin/log.c:1575
+msgid "--name-only does not make sense"
msgstr ""
-#: builtin/notes.c:257
-#, c-format
-msgid "Failed to read object '%s'."
+#: builtin/log.c:1577
+msgid "--name-status does not make sense"
msgstr ""
-#: builtin/notes.c:261
-#, c-format
-msgid "Cannot read note data from non-blob object '%s'."
+#: builtin/log.c:1579
+msgid "--check does not make sense"
msgstr ""
-#: builtin/notes.c:363 builtin/notes.c:418 builtin/notes.c:494
-#: builtin/notes.c:506 builtin/notes.c:582 builtin/notes.c:650
-#: builtin/notes.c:800 builtin/notes.c:947 builtin/notes.c:968
-msgid "too many parameters"
+#: builtin/log.c:1609
+msgid "standard output, or directory, which one?"
msgstr ""
-#: builtin/notes.c:376 builtin/notes.c:663
+#: builtin/log.c:1611
#, c-format
-msgid "No note found for object %s."
+msgid "Could not create directory '%s'"
msgstr ""
-#: builtin/notes.c:397 builtin/notes.c:560
-msgid "note contents as a string"
+#: builtin/log.c:1705
+#, c-format
+msgid "unable to read signature file '%s'"
msgstr ""
-#: builtin/notes.c:400 builtin/notes.c:563
-msgid "note contents in a file"
+#: builtin/log.c:1777
+msgid "Failed to create output files"
msgstr ""
-#: builtin/notes.c:403 builtin/notes.c:566
-msgid "reuse and edit specified note object"
+#: builtin/log.c:1826
+msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr ""
-#: builtin/notes.c:406 builtin/notes.c:569
-msgid "reuse specified note object"
+#: builtin/log.c:1880
+#, c-format
+msgid ""
+"Could not find a tracked remote branch, please specify <upstream> manually.\n"
msgstr ""
-#: builtin/notes.c:409 builtin/notes.c:572
-msgid "allow storing empty note"
+#: builtin/ls-files.c:460
+msgid "git ls-files [<options>] [<file>...]"
msgstr ""
-#: builtin/notes.c:410 builtin/notes.c:481
-msgid "replace existing notes"
+#: builtin/ls-files.c:509
+msgid "identify the file status with tags"
msgstr ""
-#: builtin/notes.c:435
-#, c-format
-msgid ""
-"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
-"existing notes"
+#: builtin/ls-files.c:511
+msgid "use lowercase letters for 'assume unchanged' files"
msgstr ""
-#: builtin/notes.c:450 builtin/notes.c:529
-#, c-format
-msgid "Overwriting existing notes for object %s\n"
+#: builtin/ls-files.c:513
+msgid "show cached files in the output (default)"
msgstr ""
-#: builtin/notes.c:461 builtin/notes.c:622 builtin/notes.c:887
-#, c-format
-msgid "Removing note for object %s\n"
+#: builtin/ls-files.c:515
+msgid "show deleted files in the output"
msgstr ""
-#: builtin/notes.c:482
-msgid "read objects from stdin"
+#: builtin/ls-files.c:517
+msgid "show modified files in the output"
msgstr ""
-#: builtin/notes.c:484
-msgid "load rewriting config for <command> (implies --stdin)"
+#: builtin/ls-files.c:519
+msgid "show other files in the output"
msgstr ""
-#: builtin/notes.c:502
-msgid "too few parameters"
+#: builtin/ls-files.c:521
+msgid "show ignored files in the output"
msgstr ""
-#: builtin/notes.c:523
-#, c-format
-msgid ""
-"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
-"existing notes"
+#: builtin/ls-files.c:524
+msgid "show staged contents' object name in the output"
msgstr ""
-#: builtin/notes.c:535
-#, c-format
-msgid "Missing notes on source object %s. Cannot copy."
+#: builtin/ls-files.c:526
+msgid "show files on the filesystem that need to be removed"
msgstr ""
-#: builtin/notes.c:587
-#, 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/ls-files.c:528
+msgid "show 'other' directories' names only"
msgstr ""
-#: builtin/notes.c:753
-#, c-format
-msgid "unknown notes merge strategy %s"
+#: builtin/ls-files.c:530
+msgid "show line endings of files"
msgstr ""
-#: builtin/notes.c:769
-msgid "General options"
+#: builtin/ls-files.c:532
+msgid "don't show empty directories"
msgstr ""
-#: builtin/notes.c:771
-msgid "Merge options"
+#: builtin/ls-files.c:535
+msgid "show unmerged files in the output"
msgstr ""
-#: builtin/notes.c:773
-msgid ""
-"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
-"cat_sort_uniq)"
+#: builtin/ls-files.c:537
+msgid "show resolve-undo information"
msgstr ""
-#: builtin/notes.c:775
-msgid "Committing unmerged notes"
+#: builtin/ls-files.c:539
+msgid "skip files matching pattern"
msgstr ""
-#: builtin/notes.c:777
-msgid "finalize notes merge by committing unmerged notes"
+#: builtin/ls-files.c:542
+msgid "exclude patterns are read from <file>"
msgstr ""
-#: builtin/notes.c:779
-msgid "Aborting notes merge resolution"
+#: builtin/ls-files.c:545
+msgid "read additional per-directory exclude patterns in <file>"
msgstr ""
-#: builtin/notes.c:781
-msgid "abort notes merge"
+#: builtin/ls-files.c:547
+msgid "add the standard git exclusions"
msgstr ""
-#: builtin/notes.c:792
-msgid "cannot mix --commit, --abort or -s/--strategy"
+#: builtin/ls-files.c:550
+msgid "make the output relative to the project top directory"
msgstr ""
-#: builtin/notes.c:797
-msgid "Must specify a notes ref to merge"
+#: builtin/ls-files.c:553
+msgid "recurse through submodules"
msgstr ""
-#: builtin/notes.c:821
-#, c-format
-msgid "Unknown -s/--strategy: %s"
+#: builtin/ls-files.c:555
+msgid "if any <file> is not in the index, treat this as an error"
msgstr ""
-#: builtin/notes.c:858
-#, c-format
-msgid "A notes merge into %s is already in-progress at %s"
+#: builtin/ls-files.c:556
+msgid "tree-ish"
msgstr ""
-#: builtin/notes.c:861
-#, c-format
-msgid "Failed to store link to current notes ref (%s)"
+#: builtin/ls-files.c:557
+msgid "pretend that paths removed since <tree-ish> are still present"
msgstr ""
-#: builtin/notes.c:863
-#, c-format
-msgid ""
-"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
-"'git notes merge --commit', or abort the merge with 'git notes merge --"
-"abort'.\n"
+#: builtin/ls-files.c:559
+msgid "show debugging data"
msgstr ""
-#: builtin/notes.c:885
-#, c-format
-msgid "Object %s has no note\n"
+#: builtin/ls-remote.c:7
+msgid ""
+"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
+" [-q | --quiet] [--exit-code] [--get-url]\n"
+" [--symref] [<repository> [<refs>...]]"
msgstr ""
-#: builtin/notes.c:897
-msgid "attempt to remove non-existent note is not an error"
+#: builtin/ls-remote.c:50
+msgid "do not print remote URL"
msgstr ""
-#: builtin/notes.c:900
-msgid "read object names from the standard input"
+#: builtin/ls-remote.c:51 builtin/ls-remote.c:53
+msgid "exec"
msgstr ""
-#: builtin/notes.c:938 builtin/prune.c:105 builtin/worktree.c:127
-msgid "do not remove, show only"
+#: builtin/ls-remote.c:52 builtin/ls-remote.c:54
+msgid "path of git-upload-pack on the remote host"
msgstr ""
-#: builtin/notes.c:939
-msgid "report pruned notes"
+#: builtin/ls-remote.c:56
+msgid "limit to tags"
msgstr ""
-#: builtin/notes.c:981
-msgid "notes-ref"
+#: builtin/ls-remote.c:57
+msgid "limit to heads"
msgstr ""
-#: builtin/notes.c:982
-msgid "use notes from <notes-ref>"
+#: builtin/ls-remote.c:58
+msgid "do not show peeled tags"
msgstr ""
-#: builtin/notes.c:1017 builtin/remote.c:1623
-#, c-format
-msgid "Unknown subcommand: %s"
+#: builtin/ls-remote.c:60
+msgid "take url.<base>.insteadOf into account"
msgstr ""
-#: builtin/pack-objects.c:28
-msgid ""
-"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
+#: builtin/ls-remote.c:62
+msgid "exit with exit code 2 if no matching refs are found"
msgstr ""
-#: builtin/pack-objects.c:29
-msgid ""
-"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
+#: builtin/ls-remote.c:64
+msgid "show underlying ref in addition to the object pointed by it"
msgstr ""
-#: builtin/pack-objects.c:177 builtin/pack-objects.c:180
-#, c-format
-msgid "deflate error (%d)"
+#: builtin/ls-tree.c:28
+msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
msgstr ""
-#: builtin/pack-objects.c:766
-msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
+#: builtin/ls-tree.c:126
+msgid "only show trees"
msgstr ""
-#: builtin/pack-objects.c:779
-msgid "Writing objects"
+#: builtin/ls-tree.c:128
+msgid "recurse into subtrees"
msgstr ""
-#: builtin/pack-objects.c:1037
-msgid "disabling bitmap writing, as some objects are not being packed"
+#: builtin/ls-tree.c:130
+msgid "show trees when recursing"
msgstr ""
-#: builtin/pack-objects.c:2197
-msgid "Compressing objects"
+#: builtin/ls-tree.c:133
+msgid "terminate entries with NUL byte"
msgstr ""
-#: builtin/pack-objects.c:2611
-#, c-format
-msgid "unsupported index version %s"
+#: builtin/ls-tree.c:134
+msgid "include object size"
msgstr ""
-#: builtin/pack-objects.c:2615
-#, c-format
-msgid "bad index version '%s'"
+#: builtin/ls-tree.c:136 builtin/ls-tree.c:138
+msgid "list only filenames"
msgstr ""
-#: builtin/pack-objects.c:2645
-msgid "do not show progress meter"
+#: builtin/ls-tree.c:141
+msgid "use full path names"
msgstr ""
-#: builtin/pack-objects.c:2647
-msgid "show progress meter"
+#: builtin/ls-tree.c:143
+msgid "list entire tree; not just current directory (implies --full-name)"
msgstr ""
-#: builtin/pack-objects.c:2649
-msgid "show progress meter during object writing phase"
+#: builtin/merge.c:46
+msgid "git merge [<options>] [<commit>...]"
msgstr ""
-#: builtin/pack-objects.c:2652
-msgid "similar to --all-progress when progress meter is shown"
+#: builtin/merge.c:47
+msgid "git merge [<options>] <msg> HEAD <commit>"
msgstr ""
-#: builtin/pack-objects.c:2653
-msgid "version[,offset]"
+#: builtin/merge.c:48
+msgid "git merge --abort"
msgstr ""
-#: builtin/pack-objects.c:2654
-msgid "write the pack index file in the specified idx format version"
+#: builtin/merge.c:49
+msgid "git merge --continue"
msgstr ""
-#: builtin/pack-objects.c:2657
-msgid "maximum size of each output pack file"
+#: builtin/merge.c:104
+msgid "switch `m' requires a value"
msgstr ""
-#: builtin/pack-objects.c:2659
-msgid "ignore borrowed objects from alternate object store"
+#: builtin/merge.c:141
+#, c-format
+msgid "Could not find merge strategy '%s'.\n"
msgstr ""
-#: builtin/pack-objects.c:2661
-msgid "ignore packed objects"
+#: builtin/merge.c:142
+#, c-format
+msgid "Available strategies are:"
msgstr ""
-#: builtin/pack-objects.c:2663
-msgid "limit pack window by objects"
+#: builtin/merge.c:147
+#, c-format
+msgid "Available custom strategies are:"
msgstr ""
-#: builtin/pack-objects.c:2665
-msgid "limit pack window by memory in addition to object limit"
+#: builtin/merge.c:197 builtin/pull.c:127
+msgid "do not show a diffstat at the end of the merge"
msgstr ""
-#: builtin/pack-objects.c:2667
-msgid "maximum length of delta chain allowed in the resulting pack"
+#: builtin/merge.c:200 builtin/pull.c:130
+msgid "show a diffstat at the end of the merge"
msgstr ""
-#: builtin/pack-objects.c:2669
-msgid "reuse existing deltas"
+#: builtin/merge.c:201 builtin/pull.c:133
+msgid "(synonym to --stat)"
msgstr ""
-#: builtin/pack-objects.c:2671
-msgid "reuse existing objects"
+#: builtin/merge.c:203 builtin/pull.c:136
+msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr ""
-#: builtin/pack-objects.c:2673
-msgid "use OFS_DELTA objects"
+#: builtin/merge.c:206 builtin/pull.c:139
+msgid "create a single commit instead of doing a merge"
msgstr ""
-#: builtin/pack-objects.c:2675
-msgid "use threads when searching for best delta matches"
+#: builtin/merge.c:208 builtin/pull.c:142
+msgid "perform a commit if the merge succeeds (default)"
msgstr ""
-#: builtin/pack-objects.c:2677
-msgid "do not create an empty pack output"
+#: builtin/merge.c:210 builtin/pull.c:145
+msgid "edit message before committing"
msgstr ""
-#: builtin/pack-objects.c:2679
-msgid "read revision arguments from standard input"
+#: builtin/merge.c:211
+msgid "allow fast-forward (default)"
msgstr ""
-#: builtin/pack-objects.c:2681
-msgid "limit the objects to those that are not yet packed"
+#: builtin/merge.c:213 builtin/pull.c:151
+msgid "abort if fast-forward is not possible"
msgstr ""
-#: builtin/pack-objects.c:2684
-msgid "include objects reachable from any reference"
+#: builtin/merge.c:217 builtin/pull.c:154
+msgid "verify that the named commit has a valid GPG signature"
msgstr ""
-#: builtin/pack-objects.c:2687
-msgid "include objects referred by reflog entries"
+#: builtin/merge.c:218 builtin/notes.c:774 builtin/pull.c:158
+#: builtin/revert.c:89
+msgid "strategy"
msgstr ""
-#: builtin/pack-objects.c:2690
-msgid "include objects referred to by the index"
+#: builtin/merge.c:219 builtin/pull.c:159
+msgid "merge strategy to use"
msgstr ""
-#: builtin/pack-objects.c:2693
-msgid "output pack to stdout"
+#: builtin/merge.c:220 builtin/pull.c:162
+msgid "option=value"
msgstr ""
-#: builtin/pack-objects.c:2695
-msgid "include tag objects that refer to objects to be packed"
+#: builtin/merge.c:221 builtin/pull.c:163
+msgid "option for selected merge strategy"
msgstr ""
-#: builtin/pack-objects.c:2697
-msgid "keep unreachable objects"
+#: builtin/merge.c:223
+msgid "merge commit message (for a non-fast-forward merge)"
msgstr ""
-#: builtin/pack-objects.c:2699
-msgid "pack loose unreachable objects"
+#: builtin/merge.c:227
+msgid "abort the current in-progress merge"
msgstr ""
-#: builtin/pack-objects.c:2700 parse-options.h:142
-msgid "time"
+#: builtin/merge.c:229
+msgid "continue the current in-progress merge"
msgstr ""
-#: builtin/pack-objects.c:2701
-msgid "unpack unreachable objects newer than <time>"
+#: builtin/merge.c:231 builtin/pull.c:170
+msgid "allow merging unrelated histories"
msgstr ""
-#: builtin/pack-objects.c:2704
-msgid "create thin packs"
+#: builtin/merge.c:259
+msgid "could not run stash."
msgstr ""
-#: builtin/pack-objects.c:2706
-msgid "create packs suitable for shallow fetches"
+#: builtin/merge.c:264
+msgid "stash failed"
msgstr ""
-#: builtin/pack-objects.c:2708
-msgid "ignore packs that have companion .keep file"
+#: builtin/merge.c:269
+#, c-format
+msgid "not a valid object: %s"
msgstr ""
-#: builtin/pack-objects.c:2710
-msgid "pack compression level"
+#: builtin/merge.c:288 builtin/merge.c:305
+msgid "read-tree failed"
msgstr ""
-#: builtin/pack-objects.c:2712
-msgid "do not hide commits by grafts"
+#: builtin/merge.c:335
+msgid " (nothing to squash)"
msgstr ""
-#: builtin/pack-objects.c:2714
-msgid "use a bitmap index if available to speed up counting objects"
+#: builtin/merge.c:346
+#, c-format
+msgid "Squash commit -- not updating HEAD\n"
msgstr ""
-#: builtin/pack-objects.c:2716
-msgid "write a bitmap index together with the pack index"
+#: builtin/merge.c:396
+#, c-format
+msgid "No merge message -- not updating HEAD\n"
msgstr ""
-#: builtin/pack-objects.c:2829
-msgid "Counting objects"
+#: builtin/merge.c:447
+#, c-format
+msgid "'%s' does not point to a commit"
msgstr ""
-#: builtin/pack-refs.c:6
-msgid "git pack-refs [<options>]"
+#: builtin/merge.c:537
+#, c-format
+msgid "Bad branch.%s.mergeoptions string: %s"
msgstr ""
-#: builtin/pack-refs.c:14
-msgid "pack everything"
+#: builtin/merge.c:656
+msgid "Not handling anything other than two heads merge."
msgstr ""
-#: builtin/pack-refs.c:15
-msgid "prune loose refs (default)"
+#: builtin/merge.c:670
+#, c-format
+msgid "Unknown option for merge-recursive: -X%s"
msgstr ""
-#: builtin/prune-packed.c:7
-msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
+#: builtin/merge.c:685
+#, c-format
+msgid "unable to write %s"
msgstr ""
-#: builtin/prune-packed.c:40
-msgid "Removing duplicate objects"
+#: builtin/merge.c:737
+#, c-format
+msgid "Could not read from '%s'"
msgstr ""
-#: builtin/prune.c:11
-msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
+#: builtin/merge.c:746
+#, c-format
+msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr ""
-#: builtin/prune.c:106 builtin/worktree.c:128
-msgid "report pruned objects"
+#: builtin/merge.c:752
+#, 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/prune.c:109 builtin/worktree.c:130
-msgid "expire objects older than <time>"
+#: builtin/merge.c:776
+msgid "Empty commit message."
msgstr ""
-#: builtin/prune.c:123
-msgid "cannot prune in a precious-objects repo"
+#: builtin/merge.c:796
+#, c-format
+msgid "Wonderful.\n"
msgstr ""
-#: builtin/pull.c:72
-msgid "git pull [<options>] [<repository> [<refspec>...]]"
+#: builtin/merge.c:851
+#, c-format
+msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr ""
-#: builtin/pull.c:120
-msgid "Options related to merging"
+#: builtin/merge.c:867
+#, c-format
+msgid "'%s' is not a commit"
msgstr ""
-#: builtin/pull.c:123
-msgid "incorporate changes by rebasing rather than merging"
+#: builtin/merge.c:908
+msgid "No current branch."
msgstr ""
-#: builtin/pull.c:147 builtin/revert.c:101
-msgid "allow fast-forward"
+#: builtin/merge.c:910
+msgid "No remote for the current branch."
msgstr ""
-#: builtin/pull.c:156
-msgid "automatically stash/stash pop before and after rebase"
+#: builtin/merge.c:912
+msgid "No default upstream defined for the current branch."
msgstr ""
-#: builtin/pull.c:172
-msgid "Options related to fetching"
+#: builtin/merge.c:917
+#, c-format
+msgid "No remote-tracking branch for %s from %s"
msgstr ""
-#: builtin/pull.c:194
-msgid "number of submodules pulled in parallel"
+#: builtin/merge.c:964
+#, c-format
+msgid "Bad value '%s' in environment '%s'"
msgstr ""
-#: builtin/pull.c:283
+#: builtin/merge.c:1038
#, c-format
-msgid "Invalid value for pull.ff: %s"
+msgid "could not close '%s'"
msgstr ""
-#: builtin/pull.c:379 git-sh-setup.sh:226
-msgid "Cannot pull with rebase: You have unstaged changes."
+#: builtin/merge.c:1065
+#, c-format
+msgid "not something we can merge in %s: %s"
msgstr ""
-#: builtin/pull.c:385 git-sh-setup.sh:252
-msgid "Additionally, your index contains uncommitted changes."
+#: builtin/merge.c:1099
+msgid "not something we can merge"
msgstr ""
-#: builtin/pull.c:387 git-sh-setup.sh:245
-msgid "Cannot pull with rebase: Your index contains uncommitted changes."
+#: builtin/merge.c:1167
+msgid "--abort expects no arguments"
msgstr ""
-#: builtin/pull.c:463
-msgid ""
-"There is no candidate for rebasing against among the refs that you just "
-"fetched."
+#: builtin/merge.c:1171
+msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr ""
-#: builtin/pull.c:465
-msgid ""
-"There are no candidates for merging among the refs that you just fetched."
+#: builtin/merge.c:1183
+msgid "--continue expects no arguments"
msgstr ""
-#: builtin/pull.c:466
+#: builtin/merge.c:1187
+msgid "There is no merge in progress (MERGE_HEAD missing)."
+msgstr ""
+
+#: builtin/merge.c:1203
msgid ""
-"Generally this means that you provided a wildcard refspec which had no\n"
-"matches on the remote end."
+"You have not concluded your merge (MERGE_HEAD exists).\n"
+"Please, commit your changes before you merge."
msgstr ""
-#: builtin/pull.c:469
-#, c-format
+#: builtin/merge.c:1210
msgid ""
-"You asked to pull from the remote '%s', but did not specify\n"
-"a branch. Because this is not the default configured remote\n"
-"for your current branch, you must specify a branch on the command line."
+"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
+"Please, commit your changes before you merge."
msgstr ""
-#: builtin/pull.c:474 git-parse-remote.sh:73
-msgid "You are not currently on a branch."
+#: builtin/merge.c:1213
+msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr ""
-#: builtin/pull.c:476 builtin/pull.c:491 git-parse-remote.sh:79
-msgid "Please specify which branch you want to rebase against."
+#: builtin/merge.c:1222
+msgid "You cannot combine --squash with --no-ff."
msgstr ""
-#: builtin/pull.c:478 builtin/pull.c:493 git-parse-remote.sh:82
-msgid "Please specify which branch you want to merge with."
+#: builtin/merge.c:1230
+msgid "No commit specified and merge.defaultToUpstream not set."
msgstr ""
-#: builtin/pull.c:479 builtin/pull.c:494
-msgid "See git-pull(1) for details."
+#: builtin/merge.c:1247
+msgid "Squash commit into empty head not supported yet"
msgstr ""
-#: builtin/pull.c:481 builtin/pull.c:487 builtin/pull.c:496
-#: git-parse-remote.sh:64
-msgid "<remote>"
+#: builtin/merge.c:1249
+msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr ""
-#: builtin/pull.c:481 builtin/pull.c:496 builtin/pull.c:501 git-rebase.sh:451
-#: git-parse-remote.sh:65
-msgid "<branch>"
+#: builtin/merge.c:1254
+#, c-format
+msgid "%s - not something we can merge"
msgstr ""
-#: builtin/pull.c:489 git-parse-remote.sh:75
-msgid "There is no tracking information for the current branch."
+#: builtin/merge.c:1256
+msgid "Can merge only exactly one commit into empty head"
msgstr ""
-#: builtin/pull.c:498 git-parse-remote.sh:95
-msgid ""
-"If you wish to set tracking information for this branch you can do so with:"
+#: builtin/merge.c:1312
+#, c-format
+msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr ""
-#: builtin/pull.c:503
+#: builtin/merge.c:1315
#, c-format
-msgid ""
-"Your configuration specifies to merge with the ref '%s'\n"
-"from the remote, but no such ref was fetched."
+msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr ""
-#: builtin/pull.c:820
-msgid "ignoring --verify-signatures for rebase"
+#: builtin/merge.c:1318
+#, c-format
+msgid "Commit %s does not have a GPG signature."
msgstr ""
-#: builtin/pull.c:867
-msgid "--[no-]autostash option is only valid with --rebase."
+#: builtin/merge.c:1321
+#, c-format
+msgid "Commit %s has a good GPG signature by %s\n"
msgstr ""
-#: builtin/pull.c:875
-msgid "Updating an unborn branch with changes added to the index."
+#: builtin/merge.c:1383
+msgid "refusing to merge unrelated histories"
+msgstr ""
+
+#: builtin/merge.c:1392
+msgid "Already up-to-date."
msgstr ""
-#: builtin/pull.c:903
+#: builtin/merge.c:1402
#, c-format
-msgid ""
-"fetch updated the current branch head.\n"
-"fast-forwarding your working tree from\n"
-"commit %s."
+msgid "Updating %s..%s\n"
msgstr ""
-#: builtin/pull.c:908
+#: builtin/merge.c:1443
#, c-format
-msgid ""
-"Cannot fast-forward your working tree.\n"
-"After making sure that you saved anything precious from\n"
-"$ git diff %s\n"
-"output, run\n"
-"$ git reset --hard\n"
-"to recover."
-msgstr ""
-
-#: builtin/pull.c:923
-msgid "Cannot merge multiple branches into empty head."
+msgid "Trying really trivial in-index merge...\n"
msgstr ""
-#: builtin/pull.c:927
-msgid "Cannot rebase onto multiple branches."
+#: builtin/merge.c:1450
+#, c-format
+msgid "Nope.\n"
msgstr ""
-#: builtin/push.c:16
-msgid "git push [<options>] [<repository> [<refspec>...]]"
+#: builtin/merge.c:1475
+msgid "Already up-to-date. Yeeah!"
msgstr ""
-#: builtin/push.c:89
-msgid "tag shorthand without <tag>"
+#: builtin/merge.c:1481
+msgid "Not possible to fast-forward, aborting."
msgstr ""
-#: builtin/push.c:99
-msgid "--delete only accepts plain target ref names"
+#: builtin/merge.c:1504 builtin/merge.c:1583
+#, c-format
+msgid "Rewinding the tree to pristine...\n"
msgstr ""
-#: builtin/push.c:143
-msgid ""
-"\n"
-"To choose either option permanently, see push.default in 'git help config'."
+#: builtin/merge.c:1508
+#, c-format
+msgid "Trying merge strategy %s...\n"
msgstr ""
-#: builtin/push.c:146
+#: builtin/merge.c:1574
#, 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"
+msgid "No merge strategy handled the merge.\n"
msgstr ""
-#: builtin/push.c:161
+#: builtin/merge.c:1576
#, c-format
-msgid ""
-"You are not currently on a branch.\n"
-"To push the history leading to the current (detached HEAD)\n"
-"state now, use\n"
-"\n"
-" git push %s HEAD:<name-of-remote-branch>\n"
+msgid "Merge with strategy %s failed.\n"
msgstr ""
-#: builtin/push.c:175
+#: builtin/merge.c:1585
#, 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"
+msgid "Using the %s to prepare resolving by hand.\n"
msgstr ""
-#: builtin/push.c:183
+#: builtin/merge.c:1597
#, c-format
-msgid "The current branch %s has multiple upstream branches, refusing to push."
+msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
-#: builtin/push.c:186
-#, 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/merge-base.c:29
+msgid "git merge-base [-a | --all] <commit> <commit>..."
msgstr ""
-#: builtin/push.c:242
-msgid ""
-"You didn't specify any refspecs to push, and push.default is \"nothing\"."
+#: builtin/merge-base.c:30
+msgid "git merge-base [-a | --all] --octopus <commit>..."
msgstr ""
-#: builtin/push.c:249
-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."
+#: builtin/merge-base.c:31
+msgid "git merge-base --independent <commit>..."
msgstr ""
-#: builtin/push.c:255
-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."
+#: builtin/merge-base.c:32
+msgid "git merge-base --is-ancestor <commit> <commit>"
msgstr ""
-#: builtin/push.c:261
-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."
+#: builtin/merge-base.c:33
+msgid "git merge-base --fork-point <ref> [<commit>]"
msgstr ""
-#: builtin/push.c:268
-msgid "Updates were rejected because the tag already exists in the remote."
+#: builtin/merge-base.c:217
+msgid "output all common ancestors"
msgstr ""
-#: builtin/push.c:271
-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"
+#: builtin/merge-base.c:219
+msgid "find ancestors for a single n-way merge"
msgstr ""
-#: builtin/push.c:331
-#, c-format
-msgid "Pushing to %s\n"
+#: builtin/merge-base.c:221
+msgid "list revs not reachable from others"
msgstr ""
-#: builtin/push.c:335
-#, c-format
-msgid "failed to push some refs to '%s'"
+#: builtin/merge-base.c:223
+msgid "is the first one ancestor of the other?"
msgstr ""
-#: builtin/push.c:366
-#, c-format
-msgid "bad repository '%s'"
+#: builtin/merge-base.c:225
+msgid "find where <commit> forked from reflog of <ref>"
msgstr ""
-#: builtin/push.c:367
+#: builtin/merge-file.c:8
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"
+"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
+"<orig-file> <file2>"
msgstr ""
-#: builtin/push.c:385
-msgid "--all and --tags are incompatible"
+#: builtin/merge-file.c:33
+msgid "send results to standard output"
msgstr ""
-#: builtin/push.c:386
-msgid "--all can't be combined with refspecs"
+#: builtin/merge-file.c:34
+msgid "use a diff3 based merge"
msgstr ""
-#: builtin/push.c:391
-msgid "--mirror and --tags are incompatible"
+#: builtin/merge-file.c:35
+msgid "for conflicts, use our version"
msgstr ""
-#: builtin/push.c:392
-msgid "--mirror can't be combined with refspecs"
+#: builtin/merge-file.c:37
+msgid "for conflicts, use their version"
msgstr ""
-#: builtin/push.c:397
-msgid "--all and --mirror are incompatible"
+#: builtin/merge-file.c:39
+msgid "for conflicts, use a union version"
msgstr ""
-#: builtin/push.c:515
-msgid "repository"
+#: builtin/merge-file.c:42
+msgid "for conflicts, use this marker size"
msgstr ""
-#: builtin/push.c:516 builtin/send-pack.c:161
-msgid "push all refs"
+#: builtin/merge-file.c:43
+msgid "do not warn about conflicts"
msgstr ""
-#: builtin/push.c:517 builtin/send-pack.c:163
-msgid "mirror all refs"
+#: builtin/merge-file.c:45
+msgid "set labels for file1/orig-file/file2"
msgstr ""
-#: builtin/push.c:519
-msgid "delete refs"
+#: builtin/merge-recursive.c:45
+#, c-format
+msgid "unknown option %s"
msgstr ""
-#: builtin/push.c:520
-msgid "push tags (can't be used with --all or --mirror)"
+#: builtin/merge-recursive.c:51
+#, c-format
+msgid "could not parse object '%s'"
msgstr ""
-#: builtin/push.c:523 builtin/send-pack.c:164
-msgid "force updates"
-msgstr ""
+#: builtin/merge-recursive.c:55
+#, c-format
+msgid "cannot handle more than %d base. Ignoring %s."
+msgid_plural "cannot handle more than %d bases. Ignoring %s."
+msgstr[0] ""
+msgstr[1] ""
-#: builtin/push.c:525 builtin/send-pack.c:175
-msgid "refname>:<expect"
+#: builtin/merge-recursive.c:63
+msgid "not handling anything other than two heads merge."
msgstr ""
-#: builtin/push.c:526 builtin/send-pack.c:176
-msgid "require old value of ref to be at this value"
+#: builtin/merge-recursive.c:69 builtin/merge-recursive.c:71
+#, c-format
+msgid "could not resolve ref '%s'"
msgstr ""
-#: builtin/push.c:529
-msgid "control recursive pushing of submodules"
+#: builtin/merge-recursive.c:77
+#, c-format
+msgid "Merging %s with %s\n"
msgstr ""
-#: builtin/push.c:531 builtin/send-pack.c:169
-msgid "use thin pack"
+#: builtin/mktree.c:65
+msgid "git mktree [-z] [--missing] [--batch]"
msgstr ""
-#: builtin/push.c:532 builtin/push.c:533 builtin/send-pack.c:158
-#: builtin/send-pack.c:159
-msgid "receive pack program"
+#: builtin/mktree.c:152
+msgid "input is NUL terminated"
msgstr ""
-#: builtin/push.c:534
-msgid "set upstream for git pull/status"
+#: builtin/mktree.c:153 builtin/write-tree.c:24
+msgid "allow missing objects"
msgstr ""
-#: builtin/push.c:537
-msgid "prune locally removed refs"
+#: builtin/mktree.c:154
+msgid "allow creation of more than one tree"
msgstr ""
-#: builtin/push.c:539
-msgid "bypass pre-push hook"
+#: builtin/mv.c:16
+msgid "git mv [<options>] <source>... <destination>"
msgstr ""
-#: builtin/push.c:540
-msgid "push missing but relevant tags"
+#: builtin/mv.c:82
+#, c-format
+msgid "Directory %s is in index and no submodule?"
msgstr ""
-#: builtin/push.c:543 builtin/send-pack.c:166
-msgid "GPG sign the push"
+#: builtin/mv.c:84 builtin/rm.c:290
+msgid "Please stage your changes to .gitmodules or stash them to proceed"
msgstr ""
-#: builtin/push.c:545 builtin/send-pack.c:170
-msgid "request atomic transaction on remote side"
+#: builtin/mv.c:102
+#, c-format
+msgid "%.*s is in index"
msgstr ""
-#: builtin/push.c:546
-msgid "server-specific"
+#: builtin/mv.c:124
+msgid "force move/rename even if target exists"
msgstr ""
-#: builtin/push.c:546
-msgid "option to transmit"
+#: builtin/mv.c:125
+msgid "skip move/rename errors"
msgstr ""
-#: builtin/push.c:560
-msgid "--delete is incompatible with --all, --mirror and --tags"
+#: builtin/mv.c:167
+#, c-format
+msgid "destination '%s' is not a directory"
msgstr ""
-#: builtin/push.c:562
-msgid "--delete doesn't make sense without any refs"
+#: builtin/mv.c:178
+#, c-format
+msgid "Checking rename of '%s' to '%s'\n"
msgstr ""
-#: builtin/push.c:579
-msgid "push options must not have new line characters"
+#: builtin/mv.c:182
+msgid "bad source"
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>]])"
+#: builtin/mv.c:185
+msgid "can not move directory into itself"
msgstr ""
-#: builtin/read-tree.c:110
-msgid "write resulting index to <file>"
+#: builtin/mv.c:188
+msgid "cannot move directory over file"
msgstr ""
-#: builtin/read-tree.c:113
-msgid "only empty the index"
+#: builtin/mv.c:197
+msgid "source directory is empty"
msgstr ""
-#: builtin/read-tree.c:115
-msgid "Merging"
+#: builtin/mv.c:222
+msgid "not under version control"
msgstr ""
-#: builtin/read-tree.c:117
-msgid "perform a merge in addition to a read"
+#: builtin/mv.c:225
+msgid "destination exists"
msgstr ""
-#: builtin/read-tree.c:119
-msgid "3-way merge if no file level merging required"
+#: builtin/mv.c:233
+#, c-format
+msgid "overwriting '%s'"
msgstr ""
-#: builtin/read-tree.c:121
-msgid "3-way merge in presence of adds and removes"
+#: builtin/mv.c:236
+msgid "Cannot overwrite"
msgstr ""
-#: builtin/read-tree.c:123
-msgid "same as -m, but discard unmerged entries"
+#: builtin/mv.c:239
+msgid "multiple sources for the same target"
msgstr ""
-#: builtin/read-tree.c:124
-msgid "<subdirectory>/"
+#: builtin/mv.c:241
+msgid "destination directory does not exist"
msgstr ""
-#: builtin/read-tree.c:125
-msgid "read the tree into the index under <subdirectory>/"
+#: builtin/mv.c:248
+#, c-format
+msgid "%s, source=%s, destination=%s"
msgstr ""
-#: builtin/read-tree.c:128
-msgid "update working tree with merge result"
+#: builtin/mv.c:269
+#, c-format
+msgid "Renaming %s to %s\n"
msgstr ""
-#: builtin/read-tree.c:130
-msgid "gitignore"
+#: builtin/mv.c:275 builtin/remote.c:710 builtin/repack.c:384
+#, c-format
+msgid "renaming '%s' failed"
msgstr ""
-#: builtin/read-tree.c:131
-msgid "allow explicitly ignored files to be overwritten"
+#: builtin/name-rev.c:257
+msgid "git name-rev [<options>] <commit>..."
msgstr ""
-#: builtin/read-tree.c:134
-msgid "don't check the working tree after merging"
+#: builtin/name-rev.c:258
+msgid "git name-rev [<options>] --all"
msgstr ""
-#: builtin/read-tree.c:135
-msgid "don't update the index or the work tree"
+#: builtin/name-rev.c:259
+msgid "git name-rev [<options>] --stdin"
msgstr ""
-#: builtin/read-tree.c:137
-msgid "skip applying sparse checkout filter"
+#: builtin/name-rev.c:311
+msgid "print only names (no SHA-1)"
msgstr ""
-#: builtin/read-tree.c:139
-msgid "debug unpack-trees"
+#: builtin/name-rev.c:312
+msgid "only use tags to name the commits"
msgstr ""
-#: builtin/receive-pack.c:25
-msgid "git receive-pack <git-dir>"
+#: builtin/name-rev.c:314
+msgid "only use refs matching <pattern>"
msgstr ""
-#: builtin/receive-pack.c:1843
-msgid "quiet"
+#: builtin/name-rev.c:316
+msgid "list all commits reachable from all refs"
msgstr ""
-#: builtin/receive-pack.c:1857
-msgid "You must specify a directory."
+#: builtin/name-rev.c:317
+msgid "read from stdin"
msgstr ""
-#: builtin/reflog.c:423
-#, c-format
-msgid "'%s' for '%s' is not a valid timestamp"
+#: builtin/name-rev.c:318
+msgid "allow to print `undefined` names (default)"
msgstr ""
-#: builtin/reflog.c:540 builtin/reflog.c:545
-#, c-format
-msgid "'%s' is not a valid timestamp"
+#: builtin/name-rev.c:324
+msgid "dereference tags in the input (internal use)"
msgstr ""
-#: builtin/remote.c:12
-msgid "git remote [-v | --verbose]"
+#: builtin/notes.c:25
+msgid "git notes [--ref <notes-ref>] [list [<object>]]"
msgstr ""
-#: builtin/remote.c:13
+#: builtin/notes.c:26
msgid ""
-"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
-"mirror=<fetch|push>] <name> <url>"
+"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
+"| (-c | -C) <object>] [<object>]"
msgstr ""
-#: builtin/remote.c:14 builtin/remote.c:34
-msgid "git remote rename <old> <new>"
+#: builtin/notes.c:27
+msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
msgstr ""
-#: builtin/remote.c:15 builtin/remote.c:39
-msgid "git remote remove <name>"
+#: builtin/notes.c:28
+msgid ""
+"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
+"(-c | -C) <object>] [<object>]"
msgstr ""
-#: builtin/remote.c:16 builtin/remote.c:44
-msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
+#: builtin/notes.c:29
+msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
msgstr ""
-#: builtin/remote.c:17
-msgid "git remote [-v | --verbose] show [-n] <name>"
+#: builtin/notes.c:30
+msgid "git notes [--ref <notes-ref>] show [<object>]"
msgstr ""
-#: builtin/remote.c:18
-msgid "git remote prune [-n | --dry-run] <name>"
+#: builtin/notes.c:31
+msgid ""
+"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
msgstr ""
-#: builtin/remote.c:19
-msgid ""
-"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
+#: builtin/notes.c:32
+msgid "git notes merge --commit [-v | -q]"
msgstr ""
-#: builtin/remote.c:20
-msgid "git remote set-branches [--add] <name> <branch>..."
+#: builtin/notes.c:33
+msgid "git notes merge --abort [-v | -q]"
msgstr ""
-#: builtin/remote.c:21 builtin/remote.c:70
-msgid "git remote get-url [--push] [--all] <name>"
+#: builtin/notes.c:34
+msgid "git notes [--ref <notes-ref>] remove [<object>...]"
msgstr ""
-#: builtin/remote.c:22 builtin/remote.c:75
-msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
+#: builtin/notes.c:35
+msgid "git notes [--ref <notes-ref>] prune [-n | -v]"
msgstr ""
-#: builtin/remote.c:23 builtin/remote.c:76
-msgid "git remote set-url --add <name> <newurl>"
+#: builtin/notes.c:36
+msgid "git notes [--ref <notes-ref>] get-ref"
msgstr ""
-#: builtin/remote.c:24 builtin/remote.c:77
-msgid "git remote set-url --delete <name> <url>"
+#: builtin/notes.c:41
+msgid "git notes [list [<object>]]"
msgstr ""
-#: builtin/remote.c:29
-msgid "git remote add [<options>] <name> <url>"
+#: builtin/notes.c:46
+msgid "git notes add [<options>] [<object>]"
msgstr ""
-#: builtin/remote.c:49
-msgid "git remote set-branches <name> <branch>..."
+#: builtin/notes.c:51
+msgid "git notes copy [<options>] <from-object> <to-object>"
msgstr ""
-#: builtin/remote.c:50
-msgid "git remote set-branches --add <name> <branch>..."
+#: builtin/notes.c:52
+msgid "git notes copy --stdin [<from-object> <to-object>]..."
msgstr ""
-#: builtin/remote.c:55
-msgid "git remote show [<options>] <name>"
+#: builtin/notes.c:57
+msgid "git notes append [<options>] [<object>]"
msgstr ""
-#: builtin/remote.c:60
-msgid "git remote prune [<options>] <name>"
+#: builtin/notes.c:62
+msgid "git notes edit [<object>]"
msgstr ""
-#: builtin/remote.c:65
-msgid "git remote update [<options>] [<group> | <remote>]..."
+#: builtin/notes.c:67
+msgid "git notes show [<object>]"
msgstr ""
-#: builtin/remote.c:94
-#, c-format
-msgid "Updating %s"
+#: builtin/notes.c:72
+msgid "git notes merge [<options>] <notes-ref>"
msgstr ""
-#: builtin/remote.c:126
-msgid ""
-"--mirror is dangerous and deprecated; please\n"
-"\t use --mirror=fetch or --mirror=push instead"
+#: builtin/notes.c:73
+msgid "git notes merge --commit [<options>]"
msgstr ""
-#: builtin/remote.c:143
-#, c-format
-msgid "unknown mirror argument: %s"
+#: builtin/notes.c:74
+msgid "git notes merge --abort [<options>]"
msgstr ""
-#: builtin/remote.c:159
-msgid "fetch the remote branches"
+#: builtin/notes.c:79
+msgid "git notes remove [<object>]"
msgstr ""
-#: builtin/remote.c:161
-msgid "import all tags and associated objects when fetching"
+#: builtin/notes.c:84
+msgid "git notes prune [<options>]"
msgstr ""
-#: builtin/remote.c:164
-msgid "or do not fetch any tag at all (--no-tags)"
+#: builtin/notes.c:89
+msgid "git notes get-ref"
msgstr ""
-#: builtin/remote.c:166
-msgid "branch(es) to track"
+#: builtin/notes.c:94
+msgid "Write/edit the notes for the following object:"
msgstr ""
-#: builtin/remote.c:167
-msgid "master branch"
+#: builtin/notes.c:147
+#, c-format
+msgid "unable to start 'show' for object '%s'"
msgstr ""
-#: builtin/remote.c:168
-msgid "push|fetch"
+#: builtin/notes.c:151
+msgid "could not read 'show' output"
msgstr ""
-#: builtin/remote.c:169
-msgid "set up remote as a mirror to push to or fetch from"
+#: builtin/notes.c:159
+#, c-format
+msgid "failed to finish 'show' for object '%s'"
msgstr ""
-#: builtin/remote.c:181
-msgid "specifying a master branch makes no sense with --mirror"
+#: builtin/notes.c:194
+msgid "please supply the note contents using either -m or -F option"
msgstr ""
-#: builtin/remote.c:183
-msgid "specifying branches to track makes sense only with fetch mirrors"
+#: builtin/notes.c:203
+msgid "unable to write note object"
msgstr ""
-#: builtin/remote.c:190 builtin/remote.c:629
+#: builtin/notes.c:205
#, c-format
-msgid "remote %s already exists."
+msgid "the note contents have been left in %s"
msgstr ""
-#: builtin/remote.c:194 builtin/remote.c:633
+#: builtin/notes.c:233 builtin/tag.c:460
#, c-format
-msgid "'%s' is not a valid remote name"
+msgid "cannot read '%s'"
msgstr ""
-#: builtin/remote.c:234
+#: builtin/notes.c:235 builtin/tag.c:463
#, c-format
-msgid "Could not setup master '%s'"
+msgid "could not open or read '%s'"
msgstr ""
-#: builtin/remote.c:336
+#: builtin/notes.c:254 builtin/notes.c:305 builtin/notes.c:307
+#: builtin/notes.c:372 builtin/notes.c:427 builtin/notes.c:513
+#: builtin/notes.c:518 builtin/notes.c:596 builtin/notes.c:659
#, c-format
-msgid "Could not get fetch map for refspec %s"
+msgid "failed to resolve '%s' as a valid ref."
msgstr ""
-#: builtin/remote.c:437 builtin/remote.c:445
-msgid "(matching)"
+#: builtin/notes.c:257
+#, c-format
+msgid "failed to read object '%s'."
msgstr ""
-#: builtin/remote.c:449
-msgid "(delete)"
+#: builtin/notes.c:261
+#, c-format
+msgid "cannot read note data from non-blob object '%s'."
msgstr ""
-#: builtin/remote.c:622 builtin/remote.c:757 builtin/remote.c:854
+#: builtin/notes.c:301
#, c-format
-msgid "No such remote: %s"
+msgid "malformed input line: '%s'."
msgstr ""
-#: builtin/remote.c:639
+#: builtin/notes.c:316
#, c-format
-msgid "Could not rename config section '%s' to '%s'"
+msgid "failed to copy notes from '%s' to '%s'"
msgstr ""
-#: builtin/remote.c:659
+#. TRANSLATORS: the first %s will be replaced by a
+#. git notes command: 'add', 'merge', 'remove', etc.
+#: builtin/notes.c:345
#, c-format
-msgid ""
-"Not updating non-default fetch refspec\n"
-"\t%s\n"
-"\tPlease update the configuration manually if necessary."
+msgid "refusing to %s notes in %s (outside of refs/notes/)"
msgstr ""
-#: builtin/remote.c:695
-#, c-format
-msgid "deleting '%s' failed"
+#: builtin/notes.c:365 builtin/notes.c:420 builtin/notes.c:496
+#: builtin/notes.c:508 builtin/notes.c:584 builtin/notes.c:652
+#: builtin/notes.c:802 builtin/notes.c:949 builtin/notes.c:970
+msgid "too many parameters"
msgstr ""
-#: builtin/remote.c:729
+#: builtin/notes.c:378 builtin/notes.c:665
#, c-format
-msgid "creating '%s' failed"
+msgid "no note found for object %s."
msgstr ""
-#: builtin/remote.c:792
-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/notes.c:399 builtin/notes.c:562
+msgid "note contents as a string"
+msgstr ""
-#: builtin/remote.c:806
-#, c-format
-msgid "Could not remove config section '%s'"
+#: builtin/notes.c:402 builtin/notes.c:565
+msgid "note contents in a file"
msgstr ""
-#: builtin/remote.c:907
-#, c-format
-msgid " new (next fetch will store in remotes/%s)"
+#: builtin/notes.c:405 builtin/notes.c:568
+msgid "reuse and edit specified note object"
msgstr ""
-#: builtin/remote.c:910
-msgid " tracked"
+#: builtin/notes.c:408 builtin/notes.c:571
+msgid "reuse specified note object"
msgstr ""
-#: builtin/remote.c:912
-msgid " stale (use 'git remote prune' to remove)"
+#: builtin/notes.c:411 builtin/notes.c:574
+msgid "allow storing empty note"
msgstr ""
-#: builtin/remote.c:914
-msgid " ???"
+#: builtin/notes.c:412 builtin/notes.c:483
+msgid "replace existing notes"
msgstr ""
-#: builtin/remote.c:955
+#: builtin/notes.c:437
#, c-format
-msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
+msgid ""
+"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
+"existing notes"
msgstr ""
-#: builtin/remote.c:963
+#: builtin/notes.c:452 builtin/notes.c:531
#, c-format
-msgid "rebases interactively onto remote %s"
+msgid "Overwriting existing notes for object %s\n"
msgstr ""
-#: builtin/remote.c:964
+#: builtin/notes.c:463 builtin/notes.c:624 builtin/notes.c:889
#, c-format
-msgid "rebases onto remote %s"
+msgid "Removing note for object %s\n"
msgstr ""
-#: builtin/remote.c:967
+#: builtin/notes.c:484
+msgid "read objects from stdin"
+msgstr ""
+
+#: builtin/notes.c:486
+msgid "load rewriting config for <command> (implies --stdin)"
+msgstr ""
+
+#: builtin/notes.c:504
+msgid "too few parameters"
+msgstr ""
+
+#: builtin/notes.c:525
#, c-format
-msgid " merges with remote %s"
+msgid ""
+"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
+"existing notes"
msgstr ""
-#: builtin/remote.c:970
+#: builtin/notes.c:537
#, c-format
-msgid "merges with remote %s"
+msgid "missing notes on source object %s. Cannot copy."
msgstr ""
-#: builtin/remote.c:973
+#: builtin/notes.c:589
#, c-format
-msgid "%-*s and with remote %s\n"
+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/remote.c:1016
-msgid "create"
+#: builtin/notes.c:685
+msgid "failed to delete ref NOTES_MERGE_PARTIAL"
msgstr ""
-#: builtin/remote.c:1019
-msgid "delete"
+#: builtin/notes.c:687
+msgid "failed to delete ref NOTES_MERGE_REF"
msgstr ""
-#: builtin/remote.c:1023
-msgid "up to date"
+#: builtin/notes.c:689
+msgid "failed to remove 'git notes merge' worktree"
+msgstr ""
+
+#: builtin/notes.c:709
+msgid "failed to read ref NOTES_MERGE_PARTIAL"
+msgstr ""
+
+#: builtin/notes.c:711
+msgid "could not find commit from NOTES_MERGE_PARTIAL."
+msgstr ""
+
+#: builtin/notes.c:713
+msgid "could not parse commit from NOTES_MERGE_PARTIAL."
+msgstr ""
+
+#: builtin/notes.c:726
+msgid "failed to resolve NOTES_MERGE_REF"
+msgstr ""
+
+#: builtin/notes.c:729
+msgid "failed to finalize notes merge"
+msgstr ""
+
+#: builtin/notes.c:755
+#, c-format
+msgid "unknown notes merge strategy %s"
+msgstr ""
+
+#: builtin/notes.c:771
+msgid "General options"
+msgstr ""
+
+#: builtin/notes.c:773
+msgid "Merge options"
+msgstr ""
+
+#: builtin/notes.c:775
+msgid ""
+"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
+"cat_sort_uniq)"
+msgstr ""
+
+#: builtin/notes.c:777
+msgid "Committing unmerged notes"
+msgstr ""
+
+#: builtin/notes.c:779
+msgid "finalize notes merge by committing unmerged notes"
+msgstr ""
+
+#: builtin/notes.c:781
+msgid "Aborting notes merge resolution"
+msgstr ""
+
+#: builtin/notes.c:783
+msgid "abort notes merge"
+msgstr ""
+
+#: builtin/notes.c:794
+msgid "cannot mix --commit, --abort or -s/--strategy"
+msgstr ""
+
+#: builtin/notes.c:799
+msgid "must specify a notes ref to merge"
+msgstr ""
+
+#: builtin/notes.c:823
+#, c-format
+msgid "unknown -s/--strategy: %s"
+msgstr ""
+
+#: builtin/notes.c:860
+#, c-format
+msgid "a notes merge into %s is already in-progress at %s"
+msgstr ""
+
+#: builtin/notes.c:863
+#, c-format
+msgid "failed to store link to current notes ref (%s)"
+msgstr ""
+
+#: builtin/notes.c:865
+#, c-format
+msgid ""
+"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
+"'git notes merge --commit', or abort the merge with 'git notes merge --"
+"abort'.\n"
+msgstr ""
+
+#: builtin/notes.c:887
+#, c-format
+msgid "Object %s has no note\n"
+msgstr ""
+
+#: builtin/notes.c:899
+msgid "attempt to remove non-existent note is not an error"
+msgstr ""
+
+#: builtin/notes.c:902
+msgid "read object names from the standard input"
+msgstr ""
+
+#: builtin/notes.c:940 builtin/prune.c:105 builtin/worktree.c:127
+msgid "do not remove, show only"
+msgstr ""
+
+#: builtin/notes.c:941
+msgid "report pruned notes"
+msgstr ""
+
+#: builtin/notes.c:983
+msgid "notes-ref"
+msgstr ""
+
+#: builtin/notes.c:984
+msgid "use notes from <notes-ref>"
+msgstr ""
+
+#: builtin/notes.c:1019
+#, c-format
+msgid "unknown subcommand: %s"
+msgstr ""
+
+#: builtin/pack-objects.c:29
+msgid ""
+"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
+msgstr ""
+
+#: builtin/pack-objects.c:30
+msgid ""
+"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
+msgstr ""
+
+#: builtin/pack-objects.c:177 builtin/pack-objects.c:180
+#, c-format
+msgid "deflate error (%d)"
+msgstr ""
+
+#: builtin/pack-objects.c:766
+msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
+msgstr ""
+
+#: builtin/pack-objects.c:779
+msgid "Writing objects"
+msgstr ""
+
+#: builtin/pack-objects.c:1068
+msgid "disabling bitmap writing, as some objects are not being packed"
+msgstr ""
+
+#: builtin/pack-objects.c:2344
+msgid "Compressing objects"
+msgstr ""
+
+#: builtin/pack-objects.c:2747
+#, c-format
+msgid "unsupported index version %s"
+msgstr ""
+
+#: builtin/pack-objects.c:2751
+#, c-format
+msgid "bad index version '%s'"
+msgstr ""
+
+#: builtin/pack-objects.c:2781
+msgid "do not show progress meter"
+msgstr ""
+
+#: builtin/pack-objects.c:2783
+msgid "show progress meter"
+msgstr ""
+
+#: builtin/pack-objects.c:2785
+msgid "show progress meter during object writing phase"
+msgstr ""
+
+#: builtin/pack-objects.c:2788
+msgid "similar to --all-progress when progress meter is shown"
+msgstr ""
+
+#: builtin/pack-objects.c:2789
+msgid "version[,offset]"
+msgstr ""
+
+#: builtin/pack-objects.c:2790
+msgid "write the pack index file in the specified idx format version"
+msgstr ""
+
+#: builtin/pack-objects.c:2793
+msgid "maximum size of each output pack file"
+msgstr ""
+
+#: builtin/pack-objects.c:2795
+msgid "ignore borrowed objects from alternate object store"
+msgstr ""
+
+#: builtin/pack-objects.c:2797
+msgid "ignore packed objects"
+msgstr ""
+
+#: builtin/pack-objects.c:2799
+msgid "limit pack window by objects"
+msgstr ""
+
+#: builtin/pack-objects.c:2801
+msgid "limit pack window by memory in addition to object limit"
+msgstr ""
+
+#: builtin/pack-objects.c:2803
+msgid "maximum length of delta chain allowed in the resulting pack"
+msgstr ""
+
+#: builtin/pack-objects.c:2805
+msgid "reuse existing deltas"
+msgstr ""
+
+#: builtin/pack-objects.c:2807
+msgid "reuse existing objects"
+msgstr ""
+
+#: builtin/pack-objects.c:2809
+msgid "use OFS_DELTA objects"
+msgstr ""
+
+#: builtin/pack-objects.c:2811
+msgid "use threads when searching for best delta matches"
+msgstr ""
+
+#: builtin/pack-objects.c:2813
+msgid "do not create an empty pack output"
+msgstr ""
+
+#: builtin/pack-objects.c:2815
+msgid "read revision arguments from standard input"
+msgstr ""
+
+#: builtin/pack-objects.c:2817
+msgid "limit the objects to those that are not yet packed"
+msgstr ""
+
+#: builtin/pack-objects.c:2820
+msgid "include objects reachable from any reference"
+msgstr ""
+
+#: builtin/pack-objects.c:2823
+msgid "include objects referred by reflog entries"
+msgstr ""
+
+#: builtin/pack-objects.c:2826
+msgid "include objects referred to by the index"
+msgstr ""
+
+#: builtin/pack-objects.c:2829
+msgid "output pack to stdout"
+msgstr ""
+
+#: builtin/pack-objects.c:2831
+msgid "include tag objects that refer to objects to be packed"
+msgstr ""
+
+#: builtin/pack-objects.c:2833
+msgid "keep unreachable objects"
+msgstr ""
+
+#: builtin/pack-objects.c:2835
+msgid "pack loose unreachable objects"
+msgstr ""
+
+#: builtin/pack-objects.c:2837
+msgid "unpack unreachable objects newer than <time>"
+msgstr ""
+
+#: builtin/pack-objects.c:2840
+msgid "create thin packs"
+msgstr ""
+
+#: builtin/pack-objects.c:2842
+msgid "create packs suitable for shallow fetches"
+msgstr ""
+
+#: builtin/pack-objects.c:2844
+msgid "ignore packs that have companion .keep file"
+msgstr ""
+
+#: builtin/pack-objects.c:2846
+msgid "pack compression level"
+msgstr ""
+
+#: builtin/pack-objects.c:2848
+msgid "do not hide commits by grafts"
+msgstr ""
+
+#: builtin/pack-objects.c:2850
+msgid "use a bitmap index if available to speed up counting objects"
+msgstr ""
+
+#: builtin/pack-objects.c:2852
+msgid "write a bitmap index together with the pack index"
+msgstr ""
+
+#: builtin/pack-objects.c:2979
+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:11
+msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
+msgstr ""
+
+#: builtin/prune.c:106
+msgid "report pruned objects"
+msgstr ""
+
+#: builtin/prune.c:109
+msgid "expire objects older than <time>"
+msgstr ""
+
+#: builtin/prune.c:123
+msgid "cannot prune in a precious-objects repo"
+msgstr ""
+
+#: builtin/pull.c:51 builtin/pull.c:53
+#, c-format
+msgid "Invalid value for %s: %s"
+msgstr ""
+
+#: builtin/pull.c:73
+msgid "git pull [<options>] [<repository> [<refspec>...]]"
+msgstr ""
+
+#: builtin/pull.c:121
+msgid "Options related to merging"
+msgstr ""
+
+#: builtin/pull.c:124
+msgid "incorporate changes by rebasing rather than merging"
+msgstr ""
+
+#: builtin/pull.c:148 builtin/revert.c:101
+msgid "allow fast-forward"
+msgstr ""
+
+#: builtin/pull.c:157
+msgid "automatically stash/stash pop before and after rebase"
+msgstr ""
+
+#: builtin/pull.c:173
+msgid "Options related to fetching"
+msgstr ""
+
+#: builtin/pull.c:195
+msgid "number of submodules pulled in parallel"
+msgstr ""
+
+#: builtin/pull.c:284
+#, c-format
+msgid "Invalid value for pull.ff: %s"
+msgstr ""
+
+#: builtin/pull.c:397
+msgid ""
+"There is no candidate for rebasing against among the refs that you just "
+"fetched."
+msgstr ""
+
+#: builtin/pull.c:399
+msgid ""
+"There are no candidates for merging among the refs that you just fetched."
+msgstr ""
+
+#: builtin/pull.c:400
+msgid ""
+"Generally this means that you provided a wildcard refspec which had no\n"
+"matches on the remote end."
+msgstr ""
+
+#: builtin/pull.c:403
+#, c-format
+msgid ""
+"You asked to pull from the remote '%s', but did not specify\n"
+"a branch. Because this is not the default configured remote\n"
+"for your current branch, you must specify a branch on the command line."
+msgstr ""
+
+#: builtin/pull.c:408 git-parse-remote.sh:73
+msgid "You are not currently on a branch."
+msgstr ""
+
+#: builtin/pull.c:410 builtin/pull.c:425 git-parse-remote.sh:79
+msgid "Please specify which branch you want to rebase against."
+msgstr ""
+
+#: builtin/pull.c:412 builtin/pull.c:427 git-parse-remote.sh:82
+msgid "Please specify which branch you want to merge with."
+msgstr ""
+
+#: builtin/pull.c:413 builtin/pull.c:428
+msgid "See git-pull(1) for details."
+msgstr ""
+
+#: builtin/pull.c:415 builtin/pull.c:421 builtin/pull.c:430
+#: git-parse-remote.sh:64
+msgid "<remote>"
+msgstr ""
+
+#: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:455
+#: git-parse-remote.sh:65
+msgid "<branch>"
+msgstr ""
+
+#: builtin/pull.c:423 git-parse-remote.sh:75
+msgid "There is no tracking information for the current branch."
+msgstr ""
+
+#: builtin/pull.c:432 git-parse-remote.sh:95
+msgid ""
+"If you wish to set tracking information for this branch you can do so with:"
+msgstr ""
+
+#: builtin/pull.c:437
+#, c-format
+msgid ""
+"Your configuration specifies to merge with the ref '%s'\n"
+"from the remote, but no such ref was fetched."
+msgstr ""
+
+#: builtin/pull.c:754
+msgid "ignoring --verify-signatures for rebase"
+msgstr ""
+
+#: builtin/pull.c:801
+msgid "--[no-]autostash option is only valid with --rebase."
+msgstr ""
+
+#: builtin/pull.c:809
+msgid "Updating an unborn branch with changes added to the index."
+msgstr ""
+
+#: builtin/pull.c:812
+msgid "pull with rebase"
+msgstr ""
+
+#: builtin/pull.c:813
+msgid "please commit or stash them."
+msgstr ""
+
+#: builtin/pull.c:838
+#, c-format
+msgid ""
+"fetch updated the current branch head.\n"
+"fast-forwarding your working tree from\n"
+"commit %s."
+msgstr ""
+
+#: builtin/pull.c:843
+#, c-format
+msgid ""
+"Cannot fast-forward your working tree.\n"
+"After making sure that you saved anything precious from\n"
+"$ git diff %s\n"
+"output, run\n"
+"$ git reset --hard\n"
+"to recover."
+msgstr ""
+
+#: builtin/pull.c:858
+msgid "Cannot merge multiple branches into empty head."
+msgstr ""
+
+#: builtin/pull.c:862
+msgid "Cannot rebase onto multiple branches."
+msgstr ""
+
+#: builtin/push.c:16
+msgid "git push [<options>] [<repository> [<refspec>...]]"
+msgstr ""
+
+#: builtin/push.c:89
+msgid "tag shorthand without <tag>"
+msgstr ""
+
+#: builtin/push.c:99
+msgid "--delete only accepts plain target ref names"
+msgstr ""
+
+#: builtin/push.c:143
+msgid ""
+"\n"
+"To choose either option permanently, see push.default in 'git help config'."
+msgstr ""
+
+#: builtin/push.c:146
+#, 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:161
+#, 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:175
+#, 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:183
+#, c-format
+msgid "The current branch %s has multiple upstream branches, refusing to push."
+msgstr ""
+
+#: builtin/push.c:186
+#, 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:245
+msgid ""
+"You didn't specify any refspecs to push, and push.default is \"nothing\"."
+msgstr ""
+
+#: builtin/push.c:252
+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:258
+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:264
+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:271
+msgid "Updates were rejected because the tag already exists in the remote."
+msgstr ""
+
+#: builtin/push.c:274
+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:334
+#, c-format
+msgid "Pushing to %s\n"
+msgstr ""
+
+#: builtin/push.c:338
+#, c-format
+msgid "failed to push some refs to '%s'"
+msgstr ""
+
+#: builtin/push.c:369
+#, c-format
+msgid "bad repository '%s'"
+msgstr ""
+
+#: builtin/push.c:370
+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:388
+msgid "--all and --tags are incompatible"
+msgstr ""
+
+#: builtin/push.c:389
+msgid "--all can't be combined with refspecs"
+msgstr ""
+
+#: builtin/push.c:394
+msgid "--mirror and --tags are incompatible"
+msgstr ""
+
+#: builtin/push.c:395
+msgid "--mirror can't be combined with refspecs"
+msgstr ""
+
+#: builtin/push.c:400
+msgid "--all and --mirror are incompatible"
+msgstr ""
+
+#: builtin/push.c:518
+msgid "repository"
+msgstr ""
+
+#: builtin/push.c:519 builtin/send-pack.c:161
+msgid "push all refs"
+msgstr ""
+
+#: builtin/push.c:520 builtin/send-pack.c:163
+msgid "mirror all refs"
+msgstr ""
+
+#: builtin/push.c:522
+msgid "delete refs"
+msgstr ""
+
+#: builtin/push.c:523
+msgid "push tags (can't be used with --all or --mirror)"
+msgstr ""
+
+#: builtin/push.c:526 builtin/send-pack.c:164
+msgid "force updates"
+msgstr ""
+
+#: builtin/push.c:528 builtin/send-pack.c:175
+msgid "refname>:<expect"
+msgstr ""
+
+#: builtin/push.c:529 builtin/send-pack.c:176
+msgid "require old value of ref to be at this value"
+msgstr ""
+
+#: builtin/push.c:532
+msgid "control recursive pushing of submodules"
+msgstr ""
+
+#: builtin/push.c:534 builtin/send-pack.c:169
+msgid "use thin pack"
+msgstr ""
+
+#: builtin/push.c:535 builtin/push.c:536 builtin/send-pack.c:158
+#: builtin/send-pack.c:159
+msgid "receive pack program"
+msgstr ""
+
+#: builtin/push.c:537
+msgid "set upstream for git pull/status"
+msgstr ""
+
+#: builtin/push.c:540
+msgid "prune locally removed refs"
+msgstr ""
+
+#: builtin/push.c:542
+msgid "bypass pre-push hook"
+msgstr ""
+
+#: builtin/push.c:543
+msgid "push missing but relevant tags"
+msgstr ""
+
+#: builtin/push.c:546 builtin/send-pack.c:166
+msgid "GPG sign the push"
+msgstr ""
+
+#: builtin/push.c:548 builtin/send-pack.c:170
+msgid "request atomic transaction on remote side"
+msgstr ""
+
+#: builtin/push.c:549
+msgid "server-specific"
+msgstr ""
+
+#: builtin/push.c:549
+msgid "option to transmit"
+msgstr ""
+
+#: builtin/push.c:563
+msgid "--delete is incompatible with --all, --mirror and --tags"
+msgstr ""
+
+#: builtin/push.c:565
+msgid "--delete doesn't make sense without any refs"
+msgstr ""
+
+#: builtin/push.c:584
+msgid "push options must not have new line characters"
+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/read-tree.c:139
+msgid "debug unpack-trees"
+msgstr ""
+
+#: builtin/receive-pack.c:26
+msgid "git receive-pack <git-dir>"
+msgstr ""
+
+#: builtin/receive-pack.c:793
+msgid ""
+"By default, updating the current branch in a non-bare repository\n"
+"is denied, because it will make the index and work tree inconsistent\n"
+"with what you pushed, and will require 'git reset --hard' to match\n"
+"the work tree to HEAD.\n"
+"\n"
+"You can set the 'receive.denyCurrentBranch' configuration variable\n"
+"to 'ignore' or 'warn' in the remote repository to allow pushing into\n"
+"its current branch; however, this is not recommended unless you\n"
+"arranged to update its work tree to match what you pushed in some\n"
+"other way.\n"
+"\n"
+"To squelch this message and still keep the default behaviour, set\n"
+"'receive.denyCurrentBranch' configuration variable to 'refuse'."
+msgstr ""
+
+#: builtin/receive-pack.c:813
+msgid ""
+"By default, deleting the current branch is denied, because the next\n"
+"'git clone' won't result in any file checked out, causing confusion.\n"
+"\n"
+"You can set 'receive.denyDeleteCurrent' configuration variable to\n"
+"'warn' or 'ignore' in the remote repository to allow deleting the\n"
+"current branch, with or without a warning message.\n"
+"\n"
+"To squelch this message, you can set it to 'refuse'."
+msgstr ""
+
+#: builtin/receive-pack.c:1883
+msgid "quiet"
+msgstr ""
+
+#: builtin/receive-pack.c:1897
+msgid "You must specify a directory."
+msgstr ""
+
+#: builtin/reflog.c:423
+#, c-format
+msgid "'%s' for '%s' is not a valid timestamp"
+msgstr ""
+
+#: builtin/reflog.c:540 builtin/reflog.c:545
+#, c-format
+msgid "'%s' is not a valid timestamp"
+msgstr ""
+
+#: 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:34
+msgid "git remote rename <old> <new>"
+msgstr ""
+
+#: builtin/remote.c:15 builtin/remote.c:39
+msgid "git remote remove <name>"
+msgstr ""
+
+#: builtin/remote.c:16 builtin/remote.c:44
+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:70
+msgid "git remote get-url [--push] [--all] <name>"
+msgstr ""
+
+#: builtin/remote.c:22 builtin/remote.c:75
+msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
+msgstr ""
+
+#: builtin/remote.c:23 builtin/remote.c:76
+msgid "git remote set-url --add <name> <newurl>"
+msgstr ""
+
+#: builtin/remote.c:24 builtin/remote.c:77
+msgid "git remote set-url --delete <name> <url>"
+msgstr ""
+
+#: builtin/remote.c:29
+msgid "git remote add [<options>] <name> <url>"
+msgstr ""
+
+#: builtin/remote.c:49
+msgid "git remote set-branches <name> <branch>..."
+msgstr ""
+
+#: builtin/remote.c:50
+msgid "git remote set-branches --add <name> <branch>..."
+msgstr ""
+
+#: builtin/remote.c:55
+msgid "git remote show [<options>] <name>"
+msgstr ""
+
+#: builtin/remote.c:60
+msgid "git remote prune [<options>] <name>"
+msgstr ""
+
+#: builtin/remote.c:65
+msgid "git remote update [<options>] [<group> | <remote>]..."
+msgstr ""
+
+#: builtin/remote.c:94
+#, c-format
+msgid "Updating %s"
+msgstr ""
+
+#: builtin/remote.c:126
+msgid ""
+"--mirror is dangerous and deprecated; please\n"
+"\t use --mirror=fetch or --mirror=push instead"
+msgstr ""
+
+#: builtin/remote.c:143
+#, c-format
+msgid "unknown mirror argument: %s"
+msgstr ""
+
+#: builtin/remote.c:159
+msgid "fetch the remote branches"
+msgstr ""
+
+#: builtin/remote.c:161
+msgid "import all tags and associated objects when fetching"
+msgstr ""
+
+#: builtin/remote.c:164
+msgid "or do not fetch any tag at all (--no-tags)"
+msgstr ""
+
+#: builtin/remote.c:166
+msgid "branch(es) to track"
+msgstr ""
+
+#: builtin/remote.c:167
+msgid "master branch"
+msgstr ""
+
+#: builtin/remote.c:168
+msgid "push|fetch"
+msgstr ""
+
+#: builtin/remote.c:169
+msgid "set up remote as a mirror to push to or fetch from"
+msgstr ""
+
+#: builtin/remote.c:181
+msgid "specifying a master branch makes no sense with --mirror"
+msgstr ""
+
+#: builtin/remote.c:183
+msgid "specifying branches to track makes sense only with fetch mirrors"
+msgstr ""
+
+#: builtin/remote.c:190 builtin/remote.c:629
+#, c-format
+msgid "remote %s already exists."
+msgstr ""
+
+#: builtin/remote.c:194 builtin/remote.c:633
+#, c-format
+msgid "'%s' is not a valid remote name"
+msgstr ""
+
+#: builtin/remote.c:234
+#, c-format
+msgid "Could not setup master '%s'"
+msgstr ""
+
+#: builtin/remote.c:336
+#, c-format
+msgid "Could not get fetch map for refspec %s"
+msgstr ""
+
+#: builtin/remote.c:437 builtin/remote.c:445
+msgid "(matching)"
+msgstr ""
+
+#: builtin/remote.c:449
+msgid "(delete)"
+msgstr ""
+
+#: builtin/remote.c:622 builtin/remote.c:757 builtin/remote.c:854
+#, c-format
+msgid "No such remote: %s"
+msgstr ""
+
+#: builtin/remote.c:639
+#, c-format
+msgid "Could not rename config section '%s' to '%s'"
+msgstr ""
+
+#: builtin/remote.c:659
+#, c-format
+msgid ""
+"Not updating non-default fetch refspec\n"
+"\t%s\n"
+"\tPlease update the configuration manually if necessary."
+msgstr ""
+
+#: builtin/remote.c:695
+#, c-format
+msgid "deleting '%s' failed"
+msgstr ""
+
+#: builtin/remote.c:729
+#, c-format
+msgid "creating '%s' failed"
+msgstr ""
+
+#: builtin/remote.c:792
+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:806
+#, c-format
+msgid "Could not remove config section '%s'"
+msgstr ""
+
+#: builtin/remote.c:907
+#, c-format
+msgid " new (next fetch will store in remotes/%s)"
+msgstr ""
+
+#: builtin/remote.c:910
+msgid " tracked"
+msgstr ""
+
+#: builtin/remote.c:912
+msgid " stale (use 'git remote prune' to remove)"
+msgstr ""
+
+#: builtin/remote.c:914
+msgid " ???"
+msgstr ""
+
+#: builtin/remote.c:955
+#, c-format
+msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
+msgstr ""
+
+#: builtin/remote.c:963
+#, c-format
+msgid "rebases interactively onto remote %s"
+msgstr ""
+
+#: builtin/remote.c:964
+#, c-format
+msgid "rebases onto remote %s"
+msgstr ""
+
+#: builtin/remote.c:967
+#, c-format
+msgid " merges with remote %s"
+msgstr ""
+
+#: builtin/remote.c:970
+#, c-format
+msgid "merges with remote %s"
+msgstr ""
+
+#: builtin/remote.c:973
+#, c-format
+msgid "%-*s and with remote %s\n"
+msgstr ""
+
+#: builtin/remote.c:1016
+msgid "create"
+msgstr ""
+
+#: builtin/remote.c:1019
+msgid "delete"
+msgstr ""
+
+#: builtin/remote.c:1023
+msgid "up to date"
msgstr ""
#: builtin/remote.c:1026
msgid "fast-forwardable"
msgstr ""
-#: builtin/remote.c:1029
-msgid "local out of date"
+#: builtin/remote.c:1029
+msgid "local out of date"
+msgstr ""
+
+#: builtin/remote.c:1036
+#, c-format
+msgid " %-*s forces to %-*s (%s)"
+msgstr ""
+
+#: builtin/remote.c:1039
+#, c-format
+msgid " %-*s pushes to %-*s (%s)"
+msgstr ""
+
+#: builtin/remote.c:1043
+#, c-format
+msgid " %-*s forces to %s"
+msgstr ""
+
+#: builtin/remote.c:1046
+#, c-format
+msgid " %-*s pushes to %s"
+msgstr ""
+
+#: builtin/remote.c:1114
+msgid "do not query remotes"
+msgstr ""
+
+#: builtin/remote.c:1141
+#, c-format
+msgid "* remote %s"
+msgstr ""
+
+#: builtin/remote.c:1142
+#, c-format
+msgid " Fetch URL: %s"
+msgstr ""
+
+#: builtin/remote.c:1143 builtin/remote.c:1156 builtin/remote.c:1295
+msgid "(no URL)"
+msgstr ""
+
+#. TRANSLATORS: the colon ':' should align with
+#. the one in " Fetch URL: %s" translation
+#: builtin/remote.c:1154 builtin/remote.c:1156
+#, c-format
+msgid " Push URL: %s"
+msgstr ""
+
+#: builtin/remote.c:1158 builtin/remote.c:1160 builtin/remote.c:1162
+#, c-format
+msgid " HEAD branch: %s"
+msgstr ""
+
+#: builtin/remote.c:1158
+msgid "(not queried)"
+msgstr ""
+
+#: builtin/remote.c:1160
+msgid "(unknown)"
+msgstr ""
+
+#: builtin/remote.c:1164
+#, c-format
+msgid ""
+" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
+msgstr ""
+
+#: builtin/remote.c:1176
+#, c-format
+msgid " Remote branch:%s"
+msgid_plural " Remote branches:%s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/remote.c:1179 builtin/remote.c:1205
+msgid " (status not queried)"
+msgstr ""
+
+#: builtin/remote.c:1188
+msgid " Local branch configured for 'git pull':"
+msgid_plural " Local branches configured for 'git pull':"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/remote.c:1196
+msgid " Local refs will be mirrored by 'git push'"
+msgstr ""
+
+#: builtin/remote.c:1202
+#, 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:1223
+msgid "set refs/remotes/<name>/HEAD according to remote"
+msgstr ""
+
+#: builtin/remote.c:1225
+msgid "delete refs/remotes/<name>/HEAD"
+msgstr ""
+
+#: builtin/remote.c:1240
+msgid "Cannot determine remote HEAD"
+msgstr ""
+
+#: builtin/remote.c:1242
+msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
+msgstr ""
+
+#: builtin/remote.c:1252
+#, c-format
+msgid "Could not delete %s"
+msgstr ""
+
+#: builtin/remote.c:1260
+#, c-format
+msgid "Not a valid ref: %s"
+msgstr ""
+
+#: builtin/remote.c:1262
+#, c-format
+msgid "Could not setup %s"
+msgstr ""
+
+#: builtin/remote.c:1280
+#, c-format
+msgid " %s will become dangling!"
+msgstr ""
+
+#: builtin/remote.c:1281
+#, c-format
+msgid " %s has become dangling!"
+msgstr ""
+
+#: builtin/remote.c:1291
+#, c-format
+msgid "Pruning %s"
+msgstr ""
+
+#: builtin/remote.c:1292
+#, c-format
+msgid "URL: %s"
+msgstr ""
+
+#: builtin/remote.c:1308
+#, c-format
+msgid " * [would prune] %s"
+msgstr ""
+
+#: builtin/remote.c:1311
+#, c-format
+msgid " * [pruned] %s"
+msgstr ""
+
+#: builtin/remote.c:1356
+msgid "prune remotes after fetching"
+msgstr ""
+
+#: builtin/remote.c:1419 builtin/remote.c:1473 builtin/remote.c:1541
+#, c-format
+msgid "No such remote '%s'"
+msgstr ""
+
+#: builtin/remote.c:1435
+msgid "add branch"
+msgstr ""
+
+#: builtin/remote.c:1442
+msgid "no remote specified"
+msgstr ""
+
+#: builtin/remote.c:1459
+msgid "query push URLs rather than fetch URLs"
+msgstr ""
+
+#: builtin/remote.c:1461
+msgid "return all URLs"
+msgstr ""
+
+#: builtin/remote.c:1489
+#, c-format
+msgid "no URLs configured for remote '%s'"
+msgstr ""
+
+#: builtin/remote.c:1515
+msgid "manipulate push URLs"
+msgstr ""
+
+#: builtin/remote.c:1517
+msgid "add URL"
+msgstr ""
+
+#: builtin/remote.c:1519
+msgid "delete URLs"
+msgstr ""
+
+#: builtin/remote.c:1526
+msgid "--add --delete doesn't make sense"
+msgstr ""
+
+#: builtin/remote.c:1567
+#, c-format
+msgid "Invalid old URL pattern: %s"
+msgstr ""
+
+#: builtin/remote.c:1575
+#, c-format
+msgid "No such URL found: %s"
+msgstr ""
+
+#: builtin/remote.c:1577
+msgid "Will not delete all non-push URLs"
+msgstr ""
+
+#: builtin/remote.c:1591
+msgid "be verbose; must be placed before a subcommand"
+msgstr ""
+
+#: builtin/remote.c:1622
+#, c-format
+msgid "Unknown subcommand: %s"
+msgstr ""
+
+#: builtin/repack.c:17
+msgid "git repack [<options>]"
+msgstr ""
+
+#: builtin/repack.c:22
+msgid ""
+"Incremental repacks are incompatible with bitmap indexes. Use\n"
+"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
+msgstr ""
+
+#: builtin/repack.c:166
+msgid "pack everything in a single pack"
+msgstr ""
+
+#: builtin/repack.c:168
+msgid "same as -a, and turn unreachable objects loose"
+msgstr ""
+
+#: builtin/repack.c:171
+msgid "remove redundant packs, and run git-prune-packed"
+msgstr ""
+
+#: builtin/repack.c:173
+msgid "pass --no-reuse-delta to git-pack-objects"
+msgstr ""
+
+#: builtin/repack.c:175
+msgid "pass --no-reuse-object to git-pack-objects"
+msgstr ""
+
+#: builtin/repack.c:177
+msgid "do not run git-update-server-info"
+msgstr ""
+
+#: builtin/repack.c:180
+msgid "pass --local to git-pack-objects"
+msgstr ""
+
+#: builtin/repack.c:182
+msgid "write bitmap index"
+msgstr ""
+
+#: builtin/repack.c:183
+msgid "approxidate"
+msgstr ""
+
+#: builtin/repack.c:184
+msgid "with -A, do not loosen objects older than this"
+msgstr ""
+
+#: builtin/repack.c:186
+msgid "with -a, repack unreachable objects"
+msgstr ""
+
+#: builtin/repack.c:188
+msgid "size of the window used for delta compression"
+msgstr ""
+
+#: builtin/repack.c:189 builtin/repack.c:193
+msgid "bytes"
+msgstr ""
+
+#: builtin/repack.c:190
+msgid "same as the above, but limit memory size instead of entries count"
+msgstr ""
+
+#: builtin/repack.c:192
+msgid "limits the maximum delta depth"
+msgstr ""
+
+#: builtin/repack.c:194
+msgid "maximum size of each packfile"
+msgstr ""
+
+#: builtin/repack.c:196
+msgid "repack objects in packs marked with .keep"
+msgstr ""
+
+#: builtin/repack.c:206
+msgid "cannot delete packs in a precious-objects repo"
+msgstr ""
+
+#: builtin/repack.c:210
+msgid "--keep-unreachable and -A are incompatible"
+msgstr ""
+
+#: builtin/repack.c:400 builtin/worktree.c:115
+#, c-format
+msgid "failed to remove '%s'"
+msgstr ""
+
+#: builtin/replace.c:19
+msgid "git replace [-f] <object> <replacement>"
+msgstr ""
+
+#: builtin/replace.c:20
+msgid "git replace [-f] --edit <object>"
+msgstr ""
+
+#: builtin/replace.c:21
+msgid "git replace [-f] --graft <commit> [<parent>...]"
+msgstr ""
+
+#: builtin/replace.c:22
+msgid "git replace -d <object>..."
+msgstr ""
+
+#: builtin/replace.c:23
+msgid "git replace [--format=<format>] [-l [<pattern>]]"
+msgstr ""
+
+#: builtin/replace.c:325 builtin/replace.c:363 builtin/replace.c:391
+#, c-format
+msgid "Not a valid object name: '%s'"
+msgstr ""
+
+#: builtin/replace.c:355
+#, c-format
+msgid "bad mergetag in commit '%s'"
+msgstr ""
+
+#: builtin/replace.c:357
+#, c-format
+msgid "malformed mergetag in commit '%s'"
+msgstr ""
+
+#: builtin/replace.c:368
+#, c-format
+msgid ""
+"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
+"instead of --graft"
+msgstr ""
+
+#: builtin/replace.c:401
+#, c-format
+msgid "the original commit '%s' has a gpg signature."
+msgstr ""
+
+#: builtin/replace.c:402
+msgid "the signature will be removed in the replacement commit!"
+msgstr ""
+
+#: builtin/replace.c:408
+#, c-format
+msgid "could not write replacement commit for: '%s'"
+msgstr ""
+
+#: builtin/replace.c:432
+msgid "list replace refs"
+msgstr ""
+
+#: builtin/replace.c:433
+msgid "delete replace refs"
+msgstr ""
+
+#: builtin/replace.c:434
+msgid "edit existing object"
+msgstr ""
+
+#: builtin/replace.c:435
+msgid "change a commit's parents"
+msgstr ""
+
+#: builtin/replace.c:436
+msgid "replace the ref if it exists"
+msgstr ""
+
+#: builtin/replace.c:437
+msgid "do not pretty-print contents for --edit"
+msgstr ""
+
+#: builtin/replace.c:438
+msgid "use this format"
+msgstr ""
+
+#: builtin/rerere.c:12
+msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
+msgstr ""
+
+#: builtin/rerere.c:58
+msgid "register clean resolutions in index"
+msgstr ""
+
+#: builtin/reset.c:26
+msgid ""
+"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
+msgstr ""
+
+#: builtin/reset.c:27
+msgid "git reset [-q] [<tree-ish>] [--] <paths>..."
+msgstr ""
+
+#: builtin/reset.c:28
+msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
+msgstr ""
+
+#: builtin/reset.c:34
+msgid "mixed"
+msgstr ""
+
+#: builtin/reset.c:34
+msgid "soft"
+msgstr ""
+
+#: builtin/reset.c:34
+msgid "hard"
+msgstr ""
+
+#: builtin/reset.c:34
+msgid "merge"
+msgstr ""
+
+#: builtin/reset.c:34
+msgid "keep"
+msgstr ""
+
+#: builtin/reset.c:74
+msgid "You do not have a valid HEAD."
+msgstr ""
+
+#: builtin/reset.c:76
+msgid "Failed to find tree of HEAD."
+msgstr ""
+
+#: builtin/reset.c:82
+#, c-format
+msgid "Failed to find tree of %s."
+msgstr ""
+
+#: builtin/reset.c:100
+#, c-format
+msgid "HEAD is now at %s"
+msgstr ""
+
+#: builtin/reset.c:183
+#, c-format
+msgid "Cannot do a %s reset in the middle of a merge."
+msgstr ""
+
+#: builtin/reset.c:276
+msgid "be quiet, only report errors"
+msgstr ""
+
+#: builtin/reset.c:278
+msgid "reset HEAD and index"
+msgstr ""
+
+#: builtin/reset.c:279
+msgid "reset only HEAD"
msgstr ""
-#: builtin/remote.c:1036
+#: builtin/reset.c:281 builtin/reset.c:283
+msgid "reset HEAD, index and working tree"
+msgstr ""
+
+#: builtin/reset.c:285
+msgid "reset HEAD but keep local changes"
+msgstr ""
+
+#: builtin/reset.c:288
+msgid "record only the fact that removed paths will be added later"
+msgstr ""
+
+#: builtin/reset.c:305
#, c-format
-msgid " %-*s forces to %-*s (%s)"
+msgid "Failed to resolve '%s' as a valid revision."
msgstr ""
-#: builtin/remote.c:1039
+#: builtin/reset.c:313
#, c-format
-msgid " %-*s pushes to %-*s (%s)"
+msgid "Failed to resolve '%s' as a valid tree."
msgstr ""
-#: builtin/remote.c:1043
+#: builtin/reset.c:322
+msgid "--patch is incompatible with --{hard,mixed,soft}"
+msgstr ""
+
+#: builtin/reset.c:331
+msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
+msgstr ""
+
+#: builtin/reset.c:333
#, c-format
-msgid " %-*s forces to %s"
+msgid "Cannot do %s reset with paths."
msgstr ""
-#: builtin/remote.c:1046
+#: builtin/reset.c:343
#, c-format
-msgid " %-*s pushes to %s"
+msgid "%s reset is not allowed in a bare repository"
msgstr ""
-#: builtin/remote.c:1114
-msgid "do not query remotes"
+#: builtin/reset.c:347
+msgid "-N can only be used with --mixed"
msgstr ""
-#: builtin/remote.c:1141
+#: builtin/reset.c:364
+msgid "Unstaged changes after reset:"
+msgstr ""
+
+#: builtin/reset.c:370
#, c-format
-msgid "* remote %s"
+msgid "Could not reset index file to revision '%s'."
msgstr ""
-#: builtin/remote.c:1142
+#: builtin/reset.c:374
+msgid "Could not write new index file."
+msgstr ""
+
+#: builtin/rev-list.c:354
+msgid "rev-list does not support display of notes"
+msgstr ""
+
+#: builtin/rev-parse.c:391
+msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
+msgstr ""
+
+#: builtin/rev-parse.c:396
+msgid "keep the `--` passed as an arg"
+msgstr ""
+
+#: builtin/rev-parse.c:398
+msgid "stop parsing after the first non-option argument"
+msgstr ""
+
+#: builtin/rev-parse.c:401
+msgid "output in stuck long form"
+msgstr ""
+
+#: builtin/rev-parse.c:532
+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/revert.c:22
+msgid "git revert [<options>] <commit-ish>..."
+msgstr ""
+
+#: builtin/revert.c:23
+msgid "git revert <subcommand>"
+msgstr ""
+
+#: builtin/revert.c:28
+msgid "git cherry-pick [<options>] <commit-ish>..."
+msgstr ""
+
+#: builtin/revert.c:29
+msgid "git cherry-pick <subcommand>"
+msgstr ""
+
+#: builtin/revert.c:71
#, c-format
-msgid " Fetch URL: %s"
+msgid "%s: %s cannot be used with %s"
msgstr ""
-#: builtin/remote.c:1143 builtin/remote.c:1156 builtin/remote.c:1296
-msgid "(no URL)"
+#: builtin/revert.c:80
+msgid "end revert or cherry-pick sequence"
msgstr ""
-#. TRANSLATORS: the colon ':' should align with
-#. the one in " Fetch URL: %s" translation
-#: builtin/remote.c:1154 builtin/remote.c:1156
+#: builtin/revert.c:81
+msgid "resume revert or cherry-pick sequence"
+msgstr ""
+
+#: builtin/revert.c:82
+msgid "cancel revert or cherry-pick sequence"
+msgstr ""
+
+#: builtin/revert.c:83
+msgid "don't automatically commit"
+msgstr ""
+
+#: builtin/revert.c:84
+msgid "edit the commit message"
+msgstr ""
+
+#: builtin/revert.c:87
+msgid "parent number"
+msgstr ""
+
+#: builtin/revert.c:89
+msgid "merge strategy"
+msgstr ""
+
+#: builtin/revert.c:90
+msgid "option"
+msgstr ""
+
+#: builtin/revert.c:91
+msgid "option for merge strategy"
+msgstr ""
+
+#: builtin/revert.c:100
+msgid "append commit name"
+msgstr ""
+
+#: builtin/revert.c:102
+msgid "preserve initially empty commits"
+msgstr ""
+
+#: builtin/revert.c:103
+msgid "allow commits with empty messages"
+msgstr ""
+
+#: builtin/revert.c:104
+msgid "keep redundant, empty commits"
+msgstr ""
+
+#: builtin/revert.c:192
+msgid "revert failed"
+msgstr ""
+
+#: builtin/revert.c:205
+msgid "cherry-pick failed"
+msgstr ""
+
+#: builtin/rm.c:17
+msgid "git rm [<options>] [--] <file>..."
+msgstr ""
+
+#: builtin/rm.c:205
+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:210
+msgid ""
+"\n"
+"(use -f to force removal)"
+msgstr ""
+
+#: builtin/rm.c:214
+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:218 builtin/rm.c:227
+msgid ""
+"\n"
+"(use --cached to keep the file, or -f to force removal)"
+msgstr ""
+
+#: builtin/rm.c:224
+msgid "the following file has local modifications:"
+msgid_plural "the following files have local modifications:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/rm.c:242
+msgid "do not list removed files"
+msgstr ""
+
+#: builtin/rm.c:243
+msgid "only remove from the index"
+msgstr ""
+
+#: builtin/rm.c:244
+msgid "override the up-to-date check"
+msgstr ""
+
+#: builtin/rm.c:245
+msgid "allow recursive removal"
+msgstr ""
+
+#: builtin/rm.c:247
+msgid "exit with a zero status even if nothing matched"
+msgstr ""
+
+#: builtin/rm.c:308
#, c-format
-msgid " Push URL: %s"
+msgid "not removing '%s' recursively without -r"
msgstr ""
-#: builtin/remote.c:1158 builtin/remote.c:1160 builtin/remote.c:1162
+#: builtin/rm.c:347
#, c-format
-msgid " HEAD branch: %s"
+msgid "git rm: unable to remove %s"
+msgstr ""
+
+#: builtin/rm.c:370
+#, c-format
+msgid "could not remove '%s'"
+msgstr ""
+
+#: builtin/send-pack.c:18
+msgid ""
+"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
+"receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
+"[<ref>...]\n"
+" --all and explicit <ref> specification are mutually exclusive."
+msgstr ""
+
+#: builtin/send-pack.c:160
+msgid "remote name"
+msgstr ""
+
+#: builtin/send-pack.c:171
+msgid "use stateless RPC protocol"
+msgstr ""
+
+#: builtin/send-pack.c:172
+msgid "read refs from stdin"
+msgstr ""
+
+#: builtin/send-pack.c:173
+msgid "print status from remote helper"
+msgstr ""
+
+#: builtin/shortlog.c:13
+msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
+msgstr ""
+
+#: builtin/shortlog.c:249
+msgid "Group by committer rather than author"
+msgstr ""
+
+#: builtin/shortlog.c:251
+msgid "sort output according to the number of commits per author"
+msgstr ""
+
+#: builtin/shortlog.c:253
+msgid "Suppress commit descriptions, only provides commit count"
+msgstr ""
+
+#: builtin/shortlog.c:255
+msgid "Show the email address of each author"
msgstr ""
-#: builtin/remote.c:1158
-msgid "(not queried)"
+#: builtin/shortlog.c:256
+msgid "w[,i1[,i2]]"
msgstr ""
-#: builtin/remote.c:1160
-msgid "(unknown)"
+#: builtin/shortlog.c:257
+msgid "Linewrap output"
msgstr ""
-#: builtin/remote.c:1164
-#, c-format
+#: builtin/show-branch.c:10
msgid ""
-" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
+"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/remote.c:1176
-#, c-format
-msgid " Remote branch:%s"
-msgid_plural " Remote branches:%s"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/remote.c:1179 builtin/remote.c:1206
-msgid " (status not queried)"
+#: builtin/show-branch.c:14
+msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
msgstr ""
-#: builtin/remote.c:1188
-msgid " Local branch configured for 'git pull':"
-msgid_plural " Local branches configured for 'git pull':"
+#: builtin/show-branch.c:375
+#, c-format
+msgid "ignoring %s; cannot handle more than %d ref"
+msgid_plural "ignoring %s; cannot handle more than %d refs"
msgstr[0] ""
msgstr[1] ""
-#: builtin/remote.c:1196
-msgid " Local refs will be mirrored by 'git push'"
+#: builtin/show-branch.c:541
+#, c-format
+msgid "no matching refs with %s"
msgstr ""
-#: builtin/remote.c:1203
-#, c-format
-msgid " Local ref configured for 'git push'%s:"
-msgid_plural " Local refs configured for 'git push'%s:"
-msgstr[0] ""
-msgstr[1] ""
+#: builtin/show-branch.c:639
+msgid "show remote-tracking and local branches"
+msgstr ""
-#: builtin/remote.c:1224
-msgid "set refs/remotes/<name>/HEAD according to remote"
+#: builtin/show-branch.c:641
+msgid "show remote-tracking branches"
msgstr ""
-#: builtin/remote.c:1226
-msgid "delete refs/remotes/<name>/HEAD"
+#: builtin/show-branch.c:643
+msgid "color '*!+-' corresponding to the branch"
msgstr ""
-#: builtin/remote.c:1241
-msgid "Cannot determine remote HEAD"
+#: builtin/show-branch.c:645
+msgid "show <n> more commits after the common ancestor"
msgstr ""
-#: builtin/remote.c:1243
-msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
+#: builtin/show-branch.c:647
+msgid "synonym to more=-1"
msgstr ""
-#: builtin/remote.c:1253
-#, c-format
-msgid "Could not delete %s"
+#: builtin/show-branch.c:648
+msgid "suppress naming strings"
msgstr ""
-#: builtin/remote.c:1261
-#, c-format
-msgid "Not a valid ref: %s"
+#: builtin/show-branch.c:650
+msgid "include the current branch"
msgstr ""
-#: builtin/remote.c:1263
-#, c-format
-msgid "Could not setup %s"
+#: builtin/show-branch.c:652
+msgid "name commits with their object names"
msgstr ""
-#: builtin/remote.c:1281
-#, c-format
-msgid " %s will become dangling!"
+#: builtin/show-branch.c:654
+msgid "show possible merge bases"
msgstr ""
-#: builtin/remote.c:1282
-#, c-format
-msgid " %s has become dangling!"
+#: builtin/show-branch.c:656
+msgid "show refs unreachable from any other ref"
msgstr ""
-#: builtin/remote.c:1292
-#, c-format
-msgid "Pruning %s"
+#: builtin/show-branch.c:658
+msgid "show commits in topological order"
msgstr ""
-#: builtin/remote.c:1293
-#, c-format
-msgid "URL: %s"
+#: builtin/show-branch.c:661
+msgid "show only commits not on the first branch"
msgstr ""
-#: builtin/remote.c:1309
-#, c-format
-msgid " * [would prune] %s"
+#: builtin/show-branch.c:663
+msgid "show merges reachable from only one tip"
msgstr ""
-#: builtin/remote.c:1312
-#, c-format
-msgid " * [pruned] %s"
+#: builtin/show-branch.c:665
+msgid "topologically sort, maintaining date order where possible"
msgstr ""
-#: builtin/remote.c:1357
-msgid "prune remotes after fetching"
+#: builtin/show-branch.c:668
+msgid "<n>[,<base>]"
msgstr ""
-#: builtin/remote.c:1420 builtin/remote.c:1474 builtin/remote.c:1542
-#, c-format
-msgid "No such remote '%s'"
+#: builtin/show-branch.c:669
+msgid "show <n> most recent ref-log entries starting at base"
msgstr ""
-#: builtin/remote.c:1436
-msgid "add branch"
+#: builtin/show-branch.c:703
+msgid ""
+"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
msgstr ""
-#: builtin/remote.c:1443
-msgid "no remote specified"
+#: builtin/show-branch.c:727
+msgid "no branches given, and HEAD is not valid"
msgstr ""
-#: builtin/remote.c:1460
-msgid "query push URLs rather than fetch URLs"
+#: builtin/show-branch.c:730
+msgid "--reflog option needs one branch name"
msgstr ""
-#: builtin/remote.c:1462
-msgid "return all URLs"
+#: builtin/show-branch.c:733
+#, c-format
+msgid "only %d entry can be shown at one time."
+msgid_plural "only %d entries can be shown at one time."
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/show-branch.c:737
+#, c-format
+msgid "no such ref %s"
msgstr ""
-#: builtin/remote.c:1490
+#: builtin/show-branch.c:829
#, c-format
-msgid "no URLs configured for remote '%s'"
+msgid "cannot handle more than %d rev."
+msgid_plural "cannot handle more than %d revs."
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/show-branch.c:833
+#, c-format
+msgid "'%s' is not a valid ref."
msgstr ""
-#: builtin/remote.c:1516
-msgid "manipulate push URLs"
+#: builtin/show-branch.c:836
+#, c-format
+msgid "cannot find commit %s (%s)"
msgstr ""
-#: builtin/remote.c:1518
-msgid "add URL"
+#: builtin/show-ref.c:10
+msgid ""
+"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
+"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
msgstr ""
-#: builtin/remote.c:1520
-msgid "delete URLs"
+#: builtin/show-ref.c:11
+msgid "git show-ref --exclude-existing[=<pattern>]"
msgstr ""
-#: builtin/remote.c:1527
-msgid "--add --delete doesn't make sense"
+#: builtin/show-ref.c:159
+msgid "only show tags (can be combined with heads)"
msgstr ""
-#: builtin/remote.c:1568
-#, c-format
-msgid "Invalid old URL pattern: %s"
+#: builtin/show-ref.c:160
+msgid "only show heads (can be combined with tags)"
msgstr ""
-#: builtin/remote.c:1576
-#, c-format
-msgid "No such URL found: %s"
+#: builtin/show-ref.c:161
+msgid "stricter reference checking, requires exact ref path"
msgstr ""
-#: builtin/remote.c:1578
-msgid "Will not delete all non-push URLs"
+#: builtin/show-ref.c:164 builtin/show-ref.c:166
+msgid "show the HEAD reference, even if it would be filtered out"
msgstr ""
-#: builtin/remote.c:1592
-msgid "be verbose; must be placed before a subcommand"
+#: builtin/show-ref.c:168
+msgid "dereference tags into object IDs"
msgstr ""
-#: builtin/repack.c:17
-msgid "git repack [<options>]"
+#: builtin/show-ref.c:170
+msgid "only show SHA1 hash using <n> digits"
msgstr ""
-#: builtin/repack.c:160
-msgid "pack everything in a single pack"
+#: builtin/show-ref.c:174
+msgid "do not print results to stdout (useful with --verify)"
msgstr ""
-#: builtin/repack.c:162
-msgid "same as -a, and turn unreachable objects loose"
+#: builtin/show-ref.c:176
+msgid "show refs from stdin that aren't in local repository"
msgstr ""
-#: builtin/repack.c:165
-msgid "remove redundant packs, and run git-prune-packed"
+#: builtin/stripspace.c:17
+msgid "git stripspace [-s | --strip-comments]"
msgstr ""
-#: builtin/repack.c:167
-msgid "pass --no-reuse-delta to git-pack-objects"
+#: builtin/stripspace.c:18
+msgid "git stripspace [-c | --comment-lines]"
msgstr ""
-#: builtin/repack.c:169
-msgid "pass --no-reuse-object to git-pack-objects"
+#: builtin/stripspace.c:35
+msgid "skip and remove all lines starting with comment character"
msgstr ""
-#: builtin/repack.c:171
-msgid "do not run git-update-server-info"
+#: builtin/stripspace.c:38
+msgid "prepend comment character and space to each line"
msgstr ""
-#: builtin/repack.c:174
-msgid "pass --local to git-pack-objects"
+#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1062
+#, c-format
+msgid "No such ref: %s"
msgstr ""
-#: builtin/repack.c:176
-msgid "write bitmap index"
+#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1071
+#, c-format
+msgid "Expecting a full ref name, got %s"
msgstr ""
-#: builtin/repack.c:177
-msgid "approxidate"
+#: builtin/submodule--helper.c:71
+#, c-format
+msgid "cannot strip one component off url '%s'"
msgstr ""
-#: builtin/repack.c:178
-msgid "with -A, do not loosen objects older than this"
+#: builtin/submodule--helper.c:282 builtin/submodule--helper.c:592
+msgid "alternative anchor for relative paths"
msgstr ""
-#: builtin/repack.c:180
-msgid "with -a, repack unreachable objects"
+#: builtin/submodule--helper.c:287
+msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr ""
-#: builtin/repack.c:182
-msgid "size of the window used for delta compression"
+#: builtin/submodule--helper.c:333 builtin/submodule--helper.c:347
+#, c-format
+msgid "No url found for submodule path '%s' in .gitmodules"
msgstr ""
-#: builtin/repack.c:183 builtin/repack.c:187
-msgid "bytes"
+#: builtin/submodule--helper.c:373
+#, c-format
+msgid "Failed to register url for submodule path '%s'"
msgstr ""
-#: builtin/repack.c:184
-msgid "same as the above, but limit memory size instead of entries count"
+#: builtin/submodule--helper.c:377
+#, c-format
+msgid "Submodule '%s' (%s) registered for path '%s'\n"
msgstr ""
-#: builtin/repack.c:186
-msgid "limits the maximum delta depth"
+#: builtin/submodule--helper.c:387
+#, c-format
+msgid "warning: command update mode suggested for submodule '%s'\n"
msgstr ""
-#: builtin/repack.c:188
-msgid "maximum size of each packfile"
+#: builtin/submodule--helper.c:394
+#, c-format
+msgid "Failed to register update mode for submodule path '%s'"
msgstr ""
-#: builtin/repack.c:190
-msgid "repack objects in packs marked with .keep"
+#: builtin/submodule--helper.c:410
+msgid "Suppress output for initializing a submodule"
msgstr ""
-#: builtin/repack.c:200
-msgid "cannot delete packs in a precious-objects repo"
+#: builtin/submodule--helper.c:415
+msgid "git submodule--helper init [<path>]"
msgstr ""
-#: builtin/repack.c:204
-msgid "--keep-unreachable and -A are incompatible"
+#: builtin/submodule--helper.c:436
+msgid "git submodule--helper name <path>"
msgstr ""
-#: builtin/repack.c:391 builtin/worktree.c:115
+#: builtin/submodule--helper.c:442
#, c-format
-msgid "failed to remove '%s'"
+msgid "no submodule mapping found in .gitmodules for path '%s'"
msgstr ""
-#: builtin/replace.c:19
-msgid "git replace [-f] <object> <replacement>"
+#: builtin/submodule--helper.c:525 builtin/submodule--helper.c:528
+#, c-format
+msgid "submodule '%s' cannot add alternate: %s"
msgstr ""
-#: builtin/replace.c:20
-msgid "git replace [-f] --edit <object>"
+#: builtin/submodule--helper.c:564
+#, c-format
+msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
msgstr ""
-#: builtin/replace.c:21
-msgid "git replace [-f] --graft <commit> [<parent>...]"
+#: builtin/submodule--helper.c:571
+#, c-format
+msgid "Value '%s' for submodule.alternateLocation is not recognized"
msgstr ""
-#: builtin/replace.c:22
-msgid "git replace -d <object>..."
+#: builtin/submodule--helper.c:595
+msgid "where the new submodule will be cloned to"
msgstr ""
-#: builtin/replace.c:23
-msgid "git replace [--format=<format>] [-l [<pattern>]]"
+#: builtin/submodule--helper.c:598
+msgid "name of the new submodule"
msgstr ""
-#: builtin/replace.c:325 builtin/replace.c:363 builtin/replace.c:391
-#, c-format
-msgid "Not a valid object name: '%s'"
+#: builtin/submodule--helper.c:601
+msgid "url where to clone the submodule from"
msgstr ""
-#: builtin/replace.c:355
-#, c-format
-msgid "bad mergetag in commit '%s'"
+#: builtin/submodule--helper.c:607
+msgid "depth for shallow clones"
msgstr ""
-#: builtin/replace.c:357
-#, c-format
-msgid "malformed mergetag in commit '%s'"
+#: builtin/submodule--helper.c:610 builtin/submodule--helper.c:980
+msgid "force cloning progress"
msgstr ""
-#: builtin/replace.c:368
-#, c-format
+#: builtin/submodule--helper.c:615
msgid ""
-"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
-"instead of --graft"
+"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
+"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
msgstr ""
-#: builtin/replace.c:401
+#: builtin/submodule--helper.c:646
#, c-format
-msgid "the original commit '%s' has a gpg signature."
+msgid "clone of '%s' into submodule path '%s' failed"
msgstr ""
-#: builtin/replace.c:402
-msgid "the signature will be removed in the replacement commit!"
+#: builtin/submodule--helper.c:662
+#, c-format
+msgid "cannot open file '%s'"
msgstr ""
-#: builtin/replace.c:408
+#: builtin/submodule--helper.c:667
#, c-format
-msgid "could not write replacement commit for: '%s'"
+msgid "could not close file %s"
msgstr ""
-#: builtin/replace.c:432
-msgid "list replace refs"
+#: builtin/submodule--helper.c:674
+#, c-format
+msgid "could not get submodule directory for '%s'"
msgstr ""
-#: builtin/replace.c:433
-msgid "delete replace refs"
+#: builtin/submodule--helper.c:742
+#, c-format
+msgid "Submodule path '%s' not initialized"
msgstr ""
-#: builtin/replace.c:434
-msgid "edit existing object"
+#: builtin/submodule--helper.c:746
+msgid "Maybe you want to use 'update --init'?"
msgstr ""
-#: builtin/replace.c:435
-msgid "change a commit's parents"
+#: builtin/submodule--helper.c:772
+#, c-format
+msgid "Skipping unmerged submodule %s"
msgstr ""
-#: builtin/replace.c:436
-msgid "replace the ref if it exists"
+#: builtin/submodule--helper.c:793
+#, c-format
+msgid "Skipping submodule '%s'"
msgstr ""
-#: builtin/replace.c:437
-msgid "do not pretty-print contents for --edit"
+#: builtin/submodule--helper.c:929
+#, c-format
+msgid "Failed to clone '%s'. Retry scheduled"
+msgstr ""
+
+#: builtin/submodule--helper.c:940
+#, c-format
+msgid "Failed to clone '%s' a second time, aborting"
msgstr ""
-#: builtin/replace.c:438
-msgid "use this format"
+#: builtin/submodule--helper.c:961 builtin/submodule--helper.c:1105
+msgid "path into the working tree"
msgstr ""
-#: builtin/rerere.c:12
-msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
+#: builtin/submodule--helper.c:964
+msgid "path into the working tree, across nested submodule boundaries"
msgstr ""
-#: builtin/rerere.c:58
-msgid "register clean resolutions in index"
+#: builtin/submodule--helper.c:968
+msgid "rebase, merge, checkout or none"
msgstr ""
-#: builtin/reset.c:26
-msgid ""
-"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
+#: builtin/submodule--helper.c:972
+msgid "Create a shallow clone truncated to the specified number of revisions"
msgstr ""
-#: builtin/reset.c:27
-msgid "git reset [-q] <tree-ish> [--] <paths>..."
+#: builtin/submodule--helper.c:975
+msgid "parallel jobs"
msgstr ""
-#: builtin/reset.c:28
-msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
+#: builtin/submodule--helper.c:977
+msgid "whether the initial clone should follow the shallow recommendation"
msgstr ""
-#: builtin/reset.c:34
-msgid "mixed"
+#: builtin/submodule--helper.c:978
+msgid "don't print cloning progress"
msgstr ""
-#: builtin/reset.c:34
-msgid "soft"
+#: builtin/submodule--helper.c:985
+msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
msgstr ""
-#: builtin/reset.c:34
-msgid "hard"
+#: builtin/submodule--helper.c:995
+msgid "bad value for update parameter"
msgstr ""
-#: builtin/reset.c:34
-msgid "merge"
+#: builtin/submodule--helper.c:1066
+#, c-format
+msgid ""
+"Submodule (%s) branch configured to inherit branch from superproject, but "
+"the superproject is not on any branch"
msgstr ""
-#: builtin/reset.c:34
-msgid "keep"
+#: builtin/submodule--helper.c:1106
+msgid "recurse into submodules"
msgstr ""
-#: builtin/reset.c:74
-msgid "You do not have a valid HEAD."
+#: builtin/submodule--helper.c:1112
+msgid "git submodule--helper embed-git-dir [<path>...]"
msgstr ""
-#: builtin/reset.c:76
-msgid "Failed to find tree of HEAD."
+#: builtin/submodule--helper.c:1157
+msgid "submodule--helper subcommand must be called with a subcommand"
msgstr ""
-#: builtin/reset.c:82
+#: builtin/submodule--helper.c:1164
#, c-format
-msgid "Failed to find tree of %s."
+msgid "%s doesn't support --super-prefix"
msgstr ""
-#: builtin/reset.c:100
+#: builtin/submodule--helper.c:1170
#, c-format
-msgid "HEAD is now at %s"
+msgid "'%s' is not a valid submodule--helper subcommand"
msgstr ""
-#: builtin/reset.c:183
-#, c-format
-msgid "Cannot do a %s reset in the middle of a merge."
+#: builtin/symbolic-ref.c:7
+msgid "git symbolic-ref [<options>] <name> [<ref>]"
msgstr ""
-#: builtin/reset.c:276
-msgid "be quiet, only report errors"
+#: builtin/symbolic-ref.c:8
+msgid "git symbolic-ref -d [-q] <name>"
msgstr ""
-#: builtin/reset.c:278
-msgid "reset HEAD and index"
+#: builtin/symbolic-ref.c:40
+msgid "suppress error message for non-symbolic (detached) refs"
msgstr ""
-#: builtin/reset.c:279
-msgid "reset only HEAD"
+#: builtin/symbolic-ref.c:41
+msgid "delete symbolic ref"
msgstr ""
-#: builtin/reset.c:281 builtin/reset.c:283
-msgid "reset HEAD, index and working tree"
+#: builtin/symbolic-ref.c:42
+msgid "shorten ref output"
msgstr ""
-#: builtin/reset.c:285
-msgid "reset HEAD but keep local changes"
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
+msgid "reason"
msgstr ""
-#: builtin/reset.c:288
-msgid "record only the fact that removed paths will be added later"
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
+msgid "reason of the update"
msgstr ""
-#: builtin/reset.c:305
-#, c-format
-msgid "Failed to resolve '%s' as a valid revision."
+#: builtin/tag.c:23
+msgid ""
+"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
+"[<head>]"
msgstr ""
-#: builtin/reset.c:313
-#, c-format
-msgid "Failed to resolve '%s' as a valid tree."
+#: builtin/tag.c:24
+msgid "git tag -d <tagname>..."
msgstr ""
-#: builtin/reset.c:322
-msgid "--patch is incompatible with --{hard,mixed,soft}"
+#: builtin/tag.c:25
+msgid ""
+"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>]\n"
+"\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]"
msgstr ""
-#: builtin/reset.c:331
-msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
+#: builtin/tag.c:27
+msgid "git tag -v [--format=<format>] <tagname>..."
msgstr ""
-#: builtin/reset.c:333
+#: builtin/tag.c:82
#, c-format
-msgid "Cannot do %s reset with paths."
+msgid "tag name too long: %.*s..."
msgstr ""
-#: builtin/reset.c:343
+#: builtin/tag.c:87
#, c-format
-msgid "%s reset is not allowed in a bare repository"
+msgid "tag '%s' not found."
msgstr ""
-#: builtin/reset.c:347
-msgid "-N can only be used with --mixed"
+#: builtin/tag.c:102
+#, c-format
+msgid "Deleted tag '%s' (was %s)\n"
msgstr ""
-#: builtin/reset.c:364
-msgid "Unstaged changes after reset:"
+#: builtin/tag.c:131
+#, c-format
+msgid ""
+"\n"
+"Write a message for tag:\n"
+" %s\n"
+"Lines starting with '%c' will be ignored.\n"
msgstr ""
-#: builtin/reset.c:370
+#: builtin/tag.c:135
#, c-format
-msgid "Could not reset index file to revision '%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/reset.c:374
-msgid "Could not write new index file."
+#: builtin/tag.c:213
+msgid "unable to sign the tag"
msgstr ""
-#: builtin/rev-list.c:362
-msgid "rev-list does not support display of notes"
+#: builtin/tag.c:215
+msgid "unable to write tag file"
msgstr ""
-#: builtin/rev-parse.c:358
-msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
+#: builtin/tag.c:240
+msgid "bad object type."
msgstr ""
-#: builtin/rev-parse.c:363
-msgid "keep the `--` passed as an arg"
+#: builtin/tag.c:253
+msgid "tag header too big."
msgstr ""
-#: builtin/rev-parse.c:365
-msgid "stop parsing after the first non-option argument"
+#: builtin/tag.c:289
+msgid "no tag message?"
msgstr ""
-#: builtin/rev-parse.c:368
-msgid "output in stuck long form"
+#: builtin/tag.c:295
+#, c-format
+msgid "The tag message has been left in %s\n"
msgstr ""
-#: 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."
+#: builtin/tag.c:354
+msgid "list tag names"
msgstr ""
-#: builtin/revert.c:22
-msgid "git revert [<options>] <commit-ish>..."
+#: builtin/tag.c:356
+msgid "print <n> lines of each tag message"
msgstr ""
-#: builtin/revert.c:23
-msgid "git revert <subcommand>"
+#: builtin/tag.c:358
+msgid "delete tags"
msgstr ""
-#: builtin/revert.c:28
-msgid "git cherry-pick [<options>] <commit-ish>..."
+#: builtin/tag.c:359
+msgid "verify tags"
msgstr ""
-#: builtin/revert.c:29
-msgid "git cherry-pick <subcommand>"
+#: builtin/tag.c:361
+msgid "Tag creation options"
msgstr ""
-#: builtin/revert.c:71
-#, c-format
-msgid "%s: %s cannot be used with %s"
+#: builtin/tag.c:363
+msgid "annotated tag, needs a message"
msgstr ""
-#: builtin/revert.c:80
-msgid "end revert or cherry-pick sequence"
+#: builtin/tag.c:365
+msgid "tag message"
msgstr ""
-#: builtin/revert.c:81
-msgid "resume revert or cherry-pick sequence"
+#: builtin/tag.c:367
+msgid "annotated and GPG-signed tag"
msgstr ""
-#: builtin/revert.c:82
-msgid "cancel revert or cherry-pick sequence"
+#: builtin/tag.c:371
+msgid "use another key to sign the tag"
msgstr ""
-#: builtin/revert.c:83
-msgid "don't automatically commit"
+#: builtin/tag.c:372
+msgid "replace the tag if exists"
msgstr ""
-#: builtin/revert.c:84
-msgid "edit the commit message"
+#: builtin/tag.c:373 builtin/update-ref.c:368
+msgid "create a reflog"
msgstr ""
-#: builtin/revert.c:87
-msgid "parent number"
+#: builtin/tag.c:375
+msgid "Tag listing options"
msgstr ""
-#: builtin/revert.c:89
-msgid "merge strategy"
+#: builtin/tag.c:376
+msgid "show tag list in columns"
msgstr ""
-#: builtin/revert.c:90
-msgid "option"
+#: builtin/tag.c:377 builtin/tag.c:378
+msgid "print only tags that contain the commit"
msgstr ""
-#: builtin/revert.c:91
-msgid "option for merge strategy"
+#: builtin/tag.c:379
+msgid "print only tags that are merged"
msgstr ""
-#: builtin/revert.c:100
-msgid "append commit name"
+#: builtin/tag.c:380
+msgid "print only tags that are not merged"
msgstr ""
-#: builtin/revert.c:102
-msgid "preserve initially empty commits"
+#: builtin/tag.c:385
+msgid "print only tags of the object"
msgstr ""
-#: builtin/revert.c:103
-msgid "allow commits with empty messages"
+#: builtin/tag.c:415
+msgid "--column and -n are incompatible"
msgstr ""
-#: builtin/revert.c:104
-msgid "keep redundant, empty commits"
+#: builtin/tag.c:437
+msgid "-n option is only allowed with -l."
msgstr ""
-#: builtin/revert.c:192
-msgid "revert failed"
+#: builtin/tag.c:439
+msgid "--contains option is only allowed with -l."
msgstr ""
-#: builtin/revert.c:207
-msgid "cherry-pick failed"
+#: builtin/tag.c:441
+msgid "--points-at option is only allowed with -l."
msgstr ""
-#: builtin/rm.c:17
-msgid "git rm [<options>] [--] <file>..."
+#: builtin/tag.c:443
+msgid "--merged and --no-merged option are only allowed with -l"
msgstr ""
-#: builtin/rm.c:65
-msgid ""
-"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/rm.c:71
-msgid ""
-"\n"
-"(use 'rm -rf' if you really want to remove it including all of its history)"
+#: builtin/tag.c:454
+msgid "only one -F or -m option is allowed."
msgstr ""
-#: builtin/rm.c:230
-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:235
-msgid ""
-"\n"
-"(use -f to force removal)"
+#: builtin/tag.c:473
+msgid "too many params"
msgstr ""
-#: builtin/rm.c:239
-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/tag.c:479
+#, c-format
+msgid "'%s' is not a valid tag name."
+msgstr ""
-#: builtin/rm.c:243 builtin/rm.c:254
-msgid ""
-"\n"
-"(use --cached to keep the file, or -f to force removal)"
+#: builtin/tag.c:484
+#, c-format
+msgid "tag '%s' already exists"
msgstr ""
-#: builtin/rm.c:251
-msgid "the following file has local modifications:"
-msgid_plural "the following files have local modifications:"
-msgstr[0] ""
-msgstr[1] ""
+#: builtin/tag.c:512
+#, c-format
+msgid "Updated tag '%s' (was %s)\n"
+msgstr ""
-#: builtin/rm.c:269
-msgid "do not list removed files"
+#: builtin/unpack-objects.c:493
+msgid "Unpacking objects"
msgstr ""
-#: builtin/rm.c:270
-msgid "only remove from the index"
+#: builtin/update-index.c:79
+#, c-format
+msgid "failed to create directory %s"
msgstr ""
-#: builtin/rm.c:271
-msgid "override the up-to-date check"
+#: builtin/update-index.c:85
+#, c-format
+msgid "failed to stat %s"
msgstr ""
-#: builtin/rm.c:272
-msgid "allow recursive removal"
+#: builtin/update-index.c:95
+#, c-format
+msgid "failed to create file %s"
msgstr ""
-#: builtin/rm.c:274
-msgid "exit with a zero status even if nothing matched"
+#: builtin/update-index.c:103
+#, c-format
+msgid "failed to delete file %s"
msgstr ""
-#: builtin/rm.c:335
+#: builtin/update-index.c:110 builtin/update-index.c:212
#, c-format
-msgid "not removing '%s' recursively without -r"
+msgid "failed to delete directory %s"
msgstr ""
-#: builtin/rm.c:374
+#: builtin/update-index.c:133
#, c-format
-msgid "git rm: unable to remove %s"
+msgid "Testing mtime in '%s' "
msgstr ""
-#: builtin/send-pack.c:18
-msgid ""
-"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
-"receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
-"[<ref>...]\n"
-" --all and explicit <ref> specification are mutually exclusive."
+#: builtin/update-index.c:145
+msgid "directory stat info does not change after adding a new file"
msgstr ""
-#: builtin/send-pack.c:160
-msgid "remote name"
+#: builtin/update-index.c:158
+msgid "directory stat info does not change after adding a new directory"
msgstr ""
-#: builtin/send-pack.c:171
-msgid "use stateless RPC protocol"
+#: builtin/update-index.c:171
+msgid "directory stat info changes after updating a file"
msgstr ""
-#: builtin/send-pack.c:172
-msgid "read refs from stdin"
+#: builtin/update-index.c:182
+msgid "directory stat info changes after adding a file inside subdirectory"
msgstr ""
-#: builtin/send-pack.c:173
-msgid "print status from remote helper"
+#: builtin/update-index.c:193
+msgid "directory stat info does not change after deleting a file"
msgstr ""
-#: builtin/shortlog.c:13
-msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
+#: builtin/update-index.c:206
+msgid "directory stat info does not change after deleting a directory"
msgstr ""
-#: builtin/shortlog.c:242
-msgid "sort output according to the number of commits per author"
+#: builtin/update-index.c:213
+msgid " OK"
msgstr ""
-#: builtin/shortlog.c:244
-msgid "Suppress commit descriptions, only provides commit count"
+#: builtin/update-index.c:564
+msgid "git update-index [<options>] [--] [<file>...]"
msgstr ""
-#: builtin/shortlog.c:246
-msgid "Show the email address of each author"
+#: builtin/update-index.c:919
+msgid "continue refresh even when index needs update"
msgstr ""
-#: builtin/shortlog.c:247
-msgid "w[,i1[,i2]]"
+#: builtin/update-index.c:922
+msgid "refresh: ignore submodules"
msgstr ""
-#: builtin/shortlog.c:248
-msgid "Linewrap output"
+#: builtin/update-index.c:925
+msgid "do not ignore new files"
msgstr ""
-#: builtin/show-branch.c:10
-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>)...]"
+#: builtin/update-index.c:927
+msgid "let files replace directories and vice-versa"
msgstr ""
-#: builtin/show-branch.c:14
-msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
+#: builtin/update-index.c:929
+msgid "notice files missing from worktree"
msgstr ""
-#: builtin/show-branch.c:640
-msgid "show remote-tracking and local branches"
+#: builtin/update-index.c:931
+msgid "refresh even if index contains unmerged entries"
msgstr ""
-#: builtin/show-branch.c:642
-msgid "show remote-tracking branches"
+#: builtin/update-index.c:934
+msgid "refresh stat information"
msgstr ""
-#: builtin/show-branch.c:644
-msgid "color '*!+-' corresponding to the branch"
+#: builtin/update-index.c:938
+msgid "like --refresh, but ignore assume-unchanged setting"
msgstr ""
-#: builtin/show-branch.c:646
-msgid "show <n> more commits after the common ancestor"
+#: builtin/update-index.c:942
+msgid "<mode>,<object>,<path>"
msgstr ""
-#: builtin/show-branch.c:648
-msgid "synonym to more=-1"
+#: builtin/update-index.c:943
+msgid "add the specified entry to the index"
msgstr ""
-#: builtin/show-branch.c:649
-msgid "suppress naming strings"
+#: builtin/update-index.c:952
+msgid "mark files as \"not changing\""
msgstr ""
-#: builtin/show-branch.c:651
-msgid "include the current branch"
+#: builtin/update-index.c:955
+msgid "clear assumed-unchanged bit"
msgstr ""
-#: builtin/show-branch.c:653
-msgid "name commits with their object names"
+#: builtin/update-index.c:958
+msgid "mark files as \"index-only\""
msgstr ""
-#: builtin/show-branch.c:655
-msgid "show possible merge bases"
+#: builtin/update-index.c:961
+msgid "clear skip-worktree bit"
msgstr ""
-#: builtin/show-branch.c:657
-msgid "show refs unreachable from any other ref"
+#: builtin/update-index.c:964
+msgid "add to index only; do not add content to object database"
msgstr ""
-#: builtin/show-branch.c:659
-msgid "show commits in topological order"
+#: builtin/update-index.c:966
+msgid "remove named paths even if present in worktree"
msgstr ""
-#: builtin/show-branch.c:662
-msgid "show only commits not on the first branch"
+#: builtin/update-index.c:968
+msgid "with --stdin: input lines are terminated by null bytes"
msgstr ""
-#: builtin/show-branch.c:664
-msgid "show merges reachable from only one tip"
+#: builtin/update-index.c:970
+msgid "read list of paths to be updated from standard input"
msgstr ""
-#: builtin/show-branch.c:666
-msgid "topologically sort, maintaining date order where possible"
+#: builtin/update-index.c:974
+msgid "add entries from standard input to the index"
msgstr ""
-#: builtin/show-branch.c:669
-msgid "<n>[,<base>]"
+#: builtin/update-index.c:978
+msgid "repopulate stages #2 and #3 for the listed paths"
msgstr ""
-#: builtin/show-branch.c:670
-msgid "show <n> most recent ref-log entries starting at base"
+#: builtin/update-index.c:982
+msgid "only update entries that differ from HEAD"
msgstr ""
-#: builtin/show-ref.c:10
-msgid ""
-"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
-"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
+#: builtin/update-index.c:986
+msgid "ignore files missing from worktree"
msgstr ""
-#: builtin/show-ref.c:11
-msgid "git show-ref --exclude-existing[=<pattern>]"
+#: builtin/update-index.c:989
+msgid "report actions to standard output"
msgstr ""
-#: builtin/show-ref.c:165
-msgid "only show tags (can be combined with heads)"
+#: builtin/update-index.c:991
+msgid "(for porcelains) forget saved unresolved conflicts"
msgstr ""
-#: builtin/show-ref.c:166
-msgid "only show heads (can be combined with tags)"
+#: builtin/update-index.c:995
+msgid "write index in this format"
msgstr ""
-#: builtin/show-ref.c:167
-msgid "stricter reference checking, requires exact ref path"
+#: builtin/update-index.c:997
+msgid "enable or disable split index"
msgstr ""
-#: builtin/show-ref.c:170 builtin/show-ref.c:172
-msgid "show the HEAD reference, even if it would be filtered out"
+#: builtin/update-index.c:999
+msgid "enable/disable untracked cache"
msgstr ""
-#: builtin/show-ref.c:174
-msgid "dereference tags into object IDs"
+#: builtin/update-index.c:1001
+msgid "test if the filesystem supports untracked cache"
msgstr ""
-#: builtin/show-ref.c:176
-msgid "only show SHA1 hash using <n> digits"
+#: builtin/update-index.c:1003
+msgid "enable untracked cache without testing the filesystem"
msgstr ""
-#: builtin/show-ref.c:180
-msgid "do not print results to stdout (useful with --verify)"
+#: builtin/update-index.c:1120
+msgid ""
+"core.untrackedCache is set to true; remove or change it, if you really want "
+"to disable the untracked cache"
msgstr ""
-#: builtin/show-ref.c:182
-msgid "show refs from stdin that aren't in local repository"
+#: builtin/update-index.c:1124
+msgid "Untracked cache disabled"
msgstr ""
-#: builtin/stripspace.c:17
-msgid "git stripspace [-s | --strip-comments]"
+#: builtin/update-index.c:1132
+msgid ""
+"core.untrackedCache is set to false; remove or change it, if you really want "
+"to enable the untracked cache"
msgstr ""
-#: builtin/stripspace.c:18
-msgid "git stripspace [-c | --comment-lines]"
+#: builtin/update-index.c:1136
+#, c-format
+msgid "Untracked cache enabled for '%s'"
msgstr ""
-#: builtin/stripspace.c:35
-msgid "skip and remove all lines starting with comment character"
+#: builtin/update-ref.c:9
+msgid "git update-ref [<options>] -d <refname> [<old-val>]"
msgstr ""
-#: builtin/stripspace.c:38
-msgid "prepend comment character and space to each line"
+#: builtin/update-ref.c:10
+msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]"
msgstr ""
-#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:923
-#, c-format
-msgid "No such ref: %s"
+#: builtin/update-ref.c:11
+msgid "git update-ref [<options>] --stdin [-z]"
msgstr ""
-#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:932
-#, c-format
-msgid "Expecting a full ref name, got %s"
+#: builtin/update-ref.c:363
+msgid "delete the reference"
msgstr ""
-#: builtin/submodule--helper.c:71
-#, c-format
-msgid "cannot strip one component off url '%s'"
+#: builtin/update-ref.c:365
+msgid "update <refname> not the one it points to"
msgstr ""
-#: builtin/submodule--helper.c:278 builtin/submodule--helper.c:403
-#: builtin/submodule--helper.c:483
-msgid "alternative anchor for relative paths"
+#: builtin/update-ref.c:366
+msgid "stdin has NUL-terminated arguments"
msgstr ""
-#: builtin/submodule--helper.c:283
-msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
+#: builtin/update-ref.c:367
+msgid "read updates from stdin"
msgstr ""
-#: builtin/submodule--helper.c:324 builtin/submodule--helper.c:338
-#, c-format
-msgid "No url found for submodule path '%s' in .gitmodules"
+#: builtin/update-server-info.c:6
+msgid "git update-server-info [--force]"
msgstr ""
-#: builtin/submodule--helper.c:364
-#, c-format
-msgid "Failed to register url for submodule path '%s'"
+#: builtin/update-server-info.c:14
+msgid "update the info files from scratch"
msgstr ""
-#: builtin/submodule--helper.c:368
-#, c-format
-msgid "Submodule '%s' (%s) registered for path '%s'\n"
+#: builtin/verify-commit.c:17
+msgid "git verify-commit [-v | --verbose] <commit>..."
msgstr ""
-#: builtin/submodule--helper.c:378
-#, c-format
-msgid "warning: command update mode suggested for submodule '%s'\n"
+#: builtin/verify-commit.c:72
+msgid "print commit contents"
msgstr ""
-#: builtin/submodule--helper.c:385
-#, c-format
-msgid "Failed to register update mode for submodule path '%s'"
+#: builtin/verify-commit.c:73 builtin/verify-tag.c:37
+msgid "print raw gpg status output"
msgstr ""
-#: builtin/submodule--helper.c:404
-msgid "Suppress output for initializing a submodule"
+#: builtin/verify-pack.c:54
+msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
msgstr ""
-#: builtin/submodule--helper.c:409
-msgid "git submodule--helper init [<path>]"
+#: builtin/verify-pack.c:64
+msgid "verbose"
msgstr ""
-#: builtin/submodule--helper.c:430
-msgid "git submodule--helper name <path>"
+#: builtin/verify-pack.c:66
+msgid "show statistics only"
msgstr ""
-#: builtin/submodule--helper.c:436
-#, c-format
-msgid "no submodule mapping found in .gitmodules for path '%s'"
+#: builtin/verify-tag.c:18
+msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
msgstr ""
-#: builtin/submodule--helper.c:486
-msgid "where the new submodule will be cloned to"
+#: builtin/verify-tag.c:36
+msgid "print tag contents"
msgstr ""
-#: builtin/submodule--helper.c:489
-msgid "name of the new submodule"
+#: builtin/worktree.c:15
+msgid "git worktree add [<options>] <path> [<branch>]"
msgstr ""
-#: builtin/submodule--helper.c:492
-msgid "url where to clone the submodule from"
+#: builtin/worktree.c:16
+msgid "git worktree list [<options>]"
msgstr ""
-#: builtin/submodule--helper.c:498
-msgid "depth for shallow clones"
+#: builtin/worktree.c:17
+msgid "git worktree lock [<options>] <path>"
msgstr ""
-#: builtin/submodule--helper.c:504
-msgid ""
-"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
-"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
+#: builtin/worktree.c:18
+msgid "git worktree prune [<options>]"
msgstr ""
-#: builtin/submodule--helper.c:529 builtin/submodule--helper.c:535
-#, c-format
-msgid "could not create directory '%s'"
+#: builtin/worktree.c:19
+msgid "git worktree unlock <path>"
msgstr ""
-#: builtin/submodule--helper.c:531
+#: builtin/worktree.c:42
#, c-format
-msgid "clone of '%s' into submodule path '%s' failed"
+msgid "Removing worktrees/%s: not a valid directory"
msgstr ""
-#: builtin/submodule--helper.c:547
+#: builtin/worktree.c:48
#, c-format
-msgid "cannot open file '%s'"
+msgid "Removing worktrees/%s: gitdir file does not exist"
msgstr ""
-#: builtin/submodule--helper.c:552
+#: builtin/worktree.c:53
#, c-format
-msgid "could not close file %s"
+msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
msgstr ""
-#: builtin/submodule--helper.c:559
+#: builtin/worktree.c:64
#, c-format
-msgid "could not get submodule directory for '%s'"
+msgid "Removing worktrees/%s: invalid gitdir file"
msgstr ""
-#: builtin/submodule--helper.c:611
+#: builtin/worktree.c:80
#, c-format
-msgid "Submodule path '%s' not initialized"
+msgid "Removing worktrees/%s: gitdir file points to non-existent location"
msgstr ""
-#: builtin/submodule--helper.c:615
-msgid "Maybe you want to use 'update --init'?"
+#: builtin/worktree.c:128
+msgid "report pruned working trees"
msgstr ""
-#: builtin/submodule--helper.c:641
-#, c-format
-msgid "Skipping unmerged submodule %s"
+#: builtin/worktree.c:130
+msgid "expire working trees older than <time>"
msgstr ""
-#: builtin/submodule--helper.c:662
+#: builtin/worktree.c:204
#, c-format
-msgid "Skipping submodule '%s'"
+msgid "'%s' already exists"
msgstr ""
-#: builtin/submodule--helper.c:792
+#: builtin/worktree.c:236
#, c-format
-msgid "Failed to clone '%s'. Retry scheduled"
+msgid "could not create directory of '%s'"
msgstr ""
-#: builtin/submodule--helper.c:803
+#: builtin/worktree.c:272
#, c-format
-msgid "Failed to clone '%s' a second time, aborting"
-msgstr ""
-
-#: builtin/submodule--helper.c:824
-msgid "path into the working tree"
+msgid "Preparing %s (identifier %s)"
msgstr ""
-#: builtin/submodule--helper.c:827
-msgid "path into the working tree, across nested submodule boundaries"
+#: builtin/worktree.c:323
+msgid "checkout <branch> even if already checked out in other worktree"
msgstr ""
-#: builtin/submodule--helper.c:831
-msgid "rebase, merge, checkout or none"
+#: builtin/worktree.c:325
+msgid "create a new branch"
msgstr ""
-#: builtin/submodule--helper.c:835
-msgid "Create a shallow clone truncated to the specified number of revisions"
+#: builtin/worktree.c:327
+msgid "create or reset a branch"
msgstr ""
-#: builtin/submodule--helper.c:838
-msgid "parallel jobs"
+#: builtin/worktree.c:329
+msgid "populate the new working tree"
msgstr ""
-#: builtin/submodule--helper.c:840
-msgid "whether the initial clone should follow the shallow recommendation"
+#: builtin/worktree.c:337
+msgid "-b, -B, and --detach are mutually exclusive"
msgstr ""
-#: builtin/submodule--helper.c:841
-msgid "don't print cloning progress"
+#: builtin/worktree.c:472
+msgid "reason for locking"
msgstr ""
-#: builtin/submodule--helper.c:846
-msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
+#: builtin/worktree.c:484 builtin/worktree.c:517
+#, c-format
+msgid "'%s' is not a working tree"
msgstr ""
-#: builtin/submodule--helper.c:856
-msgid "bad value for update parameter"
+#: builtin/worktree.c:486 builtin/worktree.c:519
+msgid "The main working tree cannot be locked or unlocked"
msgstr ""
-#: builtin/submodule--helper.c:927
+#: builtin/worktree.c:491
#, c-format
-msgid ""
-"Submodule (%s) branch configured to inherit branch from superproject, but "
-"the superproject is not on any branch"
+msgid "'%s' is already locked, reason: %s"
msgstr ""
-#: builtin/submodule--helper.c:977
-msgid "submodule--helper subcommand must be called with a subcommand"
+#: builtin/worktree.c:493
+#, c-format
+msgid "'%s' is already locked"
msgstr ""
-#: builtin/submodule--helper.c:984
+#: builtin/worktree.c:521
#, c-format
-msgid "'%s' is not a valid submodule--helper subcommand"
+msgid "'%s' is not locked"
msgstr ""
-#: builtin/symbolic-ref.c:7
-msgid "git symbolic-ref [<options>] <name> [<ref>]"
+#: builtin/write-tree.c:13
+msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
msgstr ""
-#: builtin/symbolic-ref.c:8
-msgid "git symbolic-ref -d [-q] <name>"
+#: builtin/write-tree.c:26
+msgid "<prefix>/"
msgstr ""
-#: builtin/symbolic-ref.c:40
-msgid "suppress error message for non-symbolic (detached) refs"
+#: builtin/write-tree.c:27
+msgid "write tree object for a subdirectory <prefix>"
msgstr ""
-#: builtin/symbolic-ref.c:41
-msgid "delete symbolic ref"
+#: builtin/write-tree.c:30
+msgid "only useful for debugging"
msgstr ""
-#: builtin/symbolic-ref.c:42
-msgid "shorten ref output"
+#: upload-pack.c:22
+msgid "git upload-pack [<options>] <dir>"
msgstr ""
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
-msgid "reason"
+#: upload-pack.c:1036
+msgid "quit after a single request/response exchange"
msgstr ""
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
-msgid "reason of the update"
+#: upload-pack.c:1038
+msgid "exit immediately after initial ref advertisement"
msgstr ""
-#: builtin/tag.c:23
-msgid ""
-"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
-"[<head>]"
+#: upload-pack.c:1040
+msgid "do not try <directory>/.git/ if <directory> is no Git directory"
msgstr ""
-#: builtin/tag.c:24
-msgid "git tag -d <tagname>..."
+#: upload-pack.c:1042
+msgid "interrupt transfer after <n> seconds of inactivity"
msgstr ""
-#: builtin/tag.c:25
+#: credential-cache--daemon.c:223
+#, c-format
msgid ""
-"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>]\n"
-"\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]"
+"The permissions on your socket directory are too loose; other\n"
+"users may be able to read your cached credentials. Consider running:\n"
+"\n"
+"\tchmod 0700 %s"
msgstr ""
-#: builtin/tag.c:27
-msgid "git tag -v <tagname>..."
+#: credential-cache--daemon.c:271
+msgid "print debugging messages to stderr"
msgstr ""
-#: builtin/tag.c:81
-#, c-format
-msgid "tag name too long: %.*s..."
+#: 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 ""
-#: builtin/tag.c:86
-#, c-format
-msgid "tag '%s' not found."
+#: http.c:344
+msgid "Delegation control is not supported with cURL < 7.22.0"
msgstr ""
-#: builtin/tag.c:101
-#, c-format
-msgid "Deleted tag '%s' (was %s)\n"
+#: http.c:353
+msgid "Public key pinning not supported with cURL < 7.44.0"
msgstr ""
-#: builtin/tag.c:117
+#: http.c:1713
#, c-format
msgid ""
-"\n"
-"Write a message for tag:\n"
-" %s\n"
-"Lines starting with '%c' will be ignored.\n"
+"unable to update url base from redirection:\n"
+" asked for: %s\n"
+" redirect: %s"
msgstr ""
-#: builtin/tag.c:121
+#: remote-curl.c:319
#, c-format
-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"
+msgid "redirecting to %s"
msgstr ""
-#: builtin/tag.c:199
-msgid "unable to sign the tag"
+#: common-cmds.h:9
+msgid "start a working area (see also: git help tutorial)"
msgstr ""
-#: builtin/tag.c:201
-msgid "unable to write tag file"
+#: common-cmds.h:10
+msgid "work on the current change (see also: git help everyday)"
msgstr ""
-#: builtin/tag.c:226
-msgid "bad object type."
+#: common-cmds.h:11
+msgid "examine the history and state (see also: git help revisions)"
msgstr ""
-#: builtin/tag.c:239
-msgid "tag header too big."
+#: common-cmds.h:12
+msgid "grow, mark and tweak your common history"
msgstr ""
-#: builtin/tag.c:275
-msgid "no tag message?"
+#: common-cmds.h:13
+msgid "collaborate (see also: git help workflows)"
msgstr ""
-#: builtin/tag.c:281
-#, c-format
-msgid "The tag message has been left in %s\n"
+#: common-cmds.h:17
+msgid "Add file contents to the index"
msgstr ""
-#: builtin/tag.c:339
-msgid "list tag names"
+#: common-cmds.h:18
+msgid "Use binary search to find the commit that introduced a bug"
msgstr ""
-#: builtin/tag.c:341
-msgid "print <n> lines of each tag message"
+#: common-cmds.h:19
+msgid "List, create, or delete branches"
msgstr ""
-#: builtin/tag.c:343
-msgid "delete tags"
+#: common-cmds.h:20
+msgid "Switch branches or restore working tree files"
msgstr ""
-#: builtin/tag.c:344
-msgid "verify tags"
+#: common-cmds.h:21
+msgid "Clone a repository into a new directory"
msgstr ""
-#: builtin/tag.c:346
-msgid "Tag creation options"
+#: common-cmds.h:22
+msgid "Record changes to the repository"
msgstr ""
-#: builtin/tag.c:348
-msgid "annotated tag, needs a message"
+#: common-cmds.h:23
+msgid "Show changes between commits, commit and working tree, etc"
msgstr ""
-#: builtin/tag.c:350
-msgid "tag message"
+#: common-cmds.h:24
+msgid "Download objects and refs from another repository"
msgstr ""
-#: builtin/tag.c:352
-msgid "annotated and GPG-signed tag"
+#: common-cmds.h:25
+msgid "Print lines matching a pattern"
msgstr ""
-#: builtin/tag.c:356
-msgid "use another key to sign the tag"
+#: common-cmds.h:26
+msgid "Create an empty Git repository or reinitialize an existing one"
msgstr ""
-#: builtin/tag.c:357
-msgid "replace the tag if exists"
+#: common-cmds.h:27
+msgid "Show commit logs"
msgstr ""
-#: builtin/tag.c:358 builtin/update-ref.c:368
-msgid "create a reflog"
+#: common-cmds.h:28
+msgid "Join two or more development histories together"
msgstr ""
-#: builtin/tag.c:360
-msgid "Tag listing options"
+#: common-cmds.h:29
+msgid "Move or rename a file, a directory, or a symlink"
msgstr ""
-#: builtin/tag.c:361
-msgid "show tag list in columns"
+#: common-cmds.h:30
+msgid "Fetch from and integrate with another repository or a local branch"
msgstr ""
-#: builtin/tag.c:362 builtin/tag.c:363
-msgid "print only tags that contain the commit"
+#: common-cmds.h:31
+msgid "Update remote refs along with associated objects"
msgstr ""
-#: builtin/tag.c:364
-msgid "print only tags that are merged"
+#: common-cmds.h:32
+msgid "Reapply commits on top of another base tip"
msgstr ""
-#: builtin/tag.c:365
-msgid "print only tags that are not merged"
+#: common-cmds.h:33
+msgid "Reset current HEAD to the specified state"
msgstr ""
-#: builtin/tag.c:370
-msgid "print only tags of the object"
+#: common-cmds.h:34
+msgid "Remove files from the working tree and from the index"
msgstr ""
-#: builtin/tag.c:399
-msgid "--column and -n are incompatible"
+#: common-cmds.h:35
+msgid "Show various types of objects"
msgstr ""
-#: builtin/tag.c:419
-msgid "-n option is only allowed with -l."
+#: common-cmds.h:36
+msgid "Show the working tree status"
msgstr ""
-#: builtin/tag.c:421
-msgid "--contains option is only allowed with -l."
+#: common-cmds.h:37
+msgid "Create, list, delete or verify a tag object signed with GPG"
msgstr ""
-#: builtin/tag.c:423
-msgid "--points-at option is only allowed with -l."
+#: parse-options.h:145
+msgid "expiry-date"
msgstr ""
-#: builtin/tag.c:425
-msgid "--merged and --no-merged option are only allowed with -l"
+#: parse-options.h:160
+msgid "no-op (backward compatibility)"
msgstr ""
-#: builtin/tag.c:433
-msgid "only one -F or -m option is allowed."
+#: parse-options.h:238
+msgid "be more verbose"
msgstr ""
-#: builtin/tag.c:452
-msgid "too many params"
+#: parse-options.h:240
+msgid "be more quiet"
msgstr ""
-#: builtin/tag.c:458
-#, c-format
-msgid "'%s' is not a valid tag name."
+#: parse-options.h:246
+msgid "use <n> digits to display SHA-1s"
msgstr ""
-#: builtin/tag.c:463
-#, c-format
-msgid "tag '%s' already exists"
+#: rerere.h:40
+msgid "update the index with reused conflict resolution if possible"
msgstr ""
-#: builtin/tag.c:491
-#, c-format
-msgid "Updated tag '%s' (was %s)\n"
+#: git-bisect.sh:54
+msgid "You need to start by \"git bisect start\""
msgstr ""
-#: builtin/unpack-objects.c:490
-msgid "Unpacking objects"
+#. TRANSLATORS: Make sure to include [Y] and [n] in your
+#. translation. The program will only accept English input
+#. at this point.
+#: git-bisect.sh:60
+msgid "Do you want me to do it for you [Y/n]? "
msgstr ""
-#: builtin/update-index.c:79
-#, c-format
-msgid "failed to create directory %s"
+#: git-bisect.sh:121
+#, sh-format
+msgid "unrecognised option: '$arg'"
msgstr ""
-#: builtin/update-index.c:85
-#, c-format
-msgid "failed to stat %s"
+#: git-bisect.sh:125
+#, sh-format
+msgid "'$arg' does not appear to be a valid revision"
msgstr ""
-#: builtin/update-index.c:95
-#, c-format
-msgid "failed to create file %s"
+#: git-bisect.sh:154
+msgid "Bad HEAD - I need a HEAD"
msgstr ""
-#: builtin/update-index.c:103
-#, c-format
-msgid "failed to delete file %s"
+#: git-bisect.sh:167
+#, sh-format
+msgid ""
+"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
msgstr ""
-#: builtin/update-index.c:110 builtin/update-index.c:212
-#, c-format
-msgid "failed to delete directory %s"
+#: git-bisect.sh:177
+msgid "won't bisect on cg-seek'ed tree"
msgstr ""
-#: builtin/update-index.c:133
-#, c-format
-msgid "Testing mtime in '%s' "
+#: git-bisect.sh:181
+msgid "Bad HEAD - strange symbolic ref"
msgstr ""
-#: builtin/update-index.c:145
-msgid "directory stat info does not change after adding a new file"
+#: git-bisect.sh:233
+#, sh-format
+msgid "Bad bisect_write argument: $state"
msgstr ""
-#: builtin/update-index.c:158
-msgid "directory stat info does not change after adding a new directory"
+#: git-bisect.sh:262
+#, sh-format
+msgid "Bad rev input: $arg"
msgstr ""
-#: builtin/update-index.c:171
-msgid "directory stat info changes after updating a file"
+#: git-bisect.sh:281
+#, sh-format
+msgid "Bad rev input: $bisected_head"
msgstr ""
-#: builtin/update-index.c:182
-msgid "directory stat info changes after adding a file inside subdirectory"
+#: git-bisect.sh:290
+#, sh-format
+msgid "Bad rev input: $rev"
msgstr ""
-#: builtin/update-index.c:193
-msgid "directory stat info does not change after deleting a file"
+#: git-bisect.sh:299
+#, sh-format
+msgid "'git bisect $TERM_BAD' can take only one argument."
msgstr ""
-#: builtin/update-index.c:206
-msgid "directory stat info does not change after deleting a directory"
+#: git-bisect.sh:322
+#, sh-format
+msgid "Warning: bisecting only with a $TERM_BAD commit."
msgstr ""
-#: builtin/update-index.c:213
-msgid " OK"
+#. TRANSLATORS: Make sure to include [Y] and [n] in your
+#. translation. The program will only accept English input
+#. at this point.
+#: git-bisect.sh:328
+msgid "Are you sure [Y/n]? "
msgstr ""
-#: builtin/update-index.c:575
-msgid "git update-index [<options>] [--] [<file>...]"
+#: git-bisect.sh:340
+#, sh-format
+msgid ""
+"You need to give me at least one $bad_syn and one $good_syn revision.\n"
+"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
msgstr ""
-#: builtin/update-index.c:930
-msgid "continue refresh even when index needs update"
+#: git-bisect.sh:343
+#, sh-format
+msgid ""
+"You need to start by \"git bisect start\".\n"
+"You then need to give me at least one $good_syn and one $bad_syn revision.\n"
+"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
msgstr ""
-#: builtin/update-index.c:933
-msgid "refresh: ignore submodules"
+#: git-bisect.sh:414 git-bisect.sh:546
+msgid "We are not bisecting."
msgstr ""
-#: builtin/update-index.c:936
-msgid "do not ignore new files"
+#: git-bisect.sh:421
+#, sh-format
+msgid "'$invalid' is not a valid commit"
msgstr ""
-#: builtin/update-index.c:938
-msgid "let files replace directories and vice-versa"
+#: git-bisect.sh:430
+#, sh-format
+msgid ""
+"Could not check out original HEAD '$branch'.\n"
+"Try 'git bisect reset <commit>'."
msgstr ""
-#: builtin/update-index.c:940
-msgid "notice files missing from worktree"
+#: git-bisect.sh:458
+msgid "No logfile given"
msgstr ""
-#: builtin/update-index.c:942
-msgid "refresh even if index contains unmerged entries"
+#: git-bisect.sh:459
+#, sh-format
+msgid "cannot read $file for replaying"
msgstr ""
-#: builtin/update-index.c:945
-msgid "refresh stat information"
+#: git-bisect.sh:480
+msgid "?? what are you talking about?"
msgstr ""
-#: builtin/update-index.c:949
-msgid "like --refresh, but ignore assume-unchanged setting"
+#: git-bisect.sh:492
+#, sh-format
+msgid "running $command"
msgstr ""
-#: builtin/update-index.c:953
-msgid "<mode>,<object>,<path>"
+#: git-bisect.sh:499
+#, sh-format
+msgid ""
+"bisect run failed:\n"
+"exit code $res from '$command' is < 0 or >= 128"
msgstr ""
-#: builtin/update-index.c:954
-msgid "add the specified entry to the index"
+#: git-bisect.sh:525
+msgid "bisect run cannot continue any more"
msgstr ""
-#: builtin/update-index.c:963
-msgid "mark files as \"not changing\""
+#: git-bisect.sh:531
+#, sh-format
+msgid ""
+"bisect run failed:\n"
+"'bisect_state $state' exited with error code $res"
msgstr ""
-#: builtin/update-index.c:966
-msgid "clear assumed-unchanged bit"
+#: git-bisect.sh:538
+msgid "bisect run success"
msgstr ""
-#: builtin/update-index.c:969
-msgid "mark files as \"index-only\""
+#: git-bisect.sh:565
+msgid "please use two different terms"
msgstr ""
-#: builtin/update-index.c:972
-msgid "clear skip-worktree bit"
+#: git-bisect.sh:575
+#, sh-format
+msgid "'$term' is not a valid term"
msgstr ""
-#: builtin/update-index.c:975
-msgid "add to index only; do not add content to object database"
+#: git-bisect.sh:578
+#, sh-format
+msgid "can't use the builtin command '$term' as a term"
msgstr ""
-#: builtin/update-index.c:977
-msgid "remove named paths even if present in worktree"
+#: git-bisect.sh:587 git-bisect.sh:593
+#, sh-format
+msgid "can't change the meaning of term '$term'"
msgstr ""
-#: builtin/update-index.c:979
-msgid "with --stdin: input lines are terminated by null bytes"
+#: git-bisect.sh:606
+#, sh-format
+msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect."
msgstr ""
-#: builtin/update-index.c:981
-msgid "read list of paths to be updated from standard input"
+#: git-bisect.sh:636
+msgid "no terms defined"
msgstr ""
-#: builtin/update-index.c:985
-msgid "add entries from standard input to the index"
+#: git-bisect.sh:653
+#, sh-format
+msgid ""
+"invalid argument $arg for 'git bisect terms'.\n"
+"Supported options are: --term-good|--term-old and --term-bad|--term-new."
msgstr ""
-#: builtin/update-index.c:989
-msgid "repopulate stages #2 and #3 for the listed paths"
+#: git-merge-octopus.sh:46
+msgid ""
+"Error: Your local changes to the following files would be overwritten by "
+"merge"
msgstr ""
-#: builtin/update-index.c:993
-msgid "only update entries that differ from HEAD"
+#: git-merge-octopus.sh:61
+msgid "Automated merge did not work."
msgstr ""
-#: builtin/update-index.c:997
-msgid "ignore files missing from worktree"
+#: git-merge-octopus.sh:62
+msgid "Should not be doing an octopus."
msgstr ""
-#: builtin/update-index.c:1000
-msgid "report actions to standard output"
+#: git-merge-octopus.sh:73
+#, sh-format
+msgid "Unable to find common commit with $pretty_name"
msgstr ""
-#: builtin/update-index.c:1002
-msgid "(for porcelains) forget saved unresolved conflicts"
+#: git-merge-octopus.sh:77
+#, sh-format
+msgid "Already up-to-date with $pretty_name"
msgstr ""
-#: builtin/update-index.c:1006
-msgid "write index in this format"
+#: git-merge-octopus.sh:89
+#, sh-format
+msgid "Fast-forwarding to: $pretty_name"
msgstr ""
-#: builtin/update-index.c:1008
-msgid "enable or disable split index"
+#: git-merge-octopus.sh:97
+#, sh-format
+msgid "Trying simple merge with $pretty_name"
msgstr ""
-#: builtin/update-index.c:1010
-msgid "enable/disable untracked cache"
+#: git-merge-octopus.sh:102
+msgid "Simple merge did not work, trying automatic merge."
msgstr ""
-#: builtin/update-index.c:1012
-msgid "test if the filesystem supports untracked cache"
+#: 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 ""
-#: builtin/update-index.c:1014
-msgid "enable untracked cache without testing the filesystem"
+#: git-rebase.sh:157 git-rebase.sh:396
+#, sh-format
+msgid "Could not move back to $head_name"
msgstr ""
-#: builtin/update-index.c:1134
-msgid "Untracked cache disabled"
+#: git-rebase.sh:171
+#, sh-format
+msgid "Cannot store $stash_sha1"
msgstr ""
-#: builtin/update-index.c:1146
-#, c-format
-msgid "Untracked cache enabled for '%s'"
+#: git-rebase.sh:211
+msgid "The pre-rebase hook refused to rebase."
msgstr ""
-#: builtin/update-ref.c:9
-msgid "git update-ref [<options>] -d <refname> [<old-val>]"
+#: git-rebase.sh:216
+msgid "It looks like git-am is in progress. Cannot rebase."
msgstr ""
-#: builtin/update-ref.c:10
-msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]"
+#: git-rebase.sh:357
+msgid "No rebase in progress?"
msgstr ""
-#: builtin/update-ref.c:11
-msgid "git update-ref [<options>] --stdin [-z]"
+#: git-rebase.sh:368
+msgid "The --edit-todo action can only be used during interactive rebase."
msgstr ""
-#: builtin/update-ref.c:363
-msgid "delete the reference"
+#: git-rebase.sh:375
+msgid "Cannot read HEAD"
msgstr ""
-#: builtin/update-ref.c:365
-msgid "update <refname> not the one it points to"
+#: git-rebase.sh:378
+msgid ""
+"You must edit all merge conflicts and then\n"
+"mark them as resolved using git add"
msgstr ""
-#: builtin/update-ref.c:366
-msgid "stdin has NUL-terminated arguments"
+#: git-rebase.sh:418
+#, 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 ""
-#: builtin/update-ref.c:367
-msgid "read updates from stdin"
+#: git-rebase.sh:469
+#, sh-format
+msgid "invalid upstream $upstream_name"
msgstr ""
-#: builtin/update-server-info.c:6
-msgid "git update-server-info [--force]"
+#: git-rebase.sh:493
+#, sh-format
+msgid "$onto_name: there are more than one merge bases"
msgstr ""
-#: builtin/update-server-info.c:14
-msgid "update the info files from scratch"
+#: git-rebase.sh:496 git-rebase.sh:500
+#, sh-format
+msgid "$onto_name: there is no merge base"
msgstr ""
-#: builtin/verify-commit.c:17
-msgid "git verify-commit [-v | --verbose] <commit>..."
+#: git-rebase.sh:505
+#, sh-format
+msgid "Does not point to a valid commit: $onto_name"
msgstr ""
-#: builtin/verify-commit.c:72
-msgid "print commit contents"
+#: git-rebase.sh:528
+#, sh-format
+msgid "fatal: no such branch: $branch_name"
msgstr ""
-#: builtin/verify-commit.c:73 builtin/verify-tag.c:35
-msgid "print raw gpg status output"
+#: git-rebase.sh:561
+msgid "Cannot autostash"
msgstr ""
-#: builtin/verify-pack.c:54
-msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
+#: git-rebase.sh:566
+#, sh-format
+msgid "Created autostash: $stash_abbrev"
msgstr ""
-#: builtin/verify-pack.c:64
-msgid "verbose"
+#: git-rebase.sh:570
+msgid "Please commit or stash them."
msgstr ""
-#: builtin/verify-pack.c:66
-msgid "show statistics only"
+#: git-rebase.sh:590
+#, sh-format
+msgid "Current branch $branch_name is up to date."
msgstr ""
-#: builtin/verify-tag.c:17
-msgid "git verify-tag [-v | --verbose] <tag>..."
+#: git-rebase.sh:594
+#, sh-format
+msgid "Current branch $branch_name is up to date, rebase forced."
msgstr ""
-#: builtin/verify-tag.c:34
-msgid "print tag contents"
+#: git-rebase.sh:605
+#, sh-format
+msgid "Changes from $mb to $onto:"
msgstr ""
-#: builtin/worktree.c:15
-msgid "git worktree add [<options>] <path> [<branch>]"
+#: git-rebase.sh:614
+msgid "First, rewinding head to replay your work on top of it..."
msgstr ""
-#: builtin/worktree.c:16
-msgid "git worktree list [<options>]"
+#: git-rebase.sh:624
+#, sh-format
+msgid "Fast-forwarded $branch_name to $onto_name."
msgstr ""
-#: builtin/worktree.c:17
-msgid "git worktree lock [<options>] <path>"
+#: git-stash.sh:50
+msgid "git stash clear with parameters is unimplemented"
msgstr ""
-#: builtin/worktree.c:18
-msgid "git worktree prune [<options>]"
+#: git-stash.sh:73
+msgid "You do not have the initial commit yet"
msgstr ""
-#: builtin/worktree.c:19
-msgid "git worktree unlock <path>"
+#: git-stash.sh:88
+msgid "Cannot save the current index state"
msgstr ""
-#: builtin/worktree.c:42
-#, c-format
-msgid "Removing worktrees/%s: not a valid directory"
+#: git-stash.sh:103
+msgid "Cannot save the untracked files"
msgstr ""
-#: builtin/worktree.c:48
-#, c-format
-msgid "Removing worktrees/%s: gitdir file does not exist"
+#: git-stash.sh:123 git-stash.sh:136
+msgid "Cannot save the current worktree state"
msgstr ""
-#: builtin/worktree.c:53
-#, c-format
-msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
+#: git-stash.sh:140
+msgid "No changes selected"
+msgstr ""
+
+#: git-stash.sh:143
+msgid "Cannot remove temporary index (can't happen)"
msgstr ""
-#: builtin/worktree.c:64
-#, c-format
-msgid "Removing worktrees/%s: invalid gitdir file"
+#: git-stash.sh:156
+msgid "Cannot record working tree state"
msgstr ""
-#: builtin/worktree.c:80
-#, c-format
-msgid "Removing worktrees/%s: gitdir file points to non-existent location"
+#: git-stash.sh:188
+#, sh-format
+msgid "Cannot update $ref_stash with $w_commit"
msgstr ""
-#: builtin/worktree.c:204
-#, c-format
-msgid "'%s' already exists"
+#. TRANSLATORS: $option is an invalid option, like
+#. `--blah-blah'. The 7 spaces at the beginning of the
+#. second line correspond to "error: ". So you should line
+#. up the second line with however many characters the
+#. translation of "error: " takes in your language. E.g. in
+#. English this is:
+#.
+#. $ git stash save --blah-blah 2>&1 | head -n 2
+#. error: unknown option for 'stash save': --blah-blah
+#. To provide a message, use git stash save -- '--blah-blah'
+#: git-stash.sh:238
+#, sh-format
+msgid ""
+"error: unknown option for 'stash save': $option\n"
+" To provide a message, use git stash save -- '$option'"
msgstr ""
-#: builtin/worktree.c:236
-#, c-format
-msgid "could not create directory of '%s'"
+#: git-stash.sh:251
+msgid "Can't use --patch and --include-untracked or --all at the same time"
msgstr ""
-#: builtin/worktree.c:272
-#, c-format
-msgid "Preparing %s (identifier %s)"
+#: git-stash.sh:259
+msgid "No local changes to save"
msgstr ""
-#: builtin/worktree.c:323
-msgid "checkout <branch> even if already checked out in other worktree"
+#: git-stash.sh:263
+msgid "Cannot initialize stash"
msgstr ""
-#: builtin/worktree.c:325
-msgid "create a new branch"
+#: git-stash.sh:267
+msgid "Cannot save the current status"
msgstr ""
-#: builtin/worktree.c:327
-msgid "create or reset a branch"
+#: git-stash.sh:268
+#, sh-format
+msgid "Saved working directory and index state $stash_msg"
msgstr ""
-#: builtin/worktree.c:329
-msgid "populate the new working tree"
+#: git-stash.sh:285
+msgid "Cannot remove worktree changes"
msgstr ""
-#: builtin/worktree.c:337
-msgid "-b, -B, and --detach are mutually exclusive"
+#: git-stash.sh:403
+#, sh-format
+msgid "unknown option: $opt"
msgstr ""
-#: builtin/worktree.c:470
-msgid "reason for locking"
+#: git-stash.sh:416
+msgid "No stash found."
msgstr ""
-#: builtin/worktree.c:482 builtin/worktree.c:515
-#, c-format
-msgid "'%s' is not a working tree"
+#: git-stash.sh:423
+#, sh-format
+msgid "Too many revisions specified: $REV"
msgstr ""
-#: builtin/worktree.c:484 builtin/worktree.c:517
-msgid "The main working tree cannot be locked or unlocked"
+#: git-stash.sh:438
+#, sh-format
+msgid "$reference is not a valid reference"
msgstr ""
-#: builtin/worktree.c:489
-#, c-format
-msgid "'%s' is already locked, reason: %s"
+#: git-stash.sh:466
+#, sh-format
+msgid "'$args' is not a stash-like commit"
msgstr ""
-#: builtin/worktree.c:491
-#, c-format
-msgid "'%s' is already locked"
+#: git-stash.sh:477
+#, sh-format
+msgid "'$args' is not a stash reference"
msgstr ""
-#: builtin/worktree.c:519
-#, c-format
-msgid "'%s' is not locked"
+#: git-stash.sh:485
+msgid "unable to refresh index"
msgstr ""
-#: builtin/write-tree.c:13
-msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
+#: git-stash.sh:489
+msgid "Cannot apply a stash in the middle of a merge"
msgstr ""
-#: builtin/write-tree.c:26
-msgid "<prefix>/"
+#: git-stash.sh:497
+msgid "Conflicts in index. Try without --index."
msgstr ""
-#: builtin/write-tree.c:27
-msgid "write tree object for a subdirectory <prefix>"
+#: git-stash.sh:499
+msgid "Could not save index tree"
msgstr ""
-#: builtin/write-tree.c:30
-msgid "only useful for debugging"
+#: git-stash.sh:508
+msgid "Could not restore untracked files from stash"
msgstr ""
-#: upload-pack.c:20
-msgid "git upload-pack [<options>] <dir>"
+#: git-stash.sh:533
+msgid "Cannot unstage modified files"
msgstr ""
-#: upload-pack.c:837
-msgid "quit after a single request/response exchange"
+#: git-stash.sh:548
+msgid "Index was not unstashed."
msgstr ""
-#: upload-pack.c:839
-msgid "exit immediately after initial ref advertisement"
+#: git-stash.sh:562
+msgid "The stash is kept in case you need it again."
msgstr ""
-#: upload-pack.c:841
-msgid "do not try <directory>/.git/ if <directory> is no Git directory"
+#: git-stash.sh:571
+#, sh-format
+msgid "Dropped ${REV} ($s)"
msgstr ""
-#: upload-pack.c:843
-msgid "interrupt transfer after <n> seconds of inactivity"
+#: git-stash.sh:572
+#, sh-format
+msgid "${REV}: Could not drop stash entry"
msgstr ""
-#: credential-cache--daemon.c:271
-msgid "print debugging messages to stderr"
+#: git-stash.sh:580
+msgid "No branch name specified"
msgstr ""
-#: 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."
+#: git-stash.sh:652
+msgid "(To restore them type \"git stash apply\")"
msgstr ""
-#: http.c:323
-msgid "Public key pinning not supported with cURL < 7.44.0"
+#: git-submodule.sh:181
+msgid "Relative path can only be used from the toplevel of the working tree"
msgstr ""
-#: common-cmds.h:9
-msgid "start a working area (see also: git help tutorial)"
+#: git-submodule.sh:191
+#, sh-format
+msgid "repo URL: '$repo' must be absolute or begin with ./|../"
msgstr ""
-#: common-cmds.h:10
-msgid "work on the current change (see also: git help everyday)"
+#: git-submodule.sh:210
+#, sh-format
+msgid "'$sm_path' already exists in the index"
msgstr ""
-#: common-cmds.h:11
-msgid "examine the history and state (see also: git help revisions)"
+#: git-submodule.sh:213
+#, sh-format
+msgid "'$sm_path' already exists in the index and is not a submodule"
msgstr ""
-#: common-cmds.h:12
-msgid "grow, mark and tweak your common history"
+#: git-submodule.sh:218
+#, sh-format
+msgid ""
+"The following path is ignored by one of your .gitignore files:\n"
+"$sm_path\n"
+"Use -f if you really want to add it."
msgstr ""
-#: common-cmds.h:13
-msgid "collaborate (see also: git help workflows)"
+#: git-submodule.sh:236
+#, sh-format
+msgid "Adding existing repo at '$sm_path' to the index"
msgstr ""
-#: common-cmds.h:17
-msgid "Add file contents to the index"
+#: git-submodule.sh:238
+#, sh-format
+msgid "'$sm_path' already exists and is not a valid git repo"
msgstr ""
-#: common-cmds.h:18
-msgid "Use binary search to find the commit that introduced a bug"
+#: git-submodule.sh:246
+#, sh-format
+msgid "A git directory for '$sm_name' is found locally with remote(s):"
msgstr ""
-#: common-cmds.h:19
-msgid "List, create, or delete branches"
+#: git-submodule.sh:248
+#, sh-format
+msgid ""
+"If you want to reuse this local git directory instead of cloning again from\n"
+" $realrepo\n"
+"use the '--force' option. If the local git directory is not the correct "
+"repo\n"
+"or you are unsure what this means choose another name with the '--name' "
+"option."
msgstr ""
-#: common-cmds.h:20
-msgid "Switch branches or restore working tree files"
+#: git-submodule.sh:254
+#, sh-format
+msgid "Reactivating local git directory for submodule '$sm_name'."
msgstr ""
-#: common-cmds.h:21
-msgid "Clone a repository into a new directory"
+#: git-submodule.sh:266
+#, sh-format
+msgid "Unable to checkout submodule '$sm_path'"
msgstr ""
-#: common-cmds.h:22
-msgid "Record changes to the repository"
+#: git-submodule.sh:271
+#, sh-format
+msgid "Failed to add submodule '$sm_path'"
msgstr ""
-#: common-cmds.h:23
-msgid "Show changes between commits, commit and working tree, etc"
+#: git-submodule.sh:280
+#, sh-format
+msgid "Failed to register submodule '$sm_path'"
msgstr ""
-#: common-cmds.h:24
-msgid "Download objects and refs from another repository"
+#: git-submodule.sh:327
+#, sh-format
+msgid "Entering '$displaypath'"
msgstr ""
-#: common-cmds.h:25
-msgid "Print lines matching a pattern"
+#: git-submodule.sh:347
+#, sh-format
+msgid "Stopping at '$displaypath'; script returned non-zero status."
msgstr ""
-#: common-cmds.h:26
-msgid "Create an empty Git repository or reinitialize an existing one"
+#: git-submodule.sh:418
+#, sh-format
+msgid "pathspec and --all are incompatible"
msgstr ""
-#: common-cmds.h:27
-msgid "Show commit logs"
+#: git-submodule.sh:423
+#, sh-format
+msgid "Use '--all' if you really want to deinitialize all submodules"
msgstr ""
-#: common-cmds.h:28
-msgid "Join two or more development histories together"
+#: git-submodule.sh:443
+#, sh-format
+msgid ""
+"Submodule work tree '$displaypath' contains a .git directory\n"
+"(use 'rm -rf' if you really want to remove it including all of its history)"
msgstr ""
-#: common-cmds.h:29
-msgid "Move or rename a file, a directory, or a symlink"
+#: git-submodule.sh:451
+#, sh-format
+msgid ""
+"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
+"discard them"
msgstr ""
-#: common-cmds.h:30
-msgid "Fetch from and integrate with another repository or a local branch"
+#: git-submodule.sh:454
+#, sh-format
+msgid "Cleared directory '$displaypath'"
msgstr ""
-#: common-cmds.h:31
-msgid "Update remote refs along with associated objects"
+#: git-submodule.sh:455
+#, sh-format
+msgid "Could not remove submodule work tree '$displaypath'"
msgstr ""
-#: common-cmds.h:32
-msgid "Reapply commits on top of another base tip"
+#: git-submodule.sh:458
+#, sh-format
+msgid "Could not create empty submodule directory '$displaypath'"
msgstr ""
-#: common-cmds.h:33
-msgid "Reset current HEAD to the specified state"
+#: git-submodule.sh:467
+#, sh-format
+msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
msgstr ""
-#: common-cmds.h:34
-msgid "Remove files from the working tree and from the index"
+#: git-submodule.sh:623
+#, sh-format
+msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr ""
-#: common-cmds.h:35
-msgid "Show various types of objects"
+#: git-submodule.sh:633
+#, sh-format
+msgid "Unable to fetch in submodule path '$sm_path'"
msgstr ""
-#: common-cmds.h:36
-msgid "Show the working tree status"
+#: git-submodule.sh:638
+#, sh-format
+msgid ""
+"Unable to find current ${remote_name}/${branch} revision in submodule path "
+"'$sm_path'"
msgstr ""
-#: common-cmds.h:37
-msgid "Create, list, delete or verify a tag object signed with GPG"
+#: git-submodule.sh:656
+#, sh-format
+msgid "Unable to fetch in submodule path '$displaypath'"
msgstr ""
-#: parse-options.h:145
-msgid "expiry-date"
+#: git-submodule.sh:662
+#, sh-format
+msgid ""
+"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
+"Direct fetching of that commit failed."
msgstr ""
-#: parse-options.h:160
-msgid "no-op (backward compatibility)"
+#: git-submodule.sh:669
+#, sh-format
+msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
msgstr ""
-#: parse-options.h:237
-msgid "be more verbose"
+#: git-submodule.sh:670
+#, sh-format
+msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr ""
-#: parse-options.h:239
-msgid "be more quiet"
+#: git-submodule.sh:674
+#, sh-format
+msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr ""
-#: parse-options.h:245
-msgid "use <n> digits to display SHA-1s"
+#: git-submodule.sh:675
+#, sh-format
+msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr ""
-#: rerere.h:40
-msgid "update the index with reused conflict resolution if possible"
+#: git-submodule.sh:680
+#, sh-format
+msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr ""
-#: git-bisect.sh:54
-msgid "You need to start by \"git bisect start\""
+#: git-submodule.sh:681
+#, sh-format
+msgid "Submodule path '$displaypath': merged in '$sha1'"
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:60
-msgid "Do you want me to do it for you [Y/n]? "
+#: git-submodule.sh:686
+#, sh-format
+msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
msgstr ""
-#: git-bisect.sh:121
+#: git-submodule.sh:687
#, sh-format
-msgid "unrecognised option: '$arg'"
+msgid "Submodule path '$displaypath': '$command $sha1'"
msgstr ""
-#: git-bisect.sh:125
+#: git-submodule.sh:718
#, sh-format
-msgid "'$arg' does not appear to be a valid revision"
+msgid "Failed to recurse into submodule path '$displaypath'"
msgstr ""
-#: git-bisect.sh:154
-msgid "Bad HEAD - I need a HEAD"
+#: git-submodule.sh:826
+msgid "The --cached option cannot be used with the --files option"
msgstr ""
-#: git-bisect.sh:167
+#: git-submodule.sh:878
#, sh-format
-msgid ""
-"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
+msgid "unexpected mode $mod_dst"
msgstr ""
-#: git-bisect.sh:177
-msgid "won't bisect on cg-seek'ed tree"
+#: git-submodule.sh:898
+#, sh-format
+msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr ""
-#: git-bisect.sh:181
-msgid "Bad HEAD - strange symbolic ref"
+#: git-submodule.sh:901
+#, sh-format
+msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr ""
-#: git-bisect.sh:233
+#: git-submodule.sh:904
#, sh-format
-msgid "Bad bisect_write argument: $state"
+msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
msgstr ""
-#: git-bisect.sh:262
+#: git-submodule.sh:1051
#, sh-format
-msgid "Bad rev input: $arg"
+msgid "Failed to recurse into submodule path '$sm_path'"
msgstr ""
-#: git-bisect.sh:281
+#: git-submodule.sh:1118
#, sh-format
-msgid "Bad rev input: $bisected_head"
+msgid "Synchronizing submodule url for '$displaypath'"
msgstr ""
-#: git-bisect.sh:290
+#: git-parse-remote.sh:89
#, sh-format
-msgid "Bad rev input: $rev"
+msgid "See git-${cmd}(1) for details."
msgstr ""
-#: git-bisect.sh:299
+#: git-rebase--interactive.sh:140
#, sh-format
-msgid "'git bisect $TERM_BAD' can take only one argument."
+msgid "Rebasing ($new_count/$total)"
msgstr ""
-#: git-bisect.sh:322
-#, sh-format
-msgid "Warning: bisecting only with a $TERM_BAD commit."
+#: git-rebase--interactive.sh:156
+msgid ""
+"\n"
+"Commands:\n"
+" p, pick = use commit\n"
+" r, reword = use commit, but edit the commit message\n"
+" e, edit = use commit, but stop for amending\n"
+" s, squash = use commit, but meld into previous commit\n"
+" f, fixup = like \"squash\", but discard this commit's log message\n"
+" x, exec = run command (the rest of the line) using shell\n"
+" d, drop = remove commit\n"
+"\n"
+"These lines can be re-ordered; they are executed from top to bottom.\n"
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:328
-msgid "Are you sure [Y/n]? "
+#: git-rebase--interactive.sh:171
+msgid ""
+"\n"
+"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
msgstr ""
-#: git-bisect.sh:340
-#, sh-format
+#: git-rebase--interactive.sh:175
msgid ""
-"You need to give me at least one $bad_syn and one $good_syn revision.\n"
-"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
+"\n"
+"If you remove a line here THAT COMMIT WILL BE LOST.\n"
msgstr ""
-#: git-bisect.sh:343
+#: git-rebase--interactive.sh:211
#, sh-format
msgid ""
-"You need to start by \"git bisect start\".\n"
-"You then need to give me at least one $good_syn and one $bad_syn revision.\n"
-"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
+"You can amend the commit now, with\n"
+"\n"
+"\tgit commit --amend $gpg_sign_opt_quoted\n"
+"\n"
+"Once you are satisfied with your changes, run\n"
+"\n"
+"\tgit rebase --continue"
msgstr ""
-#: git-bisect.sh:414 git-bisect.sh:546
-msgid "We are not bisecting."
+#: git-rebase--interactive.sh:236
+#, sh-format
+msgid "$sha1: not a commit that can be picked"
msgstr ""
-#: git-bisect.sh:421
+#: git-rebase--interactive.sh:275
#, sh-format
-msgid "'$invalid' is not a valid commit"
+msgid "Invalid commit name: $sha1"
msgstr ""
-#: git-bisect.sh:430
+#: git-rebase--interactive.sh:317
+msgid "Cannot write current commit's replacement sha1"
+msgstr ""
+
+#: git-rebase--interactive.sh:369
#, sh-format
-msgid ""
-"Could not check out original HEAD '$branch'.\n"
-"Try 'git bisect reset <commit>'."
+msgid "Fast-forward to $sha1"
msgstr ""
-#: git-bisect.sh:458
-msgid "No logfile given"
+#: git-rebase--interactive.sh:371
+#, sh-format
+msgid "Cannot fast-forward to $sha1"
msgstr ""
-#: git-bisect.sh:459
+#: git-rebase--interactive.sh:380
#, sh-format
-msgid "cannot read $file for replaying"
+msgid "Cannot move HEAD to $first_parent"
msgstr ""
-#: git-bisect.sh:480
-msgid "?? what are you talking about?"
+#: git-rebase--interactive.sh:385
+#, sh-format
+msgid "Refusing to squash a merge: $sha1"
msgstr ""
-#: git-bisect.sh:492
+#: git-rebase--interactive.sh:399
#, sh-format
-msgid "running $command"
+msgid "Error redoing merge $sha1"
msgstr ""
-#: git-bisect.sh:499
+#: git-rebase--interactive.sh:407
#, sh-format
-msgid ""
-"bisect run failed:\n"
-"exit code $res from '$command' is < 0 or >= 128"
+msgid "Could not pick $sha1"
msgstr ""
-#: git-bisect.sh:525
-msgid "bisect run cannot continue any more"
+#: git-rebase--interactive.sh:416
+#, sh-format
+msgid "This is the commit message #${n}:"
msgstr ""
-#: git-bisect.sh:531
+#: git-rebase--interactive.sh:421
#, sh-format
-msgid ""
-"bisect run failed:\n"
-"'bisect_state $state' exited with error code $res"
+msgid "The commit message #${n} will be skipped:"
msgstr ""
-#: git-bisect.sh:538
-msgid "bisect run success"
+#: git-rebase--interactive.sh:432
+#, sh-format
+msgid "This is a combination of $count commit."
+msgid_plural "This is a combination of $count commits."
+msgstr[0] ""
+msgstr[1] ""
+
+#: git-rebase--interactive.sh:441
+#, sh-format
+msgid "Cannot write $fixup_msg"
msgstr ""
-#: git-bisect.sh:565
-msgid "please use two different terms"
+#: git-rebase--interactive.sh:444
+msgid "This is a combination of 2 commits."
msgstr ""
-#: git-bisect.sh:575
+#: git-rebase--interactive.sh:485 git-rebase--interactive.sh:528
+#: git-rebase--interactive.sh:531
#, sh-format
-msgid "'$term' is not a valid term"
+msgid "Could not apply $sha1... $rest"
msgstr ""
-#: git-bisect.sh:578
+#: git-rebase--interactive.sh:559
#, sh-format
-msgid "can't use the builtin command '$term' as a term"
+msgid ""
+"Could not amend commit after successfully picking $sha1... $rest\n"
+"This is most likely due to an empty commit message, or the pre-commit hook\n"
+"failed. If the pre-commit hook failed, you may need to resolve the issue "
+"before\n"
+"you are able to reword the commit."
msgstr ""
-#: git-bisect.sh:587 git-bisect.sh:593
+#: git-rebase--interactive.sh:574
#, sh-format
-msgid "can't change the meaning of term '$term'"
+msgid "Stopped at $sha1_abbrev... $rest"
msgstr ""
-#: git-bisect.sh:606
+#: git-rebase--interactive.sh:589
#, sh-format
-msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect."
+msgid "Cannot '$squash_style' without a previous commit"
msgstr ""
-#: git-bisect.sh:636
-msgid "no terms defined"
+#: git-rebase--interactive.sh:631
+#, sh-format
+msgid "Executing: $rest"
msgstr ""
-#: git-bisect.sh:653
+#: git-rebase--interactive.sh:639
#, sh-format
+msgid "Execution failed: $rest"
+msgstr ""
+
+#: git-rebase--interactive.sh:641
+msgid "and made changes to the index and/or the working tree"
+msgstr ""
+
+#: git-rebase--interactive.sh:643
msgid ""
-"invalid argument $arg for 'git bisect terms'.\n"
-"Supported options are: --term-good|--term-old and --term-bad|--term-new."
+"You can fix the problem, and then run\n"
+"\n"
+"\tgit rebase --continue"
msgstr ""
-#: git-merge-octopus.sh:46
+#. TRANSLATORS: after these lines is a command to be issued by the user
+#: git-rebase--interactive.sh:656
+#, sh-format
msgid ""
-"Error: Your local changes to the following files would be overwritten by "
-"merge"
+"Execution succeeded: $rest\n"
+"but left changes to the index and/or the working tree\n"
+"Commit or stash your changes, and then run\n"
+"\n"
+"\tgit rebase --continue"
msgstr ""
-#: git-merge-octopus.sh:61
-msgid "Automated merge did not work."
+#: git-rebase--interactive.sh:667
+#, sh-format
+msgid "Unknown command: $command $sha1 $rest"
msgstr ""
-#: git-merge-octopus.sh:62
-msgid "Should not be doing an Octopus."
+#: git-rebase--interactive.sh:668
+msgid "Please fix this using 'git rebase --edit-todo'."
msgstr ""
-#: git-merge-octopus.sh:73
+#: git-rebase--interactive.sh:703
#, sh-format
-msgid "Unable to find common commit with $pretty_name"
+msgid "Successfully rebased and updated $head_name."
msgstr ""
-#: git-merge-octopus.sh:77
-#, sh-format
-msgid "Already up-to-date with $pretty_name"
+#: git-rebase--interactive.sh:750
+msgid "Could not skip unnecessary pick commands"
msgstr ""
-#: git-merge-octopus.sh:89
+#: git-rebase--interactive.sh:908
#, sh-format
-msgid "Fast-forwarding to: $pretty_name"
+msgid ""
+"Warning: the SHA-1 is missing or isn't a commit in the following line:\n"
+" - $line"
msgstr ""
-#: git-merge-octopus.sh:97
+#: git-rebase--interactive.sh:941
#, sh-format
-msgid "Trying simple merge with $pretty_name"
+msgid ""
+"Warning: the command isn't recognized in the following line:\n"
+" - $line"
msgstr ""
-#: git-merge-octopus.sh:102
-msgid "Simple merge did not work, trying automatic merge."
+#: git-rebase--interactive.sh:980
+msgid "could not detach HEAD"
msgstr ""
-#: git-rebase.sh:56
+#: git-rebase--interactive.sh:1018
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:156 git-rebase.sh:395
-#, sh-format
-msgid "Could not move back to $head_name"
+"Warning: some commits may have been dropped accidentally.\n"
+"Dropped commits (newer to older):"
msgstr ""
-#: git-rebase.sh:167
-msgid "Applied autostash."
+#: git-rebase--interactive.sh:1026
+msgid ""
+"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
+"\n"
+"Use 'git config rebase.missingCommitsCheck' to change the level of "
+"warnings.\n"
+"The possible behaviours are: ignore, warn, error."
msgstr ""
-#: git-rebase.sh:170
+#: git-rebase--interactive.sh:1037
#, sh-format
-msgid "Cannot store $stash_sha1"
+msgid ""
+"Unrecognized setting $check_level for option rebase.missingCommitsCheck. "
+"Ignoring."
msgstr ""
-#: git-rebase.sh:171
+#: git-rebase--interactive.sh:1054
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"
+"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
+"continue'."
msgstr ""
-#: git-rebase.sh:210
-msgid "The pre-rebase hook refused to rebase."
+#: git-rebase--interactive.sh:1055
+msgid "Or you can abort the rebase with 'git rebase --abort'."
msgstr ""
-#: git-rebase.sh:215
-msgid "It looks like git-am is in progress. Cannot rebase."
+#: git-rebase--interactive.sh:1079
+msgid "Could not remove CHERRY_PICK_HEAD"
msgstr ""
-#: git-rebase.sh:356
-msgid "No rebase in progress?"
+#: git-rebase--interactive.sh:1084
+#, sh-format
+msgid ""
+"You have staged changes in your working tree.\n"
+"If these changes are meant to be\n"
+"squashed into the previous commit, run:\n"
+"\n"
+" git commit --amend $gpg_sign_opt_quoted\n"
+"\n"
+"If they are meant to go into a new commit, run:\n"
+"\n"
+" git commit $gpg_sign_opt_quoted\n"
+"\n"
+"In both cases, once you're done, continue with:\n"
+"\n"
+" git rebase --continue\n"
msgstr ""
-#: git-rebase.sh:367
-msgid "The --edit-todo action can only be used during interactive rebase."
+#: git-rebase--interactive.sh:1101
+msgid "Error trying to find the author identity to amend commit"
msgstr ""
-#: git-rebase.sh:374
-msgid "Cannot read HEAD"
+#: git-rebase--interactive.sh:1106
+msgid ""
+"You have uncommitted changes in your working tree. Please commit them\n"
+"first and then run 'git rebase --continue' again."
msgstr ""
-#: git-rebase.sh:377
-msgid ""
-"You must edit all merge conflicts and then\n"
-"mark them as resolved using git add"
+#: git-rebase--interactive.sh:1111 git-rebase--interactive.sh:1115
+msgid "Could not commit staged changes."
msgstr ""
-#: git-rebase.sh:414
-#, sh-format
+#: git-rebase--interactive.sh:1139
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."
+"\n"
+"You are editing the todo file of an ongoing interactive rebase.\n"
+"To continue rebase after editing, run:\n"
+" git rebase --continue\n"
+"\n"
msgstr ""
-#: git-rebase.sh:465
-#, sh-format
-msgid "invalid upstream $upstream_name"
+#: git-rebase--interactive.sh:1147 git-rebase--interactive.sh:1305
+msgid "Could not execute editor"
msgstr ""
-#: git-rebase.sh:489
+#: git-rebase--interactive.sh:1160
#, sh-format
-msgid "$onto_name: there are more than one merge bases"
+msgid "Could not checkout $switch_to"
msgstr ""
-#: git-rebase.sh:492 git-rebase.sh:496
-#, sh-format
-msgid "$onto_name: there is no merge base"
+#: git-rebase--interactive.sh:1165
+msgid "No HEAD?"
msgstr ""
-#: git-rebase.sh:501
+#: git-rebase--interactive.sh:1166
#, sh-format
-msgid "Does not point to a valid commit: $onto_name"
+msgid "Could not create temporary $state_dir"
msgstr ""
-#: git-rebase.sh:524
-#, sh-format
-msgid "fatal: no such branch: $branch_name"
+#: git-rebase--interactive.sh:1168
+msgid "Could not mark as interactive"
msgstr ""
-#: git-rebase.sh:557
-msgid "Cannot autostash"
+#: git-rebase--interactive.sh:1178 git-rebase--interactive.sh:1183
+msgid "Could not init rewritten commits"
msgstr ""
-#: git-rebase.sh:562
+#: git-rebase--interactive.sh:1283
#, sh-format
-msgid "Created autostash: $stash_abbrev"
+msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
+msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: git-rebase--interactive.sh:1288
+msgid ""
+"\n"
+"However, if you remove everything, the rebase will be aborted.\n"
+"\n"
msgstr ""
-#: git-rebase.sh:566
-msgid "Please commit or stash them."
+#: git-rebase--interactive.sh:1295
+msgid "Note that empty commits are commented out"
msgstr ""
-#: git-rebase.sh:586
+#: git-sh-setup.sh:89 git-sh-setup.sh:94
#, sh-format
-msgid "Current branch $branch_name is up to date."
+msgid "usage: $dashless $USAGE"
msgstr ""
-#: git-rebase.sh:590
+#: git-sh-setup.sh:190
#, sh-format
-msgid "Current branch $branch_name is up to date, rebase forced."
+msgid "Cannot chdir to $cdup, the toplevel of the working tree"
msgstr ""
-#: git-rebase.sh:601
+#: git-sh-setup.sh:199 git-sh-setup.sh:206
#, sh-format
-msgid "Changes from $mb to $onto:"
+msgid "fatal: $program_name cannot be used without a working tree."
msgstr ""
-#: git-rebase.sh:610
-msgid "First, rewinding head to replay your work on top of it..."
+#: git-sh-setup.sh:220
+msgid "Cannot rebase: You have unstaged changes."
msgstr ""
-#: git-rebase.sh:620
-#, sh-format
-msgid "Fast-forwarded $branch_name to $onto_name."
+#: git-sh-setup.sh:223
+msgid "Cannot rewrite branches: You have unstaged changes."
msgstr ""
-#: git-stash.sh:50
-msgid "git stash clear with parameters is unimplemented"
+#: git-sh-setup.sh:226
+msgid "Cannot pull with rebase: You have unstaged changes."
msgstr ""
-#: git-stash.sh:73
-msgid "You do not have the initial commit yet"
+#: git-sh-setup.sh:229
+#, sh-format
+msgid "Cannot $action: You have unstaged changes."
msgstr ""
-#: git-stash.sh:88
-msgid "Cannot save the current index state"
+#: git-sh-setup.sh:242
+msgid "Cannot rebase: Your index contains uncommitted changes."
msgstr ""
-#: git-stash.sh:123 git-stash.sh:136
-msgid "Cannot save the current worktree state"
+#: git-sh-setup.sh:245
+msgid "Cannot pull with rebase: Your index contains uncommitted changes."
msgstr ""
-#: git-stash.sh:140
-msgid "No changes selected"
+#: git-sh-setup.sh:248
+#, sh-format
+msgid "Cannot $action: Your index contains uncommitted changes."
msgstr ""
-#: git-stash.sh:143
-msgid "Cannot remove temporary index (can't happen)"
+#: git-sh-setup.sh:252
+msgid "Additionally, your index contains uncommitted changes."
msgstr ""
-#: git-stash.sh:156
-msgid "Cannot record working tree state"
+#: git-sh-setup.sh:372
+msgid "You need to run this command from the toplevel of the working tree."
msgstr ""
-#: git-stash.sh:188
-#, sh-format
-msgid "Cannot update $ref_stash with $w_commit"
+#: git-sh-setup.sh:377
+msgid "Unable to determine absolute path of git directory"
msgstr ""
-#. TRANSLATORS: $option is an invalid option, like
-#. `--blah-blah'. The 7 spaces at the beginning of the
-#. second line correspond to "error: ". So you should line
-#. up the second line with however many characters the
-#. translation of "error: " takes in your language. E.g. in
-#. English this is:
-#.
-#. $ git stash save --blah-blah 2>&1 | head -n 2
-#. error: unknown option for 'stash save': --blah-blah
-#. To provide a message, use git stash save -- '--blah-blah'
-#: git-stash.sh:238
-#, sh-format
-msgid ""
-"error: unknown option for 'stash save': $option\n"
-" To provide a message, use git stash save -- '$option'"
+#. TRANSLATORS: you can adjust this to align "git add -i" status menu
+#: git-add--interactive.perl:238
+#, perl-format
+msgid "%12s %12s %s"
msgstr ""
-#: git-stash.sh:259
-msgid "No local changes to save"
+#: git-add--interactive.perl:239
+msgid "staged"
msgstr ""
-#: git-stash.sh:263
-msgid "Cannot initialize stash"
+#: git-add--interactive.perl:239
+msgid "unstaged"
msgstr ""
-#: git-stash.sh:267
-msgid "Cannot save the current status"
+#: git-add--interactive.perl:297 git-add--interactive.perl:322
+msgid "binary"
msgstr ""
-#: git-stash.sh:268
-#, sh-format
-msgid "Saved working directory and index state $stash_msg"
+#: git-add--interactive.perl:306 git-add--interactive.perl:360
+msgid "nothing"
msgstr ""
-#: git-stash.sh:285
-msgid "Cannot remove worktree changes"
+#: git-add--interactive.perl:342 git-add--interactive.perl:357
+msgid "unchanged"
msgstr ""
-#: git-stash.sh:404
-#, sh-format
-msgid "unknown option: $opt"
-msgstr ""
+#: git-add--interactive.perl:653
+#, perl-format
+msgid "added %d path\n"
+msgid_plural "added %d paths\n"
+msgstr[0] ""
+msgstr[1] ""
-#: git-stash.sh:414
-msgid "No stash found."
-msgstr ""
+#: git-add--interactive.perl:656
+#, perl-format
+msgid "updated %d path\n"
+msgid_plural "updated %d paths\n"
+msgstr[0] ""
+msgstr[1] ""
-#: git-stash.sh:421
-#, sh-format
-msgid "Too many revisions specified: $REV"
-msgstr ""
+#: git-add--interactive.perl:659
+#, perl-format
+msgid "reverted %d path\n"
+msgid_plural "reverted %d paths\n"
+msgstr[0] ""
+msgstr[1] ""
-#: git-stash.sh:427
-#, sh-format
-msgid "$reference is not a valid reference"
-msgstr ""
+#: git-add--interactive.perl:662
+#, perl-format
+msgid "touched %d path\n"
+msgid_plural "touched %d paths\n"
+msgstr[0] ""
+msgstr[1] ""
-#: git-stash.sh:455
-#, sh-format
-msgid "'$args' is not a stash-like commit"
+#: git-add--interactive.perl:671
+msgid "Update"
msgstr ""
-#: git-stash.sh:466
-#, sh-format
-msgid "'$args' is not a stash reference"
+#: git-add--interactive.perl:683
+msgid "Revert"
msgstr ""
-#: git-stash.sh:474
-msgid "unable to refresh index"
+#: git-add--interactive.perl:706
+#, perl-format
+msgid "note: %s is untracked now.\n"
msgstr ""
-#: git-stash.sh:478
-msgid "Cannot apply a stash in the middle of a merge"
+#: git-add--interactive.perl:717
+msgid "Add untracked"
msgstr ""
-#: git-stash.sh:486
-msgid "Conflicts in index. Try without --index."
+#: git-add--interactive.perl:723
+msgid "No untracked files.\n"
msgstr ""
-#: git-stash.sh:488
-msgid "Could not save index tree"
+#: git-add--interactive.perl:1039
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be\n"
+"marked for staging."
msgstr ""
-#: git-stash.sh:522
-msgid "Cannot unstage modified files"
+#: git-add--interactive.perl:1042
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be\n"
+"marked for stashing."
msgstr ""
-#: git-stash.sh:537
-msgid "Index was not unstashed."
+#: git-add--interactive.perl:1045
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be\n"
+"marked for unstaging."
msgstr ""
-#: git-stash.sh:551
-msgid "The stash is kept in case you need it again."
+#: git-add--interactive.perl:1048 git-add--interactive.perl:1057
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be\n"
+"marked for applying."
msgstr ""
-#: git-stash.sh:560
-#, sh-format
-msgid "Dropped ${REV} ($s)"
+#: git-add--interactive.perl:1051
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be\n"
+"marked for discarding"
msgstr ""
-#: git-stash.sh:561
-#, sh-format
-msgid "${REV}: Could not drop stash entry"
+#: git-add--interactive.perl:1054
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be\n"
+"marked for discarding."
msgstr ""
-#: git-stash.sh:569
-msgid "No branch name specified"
+#: git-add--interactive.perl:1067
+#, perl-format
+msgid "failed to open hunk edit file for writing: %s"
msgstr ""
-#: git-stash.sh:641
-msgid "(To restore them type \"git stash apply\")"
+#: git-add--interactive.perl:1068
+msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
msgstr ""
-#: git-submodule.sh:183
-msgid "Relative path can only be used from the toplevel of the working tree"
+#: git-add--interactive.perl:1074
+#, perl-format
+msgid ""
+"---\n"
+"To remove '%s' lines, make them ' ' lines (context).\n"
+"To remove '%s' lines, delete them.\n"
+"Lines starting with %s will be removed.\n"
msgstr ""
-#: git-submodule.sh:193
-#, sh-format
-msgid "repo URL: '$repo' must be absolute or begin with ./|../"
+#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
+#: git-add--interactive.perl:1082
+msgid ""
+"If it does not apply cleanly, you will be given an opportunity to\n"
+"edit again. If all lines of the hunk are removed, then the edit is\n"
+"aborted and the hunk is left unchanged.\n"
msgstr ""
-#: git-submodule.sh:210
-#, sh-format
-msgid "'$sm_path' already exists in the index"
+#: git-add--interactive.perl:1096
+#, perl-format
+msgid "failed to open hunk edit file for reading: %s"
msgstr ""
-#: git-submodule.sh:214
-#, sh-format
+#. TRANSLATORS: do not translate [y/n]
+#. The program will only accept that input
+#. at this point.
+#. Consider translating (saying "no" discards!) as
+#. (saying "n" for "no" discards!) if the translation
+#. of the word "no" does not start with n.
+#: git-add--interactive.perl:1187
msgid ""
-"The following path is ignored by one of your .gitignore files:\n"
-"$sm_path\n"
-"Use -f if you really want to add it."
+"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
msgstr ""
-#: git-submodule.sh:232
-#, sh-format
-msgid "Adding existing repo at '$sm_path' to the index"
+#: git-add--interactive.perl:1196
+msgid ""
+"y - stage this hunk\n"
+"n - do not stage this hunk\n"
+"q - quit; do not stage this hunk or any of the remaining ones\n"
+"a - stage this hunk and all later hunks in the file\n"
+"d - do not stage this hunk or any of the later hunks in the file"
msgstr ""
-#: git-submodule.sh:234
-#, sh-format
-msgid "'$sm_path' already exists and is not a valid git repo"
+#: git-add--interactive.perl:1202
+msgid ""
+"y - stash this hunk\n"
+"n - do not stash this hunk\n"
+"q - quit; do not stash this hunk or any of the remaining ones\n"
+"a - stash this hunk and all later hunks in the file\n"
+"d - do not stash this hunk or any of the later hunks in the file"
msgstr ""
-#: git-submodule.sh:242
-#, sh-format
-msgid "A git directory for '$sm_name' is found locally with remote(s):"
+#: git-add--interactive.perl:1208
+msgid ""
+"y - unstage this hunk\n"
+"n - do not unstage this hunk\n"
+"q - quit; do not unstage this hunk or any of the remaining ones\n"
+"a - unstage this hunk and all later hunks in the file\n"
+"d - do not unstage this hunk or any of the later hunks in the file"
msgstr ""
-#: git-submodule.sh:244
-#, sh-format
+#: git-add--interactive.perl:1214
msgid ""
-"If you want to reuse this local git directory instead of cloning again from\n"
-" $realrepo\n"
-"use the '--force' option. If the local git directory is not the correct "
-"repo\n"
-"or you are unsure what this means choose another name with the '--name' "
-"option."
+"y - apply this hunk to index\n"
+"n - do not apply this hunk to index\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file"
msgstr ""
-#: git-submodule.sh:250
-#, sh-format
-msgid "Reactivating local git directory for submodule '$sm_name'."
+#: git-add--interactive.perl:1220
+msgid ""
+"y - discard this hunk from worktree\n"
+"n - do not discard this hunk from worktree\n"
+"q - quit; do not discard this hunk or any of the remaining ones\n"
+"a - discard this hunk and all later hunks in the file\n"
+"d - do not discard this hunk or any of the later hunks in the file"
msgstr ""
-#: git-submodule.sh:262
-#, sh-format
-msgid "Unable to checkout submodule '$sm_path'"
+#: git-add--interactive.perl:1226
+msgid ""
+"y - discard this hunk from index and worktree\n"
+"n - do not discard this hunk from index and worktree\n"
+"q - quit; do not discard this hunk or any of the remaining ones\n"
+"a - discard this hunk and all later hunks in the file\n"
+"d - do not discard this hunk or any of the later hunks in the file"
msgstr ""
-#: git-submodule.sh:267
-#, sh-format
-msgid "Failed to add submodule '$sm_path'"
+#: git-add--interactive.perl:1232
+msgid ""
+"y - apply this hunk to index and worktree\n"
+"n - do not apply this hunk to index and worktree\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file"
msgstr ""
-#: git-submodule.sh:276
-#, sh-format
-msgid "Failed to register submodule '$sm_path'"
+#: git-add--interactive.perl:1241
+msgid ""
+"g - select a hunk to go to\n"
+"/ - search for a hunk matching the given regex\n"
+"j - leave this hunk undecided, see next undecided hunk\n"
+"J - leave this hunk undecided, see next hunk\n"
+"k - leave this hunk undecided, see previous undecided hunk\n"
+"K - leave this hunk undecided, see previous hunk\n"
+"s - split the current hunk into smaller hunks\n"
+"e - manually edit the current hunk\n"
+"? - print help\n"
msgstr ""
-#: git-submodule.sh:323
-#, sh-format
-msgid "Entering '$displaypath'"
+#: git-add--interactive.perl:1272
+msgid "The selected hunks do not apply to the index!\n"
msgstr ""
-#: git-submodule.sh:343
-#, sh-format
-msgid "Stopping at '$displaypath'; script returned non-zero status."
+#: git-add--interactive.perl:1273
+msgid "Apply them to the worktree anyway? "
msgstr ""
-#: git-submodule.sh:414
-#, sh-format
-msgid "pathspec and --all are incompatible"
+#: git-add--interactive.perl:1276
+msgid "Nothing was applied.\n"
msgstr ""
-#: git-submodule.sh:419
-#, sh-format
-msgid "Use '--all' if you really want to deinitialize all submodules"
+#: git-add--interactive.perl:1287
+#, perl-format
+msgid "ignoring unmerged: %s\n"
msgstr ""
-#: git-submodule.sh:439
-#, sh-format
-msgid ""
-"Submodule work tree '$displaypath' contains a .git directory\n"
-"(use 'rm -rf' if you really want to remove it including all of its history)"
+#: git-add--interactive.perl:1296
+msgid "Only binary files changed.\n"
msgstr ""
-#: git-submodule.sh:447
-#, sh-format
-msgid ""
-"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
-"discard them"
+#: git-add--interactive.perl:1298
+msgid "No changes.\n"
msgstr ""
-#: git-submodule.sh:450
-#, sh-format
-msgid "Cleared directory '$displaypath'"
+#: git-add--interactive.perl:1306
+msgid "Patch update"
msgstr ""
-#: git-submodule.sh:451
-#, sh-format
-msgid "Could not remove submodule work tree '$displaypath'"
+#: git-add--interactive.perl:1358
+#, perl-format
+msgid "Stage mode change [y,n,q,a,d,/%s,?]? "
msgstr ""
-#: git-submodule.sh:454
-#, sh-format
-msgid "Could not create empty submodule directory '$displaypath'"
+#: git-add--interactive.perl:1359
+#, perl-format
+msgid "Stage deletion [y,n,q,a,d,/%s,?]? "
msgstr ""
-#: git-submodule.sh:463
-#, sh-format
-msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
+#: git-add--interactive.perl:1360
+#, perl-format
+msgid "Stage this hunk [y,n,q,a,d,/%s,?]? "
msgstr ""
-#: git-submodule.sh:612
-#, sh-format
-msgid "Unable to find current revision in submodule path '$displaypath'"
+#: git-add--interactive.perl:1363
+#, perl-format
+msgid "Stash mode change [y,n,q,a,d,/%s,?]? "
msgstr ""
-
-#: git-submodule.sh:622
-#, sh-format
-msgid "Unable to fetch in submodule path '$sm_path'"
+
+#: git-add--interactive.perl:1364
+#, perl-format
+msgid "Stash deletion [y,n,q,a,d,/%s,?]? "
msgstr ""
-#: git-submodule.sh:627
-#, sh-format
-msgid ""
-"Unable to find current ${remote_name}/${branch} revision in submodule path "
-"'$sm_path'"
+#: git-add--interactive.perl:1365
+#, perl-format
+msgid "Stash this hunk [y,n,q,a,d,/%s,?]? "
msgstr ""
-#: git-submodule.sh:645
-#, sh-format
-msgid "Unable to fetch in submodule path '$displaypath'"
+#: git-add--interactive.perl:1368
+#, perl-format
+msgid "Unstage mode change [y,n,q,a,d,/%s,?]? "
msgstr ""
-#: git-submodule.sh:651
-#, sh-format
-msgid ""
-"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
-"Direct fetching of that commit failed."
+#: git-add--interactive.perl:1369
+#, perl-format
+msgid "Unstage deletion [y,n,q,a,d,/%s,?]? "
msgstr ""
-#: git-submodule.sh:658
-#, sh-format
-msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
+#: git-add--interactive.perl:1370
+#, perl-format
+msgid "Unstage this hunk [y,n,q,a,d,/%s,?]? "
msgstr ""
-#: git-submodule.sh:659
-#, sh-format
-msgid "Submodule path '$displaypath': checked out '$sha1'"
+#: git-add--interactive.perl:1373
+#, perl-format
+msgid "Apply mode change to index [y,n,q,a,d,/%s,?]? "
msgstr ""
-#: git-submodule.sh:663
-#, sh-format
-msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
+#: git-add--interactive.perl:1374
+#, perl-format
+msgid "Apply deletion to index [y,n,q,a,d,/%s,?]? "
msgstr ""
-#: git-submodule.sh:664
-#, sh-format
-msgid "Submodule path '$displaypath': rebased into '$sha1'"
+#: git-add--interactive.perl:1375
+#, perl-format
+msgid "Apply this hunk to index [y,n,q,a,d,/%s,?]? "
msgstr ""
-#: git-submodule.sh:669
-#, sh-format
-msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
+#: git-add--interactive.perl:1378
+#, perl-format
+msgid "Discard mode change from worktree [y,n,q,a,d,/%s,?]? "
msgstr ""
-#: git-submodule.sh:670
-#, sh-format
-msgid "Submodule path '$displaypath': merged in '$sha1'"
+#: git-add--interactive.perl:1379
+#, perl-format
+msgid "Discard deletion from worktree [y,n,q,a,d,/%s,?]? "
msgstr ""
-#: git-submodule.sh:675
-#, sh-format
-msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
+#: git-add--interactive.perl:1380
+#, perl-format
+msgid "Discard this hunk from worktree [y,n,q,a,d,/%s,?]? "
msgstr ""
-#: git-submodule.sh:676
-#, sh-format
-msgid "Submodule path '$displaypath': '$command $sha1'"
+#: git-add--interactive.perl:1383
+#, perl-format
+msgid "Discard mode change from index and worktree [y,n,q,a,d,/%s,?]? "
msgstr ""
-#: git-submodule.sh:707
-#, sh-format
-msgid "Failed to recurse into submodule path '$displaypath'"
+#: git-add--interactive.perl:1384
+#, perl-format
+msgid "Discard deletion from index and worktree [y,n,q,a,d,/%s,?]? "
msgstr ""
-#: git-submodule.sh:815
-msgid "The --cached option cannot be used with the --files option"
+#: git-add--interactive.perl:1385
+#, perl-format
+msgid "Discard this hunk from index and worktree [y,n,q,a,d,/%s,?]? "
msgstr ""
-#: git-submodule.sh:867
-#, sh-format
-msgid "unexpected mode $mod_dst"
+#: git-add--interactive.perl:1388
+#, perl-format
+msgid "Apply mode change to index and worktree [y,n,q,a,d,/%s,?]? "
msgstr ""
-#: git-submodule.sh:887
-#, sh-format
-msgid " Warn: $display_name doesn't contain commit $sha1_src"
+#: git-add--interactive.perl:1389
+#, perl-format
+msgid "Apply deletion to index and worktree [y,n,q,a,d,/%s,?]? "
msgstr ""
-#: git-submodule.sh:890
-#, sh-format
-msgid " Warn: $display_name doesn't contain commit $sha1_dst"
+#: git-add--interactive.perl:1390
+#, perl-format
+msgid "Apply this hunk to index and worktree [y,n,q,a,d,/%s,?]? "
msgstr ""
-#: git-submodule.sh:893
-#, sh-format
-msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
+#: git-add--interactive.perl:1493
+msgid "go to which hunk (<ret> to see more)? "
msgstr ""
-#: git-submodule.sh:918
-msgid "blob"
+#: git-add--interactive.perl:1495
+msgid "go to which hunk? "
msgstr ""
-#: git-submodule.sh:1040
-#, sh-format
-msgid "Failed to recurse into submodule path '$sm_path'"
+#: git-add--interactive.perl:1504
+#, perl-format
+msgid "Invalid number: '%s'\n"
msgstr ""
-#: git-submodule.sh:1107
-#, sh-format
-msgid "Synchronizing submodule url for '$displaypath'"
+#: git-add--interactive.perl:1509
+#, perl-format
+msgid "Sorry, only %d hunk available.\n"
+msgid_plural "Sorry, only %d hunks available.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: git-add--interactive.perl:1535
+msgid "search for regex? "
msgstr ""
-#: git-parse-remote.sh:89
-#, sh-format
-msgid "See git-${cmd}(1) for details."
+#: git-add--interactive.perl:1548
+#, perl-format
+msgid "Malformed search regexp %s: %s\n"
msgstr ""
-#: git-rebase--interactive.sh:131
-#, sh-format
-msgid "Rebasing ($new_count/$total)"
+#: git-add--interactive.perl:1558
+msgid "No hunk matches the given pattern\n"
msgstr ""
-#: git-rebase--interactive.sh:147
-msgid ""
-"\n"
-"Commands:\n"
-" p, pick = use commit\n"
-" r, reword = use commit, but edit the commit message\n"
-" e, edit = use commit, but stop for amending\n"
-" s, squash = use commit, but meld into previous commit\n"
-" f, fixup = like \"squash\", but discard this commit's log message\n"
-" x, exec = run command (the rest of the line) using shell\n"
-" d, drop = remove commit\n"
-"\n"
-"These lines can be re-ordered; they are executed from top to bottom.\n"
+#: git-add--interactive.perl:1570 git-add--interactive.perl:1592
+msgid "No previous hunk\n"
msgstr ""
-#: git-rebase--interactive.sh:162
-msgid ""
-"\n"
-"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
+#: git-add--interactive.perl:1579 git-add--interactive.perl:1598
+msgid "No next hunk\n"
msgstr ""
-#: git-rebase--interactive.sh:166
-msgid ""
-"\n"
-"If you remove a line here THAT COMMIT WILL BE LOST.\n"
+#: git-add--interactive.perl:1606
+#, perl-format
+msgid "Split into %d hunk.\n"
+msgid_plural "Split into %d hunks.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: git-add--interactive.perl:1658
+msgid "Review diff"
msgstr ""
-#: git-rebase--interactive.sh:202
-#, sh-format
+#. TRANSLATORS: please do not translate the command names
+#. 'status', 'update', 'revert', etc.
+#: git-add--interactive.perl:1677
msgid ""
-"You can amend the commit now, with\n"
-"\n"
-"\tgit commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"Once you are satisfied with your changes, run\n"
-"\n"
-"\tgit rebase --continue"
+"status - show paths with changes\n"
+"update - add working tree state to the staged set of changes\n"
+"revert - revert staged set of changes back to the HEAD version\n"
+"patch - pick hunks and update selectively\n"
+"diff\t - view diff between HEAD and index\n"
+"add untracked - add contents of untracked files to the staged set of "
+"changes\n"
msgstr ""
-#: git-rebase--interactive.sh:227
-#, sh-format
-msgid "$sha1: not a commit that can be picked"
+#: git-add--interactive.perl:1694 git-add--interactive.perl:1699
+#: git-add--interactive.perl:1702 git-add--interactive.perl:1709
+#: git-add--interactive.perl:1713 git-add--interactive.perl:1719
+msgid "missing --"
msgstr ""
-#: git-rebase--interactive.sh:266
-#, sh-format
-msgid "Invalid commit name: $sha1"
+#: git-add--interactive.perl:1715
+#, perl-format
+msgid "unknown --patch mode: %s"
msgstr ""
-#: git-rebase--interactive.sh:308
-msgid "Cannot write current commit's replacement sha1"
+#: git-add--interactive.perl:1721 git-add--interactive.perl:1727
+#, perl-format
+msgid "invalid argument %s, expecting --"
msgstr ""
-#: git-rebase--interactive.sh:360
-#, sh-format
-msgid "Fast-forward to $sha1"
+#: git-send-email.perl:121
+msgid "local zone differs from GMT by a non-minute interval\n"
msgstr ""
-#: git-rebase--interactive.sh:362
-#, sh-format
-msgid "Cannot fast-forward to $sha1"
+#: git-send-email.perl:128 git-send-email.perl:134
+msgid "local time offset greater than or equal to 24 hours\n"
msgstr ""
-#: git-rebase--interactive.sh:371
-#, sh-format
-msgid "Cannot move HEAD to $first_parent"
+#: git-send-email.perl:202 git-send-email.perl:208
+msgid "the editor exited uncleanly, aborting everything"
msgstr ""
-#: git-rebase--interactive.sh:376
-#, sh-format
-msgid "Refusing to squash a merge: $sha1"
+#: git-send-email.perl:282
+#, perl-format
+msgid ""
+"'%s' contains an intermediate version of the email you were composing.\n"
msgstr ""
-#: git-rebase--interactive.sh:390
-#, sh-format
-msgid "Error redoing merge $sha1"
+#: git-send-email.perl:287
+#, perl-format
+msgid "'%s.final' contains the composed email.\n"
msgstr ""
-#: git-rebase--interactive.sh:398
-#, sh-format
-msgid "Could not pick $sha1"
+#: git-send-email.perl:305
+msgid "--dump-aliases incompatible with other options\n"
msgstr ""
-#: git-rebase--interactive.sh:407
-#, sh-format
-msgid "This is the commit message #${n}:"
+#: git-send-email.perl:368 git-send-email.perl:623
+msgid "Cannot run git format-patch from outside a repository\n"
msgstr ""
-#: git-rebase--interactive.sh:412
-#, sh-format
-msgid "The commit message #${n} will be skipped:"
+#: git-send-email.perl:437
+#, perl-format
+msgid "Unknown --suppress-cc field: '%s'\n"
msgstr ""
-#: git-rebase--interactive.sh:423
-#, sh-format
-msgid "This is a combination of $count commit."
-msgid_plural "This is a combination of $count commits."
-msgstr[0] ""
-msgstr[1] ""
+#: git-send-email.perl:466
+#, perl-format
+msgid "Unknown --confirm setting: '%s'\n"
+msgstr ""
-#: git-rebase--interactive.sh:431
-#, sh-format
-msgid "Cannot write $fixup_msg"
+#: git-send-email.perl:498
+#, perl-format
+msgid "warning: sendmail alias with quotes is not supported: %s\n"
msgstr ""
-#: git-rebase--interactive.sh:434
-msgid "This is a combination of 2 commits."
+#: git-send-email.perl:500
+#, perl-format
+msgid "warning: `:include:` not supported: %s\n"
msgstr ""
-#: git-rebase--interactive.sh:435
-msgid "This is the 1st commit message:"
+#: git-send-email.perl:502
+#, perl-format
+msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
msgstr ""
-#: git-rebase--interactive.sh:475 git-rebase--interactive.sh:518
-#: git-rebase--interactive.sh:521
-#, sh-format
-msgid "Could not apply $sha1... $rest"
+#: git-send-email.perl:507
+#, perl-format
+msgid "warning: sendmail line is not recognized: %s\n"
msgstr ""
-#: git-rebase--interactive.sh:549
-#, sh-format
+#: git-send-email.perl:589
+#, perl-format
msgid ""
-"Could not amend commit after successfully picking $sha1... $rest\n"
-"This is most likely due to an empty commit message, or the pre-commit hook\n"
-"failed. If the pre-commit hook failed, you may need to resolve the issue "
-"before\n"
-"you are able to reword the commit."
+"File '%s' exists but it could also be the range of commits\n"
+"to produce patches for. Please disambiguate by...\n"
+"\n"
+" * Saying \"./%s\" if you mean a file; or\n"
+" * Giving --format-patch option if you mean a range.\n"
msgstr ""
-#: git-rebase--interactive.sh:564
-#, sh-format
-msgid "Stopped at $sha1_abbrev... $rest"
+#: git-send-email.perl:610
+#, perl-format
+msgid "Failed to opendir %s: %s"
msgstr ""
-#: git-rebase--interactive.sh:579
-#, sh-format
-msgid "Cannot '$squash_style' without a previous commit"
+#: git-send-email.perl:634
+#, perl-format
+msgid ""
+"fatal: %s: %s\n"
+"warning: no patches were sent\n"
msgstr ""
-#: git-rebase--interactive.sh:621
-#, sh-format
-msgid "Executing: $rest"
+#: git-send-email.perl:645
+msgid ""
+"\n"
+"No patch files specified!\n"
+"\n"
msgstr ""
-#: git-rebase--interactive.sh:629
-#, sh-format
-msgid "Execution failed: $rest"
+#: git-send-email.perl:658
+#, perl-format
+msgid "No subject line in %s?"
msgstr ""
-#: git-rebase--interactive.sh:631
-msgid "and made changes to the index and/or the working tree"
+#: git-send-email.perl:668
+#, perl-format
+msgid "Failed to open for writing %s: %s"
msgstr ""
-#: git-rebase--interactive.sh:633
+#: git-send-email.perl:678
msgid ""
-"You can fix the problem, and then run\n"
+"Lines beginning in \"GIT:\" will be removed.\n"
+"Consider including an overall diffstat or table of contents\n"
+"for the patch you are writing.\n"
"\n"
-"\tgit rebase --continue"
+"Clear the body content if you don't wish to send a summary.\n"
msgstr ""
-#. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--interactive.sh:646
-#, sh-format
-msgid ""
-"Execution succeeded: $rest\n"
-"but left changes to the index and/or the working tree\n"
-"Commit or stash your changes, and then run\n"
-"\n"
-"\tgit rebase --continue"
+#: git-send-email.perl:701
+#, perl-format
+msgid "Failed to open %s.final: %s"
msgstr ""
-#: git-rebase--interactive.sh:657
-#, sh-format
-msgid "Unknown command: $command $sha1 $rest"
+#: git-send-email.perl:704
+#, perl-format
+msgid "Failed to open %s: %s"
msgstr ""
-#: git-rebase--interactive.sh:658
-msgid "Please fix this using 'git rebase --edit-todo'."
+#: git-send-email.perl:739
+msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n"
msgstr ""
-#: git-rebase--interactive.sh:693
-#, sh-format
-msgid "Successfully rebased and updated $head_name."
+#: git-send-email.perl:748
+msgid "Summary email is empty, skipping it\n"
msgstr ""
-#: git-rebase--interactive.sh:740
-msgid "Could not skip unnecessary pick commands"
+#. TRANSLATORS: please keep [y/N] as is.
+#: git-send-email.perl:780
+#, perl-format
+msgid "Are you sure you want to use <%s> [y/N]? "
msgstr ""
-#: git-rebase--interactive.sh:898
-#, sh-format
+#: git-send-email.perl:809
msgid ""
-"Warning: the SHA-1 is missing or isn't a commit in the following line:\n"
-" - $line"
+"The following files are 8bit, but do not declare a Content-Transfer-"
+"Encoding.\n"
msgstr ""
-#: git-rebase--interactive.sh:931
-#, sh-format
-msgid ""
-"Warning: the command isn't recognized in the following line:\n"
-" - $line"
+#: git-send-email.perl:814
+msgid "Which 8bit encoding should I declare [UTF-8]? "
msgstr ""
-#: git-rebase--interactive.sh:970
-msgid "could not detach HEAD"
+#: git-send-email.perl:822
+#, perl-format
+msgid ""
+"Refusing to send because the patch\n"
+"\t%s\n"
+"has the template subject '*** SUBJECT HERE ***'. Pass --force if you really "
+"want to send.\n"
msgstr ""
-#: git-rebase--interactive.sh:1008
-msgid ""
-"Warning: some commits may have been dropped accidentally.\n"
-"Dropped commits (newer to older):"
+#: git-send-email.perl:841
+msgid "To whom should the emails be sent (if anyone)?"
msgstr ""
-#: git-rebase--interactive.sh:1016
-msgid ""
-"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
-"\n"
-"Use 'git config rebase.missingCommitsCheck' to change the level of "
-"warnings.\n"
-"The possible behaviours are: ignore, warn, error."
+#: git-send-email.perl:859
+#, perl-format
+msgid "fatal: alias '%s' expands to itself\n"
msgstr ""
-#: git-rebase--interactive.sh:1027
-#, sh-format
-msgid ""
-"Unrecognized setting $check_level for option rebase.missingCommitsCheck. "
-"Ignoring."
+#: git-send-email.perl:871
+msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
msgstr ""
-#: git-rebase--interactive.sh:1044
-msgid "You can fix this with 'git rebase --edit-todo'."
+#: git-send-email.perl:921 git-send-email.perl:929
+#, perl-format
+msgid "error: unable to extract a valid address from: %s\n"
msgstr ""
-#: git-rebase--interactive.sh:1045
-msgid "Or you can abort the rebase with 'git rebase --abort'."
+#. TRANSLATORS: Make sure to include [q] [d] [e] in your
+#. translation. The program will only accept English input
+#. at this point.
+#: git-send-email.perl:933
+msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
msgstr ""
-#: git-rebase--interactive.sh:1069
-msgid "Could not remove CHERRY_PICK_HEAD"
+#: git-send-email.perl:1234
+#, perl-format
+msgid "CA path \"%s\" does not exist"
msgstr ""
-#: git-rebase--interactive.sh:1074
-#, sh-format
+#: git-send-email.perl:1309
msgid ""
-"You have staged changes in your working tree.\n"
-"If these changes are meant to be\n"
-"squashed into the previous commit, run:\n"
-"\n"
-" git commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"If they are meant to go into a new commit, run:\n"
-"\n"
-" git commit $gpg_sign_opt_quoted\n"
+" The Cc list above has been expanded by additional\n"
+" addresses found in the patch commit message. By default\n"
+" send-email prompts before sending whenever this occurs.\n"
+" This behavior is controlled by the sendemail.confirm\n"
+" configuration setting.\n"
"\n"
-"In both case, once you're done, continue with:\n"
+" For additional information, run 'git send-email --help'.\n"
+" To retain the current behavior, but squelch this message,\n"
+" run 'git config --global sendemail.confirm auto'.\n"
"\n"
-" git rebase --continue\n"
msgstr ""
-#: git-rebase--interactive.sh:1091
-msgid "Error trying to find the author identity to amend commit"
+#. TRANSLATORS: Make sure to include [y] [n] [q] [a] in your
+#. translation. The program will only accept English input
+#. at this point.
+#: git-send-email.perl:1324
+msgid "Send this email? ([y]es|[n]o|[q]uit|[a]ll): "
msgstr ""
-#: git-rebase--interactive.sh:1096
-msgid ""
-"You have uncommitted changes in your working tree. Please commit them\n"
-"first and then run 'git rebase --continue' again."
+#: git-send-email.perl:1327
+msgid "Send this email reply required"
msgstr ""
-#: git-rebase--interactive.sh:1101 git-rebase--interactive.sh:1105
-msgid "Could not commit staged changes."
+#: git-send-email.perl:1353
+msgid "The required SMTP server is not properly defined."
msgstr ""
-#: git-rebase--interactive.sh:1129
-msgid ""
-"\n"
-"You are editing the todo file of an ongoing interactive rebase.\n"
-"To continue rebase after editing, run:\n"
-" git rebase --continue\n"
-"\n"
+#: git-send-email.perl:1397
+#, perl-format
+msgid "Server does not support STARTTLS! %s"
msgstr ""
-#: git-rebase--interactive.sh:1137 git-rebase--interactive.sh:1298
-msgid "Could not execute editor"
+#: git-send-email.perl:1403
+msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
msgstr ""
-#: git-rebase--interactive.sh:1145
-msgid "You need to set your committer info first"
+#: git-send-email.perl:1421
+#, perl-format
+msgid "Failed to send %s\n"
msgstr ""
-#: git-rebase--interactive.sh:1153
-#, sh-format
-msgid "Could not checkout $switch_to"
+#: git-send-email.perl:1424
+#, perl-format
+msgid "Dry-Sent %s\n"
msgstr ""
-#: git-rebase--interactive.sh:1158
-msgid "No HEAD?"
+#: git-send-email.perl:1424
+#, perl-format
+msgid "Sent %s\n"
msgstr ""
-#: git-rebase--interactive.sh:1159
-#, sh-format
-msgid "Could not create temporary $state_dir"
+#: git-send-email.perl:1426
+msgid "Dry-OK. Log says:\n"
msgstr ""
-#: git-rebase--interactive.sh:1161
-msgid "Could not mark as interactive"
+#: git-send-email.perl:1426
+msgid "OK. Log says:\n"
msgstr ""
-#: git-rebase--interactive.sh:1171 git-rebase--interactive.sh:1176
-msgid "Could not init rewritten commits"
+#: git-send-email.perl:1438
+msgid "Result: "
msgstr ""
-#: git-rebase--interactive.sh:1276
-#, sh-format
-msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
-msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
-msgstr[0] ""
-msgstr[1] ""
+#: git-send-email.perl:1441
+msgid "Result: OK\n"
+msgstr ""
-#: git-rebase--interactive.sh:1281
-msgid ""
-"\n"
-"However, if you remove everything, the rebase will be aborted.\n"
-"\n"
+#: git-send-email.perl:1454
+#, perl-format
+msgid "can't open file %s"
msgstr ""
-#: git-rebase--interactive.sh:1288
-msgid "Note that empty commits are commented out"
+#: git-send-email.perl:1501 git-send-email.perl:1521
+#, perl-format
+msgid "(mbox) Adding cc: %s from line '%s'\n"
msgstr ""
-#: git-sh-setup.sh:89 git-sh-setup.sh:94
-#, sh-format
-msgid "usage: $dashless $USAGE"
+#: git-send-email.perl:1507
+#, perl-format
+msgid "(mbox) Adding to: %s from line '%s'\n"
msgstr ""
-#: git-sh-setup.sh:190
-#, sh-format
-msgid "Cannot chdir to $cdup, the toplevel of the working tree"
+#: git-send-email.perl:1555
+#, perl-format
+msgid "(non-mbox) Adding cc: %s from line '%s'\n"
msgstr ""
-#: git-sh-setup.sh:199 git-sh-setup.sh:206
-#, sh-format
-msgid "fatal: $program_name cannot be used without a working tree."
+#: git-send-email.perl:1578
+#, perl-format
+msgid "(body) Adding cc: %s from line '%s'\n"
msgstr ""
-#: git-sh-setup.sh:220
-msgid "Cannot rebase: You have unstaged changes."
+#: git-send-email.perl:1676
+#, perl-format
+msgid "(%s) Could not execute '%s'"
msgstr ""
-#: git-sh-setup.sh:223
-msgid "Cannot rewrite branches: You have unstaged changes."
+#: git-send-email.perl:1683
+#, perl-format
+msgid "(%s) Adding %s: %s from: '%s'\n"
msgstr ""
-#: git-sh-setup.sh:229
-#, sh-format
-msgid "Cannot $action: You have unstaged changes."
+#: git-send-email.perl:1687
+#, perl-format
+msgid "(%s) failed to close pipe to '%s'"
msgstr ""
-#: git-sh-setup.sh:242
-msgid "Cannot rebase: Your index contains uncommitted changes."
+#: git-send-email.perl:1714
+msgid "cannot send message as 7bit"
msgstr ""
-#: git-sh-setup.sh:248
-#, sh-format
-msgid "Cannot $action: Your index contains uncommitted changes."
+#: git-send-email.perl:1722
+msgid "invalid transfer encoding"
msgstr ""
-#: git-sh-setup.sh:372
-msgid "You need to run this command from the toplevel of the working tree."
+#: git-send-email.perl:1741 git-send-email.perl:1792 git-send-email.perl:1802
+#, perl-format
+msgid "unable to open %s: %s\n"
msgstr ""
-#: git-sh-setup.sh:377
-msgid "Unable to determine absolute path of git directory"
+#: git-send-email.perl:1744
+#, perl-format
+msgid "%s: patch contains a line longer than 998 characters"
+msgstr ""
+
+#: git-send-email.perl:1760
+#, perl-format
+msgid "Skipping %s with backup suffix '%s'.\n"
+msgstr ""
+
+#. TRANSLATORS: please keep "[y|N]" as is.
+#: git-send-email.perl:1764
+#, perl-format
+msgid "Do you really want to send %s? [y|N]: "
msgstr ""