msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2018-08-21 08:28+0800\n"
+"POT-Creation-Date: 2019-08-10 20:12+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:97
+#: advice.c:109
#, c-format
msgid "%shint: %.*s%s\n"
msgstr ""
-#: advice.c:150
+#: advice.c:162
msgid "Cherry-picking is not possible because you have unmerged files."
msgstr ""
-#: advice.c:152
+#: advice.c:164
msgid "Committing is not possible because you have unmerged files."
msgstr ""
-#: advice.c:154
+#: advice.c:166
msgid "Merging is not possible because you have unmerged files."
msgstr ""
-#: advice.c:156
+#: advice.c:168
msgid "Pulling is not possible because you have unmerged files."
msgstr ""
-#: advice.c:158
+#: advice.c:170
msgid "Reverting is not possible because you have unmerged files."
msgstr ""
-#: advice.c:160
+#: advice.c:172
#, c-format
msgid "It is not possible to %s because you have unmerged files."
msgstr ""
-#: advice.c:168
+#: advice.c:180
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:176
+#: advice.c:188
msgid "Exiting because of an unresolved conflict."
msgstr ""
-#: advice.c:181 builtin/merge.c:1286
+#: advice.c:193 builtin/merge.c:1327
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr ""
-#: advice.c:183
+#: advice.c:195
msgid "Please, commit your changes before merging."
msgstr ""
-#: advice.c:184
+#: advice.c:196
msgid "Exiting because of unfinished merge."
msgstr ""
-#: advice.c:190
+#: advice.c:202
#, c-format
msgid ""
-"Note: checking out '%s'.\n"
+"Note: switching to '%s'.\n"
"\n"
"You are in 'detached HEAD' state. You can look around, make experimental\n"
"changes and commit them, and you can discard any commits you make in this\n"
-"state without impacting any branches by performing another checkout.\n"
+"state without impacting any branches by switching back to a branch.\n"
"\n"
"If you want to create a new branch to retain commits you create, you may\n"
-"do so (now or later) by using -b with the checkout command again. Example:\n"
+"do so (now or later) by using -c with the switch command. Example:\n"
+"\n"
+" git switch -c <new-branch-name>\n"
+"\n"
+"Or undo this operation with:\n"
"\n"
-" git checkout -b <new-branch-name>\n"
+" git switch -\n"
"\n"
+"Turn off this advice by setting config variable advice.detachedHead to "
+"false\n"
+"\n"
+msgstr ""
+
+#: alias.c:50
+msgid "cmdline ends with \\"
+msgstr ""
+
+#: alias.c:51
+msgid "unclosed quote"
msgstr ""
-#: apply.c:59
+#: apply.c:69
#, c-format
msgid "unrecognized whitespace option '%s'"
msgstr ""
-#: apply.c:75
+#: apply.c:85
#, c-format
msgid "unrecognized whitespace ignore option '%s'"
msgstr ""
-#: apply.c:125
+#: apply.c:135
msgid "--reject and --3way cannot be used together."
msgstr ""
-#: apply.c:127
+#: apply.c:137
msgid "--cached and --3way cannot be used together."
msgstr ""
-#: apply.c:130
+#: apply.c:140
msgid "--3way outside a repository"
msgstr ""
-#: apply.c:141
+#: apply.c:151
msgid "--index outside a repository"
msgstr ""
-#: apply.c:144
+#: apply.c:154
msgid "--cached outside a repository"
msgstr ""
-#: apply.c:826
+#: apply.c:801
#, c-format
msgid "Cannot prepare timestamp regexp %s"
msgstr ""
-#: apply.c:835
+#: apply.c:810
#, c-format
msgid "regexec returned %d for input: %s"
msgstr ""
-#: apply.c:909
+#: apply.c:884
#, c-format
msgid "unable to find filename in patch at line %d"
msgstr ""
-#: apply.c:947
+#: apply.c:922
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
msgstr ""
-#: apply.c:953
+#: apply.c:928
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr ""
-#: apply.c:954
+#: apply.c:929
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr ""
-#: apply.c:959
+#: apply.c:934
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr ""
-#: apply.c:988
+#: apply.c:963
#, c-format
msgid "invalid mode on line %d: %s"
msgstr ""
-#: apply.c:1306
+#: apply.c:1282
#, c-format
msgid "inconsistent header lines %d and %d"
msgstr ""
-#: apply.c:1478
+#: apply.c:1460
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr ""
-#: apply.c:1547
+#: apply.c:1529
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr ""
-#: apply.c:1567
+#: apply.c:1551
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
msgstr[0] ""
msgstr[1] ""
-#: apply.c:1580
+#: apply.c:1564
#, c-format
msgid "git diff header lacks filename information (line %d)"
msgstr ""
-#: apply.c:1768
+#: apply.c:1752
msgid "new file depends on old contents"
msgstr ""
-#: apply.c:1770
+#: apply.c:1754
msgid "deleted file still has contents"
msgstr ""
-#: apply.c:1804
+#: apply.c:1788
#, c-format
msgid "corrupt patch at line %d"
msgstr ""
-#: apply.c:1841
+#: apply.c:1825
#, c-format
msgid "new file %s depends on old contents"
msgstr ""
-#: apply.c:1843
+#: apply.c:1827
#, c-format
msgid "deleted file %s still has contents"
msgstr ""
-#: apply.c:1846
+#: apply.c:1830
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr ""
-#: apply.c:1993
+#: apply.c:1977
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr ""
-#: apply.c:2030
+#: apply.c:2014
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr ""
-#: apply.c:2190
+#: apply.c:2176
#, c-format
msgid "patch with only garbage at line %d"
msgstr ""
-#: apply.c:2276
+#: apply.c:2262
#, c-format
msgid "unable to read symlink %s"
msgstr ""
-#: apply.c:2280
+#: apply.c:2266
#, c-format
msgid "unable to open or read %s"
msgstr ""
-#: apply.c:2939
+#: apply.c:2925
#, c-format
msgid "invalid start of line: '%c'"
msgstr ""
-#: apply.c:3060
+#: apply.c:3046
#, 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:3072
+#: apply.c:3058
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr ""
-#: apply.c:3078
+#: apply.c:3064
#, c-format
msgid ""
"while searching for:\n"
"%.*s"
msgstr ""
-#: apply.c:3100
+#: apply.c:3086
#, c-format
msgid "missing binary patch data for '%s'"
msgstr ""
-#: apply.c:3108
+#: apply.c:3094
#, c-format
msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
msgstr ""
-#: apply.c:3154
+#: apply.c:3141
#, c-format
msgid "cannot apply binary patch to '%s' without full index line"
msgstr ""
-#: apply.c:3164
+#: apply.c:3151
#, c-format
msgid ""
"the patch applies to '%s' (%s), which does not match the current contents."
msgstr ""
-#: apply.c:3172
+#: apply.c:3159
#, c-format
msgid "the patch applies to an empty '%s' but it is not empty"
msgstr ""
-#: apply.c:3190
+#: apply.c:3177
#, c-format
msgid "the necessary postimage %s for '%s' cannot be read"
msgstr ""
-#: apply.c:3203
+#: apply.c:3190
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr ""
-#: apply.c:3209
+#: apply.c:3196
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr ""
-#: apply.c:3230
+#: apply.c:3217
#, c-format
msgid "patch failed: %s:%ld"
msgstr ""
-#: apply.c:3352
+#: apply.c:3340
#, c-format
msgid "cannot checkout %s"
msgstr ""
-#: apply.c:3404 apply.c:3415 apply.c:3461 setup.c:278
+#: apply.c:3392 apply.c:3403 apply.c:3449 midx.c:62 setup.c:279
#, c-format
msgid "failed to read %s"
msgstr ""
-#: apply.c:3412
+#: apply.c:3400
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr ""
-#: apply.c:3441 apply.c:3681
+#: apply.c:3429 apply.c:3672
#, c-format
msgid "path %s has been renamed/deleted"
msgstr ""
-#: apply.c:3524 apply.c:3696
+#: apply.c:3515 apply.c:3687
#, c-format
msgid "%s: does not exist in index"
msgstr ""
-#: apply.c:3533 apply.c:3704
+#: apply.c:3524 apply.c:3695
#, c-format
msgid "%s: does not match index"
msgstr ""
-#: apply.c:3568
+#: apply.c:3559
msgid "repository lacks the necessary blob to fall back on 3-way merge."
msgstr ""
-#: apply.c:3571
+#: apply.c:3562
#, c-format
msgid "Falling back to three-way merge...\n"
msgstr ""
-#: apply.c:3587 apply.c:3591
+#: apply.c:3578 apply.c:3582
#, c-format
msgid "cannot read the current contents of '%s'"
msgstr ""
-#: apply.c:3603
+#: apply.c:3594
#, c-format
msgid "Failed to fall back on three-way merge...\n"
msgstr ""
-#: apply.c:3617
+#: apply.c:3608
#, c-format
msgid "Applied patch to '%s' with conflicts.\n"
msgstr ""
-#: apply.c:3622
+#: apply.c:3613
#, c-format
msgid "Applied patch to '%s' cleanly.\n"
msgstr ""
-#: apply.c:3648
+#: apply.c:3639
msgid "removal patch leaves file contents"
msgstr ""
-#: apply.c:3721
+#: apply.c:3712
#, c-format
msgid "%s: wrong type"
msgstr ""
-#: apply.c:3723
+#: apply.c:3714
#, c-format
msgid "%s has type %o, expected %o"
msgstr ""
-#: apply.c:3874 apply.c:3876
+#: apply.c:3865 apply.c:3867 read-cache.c:830 read-cache.c:856
+#: read-cache.c:1309
#, c-format
msgid "invalid path '%s'"
msgstr ""
-#: apply.c:3932
+#: apply.c:3923
#, c-format
msgid "%s: already exists in index"
msgstr ""
-#: apply.c:3935
+#: apply.c:3926
#, c-format
msgid "%s: already exists in working directory"
msgstr ""
-#: apply.c:3955
+#: apply.c:3946
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr ""
-#: apply.c:3960
+#: apply.c:3951
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr ""
-#: apply.c:3980
+#: apply.c:3971
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr ""
-#: apply.c:3984
+#: apply.c:3975
#, c-format
msgid "%s: patch does not apply"
msgstr ""
-#: apply.c:3999
+#: apply.c:3990
#, c-format
msgid "Checking patch %s..."
msgstr ""
-#: apply.c:4091
+#: apply.c:4082
#, c-format
msgid "sha1 information is lacking or useless for submodule %s"
msgstr ""
-#: apply.c:4098
+#: apply.c:4089
#, c-format
msgid "mode change for %s, which is not in current HEAD"
msgstr ""
-#: apply.c:4101
+#: apply.c:4092
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr ""
-#: apply.c:4106 builtin/checkout.c:237 builtin/reset.c:140
+#: apply.c:4097 builtin/checkout.c:278 builtin/reset.c:143
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr ""
-#: apply.c:4110
+#: apply.c:4101
#, c-format
msgid "could not add %s to temporary index"
msgstr ""
-#: apply.c:4120
+#: apply.c:4111
#, c-format
msgid "could not write temporary index to %s"
msgstr ""
-#: apply.c:4258
+#: apply.c:4249
#, c-format
msgid "unable to remove %s from index"
msgstr ""
-#: apply.c:4292
+#: apply.c:4283
#, c-format
msgid "corrupt patch for submodule %s"
msgstr ""
-#: apply.c:4298
+#: apply.c:4289
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr ""
-#: apply.c:4306
+#: apply.c:4297
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr ""
-#: apply.c:4312 apply.c:4457
+#: apply.c:4303 apply.c:4448
#, c-format
msgid "unable to add cache entry for %s"
msgstr ""
-#: apply.c:4355
+#: apply.c:4346
#, c-format
msgid "failed to write to '%s'"
msgstr ""
-#: apply.c:4359
+#: apply.c:4350
#, c-format
msgid "closing file '%s'"
msgstr ""
-#: apply.c:4429
+#: apply.c:4420
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr ""
-#: apply.c:4527
+#: apply.c:4518
#, c-format
msgid "Applied patch %s cleanly."
msgstr ""
-#: apply.c:4535
+#: apply.c:4526
msgid "internal error"
msgstr ""
-#: apply.c:4538
+#: apply.c:4529
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] ""
msgstr[1] ""
-#: apply.c:4549
+#: apply.c:4540
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr ""
-#: apply.c:4557 builtin/fetch.c:780 builtin/fetch.c:1048
+#: apply.c:4548 builtin/fetch.c:878 builtin/fetch.c:1168
#, c-format
msgid "cannot open %s"
msgstr ""
-#: apply.c:4571
+#: apply.c:4562
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr ""
-#: apply.c:4575
+#: apply.c:4566
#, c-format
msgid "Rejected hunk #%d."
msgstr ""
-#: apply.c:4685
+#: apply.c:4676
#, c-format
msgid "Skipped patch '%s'."
msgstr ""
-#: apply.c:4693
+#: apply.c:4684
msgid "unrecognized input"
msgstr ""
-#: apply.c:4712
+#: apply.c:4704
msgid "unable to read index file"
msgstr ""
-#: apply.c:4849
+#: apply.c:4859
#, c-format
msgid "can't open patch '%s': %s"
msgstr ""
-#: apply.c:4876
+#: apply.c:4886
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] ""
msgstr[1] ""
-#: apply.c:4882 apply.c:4897
+#: apply.c:4892 apply.c:4907
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgstr[0] ""
msgstr[1] ""
-#: apply.c:4890
+#: apply.c:4900
#, 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:4906 builtin/add.c:539 builtin/mv.c:300 builtin/rm.c:389
+#: apply.c:4916 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390
msgid "Unable to write new index file"
msgstr ""
-#: 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
+#: apply.c:4943 apply.c:4946 builtin/am.c:2208 builtin/am.c:2211
+#: builtin/clone.c:123 builtin/fetch.c:128 builtin/merge.c:273
+#: builtin/pull.c:208 builtin/submodule--helper.c:407
+#: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1370
+#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:1853
+#: builtin/submodule--helper.c:2092 git-add--interactive.perl:211
msgid "path"
msgstr ""
-#: apply.c:4934
+#: apply.c:4944
msgid "don't apply changes matching the given path"
msgstr ""
-#: apply.c:4937
+#: apply.c:4947
msgid "apply changes matching the given path"
msgstr ""
-#: apply.c:4939 builtin/am.c:2263
+#: apply.c:4949 builtin/am.c:2217
msgid "num"
msgstr ""
-#: apply.c:4940
+#: apply.c:4950
msgid "remove <num> leading slashes from traditional diff paths"
msgstr ""
-#: apply.c:4943
+#: apply.c:4953
msgid "ignore additions made by the patch"
msgstr ""
-#: apply.c:4945
+#: apply.c:4955
msgid "instead of applying the patch, output diffstat for the input"
msgstr ""
-#: apply.c:4949
+#: apply.c:4959
msgid "show number of added and deleted lines in decimal notation"
msgstr ""
-#: apply.c:4951
+#: apply.c:4961
msgid "instead of applying the patch, output a summary for the input"
msgstr ""
-#: apply.c:4953
+#: apply.c:4963
msgid "instead of applying the patch, see if the patch is applicable"
msgstr ""
-#: apply.c:4955
+#: apply.c:4965
msgid "make sure the patch is applicable to the current index"
msgstr ""
-#: apply.c:4957
+#: apply.c:4967
msgid "mark new files with `git add --intent-to-add`"
msgstr ""
-#: apply.c:4959
+#: apply.c:4969
msgid "apply a patch without touching the working tree"
msgstr ""
-#: apply.c:4961
+#: apply.c:4971
msgid "accept a patch that touches outside the working area"
msgstr ""
-#: apply.c:4964
+#: apply.c:4974
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr ""
-#: apply.c:4966
+#: apply.c:4976
msgid "attempt three-way merge if a patch does not apply"
msgstr ""
-#: apply.c:4968
+#: apply.c:4978
msgid "build a temporary index based on embedded index information"
msgstr ""
-#: apply.c:4971 builtin/checkout-index.c:168 builtin/ls-files.c:516
+#: apply.c:4981 builtin/checkout-index.c:173 builtin/ls-files.c:524
msgid "paths are separated with NUL character"
msgstr ""
-#: apply.c:4973
+#: apply.c:4983
msgid "ensure at least <n> lines of context match"
msgstr ""
-#: 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:3205
+#: apply.c:4984 builtin/am.c:2196 builtin/interpret-trailers.c:98
+#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102
+#: builtin/pack-objects.c:3330 builtin/rebase.c:1421
msgid "action"
msgstr ""
-#: apply.c:4975
+#: apply.c:4985
msgid "detect new or modified lines that have whitespace errors"
msgstr ""
-#: apply.c:4978 apply.c:4981
+#: apply.c:4988 apply.c:4991
msgid "ignore changes in whitespace when finding context"
msgstr ""
-#: apply.c:4984
+#: apply.c:4994
msgid "apply the patch in reverse"
msgstr ""
-#: apply.c:4986
+#: apply.c:4996
msgid "don't expect at least one line of context"
msgstr ""
-#: apply.c:4988
+#: apply.c:4998
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr ""
-#: apply.c:4990
+#: apply.c:5000
msgid "allow overlapping hunks"
msgstr ""
-#: 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
+#: apply.c:5001 builtin/add.c:291 builtin/check-ignore.c:22
+#: builtin/commit.c:1337 builtin/count-objects.c:98 builtin/fsck.c:786
+#: builtin/log.c:2068 builtin/mv.c:123 builtin/read-tree.c:128
msgid "be verbose"
msgstr ""
-#: apply.c:4993
+#: apply.c:5003
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr ""
-#: apply.c:4996
+#: apply.c:5006
msgid "do not trust the line counts in the hunk headers"
msgstr ""
-#: apply.c:4998 builtin/am.c:2251
+#: apply.c:5008 builtin/am.c:2205
msgid "root"
msgstr ""
-#: apply.c:4999
+#: apply.c:5009
msgid "prepend <root> to all filenames"
msgstr ""
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr ""
-#: archive.c:363 builtin/add.c:176 builtin/add.c:515 builtin/rm.c:298
+#: archive.c:372 builtin/add.c:177 builtin/add.c:516 builtin/rm.c:299
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr ""
-#: archive.c:446
+#: archive.c:396
+#, c-format
+msgid "no such ref: %.*s"
+msgstr ""
+
+#: archive.c:401
+#, c-format
+msgid "not a valid object name: %s"
+msgstr ""
+
+#: archive.c:414
+#, c-format
+msgid "not a tree object: %s"
+msgstr ""
+
+#: archive.c:426
+msgid "current working directory is untracked"
+msgstr ""
+
+#: archive.c:457
msgid "fmt"
msgstr ""
-#: archive.c:446
+#: archive.c:457
msgid "archive format"
msgstr ""
-#: archive.c:447 builtin/log.c:1473
+#: archive.c:458 builtin/log.c:1580
msgid "prefix"
msgstr ""
-#: archive.c:448
+#: archive.c:459
msgid "prepend prefix to each pathname in the archive"
msgstr ""
-#: 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
+#: archive.c:460 builtin/blame.c:862 builtin/blame.c:874 builtin/blame.c:875
+#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1134
+#: builtin/fast-export.c:1136 builtin/grep.c:897 builtin/hash-object.c:105
+#: builtin/ls-files.c:560 builtin/ls-files.c:563 builtin/notes.c:412
+#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:177
msgid "file"
msgstr ""
-#: archive.c:450 builtin/archive.c:89
+#: archive.c:461 builtin/archive.c:90
msgid "write the archive to this file"
msgstr ""
-#: archive.c:452
+#: archive.c:463
msgid "read .gitattributes in working directory"
msgstr ""
-#: archive.c:453
+#: archive.c:464
msgid "report archived files on stderr"
msgstr ""
-#: archive.c:454
+#: archive.c:465
msgid "store only"
msgstr ""
-#: archive.c:455
+#: archive.c:466
msgid "compress faster"
msgstr ""
-#: archive.c:463
+#: archive.c:474
msgid "compress better"
msgstr ""
-#: archive.c:466
+#: archive.c:477
msgid "list supported archive formats"
msgstr ""
-#: 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
+#: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116
+#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1859
msgid "repo"
msgstr ""
-#: archive.c:469 builtin/archive.c:91
+#: archive.c:480 builtin/archive.c:92
msgid "retrieve the archive from remote repository <repo>"
msgstr ""
-#: archive.c:470 builtin/archive.c:92 builtin/difftool.c:714
-#: builtin/notes.c:491
+#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:707
+#: builtin/notes.c:498
msgid "command"
msgstr ""
-#: archive.c:471 builtin/archive.c:93
+#: archive.c:482 builtin/archive.c:94
msgid "path to the remote git-upload-archive command"
msgstr ""
-#: archive.c:478
+#: archive.c:489
msgid "Unexpected option --remote"
msgstr ""
-#: archive.c:480
+#: archive.c:491
msgid "Option --exec can only be used together with --remote"
msgstr ""
-#: archive.c:482
+#: archive.c:493
msgid "Unexpected option --output"
msgstr ""
-#: archive.c:504
+#: archive.c:515
#, c-format
msgid "Unknown archive format '%s'"
msgstr ""
-#: archive.c:511
+#: archive.c:522
#, c-format
msgid "Argument not supported for format '%s': -%d"
msgstr ""
-#: archive-tar.c:125 archive-zip.c:344
+#: archive-tar.c:125 archive-zip.c:345
#, c-format
msgid "cannot stream blob %s"
msgstr ""
-#: archive-tar.c:260 archive-zip.c:361
+#: archive-tar.c:260 archive-zip.c:363
#, c-format
msgid "unsupported file mode: 0%o (SHA1: %s)"
msgstr ""
-#: archive-tar.c:287 archive-zip.c:352
+#: archive-tar.c:287 archive-zip.c:353
#, c-format
msgid "cannot read %s"
msgstr ""
-#: archive-tar.c:458
+#: archive-tar.c:459
#, c-format
msgid "unable to start '%s' filter"
msgstr ""
-#: archive-tar.c:461
+#: archive-tar.c:462
msgid "unable to redirect descriptor"
msgstr ""
-#: archive-tar.c:468
+#: archive-tar.c:469
#, c-format
msgid "'%s' filter reported error"
msgstr ""
-#: archive-zip.c:313
+#: archive-zip.c:314
#, c-format
msgid "path is not valid UTF-8: %s"
msgstr ""
-#: archive-zip.c:317
+#: archive-zip.c:318
#, 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
+#: archive-zip.c:474 builtin/pack-objects.c:230 builtin/pack-objects.c:233
#, c-format
msgid "deflate error (%d)"
msgstr ""
-#: archive-zip.c:605
+#: archive-zip.c:609
#, c-format
msgid "timestamp too large for this system: %<PRIuMAX>"
msgstr ""
-#: attr.c:218
+#: attr.c:211
#, c-format
msgid "%.*s is not a valid attribute name"
msgstr ""
-#: attr.c:415
+#: attr.c:368
+#, c-format
+msgid "%s not allowed: %s:%d"
+msgstr ""
+
+#: attr.c:408
msgid ""
"Negative patterns are ignored in git attributes\n"
"Use '\\!' for literal leading exclamation."
msgstr ""
-#: bisect.c:467
+#: bisect.c:468
#, c-format
msgid "Badly quoted content in file '%s': %s"
msgstr ""
-#: bisect.c:675
+#: bisect.c:678
#, c-format
msgid "We cannot bisect more!\n"
msgstr ""
-#: bisect.c:729
+#: bisect.c:733
#, c-format
msgid "Not a valid commit name %s"
msgstr ""
-#: bisect.c:753
+#: bisect.c:758
#, 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:758
+#: bisect.c:763
#, c-format
msgid ""
"The merge base %s is new.\n"
"The property has changed between %s and [%s].\n"
msgstr ""
-#: bisect.c:763
+#: bisect.c:768
#, 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:771
+#: bisect.c:776
#, 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:784
+#: bisect.c:789
#, c-format
msgid ""
"the merge base between %s and [%s] must be skipped.\n"
"We continue anyway."
msgstr ""
-#: bisect.c:817
+#: bisect.c:822
#, c-format
msgid "Bisecting: a merge base must be tested\n"
msgstr ""
-#: bisect.c:857
+#: bisect.c:865
#, c-format
msgid "a %s revision is needed"
msgstr ""
-#: bisect.c:876 builtin/notes.c:177 builtin/tag.c:237
+#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:254
#, c-format
msgid "could not create file '%s'"
msgstr ""
-#: bisect.c:927 builtin/merge.c:137
+#: bisect.c:928 builtin/merge.c:148
#, c-format
msgid "could not read file '%s'"
msgstr ""
-#: bisect.c:957
+#: bisect.c:958
msgid "reading bisect refs failed"
msgstr ""
-#: bisect.c:976
+#: bisect.c:977
#, c-format
msgid "%s was both %s and %s\n"
msgstr ""
-#: bisect.c:984
+#: bisect.c:985
#, c-format
msgid ""
"No testable commit found.\n"
"Maybe you started with bad path parameters?\n"
msgstr ""
-#: bisect.c:1003
+#: bisect.c:1004
#, 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:1009
+#: bisect.c:1010
#, 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:1786
+#: blame.c:2697
msgid "--contents and --reverse do not blend well."
msgstr ""
-#: blame.c:1800
+#: blame.c:2711
msgid "cannot use --contents with final commit object name"
msgstr ""
-#: blame.c:1821
+#: blame.c:2732
msgid "--reverse and --first-parent together require specified latest commit"
msgstr ""
-#: blame.c:1830 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:3032 builtin/pack-objects.c:3047
+#: blame.c:2741 bundle.c:167 ref-filter.c:2196 remote.c:1938 sequencer.c:2033
+#: sequencer.c:4348 builtin/commit.c:1020 builtin/log.c:387 builtin/log.c:963
+#: builtin/log.c:1451 builtin/log.c:1827 builtin/log.c:2117 builtin/merge.c:411
+#: builtin/pack-objects.c:3148 builtin/pack-objects.c:3163
#: builtin/shortlog.c:192
msgid "revision walk setup failed"
msgstr ""
-#: blame.c:1848
+#: blame.c:2759
msgid ""
"--reverse --first-parent together require range along first-parent chain"
msgstr ""
-#: blame.c:1859
+#: blame.c:2770
#, c-format
msgid "no such path %s in %s"
msgstr ""
-#: blame.c:1870
+#: blame.c:2781
#, c-format
msgid "cannot read blob %s for path %s"
msgstr ""
-#: branch.c:54
+#: branch.c:53
#, c-format
msgid ""
"\n"
"\"git branch --set-upstream-to=%s%s%s\"."
msgstr ""
-#: branch.c:68
+#: branch.c:67
#, c-format
msgid "Not setting branch %s as its own upstream."
msgstr ""
-#: branch.c:94
+#: branch.c:93
#, c-format
msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
msgstr ""
-#: branch.c:95
+#: branch.c:94
#, c-format
msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
msgstr ""
-#: branch.c:99
+#: branch.c:98
#, c-format
msgid "Branch '%s' set up to track local branch '%s' by rebasing."
msgstr ""
-#: branch.c:100
+#: branch.c:99
#, c-format
msgid "Branch '%s' set up to track local branch '%s'."
msgstr ""
-#: branch.c:105
+#: branch.c:104
#, c-format
msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
msgstr ""
-#: branch.c:106
+#: branch.c:105
#, c-format
msgid "Branch '%s' set up to track remote ref '%s'."
msgstr ""
-#: branch.c:110
+#: branch.c:109
#, c-format
msgid "Branch '%s' set up to track local ref '%s' by rebasing."
msgstr ""
-#: branch.c:111
+#: branch.c:110
#, c-format
msgid "Branch '%s' set up to track local ref '%s'."
msgstr ""
-#: branch.c:120
+#: branch.c:119
msgid "Unable to write upstream branch configuration"
msgstr ""
-#: branch.c:157
+#: branch.c:156
#, c-format
msgid "Not tracking: ambiguous information for ref %s"
msgstr ""
-#: branch.c:190
+#: branch.c:189
#, c-format
msgid "'%s' is not a valid branch name."
msgstr ""
-#: branch.c:209
+#: branch.c:208
#, c-format
msgid "A branch named '%s' already exists."
msgstr ""
-#: branch.c:214
+#: branch.c:213
msgid "Cannot force update the current branch."
msgstr ""
-#: branch.c:234
+#: branch.c:233
#, c-format
msgid "Cannot setup tracking information; starting point '%s' is not a branch."
msgstr ""
-#: branch.c:236
+#: branch.c:235
#, c-format
msgid "the requested upstream branch '%s' does not exist"
msgstr ""
-#: branch.c:238
+#: branch.c:237
msgid ""
"\n"
"If you are planning on basing your work on an upstream\n"
msgid "Not a valid branch point: '%s'."
msgstr ""
-#: branch.c:360
+#: branch.c:364
#, c-format
msgid "'%s' is already checked out at '%s'"
msgstr ""
-#: branch.c:383
+#: branch.c:387
#, c-format
msgid "HEAD of working tree %s is not updated"
msgstr ""
msgid "unrecognized header: %s%s (%d)"
msgstr ""
-#: bundle.c:90 sequencer.c:2092 sequencer.c:2578 builtin/commit.c:768
+#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2283 sequencer.c:3024
+#: builtin/commit.c:791
#, c-format
msgid "could not open '%s'"
msgstr ""
-#: bundle.c:141
+#: bundle.c:143
msgid "Repository lacks these prerequisite commits:"
msgstr ""
-#: bundle.c:192
+#: bundle.c:146
+msgid "need a repository to verify a bundle"
+msgstr ""
+
+#: bundle.c:197
#, c-format
msgid "The bundle contains this ref:"
msgid_plural "The bundle contains these %d refs:"
msgstr[0] ""
msgstr[1] ""
-#: bundle.c:199
+#: bundle.c:204
msgid "The bundle records a complete history."
msgstr ""
-#: bundle.c:201
+#: bundle.c:206
#, c-format
msgid "The bundle requires this ref:"
msgid_plural "The bundle requires these %d refs:"
msgstr[0] ""
msgstr[1] ""
-#: bundle.c:260
+#: bundle.c:272
+msgid "unable to dup bundle descriptor"
+msgstr ""
+
+#: bundle.c:279
msgid "Could not spawn pack-objects"
msgstr ""
-#: bundle.c:271
+#: bundle.c:290
msgid "pack-objects died"
msgstr ""
-#: bundle.c:313
+#: bundle.c:332
msgid "rev-list died"
msgstr ""
-#: bundle.c:362
+#: bundle.c:381
#, c-format
msgid "ref '%s' is excluded by the rev-list options"
msgstr ""
-#: bundle.c:453 builtin/log.c:187 builtin/log.c:1618 builtin/shortlog.c:304
+#: bundle.c:460 builtin/log.c:202 builtin/log.c:1732 builtin/shortlog.c:306
#, c-format
msgid "unrecognized argument: %s"
msgstr ""
-#: bundle.c:461
+#: bundle.c:468
msgid "Refusing to create empty bundle."
msgstr ""
-#: bundle.c:473
+#: bundle.c:478
#, c-format
msgid "cannot create '%s'"
msgstr ""
-#: bundle.c:501
+#: bundle.c:503
msgid "index-pack died"
msgstr ""
msgid "invalid color value: %.*s"
msgstr ""
-#: 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
+#: commit.c:50 sequencer.c:2727 builtin/am.c:355 builtin/am.c:399
+#: builtin/am.c:1378 builtin/am.c:2020 builtin/replace.c:455
#, c-format
msgid "could not parse %s"
msgstr ""
-#: commit.c:50
+#: commit.c:52
#, c-format
msgid "%s %s is not a commit!"
msgstr ""
-#: commit.c:191
+#: commit.c:192
msgid ""
"Support for <GIT_DIR>/info/grafts is deprecated\n"
"and will be removed in a future Git version.\n"
"\"git config advice.graftFileDeprecated false\""
msgstr ""
-#: commit.c:1629
+#: commit.c:1127
+#, c-format
+msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
+msgstr ""
+
+#: commit.c:1130
+#, c-format
+msgid "Commit %s has a bad GPG signature allegedly by %s."
+msgstr ""
+
+#: commit.c:1133
+#, c-format
+msgid "Commit %s does not have a GPG signature."
+msgstr ""
+
+#: commit.c:1136
+#, c-format
+msgid "Commit %s has a good GPG signature by %s\n"
+msgstr ""
+
+#: commit.c:1390
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 ""
-#: commit-graph.c:83
+#: commit-graph.c:127
+msgid "commit-graph file is too small"
+msgstr ""
+
+#: commit-graph.c:192
#, c-format
-msgid "graph file %s is too small"
+msgid "commit-graph signature %X does not match signature %X"
msgstr ""
-#: commit-graph.c:90
+#: commit-graph.c:199
#, c-format
-msgid "graph signature %X does not match signature %X"
+msgid "commit-graph version %X does not match version %X"
msgstr ""
-#: commit-graph.c:97
+#: commit-graph.c:206
#, c-format
-msgid "graph version %X does not match version %X"
+msgid "commit-graph hash version %X does not match version %X"
+msgstr ""
+
+#: commit-graph.c:229
+msgid "commit-graph chunk lookup table entry missing; file may be incomplete"
msgstr ""
-#: commit-graph.c:104
+#: commit-graph.c:240
#, c-format
-msgid "hash version %X does not match version %X"
+msgid "commit-graph improper chunk offset %08x%08x"
msgstr ""
-#: commit-graph.c:128
+#: commit-graph.c:283
#, c-format
-msgid "improper chunk offset %08x%08x"
+msgid "commit-graph chunk id %08x appears multiple times"
+msgstr ""
+
+#: commit-graph.c:347
+msgid "commit-graph has no base graphs chunk"
+msgstr ""
+
+#: commit-graph.c:357
+msgid "commit-graph chain does not match"
msgstr ""
-#: commit-graph.c:164
+#: commit-graph.c:404
#, c-format
-msgid "chunk id %08x appears multiple times"
+msgid "invalid commit-graph chain: line '%s' not a hash"
+msgstr ""
+
+#: commit-graph.c:430
+msgid "unable to find all commit-graph files"
+msgstr ""
+
+#: commit-graph.c:554 commit-graph.c:614
+msgid "invalid commit position. commit-graph is likely corrupt"
msgstr ""
-#: commit-graph.c:261
+#: commit-graph.c:575
#, c-format
msgid "could not find commit %s"
msgstr ""
-#: commit-graph.c:565 builtin/pack-objects.c:2571
+#: commit-graph.c:1002 builtin/pack-objects.c:2657
#, c-format
msgid "unable to get type of object %s"
msgstr ""
-#: commit-graph.c:730
+#: commit-graph.c:1034
+msgid "Loading known commits in commit graph"
+msgstr ""
+
+#: commit-graph.c:1051
+msgid "Expanding reachable commits in commit graph"
+msgstr ""
+
+#: commit-graph.c:1070
+msgid "Clearing commit marks in commit graph"
+msgstr ""
+
+#: commit-graph.c:1089
+msgid "Computing commit graph generation numbers"
+msgstr ""
+
+#: commit-graph.c:1163
+#, c-format
+msgid "Finding commits for commit graph in %d pack"
+msgid_plural "Finding commits for commit graph in %d packs"
+msgstr[0] ""
+msgstr[1] ""
+
+#: commit-graph.c:1176
#, c-format
msgid "error adding pack %s"
msgstr ""
-#: commit-graph.c:732
+#: commit-graph.c:1180
#, c-format
msgid "error opening index for %s"
msgstr ""
-#: commit-graph.c:773
+#: commit-graph.c:1204
#, c-format
-msgid "the commit graph format cannot write %d commits"
+msgid "Finding commits for commit graph from %d ref"
+msgid_plural "Finding commits for commit graph from %d refs"
+msgstr[0] ""
+msgstr[1] ""
+
+#: commit-graph.c:1238
+msgid "Finding commits for commit graph among packed objects"
msgstr ""
-#: commit-graph.c:800
-msgid "too many commits to write graph"
+#: commit-graph.c:1253
+msgid "Counting distinct commits in commit graph"
+msgstr ""
+
+#: commit-graph.c:1284
+msgid "Finding extra edges in commit graph"
msgstr ""
-#: commit-graph.c:806
+#: commit-graph.c:1332
+msgid "failed to write correct number of base graph ids"
+msgstr ""
+
+#: commit-graph.c:1365 midx.c:811
#, c-format
msgid "unable to create leading directories of %s"
msgstr ""
-#: commit-graph.c:904
+#: commit-graph.c:1377 builtin/index-pack.c:306 builtin/repack.c:240
+#, c-format
+msgid "unable to create '%s'"
+msgstr ""
+
+#: commit-graph.c:1437
+#, c-format
+msgid "Writing out commit graph in %d pass"
+msgid_plural "Writing out commit graph in %d passes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: commit-graph.c:1478
+msgid "unable to open commit-graph chain file"
+msgstr ""
+
+#: commit-graph.c:1490
+msgid "failed to rename base commit-graph file"
+msgstr ""
+
+#: commit-graph.c:1510
+msgid "failed to rename temporary commit-graph file"
+msgstr ""
+
+#: commit-graph.c:1621
+msgid "Scanning merged commits"
+msgstr ""
+
+#: commit-graph.c:1632
+#, c-format
+msgid "unexpected duplicate commit id %s"
+msgstr ""
+
+#: commit-graph.c:1657
+msgid "Merging commit-graph"
+msgstr ""
+
+#: commit-graph.c:1844
+#, c-format
+msgid "the commit graph format cannot write %d commits"
+msgstr ""
+
+#: commit-graph.c:1855
+msgid "too many commits to write graph"
+msgstr ""
+
+#: commit-graph.c:1945
msgid "the commit-graph file has incorrect checksum and is likely corrupt"
msgstr ""
-#: compat/obstack.c:405 compat/obstack.c:407
+#: commit-graph.c:1955
+#, c-format
+msgid "commit-graph has incorrect OID order: %s then %s"
+msgstr ""
+
+#: commit-graph.c:1965 commit-graph.c:1980
+#, c-format
+msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
+msgstr ""
+
+#: commit-graph.c:1972
+#, c-format
+msgid "failed to parse commit %s from commit-graph"
+msgstr ""
+
+#: commit-graph.c:1989
+msgid "Verifying commits in commit graph"
+msgstr ""
+
+#: commit-graph.c:2002
+#, c-format
+msgid "failed to parse commit %s from object database for commit-graph"
+msgstr ""
+
+#: commit-graph.c:2009
+#, c-format
+msgid "root tree OID for commit %s in commit-graph is %s != %s"
+msgstr ""
+
+#: commit-graph.c:2019
+#, c-format
+msgid "commit-graph parent list for commit %s is too long"
+msgstr ""
+
+#: commit-graph.c:2028
+#, c-format
+msgid "commit-graph parent for %s is %s != %s"
+msgstr ""
+
+#: commit-graph.c:2041
+#, c-format
+msgid "commit-graph parent list for commit %s terminates early"
+msgstr ""
+
+#: commit-graph.c:2046
+#, c-format
+msgid ""
+"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
+msgstr ""
+
+#: commit-graph.c:2050
+#, c-format
+msgid ""
+"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
+msgstr ""
+
+#: commit-graph.c:2065
+#, c-format
+msgid "commit-graph generation for commit %s is %u != %u"
+msgstr ""
+
+#: commit-graph.c:2071
+#, c-format
+msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
+msgstr ""
+
+#: compat/obstack.c:406 compat/obstack.c:408
msgid "memory exhausted"
msgstr ""
-#: config.c:123
+#: config.c:124
#, c-format
msgid ""
"exceeded maximum include depth (%d) while including\n"
"\t%s\n"
"from\n"
"\t%s\n"
-"Do you have circular includes?"
+"This might be due to circular includes."
msgstr ""
-#: config.c:139
+#: config.c:140
#, c-format
msgid "could not expand include path '%s'"
msgstr ""
-#: config.c:150
+#: config.c:151
msgid "relative config includes must come from files"
msgstr ""
-#: config.c:190
+#: config.c:197
msgid "relative config include conditionals must come from files"
msgstr ""
-#: config.c:348
+#: config.c:376
#, c-format
msgid "key does not contain a section: %s"
msgstr ""
-#: config.c:354
+#: config.c:382
#, c-format
msgid "key does not contain variable name: %s"
msgstr ""
-#: config.c:378 sequencer.c:2206
+#: config.c:406 sequencer.c:2463
#, c-format
msgid "invalid key: %s"
msgstr ""
-#: config.c:384
+#: config.c:412
#, c-format
msgid "invalid key (newline): %s"
msgstr ""
-#: config.c:420 config.c:432
+#: config.c:448 config.c:460
#, c-format
msgid "bogus config parameter: %s"
msgstr ""
-#: config.c:467
+#: config.c:495
#, c-format
msgid "bogus format in %s"
msgstr ""
-#: config.c:793
+#: config.c:821
#, c-format
msgid "bad config line %d in blob %s"
msgstr ""
-#: config.c:797
+#: config.c:825
#, c-format
msgid "bad config line %d in file %s"
msgstr ""
-#: config.c:801
+#: config.c:829
#, c-format
msgid "bad config line %d in standard input"
msgstr ""
-#: config.c:805
+#: config.c:833
#, c-format
msgid "bad config line %d in submodule-blob %s"
msgstr ""
-#: config.c:809
+#: config.c:837
#, c-format
msgid "bad config line %d in command line %s"
msgstr ""
-#: config.c:813
+#: config.c:841
#, c-format
msgid "bad config line %d in %s"
msgstr ""
-#: config.c:952
+#: config.c:978
msgid "out of range"
msgstr ""
-#: config.c:952
+#: config.c:978
msgid "invalid unit"
msgstr ""
-#: config.c:958
+#: config.c:979
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
msgstr ""
-#: config.c:963
+#: config.c:998
#, c-format
msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
msgstr ""
-#: config.c:966
+#: config.c:1001
#, c-format
msgid "bad numeric config value '%s' for '%s' in file %s: %s"
msgstr ""
-#: config.c:969
+#: config.c:1004
#, c-format
msgid "bad numeric config value '%s' for '%s' in standard input: %s"
msgstr ""
-#: config.c:972
+#: config.c:1007
#, c-format
msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
msgstr ""
-#: config.c:975
+#: config.c:1010
#, c-format
msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
msgstr ""
-#: config.c:978
+#: config.c:1013
#, c-format
msgid "bad numeric config value '%s' for '%s' in %s: %s"
msgstr ""
-#: config.c:1073
+#: config.c:1108
#, c-format
msgid "failed to expand user dir in: '%s'"
msgstr ""
-#: config.c:1082
+#: config.c:1117
#, c-format
msgid "'%s' for '%s' is not a valid timestamp"
msgstr ""
-#: config.c:1173
+#: config.c:1208
#, c-format
msgid "abbrev length out of range: %d"
msgstr ""
-#: config.c:1187 config.c:1198
+#: config.c:1222 config.c:1233
#, c-format
msgid "bad zlib compression level %d"
msgstr ""
-#: config.c:1290
+#: config.c:1325
msgid "core.commentChar should only be one character"
msgstr ""
-#: config.c:1323
+#: config.c:1358
#, c-format
msgid "invalid mode for object creation: %s"
msgstr ""
-#: config.c:1403
+#: config.c:1430
#, c-format
msgid "malformed value for %s"
msgstr ""
-#: config.c:1429
+#: config.c:1456
#, c-format
msgid "malformed value for %s: %s"
msgstr ""
-#: config.c:1430
+#: config.c:1457
msgid "must be one of nothing, matching, simple, upstream or current"
msgstr ""
-#: config.c:1489 builtin/pack-objects.c:3282
+#: config.c:1518 builtin/pack-objects.c:3410
#, c-format
msgid "bad pack compression level %d"
msgstr ""
-#: config.c:1610
+#: config.c:1639
#, c-format
msgid "unable to load config blob object '%s'"
msgstr ""
-#: config.c:1613
+#: config.c:1642
#, c-format
msgid "reference '%s' does not point to a blob"
msgstr ""
-#: config.c:1630
+#: config.c:1659
#, c-format
msgid "unable to resolve config blob '%s'"
msgstr ""
-#: config.c:1660
+#: config.c:1689
#, c-format
msgid "failed to parse %s"
msgstr ""
-#: config.c:1700
+#: config.c:1745
msgid "unable to parse command-line config"
msgstr ""
-#: config.c:2032
+#: config.c:2094
msgid "unknown error occurred while reading the configuration files"
msgstr ""
-#: config.c:2202
+#: config.c:2264
#, c-format
msgid "Invalid %s: '%s'"
msgstr ""
-#: config.c:2245
+#: config.c:2307
#, c-format
msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
msgstr ""
-#: config.c:2271
+#: config.c:2333
#, c-format
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
msgstr ""
-#: config.c:2296
+#: config.c:2379
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr ""
-#: config.c:2298
+#: config.c:2381
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr ""
-#: config.c:2379
+#: config.c:2462
#, c-format
msgid "invalid section name '%s'"
msgstr ""
-#: config.c:2411
+#: config.c:2494
#, c-format
msgid "%s has multiple values"
msgstr ""
-#: config.c:2440
+#: config.c:2523
#, c-format
msgid "failed to write new configuration file %s"
msgstr ""
-#: config.c:2691 config.c:3015
+#: config.c:2775 config.c:3099
#, c-format
msgid "could not lock config file %s"
msgstr ""
-#: config.c:2702
+#: config.c:2786
#, c-format
msgid "opening %s"
msgstr ""
-#: config.c:2737 builtin/config.c:324
+#: config.c:2821 builtin/config.c:328
#, c-format
msgid "invalid pattern: %s"
msgstr ""
-#: config.c:2762
+#: config.c:2846
#, c-format
msgid "invalid config file %s"
msgstr ""
-#: config.c:2775 config.c:3028
+#: config.c:2859 config.c:3112
#, c-format
msgid "fstat on %s failed"
msgstr ""
-#: config.c:2786
+#: config.c:2870
#, c-format
msgid "unable to mmap '%s'"
msgstr ""
-#: config.c:2795 config.c:3033
+#: config.c:2879 config.c:3117
#, c-format
msgid "chmod on %s failed"
msgstr ""
-#: config.c:2880 config.c:3130
+#: config.c:2964 config.c:3214
#, c-format
msgid "could not write config file %s"
msgstr ""
-#: config.c:2914
+#: config.c:2998
#, c-format
msgid "could not set '%s' to '%s'"
msgstr ""
-#: config.c:2916 builtin/remote.c:781
+#: config.c:3000 builtin/remote.c:782
#, c-format
msgid "could not unset '%s'"
msgstr ""
-#: config.c:3006
+#: config.c:3090
#, c-format
msgid "invalid section name: %s"
msgstr ""
-#: config.c:3173
+#: config.c:3257
#, c-format
msgid "missing value for '%s'"
msgstr ""
msgid "repository on the other end cannot be shallow"
msgstr ""
-#: connect.c:310 fetch-pack.c:183 builtin/archive.c:63
-#, c-format
-msgid "remote error: %s"
-msgstr ""
-
-#: connect.c:316
+#: connect.c:313
msgid "invalid packet"
msgstr ""
-#: connect.c:336
+#: connect.c:333
#, c-format
msgid "protocol error: unexpected '%s'"
msgstr ""
-#: connect.c:444
+#: connect.c:441
#, c-format
msgid "invalid ls-refs response: %s"
msgstr ""
-#: connect.c:448
+#: connect.c:445
msgid "expected flush after ref listing"
msgstr ""
-#: connect.c:547
+#: connect.c:544
#, c-format
msgid "protocol '%s' is not supported"
msgstr ""
-#: connect.c:598
+#: connect.c:595
msgid "unable to set SO_KEEPALIVE on socket"
msgstr ""
-#: connect.c:638 connect.c:701
+#: connect.c:635 connect.c:698
#, c-format
msgid "Looking up %s ... "
msgstr ""
-#: connect.c:642
+#: connect.c:639
#, 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
+#: connect.c:643 connect.c:714
#, c-format
msgid ""
"done.\n"
"Connecting to %s (port %s) ... "
msgstr ""
-#: connect.c:668 connect.c:745
+#: connect.c:665 connect.c:742
#, c-format
msgid ""
"unable to connect to %s:\n"
msgstr ""
#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
-#: connect.c:674 connect.c:751
+#: connect.c:671 connect.c:748
msgid "done."
msgstr ""
-#: connect.c:705
+#: connect.c:702
#, c-format
msgid "unable to look up %s (%s)"
msgstr ""
-#: connect.c:711
+#: connect.c:708
#, c-format
msgid "unknown port %s"
msgstr ""
-#: connect.c:848 connect.c:1174
+#: connect.c:845 connect.c:1171
#, c-format
msgid "strange hostname '%s' blocked"
msgstr ""
-#: connect.c:850
+#: connect.c:847
#, c-format
msgid "strange port '%s' blocked"
msgstr ""
-#: connect.c:860
+#: connect.c:857
#, c-format
msgid "cannot start proxy %s"
msgstr ""
-#: connect.c:927
+#: connect.c:924
msgid "no path specified; see 'git help pull' for valid url syntax"
msgstr ""
-#: connect.c:1122
+#: connect.c:1119
msgid "ssh variant 'simple' does not support -4"
msgstr ""
-#: connect.c:1134
+#: connect.c:1131
msgid "ssh variant 'simple' does not support -6"
msgstr ""
-#: connect.c:1151
+#: connect.c:1148
msgid "ssh variant 'simple' does not support setting port"
msgstr ""
-#: connect.c:1262
+#: connect.c:1260
#, c-format
msgid "strange pathname '%s' blocked"
msgstr ""
msgid "unable to fork"
msgstr ""
-#: connected.c:68 builtin/fsck.c:203 builtin/prune.c:146
+#: connected.c:86 builtin/fsck.c:221 builtin/prune.c:43
msgid "Checking connectivity"
msgstr ""
-#: connected.c:80
+#: connected.c:98
msgid "Could not run 'git rev-list'"
msgstr ""
-#: connected.c:100
+#: connected.c:118
msgid "failed write to rev-list"
msgstr ""
-#: connected.c:107
+#: connected.c:125
msgid "failed to close rev-list's stdin"
msgstr ""
-#: convert.c:194
+#: convert.c:193
#, c-format
msgid "illegal crlf_action %d"
msgstr ""
-#: convert.c:207
+#: convert.c:206
#, c-format
msgid "CRLF would be replaced by LF in %s"
msgstr ""
-#: convert.c:209
+#: convert.c:208
#, 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
+#: convert.c:216
#, c-format
msgid "LF would be replaced by CRLF in %s"
msgstr ""
-#: convert.c:219
+#: convert.c:218
#, 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
+#: convert.c:279
#, c-format
msgid "BOM is prohibited in '%s' if encoded as %s"
msgstr ""
-#: convert.c:287
+#: convert.c:286
#, c-format
msgid ""
"The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-"
"tree-encoding."
msgstr ""
-#: convert.c:305
+#: convert.c:304
#, c-format
msgid "BOM is required in '%s' if encoded as %s"
msgstr ""
-#: convert.c:307
+#: convert.c:306
#, 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
+#: convert.c:424 convert.c:495
#, c-format
msgid "failed to encode '%s' from %s to %s"
msgstr ""
-#: convert.c:468
+#: convert.c:467
#, c-format
msgid "encoding '%s' from %s to %s and back is not the same"
msgstr ""
-#: convert.c:674
+#: convert.c:673
#, c-format
msgid "cannot fork to run external filter '%s'"
msgstr ""
-#: convert.c:694
+#: convert.c:693
#, c-format
msgid "cannot feed the input to external filter '%s'"
msgstr ""
-#: convert.c:701
+#: convert.c:700
#, c-format
msgid "external filter '%s' failed %d"
msgstr ""
-#: convert.c:736 convert.c:739
+#: convert.c:735 convert.c:738
#, c-format
msgid "read from external filter '%s' failed"
msgstr ""
-#: convert.c:742 convert.c:796
+#: convert.c:741 convert.c:796
#, c-format
msgid "external filter '%s' failed"
msgstr ""
msgid "true/false are no valid working-tree-encodings"
msgstr ""
-#: convert.c:1402 convert.c:1436
+#: convert.c:1398 convert.c:1432
#, c-format
msgid "%s: clean filter '%s' failed"
msgstr ""
-#: convert.c:1480
+#: convert.c:1476
#, c-format
msgid "%s: smudge filter %s failed"
msgstr ""
-#: date.c:116
+#: date.c:137
msgid "in the future"
msgstr ""
-#: date.c:122
+#: date.c:143
#, c-format
msgid "%<PRIuMAX> second ago"
msgid_plural "%<PRIuMAX> seconds ago"
msgstr[0] ""
msgstr[1] ""
-#: date.c:129
+#: date.c:150
#, c-format
msgid "%<PRIuMAX> minute ago"
msgid_plural "%<PRIuMAX> minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: date.c:136
+#: date.c:157
#, c-format
msgid "%<PRIuMAX> hour ago"
msgid_plural "%<PRIuMAX> hours ago"
msgstr[0] ""
msgstr[1] ""
-#: date.c:143
+#: date.c:164
#, c-format
msgid "%<PRIuMAX> day ago"
msgid_plural "%<PRIuMAX> days ago"
msgstr[0] ""
msgstr[1] ""
-#: date.c:149
+#: date.c:170
#, c-format
msgid "%<PRIuMAX> week ago"
msgid_plural "%<PRIuMAX> weeks ago"
msgstr[0] ""
msgstr[1] ""
-#: date.c:156
+#: date.c:177
#, c-format
msgid "%<PRIuMAX> month ago"
msgid_plural "%<PRIuMAX> months ago"
msgstr[0] ""
msgstr[1] ""
-#: date.c:167
+#: date.c:188
#, c-format
msgid "%<PRIuMAX> year"
msgid_plural "%<PRIuMAX> years"
msgstr[1] ""
#. TRANSLATORS: "%s" is "<n> years"
-#: date.c:170
+#: date.c:191
#, c-format
msgid "%s, %<PRIuMAX> month ago"
msgid_plural "%s, %<PRIuMAX> months ago"
msgstr[0] ""
msgstr[1] ""
-#: date.c:175 date.c:180
+#: date.c:196 date.c:201
#, c-format
msgid "%<PRIuMAX> year ago"
msgid_plural "%<PRIuMAX> years ago"
msgstr[0] ""
msgstr[1] ""
+#: delta-islands.c:272
+msgid "Propagating island marks"
+msgstr ""
+
+#: delta-islands.c:290
+#, c-format
+msgid "bad tree object %s"
+msgstr ""
+
+#: delta-islands.c:334
+#, c-format
+msgid "failed to load island regex for '%s': %s"
+msgstr ""
+
+#: delta-islands.c:390
+#, c-format
+msgid "island regex from config has too many capture groups (max=%d)"
+msgstr ""
+
+#: delta-islands.c:467
+#, c-format
+msgid "Marked %d islands, done.\n"
+msgstr ""
+
#: diffcore-order.c:24
#, c-format
msgid "failed to read orderfile '%s'"
msgstr ""
-#: diffcore-rename.c:536
+#: diffcore-rename.c:544
msgid "Performing inexact rename detection"
msgstr ""
-#: diff.c:108
-#, c-format
-msgid "option '%s' requires a value"
+#: diff-no-index.c:238
+msgid "git diff --no-index [<options>] <path> <path>"
+msgstr ""
+
+#: diff-no-index.c:263
+msgid ""
+"Not a git repository. Use --no-index to compare two paths outside a working "
+"tree"
msgstr ""
-#: diff.c:158
+#: diff.c:155
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr ""
-#: diff.c:163
+#: diff.c:160
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr ""
-#: diff.c:291
+#: diff.c:296
msgid ""
"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
"'dimmed-zebra', 'plain'"
msgstr ""
-#: diff.c:316
+#: diff.c:324
#, c-format
-msgid "ignoring unknown color-moved-ws mode '%s'"
+msgid ""
+"unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
+"'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-change'"
msgstr ""
-#: diff.c:323
+#: diff.c:332
msgid ""
-"color-moved-ws: allow-indentation-change cannot be combined with other white "
-"space modes"
+"color-moved-ws: allow-indentation-change cannot be combined with other "
+"whitespace modes"
msgstr ""
-#: diff.c:394
+#: diff.c:405
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr ""
-#: diff.c:454
+#: diff.c:465
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
"%s"
msgstr ""
-#: diff.c:4096
+#: diff.c:4215
#, c-format
msgid "external diff died, stopping at %s"
msgstr ""
-#: diff.c:4427
+#: diff.c:4560
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
msgstr ""
-#: diff.c:4430
+#: diff.c:4563
msgid "-G, -S and --find-object are mutually exclusive"
msgstr ""
-#: diff.c:4508
+#: diff.c:4641
msgid "--follow requires exactly one pathspec"
msgstr ""
-#: diff.c:4674
+#: diff.c:4689
+#, c-format
+msgid "invalid --stat value: %s"
+msgstr ""
+
+#: diff.c:4694 diff.c:4699 diff.c:4704 diff.c:4709 diff.c:5222
+#: parse-options.c:199 parse-options.c:203
+#, c-format
+msgid "%s expects a numerical value"
+msgstr ""
+
+#: diff.c:4726
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
"%s"
msgstr ""
-#: diff.c:4688
+#: diff.c:4811
#, c-format
-msgid "Failed to parse --submodule option parameter: '%s'"
+msgid "unknown change class '%c' in --diff-filter=%s"
msgstr ""
-#: diff.c:5766
-msgid "inexact rename detection was skipped due to too many files."
+#: diff.c:4835
+#, c-format
+msgid "unknown value after ws-error-highlight=%.*s"
msgstr ""
-#: diff.c:5769
-msgid "only found copies from modified paths due to too many files."
+#: diff.c:4849
+#, c-format
+msgid "unable to resolve '%s'"
msgstr ""
-#: diff.c:5772
+#: diff.c:4899 diff.c:4905
#, c-format
-msgid ""
-"you may want to set your %s variable to at least %d and retry the command."
+msgid "%s expects <n>/<m> form"
msgstr ""
-#: dir.c:569
+#: diff.c:4917
#, c-format
-msgid "pathspec '%s' did not match any file(s) known to git"
+msgid "%s expects a character, got '%s'"
msgstr ""
-#: dir.c:958
+#: diff.c:4938
#, c-format
-msgid "cannot use %s as an exclude file"
+msgid "bad --color-moved argument: %s"
msgstr ""
-#: dir.c:1873
+#: diff.c:4957
#, c-format
-msgid "could not open directory '%s'"
+msgid "invalid mode '%s' in --color-moved-ws"
msgstr ""
-#: dir.c:2115
-msgid "failed to get kernel name and information"
+#: diff.c:4997
+msgid ""
+"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
+"\"histogram\""
msgstr ""
-#: dir.c:2239
-msgid "untracked cache is disabled on this system or location"
+#: diff.c:5033 diff.c:5053
+#, c-format
+msgid "invalid argument to %s"
msgstr ""
-#: dir.c:3037
+#: diff.c:5191
#, c-format
-msgid "index file corrupt in repo %s"
+msgid "failed to parse --submodule option parameter: '%s'"
msgstr ""
-#: dir.c:3082 dir.c:3087
+#: diff.c:5247
#, c-format
-msgid "could not create directories for %s"
+msgid "bad --word-diff argument: %s"
msgstr ""
-#: dir.c:3116
-#, c-format
-msgid "could not migrate git directory from '%s' to '%s'"
+#: diff.c:5270
+msgid "Diff output format options"
msgstr ""
-#: editor.c:61
-#, c-format
-msgid "hint: Waiting for your editor to close the file...%c"
+#: diff.c:5272 diff.c:5278
+msgid "generate patch"
msgstr ""
-#: entry.c:178
-msgid "Filtering content"
+#: diff.c:5275 builtin/log.c:172
+msgid "suppress diff output"
msgstr ""
-#: entry.c:437
-#, c-format
-msgid "could not stat file '%s'"
+#: diff.c:5280 diff.c:5394 diff.c:5401
+msgid "<n>"
msgstr ""
-#: environment.c:150
-#, c-format
-msgid "bad git namespace path \"%s\""
+#: diff.c:5281 diff.c:5284
+msgid "generate diffs with <n> lines context"
msgstr ""
-#: environment.c:332
-#, c-format
-msgid "could not set GIT_DIR to '%s'"
+#: diff.c:5286
+msgid "generate the diff in raw format"
msgstr ""
-#: exec-cmd.c:361
-#, c-format
-msgid "too many args to run %s"
+#: diff.c:5289
+msgid "synonym for '-p --raw'"
msgstr ""
-#: fetch-object.c:17
-msgid "Remote with no URL"
+#: diff.c:5293
+msgid "synonym for '-p --stat'"
msgstr ""
-#: fetch-pack.c:152
-msgid "git fetch-pack: expected shallow list"
+#: diff.c:5297
+msgid "machine friendly --stat"
msgstr ""
-#: fetch-pack.c:164
-msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
+#: diff.c:5300
+msgid "output only the last line of --stat"
msgstr ""
-#: fetch-pack.c:184
-#, c-format
-msgid "git fetch-pack: expected ACK/NAK, got '%s'"
+#: diff.c:5302 diff.c:5310
+msgid "<param1,param2>..."
msgstr ""
-#: fetch-pack.c:254
-msgid "--stateless-rpc requires multi_ack_detailed"
+#: diff.c:5303
+msgid ""
+"output the distribution of relative amount of changes for each sub-directory"
msgstr ""
-#: fetch-pack.c:342 fetch-pack.c:1257
-#, c-format
-msgid "invalid shallow line: %s"
+#: diff.c:5307
+msgid "synonym for --dirstat=cumulative"
msgstr ""
-#: fetch-pack.c:348 fetch-pack.c:1263
-#, c-format
-msgid "invalid unshallow line: %s"
+#: diff.c:5311
+msgid "synonym for --dirstat=files,param1,param2..."
msgstr ""
-#: fetch-pack.c:350 fetch-pack.c:1265
-#, c-format
-msgid "object not found: %s"
+#: diff.c:5315
+msgid "warn if changes introduce conflict markers or whitespace errors"
msgstr ""
-#: fetch-pack.c:353 fetch-pack.c:1268
-#, c-format
-msgid "error in object: %s"
+#: diff.c:5318
+msgid "condensed summary such as creations, renames and mode changes"
msgstr ""
-#: fetch-pack.c:355 fetch-pack.c:1270
-#, c-format
-msgid "no shallow found: %s"
+#: diff.c:5321
+msgid "show only names of changed files"
msgstr ""
-#: fetch-pack.c:358 fetch-pack.c:1273
-#, c-format
-msgid "expected shallow/unshallow, got %s"
+#: diff.c:5324
+msgid "show only names and status of changed files"
msgstr ""
-#: fetch-pack.c:399
-#, c-format
-msgid "got %s %d %s"
+#: diff.c:5326
+msgid "<width>[,<name-width>[,<count>]]"
msgstr ""
-#: fetch-pack.c:416
-#, c-format
-msgid "invalid commit %s"
+#: diff.c:5327
+msgid "generate diffstat"
msgstr ""
-#: fetch-pack.c:447
-msgid "giving up"
+#: diff.c:5329 diff.c:5332 diff.c:5335
+msgid "<width>"
msgstr ""
-#: fetch-pack.c:459 progress.c:229
-msgid "done"
+#: diff.c:5330
+msgid "generate diffstat with a given width"
msgstr ""
-#: fetch-pack.c:471
-#, c-format
-msgid "got %s (%d) %s"
+#: diff.c:5333
+msgid "generate diffstat with a given name width"
msgstr ""
-#: fetch-pack.c:517
-#, c-format
-msgid "Marking %s as complete"
+#: diff.c:5336
+msgid "generate diffstat with a given graph width"
msgstr ""
-#: fetch-pack.c:764
-#, c-format
-msgid "already have %s (%s)"
+#: diff.c:5338
+msgid "<count>"
msgstr ""
-#: fetch-pack.c:803
-msgid "fetch-pack: unable to fork off sideband demultiplexer"
+#: diff.c:5339
+msgid "generate diffstat with limited lines"
msgstr ""
-#: fetch-pack.c:811
-msgid "protocol error: bad pack header"
+#: diff.c:5342
+msgid "generate compact summary in diffstat"
msgstr ""
-#: fetch-pack.c:879
-#, c-format
-msgid "fetch-pack: unable to fork off %s"
+#: diff.c:5345
+msgid "output a binary diff that can be applied"
msgstr ""
-#: fetch-pack.c:895
-#, c-format
-msgid "%s failed"
+#: diff.c:5348
+msgid "show full pre- and post-image object names on the \"index\" lines"
msgstr ""
-#: fetch-pack.c:897
-msgid "error in sideband demultiplexer"
+#: diff.c:5350
+msgid "show colored diff"
msgstr ""
-#: fetch-pack.c:926
-msgid "Server does not support shallow clients"
+#: diff.c:5351
+msgid "<kind>"
msgstr ""
-#: fetch-pack.c:930
-msgid "Server supports multi_ack_detailed"
+#: diff.c:5352
+msgid ""
+"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
+"diff"
msgstr ""
-#: fetch-pack.c:933
-msgid "Server supports no-done"
+#: diff.c:5355
+msgid ""
+"do not munge pathnames and use NULs as output field terminators in --raw or "
+"--numstat"
msgstr ""
-#: fetch-pack.c:939
-msgid "Server supports multi_ack"
+#: diff.c:5358 diff.c:5361 diff.c:5364 diff.c:5470
+msgid "<prefix>"
msgstr ""
-#: fetch-pack.c:943
-msgid "Server supports side-band-64k"
+#: diff.c:5359
+msgid "show the given source prefix instead of \"a/\""
msgstr ""
-#: fetch-pack.c:947
-msgid "Server supports side-band"
+#: diff.c:5362
+msgid "show the given destination prefix instead of \"b/\""
msgstr ""
-#: fetch-pack.c:951
-msgid "Server supports allow-tip-sha1-in-want"
+#: diff.c:5365
+msgid "prepend an additional prefix to every line of output"
msgstr ""
-#: fetch-pack.c:955
-msgid "Server supports allow-reachable-sha1-in-want"
+#: diff.c:5368
+msgid "do not show any source or destination prefix"
msgstr ""
-#: fetch-pack.c:965
-msgid "Server supports ofs-delta"
+#: diff.c:5371
+msgid "show context between diff hunks up to the specified number of lines"
msgstr ""
-#: fetch-pack.c:971 fetch-pack.c:1150
-msgid "Server supports filter"
+#: diff.c:5375 diff.c:5380 diff.c:5385
+msgid "<char>"
msgstr ""
-#: fetch-pack.c:979
-#, c-format
-msgid "Server version is %.*s"
+#: diff.c:5376
+msgid "specify the character to indicate a new line instead of '+'"
msgstr ""
-#: fetch-pack.c:985
-msgid "Server does not support --shallow-since"
+#: diff.c:5381
+msgid "specify the character to indicate an old line instead of '-'"
msgstr ""
-#: fetch-pack.c:989
-msgid "Server does not support --shallow-exclude"
+#: diff.c:5386
+msgid "specify the character to indicate a context instead of ' '"
msgstr ""
-#: fetch-pack.c:991
-msgid "Server does not support --deepen"
+#: diff.c:5389
+msgid "Diff rename options"
msgstr ""
-#: fetch-pack.c:1004
-msgid "no common commits"
+#: diff.c:5390
+msgid "<n>[/<m>]"
msgstr ""
-#: fetch-pack.c:1016 fetch-pack.c:1393
-msgid "git fetch-pack: fetch failed."
+#: diff.c:5391
+msgid "break complete rewrite changes into pairs of delete and create"
msgstr ""
-#: fetch-pack.c:1145
-msgid "Server does not support shallow requests"
+#: diff.c:5395
+msgid "detect renames"
msgstr ""
-#: fetch-pack.c:1191
-#, c-format
-msgid "error reading section header '%s'"
+#: diff.c:5399
+msgid "omit the preimage for deletes"
msgstr ""
-#: fetch-pack.c:1197
-#, c-format
-msgid "expected '%s', received '%s'"
+#: diff.c:5402
+msgid "detect copies"
msgstr ""
-#: fetch-pack.c:1236
-#, c-format
-msgid "unexpected acknowledgment line: '%s'"
+#: diff.c:5406
+msgid "use unmodified files as source to find copies"
msgstr ""
-#: fetch-pack.c:1241
-#, c-format
-msgid "error processing acks: %d"
+#: diff.c:5408
+msgid "disable rename detection"
msgstr ""
-#: fetch-pack.c:1278
-#, c-format
-msgid "error processing shallow info: %d"
+#: diff.c:5411
+msgid "use empty blobs as rename source"
msgstr ""
-#: fetch-pack.c:1294
-#, c-format
-msgid "expected wanted-ref, got '%s'"
+#: diff.c:5413
+msgid "continue listing the history of a file beyond renames"
msgstr ""
-#: fetch-pack.c:1304
-#, c-format
-msgid "unexpected wanted-ref: '%s'"
+#: diff.c:5416
+msgid ""
+"prevent rename/copy detection if the number of rename/copy targets exceeds "
+"given limit"
msgstr ""
-#: fetch-pack.c:1308
-#, c-format
-msgid "error processing wanted refs: %d"
+#: diff.c:5418
+msgid "Diff algorithm options"
msgstr ""
-#: fetch-pack.c:1603
-msgid "no matching remote head"
+#: diff.c:5420
+msgid "produce the smallest possible diff"
msgstr ""
-#: fetch-pack.c:1621 builtin/clone.c:664
-msgid "remote did not send all necessary objects"
+#: diff.c:5423
+msgid "ignore whitespace when comparing lines"
msgstr ""
-#: fetch-pack.c:1647
-#, c-format
-msgid "no such remote ref %s"
+#: diff.c:5426
+msgid "ignore changes in amount of whitespace"
msgstr ""
-#: fetch-pack.c:1650
-#, c-format
-msgid "Server does not allow request for unadvertised object %s"
+#: diff.c:5429
+msgid "ignore changes in whitespace at EOL"
msgstr ""
-#: gpg-interface.c:253
-msgid "gpg failed to sign the data"
+#: diff.c:5432
+msgid "ignore carrier-return at the end of line"
msgstr ""
-#: gpg-interface.c:279
-msgid "could not create temporary file"
+#: diff.c:5435
+msgid "ignore changes whose lines are all blank"
msgstr ""
-#: gpg-interface.c:282
-#, c-format
-msgid "failed writing detached signature to '%s'"
+#: diff.c:5438
+msgid "heuristic to shift diff hunk boundaries for easy reading"
msgstr ""
-#: graph.c:97
-#, c-format
-msgid "ignore invalid color '%.*s' in log.graphColors"
+#: diff.c:5441
+msgid "generate diff using the \"patience diff\" algorithm"
msgstr ""
-#: grep.c:2115
-#, c-format
-msgid "'%s': unable to read %s"
+#: diff.c:5445
+msgid "generate diff using the \"histogram diff\" algorithm"
msgstr ""
-#: 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'"
+#: diff.c:5447
+msgid "<algorithm>"
msgstr ""
-#: grep.c:2143
-#, c-format
-msgid "'%s': short read"
+#: diff.c:5448
+msgid "choose a diff algorithm"
msgstr ""
-#: help.c:23
-msgid "start a working area (see also: git help tutorial)"
+#: diff.c:5450
+msgid "<text>"
msgstr ""
-#: help.c:24
-msgid "work on the current change (see also: git help everyday)"
+#: diff.c:5451
+msgid "generate diff using the \"anchored diff\" algorithm"
msgstr ""
-#: help.c:25
-msgid "examine the history and state (see also: git help revisions)"
+#: diff.c:5453 diff.c:5462 diff.c:5465
+msgid "<mode>"
msgstr ""
-#: help.c:26
-msgid "grow, mark and tweak your common history"
+#: diff.c:5454
+msgid "show word diff, using <mode> to delimit changed words"
msgstr ""
-#: help.c:27
-msgid "collaborate (see also: git help workflows)"
+#: diff.c:5456 diff.c:5459 diff.c:5504
+msgid "<regex>"
msgstr ""
-#: help.c:31
-msgid "Main Porcelain Commands"
+#: diff.c:5457
+msgid "use <regex> to decide what a word is"
msgstr ""
-#: help.c:32
-msgid "Ancillary Commands / Manipulators"
+#: diff.c:5460
+msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
msgstr ""
-#: help.c:33
-msgid "Ancillary Commands / Interrogators"
+#: diff.c:5463
+msgid "moved lines of code are colored differently"
msgstr ""
-#: help.c:34
-msgid "Interacting with Others"
+#: diff.c:5466
+msgid "how white spaces are ignored in --color-moved"
msgstr ""
-#: help.c:35
-msgid "Low-level Commands / Manipulators"
+#: diff.c:5469
+msgid "Other diff options"
msgstr ""
-#: help.c:36
-msgid "Low-level Commands / Interrogators"
+#: diff.c:5471
+msgid "when run from subdir, exclude changes outside and show relative paths"
msgstr ""
-#: help.c:37
-msgid "Low-level Commands / Synching Repositories"
+#: diff.c:5475
+msgid "treat all files as text"
msgstr ""
-#: help.c:38
-msgid "Low-level Commands / Internal Helpers"
+#: diff.c:5477
+msgid "swap two inputs, reverse the diff"
msgstr ""
-#: help.c:293
-#, c-format
-msgid "available git commands in '%s'"
+#: diff.c:5479
+msgid "exit with 1 if there were differences, 0 otherwise"
msgstr ""
-#: help.c:300
-msgid "git commands available from elsewhere on your $PATH"
+#: diff.c:5481
+msgid "disable all output of the program"
msgstr ""
-#: help.c:309
-msgid "These are common Git commands used in various situations:"
+#: diff.c:5483
+msgid "allow an external diff helper to be executed"
msgstr ""
-#: help.c:358 git.c:90
-#, c-format
-msgid "unsupported command listing type '%s'"
+#: diff.c:5485
+msgid "run external text conversion filters when comparing binary files"
msgstr ""
-#: help.c:405
-msgid "The common Git guides are:"
+#: diff.c:5487
+msgid "<when>"
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?"
+#: diff.c:5488
+msgid "ignore changes to submodules in the diff generation"
msgstr ""
-#: help.c:611
-msgid "Uh oh. Your system reports no Git commands at all."
+#: diff.c:5491
+msgid "<format>"
msgstr ""
-#: help.c:633
-#, c-format
-msgid "WARNING: You called a Git command named '%s', which does not exist."
+#: diff.c:5492
+msgid "specify how differences in submodules are shown"
msgstr ""
-#: help.c:638
-#, c-format
-msgid "Continuing under the assumption that you meant '%s'."
+#: diff.c:5496
+msgid "hide 'git add -N' entries from the index"
msgstr ""
-#: help.c:643
-#, c-format
-msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
+#: diff.c:5499
+msgid "treat 'git add -N' entries as real in the index"
msgstr ""
-#: help.c:651
-#, c-format
-msgid "git: '%s' is not a git command. See 'git --help'."
+#: diff.c:5501
+msgid "<string>"
msgstr ""
-#: help.c:655
+#: diff.c:5502
msgid ""
-"\n"
-"The most similar command is"
-msgid_plural ""
-"\n"
-"The most similar commands are"
-msgstr[0] ""
-msgstr[1] ""
-
-#: help.c:670
-msgid "git version [<options>]"
+"look for differences that change the number of occurrences of the specified "
+"string"
msgstr ""
-#: help.c:738
-#, c-format
-msgid "%s: %s - %s"
+#: diff.c:5505
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"regex"
msgstr ""
-#: help.c:742
-msgid ""
-"\n"
-"Did you mean this?"
-msgid_plural ""
-"\n"
-"Did you mean one of these?"
-msgstr[0] ""
-msgstr[1] ""
+#: diff.c:5508
+msgid "show all changes in the changeset with -S or -G"
+msgstr ""
-#: ident.c:342
-msgid ""
-"\n"
-"*** Please tell me who you are.\n"
-"\n"
-"Run\n"
-"\n"
-" git config --global user.email \"you@example.com\"\n"
-" git config --global user.name \"Your Name\"\n"
-"\n"
-"to set your account's default identity.\n"
-"Omit --global to set the identity only in this repository.\n"
-"\n"
+#: diff.c:5511
+msgid "treat <string> in -S as extended POSIX regular expression"
msgstr ""
-#: ident.c:366
-msgid "no email was given and auto-detection is disabled"
+#: diff.c:5514
+msgid "control the order in which files appear in the output"
msgstr ""
-#: ident.c:371
-#, c-format
-msgid "unable to auto-detect email address (got '%s')"
+#: diff.c:5515
+msgid "<object-id>"
msgstr ""
-#: ident.c:381
-msgid "no name was given and auto-detection is disabled"
+#: diff.c:5516
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"object"
msgstr ""
-#: ident.c:387
-#, c-format
-msgid "unable to auto-detect name (got '%s')"
+#: diff.c:5518
+msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
msgstr ""
-#: ident.c:395
-#, c-format
-msgid "empty ident name (for <%s>) not allowed"
+#: diff.c:5519
+msgid "select files by diff type"
msgstr ""
-#: ident.c:401
-#, c-format
-msgid "name consists only of disallowed characters: %s"
+#: diff.c:5521
+msgid "<file>"
msgstr ""
-#: ident.c:416 builtin/commit.c:600
-#, c-format
-msgid "invalid date format: %s"
+#: diff.c:5522
+msgid "Output to a specific file"
msgstr ""
-#: list-objects-filter-options.c:36
-msgid "multiple filter-specs cannot be combined"
+#: diff.c:6177
+msgid "inexact rename detection was skipped due to too many files."
msgstr ""
-#: list-objects-filter-options.c:126
-msgid "cannot change partial clone promisor remote"
+#: diff.c:6180
+msgid "only found copies from modified paths due to too many files."
msgstr ""
-#: lockfile.c:151
+#: diff.c:6183
#, c-format
msgid ""
-"Unable to create '%s.lock': %s.\n"
-"\n"
-"Another git process seems to be running in this repository, e.g.\n"
-"an editor opened by 'git commit'. Please make sure all processes\n"
-"are terminated then try again. If it still fails, a git process\n"
-"may have crashed in this repository earlier:\n"
-"remove the file manually to continue."
+"you may want to set your %s variable to at least %d and retry the command."
msgstr ""
-#: lockfile.c:159
+#: dir.c:537
#, c-format
-msgid "Unable to create '%s.lock': %s"
+msgid "pathspec '%s' did not match any file(s) known to git"
msgstr ""
-#: merge.c:40
-msgid "failed to read the cache"
+#: dir.c:926
+#, c-format
+msgid "cannot use %s as an exclude file"
msgstr ""
-#: 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"
+#: dir.c:1843
+#, c-format
+msgid "could not open directory '%s'"
msgstr ""
-#: merge-recursive.c:303
-msgid "(bad commit)\n"
+#: dir.c:2085
+msgid "failed to get kernel name and information"
msgstr ""
-#: merge-recursive.c:325
-#, c-format
-msgid "add_cacheinfo failed for path '%s'; merge aborting."
+#: dir.c:2209
+msgid "untracked cache is disabled on this system or location"
msgstr ""
-#: merge-recursive.c:333
+#: dir.c:3013
#, c-format
-msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
+msgid "index file corrupt in repo %s"
msgstr ""
-#: merge-recursive.c:415
-msgid "error building trees"
+#: dir.c:3058 dir.c:3063
+#, c-format
+msgid "could not create directories for %s"
msgstr ""
-#: merge-recursive.c:886
+#: dir.c:3092
#, c-format
-msgid "failed to create path '%s'%s"
+msgid "could not migrate git directory from '%s' to '%s'"
msgstr ""
-#: merge-recursive.c:897
+#: editor.c:73
#, c-format
-msgid "Removing %s to make room for subdirectory\n"
+msgid "hint: Waiting for your editor to close the file...%c"
msgstr ""
-#: merge-recursive.c:911 merge-recursive.c:930
-msgid ": perhaps a D/F conflict?"
+#: entry.c:178
+msgid "Filtering content"
msgstr ""
-#: merge-recursive.c:920
+#: entry.c:476
#, c-format
-msgid "refusing to lose untracked file at '%s'"
+msgid "could not stat file '%s'"
msgstr ""
-#: merge-recursive.c:962 builtin/cat-file.c:39
+#: environment.c:150
#, c-format
-msgid "cannot read object %s '%s'"
+msgid "bad git namespace path \"%s\""
msgstr ""
-#: merge-recursive.c:964
+#: environment.c:332
#, c-format
-msgid "blob expected for %s '%s'"
+msgid "could not set GIT_DIR to '%s'"
msgstr ""
-#: merge-recursive.c:988
+#: exec-cmd.c:363
#, c-format
-msgid "failed to open '%s': %s"
+msgid "too many args to run %s"
msgstr ""
-#: merge-recursive.c:999
-#, c-format
-msgid "failed to symlink '%s': %s"
+#: fetch-object.c:17
+msgid "Remote with no URL"
msgstr ""
-#: merge-recursive.c:1004
-#, c-format
-msgid "do not know what to do with %06o %s '%s'"
+#: fetch-pack.c:151
+msgid "git fetch-pack: expected shallow list"
msgstr ""
-#: merge-recursive.c:1191
-#, c-format
-msgid "Failed to merge submodule %s (not checked out)"
+#: fetch-pack.c:154
+msgid "git fetch-pack: expected a flush packet after shallow list"
msgstr ""
-#: merge-recursive.c:1198
-#, c-format
-msgid "Failed to merge submodule %s (commits not present)"
+#: fetch-pack.c:165
+msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
msgstr ""
-#: merge-recursive.c:1205
+#: fetch-pack.c:185
#, c-format
-msgid "Failed to merge submodule %s (commits don't follow merge-base)"
+msgid "git fetch-pack: expected ACK/NAK, got '%s'"
+msgstr ""
+
+#: fetch-pack.c:196
+msgid "unable to write to remote"
+msgstr ""
+
+#: fetch-pack.c:258
+msgid "--stateless-rpc requires multi_ack_detailed"
msgstr ""
-#: merge-recursive.c:1213 merge-recursive.c:1225
+#: fetch-pack.c:360 fetch-pack.c:1284
#, c-format
-msgid "Fast-forwarding submodule %s to the following commit:"
+msgid "invalid shallow line: %s"
msgstr ""
-#: merge-recursive.c:1216 merge-recursive.c:1228
+#: fetch-pack.c:366 fetch-pack.c:1290
#, c-format
-msgid "Fast-forwarding submodule %s"
+msgid "invalid unshallow line: %s"
msgstr ""
-#: merge-recursive.c:1250
+#: fetch-pack.c:368 fetch-pack.c:1292
#, c-format
-msgid "Failed to merge submodule %s (merge following commits not found)"
+msgid "object not found: %s"
msgstr ""
-#: merge-recursive.c:1254
+#: fetch-pack.c:371 fetch-pack.c:1295
#, c-format
-msgid "Failed to merge submodule %s (not fast-forward)"
+msgid "error in object: %s"
msgstr ""
-#: merge-recursive.c:1255
-msgid "Found a possible merge resolution for the submodule:\n"
+#: fetch-pack.c:373 fetch-pack.c:1297
+#, c-format
+msgid "no shallow found: %s"
msgstr ""
-#: merge-recursive.c:1258
+#: fetch-pack.c:376 fetch-pack.c:1301
#, 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"
+msgid "expected shallow/unshallow, got %s"
msgstr ""
-#: merge-recursive.c:1267
+#: fetch-pack.c:417
#, c-format
-msgid "Failed to merge submodule %s (multiple merges found)"
-msgstr ""
-
-#: merge-recursive.c:1326
-msgid "Failed to execute internal merge"
+msgid "got %s %d %s"
msgstr ""
-#: merge-recursive.c:1331
+#: fetch-pack.c:434
#, c-format
-msgid "Unable to add %s to database"
+msgid "invalid commit %s"
msgstr ""
-#: merge-recursive.c:1363
-#, c-format
-msgid "Auto-merging %s"
+#: fetch-pack.c:465
+msgid "giving up"
msgstr ""
-#: merge-recursive.c:1434
-#, c-format
-msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
+#: fetch-pack.c:477 progress.c:277
+msgid "done"
msgstr ""
-#: merge-recursive.c:1501
+#: fetch-pack.c:489
#, c-format
-msgid ""
-"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
-"in tree."
+msgid "got %s (%d) %s"
msgstr ""
-#: merge-recursive.c:1506
+#: fetch-pack.c:535
#, c-format
-msgid ""
-"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
-"left in tree."
+msgid "Marking %s as complete"
msgstr ""
-#: merge-recursive.c:1513
+#: fetch-pack.c:744
#, c-format
-msgid ""
-"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
-"in tree at %s."
+msgid "already have %s (%s)"
msgstr ""
-#: 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."
+#: fetch-pack.c:783
+msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr ""
-#: merge-recursive.c:1552
-msgid "rename"
+#: fetch-pack.c:791
+msgid "protocol error: bad pack header"
msgstr ""
-#: merge-recursive.c:1552
-msgid "renamed"
+#: fetch-pack.c:859
+#, c-format
+msgid "fetch-pack: unable to fork off %s"
msgstr ""
-#: merge-recursive.c:1606 merge-recursive.c:1762 merge-recursive.c:2394
-#: merge-recursive.c:3129
+#: fetch-pack.c:875
#, c-format
-msgid "Refusing to lose dirty file at %s"
+msgid "%s failed"
msgstr ""
-#: merge-recursive.c:1620
-#, c-format
-msgid "%s is a directory in %s adding as %s instead"
+#: fetch-pack.c:877
+msgid "error in sideband demultiplexer"
msgstr ""
-#: merge-recursive.c:1625
+#: fetch-pack.c:908
#, c-format
-msgid "Refusing to lose untracked file at %s; adding as %s instead"
+msgid "Server version is %.*s"
msgstr ""
-#: merge-recursive.c:1651
+#: fetch-pack.c:913 fetch-pack.c:919 fetch-pack.c:922 fetch-pack.c:928
+#: fetch-pack.c:932 fetch-pack.c:936 fetch-pack.c:940 fetch-pack.c:944
+#: fetch-pack.c:948 fetch-pack.c:952 fetch-pack.c:956 fetch-pack.c:960
+#: fetch-pack.c:966 fetch-pack.c:972 fetch-pack.c:977 fetch-pack.c:982
#, c-format
-msgid ""
-"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
-"\"->\"%s\" in \"%s\"%s"
+msgid "Server supports %s"
msgstr ""
-#: merge-recursive.c:1656
-msgid " (left unresolved)"
+#: fetch-pack.c:915
+msgid "Server does not support shallow clients"
msgstr ""
-#: merge-recursive.c:1720
-#, c-format
-msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
+#: fetch-pack.c:975
+msgid "Server does not support --shallow-since"
msgstr ""
-#: merge-recursive.c:1759
-#, c-format
-msgid "Renaming %s to %s and %s to %s instead"
+#: fetch-pack.c:980
+msgid "Server does not support --shallow-exclude"
msgstr ""
-#: merge-recursive.c:1771
-#, c-format
-msgid "Refusing to lose untracked file at %s, even though it's in the way."
+#: fetch-pack.c:984
+msgid "Server does not support --deepen"
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."
+#: fetch-pack.c:1001
+msgid "no common commits"
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."
+#: fetch-pack.c:1013 fetch-pack.c:1462
+msgid "git fetch-pack: fetch failed."
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"
+#: fetch-pack.c:1151
+msgid "Server does not support shallow requests"
msgstr ""
-#: merge-recursive.c:2111
-#, c-format
-msgid ""
-"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
-">%s in %s"
+#: fetch-pack.c:1157
+msgid "Server supports filter"
msgstr ""
-#: merge-recursive.c:2356
-#, c-format
-msgid ""
-"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
-"renamed."
+#: fetch-pack.c:1184
+msgid "unable to write request to remote"
msgstr ""
-#: merge-recursive.c:2762
+#: fetch-pack.c:1202
#, c-format
-msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
+msgid "error reading section header '%s'"
msgstr ""
-#: merge-recursive.c:2777
+#: fetch-pack.c:1208
#, c-format
-msgid "Adding merged %s"
+msgid "expected '%s', received '%s'"
msgstr ""
-#: merge-recursive.c:2784 merge-recursive.c:3132
+#: fetch-pack.c:1247
#, c-format
-msgid "Adding as %s instead"
+msgid "unexpected acknowledgment line: '%s'"
msgstr ""
-#: merge-recursive.c:2941
+#: fetch-pack.c:1252
#, c-format
-msgid "cannot read object %s"
+msgid "error processing acks: %d"
msgstr ""
-#: merge-recursive.c:2944
-#, c-format
-msgid "object %s is not a blob"
+#: fetch-pack.c:1262
+msgid "expected packfile to be sent after 'ready'"
msgstr ""
-#: merge-recursive.c:3013
-msgid "modify"
+#: fetch-pack.c:1264
+msgid "expected no other sections to be sent after no 'ready'"
msgstr ""
-#: merge-recursive.c:3013
-msgid "modified"
+#: fetch-pack.c:1306
+#, c-format
+msgid "error processing shallow info: %d"
msgstr ""
-#: merge-recursive.c:3024
-msgid "content"
+#: fetch-pack.c:1353
+#, c-format
+msgid "expected wanted-ref, got '%s'"
msgstr ""
-#: merge-recursive.c:3031
-msgid "add/add"
+#: fetch-pack.c:1358
+#, c-format
+msgid "unexpected wanted-ref: '%s'"
msgstr ""
-#: merge-recursive.c:3076
+#: fetch-pack.c:1363
#, c-format
-msgid "Skipped %s (merged same as existing)"
+msgid "error processing wanted refs: %d"
msgstr ""
-#: merge-recursive.c:3098 git-submodule.sh:865
-msgid "submodule"
+#: fetch-pack.c:1689
+msgid "no matching remote head"
+msgstr ""
+
+#: fetch-pack.c:1712 builtin/clone.c:686
+msgid "remote did not send all necessary objects"
msgstr ""
-#: merge-recursive.c:3099
+#: fetch-pack.c:1739
#, c-format
-msgid "CONFLICT (%s): Merge conflict in %s"
+msgid "no such remote ref %s"
msgstr ""
-#: merge-recursive.c:3221
+#: fetch-pack.c:1742
#, c-format
-msgid "Removing %s"
+msgid "Server does not allow request for unadvertised object %s"
msgstr ""
-#: merge-recursive.c:3247
-msgid "file/directory"
+#: gpg-interface.c:321
+msgid "gpg failed to sign the data"
msgstr ""
-#: merge-recursive.c:3253
-msgid "directory/file"
+#: gpg-interface.c:347
+msgid "could not create temporary file"
msgstr ""
-#: merge-recursive.c:3260
+#: gpg-interface.c:350
#, c-format
-msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
+msgid "failed writing detached signature to '%s'"
msgstr ""
-#: merge-recursive.c:3269
+#: graph.c:97
#, c-format
-msgid "Adding %s"
+msgid "ignore invalid color '%.*s' in log.graphColors"
msgstr ""
-#: merge-recursive.c:3303
+#: grep.c:2117
#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by merge:\n"
-" %s"
+msgid "'%s': unable to read %s"
msgstr ""
-#: merge-recursive.c:3314
-msgid "Already up to date!"
+#: grep.c:2134 setup.c:164 builtin/clone.c:409 builtin/diff.c:82
+#: builtin/rm.c:135
+#, c-format
+msgid "failed to stat '%s'"
msgstr ""
-#: merge-recursive.c:3323
+#: grep.c:2145
#, c-format
-msgid "merging of trees %s and %s failed"
+msgid "'%s': short read"
msgstr ""
-#: merge-recursive.c:3422
-msgid "Merging:"
+#: help.c:23
+msgid "start a working area (see also: git help tutorial)"
msgstr ""
-#: merge-recursive.c:3435
-#, c-format
-msgid "found %u common ancestor:"
-msgid_plural "found %u common ancestors:"
-msgstr[0] ""
-msgstr[1] ""
-
-#: merge-recursive.c:3474
-msgid "merge returned no commit"
+#: help.c:24
+msgid "work on the current change (see also: git help everyday)"
msgstr ""
-#: merge-recursive.c:3540
-#, c-format
-msgid "Could not parse object '%s'"
+#: help.c:25
+msgid "examine the history and state (see also: git help revisions)"
msgstr ""
-#: merge-recursive.c:3556 builtin/merge.c:689 builtin/merge.c:846
-msgid "Unable to write index."
+#: help.c:26
+msgid "grow, mark and tweak your common history"
msgstr ""
-#: notes-merge.c:274
-#, c-format
-msgid ""
-"You have not concluded your previous notes merge (%s exists).\n"
-"Please, use 'git notes merge --commit' or 'git notes merge --abort' to "
-"commit/abort the previous merge before you start a new notes merge."
+#: help.c:27
+msgid "collaborate (see also: git help workflows)"
msgstr ""
-#: notes-merge.c:281
-#, c-format
-msgid "You have not concluded your notes merge (%s exists)."
+#: help.c:31
+msgid "Main Porcelain Commands"
msgstr ""
-#: notes-utils.c:45
-msgid "Cannot commit uninitialized/unreferenced notes tree"
+#: help.c:32
+msgid "Ancillary Commands / Manipulators"
msgstr ""
-#: notes-utils.c:104
-#, c-format
-msgid "Bad notes.rewriteMode value: '%s'"
+#: help.c:33
+msgid "Ancillary Commands / Interrogators"
msgstr ""
-#: notes-utils.c:114
-#, c-format
-msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
+#: help.c:34
+msgid "Interacting with Others"
msgstr ""
-#. TRANSLATORS: The first %s is the name of
-#. the environment variable, the second %s is
-#. its value.
-#.
-#: notes-utils.c:144
-#, c-format
-msgid "Bad %s value: '%s'"
+#: help.c:35
+msgid "Low-level Commands / Manipulators"
msgstr ""
-#: object.c:54
-#, c-format
-msgid "invalid object type \"%s\""
+#: help.c:36
+msgid "Low-level Commands / Interrogators"
msgstr ""
-#: object.c:173
-#, c-format
-msgid "object %s is a %s, not a %s"
+#: help.c:37
+msgid "Low-level Commands / Synching Repositories"
msgstr ""
-#: object.c:233
-#, c-format
-msgid "object %s has unknown type id %d"
+#: help.c:38
+msgid "Low-level Commands / Internal Helpers"
msgstr ""
-#: object.c:246
+#: help.c:298
#, c-format
-msgid "unable to parse object: %s"
+msgid "available git commands in '%s'"
msgstr ""
-#: object.c:266 object.c:277
-#, c-format
-msgid "sha1 mismatch %s"
+#: help.c:305
+msgid "git commands available from elsewhere on your $PATH"
msgstr ""
-#: packfile.c:563
-msgid "offset before end of packfile (broken .idx?)"
+#: help.c:314
+msgid "These are common Git commands used in various situations:"
msgstr ""
-#: packfile.c:1745
+#: help.c:363 git.c:98
#, c-format
-msgid "offset before start of pack index for %s (corrupt index?)"
+msgid "unsupported command listing type '%s'"
msgstr ""
-#: packfile.c:1749
-#, c-format
-msgid "offset beyond end of pack index for %s (truncated index?)"
+#: help.c:403
+msgid "The common Git guides are:"
msgstr ""
-#: parse-options.c:672
-msgid "..."
+#: help.c:512
+msgid "See 'git help <command>' to read about a specific subcommand"
msgstr ""
-#: parse-options.c:691
-#, c-format
-msgid "usage: %s"
+#: help.c:517
+msgid "External commands"
msgstr ""
-#. TRANSLATORS: the colon here should align with the
-#. one in "usage: %s" translation.
-#.
-#: parse-options.c:697
-#, c-format
-msgid " or: %s"
+#: help.c:532
+msgid "Command aliases"
msgstr ""
-#: parse-options.c:700
+#: help.c:596
#, c-format
-msgid " %s"
+msgid ""
+"'%s' appears to be a git command, but we were not\n"
+"able to execute it. Maybe git-%s is broken?"
msgstr ""
-#: parse-options.c:739
-msgid "-NUM"
+#: help.c:655
+msgid "Uh oh. Your system reports no Git commands at all."
msgstr ""
-#: parse-options-cb.c:44
+#: help.c:677
#, c-format
-msgid "malformed expiration date '%s'"
+msgid "WARNING: You called a Git command named '%s', which does not exist."
msgstr ""
-#: parse-options-cb.c:112
+#: help.c:682
#, c-format
-msgid "malformed object name '%s'"
+msgid "Continuing under the assumption that you meant '%s'."
msgstr ""
-#: path.c:892
+#: help.c:687
#, c-format
-msgid "Could not make %s writable by group"
+msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
msgstr ""
-#: pathspec.c:129
-msgid "Escape character '\\' not allowed as last character in attr value"
+#: help.c:695
+#, c-format
+msgid "git: '%s' is not a git command. See 'git --help'."
msgstr ""
-#: pathspec.c:147
-msgid "Only one 'attr:' specification is allowed."
-msgstr ""
+#: help.c:699
+msgid ""
+"\n"
+"The most similar command is"
+msgid_plural ""
+"\n"
+"The most similar commands are"
+msgstr[0] ""
+msgstr[1] ""
-#: pathspec.c:150
-msgid "attr spec must not be empty"
+#: help.c:714
+msgid "git version [<options>]"
msgstr ""
-#: pathspec.c:193
+#: help.c:782
#, c-format
-msgid "invalid attribute name %s"
-msgstr ""
-
-#: pathspec.c:258
-msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
+msgid "%s: %s - %s"
msgstr ""
-#: pathspec.c:265
+#: help.c:786
msgid ""
-"global 'literal' pathspec setting is incompatible with all other global "
-"pathspec settings"
-msgstr ""
-
-#: pathspec.c:305
-msgid "invalid parameter for pathspec magic 'prefix'"
+"\n"
+"Did you mean this?"
+msgid_plural ""
+"\n"
+"Did you mean one of these?"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ident.c:349
+msgid ""
+"\n"
+"*** Please tell me who you are.\n"
+"\n"
+"Run\n"
+"\n"
+" git config --global user.email \"you@example.com\"\n"
+" git config --global user.name \"Your Name\"\n"
+"\n"
+"to set your account's default identity.\n"
+"Omit --global to set the identity only in this repository.\n"
+"\n"
msgstr ""
-#: pathspec.c:326
-#, c-format
-msgid "Invalid pathspec magic '%.*s' in '%s'"
+#: ident.c:379
+msgid "no email was given and auto-detection is disabled"
msgstr ""
-#: pathspec.c:331
+#: ident.c:384
#, c-format
-msgid "Missing ')' at the end of pathspec magic in '%s'"
+msgid "unable to auto-detect email address (got '%s')"
msgstr ""
-#: pathspec.c:369
-#, c-format
-msgid "Unimplemented pathspec magic '%c' in '%s'"
+#: ident.c:401
+msgid "no name was given and auto-detection is disabled"
msgstr ""
-#: pathspec.c:428
+#: ident.c:407
#, c-format
-msgid "%s: 'literal' and 'glob' are incompatible"
+msgid "unable to auto-detect name (got '%s')"
msgstr ""
-#: pathspec.c:441
+#: ident.c:415
#, c-format
-msgid "%s: '%s' is outside repository"
+msgid "empty ident name (for <%s>) not allowed"
msgstr ""
-#: pathspec.c:515
+#: ident.c:421
#, c-format
-msgid "'%s' (mnemonic: '%c')"
+msgid "name consists only of disallowed characters: %s"
msgstr ""
-#: pathspec.c:525
+#: ident.c:436 builtin/commit.c:611
#, c-format
-msgid "%s: pathspec magic not supported by this command: %s"
+msgid "invalid date format: %s"
msgstr ""
-#: pathspec.c:592
+#: list-objects.c:129
#, c-format
-msgid "pathspec '%s' is beyond a symbolic link"
+msgid "entry '%s' in tree %s has tree mode, but is not a tree"
msgstr ""
-#: pkt-line.c:104
-msgid "flush packet write failed"
+#: list-objects.c:142
+#, c-format
+msgid "entry '%s' in tree %s has blob mode, but is not a blob"
msgstr ""
-#: pkt-line.c:142 pkt-line.c:228
-msgid "protocol error: impossibly long line"
+#: list-objects.c:378
+#, c-format
+msgid "unable to load root tree for commit %s"
msgstr ""
-#: pkt-line.c:158 pkt-line.c:160
-msgid "packet write with format failed"
+#: list-objects-filter-options.c:36
+msgid "multiple filter-specs cannot be combined"
msgstr ""
-#: pkt-line.c:192
-msgid "packet write failed - data exceeds max packet size"
+#: list-objects-filter-options.c:58
+msgid "expected 'tree:<depth>'"
msgstr ""
-#: pkt-line.c:199 pkt-line.c:206
-msgid "packet write failed"
+#: list-objects-filter-options.c:84
+msgid "sparse:path filters support has been dropped"
msgstr ""
-#: pkt-line.c:291
-msgid "read error"
+#: list-objects-filter-options.c:94
+#, c-format
+msgid "invalid filter-spec '%s'"
msgstr ""
-#: pkt-line.c:299
-msgid "the remote end hung up unexpectedly"
+#: list-objects-filter-options.c:158
+msgid "cannot change partial clone promisor remote"
msgstr ""
-#: pkt-line.c:327
+#: lockfile.c:151
#, c-format
-msgid "protocol error: bad line length character: %.4s"
+msgid ""
+"Unable to create '%s.lock': %s.\n"
+"\n"
+"Another git process seems to be running in this repository, e.g.\n"
+"an editor opened by 'git commit'. Please make sure all processes\n"
+"are terminated then try again. If it still fails, a git process\n"
+"may have crashed in this repository earlier:\n"
+"remove the file manually to continue."
msgstr ""
-#: pkt-line.c:337 pkt-line.c:342
+#: lockfile.c:159
#, c-format
-msgid "protocol error: bad line length %d"
+msgid "Unable to create '%s.lock': %s"
msgstr ""
-#: pretty.c:962
-msgid "unable to parse --pretty format"
+#: merge.c:41
+msgid "failed to read the cache"
msgstr ""
-#: range-diff.c:48
-msgid "could not start `log`"
+#: merge.c:107 rerere.c:720 builtin/am.c:1885 builtin/am.c:1919
+#: builtin/checkout.c:536 builtin/checkout.c:796 builtin/clone.c:786
+#: builtin/stash.c:264
+msgid "unable to write new index file"
msgstr ""
-#: range-diff.c:51
-msgid "could not read `log` output"
+#: merge-recursive.c:322
+msgid "(bad commit)\n"
msgstr ""
-#: range-diff.c:66 sequencer.c:4540
+#: merge-recursive.c:345
#, c-format
-msgid "could not parse commit '%s'"
-msgstr ""
-
-#: range-diff.c:196
-msgid "failed to generate diff"
+msgid "add_cacheinfo failed for path '%s'; merge aborting."
msgstr ""
-#: range-diff.c:421 range-diff.c:423
+#: merge-recursive.c:354
#, c-format
-msgid "could not parse log for '%s'"
+msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
msgstr ""
-#: read-cache.c:1579
-#, c-format
-msgid ""
-"index.version set, but the value is invalid.\n"
-"Using version %i"
+#: merge-recursive.c:437
+msgid "error building trees"
msgstr ""
-#: read-cache.c:1589
+#: merge-recursive.c:863
#, c-format
-msgid ""
-"GIT_INDEX_VERSION set, but the value is invalid.\n"
-"Using version %i"
+msgid "failed to create path '%s'%s"
msgstr ""
-#: read-cache.c:2580 sequencer.c:4503 wrapper.c:658 builtin/merge.c:1083
+#: merge-recursive.c:874
#, c-format
-msgid "could not close '%s'"
+msgid "Removing %s to make room for subdirectory\n"
msgstr ""
-#: read-cache.c:2653 sequencer.c:2113 sequencer.c:3374
-#, c-format
-msgid "could not stat '%s'"
+#: merge-recursive.c:888 merge-recursive.c:907
+msgid ": perhaps a D/F conflict?"
msgstr ""
-#: read-cache.c:2666
+#: merge-recursive.c:897
#, c-format
-msgid "unable to open git dir: %s"
+msgid "refusing to lose untracked file at '%s'"
msgstr ""
-#: read-cache.c:2678
+#: merge-recursive.c:938 builtin/cat-file.c:40
#, c-format
-msgid "unable to unlink: %s"
+msgid "cannot read object %s '%s'"
msgstr ""
-#: refs.c:192
+#: merge-recursive.c:941
#, c-format
-msgid "%s does not point to a valid object!"
+msgid "blob expected for %s '%s'"
msgstr ""
-#: refs.c:579
+#: merge-recursive.c:965
#, c-format
-msgid "ignoring dangling symref %s"
+msgid "failed to open '%s': %s"
msgstr ""
-#: refs.c:581 ref-filter.c:2067
+#: merge-recursive.c:976
#, c-format
-msgid "ignoring broken ref %s"
+msgid "failed to symlink '%s': %s"
msgstr ""
-#: refs.c:685
+#: merge-recursive.c:981
#, c-format
-msgid "could not open '%s' for writing: %s"
+msgid "do not know what to do with %06o %s '%s'"
msgstr ""
-#: refs.c:695 refs.c:746
+#: merge-recursive.c:1177
#, c-format
-msgid "could not read ref '%s'"
+msgid "Failed to merge submodule %s (not checked out)"
msgstr ""
-#: refs.c:701
+#: merge-recursive.c:1184
#, c-format
-msgid "ref '%s' already exists"
+msgid "Failed to merge submodule %s (commits not present)"
msgstr ""
-#: refs.c:706
+#: merge-recursive.c:1191
#, c-format
-msgid "unexpected object ID when writing '%s'"
+msgid "Failed to merge submodule %s (commits don't follow merge-base)"
msgstr ""
-#: 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
+#: merge-recursive.c:1199 merge-recursive.c:1211
#, c-format
-msgid "could not write to '%s'"
+msgid "Fast-forwarding submodule %s to the following commit:"
msgstr ""
-#: refs.c:741 sequencer.c:4499 sequencer.c:4558 wrapper.c:225 wrapper.c:395
-#: builtin/am.c:780
+#: merge-recursive.c:1202 merge-recursive.c:1214
#, c-format
-msgid "could not open '%s' for writing"
+msgid "Fast-forwarding submodule %s"
msgstr ""
-#: refs.c:748
+#: merge-recursive.c:1237
#, c-format
-msgid "unexpected object ID when deleting '%s'"
+msgid "Failed to merge submodule %s (merge following commits not found)"
msgstr ""
-#: refs.c:879
+#: merge-recursive.c:1241
#, c-format
-msgid "log for ref %s has gap after %s"
+msgid "Failed to merge submodule %s (not fast-forward)"
msgstr ""
-#: refs.c:885
-#, c-format
-msgid "log for ref %s unexpectedly ended on %s"
+#: merge-recursive.c:1242
+msgid "Found a possible merge resolution for the submodule:\n"
msgstr ""
-#: refs.c:943
+#: merge-recursive.c:1245
#, c-format
-msgid "log for %s is empty"
+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 ""
-#: refs.c:1035
+#: merge-recursive.c:1254
#, c-format
-msgid "refusing to update ref with bad name '%s'"
+msgid "Failed to merge submodule %s (multiple merges found)"
msgstr ""
-#: refs.c:1111
-#, c-format
-msgid "update_ref failed for ref '%s': %s"
+#: merge-recursive.c:1327
+msgid "Failed to execute internal merge"
msgstr ""
-#: refs.c:1853
+#: merge-recursive.c:1332
#, c-format
-msgid "multiple updates for ref '%s' not allowed"
+msgid "Unable to add %s to database"
msgstr ""
-#: refs.c:1885
-msgid "ref updates forbidden inside quarantine environment"
+#: merge-recursive.c:1364
+#, c-format
+msgid "Auto-merging %s"
msgstr ""
-#: refs.c:1981 refs.c:2011
+#: merge-recursive.c:1387
#, c-format
-msgid "'%s' exists; cannot create '%s'"
+msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
msgstr ""
-#: refs.c:1987 refs.c:2022
+#: merge-recursive.c:1459
#, c-format
-msgid "cannot process '%s' and '%s' at the same time"
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
+"in tree."
msgstr ""
-#: refs/files-backend.c:1191
+#: merge-recursive.c:1464
#, c-format
-msgid "could not remove reference %s"
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
+"left in tree."
msgstr ""
-#: refs/files-backend.c:1205 refs/packed-backend.c:1532
-#: refs/packed-backend.c:1542
+#: merge-recursive.c:1471
#, c-format
-msgid "could not delete reference %s: %s"
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
+"in tree at %s."
msgstr ""
-#: refs/files-backend.c:1208 refs/packed-backend.c:1545
+#: merge-recursive.c:1476
#, c-format
-msgid "could not delete references: %s"
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
+"left in tree at %s."
msgstr ""
-#: refspec.c:137
-#, c-format
-msgid "invalid refspec '%s'"
+#: merge-recursive.c:1511
+msgid "rename"
msgstr ""
-#: ref-filter.c:38 wt-status.c:1850
-msgid "gone"
+#: merge-recursive.c:1511
+msgid "renamed"
msgstr ""
-#: ref-filter.c:39
+#: merge-recursive.c:1591 merge-recursive.c:2450 merge-recursive.c:3094
#, c-format
-msgid "ahead %d"
+msgid "Refusing to lose dirty file at %s"
msgstr ""
-#: ref-filter.c:40
+#: merge-recursive.c:1601
#, c-format
-msgid "behind %d"
+msgid "Refusing to lose untracked file at %s, even though it's in the way."
msgstr ""
-#: ref-filter.c:41
+#: merge-recursive.c:1659
#, c-format
-msgid "ahead %d, behind %d"
+msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
msgstr ""
-#: ref-filter.c:137
+#: merge-recursive.c:1690
#, c-format
-msgid "expected format: %%(color:<color>)"
+msgid "%s is a directory in %s adding as %s instead"
msgstr ""
-#: ref-filter.c:139
+#: merge-recursive.c:1695
#, c-format
-msgid "unrecognized color: %%(color:%s)"
+msgid "Refusing to lose untracked file at %s; adding as %s instead"
msgstr ""
-#: ref-filter.c:161
+#: merge-recursive.c:1714
#, c-format
-msgid "Integer value expected refname:lstrip=%s"
+msgid ""
+"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
+"\"->\"%s\" in \"%s\"%s"
msgstr ""
-#: ref-filter.c:165
-#, c-format
-msgid "Integer value expected refname:rstrip=%s"
+#: merge-recursive.c:1719
+msgid " (left unresolved)"
msgstr ""
-#: ref-filter.c:167
+#: merge-recursive.c:1828
#, c-format
-msgid "unrecognized %%(%s) argument: %s"
+msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr ""
-#: ref-filter.c:222
+#: merge-recursive.c:2035
#, c-format
-msgid "%%(objecttype) does not take arguments"
+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 ""
-#: ref-filter.c:234
+#: merge-recursive.c:2067
#, c-format
-msgid "%%(objectsize) does not take arguments"
+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 ""
-#: ref-filter.c:246
+#: merge-recursive.c:2077
#, c-format
-msgid "%%(body) does not take arguments"
+msgid ""
+"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
+"implicit directory renames tried to put these paths there: %s"
msgstr ""
-#: ref-filter.c:255
+#: merge-recursive.c:2169
#, c-format
-msgid "%%(subject) does not take arguments"
+msgid ""
+"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
+">%s in %s"
msgstr ""
-#: ref-filter.c:275
+#: merge-recursive.c:2413
#, c-format
-msgid "unknown %%(trailers) argument: %s"
+msgid ""
+"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
+"renamed."
msgstr ""
-#: ref-filter.c:304
+#: merge-recursive.c:2938
#, c-format
-msgid "positive value expected contents:lines=%s"
+msgid "cannot read object %s"
msgstr ""
-#: ref-filter.c:306
+#: merge-recursive.c:2941
#, c-format
-msgid "unrecognized %%(contents) argument: %s"
+msgid "object %s is not a blob"
msgstr ""
-#: ref-filter.c:321
-#, c-format
-msgid "positive value expected objectname:short=%s"
+#: merge-recursive.c:3005
+msgid "modify"
msgstr ""
-#: ref-filter.c:325
-#, c-format
-msgid "unrecognized %%(objectname) argument: %s"
+#: merge-recursive.c:3005
+msgid "modified"
msgstr ""
-#: ref-filter.c:355
-#, c-format
-msgid "expected format: %%(align:<width>,<position>)"
+#: merge-recursive.c:3017
+msgid "content"
msgstr ""
-#: ref-filter.c:367
-#, c-format
-msgid "unrecognized position:%s"
+#: merge-recursive.c:3021
+msgid "add/add"
msgstr ""
-#: ref-filter.c:374
+#: merge-recursive.c:3044
#, c-format
-msgid "unrecognized width:%s"
+msgid "Skipped %s (merged same as existing)"
msgstr ""
-#: ref-filter.c:383
-#, c-format
-msgid "unrecognized %%(align) argument: %s"
+#: merge-recursive.c:3066 git-submodule.sh:937
+msgid "submodule"
msgstr ""
-#: ref-filter.c:391
+#: merge-recursive.c:3067
#, c-format
-msgid "positive width expected with the %%(align) atom"
+msgid "CONFLICT (%s): Merge conflict in %s"
msgstr ""
-#: ref-filter.c:409
+#: merge-recursive.c:3097
#, c-format
-msgid "unrecognized %%(if) argument: %s"
+msgid "Adding as %s instead"
msgstr ""
-#: ref-filter.c:505
+#: merge-recursive.c:3179
#, c-format
-msgid "malformed field name: %.*s"
+msgid ""
+"Path updated: %s added in %s inside a directory that was renamed in %s; "
+"moving it to %s."
msgstr ""
-#: ref-filter.c:532
+#: merge-recursive.c:3182
#, c-format
-msgid "unknown field name: %.*s"
+msgid ""
+"CONFLICT (file location): %s added in %s inside a directory that was renamed "
+"in %s, suggesting it should perhaps be moved to %s."
msgstr ""
-#: ref-filter.c:656
+#: merge-recursive.c:3186
#, c-format
-msgid "format: %%(if) atom used without a %%(then) atom"
+msgid ""
+"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
+"%s; moving it to %s."
msgstr ""
-#: ref-filter.c:719
+#: merge-recursive.c:3189
#, c-format
-msgid "format: %%(then) atom used without an %%(if) atom"
+msgid ""
+"CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
+"was renamed in %s, suggesting it should perhaps be moved to %s."
msgstr ""
-#: ref-filter.c:721
+#: merge-recursive.c:3303
#, c-format
-msgid "format: %%(then) atom used more than once"
+msgid "Removing %s"
msgstr ""
-#: ref-filter.c:723
-#, c-format
-msgid "format: %%(then) atom used after %%(else)"
+#: merge-recursive.c:3326
+msgid "file/directory"
msgstr ""
-#: ref-filter.c:751
-#, c-format
-msgid "format: %%(else) atom used without an %%(if) atom"
+#: merge-recursive.c:3331
+msgid "directory/file"
msgstr ""
-#: ref-filter.c:753
+#: merge-recursive.c:3338
#, c-format
-msgid "format: %%(else) atom used without a %%(then) atom"
+msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
msgstr ""
-#: ref-filter.c:755
+#: merge-recursive.c:3347
#, c-format
-msgid "format: %%(else) atom used more than once"
+msgid "Adding %s"
msgstr ""
-#: ref-filter.c:770
+#: merge-recursive.c:3356
#, c-format
-msgid "format: %%(end) atom used without corresponding atom"
+msgid "CONFLICT (add/add): Merge conflict in %s"
msgstr ""
-#: ref-filter.c:827
+#: merge-recursive.c:3394
#, c-format
-msgid "malformed format string %s"
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+" %s"
msgstr ""
-#: ref-filter.c:1416
-#, c-format
-msgid "(no branch, rebasing %s)"
+#: merge-recursive.c:3405
+msgid "Already up to date!"
msgstr ""
-#: ref-filter.c:1419
+#: merge-recursive.c:3414
#, c-format
-msgid "(no branch, rebasing detached HEAD %s)"
+msgid "merging of trees %s and %s failed"
msgstr ""
-#: ref-filter.c:1422
-#, c-format
-msgid "(no branch, bisect started on %s)"
+#: merge-recursive.c:3513
+msgid "Merging:"
msgstr ""
-#. TRANSLATORS: make sure this matches "HEAD
-#. detached at " in wt-status.c
-#.
-#: ref-filter.c:1430
+#: merge-recursive.c:3526
#, c-format
-msgid "(HEAD detached at %s)"
+msgid "found %u common ancestor:"
+msgid_plural "found %u common ancestors:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: merge-recursive.c:3565
+msgid "merge returned no commit"
msgstr ""
-#. TRANSLATORS: make sure this matches "HEAD
-#. detached from " in wt-status.c
-#.
-#: ref-filter.c:1437
+#: merge-recursive.c:3631
#, c-format
-msgid "(HEAD detached from %s)"
+msgid "Could not parse object '%s'"
msgstr ""
-#: ref-filter.c:1441
-msgid "(no branch)"
+#: merge-recursive.c:3647 builtin/merge.c:698 builtin/merge.c:869
+msgid "Unable to write index."
msgstr ""
-#: ref-filter.c:1475 ref-filter.c:1623
+#: midx.c:69
#, c-format
-msgid "missing object %s for %s"
+msgid "multi-pack-index file %s is too small"
msgstr ""
-#: ref-filter.c:1483
+#: midx.c:85
#, c-format
-msgid "parse_object_buffer failed on %s for %s"
+msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
msgstr ""
-#: ref-filter.c:1980
+#: midx.c:90
#, c-format
-msgid "malformed object at '%s'"
+msgid "multi-pack-index version %d not recognized"
msgstr ""
-#: ref-filter.c:2062
+#: midx.c:95
#, c-format
-msgid "ignoring ref with broken name %s"
+msgid "hash version %u does not match"
msgstr ""
-#: ref-filter.c:2340
-#, c-format
-msgid "format: %%(end) atom missing"
+#: midx.c:109
+msgid "invalid chunk offset (too large)"
msgstr ""
-#: ref-filter.c:2444
-#, c-format
-msgid "malformed object name %s"
+#: midx.c:133
+msgid "terminating multi-pack-index chunk id appears earlier than expected"
msgstr ""
-#: remote.c:606
-#, c-format
-msgid "Cannot fetch both %s and %s to %s"
+#: midx.c:146
+msgid "multi-pack-index missing required pack-name chunk"
msgstr ""
-#: remote.c:610
-#, c-format
-msgid "%s usually tracks %s, not %s"
+#: midx.c:148
+msgid "multi-pack-index missing required OID fanout chunk"
msgstr ""
-#: remote.c:614
-#, c-format
-msgid "%s tracks both %s and %s"
+#: midx.c:150
+msgid "multi-pack-index missing required OID lookup chunk"
msgstr ""
-#: remote.c:622
-msgid "Internal error"
+#: midx.c:152
+msgid "multi-pack-index missing required object offsets chunk"
msgstr ""
-#: remote.c:1536 remote.c:1637
-msgid "HEAD does not point to a branch"
+#: midx.c:166
+#, c-format
+msgid "multi-pack-index pack names out of order: '%s' before '%s'"
msgstr ""
-#: remote.c:1545
+#: midx.c:211
#, c-format
-msgid "no such branch: '%s'"
+msgid "bad pack-int-id: %u (%u total packs)"
msgstr ""
-#: remote.c:1548
-#, c-format
-msgid "no upstream configured for branch '%s'"
+#: midx.c:261
+msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
+msgstr ""
+
+#: midx.c:289
+msgid "error preparing packfile from multi-pack-index"
msgstr ""
-#: remote.c:1554
+#: midx.c:470
#, c-format
-msgid "upstream branch '%s' not stored as a remote-tracking branch"
+msgid "failed to add packfile '%s'"
msgstr ""
-#: remote.c:1569
+#: midx.c:476
#, c-format
-msgid "push destination '%s' on remote '%s' has no local tracking branch"
+msgid "failed to open pack-index '%s'"
msgstr ""
-#: remote.c:1581
+#: midx.c:536
#, c-format
-msgid "branch '%s' has no remote for pushing"
+msgid "failed to locate object %d in packfile"
msgstr ""
-#: remote.c:1591
+#: midx.c:865
#, c-format
-msgid "push refspecs for '%s' do not include '%s'"
+msgid "did not see pack-file %s to drop"
msgstr ""
-#: remote.c:1604
-msgid "push has no destination (push.default is 'nothing')"
+#: midx.c:1036
+#, c-format
+msgid "failed to clear multi-pack-index at %s"
msgstr ""
-#: remote.c:1626
-msgid "cannot resolve 'simple' push to a single destination"
+#: midx.c:1091
+msgid "Looking for referenced packfiles"
msgstr ""
-#: remote.c:1951
+#: midx.c:1106
#, c-format
-msgid "Your branch is based on '%s', but the upstream is gone.\n"
+msgid ""
+"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
msgstr ""
-#: remote.c:1955
-msgid " (use \"git branch --unset-upstream\" to fixup)\n"
+#: midx.c:1110
+msgid "Verifying OID order in MIDX"
msgstr ""
-#: remote.c:1958
+#: midx.c:1119
#, c-format
-msgid "Your branch is up to date with '%s'.\n"
+msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
msgstr ""
-#: remote.c:1962
-#, c-format
-msgid "Your branch and '%s' refer to different commits.\n"
+#: midx.c:1138
+msgid "Sorting objects by packfile"
msgstr ""
-#: remote.c:1965
-#, c-format
-msgid " (use \"%s\" for details)\n"
+#: midx.c:1144
+msgid "Verifying object offsets"
msgstr ""
-#: remote.c:1969
+#: midx.c:1160
#, 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:1975
-msgid " (use \"git push\" to publish your local commits)\n"
+msgid "failed to load pack entry for oid[%d] = %s"
msgstr ""
-#: remote.c:1978
+#: midx.c:1166
#, c-format
-msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
-msgid_plural ""
-"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: remote.c:1986
-msgid " (use \"git pull\" to update your local branch)\n"
+msgid "failed to load pack-index for packfile %s"
msgstr ""
-#: remote.c:1989
+#: midx.c:1175
#, c-format
-msgid ""
-"Your branch and '%s' have diverged,\n"
-"and have %d and %d different commit each, respectively.\n"
-msgid_plural ""
-"Your branch and '%s' have diverged,\n"
-"and have %d and %d different commits each, respectively.\n"
-msgstr[0] ""
-msgstr[1] ""
+msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
+msgstr ""
-#: remote.c:1999
-msgid " (use \"git pull\" to merge the remote branch into yours)\n"
+#: midx.c:1350
+msgid "could not start pack-objects"
msgstr ""
-#: replace-object.c:20
-#, c-format
-msgid "bad replace ref name: %s"
+#: midx.c:1369
+msgid "could not finish pack-objects"
msgstr ""
-#: replace-object.c:29
+#: name-hash.c:532
#, c-format
-msgid "duplicate replace ref: %s"
+msgid "unable to create lazy_dir thread: %s"
msgstr ""
-#: replace-object.c:72
+#: name-hash.c:554
#, c-format
-msgid "replace depth too high for object %s"
+msgid "unable to create lazy_name thread: %s"
msgstr ""
-#: revision.c:2305
-msgid "your current branch appears to be broken"
+#: name-hash.c:560
+#, c-format
+msgid "unable to join lazy_name thread: %s"
msgstr ""
-#: revision.c:2308
+#: notes-merge.c:277
#, c-format
-msgid "your current branch '%s' does not have any commits yet"
+msgid ""
+"You have not concluded your previous notes merge (%s exists).\n"
+"Please, use 'git notes merge --commit' or 'git notes merge --abort' to "
+"commit/abort the previous merge before you start a new notes merge."
msgstr ""
-#: revision.c:2505
-msgid "--first-parent is incompatible with --bisect"
+#: notes-merge.c:284
+#, c-format
+msgid "You have not concluded your notes merge (%s exists)."
msgstr ""
-#: run-command.c:728
-msgid "open /dev/null failed"
+#: notes-utils.c:46
+msgid "Cannot commit uninitialized/unreferenced notes tree"
msgstr ""
-#: run-command.c:1271
+#: notes-utils.c:105
#, 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`."
+msgid "Bad notes.rewriteMode value: '%s'"
msgstr ""
-#: send-pack.c:142
-msgid "unexpected flush packet while reading remote unpack status"
+#: notes-utils.c:115
+#, c-format
+msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
msgstr ""
-#: send-pack.c:144
+#. TRANSLATORS: The first %s is the name of
+#. the environment variable, the second %s is
+#. its value.
+#.
+#: notes-utils.c:145
#, c-format
-msgid "unable to parse remote unpack status: %s"
+msgid "Bad %s value: '%s'"
msgstr ""
-#: send-pack.c:146
+#: object.c:54
#, c-format
-msgid "remote unpack failed: %s"
+msgid "invalid object type \"%s\""
msgstr ""
-#: send-pack.c:309
-msgid "failed to sign the push certificate"
+#: object.c:174
+#, c-format
+msgid "object %s is a %s, not a %s"
msgstr ""
-#: send-pack.c:422
-msgid "the receiving end does not support --signed push"
+#: object.c:234
+#, c-format
+msgid "object %s has unknown type id %d"
msgstr ""
-#: send-pack.c:424
-msgid ""
-"not sending a push certificate since the receiving end does not support --"
-"signed push"
+#: object.c:247
+#, c-format
+msgid "unable to parse object: %s"
msgstr ""
-#: send-pack.c:436
-msgid "the receiving end does not support --atomic push"
+#: object.c:267 object.c:278
+#, c-format
+msgid "hash mismatch %s"
msgstr ""
-#: send-pack.c:441
-msgid "the receiving end does not support push options"
+#: packfile.c:648
+msgid "offset before end of packfile (broken .idx?)"
msgstr ""
-#: sequencer.c:177
+#: packfile.c:1899
#, c-format
-msgid "invalid commit message cleanup mode '%s'"
+msgid "offset before start of pack index for %s (corrupt index?)"
msgstr ""
-#: sequencer.c:278
+#: packfile.c:1903
#, c-format
-msgid "could not delete '%s'"
+msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr ""
-#: sequencer.c:304
-msgid "revert"
+#: parse-options.c:38
+#, c-format
+msgid "%s requires a value"
msgstr ""
-#: sequencer.c:306
-msgid "cherry-pick"
+#: parse-options.c:73
+#, c-format
+msgid "%s is incompatible with %s"
msgstr ""
-#: sequencer.c:308
-msgid "rebase -i"
+#: parse-options.c:78
+#, c-format
+msgid "%s : incompatible with something else"
msgstr ""
-#: sequencer.c:310
+#: parse-options.c:92 parse-options.c:96 parse-options.c:319
#, c-format
-msgid "unknown action: %d"
+msgid "%s takes no value"
msgstr ""
-#: sequencer.c:367
-msgid ""
-"after resolving the conflicts, mark the corrected paths\n"
-"with 'git add <paths>' or 'git rm <paths>'"
+#: parse-options.c:94
+#, c-format
+msgid "%s isn't available"
msgstr ""
-#: 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'"
+#: parse-options.c:219
+#, c-format
+msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
msgstr ""
-#: sequencer.c:383 sequencer.c:2488
+#: parse-options.c:389
#, c-format
-msgid "could not lock '%s'"
+msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
msgstr ""
-#: sequencer.c:390
+#: parse-options.c:423 parse-options.c:431
#, c-format
-msgid "could not write eol to '%s'"
+msgid "did you mean `--%s` (with two dashes ?)"
msgstr ""
-#: sequencer.c:395 sequencer.c:2371 sequencer.c:2494 sequencer.c:2508
-#: sequencer.c:2741
+#: parse-options.c:859
#, c-format
-msgid "failed to finalize '%s'"
+msgid "unknown option `%s'"
msgstr ""
-#: 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
+#: parse-options.c:861
#, c-format
-msgid "could not read '%s'"
+msgid "unknown switch `%c'"
msgstr ""
-#: sequencer.c:444
+#: parse-options.c:863
#, c-format
-msgid "your local changes would be overwritten by %s."
+msgid "unknown non-ascii option in string: `%s'"
msgstr ""
-#: sequencer.c:448
-msgid "commit your changes or stash them to proceed."
+#: parse-options.c:887
+msgid "..."
msgstr ""
-#: sequencer.c:477
+#: parse-options.c:906
#, c-format
-msgid "%s: fast-forward"
+msgid "usage: %s"
msgstr ""
-#. TRANSLATORS: %s will be "revert", "cherry-pick" or
-#. "rebase -i".
+#. TRANSLATORS: the colon here should align with the
+#. one in "usage: %s" translation.
#.
-#: sequencer.c:566
+#: parse-options.c:912
#, c-format
-msgid "%s: Unable to write new index file"
+msgid " or: %s"
msgstr ""
-#: sequencer.c:582
-msgid "unable to update cache tree"
+#: parse-options.c:915
+#, c-format
+msgid " %s"
msgstr ""
-#: sequencer.c:595
-msgid "could not resolve HEAD commit"
+#: parse-options.c:954
+msgid "-NUM"
msgstr ""
-#: sequencer.c:723
+#: parse-options.c:968
#, c-format
-msgid "could not parse '%s' (looking for '%s'"
+msgid "alias of --%s"
msgstr ""
-#: sequencer.c:731
+#: parse-options-cb.c:20 parse-options-cb.c:24
#, c-format
-msgid "bad quoting on %s value in '%s'"
+msgid "option `%s' expects a numerical value"
msgstr ""
-#: sequencer.c:740
+#: parse-options-cb.c:41
#, c-format
-msgid "could not parse '%s' (looking for '%s')"
+msgid "malformed expiration date '%s'"
msgstr ""
-#: sequencer.c:747
+#: parse-options-cb.c:54
#, c-format
-msgid "invalid date format '%s' in '%s'"
+msgid "option `%s' expects \"always\", \"auto\", or \"never\""
msgstr ""
-#: sequencer.c:761
+#: parse-options-cb.c:130 parse-options-cb.c:147
#, c-format
-msgid ""
-"you have staged changes in your working tree\n"
-"If these changes are meant to be squashed into the previous commit, run:\n"
-"\n"
-" git commit --amend %s\n"
-"\n"
-"If they are meant to go into a new commit, run:\n"
-"\n"
-" git commit %s\n"
-"\n"
-"In both cases, once you're done, continue with:\n"
-"\n"
-" git rebase --continue\n"
-msgstr ""
-
-#: sequencer.c:830
-msgid "writing root commit"
-msgstr ""
-
-#: sequencer.c:1055
-msgid "'prepare-commit-msg' hook failed"
+msgid "malformed object name '%s'"
msgstr ""
-#: sequencer.c:1062
-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"
+#: path.c:897
+#, c-format
+msgid "Could not make %s writable by group"
msgstr ""
-#: sequencer.c:1075
-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"
+#: pathspec.c:128
+msgid "Escape character '\\' not allowed as last character in attr value"
msgstr ""
-#: sequencer.c:1115
-msgid "couldn't look up newly created commit"
+#: pathspec.c:146
+msgid "Only one 'attr:' specification is allowed."
msgstr ""
-#: sequencer.c:1117
-msgid "could not parse newly created commit"
+#: pathspec.c:149
+msgid "attr spec must not be empty"
msgstr ""
-#: sequencer.c:1163
-msgid "unable to resolve HEAD after creating commit"
+#: pathspec.c:192
+#, c-format
+msgid "invalid attribute name %s"
msgstr ""
-#: sequencer.c:1165
-msgid "detached HEAD"
+#: pathspec.c:257
+msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
msgstr ""
-#: sequencer.c:1169
-msgid " (root-commit)"
+#: pathspec.c:264
+msgid ""
+"global 'literal' pathspec setting is incompatible with all other global "
+"pathspec settings"
msgstr ""
-#: sequencer.c:1190
-msgid "could not parse HEAD"
+#: pathspec.c:304
+msgid "invalid parameter for pathspec magic 'prefix'"
msgstr ""
-#: sequencer.c:1192
+#: pathspec.c:325
#, c-format
-msgid "HEAD %s is not a commit!"
+msgid "Invalid pathspec magic '%.*s' in '%s'"
msgstr ""
-#: sequencer.c:1196 builtin/commit.c:1528
-msgid "could not parse HEAD commit"
+#: pathspec.c:330
+#, c-format
+msgid "Missing ')' at the end of pathspec magic in '%s'"
msgstr ""
-#: sequencer.c:1247 sequencer.c:1845
-msgid "unable to parse commit author"
+#: pathspec.c:368
+#, c-format
+msgid "Unimplemented pathspec magic '%c' in '%s'"
msgstr ""
-#: sequencer.c:1257 builtin/am.c:1632 builtin/merge.c:675
-msgid "git write-tree failed to write a tree"
+#: pathspec.c:427
+#, c-format
+msgid "%s: 'literal' and 'glob' are incompatible"
msgstr ""
-#: sequencer.c:1274 sequencer.c:1329
+#: pathspec.c:440
#, c-format
-msgid "unable to read commit message from '%s'"
+msgid "%s: '%s' is outside repository"
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"
+#: pathspec.c:514
+#, c-format
+msgid "'%s' (mnemonic: '%c')"
msgstr ""
-#: sequencer.c:1356
+#: pathspec.c:524
#, c-format
-msgid "could not parse commit %s"
+msgid "%s: pathspec magic not supported by this command: %s"
msgstr ""
-#: sequencer.c:1361
+#: pathspec.c:591
#, c-format
-msgid "could not parse parent commit %s"
+msgid "pathspec '%s' is beyond a symbolic link"
msgstr ""
-#: sequencer.c:1457 sequencer.c:1565
-#, c-format
-msgid "unknown command: %d"
+#: pkt-line.c:92
+msgid "unable to write flush packet"
msgstr ""
-#: sequencer.c:1512 sequencer.c:1537
-#, c-format
-msgid "This is a combination of %d commits."
+#: pkt-line.c:99
+msgid "unable to write delim packet"
msgstr ""
-#: sequencer.c:1522 sequencer.c:4520
-msgid "need a HEAD to fixup"
+#: pkt-line.c:106
+msgid "flush packet write failed"
msgstr ""
-#: sequencer.c:1524 sequencer.c:2768
-msgid "could not read HEAD"
+#: pkt-line.c:146 pkt-line.c:232
+msgid "protocol error: impossibly long line"
msgstr ""
-#: sequencer.c:1526
-msgid "could not read HEAD's commit message"
+#: pkt-line.c:162 pkt-line.c:164
+msgid "packet write with format failed"
msgstr ""
-#: sequencer.c:1532
-#, c-format
-msgid "cannot write '%s'"
+#: pkt-line.c:196
+msgid "packet write failed - data exceeds max packet size"
msgstr ""
-#: sequencer.c:1539 git-rebase--preserve-merges.sh:441
-msgid "This is the 1st commit message:"
+#: pkt-line.c:203 pkt-line.c:210
+msgid "packet write failed"
msgstr ""
-#: sequencer.c:1547
-#, c-format
-msgid "could not read commit message of %s"
+#: pkt-line.c:295
+msgid "read error"
msgstr ""
-#: sequencer.c:1554
+#: pkt-line.c:303
+msgid "the remote end hung up unexpectedly"
+msgstr ""
+
+#: pkt-line.c:331
#, c-format
-msgid "This is the commit message #%d:"
+msgid "protocol error: bad line length character: %.4s"
msgstr ""
-#: sequencer.c:1560
+#: pkt-line.c:341 pkt-line.c:346
#, c-format
-msgid "The commit message #%d will be skipped:"
+msgid "protocol error: bad line length %d"
msgstr ""
-#: sequencer.c:1643
-msgid "your index file is unmerged."
+#: pkt-line.c:362
+#, c-format
+msgid "remote error: %s"
msgstr ""
-#: sequencer.c:1650
-msgid "cannot fixup root commit"
+#: preload-index.c:119
+msgid "Refreshing index"
msgstr ""
-#: sequencer.c:1669
+#: preload-index.c:138
#, c-format
-msgid "commit %s is a merge but no -m option was given."
+msgid "unable to create threaded lstat: %s"
msgstr ""
-#: sequencer.c:1677
-#, c-format
-msgid "commit %s does not have parent %d"
+#: pretty.c:966
+msgid "unable to parse --pretty format"
msgstr ""
-#: sequencer.c:1681
-#, c-format
-msgid "mainline was specified but commit %s is not a merge."
+#: range-diff.c:70
+msgid "could not start `log`"
msgstr ""
-#: sequencer.c:1687
-#, c-format
-msgid "cannot get commit message for %s"
+#: range-diff.c:72
+msgid "could not read `log` output"
msgstr ""
-#. TRANSLATORS: The first %s will be a "todo" command like
-#. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:1706
+#: range-diff.c:91 sequencer.c:5021
#, c-format
-msgid "%s: cannot parse parent commit %s"
+msgid "could not parse commit '%s'"
msgstr ""
-#: sequencer.c:1771
+#: range-diff.c:117
#, c-format
-msgid "could not rename '%s' to '%s'"
+msgid "could not parse git header '%.*s'"
msgstr ""
-#: sequencer.c:1826
-#, c-format
-msgid "could not revert %s... %s"
+#: range-diff.c:274
+msgid "failed to generate diff"
msgstr ""
-#: sequencer.c:1827
+#: range-diff.c:506 range-diff.c:508
#, c-format
-msgid "could not apply %s... %s"
+msgid "could not parse log for '%s'"
msgstr ""
-#: sequencer.c:1885
+#: read-cache.c:680
#, c-format
-msgid "git %s: failed to read the index"
+msgid "will not add file alias '%s' ('%s' already exists in index)"
+msgstr ""
+
+#: read-cache.c:696
+msgid "cannot create an empty blob in the object database"
msgstr ""
-#: sequencer.c:1892
+#: read-cache.c:718
#, c-format
-msgid "git %s: failed to refresh the index"
+msgid "%s: can only add regular files, symbolic links or git-directories"
msgstr ""
-#: sequencer.c:1972
+#: read-cache.c:723
#, c-format
-msgid "%s does not accept arguments: '%s'"
+msgid "'%s' does not have a commit checked out"
msgstr ""
-#: sequencer.c:1981
+#: read-cache.c:775
#, c-format
-msgid "missing arguments for %s"
+msgid "unable to index file '%s'"
msgstr ""
-#: sequencer.c:2040
+#: read-cache.c:794
#, c-format
-msgid "invalid line %d: %.*s"
+msgid "unable to add '%s' to index"
msgstr ""
-#: sequencer.c:2048
+#: read-cache.c:805
#, c-format
-msgid "cannot '%s' without a previous commit"
+msgid "unable to stat '%s'"
msgstr ""
-#: sequencer.c:2096 sequencer.c:4277 sequencer.c:4333
+#: read-cache.c:1314
#, c-format
-msgid "could not read '%s'."
+msgid "'%s' appears as both a file and as a directory"
msgstr ""
-#: sequencer.c:2119
-msgid "please fix this using 'git rebase --edit-todo'."
+#: read-cache.c:1499
+msgid "Refresh index"
msgstr ""
-#: sequencer.c:2121
+#: read-cache.c:1613
#, c-format
-msgid "unusable instruction sheet: '%s'"
+msgid ""
+"index.version set, but the value is invalid.\n"
+"Using version %i"
msgstr ""
-#: sequencer.c:2126
-msgid "no commits parsed."
+#: read-cache.c:1623
+#, c-format
+msgid ""
+"GIT_INDEX_VERSION set, but the value is invalid.\n"
+"Using version %i"
msgstr ""
-#: sequencer.c:2137
-msgid "cannot cherry-pick during a revert."
+#: read-cache.c:1679
+#, c-format
+msgid "bad signature 0x%08x"
msgstr ""
-#: sequencer.c:2139
-msgid "cannot revert during a cherry-pick."
+#: read-cache.c:1682
+#, c-format
+msgid "bad index version %d"
+msgstr ""
+
+#: read-cache.c:1691
+msgid "bad index file sha1 signature"
msgstr ""
-#: sequencer.c:2209
+#: read-cache.c:1721
#, c-format
-msgid "invalid value for %s: %s"
+msgid "index uses %.4s extension, which we do not understand"
msgstr ""
-#: sequencer.c:2285
-msgid "unusable squash-onto"
+#: read-cache.c:1723
+#, c-format
+msgid "ignoring %.4s extension"
msgstr ""
-#: sequencer.c:2301
+#: read-cache.c:1760
#, c-format
-msgid "malformed options sheet: '%s'"
+msgid "unknown index entry format 0x%08x"
msgstr ""
-#: sequencer.c:2335 sequencer.c:3775
-msgid "empty commit set passed"
+#: read-cache.c:1776
+#, c-format
+msgid "malformed name field in the index, near path '%s'"
msgstr ""
-#: sequencer.c:2343
-msgid "a cherry-pick or revert is already in progress"
+#: read-cache.c:1833
+msgid "unordered stage entries in index"
msgstr ""
-#: sequencer.c:2344
-msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
+#: read-cache.c:1836
+#, c-format
+msgid "multiple stage entries for merged file '%s'"
msgstr ""
-#: sequencer.c:2347
+#: read-cache.c:1839
#, c-format
-msgid "could not create sequencer directory '%s'"
+msgid "unordered stage entries for '%s'"
msgstr ""
-#: sequencer.c:2361
-msgid "could not lock HEAD"
+#: read-cache.c:1946 read-cache.c:2234 rerere.c:565 rerere.c:599 rerere.c:1111
+#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:467
+#: builtin/checkout.c:651 builtin/clean.c:956 builtin/commit.c:347
+#: builtin/diff-tree.c:120 builtin/grep.c:499 builtin/mv.c:145
+#: builtin/reset.c:245 builtin/rm.c:271 builtin/submodule--helper.c:330
+msgid "index file corrupt"
msgstr ""
-#: sequencer.c:2416 sequencer.c:3543
-msgid "no cherry-pick or revert in progress"
+#: read-cache.c:2087
+#, c-format
+msgid "unable to create load_cache_entries thread: %s"
msgstr ""
-#: sequencer.c:2418
-msgid "cannot resolve HEAD"
+#: read-cache.c:2100
+#, c-format
+msgid "unable to join load_cache_entries thread: %s"
msgstr ""
-#: sequencer.c:2420 sequencer.c:2455
-msgid "cannot abort from a branch yet to be born"
+#: read-cache.c:2133
+#, c-format
+msgid "%s: index file open failed"
msgstr ""
-#: sequencer.c:2441 builtin/grep.c:721
+#: read-cache.c:2137
#, c-format
-msgid "cannot open '%s'"
+msgid "%s: cannot stat the open index"
msgstr ""
-#: sequencer.c:2443
+#: read-cache.c:2141
#, c-format
-msgid "cannot read '%s': %s"
+msgid "%s: index file smaller than expected"
msgstr ""
-#: sequencer.c:2444
-msgid "unexpected end of file"
+#: read-cache.c:2145
+#, c-format
+msgid "%s: unable to map index file"
msgstr ""
-#: sequencer.c:2450
+#: read-cache.c:2187
#, c-format
-msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
+msgid "unable to create load_index_extensions thread: %s"
msgstr ""
-#: sequencer.c:2461
-msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
+#: read-cache.c:2214
+#, c-format
+msgid "unable to join load_index_extensions thread: %s"
msgstr ""
-#: sequencer.c:2565 sequencer.c:3461
+#: read-cache.c:2246
#, c-format
-msgid "could not update %s"
+msgid "could not freshen shared index '%s'"
msgstr ""
-#: sequencer.c:2603 sequencer.c:3441
-msgid "cannot read HEAD"
+#: read-cache.c:2293
+#, c-format
+msgid "broken index, expect %s in %s, got %s"
msgstr ""
-#: sequencer.c:2618
+#: read-cache.c:2989 wrapper.c:658 builtin/merge.c:1114
#, c-format
-msgid "unable to copy '%s' to '%s'"
+msgid "could not close '%s'"
msgstr ""
-#: sequencer.c:2626
+#: read-cache.c:3092 sequencer.c:2358 sequencer.c:3928
#, 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"
+msgid "could not stat '%s'"
msgstr ""
-#: sequencer.c:2636
+#: read-cache.c:3105
#, c-format
-msgid "Could not apply %s... %.*s"
+msgid "unable to open git dir: %s"
msgstr ""
-#: sequencer.c:2643
+#: read-cache.c:3117
#, c-format
-msgid "Could not merge %.*s"
+msgid "unable to unlink: %s"
msgstr ""
-#: sequencer.c:2654 sequencer.c:2658 builtin/difftool.c:640
+#: read-cache.c:3142
#, c-format
-msgid "could not copy '%s' to '%s'"
+msgid "cannot fix permission bits on '%s'"
msgstr ""
-#: sequencer.c:2680 sequencer.c:3095
-msgid "could not read index"
+#: read-cache.c:3291
+#, c-format
+msgid "%s: cannot drop to stage #0"
msgstr ""
-#: sequencer.c:2685
+#: rebase-interactive.c:26
#, c-format
msgid ""
-"execution failed: %s\n"
-"%sYou can fix the problem, and then run\n"
-"\n"
-" git rebase --continue\n"
-"\n"
+"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
msgstr ""
-#: sequencer.c:2691
-msgid "and made changes to the index and/or the working tree\n"
+#: rebase-interactive.c:35
+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 <command> = run command (the rest of the line) using shell\n"
+"b, break = stop here (continue rebase later with 'git rebase --continue')\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 ""
-#: sequencer.c:2697
+#: rebase-interactive.c:56
#, c-format
+msgid "Rebase %s onto %s (%d command)"
+msgid_plural "Rebase %s onto %s (%d commands)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: rebase-interactive.c:65 git-rebase--preserve-merges.sh:228
msgid ""
-"execution succeeded: %s\n"
-"but left changes to the index and/or the working tree\n"
-"Commit or stash your changes, and then run\n"
"\n"
-" git rebase --continue\n"
+"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
+msgstr ""
+
+#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:232
+msgid ""
"\n"
+"If you remove a line here THAT COMMIT WILL BE LOST.\n"
msgstr ""
-#: sequencer.c:2758
-#, c-format
-msgid "illegal label name: '%.*s'"
+#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:871
+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 ""
-#: sequencer.c:2810
-msgid "writing fake root commit"
+#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:948
+msgid ""
+"\n"
+"However, if you remove everything, the rebase will be aborted.\n"
+"\n"
msgstr ""
-#: sequencer.c:2815
-msgid "writing squash-onto"
+#: rebase-interactive.c:85 git-rebase--preserve-merges.sh:955
+msgid "Note that empty commits are commented out"
msgstr ""
-#: sequencer.c:2850
+#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3447
+#: sequencer.c:3473 sequencer.c:5120 builtin/fsck.c:356 builtin/rebase.c:235
#, c-format
-msgid "failed to find tree of %s"
+msgid "could not write '%s'"
msgstr ""
-#: sequencer.c:2868
-msgid "could not write index"
+#: rebase-interactive.c:108
+#, c-format
+msgid "could not copy '%s' to '%s'."
msgstr ""
-#: sequencer.c:2895
+#: rebase-interactive.c:173
#, c-format
-msgid "could not resolve '%s'"
+msgid ""
+"Warning: some commits may have been dropped accidentally.\n"
+"Dropped commits (newer to older):\n"
msgstr ""
-#: sequencer.c:2921
-msgid "cannot merge without a current revision"
+#: rebase-interactive.c:180
+#, 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:2943
+#: refs.c:262
#, c-format
-msgid "unable to parse '%.*s'"
+msgid "%s does not point to a valid object!"
msgstr ""
-#: sequencer.c:2952
+#: refs.c:667
#, c-format
-msgid "nothing to merge: '%.*s'"
+msgid "ignoring dangling symref %s"
msgstr ""
-#: sequencer.c:2964
-msgid "octopus merge cannot be executed on top of a [new root]"
+#: refs.c:669 ref-filter.c:2092
+#, c-format
+msgid "ignoring broken ref %s"
msgstr ""
-#: sequencer.c:2979
+#: refs.c:804
#, c-format
-msgid "could not get commit message of '%s'"
+msgid "could not open '%s' for writing: %s"
msgstr ""
-#: sequencer.c:2989 sequencer.c:3015
+#: refs.c:814 refs.c:865
#, c-format
-msgid "could not write '%s'"
+msgid "could not read ref '%s'"
msgstr ""
-#: sequencer.c:3127
+#: refs.c:820
#, c-format
-msgid "could not even attempt to merge '%.*s'"
+msgid "ref '%s' already exists"
msgstr ""
-#: sequencer.c:3143
-msgid "merge: Unable to write new index file"
+#: refs.c:825
+#, c-format
+msgid "unexpected object ID when writing '%s'"
msgstr ""
-#: sequencer.c:3211
+#: refs.c:833 sequencer.c:403 sequencer.c:2709 sequencer.c:2913
+#: sequencer.c:2927 sequencer.c:3184 sequencer.c:5037 wrapper.c:656
#, c-format
-msgid "Applied autostash.\n"
+msgid "could not write to '%s'"
msgstr ""
-#: sequencer.c:3223
+#: refs.c:860 wrapper.c:225 wrapper.c:395 builtin/am.c:715
+#: builtin/rebase.c:1003
#, c-format
-msgid "cannot store %s"
+msgid "could not open '%s' for writing"
msgstr ""
-#: sequencer.c:3226 git-rebase.sh:188
+#: refs.c:867
#, 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"
+msgid "unexpected object ID when deleting '%s'"
msgstr ""
-#: sequencer.c:3257
+#: refs.c:998
#, 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"
+msgid "log for ref %s has gap after %s"
msgstr ""
-#: sequencer.c:3325
+#: refs.c:1004
#, c-format
-msgid "Stopped at %s... %.*s\n"
+msgid "log for ref %s unexpectedly ended on %s"
msgstr ""
-#: sequencer.c:3404
+#: refs.c:1063
#, c-format
-msgid "unknown command %d"
+msgid "log for %s is empty"
msgstr ""
-#: sequencer.c:3449
-msgid "could not read orig-head"
+#: refs.c:1155
+#, c-format
+msgid "refusing to update ref with bad name '%s'"
msgstr ""
-#: sequencer.c:3454 sequencer.c:4517
-msgid "could not read 'onto'"
+#: refs.c:1231
+#, c-format
+msgid "update_ref failed for ref '%s': %s"
msgstr ""
-#: sequencer.c:3468
+#: refs.c:2012
#, c-format
-msgid "could not update HEAD to %s"
+msgid "multiple updates for ref '%s' not allowed"
msgstr ""
-#: sequencer.c:3554
-msgid "cannot rebase: You have unstaged changes."
+#: refs.c:2044
+msgid "ref updates forbidden inside quarantine environment"
msgstr ""
-#: sequencer.c:3563
-msgid "cannot amend non-existing commit"
+#: refs.c:2140 refs.c:2170
+#, c-format
+msgid "'%s' exists; cannot create '%s'"
msgstr ""
-#: sequencer.c:3565
+#: refs.c:2146 refs.c:2181
#, c-format
-msgid "invalid file: '%s'"
+msgid "cannot process '%s' and '%s' at the same time"
msgstr ""
-#: sequencer.c:3567
+#: refs/files-backend.c:1234
#, c-format
-msgid "invalid contents: '%s'"
+msgid "could not remove reference %s"
msgstr ""
-#: 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."
+#: refs/files-backend.c:1248 refs/packed-backend.c:1532
+#: refs/packed-backend.c:1542
+#, c-format
+msgid "could not delete reference %s: %s"
msgstr ""
-#: sequencer.c:3595 sequencer.c:3633
+#: refs/files-backend.c:1251 refs/packed-backend.c:1545
#, c-format
-msgid "could not write file: '%s'"
+msgid "could not delete references: %s"
msgstr ""
-#: sequencer.c:3648
-msgid "could not remove CHERRY_PICK_HEAD"
+#: refspec.c:137
+#, c-format
+msgid "invalid refspec '%s'"
msgstr ""
-#: sequencer.c:3655
-msgid "could not commit staged changes."
+#: ref-filter.c:42 wt-status.c:1934
+msgid "gone"
msgstr ""
-#: sequencer.c:3752
+#: ref-filter.c:43
#, c-format
-msgid "%s: can't cherry-pick a %s"
+msgid "ahead %d"
msgstr ""
-#: sequencer.c:3756
+#: ref-filter.c:44
#, c-format
-msgid "%s: bad revision"
+msgid "behind %d"
msgstr ""
-#: sequencer.c:3791
-msgid "can't revert as initial commit"
+#: ref-filter.c:45
+#, c-format
+msgid "ahead %d, behind %d"
msgstr ""
-#: 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
+#: ref-filter.c:162
#, c-format
-msgid "unusable todo list: '%s'"
+msgid "expected format: %%(color:<color>)"
msgstr ""
-#: sequencer.c:4396
+#: ref-filter.c:164
#, c-format
-msgid ""
-"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
+msgid "unrecognized color: %%(color:%s)"
msgstr ""
-#: sequencer.c:4466
+#: ref-filter.c:186
#, c-format
-msgid ""
-"Warning: some commits may have been dropped accidentally.\n"
-"Dropped commits (newer to older):\n"
+msgid "Integer value expected refname:lstrip=%s"
msgstr ""
-#: sequencer.c:4473
+#: ref-filter.c:190
#, 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"
+msgid "Integer value expected refname:rstrip=%s"
msgstr ""
-#: sequencer.c:4486
+#: ref-filter.c:192
#, 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"
+msgid "unrecognized %%(%s) argument: %s"
msgstr ""
-#: sequencer.c:4660
-msgid "the script was already rearranged."
+#: ref-filter.c:247
+#, c-format
+msgid "%%(objecttype) does not take arguments"
msgstr ""
-#: setup.c:123
+#: ref-filter.c:269
#, c-format
-msgid "'%s' is outside repository"
+msgid "unrecognized %%(objectsize) argument: %s"
msgstr ""
-#: setup.c:172
+#: ref-filter.c:277
#, c-format
-msgid ""
-"%s: no such path in the working tree.\n"
-"Use 'git <command> -- <path>...' to specify paths that do not exist locally."
+msgid "%%(deltabase) does not take arguments"
msgstr ""
-#: setup.c:185
+#: ref-filter.c:289
#, c-format
-msgid ""
-"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
-"Use '--' to separate paths from revisions, like this:\n"
-"'git <command> [<revision>...] -- [<file>...]'"
+msgid "%%(body) does not take arguments"
msgstr ""
-#: setup.c:234
+#: ref-filter.c:298
#, c-format
-msgid "option '%s' must come before non-option arguments"
+msgid "%%(subject) does not take arguments"
msgstr ""
-#: setup.c:253
+#: ref-filter.c:320
#, c-format
-msgid ""
-"ambiguous argument '%s': both revision and filename\n"
-"Use '--' to separate paths from revisions, like this:\n"
-"'git <command> [<revision>...] -- [<file>...]'"
+msgid "unknown %%(trailers) argument: %s"
msgstr ""
-#: setup.c:389
-msgid "unable to set up work tree using invalid config"
+#: ref-filter.c:349
+#, c-format
+msgid "positive value expected contents:lines=%s"
msgstr ""
-#: setup.c:393
-msgid "this operation must be run in a work tree"
+#: ref-filter.c:351
+#, c-format
+msgid "unrecognized %%(contents) argument: %s"
msgstr ""
-#: setup.c:503
+#: ref-filter.c:366
#, c-format
-msgid "Expected git repo version <= %d, found %d"
+msgid "positive value expected objectname:short=%s"
msgstr ""
-#: setup.c:511
-msgid "unknown repository extensions found:"
+#: ref-filter.c:370
+#, c-format
+msgid "unrecognized %%(objectname) argument: %s"
msgstr ""
-#: setup.c:530
+#: ref-filter.c:400
#, c-format
-msgid "error opening '%s'"
+msgid "expected format: %%(align:<width>,<position>)"
msgstr ""
-#: setup.c:532
+#: ref-filter.c:412
#, c-format
-msgid "too large to be a .git file: '%s'"
+msgid "unrecognized position:%s"
msgstr ""
-#: setup.c:534
+#: ref-filter.c:419
#, c-format
-msgid "error reading %s"
+msgid "unrecognized width:%s"
msgstr ""
-#: setup.c:536
+#: ref-filter.c:428
#, c-format
-msgid "invalid gitfile format: %s"
+msgid "unrecognized %%(align) argument: %s"
msgstr ""
-#: setup.c:538
+#: ref-filter.c:436
#, c-format
-msgid "no path in gitfile: %s"
+msgid "positive width expected with the %%(align) atom"
msgstr ""
-#: setup.c:540
+#: ref-filter.c:454
#, c-format
-msgid "not a git repository: %s"
+msgid "unrecognized %%(if) argument: %s"
msgstr ""
-#: setup.c:639
+#: ref-filter.c:556
#, c-format
-msgid "'$%s' too big"
+msgid "malformed field name: %.*s"
msgstr ""
-#: setup.c:653
+#: ref-filter.c:583
#, c-format
-msgid "not a git repository: '%s'"
+msgid "unknown field name: %.*s"
msgstr ""
-#: setup.c:682 setup.c:684 setup.c:715
+#: ref-filter.c:587
#, c-format
-msgid "cannot chdir to '%s'"
+msgid ""
+"not a git repository, but the field '%.*s' requires access to object data"
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"
+#: ref-filter.c:711
+#, c-format
+msgid "format: %%(if) atom used without a %%(then) atom"
msgstr ""
-#: setup.c:813
+#: ref-filter.c:774
#, c-format
-msgid "not a git repository (or any of the parent directories): %s"
+msgid "format: %%(then) atom used without an %%(if) atom"
msgstr ""
-#: setup.c:824
+#: ref-filter.c:776
#, c-format
-msgid "failed to stat '%*s%s%s'"
+msgid "format: %%(then) atom used more than once"
msgstr ""
-#: setup.c:1054
-msgid "Unable to read current working directory"
+#: ref-filter.c:778
+#, c-format
+msgid "format: %%(then) atom used after %%(else)"
msgstr ""
-#: setup.c:1066 setup.c:1072
+#: ref-filter.c:806
#, c-format
-msgid "cannot change to '%s'"
+msgid "format: %%(else) atom used without an %%(if) atom"
msgstr ""
-#: setup.c:1085
+#: ref-filter.c:808
#, 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 "format: %%(else) atom used without a %%(then) atom"
msgstr ""
-#: setup.c:1168
+#: ref-filter.c:810
#, c-format
-msgid ""
-"problem with core.sharedRepository filemode value (0%.3o).\n"
-"The owner of files must always have read and write permissions."
+msgid "format: %%(else) atom used more than once"
msgstr ""
-#: setup.c:1211
-msgid "open /dev/null or dup failed"
+#: ref-filter.c:825
+#, c-format
+msgid "format: %%(end) atom used without corresponding atom"
msgstr ""
-#: setup.c:1226
-msgid "fork failed"
+#: ref-filter.c:882
+#, c-format
+msgid "malformed format string %s"
msgstr ""
-#: setup.c:1231
-msgid "setsid failed"
+#: ref-filter.c:1485
+#, c-format
+msgid "no branch, rebasing %s"
msgstr ""
-#: sha1-file.c:381
+#: ref-filter.c:1488
#, c-format
-msgid "object directory %s does not exist; check .git/objects/info/alternates"
+msgid "no branch, rebasing detached HEAD %s"
msgstr ""
-#: sha1-file.c:432
+#: ref-filter.c:1491
#, c-format
-msgid "unable to normalize alternate object path: %s"
+msgid "no branch, bisect started on %s"
msgstr ""
-#: sha1-file.c:503
-#, c-format
-msgid "%s: ignoring alternate object stores, nesting too deep"
+#: ref-filter.c:1501
+msgid "no branch"
msgstr ""
-#: sha1-file.c:510
+#: ref-filter.c:1537 ref-filter.c:1743
#, c-format
-msgid "unable to normalize object directory: %s"
+msgid "missing object %s for %s"
msgstr ""
-#: sha1-file.c:565
-msgid "unable to fdopen alternates lockfile"
+#: ref-filter.c:1547
+#, c-format
+msgid "parse_object_buffer failed on %s for %s"
msgstr ""
-#: sha1-file.c:583
-msgid "unable to read alternates file"
+#: ref-filter.c:1998
+#, c-format
+msgid "malformed object at '%s'"
msgstr ""
-#: sha1-file.c:590
-msgid "unable to move new alternates file into place"
+#: ref-filter.c:2087
+#, c-format
+msgid "ignoring ref with broken name %s"
msgstr ""
-#: sha1-file.c:625
+#: ref-filter.c:2382
#, c-format
-msgid "path '%s' does not exist"
+msgid "format: %%(end) atom missing"
msgstr ""
-#: sha1-file.c:651
+#: ref-filter.c:2482
#, c-format
-msgid "reference repository '%s' as a linked checkout is not supported yet."
+msgid "option `%s' is incompatible with --merged"
msgstr ""
-#: sha1-file.c:657
+#: ref-filter.c:2485
#, c-format
-msgid "reference repository '%s' is not a local repository."
+msgid "option `%s' is incompatible with --no-merged"
msgstr ""
-#: sha1-file.c:663
+#: ref-filter.c:2495
#, c-format
-msgid "reference repository '%s' is shallow"
+msgid "malformed object name %s"
msgstr ""
-#: sha1-file.c:671
+#: ref-filter.c:2500
#, c-format
-msgid "reference repository '%s' is grafted"
+msgid "option `%s' must point to a commit"
msgstr ""
-#: sha1-file.c:781
+#: remote.c:363
#, c-format
-msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
+msgid "config remote shorthand cannot begin with '/': %s"
msgstr ""
-#: sha1-file.c:806
-msgid "mmap failed"
+#: remote.c:410
+msgid "more than one receivepack given, using the first"
msgstr ""
-#: sha1-file.c:973
-#, c-format
-msgid "object file %s is empty"
+#: remote.c:418
+msgid "more than one uploadpack given, using the first"
msgstr ""
-#: sha1-file.c:1093 sha1-file.c:2206
+#: remote.c:608
#, c-format
-msgid "corrupt loose object '%s'"
+msgid "Cannot fetch both %s and %s to %s"
msgstr ""
-#: sha1-file.c:1095 sha1-file.c:2210
+#: remote.c:612
#, c-format
-msgid "garbage at end of loose object '%s'"
+msgid "%s usually tracks %s, not %s"
msgstr ""
-#: sha1-file.c:1137
-msgid "invalid object type"
+#: remote.c:616
+#, c-format
+msgid "%s tracks both %s and %s"
msgstr ""
-#: sha1-file.c:1219
+#: remote.c:684
#, c-format
-msgid "unable to unpack %s header with --allow-unknown-type"
+msgid "key '%s' of pattern had no '*'"
msgstr ""
-#: sha1-file.c:1222
+#: remote.c:694
#, c-format
-msgid "unable to unpack %s header"
+msgid "value '%s' of pattern has no '*'"
msgstr ""
-#: sha1-file.c:1228
+#: remote.c:1000
#, c-format
-msgid "unable to parse %s header with --allow-unknown-type"
+msgid "src refspec %s does not match any"
msgstr ""
-#: sha1-file.c:1231
+#: remote.c:1005
#, c-format
-msgid "unable to parse %s header"
+msgid "src refspec %s matches more than one"
msgstr ""
-#: sha1-file.c:1422
+#. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push
+#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
+#. the <src>.
+#.
+#: remote.c:1020
#, c-format
-msgid "failed to read object %s"
+msgid ""
+"The destination you provided is not a full refname (i.e.,\n"
+"starting with \"refs/\"). We tried to guess what you meant by:\n"
+"\n"
+"- Looking for a ref that matches '%s' on the remote side.\n"
+"- Checking if the <src> being pushed ('%s')\n"
+" is a ref in \"refs/{heads,tags}/\". If so we add a corresponding\n"
+" refs/{heads,tags}/ prefix on the remote side.\n"
+"\n"
+"Neither worked, so we gave up. You must fully qualify the ref."
msgstr ""
-#: sha1-file.c:1426
+#: remote.c:1040
#, c-format
-msgid "replacement %s not found for %s"
+msgid ""
+"The <src> part of the refspec is a commit object.\n"
+"Did you mean to create a new branch by pushing to\n"
+"'%s:refs/heads/%s'?"
msgstr ""
-#: sha1-file.c:1430
+#: remote.c:1045
#, c-format
-msgid "loose object %s (stored in %s) is corrupt"
+msgid ""
+"The <src> part of the refspec is a tag object.\n"
+"Did you mean to create a new tag by pushing to\n"
+"'%s:refs/tags/%s'?"
msgstr ""
-#: sha1-file.c:1434
+#: remote.c:1050
#, c-format
-msgid "packed object %s (stored in %s) is corrupt"
+msgid ""
+"The <src> part of the refspec is a tree object.\n"
+"Did you mean to tag a new tree by pushing to\n"
+"'%s:refs/tags/%s'?"
msgstr ""
-#: sha1-file.c:1536
+#: remote.c:1055
#, c-format
-msgid "unable to write sha1 filename %s"
+msgid ""
+"The <src> part of the refspec is a blob object.\n"
+"Did you mean to tag a new blob by pushing to\n"
+"'%s:refs/tags/%s'?"
msgstr ""
-#: sha1-file.c:1543
+#: remote.c:1091
#, c-format
-msgid "unable to set permission to '%s'"
+msgid "%s cannot be resolved to branch"
msgstr ""
-#: sha1-file.c:1550
-msgid "file write error"
+#: remote.c:1102
+#, c-format
+msgid "unable to delete '%s': remote ref does not exist"
msgstr ""
-#: sha1-file.c:1569
-msgid "error when closing sha1 file"
+#: remote.c:1114
+#, c-format
+msgid "dst refspec %s matches more than one"
msgstr ""
-#: sha1-file.c:1635
+#: remote.c:1121
#, c-format
-msgid "insufficient permission for adding an object to repository database %s"
+msgid "dst ref %s receives from more than one src"
msgstr ""
-#: sha1-file.c:1637
-msgid "unable to create temporary file"
+#: remote.c:1624 remote.c:1725
+msgid "HEAD does not point to a branch"
msgstr ""
-#: sha1-file.c:1661
-msgid "unable to write sha1 file"
+#: remote.c:1633
+#, c-format
+msgid "no such branch: '%s'"
msgstr ""
-#: sha1-file.c:1667
+#: remote.c:1636
#, c-format
-msgid "unable to deflate new object %s (%d)"
+msgid "no upstream configured for branch '%s'"
msgstr ""
-#: sha1-file.c:1671
+#: remote.c:1642
#, c-format
-msgid "deflateEnd on object %s failed (%d)"
+msgid "upstream branch '%s' not stored as a remote-tracking branch"
msgstr ""
-#: sha1-file.c:1675
+#: remote.c:1657
#, c-format
-msgid "confused by unstable object source data for %s"
+msgid "push destination '%s' on remote '%s' has no local tracking branch"
msgstr ""
-#: sha1-file.c:1685 builtin/pack-objects.c:899
+#: remote.c:1669
#, c-format
-msgid "failed utime() on %s"
+msgid "branch '%s' has no remote for pushing"
msgstr ""
-#: sha1-file.c:1760
+#: remote.c:1679
#, c-format
-msgid "cannot read sha1_file for %s"
+msgid "push refspecs for '%s' do not include '%s'"
msgstr ""
-#: sha1-file.c:1805
-msgid "corrupt commit"
+#: remote.c:1692
+msgid "push has no destination (push.default is 'nothing')"
msgstr ""
-#: sha1-file.c:1813
-msgid "corrupt tag"
+#: remote.c:1714
+msgid "cannot resolve 'simple' push to a single destination"
msgstr ""
-#: sha1-file.c:1906
+#: remote.c:1840
#, c-format
-msgid "read error while indexing %s"
+msgid "couldn't find remote ref %s"
msgstr ""
-#: sha1-file.c:1909
+#: remote.c:1853
#, c-format
-msgid "short read while indexing %s"
+msgid "* Ignoring funny ref '%s' locally"
msgstr ""
-#: sha1-file.c:1980 sha1-file.c:1989
+#: remote.c:2016
#, c-format
-msgid "%s: failed to insert into database"
+msgid "Your branch is based on '%s', but the upstream is gone.\n"
msgstr ""
-#: sha1-file.c:1995
-#, c-format
-msgid "%s: unsupported file type"
+#: remote.c:2020
+msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr ""
-#: sha1-file.c:2019
+#: remote.c:2023
#, c-format
-msgid "%s is not a valid object"
+msgid "Your branch is up to date with '%s'.\n"
msgstr ""
-#: sha1-file.c:2021
+#: remote.c:2027
#, c-format
-msgid "%s is not a valid '%s' object"
+msgid "Your branch and '%s' refer to different commits.\n"
msgstr ""
-#: sha1-file.c:2048 builtin/index-pack.c:158
+#: remote.c:2030
#, c-format
-msgid "unable to open %s"
+msgid " (use \"%s\" for details)\n"
msgstr ""
-#: sha1-file.c:2217 sha1-file.c:2269
+#: remote.c:2034
#, c-format
-msgid "sha1 mismatch for %s (expected %s)"
+msgid "Your branch is ahead of '%s' by %d commit.\n"
+msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: remote.c:2040
+msgid " (use \"git push\" to publish your local commits)\n"
msgstr ""
-#: sha1-file.c:2241
+#: remote.c:2043
#, c-format
-msgid "unable to mmap %s"
+msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
+msgid_plural ""
+"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: remote.c:2051
+msgid " (use \"git pull\" to update your local branch)\n"
msgstr ""
-#: sha1-file.c:2246
+#: remote.c:2054
#, c-format
-msgid "unable to unpack header of %s"
+msgid ""
+"Your branch and '%s' have diverged,\n"
+"and have %d and %d different commit each, respectively.\n"
+msgid_plural ""
+"Your branch and '%s' have diverged,\n"
+"and have %d and %d different commits each, respectively.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: remote.c:2064
+msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr ""
-#: sha1-file.c:2252
+#: remote.c:2247
#, c-format
-msgid "unable to parse header of %s"
+msgid "cannot parse expected object name '%s'"
msgstr ""
-#: sha1-file.c:2263
+#: replace-object.c:21
#, c-format
-msgid "unable to unpack contents of %s"
+msgid "bad replace ref name: %s"
msgstr ""
-#: sha1-name.c:444
+#: replace-object.c:30
#, c-format
-msgid "short SHA1 %s is ambiguous"
+msgid "duplicate replace ref: %s"
msgstr ""
-#: sha1-name.c:455
-msgid "The candidates are:"
+#: replace-object.c:73
+#, c-format
+msgid "replace depth too high for object %s"
msgstr ""
-#: sha1-name.c:699
-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\""
+#: rerere.c:217 rerere.c:226 rerere.c:229
+msgid "corrupt MERGE_RR"
msgstr ""
-#: submodule.c:97 submodule.c:131
-msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
+#: rerere.c:264 rerere.c:269
+msgid "unable to write rerere record"
msgstr ""
-#: submodule.c:101 submodule.c:135
+#: rerere.c:495
#, c-format
-msgid "Could not find section in .gitmodules where path=%s"
+msgid "there were errors while writing '%s' (%s)"
msgstr ""
-#: submodule.c:109
+#: rerere.c:498
#, c-format
-msgid "Could not update .gitmodules entry %s"
+msgid "failed to flush '%s'"
msgstr ""
-#: submodule.c:142
+#: rerere.c:503 rerere.c:1039
#, c-format
-msgid "Could not remove .gitmodules entry for %s"
+msgid "could not parse conflict hunks in '%s'"
msgstr ""
-#: submodule.c:153
-msgid "staging updated .gitmodules failed"
+#: rerere.c:684
+#, c-format
+msgid "failed utime() on '%s'"
msgstr ""
-#: submodule.c:315
+#: rerere.c:694
#, c-format
-msgid "in unpopulated submodule '%s'"
+msgid "writing '%s' failed"
msgstr ""
-#: submodule.c:346
+#: rerere.c:714
#, c-format
-msgid "Pathspec '%s' is in submodule '%.*s'"
+msgid "Staged '%s' using previous resolution."
msgstr ""
-#: submodule.c:839
+#: rerere.c:753
#, c-format
-msgid "submodule entry '%s' (%s) is a %s, not a commit"
+msgid "Recorded resolution for '%s'."
msgstr ""
-#: submodule.c:1071 builtin/branch.c:662 builtin/submodule--helper.c:1888
-msgid "Failed to resolve HEAD as a valid ref."
+#: rerere.c:788
+#, c-format
+msgid "Resolved '%s' using previous resolution."
msgstr ""
-#: submodule.c:1377
+#: rerere.c:803
#, c-format
-msgid "'%s' not recognized as a git repository"
+msgid "cannot unlink stray '%s'"
msgstr ""
-#: submodule.c:1515
+#: rerere.c:807
#, c-format
-msgid "could not start 'git status' in submodule '%s'"
+msgid "Recorded preimage for '%s'"
msgstr ""
-#: submodule.c:1528
+#: rerere.c:881 submodule.c:2023 builtin/log.c:1773
+#: builtin/submodule--helper.c:1418 builtin/submodule--helper.c:1428
#, c-format
-msgid "could not run 'git status' in submodule '%s'"
+msgid "could not create directory '%s'"
msgstr ""
-#: submodule.c:1543
+#: rerere.c:1057
#, c-format
-msgid "Could not unset core.worktree setting in submodule '%s'"
+msgid "failed to update conflicted state in '%s'"
msgstr ""
-#: submodule.c:1633
+#: rerere.c:1068 rerere.c:1075
#, c-format
-msgid "submodule '%s' has dirty index"
+msgid "no remembered resolution for '%s'"
msgstr ""
-#: submodule.c:1685
+#: rerere.c:1077
#, c-format
-msgid "Submodule '%s' could not be updated."
+msgid "cannot unlink '%s'"
msgstr ""
-#: submodule.c:1734
+#: rerere.c:1087
#, c-format
-msgid ""
-"relocate_gitdir for submodule '%s' with more than one worktree not supported"
+msgid "Updated preimage for '%s'"
msgstr ""
-#: submodule.c:1746 submodule.c:1802
+#: rerere.c:1096
#, c-format
-msgid "could not lookup name for submodule '%s'"
+msgid "Forgot resolution for '%s'\n"
msgstr ""
-#: submodule.c:1750 builtin/submodule--helper.c:1406
-#: builtin/submodule--helper.c:1416
-#, c-format
-msgid "could not create directory '%s'"
+#: rerere.c:1199
+msgid "unable to open rr-cache directory"
msgstr ""
-#: submodule.c:1753
-#, c-format
-msgid ""
-"Migrating git directory of '%s%s' from\n"
-"'%s' to\n"
-"'%s'\n"
+#: revision.c:2507
+msgid "your current branch appears to be broken"
msgstr ""
-#: submodule.c:1837
+#: revision.c:2510
#, c-format
-msgid "could not recurse into submodule '%s'"
+msgid "your current branch '%s' does not have any commits yet"
msgstr ""
-#: submodule.c:1881
-msgid "could not start ls-files in .."
+#: revision.c:2710
+msgid "--first-parent is incompatible with --bisect"
+msgstr ""
+
+#: revision.c:2714
+msgid "-L does not yet support diff formats besides -p and -s"
msgstr ""
-#: submodule.c:1920
+#: run-command.c:763
+msgid "open /dev/null failed"
+msgstr ""
+
+#: run-command.c:1269
#, c-format
-msgid "ls-tree returned unexpected return code %d"
+msgid "cannot create async thread: %s"
msgstr ""
-#: submodule-config.c:231
+#: run-command.c:1333
#, c-format
-msgid "ignoring suspicious submodule name: %s"
+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 ""
-#: submodule-config.c:295
-msgid "negative values not allowed for submodule.fetchjobs"
+#: send-pack.c:141
+msgid "unexpected flush packet while reading remote unpack status"
msgstr ""
-#: submodule-config.c:468
+#: send-pack.c:143
#, c-format
-msgid "invalid value for %s"
+msgid "unable to parse remote unpack status: %s"
msgstr ""
-#: trailer.c:238
+#: send-pack.c:145
#, c-format
-msgid "running trailer command '%s' failed"
+msgid "remote unpack failed: %s"
msgstr ""
-#: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553
-#: trailer.c:557
-#, c-format
-msgid "unknown value '%s' for key '%s'"
+#: send-pack.c:306
+msgid "failed to sign the push certificate"
msgstr ""
-#: trailer.c:539 trailer.c:544 builtin/remote.c:294
-#, c-format
-msgid "more than one %s"
+#: send-pack.c:420
+msgid "the receiving end does not support --signed push"
msgstr ""
-#: trailer.c:730
-#, c-format
-msgid "empty trailer token in trailer '%.*s'"
+#: send-pack.c:422
+msgid ""
+"not sending a push certificate since the receiving end does not support --"
+"signed push"
msgstr ""
-#: trailer.c:750
-#, c-format
-msgid "could not read input file '%s'"
+#: send-pack.c:434
+msgid "the receiving end does not support --atomic push"
msgstr ""
-#: trailer.c:753
-msgid "could not read from stdin"
+#: send-pack.c:439
+msgid "the receiving end does not support push options"
msgstr ""
-#: trailer.c:1008 builtin/am.c:47
+#: sequencer.c:187
#, c-format
-msgid "could not stat %s"
+msgid "invalid commit message cleanup mode '%s'"
msgstr ""
-#: trailer.c:1010
+#: sequencer.c:292
#, c-format
-msgid "file %s is not a regular file"
+msgid "could not delete '%s'"
msgstr ""
-#: trailer.c:1012
+#: sequencer.c:311 builtin/rebase.c:759 builtin/rebase.c:1645 builtin/rm.c:369
#, c-format
-msgid "file %s is not writable by user"
+msgid "could not remove '%s'"
msgstr ""
-#: trailer.c:1024
-msgid "could not open temporary file"
+#: sequencer.c:321
+msgid "revert"
msgstr ""
-#: trailer.c:1064
-#, c-format
-msgid "could not rename temporary file to %s"
+#: sequencer.c:323
+msgid "cherry-pick"
msgstr ""
-#: transport.c:116
-#, c-format
-msgid "Would set upstream of '%s' to '%s' of '%s'\n"
+#: sequencer.c:325
+msgid "rebase -i"
msgstr ""
-#: transport.c:142
+#: sequencer.c:327
#, c-format
-msgid "could not read bundle '%s'"
+msgid "unknown action: %d"
msgstr ""
-#: transport.c:208
+#: sequencer.c:385
+msgid ""
+"after resolving the conflicts, mark the corrected paths\n"
+"with 'git add <paths>' or 'git rm <paths>'"
+msgstr ""
+
+#: sequencer.c:388
+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:401 sequencer.c:2909
#, c-format
-msgid "transport: invalid depth option '%s'"
+msgid "could not lock '%s'"
msgstr ""
-#: transport.c:586
-msgid "could not parse transport.color.* config"
+#: sequencer.c:408
+#, c-format
+msgid "could not write eol to '%s'"
msgstr ""
-#: transport.c:659
-msgid "support for protocol v2 not implemented yet"
+#: sequencer.c:413 sequencer.c:2714 sequencer.c:2915 sequencer.c:2929
+#: sequencer.c:3192
+#, c-format
+msgid "failed to finalize '%s'"
msgstr ""
-#: transport.c:785
+#: sequencer.c:436 sequencer.c:981 sequencer.c:1655 sequencer.c:2734
+#: sequencer.c:3174 sequencer.c:3283 builtin/am.c:245 builtin/commit.c:763
+#: builtin/merge.c:1112 builtin/rebase.c:567
#, c-format
-msgid "unknown value for config '%s': %s"
+msgid "could not read '%s'"
msgstr ""
-#: transport.c:851
+#: sequencer.c:462
#, c-format
-msgid "transport '%s' not allowed"
+msgid "your local changes would be overwritten by %s."
msgstr ""
-#: transport.c:903
-msgid "git-over-rsync is no longer supported"
+#: sequencer.c:466
+msgid "commit your changes or stash them to proceed."
msgstr ""
-#: transport.c:998
+#: sequencer.c:498
#, c-format
-msgid ""
-"The following submodule paths contain changes that can\n"
-"not be found on any remote:\n"
+msgid "%s: fast-forward"
msgstr ""
-#: transport.c:1002
+#: sequencer.c:537 builtin/tag.c:565
#, 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 "Invalid cleanup mode %s"
msgstr ""
-#: transport.c:1010
-msgid "Aborting."
+#. TRANSLATORS: %s will be "revert", "cherry-pick" or
+#. "rebase -i".
+#.
+#: sequencer.c:632
+#, c-format
+msgid "%s: Unable to write new index file"
msgstr ""
-#: transport.c:1148
-msgid "failed to push all needed submodules"
+#: sequencer.c:649
+msgid "unable to update cache tree"
msgstr ""
-#: transport.c:1270 transport-helper.c:643
-msgid "operation not supported by protocol"
+#: sequencer.c:663
+msgid "could not resolve HEAD commit"
msgstr ""
-#: transport.c:1352
+#: sequencer.c:743
#, c-format
-msgid "invalid line while parsing alternate refs: %s"
+msgid "no key present in '%.*s'"
msgstr ""
-#: transport-helper.c:51 transport-helper.c:80
-msgid "full write to remote helper failed"
+#: sequencer.c:754
+#, c-format
+msgid "unable to dequote value of '%s'"
msgstr ""
-#: transport-helper.c:132
+#: sequencer.c:791 wrapper.c:227 wrapper.c:397 builtin/am.c:706
+#: builtin/am.c:798 builtin/merge.c:1109 builtin/rebase.c:1045
#, c-format
-msgid "unable to find remote helper for '%s'"
+msgid "could not open '%s' for reading"
msgstr ""
-#: transport-helper.c:148 transport-helper.c:557
-msgid "can't dup helper output fd"
+#: sequencer.c:801
+msgid "'GIT_AUTHOR_NAME' already given"
msgstr ""
-#: transport-helper.c:199
-#, c-format
-msgid ""
-"unknown mandatory capability %s; this remote helper probably needs newer "
-"version of Git"
+#: sequencer.c:806
+msgid "'GIT_AUTHOR_EMAIL' already given"
msgstr ""
-#: transport-helper.c:205
-msgid "this remote helper should implement refspec capability"
+#: sequencer.c:811
+msgid "'GIT_AUTHOR_DATE' already given"
msgstr ""
-#: transport-helper.c:272 transport-helper.c:412
+#: sequencer.c:815
#, c-format
-msgid "%s unexpectedly said: '%s'"
+msgid "unknown variable '%s'"
msgstr ""
-#: transport-helper.c:401
-#, c-format
-msgid "%s also locked %s"
+#: sequencer.c:820
+msgid "missing 'GIT_AUTHOR_NAME'"
msgstr ""
-#: transport-helper.c:479
-msgid "couldn't run fast-import"
+#: sequencer.c:822
+msgid "missing 'GIT_AUTHOR_EMAIL'"
msgstr ""
-#: transport-helper.c:502
-msgid "error while running fast-import"
+#: sequencer.c:824
+msgid "missing 'GIT_AUTHOR_DATE'"
msgstr ""
-#: transport-helper.c:531 transport-helper.c:1091
+#: sequencer.c:884
#, c-format
-msgid "could not read ref %s"
+msgid "invalid date format '%s' in '%s'"
msgstr ""
-#: transport-helper.c:576
+#: sequencer.c:901
#, c-format
-msgid "unknown response to connect: %s"
+msgid ""
+"you have staged changes in your working tree\n"
+"If these changes are meant to be squashed into the previous commit, run:\n"
+"\n"
+" git commit --amend %s\n"
+"\n"
+"If they are meant to go into a new commit, run:\n"
+"\n"
+" git commit %s\n"
+"\n"
+"In both cases, once you're done, continue with:\n"
+"\n"
+" git rebase --continue\n"
msgstr ""
-#: transport-helper.c:598
-msgid "setting remote service path not supported by protocol"
+#: sequencer.c:995
+msgid "writing root commit"
msgstr ""
-#: transport-helper.c:600
-msgid "invalid remote service path"
+#: sequencer.c:1216
+msgid "'prepare-commit-msg' hook failed"
msgstr ""
-#: transport-helper.c:646
-#, c-format
-msgid "can't connect to subservice %s"
+#: sequencer.c:1223
+msgid ""
+"Your name and email address were configured automatically based\n"
+"on your username and hostname. Please check that they are accurate.\n"
+"You can suppress this message by setting them explicitly. Run the\n"
+"following command and follow the instructions in your editor to edit\n"
+"your configuration file:\n"
+"\n"
+" git config --global --edit\n"
+"\n"
+"After doing this, you may fix the identity used for this commit with:\n"
+"\n"
+" git commit --amend --reset-author\n"
msgstr ""
-#: transport-helper.c:713
-#, c-format
-msgid "expected ok/error, helper said '%s'"
+#: sequencer.c:1236
+msgid ""
+"Your name and email address were configured automatically based\n"
+"on your username and hostname. Please check that they are accurate.\n"
+"You can suppress this message by setting them explicitly:\n"
+"\n"
+" git config --global user.name \"Your Name\"\n"
+" git config --global user.email you@example.com\n"
+"\n"
+"After doing this, you may fix the identity used for this commit with:\n"
+"\n"
+" git commit --amend --reset-author\n"
msgstr ""
-#: transport-helper.c:766
-#, c-format
-msgid "helper reported unexpected status of %s"
+#: sequencer.c:1278
+msgid "couldn't look up newly created commit"
msgstr ""
-#: transport-helper.c:827
-#, c-format
-msgid "helper %s does not support dry-run"
+#: sequencer.c:1280
+msgid "could not parse newly created commit"
msgstr ""
-#: transport-helper.c:830
-#, c-format
-msgid "helper %s does not support --signed"
+#: sequencer.c:1326
+msgid "unable to resolve HEAD after creating commit"
msgstr ""
-#: transport-helper.c:833
-#, c-format
-msgid "helper %s does not support --signed=if-asked"
+#: sequencer.c:1328
+msgid "detached HEAD"
msgstr ""
-#: transport-helper.c:840
-#, c-format
-msgid "helper %s does not support 'push-option'"
+#: sequencer.c:1332
+msgid " (root-commit)"
msgstr ""
-#: transport-helper.c:932
-msgid "remote-helper doesn't support push; refspec needed"
+#: sequencer.c:1353
+msgid "could not parse HEAD"
msgstr ""
-#: transport-helper.c:937
+#: sequencer.c:1355
#, c-format
-msgid "helper %s does not support 'force'"
+msgid "HEAD %s is not a commit!"
msgstr ""
-#: transport-helper.c:984
-msgid "couldn't run fast-export"
+#: sequencer.c:1359 builtin/commit.c:1571
+msgid "could not parse HEAD commit"
msgstr ""
-#: transport-helper.c:989
-msgid "error while running fast-export"
+#: sequencer.c:1411 sequencer.c:2004
+msgid "unable to parse commit author"
msgstr ""
-#: 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"
+#: sequencer.c:1421 builtin/am.c:1573 builtin/merge.c:684
+msgid "git write-tree failed to write a tree"
msgstr ""
-#: transport-helper.c:1077
+#: sequencer.c:1438 sequencer.c:1499
#, c-format
-msgid "malformed response in ref list: %s"
+msgid "unable to read commit message from '%s'"
msgstr ""
-#: transport-helper.c:1230
-#, c-format
-msgid "read(%s) failed"
+#: sequencer.c:1465 builtin/am.c:1595 builtin/commit.c:1670 builtin/merge.c:878
+#: builtin/merge.c:903
+msgid "failed to write commit object"
msgstr ""
-#: transport-helper.c:1257
+#: sequencer.c:1526
#, c-format
-msgid "write(%s) failed"
+msgid "could not parse commit %s"
msgstr ""
-#: transport-helper.c:1306
+#: sequencer.c:1531
#, c-format
-msgid "%s thread failed"
+msgid "could not parse parent commit %s"
msgstr ""
-#: transport-helper.c:1310
+#: sequencer.c:1605 sequencer.c:1715
#, c-format
-msgid "%s thread failed to join: %s"
+msgid "unknown command: %d"
msgstr ""
-#: transport-helper.c:1329 transport-helper.c:1333
+#: sequencer.c:1662 sequencer.c:1687
#, c-format
-msgid "can't start thread for copying data: %s"
+msgid "This is a combination of %d commits."
msgstr ""
-#: transport-helper.c:1370
-#, c-format
-msgid "%s process failed to wait"
+#: sequencer.c:1672
+msgid "need a HEAD to fixup"
msgstr ""
-#: transport-helper.c:1374
-#, c-format
-msgid "%s process failed"
+#: sequencer.c:1674 sequencer.c:3219
+msgid "could not read HEAD"
msgstr ""
-#: transport-helper.c:1392 transport-helper.c:1401
-msgid "can't start thread for copying data"
+#: sequencer.c:1676
+msgid "could not read HEAD's commit message"
msgstr ""
-#: tree-walk.c:33
-msgid "too-short tree object"
+#: sequencer.c:1682
+#, c-format
+msgid "cannot write '%s'"
msgstr ""
-#: tree-walk.c:39
-msgid "malformed mode in tree entry"
+#: sequencer.c:1689 git-rebase--preserve-merges.sh:496
+msgid "This is the 1st commit message:"
msgstr ""
-#: tree-walk.c:43
-msgid "empty filename in tree entry"
+#: sequencer.c:1697
+#, c-format
+msgid "could not read commit message of %s"
msgstr ""
-#: tree-walk.c:115
-msgid "too-short tree file"
+#: sequencer.c:1704
+#, c-format
+msgid "This is the commit message #%d:"
msgstr ""
-#: unpack-trees.c:112
+#: sequencer.c:1710
#, 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 "The commit message #%d will be skipped:"
msgstr ""
-#: unpack-trees.c:114
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by checkout:\n"
-"%%s"
+#: sequencer.c:1798
+msgid "your index file is unmerged."
msgstr ""
-#: 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."
+#: sequencer.c:1805
+msgid "cannot fixup root commit"
msgstr ""
-#: unpack-trees.c:119
+#: sequencer.c:1824
#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by merge:\n"
-"%%s"
+msgid "commit %s is a merge but no -m option was given."
msgstr ""
-#: unpack-trees.c:122
+#: sequencer.c:1832 sequencer.c:1840
#, 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 "commit %s does not have parent %d"
msgstr ""
-#: unpack-trees.c:124
+#: sequencer.c:1846
#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by %s:\n"
-"%%s"
+msgid "cannot get commit message for %s"
msgstr ""
-#: unpack-trees.c:129
+#. TRANSLATORS: The first %s will be a "todo" command like
+#. "revert" or "pick", the second %s a SHA1.
+#: sequencer.c:1865
#, c-format
-msgid ""
-"Updating the following directories would lose untracked files in them:\n"
-"%s"
+msgid "%s: cannot parse parent commit %s"
msgstr ""
-#: unpack-trees.c:133
+#: sequencer.c:1930
#, 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 "could not rename '%s' to '%s'"
msgstr ""
-#: unpack-trees.c:135
+#: sequencer.c:1985
#, c-format
-msgid ""
-"The following untracked working tree files would be removed by checkout:\n"
-"%%s"
+msgid "could not revert %s... %s"
msgstr ""
-#: unpack-trees.c:138
+#: sequencer.c:1986
#, c-format
-msgid ""
-"The following untracked working tree files would be removed by merge:\n"
-"%%sPlease move or remove them before you merge."
+msgid "could not apply %s... %s"
msgstr ""
-#: unpack-trees.c:140
+#: sequencer.c:2045
#, c-format
-msgid ""
-"The following untracked working tree files would be removed by merge:\n"
-"%%s"
+msgid "git %s: failed to read the index"
msgstr ""
-#: unpack-trees.c:143
+#: sequencer.c:2052
#, c-format
-msgid ""
-"The following untracked working tree files would be removed by %s:\n"
-"%%sPlease move or remove them before you %s."
+msgid "git %s: failed to refresh the index"
msgstr ""
-#: unpack-trees.c:145
+#: sequencer.c:2128
#, c-format
-msgid ""
-"The following untracked working tree files would be removed by %s:\n"
-"%%s"
+msgid "%s does not accept arguments: '%s'"
msgstr ""
-#: unpack-trees.c:151
+#: sequencer.c:2137
#, 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 "missing arguments for %s"
msgstr ""
-#: unpack-trees.c:153
+#: sequencer.c:2174
#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by "
-"checkout:\n"
-"%%s"
+msgid "could not parse '%.*s'"
msgstr ""
-#: unpack-trees.c:156
+#: sequencer.c:2228
#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by merge:\n"
-"%%sPlease move or remove them before you merge."
+msgid "invalid line %d: %.*s"
msgstr ""
-#: unpack-trees.c:158
+#: sequencer.c:2239
#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by merge:\n"
-"%%s"
+msgid "cannot '%s' without a previous commit"
msgstr ""
-#: unpack-trees.c:161
+#: sequencer.c:2287 builtin/rebase.c:153 builtin/rebase.c:178
+#: builtin/rebase.c:204 builtin/rebase.c:229
#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by %s:\n"
-"%%sPlease move or remove them before you %s."
+msgid "could not read '%s'."
msgstr ""
-#: unpack-trees.c:163
-#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by %s:\n"
-"%%s"
+#: sequencer.c:2323
+msgid "cancelling a cherry picking in progress"
msgstr ""
-#: unpack-trees.c:171
-#, c-format
-msgid "Entry '%s' overlaps with '%s'. Cannot bind."
+#: sequencer.c:2330
+msgid "cancelling a revert in progress"
msgstr ""
-#: unpack-trees.c:174
-#, c-format
-msgid ""
-"Cannot update sparse checkout: the following entries are not up to date:\n"
-"%s"
+#: sequencer.c:2364
+msgid "please fix this using 'git rebase --edit-todo'."
msgstr ""
-#: unpack-trees.c:176
+#: sequencer.c:2366
#, c-format
-msgid ""
-"The following working tree files would be overwritten by sparse checkout "
-"update:\n"
-"%s"
+msgid "unusable instruction sheet: '%s'"
msgstr ""
-#: unpack-trees.c:178
-#, c-format
-msgid ""
-"The following working tree files would be removed by sparse checkout "
-"update:\n"
-"%s"
+#: sequencer.c:2371
+msgid "no commits parsed."
+msgstr ""
+
+#: sequencer.c:2382
+msgid "cannot cherry-pick during a revert."
+msgstr ""
+
+#: sequencer.c:2384
+msgid "cannot revert during a cherry-pick."
msgstr ""
-#: unpack-trees.c:180
+#: sequencer.c:2466
#, c-format
-msgid ""
-"Cannot update submodule:\n"
-"%s"
+msgid "invalid value for %s: %s"
msgstr ""
-#: unpack-trees.c:254
+#: sequencer.c:2553
+msgid "unusable squash-onto"
+msgstr ""
+
+#: sequencer.c:2569
#, c-format
-msgid "Aborting\n"
+msgid "malformed options sheet: '%s'"
msgstr ""
-#: unpack-trees.c:336
-msgid "Checking out files"
+#: sequencer.c:2652 sequencer.c:4351
+msgid "empty commit set passed"
msgstr ""
-#: urlmatch.c:163
-msgid "invalid URL scheme name or missing '://' suffix"
+#: sequencer.c:2668
+msgid "revert is already in progress"
msgstr ""
-#: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405
+#: sequencer.c:2670
#, c-format
-msgid "invalid %XX escape sequence"
+msgid "try \"git revert (--continue | %s--abort | --quit)\""
msgstr ""
-#: urlmatch.c:215
-msgid "missing host and scheme is not 'file:'"
+#: sequencer.c:2673
+msgid "cherry-pick is already in progress"
msgstr ""
-#: urlmatch.c:232
-msgid "a 'file:' URL may not have a port number"
+#: sequencer.c:2675
+#, c-format
+msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
msgstr ""
-#: urlmatch.c:247
-msgid "invalid characters in host name"
+#: sequencer.c:2689
+#, c-format
+msgid "could not create sequencer directory '%s'"
msgstr ""
-#: urlmatch.c:292 urlmatch.c:303
-msgid "invalid port number"
+#: sequencer.c:2704
+msgid "could not lock HEAD"
msgstr ""
-#: urlmatch.c:371
-msgid "invalid '..' path segment"
+#: sequencer.c:2764 sequencer.c:4103
+msgid "no cherry-pick or revert in progress"
msgstr ""
-#: worktree.c:245 builtin/am.c:2147
-#, c-format
-msgid "failed to read '%s'"
+#: sequencer.c:2766 sequencer.c:2777
+msgid "cannot resolve HEAD"
msgstr ""
-#: worktree.c:291
-#, c-format
-msgid "'%s' at main working tree is not the repository directory"
+#: sequencer.c:2768 sequencer.c:2812
+msgid "cannot abort from a branch yet to be born"
msgstr ""
-#: worktree.c:302
+#: sequencer.c:2798 builtin/grep.c:734
#, c-format
-msgid "'%s' file does not contain absolute path to the working tree location"
+msgid "cannot open '%s'"
msgstr ""
-#: worktree.c:314
+#: sequencer.c:2800
#, c-format
-msgid "'%s' does not exist"
+msgid "cannot read '%s': %s"
msgstr ""
-#: worktree.c:320
-#, c-format
-msgid "'%s' is not a .git file, error code %d"
+#: sequencer.c:2801
+msgid "unexpected end of file"
msgstr ""
-#: worktree.c:328
+#: sequencer.c:2807
#, c-format
-msgid "'%s' does not point back to '%s'"
+msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr ""
-#: wrapper.c:223 wrapper.c:393
-#, c-format
-msgid "could not open '%s' for reading and writing"
+#: sequencer.c:2818
+msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr ""
-#: 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 "could not open '%s' for reading"
+#: sequencer.c:2859
+msgid "no revert in progress"
msgstr ""
-#: wrapper.c:424 wrapper.c:624
-#, c-format
-msgid "unable to access '%s'"
+#: sequencer.c:2867
+msgid "no cherry-pick in progress"
msgstr ""
-#: wrapper.c:632
-msgid "unable to get current working directory"
+#: sequencer.c:2877
+msgid "failed to skip the commit"
msgstr ""
-#: wt-status.c:154
-msgid "Unmerged paths:"
+#: sequencer.c:2884
+msgid "there is nothing to skip"
msgstr ""
-#: wt-status.c:181 wt-status.c:208
+#: sequencer.c:2887
#, c-format
-msgid " (use \"git reset %s <file>...\" to unstage)"
+msgid ""
+"have you committed already?\n"
+"try \"git %s --continue\""
msgstr ""
-#: wt-status.c:183 wt-status.c:210
-msgid " (use \"git rm --cached <file>...\" to unstage)"
+#: sequencer.c:3011 sequencer.c:4015
+#, c-format
+msgid "could not update %s"
msgstr ""
-#: wt-status.c:187
-msgid " (use \"git add <file>...\" to mark resolution)"
+#: sequencer.c:3049 sequencer.c:3995
+msgid "cannot read HEAD"
msgstr ""
-#: wt-status.c:189 wt-status.c:193
-msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
+#: sequencer.c:3066
+#, c-format
+msgid "unable to copy '%s' to '%s'"
msgstr ""
-#: wt-status.c:191
-msgid " (use \"git rm <file>...\" to mark resolution)"
+#: sequencer.c:3074
+#, 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 ""
-#: wt-status.c:202 wt-status.c:1015
-msgid "Changes to be committed:"
+#: sequencer.c:3084
+#, c-format
+msgid "Could not apply %s... %.*s"
msgstr ""
-#: wt-status.c:220 wt-status.c:1024
-msgid "Changes not staged for commit:"
+#: sequencer.c:3091
+#, c-format
+msgid "Could not merge %.*s"
msgstr ""
-#: wt-status.c:224
-msgid " (use \"git add <file>...\" to update what will be committed)"
+#: sequencer.c:3105 sequencer.c:3109 builtin/difftool.c:633
+#, c-format
+msgid "could not copy '%s' to '%s'"
msgstr ""
-#: wt-status.c:226
-msgid " (use \"git add/rm <file>...\" to update what will be committed)"
+#: sequencer.c:3131 sequencer.c:3558 builtin/rebase.c:849 builtin/rebase.c:1582
+#: builtin/rebase.c:1953 builtin/rebase.c:2008
+msgid "could not read index"
msgstr ""
-#: wt-status.c:227
+#: sequencer.c:3136
+#, c-format
msgid ""
-" (use \"git checkout -- <file>...\" to discard changes in working directory)"
+"execution failed: %s\n"
+"%sYou can fix the problem, and then run\n"
+"\n"
+" git rebase --continue\n"
+"\n"
msgstr ""
-#: wt-status.c:229
-msgid " (commit or discard the untracked or modified content in submodules)"
+#: sequencer.c:3142
+msgid "and made changes to the index and/or the working tree\n"
msgstr ""
-#: wt-status.c:241
+#: sequencer.c:3148
#, c-format
-msgid " (use \"git %s <file>...\" to include in what will be committed)"
+msgid ""
+"execution succeeded: %s\n"
+"but left changes to the index and/or the working tree\n"
+"Commit or stash your changes, and then run\n"
+"\n"
+" git rebase --continue\n"
+"\n"
msgstr ""
-#: wt-status.c:256
-msgid "both deleted:"
+#: sequencer.c:3209
+#, c-format
+msgid "illegal label name: '%.*s'"
msgstr ""
-#: wt-status.c:258
-msgid "added by us:"
+#: sequencer.c:3263
+msgid "writing fake root commit"
msgstr ""
-#: wt-status.c:260
-msgid "deleted by them:"
+#: sequencer.c:3268
+msgid "writing squash-onto"
msgstr ""
-#: wt-status.c:262
-msgid "added by them:"
+#: sequencer.c:3306 builtin/rebase.c:854 builtin/rebase.c:860
+#, c-format
+msgid "failed to find tree of %s"
msgstr ""
-#: wt-status.c:264
-msgid "deleted by us:"
+#: sequencer.c:3324 builtin/rebase.c:873
+msgid "could not write index"
msgstr ""
-#: wt-status.c:266
-msgid "both added:"
+#: sequencer.c:3351
+#, c-format
+msgid "could not resolve '%s'"
msgstr ""
-#: wt-status.c:268
-msgid "both modified:"
+#: sequencer.c:3379
+msgid "cannot merge without a current revision"
msgstr ""
-#: wt-status.c:278
-msgid "new file:"
+#: sequencer.c:3401
+#, c-format
+msgid "unable to parse '%.*s'"
msgstr ""
-#: wt-status.c:280
-msgid "copied:"
+#: sequencer.c:3410
+#, c-format
+msgid "nothing to merge: '%.*s'"
msgstr ""
-#: wt-status.c:282
-msgid "deleted:"
+#: sequencer.c:3422
+msgid "octopus merge cannot be executed on top of a [new root]"
msgstr ""
-#: wt-status.c:284
-msgid "modified:"
+#: sequencer.c:3437
+#, c-format
+msgid "could not get commit message of '%s'"
msgstr ""
-#: wt-status.c:286
-msgid "renamed:"
+#: sequencer.c:3590
+#, c-format
+msgid "could not even attempt to merge '%.*s'"
msgstr ""
-#: wt-status.c:288
-msgid "typechange:"
+#: sequencer.c:3606
+msgid "merge: Unable to write new index file"
msgstr ""
-#: wt-status.c:290
-msgid "unknown:"
+#: sequencer.c:3675 builtin/rebase.c:711
+#, c-format
+msgid "Applied autostash.\n"
msgstr ""
-#: wt-status.c:292
-msgid "unmerged:"
+#: sequencer.c:3687
+#, c-format
+msgid "cannot store %s"
msgstr ""
-#: wt-status.c:372
-msgid "new commits, "
+#: sequencer.c:3690 builtin/rebase.c:727 git-rebase--preserve-merges.sh:113
+#, 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 ""
-#: wt-status.c:374
-msgid "modified content, "
+#: sequencer.c:3751
+#, c-format
+msgid "could not checkout %s"
msgstr ""
-#: wt-status.c:376
-msgid "untracked content, "
+#: sequencer.c:3765
+#, c-format
+msgid "%s: not a valid OID"
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] ""
+#: sequencer.c:3770 git-rebase--preserve-merges.sh:779
+msgid "could not detach HEAD"
+msgstr ""
-#: wt-status.c:885
-msgid "Submodules changed but not updated:"
+#: sequencer.c:3785
+#, c-format
+msgid "Stopped at HEAD\n"
msgstr ""
-#: wt-status.c:887
-msgid "Submodule changes to be committed:"
+#: sequencer.c:3787
+#, c-format
+msgid "Stopped at %s\n"
msgstr ""
-#: wt-status.c:969
+#: sequencer.c:3795
+#, c-format
msgid ""
-"Do not modify or remove the line above.\n"
-"Everything below it will be ignored."
+"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 ""
-#: wt-status.c:1084
-msgid "You have unmerged paths."
+#: sequencer.c:3877
+#, c-format
+msgid "Stopped at %s... %.*s\n"
msgstr ""
-#: wt-status.c:1087
-msgid " (fix conflicts and run \"git commit\")"
+#: sequencer.c:3958
+#, c-format
+msgid "unknown command %d"
msgstr ""
-#: wt-status.c:1089
-msgid " (use \"git merge --abort\" to abort the merge)"
+#: sequencer.c:4003
+msgid "could not read orig-head"
msgstr ""
-#: wt-status.c:1094
-msgid "All conflicts fixed but you are still merging."
+#: sequencer.c:4008
+msgid "could not read 'onto'"
msgstr ""
-#: wt-status.c:1097
-msgid " (use \"git commit\" to conclude merge)"
+#: sequencer.c:4022
+#, c-format
+msgid "could not update HEAD to %s"
msgstr ""
-#: wt-status.c:1107
-msgid "You are in the middle of an am session."
+#: sequencer.c:4115
+msgid "cannot rebase: You have unstaged changes."
msgstr ""
-#: wt-status.c:1110
-msgid "The current patch is empty."
+#: sequencer.c:4124
+msgid "cannot amend non-existing commit"
msgstr ""
-#: wt-status.c:1114
-msgid " (fix conflicts and then run \"git am --continue\")"
+#: sequencer.c:4126
+#, c-format
+msgid "invalid file: '%s'"
msgstr ""
-#: wt-status.c:1116
-msgid " (use \"git am --skip\" to skip this patch)"
+#: sequencer.c:4128
+#, c-format
+msgid "invalid contents: '%s'"
msgstr ""
-#: wt-status.c:1118
-msgid " (use \"git am --abort\" to restore the original branch)"
+#: sequencer.c:4131
+msgid ""
+"\n"
+"You have uncommitted changes in your working tree. Please, commit them\n"
+"first and then run 'git rebase --continue' again."
msgstr ""
-#: wt-status.c:1250
-msgid "git-rebase-todo is missing."
+#: sequencer.c:4167 sequencer.c:4205
+#, c-format
+msgid "could not write file: '%s'"
msgstr ""
-#: wt-status.c:1252
-msgid "No commands done."
+#: sequencer.c:4220
+msgid "could not remove CHERRY_PICK_HEAD"
msgstr ""
-#: wt-status.c:1255
-#, c-format
-msgid "Last command done (%d command done):"
-msgid_plural "Last commands done (%d commands done):"
-msgstr[0] ""
-msgstr[1] ""
+#: sequencer.c:4227
+msgid "could not commit staged changes."
+msgstr ""
-#: wt-status.c:1266
+#: sequencer.c:4328
#, c-format
-msgid " (see more in file %s)"
+msgid "%s: can't cherry-pick a %s"
msgstr ""
-#: wt-status.c:1271
-msgid "No commands remaining."
+#: sequencer.c:4332
+#, c-format
+msgid "%s: bad revision"
msgstr ""
-#: wt-status.c:1274
-#, c-format
-msgid "Next command to do (%d remaining command):"
-msgid_plural "Next commands to do (%d remaining commands):"
-msgstr[0] ""
-msgstr[1] ""
+#: sequencer.c:4367
+msgid "can't revert as initial commit"
+msgstr ""
-#: wt-status.c:1282
-msgid " (use \"git rebase --edit-todo\" to view and edit)"
+#: sequencer.c:4810
+msgid "make_script: unhandled options"
msgstr ""
-#: wt-status.c:1295
-#, c-format
-msgid "You are currently rebasing branch '%s' on '%s'."
+#: sequencer.c:4813
+msgid "make_script: error preparing revisions"
msgstr ""
-#: wt-status.c:1300
-msgid "You are currently rebasing."
+#: sequencer.c:4971
+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 ""
-#: wt-status.c:1314
-msgid " (fix conflicts and then run \"git rebase --continue\")"
+#: sequencer.c:5083 sequencer.c:5100
+msgid "nothing to do"
msgstr ""
-#: wt-status.c:1316
-msgid " (use \"git rebase --skip\" to skip this patch)"
+#: sequencer.c:5114
+msgid "could not skip unnecessary pick commands"
msgstr ""
-#: wt-status.c:1318
-msgid " (use \"git rebase --abort\" to check out the original branch)"
+#: sequencer.c:5197
+msgid "the script was already rearranged."
msgstr ""
-#: wt-status.c:1324
-msgid " (all conflicts fixed: run \"git rebase --continue\")"
+#: setup.c:123
+#, c-format
+msgid "'%s' is outside repository"
msgstr ""
-#: wt-status.c:1328
+#: setup.c:173
#, c-format
msgid ""
-"You are currently splitting a commit while rebasing branch '%s' on '%s'."
+"%s: no such path in the working tree.\n"
+"Use 'git <command> -- <path>...' to specify paths that do not exist locally."
msgstr ""
-#: wt-status.c:1333
-msgid "You are currently splitting a commit during a rebase."
+#: setup.c:186
+#, c-format
+msgid ""
+"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
+"Use '--' to separate paths from revisions, like this:\n"
+"'git <command> [<revision>...] -- [<file>...]'"
msgstr ""
-#: wt-status.c:1336
-msgid " (Once your working directory is clean, run \"git rebase --continue\")"
+#: setup.c:235
+#, c-format
+msgid "option '%s' must come before non-option arguments"
msgstr ""
-#: wt-status.c:1340
+#: setup.c:254
#, c-format
-msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
+msgid ""
+"ambiguous argument '%s': both revision and filename\n"
+"Use '--' to separate paths from revisions, like this:\n"
+"'git <command> [<revision>...] -- [<file>...]'"
msgstr ""
-#: wt-status.c:1345
-msgid "You are currently editing a commit during a rebase."
+#: setup.c:390
+msgid "unable to set up work tree using invalid config"
msgstr ""
-#: wt-status.c:1348
-msgid " (use \"git commit --amend\" to amend the current commit)"
+#: setup.c:394
+msgid "this operation must be run in a work tree"
msgstr ""
-#: wt-status.c:1350
-msgid ""
-" (use \"git rebase --continue\" once you are satisfied with your changes)"
+#: setup.c:540
+#, c-format
+msgid "Expected git repo version <= %d, found %d"
+msgstr ""
+
+#: setup.c:548
+msgid "unknown repository extensions found:"
msgstr ""
-#: wt-status.c:1360
+#: setup.c:567
#, c-format
-msgid "You are currently cherry-picking commit %s."
+msgid "error opening '%s'"
msgstr ""
-#: wt-status.c:1365
-msgid " (fix conflicts and run \"git cherry-pick --continue\")"
+#: setup.c:569
+#, c-format
+msgid "too large to be a .git file: '%s'"
msgstr ""
-#: wt-status.c:1368
-msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
+#: setup.c:571
+#, c-format
+msgid "error reading %s"
msgstr ""
-#: wt-status.c:1370
-msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
+#: setup.c:573
+#, c-format
+msgid "invalid gitfile format: %s"
msgstr ""
-#: wt-status.c:1379
+#: setup.c:575
#, c-format
-msgid "You are currently reverting commit %s."
+msgid "no path in gitfile: %s"
msgstr ""
-#: wt-status.c:1384
-msgid " (fix conflicts and run \"git revert --continue\")"
+#: setup.c:577
+#, c-format
+msgid "not a git repository: %s"
msgstr ""
-#: wt-status.c:1387
-msgid " (all conflicts fixed: run \"git revert --continue\")"
+#: setup.c:676
+#, c-format
+msgid "'$%s' too big"
msgstr ""
-#: wt-status.c:1389
-msgid " (use \"git revert --abort\" to cancel the revert operation)"
+#: setup.c:690
+#, c-format
+msgid "not a git repository: '%s'"
msgstr ""
-#: wt-status.c:1400
+#: setup.c:719 setup.c:721 setup.c:752
#, c-format
-msgid "You are currently bisecting, started from branch '%s'."
+msgid "cannot chdir to '%s'"
msgstr ""
-#: wt-status.c:1404
-msgid "You are currently bisecting."
+#: setup.c:724 setup.c:780 setup.c:790 setup.c:829 setup.c:837
+msgid "cannot come back to cwd"
msgstr ""
-#: wt-status.c:1407
-msgid " (use \"git bisect reset\" to get back to the original branch)"
+#: setup.c:851
+#, c-format
+msgid "failed to stat '%*s%s%s'"
msgstr ""
-#: wt-status.c:1604
-msgid "On branch "
+#: setup.c:1083
+msgid "Unable to read current working directory"
msgstr ""
-#: wt-status.c:1610
-msgid "interactive rebase in progress; onto "
+#: setup.c:1092 setup.c:1098
+#, c-format
+msgid "cannot change to '%s'"
msgstr ""
-#: wt-status.c:1612
-msgid "rebase in progress; onto "
+#: setup.c:1103
+#, c-format
+msgid "not a git repository (or any of the parent directories): %s"
msgstr ""
-#: wt-status.c:1617
-msgid "HEAD detached at "
+#: setup.c:1109
+#, 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)."
msgstr ""
-#: wt-status.c:1619
-msgid "HEAD detached from "
+#: setup.c:1220
+#, c-format
+msgid ""
+"problem with core.sharedRepository filemode value (0%.3o).\n"
+"The owner of files must always have read and write permissions."
msgstr ""
-#: wt-status.c:1622
-msgid "Not currently on any branch."
+#: setup.c:1264
+msgid "open /dev/null or dup failed"
msgstr ""
-#: wt-status.c:1642
-msgid "Initial commit"
+#: setup.c:1279
+msgid "fork failed"
msgstr ""
-#: wt-status.c:1643
-msgid "No commits yet"
+#: setup.c:1284
+msgid "setsid failed"
msgstr ""
-#: wt-status.c:1657
-msgid "Untracked files"
+#: sha1-file.c:453
+#, c-format
+msgid "object directory %s does not exist; check .git/objects/info/alternates"
msgstr ""
-#: wt-status.c:1659
-msgid "Ignored files"
+#: sha1-file.c:504
+#, c-format
+msgid "unable to normalize alternate object path: %s"
msgstr ""
-#: wt-status.c:1663
+#: sha1-file.c:576
#, c-format
-msgid ""
-"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
-"may speed it up, but you have to be careful not to forget to add\n"
-"new files yourself (see 'git help status')."
+msgid "%s: ignoring alternate object stores, nesting too deep"
msgstr ""
-#: wt-status.c:1669
+#: sha1-file.c:583
#, c-format
-msgid "Untracked files not listed%s"
+msgid "unable to normalize object directory: %s"
msgstr ""
-#: wt-status.c:1671
-msgid " (use -u option to show untracked files)"
+#: sha1-file.c:626
+msgid "unable to fdopen alternates lockfile"
msgstr ""
-#: wt-status.c:1677
-msgid "No changes"
+#: sha1-file.c:644
+msgid "unable to read alternates file"
msgstr ""
-#: wt-status.c:1682
-#, c-format
-msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
+#: sha1-file.c:651
+msgid "unable to move new alternates file into place"
msgstr ""
-#: wt-status.c:1685
+#: sha1-file.c:686
#, c-format
-msgid "no changes added to commit\n"
+msgid "path '%s' does not exist"
msgstr ""
-#: wt-status.c:1688
+#: sha1-file.c:712
#, c-format
-msgid ""
-"nothing added to commit but untracked files present (use \"git add\" to "
-"track)\n"
+msgid "reference repository '%s' as a linked checkout is not supported yet."
msgstr ""
-#: wt-status.c:1691
+#: sha1-file.c:718
#, c-format
-msgid "nothing added to commit but untracked files present\n"
+msgid "reference repository '%s' is not a local repository."
msgstr ""
-#: wt-status.c:1694
+#: sha1-file.c:724
#, c-format
-msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
+msgid "reference repository '%s' is shallow"
msgstr ""
-#: wt-status.c:1697 wt-status.c:1702
+#: sha1-file.c:732
#, c-format
-msgid "nothing to commit\n"
+msgid "reference repository '%s' is grafted"
msgstr ""
-#: wt-status.c:1700
+#: sha1-file.c:792
#, c-format
-msgid "nothing to commit (use -u to show untracked files)\n"
+msgid "invalid line while parsing alternate refs: %s"
msgstr ""
-#: wt-status.c:1704
+#: sha1-file.c:944
#, c-format
-msgid "nothing to commit, working tree clean\n"
+msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
msgstr ""
-#: wt-status.c:1817
-msgid "No commits yet on "
+#: sha1-file.c:969
+msgid "mmap failed"
msgstr ""
-#: wt-status.c:1821
-msgid "HEAD (no branch)"
+#: sha1-file.c:1133
+#, c-format
+msgid "object file %s is empty"
msgstr ""
-#: wt-status.c:1852
-msgid "different"
+#: sha1-file.c:1257 sha1-file.c:2396
+#, c-format
+msgid "corrupt loose object '%s'"
msgstr ""
-#: wt-status.c:1854 wt-status.c:1862
-msgid "behind "
+#: sha1-file.c:1259 sha1-file.c:2400
+#, c-format
+msgid "garbage at end of loose object '%s'"
msgstr ""
-#: wt-status.c:1857 wt-status.c:1860
-msgid "ahead "
+#: sha1-file.c:1301
+msgid "invalid object type"
msgstr ""
-#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2376
+#: sha1-file.c:1385
#, c-format
-msgid "cannot %s: You have unstaged changes."
-msgstr ""
-
-#: wt-status.c:2382
-msgid "additionally, your index contains uncommitted changes."
+msgid "unable to unpack %s header with --allow-unknown-type"
msgstr ""
-#: wt-status.c:2384
+#: sha1-file.c:1388
#, c-format
-msgid "cannot %s: Your index contains uncommitted changes."
+msgid "unable to unpack %s header"
msgstr ""
-#: compat/precompose_utf8.c:58 builtin/clone.c:443
+#: sha1-file.c:1394
#, c-format
-msgid "failed to unlink '%s'"
+msgid "unable to parse %s header with --allow-unknown-type"
msgstr ""
-#: builtin/add.c:24
-msgid "git add [<options>] [--] <pathspec>..."
+#: sha1-file.c:1397
+#, c-format
+msgid "unable to parse %s header"
msgstr ""
-#: builtin/add.c:83
+#: sha1-file.c:1588
#, c-format
-msgid "unexpected diff status %c"
+msgid "failed to read object %s"
msgstr ""
-#: builtin/add.c:88 builtin/commit.c:279
-msgid "updating files failed"
+#: sha1-file.c:1592
+#, c-format
+msgid "replacement %s not found for %s"
msgstr ""
-#: builtin/add.c:98
+#: sha1-file.c:1596
#, c-format
-msgid "remove '%s'\n"
+msgid "loose object %s (stored in %s) is corrupt"
msgstr ""
-#: builtin/add.c:173
-msgid "Unstaged changes after refreshing the index:"
+#: sha1-file.c:1600
+#, c-format
+msgid "packed object %s (stored in %s) is corrupt"
msgstr ""
-#: builtin/add.c:233 builtin/rev-parse.c:893
-msgid "Could not read the index"
+#: sha1-file.c:1703
+#, c-format
+msgid "unable to write file %s"
msgstr ""
-#: builtin/add.c:244
+#: sha1-file.c:1710
#, c-format
-msgid "Could not open '%s' for writing."
+msgid "unable to set permission to '%s'"
msgstr ""
-#: builtin/add.c:248
-msgid "Could not write patch"
+#: sha1-file.c:1717
+msgid "file write error"
msgstr ""
-#: builtin/add.c:251
-msgid "editing patch failed"
+#: sha1-file.c:1736
+msgid "error when closing loose object file"
msgstr ""
-#: builtin/add.c:254
+#: sha1-file.c:1801
#, c-format
-msgid "Could not stat '%s'"
+msgid "insufficient permission for adding an object to repository database %s"
msgstr ""
-#: builtin/add.c:256
-msgid "Empty patch. Aborted."
+#: sha1-file.c:1803
+msgid "unable to create temporary file"
msgstr ""
-#: builtin/add.c:261
-#, c-format
-msgid "Could not apply '%s'"
+#: sha1-file.c:1827
+msgid "unable to write loose object file"
msgstr ""
-#: builtin/add.c:269
-msgid "The following paths are ignored by one of your .gitignore files:\n"
+#: sha1-file.c:1833
+#, c-format
+msgid "unable to deflate new object %s (%d)"
msgstr ""
-#: 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"
+#: sha1-file.c:1837
+#, c-format
+msgid "deflateEnd on object %s failed (%d)"
msgstr ""
-#: builtin/add.c:292
-msgid "interactive picking"
+#: sha1-file.c:1841
+#, c-format
+msgid "confused by unstable object source data for %s"
msgstr ""
-#: builtin/add.c:293 builtin/checkout.c:1144 builtin/reset.c:302
-msgid "select hunks interactively"
+#: sha1-file.c:1851 builtin/pack-objects.c:925
+#, c-format
+msgid "failed utime() on %s"
msgstr ""
-#: builtin/add.c:294
-msgid "edit current diff and apply"
+#: sha1-file.c:1926
+#, c-format
+msgid "cannot read object for %s"
msgstr ""
-#: builtin/add.c:295
-msgid "allow adding otherwise ignored files"
+#: sha1-file.c:1966
+msgid "corrupt commit"
msgstr ""
-#: builtin/add.c:296
-msgid "update tracked files"
+#: sha1-file.c:1974
+msgid "corrupt tag"
msgstr ""
-#: builtin/add.c:297
-msgid "renormalize EOL of tracked files (implies -u)"
+#: sha1-file.c:2073
+#, c-format
+msgid "read error while indexing %s"
msgstr ""
-#: builtin/add.c:298
-msgid "record only the fact that the path will be added later"
+#: sha1-file.c:2076
+#, c-format
+msgid "short read while indexing %s"
msgstr ""
-#: builtin/add.c:299
-msgid "add changes from all tracked and untracked files"
+#: sha1-file.c:2149 sha1-file.c:2158
+#, c-format
+msgid "%s: failed to insert into database"
msgstr ""
-#: builtin/add.c:302
-msgid "ignore paths removed in the working tree (same as --no-all)"
+#: sha1-file.c:2164
+#, c-format
+msgid "%s: unsupported file type"
msgstr ""
-#: builtin/add.c:304
-msgid "don't add, only refresh the index"
+#: sha1-file.c:2188
+#, c-format
+msgid "%s is not a valid object"
msgstr ""
-#: builtin/add.c:305
-msgid "just skip files which cannot be added because of errors"
+#: sha1-file.c:2190
+#, c-format
+msgid "%s is not a valid '%s' object"
msgstr ""
-#: builtin/add.c:306
-msgid "check if - even missing - files are ignored in dry run"
+#: sha1-file.c:2217 builtin/index-pack.c:155
+#, c-format
+msgid "unable to open %s"
msgstr ""
-#: builtin/add.c:308 builtin/update-index.c:973
-msgid "override the executable bit of the listed files"
+#: sha1-file.c:2407 sha1-file.c:2459
+#, c-format
+msgid "hash mismatch for %s (expected %s)"
msgstr ""
-#: builtin/add.c:310
-msgid "warn when adding an embedded repository"
+#: sha1-file.c:2431
+#, c-format
+msgid "unable to mmap %s"
msgstr ""
-#: builtin/add.c:325
+#: sha1-file.c:2436
#, 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."
+msgid "unable to unpack header of %s"
msgstr ""
-#: builtin/add.c:353
+#: sha1-file.c:2442
#, c-format
-msgid "adding embedded git repository: %s"
+msgid "unable to parse header of %s"
msgstr ""
-#: builtin/add.c:371
+#: sha1-file.c:2453
#, c-format
-msgid "Use -f if you really want to add them.\n"
+msgid "unable to unpack contents of %s"
msgstr ""
-#: builtin/add.c:379
-msgid "adding files failed"
+#: sha1-name.c:490
+#, c-format
+msgid "short SHA1 %s is ambiguous"
msgstr ""
-#: builtin/add.c:417
-msgid "-A and -u are mutually incompatible"
+#: sha1-name.c:501
+msgid "The candidates are:"
msgstr ""
-#: builtin/add.c:424
-msgid "Option --ignore-missing can only be used together with --dry-run"
+#: sha1-name.c:800
+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 switch -c $br $(git rev-parse ...)\n"
+"\n"
+"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
+"examine these refs and maybe delete them. Turn this message off by\n"
+"running \"git config advice.objectNameWarning false\""
msgstr ""
-#: builtin/add.c:428
+#. TRANSLATORS: IEC 80000-13:2008 gibibyte
+#: strbuf.c:821
#, c-format
-msgid "--chmod param '%s' must be either -x or +x"
+msgid "%u.%2.2u GiB"
msgstr ""
-#: builtin/add.c:443
+#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
+#: strbuf.c:823
#, c-format
-msgid "Nothing specified, nothing added.\n"
+msgid "%u.%2.2u GiB/s"
msgstr ""
-#: builtin/add.c:444
+#. TRANSLATORS: IEC 80000-13:2008 mebibyte
+#: strbuf.c:831
#, c-format
-msgid "Maybe you wanted to say 'git add .'?\n"
+msgid "%u.%2.2u MiB"
msgstr ""
-#: 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"
+#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
+#: strbuf.c:833
+#, c-format
+msgid "%u.%2.2u MiB/s"
msgstr ""
-#: builtin/am.c:415
-msgid "could not parse author script"
+#. TRANSLATORS: IEC 80000-13:2008 kibibyte
+#: strbuf.c:840
+#, c-format
+msgid "%u.%2.2u KiB"
msgstr ""
-#: builtin/am.c:499
+#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
+#: strbuf.c:842
#, c-format
-msgid "'%s' was deleted by the applypatch-msg hook"
+msgid "%u.%2.2u KiB/s"
msgstr ""
-#: builtin/am.c:540
+#. TRANSLATORS: IEC 80000-13:2008 byte
+#: strbuf.c:848
#, c-format
-msgid "Malformed input line: '%s'."
-msgstr ""
+msgid "%u byte"
+msgid_plural "%u bytes"
+msgstr[0] ""
+msgstr[1] ""
-#: builtin/am.c:577
+#. TRANSLATORS: IEC 80000-13:2008 byte/second
+#: strbuf.c:850
#, c-format
-msgid "Failed to copy notes from '%s' to '%s'"
+msgid "%u byte/s"
+msgid_plural "%u bytes/s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: submodule.c:114 submodule.c:143
+msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
msgstr ""
-#: builtin/am.c:603
-msgid "fseek failed"
+#: submodule.c:118 submodule.c:147
+#, c-format
+msgid "Could not find section in .gitmodules where path=%s"
msgstr ""
-#: builtin/am.c:791
+#: submodule.c:154
#, c-format
-msgid "could not parse patch '%s'"
+msgid "Could not remove .gitmodules entry for %s"
msgstr ""
-#: builtin/am.c:856
-msgid "Only one StGIT patch series can be applied at once"
+#: submodule.c:165
+msgid "staging updated .gitmodules failed"
msgstr ""
-#: builtin/am.c:904
-msgid "invalid timestamp"
+#: submodule.c:327
+#, c-format
+msgid "in unpopulated submodule '%s'"
msgstr ""
-#: builtin/am.c:909 builtin/am.c:921
-msgid "invalid Date line"
+#: submodule.c:358
+#, c-format
+msgid "Pathspec '%s' is in submodule '%.*s'"
msgstr ""
-#: builtin/am.c:916
-msgid "invalid timezone offset"
+#: submodule.c:910
+#, c-format
+msgid "submodule entry '%s' (%s) is a %s, not a commit"
msgstr ""
-#: builtin/am.c:1009
-msgid "Patch format detection failed."
+#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:1989
+msgid "Failed to resolve HEAD as a valid ref."
msgstr ""
-#: builtin/am.c:1014 builtin/clone.c:408
+#: submodule.c:1481
#, c-format
-msgid "failed to create directory '%s'"
+msgid "Could not access submodule '%s'"
msgstr ""
-#: builtin/am.c:1019
-msgid "Failed to split patches."
+#: submodule.c:1651
+#, c-format
+msgid "'%s' not recognized as a git repository"
msgstr ""
-#: builtin/am.c:1149 builtin/commit.c:364
-msgid "unable to write index file"
+#: submodule.c:1789
+#, c-format
+msgid "could not start 'git status' in submodule '%s'"
msgstr ""
-#: builtin/am.c:1163
+#: submodule.c:1802
#, c-format
-msgid "When you have resolved this problem, run \"%s --continue\"."
+msgid "could not run 'git status' in submodule '%s'"
msgstr ""
-#: builtin/am.c:1164
+#: submodule.c:1817
#, c-format
-msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
+msgid "Could not unset core.worktree setting in submodule '%s'"
msgstr ""
-#: builtin/am.c:1165
+#: submodule.c:1907
#, c-format
-msgid "To restore the original branch and stop patching, run \"%s --abort\"."
+msgid "submodule '%s' has dirty index"
msgstr ""
-#: builtin/am.c:1272
-msgid "Patch is empty."
+#: submodule.c:1959
+#, c-format
+msgid "Submodule '%s' could not be updated."
msgstr ""
-#: builtin/am.c:1338
+#: submodule.c:2007
#, c-format
-msgid "invalid ident line: %.*s"
+msgid ""
+"relocate_gitdir for submodule '%s' with more than one worktree not supported"
msgstr ""
-#: builtin/am.c:1360
+#: submodule.c:2019 submodule.c:2074
#, c-format
-msgid "unable to parse commit %s"
+msgid "could not lookup name for submodule '%s'"
msgstr ""
-#: builtin/am.c:1556
-msgid "Repository lacks necessary blobs to fall back on 3-way merge."
+#: submodule.c:2026
+#, c-format
+msgid ""
+"Migrating git directory of '%s%s' from\n"
+"'%s' to\n"
+"'%s'\n"
msgstr ""
-#: builtin/am.c:1558
-msgid "Using index info to reconstruct a base tree..."
+#: submodule.c:2109
+#, c-format
+msgid "could not recurse into submodule '%s'"
msgstr ""
-#: builtin/am.c:1577
-msgid ""
-"Did you hand edit your patch?\n"
-"It does not apply to blobs recorded in its index."
+#: submodule.c:2153
+msgid "could not start ls-files in .."
msgstr ""
-#: builtin/am.c:1583
-msgid "Falling back to patching base and 3-way merge..."
+#: submodule.c:2192
+#, c-format
+msgid "ls-tree returned unexpected return code %d"
msgstr ""
-#: builtin/am.c:1608
-msgid "Failed to merge in the changes."
+#: submodule-config.c:232
+#, c-format
+msgid "ignoring suspicious submodule name: %s"
msgstr ""
-#: builtin/am.c:1640
-msgid "applying to an empty history"
+#: submodule-config.c:299
+msgid "negative values not allowed for submodule.fetchjobs"
msgstr ""
-#: builtin/am.c:1686 builtin/am.c:1690
+#: submodule-config.c:397
#, c-format
-msgid "cannot resume: %s does not exist."
+msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
msgstr ""
-#: builtin/am.c:1706
-msgid "cannot be interactive without stdin connected to a terminal."
+#: submodule-config.c:486
+#, c-format
+msgid "invalid value for %s"
msgstr ""
-#: builtin/am.c:1711
-msgid "Commit Body is:"
+#: submodule-config.c:755
+#, c-format
+msgid "Could not update .gitmodules entry %s"
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:1721
-msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
+#: trailer.c:238
+#, c-format
+msgid "running trailer command '%s' failed"
msgstr ""
-#: builtin/am.c:1771
+#: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553
+#: trailer.c:557
#, c-format
-msgid "Dirty index: cannot apply patches (dirty: %s)"
+msgid "unknown value '%s' for key '%s'"
msgstr ""
-#: builtin/am.c:1811 builtin/am.c:1879
+#: trailer.c:539 trailer.c:544 builtin/remote.c:295
#, c-format
-msgid "Applying: %.*s"
+msgid "more than one %s"
msgstr ""
-#: builtin/am.c:1828
-msgid "No changes -- Patch already applied."
+#: trailer.c:730
+#, c-format
+msgid "empty trailer token in trailer '%.*s'"
msgstr ""
-#: builtin/am.c:1834
+#: trailer.c:750
#, c-format
-msgid "Patch failed at %s %.*s"
+msgid "could not read input file '%s'"
msgstr ""
-#: builtin/am.c:1838
-msgid "Use 'git am --show-current-patch' to see the failed patch"
+#: trailer.c:753
+msgid "could not read from stdin"
msgstr ""
-#: 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."
+#: trailer.c:1011 wrapper.c:701
+#, c-format
+msgid "could not stat %s"
msgstr ""
-#: 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."
+#: trailer.c:1013
+#, c-format
+msgid "file %s is not a regular file"
msgstr ""
-#: builtin/am.c:1996 builtin/am.c:2000 builtin/am.c:2012 builtin/reset.c:324
-#: builtin/reset.c:332
+#: trailer.c:1015
#, c-format
-msgid "Could not parse object '%s'."
+msgid "file %s is not writable by user"
msgstr ""
-#: builtin/am.c:2048
-msgid "failed to clean index"
+#: trailer.c:1027
+msgid "could not open temporary file"
msgstr ""
-#: builtin/am.c:2083
-msgid ""
-"You seem to have moved HEAD since the last 'am' failure.\n"
-"Not rewinding to ORIG_HEAD"
+#: trailer.c:1067
+#, c-format
+msgid "could not rename temporary file to %s"
msgstr ""
-#: builtin/am.c:2174
+#: transport.c:116
#, c-format
-msgid "Invalid value for --patch-format: %s"
+msgid "Would set upstream of '%s' to '%s' of '%s'\n"
msgstr ""
-#: builtin/am.c:2210
-msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
+#: transport.c:142
+#, c-format
+msgid "could not read bundle '%s'"
msgstr ""
-#: builtin/am.c:2211
-msgid "git am [<options>] (--continue | --skip | --abort)"
+#: transport.c:208
+#, c-format
+msgid "transport: invalid depth option '%s'"
msgstr ""
-#: builtin/am.c:2217
-msgid "run interactively"
+#: transport.c:259
+msgid "see protocol.version in 'git help config' for more details"
msgstr ""
-#: builtin/am.c:2219
-msgid "historical option -- no-op"
+#: transport.c:260
+msgid "server options require protocol version 2 or later"
msgstr ""
-#: builtin/am.c:2221
-msgid "allow fall back on 3way merging if needed"
+#: transport.c:625
+msgid "could not parse transport.color.* config"
msgstr ""
-#: builtin/am.c:2222 builtin/init-db.c:485 builtin/prune-packed.c:58
-#: builtin/repack.c:299
-msgid "be quiet"
+#: transport.c:698
+msgid "support for protocol v2 not implemented yet"
msgstr ""
-#: builtin/am.c:2224
-msgid "add a Signed-off-by line to the commit message"
+#: transport.c:825
+#, c-format
+msgid "unknown value for config '%s': %s"
msgstr ""
-#: builtin/am.c:2227
-msgid "recode into utf8 (default)"
+#: transport.c:891
+#, c-format
+msgid "transport '%s' not allowed"
msgstr ""
-#: builtin/am.c:2229
-msgid "pass -k flag to git-mailinfo"
+#: transport.c:945
+msgid "git-over-rsync is no longer supported"
msgstr ""
-#: builtin/am.c:2231
-msgid "pass -b flag to git-mailinfo"
-msgstr ""
-
-#: builtin/am.c:2233
-msgid "pass -m flag to git-mailinfo"
+#: transport.c:1040
+#, c-format
+msgid ""
+"The following submodule paths contain changes that can\n"
+"not be found on any remote:\n"
msgstr ""
-#: builtin/am.c:2235
-msgid "pass --keep-cr flag to git-mailsplit for mbox format"
+#: transport.c:1044
+#, c-format
+msgid ""
+"\n"
+"Please try\n"
+"\n"
+"\tgit push --recurse-submodules=on-demand\n"
+"\n"
+"or cd to the path and use\n"
+"\n"
+"\tgit push\n"
+"\n"
+"to push them to a remote.\n"
+"\n"
msgstr ""
-#: builtin/am.c:2238
-msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
+#: transport.c:1052
+msgid "Aborting."
msgstr ""
-#: builtin/am.c:2241
-msgid "strip everything before a scissors line"
+#: transport.c:1193
+msgid "failed to push all needed submodules"
msgstr ""
-#: 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"
+#: transport.c:1340 transport-helper.c:645
+msgid "operation not supported by protocol"
msgstr ""
-#: 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"
+#: transport-helper.c:51 transport-helper.c:80
+msgid "full write to remote helper failed"
msgstr ""
-#: builtin/am.c:2266 builtin/branch.c:643 builtin/for-each-ref.c:38
-#: builtin/replace.c:543 builtin/tag.c:420 builtin/verify-tag.c:39
-msgid "format"
+#: transport-helper.c:134
+#, c-format
+msgid "unable to find remote helper for '%s'"
msgstr ""
-#: builtin/am.c:2267
-msgid "format the patch(es) are in"
+#: transport-helper.c:150 transport-helper.c:559
+msgid "can't dup helper output fd"
msgstr ""
-#: builtin/am.c:2273
-msgid "override error message when patch failure occurs"
+#: transport-helper.c:201
+#, c-format
+msgid ""
+"unknown mandatory capability %s; this remote helper probably needs newer "
+"version of Git"
msgstr ""
-#: builtin/am.c:2275
-msgid "continue applying patches after resolving a conflict"
+#: transport-helper.c:207
+msgid "this remote helper should implement refspec capability"
msgstr ""
-#: builtin/am.c:2278
-msgid "synonyms for --continue"
+#: transport-helper.c:274 transport-helper.c:414
+#, c-format
+msgid "%s unexpectedly said: '%s'"
msgstr ""
-#: builtin/am.c:2281
-msgid "skip the current patch"
+#: transport-helper.c:403
+#, c-format
+msgid "%s also locked %s"
msgstr ""
-#: builtin/am.c:2284
-msgid "restore the original branch and abort the patching operation."
+#: transport-helper.c:481
+msgid "couldn't run fast-import"
msgstr ""
-#: builtin/am.c:2287
-msgid "abort the patching operation but keep HEAD where it is."
+#: transport-helper.c:504
+msgid "error while running fast-import"
msgstr ""
-#: builtin/am.c:2290
-msgid "show the patch being applied."
+#: transport-helper.c:533 transport-helper.c:1105
+#, c-format
+msgid "could not read ref %s"
msgstr ""
-#: builtin/am.c:2294
-msgid "lie about committer date"
+#: transport-helper.c:578
+#, c-format
+msgid "unknown response to connect: %s"
msgstr ""
-#: builtin/am.c:2296
-msgid "use current timestamp for author date"
+#: transport-helper.c:600
+msgid "setting remote service path not supported by protocol"
msgstr ""
-#: 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"
+#: transport-helper.c:602
+msgid "invalid remote service path"
msgstr ""
-#: builtin/am.c:2299
-msgid "GPG-sign commits"
+#: transport-helper.c:648
+#, c-format
+msgid "can't connect to subservice %s"
msgstr ""
-#: builtin/am.c:2302
-msgid "(internal use for git-rebase)"
+#: transport-helper.c:720
+#, c-format
+msgid "expected ok/error, helper said '%s'"
msgstr ""
-#: 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."
+#: transport-helper.c:773
+#, c-format
+msgid "helper reported unexpected status of %s"
msgstr ""
-#: builtin/am.c:2327
-msgid "failed to read the index"
+#: transport-helper.c:834
+#, c-format
+msgid "helper %s does not support dry-run"
msgstr ""
-#: builtin/am.c:2342
+#: transport-helper.c:837
#, c-format
-msgid "previous rebase directory %s still exists but mbox given."
+msgid "helper %s does not support --signed"
msgstr ""
-#: builtin/am.c:2366
+#: transport-helper.c:840
#, c-format
-msgid ""
-"Stray %s directory found.\n"
-"Use \"git am --abort\" to remove it."
+msgid "helper %s does not support --signed=if-asked"
msgstr ""
-#: builtin/am.c:2372
-msgid "Resolve operation not in progress, we are not resuming."
+#: transport-helper.c:847
+#, c-format
+msgid "helper %s does not support 'push-option'"
msgstr ""
-#: builtin/apply.c:8
-msgid "git apply [<options>] [<patch>...]"
+#: transport-helper.c:945
+msgid "remote-helper doesn't support push; refspec needed"
msgstr ""
-#: builtin/archive.c:17
+#: transport-helper.c:950
#, c-format
-msgid "could not create archive file '%s'"
+msgid "helper %s does not support 'force'"
msgstr ""
-#: builtin/archive.c:20
-msgid "could not redirect output"
+#: transport-helper.c:997
+msgid "couldn't run fast-export"
msgstr ""
-#: builtin/archive.c:37
-msgid "git archive: Remote with no URL"
+#: transport-helper.c:1002
+msgid "error while running fast-export"
msgstr ""
-#: builtin/archive.c:58
-msgid "git archive: expected ACK/NAK, got a flush packet"
+#: transport-helper.c:1027
+#, c-format
+msgid ""
+"No refs in common and none specified; doing nothing.\n"
+"Perhaps you should specify a branch such as 'master'.\n"
msgstr ""
-#: builtin/archive.c:61
+#: transport-helper.c:1091
#, c-format
-msgid "git archive: NACK %s"
+msgid "malformed response in ref list: %s"
msgstr ""
-#: builtin/archive.c:64
-msgid "git archive: protocol error"
+#: transport-helper.c:1244
+#, c-format
+msgid "read(%s) failed"
msgstr ""
-#: builtin/archive.c:68
-msgid "git archive: expected a flush"
+#: transport-helper.c:1271
+#, c-format
+msgid "write(%s) failed"
msgstr ""
-#: builtin/bisect--helper.c:12
-msgid "git bisect--helper --next-all [--no-checkout]"
+#: transport-helper.c:1320
+#, c-format
+msgid "%s thread failed"
msgstr ""
-#: builtin/bisect--helper.c:13
-msgid "git bisect--helper --write-terms <bad_term> <good_term>"
+#: transport-helper.c:1324
+#, c-format
+msgid "%s thread failed to join: %s"
msgstr ""
-#: builtin/bisect--helper.c:14
-msgid "git bisect--helper --bisect-clean-state"
+#: transport-helper.c:1343 transport-helper.c:1347
+#, c-format
+msgid "can't start thread for copying data: %s"
msgstr ""
-#: builtin/bisect--helper.c:46
+#: transport-helper.c:1384
#, c-format
-msgid "'%s' is not a valid term"
+msgid "%s process failed to wait"
msgstr ""
-#: builtin/bisect--helper.c:50
+#: transport-helper.c:1388
#, c-format
-msgid "can't use the builtin command '%s' as a term"
+msgid "%s process failed"
msgstr ""
-#: builtin/bisect--helper.c:60
-#, c-format
-msgid "can't change the meaning of the term '%s'"
+#: transport-helper.c:1406 transport-helper.c:1415
+msgid "can't start thread for copying data"
msgstr ""
-#: builtin/bisect--helper.c:71
-msgid "please use two different terms"
+#: tree-walk.c:33
+msgid "too-short tree object"
msgstr ""
-#: builtin/bisect--helper.c:78
-msgid "could not open the file BISECT_TERMS"
+#: tree-walk.c:39
+msgid "malformed mode in tree entry"
msgstr ""
-#: builtin/bisect--helper.c:120
-msgid "perform 'git bisect next'"
+#: tree-walk.c:43
+msgid "empty filename in tree entry"
msgstr ""
-#: builtin/bisect--helper.c:122
-msgid "write the terms to .git/BISECT_TERMS"
+#: tree-walk.c:118
+msgid "too-short tree file"
msgstr ""
-#: builtin/bisect--helper.c:124
-msgid "cleanup the bisection state"
+#: unpack-trees.c:111
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by checkout:\n"
+"%%sPlease commit your changes or stash them before you switch branches."
msgstr ""
-#: builtin/bisect--helper.c:126
-msgid "check for expected revs"
+#: unpack-trees.c:113
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by checkout:\n"
+"%%s"
msgstr ""
-#: builtin/bisect--helper.c:128
-msgid "update BISECT_HEAD instead of checking out the current commit"
+#: unpack-trees.c:116
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"%%sPlease commit your changes or stash them before you merge."
msgstr ""
-#: builtin/bisect--helper.c:143
-msgid "--write-terms requires two arguments"
+#: unpack-trees.c:118
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"%%s"
msgstr ""
-#: builtin/bisect--helper.c:147
-msgid "--bisect-clean-state requires no arguments"
+#: unpack-trees.c:121
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by %s:\n"
+"%%sPlease commit your changes or stash them before you %s."
msgstr ""
-#: builtin/blame.c:31
-msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
+#: unpack-trees.c:123
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by %s:\n"
+"%%s"
msgstr ""
-#: builtin/blame.c:36
-msgid "<rev-opts> are documented in git-rev-list(1)"
+#: unpack-trees.c:128
+#, c-format
+msgid ""
+"Updating the following directories would lose untracked files in them:\n"
+"%s"
msgstr ""
-#: builtin/blame.c:406
+#: unpack-trees.c:132
#, c-format
-msgid "expecting a color: %s"
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%sPlease move or remove them before you switch branches."
msgstr ""
-#: builtin/blame.c:413
-msgid "must end with a color"
+#: unpack-trees.c:134
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%s"
msgstr ""
-#: builtin/blame.c:700
+#: unpack-trees.c:137
#, c-format
-msgid "invalid color '%s' in color.blame.repeatedLines"
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%sPlease move or remove them before you merge."
msgstr ""
-#: builtin/blame.c:718
-msgid "invalid value for blame.coloring"
+#: unpack-trees.c:139
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%s"
msgstr ""
-#: builtin/blame.c:789
-msgid "Show blame entries as we find them, incrementally"
+#: unpack-trees.c:142
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%sPlease move or remove them before you %s."
msgstr ""
-#: builtin/blame.c:790
-msgid "Show blank SHA-1 for boundary commits (Default: off)"
+#: unpack-trees.c:144
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%s"
msgstr ""
-#: builtin/blame.c:791
-msgid "Do not treat root commits as boundaries (Default: off)"
+#: unpack-trees.c:150
+#, 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 ""
-#: builtin/blame.c:792
-msgid "Show work cost statistics"
+#: unpack-trees.c:152
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%s"
msgstr ""
-#: builtin/blame.c:793
-msgid "Force progress reporting"
+#: unpack-trees.c:155
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%sPlease move or remove them before you merge."
msgstr ""
-#: builtin/blame.c:794
-msgid "Show output score for blame entries"
+#: unpack-trees.c:157
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%s"
msgstr ""
-#: builtin/blame.c:795
-msgid "Show original filename (Default: auto)"
+#: unpack-trees.c:160
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%sPlease move or remove them before you %s."
msgstr ""
-#: builtin/blame.c:796
-msgid "Show original linenumber (Default: off)"
+#: unpack-trees.c:162
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%s"
msgstr ""
-#: builtin/blame.c:797
-msgid "Show in a format designed for machine consumption"
+#: unpack-trees.c:170
+#, c-format
+msgid "Entry '%s' overlaps with '%s'. Cannot bind."
msgstr ""
-#: builtin/blame.c:798
-msgid "Show porcelain format with per-line commit information"
+#: unpack-trees.c:173
+#, c-format
+msgid ""
+"Cannot update sparse checkout: the following entries are not up to date:\n"
+"%s"
msgstr ""
-#: builtin/blame.c:799
-msgid "Use the same output mode as git-annotate (Default: off)"
+#: unpack-trees.c:175
+#, c-format
+msgid ""
+"The following working tree files would be overwritten by sparse checkout "
+"update:\n"
+"%s"
msgstr ""
-#: builtin/blame.c:800
-msgid "Show raw timestamp (Default: off)"
+#: unpack-trees.c:177
+#, c-format
+msgid ""
+"The following working tree files would be removed by sparse checkout "
+"update:\n"
+"%s"
msgstr ""
-#: builtin/blame.c:801
-msgid "Show long commit SHA1 (Default: off)"
+#: unpack-trees.c:179
+#, c-format
+msgid ""
+"Cannot update submodule:\n"
+"%s"
msgstr ""
-#: builtin/blame.c:802
-msgid "Suppress author name and timestamp (Default: off)"
+#: unpack-trees.c:256
+#, c-format
+msgid "Aborting\n"
msgstr ""
-#: builtin/blame.c:803
-msgid "Show author email instead of name (Default: off)"
+#: unpack-trees.c:318
+msgid "Updating files"
msgstr ""
-#: builtin/blame.c:804
-msgid "Ignore whitespace differences"
+#: unpack-trees.c:350
+msgid ""
+"the following paths have collided (e.g. case-sensitive paths\n"
+"on a case-insensitive filesystem) and only one from the same\n"
+"colliding group is in the working tree:\n"
msgstr ""
-#: builtin/blame.c:805
-msgid "color redundant metadata from previous line differently"
+#: urlmatch.c:163
+msgid "invalid URL scheme name or missing '://' suffix"
msgstr ""
-#: builtin/blame.c:806
-msgid "color lines by age"
+#: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405
+#, c-format
+msgid "invalid %XX escape sequence"
msgstr ""
-#: builtin/blame.c:813
-msgid "Use an experimental heuristic to improve diffs"
+#: urlmatch.c:215
+msgid "missing host and scheme is not 'file:'"
msgstr ""
-#: builtin/blame.c:815
-msgid "Spend extra cycles to find better match"
+#: urlmatch.c:232
+msgid "a 'file:' URL may not have a port number"
msgstr ""
-#: builtin/blame.c:816
-msgid "Use revisions from <file> instead of calling git-rev-list"
+#: urlmatch.c:247
+msgid "invalid characters in host name"
msgstr ""
-#: builtin/blame.c:817
-msgid "Use <file>'s contents as the final image"
+#: urlmatch.c:292 urlmatch.c:303
+msgid "invalid port number"
msgstr ""
-#: builtin/blame.c:818 builtin/blame.c:819
-msgid "score"
+#: urlmatch.c:371
+msgid "invalid '..' path segment"
msgstr ""
-#: builtin/blame.c:818
-msgid "Find line copies within and across files"
+#: worktree.c:258 builtin/am.c:2095
+#, c-format
+msgid "failed to read '%s'"
msgstr ""
-#: builtin/blame.c:819
-msgid "Find line movements within and across files"
+#: worktree.c:304
+#, c-format
+msgid "'%s' at main working tree is not the repository directory"
msgstr ""
-#: builtin/blame.c:820
-msgid "n,m"
+#: worktree.c:315
+#, c-format
+msgid "'%s' file does not contain absolute path to the working tree location"
msgstr ""
-#: builtin/blame.c:820
-msgid "Process only line range n,m, counting from 1"
+#: worktree.c:327
+#, c-format
+msgid "'%s' does not exist"
msgstr ""
-#: builtin/blame.c:869
-msgid "--progress can't be used with --incremental or porcelain formats"
+#: worktree.c:333
+#, c-format
+msgid "'%s' is not a .git file, error code %d"
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:920
-msgid "4 years, 11 months ago"
+#: worktree.c:341
+#, c-format
+msgid "'%s' does not point back to '%s'"
msgstr ""
-#: builtin/blame.c:1007
+#: wrapper.c:223 wrapper.c:393
#, 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"
+msgid "could not open '%s' for reading and writing"
msgstr ""
-#: builtin/branch.c:28
-msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
+#: wrapper.c:424 wrapper.c:624
+#, c-format
+msgid "unable to access '%s'"
msgstr ""
-#: builtin/branch.c:29
-msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
+#: wrapper.c:632
+msgid "unable to get current working directory"
msgstr ""
-#: builtin/branch.c:30
-msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
+#: wt-status.c:158
+msgid "Unmerged paths:"
msgstr ""
-#: builtin/branch.c:31
-msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
+#: wt-status.c:187 wt-status.c:219
+msgid " (use \"git restore --staged <file>...\" to unstage)"
msgstr ""
-#: builtin/branch.c:32
-msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
+#: wt-status.c:190 wt-status.c:222
+#, c-format
+msgid " (use \"git restore --source=%s --staged <file>...\" to unstage)"
msgstr ""
-#: builtin/branch.c:33
-msgid "git branch [<options>] [-r | -a] [--points-at]"
+#: wt-status.c:193 wt-status.c:225
+msgid " (use \"git rm --cached <file>...\" to unstage)"
msgstr ""
-#: builtin/branch.c:34
-msgid "git branch [<options>] [-r | -a] [--format]"
+#: wt-status.c:197
+msgid " (use \"git add <file>...\" to mark resolution)"
msgstr ""
-#: builtin/branch.c:143
-#, c-format
-msgid ""
-"deleting branch '%s' that has been merged to\n"
-" '%s', but not yet merged to HEAD."
+#: wt-status.c:199 wt-status.c:203
+msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
msgstr ""
-#: builtin/branch.c:147
-#, c-format
-msgid ""
-"not deleting branch '%s' that is not yet merged to\n"
-" '%s', even though it is merged to HEAD."
+#: wt-status.c:201
+msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr ""
-#: builtin/branch.c:161
-#, c-format
-msgid "Couldn't look up commit object for '%s'"
+#: wt-status.c:211 wt-status.c:1074
+msgid "Changes to be committed:"
msgstr ""
-#: builtin/branch.c:165
-#, c-format
-msgid ""
-"The branch '%s' is not fully merged.\n"
-"If you are sure you want to delete it, run 'git branch -D %s'."
+#: wt-status.c:234 wt-status.c:1083
+msgid "Changes not staged for commit:"
msgstr ""
-#: builtin/branch.c:178
-msgid "Update of config-file failed"
+#: wt-status.c:238
+msgid " (use \"git add <file>...\" to update what will be committed)"
msgstr ""
-#: builtin/branch.c:209
-msgid "cannot use -a with -d"
+#: wt-status.c:240
+msgid " (use \"git add/rm <file>...\" to update what will be committed)"
msgstr ""
-#: builtin/branch.c:215
-msgid "Couldn't look up commit object for HEAD"
+#: wt-status.c:241
+msgid ""
+" (use \"git restore <file>...\" to discard changes in working directory)"
msgstr ""
-#: builtin/branch.c:229
-#, c-format
-msgid "Cannot delete branch '%s' checked out at '%s'"
+#: wt-status.c:243
+msgid " (commit or discard the untracked or modified content in submodules)"
msgstr ""
-#: builtin/branch.c:244
+#: wt-status.c:254
#, c-format
-msgid "remote-tracking branch '%s' not found."
+msgid " (use \"git %s <file>...\" to include in what will be committed)"
msgstr ""
-#: builtin/branch.c:245
-#, c-format
-msgid "branch '%s' not found."
+#: wt-status.c:268
+msgid "both deleted:"
msgstr ""
-#: builtin/branch.c:260
-#, c-format
-msgid "Error deleting remote-tracking branch '%s'"
+#: wt-status.c:270
+msgid "added by us:"
msgstr ""
-#: builtin/branch.c:261
-#, c-format
-msgid "Error deleting branch '%s'"
+#: wt-status.c:272
+msgid "deleted by them:"
msgstr ""
-#: builtin/branch.c:268
-#, c-format
-msgid "Deleted remote-tracking branch %s (was %s).\n"
+#: wt-status.c:274
+msgid "added by them:"
msgstr ""
-#: builtin/branch.c:269
-#, c-format
-msgid "Deleted branch %s (was %s).\n"
+#: wt-status.c:276
+msgid "deleted by us:"
msgstr ""
-#: builtin/branch.c:413 builtin/tag.c:59
-msgid "unable to parse format string"
+#: wt-status.c:278
+msgid "both added:"
msgstr ""
-#: builtin/branch.c:450
-#, c-format
-msgid "Branch %s is being rebased at %s"
+#: wt-status.c:280
+msgid "both modified:"
msgstr ""
-#: builtin/branch.c:454
-#, c-format
-msgid "Branch %s is being bisected at %s"
+#: wt-status.c:290
+msgid "new file:"
msgstr ""
-#: builtin/branch.c:471
-msgid "cannot copy the current branch while not on any."
+#: wt-status.c:292
+msgid "copied:"
msgstr ""
-#: builtin/branch.c:473
-msgid "cannot rename the current branch while not on any."
+#: wt-status.c:294
+msgid "deleted:"
msgstr ""
-#: builtin/branch.c:484
-#, c-format
-msgid "Invalid branch name: '%s'"
+#: wt-status.c:296
+msgid "modified:"
msgstr ""
-#: builtin/branch.c:511
-msgid "Branch rename failed"
+#: wt-status.c:298
+msgid "renamed:"
msgstr ""
-#: builtin/branch.c:513
-msgid "Branch copy failed"
+#: wt-status.c:300
+msgid "typechange:"
msgstr ""
-#: builtin/branch.c:517
-#, c-format
-msgid "Created a copy of a misnamed branch '%s'"
+#: wt-status.c:302
+msgid "unknown:"
msgstr ""
-#: builtin/branch.c:520
-#, c-format
-msgid "Renamed a misnamed branch '%s' away"
+#: wt-status.c:304
+msgid "unmerged:"
msgstr ""
-#: builtin/branch.c:526
-#, c-format
-msgid "Branch renamed to %s, but HEAD is not updated!"
+#: wt-status.c:384
+msgid "new commits, "
msgstr ""
-#: builtin/branch.c:535
-msgid "Branch is renamed, but update of config-file failed"
+#: wt-status.c:386
+msgid "modified content, "
msgstr ""
-#: builtin/branch.c:537
-msgid "Branch is copied, but update of config-file failed"
+#: wt-status.c:388
+msgid "untracked content, "
msgstr ""
-#: builtin/branch.c:553
+#: wt-status.c:906
#, c-format
-msgid ""
-"Please edit the description for the branch\n"
-" %s\n"
-"Lines starting with '%c' will be stripped.\n"
-msgstr ""
+msgid "Your stash currently has %d entry"
+msgid_plural "Your stash currently has %d entries"
+msgstr[0] ""
+msgstr[1] ""
-#: builtin/branch.c:594
-msgid "Generic options"
+#: wt-status.c:938
+msgid "Submodules changed but not updated:"
msgstr ""
-#: builtin/branch.c:596
-msgid "show hash and subject, give twice for upstream branch"
+#: wt-status.c:940
+msgid "Submodule changes to be committed:"
msgstr ""
-#: builtin/branch.c:597
-msgid "suppress informational messages"
+#: wt-status.c:1022
+msgid ""
+"Do not modify or remove the line above.\n"
+"Everything below it will be ignored."
msgstr ""
-#: builtin/branch.c:598
-msgid "set up tracking mode (see git-pull(1))"
+#: wt-status.c:1114
+#, c-format
+msgid ""
+"\n"
+"It took %.2f seconds to compute the branch ahead/behind values.\n"
+"You can use '--no-ahead-behind' to avoid this.\n"
msgstr ""
-#: builtin/branch.c:600
-msgid "do not use"
+#: wt-status.c:1144
+msgid "You have unmerged paths."
msgstr ""
-#: builtin/branch.c:602
-msgid "upstream"
+#: wt-status.c:1147
+msgid " (fix conflicts and run \"git commit\")"
msgstr ""
-#: builtin/branch.c:602
-msgid "change the upstream info"
+#: wt-status.c:1149
+msgid " (use \"git merge --abort\" to abort the merge)"
msgstr ""
-#: builtin/branch.c:603
-msgid "Unset the upstream info"
+#: wt-status.c:1153
+msgid "All conflicts fixed but you are still merging."
msgstr ""
-#: builtin/branch.c:604
-msgid "use colored output"
+#: wt-status.c:1156
+msgid " (use \"git commit\" to conclude merge)"
msgstr ""
-#: builtin/branch.c:605
-msgid "act on remote-tracking branches"
+#: wt-status.c:1165
+msgid "You are in the middle of an am session."
msgstr ""
-#: builtin/branch.c:607 builtin/branch.c:609
-msgid "print only branches that contain the commit"
+#: wt-status.c:1168
+msgid "The current patch is empty."
msgstr ""
-#: builtin/branch.c:608 builtin/branch.c:610
-msgid "print only branches that don't contain the commit"
+#: wt-status.c:1172
+msgid " (fix conflicts and then run \"git am --continue\")"
msgstr ""
-#: builtin/branch.c:613
-msgid "Specific git-branch actions:"
+#: wt-status.c:1174
+msgid " (use \"git am --skip\" to skip this patch)"
msgstr ""
-#: builtin/branch.c:614
-msgid "list both remote-tracking and local branches"
+#: wt-status.c:1176
+msgid " (use \"git am --abort\" to restore the original branch)"
msgstr ""
-#: builtin/branch.c:616
-msgid "delete fully merged branch"
+#: wt-status.c:1309
+msgid "git-rebase-todo is missing."
msgstr ""
-#: builtin/branch.c:617
-msgid "delete branch (even if not merged)"
+#: wt-status.c:1311
+msgid "No commands done."
msgstr ""
-#: builtin/branch.c:618
-msgid "move/rename a branch and its reflog"
-msgstr ""
+#: wt-status.c:1314
+#, c-format
+msgid "Last command done (%d command done):"
+msgid_plural "Last commands done (%d commands done):"
+msgstr[0] ""
+msgstr[1] ""
-#: builtin/branch.c:619
-msgid "move/rename a branch, even if target exists"
+#: wt-status.c:1325
+#, c-format
+msgid " (see more in file %s)"
msgstr ""
-#: builtin/branch.c:620
-msgid "copy a branch and its reflog"
+#: wt-status.c:1330
+msgid "No commands remaining."
msgstr ""
-#: builtin/branch.c:621
-msgid "copy a branch, even if target exists"
+#: wt-status.c:1333
+#, 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:1341
+msgid " (use \"git rebase --edit-todo\" to view and edit)"
msgstr ""
-#: builtin/branch.c:622
-msgid "list branch names"
+#: wt-status.c:1353
+#, c-format
+msgid "You are currently rebasing branch '%s' on '%s'."
msgstr ""
-#: builtin/branch.c:623
-msgid "create the branch's reflog"
+#: wt-status.c:1358
+msgid "You are currently rebasing."
msgstr ""
-#: builtin/branch.c:626
-msgid "deprecated synonym for --create-reflog"
+#: wt-status.c:1371
+msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr ""
-#: builtin/branch.c:631
-msgid "edit the description for the branch"
+#: wt-status.c:1373
+msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr ""
-#: builtin/branch.c:632
-msgid "force creation, move/rename, deletion"
+#: wt-status.c:1375
+msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr ""
-#: builtin/branch.c:633
-msgid "print only branches that are merged"
+#: wt-status.c:1382
+msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr ""
-#: builtin/branch.c:634
-msgid "print only branches that are not merged"
+#: wt-status.c:1386
+#, c-format
+msgid ""
+"You are currently splitting a commit while rebasing branch '%s' on '%s'."
msgstr ""
-#: builtin/branch.c:635
-msgid "list branches in columns"
+#: wt-status.c:1391
+msgid "You are currently splitting a commit during a rebase."
msgstr ""
-#: builtin/branch.c:636 builtin/for-each-ref.c:40 builtin/ls-remote.c:70
-#: builtin/tag.c:413
-msgid "key"
+#: wt-status.c:1394
+msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr ""
-#: builtin/branch.c:637 builtin/for-each-ref.c:41 builtin/ls-remote.c:71
-#: builtin/tag.c:414
-msgid "field name to sort on"
+#: wt-status.c:1398
+#, c-format
+msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr ""
-#: builtin/branch.c:639 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"
+#: wt-status.c:1403
+msgid "You are currently editing a commit during a rebase."
msgstr ""
-#: builtin/branch.c:640
-msgid "print only branches of the object"
+#: wt-status.c:1406
+msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr ""
-#: builtin/branch.c:642 builtin/for-each-ref.c:49 builtin/tag.c:423
-msgid "sorting and filtering are case insensitive"
+#: wt-status.c:1408
+msgid ""
+" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr ""
-#: builtin/branch.c:643 builtin/for-each-ref.c:38 builtin/tag.c:421
-#: builtin/verify-tag.c:39
-msgid "format to use for the output"
+#: wt-status.c:1419
+msgid "Cherry-pick currently in progress."
msgstr ""
-#: builtin/branch.c:666 builtin/clone.c:739
-msgid "HEAD not found below refs/heads!"
+#: wt-status.c:1422
+#, c-format
+msgid "You are currently cherry-picking commit %s."
msgstr ""
-#: builtin/branch.c:689
-msgid "--column and --verbose are incompatible"
+#: wt-status.c:1429
+msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr ""
-#: builtin/branch.c:709 builtin/branch.c:761 builtin/branch.c:770
-msgid "branch name required"
+#: wt-status.c:1432
+msgid " (run \"git cherry-pick --continue\" to continue)"
msgstr ""
-#: builtin/branch.c:737
-msgid "Cannot give description to detached HEAD"
+#: wt-status.c:1435
+msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr ""
-#: builtin/branch.c:742
-msgid "cannot edit description of more than one branch"
+#: wt-status.c:1437
+msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr ""
-#: builtin/branch.c:749
-#, c-format
-msgid "No commit on branch '%s' yet."
+#: wt-status.c:1447
+msgid "Revert currently in progress."
msgstr ""
-#: builtin/branch.c:752
+#: wt-status.c:1450
#, c-format
-msgid "No branch named '%s'."
+msgid "You are currently reverting commit %s."
msgstr ""
-#: builtin/branch.c:767
-msgid "too many branches for a copy operation"
+#: wt-status.c:1456
+msgid " (fix conflicts and run \"git revert --continue\")"
msgstr ""
-#: builtin/branch.c:776
-msgid "too many arguments for a rename operation"
+#: wt-status.c:1459
+msgid " (run \"git revert --continue\" to continue)"
msgstr ""
-#: builtin/branch.c:781
-msgid "too many arguments to set new upstream"
+#: wt-status.c:1462
+msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr ""
-#: builtin/branch.c:785
-#, c-format
-msgid ""
-"could not set upstream of HEAD to %s when it does not point to any branch."
+#: wt-status.c:1464
+msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr ""
-#: builtin/branch.c:788 builtin/branch.c:810 builtin/branch.c:826
+#: wt-status.c:1474
#, c-format
-msgid "no such branch '%s'"
+msgid "You are currently bisecting, started from branch '%s'."
msgstr ""
-#: builtin/branch.c:792
-#, c-format
-msgid "branch '%s' does not exist"
+#: wt-status.c:1478
+msgid "You are currently bisecting."
msgstr ""
-#: builtin/branch.c:804
-msgid "too many arguments to unset upstream"
+#: wt-status.c:1481
+msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr ""
-#: builtin/branch.c:808
-msgid "could not unset upstream of HEAD when it does not point to any branch."
+#: wt-status.c:1690
+msgid "On branch "
msgstr ""
-#: builtin/branch.c:814
-#, c-format
-msgid "Branch '%s' has no upstream information"
+#: wt-status.c:1697
+msgid "interactive rebase in progress; onto "
msgstr ""
-#: builtin/branch.c:829
-msgid "-a and -r options to 'git branch' do not make sense with a branch name"
+#: wt-status.c:1699
+msgid "rebase in progress; onto "
msgstr ""
-#: builtin/branch.c:832
-msgid ""
-"the '--set-upstream' option is no longer supported. Please use '--track' or "
-"'--set-upstream-to' instead."
+#: wt-status.c:1709
+msgid "Not currently on any branch."
msgstr ""
-#: builtin/bundle.c:45
-#, c-format
-msgid "%s is okay\n"
+#: wt-status.c:1726
+msgid "Initial commit"
msgstr ""
-#: builtin/bundle.c:58
-msgid "Need a repository to create a bundle."
+#: wt-status.c:1727
+msgid "No commits yet"
msgstr ""
-#: builtin/bundle.c:62
-msgid "Need a repository to unbundle."
+#: wt-status.c:1741
+msgid "Untracked files"
msgstr ""
-#: 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>"
+#: wt-status.c:1743
+msgid "Ignored files"
msgstr ""
-#: builtin/cat-file.c:578
+#: wt-status.c:1747
+#, c-format
msgid ""
-"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
-"filters]"
+"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/cat-file.c:615
-msgid "<type> can be one of: blob, tree, commit, tag"
+#: wt-status.c:1753
+#, c-format
+msgid "Untracked files not listed%s"
msgstr ""
-#: builtin/cat-file.c:616
-msgid "show object type"
+#: wt-status.c:1755
+msgid " (use -u option to show untracked files)"
msgstr ""
-#: builtin/cat-file.c:617
-msgid "show object size"
+#: wt-status.c:1761
+msgid "No changes"
msgstr ""
-#: builtin/cat-file.c:619
-msgid "exit with zero when there's no error"
+#: wt-status.c:1766
+#, c-format
+msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr ""
-#: builtin/cat-file.c:620
-msgid "pretty-print object's content"
+#: wt-status.c:1769
+#, c-format
+msgid "no changes added to commit\n"
msgstr ""
-#: builtin/cat-file.c:622
-msgid "for blob objects, run textconv on object's content"
+#: wt-status.c:1772
+#, c-format
+msgid ""
+"nothing added to commit but untracked files present (use \"git add\" to "
+"track)\n"
msgstr ""
-#: builtin/cat-file.c:624
-msgid "for blob objects, run filters on object's content"
+#: wt-status.c:1775
+#, c-format
+msgid "nothing added to commit but untracked files present\n"
msgstr ""
-#: builtin/cat-file.c:625 git-submodule.sh:864
-msgid "blob"
+#: wt-status.c:1778
+#, c-format
+msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr ""
-#: builtin/cat-file.c:626
-msgid "use a specific path for --textconv/--filters"
+#: wt-status.c:1781 wt-status.c:1786
+#, c-format
+msgid "nothing to commit\n"
msgstr ""
-#: builtin/cat-file.c:628
-msgid "allow -s and -t to work with broken/corrupt objects"
+#: wt-status.c:1784
+#, c-format
+msgid "nothing to commit (use -u to show untracked files)\n"
msgstr ""
-#: builtin/cat-file.c:629
-msgid "buffer --batch output"
+#: wt-status.c:1788
+#, c-format
+msgid "nothing to commit, working tree clean\n"
msgstr ""
-#: builtin/cat-file.c:631
-msgid "show info and content of objects fed from the standard input"
+#: wt-status.c:1901
+msgid "No commits yet on "
msgstr ""
-#: builtin/cat-file.c:634
-msgid "show info about objects fed from the standard input"
+#: wt-status.c:1905
+msgid "HEAD (no branch)"
msgstr ""
-#: builtin/cat-file.c:637
-msgid "follow in-tree symlinks (used with --batch or --batch-check)"
+#: wt-status.c:1936
+msgid "different"
msgstr ""
-#: builtin/cat-file.c:639
-msgid "show all objects with --batch or --batch-check"
+#: wt-status.c:1938 wt-status.c:1946
+msgid "behind "
msgstr ""
-#: builtin/cat-file.c:641
-msgid "do not order --batch-all-objects output"
+#: wt-status.c:1941 wt-status.c:1944
+msgid "ahead "
msgstr ""
-#: builtin/check-attr.c:12
-msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
+#. TRANSLATORS: the action is e.g. "pull with rebase"
+#: wt-status.c:2466
+#, c-format
+msgid "cannot %s: You have unstaged changes."
msgstr ""
-#: builtin/check-attr.c:13
-msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
+#: wt-status.c:2472
+msgid "additionally, your index contains uncommitted changes."
msgstr ""
-#: builtin/check-attr.c:20
-msgid "report all attributes set on file"
+#: wt-status.c:2474
+#, c-format
+msgid "cannot %s: Your index contains uncommitted changes."
msgstr ""
-#: builtin/check-attr.c:21
-msgid "use .gitattributes only from the index"
+#: builtin/add.c:25
+msgid "git add [<options>] [--] <pathspec>..."
msgstr ""
-#: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:101
-msgid "read file names from stdin"
+#: builtin/add.c:84
+#, c-format
+msgid "unexpected diff status %c"
msgstr ""
-#: builtin/check-attr.c:24 builtin/check-ignore.c:26
-msgid "terminate input and output records by a NUL character"
+#: builtin/add.c:89 builtin/commit.c:288
+msgid "updating files failed"
msgstr ""
-#: builtin/check-ignore.c:20 builtin/checkout.c:1120 builtin/gc.c:503
-msgid "suppress progress reporting"
+#: builtin/add.c:99
+#, c-format
+msgid "remove '%s'\n"
msgstr ""
-#: builtin/check-ignore.c:28
-msgid "show non-matching input paths"
+#: builtin/add.c:174
+msgid "Unstaged changes after refreshing the index:"
msgstr ""
-#: builtin/check-ignore.c:30
-msgid "ignore index when checking"
+#: builtin/add.c:234 builtin/rev-parse.c:896
+msgid "Could not read the index"
msgstr ""
-#: builtin/check-ignore.c:159
-msgid "cannot specify pathnames with --stdin"
+#: builtin/add.c:245
+#, c-format
+msgid "Could not open '%s' for writing."
msgstr ""
-#: builtin/check-ignore.c:162
-msgid "-z only makes sense with --stdin"
+#: builtin/add.c:249
+msgid "Could not write patch"
msgstr ""
-#: builtin/check-ignore.c:164
-msgid "no path specified"
+#: builtin/add.c:252
+msgid "editing patch failed"
msgstr ""
-#: builtin/check-ignore.c:168
-msgid "--quiet is only valid with a single pathname"
+#: builtin/add.c:255
+#, c-format
+msgid "Could not stat '%s'"
msgstr ""
-#: builtin/check-ignore.c:170
-msgid "cannot have both --quiet and --verbose"
+#: builtin/add.c:257
+msgid "Empty patch. Aborted."
msgstr ""
-#: builtin/check-ignore.c:173
-msgid "--non-matching is only valid with --verbose"
+#: builtin/add.c:262
+#, c-format
+msgid "Could not apply '%s'"
msgstr ""
-#: builtin/check-mailmap.c:9
-msgid "git check-mailmap [<options>] <contact>..."
+#: builtin/add.c:270
+msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr ""
-#: builtin/check-mailmap.c:14
-msgid "also read contacts from stdin"
+#: builtin/add.c:290 builtin/clean.c:909 builtin/fetch.c:147 builtin/mv.c:124
+#: builtin/prune-packed.c:56 builtin/pull.c:222 builtin/push.c:560
+#: builtin/remote.c:1345 builtin/rm.c:241 builtin/send-pack.c:165
+msgid "dry run"
msgstr ""
-#: builtin/check-mailmap.c:25
-#, c-format
-msgid "unable to parse contact: %s"
+#: builtin/add.c:293
+msgid "interactive picking"
msgstr ""
-#: builtin/check-mailmap.c:48
-msgid "no contacts specified"
+#: builtin/add.c:294 builtin/checkout.c:1480 builtin/reset.c:306
+msgid "select hunks interactively"
msgstr ""
-#: builtin/checkout-index.c:128
-msgid "git checkout-index [<options>] [--] [<file>...]"
+#: builtin/add.c:295
+msgid "edit current diff and apply"
msgstr ""
-#: builtin/checkout-index.c:143
-msgid "stage should be between 1 and 3 or all"
+#: builtin/add.c:296
+msgid "allow adding otherwise ignored files"
msgstr ""
-#: builtin/checkout-index.c:159
-msgid "check out all files in the index"
+#: builtin/add.c:297
+msgid "update tracked files"
msgstr ""
-#: builtin/checkout-index.c:160
-msgid "force overwrite of existing files"
+#: builtin/add.c:298
+msgid "renormalize EOL of tracked files (implies -u)"
msgstr ""
-#: builtin/checkout-index.c:162
-msgid "no warning for existing files and files not in index"
+#: builtin/add.c:299
+msgid "record only the fact that the path will be added later"
msgstr ""
-#: builtin/checkout-index.c:164
-msgid "don't checkout new files"
+#: builtin/add.c:300
+msgid "add changes from all tracked and untracked files"
msgstr ""
-#: builtin/checkout-index.c:166
-msgid "update stat information in the index file"
+#: builtin/add.c:303
+msgid "ignore paths removed in the working tree (same as --no-all)"
msgstr ""
-#: builtin/checkout-index.c:170
-msgid "read list of paths from the standard input"
+#: builtin/add.c:305
+msgid "don't add, only refresh the index"
msgstr ""
-#: builtin/checkout-index.c:172
-msgid "write the content to temporary files"
+#: builtin/add.c:306
+msgid "just skip files which cannot be added because of errors"
msgstr ""
-#: 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:610
-msgid "string"
+#: builtin/add.c:307
+msgid "check if - even missing - files are ignored in dry run"
msgstr ""
-#: builtin/checkout-index.c:174
-msgid "when creating files, prepend <string>"
+#: builtin/add.c:309 builtin/update-index.c:1001
+msgid "override the executable bit of the listed files"
msgstr ""
-#: builtin/checkout-index.c:176
-msgid "copy out the files from named stage"
+#: builtin/add.c:311
+msgid "warn when adding an embedded repository"
msgstr ""
-#: builtin/checkout.c:29
-msgid "git checkout [<options>] <branch>"
+#: builtin/add.c:326
+#, 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/checkout.c:30
-msgid "git checkout [<options>] [<branch>] -- <file>..."
+#: builtin/add.c:354
+#, c-format
+msgid "adding embedded git repository: %s"
msgstr ""
-#: builtin/checkout.c:138 builtin/checkout.c:171
+#: builtin/add.c:372
#, c-format
-msgid "path '%s' does not have our version"
+msgid "Use -f if you really want to add them.\n"
msgstr ""
-#: builtin/checkout.c:140 builtin/checkout.c:173
-#, c-format
-msgid "path '%s' does not have their version"
+#: builtin/add.c:379
+msgid "adding files failed"
msgstr ""
-#: builtin/checkout.c:156
-#, c-format
-msgid "path '%s' does not have all necessary versions"
+#: builtin/add.c:419
+msgid "-A and -u are mutually incompatible"
msgstr ""
-#: builtin/checkout.c:200
-#, c-format
-msgid "path '%s' does not have necessary versions"
+#: builtin/add.c:426
+msgid "Option --ignore-missing can only be used together with --dry-run"
msgstr ""
-#: builtin/checkout.c:217
+#: builtin/add.c:430
#, c-format
-msgid "path '%s': cannot merge"
+msgid "--chmod param '%s' must be either -x or +x"
msgstr ""
-#: builtin/checkout.c:233
+#: builtin/add.c:445
#, c-format
-msgid "Unable to add merge result for '%s'"
+msgid "Nothing specified, nothing added.\n"
msgstr ""
-#: builtin/checkout.c:255 builtin/checkout.c:258 builtin/checkout.c:261
-#: builtin/checkout.c:264
+#: builtin/add.c:446
#, c-format
-msgid "'%s' cannot be used with updating paths"
+msgid "Maybe you wanted to say 'git add .'?\n"
+msgstr ""
+
+#: builtin/am.c:348
+msgid "could not parse author script"
msgstr ""
-#: builtin/checkout.c:267 builtin/checkout.c:270
+#: builtin/am.c:432
#, c-format
-msgid "'%s' cannot be used with %s"
+msgid "'%s' was deleted by the applypatch-msg hook"
msgstr ""
-#: builtin/checkout.c:273
+#: builtin/am.c:474
#, c-format
-msgid "Cannot update paths and switch to branch '%s' at the same time."
+msgid "Malformed input line: '%s'."
msgstr ""
-#: builtin/checkout.c:342 builtin/checkout.c:349
+#: builtin/am.c:512
#, c-format
-msgid "path '%s' is unmerged"
+msgid "Failed to copy notes from '%s' to '%s'"
msgstr ""
-#: builtin/checkout.c:508
-msgid "you need to resolve your current index first"
+#: builtin/am.c:538
+msgid "fseek failed"
msgstr ""
-#: builtin/checkout.c:645
+#: builtin/am.c:726
#, c-format
-msgid "Can not do reflog for '%s': %s\n"
+msgid "could not parse patch '%s'"
msgstr ""
-#: builtin/checkout.c:686
-msgid "HEAD is now at"
+#: builtin/am.c:791
+msgid "Only one StGIT patch series can be applied at once"
msgstr ""
-#: builtin/checkout.c:690 builtin/clone.c:692
-msgid "unable to update HEAD"
+#: builtin/am.c:839
+msgid "invalid timestamp"
msgstr ""
-#: builtin/checkout.c:694
-#, c-format
-msgid "Reset branch '%s'\n"
+#: builtin/am.c:844 builtin/am.c:856
+msgid "invalid Date line"
msgstr ""
-#: builtin/checkout.c:697
-#, c-format
-msgid "Already on '%s'\n"
+#: builtin/am.c:851
+msgid "invalid timezone offset"
msgstr ""
-#: builtin/checkout.c:701
-#, c-format
-msgid "Switched to and reset branch '%s'\n"
+#: builtin/am.c:944
+msgid "Patch format detection failed."
msgstr ""
-#: builtin/checkout.c:703 builtin/checkout.c:1052
+#: builtin/am.c:949 builtin/clone.c:407
#, c-format
-msgid "Switched to a new branch '%s'\n"
+msgid "failed to create directory '%s'"
msgstr ""
-#: builtin/checkout.c:705
-#, c-format
-msgid "Switched to branch '%s'\n"
+#: builtin/am.c:954
+msgid "Failed to split patches."
msgstr ""
-#: builtin/checkout.c:756
-#, c-format
-msgid " ... and %d more.\n"
+#: builtin/am.c:1084 builtin/commit.c:374
+msgid "unable to write index file"
msgstr ""
-#: builtin/checkout.c:762
+#: builtin/am.c:1098
#, c-format
-msgid ""
-"Warning: you are leaving %d commit behind, not connected to\n"
-"any of your branches:\n"
-"\n"
-"%s\n"
-msgid_plural ""
-"Warning: you are leaving %d commits behind, not connected to\n"
-"any of your branches:\n"
-"\n"
-"%s\n"
-msgstr[0] ""
-msgstr[1] ""
+msgid "When you have resolved this problem, run \"%s --continue\"."
+msgstr ""
-#: builtin/checkout.c:781
+#: builtin/am.c:1099
#, 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] ""
+msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
+msgstr ""
-#: builtin/checkout.c:813
-msgid "internal error in revision walk"
+#: builtin/am.c:1100
+#, c-format
+msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr ""
-#: builtin/checkout.c:817
-msgid "Previous HEAD position was"
+#: builtin/am.c:1183
+msgid "Patch sent with format=flowed; space at the end of lines might be lost."
msgstr ""
-#: builtin/checkout.c:845 builtin/checkout.c:1047
-msgid "You are on a branch yet to be born"
+#: builtin/am.c:1211
+msgid "Patch is empty."
msgstr ""
-#: builtin/checkout.c:952
+#: builtin/am.c:1277
#, c-format
-msgid "only one reference expected, %d given."
+msgid "invalid ident line: %.*s"
msgstr ""
-#: builtin/checkout.c:993 builtin/worktree.c:240 builtin/worktree.c:389
+#: builtin/am.c:1299
#, c-format
-msgid "invalid reference: %s"
+msgid "unable to parse commit %s"
msgstr ""
-#: builtin/checkout.c:1022
-#, c-format
-msgid "reference is not a tree: %s"
+#: builtin/am.c:1496
+msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr ""
-#: builtin/checkout.c:1061
-msgid "paths cannot be used with switching branches"
+#: builtin/am.c:1498
+msgid "Using index info to reconstruct a base tree..."
msgstr ""
-#: builtin/checkout.c:1064 builtin/checkout.c:1068
-#, c-format
-msgid "'%s' cannot be used with switching branches"
+#: builtin/am.c:1517
+msgid ""
+"Did you hand edit your patch?\n"
+"It does not apply to blobs recorded in its index."
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'"
+#: builtin/am.c:1523
+msgid "Falling back to patching base and 3-way merge..."
+msgstr ""
+
+#: builtin/am.c:1549
+msgid "Failed to merge in the changes."
+msgstr ""
+
+#: builtin/am.c:1581
+msgid "applying to an empty history"
msgstr ""
-#: builtin/checkout.c:1088
+#: builtin/am.c:1628 builtin/am.c:1632
#, c-format
-msgid "Cannot switch branch to a non-commit '%s'"
+msgid "cannot resume: %s does not exist."
msgstr ""
-#: builtin/checkout.c:1121 builtin/checkout.c:1123 builtin/clone.c:119
-#: builtin/remote.c:168 builtin/remote.c:170 builtin/worktree.c:433
-#: builtin/worktree.c:435
-msgid "branch"
+#: builtin/am.c:1650
+msgid "Commit Body is:"
msgstr ""
-#: builtin/checkout.c:1122
-msgid "create and checkout a new branch"
+#. 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:1660
+#, c-format
+msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr ""
-#: builtin/checkout.c:1124
-msgid "create/reset and checkout a branch"
+#: builtin/am.c:1710
+#, c-format
+msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr ""
-#: builtin/checkout.c:1125
-msgid "create reflog for new branch"
+#: builtin/am.c:1750 builtin/am.c:1818
+#, c-format
+msgid "Applying: %.*s"
msgstr ""
-#: builtin/checkout.c:1126 builtin/worktree.c:437
-msgid "detach HEAD at named commit"
+#: builtin/am.c:1767
+msgid "No changes -- Patch already applied."
msgstr ""
-#: builtin/checkout.c:1127
-msgid "set upstream info for new branch"
+#: builtin/am.c:1773
+#, c-format
+msgid "Patch failed at %s %.*s"
msgstr ""
-#: builtin/checkout.c:1129
-msgid "new-branch"
+#: builtin/am.c:1777
+msgid "Use 'git am --show-current-patch' to see the failed patch"
msgstr ""
-#: builtin/checkout.c:1129
-msgid "new unparented branch"
+#: builtin/am.c:1821
+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/checkout.c:1131
-msgid "checkout our version for unmerged files"
+#: builtin/am.c:1828
+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/checkout.c:1134
-msgid "checkout their version for unmerged files"
+#: builtin/am.c:1935 builtin/am.c:1939 builtin/am.c:1951 builtin/reset.c:329
+#: builtin/reset.c:337
+#, c-format
+msgid "Could not parse object '%s'."
msgstr ""
-#: builtin/checkout.c:1136
-msgid "force checkout (throw away local modifications)"
+#: builtin/am.c:1987
+msgid "failed to clean index"
msgstr ""
-#: builtin/checkout.c:1138
-msgid "perform a 3-way merge with the new branch"
+#: builtin/am.c:2031
+msgid ""
+"You seem to have moved HEAD since the last 'am' failure.\n"
+"Not rewinding to ORIG_HEAD"
msgstr ""
-#: builtin/checkout.c:1140 builtin/merge.c:273
-msgid "update ignored files (default)"
+#: builtin/am.c:2128
+#, c-format
+msgid "Invalid value for --patch-format: %s"
msgstr ""
-#: builtin/checkout.c:1142 builtin/log.c:1510 parse-options.h:264
-msgid "style"
+#: builtin/am.c:2164
+msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr ""
-#: builtin/checkout.c:1143
-msgid "conflict style (merge or diff3)"
+#: builtin/am.c:2165
+msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr ""
-#: builtin/checkout.c:1146
-msgid "do not limit pathspecs to sparse entries only"
+#: builtin/am.c:2171
+msgid "run interactively"
msgstr ""
-#: builtin/checkout.c:1148
-msgid "second guess 'git checkout <no-such-branch>'"
+#: builtin/am.c:2173
+msgid "historical option -- no-op"
msgstr ""
-#: builtin/checkout.c:1150
-msgid "do not check if another worktree is holding the given ref"
+#: builtin/am.c:2175
+msgid "allow fall back on 3way merging if needed"
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"
+#: builtin/am.c:2176 builtin/init-db.c:494 builtin/prune-packed.c:58
+#: builtin/repack.c:296 builtin/stash.c:806
+msgid "be quiet"
msgstr ""
-#: builtin/checkout.c:1184
-msgid "-b, -B and --orphan are mutually exclusive"
+#: builtin/am.c:2178
+msgid "add a Signed-off-by line to the commit message"
msgstr ""
-#: builtin/checkout.c:1201
-msgid "--track needs a branch name"
+#: builtin/am.c:2181
+msgid "recode into utf8 (default)"
msgstr ""
-#: builtin/checkout.c:1206
-msgid "missing branch name; try -b"
+#: builtin/am.c:2183
+msgid "pass -k flag to git-mailinfo"
msgstr ""
-#: builtin/checkout.c:1243
-msgid "invalid path specification"
+#: builtin/am.c:2185
+msgid "pass -b flag to git-mailinfo"
msgstr ""
-#: builtin/checkout.c:1250
-#, c-format
-msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
+#: builtin/am.c:2187
+msgid "pass -m flag to git-mailinfo"
msgstr ""
-#: builtin/checkout.c:1254
-#, c-format
-msgid "git checkout: --detach does not take a path argument '%s'"
+#: builtin/am.c:2189
+msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr ""
-#: builtin/checkout.c:1258
-msgid ""
-"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
-"checking out of the index."
+#: builtin/am.c:2192
+msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
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."
+#: builtin/am.c:2195
+msgid "strip everything before a scissors line"
msgstr ""
-#: builtin/clean.c:27
-msgid ""
-"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
+#: builtin/am.c:2197 builtin/am.c:2200 builtin/am.c:2203 builtin/am.c:2206
+#: builtin/am.c:2209 builtin/am.c:2212 builtin/am.c:2215 builtin/am.c:2218
+#: builtin/am.c:2224
+msgid "pass it through git-apply"
msgstr ""
-#: builtin/clean.c:31
-#, c-format
-msgid "Removing %s\n"
+#: builtin/am.c:2214 builtin/commit.c:1368 builtin/fmt-merge-msg.c:671
+#: builtin/fmt-merge-msg.c:674 builtin/grep.c:881 builtin/merge.c:249
+#: builtin/pull.c:159 builtin/pull.c:218 builtin/rebase.c:1418
+#: builtin/repack.c:307 builtin/repack.c:311 builtin/repack.c:313
+#: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403
+#: parse-options.h:141 parse-options.h:162 parse-options.h:312
+msgid "n"
msgstr ""
-#: builtin/clean.c:32
-#, c-format
-msgid "Would remove %s\n"
+#: builtin/am.c:2220 builtin/branch.c:661 builtin/for-each-ref.c:38
+#: builtin/replace.c:554 builtin/tag.c:437 builtin/verify-tag.c:38
+msgid "format"
msgstr ""
-#: builtin/clean.c:33
-#, c-format
-msgid "Skipping repository %s\n"
+#: builtin/am.c:2221
+msgid "format the patch(es) are in"
msgstr ""
-#: builtin/clean.c:34
-#, c-format
-msgid "Would skip repository %s\n"
+#: builtin/am.c:2227
+msgid "override error message when patch failure occurs"
msgstr ""
-#: builtin/clean.c:35
-#, c-format
-msgid "failed to remove %s"
+#: builtin/am.c:2229
+msgid "continue applying patches after resolving a conflict"
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"
+#: builtin/am.c:2232
+msgid "synonyms for --continue"
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"
+#: builtin/am.c:2235
+msgid "skip the current patch"
msgstr ""
-#: builtin/clean.c:517 git-add--interactive.perl:554
-#: git-add--interactive.perl:559
-#, c-format, perl-format
-msgid "Huh (%s)?\n"
+#: builtin/am.c:2238
+msgid "restore the original branch and abort the patching operation."
msgstr ""
-#: builtin/clean.c:659
-#, c-format
-msgid "Input ignore patterns>> "
+#: builtin/am.c:2241
+msgid "abort the patching operation but keep HEAD where it is."
msgstr ""
-#: builtin/clean.c:696
-#, c-format
-msgid "WARNING: Cannot find items matched by: %s"
+#: builtin/am.c:2244
+msgid "show the patch being applied."
msgstr ""
-#: builtin/clean.c:717
-msgid "Select items to delete"
+#: builtin/am.c:2248
+msgid "lie about committer date"
msgstr ""
-#. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:758
-#, c-format
-msgid "Remove %s [y/N]? "
+#: builtin/am.c:2250
+msgid "use current timestamp for author date"
msgstr ""
-#: builtin/clean.c:783 git-add--interactive.perl:1717
-#, c-format
-msgid "Bye.\n"
+#: builtin/am.c:2252 builtin/commit-tree.c:120 builtin/commit.c:1511
+#: builtin/merge.c:286 builtin/pull.c:193 builtin/rebase.c:489
+#: builtin/rebase.c:1459 builtin/revert.c:117 builtin/tag.c:418
+msgid "key-id"
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"
+#: builtin/am.c:2253 builtin/rebase.c:490 builtin/rebase.c:1460
+msgid "GPG-sign commits"
msgstr ""
-#: builtin/clean.c:818 git-add--interactive.perl:1793
-msgid "*** Commands ***"
+#: builtin/am.c:2256
+msgid "(internal use for git-rebase)"
msgstr ""
-#: builtin/clean.c:819 git-add--interactive.perl:1790
-msgid "What now"
+#: builtin/am.c:2274
+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/clean.c:827
-msgid "Would remove the following item:"
-msgid_plural "Would remove the following items:"
-msgstr[0] ""
-msgstr[1] ""
+#: builtin/am.c:2281
+msgid "failed to read the index"
+msgstr ""
-#: builtin/clean.c:843
-msgid "No more files to clean, exiting."
+#: builtin/am.c:2296
+#, c-format
+msgid "previous rebase directory %s still exists but mbox given."
msgstr ""
-#: builtin/clean.c:905
-msgid "do not print names of files removed"
+#: builtin/am.c:2320
+#, c-format
+msgid ""
+"Stray %s directory found.\n"
+"Use \"git am --abort\" to remove it."
msgstr ""
-#: builtin/clean.c:907
-msgid "force"
+#: builtin/am.c:2326
+msgid "Resolve operation not in progress, we are not resuming."
msgstr ""
-#: builtin/clean.c:908
-msgid "interactive cleaning"
+#: builtin/am.c:2336
+msgid "interactive mode requires patches on the command line"
msgstr ""
-#: builtin/clean.c:910
-msgid "remove whole directories"
+#: builtin/apply.c:8
+msgid "git apply [<options>] [<patch>...]"
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"
+#: builtin/archive.c:17
+#, c-format
+msgid "could not create archive file '%s'"
msgstr ""
-#: builtin/clean.c:912
-msgid "add <pattern> to ignore rules"
+#: builtin/archive.c:20
+msgid "could not redirect output"
msgstr ""
-#: builtin/clean.c:913
-msgid "remove ignored files, too"
+#: builtin/archive.c:37
+msgid "git archive: Remote with no URL"
msgstr ""
-#: builtin/clean.c:915
-msgid "remove only ignored files"
+#: builtin/archive.c:61
+msgid "git archive: expected ACK/NAK, got a flush packet"
msgstr ""
-#: builtin/clean.c:933
-msgid "-x and -X cannot be used together"
+#: builtin/archive.c:64
+#, c-format
+msgid "git archive: NACK %s"
msgstr ""
-#: builtin/clean.c:937
-msgid ""
-"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
-"clean"
+#: builtin/archive.c:65
+msgid "git archive: protocol error"
msgstr ""
-#: builtin/clean.c:940
-msgid ""
-"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
-"refusing to clean"
+#: builtin/archive.c:69
+msgid "git archive: expected a flush"
msgstr ""
-#: builtin/clone.c:43
-msgid "git clone [<options>] [--] <repo> [<dir>]"
+#: builtin/bisect--helper.c:22
+msgid "git bisect--helper --next-all [--no-checkout]"
msgstr ""
-#: builtin/clone.c:88
-msgid "don't create a checkout"
+#: builtin/bisect--helper.c:23
+msgid "git bisect--helper --write-terms <bad_term> <good_term>"
msgstr ""
-#: builtin/clone.c:89 builtin/clone.c:91 builtin/init-db.c:480
-msgid "create a bare repository"
+#: builtin/bisect--helper.c:24
+msgid "git bisect--helper --bisect-clean-state"
msgstr ""
-#: builtin/clone.c:93
-msgid "create a mirror repository (implies bare)"
+#: builtin/bisect--helper.c:25
+msgid "git bisect--helper --bisect-reset [<commit>]"
msgstr ""
-#: builtin/clone.c:95
-msgid "to clone from a local repository"
+#: builtin/bisect--helper.c:26
+msgid ""
+"git bisect--helper --bisect-write [--no-log] <state> <revision> <good_term> "
+"<bad_term>"
msgstr ""
-#: builtin/clone.c:97
-msgid "don't use local hardlinks, always copy"
+#: builtin/bisect--helper.c:27
+msgid ""
+"git bisect--helper --bisect-check-and-set-terms <command> <good_term> "
+"<bad_term>"
msgstr ""
-#: builtin/clone.c:99
-msgid "setup as shared repository"
+#: builtin/bisect--helper.c:28
+msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
msgstr ""
-#: builtin/clone.c:101 builtin/clone.c:105
-msgid "pathspec"
+#: builtin/bisect--helper.c:29
+msgid ""
+"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
+"term-new]"
msgstr ""
-#: builtin/clone.c:101 builtin/clone.c:105
-msgid "initialize submodules in the clone"
+#: builtin/bisect--helper.c:30
+msgid ""
+"git bisect--helper --bisect-start [--term-{old,good}=<term> --term-{new,bad}"
+"=<term>][--no-checkout] [<bad> [<good>...]] [--] [<paths>...]"
msgstr ""
-#: builtin/clone.c:108
-msgid "number of submodules cloned in parallel"
+#: builtin/bisect--helper.c:86
+#, c-format
+msgid "'%s' is not a valid term"
msgstr ""
-#: builtin/clone.c:109 builtin/init-db.c:477
-msgid "template-directory"
+#: builtin/bisect--helper.c:90
+#, c-format
+msgid "can't use the builtin command '%s' as a term"
msgstr ""
-#: builtin/clone.c:110 builtin/init-db.c:478
-msgid "directory from which templates will be used"
+#: builtin/bisect--helper.c:100
+#, c-format
+msgid "can't change the meaning of the term '%s'"
msgstr ""
-#: builtin/clone.c:112 builtin/clone.c:114 builtin/submodule--helper.c:1368
-#: builtin/submodule--helper.c:1739
-msgid "reference repository"
+#: builtin/bisect--helper.c:111
+msgid "please use two different terms"
msgstr ""
-#: builtin/clone.c:116 builtin/submodule--helper.c:1370
-#: builtin/submodule--helper.c:1741
-msgid "use --reference only while cloning"
+#: builtin/bisect--helper.c:118
+msgid "could not open the file BISECT_TERMS"
msgstr ""
-#: builtin/clone.c:117 builtin/column.c:27 builtin/merge-file.c:44
-#: builtin/pack-objects.c:3194 builtin/repack.c:320
-msgid "name"
+#: builtin/bisect--helper.c:155
+#, c-format
+msgid "We are not bisecting.\n"
msgstr ""
-#: builtin/clone.c:118
-msgid "use <name> instead of 'origin' to track upstream"
+#: builtin/bisect--helper.c:163
+#, c-format
+msgid "'%s' is not a valid commit"
msgstr ""
-#: builtin/clone.c:120
-msgid "checkout <branch> instead of the remote's HEAD"
+#: builtin/bisect--helper.c:174
+#, c-format
+msgid ""
+"could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
msgstr ""
-#: builtin/clone.c:122
-msgid "path to git-upload-pack on the remote"
+#: builtin/bisect--helper.c:215
+#, c-format
+msgid "Bad bisect_write argument: %s"
msgstr ""
-#: builtin/clone.c:123 builtin/fetch.c:139 builtin/grep.c:814
-#: builtin/pull.c:216
-msgid "depth"
+#: builtin/bisect--helper.c:220
+#, c-format
+msgid "couldn't get the oid of the rev '%s'"
msgstr ""
-#: builtin/clone.c:124
-msgid "create a shallow clone of that depth"
+#: builtin/bisect--helper.c:232
+#, c-format
+msgid "couldn't open the file '%s'"
msgstr ""
-#: builtin/clone.c:125 builtin/fetch.c:141 builtin/pack-objects.c:3185
-#: parse-options.h:154
-msgid "time"
+#: builtin/bisect--helper.c:258
+#, c-format
+msgid "Invalid command: you're currently in a %s/%s bisect"
msgstr ""
-#: builtin/clone.c:126
-msgid "create a shallow clone since a specific time"
+#: builtin/bisect--helper.c:285
+#, c-format
+msgid ""
+"You need to give me at least one %s and %s revision.\n"
+"You can use \"git bisect %s\" and \"git bisect %s\" for that."
msgstr ""
-#: builtin/clone.c:127 builtin/fetch.c:143 builtin/fetch.c:166
-msgid "revision"
+#: builtin/bisect--helper.c:289
+#, c-format
+msgid ""
+"You need to start by \"git bisect start\".\n"
+"You then need to give me at least one %s and %s revision.\n"
+"You can use \"git bisect %s\" and \"git bisect %s\" for that."
msgstr ""
-#: builtin/clone.c:128 builtin/fetch.c:144
-msgid "deepen history of shallow clone, excluding rev"
+#: builtin/bisect--helper.c:321
+#, c-format
+msgid "bisecting only with a %s commit"
msgstr ""
-#: builtin/clone.c:130
-msgid "clone only one branch, HEAD or --branch"
+#. TRANSLATORS: Make sure to include [Y] and [n] in your
+#. translation. The program will only accept English input
+#. at this point.
+#.
+#: builtin/bisect--helper.c:329
+msgid "Are you sure [Y/n]? "
msgstr ""
-#: builtin/clone.c:132
-msgid "don't clone any tags, and make later fetches not to follow them"
+#: builtin/bisect--helper.c:376
+msgid "no terms defined"
msgstr ""
-#: builtin/clone.c:134
-msgid "any cloned submodules will be shallow"
+#: builtin/bisect--helper.c:379
+#, c-format
+msgid ""
+"Your current terms are %s for the old state\n"
+"and %s for the new state.\n"
msgstr ""
-#: builtin/clone.c:135 builtin/init-db.c:486
-msgid "gitdir"
+#: builtin/bisect--helper.c:389
+#, c-format
+msgid ""
+"invalid argument %s for 'git bisect terms'.\n"
+"Supported options are: --term-good|--term-old and --term-bad|--term-new."
msgstr ""
-#: builtin/clone.c:136 builtin/init-db.c:487
-msgid "separate git dir from working tree"
+#: builtin/bisect--helper.c:475
+#, c-format
+msgid "unrecognized option: '%s'"
msgstr ""
-#: builtin/clone.c:137
-msgid "key=value"
+#: builtin/bisect--helper.c:479
+#, c-format
+msgid "'%s' does not appear to be a valid revision"
msgstr ""
-#: builtin/clone.c:138
-msgid "set config inside the new repository"
+#: builtin/bisect--helper.c:511
+msgid "bad HEAD - I need a HEAD"
msgstr ""
-#: builtin/clone.c:139 builtin/fetch.c:162 builtin/pull.c:229
-#: builtin/push.c:583
-msgid "use IPv4 addresses only"
+#: builtin/bisect--helper.c:526
+#, c-format
+msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
msgstr ""
-#: builtin/clone.c:141 builtin/fetch.c:164 builtin/pull.c:232
-#: builtin/push.c:585
-msgid "use IPv6 addresses only"
+#: builtin/bisect--helper.c:547
+msgid "won't bisect on cg-seek'ed tree"
msgstr ""
-#: builtin/clone.c:279
-msgid ""
-"No directory name could be guessed.\n"
-"Please specify a directory on the command line"
+#: builtin/bisect--helper.c:550
+msgid "bad HEAD - strange symbolic ref"
msgstr ""
-#: builtin/clone.c:332
+#: builtin/bisect--helper.c:574
#, c-format
-msgid "info: Could not add alternate for '%s': %s\n"
+msgid "invalid ref: '%s'"
msgstr ""
-#: builtin/clone.c:404
-#, c-format
-msgid "failed to open '%s'"
+#: builtin/bisect--helper.c:630
+msgid "perform 'git bisect next'"
msgstr ""
-#: builtin/clone.c:412
-#, c-format
-msgid "%s exists and is not a directory"
+#: builtin/bisect--helper.c:632
+msgid "write the terms to .git/BISECT_TERMS"
msgstr ""
-#: builtin/clone.c:426
-#, c-format
-msgid "failed to stat %s\n"
+#: builtin/bisect--helper.c:634
+msgid "cleanup the bisection state"
msgstr ""
-#: builtin/clone.c:448
-#, c-format
-msgid "failed to create link '%s'"
+#: builtin/bisect--helper.c:636
+msgid "check for expected revs"
msgstr ""
-#: builtin/clone.c:452
-#, c-format
-msgid "failed to copy file to '%s'"
+#: builtin/bisect--helper.c:638
+msgid "reset the bisection state"
msgstr ""
-#: builtin/clone.c:478
-#, c-format
-msgid "done.\n"
+#: builtin/bisect--helper.c:640
+msgid "write out the bisection state in BISECT_LOG"
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"
+#: builtin/bisect--helper.c:642
+msgid "check and set terms in a bisection state"
msgstr ""
-#: builtin/clone.c:569
-#, c-format
-msgid "Could not find remote branch %s to clone."
+#: builtin/bisect--helper.c:644
+msgid "check whether bad or good terms exist"
msgstr ""
-#: builtin/clone.c:680
-#, c-format
-msgid "unable to update %s"
+#: builtin/bisect--helper.c:646
+msgid "print out the bisect terms"
msgstr ""
-#: builtin/clone.c:730
-msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
+#: builtin/bisect--helper.c:648
+msgid "start the bisect session"
msgstr ""
-#: builtin/clone.c:760
-msgid "unable to checkout working tree"
+#: builtin/bisect--helper.c:650
+msgid "update BISECT_HEAD instead of checking out the current commit"
msgstr ""
-#: builtin/clone.c:805
-msgid "unable to write parameters to config file"
+#: builtin/bisect--helper.c:652
+msgid "no log for BISECT_WRITE"
msgstr ""
-#: builtin/clone.c:868
-msgid "cannot repack to clean up"
+#: builtin/bisect--helper.c:669
+msgid "--write-terms requires two arguments"
msgstr ""
-#: builtin/clone.c:870
-msgid "cannot unlink temporary alternates file"
+#: builtin/bisect--helper.c:673
+msgid "--bisect-clean-state requires no arguments"
msgstr ""
-#: builtin/clone.c:910 builtin/receive-pack.c:1935
-msgid "Too many arguments."
+#: builtin/bisect--helper.c:680
+msgid "--bisect-reset requires either no argument or a commit"
msgstr ""
-#: builtin/clone.c:914
-msgid "You must specify a repository to clone."
+#: builtin/bisect--helper.c:684
+msgid "--bisect-write requires either 4 or 5 arguments"
msgstr ""
-#: builtin/clone.c:927
-#, c-format
-msgid "--bare and --origin %s options are incompatible."
+#: builtin/bisect--helper.c:690
+msgid "--check-and-set-terms requires 3 arguments"
msgstr ""
-#: builtin/clone.c:930
-msgid "--bare and --separate-git-dir are incompatible."
+#: builtin/bisect--helper.c:696
+msgid "--bisect-next-check requires 2 or 3 arguments"
msgstr ""
-#: builtin/clone.c:943
-#, c-format
-msgid "repository '%s' does not exist"
+#: builtin/bisect--helper.c:702
+msgid "--bisect-terms requires 0 or 1 argument"
msgstr ""
-#: builtin/clone.c:949 builtin/fetch.c:1512
-#, c-format
-msgid "depth %s is not a positive number"
+#: builtin/blame.c:32
+msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
msgstr ""
-#: builtin/clone.c:959
-#, c-format
-msgid "destination path '%s' already exists and is not an empty directory."
+#: builtin/blame.c:37
+msgid "<rev-opts> are documented in git-rev-list(1)"
msgstr ""
-#: builtin/clone.c:969
+#: builtin/blame.c:410
#, c-format
-msgid "working tree '%s' already exists."
+msgid "expecting a color: %s"
msgstr ""
-#: builtin/clone.c:984 builtin/clone.c:1005 builtin/difftool.c:271
-#: builtin/worktree.c:246 builtin/worktree.c:276
-#, c-format
-msgid "could not create leading directories of '%s'"
+#: builtin/blame.c:417
+msgid "must end with a color"
msgstr ""
-#: builtin/clone.c:989
+#: builtin/blame.c:730
#, c-format
-msgid "could not create work tree dir '%s'"
+msgid "invalid color '%s' in color.blame.repeatedLines"
msgstr ""
-#: builtin/clone.c:1009
-#, c-format
-msgid "Cloning into bare repository '%s'...\n"
+#: builtin/blame.c:748
+msgid "invalid value for blame.coloring"
msgstr ""
-#: builtin/clone.c:1011
+#: builtin/blame.c:823
#, c-format
-msgid "Cloning into '%s'...\n"
+msgid "cannot find revision %s to ignore"
msgstr ""
-#: builtin/clone.c:1035
-msgid ""
-"clone --recursive is not compatible with both --reference and --reference-if-"
-"able"
+#: builtin/blame.c:845
+msgid "Show blame entries as we find them, incrementally"
msgstr ""
-#: builtin/clone.c:1096
-msgid "--depth is ignored in local clones; use file:// instead."
+#: builtin/blame.c:846
+msgid "Show blank SHA-1 for boundary commits (Default: off)"
msgstr ""
-#: builtin/clone.c:1098
-msgid "--shallow-since is ignored in local clones; use file:// instead."
+#: builtin/blame.c:847
+msgid "Do not treat root commits as boundaries (Default: off)"
msgstr ""
-#: builtin/clone.c:1100
-msgid "--shallow-exclude is ignored in local clones; use file:// instead."
+#: builtin/blame.c:848
+msgid "Show work cost statistics"
msgstr ""
-#: builtin/clone.c:1102
-msgid "--filter is ignored in local clones; use file:// instead."
+#: builtin/blame.c:849
+msgid "Force progress reporting"
msgstr ""
-#: builtin/clone.c:1105
-msgid "source repository is shallow, ignoring --local"
+#: builtin/blame.c:850
+msgid "Show output score for blame entries"
msgstr ""
-#: builtin/clone.c:1110
-msgid "--local is ignored"
+#: builtin/blame.c:851
+msgid "Show original filename (Default: auto)"
msgstr ""
-#: builtin/clone.c:1180 builtin/clone.c:1188
-#, c-format
-msgid "Remote branch %s not found in upstream %s"
+#: builtin/blame.c:852
+msgid "Show original linenumber (Default: off)"
msgstr ""
-#: builtin/clone.c:1191
-msgid "You appear to have cloned an empty repository."
+#: builtin/blame.c:853
+msgid "Show in a format designed for machine consumption"
msgstr ""
-#: builtin/column.c:10
-msgid "git column [<options>]"
+#: builtin/blame.c:854
+msgid "Show porcelain format with per-line commit information"
msgstr ""
-#: builtin/column.c:27
-msgid "lookup config vars"
+#: builtin/blame.c:855
+msgid "Use the same output mode as git-annotate (Default: off)"
msgstr ""
-#: builtin/column.c:28 builtin/column.c:29
-msgid "layout to use"
+#: builtin/blame.c:856
+msgid "Show raw timestamp (Default: off)"
msgstr ""
-#: builtin/column.c:30
-msgid "Maximum width"
+#: builtin/blame.c:857
+msgid "Show long commit SHA1 (Default: off)"
msgstr ""
-#: builtin/column.c:31
-msgid "Padding space on left border"
+#: builtin/blame.c:858
+msgid "Suppress author name and timestamp (Default: off)"
msgstr ""
-#: builtin/column.c:32
-msgid "Padding space on right border"
+#: builtin/blame.c:859
+msgid "Show author email instead of name (Default: off)"
msgstr ""
-#: builtin/column.c:33
-msgid "Padding space between columns"
+#: builtin/blame.c:860
+msgid "Ignore whitespace differences"
msgstr ""
-#: builtin/column.c:51
-msgid "--command must be the first argument"
+#: builtin/blame.c:861 builtin/log.c:1629
+msgid "rev"
msgstr ""
-#: builtin/commit.c:38
-msgid "git commit [<options>] [--] <pathspec>..."
+#: builtin/blame.c:861
+msgid "Ignore <rev> when blaming"
msgstr ""
-#: builtin/commit.c:43
-msgid "git status [<options>] [--] <pathspec>..."
+#: builtin/blame.c:862
+msgid "Ignore revisions from <file>"
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"
+#: builtin/blame.c:863
+msgid "color redundant metadata from previous line differently"
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"
+#: builtin/blame.c:864
+msgid "color lines by age"
msgstr ""
-#: builtin/commit.c:306
-msgid "failed to unpack HEAD tree object"
+#: builtin/blame.c:871
+msgid "Use an experimental heuristic to improve diffs"
msgstr ""
-#: builtin/commit.c:347
-msgid "unable to create temporary index"
+#: builtin/blame.c:873
+msgid "Spend extra cycles to find better match"
msgstr ""
-#: builtin/commit.c:353
-msgid "interactive add failed"
+#: builtin/blame.c:874
+msgid "Use revisions from <file> instead of calling git-rev-list"
msgstr ""
-#: builtin/commit.c:366
-msgid "unable to update temporary index"
+#: builtin/blame.c:875
+msgid "Use <file>'s contents as the final image"
msgstr ""
-#: builtin/commit.c:368
-msgid "Failed to update main cache tree"
+#: builtin/blame.c:876 builtin/blame.c:877
+msgid "score"
msgstr ""
-#: builtin/commit.c:393 builtin/commit.c:416 builtin/commit.c:462
-msgid "unable to write new_index file"
+#: builtin/blame.c:876
+msgid "Find line copies within and across files"
msgstr ""
-#: builtin/commit.c:445
-msgid "cannot do a partial commit during a merge."
+#: builtin/blame.c:877
+msgid "Find line movements within and across files"
msgstr ""
-#: builtin/commit.c:447
-msgid "cannot do a partial commit during a cherry-pick."
+#: builtin/blame.c:878
+msgid "n,m"
msgstr ""
-#: builtin/commit.c:455
-msgid "cannot read the index"
+#: builtin/blame.c:878
+msgid "Process only line range n,m, counting from 1"
msgstr ""
-#: builtin/commit.c:474
-msgid "unable to write temporary index file"
+#: builtin/blame.c:929
+msgid "--progress can't be used with --incremental or porcelain formats"
msgstr ""
-#: builtin/commit.c:571
-#, c-format
-msgid "commit '%s' lacks author header"
+#. 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:980
+msgid "4 years, 11 months ago"
msgstr ""
-#: builtin/commit.c:573
+#: builtin/blame.c:1087
#, c-format
-msgid "commit '%s' has malformed author line"
-msgstr ""
-
-#: builtin/commit.c:592
-msgid "malformed --author parameter"
-msgstr ""
+msgid "file %s has only %lu line"
+msgid_plural "file %s has only %lu lines"
+msgstr[0] ""
+msgstr[1] ""
-#: builtin/commit.c:644
-msgid ""
-"unable to select a comment character that is not used\n"
-"in the current commit message"
+#: builtin/blame.c:1133
+msgid "Blaming lines"
msgstr ""
-#: builtin/commit.c:681 builtin/commit.c:714 builtin/commit.c:1042
-#, c-format
-msgid "could not lookup commit %s"
+#: builtin/branch.c:29
+msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
msgstr ""
-#: builtin/commit.c:693 builtin/shortlog.c:317
-#, c-format
-msgid "(reading log message from standard input)\n"
+#: builtin/branch.c:30
+msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
msgstr ""
-#: builtin/commit.c:695
-msgid "could not read log from standard input"
+#: builtin/branch.c:31
+msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
msgstr ""
-#: builtin/commit.c:699
-#, c-format
-msgid "could not read log file '%s'"
+#: builtin/branch.c:32
+msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
msgstr ""
-#: builtin/commit.c:728 builtin/commit.c:736
-msgid "could not read SQUASH_MSG"
+#: builtin/branch.c:33
+msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
msgstr ""
-#: builtin/commit.c:733
-msgid "could not read MERGE_MSG"
+#: builtin/branch.c:34
+msgid "git branch [<options>] [-r | -a] [--points-at]"
msgstr ""
-#: builtin/commit.c:787
-msgid "could not write commit template"
+#: builtin/branch.c:35
+msgid "git branch [<options>] [-r | -a] [--format]"
msgstr ""
-#: builtin/commit.c:805
+#: builtin/branch.c:154
#, 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"
+"deleting branch '%s' that has been merged to\n"
+" '%s', but not yet merged to HEAD."
msgstr ""
-#: builtin/commit.c:810
+#: builtin/branch.c:158
#, 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"
+"not deleting branch '%s' that is not yet merged to\n"
+" '%s', even though it is merged to HEAD."
msgstr ""
-#: builtin/commit.c:823
+#: builtin/branch.c:172
#, 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 "Couldn't look up commit object for '%s'"
msgstr ""
-#: builtin/commit.c:831
+#: builtin/branch.c:176
#, 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"
+"The branch '%s' is not fully merged.\n"
+"If you are sure you want to delete it, run 'git branch -D %s'."
msgstr ""
-#: builtin/commit.c:848
-#, c-format
-msgid "%sAuthor: %.*s <%.*s>"
+#: builtin/branch.c:189
+msgid "Update of config-file failed"
msgstr ""
-#: builtin/commit.c:856
-#, c-format
-msgid "%sDate: %s"
+#: builtin/branch.c:220
+msgid "cannot use -a with -d"
msgstr ""
-#: builtin/commit.c:863
-#, c-format
-msgid "%sCommitter: %.*s <%.*s>"
+#: builtin/branch.c:226
+msgid "Couldn't look up commit object for HEAD"
msgstr ""
-#: builtin/commit.c:880
-msgid "Cannot read index"
+#: builtin/branch.c:240
+#, c-format
+msgid "Cannot delete branch '%s' checked out at '%s'"
msgstr ""
-#: builtin/commit.c:946
-msgid "Error building trees"
+#: builtin/branch.c:255
+#, c-format
+msgid "remote-tracking branch '%s' not found."
msgstr ""
-#: builtin/commit.c:960 builtin/tag.c:258
+#: builtin/branch.c:256
#, c-format
-msgid "Please supply the message using either -m or -F option.\n"
+msgid "branch '%s' not found."
msgstr ""
-#: builtin/commit.c:1004
+#: builtin/branch.c:271
#, c-format
-msgid "--author '%s' is not 'Name <email>' and matches no existing author"
+msgid "Error deleting remote-tracking branch '%s'"
msgstr ""
-#: builtin/commit.c:1018
+#: builtin/branch.c:272
#, c-format
-msgid "Invalid ignored mode '%s'"
+msgid "Error deleting branch '%s'"
msgstr ""
-#: builtin/commit.c:1032 builtin/commit.c:1269
+#: builtin/branch.c:279
#, c-format
-msgid "Invalid untracked files mode '%s'"
+msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr ""
-#: builtin/commit.c:1070
-msgid "--long and -z are incompatible"
+#: builtin/branch.c:280
+#, c-format
+msgid "Deleted branch %s (was %s).\n"
msgstr ""
-#: builtin/commit.c:1103
-msgid "Using both --reset-author and --author does not make sense"
+#: builtin/branch.c:429 builtin/tag.c:61
+msgid "unable to parse format string"
msgstr ""
-#: builtin/commit.c:1112
-msgid "You have nothing to amend."
+#: builtin/branch.c:460
+msgid "could not resolve HEAD"
msgstr ""
-#: builtin/commit.c:1115
-msgid "You are in the middle of a merge -- cannot amend."
+#: builtin/branch.c:466
+#, c-format
+msgid "HEAD (%s) points outside of refs/heads/"
msgstr ""
-#: builtin/commit.c:1117
-msgid "You are in the middle of a cherry-pick -- cannot amend."
+#: builtin/branch.c:481
+#, c-format
+msgid "Branch %s is being rebased at %s"
msgstr ""
-#: builtin/commit.c:1120
-msgid "Options --squash and --fixup cannot be used together"
+#: builtin/branch.c:485
+#, c-format
+msgid "Branch %s is being bisected at %s"
msgstr ""
-#: builtin/commit.c:1130
-msgid "Only one of -c/-C/-F/--fixup can be used."
+#: builtin/branch.c:502
+msgid "cannot copy the current branch while not on any."
msgstr ""
-#: builtin/commit.c:1132
-msgid "Option -m cannot be combined with -c/-C/-F."
+#: builtin/branch.c:504
+msgid "cannot rename the current branch while not on any."
msgstr ""
-#: builtin/commit.c:1140
-msgid "--reset-author can be used only with -C, -c or --amend."
+#: builtin/branch.c:515
+#, c-format
+msgid "Invalid branch name: '%s'"
msgstr ""
-#: builtin/commit.c:1157
-msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
+#: builtin/branch.c:542
+msgid "Branch rename failed"
msgstr ""
-#: builtin/commit.c:1159
-msgid "No paths with --include/--only does not make sense."
+#: builtin/branch.c:544
+msgid "Branch copy failed"
msgstr ""
-#: builtin/commit.c:1173 builtin/tag.c:544
+#: builtin/branch.c:548
#, c-format
-msgid "Invalid cleanup mode %s"
+msgid "Created a copy of a misnamed branch '%s'"
msgstr ""
-#: builtin/commit.c:1178
-msgid "Paths with -a does not make sense."
+#: builtin/branch.c:551
+#, c-format
+msgid "Renamed a misnamed branch '%s' away"
msgstr ""
-#: builtin/commit.c:1303 builtin/commit.c:1480
-msgid "show status concisely"
+#: builtin/branch.c:557
+#, c-format
+msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr ""
-#: builtin/commit.c:1305 builtin/commit.c:1482
-msgid "show branch information"
+#: builtin/branch.c:566
+msgid "Branch is renamed, but update of config-file failed"
msgstr ""
-#: builtin/commit.c:1307
-msgid "show stash information"
+#: builtin/branch.c:568
+msgid "Branch is copied, but update of config-file failed"
msgstr ""
-#: builtin/commit.c:1309 builtin/commit.c:1484
-msgid "compute full ahead/behind values"
+#: builtin/branch.c:584
+#, c-format
+msgid ""
+"Please edit the description for the branch\n"
+" %s\n"
+"Lines starting with '%c' will be stripped.\n"
msgstr ""
-#: builtin/commit.c:1311
-msgid "version"
+#: builtin/branch.c:618
+msgid "Generic options"
msgstr ""
-#: builtin/commit.c:1311 builtin/commit.c:1486 builtin/push.c:558
-#: builtin/worktree.c:581
-msgid "machine-readable output"
+#: builtin/branch.c:620
+msgid "show hash and subject, give twice for upstream branch"
msgstr ""
-#: builtin/commit.c:1314 builtin/commit.c:1488
-msgid "show status in long format (default)"
+#: builtin/branch.c:621
+msgid "suppress informational messages"
msgstr ""
-#: builtin/commit.c:1317 builtin/commit.c:1491
-msgid "terminate entries with NUL"
+#: builtin/branch.c:622
+msgid "set up tracking mode (see git-pull(1))"
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"
+#: builtin/branch.c:624
+msgid "do not use"
msgstr ""
-#: builtin/commit.c:1320 builtin/commit.c:1494
-msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
+#: builtin/branch.c:626 builtin/rebase.c:485
+msgid "upstream"
msgstr ""
-#: builtin/commit.c:1324
-msgid ""
-"show ignored files, optional modes: traditional, matching, no. (Default: "
-"traditional)"
+#: builtin/branch.c:626
+msgid "change the upstream info"
msgstr ""
-#: builtin/commit.c:1326 parse-options.h:167
-msgid "when"
+#: builtin/branch.c:627
+msgid "Unset the upstream info"
msgstr ""
-#: builtin/commit.c:1327
-msgid ""
-"ignore changes to submodules, optional when: all, dirty, untracked. "
-"(Default: all)"
+#: builtin/branch.c:628
+msgid "use colored output"
msgstr ""
-#: builtin/commit.c:1329
-msgid "list untracked files in columns"
+#: builtin/branch.c:629
+msgid "act on remote-tracking branches"
msgstr ""
-#: builtin/commit.c:1330
-msgid "do not detect renames"
+#: builtin/branch.c:631 builtin/branch.c:633
+msgid "print only branches that contain the commit"
msgstr ""
-#: builtin/commit.c:1332
-msgid "detect renames, optionally set similarity index"
+#: builtin/branch.c:632 builtin/branch.c:634
+msgid "print only branches that don't contain the commit"
msgstr ""
-#: builtin/commit.c:1352
-msgid "Unsupported combination of ignored and untracked-files arguments"
+#: builtin/branch.c:637
+msgid "Specific git-branch actions:"
msgstr ""
-#: builtin/commit.c:1450
-msgid "suppress summary after successful commit"
+#: builtin/branch.c:638
+msgid "list both remote-tracking and local branches"
msgstr ""
-#: builtin/commit.c:1451
-msgid "show diff in commit message template"
+#: builtin/branch.c:640
+msgid "delete fully merged branch"
msgstr ""
-#: builtin/commit.c:1453
-msgid "Commit message options"
+#: builtin/branch.c:641
+msgid "delete branch (even if not merged)"
msgstr ""
-#: builtin/commit.c:1454 builtin/merge.c:261 builtin/tag.c:395
-msgid "read message from file"
+#: builtin/branch.c:642
+msgid "move/rename a branch and its reflog"
msgstr ""
-#: builtin/commit.c:1455
-msgid "author"
+#: builtin/branch.c:643
+msgid "move/rename a branch, even if target exists"
msgstr ""
-#: builtin/commit.c:1455
-msgid "override author for commit"
+#: builtin/branch.c:644
+msgid "copy a branch and its reflog"
msgstr ""
-#: builtin/commit.c:1456 builtin/gc.c:504
-msgid "date"
+#: builtin/branch.c:645
+msgid "copy a branch, even if target exists"
msgstr ""
-#: builtin/commit.c:1456
-msgid "override date for commit"
+#: builtin/branch.c:646
+msgid "list branch names"
msgstr ""
-#: builtin/commit.c:1457 builtin/merge.c:257 builtin/notes.c:404
-#: builtin/notes.c:567 builtin/tag.c:393
-msgid "message"
+#: builtin/branch.c:647
+msgid "show current branch name"
msgstr ""
-#: builtin/commit.c:1457
-msgid "commit message"
+#: builtin/branch.c:648
+msgid "create the branch's reflog"
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"
+#: builtin/branch.c:650
+msgid "edit the description for the branch"
msgstr ""
-#: builtin/commit.c:1458
-msgid "reuse and edit message from specified commit"
+#: builtin/branch.c:651
+msgid "force creation, move/rename, deletion"
msgstr ""
-#: builtin/commit.c:1459
-msgid "reuse message from specified commit"
+#: builtin/branch.c:652
+msgid "print only branches that are merged"
msgstr ""
-#: builtin/commit.c:1460
-msgid "use autosquash formatted message to fixup specified commit"
+#: builtin/branch.c:653
+msgid "print only branches that are not merged"
msgstr ""
-#: builtin/commit.c:1461
-msgid "use autosquash formatted message to squash specified commit"
+#: builtin/branch.c:654
+msgid "list branches in columns"
msgstr ""
-#: builtin/commit.c:1462
-msgid "the commit is authored by me now (used with -C/-c/--amend)"
+#: builtin/branch.c:657 builtin/for-each-ref.c:42 builtin/notes.c:415
+#: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584
+#: builtin/tag.c:433
+msgid "object"
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:"
+#: builtin/branch.c:658
+msgid "print only branches of the object"
msgstr ""
-#: builtin/commit.c:1464
-msgid "use specified template file"
+#: builtin/branch.c:660 builtin/for-each-ref.c:48 builtin/tag.c:440
+msgid "sorting and filtering are case insensitive"
msgstr ""
-#: builtin/commit.c:1465
-msgid "force edit of commit"
+#: builtin/branch.c:661 builtin/for-each-ref.c:38 builtin/tag.c:438
+#: builtin/verify-tag.c:38
+msgid "format to use for the output"
msgstr ""
-#: builtin/commit.c:1466
-msgid "default"
+#: builtin/branch.c:684 builtin/clone.c:761
+msgid "HEAD not found below refs/heads!"
msgstr ""
-#: builtin/commit.c:1466 builtin/tag.c:399
-msgid "how to strip spaces and #comments from message"
+#: builtin/branch.c:708
+msgid "--column and --verbose are incompatible"
msgstr ""
-#: builtin/commit.c:1467
-msgid "include status in commit message template"
+#: builtin/branch.c:723 builtin/branch.c:777 builtin/branch.c:786
+msgid "branch name required"
msgstr ""
-#: builtin/commit.c:1469 builtin/merge.c:272 builtin/pull.c:184
-#: builtin/revert.c:114
-msgid "GPG sign commit"
+#: builtin/branch.c:753
+msgid "Cannot give description to detached HEAD"
msgstr ""
-#: builtin/commit.c:1472
-msgid "Commit contents options"
+#: builtin/branch.c:758
+msgid "cannot edit description of more than one branch"
msgstr ""
-#: builtin/commit.c:1473
-msgid "commit all changed files"
+#: builtin/branch.c:765
+#, c-format
+msgid "No commit on branch '%s' yet."
msgstr ""
-#: builtin/commit.c:1474
-msgid "add specified files to index for commit"
+#: builtin/branch.c:768
+#, c-format
+msgid "No branch named '%s'."
msgstr ""
-#: builtin/commit.c:1475
-msgid "interactively add files"
+#: builtin/branch.c:783
+msgid "too many branches for a copy operation"
msgstr ""
-#: builtin/commit.c:1476
-msgid "interactively add changes"
+#: builtin/branch.c:792
+msgid "too many arguments for a rename operation"
msgstr ""
-#: builtin/commit.c:1477
-msgid "commit only specified files"
+#: builtin/branch.c:797
+msgid "too many arguments to set new upstream"
msgstr ""
-#: builtin/commit.c:1478
-msgid "bypass pre-commit and commit-msg hooks"
+#: builtin/branch.c:801
+#, c-format
+msgid ""
+"could not set upstream of HEAD to %s when it does not point to any branch."
msgstr ""
-#: builtin/commit.c:1479
-msgid "show what would be committed"
+#: builtin/branch.c:804 builtin/branch.c:827
+#, c-format
+msgid "no such branch '%s'"
msgstr ""
-#: builtin/commit.c:1492
-msgid "amend previous commit"
+#: builtin/branch.c:808
+#, c-format
+msgid "branch '%s' does not exist"
msgstr ""
-#: builtin/commit.c:1493
-msgid "bypass post-rewrite hook"
+#: builtin/branch.c:821
+msgid "too many arguments to unset upstream"
msgstr ""
-#: builtin/commit.c:1498
-msgid "ok to record an empty change"
+#: builtin/branch.c:825
+msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr ""
-#: builtin/commit.c:1500
-msgid "ok to record a change with an empty message"
+#: builtin/branch.c:831
+#, c-format
+msgid "Branch '%s' has no upstream information"
msgstr ""
-#: builtin/commit.c:1573
-#, c-format
-msgid "Corrupt MERGE_HEAD file (%s)"
+#: builtin/branch.c:841
+msgid ""
+"The -a, and -r, options to 'git branch' do not take a branch name.\n"
+"Did you mean to use: -a|-r --list <pattern>?"
msgstr ""
-#: builtin/commit.c:1580
-msgid "could not read MERGE_MODE"
+#: builtin/branch.c:845
+msgid ""
+"the '--set-upstream' option is no longer supported. Please use '--track' or "
+"'--set-upstream-to' instead."
msgstr ""
-#: builtin/commit.c:1599
+#: builtin/bundle.c:45
#, c-format
-msgid "could not read commit message: %s"
+msgid "%s is okay\n"
msgstr ""
-#: builtin/commit.c:1610
-#, c-format
-msgid "Aborting commit due to empty commit message.\n"
+#: builtin/bundle.c:58
+msgid "Need a repository to create a bundle."
msgstr ""
-#: builtin/commit.c:1615
-#, c-format
-msgid "Aborting commit; you did not edit the message.\n"
+#: builtin/bundle.c:62
+msgid "Need a repository to unbundle."
msgstr ""
-#: builtin/commit.c:1650
+#: builtin/cat-file.c:594
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."
+"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
+"p | <type> | --textconv | --filters) [--path=<path>] <object>"
msgstr ""
-#: builtin/commit-graph.c:10
-msgid "git commit-graph [--object-dir <objdir>]"
+#: builtin/cat-file.c:595
+msgid ""
+"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
+"filters]"
msgstr ""
-#: builtin/commit-graph.c:11 builtin/commit-graph.c:23
-msgid "git commit-graph read [--object-dir <objdir>]"
+#: builtin/cat-file.c:616
+msgid "only one batch option may be specified"
msgstr ""
-#: builtin/commit-graph.c:12 builtin/commit-graph.c:18
-msgid "git commit-graph verify [--object-dir <objdir>]"
+#: builtin/cat-file.c:634
+msgid "<type> can be one of: blob, tree, commit, tag"
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]"
+#: builtin/cat-file.c:635
+msgid "show object type"
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"
+#: builtin/cat-file.c:636
+msgid "show object size"
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"
+#: builtin/cat-file.c:638
+msgid "exit with zero when there's no error"
msgstr ""
-#: builtin/commit-graph.c:134
-msgid "start walk at all refs"
+#: builtin/cat-file.c:639
+msgid "pretty-print object's content"
msgstr ""
-#: builtin/commit-graph.c:136
-msgid "scan pack-indexes listed by stdin for commits"
+#: builtin/cat-file.c:641
+msgid "for blob objects, run textconv on object's content"
msgstr ""
-#: builtin/commit-graph.c:138
-msgid "start walk at commits listed by stdin"
+#: builtin/cat-file.c:643
+msgid "for blob objects, run filters on object's content"
msgstr ""
-#: builtin/commit-graph.c:140
-msgid "include all commits already in the commit-graph file"
+#: builtin/cat-file.c:644 git-submodule.sh:936
+msgid "blob"
msgstr ""
-#: builtin/commit-graph.c:149
-msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
+#: builtin/cat-file.c:645
+msgid "use a specific path for --textconv/--filters"
msgstr ""
-#: builtin/config.c:10
-msgid "git config [<options>]"
+#: builtin/cat-file.c:647
+msgid "allow -s and -t to work with broken/corrupt objects"
msgstr ""
-#: builtin/config.c:101
-#, c-format
-msgid "unrecognized --type argument, %s"
+#: builtin/cat-file.c:648
+msgid "buffer --batch output"
msgstr ""
-#: builtin/config.c:113
-msgid "only one type at a time"
+#: builtin/cat-file.c:650
+msgid "show info and content of objects fed from the standard input"
msgstr ""
-#: builtin/config.c:122
-msgid "Config file location"
+#: builtin/cat-file.c:654
+msgid "show info about objects fed from the standard input"
msgstr ""
-#: builtin/config.c:123
-msgid "use global config file"
+#: builtin/cat-file.c:658
+msgid "follow in-tree symlinks (used with --batch or --batch-check)"
msgstr ""
-#: builtin/config.c:124
-msgid "use system config file"
+#: builtin/cat-file.c:660
+msgid "show all objects with --batch or --batch-check"
msgstr ""
-#: builtin/config.c:125
-msgid "use repository config file"
+#: builtin/cat-file.c:662
+msgid "do not order --batch-all-objects output"
msgstr ""
-#: builtin/config.c:126
-msgid "use given config file"
+#: builtin/check-attr.c:13
+msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
msgstr ""
-#: builtin/config.c:127
-msgid "blob-id"
+#: builtin/check-attr.c:14
+msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
msgstr ""
-#: builtin/config.c:127
-msgid "read config from given blob object"
+#: builtin/check-attr.c:21
+msgid "report all attributes set on file"
msgstr ""
-#: builtin/config.c:128
-msgid "Action"
+#: builtin/check-attr.c:22
+msgid "use .gitattributes only from the index"
msgstr ""
-#: builtin/config.c:129
-msgid "get value: name [value-regex]"
+#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:102
+msgid "read file names from stdin"
msgstr ""
-#: builtin/config.c:130
-msgid "get all values: key [value-regex]"
+#: builtin/check-attr.c:25 builtin/check-ignore.c:27
+msgid "terminate input and output records by a NUL character"
msgstr ""
-#: builtin/config.c:131
-msgid "get values for regexp: name-regex [value-regex]"
+#: builtin/check-ignore.c:21 builtin/checkout.c:1433 builtin/gc.c:538
+#: builtin/worktree.c:507
+msgid "suppress progress reporting"
msgstr ""
-#: builtin/config.c:132
-msgid "get value specific for the URL: section[.var] URL"
+#: builtin/check-ignore.c:29
+msgid "show non-matching input paths"
msgstr ""
-#: builtin/config.c:133
-msgid "replace all matching variables: name value [value_regex]"
+#: builtin/check-ignore.c:31
+msgid "ignore index when checking"
msgstr ""
-#: builtin/config.c:134
-msgid "add a new variable: name value"
+#: builtin/check-ignore.c:160
+msgid "cannot specify pathnames with --stdin"
msgstr ""
-#: builtin/config.c:135
-msgid "remove a variable: name [value-regex]"
+#: builtin/check-ignore.c:163
+msgid "-z only makes sense with --stdin"
msgstr ""
-#: builtin/config.c:136
-msgid "remove all matches: name [value-regex]"
+#: builtin/check-ignore.c:165
+msgid "no path specified"
msgstr ""
-#: builtin/config.c:137
-msgid "rename section: old-name new-name"
+#: builtin/check-ignore.c:169
+msgid "--quiet is only valid with a single pathname"
msgstr ""
-#: builtin/config.c:138
-msgid "remove a section: name"
+#: builtin/check-ignore.c:171
+msgid "cannot have both --quiet and --verbose"
msgstr ""
-#: builtin/config.c:139
-msgid "list all"
+#: builtin/check-ignore.c:174
+msgid "--non-matching is only valid with --verbose"
msgstr ""
-#: builtin/config.c:140
-msgid "open an editor"
+#: builtin/check-mailmap.c:9
+msgid "git check-mailmap [<options>] <contact>..."
msgstr ""
-#: builtin/config.c:141
-msgid "find the color configured: slot [default]"
+#: builtin/check-mailmap.c:14
+msgid "also read contacts from stdin"
msgstr ""
-#: builtin/config.c:142
-msgid "find the color setting: slot [stdout-is-tty]"
+#: builtin/check-mailmap.c:25
+#, c-format
+msgid "unable to parse contact: %s"
msgstr ""
-#: builtin/config.c:143
-msgid "Type"
+#: builtin/check-mailmap.c:48
+msgid "no contacts specified"
msgstr ""
-#: builtin/config.c:144
-msgid "value is given this type"
+#: builtin/checkout-index.c:131
+msgid "git checkout-index [<options>] [--] [<file>...]"
msgstr ""
-#: builtin/config.c:145
-msgid "value is \"true\" or \"false\""
+#: builtin/checkout-index.c:148
+msgid "stage should be between 1 and 3 or all"
msgstr ""
-#: builtin/config.c:146
-msgid "value is decimal number"
+#: builtin/checkout-index.c:164
+msgid "check out all files in the index"
msgstr ""
-#: builtin/config.c:147
-msgid "value is --bool or --int"
+#: builtin/checkout-index.c:165
+msgid "force overwrite of existing files"
msgstr ""
-#: builtin/config.c:148
-msgid "value is a path (file or directory name)"
+#: builtin/checkout-index.c:167
+msgid "no warning for existing files and files not in index"
msgstr ""
-#: builtin/config.c:149
-msgid "value is an expiry date"
+#: builtin/checkout-index.c:169
+msgid "don't checkout new files"
msgstr ""
-#: builtin/config.c:150
-msgid "Other"
+#: builtin/checkout-index.c:171
+msgid "update stat information in the index file"
msgstr ""
-#: builtin/config.c:151
-msgid "terminate values with NUL byte"
+#: builtin/checkout-index.c:175
+msgid "read list of paths from the standard input"
msgstr ""
-#: builtin/config.c:152
-msgid "show variable names only"
+#: builtin/checkout-index.c:177
+msgid "write the content to temporary files"
msgstr ""
-#: builtin/config.c:153
-msgid "respect include directives on lookup"
+#: builtin/checkout-index.c:178 builtin/column.c:31
+#: builtin/submodule--helper.c:1373 builtin/submodule--helper.c:1376
+#: builtin/submodule--helper.c:1384 builtin/submodule--helper.c:1857
+#: builtin/worktree.c:680
+msgid "string"
msgstr ""
-#: builtin/config.c:154
-msgid "show origin of config (file, standard input, blob, command line)"
+#: builtin/checkout-index.c:179
+msgid "when creating files, prepend <string>"
msgstr ""
-#: builtin/config.c:155
-msgid "value"
+#: builtin/checkout-index.c:181
+msgid "copy out the files from named stage"
msgstr ""
-#: builtin/config.c:155
-msgid "with --get, use default value when missing entry"
+#: builtin/checkout.c:31
+msgid "git checkout [<options>] <branch>"
msgstr ""
-#: builtin/config.c:168
-#, c-format
-msgid "wrong number of arguments, should be %d"
+#: builtin/checkout.c:32
+msgid "git checkout [<options>] [<branch>] -- <file>..."
msgstr ""
-#: builtin/config.c:170
-#, c-format
-msgid "wrong number of arguments, should be from %d to %d"
+#: builtin/checkout.c:37
+msgid "git switch [<options>] [<branch>]"
msgstr ""
-#: builtin/config.c:304
-#, c-format
-msgid "invalid key pattern: %s"
+#: builtin/checkout.c:42
+msgid "git restore [<options>] [--source=<branch>] <file>..."
msgstr ""
-#: builtin/config.c:340
+#: builtin/checkout.c:172 builtin/checkout.c:211
#, c-format
-msgid "failed to format default config value: %s"
+msgid "path '%s' does not have our version"
msgstr ""
-#: builtin/config.c:397
+#: builtin/checkout.c:174 builtin/checkout.c:213
#, c-format
-msgid "cannot parse color '%s'"
+msgid "path '%s' does not have their version"
msgstr ""
-#: builtin/config.c:439
-msgid "unable to parse default color value"
+#: builtin/checkout.c:190
+#, c-format
+msgid "path '%s' does not have all necessary versions"
msgstr ""
-#: builtin/config.c:492 builtin/config.c:724
-msgid "not in a git directory"
+#: builtin/checkout.c:240
+#, c-format
+msgid "path '%s' does not have necessary versions"
msgstr ""
-#: builtin/config.c:495
-msgid "writing to stdin is not supported"
+#: builtin/checkout.c:258
+#, c-format
+msgid "path '%s': cannot merge"
msgstr ""
-#: builtin/config.c:498
-msgid "writing config blobs is not supported"
+#: builtin/checkout.c:274
+#, c-format
+msgid "Unable to add merge result for '%s'"
msgstr ""
-#: builtin/config.c:583
+#: builtin/checkout.c:374
#, 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 ""
+msgid "Recreated %d merge conflict"
+msgid_plural "Recreated %d merge conflicts"
+msgstr[0] ""
+msgstr[1] ""
-#: builtin/config.c:606
-msgid "only one config file at a time"
-msgstr ""
+#: builtin/checkout.c:379
+#, c-format
+msgid "Updated %d path from %s"
+msgid_plural "Updated %d paths from %s"
+msgstr[0] ""
+msgstr[1] ""
-#: builtin/config.c:611
-msgid "--local can only be used inside a git repository"
+#: builtin/checkout.c:386
+#, c-format
+msgid "Updated %d path from the index"
+msgid_plural "Updated %d paths from the index"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/checkout.c:409 builtin/checkout.c:412 builtin/checkout.c:415
+#: builtin/checkout.c:419
+#, c-format
+msgid "'%s' cannot be used with updating paths"
msgstr ""
-#: builtin/config.c:614
-msgid "--blob can only be used inside a git repository"
+#: builtin/checkout.c:422 builtin/checkout.c:425
+#, c-format
+msgid "'%s' cannot be used with %s"
msgstr ""
-#: builtin/config.c:633
-msgid "$HOME not set"
+#: builtin/checkout.c:429
+#, c-format
+msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr ""
-#: builtin/config.c:670
-msgid "--get-color and variable type are incoherent"
+#: builtin/checkout.c:433
+#, c-format
+msgid "neither '%s' or '%s' is specified"
msgstr ""
-#: builtin/config.c:675
-msgid "only one action at a time"
+#: builtin/checkout.c:437
+#, c-format
+msgid "'%s' must be used when '%s' is not specified"
msgstr ""
-#: builtin/config.c:688
-msgid "--name-only is only applicable to --list or --get-regexp"
+#: builtin/checkout.c:442 builtin/checkout.c:447
+#, c-format
+msgid "'%s' or '%s' cannot be used with %s"
msgstr ""
-#: builtin/config.c:694
-msgid ""
-"--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
-"list"
+#: builtin/checkout.c:506 builtin/checkout.c:513
+#, c-format
+msgid "path '%s' is unmerged"
msgstr ""
-#: builtin/config.c:700
-msgid "--default is only applicable to --get"
+#: builtin/checkout.c:679
+msgid "you need to resolve your current index first"
msgstr ""
-#: builtin/config.c:713
+#: builtin/checkout.c:729
#, c-format
-msgid "unable to read config file '%s'"
+msgid ""
+"cannot continue with staged changes in the following files:\n"
+"%s"
msgstr ""
-#: builtin/config.c:716
-msgid "error processing config file(s)"
+#: builtin/checkout.c:736
+#, c-format
+msgid "staged changes in the following files may be lost: %s"
msgstr ""
-#: builtin/config.c:726
-msgid "editing stdin is not supported"
+#: builtin/checkout.c:833
+#, c-format
+msgid "Can not do reflog for '%s': %s\n"
msgstr ""
-#: builtin/config.c:728
-msgid "editing blobs is not supported"
+#: builtin/checkout.c:875
+msgid "HEAD is now at"
+msgstr ""
+
+#: builtin/checkout.c:879 builtin/clone.c:714
+msgid "unable to update HEAD"
msgstr ""
-#: builtin/config.c:742
+#: builtin/checkout.c:883
#, c-format
-msgid "cannot create configuration file %s"
+msgid "Reset branch '%s'\n"
msgstr ""
-#: builtin/config.c:755
+#: builtin/checkout.c:886
#, c-format
-msgid ""
-"cannot overwrite multiple values with a single value\n"
-" Use a regexp, --add or --replace-all to change %s."
+msgid "Already on '%s'\n"
msgstr ""
-#: builtin/config.c:829 builtin/config.c:840
+#: builtin/checkout.c:890
#, c-format
-msgid "no such section: %s"
+msgid "Switched to and reset branch '%s'\n"
msgstr ""
-#: builtin/count-objects.c:90
-msgid "git count-objects [-v] [-H | --human-readable]"
+#: builtin/checkout.c:892 builtin/checkout.c:1289
+#, c-format
+msgid "Switched to a new branch '%s'\n"
msgstr ""
-#: builtin/count-objects.c:100
-msgid "print sizes in human readable format"
+#: builtin/checkout.c:894
+#, c-format
+msgid "Switched to branch '%s'\n"
msgstr ""
-#: builtin/describe.c:26
-msgid "git describe [<options>] [<commit-ish>...]"
+#: builtin/checkout.c:945
+#, c-format
+msgid " ... and %d more.\n"
msgstr ""
-#: builtin/describe.c:27
-msgid "git describe [<options>] --dirty"
+#: builtin/checkout.c:951
+#, c-format
+msgid ""
+"Warning: you are leaving %d commit behind, not connected to\n"
+"any of your branches:\n"
+"\n"
+"%s\n"
+msgid_plural ""
+"Warning: you are leaving %d commits behind, not connected to\n"
+"any of your branches:\n"
+"\n"
+"%s\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/checkout.c:970
+#, 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:1005
+msgid "internal error in revision walk"
msgstr ""
-#: builtin/describe.c:62
-msgid "head"
+#: builtin/checkout.c:1009
+msgid "Previous HEAD position was"
msgstr ""
-#: builtin/describe.c:62
-msgid "lightweight"
+#: builtin/checkout.c:1049 builtin/checkout.c:1284
+msgid "You are on a branch yet to be born"
msgstr ""
-#: builtin/describe.c:62
-msgid "annotated"
+#: builtin/checkout.c:1176
+msgid "only one reference expected"
msgstr ""
-#: builtin/describe.c:272
+#: builtin/checkout.c:1193
#, c-format
-msgid "annotated tag %s not available"
+msgid "only one reference expected, %d given."
msgstr ""
-#: builtin/describe.c:276
+#: builtin/checkout.c:1230
#, c-format
-msgid "annotated tag %s has no embedded name"
+msgid ""
+"'%s' could be both a local file and a tracking branch.\n"
+"Please use -- (and optionally --no-guess) to disambiguate"
msgstr ""
-#: builtin/describe.c:278
+#: builtin/checkout.c:1243 builtin/worktree.c:291 builtin/worktree.c:456
#, c-format
-msgid "tag '%s' is really '%s' here"
+msgid "invalid reference: %s"
msgstr ""
-#: builtin/describe.c:322
+#: builtin/checkout.c:1256 builtin/checkout.c:1618
#, c-format
-msgid "no tag exactly matches '%s'"
+msgid "reference is not a tree: %s"
msgstr ""
-#: builtin/describe.c:324
+#: builtin/checkout.c:1303
#, c-format
-msgid "No exact match on refs or tags, searching to describe\n"
+msgid "a branch is expected, got tag '%s'"
msgstr ""
-#: builtin/describe.c:378
+#: builtin/checkout.c:1305
#, c-format
-msgid "finished search at %s\n"
+msgid "a branch is expected, got remote branch '%s'"
msgstr ""
-#: builtin/describe.c:404
+#: builtin/checkout.c:1306 builtin/checkout.c:1314
#, c-format
-msgid ""
-"No annotated tags can describe '%s'.\n"
-"However, there were unannotated tags: try --tags."
+msgid "a branch is expected, got '%s'"
msgstr ""
-#: builtin/describe.c:408
+#: builtin/checkout.c:1309
#, c-format
-msgid ""
-"No tags can describe '%s'.\n"
-"Try --always, or create some tags."
+msgid "a branch is expected, got commit '%s'"
msgstr ""
-#: builtin/describe.c:438
-#, c-format
-msgid "traversed %lu commits\n"
+#: builtin/checkout.c:1325
+msgid ""
+"cannot switch branch while merging\n"
+"Consider \"git merge --quit\" or \"git worktree add\"."
msgstr ""
-#: builtin/describe.c:441
-#, c-format
+#: builtin/checkout.c:1329
msgid ""
-"more than %i tags found; listed %i most recent\n"
-"gave up search at %s\n"
+"cannot switch branch in the middle of an am session\n"
+"Consider \"git am --quit\" or \"git worktree add\"."
msgstr ""
-#: builtin/describe.c:509
-#, c-format
-msgid "describe %s\n"
+#: builtin/checkout.c:1333
+msgid ""
+"cannot switch branch while rebasing\n"
+"Consider \"git rebase --quit\" or \"git worktree add\"."
msgstr ""
-#: builtin/describe.c:512 builtin/log.c:508
-#, c-format
-msgid "Not a valid object name %s"
+#: builtin/checkout.c:1337
+msgid ""
+"cannot switch branch while cherry-picking\n"
+"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
msgstr ""
-#: builtin/describe.c:520
-#, c-format
-msgid "%s is neither a commit nor blob"
+#: builtin/checkout.c:1341
+msgid ""
+"cannot switch branch while reverting\n"
+"Consider \"git revert --quit\" or \"git worktree add\"."
msgstr ""
-#: builtin/describe.c:534
-msgid "find the tag that comes after the commit"
+#: builtin/checkout.c:1345
+msgid "you are switching branch while bisecting"
msgstr ""
-#: builtin/describe.c:535
-msgid "debug search strategy on stderr"
+#: builtin/checkout.c:1352
+msgid "paths cannot be used with switching branches"
msgstr ""
-#: builtin/describe.c:536
-msgid "use any ref"
+#: builtin/checkout.c:1355 builtin/checkout.c:1359 builtin/checkout.c:1363
+#, c-format
+msgid "'%s' cannot be used with switching branches"
msgstr ""
-#: builtin/describe.c:537
-msgid "use any tag, even unannotated"
+#: builtin/checkout.c:1367 builtin/checkout.c:1370 builtin/checkout.c:1373
+#: builtin/checkout.c:1378 builtin/checkout.c:1383
+#, c-format
+msgid "'%s' cannot be used with '%s'"
msgstr ""
-#: builtin/describe.c:538
-msgid "always use long format"
+#: builtin/checkout.c:1380
+#, c-format
+msgid "'%s' cannot take <start-point>"
msgstr ""
-#: builtin/describe.c:539
-msgid "only follow first parent"
+#: builtin/checkout.c:1388
+#, c-format
+msgid "Cannot switch branch to a non-commit '%s'"
msgstr ""
-#: builtin/describe.c:542
-msgid "only output exact matches"
+#: builtin/checkout.c:1395
+msgid "missing branch or commit argument"
msgstr ""
-#: builtin/describe.c:544
-msgid "consider <n> most recent tags (default: 10)"
+#: builtin/checkout.c:1437 builtin/clone.c:91 builtin/fetch.c:151
+#: builtin/merge.c:285 builtin/pull.c:137 builtin/push.c:575
+#: builtin/send-pack.c:174
+msgid "force progress reporting"
msgstr ""
-#: builtin/describe.c:546
-msgid "only consider tags matching <pattern>"
+#: builtin/checkout.c:1438
+msgid "perform a 3-way merge with the new branch"
msgstr ""
-#: builtin/describe.c:548
-msgid "do not consider tags matching <pattern>"
+#: builtin/checkout.c:1439 builtin/log.c:1617 parse-options.h:318
+msgid "style"
msgstr ""
-#: builtin/describe.c:550 builtin/name-rev.c:424
-msgid "show abbreviated commit object as fallback"
+#: builtin/checkout.c:1440
+msgid "conflict style (merge or diff3)"
msgstr ""
-#: builtin/describe.c:551 builtin/describe.c:554
-msgid "mark"
+#: builtin/checkout.c:1452 builtin/worktree.c:504
+msgid "detach HEAD at named commit"
msgstr ""
-#: builtin/describe.c:552
-msgid "append <mark> on dirty working tree (default: \"-dirty\")"
+#: builtin/checkout.c:1453
+msgid "set upstream info for new branch"
msgstr ""
-#: builtin/describe.c:555
-msgid "append <mark> on broken working tree (default: \"-broken\")"
+#: builtin/checkout.c:1455
+msgid "force checkout (throw away local modifications)"
msgstr ""
-#: builtin/describe.c:573
-msgid "--long is incompatible with --abbrev=0"
+#: builtin/checkout.c:1457
+msgid "new-branch"
msgstr ""
-#: builtin/describe.c:602
-msgid "No names found, cannot describe anything."
+#: builtin/checkout.c:1457
+msgid "new unparented branch"
msgstr ""
-#: builtin/describe.c:652
-msgid "--dirty is incompatible with commit-ishes"
+#: builtin/checkout.c:1459 builtin/merge.c:288
+msgid "update ignored files (default)"
msgstr ""
-#: builtin/describe.c:654
-msgid "--broken is incompatible with commit-ishes"
+#: builtin/checkout.c:1462
+msgid "do not check if another worktree is holding the given ref"
msgstr ""
-#: builtin/diff.c:83
-#, c-format
-msgid "'%s': not a regular file or symlink"
+#: builtin/checkout.c:1475
+msgid "checkout our version for unmerged files"
msgstr ""
-#: builtin/diff.c:234
-#, c-format
-msgid "invalid option: %s"
+#: builtin/checkout.c:1478
+msgid "checkout their version for unmerged files"
msgstr ""
-#: builtin/diff.c:363
-msgid "Not a git repository"
+#: builtin/checkout.c:1482
+msgid "do not limit pathspecs to sparse entries only"
msgstr ""
-#: builtin/diff.c:407
-#, c-format
-msgid "invalid object '%s' given."
+#: builtin/checkout.c:1533
+msgid "-b, -B and --orphan are mutually exclusive"
msgstr ""
-#: builtin/diff.c:416
-#, c-format
-msgid "more than two blobs given: '%s'"
+#: builtin/checkout.c:1536
+msgid "-p and --overlay are mutually exclusive"
msgstr ""
-#: builtin/diff.c:421
-#, c-format
-msgid "unhandled object '%s' given."
+#: builtin/checkout.c:1573
+msgid "--track needs a branch name"
msgstr ""
-#: builtin/difftool.c:30
-msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
+#: builtin/checkout.c:1578
+msgid "missing branch name; try -b"
msgstr ""
-#: builtin/difftool.c:260
+#: builtin/checkout.c:1611
#, c-format
-msgid "failed: %d"
+msgid "could not resolve %s"
msgstr ""
-#: builtin/difftool.c:302
-#, c-format
-msgid "could not read symlink %s"
+#: builtin/checkout.c:1623
+msgid "you must specify path(s) to restore"
msgstr ""
-#: builtin/difftool.c:304
+#: builtin/checkout.c:1631
+msgid "invalid path specification"
+msgstr ""
+
+#: builtin/checkout.c:1638
#, c-format
-msgid "could not read symlink file %s"
+msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
msgstr ""
-#: builtin/difftool.c:312
+#: builtin/checkout.c:1642
#, c-format
-msgid "could not read object %s for symlink %s"
+msgid "git checkout: --detach does not take a path argument '%s'"
msgstr ""
-#: builtin/difftool.c:413
+#: builtin/checkout.c:1646
msgid ""
-"combined diff formats('-c' and '--cc') are not supported in\n"
-"directory diff mode('-d' and '--dir-diff')."
+"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
+"checking out of the index."
msgstr ""
-#: builtin/difftool.c:633
+#: builtin/checkout.c:1666
#, c-format
-msgid "both files modified: '%s' and '%s'."
+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/difftool.c:635
-msgid "working tree file has been left."
+#: builtin/checkout.c:1691 builtin/checkout.c:1693 builtin/checkout.c:1733
+#: builtin/checkout.c:1735 builtin/clone.c:121 builtin/remote.c:169
+#: builtin/remote.c:171 builtin/worktree.c:500 builtin/worktree.c:502
+msgid "branch"
msgstr ""
-#: builtin/difftool.c:646
-#, c-format
-msgid "temporary files exist in '%s'."
+#: builtin/checkout.c:1692
+msgid "create and checkout a new branch"
msgstr ""
-#: builtin/difftool.c:647
-msgid "you may want to cleanup or recover these."
+#: builtin/checkout.c:1694
+msgid "create/reset and checkout a branch"
msgstr ""
-#: builtin/difftool.c:696
-msgid "use `diff.guitool` instead of `diff.tool`"
+#: builtin/checkout.c:1695
+msgid "create reflog for new branch"
msgstr ""
-#: builtin/difftool.c:698
-msgid "perform a full-directory diff"
+#: builtin/checkout.c:1697
+msgid "second guess 'git checkout <no-such-branch>' (default)"
msgstr ""
-#: builtin/difftool.c:700
-msgid "do not prompt before launching a diff tool"
+#: builtin/checkout.c:1698
+msgid "use overlay mode (default)"
msgstr ""
-#: builtin/difftool.c:705
-msgid "use symlinks in dir-diff mode"
+#: builtin/checkout.c:1734
+msgid "create and switch to a new branch"
msgstr ""
-#: builtin/difftool.c:706
-msgid "tool"
+#: builtin/checkout.c:1736
+msgid "create/reset and switch to a branch"
msgstr ""
-#: builtin/difftool.c:707
-msgid "use the specified diff tool"
+#: builtin/checkout.c:1738
+msgid "second guess 'git switch <no-such-branch>'"
msgstr ""
-#: builtin/difftool.c:709
-msgid "print a list of diff tools that may be used with `--tool`"
+#: builtin/checkout.c:1740
+msgid "throw away local modifications"
msgstr ""
-#: builtin/difftool.c:712
-msgid ""
-"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
-"code"
+#: builtin/checkout.c:1772
+msgid "which tree-ish to checkout from"
msgstr ""
-#: builtin/difftool.c:715
-msgid "specify a custom command for viewing diffs"
+#: builtin/checkout.c:1774
+msgid "restore the index"
msgstr ""
-#: builtin/difftool.c:739
-msgid "no <tool> given for --tool=<tool>"
+#: builtin/checkout.c:1776
+msgid "restore the working tree (default)"
msgstr ""
-#: builtin/difftool.c:746
-msgid "no <cmd> given for --extcmd=<cmd>"
+#: builtin/checkout.c:1778
+msgid "ignore unmerged entries"
msgstr ""
-#: builtin/fast-export.c:29
-msgid "git fast-export [rev-list-opts]"
+#: builtin/checkout.c:1779
+msgid "use overlay mode"
msgstr ""
-#: builtin/fast-export.c:1006
-msgid "show progress after <n> objects"
+#: builtin/clean.c:28
+msgid ""
+"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
msgstr ""
-#: builtin/fast-export.c:1008
-msgid "select handling of signed tags"
+#: builtin/clean.c:32
+#, c-format
+msgid "Removing %s\n"
msgstr ""
-#: builtin/fast-export.c:1011
-msgid "select handling of tags that tag filtered objects"
+#: builtin/clean.c:33
+#, c-format
+msgid "Would remove %s\n"
msgstr ""
-#: builtin/fast-export.c:1014
-msgid "Dump marks to this file"
+#: builtin/clean.c:34
+#, c-format
+msgid "Skipping repository %s\n"
msgstr ""
-#: builtin/fast-export.c:1016
-msgid "Import marks from this file"
+#: builtin/clean.c:35
+#, c-format
+msgid "Would skip repository %s\n"
msgstr ""
-#: builtin/fast-export.c:1018
-msgid "Fake a tagger when tags lack one"
+#: builtin/clean.c:36
+#, c-format
+msgid "failed to remove %s"
msgstr ""
-#: builtin/fast-export.c:1020
-msgid "Output full tree for each commit"
+#: builtin/clean.c:37
+#, c-format
+msgid "could not lstat %s\n"
msgstr ""
-#: builtin/fast-export.c:1022
-msgid "Use the done feature to terminate the stream"
+#: builtin/clean.c:300 git-add--interactive.perl:593
+#, 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/fast-export.c:1023
-msgid "Skip output of blob data"
+#: builtin/clean.c:304 git-add--interactive.perl:602
+#, 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/fast-export.c:1024
-msgid "refspec"
+#: builtin/clean.c:520 git-add--interactive.perl:568
+#: git-add--interactive.perl:573
+#, c-format, perl-format
+msgid "Huh (%s)?\n"
msgstr ""
-#: builtin/fast-export.c:1025
-msgid "Apply refspec to exported refs"
+#: builtin/clean.c:662
+#, c-format
+msgid "Input ignore patterns>> "
msgstr ""
-#: builtin/fast-export.c:1026
-msgid "anonymize output"
+#: builtin/clean.c:699
+#, c-format
+msgid "WARNING: Cannot find items matched by: %s"
msgstr ""
-#: builtin/fetch.c:27
-msgid "git fetch [<options>] [<repository> [<refspec>...]]"
+#: builtin/clean.c:720
+msgid "Select items to delete"
msgstr ""
-#: builtin/fetch.c:28
-msgid "git fetch [<options>] <group>"
+#. TRANSLATORS: Make sure to keep [y/N] as is
+#: builtin/clean.c:761
+#, c-format
+msgid "Remove %s [y/N]? "
msgstr ""
-#: builtin/fetch.c:29
-msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
+#: builtin/clean.c:786 git-add--interactive.perl:1763
+#, c-format
+msgid "Bye.\n"
msgstr ""
-#: builtin/fetch.c:30
-msgid "git fetch --all [<options>]"
+#: builtin/clean.c:794
+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/fetch.c:112 builtin/pull.c:193
-msgid "fetch from all remotes"
+#: builtin/clean.c:821 git-add--interactive.perl:1849
+msgid "*** Commands ***"
msgstr ""
-#: builtin/fetch.c:114 builtin/pull.c:196
-msgid "append to .git/FETCH_HEAD instead of overwriting"
+#: builtin/clean.c:822 git-add--interactive.perl:1846
+msgid "What now"
msgstr ""
-#: builtin/fetch.c:116 builtin/pull.c:199
-msgid "path to upload pack on remote end"
-msgstr ""
+#: builtin/clean.c:830
+msgid "Would remove the following item:"
+msgid_plural "Would remove the following items:"
+msgstr[0] ""
+msgstr[1] ""
-#: builtin/fetch.c:117 builtin/pull.c:201
-msgid "force overwrite of local branch"
+#: builtin/clean.c:846
+msgid "No more files to clean, exiting."
msgstr ""
-#: builtin/fetch.c:119
-msgid "fetch from multiple remotes"
+#: builtin/clean.c:908
+msgid "do not print names of files removed"
msgstr ""
-#: builtin/fetch.c:121 builtin/pull.c:203
-msgid "fetch all tags and associated objects"
+#: builtin/clean.c:910
+msgid "force"
msgstr ""
-#: builtin/fetch.c:123
-msgid "do not fetch all tags (--no-tags)"
+#: builtin/clean.c:911
+msgid "interactive cleaning"
msgstr ""
-#: builtin/fetch.c:125
-msgid "number of submodules fetched in parallel"
+#: builtin/clean.c:913
+msgid "remove whole directories"
msgstr ""
-#: builtin/fetch.c:127 builtin/pull.c:206
-msgid "prune remote-tracking branches no longer on remote"
+#: builtin/clean.c:914 builtin/describe.c:546 builtin/describe.c:548
+#: builtin/grep.c:899 builtin/log.c:176 builtin/log.c:178
+#: builtin/ls-files.c:557 builtin/name-rev.c:413 builtin/name-rev.c:415
+#: builtin/show-ref.c:179
+msgid "pattern"
msgstr ""
-#: builtin/fetch.c:129
-msgid "prune local tags no longer on remote and clobber changed tags"
+#: builtin/clean.c:915
+msgid "add <pattern> to ignore rules"
msgstr ""
-#: builtin/fetch.c:130 builtin/fetch.c:153 builtin/pull.c:131
-msgid "on-demand"
+#: builtin/clean.c:916
+msgid "remove ignored files, too"
msgstr ""
-#: builtin/fetch.c:131
-msgid "control recursive fetching of submodules"
+#: builtin/clean.c:918
+msgid "remove only ignored files"
msgstr ""
-#: builtin/fetch.c:135 builtin/pull.c:214
-msgid "keep downloaded pack"
+#: builtin/clean.c:936
+msgid "-x and -X cannot be used together"
msgstr ""
-#: builtin/fetch.c:137
-msgid "allow updating of HEAD ref"
+#: builtin/clean.c:940
+msgid ""
+"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
+"clean"
msgstr ""
-#: builtin/fetch.c:140 builtin/fetch.c:146 builtin/pull.c:217
-msgid "deepen history of shallow clone"
+#: builtin/clean.c:943
+msgid ""
+"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
+"refusing to clean"
msgstr ""
-#: builtin/fetch.c:142
-msgid "deepen history of shallow repository based on time"
+#: builtin/clone.c:46
+msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr ""
-#: builtin/fetch.c:148 builtin/pull.c:220
-msgid "convert to a complete repository"
+#: builtin/clone.c:93
+msgid "don't create a checkout"
msgstr ""
-#: builtin/fetch.c:151
-msgid "prepend this to submodule path output"
+#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:489
+msgid "create a bare repository"
msgstr ""
-#: builtin/fetch.c:154
-msgid ""
-"default for recursive fetching of submodules (lower priority than config "
-"files)"
+#: builtin/clone.c:98
+msgid "create a mirror repository (implies bare)"
msgstr ""
-#: builtin/fetch.c:158 builtin/pull.c:223
-msgid "accept refs that update .git/shallow"
+#: builtin/clone.c:100
+msgid "to clone from a local repository"
msgstr ""
-#: builtin/fetch.c:159 builtin/pull.c:225
-msgid "refmap"
+#: builtin/clone.c:102
+msgid "don't use local hardlinks, always copy"
msgstr ""
-#: builtin/fetch.c:160 builtin/pull.c:226
-msgid "specify fetch refmap"
+#: builtin/clone.c:104
+msgid "setup as shared repository"
msgstr ""
-#: builtin/fetch.c:161 builtin/ls-remote.c:77 builtin/push.c:582
-#: builtin/send-pack.c:172
-msgid "server-specific"
+#: builtin/clone.c:107
+msgid "pathspec"
msgstr ""
-#: builtin/fetch.c:161 builtin/ls-remote.c:77 builtin/push.c:582
-#: builtin/send-pack.c:173
-msgid "option to transmit"
+#: builtin/clone.c:107
+msgid "initialize submodules in the clone"
msgstr ""
-#: builtin/fetch.c:167
-msgid "report that we have only objects reachable from this object"
+#: builtin/clone.c:110
+msgid "number of submodules cloned in parallel"
msgstr ""
-#: builtin/fetch.c:418
-msgid "Couldn't find remote ref HEAD"
+#: builtin/clone.c:111 builtin/init-db.c:486
+msgid "template-directory"
msgstr ""
-#: builtin/fetch.c:552
-#, c-format
-msgid "configuration fetch.output contains invalid value %s"
+#: builtin/clone.c:112 builtin/init-db.c:487
+msgid "directory from which templates will be used"
msgstr ""
-#: builtin/fetch.c:645
-#, c-format
-msgid "object %s not found"
+#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1380
+#: builtin/submodule--helper.c:1860
+msgid "reference repository"
msgstr ""
-#: builtin/fetch.c:649
-msgid "[up to date]"
+#: builtin/clone.c:118 builtin/submodule--helper.c:1382
+#: builtin/submodule--helper.c:1862
+msgid "use --reference only while cloning"
msgstr ""
-#: builtin/fetch.c:662 builtin/fetch.c:744
-msgid "[rejected]"
+#: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46
+#: builtin/pack-objects.c:3314 builtin/repack.c:319
+msgid "name"
msgstr ""
-#: builtin/fetch.c:663
-msgid "can't fetch in current branch"
+#: builtin/clone.c:120
+msgid "use <name> instead of 'origin' to track upstream"
msgstr ""
-#: builtin/fetch.c:672
-msgid "[tag update]"
+#: builtin/clone.c:122
+msgid "checkout <branch> instead of the remote's HEAD"
msgstr ""
-#: builtin/fetch.c:673 builtin/fetch.c:708 builtin/fetch.c:724
-#: builtin/fetch.c:739
-msgid "unable to update local ref"
+#: builtin/clone.c:124
+msgid "path to git-upload-pack on the remote"
msgstr ""
-#: builtin/fetch.c:694
-msgid "[new tag]"
+#: builtin/clone.c:125 builtin/fetch.c:152 builtin/grep.c:838
+#: builtin/pull.c:226
+msgid "depth"
msgstr ""
-#: builtin/fetch.c:697
-msgid "[new branch]"
+#: builtin/clone.c:126
+msgid "create a shallow clone of that depth"
msgstr ""
-#: builtin/fetch.c:700
-msgid "[new ref]"
+#: builtin/clone.c:127 builtin/fetch.c:154 builtin/pack-objects.c:3303
+msgid "time"
msgstr ""
-#: builtin/fetch.c:739
-msgid "forced update"
+#: builtin/clone.c:128
+msgid "create a shallow clone since a specific time"
msgstr ""
-#: builtin/fetch.c:744
-msgid "non-fast-forward"
+#: builtin/clone.c:129 builtin/fetch.c:156 builtin/fetch.c:179
+#: builtin/rebase.c:1395
+msgid "revision"
msgstr ""
-#: builtin/fetch.c:790
-#, c-format
-msgid "%s did not send all necessary objects\n"
+#: builtin/clone.c:130 builtin/fetch.c:157
+msgid "deepen history of shallow clone, excluding rev"
msgstr ""
-#: builtin/fetch.c:811
-#, c-format
-msgid "reject %s because shallow roots are not allowed to be updated"
+#: builtin/clone.c:132
+msgid "clone only one branch, HEAD or --branch"
msgstr ""
-#: builtin/fetch.c:900 builtin/fetch.c:1011
-#, c-format
-msgid "From %.*s\n"
+#: builtin/clone.c:134
+msgid "don't clone any tags, and make later fetches not to follow them"
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"
+#: builtin/clone.c:136
+msgid "any cloned submodules will be shallow"
msgstr ""
-#: builtin/fetch.c:981
-#, c-format
-msgid " (%s will become dangling)"
+#: builtin/clone.c:137 builtin/init-db.c:495
+msgid "gitdir"
msgstr ""
-#: builtin/fetch.c:982
-#, c-format
-msgid " (%s has become dangling)"
+#: builtin/clone.c:138 builtin/init-db.c:496
+msgid "separate git dir from working tree"
msgstr ""
-#: builtin/fetch.c:1014
-msgid "[deleted]"
+#: builtin/clone.c:139
+msgid "key=value"
msgstr ""
-#: builtin/fetch.c:1015 builtin/remote.c:1035
-msgid "(none)"
+#: builtin/clone.c:140
+msgid "set config inside the new repository"
msgstr ""
-#: builtin/fetch.c:1038
-#, c-format
-msgid "Refusing to fetch into current branch %s of non-bare repository"
+#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76
+#: builtin/push.c:585 builtin/send-pack.c:172
+msgid "server-specific"
msgstr ""
-#: builtin/fetch.c:1057
-#, c-format
-msgid "Option \"%s\" value \"%s\" is not valid for %s"
+#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76
+#: builtin/push.c:585 builtin/send-pack.c:173
+msgid "option to transmit"
msgstr ""
-#: builtin/fetch.c:1060
-#, c-format
-msgid "Option \"%s\" is ignored for %s\n"
+#: builtin/clone.c:143 builtin/fetch.c:175 builtin/pull.c:239
+#: builtin/push.c:586
+msgid "use IPv4 addresses only"
msgstr ""
-#: builtin/fetch.c:1339
-#, c-format
-msgid "Fetching %s\n"
+#: builtin/clone.c:145 builtin/fetch.c:177 builtin/pull.c:242
+#: builtin/push.c:588
+msgid "use IPv6 addresses only"
msgstr ""
-#: builtin/fetch.c:1341 builtin/remote.c:99
-#, c-format
-msgid "Could not fetch %s"
+#: builtin/clone.c:149
+msgid "any cloned submodules will use their remote-tracking branch"
msgstr ""
-#: builtin/fetch.c:1387 builtin/fetch.c:1555
+#: builtin/clone.c:285
msgid ""
-"--filter can only be used with the remote configured in core.partialClone"
+"No directory name could be guessed.\n"
+"Please specify a directory on the command line"
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."
+#: builtin/clone.c:338
+#, c-format
+msgid "info: Could not add alternate for '%s': %s\n"
msgstr ""
-#: builtin/fetch.c:1447
-msgid "You need to specify a tag name."
+#: builtin/clone.c:411
+#, c-format
+msgid "%s exists and is not a directory"
msgstr ""
-#: builtin/fetch.c:1496
-msgid "Negative depth in --deepen is not supported"
+#: builtin/clone.c:428
+#, c-format
+msgid "failed to start iterator over '%s'"
msgstr ""
-#: builtin/fetch.c:1498
-msgid "--deepen and --depth are mutually exclusive"
+#: builtin/clone.c:453
+#, c-format
+msgid "failed to unlink '%s'"
msgstr ""
-#: builtin/fetch.c:1503
-msgid "--depth and --unshallow cannot be used together"
+#: builtin/clone.c:458
+#, c-format
+msgid "failed to create link '%s'"
msgstr ""
-#: builtin/fetch.c:1505
-msgid "--unshallow on a complete repository does not make sense"
+#: builtin/clone.c:462
+#, c-format
+msgid "failed to copy file to '%s'"
msgstr ""
-#: builtin/fetch.c:1521
-msgid "fetch --all does not take a repository argument"
+#: builtin/clone.c:467
+#, c-format
+msgid "failed to iterate over '%s'"
msgstr ""
-#: builtin/fetch.c:1523
-msgid "fetch --all does not make sense with refspecs"
+#: builtin/clone.c:492
+#, c-format
+msgid "done.\n"
msgstr ""
-#: builtin/fetch.c:1532
-#, c-format
-msgid "No such remote or remote group: %s"
+#: builtin/clone.c:506
+msgid ""
+"Clone succeeded, but checkout failed.\n"
+"You can inspect what was checked out with 'git status'\n"
+"and retry with 'git restore --source=HEAD :/'\n"
msgstr ""
-#: builtin/fetch.c:1539
-msgid "Fetching a group and specifying refspecs does not make sense"
+#: builtin/clone.c:583
+#, c-format
+msgid "Could not find remote branch %s to clone."
msgstr ""
-#: builtin/fmt-merge-msg.c:17
-msgid ""
-"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
+#: builtin/clone.c:702
+#, c-format
+msgid "unable to update %s"
msgstr ""
-#: builtin/fmt-merge-msg.c:671
-msgid "populate log with at most <n> entries from shortlog"
+#: builtin/clone.c:752
+msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr ""
-#: builtin/fmt-merge-msg.c:674
-msgid "alias for --log (deprecated)"
+#: builtin/clone.c:783
+msgid "unable to checkout working tree"
msgstr ""
-#: builtin/fmt-merge-msg.c:677
-msgid "text"
+#: builtin/clone.c:833
+msgid "unable to write parameters to config file"
msgstr ""
-#: builtin/fmt-merge-msg.c:678
-msgid "use <text> as start of message"
+#: builtin/clone.c:896
+msgid "cannot repack to clean up"
msgstr ""
-#: builtin/fmt-merge-msg.c:679
-msgid "file to read from"
+#: builtin/clone.c:898
+msgid "cannot unlink temporary alternates file"
msgstr ""
-#: builtin/for-each-ref.c:10
-msgid "git for-each-ref [<options>] [<pattern>]"
+#: builtin/clone.c:938 builtin/receive-pack.c:1950
+msgid "Too many arguments."
msgstr ""
-#: builtin/for-each-ref.c:11
-msgid "git for-each-ref [--points-at <object>]"
+#: builtin/clone.c:942
+msgid "You must specify a repository to clone."
msgstr ""
-#: builtin/for-each-ref.c:12
-msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]"
+#: builtin/clone.c:955
+#, c-format
+msgid "--bare and --origin %s options are incompatible."
msgstr ""
-#: builtin/for-each-ref.c:13
-msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
+#: builtin/clone.c:958
+msgid "--bare and --separate-git-dir are incompatible."
msgstr ""
-#: builtin/for-each-ref.c:28
-msgid "quote placeholders suitably for shells"
+#: builtin/clone.c:971
+#, c-format
+msgid "repository '%s' does not exist"
msgstr ""
-#: builtin/for-each-ref.c:30
-msgid "quote placeholders suitably for perl"
+#: builtin/clone.c:977 builtin/fetch.c:1660
+#, c-format
+msgid "depth %s is not a positive number"
msgstr ""
-#: builtin/for-each-ref.c:32
-msgid "quote placeholders suitably for python"
+#: builtin/clone.c:987
+#, c-format
+msgid "destination path '%s' already exists and is not an empty directory."
msgstr ""
-#: builtin/for-each-ref.c:34
-msgid "quote placeholders suitably for Tcl"
+#: builtin/clone.c:997
+#, c-format
+msgid "working tree '%s' already exists."
msgstr ""
-#: builtin/for-each-ref.c:37
-msgid "show only <n> matched refs"
+#: builtin/clone.c:1012 builtin/clone.c:1033 builtin/difftool.c:264
+#: builtin/worktree.c:303 builtin/worktree.c:335
+#, c-format
+msgid "could not create leading directories of '%s'"
msgstr ""
-#: builtin/for-each-ref.c:39 builtin/tag.c:422
-msgid "respect format colors"
+#: builtin/clone.c:1017
+#, c-format
+msgid "could not create work tree dir '%s'"
msgstr ""
-#: builtin/for-each-ref.c:43
-msgid "print only refs which points at the given object"
+#: builtin/clone.c:1037
+#, c-format
+msgid "Cloning into bare repository '%s'...\n"
msgstr ""
-#: builtin/for-each-ref.c:45
-msgid "print only refs that are merged"
+#: builtin/clone.c:1039
+#, c-format
+msgid "Cloning into '%s'...\n"
msgstr ""
-#: builtin/for-each-ref.c:46
-msgid "print only refs that are not merged"
+#: builtin/clone.c:1063
+msgid ""
+"clone --recursive is not compatible with both --reference and --reference-if-"
+"able"
msgstr ""
-#: builtin/for-each-ref.c:47
-msgid "print only refs which contain the commit"
+#: builtin/clone.c:1124
+msgid "--depth is ignored in local clones; use file:// instead."
msgstr ""
-#: builtin/for-each-ref.c:48
-msgid "print only refs which don't contain the commit"
+#: builtin/clone.c:1126
+msgid "--shallow-since is ignored in local clones; use file:// instead."
msgstr ""
-#: builtin/fsck.c:574
-msgid "Checking object directories"
+#: builtin/clone.c:1128
+msgid "--shallow-exclude is ignored in local clones; use file:// instead."
msgstr ""
-#: builtin/fsck.c:666
-msgid "git fsck [<options>] [<object>...]"
+#: builtin/clone.c:1130
+msgid "--filter is ignored in local clones; use file:// instead."
msgstr ""
-#: builtin/fsck.c:672
-msgid "show unreachable objects"
+#: builtin/clone.c:1133
+msgid "source repository is shallow, ignoring --local"
msgstr ""
-#: builtin/fsck.c:673
-msgid "show dangling objects"
+#: builtin/clone.c:1138
+msgid "--local is ignored"
msgstr ""
-#: builtin/fsck.c:674
-msgid "report tags"
+#: builtin/clone.c:1215 builtin/clone.c:1223
+#, c-format
+msgid "Remote branch %s not found in upstream %s"
msgstr ""
-#: builtin/fsck.c:675
-msgid "report root nodes"
+#: builtin/clone.c:1226
+msgid "You appear to have cloned an empty repository."
msgstr ""
-#: builtin/fsck.c:676
-msgid "make index objects head nodes"
+#: builtin/column.c:10
+msgid "git column [<options>]"
msgstr ""
-#: builtin/fsck.c:677
-msgid "make reflogs head nodes (default)"
+#: builtin/column.c:27
+msgid "lookup config vars"
msgstr ""
-#: builtin/fsck.c:678
-msgid "also consider packs and alternate objects"
+#: builtin/column.c:28 builtin/column.c:29
+msgid "layout to use"
msgstr ""
-#: builtin/fsck.c:679
-msgid "check only connectivity"
+#: builtin/column.c:30
+msgid "Maximum width"
msgstr ""
-#: builtin/fsck.c:680
-msgid "enable more strict checking"
+#: builtin/column.c:31
+msgid "Padding space on left border"
msgstr ""
-#: builtin/fsck.c:682
-msgid "write dangling objects in .git/lost-found"
+#: builtin/column.c:32
+msgid "Padding space on right border"
msgstr ""
-#: builtin/fsck.c:683 builtin/prune.c:110
-msgid "show progress"
+#: builtin/column.c:33
+msgid "Padding space between columns"
msgstr ""
-#: builtin/fsck.c:684
-msgid "show verbose names for reachable objects"
+#: builtin/column.c:51
+msgid "--command must be the first argument"
msgstr ""
-#: builtin/fsck.c:750
-msgid "Checking objects"
+#: builtin/commit-tree.c:18
+msgid ""
+"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "
+"<file>)...] <tree>"
msgstr ""
-#: builtin/gc.c:34
-msgid "git gc [<options>]"
+#: builtin/commit-tree.c:31
+#, c-format
+msgid "duplicate parent %s ignored"
msgstr ""
-#: builtin/gc.c:90
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:525
#, c-format
-msgid "Failed to fstat %s: %s"
+msgid "not a valid object name %s"
msgstr ""
-#: builtin/gc.c:455
+#: builtin/commit-tree.c:93
#, c-format
-msgid "Can't stat %s"
+msgid "git commit-tree: failed to open '%s'"
msgstr ""
-#: builtin/gc.c:464
+#: builtin/commit-tree.c:96
#, 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"
+msgid "git commit-tree: failed to read '%s'"
msgstr ""
-#: builtin/gc.c:505
-msgid "prune unreferenced objects"
+#: builtin/commit-tree.c:98
+#, c-format
+msgid "git commit-tree: failed to close '%s'"
msgstr ""
-#: builtin/gc.c:507
-msgid "be more thorough (increased runtime)"
+#: builtin/commit-tree.c:111
+msgid "parent"
msgstr ""
-#: builtin/gc.c:508
-msgid "enable auto-gc mode"
+#: builtin/commit-tree.c:112
+msgid "id of a parent commit object"
msgstr ""
-#: builtin/gc.c:511
-msgid "force running gc even if there may be another gc running"
+#: builtin/commit-tree.c:114 builtin/commit.c:1500 builtin/merge.c:270
+#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1460
+#: builtin/tag.c:412
+msgid "message"
msgstr ""
-#: builtin/gc.c:514
-msgid "repack all other packs except the largest pack"
+#: builtin/commit-tree.c:115 builtin/commit.c:1500
+msgid "commit message"
msgstr ""
-#: builtin/gc.c:531
-#, c-format
-msgid "failed to parse gc.logexpiry value %s"
+#: builtin/commit-tree.c:118
+msgid "read commit log message from file"
msgstr ""
-#: builtin/gc.c:542
-#, c-format
-msgid "failed to parse prune expiry value %s"
+#: builtin/commit-tree.c:121 builtin/commit.c:1512 builtin/merge.c:287
+#: builtin/pull.c:194 builtin/revert.c:118
+msgid "GPG sign commit"
msgstr ""
-#: builtin/gc.c:562
-#, c-format
-msgid "Auto packing the repository in background for optimum performance.\n"
+#: builtin/commit-tree.c:133
+msgid "must give exactly one tree"
msgstr ""
-#: builtin/gc.c:564
-#, c-format
-msgid "Auto packing the repository for optimum performance.\n"
+#: builtin/commit-tree.c:140
+msgid "git commit-tree: failed to read"
msgstr ""
-#: builtin/gc.c:565
-#, c-format
-msgid "See \"git help gc\" for manual housekeeping.\n"
+#: builtin/commit.c:41
+msgid "git commit [<options>] [--] <pathspec>..."
msgstr ""
-#: builtin/gc.c:601
-#, c-format
-msgid ""
-"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
+#: builtin/commit.c:46
+msgid "git status [<options>] [--] <pathspec>..."
msgstr ""
-#: builtin/gc.c:652
+#: builtin/commit.c:51
msgid ""
-"There are too many unreachable loose objects; run 'git prune' to remove them."
+"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/grep.c:28
-msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
+#: builtin/commit.c:56
+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/grep.c:226
-#, c-format
-msgid "grep: failed to create thread: %s"
+#: builtin/commit.c:63
+msgid "Otherwise, please use 'git cherry-pick --skip'\n"
msgstr ""
-#: builtin/grep.c:284
-#, c-format
-msgid "invalid number of threads specified (%d) for %s"
+#: builtin/commit.c:66
+msgid ""
+"and then use:\n"
+"\n"
+" git cherry-pick --continue\n"
+"\n"
+"to resume cherry-picking the remaining commits.\n"
+"If you wish to skip this commit, use:\n"
+"\n"
+" git cherry-pick --skip\n"
+"\n"
msgstr ""
-#. 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:2639
-#, c-format
-msgid "no threads support, ignoring %s"
+#: builtin/commit.c:315
+msgid "failed to unpack HEAD tree object"
msgstr ""
-#: builtin/grep.c:461 builtin/grep.c:582 builtin/grep.c:623
-#, c-format
-msgid "unable to read tree (%s)"
+#: builtin/commit.c:356
+msgid "unable to create temporary index"
msgstr ""
-#: builtin/grep.c:638
-#, c-format
-msgid "unable to grep from object of type %s"
+#: builtin/commit.c:362
+msgid "interactive add failed"
msgstr ""
-#: builtin/grep.c:704
-#, c-format
-msgid "switch `%c' expects a numerical value"
+#: builtin/commit.c:376
+msgid "unable to update temporary index"
msgstr ""
-#: builtin/grep.c:791
-msgid "search in index instead of in the work tree"
+#: builtin/commit.c:378
+msgid "Failed to update main cache tree"
msgstr ""
-#: builtin/grep.c:793
-msgid "find in contents not managed by git"
+#: builtin/commit.c:403 builtin/commit.c:426 builtin/commit.c:472
+msgid "unable to write new_index file"
msgstr ""
-#: builtin/grep.c:795
-msgid "search in both tracked and untracked files"
+#: builtin/commit.c:455
+msgid "cannot do a partial commit during a merge."
msgstr ""
-#: builtin/grep.c:797
-msgid "ignore files specified via '.gitignore'"
+#: builtin/commit.c:457
+msgid "cannot do a partial commit during a cherry-pick."
msgstr ""
-#: builtin/grep.c:799
-msgid "recursively search in each submodule"
+#: builtin/commit.c:465
+msgid "cannot read the index"
msgstr ""
-#: builtin/grep.c:802
-msgid "show non-matching lines"
+#: builtin/commit.c:484
+msgid "unable to write temporary index file"
msgstr ""
-#: builtin/grep.c:804
-msgid "case insensitive matching"
+#: builtin/commit.c:582
+#, c-format
+msgid "commit '%s' lacks author header"
msgstr ""
-#: builtin/grep.c:806
-msgid "match patterns only at word boundaries"
+#: builtin/commit.c:584
+#, c-format
+msgid "commit '%s' has malformed author line"
msgstr ""
-#: builtin/grep.c:808
-msgid "process binary files as text"
+#: builtin/commit.c:603
+msgid "malformed --author parameter"
msgstr ""
-#: builtin/grep.c:810
-msgid "don't match patterns in binary files"
+#: builtin/commit.c:656
+msgid ""
+"unable to select a comment character that is not used\n"
+"in the current commit message"
msgstr ""
-#: builtin/grep.c:813
-msgid "process binary files with textconv filters"
+#: builtin/commit.c:694 builtin/commit.c:727 builtin/commit.c:1072
+#, c-format
+msgid "could not lookup commit %s"
msgstr ""
-#: builtin/grep.c:815
-msgid "descend at most <depth> levels"
+#: builtin/commit.c:706 builtin/shortlog.c:319
+#, c-format
+msgid "(reading log message from standard input)\n"
msgstr ""
-#: builtin/grep.c:819
-msgid "use extended POSIX regular expressions"
+#: builtin/commit.c:708
+msgid "could not read log from standard input"
msgstr ""
-#: builtin/grep.c:822
-msgid "use basic POSIX regular expressions (default)"
+#: builtin/commit.c:712
+#, c-format
+msgid "could not read log file '%s'"
msgstr ""
-#: builtin/grep.c:825
-msgid "interpret patterns as fixed strings"
+#: builtin/commit.c:743 builtin/commit.c:759
+msgid "could not read SQUASH_MSG"
msgstr ""
-#: builtin/grep.c:828
-msgid "use Perl-compatible regular expressions"
+#: builtin/commit.c:750
+msgid "could not read MERGE_MSG"
msgstr ""
-#: builtin/grep.c:831
-msgid "show line numbers"
+#: builtin/commit.c:810
+msgid "could not write commit template"
msgstr ""
-#: builtin/grep.c:832
-msgid "show column number of first match"
+#: builtin/commit.c:829
+#, 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/grep.c:833
-msgid "don't show filenames"
+#: builtin/commit.c:834
+#, 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/grep.c:834
-msgid "show filenames"
+#: builtin/commit.c:847
+#, 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/grep.c:836
-msgid "show filenames relative to top directory"
+#: builtin/commit.c:855
+#, 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/grep.c:838
-msgid "show only filenames instead of matching lines"
+#: builtin/commit.c:872
+#, c-format
+msgid "%sAuthor: %.*s <%.*s>"
msgstr ""
-#: builtin/grep.c:840
-msgid "synonym for --files-with-matches"
+#: builtin/commit.c:880
+#, c-format
+msgid "%sDate: %s"
msgstr ""
-#: builtin/grep.c:843
-msgid "show only the names of files without match"
+#: builtin/commit.c:887
+#, c-format
+msgid "%sCommitter: %.*s <%.*s>"
msgstr ""
-#: builtin/grep.c:845
-msgid "print NUL after filenames"
+#: builtin/commit.c:905
+msgid "Cannot read index"
msgstr ""
-#: builtin/grep.c:848
-msgid "show only matching parts of a line"
+#: builtin/commit.c:972
+msgid "Error building trees"
msgstr ""
-#: builtin/grep.c:850
-msgid "show the number of matches instead of matching lines"
+#: builtin/commit.c:986 builtin/tag.c:275
+#, c-format
+msgid "Please supply the message using either -m or -F option.\n"
msgstr ""
-#: builtin/grep.c:851
-msgid "highlight matches"
+#: builtin/commit.c:1030
+#, c-format
+msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr ""
-#: builtin/grep.c:853
-msgid "print empty line between matches from different files"
+#: builtin/commit.c:1044
+#, c-format
+msgid "Invalid ignored mode '%s'"
msgstr ""
-#: builtin/grep.c:855
-msgid "show filename only once above matches from same file"
+#: builtin/commit.c:1062 builtin/commit.c:1304
+#, c-format
+msgid "Invalid untracked files mode '%s'"
msgstr ""
-#: builtin/grep.c:858
-msgid "show <n> context lines before and after matches"
+#: builtin/commit.c:1102
+msgid "--long and -z are incompatible"
msgstr ""
-#: builtin/grep.c:861
-msgid "show <n> context lines before matches"
+#: builtin/commit.c:1146
+msgid "Using both --reset-author and --author does not make sense"
msgstr ""
-#: builtin/grep.c:863
-msgid "show <n> context lines after matches"
+#: builtin/commit.c:1155
+msgid "You have nothing to amend."
msgstr ""
-#: builtin/grep.c:865
-msgid "use <n> worker threads"
+#: builtin/commit.c:1158
+msgid "You are in the middle of a merge -- cannot amend."
msgstr ""
-#: builtin/grep.c:866
-msgid "shortcut for -C NUM"
+#: builtin/commit.c:1160
+msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr ""
-#: builtin/grep.c:869
-msgid "show a line with the function name before matches"
+#: builtin/commit.c:1163
+msgid "Options --squash and --fixup cannot be used together"
msgstr ""
-#: builtin/grep.c:871
-msgid "show the surrounding function"
+#: builtin/commit.c:1173
+msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr ""
-#: builtin/grep.c:874
-msgid "read patterns from file"
+#: builtin/commit.c:1175
+msgid "Option -m cannot be combined with -c/-C/-F."
msgstr ""
-#: builtin/grep.c:876
-msgid "match <pattern>"
+#: builtin/commit.c:1183
+msgid "--reset-author can be used only with -C, -c or --amend."
msgstr ""
-#: builtin/grep.c:878
-msgid "combine patterns specified with -e"
+#: builtin/commit.c:1200
+msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr ""
-#: builtin/grep.c:890
-msgid "indicate hit with exit status without output"
+#: builtin/commit.c:1202
+msgid "No paths with --include/--only does not make sense."
msgstr ""
-#: builtin/grep.c:892
-msgid "show only matches from files that match all patterns"
+#: builtin/commit.c:1208
+#, c-format
+msgid "paths '%s ...' with -a does not make sense"
msgstr ""
-#: builtin/grep.c:894
-msgid "show parse tree for grep expression"
+#: builtin/commit.c:1339 builtin/commit.c:1523
+msgid "show status concisely"
msgstr ""
-#: builtin/grep.c:898
-msgid "pager"
+#: builtin/commit.c:1341 builtin/commit.c:1525
+msgid "show branch information"
msgstr ""
-#: builtin/grep.c:898
-msgid "show matching files in the pager"
+#: builtin/commit.c:1343
+msgid "show stash information"
msgstr ""
-#: builtin/grep.c:902
-msgid "allow calling of grep(1) (ignored by this build)"
+#: builtin/commit.c:1345 builtin/commit.c:1527
+msgid "compute full ahead/behind values"
msgstr ""
-#: builtin/grep.c:966
-msgid "no pattern given"
+#: builtin/commit.c:1347
+msgid "version"
msgstr ""
-#: builtin/grep.c:1002
-msgid "--no-index or --untracked cannot be used with revs"
+#: builtin/commit.c:1347 builtin/commit.c:1529 builtin/push.c:561
+#: builtin/worktree.c:651
+msgid "machine-readable output"
msgstr ""
-#: builtin/grep.c:1009
-#, c-format
-msgid "unable to resolve revision: %s"
+#: builtin/commit.c:1350 builtin/commit.c:1531
+msgid "show status in long format (default)"
msgstr ""
-#: builtin/grep.c:1044 builtin/index-pack.c:1532 builtin/pack-objects.c:2635
-#, c-format
-msgid "invalid number of threads specified (%d)"
+#: builtin/commit.c:1353 builtin/commit.c:1534
+msgid "terminate entries with NUL"
msgstr ""
-#: builtin/grep.c:1049 builtin/pack-objects.c:3289
-msgid "no threads support, ignoring --threads"
+#: builtin/commit.c:1355 builtin/commit.c:1359 builtin/commit.c:1537
+#: builtin/fast-export.c:1125 builtin/fast-export.c:1128
+#: builtin/fast-export.c:1131 builtin/rebase.c:1471 parse-options.h:332
+msgid "mode"
msgstr ""
-#: builtin/grep.c:1073
-msgid "--open-files-in-pager only works on the worktree"
+#: builtin/commit.c:1356 builtin/commit.c:1537
+msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr ""
-#: builtin/grep.c:1096
-msgid "option not supported with --recurse-submodules"
+#: builtin/commit.c:1360
+msgid ""
+"show ignored files, optional modes: traditional, matching, no. (Default: "
+"traditional)"
msgstr ""
-#: builtin/grep.c:1102
-msgid "--cached or --untracked cannot be used with --no-index"
+#: builtin/commit.c:1362 parse-options.h:179
+msgid "when"
msgstr ""
-#: builtin/grep.c:1108
-msgid "--[no-]exclude-standard cannot be used for tracked contents"
+#: builtin/commit.c:1363
+msgid ""
+"ignore changes to submodules, optional when: all, dirty, untracked. "
+"(Default: all)"
msgstr ""
-#: builtin/grep.c:1116
-msgid "both --cached and trees are given"
+#: builtin/commit.c:1365
+msgid "list untracked files in columns"
msgstr ""
-#: builtin/hash-object.c:84
-msgid ""
-"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
-"[--] <file>..."
+#: builtin/commit.c:1366
+msgid "do not detect renames"
msgstr ""
-#: builtin/hash-object.c:85
-msgid "git hash-object --stdin-paths"
+#: builtin/commit.c:1368
+msgid "detect renames, optionally set similarity index"
msgstr ""
-#: builtin/hash-object.c:97
-msgid "type"
+#: builtin/commit.c:1388
+msgid "Unsupported combination of ignored and untracked-files arguments"
msgstr ""
-#: builtin/hash-object.c:97
-msgid "object type"
+#: builtin/commit.c:1493
+msgid "suppress summary after successful commit"
msgstr ""
-#: builtin/hash-object.c:98
-msgid "write the object into the object database"
+#: builtin/commit.c:1494
+msgid "show diff in commit message template"
msgstr ""
-#: builtin/hash-object.c:100
-msgid "read the object from stdin"
+#: builtin/commit.c:1496
+msgid "Commit message options"
msgstr ""
-#: builtin/hash-object.c:102
-msgid "store file as is without filters"
+#: builtin/commit.c:1497 builtin/merge.c:274 builtin/tag.c:414
+msgid "read message from file"
msgstr ""
-#: builtin/hash-object.c:103
-msgid ""
-"just hash any random garbage to create corrupt objects for debugging Git"
+#: builtin/commit.c:1498
+msgid "author"
msgstr ""
-#: builtin/hash-object.c:104
-msgid "process file as it were from this path"
+#: builtin/commit.c:1498
+msgid "override author for commit"
msgstr ""
-#: builtin/help.c:46
-msgid "print all available commands"
+#: builtin/commit.c:1499 builtin/gc.c:539
+msgid "date"
msgstr ""
-#: builtin/help.c:47
-msgid "exclude guides"
+#: builtin/commit.c:1499
+msgid "override date for commit"
msgstr ""
-#: builtin/help.c:48
-msgid "print list of useful guides"
+#: builtin/commit.c:1501 builtin/commit.c:1502 builtin/commit.c:1503
+#: builtin/commit.c:1504 parse-options.h:324 ref-filter.h:92
+msgid "commit"
msgstr ""
-#: builtin/help.c:49
-msgid "print all configuration variable names"
+#: builtin/commit.c:1501
+msgid "reuse and edit message from specified commit"
msgstr ""
-#: builtin/help.c:51
-msgid "show man page"
+#: builtin/commit.c:1502
+msgid "reuse message from specified commit"
msgstr ""
-#: builtin/help.c:52
-msgid "show manual in web browser"
+#: builtin/commit.c:1503
+msgid "use autosquash formatted message to fixup specified commit"
msgstr ""
-#: builtin/help.c:54
-msgid "show info page"
+#: builtin/commit.c:1504
+msgid "use autosquash formatted message to squash specified commit"
msgstr ""
-#: builtin/help.c:56
-msgid "print command description"
+#: builtin/commit.c:1505
+msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr ""
-#: builtin/help.c:61
-msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
+#: builtin/commit.c:1506 builtin/log.c:1564 builtin/merge.c:289
+#: builtin/pull.c:163 builtin/revert.c:110
+msgid "add Signed-off-by:"
msgstr ""
-#: builtin/help.c:73
-#, c-format
-msgid "unrecognized help format '%s'"
+#: builtin/commit.c:1507
+msgid "use specified template file"
msgstr ""
-#: builtin/help.c:100
-msgid "Failed to start emacsclient."
+#: builtin/commit.c:1508
+msgid "force edit of commit"
msgstr ""
-#: builtin/help.c:113
-msgid "Failed to parse emacsclient version."
+#: builtin/commit.c:1510
+msgid "include status in commit message template"
msgstr ""
-#: builtin/help.c:121
-#, c-format
-msgid "emacsclient version '%d' too old (< 22)."
+#: builtin/commit.c:1515
+msgid "Commit contents options"
msgstr ""
-#: builtin/help.c:139 builtin/help.c:161 builtin/help.c:171 builtin/help.c:179
-#, c-format
-msgid "failed to exec '%s'"
+#: builtin/commit.c:1516
+msgid "commit all changed files"
msgstr ""
-#: builtin/help.c:217
-#, c-format
-msgid ""
-"'%s': path for unsupported man viewer.\n"
-"Please consider using 'man.<tool>.cmd' instead."
+#: builtin/commit.c:1517
+msgid "add specified files to index for commit"
msgstr ""
-#: builtin/help.c:229
-#, c-format
-msgid ""
-"'%s': cmd for supported man viewer.\n"
-"Please consider using 'man.<tool>.path' instead."
+#: builtin/commit.c:1518
+msgid "interactively add files"
msgstr ""
-#: builtin/help.c:346
-#, c-format
-msgid "'%s': unknown man viewer."
+#: builtin/commit.c:1519
+msgid "interactively add changes"
msgstr ""
-#: builtin/help.c:363
-msgid "no man viewer handled the request"
+#: builtin/commit.c:1520
+msgid "commit only specified files"
msgstr ""
-#: builtin/help.c:371
-msgid "no info viewer handled the request"
+#: builtin/commit.c:1521
+msgid "bypass pre-commit and commit-msg hooks"
msgstr ""
-#: builtin/help.c:418
-#, c-format
-msgid "'%s' is aliased to '%s'"
+#: builtin/commit.c:1522
+msgid "show what would be committed"
msgstr ""
-#: builtin/help.c:445 builtin/help.c:475
-#, c-format
-msgid "usage: %s%s"
+#: builtin/commit.c:1535
+msgid "amend previous commit"
msgstr ""
-#: builtin/help.c:459
-msgid "'git help config' for more information"
+#: builtin/commit.c:1536
+msgid "bypass post-rewrite hook"
msgstr ""
-#: builtin/index-pack.c:208
-#, c-format
-msgid "object type mismatch at %s"
+#: builtin/commit.c:1541
+msgid "ok to record an empty change"
msgstr ""
-#: builtin/index-pack.c:228
-#, c-format
-msgid "did not receive expected object %s"
+#: builtin/commit.c:1543
+msgid "ok to record a change with an empty message"
msgstr ""
-#: builtin/index-pack.c:231
+#: builtin/commit.c:1616
#, c-format
-msgid "object %s: expected type %s, found %s"
+msgid "Corrupt MERGE_HEAD file (%s)"
+msgstr ""
+
+#: builtin/commit.c:1623
+msgid "could not read MERGE_MODE"
msgstr ""
-#: builtin/index-pack.c:273
+#: builtin/commit.c:1642
#, c-format
-msgid "cannot fill %d byte"
-msgid_plural "cannot fill %d bytes"
-msgstr[0] ""
-msgstr[1] ""
+msgid "could not read commit message: %s"
+msgstr ""
-#: builtin/index-pack.c:283
-msgid "early EOF"
+#: builtin/commit.c:1649
+#, c-format
+msgid "Aborting commit due to empty commit message.\n"
msgstr ""
-#: builtin/index-pack.c:284
-msgid "read error on input"
+#: builtin/commit.c:1654
+#, c-format
+msgid "Aborting commit; you did not edit the message.\n"
msgstr ""
-#: builtin/index-pack.c:296
-msgid "used more bytes than were available"
+#: builtin/commit.c:1688
+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 restore --staged :/\" to recover."
msgstr ""
-#: builtin/index-pack.c:303 builtin/pack-objects.c:590
-msgid "pack too large for current definition of off_t"
+#: builtin/commit-graph.c:11
+msgid "git commit-graph [--object-dir <objdir>]"
msgstr ""
-#: builtin/index-pack.c:306 builtin/unpack-objects.c:94
-msgid "pack exceeds maximum allowed size"
+#: builtin/commit-graph.c:12 builtin/commit-graph.c:24
+msgid "git commit-graph read [--object-dir <objdir>]"
msgstr ""
-#: builtin/index-pack.c:321
-#, c-format
-msgid "unable to create '%s'"
+#: builtin/commit-graph.c:13 builtin/commit-graph.c:19
+msgid "git commit-graph verify [--object-dir <objdir>] [--shallow]"
msgstr ""
-#: builtin/index-pack.c:327
-#, c-format
-msgid "cannot open packfile '%s'"
+#: builtin/commit-graph.c:14 builtin/commit-graph.c:29
+msgid ""
+"git commit-graph write [--object-dir <objdir>] [--append|--split] [--"
+"reachable|--stdin-packs|--stdin-commits] <split options>"
msgstr ""
-#: builtin/index-pack.c:341
-msgid "pack signature mismatch"
+#: builtin/commit-graph.c:54 builtin/commit-graph.c:100
+#: builtin/commit-graph.c:161 builtin/commit-graph.c:237 builtin/fetch.c:163
+#: builtin/log.c:1584
+msgid "dir"
msgstr ""
-#: builtin/index-pack.c:343
-#, c-format
-msgid "pack version %<PRIu32> unsupported"
+#: builtin/commit-graph.c:55 builtin/commit-graph.c:101
+#: builtin/commit-graph.c:162 builtin/commit-graph.c:238
+msgid "The object directory to store the graph"
msgstr ""
-#: builtin/index-pack.c:361
-#, c-format
-msgid "pack has bad object at offset %<PRIuMAX>: %s"
+#: builtin/commit-graph.c:57
+msgid "if the commit-graph is split, only verify the tip file"
msgstr ""
-#: builtin/index-pack.c:482
+#: builtin/commit-graph.c:73 builtin/commit-graph.c:116
#, c-format
-msgid "inflate returned %d"
+msgid "Could not open commit-graph '%s'"
msgstr ""
-#: builtin/index-pack.c:531
-msgid "offset value overflow for delta base object"
+#: builtin/commit-graph.c:164
+msgid "start walk at all refs"
msgstr ""
-#: builtin/index-pack.c:539
-msgid "delta base offset is out of bound"
+#: builtin/commit-graph.c:166
+msgid "scan pack-indexes listed by stdin for commits"
msgstr ""
-#: builtin/index-pack.c:547
-#, c-format
-msgid "unknown object type %d"
+#: builtin/commit-graph.c:168
+msgid "start walk at commits listed by stdin"
msgstr ""
-#: builtin/index-pack.c:578
-msgid "cannot pread pack file"
+#: builtin/commit-graph.c:170
+msgid "include all commits already in the commit-graph file"
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/index-pack.c:606
-msgid "serious inflate inconsistency"
+#: builtin/commit-graph.c:172
+msgid "allow writing an incremental commit-graph file"
msgstr ""
-#: 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 !"
+#: builtin/commit-graph.c:174 builtin/commit-graph.c:178
+msgid "maximum number of commits in a non-base split commit-graph"
msgstr ""
-#: 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"
+#: builtin/commit-graph.c:176
+msgid "maximum ratio between two levels of a split commit-graph"
msgstr ""
-#: builtin/index-pack.c:817
-#, c-format
-msgid "cannot read existing object info %s"
+#: builtin/commit-graph.c:191
+msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
msgstr ""
-#: builtin/index-pack.c:825
-#, c-format
-msgid "cannot read existing object %s"
+#: builtin/config.c:11
+msgid "git config [<options>]"
msgstr ""
-#: builtin/index-pack.c:839
+#: builtin/config.c:103 builtin/env--helper.c:23
#, c-format
-msgid "invalid blob object %s"
+msgid "unrecognized --type argument, %s"
msgstr ""
-#: builtin/index-pack.c:842 builtin/index-pack.c:861
-msgid "fsck error in packed object"
+#: builtin/config.c:115
+msgid "only one type at a time"
msgstr ""
-#: builtin/index-pack.c:858
-#, c-format
-msgid "invalid %s"
+#: builtin/config.c:124
+msgid "Config file location"
msgstr ""
-#: builtin/index-pack.c:863
-#, c-format
-msgid "Not all child objects of %s are reachable"
+#: builtin/config.c:125
+msgid "use global config file"
msgstr ""
-#: builtin/index-pack.c:935 builtin/index-pack.c:966
-msgid "failed to apply delta"
+#: builtin/config.c:126
+msgid "use system config file"
msgstr ""
-#: builtin/index-pack.c:1136
-msgid "Receiving objects"
+#: builtin/config.c:127
+msgid "use repository config file"
msgstr ""
-#: builtin/index-pack.c:1136
-msgid "Indexing objects"
+#: builtin/config.c:128
+msgid "use per-worktree config file"
msgstr ""
-#: builtin/index-pack.c:1170
-msgid "pack is corrupted (SHA1 mismatch)"
+#: builtin/config.c:129
+msgid "use given config file"
msgstr ""
-#: builtin/index-pack.c:1175
-msgid "cannot fstat packfile"
+#: builtin/config.c:130
+msgid "blob-id"
msgstr ""
-#: builtin/index-pack.c:1178
-msgid "pack has junk at the end"
+#: builtin/config.c:130
+msgid "read config from given blob object"
msgstr ""
-#: builtin/index-pack.c:1190
-msgid "confusion beyond insanity in parse_pack_objects()"
+#: builtin/config.c:131
+msgid "Action"
msgstr ""
-#: builtin/index-pack.c:1213
-msgid "Resolving deltas"
+#: builtin/config.c:132
+msgid "get value: name [value-regex]"
msgstr ""
-#: builtin/index-pack.c:1224 builtin/pack-objects.c:2410
-#, c-format
-msgid "unable to create thread: %s"
+#: builtin/config.c:133
+msgid "get all values: key [value-regex]"
msgstr ""
-#: builtin/index-pack.c:1266
-msgid "confusion beyond insanity"
+#: builtin/config.c:134
+msgid "get values for regexp: name-regex [value-regex]"
msgstr ""
-#: builtin/index-pack.c:1272
-#, c-format
-msgid "completed with %d local object"
-msgid_plural "completed with %d local objects"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/index-pack.c:1284
-#, c-format
-msgid "Unexpected tail checksum for %s (disk corruption?)"
+#: builtin/config.c:135
+msgid "get value specific for the URL: section[.var] URL"
msgstr ""
-#: builtin/index-pack.c:1288
-#, c-format
-msgid "pack has %d unresolved delta"
-msgid_plural "pack has %d unresolved deltas"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/index-pack.c:1312
-#, c-format
-msgid "unable to deflate appended object (%d)"
+#: builtin/config.c:136
+msgid "replace all matching variables: name value [value_regex]"
msgstr ""
-#: builtin/index-pack.c:1389
-#, c-format
-msgid "local object %s is corrupt"
+#: builtin/config.c:137
+msgid "add a new variable: name value"
msgstr ""
-#: builtin/index-pack.c:1403
-#, c-format
-msgid "packfile name '%s' does not end with '.pack'"
+#: builtin/config.c:138
+msgid "remove a variable: name [value-regex]"
msgstr ""
-#: builtin/index-pack.c:1428
-#, c-format
-msgid "cannot write %s file '%s'"
+#: builtin/config.c:139
+msgid "remove all matches: name [value-regex]"
msgstr ""
-#: builtin/index-pack.c:1436
-#, c-format
-msgid "cannot close written %s file '%s'"
+#: builtin/config.c:140
+msgid "rename section: old-name new-name"
msgstr ""
-#: builtin/index-pack.c:1460
-msgid "error while closing pack file"
+#: builtin/config.c:141
+msgid "remove a section: name"
msgstr ""
-#: builtin/index-pack.c:1474
-msgid "cannot store pack file"
+#: builtin/config.c:142
+msgid "list all"
msgstr ""
-#: builtin/index-pack.c:1482
-msgid "cannot store index file"
+#: builtin/config.c:143
+msgid "open an editor"
msgstr ""
-#: builtin/index-pack.c:1526 builtin/pack-objects.c:2648
-#, c-format
-msgid "bad pack.indexversion=%<PRIu32>"
+#: builtin/config.c:144
+msgid "find the color configured: slot [default]"
msgstr ""
-#: builtin/index-pack.c:1595
-#, c-format
-msgid "Cannot open existing pack file '%s'"
+#: builtin/config.c:145
+msgid "find the color setting: slot [stdout-is-tty]"
msgstr ""
-#: builtin/index-pack.c:1597
-#, c-format
-msgid "Cannot open existing pack idx file for '%s'"
+#: builtin/config.c:146
+msgid "Type"
msgstr ""
-#: builtin/index-pack.c:1645
-#, c-format
-msgid "non delta: %d object"
-msgid_plural "non delta: %d objects"
-msgstr[0] ""
-msgstr[1] ""
+#: builtin/config.c:147 builtin/env--helper.c:38
+msgid "value is given this type"
+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/config.c:148
+msgid "value is \"true\" or \"false\""
+msgstr ""
-#: builtin/index-pack.c:1689
-msgid "Cannot come back to cwd"
+#: builtin/config.c:149
+msgid "value is decimal number"
msgstr ""
-#: 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"
+#: builtin/config.c:150
+msgid "value is --bool or --int"
msgstr ""
-#: builtin/index-pack.c:1779
-msgid "--fix-thin cannot be used without --stdin"
+#: builtin/config.c:151
+msgid "value is a path (file or directory name)"
msgstr ""
-#: builtin/index-pack.c:1781
-msgid "--stdin requires a git repository"
+#: builtin/config.c:152
+msgid "value is an expiry date"
msgstr ""
-#: builtin/index-pack.c:1787
-msgid "--verify with no packfile name given"
+#: builtin/config.c:153
+msgid "Other"
msgstr ""
-#: builtin/index-pack.c:1837 builtin/unpack-objects.c:580
-msgid "fsck error in pack objects"
+#: builtin/config.c:154
+msgid "terminate values with NUL byte"
msgstr ""
-#: builtin/init-db.c:55
-#, c-format
-msgid "cannot stat '%s'"
+#: builtin/config.c:155
+msgid "show variable names only"
msgstr ""
-#: builtin/init-db.c:61
-#, c-format
-msgid "cannot stat template '%s'"
+#: builtin/config.c:156
+msgid "respect include directives on lookup"
msgstr ""
-#: builtin/init-db.c:66
-#, c-format
-msgid "cannot opendir '%s'"
+#: builtin/config.c:157
+msgid "show origin of config (file, standard input, blob, command line)"
msgstr ""
-#: builtin/init-db.c:78
-#, c-format
-msgid "cannot readlink '%s'"
+#: builtin/config.c:158 builtin/env--helper.c:40
+msgid "value"
msgstr ""
-#: builtin/init-db.c:80
-#, c-format
-msgid "cannot symlink '%s' '%s'"
+#: builtin/config.c:158
+msgid "with --get, use default value when missing entry"
msgstr ""
-#: builtin/init-db.c:86
+#: builtin/config.c:172
#, c-format
-msgid "cannot copy '%s' to '%s'"
+msgid "wrong number of arguments, should be %d"
msgstr ""
-#: builtin/init-db.c:90
+#: builtin/config.c:174
#, c-format
-msgid "ignoring template %s"
+msgid "wrong number of arguments, should be from %d to %d"
msgstr ""
-#: builtin/init-db.c:121
+#: builtin/config.c:308
#, c-format
-msgid "templates not found in %s"
+msgid "invalid key pattern: %s"
msgstr ""
-#: builtin/init-db.c:136
+#: builtin/config.c:344
#, c-format
-msgid "not copying templates from '%s': %s"
+msgid "failed to format default config value: %s"
msgstr ""
-#: builtin/init-db.c:329
+#: builtin/config.c:401
#, c-format
-msgid "unable to handle file type %d"
+msgid "cannot parse color '%s'"
msgstr ""
-#: builtin/init-db.c:332
-#, c-format
-msgid "unable to move %s to %s"
+#: builtin/config.c:443
+msgid "unable to parse default color value"
msgstr ""
-#: builtin/init-db.c:349 builtin/init-db.c:352
-#, c-format
-msgid "%s already exists"
+#: builtin/config.c:496 builtin/config.c:742
+msgid "not in a git directory"
msgstr ""
-#: builtin/init-db.c:405
-#, c-format
-msgid "Reinitialized existing shared Git repository in %s%s\n"
+#: builtin/config.c:499
+msgid "writing to stdin is not supported"
msgstr ""
-#: builtin/init-db.c:406
-#, c-format
-msgid "Reinitialized existing Git repository in %s%s\n"
+#: builtin/config.c:502
+msgid "writing config blobs is not supported"
msgstr ""
-#: builtin/init-db.c:410
+#: builtin/config.c:587
#, c-format
-msgid "Initialized empty shared Git repository in %s%s\n"
+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/init-db.c:411
-#, c-format
-msgid "Initialized empty Git repository in %s%s\n"
+#: builtin/config.c:611
+msgid "only one config file at a time"
msgstr ""
-#: builtin/init-db.c:459
-msgid ""
-"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
-"shared[=<permissions>]] [<directory>]"
+#: builtin/config.c:616
+msgid "--local can only be used inside a git repository"
msgstr ""
-#: builtin/init-db.c:482
-msgid "permissions"
+#: builtin/config.c:619
+msgid "--blob can only be used inside a git repository"
msgstr ""
-#: builtin/init-db.c:483
-msgid "specify that the git repository is to be shared amongst several users"
+#: builtin/config.c:638
+msgid "$HOME not set"
msgstr ""
-#: builtin/init-db.c:517 builtin/init-db.c:522
-#, c-format
-msgid "cannot mkdir %s"
+#: builtin/config.c:658
+msgid ""
+"--worktree cannot be used with multiple working trees unless the config\n"
+"extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n"
+"section in \"git help worktree\" for details"
msgstr ""
-#: builtin/init-db.c:526
-#, c-format
-msgid "cannot chdir to %s"
+#: builtin/config.c:688
+msgid "--get-color and variable type are incoherent"
msgstr ""
-#: builtin/init-db.c:547
-#, c-format
-msgid ""
-"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
-"dir=<directory>)"
+#: builtin/config.c:693
+msgid "only one action at a time"
msgstr ""
-#: builtin/init-db.c:575
-#, c-format
-msgid "Cannot access work tree '%s'"
+#: builtin/config.c:706
+msgid "--name-only is only applicable to --list or --get-regexp"
msgstr ""
-#: builtin/interpret-trailers.c:15
+#: builtin/config.c:712
msgid ""
-"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
-"<token>[(=|:)<value>])...] [<file>...]"
+"--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
+"list"
msgstr ""
-#: builtin/interpret-trailers.c:92
-msgid "edit files in place"
+#: builtin/config.c:718
+msgid "--default is only applicable to --get"
msgstr ""
-#: builtin/interpret-trailers.c:93
-msgid "trim empty trailers"
+#: builtin/config.c:731
+#, c-format
+msgid "unable to read config file '%s'"
msgstr ""
-#: builtin/interpret-trailers.c:96
-msgid "where to place the new trailer"
+#: builtin/config.c:734
+msgid "error processing config file(s)"
msgstr ""
-#: builtin/interpret-trailers.c:98
-msgid "action if trailer already exists"
+#: builtin/config.c:744
+msgid "editing stdin is not supported"
msgstr ""
-#: builtin/interpret-trailers.c:100
-msgid "action if trailer is missing"
+#: builtin/config.c:746
+msgid "editing blobs is not supported"
msgstr ""
-#: builtin/interpret-trailers.c:102
-msgid "output only the trailers"
+#: builtin/config.c:760
+#, c-format
+msgid "cannot create configuration file %s"
msgstr ""
-#: builtin/interpret-trailers.c:103
-msgid "do not apply config rules"
+#: builtin/config.c:773
+#, c-format
+msgid ""
+"cannot overwrite multiple values with a single value\n"
+" Use a regexp, --add or --replace-all to change %s."
msgstr ""
-#: builtin/interpret-trailers.c:104
-msgid "join whitespace-continued values"
+#: builtin/config.c:847 builtin/config.c:858
+#, c-format
+msgid "no such section: %s"
msgstr ""
-#: builtin/interpret-trailers.c:105
-msgid "set parsing options"
+#: builtin/count-objects.c:90
+msgid "git count-objects [-v] [-H | --human-readable]"
msgstr ""
-#: builtin/interpret-trailers.c:107
-msgid "trailer"
+#: builtin/count-objects.c:100
+msgid "print sizes in human readable format"
msgstr ""
-#: builtin/interpret-trailers.c:108
-msgid "trailer(s) to add"
+#: builtin/describe.c:27
+msgid "git describe [<options>] [<commit-ish>...]"
msgstr ""
-#: builtin/interpret-trailers.c:117
-msgid "--trailer with --only-input does not make sense"
+#: builtin/describe.c:28
+msgid "git describe [<options>] --dirty"
msgstr ""
-#: builtin/interpret-trailers.c:127
-msgid "no input file given for in-place editing"
+#: builtin/describe.c:63
+msgid "head"
msgstr ""
-#: builtin/log.c:51
-msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
+#: builtin/describe.c:63
+msgid "lightweight"
msgstr ""
-#: builtin/log.c:52
-msgid "git show [<options>] <object>..."
+#: builtin/describe.c:63
+msgid "annotated"
msgstr ""
-#: builtin/log.c:96
+#: builtin/describe.c:273
#, c-format
-msgid "invalid --decorate option: %s"
+msgid "annotated tag %s not available"
msgstr ""
-#: builtin/log.c:157
-msgid "suppress diff output"
+#: builtin/describe.c:277
+#, c-format
+msgid "annotated tag %s has no embedded name"
msgstr ""
-#: builtin/log.c:158
-msgid "show source"
+#: builtin/describe.c:279
+#, c-format
+msgid "tag '%s' is really '%s' here"
msgstr ""
-#: builtin/log.c:159
-msgid "Use mail map file"
+#: builtin/describe.c:323
+#, c-format
+msgid "no tag exactly matches '%s'"
msgstr ""
-#: builtin/log.c:161
-msgid "only decorate refs that match <pattern>"
+#: builtin/describe.c:325
+#, c-format
+msgid "No exact match on refs or tags, searching to describe\n"
msgstr ""
-#: builtin/log.c:163
-msgid "do not decorate refs that match <pattern>"
+#: builtin/describe.c:379
+#, c-format
+msgid "finished search at %s\n"
msgstr ""
-#: builtin/log.c:164
-msgid "decorate options"
+#: builtin/describe.c:405
+#, c-format
+msgid ""
+"No annotated tags can describe '%s'.\n"
+"However, there were unannotated tags: try --tags."
msgstr ""
-#: builtin/log.c:167
-msgid "Process line range n,m in file, counting from 1"
+#: builtin/describe.c:409
+#, c-format
+msgid ""
+"No tags can describe '%s'.\n"
+"Try --always, or create some tags."
msgstr ""
-#: builtin/log.c:265
+#: builtin/describe.c:439
#, c-format
-msgid "Final output: %d %s\n"
+msgid "traversed %lu commits\n"
msgstr ""
-#: builtin/log.c:516
+#: builtin/describe.c:442
#, c-format
-msgid "git show %s: bad file"
+msgid ""
+"more than %i tags found; listed %i most recent\n"
+"gave up search at %s\n"
msgstr ""
-#: builtin/log.c:531 builtin/log.c:625
+#: builtin/describe.c:510
#, c-format
-msgid "Could not read object %s"
+msgid "describe %s\n"
msgstr ""
-#: builtin/log.c:649
+#: builtin/describe.c:513
#, c-format
-msgid "Unknown type: %d"
+msgid "Not a valid object name %s"
msgstr ""
-#: builtin/log.c:770
-msgid "format.headers without value"
+#: builtin/describe.c:521
+#, c-format
+msgid "%s is neither a commit nor blob"
msgstr ""
-#: builtin/log.c:871
-msgid "name of output directory is too long"
+#: builtin/describe.c:535
+msgid "find the tag that comes after the commit"
msgstr ""
-#: builtin/log.c:887
-#, c-format
-msgid "Cannot open patch file %s"
+#: builtin/describe.c:536
+msgid "debug search strategy on stderr"
msgstr ""
-#: builtin/log.c:904
-msgid "Need exactly one range."
+#: builtin/describe.c:537
+msgid "use any ref"
msgstr ""
-#: builtin/log.c:914
-msgid "Not a range."
+#: builtin/describe.c:538
+msgid "use any tag, even unannotated"
msgstr ""
-#: builtin/log.c:1020
-msgid "Cover letter needs email format"
+#: builtin/describe.c:539
+msgid "always use long format"
msgstr ""
-#: builtin/log.c:1101
-#, c-format
-msgid "insane in-reply-to: %s"
+#: builtin/describe.c:540
+msgid "only follow first parent"
msgstr ""
-#: builtin/log.c:1128
-msgid "git format-patch [<options>] [<since> | <revision-range>]"
+#: builtin/describe.c:543
+msgid "only output exact matches"
msgstr ""
-#: builtin/log.c:1178
-msgid "Two output directories?"
+#: builtin/describe.c:545
+msgid "consider <n> most recent tags (default: 10)"
msgstr ""
-#: builtin/log.c:1285 builtin/log.c:1945 builtin/log.c:1947 builtin/log.c:1959
-#, c-format
-msgid "Unknown commit %s"
+#: builtin/describe.c:547
+msgid "only consider tags matching <pattern>"
msgstr ""
-#: builtin/log.c:1295 builtin/notes.c:889 builtin/tag.c:524
-#, c-format
-msgid "Failed to resolve '%s' as a valid ref."
+#: builtin/describe.c:549
+msgid "do not consider tags matching <pattern>"
msgstr ""
-#: builtin/log.c:1300
-msgid "Could not find exact merge base."
+#: builtin/describe.c:551 builtin/name-rev.c:422
+msgid "show abbreviated commit object as fallback"
msgstr ""
-#: 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."
+#: builtin/describe.c:552 builtin/describe.c:555
+msgid "mark"
msgstr ""
-#: builtin/log.c:1324
-msgid "Failed to find exact merge base"
+#: builtin/describe.c:553
+msgid "append <mark> on dirty working tree (default: \"-dirty\")"
msgstr ""
-#: builtin/log.c:1335
-msgid "base commit should be the ancestor of revision list"
+#: builtin/describe.c:556
+msgid "append <mark> on broken working tree (default: \"-broken\")"
msgstr ""
-#: builtin/log.c:1339
-msgid "base commit shouldn't be in revision list"
+#: builtin/describe.c:574
+msgid "--long is incompatible with --abbrev=0"
msgstr ""
-#: builtin/log.c:1392
-msgid "cannot get patch id"
+#: builtin/describe.c:603
+msgid "No names found, cannot describe anything."
msgstr ""
-#: builtin/log.c:1452
-msgid "use [PATCH n/m] even with a single patch"
+#: builtin/describe.c:654
+msgid "--dirty is incompatible with commit-ishes"
msgstr ""
-#: builtin/log.c:1455
-msgid "use [PATCH] even with multiple patches"
+#: builtin/describe.c:656
+msgid "--broken is incompatible with commit-ishes"
msgstr ""
-#: builtin/log.c:1459
-msgid "print patches to standard out"
+#: builtin/diff.c:84
+#, c-format
+msgid "'%s': not a regular file or symlink"
msgstr ""
-#: builtin/log.c:1461
-msgid "generate a cover letter"
+#: builtin/diff.c:235
+#, c-format
+msgid "invalid option: %s"
msgstr ""
-#: builtin/log.c:1463
-msgid "use simple number sequence for output file names"
+#: builtin/diff.c:350
+msgid "Not a git repository"
msgstr ""
-#: builtin/log.c:1464
-msgid "sfx"
+#: builtin/diff.c:394
+#, c-format
+msgid "invalid object '%s' given."
msgstr ""
-#: builtin/log.c:1465
-msgid "use <sfx> instead of '.patch'"
+#: builtin/diff.c:403
+#, c-format
+msgid "more than two blobs given: '%s'"
msgstr ""
-#: builtin/log.c:1467
-msgid "start numbering patches at <n> instead of 1"
+#: builtin/diff.c:408
+#, c-format
+msgid "unhandled object '%s' given."
msgstr ""
-#: builtin/log.c:1469
-msgid "mark the series as Nth re-roll"
+#: builtin/difftool.c:30
+msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
msgstr ""
-#: builtin/log.c:1471
-msgid "Use [RFC PATCH] instead of [PATCH]"
+#: builtin/difftool.c:253
+#, c-format
+msgid "failed: %d"
msgstr ""
-#: builtin/log.c:1474
-msgid "Use [<prefix>] instead of [PATCH]"
+#: builtin/difftool.c:295
+#, c-format
+msgid "could not read symlink %s"
msgstr ""
-#: builtin/log.c:1477
-msgid "store resulting files in <dir>"
+#: builtin/difftool.c:297
+#, c-format
+msgid "could not read symlink file %s"
msgstr ""
-#: builtin/log.c:1480
-msgid "don't strip/add [PATCH]"
+#: builtin/difftool.c:305
+#, c-format
+msgid "could not read object %s for symlink %s"
msgstr ""
-#: builtin/log.c:1483
-msgid "don't output binary diffs"
+#: builtin/difftool.c:406
+msgid ""
+"combined diff formats('-c' and '--cc') are not supported in\n"
+"directory diff mode('-d' and '--dir-diff')."
msgstr ""
-#: builtin/log.c:1485
-msgid "output all-zero hash in From header"
+#: builtin/difftool.c:626
+#, c-format
+msgid "both files modified: '%s' and '%s'."
msgstr ""
-#: builtin/log.c:1487
-msgid "don't include a patch matching a commit upstream"
+#: builtin/difftool.c:628
+msgid "working tree file has been left."
msgstr ""
-#: builtin/log.c:1489
-msgid "show patch format instead of default (patch + stat)"
+#: builtin/difftool.c:639
+#, c-format
+msgid "temporary files exist in '%s'."
msgstr ""
-#: builtin/log.c:1491
-msgid "Messaging"
+#: builtin/difftool.c:640
+msgid "you may want to cleanup or recover these."
msgstr ""
-#: builtin/log.c:1492
-msgid "header"
+#: builtin/difftool.c:689
+msgid "use `diff.guitool` instead of `diff.tool`"
msgstr ""
-#: builtin/log.c:1493
-msgid "add email header"
+#: builtin/difftool.c:691
+msgid "perform a full-directory diff"
msgstr ""
-#: builtin/log.c:1494 builtin/log.c:1496
-msgid "email"
+#: builtin/difftool.c:693
+msgid "do not prompt before launching a diff tool"
msgstr ""
-#: builtin/log.c:1494
-msgid "add To: header"
+#: builtin/difftool.c:698
+msgid "use symlinks in dir-diff mode"
msgstr ""
-#: builtin/log.c:1496
-msgid "add Cc: header"
+#: builtin/difftool.c:699
+msgid "tool"
msgstr ""
-#: builtin/log.c:1498
-msgid "ident"
+#: builtin/difftool.c:700
+msgid "use the specified diff tool"
msgstr ""
-#: builtin/log.c:1499
-msgid "set From address to <ident> (or committer ident if absent)"
+#: builtin/difftool.c:702
+msgid "print a list of diff tools that may be used with `--tool`"
msgstr ""
-#: builtin/log.c:1501
-msgid "message-id"
+#: builtin/difftool.c:705
+msgid ""
+"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
+"code"
msgstr ""
-#: builtin/log.c:1502
-msgid "make first mail a reply to <message-id>"
+#: builtin/difftool.c:708
+msgid "specify a custom command for viewing diffs"
msgstr ""
-#: builtin/log.c:1503 builtin/log.c:1506
-msgid "boundary"
+#: builtin/difftool.c:709
+msgid "passed to `diff`"
msgstr ""
-#: builtin/log.c:1504
-msgid "attach the patch"
+#: builtin/difftool.c:724
+msgid "difftool requires worktree or --no-index"
msgstr ""
-#: builtin/log.c:1507
-msgid "inline the patch"
+#: builtin/difftool.c:731
+msgid "--dir-diff is incompatible with --no-index"
msgstr ""
-#: builtin/log.c:1511
-msgid "enable message threading, styles: shallow, deep"
+#: builtin/difftool.c:734
+msgid "--gui, --tool and --extcmd are mutually exclusive"
msgstr ""
-#: builtin/log.c:1513
-msgid "signature"
+#: builtin/difftool.c:742
+msgid "no <tool> given for --tool=<tool>"
msgstr ""
-#: builtin/log.c:1514
-msgid "add a signature"
+#: builtin/difftool.c:749
+msgid "no <cmd> given for --extcmd=<cmd>"
msgstr ""
-#: builtin/log.c:1515
-msgid "base-commit"
+#: builtin/env--helper.c:6
+msgid "git env--helper --type=[bool|ulong] <options> <env-var>"
msgstr ""
-#: builtin/log.c:1516
-msgid "add prerequisite tree info to the patch series"
+#: builtin/env--helper.c:37 builtin/hash-object.c:98
+msgid "type"
msgstr ""
-#: builtin/log.c:1518
-msgid "add a signature from a file"
+#: builtin/env--helper.c:41
+msgid "default for git_env_*(...) to fall back on"
msgstr ""
-#: builtin/log.c:1519
-msgid "don't print the patch filenames"
+#: builtin/env--helper.c:43
+msgid "be quiet only use git_env_*() value as exit code"
msgstr ""
-#: builtin/log.c:1521
-msgid "show progress while generating patches"
+#: builtin/env--helper.c:62
+#, c-format
+msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`"
msgstr ""
-#: builtin/log.c:1596
+#: builtin/env--helper.c:77
#, c-format
-msgid "invalid ident line: %s"
+msgid ""
+"option `--default' expects an unsigned long value with `--type=ulong`, not `"
+"%s`"
msgstr ""
-#: builtin/log.c:1611
-msgid "-n and -k are mutually exclusive"
+#: builtin/fast-export.c:29
+msgid "git fast-export [rev-list-opts]"
msgstr ""
-#: builtin/log.c:1613
-msgid "--subject-prefix/--rfc and -k are mutually exclusive"
+#: builtin/fast-export.c:1124
+msgid "show progress after <n> objects"
msgstr ""
-#: builtin/log.c:1621
-msgid "--name-only does not make sense"
+#: builtin/fast-export.c:1126
+msgid "select handling of signed tags"
msgstr ""
-#: builtin/log.c:1623
-msgid "--name-status does not make sense"
+#: builtin/fast-export.c:1129
+msgid "select handling of tags that tag filtered objects"
msgstr ""
-#: builtin/log.c:1625
-msgid "--check does not make sense"
+#: builtin/fast-export.c:1132
+msgid "select handling of commit messages in an alternate encoding"
msgstr ""
-#: builtin/log.c:1657
-msgid "standard output, or directory, which one?"
+#: builtin/fast-export.c:1135
+msgid "Dump marks to this file"
msgstr ""
-#: builtin/log.c:1659
-#, c-format
-msgid "Could not create directory '%s'"
+#: builtin/fast-export.c:1137
+msgid "Import marks from this file"
msgstr ""
-#: builtin/log.c:1752
-#, c-format
-msgid "unable to read signature file '%s'"
+#: builtin/fast-export.c:1139
+msgid "Fake a tagger when tags lack one"
msgstr ""
-#: builtin/log.c:1785
-msgid "Generating patches"
+#: builtin/fast-export.c:1141
+msgid "Output full tree for each commit"
msgstr ""
-#: builtin/log.c:1829
-msgid "Failed to create output files"
+#: builtin/fast-export.c:1143
+msgid "Use the done feature to terminate the stream"
msgstr ""
-#: builtin/log.c:1880
-msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
+#: builtin/fast-export.c:1144
+msgid "Skip output of blob data"
msgstr ""
-#: builtin/log.c:1934
-#, c-format
-msgid ""
-"Could not find a tracked remote branch, please specify <upstream> manually.\n"
+#: builtin/fast-export.c:1145 builtin/log.c:1632
+msgid "refspec"
msgstr ""
-#: builtin/ls-files.c:469
-msgid "git ls-files [<options>] [<file>...]"
+#: builtin/fast-export.c:1146
+msgid "Apply refspec to exported refs"
msgstr ""
-#: builtin/ls-files.c:518
-msgid "identify the file status with tags"
+#: builtin/fast-export.c:1147
+msgid "anonymize output"
msgstr ""
-#: builtin/ls-files.c:520
-msgid "use lowercase letters for 'assume unchanged' files"
+#: builtin/fast-export.c:1149
+msgid "Reference parents which are not in fast-export stream by object id"
msgstr ""
-#: builtin/ls-files.c:522
-msgid "use lowercase letters for 'fsmonitor clean' files"
+#: builtin/fast-export.c:1151
+msgid "Show original object ids of blobs/commits"
msgstr ""
-#: builtin/ls-files.c:524
-msgid "show cached files in the output (default)"
+#: builtin/fetch.c:30
+msgid "git fetch [<options>] [<repository> [<refspec>...]]"
msgstr ""
-#: builtin/ls-files.c:526
-msgid "show deleted files in the output"
+#: builtin/fetch.c:31
+msgid "git fetch [<options>] <group>"
msgstr ""
-#: builtin/ls-files.c:528
-msgid "show modified files in the output"
+#: builtin/fetch.c:32
+msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
msgstr ""
-#: builtin/ls-files.c:530
-msgid "show other files in the output"
+#: builtin/fetch.c:33
+msgid "git fetch --all [<options>]"
msgstr ""
-#: builtin/ls-files.c:532
-msgid "show ignored files in the output"
+#: builtin/fetch.c:125 builtin/pull.c:203
+msgid "fetch from all remotes"
msgstr ""
-#: builtin/ls-files.c:535
-msgid "show staged contents' object name in the output"
+#: builtin/fetch.c:127 builtin/pull.c:206
+msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr ""
-#: builtin/ls-files.c:537
-msgid "show files on the filesystem that need to be removed"
+#: builtin/fetch.c:129 builtin/pull.c:209
+msgid "path to upload pack on remote end"
msgstr ""
-#: builtin/ls-files.c:539
-msgid "show 'other' directories' names only"
+#: builtin/fetch.c:130
+msgid "force overwrite of local reference"
msgstr ""
-#: builtin/ls-files.c:541
-msgid "show line endings of files"
+#: builtin/fetch.c:132
+msgid "fetch from multiple remotes"
msgstr ""
-#: builtin/ls-files.c:543
-msgid "don't show empty directories"
+#: builtin/fetch.c:134 builtin/pull.c:213
+msgid "fetch all tags and associated objects"
msgstr ""
-#: builtin/ls-files.c:546
-msgid "show unmerged files in the output"
+#: builtin/fetch.c:136
+msgid "do not fetch all tags (--no-tags)"
msgstr ""
-#: builtin/ls-files.c:548
-msgid "show resolve-undo information"
+#: builtin/fetch.c:138
+msgid "number of submodules fetched in parallel"
msgstr ""
-#: builtin/ls-files.c:550
-msgid "skip files matching pattern"
+#: builtin/fetch.c:140 builtin/pull.c:216
+msgid "prune remote-tracking branches no longer on remote"
msgstr ""
-#: builtin/ls-files.c:553
-msgid "exclude patterns are read from <file>"
+#: builtin/fetch.c:142
+msgid "prune local tags no longer on remote and clobber changed tags"
msgstr ""
-#: builtin/ls-files.c:556
-msgid "read additional per-directory exclude patterns in <file>"
+#: builtin/fetch.c:143 builtin/fetch.c:166 builtin/pull.c:140
+msgid "on-demand"
msgstr ""
-#: builtin/ls-files.c:558
-msgid "add the standard git exclusions"
+#: builtin/fetch.c:144
+msgid "control recursive fetching of submodules"
msgstr ""
-#: builtin/ls-files.c:561
-msgid "make the output relative to the project top directory"
+#: builtin/fetch.c:148 builtin/pull.c:224
+msgid "keep downloaded pack"
msgstr ""
-#: builtin/ls-files.c:564
-msgid "recurse through submodules"
+#: builtin/fetch.c:150
+msgid "allow updating of HEAD ref"
msgstr ""
-#: builtin/ls-files.c:566
-msgid "if any <file> is not in the index, treat this as an error"
+#: builtin/fetch.c:153 builtin/fetch.c:159 builtin/pull.c:227
+msgid "deepen history of shallow clone"
msgstr ""
-#: builtin/ls-files.c:567
-msgid "tree-ish"
+#: builtin/fetch.c:155
+msgid "deepen history of shallow repository based on time"
msgstr ""
-#: builtin/ls-files.c:568
-msgid "pretend that paths removed since <tree-ish> are still present"
+#: builtin/fetch.c:161 builtin/pull.c:230
+msgid "convert to a complete repository"
msgstr ""
-#: builtin/ls-files.c:570
-msgid "show debugging data"
+#: builtin/fetch.c:164
+msgid "prepend this to submodule path output"
msgstr ""
-#: builtin/ls-remote.c:9
+#: builtin/fetch.c:167
msgid ""
-"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
-" [-q | --quiet] [--exit-code] [--get-url]\n"
-" [--symref] [<repository> [<refs>...]]"
+"default for recursive fetching of submodules (lower priority than config "
+"files)"
msgstr ""
-#: builtin/ls-remote.c:59
-msgid "do not print remote URL"
+#: builtin/fetch.c:171 builtin/pull.c:233
+msgid "accept refs that update .git/shallow"
msgstr ""
-#: builtin/ls-remote.c:60 builtin/ls-remote.c:62
-msgid "exec"
+#: builtin/fetch.c:172 builtin/pull.c:235
+msgid "refmap"
msgstr ""
-#: builtin/ls-remote.c:61 builtin/ls-remote.c:63
-msgid "path of git-upload-pack on the remote host"
+#: builtin/fetch.c:173 builtin/pull.c:236
+msgid "specify fetch refmap"
msgstr ""
-#: builtin/ls-remote.c:65
-msgid "limit to tags"
+#: builtin/fetch.c:180
+msgid "report that we have only objects reachable from this object"
msgstr ""
-#: builtin/ls-remote.c:66
-msgid "limit to heads"
+#: builtin/fetch.c:183
+msgid "run 'gc --auto' after fetching"
msgstr ""
-#: builtin/ls-remote.c:67
-msgid "do not show peeled tags"
+#: builtin/fetch.c:185 builtin/pull.c:245
+msgid "check for forced-updates on all updated branches"
msgstr ""
-#: builtin/ls-remote.c:69
-msgid "take url.<base>.insteadOf into account"
+#: builtin/fetch.c:491
+msgid "Couldn't find remote ref HEAD"
msgstr ""
-#: builtin/ls-remote.c:73
-msgid "exit with exit code 2 if no matching refs are found"
+#: builtin/fetch.c:630
+#, c-format
+msgid "configuration fetch.output contains invalid value %s"
msgstr ""
-#: builtin/ls-remote.c:76
-msgid "show underlying ref in addition to the object pointed by it"
+#: builtin/fetch.c:728
+#, c-format
+msgid "object %s not found"
msgstr ""
-#: builtin/ls-tree.c:30
-msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
+#: builtin/fetch.c:732
+msgid "[up to date]"
msgstr ""
-#: builtin/ls-tree.c:128
-msgid "only show trees"
+#: builtin/fetch.c:745 builtin/fetch.c:761 builtin/fetch.c:833
+msgid "[rejected]"
msgstr ""
-#: builtin/ls-tree.c:130
-msgid "recurse into subtrees"
+#: builtin/fetch.c:746
+msgid "can't fetch in current branch"
msgstr ""
-#: builtin/ls-tree.c:132
-msgid "show trees when recursing"
+#: builtin/fetch.c:756
+msgid "[tag update]"
msgstr ""
-#: builtin/ls-tree.c:135
-msgid "terminate entries with NUL byte"
+#: builtin/fetch.c:757 builtin/fetch.c:794 builtin/fetch.c:816
+#: builtin/fetch.c:828
+msgid "unable to update local ref"
msgstr ""
-#: builtin/ls-tree.c:136
-msgid "include object size"
+#: builtin/fetch.c:761
+msgid "would clobber existing tag"
msgstr ""
-#: builtin/ls-tree.c:138 builtin/ls-tree.c:140
-msgid "list only filenames"
+#: builtin/fetch.c:783
+msgid "[new tag]"
msgstr ""
-#: builtin/ls-tree.c:143
-msgid "use full path names"
+#: builtin/fetch.c:786
+msgid "[new branch]"
msgstr ""
-#: builtin/ls-tree.c:145
-msgid "list entire tree; not just current directory (implies --full-name)"
+#: builtin/fetch.c:789
+msgid "[new ref]"
msgstr ""
-#: builtin/mailsplit.c:241
-#, c-format
-msgid "empty mbox: '%s'"
+#: builtin/fetch.c:828
+msgid "forced update"
msgstr ""
-#: builtin/merge.c:51
-msgid "git merge [<options>] [<commit>...]"
+#: builtin/fetch.c:833
+msgid "non-fast-forward"
msgstr ""
-#: builtin/merge.c:52
-msgid "git merge --abort"
+#: builtin/fetch.c:854
+msgid ""
+"Fetch normally indicates which branches had a forced update,\n"
+"but that check has been disabled. To re-enable, use '--show-forced-updates'\n"
+"flag or run 'git config fetch.showForcedUpdates true'."
msgstr ""
-#: builtin/merge.c:53
-msgid "git merge --continue"
+#: builtin/fetch.c:858
+#, c-format
+msgid ""
+"It took %.2f seconds to check forced updates. You can use\n"
+"'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates "
+"false'\n"
+" to avoid this check.\n"
msgstr ""
-#: builtin/merge.c:110
-msgid "switch `m' requires a value"
+#: builtin/fetch.c:888
+#, c-format
+msgid "%s did not send all necessary objects\n"
msgstr ""
-#: builtin/merge.c:176
+#: builtin/fetch.c:909
#, c-format
-msgid "Could not find merge strategy '%s'.\n"
+msgid "reject %s because shallow roots are not allowed to be updated"
msgstr ""
-#: builtin/merge.c:177
+#: builtin/fetch.c:1000 builtin/fetch.c:1131
#, c-format
-msgid "Available strategies are:"
+msgid "From %.*s\n"
msgstr ""
-#: builtin/merge.c:182
+#: builtin/fetch.c:1011
#, c-format
-msgid "Available custom strategies are:"
+msgid ""
+"some local refs could not be updated; try running\n"
+" 'git remote prune %s' to remove any old, conflicting branches"
msgstr ""
-#: builtin/merge.c:232 builtin/pull.c:142
-msgid "do not show a diffstat at the end of the merge"
+#: builtin/fetch.c:1101
+#, c-format
+msgid " (%s will become dangling)"
msgstr ""
-#: builtin/merge.c:235 builtin/pull.c:145
-msgid "show a diffstat at the end of the merge"
+#: builtin/fetch.c:1102
+#, c-format
+msgid " (%s has become dangling)"
msgstr ""
-#: builtin/merge.c:236 builtin/pull.c:148
-msgid "(synonym to --stat)"
+#: builtin/fetch.c:1134
+msgid "[deleted]"
msgstr ""
-#: builtin/merge.c:238 builtin/pull.c:151
-msgid "add (at most <n>) entries from shortlog to merge commit message"
+#: builtin/fetch.c:1135 builtin/remote.c:1036
+msgid "(none)"
msgstr ""
-#: builtin/merge.c:241 builtin/pull.c:157
-msgid "create a single commit instead of doing a merge"
+#: builtin/fetch.c:1158
+#, c-format
+msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr ""
-#: builtin/merge.c:243 builtin/pull.c:160
-msgid "perform a commit if the merge succeeds (default)"
+#: builtin/fetch.c:1177
+#, c-format
+msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr ""
-#: builtin/merge.c:245 builtin/pull.c:163
-msgid "edit message before committing"
+#: builtin/fetch.c:1180
+#, c-format
+msgid "Option \"%s\" is ignored for %s\n"
msgstr ""
-#: builtin/merge.c:246
-msgid "allow fast-forward (default)"
+#: builtin/fetch.c:1484
+#, c-format
+msgid "Fetching %s\n"
msgstr ""
-#: builtin/merge.c:248 builtin/pull.c:169
-msgid "abort if fast-forward is not possible"
+#: builtin/fetch.c:1486 builtin/remote.c:100
+#, c-format
+msgid "Could not fetch %s"
msgstr ""
-#: builtin/merge.c:252 builtin/pull.c:172
-msgid "verify that the named commit has a valid GPG signature"
+#: builtin/fetch.c:1532
+msgid ""
+"--filter can only be used with the remote configured in extensions."
+"partialClone"
msgstr ""
-#: builtin/merge.c:253 builtin/notes.c:779 builtin/pull.c:176
-#: builtin/revert.c:110
-msgid "strategy"
+#: builtin/fetch.c:1556
+msgid ""
+"No remote repository specified. Please, specify either a URL or a\n"
+"remote name from which new revisions should be fetched."
msgstr ""
-#: builtin/merge.c:254 builtin/pull.c:177
-msgid "merge strategy to use"
+#: builtin/fetch.c:1593
+msgid "You need to specify a tag name."
msgstr ""
-#: builtin/merge.c:255 builtin/pull.c:180
-msgid "option=value"
+#: builtin/fetch.c:1644
+msgid "Negative depth in --deepen is not supported"
msgstr ""
-#: builtin/merge.c:256 builtin/pull.c:181
-msgid "option for selected merge strategy"
+#: builtin/fetch.c:1646
+msgid "--deepen and --depth are mutually exclusive"
msgstr ""
-#: builtin/merge.c:258
-msgid "merge commit message (for a non-fast-forward merge)"
+#: builtin/fetch.c:1651
+msgid "--depth and --unshallow cannot be used together"
msgstr ""
-#: builtin/merge.c:265
-msgid "abort the current in-progress merge"
+#: builtin/fetch.c:1653
+msgid "--unshallow on a complete repository does not make sense"
msgstr ""
-#: builtin/merge.c:267
-msgid "continue the current in-progress merge"
+#: builtin/fetch.c:1669
+msgid "fetch --all does not take a repository argument"
msgstr ""
-#: builtin/merge.c:269 builtin/pull.c:188
-msgid "allow merging unrelated histories"
+#: builtin/fetch.c:1671
+msgid "fetch --all does not make sense with refspecs"
msgstr ""
-#: builtin/merge.c:275
-msgid "verify commit-msg hook"
+#: builtin/fetch.c:1680
+#, c-format
+msgid "No such remote or remote group: %s"
msgstr ""
-#: builtin/merge.c:300
-msgid "could not run stash."
+#: builtin/fetch.c:1687
+msgid "Fetching a group and specifying refspecs does not make sense"
msgstr ""
-#: builtin/merge.c:305
-msgid "stash failed"
+#: builtin/fetch.c:1703
+msgid ""
+"--filter can only be used with the remote configured in extensions."
+"partialclone"
msgstr ""
-#: builtin/merge.c:310
-#, c-format
-msgid "not a valid object: %s"
+#: builtin/fmt-merge-msg.c:18
+msgid ""
+"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
msgstr ""
-#: builtin/merge.c:332 builtin/merge.c:349
-msgid "read-tree failed"
+#: builtin/fmt-merge-msg.c:672
+msgid "populate log with at most <n> entries from shortlog"
msgstr ""
-#: builtin/merge.c:379
-msgid " (nothing to squash)"
+#: builtin/fmt-merge-msg.c:675
+msgid "alias for --log (deprecated)"
msgstr ""
-#: builtin/merge.c:390
-#, c-format
-msgid "Squash commit -- not updating HEAD\n"
+#: builtin/fmt-merge-msg.c:678
+msgid "text"
msgstr ""
-#: builtin/merge.c:440
-#, c-format
-msgid "No merge message -- not updating HEAD\n"
+#: builtin/fmt-merge-msg.c:679
+msgid "use <text> as start of message"
msgstr ""
-#: builtin/merge.c:491
-#, c-format
-msgid "'%s' does not point to a commit"
+#: builtin/fmt-merge-msg.c:680
+msgid "file to read from"
msgstr ""
-#: builtin/merge.c:578
-#, c-format
-msgid "Bad branch.%s.mergeoptions string: %s"
+#: builtin/for-each-ref.c:10
+msgid "git for-each-ref [<options>] [<pattern>]"
msgstr ""
-#: builtin/merge.c:699
-msgid "Not handling anything other than two heads merge."
+#: builtin/for-each-ref.c:11
+msgid "git for-each-ref [--points-at <object>]"
msgstr ""
-#: builtin/merge.c:713
-#, c-format
-msgid "Unknown option for merge-recursive: -X%s"
+#: builtin/for-each-ref.c:12
+msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]"
msgstr ""
-#: builtin/merge.c:728
-#, c-format
-msgid "unable to write %s"
+#: builtin/for-each-ref.c:13
+msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
msgstr ""
-#: builtin/merge.c:779
-#, c-format
-msgid "Could not read from '%s'"
+#: builtin/for-each-ref.c:28
+msgid "quote placeholders suitably for shells"
msgstr ""
-#: builtin/merge.c:788
-#, c-format
-msgid "Not committing merge; use 'git commit' to complete the merge.\n"
+#: builtin/for-each-ref.c:30
+msgid "quote placeholders suitably for perl"
msgstr ""
-#: 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"
+#: builtin/for-each-ref.c:32
+msgid "quote placeholders suitably for python"
msgstr ""
-#: builtin/merge.c:830
-msgid "Empty commit message."
+#: builtin/for-each-ref.c:34
+msgid "quote placeholders suitably for Tcl"
msgstr ""
-#: builtin/merge.c:849
-#, c-format
-msgid "Wonderful.\n"
+#: builtin/for-each-ref.c:37
+msgid "show only <n> matched refs"
msgstr ""
-#: builtin/merge.c:902
-#, c-format
-msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
+#: builtin/for-each-ref.c:39 builtin/tag.c:439
+msgid "respect format colors"
msgstr ""
-#: builtin/merge.c:941
-msgid "No current branch."
+#: builtin/for-each-ref.c:42
+msgid "print only refs which points at the given object"
msgstr ""
-#: builtin/merge.c:943
-msgid "No remote for the current branch."
+#: builtin/for-each-ref.c:44
+msgid "print only refs that are merged"
msgstr ""
-#: builtin/merge.c:945
-msgid "No default upstream defined for the current branch."
+#: builtin/for-each-ref.c:45
+msgid "print only refs that are not merged"
msgstr ""
-#: builtin/merge.c:950
-#, c-format
-msgid "No remote-tracking branch for %s from %s"
+#: builtin/for-each-ref.c:46
+msgid "print only refs which contain the commit"
msgstr ""
-#: builtin/merge.c:1007
+#: builtin/for-each-ref.c:47
+msgid "print only refs which don't contain the commit"
+msgstr ""
+
+#: builtin/fsck.c:88 builtin/fsck.c:160 builtin/fsck.c:161
+msgid "unknown"
+msgstr ""
+
+#. TRANSLATORS: e.g. error in tree 01bfda: <more explanation>
+#: builtin/fsck.c:120 builtin/fsck.c:136
#, c-format
-msgid "Bad value '%s' in environment '%s'"
+msgid "error in %s %s: %s"
msgstr ""
-#: builtin/merge.c:1110
+#. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation>
+#: builtin/fsck.c:131
#, c-format
-msgid "not something we can merge in %s: %s"
+msgid "warning in %s %s: %s"
msgstr ""
-#: builtin/merge.c:1144
-msgid "not something we can merge"
+#: builtin/fsck.c:157 builtin/fsck.c:159
+#, c-format
+msgid "broken link from %7s %s"
msgstr ""
-#: builtin/merge.c:1247
-msgid "--abort expects no arguments"
+#: builtin/fsck.c:168
+msgid "wrong object type in link"
msgstr ""
-#: builtin/merge.c:1251
-msgid "There is no merge to abort (MERGE_HEAD missing)."
+#: builtin/fsck.c:184
+#, c-format
+msgid ""
+"broken link from %7s %s\n"
+" to %7s %s"
msgstr ""
-#: builtin/merge.c:1263
-msgid "--continue expects no arguments"
+#: builtin/fsck.c:295
+#, c-format
+msgid "missing %s %s"
msgstr ""
-#: builtin/merge.c:1267
-msgid "There is no merge in progress (MERGE_HEAD missing)."
+#: builtin/fsck.c:321
+#, c-format
+msgid "unreachable %s %s"
msgstr ""
-#: builtin/merge.c:1283
-msgid ""
-"You have not concluded your merge (MERGE_HEAD exists).\n"
-"Please, commit your changes before you merge."
+#: builtin/fsck.c:340
+#, c-format
+msgid "dangling %s %s"
msgstr ""
-#: builtin/merge.c:1290
-msgid ""
-"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
-"Please, commit your changes before you merge."
+#: builtin/fsck.c:349
+msgid "could not create lost-found"
msgstr ""
-#: builtin/merge.c:1293
-msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
+#: builtin/fsck.c:360
+#, c-format
+msgid "could not finish '%s'"
msgstr ""
-#: builtin/merge.c:1302
-msgid "You cannot combine --squash with --no-ff."
+#: builtin/fsck.c:377
+#, c-format
+msgid "Checking %s"
msgstr ""
-#: builtin/merge.c:1310
-msgid "No commit specified and merge.defaultToUpstream not set."
+#: builtin/fsck.c:415
+#, c-format
+msgid "Checking connectivity (%d objects)"
msgstr ""
-#: builtin/merge.c:1327
-msgid "Squash commit into empty head not supported yet"
+#: builtin/fsck.c:434
+#, c-format
+msgid "Checking %s %s"
msgstr ""
-#: builtin/merge.c:1329
-msgid "Non-fast-forward commit does not make sense into an empty head"
+#: builtin/fsck.c:438
+msgid "broken links"
msgstr ""
-#: builtin/merge.c:1334
+#: builtin/fsck.c:447
#, c-format
-msgid "%s - not something we can merge"
+msgid "root %s"
msgstr ""
-#: builtin/merge.c:1336
-msgid "Can merge only exactly one commit into empty head"
+#: builtin/fsck.c:455
+#, c-format
+msgid "tagged %s %s (%s) in %s"
msgstr ""
-#: builtin/merge.c:1370
+#: builtin/fsck.c:484
#, c-format
-msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
+msgid "%s: object corrupt or missing"
msgstr ""
-#: builtin/merge.c:1373
+#: builtin/fsck.c:509
#, c-format
-msgid "Commit %s has a bad GPG signature allegedly by %s."
+msgid "%s: invalid reflog entry %s"
msgstr ""
-#: builtin/merge.c:1376
+#: builtin/fsck.c:523
#, c-format
-msgid "Commit %s does not have a GPG signature."
+msgid "Checking reflog %s->%s"
msgstr ""
-#: builtin/merge.c:1379
+#: builtin/fsck.c:557
#, c-format
-msgid "Commit %s has a good GPG signature by %s\n"
+msgid "%s: invalid sha1 pointer %s"
msgstr ""
-#: builtin/merge.c:1438
-msgid "refusing to merge unrelated histories"
+#: builtin/fsck.c:564
+#, c-format
+msgid "%s: not a commit"
msgstr ""
-#: builtin/merge.c:1447
-msgid "Already up to date."
+#: builtin/fsck.c:619
+msgid "notice: No default references"
msgstr ""
-#: builtin/merge.c:1457
+#: builtin/fsck.c:634
#, c-format
-msgid "Updating %s..%s\n"
+msgid "%s: object corrupt or missing: %s"
msgstr ""
-#: builtin/merge.c:1498
+#: builtin/fsck.c:647
#, c-format
-msgid "Trying really trivial in-index merge...\n"
+msgid "%s: object could not be parsed: %s"
msgstr ""
-#: builtin/merge.c:1505
+#: builtin/fsck.c:667
#, c-format
-msgid "Nope.\n"
+msgid "bad sha1 file: %s"
msgstr ""
-#: builtin/merge.c:1530
-msgid "Already up to date. Yeeah!"
+#: builtin/fsck.c:682
+msgid "Checking object directory"
msgstr ""
-#: builtin/merge.c:1536
-msgid "Not possible to fast-forward, aborting."
+#: builtin/fsck.c:685
+msgid "Checking object directories"
msgstr ""
-#: builtin/merge.c:1559 builtin/merge.c:1638
+#: builtin/fsck.c:700
#, c-format
-msgid "Rewinding the tree to pristine...\n"
+msgid "Checking %s link"
msgstr ""
-#: builtin/merge.c:1563
+#: builtin/fsck.c:705 builtin/index-pack.c:842
#, c-format
-msgid "Trying merge strategy %s...\n"
+msgid "invalid %s"
msgstr ""
-#: builtin/merge.c:1629
+#: builtin/fsck.c:712
#, c-format
-msgid "No merge strategy handled the merge.\n"
+msgid "%s points to something strange (%s)"
msgstr ""
-#: builtin/merge.c:1631
+#: builtin/fsck.c:718
#, c-format
-msgid "Merge with strategy %s failed.\n"
+msgid "%s: detached HEAD points at nothing"
msgstr ""
-#: builtin/merge.c:1640
+#: builtin/fsck.c:722
#, c-format
-msgid "Using the %s to prepare resolving by hand.\n"
+msgid "notice: %s points to an unborn branch (%s)"
+msgstr ""
+
+#: builtin/fsck.c:734
+msgid "Checking cache tree"
msgstr ""
-#: builtin/merge.c:1652
+#: builtin/fsck.c:739
#, c-format
-msgid "Automatic merge went well; stopped before committing as requested\n"
+msgid "%s: invalid sha1 pointer in cache-tree"
msgstr ""
-#: builtin/merge-base.c:31
-msgid "git merge-base [-a | --all] <commit> <commit>..."
+#: builtin/fsck.c:750
+msgid "non-tree in cache-tree"
msgstr ""
-#: builtin/merge-base.c:32
-msgid "git merge-base [-a | --all] --octopus <commit>..."
-msgstr ""
-
-#: builtin/merge-base.c:33
-msgid "git merge-base --independent <commit>..."
+#: builtin/fsck.c:781
+msgid "git fsck [<options>] [<object>...]"
msgstr ""
-#: builtin/merge-base.c:34
-msgid "git merge-base --is-ancestor <commit> <commit>"
+#: builtin/fsck.c:787
+msgid "show unreachable objects"
msgstr ""
-#: builtin/merge-base.c:35
-msgid "git merge-base --fork-point <ref> [<commit>]"
+#: builtin/fsck.c:788
+msgid "show dangling objects"
msgstr ""
-#: builtin/merge-base.c:221
-msgid "output all common ancestors"
+#: builtin/fsck.c:789
+msgid "report tags"
msgstr ""
-#: builtin/merge-base.c:223
-msgid "find ancestors for a single n-way merge"
+#: builtin/fsck.c:790
+msgid "report root nodes"
msgstr ""
-#: builtin/merge-base.c:225
-msgid "list revs not reachable from others"
+#: builtin/fsck.c:791
+msgid "make index objects head nodes"
msgstr ""
-#: builtin/merge-base.c:227
-msgid "is the first one ancestor of the other?"
+#: builtin/fsck.c:792
+msgid "make reflogs head nodes (default)"
msgstr ""
-#: builtin/merge-base.c:229
-msgid "find where <commit> forked from reflog of <ref>"
+#: builtin/fsck.c:793
+msgid "also consider packs and alternate objects"
msgstr ""
-#: builtin/merge-file.c:9
-msgid ""
-"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
-"<orig-file> <file2>"
+#: builtin/fsck.c:794
+msgid "check only connectivity"
msgstr ""
-#: builtin/merge-file.c:33
-msgid "send results to standard output"
+#: builtin/fsck.c:795
+msgid "enable more strict checking"
msgstr ""
-#: builtin/merge-file.c:34
-msgid "use a diff3 based merge"
+#: builtin/fsck.c:797
+msgid "write dangling objects in .git/lost-found"
msgstr ""
-#: builtin/merge-file.c:35
-msgid "for conflicts, use our version"
+#: builtin/fsck.c:798 builtin/prune.c:132
+msgid "show progress"
msgstr ""
-#: builtin/merge-file.c:37
-msgid "for conflicts, use their version"
+#: builtin/fsck.c:799
+msgid "show verbose names for reachable objects"
msgstr ""
-#: builtin/merge-file.c:39
-msgid "for conflicts, use a union version"
+#: builtin/fsck.c:859 builtin/index-pack.c:225
+msgid "Checking objects"
msgstr ""
-#: builtin/merge-file.c:42
-msgid "for conflicts, use this marker size"
+#: builtin/fsck.c:887
+#, c-format
+msgid "%s: object missing"
msgstr ""
-#: builtin/merge-file.c:43
-msgid "do not warn about conflicts"
+#: builtin/fsck.c:899
+#, c-format
+msgid "invalid parameter: expected sha1, got '%s'"
msgstr ""
-#: builtin/merge-file.c:45
-msgid "set labels for file1/orig-file/file2"
+#: builtin/gc.c:34
+msgid "git gc [<options>]"
msgstr ""
-#: builtin/merge-recursive.c:45
+#: builtin/gc.c:90
#, c-format
-msgid "unknown option %s"
+msgid "Failed to fstat %s: %s"
msgstr ""
-#: builtin/merge-recursive.c:51
+#: builtin/gc.c:126
#, c-format
-msgid "could not parse object '%s'"
+msgid "failed to parse '%s' value '%s'"
msgstr ""
-#: builtin/merge-recursive.c:55
+#: builtin/gc.c:476 builtin/init-db.c:55
#, c-format
-msgid "cannot handle more than %d base. Ignoring %s."
-msgid_plural "cannot handle more than %d bases. Ignoring %s."
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/merge-recursive.c:63
-msgid "not handling anything other than two heads merge."
+msgid "cannot stat '%s'"
msgstr ""
-#: builtin/merge-recursive.c:69 builtin/merge-recursive.c:71
+#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:529
#, c-format
-msgid "could not resolve ref '%s'"
+msgid "cannot read '%s'"
msgstr ""
-#: builtin/merge-recursive.c:77
+#: builtin/gc.c:492
#, c-format
-msgid "Merging %s with %s\n"
+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/mktree.c:66
-msgid "git mktree [-z] [--missing] [--batch]"
+#: builtin/gc.c:540
+msgid "prune unreferenced objects"
msgstr ""
-#: builtin/mktree.c:154
-msgid "input is NUL terminated"
+#: builtin/gc.c:542
+msgid "be more thorough (increased runtime)"
msgstr ""
-#: builtin/mktree.c:155 builtin/write-tree.c:25
-msgid "allow missing objects"
+#: builtin/gc.c:543
+msgid "enable auto-gc mode"
msgstr ""
-#: builtin/mktree.c:156
-msgid "allow creation of more than one tree"
+#: builtin/gc.c:546
+msgid "force running gc even if there may be another gc running"
msgstr ""
-#: builtin/mv.c:17
-msgid "git mv [<options>] <source>... <destination>"
+#: builtin/gc.c:549
+msgid "repack all other packs except the largest pack"
msgstr ""
-#: builtin/mv.c:82
+#: builtin/gc.c:566
#, c-format
-msgid "Directory %s is in index and no submodule?"
+msgid "failed to parse gc.logexpiry value %s"
msgstr ""
-#: builtin/mv.c:84
-msgid "Please stage your changes to .gitmodules or stash them to proceed"
+#: builtin/gc.c:577
+#, c-format
+msgid "failed to parse prune expiry value %s"
msgstr ""
-#: builtin/mv.c:102
+#: builtin/gc.c:597
#, c-format
-msgid "%.*s is in index"
+msgid "Auto packing the repository in background for optimum performance.\n"
msgstr ""
-#: builtin/mv.c:124
-msgid "force move/rename even if target exists"
+#: builtin/gc.c:599
+#, c-format
+msgid "Auto packing the repository for optimum performance.\n"
msgstr ""
-#: builtin/mv.c:126
-msgid "skip move/rename errors"
+#: builtin/gc.c:600
+#, c-format
+msgid "See \"git help gc\" for manual housekeeping.\n"
msgstr ""
-#: builtin/mv.c:168
+#: builtin/gc.c:640
#, c-format
-msgid "destination '%s' is not a directory"
+msgid ""
+"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
msgstr ""
-#: builtin/mv.c:179
-#, c-format
-msgid "Checking rename of '%s' to '%s'\n"
+#: builtin/gc.c:695
+msgid ""
+"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr ""
-#: builtin/mv.c:183
-msgid "bad source"
+#: builtin/grep.c:29
+msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
msgstr ""
-#: builtin/mv.c:186
-msgid "can not move directory into itself"
+#: builtin/grep.c:225
+#, c-format
+msgid "grep: failed to create thread: %s"
msgstr ""
-#: builtin/mv.c:189
-msgid "cannot move directory over file"
+#: builtin/grep.c:279
+#, c-format
+msgid "invalid number of threads specified (%d) for %s"
msgstr ""
-#: builtin/mv.c:198
-msgid "source directory is empty"
+#. TRANSLATORS: %s is the configuration
+#. variable for tweaking threads, currently
+#. grep.threads
+#.
+#: builtin/grep.c:287 builtin/index-pack.c:1534 builtin/index-pack.c:1727
+#: builtin/pack-objects.c:2728
+#, c-format
+msgid "no threads support, ignoring %s"
msgstr ""
-#: builtin/mv.c:223
-msgid "not under version control"
+#: builtin/grep.c:467 builtin/grep.c:591 builtin/grep.c:633
+#, c-format
+msgid "unable to read tree (%s)"
msgstr ""
-#: builtin/mv.c:226
-msgid "destination exists"
+#: builtin/grep.c:648
+#, c-format
+msgid "unable to grep from object of type %s"
msgstr ""
-#: builtin/mv.c:234
+#: builtin/grep.c:714
#, c-format
-msgid "overwriting '%s'"
+msgid "switch `%c' expects a numerical value"
msgstr ""
-#: builtin/mv.c:237
-msgid "Cannot overwrite"
+#: builtin/grep.c:813
+msgid "search in index instead of in the work tree"
msgstr ""
-#: builtin/mv.c:240
-msgid "multiple sources for the same target"
+#: builtin/grep.c:815
+msgid "find in contents not managed by git"
msgstr ""
-#: builtin/mv.c:242
-msgid "destination directory does not exist"
+#: builtin/grep.c:817
+msgid "search in both tracked and untracked files"
msgstr ""
-#: builtin/mv.c:249
-#, c-format
-msgid "%s, source=%s, destination=%s"
+#: builtin/grep.c:819
+msgid "ignore files specified via '.gitignore'"
msgstr ""
-#: builtin/mv.c:270
-#, c-format
-msgid "Renaming %s to %s\n"
+#: builtin/grep.c:821
+msgid "recursively search in each submodule"
msgstr ""
-#: builtin/mv.c:276 builtin/remote.c:716 builtin/repack.c:494
-#, c-format
-msgid "renaming '%s' failed"
+#: builtin/grep.c:824
+msgid "show non-matching lines"
msgstr ""
-#: builtin/name-rev.c:355
-msgid "git name-rev [<options>] <commit>..."
+#: builtin/grep.c:826
+msgid "case insensitive matching"
msgstr ""
-#: builtin/name-rev.c:356
-msgid "git name-rev [<options>] --all"
+#: builtin/grep.c:828
+msgid "match patterns only at word boundaries"
msgstr ""
-#: builtin/name-rev.c:357
-msgid "git name-rev [<options>] --stdin"
+#: builtin/grep.c:830
+msgid "process binary files as text"
msgstr ""
-#: builtin/name-rev.c:413
-msgid "print only names (no SHA-1)"
+#: builtin/grep.c:832
+msgid "don't match patterns in binary files"
msgstr ""
-#: builtin/name-rev.c:414
-msgid "only use tags to name the commits"
+#: builtin/grep.c:835
+msgid "process binary files with textconv filters"
msgstr ""
-#: builtin/name-rev.c:416
-msgid "only use refs matching <pattern>"
+#: builtin/grep.c:837
+msgid "search in subdirectories (default)"
msgstr ""
-#: builtin/name-rev.c:418
-msgid "ignore refs matching <pattern>"
+#: builtin/grep.c:839
+msgid "descend at most <depth> levels"
msgstr ""
-#: builtin/name-rev.c:420
-msgid "list all commits reachable from all refs"
+#: builtin/grep.c:843
+msgid "use extended POSIX regular expressions"
msgstr ""
-#: builtin/name-rev.c:421
-msgid "read from stdin"
+#: builtin/grep.c:846
+msgid "use basic POSIX regular expressions (default)"
msgstr ""
-#: builtin/name-rev.c:422
-msgid "allow to print `undefined` names (default)"
+#: builtin/grep.c:849
+msgid "interpret patterns as fixed strings"
msgstr ""
-#: builtin/name-rev.c:428
-msgid "dereference tags in the input (internal use)"
+#: builtin/grep.c:852
+msgid "use Perl-compatible regular expressions"
msgstr ""
-#: builtin/notes.c:28
-msgid "git notes [--ref <notes-ref>] [list [<object>]]"
+#: builtin/grep.c:855
+msgid "show line numbers"
msgstr ""
-#: builtin/notes.c:29
-msgid ""
-"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
-"| (-c | -C) <object>] [<object>]"
+#: builtin/grep.c:856
+msgid "show column number of first match"
msgstr ""
-#: builtin/notes.c:30
-msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
+#: builtin/grep.c:857
+msgid "don't show filenames"
msgstr ""
-#: builtin/notes.c:31
-msgid ""
-"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
-"(-c | -C) <object>] [<object>]"
+#: builtin/grep.c:858
+msgid "show filenames"
msgstr ""
-#: builtin/notes.c:32
-msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
+#: builtin/grep.c:860
+msgid "show filenames relative to top directory"
msgstr ""
-#: builtin/notes.c:33
-msgid "git notes [--ref <notes-ref>] show [<object>]"
+#: builtin/grep.c:862
+msgid "show only filenames instead of matching lines"
msgstr ""
-#: builtin/notes.c:34
-msgid ""
-"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
+#: builtin/grep.c:864
+msgid "synonym for --files-with-matches"
msgstr ""
-#: builtin/notes.c:35
-msgid "git notes merge --commit [-v | -q]"
+#: builtin/grep.c:867
+msgid "show only the names of files without match"
msgstr ""
-#: builtin/notes.c:36
-msgid "git notes merge --abort [-v | -q]"
+#: builtin/grep.c:869
+msgid "print NUL after filenames"
msgstr ""
-#: builtin/notes.c:37
-msgid "git notes [--ref <notes-ref>] remove [<object>...]"
+#: builtin/grep.c:872
+msgid "show only matching parts of a line"
msgstr ""
-#: builtin/notes.c:38
-msgid "git notes [--ref <notes-ref>] prune [-n] [-v]"
+#: builtin/grep.c:874
+msgid "show the number of matches instead of matching lines"
msgstr ""
-#: builtin/notes.c:39
-msgid "git notes [--ref <notes-ref>] get-ref"
+#: builtin/grep.c:875
+msgid "highlight matches"
msgstr ""
-#: builtin/notes.c:44
-msgid "git notes [list [<object>]]"
+#: builtin/grep.c:877
+msgid "print empty line between matches from different files"
msgstr ""
-#: builtin/notes.c:49
-msgid "git notes add [<options>] [<object>]"
+#: builtin/grep.c:879
+msgid "show filename only once above matches from same file"
msgstr ""
-#: builtin/notes.c:54
-msgid "git notes copy [<options>] <from-object> <to-object>"
+#: builtin/grep.c:882
+msgid "show <n> context lines before and after matches"
msgstr ""
-#: builtin/notes.c:55
-msgid "git notes copy --stdin [<from-object> <to-object>]..."
+#: builtin/grep.c:885
+msgid "show <n> context lines before matches"
msgstr ""
-#: builtin/notes.c:60
-msgid "git notes append [<options>] [<object>]"
+#: builtin/grep.c:887
+msgid "show <n> context lines after matches"
msgstr ""
-#: builtin/notes.c:65
-msgid "git notes edit [<object>]"
+#: builtin/grep.c:889
+msgid "use <n> worker threads"
msgstr ""
-#: builtin/notes.c:70
-msgid "git notes show [<object>]"
+#: builtin/grep.c:890
+msgid "shortcut for -C NUM"
msgstr ""
-#: builtin/notes.c:75
-msgid "git notes merge [<options>] <notes-ref>"
+#: builtin/grep.c:893
+msgid "show a line with the function name before matches"
msgstr ""
-#: builtin/notes.c:76
-msgid "git notes merge --commit [<options>]"
+#: builtin/grep.c:895
+msgid "show the surrounding function"
msgstr ""
-#: builtin/notes.c:77
-msgid "git notes merge --abort [<options>]"
+#: builtin/grep.c:898
+msgid "read patterns from file"
msgstr ""
-#: builtin/notes.c:82
-msgid "git notes remove [<object>]"
+#: builtin/grep.c:900
+msgid "match <pattern>"
msgstr ""
-#: builtin/notes.c:87
-msgid "git notes prune [<options>]"
+#: builtin/grep.c:902
+msgid "combine patterns specified with -e"
msgstr ""
-#: builtin/notes.c:92
-msgid "git notes get-ref"
-msgstr ""
-
-#: builtin/notes.c:97
-msgid "Write/edit the notes for the following object:"
+#: builtin/grep.c:914
+msgid "indicate hit with exit status without output"
msgstr ""
-#: builtin/notes.c:150
-#, c-format
-msgid "unable to start 'show' for object '%s'"
+#: builtin/grep.c:916
+msgid "show only matches from files that match all patterns"
msgstr ""
-#: builtin/notes.c:154
-msgid "could not read 'show' output"
+#: builtin/grep.c:918
+msgid "show parse tree for grep expression"
msgstr ""
-#: builtin/notes.c:162
-#, c-format
-msgid "failed to finish 'show' for object '%s'"
+#: builtin/grep.c:922
+msgid "pager"
msgstr ""
-#: builtin/notes.c:197
-msgid "please supply the note contents using either -m or -F option"
+#: builtin/grep.c:922
+msgid "show matching files in the pager"
msgstr ""
-#: builtin/notes.c:206
-msgid "unable to write note object"
+#: builtin/grep.c:926
+msgid "allow calling of grep(1) (ignored by this build)"
msgstr ""
-#: builtin/notes.c:208
-#, c-format
-msgid "the note contents have been left in %s"
+#: builtin/grep.c:990
+msgid "no pattern given"
msgstr ""
-#: builtin/notes.c:236 builtin/tag.c:508
-#, c-format
-msgid "cannot read '%s'"
+#: builtin/grep.c:1026
+msgid "--no-index or --untracked cannot be used with revs"
msgstr ""
-#: builtin/notes.c:238 builtin/tag.c:511
+#: builtin/grep.c:1034
#, c-format
-msgid "could not open or read '%s'"
+msgid "unable to resolve revision: %s"
msgstr ""
-#: 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 "failed to resolve '%s' as a valid ref."
+#: builtin/grep.c:1065
+msgid "invalid option combination, ignoring --threads"
msgstr ""
-#: builtin/notes.c:260
-#, c-format
-msgid "failed to read object '%s'."
+#: builtin/grep.c:1068 builtin/pack-objects.c:3416
+msgid "no threads support, ignoring --threads"
msgstr ""
-#: builtin/notes.c:264
+#: builtin/grep.c:1071 builtin/index-pack.c:1531 builtin/pack-objects.c:2725
#, c-format
-msgid "cannot read note data from non-blob object '%s'."
+msgid "invalid number of threads specified (%d)"
msgstr ""
-#: builtin/notes.c:304
-#, c-format
-msgid "malformed input line: '%s'."
+#: builtin/grep.c:1094
+msgid "--open-files-in-pager only works on the worktree"
msgstr ""
-#: builtin/notes.c:319
-#, c-format
-msgid "failed to copy notes from '%s' to '%s'"
+#: builtin/grep.c:1117
+msgid "option not supported with --recurse-submodules"
msgstr ""
-#. 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/)"
+#: builtin/grep.c:1123
+msgid "--cached or --untracked cannot be used with --no-index"
msgstr ""
-#: 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"
+#: builtin/grep.c:1129
+msgid "--[no-]exclude-standard cannot be used for tracked contents"
msgstr ""
-#: builtin/notes.c:384 builtin/notes.c:670
-#, c-format
-msgid "no note found for object %s."
+#: builtin/grep.c:1137
+msgid "both --cached and trees are given"
msgstr ""
-#: builtin/notes.c:405 builtin/notes.c:568
-msgid "note contents as a string"
+#: builtin/hash-object.c:85
+msgid ""
+"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
+"[--] <file>..."
msgstr ""
-#: builtin/notes.c:408 builtin/notes.c:571
-msgid "note contents in a file"
+#: builtin/hash-object.c:86
+msgid "git hash-object --stdin-paths"
msgstr ""
-#: builtin/notes.c:411 builtin/notes.c:574
-msgid "reuse and edit specified note object"
+#: builtin/hash-object.c:98
+msgid "object type"
msgstr ""
-#: builtin/notes.c:414 builtin/notes.c:577
-msgid "reuse specified note object"
+#: builtin/hash-object.c:99
+msgid "write the object into the object database"
msgstr ""
-#: builtin/notes.c:417 builtin/notes.c:580
-msgid "allow storing empty note"
+#: builtin/hash-object.c:101
+msgid "read the object from stdin"
msgstr ""
-#: builtin/notes.c:418 builtin/notes.c:489
-msgid "replace existing notes"
+#: builtin/hash-object.c:103
+msgid "store file as is without filters"
msgstr ""
-#: builtin/notes.c:443
-#, c-format
+#: builtin/hash-object.c:104
msgid ""
-"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
-"existing notes"
-msgstr ""
-
-#: builtin/notes.c:458 builtin/notes.c:537
-#, c-format
-msgid "Overwriting existing notes for object %s\n"
-msgstr ""
-
-#: builtin/notes.c:469 builtin/notes.c:629 builtin/notes.c:894
-#, c-format
-msgid "Removing note for object %s\n"
-msgstr ""
-
-#: builtin/notes.c:490
-msgid "read objects from stdin"
+"just hash any random garbage to create corrupt objects for debugging Git"
msgstr ""
-#: builtin/notes.c:492
-msgid "load rewriting config for <command> (implies --stdin)"
+#: builtin/hash-object.c:105
+msgid "process file as it were from this path"
msgstr ""
-#: builtin/notes.c:510
-msgid "too few parameters"
+#: builtin/help.c:46
+msgid "print all available commands"
msgstr ""
-#: builtin/notes.c:531
-#, c-format
-msgid ""
-"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
-"existing notes"
+#: builtin/help.c:47
+msgid "exclude guides"
msgstr ""
-#: builtin/notes.c:543
-#, c-format
-msgid "missing notes on source object %s. Cannot copy."
+#: builtin/help.c:48
+msgid "print list of useful guides"
msgstr ""
-#: 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"
+#: builtin/help.c:49
+msgid "print all configuration variable names"
msgstr ""
-#: builtin/notes.c:690
-msgid "failed to delete ref NOTES_MERGE_PARTIAL"
+#: builtin/help.c:51
+msgid "show man page"
msgstr ""
-#: builtin/notes.c:692
-msgid "failed to delete ref NOTES_MERGE_REF"
+#: builtin/help.c:52
+msgid "show manual in web browser"
msgstr ""
-#: builtin/notes.c:694
-msgid "failed to remove 'git notes merge' worktree"
+#: builtin/help.c:54
+msgid "show info page"
msgstr ""
-#: builtin/notes.c:714
-msgid "failed to read ref NOTES_MERGE_PARTIAL"
+#: builtin/help.c:56
+msgid "print command description"
msgstr ""
-#: builtin/notes.c:716
-msgid "could not find commit from NOTES_MERGE_PARTIAL."
+#: builtin/help.c:61
+msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
msgstr ""
-#: builtin/notes.c:718
-msgid "could not parse commit from NOTES_MERGE_PARTIAL."
+#: builtin/help.c:77
+#, c-format
+msgid "unrecognized help format '%s'"
msgstr ""
-#: builtin/notes.c:731
-msgid "failed to resolve NOTES_MERGE_REF"
+#: builtin/help.c:104
+msgid "Failed to start emacsclient."
msgstr ""
-#: builtin/notes.c:734
-msgid "failed to finalize notes merge"
+#: builtin/help.c:117
+msgid "Failed to parse emacsclient version."
msgstr ""
-#: builtin/notes.c:760
+#: builtin/help.c:125
#, c-format
-msgid "unknown notes merge strategy %s"
-msgstr ""
-
-#: builtin/notes.c:776
-msgid "General options"
+msgid "emacsclient version '%d' too old (< 22)."
msgstr ""
-#: builtin/notes.c:778
-msgid "Merge options"
+#: builtin/help.c:143 builtin/help.c:165 builtin/help.c:175 builtin/help.c:183
+#, c-format
+msgid "failed to exec '%s'"
msgstr ""
-#: builtin/notes.c:780
+#: builtin/help.c:221
+#, c-format
msgid ""
-"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
-"cat_sort_uniq)"
+"'%s': path for unsupported man viewer.\n"
+"Please consider using 'man.<tool>.cmd' instead."
msgstr ""
-#: builtin/notes.c:782
-msgid "Committing unmerged notes"
+#: builtin/help.c:233
+#, c-format
+msgid ""
+"'%s': cmd for supported man viewer.\n"
+"Please consider using 'man.<tool>.path' instead."
msgstr ""
-#: builtin/notes.c:784
-msgid "finalize notes merge by committing unmerged notes"
+#: builtin/help.c:350
+#, c-format
+msgid "'%s': unknown man viewer."
msgstr ""
-#: builtin/notes.c:786
-msgid "Aborting notes merge resolution"
+#: builtin/help.c:367
+msgid "no man viewer handled the request"
msgstr ""
-#: builtin/notes.c:788
-msgid "abort notes merge"
+#: builtin/help.c:375
+msgid "no info viewer handled the request"
msgstr ""
-#: builtin/notes.c:799
-msgid "cannot mix --commit, --abort or -s/--strategy"
+#: builtin/help.c:434 builtin/help.c:445 git.c:336
+#, c-format
+msgid "'%s' is aliased to '%s'"
msgstr ""
-#: builtin/notes.c:804
-msgid "must specify a notes ref to merge"
+#: builtin/help.c:448 git.c:365
+#, c-format
+msgid "bad alias.%s string: %s"
msgstr ""
-#: builtin/notes.c:828
+#: builtin/help.c:477 builtin/help.c:507
#, c-format
-msgid "unknown -s/--strategy: %s"
+msgid "usage: %s%s"
msgstr ""
-#: builtin/notes.c:865
-#, c-format
-msgid "a notes merge into %s is already in-progress at %s"
+#: builtin/help.c:491
+msgid "'git help config' for more information"
msgstr ""
-#: builtin/notes.c:868
+#: builtin/index-pack.c:185
#, c-format
-msgid "failed to store link to current notes ref (%s)"
+msgid "object type mismatch at %s"
msgstr ""
-#: builtin/notes.c:870
+#: builtin/index-pack.c:205
#, 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"
+msgid "did not receive expected object %s"
msgstr ""
-#: builtin/notes.c:892
+#: builtin/index-pack.c:208
#, c-format
-msgid "Object %s has no note\n"
+msgid "object %s: expected type %s, found %s"
msgstr ""
-#: builtin/notes.c:904
-msgid "attempt to remove non-existent note is not an error"
-msgstr ""
+#: builtin/index-pack.c:258
+#, c-format
+msgid "cannot fill %d byte"
+msgid_plural "cannot fill %d bytes"
+msgstr[0] ""
+msgstr[1] ""
-#: builtin/notes.c:907
-msgid "read object names from the standard input"
+#: builtin/index-pack.c:268
+msgid "early EOF"
msgstr ""
-#: builtin/notes.c:945 builtin/prune.c:108 builtin/worktree.c:151
-msgid "do not remove, show only"
+#: builtin/index-pack.c:269
+msgid "read error on input"
msgstr ""
-#: builtin/notes.c:946
-msgid "report pruned notes"
+#: builtin/index-pack.c:281
+msgid "used more bytes than were available"
msgstr ""
-#: builtin/notes.c:988
-msgid "notes-ref"
+#: builtin/index-pack.c:288 builtin/pack-objects.c:604
+msgid "pack too large for current definition of off_t"
msgstr ""
-#: builtin/notes.c:989
-msgid "use notes from <notes-ref>"
+#: builtin/index-pack.c:291 builtin/unpack-objects.c:94
+msgid "pack exceeds maximum allowed size"
msgstr ""
-#: builtin/notes.c:1024
+#: builtin/index-pack.c:312
#, c-format
-msgid "unknown subcommand: %s"
-msgstr ""
-
-#: builtin/pack-objects.c:48
-msgid ""
-"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
+msgid "cannot open packfile '%s'"
msgstr ""
-#: builtin/pack-objects.c:49
-msgid ""
-"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
+#: builtin/index-pack.c:326
+msgid "pack signature mismatch"
msgstr ""
-#: builtin/pack-objects.c:414
+#: builtin/index-pack.c:328
#, c-format
-msgid "bad packed object CRC for %s"
+msgid "pack version %<PRIu32> unsupported"
msgstr ""
-#: builtin/pack-objects.c:425
+#: builtin/index-pack.c:346
#, c-format
-msgid "corrupt packed object for %s"
+msgid "pack has bad object at offset %<PRIuMAX>: %s"
msgstr ""
-#: builtin/pack-objects.c:556
+#: builtin/index-pack.c:466
#, c-format
-msgid "recursive delta detected for object %s"
+msgid "inflate returned %d"
msgstr ""
-#: builtin/pack-objects.c:756
-#, c-format
-msgid "ordered %u objects, expected %<PRIu32>"
+#: builtin/index-pack.c:515
+msgid "offset value overflow for delta base object"
msgstr ""
-#: builtin/pack-objects.c:769
-#, c-format
-msgid "packfile is invalid: %s"
+#: builtin/index-pack.c:523
+msgid "delta base offset is out of bound"
msgstr ""
-#: builtin/pack-objects.c:773
+#: builtin/index-pack.c:531
#, c-format
-msgid "unable to open packfile for reuse: %s"
-msgstr ""
-
-#: builtin/pack-objects.c:777
-msgid "unable to seek in reused packfile"
+msgid "unknown object type %d"
msgstr ""
-#: builtin/pack-objects.c:788
-msgid "unable to read from reused packfile"
+#: builtin/index-pack.c:562
+msgid "cannot pread pack file"
msgstr ""
-#: builtin/pack-objects.c:816
-msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
-msgstr ""
+#: builtin/index-pack.c:564
+#, 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/pack-objects.c:829
-msgid "Writing objects"
+#: builtin/index-pack.c:590
+msgid "serious inflate inconsistency"
msgstr ""
-#: builtin/pack-objects.c:891 builtin/update-index.c:88
+#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:764
+#: builtin/index-pack.c:803 builtin/index-pack.c:812
#, c-format
-msgid "failed to stat %s"
+msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr ""
-#: builtin/pack-objects.c:944
+#: builtin/index-pack.c:738 builtin/pack-objects.c:157
+#: builtin/pack-objects.c:217 builtin/pack-objects.c:311
#, c-format
-msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
+msgid "unable to read %s"
msgstr ""
-#: builtin/pack-objects.c:1112
-msgid "disabling bitmap writing, as some objects are not being packed"
+#: builtin/index-pack.c:801
+#, c-format
+msgid "cannot read existing object info %s"
msgstr ""
-#: builtin/pack-objects.c:1489
+#: builtin/index-pack.c:809
#, c-format
-msgid "delta base offset overflow in pack for %s"
+msgid "cannot read existing object %s"
msgstr ""
-#: builtin/pack-objects.c:1498
+#: builtin/index-pack.c:823
#, c-format
-msgid "delta base offset out of bound for %s"
+msgid "invalid blob object %s"
msgstr ""
-#: builtin/pack-objects.c:1771
-msgid "Counting objects"
+#: builtin/index-pack.c:826 builtin/index-pack.c:845
+msgid "fsck error in packed object"
msgstr ""
-#: builtin/pack-objects.c:1913
+#: builtin/index-pack.c:847
#, c-format
-msgid "unable to get size of %s"
+msgid "Not all child objects of %s are reachable"
msgstr ""
-#: builtin/pack-objects.c:1928
-#, c-format
-msgid "unable to parse object header of %s"
+#: builtin/index-pack.c:919 builtin/index-pack.c:950
+msgid "failed to apply delta"
msgstr ""
-#: builtin/pack-objects.c:1995 builtin/pack-objects.c:2011
-#: builtin/pack-objects.c:2021
-#, c-format
-msgid "object %s cannot be read"
+#: builtin/index-pack.c:1118
+msgid "Receiving objects"
msgstr ""
-#: builtin/pack-objects.c:1998 builtin/pack-objects.c:2025
-#, c-format
-msgid "object %s inconsistent object length (%lu vs %lu)"
+#: builtin/index-pack.c:1118
+msgid "Indexing objects"
msgstr ""
-#: builtin/pack-objects.c:2035
-msgid "suboptimal pack - out of memory"
+#: builtin/index-pack.c:1152
+msgid "pack is corrupted (SHA1 mismatch)"
msgstr ""
-#: builtin/pack-objects.c:2369
-#, c-format
-msgid "Delta compression using up to %d threads"
+#: builtin/index-pack.c:1157
+msgid "cannot fstat packfile"
msgstr ""
-#: builtin/pack-objects.c:2505
-#, c-format
-msgid "unable to pack objects reachable from tag %s"
+#: builtin/index-pack.c:1160
+msgid "pack has junk at the end"
msgstr ""
-#: builtin/pack-objects.c:2589
-msgid "Compressing objects"
+#: builtin/index-pack.c:1172
+msgid "confusion beyond insanity in parse_pack_objects()"
msgstr ""
-#: builtin/pack-objects.c:2595
-msgid "inconsistency with delta count"
+#: builtin/index-pack.c:1195
+msgid "Resolving deltas"
msgstr ""
-#: builtin/pack-objects.c:2674
+#: builtin/index-pack.c:1205 builtin/pack-objects.c:2497
#, c-format
-msgid ""
-"expected edge object ID, got garbage:\n"
-" %s"
+msgid "unable to create thread: %s"
msgstr ""
-#: builtin/pack-objects.c:2680
-#, c-format
-msgid ""
-"expected object ID, got garbage:\n"
-" %s"
+#: builtin/index-pack.c:1246
+msgid "confusion beyond insanity"
msgstr ""
-#: builtin/pack-objects.c:2760
-msgid "invalid value for --missing"
+#: builtin/index-pack.c:1252
+#, c-format
+msgid "completed with %d local object"
+msgid_plural "completed with %d local objects"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/index-pack.c:1264
+#, c-format
+msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr ""
-#: builtin/pack-objects.c:2819 builtin/pack-objects.c:2927
-msgid "cannot open pack index"
+#: builtin/index-pack.c:1268
+#, c-format
+msgid "pack has %d unresolved delta"
+msgid_plural "pack has %d unresolved deltas"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/index-pack.c:1292
+#, c-format
+msgid "unable to deflate appended object (%d)"
msgstr ""
-#: builtin/pack-objects.c:2850
+#: builtin/index-pack.c:1388
#, c-format
-msgid "loose object at %s could not be examined"
+msgid "local object %s is corrupt"
msgstr ""
-#: builtin/pack-objects.c:2935
-msgid "unable to force loose object"
+#: builtin/index-pack.c:1402
+#, c-format
+msgid "packfile name '%s' does not end with '.pack'"
msgstr ""
-#: builtin/pack-objects.c:3022
+#: builtin/index-pack.c:1427
#, c-format
-msgid "not a rev '%s'"
+msgid "cannot write %s file '%s'"
msgstr ""
-#: builtin/pack-objects.c:3025
+#: builtin/index-pack.c:1435
#, c-format
-msgid "bad revision '%s'"
+msgid "cannot close written %s file '%s'"
msgstr ""
-#: builtin/pack-objects.c:3045
-msgid "unable to add recent objects"
+#: builtin/index-pack.c:1459
+msgid "error while closing pack file"
msgstr ""
-#: builtin/pack-objects.c:3095
-#, c-format
-msgid "unsupported index version %s"
+#: builtin/index-pack.c:1473
+msgid "cannot store pack file"
+msgstr ""
+
+#: builtin/index-pack.c:1481
+msgid "cannot store index file"
msgstr ""
-#: builtin/pack-objects.c:3099
+#: builtin/index-pack.c:1525 builtin/pack-objects.c:2736
#, c-format
-msgid "bad index version '%s'"
+msgid "bad pack.indexversion=%<PRIu32>"
msgstr ""
-#: builtin/pack-objects.c:3130
-msgid "do not show progress meter"
+#: builtin/index-pack.c:1593
+#, c-format
+msgid "Cannot open existing pack file '%s'"
msgstr ""
-#: builtin/pack-objects.c:3132
-msgid "show progress meter"
+#: builtin/index-pack.c:1595
+#, c-format
+msgid "Cannot open existing pack idx file for '%s'"
msgstr ""
-#: builtin/pack-objects.c:3134
-msgid "show progress meter during object writing phase"
+#: builtin/index-pack.c:1643
+#, c-format
+msgid "non delta: %d object"
+msgid_plural "non delta: %d objects"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/index-pack.c:1650
+#, c-format
+msgid "chain length = %d: %lu object"
+msgid_plural "chain length = %d: %lu objects"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/index-pack.c:1689
+msgid "Cannot come back to cwd"
msgstr ""
-#: builtin/pack-objects.c:3137
-msgid "similar to --all-progress when progress meter is shown"
+#: builtin/index-pack.c:1738 builtin/index-pack.c:1741
+#: builtin/index-pack.c:1757 builtin/index-pack.c:1761
+#, c-format
+msgid "bad %s"
msgstr ""
-#: builtin/pack-objects.c:3138
-msgid "<version>[,<offset>]"
+#: builtin/index-pack.c:1777
+msgid "--fix-thin cannot be used without --stdin"
msgstr ""
-#: builtin/pack-objects.c:3139
-msgid "write the pack index file in the specified idx format version"
+#: builtin/index-pack.c:1779
+msgid "--stdin requires a git repository"
msgstr ""
-#: builtin/pack-objects.c:3142
-msgid "maximum size of each output pack file"
+#: builtin/index-pack.c:1785
+msgid "--verify with no packfile name given"
msgstr ""
-#: builtin/pack-objects.c:3144
-msgid "ignore borrowed objects from alternate object store"
+#: builtin/index-pack.c:1833 builtin/unpack-objects.c:580
+msgid "fsck error in pack objects"
msgstr ""
-#: builtin/pack-objects.c:3146
-msgid "ignore packed objects"
+#: builtin/init-db.c:61
+#, c-format
+msgid "cannot stat template '%s'"
msgstr ""
-#: builtin/pack-objects.c:3148
-msgid "limit pack window by objects"
+#: builtin/init-db.c:66
+#, c-format
+msgid "cannot opendir '%s'"
msgstr ""
-#: builtin/pack-objects.c:3150
-msgid "limit pack window by memory in addition to object limit"
+#: builtin/init-db.c:78
+#, c-format
+msgid "cannot readlink '%s'"
msgstr ""
-#: builtin/pack-objects.c:3152
-msgid "maximum length of delta chain allowed in the resulting pack"
+#: builtin/init-db.c:80
+#, c-format
+msgid "cannot symlink '%s' '%s'"
msgstr ""
-#: builtin/pack-objects.c:3154
-msgid "reuse existing deltas"
+#: builtin/init-db.c:86
+#, c-format
+msgid "cannot copy '%s' to '%s'"
msgstr ""
-#: builtin/pack-objects.c:3156
-msgid "reuse existing objects"
+#: builtin/init-db.c:90
+#, c-format
+msgid "ignoring template %s"
msgstr ""
-#: builtin/pack-objects.c:3158
-msgid "use OFS_DELTA objects"
+#: builtin/init-db.c:121
+#, c-format
+msgid "templates not found in %s"
msgstr ""
-#: builtin/pack-objects.c:3160
-msgid "use threads when searching for best delta matches"
+#: builtin/init-db.c:136
+#, c-format
+msgid "not copying templates from '%s': %s"
msgstr ""
-#: builtin/pack-objects.c:3162
-msgid "do not create an empty pack output"
+#: builtin/init-db.c:334
+#, c-format
+msgid "unable to handle file type %d"
msgstr ""
-#: builtin/pack-objects.c:3164
-msgid "read revision arguments from standard input"
+#: builtin/init-db.c:337
+#, c-format
+msgid "unable to move %s to %s"
msgstr ""
-#: builtin/pack-objects.c:3166
-msgid "limit the objects to those that are not yet packed"
+#: builtin/init-db.c:354 builtin/init-db.c:357
+#, c-format
+msgid "%s already exists"
msgstr ""
-#: builtin/pack-objects.c:3169
-msgid "include objects reachable from any reference"
+#: builtin/init-db.c:413
+#, c-format
+msgid "Reinitialized existing shared Git repository in %s%s\n"
msgstr ""
-#: builtin/pack-objects.c:3172
-msgid "include objects referred by reflog entries"
+#: builtin/init-db.c:414
+#, c-format
+msgid "Reinitialized existing Git repository in %s%s\n"
msgstr ""
-#: builtin/pack-objects.c:3175
-msgid "include objects referred to by the index"
+#: builtin/init-db.c:418
+#, c-format
+msgid "Initialized empty shared Git repository in %s%s\n"
msgstr ""
-#: builtin/pack-objects.c:3178
-msgid "output pack to stdout"
+#: builtin/init-db.c:419
+#, c-format
+msgid "Initialized empty Git repository in %s%s\n"
msgstr ""
-#: builtin/pack-objects.c:3180
-msgid "include tag objects that refer to objects to be packed"
+#: builtin/init-db.c:468
+msgid ""
+"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
+"shared[=<permissions>]] [<directory>]"
msgstr ""
-#: builtin/pack-objects.c:3182
-msgid "keep unreachable objects"
+#: builtin/init-db.c:491
+msgid "permissions"
msgstr ""
-#: builtin/pack-objects.c:3184
-msgid "pack loose unreachable objects"
+#: builtin/init-db.c:492
+msgid "specify that the git repository is to be shared amongst several users"
msgstr ""
-#: builtin/pack-objects.c:3186
-msgid "unpack unreachable objects newer than <time>"
+#: builtin/init-db.c:529 builtin/init-db.c:534
+#, c-format
+msgid "cannot mkdir %s"
msgstr ""
-#: builtin/pack-objects.c:3189
-msgid "create thin packs"
+#: builtin/init-db.c:538
+#, c-format
+msgid "cannot chdir to %s"
msgstr ""
-#: builtin/pack-objects.c:3191
-msgid "create packs suitable for shallow fetches"
+#: builtin/init-db.c:559
+#, c-format
+msgid ""
+"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
+"dir=<directory>)"
msgstr ""
-#: builtin/pack-objects.c:3193
-msgid "ignore packs that have companion .keep file"
+#: builtin/init-db.c:587
+#, c-format
+msgid "Cannot access work tree '%s'"
msgstr ""
-#: builtin/pack-objects.c:3195
-msgid "ignore this pack"
+#: builtin/interpret-trailers.c:16
+msgid ""
+"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
+"<token>[(=|:)<value>])...] [<file>...]"
msgstr ""
-#: builtin/pack-objects.c:3197
-msgid "pack compression level"
+#: builtin/interpret-trailers.c:95
+msgid "edit files in place"
msgstr ""
-#: builtin/pack-objects.c:3199
-msgid "do not hide commits by grafts"
+#: builtin/interpret-trailers.c:96
+msgid "trim empty trailers"
msgstr ""
-#: builtin/pack-objects.c:3201
-msgid "use a bitmap index if available to speed up counting objects"
+#: builtin/interpret-trailers.c:99
+msgid "where to place the new trailer"
msgstr ""
-#: builtin/pack-objects.c:3203
-msgid "write a bitmap index together with the pack index"
+#: builtin/interpret-trailers.c:101
+msgid "action if trailer already exists"
msgstr ""
-#: builtin/pack-objects.c:3206
-msgid "handling for missing objects"
+#: builtin/interpret-trailers.c:103
+msgid "action if trailer is missing"
msgstr ""
-#: builtin/pack-objects.c:3209
-msgid "do not pack objects in promisor packfiles"
+#: builtin/interpret-trailers.c:105
+msgid "output only the trailers"
msgstr ""
-#: builtin/pack-objects.c:3233
-#, c-format
-msgid "delta chain depth %d is too deep, forcing %d"
+#: builtin/interpret-trailers.c:106
+msgid "do not apply config rules"
msgstr ""
-#: builtin/pack-objects.c:3238
-#, c-format
-msgid "pack.deltaCacheLimit is too high, forcing %d"
+#: builtin/interpret-trailers.c:107
+msgid "join whitespace-continued values"
msgstr ""
-#: builtin/pack-objects.c:3294
-msgid "--max-pack-size cannot be used to build a pack for transfer"
+#: builtin/interpret-trailers.c:108
+msgid "set parsing options"
msgstr ""
-#: builtin/pack-objects.c:3296
-msgid "minimum pack size limit is 1 MiB"
+#: builtin/interpret-trailers.c:110
+msgid "do not treat --- specially"
msgstr ""
-#: builtin/pack-objects.c:3301
-msgid "--thin cannot be used to build an indexable pack"
+#: builtin/interpret-trailers.c:111
+msgid "trailer"
msgstr ""
-#: builtin/pack-objects.c:3304
-msgid "--keep-unreachable and --unpack-unreachable are incompatible"
+#: builtin/interpret-trailers.c:112
+msgid "trailer(s) to add"
msgstr ""
-#: builtin/pack-objects.c:3310
-msgid "cannot use --filter without --stdout"
+#: builtin/interpret-trailers.c:123
+msgid "--trailer with --only-input does not make sense"
msgstr ""
-#: builtin/pack-objects.c:3366
-msgid "Enumerating objects"
+#: builtin/interpret-trailers.c:133
+msgid "no input file given for in-place editing"
msgstr ""
-#: builtin/pack-objects.c:3385
-#, c-format
-msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)"
+#: builtin/log.c:55
+msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
msgstr ""
-#: builtin/pack-refs.c:7
-msgid "git pack-refs [<options>]"
+#: builtin/log.c:56
+msgid "git show [<options>] <object>..."
msgstr ""
-#: builtin/pack-refs.c:15
-msgid "pack everything"
+#: builtin/log.c:109
+#, c-format
+msgid "invalid --decorate option: %s"
msgstr ""
-#: builtin/pack-refs.c:16
-msgid "prune loose refs (default)"
+#: builtin/log.c:173
+msgid "show source"
msgstr ""
-#: builtin/prune-packed.c:9
-msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
+#: builtin/log.c:174
+msgid "Use mail map file"
msgstr ""
-#: builtin/prune-packed.c:42
-msgid "Removing duplicate objects"
+#: builtin/log.c:176
+msgid "only decorate refs that match <pattern>"
msgstr ""
-#: builtin/prune.c:12
-msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
+#: builtin/log.c:178
+msgid "do not decorate refs that match <pattern>"
msgstr ""
-#: builtin/prune.c:109
-msgid "report pruned objects"
+#: builtin/log.c:179
+msgid "decorate options"
msgstr ""
-#: builtin/prune.c:112
-msgid "expire objects older than <time>"
+#: builtin/log.c:182
+msgid "Process line range n,m in file, counting from 1"
msgstr ""
-#: builtin/prune.c:114
-msgid "limit traversal to objects outside promisor packfiles"
+#: builtin/log.c:280
+#, c-format
+msgid "Final output: %d %s\n"
msgstr ""
-#: builtin/prune.c:128
-msgid "cannot prune in a precious-objects repo"
+#: builtin/log.c:534
+#, c-format
+msgid "git show %s: bad file"
msgstr ""
-#: builtin/pull.c:59 builtin/pull.c:61
+#: builtin/log.c:549 builtin/log.c:643
#, c-format
-msgid "Invalid value for %s: %s"
+msgid "could not read object %s"
msgstr ""
-#: builtin/pull.c:81
-msgid "git pull [<options>] [<repository> [<refspec>...]]"
+#: builtin/log.c:668
+#, c-format
+msgid "unknown type: %d"
msgstr ""
-#: builtin/pull.c:132
-msgid "control for recursive fetching of submodules"
+#: builtin/log.c:791
+msgid "format.headers without value"
msgstr ""
-#: builtin/pull.c:136
-msgid "Options related to merging"
+#: builtin/log.c:908
+msgid "name of output directory is too long"
msgstr ""
-#: builtin/pull.c:139
-msgid "incorporate changes by rebasing rather than merging"
+#: builtin/log.c:924
+#, c-format
+msgid "cannot open patch file %s"
msgstr ""
-#: builtin/pull.c:166 builtin/rebase--helper.c:23 builtin/revert.c:122
-msgid "allow fast-forward"
+#: builtin/log.c:941
+msgid "need exactly one range"
msgstr ""
-#: builtin/pull.c:175
-msgid "automatically stash/stash pop before and after rebase"
+#: builtin/log.c:951
+msgid "not a range"
msgstr ""
-#: builtin/pull.c:191
-msgid "Options related to fetching"
+#: builtin/log.c:1074
+msgid "cover letter needs email format"
msgstr ""
-#: builtin/pull.c:209
-msgid "number of submodules pulled in parallel"
+#: builtin/log.c:1080
+msgid "failed to create cover-letter file"
msgstr ""
-#: builtin/pull.c:304
+#: builtin/log.c:1159
#, c-format
-msgid "Invalid value for pull.ff: %s"
+msgid "insane in-reply-to: %s"
msgstr ""
-#: builtin/pull.c:420
-msgid ""
-"There is no candidate for rebasing against among the refs that you just "
-"fetched."
+#: builtin/log.c:1186
+msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr ""
-#: builtin/pull.c:422
-msgid ""
-"There are no candidates for merging among the refs that you just fetched."
+#: builtin/log.c:1244
+msgid "two output directories?"
msgstr ""
-#: builtin/pull.c:423
-msgid ""
-"Generally this means that you provided a wildcard refspec which had no\n"
-"matches on the remote end."
+#: builtin/log.c:1355 builtin/log.c:2099 builtin/log.c:2101 builtin/log.c:2113
+#, c-format
+msgid "unknown commit %s"
msgstr ""
-#: builtin/pull.c:426
+#: builtin/log.c:1365 builtin/replace.c:58 builtin/replace.c:207
+#: builtin/replace.c:210
#, 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 "failed to resolve '%s' as a valid ref"
msgstr ""
-#: builtin/pull.c:431 git-parse-remote.sh:73
-msgid "You are not currently on a branch."
+#: builtin/log.c:1370
+msgid "could not find exact merge base"
msgstr ""
-#: builtin/pull.c:433 builtin/pull.c:448 git-parse-remote.sh:79
-msgid "Please specify which branch you want to rebase against."
+#: builtin/log.c:1374
+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/pull.c:435 builtin/pull.c:450 git-parse-remote.sh:82
-msgid "Please specify which branch you want to merge with."
+#: builtin/log.c:1394
+msgid "failed to find exact merge base"
msgstr ""
-#: builtin/pull.c:436 builtin/pull.c:451
-msgid "See git-pull(1) for details."
+#: builtin/log.c:1405
+msgid "base commit should be the ancestor of revision list"
msgstr ""
-#: builtin/pull.c:438 builtin/pull.c:444 builtin/pull.c:453
-#: git-parse-remote.sh:64
-msgid "<remote>"
+#: builtin/log.c:1409
+msgid "base commit shouldn't be in revision list"
msgstr ""
-#: builtin/pull.c:438 builtin/pull.c:453 builtin/pull.c:458 git-rebase.sh:576
-#: git-parse-remote.sh:65
-msgid "<branch>"
+#: builtin/log.c:1462
+msgid "cannot get patch id"
msgstr ""
-#: builtin/pull.c:446 git-parse-remote.sh:75
-msgid "There is no tracking information for the current branch."
+#: builtin/log.c:1514
+msgid "failed to infer range-diff ranges"
msgstr ""
-#: builtin/pull.c:455 git-parse-remote.sh:95
-msgid ""
-"If you wish to set tracking information for this branch you can do so with:"
+#: builtin/log.c:1559
+msgid "use [PATCH n/m] even with a single patch"
msgstr ""
-#: builtin/pull.c:460
-#, c-format
-msgid ""
-"Your configuration specifies to merge with the ref '%s'\n"
-"from the remote, but no such ref was fetched."
+#: builtin/log.c:1562
+msgid "use [PATCH] even with multiple patches"
msgstr ""
-#: builtin/pull.c:829
-msgid "ignoring --verify-signatures for rebase"
+#: builtin/log.c:1566
+msgid "print patches to standard out"
msgstr ""
-#: builtin/pull.c:877
-msgid "--[no-]autostash option is only valid with --rebase."
+#: builtin/log.c:1568
+msgid "generate a cover letter"
msgstr ""
-#: builtin/pull.c:885
-msgid "Updating an unborn branch with changes added to the index."
+#: builtin/log.c:1570
+msgid "use simple number sequence for output file names"
msgstr ""
-#: builtin/pull.c:888
-msgid "pull with rebase"
+#: builtin/log.c:1571
+msgid "sfx"
msgstr ""
-#: builtin/pull.c:889
-msgid "please commit or stash them."
+#: builtin/log.c:1572
+msgid "use <sfx> instead of '.patch'"
msgstr ""
-#: builtin/pull.c:914
-#, c-format
-msgid ""
-"fetch updated the current branch head.\n"
-"fast-forwarding your working tree from\n"
-"commit %s."
+#: builtin/log.c:1574
+msgid "start numbering patches at <n> instead of 1"
msgstr ""
-#: builtin/pull.c:919
-#, 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/log.c:1576
+msgid "mark the series as Nth re-roll"
msgstr ""
-#: builtin/pull.c:934
-msgid "Cannot merge multiple branches into empty head."
+#: builtin/log.c:1578
+msgid "Use [RFC PATCH] instead of [PATCH]"
msgstr ""
-#: builtin/pull.c:938
-msgid "Cannot rebase onto multiple branches."
+#: builtin/log.c:1581
+msgid "Use [<prefix>] instead of [PATCH]"
msgstr ""
-#: builtin/pull.c:945
-msgid "cannot rebase with locally recorded submodule modifications"
+#: builtin/log.c:1584
+msgid "store resulting files in <dir>"
msgstr ""
-#: builtin/push.c:19
-msgid "git push [<options>] [<repository> [<refspec>...]]"
+#: builtin/log.c:1587
+msgid "don't strip/add [PATCH]"
msgstr ""
-#: builtin/push.c:111
-msgid "tag shorthand without <tag>"
+#: builtin/log.c:1590
+msgid "don't output binary diffs"
msgstr ""
-#: builtin/push.c:121
-msgid "--delete only accepts plain target ref names"
+#: builtin/log.c:1592
+msgid "output all-zero hash in From header"
msgstr ""
-#: builtin/push.c:165
-msgid ""
-"\n"
-"To choose either option permanently, see push.default in 'git help config'."
+#: builtin/log.c:1594
+msgid "don't include a patch matching a commit upstream"
msgstr ""
-#: 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"
+#: builtin/log.c:1596
+msgid "show patch format instead of default (patch + stat)"
msgstr ""
-#: 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"
+#: builtin/log.c:1598
+msgid "Messaging"
msgstr ""
-#: 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"
+#: builtin/log.c:1599
+msgid "header"
msgstr ""
-#: builtin/push.c:205
-#, c-format
-msgid "The current branch %s has multiple upstream branches, refusing to push."
+#: builtin/log.c:1600
+msgid "add email header"
msgstr ""
-#: 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."
+#: builtin/log.c:1601 builtin/log.c:1603
+msgid "email"
msgstr ""
-#: builtin/push.c:267
-msgid ""
-"You didn't specify any refspecs to push, and push.default is \"nothing\"."
+#: builtin/log.c:1601
+msgid "add To: header"
msgstr ""
-#: 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."
+#: builtin/log.c:1603
+msgid "add Cc: header"
msgstr ""
-#: 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."
+#: builtin/log.c:1605
+msgid "ident"
msgstr ""
-#: 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."
+#: builtin/log.c:1606
+msgid "set From address to <ident> (or committer ident if absent)"
msgstr ""
-#: builtin/push.c:293
-msgid "Updates were rejected because the tag already exists in the remote."
+#: builtin/log.c:1608
+msgid "message-id"
msgstr ""
-#: 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"
+#: builtin/log.c:1609
+msgid "make first mail a reply to <message-id>"
msgstr ""
-#: builtin/push.c:357
-#, c-format
-msgid "Pushing to %s\n"
+#: builtin/log.c:1610 builtin/log.c:1613
+msgid "boundary"
msgstr ""
-#: builtin/push.c:361
-#, c-format
-msgid "failed to push some refs to '%s'"
+#: builtin/log.c:1611
+msgid "attach the patch"
msgstr ""
-#: builtin/push.c:395
-#, c-format
-msgid "bad repository '%s'"
+#: builtin/log.c:1614
+msgid "inline the patch"
msgstr ""
-#: 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"
+#: builtin/log.c:1618
+msgid "enable message threading, styles: shallow, deep"
msgstr ""
-#: builtin/push.c:551
-msgid "repository"
+#: builtin/log.c:1620
+msgid "signature"
msgstr ""
-#: builtin/push.c:552 builtin/send-pack.c:164
-msgid "push all refs"
+#: builtin/log.c:1621
+msgid "add a signature"
msgstr ""
-#: builtin/push.c:553 builtin/send-pack.c:166
-msgid "mirror all refs"
+#: builtin/log.c:1622
+msgid "base-commit"
msgstr ""
-#: builtin/push.c:555
-msgid "delete refs"
+#: builtin/log.c:1623
+msgid "add prerequisite tree info to the patch series"
msgstr ""
-#: builtin/push.c:556
-msgid "push tags (can't be used with --all or --mirror)"
+#: builtin/log.c:1625
+msgid "add a signature from a file"
msgstr ""
-#: builtin/push.c:559 builtin/send-pack.c:167
-msgid "force updates"
+#: builtin/log.c:1626
+msgid "don't print the patch filenames"
msgstr ""
-#: builtin/push.c:561 builtin/send-pack.c:181
-msgid "<refname>:<expect>"
+#: builtin/log.c:1628
+msgid "show progress while generating patches"
msgstr ""
-#: builtin/push.c:562 builtin/send-pack.c:182
-msgid "require old value of ref to be at this value"
+#: builtin/log.c:1630
+msgid "show changes against <rev> in cover letter or single patch"
msgstr ""
-#: builtin/push.c:565
-msgid "control recursive pushing of submodules"
+#: builtin/log.c:1633
+msgid "show changes against <refspec> in cover letter or single patch"
msgstr ""
-#: builtin/push.c:567 builtin/send-pack.c:175
-msgid "use thin pack"
+#: builtin/log.c:1635
+msgid "percentage by which creation is weighted"
msgstr ""
-#: builtin/push.c:568 builtin/push.c:569 builtin/send-pack.c:161
-#: builtin/send-pack.c:162
-msgid "receive pack program"
+#: builtin/log.c:1710
+#, c-format
+msgid "invalid ident line: %s"
msgstr ""
-#: builtin/push.c:570
-msgid "set upstream for git pull/status"
+#: builtin/log.c:1725
+msgid "-n and -k are mutually exclusive"
msgstr ""
-#: builtin/push.c:573
-msgid "prune locally removed refs"
+#: builtin/log.c:1727
+msgid "--subject-prefix/--rfc and -k are mutually exclusive"
msgstr ""
-#: builtin/push.c:575
-msgid "bypass pre-push hook"
+#: builtin/log.c:1735
+msgid "--name-only does not make sense"
msgstr ""
-#: builtin/push.c:576
-msgid "push missing but relevant tags"
+#: builtin/log.c:1737
+msgid "--name-status does not make sense"
msgstr ""
-#: builtin/push.c:579 builtin/send-pack.c:169
-msgid "GPG sign the push"
+#: builtin/log.c:1739
+msgid "--check does not make sense"
msgstr ""
-#: builtin/push.c:581 builtin/send-pack.c:176
-msgid "request atomic transaction on remote side"
+#: builtin/log.c:1771
+msgid "standard output, or directory, which one?"
msgstr ""
-#: builtin/push.c:599
-msgid "--delete is incompatible with --all, --mirror and --tags"
+#: builtin/log.c:1860
+msgid "--interdiff requires --cover-letter or single patch"
msgstr ""
-#: builtin/push.c:601
-msgid "--delete doesn't make sense without any refs"
+#: builtin/log.c:1864
+msgid "Interdiff:"
msgstr ""
-#: builtin/push.c:604
-msgid "--all and --tags are incompatible"
+#: builtin/log.c:1865
+#, c-format
+msgid "Interdiff against v%d:"
msgstr ""
-#: builtin/push.c:606
-msgid "--all can't be combined with refspecs"
+#: builtin/log.c:1871
+msgid "--creation-factor requires --range-diff"
msgstr ""
-#: builtin/push.c:610
-msgid "--mirror and --tags are incompatible"
+#: builtin/log.c:1875
+msgid "--range-diff requires --cover-letter or single patch"
msgstr ""
-#: builtin/push.c:612
-msgid "--mirror can't be combined with refspecs"
+#: builtin/log.c:1883
+msgid "Range-diff:"
msgstr ""
-#: builtin/push.c:615
-msgid "--all and --mirror are incompatible"
+#: builtin/log.c:1884
+#, c-format
+msgid "Range-diff against v%d:"
msgstr ""
-#: builtin/push.c:634
-msgid "push options must not have new line characters"
+#: builtin/log.c:1895
+#, c-format
+msgid "unable to read signature file '%s'"
msgstr ""
-#: builtin/range-diff.c:8
-msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>"
+#: builtin/log.c:1931
+msgid "Generating patches"
msgstr ""
-#: builtin/range-diff.c:9
-msgid "git range-diff [<options>] <old-tip>...<new-tip>"
+#: builtin/log.c:1975
+msgid "failed to create output files"
msgstr ""
-#: builtin/range-diff.c:10
-msgid "git range-diff [<options>] <base> <old-tip> <new-tip>"
+#: builtin/log.c:2034
+msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr ""
-#: builtin/range-diff.c:26
-msgid "Percentage by which creation is weighted"
+#: builtin/log.c:2088
+#, c-format
+msgid ""
+"Could not find a tracked remote branch, please specify <upstream> manually.\n"
msgstr ""
-#: builtin/range-diff.c:28
-msgid "color both diff and diff-between-diffs"
+#: builtin/ls-files.c:470
+msgid "git ls-files [<options>] [<file>...]"
msgstr ""
-#: builtin/range-diff.c:75 builtin/range-diff.c:79
-#, c-format
-msgid "no .. in range: '%s'"
+#: builtin/ls-files.c:526
+msgid "identify the file status with tags"
msgstr ""
-#: builtin/range-diff.c:89
-msgid "single arg format must be symmetric range"
+#: builtin/ls-files.c:528
+msgid "use lowercase letters for 'assume unchanged' files"
msgstr ""
-#: builtin/range-diff.c:104
-msgid "need two commit ranges"
+#: builtin/ls-files.c:530
+msgid "use lowercase letters for 'fsmonitor clean' files"
msgstr ""
-#: 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>]])"
+#: builtin/ls-files.c:532
+msgid "show cached files in the output (default)"
msgstr ""
-#: builtin/read-tree.c:120
-msgid "write resulting index to <file>"
+#: builtin/ls-files.c:534
+msgid "show deleted files in the output"
msgstr ""
-#: builtin/read-tree.c:123
-msgid "only empty the index"
+#: builtin/ls-files.c:536
+msgid "show modified files in the output"
msgstr ""
-#: builtin/read-tree.c:125
-msgid "Merging"
+#: builtin/ls-files.c:538
+msgid "show other files in the output"
msgstr ""
-#: builtin/read-tree.c:127
-msgid "perform a merge in addition to a read"
+#: builtin/ls-files.c:540
+msgid "show ignored files in the output"
msgstr ""
-#: builtin/read-tree.c:129
-msgid "3-way merge if no file level merging required"
+#: builtin/ls-files.c:543
+msgid "show staged contents' object name in the output"
msgstr ""
-#: builtin/read-tree.c:131
-msgid "3-way merge in presence of adds and removes"
+#: builtin/ls-files.c:545
+msgid "show files on the filesystem that need to be removed"
msgstr ""
-#: builtin/read-tree.c:133
-msgid "same as -m, but discard unmerged entries"
+#: builtin/ls-files.c:547
+msgid "show 'other' directories' names only"
msgstr ""
-#: builtin/read-tree.c:134
-msgid "<subdirectory>/"
+#: builtin/ls-files.c:549
+msgid "show line endings of files"
msgstr ""
-#: builtin/read-tree.c:135
-msgid "read the tree into the index under <subdirectory>/"
+#: builtin/ls-files.c:551
+msgid "don't show empty directories"
msgstr ""
-#: builtin/read-tree.c:138
-msgid "update working tree with merge result"
+#: builtin/ls-files.c:554
+msgid "show unmerged files in the output"
msgstr ""
-#: builtin/read-tree.c:140
-msgid "gitignore"
+#: builtin/ls-files.c:556
+msgid "show resolve-undo information"
msgstr ""
-#: builtin/read-tree.c:141
-msgid "allow explicitly ignored files to be overwritten"
+#: builtin/ls-files.c:558
+msgid "skip files matching pattern"
msgstr ""
-#: builtin/read-tree.c:144
-msgid "don't check the working tree after merging"
+#: builtin/ls-files.c:561
+msgid "exclude patterns are read from <file>"
msgstr ""
-#: builtin/read-tree.c:145
-msgid "don't update the index or the work tree"
+#: builtin/ls-files.c:564
+msgid "read additional per-directory exclude patterns in <file>"
msgstr ""
-#: builtin/read-tree.c:147
-msgid "skip applying sparse checkout filter"
+#: builtin/ls-files.c:566
+msgid "add the standard git exclusions"
msgstr ""
-#: builtin/read-tree.c:149
-msgid "debug unpack-trees"
+#: builtin/ls-files.c:570
+msgid "make the output relative to the project top directory"
msgstr ""
-#: builtin/rebase--helper.c:8
-msgid "git rebase--helper [<options>]"
+#: builtin/ls-files.c:573
+msgid "recurse through submodules"
msgstr ""
-#: builtin/rebase--helper.c:24
-msgid "keep empty commits"
+#: builtin/ls-files.c:575
+msgid "if any <file> is not in the index, treat this as an error"
msgstr ""
-#: builtin/rebase--helper.c:26 builtin/revert.c:124
-msgid "allow commits with empty messages"
+#: builtin/ls-files.c:576
+msgid "tree-ish"
msgstr ""
-#: builtin/rebase--helper.c:27
-msgid "rebase merge commits"
+#: builtin/ls-files.c:577
+msgid "pretend that paths removed since <tree-ish> are still present"
msgstr ""
-#: builtin/rebase--helper.c:29
-msgid "keep original branch points of cousins"
+#: builtin/ls-files.c:579
+msgid "show debugging data"
msgstr ""
-#: builtin/rebase--helper.c:30
-msgid "continue rebase"
+#: 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/rebase--helper.c:32
-msgid "abort rebase"
+#: builtin/ls-remote.c:59
+msgid "do not print remote URL"
msgstr ""
-#: builtin/rebase--helper.c:35
-msgid "make rebase script"
+#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1464
+msgid "exec"
msgstr ""
-#: builtin/rebase--helper.c:37
-msgid "shorten commit ids in the todo list"
+#: builtin/ls-remote.c:61 builtin/ls-remote.c:63
+msgid "path of git-upload-pack on the remote host"
msgstr ""
-#: builtin/rebase--helper.c:39
-msgid "expand commit ids in the todo list"
+#: builtin/ls-remote.c:65
+msgid "limit to tags"
msgstr ""
-#: builtin/rebase--helper.c:41
-msgid "check the todo list"
+#: builtin/ls-remote.c:66
+msgid "limit to heads"
msgstr ""
-#: builtin/rebase--helper.c:43
-msgid "skip unnecessary picks"
+#: builtin/ls-remote.c:67
+msgid "do not show peeled tags"
msgstr ""
-#: builtin/rebase--helper.c:45
-msgid "rearrange fixup/squash lines"
+#: builtin/ls-remote.c:69
+msgid "take url.<base>.insteadOf into account"
msgstr ""
-#: builtin/rebase--helper.c:47
-msgid "insert exec commands in todo list"
+#: builtin/ls-remote.c:72
+msgid "exit with exit code 2 if no matching refs are found"
msgstr ""
-#: builtin/rebase--helper.c:68
-msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
+#: builtin/ls-remote.c:75
+msgid "show underlying ref in addition to the object pointed by it"
msgstr ""
-#: builtin/receive-pack.c:32
-msgid "git receive-pack <git-dir>"
+#: builtin/ls-tree.c:30
+msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
msgstr ""
-#: 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'."
+#: builtin/ls-tree.c:128
+msgid "only show trees"
msgstr ""
-#: 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'."
+#: builtin/ls-tree.c:130
+msgid "recurse into subtrees"
msgstr ""
-#: builtin/receive-pack.c:1923
-msgid "quiet"
+#: builtin/ls-tree.c:132
+msgid "show trees when recursing"
msgstr ""
-#: builtin/receive-pack.c:1937
-msgid "You must specify a directory."
+#: builtin/ls-tree.c:135
+msgid "terminate entries with NUL byte"
msgstr ""
-#: builtin/reflog.c:536 builtin/reflog.c:541
-#, c-format
-msgid "'%s' is not a valid timestamp"
+#: builtin/ls-tree.c:136
+msgid "include object size"
msgstr ""
-#: builtin/remote.c:15
-msgid "git remote [-v | --verbose]"
+#: builtin/ls-tree.c:138 builtin/ls-tree.c:140
+msgid "list only filenames"
msgstr ""
-#: builtin/remote.c:16
-msgid ""
-"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
-"mirror=<fetch|push>] <name> <url>"
+#: builtin/ls-tree.c:143
+msgid "use full path names"
msgstr ""
-#: builtin/remote.c:17 builtin/remote.c:37
-msgid "git remote rename <old> <new>"
+#: builtin/ls-tree.c:145
+msgid "list entire tree; not just current directory (implies --full-name)"
msgstr ""
-#: builtin/remote.c:18 builtin/remote.c:42
-msgid "git remote remove <name>"
+#: builtin/mailsplit.c:241
+#, c-format
+msgid "empty mbox: '%s'"
msgstr ""
-#: builtin/remote.c:19 builtin/remote.c:47
-msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
+#: builtin/merge.c:55
+msgid "git merge [<options>] [<commit>...]"
msgstr ""
-#: builtin/remote.c:20
-msgid "git remote [-v | --verbose] show [-n] <name>"
+#: builtin/merge.c:56
+msgid "git merge --abort"
msgstr ""
-#: builtin/remote.c:21
-msgid "git remote prune [-n | --dry-run] <name>"
+#: builtin/merge.c:57
+msgid "git merge --continue"
msgstr ""
-#: builtin/remote.c:22
-msgid ""
-"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
+#: builtin/merge.c:118
+msgid "switch `m' requires a value"
msgstr ""
-#: builtin/remote.c:23
-msgid "git remote set-branches [--add] <name> <branch>..."
+#: builtin/merge.c:141
+#, c-format
+msgid "option `%s' requires a value"
msgstr ""
-#: builtin/remote.c:24 builtin/remote.c:73
-msgid "git remote get-url [--push] [--all] <name>"
+#: builtin/merge.c:187
+#, c-format
+msgid "Could not find merge strategy '%s'.\n"
msgstr ""
-#: builtin/remote.c:25 builtin/remote.c:78
-msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
+#: builtin/merge.c:188
+#, c-format
+msgid "Available strategies are:"
msgstr ""
-#: builtin/remote.c:26 builtin/remote.c:79
-msgid "git remote set-url --add <name> <newurl>"
+#: builtin/merge.c:193
+#, c-format
+msgid "Available custom strategies are:"
msgstr ""
-#: builtin/remote.c:27 builtin/remote.c:80
-msgid "git remote set-url --delete <name> <url>"
+#: builtin/merge.c:244 builtin/pull.c:151
+msgid "do not show a diffstat at the end of the merge"
msgstr ""
-#: builtin/remote.c:32
-msgid "git remote add [<options>] <name> <url>"
+#: builtin/merge.c:247 builtin/pull.c:154
+msgid "show a diffstat at the end of the merge"
msgstr ""
-#: builtin/remote.c:52
-msgid "git remote set-branches <name> <branch>..."
+#: builtin/merge.c:248 builtin/pull.c:157
+msgid "(synonym to --stat)"
msgstr ""
-#: builtin/remote.c:53
-msgid "git remote set-branches --add <name> <branch>..."
+#: builtin/merge.c:250 builtin/pull.c:160
+msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr ""
-#: builtin/remote.c:58
-msgid "git remote show [<options>] <name>"
+#: builtin/merge.c:253 builtin/pull.c:166
+msgid "create a single commit instead of doing a merge"
msgstr ""
-#: builtin/remote.c:63
-msgid "git remote prune [<options>] <name>"
+#: builtin/merge.c:255 builtin/pull.c:169
+msgid "perform a commit if the merge succeeds (default)"
msgstr ""
-#: builtin/remote.c:68
-msgid "git remote update [<options>] [<group> | <remote>]..."
+#: builtin/merge.c:257 builtin/pull.c:172
+msgid "edit message before committing"
msgstr ""
-#: builtin/remote.c:97
-#, c-format
-msgid "Updating %s"
+#: builtin/merge.c:259
+msgid "allow fast-forward (default)"
msgstr ""
-#: builtin/remote.c:129
-msgid ""
-"--mirror is dangerous and deprecated; please\n"
-"\t use --mirror=fetch or --mirror=push instead"
+#: builtin/merge.c:261 builtin/pull.c:179
+msgid "abort if fast-forward is not possible"
msgstr ""
-#: builtin/remote.c:146
-#, c-format
-msgid "unknown mirror argument: %s"
+#: builtin/merge.c:265 builtin/pull.c:182
+msgid "verify that the named commit has a valid GPG signature"
msgstr ""
-#: builtin/remote.c:162
-msgid "fetch the remote branches"
+#: builtin/merge.c:266 builtin/notes.c:787 builtin/pull.c:186
+#: builtin/rebase.c:492 builtin/rebase.c:1477 builtin/revert.c:114
+msgid "strategy"
msgstr ""
-#: builtin/remote.c:164
-msgid "import all tags and associated objects when fetching"
+#: builtin/merge.c:267 builtin/pull.c:187
+msgid "merge strategy to use"
msgstr ""
-#: builtin/remote.c:167
-msgid "or do not fetch any tag at all (--no-tags)"
+#: builtin/merge.c:268 builtin/pull.c:190
+msgid "option=value"
msgstr ""
-#: builtin/remote.c:169
-msgid "branch(es) to track"
+#: builtin/merge.c:269 builtin/pull.c:191
+msgid "option for selected merge strategy"
msgstr ""
-#: builtin/remote.c:170
-msgid "master branch"
+#: builtin/merge.c:271
+msgid "merge commit message (for a non-fast-forward merge)"
msgstr ""
-#: builtin/remote.c:171
-msgid "push|fetch"
+#: builtin/merge.c:278
+msgid "abort the current in-progress merge"
msgstr ""
-#: builtin/remote.c:172
-msgid "set up remote as a mirror to push to or fetch from"
+#: builtin/merge.c:280
+msgid "--abort but leave index and working tree alone"
msgstr ""
-#: builtin/remote.c:184
-msgid "specifying a master branch makes no sense with --mirror"
+#: builtin/merge.c:282
+msgid "continue the current in-progress merge"
msgstr ""
-#: builtin/remote.c:186
-msgid "specifying branches to track makes sense only with fetch mirrors"
+#: builtin/merge.c:284 builtin/pull.c:198
+msgid "allow merging unrelated histories"
msgstr ""
-#: builtin/remote.c:193 builtin/remote.c:635
-#, c-format
-msgid "remote %s already exists."
+#: builtin/merge.c:290
+msgid "verify commit-msg hook"
msgstr ""
-#: builtin/remote.c:197 builtin/remote.c:639
-#, c-format
-msgid "'%s' is not a valid remote name"
+#: builtin/merge.c:307
+msgid "could not run stash."
msgstr ""
-#: builtin/remote.c:237
-#, c-format
-msgid "Could not setup master '%s'"
+#: builtin/merge.c:312
+msgid "stash failed"
msgstr ""
-#: builtin/remote.c:343
+#: builtin/merge.c:317
#, c-format
-msgid "Could not get fetch map for refspec %s"
+msgid "not a valid object: %s"
msgstr ""
-#: builtin/remote.c:442 builtin/remote.c:450
-msgid "(matching)"
+#: builtin/merge.c:339 builtin/merge.c:356
+msgid "read-tree failed"
msgstr ""
-#: builtin/remote.c:454
-msgid "(delete)"
+#: builtin/merge.c:386
+msgid " (nothing to squash)"
msgstr ""
-#: builtin/remote.c:628 builtin/remote.c:764 builtin/remote.c:863
+#: builtin/merge.c:397
#, c-format
-msgid "No such remote: %s"
+msgid "Squash commit -- not updating HEAD\n"
msgstr ""
-#: builtin/remote.c:645
+#: builtin/merge.c:447
#, c-format
-msgid "Could not rename config section '%s' to '%s'"
+msgid "No merge message -- not updating HEAD\n"
msgstr ""
-#: builtin/remote.c:665
+#: builtin/merge.c:498
#, c-format
-msgid ""
-"Not updating non-default fetch refspec\n"
-"\t%s\n"
-"\tPlease update the configuration manually if necessary."
+msgid "'%s' does not point to a commit"
msgstr ""
-#: builtin/remote.c:701
+#: builtin/merge.c:585
#, c-format
-msgid "deleting '%s' failed"
+msgid "Bad branch.%s.mergeoptions string: %s"
msgstr ""
-#: builtin/remote.c:735
-#, c-format
-msgid "creating '%s' failed"
+#: builtin/merge.c:708
+msgid "Not handling anything other than two heads merge."
msgstr ""
-#: 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
+#: builtin/merge.c:722
#, c-format
-msgid "Could not remove config section '%s'"
+msgid "Unknown option for merge-recursive: -X%s"
msgstr ""
-#: builtin/remote.c:916
+#: builtin/merge.c:737
#, c-format
-msgid " new (next fetch will store in remotes/%s)"
+msgid "unable to write %s"
msgstr ""
-#: builtin/remote.c:919
-msgid " tracked"
+#: builtin/merge.c:789
+#, c-format
+msgid "Could not read from '%s'"
msgstr ""
-#: builtin/remote.c:921
-msgid " stale (use 'git remote prune' to remove)"
+#: builtin/merge.c:798
+#, c-format
+msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr ""
-#: builtin/remote.c:923
-msgid " ???"
+#: builtin/merge.c:804
+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"
msgstr ""
-#: builtin/remote.c:964
-#, c-format
-msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
+#: builtin/merge.c:809
+msgid "An empty message aborts the commit.\n"
msgstr ""
-#: builtin/remote.c:973
+#: builtin/merge.c:812
#, c-format
-msgid "rebases interactively onto remote %s"
+msgid ""
+"Lines starting with '%c' will be ignored, and an empty message aborts\n"
+"the commit.\n"
msgstr ""
-#: builtin/remote.c:975
-#, c-format
-msgid "rebases interactively (with merges) onto remote %s"
+#: builtin/merge.c:853
+msgid "Empty commit message."
msgstr ""
-#: builtin/remote.c:978
+#: builtin/merge.c:872
#, c-format
-msgid "rebases onto remote %s"
+msgid "Wonderful.\n"
msgstr ""
-#: builtin/remote.c:982
+#: builtin/merge.c:933
#, c-format
-msgid " merges with remote %s"
+msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr ""
-#: builtin/remote.c:985
-#, c-format
-msgid "merges with remote %s"
+#: builtin/merge.c:972
+msgid "No current branch."
msgstr ""
-#: builtin/remote.c:988
-#, c-format
-msgid "%-*s and with remote %s\n"
+#: builtin/merge.c:974
+msgid "No remote for the current branch."
msgstr ""
-#: builtin/remote.c:1031
-msgid "create"
+#: builtin/merge.c:976
+msgid "No default upstream defined for the current branch."
msgstr ""
-#: builtin/remote.c:1034
-msgid "delete"
+#: builtin/merge.c:981
+#, c-format
+msgid "No remote-tracking branch for %s from %s"
msgstr ""
-#: builtin/remote.c:1038
-msgid "up to date"
+#: builtin/merge.c:1038
+#, c-format
+msgid "Bad value '%s' in environment '%s'"
msgstr ""
-#: builtin/remote.c:1041
-msgid "fast-forwardable"
+#: builtin/merge.c:1141
+#, c-format
+msgid "not something we can merge in %s: %s"
msgstr ""
-#: builtin/remote.c:1044
-msgid "local out of date"
+#: builtin/merge.c:1175
+msgid "not something we can merge"
msgstr ""
-#: builtin/remote.c:1051
-#, c-format
-msgid " %-*s forces to %-*s (%s)"
+#: builtin/merge.c:1278
+msgid "--abort expects no arguments"
msgstr ""
-#: builtin/remote.c:1054
-#, c-format
-msgid " %-*s pushes to %-*s (%s)"
+#: builtin/merge.c:1282
+msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr ""
-#: builtin/remote.c:1058
-#, c-format
-msgid " %-*s forces to %s"
+#: builtin/merge.c:1291
+msgid "--quit expects no arguments"
msgstr ""
-#: builtin/remote.c:1061
-#, c-format
-msgid " %-*s pushes to %s"
+#: builtin/merge.c:1304
+msgid "--continue expects no arguments"
msgstr ""
-#: builtin/remote.c:1129
-msgid "do not query remotes"
+#: builtin/merge.c:1308
+msgid "There is no merge in progress (MERGE_HEAD missing)."
msgstr ""
-#: builtin/remote.c:1156
-#, c-format
-msgid "* remote %s"
+#: builtin/merge.c:1324
+msgid ""
+"You have not concluded your merge (MERGE_HEAD exists).\n"
+"Please, commit your changes before you merge."
msgstr ""
-#: builtin/remote.c:1157
-#, c-format
-msgid " Fetch URL: %s"
+#: builtin/merge.c:1331
+msgid ""
+"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
+"Please, commit your changes before you merge."
msgstr ""
-#: builtin/remote.c:1158 builtin/remote.c:1174 builtin/remote.c:1313
-msgid "(no URL)"
+#: builtin/merge.c:1334
+msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr ""
-#. 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"
+#: builtin/merge.c:1348
+msgid "You cannot combine --squash with --no-ff."
msgstr ""
-#: builtin/remote.c:1176 builtin/remote.c:1178 builtin/remote.c:1180
-#, c-format
-msgid " HEAD branch: %s"
+#: builtin/merge.c:1350
+msgid "You cannot combine --squash with --commit."
msgstr ""
-#: builtin/remote.c:1176
-msgid "(not queried)"
+#: builtin/merge.c:1366
+msgid "No commit specified and merge.defaultToUpstream not set."
msgstr ""
-#: builtin/remote.c:1178
-msgid "(unknown)"
+#: builtin/merge.c:1383
+msgid "Squash commit into empty head not supported yet"
msgstr ""
-#: builtin/remote.c:1182
-#, c-format
-msgid ""
-" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
+#: builtin/merge.c:1385
+msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr ""
-#: builtin/remote.c:1194
+#: builtin/merge.c:1390
#, c-format
-msgid " Remote branch:%s"
-msgid_plural " Remote branches:%s"
-msgstr[0] ""
-msgstr[1] ""
+msgid "%s - not something we can merge"
+msgstr ""
-#: builtin/remote.c:1197 builtin/remote.c:1223
-msgid " (status not queried)"
+#: builtin/merge.c:1392
+msgid "Can merge only exactly one commit into empty head"
msgstr ""
-#: builtin/remote.c:1206
-msgid " Local branch configured for 'git pull':"
-msgid_plural " Local branches configured for 'git pull':"
-msgstr[0] ""
-msgstr[1] ""
+#: builtin/merge.c:1471
+msgid "refusing to merge unrelated histories"
+msgstr ""
-#: builtin/remote.c:1214
-msgid " Local refs will be mirrored by 'git push'"
+#: builtin/merge.c:1480
+msgid "Already up to date."
msgstr ""
-#: builtin/remote.c:1220
+#: builtin/merge.c:1490
#, c-format
-msgid " Local ref configured for 'git push'%s:"
-msgid_plural " Local refs configured for 'git push'%s:"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/remote.c:1241
-msgid "set refs/remotes/<name>/HEAD according to remote"
+msgid "Updating %s..%s\n"
msgstr ""
-#: builtin/remote.c:1243
-msgid "delete refs/remotes/<name>/HEAD"
+#: builtin/merge.c:1532
+#, c-format
+msgid "Trying really trivial in-index merge...\n"
msgstr ""
-#: builtin/remote.c:1258
-msgid "Cannot determine remote HEAD"
+#: builtin/merge.c:1539
+#, c-format
+msgid "Nope.\n"
msgstr ""
-#: builtin/remote.c:1260
-msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
+#: builtin/merge.c:1564
+msgid "Already up to date. Yeeah!"
msgstr ""
-#: builtin/remote.c:1270
-#, c-format
-msgid "Could not delete %s"
+#: builtin/merge.c:1570
+msgid "Not possible to fast-forward, aborting."
msgstr ""
-#: builtin/remote.c:1278
+#: builtin/merge.c:1593 builtin/merge.c:1658
#, c-format
-msgid "Not a valid ref: %s"
+msgid "Rewinding the tree to pristine...\n"
msgstr ""
-#: builtin/remote.c:1280
+#: builtin/merge.c:1597
#, c-format
-msgid "Could not setup %s"
+msgid "Trying merge strategy %s...\n"
msgstr ""
-#: builtin/remote.c:1298
+#: builtin/merge.c:1649
#, c-format
-msgid " %s will become dangling!"
+msgid "No merge strategy handled the merge.\n"
msgstr ""
-#: builtin/remote.c:1299
+#: builtin/merge.c:1651
#, c-format
-msgid " %s has become dangling!"
+msgid "Merge with strategy %s failed.\n"
msgstr ""
-#: builtin/remote.c:1309
+#: builtin/merge.c:1660
#, c-format
-msgid "Pruning %s"
+msgid "Using the %s to prepare resolving by hand.\n"
msgstr ""
-#: builtin/remote.c:1310
+#: builtin/merge.c:1672
#, c-format
-msgid "URL: %s"
+msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
-#: builtin/remote.c:1326
-#, c-format
-msgid " * [would prune] %s"
+#: builtin/merge-base.c:32
+msgid "git merge-base [-a | --all] <commit> <commit>..."
msgstr ""
-#: builtin/remote.c:1329
-#, c-format
-msgid " * [pruned] %s"
+#: builtin/merge-base.c:33
+msgid "git merge-base [-a | --all] --octopus <commit>..."
msgstr ""
-#: builtin/remote.c:1374
-msgid "prune remotes after fetching"
+#: builtin/merge-base.c:34
+msgid "git merge-base --independent <commit>..."
msgstr ""
-#: builtin/remote.c:1437 builtin/remote.c:1491 builtin/remote.c:1559
-#, c-format
-msgid "No such remote '%s'"
+#: builtin/merge-base.c:35
+msgid "git merge-base --is-ancestor <commit> <commit>"
msgstr ""
-#: builtin/remote.c:1453
-msgid "add branch"
+#: builtin/merge-base.c:36
+msgid "git merge-base --fork-point <ref> [<commit>]"
msgstr ""
-#: builtin/remote.c:1460
-msgid "no remote specified"
+#: builtin/merge-base.c:153
+msgid "output all common ancestors"
msgstr ""
-#: builtin/remote.c:1477
-msgid "query push URLs rather than fetch URLs"
+#: builtin/merge-base.c:155
+msgid "find ancestors for a single n-way merge"
msgstr ""
-#: builtin/remote.c:1479
-msgid "return all URLs"
+#: builtin/merge-base.c:157
+msgid "list revs not reachable from others"
msgstr ""
-#: builtin/remote.c:1507
-#, c-format
-msgid "no URLs configured for remote '%s'"
+#: builtin/merge-base.c:159
+msgid "is the first one ancestor of the other?"
msgstr ""
-#: builtin/remote.c:1533
-msgid "manipulate push URLs"
+#: builtin/merge-base.c:161
+msgid "find where <commit> forked from reflog of <ref>"
msgstr ""
-#: builtin/remote.c:1535
-msgid "add URL"
+#: builtin/merge-file.c:9
+msgid ""
+"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
+"<orig-file> <file2>"
msgstr ""
-#: builtin/remote.c:1537
-msgid "delete URLs"
+#: builtin/merge-file.c:35
+msgid "send results to standard output"
msgstr ""
-#: builtin/remote.c:1544
-msgid "--add --delete doesn't make sense"
+#: builtin/merge-file.c:36
+msgid "use a diff3 based merge"
msgstr ""
-#: builtin/remote.c:1583
-#, c-format
-msgid "Invalid old URL pattern: %s"
+#: builtin/merge-file.c:37
+msgid "for conflicts, use our version"
msgstr ""
-#: builtin/remote.c:1591
-#, c-format
-msgid "No such URL found: %s"
+#: builtin/merge-file.c:39
+msgid "for conflicts, use their version"
msgstr ""
-#: builtin/remote.c:1593
-msgid "Will not delete all non-push URLs"
+#: builtin/merge-file.c:41
+msgid "for conflicts, use a union version"
msgstr ""
-#: builtin/remote.c:1609
-msgid "be verbose; must be placed before a subcommand"
+#: builtin/merge-file.c:44
+msgid "for conflicts, use this marker size"
msgstr ""
-#: builtin/remote.c:1640
-#, c-format
-msgid "Unknown subcommand: %s"
+#: builtin/merge-file.c:45
+msgid "do not warn about conflicts"
msgstr ""
-#: builtin/repack.c:20
-msgid "git repack [<options>]"
+#: builtin/merge-file.c:47
+msgid "set labels for file1/orig-file/file2"
msgstr ""
-#: builtin/repack.c:25
-msgid ""
-"Incremental repacks are incompatible with bitmap indexes. Use\n"
-"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
+#: builtin/merge-recursive.c:46
+#, c-format
+msgid "unknown option %s"
msgstr ""
-#: builtin/repack.c:287
-msgid "pack everything in a single pack"
+#: builtin/merge-recursive.c:52
+#, c-format
+msgid "could not parse object '%s'"
msgstr ""
-#: builtin/repack.c:289
-msgid "same as -a, and turn unreachable objects loose"
-msgstr ""
+#: builtin/merge-recursive.c:56
+#, 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/repack.c:292
-msgid "remove redundant packs, and run git-prune-packed"
+#: builtin/merge-recursive.c:64
+msgid "not handling anything other than two heads merge."
msgstr ""
-#: builtin/repack.c:294
-msgid "pass --no-reuse-delta to git-pack-objects"
+#: builtin/merge-recursive.c:70 builtin/merge-recursive.c:72
+#, c-format
+msgid "could not resolve ref '%s'"
msgstr ""
-#: builtin/repack.c:296
-msgid "pass --no-reuse-object to git-pack-objects"
+#: builtin/merge-recursive.c:78
+#, c-format
+msgid "Merging %s with %s\n"
msgstr ""
-#: builtin/repack.c:298
-msgid "do not run git-update-server-info"
+#: builtin/mktree.c:66
+msgid "git mktree [-z] [--missing] [--batch]"
msgstr ""
-#: builtin/repack.c:301
-msgid "pass --local to git-pack-objects"
+#: builtin/mktree.c:154
+msgid "input is NUL terminated"
msgstr ""
-#: builtin/repack.c:303
-msgid "write bitmap index"
+#: builtin/mktree.c:155 builtin/write-tree.c:26
+msgid "allow missing objects"
msgstr ""
-#: builtin/repack.c:304
-msgid "approxidate"
+#: builtin/mktree.c:156
+msgid "allow creation of more than one tree"
msgstr ""
-#: builtin/repack.c:305
-msgid "with -A, do not loosen objects older than this"
+#: builtin/multi-pack-index.c:9
+msgid ""
+"git multi-pack-index [--object-dir=<dir>] (write|verify|expire|repack --"
+"batch-size=<size>)"
msgstr ""
-#: builtin/repack.c:307
-msgid "with -a, repack unreachable objects"
+#: builtin/multi-pack-index.c:23
+msgid "object directory containing set of packfile and pack-index pairs"
msgstr ""
-#: builtin/repack.c:309
-msgid "size of the window used for delta compression"
+#: builtin/multi-pack-index.c:25
+msgid ""
+"during repack, collect pack-files of smaller size into a batch that is "
+"larger than this size"
msgstr ""
-#: builtin/repack.c:310 builtin/repack.c:316
-msgid "bytes"
+#: builtin/multi-pack-index.c:43 builtin/prune-packed.c:67
+msgid "too many arguments"
msgstr ""
-#: builtin/repack.c:311
-msgid "same as the above, but limit memory size instead of entries count"
+#: builtin/multi-pack-index.c:52
+msgid "--batch-size option is only for 'repack' subcommand"
msgstr ""
-#: builtin/repack.c:313
-msgid "limits the maximum delta depth"
+#: builtin/multi-pack-index.c:61
+#, c-format
+msgid "unrecognized subcommand: %s"
msgstr ""
-#: builtin/repack.c:315
-msgid "limits the maximum number of threads"
+#: builtin/mv.c:18
+msgid "git mv [<options>] <source>... <destination>"
msgstr ""
-#: builtin/repack.c:317
-msgid "maximum size of each packfile"
+#: builtin/mv.c:83
+#, c-format
+msgid "Directory %s is in index and no submodule?"
msgstr ""
-#: builtin/repack.c:319
-msgid "repack objects in packs marked with .keep"
+#: builtin/mv.c:85
+msgid "Please stage your changes to .gitmodules or stash them to proceed"
msgstr ""
-#: builtin/repack.c:321
-msgid "do not repack this pack"
+#: builtin/mv.c:103
+#, c-format
+msgid "%.*s is in index"
msgstr ""
-#: builtin/repack.c:331
-msgid "cannot delete packs in a precious-objects repo"
+#: builtin/mv.c:125
+msgid "force move/rename even if target exists"
msgstr ""
-#: builtin/repack.c:335
-msgid "--keep-unreachable and -A are incompatible"
+#: builtin/mv.c:127
+msgid "skip move/rename errors"
msgstr ""
-#: builtin/repack.c:510 builtin/worktree.c:139
+#: builtin/mv.c:169
#, c-format
-msgid "failed to remove '%s'"
+msgid "destination '%s' is not a directory"
msgstr ""
-#: builtin/replace.c:22
-msgid "git replace [-f] <object> <replacement>"
+#: builtin/mv.c:180
+#, c-format
+msgid "Checking rename of '%s' to '%s'\n"
msgstr ""
-#: builtin/replace.c:23
-msgid "git replace [-f] --edit <object>"
+#: builtin/mv.c:184
+msgid "bad source"
msgstr ""
-#: builtin/replace.c:24
-msgid "git replace [-f] --graft <commit> [<parent>...]"
+#: builtin/mv.c:187
+msgid "can not move directory into itself"
msgstr ""
-#: builtin/replace.c:25
-msgid "git replace [-f] --convert-graft-file"
+#: builtin/mv.c:190
+msgid "cannot move directory over file"
msgstr ""
-#: builtin/replace.c:26
-msgid "git replace -d <object>..."
+#: builtin/mv.c:199
+msgid "source directory is empty"
msgstr ""
-#: builtin/replace.c:27
-msgid "git replace [--format=<format>] [-l [<pattern>]]"
+#: builtin/mv.c:224
+msgid "not under version control"
msgstr ""
-#: builtin/replace.c:57 builtin/replace.c:203 builtin/replace.c:206
-#, c-format
-msgid "failed to resolve '%s' as a valid ref"
+#: builtin/mv.c:227
+msgid "destination exists"
msgstr ""
-#: builtin/replace.c:86
+#: builtin/mv.c:235
#, c-format
-msgid ""
-"invalid replace format '%s'\n"
-"valid formats are 'short', 'medium' and 'long'"
+msgid "overwriting '%s'"
msgstr ""
-#: builtin/replace.c:121
-#, c-format
-msgid "replace ref '%s' not found"
+#: builtin/mv.c:238
+msgid "Cannot overwrite"
msgstr ""
-#: builtin/replace.c:137
-#, c-format
-msgid "Deleted replace ref '%s'"
+#: builtin/mv.c:241
+msgid "multiple sources for the same target"
msgstr ""
-#: builtin/replace.c:149
-#, c-format
-msgid "'%s' is not a valid ref name"
+#: builtin/mv.c:243
+msgid "destination directory does not exist"
msgstr ""
-#: builtin/replace.c:154
+#: builtin/mv.c:250
#, c-format
-msgid "replace ref '%s' already exists"
+msgid "%s, source=%s, destination=%s"
msgstr ""
-#: builtin/replace.c:174
+#: builtin/mv.c:271
#, c-format
-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'."
+msgid "Renaming %s to %s\n"
msgstr ""
-#: builtin/replace.c:225
+#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:510
#, c-format
-msgid "unable to open %s for writing"
+msgid "renaming '%s' failed"
msgstr ""
-#: builtin/replace.c:238
-msgid "cat-file reported failure"
+#: builtin/name-rev.c:352
+msgid "git name-rev [<options>] <commit>..."
msgstr ""
-#: builtin/replace.c:254
-#, c-format
-msgid "unable to open %s for reading"
+#: builtin/name-rev.c:353
+msgid "git name-rev [<options>] --all"
msgstr ""
-#: builtin/replace.c:268
-msgid "unable to spawn mktree"
+#: builtin/name-rev.c:354
+msgid "git name-rev [<options>] --stdin"
msgstr ""
-#: builtin/replace.c:272
-msgid "unable to read from mktree"
+#: builtin/name-rev.c:411
+msgid "print only names (no SHA-1)"
msgstr ""
-#: builtin/replace.c:281
-msgid "mktree reported failure"
+#: builtin/name-rev.c:412
+msgid "only use tags to name the commits"
msgstr ""
-#: builtin/replace.c:285
-msgid "mktree did not return an object name"
+#: builtin/name-rev.c:414
+msgid "only use refs matching <pattern>"
msgstr ""
-#: builtin/replace.c:294
-#, c-format
-msgid "unable to fstat %s"
+#: builtin/name-rev.c:416
+msgid "ignore refs matching <pattern>"
msgstr ""
-#: builtin/replace.c:299
-msgid "unable to write object to database"
+#: builtin/name-rev.c:418
+msgid "list all commits reachable from all refs"
msgstr ""
-#: 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'"
+#: builtin/name-rev.c:419
+msgid "read from stdin"
msgstr ""
-#: builtin/replace.c:322
-#, c-format
-msgid "unable to get object type for %s"
+#: builtin/name-rev.c:420
+msgid "allow to print `undefined` names (default)"
msgstr ""
-#: builtin/replace.c:338
-msgid "editing object file failed"
+#: builtin/name-rev.c:426
+msgid "dereference tags in the input (internal use)"
msgstr ""
-#: builtin/replace.c:347
-#, c-format
-msgid "new object is the same as the old one: '%s'"
+#: builtin/notes.c:28
+msgid "git notes [--ref <notes-ref>] [list [<object>]]"
msgstr ""
-#: builtin/replace.c:407
-#, c-format
-msgid "bad mergetag in commit '%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/replace.c:409
-#, c-format
-msgid "malformed mergetag in commit '%s'"
+#: builtin/notes.c:30
+msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
msgstr ""
-#: builtin/replace.c:421
-#, c-format
+#: builtin/notes.c:31
msgid ""
-"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
-"instead of --graft"
+"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
+"(-c | -C) <object>] [<object>]"
msgstr ""
-#: builtin/replace.c:460
-#, c-format
-msgid "the original commit '%s' has a gpg signature"
+#: builtin/notes.c:32
+msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
msgstr ""
-#: builtin/replace.c:461
-msgid "the signature will be removed in the replacement commit!"
+#: builtin/notes.c:33
+msgid "git notes [--ref <notes-ref>] show [<object>]"
msgstr ""
-#: builtin/replace.c:471
-#, c-format
-msgid "could not write replacement commit for: '%s'"
+#: builtin/notes.c:34
+msgid ""
+"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
msgstr ""
-#: builtin/replace.c:479
-#, c-format
-msgid "graft for '%s' unnecessary"
+#: builtin/notes.c:35
+msgid "git notes merge --commit [-v | -q]"
msgstr ""
-#: builtin/replace.c:482
-#, c-format
-msgid "new commit is the same as the old one: '%s'"
+#: builtin/notes.c:36
+msgid "git notes merge --abort [-v | -q]"
msgstr ""
-#: builtin/replace.c:514
-#, c-format
-msgid ""
-"could not convert the following graft(s):\n"
-"%s"
+#: builtin/notes.c:37
+msgid "git notes [--ref <notes-ref>] remove [<object>...]"
msgstr ""
-#: builtin/replace.c:535
-msgid "list replace refs"
+#: builtin/notes.c:38
+msgid "git notes [--ref <notes-ref>] prune [-n] [-v]"
msgstr ""
-#: builtin/replace.c:536
-msgid "delete replace refs"
+#: builtin/notes.c:39
+msgid "git notes [--ref <notes-ref>] get-ref"
msgstr ""
-#: builtin/replace.c:537
-msgid "edit existing object"
+#: builtin/notes.c:44
+msgid "git notes [list [<object>]]"
msgstr ""
-#: builtin/replace.c:538
-msgid "change a commit's parents"
+#: builtin/notes.c:49
+msgid "git notes add [<options>] [<object>]"
msgstr ""
-#: builtin/replace.c:539
-msgid "convert existing graft file"
+#: builtin/notes.c:54
+msgid "git notes copy [<options>] <from-object> <to-object>"
msgstr ""
-#: builtin/replace.c:540
-msgid "replace the ref if it exists"
+#: builtin/notes.c:55
+msgid "git notes copy --stdin [<from-object> <to-object>]..."
msgstr ""
-#: builtin/replace.c:542
-msgid "do not pretty-print contents for --edit"
+#: builtin/notes.c:60
+msgid "git notes append [<options>] [<object>]"
msgstr ""
-#: builtin/replace.c:543
-msgid "use this format"
+#: builtin/notes.c:65
+msgid "git notes edit [<object>]"
msgstr ""
-#: builtin/replace.c:556
-msgid "--format cannot be used when not listing"
+#: builtin/notes.c:70
+msgid "git notes show [<object>]"
msgstr ""
-#: builtin/replace.c:564
-msgid "-f only makes sense when writing a replacement"
+#: builtin/notes.c:75
+msgid "git notes merge [<options>] <notes-ref>"
msgstr ""
-#: builtin/replace.c:568
-msgid "--raw only makes sense with --edit"
+#: builtin/notes.c:76
+msgid "git notes merge --commit [<options>]"
msgstr ""
-#: builtin/replace.c:574
-msgid "-d needs at least one argument"
+#: builtin/notes.c:77
+msgid "git notes merge --abort [<options>]"
msgstr ""
-#: builtin/replace.c:580
-msgid "bad number of arguments"
+#: builtin/notes.c:82
+msgid "git notes remove [<object>]"
msgstr ""
-#: builtin/replace.c:586
-msgid "-e needs exactly one argument"
+#: builtin/notes.c:87
+msgid "git notes prune [<options>]"
msgstr ""
-#: builtin/replace.c:592
-msgid "-g needs at least one argument"
+#: builtin/notes.c:92
+msgid "git notes get-ref"
msgstr ""
-#: builtin/replace.c:598
-msgid "--convert-graft-file takes no argument"
+#: builtin/notes.c:97
+msgid "Write/edit the notes for the following object:"
msgstr ""
-#: builtin/replace.c:604
-msgid "only one pattern can be given with -l"
+#: builtin/notes.c:150
+#, c-format
+msgid "unable to start 'show' for object '%s'"
msgstr ""
-#: builtin/rerere.c:13
-msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
+#: builtin/notes.c:154
+msgid "could not read 'show' output"
msgstr ""
-#: builtin/rerere.c:59
-msgid "register clean resolutions in index"
+#: builtin/notes.c:162
+#, c-format
+msgid "failed to finish 'show' for object '%s'"
msgstr ""
-#: builtin/reset.c:29
-msgid ""
-"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
+#: builtin/notes.c:197
+msgid "please supply the note contents using either -m or -F option"
msgstr ""
-#: builtin/reset.c:30
-msgid "git reset [-q] [<tree-ish>] [--] <paths>..."
+#: builtin/notes.c:206
+msgid "unable to write note object"
msgstr ""
-#: builtin/reset.c:31
-msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
+#: builtin/notes.c:208
+#, c-format
+msgid "the note contents have been left in %s"
msgstr ""
-#: builtin/reset.c:37
-msgid "mixed"
+#: builtin/notes.c:242 builtin/tag.c:532
+#, c-format
+msgid "could not open or read '%s'"
msgstr ""
-#: builtin/reset.c:37
-msgid "soft"
+#: builtin/notes.c:263 builtin/notes.c:313 builtin/notes.c:315
+#: builtin/notes.c:383 builtin/notes.c:438 builtin/notes.c:526
+#: builtin/notes.c:531 builtin/notes.c:610 builtin/notes.c:672
+#, c-format
+msgid "failed to resolve '%s' as a valid ref."
msgstr ""
-#: builtin/reset.c:37
-msgid "hard"
+#: builtin/notes.c:265
+#, c-format
+msgid "failed to read object '%s'."
msgstr ""
-#: builtin/reset.c:37
-msgid "merge"
+#: builtin/notes.c:268
+#, c-format
+msgid "cannot read note data from non-blob object '%s'."
msgstr ""
-#: builtin/reset.c:37
-msgid "keep"
+#: builtin/notes.c:309
+#, c-format
+msgid "malformed input line: '%s'."
msgstr ""
-#: builtin/reset.c:78
-msgid "You do not have a valid HEAD."
+#: builtin/notes.c:324
+#, c-format
+msgid "failed to copy notes from '%s' to '%s'"
msgstr ""
-#: builtin/reset.c:80
-msgid "Failed to find tree of HEAD."
+#. TRANSLATORS: the first %s will be replaced by a git
+#. notes command: 'add', 'merge', 'remove', etc.
+#.
+#: builtin/notes.c:356
+#, c-format
+msgid "refusing to %s notes in %s (outside of refs/notes/)"
msgstr ""
-#: builtin/reset.c:86
-#, c-format
-msgid "Failed to find tree of %s."
+#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:509
+#: builtin/notes.c:521 builtin/notes.c:598 builtin/notes.c:665
+#: builtin/notes.c:815 builtin/notes.c:963 builtin/notes.c:985
+msgid "too many parameters"
msgstr ""
-#: builtin/reset.c:111
+#: builtin/notes.c:389 builtin/notes.c:678
#, c-format
-msgid "HEAD is now at %s"
+msgid "no note found for object %s."
msgstr ""
-#: builtin/reset.c:189
-#, c-format
-msgid "Cannot do a %s reset in the middle of a merge."
+#: builtin/notes.c:410 builtin/notes.c:576
+msgid "note contents as a string"
msgstr ""
-#: builtin/reset.c:289
-msgid "be quiet, only report errors"
+#: builtin/notes.c:413 builtin/notes.c:579
+msgid "note contents in a file"
msgstr ""
-#: builtin/reset.c:291
-msgid "reset HEAD and index"
+#: builtin/notes.c:416 builtin/notes.c:582
+msgid "reuse and edit specified note object"
msgstr ""
-#: builtin/reset.c:292
-msgid "reset only HEAD"
+#: builtin/notes.c:419 builtin/notes.c:585
+msgid "reuse specified note object"
msgstr ""
-#: builtin/reset.c:294 builtin/reset.c:296
-msgid "reset HEAD, index and working tree"
+#: builtin/notes.c:422 builtin/notes.c:588
+msgid "allow storing empty note"
msgstr ""
-#: builtin/reset.c:298
-msgid "reset HEAD but keep local changes"
+#: builtin/notes.c:423 builtin/notes.c:496
+msgid "replace existing notes"
msgstr ""
-#: builtin/reset.c:304
-msgid "record only the fact that removed paths will be added later"
+#: builtin/notes.c:448
+#, c-format
+msgid ""
+"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
+"existing notes"
msgstr ""
-#: builtin/reset.c:321
+#: builtin/notes.c:463 builtin/notes.c:544
#, c-format
-msgid "Failed to resolve '%s' as a valid revision."
+msgid "Overwriting existing notes for object %s\n"
msgstr ""
-#: builtin/reset.c:329
+#: builtin/notes.c:475 builtin/notes.c:637 builtin/notes.c:902
#, c-format
-msgid "Failed to resolve '%s' as a valid tree."
+msgid "Removing note for object %s\n"
msgstr ""
-#: builtin/reset.c:338
-msgid "--patch is incompatible with --{hard,mixed,soft}"
+#: builtin/notes.c:497
+msgid "read objects from stdin"
msgstr ""
-#: builtin/reset.c:347
-msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
+#: builtin/notes.c:499
+msgid "load rewriting config for <command> (implies --stdin)"
msgstr ""
-#: builtin/reset.c:349
-#, c-format
-msgid "Cannot do %s reset with paths."
+#: builtin/notes.c:517
+msgid "too few parameters"
msgstr ""
-#: builtin/reset.c:359
+#: builtin/notes.c:538
#, c-format
-msgid "%s reset is not allowed in a bare repository"
+msgid ""
+"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
+"existing notes"
msgstr ""
-#: builtin/reset.c:363
-msgid "-N can only be used with --mixed"
+#: builtin/notes.c:550
+#, c-format
+msgid "missing notes on source object %s. Cannot copy."
msgstr ""
-#: builtin/reset.c:380
-msgid "Unstaged changes after reset:"
+#: builtin/notes.c:603
+#, 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/reset.c:386
-#, c-format
-msgid "Could not reset index file to revision '%s'."
+#: builtin/notes.c:698
+msgid "failed to delete ref NOTES_MERGE_PARTIAL"
msgstr ""
-#: builtin/reset.c:390
-msgid "Could not write new index file."
+#: builtin/notes.c:700
+msgid "failed to delete ref NOTES_MERGE_REF"
msgstr ""
-#: builtin/rev-list.c:399
-msgid "cannot combine --exclude-promisor-objects and --missing"
+#: builtin/notes.c:702
+msgid "failed to remove 'git notes merge' worktree"
msgstr ""
-#: builtin/rev-list.c:457
-msgid "object filtering requires --objects"
+#: builtin/notes.c:722
+msgid "failed to read ref NOTES_MERGE_PARTIAL"
msgstr ""
-#: builtin/rev-list.c:460
-#, c-format
-msgid "invalid sparse value '%s'"
+#: builtin/notes.c:724
+msgid "could not find commit from NOTES_MERGE_PARTIAL."
msgstr ""
-#: builtin/rev-list.c:501
-msgid "rev-list does not support display of notes"
+#: builtin/notes.c:726
+msgid "could not parse commit from NOTES_MERGE_PARTIAL."
msgstr ""
-#: builtin/rev-list.c:504
-msgid "cannot combine --use-bitmap-index with object filtering"
+#: builtin/notes.c:739
+msgid "failed to resolve NOTES_MERGE_REF"
msgstr ""
-#: builtin/rev-parse.c:406
-msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
+#: builtin/notes.c:742
+msgid "failed to finalize notes merge"
msgstr ""
-#: builtin/rev-parse.c:411
-msgid "keep the `--` passed as an arg"
+#: builtin/notes.c:768
+#, c-format
+msgid "unknown notes merge strategy %s"
msgstr ""
-#: builtin/rev-parse.c:413
-msgid "stop parsing after the first non-option argument"
+#: builtin/notes.c:784
+msgid "General options"
msgstr ""
-#: builtin/rev-parse.c:416
-msgid "output in stuck long form"
+#: builtin/notes.c:786
+msgid "Merge options"
msgstr ""
-#: builtin/rev-parse.c:549
+#: builtin/notes.c:788
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."
+"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
+"cat_sort_uniq)"
msgstr ""
-#: builtin/revert.c:24
-msgid "git revert [<options>] <commit-ish>..."
+#: builtin/notes.c:790
+msgid "Committing unmerged notes"
msgstr ""
-#: builtin/revert.c:25
-msgid "git revert <subcommand>"
+#: builtin/notes.c:792
+msgid "finalize notes merge by committing unmerged notes"
msgstr ""
-#: builtin/revert.c:30
-msgid "git cherry-pick [<options>] <commit-ish>..."
+#: builtin/notes.c:794
+msgid "Aborting notes merge resolution"
msgstr ""
-#: builtin/revert.c:31
-msgid "git cherry-pick <subcommand>"
+#: builtin/notes.c:796
+msgid "abort notes merge"
msgstr ""
-#: builtin/revert.c:91
-#, c-format
-msgid "%s: %s cannot be used with %s"
+#: builtin/notes.c:807
+msgid "cannot mix --commit, --abort or -s/--strategy"
msgstr ""
-#: builtin/revert.c:100
-msgid "end revert or cherry-pick sequence"
+#: builtin/notes.c:812
+msgid "must specify a notes ref to merge"
msgstr ""
-#: builtin/revert.c:101
-msgid "resume revert or cherry-pick sequence"
+#: builtin/notes.c:836
+#, c-format
+msgid "unknown -s/--strategy: %s"
msgstr ""
-#: builtin/revert.c:102
-msgid "cancel revert or cherry-pick sequence"
+#: builtin/notes.c:873
+#, c-format
+msgid "a notes merge into %s is already in-progress at %s"
msgstr ""
-#: builtin/revert.c:103
-msgid "don't automatically commit"
+#: builtin/notes.c:876
+#, c-format
+msgid "failed to store link to current notes ref (%s)"
msgstr ""
-#: builtin/revert.c:104
-msgid "edit the commit message"
+#: builtin/notes.c:878
+#, 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/revert.c:107
-msgid "parent-number"
+#: builtin/notes.c:897 builtin/tag.c:545
+#, c-format
+msgid "Failed to resolve '%s' as a valid ref."
msgstr ""
-#: builtin/revert.c:108
-msgid "select mainline parent"
+#: builtin/notes.c:900
+#, c-format
+msgid "Object %s has no note\n"
msgstr ""
-#: builtin/revert.c:110
-msgid "merge strategy"
+#: builtin/notes.c:912
+msgid "attempt to remove non-existent note is not an error"
msgstr ""
-#: builtin/revert.c:111
-msgid "option"
+#: builtin/notes.c:915
+msgid "read object names from the standard input"
msgstr ""
-#: builtin/revert.c:112
-msgid "option for merge strategy"
+#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:165
+msgid "do not remove, show only"
msgstr ""
-#: builtin/revert.c:121
-msgid "append commit name"
+#: builtin/notes.c:955
+msgid "report pruned notes"
msgstr ""
-#: builtin/revert.c:123
-msgid "preserve initially empty commits"
+#: builtin/notes.c:998
+msgid "notes-ref"
msgstr ""
-#: builtin/revert.c:125
-msgid "keep redundant, empty commits"
+#: builtin/notes.c:999
+msgid "use notes from <notes-ref>"
msgstr ""
-#: builtin/revert.c:219
-msgid "revert failed"
+#: builtin/notes.c:1034 builtin/stash.c:1598
+#, c-format
+msgid "unknown subcommand: %s"
msgstr ""
-#: builtin/revert.c:232
-msgid "cherry-pick failed"
+#: builtin/pack-objects.c:52
+msgid ""
+"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
msgstr ""
-#: builtin/rm.c:18
-msgid "git rm [<options>] [--] <file>..."
+#: builtin/pack-objects.c:53
+msgid ""
+"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
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/pack-objects.c:428
+#, c-format
+msgid "bad packed object CRC for %s"
+msgstr ""
-#: builtin/rm.c:211
-msgid ""
-"\n"
-"(use -f to force removal)"
+#: builtin/pack-objects.c:439
+#, c-format
+msgid "corrupt packed object for %s"
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/pack-objects.c:570
+#, c-format
+msgid "recursive delta detected for object %s"
+msgstr ""
-#: builtin/rm.c:219 builtin/rm.c:228
-msgid ""
-"\n"
-"(use --cached to keep the file, or -f to force removal)"
+#: builtin/pack-objects.c:781
+#, c-format
+msgid "ordered %u objects, expected %<PRIu32>"
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/pack-objects.c:794
+#, c-format
+msgid "packfile is invalid: %s"
+msgstr ""
-#: builtin/rm.c:241
-msgid "do not list removed files"
+#: builtin/pack-objects.c:798
+#, c-format
+msgid "unable to open packfile for reuse: %s"
msgstr ""
-#: builtin/rm.c:242
-msgid "only remove from the index"
+#: builtin/pack-objects.c:802
+msgid "unable to seek in reused packfile"
msgstr ""
-#: builtin/rm.c:243
-msgid "override the up-to-date check"
+#: builtin/pack-objects.c:813
+msgid "unable to read from reused packfile"
msgstr ""
-#: builtin/rm.c:244
-msgid "allow recursive removal"
+#: builtin/pack-objects.c:841
+msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
msgstr ""
-#: builtin/rm.c:246
-msgid "exit with a zero status even if nothing matched"
+#: builtin/pack-objects.c:854
+msgid "Writing objects"
msgstr ""
-#: builtin/rm.c:288
-msgid "please stage your changes to .gitmodules or stash them to proceed"
+#: builtin/pack-objects.c:917 builtin/update-index.c:89
+#, c-format
+msgid "failed to stat %s"
msgstr ""
-#: builtin/rm.c:306
+#: builtin/pack-objects.c:970
#, c-format
-msgid "not removing '%s' recursively without -r"
+msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
+msgstr ""
+
+#: builtin/pack-objects.c:1166
+msgid "disabling bitmap writing, as some objects are not being packed"
msgstr ""
-#: builtin/rm.c:345
+#: builtin/pack-objects.c:1597
#, c-format
-msgid "git rm: unable to remove %s"
+msgid "delta base offset overflow in pack for %s"
msgstr ""
-#: builtin/rm.c:368
+#: builtin/pack-objects.c:1606
#, c-format
-msgid "could not remove '%s'"
+msgid "delta base offset out of bound for %s"
msgstr ""
-#: builtin/send-pack.c:20
-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/pack-objects.c:1875
+msgid "Counting objects"
msgstr ""
-#: builtin/send-pack.c:163
-msgid "remote name"
+#: builtin/pack-objects.c:2005
+#, c-format
+msgid "unable to get size of %s"
msgstr ""
-#: builtin/send-pack.c:177
-msgid "use stateless RPC protocol"
+#: builtin/pack-objects.c:2020
+#, c-format
+msgid "unable to parse object header of %s"
msgstr ""
-#: builtin/send-pack.c:178
-msgid "read refs from stdin"
+#: builtin/pack-objects.c:2090 builtin/pack-objects.c:2106
+#: builtin/pack-objects.c:2116
+#, c-format
+msgid "object %s cannot be read"
msgstr ""
-#: builtin/send-pack.c:179
-msgid "print status from remote helper"
+#: builtin/pack-objects.c:2093 builtin/pack-objects.c:2120
+#, c-format
+msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
msgstr ""
-#: builtin/serve.c:7
-msgid "git serve [<options>]"
+#: builtin/pack-objects.c:2130
+msgid "suboptimal pack - out of memory"
msgstr ""
-#: builtin/serve.c:17 builtin/upload-pack.c:23
-msgid "quit after a single request/response exchange"
+#: builtin/pack-objects.c:2456
+#, c-format
+msgid "Delta compression using up to %d threads"
msgstr ""
-#: builtin/serve.c:19
-msgid "exit immediately after advertising capabilities"
+#: builtin/pack-objects.c:2588
+#, c-format
+msgid "unable to pack objects reachable from tag %s"
msgstr ""
-#: builtin/shortlog.c:14
-msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]"
+#: builtin/pack-objects.c:2675
+msgid "Compressing objects"
msgstr ""
-#: builtin/shortlog.c:15
-msgid "git log --pretty=short | git shortlog [<options>]"
+#: builtin/pack-objects.c:2681
+msgid "inconsistency with delta count"
msgstr ""
-#: builtin/shortlog.c:264
-msgid "Group by committer rather than author"
+#: builtin/pack-objects.c:2762
+#, c-format
+msgid ""
+"expected edge object ID, got garbage:\n"
+" %s"
msgstr ""
-#: builtin/shortlog.c:266
-msgid "sort output according to the number of commits per author"
+#: builtin/pack-objects.c:2768
+#, c-format
+msgid ""
+"expected object ID, got garbage:\n"
+" %s"
msgstr ""
-#: builtin/shortlog.c:268
-msgid "Suppress commit descriptions, only provides commit count"
+#: builtin/pack-objects.c:2866
+msgid "invalid value for --missing"
msgstr ""
-#: builtin/shortlog.c:270
-msgid "Show the email address of each author"
+#: builtin/pack-objects.c:2925 builtin/pack-objects.c:3033
+msgid "cannot open pack index"
msgstr ""
-#: builtin/shortlog.c:271
-msgid "<w>[,<i1>[,<i2>]]"
+#: builtin/pack-objects.c:2956
+#, c-format
+msgid "loose object at %s could not be examined"
msgstr ""
-#: builtin/shortlog.c:272
-msgid "Linewrap output"
+#: builtin/pack-objects.c:3041
+msgid "unable to force loose object"
msgstr ""
-#: builtin/shortlog.c:299
-msgid "too many arguments given outside repository"
+#: builtin/pack-objects.c:3133
+#, c-format
+msgid "not a rev '%s'"
msgstr ""
-#: 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>)...]"
+#: builtin/pack-objects.c:3136
+#, c-format
+msgid "bad revision '%s'"
msgstr ""
-#: builtin/show-branch.c:17
-msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
+#: builtin/pack-objects.c:3161
+msgid "unable to add recent objects"
msgstr ""
-#: builtin/show-branch.c:395
+#: builtin/pack-objects.c:3214
#, 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] ""
+msgid "unsupported index version %s"
+msgstr ""
-#: builtin/show-branch.c:549
+#: builtin/pack-objects.c:3218
#, c-format
-msgid "no matching refs with %s"
+msgid "bad index version '%s'"
msgstr ""
-#: builtin/show-branch.c:645
-msgid "show remote-tracking and local branches"
+#: builtin/pack-objects.c:3248
+msgid "do not show progress meter"
msgstr ""
-#: builtin/show-branch.c:647
-msgid "show remote-tracking branches"
+#: builtin/pack-objects.c:3250
+msgid "show progress meter"
msgstr ""
-#: builtin/show-branch.c:649
-msgid "color '*!+-' corresponding to the branch"
+#: builtin/pack-objects.c:3252
+msgid "show progress meter during object writing phase"
msgstr ""
-#: builtin/show-branch.c:651
-msgid "show <n> more commits after the common ancestor"
+#: builtin/pack-objects.c:3255
+msgid "similar to --all-progress when progress meter is shown"
msgstr ""
-#: builtin/show-branch.c:653
-msgid "synonym to more=-1"
+#: builtin/pack-objects.c:3256
+msgid "<version>[,<offset>]"
msgstr ""
-#: builtin/show-branch.c:654
-msgid "suppress naming strings"
+#: builtin/pack-objects.c:3257
+msgid "write the pack index file in the specified idx format version"
msgstr ""
-#: builtin/show-branch.c:656
-msgid "include the current branch"
+#: builtin/pack-objects.c:3260
+msgid "maximum size of each output pack file"
msgstr ""
-#: builtin/show-branch.c:658
-msgid "name commits with their object names"
+#: builtin/pack-objects.c:3262
+msgid "ignore borrowed objects from alternate object store"
msgstr ""
-#: builtin/show-branch.c:660
-msgid "show possible merge bases"
+#: builtin/pack-objects.c:3264
+msgid "ignore packed objects"
msgstr ""
-#: builtin/show-branch.c:662
-msgid "show refs unreachable from any other ref"
+#: builtin/pack-objects.c:3266
+msgid "limit pack window by objects"
msgstr ""
-#: builtin/show-branch.c:664
-msgid "show commits in topological order"
+#: builtin/pack-objects.c:3268
+msgid "limit pack window by memory in addition to object limit"
msgstr ""
-#: builtin/show-branch.c:667
-msgid "show only commits not on the first branch"
+#: builtin/pack-objects.c:3270
+msgid "maximum length of delta chain allowed in the resulting pack"
msgstr ""
-#: builtin/show-branch.c:669
-msgid "show merges reachable from only one tip"
+#: builtin/pack-objects.c:3272
+msgid "reuse existing deltas"
msgstr ""
-#: builtin/show-branch.c:671
-msgid "topologically sort, maintaining date order where possible"
+#: builtin/pack-objects.c:3274
+msgid "reuse existing objects"
msgstr ""
-#: builtin/show-branch.c:674
-msgid "<n>[,<base>]"
+#: builtin/pack-objects.c:3276
+msgid "use OFS_DELTA objects"
msgstr ""
-#: builtin/show-branch.c:675
-msgid "show <n> most recent ref-log entries starting at base"
+#: builtin/pack-objects.c:3278
+msgid "use threads when searching for best delta matches"
msgstr ""
-#: builtin/show-branch.c:711
-msgid ""
-"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
+#: builtin/pack-objects.c:3280
+msgid "do not create an empty pack output"
msgstr ""
-#: builtin/show-branch.c:735
-msgid "no branches given, and HEAD is not valid"
+#: builtin/pack-objects.c:3282
+msgid "read revision arguments from standard input"
msgstr ""
-#: builtin/show-branch.c:738
-msgid "--reflog option needs one branch name"
+#: builtin/pack-objects.c:3284
+msgid "limit the objects to those that are not yet packed"
msgstr ""
-#: builtin/show-branch.c:741
-#, 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/pack-objects.c:3287
+msgid "include objects reachable from any reference"
+msgstr ""
-#: builtin/show-branch.c:745
-#, c-format
-msgid "no such ref %s"
+#: builtin/pack-objects.c:3290
+msgid "include objects referred by reflog entries"
msgstr ""
-#: builtin/show-branch.c:829
-#, c-format
-msgid "cannot handle more than %d rev."
-msgid_plural "cannot handle more than %d revs."
-msgstr[0] ""
-msgstr[1] ""
+#: builtin/pack-objects.c:3293
+msgid "include objects referred to by the index"
+msgstr ""
-#: builtin/show-branch.c:833
-#, c-format
-msgid "'%s' is not a valid ref."
+#: builtin/pack-objects.c:3296
+msgid "output pack to stdout"
msgstr ""
-#: builtin/show-branch.c:836
-#, c-format
-msgid "cannot find commit %s (%s)"
+#: builtin/pack-objects.c:3298
+msgid "include tag objects that refer to objects to be packed"
msgstr ""
-#: builtin/show-ref.c:11
-msgid ""
-"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
-"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
+#: builtin/pack-objects.c:3300
+msgid "keep unreachable objects"
msgstr ""
-#: builtin/show-ref.c:12
-msgid "git show-ref --exclude-existing[=<pattern>]"
+#: builtin/pack-objects.c:3302
+msgid "pack loose unreachable objects"
msgstr ""
-#: builtin/show-ref.c:160
-msgid "only show tags (can be combined with heads)"
+#: builtin/pack-objects.c:3304
+msgid "unpack unreachable objects newer than <time>"
msgstr ""
-#: builtin/show-ref.c:161
-msgid "only show heads (can be combined with tags)"
+#: builtin/pack-objects.c:3307
+msgid "use the sparse reachability algorithm"
msgstr ""
-#: builtin/show-ref.c:162
-msgid "stricter reference checking, requires exact ref path"
+#: builtin/pack-objects.c:3309
+msgid "create thin packs"
msgstr ""
-#: builtin/show-ref.c:165 builtin/show-ref.c:167
-msgid "show the HEAD reference, even if it would be filtered out"
+#: builtin/pack-objects.c:3311
+msgid "create packs suitable for shallow fetches"
msgstr ""
-#: builtin/show-ref.c:169
-msgid "dereference tags into object IDs"
+#: builtin/pack-objects.c:3313
+msgid "ignore packs that have companion .keep file"
msgstr ""
-#: builtin/show-ref.c:171
-msgid "only show SHA1 hash using <n> digits"
+#: builtin/pack-objects.c:3315
+msgid "ignore this pack"
msgstr ""
-#: builtin/show-ref.c:175
-msgid "do not print results to stdout (useful with --verify)"
+#: builtin/pack-objects.c:3317
+msgid "pack compression level"
msgstr ""
-#: builtin/show-ref.c:177
-msgid "show refs from stdin that aren't in local repository"
+#: builtin/pack-objects.c:3319
+msgid "do not hide commits by grafts"
msgstr ""
-#: builtin/stripspace.c:18
-msgid "git stripspace [-s | --strip-comments]"
+#: builtin/pack-objects.c:3321
+msgid "use a bitmap index if available to speed up counting objects"
msgstr ""
-#: builtin/stripspace.c:19
-msgid "git stripspace [-c | --comment-lines]"
+#: builtin/pack-objects.c:3323
+msgid "write a bitmap index together with the pack index"
msgstr ""
-#: builtin/stripspace.c:36
-msgid "skip and remove all lines starting with comment character"
+#: builtin/pack-objects.c:3327
+msgid "write a bitmap index if possible"
msgstr ""
-#: builtin/stripspace.c:39
-msgid "prepend comment character and space to each line"
+#: builtin/pack-objects.c:3331
+msgid "handling for missing objects"
msgstr ""
-#: builtin/submodule--helper.c:37 builtin/submodule--helper.c:1833
-#, c-format
-msgid "No such ref: %s"
+#: builtin/pack-objects.c:3334
+msgid "do not pack objects in promisor packfiles"
msgstr ""
-#: builtin/submodule--helper.c:44 builtin/submodule--helper.c:1842
-#, c-format
-msgid "Expecting a full ref name, got %s"
+#: builtin/pack-objects.c:3336
+msgid "respect islands during delta compression"
msgstr ""
-#: builtin/submodule--helper.c:61
-msgid "submodule--helper print-default-remote takes no arguments"
+#: builtin/pack-objects.c:3361
+#, c-format
+msgid "delta chain depth %d is too deep, forcing %d"
msgstr ""
-#: builtin/submodule--helper.c:99
+#: builtin/pack-objects.c:3366
#, c-format
-msgid "cannot strip one component off url '%s'"
+msgid "pack.deltaCacheLimit is too high, forcing %d"
msgstr ""
-#: builtin/submodule--helper.c:407 builtin/submodule--helper.c:1356
-msgid "alternative anchor for relative paths"
+#: builtin/pack-objects.c:3420
+msgid "--max-pack-size cannot be used to build a pack for transfer"
msgstr ""
-#: builtin/submodule--helper.c:412
-msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
+#: builtin/pack-objects.c:3422
+msgid "minimum pack size limit is 1 MiB"
msgstr ""
-#: 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"
+#: builtin/pack-objects.c:3427
+msgid "--thin cannot be used to build an indexable pack"
msgstr ""
-#: builtin/submodule--helper.c:521
-#, c-format
-msgid "Entering '%s'\n"
+#: builtin/pack-objects.c:3430
+msgid "--keep-unreachable and --unpack-unreachable are incompatible"
msgstr ""
-#: builtin/submodule--helper.c:524
-#, c-format
-msgid ""
-"run_command returned non-zero status for %s\n"
-"."
+#: builtin/pack-objects.c:3436
+msgid "cannot use --filter without --stdout"
msgstr ""
-#: builtin/submodule--helper.c:545
-#, c-format
-msgid ""
-"run_command returned non-zero status whilerecursing in the nested submodules "
-"of %s\n"
-"."
+#: builtin/pack-objects.c:3497
+msgid "Enumerating objects"
msgstr ""
-#: builtin/submodule--helper.c:561
-msgid "Suppress output of entering each submodule command"
+#: builtin/pack-objects.c:3527
+#, c-format
+msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)"
msgstr ""
-#: builtin/submodule--helper.c:563 builtin/submodule--helper.c:1040
-msgid "Recurse into nested submodules"
+#: builtin/pack-refs.c:8
+msgid "git pack-refs [<options>]"
msgstr ""
-#: builtin/submodule--helper.c:568
-msgid "git submodule--helper foreach [--quiet] [--recursive] <command>"
+#: builtin/pack-refs.c:16
+msgid "pack everything"
msgstr ""
-#: builtin/submodule--helper.c:644
-#, c-format
-msgid ""
-"could not lookup configuration '%s'. Assuming this repository is its own "
-"authoritative upstream."
+#: builtin/pack-refs.c:17
+msgid "prune loose refs (default)"
msgstr ""
-#: builtin/submodule--helper.c:655
-#, c-format
-msgid "Failed to register url for submodule path '%s'"
+#: builtin/prune-packed.c:9
+msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
msgstr ""
-#: builtin/submodule--helper.c:659
-#, c-format
-msgid "Submodule '%s' (%s) registered for path '%s'\n"
+#: builtin/prune-packed.c:42
+msgid "Removing duplicate objects"
msgstr ""
-#: builtin/submodule--helper.c:669
-#, c-format
-msgid "warning: command update mode suggested for submodule '%s'\n"
+#: builtin/prune.c:12
+msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
msgstr ""
-#: builtin/submodule--helper.c:676
-#, c-format
-msgid "Failed to register update mode for submodule path '%s'"
+#: builtin/prune.c:131
+msgid "report pruned objects"
msgstr ""
-#: builtin/submodule--helper.c:698
-msgid "Suppress output for initializing a submodule"
+#: builtin/prune.c:134
+msgid "expire objects older than <time>"
msgstr ""
-#: builtin/submodule--helper.c:703
-msgid "git submodule--helper init [<path>]"
+#: builtin/prune.c:136
+msgid "limit traversal to objects outside promisor packfiles"
msgstr ""
-#: builtin/submodule--helper.c:775 builtin/submodule--helper.c:901
-#, c-format
-msgid "no submodule mapping found in .gitmodules for path '%s'"
+#: builtin/prune.c:150
+msgid "cannot prune in a precious-objects repo"
msgstr ""
-#: builtin/submodule--helper.c:814
+#: builtin/pull.c:66 builtin/pull.c:68
#, c-format
-msgid "could not resolve HEAD ref inside the submodule '%s'"
+msgid "Invalid value for %s: %s"
msgstr ""
-#: builtin/submodule--helper.c:841 builtin/submodule--helper.c:1010
-#, c-format
-msgid "failed to recurse into submodule '%s'"
+#: builtin/pull.c:88
+msgid "git pull [<options>] [<repository> [<refspec>...]]"
msgstr ""
-#: builtin/submodule--helper.c:865 builtin/submodule--helper.c:1176
-msgid "Suppress submodule status output"
+#: builtin/pull.c:141
+msgid "control for recursive fetching of submodules"
msgstr ""
-#: builtin/submodule--helper.c:866
-msgid ""
-"Use commit stored in the index instead of the one stored in the submodule "
-"HEAD"
+#: builtin/pull.c:145
+msgid "Options related to merging"
msgstr ""
-#: builtin/submodule--helper.c:867
-msgid "recurse into nested submodules"
+#: builtin/pull.c:148
+msgid "incorporate changes by rebasing rather than merging"
msgstr ""
-#: builtin/submodule--helper.c:872
-msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
+#: builtin/pull.c:176 builtin/rebase.c:447 builtin/revert.c:126
+msgid "allow fast-forward"
msgstr ""
-#: builtin/submodule--helper.c:896
-msgid "git submodule--helper name <path>"
+#: builtin/pull.c:185
+msgid "automatically stash/stash pop before and after rebase"
msgstr ""
-#: builtin/submodule--helper.c:960
-#, c-format
-msgid "Synchronizing submodule url for '%s'\n"
+#: builtin/pull.c:201
+msgid "Options related to fetching"
msgstr ""
-#: builtin/submodule--helper.c:966
-#, c-format
-msgid "failed to register url for submodule path '%s'"
+#: builtin/pull.c:211
+msgid "force overwrite of local branch"
msgstr ""
-#: builtin/submodule--helper.c:980
-#, c-format
-msgid "failed to get the default remote for submodule '%s'"
+#: builtin/pull.c:219
+msgid "number of submodules pulled in parallel"
msgstr ""
-#: builtin/submodule--helper.c:991
+#: builtin/pull.c:316
#, c-format
-msgid "failed to update remote for submodule '%s'"
+msgid "Invalid value for pull.ff: %s"
msgstr ""
-#: builtin/submodule--helper.c:1038
-msgid "Suppress output of synchronizing submodule url"
+#: builtin/pull.c:433
+msgid ""
+"There is no candidate for rebasing against among the refs that you just "
+"fetched."
msgstr ""
-#: builtin/submodule--helper.c:1045
-msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
+#: builtin/pull.c:435
+msgid ""
+"There are no candidates for merging among the refs that you just fetched."
msgstr ""
-#: builtin/submodule--helper.c:1099
-#, c-format
+#: builtin/pull.c:436
msgid ""
-"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
-"really want to remove it including all of its history)"
+"Generally this means that you provided a wildcard refspec which had no\n"
+"matches on the remote end."
msgstr ""
-#: builtin/submodule--helper.c:1111
+#: builtin/pull.c:439
#, c-format
msgid ""
-"Submodule work tree '%s' contains local modifications; use '-f' to discard "
-"them"
+"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/submodule--helper.c:1119
-#, c-format
-msgid "Cleared directory '%s'\n"
+#: builtin/pull.c:444 builtin/rebase.c:1326 git-parse-remote.sh:73
+msgid "You are not currently on a branch."
msgstr ""
-#: builtin/submodule--helper.c:1121
-#, c-format
-msgid "Could not remove submodule work tree '%s'\n"
+#: builtin/pull.c:446 builtin/pull.c:461 git-parse-remote.sh:79
+msgid "Please specify which branch you want to rebase against."
msgstr ""
-#: builtin/submodule--helper.c:1132
-#, c-format
-msgid "could not create empty submodule directory %s"
+#: builtin/pull.c:448 builtin/pull.c:463 git-parse-remote.sh:82
+msgid "Please specify which branch you want to merge with."
msgstr ""
-#: builtin/submodule--helper.c:1148
-#, c-format
-msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
+#: builtin/pull.c:449 builtin/pull.c:464
+msgid "See git-pull(1) for details."
msgstr ""
-#: builtin/submodule--helper.c:1177
-msgid "Remove submodule working trees even if they contain local changes"
+#: builtin/pull.c:451 builtin/pull.c:457 builtin/pull.c:466
+#: builtin/rebase.c:1332 git-parse-remote.sh:64
+msgid "<remote>"
msgstr ""
-#: builtin/submodule--helper.c:1178
-msgid "Unregister all submodules"
+#: builtin/pull.c:451 builtin/pull.c:466 builtin/pull.c:471
+#: git-parse-remote.sh:65
+msgid "<branch>"
msgstr ""
-#: builtin/submodule--helper.c:1183
-msgid ""
-"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
+#: builtin/pull.c:459 builtin/rebase.c:1324 git-parse-remote.sh:75
+msgid "There is no tracking information for the current branch."
msgstr ""
-#: builtin/submodule--helper.c:1197
-msgid "Use '--all' if you really want to deinitialize all submodules"
+#: builtin/pull.c:468 git-parse-remote.sh:95
+msgid ""
+"If you wish to set tracking information for this branch you can do so with:"
msgstr ""
-#: builtin/submodule--helper.c:1290 builtin/submodule--helper.c:1293
+#: builtin/pull.c:473
#, c-format
-msgid "submodule '%s' cannot add alternate: %s"
+msgid ""
+"Your configuration specifies to merge with the ref '%s'\n"
+"from the remote, but no such ref was fetched."
msgstr ""
-#: builtin/submodule--helper.c:1329
+#: builtin/pull.c:581
#, c-format
-msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
+msgid "unable to access commit %s"
msgstr ""
-#: builtin/submodule--helper.c:1336
-#, c-format
-msgid "Value '%s' for submodule.alternateLocation is not recognized"
+#: builtin/pull.c:861
+msgid "ignoring --verify-signatures for rebase"
msgstr ""
-#: builtin/submodule--helper.c:1359
-msgid "where the new submodule will be cloned to"
+#: builtin/pull.c:916
+msgid "--[no-]autostash option is only valid with --rebase."
msgstr ""
-#: builtin/submodule--helper.c:1362
-msgid "name of the new submodule"
+#: builtin/pull.c:924
+msgid "Updating an unborn branch with changes added to the index."
msgstr ""
-#: builtin/submodule--helper.c:1365
-msgid "url where to clone the submodule from"
+#: builtin/pull.c:928
+msgid "pull with rebase"
msgstr ""
-#: builtin/submodule--helper.c:1373
-msgid "depth for shallow clones"
+#: builtin/pull.c:929
+msgid "please commit or stash them."
msgstr ""
-#: builtin/submodule--helper.c:1376 builtin/submodule--helper.c:1751
-msgid "force cloning progress"
+#: builtin/pull.c:954
+#, c-format
+msgid ""
+"fetch updated the current branch head.\n"
+"fast-forwarding your working tree from\n"
+"commit %s."
msgstr ""
-#: builtin/submodule--helper.c:1381
+#: builtin/pull.c:960
+#, c-format
msgid ""
-"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
-"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
+"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/submodule--helper.c:1412
-#, c-format
-msgid "clone of '%s' into submodule path '%s' failed"
+#: builtin/pull.c:975
+msgid "Cannot merge multiple branches into empty head."
msgstr ""
-#: builtin/submodule--helper.c:1426
-#, c-format
-msgid "could not get submodule directory for '%s'"
+#: builtin/pull.c:979
+msgid "Cannot rebase onto multiple branches."
msgstr ""
-#: builtin/submodule--helper.c:1492
-#, c-format
-msgid "Submodule path '%s' not initialized"
+#: builtin/pull.c:986
+msgid "cannot rebase with locally recorded submodule modifications"
msgstr ""
-#: builtin/submodule--helper.c:1496
-msgid "Maybe you want to use 'update --init'?"
+#: builtin/push.c:19
+msgid "git push [<options>] [<repository> [<refspec>...]]"
msgstr ""
-#: builtin/submodule--helper.c:1525
-#, c-format
-msgid "Skipping unmerged submodule %s"
+#: builtin/push.c:111
+msgid "tag shorthand without <tag>"
msgstr ""
-#: builtin/submodule--helper.c:1554
-#, c-format
-msgid "Skipping submodule '%s'"
+#: builtin/push.c:121
+msgid "--delete only accepts plain target ref names"
msgstr ""
-#: builtin/submodule--helper.c:1689
-#, c-format
-msgid "Failed to clone '%s'. Retry scheduled"
+#: builtin/push.c:167
+msgid ""
+"\n"
+"To choose either option permanently, see push.default in 'git help config'."
msgstr ""
-#: builtin/submodule--helper.c:1700
+#: builtin/push.c:170
#, c-format
-msgid "Failed to clone '%s' a second time, aborting"
+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 HEAD\n"
+"%s"
msgstr ""
-#: builtin/submodule--helper.c:1730 builtin/submodule--helper.c:1953
-msgid "path into the working tree"
+#: builtin/push.c:185
+#, 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/submodule--helper.c:1733
-msgid "path into the working tree, across nested submodule boundaries"
+#: builtin/push.c:199
+#, 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/submodule--helper.c:1737
-msgid "rebase, merge, checkout or none"
+#: builtin/push.c:207
+#, c-format
+msgid "The current branch %s has multiple upstream branches, refusing to push."
msgstr ""
-#: builtin/submodule--helper.c:1743
-msgid "Create a shallow clone truncated to the specified number of revisions"
+#: builtin/push.c:210
+#, 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/submodule--helper.c:1746
-msgid "parallel jobs"
+#: builtin/push.c:269
+msgid ""
+"You didn't specify any refspecs to push, and push.default is \"nothing\"."
msgstr ""
-#: builtin/submodule--helper.c:1748
-msgid "whether the initial clone should follow the shallow recommendation"
+#: builtin/push.c:276
+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/submodule--helper.c:1749
-msgid "don't print cloning progress"
+#: builtin/push.c:282
+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/submodule--helper.c:1756
-msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
+#: builtin/push.c:288
+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/submodule--helper.c:1769
-msgid "bad value for update parameter"
+#: builtin/push.c:295
+msgid "Updates were rejected because the tag already exists in the remote."
msgstr ""
-#: builtin/submodule--helper.c:1837
-#, c-format
+#: builtin/push.c:298
msgid ""
-"Submodule (%s) branch configured to inherit branch from superproject, but "
-"the superproject is not on any branch"
+"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/submodule--helper.c:1954
-msgid "recurse into submodules"
+#: builtin/push.c:359
+#, c-format
+msgid "Pushing to %s\n"
msgstr ""
-#: builtin/submodule--helper.c:1960
-msgid "git submodule--helper embed-git-dir [<path>...]"
+#: builtin/push.c:364
+#, c-format
+msgid "failed to push some refs to '%s'"
msgstr ""
-#: builtin/submodule--helper.c:2071
+#: builtin/push.c:398
#, c-format
-msgid "%s doesn't support --super-prefix"
+msgid "bad repository '%s'"
msgstr ""
-#: builtin/submodule--helper.c:2077
-#, c-format
-msgid "'%s' is not a valid submodule--helper subcommand"
+#: builtin/push.c:399
+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/symbolic-ref.c:8
-msgid "git symbolic-ref [<options>] <name> [<ref>]"
+#: builtin/push.c:554
+msgid "repository"
msgstr ""
-#: builtin/symbolic-ref.c:9
-msgid "git symbolic-ref -d [-q] <name>"
+#: builtin/push.c:555 builtin/send-pack.c:164
+msgid "push all refs"
msgstr ""
-#: builtin/symbolic-ref.c:40
-msgid "suppress error message for non-symbolic (detached) refs"
+#: builtin/push.c:556 builtin/send-pack.c:166
+msgid "mirror all refs"
msgstr ""
-#: builtin/symbolic-ref.c:41
-msgid "delete symbolic ref"
+#: builtin/push.c:558
+msgid "delete refs"
msgstr ""
-#: builtin/symbolic-ref.c:42
-msgid "shorten ref output"
+#: builtin/push.c:559
+msgid "push tags (can't be used with --all or --mirror)"
msgstr ""
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363
-msgid "reason"
+#: builtin/push.c:562 builtin/send-pack.c:167
+msgid "force updates"
msgstr ""
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363
-msgid "reason of the update"
+#: builtin/push.c:564 builtin/send-pack.c:181
+msgid "<refname>:<expect>"
msgstr ""
-#: builtin/tag.c:25
-msgid ""
-"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
-"[<head>]"
+#: builtin/push.c:565 builtin/send-pack.c:182
+msgid "require old value of ref to be at this value"
msgstr ""
-#: builtin/tag.c:26
-msgid "git tag -d <tagname>..."
+#: builtin/push.c:568
+msgid "control recursive pushing of submodules"
msgstr ""
-#: 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>...]"
+#: builtin/push.c:570 builtin/send-pack.c:175
+msgid "use thin pack"
msgstr ""
-#: builtin/tag.c:29
-msgid "git tag -v [--format=<format>] <tagname>..."
+#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:161
+#: builtin/send-pack.c:162
+msgid "receive pack program"
msgstr ""
-#: builtin/tag.c:87
-#, c-format
-msgid "tag '%s' not found."
+#: builtin/push.c:573
+msgid "set upstream for git pull/status"
msgstr ""
-#: builtin/tag.c:103
-#, c-format
-msgid "Deleted tag '%s' (was %s)\n"
+#: builtin/push.c:576
+msgid "prune locally removed refs"
msgstr ""
-#: builtin/tag.c:133
-#, c-format
-msgid ""
-"\n"
-"Write a message for tag:\n"
-" %s\n"
-"Lines starting with '%c' will be ignored.\n"
+#: builtin/push.c:578
+msgid "bypass pre-push hook"
msgstr ""
-#: 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"
+#: builtin/push.c:579
+msgid "push missing but relevant tags"
msgstr ""
-#: builtin/tag.c:191
-msgid "unable to sign the tag"
+#: builtin/push.c:582 builtin/send-pack.c:169
+msgid "GPG sign the push"
msgstr ""
-#: builtin/tag.c:193
-msgid "unable to write tag file"
+#: builtin/push.c:584 builtin/send-pack.c:176
+msgid "request atomic transaction on remote side"
msgstr ""
-#: builtin/tag.c:218
-msgid "bad object type."
+#: builtin/push.c:602
+msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr ""
-#: builtin/tag.c:267
-msgid "no tag message?"
+#: builtin/push.c:604
+msgid "--delete doesn't make sense without any refs"
msgstr ""
-#: builtin/tag.c:274
-#, c-format
-msgid "The tag message has been left in %s\n"
+#: builtin/push.c:607
+msgid "--all and --tags are incompatible"
msgstr ""
-#: builtin/tag.c:383
-msgid "list tag names"
+#: builtin/push.c:609
+msgid "--all can't be combined with refspecs"
msgstr ""
-#: builtin/tag.c:385
-msgid "print <n> lines of each tag message"
+#: builtin/push.c:613
+msgid "--mirror and --tags are incompatible"
msgstr ""
-#: builtin/tag.c:387
-msgid "delete tags"
+#: builtin/push.c:615
+msgid "--mirror can't be combined with refspecs"
msgstr ""
-#: builtin/tag.c:388
-msgid "verify tags"
+#: builtin/push.c:618
+msgid "--all and --mirror are incompatible"
msgstr ""
-#: builtin/tag.c:390
-msgid "Tag creation options"
+#: builtin/push.c:637
+msgid "push options must not have new line characters"
msgstr ""
-#: builtin/tag.c:392
-msgid "annotated tag, needs a message"
+#: builtin/range-diff.c:8
+msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>"
msgstr ""
-#: builtin/tag.c:394
-msgid "tag message"
+#: builtin/range-diff.c:9
+msgid "git range-diff [<options>] <old-tip>...<new-tip>"
msgstr ""
-#: builtin/tag.c:396
-msgid "force edit of tag message"
+#: builtin/range-diff.c:10
+msgid "git range-diff [<options>] <base> <old-tip> <new-tip>"
msgstr ""
-#: builtin/tag.c:397
-msgid "annotated and GPG-signed tag"
+#: builtin/range-diff.c:21
+msgid "Percentage by which creation is weighted"
msgstr ""
-#: builtin/tag.c:401
-msgid "use another key to sign the tag"
+#: builtin/range-diff.c:23
+msgid "use simple diff colors"
msgstr ""
-#: builtin/tag.c:402
-msgid "replace the tag if exists"
+#: builtin/range-diff.c:46 builtin/range-diff.c:50
+#, c-format
+msgid "no .. in range: '%s'"
msgstr ""
-#: builtin/tag.c:403 builtin/update-ref.c:369
-msgid "create a reflog"
+#: builtin/range-diff.c:60
+msgid "single arg format must be symmetric range"
msgstr ""
-#: builtin/tag.c:405
-msgid "Tag listing options"
+#: builtin/range-diff.c:75
+msgid "need two commit ranges"
msgstr ""
-#: builtin/tag.c:406
-msgid "show tag list in columns"
+#: builtin/read-tree.c:41
+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/tag.c:407 builtin/tag.c:409
-msgid "print only tags that contain the commit"
+#: builtin/read-tree.c:124
+msgid "write resulting index to <file>"
msgstr ""
-#: builtin/tag.c:408 builtin/tag.c:410
-msgid "print only tags that don't contain the commit"
+#: builtin/read-tree.c:127
+msgid "only empty the index"
msgstr ""
-#: builtin/tag.c:411
-msgid "print only tags that are merged"
+#: builtin/read-tree.c:129
+msgid "Merging"
msgstr ""
-#: builtin/tag.c:412
-msgid "print only tags that are not merged"
+#: builtin/read-tree.c:131
+msgid "perform a merge in addition to a read"
msgstr ""
-#: builtin/tag.c:417
-msgid "print only tags of the object"
+#: builtin/read-tree.c:133
+msgid "3-way merge if no file level merging required"
msgstr ""
-#: builtin/tag.c:461
-msgid "--column and -n are incompatible"
+#: builtin/read-tree.c:135
+msgid "3-way merge in presence of adds and removes"
msgstr ""
-#: builtin/tag.c:483
-msgid "-n option is only allowed in list mode"
+#: builtin/read-tree.c:137
+msgid "same as -m, but discard unmerged entries"
msgstr ""
-#: builtin/tag.c:485
-msgid "--contains option is only allowed in list mode"
+#: builtin/read-tree.c:138
+msgid "<subdirectory>/"
msgstr ""
-#: builtin/tag.c:487
-msgid "--no-contains option is only allowed in list mode"
+#: builtin/read-tree.c:139
+msgid "read the tree into the index under <subdirectory>/"
msgstr ""
-#: builtin/tag.c:489
-msgid "--points-at option is only allowed in list mode"
+#: builtin/read-tree.c:142
+msgid "update working tree with merge result"
msgstr ""
-#: builtin/tag.c:491
-msgid "--merged and --no-merged options are only allowed in list mode"
+#: builtin/read-tree.c:144
+msgid "gitignore"
msgstr ""
-#: builtin/tag.c:502
-msgid "only one -F or -m option is allowed."
+#: builtin/read-tree.c:145
+msgid "allow explicitly ignored files to be overwritten"
msgstr ""
-#: builtin/tag.c:521
-msgid "too many params"
+#: builtin/read-tree.c:148
+msgid "don't check the working tree after merging"
msgstr ""
-#: builtin/tag.c:527
-#, c-format
-msgid "'%s' is not a valid tag name."
+#: builtin/read-tree.c:149
+msgid "don't update the index or the work tree"
msgstr ""
-#: builtin/tag.c:532
-#, c-format
-msgid "tag '%s' already exists"
+#: builtin/read-tree.c:151
+msgid "skip applying sparse checkout filter"
msgstr ""
-#: builtin/tag.c:563
-#, c-format
-msgid "Updated tag '%s' (was %s)\n"
+#: builtin/read-tree.c:153
+msgid "debug unpack-trees"
msgstr ""
-#: builtin/unpack-objects.c:500
-msgid "Unpacking objects"
+#: builtin/read-tree.c:157
+msgid "suppress feedback messages"
msgstr ""
-#: builtin/update-index.c:82
-#, c-format
-msgid "failed to create directory %s"
+#: builtin/rebase.c:32
+msgid ""
+"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] "
+"[<branch>]"
msgstr ""
-#: builtin/update-index.c:98
-#, c-format
-msgid "failed to create file %s"
+#: builtin/rebase.c:34
+msgid ""
+"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]"
msgstr ""
-#: builtin/update-index.c:106
-#, c-format
-msgid "failed to delete file %s"
+#: builtin/rebase.c:36
+msgid "git rebase --continue | --abort | --skip | --edit-todo"
msgstr ""
-#: builtin/update-index.c:113 builtin/update-index.c:219
+#: builtin/rebase.c:158 builtin/rebase.c:182 builtin/rebase.c:209
#, c-format
-msgid "failed to delete directory %s"
+msgid "unusable todo list: '%s'"
msgstr ""
-#: builtin/update-index.c:138
+#: builtin/rebase.c:167 builtin/rebase.c:193 builtin/rebase.c:217
#, c-format
-msgid "Testing mtime in '%s' "
+msgid "could not write '%s'."
msgstr ""
-#: builtin/update-index.c:152
-msgid "directory stat info does not change after adding a new file"
+#: builtin/rebase.c:252
+msgid "no HEAD?"
msgstr ""
-#: builtin/update-index.c:165
-msgid "directory stat info does not change after adding a new directory"
+#: builtin/rebase.c:279
+#, c-format
+msgid "could not create temporary %s"
msgstr ""
-#: builtin/update-index.c:178
-msgid "directory stat info changes after updating a file"
+#: builtin/rebase.c:285
+msgid "could not mark as interactive"
msgstr ""
-#: builtin/update-index.c:189
-msgid "directory stat info changes after adding a file inside subdirectory"
+#: builtin/rebase.c:343
+msgid "could not generate todo list"
msgstr ""
-#: builtin/update-index.c:200
-msgid "directory stat info does not change after deleting a file"
+#: builtin/rebase.c:382
+msgid "a base commit must be provided with --upstream or --onto"
msgstr ""
-#: builtin/update-index.c:213
-msgid "directory stat info does not change after deleting a directory"
+#: builtin/rebase.c:437
+msgid "git rebase--interactive [<options>]"
msgstr ""
-#: builtin/update-index.c:220
-msgid " OK"
+#: builtin/rebase.c:449
+msgid "keep empty commits"
msgstr ""
-#: builtin/update-index.c:588
-msgid "git update-index [<options>] [--] [<file>...]"
+#: builtin/rebase.c:451 builtin/revert.c:128
+msgid "allow commits with empty messages"
msgstr ""
-#: builtin/update-index.c:944
-msgid "continue refresh even when index needs update"
+#: builtin/rebase.c:452
+msgid "rebase merge commits"
msgstr ""
-#: builtin/update-index.c:947
-msgid "refresh: ignore submodules"
+#: builtin/rebase.c:454
+msgid "keep original branch points of cousins"
msgstr ""
-#: builtin/update-index.c:950
-msgid "do not ignore new files"
+#: builtin/rebase.c:456
+msgid "move commits that begin with squash!/fixup!"
msgstr ""
-#: builtin/update-index.c:952
-msgid "let files replace directories and vice-versa"
+#: builtin/rebase.c:457
+msgid "sign commits"
msgstr ""
-#: builtin/update-index.c:954
-msgid "notice files missing from worktree"
+#: builtin/rebase.c:459 builtin/rebase.c:1403
+msgid "display a diffstat of what changed upstream"
msgstr ""
-#: builtin/update-index.c:956
-msgid "refresh even if index contains unmerged entries"
+#: builtin/rebase.c:461
+msgid "continue rebase"
msgstr ""
-#: builtin/update-index.c:959
-msgid "refresh stat information"
+#: builtin/rebase.c:463
+msgid "skip commit"
msgstr ""
-#: builtin/update-index.c:963
-msgid "like --refresh, but ignore assume-unchanged setting"
+#: builtin/rebase.c:464
+msgid "edit the todo list"
msgstr ""
-#: builtin/update-index.c:967
-msgid "<mode>,<object>,<path>"
+#: builtin/rebase.c:466
+msgid "show the current patch"
msgstr ""
-#: builtin/update-index.c:968
-msgid "add the specified entry to the index"
+#: builtin/rebase.c:469
+msgid "shorten commit ids in the todo list"
msgstr ""
-#: builtin/update-index.c:977
-msgid "mark files as \"not changing\""
+#: builtin/rebase.c:471
+msgid "expand commit ids in the todo list"
msgstr ""
-#: builtin/update-index.c:980
-msgid "clear assumed-unchanged bit"
+#: builtin/rebase.c:473
+msgid "check the todo list"
msgstr ""
-#: builtin/update-index.c:983
-msgid "mark files as \"index-only\""
+#: builtin/rebase.c:475
+msgid "rearrange fixup/squash lines"
msgstr ""
-#: builtin/update-index.c:986
-msgid "clear skip-worktree bit"
+#: builtin/rebase.c:477
+msgid "insert exec commands in todo list"
msgstr ""
-#: builtin/update-index.c:989
-msgid "add to index only; do not add content to object database"
+#: builtin/rebase.c:478
+msgid "onto"
msgstr ""
-#: builtin/update-index.c:991
-msgid "remove named paths even if present in worktree"
+#: builtin/rebase.c:481
+msgid "restrict-revision"
msgstr ""
-#: builtin/update-index.c:993
-msgid "with --stdin: input lines are terminated by null bytes"
+#: builtin/rebase.c:481
+msgid "restrict revision"
msgstr ""
-#: builtin/update-index.c:995
-msgid "read list of paths to be updated from standard input"
+#: builtin/rebase.c:483
+msgid "squash-onto"
msgstr ""
-#: builtin/update-index.c:999
-msgid "add entries from standard input to the index"
+#: builtin/rebase.c:484
+msgid "squash onto"
msgstr ""
-#: builtin/update-index.c:1003
-msgid "repopulate stages #2 and #3 for the listed paths"
+#: builtin/rebase.c:486
+msgid "the upstream commit"
msgstr ""
-#: builtin/update-index.c:1007
-msgid "only update entries that differ from HEAD"
+#: builtin/rebase.c:488
+msgid "head-name"
msgstr ""
-#: builtin/update-index.c:1011
-msgid "ignore files missing from worktree"
+#: builtin/rebase.c:488
+msgid "head name"
msgstr ""
-#: builtin/update-index.c:1014
-msgid "report actions to standard output"
+#: builtin/rebase.c:493
+msgid "rebase strategy"
msgstr ""
-#: builtin/update-index.c:1016
-msgid "(for porcelains) forget saved unresolved conflicts"
+#: builtin/rebase.c:494
+msgid "strategy-opts"
msgstr ""
-#: builtin/update-index.c:1020
-msgid "write index in this format"
+#: builtin/rebase.c:495
+msgid "strategy options"
msgstr ""
-#: builtin/update-index.c:1022
-msgid "enable or disable split index"
+#: builtin/rebase.c:496
+msgid "switch-to"
msgstr ""
-#: builtin/update-index.c:1024
-msgid "enable/disable untracked cache"
+#: builtin/rebase.c:497
+msgid "the branch or commit to checkout"
msgstr ""
-#: builtin/update-index.c:1026
-msgid "test if the filesystem supports untracked cache"
+#: builtin/rebase.c:498
+msgid "onto-name"
msgstr ""
-#: builtin/update-index.c:1028
-msgid "enable untracked cache without testing the filesystem"
+#: builtin/rebase.c:498
+msgid "onto name"
msgstr ""
-#: builtin/update-index.c:1030
-msgid "write out the index even if is not flagged as changed"
+#: builtin/rebase.c:499
+msgid "cmd"
msgstr ""
-#: builtin/update-index.c:1032
-msgid "enable or disable file system monitor"
+#: builtin/rebase.c:499
+msgid "the command to run"
msgstr ""
-#: builtin/update-index.c:1034
-msgid "mark files as fsmonitor valid"
+#: builtin/rebase.c:502 builtin/rebase.c:1486
+msgid "automatically re-schedule any `exec` that fails"
msgstr ""
-#: builtin/update-index.c:1037
-msgid "clear fsmonitor valid bit"
+#: builtin/rebase.c:518
+msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
msgstr ""
-#: builtin/update-index.c:1136
-msgid ""
-"core.splitIndex is set to false; remove or change it, if you really want to "
-"enable split index"
+#: builtin/rebase.c:534
+#, c-format
+msgid "%s requires an interactive rebase"
msgstr ""
-#: builtin/update-index.c:1145
-msgid ""
-"core.splitIndex is set to true; remove or change it, if you really want to "
-"disable split index"
+#: builtin/rebase.c:586
+#, c-format
+msgid "could not get 'onto': '%s'"
msgstr ""
-#: 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"
+#: builtin/rebase.c:601
+#, c-format
+msgid "invalid orig-head: '%s'"
msgstr ""
-#: builtin/update-index.c:1160
-msgid "Untracked cache disabled"
+#: builtin/rebase.c:626
+#, c-format
+msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
msgstr ""
-#: 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"
+#: builtin/rebase.c:702
+#, c-format
+msgid "Could not read '%s'"
msgstr ""
-#: builtin/update-index.c:1172
+#: builtin/rebase.c:720
#, c-format
-msgid "Untracked cache enabled for '%s'"
+msgid "Cannot store %s"
msgstr ""
-#: builtin/update-index.c:1180
-msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
+#: builtin/rebase.c:827
+msgid "could not determine HEAD revision"
msgstr ""
-#: builtin/update-index.c:1184
-msgid "fsmonitor enabled"
+#: builtin/rebase.c:950 git-rebase--preserve-merges.sh:81
+msgid ""
+"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 ""
-#: builtin/update-index.c:1187
+#: builtin/rebase.c:1031
+#, c-format
msgid ""
-"core.fsmonitor is set; remove it if you really want to disable fsmonitor"
+"\n"
+"git encountered an error while preparing the patches to replay\n"
+"these revisions:\n"
+"\n"
+" %s\n"
+"\n"
+"As a result, git cannot rebase them."
msgstr ""
-#: builtin/update-index.c:1191
-msgid "fsmonitor disabled"
+#: builtin/rebase.c:1318
+#, c-format
+msgid ""
+"%s\n"
+"Please specify which branch you want to rebase against.\n"
+"See git-rebase(1) for details.\n"
+"\n"
+" git rebase '<branch>'\n"
+"\n"
msgstr ""
-#: builtin/update-ref.c:10
-msgid "git update-ref [<options>] -d <refname> [<old-val>]"
+#: builtin/rebase.c:1334
+#, c-format
+msgid ""
+"If you wish to set tracking information for this branch you can do so with:\n"
+"\n"
+" git branch --set-upstream-to=%s/<branch> %s\n"
+"\n"
msgstr ""
-#: builtin/update-ref.c:11
-msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]"
+#: builtin/rebase.c:1364
+msgid "exec commands cannot contain newlines"
msgstr ""
-#: builtin/update-ref.c:12
-msgid "git update-ref [<options>] --stdin [-z]"
+#: builtin/rebase.c:1368
+msgid "empty exec command"
msgstr ""
-#: builtin/update-ref.c:364
-msgid "delete the reference"
+#: builtin/rebase.c:1396
+msgid "rebase onto given branch instead of upstream"
msgstr ""
-#: builtin/update-ref.c:366
-msgid "update <refname> not the one it points to"
+#: builtin/rebase.c:1398
+msgid "allow pre-rebase hook to run"
msgstr ""
-#: builtin/update-ref.c:367
-msgid "stdin has NUL-terminated arguments"
+#: builtin/rebase.c:1400
+msgid "be quiet. implies --no-stat"
msgstr ""
-#: builtin/update-ref.c:368
-msgid "read updates from stdin"
+#: builtin/rebase.c:1406
+msgid "do not show diffstat of what changed upstream"
msgstr ""
-#: builtin/update-server-info.c:7
-msgid "git update-server-info [--force]"
+#: builtin/rebase.c:1409
+msgid "add a Signed-off-by: line to each commit"
msgstr ""
-#: builtin/update-server-info.c:15
-msgid "update the info files from scratch"
+#: builtin/rebase.c:1411 builtin/rebase.c:1415 builtin/rebase.c:1417
+msgid "passed to 'git am'"
msgstr ""
-#: builtin/upload-pack.c:11
-msgid "git upload-pack [<options>] <dir>"
+#: builtin/rebase.c:1419 builtin/rebase.c:1421
+msgid "passed to 'git apply'"
msgstr ""
-#: builtin/upload-pack.c:25
-msgid "exit immediately after initial ref advertisement"
+#: builtin/rebase.c:1423 builtin/rebase.c:1426
+msgid "cherry-pick all commits, even if unchanged"
msgstr ""
-#: builtin/upload-pack.c:27
-msgid "do not try <directory>/.git/ if <directory> is no Git directory"
+#: builtin/rebase.c:1428
+msgid "continue"
msgstr ""
-#: builtin/upload-pack.c:29
-msgid "interrupt transfer after <n> seconds of inactivity"
+#: builtin/rebase.c:1431
+msgid "skip current patch and continue"
msgstr ""
-#: builtin/verify-commit.c:20
-msgid "git verify-commit [-v | --verbose] <commit>..."
+#: builtin/rebase.c:1433
+msgid "abort and check out the original branch"
msgstr ""
-#: builtin/verify-commit.c:76
-msgid "print commit contents"
+#: builtin/rebase.c:1436
+msgid "abort but keep HEAD where it is"
msgstr ""
-#: builtin/verify-commit.c:77 builtin/verify-tag.c:38
-msgid "print raw gpg status output"
+#: builtin/rebase.c:1437
+msgid "edit the todo list during an interactive rebase"
msgstr ""
-#: builtin/verify-pack.c:55
-msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
+#: builtin/rebase.c:1440
+msgid "show the patch file being applied or merged"
msgstr ""
-#: builtin/verify-pack.c:65
-msgid "verbose"
+#: builtin/rebase.c:1443
+msgid "use merging strategies to rebase"
msgstr ""
-#: builtin/verify-pack.c:67
-msgid "show statistics only"
+#: builtin/rebase.c:1447
+msgid "let the user edit the list of commits to rebase"
msgstr ""
-#: builtin/verify-tag.c:19
-msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
+#: builtin/rebase.c:1451
+msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
msgstr ""
-#: builtin/verify-tag.c:37
-msgid "print tag contents"
+#: builtin/rebase.c:1455
+msgid "preserve empty commits during rebase"
msgstr ""
-#: builtin/worktree.c:17
-msgid "git worktree add [<options>] <path> [<commit-ish>]"
+#: builtin/rebase.c:1457
+msgid "move commits that begin with squash!/fixup! under -i"
msgstr ""
-#: builtin/worktree.c:18
-msgid "git worktree list [<options>]"
+#: builtin/rebase.c:1463
+msgid "automatically stash/stash pop before and after"
msgstr ""
-#: builtin/worktree.c:19
-msgid "git worktree lock [<options>] <path>"
+#: builtin/rebase.c:1465
+msgid "add exec lines after each commit of the editable list"
msgstr ""
-#: builtin/worktree.c:20
-msgid "git worktree move <worktree> <new-path>"
+#: builtin/rebase.c:1469
+msgid "allow rebasing commits with empty messages"
msgstr ""
-#: builtin/worktree.c:21
-msgid "git worktree prune [<options>]"
+#: builtin/rebase.c:1472
+msgid "try to rebase merges instead of skipping them"
msgstr ""
-#: builtin/worktree.c:22
-msgid "git worktree remove [<options>] <worktree>"
+#: builtin/rebase.c:1475
+msgid "use 'merge-base --fork-point' to refine upstream"
msgstr ""
-#: builtin/worktree.c:23
-msgid "git worktree unlock <path>"
+#: builtin/rebase.c:1477
+msgid "use the given merge strategy"
msgstr ""
-#: builtin/worktree.c:58
-#, c-format
-msgid "Removing worktrees/%s: not a valid directory"
+#: builtin/rebase.c:1479 builtin/revert.c:115
+msgid "option"
msgstr ""
-#: builtin/worktree.c:64
-#, c-format
-msgid "Removing worktrees/%s: gitdir file does not exist"
+#: builtin/rebase.c:1480
+msgid "pass the argument through to the merge strategy"
msgstr ""
-#: builtin/worktree.c:69 builtin/worktree.c:78
-#, c-format
-msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
+#: builtin/rebase.c:1483
+msgid "rebase all reachable commits up to the root(s)"
msgstr ""
-#: builtin/worktree.c:88
-#, c-format
+#: builtin/rebase.c:1500
msgid ""
-"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
-"%<PRIuMAX>)"
+"the rebase.useBuiltin support has been removed!\n"
+"See its entry in 'git help config' for details."
msgstr ""
-#: builtin/worktree.c:96
-#, c-format
-msgid "Removing worktrees/%s: invalid gitdir file"
+#: builtin/rebase.c:1506
+msgid "It looks like 'git am' is in progress. Cannot rebase."
msgstr ""
-#: builtin/worktree.c:105
-#, c-format
-msgid "Removing worktrees/%s: gitdir file points to non-existent location"
+#: builtin/rebase.c:1547
+msgid ""
+"git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
msgstr ""
-#: builtin/worktree.c:152
-msgid "report pruned working trees"
+#: builtin/rebase.c:1551
+msgid "No rebase in progress?"
msgstr ""
-#: builtin/worktree.c:154
-msgid "expire working trees older than <time>"
+#: builtin/rebase.c:1555
+msgid "The --edit-todo action can only be used during interactive rebase."
msgstr ""
-#: builtin/worktree.c:229
-#, c-format
-msgid "'%s' already exists"
+#: builtin/rebase.c:1578
+msgid "Cannot read HEAD"
msgstr ""
-#: builtin/worktree.c:260
-#, c-format
-msgid "could not create directory of '%s'"
+#: builtin/rebase.c:1590
+msgid ""
+"You must edit all merge conflicts and then\n"
+"mark them as resolved using git add"
msgstr ""
-#: builtin/worktree.c:373 builtin/worktree.c:379
-#, c-format
-msgid "Preparing worktree (new branch '%s')"
+#: builtin/rebase.c:1609
+msgid "could not discard worktree changes"
msgstr ""
-#: builtin/worktree.c:375
+#: builtin/rebase.c:1628
#, c-format
-msgid "Preparing worktree (resetting branch '%s'; was at %s)"
+msgid "could not move back to %s"
msgstr ""
-#: builtin/worktree.c:384
+#: builtin/rebase.c:1673
#, c-format
-msgid "Preparing worktree (checking out '%s')"
+msgid ""
+"It seems that there is already a %s directory, and\n"
+"I wonder if you are in the middle of another rebase. If that is the\n"
+"case, please try\n"
+"\t%s\n"
+"If that is not the case, please\n"
+"\t%s\n"
+"and run me again. I am stopping in case you still have something\n"
+"valuable there.\n"
msgstr ""
-#: builtin/worktree.c:390
-#, c-format
-msgid "Preparing worktree (detached HEAD %s)"
+#: builtin/rebase.c:1694
+msgid "switch `C' expects a numerical value"
msgstr ""
-#: builtin/worktree.c:431
-msgid "checkout <branch> even if already checked out in other worktree"
+#: builtin/rebase.c:1735
+#, c-format
+msgid "Unknown mode: %s"
msgstr ""
-#: builtin/worktree.c:434
-msgid "create a new branch"
+#: builtin/rebase.c:1757
+msgid "--strategy requires --merge or --interactive"
msgstr ""
-#: builtin/worktree.c:436
-msgid "create or reset a branch"
+#: builtin/rebase.c:1797
+msgid "--reschedule-failed-exec requires --exec or --interactive"
msgstr ""
-#: builtin/worktree.c:438
-msgid "populate the new working tree"
+#: builtin/rebase.c:1809
+msgid "cannot combine am options with either interactive or merge options"
msgstr ""
-#: builtin/worktree.c:439
-msgid "keep the new working tree locked"
+#: builtin/rebase.c:1828
+msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
msgstr ""
-#: builtin/worktree.c:441
-msgid "set up tracking mode (see git-branch(1))"
+#: builtin/rebase.c:1832
+msgid ""
+"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
msgstr ""
-#: builtin/worktree.c:444
-msgid "try to match the new branch name with a remote-tracking branch"
+#: builtin/rebase.c:1838
+msgid "cannot combine '--rebase-merges' with '--strategy-option'"
msgstr ""
-#: builtin/worktree.c:452
-msgid "-b, -B, and --detach are mutually exclusive"
+#: builtin/rebase.c:1841
+msgid "cannot combine '--rebase-merges' with '--strategy'"
msgstr ""
-#: builtin/worktree.c:511
-msgid "--[no-]track can only be used if a new branch is created"
+#: builtin/rebase.c:1865
+#, c-format
+msgid "invalid upstream '%s'"
msgstr ""
-#: builtin/worktree.c:611
-msgid "reason for locking"
+#: builtin/rebase.c:1871
+msgid "Could not create new root commit"
msgstr ""
-#: builtin/worktree.c:623 builtin/worktree.c:656 builtin/worktree.c:710
-#: builtin/worktree.c:850
+#: builtin/rebase.c:1889
#, c-format
-msgid "'%s' is not a working tree"
-msgstr ""
-
-#: builtin/worktree.c:625 builtin/worktree.c:658
-msgid "The main working tree cannot be locked or unlocked"
+msgid "'%s': need exactly one merge base"
msgstr ""
-#: builtin/worktree.c:630
+#: builtin/rebase.c:1896
#, c-format
-msgid "'%s' is already locked, reason: %s"
+msgid "Does not point to a valid commit '%s'"
msgstr ""
-#: builtin/worktree.c:632
+#: builtin/rebase.c:1921
#, c-format
-msgid "'%s' is already locked"
+msgid "fatal: no such branch/commit '%s'"
msgstr ""
-#: builtin/worktree.c:660
+#: builtin/rebase.c:1929 builtin/submodule--helper.c:38
+#: builtin/submodule--helper.c:1934
#, c-format
-msgid "'%s' is not locked"
+msgid "No such ref: %s"
msgstr ""
-#: builtin/worktree.c:685
-msgid "working trees containing submodules cannot be moved or removed"
+#: builtin/rebase.c:1940
+msgid "Could not resolve HEAD to a revision"
msgstr ""
-#: builtin/worktree.c:712 builtin/worktree.c:852
-#, c-format
-msgid "'%s' is a main working tree"
+#: builtin/rebase.c:1981
+msgid "Cannot autostash"
msgstr ""
-#: builtin/worktree.c:717
+#: builtin/rebase.c:1984
#, c-format
-msgid "could not figure out destination name from '%s'"
+msgid "Unexpected stash response: '%s'"
msgstr ""
-#: builtin/worktree.c:723
+#: builtin/rebase.c:1990
#, c-format
-msgid "target '%s' already exists"
+msgid "Could not create directory for '%s'"
msgstr ""
-#: builtin/worktree.c:730
+#: builtin/rebase.c:1993
#, c-format
-msgid "cannot move a locked working tree, lock reason: %s"
+msgid "Created autostash: %s\n"
msgstr ""
-#: builtin/worktree.c:732
-msgid "cannot move a locked working tree"
+#: builtin/rebase.c:1996
+msgid "could not reset --hard"
msgstr ""
-#: builtin/worktree.c:735
+#: builtin/rebase.c:1997 builtin/reset.c:114
#, c-format
-msgid "validation failed, cannot move working tree: %s"
+msgid "HEAD is now at %s"
msgstr ""
-#: builtin/worktree.c:740
-#, c-format
-msgid "failed to move '%s' to '%s'"
+#: builtin/rebase.c:2013
+msgid "Please commit or stash them."
msgstr ""
-#: builtin/worktree.c:788
+#: builtin/rebase.c:2040
#, c-format
-msgid "failed to run 'git status' on '%s'"
+msgid "could not parse '%s'"
msgstr ""
-#: builtin/worktree.c:792
+#: builtin/rebase.c:2053
#, c-format
-msgid "'%s' is dirty, use --force to delete it"
+msgid "could not switch to %s"
msgstr ""
-#: builtin/worktree.c:797
-#, c-format
-msgid "failed to run 'git status' on '%s', code %d"
+#: builtin/rebase.c:2064
+msgid "HEAD is up to date."
msgstr ""
-#: builtin/worktree.c:808 builtin/worktree.c:822
+#: builtin/rebase.c:2066
#, c-format
-msgid "failed to delete '%s'"
+msgid "Current branch %s is up to date.\n"
msgstr ""
-#: builtin/worktree.c:834
-msgid "force removing even if the worktree is dirty"
+#: builtin/rebase.c:2074
+msgid "HEAD is up to date, rebase forced."
msgstr ""
-#: builtin/worktree.c:856
+#: builtin/rebase.c:2076
#, c-format
-msgid "cannot remove a locked working tree, lock reason: %s"
+msgid "Current branch %s is up to date, rebase forced.\n"
msgstr ""
-#: builtin/worktree.c:858
-msgid "cannot remove a locked working tree"
+#: builtin/rebase.c:2084
+msgid "The pre-rebase hook refused to rebase."
msgstr ""
-#: builtin/worktree.c:861
+#: builtin/rebase.c:2091
#, c-format
-msgid "validation failed, cannot remove working tree: %s"
+msgid "Changes to %s:\n"
msgstr ""
-#: builtin/write-tree.c:14
-msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
+#: builtin/rebase.c:2094
+#, c-format
+msgid "Changes from %s to %s:\n"
msgstr ""
-#: builtin/write-tree.c:27
-msgid "<prefix>/"
+#: builtin/rebase.c:2119
+#, c-format
+msgid "First, rewinding head to replay your work on top of it...\n"
msgstr ""
-#: builtin/write-tree.c:28
-msgid "write tree object for a subdirectory <prefix>"
+#: builtin/rebase.c:2128
+msgid "Could not detach HEAD"
msgstr ""
-#: builtin/write-tree.c:30
-msgid "only useful for debugging"
+#: builtin/rebase.c:2137
+#, c-format
+msgid "Fast-forwarded %s to %s.\n"
msgstr ""
-#: credential-cache--daemon.c:222
-#, c-format
+#: builtin/receive-pack.c:32
+msgid "git receive-pack <git-dir>"
+msgstr ""
+
+#: builtin/receive-pack.c:832
msgid ""
-"The permissions on your socket directory are too loose; other\n"
-"users may be able to read your cached credentials. Consider running:\n"
+"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"
-"\tchmod 0700 %s"
+"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 ""
-#: credential-cache--daemon.c:271
-msgid "print debugging messages to stderr"
+#: builtin/receive-pack.c:852
+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 ""
-#: git.c:27
-msgid ""
-"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>]"
+#: builtin/receive-pack.c:1938
+msgid "quiet"
msgstr ""
-#: 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."
+#: builtin/receive-pack.c:1952
+msgid "You must specify a directory."
msgstr ""
-#: git.c:173
-#, c-format
-msgid "no directory given for --git-dir\n"
+#: builtin/reflog.c:17
+msgid ""
+"git reflog expire [--expire=<time>] [--expire-unreachable=<time>] [--"
+"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] "
+"<refs>..."
msgstr ""
-#: git.c:187
-#, c-format
-msgid "no namespace given for --namespace\n"
+#: builtin/reflog.c:22
+msgid ""
+"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] "
+"<refs>..."
msgstr ""
-#: git.c:201
-#, c-format
-msgid "no directory given for --work-tree\n"
+#: builtin/reflog.c:25
+msgid "git reflog exists <ref>"
msgstr ""
-#: git.c:215
+#: builtin/reflog.c:567 builtin/reflog.c:572
#, c-format
-msgid "no prefix given for --super-prefix\n"
+msgid "'%s' is not a valid timestamp"
msgstr ""
-#: git.c:237
+#: builtin/reflog.c:605
#, c-format
-msgid "-c expects a configuration string\n"
+msgid "Marking reachable objects..."
msgstr ""
-#: git.c:275
+#: builtin/reflog.c:643
#, c-format
-msgid "no directory given for -C\n"
+msgid "%s points nowhere!"
msgstr ""
-#: git.c:300
-#, c-format
-msgid "unknown option: %s\n"
+#: builtin/reflog.c:695
+msgid "no reflog specified to delete"
msgstr ""
-#: git.c:770
+#: builtin/reflog.c:704
#, c-format
-msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
+msgid "not a reflog: %s"
msgstr ""
-#: git.c:782
+#: builtin/reflog.c:709
#, c-format
-msgid "failed to run command '%s': %s\n"
+msgid "no reflog for '%s'"
msgstr ""
-#: http.c:348
+#: builtin/reflog.c:755
#, c-format
-msgid "negative value for http.postbuffer; defaulting to %d"
+msgid "invalid ref format: %s"
msgstr ""
-#: http.c:369
-msgid "Delegation control is not supported with cURL < 7.22.0"
+#: builtin/reflog.c:764
+msgid "git reflog [ show | expire | delete | exists ]"
msgstr ""
-#: http.c:378
-msgid "Public key pinning not supported with cURL < 7.44.0"
+#: builtin/remote.c:16
+msgid "git remote [-v | --verbose]"
msgstr ""
-#: http.c:1854
-#, c-format
+#: builtin/remote.c:17
msgid ""
-"unable to update url base from redirection:\n"
-" asked for: %s\n"
-" redirect: %s"
+"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
+"mirror=<fetch|push>] <name> <url>"
msgstr ""
-#: remote-curl.c:401
-#, c-format
-msgid "redirecting to %s"
+#: builtin/remote.c:18 builtin/remote.c:38
+msgid "git remote rename <old> <new>"
msgstr ""
-#: list-objects-filter-options.h:59
-msgid "args"
+#: builtin/remote.c:19 builtin/remote.c:43
+msgid "git remote remove <name>"
msgstr ""
-#: list-objects-filter-options.h:60
-msgid "object filtering"
+#: builtin/remote.c:20 builtin/remote.c:48
+msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
msgstr ""
-#: parse-options.h:157
-msgid "expiry-date"
+#: builtin/remote.c:21
+msgid "git remote [-v | --verbose] show [-n] <name>"
msgstr ""
-#: parse-options.h:172
-msgid "no-op (backward compatibility)"
+#: builtin/remote.c:22
+msgid "git remote prune [-n | --dry-run] <name>"
msgstr ""
-#: parse-options.h:251
-msgid "be more verbose"
+#: builtin/remote.c:23
+msgid ""
+"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
msgstr ""
-#: parse-options.h:253
-msgid "be more quiet"
+#: builtin/remote.c:24
+msgid "git remote set-branches [--add] <name> <branch>..."
msgstr ""
-#: parse-options.h:259
-msgid "use <n> digits to display SHA-1s"
+#: builtin/remote.c:25 builtin/remote.c:74
+msgid "git remote get-url [--push] [--all] <name>"
msgstr ""
-#: command-list.h:50
-msgid "Add file contents to the index"
+#: builtin/remote.c:26 builtin/remote.c:79
+msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
msgstr ""
-#: command-list.h:51
-msgid "Apply a series of patches from a mailbox"
+#: builtin/remote.c:27 builtin/remote.c:80
+msgid "git remote set-url --add <name> <newurl>"
msgstr ""
-#: command-list.h:52
-msgid "Annotate file lines with commit information"
+#: builtin/remote.c:28 builtin/remote.c:81
+msgid "git remote set-url --delete <name> <url>"
msgstr ""
-#: command-list.h:53
-msgid "Apply a patch to files and/or to the index"
+#: builtin/remote.c:33
+msgid "git remote add [<options>] <name> <url>"
msgstr ""
-#: command-list.h:54
-msgid "Import an Arch repository into Git"
+#: builtin/remote.c:53
+msgid "git remote set-branches <name> <branch>..."
msgstr ""
-#: command-list.h:55
-msgid "Create an archive of files from a named tree"
+#: builtin/remote.c:54
+msgid "git remote set-branches --add <name> <branch>..."
msgstr ""
-#: command-list.h:56
-msgid "Use binary search to find the commit that introduced a bug"
+#: builtin/remote.c:59
+msgid "git remote show [<options>] <name>"
msgstr ""
-#: command-list.h:57
-msgid "Show what revision and author last modified each line of a file"
+#: builtin/remote.c:64
+msgid "git remote prune [<options>] <name>"
msgstr ""
-#: command-list.h:58
-msgid "List, create, or delete branches"
+#: builtin/remote.c:69
+msgid "git remote update [<options>] [<group> | <remote>]..."
msgstr ""
-#: command-list.h:59
-msgid "Move objects and refs by archive"
+#: builtin/remote.c:98
+#, c-format
+msgid "Updating %s"
msgstr ""
-#: command-list.h:60
-msgid "Provide content or type and size information for repository objects"
+#: builtin/remote.c:130
+msgid ""
+"--mirror is dangerous and deprecated; please\n"
+"\t use --mirror=fetch or --mirror=push instead"
msgstr ""
-#: command-list.h:61
-msgid "Display gitattributes information"
+#: builtin/remote.c:147
+#, c-format
+msgid "unknown mirror argument: %s"
msgstr ""
-#: command-list.h:62
-msgid "Debug gitignore / exclude files"
+#: builtin/remote.c:163
+msgid "fetch the remote branches"
msgstr ""
-#: command-list.h:63
-msgid "Show canonical names and email addresses of contacts"
+#: builtin/remote.c:165
+msgid "import all tags and associated objects when fetching"
msgstr ""
-#: command-list.h:64
-msgid "Switch branches or restore working tree files"
+#: builtin/remote.c:168
+msgid "or do not fetch any tag at all (--no-tags)"
msgstr ""
-#: command-list.h:65
-msgid "Copy files from the index to the working tree"
+#: builtin/remote.c:170
+msgid "branch(es) to track"
msgstr ""
-#: command-list.h:66
-msgid "Ensures that a reference name is well formed"
+#: builtin/remote.c:171
+msgid "master branch"
msgstr ""
-#: command-list.h:67
-msgid "Find commits yet to be applied to upstream"
+#: builtin/remote.c:173
+msgid "set up remote as a mirror to push to or fetch from"
msgstr ""
-#: command-list.h:68
-msgid "Apply the changes introduced by some existing commits"
+#: builtin/remote.c:185
+msgid "specifying a master branch makes no sense with --mirror"
msgstr ""
-#: command-list.h:69
-msgid "Graphical alternative to git-commit"
+#: builtin/remote.c:187
+msgid "specifying branches to track makes sense only with fetch mirrors"
msgstr ""
-#: command-list.h:70
-msgid "Remove untracked files from the working tree"
+#: builtin/remote.c:194 builtin/remote.c:636
+#, c-format
+msgid "remote %s already exists."
msgstr ""
-#: command-list.h:71
-msgid "Clone a repository into a new directory"
+#: builtin/remote.c:198 builtin/remote.c:640
+#, c-format
+msgid "'%s' is not a valid remote name"
msgstr ""
-#: command-list.h:72
-msgid "Display data in columns"
+#: builtin/remote.c:238
+#, c-format
+msgid "Could not setup master '%s'"
msgstr ""
-#: command-list.h:73
-msgid "Record changes to the repository"
+#: builtin/remote.c:344
+#, c-format
+msgid "Could not get fetch map for refspec %s"
msgstr ""
-#: command-list.h:74
-msgid "Write and verify Git commit graph files"
+#: builtin/remote.c:443 builtin/remote.c:451
+msgid "(matching)"
msgstr ""
-#: command-list.h:75
-msgid "Create a new commit object"
+#: builtin/remote.c:455
+msgid "(delete)"
msgstr ""
-#: command-list.h:76
-msgid "Get and set repository or global options"
+#: builtin/remote.c:629 builtin/remote.c:765 builtin/remote.c:864
+#, c-format
+msgid "No such remote: '%s'"
msgstr ""
-#: command-list.h:77
-msgid "Count unpacked number of objects and their disk consumption"
+#: builtin/remote.c:646
+#, c-format
+msgid "Could not rename config section '%s' to '%s'"
msgstr ""
-#: command-list.h:78
-msgid "Retrieve and store user credentials"
+#: builtin/remote.c:666
+#, c-format
+msgid ""
+"Not updating non-default fetch refspec\n"
+"\t%s\n"
+"\tPlease update the configuration manually if necessary."
msgstr ""
-#: command-list.h:79
-msgid "Helper to temporarily store passwords in memory"
+#: builtin/remote.c:702
+#, c-format
+msgid "deleting '%s' failed"
msgstr ""
-#: command-list.h:80
-msgid "Helper to store credentials on disk"
+#: builtin/remote.c:736
+#, c-format
+msgid "creating '%s' failed"
msgstr ""
-#: command-list.h:81
-msgid "Export a single commit to a CVS checkout"
-msgstr ""
+#: builtin/remote.c:802
+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] ""
-#: command-list.h:82
-msgid "Salvage your data out of another SCM people love to hate"
+#: builtin/remote.c:816
+#, c-format
+msgid "Could not remove config section '%s'"
msgstr ""
-#: command-list.h:83
-msgid "A CVS server emulator for Git"
+#: builtin/remote.c:917
+#, c-format
+msgid " new (next fetch will store in remotes/%s)"
msgstr ""
-#: command-list.h:84
-msgid "A really simple server for Git repositories"
+#: builtin/remote.c:920
+msgid " tracked"
msgstr ""
-#: command-list.h:85
-msgid "Give an object a human readable name based on an available ref"
+#: builtin/remote.c:922
+msgid " stale (use 'git remote prune' to remove)"
msgstr ""
-#: command-list.h:86
-msgid "Show changes between commits, commit and working tree, etc"
+#: builtin/remote.c:924
+msgid " ???"
msgstr ""
-#: command-list.h:87
-msgid "Compares files in the working tree and the index"
+#: builtin/remote.c:965
+#, c-format
+msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
msgstr ""
-#: command-list.h:88
-msgid "Compare a tree to the working tree or index"
+#: builtin/remote.c:974
+#, c-format
+msgid "rebases interactively onto remote %s"
msgstr ""
-#: command-list.h:89
-msgid "Compares the content and mode of blobs found via two tree objects"
+#: builtin/remote.c:976
+#, c-format
+msgid "rebases interactively (with merges) onto remote %s"
msgstr ""
-#: command-list.h:90
-msgid "Show changes using common diff tools"
+#: builtin/remote.c:979
+#, c-format
+msgid "rebases onto remote %s"
msgstr ""
-#: command-list.h:91
-msgid "Git data exporter"
+#: builtin/remote.c:983
+#, c-format
+msgid " merges with remote %s"
msgstr ""
-#: command-list.h:92
-msgid "Backend for fast Git data importers"
+#: builtin/remote.c:986
+#, c-format
+msgid "merges with remote %s"
msgstr ""
-#: command-list.h:93
-msgid "Download objects and refs from another repository"
+#: builtin/remote.c:989
+#, c-format
+msgid "%-*s and with remote %s\n"
msgstr ""
-#: command-list.h:94
-msgid "Receive missing objects from another repository"
+#: builtin/remote.c:1032
+msgid "create"
msgstr ""
-#: command-list.h:95
-msgid "Rewrite branches"
+#: builtin/remote.c:1035
+msgid "delete"
msgstr ""
-#: command-list.h:96
-msgid "Produce a merge commit message"
+#: builtin/remote.c:1039
+msgid "up to date"
msgstr ""
-#: command-list.h:97
-msgid "Output information on each ref"
+#: builtin/remote.c:1042
+msgid "fast-forwardable"
msgstr ""
-#: command-list.h:98
-msgid "Prepare patches for e-mail submission"
+#: builtin/remote.c:1045
+msgid "local out of date"
msgstr ""
-#: command-list.h:99
-msgid "Verifies the connectivity and validity of the objects in the database"
+#: builtin/remote.c:1052
+#, c-format
+msgid " %-*s forces to %-*s (%s)"
msgstr ""
-#: command-list.h:100
-msgid "Cleanup unnecessary files and optimize the local repository"
+#: builtin/remote.c:1055
+#, c-format
+msgid " %-*s pushes to %-*s (%s)"
msgstr ""
-#: command-list.h:101
-msgid "Extract commit ID from an archive created using git-archive"
+#: builtin/remote.c:1059
+#, c-format
+msgid " %-*s forces to %s"
msgstr ""
-#: command-list.h:102
-msgid "Print lines matching a pattern"
+#: builtin/remote.c:1062
+#, c-format
+msgid " %-*s pushes to %s"
msgstr ""
-#: command-list.h:103
-msgid "A portable graphical interface to Git"
+#: builtin/remote.c:1130
+msgid "do not query remotes"
msgstr ""
-#: command-list.h:104
-msgid "Compute object ID and optionally creates a blob from a file"
+#: builtin/remote.c:1157
+#, c-format
+msgid "* remote %s"
msgstr ""
-#: command-list.h:105
-msgid "Display help information about Git"
+#: builtin/remote.c:1158
+#, c-format
+msgid " Fetch URL: %s"
msgstr ""
-#: command-list.h:106
-msgid "Server side implementation of Git over HTTP"
+#: builtin/remote.c:1159 builtin/remote.c:1175 builtin/remote.c:1314
+msgid "(no URL)"
msgstr ""
-#: command-list.h:107
-msgid "Download from a remote Git repository via HTTP"
+#. TRANSLATORS: the colon ':' should align
+#. with the one in " Fetch URL: %s"
+#. translation.
+#.
+#: builtin/remote.c:1173 builtin/remote.c:1175
+#, c-format
+msgid " Push URL: %s"
msgstr ""
-#: command-list.h:108
-msgid "Push objects over HTTP/DAV to another repository"
+#: builtin/remote.c:1177 builtin/remote.c:1179 builtin/remote.c:1181
+#, c-format
+msgid " HEAD branch: %s"
msgstr ""
-#: command-list.h:109
-msgid "Send a collection of patches from stdin to an IMAP folder"
+#: builtin/remote.c:1177
+msgid "(not queried)"
msgstr ""
-#: command-list.h:110
-msgid "Build pack index file for an existing packed archive"
+#: builtin/remote.c:1179
+msgid "(unknown)"
msgstr ""
-#: command-list.h:111
-msgid "Create an empty Git repository or reinitialize an existing one"
+#: builtin/remote.c:1183
+#, c-format
+msgid ""
+" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
msgstr ""
-#: command-list.h:112
-msgid "Instantly browse your working repository in gitweb"
+#: builtin/remote.c:1195
+#, c-format
+msgid " Remote branch:%s"
+msgid_plural " Remote branches:%s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/remote.c:1198 builtin/remote.c:1224
+msgid " (status not queried)"
msgstr ""
-#: command-list.h:113
-msgid "add or parse structured information in commit messages"
+#: builtin/remote.c:1207
+msgid " Local branch configured for 'git pull':"
+msgid_plural " Local branches configured for 'git pull':"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/remote.c:1215
+msgid " Local refs will be mirrored by 'git push'"
msgstr ""
-#: command-list.h:114
-msgid "The Git repository browser"
+#: builtin/remote.c:1221
+#, c-format
+msgid " Local ref configured for 'git push'%s:"
+msgid_plural " Local refs configured for 'git push'%s:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/remote.c:1242
+msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr ""
-#: command-list.h:115
-msgid "Show commit logs"
+#: builtin/remote.c:1244
+msgid "delete refs/remotes/<name>/HEAD"
msgstr ""
-#: command-list.h:116
-msgid "Show information about files in the index and the working tree"
+#: builtin/remote.c:1259
+msgid "Cannot determine remote HEAD"
msgstr ""
-#: command-list.h:117
-msgid "List references in a remote repository"
+#: builtin/remote.c:1261
+msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr ""
-#: command-list.h:118
-msgid "List the contents of a tree object"
+#: builtin/remote.c:1271
+#, c-format
+msgid "Could not delete %s"
msgstr ""
-#: command-list.h:119
-msgid "Extracts patch and authorship from a single e-mail message"
+#: builtin/remote.c:1279
+#, c-format
+msgid "Not a valid ref: %s"
msgstr ""
-#: command-list.h:120
-msgid "Simple UNIX mbox splitter program"
+#: builtin/remote.c:1281
+#, c-format
+msgid "Could not setup %s"
msgstr ""
-#: command-list.h:121
-msgid "Join two or more development histories together"
+#: builtin/remote.c:1299
+#, c-format
+msgid " %s will become dangling!"
msgstr ""
-#: command-list.h:122
-msgid "Find as good common ancestors as possible for a merge"
+#: builtin/remote.c:1300
+#, c-format
+msgid " %s has become dangling!"
msgstr ""
-#: command-list.h:123
-msgid "Run a three-way file merge"
+#: builtin/remote.c:1310
+#, c-format
+msgid "Pruning %s"
msgstr ""
-#: command-list.h:124
-msgid "Run a merge for files needing merging"
+#: builtin/remote.c:1311
+#, c-format
+msgid "URL: %s"
msgstr ""
-#: command-list.h:125
-msgid "The standard helper program to use with git-merge-index"
+#: builtin/remote.c:1327
+#, c-format
+msgid " * [would prune] %s"
msgstr ""
-#: command-list.h:126
-msgid "Run merge conflict resolution tools to resolve merge conflicts"
+#: builtin/remote.c:1330
+#, c-format
+msgid " * [pruned] %s"
msgstr ""
-#: command-list.h:127
-msgid "Show three-way merge without touching index"
+#: builtin/remote.c:1375
+msgid "prune remotes after fetching"
msgstr ""
-#: command-list.h:128
-msgid "Creates a tag object"
+#: builtin/remote.c:1438 builtin/remote.c:1492 builtin/remote.c:1560
+#, c-format
+msgid "No such remote '%s'"
msgstr ""
-#: command-list.h:129
-msgid "Build a tree-object from ls-tree formatted text"
+#: builtin/remote.c:1454
+msgid "add branch"
msgstr ""
-#: command-list.h:130
-msgid "Move or rename a file, a directory, or a symlink"
+#: builtin/remote.c:1461
+msgid "no remote specified"
msgstr ""
-#: command-list.h:131
-msgid "Find symbolic names for given revs"
+#: builtin/remote.c:1478
+msgid "query push URLs rather than fetch URLs"
msgstr ""
-#: command-list.h:132
-msgid "Add or inspect object notes"
+#: builtin/remote.c:1480
+msgid "return all URLs"
msgstr ""
-#: command-list.h:133
-msgid "Import from and submit to Perforce repositories"
+#: builtin/remote.c:1508
+#, c-format
+msgid "no URLs configured for remote '%s'"
msgstr ""
-#: command-list.h:134
-msgid "Create a packed archive of objects"
+#: builtin/remote.c:1534
+msgid "manipulate push URLs"
msgstr ""
-#: command-list.h:135
-msgid "Find redundant pack files"
+#: builtin/remote.c:1536
+msgid "add URL"
msgstr ""
-#: command-list.h:136
-msgid "Pack heads and tags for efficient repository access"
+#: builtin/remote.c:1538
+msgid "delete URLs"
msgstr ""
-#: command-list.h:137
-msgid "Routines to help parsing remote repository access parameters"
+#: builtin/remote.c:1545
+msgid "--add --delete doesn't make sense"
msgstr ""
-#: command-list.h:138
-msgid "Compute unique ID for a patch"
+#: builtin/remote.c:1584
+#, c-format
+msgid "Invalid old URL pattern: %s"
msgstr ""
-#: command-list.h:139
-msgid "Prune all unreachable objects from the object database"
+#: builtin/remote.c:1592
+#, c-format
+msgid "No such URL found: %s"
msgstr ""
-#: command-list.h:140
-msgid "Remove extra objects that are already in pack files"
+#: builtin/remote.c:1594
+msgid "Will not delete all non-push URLs"
msgstr ""
-#: command-list.h:141
-msgid "Fetch from and integrate with another repository or a local branch"
+#: builtin/remote.c:1610
+msgid "be verbose; must be placed before a subcommand"
msgstr ""
-#: command-list.h:142
-msgid "Update remote refs along with associated objects"
+#: builtin/remote.c:1641
+#, c-format
+msgid "Unknown subcommand: %s"
msgstr ""
-#: command-list.h:143
-msgid "Applies a quilt patchset onto the current branch"
+#: builtin/repack.c:22
+msgid "git repack [<options>]"
msgstr ""
-#: command-list.h:144
-msgid "Compare two commit ranges (e.g. two versions of a branch)"
+#: builtin/repack.c:27
+msgid ""
+"Incremental repacks are incompatible with bitmap indexes. Use\n"
+"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
msgstr ""
-#: command-list.h:145
-msgid "Reads tree information into the index"
+#: builtin/repack.c:190
+msgid "could not start pack-objects to repack promisor objects"
msgstr ""
-#: command-list.h:146
-msgid "Reapply commits on top of another base tip"
+#: builtin/repack.c:229 builtin/repack.c:408
+msgid "repack: Expecting full hex object ID lines only from pack-objects."
msgstr ""
-#: command-list.h:147
-msgid "Receive what is pushed into the repository"
+#: builtin/repack.c:246
+msgid "could not finish pack-objects to repack promisor objects"
msgstr ""
-#: command-list.h:148
-msgid "Manage reflog information"
+#: builtin/repack.c:284
+msgid "pack everything in a single pack"
msgstr ""
-#: command-list.h:149
-msgid "Manage set of tracked repositories"
+#: builtin/repack.c:286
+msgid "same as -a, and turn unreachable objects loose"
msgstr ""
-#: command-list.h:150
-msgid "Pack unpacked objects in a repository"
+#: builtin/repack.c:289
+msgid "remove redundant packs, and run git-prune-packed"
msgstr ""
-#: command-list.h:151
-msgid "Create, list, delete refs to replace objects"
+#: builtin/repack.c:291
+msgid "pass --no-reuse-delta to git-pack-objects"
msgstr ""
-#: command-list.h:152
-msgid "Generates a summary of pending changes"
+#: builtin/repack.c:293
+msgid "pass --no-reuse-object to git-pack-objects"
msgstr ""
-#: command-list.h:153
-msgid "Reuse recorded resolution of conflicted merges"
+#: builtin/repack.c:295
+msgid "do not run git-update-server-info"
msgstr ""
-#: command-list.h:154
-msgid "Reset current HEAD to the specified state"
+#: builtin/repack.c:298
+msgid "pass --local to git-pack-objects"
msgstr ""
-#: command-list.h:155
-msgid "Revert some existing commits"
+#: builtin/repack.c:300
+msgid "write bitmap index"
msgstr ""
-#: command-list.h:156
-msgid "Lists commit objects in reverse chronological order"
+#: builtin/repack.c:302
+msgid "pass --delta-islands to git-pack-objects"
msgstr ""
-#: command-list.h:157
-msgid "Pick out and massage parameters"
+#: builtin/repack.c:303
+msgid "approxidate"
msgstr ""
-#: command-list.h:158
-msgid "Remove files from the working tree and from the index"
+#: builtin/repack.c:304
+msgid "with -A, do not loosen objects older than this"
msgstr ""
-#: command-list.h:159
-msgid "Send a collection of patches as emails"
+#: builtin/repack.c:306
+msgid "with -a, repack unreachable objects"
msgstr ""
-#: command-list.h:160
-msgid "Push objects over Git protocol to another repository"
+#: builtin/repack.c:308
+msgid "size of the window used for delta compression"
msgstr ""
-#: command-list.h:161
-msgid "Restricted login shell for Git-only SSH access"
+#: builtin/repack.c:309 builtin/repack.c:315
+msgid "bytes"
msgstr ""
-#: command-list.h:162
-msgid "Summarize 'git log' output"
+#: builtin/repack.c:310
+msgid "same as the above, but limit memory size instead of entries count"
msgstr ""
-#: command-list.h:163
-msgid "Show various types of objects"
+#: builtin/repack.c:312
+msgid "limits the maximum delta depth"
msgstr ""
-#: command-list.h:164
-msgid "Show branches and their commits"
+#: builtin/repack.c:314
+msgid "limits the maximum number of threads"
msgstr ""
-#: command-list.h:165
-msgid "Show packed archive index"
+#: builtin/repack.c:316
+msgid "maximum size of each packfile"
msgstr ""
-#: command-list.h:166
-msgid "List references in a local repository"
+#: builtin/repack.c:318
+msgid "repack objects in packs marked with .keep"
msgstr ""
-#: command-list.h:167
-msgid "Git's i18n setup code for shell scripts"
+#: builtin/repack.c:320
+msgid "do not repack this pack"
msgstr ""
-#: command-list.h:168
-msgid "Common Git shell script setup code"
+#: builtin/repack.c:330
+msgid "cannot delete packs in a precious-objects repo"
msgstr ""
-#: command-list.h:169
-msgid "Stash the changes in a dirty working directory away"
+#: builtin/repack.c:334
+msgid "--keep-unreachable and -A are incompatible"
msgstr ""
-#: command-list.h:170
-msgid "Add file contents to the staging area"
+#: builtin/repack.c:417
+msgid "Nothing new to pack."
msgstr ""
-#: command-list.h:171
-msgid "Show the working tree status"
+#: builtin/repack.c:478
+#, c-format
+msgid ""
+"WARNING: Some packs in use have been renamed by\n"
+"WARNING: prefixing old- to their name, in order to\n"
+"WARNING: replace them with the new version of the\n"
+"WARNING: file. But the operation failed, and the\n"
+"WARNING: attempt to rename them back to their\n"
+"WARNING: original names also failed.\n"
+"WARNING: Please rename them in %s manually:\n"
msgstr ""
-#: command-list.h:172
-msgid "Remove unnecessary whitespace"
+#: builtin/repack.c:526
+#, c-format
+msgid "failed to remove '%s'"
msgstr ""
-#: command-list.h:173
-msgid "Initialize, update or inspect submodules"
+#: builtin/replace.c:22
+msgid "git replace [-f] <object> <replacement>"
msgstr ""
-#: command-list.h:174
-msgid "Bidirectional operation between a Subversion repository and Git"
+#: builtin/replace.c:23
+msgid "git replace [-f] --edit <object>"
msgstr ""
-#: command-list.h:175
-msgid "Read, modify and delete symbolic refs"
+#: builtin/replace.c:24
+msgid "git replace [-f] --graft <commit> [<parent>...]"
msgstr ""
-#: command-list.h:176
-msgid "Create, list, delete or verify a tag object signed with GPG"
+#: builtin/replace.c:25
+msgid "git replace [-f] --convert-graft-file"
msgstr ""
-#: command-list.h:177
-msgid "Creates a temporary file with a blob's contents"
+#: builtin/replace.c:26
+msgid "git replace -d <object>..."
msgstr ""
-#: command-list.h:178
-msgid "Unpack objects from a packed archive"
+#: builtin/replace.c:27
+msgid "git replace [--format=<format>] [-l [<pattern>]]"
msgstr ""
-#: command-list.h:179
-msgid "Register file contents in the working tree to the index"
+#: builtin/replace.c:90
+#, c-format
+msgid ""
+"invalid replace format '%s'\n"
+"valid formats are 'short', 'medium' and 'long'"
msgstr ""
-#: command-list.h:180
-msgid "Update the object name stored in a ref safely"
+#: builtin/replace.c:125
+#, c-format
+msgid "replace ref '%s' not found"
msgstr ""
-#: command-list.h:181
-msgid "Update auxiliary info file to help dumb servers"
+#: builtin/replace.c:141
+#, c-format
+msgid "Deleted replace ref '%s'"
msgstr ""
-#: command-list.h:182
-msgid "Send archive back to git-archive"
+#: builtin/replace.c:153
+#, c-format
+msgid "'%s' is not a valid ref name"
msgstr ""
-#: command-list.h:183
-msgid "Send objects packed back to git-fetch-pack"
+#: builtin/replace.c:158
+#, c-format
+msgid "replace ref '%s' already exists"
msgstr ""
-#: command-list.h:184
-msgid "Show a Git logical variable"
+#: builtin/replace.c:178
+#, c-format
+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 ""
-#: command-list.h:185
-msgid "Check the GPG signature of commits"
+#: builtin/replace.c:229
+#, c-format
+msgid "unable to open %s for writing"
msgstr ""
-#: command-list.h:186
-msgid "Validate packed Git archive files"
+#: builtin/replace.c:242
+msgid "cat-file reported failure"
msgstr ""
-#: command-list.h:187
-msgid "Check the GPG signature of tags"
+#: builtin/replace.c:258
+#, c-format
+msgid "unable to open %s for reading"
msgstr ""
-#: command-list.h:188
-msgid "Git web interface (web frontend to Git repositories)"
+#: builtin/replace.c:272
+msgid "unable to spawn mktree"
msgstr ""
-#: command-list.h:189
-msgid "Show logs with difference each commit introduces"
+#: builtin/replace.c:276
+msgid "unable to read from mktree"
msgstr ""
-#: command-list.h:190
-msgid "Manage multiple working trees"
+#: builtin/replace.c:285
+msgid "mktree reported failure"
msgstr ""
-#: command-list.h:191
-msgid "Create a tree object from the current index"
+#: builtin/replace.c:289
+msgid "mktree did not return an object name"
msgstr ""
-#: command-list.h:192
-msgid "Defining attributes per path"
+#: builtin/replace.c:298
+#, c-format
+msgid "unable to fstat %s"
msgstr ""
-#: command-list.h:193
-msgid "Git command-line interface and conventions"
+#: builtin/replace.c:303
+msgid "unable to write object to database"
msgstr ""
-#: command-list.h:194
-msgid "A Git core tutorial for developers"
+#: builtin/replace.c:322 builtin/replace.c:377 builtin/replace.c:422
+#: builtin/replace.c:452
+#, c-format
+msgid "not a valid object name: '%s'"
msgstr ""
-#: command-list.h:195
-msgid "Git for CVS users"
+#: builtin/replace.c:326
+#, c-format
+msgid "unable to get object type for %s"
msgstr ""
-#: command-list.h:196
-msgid "Tweaking diff output"
+#: builtin/replace.c:342
+msgid "editing object file failed"
msgstr ""
-#: command-list.h:197
-msgid "A useful minimum set of commands for Everyday Git"
+#: builtin/replace.c:351
+#, c-format
+msgid "new object is the same as the old one: '%s'"
msgstr ""
-#: command-list.h:198
-msgid "A Git Glossary"
+#: builtin/replace.c:383
+#, c-format
+msgid "could not parse %s as a commit"
msgstr ""
-#: command-list.h:199
-msgid "Hooks used by Git"
+#: builtin/replace.c:414
+#, c-format
+msgid "bad mergetag in commit '%s'"
msgstr ""
-#: command-list.h:200
-msgid "Specifies intentionally untracked files to ignore"
+#: builtin/replace.c:416
+#, c-format
+msgid "malformed mergetag in commit '%s'"
msgstr ""
-#: command-list.h:201
-msgid "Defining submodule properties"
+#: builtin/replace.c:428
+#, c-format
+msgid ""
+"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
+"instead of --graft"
msgstr ""
-#: command-list.h:202
-msgid "Git namespaces"
+#: builtin/replace.c:467
+#, c-format
+msgid "the original commit '%s' has a gpg signature"
msgstr ""
-#: command-list.h:203
-msgid "Git Repository Layout"
+#: builtin/replace.c:468
+msgid "the signature will be removed in the replacement commit!"
msgstr ""
-#: command-list.h:204
-msgid "Specifying revisions and ranges for Git"
+#: builtin/replace.c:478
+#, c-format
+msgid "could not write replacement commit for: '%s'"
msgstr ""
-#: command-list.h:205
-msgid "A tutorial introduction to Git: part two"
+#: builtin/replace.c:486
+#, c-format
+msgid "graft for '%s' unnecessary"
msgstr ""
-#: command-list.h:206
-msgid "A tutorial introduction to Git"
+#: builtin/replace.c:490
+#, c-format
+msgid "new commit is the same as the old one: '%s'"
msgstr ""
-#: command-list.h:207
-msgid "An overview of recommended workflows with Git"
+#: builtin/replace.c:525
+#, c-format
+msgid ""
+"could not convert the following graft(s):\n"
+"%s"
msgstr ""
-#: rerere.h:40
-msgid "update the index with reused conflict resolution if possible"
+#: builtin/replace.c:546
+msgid "list replace refs"
msgstr ""
-#: git-bisect.sh:54
-msgid "You need to start by \"git bisect start\""
+#: builtin/replace.c:547
+msgid "delete replace refs"
msgstr ""
-#. TRANSLATORS: Make sure to include [Y] and [n] in your
-#. translation. The program will only accept English input
-#. at this point.
-#: git-bisect.sh:60
-msgid "Do you want me to do it for you [Y/n]? "
+#: builtin/replace.c:548
+msgid "edit existing object"
msgstr ""
-#: git-bisect.sh:121
-#, sh-format
-msgid "unrecognised option: '$arg'"
+#: builtin/replace.c:549
+msgid "change a commit's parents"
msgstr ""
-#: git-bisect.sh:125
-#, sh-format
-msgid "'$arg' does not appear to be a valid revision"
+#: builtin/replace.c:550
+msgid "convert existing graft file"
msgstr ""
-#: git-bisect.sh:154
-msgid "Bad HEAD - I need a HEAD"
+#: builtin/replace.c:551
+msgid "replace the ref if it exists"
msgstr ""
-#: git-bisect.sh:167
-#, sh-format
-msgid ""
-"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
+#: builtin/replace.c:553
+msgid "do not pretty-print contents for --edit"
msgstr ""
-#: git-bisect.sh:177
-msgid "won't bisect on cg-seek'ed tree"
+#: builtin/replace.c:554
+msgid "use this format"
msgstr ""
-#: git-bisect.sh:181
-msgid "Bad HEAD - strange symbolic ref"
+#: builtin/replace.c:567
+msgid "--format cannot be used when not listing"
msgstr ""
-#: git-bisect.sh:233
-#, sh-format
-msgid "Bad bisect_write argument: $state"
+#: builtin/replace.c:575
+msgid "-f only makes sense when writing a replacement"
msgstr ""
-#: git-bisect.sh:246
-#, sh-format
-msgid "Bad rev input: $arg"
+#: builtin/replace.c:579
+msgid "--raw only makes sense with --edit"
msgstr ""
-#: git-bisect.sh:265
-#, sh-format
-msgid "Bad rev input: $bisected_head"
+#: builtin/replace.c:585
+msgid "-d needs at least one argument"
msgstr ""
-#: git-bisect.sh:274
-#, sh-format
-msgid "Bad rev input: $rev"
+#: builtin/replace.c:591
+msgid "bad number of arguments"
msgstr ""
-#: git-bisect.sh:283
-#, sh-format
-msgid "'git bisect $TERM_BAD' can take only one argument."
+#: builtin/replace.c:597
+msgid "-e needs exactly one argument"
msgstr ""
-#: git-bisect.sh:306
-#, sh-format
-msgid "Warning: bisecting only with a $TERM_BAD commit."
+#: builtin/replace.c:603
+msgid "-g needs at least one argument"
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:312
-msgid "Are you sure [Y/n]? "
+#: builtin/replace.c:609
+msgid "--convert-graft-file takes no argument"
msgstr ""
-#: 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.)"
+#: builtin/replace.c:615
+msgid "only one pattern can be given with -l"
msgstr ""
-#: git-bisect.sh:327
-#, sh-format
-msgid ""
-"You need to start by \"git bisect start\".\n"
-"You then need to give me at least one $good_syn and one $bad_syn revision.\n"
-"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
+#: builtin/rerere.c:13
+msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
msgstr ""
-#: git-bisect.sh:398 git-bisect.sh:512
-msgid "We are not bisecting."
+#: builtin/rerere.c:60
+msgid "register clean resolutions in index"
msgstr ""
-#: git-bisect.sh:405
-#, sh-format
-msgid "'$invalid' is not a valid commit"
+#: builtin/rerere.c:79
+msgid "'git rerere forget' without paths is deprecated"
msgstr ""
-#: git-bisect.sh:414
-#, sh-format
+#: builtin/rerere.c:113
+#, c-format
+msgid "unable to generate diff for '%s'"
+msgstr ""
+
+#: builtin/reset.c:32
msgid ""
-"Could not check out original HEAD '$branch'.\n"
-"Try 'git bisect reset <commit>'."
+"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
msgstr ""
-#: git-bisect.sh:422
-msgid "No logfile given"
+#: builtin/reset.c:33
+msgid "git reset [-q] [<tree-ish>] [--] <paths>..."
msgstr ""
-#: git-bisect.sh:423
-#, sh-format
-msgid "cannot read $file for replaying"
+#: builtin/reset.c:34
+msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
msgstr ""
-#: git-bisect.sh:444
-msgid "?? what are you talking about?"
+#: builtin/reset.c:40
+msgid "mixed"
msgstr ""
-#: git-bisect.sh:453
-msgid "bisect run failed: no command provided."
+#: builtin/reset.c:40
+msgid "soft"
msgstr ""
-#: git-bisect.sh:458
-#, sh-format
-msgid "running $command"
+#: builtin/reset.c:40
+msgid "hard"
msgstr ""
-#: git-bisect.sh:465
-#, sh-format
-msgid ""
-"bisect run failed:\n"
-"exit code $res from '$command' is < 0 or >= 128"
+#: builtin/reset.c:40
+msgid "merge"
msgstr ""
-#: git-bisect.sh:491
-msgid "bisect run cannot continue any more"
+#: builtin/reset.c:40
+msgid "keep"
msgstr ""
-#: git-bisect.sh:497
-#, sh-format
-msgid ""
-"bisect run failed:\n"
-"'bisect_state $state' exited with error code $res"
+#: builtin/reset.c:81
+msgid "You do not have a valid HEAD."
msgstr ""
-#: git-bisect.sh:504
-msgid "bisect run success"
+#: builtin/reset.c:83
+msgid "Failed to find tree of HEAD."
msgstr ""
-#: git-bisect.sh:533
-#, sh-format
-msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect."
+#: builtin/reset.c:89
+#, c-format
+msgid "Failed to find tree of %s."
msgstr ""
-#: git-bisect.sh:567
-msgid "no terms defined"
+#: builtin/reset.c:193
+#, c-format
+msgid "Cannot do a %s reset in the middle of a merge."
msgstr ""
-#: git-bisect.sh:584
-#, sh-format
+#: builtin/reset.c:293 builtin/stash.c:514 builtin/stash.c:589
+#: builtin/stash.c:613
+msgid "be quiet, only report errors"
+msgstr ""
+
+#: builtin/reset.c:295
+msgid "reset HEAD and index"
+msgstr ""
+
+#: builtin/reset.c:296
+msgid "reset only HEAD"
+msgstr ""
+
+#: builtin/reset.c:298 builtin/reset.c:300
+msgid "reset HEAD, index and working tree"
+msgstr ""
+
+#: builtin/reset.c:302
+msgid "reset HEAD but keep local changes"
+msgstr ""
+
+#: builtin/reset.c:308
+msgid "record only the fact that removed paths will be added later"
+msgstr ""
+
+#: builtin/reset.c:326
+#, c-format
+msgid "Failed to resolve '%s' as a valid revision."
+msgstr ""
+
+#: builtin/reset.c:334
+#, c-format
+msgid "Failed to resolve '%s' as a valid tree."
+msgstr ""
+
+#: builtin/reset.c:343
+msgid "--patch is incompatible with --{hard,mixed,soft}"
+msgstr ""
+
+#: builtin/reset.c:353
+msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
+msgstr ""
+
+#: builtin/reset.c:355
+#, c-format
+msgid "Cannot do %s reset with paths."
+msgstr ""
+
+#: builtin/reset.c:370
+#, c-format
+msgid "%s reset is not allowed in a bare repository"
+msgstr ""
+
+#: builtin/reset.c:374
+msgid "-N can only be used with --mixed"
+msgstr ""
+
+#: builtin/reset.c:395
+msgid "Unstaged changes after reset:"
+msgstr ""
+
+#: builtin/reset.c:398
+#, c-format
msgid ""
-"invalid argument $arg for 'git bisect terms'.\n"
-"Supported options are: --term-good|--term-old and --term-bad|--term-new."
+"\n"
+"It took %.2f seconds to enumerate unstaged changes after reset. You can\n"
+"use '--quiet' to avoid this. Set the config setting reset.quiet to true\n"
+"to make this the default.\n"
msgstr ""
-#: git-merge-octopus.sh:46
+#: builtin/reset.c:408
+#, c-format
+msgid "Could not reset index file to revision '%s'."
+msgstr ""
+
+#: builtin/reset.c:412
+msgid "Could not write new index file."
+msgstr ""
+
+#: builtin/rev-list.c:412
+msgid "cannot combine --exclude-promisor-objects and --missing"
+msgstr ""
+
+#: builtin/rev-list.c:473
+msgid "object filtering requires --objects"
+msgstr ""
+
+#: builtin/rev-list.c:476
+#, c-format
+msgid "invalid sparse value '%s'"
+msgstr ""
+
+#: builtin/rev-list.c:527
+msgid "rev-list does not support display of notes"
+msgstr ""
+
+#: builtin/rev-list.c:530
+msgid "cannot combine --use-bitmap-index with object filtering"
+msgstr ""
+
+#: builtin/rev-parse.c:408
+msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
+msgstr ""
+
+#: builtin/rev-parse.c:413
+msgid "keep the `--` passed as an arg"
+msgstr ""
+
+#: builtin/rev-parse.c:415
+msgid "stop parsing after the first non-option argument"
+msgstr ""
+
+#: builtin/rev-parse.c:418
+msgid "output in stuck long form"
+msgstr ""
+
+#: builtin/rev-parse.c:551
msgid ""
-"Error: Your local changes to the following files would be overwritten by "
-"merge"
+"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 ""
-#: git-merge-octopus.sh:61
-msgid "Automated merge did not work."
+#: builtin/revert.c:24
+msgid "git revert [<options>] <commit-ish>..."
msgstr ""
-#: git-merge-octopus.sh:62
-msgid "Should not be doing an octopus."
+#: builtin/revert.c:25
+msgid "git revert <subcommand>"
msgstr ""
-#: git-merge-octopus.sh:73
-#, sh-format
-msgid "Unable to find common commit with $pretty_name"
+#: builtin/revert.c:30
+msgid "git cherry-pick [<options>] <commit-ish>..."
msgstr ""
-#: git-merge-octopus.sh:77
-#, sh-format
-msgid "Already up to date with $pretty_name"
+#: builtin/revert.c:31
+msgid "git cherry-pick <subcommand>"
msgstr ""
-#: git-merge-octopus.sh:89
-#, sh-format
-msgid "Fast-forwarding to: $pretty_name"
+#: builtin/revert.c:72
+#, c-format
+msgid "option `%s' expects a number greater than zero"
msgstr ""
-#: git-merge-octopus.sh:97
-#, sh-format
-msgid "Trying simple merge with $pretty_name"
+#: builtin/revert.c:92
+#, c-format
+msgid "%s: %s cannot be used with %s"
msgstr ""
-#: git-merge-octopus.sh:102
-msgid "Simple merge did not work, trying automatic merge."
+#: builtin/revert.c:102
+msgid "end revert or cherry-pick sequence"
+msgstr ""
+
+#: builtin/revert.c:103
+msgid "resume revert or cherry-pick sequence"
+msgstr ""
+
+#: builtin/revert.c:104
+msgid "cancel revert or cherry-pick sequence"
+msgstr ""
+
+#: builtin/revert.c:105
+msgid "skip current commit and continue"
+msgstr ""
+
+#: builtin/revert.c:107
+msgid "don't automatically commit"
+msgstr ""
+
+#: builtin/revert.c:108
+msgid "edit the commit message"
+msgstr ""
+
+#: builtin/revert.c:111
+msgid "parent-number"
+msgstr ""
+
+#: builtin/revert.c:112
+msgid "select mainline parent"
+msgstr ""
+
+#: builtin/revert.c:114
+msgid "merge strategy"
+msgstr ""
+
+#: builtin/revert.c:116
+msgid "option for merge strategy"
+msgstr ""
+
+#: builtin/revert.c:125
+msgid "append commit name"
+msgstr ""
+
+#: builtin/revert.c:127
+msgid "preserve initially empty commits"
+msgstr ""
+
+#: builtin/revert.c:129
+msgid "keep redundant, empty commits"
+msgstr ""
+
+#: builtin/revert.c:232
+msgid "revert failed"
+msgstr ""
+
+#: builtin/revert.c:245
+msgid "cherry-pick failed"
msgstr ""
-#: git-rebase.sh:61
+#: builtin/rm.c:19
+msgid "git rm [<options>] [--] <file>..."
+msgstr ""
+
+#: builtin/rm.c:207
msgid ""
-"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\"."
+"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:212
+msgid ""
+"\n"
+"(use -f to force removal)"
msgstr ""
-#: git-rebase.sh:173 git-rebase.sh:454
-#, sh-format
-msgid "Could not move back to $head_name"
+#: builtin/rm.c:216
+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:220 builtin/rm.c:229
+msgid ""
+"\n"
+"(use --cached to keep the file, or -f to force removal)"
msgstr ""
-#: git-rebase.sh:184
-msgid "Applied autostash."
+#: builtin/rm.c:226
+msgid "the following file has local modifications:"
+msgid_plural "the following files have local modifications:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/rm.c:242
+msgid "do not list removed files"
msgstr ""
-#: git-rebase.sh:187
-#, sh-format
-msgid "Cannot store $stash_sha1"
+#: builtin/rm.c:243
+msgid "only remove from the index"
msgstr ""
-#: git-rebase.sh:236
-msgid "The pre-rebase hook refused to rebase."
+#: builtin/rm.c:244
+msgid "override the up-to-date check"
msgstr ""
-#: git-rebase.sh:241
-msgid "It looks like 'git am' is in progress. Cannot rebase."
+#: builtin/rm.c:245
+msgid "allow recursive removal"
msgstr ""
-#: git-rebase.sh:415
-msgid "No rebase in progress?"
+#: builtin/rm.c:247
+msgid "exit with a zero status even if nothing matched"
+msgstr ""
+
+#: builtin/rm.c:289
+msgid "please stage your changes to .gitmodules or stash them to proceed"
+msgstr ""
+
+#: builtin/rm.c:307
+#, c-format
+msgid "not removing '%s' recursively without -r"
+msgstr ""
+
+#: builtin/rm.c:346
+#, c-format
+msgid "git rm: unable to remove %s"
+msgstr ""
+
+#: builtin/send-pack.c:20
+msgid ""
+"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
+"receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
+"[<ref>...]\n"
+" --all and explicit <ref> specification are mutually exclusive."
+msgstr ""
+
+#: builtin/send-pack.c:163
+msgid "remote name"
+msgstr ""
+
+#: builtin/send-pack.c:177
+msgid "use stateless RPC protocol"
+msgstr ""
+
+#: builtin/send-pack.c:178
+msgid "read refs from stdin"
+msgstr ""
+
+#: builtin/send-pack.c:179
+msgid "print status from remote helper"
+msgstr ""
+
+#: builtin/shortlog.c:14
+msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]"
+msgstr ""
+
+#: builtin/shortlog.c:15
+msgid "git log --pretty=short | git shortlog [<options>]"
+msgstr ""
+
+#: builtin/shortlog.c:264
+msgid "Group by committer rather than author"
+msgstr ""
+
+#: builtin/shortlog.c:266
+msgid "sort output according to the number of commits per author"
+msgstr ""
+
+#: builtin/shortlog.c:268
+msgid "Suppress commit descriptions, only provides commit count"
+msgstr ""
+
+#: builtin/shortlog.c:270
+msgid "Show the email address of each author"
+msgstr ""
+
+#: builtin/shortlog.c:271
+msgid "<w>[,<i1>[,<i2>]]"
+msgstr ""
+
+#: builtin/shortlog.c:272
+msgid "Linewrap output"
+msgstr ""
+
+#: builtin/shortlog.c:301
+msgid "too many arguments given outside repository"
+msgstr ""
+
+#: 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/show-branch.c:17
+msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
+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/show-branch.c:548
+#, c-format
+msgid "no matching refs with %s"
+msgstr ""
+
+#: builtin/show-branch.c:645
+msgid "show remote-tracking and local branches"
+msgstr ""
+
+#: builtin/show-branch.c:647
+msgid "show remote-tracking branches"
+msgstr ""
+
+#: builtin/show-branch.c:649
+msgid "color '*!+-' corresponding to the branch"
+msgstr ""
+
+#: builtin/show-branch.c:651
+msgid "show <n> more commits after the common ancestor"
+msgstr ""
+
+#: builtin/show-branch.c:653
+msgid "synonym to more=-1"
+msgstr ""
+
+#: builtin/show-branch.c:654
+msgid "suppress naming strings"
+msgstr ""
+
+#: builtin/show-branch.c:656
+msgid "include the current branch"
+msgstr ""
+
+#: builtin/show-branch.c:658
+msgid "name commits with their object names"
+msgstr ""
+
+#: builtin/show-branch.c:660
+msgid "show possible merge bases"
+msgstr ""
+
+#: builtin/show-branch.c:662
+msgid "show refs unreachable from any other ref"
+msgstr ""
+
+#: builtin/show-branch.c:664
+msgid "show commits in topological order"
+msgstr ""
+
+#: builtin/show-branch.c:667
+msgid "show only commits not on the first branch"
+msgstr ""
+
+#: builtin/show-branch.c:669
+msgid "show merges reachable from only one tip"
+msgstr ""
+
+#: builtin/show-branch.c:671
+msgid "topologically sort, maintaining date order where possible"
+msgstr ""
+
+#: builtin/show-branch.c:674
+msgid "<n>[,<base>]"
+msgstr ""
+
+#: builtin/show-branch.c:675
+msgid "show <n> most recent ref-log entries starting at base"
+msgstr ""
+
+#: builtin/show-branch.c:711
+msgid ""
+"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
+msgstr ""
+
+#: builtin/show-branch.c:735
+msgid "no branches given, and HEAD is not valid"
+msgstr ""
+
+#: builtin/show-branch.c:738
+msgid "--reflog option needs one branch name"
+msgstr ""
+
+#: builtin/show-branch.c:741
+#, c-format
+msgid "only %d entry can be shown at one time."
+msgid_plural "only %d entries can be shown at one time."
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/show-branch.c:745
+#, c-format
+msgid "no such ref %s"
+msgstr ""
+
+#: builtin/show-branch.c:831
+#, c-format
+msgid "cannot handle more than %d rev."
+msgid_plural "cannot handle more than %d revs."
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/show-branch.c:835
+#, c-format
+msgid "'%s' is not a valid ref."
+msgstr ""
+
+#: builtin/show-branch.c:838
+#, c-format
+msgid "cannot find commit %s (%s)"
+msgstr ""
+
+#: builtin/show-ref.c:12
+msgid ""
+"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
+"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
+msgstr ""
+
+#: builtin/show-ref.c:13
+msgid "git show-ref --exclude-existing[=<pattern>]"
+msgstr ""
+
+#: builtin/show-ref.c:162
+msgid "only show tags (can be combined with heads)"
+msgstr ""
+
+#: builtin/show-ref.c:163
+msgid "only show heads (can be combined with tags)"
+msgstr ""
+
+#: builtin/show-ref.c:164
+msgid "stricter reference checking, requires exact ref path"
+msgstr ""
+
+#: builtin/show-ref.c:167 builtin/show-ref.c:169
+msgid "show the HEAD reference, even if it would be filtered out"
+msgstr ""
+
+#: builtin/show-ref.c:171
+msgid "dereference tags into object IDs"
+msgstr ""
+
+#: builtin/show-ref.c:173
+msgid "only show SHA1 hash using <n> digits"
+msgstr ""
+
+#: builtin/show-ref.c:177
+msgid "do not print results to stdout (useful with --verify)"
+msgstr ""
+
+#: builtin/show-ref.c:179
+msgid "show refs from stdin that aren't in local repository"
+msgstr ""
+
+#: builtin/stash.c:22 builtin/stash.c:37
+msgid "git stash list [<options>]"
+msgstr ""
+
+#: builtin/stash.c:23 builtin/stash.c:42
+msgid "git stash show [<options>] [<stash>]"
+msgstr ""
+
+#: builtin/stash.c:24 builtin/stash.c:47
+msgid "git stash drop [-q|--quiet] [<stash>]"
+msgstr ""
+
+#: builtin/stash.c:25
+msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
+msgstr ""
+
+#: builtin/stash.c:26 builtin/stash.c:62
+msgid "git stash branch <branchname> [<stash>]"
+msgstr ""
+
+#: builtin/stash.c:27 builtin/stash.c:67
+msgid "git stash clear"
+msgstr ""
+
+#: builtin/stash.c:28 builtin/stash.c:77
+msgid ""
+"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
+" [--] [<pathspec>...]]"
+msgstr ""
+
+#: builtin/stash.c:31 builtin/stash.c:84
+msgid ""
+"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+" [-u|--include-untracked] [-a|--all] [<message>]"
+msgstr ""
+
+#: builtin/stash.c:52
+msgid "git stash pop [--index] [-q|--quiet] [<stash>]"
+msgstr ""
+
+#: builtin/stash.c:57
+msgid "git stash apply [--index] [-q|--quiet] [<stash>]"
+msgstr ""
+
+#: builtin/stash.c:72
+msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>"
+msgstr ""
+
+#: builtin/stash.c:127
+#, c-format
+msgid "'%s' is not a stash-like commit"
+msgstr ""
+
+#: builtin/stash.c:147
+#, c-format
+msgid "Too many revisions specified:%s"
+msgstr ""
+
+#: builtin/stash.c:161 git-legacy-stash.sh:548
+msgid "No stash entries found."
+msgstr ""
+
+#: builtin/stash.c:175
+#, c-format
+msgid "%s is not a valid reference"
+msgstr ""
+
+#: builtin/stash.c:224 git-legacy-stash.sh:75
+msgid "git stash clear with parameters is unimplemented"
+msgstr ""
+
+#: builtin/stash.c:403
+msgid "cannot apply a stash in the middle of a merge"
+msgstr ""
+
+#: builtin/stash.c:414
+#, c-format
+msgid "could not generate diff %s^!."
+msgstr ""
+
+#: builtin/stash.c:421
+msgid "conflicts in index.Try without --index."
+msgstr ""
+
+#: builtin/stash.c:427
+msgid "could not save index tree"
+msgstr ""
+
+#: builtin/stash.c:434
+msgid "could not restore untracked files from stash"
+msgstr ""
+
+#: builtin/stash.c:448
+#, c-format
+msgid "Merging %s with %s"
+msgstr ""
+
+#: builtin/stash.c:458 git-legacy-stash.sh:680
+msgid "Index was not unstashed."
+msgstr ""
+
+#: builtin/stash.c:516 builtin/stash.c:615
+msgid "attempt to recreate the index"
+msgstr ""
+
+#: builtin/stash.c:549
+#, c-format
+msgid "Dropped %s (%s)"
+msgstr ""
+
+#: builtin/stash.c:552
+#, c-format
+msgid "%s: Could not drop stash entry"
+msgstr ""
+
+#: builtin/stash.c:577
+#, c-format
+msgid "'%s' is not a stash reference"
+msgstr ""
+
+#: builtin/stash.c:627 git-legacy-stash.sh:694
+msgid "The stash entry is kept in case you need it again."
+msgstr ""
+
+#: builtin/stash.c:650 git-legacy-stash.sh:712
+msgid "No branch name specified"
+msgstr ""
+
+#: builtin/stash.c:790 builtin/stash.c:827
+#, c-format
+msgid "Cannot update %s with %s"
+msgstr ""
+
+#: builtin/stash.c:808 builtin/stash.c:1461 builtin/stash.c:1497
+msgid "stash message"
+msgstr ""
+
+#: builtin/stash.c:818
+msgid "\"git stash store\" requires one <commit> argument"
+msgstr ""
+
+#: builtin/stash.c:1040 git-legacy-stash.sh:217
+msgid "No changes selected"
+msgstr ""
+
+#: builtin/stash.c:1136 git-legacy-stash.sh:150
+msgid "You do not have the initial commit yet"
+msgstr ""
+
+#: builtin/stash.c:1163 git-legacy-stash.sh:165
+msgid "Cannot save the current index state"
+msgstr ""
+
+#: builtin/stash.c:1172 git-legacy-stash.sh:180
+msgid "Cannot save the untracked files"
+msgstr ""
+
+#: builtin/stash.c:1183 builtin/stash.c:1192 git-legacy-stash.sh:200
+#: git-legacy-stash.sh:213
+msgid "Cannot save the current worktree state"
+msgstr ""
+
+#: builtin/stash.c:1220 git-legacy-stash.sh:233
+msgid "Cannot record working tree state"
+msgstr ""
+
+#: builtin/stash.c:1269 git-legacy-stash.sh:337
+msgid "Can't use --patch and --include-untracked or --all at the same time"
+msgstr ""
+
+#: builtin/stash.c:1285
+msgid "Did you forget to 'git add'?"
+msgstr ""
+
+#: builtin/stash.c:1300 git-legacy-stash.sh:345
+msgid "No local changes to save"
+msgstr ""
+
+#: builtin/stash.c:1307 git-legacy-stash.sh:350
+msgid "Cannot initialize stash"
+msgstr ""
+
+#: builtin/stash.c:1322 git-legacy-stash.sh:354
+msgid "Cannot save the current status"
+msgstr ""
+
+#: builtin/stash.c:1327
+#, c-format
+msgid "Saved working directory and index state %s"
+msgstr ""
+
+#: builtin/stash.c:1417 git-legacy-stash.sh:384
+msgid "Cannot remove worktree changes"
+msgstr ""
+
+#: builtin/stash.c:1452 builtin/stash.c:1488
+msgid "keep index"
+msgstr ""
+
+#: builtin/stash.c:1454 builtin/stash.c:1490
+msgid "stash in patch mode"
+msgstr ""
+
+#: builtin/stash.c:1455 builtin/stash.c:1491
+msgid "quiet mode"
+msgstr ""
+
+#: builtin/stash.c:1457 builtin/stash.c:1493
+msgid "include untracked files in stash"
+msgstr ""
+
+#: builtin/stash.c:1459 builtin/stash.c:1495
+msgid "include ignore files"
+msgstr ""
+
+#: builtin/stash.c:1555
+#, c-format
+msgid "could not exec %s"
+msgstr ""
+
+#: builtin/stripspace.c:18
+msgid "git stripspace [-s | --strip-comments]"
+msgstr ""
+
+#: builtin/stripspace.c:19
+msgid "git stripspace [-c | --comment-lines]"
+msgstr ""
+
+#: builtin/stripspace.c:37
+msgid "skip and remove all lines starting with comment character"
+msgstr ""
+
+#: builtin/stripspace.c:40
+msgid "prepend comment character and space to each line"
+msgstr ""
+
+#: builtin/submodule--helper.c:45 builtin/submodule--helper.c:1943
+#, c-format
+msgid "Expecting a full ref name, got %s"
+msgstr ""
+
+#: builtin/submodule--helper.c:62
+msgid "submodule--helper print-default-remote takes no arguments"
+msgstr ""
+
+#: builtin/submodule--helper.c:100
+#, c-format
+msgid "cannot strip one component off url '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1368
+msgid "alternative anchor for relative paths"
+msgstr ""
+
+#: builtin/submodule--helper.c:413
+msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
+msgstr ""
+
+#: builtin/submodule--helper.c:470 builtin/submodule--helper.c:628
+#: builtin/submodule--helper.c:651
+#, c-format
+msgid "No url found for submodule path '%s' in .gitmodules"
+msgstr ""
+
+#: builtin/submodule--helper.c:522
+#, c-format
+msgid "Entering '%s'\n"
+msgstr ""
+
+#: builtin/submodule--helper.c:525
+#, c-format
+msgid ""
+"run_command returned non-zero status for %s\n"
+"."
+msgstr ""
+
+#: builtin/submodule--helper.c:547
+#, c-format
+msgid ""
+"run_command returned non-zero status while recursing in the nested "
+"submodules of %s\n"
+"."
+msgstr ""
+
+#: builtin/submodule--helper.c:563
+msgid "Suppress output of entering each submodule command"
+msgstr ""
+
+#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:1050
+msgid "Recurse into nested submodules"
+msgstr ""
+
+#: builtin/submodule--helper.c:570
+msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
+msgstr ""
+
+#: builtin/submodule--helper.c:597
+#, c-format
+msgid ""
+"could not look up configuration '%s'. Assuming this repository is its own "
+"authoritative upstream."
+msgstr ""
+
+#: builtin/submodule--helper.c:665
+#, c-format
+msgid "Failed to register url for submodule path '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:669
+#, c-format
+msgid "Submodule '%s' (%s) registered for path '%s'\n"
+msgstr ""
+
+#: builtin/submodule--helper.c:679
+#, c-format
+msgid "warning: command update mode suggested for submodule '%s'\n"
+msgstr ""
+
+#: builtin/submodule--helper.c:686
+#, c-format
+msgid "Failed to register update mode for submodule path '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:708
+msgid "Suppress output for initializing a submodule"
+msgstr ""
+
+#: builtin/submodule--helper.c:713
+msgid "git submodule--helper init [<options>] [<path>]"
+msgstr ""
+
+#: builtin/submodule--helper.c:785 builtin/submodule--helper.c:911
+#, c-format
+msgid "no submodule mapping found in .gitmodules for path '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:824
+#, c-format
+msgid "could not resolve HEAD ref inside the submodule '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:851 builtin/submodule--helper.c:1020
+#, c-format
+msgid "failed to recurse into submodule '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1186
+msgid "Suppress submodule status output"
+msgstr ""
+
+#: builtin/submodule--helper.c:876
+msgid ""
+"Use commit stored in the index instead of the one stored in the submodule "
+"HEAD"
+msgstr ""
+
+#: builtin/submodule--helper.c:877
+msgid "recurse into nested submodules"
+msgstr ""
+
+#: builtin/submodule--helper.c:882
+msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
+msgstr ""
+
+#: builtin/submodule--helper.c:906
+msgid "git submodule--helper name <path>"
+msgstr ""
+
+#: builtin/submodule--helper.c:970
+#, c-format
+msgid "Synchronizing submodule url for '%s'\n"
+msgstr ""
+
+#: builtin/submodule--helper.c:976
+#, c-format
+msgid "failed to register url for submodule path '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:990
+#, c-format
+msgid "failed to get the default remote for submodule '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:1001
+#, c-format
+msgid "failed to update remote for submodule '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:1048
+msgid "Suppress output of synchronizing submodule url"
+msgstr ""
+
+#: builtin/submodule--helper.c:1055
+msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
+msgstr ""
+
+#: builtin/submodule--helper.c:1109
+#, c-format
+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/submodule--helper.c:1121
+#, c-format
+msgid ""
+"Submodule work tree '%s' contains local modifications; use '-f' to discard "
+"them"
+msgstr ""
+
+#: builtin/submodule--helper.c:1129
+#, c-format
+msgid "Cleared directory '%s'\n"
+msgstr ""
+
+#: builtin/submodule--helper.c:1131
+#, c-format
+msgid "Could not remove submodule work tree '%s'\n"
+msgstr ""
+
+#: builtin/submodule--helper.c:1142
+#, c-format
+msgid "could not create empty submodule directory %s"
+msgstr ""
+
+#: builtin/submodule--helper.c:1158
+#, c-format
+msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
+msgstr ""
+
+#: builtin/submodule--helper.c:1187
+msgid "Remove submodule working trees even if they contain local changes"
+msgstr ""
+
+#: builtin/submodule--helper.c:1188
+msgid "Unregister all submodules"
+msgstr ""
+
+#: builtin/submodule--helper.c:1193
+msgid ""
+"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
+msgstr ""
+
+#: builtin/submodule--helper.c:1207
+msgid "Use '--all' if you really want to deinitialize all submodules"
+msgstr ""
+
+#: builtin/submodule--helper.c:1302 builtin/submodule--helper.c:1305
+#, c-format
+msgid "submodule '%s' cannot add alternate: %s"
+msgstr ""
+
+#: builtin/submodule--helper.c:1341
+#, c-format
+msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
+msgstr ""
+
+#: builtin/submodule--helper.c:1348
+#, c-format
+msgid "Value '%s' for submodule.alternateLocation is not recognized"
+msgstr ""
+
+#: builtin/submodule--helper.c:1371
+msgid "where the new submodule will be cloned to"
+msgstr ""
+
+#: builtin/submodule--helper.c:1374
+msgid "name of the new submodule"
+msgstr ""
+
+#: builtin/submodule--helper.c:1377
+msgid "url where to clone the submodule from"
+msgstr ""
+
+#: builtin/submodule--helper.c:1385
+msgid "depth for shallow clones"
+msgstr ""
+
+#: builtin/submodule--helper.c:1388 builtin/submodule--helper.c:1872
+msgid "force cloning progress"
+msgstr ""
+
+#: builtin/submodule--helper.c:1393
+msgid ""
+"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
+"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
+msgstr ""
+
+#: builtin/submodule--helper.c:1424
+#, c-format
+msgid "clone of '%s' into submodule path '%s' failed"
+msgstr ""
+
+#: builtin/submodule--helper.c:1438
+#, c-format
+msgid "could not get submodule directory for '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:1474
+#, c-format
+msgid "Invalid update mode '%s' for submodule path '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:1478
+#, c-format
+msgid "Invalid update mode '%s' configured for submodule path '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:1571
+#, c-format
+msgid "Submodule path '%s' not initialized"
+msgstr ""
+
+#: builtin/submodule--helper.c:1575
+msgid "Maybe you want to use 'update --init'?"
+msgstr ""
+
+#: builtin/submodule--helper.c:1605
+#, c-format
+msgid "Skipping unmerged submodule %s"
+msgstr ""
+
+#: builtin/submodule--helper.c:1634
+#, c-format
+msgid "Skipping submodule '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:1778
+#, c-format
+msgid "Failed to clone '%s'. Retry scheduled"
+msgstr ""
+
+#: builtin/submodule--helper.c:1789
+#, c-format
+msgid "Failed to clone '%s' a second time, aborting"
+msgstr ""
+
+#: builtin/submodule--helper.c:1851 builtin/submodule--helper.c:2093
+msgid "path into the working tree"
+msgstr ""
+
+#: builtin/submodule--helper.c:1854
+msgid "path into the working tree, across nested submodule boundaries"
+msgstr ""
+
+#: builtin/submodule--helper.c:1858
+msgid "rebase, merge, checkout or none"
+msgstr ""
+
+#: builtin/submodule--helper.c:1864
+msgid "Create a shallow clone truncated to the specified number of revisions"
+msgstr ""
+
+#: builtin/submodule--helper.c:1867
+msgid "parallel jobs"
+msgstr ""
+
+#: builtin/submodule--helper.c:1869
+msgid "whether the initial clone should follow the shallow recommendation"
+msgstr ""
+
+#: builtin/submodule--helper.c:1870
+msgid "don't print cloning progress"
+msgstr ""
+
+#: builtin/submodule--helper.c:1877
+msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
+msgstr ""
+
+#: builtin/submodule--helper.c:1890
+msgid "bad value for update parameter"
+msgstr ""
+
+#: builtin/submodule--helper.c:1938
+#, c-format
+msgid ""
+"Submodule (%s) branch configured to inherit branch from superproject, but "
+"the superproject is not on any branch"
+msgstr ""
+
+#: builtin/submodule--helper.c:2061
+#, c-format
+msgid "could not get a repository handle for submodule '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:2094
+msgid "recurse into submodules"
+msgstr ""
+
+#: builtin/submodule--helper.c:2100
+msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
+msgstr ""
+
+#: builtin/submodule--helper.c:2156
+msgid "check if it is safe to write to the .gitmodules file"
+msgstr ""
+
+#: builtin/submodule--helper.c:2159
+msgid "unset the config in the .gitmodules file"
+msgstr ""
+
+#: builtin/submodule--helper.c:2164
+msgid "git submodule--helper config <name> [<value>]"
+msgstr ""
+
+#: builtin/submodule--helper.c:2165
+msgid "git submodule--helper config --unset <name>"
+msgstr ""
+
+#: builtin/submodule--helper.c:2166
+msgid "git submodule--helper config --check-writeable"
+msgstr ""
+
+#: builtin/submodule--helper.c:2185 git-submodule.sh:171
+#, sh-format
+msgid "please make sure that the .gitmodules file is in the working tree"
+msgstr ""
+
+#: builtin/submodule--helper.c:2235 git.c:434 git.c:684
+#, c-format
+msgid "%s doesn't support --super-prefix"
+msgstr ""
+
+#: builtin/submodule--helper.c:2241
+#, c-format
+msgid "'%s' is not a valid submodule--helper subcommand"
+msgstr ""
+
+#: builtin/symbolic-ref.c:8
+msgid "git symbolic-ref [<options>] <name> [<ref>]"
+msgstr ""
+
+#: builtin/symbolic-ref.c:9
+msgid "git symbolic-ref -d [-q] <name>"
+msgstr ""
+
+#: builtin/symbolic-ref.c:40
+msgid "suppress error message for non-symbolic (detached) refs"
+msgstr ""
+
+#: builtin/symbolic-ref.c:41
+msgid "delete symbolic ref"
+msgstr ""
+
+#: builtin/symbolic-ref.c:42
+msgid "shorten ref output"
+msgstr ""
+
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363
+msgid "reason"
+msgstr ""
+
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363
+msgid "reason of the update"
+msgstr ""
+
+#: builtin/tag.c:25
+msgid ""
+"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n"
+"\t\t<tagname> [<head>]"
+msgstr ""
+
+#: builtin/tag.c:27
+msgid "git tag -d <tagname>..."
+msgstr ""
+
+#: builtin/tag.c:28
+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/tag.c:30
+msgid "git tag -v [--format=<format>] <tagname>..."
+msgstr ""
+
+#: builtin/tag.c:89
+#, c-format
+msgid "tag '%s' not found."
+msgstr ""
+
+#: builtin/tag.c:105
+#, c-format
+msgid "Deleted tag '%s' (was %s)\n"
+msgstr ""
+
+#: builtin/tag.c:135
+#, c-format
+msgid ""
+"\n"
+"Write a message for tag:\n"
+" %s\n"
+"Lines starting with '%c' will be ignored.\n"
+msgstr ""
+
+#: builtin/tag.c:139
+#, 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:198
+msgid "unable to sign the tag"
+msgstr ""
+
+#: builtin/tag.c:200
+msgid "unable to write tag file"
+msgstr ""
+
+#: builtin/tag.c:216
+#, c-format
+msgid ""
+"You have created a nested tag. The object referred to by your new tag is\n"
+"already a tag. If you meant to tag the object that it points to, use:\n"
+"\n"
+"\tgit tag -f %s %s^{}"
+msgstr ""
+
+#: builtin/tag.c:232
+msgid "bad object type."
+msgstr ""
+
+#: builtin/tag.c:284
+msgid "no tag message?"
+msgstr ""
+
+#: builtin/tag.c:291
+#, c-format
+msgid "The tag message has been left in %s\n"
+msgstr ""
+
+#: builtin/tag.c:402
+msgid "list tag names"
+msgstr ""
+
+#: builtin/tag.c:404
+msgid "print <n> lines of each tag message"
+msgstr ""
+
+#: builtin/tag.c:406
+msgid "delete tags"
+msgstr ""
+
+#: builtin/tag.c:407
+msgid "verify tags"
+msgstr ""
+
+#: builtin/tag.c:409
+msgid "Tag creation options"
+msgstr ""
+
+#: builtin/tag.c:411
+msgid "annotated tag, needs a message"
+msgstr ""
+
+#: builtin/tag.c:413
+msgid "tag message"
+msgstr ""
+
+#: builtin/tag.c:415
+msgid "force edit of tag message"
+msgstr ""
+
+#: builtin/tag.c:416
+msgid "annotated and GPG-signed tag"
+msgstr ""
+
+#: builtin/tag.c:419
+msgid "use another key to sign the tag"
+msgstr ""
+
+#: builtin/tag.c:420
+msgid "replace the tag if exists"
+msgstr ""
+
+#: builtin/tag.c:421 builtin/update-ref.c:369
+msgid "create a reflog"
+msgstr ""
+
+#: builtin/tag.c:423
+msgid "Tag listing options"
+msgstr ""
+
+#: builtin/tag.c:424
+msgid "show tag list in columns"
+msgstr ""
+
+#: builtin/tag.c:425 builtin/tag.c:427
+msgid "print only tags that contain the commit"
+msgstr ""
+
+#: builtin/tag.c:426 builtin/tag.c:428
+msgid "print only tags that don't contain the commit"
+msgstr ""
+
+#: builtin/tag.c:429
+msgid "print only tags that are merged"
+msgstr ""
+
+#: builtin/tag.c:430
+msgid "print only tags that are not merged"
+msgstr ""
+
+#: builtin/tag.c:434
+msgid "print only tags of the object"
+msgstr ""
+
+#: builtin/tag.c:482
+msgid "--column and -n are incompatible"
+msgstr ""
+
+#: builtin/tag.c:504
+msgid "-n option is only allowed in list mode"
+msgstr ""
+
+#: builtin/tag.c:506
+msgid "--contains option is only allowed in list mode"
+msgstr ""
+
+#: builtin/tag.c:508
+msgid "--no-contains option is only allowed in list mode"
+msgstr ""
+
+#: builtin/tag.c:510
+msgid "--points-at option is only allowed in list mode"
+msgstr ""
+
+#: builtin/tag.c:512
+msgid "--merged and --no-merged options are only allowed in list mode"
+msgstr ""
+
+#: builtin/tag.c:523
+msgid "only one -F or -m option is allowed."
+msgstr ""
+
+#: builtin/tag.c:542
+msgid "too many params"
+msgstr ""
+
+#: builtin/tag.c:548
+#, c-format
+msgid "'%s' is not a valid tag name."
+msgstr ""
+
+#: builtin/tag.c:553
+#, c-format
+msgid "tag '%s' already exists"
+msgstr ""
+
+#: builtin/tag.c:584
+#, c-format
+msgid "Updated tag '%s' (was %s)\n"
+msgstr ""
+
+#: builtin/unpack-objects.c:500
+msgid "Unpacking objects"
+msgstr ""
+
+#: builtin/update-index.c:83
+#, c-format
+msgid "failed to create directory %s"
+msgstr ""
+
+#: builtin/update-index.c:99
+#, c-format
+msgid "failed to create file %s"
+msgstr ""
+
+#: builtin/update-index.c:107
+#, c-format
+msgid "failed to delete file %s"
+msgstr ""
+
+#: builtin/update-index.c:114 builtin/update-index.c:220
+#, c-format
+msgid "failed to delete directory %s"
+msgstr ""
+
+#: builtin/update-index.c:139
+#, c-format
+msgid "Testing mtime in '%s' "
+msgstr ""
+
+#: builtin/update-index.c:153
+msgid "directory stat info does not change after adding a new file"
+msgstr ""
+
+#: builtin/update-index.c:166
+msgid "directory stat info does not change after adding a new directory"
+msgstr ""
+
+#: builtin/update-index.c:179
+msgid "directory stat info changes after updating a file"
+msgstr ""
+
+#: builtin/update-index.c:190
+msgid "directory stat info changes after adding a file inside subdirectory"
+msgstr ""
+
+#: builtin/update-index.c:201
+msgid "directory stat info does not change after deleting a file"
+msgstr ""
+
+#: builtin/update-index.c:214
+msgid "directory stat info does not change after deleting a directory"
+msgstr ""
+
+#: builtin/update-index.c:221
+msgid " OK"
+msgstr ""
+
+#: builtin/update-index.c:589
+msgid "git update-index [<options>] [--] [<file>...]"
+msgstr ""
+
+#: builtin/update-index.c:971
+msgid "continue refresh even when index needs update"
+msgstr ""
+
+#: builtin/update-index.c:974
+msgid "refresh: ignore submodules"
+msgstr ""
+
+#: builtin/update-index.c:977
+msgid "do not ignore new files"
+msgstr ""
+
+#: builtin/update-index.c:979
+msgid "let files replace directories and vice-versa"
+msgstr ""
+
+#: builtin/update-index.c:981
+msgid "notice files missing from worktree"
+msgstr ""
+
+#: builtin/update-index.c:983
+msgid "refresh even if index contains unmerged entries"
+msgstr ""
+
+#: builtin/update-index.c:986
+msgid "refresh stat information"
+msgstr ""
+
+#: builtin/update-index.c:990
+msgid "like --refresh, but ignore assume-unchanged setting"
+msgstr ""
+
+#: builtin/update-index.c:994
+msgid "<mode>,<object>,<path>"
+msgstr ""
+
+#: builtin/update-index.c:995
+msgid "add the specified entry to the index"
+msgstr ""
+
+#: builtin/update-index.c:1005
+msgid "mark files as \"not changing\""
+msgstr ""
+
+#: builtin/update-index.c:1008
+msgid "clear assumed-unchanged bit"
+msgstr ""
+
+#: builtin/update-index.c:1011
+msgid "mark files as \"index-only\""
+msgstr ""
+
+#: builtin/update-index.c:1014
+msgid "clear skip-worktree bit"
+msgstr ""
+
+#: builtin/update-index.c:1017
+msgid "add to index only; do not add content to object database"
+msgstr ""
+
+#: builtin/update-index.c:1019
+msgid "remove named paths even if present in worktree"
+msgstr ""
+
+#: builtin/update-index.c:1021
+msgid "with --stdin: input lines are terminated by null bytes"
+msgstr ""
+
+#: builtin/update-index.c:1023
+msgid "read list of paths to be updated from standard input"
+msgstr ""
+
+#: builtin/update-index.c:1027
+msgid "add entries from standard input to the index"
+msgstr ""
+
+#: builtin/update-index.c:1031
+msgid "repopulate stages #2 and #3 for the listed paths"
+msgstr ""
+
+#: builtin/update-index.c:1035
+msgid "only update entries that differ from HEAD"
+msgstr ""
+
+#: builtin/update-index.c:1039
+msgid "ignore files missing from worktree"
+msgstr ""
+
+#: builtin/update-index.c:1042
+msgid "report actions to standard output"
+msgstr ""
+
+#: builtin/update-index.c:1044
+msgid "(for porcelains) forget saved unresolved conflicts"
+msgstr ""
+
+#: builtin/update-index.c:1048
+msgid "write index in this format"
+msgstr ""
+
+#: builtin/update-index.c:1050
+msgid "enable or disable split index"
+msgstr ""
+
+#: builtin/update-index.c:1052
+msgid "enable/disable untracked cache"
+msgstr ""
+
+#: builtin/update-index.c:1054
+msgid "test if the filesystem supports untracked cache"
+msgstr ""
+
+#: builtin/update-index.c:1056
+msgid "enable untracked cache without testing the filesystem"
+msgstr ""
+
+#: builtin/update-index.c:1058
+msgid "write out the index even if is not flagged as changed"
+msgstr ""
+
+#: builtin/update-index.c:1060
+msgid "enable or disable file system monitor"
+msgstr ""
+
+#: builtin/update-index.c:1062
+msgid "mark files as fsmonitor valid"
+msgstr ""
+
+#: builtin/update-index.c:1065
+msgid "clear fsmonitor valid bit"
+msgstr ""
+
+#: builtin/update-index.c:1168
+msgid ""
+"core.splitIndex is set to false; remove or change it, if you really want to "
+"enable split index"
+msgstr ""
+
+#: builtin/update-index.c:1177
+msgid ""
+"core.splitIndex is set to true; remove or change it, if you really want to "
+"disable split index"
+msgstr ""
+
+#: builtin/update-index.c:1188
+msgid ""
+"core.untrackedCache is set to true; remove or change it, if you really want "
+"to disable the untracked cache"
+msgstr ""
+
+#: builtin/update-index.c:1192
+msgid "Untracked cache disabled"
+msgstr ""
+
+#: builtin/update-index.c:1200
+msgid ""
+"core.untrackedCache is set to false; remove or change it, if you really want "
+"to enable the untracked cache"
+msgstr ""
+
+#: builtin/update-index.c:1204
+#, c-format
+msgid "Untracked cache enabled for '%s'"
+msgstr ""
+
+#: builtin/update-index.c:1212
+msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
+msgstr ""
+
+#: builtin/update-index.c:1216
+msgid "fsmonitor enabled"
+msgstr ""
+
+#: builtin/update-index.c:1219
+msgid ""
+"core.fsmonitor is set; remove it if you really want to disable fsmonitor"
+msgstr ""
+
+#: builtin/update-index.c:1223
+msgid "fsmonitor disabled"
+msgstr ""
+
+#: builtin/update-ref.c:10
+msgid "git update-ref [<options>] -d <refname> [<old-val>]"
+msgstr ""
+
+#: builtin/update-ref.c:11
+msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]"
+msgstr ""
+
+#: builtin/update-ref.c:12
+msgid "git update-ref [<options>] --stdin [-z]"
+msgstr ""
+
+#: builtin/update-ref.c:364
+msgid "delete the reference"
+msgstr ""
+
+#: builtin/update-ref.c:366
+msgid "update <refname> not the one it points to"
+msgstr ""
+
+#: builtin/update-ref.c:367
+msgid "stdin has NUL-terminated arguments"
+msgstr ""
+
+#: builtin/update-ref.c:368
+msgid "read updates from stdin"
+msgstr ""
+
+#: builtin/update-server-info.c:7
+msgid "git update-server-info [--force]"
+msgstr ""
+
+#: builtin/update-server-info.c:15
+msgid "update the info files from scratch"
+msgstr ""
+
+#: builtin/upload-pack.c:11
+msgid "git upload-pack [<options>] <dir>"
+msgstr ""
+
+#: builtin/upload-pack.c:23 t/helper/test-serve-v2.c:17
+msgid "quit after a single request/response exchange"
+msgstr ""
+
+#: builtin/upload-pack.c:25
+msgid "exit immediately after initial ref advertisement"
+msgstr ""
+
+#: builtin/upload-pack.c:27
+msgid "do not try <directory>/.git/ if <directory> is no Git directory"
+msgstr ""
+
+#: builtin/upload-pack.c:29
+msgid "interrupt transfer after <n> seconds of inactivity"
+msgstr ""
+
+#: builtin/verify-commit.c:19
+msgid "git verify-commit [-v | --verbose] <commit>..."
+msgstr ""
+
+#: builtin/verify-commit.c:68
+msgid "print commit contents"
+msgstr ""
+
+#: builtin/verify-commit.c:69 builtin/verify-tag.c:37
+msgid "print raw gpg status output"
+msgstr ""
+
+#: builtin/verify-pack.c:55
+msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
+msgstr ""
+
+#: builtin/verify-pack.c:65
+msgid "verbose"
+msgstr ""
+
+#: builtin/verify-pack.c:67
+msgid "show statistics only"
+msgstr ""
+
+#: builtin/verify-tag.c:18
+msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
+msgstr ""
+
+#: builtin/verify-tag.c:36
+msgid "print tag contents"
+msgstr ""
+
+#: builtin/worktree.c:18
+msgid "git worktree add [<options>] <path> [<commit-ish>]"
+msgstr ""
+
+#: builtin/worktree.c:19
+msgid "git worktree list [<options>]"
+msgstr ""
+
+#: builtin/worktree.c:20
+msgid "git worktree lock [<options>] <path>"
+msgstr ""
+
+#: builtin/worktree.c:21
+msgid "git worktree move <worktree> <new-path>"
+msgstr ""
+
+#: builtin/worktree.c:22
+msgid "git worktree prune [<options>]"
+msgstr ""
+
+#: builtin/worktree.c:23
+msgid "git worktree remove [<options>] <worktree>"
+msgstr ""
+
+#: builtin/worktree.c:24
+msgid "git worktree unlock <path>"
+msgstr ""
+
+#: builtin/worktree.c:61 builtin/worktree.c:899
+#, c-format
+msgid "failed to delete '%s'"
+msgstr ""
+
+#: builtin/worktree.c:80
+#, c-format
+msgid "Removing worktrees/%s: not a valid directory"
+msgstr ""
+
+#: builtin/worktree.c:86
+#, c-format
+msgid "Removing worktrees/%s: gitdir file does not exist"
+msgstr ""
+
+#: builtin/worktree.c:91 builtin/worktree.c:100
+#, c-format
+msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
+msgstr ""
+
+#: builtin/worktree.c:110
+#, c-format
+msgid ""
+"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
+"%<PRIuMAX>)"
+msgstr ""
+
+#: builtin/worktree.c:118
+#, c-format
+msgid "Removing worktrees/%s: invalid gitdir file"
+msgstr ""
+
+#: builtin/worktree.c:127
+#, c-format
+msgid "Removing worktrees/%s: gitdir file points to non-existent location"
+msgstr ""
+
+#: builtin/worktree.c:166
+msgid "report pruned working trees"
+msgstr ""
+
+#: builtin/worktree.c:168
+msgid "expire working trees older than <time>"
+msgstr ""
+
+#: builtin/worktree.c:235
+#, c-format
+msgid "'%s' already exists"
+msgstr ""
+
+#: builtin/worktree.c:252
+#, c-format
+msgid "unable to re-add worktree '%s'"
+msgstr ""
+
+#: builtin/worktree.c:257
+#, c-format
+msgid ""
+"'%s' is a missing but locked worktree;\n"
+"use 'add -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear"
+msgstr ""
+
+#: builtin/worktree.c:259
+#, c-format
+msgid ""
+"'%s' is a missing but already registered worktree;\n"
+"use 'add -f' to override, or 'prune' or 'remove' to clear"
+msgstr ""
+
+#: builtin/worktree.c:309
+#, c-format
+msgid "could not create directory of '%s'"
+msgstr ""
+
+#: builtin/worktree.c:440 builtin/worktree.c:446
+#, c-format
+msgid "Preparing worktree (new branch '%s')"
+msgstr ""
+
+#: builtin/worktree.c:442
+#, c-format
+msgid "Preparing worktree (resetting branch '%s'; was at %s)"
+msgstr ""
+
+#: builtin/worktree.c:451
+#, c-format
+msgid "Preparing worktree (checking out '%s')"
+msgstr ""
+
+#: builtin/worktree.c:457
+#, c-format
+msgid "Preparing worktree (detached HEAD %s)"
+msgstr ""
+
+#: builtin/worktree.c:498
+msgid "checkout <branch> even if already checked out in other worktree"
+msgstr ""
+
+#: builtin/worktree.c:501
+msgid "create a new branch"
+msgstr ""
+
+#: builtin/worktree.c:503
+msgid "create or reset a branch"
+msgstr ""
+
+#: builtin/worktree.c:505
+msgid "populate the new working tree"
+msgstr ""
+
+#: builtin/worktree.c:506
+msgid "keep the new working tree locked"
+msgstr ""
+
+#: builtin/worktree.c:509
+msgid "set up tracking mode (see git-branch(1))"
+msgstr ""
+
+#: builtin/worktree.c:512
+msgid "try to match the new branch name with a remote-tracking branch"
+msgstr ""
+
+#: builtin/worktree.c:520
+msgid "-b, -B, and --detach are mutually exclusive"
+msgstr ""
+
+#: builtin/worktree.c:581
+msgid "--[no-]track can only be used if a new branch is created"
+msgstr ""
+
+#: builtin/worktree.c:681
+msgid "reason for locking"
+msgstr ""
+
+#: builtin/worktree.c:693 builtin/worktree.c:726 builtin/worktree.c:800
+#: builtin/worktree.c:927
+#, c-format
+msgid "'%s' is not a working tree"
+msgstr ""
+
+#: builtin/worktree.c:695 builtin/worktree.c:728
+msgid "The main working tree cannot be locked or unlocked"
+msgstr ""
+
+#: builtin/worktree.c:700
+#, c-format
+msgid "'%s' is already locked, reason: %s"
+msgstr ""
+
+#: builtin/worktree.c:702
+#, c-format
+msgid "'%s' is already locked"
+msgstr ""
+
+#: builtin/worktree.c:730
+#, c-format
+msgid "'%s' is not locked"
+msgstr ""
+
+#: builtin/worktree.c:771
+msgid "working trees containing submodules cannot be moved or removed"
+msgstr ""
+
+#: builtin/worktree.c:779
+msgid "force move even if worktree is dirty or locked"
+msgstr ""
+
+#: builtin/worktree.c:802 builtin/worktree.c:929
+#, c-format
+msgid "'%s' is a main working tree"
+msgstr ""
+
+#: builtin/worktree.c:807
+#, c-format
+msgid "could not figure out destination name from '%s'"
+msgstr ""
+
+#: builtin/worktree.c:813
+#, c-format
+msgid "target '%s' already exists"
+msgstr ""
+
+#: builtin/worktree.c:821
+#, c-format
+msgid ""
+"cannot move a locked working tree, lock reason: %s\n"
+"use 'move -f -f' to override or unlock first"
+msgstr ""
+
+#: builtin/worktree.c:823
+msgid ""
+"cannot move a locked working tree;\n"
+"use 'move -f -f' to override or unlock first"
+msgstr ""
+
+#: builtin/worktree.c:826
+#, c-format
+msgid "validation failed, cannot move working tree: %s"
+msgstr ""
+
+#: builtin/worktree.c:831
+#, c-format
+msgid "failed to move '%s' to '%s'"
+msgstr ""
+
+#: builtin/worktree.c:879
+#, c-format
+msgid "failed to run 'git status' on '%s'"
+msgstr ""
+
+#: builtin/worktree.c:883
+#, c-format
+msgid "'%s' is dirty, use --force to delete it"
+msgstr ""
+
+#: builtin/worktree.c:888
+#, c-format
+msgid "failed to run 'git status' on '%s', code %d"
+msgstr ""
+
+#: builtin/worktree.c:911
+msgid "force removal even if worktree is dirty or locked"
+msgstr ""
+
+#: builtin/worktree.c:934
+#, c-format
+msgid ""
+"cannot remove a locked working tree, lock reason: %s\n"
+"use 'remove -f -f' to override or unlock first"
+msgstr ""
+
+#: builtin/worktree.c:936
+msgid ""
+"cannot remove a locked working tree;\n"
+"use 'remove -f -f' to override or unlock first"
+msgstr ""
+
+#: builtin/worktree.c:939
+#, c-format
+msgid "validation failed, cannot remove working tree: %s"
+msgstr ""
+
+#: builtin/write-tree.c:15
+msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
+msgstr ""
+
+#: builtin/write-tree.c:28
+msgid "<prefix>/"
+msgstr ""
+
+#: builtin/write-tree.c:29
+msgid "write tree object for a subdirectory <prefix>"
+msgstr ""
+
+#: builtin/write-tree.c:31
+msgid "only useful for debugging"
+msgstr ""
+
+#: credential-cache--daemon.c:223
+#, 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"
+msgstr ""
+
+#: credential-cache--daemon.c:272
+msgid "print debugging messages to stderr"
+msgstr ""
+
+#: t/helper/test-reach.c:152
+#, c-format
+msgid "commit %s is not marked reachable"
+msgstr ""
+
+#: t/helper/test-reach.c:162
+msgid "too many commits marked reachable"
+msgstr ""
+
+#: t/helper/test-serve-v2.c:7
+msgid "test-tool serve-v2 [<options>]"
+msgstr ""
+
+#: t/helper/test-serve-v2.c:19
+msgid "exit immediately after advertising capabilities"
+msgstr ""
+
+#: git.c:27
+msgid ""
+"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 ""
+
+#: 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.\n"
+"See 'git help git' for an overview of the system."
+msgstr ""
+
+#: git.c:186
+#, c-format
+msgid "no directory given for --git-dir\n"
+msgstr ""
+
+#: git.c:200
+#, c-format
+msgid "no namespace given for --namespace\n"
+msgstr ""
+
+#: git.c:214
+#, c-format
+msgid "no directory given for --work-tree\n"
+msgstr ""
+
+#: git.c:228
+#, c-format
+msgid "no prefix given for --super-prefix\n"
+msgstr ""
+
+#: git.c:250
+#, c-format
+msgid "-c expects a configuration string\n"
+msgstr ""
+
+#: git.c:288
+#, c-format
+msgid "no directory given for -C\n"
+msgstr ""
+
+#: git.c:314
+#, c-format
+msgid "unknown option: %s\n"
+msgstr ""
+
+#: git.c:360
+#, c-format
+msgid "while expanding alias '%s': '%s'"
+msgstr ""
+
+#: git.c:369
+#, c-format
+msgid ""
+"alias '%s' changes environment variables.\n"
+"You can use '!git' in the alias to do this"
+msgstr ""
+
+#: git.c:377
+#, c-format
+msgid "empty alias for %s"
+msgstr ""
+
+#: git.c:380
+#, c-format
+msgid "recursive alias: %s"
+msgstr ""
+
+#: git.c:460
+msgid "write failure on standard output"
+msgstr ""
+
+#: git.c:462
+msgid "unknown write failure on standard output"
+msgstr ""
+
+#: git.c:464
+msgid "close failed on standard output"
+msgstr ""
+
+#: git.c:793
+#, c-format
+msgid "alias loop detected: expansion of '%s' does not terminate:%s"
+msgstr ""
+
+#: git.c:843
+#, c-format
+msgid "cannot handle %s as a builtin"
+msgstr ""
+
+#: git.c:856
+#, c-format
+msgid ""
+"usage: %s\n"
+"\n"
+msgstr ""
+
+#: git.c:876
+#, c-format
+msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
+msgstr ""
+
+#: git.c:888
+#, c-format
+msgid "failed to run command '%s': %s\n"
+msgstr ""
+
+#: http.c:378
+#, c-format
+msgid "negative value for http.postbuffer; defaulting to %d"
+msgstr ""
+
+#: http.c:399
+msgid "Delegation control is not supported with cURL < 7.22.0"
+msgstr ""
+
+#: http.c:408
+msgid "Public key pinning not supported with cURL < 7.44.0"
+msgstr ""
+
+#: http.c:876
+msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
+msgstr ""
+
+#: http.c:949
+msgid "Protocol restrictions not supported with cURL < 7.19.4"
+msgstr ""
+
+#: http.c:1085
+#, c-format
+msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
+msgstr ""
+
+#: http.c:1092
+#, c-format
+msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
+msgstr ""
+
+#: http.c:1096
+#, c-format
+msgid "Could not set SSL backend to '%s': already set"
+msgstr ""
+
+#: http.c:1965
+#, c-format
+msgid ""
+"unable to update url base from redirection:\n"
+" asked for: %s\n"
+" redirect: %s"
+msgstr ""
+
+#: remote-curl.c:157
+#, c-format
+msgid "invalid quoting in push-option value: '%s'"
+msgstr ""
+
+#: remote-curl.c:254
+#, c-format
+msgid "%sinfo/refs not valid: is this a git repository?"
+msgstr ""
+
+#: remote-curl.c:355
+msgid "invalid server response; expected service, got flush packet"
+msgstr ""
+
+#: remote-curl.c:386
+#, c-format
+msgid "invalid server response; got '%s'"
+msgstr ""
+
+#: remote-curl.c:446
+#, c-format
+msgid "repository '%s' not found"
+msgstr ""
+
+#: remote-curl.c:450
+#, c-format
+msgid "Authentication failed for '%s'"
+msgstr ""
+
+#: remote-curl.c:454
+#, c-format
+msgid "unable to access '%s': %s"
+msgstr ""
+
+#: remote-curl.c:460
+#, c-format
+msgid "redirecting to %s"
+msgstr ""
+
+#: remote-curl.c:584
+msgid "shouldn't have EOF when not gentle on EOF"
+msgstr ""
+
+#: remote-curl.c:664
+msgid "unable to rewind rpc post data - try increasing http.postBuffer"
+msgstr ""
+
+#: remote-curl.c:724
+#, c-format
+msgid "RPC failed; %s"
+msgstr ""
+
+#: remote-curl.c:764
+msgid "cannot handle pushes this big"
+msgstr ""
+
+#: remote-curl.c:879
+#, c-format
+msgid "cannot deflate request; zlib deflate error %d"
+msgstr ""
+
+#: remote-curl.c:883
+#, c-format
+msgid "cannot deflate request; zlib end error %d"
+msgstr ""
+
+#: remote-curl.c:1014
+msgid "dumb http transport does not support shallow capabilities"
+msgstr ""
+
+#: remote-curl.c:1028
+msgid "fetch failed."
+msgstr ""
+
+#: remote-curl.c:1076
+msgid "cannot fetch by sha1 over smart http"
+msgstr ""
+
+#: remote-curl.c:1120 remote-curl.c:1126
+#, c-format
+msgid "protocol error: expected sha/ref, got '%s'"
+msgstr ""
+
+#: remote-curl.c:1138 remote-curl.c:1252
+#, c-format
+msgid "http transport does not support %s"
+msgstr ""
+
+#: remote-curl.c:1174
+msgid "git-http-push failed"
+msgstr ""
+
+#: remote-curl.c:1360
+msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
+msgstr ""
+
+#: remote-curl.c:1392
+msgid "remote-curl: error reading command stream from git"
+msgstr ""
+
+#: remote-curl.c:1399
+msgid "remote-curl: fetch attempted without a local repo"
+msgstr ""
+
+#: remote-curl.c:1439
+#, c-format
+msgid "remote-curl: unknown command '%s' from git"
+msgstr ""
+
+#: list-objects-filter-options.h:61
+msgid "args"
+msgstr ""
+
+#: list-objects-filter-options.h:62
+msgid "object filtering"
+msgstr ""
+
+#: parse-options.h:170
+msgid "expiry-date"
+msgstr ""
+
+#: parse-options.h:184
+msgid "no-op (backward compatibility)"
+msgstr ""
+
+#: parse-options.h:305
+msgid "be more verbose"
+msgstr ""
+
+#: parse-options.h:307
+msgid "be more quiet"
+msgstr ""
+
+#: parse-options.h:313
+msgid "use <n> digits to display SHA-1s"
+msgstr ""
+
+#: parse-options.h:332
+msgid "how to strip spaces and #comments from message"
+msgstr ""
+
+#: ref-filter.h:101
+msgid "key"
+msgstr ""
+
+#: ref-filter.h:101
+msgid "field name to sort on"
+msgstr ""
+
+#: rerere.h:44
+msgid "update the index with reused conflict resolution if possible"
+msgstr ""
+
+#: wt-status.h:67
+msgid "HEAD detached at "
+msgstr ""
+
+#: wt-status.h:68
+msgid "HEAD detached from "
+msgstr ""
+
+#: command-list.h:50
+msgid "Add file contents to the index"
+msgstr ""
+
+#: command-list.h:51
+msgid "Apply a series of patches from a mailbox"
+msgstr ""
+
+#: command-list.h:52
+msgid "Annotate file lines with commit information"
+msgstr ""
+
+#: command-list.h:53
+msgid "Apply a patch to files and/or to the index"
+msgstr ""
+
+#: command-list.h:54
+msgid "Import a GNU Arch repository into Git"
+msgstr ""
+
+#: command-list.h:55
+msgid "Create an archive of files from a named tree"
+msgstr ""
+
+#: command-list.h:56
+msgid "Use binary search to find the commit that introduced a bug"
+msgstr ""
+
+#: command-list.h:57
+msgid "Show what revision and author last modified each line of a file"
+msgstr ""
+
+#: command-list.h:58
+msgid "List, create, or delete branches"
+msgstr ""
+
+#: command-list.h:59
+msgid "Move objects and refs by archive"
+msgstr ""
+
+#: command-list.h:60
+msgid "Provide content or type and size information for repository objects"
+msgstr ""
+
+#: command-list.h:61
+msgid "Display gitattributes information"
+msgstr ""
+
+#: command-list.h:62
+msgid "Debug gitignore / exclude files"
+msgstr ""
+
+#: command-list.h:63
+msgid "Show canonical names and email addresses of contacts"
+msgstr ""
+
+#: command-list.h:64
+msgid "Switch branches or restore working tree files"
+msgstr ""
+
+#: command-list.h:65
+msgid "Copy files from the index to the working tree"
+msgstr ""
+
+#: command-list.h:66
+msgid "Ensures that a reference name is well formed"
+msgstr ""
+
+#: command-list.h:67
+msgid "Find commits yet to be applied to upstream"
+msgstr ""
+
+#: command-list.h:68
+msgid "Apply the changes introduced by some existing commits"
+msgstr ""
+
+#: command-list.h:69
+msgid "Graphical alternative to git-commit"
+msgstr ""
+
+#: command-list.h:70
+msgid "Remove untracked files from the working tree"
+msgstr ""
+
+#: command-list.h:71
+msgid "Clone a repository into a new directory"
+msgstr ""
+
+#: command-list.h:72
+msgid "Display data in columns"
+msgstr ""
+
+#: command-list.h:73
+msgid "Record changes to the repository"
+msgstr ""
+
+#: command-list.h:74
+msgid "Write and verify Git commit-graph files"
+msgstr ""
+
+#: command-list.h:75
+msgid "Create a new commit object"
+msgstr ""
+
+#: command-list.h:76
+msgid "Get and set repository or global options"
+msgstr ""
+
+#: command-list.h:77
+msgid "Count unpacked number of objects and their disk consumption"
+msgstr ""
+
+#: command-list.h:78
+msgid "Retrieve and store user credentials"
+msgstr ""
+
+#: command-list.h:79
+msgid "Helper to temporarily store passwords in memory"
+msgstr ""
+
+#: command-list.h:80
+msgid "Helper to store credentials on disk"
+msgstr ""
+
+#: command-list.h:81
+msgid "Export a single commit to a CVS checkout"
+msgstr ""
+
+#: command-list.h:82
+msgid "Salvage your data out of another SCM people love to hate"
+msgstr ""
+
+#: command-list.h:83
+msgid "A CVS server emulator for Git"
+msgstr ""
+
+#: command-list.h:84
+msgid "A really simple server for Git repositories"
+msgstr ""
+
+#: command-list.h:85
+msgid "Give an object a human readable name based on an available ref"
+msgstr ""
+
+#: command-list.h:86
+msgid "Show changes between commits, commit and working tree, etc"
+msgstr ""
+
+#: command-list.h:87
+msgid "Compares files in the working tree and the index"
+msgstr ""
+
+#: command-list.h:88
+msgid "Compare a tree to the working tree or index"
+msgstr ""
+
+#: command-list.h:89
+msgid "Compares the content and mode of blobs found via two tree objects"
+msgstr ""
+
+#: command-list.h:90
+msgid "Show changes using common diff tools"
+msgstr ""
+
+#: command-list.h:91
+msgid "Git data exporter"
+msgstr ""
+
+#: command-list.h:92
+msgid "Backend for fast Git data importers"
+msgstr ""
+
+#: command-list.h:93
+msgid "Download objects and refs from another repository"
+msgstr ""
+
+#: command-list.h:94
+msgid "Receive missing objects from another repository"
+msgstr ""
+
+#: command-list.h:95
+msgid "Rewrite branches"
+msgstr ""
+
+#: command-list.h:96
+msgid "Produce a merge commit message"
+msgstr ""
+
+#: command-list.h:97
+msgid "Output information on each ref"
+msgstr ""
+
+#: command-list.h:98
+msgid "Prepare patches for e-mail submission"
+msgstr ""
+
+#: command-list.h:99
+msgid "Verifies the connectivity and validity of the objects in the database"
+msgstr ""
+
+#: command-list.h:100
+msgid "Cleanup unnecessary files and optimize the local repository"
+msgstr ""
+
+#: command-list.h:101
+msgid "Extract commit ID from an archive created using git-archive"
+msgstr ""
+
+#: command-list.h:102
+msgid "Print lines matching a pattern"
+msgstr ""
+
+#: command-list.h:103
+msgid "A portable graphical interface to Git"
+msgstr ""
+
+#: command-list.h:104
+msgid "Compute object ID and optionally creates a blob from a file"
+msgstr ""
+
+#: command-list.h:105
+msgid "Display help information about Git"
+msgstr ""
+
+#: command-list.h:106
+msgid "Server side implementation of Git over HTTP"
+msgstr ""
+
+#: command-list.h:107
+msgid "Download from a remote Git repository via HTTP"
+msgstr ""
+
+#: command-list.h:108
+msgid "Push objects over HTTP/DAV to another repository"
+msgstr ""
+
+#: command-list.h:109
+msgid "Send a collection of patches from stdin to an IMAP folder"
+msgstr ""
+
+#: command-list.h:110
+msgid "Build pack index file for an existing packed archive"
+msgstr ""
+
+#: command-list.h:111
+msgid "Create an empty Git repository or reinitialize an existing one"
+msgstr ""
+
+#: command-list.h:112
+msgid "Instantly browse your working repository in gitweb"
+msgstr ""
+
+#: command-list.h:113
+msgid "Add or parse structured information in commit messages"
+msgstr ""
+
+#: command-list.h:114
+msgid "The Git repository browser"
+msgstr ""
+
+#: command-list.h:115
+msgid "Show commit logs"
+msgstr ""
+
+#: command-list.h:116
+msgid "Show information about files in the index and the working tree"
+msgstr ""
+
+#: command-list.h:117
+msgid "List references in a remote repository"
+msgstr ""
+
+#: command-list.h:118
+msgid "List the contents of a tree object"
+msgstr ""
+
+#: command-list.h:119
+msgid "Extracts patch and authorship from a single e-mail message"
+msgstr ""
+
+#: command-list.h:120
+msgid "Simple UNIX mbox splitter program"
+msgstr ""
+
+#: command-list.h:121
+msgid "Join two or more development histories together"
+msgstr ""
+
+#: command-list.h:122
+msgid "Find as good common ancestors as possible for a merge"
+msgstr ""
+
+#: command-list.h:123
+msgid "Run a three-way file merge"
+msgstr ""
+
+#: command-list.h:124
+msgid "Run a merge for files needing merging"
+msgstr ""
+
+#: command-list.h:125
+msgid "The standard helper program to use with git-merge-index"
+msgstr ""
+
+#: command-list.h:126
+msgid "Run merge conflict resolution tools to resolve merge conflicts"
+msgstr ""
+
+#: command-list.h:127
+msgid "Show three-way merge without touching index"
+msgstr ""
+
+#: command-list.h:128
+msgid "Write and verify multi-pack-indexes"
+msgstr ""
+
+#: command-list.h:129
+msgid "Creates a tag object"
+msgstr ""
+
+#: command-list.h:130
+msgid "Build a tree-object from ls-tree formatted text"
+msgstr ""
+
+#: command-list.h:131
+msgid "Move or rename a file, a directory, or a symlink"
+msgstr ""
+
+#: command-list.h:132
+msgid "Find symbolic names for given revs"
+msgstr ""
+
+#: command-list.h:133
+msgid "Add or inspect object notes"
+msgstr ""
+
+#: command-list.h:134
+msgid "Import from and submit to Perforce repositories"
+msgstr ""
+
+#: command-list.h:135
+msgid "Create a packed archive of objects"
+msgstr ""
+
+#: command-list.h:136
+msgid "Find redundant pack files"
+msgstr ""
+
+#: command-list.h:137
+msgid "Pack heads and tags for efficient repository access"
+msgstr ""
+
+#: command-list.h:138
+msgid "Routines to help parsing remote repository access parameters"
+msgstr ""
+
+#: command-list.h:139
+msgid "Compute unique ID for a patch"
+msgstr ""
+
+#: command-list.h:140
+msgid "Prune all unreachable objects from the object database"
+msgstr ""
+
+#: command-list.h:141
+msgid "Remove extra objects that are already in pack files"
+msgstr ""
+
+#: command-list.h:142
+msgid "Fetch from and integrate with another repository or a local branch"
+msgstr ""
+
+#: command-list.h:143
+msgid "Update remote refs along with associated objects"
+msgstr ""
+
+#: command-list.h:144
+msgid "Applies a quilt patchset onto the current branch"
+msgstr ""
+
+#: command-list.h:145
+msgid "Compare two commit ranges (e.g. two versions of a branch)"
+msgstr ""
+
+#: command-list.h:146
+msgid "Reads tree information into the index"
+msgstr ""
+
+#: command-list.h:147
+msgid "Reapply commits on top of another base tip"
+msgstr ""
+
+#: command-list.h:148
+msgid "Receive what is pushed into the repository"
+msgstr ""
+
+#: command-list.h:149
+msgid "Manage reflog information"
+msgstr ""
+
+#: command-list.h:150
+msgid "Manage set of tracked repositories"
+msgstr ""
+
+#: command-list.h:151
+msgid "Pack unpacked objects in a repository"
+msgstr ""
+
+#: command-list.h:152
+msgid "Create, list, delete refs to replace objects"
+msgstr ""
+
+#: command-list.h:153
+msgid "Generates a summary of pending changes"
+msgstr ""
+
+#: command-list.h:154
+msgid "Reuse recorded resolution of conflicted merges"
+msgstr ""
+
+#: command-list.h:155
+msgid "Reset current HEAD to the specified state"
+msgstr ""
+
+#: command-list.h:156
+msgid "Restore working tree files"
+msgstr ""
+
+#: command-list.h:157
+msgid "Revert some existing commits"
+msgstr ""
+
+#: command-list.h:158
+msgid "Lists commit objects in reverse chronological order"
+msgstr ""
+
+#: command-list.h:159
+msgid "Pick out and massage parameters"
+msgstr ""
+
+#: command-list.h:160
+msgid "Remove files from the working tree and from the index"
+msgstr ""
+
+#: command-list.h:161
+msgid "Send a collection of patches as emails"
+msgstr ""
+
+#: command-list.h:162
+msgid "Push objects over Git protocol to another repository"
+msgstr ""
+
+#: command-list.h:163
+msgid "Restricted login shell for Git-only SSH access"
+msgstr ""
+
+#: command-list.h:164
+msgid "Summarize 'git log' output"
+msgstr ""
+
+#: command-list.h:165
+msgid "Show various types of objects"
+msgstr ""
+
+#: command-list.h:166
+msgid "Show branches and their commits"
+msgstr ""
+
+#: command-list.h:167
+msgid "Show packed archive index"
+msgstr ""
+
+#: command-list.h:168
+msgid "List references in a local repository"
+msgstr ""
+
+#: command-list.h:169
+msgid "Git's i18n setup code for shell scripts"
+msgstr ""
+
+#: command-list.h:170
+msgid "Common Git shell script setup code"
+msgstr ""
+
+#: command-list.h:171
+msgid "Stash the changes in a dirty working directory away"
+msgstr ""
+
+#: command-list.h:172
+msgid "Add file contents to the staging area"
+msgstr ""
+
+#: command-list.h:173
+msgid "Show the working tree status"
+msgstr ""
+
+#: command-list.h:174
+msgid "Remove unnecessary whitespace"
+msgstr ""
+
+#: command-list.h:175
+msgid "Initialize, update or inspect submodules"
+msgstr ""
+
+#: command-list.h:176
+msgid "Bidirectional operation between a Subversion repository and Git"
+msgstr ""
+
+#: command-list.h:177
+msgid "Switch branches"
+msgstr ""
+
+#: command-list.h:178
+msgid "Read, modify and delete symbolic refs"
+msgstr ""
+
+#: command-list.h:179
+msgid "Create, list, delete or verify a tag object signed with GPG"
+msgstr ""
+
+#: command-list.h:180
+msgid "Creates a temporary file with a blob's contents"
+msgstr ""
+
+#: command-list.h:181
+msgid "Unpack objects from a packed archive"
+msgstr ""
+
+#: command-list.h:182
+msgid "Register file contents in the working tree to the index"
+msgstr ""
+
+#: command-list.h:183
+msgid "Update the object name stored in a ref safely"
+msgstr ""
+
+#: command-list.h:184
+msgid "Update auxiliary info file to help dumb servers"
+msgstr ""
+
+#: command-list.h:185
+msgid "Send archive back to git-archive"
+msgstr ""
+
+#: command-list.h:186
+msgid "Send objects packed back to git-fetch-pack"
+msgstr ""
+
+#: command-list.h:187
+msgid "Show a Git logical variable"
+msgstr ""
+
+#: command-list.h:188
+msgid "Check the GPG signature of commits"
+msgstr ""
+
+#: command-list.h:189
+msgid "Validate packed Git archive files"
+msgstr ""
+
+#: command-list.h:190
+msgid "Check the GPG signature of tags"
+msgstr ""
+
+#: command-list.h:191
+msgid "Git web interface (web frontend to Git repositories)"
+msgstr ""
+
+#: command-list.h:192
+msgid "Show logs with difference each commit introduces"
+msgstr ""
+
+#: command-list.h:193
+msgid "Manage multiple working trees"
+msgstr ""
+
+#: command-list.h:194
+msgid "Create a tree object from the current index"
+msgstr ""
+
+#: command-list.h:195
+msgid "Defining attributes per path"
+msgstr ""
+
+#: command-list.h:196
+msgid "Git command-line interface and conventions"
+msgstr ""
+
+#: command-list.h:197
+msgid "A Git core tutorial for developers"
+msgstr ""
+
+#: command-list.h:198
+msgid "Git for CVS users"
+msgstr ""
+
+#: command-list.h:199
+msgid "Tweaking diff output"
+msgstr ""
+
+#: command-list.h:200
+msgid "A useful minimum set of commands for Everyday Git"
+msgstr ""
+
+#: command-list.h:201
+msgid "A Git Glossary"
msgstr ""
-#: git-rebase.sh:426
-msgid "The --edit-todo action can only be used during interactive rebase."
+#: command-list.h:202
+msgid "Hooks used by Git"
msgstr ""
-#: git-rebase.sh:433
-msgid "Cannot read HEAD"
+#: command-list.h:203
+msgid "Specifies intentionally untracked files to ignore"
msgstr ""
-#: git-rebase.sh:436
-msgid ""
-"You must edit all merge conflicts and then\n"
-"mark them as resolved using git add"
+#: command-list.h:204
+msgid "Defining submodule properties"
msgstr ""
-#: git-rebase.sh:480
-#, sh-format
-msgid ""
-"It seems that there is already a $state_dir_base directory, and\n"
-"I wonder if you are in the middle of another rebase. If that is the\n"
-"case, please try\n"
-"\t$cmd_live_rebase\n"
-"If that is not the case, please\n"
-"\t$cmd_clear_stale_rebase\n"
-"and run me again. I am stopping in case you still have something\n"
-"valuable there."
+#: command-list.h:205
+msgid "Git namespaces"
msgstr ""
-#: git-rebase.sh:545
-msgid "error: cannot combine '--signoff' with '--preserve-merges'"
+#: command-list.h:206
+msgid "Git Repository Layout"
msgstr ""
-#: git-rebase.sh:556
-msgid "error: cannot combine '--preserve_merges' with '--rebase-merges'"
+#: command-list.h:207
+msgid "Specifying revisions and ranges for Git"
msgstr ""
-#: git-rebase.sh:562
-msgid "error: cannot combine '--rebase_merges' with '--strategy-option'"
+#: command-list.h:208
+msgid "A tutorial introduction to Git: part two"
msgstr ""
-#: git-rebase.sh:564
-msgid "error: cannot combine '--rebase_merges' with '--strategy'"
+#: command-list.h:209
+msgid "A tutorial introduction to Git"
msgstr ""
-#: git-rebase.sh:590
-#, sh-format
-msgid "invalid upstream '$upstream_name'"
+#: command-list.h:210
+msgid "An overview of recommended workflows with Git"
msgstr ""
-#: git-rebase.sh:614
-#, sh-format
-msgid "$onto_name: there are more than one merge bases"
+#: git-bisect.sh:54
+msgid "You need to start by \"git bisect start\""
msgstr ""
-#: git-rebase.sh:617 git-rebase.sh:621
-#, sh-format
-msgid "$onto_name: there is no merge base"
+#. TRANSLATORS: Make sure to include [Y] and [n] in your
+#. translation. The program will only accept English input
+#. at this point.
+#: git-bisect.sh:60
+msgid "Do you want me to do it for you [Y/n]? "
msgstr ""
-#: git-rebase.sh:626
+#: git-bisect.sh:101
#, sh-format
-msgid "Does not point to a valid commit: $onto_name"
+msgid "Bad rev input: $arg"
msgstr ""
-#: git-rebase.sh:652
+#: git-bisect.sh:121
#, sh-format
-msgid "fatal: no such branch/commit '$branch_name'"
+msgid "Bad rev input: $bisected_head"
msgstr ""
-#: git-rebase.sh:685
-msgid "Cannot autostash"
+#: git-bisect.sh:130
+#, sh-format
+msgid "Bad rev input: $rev"
msgstr ""
-#: git-rebase.sh:690
+#: git-bisect.sh:139
#, sh-format
-msgid "Created autostash: $stash_abbrev"
+msgid "'git bisect $TERM_BAD' can take only one argument."
msgstr ""
-#: git-rebase.sh:694
-msgid "Please commit or stash them."
+#: git-bisect.sh:209
+msgid "No logfile given"
msgstr ""
-#: git-rebase.sh:717
+#: git-bisect.sh:210
#, sh-format
-msgid "HEAD is up to date."
+msgid "cannot read $file for replaying"
msgstr ""
-#: git-rebase.sh:719
-#, sh-format
-msgid "Current branch $branch_name is up to date."
+#: git-bisect.sh:232
+msgid "?? what are you talking about?"
msgstr ""
-#: git-rebase.sh:727
-#, sh-format
-msgid "HEAD is up to date, rebase forced."
+#: git-bisect.sh:241
+msgid "bisect run failed: no command provided."
msgstr ""
-#: git-rebase.sh:729
+#: git-bisect.sh:246
#, sh-format
-msgid "Current branch $branch_name is up to date, rebase forced."
+msgid "running $command"
msgstr ""
-#: git-rebase.sh:741
+#: git-bisect.sh:253
#, sh-format
-msgid "Changes from $mb to $onto:"
+msgid ""
+"bisect run failed:\n"
+"exit code $res from '$command' is < 0 or >= 128"
msgstr ""
-#: git-rebase.sh:750
-msgid "First, rewinding head to replay your work on top of it..."
+#: git-bisect.sh:279
+msgid "bisect run cannot continue any more"
msgstr ""
-#: git-rebase.sh:760
+#: git-bisect.sh:285
#, sh-format
-msgid "Fast-forwarded $branch_name to $onto_name."
-msgstr ""
-
-#: git-stash.sh:61
-msgid "git stash clear with parameters is unimplemented"
+msgid ""
+"bisect run failed:\n"
+"'bisect_state $state' exited with error code $res"
msgstr ""
-#: git-stash.sh:108
-msgid "You do not have the initial commit yet"
+#: git-bisect.sh:292
+msgid "bisect run success"
msgstr ""
-#: git-stash.sh:123
-msgid "Cannot save the current index state"
+#: git-bisect.sh:300
+msgid "We are not bisecting."
msgstr ""
-#: git-stash.sh:138
-msgid "Cannot save the untracked files"
+#: git-merge-octopus.sh:46
+msgid ""
+"Error: Your local changes to the following files would be overwritten by "
+"merge"
msgstr ""
-#: git-stash.sh:158 git-stash.sh:171
-msgid "Cannot save the current worktree state"
+#: git-merge-octopus.sh:61
+msgid "Automated merge did not work."
msgstr ""
-#: git-stash.sh:175
-msgid "No changes selected"
+#: git-merge-octopus.sh:62
+msgid "Should not be doing an octopus."
msgstr ""
-#: git-stash.sh:178
-msgid "Cannot remove temporary index (can't happen)"
+#: git-merge-octopus.sh:73
+#, sh-format
+msgid "Unable to find common commit with $pretty_name"
msgstr ""
-#: git-stash.sh:191
-msgid "Cannot record working tree state"
+#: git-merge-octopus.sh:77
+#, sh-format
+msgid "Already up to date with $pretty_name"
msgstr ""
-#: git-stash.sh:229
+#: git-merge-octopus.sh:89
#, sh-format
-msgid "Cannot update $ref_stash with $w_commit"
+msgid "Fast-forwarding to: $pretty_name"
msgstr ""
-#: git-stash.sh:281
+#: git-merge-octopus.sh:97
#, sh-format
-msgid "error: unknown option for 'stash push': $option"
+msgid "Trying simple merge with $pretty_name"
msgstr ""
-#: git-stash.sh:295
-msgid "Can't use --patch and --include-untracked or --all at the same time"
+#: git-merge-octopus.sh:102
+msgid "Simple merge did not work, trying automatic merge."
msgstr ""
-#: git-stash.sh:303
-msgid "No local changes to save"
+#: git-legacy-stash.sh:220
+msgid "Cannot remove temporary index (can't happen)"
msgstr ""
-#: git-stash.sh:308
-msgid "Cannot initialize stash"
+#: git-legacy-stash.sh:271
+#, sh-format
+msgid "Cannot update $ref_stash with $w_commit"
msgstr ""
-#: git-stash.sh:312
-msgid "Cannot save the current status"
+#: git-legacy-stash.sh:323
+#, sh-format
+msgid "error: unknown option for 'stash push': $option"
msgstr ""
-#: git-stash.sh:313
+#: git-legacy-stash.sh:355
#, sh-format
msgid "Saved working directory and index state $stash_msg"
msgstr ""
-#: git-stash.sh:342
-msgid "Cannot remove worktree changes"
-msgstr ""
-
-#: git-stash.sh:490
+#: git-legacy-stash.sh:535
#, sh-format
msgid "unknown option: $opt"
msgstr ""
-#: git-stash.sh:503
-msgid "No stash entries found."
-msgstr ""
-
-#: git-stash.sh:510
+#: git-legacy-stash.sh:555
#, sh-format
msgid "Too many revisions specified: $REV"
msgstr ""
-#: git-stash.sh:525
+#: git-legacy-stash.sh:570
#, sh-format
msgid "$reference is not a valid reference"
msgstr ""
-#: git-stash.sh:553
+#: git-legacy-stash.sh:598
#, sh-format
msgid "'$args' is not a stash-like commit"
msgstr ""
-#: git-stash.sh:564
+#: git-legacy-stash.sh:609
#, sh-format
msgid "'$args' is not a stash reference"
msgstr ""
-#: git-stash.sh:572
+#: git-legacy-stash.sh:617
msgid "unable to refresh index"
msgstr ""
-#: git-stash.sh:576
+#: git-legacy-stash.sh:621
msgid "Cannot apply a stash in the middle of a merge"
msgstr ""
-#: git-stash.sh:584
+#: git-legacy-stash.sh:629
msgid "Conflicts in index. Try without --index."
msgstr ""
-#: git-stash.sh:586
+#: git-legacy-stash.sh:631
msgid "Could not save index tree"
msgstr ""
-#: git-stash.sh:595
+#: git-legacy-stash.sh:640
msgid "Could not restore untracked files from stash entry"
msgstr ""
-#: git-stash.sh:620
+#: git-legacy-stash.sh:665
msgid "Cannot unstage modified files"
msgstr ""
-#: git-stash.sh:635
-msgid "Index was not unstashed."
-msgstr ""
-
-#: git-stash.sh:649
-msgid "The stash entry is kept in case you need it again."
-msgstr ""
-
-#: git-stash.sh:658
+#: git-legacy-stash.sh:703
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr ""
-#: git-stash.sh:659
+#: git-legacy-stash.sh:704
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr ""
-#: git-stash.sh:667
-msgid "No branch name specified"
-msgstr ""
-
-#: git-stash.sh:746
+#: git-legacy-stash.sh:791
msgid "(To restore them type \"git stash apply\")"
msgstr ""
-#: git-submodule.sh:188
+#: git-submodule.sh:200
msgid "Relative path can only be used from the toplevel of the working tree"
msgstr ""
-#: git-submodule.sh:198
+#: git-submodule.sh:210
#, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
msgstr ""
-#: git-submodule.sh:217
+#: git-submodule.sh:229
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr ""
-#: git-submodule.sh:220
+#: git-submodule.sh:232
#, sh-format
msgid "'$sm_path' already exists in the index and is not a submodule"
msgstr ""
-#: git-submodule.sh:226
+#: git-submodule.sh:239
+#, sh-format
+msgid "'$sm_path' does not have a commit checked out"
+msgstr ""
+
+#: git-submodule.sh:245
#, 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:249
+#: git-submodule.sh:268
#, sh-format
msgid "Adding existing repo at '$sm_path' to the index"
msgstr ""
-#: git-submodule.sh:251
+#: git-submodule.sh:270
#, sh-format
msgid "'$sm_path' already exists and is not a valid git repo"
msgstr ""
-#: git-submodule.sh:259
+#: git-submodule.sh:278
#, sh-format
msgid "A git directory for '$sm_name' is found locally with remote(s):"
msgstr ""
-#: git-submodule.sh:261
+#: git-submodule.sh:280
#, sh-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from\n"
"option."
msgstr ""
-#: git-submodule.sh:267
+#: git-submodule.sh:286
#, sh-format
msgid "Reactivating local git directory for submodule '$sm_name'."
msgstr ""
-#: git-submodule.sh:279
+#: git-submodule.sh:298
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
msgstr ""
-#: git-submodule.sh:284
+#: git-submodule.sh:303
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr ""
-#: git-submodule.sh:293
+#: git-submodule.sh:312
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr ""
-#: git-submodule.sh:565
+#: git-submodule.sh:573
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:575
+#: git-submodule.sh:583
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr ""
-#: git-submodule.sh:580
+#: git-submodule.sh:588
#, sh-format
msgid ""
"Unable to find current ${remote_name}/${branch} revision in submodule path "
"'$sm_path'"
msgstr ""
-#: git-submodule.sh:603
+#: git-submodule.sh:606
#, sh-format
-msgid "Unable to fetch in submodule path '$displaypath'"
+msgid ""
+"Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
+"$sha1:"
msgstr ""
-#: git-submodule.sh:609
+#: git-submodule.sh:612
#, sh-format
msgid ""
"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
"Direct fetching of that commit failed."
msgstr ""
-#: git-submodule.sh:616
+#: git-submodule.sh:619
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:617
+#: git-submodule.sh:620
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr ""
-#: git-submodule.sh:621
+#: git-submodule.sh:624
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:622
+#: git-submodule.sh:625
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr ""
-#: git-submodule.sh:627
+#: git-submodule.sh:630
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:628
+#: git-submodule.sh:631
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr ""
-#: git-submodule.sh:633
+#: git-submodule.sh:636
#, sh-format
msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:634
+#: git-submodule.sh:637
#, sh-format
msgid "Submodule path '$displaypath': '$command $sha1'"
msgstr ""
-#: git-submodule.sh:665
+#: git-submodule.sh:668
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:761
+#: git-submodule.sh:830
msgid "The --cached option cannot be used with the --files option"
msgstr ""
-#: git-submodule.sh:813
+#: git-submodule.sh:882
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr ""
-#: git-submodule.sh:833
+#: git-submodule.sh:902
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr ""
-#: git-submodule.sh:836
+#: git-submodule.sh:905
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr ""
-#: git-submodule.sh:839
+#: git-submodule.sh:908
#, sh-format
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
msgstr ""
msgid "See git-${cmd}(1) for details."
msgstr ""
-#: git-rebase--interactive.sh:43
-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 <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: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: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: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"
+#: git-rebase--preserve-merges.sh:109
+msgid "Applied autostash."
msgstr ""
-#: git-rebase--interactive.sh:219 git-rebase--preserve-merges.sh:888
+#: git-rebase--preserve-merges.sh:112
#, 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"
+msgid "Cannot store $stash_sha1"
msgstr ""
-#: git-rebase--preserve-merges.sh:136
+#: git-rebase--preserve-merges.sh:191
#, sh-format
msgid "Rebasing ($new_count/$total)"
msgstr ""
-#: git-rebase--preserve-merges.sh:152
+#: git-rebase--preserve-merges.sh:207
msgid ""
"\n"
"Commands:\n"
"These lines can be re-ordered; they are executed from top to bottom.\n"
msgstr ""
-#: git-rebase--preserve-merges.sh:215
+#: git-rebase--preserve-merges.sh:270
#, sh-format
msgid ""
"You can amend the commit now, with\n"
"\tgit rebase --continue"
msgstr ""
-#: git-rebase--preserve-merges.sh:240
+#: git-rebase--preserve-merges.sh:295
#, sh-format
msgid "$sha1: not a commit that can be picked"
msgstr ""
-#: git-rebase--preserve-merges.sh:279
+#: git-rebase--preserve-merges.sh:334
#, sh-format
msgid "Invalid commit name: $sha1"
msgstr ""
-#: git-rebase--preserve-merges.sh:309
+#: git-rebase--preserve-merges.sh:364
msgid "Cannot write current commit's replacement sha1"
msgstr ""
-#: git-rebase--preserve-merges.sh:360
+#: git-rebase--preserve-merges.sh:415
#, sh-format
msgid "Fast-forward to $sha1"
msgstr ""
-#: git-rebase--preserve-merges.sh:362
+#: git-rebase--preserve-merges.sh:417
#, sh-format
msgid "Cannot fast-forward to $sha1"
msgstr ""
-#: git-rebase--preserve-merges.sh:371
+#: git-rebase--preserve-merges.sh:426
#, sh-format
msgid "Cannot move HEAD to $first_parent"
msgstr ""
-#: git-rebase--preserve-merges.sh:376
+#: git-rebase--preserve-merges.sh:431
#, sh-format
msgid "Refusing to squash a merge: $sha1"
msgstr ""
-#: git-rebase--preserve-merges.sh:394
+#: git-rebase--preserve-merges.sh:449
#, sh-format
msgid "Error redoing merge $sha1"
msgstr ""
-#: git-rebase--preserve-merges.sh:403
+#: git-rebase--preserve-merges.sh:458
#, sh-format
msgid "Could not pick $sha1"
msgstr ""
-#: git-rebase--preserve-merges.sh:412
+#: git-rebase--preserve-merges.sh:467
#, sh-format
msgid "This is the commit message #${n}:"
msgstr ""
-#: git-rebase--preserve-merges.sh:417
+#: git-rebase--preserve-merges.sh:472
#, sh-format
msgid "The commit message #${n} will be skipped:"
msgstr ""
-#: git-rebase--preserve-merges.sh:428
+#: git-rebase--preserve-merges.sh:483
#, 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--preserve-merges.sh:437
+#: git-rebase--preserve-merges.sh:492
#, sh-format
msgid "Cannot write $fixup_msg"
msgstr ""
-#: git-rebase--preserve-merges.sh:440
+#: git-rebase--preserve-merges.sh:495
msgid "This is a combination of 2 commits."
msgstr ""
-#: git-rebase--preserve-merges.sh:481 git-rebase--preserve-merges.sh:524
-#: git-rebase--preserve-merges.sh:527
+#: git-rebase--preserve-merges.sh:536 git-rebase--preserve-merges.sh:579
+#: git-rebase--preserve-merges.sh:582
#, sh-format
msgid "Could not apply $sha1... $rest"
msgstr ""
-#: git-rebase--preserve-merges.sh:556
+#: git-rebase--preserve-merges.sh:611
#, sh-format
msgid ""
"Could not amend commit after successfully picking $sha1... $rest\n"
"you are able to reword the commit."
msgstr ""
-#: git-rebase--preserve-merges.sh:571
+#: git-rebase--preserve-merges.sh:626
#, sh-format
msgid "Stopped at $sha1_abbrev... $rest"
msgstr ""
-#: git-rebase--preserve-merges.sh:586
+#: git-rebase--preserve-merges.sh:641
#, sh-format
msgid "Cannot '$squash_style' without a previous commit"
msgstr ""
-#: git-rebase--preserve-merges.sh:628
+#: git-rebase--preserve-merges.sh:683
#, sh-format
msgid "Executing: $rest"
msgstr ""
-#: git-rebase--preserve-merges.sh:636
+#: git-rebase--preserve-merges.sh:691
#, sh-format
msgid "Execution failed: $rest"
msgstr ""
-#: git-rebase--preserve-merges.sh:638
+#: git-rebase--preserve-merges.sh:693
msgid "and made changes to the index and/or the working tree"
msgstr ""
-#: git-rebase--preserve-merges.sh:640
+#: git-rebase--preserve-merges.sh:695
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--preserve-merges.sh:653
+#: git-rebase--preserve-merges.sh:708
#, sh-format
msgid ""
"Execution succeeded: $rest\n"
"\tgit rebase --continue"
msgstr ""
-#: git-rebase--preserve-merges.sh:664
+#: git-rebase--preserve-merges.sh:719
#, sh-format
msgid "Unknown command: $command $sha1 $rest"
msgstr ""
-#: git-rebase--preserve-merges.sh:665
+#: git-rebase--preserve-merges.sh:720
msgid "Please fix this using 'git rebase --edit-todo'."
msgstr ""
-#: git-rebase--preserve-merges.sh:700
+#: git-rebase--preserve-merges.sh:755
#, sh-format
msgid "Successfully rebased and updated $head_name."
msgstr ""
-#: git-rebase--preserve-merges.sh:757
+#: git-rebase--preserve-merges.sh:812
msgid "Could not remove CHERRY_PICK_HEAD"
msgstr ""
-#: git-rebase--preserve-merges.sh:762
+#: git-rebase--preserve-merges.sh:817
#, sh-format
msgid ""
"You have staged changes in your working tree.\n"
" git rebase --continue\n"
msgstr ""
-#: git-rebase--preserve-merges.sh:779
+#: git-rebase--preserve-merges.sh:834
msgid "Error trying to find the author identity to amend commit"
msgstr ""
-#: git-rebase--preserve-merges.sh:784
+#: git-rebase--preserve-merges.sh:839
msgid ""
"You have uncommitted changes in your working tree. Please commit them\n"
"first and then run 'git rebase --continue' again."
msgstr ""
-#: git-rebase--preserve-merges.sh:789 git-rebase--preserve-merges.sh:793
+#: git-rebase--preserve-merges.sh:844 git-rebase--preserve-merges.sh:848
msgid "Could not commit staged changes."
msgstr ""
-#: git-rebase--preserve-merges.sh:893
-msgid ""
-"\n"
-"However, if you remove everything, the rebase will be aborted.\n"
-"\n"
+#: git-rebase--preserve-merges.sh:879 git-rebase--preserve-merges.sh:965
+msgid "Could not execute editor"
+msgstr ""
+
+#: git-rebase--preserve-merges.sh:900
+#, sh-format
+msgid "Could not checkout $switch_to"
+msgstr ""
+
+#: git-rebase--preserve-merges.sh:907
+msgid "No HEAD?"
msgstr ""
-#: git-rebase--preserve-merges.sh:942 git-rebase--preserve-merges.sh:947
+#: git-rebase--preserve-merges.sh:908
+#, sh-format
+msgid "Could not create temporary $state_dir"
+msgstr ""
+
+#: git-rebase--preserve-merges.sh:911
+msgid "Could not mark as interactive"
+msgstr ""
+
+#: git-rebase--preserve-merges.sh:943
+#, sh-format
+msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
+msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: git-rebase--preserve-merges.sh:997 git-rebase--preserve-merges.sh:1002
msgid "Could not init rewritten commits"
msgstr ""
msgid "usage: $dashless $USAGE"
msgstr ""
-#: git-sh-setup.sh:190
+#: git-sh-setup.sh:191
#, sh-format
msgid "Cannot chdir to $cdup, the toplevel of the working tree"
msgstr ""
-#: git-sh-setup.sh:199 git-sh-setup.sh:206
+#: git-sh-setup.sh:200 git-sh-setup.sh:207
#, sh-format
msgid "fatal: $program_name cannot be used without a working tree."
msgstr ""
-#: git-sh-setup.sh:220
+#: git-sh-setup.sh:221
msgid "Cannot rebase: You have unstaged changes."
msgstr ""
-#: git-sh-setup.sh:223
+#: git-sh-setup.sh:224
msgid "Cannot rewrite branches: You have unstaged changes."
msgstr ""
-#: git-sh-setup.sh:226
+#: git-sh-setup.sh:227
msgid "Cannot pull with rebase: You have unstaged changes."
msgstr ""
-#: git-sh-setup.sh:229
+#: git-sh-setup.sh:230
#, sh-format
msgid "Cannot $action: You have unstaged changes."
msgstr ""
-#: git-sh-setup.sh:242
+#: git-sh-setup.sh:243
msgid "Cannot rebase: Your index contains uncommitted changes."
msgstr ""
-#: git-sh-setup.sh:245
+#: git-sh-setup.sh:246
msgid "Cannot pull with rebase: Your index contains uncommitted changes."
msgstr ""
-#: git-sh-setup.sh:248
+#: git-sh-setup.sh:249
#, sh-format
msgid "Cannot $action: Your index contains uncommitted changes."
msgstr ""
-#: git-sh-setup.sh:252
+#: git-sh-setup.sh:253
msgid "Additionally, your index contains uncommitted changes."
msgstr ""
-#: git-sh-setup.sh:372
+#: git-sh-setup.sh:373
msgid "You need to run this command from the toplevel of the working tree."
msgstr ""
-#: git-sh-setup.sh:377
+#: git-sh-setup.sh:378
msgid "Unable to determine absolute path of git directory"
msgstr ""
#. TRANSLATORS: you can adjust this to align "git add -i" status menu
-#: git-add--interactive.perl:196
+#: git-add--interactive.perl:210
#, perl-format
msgid "%12s %12s %s"
msgstr ""
-#: git-add--interactive.perl:197
+#: git-add--interactive.perl:211
msgid "staged"
msgstr ""
-#: git-add--interactive.perl:197
+#: git-add--interactive.perl:211
msgid "unstaged"
msgstr ""
-#: git-add--interactive.perl:253 git-add--interactive.perl:278
+#: git-add--interactive.perl:267 git-add--interactive.perl:292
msgid "binary"
msgstr ""
-#: git-add--interactive.perl:262 git-add--interactive.perl:316
+#: git-add--interactive.perl:276 git-add--interactive.perl:330
msgid "nothing"
msgstr ""
-#: git-add--interactive.perl:298 git-add--interactive.perl:313
+#: git-add--interactive.perl:312 git-add--interactive.perl:327
msgid "unchanged"
msgstr ""
-#: git-add--interactive.perl:609
+#: git-add--interactive.perl:623
#, perl-format
msgid "added %d path\n"
msgid_plural "added %d paths\n"
msgstr[0] ""
msgstr[1] ""
-#: git-add--interactive.perl:612
+#: git-add--interactive.perl:626
#, perl-format
msgid "updated %d path\n"
msgid_plural "updated %d paths\n"
msgstr[0] ""
msgstr[1] ""
-#: git-add--interactive.perl:615
+#: git-add--interactive.perl:629
#, perl-format
msgid "reverted %d path\n"
msgid_plural "reverted %d paths\n"
msgstr[0] ""
msgstr[1] ""
-#: git-add--interactive.perl:618
+#: git-add--interactive.perl:632
#, perl-format
msgid "touched %d path\n"
msgid_plural "touched %d paths\n"
msgstr[0] ""
msgstr[1] ""
-#: git-add--interactive.perl:627
+#: git-add--interactive.perl:641
msgid "Update"
msgstr ""
-#: git-add--interactive.perl:639
+#: git-add--interactive.perl:653
msgid "Revert"
msgstr ""
-#: git-add--interactive.perl:662
+#: git-add--interactive.perl:676
#, perl-format
msgid "note: %s is untracked now.\n"
msgstr ""
-#: git-add--interactive.perl:673
+#: git-add--interactive.perl:687
msgid "Add untracked"
msgstr ""
-#: git-add--interactive.perl:679
+#: git-add--interactive.perl:693
msgid "No untracked files.\n"
msgstr ""
-#: git-add--interactive.perl:1033
+#: git-add--interactive.perl:1051
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for staging."
msgstr ""
-#: git-add--interactive.perl:1036
+#: git-add--interactive.perl:1054
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for stashing."
msgstr ""
-#: git-add--interactive.perl:1039
+#: git-add--interactive.perl:1057
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for unstaging."
msgstr ""
-#: git-add--interactive.perl:1042 git-add--interactive.perl:1051
+#: git-add--interactive.perl:1060 git-add--interactive.perl:1069
+#: git-add--interactive.perl:1075
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for applying."
msgstr ""
-#: git-add--interactive.perl:1045 git-add--interactive.perl:1048
+#: git-add--interactive.perl:1063 git-add--interactive.perl:1066
+#: git-add--interactive.perl:1072
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for discarding."
msgstr ""
-#: git-add--interactive.perl:1085
+#: git-add--interactive.perl:1109
#, perl-format
msgid "failed to open hunk edit file for writing: %s"
msgstr ""
-#: git-add--interactive.perl:1086
+#: git-add--interactive.perl:1110
msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
msgstr ""
-#: git-add--interactive.perl:1092
+#: git-add--interactive.perl:1116
#, perl-format
msgid ""
"---\n"
msgstr ""
#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: git-add--interactive.perl:1100
+#: git-add--interactive.perl:1124
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:1114
+#: git-add--interactive.perl:1138
#, 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:1213
+#: git-add--interactive.perl:1237
msgid ""
"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
msgstr ""
-#: git-add--interactive.perl:1222
+#: git-add--interactive.perl:1246
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:1228
+#: git-add--interactive.perl:1252
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:1234
+#: git-add--interactive.perl:1258
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:1240
+#: git-add--interactive.perl:1264
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:1246
+#: git-add--interactive.perl:1270 git-add--interactive.perl:1288
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:1252
+#: git-add--interactive.perl:1276
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:1258
+#: git-add--interactive.perl:1282
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:1273
+#: git-add--interactive.perl:1294
+msgid ""
+"y - apply this hunk to worktree\n"
+"n - do not apply this hunk to worktree\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file"
+msgstr ""
+
+#: git-add--interactive.perl:1309
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:1304
+#: git-add--interactive.perl:1340
msgid "The selected hunks do not apply to the index!\n"
msgstr ""
-#: git-add--interactive.perl:1305
+#: git-add--interactive.perl:1341
msgid "Apply them to the worktree anyway? "
msgstr ""
-#: git-add--interactive.perl:1308
+#: git-add--interactive.perl:1344
msgid "Nothing was applied.\n"
msgstr ""
-#: git-add--interactive.perl:1319
+#: git-add--interactive.perl:1355
#, perl-format
msgid "ignoring unmerged: %s\n"
msgstr ""
-#: git-add--interactive.perl:1328
+#: git-add--interactive.perl:1364
msgid "Only binary files changed.\n"
msgstr ""
-#: git-add--interactive.perl:1330
+#: git-add--interactive.perl:1366
msgid "No changes.\n"
msgstr ""
-#: git-add--interactive.perl:1338
+#: git-add--interactive.perl:1374
msgid "Patch update"
msgstr ""
-#: git-add--interactive.perl:1390
+#: git-add--interactive.perl:1426
#, perl-format
msgid "Stage mode change [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1391
+#: git-add--interactive.perl:1427
#, perl-format
msgid "Stage deletion [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1392
+#: git-add--interactive.perl:1428
#, perl-format
msgid "Stage this hunk [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1395
+#: git-add--interactive.perl:1431
#, perl-format
msgid "Stash mode change [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1396
+#: git-add--interactive.perl:1432
#, perl-format
msgid "Stash deletion [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1397
+#: git-add--interactive.perl:1433
#, perl-format
msgid "Stash this hunk [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1400
+#: git-add--interactive.perl:1436
#, perl-format
msgid "Unstage mode change [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1401
+#: git-add--interactive.perl:1437
#, perl-format
msgid "Unstage deletion [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1402
+#: git-add--interactive.perl:1438
#, perl-format
msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1405
+#: git-add--interactive.perl:1441
#, perl-format
msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1406
+#: git-add--interactive.perl:1442
#, perl-format
msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1407
+#: git-add--interactive.perl:1443
#, perl-format
msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1410
+#: git-add--interactive.perl:1446 git-add--interactive.perl:1461
#, perl-format
msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1411
+#: git-add--interactive.perl:1447 git-add--interactive.perl:1462
#, perl-format
msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1412
+#: git-add--interactive.perl:1448 git-add--interactive.perl:1463
#, perl-format
msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1415
+#: git-add--interactive.perl:1451
#, perl-format
msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1416
+#: git-add--interactive.perl:1452
#, perl-format
msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1417
+#: git-add--interactive.perl:1453
#, perl-format
msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1420
+#: git-add--interactive.perl:1456
#, perl-format
msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1421
+#: git-add--interactive.perl:1457
#, perl-format
msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1422
+#: git-add--interactive.perl:1458
#, perl-format
msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1522
+#: git-add--interactive.perl:1466
+#, perl-format
+msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
+msgstr ""
+
+#: git-add--interactive.perl:1467
+#, perl-format
+msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
+msgstr ""
+
+#: git-add--interactive.perl:1468
+#, perl-format
+msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
+msgstr ""
+
+#: git-add--interactive.perl:1568
msgid "No other hunks to goto\n"
msgstr ""
-#: git-add--interactive.perl:1529
+#: git-add--interactive.perl:1575
msgid "go to which hunk (<ret> to see more)? "
msgstr ""
-#: git-add--interactive.perl:1531
+#: git-add--interactive.perl:1577
msgid "go to which hunk? "
msgstr ""
-#: git-add--interactive.perl:1540
+#: git-add--interactive.perl:1586
#, perl-format
msgid "Invalid number: '%s'\n"
msgstr ""
-#: git-add--interactive.perl:1545
+#: git-add--interactive.perl:1591
#, 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:1571
+#: git-add--interactive.perl:1617
msgid "No other hunks to search\n"
msgstr ""
-#: git-add--interactive.perl:1575
+#: git-add--interactive.perl:1621
msgid "search for regex? "
msgstr ""
-#: git-add--interactive.perl:1588
+#: git-add--interactive.perl:1634
#, perl-format
msgid "Malformed search regexp %s: %s\n"
msgstr ""
-#: git-add--interactive.perl:1598
+#: git-add--interactive.perl:1644
msgid "No hunk matches the given pattern\n"
msgstr ""
-#: git-add--interactive.perl:1610 git-add--interactive.perl:1632
+#: git-add--interactive.perl:1656 git-add--interactive.perl:1678
msgid "No previous hunk\n"
msgstr ""
-#: git-add--interactive.perl:1619 git-add--interactive.perl:1638
+#: git-add--interactive.perl:1665 git-add--interactive.perl:1684
msgid "No next hunk\n"
msgstr ""
-#: git-add--interactive.perl:1644
+#: git-add--interactive.perl:1690
msgid "Sorry, cannot split this hunk\n"
msgstr ""
-#: git-add--interactive.perl:1650
+#: git-add--interactive.perl:1696
#, perl-format
msgid "Split into %d hunk.\n"
msgid_plural "Split into %d hunks.\n"
msgstr[0] ""
msgstr[1] ""
-#: git-add--interactive.perl:1660
+#: git-add--interactive.perl:1706
msgid "Sorry, cannot edit this hunk\n"
msgstr ""
-#: git-add--interactive.perl:1706
+#: git-add--interactive.perl:1752
msgid "Review diff"
msgstr ""
#. TRANSLATORS: please do not translate the command names
#. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1725
+#: git-add--interactive.perl:1771
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: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
+#: git-add--interactive.perl:1788 git-add--interactive.perl:1793
+#: git-add--interactive.perl:1796 git-add--interactive.perl:1803
+#: git-add--interactive.perl:1806 git-add--interactive.perl:1813
+#: git-add--interactive.perl:1817 git-add--interactive.perl:1823
msgid "missing --"
msgstr ""
-#: git-add--interactive.perl:1763
+#: git-add--interactive.perl:1819
#, perl-format
msgid "unknown --patch mode: %s"
msgstr ""
-#: git-add--interactive.perl:1769 git-add--interactive.perl:1775
+#: git-add--interactive.perl:1825 git-add--interactive.perl:1831
#, perl-format
msgid "invalid argument %s, expecting --"
msgstr ""
-#: git-send-email.perl:130
+#: git-send-email.perl:138
msgid "local zone differs from GMT by a non-minute interval\n"
msgstr ""
-#: git-send-email.perl:137 git-send-email.perl:143
+#: git-send-email.perl:145 git-send-email.perl:151
msgid "local time offset greater than or equal to 24 hours\n"
msgstr ""
-#: git-send-email.perl:211 git-send-email.perl:217
+#: git-send-email.perl:223 git-send-email.perl:229
msgid "the editor exited uncleanly, aborting everything"
msgstr ""
-#: git-send-email.perl:294
+#: git-send-email.perl:310
#, perl-format
msgid ""
"'%s' contains an intermediate version of the email you were composing.\n"
msgstr ""
-#: git-send-email.perl:299
+#: git-send-email.perl:315
#, perl-format
msgid "'%s.final' contains the composed email.\n"
msgstr ""
-#: git-send-email.perl:317
+#: git-send-email.perl:408
msgid "--dump-aliases incompatible with other options\n"
msgstr ""
-#: git-send-email.perl:383 git-send-email.perl:638
+#: git-send-email.perl:481 git-send-email.perl:683
msgid "Cannot run git format-patch from outside a repository\n"
msgstr ""
-#: git-send-email.perl:386
+#: git-send-email.perl:484
msgid ""
"`batch-size` and `relogin` must be specified together (via command-line or "
"configuration option)\n"
msgstr ""
-#: git-send-email.perl:456
+#: git-send-email.perl:497
#, perl-format
msgid "Unknown --suppress-cc field: '%s'\n"
msgstr ""
-#: git-send-email.perl:485
+#: git-send-email.perl:528
#, perl-format
msgid "Unknown --confirm setting: '%s'\n"
msgstr ""
-#: git-send-email.perl:513
+#: git-send-email.perl:556
#, perl-format
msgid "warning: sendmail alias with quotes is not supported: %s\n"
msgstr ""
-#: git-send-email.perl:515
+#: git-send-email.perl:558
#, perl-format
msgid "warning: `:include:` not supported: %s\n"
msgstr ""
-#: git-send-email.perl:517
+#: git-send-email.perl:560
#, perl-format
msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
msgstr ""
-#: git-send-email.perl:522
+#: git-send-email.perl:565
#, perl-format
msgid "warning: sendmail line is not recognized: %s\n"
msgstr ""
-#: git-send-email.perl:604
+#: git-send-email.perl:649
#, 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:625
+#: git-send-email.perl:670
#, perl-format
msgid "Failed to opendir %s: %s"
msgstr ""
-#: git-send-email.perl:649
+#: git-send-email.perl:694
#, perl-format
msgid ""
"fatal: %s: %s\n"
"warning: no patches were sent\n"
msgstr ""
-#: git-send-email.perl:660
+#: git-send-email.perl:705
msgid ""
"\n"
"No patch files specified!\n"
"\n"
msgstr ""
-#: git-send-email.perl:673
+#: git-send-email.perl:718
#, perl-format
msgid "No subject line in %s?"
msgstr ""
-#: git-send-email.perl:683
+#: git-send-email.perl:728
#, perl-format
msgid "Failed to open for writing %s: %s"
msgstr ""
-#: git-send-email.perl:694
+#: git-send-email.perl:739
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:718
+#: git-send-email.perl:763
#, perl-format
msgid "Failed to open %s: %s"
msgstr ""
-#: git-send-email.perl:735
+#: git-send-email.perl:780
#, perl-format
msgid "Failed to open %s.final: %s"
msgstr ""
-#: git-send-email.perl:778
+#: git-send-email.perl:823
msgid "Summary email is empty, skipping it\n"
msgstr ""
#. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:813
+#: git-send-email.perl:858
#, perl-format
msgid "Are you sure you want to use <%s> [y/N]? "
msgstr ""
-#: git-send-email.perl:868
+#: git-send-email.perl:913
msgid ""
"The following files are 8bit, but do not declare a Content-Transfer-"
"Encoding.\n"
msgstr ""
-#: git-send-email.perl:873
+#: git-send-email.perl:918
msgid "Which 8bit encoding should I declare [UTF-8]? "
msgstr ""
-#: git-send-email.perl:881
+#: git-send-email.perl:926
#, perl-format
msgid ""
"Refusing to send because the patch\n"
"want to send.\n"
msgstr ""
-#: git-send-email.perl:900
+#: git-send-email.perl:945
msgid "To whom should the emails be sent (if anyone)?"
msgstr ""
-#: git-send-email.perl:918
+#: git-send-email.perl:963
#, perl-format
msgid "fatal: alias '%s' expands to itself\n"
msgstr ""
-#: git-send-email.perl:930
+#: git-send-email.perl:975
msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
msgstr ""
-#: git-send-email.perl:988 git-send-email.perl:996
+#: git-send-email.perl:1033 git-send-email.perl:1041
#, 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:1000
+#: git-send-email.perl:1045
msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
msgstr ""
-#: git-send-email.perl:1317
+#: git-send-email.perl:1362
#, perl-format
msgid "CA path \"%s\" does not exist"
msgstr ""
-#: git-send-email.perl:1400
+#: git-send-email.perl:1445
msgid ""
" The Cc list above has been expanded by additional\n"
" addresses found in the patch commit message. By default\n"
#. 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:1415
+#: git-send-email.perl:1460
msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
msgstr ""
-#: git-send-email.perl:1418
+#: git-send-email.perl:1463
msgid "Send this email reply required"
msgstr ""
-#: git-send-email.perl:1446
+#: git-send-email.perl:1491
msgid "The required SMTP server is not properly defined."
msgstr ""
-#: git-send-email.perl:1493
+#: git-send-email.perl:1538
#, perl-format
msgid "Server does not support STARTTLS! %s"
msgstr ""
-#: git-send-email.perl:1498 git-send-email.perl:1502
+#: git-send-email.perl:1543 git-send-email.perl:1547
#, perl-format
msgid "STARTTLS failed! %s"
msgstr ""
-#: git-send-email.perl:1511
+#: git-send-email.perl:1556
msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
msgstr ""
-#: git-send-email.perl:1529
+#: git-send-email.perl:1574
#, perl-format
msgid "Failed to send %s\n"
msgstr ""
-#: git-send-email.perl:1532
+#: git-send-email.perl:1577
#, perl-format
msgid "Dry-Sent %s\n"
msgstr ""
-#: git-send-email.perl:1532
+#: git-send-email.perl:1577
#, perl-format
msgid "Sent %s\n"
msgstr ""
-#: git-send-email.perl:1534
+#: git-send-email.perl:1579
msgid "Dry-OK. Log says:\n"
msgstr ""
-#: git-send-email.perl:1534
+#: git-send-email.perl:1579
msgid "OK. Log says:\n"
msgstr ""
-#: git-send-email.perl:1546
+#: git-send-email.perl:1591
msgid "Result: "
msgstr ""
-#: git-send-email.perl:1549
+#: git-send-email.perl:1594
msgid "Result: OK\n"
msgstr ""
-#: git-send-email.perl:1567
+#: git-send-email.perl:1612
#, perl-format
msgid "can't open file %s"
msgstr ""
-#: git-send-email.perl:1614 git-send-email.perl:1634
+#: git-send-email.perl:1659 git-send-email.perl:1679
#, perl-format
msgid "(mbox) Adding cc: %s from line '%s'\n"
msgstr ""
-#: git-send-email.perl:1620
+#: git-send-email.perl:1665
#, perl-format
msgid "(mbox) Adding to: %s from line '%s'\n"
msgstr ""
-#: git-send-email.perl:1673
+#: git-send-email.perl:1718
#, perl-format
msgid "(non-mbox) Adding cc: %s from line '%s'\n"
msgstr ""
-#: git-send-email.perl:1698
+#: git-send-email.perl:1753
#, perl-format
msgid "(body) Adding cc: %s from line '%s'\n"
msgstr ""
-#: git-send-email.perl:1809
+#: git-send-email.perl:1864
#, perl-format
msgid "(%s) Could not execute '%s'"
msgstr ""
-#: git-send-email.perl:1816
+#: git-send-email.perl:1871
#, perl-format
msgid "(%s) Adding %s: %s from: '%s'\n"
msgstr ""
-#: git-send-email.perl:1820
+#: git-send-email.perl:1875
#, perl-format
msgid "(%s) failed to close pipe to '%s'"
msgstr ""
-#: git-send-email.perl:1850
+#: git-send-email.perl:1905
msgid "cannot send message as 7bit"
msgstr ""
-#: git-send-email.perl:1858
+#: git-send-email.perl:1913
msgid "invalid transfer encoding"
msgstr ""
-#: git-send-email.perl:1899 git-send-email.perl:1951 git-send-email.perl:1961
+#: git-send-email.perl:1954 git-send-email.perl:2006 git-send-email.perl:2016
#, perl-format
msgid "unable to open %s: %s\n"
msgstr ""
-#: git-send-email.perl:1902
+#: git-send-email.perl:1957
#, perl-format
msgid "%s: patch contains a line longer than 998 characters"
msgstr ""
-#: git-send-email.perl:1919
+#: git-send-email.perl:1974
#, perl-format
msgid "Skipping %s with backup suffix '%s'.\n"
msgstr ""
#. TRANSLATORS: please keep "[y|N]" as is.
-#: git-send-email.perl:1923
+#: git-send-email.perl:1978
#, perl-format
msgid "Do you really want to send %s? [y|N]: "
msgstr ""