msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2017-07-24 21:54+0800\n"
+"POT-Creation-Date: 2018-09-04 08:50+0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
-#: advice.c:58
+#: advice.c:97
#, c-format
-msgid "hint: %.*s\n"
+msgid "%shint: %.*s%s\n"
msgstr ""
-#: advice.c:86
+#: advice.c:150
msgid "Cherry-picking is not possible because you have unmerged files."
msgstr ""
-#: advice.c:88
+#: advice.c:152
msgid "Committing is not possible because you have unmerged files."
msgstr ""
-#: advice.c:90
+#: advice.c:154
msgid "Merging is not possible because you have unmerged files."
msgstr ""
-#: advice.c:92
+#: advice.c:156
msgid "Pulling is not possible because you have unmerged files."
msgstr ""
-#: advice.c:94
+#: advice.c:158
msgid "Reverting is not possible because you have unmerged files."
msgstr ""
-#: advice.c:96
+#: advice.c:160
#, c-format
msgid "It is not possible to %s because you have unmerged files."
msgstr ""
-#: advice.c:104
+#: advice.c:168
msgid ""
"Fix them up in the work tree, and then use 'git add/rm <file>'\n"
"as appropriate to mark resolution and make a commit."
msgstr ""
-#: advice.c:112
+#: advice.c:176
msgid "Exiting because of an unresolved conflict."
msgstr ""
-#: advice.c:117 builtin/merge.c:1184
+#: advice.c:181 builtin/merge.c:1286
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr ""
-#: advice.c:119
+#: advice.c:183
msgid "Please, commit your changes before merging."
msgstr ""
-#: advice.c:120
+#: advice.c:184
msgid "Exiting because of unfinished merge."
msgstr ""
-#: advice.c:126
+#: advice.c:190
#, c-format
msgid ""
"Note: checking out '%s'.\n"
"\n"
msgstr ""
-#: apply.c:58
+#: apply.c:59
#, c-format
msgid "unrecognized whitespace option '%s'"
msgstr ""
-#: apply.c:74
+#: apply.c:75
#, c-format
msgid "unrecognized whitespace ignore option '%s'"
msgstr ""
-#: apply.c:126
+#: apply.c:125
msgid "--reject and --3way cannot be used together."
msgstr ""
-#: apply.c:128
+#: apply.c:127
msgid "--cached and --3way cannot be used together."
msgstr ""
-#: apply.c:131
+#: apply.c:130
msgid "--3way outside a repository"
msgstr ""
-#: apply.c:142
+#: apply.c:141
msgid "--index outside a repository"
msgstr ""
-#: apply.c:145
+#: apply.c:144
msgid "--cached outside a repository"
msgstr ""
-#: apply.c:836
+#: apply.c:826
#, c-format
msgid "Cannot prepare timestamp regexp %s"
msgstr ""
-#: apply.c:845
+#: apply.c:835
#, c-format
msgid "regexec returned %d for input: %s"
msgstr ""
-#: apply.c:929
+#: apply.c:909
#, c-format
msgid "unable to find filename in patch at line %d"
msgstr ""
-#: apply.c:967
+#: apply.c:947
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
msgstr ""
-#: apply.c:973
+#: apply.c:953
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr ""
-#: apply.c:974
+#: apply.c:954
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr ""
-#: apply.c:979
+#: apply.c:959
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr ""
-#: apply.c:1008
+#: apply.c:988
#, c-format
msgid "invalid mode on line %d: %s"
msgstr ""
-#: apply.c:1326
+#: apply.c:1306
#, c-format
msgid "inconsistent header lines %d and %d"
msgstr ""
-#: apply.c:1498
+#: apply.c:1478
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr ""
-#: apply.c:1567
+#: apply.c:1547
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr ""
-#: apply.c:1587
+#: apply.c:1567
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
msgstr[0] ""
msgstr[1] ""
-#: apply.c:1600
+#: apply.c:1580
#, c-format
msgid "git diff header lacks filename information (line %d)"
msgstr ""
-#: apply.c:1770
+#: apply.c:1768
msgid "new file depends on old contents"
msgstr ""
-#: apply.c:1772
+#: apply.c:1770
msgid "deleted file still has contents"
msgstr ""
-#: apply.c:1806
+#: apply.c:1804
#, c-format
msgid "corrupt patch at line %d"
msgstr ""
-#: apply.c:1843
+#: apply.c:1841
#, c-format
msgid "new file %s depends on old contents"
msgstr ""
-#: apply.c:1845
+#: apply.c:1843
#, c-format
msgid "deleted file %s still has contents"
msgstr ""
-#: apply.c:1848
+#: apply.c:1846
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr ""
-#: apply.c:1995
+#: apply.c:1993
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr ""
-#: apply.c:2032
+#: apply.c:2030
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr ""
-#: apply.c:2193
+#: apply.c:2190
#, c-format
msgid "patch with only garbage at line %d"
msgstr ""
msgid "unable to open or read %s"
msgstr ""
-#: apply.c:2933
+#: apply.c:2939
#, c-format
msgid "invalid start of line: '%c'"
msgstr ""
-#: apply.c:3052
+#: apply.c:3060
#, 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] ""
-#: apply.c:3064
+#: apply.c:3072
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr ""
-#: apply.c:3070
+#: apply.c:3078
#, c-format
msgid ""
"while searching for:\n"
"%.*s"
msgstr ""
-#: apply.c:3092
+#: apply.c:3100
#, c-format
msgid "missing binary patch data for '%s'"
msgstr ""
-#: apply.c:3100
+#: apply.c:3108
#, c-format
msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
msgstr ""
-#: apply.c:3146
+#: apply.c:3154
#, c-format
msgid "cannot apply binary patch to '%s' without full index line"
msgstr ""
-#: apply.c:3156
+#: apply.c:3164
#, c-format
msgid ""
"the patch applies to '%s' (%s), which does not match the current contents."
msgstr ""
-#: apply.c:3164
+#: apply.c:3172
#, c-format
msgid "the patch applies to an empty '%s' but it is not empty"
msgstr ""
-#: apply.c:3182
+#: apply.c:3190
#, c-format
msgid "the necessary postimage %s for '%s' cannot be read"
msgstr ""
-#: apply.c:3195
+#: apply.c:3203
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr ""
-#: apply.c:3201
+#: apply.c:3209
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr ""
-#: apply.c:3222
+#: apply.c:3230
#, c-format
msgid "patch failed: %s:%ld"
msgstr ""
-#: apply.c:3344
+#: apply.c:3352
#, c-format
msgid "cannot checkout %s"
msgstr ""
-#: apply.c:3392 apply.c:3403 apply.c:3449 setup.c:277
+#: apply.c:3404 apply.c:3415 apply.c:3461 setup.c:278
#, c-format
msgid "failed to read %s"
msgstr ""
-#: apply.c:3400
+#: apply.c:3412
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr ""
-#: apply.c:3429 apply.c:3669
+#: apply.c:3441 apply.c:3681
#, c-format
msgid "path %s has been renamed/deleted"
msgstr ""
-#: apply.c:3512 apply.c:3683
+#: apply.c:3524 apply.c:3696
#, c-format
msgid "%s: does not exist in index"
msgstr ""
-#: apply.c:3521 apply.c:3691
+#: apply.c:3533 apply.c:3704
#, c-format
msgid "%s: does not match index"
msgstr ""
-#: apply.c:3556
+#: apply.c:3568
msgid "repository lacks the necessary blob to fall back on 3-way merge."
msgstr ""
-#: apply.c:3559
+#: apply.c:3571
#, c-format
msgid "Falling back to three-way merge...\n"
msgstr ""
-#: apply.c:3575 apply.c:3579
+#: apply.c:3587 apply.c:3591
#, c-format
msgid "cannot read the current contents of '%s'"
msgstr ""
-#: apply.c:3591
+#: apply.c:3603
#, c-format
msgid "Failed to fall back on three-way merge...\n"
msgstr ""
-#: apply.c:3605
+#: apply.c:3617
#, c-format
msgid "Applied patch to '%s' with conflicts.\n"
msgstr ""
-#: apply.c:3610
+#: apply.c:3622
#, c-format
msgid "Applied patch to '%s' cleanly.\n"
msgstr ""
-#: apply.c:3636
+#: apply.c:3648
msgid "removal patch leaves file contents"
msgstr ""
-#: apply.c:3708
+#: apply.c:3721
#, c-format
msgid "%s: wrong type"
msgstr ""
-#: apply.c:3710
+#: apply.c:3723
#, c-format
msgid "%s has type %o, expected %o"
msgstr ""
-#: apply.c:3860 apply.c:3862
+#: apply.c:3874 apply.c:3876
#, c-format
msgid "invalid path '%s'"
msgstr ""
-#: apply.c:3918
+#: apply.c:3932
#, c-format
msgid "%s: already exists in index"
msgstr ""
-#: apply.c:3921
+#: apply.c:3935
#, c-format
msgid "%s: already exists in working directory"
msgstr ""
-#: apply.c:3941
+#: apply.c:3955
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr ""
-#: apply.c:3946
+#: apply.c:3960
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr ""
-#: apply.c:3966
+#: apply.c:3980
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr ""
-#: apply.c:3970
+#: apply.c:3984
#, c-format
msgid "%s: patch does not apply"
msgstr ""
-#: apply.c:3985
+#: apply.c:3999
#, c-format
msgid "Checking patch %s..."
msgstr ""
-#: apply.c:4076
+#: apply.c:4091
#, c-format
msgid "sha1 information is lacking or useless for submodule %s"
msgstr ""
-#: apply.c:4083
+#: apply.c:4098
#, c-format
msgid "mode change for %s, which is not in current HEAD"
msgstr ""
-#: apply.c:4086
+#: apply.c:4101
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr ""
-#: apply.c:4091 builtin/checkout.c:235 builtin/reset.c:138
+#: apply.c:4106 builtin/checkout.c:237 builtin/reset.c:140
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr ""
-#: apply.c:4095
+#: apply.c:4110
#, c-format
msgid "could not add %s to temporary index"
msgstr ""
-#: apply.c:4105
+#: apply.c:4120
#, c-format
msgid "could not write temporary index to %s"
msgstr ""
-#: apply.c:4243
+#: apply.c:4258
#, c-format
msgid "unable to remove %s from index"
msgstr ""
-#: apply.c:4278
+#: apply.c:4292
#, c-format
msgid "corrupt patch for submodule %s"
msgstr ""
-#: apply.c:4284
+#: apply.c:4298
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr ""
-#: apply.c:4292
+#: apply.c:4306
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr ""
-#: apply.c:4298 apply.c:4442
+#: apply.c:4312 apply.c:4457
#, c-format
msgid "unable to add cache entry for %s"
msgstr ""
-#: apply.c:4339
+#: apply.c:4355
#, c-format
msgid "failed to write to '%s'"
msgstr ""
-#: apply.c:4343
+#: apply.c:4359
#, c-format
msgid "closing file '%s'"
msgstr ""
-#: apply.c:4413
+#: apply.c:4429
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr ""
-#: apply.c:4511
+#: apply.c:4527
#, c-format
msgid "Applied patch %s cleanly."
msgstr ""
-#: apply.c:4519
+#: apply.c:4535
msgid "internal error"
msgstr ""
-#: apply.c:4522
+#: apply.c:4538
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] ""
msgstr[1] ""
-#: apply.c:4533
+#: apply.c:4549
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr ""
-#: apply.c:4541 builtin/fetch.c:738 builtin/fetch.c:988
+#: apply.c:4557 builtin/fetch.c:780 builtin/fetch.c:1048
#, c-format
msgid "cannot open %s"
msgstr ""
-#: apply.c:4555
+#: apply.c:4571
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr ""
-#: apply.c:4559
+#: apply.c:4575
#, c-format
msgid "Rejected hunk #%d."
msgstr ""
-#: apply.c:4669
+#: apply.c:4685
#, c-format
msgid "Skipped patch '%s'."
msgstr ""
-#: apply.c:4677
+#: apply.c:4693
msgid "unrecognized input"
msgstr ""
-#: apply.c:4696
+#: apply.c:4712
msgid "unable to read index file"
msgstr ""
-#: apply.c:4833
+#: apply.c:4849
#, c-format
msgid "can't open patch '%s': %s"
msgstr ""
-#: apply.c:4860
+#: apply.c:4876
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] ""
msgstr[1] ""
-#: apply.c:4866 apply.c:4881
+#: apply.c:4882 apply.c:4897
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgstr[0] ""
msgstr[1] ""
-#: apply.c:4874
+#: apply.c:4890
#, c-format
msgid "%d line applied after fixing whitespace errors."
msgid_plural "%d lines applied after fixing whitespace errors."
msgstr[0] ""
msgstr[1] ""
-#: apply.c:4890 builtin/add.c:513 builtin/mv.c:299 builtin/rm.c:391
+#: apply.c:4906 builtin/add.c:539 builtin/mv.c:300 builtin/rm.c:389
msgid "Unable to write new index file"
msgstr ""
-#: apply.c:4921 apply.c:4924 builtin/am.c:2257 builtin/am.c:2260
-#: builtin/clone.c:115 builtin/fetch.c:93 builtin/pull.c:187
-#: builtin/submodule--helper.c:304 builtin/submodule--helper.c:629
-#: builtin/submodule--helper.c:632 builtin/submodule--helper.c:973
-#: builtin/submodule--helper.c:976 builtin/submodule--helper.c:1161
-#: git-add--interactive.perl:197
+#: apply.c:4933 apply.c:4936 builtin/am.c:2254 builtin/am.c:2257
+#: builtin/clone.c:121 builtin/fetch.c:115 builtin/merge.c:260
+#: builtin/pull.c:198 builtin/submodule--helper.c:406
+#: builtin/submodule--helper.c:1355 builtin/submodule--helper.c:1358
+#: builtin/submodule--helper.c:1729 builtin/submodule--helper.c:1732
+#: builtin/submodule--helper.c:1952 git-add--interactive.perl:197
msgid "path"
msgstr ""
-#: apply.c:4922
+#: apply.c:4934
msgid "don't apply changes matching the given path"
msgstr ""
-#: apply.c:4925
+#: apply.c:4937
msgid "apply changes matching the given path"
msgstr ""
-#: apply.c:4927 builtin/am.c:2266
+#: apply.c:4939 builtin/am.c:2263
msgid "num"
msgstr ""
-#: apply.c:4928
+#: apply.c:4940
msgid "remove <num> leading slashes from traditional diff paths"
msgstr ""
-#: apply.c:4931
+#: apply.c:4943
msgid "ignore additions made by the patch"
msgstr ""
-#: apply.c:4933
+#: apply.c:4945
msgid "instead of applying the patch, output diffstat for the input"
msgstr ""
-#: apply.c:4937
+#: apply.c:4949
msgid "show number of added and deleted lines in decimal notation"
msgstr ""
-#: apply.c:4939
+#: apply.c:4951
msgid "instead of applying the patch, output a summary for the input"
msgstr ""
-#: apply.c:4941
+#: apply.c:4953
msgid "instead of applying the patch, see if the patch is applicable"
msgstr ""
-#: apply.c:4943
+#: apply.c:4955
msgid "make sure the patch is applicable to the current index"
msgstr ""
-#: apply.c:4945
+#: apply.c:4957
+msgid "mark new files with `git add --intent-to-add`"
+msgstr ""
+
+#: apply.c:4959
msgid "apply a patch without touching the working tree"
msgstr ""
-#: apply.c:4947
+#: apply.c:4961
msgid "accept a patch that touches outside the working area"
msgstr ""
-#: apply.c:4949
+#: apply.c:4964
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr ""
-#: apply.c:4951
+#: apply.c:4966
msgid "attempt three-way merge if a patch does not apply"
msgstr ""
-#: apply.c:4953
+#: apply.c:4968
msgid "build a temporary index based on embedded index information"
msgstr ""
-#: apply.c:4956 builtin/checkout-index.c:170 builtin/ls-files.c:515
+#: apply.c:4971 builtin/checkout-index.c:168 builtin/ls-files.c:516
msgid "paths are separated with NUL character"
msgstr ""
-#: apply.c:4958
+#: apply.c:4973
msgid "ensure at least <n> lines of context match"
msgstr ""
-#: apply.c:4959 builtin/am.c:2245
+#: apply.c:4974 builtin/am.c:2242 builtin/interpret-trailers.c:95
+#: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99
+#: builtin/pack-objects.c:3202
msgid "action"
msgstr ""
-#: apply.c:4960
+#: apply.c:4975
msgid "detect new or modified lines that have whitespace errors"
msgstr ""
-#: apply.c:4963 apply.c:4966
+#: apply.c:4978 apply.c:4981
msgid "ignore changes in whitespace when finding context"
msgstr ""
-#: apply.c:4969
+#: apply.c:4984
msgid "apply the patch in reverse"
msgstr ""
-#: apply.c:4971
+#: apply.c:4986
msgid "don't expect at least one line of context"
msgstr ""
-#: apply.c:4973
+#: apply.c:4988
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr ""
-#: apply.c:4975
+#: apply.c:4990
msgid "allow overlapping hunks"
msgstr ""
-#: apply.c:4976 builtin/add.c:270 builtin/check-ignore.c:21
-#: builtin/commit.c:1340 builtin/count-objects.c:95 builtin/fsck.c:651
-#: builtin/log.c:1877 builtin/mv.c:123 builtin/read-tree.c:125
+#: apply.c:4991 builtin/add.c:290 builtin/check-ignore.c:21
+#: builtin/commit.c:1301 builtin/count-objects.c:98 builtin/fsck.c:671
+#: builtin/log.c:1914 builtin/mv.c:122 builtin/read-tree.c:124
msgid "be verbose"
msgstr ""
-#: apply.c:4978
+#: apply.c:4993
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr ""
-#: apply.c:4981
+#: apply.c:4996
msgid "do not trust the line counts in the hunk headers"
msgstr ""
-#: apply.c:4983 builtin/am.c:2254
+#: apply.c:4998 builtin/am.c:2251
msgid "root"
msgstr ""
-#: apply.c:4984
+#: apply.c:4999
msgid "prepend <root> to all filenames"
msgstr ""
-#: archive.c:13
+#: archive.c:14
msgid "git archive [<options>] <tree-ish> [<path>...]"
msgstr ""
-#: archive.c:14
+#: archive.c:15
msgid "git archive --list"
msgstr ""
-#: archive.c:15
+#: archive.c:16
msgid ""
"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
msgstr ""
-#: archive.c:16
+#: archive.c:17
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr ""
-#: archive.c:333 builtin/add.c:154 builtin/add.c:492 builtin/rm.c:300
+#: archive.c:363 builtin/add.c:176 builtin/add.c:515 builtin/rm.c:298
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr ""
-#: archive.c:418
+#: archive.c:446
msgid "fmt"
msgstr ""
-#: archive.c:418
+#: archive.c:446
msgid "archive format"
msgstr ""
-#: archive.c:419 builtin/log.c:1446
+#: archive.c:447 builtin/log.c:1473
msgid "prefix"
msgstr ""
-#: archive.c:420
+#: archive.c:448
msgid "prepend prefix to each pathname in the archive"
msgstr ""
-#: archive.c:421 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:61
-#: builtin/fast-export.c:989 builtin/fast-export.c:991 builtin/grep.c:1080
-#: builtin/hash-object.c:102 builtin/ls-files.c:549 builtin/ls-files.c:552
-#: builtin/notes.c:404 builtin/notes.c:567 builtin/read-tree.c:120
-#: parse-options.h:153
+#: archive.c:449 builtin/blame.c:816 builtin/blame.c:817 builtin/config.c:126
+#: builtin/fast-export.c:1013 builtin/fast-export.c:1015 builtin/grep.c:873
+#: builtin/hash-object.c:104 builtin/ls-files.c:552 builtin/ls-files.c:555
+#: builtin/notes.c:407 builtin/notes.c:570 builtin/read-tree.c:119
+#: parse-options.h:165
msgid "file"
msgstr ""
-#: archive.c:422 builtin/archive.c:89
+#: archive.c:450 builtin/archive.c:89
msgid "write the archive to this file"
msgstr ""
-#: archive.c:424
+#: archive.c:452
msgid "read .gitattributes in working directory"
msgstr ""
-#: archive.c:425
+#: archive.c:453
msgid "report archived files on stderr"
msgstr ""
-#: archive.c:426
+#: archive.c:454
msgid "store only"
msgstr ""
-#: archive.c:427
+#: archive.c:455
msgid "compress faster"
msgstr ""
-#: archive.c:435
+#: archive.c:463
msgid "compress better"
msgstr ""
-#: archive.c:438
+#: archive.c:466
msgid "list supported archive formats"
msgstr ""
-#: archive.c:440 builtin/archive.c:90 builtin/clone.c:105 builtin/clone.c:108
-#: builtin/submodule--helper.c:641 builtin/submodule--helper.c:982
+#: archive.c:468 builtin/archive.c:90 builtin/clone.c:111 builtin/clone.c:114
+#: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1738
msgid "repo"
msgstr ""
-#: archive.c:441 builtin/archive.c:91
+#: archive.c:469 builtin/archive.c:91
msgid "retrieve the archive from remote repository <repo>"
msgstr ""
-#: archive.c:442 builtin/archive.c:92 builtin/notes.c:488
+#: archive.c:470 builtin/archive.c:92 builtin/difftool.c:714
+#: builtin/notes.c:491
msgid "command"
msgstr ""
-#: archive.c:443 builtin/archive.c:93
+#: archive.c:471 builtin/archive.c:93
msgid "path to the remote git-upload-archive command"
msgstr ""
-#: archive.c:450
+#: archive.c:478
msgid "Unexpected option --remote"
msgstr ""
-#: archive.c:452
+#: archive.c:480
msgid "Option --exec can only be used together with --remote"
msgstr ""
-#: archive.c:454
+#: archive.c:482
msgid "Unexpected option --output"
msgstr ""
-#: archive.c:476
+#: archive.c:504
#, c-format
msgid "Unknown archive format '%s'"
msgstr ""
-#: archive.c:483
+#: archive.c:511
#, c-format
msgid "Argument not supported for format '%s': -%d"
msgstr ""
-#: attr.c:214
+#: archive-tar.c:125 archive-zip.c:344
+#, c-format
+msgid "cannot stream blob %s"
+msgstr ""
+
+#: archive-tar.c:260 archive-zip.c:361
+#, c-format
+msgid "unsupported file mode: 0%o (SHA1: %s)"
+msgstr ""
+
+#: archive-tar.c:287 archive-zip.c:352
+#, c-format
+msgid "cannot read %s"
+msgstr ""
+
+#: archive-tar.c:458
+#, c-format
+msgid "unable to start '%s' filter"
+msgstr ""
+
+#: archive-tar.c:461
+msgid "unable to redirect descriptor"
+msgstr ""
+
+#: archive-tar.c:468
+#, c-format
+msgid "'%s' filter reported error"
+msgstr ""
+
+#: archive-zip.c:313
+#, c-format
+msgid "path is not valid UTF-8: %s"
+msgstr ""
+
+#: archive-zip.c:317
+#, c-format
+msgid "path too long (%d chars, SHA1: %s): %s"
+msgstr ""
+
+#: archive-zip.c:470 builtin/pack-objects.c:216 builtin/pack-objects.c:219
+#, c-format
+msgid "deflate error (%d)"
+msgstr ""
+
+#: archive-zip.c:605
+#, c-format
+msgid "timestamp too large for this system: %<PRIuMAX>"
+msgstr ""
+
+#: attr.c:218
#, c-format
msgid "%.*s is not a valid attribute name"
msgstr ""
-#: attr.c:410
+#: attr.c:415
msgid ""
"Negative patterns are ignored in git attributes\n"
"Use '\\!' for literal leading exclamation."
msgstr ""
-#: bisect.c:447
+#: bisect.c:467
#, c-format
msgid "Badly quoted content in file '%s': %s"
msgstr ""
-#: bisect.c:655
+#: bisect.c:675
#, c-format
msgid "We cannot bisect more!\n"
msgstr ""
-#: bisect.c:708
+#: bisect.c:729
#, c-format
msgid "Not a valid commit name %s"
msgstr ""
-#: bisect.c:732
+#: bisect.c:753
#, c-format
msgid ""
"The merge base %s is bad.\n"
"This means the bug has been fixed between %s and [%s].\n"
msgstr ""
-#: bisect.c:737
+#: bisect.c:758
#, c-format
msgid ""
"The merge base %s is new.\n"
"The property has changed between %s and [%s].\n"
msgstr ""
-#: bisect.c:742
+#: bisect.c:763
#, c-format
msgid ""
"The merge base %s is %s.\n"
"This means the first '%s' commit is between %s and [%s].\n"
msgstr ""
-#: bisect.c:750
+#: bisect.c:771
#, c-format
msgid ""
"Some %s revs are not ancestors of the %s rev.\n"
"Maybe you mistook %s and %s revs?\n"
msgstr ""
-#: bisect.c:763
+#: bisect.c:784
#, c-format
msgid ""
"the merge base between %s and [%s] must be skipped.\n"
"We continue anyway."
msgstr ""
-#: bisect.c:798
+#: bisect.c:817
#, c-format
msgid "Bisecting: a merge base must be tested\n"
msgstr ""
-#: bisect.c:849
+#: bisect.c:857
#, c-format
msgid "a %s revision is needed"
msgstr ""
-#: bisect.c:866 builtin/notes.c:175 builtin/tag.c:256
+#: bisect.c:876 builtin/notes.c:177 builtin/tag.c:237
#, c-format
msgid "could not create file '%s'"
msgstr ""
-#: bisect.c:917
+#: bisect.c:927 builtin/merge.c:137
#, c-format
msgid "could not read file '%s'"
msgstr ""
-#: bisect.c:947
+#: bisect.c:957
msgid "reading bisect refs failed"
msgstr ""
-#: bisect.c:967
+#: bisect.c:976
#, c-format
msgid "%s was both %s and %s\n"
msgstr ""
-#: bisect.c:975
+#: bisect.c:984
#, c-format
msgid ""
"No testable commit found.\n"
"Maybe you started with bad path parameters?\n"
msgstr ""
-#: bisect.c:994
+#: bisect.c:1003
#, c-format
msgid "(roughly %d step)"
msgid_plural "(roughly %d steps)"
#. TRANSLATORS: the last %s will be replaced with "(roughly %d
#. steps)" translation.
#.
-#: bisect.c:1000
+#: bisect.c:1009
#, 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] ""
-#: blame.c:1757
+#: blame.c:1784
msgid "--contents and --reverse do not blend well."
msgstr ""
-#: blame.c:1768
+#: blame.c:1798
msgid "cannot use --contents with final commit object name"
msgstr ""
-#: blame.c:1788
+#: blame.c:1819
msgid "--reverse and --first-parent together require specified latest commit"
msgstr ""
-#: blame.c:1797 bundle.c:164 ref-filter.c:1919 sequencer.c:1166
-#: sequencer.c:2328 builtin/commit.c:1058 builtin/log.c:356 builtin/log.c:907
-#: builtin/log.c:1357 builtin/log.c:1683 builtin/log.c:1926 builtin/merge.c:360
-#: builtin/shortlog.c:177
+#: blame.c:1828 bundle.c:162 ref-filter.c:2154 sequencer.c:1874
+#: sequencer.c:3772 builtin/commit.c:994 builtin/log.c:372 builtin/log.c:926
+#: builtin/log.c:1381 builtin/log.c:1713 builtin/log.c:1963 builtin/merge.c:404
+#: builtin/pack-objects.c:3029 builtin/pack-objects.c:3044
+#: builtin/shortlog.c:192
msgid "revision walk setup failed"
msgstr ""
-#: blame.c:1815
+#: blame.c:1846
msgid ""
"--reverse --first-parent together require range along first-parent chain"
msgstr ""
-#: blame.c:1826
+#: blame.c:1857
#, c-format
msgid "no such path %s in %s"
msgstr ""
-#: blame.c:1837
+#: blame.c:1868
#, c-format
msgid "cannot read blob %s for path %s"
msgstr ""
-#: branch.c:53
+#: branch.c:52
#, c-format
msgid ""
"\n"
"\"git branch --set-upstream-to=%s%s%s\"."
msgstr ""
-#: branch.c:67
+#: branch.c:66
#, c-format
msgid "Not setting branch %s as its own upstream."
msgstr ""
+#: branch.c:92
+#, c-format
+msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
+msgstr ""
+
#: branch.c:93
#, c-format
-msgid "Branch %s set up to track remote branch %s from %s by rebasing."
+msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
msgstr ""
-#: branch.c:94
+#: branch.c:97
#, c-format
-msgid "Branch %s set up to track remote branch %s from %s."
+msgid "Branch '%s' set up to track local branch '%s' by rebasing."
msgstr ""
#: branch.c:98
#, c-format
-msgid "Branch %s set up to track local branch %s by rebasing."
+msgid "Branch '%s' set up to track local branch '%s'."
msgstr ""
-#: branch.c:99
+#: branch.c:103
#, c-format
-msgid "Branch %s set up to track local branch %s."
+msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
msgstr ""
#: branch.c:104
#, c-format
-msgid "Branch %s set up to track remote ref %s by rebasing."
+msgid "Branch '%s' set up to track remote ref '%s'."
msgstr ""
-#: branch.c:105
+#: branch.c:108
#, c-format
-msgid "Branch %s set up to track remote ref %s."
+msgid "Branch '%s' set up to track local ref '%s' by rebasing."
msgstr ""
#: branch.c:109
#, c-format
-msgid "Branch %s set up to track local ref %s by rebasing."
-msgstr ""
-
-#: branch.c:110
-#, c-format
-msgid "Branch %s set up to track local ref %s."
+msgid "Branch '%s' set up to track local ref '%s'."
msgstr ""
-#: branch.c:119
+#: branch.c:118
msgid "Unable to write upstream branch configuration"
msgstr ""
-#: branch.c:156
+#: branch.c:155
#, c-format
msgid "Not tracking: ambiguous information for ref %s"
msgstr ""
-#: branch.c:185
+#: branch.c:188
#, c-format
msgid "'%s' is not a valid branch name."
msgstr ""
-#: branch.c:190
+#: branch.c:207
#, c-format
msgid "A branch named '%s' already exists."
msgstr ""
-#: branch.c:198
+#: branch.c:212
msgid "Cannot force update the current branch."
msgstr ""
-#: branch.c:218
+#: branch.c:232
#, c-format
msgid "Cannot setup tracking information; starting point '%s' is not a branch."
msgstr ""
-#: branch.c:220
+#: branch.c:234
#, c-format
msgid "the requested upstream branch '%s' does not exist"
msgstr ""
-#: branch.c:222
+#: branch.c:236
msgid ""
"\n"
"If you are planning on basing your work on an upstream\n"
"\"git push -u\" to set the upstream config as you push."
msgstr ""
-#: branch.c:265
+#: branch.c:279
#, c-format
msgid "Not a valid object name: '%s'."
msgstr ""
-#: branch.c:285
+#: branch.c:299
#, c-format
msgid "Ambiguous object name: '%s'."
msgstr ""
-#: branch.c:290
+#: branch.c:304
#, c-format
msgid "Not a valid branch point: '%s'."
msgstr ""
-#: branch.c:344
+#: branch.c:358
#, c-format
msgid "'%s' is already checked out at '%s'"
msgstr ""
-#: branch.c:366
+#: branch.c:381
#, c-format
msgid "HEAD of working tree %s is not updated"
msgstr ""
-#: bundle.c:34
+#: bundle.c:36
#, c-format
msgid "'%s' does not look like a v2 bundle file"
msgstr ""
-#: bundle.c:62
+#: bundle.c:64
#, c-format
msgid "unrecognized header: %s%s (%d)"
msgstr ""
-#: bundle.c:88 sequencer.c:1344 sequencer.c:1770 builtin/commit.c:778
+#: bundle.c:90 sequencer.c:2092 sequencer.c:2578 builtin/commit.c:768
#, c-format
msgid "could not open '%s'"
msgstr ""
-#: bundle.c:140
+#: bundle.c:141
msgid "Repository lacks these prerequisite commits:"
msgstr ""
-#: bundle.c:186
+#: bundle.c:192
#, c-format
msgid "The bundle contains this ref:"
msgid_plural "The bundle contains these %d refs:"
msgstr[0] ""
msgstr[1] ""
-#: bundle.c:193
+#: bundle.c:199
msgid "The bundle records a complete history."
msgstr ""
-#: bundle.c:195
+#: bundle.c:201
#, c-format
msgid "The bundle requires this ref:"
msgid_plural "The bundle requires these %d refs:"
msgstr[0] ""
msgstr[1] ""
-#: bundle.c:254
+#: bundle.c:260
msgid "Could not spawn pack-objects"
msgstr ""
-#: bundle.c:265
+#: bundle.c:271
msgid "pack-objects died"
msgstr ""
-#: bundle.c:307
+#: bundle.c:313
msgid "rev-list died"
msgstr ""
-#: bundle.c:356
+#: bundle.c:362
#, c-format
msgid "ref '%s' is excluded by the rev-list options"
msgstr ""
-#: bundle.c:446 builtin/log.c:173 builtin/log.c:1589 builtin/shortlog.c:282
+#: bundle.c:453 builtin/log.c:187 builtin/log.c:1618 builtin/shortlog.c:304
#, c-format
msgid "unrecognized argument: %s"
msgstr ""
-#: bundle.c:454
+#: bundle.c:461
msgid "Refusing to create empty bundle."
msgstr ""
-#: bundle.c:466
+#: bundle.c:473
#, c-format
msgid "cannot create '%s'"
msgstr ""
-#: bundle.c:494
+#: bundle.c:501
msgid "index-pack died"
msgstr ""
-#: color.c:301
+#: color.c:296
#, c-format
msgid "invalid color value: %.*s"
msgstr ""
-#: commit.c:41 sequencer.c:1582 builtin/am.c:420 builtin/am.c:456
-#: builtin/am.c:1469 builtin/am.c:2107
+#: commit.c:48 sequencer.c:2384 builtin/am.c:422 builtin/am.c:466
+#: builtin/am.c:1438 builtin/am.c:2072 builtin/replace.c:376
+#: builtin/replace.c:448
#, c-format
msgid "could not parse %s"
msgstr ""
-#: commit.c:43
+#: commit.c:50
#, c-format
msgid "%s %s is not a commit!"
msgstr ""
-#: commit.c:1511
+#: commit.c:191
+msgid ""
+"Support for <GIT_DIR>/info/grafts is deprecated\n"
+"and will be removed in a future Git version.\n"
+"\n"
+"Please use \"git replace --convert-graft-file\"\n"
+"to convert the grafts into replace refs.\n"
+"\n"
+"Turn this message off by running\n"
+"\"git config advice.graftFileDeprecated false\""
+msgstr ""
+
+#: commit.c:1629
msgid ""
"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 ""
-#: compat/obstack.c:406 compat/obstack.c:408
+#: commit-graph.c:83
+#, c-format
+msgid "graph file %s is too small"
+msgstr ""
+
+#: commit-graph.c:90
+#, c-format
+msgid "graph signature %X does not match signature %X"
+msgstr ""
+
+#: commit-graph.c:97
+#, c-format
+msgid "graph version %X does not match version %X"
+msgstr ""
+
+#: commit-graph.c:104
+#, c-format
+msgid "hash version %X does not match version %X"
+msgstr ""
+
+#: commit-graph.c:128
+#, c-format
+msgid "improper chunk offset %08x%08x"
+msgstr ""
+
+#: commit-graph.c:164
+#, c-format
+msgid "chunk id %08x appears multiple times"
+msgstr ""
+
+#: commit-graph.c:261
+#, c-format
+msgid "could not find commit %s"
+msgstr ""
+
+#: commit-graph.c:565 builtin/pack-objects.c:2568
+#, c-format
+msgid "unable to get type of object %s"
+msgstr ""
+
+#: commit-graph.c:730
+#, c-format
+msgid "error adding pack %s"
+msgstr ""
+
+#: commit-graph.c:732
+#, c-format
+msgid "error opening index for %s"
+msgstr ""
+
+#: commit-graph.c:773
+#, c-format
+msgid "the commit graph format cannot write %d commits"
+msgstr ""
+
+#: commit-graph.c:800
+msgid "too many commits to write graph"
+msgstr ""
+
+#: commit-graph.c:806
+#, c-format
+msgid "unable to create leading directories of %s"
+msgstr ""
+
+#: commit-graph.c:904
+msgid "the commit-graph file has incorrect checksum and is likely corrupt"
+msgstr ""
+
+#: compat/obstack.c:405 compat/obstack.c:407
msgid "memory exhausted"
msgstr ""
-#: config.c:186
+#: config.c:123
+#, c-format
+msgid ""
+"exceeded maximum include depth (%d) while including\n"
+"\t%s\n"
+"from\n"
+"\t%s\n"
+"This might be due to circular includes."
+msgstr ""
+
+#: config.c:139
+#, c-format
+msgid "could not expand include path '%s'"
+msgstr ""
+
+#: config.c:150
+msgid "relative config includes must come from files"
+msgstr ""
+
+#: config.c:190
msgid "relative config include conditionals must come from files"
msgstr ""
-#: config.c:720
+#: config.c:348
+#, c-format
+msgid "key does not contain a section: %s"
+msgstr ""
+
+#: config.c:354
+#, c-format
+msgid "key does not contain variable name: %s"
+msgstr ""
+
+#: config.c:378 sequencer.c:2206
+#, c-format
+msgid "invalid key: %s"
+msgstr ""
+
+#: config.c:384
+#, c-format
+msgid "invalid key (newline): %s"
+msgstr ""
+
+#: config.c:420 config.c:432
+#, c-format
+msgid "bogus config parameter: %s"
+msgstr ""
+
+#: config.c:467
+#, c-format
+msgid "bogus format in %s"
+msgstr ""
+
+#: config.c:793
#, c-format
msgid "bad config line %d in blob %s"
msgstr ""
-#: config.c:724
+#: config.c:797
#, c-format
msgid "bad config line %d in file %s"
msgstr ""
-#: config.c:728
+#: config.c:801
#, c-format
msgid "bad config line %d in standard input"
msgstr ""
-#: config.c:732
+#: config.c:805
#, c-format
msgid "bad config line %d in submodule-blob %s"
msgstr ""
-#: config.c:736
+#: config.c:809
#, c-format
msgid "bad config line %d in command line %s"
msgstr ""
-#: config.c:740
+#: config.c:813
#, c-format
msgid "bad config line %d in %s"
msgstr ""
-#: config.c:868
+#: config.c:952
msgid "out of range"
msgstr ""
-#: config.c:868
+#: config.c:952
msgid "invalid unit"
msgstr ""
-#: config.c:874
+#: config.c:958
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
msgstr ""
-#: config.c:879
+#: config.c:963
#, c-format
msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
msgstr ""
-#: config.c:882
+#: config.c:966
#, c-format
msgid "bad numeric config value '%s' for '%s' in file %s: %s"
msgstr ""
-#: config.c:885
+#: config.c:969
#, c-format
msgid "bad numeric config value '%s' for '%s' in standard input: %s"
msgstr ""
-#: config.c:888
+#: config.c:972
#, c-format
msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
msgstr ""
-#: config.c:891
+#: config.c:975
#, c-format
msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
msgstr ""
-#: config.c:894
+#: config.c:978
#, c-format
msgid "bad numeric config value '%s' for '%s' in %s: %s"
msgstr ""
-#: config.c:989
+#: config.c:1073
#, c-format
msgid "failed to expand user dir in: '%s'"
msgstr ""
-#: config.c:1084 config.c:1095
+#: config.c:1082
+#, c-format
+msgid "'%s' for '%s' is not a valid timestamp"
+msgstr ""
+
+#: config.c:1173
+#, c-format
+msgid "abbrev length out of range: %d"
+msgstr ""
+
+#: config.c:1187 config.c:1198
#, c-format
msgid "bad zlib compression level %d"
msgstr ""
-#: config.c:1212
+#: config.c:1290
+msgid "core.commentChar should only be one character"
+msgstr ""
+
+#: config.c:1323
#, c-format
msgid "invalid mode for object creation: %s"
msgstr ""
-#: config.c:1368
+#: config.c:1403
+#, c-format
+msgid "malformed value for %s"
+msgstr ""
+
+#: config.c:1429
+#, c-format
+msgid "malformed value for %s: %s"
+msgstr ""
+
+#: config.c:1430
+msgid "must be one of nothing, matching, simple, upstream or current"
+msgstr ""
+
+#: config.c:1489 builtin/pack-objects.c:3279
#, c-format
msgid "bad pack compression level %d"
msgstr ""
-#: config.c:1564
+#: config.c:1610
+#, c-format
+msgid "unable to load config blob object '%s'"
+msgstr ""
+
+#: config.c:1613
+#, c-format
+msgid "reference '%s' does not point to a blob"
+msgstr ""
+
+#: config.c:1630
+#, c-format
+msgid "unable to resolve config blob '%s'"
+msgstr ""
+
+#: config.c:1660
+#, c-format
+msgid "failed to parse %s"
+msgstr ""
+
+#: config.c:1700
msgid "unable to parse command-line config"
msgstr ""
-#: config.c:1894
+#: config.c:2032
msgid "unknown error occurred while reading the configuration files"
msgstr ""
-#: config.c:2064
+#: config.c:2202
#, c-format
msgid "Invalid %s: '%s'"
msgstr ""
-#: config.c:2085
+#: config.c:2245
#, c-format
msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
msgstr ""
-#: config.c:2111
+#: config.c:2271
#, c-format
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
msgstr ""
-#: config.c:2122
+#: config.c:2296
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr ""
-#: config.c:2124
+#: config.c:2298
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr ""
-#: config.c:2183
+#: config.c:2379
+#, c-format
+msgid "invalid section name '%s'"
+msgstr ""
+
+#: config.c:2411
#, c-format
msgid "%s has multiple values"
msgstr ""
-#: config.c:2517 config.c:2745
+#: config.c:2440
+#, c-format
+msgid "failed to write new configuration file %s"
+msgstr ""
+
+#: config.c:2691 config.c:3015
+#, c-format
+msgid "could not lock config file %s"
+msgstr ""
+
+#: config.c:2702
+#, c-format
+msgid "opening %s"
+msgstr ""
+
+#: config.c:2737 builtin/config.c:324
+#, c-format
+msgid "invalid pattern: %s"
+msgstr ""
+
+#: config.c:2762
+#, c-format
+msgid "invalid config file %s"
+msgstr ""
+
+#: config.c:2775 config.c:3028
#, c-format
msgid "fstat on %s failed"
msgstr ""
-#: config.c:2635
+#: config.c:2786
+#, c-format
+msgid "unable to mmap '%s'"
+msgstr ""
+
+#: config.c:2795 config.c:3033
+#, c-format
+msgid "chmod on %s failed"
+msgstr ""
+
+#: config.c:2880 config.c:3130
+#, c-format
+msgid "could not write config file %s"
+msgstr ""
+
+#: config.c:2914
#, c-format
msgid "could not set '%s' to '%s'"
msgstr ""
-#: config.c:2637 builtin/remote.c:775
+#: config.c:2916 builtin/remote.c:781
#, c-format
msgid "could not unset '%s'"
msgstr ""
-#: connect.c:50
-msgid "The remote end hung up upon initial contact"
+#: config.c:3006
+#, c-format
+msgid "invalid section name: %s"
+msgstr ""
+
+#: config.c:3173
+#, c-format
+msgid "missing value for '%s'"
+msgstr ""
+
+#: connect.c:61
+msgid "the remote end hung up upon initial contact"
msgstr ""
-#: connect.c:52
+#: connect.c:63
msgid ""
"Could not read from remote repository.\n"
"\n"
"and the repository exists."
msgstr ""
-#: connected.c:63 builtin/fsck.c:191 builtin/prune.c:141
-msgid "Checking connectivity"
+#: connect.c:81
+#, c-format
+msgid "server doesn't support '%s'"
msgstr ""
-#: connected.c:75
-msgid "Could not run 'git rev-list'"
+#: connect.c:103
+#, c-format
+msgid "server doesn't support feature '%s'"
msgstr ""
-#: connected.c:95
-msgid "failed write to rev-list"
+#: connect.c:114
+msgid "expected flush after capabilities"
msgstr ""
-#: connected.c:102
-msgid "failed to close rev-list's stdin"
+#: connect.c:233
+#, c-format
+msgid "ignoring capabilities after first line '%s'"
+msgstr ""
+
+#: connect.c:252
+msgid "protocol error: unexpected capabilities^{}"
msgstr ""
-#: convert.c:205
+#: connect.c:273
#, c-format
-msgid ""
-"CRLF will be replaced by LF in %s.\n"
-"The file will have its original line endings in your working directory."
+msgid "protocol error: expected shallow sha-1, got '%s'"
msgstr ""
-#: convert.c:209
+#: connect.c:275
+msgid "repository on the other end cannot be shallow"
+msgstr ""
+
+#: connect.c:310 fetch-pack.c:183 builtin/archive.c:63
#, c-format
-msgid "CRLF would be replaced by LF in %s."
+msgid "remote error: %s"
+msgstr ""
+
+#: connect.c:316
+msgid "invalid packet"
msgstr ""
-#: convert.c:215
+#: connect.c:336
#, c-format
-msgid ""
-"LF will be replaced by CRLF in %s.\n"
-"The file will have its original line endings in your working directory."
+msgid "protocol error: unexpected '%s'"
msgstr ""
-#: convert.c:219
+#: connect.c:444
#, c-format
-msgid "LF would be replaced by CRLF in %s"
+msgid "invalid ls-refs response: %s"
msgstr ""
-#: date.c:116
-msgid "in the future"
+#: connect.c:448
+msgid "expected flush after ref listing"
msgstr ""
-#: date.c:122
+#: connect.c:547
#, c-format
-msgid "%<PRIuMAX> second ago"
-msgid_plural "%<PRIuMAX> seconds ago"
-msgstr[0] ""
-msgstr[1] ""
+msgid "protocol '%s' is not supported"
+msgstr ""
-#: date.c:129
+#: connect.c:598
+msgid "unable to set SO_KEEPALIVE on socket"
+msgstr ""
+
+#: connect.c:638 connect.c:701
#, c-format
-msgid "%<PRIuMAX> minute ago"
-msgid_plural "%<PRIuMAX> minutes ago"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Looking up %s ... "
+msgstr ""
-#: date.c:136
+#: connect.c:642
+#, c-format
+msgid "unable to look up %s (port %s) (%s)"
+msgstr ""
+
+#. TRANSLATORS: this is the end of "Looking up %s ... "
+#: connect.c:646 connect.c:717
+#, c-format
+msgid ""
+"done.\n"
+"Connecting to %s (port %s) ... "
+msgstr ""
+
+#: connect.c:668 connect.c:745
+#, c-format
+msgid ""
+"unable to connect to %s:\n"
+"%s"
+msgstr ""
+
+#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
+#: connect.c:674 connect.c:751
+msgid "done."
+msgstr ""
+
+#: connect.c:705
+#, c-format
+msgid "unable to look up %s (%s)"
+msgstr ""
+
+#: connect.c:711
+#, c-format
+msgid "unknown port %s"
+msgstr ""
+
+#: connect.c:848 connect.c:1174
+#, c-format
+msgid "strange hostname '%s' blocked"
+msgstr ""
+
+#: connect.c:850
+#, c-format
+msgid "strange port '%s' blocked"
+msgstr ""
+
+#: connect.c:860
+#, c-format
+msgid "cannot start proxy %s"
+msgstr ""
+
+#: connect.c:927
+msgid "no path specified; see 'git help pull' for valid url syntax"
+msgstr ""
+
+#: connect.c:1122
+msgid "ssh variant 'simple' does not support -4"
+msgstr ""
+
+#: connect.c:1134
+msgid "ssh variant 'simple' does not support -6"
+msgstr ""
+
+#: connect.c:1151
+msgid "ssh variant 'simple' does not support setting port"
+msgstr ""
+
+#: connect.c:1262
+#, c-format
+msgid "strange pathname '%s' blocked"
+msgstr ""
+
+#: connect.c:1307
+msgid "unable to fork"
+msgstr ""
+
+#: connected.c:68 builtin/fsck.c:203 builtin/prune.c:146
+msgid "Checking connectivity"
+msgstr ""
+
+#: connected.c:80
+msgid "Could not run 'git rev-list'"
+msgstr ""
+
+#: connected.c:100
+msgid "failed write to rev-list"
+msgstr ""
+
+#: connected.c:107
+msgid "failed to close rev-list's stdin"
+msgstr ""
+
+#: convert.c:194
+#, c-format
+msgid "illegal crlf_action %d"
+msgstr ""
+
+#: convert.c:207
+#, c-format
+msgid "CRLF would be replaced by LF in %s"
+msgstr ""
+
+#: convert.c:209
+#, c-format
+msgid ""
+"CRLF will be replaced by LF in %s.\n"
+"The file will have its original line endings in your working directory"
+msgstr ""
+
+#: convert.c:217
+#, c-format
+msgid "LF would be replaced by CRLF in %s"
+msgstr ""
+
+#: convert.c:219
+#, c-format
+msgid ""
+"LF will be replaced by CRLF in %s.\n"
+"The file will have its original line endings in your working directory"
+msgstr ""
+
+#: convert.c:280
+#, c-format
+msgid "BOM is prohibited in '%s' if encoded as %s"
+msgstr ""
+
+#: convert.c:287
+#, c-format
+msgid ""
+"The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-"
+"tree-encoding."
+msgstr ""
+
+#: convert.c:305
+#, c-format
+msgid "BOM is required in '%s' if encoded as %s"
+msgstr ""
+
+#: convert.c:307
+#, c-format
+msgid ""
+"The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-"
+"%sLE (depending on the byte order) as working-tree-encoding."
+msgstr ""
+
+#: convert.c:425 convert.c:496
+#, c-format
+msgid "failed to encode '%s' from %s to %s"
+msgstr ""
+
+#: convert.c:468
+#, c-format
+msgid "encoding '%s' from %s to %s and back is not the same"
+msgstr ""
+
+#: convert.c:674
+#, c-format
+msgid "cannot fork to run external filter '%s'"
+msgstr ""
+
+#: convert.c:694
+#, c-format
+msgid "cannot feed the input to external filter '%s'"
+msgstr ""
+
+#: convert.c:701
+#, c-format
+msgid "external filter '%s' failed %d"
+msgstr ""
+
+#: convert.c:736 convert.c:739
+#, c-format
+msgid "read from external filter '%s' failed"
+msgstr ""
+
+#: convert.c:742 convert.c:796
+#, c-format
+msgid "external filter '%s' failed"
+msgstr ""
+
+#: convert.c:844
+msgid "unexpected filter type"
+msgstr ""
+
+#: convert.c:855
+msgid "path name too long for external filter"
+msgstr ""
+
+#: convert.c:929
+#, c-format
+msgid ""
+"external filter '%s' is not available anymore although not all paths have "
+"been filtered"
+msgstr ""
+
+#: convert.c:1228
+msgid "true/false are no valid working-tree-encodings"
+msgstr ""
+
+#: convert.c:1402 convert.c:1436
+#, c-format
+msgid "%s: clean filter '%s' failed"
+msgstr ""
+
+#: convert.c:1480
+#, c-format
+msgid "%s: smudge filter %s failed"
+msgstr ""
+
+#: date.c:116
+msgid "in the future"
+msgstr ""
+
+#: date.c:122
+#, c-format
+msgid "%<PRIuMAX> second ago"
+msgid_plural "%<PRIuMAX> seconds ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: date.c:129
+#, c-format
+msgid "%<PRIuMAX> minute ago"
+msgid_plural "%<PRIuMAX> minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: date.c:136
#, c-format
msgid "%<PRIuMAX> hour ago"
msgid_plural "%<PRIuMAX> hours ago"
msgid "Performing inexact rename detection"
msgstr ""
-#: diff.c:63
+#: diff.c:108
#, c-format
msgid "option '%s' requires a value"
msgstr ""
-#: diff.c:125
+#: diff.c:158
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr ""
-#: diff.c:130
+#: diff.c:163
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr ""
-#: diff.c:282
+#: diff.c:291
+msgid ""
+"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
+"'dimmed-zebra', 'plain'"
+msgstr ""
+
+#: diff.c:316
+#, c-format
+msgid "ignoring unknown color-moved-ws mode '%s'"
+msgstr ""
+
+#: diff.c:323
+msgid ""
+"color-moved-ws: allow-indentation-change cannot be combined with other white "
+"space modes"
+msgstr ""
+
+#: diff.c:394
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr ""
-#: diff.c:342
+#: diff.c:454
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
"%s"
msgstr ""
-#: diff.c:3101
+#: diff.c:4096
#, c-format
msgid "external diff died, stopping at %s"
msgstr ""
-#: diff.c:3427
+#: diff.c:4427
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
msgstr ""
-#: diff.c:3517
+#: diff.c:4430
+msgid "-G, -S and --find-object are mutually exclusive"
+msgstr ""
+
+#: diff.c:4508
msgid "--follow requires exactly one pathspec"
msgstr ""
-#: diff.c:3680
+#: diff.c:4674
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
"%s"
msgstr ""
-#: diff.c:3694
+#: diff.c:4688
#, c-format
msgid "Failed to parse --submodule option parameter: '%s'"
msgstr ""
-#: diff.c:4716
+#: diff.c:5766
msgid "inexact rename detection was skipped due to too many files."
msgstr ""
-#: diff.c:4719
+#: diff.c:5769
msgid "only found copies from modified paths due to too many files."
msgstr ""
-#: diff.c:4722
+#: diff.c:5772
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
msgstr ""
-#: dir.c:1948
+#: dir.c:569
+#, c-format
+msgid "pathspec '%s' did not match any file(s) known to git"
+msgstr ""
+
+#: dir.c:958
+#, c-format
+msgid "cannot use %s as an exclude file"
+msgstr ""
+
+#: dir.c:1873
+#, c-format
+msgid "could not open directory '%s'"
+msgstr ""
+
+#: dir.c:2115
msgid "failed to get kernel name and information"
msgstr ""
-#: dir.c:2067
-msgid "Untracked cache is disabled on this system or location."
+#: dir.c:2239
+msgid "untracked cache is disabled on this system or location"
+msgstr ""
+
+#: dir.c:3037
+#, c-format
+msgid "index file corrupt in repo %s"
msgstr ""
-#: dir.c:2846 dir.c:2851
+#: dir.c:3082 dir.c:3087
#, c-format
msgid "could not create directories for %s"
msgstr ""
-#: dir.c:2876
+#: dir.c:3116
#, c-format
msgid "could not migrate git directory from '%s' to '%s'"
msgstr ""
-#: entry.c:281
+#: editor.c:61
+#, c-format
+msgid "hint: Waiting for your editor to close the file...%c"
+msgstr ""
+
+#: entry.c:178
+msgid "Filtering content"
+msgstr ""
+
+#: entry.c:437
#, c-format
msgid "could not stat file '%s'"
msgstr ""
-#: fetch-pack.c:251
-msgid "git fetch-pack: expected shallow list"
+#: environment.c:150
+#, c-format
+msgid "bad git namespace path \"%s\""
msgstr ""
-#: fetch-pack.c:263
-msgid "git fetch-pack: expected ACK/NAK, got EOF"
+#: environment.c:332
+#, c-format
+msgid "could not set GIT_DIR to '%s'"
msgstr ""
-#: fetch-pack.c:282 builtin/archive.c:63
+#: exec-cmd.c:361
#, c-format
-msgid "remote error: %s"
+msgid "too many args to run %s"
+msgstr ""
+
+#: fetch-object.c:17
+msgid "Remote with no URL"
+msgstr ""
+
+#: fetch-pack.c:152
+msgid "git fetch-pack: expected shallow list"
+msgstr ""
+
+#: fetch-pack.c:164
+msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
msgstr ""
-#: fetch-pack.c:283
+#: fetch-pack.c:184
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr ""
-#: fetch-pack.c:335
+#: fetch-pack.c:254
msgid "--stateless-rpc requires multi_ack_detailed"
msgstr ""
-#: fetch-pack.c:421
+#: fetch-pack.c:342 fetch-pack.c:1257
#, c-format
msgid "invalid shallow line: %s"
msgstr ""
-#: fetch-pack.c:427
+#: fetch-pack.c:348 fetch-pack.c:1263
#, c-format
msgid "invalid unshallow line: %s"
msgstr ""
-#: fetch-pack.c:429
+#: fetch-pack.c:350 fetch-pack.c:1265
#, c-format
msgid "object not found: %s"
msgstr ""
-#: fetch-pack.c:432
+#: fetch-pack.c:353 fetch-pack.c:1268
#, c-format
msgid "error in object: %s"
msgstr ""
-#: fetch-pack.c:434
+#: fetch-pack.c:355 fetch-pack.c:1270
#, c-format
msgid "no shallow found: %s"
msgstr ""
-#: fetch-pack.c:437
+#: fetch-pack.c:358 fetch-pack.c:1273
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr ""
-#: fetch-pack.c:476
+#: fetch-pack.c:399
#, c-format
msgid "got %s %d %s"
msgstr ""
-#: fetch-pack.c:490
+#: fetch-pack.c:416
#, c-format
msgid "invalid commit %s"
msgstr ""
-#: fetch-pack.c:523
+#: fetch-pack.c:447
msgid "giving up"
msgstr ""
-#: fetch-pack.c:533 progress.c:237
+#: fetch-pack.c:459 progress.c:229
msgid "done"
msgstr ""
-#: fetch-pack.c:545
+#: fetch-pack.c:471
#, c-format
msgid "got %s (%d) %s"
msgstr ""
-#: fetch-pack.c:591
+#: fetch-pack.c:517
#, c-format
msgid "Marking %s as complete"
msgstr ""
-#: fetch-pack.c:775
+#: fetch-pack.c:764
#, c-format
msgid "already have %s (%s)"
msgstr ""
-#: fetch-pack.c:813
+#: fetch-pack.c:803
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr ""
-#: fetch-pack.c:821
+#: fetch-pack.c:811
msgid "protocol error: bad pack header"
msgstr ""
-#: fetch-pack.c:877
+#: fetch-pack.c:879
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr ""
-#: fetch-pack.c:893
+#: fetch-pack.c:895
#, c-format
msgid "%s failed"
msgstr ""
-#: fetch-pack.c:895
+#: fetch-pack.c:897
msgid "error in sideband demultiplexer"
msgstr ""
-#: fetch-pack.c:922
+#: fetch-pack.c:926
msgid "Server does not support shallow clients"
msgstr ""
-#: fetch-pack.c:926
+#: fetch-pack.c:930
msgid "Server supports multi_ack_detailed"
msgstr ""
-#: fetch-pack.c:929
+#: fetch-pack.c:933
msgid "Server supports no-done"
msgstr ""
-#: fetch-pack.c:935
+#: fetch-pack.c:939
msgid "Server supports multi_ack"
msgstr ""
-#: fetch-pack.c:939
+#: fetch-pack.c:943
msgid "Server supports side-band-64k"
msgstr ""
-#: fetch-pack.c:943
+#: fetch-pack.c:947
msgid "Server supports side-band"
msgstr ""
-#: fetch-pack.c:947
+#: fetch-pack.c:951
msgid "Server supports allow-tip-sha1-in-want"
msgstr ""
-#: fetch-pack.c:951
+#: fetch-pack.c:955
msgid "Server supports allow-reachable-sha1-in-want"
msgstr ""
-#: fetch-pack.c:961
+#: fetch-pack.c:965
msgid "Server supports ofs-delta"
msgstr ""
-#: fetch-pack.c:968
+#: fetch-pack.c:971 fetch-pack.c:1150
+msgid "Server supports filter"
+msgstr ""
+
+#: fetch-pack.c:979
#, c-format
msgid "Server version is %.*s"
msgstr ""
-#: fetch-pack.c:974
+#: fetch-pack.c:985
msgid "Server does not support --shallow-since"
msgstr ""
-#: fetch-pack.c:978
+#: fetch-pack.c:989
msgid "Server does not support --shallow-exclude"
msgstr ""
-#: fetch-pack.c:980
+#: fetch-pack.c:991
msgid "Server does not support --deepen"
msgstr ""
-#: fetch-pack.c:991
+#: fetch-pack.c:1004
msgid "no common commits"
msgstr ""
-#: fetch-pack.c:1003
+#: fetch-pack.c:1016 fetch-pack.c:1393
msgid "git fetch-pack: fetch failed."
msgstr ""
-#: fetch-pack.c:1165
+#: fetch-pack.c:1145
+msgid "Server does not support shallow requests"
+msgstr ""
+
+#: fetch-pack.c:1191
+#, c-format
+msgid "error reading section header '%s'"
+msgstr ""
+
+#: fetch-pack.c:1197
+#, c-format
+msgid "expected '%s', received '%s'"
+msgstr ""
+
+#: fetch-pack.c:1236
+#, c-format
+msgid "unexpected acknowledgment line: '%s'"
+msgstr ""
+
+#: fetch-pack.c:1241
+#, c-format
+msgid "error processing acks: %d"
+msgstr ""
+
+#: fetch-pack.c:1278
+#, c-format
+msgid "error processing shallow info: %d"
+msgstr ""
+
+#: fetch-pack.c:1294
+#, c-format
+msgid "expected wanted-ref, got '%s'"
+msgstr ""
+
+#: fetch-pack.c:1304
+#, c-format
+msgid "unexpected wanted-ref: '%s'"
+msgstr ""
+
+#: fetch-pack.c:1308
+#, c-format
+msgid "error processing wanted refs: %d"
+msgstr ""
+
+#: fetch-pack.c:1603
msgid "no matching remote head"
msgstr ""
-#: fetch-pack.c:1187
+#: fetch-pack.c:1621 builtin/clone.c:664
+msgid "remote did not send all necessary objects"
+msgstr ""
+
+#: fetch-pack.c:1647
#, c-format
msgid "no such remote ref %s"
msgstr ""
-#: fetch-pack.c:1190
+#: fetch-pack.c:1650
#, c-format
msgid "Server does not allow request for unadvertised object %s"
msgstr ""
-#: gpg-interface.c:181
+#: gpg-interface.c:253
msgid "gpg failed to sign the data"
msgstr ""
-#: gpg-interface.c:211
+#: gpg-interface.c:279
msgid "could not create temporary file"
msgstr ""
-#: gpg-interface.c:213
+#: gpg-interface.c:282
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr ""
msgid "ignore invalid color '%.*s' in log.graphColors"
msgstr ""
-#: grep.c:1981
+#: grep.c:2115
#, c-format
msgid "'%s': unable to read %s"
msgstr ""
-#: grep.c:1998 builtin/clone.c:403 builtin/diff.c:81 builtin/rm.c:134
+#: grep.c:2132 setup.c:164 builtin/clone.c:410 builtin/diff.c:81
+#: builtin/rm.c:134
#, c-format
msgid "failed to stat '%s'"
msgstr ""
-#: grep.c:2009
+#: grep.c:2143
#, c-format
msgid "'%s': short read"
msgstr ""
-#: help.c:179
-#, c-format
-msgid "available git commands in '%s'"
+#: help.c:23
+msgid "start a working area (see also: git help tutorial)"
msgstr ""
-#: help.c:186
-msgid "git commands available from elsewhere on your $PATH"
+#: help.c:24
+msgid "work on the current change (see also: git help everyday)"
msgstr ""
-#: help.c:217
-msgid "These are common Git commands used in various situations:"
+#: help.c:25
+msgid "examine the history and state (see also: git help revisions)"
msgstr ""
-#: help.c:281
-#, c-format
-msgid ""
-"'%s' appears to be a git command, but we were not\n"
-"able to execute it. Maybe git-%s is broken?"
+#: help.c:26
+msgid "grow, mark and tweak your common history"
msgstr ""
-#: help.c:336
-msgid "Uh oh. Your system reports no Git commands at all."
+#: help.c:27
+msgid "collaborate (see also: git help workflows)"
msgstr ""
-#: help.c:358
-#, c-format
-msgid "WARNING: You called a Git command named '%s', which does not exist."
+#: help.c:31
+msgid "Main Porcelain Commands"
msgstr ""
-#: help.c:363
-#, c-format
-msgid "Continuing under the assumption that you meant '%s'."
+#: help.c:32
+msgid "Ancillary Commands / Manipulators"
msgstr ""
-#: help.c:368
-#, c-format
-msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
+#: help.c:33
+msgid "Ancillary Commands / Interrogators"
msgstr ""
-#: help.c:376
-#, c-format
-msgid "git: '%s' is not a git command. See 'git --help'."
+#: help.c:34
+msgid "Interacting with Others"
msgstr ""
-#: help.c:380
-msgid ""
-"\n"
-"The most similar command is"
-msgid_plural ""
+#: help.c:35
+msgid "Low-level Commands / Manipulators"
+msgstr ""
+
+#: help.c:36
+msgid "Low-level Commands / Interrogators"
+msgstr ""
+
+#: help.c:37
+msgid "Low-level Commands / Synching Repositories"
+msgstr ""
+
+#: help.c:38
+msgid "Low-level Commands / Internal Helpers"
+msgstr ""
+
+#: help.c:293
+#, c-format
+msgid "available git commands in '%s'"
+msgstr ""
+
+#: help.c:300
+msgid "git commands available from elsewhere on your $PATH"
+msgstr ""
+
+#: help.c:309
+msgid "These are common Git commands used in various situations:"
+msgstr ""
+
+#: help.c:358 git.c:90
+#, c-format
+msgid "unsupported command listing type '%s'"
+msgstr ""
+
+#: help.c:405
+msgid "The common Git guides are:"
+msgstr ""
+
+#: help.c:552
+#, c-format
+msgid ""
+"'%s' appears to be a git command, but we were not\n"
+"able to execute it. Maybe git-%s is broken?"
+msgstr ""
+
+#: help.c:611
+msgid "Uh oh. Your system reports no Git commands at all."
+msgstr ""
+
+#: help.c:633
+#, c-format
+msgid "WARNING: You called a Git command named '%s', which does not exist."
+msgstr ""
+
+#: help.c:638
+#, c-format
+msgid "Continuing under the assumption that you meant '%s'."
+msgstr ""
+
+#: help.c:643
+#, c-format
+msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
+msgstr ""
+
+#: help.c:651
+#, c-format
+msgid "git: '%s' is not a git command. See 'git --help'."
+msgstr ""
+
+#: help.c:655
+msgid ""
+"\n"
+"The most similar command is"
+msgid_plural ""
"\n"
"The most similar commands are"
msgstr[0] ""
msgstr[1] ""
-#: help.c:395
+#: help.c:670
msgid "git version [<options>]"
msgstr ""
-#: help.c:456
+#: help.c:738
#, c-format
msgid "%s: %s - %s"
msgstr ""
-#: help.c:460
+#: help.c:742
msgid ""
"\n"
"Did you mean this?"
msgid "name consists only of disallowed characters: %s"
msgstr ""
-#: ident.c:416 builtin/commit.c:612
+#: ident.c:416 builtin/commit.c:600
#, c-format
msgid "invalid date format: %s"
msgstr ""
-#: lockfile.c:152
+#: list-objects-filter-options.c:36
+msgid "multiple filter-specs cannot be combined"
+msgstr ""
+
+#: list-objects-filter-options.c:126
+msgid "cannot change partial clone promisor remote"
+msgstr ""
+
+#: lockfile.c:151
#, c-format
msgid ""
"Unable to create '%s.lock': %s.\n"
"remove the file manually to continue."
msgstr ""
-#: lockfile.c:160
+#: lockfile.c:159
#, c-format
msgid "Unable to create '%s.lock': %s"
msgstr ""
-#: merge.c:41
+#: merge.c:40
msgid "failed to read the cache"
msgstr ""
-#: merge.c:96 builtin/am.c:1980 builtin/am.c:2015 builtin/checkout.c:377
-#: builtin/checkout.c:591 builtin/clone.c:753
+#: merge.c:105 builtin/am.c:1946 builtin/am.c:1980 builtin/checkout.c:380
+#: builtin/checkout.c:608 builtin/clone.c:763
msgid "unable to write new index file"
msgstr ""
-#: merge-recursive.c:210
+#: merge-recursive.c:303
msgid "(bad commit)\n"
msgstr ""
-#: merge-recursive.c:232 merge-recursive.c:240
+#: merge-recursive.c:325
#, c-format
-msgid "addinfo_cache failed for path '%s'"
+msgid "add_cacheinfo failed for path '%s'; merge aborting."
msgstr ""
-#: merge-recursive.c:304
+#: merge-recursive.c:333
+#, c-format
+msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
+msgstr ""
+
+#: merge-recursive.c:415
msgid "error building trees"
msgstr ""
-#: merge-recursive.c:728
+#: merge-recursive.c:886
#, c-format
msgid "failed to create path '%s'%s"
msgstr ""
-#: merge-recursive.c:739
+#: merge-recursive.c:897
#, c-format
msgid "Removing %s to make room for subdirectory\n"
msgstr ""
-#: merge-recursive.c:753 merge-recursive.c:772
+#: merge-recursive.c:911 merge-recursive.c:930
msgid ": perhaps a D/F conflict?"
msgstr ""
-#: merge-recursive.c:762
+#: merge-recursive.c:920
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr ""
-#: merge-recursive.c:804 builtin/cat-file.c:36
+#: merge-recursive.c:962 builtin/cat-file.c:39
#, c-format
msgid "cannot read object %s '%s'"
msgstr ""
-#: merge-recursive.c:806
+#: merge-recursive.c:964
#, c-format
msgid "blob expected for %s '%s'"
msgstr ""
-#: merge-recursive.c:830
+#: merge-recursive.c:988
#, c-format
msgid "failed to open '%s': %s"
msgstr ""
-#: merge-recursive.c:841
+#: merge-recursive.c:999
#, c-format
msgid "failed to symlink '%s': %s"
msgstr ""
-#: merge-recursive.c:846
+#: merge-recursive.c:1004
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr ""
-#: merge-recursive.c:986
+#: merge-recursive.c:1191
+#, c-format
+msgid "Failed to merge submodule %s (not checked out)"
+msgstr ""
+
+#: merge-recursive.c:1198
+#, c-format
+msgid "Failed to merge submodule %s (commits not present)"
+msgstr ""
+
+#: merge-recursive.c:1205
+#, c-format
+msgid "Failed to merge submodule %s (commits don't follow merge-base)"
+msgstr ""
+
+#: merge-recursive.c:1213 merge-recursive.c:1225
+#, c-format
+msgid "Fast-forwarding submodule %s to the following commit:"
+msgstr ""
+
+#: merge-recursive.c:1216 merge-recursive.c:1228
+#, c-format
+msgid "Fast-forwarding submodule %s"
+msgstr ""
+
+#: merge-recursive.c:1250
+#, c-format
+msgid "Failed to merge submodule %s (merge following commits not found)"
+msgstr ""
+
+#: merge-recursive.c:1254
+#, c-format
+msgid "Failed to merge submodule %s (not fast-forward)"
+msgstr ""
+
+#: merge-recursive.c:1255
+msgid "Found a possible merge resolution for the submodule:\n"
+msgstr ""
+
+#: merge-recursive.c:1258
+#, c-format
+msgid ""
+"If this is correct simply add it to the index for example\n"
+"by using:\n"
+"\n"
+" git update-index --cacheinfo 160000 %s \"%s\"\n"
+"\n"
+"which will accept this suggestion.\n"
+msgstr ""
+
+#: merge-recursive.c:1267
+#, c-format
+msgid "Failed to merge submodule %s (multiple merges found)"
+msgstr ""
+
+#: merge-recursive.c:1326
msgid "Failed to execute internal merge"
msgstr ""
-#: merge-recursive.c:990
+#: merge-recursive.c:1331
#, c-format
msgid "Unable to add %s to database"
msgstr ""
-#: merge-recursive.c:1093
+#: merge-recursive.c:1363
+#, c-format
+msgid "Auto-merging %s"
+msgstr ""
+
+#: merge-recursive.c:1434
+#, c-format
+msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
+msgstr ""
+
+#: merge-recursive.c:1501
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
"in tree."
msgstr ""
-#: merge-recursive.c:1098
+#: merge-recursive.c:1506
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
"left in tree."
msgstr ""
-#: merge-recursive.c:1105
+#: merge-recursive.c:1513
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
"in tree at %s."
msgstr ""
-#: merge-recursive.c:1110
+#: merge-recursive.c:1518
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
"left in tree at %s."
msgstr ""
-#: merge-recursive.c:1144
+#: merge-recursive.c:1552
msgid "rename"
msgstr ""
-#: merge-recursive.c:1144
+#: merge-recursive.c:1552
msgid "renamed"
msgstr ""
-#: merge-recursive.c:1201
+#: merge-recursive.c:1606 merge-recursive.c:1762 merge-recursive.c:2394
+#: merge-recursive.c:3129
+#, c-format
+msgid "Refusing to lose dirty file at %s"
+msgstr ""
+
+#: merge-recursive.c:1620
#, c-format
msgid "%s is a directory in %s adding as %s instead"
msgstr ""
-#: merge-recursive.c:1226
+#: merge-recursive.c:1625
+#, c-format
+msgid "Refusing to lose untracked file at %s; adding as %s instead"
+msgstr ""
+
+#: merge-recursive.c:1651
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
"\"->\"%s\" in \"%s\"%s"
msgstr ""
-#: merge-recursive.c:1231
+#: merge-recursive.c:1656
msgid " (left unresolved)"
msgstr ""
-#: merge-recursive.c:1293
+#: merge-recursive.c:1720
#, c-format
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr ""
-#: merge-recursive.c:1326
+#: merge-recursive.c:1759
#, c-format
msgid "Renaming %s to %s and %s to %s instead"
msgstr ""
-#: merge-recursive.c:1529
+#: merge-recursive.c:1771
+#, c-format
+msgid "Refusing to lose untracked file at %s, even though it's in the way."
+msgstr ""
+
+#: merge-recursive.c:1977
+#, c-format
+msgid ""
+"CONFLICT (directory rename split): Unclear where to place %s because "
+"directory %s was renamed to multiple other directories, with no destination "
+"getting a majority of the files."
+msgstr ""
+
+#: merge-recursive.c:2009
+#, c-format
+msgid ""
+"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
+"implicit directory rename(s) putting the following path(s) there: %s."
+msgstr ""
+
+#: merge-recursive.c:2019
+#, c-format
+msgid ""
+"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
+"implicit directory renames tried to put these paths there: %s"
+msgstr ""
+
+#: merge-recursive.c:2111
+#, c-format
+msgid ""
+"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
+">%s in %s"
+msgstr ""
+
+#: merge-recursive.c:2356
+#, c-format
+msgid ""
+"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
+"renamed."
+msgstr ""
+
+#: merge-recursive.c:2762
#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
msgstr ""
-#: merge-recursive.c:1544
+#: merge-recursive.c:2777
#, c-format
msgid "Adding merged %s"
msgstr ""
-#: merge-recursive.c:1551 merge-recursive.c:1781
+#: merge-recursive.c:2784 merge-recursive.c:3132
#, c-format
msgid "Adding as %s instead"
msgstr ""
-#: merge-recursive.c:1608
+#: merge-recursive.c:2941
#, c-format
msgid "cannot read object %s"
msgstr ""
-#: merge-recursive.c:1611
+#: merge-recursive.c:2944
#, c-format
msgid "object %s is not a blob"
msgstr ""
-#: merge-recursive.c:1680
+#: merge-recursive.c:3013
msgid "modify"
msgstr ""
-#: merge-recursive.c:1680
+#: merge-recursive.c:3013
msgid "modified"
msgstr ""
-#: merge-recursive.c:1690
+#: merge-recursive.c:3024
msgid "content"
msgstr ""
-#: merge-recursive.c:1697
+#: merge-recursive.c:3031
msgid "add/add"
msgstr ""
-#: merge-recursive.c:1733
+#: merge-recursive.c:3076
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr ""
-#: merge-recursive.c:1747
-#, c-format
-msgid "Auto-merging %s"
-msgstr ""
-
-#: merge-recursive.c:1751 git-submodule.sh:945
+#: merge-recursive.c:3098 git-submodule.sh:865
msgid "submodule"
msgstr ""
-#: merge-recursive.c:1752
+#: merge-recursive.c:3099
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr ""
-#: merge-recursive.c:1846
+#: merge-recursive.c:3221
#, c-format
msgid "Removing %s"
msgstr ""
-#: merge-recursive.c:1872
+#: merge-recursive.c:3247
msgid "file/directory"
msgstr ""
-#: merge-recursive.c:1878
+#: merge-recursive.c:3253
msgid "directory/file"
msgstr ""
-#: merge-recursive.c:1884
+#: merge-recursive.c:3260
#, c-format
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
msgstr ""
-#: merge-recursive.c:1893
+#: merge-recursive.c:3269
#, c-format
msgid "Adding %s"
msgstr ""
-#: merge-recursive.c:1930
-msgid "Already up-to-date!"
+#: merge-recursive.c:3303
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+" %s"
+msgstr ""
+
+#: merge-recursive.c:3314
+msgid "Already up to date!"
msgstr ""
-#: merge-recursive.c:1939
+#: merge-recursive.c:3323
#, c-format
msgid "merging of trees %s and %s failed"
msgstr ""
-#: merge-recursive.c:2022
+#: merge-recursive.c:3422
msgid "Merging:"
msgstr ""
-#: merge-recursive.c:2035
+#: merge-recursive.c:3435
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] ""
msgstr[1] ""
-#: merge-recursive.c:2074
+#: merge-recursive.c:3474
msgid "merge returned no commit"
msgstr ""
-#: merge-recursive.c:2137
+#: merge-recursive.c:3540
#, c-format
msgid "Could not parse object '%s'"
msgstr ""
-#: merge-recursive.c:2151 builtin/merge.c:646 builtin/merge.c:793
+#: merge-recursive.c:3556 builtin/merge.c:689 builtin/merge.c:846
msgid "Unable to write index."
msgstr ""
-#: notes-merge.c:273
+#: notes-merge.c:274
#, c-format
msgid ""
"You have not concluded your previous notes merge (%s exists).\n"
"commit/abort the previous merge before you start a new notes merge."
msgstr ""
-#: notes-merge.c:280
+#: notes-merge.c:281
#, c-format
msgid "You have not concluded your notes merge (%s exists)."
msgstr ""
-#: notes-utils.c:42
+#: notes-utils.c:45
msgid "Cannot commit uninitialized/unreferenced notes tree"
msgstr ""
-#: notes-utils.c:101
+#: notes-utils.c:104
#, c-format
msgid "Bad notes.rewriteMode value: '%s'"
msgstr ""
-#: notes-utils.c:111
+#: notes-utils.c:114
#, c-format
msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
msgstr ""
#. the environment variable, the second %s is
#. its value.
#.
-#: notes-utils.c:141
+#: notes-utils.c:144
#, c-format
msgid "Bad %s value: '%s'"
msgstr ""
-#: object.c:240
+#: object.c:54
+#, c-format
+msgid "invalid object type \"%s\""
+msgstr ""
+
+#: object.c:173
+#, c-format
+msgid "object %s is a %s, not a %s"
+msgstr ""
+
+#: object.c:233
+#, c-format
+msgid "object %s has unknown type id %d"
+msgstr ""
+
+#: object.c:246
#, c-format
msgid "unable to parse object: %s"
msgstr ""
-#: parse-options.c:573
+#: object.c:266 object.c:277
+#, c-format
+msgid "sha1 mismatch %s"
+msgstr ""
+
+#: packfile.c:563
+msgid "offset before end of packfile (broken .idx?)"
+msgstr ""
+
+#: packfile.c:1745
+#, c-format
+msgid "offset before start of pack index for %s (corrupt index?)"
+msgstr ""
+
+#: packfile.c:1749
+#, c-format
+msgid "offset beyond end of pack index for %s (truncated index?)"
+msgstr ""
+
+#: parse-options.c:672
msgid "..."
msgstr ""
-#: parse-options.c:591
+#: parse-options.c:691
#, c-format
msgid "usage: %s"
msgstr ""
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation.
#.
-#: parse-options.c:597
+#: parse-options.c:697
#, c-format
msgid " or: %s"
msgstr ""
-#: parse-options.c:600
+#: parse-options.c:700
#, c-format
msgid " %s"
msgstr ""
-#: parse-options.c:634
+#: parse-options.c:739
msgid "-NUM"
msgstr ""
-#: parse-options-cb.c:108
+#: parse-options-cb.c:44
+#, c-format
+msgid "malformed expiration date '%s'"
+msgstr ""
+
+#: parse-options-cb.c:112
#, c-format
msgid "malformed object name '%s'"
msgstr ""
-#: path.c:890
+#: path.c:892
#, c-format
msgid "Could not make %s writable by group"
msgstr ""
msgid "%s: pathspec magic not supported by this command: %s"
msgstr ""
-#: pathspec.c:575
-msgid ""
-"empty strings as pathspecs will be made invalid in upcoming releases. please "
-"use . instead if you meant to match all paths"
+#: pathspec.c:592
+#, c-format
+msgid "pathspec '%s' is beyond a symbolic link"
+msgstr ""
+
+#: pkt-line.c:104
+msgid "flush packet write failed"
+msgstr ""
+
+#: pkt-line.c:142 pkt-line.c:228
+msgid "protocol error: impossibly long line"
+msgstr ""
+
+#: pkt-line.c:158 pkt-line.c:160
+msgid "packet write with format failed"
+msgstr ""
+
+#: pkt-line.c:192
+msgid "packet write failed - data exceeds max packet size"
+msgstr ""
+
+#: pkt-line.c:199 pkt-line.c:206
+msgid "packet write failed"
+msgstr ""
+
+#: pkt-line.c:291
+msgid "read error"
+msgstr ""
+
+#: pkt-line.c:299
+msgid "the remote end hung up unexpectedly"
msgstr ""
-#: pathspec.c:599
+#: pkt-line.c:327
#, c-format
-msgid "pathspec '%s' is beyond a symbolic link"
+msgid "protocol error: bad line length character: %.4s"
+msgstr ""
+
+#: pkt-line.c:337 pkt-line.c:342
+#, c-format
+msgid "protocol error: bad line length %d"
msgstr ""
-#: pretty.c:963
+#: pretty.c:962
msgid "unable to parse --pretty format"
msgstr ""
-#: read-cache.c:1443
+#: range-diff.c:48
+msgid "could not start `log`"
+msgstr ""
+
+#: range-diff.c:51
+msgid "could not read `log` output"
+msgstr ""
+
+#: range-diff.c:66 sequencer.c:4540
+#, c-format
+msgid "could not parse commit '%s'"
+msgstr ""
+
+#: range-diff.c:196
+msgid "failed to generate diff"
+msgstr ""
+
+#: range-diff.c:421 range-diff.c:423
+#, c-format
+msgid "could not parse log for '%s'"
+msgstr ""
+
+#: read-cache.c:1579
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
"Using version %i"
msgstr ""
-#: read-cache.c:1453
+#: read-cache.c:1589
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
"Using version %i"
msgstr ""
-#: read-cache.c:2308 builtin/merge.c:1019
+#: read-cache.c:2580 sequencer.c:4503 wrapper.c:658 builtin/merge.c:1083
#, c-format
msgid "could not close '%s'"
msgstr ""
-#: read-cache.c:2383 sequencer.c:1353 sequencer.c:2054
+#: read-cache.c:2653 sequencer.c:2113 sequencer.c:3374
#, c-format
msgid "could not stat '%s'"
msgstr ""
-#: read-cache.c:2396
+#: read-cache.c:2666
#, c-format
msgid "unable to open git dir: %s"
msgstr ""
-#: read-cache.c:2408
+#: read-cache.c:2678
#, c-format
msgid "unable to unlink: %s"
msgstr ""
-#: refs.c:622
+#: refs.c:192
#, c-format
-msgid "Could not open '%s' for writing"
+msgid "%s does not point to a valid object!"
msgstr ""
-#: refs.c:1769
-msgid "ref updates forbidden inside quarantine environment"
+#: refs.c:579
+#, c-format
+msgid "ignoring dangling symref %s"
msgstr ""
-#: refs/files-backend.c:1664
+#: refs.c:581 ref-filter.c:2067
#, c-format
-msgid "could not delete reference %s: %s"
+msgid "ignoring broken ref %s"
msgstr ""
-#: refs/files-backend.c:1667
+#: refs.c:685
#, c-format
-msgid "could not delete references: %s"
+msgid "could not open '%s' for writing: %s"
msgstr ""
-#: refs/files-backend.c:1676
+#: refs.c:695 refs.c:746
#, c-format
-msgid "could not remove reference %s"
+msgid "could not read ref '%s'"
msgstr ""
-#: ref-filter.c:35 wt-status.c:1811
-msgid "gone"
+#: refs.c:701
+#, c-format
+msgid "ref '%s' already exists"
msgstr ""
-#: ref-filter.c:36
+#: refs.c:706
#, c-format
-msgid "ahead %d"
+msgid "unexpected object ID when writing '%s'"
msgstr ""
-#: ref-filter.c:37
+#: refs.c:714 sequencer.c:385 sequencer.c:2366 sequencer.c:2492
+#: sequencer.c:2506 sequencer.c:2733 sequencer.c:4501 sequencer.c:4564
+#: wrapper.c:656
#, c-format
-msgid "behind %d"
+msgid "could not write to '%s'"
msgstr ""
-#: ref-filter.c:38
+#: refs.c:741 sequencer.c:4499 sequencer.c:4558 wrapper.c:225 wrapper.c:395
+#: builtin/am.c:780
#, c-format
-msgid "ahead %d, behind %d"
+msgid "could not open '%s' for writing"
msgstr ""
-#: ref-filter.c:105
+#: refs.c:748
#, c-format
-msgid "expected format: %%(color:<color>)"
+msgid "unexpected object ID when deleting '%s'"
msgstr ""
-#: ref-filter.c:107
+#: refs.c:879
#, c-format
-msgid "unrecognized color: %%(color:%s)"
+msgid "log for ref %s has gap after %s"
msgstr ""
-#: ref-filter.c:121
+#: refs.c:885
#, c-format
-msgid "Integer value expected refname:lstrip=%s"
+msgid "log for ref %s unexpectedly ended on %s"
msgstr ""
-#: ref-filter.c:125
+#: refs.c:943
#, c-format
-msgid "Integer value expected refname:rstrip=%s"
+msgid "log for %s is empty"
msgstr ""
-#: ref-filter.c:127
+#: refs.c:1035
#, c-format
-msgid "unrecognized %%(%s) argument: %s"
+msgid "refusing to update ref with bad name '%s'"
msgstr ""
-#: ref-filter.c:167
+#: refs.c:1111
#, c-format
-msgid "%%(body) does not take arguments"
+msgid "update_ref failed for ref '%s': %s"
msgstr ""
-#: ref-filter.c:174
+#: refs.c:1853
#, c-format
-msgid "%%(subject) does not take arguments"
+msgid "multiple updates for ref '%s' not allowed"
msgstr ""
-#: ref-filter.c:181
-#, c-format
-msgid "%%(trailers) does not take arguments"
+#: refs.c:1885
+msgid "ref updates forbidden inside quarantine environment"
msgstr ""
-#: ref-filter.c:200
+#: refs.c:1981 refs.c:2011
#, c-format
-msgid "positive value expected contents:lines=%s"
+msgid "'%s' exists; cannot create '%s'"
msgstr ""
-#: ref-filter.c:202
+#: refs.c:1987 refs.c:2022
#, c-format
-msgid "unrecognized %%(contents) argument: %s"
+msgid "cannot process '%s' and '%s' at the same time"
msgstr ""
-#: ref-filter.c:215
+#: refs/files-backend.c:1191
#, c-format
-msgid "positive value expected objectname:short=%s"
+msgid "could not remove reference %s"
msgstr ""
-#: ref-filter.c:219
+#: refs/files-backend.c:1205 refs/packed-backend.c:1532
+#: refs/packed-backend.c:1542
#, c-format
-msgid "unrecognized %%(objectname) argument: %s"
+msgid "could not delete reference %s: %s"
msgstr ""
-#: ref-filter.c:246
+#: refs/files-backend.c:1208 refs/packed-backend.c:1545
#, c-format
-msgid "expected format: %%(align:<width>,<position>)"
+msgid "could not delete references: %s"
msgstr ""
-#: ref-filter.c:258
+#: refspec.c:137
#, c-format
-msgid "unrecognized position:%s"
+msgid "invalid refspec '%s'"
msgstr ""
-#: ref-filter.c:262
-#, c-format
-msgid "unrecognized width:%s"
+#: ref-filter.c:38 wt-status.c:1850
+msgid "gone"
msgstr ""
-#: ref-filter.c:268
+#: ref-filter.c:39
#, c-format
-msgid "unrecognized %%(align) argument: %s"
+msgid "ahead %d"
msgstr ""
-#: ref-filter.c:272
+#: ref-filter.c:40
#, c-format
-msgid "positive width expected with the %%(align) atom"
+msgid "behind %d"
msgstr ""
-#: ref-filter.c:287
+#: ref-filter.c:41
#, c-format
-msgid "unrecognized %%(if) argument: %s"
+msgid "ahead %d, behind %d"
msgstr ""
-#: ref-filter.c:378
+#: ref-filter.c:137
#, c-format
-msgid "malformed field name: %.*s"
+msgid "expected format: %%(color:<color>)"
msgstr ""
-#: ref-filter.c:404
+#: ref-filter.c:139
#, c-format
-msgid "unknown field name: %.*s"
+msgid "unrecognized color: %%(color:%s)"
msgstr ""
-#: ref-filter.c:508
+#: ref-filter.c:161
#, c-format
-msgid "format: %%(if) atom used without a %%(then) atom"
+msgid "Integer value expected refname:lstrip=%s"
msgstr ""
-#: ref-filter.c:568
+#: ref-filter.c:165
#, c-format
-msgid "format: %%(then) atom used without an %%(if) atom"
+msgid "Integer value expected refname:rstrip=%s"
msgstr ""
-#: ref-filter.c:570
+#: ref-filter.c:167
#, c-format
-msgid "format: %%(then) atom used more than once"
+msgid "unrecognized %%(%s) argument: %s"
msgstr ""
-#: ref-filter.c:572
+#: ref-filter.c:222
#, c-format
-msgid "format: %%(then) atom used after %%(else)"
+msgid "%%(objecttype) does not take arguments"
msgstr ""
-#: ref-filter.c:598
+#: ref-filter.c:234
#, c-format
-msgid "format: %%(else) atom used without an %%(if) atom"
+msgid "%%(objectsize) does not take arguments"
msgstr ""
-#: ref-filter.c:600
+#: ref-filter.c:246
#, c-format
-msgid "format: %%(else) atom used without a %%(then) atom"
+msgid "%%(body) does not take arguments"
msgstr ""
-#: ref-filter.c:602
+#: ref-filter.c:255
+#, c-format
+msgid "%%(subject) does not take arguments"
+msgstr ""
+
+#: ref-filter.c:275
+#, c-format
+msgid "unknown %%(trailers) argument: %s"
+msgstr ""
+
+#: ref-filter.c:304
+#, c-format
+msgid "positive value expected contents:lines=%s"
+msgstr ""
+
+#: ref-filter.c:306
+#, c-format
+msgid "unrecognized %%(contents) argument: %s"
+msgstr ""
+
+#: ref-filter.c:321
+#, c-format
+msgid "positive value expected objectname:short=%s"
+msgstr ""
+
+#: ref-filter.c:325
+#, c-format
+msgid "unrecognized %%(objectname) argument: %s"
+msgstr ""
+
+#: ref-filter.c:355
+#, c-format
+msgid "expected format: %%(align:<width>,<position>)"
+msgstr ""
+
+#: ref-filter.c:367
+#, c-format
+msgid "unrecognized position:%s"
+msgstr ""
+
+#: ref-filter.c:374
+#, c-format
+msgid "unrecognized width:%s"
+msgstr ""
+
+#: ref-filter.c:383
+#, c-format
+msgid "unrecognized %%(align) argument: %s"
+msgstr ""
+
+#: ref-filter.c:391
+#, c-format
+msgid "positive width expected with the %%(align) atom"
+msgstr ""
+
+#: ref-filter.c:409
+#, c-format
+msgid "unrecognized %%(if) argument: %s"
+msgstr ""
+
+#: ref-filter.c:505
+#, c-format
+msgid "malformed field name: %.*s"
+msgstr ""
+
+#: ref-filter.c:532
+#, c-format
+msgid "unknown field name: %.*s"
+msgstr ""
+
+#: ref-filter.c:656
+#, c-format
+msgid "format: %%(if) atom used without a %%(then) atom"
+msgstr ""
+
+#: ref-filter.c:719
+#, c-format
+msgid "format: %%(then) atom used without an %%(if) atom"
+msgstr ""
+
+#: ref-filter.c:721
+#, c-format
+msgid "format: %%(then) atom used more than once"
+msgstr ""
+
+#: ref-filter.c:723
+#, c-format
+msgid "format: %%(then) atom used after %%(else)"
+msgstr ""
+
+#: ref-filter.c:751
+#, c-format
+msgid "format: %%(else) atom used without an %%(if) atom"
+msgstr ""
+
+#: ref-filter.c:753
+#, c-format
+msgid "format: %%(else) atom used without a %%(then) atom"
+msgstr ""
+
+#: ref-filter.c:755
#, c-format
msgid "format: %%(else) atom used more than once"
msgstr ""
-#: ref-filter.c:615
+#: ref-filter.c:770
#, c-format
msgid "format: %%(end) atom used without corresponding atom"
msgstr ""
-#: ref-filter.c:670
+#: ref-filter.c:827
#, c-format
msgid "malformed format string %s"
msgstr ""
-#: ref-filter.c:1254
+#: ref-filter.c:1416
#, c-format
msgid "(no branch, rebasing %s)"
msgstr ""
-#: ref-filter.c:1257
+#: ref-filter.c:1419
+#, c-format
+msgid "(no branch, rebasing detached HEAD %s)"
+msgstr ""
+
+#: ref-filter.c:1422
#, c-format
msgid "(no branch, bisect started on %s)"
msgstr ""
#. TRANSLATORS: make sure this matches "HEAD
#. detached at " in wt-status.c
#.
-#: ref-filter.c:1265
+#: ref-filter.c:1430
#, c-format
msgid "(HEAD detached at %s)"
msgstr ""
#. TRANSLATORS: make sure this matches "HEAD
#. detached from " in wt-status.c
#.
-#: ref-filter.c:1272
+#: ref-filter.c:1437
#, c-format
msgid "(HEAD detached from %s)"
msgstr ""
-#: ref-filter.c:1276
+#: ref-filter.c:1441
msgid "(no branch)"
msgstr ""
-#: ref-filter.c:1426 ref-filter.c:1457
+#: ref-filter.c:1475 ref-filter.c:1623
#, c-format
msgid "missing object %s for %s"
msgstr ""
-#: ref-filter.c:1429 ref-filter.c:1460
+#: ref-filter.c:1483
#, c-format
msgid "parse_object_buffer failed on %s for %s"
msgstr ""
-#: ref-filter.c:1760
+#: ref-filter.c:1980
#, c-format
msgid "malformed object at '%s'"
msgstr ""
-#: ref-filter.c:1827
+#: ref-filter.c:2062
#, c-format
msgid "ignoring ref with broken name %s"
msgstr ""
-#: ref-filter.c:1832
-#, c-format
-msgid "ignoring broken ref %s"
-msgstr ""
-
-#: ref-filter.c:2095
+#: ref-filter.c:2340
#, c-format
msgid "format: %%(end) atom missing"
msgstr ""
-#: ref-filter.c:2176
+#: ref-filter.c:2444
#, c-format
msgid "malformed object name %s"
msgstr ""
-#: remote.c:747
+#: remote.c:606
#, c-format
msgid "Cannot fetch both %s and %s to %s"
msgstr ""
-#: remote.c:751
+#: remote.c:610
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr ""
-#: remote.c:755
+#: remote.c:614
#, c-format
msgid "%s tracks both %s and %s"
msgstr ""
-#: remote.c:763
+#: remote.c:622
msgid "Internal error"
msgstr ""
-#: remote.c:1680 remote.c:1782
+#: remote.c:1536 remote.c:1637
msgid "HEAD does not point to a branch"
msgstr ""
-#: remote.c:1689
+#: remote.c:1545
#, c-format
msgid "no such branch: '%s'"
msgstr ""
-#: remote.c:1692
+#: remote.c:1548
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr ""
-#: remote.c:1698
+#: remote.c:1554
#, c-format
msgid "upstream branch '%s' not stored as a remote-tracking branch"
msgstr ""
-#: remote.c:1713
+#: remote.c:1569
#, c-format
msgid "push destination '%s' on remote '%s' has no local tracking branch"
msgstr ""
-#: remote.c:1725
+#: remote.c:1581
#, c-format
msgid "branch '%s' has no remote for pushing"
msgstr ""
-#: remote.c:1736
+#: remote.c:1591
#, c-format
msgid "push refspecs for '%s' do not include '%s'"
msgstr ""
-#: remote.c:1749
+#: remote.c:1604
msgid "push has no destination (push.default is 'nothing')"
msgstr ""
-#: remote.c:1771
+#: remote.c:1626
msgid "cannot resolve 'simple' push to a single destination"
msgstr ""
-#: remote.c:2076
+#: remote.c:1951
#, c-format
msgid "Your branch is based on '%s', but the upstream is gone.\n"
msgstr ""
-#: remote.c:2080
+#: remote.c:1955
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr ""
-#: remote.c:2083
+#: remote.c:1958
+#, c-format
+msgid "Your branch is up to date with '%s'.\n"
+msgstr ""
+
+#: remote.c:1962
+#, c-format
+msgid "Your branch and '%s' refer to different commits.\n"
+msgstr ""
+
+#: remote.c:1965
#, c-format
-msgid "Your branch is up-to-date with '%s'.\n"
+msgid " (use \"%s\" for details)\n"
msgstr ""
-#: remote.c:2087
+#: remote.c:1969
#, 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:2093
+#: remote.c:1975
msgid " (use \"git push\" to publish your local commits)\n"
msgstr ""
-#: remote.c:2096
+#: remote.c:1978
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: remote.c:2104
+#: remote.c:1986
msgid " (use \"git pull\" to update your local branch)\n"
msgstr ""
-#: remote.c:2107
+#: remote.c:1989
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
msgstr[0] ""
msgstr[1] ""
-#: remote.c:2117
+#: remote.c:1999
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr ""
-#: revision.c:2187
+#: replace-object.c:20
+#, c-format
+msgid "bad replace ref name: %s"
+msgstr ""
+
+#: replace-object.c:29
+#, c-format
+msgid "duplicate replace ref: %s"
+msgstr ""
+
+#: replace-object.c:72
+#, c-format
+msgid "replace depth too high for object %s"
+msgstr ""
+
+#: revision.c:2305
msgid "your current branch appears to be broken"
msgstr ""
-#: revision.c:2190
+#: revision.c:2308
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr ""
-#: revision.c:2384
+#: revision.c:2505
msgid "--first-parent is incompatible with --bisect"
msgstr ""
-#: run-command.c:644
+#: run-command.c:728
msgid "open /dev/null failed"
msgstr ""
-#: send-pack.c:151
+#: run-command.c:1271
+#, c-format
+msgid ""
+"The '%s' hook was ignored because it's not set as executable.\n"
+"You can disable this warning with `git config advice.ignoredHook false`."
+msgstr ""
+
+#: send-pack.c:142
+msgid "unexpected flush packet while reading remote unpack status"
+msgstr ""
+
+#: send-pack.c:144
#, c-format
msgid "unable to parse remote unpack status: %s"
msgstr ""
-#: send-pack.c:153
+#: send-pack.c:146
#, c-format
msgid "remote unpack failed: %s"
msgstr ""
-#: send-pack.c:316
+#: send-pack.c:309
msgid "failed to sign the push certificate"
msgstr ""
-#: send-pack.c:429
+#: send-pack.c:422
msgid "the receiving end does not support --signed push"
msgstr ""
-#: send-pack.c:431
+#: send-pack.c:424
msgid ""
"not sending a push certificate since the receiving end does not support --"
"signed push"
msgstr ""
-#: send-pack.c:443
+#: send-pack.c:436
msgid "the receiving end does not support --atomic push"
msgstr ""
-#: send-pack.c:448
+#: send-pack.c:441
msgid "the receiving end does not support push options"
msgstr ""
-#: sequencer.c:216
+#: sequencer.c:177
+#, c-format
+msgid "invalid commit message cleanup mode '%s'"
+msgstr ""
+
+#: sequencer.c:278
+#, c-format
+msgid "could not delete '%s'"
+msgstr ""
+
+#: sequencer.c:304
msgid "revert"
msgstr ""
-#: sequencer.c:218
+#: sequencer.c:306
msgid "cherry-pick"
msgstr ""
-#: sequencer.c:220
+#: sequencer.c:308
msgid "rebase -i"
msgstr ""
-#: sequencer.c:222
+#: sequencer.c:310
#, c-format
-msgid "Unknown action: %d"
+msgid "unknown action: %d"
msgstr ""
-#: sequencer.c:279
+#: sequencer.c:367
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
msgstr ""
-#: sequencer.c:282
+#: sequencer.c:370
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'\n"
"and commit the result with 'git commit'"
msgstr ""
-#: sequencer.c:295 sequencer.c:1685
+#: sequencer.c:383 sequencer.c:2488
#, c-format
msgid "could not lock '%s'"
msgstr ""
-#: sequencer.c:298 sequencer.c:1563 sequencer.c:1690 sequencer.c:1704
-#, c-format
-msgid "could not write to '%s'"
-msgstr ""
-
-#: sequencer.c:302
+#: sequencer.c:390
#, c-format
msgid "could not write eol to '%s'"
msgstr ""
-#: sequencer.c:306 sequencer.c:1568 sequencer.c:1692
+#: sequencer.c:395 sequencer.c:2371 sequencer.c:2494 sequencer.c:2508
+#: sequencer.c:2741
#, c-format
-msgid "failed to finalize '%s'."
+msgid "failed to finalize '%s'"
msgstr ""
-#: sequencer.c:330 sequencer.c:817 sequencer.c:1589 builtin/am.c:258
-#: builtin/commit.c:750 builtin/merge.c:1017
+#: sequencer.c:418 sequencer.c:816 sequencer.c:1505 sequencer.c:2391
+#: sequencer.c:2723 sequencer.c:2827 builtin/am.c:260 builtin/commit.c:740
+#: builtin/merge.c:1081
#, c-format
msgid "could not read '%s'"
msgstr ""
-#: sequencer.c:356
+#: sequencer.c:444
#, c-format
msgid "your local changes would be overwritten by %s."
msgstr ""
-#: sequencer.c:360
+#: sequencer.c:448
msgid "commit your changes or stash them to proceed."
msgstr ""
-#: sequencer.c:389
+#: sequencer.c:477
#, c-format
msgid "%s: fast-forward"
msgstr ""
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
#. "rebase -i".
#.
-#: sequencer.c:472
+#: sequencer.c:566
#, c-format
msgid "%s: Unable to write new index file"
msgstr ""
-#: sequencer.c:491
-msgid "could not resolve HEAD commit\n"
+#: sequencer.c:582
+msgid "unable to update cache tree"
msgstr ""
-#: sequencer.c:511
-msgid "unable to update cache tree\n"
+#: sequencer.c:595
+msgid "could not resolve HEAD commit"
msgstr ""
-#: sequencer.c:595
+#: sequencer.c:723 sequencer.c:740
+#, c-format
+msgid "could not parse '%s' (looking for '%s')"
+msgstr ""
+
+#: sequencer.c:731
+#, c-format
+msgid "bad quoting on %s value in '%s'"
+msgstr ""
+
+#: sequencer.c:747
+#, c-format
+msgid "invalid date format '%s' in '%s'"
+msgstr ""
+
+#: sequencer.c:761
#, c-format
msgid ""
"you have staged changes in your working tree\n"
" git rebase --continue\n"
msgstr ""
-#: sequencer.c:697
-#, c-format
-msgid "could not parse commit %s\n"
+#: sequencer.c:830
+msgid "writing root commit"
msgstr ""
-#: sequencer.c:702
-#, c-format
-msgid "could not parse parent commit %s\n"
+#: sequencer.c:1055
+msgid "'prepare-commit-msg' hook failed"
msgstr ""
-#: sequencer.c:824
-#, c-format
+#: sequencer.c:1062
msgid ""
-"unexpected 1st line of squash message:\n"
+"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"
-"\t%.*s"
+" git commit --amend --reset-author\n"
msgstr ""
-#: sequencer.c:830
-#, c-format
+#: sequencer.c:1075
msgid ""
-"invalid 1st line of squash message:\n"
+"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"
-"\t%.*s"
+" git commit --amend --reset-author\n"
+msgstr ""
+
+#: sequencer.c:1115
+msgid "couldn't look up newly created commit"
+msgstr ""
+
+#: sequencer.c:1117
+msgid "could not parse newly created commit"
+msgstr ""
+
+#: sequencer.c:1163
+msgid "unable to resolve HEAD after creating commit"
+msgstr ""
+
+#: sequencer.c:1165
+msgid "detached HEAD"
+msgstr ""
+
+#: sequencer.c:1169
+msgid " (root-commit)"
+msgstr ""
+
+#: sequencer.c:1190
+msgid "could not parse HEAD"
+msgstr ""
+
+#: sequencer.c:1192
+#, c-format
+msgid "HEAD %s is not a commit!"
+msgstr ""
+
+#: sequencer.c:1196 builtin/commit.c:1528
+msgid "could not parse HEAD commit"
+msgstr ""
+
+#: sequencer.c:1247 sequencer.c:1845
+msgid "unable to parse commit author"
+msgstr ""
+
+#: sequencer.c:1257 builtin/am.c:1632 builtin/merge.c:675
+msgid "git write-tree failed to write a tree"
+msgstr ""
+
+#: sequencer.c:1274 sequencer.c:1329
+#, c-format
+msgid "unable to read commit message from '%s'"
+msgstr ""
+
+#: sequencer.c:1296 builtin/am.c:1653 builtin/commit.c:1631 builtin/merge.c:855
+#: builtin/merge.c:880
+msgid "failed to write commit object"
+msgstr ""
+
+#: sequencer.c:1356
+#, c-format
+msgid "could not parse commit %s"
+msgstr ""
+
+#: sequencer.c:1361
+#, c-format
+msgid "could not parse parent commit %s"
+msgstr ""
+
+#: sequencer.c:1457 sequencer.c:1565
+#, c-format
+msgid "unknown command: %d"
msgstr ""
-#: sequencer.c:836 sequencer.c:861
+#: sequencer.c:1512 sequencer.c:1537
#, c-format
msgid "This is a combination of %d commits."
msgstr ""
-#: sequencer.c:845
+#: sequencer.c:1522 sequencer.c:4520
msgid "need a HEAD to fixup"
msgstr ""
-#: sequencer.c:847
+#: sequencer.c:1524 sequencer.c:2768
msgid "could not read HEAD"
msgstr ""
-#: sequencer.c:849
+#: sequencer.c:1526
msgid "could not read HEAD's commit message"
msgstr ""
-#: sequencer.c:855
+#: sequencer.c:1532
#, c-format
msgid "cannot write '%s'"
msgstr ""
-#: sequencer.c:864 git-rebase--interactive.sh:445
+#: sequencer.c:1539 git-rebase--preserve-merges.sh:441
msgid "This is the 1st commit message:"
msgstr ""
-#: sequencer.c:872
+#: sequencer.c:1547
#, c-format
msgid "could not read commit message of %s"
msgstr ""
-#: sequencer.c:879
+#: sequencer.c:1554
#, c-format
msgid "This is the commit message #%d:"
msgstr ""
-#: sequencer.c:884
+#: sequencer.c:1560
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr ""
-#: sequencer.c:889
-#, c-format
-msgid "unknown command: %d"
+#: sequencer.c:1643
+msgid "your index file is unmerged."
msgstr ""
-#: sequencer.c:955
-msgid "your index file is unmerged."
+#: sequencer.c:1650
+msgid "cannot fixup root commit"
msgstr ""
-#: sequencer.c:973
+#: sequencer.c:1669
#, c-format
msgid "commit %s is a merge but no -m option was given."
msgstr ""
-#: sequencer.c:981
+#: sequencer.c:1677
#, c-format
msgid "commit %s does not have parent %d"
msgstr ""
-#: sequencer.c:985
+#: sequencer.c:1681
#, c-format
msgid "mainline was specified but commit %s is not a merge."
msgstr ""
-#: sequencer.c:991
+#: sequencer.c:1687
#, c-format
msgid "cannot get commit message for %s"
msgstr ""
#. TRANSLATORS: The first %s will be a "todo" command like
#. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:1012
+#: sequencer.c:1706
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr ""
-#: sequencer.c:1075 sequencer.c:1830
+#: sequencer.c:1771
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr ""
-#: sequencer.c:1126
+#: sequencer.c:1826
#, c-format
msgid "could not revert %s... %s"
msgstr ""
-#: sequencer.c:1127
+#: sequencer.c:1827
#, c-format
msgid "could not apply %s... %s"
msgstr ""
-#: sequencer.c:1169
-msgid "empty commit set passed"
-msgstr ""
-
-#: sequencer.c:1179
+#: sequencer.c:1885
#, c-format
msgid "git %s: failed to read the index"
msgstr ""
-#: sequencer.c:1186
+#: sequencer.c:1892
#, c-format
msgid "git %s: failed to refresh the index"
msgstr ""
-#: sequencer.c:1306
+#: sequencer.c:1972
+#, c-format
+msgid "%s does not accept arguments: '%s'"
+msgstr ""
+
+#: sequencer.c:1981
+#, c-format
+msgid "missing arguments for %s"
+msgstr ""
+
+#: sequencer.c:2040
#, c-format
msgid "invalid line %d: %.*s"
msgstr ""
-#: sequencer.c:1314
+#: sequencer.c:2048
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr ""
-#: sequencer.c:1347
+#: sequencer.c:2096 sequencer.c:4277 sequencer.c:4333
#, c-format
msgid "could not read '%s'."
msgstr ""
-#: sequencer.c:1359
+#: sequencer.c:2119
msgid "please fix this using 'git rebase --edit-todo'."
msgstr ""
-#: sequencer.c:1361
+#: sequencer.c:2121
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr ""
-#: sequencer.c:1366
+#: sequencer.c:2126
msgid "no commits parsed."
msgstr ""
-#: sequencer.c:1377
+#: sequencer.c:2137
msgid "cannot cherry-pick during a revert."
msgstr ""
-#: sequencer.c:1379
+#: sequencer.c:2139
msgid "cannot revert during a cherry-pick."
msgstr ""
-#: sequencer.c:1442
+#: sequencer.c:2209
#, c-format
-msgid "invalid key: %s"
+msgid "invalid value for %s: %s"
msgstr ""
-#: sequencer.c:1445
-#, c-format
-msgid "invalid value for %s: %s"
+#: sequencer.c:2285
+msgid "unusable squash-onto"
msgstr ""
-#: sequencer.c:1502
+#: sequencer.c:2301
#, c-format
msgid "malformed options sheet: '%s'"
msgstr ""
-#: sequencer.c:1540
+#: sequencer.c:2335 sequencer.c:3775
+msgid "empty commit set passed"
+msgstr ""
+
+#: sequencer.c:2343
msgid "a cherry-pick or revert is already in progress"
msgstr ""
-#: sequencer.c:1541
+#: sequencer.c:2344
msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
msgstr ""
-#: sequencer.c:1544
+#: sequencer.c:2347
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr ""
-#: sequencer.c:1558
+#: sequencer.c:2361
msgid "could not lock HEAD"
msgstr ""
-#: sequencer.c:1614 sequencer.c:2188
+#: sequencer.c:2416 sequencer.c:3543
msgid "no cherry-pick or revert in progress"
msgstr ""
-#: sequencer.c:1616
+#: sequencer.c:2418
msgid "cannot resolve HEAD"
msgstr ""
-#: sequencer.c:1618 sequencer.c:1652
+#: sequencer.c:2420 sequencer.c:2455
msgid "cannot abort from a branch yet to be born"
msgstr ""
-#: sequencer.c:1638 builtin/grep.c:929
+#: sequencer.c:2441 builtin/grep.c:721
#, c-format
msgid "cannot open '%s'"
msgstr ""
-#: sequencer.c:1640
+#: sequencer.c:2443
#, c-format
msgid "cannot read '%s': %s"
msgstr ""
-#: sequencer.c:1641
+#: sequencer.c:2444
msgid "unexpected end of file"
msgstr ""
-#: sequencer.c:1647
+#: sequencer.c:2450
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr ""
-#: sequencer.c:1658
+#: sequencer.c:2461
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr ""
-#: sequencer.c:1795 sequencer.c:2086
+#: sequencer.c:2565 sequencer.c:3461
+#, c-format
+msgid "could not update %s"
+msgstr ""
+
+#: sequencer.c:2603 sequencer.c:3441
msgid "cannot read HEAD"
msgstr ""
-#: sequencer.c:1835 builtin/difftool.c:633
+#: sequencer.c:2618
+#, c-format
+msgid "unable to copy '%s' to '%s'"
+msgstr ""
+
+#: sequencer.c:2626
+#, c-format
+msgid ""
+"You can amend the commit now, with\n"
+"\n"
+" git commit --amend %s\n"
+"\n"
+"Once you are satisfied with your changes, run\n"
+"\n"
+" git rebase --continue\n"
+msgstr ""
+
+#: sequencer.c:2636
+#, c-format
+msgid "Could not apply %s... %.*s"
+msgstr ""
+
+#: sequencer.c:2643
+#, c-format
+msgid "Could not merge %.*s"
+msgstr ""
+
+#: sequencer.c:2654 sequencer.c:2658 builtin/difftool.c:640
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr ""
-#: sequencer.c:1851
+#: sequencer.c:2680 sequencer.c:3095
msgid "could not read index"
msgstr ""
-#: sequencer.c:1856
+#: sequencer.c:2685
#, c-format
msgid ""
"execution failed: %s\n"
"\n"
msgstr ""
-#: sequencer.c:1862
+#: sequencer.c:2691
msgid "and made changes to the index and/or the working tree\n"
msgstr ""
-#: sequencer.c:1868
+#: sequencer.c:2697
#, c-format
msgid ""
"execution succeeded: %s\n"
"\n"
msgstr ""
-#: sequencer.c:1925
+#: sequencer.c:2758
#, c-format
-msgid "Applied autostash.\n"
+msgid "illegal label name: '%.*s'"
msgstr ""
-#: sequencer.c:1937
-#, c-format
-msgid "cannot store %s"
+#: sequencer.c:2810
+msgid "writing fake root commit"
msgstr ""
-#: sequencer.c:1940 git-rebase.sh:173
-#, 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"
+#: sequencer.c:2815
+msgid "writing squash-onto"
msgstr ""
-#: sequencer.c:2022
+#: sequencer.c:2850
#, c-format
-msgid "Stopped at %s... %.*s\n"
+msgid "failed to find tree of %s"
+msgstr ""
+
+#: sequencer.c:2868
+msgid "could not write index"
msgstr ""
-#: sequencer.c:2064
+#: sequencer.c:2895
#, c-format
-msgid "unknown command %d"
+msgid "could not resolve '%s'"
msgstr ""
-#: sequencer.c:2094
-msgid "could not read orig-head"
+#: sequencer.c:2921
+msgid "cannot merge without a current revision"
msgstr ""
-#: sequencer.c:2099
-msgid "could not read 'onto'"
+#: sequencer.c:2943
+#, c-format
+msgid "unable to parse '%.*s'"
msgstr ""
-#: sequencer.c:2106
+#: sequencer.c:2952
#, c-format
-msgid "could not update %s"
+msgid "nothing to merge: '%.*s'"
msgstr ""
-#: sequencer.c:2113
+#: sequencer.c:2964
+msgid "octopus merge cannot be executed on top of a [new root]"
+msgstr ""
+
+#: sequencer.c:2979
#, c-format
-msgid "could not update HEAD to %s"
+msgid "could not get commit message of '%s'"
msgstr ""
-#: sequencer.c:2197
-msgid "cannot rebase: You have unstaged changes."
+#: sequencer.c:2989 sequencer.c:3015
+#, c-format
+msgid "could not write '%s'"
msgstr ""
-#: sequencer.c:2202
-msgid "could not remove CHERRY_PICK_HEAD"
+#: sequencer.c:3127
+#, c-format
+msgid "could not even attempt to merge '%.*s'"
+msgstr ""
+
+#: sequencer.c:3143
+msgid "merge: Unable to write new index file"
+msgstr ""
+
+#: sequencer.c:3211
+#, c-format
+msgid "Applied autostash.\n"
+msgstr ""
+
+#: sequencer.c:3223
+#, c-format
+msgid "cannot store %s"
+msgstr ""
+
+#: sequencer.c:3226 git-rebase.sh:188
+#, 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 ""
+
+#: sequencer.c:3257
+#, c-format
+msgid ""
+"Could not execute the todo command\n"
+"\n"
+" %.*s\n"
+"It has been rescheduled; To edit the command before continuing, please\n"
+"edit the todo list first:\n"
+"\n"
+" git rebase --edit-todo\n"
+" git rebase --continue\n"
+msgstr ""
+
+#: sequencer.c:3325
+#, c-format
+msgid "Stopped at %s... %.*s\n"
+msgstr ""
+
+#: sequencer.c:3404
+#, c-format
+msgid "unknown command %d"
+msgstr ""
+
+#: sequencer.c:3449
+msgid "could not read orig-head"
+msgstr ""
+
+#: sequencer.c:3454 sequencer.c:4517
+msgid "could not read 'onto'"
+msgstr ""
+
+#: sequencer.c:3468
+#, c-format
+msgid "could not update HEAD to %s"
+msgstr ""
+
+#: sequencer.c:3554
+msgid "cannot rebase: You have unstaged changes."
msgstr ""
-#: sequencer.c:2211
+#: sequencer.c:3563
msgid "cannot amend non-existing commit"
msgstr ""
-#: sequencer.c:2213
+#: sequencer.c:3565
#, c-format
msgid "invalid file: '%s'"
msgstr ""
-#: sequencer.c:2215
+#: sequencer.c:3567
#, c-format
msgid "invalid contents: '%s'"
msgstr ""
-#: sequencer.c:2218
+#: sequencer.c:3570
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
"first and then run 'git rebase --continue' again."
msgstr ""
-#: sequencer.c:2228
+#: sequencer.c:3595 sequencer.c:3633
+#, c-format
+msgid "could not write file: '%s'"
+msgstr ""
+
+#: sequencer.c:3648
+msgid "could not remove CHERRY_PICK_HEAD"
+msgstr ""
+
+#: sequencer.c:3655
msgid "could not commit staged changes."
msgstr ""
-#: sequencer.c:2308
+#: sequencer.c:3752
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr ""
-#: sequencer.c:2312
+#: sequencer.c:3756
#, c-format
msgid "%s: bad revision"
msgstr ""
-#: sequencer.c:2345
+#: sequencer.c:3791
msgid "can't revert as initial commit"
msgstr ""
-#: setup.c:171
+#: sequencer.c:4238
+msgid "make_script: unhandled options"
+msgstr ""
+
+#: sequencer.c:4241
+msgid "make_script: error preparing revisions"
+msgstr ""
+
+#: sequencer.c:4281 sequencer.c:4337
+#, c-format
+msgid "unusable todo list: '%s'"
+msgstr ""
+
+#: sequencer.c:4396
+#, c-format
+msgid ""
+"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
+msgstr ""
+
+#: sequencer.c:4466
+#, c-format
+msgid ""
+"Warning: some commits may have been dropped accidentally.\n"
+"Dropped commits (newer to older):\n"
+msgstr ""
+
+#: sequencer.c:4473
+#, c-format
+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.\n"
+"\n"
+msgstr ""
+
+#: sequencer.c:4486
+#, c-format
+msgid ""
+"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
+"continue'.\n"
+"Or you can abort the rebase with 'git rebase --abort'.\n"
+msgstr ""
+
+#: sequencer.c:4660
+msgid "the script was already rearranged."
+msgstr ""
+
+#: setup.c:123
+#, c-format
+msgid "'%s' is outside repository"
+msgstr ""
+
+#: setup.c:172
#, 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 ""
-#: setup.c:184
+#: setup.c:185
#, c-format
msgid ""
"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
"'git <command> [<revision>...] -- [<file>...]'"
msgstr ""
-#: setup.c:252
+#: setup.c:234
+#, c-format
+msgid "option '%s' must come before non-option arguments"
+msgstr ""
+
+#: setup.c:253
#, c-format
msgid ""
"ambiguous argument '%s': both revision and filename\n"
"'git <command> [<revision>...] -- [<file>...]'"
msgstr ""
-#: setup.c:504
+#: setup.c:389
+msgid "unable to set up work tree using invalid config"
+msgstr ""
+
+#: setup.c:393
+msgid "this operation must be run in a work tree"
+msgstr ""
+
+#: setup.c:503
#, c-format
msgid "Expected git repo version <= %d, found %d"
msgstr ""
-#: setup.c:512
+#: setup.c:511
msgid "unknown repository extensions found:"
msgstr ""
-#: setup.c:810
+#: setup.c:530
#, c-format
-msgid "Not a git repository (or any of the parent directories): %s"
+msgid "error opening '%s'"
msgstr ""
-#: setup.c:812 builtin/index-pack.c:1652
-msgid "Cannot come back to cwd"
+#: setup.c:532
+#, c-format
+msgid "too large to be a .git file: '%s'"
msgstr ""
-#: setup.c:1050
-msgid "Unable to read current working directory"
+#: setup.c:534
+#, c-format
+msgid "error reading %s"
msgstr ""
-#: setup.c:1062 setup.c:1068
+#: setup.c:536
#, c-format
-msgid "Cannot change to '%s'"
+msgid "invalid gitfile format: %s"
msgstr ""
-#: setup.c:1081
+#: setup.c:538
#, 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 "no path in gitfile: %s"
msgstr ""
-#: setup.c:1173
+#: setup.c:540
#, c-format
-msgid ""
-"Problem with core.sharedRepository filemode value (0%.3o).\n"
-"The owner of files must always have read and write permissions."
+msgid "not a git repository: %s"
msgstr ""
-#: sha1_file.c:560
+#: setup.c:639
#, c-format
-msgid "path '%s' does not exist"
+msgid "'$%s' too big"
msgstr ""
-#: sha1_file.c:586
+#: setup.c:653
#, c-format
-msgid "reference repository '%s' as a linked checkout is not supported yet."
+msgid "not a git repository: '%s'"
msgstr ""
-#: sha1_file.c:592
+#: setup.c:682 setup.c:684 setup.c:715
#, c-format
-msgid "reference repository '%s' is not a local repository."
+msgid "cannot chdir to '%s'"
+msgstr ""
+
+#: setup.c:687 setup.c:743 setup.c:753 setup.c:792 setup.c:800 setup.c:815
+msgid "cannot come back to cwd"
msgstr ""
-#: sha1_file.c:598
+#: setup.c:813
#, c-format
-msgid "reference repository '%s' is shallow"
+msgid "not a git repository (or any of the parent directories): %s"
msgstr ""
-#: sha1_file.c:606
+#: setup.c:824
#, c-format
-msgid "reference repository '%s' is grafted"
+msgid "failed to stat '%*s%s%s'"
msgstr ""
-#: sha1_file.c:1245
-msgid "offset before end of packfile (broken .idx?)"
+#: setup.c:1054
+msgid "Unable to read current working directory"
msgstr ""
-#: sha1_file.c:2729
+#: setup.c:1066 setup.c:1072
#, c-format
-msgid "offset before start of pack index for %s (corrupt index?)"
+msgid "cannot change to '%s'"
msgstr ""
-#: sha1_file.c:2733
+#: setup.c:1085
#, c-format
-msgid "offset beyond end of pack index for %s (truncated index?)"
+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 ""
-#: sha1_name.c:419
+#: setup.c:1168
#, c-format
-msgid "short SHA1 %s is ambiguous"
+msgid ""
+"problem with core.sharedRepository filemode value (0%.3o).\n"
+"The owner of files must always have read and write permissions."
msgstr ""
-#: sha1_name.c:430
-msgid "The candidates are:"
+#: setup.c:1211
+msgid "open /dev/null or dup failed"
msgstr ""
-#: sha1_name.c:589
-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\""
+#: setup.c:1226
+msgid "fork failed"
msgstr ""
-#: submodule.c:70 submodule.c:104
-msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
+#: setup.c:1231
+msgid "setsid failed"
msgstr ""
-#: submodule.c:74 submodule.c:108
+#: sha1-file.c:381
#, c-format
-msgid "Could not find section in .gitmodules where path=%s"
+msgid "object directory %s does not exist; check .git/objects/info/alternates"
msgstr ""
-#: submodule.c:82
+#: sha1-file.c:432
#, c-format
-msgid "Could not update .gitmodules entry %s"
+msgid "unable to normalize alternate object path: %s"
msgstr ""
-#: submodule.c:115
+#: sha1-file.c:503
#, c-format
-msgid "Could not remove .gitmodules entry for %s"
+msgid "%s: ignoring alternate object stores, nesting too deep"
msgstr ""
-#: submodule.c:126
-msgid "staging updated .gitmodules failed"
+#: sha1-file.c:510
+#, c-format
+msgid "unable to normalize object directory: %s"
msgstr ""
-#: submodule.c:165
-msgid "negative values not allowed for submodule.fetchJobs"
+#: sha1-file.c:565
+msgid "unable to fdopen alternates lockfile"
msgstr ""
-#: submodule.c:376
-#, c-format
-msgid "in unpopulated submodule '%s'"
+#: sha1-file.c:583
+msgid "unable to read alternates file"
msgstr ""
-#: submodule.c:407
-#, c-format
-msgid "Pathspec '%s' is in submodule '%.*s'"
+#: sha1-file.c:590
+msgid "unable to move new alternates file into place"
msgstr ""
-#: submodule.c:1337
+#: sha1-file.c:625
#, c-format
-msgid "'%s' not recognized as a git repository"
+msgid "path '%s' does not exist"
msgstr ""
-#: submodule.c:1475
+#: sha1-file.c:651
#, c-format
-msgid "could not start 'git status' in submodule '%s'"
+msgid "reference repository '%s' as a linked checkout is not supported yet."
msgstr ""
-#: submodule.c:1488
+#: sha1-file.c:657
#, c-format
-msgid "could not run 'git status' in submodule '%s'"
+msgid "reference repository '%s' is not a local repository."
msgstr ""
-#: submodule.c:1581
+#: sha1-file.c:663
#, c-format
-msgid "submodule '%s' has dirty index"
+msgid "reference repository '%s' is shallow"
msgstr ""
-#: submodule.c:1845
+#: sha1-file.c:671
#, c-format
-msgid ""
-"relocate_gitdir for submodule '%s' with more than one worktree not supported"
+msgid "reference repository '%s' is grafted"
msgstr ""
-#: submodule.c:1857 submodule.c:1913
+#: sha1-file.c:781
#, c-format
-msgid "could not lookup name for submodule '%s'"
+msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
msgstr ""
-#: submodule.c:1861 builtin/submodule--helper.c:678
-#: builtin/submodule--helper.c:688
-#, c-format
-msgid "could not create directory '%s'"
+#: sha1-file.c:806
+msgid "mmap failed"
msgstr ""
-#: submodule.c:1864
+#: sha1-file.c:973
#, c-format
-msgid ""
-"Migrating git directory of '%s%s' from\n"
-"'%s' to\n"
-"'%s'\n"
+msgid "object file %s is empty"
msgstr ""
-#: submodule.c:1948
+#: sha1-file.c:1093 sha1-file.c:2206
#, c-format
-msgid "could not recurse into submodule '%s'"
+msgid "corrupt loose object '%s'"
msgstr ""
-#: submodule.c:1992
-msgid "could not start ls-files in .."
+#: sha1-file.c:1095 sha1-file.c:2210
+#, c-format
+msgid "garbage at end of loose object '%s'"
msgstr ""
-#: submodule.c:2012
-msgid "BUG: returned path string doesn't match cwd?"
+#: sha1-file.c:1137
+msgid "invalid object type"
msgstr ""
-#: submodule.c:2031
+#: sha1-file.c:1219
#, c-format
-msgid "ls-tree returned unexpected return code %d"
+msgid "unable to unpack %s header with --allow-unknown-type"
msgstr ""
-#: submodule-config.c:420
+#: sha1-file.c:1222
#, c-format
-msgid "invalid value for %s"
+msgid "unable to unpack %s header"
msgstr ""
-#: trailer.c:241
+#: sha1-file.c:1228
#, c-format
-msgid "running trailer command '%s' failed"
+msgid "unable to parse %s header with --allow-unknown-type"
msgstr ""
-#: trailer.c:474 trailer.c:478 trailer.c:482 trailer.c:536 trailer.c:540
-#: trailer.c:544
+#: sha1-file.c:1231
#, c-format
-msgid "unknown value '%s' for key '%s'"
+msgid "unable to parse %s header"
msgstr ""
-#: trailer.c:526 trailer.c:531 builtin/remote.c:290
+#: sha1-file.c:1422
#, c-format
-msgid "more than one %s"
+msgid "failed to read object %s"
msgstr ""
-#: trailer.c:703
+#: sha1-file.c:1426
#, c-format
-msgid "empty trailer token in trailer '%.*s'"
+msgid "replacement %s not found for %s"
msgstr ""
-#: trailer.c:723
+#: sha1-file.c:1430
#, c-format
-msgid "could not read input file '%s'"
+msgid "loose object %s (stored in %s) is corrupt"
msgstr ""
-#: trailer.c:726
-msgid "could not read from stdin"
+#: sha1-file.c:1434
+#, c-format
+msgid "packed object %s (stored in %s) is corrupt"
msgstr ""
-#: trailer.c:950 builtin/am.c:45
+#: sha1-file.c:1536
#, c-format
-msgid "could not stat %s"
+msgid "unable to write sha1 filename %s"
msgstr ""
-#: trailer.c:952
+#: sha1-file.c:1543
#, c-format
-msgid "file %s is not a regular file"
+msgid "unable to set permission to '%s'"
msgstr ""
-#: trailer.c:954
-#, c-format
-msgid "file %s is not writable by user"
+#: sha1-file.c:1550
+msgid "file write error"
msgstr ""
-#: trailer.c:966
-msgid "could not open temporary file"
+#: sha1-file.c:1569
+msgid "error when closing sha1 file"
msgstr ""
-#: trailer.c:1002
+#: sha1-file.c:1635
#, c-format
-msgid "could not rename temporary file to %s"
+msgid "insufficient permission for adding an object to repository database %s"
msgstr ""
-#: transport.c:63
-#, c-format
-msgid "Would set upstream of '%s' to '%s' of '%s'\n"
+#: sha1-file.c:1637
+msgid "unable to create temporary file"
msgstr ""
-#: transport.c:152
-#, c-format
-msgid "transport: invalid depth option '%s'"
+#: sha1-file.c:1661
+msgid "unable to write sha1 file"
msgstr ""
-#: transport.c:890
+#: sha1-file.c:1667
#, c-format
-msgid ""
-"The following submodule paths contain changes that can\n"
-"not be found on any remote:\n"
+msgid "unable to deflate new object %s (%d)"
msgstr ""
-#: transport.c:894
+#: sha1-file.c:1671
#, 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 "deflateEnd on object %s failed (%d)"
msgstr ""
-#: transport.c:902
-msgid "Aborting."
+#: sha1-file.c:1675
+#, c-format
+msgid "confused by unstable object source data for %s"
msgstr ""
-#: transport-helper.c:1071
+#: sha1-file.c:1685 builtin/pack-objects.c:899
#, c-format
-msgid "Could not read ref %s"
+msgid "failed utime() on %s"
msgstr ""
-#: tree-walk.c:31
-msgid "too-short tree object"
+#: sha1-file.c:1760
+#, c-format
+msgid "cannot read sha1_file for %s"
msgstr ""
-#: tree-walk.c:37
-msgid "malformed mode in tree entry"
+#: sha1-file.c:1805
+msgid "corrupt commit"
msgstr ""
-#: tree-walk.c:41
-msgid "empty filename in tree entry"
+#: sha1-file.c:1813
+msgid "corrupt tag"
msgstr ""
-#: tree-walk.c:113
-msgid "too-short tree file"
+#: sha1-file.c:1906
+#, c-format
+msgid "read error while indexing %s"
msgstr ""
-#: unpack-trees.c:105
+#: sha1-file.c:1909
#, 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 "short read while indexing %s"
msgstr ""
-#: unpack-trees.c:107
+#: sha1-file.c:1980 sha1-file.c:1989
#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by checkout:\n"
-"%%s"
+msgid "%s: failed to insert into database"
msgstr ""
-#: unpack-trees.c:110
+#: sha1-file.c:1995
#, 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."
+msgid "%s: unsupported file type"
msgstr ""
-#: unpack-trees.c:112
+#: sha1-file.c:2019
#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by merge:\n"
-"%%s"
+msgid "%s is not a valid object"
msgstr ""
-#: unpack-trees.c:115
+#: sha1-file.c:2021
#, 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."
+msgid "%s is not a valid '%s' object"
msgstr ""
-#: unpack-trees.c:117
+#: sha1-file.c:2048 builtin/index-pack.c:158
#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by %s:\n"
-"%%s"
+msgid "unable to open %s"
msgstr ""
-#: unpack-trees.c:122
+#: sha1-file.c:2217 sha1-file.c:2269
#, c-format
-msgid ""
-"Updating the following directories would lose untracked files in them:\n"
-"%s"
+msgid "sha1 mismatch for %s (expected %s)"
msgstr ""
-#: unpack-trees.c:126
+#: sha1-file.c:2241
#, 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 "unable to mmap %s"
msgstr ""
-#: unpack-trees.c:128
+#: sha1-file.c:2246
#, c-format
-msgid ""
-"The following untracked working tree files would be removed by checkout:\n"
-"%%s"
+msgid "unable to unpack header of %s"
msgstr ""
-#: unpack-trees.c:131
+#: sha1-file.c:2252
#, c-format
-msgid ""
-"The following untracked working tree files would be removed by merge:\n"
-"%%sPlease move or remove them before you merge."
+msgid "unable to parse header of %s"
msgstr ""
-#: unpack-trees.c:133
+#: sha1-file.c:2263
#, c-format
-msgid ""
-"The following untracked working tree files would be removed by merge:\n"
-"%%s"
+msgid "unable to unpack contents of %s"
msgstr ""
-#: unpack-trees.c:136
+#: sha1-name.c:444
#, c-format
-msgid ""
-"The following untracked working tree files would be removed by %s:\n"
-"%%sPlease move or remove them before you %s."
+msgid "short SHA1 %s is ambiguous"
msgstr ""
-#: unpack-trees.c:138
-#, c-format
+#: sha1-name.c:455
+msgid "The candidates are:"
+msgstr ""
+
+#: sha1-name.c:699
msgid ""
-"The following untracked working tree files would be removed by %s:\n"
-"%%s"
+"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 ""
-#: unpack-trees.c:143
+#: submodule.c:97 submodule.c:131
+msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
+msgstr ""
+
+#: submodule.c:101 submodule.c:135
#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by "
-"checkout:\n"
-"%%sPlease move or remove them before you switch branches."
+msgid "Could not find section in .gitmodules where path=%s"
msgstr ""
-#: unpack-trees.c:145
+#: submodule.c:109
#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by "
-"checkout:\n"
-"%%s"
+msgid "Could not update .gitmodules entry %s"
msgstr ""
-#: unpack-trees.c:148
+#: submodule.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."
+msgid "Could not remove .gitmodules entry for %s"
+msgstr ""
+
+#: submodule.c:153
+msgid "staging updated .gitmodules failed"
msgstr ""
-#: unpack-trees.c:150
+#: submodule.c:315
#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by merge:\n"
-"%%s"
+msgid "in unpopulated submodule '%s'"
msgstr ""
-#: unpack-trees.c:153
+#: submodule.c:346
#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by %s:\n"
-"%%sPlease move or remove them before you %s."
+msgid "Pathspec '%s' is in submodule '%.*s'"
msgstr ""
-#: unpack-trees.c:155
+#: submodule.c:839
#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by %s:\n"
-"%%s"
+msgid "submodule entry '%s' (%s) is a %s, not a commit"
+msgstr ""
+
+#: submodule.c:1071 builtin/branch.c:670 builtin/submodule--helper.c:1888
+msgid "Failed to resolve HEAD as a valid ref."
msgstr ""
-#: unpack-trees.c:162
+#: submodule.c:1377
#, c-format
-msgid "Entry '%s' overlaps with '%s'. Cannot bind."
+msgid "'%s' not recognized as a git repository"
msgstr ""
-#: unpack-trees.c:165
+#: submodule.c:1515
#, c-format
-msgid ""
-"Cannot update sparse checkout: the following entries are not up-to-date:\n"
-"%s"
+msgid "could not start 'git status' in submodule '%s'"
msgstr ""
-#: unpack-trees.c:167
+#: submodule.c:1528
#, c-format
-msgid ""
-"The following working tree files would be overwritten by sparse checkout "
-"update:\n"
-"%s"
+msgid "could not run 'git status' in submodule '%s'"
msgstr ""
-#: unpack-trees.c:169
+#: submodule.c:1543
#, c-format
-msgid ""
-"The following working tree files would be removed by sparse checkout "
-"update:\n"
-"%s"
+msgid "Could not unset core.worktree setting in submodule '%s'"
msgstr ""
-#: unpack-trees.c:171
+#: submodule.c:1633
#, c-format
-msgid ""
-"Cannot update submodule:\n"
-"%s"
+msgid "submodule '%s' has dirty index"
msgstr ""
-#: unpack-trees.c:248
+#: submodule.c:1685
#, c-format
-msgid "Aborting\n"
+msgid "Submodule '%s' could not be updated."
msgstr ""
-#: unpack-trees.c:277
+#: submodule.c:1734
#, c-format
-msgid "submodule update strategy not supported for submodule '%s'"
+msgid ""
+"relocate_gitdir for submodule '%s' with more than one worktree not supported"
msgstr ""
-#: unpack-trees.c:346
-msgid "Checking out files"
+#: submodule.c:1746 submodule.c:1802
+#, c-format
+msgid "could not lookup name for submodule '%s'"
msgstr ""
-#: urlmatch.c:163
-msgid "invalid URL scheme name or missing '://' suffix"
+#: submodule.c:1750 builtin/submodule--helper.c:1406
+#: builtin/submodule--helper.c:1416
+#, c-format
+msgid "could not create directory '%s'"
msgstr ""
-#: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405
+#: submodule.c:1753
#, c-format
-msgid "invalid %XX escape sequence"
+msgid ""
+"Migrating git directory of '%s%s' from\n"
+"'%s' to\n"
+"'%s'\n"
msgstr ""
-#: urlmatch.c:215
-msgid "missing host and scheme is not 'file:'"
+#: submodule.c:1837
+#, c-format
+msgid "could not recurse into submodule '%s'"
msgstr ""
-#: urlmatch.c:232
-msgid "a 'file:' URL may not have a port number"
+#: submodule.c:1881
+msgid "could not start ls-files in .."
msgstr ""
-#: urlmatch.c:247
-msgid "invalid characters in host name"
+#: submodule.c:1920
+#, c-format
+msgid "ls-tree returned unexpected return code %d"
msgstr ""
-#: urlmatch.c:292 urlmatch.c:303
-msgid "invalid port number"
+#: submodule-config.c:231
+#, c-format
+msgid "ignoring suspicious submodule name: %s"
msgstr ""
-#: urlmatch.c:371
-msgid "invalid '..' path segment"
+#: submodule-config.c:295
+msgid "negative values not allowed for submodule.fetchjobs"
msgstr ""
-#: worktree.c:245
+#: submodule-config.c:468
#, c-format
-msgid "failed to read '%s'"
+msgid "invalid value for %s"
msgstr ""
-#: wrapper.c:223 wrapper.c:393
+#: trailer.c:238
#, c-format
-msgid "could not open '%s' for reading and writing"
+msgid "running trailer command '%s' failed"
msgstr ""
-#: wrapper.c:225 wrapper.c:395 builtin/am.c:766
+#: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553
+#: trailer.c:557
#, c-format
-msgid "could not open '%s' for writing"
+msgid "unknown value '%s' for key '%s'"
msgstr ""
-#: wrapper.c:227 wrapper.c:397 builtin/am.c:319 builtin/am.c:757
-#: builtin/am.c:849 builtin/merge.c:1014
+#: trailer.c:539 trailer.c:544 builtin/remote.c:294
#, c-format
-msgid "could not open '%s' for reading"
+msgid "more than one %s"
msgstr ""
-#: wrapper.c:424 wrapper.c:624
+#: trailer.c:730
#, c-format
-msgid "unable to access '%s'"
+msgid "empty trailer token in trailer '%.*s'"
msgstr ""
-#: wrapper.c:632
-msgid "unable to get current working directory"
+#: trailer.c:750
+#, c-format
+msgid "could not read input file '%s'"
msgstr ""
-#: wrapper.c:656
-#, c-format
-msgid "could not write to %s"
+#: trailer.c:753
+msgid "could not read from stdin"
msgstr ""
-#: wrapper.c:658
+#: trailer.c:1008 builtin/am.c:47
#, c-format
-msgid "could not close %s"
+msgid "could not stat %s"
msgstr ""
-#: wt-status.c:152
-msgid "Unmerged paths:"
+#: trailer.c:1010
+#, c-format
+msgid "file %s is not a regular file"
msgstr ""
-#: wt-status.c:179 wt-status.c:206
+#: trailer.c:1012
#, c-format
-msgid " (use \"git reset %s <file>...\" to unstage)"
+msgid "file %s is not writable by user"
msgstr ""
-#: wt-status.c:181 wt-status.c:208
-msgid " (use \"git rm --cached <file>...\" to unstage)"
+#: trailer.c:1024
+msgid "could not open temporary file"
msgstr ""
-#: wt-status.c:185
-msgid " (use \"git add <file>...\" to mark resolution)"
+#: trailer.c:1064
+#, c-format
+msgid "could not rename temporary file to %s"
msgstr ""
-#: wt-status.c:187 wt-status.c:191
-msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
+#: transport.c:116
+#, c-format
+msgid "Would set upstream of '%s' to '%s' of '%s'\n"
msgstr ""
-#: wt-status.c:189
-msgid " (use \"git rm <file>...\" to mark resolution)"
+#: transport.c:142
+#, c-format
+msgid "could not read bundle '%s'"
msgstr ""
-#: wt-status.c:200 wt-status.c:981
-msgid "Changes to be committed:"
+#: transport.c:208
+#, c-format
+msgid "transport: invalid depth option '%s'"
msgstr ""
-#: wt-status.c:218 wt-status.c:990
-msgid "Changes not staged for commit:"
+#: transport.c:586
+msgid "could not parse transport.color.* config"
msgstr ""
-#: wt-status.c:222
-msgid " (use \"git add <file>...\" to update what will be committed)"
+#: transport.c:659
+msgid "support for protocol v2 not implemented yet"
msgstr ""
-#: wt-status.c:224
-msgid " (use \"git add/rm <file>...\" to update what will be committed)"
+#: transport.c:785
+#, c-format
+msgid "unknown value for config '%s': %s"
msgstr ""
-#: wt-status.c:225
-msgid ""
-" (use \"git checkout -- <file>...\" to discard changes in working directory)"
+#: transport.c:851
+#, c-format
+msgid "transport '%s' not allowed"
msgstr ""
-#: wt-status.c:227
-msgid " (commit or discard the untracked or modified content in submodules)"
+#: transport.c:903
+msgid "git-over-rsync is no longer supported"
msgstr ""
-#: wt-status.c:239
+#: transport.c:998
#, c-format
-msgid " (use \"git %s <file>...\" to include in what will be committed)"
+msgid ""
+"The following submodule paths contain changes that can\n"
+"not be found on any remote:\n"
msgstr ""
-#: wt-status.c:254
-msgid "both deleted:"
+#: transport.c:1002
+#, 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 ""
-#: wt-status.c:256
-msgid "added by us:"
+#: transport.c:1010
+msgid "Aborting."
msgstr ""
-#: wt-status.c:258
-msgid "deleted by them:"
+#: transport.c:1148
+msgid "failed to push all needed submodules"
msgstr ""
-#: wt-status.c:260
-msgid "added by them:"
+#: transport.c:1270 transport-helper.c:643
+msgid "operation not supported by protocol"
msgstr ""
-#: wt-status.c:262
-msgid "deleted by us:"
+#: transport.c:1352
+#, c-format
+msgid "invalid line while parsing alternate refs: %s"
msgstr ""
-#: wt-status.c:264
-msgid "both added:"
+#: transport-helper.c:51 transport-helper.c:80
+msgid "full write to remote helper failed"
msgstr ""
-#: wt-status.c:266
-msgid "both modified:"
+#: transport-helper.c:132
+#, c-format
+msgid "unable to find remote helper for '%s'"
msgstr ""
-#: wt-status.c:276
-msgid "new file:"
+#: transport-helper.c:148 transport-helper.c:557
+msgid "can't dup helper output fd"
msgstr ""
-#: wt-status.c:278
-msgid "copied:"
+#: transport-helper.c:199
+#, c-format
+msgid ""
+"unknown mandatory capability %s; this remote helper probably needs newer "
+"version of Git"
msgstr ""
-#: wt-status.c:280
-msgid "deleted:"
+#: transport-helper.c:205
+msgid "this remote helper should implement refspec capability"
msgstr ""
-#: wt-status.c:282
-msgid "modified:"
+#: transport-helper.c:272 transport-helper.c:412
+#, c-format
+msgid "%s unexpectedly said: '%s'"
msgstr ""
-#: wt-status.c:284
-msgid "renamed:"
+#: transport-helper.c:401
+#, c-format
+msgid "%s also locked %s"
msgstr ""
-#: wt-status.c:286
-msgid "typechange:"
+#: transport-helper.c:479
+msgid "couldn't run fast-import"
msgstr ""
-#: wt-status.c:288
-msgid "unknown:"
+#: transport-helper.c:502
+msgid "error while running fast-import"
msgstr ""
-#: wt-status.c:290
-msgid "unmerged:"
+#: transport-helper.c:531 transport-helper.c:1091
+#, c-format
+msgid "could not read ref %s"
msgstr ""
-#: wt-status.c:372
-msgid "new commits, "
+#: transport-helper.c:576
+#, c-format
+msgid "unknown response to connect: %s"
msgstr ""
-#: wt-status.c:374
-msgid "modified content, "
+#: transport-helper.c:598
+msgid "setting remote service path not supported by protocol"
msgstr ""
-#: wt-status.c:376
-msgid "untracked content, "
+#: transport-helper.c:600
+msgid "invalid remote service path"
msgstr ""
-#: wt-status.c:821
+#: transport-helper.c:646
#, c-format
-msgid "Your stash currently has %d entry"
-msgid_plural "Your stash currently has %d entries"
-msgstr[0] ""
-msgstr[1] ""
+msgid "can't connect to subservice %s"
+msgstr ""
-#: wt-status.c:853
-msgid "Submodules changed but not updated:"
+#: transport-helper.c:713
+#, c-format
+msgid "expected ok/error, helper said '%s'"
msgstr ""
-#: wt-status.c:855
-msgid "Submodule changes to be committed:"
+#: transport-helper.c:766
+#, c-format
+msgid "helper reported unexpected status of %s"
msgstr ""
-#: wt-status.c:937
-msgid ""
-"Do not touch the line above.\n"
-"Everything below will be removed."
+#: transport-helper.c:827
+#, c-format
+msgid "helper %s does not support dry-run"
msgstr ""
-#: wt-status.c:1049
-msgid "You have unmerged paths."
+#: transport-helper.c:830
+#, c-format
+msgid "helper %s does not support --signed"
msgstr ""
-#: wt-status.c:1052
-msgid " (fix conflicts and run \"git commit\")"
+#: transport-helper.c:833
+#, c-format
+msgid "helper %s does not support --signed=if-asked"
msgstr ""
-#: wt-status.c:1054
-msgid " (use \"git merge --abort\" to abort the merge)"
+#: transport-helper.c:840
+#, c-format
+msgid "helper %s does not support 'push-option'"
msgstr ""
-#: wt-status.c:1059
-msgid "All conflicts fixed but you are still merging."
+#: transport-helper.c:932
+msgid "remote-helper doesn't support push; refspec needed"
msgstr ""
-#: wt-status.c:1062
-msgid " (use \"git commit\" to conclude merge)"
+#: transport-helper.c:937
+#, c-format
+msgid "helper %s does not support 'force'"
msgstr ""
-#: wt-status.c:1072
-msgid "You are in the middle of an am session."
+#: transport-helper.c:984
+msgid "couldn't run fast-export"
msgstr ""
-#: wt-status.c:1075
-msgid "The current patch is empty."
+#: transport-helper.c:989
+msgid "error while running fast-export"
msgstr ""
-#: wt-status.c:1079
-msgid " (fix conflicts and then run \"git am --continue\")"
+#: transport-helper.c:1014
+#, c-format
+msgid ""
+"No refs in common and none specified; doing nothing.\n"
+"Perhaps you should specify a branch such as 'master'.\n"
msgstr ""
-#: wt-status.c:1081
-msgid " (use \"git am --skip\" to skip this patch)"
+#: transport-helper.c:1077
+#, c-format
+msgid "malformed response in ref list: %s"
msgstr ""
-#: wt-status.c:1083
-msgid " (use \"git am --abort\" to restore the original branch)"
+#: transport-helper.c:1230
+#, c-format
+msgid "read(%s) failed"
msgstr ""
-#: wt-status.c:1214
-msgid "git-rebase-todo is missing."
+#: transport-helper.c:1257
+#, c-format
+msgid "write(%s) failed"
msgstr ""
-#: wt-status.c:1216
-msgid "No commands done."
+#: transport-helper.c:1306
+#, c-format
+msgid "%s thread failed"
msgstr ""
-#: wt-status.c:1219
+#: transport-helper.c:1310
#, c-format
-msgid "Last command done (%d command done):"
-msgid_plural "Last commands done (%d commands done):"
-msgstr[0] ""
-msgstr[1] ""
+msgid "%s thread failed to join: %s"
+msgstr ""
-#: wt-status.c:1230
+#: transport-helper.c:1329 transport-helper.c:1333
#, c-format
-msgid " (see more in file %s)"
+msgid "can't start thread for copying data: %s"
msgstr ""
-#: wt-status.c:1235
-msgid "No commands remaining."
+#: transport-helper.c:1370
+#, c-format
+msgid "%s process failed to wait"
msgstr ""
-#: wt-status.c:1238
+#: transport-helper.c:1374
#, c-format
-msgid "Next command to do (%d remaining command):"
-msgid_plural "Next commands to do (%d remaining commands):"
-msgstr[0] ""
-msgstr[1] ""
-
-#: wt-status.c:1246
-msgid " (use \"git rebase --edit-todo\" to view and edit)"
+msgid "%s process failed"
msgstr ""
-#: wt-status.c:1259
-#, c-format
-msgid "You are currently rebasing branch '%s' on '%s'."
+#: transport-helper.c:1392 transport-helper.c:1401
+msgid "can't start thread for copying data"
msgstr ""
-#: wt-status.c:1264
-msgid "You are currently rebasing."
+#: tree-walk.c:33
+msgid "too-short tree object"
msgstr ""
-#: wt-status.c:1278
-msgid " (fix conflicts and then run \"git rebase --continue\")"
+#: tree-walk.c:39
+msgid "malformed mode in tree entry"
msgstr ""
-#: wt-status.c:1280
-msgid " (use \"git rebase --skip\" to skip this patch)"
+#: tree-walk.c:43
+msgid "empty filename in tree entry"
msgstr ""
-#: wt-status.c:1282
-msgid " (use \"git rebase --abort\" to check out the original branch)"
+#: tree-walk.c:115
+msgid "too-short tree file"
msgstr ""
-#: wt-status.c:1288
-msgid " (all conflicts fixed: run \"git rebase --continue\")"
+#: unpack-trees.c:112
+#, 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 ""
-#: wt-status.c:1292
+#: unpack-trees.c:114
#, c-format
msgid ""
-"You are currently splitting a commit while rebasing branch '%s' on '%s'."
+"Your local changes to the following files would be overwritten by checkout:\n"
+"%%s"
msgstr ""
-#: wt-status.c:1297
-msgid "You are currently splitting a commit during a rebase."
+#: unpack-trees.c:117
+#, 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 ""
-#: wt-status.c:1300
-msgid " (Once your working directory is clean, run \"git rebase --continue\")"
+#: unpack-trees.c:119
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"%%s"
msgstr ""
-#: wt-status.c:1304
+#: unpack-trees.c:122
#, c-format
-msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
+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 ""
-#: wt-status.c:1309
-msgid "You are currently editing a commit during a rebase."
+#: unpack-trees.c:124
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by %s:\n"
+"%%s"
msgstr ""
-#: wt-status.c:1312
-msgid " (use \"git commit --amend\" to amend the current commit)"
+#: unpack-trees.c:129
+#, c-format
+msgid ""
+"Updating the following directories would lose untracked files in them:\n"
+"%s"
msgstr ""
-#: wt-status.c:1314
+#: unpack-trees.c:133
+#, c-format
msgid ""
-" (use \"git rebase --continue\" once you are satisfied with your changes)"
+"The following untracked working tree files would be removed by checkout:\n"
+"%%sPlease move or remove them before you switch branches."
msgstr ""
-#: wt-status.c:1324
+#: unpack-trees.c:135
#, c-format
-msgid "You are currently cherry-picking commit %s."
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%s"
msgstr ""
-#: wt-status.c:1329
-msgid " (fix conflicts and run \"git cherry-pick --continue\")"
+#: unpack-trees.c:138
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%sPlease move or remove them before you merge."
msgstr ""
-#: wt-status.c:1332
-msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
+#: unpack-trees.c:140
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%s"
msgstr ""
-#: wt-status.c:1334
-msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
+#: unpack-trees.c:143
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%sPlease move or remove them before you %s."
msgstr ""
-#: wt-status.c:1343
+#: unpack-trees.c:145
#, c-format
-msgid "You are currently reverting commit %s."
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%s"
msgstr ""
-#: wt-status.c:1348
-msgid " (fix conflicts and run \"git revert --continue\")"
+#: unpack-trees.c:151
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%sPlease move or remove them before you switch branches."
msgstr ""
-#: wt-status.c:1351
-msgid " (all conflicts fixed: run \"git revert --continue\")"
+#: unpack-trees.c:153
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%s"
msgstr ""
-#: wt-status.c:1353
-msgid " (use \"git revert --abort\" to cancel the revert operation)"
+#: unpack-trees.c:156
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%sPlease move or remove them before you merge."
msgstr ""
-#: wt-status.c:1364
+#: unpack-trees.c:158
#, c-format
-msgid "You are currently bisecting, started from branch '%s'."
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%s"
msgstr ""
-#: wt-status.c:1368
-msgid "You are currently bisecting."
+#: unpack-trees.c:161
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%sPlease move or remove them before you %s."
msgstr ""
-#: wt-status.c:1371
-msgid " (use \"git bisect reset\" to get back to the original branch)"
+#: unpack-trees.c:163
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%s"
msgstr ""
-#: wt-status.c:1568
-msgid "On branch "
+#: unpack-trees.c:171
+#, c-format
+msgid "Entry '%s' overlaps with '%s'. Cannot bind."
msgstr ""
-#: wt-status.c:1574
-msgid "interactive rebase in progress; onto "
+#: unpack-trees.c:174
+#, c-format
+msgid ""
+"Cannot update sparse checkout: the following entries are not up to date:\n"
+"%s"
msgstr ""
-#: wt-status.c:1576
-msgid "rebase in progress; onto "
+#: unpack-trees.c:176
+#, c-format
+msgid ""
+"The following working tree files would be overwritten by sparse checkout "
+"update:\n"
+"%s"
msgstr ""
-#: wt-status.c:1581
-msgid "HEAD detached at "
+#: unpack-trees.c:178
+#, c-format
+msgid ""
+"The following working tree files would be removed by sparse checkout "
+"update:\n"
+"%s"
msgstr ""
-#: wt-status.c:1583
-msgid "HEAD detached from "
+#: unpack-trees.c:180
+#, c-format
+msgid ""
+"Cannot update submodule:\n"
+"%s"
msgstr ""
-#: wt-status.c:1586
-msgid "Not currently on any branch."
+#: unpack-trees.c:254
+#, c-format
+msgid "Aborting\n"
msgstr ""
-#: wt-status.c:1606
-msgid "Initial commit"
+#: unpack-trees.c:336
+msgid "Checking out files"
msgstr ""
-#: wt-status.c:1607
-msgid "No commits yet"
+#: urlmatch.c:163
+msgid "invalid URL scheme name or missing '://' suffix"
msgstr ""
-#: wt-status.c:1621
-msgid "Untracked files"
+#: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405
+#, c-format
+msgid "invalid %XX escape sequence"
msgstr ""
-#: wt-status.c:1623
-msgid "Ignored files"
+#: urlmatch.c:215
+msgid "missing host and scheme is not 'file:'"
msgstr ""
-#: wt-status.c:1627
-#, 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')."
+#: urlmatch.c:232
+msgid "a 'file:' URL may not have a port number"
msgstr ""
-#: wt-status.c:1633
-#, c-format
-msgid "Untracked files not listed%s"
+#: urlmatch.c:247
+msgid "invalid characters in host name"
msgstr ""
-#: wt-status.c:1635
-msgid " (use -u option to show untracked files)"
+#: urlmatch.c:292 urlmatch.c:303
+msgid "invalid port number"
msgstr ""
-#: wt-status.c:1641
-msgid "No changes"
+#: urlmatch.c:371
+msgid "invalid '..' path segment"
msgstr ""
-#: wt-status.c:1646
+#: worktree.c:245 builtin/am.c:2147
#, c-format
-msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
+msgid "failed to read '%s'"
msgstr ""
-#: wt-status.c:1649
+#: worktree.c:291
#, c-format
-msgid "no changes added to commit\n"
+msgid "'%s' at main working tree is not the repository directory"
msgstr ""
-#: wt-status.c:1652
+#: worktree.c:302
#, c-format
-msgid ""
-"nothing added to commit but untracked files present (use \"git add\" to "
-"track)\n"
+msgid "'%s' file does not contain absolute path to the working tree location"
msgstr ""
-#: wt-status.c:1655
+#: worktree.c:314
#, c-format
-msgid "nothing added to commit but untracked files present\n"
+msgid "'%s' does not exist"
msgstr ""
-#: wt-status.c:1658
+#: worktree.c:320
#, c-format
-msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
+msgid "'%s' is not a .git file, error code %d"
msgstr ""
-#: wt-status.c:1661 wt-status.c:1666
+#: worktree.c:328
#, c-format
-msgid "nothing to commit\n"
+msgid "'%s' does not point back to '%s'"
msgstr ""
-#: wt-status.c:1664
+#: wrapper.c:223 wrapper.c:393
#, c-format
-msgid "nothing to commit (use -u to show untracked files)\n"
+msgid "could not open '%s' for reading and writing"
msgstr ""
-#: wt-status.c:1668
+#: wrapper.c:227 wrapper.c:397 builtin/am.c:321 builtin/am.c:771
+#: builtin/am.c:863 builtin/merge.c:1078
#, c-format
-msgid "nothing to commit, working tree clean\n"
+msgid "could not open '%s' for reading"
msgstr ""
-#: wt-status.c:1780
-msgid "No commits yet on "
+#: wrapper.c:424 wrapper.c:624
+#, c-format
+msgid "unable to access '%s'"
msgstr ""
-#: wt-status.c:1784
-msgid "HEAD (no branch)"
+#: wrapper.c:632
+msgid "unable to get current working directory"
msgstr ""
-#: wt-status.c:1813 wt-status.c:1821
-msgid "behind "
+#: wt-status.c:154
+msgid "Unmerged paths:"
msgstr ""
-#: wt-status.c:1816 wt-status.c:1819
-msgid "ahead "
+#: wt-status.c:181 wt-status.c:208
+#, c-format
+msgid " (use \"git reset %s <file>...\" to unstage)"
msgstr ""
-#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2311
-#, c-format
-msgid "cannot %s: You have unstaged changes."
+#: wt-status.c:183 wt-status.c:210
+msgid " (use \"git rm --cached <file>...\" to unstage)"
msgstr ""
-#: wt-status.c:2317
-msgid "additionally, your index contains uncommitted changes."
+#: wt-status.c:187
+msgid " (use \"git add <file>...\" to mark resolution)"
msgstr ""
-#: wt-status.c:2319
-#, c-format
-msgid "cannot %s: Your index contains uncommitted changes."
+#: wt-status.c:189 wt-status.c:193
+msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
msgstr ""
-#: compat/precompose_utf8.c:58 builtin/clone.c:436
-#, c-format
-msgid "failed to unlink '%s'"
+#: wt-status.c:191
+msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr ""
-#: builtin/add.c:24
-msgid "git add [<options>] [--] <pathspec>..."
+#: wt-status.c:202 wt-status.c:1015
+msgid "Changes to be committed:"
msgstr ""
-#: builtin/add.c:82
-#, c-format
-msgid "unexpected diff status %c"
+#: wt-status.c:220 wt-status.c:1024
+msgid "Changes not staged for commit:"
msgstr ""
-#: builtin/add.c:87 builtin/commit.c:292
-msgid "updating files failed"
+#: wt-status.c:224
+msgid " (use \"git add <file>...\" to update what will be committed)"
msgstr ""
-#: builtin/add.c:97
-#, c-format
-msgid "remove '%s'\n"
+#: wt-status.c:226
+msgid " (use \"git add/rm <file>...\" to update what will be committed)"
msgstr ""
-#: builtin/add.c:151
-msgid "Unstaged changes after refreshing the index:"
+#: wt-status.c:227
+msgid ""
+" (use \"git checkout -- <file>...\" to discard changes in working directory)"
msgstr ""
-#: builtin/add.c:211 builtin/rev-parse.c:873
-msgid "Could not read the index"
+#: wt-status.c:229
+msgid " (commit or discard the untracked or modified content in submodules)"
msgstr ""
-#: builtin/add.c:222
+#: wt-status.c:241
#, c-format
-msgid "Could not open '%s' for writing."
+msgid " (use \"git %s <file>...\" to include in what will be committed)"
msgstr ""
-#: builtin/add.c:226
-msgid "Could not write patch"
+#: wt-status.c:256
+msgid "both deleted:"
msgstr ""
-#: builtin/add.c:229
-msgid "editing patch failed"
+#: wt-status.c:258
+msgid "added by us:"
msgstr ""
-#: builtin/add.c:232
-#, c-format
-msgid "Could not stat '%s'"
+#: wt-status.c:260
+msgid "deleted by them:"
msgstr ""
-#: builtin/add.c:234
-msgid "Empty patch. Aborted."
+#: wt-status.c:262
+msgid "added by them:"
msgstr ""
-#: builtin/add.c:239
-#, c-format
-msgid "Could not apply '%s'"
+#: wt-status.c:264
+msgid "deleted by us:"
msgstr ""
-#: builtin/add.c:249
-msgid "The following paths are ignored by one of your .gitignore files:\n"
+#: wt-status.c:266
+msgid "both added:"
msgstr ""
-#: builtin/add.c:269 builtin/clean.c:907 builtin/fetch.c:110 builtin/mv.c:124
-#: builtin/prune-packed.c:55 builtin/pull.c:201 builtin/push.c:529
-#: builtin/remote.c:1332 builtin/rm.c:242 builtin/send-pack.c:164
-msgid "dry run"
+#: wt-status.c:268
+msgid "both modified:"
msgstr ""
-#: builtin/add.c:272
-msgid "interactive picking"
+#: wt-status.c:278
+msgid "new file:"
msgstr ""
-#: builtin/add.c:273 builtin/checkout.c:1162 builtin/reset.c:299
-msgid "select hunks interactively"
+#: wt-status.c:280
+msgid "copied:"
msgstr ""
-#: builtin/add.c:274
-msgid "edit current diff and apply"
+#: wt-status.c:282
+msgid "deleted:"
msgstr ""
-#: builtin/add.c:275
-msgid "allow adding otherwise ignored files"
+#: wt-status.c:284
+msgid "modified:"
msgstr ""
-#: builtin/add.c:276
-msgid "update tracked files"
+#: wt-status.c:286
+msgid "renamed:"
msgstr ""
-#: builtin/add.c:277
-msgid "record only the fact that the path will be added later"
+#: wt-status.c:288
+msgid "typechange:"
msgstr ""
-#: builtin/add.c:278
-msgid "add changes from all tracked and untracked files"
+#: wt-status.c:290
+msgid "unknown:"
msgstr ""
-#: builtin/add.c:281
-msgid "ignore paths removed in the working tree (same as --no-all)"
+#: wt-status.c:292
+msgid "unmerged:"
msgstr ""
-#: builtin/add.c:283
-msgid "don't add, only refresh the index"
+#: wt-status.c:372
+msgid "new commits, "
msgstr ""
-#: builtin/add.c:284
-msgid "just skip files which cannot be added because of errors"
+#: wt-status.c:374
+msgid "modified content, "
msgstr ""
-#: builtin/add.c:285
-msgid "check if - even missing - files are ignored in dry run"
+#: wt-status.c:376
+msgid "untracked content, "
msgstr ""
-#: builtin/add.c:286 builtin/update-index.c:952
-msgid "(+/-)x"
-msgstr ""
+#: wt-status.c:853
+#, c-format
+msgid "Your stash currently has %d entry"
+msgid_plural "Your stash currently has %d entries"
+msgstr[0] ""
+msgstr[1] ""
-#: builtin/add.c:286 builtin/update-index.c:953
-msgid "override the executable bit of the listed files"
+#: wt-status.c:885
+msgid "Submodules changed but not updated:"
msgstr ""
-#: builtin/add.c:288
-msgid "warn when adding an embedded repository"
+#: wt-status.c:887
+msgid "Submodule changes to be committed:"
msgstr ""
-#: builtin/add.c:303
-#, c-format
+#: wt-status.c:969
msgid ""
-"You've added another git repository inside your current repository.\n"
-"Clones of the outer repository will not contain the contents of\n"
-"the embedded repository and will not know how to obtain it.\n"
-"If you meant to add a submodule, use:\n"
-"\n"
-"\tgit submodule add <url> %s\n"
-"\n"
-"If you added this path by mistake, you can remove it from the\n"
-"index with:\n"
-"\n"
-"\tgit rm --cached %s\n"
-"\n"
-"See \"git help submodule\" for more information."
+"Do not modify or remove the line above.\n"
+"Everything below it will be ignored."
msgstr ""
-#: builtin/add.c:331
-#, c-format
-msgid "adding embedded git repository: %s"
+#: wt-status.c:1084
+msgid "You have unmerged paths."
msgstr ""
-#: builtin/add.c:349
-#, c-format
-msgid "Use -f if you really want to add them.\n"
+#: wt-status.c:1087
+msgid " (fix conflicts and run \"git commit\")"
msgstr ""
-#: builtin/add.c:357
-msgid "adding files failed"
+#: wt-status.c:1089
+msgid " (use \"git merge --abort\" to abort the merge)"
msgstr ""
-#: builtin/add.c:394
-msgid "-A and -u are mutually incompatible"
+#: wt-status.c:1094
+msgid "All conflicts fixed but you are still merging."
msgstr ""
-#: builtin/add.c:401
-msgid "Option --ignore-missing can only be used together with --dry-run"
+#: wt-status.c:1097
+msgid " (use \"git commit\" to conclude merge)"
msgstr ""
-#: builtin/add.c:405
-#, c-format
-msgid "--chmod param '%s' must be either -x or +x"
+#: wt-status.c:1107
+msgid "You are in the middle of an am session."
msgstr ""
-#: builtin/add.c:420
-#, c-format
-msgid "Nothing specified, nothing added.\n"
+#: wt-status.c:1110
+msgid "The current patch is empty."
msgstr ""
-#: builtin/add.c:421
-#, c-format
-msgid "Maybe you wanted to say 'git add .'?\n"
+#: wt-status.c:1114
+msgid " (fix conflicts and then run \"git am --continue\")"
msgstr ""
-#: builtin/add.c:426 builtin/check-ignore.c:176 builtin/checkout.c:282
-#: builtin/checkout.c:475 builtin/clean.c:954 builtin/commit.c:351
-#: builtin/mv.c:144 builtin/reset.c:238 builtin/rm.c:272
-#: builtin/submodule--helper.c:244
-msgid "index file corrupt"
+#: wt-status.c:1116
+msgid " (use \"git am --skip\" to skip this patch)"
msgstr ""
-#: builtin/am.c:413
-msgid "could not parse author script"
+#: wt-status.c:1118
+msgid " (use \"git am --abort\" to restore the original branch)"
msgstr ""
-#: builtin/am.c:489
-#, c-format
-msgid "'%s' was deleted by the applypatch-msg hook"
+#: wt-status.c:1250
+msgid "git-rebase-todo is missing."
msgstr ""
-#: builtin/am.c:530
-#, c-format
-msgid "Malformed input line: '%s'."
+#: wt-status.c:1252
+msgid "No commands done."
msgstr ""
-#: builtin/am.c:567
+#: wt-status.c:1255
#, c-format
-msgid "Failed to copy notes from '%s' to '%s'"
+msgid "Last command done (%d command done):"
+msgid_plural "Last commands done (%d commands done):"
+msgstr[0] ""
+msgstr[1] ""
+
+#: wt-status.c:1266
+#, c-format
+msgid " (see more in file %s)"
msgstr ""
-#: builtin/am.c:593
-msgid "fseek failed"
+#: wt-status.c:1271
+msgid "No commands remaining."
msgstr ""
-#: builtin/am.c:777
+#: wt-status.c:1274
#, c-format
-msgid "could not parse patch '%s'"
+msgid "Next command to do (%d remaining command):"
+msgid_plural "Next commands to do (%d remaining commands):"
+msgstr[0] ""
+msgstr[1] ""
+
+#: wt-status.c:1282
+msgid " (use \"git rebase --edit-todo\" to view and edit)"
msgstr ""
-#: builtin/am.c:842
-msgid "Only one StGIT patch series can be applied at once"
+#: wt-status.c:1295
+#, c-format
+msgid "You are currently rebasing branch '%s' on '%s'."
msgstr ""
-#: builtin/am.c:889
-msgid "invalid timestamp"
+#: wt-status.c:1300
+msgid "You are currently rebasing."
msgstr ""
-#: builtin/am.c:892 builtin/am.c:900
-msgid "invalid Date line"
+#: wt-status.c:1314
+msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr ""
-#: builtin/am.c:897
-msgid "invalid timezone offset"
+#: wt-status.c:1316
+msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr ""
-#: builtin/am.c:986
-msgid "Patch format detection failed."
+#: wt-status.c:1318
+msgid " (use \"git rebase --abort\" to check out the original branch)"
+msgstr ""
+
+#: wt-status.c:1324
+msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr ""
-#: builtin/am.c:991 builtin/clone.c:401
+#: wt-status.c:1328
#, c-format
-msgid "failed to create directory '%s'"
+msgid ""
+"You are currently splitting a commit while rebasing branch '%s' on '%s'."
msgstr ""
-#: builtin/am.c:995
-msgid "Failed to split patches."
+#: wt-status.c:1333
+msgid "You are currently splitting a commit during a rebase."
msgstr ""
-#: builtin/am.c:1120 builtin/commit.c:377
-msgid "unable to write index file"
+#: wt-status.c:1336
+msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr ""
-#: builtin/am.c:1171
+#: wt-status.c:1340
#, c-format
-msgid "When you have resolved this problem, run \"%s --continue\"."
+msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr ""
-#: builtin/am.c:1172
-#, c-format
-msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
+#: wt-status.c:1345
+msgid "You are currently editing a commit during a rebase."
msgstr ""
-#: builtin/am.c:1173
-#, c-format
-msgid "To restore the original branch and stop patching, run \"%s --abort\"."
+#: wt-status.c:1348
+msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr ""
-#: builtin/am.c:1304
-msgid "Patch is empty."
+#: wt-status.c:1350
+msgid ""
+" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr ""
-#: builtin/am.c:1370
+#: wt-status.c:1360
#, c-format
-msgid "invalid ident line: %.*s"
+msgid "You are currently cherry-picking commit %s."
msgstr ""
-#: builtin/am.c:1392
-#, c-format
-msgid "unable to parse commit %s"
+#: wt-status.c:1365
+msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr ""
-#: builtin/am.c:1586
-msgid "Repository lacks necessary blobs to fall back on 3-way merge."
+#: wt-status.c:1368
+msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr ""
-#: builtin/am.c:1588
-msgid "Using index info to reconstruct a base tree..."
+#: wt-status.c:1370
+msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr ""
-#: builtin/am.c:1607
-msgid ""
-"Did you hand edit your patch?\n"
-"It does not apply to blobs recorded in its index."
+#: wt-status.c:1379
+#, c-format
+msgid "You are currently reverting commit %s."
msgstr ""
-#: builtin/am.c:1613
-msgid "Falling back to patching base and 3-way merge..."
+#: wt-status.c:1384
+msgid " (fix conflicts and run \"git revert --continue\")"
msgstr ""
-#: builtin/am.c:1638
-msgid "Failed to merge in the changes."
+#: wt-status.c:1387
+msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr ""
-#: builtin/am.c:1662 builtin/merge.c:632
-msgid "git write-tree failed to write a tree"
+#: wt-status.c:1389
+msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr ""
-#: builtin/am.c:1669
-msgid "applying to an empty history"
+#: wt-status.c:1400
+#, c-format
+msgid "You are currently bisecting, started from branch '%s'."
msgstr ""
-#: builtin/am.c:1682 builtin/commit.c:1767 builtin/merge.c:803
-#: builtin/merge.c:828
-msgid "failed to write commit object"
+#: wt-status.c:1404
+msgid "You are currently bisecting."
msgstr ""
-#: builtin/am.c:1715 builtin/am.c:1719
-#, c-format
-msgid "cannot resume: %s does not exist."
+#: wt-status.c:1407
+msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr ""
-#: builtin/am.c:1735
-msgid "cannot be interactive without stdin connected to a terminal."
+#: wt-status.c:1604
+msgid "On branch "
msgstr ""
-#: builtin/am.c:1740
-msgid "Commit Body is:"
+#: wt-status.c:1610
+msgid "interactive rebase in progress; onto "
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:1750
-msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
+#: wt-status.c:1612
+msgid "rebase in progress; onto "
msgstr ""
-#: builtin/am.c:1800
-#, c-format
-msgid "Dirty index: cannot apply patches (dirty: %s)"
+#: wt-status.c:1617
+msgid "HEAD detached at "
msgstr ""
-#: builtin/am.c:1840 builtin/am.c:1912
-#, c-format
-msgid "Applying: %.*s"
+#: wt-status.c:1619
+msgid "HEAD detached from "
msgstr ""
-#: builtin/am.c:1856
-msgid "No changes -- Patch already applied."
+#: wt-status.c:1622
+msgid "Not currently on any branch."
msgstr ""
-#: builtin/am.c:1864
-#, c-format
-msgid "Patch failed at %s %.*s"
+#: wt-status.c:1642
+msgid "Initial commit"
msgstr ""
-#: builtin/am.c:1870
-#, c-format
-msgid "The copy of the patch that failed is found in: %s"
+#: wt-status.c:1643
+msgid "No commits yet"
msgstr ""
-#: builtin/am.c:1915
-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."
+#: wt-status.c:1657
+msgid "Untracked files"
+msgstr ""
+
+#: wt-status.c:1659
+msgid "Ignored files"
msgstr ""
-#: builtin/am.c:1922
+#: wt-status.c:1663
+#, c-format
msgid ""
-"You still have unmerged paths in your index.\n"
-"You should 'git add' each file with resolved conflicts to mark them as "
-"such.\n"
-"You might run `git rm` on a file to accept \"deleted by them\" for it."
+"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/am.c:2031 builtin/am.c:2035 builtin/am.c:2047 builtin/reset.c:323
-#: builtin/reset.c:331
+#: wt-status.c:1669
#, c-format
-msgid "Could not parse object '%s'."
+msgid "Untracked files not listed%s"
msgstr ""
-#: builtin/am.c:2083
-msgid "failed to clean index"
+#: wt-status.c:1671
+msgid " (use -u option to show untracked files)"
msgstr ""
-#: builtin/am.c:2117
-msgid ""
-"You seem to have moved HEAD since the last 'am' failure.\n"
-"Not rewinding to ORIG_HEAD"
+#: wt-status.c:1677
+msgid "No changes"
msgstr ""
-#: builtin/am.c:2180
+#: wt-status.c:1682
#, c-format
-msgid "Invalid value for --patch-format: %s"
+msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr ""
-#: builtin/am.c:2213
-msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
+#: wt-status.c:1685
+#, c-format
+msgid "no changes added to commit\n"
msgstr ""
-#: builtin/am.c:2214
-msgid "git am [<options>] (--continue | --skip | --abort)"
+#: wt-status.c:1688
+#, c-format
+msgid ""
+"nothing added to commit but untracked files present (use \"git add\" to "
+"track)\n"
msgstr ""
-#: builtin/am.c:2220
-msgid "run interactively"
+#: wt-status.c:1691
+#, c-format
+msgid "nothing added to commit but untracked files present\n"
msgstr ""
-#: builtin/am.c:2222
-msgid "historical option -- no-op"
+#: wt-status.c:1694
+#, c-format
+msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr ""
-#: builtin/am.c:2224
-msgid "allow fall back on 3way merging if needed"
+#: wt-status.c:1697 wt-status.c:1702
+#, c-format
+msgid "nothing to commit\n"
msgstr ""
-#: builtin/am.c:2225 builtin/init-db.c:484 builtin/prune-packed.c:57
-#: builtin/repack.c:180
-msgid "be quiet"
+#: wt-status.c:1700
+#, c-format
+msgid "nothing to commit (use -u to show untracked files)\n"
msgstr ""
-#: builtin/am.c:2227
-msgid "add a Signed-off-by line to the commit message"
+#: wt-status.c:1704
+#, c-format
+msgid "nothing to commit, working tree clean\n"
msgstr ""
-#: builtin/am.c:2230
-msgid "recode into utf8 (default)"
+#: wt-status.c:1817
+msgid "No commits yet on "
msgstr ""
-#: builtin/am.c:2232
-msgid "pass -k flag to git-mailinfo"
+#: wt-status.c:1821
+msgid "HEAD (no branch)"
msgstr ""
-#: builtin/am.c:2234
-msgid "pass -b flag to git-mailinfo"
+#: wt-status.c:1852
+msgid "different"
msgstr ""
-#: builtin/am.c:2236
-msgid "pass -m flag to git-mailinfo"
+#: wt-status.c:1854 wt-status.c:1862
+msgid "behind "
msgstr ""
-#: builtin/am.c:2238
-msgid "pass --keep-cr flag to git-mailsplit for mbox format"
+#: wt-status.c:1857 wt-status.c:1860
+msgid "ahead "
msgstr ""
-#: builtin/am.c:2241
-msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
-msgstr ""
-
-#: builtin/am.c:2244
-msgid "strip everything before a scissors line"
-msgstr ""
-
-#: builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252 builtin/am.c:2255
-#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267
-#: builtin/am.c:2273
-msgid "pass it through git-apply"
-msgstr ""
-
-#: builtin/am.c:2263 builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666
-#: builtin/grep.c:1064 builtin/merge.c:202 builtin/pull.c:142
-#: builtin/pull.c:197 builtin/repack.c:189 builtin/repack.c:193
-#: builtin/repack.c:195 builtin/show-branch.c:631 builtin/show-ref.c:169
-#: builtin/tag.c:399 parse-options.h:132 parse-options.h:134
-#: parse-options.h:245
-msgid "n"
+#. TRANSLATORS: the action is e.g. "pull with rebase"
+#: wt-status.c:2376
+#, c-format
+msgid "cannot %s: You have unstaged changes."
msgstr ""
-#: builtin/am.c:2269 builtin/branch.c:596 builtin/for-each-ref.c:38
-#: builtin/replace.c:444 builtin/tag.c:434 builtin/verify-tag.c:39
-msgid "format"
+#: wt-status.c:2382
+msgid "additionally, your index contains uncommitted changes."
msgstr ""
-#: builtin/am.c:2270
-msgid "format the patch(es) are in"
+#: wt-status.c:2384
+#, c-format
+msgid "cannot %s: Your index contains uncommitted changes."
msgstr ""
-#: builtin/am.c:2276
-msgid "override error message when patch failure occurs"
+#: compat/precompose_utf8.c:58 builtin/clone.c:443
+#, c-format
+msgid "failed to unlink '%s'"
msgstr ""
-#: builtin/am.c:2278
-msgid "continue applying patches after resolving a conflict"
+#: builtin/add.c:24
+msgid "git add [<options>] [--] <pathspec>..."
msgstr ""
-#: builtin/am.c:2281
-msgid "synonyms for --continue"
+#: builtin/add.c:83
+#, c-format
+msgid "unexpected diff status %c"
msgstr ""
-#: builtin/am.c:2284
-msgid "skip the current patch"
+#: builtin/add.c:88 builtin/commit.c:279
+msgid "updating files failed"
msgstr ""
-#: builtin/am.c:2287
-msgid "restore the original branch and abort the patching operation."
+#: builtin/add.c:98
+#, c-format
+msgid "remove '%s'\n"
msgstr ""
-#: builtin/am.c:2291
-msgid "lie about committer date"
+#: builtin/add.c:173
+msgid "Unstaged changes after refreshing the index:"
msgstr ""
-#: builtin/am.c:2293
-msgid "use current timestamp for author date"
+#: builtin/add.c:233 builtin/rev-parse.c:893
+msgid "Could not read the index"
msgstr ""
-#: builtin/am.c:2295 builtin/commit.c:1605 builtin/merge.c:233
-#: builtin/pull.c:172 builtin/revert.c:112 builtin/tag.c:414
-msgid "key-id"
+#: builtin/add.c:244
+#, c-format
+msgid "Could not open '%s' for writing."
msgstr ""
-#: builtin/am.c:2296
-msgid "GPG-sign commits"
+#: builtin/add.c:248
+msgid "Could not write patch"
msgstr ""
-#: builtin/am.c:2299
-msgid "(internal use for git-rebase)"
+#: builtin/add.c:251
+msgid "editing patch failed"
msgstr ""
-#: builtin/am.c:2317
-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."
+#: builtin/add.c:254
+#, c-format
+msgid "Could not stat '%s'"
msgstr ""
-#: builtin/am.c:2324
-msgid "failed to read the index"
+#: builtin/add.c:256
+msgid "Empty patch. Aborted."
msgstr ""
-#: builtin/am.c:2339
+#: builtin/add.c:261
#, c-format
-msgid "previous rebase directory %s still exists but mbox given."
+msgid "Could not apply '%s'"
msgstr ""
-#: builtin/am.c:2363
-#, c-format
-msgid ""
-"Stray %s directory found.\n"
-"Use \"git am --abort\" to remove it."
+#: builtin/add.c:269
+msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr ""
-#: builtin/am.c:2369
-msgid "Resolve operation not in progress, we are not resuming."
+#: builtin/add.c:289 builtin/clean.c:906 builtin/fetch.c:134 builtin/mv.c:123
+#: builtin/prune-packed.c:56 builtin/pull.c:212 builtin/push.c:557
+#: builtin/remote.c:1344 builtin/rm.c:240 builtin/send-pack.c:165
+msgid "dry run"
msgstr ""
-#: builtin/apply.c:8
-msgid "git apply [<options>] [<patch>...]"
+#: builtin/add.c:292
+msgid "interactive picking"
msgstr ""
-#: builtin/archive.c:17
-#, c-format
-msgid "could not create archive file '%s'"
+#: builtin/add.c:293 builtin/checkout.c:1144 builtin/reset.c:302
+msgid "select hunks interactively"
msgstr ""
-#: builtin/archive.c:20
-msgid "could not redirect output"
+#: builtin/add.c:294
+msgid "edit current diff and apply"
msgstr ""
-#: builtin/archive.c:37
-msgid "git archive: Remote with no URL"
+#: builtin/add.c:295
+msgid "allow adding otherwise ignored files"
msgstr ""
-#: builtin/archive.c:58
-msgid "git archive: expected ACK/NAK, got EOF"
+#: builtin/add.c:296
+msgid "update tracked files"
msgstr ""
-#: builtin/archive.c:61
-#, c-format
-msgid "git archive: NACK %s"
+#: builtin/add.c:297
+msgid "renormalize EOL of tracked files (implies -u)"
msgstr ""
-#: builtin/archive.c:64
-msgid "git archive: protocol error"
+#: builtin/add.c:298
+msgid "record only the fact that the path will be added later"
msgstr ""
-#: builtin/archive.c:68
-msgid "git archive: expected a flush"
+#: builtin/add.c:299
+msgid "add changes from all tracked and untracked files"
msgstr ""
-#: builtin/bisect--helper.c:7
-msgid "git bisect--helper --next-all [--no-checkout]"
+#: builtin/add.c:302
+msgid "ignore paths removed in the working tree (same as --no-all)"
msgstr ""
-#: builtin/bisect--helper.c:17
-msgid "perform 'git bisect next'"
+#: builtin/add.c:304
+msgid "don't add, only refresh the index"
msgstr ""
-#: builtin/bisect--helper.c:19
-msgid "update BISECT_HEAD instead of checking out the current commit"
+#: builtin/add.c:305
+msgid "just skip files which cannot be added because of errors"
msgstr ""
-#: builtin/blame.c:27
-msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
+#: builtin/add.c:306
+msgid "check if - even missing - files are ignored in dry run"
msgstr ""
-#: builtin/blame.c:32
-msgid "<rev-opts> are documented in git-rev-list(1)"
+#: builtin/add.c:308 builtin/update-index.c:973
+msgid "override the executable bit of the listed files"
msgstr ""
-#: builtin/blame.c:668
-msgid "Show blame entries as we find them, incrementally"
+#: builtin/add.c:310
+msgid "warn when adding an embedded repository"
msgstr ""
-#: builtin/blame.c:669
-msgid "Show blank SHA-1 for boundary commits (Default: off)"
+#: builtin/add.c:325
+#, c-format
+msgid ""
+"You've added another git repository inside your current repository.\n"
+"Clones of the outer repository will not contain the contents of\n"
+"the embedded repository and will not know how to obtain it.\n"
+"If you meant to add a submodule, use:\n"
+"\n"
+"\tgit submodule add <url> %s\n"
+"\n"
+"If you added this path by mistake, you can remove it from the\n"
+"index with:\n"
+"\n"
+"\tgit rm --cached %s\n"
+"\n"
+"See \"git help submodule\" for more information."
msgstr ""
-#: builtin/blame.c:670
-msgid "Do not treat root commits as boundaries (Default: off)"
+#: builtin/add.c:353
+#, c-format
+msgid "adding embedded git repository: %s"
msgstr ""
-#: builtin/blame.c:671
-msgid "Show work cost statistics"
+#: builtin/add.c:371
+#, c-format
+msgid "Use -f if you really want to add them.\n"
msgstr ""
-#: builtin/blame.c:672
-msgid "Force progress reporting"
+#: builtin/add.c:379
+msgid "adding files failed"
msgstr ""
-#: builtin/blame.c:673
-msgid "Show output score for blame entries"
+#: builtin/add.c:417
+msgid "-A and -u are mutually incompatible"
msgstr ""
-#: builtin/blame.c:674
-msgid "Show original filename (Default: auto)"
+#: builtin/add.c:424
+msgid "Option --ignore-missing can only be used together with --dry-run"
msgstr ""
-#: builtin/blame.c:675
-msgid "Show original linenumber (Default: off)"
+#: builtin/add.c:428
+#, c-format
+msgid "--chmod param '%s' must be either -x or +x"
msgstr ""
-#: builtin/blame.c:676
-msgid "Show in a format designed for machine consumption"
+#: builtin/add.c:443
+#, c-format
+msgid "Nothing specified, nothing added.\n"
msgstr ""
-#: builtin/blame.c:677
-msgid "Show porcelain format with per-line commit information"
+#: builtin/add.c:444
+#, c-format
+msgid "Maybe you wanted to say 'git add .'?\n"
msgstr ""
-#: builtin/blame.c:678
-msgid "Use the same output mode as git-annotate (Default: off)"
+#: builtin/add.c:449 builtin/check-ignore.c:177 builtin/checkout.c:282
+#: builtin/checkout.c:485 builtin/clean.c:953 builtin/commit.c:338
+#: builtin/diff-tree.c:115 builtin/grep.c:492 builtin/mv.c:144
+#: builtin/reset.c:241 builtin/rm.c:270 builtin/submodule--helper.c:329
+msgid "index file corrupt"
msgstr ""
-#: builtin/blame.c:679
-msgid "Show raw timestamp (Default: off)"
+#: builtin/am.c:415
+msgid "could not parse author script"
msgstr ""
-#: builtin/blame.c:680
-msgid "Show long commit SHA1 (Default: off)"
+#: builtin/am.c:499
+#, c-format
+msgid "'%s' was deleted by the applypatch-msg hook"
msgstr ""
-#: builtin/blame.c:681
-msgid "Suppress author name and timestamp (Default: off)"
+#: builtin/am.c:540
+#, c-format
+msgid "Malformed input line: '%s'."
msgstr ""
-#: builtin/blame.c:682
-msgid "Show author email instead of name (Default: off)"
+#: builtin/am.c:577
+#, c-format
+msgid "Failed to copy notes from '%s' to '%s'"
msgstr ""
-#: builtin/blame.c:683
-msgid "Ignore whitespace differences"
+#: builtin/am.c:603
+msgid "fseek failed"
msgstr ""
-#: builtin/blame.c:690
-msgid "Use an experimental heuristic to improve diffs"
+#: builtin/am.c:791
+#, c-format
+msgid "could not parse patch '%s'"
msgstr ""
-#: builtin/blame.c:692
-msgid "Spend extra cycles to find better match"
+#: builtin/am.c:856
+msgid "Only one StGIT patch series can be applied at once"
msgstr ""
-#: builtin/blame.c:693
-msgid "Use revisions from <file> instead of calling git-rev-list"
+#: builtin/am.c:904
+msgid "invalid timestamp"
msgstr ""
-#: builtin/blame.c:694
-msgid "Use <file>'s contents as the final image"
+#: builtin/am.c:909 builtin/am.c:921
+msgid "invalid Date line"
msgstr ""
-#: builtin/blame.c:695 builtin/blame.c:696
-msgid "score"
+#: builtin/am.c:916
+msgid "invalid timezone offset"
msgstr ""
-#: builtin/blame.c:695
-msgid "Find line copies within and across files"
+#: builtin/am.c:1009
+msgid "Patch format detection failed."
msgstr ""
-#: builtin/blame.c:696
-msgid "Find line movements within and across files"
+#: builtin/am.c:1014 builtin/clone.c:408
+#, c-format
+msgid "failed to create directory '%s'"
msgstr ""
-#: builtin/blame.c:697
-msgid "n,m"
+#: builtin/am.c:1019
+msgid "Failed to split patches."
msgstr ""
-#: builtin/blame.c:697
-msgid "Process only line range n,m, counting from 1"
+#: builtin/am.c:1149 builtin/commit.c:364
+msgid "unable to write index file"
msgstr ""
-#: builtin/blame.c:744
-msgid "--progress can't be used with --incremental or porcelain formats"
+#: builtin/am.c:1163
+#, c-format
+msgid "When you have resolved this problem, run \"%s --continue\"."
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:795
-msgid "4 years, 11 months ago"
+#: builtin/am.c:1164
+#, c-format
+msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr ""
-#: builtin/blame.c:882
+#: builtin/am.c:1165
#, c-format
-msgid "file %s has only %lu line"
-msgid_plural "file %s has only %lu lines"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/blame.c:928
-msgid "Blaming lines"
+msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr ""
-#: builtin/branch.c:27
-msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
+#: builtin/am.c:1272
+msgid "Patch is empty."
msgstr ""
-#: builtin/branch.c:28
-msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
+#: builtin/am.c:1338
+#, c-format
+msgid "invalid ident line: %.*s"
msgstr ""
-#: builtin/branch.c:29
-msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
+#: builtin/am.c:1360
+#, c-format
+msgid "unable to parse commit %s"
msgstr ""
-#: builtin/branch.c:30
-msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
+#: builtin/am.c:1556
+msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr ""
-#: builtin/branch.c:31
-msgid "git branch [<options>] [-r | -a] [--points-at]"
+#: builtin/am.c:1558
+msgid "Using index info to reconstruct a base tree..."
msgstr ""
-#: builtin/branch.c:32
-msgid "git branch [<options>] [-r | -a] [--format]"
+#: builtin/am.c:1577
+msgid ""
+"Did you hand edit your patch?\n"
+"It does not apply to blobs recorded in its index."
msgstr ""
-#: builtin/branch.c:145
-#, c-format
-msgid ""
-"deleting branch '%s' that has been merged to\n"
-" '%s', but not yet merged to HEAD."
+#: builtin/am.c:1583
+msgid "Falling back to patching base and 3-way merge..."
msgstr ""
-#: builtin/branch.c:149
-#, c-format
-msgid ""
-"not deleting branch '%s' that is not yet merged to\n"
-" '%s', even though it is merged to HEAD."
+#: builtin/am.c:1608
+msgid "Failed to merge in the changes."
msgstr ""
-#: builtin/branch.c:163
-#, c-format
-msgid "Couldn't look up commit object for '%s'"
+#: builtin/am.c:1640
+msgid "applying to an empty history"
msgstr ""
-#: builtin/branch.c:167
+#: builtin/am.c:1686 builtin/am.c:1690
#, 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'."
+msgid "cannot resume: %s does not exist."
msgstr ""
-#: builtin/branch.c:180
-msgid "Update of config-file failed"
+#: builtin/am.c:1706
+msgid "cannot be interactive without stdin connected to a terminal."
msgstr ""
-#: builtin/branch.c:211
-msgid "cannot use -a with -d"
+#: builtin/am.c:1711
+msgid "Commit Body is:"
msgstr ""
-#: builtin/branch.c:217
-msgid "Couldn't look up commit object for HEAD"
+#. 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:1721
+msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr ""
-#: builtin/branch.c:231
+#: builtin/am.c:1771
#, c-format
-msgid "Cannot delete branch '%s' checked out at '%s'"
+msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr ""
-#: builtin/branch.c:246
+#: builtin/am.c:1811 builtin/am.c:1879
#, c-format
-msgid "remote-tracking branch '%s' not found."
+msgid "Applying: %.*s"
msgstr ""
-#: builtin/branch.c:247
-#, c-format
-msgid "branch '%s' not found."
+#: builtin/am.c:1828
+msgid "No changes -- Patch already applied."
msgstr ""
-#: builtin/branch.c:262
+#: builtin/am.c:1834
#, c-format
-msgid "Error deleting remote-tracking branch '%s'"
+msgid "Patch failed at %s %.*s"
msgstr ""
-#: builtin/branch.c:263
-#, c-format
-msgid "Error deleting branch '%s'"
+#: builtin/am.c:1838
+msgid "Use 'git am --show-current-patch' to see the failed patch"
msgstr ""
-#: builtin/branch.c:270
-#, c-format
-msgid "Deleted remote-tracking branch %s (was %s).\n"
+#: builtin/am.c:1882
+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:271
-#, c-format
-msgid "Deleted branch %s (was %s).\n"
+#: builtin/am.c:1889
+msgid ""
+"You still have unmerged paths in your index.\n"
+"You should 'git add' each file with resolved conflicts to mark them as "
+"such.\n"
+"You might run `git rm` on a file to accept \"deleted by them\" for it."
msgstr ""
-#: builtin/branch.c:445
+#: builtin/am.c:1996 builtin/am.c:2000 builtin/am.c:2012 builtin/reset.c:324
+#: builtin/reset.c:332
#, c-format
-msgid "Branch %s is being rebased at %s"
+msgid "Could not parse object '%s'."
msgstr ""
-#: builtin/branch.c:449
-#, c-format
-msgid "Branch %s is being bisected at %s"
+#: builtin/am.c:2048
+msgid "failed to clean index"
msgstr ""
-#: builtin/branch.c:464
-msgid "cannot rename the current branch while not on any."
+#: builtin/am.c:2083
+msgid ""
+"You seem to have moved HEAD since the last 'am' failure.\n"
+"Not rewinding to ORIG_HEAD"
msgstr ""
-#: builtin/branch.c:474
+#: builtin/am.c:2174
#, c-format
-msgid "Invalid branch name: '%s'"
+msgid "Invalid value for --patch-format: %s"
msgstr ""
-#: builtin/branch.c:491
-msgid "Branch rename failed"
+#: builtin/am.c:2210
+msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr ""
-#: builtin/branch.c:494
-#, c-format
-msgid "Renamed a misnamed branch '%s' away"
+#: builtin/am.c:2211
+msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr ""
-#: builtin/branch.c:497
-#, c-format
-msgid "Branch renamed to %s, but HEAD is not updated!"
+#: builtin/am.c:2217
+msgid "run interactively"
msgstr ""
-#: builtin/branch.c:506
-msgid "Branch is renamed, but update of config-file failed"
+#: builtin/am.c:2219
+msgid "historical option -- no-op"
msgstr ""
-#: builtin/branch.c:522
-#, c-format
-msgid ""
-"Please edit the description for the branch\n"
-" %s\n"
-"Lines starting with '%c' will be stripped.\n"
+#: builtin/am.c:2221
+msgid "allow fall back on 3way merging if needed"
msgstr ""
-#: builtin/branch.c:555
-msgid "Generic options"
+#: builtin/am.c:2222 builtin/init-db.c:485 builtin/prune-packed.c:58
+#: builtin/repack.c:299
+msgid "be quiet"
msgstr ""
-#: builtin/branch.c:557
-msgid "show hash and subject, give twice for upstream branch"
+#: builtin/am.c:2224
+msgid "add a Signed-off-by line to the commit message"
msgstr ""
-#: builtin/branch.c:558
-msgid "suppress informational messages"
+#: builtin/am.c:2227
+msgid "recode into utf8 (default)"
msgstr ""
-#: builtin/branch.c:559
-msgid "set up tracking mode (see git-pull(1))"
+#: builtin/am.c:2229
+msgid "pass -k flag to git-mailinfo"
msgstr ""
-#: builtin/branch.c:561
-msgid "change upstream info"
+#: builtin/am.c:2231
+msgid "pass -b flag to git-mailinfo"
msgstr ""
-#: builtin/branch.c:563
-msgid "upstream"
+#: builtin/am.c:2233
+msgid "pass -m flag to git-mailinfo"
msgstr ""
-#: builtin/branch.c:563
-msgid "change the upstream info"
+#: builtin/am.c:2235
+msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr ""
-#: builtin/branch.c:564
-msgid "Unset the upstream info"
+#: builtin/am.c:2238
+msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr ""
-#: builtin/branch.c:565
-msgid "use colored output"
+#: builtin/am.c:2241
+msgid "strip everything before a scissors line"
msgstr ""
-#: builtin/branch.c:566
-msgid "act on remote-tracking branches"
+#: builtin/am.c:2243 builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252
+#: builtin/am.c:2255 builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264
+#: builtin/am.c:2270
+msgid "pass it through git-apply"
msgstr ""
-#: builtin/branch.c:568 builtin/branch.c:570
-msgid "print only branches that contain the commit"
+#: builtin/am.c:2260 builtin/commit.c:1332 builtin/fmt-merge-msg.c:670
+#: builtin/fmt-merge-msg.c:673 builtin/grep.c:857 builtin/merge.c:237
+#: builtin/pull.c:150 builtin/pull.c:208 builtin/repack.c:308
+#: builtin/repack.c:312 builtin/repack.c:314 builtin/show-branch.c:650
+#: builtin/show-ref.c:170 builtin/tag.c:384 parse-options.h:144
+#: parse-options.h:146 parse-options.h:258
+msgid "n"
msgstr ""
-#: builtin/branch.c:569 builtin/branch.c:571
-msgid "print only branches that don't contain the commit"
+#: builtin/am.c:2266 builtin/branch.c:651 builtin/for-each-ref.c:38
+#: builtin/replace.c:543 builtin/tag.c:420 builtin/verify-tag.c:39
+msgid "format"
msgstr ""
-#: builtin/branch.c:574
-msgid "Specific git-branch actions:"
+#: builtin/am.c:2267
+msgid "format the patch(es) are in"
msgstr ""
-#: builtin/branch.c:575
-msgid "list both remote-tracking and local branches"
+#: builtin/am.c:2273
+msgid "override error message when patch failure occurs"
msgstr ""
-#: builtin/branch.c:577
-msgid "delete fully merged branch"
+#: builtin/am.c:2275
+msgid "continue applying patches after resolving a conflict"
msgstr ""
-#: builtin/branch.c:578
-msgid "delete branch (even if not merged)"
+#: builtin/am.c:2278
+msgid "synonyms for --continue"
msgstr ""
-#: builtin/branch.c:579
-msgid "move/rename a branch and its reflog"
+#: builtin/am.c:2281
+msgid "skip the current patch"
msgstr ""
-#: builtin/branch.c:580
-msgid "move/rename a branch, even if target exists"
+#: builtin/am.c:2284
+msgid "restore the original branch and abort the patching operation."
msgstr ""
-#: builtin/branch.c:581
-msgid "list branch names"
+#: builtin/am.c:2287
+msgid "abort the patching operation but keep HEAD where it is."
msgstr ""
-#: builtin/branch.c:582
-msgid "create the branch's reflog"
+#: builtin/am.c:2290
+msgid "show the patch being applied."
msgstr ""
-#: builtin/branch.c:584
-msgid "edit the description for the branch"
+#: builtin/am.c:2294
+msgid "lie about committer date"
msgstr ""
-#: builtin/branch.c:585
-msgid "force creation, move/rename, deletion"
+#: builtin/am.c:2296
+msgid "use current timestamp for author date"
msgstr ""
-#: builtin/branch.c:586
-msgid "print only branches that are merged"
+#: builtin/am.c:2298 builtin/commit.c:1468 builtin/merge.c:271
+#: builtin/pull.c:183 builtin/revert.c:113 builtin/tag.c:400
+msgid "key-id"
msgstr ""
-#: builtin/branch.c:587
-msgid "print only branches that are not merged"
+#: builtin/am.c:2299
+msgid "GPG-sign commits"
msgstr ""
-#: builtin/branch.c:588
-msgid "list branches in columns"
+#: builtin/am.c:2302
+msgid "(internal use for git-rebase)"
msgstr ""
-#: builtin/branch.c:589 builtin/for-each-ref.c:39 builtin/tag.c:427
-msgid "key"
+#: builtin/am.c:2320
+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/branch.c:590 builtin/for-each-ref.c:40 builtin/tag.c:428
-msgid "field name to sort on"
+#: builtin/am.c:2327
+msgid "failed to read the index"
msgstr ""
-#: builtin/branch.c:592 builtin/for-each-ref.c:42 builtin/notes.c:407
-#: builtin/notes.c:410 builtin/notes.c:570 builtin/notes.c:573
-#: builtin/tag.c:430
-msgid "object"
+#: builtin/am.c:2342
+#, c-format
+msgid "previous rebase directory %s still exists but mbox given."
msgstr ""
-#: builtin/branch.c:593
-msgid "print only branches of the object"
+#: builtin/am.c:2366
+#, c-format
+msgid ""
+"Stray %s directory found.\n"
+"Use \"git am --abort\" to remove it."
msgstr ""
-#: builtin/branch.c:595 builtin/for-each-ref.c:48 builtin/tag.c:435
-msgid "sorting and filtering are case insensitive"
+#: builtin/am.c:2372
+msgid "Resolve operation not in progress, we are not resuming."
msgstr ""
-#: builtin/branch.c:596 builtin/for-each-ref.c:38 builtin/tag.c:434
-#: builtin/verify-tag.c:39
-msgid "format to use for the output"
+#: builtin/apply.c:8
+msgid "git apply [<options>] [<patch>...]"
msgstr ""
-#: builtin/branch.c:615
-msgid "Failed to resolve HEAD as a valid ref."
+#: builtin/archive.c:17
+#, c-format
+msgid "could not create archive file '%s'"
msgstr ""
-#: builtin/branch.c:619 builtin/clone.c:728
-msgid "HEAD not found below refs/heads!"
+#: builtin/archive.c:20
+msgid "could not redirect output"
msgstr ""
-#: builtin/branch.c:642
-msgid "--column and --verbose are incompatible"
+#: builtin/archive.c:37
+msgid "git archive: Remote with no URL"
msgstr ""
-#: builtin/branch.c:653 builtin/branch.c:705
-msgid "branch name required"
+#: builtin/archive.c:58
+msgid "git archive: expected ACK/NAK, got a flush packet"
msgstr ""
-#: builtin/branch.c:681
-msgid "Cannot give description to detached HEAD"
+#: builtin/archive.c:61
+#, c-format
+msgid "git archive: NACK %s"
msgstr ""
-#: builtin/branch.c:686
-msgid "cannot edit description of more than one branch"
+#: builtin/archive.c:64
+msgid "git archive: protocol error"
msgstr ""
-#: builtin/branch.c:693
-#, c-format
-msgid "No commit on branch '%s' yet."
+#: builtin/archive.c:68
+msgid "git archive: expected a flush"
msgstr ""
-#: builtin/branch.c:696
-#, c-format
-msgid "No branch named '%s'."
+#: builtin/bisect--helper.c:12
+msgid "git bisect--helper --next-all [--no-checkout]"
msgstr ""
-#: builtin/branch.c:711
-msgid "too many branches for a rename operation"
+#: builtin/bisect--helper.c:13
+msgid "git bisect--helper --write-terms <bad_term> <good_term>"
msgstr ""
-#: builtin/branch.c:716
-msgid "too many branches to set new upstream"
+#: builtin/bisect--helper.c:14
+msgid "git bisect--helper --bisect-clean-state"
msgstr ""
-#: builtin/branch.c:720
+#: builtin/bisect--helper.c:46
#, c-format
-msgid ""
-"could not set upstream of HEAD to %s when it does not point to any branch."
+msgid "'%s' is not a valid term"
msgstr ""
-#: builtin/branch.c:723 builtin/branch.c:745 builtin/branch.c:766
+#: builtin/bisect--helper.c:50
#, c-format
-msgid "no such branch '%s'"
+msgid "can't use the builtin command '%s' as a term"
msgstr ""
-#: builtin/branch.c:727
+#: builtin/bisect--helper.c:60
#, c-format
-msgid "branch '%s' does not exist"
-msgstr ""
-
-#: builtin/branch.c:739
-msgid "too many branches to unset upstream"
+msgid "can't change the meaning of the term '%s'"
msgstr ""
-#: builtin/branch.c:743
-msgid "could not unset upstream of HEAD when it does not point to any branch."
+#: builtin/bisect--helper.c:71
+msgid "please use two different terms"
msgstr ""
-#: builtin/branch.c:749
-#, c-format
-msgid "Branch '%s' has no upstream information"
+#: builtin/bisect--helper.c:78
+msgid "could not open the file BISECT_TERMS"
msgstr ""
-#: builtin/branch.c:763
-msgid "it does not make sense to create 'HEAD' manually"
+#: builtin/bisect--helper.c:120
+msgid "perform 'git bisect next'"
msgstr ""
-#: builtin/branch.c:769
-msgid "-a and -r options to 'git branch' do not make sense with a branch name"
+#: builtin/bisect--helper.c:122
+msgid "write the terms to .git/BISECT_TERMS"
msgstr ""
-#: builtin/branch.c:772
-#, c-format
-msgid ""
-"The --set-upstream flag is deprecated and will be removed. Consider using --"
-"track or --set-upstream-to\n"
+#: builtin/bisect--helper.c:124
+msgid "cleanup the bisection state"
msgstr ""
-#: builtin/branch.c:789
-#, c-format
-msgid ""
-"\n"
-"If you wanted to make '%s' track '%s', do this:\n"
-"\n"
+#: builtin/bisect--helper.c:126
+msgid "check for expected revs"
msgstr ""
-#: builtin/bundle.c:45
-#, c-format
-msgid "%s is okay\n"
+#: builtin/bisect--helper.c:128
+msgid "update BISECT_HEAD instead of checking out the current commit"
msgstr ""
-#: builtin/bundle.c:58
-msgid "Need a repository to create a bundle."
+#: builtin/bisect--helper.c:143
+msgid "--write-terms requires two arguments"
msgstr ""
-#: builtin/bundle.c:62
-msgid "Need a repository to unbundle."
+#: builtin/bisect--helper.c:147
+msgid "--bisect-clean-state requires no arguments"
msgstr ""
-#: builtin/cat-file.c:519
-msgid ""
-"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
-"p | <type> | --textconv | --filters) [--path=<path>] <object>"
+#: builtin/blame.c:31
+msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
msgstr ""
-#: builtin/cat-file.c:520
-msgid ""
-"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
-"filters]"
+#: builtin/blame.c:36
+msgid "<rev-opts> are documented in git-rev-list(1)"
msgstr ""
-#: builtin/cat-file.c:557
-msgid "<type> can be one of: blob, tree, commit, tag"
+#: builtin/blame.c:406
+#, c-format
+msgid "expecting a color: %s"
msgstr ""
-#: builtin/cat-file.c:558
-msgid "show object type"
+#: builtin/blame.c:413
+msgid "must end with a color"
msgstr ""
-#: builtin/cat-file.c:559
-msgid "show object size"
+#: builtin/blame.c:700
+#, c-format
+msgid "invalid color '%s' in color.blame.repeatedLines"
msgstr ""
-#: builtin/cat-file.c:561
-msgid "exit with zero when there's no error"
+#: builtin/blame.c:718
+msgid "invalid value for blame.coloring"
msgstr ""
-#: builtin/cat-file.c:562
-msgid "pretty-print object's content"
+#: builtin/blame.c:789
+msgid "Show blame entries as we find them, incrementally"
msgstr ""
-#: builtin/cat-file.c:564
-msgid "for blob objects, run textconv on object's content"
+#: builtin/blame.c:790
+msgid "Show blank SHA-1 for boundary commits (Default: off)"
msgstr ""
-#: builtin/cat-file.c:566
-msgid "for blob objects, run filters on object's content"
+#: builtin/blame.c:791
+msgid "Do not treat root commits as boundaries (Default: off)"
msgstr ""
-#: builtin/cat-file.c:567 git-submodule.sh:944
-msgid "blob"
+#: builtin/blame.c:792
+msgid "Show work cost statistics"
msgstr ""
-#: builtin/cat-file.c:568
-msgid "use a specific path for --textconv/--filters"
+#: builtin/blame.c:793
+msgid "Force progress reporting"
msgstr ""
-#: builtin/cat-file.c:570
-msgid "allow -s and -t to work with broken/corrupt objects"
+#: builtin/blame.c:794
+msgid "Show output score for blame entries"
msgstr ""
-#: builtin/cat-file.c:571
-msgid "buffer --batch output"
+#: builtin/blame.c:795
+msgid "Show original filename (Default: auto)"
msgstr ""
-#: builtin/cat-file.c:573
-msgid "show info and content of objects fed from the standard input"
+#: builtin/blame.c:796
+msgid "Show original linenumber (Default: off)"
msgstr ""
-#: builtin/cat-file.c:576
-msgid "show info about objects fed from the standard input"
+#: builtin/blame.c:797
+msgid "Show in a format designed for machine consumption"
msgstr ""
-#: builtin/cat-file.c:579
-msgid "follow in-tree symlinks (used with --batch or --batch-check)"
+#: builtin/blame.c:798
+msgid "Show porcelain format with per-line commit information"
msgstr ""
-#: builtin/cat-file.c:581
-msgid "show all objects with --batch or --batch-check"
+#: builtin/blame.c:799
+msgid "Use the same output mode as git-annotate (Default: off)"
msgstr ""
-#: builtin/check-attr.c:12
-msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
+#: builtin/blame.c:800
+msgid "Show raw timestamp (Default: off)"
msgstr ""
-#: builtin/check-attr.c:13
-msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
+#: builtin/blame.c:801
+msgid "Show long commit SHA1 (Default: off)"
msgstr ""
-#: builtin/check-attr.c:20
-msgid "report all attributes set on file"
+#: builtin/blame.c:802
+msgid "Suppress author name and timestamp (Default: off)"
msgstr ""
-#: builtin/check-attr.c:21
-msgid "use .gitattributes only from the index"
+#: builtin/blame.c:803
+msgid "Show author email instead of name (Default: off)"
msgstr ""
-#: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:99
-msgid "read file names from stdin"
+#: builtin/blame.c:804
+msgid "Ignore whitespace differences"
msgstr ""
-#: builtin/check-attr.c:24 builtin/check-ignore.c:26
-msgid "terminate input and output records by a NUL character"
+#: builtin/blame.c:805
+msgid "color redundant metadata from previous line differently"
msgstr ""
-#: builtin/check-ignore.c:20 builtin/checkout.c:1143 builtin/gc.c:357
-msgid "suppress progress reporting"
+#: builtin/blame.c:806
+msgid "color lines by age"
msgstr ""
-#: builtin/check-ignore.c:28
-msgid "show non-matching input paths"
+#: builtin/blame.c:813
+msgid "Use an experimental heuristic to improve diffs"
msgstr ""
-#: builtin/check-ignore.c:30
-msgid "ignore index when checking"
+#: builtin/blame.c:815
+msgid "Spend extra cycles to find better match"
msgstr ""
-#: builtin/check-ignore.c:158
-msgid "cannot specify pathnames with --stdin"
+#: builtin/blame.c:816
+msgid "Use revisions from <file> instead of calling git-rev-list"
msgstr ""
-#: builtin/check-ignore.c:161
-msgid "-z only makes sense with --stdin"
+#: builtin/blame.c:817
+msgid "Use <file>'s contents as the final image"
msgstr ""
-#: builtin/check-ignore.c:163
-msgid "no path specified"
+#: builtin/blame.c:818 builtin/blame.c:819
+msgid "score"
msgstr ""
-#: builtin/check-ignore.c:167
-msgid "--quiet is only valid with a single pathname"
+#: builtin/blame.c:818
+msgid "Find line copies within and across files"
msgstr ""
-#: builtin/check-ignore.c:169
-msgid "cannot have both --quiet and --verbose"
+#: builtin/blame.c:819
+msgid "Find line movements within and across files"
msgstr ""
-#: builtin/check-ignore.c:172
-msgid "--non-matching is only valid with --verbose"
+#: builtin/blame.c:820
+msgid "n,m"
msgstr ""
-#: builtin/check-mailmap.c:9
-msgid "git check-mailmap [<options>] <contact>..."
+#: builtin/blame.c:820
+msgid "Process only line range n,m, counting from 1"
msgstr ""
-#: builtin/check-mailmap.c:14
-msgid "also read contacts from stdin"
+#: builtin/blame.c:869
+msgid "--progress can't be used with --incremental or porcelain formats"
msgstr ""
-#: builtin/check-mailmap.c:25
-#, c-format
-msgid "unable to parse contact: %s"
+#. 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:920
+msgid "4 years, 11 months ago"
msgstr ""
-#: builtin/check-mailmap.c:48
-msgid "no contacts specified"
+#: builtin/blame.c:1007
+#, c-format
+msgid "file %s has only %lu line"
+msgid_plural "file %s has only %lu lines"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/blame.c:1053
+msgid "Blaming lines"
msgstr ""
-#: builtin/checkout-index.c:128
-msgid "git checkout-index [<options>] [--] [<file>...]"
+#: builtin/branch.c:28
+msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
msgstr ""
-#: builtin/checkout-index.c:145
-msgid "stage should be between 1 and 3 or all"
+#: builtin/branch.c:29
+msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
msgstr ""
-#: builtin/checkout-index.c:161
-msgid "check out all files in the index"
+#: builtin/branch.c:30
+msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
msgstr ""
-#: builtin/checkout-index.c:162
-msgid "force overwrite of existing files"
+#: builtin/branch.c:31
+msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
msgstr ""
-#: builtin/checkout-index.c:164
-msgid "no warning for existing files and files not in index"
+#: builtin/branch.c:32
+msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
msgstr ""
-#: builtin/checkout-index.c:166
-msgid "don't checkout new files"
+#: builtin/branch.c:33
+msgid "git branch [<options>] [-r | -a] [--points-at]"
msgstr ""
-#: builtin/checkout-index.c:168
-msgid "update stat information in the index file"
+#: builtin/branch.c:34
+msgid "git branch [<options>] [-r | -a] [--format]"
msgstr ""
-#: builtin/checkout-index.c:172
-msgid "read list of paths from the standard input"
+#: builtin/branch.c:151
+#, c-format
+msgid ""
+"deleting branch '%s' that has been merged to\n"
+" '%s', but not yet merged to HEAD."
msgstr ""
-#: builtin/checkout-index.c:174
-msgid "write the content to temporary files"
+#: builtin/branch.c:155
+#, c-format
+msgid ""
+"not deleting branch '%s' that is not yet merged to\n"
+" '%s', even though it is merged to HEAD."
msgstr ""
-#: builtin/checkout-index.c:175 builtin/column.c:31
-#: builtin/submodule--helper.c:635 builtin/submodule--helper.c:638
-#: builtin/submodule--helper.c:644 builtin/submodule--helper.c:980
-#: builtin/worktree.c:478
-msgid "string"
+#: builtin/branch.c:169
+#, c-format
+msgid "Couldn't look up commit object for '%s'"
msgstr ""
-#: builtin/checkout-index.c:176
-msgid "when creating files, prepend <string>"
+#: builtin/branch.c:173
+#, c-format
+msgid ""
+"The branch '%s' is not fully merged.\n"
+"If you are sure you want to delete it, run 'git branch -D %s'."
msgstr ""
-#: builtin/checkout-index.c:178
-msgid "copy out the files from named stage"
+#: builtin/branch.c:186
+msgid "Update of config-file failed"
msgstr ""
-#: builtin/checkout.c:26
-msgid "git checkout [<options>] <branch>"
+#: builtin/branch.c:217
+msgid "cannot use -a with -d"
msgstr ""
-#: builtin/checkout.c:27
-msgid "git checkout [<options>] [<branch>] -- <file>..."
+#: builtin/branch.c:223
+msgid "Couldn't look up commit object for HEAD"
msgstr ""
-#: builtin/checkout.c:135 builtin/checkout.c:168
+#: builtin/branch.c:237
#, c-format
-msgid "path '%s' does not have our version"
+msgid "Cannot delete branch '%s' checked out at '%s'"
msgstr ""
-#: builtin/checkout.c:137 builtin/checkout.c:170
+#: builtin/branch.c:252
#, c-format
-msgid "path '%s' does not have their version"
+msgid "remote-tracking branch '%s' not found."
msgstr ""
-#: builtin/checkout.c:153
+#: builtin/branch.c:253
#, c-format
-msgid "path '%s' does not have all necessary versions"
+msgid "branch '%s' not found."
msgstr ""
-#: builtin/checkout.c:197
+#: builtin/branch.c:268
#, c-format
-msgid "path '%s' does not have necessary versions"
+msgid "Error deleting remote-tracking branch '%s'"
msgstr ""
-#: builtin/checkout.c:214
+#: builtin/branch.c:269
#, c-format
-msgid "path '%s': cannot merge"
+msgid "Error deleting branch '%s'"
msgstr ""
-#: builtin/checkout.c:231
+#: builtin/branch.c:276
#, c-format
-msgid "Unable to add merge result for '%s'"
+msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr ""
-#: builtin/checkout.c:253 builtin/checkout.c:256 builtin/checkout.c:259
-#: builtin/checkout.c:262
+#: builtin/branch.c:277
#, c-format
-msgid "'%s' cannot be used with updating paths"
+msgid "Deleted branch %s (was %s).\n"
msgstr ""
-#: builtin/checkout.c:265 builtin/checkout.c:268
-#, c-format
-msgid "'%s' cannot be used with %s"
+#: builtin/branch.c:421 builtin/tag.c:59
+msgid "unable to parse format string"
msgstr ""
-#: builtin/checkout.c:271
+#: builtin/branch.c:458
#, c-format
-msgid "Cannot update paths and switch to branch '%s' at the same time."
+msgid "Branch %s is being rebased at %s"
msgstr ""
-#: builtin/checkout.c:342 builtin/checkout.c:349
+#: builtin/branch.c:462
#, c-format
-msgid "path '%s' is unmerged"
+msgid "Branch %s is being bisected at %s"
msgstr ""
-#: builtin/checkout.c:497
-msgid "you need to resolve your current index first"
+#: builtin/branch.c:479
+msgid "cannot copy the current branch while not on any."
msgstr ""
-#: builtin/checkout.c:628
-#, c-format
-msgid "Can not do reflog for '%s': %s\n"
+#: builtin/branch.c:481
+msgid "cannot rename the current branch while not on any."
msgstr ""
-#: builtin/checkout.c:669
-msgid "HEAD is now at"
+#: builtin/branch.c:492
+#, c-format
+msgid "Invalid branch name: '%s'"
msgstr ""
-#: builtin/checkout.c:673 builtin/clone.c:682
-msgid "unable to update HEAD"
+#: builtin/branch.c:519
+msgid "Branch rename failed"
msgstr ""
-#: builtin/checkout.c:677
-#, c-format
-msgid "Reset branch '%s'\n"
+#: builtin/branch.c:521
+msgid "Branch copy failed"
msgstr ""
-#: builtin/checkout.c:680
+#: builtin/branch.c:525
#, c-format
-msgid "Already on '%s'\n"
+msgid "Created a copy of a misnamed branch '%s'"
msgstr ""
-#: builtin/checkout.c:684
+#: builtin/branch.c:528
#, c-format
-msgid "Switched to and reset branch '%s'\n"
+msgid "Renamed a misnamed branch '%s' away"
msgstr ""
-#: builtin/checkout.c:686 builtin/checkout.c:1075
+#: builtin/branch.c:534
#, c-format
-msgid "Switched to a new branch '%s'\n"
+msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr ""
-#: builtin/checkout.c:688
-#, c-format
-msgid "Switched to branch '%s'\n"
+#: builtin/branch.c:543
+msgid "Branch is renamed, but update of config-file failed"
msgstr ""
-#: builtin/checkout.c:739
-#, c-format
-msgid " ... and %d more.\n"
+#: builtin/branch.c:545
+msgid "Branch is copied, but update of config-file failed"
msgstr ""
-#: builtin/checkout.c:745
+#: builtin/branch.c:561
#, 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] ""
+"Please edit the description for the branch\n"
+" %s\n"
+"Lines starting with '%c' will be stripped.\n"
+msgstr ""
-#: builtin/checkout.c:764
-#, 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] ""
+#: builtin/branch.c:602
+msgid "Generic options"
+msgstr ""
-#: builtin/checkout.c:800
-msgid "internal error in revision walk"
+#: builtin/branch.c:604
+msgid "show hash and subject, give twice for upstream branch"
msgstr ""
-#: builtin/checkout.c:804
-msgid "Previous HEAD position was"
+#: builtin/branch.c:605
+msgid "suppress informational messages"
msgstr ""
-#: builtin/checkout.c:832 builtin/checkout.c:1070
-msgid "You are on a branch yet to be born"
+#: builtin/branch.c:606
+msgid "set up tracking mode (see git-pull(1))"
msgstr ""
-#: builtin/checkout.c:976
-#, c-format
-msgid "only one reference expected, %d given."
+#: builtin/branch.c:608
+msgid "do not use"
msgstr ""
-#: builtin/checkout.c:1016 builtin/worktree.c:215
-#, c-format
-msgid "invalid reference: %s"
+#: builtin/branch.c:610
+msgid "upstream"
msgstr ""
-#: builtin/checkout.c:1045
-#, c-format
-msgid "reference is not a tree: %s"
+#: builtin/branch.c:610
+msgid "change the upstream info"
msgstr ""
-#: builtin/checkout.c:1084
-msgid "paths cannot be used with switching branches"
+#: builtin/branch.c:611
+msgid "Unset the upstream info"
msgstr ""
-#: builtin/checkout.c:1087 builtin/checkout.c:1091
-#, c-format
-msgid "'%s' cannot be used with switching branches"
+#: builtin/branch.c:612
+msgid "use colored output"
msgstr ""
-#: builtin/checkout.c:1095 builtin/checkout.c:1098 builtin/checkout.c:1103
-#: builtin/checkout.c:1106
-#, c-format
-msgid "'%s' cannot be used with '%s'"
+#: builtin/branch.c:613
+msgid "act on remote-tracking branches"
msgstr ""
-#: builtin/checkout.c:1111
-#, c-format
-msgid "Cannot switch branch to a non-commit '%s'"
+#: builtin/branch.c:615 builtin/branch.c:617
+msgid "print only branches that contain the commit"
msgstr ""
-#: builtin/checkout.c:1144 builtin/checkout.c:1146 builtin/clone.c:113
-#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:328
-#: builtin/worktree.c:330
-msgid "branch"
+#: builtin/branch.c:616 builtin/branch.c:618
+msgid "print only branches that don't contain the commit"
msgstr ""
-#: builtin/checkout.c:1145
-msgid "create and checkout a new branch"
+#: builtin/branch.c:621
+msgid "Specific git-branch actions:"
msgstr ""
-#: builtin/checkout.c:1147
-msgid "create/reset and checkout a branch"
+#: builtin/branch.c:622
+msgid "list both remote-tracking and local branches"
msgstr ""
-#: builtin/checkout.c:1148
-msgid "create reflog for new branch"
+#: builtin/branch.c:624
+msgid "delete fully merged branch"
msgstr ""
-#: builtin/checkout.c:1149 builtin/worktree.c:332
-msgid "detach HEAD at named commit"
+#: builtin/branch.c:625
+msgid "delete branch (even if not merged)"
msgstr ""
-#: builtin/checkout.c:1150
-msgid "set upstream info for new branch"
+#: builtin/branch.c:626
+msgid "move/rename a branch and its reflog"
msgstr ""
-#: builtin/checkout.c:1152
-msgid "new-branch"
+#: builtin/branch.c:627
+msgid "move/rename a branch, even if target exists"
msgstr ""
-#: builtin/checkout.c:1152
-msgid "new unparented branch"
+#: builtin/branch.c:628
+msgid "copy a branch and its reflog"
msgstr ""
-#: builtin/checkout.c:1153
-msgid "checkout our version for unmerged files"
+#: builtin/branch.c:629
+msgid "copy a branch, even if target exists"
msgstr ""
-#: builtin/checkout.c:1155
-msgid "checkout their version for unmerged files"
+#: builtin/branch.c:630
+msgid "list branch names"
msgstr ""
-#: builtin/checkout.c:1157
-msgid "force checkout (throw away local modifications)"
+#: builtin/branch.c:631
+msgid "create the branch's reflog"
msgstr ""
-#: builtin/checkout.c:1158
-msgid "perform a 3-way merge with the new branch"
+#: builtin/branch.c:634
+msgid "deprecated synonym for --create-reflog"
msgstr ""
-#: builtin/checkout.c:1159 builtin/merge.c:235
-msgid "update ignored files (default)"
+#: builtin/branch.c:639
+msgid "edit the description for the branch"
msgstr ""
-#: builtin/checkout.c:1160 builtin/log.c:1483 parse-options.h:251
-msgid "style"
+#: builtin/branch.c:640
+msgid "force creation, move/rename, deletion"
msgstr ""
-#: builtin/checkout.c:1161
-msgid "conflict style (merge or diff3)"
+#: builtin/branch.c:641
+msgid "print only branches that are merged"
msgstr ""
-#: builtin/checkout.c:1164
-msgid "do not limit pathspecs to sparse entries only"
+#: builtin/branch.c:642
+msgid "print only branches that are not merged"
msgstr ""
-#: builtin/checkout.c:1166
-msgid "second guess 'git checkout <no-such-branch>'"
+#: builtin/branch.c:643
+msgid "list branches in columns"
msgstr ""
-#: builtin/checkout.c:1168
-msgid "do not check if another worktree is holding the given ref"
+#: builtin/branch.c:644 builtin/for-each-ref.c:40 builtin/ls-remote.c:70
+#: builtin/tag.c:413
+msgid "key"
msgstr ""
-#: builtin/checkout.c:1172 builtin/clone.c:80 builtin/fetch.c:114
-#: builtin/merge.c:232 builtin/pull.c:120 builtin/push.c:544
-#: builtin/send-pack.c:173
-msgid "force progress reporting"
+#: builtin/branch.c:645 builtin/for-each-ref.c:41 builtin/ls-remote.c:71
+#: builtin/tag.c:414
+msgid "field name to sort on"
msgstr ""
-#: builtin/checkout.c:1203
-msgid "-b, -B and --orphan are mutually exclusive"
+#: builtin/branch.c:647 builtin/for-each-ref.c:43 builtin/notes.c:410
+#: builtin/notes.c:413 builtin/notes.c:573 builtin/notes.c:576
+#: builtin/tag.c:416
+msgid "object"
msgstr ""
-#: builtin/checkout.c:1220
-msgid "--track needs a branch name"
+#: builtin/branch.c:648
+msgid "print only branches of the object"
msgstr ""
-#: builtin/checkout.c:1225
-msgid "Missing branch name; try -b"
+#: builtin/branch.c:650 builtin/for-each-ref.c:49 builtin/tag.c:423
+msgid "sorting and filtering are case insensitive"
msgstr ""
-#: builtin/checkout.c:1261
-msgid "invalid path specification"
+#: builtin/branch.c:651 builtin/for-each-ref.c:38 builtin/tag.c:421
+#: builtin/verify-tag.c:39
+msgid "format to use for the output"
msgstr ""
-#: builtin/checkout.c:1268
-#, c-format
-msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
+#: builtin/branch.c:674 builtin/clone.c:739
+msgid "HEAD not found below refs/heads!"
msgstr ""
-#: builtin/checkout.c:1272
-#, c-format
-msgid "git checkout: --detach does not take a path argument '%s'"
+#: builtin/branch.c:697
+msgid "--column and --verbose are incompatible"
msgstr ""
-#: builtin/checkout.c:1276
-msgid ""
-"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
-"checking out of the index."
+#: builtin/branch.c:717 builtin/branch.c:769 builtin/branch.c:778
+msgid "branch name required"
msgstr ""
-#: builtin/clean.c:26
-msgid ""
-"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
+#: builtin/branch.c:745
+msgid "Cannot give description to detached HEAD"
msgstr ""
-#: builtin/clean.c:30
-#, c-format
-msgid "Removing %s\n"
+#: builtin/branch.c:750
+msgid "cannot edit description of more than one branch"
msgstr ""
-#: builtin/clean.c:31
+#: builtin/branch.c:757
#, c-format
-msgid "Would remove %s\n"
+msgid "No commit on branch '%s' yet."
msgstr ""
-#: builtin/clean.c:32
+#: builtin/branch.c:760
#, c-format
-msgid "Skipping repository %s\n"
+msgid "No branch named '%s'."
msgstr ""
-#: builtin/clean.c:33
-#, c-format
-msgid "Would skip repository %s\n"
+#: builtin/branch.c:775
+msgid "too many branches for a copy operation"
msgstr ""
-#: builtin/clean.c:34
-#, c-format
-msgid "failed to remove %s"
+#: builtin/branch.c:784
+msgid "too many arguments for a rename operation"
+msgstr ""
+
+#: builtin/branch.c:789
+msgid "too many arguments to set new upstream"
msgstr ""
-#: builtin/clean.c:298 git-add--interactive.perl:572
+#: builtin/branch.c:793
#, c-format
msgid ""
-"Prompt help:\n"
-"1 - select a numbered item\n"
-"foo - select item based on unique prefix\n"
-" - (empty) select nothing\n"
+"could not set upstream of HEAD to %s when it does not point to any branch."
msgstr ""
-#: builtin/clean.c:302 git-add--interactive.perl:581
+#: builtin/branch.c:796 builtin/branch.c:818 builtin/branch.c:834
#, 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/clean.c:518 git-add--interactive.perl:547
-#: git-add--interactive.perl:552
-#, c-format, perl-format
-msgid "Huh (%s)?\n"
+msgid "no such branch '%s'"
msgstr ""
-#: builtin/clean.c:660
+#: builtin/branch.c:800
#, c-format
-msgid "Input ignore patterns>> "
+msgid "branch '%s' does not exist"
msgstr ""
-#: builtin/clean.c:697
-#, c-format
-msgid "WARNING: Cannot find items matched by: %s"
+#: builtin/branch.c:812
+msgid "too many arguments to unset upstream"
msgstr ""
-#: builtin/clean.c:718
-msgid "Select items to delete"
+#: builtin/branch.c:816
+msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr ""
-#. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:759
+#: builtin/branch.c:822
#, c-format
-msgid "Remove %s [y/N]? "
+msgid "Branch '%s' has no upstream information"
msgstr ""
-#: builtin/clean.c:784 git-add--interactive.perl:1616
-#, c-format
-msgid "Bye.\n"
+#: builtin/branch.c:837
+msgid "-a and -r options to 'git branch' do not make sense with a branch name"
msgstr ""
-#: builtin/clean.c:792
+#: builtin/branch.c:840
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"
+"the '--set-upstream' option is no longer supported. Please use '--track' or "
+"'--set-upstream-to' instead."
msgstr ""
-#: builtin/clean.c:819 git-add--interactive.perl:1692
-msgid "*** Commands ***"
+#: builtin/bundle.c:45
+#, c-format
+msgid "%s is okay\n"
msgstr ""
-#: builtin/clean.c:820 git-add--interactive.perl:1689
-msgid "What now"
+#: builtin/bundle.c:58
+msgid "Need a repository to create a bundle."
msgstr ""
-#: builtin/clean.c:828
-msgid "Would remove the following item:"
-msgid_plural "Would remove the following items:"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/clean.c:844
-msgid "No more files to clean, exiting."
+#: builtin/bundle.c:62
+msgid "Need a repository to unbundle."
msgstr ""
-#: builtin/clean.c:906
-msgid "do not print names of files removed"
+#: builtin/cat-file.c:577
+msgid ""
+"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
+"p | <type> | --textconv | --filters) [--path=<path>] <object>"
msgstr ""
-#: builtin/clean.c:908
-msgid "force"
+#: builtin/cat-file.c:578
+msgid ""
+"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
+"filters]"
msgstr ""
-#: builtin/clean.c:909
-msgid "interactive cleaning"
+#: builtin/cat-file.c:615
+msgid "<type> can be one of: blob, tree, commit, tag"
msgstr ""
-#: builtin/clean.c:911
-msgid "remove whole directories"
+#: builtin/cat-file.c:616
+msgid "show object type"
msgstr ""
-#: builtin/clean.c:912 builtin/describe.c:452 builtin/describe.c:454
-#: builtin/grep.c:1082 builtin/ls-files.c:546 builtin/name-rev.c:397
-#: builtin/name-rev.c:399 builtin/show-ref.c:176
-msgid "pattern"
+#: builtin/cat-file.c:617
+msgid "show object size"
msgstr ""
-#: builtin/clean.c:913
-msgid "add <pattern> to ignore rules"
+#: builtin/cat-file.c:619
+msgid "exit with zero when there's no error"
msgstr ""
-#: builtin/clean.c:914
-msgid "remove ignored files, too"
+#: builtin/cat-file.c:620
+msgid "pretty-print object's content"
msgstr ""
-#: builtin/clean.c:916
-msgid "remove only ignored files"
+#: builtin/cat-file.c:622
+msgid "for blob objects, run textconv on object's content"
msgstr ""
-#: builtin/clean.c:934
-msgid "-x and -X cannot be used together"
+#: builtin/cat-file.c:624
+msgid "for blob objects, run filters on object's content"
msgstr ""
-#: builtin/clean.c:938
-msgid ""
-"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
-"clean"
+#: builtin/cat-file.c:625 git-submodule.sh:864
+msgid "blob"
msgstr ""
-#: builtin/clean.c:941
-msgid ""
-"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
-"refusing to clean"
+#: builtin/cat-file.c:626
+msgid "use a specific path for --textconv/--filters"
msgstr ""
-#: builtin/clone.c:38
-msgid "git clone [<options>] [--] <repo> [<dir>]"
+#: builtin/cat-file.c:628
+msgid "allow -s and -t to work with broken/corrupt objects"
msgstr ""
-#: builtin/clone.c:82
-msgid "don't create a checkout"
+#: builtin/cat-file.c:629
+msgid "buffer --batch output"
msgstr ""
-#: builtin/clone.c:83 builtin/clone.c:85 builtin/init-db.c:479
-msgid "create a bare repository"
+#: builtin/cat-file.c:631
+msgid "show info and content of objects fed from the standard input"
msgstr ""
-#: builtin/clone.c:87
-msgid "create a mirror repository (implies bare)"
+#: builtin/cat-file.c:634
+msgid "show info about objects fed from the standard input"
msgstr ""
-#: builtin/clone.c:89
-msgid "to clone from a local repository"
+#: builtin/cat-file.c:637
+msgid "follow in-tree symlinks (used with --batch or --batch-check)"
msgstr ""
-#: builtin/clone.c:91
-msgid "don't use local hardlinks, always copy"
+#: builtin/cat-file.c:639
+msgid "show all objects with --batch or --batch-check"
msgstr ""
-#: builtin/clone.c:93
-msgid "setup as shared repository"
+#: builtin/cat-file.c:641
+msgid "do not order --batch-all-objects output"
msgstr ""
-#: builtin/clone.c:95 builtin/clone.c:99
-msgid "pathspec"
+#: builtin/check-attr.c:12
+msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
msgstr ""
-#: builtin/clone.c:95 builtin/clone.c:99
-msgid "initialize submodules in the clone"
+#: builtin/check-attr.c:13
+msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
msgstr ""
-#: builtin/clone.c:102
-msgid "number of submodules cloned in parallel"
+#: builtin/check-attr.c:20
+msgid "report all attributes set on file"
msgstr ""
-#: builtin/clone.c:103 builtin/init-db.c:476
-msgid "template-directory"
+#: builtin/check-attr.c:21
+msgid "use .gitattributes only from the index"
msgstr ""
-#: builtin/clone.c:104 builtin/init-db.c:477
-msgid "directory from which templates will be used"
+#: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:101
+msgid "read file names from stdin"
msgstr ""
-#: builtin/clone.c:106 builtin/clone.c:108 builtin/submodule--helper.c:642
-#: builtin/submodule--helper.c:983
-msgid "reference repository"
+#: builtin/check-attr.c:24 builtin/check-ignore.c:26
+msgid "terminate input and output records by a NUL character"
msgstr ""
-#: builtin/clone.c:110
-msgid "use --reference only while cloning"
+#: builtin/check-ignore.c:20 builtin/checkout.c:1120 builtin/gc.c:503
+#: builtin/worktree.c:447
+msgid "suppress progress reporting"
msgstr ""
-#: builtin/clone.c:111 builtin/column.c:27 builtin/merge-file.c:44
-msgid "name"
+#: builtin/check-ignore.c:28
+msgid "show non-matching input paths"
msgstr ""
-#: builtin/clone.c:112
-msgid "use <name> instead of 'origin' to track upstream"
+#: builtin/check-ignore.c:30
+msgid "ignore index when checking"
msgstr ""
-#: builtin/clone.c:114
-msgid "checkout <branch> instead of the remote's HEAD"
+#: builtin/check-ignore.c:159
+msgid "cannot specify pathnames with --stdin"
msgstr ""
-#: builtin/clone.c:116
-msgid "path to git-upload-pack on the remote"
+#: builtin/check-ignore.c:162
+msgid "-z only makes sense with --stdin"
msgstr ""
-#: builtin/clone.c:117 builtin/fetch.c:115 builtin/grep.c:1025
-#: builtin/pull.c:205
-msgid "depth"
+#: builtin/check-ignore.c:164
+msgid "no path specified"
msgstr ""
-#: builtin/clone.c:118
-msgid "create a shallow clone of that depth"
+#: builtin/check-ignore.c:168
+msgid "--quiet is only valid with a single pathname"
msgstr ""
-#: builtin/clone.c:119 builtin/fetch.c:117 builtin/pack-objects.c:2932
-#: parse-options.h:142
-msgid "time"
+#: builtin/check-ignore.c:170
+msgid "cannot have both --quiet and --verbose"
msgstr ""
-#: builtin/clone.c:120
-msgid "create a shallow clone since a specific time"
+#: builtin/check-ignore.c:173
+msgid "--non-matching is only valid with --verbose"
msgstr ""
-#: builtin/clone.c:121 builtin/fetch.c:119
-msgid "revision"
+#: builtin/check-mailmap.c:9
+msgid "git check-mailmap [<options>] <contact>..."
msgstr ""
-#: builtin/clone.c:122 builtin/fetch.c:120
-msgid "deepen history of shallow clone, excluding rev"
+#: builtin/check-mailmap.c:14
+msgid "also read contacts from stdin"
msgstr ""
-#: builtin/clone.c:124
-msgid "clone only one branch, HEAD or --branch"
+#: builtin/check-mailmap.c:25
+#, c-format
+msgid "unable to parse contact: %s"
msgstr ""
-#: builtin/clone.c:126
-msgid "don't clone any tags, and make later fetches not to follow them"
+#: builtin/check-mailmap.c:48
+msgid "no contacts specified"
msgstr ""
-#: builtin/clone.c:128
-msgid "any cloned submodules will be shallow"
+#: builtin/checkout-index.c:128
+msgid "git checkout-index [<options>] [--] [<file>...]"
msgstr ""
-#: builtin/clone.c:129 builtin/init-db.c:485
-msgid "gitdir"
+#: builtin/checkout-index.c:143
+msgid "stage should be between 1 and 3 or all"
msgstr ""
-#: builtin/clone.c:130 builtin/init-db.c:486
-msgid "separate git dir from working tree"
+#: builtin/checkout-index.c:159
+msgid "check out all files in the index"
msgstr ""
-#: builtin/clone.c:131
-msgid "key=value"
+#: builtin/checkout-index.c:160
+msgid "force overwrite of existing files"
msgstr ""
-#: builtin/clone.c:132
-msgid "set config inside the new repository"
+#: builtin/checkout-index.c:162
+msgid "no warning for existing files and files not in index"
msgstr ""
-#: builtin/clone.c:133 builtin/fetch.c:137 builtin/push.c:555
-msgid "use IPv4 addresses only"
+#: builtin/checkout-index.c:164
+msgid "don't checkout new files"
msgstr ""
-#: builtin/clone.c:135 builtin/fetch.c:139 builtin/push.c:557
-msgid "use IPv6 addresses only"
+#: builtin/checkout-index.c:166
+msgid "update stat information in the index file"
msgstr ""
-#: builtin/clone.c:272
-msgid ""
-"No directory name could be guessed.\n"
-"Please specify a directory on the command line"
+#: builtin/checkout-index.c:170
+msgid "read list of paths from the standard input"
msgstr ""
-#: builtin/clone.c:325
-#, c-format
-msgid "info: Could not add alternate for '%s': %s\n"
+#: builtin/checkout-index.c:172
+msgid "write the content to temporary files"
msgstr ""
-#: builtin/clone.c:397
-#, c-format
-msgid "failed to open '%s'"
+#: builtin/checkout-index.c:173 builtin/column.c:31
+#: builtin/submodule--helper.c:1361 builtin/submodule--helper.c:1364
+#: builtin/submodule--helper.c:1372 builtin/submodule--helper.c:1736
+#: builtin/worktree.c:620
+msgid "string"
msgstr ""
-#: builtin/clone.c:405
-#, c-format
-msgid "%s exists and is not a directory"
+#: builtin/checkout-index.c:174
+msgid "when creating files, prepend <string>"
msgstr ""
-#: builtin/clone.c:419
-#, c-format
-msgid "failed to stat %s\n"
+#: builtin/checkout-index.c:176
+msgid "copy out the files from named stage"
msgstr ""
-#: builtin/clone.c:441
-#, c-format
-msgid "failed to create link '%s'"
+#: builtin/checkout.c:29
+msgid "git checkout [<options>] <branch>"
msgstr ""
-#: builtin/clone.c:445
-#, c-format
-msgid "failed to copy file to '%s'"
+#: builtin/checkout.c:30
+msgid "git checkout [<options>] [<branch>] -- <file>..."
msgstr ""
-#: builtin/clone.c:470
+#: builtin/checkout.c:138 builtin/checkout.c:171
#, c-format
-msgid "done.\n"
-msgstr ""
-
-#: builtin/clone.c:482
-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"
+msgid "path '%s' does not have our version"
msgstr ""
-#: builtin/clone.c:559
+#: builtin/checkout.c:140 builtin/checkout.c:173
#, c-format
-msgid "Could not find remote branch %s to clone."
+msgid "path '%s' does not have their version"
msgstr ""
-#: builtin/clone.c:654
-msgid "remote did not send all necessary objects"
+#: builtin/checkout.c:156
+#, c-format
+msgid "path '%s' does not have all necessary versions"
msgstr ""
-#: builtin/clone.c:670
+#: builtin/checkout.c:200
#, c-format
-msgid "unable to update %s"
+msgid "path '%s' does not have necessary versions"
msgstr ""
-#: builtin/clone.c:719
-msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
+#: builtin/checkout.c:217
+#, c-format
+msgid "path '%s': cannot merge"
msgstr ""
-#: builtin/clone.c:750
-msgid "unable to checkout working tree"
+#: builtin/checkout.c:233
+#, c-format
+msgid "Unable to add merge result for '%s'"
msgstr ""
-#: builtin/clone.c:792
-msgid "unable to write parameters to config file"
+#: builtin/checkout.c:255 builtin/checkout.c:258 builtin/checkout.c:261
+#: builtin/checkout.c:264
+#, c-format
+msgid "'%s' cannot be used with updating paths"
msgstr ""
-#: builtin/clone.c:855
-msgid "cannot repack to clean up"
+#: builtin/checkout.c:267 builtin/checkout.c:270
+#, c-format
+msgid "'%s' cannot be used with %s"
msgstr ""
-#: builtin/clone.c:857
-msgid "cannot unlink temporary alternates file"
+#: builtin/checkout.c:273
+#, c-format
+msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr ""
-#: builtin/clone.c:890 builtin/receive-pack.c:1945
-msgid "Too many arguments."
+#: builtin/checkout.c:342 builtin/checkout.c:349
+#, c-format
+msgid "path '%s' is unmerged"
msgstr ""
-#: builtin/clone.c:894
-msgid "You must specify a repository to clone."
+#: builtin/checkout.c:508
+msgid "you need to resolve your current index first"
msgstr ""
-#: builtin/clone.c:907
+#: builtin/checkout.c:645
#, c-format
-msgid "--bare and --origin %s options are incompatible."
+msgid "Can not do reflog for '%s': %s\n"
msgstr ""
-#: builtin/clone.c:910
-msgid "--bare and --separate-git-dir are incompatible."
+#: builtin/checkout.c:686
+msgid "HEAD is now at"
msgstr ""
-#: builtin/clone.c:923
-#, c-format
-msgid "repository '%s' does not exist"
+#: builtin/checkout.c:690 builtin/clone.c:692
+msgid "unable to update HEAD"
msgstr ""
-#: builtin/clone.c:929 builtin/fetch.c:1337
+#: builtin/checkout.c:694
#, c-format
-msgid "depth %s is not a positive number"
+msgid "Reset branch '%s'\n"
msgstr ""
-#: builtin/clone.c:939
+#: builtin/checkout.c:697
#, c-format
-msgid "destination path '%s' already exists and is not an empty directory."
+msgid "Already on '%s'\n"
msgstr ""
-#: builtin/clone.c:949
+#: builtin/checkout.c:701
#, c-format
-msgid "working tree '%s' already exists."
+msgid "Switched to and reset branch '%s'\n"
msgstr ""
-#: builtin/clone.c:964 builtin/clone.c:975 builtin/difftool.c:260
-#: builtin/worktree.c:222 builtin/worktree.c:252
+#: builtin/checkout.c:703 builtin/checkout.c:1052
#, c-format
-msgid "could not create leading directories of '%s'"
+msgid "Switched to a new branch '%s'\n"
msgstr ""
-#: builtin/clone.c:967
+#: builtin/checkout.c:705
#, c-format
-msgid "could not create work tree dir '%s'"
+msgid "Switched to branch '%s'\n"
msgstr ""
-#: builtin/clone.c:979
+#: builtin/checkout.c:756
#, c-format
-msgid "Cloning into bare repository '%s'...\n"
+msgid " ... and %d more.\n"
msgstr ""
-#: builtin/clone.c:981
+#: builtin/checkout.c:762
#, c-format
-msgid "Cloning into '%s'...\n"
-msgstr ""
-
-#: builtin/clone.c:1005
msgid ""
-"clone --recursive is not compatible with both --reference and --reference-if-"
-"able"
-msgstr ""
-
-#: builtin/clone.c:1067
-msgid "--depth is ignored in local clones; use file:// instead."
-msgstr ""
-
-#: builtin/clone.c:1069
-msgid "--shallow-since is ignored in local clones; use file:// instead."
+"Warning: you are leaving %d commit behind, not connected to\n"
+"any of your branches:\n"
+"\n"
+"%s\n"
+msgid_plural ""
+"Warning: you are leaving %d commits behind, not connected to\n"
+"any of your branches:\n"
+"\n"
+"%s\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/checkout.c:781
+#, 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] ""
+
+#: builtin/checkout.c:813
+msgid "internal error in revision walk"
+msgstr ""
+
+#: builtin/checkout.c:817
+msgid "Previous HEAD position was"
+msgstr ""
+
+#: builtin/checkout.c:845 builtin/checkout.c:1047
+msgid "You are on a branch yet to be born"
+msgstr ""
+
+#: builtin/checkout.c:952
+#, c-format
+msgid "only one reference expected, %d given."
+msgstr ""
+
+#: builtin/checkout.c:993 builtin/worktree.c:241 builtin/worktree.c:396
+#, c-format
+msgid "invalid reference: %s"
+msgstr ""
+
+#: builtin/checkout.c:1022
+#, c-format
+msgid "reference is not a tree: %s"
+msgstr ""
+
+#: builtin/checkout.c:1061
+msgid "paths cannot be used with switching branches"
+msgstr ""
+
+#: builtin/checkout.c:1064 builtin/checkout.c:1068
+#, c-format
+msgid "'%s' cannot be used with switching branches"
+msgstr ""
+
+#: builtin/checkout.c:1072 builtin/checkout.c:1075 builtin/checkout.c:1080
+#: builtin/checkout.c:1083
+#, c-format
+msgid "'%s' cannot be used with '%s'"
+msgstr ""
+
+#: builtin/checkout.c:1088
+#, c-format
+msgid "Cannot switch branch to a non-commit '%s'"
+msgstr ""
+
+#: builtin/checkout.c:1121 builtin/checkout.c:1123 builtin/clone.c:119
+#: builtin/remote.c:168 builtin/remote.c:170 builtin/worktree.c:440
+#: builtin/worktree.c:442
+msgid "branch"
+msgstr ""
+
+#: builtin/checkout.c:1122
+msgid "create and checkout a new branch"
+msgstr ""
+
+#: builtin/checkout.c:1124
+msgid "create/reset and checkout a branch"
+msgstr ""
+
+#: builtin/checkout.c:1125
+msgid "create reflog for new branch"
+msgstr ""
+
+#: builtin/checkout.c:1126 builtin/worktree.c:444
+msgid "detach HEAD at named commit"
+msgstr ""
+
+#: builtin/checkout.c:1127
+msgid "set upstream info for new branch"
+msgstr ""
+
+#: builtin/checkout.c:1129
+msgid "new-branch"
+msgstr ""
+
+#: builtin/checkout.c:1129
+msgid "new unparented branch"
+msgstr ""
+
+#: builtin/checkout.c:1131
+msgid "checkout our version for unmerged files"
+msgstr ""
+
+#: builtin/checkout.c:1134
+msgid "checkout their version for unmerged files"
+msgstr ""
+
+#: builtin/checkout.c:1136
+msgid "force checkout (throw away local modifications)"
+msgstr ""
+
+#: builtin/checkout.c:1138
+msgid "perform a 3-way merge with the new branch"
+msgstr ""
+
+#: builtin/checkout.c:1140 builtin/merge.c:273
+msgid "update ignored files (default)"
+msgstr ""
+
+#: builtin/checkout.c:1142 builtin/log.c:1510 parse-options.h:264
+msgid "style"
+msgstr ""
+
+#: builtin/checkout.c:1143
+msgid "conflict style (merge or diff3)"
+msgstr ""
+
+#: builtin/checkout.c:1146
+msgid "do not limit pathspecs to sparse entries only"
+msgstr ""
+
+#: builtin/checkout.c:1148
+msgid "second guess 'git checkout <no-such-branch>'"
+msgstr ""
+
+#: builtin/checkout.c:1150
+msgid "do not check if another worktree is holding the given ref"
+msgstr ""
+
+#: builtin/checkout.c:1154 builtin/clone.c:86 builtin/fetch.c:138
+#: builtin/merge.c:270 builtin/pull.c:128 builtin/push.c:572
+#: builtin/send-pack.c:174
+msgid "force progress reporting"
+msgstr ""
+
+#: builtin/checkout.c:1184
+msgid "-b, -B and --orphan are mutually exclusive"
+msgstr ""
+
+#: builtin/checkout.c:1201
+msgid "--track needs a branch name"
+msgstr ""
+
+#: builtin/checkout.c:1206
+msgid "missing branch name; try -b"
+msgstr ""
+
+#: builtin/checkout.c:1243
+msgid "invalid path specification"
+msgstr ""
+
+#: builtin/checkout.c:1250
+#, c-format
+msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
+msgstr ""
+
+#: builtin/checkout.c:1254
+#, c-format
+msgid "git checkout: --detach does not take a path argument '%s'"
+msgstr ""
+
+#: builtin/checkout.c:1258
+msgid ""
+"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
+"checking out of the index."
+msgstr ""
+
+#: builtin/checkout.c:1278
+#, c-format
+msgid ""
+"'%s' matched more than one remote tracking branch.\n"
+"We found %d remotes with a reference that matched. So we fell back\n"
+"on trying to resolve the argument as a path, but failed there too!\n"
+"\n"
+"If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
+"you can do so by fully qualifying the name with the --track option:\n"
+"\n"
+" git checkout --track origin/<name>\n"
+"\n"
+"If you'd like to always have checkouts of an ambiguous <name> prefer\n"
+"one remote, e.g. the 'origin' remote, consider setting\n"
+"checkout.defaultRemote=origin in your config."
+msgstr ""
+
+#: builtin/clean.c:27
+msgid ""
+"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
+msgstr ""
+
+#: builtin/clean.c:31
+#, c-format
+msgid "Removing %s\n"
+msgstr ""
+
+#: builtin/clean.c:32
+#, c-format
+msgid "Would remove %s\n"
+msgstr ""
+
+#: builtin/clean.c:33
+#, c-format
+msgid "Skipping repository %s\n"
+msgstr ""
+
+#: builtin/clean.c:34
+#, c-format
+msgid "Would skip repository %s\n"
+msgstr ""
+
+#: builtin/clean.c:35
+#, c-format
+msgid "failed to remove %s"
+msgstr ""
+
+#: builtin/clean.c:297 git-add--interactive.perl:579
+#, 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/clean.c:301 git-add--interactive.perl:588
+#, 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/clean.c:517 git-add--interactive.perl:554
+#: git-add--interactive.perl:559
+#, c-format, perl-format
+msgid "Huh (%s)?\n"
+msgstr ""
+
+#: builtin/clean.c:659
+#, c-format
+msgid "Input ignore patterns>> "
+msgstr ""
+
+#: builtin/clean.c:696
+#, c-format
+msgid "WARNING: Cannot find items matched by: %s"
+msgstr ""
+
+#: builtin/clean.c:717
+msgid "Select items to delete"
+msgstr ""
+
+#. TRANSLATORS: Make sure to keep [y/N] as is
+#: builtin/clean.c:758
+#, c-format
+msgid "Remove %s [y/N]? "
+msgstr ""
+
+#: builtin/clean.c:783 git-add--interactive.perl:1717
+#, c-format
+msgid "Bye.\n"
+msgstr ""
+
+#: builtin/clean.c:791
+msgid ""
+"clean - start cleaning\n"
+"filter by pattern - exclude items from deletion\n"
+"select by numbers - select items to be deleted by numbers\n"
+"ask each - confirm each deletion (like \"rm -i\")\n"
+"quit - stop cleaning\n"
+"help - this screen\n"
+"? - help for prompt selection"
+msgstr ""
+
+#: builtin/clean.c:818 git-add--interactive.perl:1793
+msgid "*** Commands ***"
+msgstr ""
+
+#: builtin/clean.c:819 git-add--interactive.perl:1790
+msgid "What now"
+msgstr ""
+
+#: builtin/clean.c:827
+msgid "Would remove the following item:"
+msgid_plural "Would remove the following items:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/clean.c:843
+msgid "No more files to clean, exiting."
+msgstr ""
+
+#: builtin/clean.c:905
+msgid "do not print names of files removed"
+msgstr ""
+
+#: builtin/clean.c:907
+msgid "force"
+msgstr ""
+
+#: builtin/clean.c:908
+msgid "interactive cleaning"
+msgstr ""
+
+#: builtin/clean.c:910
+msgid "remove whole directories"
+msgstr ""
+
+#: builtin/clean.c:911 builtin/describe.c:545 builtin/describe.c:547
+#: builtin/grep.c:875 builtin/log.c:161 builtin/log.c:163
+#: builtin/ls-files.c:549 builtin/name-rev.c:415 builtin/name-rev.c:417
+#: builtin/show-ref.c:177
+msgid "pattern"
+msgstr ""
+
+#: builtin/clean.c:912
+msgid "add <pattern> to ignore rules"
+msgstr ""
+
+#: builtin/clean.c:913
+msgid "remove ignored files, too"
+msgstr ""
+
+#: builtin/clean.c:915
+msgid "remove only ignored files"
+msgstr ""
+
+#: builtin/clean.c:933
+msgid "-x and -X cannot be used together"
+msgstr ""
+
+#: builtin/clean.c:937
+msgid ""
+"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
+"clean"
+msgstr ""
+
+#: builtin/clean.c:940
+msgid ""
+"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
+"refusing to clean"
+msgstr ""
+
+#: builtin/clone.c:43
+msgid "git clone [<options>] [--] <repo> [<dir>]"
+msgstr ""
+
+#: builtin/clone.c:88
+msgid "don't create a checkout"
+msgstr ""
+
+#: builtin/clone.c:89 builtin/clone.c:91 builtin/init-db.c:480
+msgid "create a bare repository"
+msgstr ""
+
+#: builtin/clone.c:93
+msgid "create a mirror repository (implies bare)"
+msgstr ""
+
+#: builtin/clone.c:95
+msgid "to clone from a local repository"
+msgstr ""
+
+#: builtin/clone.c:97
+msgid "don't use local hardlinks, always copy"
+msgstr ""
+
+#: builtin/clone.c:99
+msgid "setup as shared repository"
+msgstr ""
+
+#: builtin/clone.c:101 builtin/clone.c:105
+msgid "pathspec"
+msgstr ""
+
+#: builtin/clone.c:101 builtin/clone.c:105
+msgid "initialize submodules in the clone"
+msgstr ""
+
+#: builtin/clone.c:108
+msgid "number of submodules cloned in parallel"
+msgstr ""
+
+#: builtin/clone.c:109 builtin/init-db.c:477
+msgid "template-directory"
+msgstr ""
+
+#: builtin/clone.c:110 builtin/init-db.c:478
+msgid "directory from which templates will be used"
+msgstr ""
+
+#: builtin/clone.c:112 builtin/clone.c:114 builtin/submodule--helper.c:1368
+#: builtin/submodule--helper.c:1739
+msgid "reference repository"
+msgstr ""
+
+#: builtin/clone.c:116 builtin/submodule--helper.c:1370
+#: builtin/submodule--helper.c:1741
+msgid "use --reference only while cloning"
+msgstr ""
+
+#: builtin/clone.c:117 builtin/column.c:27 builtin/merge-file.c:44
+#: builtin/pack-objects.c:3191 builtin/repack.c:320
+msgid "name"
+msgstr ""
+
+#: builtin/clone.c:118
+msgid "use <name> instead of 'origin' to track upstream"
+msgstr ""
+
+#: builtin/clone.c:120
+msgid "checkout <branch> instead of the remote's HEAD"
+msgstr ""
+
+#: builtin/clone.c:122
+msgid "path to git-upload-pack on the remote"
+msgstr ""
+
+#: builtin/clone.c:123 builtin/fetch.c:139 builtin/grep.c:814
+#: builtin/pull.c:216
+msgid "depth"
+msgstr ""
+
+#: builtin/clone.c:124
+msgid "create a shallow clone of that depth"
+msgstr ""
+
+#: builtin/clone.c:125 builtin/fetch.c:141 builtin/pack-objects.c:3182
+#: parse-options.h:154
+msgid "time"
+msgstr ""
+
+#: builtin/clone.c:126
+msgid "create a shallow clone since a specific time"
+msgstr ""
+
+#: builtin/clone.c:127 builtin/fetch.c:143 builtin/fetch.c:166
+msgid "revision"
+msgstr ""
+
+#: builtin/clone.c:128 builtin/fetch.c:144
+msgid "deepen history of shallow clone, excluding rev"
+msgstr ""
+
+#: builtin/clone.c:130
+msgid "clone only one branch, HEAD or --branch"
+msgstr ""
+
+#: builtin/clone.c:132
+msgid "don't clone any tags, and make later fetches not to follow them"
+msgstr ""
+
+#: builtin/clone.c:134
+msgid "any cloned submodules will be shallow"
+msgstr ""
+
+#: builtin/clone.c:135 builtin/init-db.c:486
+msgid "gitdir"
+msgstr ""
+
+#: builtin/clone.c:136 builtin/init-db.c:487
+msgid "separate git dir from working tree"
+msgstr ""
+
+#: builtin/clone.c:137
+msgid "key=value"
+msgstr ""
+
+#: builtin/clone.c:138
+msgid "set config inside the new repository"
+msgstr ""
+
+#: builtin/clone.c:139 builtin/fetch.c:162 builtin/pull.c:229
+#: builtin/push.c:583
+msgid "use IPv4 addresses only"
+msgstr ""
+
+#: builtin/clone.c:141 builtin/fetch.c:164 builtin/pull.c:232
+#: builtin/push.c:585
+msgid "use IPv6 addresses only"
+msgstr ""
+
+#: builtin/clone.c:279
+msgid ""
+"No directory name could be guessed.\n"
+"Please specify a directory on the command line"
+msgstr ""
+
+#: builtin/clone.c:332
+#, c-format
+msgid "info: Could not add alternate for '%s': %s\n"
+msgstr ""
+
+#: builtin/clone.c:404
+#, c-format
+msgid "failed to open '%s'"
+msgstr ""
+
+#: builtin/clone.c:412
+#, c-format
+msgid "%s exists and is not a directory"
+msgstr ""
+
+#: builtin/clone.c:426
+#, c-format
+msgid "failed to stat %s\n"
+msgstr ""
+
+#: builtin/clone.c:448
+#, c-format
+msgid "failed to create link '%s'"
+msgstr ""
+
+#: builtin/clone.c:452
+#, c-format
+msgid "failed to copy file to '%s'"
+msgstr ""
+
+#: builtin/clone.c:478
+#, c-format
+msgid "done.\n"
+msgstr ""
+
+#: builtin/clone.c:492
+msgid ""
+"Clone succeeded, but checkout failed.\n"
+"You can inspect what was checked out with 'git status'\n"
+"and retry the checkout with 'git checkout -f HEAD'\n"
+msgstr ""
+
+#: builtin/clone.c:569
+#, c-format
+msgid "Could not find remote branch %s to clone."
+msgstr ""
+
+#: builtin/clone.c:680
+#, c-format
+msgid "unable to update %s"
+msgstr ""
+
+#: builtin/clone.c:730
+msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
+msgstr ""
+
+#: builtin/clone.c:760
+msgid "unable to checkout working tree"
+msgstr ""
+
+#: builtin/clone.c:805
+msgid "unable to write parameters to config file"
+msgstr ""
+
+#: builtin/clone.c:868
+msgid "cannot repack to clean up"
+msgstr ""
+
+#: builtin/clone.c:870
+msgid "cannot unlink temporary alternates file"
+msgstr ""
+
+#: builtin/clone.c:910 builtin/receive-pack.c:1935
+msgid "Too many arguments."
+msgstr ""
+
+#: builtin/clone.c:914
+msgid "You must specify a repository to clone."
+msgstr ""
+
+#: builtin/clone.c:927
+#, c-format
+msgid "--bare and --origin %s options are incompatible."
+msgstr ""
+
+#: builtin/clone.c:930
+msgid "--bare and --separate-git-dir are incompatible."
+msgstr ""
+
+#: builtin/clone.c:943
+#, c-format
+msgid "repository '%s' does not exist"
+msgstr ""
+
+#: builtin/clone.c:949 builtin/fetch.c:1512
+#, c-format
+msgid "depth %s is not a positive number"
+msgstr ""
+
+#: builtin/clone.c:959
+#, c-format
+msgid "destination path '%s' already exists and is not an empty directory."
+msgstr ""
+
+#: builtin/clone.c:969
+#, c-format
+msgid "working tree '%s' already exists."
+msgstr ""
+
+#: builtin/clone.c:984 builtin/clone.c:1005 builtin/difftool.c:271
+#: builtin/worktree.c:247 builtin/worktree.c:277
+#, c-format
+msgid "could not create leading directories of '%s'"
+msgstr ""
+
+#: builtin/clone.c:989
+#, c-format
+msgid "could not create work tree dir '%s'"
+msgstr ""
+
+#: builtin/clone.c:1009
+#, c-format
+msgid "Cloning into bare repository '%s'...\n"
+msgstr ""
+
+#: builtin/clone.c:1011
+#, c-format
+msgid "Cloning into '%s'...\n"
+msgstr ""
+
+#: builtin/clone.c:1035
+msgid ""
+"clone --recursive is not compatible with both --reference and --reference-if-"
+"able"
+msgstr ""
+
+#: builtin/clone.c:1096
+msgid "--depth is ignored in local clones; use file:// instead."
+msgstr ""
+
+#: builtin/clone.c:1098
+msgid "--shallow-since is ignored in local clones; use file:// instead."
+msgstr ""
+
+#: builtin/clone.c:1100
+msgid "--shallow-exclude is ignored in local clones; use file:// instead."
+msgstr ""
+
+#: builtin/clone.c:1102
+msgid "--filter is ignored in local clones; use file:// instead."
+msgstr ""
+
+#: builtin/clone.c:1105
+msgid "source repository is shallow, ignoring --local"
+msgstr ""
+
+#: builtin/clone.c:1110
+msgid "--local is ignored"
+msgstr ""
+
+#: builtin/clone.c:1180 builtin/clone.c:1188
+#, c-format
+msgid "Remote branch %s not found in upstream %s"
+msgstr ""
+
+#: builtin/clone.c:1191
+msgid "You appear to have cloned an empty repository."
+msgstr ""
+
+#: builtin/column.c:10
+msgid "git column [<options>]"
+msgstr ""
+
+#: builtin/column.c:27
+msgid "lookup config vars"
+msgstr ""
+
+#: builtin/column.c:28 builtin/column.c:29
+msgid "layout to use"
+msgstr ""
+
+#: builtin/column.c:30
+msgid "Maximum width"
+msgstr ""
+
+#: builtin/column.c:31
+msgid "Padding space on left border"
+msgstr ""
+
+#: builtin/column.c:32
+msgid "Padding space on right border"
+msgstr ""
+
+#: builtin/column.c:33
+msgid "Padding space between columns"
+msgstr ""
+
+#: builtin/column.c:51
+msgid "--command must be the first argument"
+msgstr ""
+
+#: builtin/commit.c:38
+msgid "git commit [<options>] [--] <pathspec>..."
+msgstr ""
+
+#: builtin/commit.c:43
+msgid "git status [<options>] [--] <pathspec>..."
+msgstr ""
+
+#: builtin/commit.c:48
+msgid ""
+"You asked to amend the most recent commit, but doing so would make\n"
+"it empty. You can repeat your command with --allow-empty, or you can\n"
+"remove the commit entirely with \"git reset HEAD^\".\n"
+msgstr ""
+
+#: builtin/commit.c:53
+msgid ""
+"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
+"If you wish to commit it anyway, use:\n"
+"\n"
+" git commit --allow-empty\n"
+"\n"
+msgstr ""
+
+#: builtin/commit.c:60
+msgid "Otherwise, please use 'git reset'\n"
+msgstr ""
+
+#: builtin/commit.c:63
+msgid ""
+"If you wish to skip this commit, use:\n"
+"\n"
+" git reset\n"
+"\n"
+"Then \"git cherry-pick --continue\" will resume cherry-picking\n"
+"the remaining commits.\n"
+msgstr ""
+
+#: builtin/commit.c:306
+msgid "failed to unpack HEAD tree object"
+msgstr ""
+
+#: builtin/commit.c:347
+msgid "unable to create temporary index"
+msgstr ""
+
+#: builtin/commit.c:353
+msgid "interactive add failed"
+msgstr ""
+
+#: builtin/commit.c:366
+msgid "unable to update temporary index"
+msgstr ""
+
+#: builtin/commit.c:368
+msgid "Failed to update main cache tree"
+msgstr ""
+
+#: builtin/commit.c:393 builtin/commit.c:416 builtin/commit.c:462
+msgid "unable to write new_index file"
+msgstr ""
+
+#: builtin/commit.c:445
+msgid "cannot do a partial commit during a merge."
+msgstr ""
+
+#: builtin/commit.c:447
+msgid "cannot do a partial commit during a cherry-pick."
+msgstr ""
+
+#: builtin/commit.c:455
+msgid "cannot read the index"
+msgstr ""
+
+#: builtin/commit.c:474
+msgid "unable to write temporary index file"
+msgstr ""
+
+#: builtin/commit.c:571
+#, c-format
+msgid "commit '%s' lacks author header"
+msgstr ""
+
+#: builtin/commit.c:573
+#, c-format
+msgid "commit '%s' has malformed author line"
+msgstr ""
+
+#: builtin/commit.c:592
+msgid "malformed --author parameter"
+msgstr ""
+
+#: builtin/commit.c:644
+msgid ""
+"unable to select a comment character that is not used\n"
+"in the current commit message"
+msgstr ""
+
+#: builtin/commit.c:681 builtin/commit.c:714 builtin/commit.c:1042
+#, c-format
+msgid "could not lookup commit %s"
+msgstr ""
+
+#: builtin/commit.c:693 builtin/shortlog.c:317
+#, c-format
+msgid "(reading log message from standard input)\n"
+msgstr ""
+
+#: builtin/commit.c:695
+msgid "could not read log from standard input"
+msgstr ""
+
+#: builtin/commit.c:699
+#, c-format
+msgid "could not read log file '%s'"
+msgstr ""
+
+#: builtin/commit.c:728 builtin/commit.c:736
+msgid "could not read SQUASH_MSG"
+msgstr ""
+
+#: builtin/commit.c:733
+msgid "could not read MERGE_MSG"
+msgstr ""
+
+#: builtin/commit.c:787
+msgid "could not write commit template"
+msgstr ""
+
+#: builtin/commit.c:805
+#, c-format
+msgid ""
+"\n"
+"It looks like you may be committing a merge.\n"
+"If this is not correct, please remove the file\n"
+"\t%s\n"
+"and try again.\n"
+msgstr ""
+
+#: builtin/commit.c:810
+#, c-format
+msgid ""
+"\n"
+"It looks like you may be committing a cherry-pick.\n"
+"If this is not correct, please remove the file\n"
+"\t%s\n"
+"and try again.\n"
+msgstr ""
+
+#: builtin/commit.c:823
+#, c-format
+msgid ""
+"Please enter the commit message for your changes. Lines starting\n"
+"with '%c' will be ignored, and an empty message aborts the commit.\n"
+msgstr ""
+
+#: builtin/commit.c:831
+#, c-format
+msgid ""
+"Please enter the commit message for your changes. Lines starting\n"
+"with '%c' will be kept; you may remove them yourself if you want to.\n"
+"An empty message aborts the commit.\n"
+msgstr ""
+
+#: builtin/commit.c:848
+#, c-format
+msgid "%sAuthor: %.*s <%.*s>"
+msgstr ""
+
+#: builtin/commit.c:856
+#, c-format
+msgid "%sDate: %s"
+msgstr ""
+
+#: builtin/commit.c:863
+#, c-format
+msgid "%sCommitter: %.*s <%.*s>"
+msgstr ""
+
+#: builtin/commit.c:880
+msgid "Cannot read index"
+msgstr ""
+
+#: builtin/commit.c:946
+msgid "Error building trees"
+msgstr ""
+
+#: builtin/commit.c:960 builtin/tag.c:258
+#, c-format
+msgid "Please supply the message using either -m or -F option.\n"
+msgstr ""
+
+#: builtin/commit.c:1004
+#, c-format
+msgid "--author '%s' is not 'Name <email>' and matches no existing author"
+msgstr ""
+
+#: builtin/commit.c:1018
+#, c-format
+msgid "Invalid ignored mode '%s'"
+msgstr ""
+
+#: builtin/commit.c:1032 builtin/commit.c:1269
+#, c-format
+msgid "Invalid untracked files mode '%s'"
+msgstr ""
+
+#: builtin/commit.c:1070
+msgid "--long and -z are incompatible"
+msgstr ""
+
+#: builtin/commit.c:1103
+msgid "Using both --reset-author and --author does not make sense"
+msgstr ""
+
+#: builtin/commit.c:1112
+msgid "You have nothing to amend."
+msgstr ""
+
+#: builtin/commit.c:1115
+msgid "You are in the middle of a merge -- cannot amend."
+msgstr ""
+
+#: builtin/commit.c:1117
+msgid "You are in the middle of a cherry-pick -- cannot amend."
+msgstr ""
+
+#: builtin/commit.c:1120
+msgid "Options --squash and --fixup cannot be used together"
+msgstr ""
+
+#: builtin/commit.c:1130
+msgid "Only one of -c/-C/-F/--fixup can be used."
+msgstr ""
+
+#: builtin/commit.c:1132
+msgid "Option -m cannot be combined with -c/-C/-F."
+msgstr ""
+
+#: builtin/commit.c:1140
+msgid "--reset-author can be used only with -C, -c or --amend."
+msgstr ""
+
+#: builtin/commit.c:1157
+msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
+msgstr ""
+
+#: builtin/commit.c:1159
+msgid "No paths with --include/--only does not make sense."
+msgstr ""
+
+#: builtin/commit.c:1173 builtin/tag.c:544
+#, c-format
+msgid "Invalid cleanup mode %s"
+msgstr ""
+
+#: builtin/commit.c:1178
+msgid "Paths with -a does not make sense."
+msgstr ""
+
+#: builtin/commit.c:1303 builtin/commit.c:1480
+msgid "show status concisely"
+msgstr ""
+
+#: builtin/commit.c:1305 builtin/commit.c:1482
+msgid "show branch information"
+msgstr ""
+
+#: builtin/commit.c:1307
+msgid "show stash information"
+msgstr ""
+
+#: builtin/commit.c:1309 builtin/commit.c:1484
+msgid "compute full ahead/behind values"
+msgstr ""
+
+#: builtin/commit.c:1311
+msgid "version"
+msgstr ""
+
+#: builtin/commit.c:1311 builtin/commit.c:1486 builtin/push.c:558
+#: builtin/worktree.c:591
+msgid "machine-readable output"
+msgstr ""
+
+#: builtin/commit.c:1314 builtin/commit.c:1488
+msgid "show status in long format (default)"
+msgstr ""
+
+#: builtin/commit.c:1317 builtin/commit.c:1491
+msgid "terminate entries with NUL"
+msgstr ""
+
+#: builtin/commit.c:1319 builtin/commit.c:1323 builtin/commit.c:1494
+#: builtin/fast-export.c:1007 builtin/fast-export.c:1010 builtin/tag.c:398
+msgid "mode"
+msgstr ""
+
+#: builtin/commit.c:1320 builtin/commit.c:1494
+msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
+msgstr ""
+
+#: builtin/commit.c:1324
+msgid ""
+"show ignored files, optional modes: traditional, matching, no. (Default: "
+"traditional)"
+msgstr ""
+
+#: builtin/commit.c:1326 parse-options.h:167
+msgid "when"
+msgstr ""
+
+#: builtin/commit.c:1327
+msgid ""
+"ignore changes to submodules, optional when: all, dirty, untracked. "
+"(Default: all)"
+msgstr ""
+
+#: builtin/commit.c:1329
+msgid "list untracked files in columns"
+msgstr ""
+
+#: builtin/commit.c:1330
+msgid "do not detect renames"
+msgstr ""
+
+#: builtin/commit.c:1332
+msgid "detect renames, optionally set similarity index"
+msgstr ""
+
+#: builtin/commit.c:1352
+msgid "Unsupported combination of ignored and untracked-files arguments"
+msgstr ""
+
+#: builtin/commit.c:1450
+msgid "suppress summary after successful commit"
+msgstr ""
+
+#: builtin/commit.c:1451
+msgid "show diff in commit message template"
+msgstr ""
+
+#: builtin/commit.c:1453
+msgid "Commit message options"
+msgstr ""
+
+#: builtin/commit.c:1454 builtin/merge.c:261 builtin/tag.c:395
+msgid "read message from file"
+msgstr ""
+
+#: builtin/commit.c:1455
+msgid "author"
+msgstr ""
+
+#: builtin/commit.c:1455
+msgid "override author for commit"
+msgstr ""
+
+#: builtin/commit.c:1456 builtin/gc.c:504
+msgid "date"
+msgstr ""
+
+#: builtin/commit.c:1456
+msgid "override date for commit"
+msgstr ""
+
+#: builtin/commit.c:1457 builtin/merge.c:257 builtin/notes.c:404
+#: builtin/notes.c:567 builtin/tag.c:393
+msgid "message"
+msgstr ""
+
+#: builtin/commit.c:1457
+msgid "commit message"
+msgstr ""
+
+#: builtin/commit.c:1458 builtin/commit.c:1459 builtin/commit.c:1460
+#: builtin/commit.c:1461 parse-options.h:270 ref-filter.h:92
+msgid "commit"
+msgstr ""
+
+#: builtin/commit.c:1458
+msgid "reuse and edit message from specified commit"
+msgstr ""
+
+#: builtin/commit.c:1459
+msgid "reuse message from specified commit"
+msgstr ""
+
+#: builtin/commit.c:1460
+msgid "use autosquash formatted message to fixup specified commit"
+msgstr ""
+
+#: builtin/commit.c:1461
+msgid "use autosquash formatted message to squash specified commit"
+msgstr ""
+
+#: builtin/commit.c:1462
+msgid "the commit is authored by me now (used with -C/-c/--amend)"
+msgstr ""
+
+#: builtin/commit.c:1463 builtin/log.c:1457 builtin/merge.c:274
+#: builtin/pull.c:154 builtin/revert.c:106
+msgid "add Signed-off-by:"
+msgstr ""
+
+#: builtin/commit.c:1464
+msgid "use specified template file"
+msgstr ""
+
+#: builtin/commit.c:1465
+msgid "force edit of commit"
+msgstr ""
+
+#: builtin/commit.c:1466
+msgid "default"
+msgstr ""
+
+#: builtin/commit.c:1466 builtin/tag.c:399
+msgid "how to strip spaces and #comments from message"
+msgstr ""
+
+#: builtin/commit.c:1467
+msgid "include status in commit message template"
+msgstr ""
+
+#: builtin/commit.c:1469 builtin/merge.c:272 builtin/pull.c:184
+#: builtin/revert.c:114
+msgid "GPG sign commit"
+msgstr ""
+
+#: builtin/commit.c:1472
+msgid "Commit contents options"
+msgstr ""
+
+#: builtin/commit.c:1473
+msgid "commit all changed files"
+msgstr ""
+
+#: builtin/commit.c:1474
+msgid "add specified files to index for commit"
+msgstr ""
+
+#: builtin/commit.c:1475
+msgid "interactively add files"
+msgstr ""
+
+#: builtin/commit.c:1476
+msgid "interactively add changes"
+msgstr ""
+
+#: builtin/commit.c:1477
+msgid "commit only specified files"
+msgstr ""
+
+#: builtin/commit.c:1478
+msgid "bypass pre-commit and commit-msg hooks"
+msgstr ""
+
+#: builtin/commit.c:1479
+msgid "show what would be committed"
+msgstr ""
+
+#: builtin/commit.c:1492
+msgid "amend previous commit"
+msgstr ""
+
+#: builtin/commit.c:1493
+msgid "bypass post-rewrite hook"
+msgstr ""
+
+#: builtin/commit.c:1498
+msgid "ok to record an empty change"
+msgstr ""
+
+#: builtin/commit.c:1500
+msgid "ok to record a change with an empty message"
+msgstr ""
+
+#: builtin/commit.c:1573
+#, c-format
+msgid "Corrupt MERGE_HEAD file (%s)"
+msgstr ""
+
+#: builtin/commit.c:1580
+msgid "could not read MERGE_MODE"
+msgstr ""
+
+#: builtin/commit.c:1599
+#, c-format
+msgid "could not read commit message: %s"
+msgstr ""
+
+#: builtin/commit.c:1610
+#, c-format
+msgid "Aborting commit due to empty commit message.\n"
+msgstr ""
+
+#: builtin/commit.c:1615
+#, c-format
+msgid "Aborting commit; you did not edit the message.\n"
+msgstr ""
+
+#: builtin/commit.c:1650
+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/commit-graph.c:10
+msgid "git commit-graph [--object-dir <objdir>]"
+msgstr ""
+
+#: builtin/commit-graph.c:11 builtin/commit-graph.c:23
+msgid "git commit-graph read [--object-dir <objdir>]"
+msgstr ""
+
+#: builtin/commit-graph.c:12 builtin/commit-graph.c:18
+msgid "git commit-graph verify [--object-dir <objdir>]"
+msgstr ""
+
+#: builtin/commit-graph.c:13 builtin/commit-graph.c:28
+msgid ""
+"git commit-graph write [--object-dir <objdir>] [--append] [--reachable|--"
+"stdin-packs|--stdin-commits]"
+msgstr ""
+
+#: builtin/commit-graph.c:48 builtin/commit-graph.c:77
+#: builtin/commit-graph.c:131 builtin/commit-graph.c:184 builtin/fetch.c:150
+#: builtin/log.c:1477
+msgid "dir"
+msgstr ""
+
+#: builtin/commit-graph.c:49 builtin/commit-graph.c:78
+#: builtin/commit-graph.c:132 builtin/commit-graph.c:185
+msgid "The object directory to store the graph"
+msgstr ""
+
+#: builtin/commit-graph.c:134
+msgid "start walk at all refs"
+msgstr ""
+
+#: builtin/commit-graph.c:136
+msgid "scan pack-indexes listed by stdin for commits"
+msgstr ""
+
+#: builtin/commit-graph.c:138
+msgid "start walk at commits listed by stdin"
+msgstr ""
+
+#: builtin/commit-graph.c:140
+msgid "include all commits already in the commit-graph file"
+msgstr ""
+
+#: builtin/commit-graph.c:149
+msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
+msgstr ""
+
+#: builtin/config.c:10
+msgid "git config [<options>]"
+msgstr ""
+
+#: builtin/config.c:101
+#, c-format
+msgid "unrecognized --type argument, %s"
+msgstr ""
+
+#: builtin/config.c:113
+msgid "only one type at a time"
+msgstr ""
+
+#: builtin/config.c:122
+msgid "Config file location"
+msgstr ""
+
+#: builtin/config.c:123
+msgid "use global config file"
+msgstr ""
+
+#: builtin/config.c:124
+msgid "use system config file"
+msgstr ""
+
+#: builtin/config.c:125
+msgid "use repository config file"
+msgstr ""
+
+#: builtin/config.c:126
+msgid "use given config file"
+msgstr ""
+
+#: builtin/config.c:127
+msgid "blob-id"
+msgstr ""
+
+#: builtin/config.c:127
+msgid "read config from given blob object"
+msgstr ""
+
+#: builtin/config.c:128
+msgid "Action"
+msgstr ""
+
+#: builtin/config.c:129
+msgid "get value: name [value-regex]"
+msgstr ""
+
+#: builtin/config.c:130
+msgid "get all values: key [value-regex]"
+msgstr ""
+
+#: builtin/config.c:131
+msgid "get values for regexp: name-regex [value-regex]"
+msgstr ""
+
+#: builtin/config.c:132
+msgid "get value specific for the URL: section[.var] URL"
+msgstr ""
+
+#: builtin/config.c:133
+msgid "replace all matching variables: name value [value_regex]"
+msgstr ""
+
+#: builtin/config.c:134
+msgid "add a new variable: name value"
+msgstr ""
+
+#: builtin/config.c:135
+msgid "remove a variable: name [value-regex]"
+msgstr ""
+
+#: builtin/config.c:136
+msgid "remove all matches: name [value-regex]"
+msgstr ""
+
+#: builtin/config.c:137
+msgid "rename section: old-name new-name"
+msgstr ""
+
+#: builtin/config.c:138
+msgid "remove a section: name"
+msgstr ""
+
+#: builtin/config.c:139
+msgid "list all"
+msgstr ""
+
+#: builtin/config.c:140
+msgid "open an editor"
+msgstr ""
+
+#: builtin/config.c:141
+msgid "find the color configured: slot [default]"
+msgstr ""
+
+#: builtin/config.c:142
+msgid "find the color setting: slot [stdout-is-tty]"
+msgstr ""
+
+#: builtin/config.c:143
+msgid "Type"
+msgstr ""
+
+#: builtin/config.c:144
+msgid "value is given this type"
+msgstr ""
+
+#: builtin/config.c:145
+msgid "value is \"true\" or \"false\""
+msgstr ""
+
+#: builtin/config.c:146
+msgid "value is decimal number"
+msgstr ""
+
+#: builtin/config.c:147
+msgid "value is --bool or --int"
+msgstr ""
+
+#: builtin/config.c:148
+msgid "value is a path (file or directory name)"
+msgstr ""
+
+#: builtin/config.c:149
+msgid "value is an expiry date"
+msgstr ""
+
+#: builtin/config.c:150
+msgid "Other"
+msgstr ""
+
+#: builtin/config.c:151
+msgid "terminate values with NUL byte"
+msgstr ""
+
+#: builtin/config.c:152
+msgid "show variable names only"
+msgstr ""
+
+#: builtin/config.c:153
+msgid "respect include directives on lookup"
+msgstr ""
+
+#: builtin/config.c:154
+msgid "show origin of config (file, standard input, blob, command line)"
+msgstr ""
+
+#: builtin/config.c:155
+msgid "value"
+msgstr ""
+
+#: builtin/config.c:155
+msgid "with --get, use default value when missing entry"
+msgstr ""
+
+#: builtin/config.c:168
+#, c-format
+msgid "wrong number of arguments, should be %d"
+msgstr ""
+
+#: builtin/config.c:170
+#, c-format
+msgid "wrong number of arguments, should be from %d to %d"
+msgstr ""
+
+#: builtin/config.c:304
+#, c-format
+msgid "invalid key pattern: %s"
+msgstr ""
+
+#: builtin/config.c:340
+#, c-format
+msgid "failed to format default config value: %s"
+msgstr ""
+
+#: builtin/config.c:397
+#, c-format
+msgid "cannot parse color '%s'"
+msgstr ""
+
+#: builtin/config.c:439
+msgid "unable to parse default color value"
+msgstr ""
+
+#: builtin/config.c:492 builtin/config.c:724
+msgid "not in a git directory"
+msgstr ""
+
+#: builtin/config.c:495
+msgid "writing to stdin is not supported"
+msgstr ""
+
+#: builtin/config.c:498
+msgid "writing config blobs is not supported"
+msgstr ""
+
+#: builtin/config.c:583
+#, 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/config.c:606
+msgid "only one config file at a time"
+msgstr ""
+
+#: builtin/config.c:611
+msgid "--local can only be used inside a git repository"
+msgstr ""
+
+#: builtin/config.c:614
+msgid "--blob can only be used inside a git repository"
+msgstr ""
+
+#: builtin/config.c:633
+msgid "$HOME not set"
+msgstr ""
+
+#: builtin/config.c:670
+msgid "--get-color and variable type are incoherent"
+msgstr ""
+
+#: builtin/config.c:675
+msgid "only one action at a time"
+msgstr ""
+
+#: builtin/config.c:688
+msgid "--name-only is only applicable to --list or --get-regexp"
+msgstr ""
+
+#: builtin/config.c:694
+msgid ""
+"--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
+"list"
+msgstr ""
+
+#: builtin/config.c:700
+msgid "--default is only applicable to --get"
+msgstr ""
+
+#: builtin/config.c:713
+#, c-format
+msgid "unable to read config file '%s'"
+msgstr ""
+
+#: builtin/config.c:716
+msgid "error processing config file(s)"
+msgstr ""
+
+#: builtin/config.c:726
+msgid "editing stdin is not supported"
+msgstr ""
+
+#: builtin/config.c:728
+msgid "editing blobs is not supported"
+msgstr ""
+
+#: builtin/config.c:742
+#, c-format
+msgid "cannot create configuration file %s"
+msgstr ""
+
+#: builtin/config.c:755
+#, c-format
+msgid ""
+"cannot overwrite multiple values with a single value\n"
+" Use a regexp, --add or --replace-all to change %s."
+msgstr ""
+
+#: builtin/config.c:829 builtin/config.c:840
+#, c-format
+msgid "no such section: %s"
+msgstr ""
+
+#: builtin/count-objects.c:90
+msgid "git count-objects [-v] [-H | --human-readable]"
+msgstr ""
+
+#: builtin/count-objects.c:100
+msgid "print sizes in human readable format"
+msgstr ""
+
+#: builtin/describe.c:26
+msgid "git describe [<options>] [<commit-ish>...]"
+msgstr ""
+
+#: builtin/describe.c:27
+msgid "git describe [<options>] --dirty"
+msgstr ""
+
+#: builtin/describe.c:62
+msgid "head"
+msgstr ""
+
+#: builtin/describe.c:62
+msgid "lightweight"
+msgstr ""
+
+#: builtin/describe.c:62
+msgid "annotated"
+msgstr ""
+
+#: builtin/describe.c:272
+#, c-format
+msgid "annotated tag %s not available"
+msgstr ""
+
+#: builtin/describe.c:276
+#, c-format
+msgid "annotated tag %s has no embedded name"
+msgstr ""
+
+#: builtin/describe.c:278
+#, c-format
+msgid "tag '%s' is really '%s' here"
+msgstr ""
+
+#: builtin/describe.c:322
+#, c-format
+msgid "no tag exactly matches '%s'"
+msgstr ""
+
+#: builtin/describe.c:324
+#, c-format
+msgid "No exact match on refs or tags, searching to describe\n"
+msgstr ""
+
+#: builtin/describe.c:378
+#, c-format
+msgid "finished search at %s\n"
+msgstr ""
+
+#: builtin/describe.c:404
+#, c-format
+msgid ""
+"No annotated tags can describe '%s'.\n"
+"However, there were unannotated tags: try --tags."
+msgstr ""
+
+#: builtin/describe.c:408
+#, c-format
+msgid ""
+"No tags can describe '%s'.\n"
+"Try --always, or create some tags."
+msgstr ""
+
+#: builtin/describe.c:438
+#, c-format
+msgid "traversed %lu commits\n"
+msgstr ""
+
+#: builtin/describe.c:441
+#, c-format
+msgid ""
+"more than %i tags found; listed %i most recent\n"
+"gave up search at %s\n"
+msgstr ""
+
+#: builtin/describe.c:509
+#, c-format
+msgid "describe %s\n"
+msgstr ""
+
+#: builtin/describe.c:512 builtin/log.c:508
+#, c-format
+msgid "Not a valid object name %s"
+msgstr ""
+
+#: builtin/describe.c:520
+#, c-format
+msgid "%s is neither a commit nor blob"
+msgstr ""
+
+#: builtin/describe.c:534
+msgid "find the tag that comes after the commit"
+msgstr ""
+
+#: builtin/describe.c:535
+msgid "debug search strategy on stderr"
+msgstr ""
+
+#: builtin/describe.c:536
+msgid "use any ref"
+msgstr ""
+
+#: builtin/describe.c:537
+msgid "use any tag, even unannotated"
+msgstr ""
+
+#: builtin/describe.c:538
+msgid "always use long format"
+msgstr ""
+
+#: builtin/describe.c:539
+msgid "only follow first parent"
+msgstr ""
+
+#: builtin/describe.c:542
+msgid "only output exact matches"
+msgstr ""
+
+#: builtin/describe.c:544
+msgid "consider <n> most recent tags (default: 10)"
+msgstr ""
+
+#: builtin/describe.c:546
+msgid "only consider tags matching <pattern>"
+msgstr ""
+
+#: builtin/describe.c:548
+msgid "do not consider tags matching <pattern>"
+msgstr ""
+
+#: builtin/describe.c:550 builtin/name-rev.c:424
+msgid "show abbreviated commit object as fallback"
+msgstr ""
+
+#: builtin/describe.c:551 builtin/describe.c:554
+msgid "mark"
+msgstr ""
+
+#: builtin/describe.c:552
+msgid "append <mark> on dirty working tree (default: \"-dirty\")"
+msgstr ""
+
+#: builtin/describe.c:555
+msgid "append <mark> on broken working tree (default: \"-broken\")"
+msgstr ""
+
+#: builtin/describe.c:573
+msgid "--long is incompatible with --abbrev=0"
+msgstr ""
+
+#: builtin/describe.c:602
+msgid "No names found, cannot describe anything."
+msgstr ""
+
+#: builtin/describe.c:652
+msgid "--dirty is incompatible with commit-ishes"
+msgstr ""
+
+#: builtin/describe.c:654
+msgid "--broken is incompatible with commit-ishes"
+msgstr ""
+
+#: builtin/diff.c:83
+#, c-format
+msgid "'%s': not a regular file or symlink"
+msgstr ""
+
+#: builtin/diff.c:234
+#, c-format
+msgid "invalid option: %s"
+msgstr ""
+
+#: builtin/diff.c:363
+msgid "Not a git repository"
+msgstr ""
+
+#: builtin/diff.c:407
+#, c-format
+msgid "invalid object '%s' given."
+msgstr ""
+
+#: builtin/diff.c:416
+#, c-format
+msgid "more than two blobs given: '%s'"
+msgstr ""
+
+#: builtin/diff.c:421
+#, c-format
+msgid "unhandled object '%s' given."
+msgstr ""
+
+#: builtin/difftool.c:30
+msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
+msgstr ""
+
+#: builtin/difftool.c:260
+#, c-format
+msgid "failed: %d"
+msgstr ""
+
+#: builtin/difftool.c:302
+#, c-format
+msgid "could not read symlink %s"
+msgstr ""
+
+#: builtin/difftool.c:304
+#, c-format
+msgid "could not read symlink file %s"
+msgstr ""
+
+#: builtin/difftool.c:312
+#, c-format
+msgid "could not read object %s for symlink %s"
+msgstr ""
+
+#: builtin/difftool.c:413
+msgid ""
+"combined diff formats('-c' and '--cc') are not supported in\n"
+"directory diff mode('-d' and '--dir-diff')."
+msgstr ""
+
+#: builtin/difftool.c:633
+#, c-format
+msgid "both files modified: '%s' and '%s'."
+msgstr ""
+
+#: builtin/difftool.c:635
+msgid "working tree file has been left."
+msgstr ""
+
+#: builtin/difftool.c:646
+#, c-format
+msgid "temporary files exist in '%s'."
+msgstr ""
+
+#: builtin/difftool.c:647
+msgid "you may want to cleanup or recover these."
+msgstr ""
+
+#: builtin/difftool.c:696
+msgid "use `diff.guitool` instead of `diff.tool`"
+msgstr ""
+
+#: builtin/difftool.c:698
+msgid "perform a full-directory diff"
+msgstr ""
+
+#: builtin/difftool.c:700
+msgid "do not prompt before launching a diff tool"
+msgstr ""
+
+#: builtin/difftool.c:705
+msgid "use symlinks in dir-diff mode"
+msgstr ""
+
+#: builtin/difftool.c:706
+msgid "tool"
+msgstr ""
+
+#: builtin/difftool.c:707
+msgid "use the specified diff tool"
+msgstr ""
+
+#: builtin/difftool.c:709
+msgid "print a list of diff tools that may be used with `--tool`"
+msgstr ""
+
+#: builtin/difftool.c:712
+msgid ""
+"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
+"code"
+msgstr ""
+
+#: builtin/difftool.c:715
+msgid "specify a custom command for viewing diffs"
+msgstr ""
+
+#: builtin/difftool.c:739
+msgid "no <tool> given for --tool=<tool>"
+msgstr ""
+
+#: builtin/difftool.c:746
+msgid "no <cmd> given for --extcmd=<cmd>"
+msgstr ""
+
+#: builtin/fast-export.c:29
+msgid "git fast-export [rev-list-opts]"
+msgstr ""
+
+#: builtin/fast-export.c:1006
+msgid "show progress after <n> objects"
+msgstr ""
+
+#: builtin/fast-export.c:1008
+msgid "select handling of signed tags"
+msgstr ""
+
+#: builtin/fast-export.c:1011
+msgid "select handling of tags that tag filtered objects"
+msgstr ""
+
+#: builtin/fast-export.c:1014
+msgid "Dump marks to this file"
+msgstr ""
+
+#: builtin/fast-export.c:1016
+msgid "Import marks from this file"
+msgstr ""
+
+#: builtin/fast-export.c:1018
+msgid "Fake a tagger when tags lack one"
+msgstr ""
+
+#: builtin/fast-export.c:1020
+msgid "Output full tree for each commit"
+msgstr ""
+
+#: builtin/fast-export.c:1022
+msgid "Use the done feature to terminate the stream"
+msgstr ""
+
+#: builtin/fast-export.c:1023
+msgid "Skip output of blob data"
+msgstr ""
+
+#: builtin/fast-export.c:1024
+msgid "refspec"
+msgstr ""
+
+#: builtin/fast-export.c:1025
+msgid "Apply refspec to exported refs"
+msgstr ""
+
+#: builtin/fast-export.c:1026
+msgid "anonymize output"
+msgstr ""
+
+#: builtin/fetch.c:27
+msgid "git fetch [<options>] [<repository> [<refspec>...]]"
+msgstr ""
+
+#: builtin/fetch.c:28
+msgid "git fetch [<options>] <group>"
+msgstr ""
+
+#: builtin/fetch.c:29
+msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
+msgstr ""
+
+#: builtin/fetch.c:30
+msgid "git fetch --all [<options>]"
+msgstr ""
+
+#: builtin/fetch.c:112 builtin/pull.c:193
+msgid "fetch from all remotes"
+msgstr ""
+
+#: builtin/fetch.c:114 builtin/pull.c:196
+msgid "append to .git/FETCH_HEAD instead of overwriting"
+msgstr ""
+
+#: builtin/fetch.c:116 builtin/pull.c:199
+msgid "path to upload pack on remote end"
+msgstr ""
+
+#: builtin/fetch.c:117 builtin/pull.c:201
+msgid "force overwrite of local branch"
+msgstr ""
+
+#: builtin/fetch.c:119
+msgid "fetch from multiple remotes"
+msgstr ""
+
+#: builtin/fetch.c:121 builtin/pull.c:203
+msgid "fetch all tags and associated objects"
+msgstr ""
+
+#: builtin/fetch.c:123
+msgid "do not fetch all tags (--no-tags)"
+msgstr ""
+
+#: builtin/fetch.c:125
+msgid "number of submodules fetched in parallel"
+msgstr ""
+
+#: builtin/fetch.c:127 builtin/pull.c:206
+msgid "prune remote-tracking branches no longer on remote"
+msgstr ""
+
+#: builtin/fetch.c:129
+msgid "prune local tags no longer on remote and clobber changed tags"
msgstr ""
-#: builtin/clone.c:1071
-msgid "--shallow-exclude is ignored in local clones; use file:// instead."
+#: builtin/fetch.c:130 builtin/fetch.c:153 builtin/pull.c:131
+msgid "on-demand"
msgstr ""
-#: builtin/clone.c:1074
-msgid "source repository is shallow, ignoring --local"
+#: builtin/fetch.c:131
+msgid "control recursive fetching of submodules"
msgstr ""
-#: builtin/clone.c:1079
-msgid "--local is ignored"
+#: builtin/fetch.c:135 builtin/pull.c:214
+msgid "keep downloaded pack"
+msgstr ""
+
+#: builtin/fetch.c:137
+msgid "allow updating of HEAD ref"
+msgstr ""
+
+#: builtin/fetch.c:140 builtin/fetch.c:146 builtin/pull.c:217
+msgid "deepen history of shallow clone"
+msgstr ""
+
+#: builtin/fetch.c:142
+msgid "deepen history of shallow repository based on time"
+msgstr ""
+
+#: builtin/fetch.c:148 builtin/pull.c:220
+msgid "convert to a complete repository"
+msgstr ""
+
+#: builtin/fetch.c:151
+msgid "prepend this to submodule path output"
+msgstr ""
+
+#: builtin/fetch.c:154
+msgid ""
+"default for recursive fetching of submodules (lower priority than config "
+"files)"
+msgstr ""
+
+#: builtin/fetch.c:158 builtin/pull.c:223
+msgid "accept refs that update .git/shallow"
+msgstr ""
+
+#: builtin/fetch.c:159 builtin/pull.c:225
+msgid "refmap"
+msgstr ""
+
+#: builtin/fetch.c:160 builtin/pull.c:226
+msgid "specify fetch refmap"
+msgstr ""
+
+#: builtin/fetch.c:161 builtin/ls-remote.c:77 builtin/push.c:582
+#: builtin/send-pack.c:172
+msgid "server-specific"
+msgstr ""
+
+#: builtin/fetch.c:161 builtin/ls-remote.c:77 builtin/push.c:582
+#: builtin/send-pack.c:173
+msgid "option to transmit"
+msgstr ""
+
+#: builtin/fetch.c:167
+msgid "report that we have only objects reachable from this object"
+msgstr ""
+
+#: builtin/fetch.c:418
+msgid "Couldn't find remote ref HEAD"
msgstr ""
-#: builtin/clone.c:1083
+#: builtin/fetch.c:552
#, c-format
-msgid "Don't know how to clone %s"
+msgid "configuration fetch.output contains invalid value %s"
msgstr ""
-#: builtin/clone.c:1138 builtin/clone.c:1146
+#: builtin/fetch.c:645
#, c-format
-msgid "Remote branch %s not found in upstream %s"
+msgid "object %s not found"
msgstr ""
-#: builtin/clone.c:1149
-msgid "You appear to have cloned an empty repository."
+#: builtin/fetch.c:649
+msgid "[up to date]"
msgstr ""
-#: builtin/column.c:10
-msgid "git column [<options>]"
+#: builtin/fetch.c:662 builtin/fetch.c:744
+msgid "[rejected]"
msgstr ""
-#: builtin/column.c:27
-msgid "lookup config vars"
+#: builtin/fetch.c:663
+msgid "can't fetch in current branch"
msgstr ""
-#: builtin/column.c:28 builtin/column.c:29
-msgid "layout to use"
+#: builtin/fetch.c:672
+msgid "[tag update]"
msgstr ""
-#: builtin/column.c:30
-msgid "Maximum width"
+#: builtin/fetch.c:673 builtin/fetch.c:708 builtin/fetch.c:724
+#: builtin/fetch.c:739
+msgid "unable to update local ref"
msgstr ""
-#: builtin/column.c:31
-msgid "Padding space on left border"
+#: builtin/fetch.c:694
+msgid "[new tag]"
msgstr ""
-#: builtin/column.c:32
-msgid "Padding space on right border"
+#: builtin/fetch.c:697
+msgid "[new branch]"
msgstr ""
-#: builtin/column.c:33
-msgid "Padding space between columns"
+#: builtin/fetch.c:700
+msgid "[new ref]"
msgstr ""
-#: builtin/column.c:52
-msgid "--command must be the first argument"
+#: builtin/fetch.c:739
+msgid "forced update"
+msgstr ""
+
+#: builtin/fetch.c:744
+msgid "non-fast-forward"
+msgstr ""
+
+#: builtin/fetch.c:790
+#, c-format
+msgid "%s did not send all necessary objects\n"
+msgstr ""
+
+#: builtin/fetch.c:811
+#, c-format
+msgid "reject %s because shallow roots are not allowed to be updated"
+msgstr ""
+
+#: builtin/fetch.c:900 builtin/fetch.c:1011
+#, c-format
+msgid "From %.*s\n"
+msgstr ""
+
+#: builtin/fetch.c:911
+#, c-format
+msgid ""
+"some local refs could not be updated; try running\n"
+" 'git remote prune %s' to remove any old, conflicting branches"
+msgstr ""
+
+#: builtin/fetch.c:981
+#, c-format
+msgid " (%s will become dangling)"
+msgstr ""
+
+#: builtin/fetch.c:982
+#, c-format
+msgid " (%s has become dangling)"
+msgstr ""
+
+#: builtin/fetch.c:1014
+msgid "[deleted]"
+msgstr ""
+
+#: builtin/fetch.c:1015 builtin/remote.c:1035
+msgid "(none)"
+msgstr ""
+
+#: builtin/fetch.c:1038
+#, c-format
+msgid "Refusing to fetch into current branch %s of non-bare repository"
+msgstr ""
+
+#: builtin/fetch.c:1057
+#, c-format
+msgid "Option \"%s\" value \"%s\" is not valid for %s"
+msgstr ""
+
+#: builtin/fetch.c:1060
+#, c-format
+msgid "Option \"%s\" is ignored for %s\n"
+msgstr ""
+
+#: builtin/fetch.c:1339
+#, c-format
+msgid "Fetching %s\n"
+msgstr ""
+
+#: builtin/fetch.c:1341 builtin/remote.c:99
+#, c-format
+msgid "Could not fetch %s"
+msgstr ""
+
+#: builtin/fetch.c:1387 builtin/fetch.c:1555
+msgid ""
+"--filter can only be used with the remote configured in core.partialClone"
+msgstr ""
+
+#: builtin/fetch.c:1410
+msgid ""
+"No remote repository specified. Please, specify either a URL or a\n"
+"remote name from which new revisions should be fetched."
+msgstr ""
+
+#: builtin/fetch.c:1447
+msgid "You need to specify a tag name."
+msgstr ""
+
+#: builtin/fetch.c:1496
+msgid "Negative depth in --deepen is not supported"
+msgstr ""
+
+#: builtin/fetch.c:1498
+msgid "--deepen and --depth are mutually exclusive"
+msgstr ""
+
+#: builtin/fetch.c:1503
+msgid "--depth and --unshallow cannot be used together"
+msgstr ""
+
+#: builtin/fetch.c:1505
+msgid "--unshallow on a complete repository does not make sense"
+msgstr ""
+
+#: builtin/fetch.c:1521
+msgid "fetch --all does not take a repository argument"
+msgstr ""
+
+#: builtin/fetch.c:1523
+msgid "fetch --all does not make sense with refspecs"
+msgstr ""
+
+#: builtin/fetch.c:1532
+#, c-format
+msgid "No such remote or remote group: %s"
+msgstr ""
+
+#: builtin/fetch.c:1539
+msgid "Fetching a group and specifying refspecs does not make sense"
+msgstr ""
+
+#: builtin/fmt-merge-msg.c:17
+msgid ""
+"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
+msgstr ""
+
+#: builtin/fmt-merge-msg.c:671
+msgid "populate log with at most <n> entries from shortlog"
+msgstr ""
+
+#: builtin/fmt-merge-msg.c:674
+msgid "alias for --log (deprecated)"
+msgstr ""
+
+#: builtin/fmt-merge-msg.c:677
+msgid "text"
+msgstr ""
+
+#: builtin/fmt-merge-msg.c:678
+msgid "use <text> as start of message"
+msgstr ""
+
+#: builtin/fmt-merge-msg.c:679
+msgid "file to read from"
+msgstr ""
+
+#: builtin/for-each-ref.c:10
+msgid "git for-each-ref [<options>] [<pattern>]"
+msgstr ""
+
+#: builtin/for-each-ref.c:11
+msgid "git for-each-ref [--points-at <object>]"
+msgstr ""
+
+#: builtin/for-each-ref.c:12
+msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]"
+msgstr ""
+
+#: builtin/for-each-ref.c:13
+msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
+msgstr ""
+
+#: builtin/for-each-ref.c:28
+msgid "quote placeholders suitably for shells"
+msgstr ""
+
+#: builtin/for-each-ref.c:30
+msgid "quote placeholders suitably for perl"
+msgstr ""
+
+#: builtin/for-each-ref.c:32
+msgid "quote placeholders suitably for python"
+msgstr ""
+
+#: builtin/for-each-ref.c:34
+msgid "quote placeholders suitably for Tcl"
+msgstr ""
+
+#: builtin/for-each-ref.c:37
+msgid "show only <n> matched refs"
+msgstr ""
+
+#: builtin/for-each-ref.c:39 builtin/tag.c:422
+msgid "respect format colors"
+msgstr ""
+
+#: builtin/for-each-ref.c:43
+msgid "print only refs which points at the given object"
+msgstr ""
+
+#: builtin/for-each-ref.c:45
+msgid "print only refs that are merged"
+msgstr ""
+
+#: builtin/for-each-ref.c:46
+msgid "print only refs that are not merged"
+msgstr ""
+
+#: builtin/for-each-ref.c:47
+msgid "print only refs which contain the commit"
+msgstr ""
+
+#: builtin/for-each-ref.c:48
+msgid "print only refs which don't contain the commit"
+msgstr ""
+
+#: builtin/fsck.c:574
+msgid "Checking object directories"
+msgstr ""
+
+#: builtin/fsck.c:666
+msgid "git fsck [<options>] [<object>...]"
+msgstr ""
+
+#: builtin/fsck.c:672
+msgid "show unreachable objects"
+msgstr ""
+
+#: builtin/fsck.c:673
+msgid "show dangling objects"
msgstr ""
-#: builtin/commit.c:39
-msgid "git commit [<options>] [--] <pathspec>..."
+#: builtin/fsck.c:674
+msgid "report tags"
msgstr ""
-#: builtin/commit.c:44
-msgid "git status [<options>] [--] <pathspec>..."
+#: builtin/fsck.c:675
+msgid "report root nodes"
msgstr ""
-#: builtin/commit.c:49
-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/fsck.c:676
+msgid "make index objects head nodes"
msgstr ""
-#: builtin/commit.c:62
-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/fsck.c:677
+msgid "make reflogs head nodes (default)"
msgstr ""
-#: builtin/commit.c:74
-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/fsck.c:678
+msgid "also consider packs and alternate objects"
msgstr ""
-#: builtin/commit.c:79
-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/fsck.c:679
+msgid "check only connectivity"
msgstr ""
-#: builtin/commit.c:86
-msgid "Otherwise, please use 'git reset'\n"
+#: builtin/fsck.c:680
+msgid "enable more strict checking"
msgstr ""
-#: builtin/commit.c:89
-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/fsck.c:682
+msgid "write dangling objects in .git/lost-found"
msgstr ""
-#: builtin/commit.c:319
-msgid "failed to unpack HEAD tree object"
+#: builtin/fsck.c:683 builtin/prune.c:110
+msgid "show progress"
msgstr ""
-#: builtin/commit.c:360
-msgid "unable to create temporary index"
+#: builtin/fsck.c:684
+msgid "show verbose names for reachable objects"
msgstr ""
-#: builtin/commit.c:366
-msgid "interactive add failed"
+#: builtin/fsck.c:750
+msgid "Checking objects"
msgstr ""
-#: builtin/commit.c:379
-msgid "unable to update temporary index"
+#: builtin/gc.c:34
+msgid "git gc [<options>]"
msgstr ""
-#: builtin/commit.c:381
-msgid "Failed to update main cache tree"
+#: builtin/gc.c:90
+#, c-format
+msgid "Failed to fstat %s: %s"
msgstr ""
-#: builtin/commit.c:405 builtin/commit.c:428 builtin/commit.c:477
-msgid "unable to write new_index file"
+#: builtin/gc.c:455
+#, c-format
+msgid "Can't stat %s"
msgstr ""
-#: builtin/commit.c:459
-msgid "cannot do a partial commit during a merge."
+#: builtin/gc.c:464
+#, 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/commit.c:461
-msgid "cannot do a partial commit during a cherry-pick."
+#: builtin/gc.c:505
+msgid "prune unreferenced objects"
msgstr ""
-#: builtin/commit.c:470
-msgid "cannot read the index"
+#: builtin/gc.c:507
+msgid "be more thorough (increased runtime)"
msgstr ""
-#: builtin/commit.c:489
-msgid "unable to write temporary index file"
+#: builtin/gc.c:508
+msgid "enable auto-gc mode"
msgstr ""
-#: builtin/commit.c:583
-#, c-format
-msgid "commit '%s' lacks author header"
+#: builtin/gc.c:511
+msgid "force running gc even if there may be another gc running"
msgstr ""
-#: builtin/commit.c:585
-#, c-format
-msgid "commit '%s' has malformed author line"
+#: builtin/gc.c:514
+msgid "repack all other packs except the largest pack"
msgstr ""
-#: builtin/commit.c:604
-msgid "malformed --author parameter"
+#: builtin/gc.c:531
+#, c-format
+msgid "failed to parse gc.logexpiry value %s"
msgstr ""
-#: builtin/commit.c:656
-msgid ""
-"unable to select a comment character that is not used\n"
-"in the current commit message"
+#: builtin/gc.c:542
+#, c-format
+msgid "failed to parse prune expiry value %s"
msgstr ""
-#: builtin/commit.c:693 builtin/commit.c:726 builtin/commit.c:1093
+#: builtin/gc.c:562
#, c-format
-msgid "could not lookup commit %s"
+msgid "Auto packing the repository in background for optimum performance.\n"
msgstr ""
-#: builtin/commit.c:705 builtin/shortlog.c:295
+#: builtin/gc.c:564
#, c-format
-msgid "(reading log message from standard input)\n"
+msgid "Auto packing the repository for optimum performance.\n"
msgstr ""
-#: builtin/commit.c:707
-msgid "could not read log from standard input"
+#: builtin/gc.c:565
+#, c-format
+msgid "See \"git help gc\" for manual housekeeping.\n"
msgstr ""
-#: builtin/commit.c:711
+#: builtin/gc.c:601
#, c-format
-msgid "could not read log file '%s'"
+msgid ""
+"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
msgstr ""
-#: builtin/commit.c:738 builtin/commit.c:746
-msgid "could not read SQUASH_MSG"
+#: builtin/gc.c:652
+msgid ""
+"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr ""
-#: builtin/commit.c:743
-msgid "could not read MERGE_MSG"
+#: builtin/grep.c:28
+msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
msgstr ""
-#: builtin/commit.c:797
-msgid "could not write commit template"
+#: builtin/grep.c:226
+#, c-format
+msgid "grep: failed to create thread: %s"
msgstr ""
-#: builtin/commit.c:815
+#: builtin/grep.c:284
#, 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"
+msgid "invalid number of threads specified (%d) for %s"
msgstr ""
-#: builtin/commit.c:820
+#. TRANSLATORS: %s is the configuration
+#. variable for tweaking threads, currently
+#. grep.threads
+#.
+#: builtin/grep.c:293 builtin/index-pack.c:1536 builtin/index-pack.c:1728
+#: builtin/pack-objects.c:2636
#, 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"
+msgid "no threads support, ignoring %s"
msgstr ""
-#: builtin/commit.c:833
+#: builtin/grep.c:461 builtin/grep.c:582 builtin/grep.c:623
#, 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"
+msgid "unable to read tree (%s)"
msgstr ""
-#: builtin/commit.c:840
+#: builtin/grep.c:638
#, 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"
+msgid "unable to grep from object of type %s"
msgstr ""
-#: builtin/commit.c:857
+#: builtin/grep.c:704
#, c-format
-msgid "%sAuthor: %.*s <%.*s>"
+msgid "switch `%c' expects a numerical value"
msgstr ""
-#: builtin/commit.c:865
-#, c-format
-msgid "%sDate: %s"
+#: builtin/grep.c:791
+msgid "search in index instead of in the work tree"
msgstr ""
-#: builtin/commit.c:872
-#, c-format
-msgid "%sCommitter: %.*s <%.*s>"
+#: builtin/grep.c:793
+msgid "find in contents not managed by git"
msgstr ""
-#: builtin/commit.c:889
-msgid "Cannot read index"
+#: builtin/grep.c:795
+msgid "search in both tracked and untracked files"
msgstr ""
-#: builtin/commit.c:951
-msgid "Error building trees"
+#: builtin/grep.c:797
+msgid "ignore files specified via '.gitignore'"
msgstr ""
-#: builtin/commit.c:965 builtin/tag.c:274
-#, c-format
-msgid "Please supply the message using either -m or -F option.\n"
+#: builtin/grep.c:799
+msgid "recursively search in each submodule"
msgstr ""
-#: builtin/commit.c:1068
-#, c-format
-msgid "--author '%s' is not 'Name <email>' and matches no existing author"
+#: builtin/grep.c:802
+msgid "show non-matching lines"
msgstr ""
-#: builtin/commit.c:1083 builtin/commit.c:1328
-#, c-format
-msgid "Invalid untracked files mode '%s'"
+#: builtin/grep.c:804
+msgid "case insensitive matching"
msgstr ""
-#: builtin/commit.c:1121
-msgid "--long and -z are incompatible"
+#: builtin/grep.c:806
+msgid "match patterns only at word boundaries"
msgstr ""
-#: builtin/commit.c:1151
-msgid "Using both --reset-author and --author does not make sense"
+#: builtin/grep.c:808
+msgid "process binary files as text"
msgstr ""
-#: builtin/commit.c:1160
-msgid "You have nothing to amend."
+#: builtin/grep.c:810
+msgid "don't match patterns in binary files"
msgstr ""
-#: builtin/commit.c:1163
-msgid "You are in the middle of a merge -- cannot amend."
+#: builtin/grep.c:813
+msgid "process binary files with textconv filters"
msgstr ""
-#: builtin/commit.c:1165
-msgid "You are in the middle of a cherry-pick -- cannot amend."
+#: builtin/grep.c:815
+msgid "descend at most <depth> levels"
msgstr ""
-#: builtin/commit.c:1168
-msgid "Options --squash and --fixup cannot be used together"
+#: builtin/grep.c:819
+msgid "use extended POSIX regular expressions"
msgstr ""
-#: builtin/commit.c:1178
-msgid "Only one of -c/-C/-F/--fixup can be used."
+#: builtin/grep.c:822
+msgid "use basic POSIX regular expressions (default)"
msgstr ""
-#: builtin/commit.c:1180
-msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
+#: builtin/grep.c:825
+msgid "interpret patterns as fixed strings"
msgstr ""
-#: builtin/commit.c:1188
-msgid "--reset-author can be used only with -C, -c or --amend."
+#: builtin/grep.c:828
+msgid "use Perl-compatible regular expressions"
msgstr ""
-#: builtin/commit.c:1205
-msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
+#: builtin/grep.c:831
+msgid "show line numbers"
msgstr ""
-#: builtin/commit.c:1207
-msgid "No paths with --include/--only does not make sense."
+#: builtin/grep.c:832
+msgid "show column number of first match"
msgstr ""
-#: builtin/commit.c:1219 builtin/tag.c:552
-#, c-format
-msgid "Invalid cleanup mode %s"
+#: builtin/grep.c:833
+msgid "don't show filenames"
msgstr ""
-#: builtin/commit.c:1224
-msgid "Paths with -a does not make sense."
+#: builtin/grep.c:834
+msgid "show filenames"
msgstr ""
-#: builtin/commit.c:1342 builtin/commit.c:1617
-msgid "show status concisely"
+#: builtin/grep.c:836
+msgid "show filenames relative to top directory"
msgstr ""
-#: builtin/commit.c:1344 builtin/commit.c:1619
-msgid "show branch information"
+#: builtin/grep.c:838
+msgid "show only filenames instead of matching lines"
msgstr ""
-#: builtin/commit.c:1346
-msgid "show stash information"
+#: builtin/grep.c:840
+msgid "synonym for --files-with-matches"
msgstr ""
-#: builtin/commit.c:1348
-msgid "version"
+#: builtin/grep.c:843
+msgid "show only the names of files without match"
msgstr ""
-#: builtin/commit.c:1348 builtin/commit.c:1621 builtin/push.c:530
-#: builtin/worktree.c:449
-msgid "machine-readable output"
+#: builtin/grep.c:845
+msgid "print NUL after filenames"
msgstr ""
-#: builtin/commit.c:1351 builtin/commit.c:1623
-msgid "show status in long format (default)"
+#: builtin/grep.c:848
+msgid "show only matching parts of a line"
msgstr ""
-#: builtin/commit.c:1354 builtin/commit.c:1626
-msgid "terminate entries with NUL"
+#: builtin/grep.c:850
+msgid "show the number of matches instead of matching lines"
msgstr ""
-#: builtin/commit.c:1356 builtin/commit.c:1629 builtin/fast-export.c:983
-#: builtin/fast-export.c:986 builtin/tag.c:412
-msgid "mode"
+#: builtin/grep.c:851
+msgid "highlight matches"
msgstr ""
-#: builtin/commit.c:1357 builtin/commit.c:1629
-msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
+#: builtin/grep.c:853
+msgid "print empty line between matches from different files"
msgstr ""
-#: builtin/commit.c:1360
-msgid "show ignored files"
+#: builtin/grep.c:855
+msgid "show filename only once above matches from same file"
msgstr ""
-#: builtin/commit.c:1361 parse-options.h:155
-msgid "when"
+#: builtin/grep.c:858
+msgid "show <n> context lines before and after matches"
msgstr ""
-#: builtin/commit.c:1362
-msgid ""
-"ignore changes to submodules, optional when: all, dirty, untracked. "
-"(Default: all)"
+#: builtin/grep.c:861
+msgid "show <n> context lines before matches"
msgstr ""
-#: builtin/commit.c:1364
-msgid "list untracked files in columns"
+#: builtin/grep.c:863
+msgid "show <n> context lines after matches"
msgstr ""
-#: builtin/commit.c:1440
-msgid "couldn't look up newly created commit"
+#: builtin/grep.c:865
+msgid "use <n> worker threads"
msgstr ""
-#: builtin/commit.c:1442
-msgid "could not parse newly created commit"
+#: builtin/grep.c:866
+msgid "shortcut for -C NUM"
msgstr ""
-#: builtin/commit.c:1487
-msgid "detached HEAD"
+#: builtin/grep.c:869
+msgid "show a line with the function name before matches"
msgstr ""
-#: builtin/commit.c:1490
-msgid " (root-commit)"
+#: builtin/grep.c:871
+msgid "show the surrounding function"
msgstr ""
-#: builtin/commit.c:1587
-msgid "suppress summary after successful commit"
+#: builtin/grep.c:874
+msgid "read patterns from file"
msgstr ""
-#: builtin/commit.c:1588
-msgid "show diff in commit message template"
+#: builtin/grep.c:876
+msgid "match <pattern>"
msgstr ""
-#: builtin/commit.c:1590
-msgid "Commit message options"
+#: builtin/grep.c:878
+msgid "combine patterns specified with -e"
msgstr ""
-#: builtin/commit.c:1591 builtin/tag.c:410
-msgid "read message from file"
+#: builtin/grep.c:890
+msgid "indicate hit with exit status without output"
msgstr ""
-#: builtin/commit.c:1592
-msgid "author"
+#: builtin/grep.c:892
+msgid "show only matches from files that match all patterns"
msgstr ""
-#: builtin/commit.c:1592
-msgid "override author for commit"
+#: builtin/grep.c:894
+msgid "show parse tree for grep expression"
msgstr ""
-#: builtin/commit.c:1593 builtin/gc.c:358
-msgid "date"
+#: builtin/grep.c:898
+msgid "pager"
msgstr ""
-#: builtin/commit.c:1593
-msgid "override date for commit"
+#: builtin/grep.c:898
+msgid "show matching files in the pager"
msgstr ""
-#: builtin/commit.c:1594 builtin/merge.c:222 builtin/notes.c:401
-#: builtin/notes.c:564 builtin/tag.c:408
-msgid "message"
+#: builtin/grep.c:902
+msgid "allow calling of grep(1) (ignored by this build)"
msgstr ""
-#: builtin/commit.c:1594
-msgid "commit message"
+#: builtin/grep.c:966
+msgid "no pattern given"
msgstr ""
-#: builtin/commit.c:1595 builtin/commit.c:1596 builtin/commit.c:1597
-#: builtin/commit.c:1598 parse-options.h:257 ref-filter.h:77
-msgid "commit"
+#: builtin/grep.c:1002
+msgid "--no-index or --untracked cannot be used with revs"
msgstr ""
-#: builtin/commit.c:1595
-msgid "reuse and edit message from specified commit"
+#: builtin/grep.c:1009
+#, c-format
+msgid "unable to resolve revision: %s"
msgstr ""
-#: builtin/commit.c:1596
-msgid "reuse message from specified commit"
+#: builtin/grep.c:1044 builtin/index-pack.c:1532 builtin/pack-objects.c:2632
+#, c-format
+msgid "invalid number of threads specified (%d)"
msgstr ""
-#: builtin/commit.c:1597
-msgid "use autosquash formatted message to fixup specified commit"
+#: builtin/grep.c:1049 builtin/pack-objects.c:3286
+msgid "no threads support, ignoring --threads"
msgstr ""
-#: builtin/commit.c:1598
-msgid "use autosquash formatted message to squash specified commit"
+#: builtin/grep.c:1073
+msgid "--open-files-in-pager only works on the worktree"
msgstr ""
-#: builtin/commit.c:1599
-msgid "the commit is authored by me now (used with -C/-c/--amend)"
+#: builtin/grep.c:1096
+msgid "option not supported with --recurse-submodules"
+msgstr ""
+
+#: builtin/grep.c:1102
+msgid "--cached or --untracked cannot be used with --no-index"
msgstr ""
-#: builtin/commit.c:1600 builtin/log.c:1430 builtin/revert.c:105
-msgid "add Signed-off-by:"
+#: builtin/grep.c:1108
+msgid "--[no-]exclude-standard cannot be used for tracked contents"
msgstr ""
-#: builtin/commit.c:1601
-msgid "use specified template file"
+#: builtin/grep.c:1116
+msgid "both --cached and trees are given"
msgstr ""
-#: builtin/commit.c:1602
-msgid "force edit of commit"
+#: builtin/hash-object.c:84
+msgid ""
+"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
+"[--] <file>..."
msgstr ""
-#: builtin/commit.c:1603
-msgid "default"
+#: builtin/hash-object.c:85
+msgid "git hash-object --stdin-paths"
msgstr ""
-#: builtin/commit.c:1603 builtin/tag.c:413
-msgid "how to strip spaces and #comments from message"
+#: builtin/hash-object.c:97
+msgid "type"
msgstr ""
-#: builtin/commit.c:1604
-msgid "include status in commit message template"
+#: builtin/hash-object.c:97
+msgid "object type"
msgstr ""
-#: builtin/commit.c:1606 builtin/merge.c:234 builtin/pull.c:173
-#: builtin/revert.c:113
-msgid "GPG sign commit"
+#: builtin/hash-object.c:98
+msgid "write the object into the object database"
msgstr ""
-#: builtin/commit.c:1609
-msgid "Commit contents options"
+#: builtin/hash-object.c:100
+msgid "read the object from stdin"
msgstr ""
-#: builtin/commit.c:1610
-msgid "commit all changed files"
+#: builtin/hash-object.c:102
+msgid "store file as is without filters"
msgstr ""
-#: builtin/commit.c:1611
-msgid "add specified files to index for commit"
+#: builtin/hash-object.c:103
+msgid ""
+"just hash any random garbage to create corrupt objects for debugging Git"
msgstr ""
-#: builtin/commit.c:1612
-msgid "interactively add files"
+#: builtin/hash-object.c:104
+msgid "process file as it were from this path"
msgstr ""
-#: builtin/commit.c:1613
-msgid "interactively add changes"
+#: builtin/help.c:46
+msgid "print all available commands"
msgstr ""
-#: builtin/commit.c:1614
-msgid "commit only specified files"
+#: builtin/help.c:47
+msgid "exclude guides"
msgstr ""
-#: builtin/commit.c:1615
-msgid "bypass pre-commit and commit-msg hooks"
+#: builtin/help.c:48
+msgid "print list of useful guides"
msgstr ""
-#: builtin/commit.c:1616
-msgid "show what would be committed"
+#: builtin/help.c:49
+msgid "print all configuration variable names"
msgstr ""
-#: builtin/commit.c:1627
-msgid "amend previous commit"
+#: builtin/help.c:51
+msgid "show man page"
msgstr ""
-#: builtin/commit.c:1628
-msgid "bypass post-rewrite hook"
+#: builtin/help.c:52
+msgid "show manual in web browser"
msgstr ""
-#: builtin/commit.c:1633
-msgid "ok to record an empty change"
+#: builtin/help.c:54
+msgid "show info page"
msgstr ""
-#: builtin/commit.c:1635
-msgid "ok to record a change with an empty message"
+#: builtin/help.c:56
+msgid "print command description"
msgstr ""
-#: builtin/commit.c:1665
-msgid "could not parse HEAD commit"
+#: builtin/help.c:61
+msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
msgstr ""
-#: builtin/commit.c:1710
+#: builtin/help.c:73
#, c-format
-msgid "Corrupt MERGE_HEAD file (%s)"
+msgid "unrecognized help format '%s'"
msgstr ""
-#: builtin/commit.c:1717
-msgid "could not read MERGE_MODE"
+#: builtin/help.c:100
+msgid "Failed to start emacsclient."
msgstr ""
-#: builtin/commit.c:1736
-#, c-format
-msgid "could not read commit message: %s"
+#: builtin/help.c:113
+msgid "Failed to parse emacsclient version."
msgstr ""
-#: builtin/commit.c:1747
+#: builtin/help.c:121
#, c-format
-msgid "Aborting commit; you did not edit the message.\n"
+msgid "emacsclient version '%d' too old (< 22)."
msgstr ""
-#: builtin/commit.c:1752
+#: builtin/help.c:139 builtin/help.c:161 builtin/help.c:171 builtin/help.c:179
#, c-format
-msgid "Aborting commit due to empty commit message.\n"
+msgid "failed to exec '%s'"
msgstr ""
-#: builtin/commit.c:1800
+#: builtin/help.c:217
+#, c-format
msgid ""
-"Repository has been updated, but unable to write\n"
-"new_index file. Check that disk is not full and quota is\n"
-"not exceeded, and then \"git reset HEAD\" to recover."
-msgstr ""
-
-#: builtin/config.c:10
-msgid "git config [<options>]"
-msgstr ""
-
-#: builtin/config.c:57
-msgid "Config file location"
+"'%s': path for unsupported man viewer.\n"
+"Please consider using 'man.<tool>.cmd' instead."
msgstr ""
-#: builtin/config.c:58
-msgid "use global config file"
+#: builtin/help.c:229
+#, c-format
+msgid ""
+"'%s': cmd for supported man viewer.\n"
+"Please consider using 'man.<tool>.path' instead."
msgstr ""
-#: builtin/config.c:59
-msgid "use system config file"
+#: builtin/help.c:346
+#, c-format
+msgid "'%s': unknown man viewer."
msgstr ""
-#: builtin/config.c:60
-msgid "use repository config file"
+#: builtin/help.c:363
+msgid "no man viewer handled the request"
msgstr ""
-#: builtin/config.c:61
-msgid "use given config file"
+#: builtin/help.c:371
+msgid "no info viewer handled the request"
msgstr ""
-#: builtin/config.c:62
-msgid "blob-id"
+#: builtin/help.c:418
+#, c-format
+msgid "'%s' is aliased to '%s'"
msgstr ""
-#: builtin/config.c:62
-msgid "read config from given blob object"
+#: builtin/help.c:445 builtin/help.c:475
+#, c-format
+msgid "usage: %s%s"
msgstr ""
-#: builtin/config.c:63
-msgid "Action"
+#: builtin/help.c:459
+msgid "'git help config' for more information"
msgstr ""
-#: builtin/config.c:64
-msgid "get value: name [value-regex]"
+#: builtin/index-pack.c:208
+#, c-format
+msgid "object type mismatch at %s"
msgstr ""
-#: builtin/config.c:65
-msgid "get all values: key [value-regex]"
+#: builtin/index-pack.c:228
+#, c-format
+msgid "did not receive expected object %s"
msgstr ""
-#: builtin/config.c:66
-msgid "get values for regexp: name-regex [value-regex]"
+#: builtin/index-pack.c:231
+#, c-format
+msgid "object %s: expected type %s, found %s"
msgstr ""
-#: builtin/config.c:67
-msgid "get value specific for the URL: section[.var] URL"
-msgstr ""
+#: builtin/index-pack.c:273
+#, c-format
+msgid "cannot fill %d byte"
+msgid_plural "cannot fill %d bytes"
+msgstr[0] ""
+msgstr[1] ""
-#: builtin/config.c:68
-msgid "replace all matching variables: name value [value_regex]"
+#: builtin/index-pack.c:283
+msgid "early EOF"
msgstr ""
-#: builtin/config.c:69
-msgid "add a new variable: name value"
+#: builtin/index-pack.c:284
+msgid "read error on input"
msgstr ""
-#: builtin/config.c:70
-msgid "remove a variable: name [value-regex]"
+#: builtin/index-pack.c:296
+msgid "used more bytes than were available"
msgstr ""
-#: builtin/config.c:71
-msgid "remove all matches: name [value-regex]"
+#: builtin/index-pack.c:303 builtin/pack-objects.c:590
+msgid "pack too large for current definition of off_t"
msgstr ""
-#: builtin/config.c:72
-msgid "rename section: old-name new-name"
+#: builtin/index-pack.c:306 builtin/unpack-objects.c:94
+msgid "pack exceeds maximum allowed size"
msgstr ""
-#: builtin/config.c:73
-msgid "remove a section: name"
+#: builtin/index-pack.c:321
+#, c-format
+msgid "unable to create '%s'"
msgstr ""
-#: builtin/config.c:74
-msgid "list all"
+#: builtin/index-pack.c:327
+#, c-format
+msgid "cannot open packfile '%s'"
msgstr ""
-#: builtin/config.c:75
-msgid "open an editor"
+#: builtin/index-pack.c:341
+msgid "pack signature mismatch"
msgstr ""
-#: builtin/config.c:76
-msgid "find the color configured: slot [default]"
+#: builtin/index-pack.c:343
+#, c-format
+msgid "pack version %<PRIu32> unsupported"
msgstr ""
-#: builtin/config.c:77
-msgid "find the color setting: slot [stdout-is-tty]"
+#: builtin/index-pack.c:361
+#, c-format
+msgid "pack has bad object at offset %<PRIuMAX>: %s"
msgstr ""
-#: builtin/config.c:78
-msgid "Type"
+#: builtin/index-pack.c:482
+#, c-format
+msgid "inflate returned %d"
msgstr ""
-#: builtin/config.c:79
-msgid "value is \"true\" or \"false\""
+#: builtin/index-pack.c:531
+msgid "offset value overflow for delta base object"
msgstr ""
-#: builtin/config.c:80
-msgid "value is decimal number"
+#: builtin/index-pack.c:539
+msgid "delta base offset is out of bound"
msgstr ""
-#: builtin/config.c:81
-msgid "value is --bool or --int"
+#: builtin/index-pack.c:547
+#, c-format
+msgid "unknown object type %d"
msgstr ""
-#: builtin/config.c:82
-msgid "value is a path (file or directory name)"
+#: builtin/index-pack.c:578
+msgid "cannot pread pack file"
msgstr ""
-#: builtin/config.c:83
-msgid "Other"
-msgstr ""
+#: builtin/index-pack.c:580
+#, 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/config.c:84
-msgid "terminate values with NUL byte"
+#: builtin/index-pack.c:606
+msgid "serious inflate inconsistency"
msgstr ""
-#: builtin/config.c:85
-msgid "show variable names only"
+#: builtin/index-pack.c:751 builtin/index-pack.c:757 builtin/index-pack.c:780
+#: builtin/index-pack.c:819 builtin/index-pack.c:828
+#, c-format
+msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr ""
-#: builtin/config.c:86
-msgid "respect include directives on lookup"
+#: builtin/index-pack.c:754 builtin/pack-objects.c:143
+#: builtin/pack-objects.c:203 builtin/pack-objects.c:297
+#, c-format
+msgid "unable to read %s"
msgstr ""
-#: builtin/config.c:87
-msgid "show origin of config (file, standard input, blob, command line)"
+#: builtin/index-pack.c:817
+#, c-format
+msgid "cannot read existing object info %s"
msgstr ""
-#: builtin/config.c:327
-msgid "unable to parse default color value"
+#: builtin/index-pack.c:825
+#, c-format
+msgid "cannot read existing object %s"
msgstr ""
-#: builtin/config.c:471
+#: builtin/index-pack.c:839
#, 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 "invalid blob object %s"
msgstr ""
-#: builtin/config.c:499
-msgid "--local can only be used inside a git repository"
+#: builtin/index-pack.c:842 builtin/index-pack.c:861
+msgid "fsck error in packed object"
msgstr ""
-#: builtin/config.c:621
+#: builtin/index-pack.c:858
#, c-format
-msgid "cannot create configuration file %s"
+msgid "invalid %s"
msgstr ""
-#: builtin/config.c:633
+#: builtin/index-pack.c:863
#, c-format
-msgid ""
-"cannot overwrite multiple values with a single value\n"
-" Use a regexp, --add or --replace-all to change %s."
+msgid "Not all child objects of %s are reachable"
msgstr ""
-#: builtin/count-objects.c:87
-msgid "git count-objects [-v] [-H | --human-readable]"
+#: builtin/index-pack.c:935 builtin/index-pack.c:966
+msgid "failed to apply delta"
msgstr ""
-#: builtin/count-objects.c:97
-msgid "print sizes in human readable format"
+#: builtin/index-pack.c:1136
+msgid "Receiving objects"
msgstr ""
-#: builtin/describe.c:19
-msgid "git describe [<options>] [<commit-ish>...]"
+#: builtin/index-pack.c:1136
+msgid "Indexing objects"
msgstr ""
-#: builtin/describe.c:20
-msgid "git describe [<options>] --dirty"
+#: builtin/index-pack.c:1170
+msgid "pack is corrupted (SHA1 mismatch)"
msgstr ""
-#: builtin/describe.c:54
-msgid "head"
+#: builtin/index-pack.c:1175
+msgid "cannot fstat packfile"
msgstr ""
-#: builtin/describe.c:54
-msgid "lightweight"
+#: builtin/index-pack.c:1178
+msgid "pack has junk at the end"
msgstr ""
-#: builtin/describe.c:54
-msgid "annotated"
+#: builtin/index-pack.c:1190
+msgid "confusion beyond insanity in parse_pack_objects()"
msgstr ""
-#: builtin/describe.c:253
-#, c-format
-msgid "annotated tag %s not available"
+#: builtin/index-pack.c:1213
+msgid "Resolving deltas"
msgstr ""
-#: builtin/describe.c:257
+#: builtin/index-pack.c:1224 builtin/pack-objects.c:2407
#, c-format
-msgid "annotated tag %s has no embedded name"
+msgid "unable to create thread: %s"
msgstr ""
-#: builtin/describe.c:259
-#, c-format
-msgid "tag '%s' is really '%s' here"
+#: builtin/index-pack.c:1266
+msgid "confusion beyond insanity"
msgstr ""
-#: builtin/describe.c:286 builtin/log.c:489
+#: builtin/index-pack.c:1272
#, c-format
-msgid "Not a valid object name %s"
-msgstr ""
+msgid "completed with %d local object"
+msgid_plural "completed with %d local objects"
+msgstr[0] ""
+msgstr[1] ""
-#: builtin/describe.c:289
+#: builtin/index-pack.c:1284
#, c-format
-msgid "%s is not a valid '%s' object"
+msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr ""
-#: builtin/describe.c:306
+#: builtin/index-pack.c:1288
#, c-format
-msgid "no tag exactly matches '%s'"
-msgstr ""
+msgid "pack has %d unresolved delta"
+msgid_plural "pack has %d unresolved deltas"
+msgstr[0] ""
+msgstr[1] ""
-#: builtin/describe.c:308
+#: builtin/index-pack.c:1312
#, c-format
-msgid "searching to describe %s\n"
+msgid "unable to deflate appended object (%d)"
msgstr ""
-#: builtin/describe.c:355
+#: builtin/index-pack.c:1389
#, c-format
-msgid "finished search at %s\n"
+msgid "local object %s is corrupt"
msgstr ""
-#: builtin/describe.c:382
+#: builtin/index-pack.c:1403
#, c-format
-msgid ""
-"No annotated tags can describe '%s'.\n"
-"However, there were unannotated tags: try --tags."
+msgid "packfile name '%s' does not end with '.pack'"
msgstr ""
-#: builtin/describe.c:386
+#: builtin/index-pack.c:1428
#, c-format
-msgid ""
-"No tags can describe '%s'.\n"
-"Try --always, or create some tags."
+msgid "cannot write %s file '%s'"
msgstr ""
-#: builtin/describe.c:416
+#: builtin/index-pack.c:1436
#, c-format
-msgid "traversed %lu commits\n"
+msgid "cannot close written %s file '%s'"
msgstr ""
-#: builtin/describe.c:419
-#, c-format
-msgid ""
-"more than %i tags found; listed %i most recent\n"
-"gave up search at %s\n"
+#: builtin/index-pack.c:1460
+msgid "error while closing pack file"
msgstr ""
-#: builtin/describe.c:441
-msgid "find the tag that comes after the commit"
+#: builtin/index-pack.c:1474
+msgid "cannot store pack file"
msgstr ""
-#: builtin/describe.c:442
-msgid "debug search strategy on stderr"
+#: builtin/index-pack.c:1482
+msgid "cannot store index file"
msgstr ""
-#: builtin/describe.c:443
-msgid "use any ref"
+#: builtin/index-pack.c:1526 builtin/pack-objects.c:2645
+#, c-format
+msgid "bad pack.indexversion=%<PRIu32>"
msgstr ""
-#: builtin/describe.c:444
-msgid "use any tag, even unannotated"
+#: builtin/index-pack.c:1595
+#, c-format
+msgid "Cannot open existing pack file '%s'"
msgstr ""
-#: builtin/describe.c:445
-msgid "always use long format"
+#: builtin/index-pack.c:1597
+#, c-format
+msgid "Cannot open existing pack idx file for '%s'"
msgstr ""
-#: builtin/describe.c:446
-msgid "only follow first parent"
-msgstr ""
+#: builtin/index-pack.c:1645
+#, c-format
+msgid "non delta: %d object"
+msgid_plural "non delta: %d objects"
+msgstr[0] ""
+msgstr[1] ""
-#: builtin/describe.c:449
-msgid "only output exact matches"
-msgstr ""
+#: builtin/index-pack.c:1652
+#, c-format
+msgid "chain length = %d: %lu object"
+msgid_plural "chain length = %d: %lu objects"
+msgstr[0] ""
+msgstr[1] ""
-#: builtin/describe.c:451
-msgid "consider <n> most recent tags (default: 10)"
+#: builtin/index-pack.c:1689
+msgid "Cannot come back to cwd"
msgstr ""
-#: builtin/describe.c:453
-msgid "only consider tags matching <pattern>"
+#: builtin/index-pack.c:1740 builtin/index-pack.c:1743
+#: builtin/index-pack.c:1759 builtin/index-pack.c:1763
+#, c-format
+msgid "bad %s"
msgstr ""
-#: builtin/describe.c:455
-msgid "do not consider tags matching <pattern>"
+#: builtin/index-pack.c:1779
+msgid "--fix-thin cannot be used without --stdin"
msgstr ""
-#: builtin/describe.c:457 builtin/name-rev.c:406
-msgid "show abbreviated commit object as fallback"
+#: builtin/index-pack.c:1781
+msgid "--stdin requires a git repository"
msgstr ""
-#: builtin/describe.c:458 builtin/describe.c:461
-msgid "mark"
+#: builtin/index-pack.c:1787
+msgid "--verify with no packfile name given"
msgstr ""
-#: builtin/describe.c:459
-msgid "append <mark> on dirty working tree (default: \"-dirty\")"
+#: builtin/index-pack.c:1837 builtin/unpack-objects.c:580
+msgid "fsck error in pack objects"
msgstr ""
-#: builtin/describe.c:462
-msgid "append <mark> on broken working tree (default: \"-broken\")"
+#: builtin/init-db.c:55
+#, c-format
+msgid "cannot stat '%s'"
msgstr ""
-#: builtin/describe.c:480
-msgid "--long is incompatible with --abbrev=0"
+#: builtin/init-db.c:61
+#, c-format
+msgid "cannot stat template '%s'"
msgstr ""
-#: builtin/describe.c:509
-msgid "No names found, cannot describe anything."
+#: builtin/init-db.c:66
+#, c-format
+msgid "cannot opendir '%s'"
msgstr ""
-#: builtin/describe.c:552
-msgid "--dirty is incompatible with commit-ishes"
+#: builtin/init-db.c:78
+#, c-format
+msgid "cannot readlink '%s'"
msgstr ""
-#: builtin/describe.c:554
-msgid "--broken is incompatible with commit-ishes"
+#: builtin/init-db.c:80
+#, c-format
+msgid "cannot symlink '%s' '%s'"
msgstr ""
-#: builtin/diff.c:83
+#: builtin/init-db.c:86
#, c-format
-msgid "'%s': not a regular file or symlink"
+msgid "cannot copy '%s' to '%s'"
msgstr ""
-#: builtin/diff.c:235
+#: builtin/init-db.c:90
#, c-format
-msgid "invalid option: %s"
+msgid "ignoring template %s"
msgstr ""
-#: builtin/diff.c:359
-msgid "Not a git repository"
+#: builtin/init-db.c:121
+#, c-format
+msgid "templates not found in %s"
msgstr ""
-#: builtin/diff.c:402
+#: builtin/init-db.c:136
#, c-format
-msgid "invalid object '%s' given."
+msgid "not copying templates from '%s': %s"
msgstr ""
-#: builtin/diff.c:411
+#: builtin/init-db.c:329
#, c-format
-msgid "more than two blobs given: '%s'"
+msgid "unable to handle file type %d"
msgstr ""
-#: builtin/diff.c:416
+#: builtin/init-db.c:332
#, c-format
-msgid "unhandled object '%s' given."
+msgid "unable to move %s to %s"
msgstr ""
-#: builtin/difftool.c:29
-msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
+#: builtin/init-db.c:349 builtin/init-db.c:352
+#, c-format
+msgid "%s already exists"
msgstr ""
-#: builtin/difftool.c:249
+#: builtin/init-db.c:405
#, c-format
-msgid "failed: %d"
+msgid "Reinitialized existing shared Git repository in %s%s\n"
msgstr ""
-#: builtin/difftool.c:291
+#: builtin/init-db.c:406
#, c-format
-msgid "could not read symlink %s"
+msgid "Reinitialized existing Git repository in %s%s\n"
msgstr ""
-#: builtin/difftool.c:293
+#: builtin/init-db.c:410
#, c-format
-msgid "could not read symlink file %s"
+msgid "Initialized empty shared Git repository in %s%s\n"
msgstr ""
-#: builtin/difftool.c:301
+#: builtin/init-db.c:411
#, c-format
-msgid "could not read object %s for symlink %s"
+msgid "Initialized empty Git repository in %s%s\n"
msgstr ""
-#: builtin/difftool.c:403
+#: builtin/init-db.c:459
msgid ""
-"combined diff formats('-c' and '--cc') are not supported in\n"
-"directory diff mode('-d' and '--dir-diff')."
+"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
+"shared[=<permissions>]] [<directory>]"
msgstr ""
-#: builtin/difftool.c:626
-#, c-format
-msgid "both files modified: '%s' and '%s'."
+#: builtin/init-db.c:482
+msgid "permissions"
msgstr ""
-#: builtin/difftool.c:628
-msgid "working tree file has been left."
+#: builtin/init-db.c:483
+msgid "specify that the git repository is to be shared amongst several users"
msgstr ""
-#: builtin/difftool.c:639
+#: builtin/init-db.c:517 builtin/init-db.c:522
#, c-format
-msgid "temporary files exist in '%s'."
-msgstr ""
-
-#: builtin/difftool.c:640
-msgid "you may want to cleanup or recover these."
+msgid "cannot mkdir %s"
msgstr ""
-#: builtin/difftool.c:689
-msgid "use `diff.guitool` instead of `diff.tool`"
+#: builtin/init-db.c:526
+#, c-format
+msgid "cannot chdir to %s"
msgstr ""
-#: builtin/difftool.c:691
-msgid "perform a full-directory diff"
+#: builtin/init-db.c:547
+#, c-format
+msgid ""
+"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
+"dir=<directory>)"
msgstr ""
-#: builtin/difftool.c:693
-msgid "do not prompt before launching a diff tool"
+#: builtin/init-db.c:575
+#, c-format
+msgid "Cannot access work tree '%s'"
msgstr ""
-#: builtin/difftool.c:699
-msgid "use symlinks in dir-diff mode"
+#: builtin/interpret-trailers.c:15
+msgid ""
+"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
+"<token>[(=|:)<value>])...] [<file>...]"
msgstr ""
-#: builtin/difftool.c:700
-msgid "<tool>"
+#: builtin/interpret-trailers.c:92
+msgid "edit files in place"
msgstr ""
-#: builtin/difftool.c:701
-msgid "use the specified diff tool"
+#: builtin/interpret-trailers.c:93
+msgid "trim empty trailers"
msgstr ""
-#: builtin/difftool.c:703
-msgid "print a list of diff tools that may be used with `--tool`"
+#: builtin/interpret-trailers.c:96
+msgid "where to place the new trailer"
msgstr ""
-#: builtin/difftool.c:706
-msgid ""
-"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
-"code"
+#: builtin/interpret-trailers.c:98
+msgid "action if trailer already exists"
msgstr ""
-#: builtin/difftool.c:708
-msgid "<command>"
+#: builtin/interpret-trailers.c:100
+msgid "action if trailer is missing"
msgstr ""
-#: builtin/difftool.c:709
-msgid "specify a custom command for viewing diffs"
+#: builtin/interpret-trailers.c:102
+msgid "output only the trailers"
msgstr ""
-#: builtin/difftool.c:733
-msgid "no <tool> given for --tool=<tool>"
+#: builtin/interpret-trailers.c:103
+msgid "do not apply config rules"
msgstr ""
-#: builtin/difftool.c:740
-msgid "no <cmd> given for --extcmd=<cmd>"
+#: builtin/interpret-trailers.c:104
+msgid "join whitespace-continued values"
msgstr ""
-#: builtin/fast-export.c:26
-msgid "git fast-export [rev-list-opts]"
+#: builtin/interpret-trailers.c:105
+msgid "set parsing options"
msgstr ""
-#: builtin/fast-export.c:982
-msgid "show progress after <n> objects"
+#: builtin/interpret-trailers.c:107
+msgid "trailer"
msgstr ""
-#: builtin/fast-export.c:984
-msgid "select handling of signed tags"
+#: builtin/interpret-trailers.c:108
+msgid "trailer(s) to add"
msgstr ""
-#: builtin/fast-export.c:987
-msgid "select handling of tags that tag filtered objects"
+#: builtin/interpret-trailers.c:117
+msgid "--trailer with --only-input does not make sense"
msgstr ""
-#: builtin/fast-export.c:990
-msgid "Dump marks to this file"
+#: builtin/interpret-trailers.c:127
+msgid "no input file given for in-place editing"
msgstr ""
-#: builtin/fast-export.c:992
-msgid "Import marks from this file"
+#: builtin/log.c:51
+msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
msgstr ""
-#: builtin/fast-export.c:994
-msgid "Fake a tagger when tags lack one"
+#: builtin/log.c:52
+msgid "git show [<options>] <object>..."
msgstr ""
-#: builtin/fast-export.c:996
-msgid "Output full tree for each commit"
+#: builtin/log.c:96
+#, c-format
+msgid "invalid --decorate option: %s"
msgstr ""
-#: builtin/fast-export.c:998
-msgid "Use the done feature to terminate the stream"
+#: builtin/log.c:157
+msgid "suppress diff output"
msgstr ""
-#: builtin/fast-export.c:999
-msgid "Skip output of blob data"
+#: builtin/log.c:158
+msgid "show source"
msgstr ""
-#: builtin/fast-export.c:1000
-msgid "refspec"
+#: builtin/log.c:159
+msgid "Use mail map file"
msgstr ""
-#: builtin/fast-export.c:1001
-msgid "Apply refspec to exported refs"
+#: builtin/log.c:161
+msgid "only decorate refs that match <pattern>"
msgstr ""
-#: builtin/fast-export.c:1002
-msgid "anonymize output"
+#: builtin/log.c:163
+msgid "do not decorate refs that match <pattern>"
msgstr ""
-#: builtin/fetch.c:22
-msgid "git fetch [<options>] [<repository> [<refspec>...]]"
+#: builtin/log.c:164
+msgid "decorate options"
msgstr ""
-#: builtin/fetch.c:23
-msgid "git fetch [<options>] <group>"
+#: builtin/log.c:167
+msgid "Process line range n,m in file, counting from 1"
msgstr ""
-#: builtin/fetch.c:24
-msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
+#: builtin/log.c:265
+#, c-format
+msgid "Final output: %d %s\n"
msgstr ""
-#: builtin/fetch.c:25
-msgid "git fetch --all [<options>]"
+#: builtin/log.c:516
+#, c-format
+msgid "git show %s: bad file"
msgstr ""
-#: builtin/fetch.c:90 builtin/pull.c:182
-msgid "fetch from all remotes"
+#: builtin/log.c:531 builtin/log.c:625
+#, c-format
+msgid "Could not read object %s"
msgstr ""
-#: builtin/fetch.c:92 builtin/pull.c:185
-msgid "append to .git/FETCH_HEAD instead of overwriting"
+#: builtin/log.c:649
+#, c-format
+msgid "Unknown type: %d"
msgstr ""
-#: builtin/fetch.c:94 builtin/pull.c:188
-msgid "path to upload pack on remote end"
+#: builtin/log.c:770
+msgid "format.headers without value"
msgstr ""
-#: builtin/fetch.c:95 builtin/pull.c:190
-msgid "force overwrite of local branch"
+#: builtin/log.c:871
+msgid "name of output directory is too long"
msgstr ""
-#: builtin/fetch.c:97
-msgid "fetch from multiple remotes"
+#: builtin/log.c:887
+#, c-format
+msgid "Cannot open patch file %s"
msgstr ""
-#: builtin/fetch.c:99 builtin/pull.c:192
-msgid "fetch all tags and associated objects"
+#: builtin/log.c:904
+msgid "Need exactly one range."
msgstr ""
-#: builtin/fetch.c:101
-msgid "do not fetch all tags (--no-tags)"
+#: builtin/log.c:914
+msgid "Not a range."
msgstr ""
-#: builtin/fetch.c:103
-msgid "number of submodules fetched in parallel"
+#: builtin/log.c:1020
+msgid "Cover letter needs email format"
msgstr ""
-#: builtin/fetch.c:105 builtin/pull.c:195
-msgid "prune remote-tracking branches no longer on remote"
+#: builtin/log.c:1101
+#, c-format
+msgid "insane in-reply-to: %s"
msgstr ""
-#: builtin/fetch.c:106 builtin/fetch.c:129 builtin/pull.c:123
-msgid "on-demand"
+#: builtin/log.c:1128
+msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr ""
-#: builtin/fetch.c:107
-msgid "control recursive fetching of submodules"
+#: builtin/log.c:1178
+msgid "Two output directories?"
msgstr ""
-#: builtin/fetch.c:111 builtin/pull.c:203
-msgid "keep downloaded pack"
+#: builtin/log.c:1285 builtin/log.c:1945 builtin/log.c:1947 builtin/log.c:1959
+#, c-format
+msgid "Unknown commit %s"
msgstr ""
-#: builtin/fetch.c:113
-msgid "allow updating of HEAD ref"
+#: builtin/log.c:1295 builtin/notes.c:889 builtin/tag.c:524
+#, c-format
+msgid "Failed to resolve '%s' as a valid ref."
msgstr ""
-#: builtin/fetch.c:116 builtin/fetch.c:122 builtin/pull.c:206
-msgid "deepen history of shallow clone"
+#: builtin/log.c:1300
+msgid "Could not find exact merge base."
msgstr ""
-#: builtin/fetch.c:118
-msgid "deepen history of shallow repository based on time"
+#: builtin/log.c:1304
+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/fetch.c:124 builtin/pull.c:209
-msgid "convert to a complete repository"
+#: builtin/log.c:1324
+msgid "Failed to find exact merge base"
msgstr ""
-#: builtin/fetch.c:126 builtin/log.c:1450
-msgid "dir"
+#: builtin/log.c:1335
+msgid "base commit should be the ancestor of revision list"
msgstr ""
-#: builtin/fetch.c:127
-msgid "prepend this to submodule path output"
+#: builtin/log.c:1339
+msgid "base commit shouldn't be in revision list"
msgstr ""
-#: builtin/fetch.c:130
-msgid ""
-"default for recursive fetching of submodules (lower priority than config "
-"files)"
+#: builtin/log.c:1392
+msgid "cannot get patch id"
msgstr ""
-#: builtin/fetch.c:134 builtin/pull.c:212
-msgid "accept refs that update .git/shallow"
+#: builtin/log.c:1452
+msgid "use [PATCH n/m] even with a single patch"
msgstr ""
-#: builtin/fetch.c:135 builtin/pull.c:214
-msgid "refmap"
+#: builtin/log.c:1455
+msgid "use [PATCH] even with multiple patches"
msgstr ""
-#: builtin/fetch.c:136 builtin/pull.c:215
-msgid "specify fetch refmap"
+#: builtin/log.c:1459
+msgid "print patches to standard out"
msgstr ""
-#: builtin/fetch.c:394
-msgid "Couldn't find remote ref HEAD"
+#: builtin/log.c:1461
+msgid "generate a cover letter"
msgstr ""
-#: builtin/fetch.c:512
-#, c-format
-msgid "configuration fetch.output contains invalid value %s"
+#: builtin/log.c:1463
+msgid "use simple number sequence for output file names"
msgstr ""
-#: builtin/fetch.c:605
-#, c-format
-msgid "object %s not found"
+#: builtin/log.c:1464
+msgid "sfx"
msgstr ""
-#: builtin/fetch.c:609
-msgid "[up to date]"
+#: builtin/log.c:1465
+msgid "use <sfx> instead of '.patch'"
msgstr ""
-#: builtin/fetch.c:622 builtin/fetch.c:702
-msgid "[rejected]"
+#: builtin/log.c:1467
+msgid "start numbering patches at <n> instead of 1"
msgstr ""
-#: builtin/fetch.c:623
-msgid "can't fetch in current branch"
+#: builtin/log.c:1469
+msgid "mark the series as Nth re-roll"
msgstr ""
-#: builtin/fetch.c:632
-msgid "[tag update]"
+#: builtin/log.c:1471
+msgid "Use [RFC PATCH] instead of [PATCH]"
msgstr ""
-#: builtin/fetch.c:633 builtin/fetch.c:666 builtin/fetch.c:682
-#: builtin/fetch.c:697
-msgid "unable to update local ref"
+#: builtin/log.c:1474
+msgid "Use [<prefix>] instead of [PATCH]"
msgstr ""
-#: builtin/fetch.c:652
-msgid "[new tag]"
+#: builtin/log.c:1477
+msgid "store resulting files in <dir>"
msgstr ""
-#: builtin/fetch.c:655
-msgid "[new branch]"
+#: builtin/log.c:1480
+msgid "don't strip/add [PATCH]"
msgstr ""
-#: builtin/fetch.c:658
-msgid "[new ref]"
+#: builtin/log.c:1483
+msgid "don't output binary diffs"
msgstr ""
-#: builtin/fetch.c:697
-msgid "forced update"
+#: builtin/log.c:1485
+msgid "output all-zero hash in From header"
msgstr ""
-#: builtin/fetch.c:702
-msgid "non-fast-forward"
+#: builtin/log.c:1487
+msgid "don't include a patch matching a commit upstream"
msgstr ""
-#: builtin/fetch.c:747
-#, c-format
-msgid "%s did not send all necessary objects\n"
+#: builtin/log.c:1489
+msgid "show patch format instead of default (patch + stat)"
msgstr ""
-#: builtin/fetch.c:767
-#, c-format
-msgid "reject %s because shallow roots are not allowed to be updated"
+#: builtin/log.c:1491
+msgid "Messaging"
msgstr ""
-#: builtin/fetch.c:855 builtin/fetch.c:951
-#, c-format
-msgid "From %.*s\n"
+#: builtin/log.c:1492
+msgid "header"
msgstr ""
-#: builtin/fetch.c:866
-#, c-format
-msgid ""
-"some local refs could not be updated; try running\n"
-" 'git remote prune %s' to remove any old, conflicting branches"
+#: builtin/log.c:1493
+msgid "add email header"
msgstr ""
-#: builtin/fetch.c:921
-#, c-format
-msgid " (%s will become dangling)"
+#: builtin/log.c:1494 builtin/log.c:1496
+msgid "email"
msgstr ""
-#: builtin/fetch.c:922
-#, c-format
-msgid " (%s has become dangling)"
+#: builtin/log.c:1494
+msgid "add To: header"
msgstr ""
-#: builtin/fetch.c:954
-msgid "[deleted]"
+#: builtin/log.c:1496
+msgid "add Cc: header"
msgstr ""
-#: builtin/fetch.c:955 builtin/remote.c:1023
-msgid "(none)"
+#: builtin/log.c:1498
+msgid "ident"
msgstr ""
-#: builtin/fetch.c:978
-#, c-format
-msgid "Refusing to fetch into current branch %s of non-bare repository"
+#: builtin/log.c:1499
+msgid "set From address to <ident> (or committer ident if absent)"
msgstr ""
-#: builtin/fetch.c:997
-#, c-format
-msgid "Option \"%s\" value \"%s\" is not valid for %s"
+#: builtin/log.c:1501
+msgid "message-id"
msgstr ""
-#: builtin/fetch.c:1000
-#, c-format
-msgid "Option \"%s\" is ignored for %s\n"
+#: builtin/log.c:1502
+msgid "make first mail a reply to <message-id>"
msgstr ""
-#: builtin/fetch.c:1076
-#, c-format
-msgid "Don't know how to fetch from %s"
+#: builtin/log.c:1503 builtin/log.c:1506
+msgid "boundary"
msgstr ""
-#: builtin/fetch.c:1236
-#, c-format
-msgid "Fetching %s\n"
+#: builtin/log.c:1504
+msgid "attach the patch"
msgstr ""
-#: builtin/fetch.c:1238 builtin/remote.c:97
-#, c-format
-msgid "Could not fetch %s"
+#: builtin/log.c:1507
+msgid "inline the patch"
msgstr ""
-#: builtin/fetch.c:1256
-msgid ""
-"No remote repository specified. Please, specify either a URL or a\n"
-"remote name from which new revisions should be fetched."
+#: builtin/log.c:1511
+msgid "enable message threading, styles: shallow, deep"
msgstr ""
-#: builtin/fetch.c:1279
-msgid "You need to specify a tag name."
+#: builtin/log.c:1513
+msgid "signature"
msgstr ""
-#: builtin/fetch.c:1321
-msgid "Negative depth in --deepen is not supported"
+#: builtin/log.c:1514
+msgid "add a signature"
msgstr ""
-#: builtin/fetch.c:1323
-msgid "--deepen and --depth are mutually exclusive"
+#: builtin/log.c:1515
+msgid "base-commit"
msgstr ""
-#: builtin/fetch.c:1328
-msgid "--depth and --unshallow cannot be used together"
+#: builtin/log.c:1516
+msgid "add prerequisite tree info to the patch series"
msgstr ""
-#: builtin/fetch.c:1330
-msgid "--unshallow on a complete repository does not make sense"
+#: builtin/log.c:1518
+msgid "add a signature from a file"
msgstr ""
-#: builtin/fetch.c:1349
-msgid "fetch --all does not take a repository argument"
+#: builtin/log.c:1519
+msgid "don't print the patch filenames"
msgstr ""
-#: builtin/fetch.c:1351
-msgid "fetch --all does not make sense with refspecs"
+#: builtin/log.c:1521
+msgid "show progress while generating patches"
msgstr ""
-#: builtin/fetch.c:1362
+#: builtin/log.c:1596
#, c-format
-msgid "No such remote or remote group: %s"
+msgid "invalid ident line: %s"
msgstr ""
-#: builtin/fetch.c:1370
-msgid "Fetching a group and specifying refspecs does not make sense"
+#: builtin/log.c:1611
+msgid "-n and -k are mutually exclusive"
msgstr ""
-#: builtin/fmt-merge-msg.c:15
-msgid ""
-"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
+#: builtin/log.c:1613
+msgid "--subject-prefix/--rfc and -k are mutually exclusive"
msgstr ""
-#: builtin/fmt-merge-msg.c:664
-msgid "populate log with at most <n> entries from shortlog"
+#: builtin/log.c:1621
+msgid "--name-only does not make sense"
msgstr ""
-#: builtin/fmt-merge-msg.c:667
-msgid "alias for --log (deprecated)"
+#: builtin/log.c:1623
+msgid "--name-status does not make sense"
msgstr ""
-#: builtin/fmt-merge-msg.c:670
-msgid "text"
+#: builtin/log.c:1625
+msgid "--check does not make sense"
msgstr ""
-#: builtin/fmt-merge-msg.c:671
-msgid "use <text> as start of message"
+#: builtin/log.c:1657
+msgid "standard output, or directory, which one?"
msgstr ""
-#: builtin/fmt-merge-msg.c:672
-msgid "file to read from"
+#: builtin/log.c:1659
+#, c-format
+msgid "Could not create directory '%s'"
msgstr ""
-#: builtin/for-each-ref.c:10
-msgid "git for-each-ref [<options>] [<pattern>]"
+#: builtin/log.c:1752
+#, c-format
+msgid "unable to read signature file '%s'"
msgstr ""
-#: builtin/for-each-ref.c:11
-msgid "git for-each-ref [--points-at <object>]"
+#: builtin/log.c:1785
+msgid "Generating patches"
msgstr ""
-#: builtin/for-each-ref.c:12
-msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]"
+#: builtin/log.c:1829
+msgid "Failed to create output files"
msgstr ""
-#: builtin/for-each-ref.c:13
-msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
+#: builtin/log.c:1880
+msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr ""
-#: builtin/for-each-ref.c:28
-msgid "quote placeholders suitably for shells"
+#: builtin/log.c:1934
+#, c-format
+msgid ""
+"Could not find a tracked remote branch, please specify <upstream> manually.\n"
msgstr ""
-#: builtin/for-each-ref.c:30
-msgid "quote placeholders suitably for perl"
+#: builtin/ls-files.c:469
+msgid "git ls-files [<options>] [<file>...]"
msgstr ""
-#: builtin/for-each-ref.c:32
-msgid "quote placeholders suitably for python"
+#: builtin/ls-files.c:518
+msgid "identify the file status with tags"
msgstr ""
-#: builtin/for-each-ref.c:34
-msgid "quote placeholders suitably for Tcl"
+#: builtin/ls-files.c:520
+msgid "use lowercase letters for 'assume unchanged' files"
msgstr ""
-#: builtin/for-each-ref.c:37
-msgid "show only <n> matched refs"
+#: builtin/ls-files.c:522
+msgid "use lowercase letters for 'fsmonitor clean' files"
msgstr ""
-#: builtin/for-each-ref.c:42
-msgid "print only refs which points at the given object"
+#: builtin/ls-files.c:524
+msgid "show cached files in the output (default)"
msgstr ""
-#: builtin/for-each-ref.c:44
-msgid "print only refs that are merged"
+#: builtin/ls-files.c:526
+msgid "show deleted files in the output"
msgstr ""
-#: builtin/for-each-ref.c:45
-msgid "print only refs that are not merged"
+#: builtin/ls-files.c:528
+msgid "show modified files in the output"
msgstr ""
-#: builtin/for-each-ref.c:46
-msgid "print only refs which contain the commit"
+#: builtin/ls-files.c:530
+msgid "show other files in the output"
msgstr ""
-#: builtin/for-each-ref.c:47
-msgid "print only refs which don't contain the commit"
+#: builtin/ls-files.c:532
+msgid "show ignored files in the output"
msgstr ""
-#: builtin/fsck.c:554
-msgid "Checking object directories"
+#: builtin/ls-files.c:535
+msgid "show staged contents' object name in the output"
msgstr ""
-#: builtin/fsck.c:646
-msgid "git fsck [<options>] [<object>...]"
+#: builtin/ls-files.c:537
+msgid "show files on the filesystem that need to be removed"
msgstr ""
-#: builtin/fsck.c:652
-msgid "show unreachable objects"
+#: builtin/ls-files.c:539
+msgid "show 'other' directories' names only"
msgstr ""
-#: builtin/fsck.c:653
-msgid "show dangling objects"
+#: builtin/ls-files.c:541
+msgid "show line endings of files"
msgstr ""
-#: builtin/fsck.c:654
-msgid "report tags"
+#: builtin/ls-files.c:543
+msgid "don't show empty directories"
msgstr ""
-#: builtin/fsck.c:655
-msgid "report root nodes"
+#: builtin/ls-files.c:546
+msgid "show unmerged files in the output"
msgstr ""
-#: builtin/fsck.c:656
-msgid "make index objects head nodes"
+#: builtin/ls-files.c:548
+msgid "show resolve-undo information"
msgstr ""
-#: builtin/fsck.c:657
-msgid "make reflogs head nodes (default)"
+#: builtin/ls-files.c:550
+msgid "skip files matching pattern"
msgstr ""
-#: builtin/fsck.c:658
-msgid "also consider packs and alternate objects"
+#: builtin/ls-files.c:553
+msgid "exclude patterns are read from <file>"
msgstr ""
-#: builtin/fsck.c:659
-msgid "check only connectivity"
+#: builtin/ls-files.c:556
+msgid "read additional per-directory exclude patterns in <file>"
msgstr ""
-#: builtin/fsck.c:660
-msgid "enable more strict checking"
+#: builtin/ls-files.c:558
+msgid "add the standard git exclusions"
msgstr ""
-#: builtin/fsck.c:662
-msgid "write dangling objects in .git/lost-found"
+#: builtin/ls-files.c:561
+msgid "make the output relative to the project top directory"
msgstr ""
-#: builtin/fsck.c:663 builtin/prune.c:107
-msgid "show progress"
+#: builtin/ls-files.c:564
+msgid "recurse through submodules"
msgstr ""
-#: builtin/fsck.c:664
-msgid "show verbose names for reachable objects"
+#: builtin/ls-files.c:566
+msgid "if any <file> is not in the index, treat this as an error"
msgstr ""
-#: builtin/fsck.c:725
-msgid "Checking objects"
+#: builtin/ls-files.c:567
+msgid "tree-ish"
msgstr ""
-#: builtin/gc.c:26
-msgid "git gc [<options>]"
+#: builtin/ls-files.c:568
+msgid "pretend that paths removed since <tree-ish> are still present"
msgstr ""
-#: builtin/gc.c:79
-#, c-format
-msgid "Failed to fstat %s: %s"
+#: builtin/ls-files.c:570
+msgid "show debugging data"
msgstr ""
-#: builtin/gc.c:311
-#, c-format
-msgid "Can't stat %s"
+#: builtin/ls-remote.c:9
+msgid ""
+"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
+" [-q | --quiet] [--exit-code] [--get-url]\n"
+" [--symref] [<repository> [<refs>...]]"
msgstr ""
-#: builtin/gc.c:320
-#, 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/ls-remote.c:59
+msgid "do not print remote URL"
msgstr ""
-#: builtin/gc.c:359
-msgid "prune unreferenced objects"
+#: builtin/ls-remote.c:60 builtin/ls-remote.c:62
+msgid "exec"
msgstr ""
-#: builtin/gc.c:361
-msgid "be more thorough (increased runtime)"
+#: builtin/ls-remote.c:61 builtin/ls-remote.c:63
+msgid "path of git-upload-pack on the remote host"
msgstr ""
-#: builtin/gc.c:362
-msgid "enable auto-gc mode"
+#: builtin/ls-remote.c:65
+msgid "limit to tags"
msgstr ""
-#: builtin/gc.c:363
-msgid "force running gc even if there may be another gc running"
+#: builtin/ls-remote.c:66
+msgid "limit to heads"
msgstr ""
-#: builtin/gc.c:380
-#, c-format
-msgid "Failed to parse gc.logexpiry value %s"
+#: builtin/ls-remote.c:67
+msgid "do not show peeled tags"
msgstr ""
-#: builtin/gc.c:408
-#, c-format
-msgid "Auto packing the repository in background for optimum performance.\n"
+#: builtin/ls-remote.c:69
+msgid "take url.<base>.insteadOf into account"
msgstr ""
-#: builtin/gc.c:410
-#, c-format
-msgid "Auto packing the repository for optimum performance.\n"
+#: builtin/ls-remote.c:73
+msgid "exit with exit code 2 if no matching refs are found"
msgstr ""
-#: builtin/gc.c:411
-#, c-format
-msgid "See \"git help gc\" for manual housekeeping.\n"
+#: builtin/ls-remote.c:76
+msgid "show underlying ref in addition to the object pointed by it"
msgstr ""
-#: builtin/gc.c:436
-#, c-format
-msgid ""
-"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
+#: builtin/ls-tree.c:30
+msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
msgstr ""
-#: builtin/gc.c:480
-msgid ""
-"There are too many unreachable loose objects; run 'git prune' to remove them."
+#: builtin/ls-tree.c:128
+msgid "only show trees"
msgstr ""
-#: builtin/grep.c:27
-msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
+#: builtin/ls-tree.c:130
+msgid "recurse into subtrees"
msgstr ""
-#: builtin/grep.c:235
-#, c-format
-msgid "grep: failed to create thread: %s"
+#: builtin/ls-tree.c:132
+msgid "show trees when recursing"
msgstr ""
-#: builtin/grep.c:293
-#, c-format
-msgid "invalid number of threads specified (%d) for %s"
+#: builtin/ls-tree.c:135
+msgid "terminate entries with NUL byte"
msgstr ""
-#. TRANSLATORS: %s is the configuration
-#. variable for tweaking threads, currently
-#. grep.threads
-#.
-#: builtin/grep.c:302 builtin/index-pack.c:1494 builtin/index-pack.c:1692
-#, c-format
-msgid "no threads support, ignoring %s"
+#: builtin/ls-tree.c:136
+msgid "include object size"
msgstr ""
-#: builtin/grep.c:788 builtin/grep.c:829
-#, c-format
-msgid "unable to read tree (%s)"
+#: builtin/ls-tree.c:138 builtin/ls-tree.c:140
+msgid "list only filenames"
msgstr ""
-#: builtin/grep.c:848
-#, c-format
-msgid "unable to grep from object of type %s"
+#: builtin/ls-tree.c:143
+msgid "use full path names"
msgstr ""
-#: builtin/grep.c:912
+#: builtin/ls-tree.c:145
+msgid "list entire tree; not just current directory (implies --full-name)"
+msgstr ""
+
+#: builtin/mailsplit.c:241
#, c-format
-msgid "switch `%c' expects a numerical value"
+msgid "empty mbox: '%s'"
msgstr ""
-#: builtin/grep.c:999
-msgid "search in index instead of in the work tree"
+#: builtin/merge.c:51
+msgid "git merge [<options>] [<commit>...]"
msgstr ""
-#: builtin/grep.c:1001
-msgid "find in contents not managed by git"
+#: builtin/merge.c:52
+msgid "git merge --abort"
msgstr ""
-#: builtin/grep.c:1003
-msgid "search in both tracked and untracked files"
+#: builtin/merge.c:53
+msgid "git merge --continue"
msgstr ""
-#: builtin/grep.c:1005
-msgid "ignore files specified via '.gitignore'"
+#: builtin/merge.c:110
+msgid "switch `m' requires a value"
msgstr ""
-#: builtin/grep.c:1007
-msgid "recursively search in each submodule"
+#: builtin/merge.c:176
+#, c-format
+msgid "Could not find merge strategy '%s'.\n"
msgstr ""
-#: builtin/grep.c:1009
-msgid "basename"
+#: builtin/merge.c:177
+#, c-format
+msgid "Available strategies are:"
msgstr ""
-#: builtin/grep.c:1010
-msgid "prepend parent project's basename to output"
+#: builtin/merge.c:182
+#, c-format
+msgid "Available custom strategies are:"
msgstr ""
-#: builtin/grep.c:1013
-msgid "show non-matching lines"
+#: builtin/merge.c:232 builtin/pull.c:142
+msgid "do not show a diffstat at the end of the merge"
msgstr ""
-#: builtin/grep.c:1015
-msgid "case insensitive matching"
+#: builtin/merge.c:235 builtin/pull.c:145
+msgid "show a diffstat at the end of the merge"
msgstr ""
-#: builtin/grep.c:1017
-msgid "match patterns only at word boundaries"
+#: builtin/merge.c:236 builtin/pull.c:148
+msgid "(synonym to --stat)"
msgstr ""
-#: builtin/grep.c:1019
-msgid "process binary files as text"
+#: builtin/merge.c:238 builtin/pull.c:151
+msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr ""
-#: builtin/grep.c:1021
-msgid "don't match patterns in binary files"
+#: builtin/merge.c:241 builtin/pull.c:157
+msgid "create a single commit instead of doing a merge"
msgstr ""
-#: builtin/grep.c:1024
-msgid "process binary files with textconv filters"
+#: builtin/merge.c:243 builtin/pull.c:160
+msgid "perform a commit if the merge succeeds (default)"
msgstr ""
-#: builtin/grep.c:1026
-msgid "descend at most <depth> levels"
+#: builtin/merge.c:245 builtin/pull.c:163
+msgid "edit message before committing"
msgstr ""
-#: builtin/grep.c:1030
-msgid "use extended POSIX regular expressions"
+#: builtin/merge.c:246
+msgid "allow fast-forward (default)"
msgstr ""
-#: builtin/grep.c:1033
-msgid "use basic POSIX regular expressions (default)"
+#: builtin/merge.c:248 builtin/pull.c:169
+msgid "abort if fast-forward is not possible"
msgstr ""
-#: builtin/grep.c:1036
-msgid "interpret patterns as fixed strings"
+#: builtin/merge.c:252 builtin/pull.c:172
+msgid "verify that the named commit has a valid GPG signature"
msgstr ""
-#: builtin/grep.c:1039
-msgid "use Perl-compatible regular expressions"
+#: builtin/merge.c:253 builtin/notes.c:779 builtin/pull.c:176
+#: builtin/revert.c:110
+msgid "strategy"
msgstr ""
-#: builtin/grep.c:1042
-msgid "show line numbers"
+#: builtin/merge.c:254 builtin/pull.c:177
+msgid "merge strategy to use"
msgstr ""
-#: builtin/grep.c:1043
-msgid "don't show filenames"
+#: builtin/merge.c:255 builtin/pull.c:180
+msgid "option=value"
msgstr ""
-#: builtin/grep.c:1044
-msgid "show filenames"
+#: builtin/merge.c:256 builtin/pull.c:181
+msgid "option for selected merge strategy"
msgstr ""
-#: builtin/grep.c:1046
-msgid "show filenames relative to top directory"
+#: builtin/merge.c:258
+msgid "merge commit message (for a non-fast-forward merge)"
msgstr ""
-#: builtin/grep.c:1048
-msgid "show only filenames instead of matching lines"
+#: builtin/merge.c:265
+msgid "abort the current in-progress merge"
msgstr ""
-#: builtin/grep.c:1050
-msgid "synonym for --files-with-matches"
+#: builtin/merge.c:267
+msgid "continue the current in-progress merge"
msgstr ""
-#: builtin/grep.c:1053
-msgid "show only the names of files without match"
+#: builtin/merge.c:269 builtin/pull.c:188
+msgid "allow merging unrelated histories"
msgstr ""
-#: builtin/grep.c:1055
-msgid "print NUL after filenames"
+#: builtin/merge.c:275
+msgid "verify commit-msg hook"
msgstr ""
-#: builtin/grep.c:1057
-msgid "show the number of matches instead of matching lines"
+#: builtin/merge.c:300
+msgid "could not run stash."
msgstr ""
-#: builtin/grep.c:1058
-msgid "highlight matches"
+#: builtin/merge.c:305
+msgid "stash failed"
msgstr ""
-#: builtin/grep.c:1060
-msgid "print empty line between matches from different files"
+#: builtin/merge.c:310
+#, c-format
+msgid "not a valid object: %s"
msgstr ""
-#: builtin/grep.c:1062
-msgid "show filename only once above matches from same file"
+#: builtin/merge.c:332 builtin/merge.c:349
+msgid "read-tree failed"
msgstr ""
-#: builtin/grep.c:1065
-msgid "show <n> context lines before and after matches"
+#: builtin/merge.c:379
+msgid " (nothing to squash)"
msgstr ""
-#: builtin/grep.c:1068
-msgid "show <n> context lines before matches"
+#: builtin/merge.c:390
+#, c-format
+msgid "Squash commit -- not updating HEAD\n"
msgstr ""
-#: builtin/grep.c:1070
-msgid "show <n> context lines after matches"
+#: builtin/merge.c:440
+#, c-format
+msgid "No merge message -- not updating HEAD\n"
msgstr ""
-#: builtin/grep.c:1072
-msgid "use <n> worker threads"
+#: builtin/merge.c:491
+#, c-format
+msgid "'%s' does not point to a commit"
msgstr ""
-#: builtin/grep.c:1073
-msgid "shortcut for -C NUM"
+#: builtin/merge.c:578
+#, c-format
+msgid "Bad branch.%s.mergeoptions string: %s"
msgstr ""
-#: builtin/grep.c:1076
-msgid "show a line with the function name before matches"
+#: builtin/merge.c:699
+msgid "Not handling anything other than two heads merge."
msgstr ""
-#: builtin/grep.c:1078
-msgid "show the surrounding function"
+#: builtin/merge.c:713
+#, c-format
+msgid "Unknown option for merge-recursive: -X%s"
msgstr ""
-#: builtin/grep.c:1081
-msgid "read patterns from file"
+#: builtin/merge.c:728
+#, c-format
+msgid "unable to write %s"
msgstr ""
-#: builtin/grep.c:1083
-msgid "match <pattern>"
+#: builtin/merge.c:779
+#, c-format
+msgid "Could not read from '%s'"
msgstr ""
-#: builtin/grep.c:1085
-msgid "combine patterns specified with -e"
+#: builtin/merge.c:788
+#, c-format
+msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr ""
-#: builtin/grep.c:1097
-msgid "indicate hit with exit status without output"
+#: builtin/merge.c:794
+#, 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/grep.c:1099
-msgid "show only matches from files that match all patterns"
+#: builtin/merge.c:830
+msgid "Empty commit message."
msgstr ""
-#: builtin/grep.c:1101
-msgid "show parse tree for grep expression"
+#: builtin/merge.c:849
+#, c-format
+msgid "Wonderful.\n"
msgstr ""
-#: builtin/grep.c:1105
-msgid "pager"
+#: builtin/merge.c:902
+#, c-format
+msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr ""
-#: builtin/grep.c:1105
-msgid "show matching files in the pager"
+#: builtin/merge.c:941
+msgid "No current branch."
msgstr ""
-#: builtin/grep.c:1108
-msgid "allow calling of grep(1) (ignored by this build)"
+#: builtin/merge.c:943
+msgid "No remote for the current branch."
msgstr ""
-#: builtin/grep.c:1172
-msgid "no pattern given."
+#: builtin/merge.c:945
+msgid "No default upstream defined for the current branch."
msgstr ""
-#: builtin/grep.c:1204
-msgid "--no-index or --untracked cannot be used with revs"
+#: builtin/merge.c:950
+#, c-format
+msgid "No remote-tracking branch for %s from %s"
msgstr ""
-#: builtin/grep.c:1211
+#: builtin/merge.c:1007
#, c-format
-msgid "unable to resolve revision: %s"
+msgid "Bad value '%s' in environment '%s'"
msgstr ""
-#: builtin/grep.c:1245 builtin/index-pack.c:1490
+#: builtin/merge.c:1110
#, c-format
-msgid "invalid number of threads specified (%d)"
+msgid "not something we can merge in %s: %s"
msgstr ""
-#: builtin/grep.c:1250
-msgid "no threads support, ignoring --threads"
+#: builtin/merge.c:1144
+msgid "not something we can merge"
msgstr ""
-#: builtin/grep.c:1281
-msgid "--open-files-in-pager only works on the worktree"
+#: builtin/merge.c:1247
+msgid "--abort expects no arguments"
msgstr ""
-#: builtin/grep.c:1304
-msgid "option not supported with --recurse-submodules."
+#: builtin/merge.c:1251
+msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr ""
-#: builtin/grep.c:1310
-msgid "--cached or --untracked cannot be used with --no-index."
+#: builtin/merge.c:1263
+msgid "--continue expects no arguments"
msgstr ""
-#: builtin/grep.c:1316
-msgid "--[no-]exclude-standard cannot be used for tracked contents."
+#: builtin/merge.c:1267
+msgid "There is no merge in progress (MERGE_HEAD missing)."
msgstr ""
-#: builtin/grep.c:1324
-msgid "both --cached and trees are given."
+#: builtin/merge.c:1283
+msgid ""
+"You have not concluded your merge (MERGE_HEAD exists).\n"
+"Please, commit your changes before you merge."
msgstr ""
-#: builtin/hash-object.c:82
+#: builtin/merge.c:1290
msgid ""
-"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
-"[--] <file>..."
+"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
+"Please, commit your changes before you merge."
msgstr ""
-#: builtin/hash-object.c:83
-msgid "git hash-object --stdin-paths"
+#: builtin/merge.c:1293
+msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr ""
-#: builtin/hash-object.c:95
-msgid "type"
+#: builtin/merge.c:1302
+msgid "You cannot combine --squash with --no-ff."
msgstr ""
-#: builtin/hash-object.c:95
-msgid "object type"
+#: builtin/merge.c:1310
+msgid "No commit specified and merge.defaultToUpstream not set."
msgstr ""
-#: builtin/hash-object.c:96
-msgid "write the object into the object database"
+#: builtin/merge.c:1327
+msgid "Squash commit into empty head not supported yet"
msgstr ""
-#: builtin/hash-object.c:98
-msgid "read the object from stdin"
+#: builtin/merge.c:1329
+msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr ""
-#: builtin/hash-object.c:100
-msgid "store file as is without filters"
+#: builtin/merge.c:1334
+#, c-format
+msgid "%s - not something we can merge"
msgstr ""
-#: builtin/hash-object.c:101
-msgid ""
-"just hash any random garbage to create corrupt objects for debugging Git"
+#: builtin/merge.c:1336
+msgid "Can merge only exactly one commit into empty head"
msgstr ""
-#: builtin/hash-object.c:102
-msgid "process file as it were from this path"
+#: builtin/merge.c:1370
+#, c-format
+msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr ""
-#: builtin/help.c:43
-msgid "print all available commands"
+#: builtin/merge.c:1373
+#, c-format
+msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr ""
-#: builtin/help.c:44
-msgid "exclude guides"
+#: builtin/merge.c:1376
+#, c-format
+msgid "Commit %s does not have a GPG signature."
msgstr ""
-#: builtin/help.c:45
-msgid "print list of useful guides"
+#: builtin/merge.c:1379
+#, c-format
+msgid "Commit %s has a good GPG signature by %s\n"
msgstr ""
-#: builtin/help.c:46
-msgid "show man page"
+#: builtin/merge.c:1438
+msgid "refusing to merge unrelated histories"
msgstr ""
-#: builtin/help.c:47
-msgid "show manual in web browser"
+#: builtin/merge.c:1447
+msgid "Already up to date."
msgstr ""
-#: builtin/help.c:49
-msgid "show info page"
+#: builtin/merge.c:1457
+#, c-format
+msgid "Updating %s..%s\n"
msgstr ""
-#: builtin/help.c:55
-msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
+#: builtin/merge.c:1498
+#, c-format
+msgid "Trying really trivial in-index merge...\n"
msgstr ""
-#: builtin/help.c:67
+#: builtin/merge.c:1505
#, c-format
-msgid "unrecognized help format '%s'"
+msgid "Nope.\n"
msgstr ""
-#: builtin/help.c:94
-msgid "Failed to start emacsclient."
+#: builtin/merge.c:1530
+msgid "Already up to date. Yeeah!"
msgstr ""
-#: builtin/help.c:107
-msgid "Failed to parse emacsclient version."
+#: builtin/merge.c:1536
+msgid "Not possible to fast-forward, aborting."
msgstr ""
-#: builtin/help.c:115
+#: builtin/merge.c:1559 builtin/merge.c:1638
#, c-format
-msgid "emacsclient version '%d' too old (< 22)."
+msgid "Rewinding the tree to pristine...\n"
msgstr ""
-#: builtin/help.c:133 builtin/help.c:154 builtin/help.c:163 builtin/help.c:171
+#: builtin/merge.c:1563
#, c-format
-msgid "failed to exec '%s'"
+msgid "Trying merge strategy %s...\n"
msgstr ""
-#: builtin/help.c:208
+#: builtin/merge.c:1629
#, c-format
-msgid ""
-"'%s': path for unsupported man viewer.\n"
-"Please consider using 'man.<tool>.cmd' instead."
+msgid "No merge strategy handled the merge.\n"
msgstr ""
-#: builtin/help.c:220
+#: builtin/merge.c:1631
#, c-format
-msgid ""
-"'%s': cmd for supported man viewer.\n"
-"Please consider using 'man.<tool>.path' instead."
+msgid "Merge with strategy %s failed.\n"
msgstr ""
-#: builtin/help.c:337
+#: builtin/merge.c:1640
#, c-format
-msgid "'%s': unknown man viewer."
+msgid "Using the %s to prepare resolving by hand.\n"
msgstr ""
-#: builtin/help.c:354
-msgid "no man viewer handled the request"
+#: builtin/merge.c:1652
+#, c-format
+msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
-#: builtin/help.c:362
-msgid "no info viewer handled the request"
+#: builtin/merge-base.c:31
+msgid "git merge-base [-a | --all] <commit> <commit>..."
msgstr ""
-#: builtin/help.c:404
-msgid "Defining attributes per path"
+#: builtin/merge-base.c:32
+msgid "git merge-base [-a | --all] --octopus <commit>..."
msgstr ""
-#: builtin/help.c:405
-msgid "Everyday Git With 20 Commands Or So"
+#: builtin/merge-base.c:33
+msgid "git merge-base --independent <commit>..."
msgstr ""
-#: builtin/help.c:406
-msgid "A Git glossary"
+#: builtin/merge-base.c:34
+msgid "git merge-base --is-ancestor <commit> <commit>"
msgstr ""
-#: builtin/help.c:407
-msgid "Specifies intentionally untracked files to ignore"
+#: builtin/merge-base.c:35
+msgid "git merge-base --fork-point <ref> [<commit>]"
msgstr ""
-#: builtin/help.c:408
-msgid "Defining submodule properties"
+#: builtin/merge-base.c:221
+msgid "output all common ancestors"
msgstr ""
-#: builtin/help.c:409
-msgid "Specifying revisions and ranges for Git"
+#: builtin/merge-base.c:223
+msgid "find ancestors for a single n-way merge"
msgstr ""
-#: builtin/help.c:410
-msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
+#: builtin/merge-base.c:225
+msgid "list revs not reachable from others"
msgstr ""
-#: builtin/help.c:411
-msgid "An overview of recommended workflows with Git"
+#: builtin/merge-base.c:227
+msgid "is the first one ancestor of the other?"
msgstr ""
-#: builtin/help.c:423
-msgid "The common Git guides are:\n"
+#: builtin/merge-base.c:229
+msgid "find where <commit> forked from reflog of <ref>"
msgstr ""
-#: builtin/help.c:441
-#, c-format
-msgid "`git %s' is aliased to `%s'"
+#: builtin/merge-file.c:9
+msgid ""
+"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
+"<orig-file> <file2>"
msgstr ""
-#: builtin/help.c:463 builtin/help.c:480
-#, c-format
-msgid "usage: %s%s"
+#: builtin/merge-file.c:33
+msgid "send results to standard output"
msgstr ""
-#: builtin/index-pack.c:155
-#, c-format
-msgid "unable to open %s"
+#: builtin/merge-file.c:34
+msgid "use a diff3 based merge"
msgstr ""
-#: builtin/index-pack.c:205
-#, c-format
-msgid "object type mismatch at %s"
+#: builtin/merge-file.c:35
+msgid "for conflicts, use our version"
+msgstr ""
+
+#: builtin/merge-file.c:37
+msgid "for conflicts, use their version"
+msgstr ""
+
+#: builtin/merge-file.c:39
+msgid "for conflicts, use a union version"
+msgstr ""
+
+#: builtin/merge-file.c:42
+msgid "for conflicts, use this marker size"
+msgstr ""
+
+#: builtin/merge-file.c:43
+msgid "do not warn about conflicts"
+msgstr ""
+
+#: builtin/merge-file.c:45
+msgid "set labels for file1/orig-file/file2"
msgstr ""
-#: builtin/index-pack.c:225
+#: builtin/merge-recursive.c:45
#, c-format
-msgid "did not receive expected object %s"
+msgid "unknown option %s"
msgstr ""
-#: builtin/index-pack.c:228
+#: builtin/merge-recursive.c:51
#, c-format
-msgid "object %s: expected type %s, found %s"
+msgid "could not parse object '%s'"
msgstr ""
-#: builtin/index-pack.c:270
+#: builtin/merge-recursive.c:55
#, c-format
-msgid "cannot fill %d byte"
-msgid_plural "cannot fill %d bytes"
+msgid "cannot handle more than %d base. Ignoring %s."
+msgid_plural "cannot handle more than %d bases. Ignoring %s."
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:280
-msgid "early EOF"
+#: builtin/merge-recursive.c:63
+msgid "not handling anything other than two heads merge."
msgstr ""
-#: builtin/index-pack.c:281
-msgid "read error on input"
+#: builtin/merge-recursive.c:69 builtin/merge-recursive.c:71
+#, c-format
+msgid "could not resolve ref '%s'"
msgstr ""
-#: builtin/index-pack.c:293
-msgid "used more bytes than were available"
+#: builtin/merge-recursive.c:77
+#, c-format
+msgid "Merging %s with %s\n"
msgstr ""
-#: builtin/index-pack.c:300
-msgid "pack too large for current definition of off_t"
+#: builtin/mktree.c:66
+msgid "git mktree [-z] [--missing] [--batch]"
msgstr ""
-#: builtin/index-pack.c:303 builtin/unpack-objects.c:93
-msgid "pack exceeds maximum allowed size"
+#: builtin/mktree.c:154
+msgid "input is NUL terminated"
msgstr ""
-#: builtin/index-pack.c:318
-#, c-format
-msgid "unable to create '%s'"
+#: builtin/mktree.c:155 builtin/write-tree.c:25
+msgid "allow missing objects"
msgstr ""
-#: builtin/index-pack.c:324
-#, c-format
-msgid "cannot open packfile '%s'"
+#: builtin/mktree.c:156
+msgid "allow creation of more than one tree"
msgstr ""
-#: builtin/index-pack.c:338
-msgid "pack signature mismatch"
+#: builtin/mv.c:17
+msgid "git mv [<options>] <source>... <destination>"
+msgstr ""
+
+#: builtin/mv.c:82
+#, c-format
+msgid "Directory %s is in index and no submodule?"
msgstr ""
-#: builtin/index-pack.c:340
-#, c-format
-msgid "pack version %<PRIu32> unsupported"
+#: builtin/mv.c:84
+msgid "Please stage your changes to .gitmodules or stash them to proceed"
msgstr ""
-#: builtin/index-pack.c:358
+#: builtin/mv.c:102
#, c-format
-msgid "pack has bad object at offset %<PRIuMAX>: %s"
+msgid "%.*s is in index"
msgstr ""
-#: builtin/index-pack.c:479
-#, c-format
-msgid "inflate returned %d"
+#: builtin/mv.c:124
+msgid "force move/rename even if target exists"
msgstr ""
-#: builtin/index-pack.c:528
-msgid "offset value overflow for delta base object"
+#: builtin/mv.c:126
+msgid "skip move/rename errors"
msgstr ""
-#: builtin/index-pack.c:536
-msgid "delta base offset is out of bound"
+#: builtin/mv.c:168
+#, c-format
+msgid "destination '%s' is not a directory"
msgstr ""
-#: builtin/index-pack.c:544
+#: builtin/mv.c:179
#, c-format
-msgid "unknown object type %d"
+msgid "Checking rename of '%s' to '%s'\n"
msgstr ""
-#: builtin/index-pack.c:575
-msgid "cannot pread pack file"
+#: builtin/mv.c:183
+msgid "bad source"
msgstr ""
-#: builtin/index-pack.c:577
-#, 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/mv.c:186
+msgid "can not move directory into itself"
+msgstr ""
-#: builtin/index-pack.c:603
-msgid "serious inflate inconsistency"
+#: builtin/mv.c:189
+msgid "cannot move directory over file"
msgstr ""
-#: builtin/index-pack.c:748 builtin/index-pack.c:754 builtin/index-pack.c:777
-#: builtin/index-pack.c:816 builtin/index-pack.c:825
-#, c-format
-msgid "SHA1 COLLISION FOUND WITH %s !"
+#: builtin/mv.c:198
+msgid "source directory is empty"
msgstr ""
-#: builtin/index-pack.c:751 builtin/pack-objects.c:167
-#: builtin/pack-objects.c:261
-#, c-format
-msgid "unable to read %s"
+#: builtin/mv.c:223
+msgid "not under version control"
msgstr ""
-#: builtin/index-pack.c:814
-#, c-format
-msgid "cannot read existing object info %s"
+#: builtin/mv.c:226
+msgid "destination exists"
msgstr ""
-#: builtin/index-pack.c:822
+#: builtin/mv.c:234
#, c-format
-msgid "cannot read existing object %s"
+msgid "overwriting '%s'"
msgstr ""
-#: builtin/index-pack.c:836
-#, c-format
-msgid "invalid blob object %s"
+#: builtin/mv.c:237
+msgid "Cannot overwrite"
msgstr ""
-#: builtin/index-pack.c:851
-#, c-format
-msgid "invalid %s"
+#: builtin/mv.c:240
+msgid "multiple sources for the same target"
msgstr ""
-#: builtin/index-pack.c:854
-msgid "Error in object"
+#: builtin/mv.c:242
+msgid "destination directory does not exist"
msgstr ""
-#: builtin/index-pack.c:856
+#: builtin/mv.c:249
#, c-format
-msgid "Not all child objects of %s are reachable"
+msgid "%s, source=%s, destination=%s"
msgstr ""
-#: builtin/index-pack.c:928 builtin/index-pack.c:959
-msgid "failed to apply delta"
+#: builtin/mv.c:270
+#, c-format
+msgid "Renaming %s to %s\n"
msgstr ""
-#: builtin/index-pack.c:1130
-msgid "Receiving objects"
+#: builtin/mv.c:276 builtin/remote.c:716 builtin/repack.c:494
+#, c-format
+msgid "renaming '%s' failed"
msgstr ""
-#: builtin/index-pack.c:1130
-msgid "Indexing objects"
+#: builtin/name-rev.c:355
+msgid "git name-rev [<options>] <commit>..."
msgstr ""
-#: builtin/index-pack.c:1164
-msgid "pack is corrupted (SHA1 mismatch)"
+#: builtin/name-rev.c:356
+msgid "git name-rev [<options>] --all"
msgstr ""
-#: builtin/index-pack.c:1169
-msgid "cannot fstat packfile"
+#: builtin/name-rev.c:357
+msgid "git name-rev [<options>] --stdin"
msgstr ""
-#: builtin/index-pack.c:1172
-msgid "pack has junk at the end"
+#: builtin/name-rev.c:413
+msgid "print only names (no SHA-1)"
msgstr ""
-#: builtin/index-pack.c:1184
-msgid "confusion beyond insanity in parse_pack_objects()"
+#: builtin/name-rev.c:414
+msgid "only use tags to name the commits"
msgstr ""
-#: builtin/index-pack.c:1207
-msgid "Resolving deltas"
+#: builtin/name-rev.c:416
+msgid "only use refs matching <pattern>"
msgstr ""
-#: builtin/index-pack.c:1218
-#, c-format
-msgid "unable to create thread: %s"
+#: builtin/name-rev.c:418
+msgid "ignore refs matching <pattern>"
msgstr ""
-#: builtin/index-pack.c:1260
-msgid "confusion beyond insanity"
+#: builtin/name-rev.c:420
+msgid "list all commits reachable from all refs"
msgstr ""
-#: builtin/index-pack.c:1266
-#, c-format
-msgid "completed with %d local object"
-msgid_plural "completed with %d local objects"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/index-pack.c:1278
-#, c-format
-msgid "Unexpected tail checksum for %s (disk corruption?)"
+#: builtin/name-rev.c:421
+msgid "read from stdin"
msgstr ""
-#: builtin/index-pack.c:1282
-#, c-format
-msgid "pack has %d unresolved delta"
-msgid_plural "pack has %d unresolved deltas"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/index-pack.c:1306
-#, c-format
-msgid "unable to deflate appended object (%d)"
+#: builtin/name-rev.c:422
+msgid "allow to print `undefined` names (default)"
msgstr ""
-#: builtin/index-pack.c:1382
-#, c-format
-msgid "local object %s is corrupt"
+#: builtin/name-rev.c:428
+msgid "dereference tags in the input (internal use)"
msgstr ""
-#: builtin/index-pack.c:1408
-msgid "error while closing pack file"
+#: builtin/notes.c:28
+msgid "git notes [--ref <notes-ref>] [list [<object>]]"
msgstr ""
-#: builtin/index-pack.c:1420
-#, c-format
-msgid "cannot write keep file '%s'"
+#: builtin/notes.c:29
+msgid ""
+"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
+"| (-c | -C) <object>] [<object>]"
msgstr ""
-#: builtin/index-pack.c:1428
-#, c-format
-msgid "cannot close written keep file '%s'"
+#: builtin/notes.c:30
+msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
msgstr ""
-#: builtin/index-pack.c:1438
-msgid "cannot store pack file"
+#: builtin/notes.c:31
+msgid ""
+"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
+"(-c | -C) <object>] [<object>]"
msgstr ""
-#: builtin/index-pack.c:1446
-msgid "cannot store index file"
+#: builtin/notes.c:32
+msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
msgstr ""
-#: builtin/index-pack.c:1484
-#, c-format
-msgid "bad pack.indexversion=%<PRIu32>"
+#: builtin/notes.c:33
+msgid "git notes [--ref <notes-ref>] show [<object>]"
msgstr ""
-#: builtin/index-pack.c:1552
-#, c-format
-msgid "Cannot open existing pack file '%s'"
+#: builtin/notes.c:34
+msgid ""
+"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
msgstr ""
-#: builtin/index-pack.c:1554
-#, c-format
-msgid "Cannot open existing pack idx file for '%s'"
+#: builtin/notes.c:35
+msgid "git notes merge --commit [-v | -q]"
msgstr ""
-#: builtin/index-pack.c:1602
-#, c-format
-msgid "non delta: %d object"
-msgid_plural "non delta: %d objects"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/index-pack.c:1609
-#, c-format
-msgid "chain length = %d: %lu object"
-msgid_plural "chain length = %d: %lu objects"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/index-pack.c:1622
-#, c-format
-msgid "packfile name '%s' does not end with '.pack'"
+#: builtin/notes.c:36
+msgid "git notes merge --abort [-v | -q]"
msgstr ""
-#: builtin/index-pack.c:1704 builtin/index-pack.c:1707
-#: builtin/index-pack.c:1723 builtin/index-pack.c:1727
-#, c-format
-msgid "bad %s"
+#: builtin/notes.c:37
+msgid "git notes [--ref <notes-ref>] remove [<object>...]"
msgstr ""
-#: builtin/index-pack.c:1743
-msgid "--fix-thin cannot be used without --stdin"
+#: builtin/notes.c:38
+msgid "git notes [--ref <notes-ref>] prune [-n] [-v]"
msgstr ""
-#: builtin/index-pack.c:1745
-msgid "--stdin requires a git repository"
+#: builtin/notes.c:39
+msgid "git notes [--ref <notes-ref>] get-ref"
msgstr ""
-#: builtin/index-pack.c:1753
-msgid "--verify with no packfile name given"
+#: builtin/notes.c:44
+msgid "git notes [list [<object>]]"
msgstr ""
-#: builtin/init-db.c:55
-#, c-format
-msgid "cannot stat '%s'"
+#: builtin/notes.c:49
+msgid "git notes add [<options>] [<object>]"
msgstr ""
-#: builtin/init-db.c:61
-#, c-format
-msgid "cannot stat template '%s'"
+#: builtin/notes.c:54
+msgid "git notes copy [<options>] <from-object> <to-object>"
msgstr ""
-#: builtin/init-db.c:66
-#, c-format
-msgid "cannot opendir '%s'"
+#: builtin/notes.c:55
+msgid "git notes copy --stdin [<from-object> <to-object>]..."
msgstr ""
-#: builtin/init-db.c:77
-#, c-format
-msgid "cannot readlink '%s'"
+#: builtin/notes.c:60
+msgid "git notes append [<options>] [<object>]"
msgstr ""
-#: builtin/init-db.c:79
-#, c-format
-msgid "cannot symlink '%s' '%s'"
+#: builtin/notes.c:65
+msgid "git notes edit [<object>]"
msgstr ""
-#: builtin/init-db.c:85
-#, c-format
-msgid "cannot copy '%s' to '%s'"
+#: builtin/notes.c:70
+msgid "git notes show [<object>]"
msgstr ""
-#: builtin/init-db.c:89
-#, c-format
-msgid "ignoring template %s"
+#: builtin/notes.c:75
+msgid "git notes merge [<options>] <notes-ref>"
msgstr ""
-#: builtin/init-db.c:120
-#, c-format
-msgid "templates not found %s"
+#: builtin/notes.c:76
+msgid "git notes merge --commit [<options>]"
msgstr ""
-#: builtin/init-db.c:135
-#, c-format
-msgid "not copying templates from '%s': %s"
+#: builtin/notes.c:77
+msgid "git notes merge --abort [<options>]"
msgstr ""
-#: builtin/init-db.c:328
-#, c-format
-msgid "unable to handle file type %d"
+#: builtin/notes.c:82
+msgid "git notes remove [<object>]"
msgstr ""
-#: builtin/init-db.c:331
-#, c-format
-msgid "unable to move %s to %s"
+#: builtin/notes.c:87
+msgid "git notes prune [<options>]"
msgstr ""
-#: builtin/init-db.c:348 builtin/init-db.c:351
-#, c-format
-msgid "%s already exists"
+#: builtin/notes.c:92
+msgid "git notes get-ref"
msgstr ""
-#: builtin/init-db.c:404
-#, c-format
-msgid "Reinitialized existing shared Git repository in %s%s\n"
+#: builtin/notes.c:97
+msgid "Write/edit the notes for the following object:"
msgstr ""
-#: builtin/init-db.c:405
+#: builtin/notes.c:150
#, c-format
-msgid "Reinitialized existing Git repository in %s%s\n"
+msgid "unable to start 'show' for object '%s'"
msgstr ""
-#: builtin/init-db.c:409
-#, c-format
-msgid "Initialized empty shared Git repository in %s%s\n"
+#: builtin/notes.c:154
+msgid "could not read 'show' output"
msgstr ""
-#: builtin/init-db.c:410
+#: builtin/notes.c:162
#, c-format
-msgid "Initialized empty Git repository in %s%s\n"
-msgstr ""
-
-#: builtin/init-db.c:458
-msgid ""
-"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
-"shared[=<permissions>]] [<directory>]"
+msgid "failed to finish 'show' for object '%s'"
msgstr ""
-#: builtin/init-db.c:481
-msgid "permissions"
+#: builtin/notes.c:197
+msgid "please supply the note contents using either -m or -F option"
msgstr ""
-#: builtin/init-db.c:482
-msgid "specify that the git repository is to be shared amongst several users"
+#: builtin/notes.c:206
+msgid "unable to write note object"
msgstr ""
-#: builtin/init-db.c:516 builtin/init-db.c:521
+#: builtin/notes.c:208
#, c-format
-msgid "cannot mkdir %s"
+msgid "the note contents have been left in %s"
msgstr ""
-#: builtin/init-db.c:525
+#: builtin/notes.c:236 builtin/tag.c:508
#, c-format
-msgid "cannot chdir to %s"
+msgid "cannot read '%s'"
msgstr ""
-#: builtin/init-db.c:546
+#: builtin/notes.c:238 builtin/tag.c:511
#, c-format
-msgid ""
-"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
-"dir=<directory>)"
+msgid "could not open or read '%s'"
msgstr ""
-#: builtin/init-db.c:574
+#: builtin/notes.c:257 builtin/notes.c:308 builtin/notes.c:310
+#: builtin/notes.c:378 builtin/notes.c:433 builtin/notes.c:519
+#: builtin/notes.c:524 builtin/notes.c:602 builtin/notes.c:664
#, c-format
-msgid "Cannot access work tree '%s'"
+msgid "failed to resolve '%s' as a valid ref."
msgstr ""
-#: builtin/interpret-trailers.c:15
-msgid ""
-"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
-"<token>[(=|:)<value>])...] [<file>...]"
+#: builtin/notes.c:260
+#, c-format
+msgid "failed to read object '%s'."
msgstr ""
-#: builtin/interpret-trailers.c:26
-msgid "edit files in place"
+#: builtin/notes.c:264
+#, c-format
+msgid "cannot read note data from non-blob object '%s'."
msgstr ""
-#: builtin/interpret-trailers.c:27
-msgid "trim empty trailers"
+#: builtin/notes.c:304
+#, c-format
+msgid "malformed input line: '%s'."
msgstr ""
-#: builtin/interpret-trailers.c:28
-msgid "trailer"
+#: builtin/notes.c:319
+#, c-format
+msgid "failed to copy notes from '%s' to '%s'"
msgstr ""
-#: builtin/interpret-trailers.c:29
-msgid "trailer(s) to add"
+#. TRANSLATORS: the first %s will be replaced by a git
+#. notes command: 'add', 'merge', 'remove', etc.
+#.
+#: builtin/notes.c:351
+#, c-format
+msgid "refusing to %s notes in %s (outside of refs/notes/)"
msgstr ""
-#: builtin/interpret-trailers.c:42
-msgid "no input file given for in-place editing"
+#: builtin/notes.c:371 builtin/notes.c:426 builtin/notes.c:502
+#: builtin/notes.c:514 builtin/notes.c:590 builtin/notes.c:657
+#: builtin/notes.c:807 builtin/notes.c:954 builtin/notes.c:975
+msgid "too many parameters"
msgstr ""
-#: builtin/log.c:45
-msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
+#: builtin/notes.c:384 builtin/notes.c:670
+#, c-format
+msgid "no note found for object %s."
msgstr ""
-#: builtin/log.c:46
-msgid "git show [<options>] <object>..."
+#: builtin/notes.c:405 builtin/notes.c:568
+msgid "note contents as a string"
msgstr ""
-#: builtin/log.c:90
-#, c-format
-msgid "invalid --decorate option: %s"
+#: builtin/notes.c:408 builtin/notes.c:571
+msgid "note contents in a file"
msgstr ""
-#: builtin/log.c:147
-msgid "suppress diff output"
+#: builtin/notes.c:411 builtin/notes.c:574
+msgid "reuse and edit specified note object"
msgstr ""
-#: builtin/log.c:148
-msgid "show source"
+#: builtin/notes.c:414 builtin/notes.c:577
+msgid "reuse specified note object"
msgstr ""
-#: builtin/log.c:149
-msgid "Use mail map file"
+#: builtin/notes.c:417 builtin/notes.c:580
+msgid "allow storing empty note"
msgstr ""
-#: builtin/log.c:150
-msgid "decorate options"
+#: builtin/notes.c:418 builtin/notes.c:489
+msgid "replace existing notes"
msgstr ""
-#: builtin/log.c:153
-msgid "Process line range n,m in file, counting from 1"
+#: builtin/notes.c:443
+#, c-format
+msgid ""
+"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
+"existing notes"
msgstr ""
-#: builtin/log.c:249
+#: builtin/notes.c:458 builtin/notes.c:537
#, c-format
-msgid "Final output: %d %s\n"
+msgid "Overwriting existing notes for object %s\n"
msgstr ""
-#: builtin/log.c:497
+#: builtin/notes.c:469 builtin/notes.c:629 builtin/notes.c:894
#, c-format
-msgid "git show %s: bad file"
+msgid "Removing note for object %s\n"
msgstr ""
-#: builtin/log.c:512 builtin/log.c:606
-#, c-format
-msgid "Could not read object %s"
+#: builtin/notes.c:490
+msgid "read objects from stdin"
msgstr ""
-#: builtin/log.c:630
-#, c-format
-msgid "Unknown type: %d"
+#: builtin/notes.c:492
+msgid "load rewriting config for <command> (implies --stdin)"
msgstr ""
-#: builtin/log.c:751
-msgid "format.headers without value"
+#: builtin/notes.c:510
+msgid "too few parameters"
msgstr ""
-#: builtin/log.c:852
-msgid "name of output directory is too long"
+#: builtin/notes.c:531
+#, c-format
+msgid ""
+"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
+"existing notes"
msgstr ""
-#: builtin/log.c:868
+#: builtin/notes.c:543
#, c-format
-msgid "Cannot open patch file %s"
+msgid "missing notes on source object %s. Cannot copy."
msgstr ""
-#: builtin/log.c:885
-msgid "Need exactly one range."
+#: builtin/notes.c:595
+#, c-format
+msgid ""
+"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
+"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
msgstr ""
-#: builtin/log.c:895
-msgid "Not a range."
+#: builtin/notes.c:690
+msgid "failed to delete ref NOTES_MERGE_PARTIAL"
msgstr ""
-#: builtin/log.c:1001
-msgid "Cover letter needs email format"
+#: builtin/notes.c:692
+msgid "failed to delete ref NOTES_MERGE_REF"
msgstr ""
-#: builtin/log.c:1081
-#, c-format
-msgid "insane in-reply-to: %s"
+#: builtin/notes.c:694
+msgid "failed to remove 'git notes merge' worktree"
msgstr ""
-#: builtin/log.c:1108
-msgid "git format-patch [<options>] [<since> | <revision-range>]"
+#: builtin/notes.c:714
+msgid "failed to read ref NOTES_MERGE_PARTIAL"
msgstr ""
-#: builtin/log.c:1158
-msgid "Two output directories?"
+#: builtin/notes.c:716
+msgid "could not find commit from NOTES_MERGE_PARTIAL."
msgstr ""
-#: builtin/log.c:1265 builtin/log.c:1908 builtin/log.c:1910 builtin/log.c:1922
-#, c-format
-msgid "Unknown commit %s"
+#: builtin/notes.c:718
+msgid "could not parse commit from NOTES_MERGE_PARTIAL."
msgstr ""
-#: builtin/log.c:1275 builtin/notes.c:886 builtin/tag.c:533
-#, c-format
-msgid "Failed to resolve '%s' as a valid ref."
+#: builtin/notes.c:731
+msgid "failed to resolve NOTES_MERGE_REF"
msgstr ""
-#: builtin/log.c:1280
-msgid "Could not find exact merge base."
+#: builtin/notes.c:734
+msgid "failed to finalize notes merge"
msgstr ""
-#: builtin/log.c:1284
-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."
+#: builtin/notes.c:760
+#, c-format
+msgid "unknown notes merge strategy %s"
msgstr ""
-#: builtin/log.c:1304
-msgid "Failed to find exact merge base"
+#: builtin/notes.c:776
+msgid "General options"
msgstr ""
-#: builtin/log.c:1315
-msgid "base commit should be the ancestor of revision list"
+#: builtin/notes.c:778
+msgid "Merge options"
msgstr ""
-#: builtin/log.c:1319
-msgid "base commit shouldn't be in revision list"
+#: builtin/notes.c:780
+msgid ""
+"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
+"cat_sort_uniq)"
msgstr ""
-#: builtin/log.c:1368
-msgid "cannot get patch id"
+#: builtin/notes.c:782
+msgid "Committing unmerged notes"
msgstr ""
-#: builtin/log.c:1425
-msgid "use [PATCH n/m] even with a single patch"
+#: builtin/notes.c:784
+msgid "finalize notes merge by committing unmerged notes"
msgstr ""
-#: builtin/log.c:1428
-msgid "use [PATCH] even with multiple patches"
+#: builtin/notes.c:786
+msgid "Aborting notes merge resolution"
msgstr ""
-#: builtin/log.c:1432
-msgid "print patches to standard out"
+#: builtin/notes.c:788
+msgid "abort notes merge"
msgstr ""
-#: builtin/log.c:1434
-msgid "generate a cover letter"
+#: builtin/notes.c:799
+msgid "cannot mix --commit, --abort or -s/--strategy"
msgstr ""
-#: builtin/log.c:1436
-msgid "use simple number sequence for output file names"
+#: builtin/notes.c:804
+msgid "must specify a notes ref to merge"
msgstr ""
-#: builtin/log.c:1437
-msgid "sfx"
+#: builtin/notes.c:828
+#, c-format
+msgid "unknown -s/--strategy: %s"
msgstr ""
-#: builtin/log.c:1438
-msgid "use <sfx> instead of '.patch'"
+#: builtin/notes.c:865
+#, c-format
+msgid "a notes merge into %s is already in-progress at %s"
msgstr ""
-#: builtin/log.c:1440
-msgid "start numbering patches at <n> instead of 1"
+#: builtin/notes.c:868
+#, c-format
+msgid "failed to store link to current notes ref (%s)"
msgstr ""
-#: builtin/log.c:1442
-msgid "mark the series as Nth re-roll"
+#: builtin/notes.c:870
+#, 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/log.c:1444
-msgid "Use [RFC PATCH] instead of [PATCH]"
+#: builtin/notes.c:892
+#, c-format
+msgid "Object %s has no note\n"
msgstr ""
-#: builtin/log.c:1447
-msgid "Use [<prefix>] instead of [PATCH]"
+#: builtin/notes.c:904
+msgid "attempt to remove non-existent note is not an error"
msgstr ""
-#: builtin/log.c:1450
-msgid "store resulting files in <dir>"
+#: builtin/notes.c:907
+msgid "read object names from the standard input"
msgstr ""
-#: builtin/log.c:1453
-msgid "don't strip/add [PATCH]"
+#: builtin/notes.c:945 builtin/prune.c:108 builtin/worktree.c:152
+msgid "do not remove, show only"
msgstr ""
-#: builtin/log.c:1456
-msgid "don't output binary diffs"
+#: builtin/notes.c:946
+msgid "report pruned notes"
msgstr ""
-#: builtin/log.c:1458
-msgid "output all-zero hash in From header"
+#: builtin/notes.c:988
+msgid "notes-ref"
msgstr ""
-#: builtin/log.c:1460
-msgid "don't include a patch matching a commit upstream"
+#: builtin/notes.c:989
+msgid "use notes from <notes-ref>"
msgstr ""
-#: builtin/log.c:1462
-msgid "show patch format instead of default (patch + stat)"
+#: builtin/notes.c:1024
+#, c-format
+msgid "unknown subcommand: %s"
msgstr ""
-#: builtin/log.c:1464
-msgid "Messaging"
+#: builtin/pack-objects.c:48
+msgid ""
+"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
msgstr ""
-#: builtin/log.c:1465
-msgid "header"
+#: builtin/pack-objects.c:49
+msgid ""
+"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
msgstr ""
-#: builtin/log.c:1466
-msgid "add email header"
+#: builtin/pack-objects.c:414
+#, c-format
+msgid "bad packed object CRC for %s"
msgstr ""
-#: builtin/log.c:1467 builtin/log.c:1469
-msgid "email"
+#: builtin/pack-objects.c:425
+#, c-format
+msgid "corrupt packed object for %s"
msgstr ""
-#: builtin/log.c:1467
-msgid "add To: header"
+#: builtin/pack-objects.c:556
+#, c-format
+msgid "recursive delta detected for object %s"
msgstr ""
-#: builtin/log.c:1469
-msgid "add Cc: header"
+#: builtin/pack-objects.c:756
+#, c-format
+msgid "ordered %u objects, expected %<PRIu32>"
msgstr ""
-#: builtin/log.c:1471
-msgid "ident"
+#: builtin/pack-objects.c:769
+#, c-format
+msgid "packfile is invalid: %s"
msgstr ""
-#: builtin/log.c:1472
-msgid "set From address to <ident> (or committer ident if absent)"
+#: builtin/pack-objects.c:773
+#, c-format
+msgid "unable to open packfile for reuse: %s"
msgstr ""
-#: builtin/log.c:1474
-msgid "message-id"
+#: builtin/pack-objects.c:777
+msgid "unable to seek in reused packfile"
msgstr ""
-#: builtin/log.c:1475
-msgid "make first mail a reply to <message-id>"
+#: builtin/pack-objects.c:788
+msgid "unable to read from reused packfile"
msgstr ""
-#: builtin/log.c:1476 builtin/log.c:1479
-msgid "boundary"
+#: builtin/pack-objects.c:816
+msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
msgstr ""
-#: builtin/log.c:1477
-msgid "attach the patch"
+#: builtin/pack-objects.c:829
+msgid "Writing objects"
msgstr ""
-#: builtin/log.c:1480
-msgid "inline the patch"
+#: builtin/pack-objects.c:891 builtin/update-index.c:88
+#, c-format
+msgid "failed to stat %s"
msgstr ""
-#: builtin/log.c:1484
-msgid "enable message threading, styles: shallow, deep"
+#: builtin/pack-objects.c:944
+#, c-format
+msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
msgstr ""
-#: builtin/log.c:1486
-msgid "signature"
+#: builtin/pack-objects.c:1112
+msgid "disabling bitmap writing, as some objects are not being packed"
msgstr ""
-#: builtin/log.c:1487
-msgid "add a signature"
+#: builtin/pack-objects.c:1489
+#, c-format
+msgid "delta base offset overflow in pack for %s"
msgstr ""
-#: builtin/log.c:1488
-msgid "base-commit"
+#: builtin/pack-objects.c:1498
+#, c-format
+msgid "delta base offset out of bound for %s"
msgstr ""
-#: builtin/log.c:1489
-msgid "add prerequisite tree info to the patch series"
+#: builtin/pack-objects.c:1771
+msgid "Counting objects"
msgstr ""
-#: builtin/log.c:1491
-msgid "add a signature from a file"
+#: builtin/pack-objects.c:1913
+#, c-format
+msgid "unable to get size of %s"
msgstr ""
-#: builtin/log.c:1492
-msgid "don't print the patch filenames"
+#: builtin/pack-objects.c:1928
+#, c-format
+msgid "unable to parse object header of %s"
msgstr ""
-#: builtin/log.c:1567
+#: builtin/pack-objects.c:1995 builtin/pack-objects.c:2011
+#: builtin/pack-objects.c:2021
#, c-format
-msgid "invalid ident line: %s"
+msgid "object %s cannot be read"
msgstr ""
-#: builtin/log.c:1582
-msgid "-n and -k are mutually exclusive."
+#: builtin/pack-objects.c:1998 builtin/pack-objects.c:2025
+#, c-format
+msgid "object %s inconsistent object length (%lu vs %lu)"
msgstr ""
-#: builtin/log.c:1584
-msgid "--subject-prefix/--rfc and -k are mutually exclusive."
+#: builtin/pack-objects.c:2035
+msgid "suboptimal pack - out of memory"
msgstr ""
-#: builtin/log.c:1592
-msgid "--name-only does not make sense"
+#: builtin/pack-objects.c:2366
+#, c-format
+msgid "Delta compression using up to %d threads"
msgstr ""
-#: builtin/log.c:1594
-msgid "--name-status does not make sense"
+#: builtin/pack-objects.c:2502
+#, c-format
+msgid "unable to pack objects reachable from tag %s"
msgstr ""
-#: builtin/log.c:1596
-msgid "--check does not make sense"
+#: builtin/pack-objects.c:2586
+msgid "Compressing objects"
msgstr ""
-#: builtin/log.c:1626
-msgid "standard output, or directory, which one?"
+#: builtin/pack-objects.c:2592
+msgid "inconsistency with delta count"
msgstr ""
-#: builtin/log.c:1628
+#: builtin/pack-objects.c:2671
#, c-format
-msgid "Could not create directory '%s'"
+msgid ""
+"expected edge object ID, got garbage:\n"
+" %s"
msgstr ""
-#: builtin/log.c:1722
+#: builtin/pack-objects.c:2677
#, c-format
-msgid "unable to read signature file '%s'"
+msgid ""
+"expected object ID, got garbage:\n"
+" %s"
msgstr ""
-#: builtin/log.c:1794
-msgid "Failed to create output files"
+#: builtin/pack-objects.c:2757
+msgid "invalid value for --missing"
msgstr ""
-#: builtin/log.c:1843
-msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
+#: builtin/pack-objects.c:2816 builtin/pack-objects.c:2924
+msgid "cannot open pack index"
msgstr ""
-#: builtin/log.c:1897
+#: builtin/pack-objects.c:2847
#, c-format
-msgid ""
-"Could not find a tracked remote branch, please specify <upstream> manually.\n"
+msgid "loose object at %s could not be examined"
msgstr ""
-#: builtin/ls-files.c:468
-msgid "git ls-files [<options>] [<file>...]"
+#: builtin/pack-objects.c:2932
+msgid "unable to force loose object"
msgstr ""
-#: builtin/ls-files.c:517
-msgid "identify the file status with tags"
+#: builtin/pack-objects.c:3019
+#, c-format
+msgid "not a rev '%s'"
msgstr ""
-#: builtin/ls-files.c:519
-msgid "use lowercase letters for 'assume unchanged' files"
+#: builtin/pack-objects.c:3022
+#, c-format
+msgid "bad revision '%s'"
msgstr ""
-#: builtin/ls-files.c:521
-msgid "show cached files in the output (default)"
+#: builtin/pack-objects.c:3042
+msgid "unable to add recent objects"
msgstr ""
-#: builtin/ls-files.c:523
-msgid "show deleted files in the output"
+#: builtin/pack-objects.c:3092
+#, c-format
+msgid "unsupported index version %s"
msgstr ""
-#: builtin/ls-files.c:525
-msgid "show modified files in the output"
+#: builtin/pack-objects.c:3096
+#, c-format
+msgid "bad index version '%s'"
msgstr ""
-#: builtin/ls-files.c:527
-msgid "show other files in the output"
+#: builtin/pack-objects.c:3127
+msgid "do not show progress meter"
msgstr ""
-#: builtin/ls-files.c:529
-msgid "show ignored files in the output"
+#: builtin/pack-objects.c:3129
+msgid "show progress meter"
msgstr ""
-#: builtin/ls-files.c:532
-msgid "show staged contents' object name in the output"
+#: builtin/pack-objects.c:3131
+msgid "show progress meter during object writing phase"
msgstr ""
-#: builtin/ls-files.c:534
-msgid "show files on the filesystem that need to be removed"
+#: builtin/pack-objects.c:3134
+msgid "similar to --all-progress when progress meter is shown"
msgstr ""
-#: builtin/ls-files.c:536
-msgid "show 'other' directories' names only"
+#: builtin/pack-objects.c:3135
+msgid "<version>[,<offset>]"
msgstr ""
-#: builtin/ls-files.c:538
-msgid "show line endings of files"
+#: builtin/pack-objects.c:3136
+msgid "write the pack index file in the specified idx format version"
msgstr ""
-#: builtin/ls-files.c:540
-msgid "don't show empty directories"
+#: builtin/pack-objects.c:3139
+msgid "maximum size of each output pack file"
msgstr ""
-#: builtin/ls-files.c:543
-msgid "show unmerged files in the output"
+#: builtin/pack-objects.c:3141
+msgid "ignore borrowed objects from alternate object store"
msgstr ""
-#: builtin/ls-files.c:545
-msgid "show resolve-undo information"
+#: builtin/pack-objects.c:3143
+msgid "ignore packed objects"
msgstr ""
-#: builtin/ls-files.c:547
-msgid "skip files matching pattern"
+#: builtin/pack-objects.c:3145
+msgid "limit pack window by objects"
msgstr ""
-#: builtin/ls-files.c:550
-msgid "exclude patterns are read from <file>"
+#: builtin/pack-objects.c:3147
+msgid "limit pack window by memory in addition to object limit"
msgstr ""
-#: builtin/ls-files.c:553
-msgid "read additional per-directory exclude patterns in <file>"
+#: builtin/pack-objects.c:3149
+msgid "maximum length of delta chain allowed in the resulting pack"
msgstr ""
-#: builtin/ls-files.c:555
-msgid "add the standard git exclusions"
+#: builtin/pack-objects.c:3151
+msgid "reuse existing deltas"
msgstr ""
-#: builtin/ls-files.c:558
-msgid "make the output relative to the project top directory"
+#: builtin/pack-objects.c:3153
+msgid "reuse existing objects"
msgstr ""
-#: builtin/ls-files.c:561
-msgid "recurse through submodules"
+#: builtin/pack-objects.c:3155
+msgid "use OFS_DELTA objects"
msgstr ""
-#: builtin/ls-files.c:563
-msgid "if any <file> is not in the index, treat this as an error"
+#: builtin/pack-objects.c:3157
+msgid "use threads when searching for best delta matches"
msgstr ""
-#: builtin/ls-files.c:564
-msgid "tree-ish"
+#: builtin/pack-objects.c:3159
+msgid "do not create an empty pack output"
msgstr ""
-#: builtin/ls-files.c:565
-msgid "pretend that paths removed since <tree-ish> are still present"
+#: builtin/pack-objects.c:3161
+msgid "read revision arguments from standard input"
msgstr ""
-#: builtin/ls-files.c:567
-msgid "show debugging data"
+#: builtin/pack-objects.c:3163
+msgid "limit the objects to those that are not yet packed"
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/pack-objects.c:3166
+msgid "include objects reachable from any reference"
msgstr ""
-#: builtin/ls-remote.c:52
-msgid "do not print remote URL"
+#: builtin/pack-objects.c:3169
+msgid "include objects referred by reflog entries"
msgstr ""
-#: builtin/ls-remote.c:53 builtin/ls-remote.c:55
-msgid "exec"
+#: builtin/pack-objects.c:3172
+msgid "include objects referred to by the index"
msgstr ""
-#: builtin/ls-remote.c:54 builtin/ls-remote.c:56
-msgid "path of git-upload-pack on the remote host"
+#: builtin/pack-objects.c:3175
+msgid "output pack to stdout"
msgstr ""
-#: builtin/ls-remote.c:58
-msgid "limit to tags"
+#: builtin/pack-objects.c:3177
+msgid "include tag objects that refer to objects to be packed"
msgstr ""
-#: builtin/ls-remote.c:59
-msgid "limit to heads"
+#: builtin/pack-objects.c:3179
+msgid "keep unreachable objects"
msgstr ""
-#: builtin/ls-remote.c:60
-msgid "do not show peeled tags"
+#: builtin/pack-objects.c:3181
+msgid "pack loose unreachable objects"
msgstr ""
-#: builtin/ls-remote.c:62
-msgid "take url.<base>.insteadOf into account"
+#: builtin/pack-objects.c:3183
+msgid "unpack unreachable objects newer than <time>"
msgstr ""
-#: builtin/ls-remote.c:64
-msgid "exit with exit code 2 if no matching refs are found"
+#: builtin/pack-objects.c:3186
+msgid "create thin packs"
msgstr ""
-#: builtin/ls-remote.c:66
-msgid "show underlying ref in addition to the object pointed by it"
+#: builtin/pack-objects.c:3188
+msgid "create packs suitable for shallow fetches"
msgstr ""
-#: builtin/ls-tree.c:29
-msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
+#: builtin/pack-objects.c:3190
+msgid "ignore packs that have companion .keep file"
msgstr ""
-#: builtin/ls-tree.c:127
-msgid "only show trees"
+#: builtin/pack-objects.c:3192
+msgid "ignore this pack"
msgstr ""
-#: builtin/ls-tree.c:129
-msgid "recurse into subtrees"
+#: builtin/pack-objects.c:3194
+msgid "pack compression level"
msgstr ""
-#: builtin/ls-tree.c:131
-msgid "show trees when recursing"
+#: builtin/pack-objects.c:3196
+msgid "do not hide commits by grafts"
msgstr ""
-#: builtin/ls-tree.c:134
-msgid "terminate entries with NUL byte"
+#: builtin/pack-objects.c:3198
+msgid "use a bitmap index if available to speed up counting objects"
msgstr ""
-#: builtin/ls-tree.c:135
-msgid "include object size"
+#: builtin/pack-objects.c:3200
+msgid "write a bitmap index together with the pack index"
msgstr ""
-#: builtin/ls-tree.c:137 builtin/ls-tree.c:139
-msgid "list only filenames"
+#: builtin/pack-objects.c:3203
+msgid "handling for missing objects"
msgstr ""
-#: builtin/ls-tree.c:142
-msgid "use full path names"
+#: builtin/pack-objects.c:3206
+msgid "do not pack objects in promisor packfiles"
msgstr ""
-#: builtin/ls-tree.c:144
-msgid "list entire tree; not just current directory (implies --full-name)"
+#: builtin/pack-objects.c:3230
+#, c-format
+msgid "delta chain depth %d is too deep, forcing %d"
msgstr ""
-#: builtin/mailsplit.c:241
+#: builtin/pack-objects.c:3235
#, c-format
-msgid "empty mbox: '%s'"
+msgid "pack.deltaCacheLimit is too high, forcing %d"
msgstr ""
-#: builtin/merge.c:47
-msgid "git merge [<options>] [<commit>...]"
+#: builtin/pack-objects.c:3291
+msgid "--max-pack-size cannot be used to build a pack for transfer"
msgstr ""
-#: builtin/merge.c:48
-msgid "git merge --abort"
+#: builtin/pack-objects.c:3293
+msgid "minimum pack size limit is 1 MiB"
msgstr ""
-#: builtin/merge.c:49
-msgid "git merge --continue"
+#: builtin/pack-objects.c:3298
+msgid "--thin cannot be used to build an indexable pack"
msgstr ""
-#: builtin/merge.c:104
-msgid "switch `m' requires a value"
+#: builtin/pack-objects.c:3301
+msgid "--keep-unreachable and --unpack-unreachable are incompatible"
msgstr ""
-#: builtin/merge.c:141
-#, c-format
-msgid "Could not find merge strategy '%s'.\n"
+#: builtin/pack-objects.c:3307
+msgid "cannot use --filter without --stdout"
msgstr ""
-#: builtin/merge.c:142
-#, c-format
-msgid "Available strategies are:"
+#: builtin/pack-objects.c:3363
+msgid "Enumerating objects"
msgstr ""
-#: builtin/merge.c:147
+#: builtin/pack-objects.c:3382
#, c-format
-msgid "Available custom strategies are:"
+msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)"
msgstr ""
-#: builtin/merge.c:197 builtin/pull.c:134
-msgid "do not show a diffstat at the end of the merge"
-msgstr ""
-
-#: builtin/merge.c:200 builtin/pull.c:137
-msgid "show a diffstat at the end of the merge"
+#: builtin/pack-refs.c:7
+msgid "git pack-refs [<options>]"
msgstr ""
-#: builtin/merge.c:201 builtin/pull.c:140
-msgid "(synonym to --stat)"
+#: builtin/pack-refs.c:15
+msgid "pack everything"
msgstr ""
-#: builtin/merge.c:203 builtin/pull.c:143
-msgid "add (at most <n>) entries from shortlog to merge commit message"
+#: builtin/pack-refs.c:16
+msgid "prune loose refs (default)"
msgstr ""
-#: builtin/merge.c:206 builtin/pull.c:146
-msgid "create a single commit instead of doing a merge"
+#: builtin/prune-packed.c:9
+msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
msgstr ""
-#: builtin/merge.c:208 builtin/pull.c:149
-msgid "perform a commit if the merge succeeds (default)"
+#: builtin/prune-packed.c:42
+msgid "Removing duplicate objects"
msgstr ""
-#: builtin/merge.c:210 builtin/pull.c:152
-msgid "edit message before committing"
+#: builtin/prune.c:12
+msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
msgstr ""
-#: builtin/merge.c:211
-msgid "allow fast-forward (default)"
+#: builtin/prune.c:109
+msgid "report pruned objects"
msgstr ""
-#: builtin/merge.c:213 builtin/pull.c:158
-msgid "abort if fast-forward is not possible"
+#: builtin/prune.c:112
+msgid "expire objects older than <time>"
msgstr ""
-#: builtin/merge.c:217 builtin/pull.c:161
-msgid "verify that the named commit has a valid GPG signature"
+#: builtin/prune.c:114
+msgid "limit traversal to objects outside promisor packfiles"
msgstr ""
-#: builtin/merge.c:218 builtin/notes.c:776 builtin/pull.c:165
-#: builtin/revert.c:109
-msgid "strategy"
+#: builtin/prune.c:128
+msgid "cannot prune in a precious-objects repo"
msgstr ""
-#: builtin/merge.c:219 builtin/pull.c:166
-msgid "merge strategy to use"
+#: builtin/pull.c:59 builtin/pull.c:61
+#, c-format
+msgid "Invalid value for %s: %s"
msgstr ""
-#: builtin/merge.c:220 builtin/pull.c:169
-msgid "option=value"
+#: builtin/pull.c:81
+msgid "git pull [<options>] [<repository> [<refspec>...]]"
msgstr ""
-#: builtin/merge.c:221 builtin/pull.c:170
-msgid "option for selected merge strategy"
+#: builtin/pull.c:132
+msgid "control for recursive fetching of submodules"
msgstr ""
-#: builtin/merge.c:223
-msgid "merge commit message (for a non-fast-forward merge)"
+#: builtin/pull.c:136
+msgid "Options related to merging"
msgstr ""
-#: builtin/merge.c:227
-msgid "abort the current in-progress merge"
+#: builtin/pull.c:139
+msgid "incorporate changes by rebasing rather than merging"
msgstr ""
-#: builtin/merge.c:229
-msgid "continue the current in-progress merge"
+#: builtin/pull.c:166 builtin/rebase--helper.c:23 builtin/revert.c:122
+msgid "allow fast-forward"
msgstr ""
-#: builtin/merge.c:231 builtin/pull.c:177
-msgid "allow merging unrelated histories"
+#: builtin/pull.c:175
+msgid "automatically stash/stash pop before and after rebase"
msgstr ""
-#: builtin/merge.c:259
-msgid "could not run stash."
+#: builtin/pull.c:191
+msgid "Options related to fetching"
msgstr ""
-#: builtin/merge.c:264
-msgid "stash failed"
+#: builtin/pull.c:209
+msgid "number of submodules pulled in parallel"
msgstr ""
-#: builtin/merge.c:269
+#: builtin/pull.c:304
#, c-format
-msgid "not a valid object: %s"
+msgid "Invalid value for pull.ff: %s"
msgstr ""
-#: builtin/merge.c:288 builtin/merge.c:305
-msgid "read-tree failed"
+#: builtin/pull.c:420
+msgid ""
+"There is no candidate for rebasing against among the refs that you just "
+"fetched."
msgstr ""
-#: builtin/merge.c:335
-msgid " (nothing to squash)"
+#: builtin/pull.c:422
+msgid ""
+"There are no candidates for merging among the refs that you just fetched."
msgstr ""
-#: builtin/merge.c:346
-#, c-format
-msgid "Squash commit -- not updating HEAD\n"
+#: builtin/pull.c:423
+msgid ""
+"Generally this means that you provided a wildcard refspec which had no\n"
+"matches on the remote end."
msgstr ""
-#: builtin/merge.c:396
+#: builtin/pull.c:426
#, c-format
-msgid "No merge message -- not updating HEAD\n"
+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/merge.c:447
-#, c-format
-msgid "'%s' does not point to a commit"
+#: builtin/pull.c:431 git-parse-remote.sh:73
+msgid "You are not currently on a branch."
msgstr ""
-#: builtin/merge.c:537
-#, c-format
-msgid "Bad branch.%s.mergeoptions string: %s"
+#: builtin/pull.c:433 builtin/pull.c:448 git-parse-remote.sh:79
+msgid "Please specify which branch you want to rebase against."
msgstr ""
-#: builtin/merge.c:657
-msgid "Not handling anything other than two heads merge."
+#: builtin/pull.c:435 builtin/pull.c:450 git-parse-remote.sh:82
+msgid "Please specify which branch you want to merge with."
msgstr ""
-#: builtin/merge.c:671
-#, c-format
-msgid "Unknown option for merge-recursive: -X%s"
+#: builtin/pull.c:436 builtin/pull.c:451
+msgid "See git-pull(1) for details."
msgstr ""
-#: builtin/merge.c:686
-#, c-format
-msgid "unable to write %s"
+#: builtin/pull.c:438 builtin/pull.c:444 builtin/pull.c:453
+#: git-parse-remote.sh:64
+msgid "<remote>"
msgstr ""
-#: builtin/merge.c:738
-#, c-format
-msgid "Could not read from '%s'"
+#: builtin/pull.c:438 builtin/pull.c:453 builtin/pull.c:458 git-rebase.sh:576
+#: git-parse-remote.sh:65
+msgid "<branch>"
msgstr ""
-#: builtin/merge.c:747
-#, c-format
-msgid "Not committing merge; use 'git commit' to complete the merge.\n"
+#: builtin/pull.c:446 git-parse-remote.sh:75
+msgid "There is no tracking information for the current branch."
msgstr ""
-#: builtin/merge.c:753
-#, c-format
+#: builtin/pull.c:455 git-parse-remote.sh:95
msgid ""
-"Please enter a commit message to explain why this merge is necessary,\n"
-"especially if it merges an updated upstream into a topic branch.\n"
-"\n"
-"Lines starting with '%c' will be ignored, and an empty message aborts\n"
-"the commit.\n"
-msgstr ""
-
-#: builtin/merge.c:777
-msgid "Empty commit message."
+"If you wish to set tracking information for this branch you can do so with:"
msgstr ""
-#: builtin/merge.c:797
+#: builtin/pull.c:460
#, c-format
-msgid "Wonderful.\n"
+msgid ""
+"Your configuration specifies to merge with the ref '%s'\n"
+"from the remote, but no such ref was fetched."
msgstr ""
-#: builtin/merge.c:850
-#, c-format
-msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
+#: builtin/pull.c:829
+msgid "ignoring --verify-signatures for rebase"
msgstr ""
-#: builtin/merge.c:889
-msgid "No current branch."
+#: builtin/pull.c:877
+msgid "--[no-]autostash option is only valid with --rebase."
msgstr ""
-#: builtin/merge.c:891
-msgid "No remote for the current branch."
+#: builtin/pull.c:885
+msgid "Updating an unborn branch with changes added to the index."
msgstr ""
-#: builtin/merge.c:893
-msgid "No default upstream defined for the current branch."
+#: builtin/pull.c:888
+msgid "pull with rebase"
msgstr ""
-#: builtin/merge.c:898
-#, c-format
-msgid "No remote-tracking branch for %s from %s"
+#: builtin/pull.c:889
+msgid "please commit or stash them."
msgstr ""
-#: builtin/merge.c:945
+#: builtin/pull.c:914
#, c-format
-msgid "Bad value '%s' in environment '%s'"
+msgid ""
+"fetch updated the current branch head.\n"
+"fast-forwarding your working tree from\n"
+"commit %s."
msgstr ""
-#: builtin/merge.c:1046
+#: builtin/pull.c:919
#, c-format
-msgid "not something we can merge in %s: %s"
+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/merge.c:1080
-msgid "not something we can merge"
+#: builtin/pull.c:934
+msgid "Cannot merge multiple branches into empty head."
msgstr ""
-#: builtin/merge.c:1145
-msgid "--abort expects no arguments"
+#: builtin/pull.c:938
+msgid "Cannot rebase onto multiple branches."
msgstr ""
-#: builtin/merge.c:1149
-msgid "There is no merge to abort (MERGE_HEAD missing)."
+#: builtin/pull.c:945
+msgid "cannot rebase with locally recorded submodule modifications"
msgstr ""
-#: builtin/merge.c:1161
-msgid "--continue expects no arguments"
+#: builtin/push.c:19
+msgid "git push [<options>] [<repository> [<refspec>...]]"
msgstr ""
-#: builtin/merge.c:1165
-msgid "There is no merge in progress (MERGE_HEAD missing)."
+#: builtin/push.c:111
+msgid "tag shorthand without <tag>"
msgstr ""
-#: builtin/merge.c:1181
-msgid ""
-"You have not concluded your merge (MERGE_HEAD exists).\n"
-"Please, commit your changes before you merge."
+#: builtin/push.c:121
+msgid "--delete only accepts plain target ref names"
msgstr ""
-#: builtin/merge.c:1188
+#: builtin/push.c:165
msgid ""
-"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
-"Please, commit your changes before you merge."
+"\n"
+"To choose either option permanently, see push.default in 'git help config'."
msgstr ""
-#: builtin/merge.c:1191
-msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
+#: builtin/push.c:168
+#, 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/merge.c:1200
-msgid "You cannot combine --squash with --no-ff."
+#: builtin/push.c:183
+#, 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/merge.c:1208
-msgid "No commit specified and merge.defaultToUpstream not set."
+#: builtin/push.c:197
+#, 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/merge.c:1225
-msgid "Squash commit into empty head not supported yet"
+#: builtin/push.c:205
+#, c-format
+msgid "The current branch %s has multiple upstream branches, refusing to push."
msgstr ""
-#: builtin/merge.c:1227
-msgid "Non-fast-forward commit does not make sense into an empty head"
+#: builtin/push.c:208
+#, 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/merge.c:1232
-#, c-format
-msgid "%s - not something we can merge"
+#: builtin/push.c:267
+msgid ""
+"You didn't specify any refspecs to push, and push.default is \"nothing\"."
msgstr ""
-#: builtin/merge.c:1234
-msgid "Can merge only exactly one commit into empty head"
+#: builtin/push.c:274
+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/merge.c:1268
-#, c-format
-msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
+#: builtin/push.c:280
+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/merge.c:1271
-#, c-format
-msgid "Commit %s has a bad GPG signature allegedly by %s."
+#: builtin/push.c:286
+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/merge.c:1274
-#, c-format
-msgid "Commit %s does not have a GPG signature."
+#: builtin/push.c:293
+msgid "Updates were rejected because the tag already exists in the remote."
msgstr ""
-#: builtin/merge.c:1277
-#, c-format
-msgid "Commit %s has a good GPG signature by %s\n"
+#: builtin/push.c:296
+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/merge.c:1339
-msgid "refusing to merge unrelated histories"
+#: builtin/push.c:357
+#, c-format
+msgid "Pushing to %s\n"
msgstr ""
-#: builtin/merge.c:1348
-msgid "Already up-to-date."
+#: builtin/push.c:361
+#, c-format
+msgid "failed to push some refs to '%s'"
msgstr ""
-#: builtin/merge.c:1358
+#: builtin/push.c:395
#, c-format
-msgid "Updating %s..%s\n"
+msgid "bad repository '%s'"
msgstr ""
-#: builtin/merge.c:1399
-#, c-format
-msgid "Trying really trivial in-index merge...\n"
+#: builtin/push.c:396
+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/merge.c:1406
-#, c-format
-msgid "Nope.\n"
+#: builtin/push.c:551
+msgid "repository"
msgstr ""
-#: builtin/merge.c:1431
-msgid "Already up-to-date. Yeeah!"
+#: builtin/push.c:552 builtin/send-pack.c:164
+msgid "push all refs"
msgstr ""
-#: builtin/merge.c:1437
-msgid "Not possible to fast-forward, aborting."
+#: builtin/push.c:553 builtin/send-pack.c:166
+msgid "mirror all refs"
msgstr ""
-#: builtin/merge.c:1460 builtin/merge.c:1539
-#, c-format
-msgid "Rewinding the tree to pristine...\n"
+#: builtin/push.c:555
+msgid "delete refs"
msgstr ""
-#: builtin/merge.c:1464
-#, c-format
-msgid "Trying merge strategy %s...\n"
+#: builtin/push.c:556
+msgid "push tags (can't be used with --all or --mirror)"
msgstr ""
-#: builtin/merge.c:1530
-#, c-format
-msgid "No merge strategy handled the merge.\n"
+#: builtin/push.c:559 builtin/send-pack.c:167
+msgid "force updates"
msgstr ""
-#: builtin/merge.c:1532
-#, c-format
-msgid "Merge with strategy %s failed.\n"
+#: builtin/push.c:561 builtin/send-pack.c:181
+msgid "<refname>:<expect>"
msgstr ""
-#: builtin/merge.c:1541
-#, c-format
-msgid "Using the %s to prepare resolving by hand.\n"
+#: builtin/push.c:562 builtin/send-pack.c:182
+msgid "require old value of ref to be at this value"
msgstr ""
-#: builtin/merge.c:1553
-#, c-format
-msgid "Automatic merge went well; stopped before committing as requested\n"
+#: builtin/push.c:565
+msgid "control recursive pushing of submodules"
msgstr ""
-#: builtin/merge-base.c:30
-msgid "git merge-base [-a | --all] <commit> <commit>..."
+#: builtin/push.c:567 builtin/send-pack.c:175
+msgid "use thin pack"
msgstr ""
-#: builtin/merge-base.c:31
-msgid "git merge-base [-a | --all] --octopus <commit>..."
+#: builtin/push.c:568 builtin/push.c:569 builtin/send-pack.c:161
+#: builtin/send-pack.c:162
+msgid "receive pack program"
msgstr ""
-#: builtin/merge-base.c:32
-msgid "git merge-base --independent <commit>..."
+#: builtin/push.c:570
+msgid "set upstream for git pull/status"
msgstr ""
-#: builtin/merge-base.c:33
-msgid "git merge-base --is-ancestor <commit> <commit>"
+#: builtin/push.c:573
+msgid "prune locally removed refs"
msgstr ""
-#: builtin/merge-base.c:34
-msgid "git merge-base --fork-point <ref> [<commit>]"
+#: builtin/push.c:575
+msgid "bypass pre-push hook"
msgstr ""
-#: builtin/merge-base.c:218
-msgid "output all common ancestors"
+#: builtin/push.c:576
+msgid "push missing but relevant tags"
msgstr ""
-#: builtin/merge-base.c:220
-msgid "find ancestors for a single n-way merge"
+#: builtin/push.c:579 builtin/send-pack.c:169
+msgid "GPG sign the push"
msgstr ""
-#: builtin/merge-base.c:222
-msgid "list revs not reachable from others"
+#: builtin/push.c:581 builtin/send-pack.c:176
+msgid "request atomic transaction on remote side"
msgstr ""
-#: builtin/merge-base.c:224
-msgid "is the first one ancestor of the other?"
+#: builtin/push.c:599
+msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr ""
-#: builtin/merge-base.c:226
-msgid "find where <commit> forked from reflog of <ref>"
+#: builtin/push.c:601
+msgid "--delete doesn't make sense without any refs"
msgstr ""
-#: builtin/merge-file.c:9
-msgid ""
-"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
-"<orig-file> <file2>"
+#: builtin/push.c:604
+msgid "--all and --tags are incompatible"
msgstr ""
-#: builtin/merge-file.c:33
-msgid "send results to standard output"
+#: builtin/push.c:606
+msgid "--all can't be combined with refspecs"
msgstr ""
-#: builtin/merge-file.c:34
-msgid "use a diff3 based merge"
+#: builtin/push.c:610
+msgid "--mirror and --tags are incompatible"
msgstr ""
-#: builtin/merge-file.c:35
-msgid "for conflicts, use our version"
+#: builtin/push.c:612
+msgid "--mirror can't be combined with refspecs"
msgstr ""
-#: builtin/merge-file.c:37
-msgid "for conflicts, use their version"
+#: builtin/push.c:615
+msgid "--all and --mirror are incompatible"
msgstr ""
-#: builtin/merge-file.c:39
-msgid "for conflicts, use a union version"
+#: builtin/push.c:634
+msgid "push options must not have new line characters"
msgstr ""
-#: builtin/merge-file.c:42
-msgid "for conflicts, use this marker size"
+#: builtin/range-diff.c:8
+msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>"
msgstr ""
-#: builtin/merge-file.c:43
-msgid "do not warn about conflicts"
+#: builtin/range-diff.c:9
+msgid "git range-diff [<options>] <old-tip>...<new-tip>"
msgstr ""
-#: builtin/merge-file.c:45
-msgid "set labels for file1/orig-file/file2"
+#: builtin/range-diff.c:10
+msgid "git range-diff [<options>] <base> <old-tip> <new-tip>"
msgstr ""
-#: builtin/merge-recursive.c:45
-#, c-format
-msgid "unknown option %s"
+#: builtin/range-diff.c:26
+msgid "Percentage by which creation is weighted"
msgstr ""
-#: builtin/merge-recursive.c:51
-#, c-format
-msgid "could not parse object '%s'"
+#: builtin/range-diff.c:28
+msgid "use simple diff colors"
msgstr ""
-#: builtin/merge-recursive.c:55
+#: builtin/range-diff.c:75 builtin/range-diff.c:79
#, 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/merge-recursive.c:63
-msgid "not handling anything other than two heads merge."
+msgid "no .. in range: '%s'"
msgstr ""
-#: builtin/merge-recursive.c:69 builtin/merge-recursive.c:71
-#, c-format
-msgid "could not resolve ref '%s'"
+#: builtin/range-diff.c:89
+msgid "single arg format must be symmetric range"
msgstr ""
-#: builtin/merge-recursive.c:77
-#, c-format
-msgid "Merging %s with %s\n"
+#: builtin/range-diff.c:104
+msgid "need two commit ranges"
msgstr ""
-#: builtin/mktree.c:65
-msgid "git mktree [-z] [--missing] [--batch]"
+#: builtin/read-tree.c:40
+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/mktree.c:153
-msgid "input is NUL terminated"
+#: builtin/read-tree.c:120
+msgid "write resulting index to <file>"
msgstr ""
-#: builtin/mktree.c:154 builtin/write-tree.c:25
-msgid "allow missing objects"
+#: builtin/read-tree.c:123
+msgid "only empty the index"
msgstr ""
-#: builtin/mktree.c:155
-msgid "allow creation of more than one tree"
+#: builtin/read-tree.c:125
+msgid "Merging"
msgstr ""
-#: builtin/mv.c:17
-msgid "git mv [<options>] <source>... <destination>"
+#: builtin/read-tree.c:127
+msgid "perform a merge in addition to a read"
msgstr ""
-#: builtin/mv.c:83
-#, c-format
-msgid "Directory %s is in index and no submodule?"
+#: builtin/read-tree.c:129
+msgid "3-way merge if no file level merging required"
msgstr ""
-#: builtin/mv.c:85 builtin/rm.c:290
-msgid "Please stage your changes to .gitmodules or stash them to proceed"
+#: builtin/read-tree.c:131
+msgid "3-way merge in presence of adds and removes"
msgstr ""
-#: builtin/mv.c:103
-#, c-format
-msgid "%.*s is in index"
+#: builtin/read-tree.c:133
+msgid "same as -m, but discard unmerged entries"
msgstr ""
-#: builtin/mv.c:125
-msgid "force move/rename even if target exists"
+#: builtin/read-tree.c:134
+msgid "<subdirectory>/"
msgstr ""
-#: builtin/mv.c:126
-msgid "skip move/rename errors"
+#: builtin/read-tree.c:135
+msgid "read the tree into the index under <subdirectory>/"
msgstr ""
-#: builtin/mv.c:168
-#, c-format
-msgid "destination '%s' is not a directory"
+#: builtin/read-tree.c:138
+msgid "update working tree with merge result"
msgstr ""
-#: builtin/mv.c:179
-#, c-format
-msgid "Checking rename of '%s' to '%s'\n"
+#: builtin/read-tree.c:140
+msgid "gitignore"
msgstr ""
-#: builtin/mv.c:183
-msgid "bad source"
+#: builtin/read-tree.c:141
+msgid "allow explicitly ignored files to be overwritten"
msgstr ""
-#: builtin/mv.c:186
-msgid "can not move directory into itself"
+#: builtin/read-tree.c:144
+msgid "don't check the working tree after merging"
msgstr ""
-#: builtin/mv.c:189
-msgid "cannot move directory over file"
+#: builtin/read-tree.c:145
+msgid "don't update the index or the work tree"
msgstr ""
-#: builtin/mv.c:198
-msgid "source directory is empty"
+#: builtin/read-tree.c:147
+msgid "skip applying sparse checkout filter"
msgstr ""
-#: builtin/mv.c:223
-msgid "not under version control"
+#: builtin/read-tree.c:149
+msgid "debug unpack-trees"
msgstr ""
-#: builtin/mv.c:226
-msgid "destination exists"
+#: builtin/rebase--helper.c:8
+msgid "git rebase--helper [<options>]"
msgstr ""
-#: builtin/mv.c:234
-#, c-format
-msgid "overwriting '%s'"
+#: builtin/rebase--helper.c:24
+msgid "keep empty commits"
msgstr ""
-#: builtin/mv.c:237
-msgid "Cannot overwrite"
+#: builtin/rebase--helper.c:26 builtin/revert.c:124
+msgid "allow commits with empty messages"
msgstr ""
-#: builtin/mv.c:240
-msgid "multiple sources for the same target"
+#: builtin/rebase--helper.c:27
+msgid "rebase merge commits"
msgstr ""
-#: builtin/mv.c:242
-msgid "destination directory does not exist"
+#: builtin/rebase--helper.c:29
+msgid "keep original branch points of cousins"
msgstr ""
-#: builtin/mv.c:249
-#, c-format
-msgid "%s, source=%s, destination=%s"
+#: builtin/rebase--helper.c:30
+msgid "continue rebase"
msgstr ""
-#: builtin/mv.c:270
-#, c-format
-msgid "Renaming %s to %s\n"
+#: builtin/rebase--helper.c:32
+msgid "abort rebase"
msgstr ""
-#: builtin/mv.c:276 builtin/remote.c:711 builtin/repack.c:390
-#, c-format
-msgid "renaming '%s' failed"
+#: builtin/rebase--helper.c:35
+msgid "make rebase script"
msgstr ""
-#: builtin/name-rev.c:338
-msgid "git name-rev [<options>] <commit>..."
+#: builtin/rebase--helper.c:37
+msgid "shorten commit ids in the todo list"
msgstr ""
-#: builtin/name-rev.c:339
-msgid "git name-rev [<options>] --all"
+#: builtin/rebase--helper.c:39
+msgid "expand commit ids in the todo list"
msgstr ""
-#: builtin/name-rev.c:340
-msgid "git name-rev [<options>] --stdin"
+#: builtin/rebase--helper.c:41
+msgid "check the todo list"
msgstr ""
-#: builtin/name-rev.c:395
-msgid "print only names (no SHA-1)"
+#: builtin/rebase--helper.c:43
+msgid "skip unnecessary picks"
msgstr ""
-#: builtin/name-rev.c:396
-msgid "only use tags to name the commits"
+#: builtin/rebase--helper.c:45
+msgid "rearrange fixup/squash lines"
msgstr ""
-#: builtin/name-rev.c:398
-msgid "only use refs matching <pattern>"
+#: builtin/rebase--helper.c:47
+msgid "insert exec commands in todo list"
msgstr ""
-#: builtin/name-rev.c:400
-msgid "ignore refs matching <pattern>"
+#: builtin/rebase--helper.c:68
+msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
msgstr ""
-#: builtin/name-rev.c:402
-msgid "list all commits reachable from all refs"
+#: builtin/receive-pack.c:32
+msgid "git receive-pack <git-dir>"
msgstr ""
-#: builtin/name-rev.c:403
-msgid "read from stdin"
+#: builtin/receive-pack.c:830
+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/name-rev.c:404
-msgid "allow to print `undefined` names (default)"
+#: builtin/receive-pack.c:850
+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/name-rev.c:410
-msgid "dereference tags in the input (internal use)"
+#: builtin/receive-pack.c:1923
+msgid "quiet"
msgstr ""
-#: builtin/notes.c:26
-msgid "git notes [--ref <notes-ref>] [list [<object>]]"
+#: builtin/receive-pack.c:1937
+msgid "You must specify a directory."
msgstr ""
-#: builtin/notes.c:27
-msgid ""
-"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
-"| (-c | -C) <object>] [<object>]"
+#: builtin/reflog.c:536 builtin/reflog.c:541
+#, c-format
+msgid "'%s' is not a valid timestamp"
msgstr ""
-#: builtin/notes.c:28
-msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
+#: builtin/remote.c:15
+msgid "git remote [-v | --verbose]"
msgstr ""
-#: builtin/notes.c:29
+#: builtin/remote.c:16
msgid ""
-"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
-"(-c | -C) <object>] [<object>]"
+"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
+"mirror=<fetch|push>] <name> <url>"
msgstr ""
-#: builtin/notes.c:30
-msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
+#: builtin/remote.c:17 builtin/remote.c:37
+msgid "git remote rename <old> <new>"
msgstr ""
-#: builtin/notes.c:31
-msgid "git notes [--ref <notes-ref>] show [<object>]"
+#: builtin/remote.c:18 builtin/remote.c:42
+msgid "git remote remove <name>"
msgstr ""
-#: builtin/notes.c:32
-msgid ""
-"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
+#: builtin/remote.c:19 builtin/remote.c:47
+msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
msgstr ""
-#: builtin/notes.c:33
-msgid "git notes merge --commit [-v | -q]"
+#: builtin/remote.c:20
+msgid "git remote [-v | --verbose] show [-n] <name>"
msgstr ""
-#: builtin/notes.c:34
-msgid "git notes merge --abort [-v | -q]"
+#: builtin/remote.c:21
+msgid "git remote prune [-n | --dry-run] <name>"
msgstr ""
-#: builtin/notes.c:35
-msgid "git notes [--ref <notes-ref>] remove [<object>...]"
+#: builtin/remote.c:22
+msgid ""
+"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
msgstr ""
-#: builtin/notes.c:36
-msgid "git notes [--ref <notes-ref>] prune [-n | -v]"
+#: builtin/remote.c:23
+msgid "git remote set-branches [--add] <name> <branch>..."
msgstr ""
-#: builtin/notes.c:37
-msgid "git notes [--ref <notes-ref>] get-ref"
+#: builtin/remote.c:24 builtin/remote.c:73
+msgid "git remote get-url [--push] [--all] <name>"
msgstr ""
-#: builtin/notes.c:42
-msgid "git notes [list [<object>]]"
+#: builtin/remote.c:25 builtin/remote.c:78
+msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
msgstr ""
-#: builtin/notes.c:47
-msgid "git notes add [<options>] [<object>]"
+#: builtin/remote.c:26 builtin/remote.c:79
+msgid "git remote set-url --add <name> <newurl>"
msgstr ""
-#: builtin/notes.c:52
-msgid "git notes copy [<options>] <from-object> <to-object>"
+#: builtin/remote.c:27 builtin/remote.c:80
+msgid "git remote set-url --delete <name> <url>"
msgstr ""
-#: builtin/notes.c:53
-msgid "git notes copy --stdin [<from-object> <to-object>]..."
+#: builtin/remote.c:32
+msgid "git remote add [<options>] <name> <url>"
msgstr ""
-#: builtin/notes.c:58
-msgid "git notes append [<options>] [<object>]"
+#: builtin/remote.c:52
+msgid "git remote set-branches <name> <branch>..."
msgstr ""
-#: builtin/notes.c:63
-msgid "git notes edit [<object>]"
+#: builtin/remote.c:53
+msgid "git remote set-branches --add <name> <branch>..."
msgstr ""
-#: builtin/notes.c:68
-msgid "git notes show [<object>]"
+#: builtin/remote.c:58
+msgid "git remote show [<options>] <name>"
msgstr ""
-#: builtin/notes.c:73
-msgid "git notes merge [<options>] <notes-ref>"
+#: builtin/remote.c:63
+msgid "git remote prune [<options>] <name>"
msgstr ""
-#: builtin/notes.c:74
-msgid "git notes merge --commit [<options>]"
+#: builtin/remote.c:68
+msgid "git remote update [<options>] [<group> | <remote>]..."
msgstr ""
-#: builtin/notes.c:75
-msgid "git notes merge --abort [<options>]"
+#: builtin/remote.c:97
+#, c-format
+msgid "Updating %s"
msgstr ""
-#: builtin/notes.c:80
-msgid "git notes remove [<object>]"
+#: builtin/remote.c:129
+msgid ""
+"--mirror is dangerous and deprecated; please\n"
+"\t use --mirror=fetch or --mirror=push instead"
msgstr ""
-#: builtin/notes.c:85
-msgid "git notes prune [<options>]"
+#: builtin/remote.c:146
+#, c-format
+msgid "unknown mirror argument: %s"
msgstr ""
-#: builtin/notes.c:90
-msgid "git notes get-ref"
+#: builtin/remote.c:162
+msgid "fetch the remote branches"
msgstr ""
-#: builtin/notes.c:95
-msgid "Write/edit the notes for the following object:"
+#: builtin/remote.c:164
+msgid "import all tags and associated objects when fetching"
msgstr ""
-#: builtin/notes.c:148
-#, c-format
-msgid "unable to start 'show' for object '%s'"
+#: builtin/remote.c:167
+msgid "or do not fetch any tag at all (--no-tags)"
msgstr ""
-#: builtin/notes.c:152
-msgid "could not read 'show' output"
+#: builtin/remote.c:169
+msgid "branch(es) to track"
msgstr ""
-#: builtin/notes.c:160
-#, c-format
-msgid "failed to finish 'show' for object '%s'"
+#: builtin/remote.c:170
+msgid "master branch"
msgstr ""
-#: builtin/notes.c:195
-msgid "please supply the note contents using either -m or -F option"
+#: builtin/remote.c:172
+msgid "set up remote as a mirror to push to or fetch from"
msgstr ""
-#: builtin/notes.c:204
-msgid "unable to write note object"
+#: builtin/remote.c:184
+msgid "specifying a master branch makes no sense with --mirror"
msgstr ""
-#: builtin/notes.c:206
-#, c-format
-msgid "the note contents have been left in %s"
+#: builtin/remote.c:186
+msgid "specifying branches to track makes sense only with fetch mirrors"
msgstr ""
-#: builtin/notes.c:234 builtin/tag.c:517
+#: builtin/remote.c:193 builtin/remote.c:635
#, c-format
-msgid "cannot read '%s'"
+msgid "remote %s already exists."
msgstr ""
-#: builtin/notes.c:236 builtin/tag.c:520
+#: builtin/remote.c:197 builtin/remote.c:639
#, c-format
-msgid "could not open or read '%s'"
+msgid "'%s' is not a valid remote name"
msgstr ""
-#: builtin/notes.c:255 builtin/notes.c:306 builtin/notes.c:308
-#: builtin/notes.c:375 builtin/notes.c:430 builtin/notes.c:516
-#: builtin/notes.c:521 builtin/notes.c:599 builtin/notes.c:661
+#: builtin/remote.c:237
#, c-format
-msgid "failed to resolve '%s' as a valid ref."
+msgid "Could not setup master '%s'"
msgstr ""
-#: builtin/notes.c:258
+#: builtin/remote.c:343
#, c-format
-msgid "failed to read object '%s'."
+msgid "Could not get fetch map for refspec %s"
msgstr ""
-#: builtin/notes.c:262
-#, c-format
-msgid "cannot read note data from non-blob object '%s'."
+#: builtin/remote.c:442 builtin/remote.c:450
+msgid "(matching)"
msgstr ""
-#: builtin/notes.c:302
-#, c-format
-msgid "malformed input line: '%s'."
+#: builtin/remote.c:454
+msgid "(delete)"
msgstr ""
-#: builtin/notes.c:317
+#: builtin/remote.c:628 builtin/remote.c:764 builtin/remote.c:863
#, c-format
-msgid "failed to copy notes from '%s' to '%s'"
+msgid "No such remote: %s"
msgstr ""
-#. TRANSLATORS: the first %s will be replaced by a git
-#. notes command: 'add', 'merge', 'remove', etc.
-#.
-#: builtin/notes.c:348
+#: builtin/remote.c:645
#, c-format
-msgid "refusing to %s notes in %s (outside of refs/notes/)"
+msgid "Could not rename config section '%s' to '%s'"
msgstr ""
-#: builtin/notes.c:368 builtin/notes.c:423 builtin/notes.c:499
-#: builtin/notes.c:511 builtin/notes.c:587 builtin/notes.c:654
-#: builtin/notes.c:804 builtin/notes.c:951 builtin/notes.c:972
-msgid "too many parameters"
+#: builtin/remote.c:665
+#, c-format
+msgid ""
+"Not updating non-default fetch refspec\n"
+"\t%s\n"
+"\tPlease update the configuration manually if necessary."
msgstr ""
-#: builtin/notes.c:381 builtin/notes.c:667
+#: builtin/remote.c:701
#, c-format
-msgid "no note found for object %s."
+msgid "deleting '%s' failed"
msgstr ""
-#: builtin/notes.c:402 builtin/notes.c:565
-msgid "note contents as a string"
+#: builtin/remote.c:735
+#, c-format
+msgid "creating '%s' failed"
msgstr ""
-#: builtin/notes.c:405 builtin/notes.c:568
-msgid "note contents in a file"
+#: builtin/remote.c:801
+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:815
+#, c-format
+msgid "Could not remove config section '%s'"
msgstr ""
-#: builtin/notes.c:408 builtin/notes.c:571
-msgid "reuse and edit specified note object"
+#: builtin/remote.c:916
+#, c-format
+msgid " new (next fetch will store in remotes/%s)"
msgstr ""
-#: builtin/notes.c:411 builtin/notes.c:574
-msgid "reuse specified note object"
+#: builtin/remote.c:919
+msgid " tracked"
msgstr ""
-#: builtin/notes.c:414 builtin/notes.c:577
-msgid "allow storing empty note"
+#: builtin/remote.c:921
+msgid " stale (use 'git remote prune' to remove)"
msgstr ""
-#: builtin/notes.c:415 builtin/notes.c:486
-msgid "replace existing notes"
+#: builtin/remote.c:923
+msgid " ???"
msgstr ""
-#: builtin/notes.c:440
+#: builtin/remote.c:964
#, c-format
-msgid ""
-"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
-"existing notes"
+msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
msgstr ""
-#: builtin/notes.c:455 builtin/notes.c:534
+#: builtin/remote.c:973
#, c-format
-msgid "Overwriting existing notes for object %s\n"
+msgid "rebases interactively onto remote %s"
msgstr ""
-#: builtin/notes.c:466 builtin/notes.c:626 builtin/notes.c:891
+#: builtin/remote.c:975
#, c-format
-msgid "Removing note for object %s\n"
+msgid "rebases interactively (with merges) onto remote %s"
msgstr ""
-#: builtin/notes.c:487
-msgid "read objects from stdin"
+#: builtin/remote.c:978
+#, c-format
+msgid "rebases onto remote %s"
msgstr ""
-#: builtin/notes.c:489
-msgid "load rewriting config for <command> (implies --stdin)"
+#: builtin/remote.c:982
+#, c-format
+msgid " merges with remote %s"
msgstr ""
-#: builtin/notes.c:507
-msgid "too few parameters"
+#: builtin/remote.c:985
+#, c-format
+msgid "merges with remote %s"
msgstr ""
-#: builtin/notes.c:528
+#: builtin/remote.c:988
#, c-format
-msgid ""
-"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
-"existing notes"
+msgid "%-*s and with remote %s\n"
msgstr ""
-#: builtin/notes.c:540
-#, c-format
-msgid "missing notes on source object %s. Cannot copy."
+#: builtin/remote.c:1031
+msgid "create"
msgstr ""
-#: builtin/notes.c:592
-#, 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/remote.c:1034
+msgid "delete"
msgstr ""
-#: builtin/notes.c:687
-msgid "failed to delete ref NOTES_MERGE_PARTIAL"
+#: builtin/remote.c:1038
+msgid "up to date"
msgstr ""
-#: builtin/notes.c:689
-msgid "failed to delete ref NOTES_MERGE_REF"
+#: builtin/remote.c:1041
+msgid "fast-forwardable"
msgstr ""
-#: builtin/notes.c:691
-msgid "failed to remove 'git notes merge' worktree"
+#: builtin/remote.c:1044
+msgid "local out of date"
msgstr ""
-#: builtin/notes.c:711
-msgid "failed to read ref NOTES_MERGE_PARTIAL"
+#: builtin/remote.c:1051
+#, c-format
+msgid " %-*s forces to %-*s (%s)"
msgstr ""
-#: builtin/notes.c:713
-msgid "could not find commit from NOTES_MERGE_PARTIAL."
+#: builtin/remote.c:1054
+#, c-format
+msgid " %-*s pushes to %-*s (%s)"
msgstr ""
-#: builtin/notes.c:715
-msgid "could not parse commit from NOTES_MERGE_PARTIAL."
+#: builtin/remote.c:1058
+#, c-format
+msgid " %-*s forces to %s"
msgstr ""
-#: builtin/notes.c:728
-msgid "failed to resolve NOTES_MERGE_REF"
+#: builtin/remote.c:1061
+#, c-format
+msgid " %-*s pushes to %s"
msgstr ""
-#: builtin/notes.c:731
-msgid "failed to finalize notes merge"
+#: builtin/remote.c:1129
+msgid "do not query remotes"
msgstr ""
-#: builtin/notes.c:757
+#: builtin/remote.c:1156
#, c-format
-msgid "unknown notes merge strategy %s"
+msgid "* remote %s"
msgstr ""
-#: builtin/notes.c:773
-msgid "General options"
+#: builtin/remote.c:1157
+#, c-format
+msgid " Fetch URL: %s"
msgstr ""
-#: builtin/notes.c:775
-msgid "Merge options"
+#: builtin/remote.c:1158 builtin/remote.c:1174 builtin/remote.c:1313
+msgid "(no URL)"
msgstr ""
-#: builtin/notes.c:777
-msgid ""
-"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
-"cat_sort_uniq)"
+#. TRANSLATORS: the colon ':' should align
+#. with the one in " Fetch URL: %s"
+#. translation.
+#.
+#: builtin/remote.c:1172 builtin/remote.c:1174
+#, c-format
+msgid " Push URL: %s"
msgstr ""
-#: builtin/notes.c:779
-msgid "Committing unmerged notes"
+#: builtin/remote.c:1176 builtin/remote.c:1178 builtin/remote.c:1180
+#, c-format
+msgid " HEAD branch: %s"
msgstr ""
-#: builtin/notes.c:781
-msgid "finalize notes merge by committing unmerged notes"
+#: builtin/remote.c:1176
+msgid "(not queried)"
msgstr ""
-#: builtin/notes.c:783
-msgid "Aborting notes merge resolution"
+#: builtin/remote.c:1178
+msgid "(unknown)"
msgstr ""
-#: builtin/notes.c:785
-msgid "abort notes merge"
+#: builtin/remote.c:1182
+#, c-format
+msgid ""
+" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
msgstr ""
-#: builtin/notes.c:796
-msgid "cannot mix --commit, --abort or -s/--strategy"
+#: builtin/remote.c:1194
+#, c-format
+msgid " Remote branch:%s"
+msgid_plural " Remote branches:%s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/remote.c:1197 builtin/remote.c:1223
+msgid " (status not queried)"
msgstr ""
-#: builtin/notes.c:801
-msgid "must specify a notes ref to merge"
+#: builtin/remote.c:1206
+msgid " Local branch configured for 'git pull':"
+msgid_plural " Local branches configured for 'git pull':"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/remote.c:1214
+msgid " Local refs will be mirrored by 'git push'"
msgstr ""
-#: builtin/notes.c:825
+#: builtin/remote.c:1220
#, c-format
-msgid "unknown -s/--strategy: %s"
+msgid " Local ref configured for 'git push'%s:"
+msgid_plural " Local refs configured for 'git push'%s:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/remote.c:1241
+msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr ""
-#: builtin/notes.c:862
-#, c-format
-msgid "a notes merge into %s is already in-progress at %s"
+#: builtin/remote.c:1243
+msgid "delete refs/remotes/<name>/HEAD"
msgstr ""
-#: builtin/notes.c:865
-#, c-format
-msgid "failed to store link to current notes ref (%s)"
+#: builtin/remote.c:1258
+msgid "Cannot determine remote HEAD"
msgstr ""
-#: builtin/notes.c:867
-#, 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/remote.c:1260
+msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr ""
-#: builtin/notes.c:889
+#: builtin/remote.c:1270
#, c-format
-msgid "Object %s has no note\n"
+msgid "Could not delete %s"
msgstr ""
-#: builtin/notes.c:901
-msgid "attempt to remove non-existent note is not an error"
+#: builtin/remote.c:1278
+#, c-format
+msgid "Not a valid ref: %s"
msgstr ""
-#: builtin/notes.c:904
-msgid "read object names from the standard input"
+#: builtin/remote.c:1280
+#, c-format
+msgid "Could not setup %s"
msgstr ""
-#: builtin/notes.c:942 builtin/prune.c:105 builtin/worktree.c:128
-msgid "do not remove, show only"
+#: builtin/remote.c:1298
+#, c-format
+msgid " %s will become dangling!"
msgstr ""
-#: builtin/notes.c:943
-msgid "report pruned notes"
+#: builtin/remote.c:1299
+#, c-format
+msgid " %s has become dangling!"
msgstr ""
-#: builtin/notes.c:985
-msgid "notes-ref"
+#: builtin/remote.c:1309
+#, c-format
+msgid "Pruning %s"
msgstr ""
-#: builtin/notes.c:986
-msgid "use notes from <notes-ref>"
+#: builtin/remote.c:1310
+#, c-format
+msgid "URL: %s"
msgstr ""
-#: builtin/notes.c:1021
+#: builtin/remote.c:1326
#, c-format
-msgid "unknown subcommand: %s"
+msgid " * [would prune] %s"
msgstr ""
-#: builtin/pack-objects.c:30
-msgid ""
-"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
+#: builtin/remote.c:1329
+#, c-format
+msgid " * [pruned] %s"
msgstr ""
-#: builtin/pack-objects.c:31
-msgid ""
-"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
+#: builtin/remote.c:1374
+msgid "prune remotes after fetching"
msgstr ""
-#: builtin/pack-objects.c:180 builtin/pack-objects.c:183
+#: builtin/remote.c:1437 builtin/remote.c:1491 builtin/remote.c:1559
#, c-format
-msgid "deflate error (%d)"
+msgid "No such remote '%s'"
msgstr ""
-#: builtin/pack-objects.c:776
-msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
+#: builtin/remote.c:1453
+msgid "add branch"
msgstr ""
-#: builtin/pack-objects.c:789
-msgid "Writing objects"
+#: builtin/remote.c:1460
+msgid "no remote specified"
msgstr ""
-#: builtin/pack-objects.c:1069
-msgid "disabling bitmap writing, as some objects are not being packed"
+#: builtin/remote.c:1477
+msgid "query push URLs rather than fetch URLs"
msgstr ""
-#: builtin/pack-objects.c:2434
-msgid "Compressing objects"
+#: builtin/remote.c:1479
+msgid "return all URLs"
msgstr ""
-#: builtin/pack-objects.c:2843
+#: builtin/remote.c:1507
#, c-format
-msgid "unsupported index version %s"
+msgid "no URLs configured for remote '%s'"
msgstr ""
-#: builtin/pack-objects.c:2847
-#, c-format
-msgid "bad index version '%s'"
+#: builtin/remote.c:1533
+msgid "manipulate push URLs"
msgstr ""
-#: builtin/pack-objects.c:2877
-msgid "do not show progress meter"
+#: builtin/remote.c:1535
+msgid "add URL"
msgstr ""
-#: builtin/pack-objects.c:2879
-msgid "show progress meter"
+#: builtin/remote.c:1537
+msgid "delete URLs"
msgstr ""
-#: builtin/pack-objects.c:2881
-msgid "show progress meter during object writing phase"
+#: builtin/remote.c:1544
+msgid "--add --delete doesn't make sense"
msgstr ""
-#: builtin/pack-objects.c:2884
-msgid "similar to --all-progress when progress meter is shown"
+#: builtin/remote.c:1583
+#, c-format
+msgid "Invalid old URL pattern: %s"
msgstr ""
-#: builtin/pack-objects.c:2885
-msgid "version[,offset]"
+#: builtin/remote.c:1591
+#, c-format
+msgid "No such URL found: %s"
msgstr ""
-#: builtin/pack-objects.c:2886
-msgid "write the pack index file in the specified idx format version"
+#: builtin/remote.c:1593
+msgid "Will not delete all non-push URLs"
msgstr ""
-#: builtin/pack-objects.c:2889
-msgid "maximum size of each output pack file"
+#: builtin/remote.c:1609
+msgid "be verbose; must be placed before a subcommand"
msgstr ""
-#: builtin/pack-objects.c:2891
-msgid "ignore borrowed objects from alternate object store"
+#: builtin/remote.c:1640
+#, c-format
+msgid "Unknown subcommand: %s"
msgstr ""
-#: builtin/pack-objects.c:2893
-msgid "ignore packed objects"
+#: builtin/repack.c:20
+msgid "git repack [<options>]"
msgstr ""
-#: builtin/pack-objects.c:2895
-msgid "limit pack window by objects"
+#: builtin/repack.c:25
+msgid ""
+"Incremental repacks are incompatible with bitmap indexes. Use\n"
+"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
msgstr ""
-#: builtin/pack-objects.c:2897
-msgid "limit pack window by memory in addition to object limit"
+#: builtin/repack.c:287
+msgid "pack everything in a single pack"
msgstr ""
-#: builtin/pack-objects.c:2899
-msgid "maximum length of delta chain allowed in the resulting pack"
+#: builtin/repack.c:289
+msgid "same as -a, and turn unreachable objects loose"
msgstr ""
-#: builtin/pack-objects.c:2901
-msgid "reuse existing deltas"
+#: builtin/repack.c:292
+msgid "remove redundant packs, and run git-prune-packed"
msgstr ""
-#: builtin/pack-objects.c:2903
-msgid "reuse existing objects"
+#: builtin/repack.c:294
+msgid "pass --no-reuse-delta to git-pack-objects"
msgstr ""
-#: builtin/pack-objects.c:2905
-msgid "use OFS_DELTA objects"
+#: builtin/repack.c:296
+msgid "pass --no-reuse-object to git-pack-objects"
msgstr ""
-#: builtin/pack-objects.c:2907
-msgid "use threads when searching for best delta matches"
+#: builtin/repack.c:298
+msgid "do not run git-update-server-info"
msgstr ""
-#: builtin/pack-objects.c:2909
-msgid "do not create an empty pack output"
+#: builtin/repack.c:301
+msgid "pass --local to git-pack-objects"
msgstr ""
-#: builtin/pack-objects.c:2911
-msgid "read revision arguments from standard input"
+#: builtin/repack.c:303
+msgid "write bitmap index"
msgstr ""
-#: builtin/pack-objects.c:2913
-msgid "limit the objects to those that are not yet packed"
+#: builtin/repack.c:304
+msgid "approxidate"
msgstr ""
-#: builtin/pack-objects.c:2916
-msgid "include objects reachable from any reference"
+#: builtin/repack.c:305
+msgid "with -A, do not loosen objects older than this"
msgstr ""
-#: builtin/pack-objects.c:2919
-msgid "include objects referred by reflog entries"
+#: builtin/repack.c:307
+msgid "with -a, repack unreachable objects"
msgstr ""
-#: builtin/pack-objects.c:2922
-msgid "include objects referred to by the index"
+#: builtin/repack.c:309
+msgid "size of the window used for delta compression"
msgstr ""
-#: builtin/pack-objects.c:2925
-msgid "output pack to stdout"
+#: builtin/repack.c:310 builtin/repack.c:316
+msgid "bytes"
msgstr ""
-#: builtin/pack-objects.c:2927
-msgid "include tag objects that refer to objects to be packed"
+#: builtin/repack.c:311
+msgid "same as the above, but limit memory size instead of entries count"
msgstr ""
-#: builtin/pack-objects.c:2929
-msgid "keep unreachable objects"
+#: builtin/repack.c:313
+msgid "limits the maximum delta depth"
msgstr ""
-#: builtin/pack-objects.c:2931
-msgid "pack loose unreachable objects"
+#: builtin/repack.c:315
+msgid "limits the maximum number of threads"
msgstr ""
-#: builtin/pack-objects.c:2933
-msgid "unpack unreachable objects newer than <time>"
+#: builtin/repack.c:317
+msgid "maximum size of each packfile"
msgstr ""
-#: builtin/pack-objects.c:2936
-msgid "create thin packs"
+#: builtin/repack.c:319
+msgid "repack objects in packs marked with .keep"
msgstr ""
-#: builtin/pack-objects.c:2938
-msgid "create packs suitable for shallow fetches"
+#: builtin/repack.c:321
+msgid "do not repack this pack"
msgstr ""
-#: builtin/pack-objects.c:2940
-msgid "ignore packs that have companion .keep file"
+#: builtin/repack.c:331
+msgid "cannot delete packs in a precious-objects repo"
msgstr ""
-#: builtin/pack-objects.c:2942
-msgid "pack compression level"
+#: builtin/repack.c:335
+msgid "--keep-unreachable and -A are incompatible"
msgstr ""
-#: builtin/pack-objects.c:2944
-msgid "do not hide commits by grafts"
+#: builtin/repack.c:510 builtin/worktree.c:140
+#, c-format
+msgid "failed to remove '%s'"
msgstr ""
-#: builtin/pack-objects.c:2946
-msgid "use a bitmap index if available to speed up counting objects"
+#: builtin/replace.c:22
+msgid "git replace [-f] <object> <replacement>"
msgstr ""
-#: builtin/pack-objects.c:2948
-msgid "write a bitmap index together with the pack index"
+#: builtin/replace.c:23
+msgid "git replace [-f] --edit <object>"
msgstr ""
-#: builtin/pack-objects.c:3075
-msgid "Counting objects"
+#: builtin/replace.c:24
+msgid "git replace [-f] --graft <commit> [<parent>...]"
msgstr ""
-#: builtin/pack-refs.c:6
-msgid "git pack-refs [<options>]"
+#: builtin/replace.c:25
+msgid "git replace [-f] --convert-graft-file"
msgstr ""
-#: builtin/pack-refs.c:14
-msgid "pack everything"
+#: builtin/replace.c:26
+msgid "git replace -d <object>..."
msgstr ""
-#: builtin/pack-refs.c:15
-msgid "prune loose refs (default)"
+#: builtin/replace.c:27
+msgid "git replace [--format=<format>] [-l [<pattern>]]"
msgstr ""
-#: builtin/prune-packed.c:7
-msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
+#: builtin/replace.c:57 builtin/replace.c:203 builtin/replace.c:206
+#, c-format
+msgid "failed to resolve '%s' as a valid ref"
msgstr ""
-#: builtin/prune-packed.c:40
-msgid "Removing duplicate objects"
+#: builtin/replace.c:86
+#, c-format
+msgid ""
+"invalid replace format '%s'\n"
+"valid formats are 'short', 'medium' and 'long'"
msgstr ""
-#: builtin/prune.c:11
-msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
+#: builtin/replace.c:121
+#, c-format
+msgid "replace ref '%s' not found"
msgstr ""
-#: builtin/prune.c:106
-msgid "report pruned objects"
+#: builtin/replace.c:137
+#, c-format
+msgid "Deleted replace ref '%s'"
msgstr ""
-#: builtin/prune.c:109
-msgid "expire objects older than <time>"
+#: builtin/replace.c:149
+#, c-format
+msgid "'%s' is not a valid ref name"
msgstr ""
-#: builtin/prune.c:123
-msgid "cannot prune in a precious-objects repo"
+#: builtin/replace.c:154
+#, c-format
+msgid "replace ref '%s' already exists"
msgstr ""
-#: builtin/pull.c:54 builtin/pull.c:56
+#: builtin/replace.c:174
#, c-format
-msgid "Invalid value for %s: %s"
+msgid ""
+"Objects must be of the same type.\n"
+"'%s' points to a replaced object of type '%s'\n"
+"while '%s' points to a replacement object of type '%s'."
msgstr ""
-#: builtin/pull.c:76
-msgid "git pull [<options>] [<repository> [<refspec>...]]"
+#: builtin/replace.c:225
+#, c-format
+msgid "unable to open %s for writing"
msgstr ""
-#: builtin/pull.c:124
-msgid "control for recursive fetching of submodules"
+#: builtin/replace.c:238
+msgid "cat-file reported failure"
msgstr ""
-#: builtin/pull.c:128
-msgid "Options related to merging"
+#: builtin/replace.c:254
+#, c-format
+msgid "unable to open %s for reading"
msgstr ""
-#: builtin/pull.c:131
-msgid "incorporate changes by rebasing rather than merging"
+#: builtin/replace.c:268
+msgid "unable to spawn mktree"
msgstr ""
-#: builtin/pull.c:155 builtin/rebase--helper.c:19 builtin/revert.c:121
-msgid "allow fast-forward"
+#: builtin/replace.c:272
+msgid "unable to read from mktree"
msgstr ""
-#: builtin/pull.c:164
-msgid "automatically stash/stash pop before and after rebase"
+#: builtin/replace.c:281
+msgid "mktree reported failure"
msgstr ""
-#: builtin/pull.c:180
-msgid "Options related to fetching"
+#: builtin/replace.c:285
+msgid "mktree did not return an object name"
msgstr ""
-#: builtin/pull.c:198
-msgid "number of submodules pulled in parallel"
+#: builtin/replace.c:294
+#, c-format
+msgid "unable to fstat %s"
msgstr ""
-#: builtin/pull.c:287
-#, c-format
-msgid "Invalid value for pull.ff: %s"
+#: builtin/replace.c:299
+msgid "unable to write object to database"
msgstr ""
-#: builtin/pull.c:399
-msgid ""
-"There is no candidate for rebasing against among the refs that you just "
-"fetched."
+#: builtin/replace.c:318 builtin/replace.c:371 builtin/replace.c:415
+#: builtin/replace.c:445
+#, c-format
+msgid "not a valid object name: '%s'"
msgstr ""
-#: builtin/pull.c:401
-msgid ""
-"There are no candidates for merging among the refs that you just fetched."
+#: builtin/replace.c:322
+#, c-format
+msgid "unable to get object type for %s"
msgstr ""
-#: builtin/pull.c:402
-msgid ""
-"Generally this means that you provided a wildcard refspec which had no\n"
-"matches on the remote end."
+#: builtin/replace.c:338
+msgid "editing object file failed"
msgstr ""
-#: builtin/pull.c:405
+#: builtin/replace.c:347
#, 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."
+msgid "new object is the same as the old one: '%s'"
msgstr ""
-#: builtin/pull.c:410 git-parse-remote.sh:73
-msgid "You are not currently on a branch."
+#: builtin/replace.c:407
+#, c-format
+msgid "bad mergetag in commit '%s'"
msgstr ""
-#: builtin/pull.c:412 builtin/pull.c:427 git-parse-remote.sh:79
-msgid "Please specify which branch you want to rebase against."
+#: builtin/replace.c:409
+#, c-format
+msgid "malformed mergetag in commit '%s'"
msgstr ""
-#: builtin/pull.c:414 builtin/pull.c:429 git-parse-remote.sh:82
-msgid "Please specify which branch you want to merge with."
+#: builtin/replace.c:421
+#, c-format
+msgid ""
+"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
+"instead of --graft"
msgstr ""
-#: builtin/pull.c:415 builtin/pull.c:430
-msgid "See git-pull(1) for details."
+#: builtin/replace.c:460
+#, c-format
+msgid "the original commit '%s' has a gpg signature"
msgstr ""
-#: builtin/pull.c:417 builtin/pull.c:423 builtin/pull.c:432
-#: git-parse-remote.sh:64
-msgid "<remote>"
+#: builtin/replace.c:461
+msgid "the signature will be removed in the replacement commit!"
msgstr ""
-#: builtin/pull.c:417 builtin/pull.c:432 builtin/pull.c:437 git-rebase.sh:456
-#: git-parse-remote.sh:65
-msgid "<branch>"
+#: builtin/replace.c:471
+#, c-format
+msgid "could not write replacement commit for: '%s'"
msgstr ""
-#: builtin/pull.c:425 git-parse-remote.sh:75
-msgid "There is no tracking information for the current branch."
+#: builtin/replace.c:479
+#, c-format
+msgid "graft for '%s' unnecessary"
msgstr ""
-#: builtin/pull.c:434 git-parse-remote.sh:95
-msgid ""
-"If you wish to set tracking information for this branch you can do so with:"
+#: builtin/replace.c:482
+#, c-format
+msgid "new commit is the same as the old one: '%s'"
msgstr ""
-#: builtin/pull.c:439
+#: builtin/replace.c:514
#, c-format
msgid ""
-"Your configuration specifies to merge with the ref '%s'\n"
-"from the remote, but no such ref was fetched."
+"could not convert the following graft(s):\n"
+"%s"
msgstr ""
-#: builtin/pull.c:792
-msgid "ignoring --verify-signatures for rebase"
+#: builtin/replace.c:535
+msgid "list replace refs"
msgstr ""
-#: builtin/pull.c:840
-msgid "--[no-]autostash option is only valid with --rebase."
+#: builtin/replace.c:536
+msgid "delete replace refs"
msgstr ""
-#: builtin/pull.c:848
-msgid "Updating an unborn branch with changes added to the index."
+#: builtin/replace.c:537
+msgid "edit existing object"
msgstr ""
-#: builtin/pull.c:851
-msgid "pull with rebase"
+#: builtin/replace.c:538
+msgid "change a commit's parents"
msgstr ""
-#: builtin/pull.c:852
-msgid "please commit or stash them."
+#: builtin/replace.c:539
+msgid "convert existing graft file"
msgstr ""
-#: builtin/pull.c:877
-#, c-format
-msgid ""
-"fetch updated the current branch head.\n"
-"fast-forwarding your working tree from\n"
-"commit %s."
+#: builtin/replace.c:540
+msgid "replace the ref if it exists"
msgstr ""
-#: builtin/pull.c:882
-#, 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."
+#: builtin/replace.c:542
+msgid "do not pretty-print contents for --edit"
msgstr ""
-#: builtin/pull.c:897
-msgid "Cannot merge multiple branches into empty head."
+#: builtin/replace.c:543
+msgid "use this format"
msgstr ""
-#: builtin/pull.c:901
-msgid "Cannot rebase onto multiple branches."
+#: builtin/replace.c:556
+msgid "--format cannot be used when not listing"
msgstr ""
-#: builtin/pull.c:908
-msgid "cannot rebase with locally recorded submodule modifications"
+#: builtin/replace.c:564
+msgid "-f only makes sense when writing a replacement"
msgstr ""
-#: builtin/push.c:17
-msgid "git push [<options>] [<repository> [<refspec>...]]"
+#: builtin/replace.c:568
+msgid "--raw only makes sense with --edit"
msgstr ""
-#: builtin/push.c:90
-msgid "tag shorthand without <tag>"
+#: builtin/replace.c:574
+msgid "-d needs at least one argument"
msgstr ""
-#: builtin/push.c:100
-msgid "--delete only accepts plain target ref names"
+#: builtin/replace.c:580
+msgid "bad number of arguments"
msgstr ""
-#: builtin/push.c:144
-msgid ""
-"\n"
-"To choose either option permanently, see push.default in 'git help config'."
+#: builtin/replace.c:586
+msgid "-e needs exactly one argument"
msgstr ""
-
-#: builtin/push.c:147
-#, 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"
+
+#: builtin/replace.c:592
+msgid "-g needs at least one argument"
msgstr ""
-#: builtin/push.c:162
-#, 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"
+#: builtin/replace.c:598
+msgid "--convert-graft-file takes no argument"
msgstr ""
-#: builtin/push.c:176
-#, 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"
+#: builtin/replace.c:604
+msgid "only one pattern can be given with -l"
msgstr ""
-#: builtin/push.c:184
-#, c-format
-msgid "The current branch %s has multiple upstream branches, refusing to push."
+#: builtin/rerere.c:13
+msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
msgstr ""
-#: builtin/push.c:187
-#, 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/rerere.c:59
+msgid "register clean resolutions in index"
msgstr ""
-#: builtin/push.c:246
+#: builtin/reset.c:29
msgid ""
-"You didn't specify any refspecs to push, and push.default is \"nothing\"."
+"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
msgstr ""
-#: builtin/push.c:253
-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/reset.c:30
+msgid "git reset [-q] [<tree-ish>] [--] <paths>..."
msgstr ""
-#: builtin/push.c:259
-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/reset.c:31
+msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
msgstr ""
-#: builtin/push.c:265
-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/reset.c:37
+msgid "mixed"
msgstr ""
-#: builtin/push.c:272
-msgid "Updates were rejected because the tag already exists in the remote."
+#: builtin/reset.c:37
+msgid "soft"
msgstr ""
-#: builtin/push.c:275
-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/reset.c:37
+msgid "hard"
msgstr ""
-#: builtin/push.c:335
-#, c-format
-msgid "Pushing to %s\n"
+#: builtin/reset.c:37
+msgid "merge"
msgstr ""
-#: builtin/push.c:339
-#, c-format
-msgid "failed to push some refs to '%s'"
+#: builtin/reset.c:37
+msgid "keep"
msgstr ""
-#: builtin/push.c:370
-#, c-format
-msgid "bad repository '%s'"
+#: builtin/reset.c:78
+msgid "You do not have a valid HEAD."
msgstr ""
-#: builtin/push.c:371
-msgid ""
-"No configured push destination.\n"
-"Either specify the URL from the command-line or configure a remote "
-"repository using\n"
-"\n"
-" git remote add <name> <url>\n"
-"\n"
-"and then push using the remote name\n"
-"\n"
-" git push <name>\n"
+#: builtin/reset.c:80
+msgid "Failed to find tree of HEAD."
msgstr ""
-#: builtin/push.c:389
-msgid "--all and --tags are incompatible"
+#: builtin/reset.c:86
+#, c-format
+msgid "Failed to find tree of %s."
msgstr ""
-#: builtin/push.c:390
-msgid "--all can't be combined with refspecs"
+#: builtin/reset.c:111
+#, c-format
+msgid "HEAD is now at %s"
msgstr ""
-#: builtin/push.c:395
-msgid "--mirror and --tags are incompatible"
+#: builtin/reset.c:189
+#, c-format
+msgid "Cannot do a %s reset in the middle of a merge."
msgstr ""
-#: builtin/push.c:396
-msgid "--mirror can't be combined with refspecs"
+#: builtin/reset.c:289
+msgid "be quiet, only report errors"
msgstr ""
-#: builtin/push.c:401
-msgid "--all and --mirror are incompatible"
+#: builtin/reset.c:291
+msgid "reset HEAD and index"
msgstr ""
-#: builtin/push.c:523
-msgid "repository"
+#: builtin/reset.c:292
+msgid "reset only HEAD"
msgstr ""
-#: builtin/push.c:524 builtin/send-pack.c:163
-msgid "push all refs"
+#: builtin/reset.c:294 builtin/reset.c:296
+msgid "reset HEAD, index and working tree"
msgstr ""
-#: builtin/push.c:525 builtin/send-pack.c:165
-msgid "mirror all refs"
+#: builtin/reset.c:298
+msgid "reset HEAD but keep local changes"
msgstr ""
-#: builtin/push.c:527
-msgid "delete refs"
+#: builtin/reset.c:304
+msgid "record only the fact that removed paths will be added later"
msgstr ""
-#: builtin/push.c:528
-msgid "push tags (can't be used with --all or --mirror)"
+#: builtin/reset.c:321
+#, c-format
+msgid "Failed to resolve '%s' as a valid revision."
msgstr ""
-#: builtin/push.c:531 builtin/send-pack.c:166
-msgid "force updates"
+#: builtin/reset.c:329
+#, c-format
+msgid "Failed to resolve '%s' as a valid tree."
msgstr ""
-#: builtin/push.c:533 builtin/send-pack.c:180
-msgid "refname>:<expect"
+#: builtin/reset.c:338
+msgid "--patch is incompatible with --{hard,mixed,soft}"
msgstr ""
-#: builtin/push.c:534 builtin/send-pack.c:181
-msgid "require old value of ref to be at this value"
+#: builtin/reset.c:347
+msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
msgstr ""
-#: builtin/push.c:537
-msgid "control recursive pushing of submodules"
+#: builtin/reset.c:349
+#, c-format
+msgid "Cannot do %s reset with paths."
msgstr ""
-#: builtin/push.c:539 builtin/send-pack.c:174
-msgid "use thin pack"
+#: builtin/reset.c:359
+#, c-format
+msgid "%s reset is not allowed in a bare repository"
msgstr ""
-#: builtin/push.c:540 builtin/push.c:541 builtin/send-pack.c:160
-#: builtin/send-pack.c:161
-msgid "receive pack program"
+#: builtin/reset.c:363
+msgid "-N can only be used with --mixed"
msgstr ""
-#: builtin/push.c:542
-msgid "set upstream for git pull/status"
+#: builtin/reset.c:380
+msgid "Unstaged changes after reset:"
msgstr ""
-#: builtin/push.c:545
-msgid "prune locally removed refs"
+#: builtin/reset.c:386
+#, c-format
+msgid "Could not reset index file to revision '%s'."
msgstr ""
-#: builtin/push.c:547
-msgid "bypass pre-push hook"
+#: builtin/reset.c:390
+msgid "Could not write new index file."
msgstr ""
-#: builtin/push.c:548
-msgid "push missing but relevant tags"
+#: builtin/rev-list.c:399
+msgid "cannot combine --exclude-promisor-objects and --missing"
msgstr ""
-#: builtin/push.c:551 builtin/send-pack.c:168
-msgid "GPG sign the push"
+#: builtin/rev-list.c:457
+msgid "object filtering requires --objects"
msgstr ""
-#: builtin/push.c:553 builtin/send-pack.c:175
-msgid "request atomic transaction on remote side"
+#: builtin/rev-list.c:460
+#, c-format
+msgid "invalid sparse value '%s'"
msgstr ""
-#: builtin/push.c:554 builtin/send-pack.c:171
-msgid "server-specific"
+#: builtin/rev-list.c:501
+msgid "rev-list does not support display of notes"
msgstr ""
-#: builtin/push.c:554 builtin/send-pack.c:172
-msgid "option to transmit"
+#: builtin/rev-list.c:504
+msgid "cannot combine --use-bitmap-index with object filtering"
msgstr ""
-#: builtin/push.c:568
-msgid "--delete is incompatible with --all, --mirror and --tags"
+#: builtin/rev-parse.c:406
+msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
msgstr ""
-#: builtin/push.c:570
-msgid "--delete doesn't make sense without any refs"
+#: builtin/rev-parse.c:411
+msgid "keep the `--` passed as an arg"
msgstr ""
-#: builtin/push.c:589
-msgid "push options must not have new line characters"
+#: builtin/rev-parse.c:413
+msgid "stop parsing after the first non-option argument"
msgstr ""
-#: builtin/read-tree.c:40
+#: builtin/rev-parse.c:416
+msgid "output in stuck long form"
+msgstr ""
+
+#: builtin/rev-parse.c:549
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>]])"
+"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/read-tree.c:121
-msgid "write resulting index to <file>"
+#: builtin/revert.c:24
+msgid "git revert [<options>] <commit-ish>..."
msgstr ""
-#: builtin/read-tree.c:124
-msgid "only empty the index"
+#: builtin/revert.c:25
+msgid "git revert <subcommand>"
msgstr ""
-#: builtin/read-tree.c:126
-msgid "Merging"
+#: builtin/revert.c:30
+msgid "git cherry-pick [<options>] <commit-ish>..."
msgstr ""
-#: builtin/read-tree.c:128
-msgid "perform a merge in addition to a read"
+#: builtin/revert.c:31
+msgid "git cherry-pick <subcommand>"
msgstr ""
-#: builtin/read-tree.c:130
-msgid "3-way merge if no file level merging required"
+#: builtin/revert.c:91
+#, c-format
+msgid "%s: %s cannot be used with %s"
msgstr ""
-#: builtin/read-tree.c:132
-msgid "3-way merge in presence of adds and removes"
+#: builtin/revert.c:100
+msgid "end revert or cherry-pick sequence"
msgstr ""
-#: builtin/read-tree.c:134
-msgid "same as -m, but discard unmerged entries"
+#: builtin/revert.c:101
+msgid "resume revert or cherry-pick sequence"
msgstr ""
-#: builtin/read-tree.c:135
-msgid "<subdirectory>/"
+#: builtin/revert.c:102
+msgid "cancel revert or cherry-pick sequence"
msgstr ""
-#: builtin/read-tree.c:136
-msgid "read the tree into the index under <subdirectory>/"
+#: builtin/revert.c:103
+msgid "don't automatically commit"
msgstr ""
-#: builtin/read-tree.c:139
-msgid "update working tree with merge result"
+#: builtin/revert.c:104
+msgid "edit the commit message"
msgstr ""
-#: builtin/read-tree.c:141
-msgid "gitignore"
+#: builtin/revert.c:107
+msgid "parent-number"
msgstr ""
-#: builtin/read-tree.c:142
-msgid "allow explicitly ignored files to be overwritten"
+#: builtin/revert.c:108
+msgid "select mainline parent"
msgstr ""
-#: builtin/read-tree.c:145
-msgid "don't check the working tree after merging"
+#: builtin/revert.c:110
+msgid "merge strategy"
msgstr ""
-#: builtin/read-tree.c:146
-msgid "don't update the index or the work tree"
+#: builtin/revert.c:111
+msgid "option"
msgstr ""
-#: builtin/read-tree.c:148
-msgid "skip applying sparse checkout filter"
+#: builtin/revert.c:112
+msgid "option for merge strategy"
msgstr ""
-#: builtin/read-tree.c:150
-msgid "debug unpack-trees"
+#: builtin/revert.c:121
+msgid "append commit name"
msgstr ""
-#: builtin/rebase--helper.c:8
-msgid "git rebase--helper [<options>]"
+#: builtin/revert.c:123
+msgid "preserve initially empty commits"
msgstr ""
-#: builtin/rebase--helper.c:20
-msgid "continue rebase"
+#: builtin/revert.c:125
+msgid "keep redundant, empty commits"
msgstr ""
-#: builtin/rebase--helper.c:22
-msgid "abort rebase"
+#: builtin/revert.c:219
+msgid "revert failed"
msgstr ""
-#: builtin/receive-pack.c:28
-msgid "git receive-pack <git-dir>"
+#: builtin/revert.c:232
+msgid "cherry-pick failed"
msgstr ""
-#: builtin/receive-pack.c:838
-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'."
+#: builtin/rm.c:18
+msgid "git rm [<options>] [--] <file>..."
msgstr ""
-#: builtin/receive-pack.c:858
+#: builtin/rm.c:206
+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:211
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'."
+"(use -f to force removal)"
msgstr ""
-#: builtin/receive-pack.c:1933
-msgid "quiet"
+#: builtin/rm.c:215
+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:219 builtin/rm.c:228
+msgid ""
+"\n"
+"(use --cached to keep the file, or -f to force removal)"
msgstr ""
-#: builtin/receive-pack.c:1947
-msgid "You must specify a directory."
-msgstr ""
+#: builtin/rm.c:225
+msgid "the following file has local modifications:"
+msgid_plural "the following files have local modifications:"
+msgstr[0] ""
+msgstr[1] ""
-#: builtin/reflog.c:424
-#, c-format
-msgid "'%s' for '%s' is not a valid timestamp"
+#: builtin/rm.c:241
+msgid "do not list removed files"
msgstr ""
-#: builtin/reflog.c:541 builtin/reflog.c:546
-#, c-format
-msgid "'%s' is not a valid timestamp"
+#: builtin/rm.c:242
+msgid "only remove from the index"
msgstr ""
-#: builtin/remote.c:13
-msgid "git remote [-v | --verbose]"
+#: builtin/rm.c:243
+msgid "override the up-to-date check"
msgstr ""
-#: builtin/remote.c:14
-msgid ""
-"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
-"mirror=<fetch|push>] <name> <url>"
+#: builtin/rm.c:244
+msgid "allow recursive removal"
msgstr ""
-#: builtin/remote.c:15 builtin/remote.c:35
-msgid "git remote rename <old> <new>"
+#: builtin/rm.c:246
+msgid "exit with a zero status even if nothing matched"
msgstr ""
-#: builtin/remote.c:16 builtin/remote.c:40
-msgid "git remote remove <name>"
+#: builtin/rm.c:288
+msgid "please stage your changes to .gitmodules or stash them to proceed"
msgstr ""
-#: builtin/remote.c:17 builtin/remote.c:45
-msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
+#: builtin/rm.c:306
+#, c-format
+msgid "not removing '%s' recursively without -r"
msgstr ""
-#: builtin/remote.c:18
-msgid "git remote [-v | --verbose] show [-n] <name>"
+#: builtin/rm.c:345
+#, c-format
+msgid "git rm: unable to remove %s"
msgstr ""
-#: builtin/remote.c:19
-msgid "git remote prune [-n | --dry-run] <name>"
+#: builtin/rm.c:368
+#, c-format
+msgid "could not remove '%s'"
msgstr ""
-#: builtin/remote.c:20
+#: builtin/send-pack.c:20
msgid ""
-"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
+"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/remote.c:21
-msgid "git remote set-branches [--add] <name> <branch>..."
+#: builtin/send-pack.c:163
+msgid "remote name"
msgstr ""
-#: builtin/remote.c:22 builtin/remote.c:71
-msgid "git remote get-url [--push] [--all] <name>"
+#: builtin/send-pack.c:177
+msgid "use stateless RPC protocol"
msgstr ""
-#: builtin/remote.c:23 builtin/remote.c:76
-msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
+#: builtin/send-pack.c:178
+msgid "read refs from stdin"
msgstr ""
-#: builtin/remote.c:24 builtin/remote.c:77
-msgid "git remote set-url --add <name> <newurl>"
+#: builtin/send-pack.c:179
+msgid "print status from remote helper"
msgstr ""
-#: builtin/remote.c:25 builtin/remote.c:78
-msgid "git remote set-url --delete <name> <url>"
+#: builtin/serve.c:7
+msgid "git serve [<options>]"
msgstr ""
-#: builtin/remote.c:30
-msgid "git remote add [<options>] <name> <url>"
+#: builtin/serve.c:17 builtin/upload-pack.c:23
+msgid "quit after a single request/response exchange"
msgstr ""
-#: builtin/remote.c:50
-msgid "git remote set-branches <name> <branch>..."
+#: builtin/serve.c:19
+msgid "exit immediately after advertising capabilities"
msgstr ""
-#: builtin/remote.c:51
-msgid "git remote set-branches --add <name> <branch>..."
+#: builtin/shortlog.c:14
+msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]"
msgstr ""
-#: builtin/remote.c:56
-msgid "git remote show [<options>] <name>"
+#: builtin/shortlog.c:15
+msgid "git log --pretty=short | git shortlog [<options>]"
msgstr ""
-#: builtin/remote.c:61
-msgid "git remote prune [<options>] <name>"
+#: builtin/shortlog.c:264
+msgid "Group by committer rather than author"
msgstr ""
-#: builtin/remote.c:66
-msgid "git remote update [<options>] [<group> | <remote>]..."
+#: builtin/shortlog.c:266
+msgid "sort output according to the number of commits per author"
msgstr ""
-#: builtin/remote.c:95
-#, c-format
-msgid "Updating %s"
+#: builtin/shortlog.c:268
+msgid "Suppress commit descriptions, only provides commit count"
msgstr ""
-#: builtin/remote.c:127
-msgid ""
-"--mirror is dangerous and deprecated; please\n"
-"\t use --mirror=fetch or --mirror=push instead"
+#: builtin/shortlog.c:270
+msgid "Show the email address of each author"
msgstr ""
-#: builtin/remote.c:144
-#, c-format
-msgid "unknown mirror argument: %s"
+#: builtin/shortlog.c:271
+msgid "<w>[,<i1>[,<i2>]]"
msgstr ""
-#: builtin/remote.c:160
-msgid "fetch the remote branches"
+#: builtin/shortlog.c:272
+msgid "Linewrap output"
msgstr ""
-#: builtin/remote.c:162
-msgid "import all tags and associated objects when fetching"
+#: builtin/shortlog.c:299
+msgid "too many arguments given outside repository"
msgstr ""
-#: builtin/remote.c:165
-msgid "or do not fetch any tag at all (--no-tags)"
+#: builtin/show-branch.c:13
+msgid ""
+"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
+"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
+"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
+"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
msgstr ""
-#: builtin/remote.c:167
-msgid "branch(es) to track"
+#: builtin/show-branch.c:17
+msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
msgstr ""
-#: builtin/remote.c:168
-msgid "master branch"
-msgstr ""
+#: builtin/show-branch.c:395
+#, 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:169
-msgid "push|fetch"
+#: builtin/show-branch.c:549
+#, c-format
+msgid "no matching refs with %s"
msgstr ""
-#: builtin/remote.c:170
-msgid "set up remote as a mirror to push to or fetch from"
+#: builtin/show-branch.c:645
+msgid "show remote-tracking and local branches"
msgstr ""
-#: builtin/remote.c:182
-msgid "specifying a master branch makes no sense with --mirror"
+#: builtin/show-branch.c:647
+msgid "show remote-tracking branches"
msgstr ""
-#: builtin/remote.c:184
-msgid "specifying branches to track makes sense only with fetch mirrors"
+#: builtin/show-branch.c:649
+msgid "color '*!+-' corresponding to the branch"
msgstr ""
-#: builtin/remote.c:191 builtin/remote.c:630
-#, c-format
-msgid "remote %s already exists."
+#: builtin/show-branch.c:651
+msgid "show <n> more commits after the common ancestor"
msgstr ""
-#: builtin/remote.c:195 builtin/remote.c:634
-#, c-format
-msgid "'%s' is not a valid remote name"
+#: builtin/show-branch.c:653
+msgid "synonym to more=-1"
msgstr ""
-#: builtin/remote.c:235
-#, c-format
-msgid "Could not setup master '%s'"
+#: builtin/show-branch.c:654
+msgid "suppress naming strings"
msgstr ""
-#: builtin/remote.c:337
-#, c-format
-msgid "Could not get fetch map for refspec %s"
+#: builtin/show-branch.c:656
+msgid "include the current branch"
msgstr ""
-#: builtin/remote.c:438 builtin/remote.c:446
-msgid "(matching)"
+#: builtin/show-branch.c:658
+msgid "name commits with their object names"
msgstr ""
-#: builtin/remote.c:450
-msgid "(delete)"
+#: builtin/show-branch.c:660
+msgid "show possible merge bases"
msgstr ""
-#: builtin/remote.c:623 builtin/remote.c:758 builtin/remote.c:857
-#, c-format
-msgid "No such remote: %s"
+#: builtin/show-branch.c:662
+msgid "show refs unreachable from any other ref"
msgstr ""
-#: builtin/remote.c:640
-#, c-format
-msgid "Could not rename config section '%s' to '%s'"
+#: builtin/show-branch.c:664
+msgid "show commits in topological order"
msgstr ""
-#: builtin/remote.c:660
-#, c-format
-msgid ""
-"Not updating non-default fetch refspec\n"
-"\t%s\n"
-"\tPlease update the configuration manually if necessary."
+#: builtin/show-branch.c:667
+msgid "show only commits not on the first branch"
msgstr ""
-#: builtin/remote.c:696
-#, c-format
-msgid "deleting '%s' failed"
+#: builtin/show-branch.c:669
+msgid "show merges reachable from only one tip"
msgstr ""
-#: builtin/remote.c:730
-#, c-format
-msgid "creating '%s' failed"
+#: builtin/show-branch.c:671
+msgid "topologically sort, maintaining date order where possible"
msgstr ""
-#: builtin/remote.c:795
-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:809
-#, c-format
-msgid "Could not remove config section '%s'"
+#: builtin/show-branch.c:674
+msgid "<n>[,<base>]"
msgstr ""
-#: builtin/remote.c:910
-#, c-format
-msgid " new (next fetch will store in remotes/%s)"
+#: builtin/show-branch.c:675
+msgid "show <n> most recent ref-log entries starting at base"
msgstr ""
-#: builtin/remote.c:913
-msgid " tracked"
+#: builtin/show-branch.c:711
+msgid ""
+"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
msgstr ""
-#: builtin/remote.c:915
-msgid " stale (use 'git remote prune' to remove)"
+#: builtin/show-branch.c:735
+msgid "no branches given, and HEAD is not valid"
msgstr ""
-#: builtin/remote.c:917
-msgid " ???"
+#: builtin/show-branch.c:738
+msgid "--reflog option needs one branch name"
msgstr ""
-#: builtin/remote.c:958
+#: builtin/show-branch.c:741
#, c-format
-msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
-msgstr ""
+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/remote.c:966
+#: builtin/show-branch.c:745
#, c-format
-msgid "rebases interactively onto remote %s"
+msgid "no such ref %s"
msgstr ""
-#: builtin/remote.c:967
+#: builtin/show-branch.c:829
#, c-format
-msgid "rebases onto remote %s"
-msgstr ""
+msgid "cannot handle more than %d rev."
+msgid_plural "cannot handle more than %d revs."
+msgstr[0] ""
+msgstr[1] ""
-#: builtin/remote.c:970
+#: builtin/show-branch.c:833
#, c-format
-msgid " merges with remote %s"
+msgid "'%s' is not a valid ref."
msgstr ""
-#: builtin/remote.c:973
+#: builtin/show-branch.c:836
#, c-format
-msgid "merges with remote %s"
+msgid "cannot find commit %s (%s)"
msgstr ""
-#: builtin/remote.c:976
-#, c-format
-msgid "%-*s and with remote %s\n"
+#: builtin/show-ref.c:11
+msgid ""
+"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
+"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
msgstr ""
-#: builtin/remote.c:1019
-msgid "create"
+#: builtin/show-ref.c:12
+msgid "git show-ref --exclude-existing[=<pattern>]"
msgstr ""
-#: builtin/remote.c:1022
-msgid "delete"
+#: builtin/show-ref.c:160
+msgid "only show tags (can be combined with heads)"
msgstr ""
-#: builtin/remote.c:1026
-msgid "up to date"
+#: builtin/show-ref.c:161
+msgid "only show heads (can be combined with tags)"
msgstr ""
-#: builtin/remote.c:1029
-msgid "fast-forwardable"
+#: builtin/show-ref.c:162
+msgid "stricter reference checking, requires exact ref path"
msgstr ""
-#: builtin/remote.c:1032
-msgid "local out of date"
+#: builtin/show-ref.c:165 builtin/show-ref.c:167
+msgid "show the HEAD reference, even if it would be filtered out"
msgstr ""
-#: builtin/remote.c:1039
-#, c-format
-msgid " %-*s forces to %-*s (%s)"
+#: builtin/show-ref.c:169
+msgid "dereference tags into object IDs"
msgstr ""
-#: builtin/remote.c:1042
-#, c-format
-msgid " %-*s pushes to %-*s (%s)"
+#: builtin/show-ref.c:171
+msgid "only show SHA1 hash using <n> digits"
msgstr ""
-#: builtin/remote.c:1046
-#, c-format
-msgid " %-*s forces to %s"
+#: builtin/show-ref.c:175
+msgid "do not print results to stdout (useful with --verify)"
msgstr ""
-#: builtin/remote.c:1049
-#, c-format
-msgid " %-*s pushes to %s"
+#: builtin/show-ref.c:177
+msgid "show refs from stdin that aren't in local repository"
msgstr ""
-#: builtin/remote.c:1117
-msgid "do not query remotes"
+#: builtin/stripspace.c:18
+msgid "git stripspace [-s | --strip-comments]"
msgstr ""
-#: builtin/remote.c:1144
-#, c-format
-msgid "* remote %s"
+#: builtin/stripspace.c:19
+msgid "git stripspace [-c | --comment-lines]"
msgstr ""
-#: builtin/remote.c:1145
-#, c-format
-msgid " Fetch URL: %s"
+#: builtin/stripspace.c:36
+msgid "skip and remove all lines starting with comment character"
msgstr ""
-#: builtin/remote.c:1146 builtin/remote.c:1162 builtin/remote.c:1301
-msgid "(no URL)"
+#: builtin/stripspace.c:39
+msgid "prepend comment character and space to each line"
msgstr ""
-#. TRANSLATORS: the colon ':' should align
-#. with the one in " Fetch URL: %s"
-#. translation.
-#.
-#: builtin/remote.c:1160 builtin/remote.c:1162
+#: builtin/submodule--helper.c:37 builtin/submodule--helper.c:1833
#, c-format
-msgid " Push URL: %s"
+msgid "No such ref: %s"
msgstr ""
-#: builtin/remote.c:1164 builtin/remote.c:1166 builtin/remote.c:1168
+#: builtin/submodule--helper.c:44 builtin/submodule--helper.c:1842
#, c-format
-msgid " HEAD branch: %s"
-msgstr ""
-
-#: builtin/remote.c:1164
-msgid "(not queried)"
+msgid "Expecting a full ref name, got %s"
msgstr ""
-#: builtin/remote.c:1166
-msgid "(unknown)"
+#: builtin/submodule--helper.c:61
+msgid "submodule--helper print-default-remote takes no arguments"
msgstr ""
-#: builtin/remote.c:1170
+#: builtin/submodule--helper.c:99
#, c-format
-msgid ""
-" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
+msgid "cannot strip one component off url '%s'"
msgstr ""
-#: builtin/remote.c:1182
-#, c-format
-msgid " Remote branch:%s"
-msgid_plural " Remote branches:%s"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/remote.c:1185 builtin/remote.c:1211
-msgid " (status not queried)"
+#: builtin/submodule--helper.c:407 builtin/submodule--helper.c:1356
+msgid "alternative anchor for relative paths"
msgstr ""
-#: builtin/remote.c:1194
-msgid " Local branch configured for 'git pull':"
-msgid_plural " Local branches configured for 'git pull':"
-msgstr[0] ""
-msgstr[1] ""
+#: builtin/submodule--helper.c:412
+msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
+msgstr ""
-#: builtin/remote.c:1202
-msgid " Local refs will be mirrored by 'git push'"
+#: builtin/submodule--helper.c:469 builtin/submodule--helper.c:606
+#: builtin/submodule--helper.c:629
+#, c-format
+msgid "No url found for submodule path '%s' in .gitmodules"
msgstr ""
-#: builtin/remote.c:1208
+#: builtin/submodule--helper.c:521
#, c-format
-msgid " Local ref configured for 'git push'%s:"
-msgid_plural " Local refs configured for 'git push'%s:"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Entering '%s'\n"
+msgstr ""
-#: builtin/remote.c:1229
-msgid "set refs/remotes/<name>/HEAD according to remote"
+#: builtin/submodule--helper.c:524
+#, c-format
+msgid ""
+"run_command returned non-zero status for %s\n"
+"."
msgstr ""
-#: builtin/remote.c:1231
-msgid "delete refs/remotes/<name>/HEAD"
+#: builtin/submodule--helper.c:545
+#, c-format
+msgid ""
+"run_command returned non-zero status while recursing in the nested "
+"submodules of %s\n"
+"."
msgstr ""
-#: builtin/remote.c:1246
-msgid "Cannot determine remote HEAD"
+#: builtin/submodule--helper.c:561
+msgid "Suppress output of entering each submodule command"
msgstr ""
-#: builtin/remote.c:1248
-msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
+#: builtin/submodule--helper.c:563 builtin/submodule--helper.c:1040
+msgid "Recurse into nested submodules"
msgstr ""
-#: builtin/remote.c:1258
-#, c-format
-msgid "Could not delete %s"
+#: builtin/submodule--helper.c:568
+msgid "git submodule--helper foreach [--quiet] [--recursive] <command>"
msgstr ""
-#: builtin/remote.c:1266
+#: builtin/submodule--helper.c:644
#, c-format
-msgid "Not a valid ref: %s"
+msgid ""
+"could not lookup configuration '%s'. Assuming this repository is its own "
+"authoritative upstream."
msgstr ""
-#: builtin/remote.c:1268
+#: builtin/submodule--helper.c:655
#, c-format
-msgid "Could not setup %s"
+msgid "Failed to register url for submodule path '%s'"
msgstr ""
-#: builtin/remote.c:1286
+#: builtin/submodule--helper.c:659
#, c-format
-msgid " %s will become dangling!"
+msgid "Submodule '%s' (%s) registered for path '%s'\n"
msgstr ""
-#: builtin/remote.c:1287
+#: builtin/submodule--helper.c:669
#, c-format
-msgid " %s has become dangling!"
+msgid "warning: command update mode suggested for submodule '%s'\n"
msgstr ""
-#: builtin/remote.c:1297
+#: builtin/submodule--helper.c:676
#, c-format
-msgid "Pruning %s"
+msgid "Failed to register update mode for submodule path '%s'"
msgstr ""
-#: builtin/remote.c:1298
+#: builtin/submodule--helper.c:698
+msgid "Suppress output for initializing a submodule"
+msgstr ""
+
+#: builtin/submodule--helper.c:703
+msgid "git submodule--helper init [<path>]"
+msgstr ""
+
+#: builtin/submodule--helper.c:775 builtin/submodule--helper.c:901
#, c-format
-msgid "URL: %s"
+msgid "no submodule mapping found in .gitmodules for path '%s'"
msgstr ""
-#: builtin/remote.c:1314
+#: builtin/submodule--helper.c:814
#, c-format
-msgid " * [would prune] %s"
+msgid "could not resolve HEAD ref inside the submodule '%s'"
msgstr ""
-#: builtin/remote.c:1317
+#: builtin/submodule--helper.c:841 builtin/submodule--helper.c:1010
#, c-format
-msgid " * [pruned] %s"
+msgid "failed to recurse into submodule '%s'"
msgstr ""
-#: builtin/remote.c:1362
-msgid "prune remotes after fetching"
+#: builtin/submodule--helper.c:865 builtin/submodule--helper.c:1176
+msgid "Suppress submodule status output"
msgstr ""
-#: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547
-#, c-format
-msgid "No such remote '%s'"
+#: builtin/submodule--helper.c:866
+msgid ""
+"Use commit stored in the index instead of the one stored in the submodule "
+"HEAD"
msgstr ""
-#: builtin/remote.c:1441
-msgid "add branch"
+#: builtin/submodule--helper.c:867
+msgid "recurse into nested submodules"
msgstr ""
-#: builtin/remote.c:1448
-msgid "no remote specified"
+#: builtin/submodule--helper.c:872
+msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
msgstr ""
-#: builtin/remote.c:1465
-msgid "query push URLs rather than fetch URLs"
+#: builtin/submodule--helper.c:896
+msgid "git submodule--helper name <path>"
msgstr ""
-#: builtin/remote.c:1467
-msgid "return all URLs"
+#: builtin/submodule--helper.c:960
+#, c-format
+msgid "Synchronizing submodule url for '%s'\n"
msgstr ""
-#: builtin/remote.c:1495
+#: builtin/submodule--helper.c:966
#, c-format
-msgid "no URLs configured for remote '%s'"
+msgid "failed to register url for submodule path '%s'"
msgstr ""
-#: builtin/remote.c:1521
-msgid "manipulate push URLs"
+#: builtin/submodule--helper.c:980
+#, c-format
+msgid "failed to get the default remote for submodule '%s'"
msgstr ""
-#: builtin/remote.c:1523
-msgid "add URL"
+#: builtin/submodule--helper.c:991
+#, c-format
+msgid "failed to update remote for submodule '%s'"
msgstr ""
-#: builtin/remote.c:1525
-msgid "delete URLs"
+#: builtin/submodule--helper.c:1038
+msgid "Suppress output of synchronizing submodule url"
msgstr ""
-#: builtin/remote.c:1532
-msgid "--add --delete doesn't make sense"
+#: builtin/submodule--helper.c:1045
+msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
msgstr ""
-#: builtin/remote.c:1573
+#: builtin/submodule--helper.c:1099
#, c-format
-msgid "Invalid old URL pattern: %s"
+msgid ""
+"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
+"really want to remove it including all of its history)"
msgstr ""
-#: builtin/remote.c:1581
+#: builtin/submodule--helper.c:1111
#, c-format
-msgid "No such URL found: %s"
+msgid ""
+"Submodule work tree '%s' contains local modifications; use '-f' to discard "
+"them"
msgstr ""
-#: builtin/remote.c:1583
-msgid "Will not delete all non-push URLs"
+#: builtin/submodule--helper.c:1119
+#, c-format
+msgid "Cleared directory '%s'\n"
msgstr ""
-#: builtin/remote.c:1597
-msgid "be verbose; must be placed before a subcommand"
+#: builtin/submodule--helper.c:1121
+#, c-format
+msgid "Could not remove submodule work tree '%s'\n"
msgstr ""
-#: builtin/remote.c:1628
+#: builtin/submodule--helper.c:1132
#, c-format
-msgid "Unknown subcommand: %s"
+msgid "could not create empty submodule directory %s"
msgstr ""
-#: builtin/repack.c:18
-msgid "git repack [<options>]"
+#: builtin/submodule--helper.c:1148
+#, c-format
+msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
msgstr ""
-#: builtin/repack.c:23
-msgid ""
-"Incremental repacks are incompatible with bitmap indexes. Use\n"
-"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
+#: builtin/submodule--helper.c:1177
+msgid "Remove submodule working trees even if they contain local changes"
msgstr ""
-#: builtin/repack.c:168
-msgid "pack everything in a single pack"
+#: builtin/submodule--helper.c:1178
+msgid "Unregister all submodules"
msgstr ""
-#: builtin/repack.c:170
-msgid "same as -a, and turn unreachable objects loose"
+#: builtin/submodule--helper.c:1183
+msgid ""
+"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
msgstr ""
-#: builtin/repack.c:173
-msgid "remove redundant packs, and run git-prune-packed"
+#: builtin/submodule--helper.c:1197
+msgid "Use '--all' if you really want to deinitialize all submodules"
msgstr ""
-#: builtin/repack.c:175
-msgid "pass --no-reuse-delta to git-pack-objects"
+#: builtin/submodule--helper.c:1290 builtin/submodule--helper.c:1293
+#, c-format
+msgid "submodule '%s' cannot add alternate: %s"
msgstr ""
-#: builtin/repack.c:177
-msgid "pass --no-reuse-object to git-pack-objects"
+#: builtin/submodule--helper.c:1329
+#, c-format
+msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
msgstr ""
-#: builtin/repack.c:179
-msgid "do not run git-update-server-info"
+#: builtin/submodule--helper.c:1336
+#, c-format
+msgid "Value '%s' for submodule.alternateLocation is not recognized"
msgstr ""
-#: builtin/repack.c:182
-msgid "pass --local to git-pack-objects"
+#: builtin/submodule--helper.c:1359
+msgid "where the new submodule will be cloned to"
msgstr ""
-#: builtin/repack.c:184
-msgid "write bitmap index"
+#: builtin/submodule--helper.c:1362
+msgid "name of the new submodule"
msgstr ""
-#: builtin/repack.c:185
-msgid "approxidate"
+#: builtin/submodule--helper.c:1365
+msgid "url where to clone the submodule from"
msgstr ""
-#: builtin/repack.c:186
-msgid "with -A, do not loosen objects older than this"
+#: builtin/submodule--helper.c:1373
+msgid "depth for shallow clones"
msgstr ""
-#: builtin/repack.c:188
-msgid "with -a, repack unreachable objects"
+#: builtin/submodule--helper.c:1376 builtin/submodule--helper.c:1751
+msgid "force cloning progress"
msgstr ""
-#: builtin/repack.c:190
-msgid "size of the window used for delta compression"
+#: builtin/submodule--helper.c:1381
+msgid ""
+"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
+"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
msgstr ""
-#: builtin/repack.c:191 builtin/repack.c:197
-msgid "bytes"
+#: builtin/submodule--helper.c:1412
+#, c-format
+msgid "clone of '%s' into submodule path '%s' failed"
msgstr ""
-#: builtin/repack.c:192
-msgid "same as the above, but limit memory size instead of entries count"
+#: builtin/submodule--helper.c:1426
+#, c-format
+msgid "could not get submodule directory for '%s'"
msgstr ""
-#: builtin/repack.c:194
-msgid "limits the maximum delta depth"
+#: builtin/submodule--helper.c:1492
+#, c-format
+msgid "Submodule path '%s' not initialized"
msgstr ""
-#: builtin/repack.c:196
-msgid "limits the maximum number of threads"
+#: builtin/submodule--helper.c:1496
+msgid "Maybe you want to use 'update --init'?"
msgstr ""
-#: builtin/repack.c:198
-msgid "maximum size of each packfile"
+#: builtin/submodule--helper.c:1525
+#, c-format
+msgid "Skipping unmerged submodule %s"
msgstr ""
-#: builtin/repack.c:200
-msgid "repack objects in packs marked with .keep"
+#: builtin/submodule--helper.c:1554
+#, c-format
+msgid "Skipping submodule '%s'"
msgstr ""
-#: builtin/repack.c:210
-msgid "cannot delete packs in a precious-objects repo"
+#: builtin/submodule--helper.c:1689
+#, c-format
+msgid "Failed to clone '%s'. Retry scheduled"
msgstr ""
-#: builtin/repack.c:214
-msgid "--keep-unreachable and -A are incompatible"
+#: builtin/submodule--helper.c:1700
+#, c-format
+msgid "Failed to clone '%s' a second time, aborting"
msgstr ""
-#: builtin/repack.c:406 builtin/worktree.c:116
-#, c-format
-msgid "failed to remove '%s'"
+#: builtin/submodule--helper.c:1730 builtin/submodule--helper.c:1953
+msgid "path into the working tree"
msgstr ""
-#: builtin/replace.c:20
-msgid "git replace [-f] <object> <replacement>"
+#: builtin/submodule--helper.c:1733
+msgid "path into the working tree, across nested submodule boundaries"
msgstr ""
-#: builtin/replace.c:21
-msgid "git replace [-f] --edit <object>"
+#: builtin/submodule--helper.c:1737
+msgid "rebase, merge, checkout or none"
msgstr ""
-#: builtin/replace.c:22
-msgid "git replace [-f] --graft <commit> [<parent>...]"
+#: builtin/submodule--helper.c:1743
+msgid "Create a shallow clone truncated to the specified number of revisions"
msgstr ""
-#: builtin/replace.c:23
-msgid "git replace -d <object>..."
+#: builtin/submodule--helper.c:1746
+msgid "parallel jobs"
msgstr ""
-#: builtin/replace.c:24
-msgid "git replace [--format=<format>] [-l [<pattern>]]"
+#: builtin/submodule--helper.c:1748
+msgid "whether the initial clone should follow the shallow recommendation"
msgstr ""
-#: builtin/replace.c:331 builtin/replace.c:369 builtin/replace.c:397
-#, c-format
-msgid "Not a valid object name: '%s'"
+#: builtin/submodule--helper.c:1749
+msgid "don't print cloning progress"
msgstr ""
-#: builtin/replace.c:361
-#, c-format
-msgid "bad mergetag in commit '%s'"
+#: builtin/submodule--helper.c:1756
+msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
msgstr ""
-#: builtin/replace.c:363
-#, c-format
-msgid "malformed mergetag in commit '%s'"
+#: builtin/submodule--helper.c:1769
+msgid "bad value for update parameter"
msgstr ""
-#: builtin/replace.c:374
+#: builtin/submodule--helper.c:1837
#, c-format
msgid ""
-"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
-"instead of --graft"
+"Submodule (%s) branch configured to inherit branch from superproject, but "
+"the superproject is not on any branch"
msgstr ""
-#: builtin/replace.c:407
-#, c-format
-msgid "the original commit '%s' has a gpg signature."
+#: builtin/submodule--helper.c:1954
+msgid "recurse into submodules"
msgstr ""
-#: builtin/replace.c:408
-msgid "the signature will be removed in the replacement commit!"
+#: builtin/submodule--helper.c:1960
+msgid "git submodule--helper embed-git-dir [<path>...]"
msgstr ""
-#: builtin/replace.c:414
+#: builtin/submodule--helper.c:2071
#, c-format
-msgid "could not write replacement commit for: '%s'"
+msgid "%s doesn't support --super-prefix"
msgstr ""
-#: builtin/replace.c:438
-msgid "list replace refs"
+#: builtin/submodule--helper.c:2077
+#, c-format
+msgid "'%s' is not a valid submodule--helper subcommand"
msgstr ""
-#: builtin/replace.c:439
-msgid "delete replace refs"
+#: builtin/symbolic-ref.c:8
+msgid "git symbolic-ref [<options>] <name> [<ref>]"
msgstr ""
-#: builtin/replace.c:440
-msgid "edit existing object"
+#: builtin/symbolic-ref.c:9
+msgid "git symbolic-ref -d [-q] <name>"
msgstr ""
-#: builtin/replace.c:441
-msgid "change a commit's parents"
+#: builtin/symbolic-ref.c:40
+msgid "suppress error message for non-symbolic (detached) refs"
msgstr ""
-#: builtin/replace.c:442
-msgid "replace the ref if it exists"
+#: builtin/symbolic-ref.c:41
+msgid "delete symbolic ref"
msgstr ""
-#: builtin/replace.c:443
-msgid "do not pretty-print contents for --edit"
+#: builtin/symbolic-ref.c:42
+msgid "shorten ref output"
msgstr ""
-#: builtin/replace.c:444
-msgid "use this format"
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363
+msgid "reason"
msgstr ""
-#: builtin/rerere.c:13
-msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363
+msgid "reason of the update"
msgstr ""
-#: builtin/rerere.c:59
-msgid "register clean resolutions in index"
+#: builtin/tag.c:25
+msgid ""
+"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
+"[<head>]"
msgstr ""
-#: builtin/reset.c:29
-msgid ""
-"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
+#: builtin/tag.c:26
+msgid "git tag -d <tagname>..."
msgstr ""
-#: builtin/reset.c:30
-msgid "git reset [-q] [<tree-ish>] [--] <paths>..."
+#: builtin/tag.c:27
+msgid ""
+"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
+"points-at <object>]\n"
+"\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]"
msgstr ""
-#: builtin/reset.c:31
-msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
+#: builtin/tag.c:29
+msgid "git tag -v [--format=<format>] <tagname>..."
msgstr ""
-#: builtin/reset.c:37
-msgid "mixed"
+#: builtin/tag.c:87
+#, c-format
+msgid "tag '%s' not found."
msgstr ""
-#: builtin/reset.c:37
-msgid "soft"
+#: builtin/tag.c:103
+#, c-format
+msgid "Deleted tag '%s' (was %s)\n"
msgstr ""
-#: builtin/reset.c:37
-msgid "hard"
+#: builtin/tag.c:133
+#, c-format
+msgid ""
+"\n"
+"Write a message for tag:\n"
+" %s\n"
+"Lines starting with '%c' will be ignored.\n"
msgstr ""
-#: builtin/reset.c:37
-msgid "merge"
+#: builtin/tag.c:137
+#, 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"
msgstr ""
-#: builtin/reset.c:37
-msgid "keep"
+#: builtin/tag.c:191
+msgid "unable to sign the tag"
msgstr ""
-#: builtin/reset.c:77
-msgid "You do not have a valid HEAD."
+#: builtin/tag.c:193
+msgid "unable to write tag file"
msgstr ""
-#: builtin/reset.c:79
-msgid "Failed to find tree of HEAD."
+#: builtin/tag.c:218
+msgid "bad object type."
msgstr ""
-#: builtin/reset.c:85
-#, c-format
-msgid "Failed to find tree of %s."
+#: builtin/tag.c:267
+msgid "no tag message?"
msgstr ""
-#: builtin/reset.c:103
+#: builtin/tag.c:274
#, c-format
-msgid "HEAD is now at %s"
+msgid "The tag message has been left in %s\n"
msgstr ""
-#: builtin/reset.c:186
-#, c-format
-msgid "Cannot do a %s reset in the middle of a merge."
+#: builtin/tag.c:383
+msgid "list tag names"
msgstr ""
-#: builtin/reset.c:286
-msgid "be quiet, only report errors"
+#: builtin/tag.c:385
+msgid "print <n> lines of each tag message"
msgstr ""
-#: builtin/reset.c:288
-msgid "reset HEAD and index"
+#: builtin/tag.c:387
+msgid "delete tags"
msgstr ""
-#: builtin/reset.c:289
-msgid "reset only HEAD"
+#: builtin/tag.c:388
+msgid "verify tags"
msgstr ""
-#: builtin/reset.c:291 builtin/reset.c:293
-msgid "reset HEAD, index and working tree"
+#: builtin/tag.c:390
+msgid "Tag creation options"
msgstr ""
-#: builtin/reset.c:295
-msgid "reset HEAD but keep local changes"
+#: builtin/tag.c:392
+msgid "annotated tag, needs a message"
msgstr ""
-#: builtin/reset.c:301
-msgid "record only the fact that removed paths will be added later"
+#: builtin/tag.c:394
+msgid "tag message"
msgstr ""
-#: builtin/reset.c:320
-#, c-format
-msgid "Failed to resolve '%s' as a valid revision."
+#: builtin/tag.c:396
+msgid "force edit of tag message"
msgstr ""
-#: builtin/reset.c:328
-#, c-format
-msgid "Failed to resolve '%s' as a valid tree."
+#: builtin/tag.c:397
+msgid "annotated and GPG-signed tag"
msgstr ""
-#: builtin/reset.c:337
-msgid "--patch is incompatible with --{hard,mixed,soft}"
+#: builtin/tag.c:401
+msgid "use another key to sign the tag"
msgstr ""
-#: builtin/reset.c:346
-msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
+#: builtin/tag.c:402
+msgid "replace the tag if exists"
msgstr ""
-#: builtin/reset.c:348
-#, c-format
-msgid "Cannot do %s reset with paths."
+#: builtin/tag.c:403 builtin/update-ref.c:369
+msgid "create a reflog"
msgstr ""
-#: builtin/reset.c:358
-#, c-format
-msgid "%s reset is not allowed in a bare repository"
+#: builtin/tag.c:405
+msgid "Tag listing options"
msgstr ""
-#: builtin/reset.c:362
-msgid "-N can only be used with --mixed"
+#: builtin/tag.c:406
+msgid "show tag list in columns"
msgstr ""
-#: builtin/reset.c:379
-msgid "Unstaged changes after reset:"
+#: builtin/tag.c:407 builtin/tag.c:409
+msgid "print only tags that contain the commit"
msgstr ""
-#: builtin/reset.c:385
-#, c-format
-msgid "Could not reset index file to revision '%s'."
+#: builtin/tag.c:408 builtin/tag.c:410
+msgid "print only tags that don't contain the commit"
msgstr ""
-#: builtin/reset.c:389
-msgid "Could not write new index file."
+#: builtin/tag.c:411
+msgid "print only tags that are merged"
msgstr ""
-#: builtin/rev-list.c:358
-msgid "rev-list does not support display of notes"
+#: builtin/tag.c:412
+msgid "print only tags that are not merged"
msgstr ""
-#: builtin/rev-parse.c:394
-msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
+#: builtin/tag.c:417
+msgid "print only tags of the object"
msgstr ""
-#: builtin/rev-parse.c:399
-msgid "keep the `--` passed as an arg"
+#: builtin/tag.c:461
+msgid "--column and -n are incompatible"
msgstr ""
-#: builtin/rev-parse.c:401
-msgid "stop parsing after the first non-option argument"
+#: builtin/tag.c:483
+msgid "-n option is only allowed in list mode"
msgstr ""
-#: builtin/rev-parse.c:404
-msgid "output in stuck long form"
+#: builtin/tag.c:485
+msgid "--contains option is only allowed in list mode"
msgstr ""
-#: builtin/rev-parse.c:535
-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:487
+msgid "--no-contains option is only allowed in list mode"
msgstr ""
-#: builtin/revert.c:23
-msgid "git revert [<options>] <commit-ish>..."
+#: builtin/tag.c:489
+msgid "--points-at option is only allowed in list mode"
msgstr ""
-#: builtin/revert.c:24
-msgid "git revert <subcommand>"
+#: builtin/tag.c:491
+msgid "--merged and --no-merged options are only allowed in list mode"
msgstr ""
-#: builtin/revert.c:29
-msgid "git cherry-pick [<options>] <commit-ish>..."
+#: builtin/tag.c:502
+msgid "only one -F or -m option is allowed."
msgstr ""
-#: builtin/revert.c:30
-msgid "git cherry-pick <subcommand>"
+#: builtin/tag.c:521
+msgid "too many params"
msgstr ""
-#: builtin/revert.c:90
+#: builtin/tag.c:527
#, c-format
-msgid "%s: %s cannot be used with %s"
+msgid "'%s' is not a valid tag name."
msgstr ""
-#: builtin/revert.c:99
-msgid "end revert or cherry-pick sequence"
+#: builtin/tag.c:532
+#, c-format
+msgid "tag '%s' already exists"
msgstr ""
-#: builtin/revert.c:100
-msgid "resume revert or cherry-pick sequence"
+#: builtin/tag.c:563
+#, c-format
+msgid "Updated tag '%s' (was %s)\n"
msgstr ""
-#: builtin/revert.c:101
-msgid "cancel revert or cherry-pick sequence"
+#: builtin/unpack-objects.c:500
+msgid "Unpacking objects"
msgstr ""
-#: builtin/revert.c:102
-msgid "don't automatically commit"
+#: builtin/update-index.c:82
+#, c-format
+msgid "failed to create directory %s"
msgstr ""
-#: builtin/revert.c:103
-msgid "edit the commit message"
+#: builtin/update-index.c:98
+#, c-format
+msgid "failed to create file %s"
msgstr ""
-#: builtin/revert.c:106
-msgid "parent-number"
+#: builtin/update-index.c:106
+#, c-format
+msgid "failed to delete file %s"
msgstr ""
-#: builtin/revert.c:107
-msgid "select mainline parent"
+#: builtin/update-index.c:113 builtin/update-index.c:219
+#, c-format
+msgid "failed to delete directory %s"
msgstr ""
-#: builtin/revert.c:109
-msgid "merge strategy"
+#: builtin/update-index.c:138
+#, c-format
+msgid "Testing mtime in '%s' "
msgstr ""
-#: builtin/revert.c:110
-msgid "option"
+#: builtin/update-index.c:152
+msgid "directory stat info does not change after adding a new file"
msgstr ""
-#: builtin/revert.c:111
-msgid "option for merge strategy"
+#: builtin/update-index.c:165
+msgid "directory stat info does not change after adding a new directory"
msgstr ""
-#: builtin/revert.c:120
-msgid "append commit name"
+#: builtin/update-index.c:178
+msgid "directory stat info changes after updating a file"
msgstr ""
-#: builtin/revert.c:122
-msgid "preserve initially empty commits"
+#: builtin/update-index.c:189
+msgid "directory stat info changes after adding a file inside subdirectory"
msgstr ""
-#: builtin/revert.c:123
-msgid "allow commits with empty messages"
+#: builtin/update-index.c:200
+msgid "directory stat info does not change after deleting a file"
msgstr ""
-#: builtin/revert.c:124
-msgid "keep redundant, empty commits"
+#: builtin/update-index.c:213
+msgid "directory stat info does not change after deleting a directory"
msgstr ""
-#: builtin/revert.c:212
-msgid "revert failed"
+#: builtin/update-index.c:220
+msgid " OK"
msgstr ""
-#: builtin/revert.c:225
-msgid "cherry-pick failed"
+#: builtin/update-index.c:588
+msgid "git update-index [<options>] [--] [<file>...]"
msgstr ""
-#: builtin/rm.c:18
-msgid "git rm [<options>] [--] <file>..."
+#: builtin/update-index.c:944
+msgid "continue refresh even when index needs update"
msgstr ""
-#: builtin/rm.c:206
-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:211
-msgid ""
-"\n"
-"(use -f to force removal)"
+#: builtin/update-index.c:947
+msgid "refresh: ignore submodules"
msgstr ""
-#: builtin/rm.c:215
-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:219 builtin/rm.c:228
-msgid ""
-"\n"
-"(use --cached to keep the file, or -f to force removal)"
+#: builtin/update-index.c:950
+msgid "do not ignore new files"
msgstr ""
-#: builtin/rm.c:225
-msgid "the following file has local modifications:"
-msgid_plural "the following files have local modifications:"
-msgstr[0] ""
-msgstr[1] ""
+#: builtin/update-index.c:952
+msgid "let files replace directories and vice-versa"
+msgstr ""
-#: builtin/rm.c:243
-msgid "do not list removed files"
+#: builtin/update-index.c:954
+msgid "notice files missing from worktree"
msgstr ""
-#: builtin/rm.c:244
-msgid "only remove from the index"
+#: builtin/update-index.c:956
+msgid "refresh even if index contains unmerged entries"
msgstr ""
-#: builtin/rm.c:245
-msgid "override the up-to-date check"
+#: builtin/update-index.c:959
+msgid "refresh stat information"
msgstr ""
-#: builtin/rm.c:246
-msgid "allow recursive removal"
+#: builtin/update-index.c:963
+msgid "like --refresh, but ignore assume-unchanged setting"
msgstr ""
-#: builtin/rm.c:248
-msgid "exit with a zero status even if nothing matched"
+#: builtin/update-index.c:967
+msgid "<mode>,<object>,<path>"
msgstr ""
-#: builtin/rm.c:308
-#, c-format
-msgid "not removing '%s' recursively without -r"
+#: builtin/update-index.c:968
+msgid "add the specified entry to the index"
msgstr ""
-#: builtin/rm.c:347
-#, c-format
-msgid "git rm: unable to remove %s"
+#: builtin/update-index.c:977
+msgid "mark files as \"not changing\""
msgstr ""
-#: builtin/rm.c:370
-#, c-format
-msgid "could not remove '%s'"
+#: builtin/update-index.c:980
+msgid "clear assumed-unchanged bit"
msgstr ""
-#: builtin/send-pack.c:19
-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:983
+msgid "mark files as \"index-only\""
msgstr ""
-#: builtin/send-pack.c:162
-msgid "remote name"
+#: builtin/update-index.c:986
+msgid "clear skip-worktree bit"
msgstr ""
-#: builtin/send-pack.c:176
-msgid "use stateless RPC protocol"
+#: builtin/update-index.c:989
+msgid "add to index only; do not add content to object database"
msgstr ""
-#: builtin/send-pack.c:177
-msgid "read refs from stdin"
+#: builtin/update-index.c:991
+msgid "remove named paths even if present in worktree"
msgstr ""
-#: builtin/send-pack.c:178
-msgid "print status from remote helper"
+#: builtin/update-index.c:993
+msgid "with --stdin: input lines are terminated by null bytes"
msgstr ""
-#: builtin/shortlog.c:14
-msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
+#: builtin/update-index.c:995
+msgid "read list of paths to be updated from standard input"
msgstr ""
-#: builtin/shortlog.c:249
-msgid "Group by committer rather than author"
+#: builtin/update-index.c:999
+msgid "add entries from standard input to the index"
msgstr ""
-#: builtin/shortlog.c:251
-msgid "sort output according to the number of commits per author"
+#: builtin/update-index.c:1003
+msgid "repopulate stages #2 and #3 for the listed paths"
msgstr ""
-#: builtin/shortlog.c:253
-msgid "Suppress commit descriptions, only provides commit count"
+#: builtin/update-index.c:1007
+msgid "only update entries that differ from HEAD"
msgstr ""
-#: builtin/shortlog.c:255
-msgid "Show the email address of each author"
+#: builtin/update-index.c:1011
+msgid "ignore files missing from worktree"
msgstr ""
-#: builtin/shortlog.c:256
-msgid "w[,i1[,i2]]"
+#: builtin/update-index.c:1014
+msgid "report actions to standard output"
msgstr ""
-#: builtin/shortlog.c:257
-msgid "Linewrap output"
+#: builtin/update-index.c:1016
+msgid "(for porcelains) forget saved unresolved conflicts"
msgstr ""
-#: builtin/show-branch.c:12
-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:1020
+msgid "write index in this format"
msgstr ""
-#: builtin/show-branch.c:16
-msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
+#: builtin/update-index.c:1022
+msgid "enable or disable split index"
msgstr ""
-#: builtin/show-branch.c:376
-#, 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/update-index.c:1024
+msgid "enable/disable untracked cache"
+msgstr ""
-#: builtin/show-branch.c:530
-#, c-format
-msgid "no matching refs with %s"
+#: builtin/update-index.c:1026
+msgid "test if the filesystem supports untracked cache"
msgstr ""
-#: builtin/show-branch.c:626
-msgid "show remote-tracking and local branches"
+#: builtin/update-index.c:1028
+msgid "enable untracked cache without testing the filesystem"
msgstr ""
-#: builtin/show-branch.c:628
-msgid "show remote-tracking branches"
+#: builtin/update-index.c:1030
+msgid "write out the index even if is not flagged as changed"
msgstr ""
-#: builtin/show-branch.c:630
-msgid "color '*!+-' corresponding to the branch"
+#: builtin/update-index.c:1032
+msgid "enable or disable file system monitor"
msgstr ""
-#: builtin/show-branch.c:632
-msgid "show <n> more commits after the common ancestor"
+#: builtin/update-index.c:1034
+msgid "mark files as fsmonitor valid"
msgstr ""
-#: builtin/show-branch.c:634
-msgid "synonym to more=-1"
+#: builtin/update-index.c:1037
+msgid "clear fsmonitor valid bit"
msgstr ""
-#: builtin/show-branch.c:635
-msgid "suppress naming strings"
+#: builtin/update-index.c:1136
+msgid ""
+"core.splitIndex is set to false; remove or change it, if you really want to "
+"enable split index"
msgstr ""
-#: builtin/show-branch.c:637
-msgid "include the current branch"
+#: builtin/update-index.c:1145
+msgid ""
+"core.splitIndex is set to true; remove or change it, if you really want to "
+"disable split index"
msgstr ""
-#: builtin/show-branch.c:639
-msgid "name commits with their object names"
+#: builtin/update-index.c:1156
+msgid ""
+"core.untrackedCache is set to true; remove or change it, if you really want "
+"to disable the untracked cache"
msgstr ""
-#: builtin/show-branch.c:641
-msgid "show possible merge bases"
+#: builtin/update-index.c:1160
+msgid "Untracked cache disabled"
msgstr ""
-#: builtin/show-branch.c:643
-msgid "show refs unreachable from any other ref"
+#: builtin/update-index.c:1168
+msgid ""
+"core.untrackedCache is set to false; remove or change it, if you really want "
+"to enable the untracked cache"
msgstr ""
-#: builtin/show-branch.c:645
-msgid "show commits in topological order"
+#: builtin/update-index.c:1172
+#, c-format
+msgid "Untracked cache enabled for '%s'"
msgstr ""
-#: builtin/show-branch.c:648
-msgid "show only commits not on the first branch"
+#: builtin/update-index.c:1180
+msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
msgstr ""
-#: builtin/show-branch.c:650
-msgid "show merges reachable from only one tip"
+#: builtin/update-index.c:1184
+msgid "fsmonitor enabled"
msgstr ""
-#: builtin/show-branch.c:652
-msgid "topologically sort, maintaining date order where possible"
+#: builtin/update-index.c:1187
+msgid ""
+"core.fsmonitor is set; remove it if you really want to disable fsmonitor"
msgstr ""
-#: builtin/show-branch.c:655
-msgid "<n>[,<base>]"
+#: builtin/update-index.c:1191
+msgid "fsmonitor disabled"
msgstr ""
-#: builtin/show-branch.c:656
-msgid "show <n> most recent ref-log entries starting at base"
+#: builtin/update-ref.c:10
+msgid "git update-ref [<options>] -d <refname> [<old-val>]"
msgstr ""
-#: builtin/show-branch.c:690
-msgid ""
-"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
+#: builtin/update-ref.c:11
+msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]"
msgstr ""
-#: builtin/show-branch.c:714
-msgid "no branches given, and HEAD is not valid"
+#: builtin/update-ref.c:12
+msgid "git update-ref [<options>] --stdin [-z]"
msgstr ""
-#: builtin/show-branch.c:717
-msgid "--reflog option needs one branch name"
+#: builtin/update-ref.c:364
+msgid "delete the reference"
msgstr ""
-#: builtin/show-branch.c:720
-#, 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/update-ref.c:366
+msgid "update <refname> not the one it points to"
+msgstr ""
-#: builtin/show-branch.c:724
-#, c-format
-msgid "no such ref %s"
+#: builtin/update-ref.c:367
+msgid "stdin has NUL-terminated arguments"
msgstr ""
-#: builtin/show-branch.c:808
-#, c-format
-msgid "cannot handle more than %d rev."
-msgid_plural "cannot handle more than %d revs."
-msgstr[0] ""
-msgstr[1] ""
+#: builtin/update-ref.c:368
+msgid "read updates from stdin"
+msgstr ""
-#: builtin/show-branch.c:812
-#, c-format
-msgid "'%s' is not a valid ref."
+#: builtin/update-server-info.c:7
+msgid "git update-server-info [--force]"
msgstr ""
-#: builtin/show-branch.c:815
-#, c-format
-msgid "cannot find commit %s (%s)"
+#: builtin/update-server-info.c:15
+msgid "update the info files from scratch"
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/upload-pack.c:11
+msgid "git upload-pack [<options>] <dir>"
msgstr ""
-#: builtin/show-ref.c:11
-msgid "git show-ref --exclude-existing[=<pattern>]"
+#: builtin/upload-pack.c:25
+msgid "exit immediately after initial ref advertisement"
msgstr ""
-#: builtin/show-ref.c:159
-msgid "only show tags (can be combined with heads)"
+#: builtin/upload-pack.c:27
+msgid "do not try <directory>/.git/ if <directory> is no Git directory"
msgstr ""
-#: builtin/show-ref.c:160
-msgid "only show heads (can be combined with tags)"
+#: builtin/upload-pack.c:29
+msgid "interrupt transfer after <n> seconds of inactivity"
msgstr ""
-#: builtin/show-ref.c:161
-msgid "stricter reference checking, requires exact ref path"
+#: builtin/verify-commit.c:20
+msgid "git verify-commit [-v | --verbose] <commit>..."
msgstr ""
-#: builtin/show-ref.c:164 builtin/show-ref.c:166
-msgid "show the HEAD reference, even if it would be filtered out"
+#: builtin/verify-commit.c:76
+msgid "print commit contents"
msgstr ""
-#: builtin/show-ref.c:168
-msgid "dereference tags into object IDs"
+#: builtin/verify-commit.c:77 builtin/verify-tag.c:38
+msgid "print raw gpg status output"
msgstr ""
-#: builtin/show-ref.c:170
-msgid "only show SHA1 hash using <n> digits"
+#: builtin/verify-pack.c:55
+msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
msgstr ""
-#: builtin/show-ref.c:174
-msgid "do not print results to stdout (useful with --verify)"
+#: builtin/verify-pack.c:65
+msgid "verbose"
msgstr ""
-#: builtin/show-ref.c:176
-msgid "show refs from stdin that aren't in local repository"
+#: builtin/verify-pack.c:67
+msgid "show statistics only"
msgstr ""
-#: builtin/stripspace.c:18
-msgid "git stripspace [-s | --strip-comments]"
+#: builtin/verify-tag.c:19
+msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
msgstr ""
-#: builtin/stripspace.c:19
-msgid "git stripspace [-c | --comment-lines]"
+#: builtin/verify-tag.c:37
+msgid "print tag contents"
msgstr ""
-#: builtin/stripspace.c:36
-msgid "skip and remove all lines starting with comment character"
+#: builtin/worktree.c:17
+msgid "git worktree add [<options>] <path> [<commit-ish>]"
msgstr ""
-#: builtin/stripspace.c:39
-msgid "prepend comment character and space to each line"
+#: builtin/worktree.c:18
+msgid "git worktree list [<options>]"
msgstr ""
-#: builtin/submodule--helper.c:25 builtin/submodule--helper.c:1075
-#, c-format
-msgid "No such ref: %s"
+#: builtin/worktree.c:19
+msgid "git worktree lock [<options>] <path>"
msgstr ""
-#: builtin/submodule--helper.c:32 builtin/submodule--helper.c:1084
-#, c-format
-msgid "Expecting a full ref name, got %s"
+#: builtin/worktree.c:20
+msgid "git worktree move <worktree> <new-path>"
msgstr ""
-#: builtin/submodule--helper.c:72
-#, c-format
-msgid "cannot strip one component off url '%s'"
+#: builtin/worktree.c:21
+msgid "git worktree prune [<options>]"
msgstr ""
-#: builtin/submodule--helper.c:305 builtin/submodule--helper.c:630
-msgid "alternative anchor for relative paths"
+#: builtin/worktree.c:22
+msgid "git worktree remove [<options>] <worktree>"
msgstr ""
-#: builtin/submodule--helper.c:310
-msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
+#: builtin/worktree.c:23
+msgid "git worktree unlock <path>"
msgstr ""
-#: builtin/submodule--helper.c:356 builtin/submodule--helper.c:380
+#: builtin/worktree.c:59
#, c-format
-msgid "No url found for submodule path '%s' in .gitmodules"
+msgid "Removing worktrees/%s: not a valid directory"
msgstr ""
-#: builtin/submodule--helper.c:395
+#: builtin/worktree.c:65
#, c-format
-msgid ""
-"could not lookup configuration '%s'. Assuming this repository is its own "
-"authoritative upstream."
+msgid "Removing worktrees/%s: gitdir file does not exist"
msgstr ""
-#: builtin/submodule--helper.c:406
+#: builtin/worktree.c:70 builtin/worktree.c:79
#, c-format
-msgid "Failed to register url for submodule path '%s'"
+msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
msgstr ""
-#: builtin/submodule--helper.c:410
+#: builtin/worktree.c:89
#, c-format
-msgid "Submodule '%s' (%s) registered for path '%s'\n"
+msgid ""
+"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
+"%<PRIuMAX>)"
msgstr ""
-#: builtin/submodule--helper.c:420
+#: builtin/worktree.c:97
#, c-format
-msgid "warning: command update mode suggested for submodule '%s'\n"
+msgid "Removing worktrees/%s: invalid gitdir file"
msgstr ""
-#: builtin/submodule--helper.c:427
+#: builtin/worktree.c:106
#, c-format
-msgid "Failed to register update mode for submodule path '%s'"
+msgid "Removing worktrees/%s: gitdir file points to non-existent location"
msgstr ""
-#: builtin/submodule--helper.c:443
-msgid "Suppress output for initializing a submodule"
+#: builtin/worktree.c:153
+msgid "report pruned working trees"
msgstr ""
-#: builtin/submodule--helper.c:448
-msgid "git submodule--helper init [<path>]"
+#: builtin/worktree.c:155
+msgid "expire working trees older than <time>"
msgstr ""
-#: builtin/submodule--helper.c:476
-msgid "git submodule--helper name <path>"
+#: builtin/worktree.c:230
+#, c-format
+msgid "'%s' already exists"
msgstr ""
-#: builtin/submodule--helper.c:482
+#: builtin/worktree.c:261
#, c-format
-msgid "no submodule mapping found in .gitmodules for path '%s'"
+msgid "could not create directory of '%s'"
msgstr ""
-#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:568
+#: builtin/worktree.c:380 builtin/worktree.c:386
#, c-format
-msgid "submodule '%s' cannot add alternate: %s"
+msgid "Preparing worktree (new branch '%s')"
msgstr ""
-#: builtin/submodule--helper.c:604
+#: builtin/worktree.c:382
#, c-format
-msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
+msgid "Preparing worktree (resetting branch '%s'; was at %s)"
msgstr ""
-#: builtin/submodule--helper.c:611
+#: builtin/worktree.c:391
#, c-format
-msgid "Value '%s' for submodule.alternateLocation is not recognized"
+msgid "Preparing worktree (checking out '%s')"
msgstr ""
-#: builtin/submodule--helper.c:633
-msgid "where the new submodule will be cloned to"
+#: builtin/worktree.c:397
+#, c-format
+msgid "Preparing worktree (detached HEAD %s)"
msgstr ""
-#: builtin/submodule--helper.c:636
-msgid "name of the new submodule"
+#: builtin/worktree.c:438
+msgid "checkout <branch> even if already checked out in other worktree"
msgstr ""
-#: builtin/submodule--helper.c:639
-msgid "url where to clone the submodule from"
+#: builtin/worktree.c:441
+msgid "create a new branch"
msgstr ""
-#: builtin/submodule--helper.c:645
-msgid "depth for shallow clones"
+#: builtin/worktree.c:443
+msgid "create or reset a branch"
msgstr ""
-#: builtin/submodule--helper.c:648 builtin/submodule--helper.c:993
-msgid "force cloning progress"
+#: builtin/worktree.c:445
+msgid "populate the new working tree"
msgstr ""
-#: builtin/submodule--helper.c:653
-msgid ""
-"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
-"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
+#: builtin/worktree.c:446
+msgid "keep the new working tree locked"
msgstr ""
-#: builtin/submodule--helper.c:684
-#, c-format
-msgid "clone of '%s' into submodule path '%s' failed"
+#: builtin/worktree.c:449
+msgid "set up tracking mode (see git-branch(1))"
msgstr ""
-#: builtin/submodule--helper.c:699
-#, c-format
-msgid "could not get submodule directory for '%s'"
+#: builtin/worktree.c:452
+msgid "try to match the new branch name with a remote-tracking branch"
msgstr ""
-#: builtin/submodule--helper.c:764
-#, c-format
-msgid "Submodule path '%s' not initialized"
+#: builtin/worktree.c:460
+msgid "-b, -B, and --detach are mutually exclusive"
msgstr ""
-#: builtin/submodule--helper.c:768
-msgid "Maybe you want to use 'update --init'?"
+#: builtin/worktree.c:521
+msgid "--[no-]track can only be used if a new branch is created"
msgstr ""
-#: builtin/submodule--helper.c:793
-#, c-format
-msgid "Skipping unmerged submodule %s"
+#: builtin/worktree.c:621
+msgid "reason for locking"
msgstr ""
-#: builtin/submodule--helper.c:814
+#: builtin/worktree.c:633 builtin/worktree.c:666 builtin/worktree.c:720
+#: builtin/worktree.c:860
#, c-format
-msgid "Skipping submodule '%s'"
+msgid "'%s' is not a working tree"
msgstr ""
-#: builtin/submodule--helper.c:942
-#, c-format
-msgid "Failed to clone '%s'. Retry scheduled"
+#: builtin/worktree.c:635 builtin/worktree.c:668
+msgid "The main working tree cannot be locked or unlocked"
msgstr ""
-#: builtin/submodule--helper.c:953
+#: builtin/worktree.c:640
#, c-format
-msgid "Failed to clone '%s' a second time, aborting"
+msgid "'%s' is already locked, reason: %s"
msgstr ""
-#: builtin/submodule--helper.c:974 builtin/submodule--helper.c:1162
-msgid "path into the working tree"
+#: builtin/worktree.c:642
+#, c-format
+msgid "'%s' is already locked"
msgstr ""
-#: builtin/submodule--helper.c:977
-msgid "path into the working tree, across nested submodule boundaries"
+#: builtin/worktree.c:670
+#, c-format
+msgid "'%s' is not locked"
msgstr ""
-#: builtin/submodule--helper.c:981
-msgid "rebase, merge, checkout or none"
+#: builtin/worktree.c:695
+msgid "working trees containing submodules cannot be moved or removed"
msgstr ""
-#: builtin/submodule--helper.c:985
-msgid "Create a shallow clone truncated to the specified number of revisions"
+#: builtin/worktree.c:722 builtin/worktree.c:862
+#, c-format
+msgid "'%s' is a main working tree"
msgstr ""
-#: builtin/submodule--helper.c:988
-msgid "parallel jobs"
+#: builtin/worktree.c:727
+#, c-format
+msgid "could not figure out destination name from '%s'"
msgstr ""
-#: builtin/submodule--helper.c:990
-msgid "whether the initial clone should follow the shallow recommendation"
+#: builtin/worktree.c:733
+#, c-format
+msgid "target '%s' already exists"
msgstr ""
-#: builtin/submodule--helper.c:991
-msgid "don't print cloning progress"
+#: builtin/worktree.c:740
+#, c-format
+msgid "cannot move a locked working tree, lock reason: %s"
msgstr ""
-#: builtin/submodule--helper.c:998
-msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
+#: builtin/worktree.c:742
+msgid "cannot move a locked working tree"
msgstr ""
-#: builtin/submodule--helper.c:1008
-msgid "bad value for update parameter"
+#: builtin/worktree.c:745
+#, c-format
+msgid "validation failed, cannot move working tree: %s"
msgstr ""
-#: builtin/submodule--helper.c:1079
+#: builtin/worktree.c:750
#, c-format
-msgid ""
-"Submodule (%s) branch configured to inherit branch from superproject, but "
-"the superproject is not on any branch"
+msgid "failed to move '%s' to '%s'"
msgstr ""
-#: builtin/submodule--helper.c:1163
-msgid "recurse into submodules"
+#: builtin/worktree.c:798
+#, c-format
+msgid "failed to run 'git status' on '%s'"
msgstr ""
-#: builtin/submodule--helper.c:1169
-msgid "git submodule--helper embed-git-dir [<path>...]"
+#: builtin/worktree.c:802
+#, c-format
+msgid "'%s' is dirty, use --force to delete it"
msgstr ""
-#: builtin/submodule--helper.c:1232
+#: builtin/worktree.c:807
#, c-format
-msgid "%s doesn't support --super-prefix"
+msgid "failed to run 'git status' on '%s', code %d"
msgstr ""
-#: builtin/submodule--helper.c:1238
+#: builtin/worktree.c:818 builtin/worktree.c:832
#, c-format
-msgid "'%s' is not a valid submodule--helper subcommand"
+msgid "failed to delete '%s'"
msgstr ""
-#: builtin/symbolic-ref.c:8
-msgid "git symbolic-ref [<options>] <name> [<ref>]"
+#: builtin/worktree.c:844
+msgid "force removing even if the worktree is dirty"
msgstr ""
-#: builtin/symbolic-ref.c:9
-msgid "git symbolic-ref -d [-q] <name>"
+#: builtin/worktree.c:866
+#, c-format
+msgid "cannot remove a locked working tree, lock reason: %s"
msgstr ""
-#: builtin/symbolic-ref.c:41
-msgid "suppress error message for non-symbolic (detached) refs"
+#: builtin/worktree.c:868
+msgid "cannot remove a locked working tree"
msgstr ""
-#: builtin/symbolic-ref.c:42
-msgid "delete symbolic ref"
+#: builtin/worktree.c:871
+#, c-format
+msgid "validation failed, cannot remove working tree: %s"
msgstr ""
-#: builtin/symbolic-ref.c:43
-msgid "shorten ref output"
+#: builtin/write-tree.c:14
+msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
msgstr ""
-#: builtin/symbolic-ref.c:44 builtin/update-ref.c:363
-msgid "reason"
+#: builtin/write-tree.c:27
+msgid "<prefix>/"
msgstr ""
-#: builtin/symbolic-ref.c:44 builtin/update-ref.c:363
-msgid "reason of the update"
+#: builtin/write-tree.c:28
+msgid "write tree object for a subdirectory <prefix>"
+msgstr ""
+
+#: builtin/write-tree.c:30
+msgid "only useful for debugging"
msgstr ""
-#: builtin/tag.c:24
+#: credential-cache--daemon.c:222
+#, c-format
msgid ""
-"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
-"[<head>]"
+"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:25
-msgid "git tag -d <tagname>..."
+#: credential-cache--daemon.c:271
+msgid "print debugging messages to stderr"
msgstr ""
-#: builtin/tag.c:26
+#: git.c:27
msgid ""
-"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
-"points-at <object>]\n"
-"\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]"
+"git [--version] [--help] [-C <path>] [-c <name>=<value>]\n"
+" [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n"
+" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
+"bare]\n"
+" [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
+" <command> [<args>]"
msgstr ""
-#: builtin/tag.c:28
-msgid "git tag -v [--format=<format>] <tagname>..."
+#: git.c:34
+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:84
+#: git.c:173
#, c-format
-msgid "tag '%s' not found."
+msgid "no directory given for --git-dir\n"
msgstr ""
-#: builtin/tag.c:100
+#: git.c:187
#, c-format
-msgid "Deleted tag '%s' (was %s)\n"
+msgid "no namespace given for --namespace\n"
msgstr ""
-#: builtin/tag.c:129
+#: git.c:201
#, c-format
-msgid ""
-"\n"
-"Write a message for tag:\n"
-" %s\n"
-"Lines starting with '%c' will be ignored.\n"
+msgid "no directory given for --work-tree\n"
msgstr ""
-#: builtin/tag.c:133
+#: git.c:215
#, 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"
-msgstr ""
-
-#: builtin/tag.c:211
-msgid "unable to sign the tag"
+msgid "no prefix given for --super-prefix\n"
msgstr ""
-#: builtin/tag.c:213
-msgid "unable to write tag file"
+#: git.c:237
+#, c-format
+msgid "-c expects a configuration string\n"
msgstr ""
-#: builtin/tag.c:237
-msgid "bad object type."
+#: git.c:275
+#, c-format
+msgid "no directory given for -C\n"
msgstr ""
-#: builtin/tag.c:283
-msgid "no tag message?"
+#: git.c:300
+#, c-format
+msgid "unknown option: %s\n"
msgstr ""
-#: builtin/tag.c:290
+#: git.c:770
#, c-format
-msgid "The tag message has been left in %s\n"
+msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
msgstr ""
-#: builtin/tag.c:398
-msgid "list tag names"
+#: git.c:782
+#, c-format
+msgid "failed to run command '%s': %s\n"
msgstr ""
-#: builtin/tag.c:400
-msgid "print <n> lines of each tag message"
+#: http.c:348
+#, c-format
+msgid "negative value for http.postbuffer; defaulting to %d"
msgstr ""
-#: builtin/tag.c:402
-msgid "delete tags"
+#: http.c:369
+msgid "Delegation control is not supported with cURL < 7.22.0"
msgstr ""
-#: builtin/tag.c:403
-msgid "verify tags"
+#: http.c:378
+msgid "Public key pinning not supported with cURL < 7.44.0"
msgstr ""
-
-#: builtin/tag.c:405
-msgid "Tag creation options"
+
+#: http.c:1854
+#, c-format
+msgid ""
+"unable to update url base from redirection:\n"
+" asked for: %s\n"
+" redirect: %s"
msgstr ""
-#: builtin/tag.c:407
-msgid "annotated tag, needs a message"
+#: remote-curl.c:401
+#, c-format
+msgid "redirecting to %s"
msgstr ""
-#: builtin/tag.c:409
-msgid "tag message"
+#: list-objects-filter-options.h:59
+msgid "args"
msgstr ""
-#: builtin/tag.c:411
-msgid "annotated and GPG-signed tag"
+#: list-objects-filter-options.h:60
+msgid "object filtering"
msgstr ""
-#: builtin/tag.c:415
-msgid "use another key to sign the tag"
+#: parse-options.h:157
+msgid "expiry-date"
msgstr ""
-#: builtin/tag.c:416
-msgid "replace the tag if exists"
+#: parse-options.h:172
+msgid "no-op (backward compatibility)"
msgstr ""
-#: builtin/tag.c:417 builtin/update-ref.c:369
-msgid "create a reflog"
+#: parse-options.h:251
+msgid "be more verbose"
msgstr ""
-#: builtin/tag.c:419
-msgid "Tag listing options"
+#: parse-options.h:253
+msgid "be more quiet"
msgstr ""
-#: builtin/tag.c:420
-msgid "show tag list in columns"
+#: parse-options.h:259
+msgid "use <n> digits to display SHA-1s"
msgstr ""
-#: builtin/tag.c:421 builtin/tag.c:423
-msgid "print only tags that contain the commit"
+#: command-list.h:50
+msgid "Add file contents to the index"
msgstr ""
-#: builtin/tag.c:422 builtin/tag.c:424
-msgid "print only tags that don't contain the commit"
+#: command-list.h:51
+msgid "Apply a series of patches from a mailbox"
msgstr ""
-#: builtin/tag.c:425
-msgid "print only tags that are merged"
+#: command-list.h:52
+msgid "Annotate file lines with commit information"
msgstr ""
-#: builtin/tag.c:426
-msgid "print only tags that are not merged"
+#: command-list.h:53
+msgid "Apply a patch to files and/or to the index"
msgstr ""
-#: builtin/tag.c:431
-msgid "print only tags of the object"
+#: command-list.h:54
+msgid "Import an Arch repository into Git"
msgstr ""
-#: builtin/tag.c:470
-msgid "--column and -n are incompatible"
+#: command-list.h:55
+msgid "Create an archive of files from a named tree"
msgstr ""
-#: builtin/tag.c:492
-msgid "-n option is only allowed in list mode"
+#: command-list.h:56
+msgid "Use binary search to find the commit that introduced a bug"
msgstr ""
-#: builtin/tag.c:494
-msgid "--contains option is only allowed in list mode"
+#: command-list.h:57
+msgid "Show what revision and author last modified each line of a file"
msgstr ""
-#: builtin/tag.c:496
-msgid "--no-contains option is only allowed in list mode"
+#: command-list.h:58
+msgid "List, create, or delete branches"
msgstr ""
-#: builtin/tag.c:498
-msgid "--points-at option is only allowed in list mode"
+#: command-list.h:59
+msgid "Move objects and refs by archive"
msgstr ""
-#: builtin/tag.c:500
-msgid "--merged and --no-merged options are only allowed in list mode"
+#: command-list.h:60
+msgid "Provide content or type and size information for repository objects"
msgstr ""
-#: builtin/tag.c:511
-msgid "only one -F or -m option is allowed."
+#: command-list.h:61
+msgid "Display gitattributes information"
msgstr ""
-#: builtin/tag.c:530
-msgid "too many params"
+#: command-list.h:62
+msgid "Debug gitignore / exclude files"
msgstr ""
-#: builtin/tag.c:536
-#, c-format
-msgid "'%s' is not a valid tag name."
+#: command-list.h:63
+msgid "Show canonical names and email addresses of contacts"
msgstr ""
-#: builtin/tag.c:541
-#, c-format
-msgid "tag '%s' already exists"
+#: command-list.h:64
+msgid "Switch branches or restore working tree files"
msgstr ""
-#: builtin/tag.c:571
-#, c-format
-msgid "Updated tag '%s' (was %s)\n"
+#: command-list.h:65
+msgid "Copy files from the index to the working tree"
msgstr ""
-#: builtin/unpack-objects.c:494
-msgid "Unpacking objects"
+#: command-list.h:66
+msgid "Ensures that a reference name is well formed"
msgstr ""
-#: builtin/update-index.c:80
-#, c-format
-msgid "failed to create directory %s"
+#: command-list.h:67
+msgid "Find commits yet to be applied to upstream"
msgstr ""
-#: builtin/update-index.c:86
-#, c-format
-msgid "failed to stat %s"
+#: command-list.h:68
+msgid "Apply the changes introduced by some existing commits"
msgstr ""
-#: builtin/update-index.c:96
-#, c-format
-msgid "failed to create file %s"
+#: command-list.h:69
+msgid "Graphical alternative to git-commit"
msgstr ""
-#: builtin/update-index.c:104
-#, c-format
-msgid "failed to delete file %s"
+#: command-list.h:70
+msgid "Remove untracked files from the working tree"
msgstr ""
-#: builtin/update-index.c:111 builtin/update-index.c:217
-#, c-format
-msgid "failed to delete directory %s"
+#: command-list.h:71
+msgid "Clone a repository into a new directory"
msgstr ""
-#: builtin/update-index.c:136
-#, c-format
-msgid "Testing mtime in '%s' "
+#: command-list.h:72
+msgid "Display data in columns"
msgstr ""
-#: builtin/update-index.c:150
-msgid "directory stat info does not change after adding a new file"
+#: command-list.h:73
+msgid "Record changes to the repository"
msgstr ""
-#: builtin/update-index.c:163
-msgid "directory stat info does not change after adding a new directory"
+#: command-list.h:74
+msgid "Write and verify Git commit graph files"
msgstr ""
-#: builtin/update-index.c:176
-msgid "directory stat info changes after updating a file"
+#: command-list.h:75
+msgid "Create a new commit object"
msgstr ""
-#: builtin/update-index.c:187
-msgid "directory stat info changes after adding a file inside subdirectory"
+#: command-list.h:76
+msgid "Get and set repository or global options"
msgstr ""
-#: builtin/update-index.c:198
-msgid "directory stat info does not change after deleting a file"
+#: command-list.h:77
+msgid "Count unpacked number of objects and their disk consumption"
msgstr ""
-#: builtin/update-index.c:211
-msgid "directory stat info does not change after deleting a directory"
+#: command-list.h:78
+msgid "Retrieve and store user credentials"
msgstr ""
-#: builtin/update-index.c:218
-msgid " OK"
+#: command-list.h:79
+msgid "Helper to temporarily store passwords in memory"
msgstr ""
-#: builtin/update-index.c:569
-msgid "git update-index [<options>] [--] [<file>...]"
+#: command-list.h:80
+msgid "Helper to store credentials on disk"
msgstr ""
-#: builtin/update-index.c:924
-msgid "continue refresh even when index needs update"
+#: command-list.h:81
+msgid "Export a single commit to a CVS checkout"
msgstr ""
-#: builtin/update-index.c:927
-msgid "refresh: ignore submodules"
+#: command-list.h:82
+msgid "Salvage your data out of another SCM people love to hate"
msgstr ""
-#: builtin/update-index.c:930
-msgid "do not ignore new files"
+#: command-list.h:83
+msgid "A CVS server emulator for Git"
msgstr ""
-#: builtin/update-index.c:932
-msgid "let files replace directories and vice-versa"
+#: command-list.h:84
+msgid "A really simple server for Git repositories"
msgstr ""
-#: builtin/update-index.c:934
-msgid "notice files missing from worktree"
+#: command-list.h:85
+msgid "Give an object a human readable name based on an available ref"
msgstr ""
-#: builtin/update-index.c:936
-msgid "refresh even if index contains unmerged entries"
+#: command-list.h:86
+msgid "Show changes between commits, commit and working tree, etc"
msgstr ""
-#: builtin/update-index.c:939
-msgid "refresh stat information"
+#: command-list.h:87
+msgid "Compares files in the working tree and the index"
msgstr ""
-#: builtin/update-index.c:943
-msgid "like --refresh, but ignore assume-unchanged setting"
+#: command-list.h:88
+msgid "Compare a tree to the working tree or index"
msgstr ""
-#: builtin/update-index.c:947
-msgid "<mode>,<object>,<path>"
+#: command-list.h:89
+msgid "Compares the content and mode of blobs found via two tree objects"
msgstr ""
-#: builtin/update-index.c:948
-msgid "add the specified entry to the index"
+#: command-list.h:90
+msgid "Show changes using common diff tools"
msgstr ""
-#: builtin/update-index.c:957
-msgid "mark files as \"not changing\""
+#: command-list.h:91
+msgid "Git data exporter"
msgstr ""
-#: builtin/update-index.c:960
-msgid "clear assumed-unchanged bit"
+#: command-list.h:92
+msgid "Backend for fast Git data importers"
msgstr ""
-#: builtin/update-index.c:963
-msgid "mark files as \"index-only\""
+#: command-list.h:93
+msgid "Download objects and refs from another repository"
msgstr ""
-#: builtin/update-index.c:966
-msgid "clear skip-worktree bit"
+#: command-list.h:94
+msgid "Receive missing objects from another repository"
msgstr ""
-#: builtin/update-index.c:969
-msgid "add to index only; do not add content to object database"
+#: command-list.h:95
+msgid "Rewrite branches"
msgstr ""
-#: builtin/update-index.c:971
-msgid "remove named paths even if present in worktree"
+#: command-list.h:96
+msgid "Produce a merge commit message"
msgstr ""
-#: builtin/update-index.c:973
-msgid "with --stdin: input lines are terminated by null bytes"
+#: command-list.h:97
+msgid "Output information on each ref"
msgstr ""
-#: builtin/update-index.c:975
-msgid "read list of paths to be updated from standard input"
+#: command-list.h:98
+msgid "Prepare patches for e-mail submission"
msgstr ""
-#: builtin/update-index.c:979
-msgid "add entries from standard input to the index"
+#: command-list.h:99
+msgid "Verifies the connectivity and validity of the objects in the database"
msgstr ""
-#: builtin/update-index.c:983
-msgid "repopulate stages #2 and #3 for the listed paths"
+#: command-list.h:100
+msgid "Cleanup unnecessary files and optimize the local repository"
msgstr ""
-#: builtin/update-index.c:987
-msgid "only update entries that differ from HEAD"
+#: command-list.h:101
+msgid "Extract commit ID from an archive created using git-archive"
msgstr ""
-#: builtin/update-index.c:991
-msgid "ignore files missing from worktree"
+#: command-list.h:102
+msgid "Print lines matching a pattern"
msgstr ""
-#: builtin/update-index.c:994
-msgid "report actions to standard output"
+#: command-list.h:103
+msgid "A portable graphical interface to Git"
msgstr ""
-#: builtin/update-index.c:996
-msgid "(for porcelains) forget saved unresolved conflicts"
+#: command-list.h:104
+msgid "Compute object ID and optionally creates a blob from a file"
msgstr ""
-#: builtin/update-index.c:1000
-msgid "write index in this format"
+#: command-list.h:105
+msgid "Display help information about Git"
msgstr ""
-#: builtin/update-index.c:1002
-msgid "enable or disable split index"
+#: command-list.h:106
+msgid "Server side implementation of Git over HTTP"
msgstr ""
-#: builtin/update-index.c:1004
-msgid "enable/disable untracked cache"
+#: command-list.h:107
+msgid "Download from a remote Git repository via HTTP"
msgstr ""
-#: builtin/update-index.c:1006
-msgid "test if the filesystem supports untracked cache"
+#: command-list.h:108
+msgid "Push objects over HTTP/DAV to another repository"
msgstr ""
-#: builtin/update-index.c:1008
-msgid "enable untracked cache without testing the filesystem"
+#: command-list.h:109
+msgid "Send a collection of patches from stdin to an IMAP folder"
msgstr ""
-#: builtin/update-index.c:1108
-msgid ""
-"core.splitIndex is set to false; remove or change it, if you really want to "
-"enable split index"
+#: command-list.h:110
+msgid "Build pack index file for an existing packed archive"
msgstr ""
-#: builtin/update-index.c:1117
-msgid ""
-"core.splitIndex is set to true; remove or change it, if you really want to "
-"disable split index"
+#: command-list.h:111
+msgid "Create an empty Git repository or reinitialize an existing one"
msgstr ""
-#: builtin/update-index.c:1128
-msgid ""
-"core.untrackedCache is set to true; remove or change it, if you really want "
-"to disable the untracked cache"
+#: command-list.h:112
+msgid "Instantly browse your working repository in gitweb"
msgstr ""
-#: builtin/update-index.c:1132
-msgid "Untracked cache disabled"
+#: command-list.h:113
+msgid "add or parse structured information in commit messages"
msgstr ""
-#: builtin/update-index.c:1140
-msgid ""
-"core.untrackedCache is set to false; remove or change it, if you really want "
-"to enable the untracked cache"
+#: command-list.h:114
+msgid "The Git repository browser"
msgstr ""
-#: builtin/update-index.c:1144
-#, c-format
-msgid "Untracked cache enabled for '%s'"
+#: command-list.h:115
+msgid "Show commit logs"
msgstr ""
-#: builtin/update-ref.c:10
-msgid "git update-ref [<options>] -d <refname> [<old-val>]"
+#: command-list.h:116
+msgid "Show information about files in the index and the working tree"
msgstr ""
-#: builtin/update-ref.c:11
-msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]"
+#: command-list.h:117
+msgid "List references in a remote repository"
msgstr ""
-#: builtin/update-ref.c:12
-msgid "git update-ref [<options>] --stdin [-z]"
+#: command-list.h:118
+msgid "List the contents of a tree object"
msgstr ""
-#: builtin/update-ref.c:364
-msgid "delete the reference"
+#: command-list.h:119
+msgid "Extracts patch and authorship from a single e-mail message"
msgstr ""
-#: builtin/update-ref.c:366
-msgid "update <refname> not the one it points to"
+#: command-list.h:120
+msgid "Simple UNIX mbox splitter program"
msgstr ""
-#: builtin/update-ref.c:367
-msgid "stdin has NUL-terminated arguments"
+#: command-list.h:121
+msgid "Join two or more development histories together"
msgstr ""
-#: builtin/update-ref.c:368
-msgid "read updates from stdin"
+#: command-list.h:122
+msgid "Find as good common ancestors as possible for a merge"
msgstr ""
-#: builtin/update-server-info.c:7
-msgid "git update-server-info [--force]"
+#: command-list.h:123
+msgid "Run a three-way file merge"
msgstr ""
-#: builtin/update-server-info.c:15
-msgid "update the info files from scratch"
+#: command-list.h:124
+msgid "Run a merge for files needing merging"
msgstr ""
-#: builtin/verify-commit.c:18
-msgid "git verify-commit [-v | --verbose] <commit>..."
+#: command-list.h:125
+msgid "The standard helper program to use with git-merge-index"
msgstr ""
-#: builtin/verify-commit.c:73
-msgid "print commit contents"
+#: command-list.h:126
+msgid "Run merge conflict resolution tools to resolve merge conflicts"
msgstr ""
-#: builtin/verify-commit.c:74 builtin/verify-tag.c:38
-msgid "print raw gpg status output"
+#: command-list.h:127
+msgid "Show three-way merge without touching index"
msgstr ""
-#: builtin/verify-pack.c:55
-msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
+#: command-list.h:128
+msgid "Creates a tag object"
msgstr ""
-#: builtin/verify-pack.c:65
-msgid "verbose"
+#: command-list.h:129
+msgid "Build a tree-object from ls-tree formatted text"
msgstr ""
-#: builtin/verify-pack.c:67
-msgid "show statistics only"
+#: command-list.h:130
+msgid "Move or rename a file, a directory, or a symlink"
msgstr ""
-#: builtin/verify-tag.c:19
-msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
+#: command-list.h:131
+msgid "Find symbolic names for given revs"
msgstr ""
-#: builtin/verify-tag.c:37
-msgid "print tag contents"
+#: command-list.h:132
+msgid "Add or inspect object notes"
msgstr ""
-#: builtin/worktree.c:16
-msgid "git worktree add [<options>] <path> [<branch>]"
+#: command-list.h:133
+msgid "Import from and submit to Perforce repositories"
msgstr ""
-#: builtin/worktree.c:17
-msgid "git worktree list [<options>]"
+#: command-list.h:134
+msgid "Create a packed archive of objects"
msgstr ""
-#: builtin/worktree.c:18
-msgid "git worktree lock [<options>] <path>"
+#: command-list.h:135
+msgid "Find redundant pack files"
msgstr ""
-#: builtin/worktree.c:19
-msgid "git worktree prune [<options>]"
+#: command-list.h:136
+msgid "Pack heads and tags for efficient repository access"
msgstr ""
-#: builtin/worktree.c:20
-msgid "git worktree unlock <path>"
+#: command-list.h:137
+msgid "Routines to help parsing remote repository access parameters"
msgstr ""
-#: builtin/worktree.c:44
-#, c-format
-msgid "Removing worktrees/%s: not a valid directory"
+#: command-list.h:138
+msgid "Compute unique ID for a patch"
msgstr ""
-#: builtin/worktree.c:50
-#, c-format
-msgid "Removing worktrees/%s: gitdir file does not exist"
+#: command-list.h:139
+msgid "Prune all unreachable objects from the object database"
msgstr ""
-#: builtin/worktree.c:55
-#, c-format
-msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
+#: command-list.h:140
+msgid "Remove extra objects that are already in pack files"
msgstr ""
-#: builtin/worktree.c:66
-#, c-format
-msgid "Removing worktrees/%s: invalid gitdir file"
+#: command-list.h:141
+msgid "Fetch from and integrate with another repository or a local branch"
msgstr ""
-#: builtin/worktree.c:82
-#, c-format
-msgid "Removing worktrees/%s: gitdir file points to non-existent location"
+#: command-list.h:142
+msgid "Update remote refs along with associated objects"
msgstr ""
-#: builtin/worktree.c:129
-msgid "report pruned working trees"
+#: command-list.h:143
+msgid "Applies a quilt patchset onto the current branch"
msgstr ""
-#: builtin/worktree.c:131
-msgid "expire working trees older than <time>"
+#: command-list.h:144
+msgid "Compare two commit ranges (e.g. two versions of a branch)"
msgstr ""
-#: builtin/worktree.c:205
-#, c-format
-msgid "'%s' already exists"
+#: command-list.h:145
+msgid "Reads tree information into the index"
msgstr ""
-#: builtin/worktree.c:236
-#, c-format
-msgid "could not create directory of '%s'"
+#: command-list.h:146
+msgid "Reapply commits on top of another base tip"
msgstr ""
-#: builtin/worktree.c:275
-#, c-format
-msgid "Preparing %s (identifier %s)"
+#: command-list.h:147
+msgid "Receive what is pushed into the repository"
msgstr ""
-#: builtin/worktree.c:327
-msgid "checkout <branch> even if already checked out in other worktree"
+#: command-list.h:148
+msgid "Manage reflog information"
msgstr ""
-#: builtin/worktree.c:329
-msgid "create a new branch"
+#: command-list.h:149
+msgid "Manage set of tracked repositories"
msgstr ""
-#: builtin/worktree.c:331
-msgid "create or reset a branch"
+#: command-list.h:150
+msgid "Pack unpacked objects in a repository"
msgstr ""
-#: builtin/worktree.c:333
-msgid "populate the new working tree"
+#: command-list.h:151
+msgid "Create, list, delete refs to replace objects"
msgstr ""
-#: builtin/worktree.c:334
-msgid "keep the new working tree locked"
+#: command-list.h:152
+msgid "Generates a summary of pending changes"
msgstr ""
-#: builtin/worktree.c:342
-msgid "-b, -B, and --detach are mutually exclusive"
+#: command-list.h:153
+msgid "Reuse recorded resolution of conflicted merges"
msgstr ""
-#: builtin/worktree.c:479
-msgid "reason for locking"
+#: command-list.h:154
+msgid "Reset current HEAD to the specified state"
msgstr ""
-#: builtin/worktree.c:491 builtin/worktree.c:524
-#, c-format
-msgid "'%s' is not a working tree"
+#: command-list.h:155
+msgid "Revert some existing commits"
msgstr ""
-#: builtin/worktree.c:493 builtin/worktree.c:526
-msgid "The main working tree cannot be locked or unlocked"
+#: command-list.h:156
+msgid "Lists commit objects in reverse chronological order"
msgstr ""
-#: builtin/worktree.c:498
-#, c-format
-msgid "'%s' is already locked, reason: %s"
+#: command-list.h:157
+msgid "Pick out and massage parameters"
msgstr ""
-#: builtin/worktree.c:500
-#, c-format
-msgid "'%s' is already locked"
+#: command-list.h:158
+msgid "Remove files from the working tree and from the index"
msgstr ""
-#: builtin/worktree.c:528
-#, c-format
-msgid "'%s' is not locked"
+#: command-list.h:159
+msgid "Send a collection of patches as emails"
msgstr ""
-#: builtin/write-tree.c:14
-msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
+#: command-list.h:160
+msgid "Push objects over Git protocol to another repository"
msgstr ""
-#: builtin/write-tree.c:27
-msgid "<prefix>/"
+#: command-list.h:161
+msgid "Restricted login shell for Git-only SSH access"
msgstr ""
-#: builtin/write-tree.c:28
-msgid "write tree object for a subdirectory <prefix>"
+#: command-list.h:162
+msgid "Summarize 'git log' output"
msgstr ""
-#: builtin/write-tree.c:31
-msgid "only useful for debugging"
+#: command-list.h:163
+msgid "Show various types of objects"
msgstr ""
-#: upload-pack.c:23
-msgid "git upload-pack [<options>] <dir>"
+#: command-list.h:164
+msgid "Show branches and their commits"
msgstr ""
-#: upload-pack.c:1041
-msgid "quit after a single request/response exchange"
+#: command-list.h:165
+msgid "Show packed archive index"
msgstr ""
-#: upload-pack.c:1043
-msgid "exit immediately after initial ref advertisement"
+#: command-list.h:166
+msgid "List references in a local repository"
msgstr ""
-#: upload-pack.c:1045
-msgid "do not try <directory>/.git/ if <directory> is no Git directory"
+#: command-list.h:167
+msgid "Git's i18n setup code for shell scripts"
msgstr ""
-#: upload-pack.c:1047
-msgid "interrupt transfer after <n> seconds of inactivity"
+#: command-list.h:168
+msgid "Common Git shell script setup code"
msgstr ""
-#: credential-cache--daemon.c:224
-#, c-format
-msgid ""
-"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"
+#: command-list.h:169
+msgid "Stash the changes in a dirty working directory away"
msgstr ""
-#: credential-cache--daemon.c:272
-msgid "print debugging messages to stderr"
+#: command-list.h:170
+msgid "Add file contents to the staging area"
msgstr ""
-#: git.c:15
-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."
+#: command-list.h:171
+msgid "Show the working tree status"
msgstr ""
-#: http.c:337
-#, c-format
-msgid "negative value for http.postbuffer; defaulting to %d"
+#: command-list.h:172
+msgid "Remove unnecessary whitespace"
msgstr ""
-#: http.c:358
-msgid "Delegation control is not supported with cURL < 7.22.0"
+#: command-list.h:173
+msgid "Initialize, update or inspect submodules"
msgstr ""
-#: http.c:367
-msgid "Public key pinning not supported with cURL < 7.44.0"
+#: command-list.h:174
+msgid "Bidirectional operation between a Subversion repository and Git"
msgstr ""
-#: http.c:1764
-#, c-format
-msgid ""
-"unable to update url base from redirection:\n"
-" asked for: %s\n"
-" redirect: %s"
+#: command-list.h:175
+msgid "Read, modify and delete symbolic refs"
msgstr ""
-#: remote-curl.c:324
-#, c-format
-msgid "redirecting to %s"
+#: command-list.h:176
+msgid "Create, list, delete or verify a tag object signed with GPG"
msgstr ""
-#: common-cmds.h:9
-msgid "start a working area (see also: git help tutorial)"
+#: command-list.h:177
+msgid "Creates a temporary file with a blob's contents"
msgstr ""
-#: common-cmds.h:10
-msgid "work on the current change (see also: git help everyday)"
+#: command-list.h:178
+msgid "Unpack objects from a packed archive"
msgstr ""
-#: common-cmds.h:11
-msgid "examine the history and state (see also: git help revisions)"
+#: command-list.h:179
+msgid "Register file contents in the working tree to the index"
msgstr ""
-#: common-cmds.h:12
-msgid "grow, mark and tweak your common history"
+#: command-list.h:180
+msgid "Update the object name stored in a ref safely"
msgstr ""
-#: common-cmds.h:13
-msgid "collaborate (see also: git help workflows)"
+#: command-list.h:181
+msgid "Update auxiliary info file to help dumb servers"
msgstr ""
-#: common-cmds.h:17
-msgid "Add file contents to the index"
+#: command-list.h:182
+msgid "Send archive back to git-archive"
msgstr ""
-#: common-cmds.h:18
-msgid "Use binary search to find the commit that introduced a bug"
+#: command-list.h:183
+msgid "Send objects packed back to git-fetch-pack"
msgstr ""
-#: common-cmds.h:19
-msgid "List, create, or delete branches"
+#: command-list.h:184
+msgid "Show a Git logical variable"
msgstr ""
-#: common-cmds.h:20
-msgid "Switch branches or restore working tree files"
+#: command-list.h:185
+msgid "Check the GPG signature of commits"
msgstr ""
-#: common-cmds.h:21
-msgid "Clone a repository into a new directory"
+#: command-list.h:186
+msgid "Validate packed Git archive files"
msgstr ""
-#: common-cmds.h:22
-msgid "Record changes to the repository"
+#: command-list.h:187
+msgid "Check the GPG signature of tags"
msgstr ""
-#: common-cmds.h:23
-msgid "Show changes between commits, commit and working tree, etc"
+#: command-list.h:188
+msgid "Git web interface (web frontend to Git repositories)"
msgstr ""
-#: common-cmds.h:24
-msgid "Download objects and refs from another repository"
+#: command-list.h:189
+msgid "Show logs with difference each commit introduces"
msgstr ""
-#: common-cmds.h:25
-msgid "Print lines matching a pattern"
+#: command-list.h:190
+msgid "Manage multiple working trees"
msgstr ""
-#: common-cmds.h:26
-msgid "Create an empty Git repository or reinitialize an existing one"
+#: command-list.h:191
+msgid "Create a tree object from the current index"
msgstr ""
-#: common-cmds.h:27
-msgid "Show commit logs"
+#: command-list.h:192
+msgid "Defining attributes per path"
msgstr ""
-#: common-cmds.h:28
-msgid "Join two or more development histories together"
+#: command-list.h:193
+msgid "Git command-line interface and conventions"
msgstr ""
-#: common-cmds.h:29
-msgid "Move or rename a file, a directory, or a symlink"
+#: command-list.h:194
+msgid "A Git core tutorial for developers"
msgstr ""
-#: common-cmds.h:30
-msgid "Fetch from and integrate with another repository or a local branch"
+#: command-list.h:195
+msgid "Git for CVS users"
msgstr ""
-#: common-cmds.h:31
-msgid "Update remote refs along with associated objects"
+#: command-list.h:196
+msgid "Tweaking diff output"
msgstr ""
-#: common-cmds.h:32
-msgid "Reapply commits on top of another base tip"
+#: command-list.h:197
+msgid "A useful minimum set of commands for Everyday Git"
msgstr ""
-#: common-cmds.h:33
-msgid "Reset current HEAD to the specified state"
+#: command-list.h:198
+msgid "A Git Glossary"
msgstr ""
-#: common-cmds.h:34
-msgid "Remove files from the working tree and from the index"
+#: command-list.h:199
+msgid "Hooks used by Git"
msgstr ""
-#: common-cmds.h:35
-msgid "Show various types of objects"
+#: command-list.h:200
+msgid "Specifies intentionally untracked files to ignore"
msgstr ""
-#: common-cmds.h:36
-msgid "Show the working tree status"
+#: command-list.h:201
+msgid "Defining submodule properties"
msgstr ""
-#: common-cmds.h:37
-msgid "Create, list, delete or verify a tag object signed with GPG"
+#: command-list.h:202
+msgid "Git namespaces"
msgstr ""
-#: parse-options.h:145
-msgid "expiry-date"
+#: command-list.h:203
+msgid "Git Repository Layout"
msgstr ""
-#: parse-options.h:160
-msgid "no-op (backward compatibility)"
+#: command-list.h:204
+msgid "Specifying revisions and ranges for Git"
msgstr ""
-#: parse-options.h:238
-msgid "be more verbose"
+#: command-list.h:205
+msgid "A tutorial introduction to Git: part two"
msgstr ""
-#: parse-options.h:240
-msgid "be more quiet"
+#: command-list.h:206
+msgid "A tutorial introduction to Git"
msgstr ""
-#: parse-options.h:246
-msgid "use <n> digits to display SHA-1s"
+#: command-list.h:207
+msgid "An overview of recommended workflows with Git"
msgstr ""
#: rerere.h:40
msgid "Bad bisect_write argument: $state"
msgstr ""
-#: git-bisect.sh:262
+#: git-bisect.sh:246
#, sh-format
msgid "Bad rev input: $arg"
msgstr ""
-#: git-bisect.sh:281
+#: git-bisect.sh:265
#, sh-format
msgid "Bad rev input: $bisected_head"
msgstr ""
-#: git-bisect.sh:290
+#: git-bisect.sh:274
#, sh-format
msgid "Bad rev input: $rev"
msgstr ""
-#: git-bisect.sh:299
+#: git-bisect.sh:283
#, sh-format
msgid "'git bisect $TERM_BAD' can take only one argument."
msgstr ""
-#: git-bisect.sh:322
+#: git-bisect.sh:306
#, sh-format
msgid "Warning: bisecting only with a $TERM_BAD commit."
msgstr ""
#. TRANSLATORS: Make sure to include [Y] and [n] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-bisect.sh:328
+#: git-bisect.sh:312
msgid "Are you sure [Y/n]? "
msgstr ""
-#: git-bisect.sh:340
+#: git-bisect.sh:324
#, 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 ""
-#: git-bisect.sh:343
+#: git-bisect.sh:327
#, sh-format
msgid ""
"You need to start by \"git bisect start\".\n"
"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
msgstr ""
-#: git-bisect.sh:414 git-bisect.sh:546
+#: git-bisect.sh:398 git-bisect.sh:512
msgid "We are not bisecting."
msgstr ""
-#: git-bisect.sh:421
+#: git-bisect.sh:405
#, sh-format
msgid "'$invalid' is not a valid commit"
msgstr ""
-#: git-bisect.sh:430
+#: git-bisect.sh:414
#, sh-format
msgid ""
"Could not check out original HEAD '$branch'.\n"
"Try 'git bisect reset <commit>'."
msgstr ""
-#: git-bisect.sh:458
+#: git-bisect.sh:422
msgid "No logfile given"
msgstr ""
-#: git-bisect.sh:459
+#: git-bisect.sh:423
#, sh-format
msgid "cannot read $file for replaying"
msgstr ""
-#: git-bisect.sh:480
+#: git-bisect.sh:444
msgid "?? what are you talking about?"
msgstr ""
-#: git-bisect.sh:492
+#: git-bisect.sh:453
+msgid "bisect run failed: no command provided."
+msgstr ""
+
+#: git-bisect.sh:458
#, sh-format
msgid "running $command"
msgstr ""
-#: git-bisect.sh:499
+#: git-bisect.sh:465
#, sh-format
msgid ""
"bisect run failed:\n"
"exit code $res from '$command' is < 0 or >= 128"
msgstr ""
-#: git-bisect.sh:525
+#: git-bisect.sh:491
msgid "bisect run cannot continue any more"
msgstr ""
-#: git-bisect.sh:531
+#: git-bisect.sh:497
#, sh-format
msgid ""
"bisect run failed:\n"
"'bisect_state $state' exited with error code $res"
msgstr ""
-#: git-bisect.sh:538
+#: git-bisect.sh:504
msgid "bisect run success"
msgstr ""
-#: git-bisect.sh:565
-msgid "please use two different terms"
-msgstr ""
-
-#: git-bisect.sh:575
-#, sh-format
-msgid "'$term' is not a valid term"
-msgstr ""
-
-#: git-bisect.sh:578
-#, sh-format
-msgid "can't use the builtin command '$term' as a term"
-msgstr ""
-
-#: git-bisect.sh:587 git-bisect.sh:593
-#, sh-format
-msgid "can't change the meaning of term '$term'"
-msgstr ""
-
-#: git-bisect.sh:606
+#: git-bisect.sh:533
#, sh-format
msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect."
msgstr ""
-#: git-bisect.sh:636
+#: git-bisect.sh:567
msgid "no terms defined"
msgstr ""
-#: git-bisect.sh:653
+#: git-bisect.sh:584
#, sh-format
msgid ""
"invalid argument $arg for 'git bisect terms'.\n"
#: git-merge-octopus.sh:77
#, sh-format
-msgid "Already up-to-date with $pretty_name"
+msgid "Already up to date with $pretty_name"
msgstr ""
#: git-merge-octopus.sh:89
msgid "Simple merge did not work, trying automatic merge."
msgstr ""
-#: git-rebase.sh:58
+#: git-rebase.sh:61
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"
-"\"."
+"Resolve all conflicts manually, mark them as resolved with\n"
+"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
+"You can instead skip this commit: run \"git rebase --skip\".\n"
+"To abort and get back to the state before \"git rebase\", run \"git rebase --"
+"abort\"."
msgstr ""
-#: git-rebase.sh:158 git-rebase.sh:397
+#: git-rebase.sh:173 git-rebase.sh:454
#, sh-format
msgid "Could not move back to $head_name"
msgstr ""
-#: git-rebase.sh:169
+#: git-rebase.sh:184
msgid "Applied autostash."
msgstr ""
-#: git-rebase.sh:172
+#: git-rebase.sh:187
#, sh-format
msgid "Cannot store $stash_sha1"
msgstr ""
-#: git-rebase.sh:212
+#: git-rebase.sh:236
msgid "The pre-rebase hook refused to rebase."
msgstr ""
-#: git-rebase.sh:217
-msgid "It looks like git-am is in progress. Cannot rebase."
+#: git-rebase.sh:241
+msgid "It looks like 'git am' is in progress. Cannot rebase."
msgstr ""
-#: git-rebase.sh:358
+#: git-rebase.sh:415
msgid "No rebase in progress?"
msgstr ""
-#: git-rebase.sh:369
+#: git-rebase.sh:426
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr ""
-#: git-rebase.sh:376
+#: git-rebase.sh:433
msgid "Cannot read HEAD"
msgstr ""
-#: git-rebase.sh:379
+#: git-rebase.sh:436
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
msgstr ""
-#: git-rebase.sh:419
+#: git-rebase.sh:480
#, sh-format
msgid ""
"It seems that there is already a $state_dir_base directory, and\n"
"valuable there."
msgstr ""
-#: git-rebase.sh:470
+#: git-rebase.sh:545
+msgid "error: cannot combine '--signoff' with '--preserve-merges'"
+msgstr ""
+
+#: git-rebase.sh:556
+msgid "error: cannot combine '--preserve_merges' with '--rebase-merges'"
+msgstr ""
+
+#: git-rebase.sh:562
+msgid "error: cannot combine '--rebase_merges' with '--strategy-option'"
+msgstr ""
+
+#: git-rebase.sh:564
+msgid "error: cannot combine '--rebase_merges' with '--strategy'"
+msgstr ""
+
+#: git-rebase.sh:590
#, sh-format
-msgid "invalid upstream $upstream_name"
+msgid "invalid upstream '$upstream_name'"
msgstr ""
-#: git-rebase.sh:494
+#: git-rebase.sh:614
#, sh-format
msgid "$onto_name: there are more than one merge bases"
msgstr ""
-#: git-rebase.sh:497 git-rebase.sh:501
+#: git-rebase.sh:617 git-rebase.sh:621
#, sh-format
msgid "$onto_name: there is no merge base"
msgstr ""
-#: git-rebase.sh:506
+#: git-rebase.sh:626
#, sh-format
msgid "Does not point to a valid commit: $onto_name"
msgstr ""
-#: git-rebase.sh:529
+#: git-rebase.sh:652
#, sh-format
-msgid "fatal: no such branch: $branch_name"
+msgid "fatal: no such branch/commit '$branch_name'"
msgstr ""
-#: git-rebase.sh:562
+#: git-rebase.sh:685
msgid "Cannot autostash"
msgstr ""
-#: git-rebase.sh:567
+#: git-rebase.sh:690
#, sh-format
msgid "Created autostash: $stash_abbrev"
msgstr ""
-#: git-rebase.sh:571
+#: git-rebase.sh:694
msgid "Please commit or stash them."
msgstr ""
-#: git-rebase.sh:591
+#: git-rebase.sh:717
+#, sh-format
+msgid "HEAD is up to date."
+msgstr ""
+
+#: git-rebase.sh:719
#, sh-format
msgid "Current branch $branch_name is up to date."
msgstr ""
-#: git-rebase.sh:595
+#: git-rebase.sh:727
+#, sh-format
+msgid "HEAD is up to date, rebase forced."
+msgstr ""
+
+#: git-rebase.sh:729
#, sh-format
msgid "Current branch $branch_name is up to date, rebase forced."
msgstr ""
-#: git-rebase.sh:606
+#: git-rebase.sh:741
#, sh-format
msgid "Changes from $mb to $onto:"
msgstr ""
-#: git-rebase.sh:615
+#: git-rebase.sh:750
msgid "First, rewinding head to replay your work on top of it..."
msgstr ""
-#: git-rebase.sh:625
+#: git-rebase.sh:760
#, sh-format
msgid "Fast-forwarded $branch_name to $onto_name."
msgstr ""
-#: git-stash.sh:54
+#: git-stash.sh:61
msgid "git stash clear with parameters is unimplemented"
msgstr ""
-#: git-stash.sh:95
+#: git-stash.sh:108
msgid "You do not have the initial commit yet"
msgstr ""
-#: git-stash.sh:110
+#: git-stash.sh:123
msgid "Cannot save the current index state"
msgstr ""
-#: git-stash.sh:125
+#: git-stash.sh:138
msgid "Cannot save the untracked files"
msgstr ""
-#: git-stash.sh:145 git-stash.sh:158
+#: git-stash.sh:158 git-stash.sh:171
msgid "Cannot save the current worktree state"
msgstr ""
-#: git-stash.sh:162
+#: git-stash.sh:175
msgid "No changes selected"
msgstr ""
-#: git-stash.sh:165
+#: git-stash.sh:178
msgid "Cannot remove temporary index (can't happen)"
msgstr ""
-#: git-stash.sh:178
+#: git-stash.sh:191
msgid "Cannot record working tree state"
msgstr ""
-#: git-stash.sh:210
+#: git-stash.sh:229
#, sh-format
msgid "Cannot update $ref_stash with $w_commit"
msgstr ""
-#. TRANSLATORS: $option is an invalid option, like
-#. `--blah-blah'. The 7 spaces at the beginning of the
-#. second line correspond to "error: ". So you should line
-#. 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:266
+#: git-stash.sh:281
#, sh-format
-msgid ""
-"error: unknown option for 'stash save': $option\n"
-" To provide a message, use git stash save -- '$option'"
+msgid "error: unknown option for 'stash push': $option"
msgstr ""
-#: git-stash.sh:281
+#: git-stash.sh:295
msgid "Can't use --patch and --include-untracked or --all at the same time"
msgstr ""
-#: git-stash.sh:289
+#: git-stash.sh:303
msgid "No local changes to save"
msgstr ""
-#: git-stash.sh:294
+#: git-stash.sh:308
msgid "Cannot initialize stash"
msgstr ""
-#: git-stash.sh:298
+#: git-stash.sh:312
msgid "Cannot save the current status"
msgstr ""
-#: git-stash.sh:299
+#: git-stash.sh:313
#, sh-format
msgid "Saved working directory and index state $stash_msg"
msgstr ""
-#: git-stash.sh:326
+#: git-stash.sh:342
msgid "Cannot remove worktree changes"
msgstr ""
-#: git-stash.sh:474
+#: git-stash.sh:490
#, sh-format
msgid "unknown option: $opt"
msgstr ""
-#: git-stash.sh:487
+#: git-stash.sh:503
msgid "No stash entries found."
msgstr ""
-#: git-stash.sh:494
+#: git-stash.sh:510
#, sh-format
msgid "Too many revisions specified: $REV"
msgstr ""
-#: git-stash.sh:509
+#: git-stash.sh:525
#, sh-format
msgid "$reference is not a valid reference"
msgstr ""
-#: git-stash.sh:537
+#: git-stash.sh:553
#, sh-format
msgid "'$args' is not a stash-like commit"
msgstr ""
-#: git-stash.sh:548
+#: git-stash.sh:564
#, sh-format
msgid "'$args' is not a stash reference"
msgstr ""
-#: git-stash.sh:556
+#: git-stash.sh:572
msgid "unable to refresh index"
msgstr ""
-#: git-stash.sh:560
+#: git-stash.sh:576
msgid "Cannot apply a stash in the middle of a merge"
msgstr ""
-#: git-stash.sh:568
+#: git-stash.sh:584
msgid "Conflicts in index. Try without --index."
msgstr ""
-#: git-stash.sh:570
+#: git-stash.sh:586
msgid "Could not save index tree"
msgstr ""
-#: git-stash.sh:579
+#: git-stash.sh:595
msgid "Could not restore untracked files from stash entry"
msgstr ""
-#: git-stash.sh:604
+#: git-stash.sh:620
msgid "Cannot unstage modified files"
msgstr ""
-#: git-stash.sh:619
+#: git-stash.sh:635
msgid "Index was not unstashed."
msgstr ""
-#: git-stash.sh:633
+#: git-stash.sh:649
msgid "The stash entry is kept in case you need it again."
msgstr ""
-#: git-stash.sh:642
+#: git-stash.sh:658
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr ""
-#: git-stash.sh:643
+#: git-stash.sh:659
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr ""
-#: git-stash.sh:651
+#: git-stash.sh:667
msgid "No branch name specified"
msgstr ""
-#: git-stash.sh:730
+#: git-stash.sh:746
msgid "(To restore them type \"git stash apply\")"
msgstr ""
-#: git-submodule.sh:181
+#: git-submodule.sh:188
msgid "Relative path can only be used from the toplevel of the working tree"
msgstr ""
-#: git-submodule.sh:191
+#: git-submodule.sh:198
#, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
msgstr ""
-#: git-submodule.sh:210
+#: git-submodule.sh:217
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr ""
-#: git-submodule.sh:213
+#: git-submodule.sh:220
#, sh-format
msgid "'$sm_path' already exists in the index and is not a submodule"
msgstr ""
-#: git-submodule.sh:219
+#: git-submodule.sh:226
#, sh-format
msgid ""
"The following path is ignored by one of your .gitignore files:\n"
"Use -f if you really want to add it."
msgstr ""
-#: git-submodule.sh:237
+#: git-submodule.sh:249
#, sh-format
msgid "Adding existing repo at '$sm_path' to the index"
msgstr ""
-#: git-submodule.sh:239
+#: git-submodule.sh:251
#, sh-format
msgid "'$sm_path' already exists and is not a valid git repo"
msgstr ""
-#: git-submodule.sh:247
+#: git-submodule.sh:259
#, sh-format
msgid "A git directory for '$sm_name' is found locally with remote(s):"
msgstr ""
-#: git-submodule.sh:249
+#: git-submodule.sh:261
#, sh-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from\n"
"option."
msgstr ""
-#: git-submodule.sh:255
+#: git-submodule.sh:267
#, sh-format
msgid "Reactivating local git directory for submodule '$sm_name'."
msgstr ""
-#: git-submodule.sh:267
+#: git-submodule.sh:279
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
msgstr ""
-#: git-submodule.sh:272
+#: git-submodule.sh:284
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr ""
-#: git-submodule.sh:281
+#: git-submodule.sh:293
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr ""
-#: git-submodule.sh:342
-#, sh-format
-msgid "Entering '$displaypath'"
-msgstr ""
-
-#: git-submodule.sh:362
-#, sh-format
-msgid "Stopping at '$displaypath'; script returned non-zero status."
-msgstr ""
-
-#: git-submodule.sh:433
-#, sh-format
-msgid "pathspec and --all are incompatible"
-msgstr ""
-
-#: git-submodule.sh:438
-#, sh-format
-msgid "Use '--all' if you really want to deinitialize all submodules"
-msgstr ""
-
-#: git-submodule.sh:458
-#, 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 ""
-
-#: git-submodule.sh:466
-#, sh-format
-msgid ""
-"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
-"discard them"
-msgstr ""
-
-#: git-submodule.sh:469
-#, sh-format
-msgid "Cleared directory '$displaypath'"
-msgstr ""
-
-#: git-submodule.sh:470
-#, sh-format
-msgid "Could not remove submodule work tree '$displaypath'"
-msgstr ""
-
-#: git-submodule.sh:473
-#, sh-format
-msgid "Could not create empty submodule directory '$displaypath'"
-msgstr ""
-
-#: git-submodule.sh:482
-#, sh-format
-msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
-msgstr ""
-
-#: git-submodule.sh:638
+#: git-submodule.sh:565
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:648
+#: git-submodule.sh:575
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr ""
-#: git-submodule.sh:653
+#: git-submodule.sh:580
#, sh-format
msgid ""
"Unable to find current ${remote_name}/${branch} revision in submodule path "
"'$sm_path'"
msgstr ""
-#: git-submodule.sh:671
+#: git-submodule.sh:603
#, sh-format
msgid "Unable to fetch in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:677
+#: git-submodule.sh:609
#, sh-format
msgid ""
"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
"Direct fetching of that commit failed."
msgstr ""
-#: git-submodule.sh:684
+#: git-submodule.sh:616
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:685
+#: git-submodule.sh:617
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr ""
-#: git-submodule.sh:689
+#: git-submodule.sh:621
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:690
+#: git-submodule.sh:622
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr ""
-#: git-submodule.sh:695
+#: git-submodule.sh:627
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:696
+#: git-submodule.sh:628
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr ""
-#: git-submodule.sh:701
+#: git-submodule.sh:633
#, sh-format
msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:702
+#: git-submodule.sh:634
#, sh-format
msgid "Submodule path '$displaypath': '$command $sha1'"
msgstr ""
-#: git-submodule.sh:733
+#: git-submodule.sh:665
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:841
+#: git-submodule.sh:761
msgid "The --cached option cannot be used with the --files option"
msgstr ""
-#: git-submodule.sh:893
+#: git-submodule.sh:813
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr ""
-#: git-submodule.sh:913
+#: git-submodule.sh:833
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr ""
-#: git-submodule.sh:916
+#: git-submodule.sh:836
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr ""
-#: git-submodule.sh:919
+#: git-submodule.sh:839
#, sh-format
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
msgstr ""
-#: git-submodule.sh:1065
-#, sh-format
-msgid "Failed to recurse into submodule path '$sm_path'"
-msgstr ""
-
-#: git-submodule.sh:1137
-#, sh-format
-msgid "Synchronizing submodule url for '$displaypath'"
-msgstr ""
-
#: git-parse-remote.sh:89
#, sh-format
msgid "See git-${cmd}(1) for details."
msgstr ""
-#: git-rebase--interactive.sh:140
-#, sh-format
-msgid "Rebasing ($new_count/$total)"
-msgstr ""
-
-#: git-rebase--interactive.sh:156
+#: git-rebase--interactive.sh:43
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"
+"p, pick <commit> = use commit\n"
+"r, reword <commit> = use commit, but edit the commit message\n"
+"e, edit <commit> = use commit, but stop for amending\n"
+"s, squash <commit> = use commit, but meld into previous commit\n"
+"f, fixup <commit> = like \"squash\", but discard this commit's log message\n"
+"x, exec <command> = run command (the rest of the line) using shell\n"
+"d, drop <commit> = remove commit\n"
+"l, label <label> = label current HEAD with a name\n"
+"t, reset <label> = reset HEAD to a label\n"
+"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
+". create a merge commit using the original merge commit's\n"
+". message (or the oneline, if no original merge commit was\n"
+". specified). Use -c <commit> to reword the commit message.\n"
"\n"
"These lines can be re-ordered; they are executed from top to bottom.\n"
msgstr ""
-#: git-rebase--interactive.sh:171
+#: git-rebase--interactive.sh:64 git-rebase--preserve-merges.sh:173
msgid ""
"\n"
"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
msgstr ""
-#: git-rebase--interactive.sh:175
+#: git-rebase--interactive.sh:68 git-rebase--preserve-merges.sh:177
msgid ""
"\n"
"If you remove a line here THAT COMMIT WILL BE LOST.\n"
msgstr ""
-#: git-rebase--interactive.sh:211
+#: git-rebase--interactive.sh:108 git-rebase--preserve-merges.sh:724
+msgid "could not detach HEAD"
+msgstr ""
+
+#: git-rebase--interactive.sh:147 git-rebase--preserve-merges.sh:816
+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"
+msgstr ""
+
+#: git-rebase--interactive.sh:155 git-rebase--interactive.sh:241
+#: git-rebase--preserve-merges.sh:824 git-rebase--preserve-merges.sh:910
+msgid "Could not execute editor"
+msgstr ""
+
+#: git-rebase--interactive.sh:176 git-rebase--preserve-merges.sh:845
+#, sh-format
+msgid "Could not checkout $switch_to"
+msgstr ""
+
+#: git-rebase--interactive.sh:183 git-rebase--preserve-merges.sh:852
+msgid "No HEAD?"
+msgstr ""
+
+#: git-rebase--interactive.sh:184 git-rebase--preserve-merges.sh:853
+#, sh-format
+msgid "Could not create temporary $state_dir"
+msgstr ""
+
+#: git-rebase--interactive.sh:187 git-rebase--preserve-merges.sh:856
+msgid "Could not mark as interactive"
+msgstr ""
+
+#: git-rebase--interactive.sh:219 git-rebase--preserve-merges.sh:888
+#, sh-format
+msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
+msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: git-rebase--interactive.sh:224
+msgid ""
+"\n"
+"\tHowever, if you remove everything, the rebase will be aborted.\n"
+"\n"
+"\t"
+msgstr ""
+
+#: git-rebase--interactive.sh:231 git-rebase--preserve-merges.sh:900
+msgid "Note that empty commits are commented out"
+msgstr ""
+
+#: git-rebase--interactive.sh:280
+msgid "Could not generate todo list"
+msgstr ""
+
+#: git-rebase--preserve-merges.sh:136
+#, sh-format
+msgid "Rebasing ($new_count/$total)"
+msgstr ""
+
+#: git-rebase--preserve-merges.sh:152
+msgid ""
+"\n"
+"Commands:\n"
+"p, pick <commit> = use commit\n"
+"r, reword <commit> = use commit, but edit the commit message\n"
+"e, edit <commit> = use commit, but stop for amending\n"
+"s, squash <commit> = use commit, but meld into previous commit\n"
+"f, fixup <commit> = like \"squash\", but discard this commit's log message\n"
+"x, exec <commit> = run command (the rest of the line) using shell\n"
+"d, drop <commit> = remove commit\n"
+"l, label <label> = label current HEAD with a name\n"
+"t, reset <label> = reset HEAD to a label\n"
+"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
+". create a merge commit using the original merge commit's\n"
+". message (or the oneline, if no original merge commit was\n"
+". specified). Use -c <commit> to reword the commit message.\n"
+"\n"
+"These lines can be re-ordered; they are executed from top to bottom.\n"
+msgstr ""
+
+#: git-rebase--preserve-merges.sh:215
#, sh-format
msgid ""
"You can amend the commit now, with\n"
"\tgit rebase --continue"
msgstr ""
-#: git-rebase--interactive.sh:236
+#: git-rebase--preserve-merges.sh:240
#, sh-format
msgid "$sha1: not a commit that can be picked"
msgstr ""
-#: git-rebase--interactive.sh:275
+#: git-rebase--preserve-merges.sh:279
#, sh-format
msgid "Invalid commit name: $sha1"
msgstr ""
-#: git-rebase--interactive.sh:317
+#: git-rebase--preserve-merges.sh:309
msgid "Cannot write current commit's replacement sha1"
msgstr ""
-#: git-rebase--interactive.sh:369
+#: git-rebase--preserve-merges.sh:360
#, sh-format
msgid "Fast-forward to $sha1"
msgstr ""
-#: git-rebase--interactive.sh:371
+#: git-rebase--preserve-merges.sh:362
#, sh-format
msgid "Cannot fast-forward to $sha1"
msgstr ""
-#: git-rebase--interactive.sh:380
+#: git-rebase--preserve-merges.sh:371
#, sh-format
msgid "Cannot move HEAD to $first_parent"
msgstr ""
-#: git-rebase--interactive.sh:385
+#: git-rebase--preserve-merges.sh:376
#, sh-format
msgid "Refusing to squash a merge: $sha1"
msgstr ""
-#: git-rebase--interactive.sh:399
+#: git-rebase--preserve-merges.sh:394
#, sh-format
msgid "Error redoing merge $sha1"
msgstr ""
-#: git-rebase--interactive.sh:407
+#: git-rebase--preserve-merges.sh:403
#, sh-format
msgid "Could not pick $sha1"
msgstr ""
-#: git-rebase--interactive.sh:416
+#: git-rebase--preserve-merges.sh:412
#, sh-format
msgid "This is the commit message #${n}:"
msgstr ""
-#: git-rebase--interactive.sh:421
+#: git-rebase--preserve-merges.sh:417
#, sh-format
msgid "The commit message #${n} will be skipped:"
msgstr ""
-#: git-rebase--interactive.sh:432
+#: git-rebase--preserve-merges.sh:428
#, 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
+#: git-rebase--preserve-merges.sh:437
#, sh-format
msgid "Cannot write $fixup_msg"
msgstr ""
-#: git-rebase--interactive.sh:444
+#: git-rebase--preserve-merges.sh:440
msgid "This is a combination of 2 commits."
msgstr ""
-#: git-rebase--interactive.sh:485 git-rebase--interactive.sh:528
-#: git-rebase--interactive.sh:531
+#: git-rebase--preserve-merges.sh:481 git-rebase--preserve-merges.sh:524
+#: git-rebase--preserve-merges.sh:527
#, sh-format
msgid "Could not apply $sha1... $rest"
msgstr ""
-#: git-rebase--interactive.sh:559
+#: git-rebase--preserve-merges.sh:556
#, sh-format
msgid ""
"Could not amend commit after successfully picking $sha1... $rest\n"
"you are able to reword the commit."
msgstr ""
-#: git-rebase--interactive.sh:574
+#: git-rebase--preserve-merges.sh:571
#, sh-format
msgid "Stopped at $sha1_abbrev... $rest"
msgstr ""
-#: git-rebase--interactive.sh:589
+#: git-rebase--preserve-merges.sh:586
#, sh-format
msgid "Cannot '$squash_style' without a previous commit"
msgstr ""
-#: git-rebase--interactive.sh:631
+#: git-rebase--preserve-merges.sh:628
#, sh-format
msgid "Executing: $rest"
msgstr ""
-#: git-rebase--interactive.sh:639
+#: git-rebase--preserve-merges.sh:636
#, sh-format
msgid "Execution failed: $rest"
msgstr ""
-#: git-rebase--interactive.sh:641
+#: git-rebase--preserve-merges.sh:638
msgid "and made changes to the index and/or the working tree"
msgstr ""
-#: git-rebase--interactive.sh:643
+#: git-rebase--preserve-merges.sh:640
msgid ""
"You can fix the problem, and then run\n"
"\n"
msgstr ""
#. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--interactive.sh:656
+#: git-rebase--preserve-merges.sh:653
#, sh-format
msgid ""
"Execution succeeded: $rest\n"
"\tgit rebase --continue"
msgstr ""
-#: git-rebase--interactive.sh:667
+#: git-rebase--preserve-merges.sh:664
#, sh-format
msgid "Unknown command: $command $sha1 $rest"
msgstr ""
-#: git-rebase--interactive.sh:668
+#: git-rebase--preserve-merges.sh:665
msgid "Please fix this using 'git rebase --edit-todo'."
msgstr ""
-#: git-rebase--interactive.sh:703
+#: git-rebase--preserve-merges.sh:700
#, sh-format
msgid "Successfully rebased and updated $head_name."
msgstr ""
-#: git-rebase--interactive.sh:750
-msgid "Could not skip unnecessary pick commands"
-msgstr ""
-
-#: git-rebase--interactive.sh:908
-#, sh-format
-msgid ""
-"Warning: the SHA-1 is missing or isn't a commit in the following line:\n"
-" - $line"
-msgstr ""
-
-#: git-rebase--interactive.sh:941
-#, sh-format
-msgid ""
-"Warning: the command isn't recognized in the following line:\n"
-" - $line"
-msgstr ""
-
-#: git-rebase--interactive.sh:980
-msgid "could not detach HEAD"
-msgstr ""
-
-#: git-rebase--interactive.sh:1018
-msgid ""
-"Warning: some commits may have been dropped accidentally.\n"
-"Dropped commits (newer to older):"
-msgstr ""
-
-#: 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--interactive.sh:1037
-#, sh-format
-msgid ""
-"Unrecognized setting $check_level for option rebase.missingCommitsCheck. "
-"Ignoring."
-msgstr ""
-
-#: git-rebase--interactive.sh:1054
-msgid ""
-"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
-"continue'."
-msgstr ""
-
-#: git-rebase--interactive.sh:1055
-msgid "Or you can abort the rebase with 'git rebase --abort'."
-msgstr ""
-
-#: git-rebase--interactive.sh:1083
+#: git-rebase--preserve-merges.sh:757
msgid "Could not remove CHERRY_PICK_HEAD"
msgstr ""
-#: git-rebase--interactive.sh:1088
+#: git-rebase--preserve-merges.sh:762
#, sh-format
msgid ""
"You have staged changes in your working tree.\n"
" git rebase --continue\n"
msgstr ""
-#: git-rebase--interactive.sh:1105
+#: git-rebase--preserve-merges.sh:779
msgid "Error trying to find the author identity to amend commit"
msgstr ""
-#: git-rebase--interactive.sh:1110
+#: git-rebase--preserve-merges.sh:784
msgid ""
"You have uncommitted changes in your working tree. Please commit them\n"
"first and then run 'git rebase --continue' again."
msgstr ""
-#: git-rebase--interactive.sh:1115 git-rebase--interactive.sh:1119
+#: git-rebase--preserve-merges.sh:789 git-rebase--preserve-merges.sh:793
msgid "Could not commit staged changes."
msgstr ""
-#: git-rebase--interactive.sh:1147
-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"
-msgstr ""
-
-#: git-rebase--interactive.sh:1155 git-rebase--interactive.sh:1313
-msgid "Could not execute editor"
-msgstr ""
-
-#: git-rebase--interactive.sh:1168
-#, sh-format
-msgid "Could not checkout $switch_to"
-msgstr ""
-
-#: git-rebase--interactive.sh:1173
-msgid "No HEAD?"
-msgstr ""
-
-#: git-rebase--interactive.sh:1174
-#, sh-format
-msgid "Could not create temporary $state_dir"
-msgstr ""
-
-#: git-rebase--interactive.sh:1176
-msgid "Could not mark as interactive"
-msgstr ""
-
-#: git-rebase--interactive.sh:1186 git-rebase--interactive.sh:1191
-msgid "Could not init rewritten commits"
-msgstr ""
-
-#: git-rebase--interactive.sh:1291
-#, sh-format
-msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
-msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: git-rebase--interactive.sh:1296
+#: git-rebase--preserve-merges.sh:893
msgid ""
"\n"
"However, if you remove everything, the rebase will be aborted.\n"
"\n"
msgstr ""
-#: git-rebase--interactive.sh:1303
-msgid "Note that empty commits are commented out"
+#: git-rebase--preserve-merges.sh:942 git-rebase--preserve-merges.sh:947
+msgid "Could not init rewritten commits"
msgstr ""
#: git-sh-setup.sh:89 git-sh-setup.sh:94
msgid "unstaged"
msgstr ""
-#: git-add--interactive.perl:246 git-add--interactive.perl:271
+#: git-add--interactive.perl:253 git-add--interactive.perl:278
msgid "binary"
msgstr ""
-#: git-add--interactive.perl:255 git-add--interactive.perl:309
+#: git-add--interactive.perl:262 git-add--interactive.perl:316
msgid "nothing"
msgstr ""
-#: git-add--interactive.perl:291 git-add--interactive.perl:306
+#: git-add--interactive.perl:298 git-add--interactive.perl:313
msgid "unchanged"
msgstr ""
-#: git-add--interactive.perl:602
+#: git-add--interactive.perl:609
#, perl-format
msgid "added %d path\n"
msgid_plural "added %d paths\n"
msgstr[0] ""
msgstr[1] ""
-#: git-add--interactive.perl:605
+#: git-add--interactive.perl:612
#, perl-format
msgid "updated %d path\n"
msgid_plural "updated %d paths\n"
msgstr[0] ""
msgstr[1] ""
-#: git-add--interactive.perl:608
+#: git-add--interactive.perl:615
#, perl-format
msgid "reverted %d path\n"
msgid_plural "reverted %d paths\n"
msgstr[0] ""
msgstr[1] ""
-#: git-add--interactive.perl:611
+#: git-add--interactive.perl:618
#, perl-format
msgid "touched %d path\n"
msgid_plural "touched %d paths\n"
msgstr[0] ""
msgstr[1] ""
-#: git-add--interactive.perl:620
+#: git-add--interactive.perl:627
msgid "Update"
msgstr ""
-#: git-add--interactive.perl:632
+#: git-add--interactive.perl:639
msgid "Revert"
msgstr ""
-#: git-add--interactive.perl:655
+#: git-add--interactive.perl:662
#, perl-format
msgid "note: %s is untracked now.\n"
msgstr ""
-#: git-add--interactive.perl:666
+#: git-add--interactive.perl:673
msgid "Add untracked"
msgstr ""
-#: git-add--interactive.perl:672
+#: git-add--interactive.perl:679
msgid "No untracked files.\n"
msgstr ""
-#: git-add--interactive.perl:985
+#: git-add--interactive.perl:1033
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for staging."
msgstr ""
-#: git-add--interactive.perl:988
+#: git-add--interactive.perl:1036
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for stashing."
msgstr ""
-#: git-add--interactive.perl:991
+#: git-add--interactive.perl:1039
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for unstaging."
msgstr ""
-#: git-add--interactive.perl:994 git-add--interactive.perl:1003
+#: git-add--interactive.perl:1042 git-add--interactive.perl:1051
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for applying."
msgstr ""
-#: git-add--interactive.perl:997 git-add--interactive.perl:1000
+#: git-add--interactive.perl:1045 git-add--interactive.perl:1048
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for discarding."
msgstr ""
-#: git-add--interactive.perl:1013
+#: git-add--interactive.perl:1085
#, perl-format
msgid "failed to open hunk edit file for writing: %s"
msgstr ""
-#: git-add--interactive.perl:1014
+#: git-add--interactive.perl:1086
msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
msgstr ""
-#: git-add--interactive.perl:1020
+#: git-add--interactive.perl:1092
#, perl-format
msgid ""
"---\n"
msgstr ""
#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: git-add--interactive.perl:1028
+#: git-add--interactive.perl:1100
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-add--interactive.perl:1042
+#: git-add--interactive.perl:1114
#, perl-format
msgid "failed to open hunk edit file for reading: %s"
msgstr ""
#. 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:1134
+#: git-add--interactive.perl:1213
msgid ""
"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
msgstr ""
-#: git-add--interactive.perl:1143
+#: git-add--interactive.perl:1222
msgid ""
"y - stage this hunk\n"
"n - do not stage this hunk\n"
"d - do not stage this hunk or any of the later hunks in the file"
msgstr ""
-#: git-add--interactive.perl:1149
+#: git-add--interactive.perl:1228
msgid ""
"y - stash this hunk\n"
"n - do not stash this hunk\n"
"d - do not stash this hunk or any of the later hunks in the file"
msgstr ""
-#: git-add--interactive.perl:1155
+#: git-add--interactive.perl:1234
msgid ""
"y - unstage this hunk\n"
"n - do not unstage this hunk\n"
"d - do not unstage this hunk or any of the later hunks in the file"
msgstr ""
-#: git-add--interactive.perl:1161
+#: git-add--interactive.perl:1240
msgid ""
"y - apply this hunk to index\n"
"n - do not apply this hunk to index\n"
"d - do not apply this hunk or any of the later hunks in the file"
msgstr ""
-#: git-add--interactive.perl:1167
+#: git-add--interactive.perl:1246
msgid ""
"y - discard this hunk from worktree\n"
"n - do not discard this hunk from worktree\n"
"d - do not discard this hunk or any of the later hunks in the file"
msgstr ""
-#: git-add--interactive.perl:1173
+#: git-add--interactive.perl:1252
msgid ""
"y - discard this hunk from index and worktree\n"
"n - do not discard this hunk from index and worktree\n"
"d - do not discard this hunk or any of the later hunks in the file"
msgstr ""
-#: git-add--interactive.perl:1179
+#: git-add--interactive.perl:1258
msgid ""
"y - apply this hunk to index and worktree\n"
"n - do not apply this hunk to index and worktree\n"
"d - do not apply this hunk or any of the later hunks in the file"
msgstr ""
-#: git-add--interactive.perl:1188
+#: git-add--interactive.perl:1273
msgid ""
"g - select a hunk to go to\n"
"/ - search for a hunk matching the given regex\n"
"? - print help\n"
msgstr ""
-#: git-add--interactive.perl:1219
+#: git-add--interactive.perl:1304
msgid "The selected hunks do not apply to the index!\n"
msgstr ""
-#: git-add--interactive.perl:1220
+#: git-add--interactive.perl:1305
msgid "Apply them to the worktree anyway? "
msgstr ""
-#: git-add--interactive.perl:1223
+#: git-add--interactive.perl:1308
msgid "Nothing was applied.\n"
msgstr ""
-#: git-add--interactive.perl:1234
+#: git-add--interactive.perl:1319
#, perl-format
msgid "ignoring unmerged: %s\n"
msgstr ""
-#: git-add--interactive.perl:1243
+#: git-add--interactive.perl:1328
msgid "Only binary files changed.\n"
msgstr ""
-#: git-add--interactive.perl:1245
+#: git-add--interactive.perl:1330
msgid "No changes.\n"
msgstr ""
-#: git-add--interactive.perl:1253
+#: git-add--interactive.perl:1338
msgid "Patch update"
msgstr ""
-#: git-add--interactive.perl:1305
+#: git-add--interactive.perl:1390
#, perl-format
-msgid "Stage mode change [y,n,q,a,d,/%s,?]? "
+msgid "Stage mode change [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1306
+#: git-add--interactive.perl:1391
#, perl-format
-msgid "Stage deletion [y,n,q,a,d,/%s,?]? "
+msgid "Stage deletion [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1307
+#: git-add--interactive.perl:1392
#, perl-format
-msgid "Stage this hunk [y,n,q,a,d,/%s,?]? "
+msgid "Stage this hunk [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1310
+#: git-add--interactive.perl:1395
#, perl-format
-msgid "Stash mode change [y,n,q,a,d,/%s,?]? "
+msgid "Stash mode change [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1311
+#: git-add--interactive.perl:1396
#, perl-format
-msgid "Stash deletion [y,n,q,a,d,/%s,?]? "
+msgid "Stash deletion [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1312
+#: git-add--interactive.perl:1397
#, perl-format
-msgid "Stash this hunk [y,n,q,a,d,/%s,?]? "
+msgid "Stash this hunk [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1315
+#: git-add--interactive.perl:1400
#, perl-format
-msgid "Unstage mode change [y,n,q,a,d,/%s,?]? "
+msgid "Unstage mode change [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1316
+#: git-add--interactive.perl:1401
#, perl-format
-msgid "Unstage deletion [y,n,q,a,d,/%s,?]? "
+msgid "Unstage deletion [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1317
+#: git-add--interactive.perl:1402
#, perl-format
-msgid "Unstage this hunk [y,n,q,a,d,/%s,?]? "
+msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1320
+#: git-add--interactive.perl:1405
#, perl-format
-msgid "Apply mode change to index [y,n,q,a,d,/%s,?]? "
+msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1321
+#: git-add--interactive.perl:1406
#, perl-format
-msgid "Apply deletion to index [y,n,q,a,d,/%s,?]? "
+msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1322
+#: git-add--interactive.perl:1407
#, perl-format
-msgid "Apply this hunk to index [y,n,q,a,d,/%s,?]? "
+msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1325
+#: git-add--interactive.perl:1410
#, perl-format
-msgid "Discard mode change from worktree [y,n,q,a,d,/%s,?]? "
+msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1326
+#: git-add--interactive.perl:1411
#, perl-format
-msgid "Discard deletion from worktree [y,n,q,a,d,/%s,?]? "
+msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1327
+#: git-add--interactive.perl:1412
#, perl-format
-msgid "Discard this hunk from worktree [y,n,q,a,d,/%s,?]? "
+msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1330
+#: git-add--interactive.perl:1415
#, perl-format
-msgid "Discard mode change from index and worktree [y,n,q,a,d,/%s,?]? "
+msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1331
+#: git-add--interactive.perl:1416
#, perl-format
-msgid "Discard deletion from index and worktree [y,n,q,a,d,/%s,?]? "
+msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1332
+#: git-add--interactive.perl:1417
#, perl-format
-msgid "Discard this hunk from index and worktree [y,n,q,a,d,/%s,?]? "
+msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1335
+#: git-add--interactive.perl:1420
#, perl-format
-msgid "Apply mode change to index and worktree [y,n,q,a,d,/%s,?]? "
+msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1336
+#: git-add--interactive.perl:1421
#, perl-format
-msgid "Apply deletion to index and worktree [y,n,q,a,d,/%s,?]? "
+msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1337
+#: git-add--interactive.perl:1422
#, perl-format
-msgid "Apply this hunk to index and worktree [y,n,q,a,d,/%s,?]? "
+msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
+msgstr ""
+
+#: git-add--interactive.perl:1522
+msgid "No other hunks to goto\n"
msgstr ""
-#: git-add--interactive.perl:1440
+#: git-add--interactive.perl:1529
msgid "go to which hunk (<ret> to see more)? "
msgstr ""
-#: git-add--interactive.perl:1442
+#: git-add--interactive.perl:1531
msgid "go to which hunk? "
msgstr ""
-#: git-add--interactive.perl:1451
+#: git-add--interactive.perl:1540
#, perl-format
msgid "Invalid number: '%s'\n"
msgstr ""
-#: git-add--interactive.perl:1456
+#: git-add--interactive.perl:1545
#, 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:1482
+#: git-add--interactive.perl:1571
+msgid "No other hunks to search\n"
+msgstr ""
+
+#: git-add--interactive.perl:1575
msgid "search for regex? "
msgstr ""
-#: git-add--interactive.perl:1495
+#: git-add--interactive.perl:1588
#, perl-format
msgid "Malformed search regexp %s: %s\n"
msgstr ""
-#: git-add--interactive.perl:1505
+#: git-add--interactive.perl:1598
msgid "No hunk matches the given pattern\n"
msgstr ""
-#: git-add--interactive.perl:1517 git-add--interactive.perl:1539
+#: git-add--interactive.perl:1610 git-add--interactive.perl:1632
msgid "No previous hunk\n"
msgstr ""
-#: git-add--interactive.perl:1526 git-add--interactive.perl:1545
+#: git-add--interactive.perl:1619 git-add--interactive.perl:1638
msgid "No next hunk\n"
msgstr ""
-#: git-add--interactive.perl:1553
+#: git-add--interactive.perl:1644
+msgid "Sorry, cannot split this hunk\n"
+msgstr ""
+
+#: git-add--interactive.perl:1650
#, perl-format
msgid "Split into %d hunk.\n"
msgid_plural "Split into %d hunks.\n"
msgstr[0] ""
msgstr[1] ""
-#: git-add--interactive.perl:1605
+#: git-add--interactive.perl:1660
+msgid "Sorry, cannot edit this hunk\n"
+msgstr ""
+
+#: git-add--interactive.perl:1706
msgid "Review diff"
msgstr ""
#. TRANSLATORS: please do not translate the command names
#. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1624
+#: git-add--interactive.perl:1725
msgid ""
"status - show paths with changes\n"
"update - add working tree state to the staged set of changes\n"
"changes\n"
msgstr ""
-#: git-add--interactive.perl:1641 git-add--interactive.perl:1646
-#: git-add--interactive.perl:1649 git-add--interactive.perl:1656
-#: git-add--interactive.perl:1660 git-add--interactive.perl:1666
+#: git-add--interactive.perl:1742 git-add--interactive.perl:1747
+#: git-add--interactive.perl:1750 git-add--interactive.perl:1757
+#: git-add--interactive.perl:1761 git-add--interactive.perl:1767
msgid "missing --"
msgstr ""
-#: git-add--interactive.perl:1662
+#: git-add--interactive.perl:1763
#, perl-format
msgid "unknown --patch mode: %s"
msgstr ""
-#: git-add--interactive.perl:1668 git-add--interactive.perl:1674
+#: git-add--interactive.perl:1769 git-add--interactive.perl:1775
#, perl-format
msgid "invalid argument %s, expecting --"
msgstr ""
-#: git-send-email.perl:126
+#: git-send-email.perl:130
msgid "local zone differs from GMT by a non-minute interval\n"
msgstr ""
-#: git-send-email.perl:133 git-send-email.perl:139
+#: git-send-email.perl:137 git-send-email.perl:143
msgid "local time offset greater than or equal to 24 hours\n"
msgstr ""
-#: git-send-email.perl:208 git-send-email.perl:214
+#: git-send-email.perl:211 git-send-email.perl:217
msgid "the editor exited uncleanly, aborting everything"
msgstr ""
-#: git-send-email.perl:291
+#: git-send-email.perl:294
#, perl-format
msgid ""
"'%s' contains an intermediate version of the email you were composing.\n"
msgstr ""
-#: git-send-email.perl:296
+#: git-send-email.perl:299
#, perl-format
msgid "'%s.final' contains the composed email.\n"
msgstr ""
-#: git-send-email.perl:314
+#: git-send-email.perl:317
msgid "--dump-aliases incompatible with other options\n"
msgstr ""
-#: git-send-email.perl:379 git-send-email.perl:634
+#: git-send-email.perl:383 git-send-email.perl:638
msgid "Cannot run git format-patch from outside a repository\n"
msgstr ""
-#: git-send-email.perl:448
+#: git-send-email.perl:386
+msgid ""
+"`batch-size` and `relogin` must be specified together (via command-line or "
+"configuration option)\n"
+msgstr ""
+
+#: git-send-email.perl:456
#, perl-format
msgid "Unknown --suppress-cc field: '%s'\n"
msgstr ""
-#: git-send-email.perl:477
+#: git-send-email.perl:485
#, perl-format
msgid "Unknown --confirm setting: '%s'\n"
msgstr ""
-#: git-send-email.perl:509
+#: git-send-email.perl:513
#, perl-format
msgid "warning: sendmail alias with quotes is not supported: %s\n"
msgstr ""
-#: git-send-email.perl:511
+#: git-send-email.perl:515
#, perl-format
msgid "warning: `:include:` not supported: %s\n"
msgstr ""
-#: git-send-email.perl:513
+#: git-send-email.perl:517
#, perl-format
msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
msgstr ""
-#: git-send-email.perl:518
+#: git-send-email.perl:522
#, perl-format
msgid "warning: sendmail line is not recognized: %s\n"
msgstr ""
-#: git-send-email.perl:600
+#: git-send-email.perl:604
#, perl-format
msgid ""
"File '%s' exists but it could also be the range of commits\n"
" * Giving --format-patch option if you mean a range.\n"
msgstr ""
-#: git-send-email.perl:621
+#: git-send-email.perl:625
#, perl-format
msgid "Failed to opendir %s: %s"
msgstr ""
-#: git-send-email.perl:645
+#: git-send-email.perl:649
#, perl-format
msgid ""
"fatal: %s: %s\n"
"warning: no patches were sent\n"
msgstr ""
-#: git-send-email.perl:656
+#: git-send-email.perl:660
msgid ""
"\n"
"No patch files specified!\n"
"\n"
msgstr ""
-#: git-send-email.perl:669
+#: git-send-email.perl:673
#, perl-format
msgid "No subject line in %s?"
msgstr ""
-#: git-send-email.perl:679
+#: git-send-email.perl:683
#, perl-format
msgid "Failed to open for writing %s: %s"
msgstr ""
-#: git-send-email.perl:689
+#: git-send-email.perl:694
msgid ""
"Lines beginning in \"GIT:\" will be removed.\n"
"Consider including an overall diffstat or table of contents\n"
"Clear the body content if you don't wish to send a summary.\n"
msgstr ""
-#: git-send-email.perl:712
-#, perl-format
-msgid "Failed to open %s.final: %s"
-msgstr ""
-
-#: git-send-email.perl:715
+#: git-send-email.perl:718
#, perl-format
msgid "Failed to open %s: %s"
msgstr ""
-#: git-send-email.perl:750
-msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n"
+#: git-send-email.perl:735
+#, perl-format
+msgid "Failed to open %s.final: %s"
msgstr ""
-#: git-send-email.perl:759
+#: git-send-email.perl:778
msgid "Summary email is empty, skipping it\n"
msgstr ""
#. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:791
+#: git-send-email.perl:813
#, perl-format
msgid "Are you sure you want to use <%s> [y/N]? "
msgstr ""
-#: git-send-email.perl:820
+#: git-send-email.perl:868
msgid ""
"The following files are 8bit, but do not declare a Content-Transfer-"
"Encoding.\n"
msgstr ""
-#: git-send-email.perl:825
+#: git-send-email.perl:873
msgid "Which 8bit encoding should I declare [UTF-8]? "
msgstr ""
-#: git-send-email.perl:833
+#: git-send-email.perl:881
#, perl-format
msgid ""
"Refusing to send because the patch\n"
"want to send.\n"
msgstr ""
-#: git-send-email.perl:852
+#: git-send-email.perl:900
msgid "To whom should the emails be sent (if anyone)?"
msgstr ""
-#: git-send-email.perl:870
+#: git-send-email.perl:918
#, perl-format
msgid "fatal: alias '%s' expands to itself\n"
msgstr ""
-#: git-send-email.perl:882
+#: git-send-email.perl:930
msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
msgstr ""
-#: git-send-email.perl:932 git-send-email.perl:940
+#: git-send-email.perl:988 git-send-email.perl:996
#, perl-format
msgid "error: unable to extract a valid address from: %s\n"
msgstr ""
#. 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:944
+#: git-send-email.perl:1000
msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
msgstr ""
-#: git-send-email.perl:1245
+#: git-send-email.perl:1317
#, perl-format
msgid "CA path \"%s\" does not exist"
msgstr ""
-#: git-send-email.perl:1320
+#: git-send-email.perl:1400
msgid ""
" The Cc list above has been expanded by additional\n"
" addresses found in the patch commit message. By default\n"
"\n"
msgstr ""
-#. TRANSLATORS: Make sure to include [y] [n] [q] [a] in your
+#. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-send-email.perl:1335
-msgid "Send this email? ([y]es|[n]o|[q]uit|[a]ll): "
+#: git-send-email.perl:1415
+msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
msgstr ""
-#: git-send-email.perl:1338
+#: git-send-email.perl:1418
msgid "Send this email reply required"
msgstr ""
-#: git-send-email.perl:1364
+#: git-send-email.perl:1446
msgid "The required SMTP server is not properly defined."
msgstr ""
-#: git-send-email.perl:1411
+#: git-send-email.perl:1493
#, perl-format
msgid "Server does not support STARTTLS! %s"
msgstr ""
-#: git-send-email.perl:1416 git-send-email.perl:1420
+#: git-send-email.perl:1498 git-send-email.perl:1502
#, perl-format
msgid "STARTTLS failed! %s"
msgstr ""
-#: git-send-email.perl:1430
+#: git-send-email.perl:1511
msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
msgstr ""
-#: git-send-email.perl:1448
+#: git-send-email.perl:1529
#, perl-format
msgid "Failed to send %s\n"
msgstr ""
-#: git-send-email.perl:1451
+#: git-send-email.perl:1532
#, perl-format
msgid "Dry-Sent %s\n"
msgstr ""
-#: git-send-email.perl:1451
+#: git-send-email.perl:1532
#, perl-format
msgid "Sent %s\n"
msgstr ""
-#: git-send-email.perl:1453
+#: git-send-email.perl:1534
msgid "Dry-OK. Log says:\n"
msgstr ""
-#: git-send-email.perl:1453
+#: git-send-email.perl:1534
msgid "OK. Log says:\n"
msgstr ""
-#: git-send-email.perl:1465
+#: git-send-email.perl:1546
msgid "Result: "
msgstr ""
-#: git-send-email.perl:1468
+#: git-send-email.perl:1549
msgid "Result: OK\n"
msgstr ""
-#: git-send-email.perl:1481
+#: git-send-email.perl:1567
#, perl-format
msgid "can't open file %s"
msgstr ""
-#: git-send-email.perl:1528 git-send-email.perl:1548
+#: git-send-email.perl:1614 git-send-email.perl:1634
#, perl-format
msgid "(mbox) Adding cc: %s from line '%s'\n"
msgstr ""
-#: git-send-email.perl:1534
+#: git-send-email.perl:1620
#, perl-format
msgid "(mbox) Adding to: %s from line '%s'\n"
msgstr ""
-#: git-send-email.perl:1582
+#: git-send-email.perl:1673
#, perl-format
msgid "(non-mbox) Adding cc: %s from line '%s'\n"
msgstr ""
-#: git-send-email.perl:1605
+#: git-send-email.perl:1698
#, perl-format
msgid "(body) Adding cc: %s from line '%s'\n"
msgstr ""
-#: git-send-email.perl:1711
+#: git-send-email.perl:1809
#, perl-format
msgid "(%s) Could not execute '%s'"
msgstr ""
-#: git-send-email.perl:1718
+#: git-send-email.perl:1816
#, perl-format
msgid "(%s) Adding %s: %s from: '%s'\n"
msgstr ""
-#: git-send-email.perl:1722
+#: git-send-email.perl:1820
#, perl-format
msgid "(%s) failed to close pipe to '%s'"
msgstr ""
-#: git-send-email.perl:1749
+#: git-send-email.perl:1850
msgid "cannot send message as 7bit"
msgstr ""
-#: git-send-email.perl:1757
+#: git-send-email.perl:1858
msgid "invalid transfer encoding"
msgstr ""
-#: git-send-email.perl:1795 git-send-email.perl:1846 git-send-email.perl:1856
+#: git-send-email.perl:1899 git-send-email.perl:1951 git-send-email.perl:1961
#, perl-format
msgid "unable to open %s: %s\n"
msgstr ""
-#: git-send-email.perl:1798
+#: git-send-email.perl:1902
#, perl-format
msgid "%s: patch contains a line longer than 998 characters"
msgstr ""
-#: git-send-email.perl:1814
+#: git-send-email.perl:1919
#, perl-format
msgid "Skipping %s with backup suffix '%s'.\n"
msgstr ""
#. TRANSLATORS: please keep "[y|N]" as is.
-#: git-send-email.perl:1818
+#: git-send-email.perl:1923
#, perl-format
msgid "Do you really want to send %s? [y|N]: "
msgstr ""