msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2017-07-24 21:54+0800\n"
+"POT-Creation-Date: 2019-06-04 08:24+0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
-#: advice.c:58
+#: advice.c:103
#, c-format
-msgid "hint: %.*s\n"
+msgid "%shint: %.*s%s\n"
msgstr ""
-#: advice.c:86
+#: advice.c:156
msgid "Cherry-picking is not possible because you have unmerged files."
msgstr ""
-#: advice.c:88
+#: advice.c:158
msgid "Committing is not possible because you have unmerged files."
msgstr ""
-#: advice.c:90
+#: advice.c:160
msgid "Merging is not possible because you have unmerged files."
msgstr ""
-#: advice.c:92
+#: advice.c:162
msgid "Pulling is not possible because you have unmerged files."
msgstr ""
-#: advice.c:94
+#: advice.c:164
msgid "Reverting is not possible because you have unmerged files."
msgstr ""
-#: advice.c:96
+#: advice.c:166
#, c-format
msgid "It is not possible to %s because you have unmerged files."
msgstr ""
-#: advice.c:104
+#: advice.c:174
msgid ""
"Fix them up in the work tree, and then use 'git add/rm <file>'\n"
"as appropriate to mark resolution and make a commit."
msgstr ""
-#: advice.c:112
+#: advice.c:182
msgid "Exiting because of an unresolved conflict."
msgstr ""
-#: advice.c:117 builtin/merge.c:1184
+#: advice.c:187 builtin/merge.c:1320
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr ""
-#: advice.c:119
+#: advice.c:189
msgid "Please, commit your changes before merging."
msgstr ""
-#: advice.c:120
+#: advice.c:190
msgid "Exiting because of unfinished merge."
msgstr ""
-#: advice.c:126
+#: advice.c:196
#, c-format
msgid ""
"Note: checking out '%s'.\n"
"\n"
msgstr ""
-#: apply.c:58
+#: alias.c:50
+msgid "cmdline ends with \\"
+msgstr ""
+
+#: alias.c:51
+msgid "unclosed quote"
+msgstr ""
+
+#: apply.c:63
#, c-format
msgid "unrecognized whitespace option '%s'"
msgstr ""
-#: apply.c:74
+#: apply.c:79
#, c-format
msgid "unrecognized whitespace ignore option '%s'"
msgstr ""
-#: apply.c:126
+#: apply.c:129
msgid "--reject and --3way cannot be used together."
msgstr ""
-#: apply.c:128
+#: apply.c:131
msgid "--cached and --3way cannot be used together."
msgstr ""
-#: apply.c:131
+#: apply.c:134
msgid "--3way outside a repository"
msgstr ""
-#: apply.c:142
+#: apply.c:145
msgid "--index outside a repository"
msgstr ""
-#: apply.c:145
+#: apply.c:148
msgid "--cached outside a repository"
msgstr ""
-#: apply.c:836
+#: apply.c:829
#, c-format
msgid "Cannot prepare timestamp regexp %s"
msgstr ""
-#: apply.c:845
+#: apply.c:838
#, c-format
msgid "regexec returned %d for input: %s"
msgstr ""
-#: apply.c:929
+#: apply.c:912
#, c-format
msgid "unable to find filename in patch at line %d"
msgstr ""
-#: apply.c:967
+#: apply.c:950
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
msgstr ""
-#: apply.c:973
+#: apply.c:956
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr ""
-#: apply.c:974
+#: apply.c:957
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr ""
-#: apply.c:979
+#: apply.c:962
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr ""
-#: apply.c:1008
+#: apply.c:991
#, c-format
msgid "invalid mode on line %d: %s"
msgstr ""
-#: apply.c:1326
+#: apply.c:1310
#, c-format
msgid "inconsistent header lines %d and %d"
msgstr ""
-#: apply.c:1498
+#: apply.c:1482
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr ""
-#: apply.c:1567
+#: apply.c:1551
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr ""
-#: apply.c:1587
+#: apply.c:1571
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
msgstr[0] ""
msgstr[1] ""
-#: apply.c:1600
+#: apply.c:1584
#, c-format
msgid "git diff header lacks filename information (line %d)"
msgstr ""
-#: apply.c:1770
+#: apply.c:1772
msgid "new file depends on old contents"
msgstr ""
-#: apply.c:1772
+#: apply.c:1774
msgid "deleted file still has contents"
msgstr ""
-#: apply.c:1806
+#: apply.c:1808
#, c-format
msgid "corrupt patch at line %d"
msgstr ""
-#: apply.c:1843
+#: apply.c:1845
#, c-format
msgid "new file %s depends on old contents"
msgstr ""
-#: apply.c:1845
+#: apply.c:1847
#, c-format
msgid "deleted file %s still has contents"
msgstr ""
-#: apply.c:1848
+#: apply.c:1850
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr ""
-#: apply.c:1995
+#: apply.c:1997
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr ""
-#: apply.c:2032
+#: apply.c:2034
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr ""
-#: apply.c:2193
+#: apply.c:2196
#, c-format
msgid "patch with only garbage at line %d"
msgstr ""
-#: apply.c:2276
+#: apply.c:2282
#, c-format
msgid "unable to read symlink %s"
msgstr ""
-#: apply.c:2280
+#: apply.c:2286
#, c-format
msgid "unable to open or read %s"
msgstr ""
-#: apply.c:2933
+#: apply.c:2945
#, c-format
msgid "invalid start of line: '%c'"
msgstr ""
-#: apply.c:3052
+#: apply.c:3066
#, c-format
msgid "Hunk #%d succeeded at %d (offset %d line)."
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
msgstr[0] ""
msgstr[1] ""
-#: apply.c:3064
+#: apply.c:3078
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr ""
-#: apply.c:3070
+#: apply.c:3084
#, c-format
msgid ""
"while searching for:\n"
"%.*s"
msgstr ""
-#: apply.c:3092
+#: apply.c:3106
#, c-format
msgid "missing binary patch data for '%s'"
msgstr ""
-#: apply.c:3100
+#: apply.c:3114
#, c-format
msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
msgstr ""
-#: apply.c:3146
+#: apply.c:3161
#, c-format
msgid "cannot apply binary patch to '%s' without full index line"
msgstr ""
-#: apply.c:3156
+#: apply.c:3171
#, c-format
msgid ""
"the patch applies to '%s' (%s), which does not match the current contents."
msgstr ""
-#: apply.c:3164
+#: apply.c:3179
#, c-format
msgid "the patch applies to an empty '%s' but it is not empty"
msgstr ""
-#: apply.c:3182
+#: apply.c:3197
#, c-format
msgid "the necessary postimage %s for '%s' cannot be read"
msgstr ""
-#: apply.c:3195
+#: apply.c:3210
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr ""
-#: apply.c:3201
+#: apply.c:3216
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr ""
-#: apply.c:3222
+#: apply.c:3237
#, c-format
msgid "patch failed: %s:%ld"
msgstr ""
-#: apply.c:3344
+#: apply.c:3360
#, c-format
msgid "cannot checkout %s"
msgstr ""
-#: apply.c:3392 apply.c:3403 apply.c:3449 setup.c:277
+#: apply.c:3412 apply.c:3423 apply.c:3469 midx.c:59 setup.c:279
#, c-format
msgid "failed to read %s"
msgstr ""
-#: apply.c:3400
+#: apply.c:3420
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr ""
-#: apply.c:3429 apply.c:3669
+#: apply.c:3449 apply.c:3692
#, c-format
msgid "path %s has been renamed/deleted"
msgstr ""
-#: apply.c:3512 apply.c:3683
+#: apply.c:3535 apply.c:3707
#, c-format
msgid "%s: does not exist in index"
msgstr ""
-#: apply.c:3521 apply.c:3691
+#: apply.c:3544 apply.c:3715
#, c-format
msgid "%s: does not match index"
msgstr ""
-#: apply.c:3556
+#: apply.c:3579
msgid "repository lacks the necessary blob to fall back on 3-way merge."
msgstr ""
-#: apply.c:3559
+#: apply.c:3582
#, c-format
msgid "Falling back to three-way merge...\n"
msgstr ""
-#: apply.c:3575 apply.c:3579
+#: apply.c:3598 apply.c:3602
#, c-format
msgid "cannot read the current contents of '%s'"
msgstr ""
-#: apply.c:3591
+#: apply.c:3614
#, c-format
msgid "Failed to fall back on three-way merge...\n"
msgstr ""
-#: apply.c:3605
+#: apply.c:3628
#, c-format
msgid "Applied patch to '%s' with conflicts.\n"
msgstr ""
-#: apply.c:3610
+#: apply.c:3633
#, c-format
msgid "Applied patch to '%s' cleanly.\n"
msgstr ""
-#: apply.c:3636
+#: apply.c:3659
msgid "removal patch leaves file contents"
msgstr ""
-#: apply.c:3708
+#: apply.c:3732
#, c-format
msgid "%s: wrong type"
msgstr ""
-#: apply.c:3710
+#: apply.c:3734
#, c-format
msgid "%s has type %o, expected %o"
msgstr ""
-#: apply.c:3860 apply.c:3862
+#: apply.c:3885 apply.c:3887 read-cache.c:830 read-cache.c:856
+#: read-cache.c:1309
#, c-format
msgid "invalid path '%s'"
msgstr ""
-#: apply.c:3918
+#: apply.c:3943
#, c-format
msgid "%s: already exists in index"
msgstr ""
-#: apply.c:3921
+#: apply.c:3946
#, c-format
msgid "%s: already exists in working directory"
msgstr ""
-#: apply.c:3941
+#: apply.c:3966
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr ""
-#: apply.c:3946
+#: apply.c:3971
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr ""
-#: apply.c:3966
+#: apply.c:3991
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr ""
-#: apply.c:3970
+#: apply.c:3995
#, c-format
msgid "%s: patch does not apply"
msgstr ""
-#: apply.c:3985
+#: apply.c:4010
#, c-format
msgid "Checking patch %s..."
msgstr ""
-#: apply.c:4076
+#: apply.c:4102
#, c-format
msgid "sha1 information is lacking or useless for submodule %s"
msgstr ""
-#: apply.c:4083
+#: apply.c:4109
#, c-format
msgid "mode change for %s, which is not in current HEAD"
msgstr ""
-#: apply.c:4086
+#: apply.c:4112
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr ""
-#: apply.c:4091 builtin/checkout.c:235 builtin/reset.c:138
+#: apply.c:4117 builtin/checkout.c:257 builtin/reset.c:143
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr ""
-#: apply.c:4095
+#: apply.c:4121
#, c-format
msgid "could not add %s to temporary index"
msgstr ""
-#: apply.c:4105
+#: apply.c:4131
#, c-format
msgid "could not write temporary index to %s"
msgstr ""
-#: apply.c:4243
+#: apply.c:4269
#, c-format
msgid "unable to remove %s from index"
msgstr ""
-#: apply.c:4278
+#: apply.c:4303
#, c-format
msgid "corrupt patch for submodule %s"
msgstr ""
-#: apply.c:4284
+#: apply.c:4309
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr ""
-#: apply.c:4292
+#: apply.c:4317
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr ""
-#: apply.c:4298 apply.c:4442
+#: apply.c:4323 apply.c:4468
#, c-format
msgid "unable to add cache entry for %s"
msgstr ""
-#: apply.c:4339
+#: apply.c:4366
#, c-format
msgid "failed to write to '%s'"
msgstr ""
-#: apply.c:4343
+#: apply.c:4370
#, c-format
msgid "closing file '%s'"
msgstr ""
-#: apply.c:4413
+#: apply.c:4440
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr ""
-#: apply.c:4511
+#: apply.c:4538
#, c-format
msgid "Applied patch %s cleanly."
msgstr ""
-#: apply.c:4519
+#: apply.c:4546
msgid "internal error"
msgstr ""
-#: apply.c:4522
+#: apply.c:4549
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] ""
msgstr[1] ""
-#: apply.c:4533
+#: apply.c:4560
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr ""
-#: apply.c:4541 builtin/fetch.c:738 builtin/fetch.c:988
+#: apply.c:4568 builtin/fetch.c:837 builtin/fetch.c:1118
#, c-format
msgid "cannot open %s"
msgstr ""
-#: apply.c:4555
+#: apply.c:4582
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr ""
-#: apply.c:4559
+#: apply.c:4586
#, c-format
msgid "Rejected hunk #%d."
msgstr ""
-#: apply.c:4669
+#: apply.c:4696
#, c-format
msgid "Skipped patch '%s'."
msgstr ""
-#: apply.c:4677
+#: apply.c:4704
msgid "unrecognized input"
msgstr ""
-#: apply.c:4696
+#: apply.c:4724
msgid "unable to read index file"
msgstr ""
-#: apply.c:4833
+#: apply.c:4879
#, c-format
msgid "can't open patch '%s': %s"
msgstr ""
-#: apply.c:4860
+#: apply.c:4906
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] ""
msgstr[1] ""
-#: apply.c:4866 apply.c:4881
+#: apply.c:4912 apply.c:4927
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgstr[0] ""
msgstr[1] ""
-#: apply.c:4874
+#: apply.c:4920
#, c-format
msgid "%d line applied after fixing whitespace errors."
msgid_plural "%d lines applied after fixing whitespace errors."
msgstr[0] ""
msgstr[1] ""
-#: apply.c:4890 builtin/add.c:513 builtin/mv.c:299 builtin/rm.c:391
+#: apply.c:4936 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390
msgid "Unable to write new index file"
msgstr ""
-#: apply.c:4921 apply.c:4924 builtin/am.c:2257 builtin/am.c:2260
-#: builtin/clone.c:115 builtin/fetch.c:93 builtin/pull.c:187
-#: builtin/submodule--helper.c:304 builtin/submodule--helper.c:629
-#: builtin/submodule--helper.c:632 builtin/submodule--helper.c:973
-#: builtin/submodule--helper.c:976 builtin/submodule--helper.c:1161
-#: git-add--interactive.perl:197
+#: apply.c:4963 apply.c:4966 builtin/am.c:2210 builtin/am.c:2213
+#: builtin/clone.c:120 builtin/fetch.c:118 builtin/merge.c:271
+#: builtin/pull.c:207 builtin/submodule--helper.c:407
+#: builtin/submodule--helper.c:1366 builtin/submodule--helper.c:1369
+#: builtin/submodule--helper.c:1849 builtin/submodule--helper.c:1852
+#: builtin/submodule--helper.c:2091 git-add--interactive.perl:197
msgid "path"
msgstr ""
-#: apply.c:4922
+#: apply.c:4964
msgid "don't apply changes matching the given path"
msgstr ""
-#: apply.c:4925
+#: apply.c:4967
msgid "apply changes matching the given path"
msgstr ""
-#: apply.c:4927 builtin/am.c:2266
+#: apply.c:4969 builtin/am.c:2219
msgid "num"
msgstr ""
-#: apply.c:4928
+#: apply.c:4970
msgid "remove <num> leading slashes from traditional diff paths"
msgstr ""
-#: apply.c:4931
+#: apply.c:4973
msgid "ignore additions made by the patch"
msgstr ""
-#: apply.c:4933
+#: apply.c:4975
msgid "instead of applying the patch, output diffstat for the input"
msgstr ""
-#: apply.c:4937
+#: apply.c:4979
msgid "show number of added and deleted lines in decimal notation"
msgstr ""
-#: apply.c:4939
+#: apply.c:4981
msgid "instead of applying the patch, output a summary for the input"
msgstr ""
-#: apply.c:4941
+#: apply.c:4983
msgid "instead of applying the patch, see if the patch is applicable"
msgstr ""
-#: apply.c:4943
+#: apply.c:4985
msgid "make sure the patch is applicable to the current index"
msgstr ""
-#: apply.c:4945
+#: apply.c:4987
+msgid "mark new files with `git add --intent-to-add`"
+msgstr ""
+
+#: apply.c:4989
msgid "apply a patch without touching the working tree"
msgstr ""
-#: apply.c:4947
+#: apply.c:4991
msgid "accept a patch that touches outside the working area"
msgstr ""
-#: apply.c:4949
+#: apply.c:4994
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr ""
-#: apply.c:4951
+#: apply.c:4996
msgid "attempt three-way merge if a patch does not apply"
msgstr ""
-#: apply.c:4953
+#: apply.c:4998
msgid "build a temporary index based on embedded index information"
msgstr ""
-#: apply.c:4956 builtin/checkout-index.c:170 builtin/ls-files.c:515
+#: apply.c:5001 builtin/checkout-index.c:173 builtin/ls-files.c:524
msgid "paths are separated with NUL character"
msgstr ""
-#: apply.c:4958
+#: apply.c:5003
msgid "ensure at least <n> lines of context match"
msgstr ""
-#: apply.c:4959 builtin/am.c:2245
+#: apply.c:5004 builtin/am.c:2198 builtin/interpret-trailers.c:97
+#: builtin/interpret-trailers.c:99 builtin/interpret-trailers.c:101
+#: builtin/pack-objects.c:3317 builtin/rebase.c:1415
msgid "action"
msgstr ""
-#: apply.c:4960
+#: apply.c:5005
msgid "detect new or modified lines that have whitespace errors"
msgstr ""
-#: apply.c:4963 apply.c:4966
+#: apply.c:5008 apply.c:5011
msgid "ignore changes in whitespace when finding context"
msgstr ""
-#: apply.c:4969
+#: apply.c:5014
msgid "apply the patch in reverse"
msgstr ""
-#: apply.c:4971
+#: apply.c:5016
msgid "don't expect at least one line of context"
msgstr ""
-#: apply.c:4973
+#: apply.c:5018
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr ""
-#: apply.c:4975
+#: apply.c:5020
msgid "allow overlapping hunks"
msgstr ""
-#: apply.c:4976 builtin/add.c:270 builtin/check-ignore.c:21
-#: builtin/commit.c:1340 builtin/count-objects.c:95 builtin/fsck.c:651
-#: builtin/log.c:1877 builtin/mv.c:123 builtin/read-tree.c:125
+#: apply.c:5021 builtin/add.c:291 builtin/check-ignore.c:22
+#: builtin/commit.c:1317 builtin/count-objects.c:98 builtin/fsck.c:786
+#: builtin/log.c:2045 builtin/mv.c:123 builtin/read-tree.c:128
msgid "be verbose"
msgstr ""
-#: apply.c:4978
+#: apply.c:5023
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr ""
-#: apply.c:4981
+#: apply.c:5026
msgid "do not trust the line counts in the hunk headers"
msgstr ""
-#: apply.c:4983 builtin/am.c:2254
+#: apply.c:5028 builtin/am.c:2207
msgid "root"
msgstr ""
-#: apply.c:4984
+#: apply.c:5029
msgid "prepend <root> to all filenames"
msgstr ""
-#: archive.c:13
+#: archive.c:14
msgid "git archive [<options>] <tree-ish> [<path>...]"
msgstr ""
-#: archive.c:14
+#: archive.c:15
msgid "git archive --list"
msgstr ""
-#: archive.c:15
+#: archive.c:16
msgid ""
"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
msgstr ""
-#: archive.c:16
+#: archive.c:17
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr ""
-#: archive.c:333 builtin/add.c:154 builtin/add.c:492 builtin/rm.c:300
+#: archive.c: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:418
+#: 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:424
+msgid "current working directory is untracked"
+msgstr ""
+
+#: archive.c:455
msgid "fmt"
msgstr ""
-#: archive.c:418
+#: archive.c:455
msgid "archive format"
msgstr ""
-#: archive.c:419 builtin/log.c:1446
+#: archive.c:456 builtin/log.c:1557
msgid "prefix"
msgstr ""
-#: archive.c:420
+#: archive.c:457
msgid "prepend prefix to each pathname in the archive"
msgstr ""
-#: archive.c:421 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:61
-#: builtin/fast-export.c:989 builtin/fast-export.c:991 builtin/grep.c:1080
-#: builtin/hash-object.c:102 builtin/ls-files.c:549 builtin/ls-files.c:552
-#: builtin/notes.c:404 builtin/notes.c:567 builtin/read-tree.c:120
-#: parse-options.h:153
+#: archive.c:458 builtin/blame.c:821 builtin/blame.c:822
+#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1091
+#: builtin/fast-export.c:1093 builtin/grep.c:895 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:422 builtin/archive.c:89
+#: archive.c:459 builtin/archive.c:90
msgid "write the archive to this file"
msgstr ""
-#: archive.c:424
+#: archive.c:461
msgid "read .gitattributes in working directory"
msgstr ""
-#: archive.c:425
+#: archive.c:462
msgid "report archived files on stderr"
msgstr ""
-#: archive.c:426
+#: archive.c:463
msgid "store only"
msgstr ""
-#: archive.c:427
+#: archive.c:464
msgid "compress faster"
msgstr ""
-#: archive.c:435
+#: archive.c:472
msgid "compress better"
msgstr ""
-#: archive.c:438
+#: archive.c:475
msgid "list supported archive formats"
msgstr ""
-#: archive.c:440 builtin/archive.c:90 builtin/clone.c:105 builtin/clone.c:108
-#: builtin/submodule--helper.c:641 builtin/submodule--helper.c:982
+#: archive.c:477 builtin/archive.c:91 builtin/clone.c:110 builtin/clone.c:113
+#: builtin/submodule--helper.c:1378 builtin/submodule--helper.c:1858
msgid "repo"
msgstr ""
-#: archive.c:441 builtin/archive.c:91
+#: archive.c:478 builtin/archive.c:92
msgid "retrieve the archive from remote repository <repo>"
msgstr ""
-#: archive.c:442 builtin/archive.c:92 builtin/notes.c:488
+#: archive.c:479 builtin/archive.c:93 builtin/difftool.c:707
+#: builtin/notes.c:498
msgid "command"
msgstr ""
-#: archive.c:443 builtin/archive.c:93
+#: archive.c:480 builtin/archive.c:94
msgid "path to the remote git-upload-archive command"
msgstr ""
-#: archive.c:450
+#: archive.c:487
msgid "Unexpected option --remote"
msgstr ""
-#: archive.c:452
+#: archive.c:489
msgid "Option --exec can only be used together with --remote"
msgstr ""
-#: archive.c:454
+#: archive.c:491
msgid "Unexpected option --output"
msgstr ""
-#: archive.c:476
+#: archive.c:513
#, c-format
msgid "Unknown archive format '%s'"
msgstr ""
-#: archive.c:483
+#: archive.c:520
#, c-format
msgid "Argument not supported for format '%s': -%d"
msgstr ""
-#: attr.c:214
+#: archive-tar.c:125 archive-zip.c:345
+#, c-format
+msgid "cannot stream blob %s"
+msgstr ""
+
+#: 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:353
+#, c-format
+msgid "cannot read %s"
+msgstr ""
+
+#: archive-tar.c:459
+#, c-format
+msgid "unable to start '%s' filter"
+msgstr ""
+
+#: archive-tar.c:462
+msgid "unable to redirect descriptor"
+msgstr ""
+
+#: archive-tar.c:469
+#, c-format
+msgid "'%s' filter reported error"
+msgstr ""
+
+#: archive-zip.c:314
+#, c-format
+msgid "path is not valid UTF-8: %s"
+msgstr ""
+
+#: archive-zip.c:318
+#, c-format
+msgid "path too long (%d chars, SHA1: %s): %s"
+msgstr ""
+
+#: archive-zip.c:474 builtin/pack-objects.c:226 builtin/pack-objects.c:229
+#, c-format
+msgid "deflate error (%d)"
+msgstr ""
+
+#: archive-zip.c:609
+#, c-format
+msgid "timestamp too large for this system: %<PRIuMAX>"
+msgstr ""
+
+#: attr.c:211
#, c-format
msgid "%.*s is not a valid attribute name"
msgstr ""
-#: attr.c:410
+#: 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:447
+#: bisect.c:468
#, c-format
msgid "Badly quoted content in file '%s': %s"
msgstr ""
-#: bisect.c:655
+#: bisect.c:678
#, c-format
msgid "We cannot bisect more!\n"
msgstr ""
-#: bisect.c:708
+#: bisect.c:733
#, c-format
msgid "Not a valid commit name %s"
msgstr ""
-#: bisect.c:732
+#: 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:737
+#: 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:742
+#: 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:750
+#: 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:763
+#: bisect.c:789
#, c-format
msgid ""
"the merge base between %s and [%s] must be skipped.\n"
"We continue anyway."
msgstr ""
-#: bisect.c:798
+#: bisect.c:822
#, c-format
msgid "Bisecting: a merge base must be tested\n"
msgstr ""
-#: bisect.c:849
+#: bisect.c:865
#, c-format
msgid "a %s revision is needed"
msgstr ""
-#: bisect.c:866 builtin/notes.c:175 builtin/tag.c:256
+#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:248
#, c-format
msgid "could not create file '%s'"
msgstr ""
-#: bisect.c:917
+#: bisect.c:928 builtin/merge.c:146
#, c-format
msgid "could not read file '%s'"
msgstr ""
-#: bisect.c:947
+#: bisect.c:958
msgid "reading bisect refs failed"
msgstr ""
-#: bisect.c:967
+#: bisect.c:977
#, c-format
msgid "%s was both %s and %s\n"
msgstr ""
-#: bisect.c:975
+#: bisect.c:985
#, c-format
msgid ""
"No testable commit found.\n"
"Maybe you started with bad path parameters?\n"
msgstr ""
-#: bisect.c:994
+#: 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:1000
+#: 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:1757
+#: blame.c:1794
msgid "--contents and --reverse do not blend well."
msgstr ""
-#: blame.c:1768
+#: blame.c:1808
msgid "cannot use --contents with final commit object name"
msgstr ""
-#: blame.c:1788
+#: blame.c:1829
msgid "--reverse and --first-parent together require specified latest commit"
msgstr ""
-#: blame.c:1797 bundle.c:164 ref-filter.c:1919 sequencer.c:1166
-#: sequencer.c:2328 builtin/commit.c:1058 builtin/log.c:356 builtin/log.c:907
-#: builtin/log.c:1357 builtin/log.c:1683 builtin/log.c:1926 builtin/merge.c:360
-#: builtin/shortlog.c:177
+#: blame.c:1838 bundle.c:164 ref-filter.c:2077 remote.c:1938 sequencer.c:2030
+#: sequencer.c:4224 builtin/commit.c:1017 builtin/log.c:382 builtin/log.c:940
+#: builtin/log.c:1428 builtin/log.c:1804 builtin/log.c:2094 builtin/merge.c:415
+#: builtin/pack-objects.c:3140 builtin/pack-objects.c:3155
+#: builtin/shortlog.c:192
msgid "revision walk setup failed"
msgstr ""
-#: blame.c:1815
+#: blame.c:1856
msgid ""
"--reverse --first-parent together require range along first-parent chain"
msgstr ""
-#: blame.c:1826
+#: blame.c:1867
#, c-format
msgid "no such path %s in %s"
msgstr ""
-#: blame.c:1837
+#: blame.c:1878
#, c-format
msgid "cannot read blob %s for path %s"
msgstr ""
#: branch.c:93
#, c-format
-msgid "Branch %s set up to track remote branch %s from %s by rebasing."
+msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
msgstr ""
#: branch.c:94
#, c-format
-msgid "Branch %s set up to track remote branch %s from %s."
+msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
msgstr ""
#: branch.c:98
#, c-format
-msgid "Branch %s set up to track local branch %s by rebasing."
+msgid "Branch '%s' set up to track local branch '%s' by rebasing."
msgstr ""
#: branch.c:99
#, c-format
-msgid "Branch %s set up to track local branch %s."
+msgid "Branch '%s' set up to track local branch '%s'."
msgstr ""
#: branch.c:104
#, c-format
-msgid "Branch %s set up to track remote ref %s by rebasing."
+msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
msgstr ""
#: branch.c:105
#, c-format
-msgid "Branch %s set up to track remote ref %s."
+msgid "Branch '%s' set up to track remote ref '%s'."
msgstr ""
#: branch.c:109
#, c-format
-msgid "Branch %s set up to track local ref %s by rebasing."
+msgid "Branch '%s' set up to track local ref '%s' by rebasing."
msgstr ""
#: branch.c:110
#, c-format
-msgid "Branch %s set up to track local ref %s."
+msgid "Branch '%s' set up to track local ref '%s'."
msgstr ""
#: branch.c:119
msgid "Not tracking: ambiguous information for ref %s"
msgstr ""
-#: branch.c:185
+#: branch.c:189
#, c-format
msgid "'%s' is not a valid branch name."
msgstr ""
-#: branch.c:190
+#: branch.c:208
#, c-format
msgid "A branch named '%s' already exists."
msgstr ""
-#: branch.c:198
+#: branch.c:213
msgid "Cannot force update the current branch."
msgstr ""
-#: branch.c:218
+#: branch.c:233
#, c-format
msgid "Cannot setup tracking information; starting point '%s' is not a branch."
msgstr ""
-#: branch.c:220
+#: branch.c:235
#, c-format
msgid "the requested upstream branch '%s' does not exist"
msgstr ""
-#: branch.c:222
+#: branch.c:237
msgid ""
"\n"
"If you are planning on basing your work on an upstream\n"
"\"git push -u\" to set the upstream config as you push."
msgstr ""
-#: branch.c:265
+#: branch.c:281
#, c-format
msgid "Not a valid object name: '%s'."
msgstr ""
-#: branch.c:285
+#: branch.c:301
#, c-format
msgid "Ambiguous object name: '%s'."
msgstr ""
-#: branch.c:290
+#: branch.c:306
#, c-format
msgid "Not a valid branch point: '%s'."
msgstr ""
-#: branch.c:344
+#: branch.c:359
#, c-format
msgid "'%s' is already checked out at '%s'"
msgstr ""
-#: branch.c:366
+#: branch.c:382
#, c-format
msgid "HEAD of working tree %s is not updated"
msgstr ""
-#: bundle.c:34
+#: bundle.c:36
#, c-format
msgid "'%s' does not look like a v2 bundle file"
msgstr ""
-#: bundle.c:62
+#: bundle.c:64
#, c-format
msgid "unrecognized header: %s%s (%d)"
msgstr ""
-#: bundle.c:88 sequencer.c:1344 sequencer.c:1770 builtin/commit.c:778
+#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2281 sequencer.c:2916
+#: builtin/commit.c:788
#, c-format
msgid "could not open '%s'"
msgstr ""
-#: bundle.c:140
+#: bundle.c:143
msgid "Repository lacks these prerequisite commits:"
msgstr ""
-#: bundle.c:186
+#: bundle.c:194
#, c-format
msgid "The bundle contains this ref:"
msgid_plural "The bundle contains these %d refs:"
msgstr[0] ""
msgstr[1] ""
-#: bundle.c:193
+#: bundle.c:201
msgid "The bundle records a complete history."
msgstr ""
-#: bundle.c:195
+#: bundle.c:203
#, c-format
msgid "The bundle requires this ref:"
msgid_plural "The bundle requires these %d refs:"
msgstr[0] ""
msgstr[1] ""
-#: bundle.c:254
+#: bundle.c:269
+msgid "unable to dup bundle descriptor"
+msgstr ""
+
+#: bundle.c:276
msgid "Could not spawn pack-objects"
msgstr ""
-#: bundle.c:265
+#: bundle.c:287
msgid "pack-objects died"
msgstr ""
-#: bundle.c:307
+#: bundle.c:329
msgid "rev-list died"
msgstr ""
-#: bundle.c:356
+#: bundle.c:378
#, c-format
msgid "ref '%s' is excluded by the rev-list options"
msgstr ""
-#: bundle.c:446 builtin/log.c:173 builtin/log.c:1589 builtin/shortlog.c:282
+#: bundle.c:457 builtin/log.c:197 builtin/log.c:1709 builtin/shortlog.c:306
#, c-format
msgid "unrecognized argument: %s"
msgstr ""
-#: bundle.c:454
+#: bundle.c:465
msgid "Refusing to create empty bundle."
msgstr ""
-#: bundle.c:466
+#: bundle.c:475
#, c-format
msgid "cannot create '%s'"
msgstr ""
-#: bundle.c:494
+#: bundle.c:500
msgid "index-pack died"
msgstr ""
-#: color.c:301
+#: color.c:296
#, c-format
msgid "invalid color value: %.*s"
msgstr ""
-#: commit.c:41 sequencer.c:1582 builtin/am.c:420 builtin/am.c:456
-#: builtin/am.c:1469 builtin/am.c:2107
+#: commit.c:50 sequencer.c:2697 builtin/am.c:355 builtin/am.c:399
+#: builtin/am.c:1377 builtin/am.c:2022 builtin/replace.c:455
#, c-format
msgid "could not parse %s"
msgstr ""
-#: commit.c:43
+#: commit.c:52
#, c-format
msgid "%s %s is not a commit!"
msgstr ""
-#: commit.c:1511
+#: commit.c:193
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"
+"Support for <GIT_DIR>/info/grafts is deprecated\n"
+"and will be removed in a future Git version.\n"
+"\n"
+"Please use \"git replace --convert-graft-file\"\n"
+"to convert the grafts into replace refs.\n"
+"\n"
+"Turn this message off by running\n"
+"\"git config advice.graftFileDeprecated false\""
msgstr ""
-#: compat/obstack.c:406 compat/obstack.c:408
-msgid "memory exhausted"
+#: commit.c:1128
+#, c-format
+msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr ""
-#: config.c:186
-msgid "relative config include conditionals must come from files"
+#: commit.c:1131
+#, c-format
+msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr ""
-#: config.c:720
+#: commit.c:1134
#, c-format
-msgid "bad config line %d in blob %s"
+msgid "Commit %s does not have a GPG signature."
msgstr ""
-#: config.c:724
+#: commit.c:1137
#, c-format
-msgid "bad config line %d in file %s"
+msgid "Commit %s has a good GPG signature by %s\n"
msgstr ""
-#: config.c:728
-#, c-format
-msgid "bad config line %d in standard input"
+#: commit.c:1391
+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 ""
-#: config.c:732
-#, c-format
-msgid "bad config line %d in submodule-blob %s"
+#: commit-graph.c:105
+msgid "commit-graph file is too small"
msgstr ""
-#: config.c:736
+#: commit-graph.c:170
#, c-format
-msgid "bad config line %d in command line %s"
+msgid "commit-graph signature %X does not match signature %X"
msgstr ""
-#: config.c:740
+#: commit-graph.c:177
#, c-format
-msgid "bad config line %d in %s"
+msgid "commit-graph version %X does not match version %X"
msgstr ""
-#: config.c:868
-msgid "out of range"
+#: commit-graph.c:184
+#, c-format
+msgid "commit-graph hash version %X does not match version %X"
msgstr ""
-#: config.c:868
-msgid "invalid unit"
+#: commit-graph.c:207
+msgid "commit-graph chunk lookup table entry missing; file may be incomplete"
msgstr ""
-#: config.c:874
+#: commit-graph.c:218
#, c-format
-msgid "bad numeric config value '%s' for '%s': %s"
+msgid "commit-graph improper chunk offset %08x%08x"
msgstr ""
-#: config.c:879
+#: commit-graph.c:255
#, c-format
-msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
+msgid "commit-graph chunk id %08x appears multiple times"
msgstr ""
-#: config.c:882
+#: commit-graph.c:390
#, c-format
-msgid "bad numeric config value '%s' for '%s' in file %s: %s"
+msgid "could not find commit %s"
msgstr ""
-#: config.c:885
+#: commit-graph.c:732 builtin/pack-objects.c:2649
#, c-format
-msgid "bad numeric config value '%s' for '%s' in standard input: %s"
+msgid "unable to get type of object %s"
msgstr ""
-#: config.c:888
-#, c-format
-msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
+#: commit-graph.c:765
+msgid "Loading known commits in commit graph"
msgstr ""
-#: config.c:891
-#, c-format
-msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
+#: commit-graph.c:781
+msgid "Expanding reachable commits in commit graph"
msgstr ""
-#: config.c:894
-#, c-format
-msgid "bad numeric config value '%s' for '%s' in %s: %s"
+#: commit-graph.c:793
+msgid "Clearing commit marks in commit graph"
msgstr ""
-#: config.c:989
-#, c-format
-msgid "failed to expand user dir in: '%s'"
+#: commit-graph.c:813
+msgid "Computing commit graph generation numbers"
msgstr ""
-#: config.c:1084 config.c:1095
+#: commit-graph.c:930
#, c-format
-msgid "bad zlib compression level %d"
-msgstr ""
+msgid "Finding commits for commit graph in %d pack"
+msgid_plural "Finding commits for commit graph in %d packs"
+msgstr[0] ""
+msgstr[1] ""
-#: config.c:1212
+#: commit-graph.c:943
#, c-format
-msgid "invalid mode for object creation: %s"
+msgid "error adding pack %s"
msgstr ""
-#: config.c:1368
+#: commit-graph.c:945
#, c-format
-msgid "bad pack compression level %d"
+msgid "error opening index for %s"
msgstr ""
-#: config.c:1564
-msgid "unable to parse command-line config"
-msgstr ""
+#: commit-graph.c:959
+#, c-format
+msgid "Finding commits for commit graph from %d ref"
+msgid_plural "Finding commits for commit graph from %d refs"
+msgstr[0] ""
+msgstr[1] ""
-#: config.c:1894
-msgid "unknown error occurred while reading the configuration files"
+#: commit-graph.c:991
+msgid "Finding commits for commit graph among packed objects"
msgstr ""
-#: config.c:2064
-#, c-format
-msgid "Invalid %s: '%s'"
+#: commit-graph.c:1004
+msgid "Counting distinct commits in commit graph"
msgstr ""
-#: config.c:2085
+#: commit-graph.c:1017
#, c-format
-msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
+msgid "the commit graph format cannot write %d commits"
msgstr ""
-#: config.c:2111
-#, c-format
-msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
+#: commit-graph.c:1026
+msgid "Finding extra edges in commit graph"
msgstr ""
-#: config.c:2122
-#, c-format
-msgid "unable to parse '%s' from command-line config"
+#: commit-graph.c:1050
+msgid "too many commits to write graph"
msgstr ""
-#: config.c:2124
+#: commit-graph.c:1057 midx.c:819
#, c-format
-msgid "bad config variable '%s' in file '%s' at line %d"
+msgid "unable to create leading directories of %s"
msgstr ""
-#: config.c:2183
+#: commit-graph.c:1097
#, c-format
-msgid "%s has multiple values"
+msgid "Writing out commit graph in %d pass"
+msgid_plural "Writing out commit graph in %d passes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: commit-graph.c:1162
+msgid "the commit-graph file has incorrect checksum and is likely corrupt"
msgstr ""
-#: config.c:2517 config.c:2745
+#: commit-graph.c:1172
#, c-format
-msgid "fstat on %s failed"
+msgid "commit-graph has incorrect OID order: %s then %s"
msgstr ""
-#: config.c:2635
+#: commit-graph.c:1182 commit-graph.c:1197
#, c-format
-msgid "could not set '%s' to '%s'"
+msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
msgstr ""
-#: config.c:2637 builtin/remote.c:775
+#: commit-graph.c:1189
#, c-format
-msgid "could not unset '%s'"
+msgid "failed to parse commit %s from commit-graph"
msgstr ""
-#: connect.c:50
-msgid "The remote end hung up upon initial contact"
+#: commit-graph.c:1206
+msgid "Verifying commits in commit graph"
msgstr ""
-#: connect.c:52
-msgid ""
-"Could not read from remote repository.\n"
-"\n"
-"Please make sure you have the correct access rights\n"
-"and the repository exists."
+#: commit-graph.c:1219
+#, c-format
+msgid "failed to parse commit %s from object database for commit-graph"
msgstr ""
-#: connected.c:63 builtin/fsck.c:191 builtin/prune.c:141
-msgid "Checking connectivity"
+#: commit-graph.c:1226
+#, c-format
+msgid "root tree OID for commit %s in commit-graph is %s != %s"
msgstr ""
-#: connected.c:75
-msgid "Could not run 'git rev-list'"
+#: commit-graph.c:1236
+#, c-format
+msgid "commit-graph parent list for commit %s is too long"
msgstr ""
-#: connected.c:95
-msgid "failed write to rev-list"
+#: commit-graph.c:1242
+#, c-format
+msgid "commit-graph parent for %s is %s != %s"
msgstr ""
-#: connected.c:102
-msgid "failed to close rev-list's stdin"
+#: commit-graph.c:1255
+#, c-format
+msgid "commit-graph parent list for commit %s terminates early"
msgstr ""
-#: convert.c:205
+#: commit-graph.c:1260
#, c-format
msgid ""
-"CRLF will be replaced by LF in %s.\n"
-"The file will have its original line endings in your working directory."
+"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
msgstr ""
-#: convert.c:209
+#: commit-graph.c:1264
#, c-format
-msgid "CRLF would be replaced by LF in %s."
+msgid ""
+"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
msgstr ""
-#: convert.c:215
+#: commit-graph.c:1279
#, c-format
-msgid ""
-"LF will be replaced by CRLF in %s.\n"
-"The file will have its original line endings in your working directory."
+msgid "commit-graph generation for commit %s is %u != %u"
msgstr ""
-#: convert.c:219
+#: commit-graph.c:1285
#, c-format
-msgid "LF would be replaced by CRLF in %s"
+msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
msgstr ""
-#: date.c:116
-msgid "in the future"
+#: compat/obstack.c:406 compat/obstack.c:408
+msgid "memory exhausted"
msgstr ""
-#: date.c:122
-#, c-format
-msgid "%<PRIuMAX> second ago"
-msgid_plural "%<PRIuMAX> seconds ago"
-msgstr[0] ""
-msgstr[1] ""
-
-#: date.c:129
+#: config.c:123
#, c-format
-msgid "%<PRIuMAX> minute ago"
-msgid_plural "%<PRIuMAX> minutes ago"
-msgstr[0] ""
-msgstr[1] ""
+msgid ""
+"exceeded maximum include depth (%d) while including\n"
+"\t%s\n"
+"from\n"
+"\t%s\n"
+"This might be due to circular includes."
+msgstr ""
-#: date.c:136
+#: config.c:139
#, c-format
-msgid "%<PRIuMAX> hour ago"
-msgid_plural "%<PRIuMAX> hours ago"
-msgstr[0] ""
-msgstr[1] ""
+msgid "could not expand include path '%s'"
+msgstr ""
-#: date.c:143
-#, c-format
-msgid "%<PRIuMAX> day ago"
-msgid_plural "%<PRIuMAX> days ago"
-msgstr[0] ""
-msgstr[1] ""
+#: config.c:150
+msgid "relative config includes must come from files"
+msgstr ""
-#: date.c:149
-#, c-format
-msgid "%<PRIuMAX> week ago"
-msgid_plural "%<PRIuMAX> weeks ago"
-msgstr[0] ""
-msgstr[1] ""
+#: config.c:190
+msgid "relative config include conditionals must come from files"
+msgstr ""
-#: date.c:156
+#: config.c:348
#, c-format
-msgid "%<PRIuMAX> month ago"
-msgid_plural "%<PRIuMAX> months ago"
-msgstr[0] ""
-msgstr[1] ""
+msgid "key does not contain a section: %s"
+msgstr ""
-#: date.c:167
+#: config.c:354
#, c-format
-msgid "%<PRIuMAX> year"
-msgid_plural "%<PRIuMAX> years"
-msgstr[0] ""
-msgstr[1] ""
+msgid "key does not contain variable name: %s"
+msgstr ""
-#. TRANSLATORS: "%s" is "<n> years"
-#: date.c:170
+#: config.c:378 sequencer.c:2459
#, c-format
-msgid "%s, %<PRIuMAX> month ago"
-msgid_plural "%s, %<PRIuMAX> months ago"
-msgstr[0] ""
-msgstr[1] ""
+msgid "invalid key: %s"
+msgstr ""
-#: date.c:175 date.c:180
+#: config.c:384
#, c-format
-msgid "%<PRIuMAX> year ago"
-msgid_plural "%<PRIuMAX> years ago"
-msgstr[0] ""
-msgstr[1] ""
+msgid "invalid key (newline): %s"
+msgstr ""
-#: diffcore-order.c:24
+#: config.c:420 config.c:432
#, c-format
-msgid "failed to read orderfile '%s'"
+msgid "bogus config parameter: %s"
msgstr ""
-#: diffcore-rename.c:536
-msgid "Performing inexact rename detection"
+#: config.c:467
+#, c-format
+msgid "bogus format in %s"
msgstr ""
-#: diff.c:63
+#: config.c:793
#, c-format
-msgid "option '%s' requires a value"
+msgid "bad config line %d in blob %s"
msgstr ""
-#: diff.c:125
+#: config.c:797
#, c-format
-msgid " Failed to parse dirstat cut-off percentage '%s'\n"
+msgid "bad config line %d in file %s"
msgstr ""
-#: diff.c:130
+#: config.c:801
#, c-format
-msgid " Unknown dirstat parameter '%s'\n"
+msgid "bad config line %d in standard input"
msgstr ""
-#: diff.c:282
+#: config.c:805
#, c-format
-msgid "Unknown value for 'diff.submodule' config variable: '%s'"
+msgid "bad config line %d in submodule-blob %s"
msgstr ""
-#: diff.c:342
+#: config.c:809
#, c-format
-msgid ""
-"Found errors in 'diff.dirstat' config variable:\n"
-"%s"
+msgid "bad config line %d in command line %s"
msgstr ""
-#: diff.c:3101
+#: config.c:813
#, c-format
-msgid "external diff died, stopping at %s"
+msgid "bad config line %d in %s"
msgstr ""
-#: diff.c:3427
-msgid "--name-only, --name-status, --check and -s are mutually exclusive"
+#: config.c:952
+msgid "out of range"
msgstr ""
-#: diff.c:3517
-msgid "--follow requires exactly one pathspec"
+#: config.c:952
+msgid "invalid unit"
msgstr ""
-#: diff.c:3680
+#: config.c:958
#, c-format
-msgid ""
-"Failed to parse --dirstat/-X option parameter:\n"
-"%s"
+msgid "bad numeric config value '%s' for '%s': %s"
msgstr ""
-#: diff.c:3694
+#: config.c:963
#, c-format
-msgid "Failed to parse --submodule option parameter: '%s'"
+msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
msgstr ""
-#: diff.c:4716
-msgid "inexact rename detection was skipped due to too many files."
-msgstr ""
-
-#: diff.c:4719
-msgid "only found copies from modified paths due to too many files."
-msgstr ""
-
-#: diff.c:4722
+#: config.c:966
#, c-format
-msgid ""
-"you may want to set your %s variable to at least %d and retry the command."
-msgstr ""
-
-#: dir.c:1948
-msgid "failed to get kernel name and information"
-msgstr ""
-
-#: dir.c:2067
-msgid "Untracked cache is disabled on this system or location."
+msgid "bad numeric config value '%s' for '%s' in file %s: %s"
msgstr ""
-#: dir.c:2846 dir.c:2851
+#: config.c:969
#, c-format
-msgid "could not create directories for %s"
+msgid "bad numeric config value '%s' for '%s' in standard input: %s"
msgstr ""
-#: dir.c:2876
+#: config.c:972
#, c-format
-msgid "could not migrate git directory from '%s' to '%s'"
+msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
msgstr ""
-#: entry.c:281
+#: config.c:975
#, c-format
-msgid "could not stat file '%s'"
-msgstr ""
-
-#: fetch-pack.c:251
-msgid "git fetch-pack: expected shallow list"
-msgstr ""
-
-#: fetch-pack.c:263
-msgid "git fetch-pack: expected ACK/NAK, got EOF"
+msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
msgstr ""
-#: fetch-pack.c:282 builtin/archive.c:63
+#: config.c:978
#, c-format
-msgid "remote error: %s"
+msgid "bad numeric config value '%s' for '%s' in %s: %s"
msgstr ""
-#: fetch-pack.c:283
+#: config.c:1073
#, c-format
-msgid "git fetch-pack: expected ACK/NAK, got '%s'"
-msgstr ""
-
-#: fetch-pack.c:335
-msgid "--stateless-rpc requires multi_ack_detailed"
+msgid "failed to expand user dir in: '%s'"
msgstr ""
-#: fetch-pack.c:421
+#: config.c:1082
#, c-format
-msgid "invalid shallow line: %s"
+msgid "'%s' for '%s' is not a valid timestamp"
msgstr ""
-#: fetch-pack.c:427
+#: config.c:1173
#, c-format
-msgid "invalid unshallow line: %s"
+msgid "abbrev length out of range: %d"
msgstr ""
-#: fetch-pack.c:429
+#: config.c:1187 config.c:1198
#, c-format
-msgid "object not found: %s"
+msgid "bad zlib compression level %d"
msgstr ""
-#: fetch-pack.c:432
-#, c-format
-msgid "error in object: %s"
+#: config.c:1290
+msgid "core.commentChar should only be one character"
msgstr ""
-#: fetch-pack.c:434
+#: config.c:1323
#, c-format
-msgid "no shallow found: %s"
+msgid "invalid mode for object creation: %s"
msgstr ""
-#: fetch-pack.c:437
+#: config.c:1395
#, c-format
-msgid "expected shallow/unshallow, got %s"
+msgid "malformed value for %s"
msgstr ""
-#: fetch-pack.c:476
+#: config.c:1421
#, c-format
-msgid "got %s %d %s"
+msgid "malformed value for %s: %s"
msgstr ""
-#: fetch-pack.c:490
-#, c-format
-msgid "invalid commit %s"
+#: config.c:1422
+msgid "must be one of nothing, matching, simple, upstream or current"
msgstr ""
-#: fetch-pack.c:523
-msgid "giving up"
+#: config.c:1483 builtin/pack-objects.c:3397
+#, c-format
+msgid "bad pack compression level %d"
msgstr ""
-#: fetch-pack.c:533 progress.c:237
-msgid "done"
+#: config.c:1604
+#, c-format
+msgid "unable to load config blob object '%s'"
msgstr ""
-#: fetch-pack.c:545
+#: config.c:1607
#, c-format
-msgid "got %s (%d) %s"
+msgid "reference '%s' does not point to a blob"
msgstr ""
-#: fetch-pack.c:591
+#: config.c:1624
#, c-format
-msgid "Marking %s as complete"
+msgid "unable to resolve config blob '%s'"
msgstr ""
-#: fetch-pack.c:775
+#: config.c:1654
#, c-format
-msgid "already have %s (%s)"
+msgid "failed to parse %s"
msgstr ""
-#: fetch-pack.c:813
-msgid "fetch-pack: unable to fork off sideband demultiplexer"
+#: config.c:1710
+msgid "unable to parse command-line config"
msgstr ""
-#: fetch-pack.c:821
-msgid "protocol error: bad pack header"
+#: config.c:2059
+msgid "unknown error occurred while reading the configuration files"
msgstr ""
-#: fetch-pack.c:877
+#: config.c:2229
#, c-format
-msgid "fetch-pack: unable to fork off %s"
+msgid "Invalid %s: '%s'"
msgstr ""
-#: fetch-pack.c:893
+#: config.c:2272
#, c-format
-msgid "%s failed"
-msgstr ""
-
-#: fetch-pack.c:895
-msgid "error in sideband demultiplexer"
+msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
msgstr ""
-#: fetch-pack.c:922
-msgid "Server does not support shallow clients"
+#: config.c:2298
+#, c-format
+msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
msgstr ""
-#: fetch-pack.c:926
-msgid "Server supports multi_ack_detailed"
+#: config.c:2344
+#, c-format
+msgid "unable to parse '%s' from command-line config"
msgstr ""
-#: fetch-pack.c:929
-msgid "Server supports no-done"
+#: config.c:2346
+#, c-format
+msgid "bad config variable '%s' in file '%s' at line %d"
msgstr ""
-#: fetch-pack.c:935
-msgid "Server supports multi_ack"
+#: config.c:2427
+#, c-format
+msgid "invalid section name '%s'"
msgstr ""
-#: fetch-pack.c:939
-msgid "Server supports side-band-64k"
+#: config.c:2459
+#, c-format
+msgid "%s has multiple values"
msgstr ""
-#: fetch-pack.c:943
-msgid "Server supports side-band"
+#: config.c:2488
+#, c-format
+msgid "failed to write new configuration file %s"
msgstr ""
-#: fetch-pack.c:947
-msgid "Server supports allow-tip-sha1-in-want"
+#: config.c:2740 config.c:3064
+#, c-format
+msgid "could not lock config file %s"
msgstr ""
-#: fetch-pack.c:951
-msgid "Server supports allow-reachable-sha1-in-want"
+#: config.c:2751
+#, c-format
+msgid "opening %s"
msgstr ""
-#: fetch-pack.c:961
-msgid "Server supports ofs-delta"
+#: config.c:2786 builtin/config.c:328
+#, c-format
+msgid "invalid pattern: %s"
msgstr ""
-#: fetch-pack.c:968
+#: config.c:2811
#, c-format
-msgid "Server version is %.*s"
+msgid "invalid config file %s"
msgstr ""
-#: fetch-pack.c:974
-msgid "Server does not support --shallow-since"
+#: config.c:2824 config.c:3077
+#, c-format
+msgid "fstat on %s failed"
msgstr ""
-#: fetch-pack.c:978
-msgid "Server does not support --shallow-exclude"
+#: config.c:2835
+#, c-format
+msgid "unable to mmap '%s'"
msgstr ""
-#: fetch-pack.c:980
-msgid "Server does not support --deepen"
+#: config.c:2844 config.c:3082
+#, c-format
+msgid "chmod on %s failed"
msgstr ""
-#: fetch-pack.c:991
-msgid "no common commits"
+#: config.c:2929 config.c:3179
+#, c-format
+msgid "could not write config file %s"
msgstr ""
-#: fetch-pack.c:1003
-msgid "git fetch-pack: fetch failed."
+#: config.c:2963
+#, c-format
+msgid "could not set '%s' to '%s'"
msgstr ""
-#: fetch-pack.c:1165
-msgid "no matching remote head"
+#: config.c:2965 builtin/remote.c:782
+#, c-format
+msgid "could not unset '%s'"
msgstr ""
-#: fetch-pack.c:1187
+#: config.c:3055
#, c-format
-msgid "no such remote ref %s"
+msgid "invalid section name: %s"
msgstr ""
-#: fetch-pack.c:1190
+#: config.c:3222
#, c-format
-msgid "Server does not allow request for unadvertised object %s"
+msgid "missing value for '%s'"
msgstr ""
-#: gpg-interface.c:181
-msgid "gpg failed to sign the data"
+#: connect.c:61
+msgid "the remote end hung up upon initial contact"
msgstr ""
-#: gpg-interface.c:211
-msgid "could not create temporary file"
+#: connect.c:63
+msgid ""
+"Could not read from remote repository.\n"
+"\n"
+"Please make sure you have the correct access rights\n"
+"and the repository exists."
msgstr ""
-#: gpg-interface.c:213
+#: connect.c:81
#, c-format
-msgid "failed writing detached signature to '%s'"
+msgid "server doesn't support '%s'"
msgstr ""
-#: graph.c:97
+#: connect.c:103
#, c-format
-msgid "ignore invalid color '%.*s' in log.graphColors"
+msgid "server doesn't support feature '%s'"
msgstr ""
-#: grep.c:1981
-#, c-format
-msgid "'%s': unable to read %s"
+#: connect.c:114
+msgid "expected flush after capabilities"
msgstr ""
-#: grep.c:1998 builtin/clone.c:403 builtin/diff.c:81 builtin/rm.c:134
+#: connect.c:233
#, c-format
-msgid "failed to stat '%s'"
+msgid "ignoring capabilities after first line '%s'"
msgstr ""
-#: grep.c:2009
-#, c-format
-msgid "'%s': short read"
+#: connect.c:252
+msgid "protocol error: unexpected capabilities^{}"
msgstr ""
-#: help.c:179
+#: connect.c:273
#, c-format
-msgid "available git commands in '%s'"
+msgid "protocol error: expected shallow sha-1, got '%s'"
msgstr ""
-#: help.c:186
-msgid "git commands available from elsewhere on your $PATH"
+#: connect.c:275
+msgid "repository on the other end cannot be shallow"
msgstr ""
-#: help.c:217
-msgid "These are common Git commands used in various situations:"
+#: connect.c:313
+msgid "invalid packet"
msgstr ""
-#: help.c:281
+#: connect.c:333
#, c-format
-msgid ""
-"'%s' appears to be a git command, but we were not\n"
-"able to execute it. Maybe git-%s is broken?"
-msgstr ""
-
-#: help.c:336
-msgid "Uh oh. Your system reports no Git commands at all."
+msgid "protocol error: unexpected '%s'"
msgstr ""
-#: help.c:358
+#: connect.c:441
#, c-format
-msgid "WARNING: You called a Git command named '%s', which does not exist."
+msgid "invalid ls-refs response: %s"
msgstr ""
-#: help.c:363
-#, c-format
-msgid "Continuing under the assumption that you meant '%s'."
+#: connect.c:445
+msgid "expected flush after ref listing"
msgstr ""
-#: help.c:368
+#: connect.c:544
#, c-format
-msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
+msgid "protocol '%s' is not supported"
msgstr ""
-#: help.c:376
-#, c-format
-msgid "git: '%s' is not a git command. See 'git --help'."
+#: connect.c:595
+msgid "unable to set SO_KEEPALIVE on socket"
msgstr ""
-#: help.c:380
-msgid ""
-"\n"
-"The most similar command is"
-msgid_plural ""
-"\n"
-"The most similar commands are"
-msgstr[0] ""
-msgstr[1] ""
-
-#: help.c:395
-msgid "git version [<options>]"
+#: connect.c:635 connect.c:698
+#, c-format
+msgid "Looking up %s ... "
msgstr ""
-#: help.c:456
+#: connect.c:639
#, c-format
-msgid "%s: %s - %s"
+msgid "unable to look up %s (port %s) (%s)"
msgstr ""
-#: help.c:460
-msgid ""
-"\n"
-"Did you mean this?"
-msgid_plural ""
-"\n"
-"Did you mean one of these?"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ident.c:342
+#. TRANSLATORS: this is the end of "Looking up %s ... "
+#: connect.c:643 connect.c:714
+#, c-format
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 ""
-
-#: ident.c:366
-msgid "no email was given and auto-detection is disabled"
+"done.\n"
+"Connecting to %s (port %s) ... "
msgstr ""
-#: ident.c:371
+#: connect.c:665 connect.c:742
#, c-format
-msgid "unable to auto-detect email address (got '%s')"
+msgid ""
+"unable to connect to %s:\n"
+"%s"
msgstr ""
-#: ident.c:381
-msgid "no name was given and auto-detection is disabled"
+#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
+#: connect.c:671 connect.c:748
+msgid "done."
msgstr ""
-#: ident.c:387
+#: connect.c:702
#, c-format
-msgid "unable to auto-detect name (got '%s')"
+msgid "unable to look up %s (%s)"
msgstr ""
-#: ident.c:395
+#: connect.c:708
#, c-format
-msgid "empty ident name (for <%s>) not allowed"
+msgid "unknown port %s"
msgstr ""
-#: ident.c:401
+#: connect.c:845 connect.c:1171
#, c-format
-msgid "name consists only of disallowed characters: %s"
+msgid "strange hostname '%s' blocked"
msgstr ""
-#: ident.c:416 builtin/commit.c:612
+#: connect.c:847
#, c-format
-msgid "invalid date format: %s"
+msgid "strange port '%s' blocked"
msgstr ""
-#: lockfile.c:152
+#: connect.c:857
#, 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."
+msgid "cannot start proxy %s"
msgstr ""
-#: lockfile.c:160
-#, c-format
-msgid "Unable to create '%s.lock': %s"
+#: connect.c:924
+msgid "no path specified; see 'git help pull' for valid url syntax"
msgstr ""
-#: merge.c:41
-msgid "failed to read the cache"
+#: connect.c:1119
+msgid "ssh variant 'simple' does not support -4"
msgstr ""
-#: merge.c:96 builtin/am.c:1980 builtin/am.c:2015 builtin/checkout.c:377
-#: builtin/checkout.c:591 builtin/clone.c:753
-msgid "unable to write new index file"
+#: connect.c:1131
+msgid "ssh variant 'simple' does not support -6"
msgstr ""
-#: merge-recursive.c:210
-msgid "(bad commit)\n"
+#: connect.c:1148
+msgid "ssh variant 'simple' does not support setting port"
msgstr ""
-#: merge-recursive.c:232 merge-recursive.c:240
+#: connect.c:1260
#, c-format
-msgid "addinfo_cache failed for path '%s'"
+msgid "strange pathname '%s' blocked"
msgstr ""
-#: merge-recursive.c:304
-msgid "error building trees"
+#: connect.c:1307
+msgid "unable to fork"
msgstr ""
-#: merge-recursive.c:728
-#, c-format
-msgid "failed to create path '%s'%s"
+#: connected.c:85 builtin/fsck.c:221 builtin/prune.c:43
+msgid "Checking connectivity"
msgstr ""
-#: merge-recursive.c:739
-#, c-format
-msgid "Removing %s to make room for subdirectory\n"
+#: connected.c:97
+msgid "Could not run 'git rev-list'"
msgstr ""
-#: merge-recursive.c:753 merge-recursive.c:772
-msgid ": perhaps a D/F conflict?"
+#: connected.c:117
+msgid "failed write to rev-list"
msgstr ""
-#: merge-recursive.c:762
-#, c-format
-msgid "refusing to lose untracked file at '%s'"
+#: connected.c:124
+msgid "failed to close rev-list's stdin"
msgstr ""
-#: merge-recursive.c:804 builtin/cat-file.c:36
+#: convert.c:193
#, c-format
-msgid "cannot read object %s '%s'"
+msgid "illegal crlf_action %d"
msgstr ""
-#: merge-recursive.c:806
+#: convert.c:206
#, c-format
-msgid "blob expected for %s '%s'"
+msgid "CRLF would be replaced by LF in %s"
msgstr ""
-#: merge-recursive.c:830
+#: convert.c:208
#, c-format
-msgid "failed to open '%s': %s"
+msgid ""
+"CRLF will be replaced by LF in %s.\n"
+"The file will have its original line endings in your working directory"
msgstr ""
-#: merge-recursive.c:841
+#: convert.c:216
#, c-format
-msgid "failed to symlink '%s': %s"
+msgid "LF would be replaced by CRLF in %s"
msgstr ""
-#: merge-recursive.c:846
+#: convert.c:218
#, c-format
-msgid "do not know what to do with %06o %s '%s'"
-msgstr ""
-
-#: merge-recursive.c:986
-msgid "Failed to execute internal merge"
+msgid ""
+"LF will be replaced by CRLF in %s.\n"
+"The file will have its original line endings in your working directory"
msgstr ""
-#: merge-recursive.c:990
+#: convert.c:279
#, c-format
-msgid "Unable to add %s to database"
+msgid "BOM is prohibited in '%s' if encoded as %s"
msgstr ""
-#: merge-recursive.c:1093
+#: convert.c:286
#, c-format
msgid ""
-"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
-"in tree."
+"The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-"
+"tree-encoding."
msgstr ""
-#: merge-recursive.c:1098
+#: convert.c:304
#, c-format
-msgid ""
-"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
-"left in tree."
+msgid "BOM is required in '%s' if encoded as %s"
msgstr ""
-#: merge-recursive.c:1105
+#: convert.c:306
#, c-format
msgid ""
-"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
-"in tree at %s."
+"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 ""
-#: merge-recursive.c:1110
+#: convert.c:424 convert.c:495
#, c-format
-msgid ""
-"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
-"left in tree at %s."
-msgstr ""
-
-#: merge-recursive.c:1144
-msgid "rename"
+msgid "failed to encode '%s' from %s to %s"
msgstr ""
-#: merge-recursive.c:1144
-msgid "renamed"
+#: convert.c:467
+#, c-format
+msgid "encoding '%s' from %s to %s and back is not the same"
msgstr ""
-#: merge-recursive.c:1201
+#: convert.c:673
#, c-format
-msgid "%s is a directory in %s adding as %s instead"
+msgid "cannot fork to run external filter '%s'"
msgstr ""
-#: merge-recursive.c:1226
+#: convert.c:693
#, c-format
-msgid ""
-"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
-"\"->\"%s\" in \"%s\"%s"
+msgid "cannot feed the input to external filter '%s'"
msgstr ""
-#: merge-recursive.c:1231
-msgid " (left unresolved)"
+#: convert.c:700
+#, c-format
+msgid "external filter '%s' failed %d"
msgstr ""
-#: merge-recursive.c:1293
+#: convert.c:735 convert.c:738
#, c-format
-msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
+msgid "read from external filter '%s' failed"
msgstr ""
-#: merge-recursive.c:1326
+#: convert.c:741 convert.c:796
#, c-format
-msgid "Renaming %s to %s and %s to %s instead"
+msgid "external filter '%s' failed"
msgstr ""
-#: merge-recursive.c:1529
-#, c-format
-msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
+#: convert.c:844
+msgid "unexpected filter type"
msgstr ""
-#: merge-recursive.c:1544
-#, c-format
-msgid "Adding merged %s"
+#: convert.c:855
+msgid "path name too long for external filter"
msgstr ""
-#: merge-recursive.c:1551 merge-recursive.c:1781
+#: convert.c:929
#, c-format
-msgid "Adding as %s instead"
+msgid ""
+"external filter '%s' is not available anymore although not all paths have "
+"been filtered"
msgstr ""
-#: merge-recursive.c:1608
-#, c-format
-msgid "cannot read object %s"
+#: convert.c:1228
+msgid "true/false are no valid working-tree-encodings"
msgstr ""
-#: merge-recursive.c:1611
+#: convert.c:1398 convert.c:1432
#, c-format
-msgid "object %s is not a blob"
+msgid "%s: clean filter '%s' failed"
msgstr ""
-#: merge-recursive.c:1680
-msgid "modify"
+#: convert.c:1476
+#, c-format
+msgid "%s: smudge filter %s failed"
msgstr ""
-#: merge-recursive.c:1680
-msgid "modified"
+#: date.c:137
+msgid "in the future"
msgstr ""
-#: merge-recursive.c:1690
-msgid "content"
-msgstr ""
+#: date.c:143
+#, c-format
+msgid "%<PRIuMAX> second ago"
+msgid_plural "%<PRIuMAX> seconds ago"
+msgstr[0] ""
+msgstr[1] ""
-#: merge-recursive.c:1697
-msgid "add/add"
+#: date.c:150
+#, c-format
+msgid "%<PRIuMAX> minute ago"
+msgid_plural "%<PRIuMAX> minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: date.c:157
+#, c-format
+msgid "%<PRIuMAX> hour ago"
+msgid_plural "%<PRIuMAX> hours ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: date.c:164
+#, c-format
+msgid "%<PRIuMAX> day ago"
+msgid_plural "%<PRIuMAX> days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: date.c:170
+#, c-format
+msgid "%<PRIuMAX> week ago"
+msgid_plural "%<PRIuMAX> weeks ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: date.c:177
+#, c-format
+msgid "%<PRIuMAX> month ago"
+msgid_plural "%<PRIuMAX> months ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: date.c:188
+#, c-format
+msgid "%<PRIuMAX> year"
+msgid_plural "%<PRIuMAX> years"
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANSLATORS: "%s" is "<n> years"
+#: date.c:191
+#, c-format
+msgid "%s, %<PRIuMAX> month ago"
+msgid_plural "%s, %<PRIuMAX> months ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: 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 ""
-#: merge-recursive.c:1733
+#: delta-islands.c:290
#, c-format
-msgid "Skipped %s (merged same as existing)"
+msgid "bad tree object %s"
msgstr ""
-#: merge-recursive.c:1747
+#: delta-islands.c:334
#, c-format
-msgid "Auto-merging %s"
+msgid "failed to load island regex for '%s': %s"
msgstr ""
-#: merge-recursive.c:1751 git-submodule.sh:945
-msgid "submodule"
+#: delta-islands.c:390
+#, c-format
+msgid "island regex from config has too many capture groups (max=%d)"
msgstr ""
-#: merge-recursive.c:1752
+#: delta-islands.c:466
#, c-format
-msgid "CONFLICT (%s): Merge conflict in %s"
+msgid "Marked %d islands, done.\n"
msgstr ""
-#: merge-recursive.c:1846
+#: diffcore-order.c:24
#, c-format
-msgid "Removing %s"
+msgid "failed to read orderfile '%s'"
msgstr ""
-#: merge-recursive.c:1872
-msgid "file/directory"
+#: diffcore-rename.c:544
+msgid "Performing inexact rename detection"
msgstr ""
-#: merge-recursive.c:1878
-msgid "directory/file"
+#: diff-no-index.c:238
+msgid "git diff --no-index [<options>] <path> <path>"
msgstr ""
-#: merge-recursive.c:1884
+#: diff-no-index.c:263
+msgid ""
+"Not a git repository. Use --no-index to compare two paths outside a working "
+"tree"
+msgstr ""
+
+#: diff.c:155
#, c-format
-msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
+msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr ""
-#: merge-recursive.c:1893
+#: diff.c:160
#, c-format
-msgid "Adding %s"
+msgid " Unknown dirstat parameter '%s'\n"
msgstr ""
-#: merge-recursive.c:1930
-msgid "Already up-to-date!"
+#: diff.c:296
+msgid ""
+"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
+"'dimmed-zebra', 'plain'"
msgstr ""
-#: merge-recursive.c:1939
+#: diff.c:324
#, c-format
-msgid "merging of trees %s and %s failed"
+msgid ""
+"unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
+"'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-change'"
msgstr ""
-#: merge-recursive.c:2022
-msgid "Merging:"
+#: diff.c:332
+msgid ""
+"color-moved-ws: allow-indentation-change cannot be combined with other "
+"whitespace modes"
msgstr ""
-#: merge-recursive.c:2035
+#: diff.c:405
#, c-format
-msgid "found %u common ancestor:"
-msgid_plural "found %u common ancestors:"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Unknown value for 'diff.submodule' config variable: '%s'"
+msgstr ""
-#: merge-recursive.c:2074
-msgid "merge returned no commit"
+#: diff.c:465
+#, c-format
+msgid ""
+"Found errors in 'diff.dirstat' config variable:\n"
+"%s"
msgstr ""
-#: merge-recursive.c:2137
+#: diff.c:4210
#, c-format
-msgid "Could not parse object '%s'"
+msgid "external diff died, stopping at %s"
msgstr ""
-#: merge-recursive.c:2151 builtin/merge.c:646 builtin/merge.c:793
-msgid "Unable to write index."
+#: diff.c:4555
+msgid "--name-only, --name-status, --check and -s are mutually exclusive"
msgstr ""
-#: notes-merge.c:273
-#, 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."
+#: diff.c:4558
+msgid "-G, -S and --find-object are mutually exclusive"
msgstr ""
-#: notes-merge.c:280
+#: diff.c:4636
+msgid "--follow requires exactly one pathspec"
+msgstr ""
+
+#: diff.c:4684
#, c-format
-msgid "You have not concluded your notes merge (%s exists)."
+msgid "invalid --stat value: %s"
msgstr ""
-#: notes-utils.c:42
-msgid "Cannot commit uninitialized/unreferenced notes tree"
+#: diff.c:4689 diff.c:4694 diff.c:4699 diff.c:4704 diff.c:5217
+#: parse-options.c:199 parse-options.c:203
+#, c-format
+msgid "%s expects a numerical value"
msgstr ""
-#: notes-utils.c:101
+#: diff.c:4721
#, c-format
-msgid "Bad notes.rewriteMode value: '%s'"
+msgid ""
+"Failed to parse --dirstat/-X option parameter:\n"
+"%s"
msgstr ""
-#: notes-utils.c:111
+#: diff.c:4806
#, c-format
-msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
+msgid "unknown change class '%c' in --diff-filter=%s"
msgstr ""
-#. TRANSLATORS: The first %s is the name of
-#. the environment variable, the second %s is
-#. its value.
-#.
-#: notes-utils.c:141
+#: diff.c:4830
#, c-format
-msgid "Bad %s value: '%s'"
+msgid "unknown value after ws-error-highlight=%.*s"
msgstr ""
-#: object.c:240
+#: diff.c:4844
#, c-format
-msgid "unable to parse object: %s"
+msgid "unable to resolve '%s'"
msgstr ""
-#: parse-options.c:573
-msgid "..."
+#: diff.c:4894 diff.c:4900
+#, c-format
+msgid "%s expects <n>/<m> form"
msgstr ""
-#: parse-options.c:591
+#: diff.c:4912
#, c-format
-msgid "usage: %s"
+msgid "%s expects a character, got '%s'"
msgstr ""
-#. TRANSLATORS: the colon here should align with the
-#. one in "usage: %s" translation.
-#.
-#: parse-options.c:597
+#: diff.c:4933
#, c-format
-msgid " or: %s"
+msgid "bad --color-moved argument: %s"
msgstr ""
-#: parse-options.c:600
+#: diff.c:4952
#, c-format
-msgid " %s"
+msgid "invalid mode '%s' in --color-moved-ws"
msgstr ""
-#: parse-options.c:634
-msgid "-NUM"
+#: diff.c:4992
+msgid ""
+"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
+"\"histogram\""
msgstr ""
-#: parse-options-cb.c:108
+#: diff.c:5028 diff.c:5048
#, c-format
-msgid "malformed object name '%s'"
+msgid "invalid argument to %s"
msgstr ""
-#: path.c:890
+#: diff.c:5186
#, c-format
-msgid "Could not make %s writable by group"
+msgid "failed to parse --submodule option parameter: '%s'"
msgstr ""
-#: pathspec.c:129
-msgid "Escape character '\\' not allowed as last character in attr value"
+#: diff.c:5242
+#, c-format
+msgid "bad --word-diff argument: %s"
msgstr ""
-#: pathspec.c:147
-msgid "Only one 'attr:' specification is allowed."
+#: diff.c:5265
+msgid "Diff output format options"
msgstr ""
-#: pathspec.c:150
-msgid "attr spec must not be empty"
+#: diff.c:5267 diff.c:5273
+msgid "generate patch"
msgstr ""
-#: pathspec.c:193
-#, c-format
-msgid "invalid attribute name %s"
+#: diff.c:5270 builtin/log.c:167
+msgid "suppress diff output"
msgstr ""
-#: pathspec.c:258
-msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
+#: diff.c:5275 diff.c:5389 diff.c:5396
+msgid "<n>"
msgstr ""
-#: pathspec.c:265
-msgid ""
-"global 'literal' pathspec setting is incompatible with all other global "
-"pathspec settings"
+#: diff.c:5276 diff.c:5279
+msgid "generate diffs with <n> lines context"
msgstr ""
-#: pathspec.c:305
-msgid "invalid parameter for pathspec magic 'prefix'"
+#: diff.c:5281
+msgid "generate the diff in raw format"
msgstr ""
-#: pathspec.c:326
-#, c-format
-msgid "Invalid pathspec magic '%.*s' in '%s'"
+#: diff.c:5284
+msgid "synonym for '-p --raw'"
msgstr ""
-#: pathspec.c:331
-#, c-format
-msgid "Missing ')' at the end of pathspec magic in '%s'"
+#: diff.c:5288
+msgid "synonym for '-p --stat'"
msgstr ""
-#: pathspec.c:369
-#, c-format
-msgid "Unimplemented pathspec magic '%c' in '%s'"
+#: diff.c:5292
+msgid "machine friendly --stat"
msgstr ""
-#: pathspec.c:428
-#, c-format
-msgid "%s: 'literal' and 'glob' are incompatible"
+#: diff.c:5295
+msgid "output only the last line of --stat"
msgstr ""
-#: pathspec.c:441
-#, c-format
-msgid "%s: '%s' is outside repository"
+#: diff.c:5297 diff.c:5305
+msgid "<param1,param2>..."
msgstr ""
-#: pathspec.c:515
-#, c-format
-msgid "'%s' (mnemonic: '%c')"
+#: diff.c:5298
+msgid ""
+"output the distribution of relative amount of changes for each sub-directory"
msgstr ""
-#: pathspec.c:525
-#, c-format
-msgid "%s: pathspec magic not supported by this command: %s"
+#: diff.c:5302
+msgid "synonym for --dirstat=cumulative"
msgstr ""
-#: pathspec.c:575
-msgid ""
-"empty strings as pathspecs will be made invalid in upcoming releases. please "
-"use . instead if you meant to match all paths"
+#: diff.c:5306
+msgid "synonym for --dirstat=files,param1,param2..."
msgstr ""
-#: pathspec.c:599
-#, c-format
-msgid "pathspec '%s' is beyond a symbolic link"
+#: diff.c:5310
+msgid "warn if changes introduce conflict markers or whitespace errors"
msgstr ""
-#: pretty.c:963
-msgid "unable to parse --pretty format"
+#: diff.c:5313
+msgid "condensed summary such as creations, renames and mode changes"
msgstr ""
-#: read-cache.c:1443
-#, c-format
-msgid ""
-"index.version set, but the value is invalid.\n"
-"Using version %i"
+#: diff.c:5316
+msgid "show only names of changed files"
msgstr ""
-#: read-cache.c:1453
-#, c-format
-msgid ""
-"GIT_INDEX_VERSION set, but the value is invalid.\n"
-"Using version %i"
+#: diff.c:5319
+msgid "show only names and status of changed files"
msgstr ""
-#: read-cache.c:2308 builtin/merge.c:1019
-#, c-format
-msgid "could not close '%s'"
+#: diff.c:5321
+msgid "<width>[,<name-width>[,<count>]]"
msgstr ""
-#: read-cache.c:2383 sequencer.c:1353 sequencer.c:2054
-#, c-format
-msgid "could not stat '%s'"
+#: diff.c:5322
+msgid "generate diffstat"
msgstr ""
-#: read-cache.c:2396
-#, c-format
-msgid "unable to open git dir: %s"
+#: diff.c:5324 diff.c:5327 diff.c:5330
+msgid "<width>"
msgstr ""
-#: read-cache.c:2408
-#, c-format
-msgid "unable to unlink: %s"
+#: diff.c:5325
+msgid "generate diffstat with a given width"
msgstr ""
-#: refs.c:622
-#, c-format
-msgid "Could not open '%s' for writing"
+#: diff.c:5328
+msgid "generate diffstat with a given name width"
msgstr ""
-#: refs.c:1769
-msgid "ref updates forbidden inside quarantine environment"
+#: diff.c:5331
+msgid "generate diffstat with a given graph width"
msgstr ""
-#: refs/files-backend.c:1664
-#, c-format
-msgid "could not delete reference %s: %s"
+#: diff.c:5333
+msgid "<count>"
msgstr ""
-#: refs/files-backend.c:1667
-#, c-format
-msgid "could not delete references: %s"
+#: diff.c:5334
+msgid "generate diffstat with limited lines"
msgstr ""
-#: refs/files-backend.c:1676
-#, c-format
-msgid "could not remove reference %s"
+#: diff.c:5337
+msgid "generate compact summary in diffstat"
msgstr ""
-#: ref-filter.c:35 wt-status.c:1811
-msgid "gone"
+#: diff.c:5340
+msgid "output a binary diff that can be applied"
msgstr ""
-#: ref-filter.c:36
-#, c-format
-msgid "ahead %d"
+#: diff.c:5343
+msgid "show full pre- and post-image object names on the \"index\" lines"
msgstr ""
-#: ref-filter.c:37
-#, c-format
-msgid "behind %d"
+#: diff.c:5345
+msgid "show colored diff"
msgstr ""
-#: ref-filter.c:38
-#, c-format
-msgid "ahead %d, behind %d"
+#: diff.c:5346
+msgid "<kind>"
msgstr ""
-#: ref-filter.c:105
-#, c-format
-msgid "expected format: %%(color:<color>)"
+#: diff.c:5347
+msgid ""
+"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
+"diff"
msgstr ""
-#: ref-filter.c:107
-#, c-format
-msgid "unrecognized color: %%(color:%s)"
+#: diff.c:5350
+msgid ""
+"do not munge pathnames and use NULs as output field terminators in --raw or "
+"--numstat"
msgstr ""
-#: ref-filter.c:121
-#, c-format
-msgid "Integer value expected refname:lstrip=%s"
+#: diff.c:5353 diff.c:5356 diff.c:5359 diff.c:5465
+msgid "<prefix>"
msgstr ""
-#: ref-filter.c:125
-#, c-format
-msgid "Integer value expected refname:rstrip=%s"
+#: diff.c:5354
+msgid "show the given source prefix instead of \"a/\""
msgstr ""
-#: ref-filter.c:127
-#, c-format
-msgid "unrecognized %%(%s) argument: %s"
+#: diff.c:5357
+msgid "show the given destination prefix instead of \"b/\""
msgstr ""
-#: ref-filter.c:167
-#, c-format
-msgid "%%(body) does not take arguments"
+#: diff.c:5360
+msgid "prepend an additional prefix to every line of output"
msgstr ""
-#: ref-filter.c:174
-#, c-format
-msgid "%%(subject) does not take arguments"
+#: diff.c:5363
+msgid "do not show any source or destination prefix"
msgstr ""
-#: ref-filter.c:181
-#, c-format
-msgid "%%(trailers) does not take arguments"
+#: diff.c:5366
+msgid "show context between diff hunks up to the specified number of lines"
msgstr ""
-#: ref-filter.c:200
-#, c-format
-msgid "positive value expected contents:lines=%s"
+#: diff.c:5370 diff.c:5375 diff.c:5380
+msgid "<char>"
msgstr ""
-#: ref-filter.c:202
-#, c-format
-msgid "unrecognized %%(contents) argument: %s"
+#: diff.c:5371
+msgid "specify the character to indicate a new line instead of '+'"
msgstr ""
-#: ref-filter.c:215
-#, c-format
-msgid "positive value expected objectname:short=%s"
+#: diff.c:5376
+msgid "specify the character to indicate an old line instead of '-'"
msgstr ""
-#: ref-filter.c:219
-#, c-format
-msgid "unrecognized %%(objectname) argument: %s"
+#: diff.c:5381
+msgid "specify the character to indicate a context instead of ' '"
msgstr ""
-#: ref-filter.c:246
-#, c-format
-msgid "expected format: %%(align:<width>,<position>)"
+#: diff.c:5384
+msgid "Diff rename options"
msgstr ""
-#: ref-filter.c:258
-#, c-format
-msgid "unrecognized position:%s"
+#: diff.c:5385
+msgid "<n>[/<m>]"
msgstr ""
-#: ref-filter.c:262
-#, c-format
-msgid "unrecognized width:%s"
+#: diff.c:5386
+msgid "break complete rewrite changes into pairs of delete and create"
msgstr ""
-#: ref-filter.c:268
-#, c-format
-msgid "unrecognized %%(align) argument: %s"
+#: diff.c:5390
+msgid "detect renames"
msgstr ""
-#: ref-filter.c:272
-#, c-format
-msgid "positive width expected with the %%(align) atom"
+#: diff.c:5394
+msgid "omit the preimage for deletes"
msgstr ""
-#: ref-filter.c:287
-#, c-format
-msgid "unrecognized %%(if) argument: %s"
+#: diff.c:5397
+msgid "detect copies"
msgstr ""
-#: ref-filter.c:378
-#, c-format
-msgid "malformed field name: %.*s"
+#: diff.c:5401
+msgid "use unmodified files as source to find copies"
msgstr ""
-#: ref-filter.c:404
-#, c-format
-msgid "unknown field name: %.*s"
+#: diff.c:5403
+msgid "disable rename detection"
msgstr ""
-#: ref-filter.c:508
-#, c-format
-msgid "format: %%(if) atom used without a %%(then) atom"
+#: diff.c:5406
+msgid "use empty blobs as rename source"
msgstr ""
-#: ref-filter.c:568
-#, c-format
-msgid "format: %%(then) atom used without an %%(if) atom"
+#: diff.c:5408
+msgid "continue listing the history of a file beyond renames"
msgstr ""
-#: ref-filter.c:570
-#, c-format
-msgid "format: %%(then) atom used more than once"
+#: diff.c:5411
+msgid ""
+"prevent rename/copy detection if the number of rename/copy targets exceeds "
+"given limit"
msgstr ""
-#: ref-filter.c:572
-#, c-format
-msgid "format: %%(then) atom used after %%(else)"
+#: diff.c:5413
+msgid "Diff algorithm options"
msgstr ""
-#: ref-filter.c:598
-#, c-format
-msgid "format: %%(else) atom used without an %%(if) atom"
+#: diff.c:5415
+msgid "produce the smallest possible diff"
msgstr ""
-#: ref-filter.c:600
-#, c-format
-msgid "format: %%(else) atom used without a %%(then) atom"
+#: diff.c:5418
+msgid "ignore whitespace when comparing lines"
msgstr ""
-#: ref-filter.c:602
-#, c-format
-msgid "format: %%(else) atom used more than once"
+#: diff.c:5421
+msgid "ignore changes in amount of whitespace"
msgstr ""
-#: ref-filter.c:615
-#, c-format
-msgid "format: %%(end) atom used without corresponding atom"
+#: diff.c:5424
+msgid "ignore changes in whitespace at EOL"
msgstr ""
-#: ref-filter.c:670
-#, c-format
-msgid "malformed format string %s"
+#: diff.c:5427
+msgid "ignore carrier-return at the end of line"
msgstr ""
-#: ref-filter.c:1254
-#, c-format
-msgid "(no branch, rebasing %s)"
+#: diff.c:5430
+msgid "ignore changes whose lines are all blank"
msgstr ""
-#: ref-filter.c:1257
-#, c-format
-msgid "(no branch, bisect started on %s)"
+#: diff.c:5433
+msgid "heuristic to shift diff hunk boundaries for easy reading"
msgstr ""
-#. TRANSLATORS: make sure this matches "HEAD
-#. detached at " in wt-status.c
-#.
-#: ref-filter.c:1265
-#, c-format
-msgid "(HEAD detached at %s)"
+#: diff.c:5436
+msgid "generate diff using the \"patience diff\" algorithm"
msgstr ""
-#. TRANSLATORS: make sure this matches "HEAD
-#. detached from " in wt-status.c
-#.
-#: ref-filter.c:1272
-#, c-format
-msgid "(HEAD detached from %s)"
+#: diff.c:5440
+msgid "generate diff using the \"histogram diff\" algorithm"
msgstr ""
-#: ref-filter.c:1276
-msgid "(no branch)"
+#: diff.c:5442
+msgid "<algorithm>"
msgstr ""
-#: ref-filter.c:1426 ref-filter.c:1457
-#, c-format
-msgid "missing object %s for %s"
+#: diff.c:5443
+msgid "choose a diff algorithm"
msgstr ""
-#: ref-filter.c:1429 ref-filter.c:1460
-#, c-format
-msgid "parse_object_buffer failed on %s for %s"
+#: diff.c:5445
+msgid "<text>"
msgstr ""
-#: ref-filter.c:1760
-#, c-format
-msgid "malformed object at '%s'"
+#: diff.c:5446
+msgid "generate diff using the \"anchored diff\" algorithm"
msgstr ""
-#: ref-filter.c:1827
-#, c-format
-msgid "ignoring ref with broken name %s"
+#: diff.c:5448 diff.c:5457 diff.c:5460
+msgid "<mode>"
msgstr ""
-#: ref-filter.c:1832
-#, c-format
-msgid "ignoring broken ref %s"
+#: diff.c:5449
+msgid "show word diff, using <mode> to delimit changed words"
msgstr ""
-#: ref-filter.c:2095
-#, c-format
-msgid "format: %%(end) atom missing"
+#: diff.c:5451 diff.c:5454 diff.c:5499
+msgid "<regex>"
msgstr ""
-#: ref-filter.c:2176
-#, c-format
-msgid "malformed object name %s"
+#: diff.c:5452
+msgid "use <regex> to decide what a word is"
msgstr ""
-#: remote.c:747
-#, c-format
-msgid "Cannot fetch both %s and %s to %s"
+#: diff.c:5455
+msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
msgstr ""
-#: remote.c:751
-#, c-format
-msgid "%s usually tracks %s, not %s"
+#: diff.c:5458
+msgid "moved lines of code are colored differently"
msgstr ""
-#: remote.c:755
-#, c-format
-msgid "%s tracks both %s and %s"
+#: diff.c:5461
+msgid "how white spaces are ignored in --color-moved"
msgstr ""
-#: remote.c:763
-msgid "Internal error"
+#: diff.c:5464
+msgid "Other diff options"
msgstr ""
-#: remote.c:1680 remote.c:1782
-msgid "HEAD does not point to a branch"
+#: diff.c:5466
+msgid "when run from subdir, exclude changes outside and show relative paths"
msgstr ""
-#: remote.c:1689
-#, c-format
-msgid "no such branch: '%s'"
+#: diff.c:5470
+msgid "treat all files as text"
msgstr ""
-#: remote.c:1692
-#, c-format
-msgid "no upstream configured for branch '%s'"
+#: diff.c:5472
+msgid "swap two inputs, reverse the diff"
msgstr ""
-#: remote.c:1698
-#, c-format
-msgid "upstream branch '%s' not stored as a remote-tracking branch"
+#: diff.c:5474
+msgid "exit with 1 if there were differences, 0 otherwise"
msgstr ""
-#: remote.c:1713
-#, c-format
-msgid "push destination '%s' on remote '%s' has no local tracking branch"
+#: diff.c:5476
+msgid "disable all output of the program"
msgstr ""
-#: remote.c:1725
-#, c-format
-msgid "branch '%s' has no remote for pushing"
+#: diff.c:5478
+msgid "allow an external diff helper to be executed"
msgstr ""
-#: remote.c:1736
-#, c-format
-msgid "push refspecs for '%s' do not include '%s'"
+#: diff.c:5480
+msgid "run external text conversion filters when comparing binary files"
msgstr ""
-#: remote.c:1749
-msgid "push has no destination (push.default is 'nothing')"
+#: diff.c:5482
+msgid "<when>"
msgstr ""
-#: remote.c:1771
-msgid "cannot resolve 'simple' push to a single destination"
+#: diff.c:5483
+msgid "ignore changes to submodules in the diff generation"
msgstr ""
-#: remote.c:2076
-#, c-format
-msgid "Your branch is based on '%s', but the upstream is gone.\n"
+#: diff.c:5486
+msgid "<format>"
msgstr ""
-#: remote.c:2080
-msgid " (use \"git branch --unset-upstream\" to fixup)\n"
+#: diff.c:5487
+msgid "specify how differences in submodules are shown"
msgstr ""
-#: remote.c:2083
-#, c-format
-msgid "Your branch is up-to-date with '%s'.\n"
+#: diff.c:5491
+msgid "hide 'git add -N' entries from the index"
msgstr ""
-#: remote.c:2087
-#, c-format
-msgid "Your branch is ahead of '%s' by %d commit.\n"
-msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: remote.c:2093
-msgid " (use \"git push\" to publish your local commits)\n"
+#: diff.c:5494
+msgid "treat 'git add -N' entries as real in the index"
msgstr ""
-#: remote.c:2096
-#, 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:2104
-msgid " (use \"git pull\" to update your local branch)\n"
+#: diff.c:5496
+msgid "<string>"
msgstr ""
-#: remote.c:2107
-#, c-format
+#: diff.c:5497
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:2117
-msgid " (use \"git pull\" to merge the remote branch into yours)\n"
-msgstr ""
-
-#: revision.c:2187
-msgid "your current branch appears to be broken"
-msgstr ""
-
-#: revision.c:2190
-#, c-format
-msgid "your current branch '%s' does not have any commits yet"
-msgstr ""
-
-#: revision.c:2384
-msgid "--first-parent is incompatible with --bisect"
+"look for differences that change the number of occurrences of the specified "
+"string"
msgstr ""
-#: run-command.c:644
-msgid "open /dev/null failed"
+#: diff.c:5500
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"regex"
msgstr ""
-#: send-pack.c:151
-#, c-format
-msgid "unable to parse remote unpack status: %s"
+#: diff.c:5503
+msgid "show all changes in the changeset with -S or -G"
msgstr ""
-#: send-pack.c:153
-#, c-format
-msgid "remote unpack failed: %s"
+#: diff.c:5506
+msgid "treat <string> in -S as extended POSIX regular expression"
msgstr ""
-#: send-pack.c:316
-msgid "failed to sign the push certificate"
+#: diff.c:5509
+msgid "control the order in which files appear in the output"
msgstr ""
-#: send-pack.c:429
-msgid "the receiving end does not support --signed push"
+#: diff.c:5510
+msgid "<object-id>"
msgstr ""
-#: send-pack.c:431
+#: diff.c:5511
msgid ""
-"not sending a push certificate since the receiving end does not support --"
-"signed push"
+"look for differences that change the number of occurrences of the specified "
+"object"
msgstr ""
-#: send-pack.c:443
-msgid "the receiving end does not support --atomic push"
-msgstr ""
-
-#: send-pack.c:448
-msgid "the receiving end does not support push options"
+#: diff.c:5513
+msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
msgstr ""
-#: sequencer.c:216
-msgid "revert"
+#: diff.c:5514
+msgid "select files by diff type"
msgstr ""
-#: sequencer.c:218
-msgid "cherry-pick"
+#: diff.c:5516
+msgid "<file>"
msgstr ""
-#: sequencer.c:220
-msgid "rebase -i"
+#: diff.c:5517
+msgid "Output to a specific file"
msgstr ""
-#: sequencer.c:222
-#, c-format
-msgid "Unknown action: %d"
+#: diff.c:6150
+msgid "inexact rename detection was skipped due to too many files."
msgstr ""
-#: sequencer.c:279
-msgid ""
-"after resolving the conflicts, mark the corrected paths\n"
-"with 'git add <paths>' or 'git rm <paths>'"
+#: diff.c:6153
+msgid "only found copies from modified paths due to too many files."
msgstr ""
-#: sequencer.c:282
+#: diff.c:6156
+#, c-format
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'"
+"you may want to set your %s variable to at least %d and retry the command."
msgstr ""
-#: sequencer.c:295 sequencer.c:1685
+#: dir.c:537
#, c-format
-msgid "could not lock '%s'"
+msgid "pathspec '%s' did not match any file(s) known to git"
msgstr ""
-#: sequencer.c:298 sequencer.c:1563 sequencer.c:1690 sequencer.c:1704
+#: dir.c:926
#, c-format
-msgid "could not write to '%s'"
+msgid "cannot use %s as an exclude file"
msgstr ""
-#: sequencer.c:302
+#: dir.c:1843
#, c-format
-msgid "could not write eol to '%s'"
+msgid "could not open directory '%s'"
msgstr ""
-#: sequencer.c:306 sequencer.c:1568 sequencer.c:1692
-#, c-format
-msgid "failed to finalize '%s'."
+#: dir.c:2085
+msgid "failed to get kernel name and information"
msgstr ""
-#: sequencer.c:330 sequencer.c:817 sequencer.c:1589 builtin/am.c:258
-#: builtin/commit.c:750 builtin/merge.c:1017
-#, c-format
-msgid "could not read '%s'"
+#: dir.c:2209
+msgid "untracked cache is disabled on this system or location"
msgstr ""
-#: sequencer.c:356
+#: dir.c:3013
#, c-format
-msgid "your local changes would be overwritten by %s."
-msgstr ""
-
-#: sequencer.c:360
-msgid "commit your changes or stash them to proceed."
+msgid "index file corrupt in repo %s"
msgstr ""
-#: sequencer.c:389
+#: dir.c:3058 dir.c:3063
#, c-format
-msgid "%s: fast-forward"
+msgid "could not create directories for %s"
msgstr ""
-#. TRANSLATORS: %s will be "revert", "cherry-pick" or
-#. "rebase -i".
-#.
-#: sequencer.c:472
+#: dir.c:3092
#, c-format
-msgid "%s: Unable to write new index file"
+msgid "could not migrate git directory from '%s' to '%s'"
msgstr ""
-#: sequencer.c:491
-msgid "could not resolve HEAD commit\n"
+#: editor.c:73
+#, c-format
+msgid "hint: Waiting for your editor to close the file...%c"
msgstr ""
-#: sequencer.c:511
-msgid "unable to update cache tree\n"
+#: entry.c:178
+msgid "Filtering content"
msgstr ""
-#: sequencer.c:595
+#: entry.c:476
#, 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"
+msgid "could not stat file '%s'"
msgstr ""
-#: sequencer.c:697
+#: environment.c:150
#, c-format
-msgid "could not parse commit %s\n"
+msgid "bad git namespace path \"%s\""
msgstr ""
-#: sequencer.c:702
+#: environment.c:332
#, c-format
-msgid "could not parse parent commit %s\n"
+msgid "could not set GIT_DIR to '%s'"
msgstr ""
-#: sequencer.c:824
+#: exec-cmd.c:363
#, c-format
-msgid ""
-"unexpected 1st line of squash message:\n"
-"\n"
-"\t%.*s"
+msgid "too many args to run %s"
msgstr ""
-#: sequencer.c:830
-#, c-format
-msgid ""
-"invalid 1st line of squash message:\n"
-"\n"
-"\t%.*s"
+#: fetch-object.c:17
+msgid "Remote with no URL"
msgstr ""
-#: sequencer.c:836 sequencer.c:861
-#, c-format
-msgid "This is a combination of %d commits."
+#: fetch-pack.c:151
+msgid "git fetch-pack: expected shallow list"
msgstr ""
-#: sequencer.c:845
-msgid "need a HEAD to fixup"
+#: fetch-pack.c:154
+msgid "git fetch-pack: expected a flush packet after shallow list"
msgstr ""
-#: sequencer.c:847
-msgid "could not read HEAD"
+#: fetch-pack.c:165
+msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
msgstr ""
-#: sequencer.c:849
-msgid "could not read HEAD's commit message"
+#: fetch-pack.c:185
+#, c-format
+msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr ""
-#: sequencer.c:855
-#, c-format
-msgid "cannot write '%s'"
+#: fetch-pack.c:196
+msgid "unable to write to remote"
msgstr ""
-#: sequencer.c:864 git-rebase--interactive.sh:445
-msgid "This is the 1st commit message:"
+#: fetch-pack.c:258
+msgid "--stateless-rpc requires multi_ack_detailed"
msgstr ""
-#: sequencer.c:872
+#: fetch-pack.c:360 fetch-pack.c:1271
#, c-format
-msgid "could not read commit message of %s"
+msgid "invalid shallow line: %s"
msgstr ""
-#: sequencer.c:879
+#: fetch-pack.c:366 fetch-pack.c:1277
#, c-format
-msgid "This is the commit message #%d:"
+msgid "invalid unshallow line: %s"
msgstr ""
-#: sequencer.c:884
+#: fetch-pack.c:368 fetch-pack.c:1279
#, c-format
-msgid "The commit message #%d will be skipped:"
+msgid "object not found: %s"
msgstr ""
-#: sequencer.c:889
+#: fetch-pack.c:371 fetch-pack.c:1282
#, c-format
-msgid "unknown command: %d"
+msgid "error in object: %s"
msgstr ""
-#: sequencer.c:955
-msgid "your index file is unmerged."
+#: fetch-pack.c:373 fetch-pack.c:1284
+#, c-format
+msgid "no shallow found: %s"
msgstr ""
-#: sequencer.c:973
+#: fetch-pack.c:376 fetch-pack.c:1288
#, c-format
-msgid "commit %s is a merge but no -m option was given."
+msgid "expected shallow/unshallow, got %s"
msgstr ""
-#: sequencer.c:981
+#: fetch-pack.c:417
#, c-format
-msgid "commit %s does not have parent %d"
+msgid "got %s %d %s"
msgstr ""
-#: sequencer.c:985
+#: fetch-pack.c:434
#, c-format
-msgid "mainline was specified but commit %s is not a merge."
+msgid "invalid commit %s"
msgstr ""
-#: sequencer.c:991
-#, c-format
-msgid "cannot get commit message for %s"
+#: fetch-pack.c:465
+msgid "giving up"
msgstr ""
-#. TRANSLATORS: The first %s will be a "todo" command like
-#. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:1012
-#, c-format
-msgid "%s: cannot parse parent commit %s"
+#: fetch-pack.c:477 progress.c:284
+msgid "done"
msgstr ""
-#: sequencer.c:1075 sequencer.c:1830
+#: fetch-pack.c:489
#, c-format
-msgid "could not rename '%s' to '%s'"
+msgid "got %s (%d) %s"
msgstr ""
-#: sequencer.c:1126
+#: fetch-pack.c:535
#, c-format
-msgid "could not revert %s... %s"
+msgid "Marking %s as complete"
msgstr ""
-#: sequencer.c:1127
+#: fetch-pack.c:744
#, c-format
-msgid "could not apply %s... %s"
+msgid "already have %s (%s)"
msgstr ""
-#: sequencer.c:1169
-msgid "empty commit set passed"
+#: fetch-pack.c:783
+msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr ""
-#: sequencer.c:1179
-#, c-format
-msgid "git %s: failed to read the index"
+#: fetch-pack.c:791
+msgid "protocol error: bad pack header"
msgstr ""
-#: sequencer.c:1186
+#: fetch-pack.c:859
#, c-format
-msgid "git %s: failed to refresh the index"
+msgid "fetch-pack: unable to fork off %s"
msgstr ""
-#: sequencer.c:1306
+#: fetch-pack.c:875
#, c-format
-msgid "invalid line %d: %.*s"
+msgid "%s failed"
msgstr ""
-#: sequencer.c:1314
-#, c-format
-msgid "cannot '%s' without a previous commit"
+#: fetch-pack.c:877
+msgid "error in sideband demultiplexer"
msgstr ""
-#: sequencer.c:1347
-#, c-format
-msgid "could not read '%s'."
+#: fetch-pack.c:906
+msgid "Server does not support shallow clients"
msgstr ""
-#: sequencer.c:1359
-msgid "please fix this using 'git rebase --edit-todo'."
+#: fetch-pack.c:910
+msgid "Server supports multi_ack_detailed"
msgstr ""
-#: sequencer.c:1361
-#, c-format
-msgid "unusable instruction sheet: '%s'"
+#: fetch-pack.c:913
+msgid "Server supports no-done"
msgstr ""
-#: sequencer.c:1366
-msgid "no commits parsed."
+#: fetch-pack.c:919
+msgid "Server supports multi_ack"
msgstr ""
-#: sequencer.c:1377
-msgid "cannot cherry-pick during a revert."
+#: fetch-pack.c:923
+msgid "Server supports side-band-64k"
msgstr ""
-#: sequencer.c:1379
-msgid "cannot revert during a cherry-pick."
+#: fetch-pack.c:927
+msgid "Server supports side-band"
msgstr ""
-#: sequencer.c:1442
-#, c-format
-msgid "invalid key: %s"
+#: fetch-pack.c:931
+msgid "Server supports allow-tip-sha1-in-want"
msgstr ""
-#: sequencer.c:1445
-#, c-format
-msgid "invalid value for %s: %s"
+#: fetch-pack.c:935
+msgid "Server supports allow-reachable-sha1-in-want"
+msgstr ""
+
+#: fetch-pack.c:945
+msgid "Server supports ofs-delta"
msgstr ""
-#: sequencer.c:1502
+#: fetch-pack.c:951 fetch-pack.c:1144
+msgid "Server supports filter"
+msgstr ""
+
+#: fetch-pack.c:959
#, c-format
-msgid "malformed options sheet: '%s'"
+msgid "Server version is %.*s"
msgstr ""
-#: sequencer.c:1540
-msgid "a cherry-pick or revert is already in progress"
+#: fetch-pack.c:965
+msgid "Server does not support --shallow-since"
msgstr ""
-#: sequencer.c:1541
-msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
+#: fetch-pack.c:969
+msgid "Server does not support --shallow-exclude"
msgstr ""
-#: sequencer.c:1544
-#, c-format
-msgid "could not create sequencer directory '%s'"
+#: fetch-pack.c:971
+msgid "Server does not support --deepen"
msgstr ""
-#: sequencer.c:1558
-msgid "could not lock HEAD"
+#: fetch-pack.c:988
+msgid "no common commits"
msgstr ""
-#: sequencer.c:1614 sequencer.c:2188
-msgid "no cherry-pick or revert in progress"
+#: fetch-pack.c:1000 fetch-pack.c:1449
+msgid "git fetch-pack: fetch failed."
msgstr ""
-#: sequencer.c:1616
-msgid "cannot resolve HEAD"
+#: fetch-pack.c:1138
+msgid "Server does not support shallow requests"
msgstr ""
-#: sequencer.c:1618 sequencer.c:1652
-msgid "cannot abort from a branch yet to be born"
+#: fetch-pack.c:1171
+msgid "unable to write request to remote"
msgstr ""
-#: sequencer.c:1638 builtin/grep.c:929
+#: fetch-pack.c:1189
#, c-format
-msgid "cannot open '%s'"
+msgid "error reading section header '%s'"
msgstr ""
-#: sequencer.c:1640
+#: fetch-pack.c:1195
#, c-format
-msgid "cannot read '%s': %s"
+msgid "expected '%s', received '%s'"
msgstr ""
-#: sequencer.c:1641
-msgid "unexpected end of file"
+#: fetch-pack.c:1234
+#, c-format
+msgid "unexpected acknowledgment line: '%s'"
msgstr ""
-#: sequencer.c:1647
+#: fetch-pack.c:1239
#, c-format
-msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
+msgid "error processing acks: %d"
msgstr ""
-#: sequencer.c:1658
-msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
+#: fetch-pack.c:1249
+msgid "expected packfile to be sent after 'ready'"
msgstr ""
-#: sequencer.c:1795 sequencer.c:2086
-msgid "cannot read HEAD"
+#: fetch-pack.c:1251
+msgid "expected no other sections to be sent after no 'ready'"
msgstr ""
-#: sequencer.c:1835 builtin/difftool.c:633
+#: fetch-pack.c:1293
#, c-format
-msgid "could not copy '%s' to '%s'"
+msgid "error processing shallow info: %d"
msgstr ""
-#: sequencer.c:1851
-msgid "could not read index"
+#: fetch-pack.c:1340
+#, c-format
+msgid "expected wanted-ref, got '%s'"
msgstr ""
-#: sequencer.c:1856
+#: fetch-pack.c:1345
#, c-format
-msgid ""
-"execution failed: %s\n"
-"%sYou can fix the problem, and then run\n"
-"\n"
-" git rebase --continue\n"
-"\n"
+msgid "unexpected wanted-ref: '%s'"
msgstr ""
-#: sequencer.c:1862
-msgid "and made changes to the index and/or the working tree\n"
+#: fetch-pack.c:1350
+#, c-format
+msgid "error processing wanted refs: %d"
msgstr ""
-#: sequencer.c:1868
-#, c-format
-msgid ""
-"execution succeeded: %s\n"
-"but left changes to the index and/or the working tree\n"
-"Commit or stash your changes, and then run\n"
-"\n"
-" git rebase --continue\n"
-"\n"
+#: fetch-pack.c:1676
+msgid "no matching remote head"
msgstr ""
-#: sequencer.c:1925
-#, c-format
-msgid "Applied autostash.\n"
+#: fetch-pack.c:1699 builtin/clone.c:673
+msgid "remote did not send all necessary objects"
msgstr ""
-#: sequencer.c:1937
+#: fetch-pack.c:1726
#, c-format
-msgid "cannot store %s"
+msgid "no such remote ref %s"
msgstr ""
-#: sequencer.c:1940 git-rebase.sh:173
+#: fetch-pack.c:1729
#, 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 "Server does not allow request for unadvertised object %s"
msgstr ""
-#: sequencer.c:2022
-#, c-format
-msgid "Stopped at %s... %.*s\n"
+#: gpg-interface.c:318
+msgid "gpg failed to sign the data"
+msgstr ""
+
+#: gpg-interface.c:344
+msgid "could not create temporary file"
msgstr ""
-#: sequencer.c:2064
+#: gpg-interface.c:347
#, c-format
-msgid "unknown command %d"
+msgid "failed writing detached signature to '%s'"
msgstr ""
-#: sequencer.c:2094
-msgid "could not read orig-head"
+#: graph.c:97
+#, c-format
+msgid "ignore invalid color '%.*s' in log.graphColors"
msgstr ""
-#: sequencer.c:2099
-msgid "could not read 'onto'"
+#: grep.c:2113
+#, c-format
+msgid "'%s': unable to read %s"
msgstr ""
-#: sequencer.c:2106
+#: grep.c:2130 setup.c:164 builtin/clone.c:411 builtin/diff.c:82
+#: builtin/rm.c:135
#, c-format
-msgid "could not update %s"
+msgid "failed to stat '%s'"
msgstr ""
-#: sequencer.c:2113
+#: grep.c:2141
#, c-format
-msgid "could not update HEAD to %s"
+msgid "'%s': short read"
msgstr ""
-#: sequencer.c:2197
-msgid "cannot rebase: You have unstaged changes."
+#: help.c:23
+msgid "start a working area (see also: git help tutorial)"
msgstr ""
-#: sequencer.c:2202
-msgid "could not remove CHERRY_PICK_HEAD"
+#: help.c:24
+msgid "work on the current change (see also: git help everyday)"
msgstr ""
-#: sequencer.c:2211
-msgid "cannot amend non-existing commit"
+#: help.c:25
+msgid "examine the history and state (see also: git help revisions)"
msgstr ""
-#: sequencer.c:2213
-#, c-format
-msgid "invalid file: '%s'"
+#: help.c:26
+msgid "grow, mark and tweak your common history"
msgstr ""
-#: sequencer.c:2215
-#, c-format
-msgid "invalid contents: '%s'"
+#: help.c:27
+msgid "collaborate (see also: git help workflows)"
msgstr ""
-#: sequencer.c:2218
-msgid ""
-"\n"
-"You have uncommitted changes in your working tree. Please, commit them\n"
-"first and then run 'git rebase --continue' again."
+#: help.c:31
+msgid "Main Porcelain Commands"
msgstr ""
-#: sequencer.c:2228
-msgid "could not commit staged changes."
+#: help.c:32
+msgid "Ancillary Commands / Manipulators"
msgstr ""
-#: sequencer.c:2308
-#, c-format
-msgid "%s: can't cherry-pick a %s"
+#: help.c:33
+msgid "Ancillary Commands / Interrogators"
msgstr ""
-#: sequencer.c:2312
-#, c-format
-msgid "%s: bad revision"
+#: help.c:34
+msgid "Interacting with Others"
msgstr ""
-#: sequencer.c:2345
-msgid "can't revert as initial commit"
+#: help.c:35
+msgid "Low-level Commands / Manipulators"
msgstr ""
-#: setup.c:171
-#, c-format
-msgid ""
-"%s: no such path in the working tree.\n"
-"Use 'git <command> -- <path>...' to specify paths that do not exist locally."
+#: help.c:36
+msgid "Low-level Commands / Interrogators"
msgstr ""
-#: setup.c:184
-#, 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>...]'"
+#: help.c:37
+msgid "Low-level Commands / Synching Repositories"
msgstr ""
-#: setup.c:252
-#, c-format
-msgid ""
-"ambiguous argument '%s': both revision and filename\n"
-"Use '--' to separate paths from revisions, like this:\n"
-"'git <command> [<revision>...] -- [<file>...]'"
+#: help.c:38
+msgid "Low-level Commands / Internal Helpers"
msgstr ""
-#: setup.c:504
+#: help.c:298
#, c-format
-msgid "Expected git repo version <= %d, found %d"
+msgid "available git commands in '%s'"
msgstr ""
-#: setup.c:512
-msgid "unknown repository extensions found:"
+#: help.c:305
+msgid "git commands available from elsewhere on your $PATH"
+msgstr ""
+
+#: help.c:314
+msgid "These are common Git commands used in various situations:"
msgstr ""
-#: setup.c:810
+#: help.c:363 git.c:97
#, c-format
-msgid "Not a git repository (or any of the parent directories): %s"
+msgid "unsupported command listing type '%s'"
msgstr ""
-#: setup.c:812 builtin/index-pack.c:1652
-msgid "Cannot come back to cwd"
+#: help.c:403
+msgid "The common Git guides are:"
msgstr ""
-#: setup.c:1050
-msgid "Unable to read current working directory"
+#: help.c:512
+msgid "See 'git help <command>' to read about a specific subcommand"
msgstr ""
-#: setup.c:1062 setup.c:1068
-#, c-format
-msgid "Cannot change to '%s'"
+#: help.c:517
+msgid "External commands"
msgstr ""
-#: setup.c:1081
-#, 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)."
+#: help.c:532
+msgid "Command aliases"
msgstr ""
-#: setup.c:1173
+#: help.c:596
#, c-format
msgid ""
-"Problem with core.sharedRepository filemode value (0%.3o).\n"
-"The owner of files must always have read and write permissions."
+"'%s' appears to be a git command, but we were not\n"
+"able to execute it. Maybe git-%s is broken?"
msgstr ""
-#: sha1_file.c:560
-#, c-format
-msgid "path '%s' does not exist"
+#: help.c:655
+msgid "Uh oh. Your system reports no Git commands at all."
msgstr ""
-#: sha1_file.c:586
+#: help.c:677
#, c-format
-msgid "reference repository '%s' as a linked checkout is not supported yet."
+msgid "WARNING: You called a Git command named '%s', which does not exist."
msgstr ""
-#: sha1_file.c:592
+#: help.c:682
#, c-format
-msgid "reference repository '%s' is not a local repository."
+msgid "Continuing under the assumption that you meant '%s'."
msgstr ""
-#: sha1_file.c:598
+#: help.c:687
#, c-format
-msgid "reference repository '%s' is shallow"
+msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
msgstr ""
-#: sha1_file.c:606
+#: help.c:695
#, c-format
-msgid "reference repository '%s' is grafted"
-msgstr ""
-
-#: sha1_file.c:1245
-msgid "offset before end of packfile (broken .idx?)"
+msgid "git: '%s' is not a git command. See 'git --help'."
msgstr ""
-#: sha1_file.c:2729
-#, c-format
-msgid "offset before start of pack index for %s (corrupt index?)"
-msgstr ""
+#: help.c:699
+msgid ""
+"\n"
+"The most similar command is"
+msgid_plural ""
+"\n"
+"The most similar commands are"
+msgstr[0] ""
+msgstr[1] ""
-#: sha1_file.c:2733
-#, c-format
-msgid "offset beyond end of pack index for %s (truncated index?)"
+#: help.c:714
+msgid "git version [<options>]"
msgstr ""
-#: sha1_name.c:419
+#: help.c:782
#, c-format
-msgid "short SHA1 %s is ambiguous"
+msgid "%s: %s - %s"
msgstr ""
-#: sha1_name.c:430
-msgid "The candidates are:"
-msgstr ""
+#: help.c:786
+msgid ""
+"\n"
+"Did you mean this?"
+msgid_plural ""
+"\n"
+"Did you mean one of these?"
+msgstr[0] ""
+msgstr[1] ""
-#: sha1_name.c:589
+#: ident.c:349
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"
+"*** 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"
-"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 ""
-#: submodule.c:70 submodule.c:104
-msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
+#: ident.c:379
+msgid "no email was given and auto-detection is disabled"
msgstr ""
-#: submodule.c:74 submodule.c:108
+#: ident.c:384
#, c-format
-msgid "Could not find section in .gitmodules where path=%s"
+msgid "unable to auto-detect email address (got '%s')"
msgstr ""
-#: submodule.c:82
-#, c-format
-msgid "Could not update .gitmodules entry %s"
+#: ident.c:401
+msgid "no name was given and auto-detection is disabled"
msgstr ""
-#: submodule.c:115
+#: ident.c:407
#, c-format
-msgid "Could not remove .gitmodules entry for %s"
-msgstr ""
-
-#: submodule.c:126
-msgid "staging updated .gitmodules failed"
+msgid "unable to auto-detect name (got '%s')"
msgstr ""
-#: submodule.c:165
-msgid "negative values not allowed for submodule.fetchJobs"
+#: ident.c:415
+#, c-format
+msgid "empty ident name (for <%s>) not allowed"
msgstr ""
-#: submodule.c:376
+#: ident.c:421
#, c-format
-msgid "in unpopulated submodule '%s'"
+msgid "name consists only of disallowed characters: %s"
msgstr ""
-#: submodule.c:407
+#: ident.c:436 builtin/commit.c:608
#, c-format
-msgid "Pathspec '%s' is in submodule '%.*s'"
+msgid "invalid date format: %s"
msgstr ""
-#: submodule.c:1337
+#: list-objects.c:129
#, c-format
-msgid "'%s' not recognized as a git repository"
+msgid "entry '%s' in tree %s has tree mode, but is not a tree"
msgstr ""
-#: submodule.c:1475
+#: list-objects.c:142
#, c-format
-msgid "could not start 'git status' in submodule '%s'"
+msgid "entry '%s' in tree %s has blob mode, but is not a blob"
msgstr ""
-#: submodule.c:1488
+#: list-objects.c:378
#, c-format
-msgid "could not run 'git status' in submodule '%s'"
+msgid "unable to load root tree for commit %s"
msgstr ""
-#: submodule.c:1581
-#, c-format
-msgid "submodule '%s' has dirty index"
+#: list-objects-filter-options.c:36
+msgid "multiple filter-specs cannot be combined"
msgstr ""
-#: submodule.c:1845
-#, c-format
-msgid ""
-"relocate_gitdir for submodule '%s' with more than one worktree not supported"
+#: list-objects-filter-options.c:58
+msgid "expected 'tree:<depth>'"
msgstr ""
-#: submodule.c:1857 submodule.c:1913
-#, c-format
-msgid "could not lookup name for submodule '%s'"
+#: list-objects-filter-options.c:84
+msgid "sparse:path filters support has been dropped"
msgstr ""
-#: submodule.c:1861 builtin/submodule--helper.c:678
-#: builtin/submodule--helper.c:688
-#, c-format
-msgid "could not create directory '%s'"
+#: list-objects-filter-options.c:158
+msgid "cannot change partial clone promisor remote"
msgstr ""
-#: submodule.c:1864
+#: lockfile.c:151
#, c-format
msgid ""
-"Migrating git directory of '%s%s' from\n"
-"'%s' to\n"
-"'%s'\n"
+"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 ""
-#: submodule.c:1948
+#: lockfile.c:159
#, c-format
-msgid "could not recurse into submodule '%s'"
+msgid "Unable to create '%s.lock': %s"
msgstr ""
-#: submodule.c:1992
-msgid "could not start ls-files in .."
+#: merge.c:41
+msgid "failed to read the cache"
msgstr ""
-#: submodule.c:2012
-msgid "BUG: returned path string doesn't match cwd?"
+#: merge.c:107 rerere.c:720 builtin/am.c:1887 builtin/am.c:1921
+#: builtin/checkout.c:461 builtin/checkout.c:811 builtin/clone.c:773
+#: builtin/stash.c:264
+msgid "unable to write new index file"
msgstr ""
-#: submodule.c:2031
-#, c-format
-msgid "ls-tree returned unexpected return code %d"
+#: merge-recursive.c:322
+msgid "(bad commit)\n"
msgstr ""
-#: submodule-config.c:420
+#: merge-recursive.c:345
#, c-format
-msgid "invalid value for %s"
+msgid "add_cacheinfo failed for path '%s'; merge aborting."
msgstr ""
-#: trailer.c:241
+#: merge-recursive.c:354
#, c-format
-msgid "running trailer command '%s' failed"
+msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
msgstr ""
-#: trailer.c:474 trailer.c:478 trailer.c:482 trailer.c:536 trailer.c:540
-#: trailer.c:544
-#, c-format
-msgid "unknown value '%s' for key '%s'"
+#: merge-recursive.c:437
+msgid "error building trees"
msgstr ""
-#: trailer.c:526 trailer.c:531 builtin/remote.c:290
+#: merge-recursive.c:861
#, c-format
-msgid "more than one %s"
+msgid "failed to create path '%s'%s"
msgstr ""
-#: trailer.c:703
+#: merge-recursive.c:872
#, c-format
-msgid "empty trailer token in trailer '%.*s'"
+msgid "Removing %s to make room for subdirectory\n"
+msgstr ""
+
+#: merge-recursive.c:886 merge-recursive.c:905
+msgid ": perhaps a D/F conflict?"
msgstr ""
-#: trailer.c:723
+#: merge-recursive.c:895
#, c-format
-msgid "could not read input file '%s'"
+msgid "refusing to lose untracked file at '%s'"
msgstr ""
-#: trailer.c:726
-msgid "could not read from stdin"
+#: merge-recursive.c:936 builtin/cat-file.c:40
+#, c-format
+msgid "cannot read object %s '%s'"
msgstr ""
-#: trailer.c:950 builtin/am.c:45
+#: merge-recursive.c:939
#, c-format
-msgid "could not stat %s"
+msgid "blob expected for %s '%s'"
msgstr ""
-#: trailer.c:952
+#: merge-recursive.c:963
#, c-format
-msgid "file %s is not a regular file"
+msgid "failed to open '%s': %s"
msgstr ""
-#: trailer.c:954
+#: merge-recursive.c:974
#, c-format
-msgid "file %s is not writable by user"
+msgid "failed to symlink '%s': %s"
msgstr ""
-#: trailer.c:966
-msgid "could not open temporary file"
+#: merge-recursive.c:979
+#, c-format
+msgid "do not know what to do with %06o %s '%s'"
msgstr ""
-#: trailer.c:1002
+#: merge-recursive.c:1175
#, c-format
-msgid "could not rename temporary file to %s"
+msgid "Failed to merge submodule %s (not checked out)"
msgstr ""
-#: transport.c:63
+#: merge-recursive.c:1182
#, c-format
-msgid "Would set upstream of '%s' to '%s' of '%s'\n"
+msgid "Failed to merge submodule %s (commits not present)"
msgstr ""
-#: transport.c:152
+#: merge-recursive.c:1189
#, c-format
-msgid "transport: invalid depth option '%s'"
+msgid "Failed to merge submodule %s (commits don't follow merge-base)"
msgstr ""
-#: transport.c:890
+#: merge-recursive.c:1197 merge-recursive.c:1209
#, c-format
-msgid ""
-"The following submodule paths contain changes that can\n"
-"not be found on any remote:\n"
+msgid "Fast-forwarding submodule %s to the following commit:"
msgstr ""
-#: transport.c:894
+#: merge-recursive.c:1200 merge-recursive.c:1212
#, 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 "Fast-forwarding submodule %s"
msgstr ""
-#: transport.c:902
-msgid "Aborting."
+#: merge-recursive.c:1235
+#, c-format
+msgid "Failed to merge submodule %s (merge following commits not found)"
msgstr ""
-#: transport-helper.c:1071
+#: merge-recursive.c:1239
#, c-format
-msgid "Could not read ref %s"
+msgid "Failed to merge submodule %s (not fast-forward)"
msgstr ""
-#: tree-walk.c:31
-msgid "too-short tree object"
+#: merge-recursive.c:1240
+msgid "Found a possible merge resolution for the submodule:\n"
msgstr ""
-#: tree-walk.c:37
-msgid "malformed mode in tree entry"
-msgstr ""
-
-#: tree-walk.c:41
-msgid "empty filename in tree entry"
-msgstr ""
-
-#: tree-walk.c:113
-msgid "too-short tree file"
-msgstr ""
-
-#: unpack-trees.c:105
+#: merge-recursive.c:1243
#, 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."
+"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 ""
-#: unpack-trees.c:107
+#: merge-recursive.c:1252
#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by checkout:\n"
-"%%s"
+msgid "Failed to merge submodule %s (multiple merges found)"
msgstr ""
-#: unpack-trees.c:110
-#, 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."
+#: merge-recursive.c:1325
+msgid "Failed to execute internal merge"
msgstr ""
-#: unpack-trees.c:112
+#: merge-recursive.c:1330
#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by merge:\n"
-"%%s"
+msgid "Unable to add %s to database"
msgstr ""
-#: unpack-trees.c:115
+#: merge-recursive.c:1362
#, 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 "Auto-merging %s"
msgstr ""
-#: unpack-trees.c:117
+#: merge-recursive.c:1385
#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by %s:\n"
-"%%s"
+msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
msgstr ""
-#: unpack-trees.c:122
+#: merge-recursive.c:1457
#, c-format
msgid ""
-"Updating the following directories would lose untracked files in them:\n"
-"%s"
+"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
+"in tree."
msgstr ""
-#: unpack-trees.c:126
+#: merge-recursive.c:1462
#, c-format
msgid ""
-"The following untracked working tree files would be removed by checkout:\n"
-"%%sPlease move or remove them before you switch branches."
+"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
+"left in tree."
msgstr ""
-#: unpack-trees.c:128
+#: merge-recursive.c:1469
#, c-format
msgid ""
-"The following untracked working tree files would be removed by checkout:\n"
-"%%s"
+"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
+"in tree at %s."
msgstr ""
-#: unpack-trees.c:131
+#: merge-recursive.c:1474
#, c-format
msgid ""
-"The following untracked working tree files would be removed by merge:\n"
-"%%sPlease move or remove them before you merge."
+"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
+"left in tree at %s."
msgstr ""
-#: unpack-trees.c:133
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by merge:\n"
-"%%s"
+#: merge-recursive.c:1509
+msgid "rename"
msgstr ""
-#: unpack-trees.c:136
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by %s:\n"
-"%%sPlease move or remove them before you %s."
+#: merge-recursive.c:1509
+msgid "renamed"
msgstr ""
-#: unpack-trees.c:138
+#: merge-recursive.c:1589 merge-recursive.c:2445 merge-recursive.c:3085
#, c-format
-msgid ""
-"The following untracked working tree files would be removed by %s:\n"
-"%%s"
+msgid "Refusing to lose dirty file at %s"
msgstr ""
-#: unpack-trees.c:143
+#: merge-recursive.c:1599
#, 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 "Refusing to lose untracked file at %s, even though it's in the way."
msgstr ""
-#: unpack-trees.c:145
+#: merge-recursive.c:1657
#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by "
-"checkout:\n"
-"%%s"
+msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
msgstr ""
-#: unpack-trees.c:148
+#: merge-recursive.c:1687
#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by merge:\n"
-"%%sPlease move or remove them before you merge."
+msgid "%s is a directory in %s adding as %s instead"
msgstr ""
-#: unpack-trees.c:150
+#: merge-recursive.c:1692
#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by merge:\n"
-"%%s"
+msgid "Refusing to lose untracked file at %s; adding as %s instead"
msgstr ""
-#: unpack-trees.c:153
+#: merge-recursive.c:1711
#, c-format
msgid ""
-"The following untracked working tree files would be overwritten by %s:\n"
-"%%sPlease move or remove them before you %s."
+"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
+"\"->\"%s\" in \"%s\"%s"
msgstr ""
-#: unpack-trees.c:155
+#: merge-recursive.c:1716
+msgid " (left unresolved)"
+msgstr ""
+
+#: merge-recursive.c:1825
#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by %s:\n"
-"%%s"
+msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr ""
-#: unpack-trees.c:162
+#: merge-recursive.c:2030
#, c-format
-msgid "Entry '%s' overlaps with '%s'. Cannot bind."
+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 ""
-#: unpack-trees.c:165
+#: merge-recursive.c:2062
#, c-format
msgid ""
-"Cannot update sparse checkout: the following entries are not up-to-date:\n"
-"%s"
+"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 ""
-#: unpack-trees.c:167
+#: merge-recursive.c:2072
#, c-format
msgid ""
-"The following working tree files would be overwritten by sparse checkout "
-"update:\n"
-"%s"
+"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
+"implicit directory renames tried to put these paths there: %s"
msgstr ""
-#: unpack-trees.c:169
+#: merge-recursive.c:2164
#, c-format
msgid ""
-"The following working tree files would be removed by sparse checkout "
-"update:\n"
-"%s"
+"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
+">%s in %s"
msgstr ""
-#: unpack-trees.c:171
+#: merge-recursive.c:2408
#, c-format
msgid ""
-"Cannot update submodule:\n"
-"%s"
+"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
+"renamed."
msgstr ""
-#: unpack-trees.c:248
+#: merge-recursive.c:2929
#, c-format
-msgid "Aborting\n"
+msgid "cannot read object %s"
msgstr ""
-#: unpack-trees.c:277
+#: merge-recursive.c:2932
#, c-format
-msgid "submodule update strategy not supported for submodule '%s'"
+msgid "object %s is not a blob"
msgstr ""
-#: unpack-trees.c:346
-msgid "Checking out files"
+#: merge-recursive.c:2996
+msgid "modify"
msgstr ""
-#: urlmatch.c:163
-msgid "invalid URL scheme name or missing '://' suffix"
+#: merge-recursive.c:2996
+msgid "modified"
msgstr ""
-#: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405
-#, c-format
-msgid "invalid %XX escape sequence"
+#: merge-recursive.c:3008
+msgid "content"
msgstr ""
-#: urlmatch.c:215
-msgid "missing host and scheme is not 'file:'"
+#: merge-recursive.c:3012
+msgid "add/add"
msgstr ""
-#: urlmatch.c:232
-msgid "a 'file:' URL may not have a port number"
+#: merge-recursive.c:3035
+#, c-format
+msgid "Skipped %s (merged same as existing)"
msgstr ""
-#: urlmatch.c:247
-msgid "invalid characters in host name"
+#: merge-recursive.c:3057 git-submodule.sh:937
+msgid "submodule"
msgstr ""
-#: urlmatch.c:292 urlmatch.c:303
-msgid "invalid port number"
+#: merge-recursive.c:3058
+#, c-format
+msgid "CONFLICT (%s): Merge conflict in %s"
msgstr ""
-#: urlmatch.c:371
-msgid "invalid '..' path segment"
+#: merge-recursive.c:3088
+#, c-format
+msgid "Adding as %s instead"
msgstr ""
-#: worktree.c:245
+#: merge-recursive.c:3170
#, c-format
-msgid "failed to read '%s'"
+msgid ""
+"Path updated: %s added in %s inside a directory that was renamed in %s; "
+"moving it to %s."
msgstr ""
-#: wrapper.c:223 wrapper.c:393
+#: merge-recursive.c:3173
#, c-format
-msgid "could not open '%s' for reading and writing"
+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 ""
-#: wrapper.c:225 wrapper.c:395 builtin/am.c:766
+#: merge-recursive.c:3177
#, c-format
-msgid "could not open '%s' for writing"
+msgid ""
+"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
+"%s; moving it to %s."
msgstr ""
-#: wrapper.c:227 wrapper.c:397 builtin/am.c:319 builtin/am.c:757
-#: builtin/am.c:849 builtin/merge.c:1014
+#: merge-recursive.c:3180
#, c-format
-msgid "could not open '%s' for reading"
+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 ""
-#: wrapper.c:424 wrapper.c:624
+#: merge-recursive.c:3294
#, c-format
-msgid "unable to access '%s'"
+msgid "Removing %s"
msgstr ""
-#: wrapper.c:632
-msgid "unable to get current working directory"
+#: merge-recursive.c:3317
+msgid "file/directory"
msgstr ""
-#: wrapper.c:656
-#, c-format
-msgid "could not write to %s"
+#: merge-recursive.c:3322
+msgid "directory/file"
msgstr ""
-#: wrapper.c:658
+#: merge-recursive.c:3329
#, c-format
-msgid "could not close %s"
+msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
msgstr ""
-#: wt-status.c:152
-msgid "Unmerged paths:"
+#: merge-recursive.c:3338
+#, c-format
+msgid "Adding %s"
msgstr ""
-#: wt-status.c:179 wt-status.c:206
+#: merge-recursive.c:3347
#, c-format
-msgid " (use \"git reset %s <file>...\" to unstage)"
+msgid "CONFLICT (add/add): Merge conflict in %s"
msgstr ""
-#: wt-status.c:181 wt-status.c:208
-msgid " (use \"git rm --cached <file>...\" to unstage)"
+#: merge-recursive.c:3385
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+" %s"
msgstr ""
-#: wt-status.c:185
-msgid " (use \"git add <file>...\" to mark resolution)"
+#: merge-recursive.c:3396
+msgid "Already up to date!"
msgstr ""
-#: wt-status.c:187 wt-status.c:191
-msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
+#: merge-recursive.c:3405
+#, c-format
+msgid "merging of trees %s and %s failed"
msgstr ""
-#: wt-status.c:189
-msgid " (use \"git rm <file>...\" to mark resolution)"
+#: merge-recursive.c:3504
+msgid "Merging:"
msgstr ""
-#: wt-status.c:200 wt-status.c:981
-msgid "Changes to be committed:"
-msgstr ""
+#: merge-recursive.c:3517
+#, c-format
+msgid "found %u common ancestor:"
+msgid_plural "found %u common ancestors:"
+msgstr[0] ""
+msgstr[1] ""
-#: wt-status.c:218 wt-status.c:990
-msgid "Changes not staged for commit:"
+#: merge-recursive.c:3556
+msgid "merge returned no commit"
msgstr ""
-#: wt-status.c:222
-msgid " (use \"git add <file>...\" to update what will be committed)"
+#: merge-recursive.c:3622
+#, c-format
+msgid "Could not parse object '%s'"
msgstr ""
-#: wt-status.c:224
-msgid " (use \"git add/rm <file>...\" to update what will be committed)"
+#: merge-recursive.c:3638 builtin/merge.c:702 builtin/merge.c:873
+msgid "Unable to write index."
msgstr ""
-#: wt-status.c:225
-msgid ""
-" (use \"git checkout -- <file>...\" to discard changes in working directory)"
+#: midx.c:66
+#, c-format
+msgid "multi-pack-index file %s is too small"
msgstr ""
-#: wt-status.c:227
-msgid " (commit or discard the untracked or modified content in submodules)"
+#: midx.c:82
+#, c-format
+msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
msgstr ""
-#: wt-status.c:239
+#: midx.c:87
#, c-format
-msgid " (use \"git %s <file>...\" to include in what will be committed)"
+msgid "multi-pack-index version %d not recognized"
msgstr ""
-#: wt-status.c:254
-msgid "both deleted:"
+#: midx.c:92
+#, c-format
+msgid "hash version %u does not match"
msgstr ""
-#: wt-status.c:256
-msgid "added by us:"
+#: midx.c:106
+msgid "invalid chunk offset (too large)"
msgstr ""
-#: wt-status.c:258
-msgid "deleted by them:"
+#: midx.c:130
+msgid "terminating multi-pack-index chunk id appears earlier than expected"
msgstr ""
-#: wt-status.c:260
-msgid "added by them:"
+#: midx.c:143
+msgid "multi-pack-index missing required pack-name chunk"
msgstr ""
-#: wt-status.c:262
-msgid "deleted by us:"
+#: midx.c:145
+msgid "multi-pack-index missing required OID fanout chunk"
msgstr ""
-#: wt-status.c:264
-msgid "both added:"
+#: midx.c:147
+msgid "multi-pack-index missing required OID lookup chunk"
msgstr ""
-#: wt-status.c:266
-msgid "both modified:"
+#: midx.c:149
+msgid "multi-pack-index missing required object offsets chunk"
msgstr ""
-#: wt-status.c:276
-msgid "new file:"
+#: midx.c:163
+#, c-format
+msgid "multi-pack-index pack names out of order: '%s' before '%s'"
msgstr ""
-#: wt-status.c:278
-msgid "copied:"
+#: midx.c:208
+#, c-format
+msgid "bad pack-int-id: %u (%u total packs)"
msgstr ""
-#: wt-status.c:280
-msgid "deleted:"
+#: midx.c:258
+msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
msgstr ""
-#: wt-status.c:282
-msgid "modified:"
+#: midx.c:286
+msgid "error preparing packfile from multi-pack-index"
msgstr ""
-#: wt-status.c:284
-msgid "renamed:"
+#: midx.c:457
+#, c-format
+msgid "failed to add packfile '%s'"
msgstr ""
-#: wt-status.c:286
-msgid "typechange:"
+#: midx.c:463
+#, c-format
+msgid "failed to open pack-index '%s'"
msgstr ""
-#: wt-status.c:288
-msgid "unknown:"
+#: midx.c:557
+#, c-format
+msgid "failed to locate object %d in packfile"
msgstr ""
-#: wt-status.c:290
-msgid "unmerged:"
+#: midx.c:993
+#, c-format
+msgid "failed to clear multi-pack-index at %s"
msgstr ""
-#: wt-status.c:372
-msgid "new commits, "
+#: midx.c:1048
+msgid "Looking for referenced packfiles"
msgstr ""
-#: wt-status.c:374
-msgid "modified content, "
+#: midx.c:1063
+#, c-format
+msgid ""
+"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
msgstr ""
-#: wt-status.c:376
-msgid "untracked content, "
+#: midx.c:1067
+msgid "Verifying OID order in MIDX"
msgstr ""
-#: wt-status.c:821
+#: midx.c:1076
#, c-format
-msgid "Your stash currently has %d entry"
-msgid_plural "Your stash currently has %d entries"
-msgstr[0] ""
-msgstr[1] ""
-
-#: wt-status.c:853
-msgid "Submodules changed but not updated:"
+msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
msgstr ""
-#: wt-status.c:855
-msgid "Submodule changes to be committed:"
+#: midx.c:1095
+msgid "Sorting objects by packfile"
msgstr ""
-#: wt-status.c:937
-msgid ""
-"Do not touch the line above.\n"
-"Everything below will be removed."
+#: midx.c:1101
+msgid "Verifying object offsets"
msgstr ""
-#: wt-status.c:1049
-msgid "You have unmerged paths."
+#: midx.c:1117
+#, c-format
+msgid "failed to load pack entry for oid[%d] = %s"
msgstr ""
-#: wt-status.c:1052
-msgid " (fix conflicts and run \"git commit\")"
+#: midx.c:1123
+#, c-format
+msgid "failed to load pack-index for packfile %s"
msgstr ""
-#: wt-status.c:1054
-msgid " (use \"git merge --abort\" to abort the merge)"
+#: midx.c:1132
+#, c-format
+msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
msgstr ""
-#: wt-status.c:1059
-msgid "All conflicts fixed but you are still merging."
+#: name-hash.c:531
+#, c-format
+msgid "unable to create lazy_dir thread: %s"
msgstr ""
-#: wt-status.c:1062
-msgid " (use \"git commit\" to conclude merge)"
+#: name-hash.c:553
+#, c-format
+msgid "unable to create lazy_name thread: %s"
msgstr ""
-#: wt-status.c:1072
-msgid "You are in the middle of an am session."
+#: name-hash.c:559
+#, c-format
+msgid "unable to join lazy_name thread: %s"
msgstr ""
-#: wt-status.c:1075
-msgid "The current patch is empty."
+#: notes-merge.c:277
+#, 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."
msgstr ""
-#: wt-status.c:1079
-msgid " (fix conflicts and then run \"git am --continue\")"
+#: notes-merge.c:284
+#, c-format
+msgid "You have not concluded your notes merge (%s exists)."
msgstr ""
-#: wt-status.c:1081
-msgid " (use \"git am --skip\" to skip this patch)"
+#: notes-utils.c:46
+msgid "Cannot commit uninitialized/unreferenced notes tree"
msgstr ""
-#: wt-status.c:1083
-msgid " (use \"git am --abort\" to restore the original branch)"
+#: notes-utils.c:105
+#, c-format
+msgid "Bad notes.rewriteMode value: '%s'"
msgstr ""
-#: wt-status.c:1214
-msgid "git-rebase-todo is missing."
+#: notes-utils.c:115
+#, c-format
+msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
msgstr ""
-#: wt-status.c:1216
-msgid "No commands done."
+#. TRANSLATORS: The first %s is the name of
+#. the environment variable, the second %s is
+#. its value.
+#.
+#: notes-utils.c:145
+#, c-format
+msgid "Bad %s value: '%s'"
msgstr ""
-#: wt-status.c:1219
+#: object.c:54
#, c-format
-msgid "Last command done (%d command done):"
-msgid_plural "Last commands done (%d commands done):"
-msgstr[0] ""
-msgstr[1] ""
+msgid "invalid object type \"%s\""
+msgstr ""
-#: wt-status.c:1230
+#: object.c:174
#, c-format
-msgid " (see more in file %s)"
+msgid "object %s is a %s, not a %s"
msgstr ""
-#: wt-status.c:1235
-msgid "No commands remaining."
+#: object.c:234
+#, c-format
+msgid "object %s has unknown type id %d"
msgstr ""
-#: wt-status.c:1238
+#: object.c:247
#, c-format
-msgid "Next command to do (%d remaining command):"
-msgid_plural "Next commands to do (%d remaining commands):"
-msgstr[0] ""
-msgstr[1] ""
-
-#: wt-status.c:1246
-msgid " (use \"git rebase --edit-todo\" to view and edit)"
+msgid "unable to parse object: %s"
msgstr ""
-#: wt-status.c:1259
+#: object.c:267 object.c:278
#, c-format
-msgid "You are currently rebasing branch '%s' on '%s'."
+msgid "hash mismatch %s"
msgstr ""
-#: wt-status.c:1264
-msgid "You are currently rebasing."
+#: packfile.c:617
+msgid "offset before end of packfile (broken .idx?)"
msgstr ""
-#: wt-status.c:1278
-msgid " (fix conflicts and then run \"git rebase --continue\")"
+#: packfile.c:1868
+#, c-format
+msgid "offset before start of pack index for %s (corrupt index?)"
msgstr ""
-#: wt-status.c:1280
-msgid " (use \"git rebase --skip\" to skip this patch)"
+#: packfile.c:1872
+#, c-format
+msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr ""
-#: wt-status.c:1282
-msgid " (use \"git rebase --abort\" to check out the original branch)"
+#: parse-options.c:38
+#, c-format
+msgid "%s requires a value"
msgstr ""
-#: wt-status.c:1288
-msgid " (all conflicts fixed: run \"git rebase --continue\")"
+#: parse-options.c:73
+#, c-format
+msgid "%s is incompatible with %s"
msgstr ""
-#: wt-status.c:1292
+#: parse-options.c:78
#, c-format
-msgid ""
-"You are currently splitting a commit while rebasing branch '%s' on '%s'."
+msgid "%s : incompatible with something else"
msgstr ""
-#: wt-status.c:1297
-msgid "You are currently splitting a commit during a rebase."
+#: parse-options.c:92 parse-options.c:96 parse-options.c:319
+#, c-format
+msgid "%s takes no value"
msgstr ""
-#: wt-status.c:1300
-msgid " (Once your working directory is clean, run \"git rebase --continue\")"
+#: parse-options.c:94
+#, c-format
+msgid "%s isn't available"
msgstr ""
-#: wt-status.c:1304
+#: parse-options.c:219
#, c-format
-msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
+msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
msgstr ""
-#: wt-status.c:1309
-msgid "You are currently editing a commit during a rebase."
+#: parse-options.c:389
+#, c-format
+msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
msgstr ""
-#: wt-status.c:1312
-msgid " (use \"git commit --amend\" to amend the current commit)"
+#: parse-options.c:423 parse-options.c:431
+#, c-format
+msgid "did you mean `--%s` (with two dashes ?)"
msgstr ""
-#: wt-status.c:1314
-msgid ""
-" (use \"git rebase --continue\" once you are satisfied with your changes)"
+#: parse-options.c:859
+#, c-format
+msgid "unknown option `%s'"
msgstr ""
-#: wt-status.c:1324
+#: parse-options.c:861
#, c-format
-msgid "You are currently cherry-picking commit %s."
+msgid "unknown switch `%c'"
msgstr ""
-#: wt-status.c:1329
-msgid " (fix conflicts and run \"git cherry-pick --continue\")"
+#: parse-options.c:863
+#, c-format
+msgid "unknown non-ascii option in string: `%s'"
msgstr ""
-#: wt-status.c:1332
-msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
+#: parse-options.c:887
+msgid "..."
msgstr ""
-#: wt-status.c:1334
-msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
+#: parse-options.c:906
+#, c-format
+msgid "usage: %s"
msgstr ""
-#: wt-status.c:1343
+#. TRANSLATORS: the colon here should align with the
+#. one in "usage: %s" translation.
+#.
+#: parse-options.c:912
#, c-format
-msgid "You are currently reverting commit %s."
+msgid " or: %s"
msgstr ""
-#: wt-status.c:1348
-msgid " (fix conflicts and run \"git revert --continue\")"
+#: parse-options.c:915
+#, c-format
+msgid " %s"
msgstr ""
-#: wt-status.c:1351
-msgid " (all conflicts fixed: run \"git revert --continue\")"
+#: parse-options.c:954
+msgid "-NUM"
msgstr ""
-#: wt-status.c:1353
-msgid " (use \"git revert --abort\" to cancel the revert operation)"
+#: parse-options.c:968
+#, c-format
+msgid "alias of --%s"
msgstr ""
-#: wt-status.c:1364
+#: parse-options-cb.c:20 parse-options-cb.c:24
#, c-format
-msgid "You are currently bisecting, started from branch '%s'."
+msgid "option `%s' expects a numerical value"
msgstr ""
-#: wt-status.c:1368
-msgid "You are currently bisecting."
+#: parse-options-cb.c:41
+#, c-format
+msgid "malformed expiration date '%s'"
msgstr ""
-#: wt-status.c:1371
-msgid " (use \"git bisect reset\" to get back to the original branch)"
+#: parse-options-cb.c:54
+#, c-format
+msgid "option `%s' expects \"always\", \"auto\", or \"never\""
msgstr ""
-#: wt-status.c:1568
-msgid "On branch "
+#: parse-options-cb.c:130 parse-options-cb.c:147
+#, c-format
+msgid "malformed object name '%s'"
msgstr ""
-#: wt-status.c:1574
-msgid "interactive rebase in progress; onto "
+#: path.c:897
+#, c-format
+msgid "Could not make %s writable by group"
msgstr ""
-#: wt-status.c:1576
-msgid "rebase in progress; onto "
+#: pathspec.c:128
+msgid "Escape character '\\' not allowed as last character in attr value"
msgstr ""
-#: wt-status.c:1581
-msgid "HEAD detached at "
+#: pathspec.c:146
+msgid "Only one 'attr:' specification is allowed."
msgstr ""
-#: wt-status.c:1583
-msgid "HEAD detached from "
+#: pathspec.c:149
+msgid "attr spec must not be empty"
msgstr ""
-#: wt-status.c:1586
-msgid "Not currently on any branch."
+#: pathspec.c:192
+#, c-format
+msgid "invalid attribute name %s"
msgstr ""
-#: wt-status.c:1606
-msgid "Initial commit"
+#: pathspec.c:257
+msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
msgstr ""
-#: wt-status.c:1607
-msgid "No commits yet"
+#: pathspec.c:264
+msgid ""
+"global 'literal' pathspec setting is incompatible with all other global "
+"pathspec settings"
msgstr ""
-#: wt-status.c:1621
-msgid "Untracked files"
+#: pathspec.c:304
+msgid "invalid parameter for pathspec magic 'prefix'"
msgstr ""
-#: wt-status.c:1623
-msgid "Ignored files"
+#: pathspec.c:325
+#, c-format
+msgid "Invalid pathspec magic '%.*s' in '%s'"
msgstr ""
-#: wt-status.c:1627
+#: pathspec.c:330
#, 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 "Missing ')' at the end of pathspec magic in '%s'"
msgstr ""
-#: wt-status.c:1633
+#: pathspec.c:368
#, c-format
-msgid "Untracked files not listed%s"
+msgid "Unimplemented pathspec magic '%c' in '%s'"
msgstr ""
-#: wt-status.c:1635
-msgid " (use -u option to show untracked files)"
+#: pathspec.c:427
+#, c-format
+msgid "%s: 'literal' and 'glob' are incompatible"
msgstr ""
-#: wt-status.c:1641
-msgid "No changes"
+#: pathspec.c:440
+#, c-format
+msgid "%s: '%s' is outside repository"
msgstr ""
-#: wt-status.c:1646
+#: pathspec.c:514
#, c-format
-msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
+msgid "'%s' (mnemonic: '%c')"
msgstr ""
-#: wt-status.c:1649
+#: pathspec.c:524
#, c-format
-msgid "no changes added to commit\n"
+msgid "%s: pathspec magic not supported by this command: %s"
msgstr ""
-#: wt-status.c:1652
+#: pathspec.c:591
#, c-format
-msgid ""
-"nothing added to commit but untracked files present (use \"git add\" to "
-"track)\n"
+msgid "pathspec '%s' is beyond a symbolic link"
msgstr ""
-#: wt-status.c:1655
-#, c-format
-msgid "nothing added to commit but untracked files present\n"
+#: pkt-line.c:92
+msgid "unable to write flush packet"
msgstr ""
-#: wt-status.c:1658
-#, c-format
-msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
+#: pkt-line.c:99
+msgid "unable to write delim packet"
msgstr ""
-#: wt-status.c:1661 wt-status.c:1666
-#, c-format
-msgid "nothing to commit\n"
+#: pkt-line.c:106
+msgid "flush packet write failed"
msgstr ""
-#: wt-status.c:1664
-#, c-format
-msgid "nothing to commit (use -u to show untracked files)\n"
+#: pkt-line.c:146 pkt-line.c:232
+msgid "protocol error: impossibly long line"
msgstr ""
-#: wt-status.c:1668
-#, c-format
-msgid "nothing to commit, working tree clean\n"
+#: pkt-line.c:162 pkt-line.c:164
+msgid "packet write with format failed"
msgstr ""
-#: wt-status.c:1780
-msgid "No commits yet on "
+#: pkt-line.c:196
+msgid "packet write failed - data exceeds max packet size"
msgstr ""
-#: wt-status.c:1784
-msgid "HEAD (no branch)"
+#: pkt-line.c:203 pkt-line.c:210
+msgid "packet write failed"
msgstr ""
-#: wt-status.c:1813 wt-status.c:1821
-msgid "behind "
+#: pkt-line.c:295
+msgid "read error"
msgstr ""
-#: wt-status.c:1816 wt-status.c:1819
-msgid "ahead "
+#: pkt-line.c:303
+msgid "the remote end hung up unexpectedly"
msgstr ""
-#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2311
+#: pkt-line.c:331
#, c-format
-msgid "cannot %s: You have unstaged changes."
+msgid "protocol error: bad line length character: %.4s"
msgstr ""
-#: wt-status.c:2317
-msgid "additionally, your index contains uncommitted changes."
+#: pkt-line.c:341 pkt-line.c:346
+#, c-format
+msgid "protocol error: bad line length %d"
msgstr ""
-#: wt-status.c:2319
+#: pkt-line.c:362
#, c-format
-msgid "cannot %s: Your index contains uncommitted changes."
+msgid "remote error: %s"
+msgstr ""
+
+#: preload-index.c:119
+msgid "Refreshing index"
msgstr ""
-#: compat/precompose_utf8.c:58 builtin/clone.c:436
+#: preload-index.c:138
#, c-format
-msgid "failed to unlink '%s'"
+msgid "unable to create threaded lstat: %s"
msgstr ""
-#: builtin/add.c:24
-msgid "git add [<options>] [--] <pathspec>..."
+#: pretty.c:966
+msgid "unable to parse --pretty format"
msgstr ""
-#: builtin/add.c:82
-#, c-format
-msgid "unexpected diff status %c"
+#: range-diff.c:56
+msgid "could not start `log`"
msgstr ""
-#: builtin/add.c:87 builtin/commit.c:292
-msgid "updating files failed"
+#: range-diff.c:59
+msgid "could not read `log` output"
msgstr ""
-#: builtin/add.c:97
+#: range-diff.c:74 sequencer.c:4897
#, c-format
-msgid "remove '%s'\n"
+msgid "could not parse commit '%s'"
msgstr ""
-#: builtin/add.c:151
-msgid "Unstaged changes after refreshing the index:"
+#: range-diff.c:224
+msgid "failed to generate diff"
msgstr ""
-#: builtin/add.c:211 builtin/rev-parse.c:873
-msgid "Could not read the index"
+#: range-diff.c:455 range-diff.c:457
+#, c-format
+msgid "could not parse log for '%s'"
msgstr ""
-#: builtin/add.c:222
+#: read-cache.c:680
#, c-format
-msgid "Could not open '%s' for writing."
+msgid "will not add file alias '%s' ('%s' already exists in index)"
msgstr ""
-#: builtin/add.c:226
-msgid "Could not write patch"
+#: read-cache.c:696
+msgid "cannot create an empty blob in the object database"
msgstr ""
-#: builtin/add.c:229
-msgid "editing patch failed"
+#: read-cache.c:718
+#, c-format
+msgid "%s: can only add regular files, symbolic links or git-directories"
msgstr ""
-#: builtin/add.c:232
+#: read-cache.c:723
#, c-format
-msgid "Could not stat '%s'"
+msgid "'%s' does not have a commit checked out"
msgstr ""
-#: builtin/add.c:234
-msgid "Empty patch. Aborted."
+#: read-cache.c:775
+#, c-format
+msgid "unable to index file '%s'"
msgstr ""
-#: builtin/add.c:239
+#: read-cache.c:794
#, c-format
-msgid "Could not apply '%s'"
+msgid "unable to add '%s' to index"
msgstr ""
-#: builtin/add.c:249
-msgid "The following paths are ignored by one of your .gitignore files:\n"
+#: read-cache.c:805
+#, c-format
+msgid "unable to stat '%s'"
msgstr ""
-#: builtin/add.c:269 builtin/clean.c:907 builtin/fetch.c:110 builtin/mv.c:124
-#: builtin/prune-packed.c:55 builtin/pull.c:201 builtin/push.c:529
-#: builtin/remote.c:1332 builtin/rm.c:242 builtin/send-pack.c:164
-msgid "dry run"
+#: read-cache.c:1314
+#, c-format
+msgid "'%s' appears as both a file and as a directory"
msgstr ""
-#: builtin/add.c:272
-msgid "interactive picking"
+#: read-cache.c:1499
+msgid "Refresh index"
msgstr ""
-#: builtin/add.c:273 builtin/checkout.c:1162 builtin/reset.c:299
-msgid "select hunks interactively"
+#: read-cache.c:1613
+#, c-format
+msgid ""
+"index.version set, but the value is invalid.\n"
+"Using version %i"
msgstr ""
-#: builtin/add.c:274
-msgid "edit current diff and apply"
+#: read-cache.c:1623
+#, c-format
+msgid ""
+"GIT_INDEX_VERSION set, but the value is invalid.\n"
+"Using version %i"
msgstr ""
-#: builtin/add.c:275
-msgid "allow adding otherwise ignored files"
+#: read-cache.c:1679
+#, c-format
+msgid "bad signature 0x%08x"
msgstr ""
-#: builtin/add.c:276
-msgid "update tracked files"
+#: read-cache.c:1682
+#, c-format
+msgid "bad index version %d"
msgstr ""
-#: builtin/add.c:277
-msgid "record only the fact that the path will be added later"
+#: read-cache.c:1691
+msgid "bad index file sha1 signature"
msgstr ""
-#: builtin/add.c:278
-msgid "add changes from all tracked and untracked files"
+#: read-cache.c:1721
+#, c-format
+msgid "index uses %.4s extension, which we do not understand"
msgstr ""
-#: builtin/add.c:281
-msgid "ignore paths removed in the working tree (same as --no-all)"
+#: read-cache.c:1723
+#, c-format
+msgid "ignoring %.4s extension"
msgstr ""
-#: builtin/add.c:283
-msgid "don't add, only refresh the index"
+#: read-cache.c:1760
+#, c-format
+msgid "unknown index entry format 0x%08x"
msgstr ""
-#: builtin/add.c:284
-msgid "just skip files which cannot be added because of errors"
+#: read-cache.c:1776
+#, c-format
+msgid "malformed name field in the index, near path '%s'"
msgstr ""
-#: builtin/add.c:285
-msgid "check if - even missing - files are ignored in dry run"
+#: read-cache.c:1833
+msgid "unordered stage entries in index"
msgstr ""
-#: builtin/add.c:286 builtin/update-index.c:952
-msgid "(+/-)x"
+#: read-cache.c:1836
+#, c-format
+msgid "multiple stage entries for merged file '%s'"
msgstr ""
-#: builtin/add.c:286 builtin/update-index.c:953
-msgid "override the executable bit of the listed files"
+#: read-cache.c:1839
+#, c-format
+msgid "unordered stage entries for '%s'"
msgstr ""
-#: builtin/add.c:288
-msgid "warn when adding an embedded repository"
+#: 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:358
+#: builtin/checkout.c:672 builtin/checkout.c:1060 builtin/clean.c:955
+#: builtin/commit.c:344 builtin/diff-tree.c:120 builtin/grep.c:498
+#: builtin/mv.c:145 builtin/reset.c:245 builtin/rm.c:271
+#: builtin/submodule--helper.c:330
+msgid "index file corrupt"
msgstr ""
-#: builtin/add.c:303
+#: read-cache.c:2087
#, 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 create load_cache_entries thread: %s"
msgstr ""
-#: builtin/add.c:331
+#: read-cache.c:2100
#, c-format
-msgid "adding embedded git repository: %s"
+msgid "unable to join load_cache_entries thread: %s"
msgstr ""
-#: builtin/add.c:349
+#: read-cache.c:2133
#, c-format
-msgid "Use -f if you really want to add them.\n"
-msgstr ""
-
-#: builtin/add.c:357
-msgid "adding files failed"
+msgid "%s: index file open failed"
msgstr ""
-#: builtin/add.c:394
-msgid "-A and -u are mutually incompatible"
+#: read-cache.c:2137
+#, c-format
+msgid "%s: cannot stat the open index"
msgstr ""
-#: builtin/add.c:401
-msgid "Option --ignore-missing can only be used together with --dry-run"
+#: read-cache.c:2141
+#, c-format
+msgid "%s: index file smaller than expected"
msgstr ""
-#: builtin/add.c:405
+#: read-cache.c:2145
#, c-format
-msgid "--chmod param '%s' must be either -x or +x"
+msgid "%s: unable to map index file"
msgstr ""
-#: builtin/add.c:420
+#: read-cache.c:2187
#, c-format
-msgid "Nothing specified, nothing added.\n"
+msgid "unable to create load_index_extensions thread: %s"
msgstr ""
-#: builtin/add.c:421
+#: read-cache.c:2214
#, c-format
-msgid "Maybe you wanted to say 'git add .'?\n"
+msgid "unable to join load_index_extensions thread: %s"
msgstr ""
-#: builtin/add.c:426 builtin/check-ignore.c:176 builtin/checkout.c:282
-#: builtin/checkout.c:475 builtin/clean.c:954 builtin/commit.c:351
-#: builtin/mv.c:144 builtin/reset.c:238 builtin/rm.c:272
-#: builtin/submodule--helper.c:244
-msgid "index file corrupt"
+#: read-cache.c:2246
+#, c-format
+msgid "could not freshen shared index '%s'"
msgstr ""
-#: builtin/am.c:413
-msgid "could not parse author script"
+#: read-cache.c:2293
+#, c-format
+msgid "broken index, expect %s in %s, got %s"
msgstr ""
-#: builtin/am.c:489
+#: read-cache.c:2989 wrapper.c:658 builtin/merge.c:1117
#, c-format
-msgid "'%s' was deleted by the applypatch-msg hook"
+msgid "could not close '%s'"
msgstr ""
-#: builtin/am.c:530
+#: read-cache.c:3092 sequencer.c:2354 sequencer.c:3807
#, c-format
-msgid "Malformed input line: '%s'."
+msgid "could not stat '%s'"
msgstr ""
-#: builtin/am.c:567
+#: read-cache.c:3105
#, c-format
-msgid "Failed to copy notes from '%s' to '%s'"
+msgid "unable to open git dir: %s"
msgstr ""
-#: builtin/am.c:593
-msgid "fseek failed"
+#: read-cache.c:3117
+#, c-format
+msgid "unable to unlink: %s"
msgstr ""
-#: builtin/am.c:777
+#: read-cache.c:3142
#, c-format
-msgid "could not parse patch '%s'"
+msgid "cannot fix permission bits on '%s'"
msgstr ""
-#: builtin/am.c:842
-msgid "Only one StGIT patch series can be applied at once"
+#: read-cache.c:3291
+#, c-format
+msgid "%s: cannot drop to stage #0"
msgstr ""
-#: builtin/am.c:889
-msgid "invalid timestamp"
+#: rebase-interactive.c:26
+#, c-format
+msgid ""
+"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
msgstr ""
-#: builtin/am.c:892 builtin/am.c:900
-msgid "invalid Date line"
+#: 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 ""
-#: builtin/am.c:897
-msgid "invalid timezone offset"
+#: 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:173
+msgid ""
+"\n"
+"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
msgstr ""
-#: builtin/am.c:986
-msgid "Patch format detection failed."
+#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:177
+msgid ""
+"\n"
+"If you remove a line here THAT COMMIT WILL BE LOST.\n"
msgstr ""
-#: builtin/am.c:991 builtin/clone.c:401
-#, c-format
-msgid "failed to create directory '%s'"
+#: rebase-interactive.c:74 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 ""
-#: builtin/am.c:995
-msgid "Failed to split patches."
+#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:893
+msgid ""
+"\n"
+"However, if you remove everything, the rebase will be aborted.\n"
+"\n"
msgstr ""
-#: builtin/am.c:1120 builtin/commit.c:377
-msgid "unable to write index file"
+#: rebase-interactive.c:85 git-rebase--preserve-merges.sh:900
+msgid "Note that empty commits are commented out"
msgstr ""
-#: builtin/am.c:1171
+#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3339
+#: sequencer.c:3365 sequencer.c:4996 builtin/fsck.c:356 builtin/rebase.c:235
#, c-format
-msgid "When you have resolved this problem, run \"%s --continue\"."
+msgid "could not write '%s'"
msgstr ""
-#: builtin/am.c:1172
+#: rebase-interactive.c:108
#, c-format
-msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
+msgid "could not copy '%s' to '%s'."
msgstr ""
-#: builtin/am.c:1173
+#: rebase-interactive.c:173
#, c-format
-msgid "To restore the original branch and stop patching, run \"%s --abort\"."
+msgid ""
+"Warning: some commits may have been dropped accidentally.\n"
+"Dropped commits (newer to older):\n"
msgstr ""
-#: builtin/am.c:1304
-msgid "Patch is empty."
+#: 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 ""
-#: builtin/am.c:1370
+#: refs.c:192
#, c-format
-msgid "invalid ident line: %.*s"
+msgid "%s does not point to a valid object!"
msgstr ""
-#: builtin/am.c:1392
+#: refs.c:597
#, c-format
-msgid "unable to parse commit %s"
+msgid "ignoring dangling symref %s"
msgstr ""
-#: builtin/am.c:1586
-msgid "Repository lacks necessary blobs to fall back on 3-way merge."
+#: refs.c:599 ref-filter.c:1982
+#, c-format
+msgid "ignoring broken ref %s"
msgstr ""
-#: builtin/am.c:1588
-msgid "Using index info to reconstruct a base tree..."
+#: refs.c:734
+#, c-format
+msgid "could not open '%s' for writing: %s"
msgstr ""
-#: builtin/am.c:1607
-msgid ""
-"Did you hand edit your patch?\n"
-"It does not apply to blobs recorded in its index."
+#: refs.c:744 refs.c:795
+#, c-format
+msgid "could not read ref '%s'"
msgstr ""
-#: builtin/am.c:1613
-msgid "Falling back to patching base and 3-way merge..."
+#: refs.c:750
+#, c-format
+msgid "ref '%s' already exists"
msgstr ""
-#: builtin/am.c:1638
-msgid "Failed to merge in the changes."
+#: refs.c:755
+#, c-format
+msgid "unexpected object ID when writing '%s'"
msgstr ""
-#: builtin/am.c:1662 builtin/merge.c:632
-msgid "git write-tree failed to write a tree"
+#: refs.c:763 sequencer.c:400 sequencer.c:2679 sequencer.c:2805
+#: sequencer.c:2819 sequencer.c:3076 sequencer.c:4913 wrapper.c:656
+#, c-format
+msgid "could not write to '%s'"
msgstr ""
-#: builtin/am.c:1669
-msgid "applying to an empty history"
+#: refs.c:790 wrapper.c:225 wrapper.c:395 builtin/am.c:715 builtin/rebase.c:993
+#, c-format
+msgid "could not open '%s' for writing"
msgstr ""
-#: builtin/am.c:1682 builtin/commit.c:1767 builtin/merge.c:803
-#: builtin/merge.c:828
-msgid "failed to write commit object"
+#: refs.c:797
+#, c-format
+msgid "unexpected object ID when deleting '%s'"
msgstr ""
-#: builtin/am.c:1715 builtin/am.c:1719
+#: refs.c:928
#, c-format
-msgid "cannot resume: %s does not exist."
+msgid "log for ref %s has gap after %s"
msgstr ""
-#: builtin/am.c:1735
-msgid "cannot be interactive without stdin connected to a terminal."
+#: refs.c:934
+#, c-format
+msgid "log for ref %s unexpectedly ended on %s"
msgstr ""
-#: builtin/am.c:1740
-msgid "Commit Body is:"
+#: refs.c:993
+#, c-format
+msgid "log for %s is empty"
msgstr ""
-#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
-#. in your translation. The program will only accept English
-#. input at this point.
-#.
-#: builtin/am.c:1750
-msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
+#: refs.c:1085
+#, c-format
+msgid "refusing to update ref with bad name '%s'"
msgstr ""
-#: builtin/am.c:1800
+#: refs.c:1161
#, c-format
-msgid "Dirty index: cannot apply patches (dirty: %s)"
+msgid "update_ref failed for ref '%s': %s"
msgstr ""
-#: builtin/am.c:1840 builtin/am.c:1912
+#: refs.c:1942
#, c-format
-msgid "Applying: %.*s"
+msgid "multiple updates for ref '%s' not allowed"
msgstr ""
-#: builtin/am.c:1856
-msgid "No changes -- Patch already applied."
+#: refs.c:1974
+msgid "ref updates forbidden inside quarantine environment"
msgstr ""
-#: builtin/am.c:1864
+#: refs.c:2070 refs.c:2100
#, c-format
-msgid "Patch failed at %s %.*s"
+msgid "'%s' exists; cannot create '%s'"
msgstr ""
-#: builtin/am.c:1870
+#: refs.c:2076 refs.c:2111
#, c-format
-msgid "The copy of the patch that failed is found in: %s"
+msgid "cannot process '%s' and '%s' at the same time"
msgstr ""
-#: builtin/am.c:1915
-msgid ""
-"No changes - did you forget to use 'git add'?\n"
-"If there is nothing left to stage, chances are that something else\n"
-"already introduced the same changes; you might want to skip this patch."
+#: refs/files-backend.c:1234
+#, c-format
+msgid "could not remove reference %s"
msgstr ""
-#: builtin/am.c:1922
-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."
+#: 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 ""
-#: builtin/am.c:2031 builtin/am.c:2035 builtin/am.c:2047 builtin/reset.c:323
-#: builtin/reset.c:331
+#: refs/files-backend.c:1251 refs/packed-backend.c:1545
#, c-format
-msgid "Could not parse object '%s'."
+msgid "could not delete references: %s"
msgstr ""
-#: builtin/am.c:2083
-msgid "failed to clean index"
+#: refspec.c:137
+#, c-format
+msgid "invalid refspec '%s'"
msgstr ""
-#: builtin/am.c:2117
-msgid ""
-"You seem to have moved HEAD since the last 'am' failure.\n"
-"Not rewinding to ORIG_HEAD"
+#: ref-filter.c:39 wt-status.c:1909
+msgid "gone"
msgstr ""
-#: builtin/am.c:2180
+#: ref-filter.c:40
#, c-format
-msgid "Invalid value for --patch-format: %s"
+msgid "ahead %d"
msgstr ""
-#: builtin/am.c:2213
-msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
+#: ref-filter.c:41
+#, c-format
+msgid "behind %d"
msgstr ""
-#: builtin/am.c:2214
-msgid "git am [<options>] (--continue | --skip | --abort)"
+#: ref-filter.c:42
+#, c-format
+msgid "ahead %d, behind %d"
msgstr ""
-#: builtin/am.c:2220
-msgid "run interactively"
+#: ref-filter.c:138
+#, c-format
+msgid "expected format: %%(color:<color>)"
msgstr ""
-#: builtin/am.c:2222
-msgid "historical option -- no-op"
+#: ref-filter.c:140
+#, c-format
+msgid "unrecognized color: %%(color:%s)"
msgstr ""
-#: builtin/am.c:2224
-msgid "allow fall back on 3way merging if needed"
+#: ref-filter.c:162
+#, c-format
+msgid "Integer value expected refname:lstrip=%s"
msgstr ""
-#: builtin/am.c:2225 builtin/init-db.c:484 builtin/prune-packed.c:57
-#: builtin/repack.c:180
-msgid "be quiet"
+#: ref-filter.c:166
+#, c-format
+msgid "Integer value expected refname:rstrip=%s"
msgstr ""
-#: builtin/am.c:2227
-msgid "add a Signed-off-by line to the commit message"
+#: ref-filter.c:168
+#, c-format
+msgid "unrecognized %%(%s) argument: %s"
msgstr ""
-#: builtin/am.c:2230
-msgid "recode into utf8 (default)"
+#: ref-filter.c:223
+#, c-format
+msgid "%%(objecttype) does not take arguments"
msgstr ""
-#: builtin/am.c:2232
-msgid "pass -k flag to git-mailinfo"
+#: ref-filter.c:245
+#, c-format
+msgid "unrecognized %%(objectsize) argument: %s"
msgstr ""
-#: builtin/am.c:2234
-msgid "pass -b flag to git-mailinfo"
+#: ref-filter.c:253
+#, c-format
+msgid "%%(deltabase) does not take arguments"
msgstr ""
-#: builtin/am.c:2236
-msgid "pass -m flag to git-mailinfo"
+#: ref-filter.c:265
+#, c-format
+msgid "%%(body) does not take arguments"
msgstr ""
-#: builtin/am.c:2238
-msgid "pass --keep-cr flag to git-mailsplit for mbox format"
+#: ref-filter.c:274
+#, c-format
+msgid "%%(subject) does not take arguments"
msgstr ""
-#: builtin/am.c:2241
-msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
+#: ref-filter.c:296
+#, c-format
+msgid "unknown %%(trailers) argument: %s"
msgstr ""
-#: builtin/am.c:2244
-msgid "strip everything before a scissors line"
+#: ref-filter.c:325
+#, c-format
+msgid "positive value expected contents:lines=%s"
msgstr ""
-#: builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252 builtin/am.c:2255
-#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267
-#: builtin/am.c:2273
-msgid "pass it through git-apply"
+#: ref-filter.c:327
+#, c-format
+msgid "unrecognized %%(contents) argument: %s"
msgstr ""
-#: builtin/am.c:2263 builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666
-#: builtin/grep.c:1064 builtin/merge.c:202 builtin/pull.c:142
-#: builtin/pull.c:197 builtin/repack.c:189 builtin/repack.c:193
-#: builtin/repack.c:195 builtin/show-branch.c:631 builtin/show-ref.c:169
-#: builtin/tag.c:399 parse-options.h:132 parse-options.h:134
-#: parse-options.h:245
-msgid "n"
+#: ref-filter.c:342
+#, c-format
+msgid "positive value expected objectname:short=%s"
msgstr ""
-#: builtin/am.c:2269 builtin/branch.c:596 builtin/for-each-ref.c:38
-#: builtin/replace.c:444 builtin/tag.c:434 builtin/verify-tag.c:39
-msgid "format"
+#: ref-filter.c:346
+#, c-format
+msgid "unrecognized %%(objectname) argument: %s"
msgstr ""
-#: builtin/am.c:2270
-msgid "format the patch(es) are in"
+#: ref-filter.c:376
+#, c-format
+msgid "expected format: %%(align:<width>,<position>)"
msgstr ""
-#: builtin/am.c:2276
-msgid "override error message when patch failure occurs"
+#: ref-filter.c:388
+#, c-format
+msgid "unrecognized position:%s"
msgstr ""
-#: builtin/am.c:2278
-msgid "continue applying patches after resolving a conflict"
+#: ref-filter.c:395
+#, c-format
+msgid "unrecognized width:%s"
msgstr ""
-#: builtin/am.c:2281
-msgid "synonyms for --continue"
+#: ref-filter.c:404
+#, c-format
+msgid "unrecognized %%(align) argument: %s"
msgstr ""
-#: builtin/am.c:2284
-msgid "skip the current patch"
+#: ref-filter.c:412
+#, c-format
+msgid "positive width expected with the %%(align) atom"
msgstr ""
-#: builtin/am.c:2287
-msgid "restore the original branch and abort the patching operation."
+#: ref-filter.c:430
+#, c-format
+msgid "unrecognized %%(if) argument: %s"
msgstr ""
-#: builtin/am.c:2291
-msgid "lie about committer date"
+#: ref-filter.c:531
+#, c-format
+msgid "malformed field name: %.*s"
msgstr ""
-#: builtin/am.c:2293
-msgid "use current timestamp for author date"
+#: ref-filter.c:558
+#, c-format
+msgid "unknown field name: %.*s"
msgstr ""
-#: builtin/am.c:2295 builtin/commit.c:1605 builtin/merge.c:233
-#: builtin/pull.c:172 builtin/revert.c:112 builtin/tag.c:414
-msgid "key-id"
+#: ref-filter.c:562
+#, c-format
+msgid ""
+"not a git repository, but the field '%.*s' requires access to object data"
msgstr ""
-#: builtin/am.c:2296
-msgid "GPG-sign commits"
+#: ref-filter.c:686
+#, c-format
+msgid "format: %%(if) atom used without a %%(then) atom"
msgstr ""
-#: builtin/am.c:2299
-msgid "(internal use for git-rebase)"
+#: ref-filter.c:749
+#, c-format
+msgid "format: %%(then) atom used without an %%(if) atom"
msgstr ""
-#: builtin/am.c:2317
-msgid ""
-"The -b/--binary option has been a no-op for long time, and\n"
-"it will be removed. Please do not use it anymore."
+#: ref-filter.c:751
+#, c-format
+msgid "format: %%(then) atom used more than once"
msgstr ""
-#: builtin/am.c:2324
-msgid "failed to read the index"
+#: ref-filter.c:753
+#, c-format
+msgid "format: %%(then) atom used after %%(else)"
msgstr ""
-#: builtin/am.c:2339
+#: ref-filter.c:781
#, c-format
-msgid "previous rebase directory %s still exists but mbox given."
+msgid "format: %%(else) atom used without an %%(if) atom"
msgstr ""
-#: builtin/am.c:2363
+#: ref-filter.c:783
#, c-format
-msgid ""
-"Stray %s directory found.\n"
-"Use \"git am --abort\" to remove it."
+msgid "format: %%(else) atom used without a %%(then) atom"
msgstr ""
-#: builtin/am.c:2369
-msgid "Resolve operation not in progress, we are not resuming."
+#: ref-filter.c:785
+#, c-format
+msgid "format: %%(else) atom used more than once"
msgstr ""
-#: builtin/apply.c:8
-msgid "git apply [<options>] [<patch>...]"
+#: ref-filter.c:800
+#, c-format
+msgid "format: %%(end) atom used without corresponding atom"
msgstr ""
-#: builtin/archive.c:17
+#: ref-filter.c:857
#, c-format
-msgid "could not create archive file '%s'"
+msgid "malformed format string %s"
msgstr ""
-#: builtin/archive.c:20
-msgid "could not redirect output"
+#: ref-filter.c:1453
+#, c-format
+msgid "(no branch, rebasing %s)"
msgstr ""
-#: builtin/archive.c:37
-msgid "git archive: Remote with no URL"
+#: ref-filter.c:1456
+#, c-format
+msgid "(no branch, rebasing detached HEAD %s)"
msgstr ""
-#: builtin/archive.c:58
-msgid "git archive: expected ACK/NAK, got EOF"
+#: ref-filter.c:1459
+#, c-format
+msgid "(no branch, bisect started on %s)"
msgstr ""
-#: builtin/archive.c:61
+#. TRANSLATORS: make sure this matches "HEAD
+#. detached at " in wt-status.c
+#.
+#: ref-filter.c:1467
#, c-format
-msgid "git archive: NACK %s"
+msgid "(HEAD detached at %s)"
msgstr ""
-#: builtin/archive.c:64
-msgid "git archive: protocol error"
+#. TRANSLATORS: make sure this matches "HEAD
+#. detached from " in wt-status.c
+#.
+#: ref-filter.c:1474
+#, c-format
+msgid "(HEAD detached from %s)"
msgstr ""
-#: builtin/archive.c:68
-msgid "git archive: expected a flush"
+#: ref-filter.c:1478
+msgid "(no branch)"
msgstr ""
-#: builtin/bisect--helper.c:7
-msgid "git bisect--helper --next-all [--no-checkout]"
+#: ref-filter.c:1512 ref-filter.c:1669
+#, c-format
+msgid "missing object %s for %s"
msgstr ""
-#: builtin/bisect--helper.c:17
-msgid "perform 'git bisect next'"
+#: ref-filter.c:1522
+#, c-format
+msgid "parse_object_buffer failed on %s for %s"
msgstr ""
-#: builtin/bisect--helper.c:19
-msgid "update BISECT_HEAD instead of checking out the current commit"
+#: ref-filter.c:1888
+#, c-format
+msgid "malformed object at '%s'"
msgstr ""
-#: builtin/blame.c:27
-msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
+#: ref-filter.c:1977
+#, c-format
+msgid "ignoring ref with broken name %s"
msgstr ""
-#: builtin/blame.c:32
-msgid "<rev-opts> are documented in git-rev-list(1)"
+#: ref-filter.c:2263
+#, c-format
+msgid "format: %%(end) atom missing"
msgstr ""
-#: builtin/blame.c:668
-msgid "Show blame entries as we find them, incrementally"
+#: ref-filter.c:2363
+#, c-format
+msgid "option `%s' is incompatible with --merged"
msgstr ""
-#: builtin/blame.c:669
-msgid "Show blank SHA-1 for boundary commits (Default: off)"
+#: ref-filter.c:2366
+#, c-format
+msgid "option `%s' is incompatible with --no-merged"
msgstr ""
-#: builtin/blame.c:670
-msgid "Do not treat root commits as boundaries (Default: off)"
-msgstr ""
-
-#: builtin/blame.c:671
-msgid "Show work cost statistics"
-msgstr ""
-
-#: builtin/blame.c:672
-msgid "Force progress reporting"
-msgstr ""
-
-#: builtin/blame.c:673
-msgid "Show output score for blame entries"
+#: ref-filter.c:2376
+#, c-format
+msgid "malformed object name %s"
msgstr ""
-#: builtin/blame.c:674
-msgid "Show original filename (Default: auto)"
+#: ref-filter.c:2381
+#, c-format
+msgid "option `%s' must point to a commit"
msgstr ""
-#: builtin/blame.c:675
-msgid "Show original linenumber (Default: off)"
+#: remote.c:363
+#, c-format
+msgid "config remote shorthand cannot begin with '/': %s"
msgstr ""
-#: builtin/blame.c:676
-msgid "Show in a format designed for machine consumption"
+#: remote.c:410
+msgid "more than one receivepack given, using the first"
msgstr ""
-#: builtin/blame.c:677
-msgid "Show porcelain format with per-line commit information"
+#: remote.c:418
+msgid "more than one uploadpack given, using the first"
msgstr ""
-#: builtin/blame.c:678
-msgid "Use the same output mode as git-annotate (Default: off)"
+#: remote.c:608
+#, c-format
+msgid "Cannot fetch both %s and %s to %s"
msgstr ""
-#: builtin/blame.c:679
-msgid "Show raw timestamp (Default: off)"
+#: remote.c:612
+#, c-format
+msgid "%s usually tracks %s, not %s"
msgstr ""
-#: builtin/blame.c:680
-msgid "Show long commit SHA1 (Default: off)"
+#: remote.c:616
+#, c-format
+msgid "%s tracks both %s and %s"
msgstr ""
-#: builtin/blame.c:681
-msgid "Suppress author name and timestamp (Default: off)"
+#: remote.c:684
+#, c-format
+msgid "key '%s' of pattern had no '*'"
msgstr ""
-#: builtin/blame.c:682
-msgid "Show author email instead of name (Default: off)"
+#: remote.c:694
+#, c-format
+msgid "value '%s' of pattern has no '*'"
msgstr ""
-#: builtin/blame.c:683
-msgid "Ignore whitespace differences"
+#: remote.c:1000
+#, c-format
+msgid "src refspec %s does not match any"
msgstr ""
-#: builtin/blame.c:690
-msgid "Use an experimental heuristic to improve diffs"
+#: remote.c:1005
+#, c-format
+msgid "src refspec %s matches more than one"
msgstr ""
-#: builtin/blame.c:692
-msgid "Spend extra cycles to find better match"
+#. 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 ""
+"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 ""
-#: builtin/blame.c:693
-msgid "Use revisions from <file> instead of calling git-rev-list"
+#: remote.c:1040
+#, c-format
+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 ""
-#: builtin/blame.c:694
-msgid "Use <file>'s contents as the final image"
+#: remote.c:1045
+#, c-format
+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 ""
-#: builtin/blame.c:695 builtin/blame.c:696
-msgid "score"
+#: remote.c:1050
+#, c-format
+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 ""
-#: builtin/blame.c:695
-msgid "Find line copies within and across files"
+#: remote.c:1055
+#, c-format
+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 ""
-#: builtin/blame.c:696
-msgid "Find line movements within and across files"
+#: remote.c:1091
+#, c-format
+msgid "%s cannot be resolved to branch"
msgstr ""
-#: builtin/blame.c:697
-msgid "n,m"
+#: remote.c:1102
+#, c-format
+msgid "unable to delete '%s': remote ref does not exist"
msgstr ""
-#: builtin/blame.c:697
-msgid "Process only line range n,m, counting from 1"
+#: remote.c:1114
+#, c-format
+msgid "dst refspec %s matches more than one"
msgstr ""
-#: builtin/blame.c:744
-msgid "--progress can't be used with --incremental or porcelain formats"
+#: remote.c:1121
+#, c-format
+msgid "dst ref %s receives from more than one src"
msgstr ""
-#. TRANSLATORS: This string is used to tell us the
-#. maximum display width for a relative timestamp in
-#. "git blame" output. For C locale, "4 years, 11
-#. months ago", which takes 22 places, is the longest
-#. among various forms of relative timestamps, but
-#. your language may need more or fewer display
-#. columns.
-#.
-#: builtin/blame.c:795
-msgid "4 years, 11 months ago"
+#: remote.c:1624 remote.c:1725
+msgid "HEAD does not point to a branch"
msgstr ""
-#: builtin/blame.c:882
+#: remote.c:1633
#, c-format
-msgid "file %s has only %lu line"
-msgid_plural "file %s has only %lu lines"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/blame.c:928
-msgid "Blaming lines"
+msgid "no such branch: '%s'"
msgstr ""
-#: builtin/branch.c:27
-msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
+#: remote.c:1636
+#, c-format
+msgid "no upstream configured for branch '%s'"
msgstr ""
-#: builtin/branch.c:28
-msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
+#: remote.c:1642
+#, c-format
+msgid "upstream branch '%s' not stored as a remote-tracking branch"
msgstr ""
-#: builtin/branch.c:29
-msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
+#: remote.c:1657
+#, c-format
+msgid "push destination '%s' on remote '%s' has no local tracking branch"
msgstr ""
-#: builtin/branch.c:30
-msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
+#: remote.c:1669
+#, c-format
+msgid "branch '%s' has no remote for pushing"
msgstr ""
-#: builtin/branch.c:31
-msgid "git branch [<options>] [-r | -a] [--points-at]"
+#: remote.c:1679
+#, c-format
+msgid "push refspecs for '%s' do not include '%s'"
msgstr ""
-#: builtin/branch.c:32
-msgid "git branch [<options>] [-r | -a] [--format]"
+#: remote.c:1692
+msgid "push has no destination (push.default is 'nothing')"
msgstr ""
-#: builtin/branch.c:145
-#, c-format
-msgid ""
-"deleting branch '%s' that has been merged to\n"
-" '%s', but not yet merged to HEAD."
+#: remote.c:1714
+msgid "cannot resolve 'simple' push to a single destination"
msgstr ""
-#: builtin/branch.c:149
+#: remote.c:1840
#, c-format
-msgid ""
-"not deleting branch '%s' that is not yet merged to\n"
-" '%s', even though it is merged to HEAD."
+msgid "couldn't find remote ref %s"
msgstr ""
-#: builtin/branch.c:163
+#: remote.c:1853
#, c-format
-msgid "Couldn't look up commit object for '%s'"
+msgid "* Ignoring funny ref '%s' locally"
msgstr ""
-#: builtin/branch.c:167
+#: remote.c:2016
#, c-format
-msgid ""
-"The branch '%s' is not fully merged.\n"
-"If you are sure you want to delete it, run 'git branch -D %s'."
+msgid "Your branch is based on '%s', but the upstream is gone.\n"
msgstr ""
-#: builtin/branch.c:180
-msgid "Update of config-file failed"
+#: remote.c:2020
+msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr ""
-#: builtin/branch.c:211
-msgid "cannot use -a with -d"
+#: remote.c:2023
+#, c-format
+msgid "Your branch is up to date with '%s'.\n"
msgstr ""
-#: builtin/branch.c:217
-msgid "Couldn't look up commit object for HEAD"
+#: remote.c:2027
+#, c-format
+msgid "Your branch and '%s' refer to different commits.\n"
msgstr ""
-#: builtin/branch.c:231
+#: remote.c:2030
#, c-format
-msgid "Cannot delete branch '%s' checked out at '%s'"
+msgid " (use \"%s\" for details)\n"
msgstr ""
-#: builtin/branch.c:246
+#: remote.c:2034
#, c-format
-msgid "remote-tracking branch '%s' not found."
+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 ""
-#: builtin/branch.c:247
+#: remote.c:2043
#, c-format
-msgid "branch '%s' not found."
+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 ""
-#: builtin/branch.c:262
+#: remote.c:2054
#, c-format
-msgid "Error deleting remote-tracking branch '%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 ""
-#: builtin/branch.c:263
+#: remote.c:2247
#, c-format
-msgid "Error deleting branch '%s'"
+msgid "cannot parse expected object name '%s'"
msgstr ""
-#: builtin/branch.c:270
+#: replace-object.c:21
#, c-format
-msgid "Deleted remote-tracking branch %s (was %s).\n"
+msgid "bad replace ref name: %s"
msgstr ""
-#: builtin/branch.c:271
+#: replace-object.c:30
#, c-format
-msgid "Deleted branch %s (was %s).\n"
+msgid "duplicate replace ref: %s"
msgstr ""
-#: builtin/branch.c:445
+#: replace-object.c:73
#, c-format
-msgid "Branch %s is being rebased at %s"
+msgid "replace depth too high for object %s"
msgstr ""
-#: builtin/branch.c:449
-#, c-format
-msgid "Branch %s is being bisected at %s"
+#: rerere.c:217 rerere.c:226 rerere.c:229
+msgid "corrupt MERGE_RR"
msgstr ""
-#: builtin/branch.c:464
-msgid "cannot rename the current branch while not on any."
+#: rerere.c:264 rerere.c:269
+msgid "unable to write rerere record"
msgstr ""
-#: builtin/branch.c:474
+#: rerere.c:495
#, c-format
-msgid "Invalid branch name: '%s'"
+msgid "there were errors while writing '%s' (%s)"
msgstr ""
-#: builtin/branch.c:491
-msgid "Branch rename failed"
+#: rerere.c:498
+#, c-format
+msgid "failed to flush '%s'"
msgstr ""
-#: builtin/branch.c:494
+#: rerere.c:503 rerere.c:1039
#, c-format
-msgid "Renamed a misnamed branch '%s' away"
+msgid "could not parse conflict hunks in '%s'"
msgstr ""
-#: builtin/branch.c:497
+#: rerere.c:684
#, c-format
-msgid "Branch renamed to %s, but HEAD is not updated!"
+msgid "failed utime() on '%s'"
msgstr ""
-#: builtin/branch.c:506
-msgid "Branch is renamed, but update of config-file failed"
+#: rerere.c:694
+#, c-format
+msgid "writing '%s' failed"
msgstr ""
-#: builtin/branch.c:522
+#: rerere.c:714
#, c-format
-msgid ""
-"Please edit the description for the branch\n"
-" %s\n"
-"Lines starting with '%c' will be stripped.\n"
+msgid "Staged '%s' using previous resolution."
msgstr ""
-#: builtin/branch.c:555
-msgid "Generic options"
+#: rerere.c:753
+#, c-format
+msgid "Recorded resolution for '%s'."
msgstr ""
-#: builtin/branch.c:557
-msgid "show hash and subject, give twice for upstream branch"
+#: rerere.c:788
+#, c-format
+msgid "Resolved '%s' using previous resolution."
msgstr ""
-#: builtin/branch.c:558
-msgid "suppress informational messages"
+#: rerere.c:803
+#, c-format
+msgid "cannot unlink stray '%s'"
msgstr ""
-#: builtin/branch.c:559
-msgid "set up tracking mode (see git-pull(1))"
+#: rerere.c:807
+#, c-format
+msgid "Recorded preimage for '%s'"
msgstr ""
-#: builtin/branch.c:561
-msgid "change upstream info"
+#: rerere.c:881 submodule.c:2024 builtin/log.c:1750
+#: builtin/submodule--helper.c:1417 builtin/submodule--helper.c:1427
+#, c-format
+msgid "could not create directory '%s'"
msgstr ""
-#: builtin/branch.c:563
-msgid "upstream"
+#: rerere.c:1057
+#, c-format
+msgid "failed to update conflicted state in '%s'"
msgstr ""
-#: builtin/branch.c:563
-msgid "change the upstream info"
+#: rerere.c:1068 rerere.c:1075
+#, c-format
+msgid "no remembered resolution for '%s'"
msgstr ""
-#: builtin/branch.c:564
-msgid "Unset the upstream info"
+#: rerere.c:1077
+#, c-format
+msgid "cannot unlink '%s'"
msgstr ""
-#: builtin/branch.c:565
-msgid "use colored output"
+#: rerere.c:1087
+#, c-format
+msgid "Updated preimage for '%s'"
msgstr ""
-#: builtin/branch.c:566
-msgid "act on remote-tracking branches"
+#: rerere.c:1096
+#, c-format
+msgid "Forgot resolution for '%s'\n"
msgstr ""
-#: builtin/branch.c:568 builtin/branch.c:570
-msgid "print only branches that contain the commit"
+#: rerere.c:1199
+msgid "unable to open rr-cache directory"
msgstr ""
-#: builtin/branch.c:569 builtin/branch.c:571
-msgid "print only branches that don't contain the commit"
+#: revision.c:2476
+msgid "your current branch appears to be broken"
msgstr ""
-#: builtin/branch.c:574
-msgid "Specific git-branch actions:"
+#: revision.c:2479
+#, c-format
+msgid "your current branch '%s' does not have any commits yet"
msgstr ""
-#: builtin/branch.c:575
-msgid "list both remote-tracking and local branches"
+#: revision.c:2679
+msgid "--first-parent is incompatible with --bisect"
msgstr ""
-#: builtin/branch.c:577
-msgid "delete fully merged branch"
+#: revision.c:2683
+msgid "-L does not yet support diff formats besides -p and -s"
msgstr ""
-#: builtin/branch.c:578
-msgid "delete branch (even if not merged)"
+#: run-command.c:763
+msgid "open /dev/null failed"
msgstr ""
-#: builtin/branch.c:579
-msgid "move/rename a branch and its reflog"
+#: run-command.c:1269
+#, c-format
+msgid "cannot create async thread: %s"
msgstr ""
-#: builtin/branch.c:580
-msgid "move/rename a branch, even if target exists"
+#: run-command.c:1333
+#, c-format
+msgid ""
+"The '%s' hook was ignored because it's not set as executable.\n"
+"You can disable this warning with `git config advice.ignoredHook false`."
msgstr ""
-#: builtin/branch.c:581
-msgid "list branch names"
+#: send-pack.c:141
+msgid "unexpected flush packet while reading remote unpack status"
msgstr ""
-#: builtin/branch.c:582
-msgid "create the branch's reflog"
+#: send-pack.c:143
+#, c-format
+msgid "unable to parse remote unpack status: %s"
msgstr ""
-#: builtin/branch.c:584
-msgid "edit the description for the branch"
+#: send-pack.c:145
+#, c-format
+msgid "remote unpack failed: %s"
msgstr ""
-#: builtin/branch.c:585
-msgid "force creation, move/rename, deletion"
+#: send-pack.c:306
+msgid "failed to sign the push certificate"
msgstr ""
-#: builtin/branch.c:586
-msgid "print only branches that are merged"
+#: send-pack.c:420
+msgid "the receiving end does not support --signed push"
msgstr ""
-#: builtin/branch.c:587
-msgid "print only branches that are not merged"
+#: send-pack.c:422
+msgid ""
+"not sending a push certificate since the receiving end does not support --"
+"signed push"
msgstr ""
-#: builtin/branch.c:588
-msgid "list branches in columns"
+#: send-pack.c:434
+msgid "the receiving end does not support --atomic push"
msgstr ""
-#: builtin/branch.c:589 builtin/for-each-ref.c:39 builtin/tag.c:427
-msgid "key"
+#: send-pack.c:439
+msgid "the receiving end does not support push options"
msgstr ""
-#: builtin/branch.c:590 builtin/for-each-ref.c:40 builtin/tag.c:428
-msgid "field name to sort on"
+#: sequencer.c:187
+#, c-format
+msgid "invalid commit message cleanup mode '%s'"
msgstr ""
-#: builtin/branch.c:592 builtin/for-each-ref.c:42 builtin/notes.c:407
-#: builtin/notes.c:410 builtin/notes.c:570 builtin/notes.c:573
-#: builtin/tag.c:430
-msgid "object"
+#: sequencer.c:292
+#, c-format
+msgid "could not delete '%s'"
msgstr ""
-#: builtin/branch.c:593
-msgid "print only branches of the object"
+#: sequencer.c:318
+msgid "revert"
msgstr ""
-#: builtin/branch.c:595 builtin/for-each-ref.c:48 builtin/tag.c:435
-msgid "sorting and filtering are case insensitive"
+#: sequencer.c:320
+msgid "cherry-pick"
msgstr ""
-#: builtin/branch.c:596 builtin/for-each-ref.c:38 builtin/tag.c:434
-#: builtin/verify-tag.c:39
-msgid "format to use for the output"
+#: sequencer.c:322
+msgid "rebase -i"
msgstr ""
-#: builtin/branch.c:615
-msgid "Failed to resolve HEAD as a valid ref."
+#: sequencer.c:324
+#, c-format
+msgid "unknown action: %d"
msgstr ""
-#: builtin/branch.c:619 builtin/clone.c:728
-msgid "HEAD not found below refs/heads!"
+#: sequencer.c:382
+msgid ""
+"after resolving the conflicts, mark the corrected paths\n"
+"with 'git add <paths>' or 'git rm <paths>'"
msgstr ""
-#: builtin/branch.c:642
-msgid "--column and --verbose are incompatible"
+#: sequencer.c:385
+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 ""
-#: builtin/branch.c:653 builtin/branch.c:705
-msgid "branch name required"
+#: sequencer.c:398 sequencer.c:2801
+#, c-format
+msgid "could not lock '%s'"
msgstr ""
-#: builtin/branch.c:681
-msgid "Cannot give description to detached HEAD"
+#: sequencer.c:405
+#, c-format
+msgid "could not write eol to '%s'"
msgstr ""
-#: builtin/branch.c:686
-msgid "cannot edit description of more than one branch"
+#: sequencer.c:410 sequencer.c:2684 sequencer.c:2807 sequencer.c:2821
+#: sequencer.c:3084
+#, c-format
+msgid "failed to finalize '%s'"
msgstr ""
-#: builtin/branch.c:693
+#: sequencer.c:433 sequencer.c:978 sequencer.c:1652 sequencer.c:2704
+#: sequencer.c:3066 sequencer.c:3175 builtin/am.c:245 builtin/commit.c:760
+#: builtin/merge.c:1115 builtin/rebase.c:567
#, c-format
-msgid "No commit on branch '%s' yet."
+msgid "could not read '%s'"
msgstr ""
-#: builtin/branch.c:696
+#: sequencer.c:459
#, c-format
-msgid "No branch named '%s'."
+msgid "your local changes would be overwritten by %s."
msgstr ""
-#: builtin/branch.c:711
-msgid "too many branches for a rename operation"
+#: sequencer.c:463
+msgid "commit your changes or stash them to proceed."
msgstr ""
-#: builtin/branch.c:716
-msgid "too many branches to set new upstream"
+#: sequencer.c:495
+#, c-format
+msgid "%s: fast-forward"
msgstr ""
-#: builtin/branch.c:720
+#: sequencer.c:534 builtin/tag.c:555
#, c-format
-msgid ""
-"could not set upstream of HEAD to %s when it does not point to any branch."
+msgid "Invalid cleanup mode %s"
msgstr ""
-#: builtin/branch.c:723 builtin/branch.c:745 builtin/branch.c:766
+#. TRANSLATORS: %s will be "revert", "cherry-pick" or
+#. "rebase -i".
+#.
+#: sequencer.c:629
#, c-format
-msgid "no such branch '%s'"
+msgid "%s: Unable to write new index file"
+msgstr ""
+
+#: sequencer.c:646
+msgid "unable to update cache tree"
+msgstr ""
+
+#: sequencer.c:660
+msgid "could not resolve HEAD commit"
msgstr ""
-#: builtin/branch.c:727
+#: sequencer.c:740
#, c-format
-msgid "branch '%s' does not exist"
+msgid "no key present in '%.*s'"
msgstr ""
-#: builtin/branch.c:739
-msgid "too many branches to unset upstream"
+#: sequencer.c:751
+#, c-format
+msgid "unable to dequote value of '%s'"
msgstr ""
-#: builtin/branch.c:743
-msgid "could not unset upstream of HEAD when it does not point to any branch."
+#: sequencer.c:788 wrapper.c:227 wrapper.c:397 builtin/am.c:706
+#: builtin/am.c:798 builtin/merge.c:1112 builtin/rebase.c:1035
+#, c-format
+msgid "could not open '%s' for reading"
+msgstr ""
+
+#: sequencer.c:798
+msgid "'GIT_AUTHOR_NAME' already given"
+msgstr ""
+
+#: sequencer.c:803
+msgid "'GIT_AUTHOR_EMAIL' already given"
msgstr ""
-#: builtin/branch.c:749
+#: sequencer.c:808
+msgid "'GIT_AUTHOR_DATE' already given"
+msgstr ""
+
+#: sequencer.c:812
#, c-format
-msgid "Branch '%s' has no upstream information"
+msgid "unknown variable '%s'"
msgstr ""
-#: builtin/branch.c:763
-msgid "it does not make sense to create 'HEAD' manually"
+#: sequencer.c:817
+msgid "missing 'GIT_AUTHOR_NAME'"
msgstr ""
-#: builtin/branch.c:769
-msgid "-a and -r options to 'git branch' do not make sense with a branch name"
+#: sequencer.c:819
+msgid "missing 'GIT_AUTHOR_EMAIL'"
msgstr ""
-#: builtin/branch.c:772
+#: sequencer.c:821
+msgid "missing 'GIT_AUTHOR_DATE'"
+msgstr ""
+
+#: sequencer.c:881
#, c-format
-msgid ""
-"The --set-upstream flag is deprecated and will be removed. Consider using --"
-"track or --set-upstream-to\n"
+msgid "invalid date format '%s' in '%s'"
msgstr ""
-#: builtin/branch.c:789
+#: sequencer.c:898
#, 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"
-"If you wanted to make '%s' track '%s', do this:\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 ""
-#: builtin/bundle.c:45
-#, c-format
-msgid "%s is okay\n"
-msgstr ""
-
-#: builtin/bundle.c:58
-msgid "Need a repository to create a bundle."
+#: sequencer.c:992
+msgid "writing root commit"
msgstr ""
-#: builtin/bundle.c:62
-msgid "Need a repository to unbundle."
+#: sequencer.c:1213
+msgid "'prepare-commit-msg' hook failed"
msgstr ""
-#: builtin/cat-file.c:519
+#: sequencer.c:1220
msgid ""
-"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
-"p | <type> | --textconv | --filters) [--path=<path>] <object>"
+"Your name and email address were configured automatically based\n"
+"on your username and hostname. Please check that they are accurate.\n"
+"You can suppress this message by setting them explicitly. Run the\n"
+"following command and follow the instructions in your editor to edit\n"
+"your configuration file:\n"
+"\n"
+" git config --global --edit\n"
+"\n"
+"After doing this, you may fix the identity used for this commit with:\n"
+"\n"
+" git commit --amend --reset-author\n"
msgstr ""
-#: builtin/cat-file.c:520
+#: sequencer.c:1233
msgid ""
-"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
-"filters]"
+"Your name and email address were configured automatically based\n"
+"on your username and hostname. Please check that they are accurate.\n"
+"You can suppress this message by setting them explicitly:\n"
+"\n"
+" git config --global user.name \"Your Name\"\n"
+" git config --global user.email you@example.com\n"
+"\n"
+"After doing this, you may fix the identity used for this commit with:\n"
+"\n"
+" git commit --amend --reset-author\n"
msgstr ""
-#: builtin/cat-file.c:557
-msgid "<type> can be one of: blob, tree, commit, tag"
+#: sequencer.c:1275
+msgid "couldn't look up newly created commit"
msgstr ""
-#: builtin/cat-file.c:558
-msgid "show object type"
+#: sequencer.c:1277
+msgid "could not parse newly created commit"
msgstr ""
-#: builtin/cat-file.c:559
-msgid "show object size"
+#: sequencer.c:1323
+msgid "unable to resolve HEAD after creating commit"
msgstr ""
-#: builtin/cat-file.c:561
-msgid "exit with zero when there's no error"
+#: sequencer.c:1325
+msgid "detached HEAD"
msgstr ""
-#: builtin/cat-file.c:562
-msgid "pretty-print object's content"
+#: sequencer.c:1329
+msgid " (root-commit)"
msgstr ""
-#: builtin/cat-file.c:564
-msgid "for blob objects, run textconv on object's content"
+#: sequencer.c:1350
+msgid "could not parse HEAD"
msgstr ""
-#: builtin/cat-file.c:566
-msgid "for blob objects, run filters on object's content"
+#: sequencer.c:1352
+#, c-format
+msgid "HEAD %s is not a commit!"
msgstr ""
-#: builtin/cat-file.c:567 git-submodule.sh:944
-msgid "blob"
+#: sequencer.c:1356 builtin/commit.c:1551
+msgid "could not parse HEAD commit"
msgstr ""
-#: builtin/cat-file.c:568
-msgid "use a specific path for --textconv/--filters"
+#: sequencer.c:1408 sequencer.c:2001
+msgid "unable to parse commit author"
msgstr ""
-#: builtin/cat-file.c:570
-msgid "allow -s and -t to work with broken/corrupt objects"
+#: sequencer.c:1418 builtin/am.c:1572 builtin/merge.c:688
+msgid "git write-tree failed to write a tree"
msgstr ""
-#: builtin/cat-file.c:571
-msgid "buffer --batch output"
+#: sequencer.c:1435 sequencer.c:1496
+#, c-format
+msgid "unable to read commit message from '%s'"
msgstr ""
-#: builtin/cat-file.c:573
-msgid "show info and content of objects fed from the standard input"
+#: sequencer.c:1462 builtin/am.c:1594 builtin/commit.c:1650 builtin/merge.c:882
+#: builtin/merge.c:906
+msgid "failed to write commit object"
msgstr ""
-#: builtin/cat-file.c:576
-msgid "show info about objects fed from the standard input"
+#: sequencer.c:1523
+#, c-format
+msgid "could not parse commit %s"
msgstr ""
-#: builtin/cat-file.c:579
-msgid "follow in-tree symlinks (used with --batch or --batch-check)"
+#: sequencer.c:1528
+#, c-format
+msgid "could not parse parent commit %s"
msgstr ""
-#: builtin/cat-file.c:581
-msgid "show all objects with --batch or --batch-check"
+#: sequencer.c:1602 sequencer.c:1712
+#, c-format
+msgid "unknown command: %d"
msgstr ""
-#: builtin/check-attr.c:12
-msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
+#: sequencer.c:1659 sequencer.c:1684
+#, c-format
+msgid "This is a combination of %d commits."
msgstr ""
-#: builtin/check-attr.c:13
-msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
+#: sequencer.c:1669
+msgid "need a HEAD to fixup"
msgstr ""
-#: builtin/check-attr.c:20
-msgid "report all attributes set on file"
+#: sequencer.c:1671 sequencer.c:3111
+msgid "could not read HEAD"
msgstr ""
-#: builtin/check-attr.c:21
-msgid "use .gitattributes only from the index"
+#: sequencer.c:1673
+msgid "could not read HEAD's commit message"
msgstr ""
-#: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:99
-msgid "read file names from stdin"
+#: sequencer.c:1679
+#, c-format
+msgid "cannot write '%s'"
msgstr ""
-#: builtin/check-attr.c:24 builtin/check-ignore.c:26
-msgid "terminate input and output records by a NUL character"
+#: sequencer.c:1686 git-rebase--preserve-merges.sh:441
+msgid "This is the 1st commit message:"
msgstr ""
-#: builtin/check-ignore.c:20 builtin/checkout.c:1143 builtin/gc.c:357
-msgid "suppress progress reporting"
+#: sequencer.c:1694
+#, c-format
+msgid "could not read commit message of %s"
msgstr ""
-#: builtin/check-ignore.c:28
-msgid "show non-matching input paths"
+#: sequencer.c:1701
+#, c-format
+msgid "This is the commit message #%d:"
msgstr ""
-#: builtin/check-ignore.c:30
-msgid "ignore index when checking"
+#: sequencer.c:1707
+#, c-format
+msgid "The commit message #%d will be skipped:"
msgstr ""
-#: builtin/check-ignore.c:158
-msgid "cannot specify pathnames with --stdin"
+#: sequencer.c:1795
+msgid "your index file is unmerged."
msgstr ""
-#: builtin/check-ignore.c:161
-msgid "-z only makes sense with --stdin"
+#: sequencer.c:1802
+msgid "cannot fixup root commit"
msgstr ""
-#: builtin/check-ignore.c:163
-msgid "no path specified"
+#: sequencer.c:1821
+#, c-format
+msgid "commit %s is a merge but no -m option was given."
msgstr ""
-#: builtin/check-ignore.c:167
-msgid "--quiet is only valid with a single pathname"
+#: sequencer.c:1829 sequencer.c:1837
+#, c-format
+msgid "commit %s does not have parent %d"
msgstr ""
-#: builtin/check-ignore.c:169
-msgid "cannot have both --quiet and --verbose"
+#: sequencer.c:1843
+#, c-format
+msgid "cannot get commit message for %s"
msgstr ""
-#: builtin/check-ignore.c:172
-msgid "--non-matching is only valid with --verbose"
+#. TRANSLATORS: The first %s will be a "todo" command like
+#. "revert" or "pick", the second %s a SHA1.
+#: sequencer.c:1862
+#, c-format
+msgid "%s: cannot parse parent commit %s"
msgstr ""
-#: builtin/check-mailmap.c:9
-msgid "git check-mailmap [<options>] <contact>..."
+#: sequencer.c:1927
+#, c-format
+msgid "could not rename '%s' to '%s'"
msgstr ""
-#: builtin/check-mailmap.c:14
-msgid "also read contacts from stdin"
+#: sequencer.c:1982
+#, c-format
+msgid "could not revert %s... %s"
msgstr ""
-#: builtin/check-mailmap.c:25
+#: sequencer.c:1983
#, c-format
-msgid "unable to parse contact: %s"
+msgid "could not apply %s... %s"
msgstr ""
-#: builtin/check-mailmap.c:48
-msgid "no contacts specified"
+#: sequencer.c:2042
+#, c-format
+msgid "git %s: failed to read the index"
msgstr ""
-#: builtin/checkout-index.c:128
-msgid "git checkout-index [<options>] [--] [<file>...]"
+#: sequencer.c:2049
+#, c-format
+msgid "git %s: failed to refresh the index"
msgstr ""
-#: builtin/checkout-index.c:145
-msgid "stage should be between 1 and 3 or all"
+#: sequencer.c:2118
+#, c-format
+msgid "%s does not accept arguments: '%s'"
msgstr ""
-#: builtin/checkout-index.c:161
-msgid "check out all files in the index"
+#: sequencer.c:2127
+#, c-format
+msgid "missing arguments for %s"
msgstr ""
-#: builtin/checkout-index.c:162
-msgid "force overwrite of existing files"
+#: sequencer.c:2164
+#, c-format
+msgid "could not parse '%.*s'"
msgstr ""
-#: builtin/checkout-index.c:164
-msgid "no warning for existing files and files not in index"
+#: sequencer.c:2226
+#, c-format
+msgid "invalid line %d: %.*s"
msgstr ""
-#: builtin/checkout-index.c:166
-msgid "don't checkout new files"
+#: sequencer.c:2237
+#, c-format
+msgid "cannot '%s' without a previous commit"
msgstr ""
-#: builtin/checkout-index.c:168
-msgid "update stat information in the index file"
+#: sequencer.c:2285 builtin/rebase.c:153 builtin/rebase.c:178
+#: builtin/rebase.c:204 builtin/rebase.c:229
+#, c-format
+msgid "could not read '%s'."
msgstr ""
-#: builtin/checkout-index.c:172
-msgid "read list of paths from the standard input"
+#: sequencer.c:2360
+msgid "please fix this using 'git rebase --edit-todo'."
msgstr ""
-#: builtin/checkout-index.c:174
-msgid "write the content to temporary files"
+#: sequencer.c:2362
+#, c-format
+msgid "unusable instruction sheet: '%s'"
msgstr ""
-#: builtin/checkout-index.c:175 builtin/column.c:31
-#: builtin/submodule--helper.c:635 builtin/submodule--helper.c:638
-#: builtin/submodule--helper.c:644 builtin/submodule--helper.c:980
-#: builtin/worktree.c:478
-msgid "string"
+#: sequencer.c:2367
+msgid "no commits parsed."
msgstr ""
-#: builtin/checkout-index.c:176
-msgid "when creating files, prepend <string>"
+#: sequencer.c:2378
+msgid "cannot cherry-pick during a revert."
msgstr ""
-#: builtin/checkout-index.c:178
-msgid "copy out the files from named stage"
+#: sequencer.c:2380
+msgid "cannot revert during a cherry-pick."
msgstr ""
-#: builtin/checkout.c:26
-msgid "git checkout [<options>] <branch>"
+#: sequencer.c:2462
+#, c-format
+msgid "invalid value for %s: %s"
msgstr ""
-#: builtin/checkout.c:27
-msgid "git checkout [<options>] [<branch>] -- <file>..."
+#: sequencer.c:2549
+msgid "unusable squash-onto"
msgstr ""
-#: builtin/checkout.c:135 builtin/checkout.c:168
+#: sequencer.c:2565
#, c-format
-msgid "path '%s' does not have our version"
+msgid "malformed options sheet: '%s'"
msgstr ""
-#: builtin/checkout.c:137 builtin/checkout.c:170
-#, c-format
-msgid "path '%s' does not have their version"
+#: sequencer.c:2648 sequencer.c:4227
+msgid "empty commit set passed"
msgstr ""
-#: builtin/checkout.c:153
-#, c-format
-msgid "path '%s' does not have all necessary versions"
+#: sequencer.c:2656
+msgid "a cherry-pick or revert is already in progress"
msgstr ""
-#: builtin/checkout.c:197
-#, c-format
-msgid "path '%s' does not have necessary versions"
+#: sequencer.c:2657
+msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
msgstr ""
-#: builtin/checkout.c:214
+#: sequencer.c:2660
#, c-format
-msgid "path '%s': cannot merge"
+msgid "could not create sequencer directory '%s'"
msgstr ""
-#: builtin/checkout.c:231
-#, c-format
-msgid "Unable to add merge result for '%s'"
+#: sequencer.c:2674
+msgid "could not lock HEAD"
msgstr ""
-#: builtin/checkout.c:253 builtin/checkout.c:256 builtin/checkout.c:259
-#: builtin/checkout.c:262
-#, c-format
-msgid "'%s' cannot be used with updating paths"
+#: sequencer.c:2729 sequencer.c:3979
+msgid "no cherry-pick or revert in progress"
msgstr ""
-#: builtin/checkout.c:265 builtin/checkout.c:268
-#, c-format
-msgid "'%s' cannot be used with %s"
+#: sequencer.c:2731
+msgid "cannot resolve HEAD"
msgstr ""
-#: builtin/checkout.c:271
+#: sequencer.c:2733 sequencer.c:2768
+msgid "cannot abort from a branch yet to be born"
+msgstr ""
+
+#: sequencer.c:2754 builtin/grep.c:732
#, c-format
-msgid "Cannot update paths and switch to branch '%s' at the same time."
+msgid "cannot open '%s'"
msgstr ""
-#: builtin/checkout.c:342 builtin/checkout.c:349
+#: sequencer.c:2756
#, c-format
-msgid "path '%s' is unmerged"
+msgid "cannot read '%s': %s"
msgstr ""
-#: builtin/checkout.c:497
-msgid "you need to resolve your current index first"
+#: sequencer.c:2757
+msgid "unexpected end of file"
msgstr ""
-#: builtin/checkout.c:628
+#: sequencer.c:2763
#, c-format
-msgid "Can not do reflog for '%s': %s\n"
+msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr ""
-#: builtin/checkout.c:669
-msgid "HEAD is now at"
+#: sequencer.c:2774
+msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr ""
-#: builtin/checkout.c:673 builtin/clone.c:682
-msgid "unable to update HEAD"
+#: sequencer.c:2903 sequencer.c:3894
+#, c-format
+msgid "could not update %s"
msgstr ""
-#: builtin/checkout.c:677
-#, c-format
-msgid "Reset branch '%s'\n"
+#: sequencer.c:2941 sequencer.c:3874
+msgid "cannot read HEAD"
msgstr ""
-#: builtin/checkout.c:680
+#: sequencer.c:2958
#, c-format
-msgid "Already on '%s'\n"
+msgid "unable to copy '%s' to '%s'"
msgstr ""
-#: builtin/checkout.c:684
+#: sequencer.c:2966
#, c-format
-msgid "Switched to and reset branch '%s'\n"
+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 ""
-#: builtin/checkout.c:686 builtin/checkout.c:1075
+#: sequencer.c:2976
#, c-format
-msgid "Switched to a new branch '%s'\n"
+msgid "Could not apply %s... %.*s"
msgstr ""
-#: builtin/checkout.c:688
+#: sequencer.c:2983
#, c-format
-msgid "Switched to branch '%s'\n"
+msgid "Could not merge %.*s"
msgstr ""
-#: builtin/checkout.c:739
+#: sequencer.c:2997 sequencer.c:3001 builtin/difftool.c:633
#, c-format
-msgid " ... and %d more.\n"
+msgid "could not copy '%s' to '%s'"
+msgstr ""
+
+#: sequencer.c:3023 sequencer.c:3446 builtin/rebase.c:839 builtin/rebase.c:1580
+#: builtin/rebase.c:1940 builtin/rebase.c:1995
+msgid "could not read index"
msgstr ""
-#: builtin/checkout.c:745
+#: sequencer.c:3028
#, c-format
msgid ""
-"Warning: you are leaving %d commit behind, not connected to\n"
-"any of your branches:\n"
+"execution failed: %s\n"
+"%sYou can fix the problem, and then run\n"
"\n"
-"%s\n"
-msgid_plural ""
-"Warning: you are leaving %d commits behind, not connected to\n"
-"any of your branches:\n"
+" git rebase --continue\n"
"\n"
-"%s\n"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
+
+#: sequencer.c:3034
+msgid "and made changes to the index and/or the working tree\n"
+msgstr ""
-#: builtin/checkout.c:764
+#: sequencer.c:3040
#, 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"
+"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 branch <new-branch-name> %s\n"
+" git rebase --continue\n"
"\n"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
-#: builtin/checkout.c:800
-msgid "internal error in revision walk"
+#: sequencer.c:3101
+#, c-format
+msgid "illegal label name: '%.*s'"
msgstr ""
-#: builtin/checkout.c:804
-msgid "Previous HEAD position was"
+#: sequencer.c:3155
+msgid "writing fake root commit"
msgstr ""
-#: builtin/checkout.c:832 builtin/checkout.c:1070
-msgid "You are on a branch yet to be born"
+#: sequencer.c:3160
+msgid "writing squash-onto"
msgstr ""
-#: builtin/checkout.c:976
+#: sequencer.c:3198 builtin/rebase.c:844 builtin/rebase.c:850
#, c-format
-msgid "only one reference expected, %d given."
+msgid "failed to find tree of %s"
msgstr ""
-#: builtin/checkout.c:1016 builtin/worktree.c:215
-#, c-format
-msgid "invalid reference: %s"
+#: sequencer.c:3216 builtin/rebase.c:863
+msgid "could not write index"
msgstr ""
-#: builtin/checkout.c:1045
+#: sequencer.c:3243
#, c-format
-msgid "reference is not a tree: %s"
+msgid "could not resolve '%s'"
msgstr ""
-#: builtin/checkout.c:1084
-msgid "paths cannot be used with switching branches"
+#: sequencer.c:3271
+msgid "cannot merge without a current revision"
msgstr ""
-#: builtin/checkout.c:1087 builtin/checkout.c:1091
+#: sequencer.c:3293
#, c-format
-msgid "'%s' cannot be used with switching branches"
+msgid "unable to parse '%.*s'"
msgstr ""
-#: builtin/checkout.c:1095 builtin/checkout.c:1098 builtin/checkout.c:1103
-#: builtin/checkout.c:1106
+#: sequencer.c:3302
#, c-format
-msgid "'%s' cannot be used with '%s'"
+msgid "nothing to merge: '%.*s'"
+msgstr ""
+
+#: sequencer.c:3314
+msgid "octopus merge cannot be executed on top of a [new root]"
msgstr ""
-#: builtin/checkout.c:1111
+#: sequencer.c:3329
#, c-format
-msgid "Cannot switch branch to a non-commit '%s'"
+msgid "could not get commit message of '%s'"
msgstr ""
-#: builtin/checkout.c:1144 builtin/checkout.c:1146 builtin/clone.c:113
-#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:328
-#: builtin/worktree.c:330
-msgid "branch"
+#: sequencer.c:3478
+#, c-format
+msgid "could not even attempt to merge '%.*s'"
msgstr ""
-#: builtin/checkout.c:1145
-msgid "create and checkout a new branch"
+#: sequencer.c:3494
+msgid "merge: Unable to write new index file"
msgstr ""
-#: builtin/checkout.c:1147
-msgid "create/reset and checkout a branch"
+#: sequencer.c:3562 builtin/rebase.c:711
+#, c-format
+msgid "Applied autostash.\n"
msgstr ""
-#: builtin/checkout.c:1148
-msgid "create reflog for new branch"
+#: sequencer.c:3574
+#, c-format
+msgid "cannot store %s"
msgstr ""
-#: builtin/checkout.c:1149 builtin/worktree.c:332
-msgid "detach HEAD at named commit"
+#: sequencer.c:3577 builtin/rebase.c:727
+#, c-format
+msgid ""
+"Applying autostash resulted in conflicts.\n"
+"Your changes are safe in the stash.\n"
+"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
msgstr ""
-#: builtin/checkout.c:1150
-msgid "set upstream info for new branch"
+#: sequencer.c:3638
+#, c-format
+msgid "could not checkout %s"
msgstr ""
-#: builtin/checkout.c:1152
-msgid "new-branch"
+#: sequencer.c:3652
+#, c-format
+msgid "%s: not a valid OID"
msgstr ""
-#: builtin/checkout.c:1152
-msgid "new unparented branch"
+#: sequencer.c:3657 git-rebase--preserve-merges.sh:724
+msgid "could not detach HEAD"
msgstr ""
-#: builtin/checkout.c:1153
-msgid "checkout our version for unmerged files"
+#: sequencer.c:3672
+#, c-format
+msgid "Stopped at HEAD\n"
msgstr ""
-#: builtin/checkout.c:1155
-msgid "checkout their version for unmerged files"
+#: sequencer.c:3674
+#, c-format
+msgid "Stopped at %s\n"
msgstr ""
-#: builtin/checkout.c:1157
-msgid "force checkout (throw away local modifications)"
+#: sequencer.c:3682
+#, c-format
+msgid ""
+"Could not execute the todo command\n"
+"\n"
+" %.*s\n"
+"It has been rescheduled; To edit the command before continuing, please\n"
+"edit the todo list first:\n"
+"\n"
+" git rebase --edit-todo\n"
+" git rebase --continue\n"
msgstr ""
-#: builtin/checkout.c:1158
-msgid "perform a 3-way merge with the new branch"
+#: sequencer.c:3759
+#, c-format
+msgid "Stopped at %s... %.*s\n"
msgstr ""
-#: builtin/checkout.c:1159 builtin/merge.c:235
-msgid "update ignored files (default)"
+#: sequencer.c:3837
+#, c-format
+msgid "unknown command %d"
msgstr ""
-#: builtin/checkout.c:1160 builtin/log.c:1483 parse-options.h:251
-msgid "style"
+#: sequencer.c:3882
+msgid "could not read orig-head"
msgstr ""
-#: builtin/checkout.c:1161
-msgid "conflict style (merge or diff3)"
+#: sequencer.c:3887
+msgid "could not read 'onto'"
msgstr ""
-#: builtin/checkout.c:1164
-msgid "do not limit pathspecs to sparse entries only"
+#: sequencer.c:3901
+#, c-format
+msgid "could not update HEAD to %s"
msgstr ""
-#: builtin/checkout.c:1166
-msgid "second guess 'git checkout <no-such-branch>'"
+#: sequencer.c:3991
+msgid "cannot rebase: You have unstaged changes."
msgstr ""
-#: builtin/checkout.c:1168
-msgid "do not check if another worktree is holding the given ref"
+#: sequencer.c:4000
+msgid "cannot amend non-existing commit"
msgstr ""
-#: builtin/checkout.c:1172 builtin/clone.c:80 builtin/fetch.c:114
-#: builtin/merge.c:232 builtin/pull.c:120 builtin/push.c:544
-#: builtin/send-pack.c:173
-msgid "force progress reporting"
+#: sequencer.c:4002
+#, c-format
+msgid "invalid file: '%s'"
msgstr ""
-#: builtin/checkout.c:1203
-msgid "-b, -B and --orphan are mutually exclusive"
+#: sequencer.c:4004
+#, c-format
+msgid "invalid contents: '%s'"
msgstr ""
-#: builtin/checkout.c:1220
-msgid "--track needs a branch name"
+#: sequencer.c:4007
+msgid ""
+"\n"
+"You have uncommitted changes in your working tree. Please, commit them\n"
+"first and then run 'git rebase --continue' again."
msgstr ""
-#: builtin/checkout.c:1225
-msgid "Missing branch name; try -b"
+#: sequencer.c:4043 sequencer.c:4081
+#, c-format
+msgid "could not write file: '%s'"
msgstr ""
-#: builtin/checkout.c:1261
-msgid "invalid path specification"
+#: sequencer.c:4096
+msgid "could not remove CHERRY_PICK_HEAD"
+msgstr ""
+
+#: sequencer.c:4103
+msgid "could not commit staged changes."
msgstr ""
-#: builtin/checkout.c:1268
+#: sequencer.c:4204
#, c-format
-msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
+msgid "%s: can't cherry-pick a %s"
msgstr ""
-#: builtin/checkout.c:1272
+#: sequencer.c:4208
#, c-format
-msgid "git checkout: --detach does not take a path argument '%s'"
+msgid "%s: bad revision"
msgstr ""
-#: builtin/checkout.c:1276
-msgid ""
-"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
-"checking out of the index."
+#: sequencer.c:4243
+msgid "can't revert as initial commit"
+msgstr ""
+
+#: sequencer.c:4686
+msgid "make_script: unhandled options"
msgstr ""
-#: builtin/clean.c:26
+#: sequencer.c:4689
+msgid "make_script: error preparing revisions"
+msgstr ""
+
+#: sequencer.c:4847
msgid ""
-"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
+"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 ""
-#: builtin/clean.c:30
-#, c-format
-msgid "Removing %s\n"
+#: sequencer.c:4959 sequencer.c:4976
+msgid "nothing to do"
msgstr ""
-#: builtin/clean.c:31
-#, c-format
-msgid "Would remove %s\n"
+#: sequencer.c:4990
+msgid "could not skip unnecessary pick commands"
msgstr ""
-#: builtin/clean.c:32
-#, c-format
-msgid "Skipping repository %s\n"
+#: sequencer.c:5073
+msgid "the script was already rearranged."
msgstr ""
-#: builtin/clean.c:33
+#: setup.c:123
#, c-format
-msgid "Would skip repository %s\n"
+msgid "'%s' is outside repository"
msgstr ""
-#: builtin/clean.c:34
+#: setup.c:173
#, c-format
-msgid "failed to remove %s"
+msgid ""
+"%s: no such path in the working tree.\n"
+"Use 'git <command> -- <path>...' to specify paths that do not exist locally."
msgstr ""
-#: builtin/clean.c:298 git-add--interactive.perl:572
+#: setup.c:186
#, c-format
msgid ""
-"Prompt help:\n"
-"1 - select a numbered item\n"
-"foo - select item based on unique prefix\n"
-" - (empty) select nothing\n"
+"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 ""
+
+#: setup.c:235
+#, c-format
+msgid "option '%s' must come before non-option arguments"
msgstr ""
-#: builtin/clean.c:302 git-add--interactive.perl:581
+#: setup.c:254
#, 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"
+"ambiguous argument '%s': both revision and filename\n"
+"Use '--' to separate paths from revisions, like this:\n"
+"'git <command> [<revision>...] -- [<file>...]'"
msgstr ""
-#: builtin/clean.c:518 git-add--interactive.perl:547
-#: git-add--interactive.perl:552
-#, c-format, perl-format
-msgid "Huh (%s)?\n"
+#: setup.c:390
+msgid "unable to set up work tree using invalid config"
msgstr ""
-#: builtin/clean.c:660
-#, c-format
-msgid "Input ignore patterns>> "
+#: setup.c:394
+msgid "this operation must be run in a work tree"
msgstr ""
-#: builtin/clean.c:697
+#: setup.c:540
#, c-format
-msgid "WARNING: Cannot find items matched by: %s"
+msgid "Expected git repo version <= %d, found %d"
msgstr ""
-#: builtin/clean.c:718
-msgid "Select items to delete"
+#: setup.c:548
+msgid "unknown repository extensions found:"
msgstr ""
-#. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:759
+#: setup.c:567
#, c-format
-msgid "Remove %s [y/N]? "
+msgid "error opening '%s'"
msgstr ""
-#: builtin/clean.c:784 git-add--interactive.perl:1616
+#: setup.c:569
#, c-format
-msgid "Bye.\n"
+msgid "too large to be a .git file: '%s'"
msgstr ""
-#: builtin/clean.c:792
-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"
+#: setup.c:571
+#, c-format
+msgid "error reading %s"
msgstr ""
-#: builtin/clean.c:819 git-add--interactive.perl:1692
-msgid "*** Commands ***"
+#: setup.c:573
+#, c-format
+msgid "invalid gitfile format: %s"
msgstr ""
-#: builtin/clean.c:820 git-add--interactive.perl:1689
-msgid "What now"
+#: setup.c:575
+#, c-format
+msgid "no path in gitfile: %s"
msgstr ""
-#: builtin/clean.c:828
-msgid "Would remove the following item:"
-msgid_plural "Would remove the following items:"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/clean.c:844
-msgid "No more files to clean, exiting."
+#: setup.c:577
+#, c-format
+msgid "not a git repository: %s"
msgstr ""
-#: builtin/clean.c:906
-msgid "do not print names of files removed"
+#: setup.c:676
+#, c-format
+msgid "'$%s' too big"
msgstr ""
-#: builtin/clean.c:908
-msgid "force"
+#: setup.c:690
+#, c-format
+msgid "not a git repository: '%s'"
msgstr ""
-#: builtin/clean.c:909
-msgid "interactive cleaning"
+#: setup.c:719 setup.c:721 setup.c:752
+#, c-format
+msgid "cannot chdir to '%s'"
msgstr ""
-#: builtin/clean.c:911
-msgid "remove whole directories"
+#: setup.c:724 setup.c:780 setup.c:790 setup.c:829 setup.c:837
+msgid "cannot come back to cwd"
msgstr ""
-#: builtin/clean.c:912 builtin/describe.c:452 builtin/describe.c:454
-#: builtin/grep.c:1082 builtin/ls-files.c:546 builtin/name-rev.c:397
-#: builtin/name-rev.c:399 builtin/show-ref.c:176
-msgid "pattern"
+#: setup.c:851
+#, c-format
+msgid "failed to stat '%*s%s%s'"
msgstr ""
-#: builtin/clean.c:913
-msgid "add <pattern> to ignore rules"
+#: setup.c:1083
+msgid "Unable to read current working directory"
msgstr ""
-#: builtin/clean.c:914
-msgid "remove ignored files, too"
+#: setup.c:1092 setup.c:1098
+#, c-format
+msgid "cannot change to '%s'"
msgstr ""
-#: builtin/clean.c:916
-msgid "remove only ignored files"
+#: setup.c:1103
+#, c-format
+msgid "not a git repository (or any of the parent directories): %s"
msgstr ""
-#: builtin/clean.c:934
-msgid "-x and -X cannot be used together"
+#: 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 ""
-#: builtin/clean.c:938
+#: setup.c:1220
+#, c-format
msgid ""
-"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
-"clean"
+"problem with core.sharedRepository filemode value (0%.3o).\n"
+"The owner of files must always have read and write permissions."
msgstr ""
-#: builtin/clean.c:941
-msgid ""
-"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
-"refusing to clean"
+#: setup.c:1264
+msgid "open /dev/null or dup failed"
msgstr ""
-#: builtin/clone.c:38
-msgid "git clone [<options>] [--] <repo> [<dir>]"
+#: setup.c:1279
+msgid "fork failed"
msgstr ""
-#: builtin/clone.c:82
-msgid "don't create a checkout"
+#: setup.c:1284
+msgid "setsid failed"
msgstr ""
-#: builtin/clone.c:83 builtin/clone.c:85 builtin/init-db.c:479
-msgid "create a bare repository"
+#: sha1-file.c:453
+#, c-format
+msgid "object directory %s does not exist; check .git/objects/info/alternates"
msgstr ""
-#: builtin/clone.c:87
-msgid "create a mirror repository (implies bare)"
+#: sha1-file.c:504
+#, c-format
+msgid "unable to normalize alternate object path: %s"
msgstr ""
-#: builtin/clone.c:89
-msgid "to clone from a local repository"
+#: sha1-file.c:576
+#, c-format
+msgid "%s: ignoring alternate object stores, nesting too deep"
msgstr ""
-#: builtin/clone.c:91
-msgid "don't use local hardlinks, always copy"
+#: sha1-file.c:583
+#, c-format
+msgid "unable to normalize object directory: %s"
msgstr ""
-#: builtin/clone.c:93
-msgid "setup as shared repository"
+#: sha1-file.c:626
+msgid "unable to fdopen alternates lockfile"
msgstr ""
-#: builtin/clone.c:95 builtin/clone.c:99
-msgid "pathspec"
+#: sha1-file.c:644
+msgid "unable to read alternates file"
msgstr ""
-#: builtin/clone.c:95 builtin/clone.c:99
-msgid "initialize submodules in the clone"
+#: sha1-file.c:651
+msgid "unable to move new alternates file into place"
msgstr ""
-#: builtin/clone.c:102
-msgid "number of submodules cloned in parallel"
+#: sha1-file.c:686
+#, c-format
+msgid "path '%s' does not exist"
msgstr ""
-#: builtin/clone.c:103 builtin/init-db.c:476
-msgid "template-directory"
+#: sha1-file.c:712
+#, c-format
+msgid "reference repository '%s' as a linked checkout is not supported yet."
msgstr ""
-#: builtin/clone.c:104 builtin/init-db.c:477
-msgid "directory from which templates will be used"
+#: sha1-file.c:718
+#, c-format
+msgid "reference repository '%s' is not a local repository."
msgstr ""
-#: builtin/clone.c:106 builtin/clone.c:108 builtin/submodule--helper.c:642
-#: builtin/submodule--helper.c:983
-msgid "reference repository"
+#: sha1-file.c:724
+#, c-format
+msgid "reference repository '%s' is shallow"
msgstr ""
-#: builtin/clone.c:110
-msgid "use --reference only while cloning"
+#: sha1-file.c:732
+#, c-format
+msgid "reference repository '%s' is grafted"
msgstr ""
-#: builtin/clone.c:111 builtin/column.c:27 builtin/merge-file.c:44
-msgid "name"
+#: sha1-file.c:846
+#, c-format
+msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
msgstr ""
-#: builtin/clone.c:112
-msgid "use <name> instead of 'origin' to track upstream"
+#: sha1-file.c:871
+msgid "mmap failed"
msgstr ""
-#: builtin/clone.c:114
-msgid "checkout <branch> instead of the remote's HEAD"
+#: sha1-file.c:1035
+#, c-format
+msgid "object file %s is empty"
msgstr ""
-#: builtin/clone.c:116
-msgid "path to git-upload-pack on the remote"
+#: sha1-file.c:1159 sha1-file.c:2297
+#, c-format
+msgid "corrupt loose object '%s'"
msgstr ""
-#: builtin/clone.c:117 builtin/fetch.c:115 builtin/grep.c:1025
-#: builtin/pull.c:205
-msgid "depth"
+#: sha1-file.c:1161 sha1-file.c:2301
+#, c-format
+msgid "garbage at end of loose object '%s'"
msgstr ""
-#: builtin/clone.c:118
-msgid "create a shallow clone of that depth"
+#: sha1-file.c:1203
+msgid "invalid object type"
msgstr ""
-#: builtin/clone.c:119 builtin/fetch.c:117 builtin/pack-objects.c:2932
-#: parse-options.h:142
-msgid "time"
+#: sha1-file.c:1287
+#, c-format
+msgid "unable to unpack %s header with --allow-unknown-type"
msgstr ""
-#: builtin/clone.c:120
-msgid "create a shallow clone since a specific time"
+#: sha1-file.c:1290
+#, c-format
+msgid "unable to unpack %s header"
msgstr ""
-#: builtin/clone.c:121 builtin/fetch.c:119
-msgid "revision"
+#: sha1-file.c:1296
+#, c-format
+msgid "unable to parse %s header with --allow-unknown-type"
msgstr ""
-#: builtin/clone.c:122 builtin/fetch.c:120
-msgid "deepen history of shallow clone, excluding rev"
+#: sha1-file.c:1299
+#, c-format
+msgid "unable to parse %s header"
msgstr ""
-#: builtin/clone.c:124
-msgid "clone only one branch, HEAD or --branch"
+#: sha1-file.c:1490
+#, c-format
+msgid "failed to read object %s"
msgstr ""
-#: builtin/clone.c:126
-msgid "don't clone any tags, and make later fetches not to follow them"
+#: sha1-file.c:1494
+#, c-format
+msgid "replacement %s not found for %s"
msgstr ""
-#: builtin/clone.c:128
-msgid "any cloned submodules will be shallow"
+#: sha1-file.c:1498
+#, c-format
+msgid "loose object %s (stored in %s) is corrupt"
msgstr ""
-#: builtin/clone.c:129 builtin/init-db.c:485
-msgid "gitdir"
+#: sha1-file.c:1502
+#, c-format
+msgid "packed object %s (stored in %s) is corrupt"
msgstr ""
-#: builtin/clone.c:130 builtin/init-db.c:486
-msgid "separate git dir from working tree"
+#: sha1-file.c:1604
+#, c-format
+msgid "unable to write file %s"
msgstr ""
-#: builtin/clone.c:131
-msgid "key=value"
+#: sha1-file.c:1611
+#, c-format
+msgid "unable to set permission to '%s'"
msgstr ""
-#: builtin/clone.c:132
-msgid "set config inside the new repository"
+#: sha1-file.c:1618
+msgid "file write error"
msgstr ""
-#: builtin/clone.c:133 builtin/fetch.c:137 builtin/push.c:555
-msgid "use IPv4 addresses only"
+#: sha1-file.c:1637
+msgid "error when closing loose object file"
msgstr ""
-#: builtin/clone.c:135 builtin/fetch.c:139 builtin/push.c:557
-msgid "use IPv6 addresses only"
+#: sha1-file.c:1702
+#, c-format
+msgid "insufficient permission for adding an object to repository database %s"
msgstr ""
-#: builtin/clone.c:272
-msgid ""
-"No directory name could be guessed.\n"
-"Please specify a directory on the command line"
+#: sha1-file.c:1704
+msgid "unable to create temporary file"
msgstr ""
-#: builtin/clone.c:325
-#, c-format
-msgid "info: Could not add alternate for '%s': %s\n"
+#: sha1-file.c:1728
+msgid "unable to write loose object file"
msgstr ""
-#: builtin/clone.c:397
+#: sha1-file.c:1734
#, c-format
-msgid "failed to open '%s'"
+msgid "unable to deflate new object %s (%d)"
msgstr ""
-#: builtin/clone.c:405
+#: sha1-file.c:1738
#, c-format
-msgid "%s exists and is not a directory"
+msgid "deflateEnd on object %s failed (%d)"
msgstr ""
-#: builtin/clone.c:419
+#: sha1-file.c:1742
#, c-format
-msgid "failed to stat %s\n"
+msgid "confused by unstable object source data for %s"
msgstr ""
-#: builtin/clone.c:441
+#: sha1-file.c:1752 builtin/pack-objects.c:920
#, c-format
-msgid "failed to create link '%s'"
+msgid "failed utime() on %s"
msgstr ""
-#: builtin/clone.c:445
+#: sha1-file.c:1827
#, c-format
-msgid "failed to copy file to '%s'"
+msgid "cannot read object for %s"
msgstr ""
-#: builtin/clone.c:470
-#, c-format
-msgid "done.\n"
+#: sha1-file.c:1867
+msgid "corrupt commit"
msgstr ""
-#: builtin/clone.c:482
-msgid ""
-"Clone succeeded, but checkout failed.\n"
-"You can inspect what was checked out with 'git status'\n"
-"and retry the checkout with 'git checkout -f HEAD'\n"
+#: sha1-file.c:1875
+msgid "corrupt tag"
msgstr ""
-#: builtin/clone.c:559
+#: sha1-file.c:1974
#, c-format
-msgid "Could not find remote branch %s to clone."
-msgstr ""
-
-#: builtin/clone.c:654
-msgid "remote did not send all necessary objects"
+msgid "read error while indexing %s"
msgstr ""
-#: builtin/clone.c:670
+#: sha1-file.c:1977
#, c-format
-msgid "unable to update %s"
-msgstr ""
-
-#: builtin/clone.c:719
-msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
-msgstr ""
-
-#: builtin/clone.c:750
-msgid "unable to checkout working tree"
+msgid "short read while indexing %s"
msgstr ""
-#: builtin/clone.c:792
-msgid "unable to write parameters to config file"
+#: sha1-file.c:2050 sha1-file.c:2059
+#, c-format
+msgid "%s: failed to insert into database"
msgstr ""
-#: builtin/clone.c:855
-msgid "cannot repack to clean up"
+#: sha1-file.c:2065
+#, c-format
+msgid "%s: unsupported file type"
msgstr ""
-#: builtin/clone.c:857
-msgid "cannot unlink temporary alternates file"
+#: sha1-file.c:2089
+#, c-format
+msgid "%s is not a valid object"
msgstr ""
-#: builtin/clone.c:890 builtin/receive-pack.c:1945
-msgid "Too many arguments."
+#: sha1-file.c:2091
+#, c-format
+msgid "%s is not a valid '%s' object"
msgstr ""
-#: builtin/clone.c:894
-msgid "You must specify a repository to clone."
+#: sha1-file.c:2118 builtin/index-pack.c:154
+#, c-format
+msgid "unable to open %s"
msgstr ""
-#: builtin/clone.c:907
+#: sha1-file.c:2308 sha1-file.c:2360
#, c-format
-msgid "--bare and --origin %s options are incompatible."
+msgid "hash mismatch for %s (expected %s)"
msgstr ""
-#: builtin/clone.c:910
-msgid "--bare and --separate-git-dir are incompatible."
+#: sha1-file.c:2332
+#, c-format
+msgid "unable to mmap %s"
msgstr ""
-#: builtin/clone.c:923
+#: sha1-file.c:2337
#, c-format
-msgid "repository '%s' does not exist"
+msgid "unable to unpack header of %s"
msgstr ""
-#: builtin/clone.c:929 builtin/fetch.c:1337
+#: sha1-file.c:2343
#, c-format
-msgid "depth %s is not a positive number"
+msgid "unable to parse header of %s"
msgstr ""
-#: builtin/clone.c:939
+#: sha1-file.c:2354
#, c-format
-msgid "destination path '%s' already exists and is not an empty directory."
+msgid "unable to unpack contents of %s"
msgstr ""
-#: builtin/clone.c:949
+#: sha1-name.c:490
#, c-format
-msgid "working tree '%s' already exists."
+msgid "short SHA1 %s is ambiguous"
msgstr ""
-#: builtin/clone.c:964 builtin/clone.c:975 builtin/difftool.c:260
-#: builtin/worktree.c:222 builtin/worktree.c:252
-#, c-format
-msgid "could not create leading directories of '%s'"
+#: sha1-name.c:501
+msgid "The candidates are:"
msgstr ""
-#: builtin/clone.c:967
-#, c-format
-msgid "could not create work tree dir '%s'"
+#: 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 checkout -b $br $(git rev-parse ...)\n"
+"\n"
+"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
+"examine these refs and maybe delete them. Turn this message off by\n"
+"running \"git config advice.objectNameWarning false\""
msgstr ""
-#: builtin/clone.c:979
-#, c-format
-msgid "Cloning into bare repository '%s'...\n"
+#: submodule.c:114 submodule.c:143
+msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
msgstr ""
-#: builtin/clone.c:981
+#: submodule.c:118 submodule.c:147
#, c-format
-msgid "Cloning into '%s'...\n"
+msgid "Could not find section in .gitmodules where path=%s"
msgstr ""
-#: builtin/clone.c:1005
-msgid ""
-"clone --recursive is not compatible with both --reference and --reference-if-"
-"able"
+#: submodule.c:154
+#, c-format
+msgid "Could not remove .gitmodules entry for %s"
msgstr ""
-#: builtin/clone.c:1067
-msgid "--depth is ignored in local clones; use file:// instead."
+#: submodule.c:165
+msgid "staging updated .gitmodules failed"
msgstr ""
-#: builtin/clone.c:1069
-msgid "--shallow-since is ignored in local clones; use file:// instead."
+#: submodule.c:327
+#, c-format
+msgid "in unpopulated submodule '%s'"
msgstr ""
-#: builtin/clone.c:1071
-msgid "--shallow-exclude is ignored in local clones; use file:// instead."
+#: submodule.c:358
+#, c-format
+msgid "Pathspec '%s' is in submodule '%.*s'"
msgstr ""
-#: builtin/clone.c:1074
-msgid "source repository is shallow, ignoring --local"
+#: submodule.c:910
+#, c-format
+msgid "submodule entry '%s' (%s) is a %s, not a commit"
msgstr ""
-#: builtin/clone.c:1079
-msgid "--local is ignored"
+#: submodule.c:1147 builtin/branch.c:672 builtin/submodule--helper.c:1988
+msgid "Failed to resolve HEAD as a valid ref."
msgstr ""
-#: builtin/clone.c:1083
+#: submodule.c:1481
#, c-format
-msgid "Don't know how to clone %s"
+msgid "Could not access submodule '%s'"
msgstr ""
-#: builtin/clone.c:1138 builtin/clone.c:1146
+#: submodule.c:1651
#, c-format
-msgid "Remote branch %s not found in upstream %s"
+msgid "'%s' not recognized as a git repository"
msgstr ""
-#: builtin/clone.c:1149
-msgid "You appear to have cloned an empty repository."
+#: submodule.c:1789
+#, c-format
+msgid "could not start 'git status' in submodule '%s'"
msgstr ""
-#: builtin/column.c:10
-msgid "git column [<options>]"
+#: submodule.c:1802
+#, c-format
+msgid "could not run 'git status' in submodule '%s'"
msgstr ""
-#: builtin/column.c:27
-msgid "lookup config vars"
+#: submodule.c:1817
+#, c-format
+msgid "Could not unset core.worktree setting in submodule '%s'"
msgstr ""
-#: builtin/column.c:28 builtin/column.c:29
-msgid "layout to use"
+#: submodule.c:1907
+#, c-format
+msgid "submodule '%s' has dirty index"
msgstr ""
-#: builtin/column.c:30
-msgid "Maximum width"
+#: submodule.c:1959
+#, c-format
+msgid "Submodule '%s' could not be updated."
msgstr ""
-#: builtin/column.c:31
-msgid "Padding space on left border"
+#: submodule.c:2008
+#, c-format
+msgid ""
+"relocate_gitdir for submodule '%s' with more than one worktree not supported"
msgstr ""
-#: builtin/column.c:32
-msgid "Padding space on right border"
+#: submodule.c:2020 submodule.c:2076
+#, c-format
+msgid "could not lookup name for submodule '%s'"
msgstr ""
-#: builtin/column.c:33
-msgid "Padding space between columns"
+#: submodule.c:2027
+#, c-format
+msgid ""
+"Migrating git directory of '%s%s' from\n"
+"'%s' to\n"
+"'%s'\n"
msgstr ""
-#: builtin/column.c:52
-msgid "--command must be the first argument"
+#: submodule.c:2111
+#, c-format
+msgid "could not recurse into submodule '%s'"
msgstr ""
-#: builtin/commit.c:39
-msgid "git commit [<options>] [--] <pathspec>..."
+#: submodule.c:2155
+msgid "could not start ls-files in .."
msgstr ""
-#: builtin/commit.c:44
-msgid "git status [<options>] [--] <pathspec>..."
+#: submodule.c:2194
+#, c-format
+msgid "ls-tree returned unexpected return code %d"
msgstr ""
-#: builtin/commit.c:49
-msgid ""
-"Your name and email address were configured automatically based\n"
-"on your username and hostname. Please check that they are accurate.\n"
-"You can suppress this message by setting them explicitly. Run the\n"
-"following command and follow the instructions in your editor to edit\n"
-"your configuration file:\n"
-"\n"
-" git config --global --edit\n"
-"\n"
-"After doing this, you may fix the identity used for this commit with:\n"
-"\n"
-" git commit --amend --reset-author\n"
+#: submodule-config.c:232
+#, c-format
+msgid "ignoring suspicious submodule name: %s"
msgstr ""
-#: builtin/commit.c:62
-msgid ""
-"Your name and email address were configured automatically based\n"
-"on your username and hostname. Please check that they are accurate.\n"
-"You can suppress this message by setting them explicitly:\n"
-"\n"
-" git config --global user.name \"Your Name\"\n"
-" git config --global user.email you@example.com\n"
-"\n"
-"After doing this, you may fix the identity used for this commit with:\n"
-"\n"
-" git commit --amend --reset-author\n"
+#: submodule-config.c:299
+msgid "negative values not allowed for submodule.fetchjobs"
msgstr ""
-#: builtin/commit.c:74
-msgid ""
-"You asked to amend the most recent commit, but doing so would make\n"
-"it empty. You can repeat your command with --allow-empty, or you can\n"
-"remove the commit entirely with \"git reset HEAD^\".\n"
+#: submodule-config.c:397
+#, c-format
+msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
msgstr ""
-#: builtin/commit.c:79
-msgid ""
-"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
-"If you wish to commit it anyway, use:\n"
-"\n"
-" git commit --allow-empty\n"
-"\n"
+#: submodule-config.c:486
+#, c-format
+msgid "invalid value for %s"
msgstr ""
-#: builtin/commit.c:86
-msgid "Otherwise, please use 'git reset'\n"
+#: submodule-config.c:755
+#, c-format
+msgid "Could not update .gitmodules entry %s"
msgstr ""
-#: builtin/commit.c:89
-msgid ""
-"If you wish to skip this commit, use:\n"
-"\n"
-" git reset\n"
-"\n"
-"Then \"git cherry-pick --continue\" will resume cherry-picking\n"
-"the remaining commits.\n"
+#: trailer.c:238
+#, c-format
+msgid "running trailer command '%s' failed"
msgstr ""
-#: builtin/commit.c:319
-msgid "failed to unpack HEAD tree object"
+#: 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'"
msgstr ""
-#: builtin/commit.c:360
-msgid "unable to create temporary index"
+#: trailer.c:539 trailer.c:544 builtin/remote.c:295
+#, c-format
+msgid "more than one %s"
msgstr ""
-#: builtin/commit.c:366
-msgid "interactive add failed"
+#: trailer.c:730
+#, c-format
+msgid "empty trailer token in trailer '%.*s'"
msgstr ""
-#: builtin/commit.c:379
-msgid "unable to update temporary index"
+#: trailer.c:750
+#, c-format
+msgid "could not read input file '%s'"
msgstr ""
-#: builtin/commit.c:381
-msgid "Failed to update main cache tree"
+#: trailer.c:753
+msgid "could not read from stdin"
msgstr ""
-#: builtin/commit.c:405 builtin/commit.c:428 builtin/commit.c:477
-msgid "unable to write new_index file"
+#: trailer.c:1011 wrapper.c:701
+#, c-format
+msgid "could not stat %s"
msgstr ""
-#: builtin/commit.c:459
-msgid "cannot do a partial commit during a merge."
+#: trailer.c:1013
+#, c-format
+msgid "file %s is not a regular file"
msgstr ""
-#: builtin/commit.c:461
-msgid "cannot do a partial commit during a cherry-pick."
+#: trailer.c:1015
+#, c-format
+msgid "file %s is not writable by user"
msgstr ""
-#: builtin/commit.c:470
-msgid "cannot read the index"
+#: trailer.c:1027
+msgid "could not open temporary file"
msgstr ""
-#: builtin/commit.c:489
-msgid "unable to write temporary index file"
+#: trailer.c:1067
+#, c-format
+msgid "could not rename temporary file to %s"
msgstr ""
-#: builtin/commit.c:583
+#: transport.c:116
#, c-format
-msgid "commit '%s' lacks author header"
+msgid "Would set upstream of '%s' to '%s' of '%s'\n"
msgstr ""
-#: builtin/commit.c:585
+#: transport.c:142
#, c-format
-msgid "commit '%s' has malformed author line"
+msgid "could not read bundle '%s'"
msgstr ""
-#: builtin/commit.c:604
-msgid "malformed --author parameter"
+#: transport.c:208
+#, c-format
+msgid "transport: invalid depth option '%s'"
msgstr ""
-#: builtin/commit.c:656
-msgid ""
-"unable to select a comment character that is not used\n"
-"in the current commit message"
+#: transport.c:259
+msgid "see protocol.version in 'git help config' for more details"
msgstr ""
-#: builtin/commit.c:693 builtin/commit.c:726 builtin/commit.c:1093
-#, c-format
-msgid "could not lookup commit %s"
+#: transport.c:260
+msgid "server options require protocol version 2 or later"
msgstr ""
-#: builtin/commit.c:705 builtin/shortlog.c:295
-#, c-format
-msgid "(reading log message from standard input)\n"
+#: transport.c:625
+msgid "could not parse transport.color.* config"
msgstr ""
-#: builtin/commit.c:707
-msgid "could not read log from standard input"
+#: transport.c:698
+msgid "support for protocol v2 not implemented yet"
msgstr ""
-#: builtin/commit.c:711
+#: transport.c:825
#, c-format
-msgid "could not read log file '%s'"
+msgid "unknown value for config '%s': %s"
msgstr ""
-#: builtin/commit.c:738 builtin/commit.c:746
-msgid "could not read SQUASH_MSG"
+#: transport.c:891
+#, c-format
+msgid "transport '%s' not allowed"
msgstr ""
-#: builtin/commit.c:743
-msgid "could not read MERGE_MSG"
+#: transport.c:945
+msgid "git-over-rsync is no longer supported"
msgstr ""
-#: builtin/commit.c:797
-msgid "could not write commit template"
+#: transport.c:1040
+#, c-format
+msgid ""
+"The following submodule paths contain changes that can\n"
+"not be found on any remote:\n"
msgstr ""
-#: builtin/commit.c:815
+#: transport.c:1044
#, 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"
+"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/commit.c:820
-#, 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"
+#: transport.c:1052
+msgid "Aborting."
msgstr ""
-#: builtin/commit.c:833
-#, c-format
-msgid ""
-"Please enter the commit message for your changes. Lines starting\n"
-"with '%c' will be ignored, and an empty message aborts the commit.\n"
+#: transport.c:1193
+msgid "failed to push all needed submodules"
msgstr ""
-#: builtin/commit.c:840
-#, c-format
-msgid ""
-"Please enter the commit message for your changes. Lines starting\n"
-"with '%c' will be kept; you may remove them yourself if you want to.\n"
-"An empty message aborts the commit.\n"
+#: transport.c:1326 transport-helper.c:645
+msgid "operation not supported by protocol"
msgstr ""
-#: builtin/commit.c:857
+#: transport.c:1430
#, c-format
-msgid "%sAuthor: %.*s <%.*s>"
+msgid "invalid line while parsing alternate refs: %s"
msgstr ""
-#: builtin/commit.c:865
-#, c-format
-msgid "%sDate: %s"
+#: transport-helper.c:51 transport-helper.c:80
+msgid "full write to remote helper failed"
msgstr ""
-#: builtin/commit.c:872
+#: transport-helper.c:134
#, c-format
-msgid "%sCommitter: %.*s <%.*s>"
+msgid "unable to find remote helper for '%s'"
msgstr ""
-#: builtin/commit.c:889
-msgid "Cannot read index"
+#: transport-helper.c:150 transport-helper.c:559
+msgid "can't dup helper output fd"
msgstr ""
-#: builtin/commit.c:951
-msgid "Error building trees"
+#: transport-helper.c:201
+#, c-format
+msgid ""
+"unknown mandatory capability %s; this remote helper probably needs newer "
+"version of Git"
msgstr ""
-#: builtin/commit.c:965 builtin/tag.c:274
-#, c-format
-msgid "Please supply the message using either -m or -F option.\n"
+#: transport-helper.c:207
+msgid "this remote helper should implement refspec capability"
msgstr ""
-#: builtin/commit.c:1068
+#: transport-helper.c:274 transport-helper.c:414
#, c-format
-msgid "--author '%s' is not 'Name <email>' and matches no existing author"
+msgid "%s unexpectedly said: '%s'"
msgstr ""
-#: builtin/commit.c:1083 builtin/commit.c:1328
+#: transport-helper.c:403
#, c-format
-msgid "Invalid untracked files mode '%s'"
+msgid "%s also locked %s"
msgstr ""
-#: builtin/commit.c:1121
-msgid "--long and -z are incompatible"
+#: transport-helper.c:481
+msgid "couldn't run fast-import"
msgstr ""
-#: builtin/commit.c:1151
-msgid "Using both --reset-author and --author does not make sense"
+#: transport-helper.c:504
+msgid "error while running fast-import"
msgstr ""
-#: builtin/commit.c:1160
-msgid "You have nothing to amend."
+#: transport-helper.c:533 transport-helper.c:1099
+#, c-format
+msgid "could not read ref %s"
msgstr ""
-#: builtin/commit.c:1163
-msgid "You are in the middle of a merge -- cannot amend."
+#: transport-helper.c:578
+#, c-format
+msgid "unknown response to connect: %s"
msgstr ""
-#: builtin/commit.c:1165
-msgid "You are in the middle of a cherry-pick -- cannot amend."
+#: transport-helper.c:600
+msgid "setting remote service path not supported by protocol"
msgstr ""
-#: builtin/commit.c:1168
-msgid "Options --squash and --fixup cannot be used together"
+#: transport-helper.c:602
+msgid "invalid remote service path"
msgstr ""
-#: builtin/commit.c:1178
-msgid "Only one of -c/-C/-F/--fixup can be used."
+#: transport-helper.c:648
+#, c-format
+msgid "can't connect to subservice %s"
msgstr ""
-#: builtin/commit.c:1180
-msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
+#: transport-helper.c:720
+#, c-format
+msgid "expected ok/error, helper said '%s'"
msgstr ""
-#: builtin/commit.c:1188
-msgid "--reset-author can be used only with -C, -c or --amend."
+#: transport-helper.c:773
+#, c-format
+msgid "helper reported unexpected status of %s"
msgstr ""
-#: builtin/commit.c:1205
-msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
+#: transport-helper.c:834
+#, c-format
+msgid "helper %s does not support dry-run"
msgstr ""
-#: builtin/commit.c:1207
-msgid "No paths with --include/--only does not make sense."
+#: transport-helper.c:837
+#, c-format
+msgid "helper %s does not support --signed"
msgstr ""
-#: builtin/commit.c:1219 builtin/tag.c:552
+#: transport-helper.c:840
#, c-format
-msgid "Invalid cleanup mode %s"
+msgid "helper %s does not support --signed=if-asked"
msgstr ""
-#: builtin/commit.c:1224
-msgid "Paths with -a does not make sense."
+#: transport-helper.c:847
+#, c-format
+msgid "helper %s does not support 'push-option'"
msgstr ""
-#: builtin/commit.c:1342 builtin/commit.c:1617
-msgid "show status concisely"
+#: transport-helper.c:939
+msgid "remote-helper doesn't support push; refspec needed"
msgstr ""
-#: builtin/commit.c:1344 builtin/commit.c:1619
-msgid "show branch information"
+#: transport-helper.c:944
+#, c-format
+msgid "helper %s does not support 'force'"
msgstr ""
-#: builtin/commit.c:1346
-msgid "show stash information"
+#: transport-helper.c:991
+msgid "couldn't run fast-export"
msgstr ""
-#: builtin/commit.c:1348
-msgid "version"
+#: transport-helper.c:996
+msgid "error while running fast-export"
msgstr ""
-#: builtin/commit.c:1348 builtin/commit.c:1621 builtin/push.c:530
-#: builtin/worktree.c:449
-msgid "machine-readable output"
+#: transport-helper.c:1021
+#, 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/commit.c:1351 builtin/commit.c:1623
-msgid "show status in long format (default)"
+#: transport-helper.c:1085
+#, c-format
+msgid "malformed response in ref list: %s"
msgstr ""
-#: builtin/commit.c:1354 builtin/commit.c:1626
-msgid "terminate entries with NUL"
+#: transport-helper.c:1238
+#, c-format
+msgid "read(%s) failed"
msgstr ""
-#: builtin/commit.c:1356 builtin/commit.c:1629 builtin/fast-export.c:983
-#: builtin/fast-export.c:986 builtin/tag.c:412
-msgid "mode"
+#: transport-helper.c:1265
+#, c-format
+msgid "write(%s) failed"
msgstr ""
-#: builtin/commit.c:1357 builtin/commit.c:1629
-msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
+#: transport-helper.c:1314
+#, c-format
+msgid "%s thread failed"
msgstr ""
-#: builtin/commit.c:1360
-msgid "show ignored files"
+#: transport-helper.c:1318
+#, c-format
+msgid "%s thread failed to join: %s"
msgstr ""
-#: builtin/commit.c:1361 parse-options.h:155
-msgid "when"
+#: transport-helper.c:1337 transport-helper.c:1341
+#, c-format
+msgid "can't start thread for copying data: %s"
msgstr ""
-#: builtin/commit.c:1362
-msgid ""
-"ignore changes to submodules, optional when: all, dirty, untracked. "
-"(Default: all)"
+#: transport-helper.c:1378
+#, c-format
+msgid "%s process failed to wait"
msgstr ""
-#: builtin/commit.c:1364
-msgid "list untracked files in columns"
+#: transport-helper.c:1382
+#, c-format
+msgid "%s process failed"
msgstr ""
-#: builtin/commit.c:1440
-msgid "couldn't look up newly created commit"
+#: transport-helper.c:1400 transport-helper.c:1409
+msgid "can't start thread for copying data"
msgstr ""
-#: builtin/commit.c:1442
-msgid "could not parse newly created commit"
+#: tree-walk.c:33
+msgid "too-short tree object"
msgstr ""
-#: builtin/commit.c:1487
-msgid "detached HEAD"
+#: tree-walk.c:39
+msgid "malformed mode in tree entry"
msgstr ""
-#: builtin/commit.c:1490
-msgid " (root-commit)"
+#: tree-walk.c:43
+msgid "empty filename in tree entry"
msgstr ""
-#: builtin/commit.c:1587
-msgid "suppress summary after successful commit"
+#: tree-walk.c:116
+msgid "too-short tree file"
msgstr ""
-#: builtin/commit.c:1588
-msgid "show diff in commit message template"
+#: 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/commit.c:1590
-msgid "Commit message options"
+#: unpack-trees.c:113
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by checkout:\n"
+"%%s"
msgstr ""
-#: builtin/commit.c:1591 builtin/tag.c:410
-msgid "read message from file"
+#: 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/commit.c:1592
-msgid "author"
+#: unpack-trees.c:118
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"%%s"
msgstr ""
-#: builtin/commit.c:1592
-msgid "override author for commit"
+#: 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/commit.c:1593 builtin/gc.c:358
-msgid "date"
+#: unpack-trees.c:123
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by %s:\n"
+"%%s"
msgstr ""
-#: builtin/commit.c:1593
-msgid "override date for commit"
+#: unpack-trees.c:128
+#, c-format
+msgid ""
+"Updating the following directories would lose untracked files in them:\n"
+"%s"
msgstr ""
-#: builtin/commit.c:1594 builtin/merge.c:222 builtin/notes.c:401
-#: builtin/notes.c:564 builtin/tag.c:408
-msgid "message"
+#: unpack-trees.c:132
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%sPlease move or remove them before you switch branches."
msgstr ""
-#: builtin/commit.c:1594
-msgid "commit message"
+#: unpack-trees.c:134
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%s"
msgstr ""
-#: builtin/commit.c:1595 builtin/commit.c:1596 builtin/commit.c:1597
-#: builtin/commit.c:1598 parse-options.h:257 ref-filter.h:77
-msgid "commit"
+#: unpack-trees.c:137
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%sPlease move or remove them before you merge."
msgstr ""
-#: builtin/commit.c:1595
-msgid "reuse and edit message from specified commit"
+#: unpack-trees.c:139
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%s"
msgstr ""
-#: builtin/commit.c:1596
-msgid "reuse message from specified commit"
+#: 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/commit.c:1597
-msgid "use autosquash formatted message to fixup specified commit"
+#: unpack-trees.c:144
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%s"
msgstr ""
-#: builtin/commit.c:1598
-msgid "use autosquash formatted message to squash specified commit"
+#: 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/commit.c:1599
-msgid "the commit is authored by me now (used with -C/-c/--amend)"
+#: unpack-trees.c:152
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%s"
msgstr ""
-#: builtin/commit.c:1600 builtin/log.c:1430 builtin/revert.c:105
-msgid "add Signed-off-by:"
+#: 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/commit.c:1601
-msgid "use specified template file"
+#: unpack-trees.c:157
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%s"
msgstr ""
-#: builtin/commit.c:1602
-msgid "force edit of commit"
+#: 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/commit.c:1603
-msgid "default"
+#: unpack-trees.c:162
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%s"
msgstr ""
-#: builtin/commit.c:1603 builtin/tag.c:413
-msgid "how to strip spaces and #comments from message"
+#: unpack-trees.c:170
+#, c-format
+msgid "Entry '%s' overlaps with '%s'. Cannot bind."
msgstr ""
-#: builtin/commit.c:1604
-msgid "include status in commit message template"
+#: unpack-trees.c:173
+#, c-format
+msgid ""
+"Cannot update sparse checkout: the following entries are not up to date:\n"
+"%s"
msgstr ""
-#: builtin/commit.c:1606 builtin/merge.c:234 builtin/pull.c:173
-#: builtin/revert.c:113
-msgid "GPG sign commit"
+#: unpack-trees.c:175
+#, c-format
+msgid ""
+"The following working tree files would be overwritten by sparse checkout "
+"update:\n"
+"%s"
msgstr ""
-#: builtin/commit.c:1609
-msgid "Commit contents options"
+#: unpack-trees.c:177
+#, c-format
+msgid ""
+"The following working tree files would be removed by sparse checkout "
+"update:\n"
+"%s"
msgstr ""
-#: builtin/commit.c:1610
-msgid "commit all changed files"
+#: unpack-trees.c:179
+#, c-format
+msgid ""
+"Cannot update submodule:\n"
+"%s"
msgstr ""
-#: builtin/commit.c:1611
-msgid "add specified files to index for commit"
+#: unpack-trees.c:256
+#, c-format
+msgid "Aborting\n"
msgstr ""
-#: builtin/commit.c:1612
-msgid "interactively add files"
+#: unpack-trees.c:318
+msgid "Checking out files"
msgstr ""
-#: builtin/commit.c:1613
-msgid "interactively add changes"
+#: 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/commit.c:1614
-msgid "commit only specified files"
+#: urlmatch.c:163
+msgid "invalid URL scheme name or missing '://' suffix"
msgstr ""
-#: builtin/commit.c:1615
-msgid "bypass pre-commit and commit-msg hooks"
+#: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405
+#, c-format
+msgid "invalid %XX escape sequence"
msgstr ""
-#: builtin/commit.c:1616
-msgid "show what would be committed"
+#: urlmatch.c:215
+msgid "missing host and scheme is not 'file:'"
msgstr ""
-#: builtin/commit.c:1627
-msgid "amend previous commit"
+#: urlmatch.c:232
+msgid "a 'file:' URL may not have a port number"
msgstr ""
-#: builtin/commit.c:1628
-msgid "bypass post-rewrite hook"
+#: urlmatch.c:247
+msgid "invalid characters in host name"
msgstr ""
-#: builtin/commit.c:1633
-msgid "ok to record an empty change"
+#: urlmatch.c:292 urlmatch.c:303
+msgid "invalid port number"
msgstr ""
-#: builtin/commit.c:1635
-msgid "ok to record a change with an empty message"
+#: urlmatch.c:371
+msgid "invalid '..' path segment"
msgstr ""
-#: builtin/commit.c:1665
-msgid "could not parse HEAD commit"
-msgstr ""
-
-#: builtin/commit.c:1710
+#: worktree.c:255 builtin/am.c:2097
#, c-format
-msgid "Corrupt MERGE_HEAD file (%s)"
+msgid "failed to read '%s'"
msgstr ""
-#: builtin/commit.c:1717
-msgid "could not read MERGE_MODE"
+#: worktree.c:301
+#, c-format
+msgid "'%s' at main working tree is not the repository directory"
msgstr ""
-#: builtin/commit.c:1736
+#: worktree.c:312
#, c-format
-msgid "could not read commit message: %s"
+msgid "'%s' file does not contain absolute path to the working tree location"
msgstr ""
-#: builtin/commit.c:1747
+#: worktree.c:324
#, c-format
-msgid "Aborting commit; you did not edit the message.\n"
+msgid "'%s' does not exist"
msgstr ""
-#: builtin/commit.c:1752
+#: worktree.c:330
#, c-format
-msgid "Aborting commit due to empty commit message.\n"
+msgid "'%s' is not a .git file, error code %d"
msgstr ""
-#: builtin/commit.c:1800
-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."
+#: worktree.c:338
+#, c-format
+msgid "'%s' does not point back to '%s'"
msgstr ""
-#: builtin/config.c:10
-msgid "git config [<options>]"
+#: wrapper.c:223 wrapper.c:393
+#, c-format
+msgid "could not open '%s' for reading and writing"
msgstr ""
-#: builtin/config.c:57
-msgid "Config file location"
+#: wrapper.c:424 wrapper.c:624
+#, c-format
+msgid "unable to access '%s'"
msgstr ""
-#: builtin/config.c:58
-msgid "use global config file"
+#: wrapper.c:632
+msgid "unable to get current working directory"
msgstr ""
-#: builtin/config.c:59
-msgid "use system config file"
+#: wt-status.c:156
+msgid "Unmerged paths:"
msgstr ""
-#: builtin/config.c:60
-msgid "use repository config file"
+#: wt-status.c:183 wt-status.c:210
+#, c-format
+msgid " (use \"git reset %s <file>...\" to unstage)"
msgstr ""
-#: builtin/config.c:61
-msgid "use given config file"
+#: wt-status.c:185 wt-status.c:212
+msgid " (use \"git rm --cached <file>...\" to unstage)"
msgstr ""
-#: builtin/config.c:62
-msgid "blob-id"
+#: wt-status.c:189
+msgid " (use \"git add <file>...\" to mark resolution)"
msgstr ""
-#: builtin/config.c:62
-msgid "read config from given blob object"
+#: wt-status.c:191 wt-status.c:195
+msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
msgstr ""
-#: builtin/config.c:63
-msgid "Action"
+#: wt-status.c:193
+msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr ""
-#: builtin/config.c:64
-msgid "get value: name [value-regex]"
+#: wt-status.c:204 wt-status.c:1064
+msgid "Changes to be committed:"
msgstr ""
-#: builtin/config.c:65
-msgid "get all values: key [value-regex]"
+#: wt-status.c:222 wt-status.c:1073
+msgid "Changes not staged for commit:"
msgstr ""
-#: builtin/config.c:66
-msgid "get values for regexp: name-regex [value-regex]"
+#: wt-status.c:226
+msgid " (use \"git add <file>...\" to update what will be committed)"
msgstr ""
-#: builtin/config.c:67
-msgid "get value specific for the URL: section[.var] URL"
+#: wt-status.c:228
+msgid " (use \"git add/rm <file>...\" to update what will be committed)"
msgstr ""
-#: builtin/config.c:68
-msgid "replace all matching variables: name value [value_regex]"
+#: wt-status.c:229
+msgid ""
+" (use \"git checkout -- <file>...\" to discard changes in working directory)"
msgstr ""
-#: builtin/config.c:69
-msgid "add a new variable: name value"
+#: wt-status.c:231
+msgid " (commit or discard the untracked or modified content in submodules)"
msgstr ""
-#: builtin/config.c:70
-msgid "remove a variable: name [value-regex]"
+#: wt-status.c:243
+#, c-format
+msgid " (use \"git %s <file>...\" to include in what will be committed)"
msgstr ""
-#: builtin/config.c:71
-msgid "remove all matches: name [value-regex]"
+#: wt-status.c:258
+msgid "both deleted:"
msgstr ""
-#: builtin/config.c:72
-msgid "rename section: old-name new-name"
+#: wt-status.c:260
+msgid "added by us:"
msgstr ""
-#: builtin/config.c:73
-msgid "remove a section: name"
+#: wt-status.c:262
+msgid "deleted by them:"
msgstr ""
-#: builtin/config.c:74
-msgid "list all"
+#: wt-status.c:264
+msgid "added by them:"
msgstr ""
-#: builtin/config.c:75
-msgid "open an editor"
+#: wt-status.c:266
+msgid "deleted by us:"
msgstr ""
-#: builtin/config.c:76
-msgid "find the color configured: slot [default]"
+#: wt-status.c:268
+msgid "both added:"
msgstr ""
-#: builtin/config.c:77
-msgid "find the color setting: slot [stdout-is-tty]"
+#: wt-status.c:270
+msgid "both modified:"
msgstr ""
-#: builtin/config.c:78
-msgid "Type"
+#: wt-status.c:280
+msgid "new file:"
msgstr ""
-#: builtin/config.c:79
-msgid "value is \"true\" or \"false\""
+#: wt-status.c:282
+msgid "copied:"
msgstr ""
-#: builtin/config.c:80
-msgid "value is decimal number"
+#: wt-status.c:284
+msgid "deleted:"
msgstr ""
-#: builtin/config.c:81
-msgid "value is --bool or --int"
+#: wt-status.c:286
+msgid "modified:"
msgstr ""
-#: builtin/config.c:82
-msgid "value is a path (file or directory name)"
+#: wt-status.c:288
+msgid "renamed:"
msgstr ""
-#: builtin/config.c:83
-msgid "Other"
+#: wt-status.c:290
+msgid "typechange:"
msgstr ""
-#: builtin/config.c:84
-msgid "terminate values with NUL byte"
+#: wt-status.c:292
+msgid "unknown:"
msgstr ""
-#: builtin/config.c:85
-msgid "show variable names only"
+#: wt-status.c:294
+msgid "unmerged:"
msgstr ""
-#: builtin/config.c:86
-msgid "respect include directives on lookup"
+#: wt-status.c:374
+msgid "new commits, "
msgstr ""
-#: builtin/config.c:87
-msgid "show origin of config (file, standard input, blob, command line)"
+#: wt-status.c:376
+msgid "modified content, "
msgstr ""
-#: builtin/config.c:327
-msgid "unable to parse default color value"
+#: wt-status.c:378
+msgid "untracked content, "
msgstr ""
-#: builtin/config.c:471
+#: wt-status.c:896
#, 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 "Your stash currently has %d entry"
+msgid_plural "Your stash currently has %d entries"
+msgstr[0] ""
+msgstr[1] ""
-#: builtin/config.c:499
-msgid "--local can only be used inside a git repository"
+#: wt-status.c:928
+msgid "Submodules changed but not updated:"
msgstr ""
-#: builtin/config.c:621
-#, c-format
-msgid "cannot create configuration file %s"
+#: wt-status.c:930
+msgid "Submodule changes to be committed:"
msgstr ""
-#: builtin/config.c:633
-#, c-format
+#: wt-status.c:1012
msgid ""
-"cannot overwrite multiple values with a single value\n"
-" Use a regexp, --add or --replace-all to change %s."
+"Do not modify or remove the line above.\n"
+"Everything below it will be ignored."
msgstr ""
-#: builtin/count-objects.c:87
-msgid "git count-objects [-v] [-H | --human-readable]"
+#: wt-status.c:1119
+msgid "You have unmerged paths."
msgstr ""
-#: builtin/count-objects.c:97
-msgid "print sizes in human readable format"
+#: wt-status.c:1122
+msgid " (fix conflicts and run \"git commit\")"
msgstr ""
-#: builtin/describe.c:19
-msgid "git describe [<options>] [<commit-ish>...]"
+#: wt-status.c:1124
+msgid " (use \"git merge --abort\" to abort the merge)"
msgstr ""
-#: builtin/describe.c:20
-msgid "git describe [<options>] --dirty"
+#: wt-status.c:1128
+msgid "All conflicts fixed but you are still merging."
msgstr ""
-#: builtin/describe.c:54
-msgid "head"
+#: wt-status.c:1131
+msgid " (use \"git commit\" to conclude merge)"
msgstr ""
-#: builtin/describe.c:54
-msgid "lightweight"
+#: wt-status.c:1140
+msgid "You are in the middle of an am session."
msgstr ""
-#: builtin/describe.c:54
-msgid "annotated"
+#: wt-status.c:1143
+msgid "The current patch is empty."
msgstr ""
-#: builtin/describe.c:253
-#, c-format
-msgid "annotated tag %s not available"
+#: wt-status.c:1147
+msgid " (fix conflicts and then run \"git am --continue\")"
msgstr ""
-#: builtin/describe.c:257
-#, c-format
-msgid "annotated tag %s has no embedded name"
+#: wt-status.c:1149
+msgid " (use \"git am --skip\" to skip this patch)"
msgstr ""
-#: builtin/describe.c:259
-#, c-format
-msgid "tag '%s' is really '%s' here"
+#: wt-status.c:1151
+msgid " (use \"git am --abort\" to restore the original branch)"
msgstr ""
-#: builtin/describe.c:286 builtin/log.c:489
-#, c-format
-msgid "Not a valid object name %s"
+#: wt-status.c:1284
+msgid "git-rebase-todo is missing."
msgstr ""
-#: builtin/describe.c:289
-#, c-format
-msgid "%s is not a valid '%s' object"
+#: wt-status.c:1286
+msgid "No commands done."
msgstr ""
-#: builtin/describe.c:306
+#: wt-status.c:1289
#, c-format
-msgid "no tag exactly matches '%s'"
-msgstr ""
+msgid "Last command done (%d command done):"
+msgid_plural "Last commands done (%d commands done):"
+msgstr[0] ""
+msgstr[1] ""
-#: builtin/describe.c:308
+#: wt-status.c:1300
#, c-format
-msgid "searching to describe %s\n"
+msgid " (see more in file %s)"
msgstr ""
-#: builtin/describe.c:355
-#, c-format
-msgid "finished search at %s\n"
+#: wt-status.c:1305
+msgid "No commands remaining."
msgstr ""
-#: builtin/describe.c:382
+#: wt-status.c:1308
#, c-format
-msgid ""
-"No annotated tags can describe '%s'.\n"
-"However, there were unannotated tags: try --tags."
-msgstr ""
+msgid "Next command to do (%d remaining command):"
+msgid_plural "Next commands to do (%d remaining commands):"
+msgstr[0] ""
+msgstr[1] ""
-#: builtin/describe.c:386
-#, c-format
-msgid ""
-"No tags can describe '%s'.\n"
-"Try --always, or create some tags."
+#: wt-status.c:1316
+msgid " (use \"git rebase --edit-todo\" to view and edit)"
msgstr ""
-#: builtin/describe.c:416
+#: wt-status.c:1328
#, c-format
-msgid "traversed %lu commits\n"
+msgid "You are currently rebasing branch '%s' on '%s'."
msgstr ""
-#: builtin/describe.c:419
-#, c-format
-msgid ""
-"more than %i tags found; listed %i most recent\n"
-"gave up search at %s\n"
+#: wt-status.c:1333
+msgid "You are currently rebasing."
msgstr ""
-#: builtin/describe.c:441
-msgid "find the tag that comes after the commit"
+#: wt-status.c:1346
+msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr ""
-#: builtin/describe.c:442
-msgid "debug search strategy on stderr"
+#: wt-status.c:1348
+msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr ""
-#: builtin/describe.c:443
-msgid "use any ref"
+#: wt-status.c:1350
+msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr ""
-#: builtin/describe.c:444
-msgid "use any tag, even unannotated"
+#: wt-status.c:1357
+msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr ""
-#: builtin/describe.c:445
-msgid "always use long format"
+#: wt-status.c:1361
+#, c-format
+msgid ""
+"You are currently splitting a commit while rebasing branch '%s' on '%s'."
msgstr ""
-#: builtin/describe.c:446
-msgid "only follow first parent"
+#: wt-status.c:1366
+msgid "You are currently splitting a commit during a rebase."
msgstr ""
-#: builtin/describe.c:449
-msgid "only output exact matches"
+#: wt-status.c:1369
+msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr ""
-#: builtin/describe.c:451
-msgid "consider <n> most recent tags (default: 10)"
+#: wt-status.c:1373
+#, c-format
+msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr ""
-#: builtin/describe.c:453
-msgid "only consider tags matching <pattern>"
+#: wt-status.c:1378
+msgid "You are currently editing a commit during a rebase."
msgstr ""
-#: builtin/describe.c:455
-msgid "do not consider tags matching <pattern>"
+#: wt-status.c:1381
+msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr ""
-#: builtin/describe.c:457 builtin/name-rev.c:406
-msgid "show abbreviated commit object as fallback"
+#: wt-status.c:1383
+msgid ""
+" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr ""
-#: builtin/describe.c:458 builtin/describe.c:461
-msgid "mark"
+#: wt-status.c:1394
+msgid "Cherry-pick currently in progress."
msgstr ""
-#: builtin/describe.c:459
-msgid "append <mark> on dirty working tree (default: \"-dirty\")"
+#: wt-status.c:1397
+#, c-format
+msgid "You are currently cherry-picking commit %s."
msgstr ""
-#: builtin/describe.c:462
-msgid "append <mark> on broken working tree (default: \"-broken\")"
+#: wt-status.c:1404
+msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr ""
-#: builtin/describe.c:480
-msgid "--long is incompatible with --abbrev=0"
+#: wt-status.c:1407
+msgid " (run \"git cherry-pick --continue\" to continue)"
msgstr ""
-#: builtin/describe.c:509
-msgid "No names found, cannot describe anything."
+#: wt-status.c:1410
+msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr ""
-#: builtin/describe.c:552
-msgid "--dirty is incompatible with commit-ishes"
+#: wt-status.c:1412
+msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr ""
-#: builtin/describe.c:554
-msgid "--broken is incompatible with commit-ishes"
+#: wt-status.c:1422
+msgid "Revert currently in progress."
msgstr ""
-#: builtin/diff.c:83
+#: wt-status.c:1425
#, c-format
-msgid "'%s': not a regular file or symlink"
+msgid "You are currently reverting commit %s."
msgstr ""
-#: builtin/diff.c:235
-#, c-format
-msgid "invalid option: %s"
+#: wt-status.c:1431
+msgid " (fix conflicts and run \"git revert --continue\")"
msgstr ""
-#: builtin/diff.c:359
-msgid "Not a git repository"
+#: wt-status.c:1434
+msgid " (run \"git revert --continue\" to continue)"
msgstr ""
-#: builtin/diff.c:402
-#, c-format
-msgid "invalid object '%s' given."
+#: wt-status.c:1437
+msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr ""
-#: builtin/diff.c:411
-#, c-format
-msgid "more than two blobs given: '%s'"
+#: wt-status.c:1439
+msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr ""
-#: builtin/diff.c:416
+#: wt-status.c:1449
#, c-format
-msgid "unhandled object '%s' given."
+msgid "You are currently bisecting, started from branch '%s'."
msgstr ""
-#: builtin/difftool.c:29
-msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
+#: wt-status.c:1453
+msgid "You are currently bisecting."
msgstr ""
-#: builtin/difftool.c:249
-#, c-format
-msgid "failed: %d"
+#: wt-status.c:1456
+msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr ""
-#: builtin/difftool.c:291
-#, c-format
-msgid "could not read symlink %s"
+#: wt-status.c:1665
+msgid "On branch "
msgstr ""
-#: builtin/difftool.c:293
-#, c-format
-msgid "could not read symlink file %s"
+#: wt-status.c:1672
+msgid "interactive rebase in progress; onto "
msgstr ""
-#: builtin/difftool.c:301
-#, c-format
-msgid "could not read object %s for symlink %s"
+#: wt-status.c:1674
+msgid "rebase in progress; onto "
msgstr ""
-#: builtin/difftool.c:403
-msgid ""
-"combined diff formats('-c' and '--cc') are not supported in\n"
-"directory diff mode('-d' and '--dir-diff')."
+#: wt-status.c:1679
+msgid "HEAD detached at "
msgstr ""
-#: builtin/difftool.c:626
-#, c-format
-msgid "both files modified: '%s' and '%s'."
+#: wt-status.c:1681
+msgid "HEAD detached from "
msgstr ""
-#: builtin/difftool.c:628
-msgid "working tree file has been left."
+#: wt-status.c:1684
+msgid "Not currently on any branch."
msgstr ""
-#: builtin/difftool.c:639
-#, c-format
-msgid "temporary files exist in '%s'."
+#: wt-status.c:1701
+msgid "Initial commit"
msgstr ""
-#: builtin/difftool.c:640
-msgid "you may want to cleanup or recover these."
+#: wt-status.c:1702
+msgid "No commits yet"
msgstr ""
-#: builtin/difftool.c:689
-msgid "use `diff.guitool` instead of `diff.tool`"
+#: wt-status.c:1716
+msgid "Untracked files"
msgstr ""
-#: builtin/difftool.c:691
-msgid "perform a full-directory diff"
+#: wt-status.c:1718
+msgid "Ignored files"
msgstr ""
-#: builtin/difftool.c:693
-msgid "do not prompt before launching a diff tool"
+#: wt-status.c:1722
+#, c-format
+msgid ""
+"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
+"may speed it up, but you have to be careful not to forget to add\n"
+"new files yourself (see 'git help status')."
msgstr ""
-#: builtin/difftool.c:699
-msgid "use symlinks in dir-diff mode"
+#: wt-status.c:1728
+#, c-format
+msgid "Untracked files not listed%s"
msgstr ""
-#: builtin/difftool.c:700
-msgid "<tool>"
+#: wt-status.c:1730
+msgid " (use -u option to show untracked files)"
msgstr ""
-#: builtin/difftool.c:701
-msgid "use the specified diff tool"
+#: wt-status.c:1736
+msgid "No changes"
msgstr ""
-#: builtin/difftool.c:703
-msgid "print a list of diff tools that may be used with `--tool`"
+#: wt-status.c:1741
+#, c-format
+msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr ""
-#: builtin/difftool.c:706
-msgid ""
-"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
-"code"
+#: wt-status.c:1744
+#, c-format
+msgid "no changes added to commit\n"
msgstr ""
-#: builtin/difftool.c:708
-msgid "<command>"
+#: wt-status.c:1747
+#, c-format
+msgid ""
+"nothing added to commit but untracked files present (use \"git add\" to "
+"track)\n"
msgstr ""
-#: builtin/difftool.c:709
-msgid "specify a custom command for viewing diffs"
+#: wt-status.c:1750
+#, c-format
+msgid "nothing added to commit but untracked files present\n"
msgstr ""
-#: builtin/difftool.c:733
-msgid "no <tool> given for --tool=<tool>"
+#: wt-status.c:1753
+#, c-format
+msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr ""
-#: builtin/difftool.c:740
-msgid "no <cmd> given for --extcmd=<cmd>"
+#: wt-status.c:1756 wt-status.c:1761
+#, c-format
+msgid "nothing to commit\n"
msgstr ""
-#: builtin/fast-export.c:26
-msgid "git fast-export [rev-list-opts]"
+#: wt-status.c:1759
+#, c-format
+msgid "nothing to commit (use -u to show untracked files)\n"
msgstr ""
-#: builtin/fast-export.c:982
-msgid "show progress after <n> objects"
+#: wt-status.c:1763
+#, c-format
+msgid "nothing to commit, working tree clean\n"
msgstr ""
-#: builtin/fast-export.c:984
-msgid "select handling of signed tags"
+#: wt-status.c:1876
+msgid "No commits yet on "
msgstr ""
-#: builtin/fast-export.c:987
-msgid "select handling of tags that tag filtered objects"
+#: wt-status.c:1880
+msgid "HEAD (no branch)"
msgstr ""
-#: builtin/fast-export.c:990
-msgid "Dump marks to this file"
+#: wt-status.c:1911
+msgid "different"
msgstr ""
-#: builtin/fast-export.c:992
-msgid "Import marks from this file"
+#: wt-status.c:1913 wt-status.c:1921
+msgid "behind "
msgstr ""
-#: builtin/fast-export.c:994
-msgid "Fake a tagger when tags lack one"
+#: wt-status.c:1916 wt-status.c:1919
+msgid "ahead "
msgstr ""
-#: builtin/fast-export.c:996
-msgid "Output full tree for each commit"
+#. TRANSLATORS: the action is e.g. "pull with rebase"
+#: wt-status.c:2443
+#, c-format
+msgid "cannot %s: You have unstaged changes."
msgstr ""
-#: builtin/fast-export.c:998
-msgid "Use the done feature to terminate the stream"
+#: wt-status.c:2449
+msgid "additionally, your index contains uncommitted changes."
msgstr ""
-#: builtin/fast-export.c:999
-msgid "Skip output of blob data"
+#: wt-status.c:2451
+#, c-format
+msgid "cannot %s: Your index contains uncommitted changes."
msgstr ""
-#: builtin/fast-export.c:1000
-msgid "refspec"
+#: builtin/add.c:25
+msgid "git add [<options>] [--] <pathspec>..."
msgstr ""
-#: builtin/fast-export.c:1001
-msgid "Apply refspec to exported refs"
+#: builtin/add.c:84
+#, c-format
+msgid "unexpected diff status %c"
msgstr ""
-#: builtin/fast-export.c:1002
-msgid "anonymize output"
+#: builtin/add.c:89 builtin/commit.c:285
+msgid "updating files failed"
msgstr ""
-#: builtin/fetch.c:22
-msgid "git fetch [<options>] [<repository> [<refspec>...]]"
+#: builtin/add.c:99
+#, c-format
+msgid "remove '%s'\n"
msgstr ""
-#: builtin/fetch.c:23
-msgid "git fetch [<options>] <group>"
+#: builtin/add.c:174
+msgid "Unstaged changes after refreshing the index:"
msgstr ""
-#: builtin/fetch.c:24
-msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
+#: builtin/add.c:234 builtin/rev-parse.c:896
+msgid "Could not read the index"
msgstr ""
-#: builtin/fetch.c:25
-msgid "git fetch --all [<options>]"
+#: builtin/add.c:245
+#, c-format
+msgid "Could not open '%s' for writing."
msgstr ""
-#: builtin/fetch.c:90 builtin/pull.c:182
-msgid "fetch from all remotes"
+#: builtin/add.c:249
+msgid "Could not write patch"
msgstr ""
-#: builtin/fetch.c:92 builtin/pull.c:185
-msgid "append to .git/FETCH_HEAD instead of overwriting"
+#: builtin/add.c:252
+msgid "editing patch failed"
msgstr ""
-#: builtin/fetch.c:94 builtin/pull.c:188
-msgid "path to upload pack on remote end"
+#: builtin/add.c:255
+#, c-format
+msgid "Could not stat '%s'"
msgstr ""
-#: builtin/fetch.c:95 builtin/pull.c:190
-msgid "force overwrite of local branch"
+#: builtin/add.c:257
+msgid "Empty patch. Aborted."
msgstr ""
-#: builtin/fetch.c:97
-msgid "fetch from multiple remotes"
+#: builtin/add.c:262
+#, c-format
+msgid "Could not apply '%s'"
msgstr ""
-#: builtin/fetch.c:99 builtin/pull.c:192
-msgid "fetch all tags and associated objects"
+#: builtin/add.c:270
+msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr ""
-#: builtin/fetch.c:101
-msgid "do not fetch all tags (--no-tags)"
+#: builtin/add.c:290 builtin/clean.c:908 builtin/fetch.c:137 builtin/mv.c:124
+#: builtin/prune-packed.c:56 builtin/pull.c:221 builtin/push.c:560
+#: builtin/remote.c:1345 builtin/rm.c:241 builtin/send-pack.c:165
+msgid "dry run"
msgstr ""
-#: builtin/fetch.c:103
-msgid "number of submodules fetched in parallel"
+#: builtin/add.c:293
+msgid "interactive picking"
msgstr ""
-#: builtin/fetch.c:105 builtin/pull.c:195
-msgid "prune remote-tracking branches no longer on remote"
+#: builtin/add.c:294 builtin/checkout.c:1379 builtin/reset.c:306
+msgid "select hunks interactively"
msgstr ""
-#: builtin/fetch.c:106 builtin/fetch.c:129 builtin/pull.c:123
-msgid "on-demand"
+#: builtin/add.c:295
+msgid "edit current diff and apply"
msgstr ""
-#: builtin/fetch.c:107
-msgid "control recursive fetching of submodules"
+#: builtin/add.c:296
+msgid "allow adding otherwise ignored files"
msgstr ""
-#: builtin/fetch.c:111 builtin/pull.c:203
-msgid "keep downloaded pack"
+#: builtin/add.c:297
+msgid "update tracked files"
msgstr ""
-#: builtin/fetch.c:113
-msgid "allow updating of HEAD ref"
+#: builtin/add.c:298
+msgid "renormalize EOL of tracked files (implies -u)"
msgstr ""
-#: builtin/fetch.c:116 builtin/fetch.c:122 builtin/pull.c:206
-msgid "deepen history of shallow clone"
+#: builtin/add.c:299
+msgid "record only the fact that the path will be added later"
msgstr ""
-#: builtin/fetch.c:118
-msgid "deepen history of shallow repository based on time"
+#: builtin/add.c:300
+msgid "add changes from all tracked and untracked files"
msgstr ""
-#: builtin/fetch.c:124 builtin/pull.c:209
-msgid "convert to a complete repository"
+#: builtin/add.c:303
+msgid "ignore paths removed in the working tree (same as --no-all)"
msgstr ""
-#: builtin/fetch.c:126 builtin/log.c:1450
-msgid "dir"
+#: builtin/add.c:305
+msgid "don't add, only refresh the index"
msgstr ""
-#: builtin/fetch.c:127
-msgid "prepend this to submodule path output"
+#: builtin/add.c:306
+msgid "just skip files which cannot be added because of errors"
msgstr ""
-#: builtin/fetch.c:130
-msgid ""
-"default for recursive fetching of submodules (lower priority than config "
-"files)"
+#: builtin/add.c:307
+msgid "check if - even missing - files are ignored in dry run"
msgstr ""
-#: builtin/fetch.c:134 builtin/pull.c:212
-msgid "accept refs that update .git/shallow"
+#: builtin/add.c:309 builtin/update-index.c:1001
+msgid "override the executable bit of the listed files"
msgstr ""
-#: builtin/fetch.c:135 builtin/pull.c:214
-msgid "refmap"
+#: builtin/add.c:311
+msgid "warn when adding an embedded repository"
msgstr ""
-#: builtin/fetch.c:136 builtin/pull.c:215
-msgid "specify fetch refmap"
+#: 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/fetch.c:394
-msgid "Couldn't find remote ref HEAD"
+#: builtin/add.c:354
+#, c-format
+msgid "adding embedded git repository: %s"
msgstr ""
-#: builtin/fetch.c:512
+#: builtin/add.c:372
#, c-format
-msgid "configuration fetch.output contains invalid value %s"
+msgid "Use -f if you really want to add them.\n"
msgstr ""
-#: builtin/fetch.c:605
-#, c-format
-msgid "object %s not found"
+#: builtin/add.c:379
+msgid "adding files failed"
msgstr ""
-#: builtin/fetch.c:609
-msgid "[up to date]"
+#: builtin/add.c:419
+msgid "-A and -u are mutually incompatible"
msgstr ""
-#: builtin/fetch.c:622 builtin/fetch.c:702
-msgid "[rejected]"
+#: builtin/add.c:426
+msgid "Option --ignore-missing can only be used together with --dry-run"
msgstr ""
-#: builtin/fetch.c:623
-msgid "can't fetch in current branch"
+#: builtin/add.c:430
+#, c-format
+msgid "--chmod param '%s' must be either -x or +x"
msgstr ""
-#: builtin/fetch.c:632
-msgid "[tag update]"
+#: builtin/add.c:445
+#, c-format
+msgid "Nothing specified, nothing added.\n"
msgstr ""
-#: builtin/fetch.c:633 builtin/fetch.c:666 builtin/fetch.c:682
-#: builtin/fetch.c:697
-msgid "unable to update local ref"
+#: builtin/add.c:446
+#, c-format
+msgid "Maybe you wanted to say 'git add .'?\n"
msgstr ""
-#: builtin/fetch.c:652
-msgid "[new tag]"
+#: builtin/am.c:348
+msgid "could not parse author script"
msgstr ""
-#: builtin/fetch.c:655
-msgid "[new branch]"
+#: builtin/am.c:432
+#, c-format
+msgid "'%s' was deleted by the applypatch-msg hook"
msgstr ""
-#: builtin/fetch.c:658
-msgid "[new ref]"
+#: builtin/am.c:474
+#, c-format
+msgid "Malformed input line: '%s'."
msgstr ""
-#: builtin/fetch.c:697
-msgid "forced update"
+#: builtin/am.c:512
+#, c-format
+msgid "Failed to copy notes from '%s' to '%s'"
msgstr ""
-#: builtin/fetch.c:702
-msgid "non-fast-forward"
+#: builtin/am.c:538
+msgid "fseek failed"
msgstr ""
-#: builtin/fetch.c:747
+#: builtin/am.c:726
#, c-format
-msgid "%s did not send all necessary objects\n"
+msgid "could not parse patch '%s'"
msgstr ""
-#: builtin/fetch.c:767
-#, c-format
-msgid "reject %s because shallow roots are not allowed to be updated"
+#: builtin/am.c:791
+msgid "Only one StGIT patch series can be applied at once"
msgstr ""
-#: builtin/fetch.c:855 builtin/fetch.c:951
-#, c-format
-msgid "From %.*s\n"
+#: builtin/am.c:839
+msgid "invalid timestamp"
msgstr ""
-#: builtin/fetch.c:866
-#, c-format
-msgid ""
-"some local refs could not be updated; try running\n"
-" 'git remote prune %s' to remove any old, conflicting branches"
+#: builtin/am.c:844 builtin/am.c:856
+msgid "invalid Date line"
msgstr ""
-#: builtin/fetch.c:921
-#, c-format
-msgid " (%s will become dangling)"
+#: builtin/am.c:851
+msgid "invalid timezone offset"
+msgstr ""
+
+#: builtin/am.c:944
+msgid "Patch format detection failed."
msgstr ""
-#: builtin/fetch.c:922
+#: builtin/am.c:949 builtin/clone.c:409
#, c-format
-msgid " (%s has become dangling)"
+msgid "failed to create directory '%s'"
msgstr ""
-#: builtin/fetch.c:954
-msgid "[deleted]"
+#: builtin/am.c:954
+msgid "Failed to split patches."
msgstr ""
-#: builtin/fetch.c:955 builtin/remote.c:1023
-msgid "(none)"
+#: builtin/am.c:1084 builtin/commit.c:371
+msgid "unable to write index file"
msgstr ""
-#: builtin/fetch.c:978
+#: builtin/am.c:1098
#, c-format
-msgid "Refusing to fetch into current branch %s of non-bare repository"
+msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr ""
-#: builtin/fetch.c:997
+#: builtin/am.c:1099
#, c-format
-msgid "Option \"%s\" value \"%s\" is not valid for %s"
+msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr ""
-#: builtin/fetch.c:1000
+#: builtin/am.c:1100
#, c-format
-msgid "Option \"%s\" is ignored for %s\n"
+msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr ""
-#: builtin/fetch.c:1076
-#, c-format
-msgid "Don't know how to fetch from %s"
+#: builtin/am.c:1183
+msgid "Patch sent with format=flowed; space at the end of lines might be lost."
msgstr ""
-#: builtin/fetch.c:1236
-#, c-format
-msgid "Fetching %s\n"
+#: builtin/am.c:1211
+msgid "Patch is empty."
msgstr ""
-#: builtin/fetch.c:1238 builtin/remote.c:97
+#: builtin/am.c:1277
#, c-format
-msgid "Could not fetch %s"
+msgid "invalid ident line: %.*s"
msgstr ""
-#: builtin/fetch.c:1256
-msgid ""
-"No remote repository specified. Please, specify either a URL or a\n"
-"remote name from which new revisions should be fetched."
+#: builtin/am.c:1299
+#, c-format
+msgid "unable to parse commit %s"
msgstr ""
-#: builtin/fetch.c:1279
-msgid "You need to specify a tag name."
+#: builtin/am.c:1495
+msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr ""
-#: builtin/fetch.c:1321
-msgid "Negative depth in --deepen is not supported"
+#: builtin/am.c:1497
+msgid "Using index info to reconstruct a base tree..."
msgstr ""
-#: builtin/fetch.c:1323
-msgid "--deepen and --depth are mutually exclusive"
+#: builtin/am.c:1516
+msgid ""
+"Did you hand edit your patch?\n"
+"It does not apply to blobs recorded in its index."
msgstr ""
-#: builtin/fetch.c:1328
-msgid "--depth and --unshallow cannot be used together"
+#: builtin/am.c:1522
+msgid "Falling back to patching base and 3-way merge..."
msgstr ""
-#: builtin/fetch.c:1330
-msgid "--unshallow on a complete repository does not make sense"
+#: builtin/am.c:1548
+msgid "Failed to merge in the changes."
msgstr ""
-#: builtin/fetch.c:1349
-msgid "fetch --all does not take a repository argument"
+#: builtin/am.c:1580
+msgid "applying to an empty history"
msgstr ""
-#: builtin/fetch.c:1351
-msgid "fetch --all does not make sense with refspecs"
+#: builtin/am.c:1627 builtin/am.c:1631
+#, c-format
+msgid "cannot resume: %s does not exist."
msgstr ""
-#: builtin/fetch.c:1362
-#, c-format
-msgid "No such remote or remote group: %s"
+#: builtin/am.c:1647
+msgid "cannot be interactive without stdin connected to a terminal."
msgstr ""
-#: builtin/fetch.c:1370
-msgid "Fetching a group and specifying refspecs does not make sense"
+#: builtin/am.c:1652
+msgid "Commit Body is:"
msgstr ""
-#: builtin/fmt-merge-msg.c:15
-msgid ""
-"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
+#. 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:1662
+msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr ""
-#: builtin/fmt-merge-msg.c:664
-msgid "populate log with at most <n> entries from shortlog"
+#: builtin/am.c:1712
+#, c-format
+msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr ""
-#: builtin/fmt-merge-msg.c:667
-msgid "alias for --log (deprecated)"
+#: builtin/am.c:1752 builtin/am.c:1820
+#, c-format
+msgid "Applying: %.*s"
msgstr ""
-#: builtin/fmt-merge-msg.c:670
-msgid "text"
+#: builtin/am.c:1769
+msgid "No changes -- Patch already applied."
msgstr ""
-#: builtin/fmt-merge-msg.c:671
-msgid "use <text> as start of message"
+#: builtin/am.c:1775
+#, c-format
+msgid "Patch failed at %s %.*s"
msgstr ""
-#: builtin/fmt-merge-msg.c:672
-msgid "file to read from"
+#: builtin/am.c:1779
+msgid "Use 'git am --show-current-patch' to see the failed patch"
msgstr ""
-#: builtin/for-each-ref.c:10
-msgid "git for-each-ref [<options>] [<pattern>]"
+#: builtin/am.c:1823
+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/for-each-ref.c:11
-msgid "git for-each-ref [--points-at <object>]"
+#: builtin/am.c:1830
+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/for-each-ref.c:12
-msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]"
+#: builtin/am.c:1937 builtin/am.c:1941 builtin/am.c:1953 builtin/reset.c:329
+#: builtin/reset.c:337
+#, c-format
+msgid "Could not parse object '%s'."
msgstr ""
-#: builtin/for-each-ref.c:13
-msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
+#: builtin/am.c:1989
+msgid "failed to clean index"
msgstr ""
-#: builtin/for-each-ref.c:28
-msgid "quote placeholders suitably for shells"
+#: builtin/am.c:2033
+msgid ""
+"You seem to have moved HEAD since the last 'am' failure.\n"
+"Not rewinding to ORIG_HEAD"
msgstr ""
-#: builtin/for-each-ref.c:30
-msgid "quote placeholders suitably for perl"
+#: builtin/am.c:2130
+#, c-format
+msgid "Invalid value for --patch-format: %s"
msgstr ""
-#: builtin/for-each-ref.c:32
-msgid "quote placeholders suitably for python"
+#: builtin/am.c:2166
+msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr ""
-#: builtin/for-each-ref.c:34
-msgid "quote placeholders suitably for Tcl"
+#: builtin/am.c:2167
+msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr ""
-#: builtin/for-each-ref.c:37
-msgid "show only <n> matched refs"
+#: builtin/am.c:2173
+msgid "run interactively"
msgstr ""
-#: builtin/for-each-ref.c:42
-msgid "print only refs which points at the given object"
+#: builtin/am.c:2175
+msgid "historical option -- no-op"
msgstr ""
-#: builtin/for-each-ref.c:44
-msgid "print only refs that are merged"
+#: builtin/am.c:2177
+msgid "allow fall back on 3way merging if needed"
msgstr ""
-#: builtin/for-each-ref.c:45
-msgid "print only refs that are not merged"
+#: builtin/am.c:2178 builtin/init-db.c:494 builtin/prune-packed.c:58
+#: builtin/repack.c:306 builtin/stash.c:805
+msgid "be quiet"
msgstr ""
-#: builtin/for-each-ref.c:46
-msgid "print only refs which contain the commit"
+#: builtin/am.c:2180
+msgid "add a Signed-off-by line to the commit message"
msgstr ""
-#: builtin/for-each-ref.c:47
-msgid "print only refs which don't contain the commit"
+#: builtin/am.c:2183
+msgid "recode into utf8 (default)"
msgstr ""
-#: builtin/fsck.c:554
-msgid "Checking object directories"
+#: builtin/am.c:2185
+msgid "pass -k flag to git-mailinfo"
msgstr ""
-#: builtin/fsck.c:646
-msgid "git fsck [<options>] [<object>...]"
+#: builtin/am.c:2187
+msgid "pass -b flag to git-mailinfo"
msgstr ""
-#: builtin/fsck.c:652
-msgid "show unreachable objects"
+#: builtin/am.c:2189
+msgid "pass -m flag to git-mailinfo"
msgstr ""
-#: builtin/fsck.c:653
-msgid "show dangling objects"
+#: builtin/am.c:2191
+msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr ""
-#: builtin/fsck.c:654
-msgid "report tags"
+#: builtin/am.c:2194
+msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr ""
-#: builtin/fsck.c:655
-msgid "report root nodes"
+#: builtin/am.c:2197
+msgid "strip everything before a scissors line"
msgstr ""
-#: builtin/fsck.c:656
-msgid "make index objects head nodes"
+#: builtin/am.c:2199 builtin/am.c:2202 builtin/am.c:2205 builtin/am.c:2208
+#: builtin/am.c:2211 builtin/am.c:2214 builtin/am.c:2217 builtin/am.c:2220
+#: builtin/am.c:2226
+msgid "pass it through git-apply"
msgstr ""
-#: builtin/fsck.c:657
-msgid "make reflogs head nodes (default)"
+#: builtin/am.c:2216 builtin/commit.c:1348 builtin/fmt-merge-msg.c:671
+#: builtin/fmt-merge-msg.c:674 builtin/grep.c:879 builtin/merge.c:247
+#: builtin/pull.c:158 builtin/pull.c:217 builtin/rebase.c:1412
+#: builtin/repack.c:317 builtin/repack.c:321 builtin/repack.c:323
+#: builtin/show-branch.c:651 builtin/show-ref.c:172 builtin/tag.c:397
+#: parse-options.h:141 parse-options.h:162 parse-options.h:311
+msgid "n"
msgstr ""
-#: builtin/fsck.c:658
-msgid "also consider packs and alternate objects"
+#: builtin/am.c:2222 builtin/branch.c:653 builtin/for-each-ref.c:38
+#: builtin/replace.c:554 builtin/tag.c:431 builtin/verify-tag.c:39
+msgid "format"
msgstr ""
-#: builtin/fsck.c:659
-msgid "check only connectivity"
+#: builtin/am.c:2223
+msgid "format the patch(es) are in"
msgstr ""
-#: builtin/fsck.c:660
-msgid "enable more strict checking"
+#: builtin/am.c:2229
+msgid "override error message when patch failure occurs"
msgstr ""
-#: builtin/fsck.c:662
-msgid "write dangling objects in .git/lost-found"
+#: builtin/am.c:2231
+msgid "continue applying patches after resolving a conflict"
msgstr ""
-#: builtin/fsck.c:663 builtin/prune.c:107
-msgid "show progress"
+#: builtin/am.c:2234
+msgid "synonyms for --continue"
msgstr ""
-#: builtin/fsck.c:664
-msgid "show verbose names for reachable objects"
+#: builtin/am.c:2237
+msgid "skip the current patch"
msgstr ""
-#: builtin/fsck.c:725
-msgid "Checking objects"
+#: builtin/am.c:2240
+msgid "restore the original branch and abort the patching operation."
msgstr ""
-#: builtin/gc.c:26
-msgid "git gc [<options>]"
+#: builtin/am.c:2243
+msgid "abort the patching operation but keep HEAD where it is."
msgstr ""
-#: builtin/gc.c:79
-#, c-format
-msgid "Failed to fstat %s: %s"
+#: builtin/am.c:2246
+msgid "show the patch being applied."
msgstr ""
-#: builtin/gc.c:311
-#, c-format
-msgid "Can't stat %s"
+#: builtin/am.c:2250
+msgid "lie about committer date"
msgstr ""
-#: builtin/gc.c:320
-#, c-format
-msgid ""
-"The last gc run reported the following. Please correct the root cause\n"
-"and remove %s.\n"
-"Automatic cleanup will not be performed until the file is removed.\n"
-"\n"
-"%s"
+#: builtin/am.c:2252
+msgid "use current timestamp for author date"
msgstr ""
-#: builtin/gc.c:359
-msgid "prune unreferenced objects"
+#: builtin/am.c:2254 builtin/commit-tree.c:120 builtin/commit.c:1491
+#: builtin/merge.c:282 builtin/pull.c:192 builtin/rebase.c:489
+#: builtin/rebase.c:1453 builtin/revert.c:116 builtin/tag.c:412
+msgid "key-id"
msgstr ""
-#: builtin/gc.c:361
-msgid "be more thorough (increased runtime)"
+#: builtin/am.c:2255 builtin/rebase.c:490 builtin/rebase.c:1454
+msgid "GPG-sign commits"
msgstr ""
-#: builtin/gc.c:362
-msgid "enable auto-gc mode"
+#: builtin/am.c:2258
+msgid "(internal use for git-rebase)"
msgstr ""
-#: builtin/gc.c:363
-msgid "force running gc even if there may be another gc running"
+#: builtin/am.c:2276
+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/gc.c:380
-#, c-format
-msgid "Failed to parse gc.logexpiry value %s"
+#: builtin/am.c:2283
+msgid "failed to read the index"
msgstr ""
-#: builtin/gc.c:408
+#: builtin/am.c:2298
#, c-format
-msgid "Auto packing the repository in background for optimum performance.\n"
+msgid "previous rebase directory %s still exists but mbox given."
msgstr ""
-#: builtin/gc.c:410
+#: builtin/am.c:2322
#, c-format
-msgid "Auto packing the repository for optimum performance.\n"
+msgid ""
+"Stray %s directory found.\n"
+"Use \"git am --abort\" to remove it."
msgstr ""
-#: builtin/gc.c:411
-#, c-format
-msgid "See \"git help gc\" for manual housekeeping.\n"
+#: builtin/am.c:2328
+msgid "Resolve operation not in progress, we are not resuming."
+msgstr ""
+
+#: builtin/apply.c:8
+msgid "git apply [<options>] [<patch>...]"
msgstr ""
-#: builtin/gc.c:436
+#: builtin/archive.c:17
#, c-format
-msgid ""
-"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
+msgid "could not create archive file '%s'"
msgstr ""
-#: builtin/gc.c:480
-msgid ""
-"There are too many unreachable loose objects; run 'git prune' to remove them."
+#: builtin/archive.c:20
+msgid "could not redirect output"
msgstr ""
-#: builtin/grep.c:27
-msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
+#: builtin/archive.c:37
+msgid "git archive: Remote with no URL"
msgstr ""
-#: builtin/grep.c:235
-#, c-format
-msgid "grep: failed to create thread: %s"
+#: builtin/archive.c:61
+msgid "git archive: expected ACK/NAK, got a flush packet"
msgstr ""
-#: builtin/grep.c:293
+#: builtin/archive.c:64
#, c-format
-msgid "invalid number of threads specified (%d) for %s"
+msgid "git archive: NACK %s"
msgstr ""
-#. TRANSLATORS: %s is the configuration
-#. variable for tweaking threads, currently
-#. grep.threads
-#.
-#: builtin/grep.c:302 builtin/index-pack.c:1494 builtin/index-pack.c:1692
-#, c-format
-msgid "no threads support, ignoring %s"
+#: builtin/archive.c:65
+msgid "git archive: protocol error"
msgstr ""
-#: builtin/grep.c:788 builtin/grep.c:829
-#, c-format
-msgid "unable to read tree (%s)"
+#: builtin/archive.c:69
+msgid "git archive: expected a flush"
msgstr ""
-#: builtin/grep.c:848
-#, c-format
-msgid "unable to grep from object of type %s"
+#: builtin/bisect--helper.c:22
+msgid "git bisect--helper --next-all [--no-checkout]"
msgstr ""
-#: builtin/grep.c:912
-#, c-format
-msgid "switch `%c' expects a numerical value"
+#: builtin/bisect--helper.c:23
+msgid "git bisect--helper --write-terms <bad_term> <good_term>"
msgstr ""
-#: builtin/grep.c:999
-msgid "search in index instead of in the work tree"
+#: builtin/bisect--helper.c:24
+msgid "git bisect--helper --bisect-clean-state"
msgstr ""
-#: builtin/grep.c:1001
-msgid "find in contents not managed by git"
+#: builtin/bisect--helper.c:25
+msgid "git bisect--helper --bisect-reset [<commit>]"
msgstr ""
-#: builtin/grep.c:1003
-msgid "search in both tracked and untracked files"
+#: builtin/bisect--helper.c:26
+msgid ""
+"git bisect--helper --bisect-write [--no-log] <state> <revision> <good_term> "
+"<bad_term>"
msgstr ""
-#: builtin/grep.c:1005
-msgid "ignore files specified via '.gitignore'"
+#: builtin/bisect--helper.c:27
+msgid ""
+"git bisect--helper --bisect-check-and-set-terms <command> <good_term> "
+"<bad_term>"
msgstr ""
-#: builtin/grep.c:1007
-msgid "recursively search in each submodule"
+#: builtin/bisect--helper.c:28
+msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
msgstr ""
-#: builtin/grep.c:1009
-msgid "basename"
+#: builtin/bisect--helper.c:29
+msgid ""
+"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
+"term-new]"
msgstr ""
-#: builtin/grep.c:1010
-msgid "prepend parent project's basename to output"
+#: 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/grep.c:1013
-msgid "show non-matching lines"
+#: builtin/bisect--helper.c:86
+#, c-format
+msgid "'%s' is not a valid term"
msgstr ""
-#: builtin/grep.c:1015
-msgid "case insensitive matching"
+#: builtin/bisect--helper.c:90
+#, c-format
+msgid "can't use the builtin command '%s' as a term"
msgstr ""
-#: builtin/grep.c:1017
-msgid "match patterns only at word boundaries"
+#: builtin/bisect--helper.c:100
+#, c-format
+msgid "can't change the meaning of the term '%s'"
msgstr ""
-#: builtin/grep.c:1019
-msgid "process binary files as text"
+#: builtin/bisect--helper.c:111
+msgid "please use two different terms"
msgstr ""
-#: builtin/grep.c:1021
-msgid "don't match patterns in binary files"
+#: builtin/bisect--helper.c:118
+msgid "could not open the file BISECT_TERMS"
msgstr ""
-#: builtin/grep.c:1024
-msgid "process binary files with textconv filters"
+#: builtin/bisect--helper.c:155
+#, c-format
+msgid "We are not bisecting.\n"
msgstr ""
-#: builtin/grep.c:1026
-msgid "descend at most <depth> levels"
+#: builtin/bisect--helper.c:163
+#, c-format
+msgid "'%s' is not a valid commit"
msgstr ""
-#: builtin/grep.c:1030
-msgid "use extended POSIX regular expressions"
+#: builtin/bisect--helper.c:174
+#, c-format
+msgid ""
+"could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
msgstr ""
-#: builtin/grep.c:1033
-msgid "use basic POSIX regular expressions (default)"
+#: builtin/bisect--helper.c:215
+#, c-format
+msgid "Bad bisect_write argument: %s"
msgstr ""
-#: builtin/grep.c:1036
-msgid "interpret patterns as fixed strings"
+#: builtin/bisect--helper.c:220
+#, c-format
+msgid "couldn't get the oid of the rev '%s'"
msgstr ""
-#: builtin/grep.c:1039
-msgid "use Perl-compatible regular expressions"
+#: builtin/bisect--helper.c:232
+#, c-format
+msgid "couldn't open the file '%s'"
msgstr ""
-#: builtin/grep.c:1042
-msgid "show line numbers"
+#: builtin/bisect--helper.c:258
+#, c-format
+msgid "Invalid command: you're currently in a %s/%s bisect"
msgstr ""
-#: builtin/grep.c:1043
-msgid "don't show filenames"
+#: 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/grep.c:1044
-msgid "show filenames"
+#: 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/grep.c:1046
-msgid "show filenames relative to top directory"
+#: builtin/bisect--helper.c:321
+#, c-format
+msgid "bisecting only with a %s commit"
msgstr ""
-#: builtin/grep.c:1048
-msgid "show only filenames instead of matching lines"
+#. 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/grep.c:1050
-msgid "synonym for --files-with-matches"
+#: builtin/bisect--helper.c:376
+msgid "no terms defined"
msgstr ""
-#: builtin/grep.c:1053
-msgid "show only the names of files without match"
+#: 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/grep.c:1055
-msgid "print NUL after filenames"
+#: 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/grep.c:1057
-msgid "show the number of matches instead of matching lines"
+#: builtin/bisect--helper.c:475
+#, c-format
+msgid "unrecognized option: '%s'"
msgstr ""
-#: builtin/grep.c:1058
-msgid "highlight matches"
+#: builtin/bisect--helper.c:479
+#, c-format
+msgid "'%s' does not appear to be a valid revision"
msgstr ""
-#: builtin/grep.c:1060
-msgid "print empty line between matches from different files"
+#: builtin/bisect--helper.c:511
+msgid "bad HEAD - I need a HEAD"
msgstr ""
-#: builtin/grep.c:1062
-msgid "show filename only once above matches from same file"
+#: builtin/bisect--helper.c:526
+#, c-format
+msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
msgstr ""
-#: builtin/grep.c:1065
-msgid "show <n> context lines before and after matches"
+#: builtin/bisect--helper.c:547
+msgid "won't bisect on cg-seek'ed tree"
msgstr ""
-#: builtin/grep.c:1068
-msgid "show <n> context lines before matches"
+#: builtin/bisect--helper.c:550
+msgid "bad HEAD - strange symbolic ref"
msgstr ""
-#: builtin/grep.c:1070
-msgid "show <n> context lines after matches"
+#: builtin/bisect--helper.c:627
+msgid "perform 'git bisect next'"
msgstr ""
-#: builtin/grep.c:1072
-msgid "use <n> worker threads"
+#: builtin/bisect--helper.c:629
+msgid "write the terms to .git/BISECT_TERMS"
msgstr ""
-#: builtin/grep.c:1073
-msgid "shortcut for -C NUM"
+#: builtin/bisect--helper.c:631
+msgid "cleanup the bisection state"
msgstr ""
-#: builtin/grep.c:1076
-msgid "show a line with the function name before matches"
+#: builtin/bisect--helper.c:633
+msgid "check for expected revs"
msgstr ""
-#: builtin/grep.c:1078
-msgid "show the surrounding function"
+#: builtin/bisect--helper.c:635
+msgid "reset the bisection state"
msgstr ""
-#: builtin/grep.c:1081
-msgid "read patterns from file"
+#: builtin/bisect--helper.c:637
+msgid "write out the bisection state in BISECT_LOG"
msgstr ""
-#: builtin/grep.c:1083
-msgid "match <pattern>"
+#: builtin/bisect--helper.c:639
+msgid "check and set terms in a bisection state"
msgstr ""
-#: builtin/grep.c:1085
-msgid "combine patterns specified with -e"
+#: builtin/bisect--helper.c:641
+msgid "check whether bad or good terms exist"
msgstr ""
-#: builtin/grep.c:1097
-msgid "indicate hit with exit status without output"
+#: builtin/bisect--helper.c:643
+msgid "print out the bisect terms"
msgstr ""
-#: builtin/grep.c:1099
-msgid "show only matches from files that match all patterns"
+#: builtin/bisect--helper.c:645
+msgid "start the bisect session"
msgstr ""
-#: builtin/grep.c:1101
-msgid "show parse tree for grep expression"
+#: builtin/bisect--helper.c:647
+msgid "update BISECT_HEAD instead of checking out the current commit"
msgstr ""
-#: builtin/grep.c:1105
-msgid "pager"
+#: builtin/bisect--helper.c:649
+msgid "no log for BISECT_WRITE"
msgstr ""
-#: builtin/grep.c:1105
-msgid "show matching files in the pager"
+#: builtin/bisect--helper.c:666
+msgid "--write-terms requires two arguments"
msgstr ""
-#: builtin/grep.c:1108
-msgid "allow calling of grep(1) (ignored by this build)"
+#: builtin/bisect--helper.c:670
+msgid "--bisect-clean-state requires no arguments"
msgstr ""
-#: builtin/grep.c:1172
-msgid "no pattern given."
+#: builtin/bisect--helper.c:677
+msgid "--bisect-reset requires either no argument or a commit"
msgstr ""
-#: builtin/grep.c:1204
-msgid "--no-index or --untracked cannot be used with revs"
+#: builtin/bisect--helper.c:681
+msgid "--bisect-write requires either 4 or 5 arguments"
msgstr ""
-#: builtin/grep.c:1211
-#, c-format
-msgid "unable to resolve revision: %s"
+#: builtin/bisect--helper.c:687
+msgid "--check-and-set-terms requires 3 arguments"
msgstr ""
-#: builtin/grep.c:1245 builtin/index-pack.c:1490
-#, c-format
-msgid "invalid number of threads specified (%d)"
+#: builtin/bisect--helper.c:693
+msgid "--bisect-next-check requires 2 or 3 arguments"
msgstr ""
-#: builtin/grep.c:1250
-msgid "no threads support, ignoring --threads"
+#: builtin/bisect--helper.c:699
+msgid "--bisect-terms requires 0 or 1 argument"
msgstr ""
-#: builtin/grep.c:1281
-msgid "--open-files-in-pager only works on the worktree"
+#: builtin/blame.c:32
+msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
msgstr ""
-#: builtin/grep.c:1304
-msgid "option not supported with --recurse-submodules."
+#: builtin/blame.c:37
+msgid "<rev-opts> are documented in git-rev-list(1)"
msgstr ""
-#: builtin/grep.c:1310
-msgid "--cached or --untracked cannot be used with --no-index."
+#: builtin/blame.c:407
+#, c-format
+msgid "expecting a color: %s"
msgstr ""
-#: builtin/grep.c:1316
-msgid "--[no-]exclude-standard cannot be used for tracked contents."
+#: builtin/blame.c:414
+msgid "must end with a color"
msgstr ""
-#: builtin/grep.c:1324
-msgid "both --cached and trees are given."
+#: builtin/blame.c:701
+#, c-format
+msgid "invalid color '%s' in color.blame.repeatedLines"
msgstr ""
-#: builtin/hash-object.c:82
-msgid ""
-"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
-"[--] <file>..."
+#: builtin/blame.c:719
+msgid "invalid value for blame.coloring"
msgstr ""
-#: builtin/hash-object.c:83
-msgid "git hash-object --stdin-paths"
+#: builtin/blame.c:794
+msgid "Show blame entries as we find them, incrementally"
msgstr ""
-#: builtin/hash-object.c:95
-msgid "type"
+#: builtin/blame.c:795
+msgid "Show blank SHA-1 for boundary commits (Default: off)"
msgstr ""
-#: builtin/hash-object.c:95
-msgid "object type"
+#: builtin/blame.c:796
+msgid "Do not treat root commits as boundaries (Default: off)"
msgstr ""
-#: builtin/hash-object.c:96
-msgid "write the object into the object database"
+#: builtin/blame.c:797
+msgid "Show work cost statistics"
msgstr ""
-#: builtin/hash-object.c:98
-msgid "read the object from stdin"
+#: builtin/blame.c:798
+msgid "Force progress reporting"
msgstr ""
-#: builtin/hash-object.c:100
-msgid "store file as is without filters"
+#: builtin/blame.c:799
+msgid "Show output score for blame entries"
msgstr ""
-#: builtin/hash-object.c:101
-msgid ""
-"just hash any random garbage to create corrupt objects for debugging Git"
+#: builtin/blame.c:800
+msgid "Show original filename (Default: auto)"
msgstr ""
-#: builtin/hash-object.c:102
-msgid "process file as it were from this path"
+#: builtin/blame.c:801
+msgid "Show original linenumber (Default: off)"
msgstr ""
-#: builtin/help.c:43
-msgid "print all available commands"
+#: builtin/blame.c:802
+msgid "Show in a format designed for machine consumption"
msgstr ""
-#: builtin/help.c:44
-msgid "exclude guides"
+#: builtin/blame.c:803
+msgid "Show porcelain format with per-line commit information"
msgstr ""
-#: builtin/help.c:45
-msgid "print list of useful guides"
+#: builtin/blame.c:804
+msgid "Use the same output mode as git-annotate (Default: off)"
msgstr ""
-#: builtin/help.c:46
-msgid "show man page"
+#: builtin/blame.c:805
+msgid "Show raw timestamp (Default: off)"
msgstr ""
-#: builtin/help.c:47
-msgid "show manual in web browser"
+#: builtin/blame.c:806
+msgid "Show long commit SHA1 (Default: off)"
msgstr ""
-#: builtin/help.c:49
-msgid "show info page"
+#: builtin/blame.c:807
+msgid "Suppress author name and timestamp (Default: off)"
msgstr ""
-#: builtin/help.c:55
-msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
+#: builtin/blame.c:808
+msgid "Show author email instead of name (Default: off)"
msgstr ""
-#: builtin/help.c:67
-#, c-format
-msgid "unrecognized help format '%s'"
+#: builtin/blame.c:809
+msgid "Ignore whitespace differences"
msgstr ""
-#: builtin/help.c:94
-msgid "Failed to start emacsclient."
+#: builtin/blame.c:810
+msgid "color redundant metadata from previous line differently"
msgstr ""
-#: builtin/help.c:107
-msgid "Failed to parse emacsclient version."
+#: builtin/blame.c:811
+msgid "color lines by age"
msgstr ""
-#: builtin/help.c:115
-#, c-format
-msgid "emacsclient version '%d' too old (< 22)."
+#: builtin/blame.c:818
+msgid "Use an experimental heuristic to improve diffs"
msgstr ""
-#: builtin/help.c:133 builtin/help.c:154 builtin/help.c:163 builtin/help.c:171
-#, c-format
-msgid "failed to exec '%s'"
+#: builtin/blame.c:820
+msgid "Spend extra cycles to find better match"
msgstr ""
-#: builtin/help.c:208
-#, c-format
-msgid ""
-"'%s': path for unsupported man viewer.\n"
-"Please consider using 'man.<tool>.cmd' instead."
+#: builtin/blame.c:821
+msgid "Use revisions from <file> instead of calling git-rev-list"
msgstr ""
-#: builtin/help.c:220
-#, c-format
-msgid ""
-"'%s': cmd for supported man viewer.\n"
-"Please consider using 'man.<tool>.path' instead."
+#: builtin/blame.c:822
+msgid "Use <file>'s contents as the final image"
msgstr ""
-#: builtin/help.c:337
-#, c-format
-msgid "'%s': unknown man viewer."
+#: builtin/blame.c:823 builtin/blame.c:824
+msgid "score"
msgstr ""
-#: builtin/help.c:354
-msgid "no man viewer handled the request"
+#: builtin/blame.c:823
+msgid "Find line copies within and across files"
msgstr ""
-#: builtin/help.c:362
-msgid "no info viewer handled the request"
+#: builtin/blame.c:824
+msgid "Find line movements within and across files"
msgstr ""
-#: builtin/help.c:404
-msgid "Defining attributes per path"
+#: builtin/blame.c:825
+msgid "n,m"
msgstr ""
-#: builtin/help.c:405
-msgid "Everyday Git With 20 Commands Or So"
+#: builtin/blame.c:825
+msgid "Process only line range n,m, counting from 1"
msgstr ""
-#: builtin/help.c:406
-msgid "A Git glossary"
+#: builtin/blame.c:876
+msgid "--progress can't be used with --incremental or porcelain formats"
msgstr ""
-#: builtin/help.c:407
-msgid "Specifies intentionally untracked files to ignore"
+#. 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:927
+msgid "4 years, 11 months ago"
msgstr ""
-#: builtin/help.c:408
-msgid "Defining submodule properties"
+#: builtin/blame.c:1031
+#, c-format
+msgid "file %s has only %lu line"
+msgid_plural "file %s has only %lu lines"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/blame.c:1077
+msgid "Blaming lines"
msgstr ""
-#: builtin/help.c:409
-msgid "Specifying revisions and ranges for Git"
+#: builtin/branch.c:29
+msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
msgstr ""
-#: builtin/help.c:410
-msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
+#: builtin/branch.c:30
+msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
msgstr ""
-#: builtin/help.c:411
-msgid "An overview of recommended workflows with Git"
+#: builtin/branch.c:31
+msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
msgstr ""
-#: builtin/help.c:423
-msgid "The common Git guides are:\n"
+#: builtin/branch.c:32
+msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
msgstr ""
-#: builtin/help.c:441
-#, c-format
-msgid "`git %s' is aliased to `%s'"
+#: builtin/branch.c:33
+msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
msgstr ""
-#: builtin/help.c:463 builtin/help.c:480
-#, c-format
-msgid "usage: %s%s"
+#: builtin/branch.c:34
+msgid "git branch [<options>] [-r | -a] [--points-at]"
msgstr ""
-#: builtin/index-pack.c:155
-#, c-format
-msgid "unable to open %s"
+#: builtin/branch.c:35
+msgid "git branch [<options>] [-r | -a] [--format]"
msgstr ""
-#: builtin/index-pack.c:205
+#: builtin/branch.c:151
#, c-format
-msgid "object type mismatch at %s"
+msgid ""
+"deleting branch '%s' that has been merged to\n"
+" '%s', but not yet merged to HEAD."
msgstr ""
-#: builtin/index-pack.c:225
+#: builtin/branch.c:155
#, c-format
-msgid "did not receive expected object %s"
+msgid ""
+"not deleting branch '%s' that is not yet merged to\n"
+" '%s', even though it is merged to HEAD."
msgstr ""
-#: builtin/index-pack.c:228
+#: builtin/branch.c:169
#, c-format
-msgid "object %s: expected type %s, found %s"
+msgid "Couldn't look up commit object for '%s'"
msgstr ""
-#: builtin/index-pack.c:270
+#: builtin/branch.c:173
#, c-format
-msgid "cannot fill %d byte"
-msgid_plural "cannot fill %d bytes"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/index-pack.c:280
-msgid "early EOF"
+msgid ""
+"The branch '%s' is not fully merged.\n"
+"If you are sure you want to delete it, run 'git branch -D %s'."
msgstr ""
-#: builtin/index-pack.c:281
-msgid "read error on input"
+#: builtin/branch.c:186
+msgid "Update of config-file failed"
msgstr ""
-#: builtin/index-pack.c:293
-msgid "used more bytes than were available"
+#: builtin/branch.c:217
+msgid "cannot use -a with -d"
msgstr ""
-#: builtin/index-pack.c:300
-msgid "pack too large for current definition of off_t"
+#: builtin/branch.c:223
+msgid "Couldn't look up commit object for HEAD"
msgstr ""
-#: builtin/index-pack.c:303 builtin/unpack-objects.c:93
-msgid "pack exceeds maximum allowed size"
+#: builtin/branch.c:237
+#, c-format
+msgid "Cannot delete branch '%s' checked out at '%s'"
msgstr ""
-#: builtin/index-pack.c:318
+#: builtin/branch.c:252
#, c-format
-msgid "unable to create '%s'"
+msgid "remote-tracking branch '%s' not found."
msgstr ""
-#: builtin/index-pack.c:324
+#: builtin/branch.c:253
#, c-format
-msgid "cannot open packfile '%s'"
+msgid "branch '%s' not found."
msgstr ""
-#: builtin/index-pack.c:338
-msgid "pack signature mismatch"
+#: builtin/branch.c:268
+#, c-format
+msgid "Error deleting remote-tracking branch '%s'"
msgstr ""
-#: builtin/index-pack.c:340
+#: builtin/branch.c:269
#, c-format
-msgid "pack version %<PRIu32> unsupported"
+msgid "Error deleting branch '%s'"
msgstr ""
-#: builtin/index-pack.c:358
+#: builtin/branch.c:276
#, c-format
-msgid "pack has bad object at offset %<PRIuMAX>: %s"
+msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr ""
-#: builtin/index-pack.c:479
+#: builtin/branch.c:277
#, c-format
-msgid "inflate returned %d"
+msgid "Deleted branch %s (was %s).\n"
msgstr ""
-#: builtin/index-pack.c:528
-msgid "offset value overflow for delta base object"
+#: builtin/branch.c:421 builtin/tag.c:60
+msgid "unable to parse format string"
msgstr ""
-#: builtin/index-pack.c:536
-msgid "delta base offset is out of bound"
+#: builtin/branch.c:452
+msgid "could not resolve HEAD"
msgstr ""
-#: builtin/index-pack.c:544
+#: builtin/branch.c:458
#, c-format
-msgid "unknown object type %d"
+msgid "HEAD (%s) points outside of refs/heads/"
msgstr ""
-#: builtin/index-pack.c:575
-msgid "cannot pread pack file"
+#: builtin/branch.c:473
+#, c-format
+msgid "Branch %s is being rebased at %s"
msgstr ""
-#: builtin/index-pack.c:577
+#: builtin/branch.c:477
#, 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:603
-msgid "serious inflate inconsistency"
+msgid "Branch %s is being bisected at %s"
msgstr ""
-#: builtin/index-pack.c:748 builtin/index-pack.c:754 builtin/index-pack.c:777
-#: builtin/index-pack.c:816 builtin/index-pack.c:825
-#, c-format
-msgid "SHA1 COLLISION FOUND WITH %s !"
+#: builtin/branch.c:494
+msgid "cannot copy the current branch while not on any."
msgstr ""
-#: builtin/index-pack.c:751 builtin/pack-objects.c:167
-#: builtin/pack-objects.c:261
-#, c-format
-msgid "unable to read %s"
+#: builtin/branch.c:496
+msgid "cannot rename the current branch while not on any."
msgstr ""
-#: builtin/index-pack.c:814
+#: builtin/branch.c:507
#, c-format
-msgid "cannot read existing object info %s"
+msgid "Invalid branch name: '%s'"
msgstr ""
-#: builtin/index-pack.c:822
-#, c-format
-msgid "cannot read existing object %s"
+#: builtin/branch.c:534
+msgid "Branch rename failed"
msgstr ""
-#: builtin/index-pack.c:836
-#, c-format
-msgid "invalid blob object %s"
+#: builtin/branch.c:536
+msgid "Branch copy failed"
msgstr ""
-#: builtin/index-pack.c:851
+#: builtin/branch.c:540
#, c-format
-msgid "invalid %s"
+msgid "Created a copy of a misnamed branch '%s'"
msgstr ""
-#: builtin/index-pack.c:854
-msgid "Error in object"
+#: builtin/branch.c:543
+#, c-format
+msgid "Renamed a misnamed branch '%s' away"
msgstr ""
-#: builtin/index-pack.c:856
+#: builtin/branch.c:549
#, c-format
-msgid "Not all child objects of %s are reachable"
+msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr ""
-#: builtin/index-pack.c:928 builtin/index-pack.c:959
-msgid "failed to apply delta"
+#: builtin/branch.c:558
+msgid "Branch is renamed, but update of config-file failed"
msgstr ""
-#: builtin/index-pack.c:1130
-msgid "Receiving objects"
+#: builtin/branch.c:560
+msgid "Branch is copied, but update of config-file failed"
msgstr ""
-#: builtin/index-pack.c:1130
-msgid "Indexing objects"
+#: builtin/branch.c:576
+#, c-format
+msgid ""
+"Please edit the description for the branch\n"
+" %s\n"
+"Lines starting with '%c' will be stripped.\n"
msgstr ""
-#: builtin/index-pack.c:1164
-msgid "pack is corrupted (SHA1 mismatch)"
+#: builtin/branch.c:610
+msgid "Generic options"
msgstr ""
-#: builtin/index-pack.c:1169
-msgid "cannot fstat packfile"
+#: builtin/branch.c:612
+msgid "show hash and subject, give twice for upstream branch"
msgstr ""
-#: builtin/index-pack.c:1172
-msgid "pack has junk at the end"
+#: builtin/branch.c:613
+msgid "suppress informational messages"
msgstr ""
-#: builtin/index-pack.c:1184
-msgid "confusion beyond insanity in parse_pack_objects()"
+#: builtin/branch.c:614
+msgid "set up tracking mode (see git-pull(1))"
msgstr ""
-#: builtin/index-pack.c:1207
-msgid "Resolving deltas"
+#: builtin/branch.c:616
+msgid "do not use"
msgstr ""
-#: builtin/index-pack.c:1218
-#, c-format
-msgid "unable to create thread: %s"
+#: builtin/branch.c:618 builtin/rebase.c:485
+msgid "upstream"
msgstr ""
-#: builtin/index-pack.c:1260
-msgid "confusion beyond insanity"
+#: builtin/branch.c:618
+msgid "change the upstream info"
msgstr ""
-#: builtin/index-pack.c:1266
-#, c-format
-msgid "completed with %d local object"
-msgid_plural "completed with %d local objects"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/index-pack.c:1278
-#, c-format
-msgid "Unexpected tail checksum for %s (disk corruption?)"
+#: builtin/branch.c:619
+msgid "Unset the upstream info"
msgstr ""
-#: builtin/index-pack.c:1282
-#, c-format
-msgid "pack has %d unresolved delta"
-msgid_plural "pack has %d unresolved deltas"
-msgstr[0] ""
-msgstr[1] ""
+#: builtin/branch.c:620
+msgid "use colored output"
+msgstr ""
-#: builtin/index-pack.c:1306
-#, c-format
-msgid "unable to deflate appended object (%d)"
+#: builtin/branch.c:621
+msgid "act on remote-tracking branches"
msgstr ""
-#: builtin/index-pack.c:1382
-#, c-format
-msgid "local object %s is corrupt"
+#: builtin/branch.c:623 builtin/branch.c:625
+msgid "print only branches that contain the commit"
msgstr ""
-#: builtin/index-pack.c:1408
-msgid "error while closing pack file"
+#: builtin/branch.c:624 builtin/branch.c:626
+msgid "print only branches that don't contain the commit"
msgstr ""
-#: builtin/index-pack.c:1420
-#, c-format
-msgid "cannot write keep file '%s'"
+#: builtin/branch.c:629
+msgid "Specific git-branch actions:"
msgstr ""
-#: builtin/index-pack.c:1428
-#, c-format
-msgid "cannot close written keep file '%s'"
+#: builtin/branch.c:630
+msgid "list both remote-tracking and local branches"
msgstr ""
-#: builtin/index-pack.c:1438
-msgid "cannot store pack file"
+#: builtin/branch.c:632
+msgid "delete fully merged branch"
msgstr ""
-#: builtin/index-pack.c:1446
-msgid "cannot store index file"
+#: builtin/branch.c:633
+msgid "delete branch (even if not merged)"
msgstr ""
-#: builtin/index-pack.c:1484
-#, c-format
-msgid "bad pack.indexversion=%<PRIu32>"
+#: builtin/branch.c:634
+msgid "move/rename a branch and its reflog"
msgstr ""
-#: builtin/index-pack.c:1552
-#, c-format
-msgid "Cannot open existing pack file '%s'"
+#: builtin/branch.c:635
+msgid "move/rename a branch, even if target exists"
msgstr ""
-#: builtin/index-pack.c:1554
-#, c-format
-msgid "Cannot open existing pack idx file for '%s'"
+#: builtin/branch.c:636
+msgid "copy a branch and its reflog"
msgstr ""
-#: builtin/index-pack.c:1602
-#, c-format
-msgid "non delta: %d object"
-msgid_plural "non delta: %d objects"
-msgstr[0] ""
-msgstr[1] ""
+#: builtin/branch.c:637
+msgid "copy a branch, even if target exists"
+msgstr ""
-#: builtin/index-pack.c:1609
-#, c-format
-msgid "chain length = %d: %lu object"
-msgid_plural "chain length = %d: %lu objects"
-msgstr[0] ""
-msgstr[1] ""
+#: builtin/branch.c:638
+msgid "list branch names"
+msgstr ""
-#: builtin/index-pack.c:1622
-#, c-format
-msgid "packfile name '%s' does not end with '.pack'"
+#: builtin/branch.c:639
+msgid "show current branch name"
msgstr ""
-#: builtin/index-pack.c:1704 builtin/index-pack.c:1707
-#: builtin/index-pack.c:1723 builtin/index-pack.c:1727
-#, c-format
-msgid "bad %s"
+#: builtin/branch.c:640
+msgid "create the branch's reflog"
msgstr ""
-#: builtin/index-pack.c:1743
-msgid "--fix-thin cannot be used without --stdin"
+#: builtin/branch.c:642
+msgid "edit the description for the branch"
msgstr ""
-#: builtin/index-pack.c:1745
-msgid "--stdin requires a git repository"
+#: builtin/branch.c:643
+msgid "force creation, move/rename, deletion"
msgstr ""
-#: builtin/index-pack.c:1753
-msgid "--verify with no packfile name given"
+#: builtin/branch.c:644
+msgid "print only branches that are merged"
msgstr ""
-#: builtin/init-db.c:55
-#, c-format
-msgid "cannot stat '%s'"
+#: builtin/branch.c:645
+msgid "print only branches that are not merged"
msgstr ""
-#: builtin/init-db.c:61
-#, c-format
-msgid "cannot stat template '%s'"
+#: builtin/branch.c:646
+msgid "list branches in columns"
msgstr ""
-#: builtin/init-db.c:66
-#, c-format
-msgid "cannot opendir '%s'"
+#: builtin/branch.c:649 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:427
+msgid "object"
msgstr ""
-#: builtin/init-db.c:77
-#, c-format
-msgid "cannot readlink '%s'"
+#: builtin/branch.c:650
+msgid "print only branches of the object"
msgstr ""
-#: builtin/init-db.c:79
-#, c-format
-msgid "cannot symlink '%s' '%s'"
+#: builtin/branch.c:652 builtin/for-each-ref.c:48 builtin/tag.c:434
+msgid "sorting and filtering are case insensitive"
msgstr ""
-#: builtin/init-db.c:85
-#, c-format
-msgid "cannot copy '%s' to '%s'"
+#: builtin/branch.c:653 builtin/for-each-ref.c:38 builtin/tag.c:432
+#: builtin/verify-tag.c:39
+msgid "format to use for the output"
msgstr ""
-#: builtin/init-db.c:89
-#, c-format
-msgid "ignoring template %s"
+#: builtin/branch.c:676 builtin/clone.c:748
+msgid "HEAD not found below refs/heads!"
msgstr ""
-#: builtin/init-db.c:120
-#, c-format
-msgid "templates not found %s"
+#: builtin/branch.c:700
+msgid "--column and --verbose are incompatible"
msgstr ""
-#: builtin/init-db.c:135
-#, c-format
-msgid "not copying templates from '%s': %s"
+#: builtin/branch.c:715 builtin/branch.c:769 builtin/branch.c:778
+msgid "branch name required"
msgstr ""
-#: builtin/init-db.c:328
-#, c-format
-msgid "unable to handle file type %d"
+#: builtin/branch.c:745
+msgid "Cannot give description to detached HEAD"
msgstr ""
-#: builtin/init-db.c:331
-#, c-format
-msgid "unable to move %s to %s"
+#: builtin/branch.c:750
+msgid "cannot edit description of more than one branch"
msgstr ""
-#: builtin/init-db.c:348 builtin/init-db.c:351
+#: builtin/branch.c:757
#, c-format
-msgid "%s already exists"
+msgid "No commit on branch '%s' yet."
msgstr ""
-#: builtin/init-db.c:404
+#: builtin/branch.c:760
#, c-format
-msgid "Reinitialized existing shared Git repository in %s%s\n"
+msgid "No branch named '%s'."
msgstr ""
-#: builtin/init-db.c:405
-#, c-format
-msgid "Reinitialized existing Git repository in %s%s\n"
+#: builtin/branch.c:775
+msgid "too many branches for a copy operation"
msgstr ""
-#: builtin/init-db.c:409
-#, c-format
-msgid "Initialized empty shared Git repository in %s%s\n"
+#: builtin/branch.c:784
+msgid "too many arguments for a rename operation"
msgstr ""
-#: builtin/init-db.c:410
-#, c-format
-msgid "Initialized empty Git repository in %s%s\n"
+#: builtin/branch.c:789
+msgid "too many arguments to set new upstream"
msgstr ""
-#: builtin/init-db.c:458
+#: builtin/branch.c:793
+#, c-format
msgid ""
-"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
-"shared[=<permissions>]] [<directory>]"
+"could not set upstream of HEAD to %s when it does not point to any branch."
msgstr ""
-#: builtin/init-db.c:481
-msgid "permissions"
+#: builtin/branch.c:796 builtin/branch.c:819
+#, c-format
+msgid "no such branch '%s'"
msgstr ""
-#: builtin/init-db.c:482
-msgid "specify that the git repository is to be shared amongst several users"
+#: builtin/branch.c:800
+#, c-format
+msgid "branch '%s' does not exist"
msgstr ""
-#: builtin/init-db.c:516 builtin/init-db.c:521
-#, c-format
-msgid "cannot mkdir %s"
+#: builtin/branch.c:813
+msgid "too many arguments to unset upstream"
msgstr ""
-#: builtin/init-db.c:525
-#, c-format
-msgid "cannot chdir to %s"
+#: builtin/branch.c:817
+msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr ""
-#: builtin/init-db.c:546
+#: builtin/branch.c:823
#, c-format
-msgid ""
-"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
-"dir=<directory>)"
+msgid "Branch '%s' has no upstream information"
msgstr ""
-#: builtin/init-db.c:574
-#, c-format
-msgid "Cannot access work tree '%s'"
+#: builtin/branch.c:833
+msgid "-a and -r options to 'git branch' do not make sense with a branch name"
msgstr ""
-#: builtin/interpret-trailers.c:15
+#: builtin/branch.c:836
msgid ""
-"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
-"<token>[(=|:)<value>])...] [<file>...]"
+"the '--set-upstream' option is no longer supported. Please use '--track' or "
+"'--set-upstream-to' instead."
msgstr ""
-#: builtin/interpret-trailers.c:26
-msgid "edit files in place"
+#: builtin/bundle.c:45
+#, c-format
+msgid "%s is okay\n"
msgstr ""
-#: builtin/interpret-trailers.c:27
-msgid "trim empty trailers"
+#: builtin/bundle.c:58
+msgid "Need a repository to create a bundle."
msgstr ""
-#: builtin/interpret-trailers.c:28
-msgid "trailer"
+#: builtin/bundle.c:62
+msgid "Need a repository to unbundle."
msgstr ""
-#: builtin/interpret-trailers.c:29
-msgid "trailer(s) to add"
+#: builtin/cat-file.c:593
+msgid ""
+"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
+"p | <type> | --textconv | --filters) [--path=<path>] <object>"
msgstr ""
-#: builtin/interpret-trailers.c:42
-msgid "no input file given for in-place editing"
+#: builtin/cat-file.c:594
+msgid ""
+"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
+"filters]"
msgstr ""
-#: builtin/log.c:45
-msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
+#: builtin/cat-file.c:615
+msgid "only one batch option may be specified"
msgstr ""
-#: builtin/log.c:46
-msgid "git show [<options>] <object>..."
+#: builtin/cat-file.c:633
+msgid "<type> can be one of: blob, tree, commit, tag"
msgstr ""
-#: builtin/log.c:90
-#, c-format
-msgid "invalid --decorate option: %s"
+#: builtin/cat-file.c:634
+msgid "show object type"
msgstr ""
-#: builtin/log.c:147
-msgid "suppress diff output"
+#: builtin/cat-file.c:635
+msgid "show object size"
msgstr ""
-#: builtin/log.c:148
-msgid "show source"
+#: builtin/cat-file.c:637
+msgid "exit with zero when there's no error"
msgstr ""
-#: builtin/log.c:149
-msgid "Use mail map file"
+#: builtin/cat-file.c:638
+msgid "pretty-print object's content"
msgstr ""
-#: builtin/log.c:150
-msgid "decorate options"
+#: builtin/cat-file.c:640
+msgid "for blob objects, run textconv on object's content"
msgstr ""
-#: builtin/log.c:153
-msgid "Process line range n,m in file, counting from 1"
+#: builtin/cat-file.c:642
+msgid "for blob objects, run filters on object's content"
msgstr ""
-#: builtin/log.c:249
-#, c-format
-msgid "Final output: %d %s\n"
+#: builtin/cat-file.c:643 git-submodule.sh:936
+msgid "blob"
msgstr ""
-#: builtin/log.c:497
-#, c-format
-msgid "git show %s: bad file"
+#: builtin/cat-file.c:644
+msgid "use a specific path for --textconv/--filters"
msgstr ""
-#: builtin/log.c:512 builtin/log.c:606
-#, c-format
-msgid "Could not read object %s"
+#: builtin/cat-file.c:646
+msgid "allow -s and -t to work with broken/corrupt objects"
msgstr ""
-#: builtin/log.c:630
-#, c-format
-msgid "Unknown type: %d"
+#: builtin/cat-file.c:647
+msgid "buffer --batch output"
msgstr ""
-#: builtin/log.c:751
-msgid "format.headers without value"
+#: builtin/cat-file.c:649
+msgid "show info and content of objects fed from the standard input"
msgstr ""
-#: builtin/log.c:852
-msgid "name of output directory is too long"
+#: builtin/cat-file.c:653
+msgid "show info about objects fed from the standard input"
msgstr ""
-#: builtin/log.c:868
-#, c-format
-msgid "Cannot open patch file %s"
+#: builtin/cat-file.c:657
+msgid "follow in-tree symlinks (used with --batch or --batch-check)"
msgstr ""
-#: builtin/log.c:885
-msgid "Need exactly one range."
+#: builtin/cat-file.c:659
+msgid "show all objects with --batch or --batch-check"
msgstr ""
-#: builtin/log.c:895
-msgid "Not a range."
+#: builtin/cat-file.c:661
+msgid "do not order --batch-all-objects output"
msgstr ""
-#: builtin/log.c:1001
-msgid "Cover letter needs email format"
+#: builtin/check-attr.c:13
+msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
msgstr ""
-#: builtin/log.c:1081
-#, c-format
-msgid "insane in-reply-to: %s"
+#: builtin/check-attr.c:14
+msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
msgstr ""
-#: builtin/log.c:1108
-msgid "git format-patch [<options>] [<since> | <revision-range>]"
+#: builtin/check-attr.c:21
+msgid "report all attributes set on file"
msgstr ""
-#: builtin/log.c:1158
-msgid "Two output directories?"
+#: builtin/check-attr.c:22
+msgid "use .gitattributes only from the index"
msgstr ""
-#: builtin/log.c:1265 builtin/log.c:1908 builtin/log.c:1910 builtin/log.c:1922
-#, c-format
-msgid "Unknown commit %s"
+#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:102
+msgid "read file names from stdin"
msgstr ""
-#: builtin/log.c:1275 builtin/notes.c:886 builtin/tag.c:533
-#, c-format
-msgid "Failed to resolve '%s' as a valid ref."
+#: builtin/check-attr.c:25 builtin/check-ignore.c:27
+msgid "terminate input and output records by a NUL character"
msgstr ""
-#: builtin/log.c:1280
-msgid "Could not find exact merge base."
+#: builtin/check-ignore.c:21 builtin/checkout.c:1355 builtin/gc.c:538
+#: builtin/worktree.c:499
+msgid "suppress progress reporting"
msgstr ""
-#: builtin/log.c:1284
-msgid ""
-"Failed to get upstream, if you want to record base commit automatically,\n"
-"please use git branch --set-upstream-to to track a remote branch.\n"
-"Or you could specify base commit by --base=<base-commit-id> manually."
+#: builtin/check-ignore.c:29
+msgid "show non-matching input paths"
msgstr ""
-#: builtin/log.c:1304
-msgid "Failed to find exact merge base"
+#: builtin/check-ignore.c:31
+msgid "ignore index when checking"
msgstr ""
-#: builtin/log.c:1315
-msgid "base commit should be the ancestor of revision list"
+#: builtin/check-ignore.c:160
+msgid "cannot specify pathnames with --stdin"
msgstr ""
-#: builtin/log.c:1319
-msgid "base commit shouldn't be in revision list"
+#: builtin/check-ignore.c:163
+msgid "-z only makes sense with --stdin"
msgstr ""
-#: builtin/log.c:1368
-msgid "cannot get patch id"
+#: builtin/check-ignore.c:165
+msgid "no path specified"
msgstr ""
-#: builtin/log.c:1425
-msgid "use [PATCH n/m] even with a single patch"
+#: builtin/check-ignore.c:169
+msgid "--quiet is only valid with a single pathname"
msgstr ""
-#: builtin/log.c:1428
-msgid "use [PATCH] even with multiple patches"
+#: builtin/check-ignore.c:171
+msgid "cannot have both --quiet and --verbose"
msgstr ""
-#: builtin/log.c:1432
-msgid "print patches to standard out"
+#: builtin/check-ignore.c:174
+msgid "--non-matching is only valid with --verbose"
msgstr ""
-#: builtin/log.c:1434
-msgid "generate a cover letter"
+#: builtin/check-mailmap.c:9
+msgid "git check-mailmap [<options>] <contact>..."
msgstr ""
-#: builtin/log.c:1436
-msgid "use simple number sequence for output file names"
+#: builtin/check-mailmap.c:14
+msgid "also read contacts from stdin"
msgstr ""
-#: builtin/log.c:1437
-msgid "sfx"
+#: builtin/check-mailmap.c:25
+#, c-format
+msgid "unable to parse contact: %s"
msgstr ""
-#: builtin/log.c:1438
-msgid "use <sfx> instead of '.patch'"
+#: builtin/check-mailmap.c:48
+msgid "no contacts specified"
msgstr ""
-#: builtin/log.c:1440
-msgid "start numbering patches at <n> instead of 1"
+#: builtin/checkout-index.c:131
+msgid "git checkout-index [<options>] [--] [<file>...]"
msgstr ""
-#: builtin/log.c:1442
-msgid "mark the series as Nth re-roll"
+#: builtin/checkout-index.c:148
+msgid "stage should be between 1 and 3 or all"
msgstr ""
-#: builtin/log.c:1444
-msgid "Use [RFC PATCH] instead of [PATCH]"
+#: builtin/checkout-index.c:164
+msgid "check out all files in the index"
msgstr ""
-#: builtin/log.c:1447
-msgid "Use [<prefix>] instead of [PATCH]"
+#: builtin/checkout-index.c:165
+msgid "force overwrite of existing files"
msgstr ""
-#: builtin/log.c:1450
-msgid "store resulting files in <dir>"
+#: builtin/checkout-index.c:167
+msgid "no warning for existing files and files not in index"
msgstr ""
-#: builtin/log.c:1453
-msgid "don't strip/add [PATCH]"
+#: builtin/checkout-index.c:169
+msgid "don't checkout new files"
msgstr ""
-#: builtin/log.c:1456
-msgid "don't output binary diffs"
+#: builtin/checkout-index.c:171
+msgid "update stat information in the index file"
msgstr ""
-#: builtin/log.c:1458
-msgid "output all-zero hash in From header"
+#: builtin/checkout-index.c:175
+msgid "read list of paths from the standard input"
msgstr ""
-#: builtin/log.c:1460
-msgid "don't include a patch matching a commit upstream"
+#: builtin/checkout-index.c:177
+msgid "write the content to temporary files"
msgstr ""
-#: builtin/log.c:1462
-msgid "show patch format instead of default (patch + stat)"
+#: builtin/checkout-index.c:178 builtin/column.c:31
+#: builtin/submodule--helper.c:1372 builtin/submodule--helper.c:1375
+#: builtin/submodule--helper.c:1383 builtin/submodule--helper.c:1856
+#: builtin/worktree.c:672
+msgid "string"
msgstr ""
-#: builtin/log.c:1464
-msgid "Messaging"
+#: builtin/checkout-index.c:179
+msgid "when creating files, prepend <string>"
msgstr ""
-#: builtin/log.c:1465
-msgid "header"
+#: builtin/checkout-index.c:181
+msgid "copy out the files from named stage"
msgstr ""
-#: builtin/log.c:1466
-msgid "add email header"
+#: builtin/checkout.c:32
+msgid "git checkout [<options>] <branch>"
msgstr ""
-#: builtin/log.c:1467 builtin/log.c:1469
-msgid "email"
+#: builtin/checkout.c:33
+msgid "git checkout [<options>] [<branch>] -- <file>..."
msgstr ""
-#: builtin/log.c:1467
-msgid "add To: header"
+#: builtin/checkout.c:151 builtin/checkout.c:190
+#, c-format
+msgid "path '%s' does not have our version"
msgstr ""
-#: builtin/log.c:1469
-msgid "add Cc: header"
+#: builtin/checkout.c:153 builtin/checkout.c:192
+#, c-format
+msgid "path '%s' does not have their version"
msgstr ""
-#: builtin/log.c:1471
-msgid "ident"
+#: builtin/checkout.c:169
+#, c-format
+msgid "path '%s' does not have all necessary versions"
msgstr ""
-#: builtin/log.c:1472
-msgid "set From address to <ident> (or committer ident if absent)"
+#: builtin/checkout.c:219
+#, c-format
+msgid "path '%s' does not have necessary versions"
msgstr ""
-#: builtin/log.c:1474
-msgid "message-id"
+#: builtin/checkout.c:237
+#, c-format
+msgid "path '%s': cannot merge"
msgstr ""
-#: builtin/log.c:1475
-msgid "make first mail a reply to <message-id>"
+#: builtin/checkout.c:253
+#, c-format
+msgid "Unable to add merge result for '%s'"
msgstr ""
-#: builtin/log.c:1476 builtin/log.c:1479
-msgid "boundary"
-msgstr ""
-
-#: builtin/log.c:1477
-msgid "attach the patch"
-msgstr ""
-
-#: builtin/log.c:1480
-msgid "inline the patch"
+#: builtin/checkout.c:331 builtin/checkout.c:334 builtin/checkout.c:337
+#: builtin/checkout.c:340
+#, c-format
+msgid "'%s' cannot be used with updating paths"
msgstr ""
-#: builtin/log.c:1484
-msgid "enable message threading, styles: shallow, deep"
+#: builtin/checkout.c:343 builtin/checkout.c:346
+#, c-format
+msgid "'%s' cannot be used with %s"
msgstr ""
-#: builtin/log.c:1486
-msgid "signature"
+#: builtin/checkout.c:349
+#, c-format
+msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr ""
-#: builtin/log.c:1487
-msgid "add a signature"
+#: builtin/checkout.c:396 builtin/checkout.c:403
+#, c-format
+msgid "path '%s' is unmerged"
msgstr ""
-#: builtin/log.c:1488
-msgid "base-commit"
-msgstr ""
+#: builtin/checkout.c:442
+#, c-format
+msgid "Recreated %d merge conflict"
+msgid_plural "Recreated %d merge conflicts"
+msgstr[0] ""
+msgstr[1] ""
-#: builtin/log.c:1489
-msgid "add prerequisite tree info to the patch series"
-msgstr ""
+#: builtin/checkout.c:447
+#, c-format
+msgid "Updated %d path from %s"
+msgid_plural "Updated %d paths from %s"
+msgstr[0] ""
+msgstr[1] ""
-#: builtin/log.c:1491
-msgid "add a signature from a file"
-msgstr ""
+#: builtin/checkout.c:454
+#, c-format
+msgid "Updated %d path from the index"
+msgid_plural "Updated %d paths from the index"
+msgstr[0] ""
+msgstr[1] ""
-#: builtin/log.c:1492
-msgid "don't print the patch filenames"
+#: builtin/checkout.c:695
+msgid "you need to resolve your current index first"
msgstr ""
-#: builtin/log.c:1567
+#: builtin/checkout.c:744
#, c-format
-msgid "invalid ident line: %s"
+msgid ""
+"cannot continue with staged changes in the following files:\n"
+"%s"
msgstr ""
-#: builtin/log.c:1582
-msgid "-n and -k are mutually exclusive."
+#: builtin/checkout.c:751
+#, c-format
+msgid "staged changes in the following files may be lost: %s"
msgstr ""
-#: builtin/log.c:1584
-msgid "--subject-prefix/--rfc and -k are mutually exclusive."
+#: builtin/checkout.c:848
+#, c-format
+msgid "Can not do reflog for '%s': %s\n"
msgstr ""
-#: builtin/log.c:1592
-msgid "--name-only does not make sense"
+#: builtin/checkout.c:890
+msgid "HEAD is now at"
msgstr ""
-#: builtin/log.c:1594
-msgid "--name-status does not make sense"
+#: builtin/checkout.c:894 builtin/clone.c:701
+msgid "unable to update HEAD"
msgstr ""
-#: builtin/log.c:1596
-msgid "--check does not make sense"
+#: builtin/checkout.c:898
+#, c-format
+msgid "Reset branch '%s'\n"
msgstr ""
-#: builtin/log.c:1626
-msgid "standard output, or directory, which one?"
+#: builtin/checkout.c:901
+#, c-format
+msgid "Already on '%s'\n"
msgstr ""
-#: builtin/log.c:1628
+#: builtin/checkout.c:905
#, c-format
-msgid "Could not create directory '%s'"
+msgid "Switched to and reset branch '%s'\n"
msgstr ""
-#: builtin/log.c:1722
+#: builtin/checkout.c:907 builtin/checkout.c:1283
#, c-format
-msgid "unable to read signature file '%s'"
+msgid "Switched to a new branch '%s'\n"
msgstr ""
-#: builtin/log.c:1794
-msgid "Failed to create output files"
+#: builtin/checkout.c:909
+#, c-format
+msgid "Switched to branch '%s'\n"
msgstr ""
-#: builtin/log.c:1843
-msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
+#: builtin/checkout.c:960
+#, c-format
+msgid " ... and %d more.\n"
msgstr ""
-#: builtin/log.c:1897
+#: builtin/checkout.c:966
#, c-format
msgid ""
-"Could not find a tracked remote branch, please specify <upstream> manually.\n"
-msgstr ""
+"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/ls-files.c:468
-msgid "git ls-files [<options>] [<file>...]"
-msgstr ""
+#: builtin/checkout.c:985
+#, 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/ls-files.c:517
-msgid "identify the file status with tags"
+#: builtin/checkout.c:1017
+msgid "internal error in revision walk"
msgstr ""
-#: builtin/ls-files.c:519
-msgid "use lowercase letters for 'assume unchanged' files"
+#: builtin/checkout.c:1021
+msgid "Previous HEAD position was"
msgstr ""
-#: builtin/ls-files.c:521
-msgid "show cached files in the output (default)"
+#: builtin/checkout.c:1052 builtin/checkout.c:1278
+msgid "You are on a branch yet to be born"
msgstr ""
-#: builtin/ls-files.c:523
-msgid "show deleted files in the output"
+#: builtin/checkout.c:1173
+#, c-format
+msgid "only one reference expected, %d given."
msgstr ""
-#: builtin/ls-files.c:525
-msgid "show modified files in the output"
+#: builtin/checkout.c:1209
+#, c-format
+msgid ""
+"'%s' could be both a local file and a tracking branch.\n"
+"Please use -- (and optionally --no-guess) to disambiguate"
msgstr ""
-#: builtin/ls-files.c:527
-msgid "show other files in the output"
+#: builtin/checkout.c:1222 builtin/worktree.c:290 builtin/worktree.c:448
+#, c-format
+msgid "invalid reference: %s"
msgstr ""
-#: builtin/ls-files.c:529
-msgid "show ignored files in the output"
+#: builtin/checkout.c:1251
+#, c-format
+msgid "reference is not a tree: %s"
msgstr ""
-#: builtin/ls-files.c:532
-msgid "show staged contents' object name in the output"
+#: builtin/checkout.c:1292
+msgid "paths cannot be used with switching branches"
msgstr ""
-#: builtin/ls-files.c:534
-msgid "show files on the filesystem that need to be removed"
+#: builtin/checkout.c:1295 builtin/checkout.c:1299 builtin/checkout.c:1303
+#, c-format
+msgid "'%s' cannot be used with switching branches"
msgstr ""
-#: builtin/ls-files.c:536
-msgid "show 'other' directories' names only"
+#: builtin/checkout.c:1307 builtin/checkout.c:1310 builtin/checkout.c:1315
+#: builtin/checkout.c:1318
+#, c-format
+msgid "'%s' cannot be used with '%s'"
msgstr ""
-#: builtin/ls-files.c:538
-msgid "show line endings of files"
+#: builtin/checkout.c:1323
+#, c-format
+msgid "Cannot switch branch to a non-commit '%s'"
msgstr ""
-#: builtin/ls-files.c:540
-msgid "don't show empty directories"
+#: builtin/checkout.c:1356 builtin/checkout.c:1358 builtin/clone.c:118
+#: builtin/remote.c:169 builtin/remote.c:171 builtin/worktree.c:492
+#: builtin/worktree.c:494
+msgid "branch"
msgstr ""
-#: builtin/ls-files.c:543
-msgid "show unmerged files in the output"
+#: builtin/checkout.c:1357
+msgid "create and checkout a new branch"
msgstr ""
-#: builtin/ls-files.c:545
-msgid "show resolve-undo information"
+#: builtin/checkout.c:1359
+msgid "create/reset and checkout a branch"
msgstr ""
-#: builtin/ls-files.c:547
-msgid "skip files matching pattern"
+#: builtin/checkout.c:1360
+msgid "create reflog for new branch"
msgstr ""
-#: builtin/ls-files.c:550
-msgid "exclude patterns are read from <file>"
+#: builtin/checkout.c:1361 builtin/worktree.c:496
+msgid "detach HEAD at named commit"
msgstr ""
-#: builtin/ls-files.c:553
-msgid "read additional per-directory exclude patterns in <file>"
+#: builtin/checkout.c:1362
+msgid "set upstream info for new branch"
msgstr ""
-#: builtin/ls-files.c:555
-msgid "add the standard git exclusions"
+#: builtin/checkout.c:1364
+msgid "new-branch"
msgstr ""
-#: builtin/ls-files.c:558
-msgid "make the output relative to the project top directory"
+#: builtin/checkout.c:1364
+msgid "new unparented branch"
msgstr ""
-#: builtin/ls-files.c:561
-msgid "recurse through submodules"
+#: builtin/checkout.c:1366
+msgid "checkout our version for unmerged files"
msgstr ""
-#: builtin/ls-files.c:563
-msgid "if any <file> is not in the index, treat this as an error"
+#: builtin/checkout.c:1369
+msgid "checkout their version for unmerged files"
msgstr ""
-#: builtin/ls-files.c:564
-msgid "tree-ish"
+#: builtin/checkout.c:1371
+msgid "force checkout (throw away local modifications)"
msgstr ""
-#: builtin/ls-files.c:565
-msgid "pretend that paths removed since <tree-ish> are still present"
+#: builtin/checkout.c:1373
+msgid "perform a 3-way merge with the new branch"
msgstr ""
-#: builtin/ls-files.c:567
-msgid "show debugging data"
+#: builtin/checkout.c:1375 builtin/merge.c:284
+msgid "update ignored files (default)"
msgstr ""
-#: builtin/ls-remote.c:7
-msgid ""
-"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
-" [-q | --quiet] [--exit-code] [--get-url]\n"
-" [--symref] [<repository> [<refs>...]]"
+#: builtin/checkout.c:1377 builtin/log.c:1594 parse-options.h:317
+msgid "style"
msgstr ""
-#: builtin/ls-remote.c:52
-msgid "do not print remote URL"
+#: builtin/checkout.c:1378
+msgid "conflict style (merge or diff3)"
msgstr ""
-#: builtin/ls-remote.c:53 builtin/ls-remote.c:55
-msgid "exec"
+#: builtin/checkout.c:1381
+msgid "do not limit pathspecs to sparse entries only"
msgstr ""
-#: builtin/ls-remote.c:54 builtin/ls-remote.c:56
-msgid "path of git-upload-pack on the remote host"
+#: builtin/checkout.c:1383
+msgid "do not second guess 'git checkout <no-such-branch>'"
msgstr ""
-#: builtin/ls-remote.c:58
-msgid "limit to tags"
+#: builtin/checkout.c:1385
+msgid "do not check if another worktree is holding the given ref"
msgstr ""
-#: builtin/ls-remote.c:59
-msgid "limit to heads"
+#: builtin/checkout.c:1389 builtin/clone.c:88 builtin/fetch.c:141
+#: builtin/merge.c:281 builtin/pull.c:136 builtin/push.c:575
+#: builtin/send-pack.c:174
+msgid "force progress reporting"
msgstr ""
-#: builtin/ls-remote.c:60
-msgid "do not show peeled tags"
+#: builtin/checkout.c:1390
+msgid "use overlay mode (default)"
msgstr ""
-#: builtin/ls-remote.c:62
-msgid "take url.<base>.insteadOf into account"
+#: builtin/checkout.c:1422
+msgid "-b, -B and --orphan are mutually exclusive"
msgstr ""
-#: builtin/ls-remote.c:64
-msgid "exit with exit code 2 if no matching refs are found"
+#: builtin/checkout.c:1425
+msgid "-p and --overlay are mutually exclusive"
msgstr ""
-#: builtin/ls-remote.c:66
-msgid "show underlying ref in addition to the object pointed by it"
+#: builtin/checkout.c:1442
+msgid "--track needs a branch name"
msgstr ""
-#: builtin/ls-tree.c:29
-msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
+#: builtin/checkout.c:1447
+msgid "missing branch name; try -b"
msgstr ""
-#: builtin/ls-tree.c:127
-msgid "only show trees"
+#: builtin/checkout.c:1484
+msgid "invalid path specification"
msgstr ""
-#: builtin/ls-tree.c:129
-msgid "recurse into subtrees"
+#: builtin/checkout.c:1491
+#, c-format
+msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
msgstr ""
-#: builtin/ls-tree.c:131
-msgid "show trees when recursing"
+#: builtin/checkout.c:1495
+#, c-format
+msgid "git checkout: --detach does not take a path argument '%s'"
msgstr ""
-#: builtin/ls-tree.c:134
-msgid "terminate entries with NUL byte"
+#: builtin/checkout.c:1499
+msgid ""
+"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
+"checking out of the index."
msgstr ""
-#: builtin/ls-tree.c:135
-msgid "include object size"
+#: builtin/checkout.c:1519
+#, c-format
+msgid ""
+"'%s' matched more than one remote tracking branch.\n"
+"We found %d remotes with a reference that matched. So we fell back\n"
+"on trying to resolve the argument as a path, but failed there too!\n"
+"\n"
+"If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
+"you can do so by fully qualifying the name with the --track option:\n"
+"\n"
+" git checkout --track origin/<name>\n"
+"\n"
+"If you'd like to always have checkouts of an ambiguous <name> prefer\n"
+"one remote, e.g. the 'origin' remote, consider setting\n"
+"checkout.defaultRemote=origin in your config."
msgstr ""
-#: builtin/ls-tree.c:137 builtin/ls-tree.c:139
-msgid "list only filenames"
+#: builtin/clean.c:28
+msgid ""
+"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
msgstr ""
-#: builtin/ls-tree.c:142
-msgid "use full path names"
+#: builtin/clean.c:32
+#, c-format
+msgid "Removing %s\n"
msgstr ""
-#: builtin/ls-tree.c:144
-msgid "list entire tree; not just current directory (implies --full-name)"
+#: builtin/clean.c:33
+#, c-format
+msgid "Would remove %s\n"
msgstr ""
-#: builtin/mailsplit.c:241
+#: builtin/clean.c:34
#, c-format
-msgid "empty mbox: '%s'"
+msgid "Skipping repository %s\n"
msgstr ""
-#: builtin/merge.c:47
-msgid "git merge [<options>] [<commit>...]"
+#: builtin/clean.c:35
+#, c-format
+msgid "Would skip repository %s\n"
msgstr ""
-#: builtin/merge.c:48
-msgid "git merge --abort"
+#: builtin/clean.c:36
+#, c-format
+msgid "failed to remove %s"
msgstr ""
-#: builtin/merge.c:49
-msgid "git merge --continue"
+#: builtin/clean.c:299 git-add--interactive.perl:579
+#, c-format
+msgid ""
+"Prompt help:\n"
+"1 - select a numbered item\n"
+"foo - select item based on unique prefix\n"
+" - (empty) select nothing\n"
msgstr ""
-#: builtin/merge.c:104
-msgid "switch `m' requires a value"
+#: builtin/clean.c:303 git-add--interactive.perl:588
+#, c-format
+msgid ""
+"Prompt help:\n"
+"1 - select a single item\n"
+"3-5 - select a range of items\n"
+"2-3,6-9 - select multiple ranges\n"
+"foo - select item based on unique prefix\n"
+"-... - unselect specified items\n"
+"* - choose all items\n"
+" - (empty) finish selecting\n"
msgstr ""
-#: builtin/merge.c:141
-#, c-format
-msgid "Could not find merge strategy '%s'.\n"
+#: builtin/clean.c:519 git-add--interactive.perl:554
+#: git-add--interactive.perl:559
+#, c-format, perl-format
+msgid "Huh (%s)?\n"
msgstr ""
-#: builtin/merge.c:142
+#: builtin/clean.c:661
#, c-format
-msgid "Available strategies are:"
+msgid "Input ignore patterns>> "
msgstr ""
-#: builtin/merge.c:147
+#: builtin/clean.c:698
#, c-format
-msgid "Available custom strategies are:"
+msgid "WARNING: Cannot find items matched by: %s"
msgstr ""
-#: builtin/merge.c:197 builtin/pull.c:134
-msgid "do not show a diffstat at the end of the merge"
+#: builtin/clean.c:719
+msgid "Select items to delete"
msgstr ""
-#: builtin/merge.c:200 builtin/pull.c:137
-msgid "show a diffstat at the end of the merge"
+#. TRANSLATORS: Make sure to keep [y/N] as is
+#: builtin/clean.c:760
+#, c-format
+msgid "Remove %s [y/N]? "
msgstr ""
-#: builtin/merge.c:201 builtin/pull.c:140
-msgid "(synonym to --stat)"
+#: builtin/clean.c:785 git-add--interactive.perl:1717
+#, c-format
+msgid "Bye.\n"
msgstr ""
-#: builtin/merge.c:203 builtin/pull.c:143
-msgid "add (at most <n>) entries from shortlog to merge commit message"
+#: builtin/clean.c:793
+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/merge.c:206 builtin/pull.c:146
-msgid "create a single commit instead of doing a merge"
+#: builtin/clean.c:820 git-add--interactive.perl:1793
+msgid "*** Commands ***"
msgstr ""
-#: builtin/merge.c:208 builtin/pull.c:149
-msgid "perform a commit if the merge succeeds (default)"
+#: builtin/clean.c:821 git-add--interactive.perl:1790
+msgid "What now"
msgstr ""
-#: builtin/merge.c:210 builtin/pull.c:152
-msgid "edit message before committing"
+#: builtin/clean.c:829
+msgid "Would remove the following item:"
+msgid_plural "Would remove the following items:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/clean.c:845
+msgid "No more files to clean, exiting."
msgstr ""
-#: builtin/merge.c:211
-msgid "allow fast-forward (default)"
+#: builtin/clean.c:907
+msgid "do not print names of files removed"
msgstr ""
-#: builtin/merge.c:213 builtin/pull.c:158
-msgid "abort if fast-forward is not possible"
+#: builtin/clean.c:909
+msgid "force"
msgstr ""
-#: builtin/merge.c:217 builtin/pull.c:161
-msgid "verify that the named commit has a valid GPG signature"
+#: builtin/clean.c:910
+msgid "interactive cleaning"
msgstr ""
-#: builtin/merge.c:218 builtin/notes.c:776 builtin/pull.c:165
-#: builtin/revert.c:109
-msgid "strategy"
+#: builtin/clean.c:912
+msgid "remove whole directories"
msgstr ""
-#: builtin/merge.c:219 builtin/pull.c:166
-msgid "merge strategy to use"
+#: builtin/clean.c:913 builtin/describe.c:546 builtin/describe.c:548
+#: builtin/grep.c:897 builtin/log.c:171 builtin/log.c:173
+#: builtin/ls-files.c:557 builtin/name-rev.c:417 builtin/name-rev.c:419
+#: builtin/show-ref.c:179
+msgid "pattern"
msgstr ""
-#: builtin/merge.c:220 builtin/pull.c:169
-msgid "option=value"
+#: builtin/clean.c:914
+msgid "add <pattern> to ignore rules"
msgstr ""
-#: builtin/merge.c:221 builtin/pull.c:170
-msgid "option for selected merge strategy"
+#: builtin/clean.c:915
+msgid "remove ignored files, too"
msgstr ""
-#: builtin/merge.c:223
-msgid "merge commit message (for a non-fast-forward merge)"
+#: builtin/clean.c:917
+msgid "remove only ignored files"
msgstr ""
-#: builtin/merge.c:227
-msgid "abort the current in-progress merge"
+#: builtin/clean.c:935
+msgid "-x and -X cannot be used together"
msgstr ""
-#: builtin/merge.c:229
-msgid "continue the current in-progress merge"
+#: builtin/clean.c:939
+msgid ""
+"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
+"clean"
msgstr ""
-#: builtin/merge.c:231 builtin/pull.c:177
-msgid "allow merging unrelated histories"
+#: builtin/clean.c:942
+msgid ""
+"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
+"refusing to clean"
msgstr ""
-#: builtin/merge.c:259
-msgid "could not run stash."
+#: builtin/clone.c:44
+msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr ""
-#: builtin/merge.c:264
-msgid "stash failed"
+#: builtin/clone.c:90
+msgid "don't create a checkout"
msgstr ""
-#: builtin/merge.c:269
-#, c-format
-msgid "not a valid object: %s"
+#: builtin/clone.c:91 builtin/clone.c:93 builtin/init-db.c:489
+msgid "create a bare repository"
msgstr ""
-#: builtin/merge.c:288 builtin/merge.c:305
-msgid "read-tree failed"
+#: builtin/clone.c:95
+msgid "create a mirror repository (implies bare)"
msgstr ""
-#: builtin/merge.c:335
-msgid " (nothing to squash)"
+#: builtin/clone.c:97
+msgid "to clone from a local repository"
msgstr ""
-#: builtin/merge.c:346
-#, c-format
-msgid "Squash commit -- not updating HEAD\n"
+#: builtin/clone.c:99
+msgid "don't use local hardlinks, always copy"
msgstr ""
-#: builtin/merge.c:396
-#, c-format
-msgid "No merge message -- not updating HEAD\n"
+#: builtin/clone.c:101
+msgid "setup as shared repository"
msgstr ""
-#: builtin/merge.c:447
-#, c-format
-msgid "'%s' does not point to a commit"
+#: builtin/clone.c:104
+msgid "pathspec"
msgstr ""
-#: builtin/merge.c:537
-#, c-format
-msgid "Bad branch.%s.mergeoptions string: %s"
+#: builtin/clone.c:104
+msgid "initialize submodules in the clone"
msgstr ""
-#: builtin/merge.c:657
-msgid "Not handling anything other than two heads merge."
+#: builtin/clone.c:107
+msgid "number of submodules cloned in parallel"
msgstr ""
-#: builtin/merge.c:671
-#, c-format
-msgid "Unknown option for merge-recursive: -X%s"
+#: builtin/clone.c:108 builtin/init-db.c:486
+msgid "template-directory"
msgstr ""
-#: builtin/merge.c:686
-#, c-format
-msgid "unable to write %s"
+#: builtin/clone.c:109 builtin/init-db.c:487
+msgid "directory from which templates will be used"
msgstr ""
-#: builtin/merge.c:738
-#, c-format
-msgid "Could not read from '%s'"
+#: builtin/clone.c:111 builtin/clone.c:113 builtin/submodule--helper.c:1379
+#: builtin/submodule--helper.c:1859
+msgid "reference repository"
msgstr ""
-#: builtin/merge.c:747
-#, c-format
-msgid "Not committing merge; use 'git commit' to complete the merge.\n"
+#: builtin/clone.c:115 builtin/submodule--helper.c:1381
+#: builtin/submodule--helper.c:1861
+msgid "use --reference only while cloning"
msgstr ""
-#: builtin/merge.c:753
-#, 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/clone.c:116 builtin/column.c:27 builtin/merge-file.c:46
+#: builtin/pack-objects.c:3306 builtin/repack.c:329
+msgid "name"
msgstr ""
-#: builtin/merge.c:777
-msgid "Empty commit message."
+#: builtin/clone.c:117
+msgid "use <name> instead of 'origin' to track upstream"
msgstr ""
-#: builtin/merge.c:797
-#, c-format
-msgid "Wonderful.\n"
+#: builtin/clone.c:119
+msgid "checkout <branch> instead of the remote's HEAD"
msgstr ""
-#: builtin/merge.c:850
-#, c-format
-msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
+#: builtin/clone.c:121
+msgid "path to git-upload-pack on the remote"
msgstr ""
-#: builtin/merge.c:889
-msgid "No current branch."
+#: builtin/clone.c:122 builtin/fetch.c:142 builtin/grep.c:836
+#: builtin/pull.c:225
+msgid "depth"
msgstr ""
-#: builtin/merge.c:891
-msgid "No remote for the current branch."
+#: builtin/clone.c:123
+msgid "create a shallow clone of that depth"
msgstr ""
-#: builtin/merge.c:893
-msgid "No default upstream defined for the current branch."
+#: builtin/clone.c:124 builtin/fetch.c:144 builtin/pack-objects.c:3295
+msgid "time"
msgstr ""
-#: builtin/merge.c:898
-#, c-format
-msgid "No remote-tracking branch for %s from %s"
+#: builtin/clone.c:125
+msgid "create a shallow clone since a specific time"
msgstr ""
-#: builtin/merge.c:945
-#, c-format
-msgid "Bad value '%s' in environment '%s'"
+#: builtin/clone.c:126 builtin/fetch.c:146 builtin/fetch.c:169
+#: builtin/rebase.c:1389
+msgid "revision"
msgstr ""
-#: builtin/merge.c:1046
-#, c-format
-msgid "not something we can merge in %s: %s"
+#: builtin/clone.c:127 builtin/fetch.c:147
+msgid "deepen history of shallow clone, excluding rev"
msgstr ""
-#: builtin/merge.c:1080
-msgid "not something we can merge"
+#: builtin/clone.c:129
+msgid "clone only one branch, HEAD or --branch"
msgstr ""
-#: builtin/merge.c:1145
-msgid "--abort expects no arguments"
+#: builtin/clone.c:131
+msgid "don't clone any tags, and make later fetches not to follow them"
msgstr ""
-#: builtin/merge.c:1149
-msgid "There is no merge to abort (MERGE_HEAD missing)."
+#: builtin/clone.c:133
+msgid "any cloned submodules will be shallow"
msgstr ""
-#: builtin/merge.c:1161
-msgid "--continue expects no arguments"
+#: builtin/clone.c:134 builtin/init-db.c:495
+msgid "gitdir"
msgstr ""
-#: builtin/merge.c:1165
-msgid "There is no merge in progress (MERGE_HEAD missing)."
+#: builtin/clone.c:135 builtin/init-db.c:496
+msgid "separate git dir from working tree"
msgstr ""
-#: builtin/merge.c:1181
-msgid ""
-"You have not concluded your merge (MERGE_HEAD exists).\n"
-"Please, commit your changes before you merge."
+#: builtin/clone.c:136
+msgid "key=value"
msgstr ""
-#: builtin/merge.c:1188
-msgid ""
-"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
-"Please, commit your changes before you merge."
+#: builtin/clone.c:137
+msgid "set config inside the new repository"
msgstr ""
-#: builtin/merge.c:1191
-msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
+#: builtin/clone.c:139 builtin/fetch.c:164 builtin/ls-remote.c:76
+#: builtin/push.c:585 builtin/send-pack.c:172
+msgid "server-specific"
msgstr ""
-#: builtin/merge.c:1200
-msgid "You cannot combine --squash with --no-ff."
+#: builtin/clone.c:139 builtin/fetch.c:164 builtin/ls-remote.c:76
+#: builtin/push.c:585 builtin/send-pack.c:173
+msgid "option to transmit"
msgstr ""
-#: builtin/merge.c:1208
-msgid "No commit specified and merge.defaultToUpstream not set."
+#: builtin/clone.c:140 builtin/fetch.c:165 builtin/pull.c:238
+#: builtin/push.c:586
+msgid "use IPv4 addresses only"
msgstr ""
-#: builtin/merge.c:1225
-msgid "Squash commit into empty head not supported yet"
+#: builtin/clone.c:142 builtin/fetch.c:167 builtin/pull.c:241
+#: builtin/push.c:588
+msgid "use IPv6 addresses only"
msgstr ""
-#: builtin/merge.c:1227
-msgid "Non-fast-forward commit does not make sense into an empty head"
+#: builtin/clone.c:280
+msgid ""
+"No directory name could be guessed.\n"
+"Please specify a directory on the command line"
msgstr ""
-#: builtin/merge.c:1232
+#: builtin/clone.c:333
#, c-format
-msgid "%s - not something we can merge"
+msgid "info: Could not add alternate for '%s': %s\n"
msgstr ""
-#: builtin/merge.c:1234
-msgid "Can merge only exactly one commit into empty head"
+#: builtin/clone.c:405
+#, c-format
+msgid "failed to open '%s'"
msgstr ""
-#: builtin/merge.c:1268
+#: builtin/clone.c:413
#, c-format
-msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
+msgid "%s exists and is not a directory"
msgstr ""
-#: builtin/merge.c:1271
+#: builtin/clone.c:427
#, c-format
-msgid "Commit %s has a bad GPG signature allegedly by %s."
+msgid "failed to stat %s\n"
msgstr ""
-#: builtin/merge.c:1274
+#: builtin/clone.c:444
#, c-format
-msgid "Commit %s does not have a GPG signature."
+msgid "failed to unlink '%s'"
msgstr ""
-#: builtin/merge.c:1277
+#: builtin/clone.c:449
#, c-format
-msgid "Commit %s has a good GPG signature by %s\n"
+msgid "failed to create link '%s'"
msgstr ""
-#: builtin/merge.c:1339
-msgid "refusing to merge unrelated histories"
+#: builtin/clone.c:453
+#, c-format
+msgid "failed to copy file to '%s'"
msgstr ""
-#: builtin/merge.c:1348
-msgid "Already up-to-date."
+#: builtin/clone.c:479
+#, c-format
+msgid "done.\n"
msgstr ""
-#: builtin/merge.c:1358
-#, c-format
-msgid "Updating %s..%s\n"
+#: builtin/clone.c:493
+msgid ""
+"Clone succeeded, but checkout failed.\n"
+"You can inspect what was checked out with 'git status'\n"
+"and retry the checkout with 'git checkout -f HEAD'\n"
msgstr ""
-#: builtin/merge.c:1399
+#: builtin/clone.c:570
#, c-format
-msgid "Trying really trivial in-index merge...\n"
+msgid "Could not find remote branch %s to clone."
msgstr ""
-#: builtin/merge.c:1406
+#: builtin/clone.c:689
#, c-format
-msgid "Nope.\n"
+msgid "unable to update %s"
msgstr ""
-#: builtin/merge.c:1431
-msgid "Already up-to-date. Yeeah!"
+#: builtin/clone.c:739
+msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr ""
-#: builtin/merge.c:1437
-msgid "Not possible to fast-forward, aborting."
+#: builtin/clone.c:770
+msgid "unable to checkout working tree"
msgstr ""
-#: builtin/merge.c:1460 builtin/merge.c:1539
-#, c-format
-msgid "Rewinding the tree to pristine...\n"
+#: builtin/clone.c:815
+msgid "unable to write parameters to config file"
msgstr ""
-#: builtin/merge.c:1464
-#, c-format
-msgid "Trying merge strategy %s...\n"
+#: builtin/clone.c:878
+msgid "cannot repack to clean up"
msgstr ""
-#: builtin/merge.c:1530
-#, c-format
-msgid "No merge strategy handled the merge.\n"
+#: builtin/clone.c:880
+msgid "cannot unlink temporary alternates file"
msgstr ""
-#: builtin/merge.c:1532
-#, c-format
-msgid "Merge with strategy %s failed.\n"
+#: builtin/clone.c:920 builtin/receive-pack.c:1952
+msgid "Too many arguments."
msgstr ""
-#: builtin/merge.c:1541
-#, c-format
-msgid "Using the %s to prepare resolving by hand.\n"
+#: builtin/clone.c:924
+msgid "You must specify a repository to clone."
msgstr ""
-#: builtin/merge.c:1553
+#: builtin/clone.c:937
#, c-format
-msgid "Automatic merge went well; stopped before committing as requested\n"
-msgstr ""
-
-#: builtin/merge-base.c:30
-msgid "git merge-base [-a | --all] <commit> <commit>..."
+msgid "--bare and --origin %s options are incompatible."
msgstr ""
-#: builtin/merge-base.c:31
-msgid "git merge-base [-a | --all] --octopus <commit>..."
+#: builtin/clone.c:940
+msgid "--bare and --separate-git-dir are incompatible."
msgstr ""
-#: builtin/merge-base.c:32
-msgid "git merge-base --independent <commit>..."
+#: builtin/clone.c:953
+#, c-format
+msgid "repository '%s' does not exist"
msgstr ""
-#: builtin/merge-base.c:33
-msgid "git merge-base --is-ancestor <commit> <commit>"
+#: builtin/clone.c:959 builtin/fetch.c:1610
+#, c-format
+msgid "depth %s is not a positive number"
msgstr ""
-#: builtin/merge-base.c:34
-msgid "git merge-base --fork-point <ref> [<commit>]"
+#: builtin/clone.c:969
+#, c-format
+msgid "destination path '%s' already exists and is not an empty directory."
msgstr ""
-#: builtin/merge-base.c:218
-msgid "output all common ancestors"
+#: builtin/clone.c:979
+#, c-format
+msgid "working tree '%s' already exists."
msgstr ""
-#: builtin/merge-base.c:220
-msgid "find ancestors for a single n-way merge"
+#: builtin/clone.c:994 builtin/clone.c:1015 builtin/difftool.c:264
+#: builtin/worktree.c:296 builtin/worktree.c:328
+#, c-format
+msgid "could not create leading directories of '%s'"
msgstr ""
-#: builtin/merge-base.c:222
-msgid "list revs not reachable from others"
+#: builtin/clone.c:999
+#, c-format
+msgid "could not create work tree dir '%s'"
msgstr ""
-#: builtin/merge-base.c:224
-msgid "is the first one ancestor of the other?"
+#: builtin/clone.c:1019
+#, c-format
+msgid "Cloning into bare repository '%s'...\n"
msgstr ""
-#: builtin/merge-base.c:226
-msgid "find where <commit> forked from reflog of <ref>"
+#: builtin/clone.c:1021
+#, c-format
+msgid "Cloning into '%s'...\n"
msgstr ""
-#: builtin/merge-file.c:9
+#: builtin/clone.c:1045
msgid ""
-"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
-"<orig-file> <file2>"
+"clone --recursive is not compatible with both --reference and --reference-if-"
+"able"
msgstr ""
-#: builtin/merge-file.c:33
-msgid "send results to standard output"
+#: builtin/clone.c:1106
+msgid "--depth is ignored in local clones; use file:// instead."
msgstr ""
-#: builtin/merge-file.c:34
-msgid "use a diff3 based merge"
+#: builtin/clone.c:1108
+msgid "--shallow-since is ignored in local clones; use file:// instead."
msgstr ""
-#: builtin/merge-file.c:35
-msgid "for conflicts, use our version"
+#: builtin/clone.c:1110
+msgid "--shallow-exclude is ignored in local clones; use file:// instead."
msgstr ""
-#: builtin/merge-file.c:37
-msgid "for conflicts, use their version"
+#: builtin/clone.c:1112
+msgid "--filter is ignored in local clones; use file:// instead."
msgstr ""
-#: builtin/merge-file.c:39
-msgid "for conflicts, use a union version"
+#: builtin/clone.c:1115
+msgid "source repository is shallow, ignoring --local"
msgstr ""
-#: builtin/merge-file.c:42
-msgid "for conflicts, use this marker size"
+#: builtin/clone.c:1120
+msgid "--local is ignored"
msgstr ""
-#: builtin/merge-file.c:43
-msgid "do not warn about conflicts"
+#: builtin/clone.c:1197 builtin/clone.c:1205
+#, c-format
+msgid "Remote branch %s not found in upstream %s"
msgstr ""
-#: builtin/merge-file.c:45
-msgid "set labels for file1/orig-file/file2"
+#: builtin/clone.c:1208
+msgid "You appear to have cloned an empty repository."
msgstr ""
-#: builtin/merge-recursive.c:45
-#, c-format
-msgid "unknown option %s"
-msgstr ""
-
-#: builtin/merge-recursive.c:51
-#, c-format
-msgid "could not parse object '%s'"
+#: builtin/column.c:10
+msgid "git column [<options>]"
msgstr ""
-#: builtin/merge-recursive.c:55
-#, c-format
-msgid "cannot handle more than %d base. Ignoring %s."
-msgid_plural "cannot handle more than %d bases. Ignoring %s."
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/merge-recursive.c:63
-msgid "not handling anything other than two heads merge."
+#: builtin/column.c:27
+msgid "lookup config vars"
msgstr ""
-#: builtin/merge-recursive.c:69 builtin/merge-recursive.c:71
-#, c-format
-msgid "could not resolve ref '%s'"
+#: builtin/column.c:28 builtin/column.c:29
+msgid "layout to use"
msgstr ""
-#: builtin/merge-recursive.c:77
-#, c-format
-msgid "Merging %s with %s\n"
+#: builtin/column.c:30
+msgid "Maximum width"
msgstr ""
-#: builtin/mktree.c:65
-msgid "git mktree [-z] [--missing] [--batch]"
+#: builtin/column.c:31
+msgid "Padding space on left border"
msgstr ""
-#: builtin/mktree.c:153
-msgid "input is NUL terminated"
+#: builtin/column.c:32
+msgid "Padding space on right border"
msgstr ""
-#: builtin/mktree.c:154 builtin/write-tree.c:25
-msgid "allow missing objects"
+#: builtin/column.c:33
+msgid "Padding space between columns"
msgstr ""
-#: builtin/mktree.c:155
-msgid "allow creation of more than one tree"
+#: builtin/column.c:51
+msgid "--command must be the first argument"
msgstr ""
-#: builtin/mv.c:17
-msgid "git mv [<options>] <source>... <destination>"
+#: builtin/commit-tree.c:18
+msgid ""
+"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "
+"<file>)...] <tree>"
msgstr ""
-#: builtin/mv.c:83
+#: builtin/commit-tree.c:31
#, c-format
-msgid "Directory %s is in index and no submodule?"
-msgstr ""
-
-#: builtin/mv.c:85 builtin/rm.c:290
-msgid "Please stage your changes to .gitmodules or stash them to proceed"
+msgid "duplicate parent %s ignored"
msgstr ""
-#: builtin/mv.c:103
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:520
#, c-format
-msgid "%.*s is in index"
-msgstr ""
-
-#: builtin/mv.c:125
-msgid "force move/rename even if target exists"
+msgid "not a valid object name %s"
msgstr ""
-#: builtin/mv.c:126
-msgid "skip move/rename errors"
+#: builtin/commit-tree.c:93
+#, c-format
+msgid "git commit-tree: failed to open '%s'"
msgstr ""
-#: builtin/mv.c:168
+#: builtin/commit-tree.c:96
#, c-format
-msgid "destination '%s' is not a directory"
+msgid "git commit-tree: failed to read '%s'"
msgstr ""
-#: builtin/mv.c:179
+#: builtin/commit-tree.c:98
#, c-format
-msgid "Checking rename of '%s' to '%s'\n"
+msgid "git commit-tree: failed to close '%s'"
msgstr ""
-#: builtin/mv.c:183
-msgid "bad source"
+#: builtin/commit-tree.c:111
+msgid "parent"
msgstr ""
-#: builtin/mv.c:186
-msgid "can not move directory into itself"
+#: builtin/commit-tree.c:112
+msgid "id of a parent commit object"
msgstr ""
-#: builtin/mv.c:189
-msgid "cannot move directory over file"
+#: builtin/commit-tree.c:114 builtin/commit.c:1480 builtin/merge.c:268
+#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1473
+#: builtin/tag.c:406
+msgid "message"
msgstr ""
-#: builtin/mv.c:198
-msgid "source directory is empty"
+#: builtin/commit-tree.c:115 builtin/commit.c:1480
+msgid "commit message"
msgstr ""
-#: builtin/mv.c:223
-msgid "not under version control"
+#: builtin/commit-tree.c:118
+msgid "read commit log message from file"
msgstr ""
-#: builtin/mv.c:226
-msgid "destination exists"
+#: builtin/commit-tree.c:121 builtin/commit.c:1492 builtin/merge.c:283
+#: builtin/pull.c:193 builtin/revert.c:117
+msgid "GPG sign commit"
msgstr ""
-#: builtin/mv.c:234
-#, c-format
-msgid "overwriting '%s'"
+#: builtin/commit-tree.c:133
+msgid "must give exactly one tree"
msgstr ""
-#: builtin/mv.c:237
-msgid "Cannot overwrite"
+#: builtin/commit-tree.c:140
+msgid "git commit-tree: failed to read"
msgstr ""
-#: builtin/mv.c:240
-msgid "multiple sources for the same target"
+#: builtin/commit.c:41
+msgid "git commit [<options>] [--] <pathspec>..."
msgstr ""
-#: builtin/mv.c:242
-msgid "destination directory does not exist"
+#: builtin/commit.c:46
+msgid "git status [<options>] [--] <pathspec>..."
msgstr ""
-#: builtin/mv.c:249
-#, c-format
-msgid "%s, source=%s, destination=%s"
+#: builtin/commit.c:51
+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/mv.c:270
-#, c-format
-msgid "Renaming %s to %s\n"
+#: 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/mv.c:276 builtin/remote.c:711 builtin/repack.c:390
-#, c-format
-msgid "renaming '%s' failed"
+#: builtin/commit.c:63
+msgid "Otherwise, please use 'git reset'\n"
msgstr ""
-#: builtin/name-rev.c:338
-msgid "git name-rev [<options>] <commit>..."
+#: builtin/commit.c:66
+msgid ""
+"If you wish to skip this commit, use:\n"
+"\n"
+" git reset\n"
+"\n"
+"Then \"git cherry-pick --continue\" will resume cherry-picking\n"
+"the remaining commits.\n"
msgstr ""
-#: builtin/name-rev.c:339
-msgid "git name-rev [<options>] --all"
+#: builtin/commit.c:312
+msgid "failed to unpack HEAD tree object"
msgstr ""
-#: builtin/name-rev.c:340
-msgid "git name-rev [<options>] --stdin"
+#: builtin/commit.c:353
+msgid "unable to create temporary index"
msgstr ""
-#: builtin/name-rev.c:395
-msgid "print only names (no SHA-1)"
+#: builtin/commit.c:359
+msgid "interactive add failed"
msgstr ""
-#: builtin/name-rev.c:396
-msgid "only use tags to name the commits"
+#: builtin/commit.c:373
+msgid "unable to update temporary index"
msgstr ""
-#: builtin/name-rev.c:398
-msgid "only use refs matching <pattern>"
+#: builtin/commit.c:375
+msgid "Failed to update main cache tree"
msgstr ""
-#: builtin/name-rev.c:400
-msgid "ignore refs matching <pattern>"
+#: builtin/commit.c:400 builtin/commit.c:423 builtin/commit.c:469
+msgid "unable to write new_index file"
msgstr ""
-#: builtin/name-rev.c:402
-msgid "list all commits reachable from all refs"
+#: builtin/commit.c:452
+msgid "cannot do a partial commit during a merge."
msgstr ""
-#: builtin/name-rev.c:403
-msgid "read from stdin"
+#: builtin/commit.c:454
+msgid "cannot do a partial commit during a cherry-pick."
msgstr ""
-#: builtin/name-rev.c:404
-msgid "allow to print `undefined` names (default)"
+#: builtin/commit.c:462
+msgid "cannot read the index"
msgstr ""
-#: builtin/name-rev.c:410
-msgid "dereference tags in the input (internal use)"
+#: builtin/commit.c:481
+msgid "unable to write temporary index file"
msgstr ""
-#: builtin/notes.c:26
-msgid "git notes [--ref <notes-ref>] [list [<object>]]"
+#: builtin/commit.c:579
+#, c-format
+msgid "commit '%s' lacks author header"
msgstr ""
-#: builtin/notes.c:27
-msgid ""
-"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
-"| (-c | -C) <object>] [<object>]"
+#: builtin/commit.c:581
+#, c-format
+msgid "commit '%s' has malformed author line"
msgstr ""
-#: builtin/notes.c:28
-msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
+#: builtin/commit.c:600
+msgid "malformed --author parameter"
msgstr ""
-#: builtin/notes.c:29
+#: builtin/commit.c:653
msgid ""
-"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
-"(-c | -C) <object>] [<object>]"
+"unable to select a comment character that is not used\n"
+"in the current commit message"
msgstr ""
-#: builtin/notes.c:30
-msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
+#: builtin/commit.c:691 builtin/commit.c:724 builtin/commit.c:1069
+#, c-format
+msgid "could not lookup commit %s"
msgstr ""
-#: builtin/notes.c:31
-msgid "git notes [--ref <notes-ref>] show [<object>]"
+#: builtin/commit.c:703 builtin/shortlog.c:319
+#, c-format
+msgid "(reading log message from standard input)\n"
msgstr ""
-#: builtin/notes.c:32
-msgid ""
-"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
+#: builtin/commit.c:705
+msgid "could not read log from standard input"
msgstr ""
-#: builtin/notes.c:33
-msgid "git notes merge --commit [-v | -q]"
+#: builtin/commit.c:709
+#, c-format
+msgid "could not read log file '%s'"
msgstr ""
-#: builtin/notes.c:34
-msgid "git notes merge --abort [-v | -q]"
+#: builtin/commit.c:740 builtin/commit.c:756
+msgid "could not read SQUASH_MSG"
msgstr ""
-#: builtin/notes.c:35
-msgid "git notes [--ref <notes-ref>] remove [<object>...]"
+#: builtin/commit.c:747
+msgid "could not read MERGE_MSG"
msgstr ""
-#: builtin/notes.c:36
-msgid "git notes [--ref <notes-ref>] prune [-n | -v]"
+#: builtin/commit.c:807
+msgid "could not write commit template"
msgstr ""
-#: builtin/notes.c:37
-msgid "git notes [--ref <notes-ref>] get-ref"
+#: builtin/commit.c:826
+#, 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/notes.c:42
-msgid "git notes [list [<object>]]"
+#: builtin/commit.c:831
+#, 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/notes.c:47
-msgid "git notes add [<options>] [<object>]"
+#: builtin/commit.c:844
+#, 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/notes.c:52
-msgid "git notes copy [<options>] <from-object> <to-object>"
+#: builtin/commit.c:852
+#, 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/notes.c:53
-msgid "git notes copy --stdin [<from-object> <to-object>]..."
+#: builtin/commit.c:869
+#, c-format
+msgid "%sAuthor: %.*s <%.*s>"
msgstr ""
-#: builtin/notes.c:58
-msgid "git notes append [<options>] [<object>]"
+#: builtin/commit.c:877
+#, c-format
+msgid "%sDate: %s"
msgstr ""
-#: builtin/notes.c:63
-msgid "git notes edit [<object>]"
+#: builtin/commit.c:884
+#, c-format
+msgid "%sCommitter: %.*s <%.*s>"
msgstr ""
-#: builtin/notes.c:68
-msgid "git notes show [<object>]"
+#: builtin/commit.c:902
+msgid "Cannot read index"
msgstr ""
-#: builtin/notes.c:73
-msgid "git notes merge [<options>] <notes-ref>"
+#: builtin/commit.c:969
+msgid "Error building trees"
msgstr ""
-#: builtin/notes.c:74
-msgid "git notes merge --commit [<options>]"
+#: builtin/commit.c:983 builtin/tag.c:269
+#, c-format
+msgid "Please supply the message using either -m or -F option.\n"
msgstr ""
-#: builtin/notes.c:75
-msgid "git notes merge --abort [<options>]"
+#: builtin/commit.c:1027
+#, c-format
+msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr ""
-#: builtin/notes.c:80
-msgid "git notes remove [<object>]"
+#: builtin/commit.c:1041
+#, c-format
+msgid "Invalid ignored mode '%s'"
msgstr ""
-#: builtin/notes.c:85
-msgid "git notes prune [<options>]"
+#: builtin/commit.c:1059 builtin/commit.c:1284
+#, c-format
+msgid "Invalid untracked files mode '%s'"
msgstr ""
-#: builtin/notes.c:90
-msgid "git notes get-ref"
+#: builtin/commit.c:1097
+msgid "--long and -z are incompatible"
msgstr ""
-#: builtin/notes.c:95
-msgid "Write/edit the notes for the following object:"
+#: builtin/commit.c:1130
+msgid "Using both --reset-author and --author does not make sense"
msgstr ""
-#: builtin/notes.c:148
-#, c-format
-msgid "unable to start 'show' for object '%s'"
+#: builtin/commit.c:1139
+msgid "You have nothing to amend."
msgstr ""
-#: builtin/notes.c:152
-msgid "could not read 'show' output"
+#: builtin/commit.c:1142
+msgid "You are in the middle of a merge -- cannot amend."
msgstr ""
-#: builtin/notes.c:160
-#, c-format
-msgid "failed to finish 'show' for object '%s'"
+#: builtin/commit.c:1144
+msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr ""
-#: builtin/notes.c:195
-msgid "please supply the note contents using either -m or -F option"
+#: builtin/commit.c:1147
+msgid "Options --squash and --fixup cannot be used together"
msgstr ""
-#: builtin/notes.c:204
-msgid "unable to write note object"
+#: builtin/commit.c:1157
+msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr ""
-#: builtin/notes.c:206
-#, c-format
-msgid "the note contents have been left in %s"
+#: builtin/commit.c:1159
+msgid "Option -m cannot be combined with -c/-C/-F."
msgstr ""
-#: builtin/notes.c:234 builtin/tag.c:517
-#, c-format
-msgid "cannot read '%s'"
+#: builtin/commit.c:1167
+msgid "--reset-author can be used only with -C, -c or --amend."
msgstr ""
-#: builtin/notes.c:236 builtin/tag.c:520
-#, c-format
-msgid "could not open or read '%s'"
+#: builtin/commit.c:1184
+msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr ""
-#: builtin/notes.c:255 builtin/notes.c:306 builtin/notes.c:308
-#: builtin/notes.c:375 builtin/notes.c:430 builtin/notes.c:516
-#: builtin/notes.c:521 builtin/notes.c:599 builtin/notes.c:661
-#, c-format
-msgid "failed to resolve '%s' as a valid ref."
+#: builtin/commit.c:1186
+msgid "No paths with --include/--only does not make sense."
msgstr ""
-#: builtin/notes.c:258
+#: builtin/commit.c:1192
#, c-format
-msgid "failed to read object '%s'."
+msgid "paths '%s ...' with -a does not make sense"
msgstr ""
-#: builtin/notes.c:262
-#, c-format
-msgid "cannot read note data from non-blob object '%s'."
+#: builtin/commit.c:1319 builtin/commit.c:1503
+msgid "show status concisely"
msgstr ""
-#: builtin/notes.c:302
-#, c-format
-msgid "malformed input line: '%s'."
+#: builtin/commit.c:1321 builtin/commit.c:1505
+msgid "show branch information"
msgstr ""
-#: builtin/notes.c:317
-#, c-format
-msgid "failed to copy notes from '%s' to '%s'"
+#: builtin/commit.c:1323
+msgid "show stash information"
msgstr ""
-#. TRANSLATORS: the first %s will be replaced by a git
-#. notes command: 'add', 'merge', 'remove', etc.
-#.
-#: builtin/notes.c:348
-#, c-format
-msgid "refusing to %s notes in %s (outside of refs/notes/)"
+#: builtin/commit.c:1325 builtin/commit.c:1507
+msgid "compute full ahead/behind values"
msgstr ""
-#: builtin/notes.c:368 builtin/notes.c:423 builtin/notes.c:499
-#: builtin/notes.c:511 builtin/notes.c:587 builtin/notes.c:654
-#: builtin/notes.c:804 builtin/notes.c:951 builtin/notes.c:972
-msgid "too many parameters"
+#: builtin/commit.c:1327
+msgid "version"
msgstr ""
-#: builtin/notes.c:381 builtin/notes.c:667
-#, c-format
-msgid "no note found for object %s."
+#: builtin/commit.c:1327 builtin/commit.c:1509 builtin/push.c:561
+#: builtin/worktree.c:643
+msgid "machine-readable output"
msgstr ""
-#: builtin/notes.c:402 builtin/notes.c:565
-msgid "note contents as a string"
+#: builtin/commit.c:1330 builtin/commit.c:1511
+msgid "show status in long format (default)"
msgstr ""
-#: builtin/notes.c:405 builtin/notes.c:568
-msgid "note contents in a file"
+#: builtin/commit.c:1333 builtin/commit.c:1514
+msgid "terminate entries with NUL"
msgstr ""
-#: builtin/notes.c:408 builtin/notes.c:571
-msgid "reuse and edit specified note object"
+#: builtin/commit.c:1335 builtin/commit.c:1339 builtin/commit.c:1517
+#: builtin/fast-export.c:1085 builtin/fast-export.c:1088 builtin/rebase.c:1465
+#: parse-options.h:331
+msgid "mode"
msgstr ""
-#: builtin/notes.c:411 builtin/notes.c:574
-msgid "reuse specified note object"
+#: builtin/commit.c:1336 builtin/commit.c:1517
+msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr ""
-#: builtin/notes.c:414 builtin/notes.c:577
-msgid "allow storing empty note"
+#: builtin/commit.c:1340
+msgid ""
+"show ignored files, optional modes: traditional, matching, no. (Default: "
+"traditional)"
msgstr ""
-#: builtin/notes.c:415 builtin/notes.c:486
-msgid "replace existing notes"
+#: builtin/commit.c:1342 parse-options.h:179
+msgid "when"
msgstr ""
-#: builtin/notes.c:440
-#, c-format
+#: builtin/commit.c:1343
msgid ""
-"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
-"existing notes"
+"ignore changes to submodules, optional when: all, dirty, untracked. "
+"(Default: all)"
msgstr ""
-#: builtin/notes.c:455 builtin/notes.c:534
-#, c-format
-msgid "Overwriting existing notes for object %s\n"
+#: builtin/commit.c:1345
+msgid "list untracked files in columns"
msgstr ""
-#: builtin/notes.c:466 builtin/notes.c:626 builtin/notes.c:891
-#, c-format
-msgid "Removing note for object %s\n"
+#: builtin/commit.c:1346
+msgid "do not detect renames"
msgstr ""
-#: builtin/notes.c:487
-msgid "read objects from stdin"
+#: builtin/commit.c:1348
+msgid "detect renames, optionally set similarity index"
msgstr ""
-#: builtin/notes.c:489
-msgid "load rewriting config for <command> (implies --stdin)"
+#: builtin/commit.c:1368
+msgid "Unsupported combination of ignored and untracked-files arguments"
msgstr ""
-#: builtin/notes.c:507
-msgid "too few parameters"
+#: builtin/commit.c:1473
+msgid "suppress summary after successful commit"
msgstr ""
-#: builtin/notes.c:528
-#, c-format
-msgid ""
-"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
-"existing notes"
+#: builtin/commit.c:1474
+msgid "show diff in commit message template"
msgstr ""
-#: builtin/notes.c:540
-#, c-format
-msgid "missing notes on source object %s. Cannot copy."
+#: builtin/commit.c:1476
+msgid "Commit message options"
msgstr ""
-#: builtin/notes.c:592
-#, c-format
-msgid ""
-"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
-"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
+#: builtin/commit.c:1477 builtin/merge.c:272 builtin/tag.c:408
+msgid "read message from file"
msgstr ""
-#: builtin/notes.c:687
-msgid "failed to delete ref NOTES_MERGE_PARTIAL"
+#: builtin/commit.c:1478
+msgid "author"
msgstr ""
-#: builtin/notes.c:689
-msgid "failed to delete ref NOTES_MERGE_REF"
+#: builtin/commit.c:1478
+msgid "override author for commit"
msgstr ""
-#: builtin/notes.c:691
-msgid "failed to remove 'git notes merge' worktree"
+#: builtin/commit.c:1479 builtin/gc.c:539
+msgid "date"
msgstr ""
-#: builtin/notes.c:711
-msgid "failed to read ref NOTES_MERGE_PARTIAL"
+#: builtin/commit.c:1479
+msgid "override date for commit"
msgstr ""
-#: builtin/notes.c:713
-msgid "could not find commit from NOTES_MERGE_PARTIAL."
+#: builtin/commit.c:1481 builtin/commit.c:1482 builtin/commit.c:1483
+#: builtin/commit.c:1484 parse-options.h:323 ref-filter.h:92
+msgid "commit"
msgstr ""
-#: builtin/notes.c:715
-msgid "could not parse commit from NOTES_MERGE_PARTIAL."
+#: builtin/commit.c:1481
+msgid "reuse and edit message from specified commit"
msgstr ""
-#: builtin/notes.c:728
-msgid "failed to resolve NOTES_MERGE_REF"
+#: builtin/commit.c:1482
+msgid "reuse message from specified commit"
msgstr ""
-#: builtin/notes.c:731
-msgid "failed to finalize notes merge"
+#: builtin/commit.c:1483
+msgid "use autosquash formatted message to fixup specified commit"
msgstr ""
-#: builtin/notes.c:757
-#, c-format
-msgid "unknown notes merge strategy %s"
+#: builtin/commit.c:1484
+msgid "use autosquash formatted message to squash specified commit"
msgstr ""
-#: builtin/notes.c:773
-msgid "General options"
+#: builtin/commit.c:1485
+msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr ""
-#: builtin/notes.c:775
-msgid "Merge options"
+#: builtin/commit.c:1486 builtin/log.c:1541 builtin/merge.c:285
+#: builtin/pull.c:162 builtin/revert.c:109
+msgid "add Signed-off-by:"
msgstr ""
-#: builtin/notes.c:777
-msgid ""
-"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
-"cat_sort_uniq)"
+#: builtin/commit.c:1487
+msgid "use specified template file"
msgstr ""
-#: builtin/notes.c:779
-msgid "Committing unmerged notes"
+#: builtin/commit.c:1488
+msgid "force edit of commit"
msgstr ""
-#: builtin/notes.c:781
-msgid "finalize notes merge by committing unmerged notes"
+#: builtin/commit.c:1490
+msgid "include status in commit message template"
msgstr ""
-#: builtin/notes.c:783
-msgid "Aborting notes merge resolution"
+#: builtin/commit.c:1495
+msgid "Commit contents options"
msgstr ""
-#: builtin/notes.c:785
-msgid "abort notes merge"
+#: builtin/commit.c:1496
+msgid "commit all changed files"
msgstr ""
-#: builtin/notes.c:796
-msgid "cannot mix --commit, --abort or -s/--strategy"
+#: builtin/commit.c:1497
+msgid "add specified files to index for commit"
msgstr ""
-#: builtin/notes.c:801
-msgid "must specify a notes ref to merge"
+#: builtin/commit.c:1498
+msgid "interactively add files"
msgstr ""
-#: builtin/notes.c:825
-#, c-format
-msgid "unknown -s/--strategy: %s"
+#: builtin/commit.c:1499
+msgid "interactively add changes"
msgstr ""
-#: builtin/notes.c:862
-#, c-format
-msgid "a notes merge into %s is already in-progress at %s"
+#: builtin/commit.c:1500
+msgid "commit only specified files"
msgstr ""
-#: builtin/notes.c:865
-#, c-format
-msgid "failed to store link to current notes ref (%s)"
+#: builtin/commit.c:1501
+msgid "bypass pre-commit and commit-msg hooks"
msgstr ""
-#: builtin/notes.c:867
-#, c-format
-msgid ""
-"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
-"'git notes merge --commit', or abort the merge with 'git notes merge --"
-"abort'.\n"
+#: builtin/commit.c:1502
+msgid "show what would be committed"
msgstr ""
-#: builtin/notes.c:889
-#, c-format
-msgid "Object %s has no note\n"
+#: builtin/commit.c:1515
+msgid "amend previous commit"
msgstr ""
-#: builtin/notes.c:901
-msgid "attempt to remove non-existent note is not an error"
+#: builtin/commit.c:1516
+msgid "bypass post-rewrite hook"
msgstr ""
-#: builtin/notes.c:904
-msgid "read object names from the standard input"
+#: builtin/commit.c:1521
+msgid "ok to record an empty change"
msgstr ""
-#: builtin/notes.c:942 builtin/prune.c:105 builtin/worktree.c:128
-msgid "do not remove, show only"
+#: builtin/commit.c:1523
+msgid "ok to record a change with an empty message"
msgstr ""
-#: builtin/notes.c:943
-msgid "report pruned notes"
+#: builtin/commit.c:1596
+#, c-format
+msgid "Corrupt MERGE_HEAD file (%s)"
msgstr ""
-#: builtin/notes.c:985
-msgid "notes-ref"
+#: builtin/commit.c:1603
+msgid "could not read MERGE_MODE"
msgstr ""
-#: builtin/notes.c:986
-msgid "use notes from <notes-ref>"
+#: builtin/commit.c:1622
+#, c-format
+msgid "could not read commit message: %s"
msgstr ""
-#: builtin/notes.c:1021
+#: builtin/commit.c:1629
#, c-format
-msgid "unknown subcommand: %s"
+msgid "Aborting commit due to empty commit message.\n"
msgstr ""
-#: builtin/pack-objects.c:30
-msgid ""
-"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
+#: builtin/commit.c:1634
+#, c-format
+msgid "Aborting commit; you did not edit the message.\n"
msgstr ""
-#: builtin/pack-objects.c:31
+#: builtin/commit.c:1668
msgid ""
-"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
+"repository has been updated, but unable to write\n"
+"new_index file. Check that disk is not full and quota is\n"
+"not exceeded, and then \"git reset HEAD\" to recover."
msgstr ""
-#: builtin/pack-objects.c:180 builtin/pack-objects.c:183
-#, c-format
-msgid "deflate error (%d)"
+#: builtin/commit-graph.c:10
+msgid "git commit-graph [--object-dir <objdir>]"
msgstr ""
-#: builtin/pack-objects.c:776
-msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
+#: builtin/commit-graph.c:11 builtin/commit-graph.c:23
+msgid "git commit-graph read [--object-dir <objdir>]"
msgstr ""
-#: builtin/pack-objects.c:789
-msgid "Writing objects"
+#: builtin/commit-graph.c:12 builtin/commit-graph.c:18
+msgid "git commit-graph verify [--object-dir <objdir>]"
msgstr ""
-#: builtin/pack-objects.c:1069
-msgid "disabling bitmap writing, as some objects are not being packed"
+#: builtin/commit-graph.c:13 builtin/commit-graph.c:28
+msgid ""
+"git commit-graph write [--object-dir <objdir>] [--append] [--reachable|--"
+"stdin-packs|--stdin-commits]"
msgstr ""
-#: builtin/pack-objects.c:2434
-msgid "Compressing objects"
+#: builtin/commit-graph.c:51 builtin/commit-graph.c:89
+#: builtin/commit-graph.c:147 builtin/commit-graph.c:205 builtin/fetch.c:153
+#: builtin/log.c:1561
+msgid "dir"
msgstr ""
-#: builtin/pack-objects.c:2843
-#, c-format
-msgid "unsupported index version %s"
+#: builtin/commit-graph.c:52 builtin/commit-graph.c:90
+#: builtin/commit-graph.c:148 builtin/commit-graph.c:206
+msgid "The object directory to store the graph"
msgstr ""
-#: builtin/pack-objects.c:2847
+#: builtin/commit-graph.c:68 builtin/commit-graph.c:105
#, c-format
-msgid "bad index version '%s'"
+msgid "Could not open commit-graph '%s'"
msgstr ""
-#: builtin/pack-objects.c:2877
-msgid "do not show progress meter"
+#: builtin/commit-graph.c:150
+msgid "start walk at all refs"
msgstr ""
-#: builtin/pack-objects.c:2879
-msgid "show progress meter"
+#: builtin/commit-graph.c:152
+msgid "scan pack-indexes listed by stdin for commits"
msgstr ""
-#: builtin/pack-objects.c:2881
-msgid "show progress meter during object writing phase"
+#: builtin/commit-graph.c:154
+msgid "start walk at commits listed by stdin"
msgstr ""
-#: builtin/pack-objects.c:2884
-msgid "similar to --all-progress when progress meter is shown"
+#: builtin/commit-graph.c:156
+msgid "include all commits already in the commit-graph file"
msgstr ""
-#: builtin/pack-objects.c:2885
-msgid "version[,offset]"
+#: builtin/commit-graph.c:165
+msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
msgstr ""
-#: builtin/pack-objects.c:2886
-msgid "write the pack index file in the specified idx format version"
+#: builtin/config.c:11
+msgid "git config [<options>]"
msgstr ""
-#: builtin/pack-objects.c:2889
-msgid "maximum size of each output pack file"
+#: builtin/config.c:103
+#, c-format
+msgid "unrecognized --type argument, %s"
msgstr ""
-#: builtin/pack-objects.c:2891
-msgid "ignore borrowed objects from alternate object store"
+#: builtin/config.c:115
+msgid "only one type at a time"
msgstr ""
-#: builtin/pack-objects.c:2893
-msgid "ignore packed objects"
+#: builtin/config.c:124
+msgid "Config file location"
msgstr ""
-#: builtin/pack-objects.c:2895
-msgid "limit pack window by objects"
+#: builtin/config.c:125
+msgid "use global config file"
msgstr ""
-#: builtin/pack-objects.c:2897
-msgid "limit pack window by memory in addition to object limit"
+#: builtin/config.c:126
+msgid "use system config file"
msgstr ""
-#: builtin/pack-objects.c:2899
-msgid "maximum length of delta chain allowed in the resulting pack"
+#: builtin/config.c:127
+msgid "use repository config file"
msgstr ""
-#: builtin/pack-objects.c:2901
-msgid "reuse existing deltas"
+#: builtin/config.c:128
+msgid "use per-worktree config file"
msgstr ""
-#: builtin/pack-objects.c:2903
-msgid "reuse existing objects"
+#: builtin/config.c:129
+msgid "use given config file"
msgstr ""
-#: builtin/pack-objects.c:2905
-msgid "use OFS_DELTA objects"
+#: builtin/config.c:130
+msgid "blob-id"
msgstr ""
-#: builtin/pack-objects.c:2907
-msgid "use threads when searching for best delta matches"
+#: builtin/config.c:130
+msgid "read config from given blob object"
msgstr ""
-#: builtin/pack-objects.c:2909
-msgid "do not create an empty pack output"
+#: builtin/config.c:131
+msgid "Action"
msgstr ""
-#: builtin/pack-objects.c:2911
-msgid "read revision arguments from standard input"
+#: builtin/config.c:132
+msgid "get value: name [value-regex]"
msgstr ""
-#: builtin/pack-objects.c:2913
-msgid "limit the objects to those that are not yet packed"
+#: builtin/config.c:133
+msgid "get all values: key [value-regex]"
msgstr ""
-#: builtin/pack-objects.c:2916
-msgid "include objects reachable from any reference"
+#: builtin/config.c:134
+msgid "get values for regexp: name-regex [value-regex]"
msgstr ""
-#: builtin/pack-objects.c:2919
-msgid "include objects referred by reflog entries"
+#: builtin/config.c:135
+msgid "get value specific for the URL: section[.var] URL"
msgstr ""
-#: builtin/pack-objects.c:2922
-msgid "include objects referred to by the index"
+#: builtin/config.c:136
+msgid "replace all matching variables: name value [value_regex]"
msgstr ""
-#: builtin/pack-objects.c:2925
-msgid "output pack to stdout"
+#: builtin/config.c:137
+msgid "add a new variable: name value"
msgstr ""
-#: builtin/pack-objects.c:2927
-msgid "include tag objects that refer to objects to be packed"
+#: builtin/config.c:138
+msgid "remove a variable: name [value-regex]"
msgstr ""
-#: builtin/pack-objects.c:2929
-msgid "keep unreachable objects"
+#: builtin/config.c:139
+msgid "remove all matches: name [value-regex]"
msgstr ""
-#: builtin/pack-objects.c:2931
-msgid "pack loose unreachable objects"
+#: builtin/config.c:140
+msgid "rename section: old-name new-name"
msgstr ""
-#: builtin/pack-objects.c:2933
-msgid "unpack unreachable objects newer than <time>"
+#: builtin/config.c:141
+msgid "remove a section: name"
msgstr ""
-#: builtin/pack-objects.c:2936
-msgid "create thin packs"
+#: builtin/config.c:142
+msgid "list all"
msgstr ""
-#: builtin/pack-objects.c:2938
-msgid "create packs suitable for shallow fetches"
+#: builtin/config.c:143
+msgid "open an editor"
msgstr ""
-#: builtin/pack-objects.c:2940
-msgid "ignore packs that have companion .keep file"
+#: builtin/config.c:144
+msgid "find the color configured: slot [default]"
msgstr ""
-#: builtin/pack-objects.c:2942
-msgid "pack compression level"
+#: builtin/config.c:145
+msgid "find the color setting: slot [stdout-is-tty]"
msgstr ""
-#: builtin/pack-objects.c:2944
-msgid "do not hide commits by grafts"
+#: builtin/config.c:146
+msgid "Type"
msgstr ""
-#: builtin/pack-objects.c:2946
-msgid "use a bitmap index if available to speed up counting objects"
+#: builtin/config.c:147
+msgid "value is given this type"
msgstr ""
-#: builtin/pack-objects.c:2948
-msgid "write a bitmap index together with the pack index"
+#: builtin/config.c:148
+msgid "value is \"true\" or \"false\""
msgstr ""
-#: builtin/pack-objects.c:3075
-msgid "Counting objects"
+#: builtin/config.c:149
+msgid "value is decimal number"
msgstr ""
-#: builtin/pack-refs.c:6
-msgid "git pack-refs [<options>]"
+#: builtin/config.c:150
+msgid "value is --bool or --int"
msgstr ""
-#: builtin/pack-refs.c:14
-msgid "pack everything"
+#: builtin/config.c:151
+msgid "value is a path (file or directory name)"
msgstr ""
-#: builtin/pack-refs.c:15
-msgid "prune loose refs (default)"
+#: builtin/config.c:152
+msgid "value is an expiry date"
msgstr ""
-#: builtin/prune-packed.c:7
-msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
+#: builtin/config.c:153
+msgid "Other"
msgstr ""
-#: builtin/prune-packed.c:40
-msgid "Removing duplicate objects"
+#: builtin/config.c:154
+msgid "terminate values with NUL byte"
msgstr ""
-#: builtin/prune.c:11
-msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
+#: builtin/config.c:155
+msgid "show variable names only"
msgstr ""
-#: builtin/prune.c:106
-msgid "report pruned objects"
+#: builtin/config.c:156
+msgid "respect include directives on lookup"
msgstr ""
-#: builtin/prune.c:109
-msgid "expire objects older than <time>"
+#: builtin/config.c:157
+msgid "show origin of config (file, standard input, blob, command line)"
msgstr ""
-#: builtin/prune.c:123
-msgid "cannot prune in a precious-objects repo"
+#: builtin/config.c:158
+msgid "value"
msgstr ""
-#: builtin/pull.c:54 builtin/pull.c:56
-#, c-format
-msgid "Invalid value for %s: %s"
+#: builtin/config.c:158
+msgid "with --get, use default value when missing entry"
msgstr ""
-#: builtin/pull.c:76
-msgid "git pull [<options>] [<repository> [<refspec>...]]"
+#: builtin/config.c:172
+#, c-format
+msgid "wrong number of arguments, should be %d"
msgstr ""
-#: builtin/pull.c:124
-msgid "control for recursive fetching of submodules"
+#: builtin/config.c:174
+#, c-format
+msgid "wrong number of arguments, should be from %d to %d"
msgstr ""
-#: builtin/pull.c:128
-msgid "Options related to merging"
+#: builtin/config.c:308
+#, c-format
+msgid "invalid key pattern: %s"
msgstr ""
-#: builtin/pull.c:131
-msgid "incorporate changes by rebasing rather than merging"
+#: builtin/config.c:344
+#, c-format
+msgid "failed to format default config value: %s"
msgstr ""
-#: builtin/pull.c:155 builtin/rebase--helper.c:19 builtin/revert.c:121
-msgid "allow fast-forward"
+#: builtin/config.c:401
+#, c-format
+msgid "cannot parse color '%s'"
msgstr ""
-#: builtin/pull.c:164
-msgid "automatically stash/stash pop before and after rebase"
+#: builtin/config.c:443
+msgid "unable to parse default color value"
msgstr ""
-#: builtin/pull.c:180
-msgid "Options related to fetching"
+#: builtin/config.c:496 builtin/config.c:742
+msgid "not in a git directory"
msgstr ""
-#: builtin/pull.c:198
-msgid "number of submodules pulled in parallel"
+#: builtin/config.c:499
+msgid "writing to stdin is not supported"
msgstr ""
-#: builtin/pull.c:287
-#, c-format
-msgid "Invalid value for pull.ff: %s"
+#: builtin/config.c:502
+msgid "writing config blobs is not supported"
msgstr ""
-#: builtin/pull.c:399
+#: builtin/config.c:587
+#, c-format
msgid ""
-"There is no candidate for rebasing against among the refs that you just "
-"fetched."
+"# 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/pull.c:401
-msgid ""
-"There are no candidates for merging among the refs that you just fetched."
+#: builtin/config.c:611
+msgid "only one config file at a time"
msgstr ""
-#: builtin/pull.c:402
-msgid ""
-"Generally this means that you provided a wildcard refspec which had no\n"
-"matches on the remote end."
+#: builtin/config.c:616
+msgid "--local can only be used inside a git repository"
msgstr ""
-#: builtin/pull.c:405
-#, 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."
+#: builtin/config.c:619
+msgid "--blob can only be used inside a git repository"
msgstr ""
-#: builtin/pull.c:410 git-parse-remote.sh:73
-msgid "You are not currently on a branch."
+#: builtin/config.c:638
+msgid "$HOME not set"
msgstr ""
-#: builtin/pull.c:412 builtin/pull.c:427 git-parse-remote.sh:79
-msgid "Please specify which branch you want to rebase against."
+#: builtin/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/pull.c:414 builtin/pull.c:429 git-parse-remote.sh:82
-msgid "Please specify which branch you want to merge with."
+#: builtin/config.c:688
+msgid "--get-color and variable type are incoherent"
msgstr ""
-#: builtin/pull.c:415 builtin/pull.c:430
-msgid "See git-pull(1) for details."
+#: builtin/config.c:693
+msgid "only one action at a time"
msgstr ""
-#: builtin/pull.c:417 builtin/pull.c:423 builtin/pull.c:432
-#: git-parse-remote.sh:64
-msgid "<remote>"
+#: builtin/config.c:706
+msgid "--name-only is only applicable to --list or --get-regexp"
msgstr ""
-#: builtin/pull.c:417 builtin/pull.c:432 builtin/pull.c:437 git-rebase.sh:456
-#: git-parse-remote.sh:65
-msgid "<branch>"
-msgstr ""
-
-#: builtin/pull.c:425 git-parse-remote.sh:75
-msgid "There is no tracking information for the current branch."
-msgstr ""
-
-#: builtin/pull.c:434 git-parse-remote.sh:95
+#: builtin/config.c:712
msgid ""
-"If you wish to set tracking information for this branch you can do so with:"
+"--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
+"list"
msgstr ""
-#: builtin/pull.c:439
-#, c-format
-msgid ""
-"Your configuration specifies to merge with the ref '%s'\n"
-"from the remote, but no such ref was fetched."
+#: builtin/config.c:718
+msgid "--default is only applicable to --get"
msgstr ""
-#: builtin/pull.c:792
-msgid "ignoring --verify-signatures for rebase"
+#: builtin/config.c:731
+#, c-format
+msgid "unable to read config file '%s'"
msgstr ""
-#: builtin/pull.c:840
-msgid "--[no-]autostash option is only valid with --rebase."
+#: builtin/config.c:734
+msgid "error processing config file(s)"
msgstr ""
-#: builtin/pull.c:848
-msgid "Updating an unborn branch with changes added to the index."
+#: builtin/config.c:744
+msgid "editing stdin is not supported"
msgstr ""
-#: builtin/pull.c:851
-msgid "pull with rebase"
+#: builtin/config.c:746
+msgid "editing blobs is not supported"
msgstr ""
-#: builtin/pull.c:852
-msgid "please commit or stash them."
+#: builtin/config.c:760
+#, c-format
+msgid "cannot create configuration file %s"
msgstr ""
-#: builtin/pull.c:877
+#: builtin/config.c:773
#, c-format
msgid ""
-"fetch updated the current branch head.\n"
-"fast-forwarding your working tree from\n"
-"commit %s."
+"cannot overwrite multiple values with a single value\n"
+" Use a regexp, --add or --replace-all to change %s."
msgstr ""
-#: builtin/pull.c:882
+#: builtin/config.c:847 builtin/config.c:858
#, 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."
+msgid "no such section: %s"
msgstr ""
-#: builtin/pull.c:897
-msgid "Cannot merge multiple branches into empty head."
+#: builtin/count-objects.c:90
+msgid "git count-objects [-v] [-H | --human-readable]"
msgstr ""
-#: builtin/pull.c:901
-msgid "Cannot rebase onto multiple branches."
+#: builtin/count-objects.c:100
+msgid "print sizes in human readable format"
msgstr ""
-#: builtin/pull.c:908
-msgid "cannot rebase with locally recorded submodule modifications"
+#: builtin/describe.c:27
+msgid "git describe [<options>] [<commit-ish>...]"
msgstr ""
-#: builtin/push.c:17
-msgid "git push [<options>] [<repository> [<refspec>...]]"
+#: builtin/describe.c:28
+msgid "git describe [<options>] --dirty"
msgstr ""
-#: builtin/push.c:90
-msgid "tag shorthand without <tag>"
+#: builtin/describe.c:63
+msgid "head"
msgstr ""
-#: builtin/push.c:100
-msgid "--delete only accepts plain target ref names"
+#: builtin/describe.c:63
+msgid "lightweight"
msgstr ""
-#: builtin/push.c:144
-msgid ""
-"\n"
-"To choose either option permanently, see push.default in 'git help config'."
+#: builtin/describe.c:63
+msgid "annotated"
msgstr ""
-#: builtin/push.c:147
+#: builtin/describe.c:273
#, c-format
-msgid ""
-"The upstream branch of your current branch does not match\n"
-"the name of your current branch. To push to the upstream branch\n"
-"on the remote, use\n"
-"\n"
-" git push %s HEAD:%s\n"
-"\n"
-"To push to the branch of the same name on the remote, use\n"
-"\n"
-" git push %s %s\n"
-"%s"
+msgid "annotated tag %s not available"
msgstr ""
-#: builtin/push.c:162
+#: builtin/describe.c:277
#, c-format
-msgid ""
-"You are not currently on a branch.\n"
-"To push the history leading to the current (detached HEAD)\n"
-"state now, use\n"
-"\n"
-" git push %s HEAD:<name-of-remote-branch>\n"
+msgid "annotated tag %s has no embedded name"
msgstr ""
-#: builtin/push.c:176
+#: builtin/describe.c:279
#, c-format
-msgid ""
-"The current branch %s has no upstream branch.\n"
-"To push the current branch and set the remote as upstream, use\n"
-"\n"
-" git push --set-upstream %s %s\n"
+msgid "tag '%s' is really '%s' here"
msgstr ""
-#: builtin/push.c:184
+#: builtin/describe.c:323
#, c-format
-msgid "The current branch %s has multiple upstream branches, refusing to push."
+msgid "no tag exactly matches '%s'"
msgstr ""
-#: builtin/push.c:187
+#: builtin/describe.c:325
#, c-format
-msgid ""
-"You are pushing to remote '%s', which is not the upstream of\n"
-"your current branch '%s', without telling me what to push\n"
-"to update which remote branch."
-msgstr ""
-
-#: builtin/push.c:246
-msgid ""
-"You didn't specify any refspecs to push, and push.default is \"nothing\"."
+msgid "No exact match on refs or tags, searching to describe\n"
msgstr ""
-#: builtin/push.c:253
-msgid ""
-"Updates were rejected because the tip of your current branch is behind\n"
-"its remote counterpart. Integrate the remote changes (e.g.\n"
-"'git pull ...') before pushing again.\n"
-"See the 'Note about fast-forwards' in 'git push --help' for details."
+#: builtin/describe.c:379
+#, c-format
+msgid "finished search at %s\n"
msgstr ""
-#: builtin/push.c:259
+#: builtin/describe.c:405
+#, c-format
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."
+"No annotated tags can describe '%s'.\n"
+"However, there were unannotated tags: try --tags."
msgstr ""
-#: builtin/push.c:265
+#: builtin/describe.c:409
+#, c-format
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."
+"No tags can describe '%s'.\n"
+"Try --always, or create some tags."
msgstr ""
-#: builtin/push.c:272
-msgid "Updates were rejected because the tag already exists in the remote."
+#: builtin/describe.c:439
+#, c-format
+msgid "traversed %lu commits\n"
msgstr ""
-#: builtin/push.c:275
+#: builtin/describe.c:442
+#, c-format
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"
+"more than %i tags found; listed %i most recent\n"
+"gave up search at %s\n"
msgstr ""
-#: builtin/push.c:335
+#: builtin/describe.c:510
#, c-format
-msgid "Pushing to %s\n"
+msgid "describe %s\n"
msgstr ""
-#: builtin/push.c:339
+#: builtin/describe.c:513
#, c-format
-msgid "failed to push some refs to '%s'"
+msgid "Not a valid object name %s"
msgstr ""
-#: builtin/push.c:370
+#: builtin/describe.c:521
#, c-format
-msgid "bad repository '%s'"
+msgid "%s is neither a commit nor blob"
msgstr ""
-#: builtin/push.c:371
-msgid ""
-"No configured push destination.\n"
-"Either specify the URL from the command-line or configure a remote "
-"repository using\n"
-"\n"
-" git remote add <name> <url>\n"
-"\n"
-"and then push using the remote name\n"
-"\n"
-" git push <name>\n"
+#: builtin/describe.c:535
+msgid "find the tag that comes after the commit"
msgstr ""
-#: builtin/push.c:389
-msgid "--all and --tags are incompatible"
+#: builtin/describe.c:536
+msgid "debug search strategy on stderr"
msgstr ""
-#: builtin/push.c:390
-msgid "--all can't be combined with refspecs"
+#: builtin/describe.c:537
+msgid "use any ref"
msgstr ""
-#: builtin/push.c:395
-msgid "--mirror and --tags are incompatible"
+#: builtin/describe.c:538
+msgid "use any tag, even unannotated"
msgstr ""
-#: builtin/push.c:396
-msgid "--mirror can't be combined with refspecs"
+#: builtin/describe.c:539
+msgid "always use long format"
msgstr ""
-#: builtin/push.c:401
-msgid "--all and --mirror are incompatible"
+#: builtin/describe.c:540
+msgid "only follow first parent"
msgstr ""
-#: builtin/push.c:523
-msgid "repository"
+#: builtin/describe.c:543
+msgid "only output exact matches"
msgstr ""
-#: builtin/push.c:524 builtin/send-pack.c:163
-msgid "push all refs"
+#: builtin/describe.c:545
+msgid "consider <n> most recent tags (default: 10)"
msgstr ""
-#: builtin/push.c:525 builtin/send-pack.c:165
-msgid "mirror all refs"
+#: builtin/describe.c:547
+msgid "only consider tags matching <pattern>"
msgstr ""
-#: builtin/push.c:527
-msgid "delete refs"
+#: builtin/describe.c:549
+msgid "do not consider tags matching <pattern>"
msgstr ""
-#: builtin/push.c:528
-msgid "push tags (can't be used with --all or --mirror)"
+#: builtin/describe.c:551 builtin/name-rev.c:426
+msgid "show abbreviated commit object as fallback"
msgstr ""
-#: builtin/push.c:531 builtin/send-pack.c:166
-msgid "force updates"
+#: builtin/describe.c:552 builtin/describe.c:555
+msgid "mark"
msgstr ""
-#: builtin/push.c:533 builtin/send-pack.c:180
-msgid "refname>:<expect"
+#: builtin/describe.c:553
+msgid "append <mark> on dirty working tree (default: \"-dirty\")"
msgstr ""
-#: builtin/push.c:534 builtin/send-pack.c:181
-msgid "require old value of ref to be at this value"
+#: builtin/describe.c:556
+msgid "append <mark> on broken working tree (default: \"-broken\")"
msgstr ""
-#: builtin/push.c:537
-msgid "control recursive pushing of submodules"
+#: builtin/describe.c:574
+msgid "--long is incompatible with --abbrev=0"
msgstr ""
-#: builtin/push.c:539 builtin/send-pack.c:174
-msgid "use thin pack"
+#: builtin/describe.c:603
+msgid "No names found, cannot describe anything."
msgstr ""
-#: builtin/push.c:540 builtin/push.c:541 builtin/send-pack.c:160
-#: builtin/send-pack.c:161
-msgid "receive pack program"
+#: builtin/describe.c:654
+msgid "--dirty is incompatible with commit-ishes"
msgstr ""
-#: builtin/push.c:542
-msgid "set upstream for git pull/status"
+#: builtin/describe.c:656
+msgid "--broken is incompatible with commit-ishes"
msgstr ""
-#: builtin/push.c:545
-msgid "prune locally removed refs"
+#: builtin/diff.c:84
+#, c-format
+msgid "'%s': not a regular file or symlink"
msgstr ""
-#: builtin/push.c:547
-msgid "bypass pre-push hook"
+#: builtin/diff.c:235
+#, c-format
+msgid "invalid option: %s"
msgstr ""
-#: builtin/push.c:548
-msgid "push missing but relevant tags"
+#: builtin/diff.c:350
+msgid "Not a git repository"
msgstr ""
-#: builtin/push.c:551 builtin/send-pack.c:168
-msgid "GPG sign the push"
+#: builtin/diff.c:394
+#, c-format
+msgid "invalid object '%s' given."
msgstr ""
-#: builtin/push.c:553 builtin/send-pack.c:175
-msgid "request atomic transaction on remote side"
+#: builtin/diff.c:403
+#, c-format
+msgid "more than two blobs given: '%s'"
msgstr ""
-#: builtin/push.c:554 builtin/send-pack.c:171
-msgid "server-specific"
+#: builtin/diff.c:408
+#, c-format
+msgid "unhandled object '%s' given."
msgstr ""
-#: builtin/push.c:554 builtin/send-pack.c:172
-msgid "option to transmit"
+#: builtin/difftool.c:30
+msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
msgstr ""
-#: builtin/push.c:568
-msgid "--delete is incompatible with --all, --mirror and --tags"
+#: builtin/difftool.c:253
+#, c-format
+msgid "failed: %d"
msgstr ""
-#: builtin/push.c:570
-msgid "--delete doesn't make sense without any refs"
+#: builtin/difftool.c:295
+#, c-format
+msgid "could not read symlink %s"
msgstr ""
-#: builtin/push.c:589
-msgid "push options must not have new line characters"
+#: builtin/difftool.c:297
+#, c-format
+msgid "could not read symlink file %s"
msgstr ""
-#: builtin/read-tree.c:40
+#: builtin/difftool.c:305
+#, c-format
+msgid "could not read object %s for symlink %s"
+msgstr ""
+
+#: builtin/difftool.c:406
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>]])"
+"combined diff formats('-c' and '--cc') are not supported in\n"
+"directory diff mode('-d' and '--dir-diff')."
msgstr ""
-#: builtin/read-tree.c:121
-msgid "write resulting index to <file>"
+#: builtin/difftool.c:626
+#, c-format
+msgid "both files modified: '%s' and '%s'."
msgstr ""
-#: builtin/read-tree.c:124
-msgid "only empty the index"
+#: builtin/difftool.c:628
+msgid "working tree file has been left."
msgstr ""
-#: builtin/read-tree.c:126
-msgid "Merging"
+#: builtin/difftool.c:639
+#, c-format
+msgid "temporary files exist in '%s'."
msgstr ""
-#: builtin/read-tree.c:128
-msgid "perform a merge in addition to a read"
+#: builtin/difftool.c:640
+msgid "you may want to cleanup or recover these."
msgstr ""
-#: builtin/read-tree.c:130
-msgid "3-way merge if no file level merging required"
+#: builtin/difftool.c:689
+msgid "use `diff.guitool` instead of `diff.tool`"
msgstr ""
-#: builtin/read-tree.c:132
-msgid "3-way merge in presence of adds and removes"
+#: builtin/difftool.c:691
+msgid "perform a full-directory diff"
msgstr ""
-#: builtin/read-tree.c:134
-msgid "same as -m, but discard unmerged entries"
+#: builtin/difftool.c:693
+msgid "do not prompt before launching a diff tool"
msgstr ""
-#: builtin/read-tree.c:135
-msgid "<subdirectory>/"
+#: builtin/difftool.c:698
+msgid "use symlinks in dir-diff mode"
msgstr ""
-#: builtin/read-tree.c:136
-msgid "read the tree into the index under <subdirectory>/"
+#: builtin/difftool.c:699
+msgid "tool"
msgstr ""
-#: builtin/read-tree.c:139
-msgid "update working tree with merge result"
+#: builtin/difftool.c:700
+msgid "use the specified diff tool"
msgstr ""
-#: builtin/read-tree.c:141
-msgid "gitignore"
+#: builtin/difftool.c:702
+msgid "print a list of diff tools that may be used with `--tool`"
msgstr ""
-#: builtin/read-tree.c:142
-msgid "allow explicitly ignored files to be overwritten"
+#: builtin/difftool.c:705
+msgid ""
+"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
+"code"
msgstr ""
-#: builtin/read-tree.c:145
-msgid "don't check the working tree after merging"
+#: builtin/difftool.c:708
+msgid "specify a custom command for viewing diffs"
msgstr ""
-#: builtin/read-tree.c:146
-msgid "don't update the index or the work tree"
+#: builtin/difftool.c:709
+msgid "passed to `diff`"
msgstr ""
-#: builtin/read-tree.c:148
-msgid "skip applying sparse checkout filter"
+#: builtin/difftool.c:724
+msgid "difftool requires worktree or --no-index"
msgstr ""
-#: builtin/read-tree.c:150
-msgid "debug unpack-trees"
+#: builtin/difftool.c:731
+msgid "--dir-diff is incompatible with --no-index"
msgstr ""
-#: builtin/rebase--helper.c:8
-msgid "git rebase--helper [<options>]"
+#: builtin/difftool.c:734
+msgid "--gui, --tool and --extcmd are mutually exclusive"
msgstr ""
-#: builtin/rebase--helper.c:20
-msgid "continue rebase"
+#: builtin/difftool.c:742
+msgid "no <tool> given for --tool=<tool>"
msgstr ""
-#: builtin/rebase--helper.c:22
-msgid "abort rebase"
+#: builtin/difftool.c:749
+msgid "no <cmd> given for --extcmd=<cmd>"
msgstr ""
-#: builtin/receive-pack.c:28
-msgid "git receive-pack <git-dir>"
+#: builtin/fast-export.c:29
+msgid "git fast-export [rev-list-opts]"
msgstr ""
-#: builtin/receive-pack.c:838
-msgid ""
+#: builtin/fast-export.c:1084
+msgid "show progress after <n> objects"
+msgstr ""
+
+#: builtin/fast-export.c:1086
+msgid "select handling of signed tags"
+msgstr ""
+
+#: builtin/fast-export.c:1089
+msgid "select handling of tags that tag filtered objects"
+msgstr ""
+
+#: builtin/fast-export.c:1092
+msgid "Dump marks to this file"
+msgstr ""
+
+#: builtin/fast-export.c:1094
+msgid "Import marks from this file"
+msgstr ""
+
+#: builtin/fast-export.c:1096
+msgid "Fake a tagger when tags lack one"
+msgstr ""
+
+#: builtin/fast-export.c:1098
+msgid "Output full tree for each commit"
+msgstr ""
+
+#: builtin/fast-export.c:1100
+msgid "Use the done feature to terminate the stream"
+msgstr ""
+
+#: builtin/fast-export.c:1101
+msgid "Skip output of blob data"
+msgstr ""
+
+#: builtin/fast-export.c:1102 builtin/log.c:1609
+msgid "refspec"
+msgstr ""
+
+#: builtin/fast-export.c:1103
+msgid "Apply refspec to exported refs"
+msgstr ""
+
+#: builtin/fast-export.c:1104
+msgid "anonymize output"
+msgstr ""
+
+#: builtin/fast-export.c:1106
+msgid "Reference parents which are not in fast-export stream by object id"
+msgstr ""
+
+#: builtin/fast-export.c:1108
+msgid "Show original object ids of blobs/commits"
+msgstr ""
+
+#: builtin/fetch.c:28
+msgid "git fetch [<options>] [<repository> [<refspec>...]]"
+msgstr ""
+
+#: builtin/fetch.c:29
+msgid "git fetch [<options>] <group>"
+msgstr ""
+
+#: builtin/fetch.c:30
+msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
+msgstr ""
+
+#: builtin/fetch.c:31
+msgid "git fetch --all [<options>]"
+msgstr ""
+
+#: builtin/fetch.c:115 builtin/pull.c:202
+msgid "fetch from all remotes"
+msgstr ""
+
+#: builtin/fetch.c:117 builtin/pull.c:205
+msgid "append to .git/FETCH_HEAD instead of overwriting"
+msgstr ""
+
+#: builtin/fetch.c:119 builtin/pull.c:208
+msgid "path to upload pack on remote end"
+msgstr ""
+
+#: builtin/fetch.c:120
+msgid "force overwrite of local reference"
+msgstr ""
+
+#: builtin/fetch.c:122
+msgid "fetch from multiple remotes"
+msgstr ""
+
+#: builtin/fetch.c:124 builtin/pull.c:212
+msgid "fetch all tags and associated objects"
+msgstr ""
+
+#: builtin/fetch.c:126
+msgid "do not fetch all tags (--no-tags)"
+msgstr ""
+
+#: builtin/fetch.c:128
+msgid "number of submodules fetched in parallel"
+msgstr ""
+
+#: builtin/fetch.c:130 builtin/pull.c:215
+msgid "prune remote-tracking branches no longer on remote"
+msgstr ""
+
+#: builtin/fetch.c:132
+msgid "prune local tags no longer on remote and clobber changed tags"
+msgstr ""
+
+#: builtin/fetch.c:133 builtin/fetch.c:156 builtin/pull.c:139
+msgid "on-demand"
+msgstr ""
+
+#: builtin/fetch.c:134
+msgid "control recursive fetching of submodules"
+msgstr ""
+
+#: builtin/fetch.c:138 builtin/pull.c:223
+msgid "keep downloaded pack"
+msgstr ""
+
+#: builtin/fetch.c:140
+msgid "allow updating of HEAD ref"
+msgstr ""
+
+#: builtin/fetch.c:143 builtin/fetch.c:149 builtin/pull.c:226
+msgid "deepen history of shallow clone"
+msgstr ""
+
+#: builtin/fetch.c:145
+msgid "deepen history of shallow repository based on time"
+msgstr ""
+
+#: builtin/fetch.c:151 builtin/pull.c:229
+msgid "convert to a complete repository"
+msgstr ""
+
+#: builtin/fetch.c:154
+msgid "prepend this to submodule path output"
+msgstr ""
+
+#: builtin/fetch.c:157
+msgid ""
+"default for recursive fetching of submodules (lower priority than config "
+"files)"
+msgstr ""
+
+#: builtin/fetch.c:161 builtin/pull.c:232
+msgid "accept refs that update .git/shallow"
+msgstr ""
+
+#: builtin/fetch.c:162 builtin/pull.c:234
+msgid "refmap"
+msgstr ""
+
+#: builtin/fetch.c:163 builtin/pull.c:235
+msgid "specify fetch refmap"
+msgstr ""
+
+#: builtin/fetch.c:170
+msgid "report that we have only objects reachable from this object"
+msgstr ""
+
+#: builtin/fetch.c:469
+msgid "Couldn't find remote ref HEAD"
+msgstr ""
+
+#: builtin/fetch.c:608
+#, c-format
+msgid "configuration fetch.output contains invalid value %s"
+msgstr ""
+
+#: builtin/fetch.c:705
+#, c-format
+msgid "object %s not found"
+msgstr ""
+
+#: builtin/fetch.c:709
+msgid "[up to date]"
+msgstr ""
+
+#: builtin/fetch.c:722 builtin/fetch.c:738 builtin/fetch.c:801
+msgid "[rejected]"
+msgstr ""
+
+#: builtin/fetch.c:723
+msgid "can't fetch in current branch"
+msgstr ""
+
+#: builtin/fetch.c:733
+msgid "[tag update]"
+msgstr ""
+
+#: builtin/fetch.c:734 builtin/fetch.c:771 builtin/fetch.c:784
+#: builtin/fetch.c:796
+msgid "unable to update local ref"
+msgstr ""
+
+#: builtin/fetch.c:738
+msgid "would clobber existing tag"
+msgstr ""
+
+#: builtin/fetch.c:760
+msgid "[new tag]"
+msgstr ""
+
+#: builtin/fetch.c:763
+msgid "[new branch]"
+msgstr ""
+
+#: builtin/fetch.c:766
+msgid "[new ref]"
+msgstr ""
+
+#: builtin/fetch.c:796
+msgid "forced update"
+msgstr ""
+
+#: builtin/fetch.c:801
+msgid "non-fast-forward"
+msgstr ""
+
+#: builtin/fetch.c:847
+#, c-format
+msgid "%s did not send all necessary objects\n"
+msgstr ""
+
+#: builtin/fetch.c:868
+#, c-format
+msgid "reject %s because shallow roots are not allowed to be updated"
+msgstr ""
+
+#: builtin/fetch.c:959 builtin/fetch.c:1081
+#, c-format
+msgid "From %.*s\n"
+msgstr ""
+
+#: builtin/fetch.c:970
+#, c-format
+msgid ""
+"some local refs could not be updated; try running\n"
+" 'git remote prune %s' to remove any old, conflicting branches"
+msgstr ""
+
+#: builtin/fetch.c:1051
+#, c-format
+msgid " (%s will become dangling)"
+msgstr ""
+
+#: builtin/fetch.c:1052
+#, c-format
+msgid " (%s has become dangling)"
+msgstr ""
+
+#: builtin/fetch.c:1084
+msgid "[deleted]"
+msgstr ""
+
+#: builtin/fetch.c:1085 builtin/remote.c:1036
+msgid "(none)"
+msgstr ""
+
+#: builtin/fetch.c:1108
+#, c-format
+msgid "Refusing to fetch into current branch %s of non-bare repository"
+msgstr ""
+
+#: builtin/fetch.c:1127
+#, c-format
+msgid "Option \"%s\" value \"%s\" is not valid for %s"
+msgstr ""
+
+#: builtin/fetch.c:1130
+#, c-format
+msgid "Option \"%s\" is ignored for %s\n"
+msgstr ""
+
+#: builtin/fetch.c:1434
+#, c-format
+msgid "Fetching %s\n"
+msgstr ""
+
+#: builtin/fetch.c:1436 builtin/remote.c:100
+#, c-format
+msgid "Could not fetch %s"
+msgstr ""
+
+#: builtin/fetch.c:1482
+msgid ""
+"--filter can only be used with the remote configured in extensions."
+"partialClone"
+msgstr ""
+
+#: builtin/fetch.c:1506
+msgid ""
+"No remote repository specified. Please, specify either a URL or a\n"
+"remote name from which new revisions should be fetched."
+msgstr ""
+
+#: builtin/fetch.c:1543
+msgid "You need to specify a tag name."
+msgstr ""
+
+#: builtin/fetch.c:1594
+msgid "Negative depth in --deepen is not supported"
+msgstr ""
+
+#: builtin/fetch.c:1596
+msgid "--deepen and --depth are mutually exclusive"
+msgstr ""
+
+#: builtin/fetch.c:1601
+msgid "--depth and --unshallow cannot be used together"
+msgstr ""
+
+#: builtin/fetch.c:1603
+msgid "--unshallow on a complete repository does not make sense"
+msgstr ""
+
+#: builtin/fetch.c:1619
+msgid "fetch --all does not take a repository argument"
+msgstr ""
+
+#: builtin/fetch.c:1621
+msgid "fetch --all does not make sense with refspecs"
+msgstr ""
+
+#: builtin/fetch.c:1630
+#, c-format
+msgid "No such remote or remote group: %s"
+msgstr ""
+
+#: builtin/fetch.c:1637
+msgid "Fetching a group and specifying refspecs does not make sense"
+msgstr ""
+
+#: builtin/fetch.c:1653
+msgid ""
+"--filter can only be used with the remote configured in extensions."
+"partialclone"
+msgstr ""
+
+#: builtin/fmt-merge-msg.c:18
+msgid ""
+"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
+msgstr ""
+
+#: builtin/fmt-merge-msg.c:672
+msgid "populate log with at most <n> entries from shortlog"
+msgstr ""
+
+#: builtin/fmt-merge-msg.c:675
+msgid "alias for --log (deprecated)"
+msgstr ""
+
+#: builtin/fmt-merge-msg.c:678
+msgid "text"
+msgstr ""
+
+#: builtin/fmt-merge-msg.c:679
+msgid "use <text> as start of message"
+msgstr ""
+
+#: builtin/fmt-merge-msg.c:680
+msgid "file to read from"
+msgstr ""
+
+#: builtin/for-each-ref.c:10
+msgid "git for-each-ref [<options>] [<pattern>]"
+msgstr ""
+
+#: builtin/for-each-ref.c:11
+msgid "git for-each-ref [--points-at <object>]"
+msgstr ""
+
+#: builtin/for-each-ref.c:12
+msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]"
+msgstr ""
+
+#: builtin/for-each-ref.c:13
+msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
+msgstr ""
+
+#: builtin/for-each-ref.c:28
+msgid "quote placeholders suitably for shells"
+msgstr ""
+
+#: builtin/for-each-ref.c:30
+msgid "quote placeholders suitably for perl"
+msgstr ""
+
+#: builtin/for-each-ref.c:32
+msgid "quote placeholders suitably for python"
+msgstr ""
+
+#: builtin/for-each-ref.c:34
+msgid "quote placeholders suitably for Tcl"
+msgstr ""
+
+#: builtin/for-each-ref.c:37
+msgid "show only <n> matched refs"
+msgstr ""
+
+#: builtin/for-each-ref.c:39 builtin/tag.c:433
+msgid "respect format colors"
+msgstr ""
+
+#: builtin/for-each-ref.c:42
+msgid "print only refs which points at the given object"
+msgstr ""
+
+#: builtin/for-each-ref.c:44
+msgid "print only refs that are merged"
+msgstr ""
+
+#: builtin/for-each-ref.c:45
+msgid "print only refs that are not merged"
+msgstr ""
+
+#: builtin/for-each-ref.c:46
+msgid "print only refs which contain the commit"
+msgstr ""
+
+#: 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 "error in %s %s: %s"
+msgstr ""
+
+#. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation>
+#: builtin/fsck.c:131
+#, c-format
+msgid "warning in %s %s: %s"
+msgstr ""
+
+#: builtin/fsck.c:157 builtin/fsck.c:159
+#, c-format
+msgid "broken link from %7s %s"
+msgstr ""
+
+#: builtin/fsck.c:168
+msgid "wrong object type in link"
+msgstr ""
+
+#: builtin/fsck.c:184
+#, c-format
+msgid ""
+"broken link from %7s %s\n"
+" to %7s %s"
+msgstr ""
+
+#: builtin/fsck.c:295
+#, c-format
+msgid "missing %s %s"
+msgstr ""
+
+#: builtin/fsck.c:321
+#, c-format
+msgid "unreachable %s %s"
+msgstr ""
+
+#: builtin/fsck.c:340
+#, c-format
+msgid "dangling %s %s"
+msgstr ""
+
+#: builtin/fsck.c:349
+msgid "could not create lost-found"
+msgstr ""
+
+#: builtin/fsck.c:360
+#, c-format
+msgid "could not finish '%s'"
+msgstr ""
+
+#: builtin/fsck.c:377
+#, c-format
+msgid "Checking %s"
+msgstr ""
+
+#: builtin/fsck.c:415
+#, c-format
+msgid "Checking connectivity (%d objects)"
+msgstr ""
+
+#: builtin/fsck.c:434
+#, c-format
+msgid "Checking %s %s"
+msgstr ""
+
+#: builtin/fsck.c:438
+msgid "broken links"
+msgstr ""
+
+#: builtin/fsck.c:447
+#, c-format
+msgid "root %s"
+msgstr ""
+
+#: builtin/fsck.c:455
+#, c-format
+msgid "tagged %s %s (%s) in %s"
+msgstr ""
+
+#: builtin/fsck.c:484
+#, c-format
+msgid "%s: object corrupt or missing"
+msgstr ""
+
+#: builtin/fsck.c:509
+#, c-format
+msgid "%s: invalid reflog entry %s"
+msgstr ""
+
+#: builtin/fsck.c:523
+#, c-format
+msgid "Checking reflog %s->%s"
+msgstr ""
+
+#: builtin/fsck.c:557
+#, c-format
+msgid "%s: invalid sha1 pointer %s"
+msgstr ""
+
+#: builtin/fsck.c:564
+#, c-format
+msgid "%s: not a commit"
+msgstr ""
+
+#: builtin/fsck.c:619
+msgid "notice: No default references"
+msgstr ""
+
+#: builtin/fsck.c:634
+#, c-format
+msgid "%s: object corrupt or missing: %s"
+msgstr ""
+
+#: builtin/fsck.c:647
+#, c-format
+msgid "%s: object could not be parsed: %s"
+msgstr ""
+
+#: builtin/fsck.c:667
+#, c-format
+msgid "bad sha1 file: %s"
+msgstr ""
+
+#: builtin/fsck.c:682
+msgid "Checking object directory"
+msgstr ""
+
+#: builtin/fsck.c:685
+msgid "Checking object directories"
+msgstr ""
+
+#: builtin/fsck.c:700
+#, c-format
+msgid "Checking %s link"
+msgstr ""
+
+#: builtin/fsck.c:705 builtin/index-pack.c:841
+#, c-format
+msgid "invalid %s"
+msgstr ""
+
+#: builtin/fsck.c:712
+#, c-format
+msgid "%s points to something strange (%s)"
+msgstr ""
+
+#: builtin/fsck.c:718
+#, c-format
+msgid "%s: detached HEAD points at nothing"
+msgstr ""
+
+#: builtin/fsck.c:722
+#, c-format
+msgid "notice: %s points to an unborn branch (%s)"
+msgstr ""
+
+#: builtin/fsck.c:734
+msgid "Checking cache tree"
+msgstr ""
+
+#: builtin/fsck.c:739
+#, c-format
+msgid "%s: invalid sha1 pointer in cache-tree"
+msgstr ""
+
+#: builtin/fsck.c:750
+msgid "non-tree in cache-tree"
+msgstr ""
+
+#: builtin/fsck.c:781
+msgid "git fsck [<options>] [<object>...]"
+msgstr ""
+
+#: builtin/fsck.c:787
+msgid "show unreachable objects"
+msgstr ""
+
+#: builtin/fsck.c:788
+msgid "show dangling objects"
+msgstr ""
+
+#: builtin/fsck.c:789
+msgid "report tags"
+msgstr ""
+
+#: builtin/fsck.c:790
+msgid "report root nodes"
+msgstr ""
+
+#: builtin/fsck.c:791
+msgid "make index objects head nodes"
+msgstr ""
+
+#: builtin/fsck.c:792
+msgid "make reflogs head nodes (default)"
+msgstr ""
+
+#: builtin/fsck.c:793
+msgid "also consider packs and alternate objects"
+msgstr ""
+
+#: builtin/fsck.c:794
+msgid "check only connectivity"
+msgstr ""
+
+#: builtin/fsck.c:795
+msgid "enable more strict checking"
+msgstr ""
+
+#: builtin/fsck.c:797
+msgid "write dangling objects in .git/lost-found"
+msgstr ""
+
+#: builtin/fsck.c:798 builtin/prune.c:132
+msgid "show progress"
+msgstr ""
+
+#: builtin/fsck.c:799
+msgid "show verbose names for reachable objects"
+msgstr ""
+
+#: builtin/fsck.c:859 builtin/index-pack.c:224
+msgid "Checking objects"
+msgstr ""
+
+#: builtin/fsck.c:887
+#, c-format
+msgid "%s: object missing"
+msgstr ""
+
+#: builtin/fsck.c:899
+#, c-format
+msgid "invalid parameter: expected sha1, got '%s'"
+msgstr ""
+
+#: builtin/gc.c:34
+msgid "git gc [<options>]"
+msgstr ""
+
+#: builtin/gc.c:90
+#, c-format
+msgid "Failed to fstat %s: %s"
+msgstr ""
+
+#: builtin/gc.c:126
+#, c-format
+msgid "failed to parse '%s' value '%s'"
+msgstr ""
+
+#: builtin/gc.c:476 builtin/init-db.c:55
+#, c-format
+msgid "cannot stat '%s'"
+msgstr ""
+
+#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:519
+#, c-format
+msgid "cannot read '%s'"
+msgstr ""
+
+#: builtin/gc.c:492
+#, c-format
+msgid ""
+"The last gc run reported the following. Please correct the root cause\n"
+"and remove %s.\n"
+"Automatic cleanup will not be performed until the file is removed.\n"
+"\n"
+"%s"
+msgstr ""
+
+#: builtin/gc.c:540
+msgid "prune unreferenced objects"
+msgstr ""
+
+#: builtin/gc.c:542
+msgid "be more thorough (increased runtime)"
+msgstr ""
+
+#: builtin/gc.c:543
+msgid "enable auto-gc mode"
+msgstr ""
+
+#: builtin/gc.c:546
+msgid "force running gc even if there may be another gc running"
+msgstr ""
+
+#: builtin/gc.c:549
+msgid "repack all other packs except the largest pack"
+msgstr ""
+
+#: builtin/gc.c:566
+#, c-format
+msgid "failed to parse gc.logexpiry value %s"
+msgstr ""
+
+#: builtin/gc.c:577
+#, c-format
+msgid "failed to parse prune expiry value %s"
+msgstr ""
+
+#: builtin/gc.c:597
+#, c-format
+msgid "Auto packing the repository in background for optimum performance.\n"
+msgstr ""
+
+#: builtin/gc.c:599
+#, c-format
+msgid "Auto packing the repository for optimum performance.\n"
+msgstr ""
+
+#: builtin/gc.c:600
+#, c-format
+msgid "See \"git help gc\" for manual housekeeping.\n"
+msgstr ""
+
+#: builtin/gc.c:640
+#, c-format
+msgid ""
+"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
+msgstr ""
+
+#: builtin/gc.c:693
+msgid ""
+"There are too many unreachable loose objects; run 'git prune' to remove them."
+msgstr ""
+
+#: builtin/grep.c:29
+msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
+msgstr ""
+
+#: builtin/grep.c:225
+#, c-format
+msgid "grep: failed to create thread: %s"
+msgstr ""
+
+#: builtin/grep.c:279
+#, c-format
+msgid "invalid number of threads specified (%d) for %s"
+msgstr ""
+
+#. TRANSLATORS: %s is the configuration
+#. variable for tweaking threads, currently
+#. grep.threads
+#.
+#: builtin/grep.c:287 builtin/index-pack.c:1514 builtin/index-pack.c:1705
+#: builtin/pack-objects.c:2720
+#, c-format
+msgid "no threads support, ignoring %s"
+msgstr ""
+
+#: builtin/grep.c:466 builtin/grep.c:590 builtin/grep.c:631
+#, c-format
+msgid "unable to read tree (%s)"
+msgstr ""
+
+#: builtin/grep.c:646
+#, c-format
+msgid "unable to grep from object of type %s"
+msgstr ""
+
+#: builtin/grep.c:712
+#, c-format
+msgid "switch `%c' expects a numerical value"
+msgstr ""
+
+#: builtin/grep.c:811
+msgid "search in index instead of in the work tree"
+msgstr ""
+
+#: builtin/grep.c:813
+msgid "find in contents not managed by git"
+msgstr ""
+
+#: builtin/grep.c:815
+msgid "search in both tracked and untracked files"
+msgstr ""
+
+#: builtin/grep.c:817
+msgid "ignore files specified via '.gitignore'"
+msgstr ""
+
+#: builtin/grep.c:819
+msgid "recursively search in each submodule"
+msgstr ""
+
+#: builtin/grep.c:822
+msgid "show non-matching lines"
+msgstr ""
+
+#: builtin/grep.c:824
+msgid "case insensitive matching"
+msgstr ""
+
+#: builtin/grep.c:826
+msgid "match patterns only at word boundaries"
+msgstr ""
+
+#: builtin/grep.c:828
+msgid "process binary files as text"
+msgstr ""
+
+#: builtin/grep.c:830
+msgid "don't match patterns in binary files"
+msgstr ""
+
+#: builtin/grep.c:833
+msgid "process binary files with textconv filters"
+msgstr ""
+
+#: builtin/grep.c:835
+msgid "search in subdirectories (default)"
+msgstr ""
+
+#: builtin/grep.c:837
+msgid "descend at most <depth> levels"
+msgstr ""
+
+#: builtin/grep.c:841
+msgid "use extended POSIX regular expressions"
+msgstr ""
+
+#: builtin/grep.c:844
+msgid "use basic POSIX regular expressions (default)"
+msgstr ""
+
+#: builtin/grep.c:847
+msgid "interpret patterns as fixed strings"
+msgstr ""
+
+#: builtin/grep.c:850
+msgid "use Perl-compatible regular expressions"
+msgstr ""
+
+#: builtin/grep.c:853
+msgid "show line numbers"
+msgstr ""
+
+#: builtin/grep.c:854
+msgid "show column number of first match"
+msgstr ""
+
+#: builtin/grep.c:855
+msgid "don't show filenames"
+msgstr ""
+
+#: builtin/grep.c:856
+msgid "show filenames"
+msgstr ""
+
+#: builtin/grep.c:858
+msgid "show filenames relative to top directory"
+msgstr ""
+
+#: builtin/grep.c:860
+msgid "show only filenames instead of matching lines"
+msgstr ""
+
+#: builtin/grep.c:862
+msgid "synonym for --files-with-matches"
+msgstr ""
+
+#: builtin/grep.c:865
+msgid "show only the names of files without match"
+msgstr ""
+
+#: builtin/grep.c:867
+msgid "print NUL after filenames"
+msgstr ""
+
+#: builtin/grep.c:870
+msgid "show only matching parts of a line"
+msgstr ""
+
+#: builtin/grep.c:872
+msgid "show the number of matches instead of matching lines"
+msgstr ""
+
+#: builtin/grep.c:873
+msgid "highlight matches"
+msgstr ""
+
+#: builtin/grep.c:875
+msgid "print empty line between matches from different files"
+msgstr ""
+
+#: builtin/grep.c:877
+msgid "show filename only once above matches from same file"
+msgstr ""
+
+#: builtin/grep.c:880
+msgid "show <n> context lines before and after matches"
+msgstr ""
+
+#: builtin/grep.c:883
+msgid "show <n> context lines before matches"
+msgstr ""
+
+#: builtin/grep.c:885
+msgid "show <n> context lines after matches"
+msgstr ""
+
+#: builtin/grep.c:887
+msgid "use <n> worker threads"
+msgstr ""
+
+#: builtin/grep.c:888
+msgid "shortcut for -C NUM"
+msgstr ""
+
+#: builtin/grep.c:891
+msgid "show a line with the function name before matches"
+msgstr ""
+
+#: builtin/grep.c:893
+msgid "show the surrounding function"
+msgstr ""
+
+#: builtin/grep.c:896
+msgid "read patterns from file"
+msgstr ""
+
+#: builtin/grep.c:898
+msgid "match <pattern>"
+msgstr ""
+
+#: builtin/grep.c:900
+msgid "combine patterns specified with -e"
+msgstr ""
+
+#: builtin/grep.c:912
+msgid "indicate hit with exit status without output"
+msgstr ""
+
+#: builtin/grep.c:914
+msgid "show only matches from files that match all patterns"
+msgstr ""
+
+#: builtin/grep.c:916
+msgid "show parse tree for grep expression"
+msgstr ""
+
+#: builtin/grep.c:920
+msgid "pager"
+msgstr ""
+
+#: builtin/grep.c:920
+msgid "show matching files in the pager"
+msgstr ""
+
+#: builtin/grep.c:924
+msgid "allow calling of grep(1) (ignored by this build)"
+msgstr ""
+
+#: builtin/grep.c:988
+msgid "no pattern given"
+msgstr ""
+
+#: builtin/grep.c:1024
+msgid "--no-index or --untracked cannot be used with revs"
+msgstr ""
+
+#: builtin/grep.c:1032
+#, c-format
+msgid "unable to resolve revision: %s"
+msgstr ""
+
+#: builtin/grep.c:1063
+msgid "invalid option combination, ignoring --threads"
+msgstr ""
+
+#: builtin/grep.c:1066 builtin/pack-objects.c:3403
+msgid "no threads support, ignoring --threads"
+msgstr ""
+
+#: builtin/grep.c:1069 builtin/index-pack.c:1511 builtin/pack-objects.c:2717
+#, c-format
+msgid "invalid number of threads specified (%d)"
+msgstr ""
+
+#: builtin/grep.c:1092
+msgid "--open-files-in-pager only works on the worktree"
+msgstr ""
+
+#: builtin/grep.c:1115
+msgid "option not supported with --recurse-submodules"
+msgstr ""
+
+#: builtin/grep.c:1121
+msgid "--cached or --untracked cannot be used with --no-index"
+msgstr ""
+
+#: builtin/grep.c:1127
+msgid "--[no-]exclude-standard cannot be used for tracked contents"
+msgstr ""
+
+#: builtin/grep.c:1135
+msgid "both --cached and trees are given"
+msgstr ""
+
+#: builtin/hash-object.c:85
+msgid ""
+"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
+"[--] <file>..."
+msgstr ""
+
+#: builtin/hash-object.c:86
+msgid "git hash-object --stdin-paths"
+msgstr ""
+
+#: builtin/hash-object.c:98
+msgid "type"
+msgstr ""
+
+#: builtin/hash-object.c:98
+msgid "object type"
+msgstr ""
+
+#: builtin/hash-object.c:99
+msgid "write the object into the object database"
+msgstr ""
+
+#: builtin/hash-object.c:101
+msgid "read the object from stdin"
+msgstr ""
+
+#: builtin/hash-object.c:103
+msgid "store file as is without filters"
+msgstr ""
+
+#: builtin/hash-object.c:104
+msgid ""
+"just hash any random garbage to create corrupt objects for debugging Git"
+msgstr ""
+
+#: builtin/hash-object.c:105
+msgid "process file as it were from this path"
+msgstr ""
+
+#: builtin/help.c:46
+msgid "print all available commands"
+msgstr ""
+
+#: builtin/help.c:47
+msgid "exclude guides"
+msgstr ""
+
+#: builtin/help.c:48
+msgid "print list of useful guides"
+msgstr ""
+
+#: builtin/help.c:49
+msgid "print all configuration variable names"
+msgstr ""
+
+#: builtin/help.c:51
+msgid "show man page"
+msgstr ""
+
+#: builtin/help.c:52
+msgid "show manual in web browser"
+msgstr ""
+
+#: builtin/help.c:54
+msgid "show info page"
+msgstr ""
+
+#: builtin/help.c:56
+msgid "print command description"
+msgstr ""
+
+#: builtin/help.c:61
+msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
+msgstr ""
+
+#: builtin/help.c:77
+#, c-format
+msgid "unrecognized help format '%s'"
+msgstr ""
+
+#: builtin/help.c:104
+msgid "Failed to start emacsclient."
+msgstr ""
+
+#: builtin/help.c:117
+msgid "Failed to parse emacsclient version."
+msgstr ""
+
+#: builtin/help.c:125
+#, c-format
+msgid "emacsclient version '%d' too old (< 22)."
+msgstr ""
+
+#: 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/help.c:221
+#, c-format
+msgid ""
+"'%s': path for unsupported man viewer.\n"
+"Please consider using 'man.<tool>.cmd' instead."
+msgstr ""
+
+#: builtin/help.c:233
+#, c-format
+msgid ""
+"'%s': cmd for supported man viewer.\n"
+"Please consider using 'man.<tool>.path' instead."
+msgstr ""
+
+#: builtin/help.c:350
+#, c-format
+msgid "'%s': unknown man viewer."
+msgstr ""
+
+#: builtin/help.c:367
+msgid "no man viewer handled the request"
+msgstr ""
+
+#: builtin/help.c:375
+msgid "no info viewer handled the request"
+msgstr ""
+
+#: builtin/help.c:434 builtin/help.c:445 git.c:335
+#, c-format
+msgid "'%s' is aliased to '%s'"
+msgstr ""
+
+#: builtin/help.c:448 git.c:364
+#, c-format
+msgid "bad alias.%s string: %s"
+msgstr ""
+
+#: builtin/help.c:477 builtin/help.c:507
+#, c-format
+msgid "usage: %s%s"
+msgstr ""
+
+#: builtin/help.c:491
+msgid "'git help config' for more information"
+msgstr ""
+
+#: builtin/index-pack.c:184
+#, c-format
+msgid "object type mismatch at %s"
+msgstr ""
+
+#: builtin/index-pack.c:204
+#, c-format
+msgid "did not receive expected object %s"
+msgstr ""
+
+#: builtin/index-pack.c:207
+#, c-format
+msgid "object %s: expected type %s, found %s"
+msgstr ""
+
+#: builtin/index-pack.c:257
+#, c-format
+msgid "cannot fill %d byte"
+msgid_plural "cannot fill %d bytes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/index-pack.c:267
+msgid "early EOF"
+msgstr ""
+
+#: builtin/index-pack.c:268
+msgid "read error on input"
+msgstr ""
+
+#: builtin/index-pack.c:280
+msgid "used more bytes than were available"
+msgstr ""
+
+#: builtin/index-pack.c:287 builtin/pack-objects.c:600
+msgid "pack too large for current definition of off_t"
+msgstr ""
+
+#: builtin/index-pack.c:290 builtin/unpack-objects.c:94
+msgid "pack exceeds maximum allowed size"
+msgstr ""
+
+#: builtin/index-pack.c:305 builtin/repack.c:250
+#, c-format
+msgid "unable to create '%s'"
+msgstr ""
+
+#: builtin/index-pack.c:311
+#, c-format
+msgid "cannot open packfile '%s'"
+msgstr ""
+
+#: builtin/index-pack.c:325
+msgid "pack signature mismatch"
+msgstr ""
+
+#: builtin/index-pack.c:327
+#, c-format
+msgid "pack version %<PRIu32> unsupported"
+msgstr ""
+
+#: builtin/index-pack.c:345
+#, c-format
+msgid "pack has bad object at offset %<PRIuMAX>: %s"
+msgstr ""
+
+#: builtin/index-pack.c:465
+#, c-format
+msgid "inflate returned %d"
+msgstr ""
+
+#: builtin/index-pack.c:514
+msgid "offset value overflow for delta base object"
+msgstr ""
+
+#: builtin/index-pack.c:522
+msgid "delta base offset is out of bound"
+msgstr ""
+
+#: builtin/index-pack.c:530
+#, c-format
+msgid "unknown object type %d"
+msgstr ""
+
+#: builtin/index-pack.c:561
+msgid "cannot pread pack file"
+msgstr ""
+
+#: builtin/index-pack.c:563
+#, 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:589
+msgid "serious inflate inconsistency"
+msgstr ""
+
+#: builtin/index-pack.c:734 builtin/index-pack.c:740 builtin/index-pack.c:763
+#: builtin/index-pack.c:802 builtin/index-pack.c:811
+#, c-format
+msgid "SHA1 COLLISION FOUND WITH %s !"
+msgstr ""
+
+#: builtin/index-pack.c:737 builtin/pack-objects.c:153
+#: builtin/pack-objects.c:213 builtin/pack-objects.c:307
+#, c-format
+msgid "unable to read %s"
+msgstr ""
+
+#: builtin/index-pack.c:800
+#, c-format
+msgid "cannot read existing object info %s"
+msgstr ""
+
+#: builtin/index-pack.c:808
+#, c-format
+msgid "cannot read existing object %s"
+msgstr ""
+
+#: builtin/index-pack.c:822
+#, c-format
+msgid "invalid blob object %s"
+msgstr ""
+
+#: builtin/index-pack.c:825 builtin/index-pack.c:844
+msgid "fsck error in packed object"
+msgstr ""
+
+#: builtin/index-pack.c:846
+#, c-format
+msgid "Not all child objects of %s are reachable"
+msgstr ""
+
+#: builtin/index-pack.c:918 builtin/index-pack.c:949
+msgid "failed to apply delta"
+msgstr ""
+
+#: builtin/index-pack.c:1117
+msgid "Receiving objects"
+msgstr ""
+
+#: builtin/index-pack.c:1117
+msgid "Indexing objects"
+msgstr ""
+
+#: builtin/index-pack.c:1151
+msgid "pack is corrupted (SHA1 mismatch)"
+msgstr ""
+
+#: builtin/index-pack.c:1156
+msgid "cannot fstat packfile"
+msgstr ""
+
+#: builtin/index-pack.c:1159
+msgid "pack has junk at the end"
+msgstr ""
+
+#: builtin/index-pack.c:1171
+msgid "confusion beyond insanity in parse_pack_objects()"
+msgstr ""
+
+#: builtin/index-pack.c:1194
+msgid "Resolving deltas"
+msgstr ""
+
+#: builtin/index-pack.c:1204 builtin/pack-objects.c:2489
+#, c-format
+msgid "unable to create thread: %s"
+msgstr ""
+
+#: builtin/index-pack.c:1245
+msgid "confusion beyond insanity"
+msgstr ""
+
+#: builtin/index-pack.c:1251
+#, c-format
+msgid "completed with %d local object"
+msgid_plural "completed with %d local objects"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/index-pack.c:1263
+#, c-format
+msgid "Unexpected tail checksum for %s (disk corruption?)"
+msgstr ""
+
+#: builtin/index-pack.c:1267
+#, c-format
+msgid "pack has %d unresolved delta"
+msgid_plural "pack has %d unresolved deltas"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/index-pack.c:1291
+#, c-format
+msgid "unable to deflate appended object (%d)"
+msgstr ""
+
+#: builtin/index-pack.c:1368
+#, c-format
+msgid "local object %s is corrupt"
+msgstr ""
+
+#: builtin/index-pack.c:1382
+#, c-format
+msgid "packfile name '%s' does not end with '.pack'"
+msgstr ""
+
+#: builtin/index-pack.c:1407
+#, c-format
+msgid "cannot write %s file '%s'"
+msgstr ""
+
+#: builtin/index-pack.c:1415
+#, c-format
+msgid "cannot close written %s file '%s'"
+msgstr ""
+
+#: builtin/index-pack.c:1439
+msgid "error while closing pack file"
+msgstr ""
+
+#: builtin/index-pack.c:1453
+msgid "cannot store pack file"
+msgstr ""
+
+#: builtin/index-pack.c:1461
+msgid "cannot store index file"
+msgstr ""
+
+#: builtin/index-pack.c:1505 builtin/pack-objects.c:2728
+#, c-format
+msgid "bad pack.indexversion=%<PRIu32>"
+msgstr ""
+
+#: builtin/index-pack.c:1573
+#, c-format
+msgid "Cannot open existing pack file '%s'"
+msgstr ""
+
+#: builtin/index-pack.c:1575
+#, c-format
+msgid "Cannot open existing pack idx file for '%s'"
+msgstr ""
+
+#: builtin/index-pack.c:1623
+#, c-format
+msgid "non delta: %d object"
+msgid_plural "non delta: %d objects"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/index-pack.c:1630
+#, c-format
+msgid "chain length = %d: %lu object"
+msgid_plural "chain length = %d: %lu objects"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/index-pack.c:1667
+msgid "Cannot come back to cwd"
+msgstr ""
+
+#: builtin/index-pack.c:1716 builtin/index-pack.c:1719
+#: builtin/index-pack.c:1735 builtin/index-pack.c:1739
+#, c-format
+msgid "bad %s"
+msgstr ""
+
+#: builtin/index-pack.c:1755
+msgid "--fix-thin cannot be used without --stdin"
+msgstr ""
+
+#: builtin/index-pack.c:1757
+msgid "--stdin requires a git repository"
+msgstr ""
+
+#: builtin/index-pack.c:1763
+msgid "--verify with no packfile name given"
+msgstr ""
+
+#: builtin/index-pack.c:1811 builtin/unpack-objects.c:580
+msgid "fsck error in pack objects"
+msgstr ""
+
+#: builtin/init-db.c:61
+#, c-format
+msgid "cannot stat template '%s'"
+msgstr ""
+
+#: builtin/init-db.c:66
+#, c-format
+msgid "cannot opendir '%s'"
+msgstr ""
+
+#: builtin/init-db.c:78
+#, c-format
+msgid "cannot readlink '%s'"
+msgstr ""
+
+#: builtin/init-db.c:80
+#, c-format
+msgid "cannot symlink '%s' '%s'"
+msgstr ""
+
+#: builtin/init-db.c:86
+#, c-format
+msgid "cannot copy '%s' to '%s'"
+msgstr ""
+
+#: builtin/init-db.c:90
+#, c-format
+msgid "ignoring template %s"
+msgstr ""
+
+#: builtin/init-db.c:121
+#, c-format
+msgid "templates not found in %s"
+msgstr ""
+
+#: builtin/init-db.c:136
+#, c-format
+msgid "not copying templates from '%s': %s"
+msgstr ""
+
+#: builtin/init-db.c:334
+#, c-format
+msgid "unable to handle file type %d"
+msgstr ""
+
+#: builtin/init-db.c:337
+#, c-format
+msgid "unable to move %s to %s"
+msgstr ""
+
+#: builtin/init-db.c:354 builtin/init-db.c:357
+#, c-format
+msgid "%s already exists"
+msgstr ""
+
+#: builtin/init-db.c:413
+#, c-format
+msgid "Reinitialized existing shared Git repository in %s%s\n"
+msgstr ""
+
+#: builtin/init-db.c:414
+#, c-format
+msgid "Reinitialized existing Git repository in %s%s\n"
+msgstr ""
+
+#: builtin/init-db.c:418
+#, c-format
+msgid "Initialized empty shared Git repository in %s%s\n"
+msgstr ""
+
+#: builtin/init-db.c:419
+#, c-format
+msgid "Initialized empty Git repository in %s%s\n"
+msgstr ""
+
+#: builtin/init-db.c:468
+msgid ""
+"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
+"shared[=<permissions>]] [<directory>]"
+msgstr ""
+
+#: builtin/init-db.c:491
+msgid "permissions"
+msgstr ""
+
+#: builtin/init-db.c:492
+msgid "specify that the git repository is to be shared amongst several users"
+msgstr ""
+
+#: builtin/init-db.c:526 builtin/init-db.c:531
+#, c-format
+msgid "cannot mkdir %s"
+msgstr ""
+
+#: builtin/init-db.c:535
+#, c-format
+msgid "cannot chdir to %s"
+msgstr ""
+
+#: builtin/init-db.c:556
+#, c-format
+msgid ""
+"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
+"dir=<directory>)"
+msgstr ""
+
+#: builtin/init-db.c:584
+#, c-format
+msgid "Cannot access work tree '%s'"
+msgstr ""
+
+#: builtin/interpret-trailers.c:15
+msgid ""
+"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
+"<token>[(=|:)<value>])...] [<file>...]"
+msgstr ""
+
+#: builtin/interpret-trailers.c:94
+msgid "edit files in place"
+msgstr ""
+
+#: builtin/interpret-trailers.c:95
+msgid "trim empty trailers"
+msgstr ""
+
+#: builtin/interpret-trailers.c:98
+msgid "where to place the new trailer"
+msgstr ""
+
+#: builtin/interpret-trailers.c:100
+msgid "action if trailer already exists"
+msgstr ""
+
+#: builtin/interpret-trailers.c:102
+msgid "action if trailer is missing"
+msgstr ""
+
+#: builtin/interpret-trailers.c:104
+msgid "output only the trailers"
+msgstr ""
+
+#: builtin/interpret-trailers.c:105
+msgid "do not apply config rules"
+msgstr ""
+
+#: builtin/interpret-trailers.c:106
+msgid "join whitespace-continued values"
+msgstr ""
+
+#: builtin/interpret-trailers.c:107
+msgid "set parsing options"
+msgstr ""
+
+#: builtin/interpret-trailers.c:109
+msgid "do not treat --- specially"
+msgstr ""
+
+#: builtin/interpret-trailers.c:110
+msgid "trailer"
+msgstr ""
+
+#: builtin/interpret-trailers.c:111
+msgid "trailer(s) to add"
+msgstr ""
+
+#: builtin/interpret-trailers.c:120
+msgid "--trailer with --only-input does not make sense"
+msgstr ""
+
+#: builtin/interpret-trailers.c:130
+msgid "no input file given for in-place editing"
+msgstr ""
+
+#: builtin/log.c:55
+msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
+msgstr ""
+
+#: builtin/log.c:56
+msgid "git show [<options>] <object>..."
+msgstr ""
+
+#: builtin/log.c:104
+#, c-format
+msgid "invalid --decorate option: %s"
+msgstr ""
+
+#: builtin/log.c:168
+msgid "show source"
+msgstr ""
+
+#: builtin/log.c:169
+msgid "Use mail map file"
+msgstr ""
+
+#: builtin/log.c:171
+msgid "only decorate refs that match <pattern>"
+msgstr ""
+
+#: builtin/log.c:173
+msgid "do not decorate refs that match <pattern>"
+msgstr ""
+
+#: builtin/log.c:174
+msgid "decorate options"
+msgstr ""
+
+#: builtin/log.c:177
+msgid "Process line range n,m in file, counting from 1"
+msgstr ""
+
+#: builtin/log.c:275
+#, c-format
+msgid "Final output: %d %s\n"
+msgstr ""
+
+#: builtin/log.c:529
+#, c-format
+msgid "git show %s: bad file"
+msgstr ""
+
+#: builtin/log.c:544 builtin/log.c:638
+#, c-format
+msgid "could not read object %s"
+msgstr ""
+
+#: builtin/log.c:663
+#, c-format
+msgid "unknown type: %d"
+msgstr ""
+
+#: builtin/log.c:784
+msgid "format.headers without value"
+msgstr ""
+
+#: builtin/log.c:885
+msgid "name of output directory is too long"
+msgstr ""
+
+#: builtin/log.c:901
+#, c-format
+msgid "cannot open patch file %s"
+msgstr ""
+
+#: builtin/log.c:918
+msgid "need exactly one range"
+msgstr ""
+
+#: builtin/log.c:928
+msgid "not a range"
+msgstr ""
+
+#: builtin/log.c:1051
+msgid "cover letter needs email format"
+msgstr ""
+
+#: builtin/log.c:1057
+msgid "failed to create cover-letter file"
+msgstr ""
+
+#: builtin/log.c:1136
+#, c-format
+msgid "insane in-reply-to: %s"
+msgstr ""
+
+#: builtin/log.c:1163
+msgid "git format-patch [<options>] [<since> | <revision-range>]"
+msgstr ""
+
+#: builtin/log.c:1221
+msgid "two output directories?"
+msgstr ""
+
+#: builtin/log.c:1332 builtin/log.c:2076 builtin/log.c:2078 builtin/log.c:2090
+#, c-format
+msgid "unknown commit %s"
+msgstr ""
+
+#: builtin/log.c:1342 builtin/replace.c:58 builtin/replace.c:207
+#: builtin/replace.c:210
+#, c-format
+msgid "failed to resolve '%s' as a valid ref"
+msgstr ""
+
+#: builtin/log.c:1347
+msgid "could not find exact merge base"
+msgstr ""
+
+#: builtin/log.c:1351
+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/log.c:1371
+msgid "failed to find exact merge base"
+msgstr ""
+
+#: builtin/log.c:1382
+msgid "base commit should be the ancestor of revision list"
+msgstr ""
+
+#: builtin/log.c:1386
+msgid "base commit shouldn't be in revision list"
+msgstr ""
+
+#: builtin/log.c:1439
+msgid "cannot get patch id"
+msgstr ""
+
+#: builtin/log.c:1491
+msgid "failed to infer range-diff ranges"
+msgstr ""
+
+#: builtin/log.c:1536
+msgid "use [PATCH n/m] even with a single patch"
+msgstr ""
+
+#: builtin/log.c:1539
+msgid "use [PATCH] even with multiple patches"
+msgstr ""
+
+#: builtin/log.c:1543
+msgid "print patches to standard out"
+msgstr ""
+
+#: builtin/log.c:1545
+msgid "generate a cover letter"
+msgstr ""
+
+#: builtin/log.c:1547
+msgid "use simple number sequence for output file names"
+msgstr ""
+
+#: builtin/log.c:1548
+msgid "sfx"
+msgstr ""
+
+#: builtin/log.c:1549
+msgid "use <sfx> instead of '.patch'"
+msgstr ""
+
+#: builtin/log.c:1551
+msgid "start numbering patches at <n> instead of 1"
+msgstr ""
+
+#: builtin/log.c:1553
+msgid "mark the series as Nth re-roll"
+msgstr ""
+
+#: builtin/log.c:1555
+msgid "Use [RFC PATCH] instead of [PATCH]"
+msgstr ""
+
+#: builtin/log.c:1558
+msgid "Use [<prefix>] instead of [PATCH]"
+msgstr ""
+
+#: builtin/log.c:1561
+msgid "store resulting files in <dir>"
+msgstr ""
+
+#: builtin/log.c:1564
+msgid "don't strip/add [PATCH]"
+msgstr ""
+
+#: builtin/log.c:1567
+msgid "don't output binary diffs"
+msgstr ""
+
+#: builtin/log.c:1569
+msgid "output all-zero hash in From header"
+msgstr ""
+
+#: builtin/log.c:1571
+msgid "don't include a patch matching a commit upstream"
+msgstr ""
+
+#: builtin/log.c:1573
+msgid "show patch format instead of default (patch + stat)"
+msgstr ""
+
+#: builtin/log.c:1575
+msgid "Messaging"
+msgstr ""
+
+#: builtin/log.c:1576
+msgid "header"
+msgstr ""
+
+#: builtin/log.c:1577
+msgid "add email header"
+msgstr ""
+
+#: builtin/log.c:1578 builtin/log.c:1580
+msgid "email"
+msgstr ""
+
+#: builtin/log.c:1578
+msgid "add To: header"
+msgstr ""
+
+#: builtin/log.c:1580
+msgid "add Cc: header"
+msgstr ""
+
+#: builtin/log.c:1582
+msgid "ident"
+msgstr ""
+
+#: builtin/log.c:1583
+msgid "set From address to <ident> (or committer ident if absent)"
+msgstr ""
+
+#: builtin/log.c:1585
+msgid "message-id"
+msgstr ""
+
+#: builtin/log.c:1586
+msgid "make first mail a reply to <message-id>"
+msgstr ""
+
+#: builtin/log.c:1587 builtin/log.c:1590
+msgid "boundary"
+msgstr ""
+
+#: builtin/log.c:1588
+msgid "attach the patch"
+msgstr ""
+
+#: builtin/log.c:1591
+msgid "inline the patch"
+msgstr ""
+
+#: builtin/log.c:1595
+msgid "enable message threading, styles: shallow, deep"
+msgstr ""
+
+#: builtin/log.c:1597
+msgid "signature"
+msgstr ""
+
+#: builtin/log.c:1598
+msgid "add a signature"
+msgstr ""
+
+#: builtin/log.c:1599
+msgid "base-commit"
+msgstr ""
+
+#: builtin/log.c:1600
+msgid "add prerequisite tree info to the patch series"
+msgstr ""
+
+#: builtin/log.c:1602
+msgid "add a signature from a file"
+msgstr ""
+
+#: builtin/log.c:1603
+msgid "don't print the patch filenames"
+msgstr ""
+
+#: builtin/log.c:1605
+msgid "show progress while generating patches"
+msgstr ""
+
+#: builtin/log.c:1606
+msgid "rev"
+msgstr ""
+
+#: builtin/log.c:1607
+msgid "show changes against <rev> in cover letter or single patch"
+msgstr ""
+
+#: builtin/log.c:1610
+msgid "show changes against <refspec> in cover letter or single patch"
+msgstr ""
+
+#: builtin/log.c:1612
+msgid "percentage by which creation is weighted"
+msgstr ""
+
+#: builtin/log.c:1687
+#, c-format
+msgid "invalid ident line: %s"
+msgstr ""
+
+#: builtin/log.c:1702
+msgid "-n and -k are mutually exclusive"
+msgstr ""
+
+#: builtin/log.c:1704
+msgid "--subject-prefix/--rfc and -k are mutually exclusive"
+msgstr ""
+
+#: builtin/log.c:1712
+msgid "--name-only does not make sense"
+msgstr ""
+
+#: builtin/log.c:1714
+msgid "--name-status does not make sense"
+msgstr ""
+
+#: builtin/log.c:1716
+msgid "--check does not make sense"
+msgstr ""
+
+#: builtin/log.c:1748
+msgid "standard output, or directory, which one?"
+msgstr ""
+
+#: builtin/log.c:1837
+msgid "--interdiff requires --cover-letter or single patch"
+msgstr ""
+
+#: builtin/log.c:1841
+msgid "Interdiff:"
+msgstr ""
+
+#: builtin/log.c:1842
+#, c-format
+msgid "Interdiff against v%d:"
+msgstr ""
+
+#: builtin/log.c:1848
+msgid "--creation-factor requires --range-diff"
+msgstr ""
+
+#: builtin/log.c:1852
+msgid "--range-diff requires --cover-letter or single patch"
+msgstr ""
+
+#: builtin/log.c:1860
+msgid "Range-diff:"
+msgstr ""
+
+#: builtin/log.c:1861
+#, c-format
+msgid "Range-diff against v%d:"
+msgstr ""
+
+#: builtin/log.c:1872
+#, c-format
+msgid "unable to read signature file '%s'"
+msgstr ""
+
+#: builtin/log.c:1908
+msgid "Generating patches"
+msgstr ""
+
+#: builtin/log.c:1952
+msgid "failed to create output files"
+msgstr ""
+
+#: builtin/log.c:2011
+msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
+msgstr ""
+
+#: builtin/log.c:2065
+#, c-format
+msgid ""
+"Could not find a tracked remote branch, please specify <upstream> manually.\n"
+msgstr ""
+
+#: builtin/ls-files.c:470
+msgid "git ls-files [<options>] [<file>...]"
+msgstr ""
+
+#: builtin/ls-files.c:526
+msgid "identify the file status with tags"
+msgstr ""
+
+#: builtin/ls-files.c:528
+msgid "use lowercase letters for 'assume unchanged' files"
+msgstr ""
+
+#: builtin/ls-files.c:530
+msgid "use lowercase letters for 'fsmonitor clean' files"
+msgstr ""
+
+#: builtin/ls-files.c:532
+msgid "show cached files in the output (default)"
+msgstr ""
+
+#: builtin/ls-files.c:534
+msgid "show deleted files in the output"
+msgstr ""
+
+#: builtin/ls-files.c:536
+msgid "show modified files in the output"
+msgstr ""
+
+#: builtin/ls-files.c:538
+msgid "show other files in the output"
+msgstr ""
+
+#: builtin/ls-files.c:540
+msgid "show ignored files in the output"
+msgstr ""
+
+#: builtin/ls-files.c:543
+msgid "show staged contents' object name in the output"
+msgstr ""
+
+#: builtin/ls-files.c:545
+msgid "show files on the filesystem that need to be removed"
+msgstr ""
+
+#: builtin/ls-files.c:547
+msgid "show 'other' directories' names only"
+msgstr ""
+
+#: builtin/ls-files.c:549
+msgid "show line endings of files"
+msgstr ""
+
+#: builtin/ls-files.c:551
+msgid "don't show empty directories"
+msgstr ""
+
+#: builtin/ls-files.c:554
+msgid "show unmerged files in the output"
+msgstr ""
+
+#: builtin/ls-files.c:556
+msgid "show resolve-undo information"
+msgstr ""
+
+#: builtin/ls-files.c:558
+msgid "skip files matching pattern"
+msgstr ""
+
+#: builtin/ls-files.c:561
+msgid "exclude patterns are read from <file>"
+msgstr ""
+
+#: builtin/ls-files.c:564
+msgid "read additional per-directory exclude patterns in <file>"
+msgstr ""
+
+#: builtin/ls-files.c:566
+msgid "add the standard git exclusions"
+msgstr ""
+
+#: builtin/ls-files.c:570
+msgid "make the output relative to the project top directory"
+msgstr ""
+
+#: builtin/ls-files.c:573
+msgid "recurse through submodules"
+msgstr ""
+
+#: builtin/ls-files.c:575
+msgid "if any <file> is not in the index, treat this as an error"
+msgstr ""
+
+#: builtin/ls-files.c:576
+msgid "tree-ish"
+msgstr ""
+
+#: builtin/ls-files.c:577
+msgid "pretend that paths removed since <tree-ish> are still present"
+msgstr ""
+
+#: builtin/ls-files.c:579
+msgid "show debugging data"
+msgstr ""
+
+#: 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/ls-remote.c:59
+msgid "do not print remote URL"
+msgstr ""
+
+#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1458
+msgid "exec"
+msgstr ""
+
+#: builtin/ls-remote.c:61 builtin/ls-remote.c:63
+msgid "path of git-upload-pack on the remote host"
+msgstr ""
+
+#: builtin/ls-remote.c:65
+msgid "limit to tags"
+msgstr ""
+
+#: builtin/ls-remote.c:66
+msgid "limit to heads"
+msgstr ""
+
+#: builtin/ls-remote.c:67
+msgid "do not show peeled tags"
+msgstr ""
+
+#: builtin/ls-remote.c:69
+msgid "take url.<base>.insteadOf into account"
+msgstr ""
+
+#: builtin/ls-remote.c:72
+msgid "exit with exit code 2 if no matching refs are found"
+msgstr ""
+
+#: builtin/ls-remote.c:75
+msgid "show underlying ref in addition to the object pointed by it"
+msgstr ""
+
+#: builtin/ls-tree.c:30
+msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
+msgstr ""
+
+#: builtin/ls-tree.c:128
+msgid "only show trees"
+msgstr ""
+
+#: builtin/ls-tree.c:130
+msgid "recurse into subtrees"
+msgstr ""
+
+#: builtin/ls-tree.c:132
+msgid "show trees when recursing"
+msgstr ""
+
+#: builtin/ls-tree.c:135
+msgid "terminate entries with NUL byte"
+msgstr ""
+
+#: builtin/ls-tree.c:136
+msgid "include object size"
+msgstr ""
+
+#: builtin/ls-tree.c:138 builtin/ls-tree.c:140
+msgid "list only filenames"
+msgstr ""
+
+#: builtin/ls-tree.c:143
+msgid "use full path names"
+msgstr ""
+
+#: builtin/ls-tree.c:145
+msgid "list entire tree; not just current directory (implies --full-name)"
+msgstr ""
+
+#: builtin/mailsplit.c:241
+#, c-format
+msgid "empty mbox: '%s'"
+msgstr ""
+
+#: builtin/merge.c:54
+msgid "git merge [<options>] [<commit>...]"
+msgstr ""
+
+#: builtin/merge.c:55
+msgid "git merge --abort"
+msgstr ""
+
+#: builtin/merge.c:56
+msgid "git merge --continue"
+msgstr ""
+
+#: builtin/merge.c:116
+msgid "switch `m' requires a value"
+msgstr ""
+
+#: builtin/merge.c:139
+#, c-format
+msgid "option `%s' requires a value"
+msgstr ""
+
+#: builtin/merge.c:185
+#, c-format
+msgid "Could not find merge strategy '%s'.\n"
+msgstr ""
+
+#: builtin/merge.c:186
+#, c-format
+msgid "Available strategies are:"
+msgstr ""
+
+#: builtin/merge.c:191
+#, c-format
+msgid "Available custom strategies are:"
+msgstr ""
+
+#: builtin/merge.c:242 builtin/pull.c:150
+msgid "do not show a diffstat at the end of the merge"
+msgstr ""
+
+#: builtin/merge.c:245 builtin/pull.c:153
+msgid "show a diffstat at the end of the merge"
+msgstr ""
+
+#: builtin/merge.c:246 builtin/pull.c:156
+msgid "(synonym to --stat)"
+msgstr ""
+
+#: builtin/merge.c:248 builtin/pull.c:159
+msgid "add (at most <n>) entries from shortlog to merge commit message"
+msgstr ""
+
+#: builtin/merge.c:251 builtin/pull.c:165
+msgid "create a single commit instead of doing a merge"
+msgstr ""
+
+#: builtin/merge.c:253 builtin/pull.c:168
+msgid "perform a commit if the merge succeeds (default)"
+msgstr ""
+
+#: builtin/merge.c:255 builtin/pull.c:171
+msgid "edit message before committing"
+msgstr ""
+
+#: builtin/merge.c:257
+msgid "allow fast-forward (default)"
+msgstr ""
+
+#: builtin/merge.c:259 builtin/pull.c:178
+msgid "abort if fast-forward is not possible"
+msgstr ""
+
+#: builtin/merge.c:263 builtin/pull.c:181
+msgid "verify that the named commit has a valid GPG signature"
+msgstr ""
+
+#: builtin/merge.c:264 builtin/notes.c:787 builtin/pull.c:185
+#: builtin/rebase.c:492 builtin/rebase.c:1471 builtin/revert.c:113
+msgid "strategy"
+msgstr ""
+
+#: builtin/merge.c:265 builtin/pull.c:186
+msgid "merge strategy to use"
+msgstr ""
+
+#: builtin/merge.c:266 builtin/pull.c:189
+msgid "option=value"
+msgstr ""
+
+#: builtin/merge.c:267 builtin/pull.c:190
+msgid "option for selected merge strategy"
+msgstr ""
+
+#: builtin/merge.c:269
+msgid "merge commit message (for a non-fast-forward merge)"
+msgstr ""
+
+#: builtin/merge.c:276
+msgid "abort the current in-progress merge"
+msgstr ""
+
+#: builtin/merge.c:278
+msgid "continue the current in-progress merge"
+msgstr ""
+
+#: builtin/merge.c:280 builtin/pull.c:197
+msgid "allow merging unrelated histories"
+msgstr ""
+
+#: builtin/merge.c:286
+msgid "verify commit-msg hook"
+msgstr ""
+
+#: builtin/merge.c:311
+msgid "could not run stash."
+msgstr ""
+
+#: builtin/merge.c:316
+msgid "stash failed"
+msgstr ""
+
+#: builtin/merge.c:321
+#, c-format
+msgid "not a valid object: %s"
+msgstr ""
+
+#: builtin/merge.c:343 builtin/merge.c:360
+msgid "read-tree failed"
+msgstr ""
+
+#: builtin/merge.c:390
+msgid " (nothing to squash)"
+msgstr ""
+
+#: builtin/merge.c:401
+#, c-format
+msgid "Squash commit -- not updating HEAD\n"
+msgstr ""
+
+#: builtin/merge.c:451
+#, c-format
+msgid "No merge message -- not updating HEAD\n"
+msgstr ""
+
+#: builtin/merge.c:502
+#, c-format
+msgid "'%s' does not point to a commit"
+msgstr ""
+
+#: builtin/merge.c:589
+#, c-format
+msgid "Bad branch.%s.mergeoptions string: %s"
+msgstr ""
+
+#: builtin/merge.c:712
+msgid "Not handling anything other than two heads merge."
+msgstr ""
+
+#: builtin/merge.c:726
+#, c-format
+msgid "Unknown option for merge-recursive: -X%s"
+msgstr ""
+
+#: builtin/merge.c:741
+#, c-format
+msgid "unable to write %s"
+msgstr ""
+
+#: builtin/merge.c:793
+#, c-format
+msgid "Could not read from '%s'"
+msgstr ""
+
+#: builtin/merge.c:802
+#, c-format
+msgid "Not committing merge; use 'git commit' to complete the merge.\n"
+msgstr ""
+
+#: builtin/merge.c:808
+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/merge.c:813
+msgid "An empty message aborts the commit.\n"
+msgstr ""
+
+#: builtin/merge.c:816
+#, c-format
+msgid ""
+"Lines starting with '%c' will be ignored, and an empty message aborts\n"
+"the commit.\n"
+msgstr ""
+
+#: builtin/merge.c:857
+msgid "Empty commit message."
+msgstr ""
+
+#: builtin/merge.c:876
+#, c-format
+msgid "Wonderful.\n"
+msgstr ""
+
+#: builtin/merge.c:936
+#, c-format
+msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
+msgstr ""
+
+#: builtin/merge.c:975
+msgid "No current branch."
+msgstr ""
+
+#: builtin/merge.c:977
+msgid "No remote for the current branch."
+msgstr ""
+
+#: builtin/merge.c:979
+msgid "No default upstream defined for the current branch."
+msgstr ""
+
+#: builtin/merge.c:984
+#, c-format
+msgid "No remote-tracking branch for %s from %s"
+msgstr ""
+
+#: builtin/merge.c:1041
+#, c-format
+msgid "Bad value '%s' in environment '%s'"
+msgstr ""
+
+#: builtin/merge.c:1144
+#, c-format
+msgid "not something we can merge in %s: %s"
+msgstr ""
+
+#: builtin/merge.c:1178
+msgid "not something we can merge"
+msgstr ""
+
+#: builtin/merge.c:1281
+msgid "--abort expects no arguments"
+msgstr ""
+
+#: builtin/merge.c:1285
+msgid "There is no merge to abort (MERGE_HEAD missing)."
+msgstr ""
+
+#: builtin/merge.c:1297
+msgid "--continue expects no arguments"
+msgstr ""
+
+#: builtin/merge.c:1301
+msgid "There is no merge in progress (MERGE_HEAD missing)."
+msgstr ""
+
+#: builtin/merge.c:1317
+msgid ""
+"You have not concluded your merge (MERGE_HEAD exists).\n"
+"Please, commit your changes before you merge."
+msgstr ""
+
+#: builtin/merge.c:1324
+msgid ""
+"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
+"Please, commit your changes before you merge."
+msgstr ""
+
+#: builtin/merge.c:1327
+msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
+msgstr ""
+
+#: builtin/merge.c:1341
+msgid "You cannot combine --squash with --no-ff."
+msgstr ""
+
+#: builtin/merge.c:1349
+msgid "No commit specified and merge.defaultToUpstream not set."
+msgstr ""
+
+#: builtin/merge.c:1366
+msgid "Squash commit into empty head not supported yet"
+msgstr ""
+
+#: builtin/merge.c:1368
+msgid "Non-fast-forward commit does not make sense into an empty head"
+msgstr ""
+
+#: builtin/merge.c:1373
+#, c-format
+msgid "%s - not something we can merge"
+msgstr ""
+
+#: builtin/merge.c:1375
+msgid "Can merge only exactly one commit into empty head"
+msgstr ""
+
+#: builtin/merge.c:1454
+msgid "refusing to merge unrelated histories"
+msgstr ""
+
+#: builtin/merge.c:1463
+msgid "Already up to date."
+msgstr ""
+
+#: builtin/merge.c:1473
+#, c-format
+msgid "Updating %s..%s\n"
+msgstr ""
+
+#: builtin/merge.c:1515
+#, c-format
+msgid "Trying really trivial in-index merge...\n"
+msgstr ""
+
+#: builtin/merge.c:1522
+#, c-format
+msgid "Nope.\n"
+msgstr ""
+
+#: builtin/merge.c:1547
+msgid "Already up to date. Yeeah!"
+msgstr ""
+
+#: builtin/merge.c:1553
+msgid "Not possible to fast-forward, aborting."
+msgstr ""
+
+#: builtin/merge.c:1576 builtin/merge.c:1655
+#, c-format
+msgid "Rewinding the tree to pristine...\n"
+msgstr ""
+
+#: builtin/merge.c:1580
+#, c-format
+msgid "Trying merge strategy %s...\n"
+msgstr ""
+
+#: builtin/merge.c:1646
+#, c-format
+msgid "No merge strategy handled the merge.\n"
+msgstr ""
+
+#: builtin/merge.c:1648
+#, c-format
+msgid "Merge with strategy %s failed.\n"
+msgstr ""
+
+#: builtin/merge.c:1657
+#, c-format
+msgid "Using the %s to prepare resolving by hand.\n"
+msgstr ""
+
+#: builtin/merge.c:1669
+#, c-format
+msgid "Automatic merge went well; stopped before committing as requested\n"
+msgstr ""
+
+#: builtin/merge-base.c:32
+msgid "git merge-base [-a | --all] <commit> <commit>..."
+msgstr ""
+
+#: builtin/merge-base.c:33
+msgid "git merge-base [-a | --all] --octopus <commit>..."
+msgstr ""
+
+#: builtin/merge-base.c:34
+msgid "git merge-base --independent <commit>..."
+msgstr ""
+
+#: builtin/merge-base.c:35
+msgid "git merge-base --is-ancestor <commit> <commit>"
+msgstr ""
+
+#: builtin/merge-base.c:36
+msgid "git merge-base --fork-point <ref> [<commit>]"
+msgstr ""
+
+#: builtin/merge-base.c:153
+msgid "output all common ancestors"
+msgstr ""
+
+#: builtin/merge-base.c:155
+msgid "find ancestors for a single n-way merge"
+msgstr ""
+
+#: builtin/merge-base.c:157
+msgid "list revs not reachable from others"
+msgstr ""
+
+#: builtin/merge-base.c:159
+msgid "is the first one ancestor of the other?"
+msgstr ""
+
+#: builtin/merge-base.c:161
+msgid "find where <commit> forked from reflog of <ref>"
+msgstr ""
+
+#: builtin/merge-file.c:9
+msgid ""
+"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
+"<orig-file> <file2>"
+msgstr ""
+
+#: builtin/merge-file.c:35
+msgid "send results to standard output"
+msgstr ""
+
+#: builtin/merge-file.c:36
+msgid "use a diff3 based merge"
+msgstr ""
+
+#: builtin/merge-file.c:37
+msgid "for conflicts, use our version"
+msgstr ""
+
+#: builtin/merge-file.c:39
+msgid "for conflicts, use their version"
+msgstr ""
+
+#: builtin/merge-file.c:41
+msgid "for conflicts, use a union version"
+msgstr ""
+
+#: builtin/merge-file.c:44
+msgid "for conflicts, use this marker size"
+msgstr ""
+
+#: builtin/merge-file.c:45
+msgid "do not warn about conflicts"
+msgstr ""
+
+#: builtin/merge-file.c:47
+msgid "set labels for file1/orig-file/file2"
+msgstr ""
+
+#: builtin/merge-recursive.c:46
+#, c-format
+msgid "unknown option %s"
+msgstr ""
+
+#: builtin/merge-recursive.c:52
+#, c-format
+msgid "could not parse object '%s'"
+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/merge-recursive.c:64
+msgid "not handling anything other than two heads merge."
+msgstr ""
+
+#: builtin/merge-recursive.c:70 builtin/merge-recursive.c:72
+#, c-format
+msgid "could not resolve ref '%s'"
+msgstr ""
+
+#: builtin/merge-recursive.c:78
+#, c-format
+msgid "Merging %s with %s\n"
+msgstr ""
+
+#: builtin/mktree.c:66
+msgid "git mktree [-z] [--missing] [--batch]"
+msgstr ""
+
+#: builtin/mktree.c:154
+msgid "input is NUL terminated"
+msgstr ""
+
+#: builtin/mktree.c:155 builtin/write-tree.c:26
+msgid "allow missing objects"
+msgstr ""
+
+#: builtin/mktree.c:156
+msgid "allow creation of more than one tree"
+msgstr ""
+
+#: builtin/multi-pack-index.c:9
+msgid "git multi-pack-index [--object-dir=<dir>] (write|verify)"
+msgstr ""
+
+#: builtin/multi-pack-index.c:22
+msgid "object directory containing set of packfile and pack-index pairs"
+msgstr ""
+
+#: builtin/multi-pack-index.c:40 builtin/prune-packed.c:67
+msgid "too many arguments"
+msgstr ""
+
+#: builtin/multi-pack-index.c:51
+#, c-format
+msgid "unrecognized verb: %s"
+msgstr ""
+
+#: builtin/mv.c:18
+msgid "git mv [<options>] <source>... <destination>"
+msgstr ""
+
+#: builtin/mv.c:83
+#, c-format
+msgid "Directory %s is in index and no submodule?"
+msgstr ""
+
+#: builtin/mv.c:85
+msgid "Please stage your changes to .gitmodules or stash them to proceed"
+msgstr ""
+
+#: builtin/mv.c:103
+#, c-format
+msgid "%.*s is in index"
+msgstr ""
+
+#: builtin/mv.c:125
+msgid "force move/rename even if target exists"
+msgstr ""
+
+#: builtin/mv.c:127
+msgid "skip move/rename errors"
+msgstr ""
+
+#: builtin/mv.c:169
+#, c-format
+msgid "destination '%s' is not a directory"
+msgstr ""
+
+#: builtin/mv.c:180
+#, c-format
+msgid "Checking rename of '%s' to '%s'\n"
+msgstr ""
+
+#: builtin/mv.c:184
+msgid "bad source"
+msgstr ""
+
+#: builtin/mv.c:187
+msgid "can not move directory into itself"
+msgstr ""
+
+#: builtin/mv.c:190
+msgid "cannot move directory over file"
+msgstr ""
+
+#: builtin/mv.c:199
+msgid "source directory is empty"
+msgstr ""
+
+#: builtin/mv.c:224
+msgid "not under version control"
+msgstr ""
+
+#: builtin/mv.c:227
+msgid "destination exists"
+msgstr ""
+
+#: builtin/mv.c:235
+#, c-format
+msgid "overwriting '%s'"
+msgstr ""
+
+#: builtin/mv.c:238
+msgid "Cannot overwrite"
+msgstr ""
+
+#: builtin/mv.c:241
+msgid "multiple sources for the same target"
+msgstr ""
+
+#: builtin/mv.c:243
+msgid "destination directory does not exist"
+msgstr ""
+
+#: builtin/mv.c:250
+#, c-format
+msgid "%s, source=%s, destination=%s"
+msgstr ""
+
+#: builtin/mv.c:271
+#, c-format
+msgid "Renaming %s to %s\n"
+msgstr ""
+
+#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:516
+#, c-format
+msgid "renaming '%s' failed"
+msgstr ""
+
+#: builtin/name-rev.c:355
+msgid "git name-rev [<options>] <commit>..."
+msgstr ""
+
+#: builtin/name-rev.c:356
+msgid "git name-rev [<options>] --all"
+msgstr ""
+
+#: builtin/name-rev.c:357
+msgid "git name-rev [<options>] --stdin"
+msgstr ""
+
+#: builtin/name-rev.c:415
+msgid "print only names (no SHA-1)"
+msgstr ""
+
+#: builtin/name-rev.c:416
+msgid "only use tags to name the commits"
+msgstr ""
+
+#: builtin/name-rev.c:418
+msgid "only use refs matching <pattern>"
+msgstr ""
+
+#: builtin/name-rev.c:420
+msgid "ignore refs matching <pattern>"
+msgstr ""
+
+#: builtin/name-rev.c:422
+msgid "list all commits reachable from all refs"
+msgstr ""
+
+#: builtin/name-rev.c:423
+msgid "read from stdin"
+msgstr ""
+
+#: builtin/name-rev.c:424
+msgid "allow to print `undefined` names (default)"
+msgstr ""
+
+#: builtin/name-rev.c:430
+msgid "dereference tags in the input (internal use)"
+msgstr ""
+
+#: builtin/notes.c:28
+msgid "git notes [--ref <notes-ref>] [list [<object>]]"
+msgstr ""
+
+#: builtin/notes.c:29
+msgid ""
+"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
+"| (-c | -C) <object>] [<object>]"
+msgstr ""
+
+#: builtin/notes.c:30
+msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
+msgstr ""
+
+#: builtin/notes.c:31
+msgid ""
+"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
+"(-c | -C) <object>] [<object>]"
+msgstr ""
+
+#: builtin/notes.c:32
+msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
+msgstr ""
+
+#: builtin/notes.c:33
+msgid "git notes [--ref <notes-ref>] show [<object>]"
+msgstr ""
+
+#: builtin/notes.c:34
+msgid ""
+"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
+msgstr ""
+
+#: builtin/notes.c:35
+msgid "git notes merge --commit [-v | -q]"
+msgstr ""
+
+#: builtin/notes.c:36
+msgid "git notes merge --abort [-v | -q]"
+msgstr ""
+
+#: builtin/notes.c:37
+msgid "git notes [--ref <notes-ref>] remove [<object>...]"
+msgstr ""
+
+#: builtin/notes.c:38
+msgid "git notes [--ref <notes-ref>] prune [-n] [-v]"
+msgstr ""
+
+#: builtin/notes.c:39
+msgid "git notes [--ref <notes-ref>] get-ref"
+msgstr ""
+
+#: builtin/notes.c:44
+msgid "git notes [list [<object>]]"
+msgstr ""
+
+#: builtin/notes.c:49
+msgid "git notes add [<options>] [<object>]"
+msgstr ""
+
+#: builtin/notes.c:54
+msgid "git notes copy [<options>] <from-object> <to-object>"
+msgstr ""
+
+#: builtin/notes.c:55
+msgid "git notes copy --stdin [<from-object> <to-object>]..."
+msgstr ""
+
+#: builtin/notes.c:60
+msgid "git notes append [<options>] [<object>]"
+msgstr ""
+
+#: builtin/notes.c:65
+msgid "git notes edit [<object>]"
+msgstr ""
+
+#: builtin/notes.c:70
+msgid "git notes show [<object>]"
+msgstr ""
+
+#: builtin/notes.c:75
+msgid "git notes merge [<options>] <notes-ref>"
+msgstr ""
+
+#: builtin/notes.c:76
+msgid "git notes merge --commit [<options>]"
+msgstr ""
+
+#: builtin/notes.c:77
+msgid "git notes merge --abort [<options>]"
+msgstr ""
+
+#: builtin/notes.c:82
+msgid "git notes remove [<object>]"
+msgstr ""
+
+#: builtin/notes.c:87
+msgid "git notes prune [<options>]"
+msgstr ""
+
+#: builtin/notes.c:92
+msgid "git notes get-ref"
+msgstr ""
+
+#: builtin/notes.c:97
+msgid "Write/edit the notes for the following object:"
+msgstr ""
+
+#: builtin/notes.c:150
+#, c-format
+msgid "unable to start 'show' for object '%s'"
+msgstr ""
+
+#: builtin/notes.c:154
+msgid "could not read 'show' output"
+msgstr ""
+
+#: builtin/notes.c:162
+#, c-format
+msgid "failed to finish 'show' for object '%s'"
+msgstr ""
+
+#: builtin/notes.c:197
+msgid "please supply the note contents using either -m or -F option"
+msgstr ""
+
+#: builtin/notes.c:206
+msgid "unable to write note object"
+msgstr ""
+
+#: builtin/notes.c:208
+#, c-format
+msgid "the note contents have been left in %s"
+msgstr ""
+
+#: builtin/notes.c:242 builtin/tag.c:522
+#, c-format
+msgid "could not open or read '%s'"
+msgstr ""
+
+#: 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/notes.c:265
+#, c-format
+msgid "failed to read object '%s'."
+msgstr ""
+
+#: builtin/notes.c:268
+#, c-format
+msgid "cannot read note data from non-blob object '%s'."
+msgstr ""
+
+#: builtin/notes.c:309
+#, c-format
+msgid "malformed input line: '%s'."
+msgstr ""
+
+#: builtin/notes.c:324
+#, c-format
+msgid "failed to copy notes from '%s' to '%s'"
+msgstr ""
+
+#. 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/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/notes.c:389 builtin/notes.c:678
+#, c-format
+msgid "no note found for object %s."
+msgstr ""
+
+#: builtin/notes.c:410 builtin/notes.c:576
+msgid "note contents as a string"
+msgstr ""
+
+#: builtin/notes.c:413 builtin/notes.c:579
+msgid "note contents in a file"
+msgstr ""
+
+#: builtin/notes.c:416 builtin/notes.c:582
+msgid "reuse and edit specified note object"
+msgstr ""
+
+#: builtin/notes.c:419 builtin/notes.c:585
+msgid "reuse specified note object"
+msgstr ""
+
+#: builtin/notes.c:422 builtin/notes.c:588
+msgid "allow storing empty note"
+msgstr ""
+
+#: builtin/notes.c:423 builtin/notes.c:496
+msgid "replace existing notes"
+msgstr ""
+
+#: builtin/notes.c:448
+#, c-format
+msgid ""
+"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
+"existing notes"
+msgstr ""
+
+#: builtin/notes.c:463 builtin/notes.c:544
+#, c-format
+msgid "Overwriting existing notes for object %s\n"
+msgstr ""
+
+#: builtin/notes.c:475 builtin/notes.c:637 builtin/notes.c:902
+#, c-format
+msgid "Removing note for object %s\n"
+msgstr ""
+
+#: builtin/notes.c:497
+msgid "read objects from stdin"
+msgstr ""
+
+#: builtin/notes.c:499
+msgid "load rewriting config for <command> (implies --stdin)"
+msgstr ""
+
+#: builtin/notes.c:517
+msgid "too few parameters"
+msgstr ""
+
+#: builtin/notes.c:538
+#, c-format
+msgid ""
+"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
+"existing notes"
+msgstr ""
+
+#: builtin/notes.c:550
+#, c-format
+msgid "missing notes on source object %s. Cannot copy."
+msgstr ""
+
+#: 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/notes.c:698
+msgid "failed to delete ref NOTES_MERGE_PARTIAL"
+msgstr ""
+
+#: builtin/notes.c:700
+msgid "failed to delete ref NOTES_MERGE_REF"
+msgstr ""
+
+#: builtin/notes.c:702
+msgid "failed to remove 'git notes merge' worktree"
+msgstr ""
+
+#: builtin/notes.c:722
+msgid "failed to read ref NOTES_MERGE_PARTIAL"
+msgstr ""
+
+#: builtin/notes.c:724
+msgid "could not find commit from NOTES_MERGE_PARTIAL."
+msgstr ""
+
+#: builtin/notes.c:726
+msgid "could not parse commit from NOTES_MERGE_PARTIAL."
+msgstr ""
+
+#: builtin/notes.c:739
+msgid "failed to resolve NOTES_MERGE_REF"
+msgstr ""
+
+#: builtin/notes.c:742
+msgid "failed to finalize notes merge"
+msgstr ""
+
+#: builtin/notes.c:768
+#, c-format
+msgid "unknown notes merge strategy %s"
+msgstr ""
+
+#: builtin/notes.c:784
+msgid "General options"
+msgstr ""
+
+#: builtin/notes.c:786
+msgid "Merge options"
+msgstr ""
+
+#: builtin/notes.c:788
+msgid ""
+"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
+"cat_sort_uniq)"
+msgstr ""
+
+#: builtin/notes.c:790
+msgid "Committing unmerged notes"
+msgstr ""
+
+#: builtin/notes.c:792
+msgid "finalize notes merge by committing unmerged notes"
+msgstr ""
+
+#: builtin/notes.c:794
+msgid "Aborting notes merge resolution"
+msgstr ""
+
+#: builtin/notes.c:796
+msgid "abort notes merge"
+msgstr ""
+
+#: builtin/notes.c:807
+msgid "cannot mix --commit, --abort or -s/--strategy"
+msgstr ""
+
+#: builtin/notes.c:812
+msgid "must specify a notes ref to merge"
+msgstr ""
+
+#: builtin/notes.c:836
+#, c-format
+msgid "unknown -s/--strategy: %s"
+msgstr ""
+
+#: builtin/notes.c:873
+#, c-format
+msgid "a notes merge into %s is already in-progress at %s"
+msgstr ""
+
+#: builtin/notes.c:876
+#, c-format
+msgid "failed to store link to current notes ref (%s)"
+msgstr ""
+
+#: 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/notes.c:897 builtin/tag.c:535
+#, c-format
+msgid "Failed to resolve '%s' as a valid ref."
+msgstr ""
+
+#: builtin/notes.c:900
+#, c-format
+msgid "Object %s has no note\n"
+msgstr ""
+
+#: builtin/notes.c:912
+msgid "attempt to remove non-existent note is not an error"
+msgstr ""
+
+#: builtin/notes.c:915
+msgid "read object names from the standard input"
+msgstr ""
+
+#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:165
+msgid "do not remove, show only"
+msgstr ""
+
+#: builtin/notes.c:955
+msgid "report pruned notes"
+msgstr ""
+
+#: builtin/notes.c:998
+msgid "notes-ref"
+msgstr ""
+
+#: builtin/notes.c:999
+msgid "use notes from <notes-ref>"
+msgstr ""
+
+#: builtin/notes.c:1034 builtin/stash.c:1611
+#, c-format
+msgid "unknown subcommand: %s"
+msgstr ""
+
+#: builtin/pack-objects.c:52
+msgid ""
+"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
+msgstr ""
+
+#: builtin/pack-objects.c:53
+msgid ""
+"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
+msgstr ""
+
+#: builtin/pack-objects.c:424
+#, c-format
+msgid "bad packed object CRC for %s"
+msgstr ""
+
+#: builtin/pack-objects.c:435
+#, c-format
+msgid "corrupt packed object for %s"
+msgstr ""
+
+#: builtin/pack-objects.c:566
+#, c-format
+msgid "recursive delta detected for object %s"
+msgstr ""
+
+#: builtin/pack-objects.c:777
+#, c-format
+msgid "ordered %u objects, expected %<PRIu32>"
+msgstr ""
+
+#: builtin/pack-objects.c:790
+#, c-format
+msgid "packfile is invalid: %s"
+msgstr ""
+
+#: builtin/pack-objects.c:794
+#, c-format
+msgid "unable to open packfile for reuse: %s"
+msgstr ""
+
+#: builtin/pack-objects.c:798
+msgid "unable to seek in reused packfile"
+msgstr ""
+
+#: builtin/pack-objects.c:809
+msgid "unable to read from reused packfile"
+msgstr ""
+
+#: builtin/pack-objects.c:837
+msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
+msgstr ""
+
+#: builtin/pack-objects.c:850
+msgid "Writing objects"
+msgstr ""
+
+#: builtin/pack-objects.c:912 builtin/update-index.c:89
+#, c-format
+msgid "failed to stat %s"
+msgstr ""
+
+#: builtin/pack-objects.c:965
+#, c-format
+msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
+msgstr ""
+
+#: builtin/pack-objects.c:1161
+msgid "disabling bitmap writing, as some objects are not being packed"
+msgstr ""
+
+#: builtin/pack-objects.c:1589
+#, c-format
+msgid "delta base offset overflow in pack for %s"
+msgstr ""
+
+#: builtin/pack-objects.c:1598
+#, c-format
+msgid "delta base offset out of bound for %s"
+msgstr ""
+
+#: builtin/pack-objects.c:1867
+msgid "Counting objects"
+msgstr ""
+
+#: builtin/pack-objects.c:1997
+#, c-format
+msgid "unable to get size of %s"
+msgstr ""
+
+#: builtin/pack-objects.c:2012
+#, c-format
+msgid "unable to parse object header of %s"
+msgstr ""
+
+#: builtin/pack-objects.c:2082 builtin/pack-objects.c:2098
+#: builtin/pack-objects.c:2108
+#, c-format
+msgid "object %s cannot be read"
+msgstr ""
+
+#: builtin/pack-objects.c:2085 builtin/pack-objects.c:2112
+#, c-format
+msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
+msgstr ""
+
+#: builtin/pack-objects.c:2122
+msgid "suboptimal pack - out of memory"
+msgstr ""
+
+#: builtin/pack-objects.c:2448
+#, c-format
+msgid "Delta compression using up to %d threads"
+msgstr ""
+
+#: builtin/pack-objects.c:2580
+#, c-format
+msgid "unable to pack objects reachable from tag %s"
+msgstr ""
+
+#: builtin/pack-objects.c:2667
+msgid "Compressing objects"
+msgstr ""
+
+#: builtin/pack-objects.c:2673
+msgid "inconsistency with delta count"
+msgstr ""
+
+#: builtin/pack-objects.c:2754
+#, c-format
+msgid ""
+"expected edge object ID, got garbage:\n"
+" %s"
+msgstr ""
+
+#: builtin/pack-objects.c:2760
+#, c-format
+msgid ""
+"expected object ID, got garbage:\n"
+" %s"
+msgstr ""
+
+#: builtin/pack-objects.c:2858
+msgid "invalid value for --missing"
+msgstr ""
+
+#: builtin/pack-objects.c:2917 builtin/pack-objects.c:3025
+msgid "cannot open pack index"
+msgstr ""
+
+#: builtin/pack-objects.c:2948
+#, c-format
+msgid "loose object at %s could not be examined"
+msgstr ""
+
+#: builtin/pack-objects.c:3033
+msgid "unable to force loose object"
+msgstr ""
+
+#: builtin/pack-objects.c:3125
+#, c-format
+msgid "not a rev '%s'"
+msgstr ""
+
+#: builtin/pack-objects.c:3128
+#, c-format
+msgid "bad revision '%s'"
+msgstr ""
+
+#: builtin/pack-objects.c:3153
+msgid "unable to add recent objects"
+msgstr ""
+
+#: builtin/pack-objects.c:3206
+#, c-format
+msgid "unsupported index version %s"
+msgstr ""
+
+#: builtin/pack-objects.c:3210
+#, c-format
+msgid "bad index version '%s'"
+msgstr ""
+
+#: builtin/pack-objects.c:3240
+msgid "do not show progress meter"
+msgstr ""
+
+#: builtin/pack-objects.c:3242
+msgid "show progress meter"
+msgstr ""
+
+#: builtin/pack-objects.c:3244
+msgid "show progress meter during object writing phase"
+msgstr ""
+
+#: builtin/pack-objects.c:3247
+msgid "similar to --all-progress when progress meter is shown"
+msgstr ""
+
+#: builtin/pack-objects.c:3248
+msgid "<version>[,<offset>]"
+msgstr ""
+
+#: builtin/pack-objects.c:3249
+msgid "write the pack index file in the specified idx format version"
+msgstr ""
+
+#: builtin/pack-objects.c:3252
+msgid "maximum size of each output pack file"
+msgstr ""
+
+#: builtin/pack-objects.c:3254
+msgid "ignore borrowed objects from alternate object store"
+msgstr ""
+
+#: builtin/pack-objects.c:3256
+msgid "ignore packed objects"
+msgstr ""
+
+#: builtin/pack-objects.c:3258
+msgid "limit pack window by objects"
+msgstr ""
+
+#: builtin/pack-objects.c:3260
+msgid "limit pack window by memory in addition to object limit"
+msgstr ""
+
+#: builtin/pack-objects.c:3262
+msgid "maximum length of delta chain allowed in the resulting pack"
+msgstr ""
+
+#: builtin/pack-objects.c:3264
+msgid "reuse existing deltas"
+msgstr ""
+
+#: builtin/pack-objects.c:3266
+msgid "reuse existing objects"
+msgstr ""
+
+#: builtin/pack-objects.c:3268
+msgid "use OFS_DELTA objects"
+msgstr ""
+
+#: builtin/pack-objects.c:3270
+msgid "use threads when searching for best delta matches"
+msgstr ""
+
+#: builtin/pack-objects.c:3272
+msgid "do not create an empty pack output"
+msgstr ""
+
+#: builtin/pack-objects.c:3274
+msgid "read revision arguments from standard input"
+msgstr ""
+
+#: builtin/pack-objects.c:3276
+msgid "limit the objects to those that are not yet packed"
+msgstr ""
+
+#: builtin/pack-objects.c:3279
+msgid "include objects reachable from any reference"
+msgstr ""
+
+#: builtin/pack-objects.c:3282
+msgid "include objects referred by reflog entries"
+msgstr ""
+
+#: builtin/pack-objects.c:3285
+msgid "include objects referred to by the index"
+msgstr ""
+
+#: builtin/pack-objects.c:3288
+msgid "output pack to stdout"
+msgstr ""
+
+#: builtin/pack-objects.c:3290
+msgid "include tag objects that refer to objects to be packed"
+msgstr ""
+
+#: builtin/pack-objects.c:3292
+msgid "keep unreachable objects"
+msgstr ""
+
+#: builtin/pack-objects.c:3294
+msgid "pack loose unreachable objects"
+msgstr ""
+
+#: builtin/pack-objects.c:3296
+msgid "unpack unreachable objects newer than <time>"
+msgstr ""
+
+#: builtin/pack-objects.c:3299
+msgid "use the sparse reachability algorithm"
+msgstr ""
+
+#: builtin/pack-objects.c:3301
+msgid "create thin packs"
+msgstr ""
+
+#: builtin/pack-objects.c:3303
+msgid "create packs suitable for shallow fetches"
+msgstr ""
+
+#: builtin/pack-objects.c:3305
+msgid "ignore packs that have companion .keep file"
+msgstr ""
+
+#: builtin/pack-objects.c:3307
+msgid "ignore this pack"
+msgstr ""
+
+#: builtin/pack-objects.c:3309
+msgid "pack compression level"
+msgstr ""
+
+#: builtin/pack-objects.c:3311
+msgid "do not hide commits by grafts"
+msgstr ""
+
+#: builtin/pack-objects.c:3313
+msgid "use a bitmap index if available to speed up counting objects"
+msgstr ""
+
+#: builtin/pack-objects.c:3315
+msgid "write a bitmap index together with the pack index"
+msgstr ""
+
+#: builtin/pack-objects.c:3318
+msgid "handling for missing objects"
+msgstr ""
+
+#: builtin/pack-objects.c:3321
+msgid "do not pack objects in promisor packfiles"
+msgstr ""
+
+#: builtin/pack-objects.c:3323
+msgid "respect islands during delta compression"
+msgstr ""
+
+#: builtin/pack-objects.c:3348
+#, c-format
+msgid "delta chain depth %d is too deep, forcing %d"
+msgstr ""
+
+#: builtin/pack-objects.c:3353
+#, c-format
+msgid "pack.deltaCacheLimit is too high, forcing %d"
+msgstr ""
+
+#: builtin/pack-objects.c:3407
+msgid "--max-pack-size cannot be used to build a pack for transfer"
+msgstr ""
+
+#: builtin/pack-objects.c:3409
+msgid "minimum pack size limit is 1 MiB"
+msgstr ""
+
+#: builtin/pack-objects.c:3414
+msgid "--thin cannot be used to build an indexable pack"
+msgstr ""
+
+#: builtin/pack-objects.c:3417
+msgid "--keep-unreachable and --unpack-unreachable are incompatible"
+msgstr ""
+
+#: builtin/pack-objects.c:3423
+msgid "cannot use --filter without --stdout"
+msgstr ""
+
+#: builtin/pack-objects.c:3484
+msgid "Enumerating objects"
+msgstr ""
+
+#: builtin/pack-objects.c:3514
+#, c-format
+msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)"
+msgstr ""
+
+#: builtin/pack-refs.c:8
+msgid "git pack-refs [<options>]"
+msgstr ""
+
+#: builtin/pack-refs.c:16
+msgid "pack everything"
+msgstr ""
+
+#: builtin/pack-refs.c:17
+msgid "prune loose refs (default)"
+msgstr ""
+
+#: builtin/prune-packed.c:9
+msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
+msgstr ""
+
+#: builtin/prune-packed.c:42
+msgid "Removing duplicate objects"
+msgstr ""
+
+#: builtin/prune.c:12
+msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
+msgstr ""
+
+#: builtin/prune.c:131
+msgid "report pruned objects"
+msgstr ""
+
+#: builtin/prune.c:134
+msgid "expire objects older than <time>"
+msgstr ""
+
+#: builtin/prune.c:136
+msgid "limit traversal to objects outside promisor packfiles"
+msgstr ""
+
+#: builtin/prune.c:150
+msgid "cannot prune in a precious-objects repo"
+msgstr ""
+
+#: builtin/pull.c:66 builtin/pull.c:68
+#, c-format
+msgid "Invalid value for %s: %s"
+msgstr ""
+
+#: builtin/pull.c:88
+msgid "git pull [<options>] [<repository> [<refspec>...]]"
+msgstr ""
+
+#: builtin/pull.c:140
+msgid "control for recursive fetching of submodules"
+msgstr ""
+
+#: builtin/pull.c:144
+msgid "Options related to merging"
+msgstr ""
+
+#: builtin/pull.c:147
+msgid "incorporate changes by rebasing rather than merging"
+msgstr ""
+
+#: builtin/pull.c:175 builtin/rebase.c:447 builtin/revert.c:125
+msgid "allow fast-forward"
+msgstr ""
+
+#: builtin/pull.c:184
+msgid "automatically stash/stash pop before and after rebase"
+msgstr ""
+
+#: builtin/pull.c:200
+msgid "Options related to fetching"
+msgstr ""
+
+#: builtin/pull.c:210
+msgid "force overwrite of local branch"
+msgstr ""
+
+#: builtin/pull.c:218
+msgid "number of submodules pulled in parallel"
+msgstr ""
+
+#: builtin/pull.c:313
+#, c-format
+msgid "Invalid value for pull.ff: %s"
+msgstr ""
+
+#: builtin/pull.c:430
+msgid ""
+"There is no candidate for rebasing against among the refs that you just "
+"fetched."
+msgstr ""
+
+#: builtin/pull.c:432
+msgid ""
+"There are no candidates for merging among the refs that you just fetched."
+msgstr ""
+
+#: builtin/pull.c:433
+msgid ""
+"Generally this means that you provided a wildcard refspec which had no\n"
+"matches on the remote end."
+msgstr ""
+
+#: builtin/pull.c:436
+#, c-format
+msgid ""
+"You asked to pull from the remote '%s', but did not specify\n"
+"a branch. Because this is not the default configured remote\n"
+"for your current branch, you must specify a branch on the command line."
+msgstr ""
+
+#: builtin/pull.c:441 builtin/rebase.c:1321 git-parse-remote.sh:73
+msgid "You are not currently on a branch."
+msgstr ""
+
+#: builtin/pull.c:443 builtin/pull.c:458 git-parse-remote.sh:79
+msgid "Please specify which branch you want to rebase against."
+msgstr ""
+
+#: builtin/pull.c:445 builtin/pull.c:460 git-parse-remote.sh:82
+msgid "Please specify which branch you want to merge with."
+msgstr ""
+
+#: builtin/pull.c:446 builtin/pull.c:461
+msgid "See git-pull(1) for details."
+msgstr ""
+
+#: builtin/pull.c:448 builtin/pull.c:454 builtin/pull.c:463
+#: builtin/rebase.c:1327 git-parse-remote.sh:64
+msgid "<remote>"
+msgstr ""
+
+#: builtin/pull.c:448 builtin/pull.c:463 builtin/pull.c:468
+#: git-parse-remote.sh:65
+msgid "<branch>"
+msgstr ""
+
+#: builtin/pull.c:456 builtin/rebase.c:1319 git-parse-remote.sh:75
+msgid "There is no tracking information for the current branch."
+msgstr ""
+
+#: builtin/pull.c:465 git-parse-remote.sh:95
+msgid ""
+"If you wish to set tracking information for this branch you can do so with:"
+msgstr ""
+
+#: builtin/pull.c:470
+#, c-format
+msgid ""
+"Your configuration specifies to merge with the ref '%s'\n"
+"from the remote, but no such ref was fetched."
+msgstr ""
+
+#: builtin/pull.c:574
+#, c-format
+msgid "unable to access commit %s"
+msgstr ""
+
+#: builtin/pull.c:854
+msgid "ignoring --verify-signatures for rebase"
+msgstr ""
+
+#: builtin/pull.c:909
+msgid "--[no-]autostash option is only valid with --rebase."
+msgstr ""
+
+#: builtin/pull.c:917
+msgid "Updating an unborn branch with changes added to the index."
+msgstr ""
+
+#: builtin/pull.c:921
+msgid "pull with rebase"
+msgstr ""
+
+#: builtin/pull.c:922
+msgid "please commit or stash them."
+msgstr ""
+
+#: builtin/pull.c:947
+#, c-format
+msgid ""
+"fetch updated the current branch head.\n"
+"fast-forwarding your working tree from\n"
+"commit %s."
+msgstr ""
+
+#: builtin/pull.c:953
+#, c-format
+msgid ""
+"Cannot fast-forward your working tree.\n"
+"After making sure that you saved anything precious from\n"
+"$ git diff %s\n"
+"output, run\n"
+"$ git reset --hard\n"
+"to recover."
+msgstr ""
+
+#: builtin/pull.c:968
+msgid "Cannot merge multiple branches into empty head."
+msgstr ""
+
+#: builtin/pull.c:972
+msgid "Cannot rebase onto multiple branches."
+msgstr ""
+
+#: builtin/pull.c:979
+msgid "cannot rebase with locally recorded submodule modifications"
+msgstr ""
+
+#: builtin/push.c:19
+msgid "git push [<options>] [<repository> [<refspec>...]]"
+msgstr ""
+
+#: builtin/push.c:111
+msgid "tag shorthand without <tag>"
+msgstr ""
+
+#: builtin/push.c:121
+msgid "--delete only accepts plain target ref names"
+msgstr ""
+
+#: builtin/push.c:167
+msgid ""
+"\n"
+"To choose either option permanently, see push.default in 'git help config'."
+msgstr ""
+
+#: builtin/push.c:170
+#, 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 HEAD\n"
+"%s"
+msgstr ""
+
+#: 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/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/push.c:207
+#, c-format
+msgid "The current branch %s has multiple upstream branches, refusing to push."
+msgstr ""
+
+#: 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/push.c:269
+msgid ""
+"You didn't specify any refspecs to push, and push.default is \"nothing\"."
+msgstr ""
+
+#: 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/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/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/push.c:295
+msgid "Updates were rejected because the tag already exists in the remote."
+msgstr ""
+
+#: builtin/push.c:298
+msgid ""
+"You cannot update a remote ref that points at a non-commit object,\n"
+"or update a remote ref to make it point at a non-commit object,\n"
+"without using the '--force' option.\n"
+msgstr ""
+
+#: builtin/push.c:359
+#, c-format
+msgid "Pushing to %s\n"
+msgstr ""
+
+#: builtin/push.c:364
+#, c-format
+msgid "failed to push some refs to '%s'"
+msgstr ""
+
+#: builtin/push.c:398
+#, c-format
+msgid "bad repository '%s'"
+msgstr ""
+
+#: 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/push.c:554
+msgid "repository"
+msgstr ""
+
+#: builtin/push.c:555 builtin/send-pack.c:164
+msgid "push all refs"
+msgstr ""
+
+#: builtin/push.c:556 builtin/send-pack.c:166
+msgid "mirror all refs"
+msgstr ""
+
+#: builtin/push.c:558
+msgid "delete refs"
+msgstr ""
+
+#: builtin/push.c:559
+msgid "push tags (can't be used with --all or --mirror)"
+msgstr ""
+
+#: builtin/push.c:562 builtin/send-pack.c:167
+msgid "force updates"
+msgstr ""
+
+#: builtin/push.c:564 builtin/send-pack.c:181
+msgid "<refname>:<expect>"
+msgstr ""
+
+#: builtin/push.c:565 builtin/send-pack.c:182
+msgid "require old value of ref to be at this value"
+msgstr ""
+
+#: builtin/push.c:568
+msgid "control recursive pushing of submodules"
+msgstr ""
+
+#: builtin/push.c:570 builtin/send-pack.c:175
+msgid "use thin pack"
+msgstr ""
+
+#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:161
+#: builtin/send-pack.c:162
+msgid "receive pack program"
+msgstr ""
+
+#: builtin/push.c:573
+msgid "set upstream for git pull/status"
+msgstr ""
+
+#: builtin/push.c:576
+msgid "prune locally removed refs"
+msgstr ""
+
+#: builtin/push.c:578
+msgid "bypass pre-push hook"
+msgstr ""
+
+#: builtin/push.c:579
+msgid "push missing but relevant tags"
+msgstr ""
+
+#: builtin/push.c:582 builtin/send-pack.c:169
+msgid "GPG sign the push"
+msgstr ""
+
+#: builtin/push.c:584 builtin/send-pack.c:176
+msgid "request atomic transaction on remote side"
+msgstr ""
+
+#: builtin/push.c:602
+msgid "--delete is incompatible with --all, --mirror and --tags"
+msgstr ""
+
+#: builtin/push.c:604
+msgid "--delete doesn't make sense without any refs"
+msgstr ""
+
+#: builtin/push.c:607
+msgid "--all and --tags are incompatible"
+msgstr ""
+
+#: builtin/push.c:609
+msgid "--all can't be combined with refspecs"
+msgstr ""
+
+#: builtin/push.c:613
+msgid "--mirror and --tags are incompatible"
+msgstr ""
+
+#: builtin/push.c:615
+msgid "--mirror can't be combined with refspecs"
+msgstr ""
+
+#: builtin/push.c:618
+msgid "--all and --mirror are incompatible"
+msgstr ""
+
+#: builtin/push.c:637
+msgid "push options must not have new line characters"
+msgstr ""
+
+#: builtin/range-diff.c:8
+msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>"
+msgstr ""
+
+#: builtin/range-diff.c:9
+msgid "git range-diff [<options>] <old-tip>...<new-tip>"
+msgstr ""
+
+#: builtin/range-diff.c:10
+msgid "git range-diff [<options>] <base> <old-tip> <new-tip>"
+msgstr ""
+
+#: builtin/range-diff.c:21
+msgid "Percentage by which creation is weighted"
+msgstr ""
+
+#: builtin/range-diff.c:23
+msgid "use simple diff colors"
+msgstr ""
+
+#: builtin/range-diff.c:46 builtin/range-diff.c:50
+#, c-format
+msgid "no .. in range: '%s'"
+msgstr ""
+
+#: builtin/range-diff.c:60
+msgid "single arg format must be symmetric range"
+msgstr ""
+
+#: builtin/range-diff.c:75
+msgid "need two commit ranges"
+msgstr ""
+
+#: 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/read-tree.c:124
+msgid "write resulting index to <file>"
+msgstr ""
+
+#: builtin/read-tree.c:127
+msgid "only empty the index"
+msgstr ""
+
+#: builtin/read-tree.c:129
+msgid "Merging"
+msgstr ""
+
+#: builtin/read-tree.c:131
+msgid "perform a merge in addition to a read"
+msgstr ""
+
+#: builtin/read-tree.c:133
+msgid "3-way merge if no file level merging required"
+msgstr ""
+
+#: builtin/read-tree.c:135
+msgid "3-way merge in presence of adds and removes"
+msgstr ""
+
+#: builtin/read-tree.c:137
+msgid "same as -m, but discard unmerged entries"
+msgstr ""
+
+#: builtin/read-tree.c:138
+msgid "<subdirectory>/"
+msgstr ""
+
+#: builtin/read-tree.c:139
+msgid "read the tree into the index under <subdirectory>/"
+msgstr ""
+
+#: builtin/read-tree.c:142
+msgid "update working tree with merge result"
+msgstr ""
+
+#: builtin/read-tree.c:144
+msgid "gitignore"
+msgstr ""
+
+#: builtin/read-tree.c:145
+msgid "allow explicitly ignored files to be overwritten"
+msgstr ""
+
+#: builtin/read-tree.c:148
+msgid "don't check the working tree after merging"
+msgstr ""
+
+#: builtin/read-tree.c:149
+msgid "don't update the index or the work tree"
+msgstr ""
+
+#: builtin/read-tree.c:151
+msgid "skip applying sparse checkout filter"
+msgstr ""
+
+#: builtin/read-tree.c:153
+msgid "debug unpack-trees"
+msgstr ""
+
+#: builtin/read-tree.c:157
+msgid "suppress feedback messages"
+msgstr ""
+
+#: builtin/rebase.c:32
+msgid ""
+"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] "
+"[<branch>]"
+msgstr ""
+
+#: builtin/rebase.c:34
+msgid ""
+"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]"
+msgstr ""
+
+#: builtin/rebase.c:36
+msgid "git rebase --continue | --abort | --skip | --edit-todo"
+msgstr ""
+
+#: builtin/rebase.c:158 builtin/rebase.c:182 builtin/rebase.c:209
+#, c-format
+msgid "unusable todo list: '%s'"
+msgstr ""
+
+#: builtin/rebase.c:167 builtin/rebase.c:193 builtin/rebase.c:217
+#, c-format
+msgid "could not write '%s'."
+msgstr ""
+
+#: builtin/rebase.c:252
+msgid "no HEAD?"
+msgstr ""
+
+#: builtin/rebase.c:279
+#, c-format
+msgid "could not create temporary %s"
+msgstr ""
+
+#: builtin/rebase.c:285
+msgid "could not mark as interactive"
+msgstr ""
+
+#: builtin/rebase.c:343
+msgid "could not generate todo list"
+msgstr ""
+
+#: builtin/rebase.c:382
+msgid "a base commit must be provided with --upstream or --onto"
+msgstr ""
+
+#: builtin/rebase.c:437
+msgid "git rebase--interactive [<options>]"
+msgstr ""
+
+#: builtin/rebase.c:449
+msgid "keep empty commits"
+msgstr ""
+
+#: builtin/rebase.c:451 builtin/revert.c:127
+msgid "allow commits with empty messages"
+msgstr ""
+
+#: builtin/rebase.c:452
+msgid "rebase merge commits"
+msgstr ""
+
+#: builtin/rebase.c:454
+msgid "keep original branch points of cousins"
+msgstr ""
+
+#: builtin/rebase.c:456
+msgid "move commits that begin with squash!/fixup!"
+msgstr ""
+
+#: builtin/rebase.c:457
+msgid "sign commits"
+msgstr ""
+
+#: builtin/rebase.c:459 builtin/rebase.c:1397
+msgid "display a diffstat of what changed upstream"
+msgstr ""
+
+#: builtin/rebase.c:461
+msgid "continue rebase"
+msgstr ""
+
+#: builtin/rebase.c:463
+msgid "skip commit"
+msgstr ""
+
+#: builtin/rebase.c:464
+msgid "edit the todo list"
+msgstr ""
+
+#: builtin/rebase.c:466
+msgid "show the current patch"
+msgstr ""
+
+#: builtin/rebase.c:469
+msgid "shorten commit ids in the todo list"
+msgstr ""
+
+#: builtin/rebase.c:471
+msgid "expand commit ids in the todo list"
+msgstr ""
+
+#: builtin/rebase.c:473
+msgid "check the todo list"
+msgstr ""
+
+#: builtin/rebase.c:475
+msgid "rearrange fixup/squash lines"
+msgstr ""
+
+#: builtin/rebase.c:477
+msgid "insert exec commands in todo list"
+msgstr ""
+
+#: builtin/rebase.c:478
+msgid "onto"
+msgstr ""
+
+#: builtin/rebase.c:481
+msgid "restrict-revision"
+msgstr ""
+
+#: builtin/rebase.c:481
+msgid "restrict revision"
+msgstr ""
+
+#: builtin/rebase.c:483
+msgid "squash-onto"
+msgstr ""
+
+#: builtin/rebase.c:484
+msgid "squash onto"
+msgstr ""
+
+#: builtin/rebase.c:486
+msgid "the upstream commit"
+msgstr ""
+
+#: builtin/rebase.c:488
+msgid "head-name"
+msgstr ""
+
+#: builtin/rebase.c:488
+msgid "head name"
+msgstr ""
+
+#: builtin/rebase.c:493
+msgid "rebase strategy"
+msgstr ""
+
+#: builtin/rebase.c:494
+msgid "strategy-opts"
+msgstr ""
+
+#: builtin/rebase.c:495
+msgid "strategy options"
+msgstr ""
+
+#: builtin/rebase.c:496
+msgid "switch-to"
+msgstr ""
+
+#: builtin/rebase.c:497
+msgid "the branch or commit to checkout"
+msgstr ""
+
+#: builtin/rebase.c:498
+msgid "onto-name"
+msgstr ""
+
+#: builtin/rebase.c:498
+msgid "onto name"
+msgstr ""
+
+#: builtin/rebase.c:499
+msgid "cmd"
+msgstr ""
+
+#: builtin/rebase.c:499
+msgid "the command to run"
+msgstr ""
+
+#: builtin/rebase.c:502 builtin/rebase.c:1480
+msgid "automatically re-schedule any `exec` that fails"
+msgstr ""
+
+#: builtin/rebase.c:518
+msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
+msgstr ""
+
+#: builtin/rebase.c:534 builtin/rebase.c:1787
+#, c-format
+msgid "%s requires an interactive rebase"
+msgstr ""
+
+#: builtin/rebase.c:586
+#, c-format
+msgid "could not get 'onto': '%s'"
+msgstr ""
+
+#: builtin/rebase.c:601
+#, c-format
+msgid "invalid orig-head: '%s'"
+msgstr ""
+
+#: builtin/rebase.c:626
+#, c-format
+msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
+msgstr ""
+
+#: builtin/rebase.c:702
+#, c-format
+msgid "Could not read '%s'"
+msgstr ""
+
+#: builtin/rebase.c:720
+#, c-format
+msgid "Cannot store %s"
+msgstr ""
+
+#: builtin/rebase.c:817
+msgid "could not determine HEAD revision"
+msgstr ""
+
+#: builtin/rebase.c:940
+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/rebase.c:1021
+#, c-format
+msgid ""
+"\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/rebase.c:1313
+#, 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/rebase.c:1329
+#, 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/rebase.c:1359
+msgid "exec commands cannot contain newlines"
+msgstr ""
+
+#: builtin/rebase.c:1363
+msgid "empty exec command"
+msgstr ""
+
+#: builtin/rebase.c:1390
+msgid "rebase onto given branch instead of upstream"
+msgstr ""
+
+#: builtin/rebase.c:1392
+msgid "allow pre-rebase hook to run"
+msgstr ""
+
+#: builtin/rebase.c:1394
+msgid "be quiet. implies --no-stat"
+msgstr ""
+
+#: builtin/rebase.c:1400
+msgid "do not show diffstat of what changed upstream"
+msgstr ""
+
+#: builtin/rebase.c:1403
+msgid "add a Signed-off-by: line to each commit"
+msgstr ""
+
+#: builtin/rebase.c:1405 builtin/rebase.c:1409 builtin/rebase.c:1411
+msgid "passed to 'git am'"
+msgstr ""
+
+#: builtin/rebase.c:1413 builtin/rebase.c:1415
+msgid "passed to 'git apply'"
+msgstr ""
+
+#: builtin/rebase.c:1417 builtin/rebase.c:1420
+msgid "cherry-pick all commits, even if unchanged"
+msgstr ""
+
+#: builtin/rebase.c:1422
+msgid "continue"
+msgstr ""
+
+#: builtin/rebase.c:1425
+msgid "skip current patch and continue"
+msgstr ""
+
+#: builtin/rebase.c:1427
+msgid "abort and check out the original branch"
+msgstr ""
+
+#: builtin/rebase.c:1430
+msgid "abort but keep HEAD where it is"
+msgstr ""
+
+#: builtin/rebase.c:1431
+msgid "edit the todo list during an interactive rebase"
+msgstr ""
+
+#: builtin/rebase.c:1434
+msgid "show the patch file being applied or merged"
+msgstr ""
+
+#: builtin/rebase.c:1437
+msgid "use merging strategies to rebase"
+msgstr ""
+
+#: builtin/rebase.c:1441
+msgid "let the user edit the list of commits to rebase"
+msgstr ""
+
+#: builtin/rebase.c:1445
+msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
+msgstr ""
+
+#: builtin/rebase.c:1449
+msgid "preserve empty commits during rebase"
+msgstr ""
+
+#: builtin/rebase.c:1451
+msgid "move commits that begin with squash!/fixup! under -i"
+msgstr ""
+
+#: builtin/rebase.c:1457
+msgid "automatically stash/stash pop before and after"
+msgstr ""
+
+#: builtin/rebase.c:1459
+msgid "add exec lines after each commit of the editable list"
+msgstr ""
+
+#: builtin/rebase.c:1463
+msgid "allow rebasing commits with empty messages"
+msgstr ""
+
+#: builtin/rebase.c:1466
+msgid "try to rebase merges instead of skipping them"
+msgstr ""
+
+#: builtin/rebase.c:1469
+msgid "use 'merge-base --fork-point' to refine upstream"
+msgstr ""
+
+#: builtin/rebase.c:1471
+msgid "use the given merge strategy"
+msgstr ""
+
+#: builtin/rebase.c:1473 builtin/revert.c:114
+msgid "option"
+msgstr ""
+
+#: builtin/rebase.c:1474
+msgid "pass the argument through to the merge strategy"
+msgstr ""
+
+#: builtin/rebase.c:1477
+msgid "rebase all reachable commits up to the root(s)"
+msgstr ""
+
+#: builtin/rebase.c:1498
+msgid ""
+"the rebase.useBuiltin support has been removed!\n"
+"See its entry in 'git help config' for details."
+msgstr ""
+
+#: builtin/rebase.c:1504
+msgid "It looks like 'git am' is in progress. Cannot rebase."
+msgstr ""
+
+#: builtin/rebase.c:1545
+msgid ""
+"git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
+msgstr ""
+
+#: builtin/rebase.c:1549
+msgid "No rebase in progress?"
+msgstr ""
+
+#: builtin/rebase.c:1553
+msgid "The --edit-todo action can only be used during interactive rebase."
+msgstr ""
+
+#: builtin/rebase.c:1576
+msgid "Cannot read HEAD"
+msgstr ""
+
+#: builtin/rebase.c:1588
+msgid ""
+"You must edit all merge conflicts and then\n"
+"mark them as resolved using git add"
+msgstr ""
+
+#: builtin/rebase.c:1607
+msgid "could not discard worktree changes"
+msgstr ""
+
+#: builtin/rebase.c:1626
+#, c-format
+msgid "could not move back to %s"
+msgstr ""
+
+#: builtin/rebase.c:1637 builtin/rm.c:369
+#, c-format
+msgid "could not remove '%s'"
+msgstr ""
+
+#: builtin/rebase.c:1663
+#, c-format
+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/rebase.c:1684
+msgid "switch `C' expects a numerical value"
+msgstr ""
+
+#: builtin/rebase.c:1725
+#, c-format
+msgid "Unknown mode: %s"
+msgstr ""
+
+#: builtin/rebase.c:1747
+msgid "--strategy requires --merge or --interactive"
+msgstr ""
+
+#: builtin/rebase.c:1796
+msgid "cannot combine am options with either interactive or merge options"
+msgstr ""
+
+#: builtin/rebase.c:1815
+msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
+msgstr ""
+
+#: builtin/rebase.c:1819
+msgid ""
+"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
+msgstr ""
+
+#: builtin/rebase.c:1825
+msgid "cannot combine '--rebase-merges' with '--strategy-option'"
+msgstr ""
+
+#: builtin/rebase.c:1828
+msgid "cannot combine '--rebase-merges' with '--strategy'"
+msgstr ""
+
+#: builtin/rebase.c:1852
+#, c-format
+msgid "invalid upstream '%s'"
+msgstr ""
+
+#: builtin/rebase.c:1858
+msgid "Could not create new root commit"
+msgstr ""
+
+#: builtin/rebase.c:1876
+#, c-format
+msgid "'%s': need exactly one merge base"
+msgstr ""
+
+#: builtin/rebase.c:1883
+#, c-format
+msgid "Does not point to a valid commit '%s'"
+msgstr ""
+
+#: builtin/rebase.c:1908
+#, c-format
+msgid "fatal: no such branch/commit '%s'"
+msgstr ""
+
+#: builtin/rebase.c:1916 builtin/submodule--helper.c:38
+#: builtin/submodule--helper.c:1933
+#, c-format
+msgid "No such ref: %s"
+msgstr ""
+
+#: builtin/rebase.c:1927
+msgid "Could not resolve HEAD to a revision"
+msgstr ""
+
+#: builtin/rebase.c:1968
+msgid "Cannot autostash"
+msgstr ""
+
+#: builtin/rebase.c:1971
+#, c-format
+msgid "Unexpected stash response: '%s'"
+msgstr ""
+
+#: builtin/rebase.c:1977
+#, c-format
+msgid "Could not create directory for '%s'"
+msgstr ""
+
+#: builtin/rebase.c:1980
+#, c-format
+msgid "Created autostash: %s\n"
+msgstr ""
+
+#: builtin/rebase.c:1983
+msgid "could not reset --hard"
+msgstr ""
+
+#: builtin/rebase.c:1984 builtin/reset.c:114
+#, c-format
+msgid "HEAD is now at %s"
+msgstr ""
+
+#: builtin/rebase.c:2000
+msgid "Please commit or stash them."
+msgstr ""
+
+#: builtin/rebase.c:2027
+#, c-format
+msgid "could not parse '%s'"
+msgstr ""
+
+#: builtin/rebase.c:2040
+#, c-format
+msgid "could not switch to %s"
+msgstr ""
+
+#: builtin/rebase.c:2051
+msgid "HEAD is up to date."
+msgstr ""
+
+#: builtin/rebase.c:2053
+#, c-format
+msgid "Current branch %s is up to date.\n"
+msgstr ""
+
+#: builtin/rebase.c:2061
+msgid "HEAD is up to date, rebase forced."
+msgstr ""
+
+#: builtin/rebase.c:2063
+#, c-format
+msgid "Current branch %s is up to date, rebase forced.\n"
+msgstr ""
+
+#: builtin/rebase.c:2071
+msgid "The pre-rebase hook refused to rebase."
+msgstr ""
+
+#: builtin/rebase.c:2078
+#, c-format
+msgid "Changes to %s:\n"
+msgstr ""
+
+#: builtin/rebase.c:2081
+#, c-format
+msgid "Changes from %s to %s:\n"
+msgstr ""
+
+#: builtin/rebase.c:2106
+#, c-format
+msgid "First, rewinding head to replay your work on top of it...\n"
+msgstr ""
+
+#: builtin/rebase.c:2115
+msgid "Could not detach HEAD"
+msgstr ""
+
+#: builtin/rebase.c:2124
+#, c-format
+msgid "Fast-forwarded %s to %s.\n"
+msgstr ""
+
+#: builtin/receive-pack.c:33
+msgid "git receive-pack <git-dir>"
+msgstr ""
+
+#: builtin/receive-pack.c:833
+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"
+"You can set the 'receive.denyCurrentBranch' configuration variable\n"
+"to 'ignore' or 'warn' in the remote repository to allow pushing into\n"
+"its current branch; however, this is not recommended unless you\n"
+"arranged to update its work tree to match what you pushed in some\n"
+"other way.\n"
+"\n"
+"To squelch this message and still keep the default behaviour, set\n"
+"'receive.denyCurrentBranch' configuration variable to 'refuse'."
+msgstr ""
+
+#: builtin/receive-pack.c:853
+msgid ""
+"By default, deleting the current branch is denied, because the next\n"
+"'git clone' won't result in any file checked out, causing confusion.\n"
+"\n"
+"You can set 'receive.denyDeleteCurrent' configuration variable to\n"
+"'warn' or 'ignore' in the remote repository to allow deleting the\n"
+"current branch, with or without a warning message.\n"
+"\n"
+"To squelch this message, you can set it to 'refuse'."
+msgstr ""
+
+#: builtin/receive-pack.c:1940
+msgid "quiet"
+msgstr ""
+
+#: builtin/receive-pack.c:1954
+msgid "You must specify a directory."
+msgstr ""
+
+#: builtin/reflog.c:17
+msgid ""
+"git reflog expire [--expire=<time>] [--expire-unreachable=<time>] [--"
+"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] "
+"<refs>..."
+msgstr ""
+
+#: builtin/reflog.c:22
+msgid ""
+"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] "
+"<refs>..."
+msgstr ""
+
+#: builtin/reflog.c:25
+msgid "git reflog exists <ref>"
+msgstr ""
+
+#: builtin/reflog.c:567 builtin/reflog.c:572
+#, c-format
+msgid "'%s' is not a valid timestamp"
+msgstr ""
+
+#: builtin/reflog.c:605
+#, c-format
+msgid "Marking reachable objects..."
+msgstr ""
+
+#: builtin/reflog.c:643
+#, c-format
+msgid "%s points nowhere!"
+msgstr ""
+
+#: builtin/reflog.c:695
+msgid "no reflog specified to delete"
+msgstr ""
+
+#: builtin/reflog.c:704
+#, c-format
+msgid "not a reflog: %s"
+msgstr ""
+
+#: builtin/reflog.c:709
+#, c-format
+msgid "no reflog for '%s'"
+msgstr ""
+
+#: builtin/reflog.c:755
+#, c-format
+msgid "invalid ref format: %s"
+msgstr ""
+
+#: builtin/reflog.c:764
+msgid "git reflog [ show | expire | delete | exists ]"
+msgstr ""
+
+#: builtin/remote.c:16
+msgid "git remote [-v | --verbose]"
+msgstr ""
+
+#: builtin/remote.c:17
+msgid ""
+"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
+"mirror=<fetch|push>] <name> <url>"
+msgstr ""
+
+#: builtin/remote.c:18 builtin/remote.c:38
+msgid "git remote rename <old> <new>"
+msgstr ""
+
+#: builtin/remote.c:19 builtin/remote.c:43
+msgid "git remote remove <name>"
+msgstr ""
+
+#: builtin/remote.c:20 builtin/remote.c:48
+msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
+msgstr ""
+
+#: builtin/remote.c:21
+msgid "git remote [-v | --verbose] show [-n] <name>"
+msgstr ""
+
+#: builtin/remote.c:22
+msgid "git remote prune [-n | --dry-run] <name>"
+msgstr ""
+
+#: builtin/remote.c:23
+msgid ""
+"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
+msgstr ""
+
+#: builtin/remote.c:24
+msgid "git remote set-branches [--add] <name> <branch>..."
+msgstr ""
+
+#: builtin/remote.c:25 builtin/remote.c:74
+msgid "git remote get-url [--push] [--all] <name>"
+msgstr ""
+
+#: builtin/remote.c:26 builtin/remote.c:79
+msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
+msgstr ""
+
+#: builtin/remote.c:27 builtin/remote.c:80
+msgid "git remote set-url --add <name> <newurl>"
+msgstr ""
+
+#: builtin/remote.c:28 builtin/remote.c:81
+msgid "git remote set-url --delete <name> <url>"
+msgstr ""
+
+#: builtin/remote.c:33
+msgid "git remote add [<options>] <name> <url>"
+msgstr ""
+
+#: builtin/remote.c:53
+msgid "git remote set-branches <name> <branch>..."
+msgstr ""
+
+#: builtin/remote.c:54
+msgid "git remote set-branches --add <name> <branch>..."
+msgstr ""
+
+#: builtin/remote.c:59
+msgid "git remote show [<options>] <name>"
+msgstr ""
+
+#: builtin/remote.c:64
+msgid "git remote prune [<options>] <name>"
+msgstr ""
+
+#: builtin/remote.c:69
+msgid "git remote update [<options>] [<group> | <remote>]..."
+msgstr ""
+
+#: builtin/remote.c:98
+#, c-format
+msgid "Updating %s"
+msgstr ""
+
+#: builtin/remote.c:130
+msgid ""
+"--mirror is dangerous and deprecated; please\n"
+"\t use --mirror=fetch or --mirror=push instead"
+msgstr ""
+
+#: builtin/remote.c:147
+#, c-format
+msgid "unknown mirror argument: %s"
+msgstr ""
+
+#: builtin/remote.c:163
+msgid "fetch the remote branches"
+msgstr ""
+
+#: builtin/remote.c:165
+msgid "import all tags and associated objects when fetching"
+msgstr ""
+
+#: builtin/remote.c:168
+msgid "or do not fetch any tag at all (--no-tags)"
+msgstr ""
+
+#: builtin/remote.c:170
+msgid "branch(es) to track"
+msgstr ""
+
+#: builtin/remote.c:171
+msgid "master branch"
+msgstr ""
+
+#: builtin/remote.c:173
+msgid "set up remote as a mirror to push to or fetch from"
+msgstr ""
+
+#: builtin/remote.c:185
+msgid "specifying a master branch makes no sense with --mirror"
+msgstr ""
+
+#: builtin/remote.c:187
+msgid "specifying branches to track makes sense only with fetch mirrors"
+msgstr ""
+
+#: builtin/remote.c:194 builtin/remote.c:636
+#, c-format
+msgid "remote %s already exists."
+msgstr ""
+
+#: builtin/remote.c:198 builtin/remote.c:640
+#, c-format
+msgid "'%s' is not a valid remote name"
+msgstr ""
+
+#: builtin/remote.c:238
+#, c-format
+msgid "Could not setup master '%s'"
+msgstr ""
+
+#: builtin/remote.c:344
+#, c-format
+msgid "Could not get fetch map for refspec %s"
+msgstr ""
+
+#: builtin/remote.c:443 builtin/remote.c:451
+msgid "(matching)"
+msgstr ""
+
+#: builtin/remote.c:455
+msgid "(delete)"
+msgstr ""
+
+#: builtin/remote.c:629 builtin/remote.c:765 builtin/remote.c:864
+#, c-format
+msgid "No such remote: '%s'"
+msgstr ""
+
+#: builtin/remote.c:646
+#, c-format
+msgid "Could not rename config section '%s' to '%s'"
+msgstr ""
+
+#: 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 ""
+
+#: builtin/remote.c:702
+#, c-format
+msgid "deleting '%s' failed"
+msgstr ""
+
+#: builtin/remote.c:736
+#, c-format
+msgid "creating '%s' failed"
+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] ""
+
+#: builtin/remote.c:816
+#, c-format
+msgid "Could not remove config section '%s'"
+msgstr ""
+
+#: builtin/remote.c:917
+#, c-format
+msgid " new (next fetch will store in remotes/%s)"
+msgstr ""
+
+#: builtin/remote.c:920
+msgid " tracked"
+msgstr ""
+
+#: builtin/remote.c:922
+msgid " stale (use 'git remote prune' to remove)"
+msgstr ""
+
+#: builtin/remote.c:924
+msgid " ???"
+msgstr ""
+
+#: builtin/remote.c:965
+#, c-format
+msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
+msgstr ""
+
+#: builtin/remote.c:974
+#, c-format
+msgid "rebases interactively onto remote %s"
+msgstr ""
+
+#: builtin/remote.c:976
+#, c-format
+msgid "rebases interactively (with merges) onto remote %s"
+msgstr ""
+
+#: builtin/remote.c:979
+#, c-format
+msgid "rebases onto remote %s"
+msgstr ""
+
+#: builtin/remote.c:983
+#, c-format
+msgid " merges with remote %s"
+msgstr ""
+
+#: builtin/remote.c:986
+#, c-format
+msgid "merges with remote %s"
+msgstr ""
+
+#: builtin/remote.c:989
+#, c-format
+msgid "%-*s and with remote %s\n"
+msgstr ""
+
+#: builtin/remote.c:1032
+msgid "create"
+msgstr ""
+
+#: builtin/remote.c:1035
+msgid "delete"
+msgstr ""
+
+#: builtin/remote.c:1039
+msgid "up to date"
+msgstr ""
+
+#: builtin/remote.c:1042
+msgid "fast-forwardable"
+msgstr ""
+
+#: builtin/remote.c:1045
+msgid "local out of date"
+msgstr ""
+
+#: builtin/remote.c:1052
+#, c-format
+msgid " %-*s forces to %-*s (%s)"
+msgstr ""
+
+#: builtin/remote.c:1055
+#, c-format
+msgid " %-*s pushes to %-*s (%s)"
+msgstr ""
+
+#: builtin/remote.c:1059
+#, c-format
+msgid " %-*s forces to %s"
+msgstr ""
+
+#: builtin/remote.c:1062
+#, c-format
+msgid " %-*s pushes to %s"
+msgstr ""
+
+#: builtin/remote.c:1130
+msgid "do not query remotes"
+msgstr ""
+
+#: builtin/remote.c:1157
+#, c-format
+msgid "* remote %s"
+msgstr ""
+
+#: builtin/remote.c:1158
+#, c-format
+msgid " Fetch URL: %s"
+msgstr ""
+
+#: builtin/remote.c:1159 builtin/remote.c:1175 builtin/remote.c:1314
+msgid "(no URL)"
+msgstr ""
+
+#. 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 ""
+
+#: builtin/remote.c:1177 builtin/remote.c:1179 builtin/remote.c:1181
+#, c-format
+msgid " HEAD branch: %s"
+msgstr ""
+
+#: builtin/remote.c:1177
+msgid "(not queried)"
+msgstr ""
+
+#: builtin/remote.c:1179
+msgid "(unknown)"
+msgstr ""
+
+#: builtin/remote.c:1183
+#, c-format
+msgid ""
+" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: builtin/remote.c:1244
+msgid "delete refs/remotes/<name>/HEAD"
+msgstr ""
+
+#: builtin/remote.c:1259
+msgid "Cannot determine remote HEAD"
+msgstr ""
+
+#: builtin/remote.c:1261
+msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
+msgstr ""
+
+#: builtin/remote.c:1271
+#, c-format
+msgid "Could not delete %s"
+msgstr ""
+
+#: builtin/remote.c:1279
+#, c-format
+msgid "Not a valid ref: %s"
+msgstr ""
+
+#: builtin/remote.c:1281
+#, c-format
+msgid "Could not setup %s"
+msgstr ""
+
+#: builtin/remote.c:1299
+#, c-format
+msgid " %s will become dangling!"
+msgstr ""
+
+#: builtin/remote.c:1300
+#, c-format
+msgid " %s has become dangling!"
+msgstr ""
+
+#: builtin/remote.c:1310
+#, c-format
+msgid "Pruning %s"
+msgstr ""
+
+#: builtin/remote.c:1311
+#, c-format
+msgid "URL: %s"
+msgstr ""
+
+#: builtin/remote.c:1327
+#, c-format
+msgid " * [would prune] %s"
+msgstr ""
+
+#: builtin/remote.c:1330
+#, c-format
+msgid " * [pruned] %s"
+msgstr ""
+
+#: builtin/remote.c:1375
+msgid "prune remotes after fetching"
+msgstr ""
+
+#: builtin/remote.c:1438 builtin/remote.c:1492 builtin/remote.c:1560
+#, c-format
+msgid "No such remote '%s'"
+msgstr ""
+
+#: builtin/remote.c:1454
+msgid "add branch"
+msgstr ""
+
+#: builtin/remote.c:1461
+msgid "no remote specified"
+msgstr ""
+
+#: builtin/remote.c:1478
+msgid "query push URLs rather than fetch URLs"
+msgstr ""
+
+#: builtin/remote.c:1480
+msgid "return all URLs"
+msgstr ""
+
+#: builtin/remote.c:1508
+#, c-format
+msgid "no URLs configured for remote '%s'"
+msgstr ""
+
+#: builtin/remote.c:1534
+msgid "manipulate push URLs"
+msgstr ""
+
+#: builtin/remote.c:1536
+msgid "add URL"
+msgstr ""
+
+#: builtin/remote.c:1538
+msgid "delete URLs"
+msgstr ""
+
+#: builtin/remote.c:1545
+msgid "--add --delete doesn't make sense"
+msgstr ""
+
+#: builtin/remote.c:1584
+#, c-format
+msgid "Invalid old URL pattern: %s"
+msgstr ""
+
+#: builtin/remote.c:1592
+#, c-format
+msgid "No such URL found: %s"
+msgstr ""
+
+#: builtin/remote.c:1594
+msgid "Will not delete all non-push URLs"
+msgstr ""
+
+#: builtin/remote.c:1610
+msgid "be verbose; must be placed before a subcommand"
+msgstr ""
+
+#: builtin/remote.c:1641
+#, c-format
+msgid "Unknown subcommand: %s"
+msgstr ""
+
+#: builtin/repack.c:22
+msgid "git repack [<options>]"
+msgstr ""
+
+#: 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 ""
+
+#: builtin/repack.c:200
+msgid "could not start pack-objects to repack promisor objects"
+msgstr ""
+
+#: builtin/repack.c:239 builtin/repack.c:414
+msgid "repack: Expecting full hex object ID lines only from pack-objects."
+msgstr ""
+
+#: builtin/repack.c:256
+msgid "could not finish pack-objects to repack promisor objects"
+msgstr ""
+
+#: builtin/repack.c:294
+msgid "pack everything in a single pack"
+msgstr ""
+
+#: builtin/repack.c:296
+msgid "same as -a, and turn unreachable objects loose"
+msgstr ""
+
+#: builtin/repack.c:299
+msgid "remove redundant packs, and run git-prune-packed"
+msgstr ""
+
+#: builtin/repack.c:301
+msgid "pass --no-reuse-delta to git-pack-objects"
+msgstr ""
+
+#: builtin/repack.c:303
+msgid "pass --no-reuse-object to git-pack-objects"
+msgstr ""
+
+#: builtin/repack.c:305
+msgid "do not run git-update-server-info"
+msgstr ""
+
+#: builtin/repack.c:308
+msgid "pass --local to git-pack-objects"
+msgstr ""
+
+#: builtin/repack.c:310
+msgid "write bitmap index"
+msgstr ""
+
+#: builtin/repack.c:312
+msgid "pass --delta-islands to git-pack-objects"
+msgstr ""
+
+#: builtin/repack.c:313
+msgid "approxidate"
+msgstr ""
+
+#: builtin/repack.c:314
+msgid "with -A, do not loosen objects older than this"
+msgstr ""
+
+#: builtin/repack.c:316
+msgid "with -a, repack unreachable objects"
+msgstr ""
+
+#: builtin/repack.c:318
+msgid "size of the window used for delta compression"
+msgstr ""
+
+#: builtin/repack.c:319 builtin/repack.c:325
+msgid "bytes"
+msgstr ""
+
+#: builtin/repack.c:320
+msgid "same as the above, but limit memory size instead of entries count"
+msgstr ""
+
+#: builtin/repack.c:322
+msgid "limits the maximum delta depth"
+msgstr ""
+
+#: builtin/repack.c:324
+msgid "limits the maximum number of threads"
+msgstr ""
+
+#: builtin/repack.c:326
+msgid "maximum size of each packfile"
+msgstr ""
+
+#: builtin/repack.c:328
+msgid "repack objects in packs marked with .keep"
+msgstr ""
+
+#: builtin/repack.c:330
+msgid "do not repack this pack"
+msgstr ""
+
+#: builtin/repack.c:340
+msgid "cannot delete packs in a precious-objects repo"
+msgstr ""
+
+#: builtin/repack.c:344
+msgid "--keep-unreachable and -A are incompatible"
+msgstr ""
+
+#: builtin/repack.c:423
+msgid "Nothing new to pack."
+msgstr ""
+
+#: builtin/repack.c:484
+#, 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 ""
+
+#: builtin/repack.c:532
+#, c-format
+msgid "failed to remove '%s'"
+msgstr ""
+
+#: builtin/replace.c:22
+msgid "git replace [-f] <object> <replacement>"
+msgstr ""
+
+#: builtin/replace.c:23
+msgid "git replace [-f] --edit <object>"
+msgstr ""
+
+#: builtin/replace.c:24
+msgid "git replace [-f] --graft <commit> [<parent>...]"
+msgstr ""
+
+#: builtin/replace.c:25
+msgid "git replace [-f] --convert-graft-file"
+msgstr ""
+
+#: builtin/replace.c:26
+msgid "git replace -d <object>..."
+msgstr ""
+
+#: builtin/replace.c:27
+msgid "git replace [--format=<format>] [-l [<pattern>]]"
+msgstr ""
+
+#: builtin/replace.c:90
+#, c-format
+msgid ""
+"invalid replace format '%s'\n"
+"valid formats are 'short', 'medium' and 'long'"
+msgstr ""
+
+#: builtin/replace.c:125
+#, c-format
+msgid "replace ref '%s' not found"
+msgstr ""
+
+#: builtin/replace.c:141
+#, c-format
+msgid "Deleted replace ref '%s'"
+msgstr ""
+
+#: builtin/replace.c:153
+#, c-format
+msgid "'%s' is not a valid ref name"
+msgstr ""
+
+#: builtin/replace.c:158
+#, c-format
+msgid "replace ref '%s' already exists"
+msgstr ""
+
+#: 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 ""
+
+#: builtin/replace.c:229
+#, c-format
+msgid "unable to open %s for writing"
+msgstr ""
+
+#: builtin/replace.c:242
+msgid "cat-file reported failure"
+msgstr ""
+
+#: builtin/replace.c:258
+#, c-format
+msgid "unable to open %s for reading"
+msgstr ""
+
+#: builtin/replace.c:272
+msgid "unable to spawn mktree"
+msgstr ""
+
+#: builtin/replace.c:276
+msgid "unable to read from mktree"
+msgstr ""
+
+#: builtin/replace.c:285
+msgid "mktree reported failure"
+msgstr ""
+
+#: builtin/replace.c:289
+msgid "mktree did not return an object name"
+msgstr ""
+
+#: builtin/replace.c:298
+#, c-format
+msgid "unable to fstat %s"
+msgstr ""
+
+#: builtin/replace.c:303
+msgid "unable to write object to database"
+msgstr ""
+
+#: 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 ""
+
+#: builtin/replace.c:326
+#, c-format
+msgid "unable to get object type for %s"
+msgstr ""
+
+#: builtin/replace.c:342
+msgid "editing object file failed"
+msgstr ""
+
+#: builtin/replace.c:351
+#, c-format
+msgid "new object is the same as the old one: '%s'"
+msgstr ""
+
+#: builtin/replace.c:383
+#, c-format
+msgid "could not parse %s as a commit"
+msgstr ""
+
+#: builtin/replace.c:414
+#, c-format
+msgid "bad mergetag in commit '%s'"
+msgstr ""
+
+#: builtin/replace.c:416
+#, c-format
+msgid "malformed mergetag in commit '%s'"
+msgstr ""
+
+#: builtin/replace.c:428
+#, c-format
+msgid ""
+"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
+"instead of --graft"
+msgstr ""
+
+#: builtin/replace.c:467
+#, c-format
+msgid "the original commit '%s' has a gpg signature"
+msgstr ""
+
+#: builtin/replace.c:468
+msgid "the signature will be removed in the replacement commit!"
+msgstr ""
+
+#: builtin/replace.c:478
+#, c-format
+msgid "could not write replacement commit for: '%s'"
+msgstr ""
+
+#: builtin/replace.c:486
+#, c-format
+msgid "graft for '%s' unnecessary"
+msgstr ""
+
+#: builtin/replace.c:490
+#, c-format
+msgid "new commit is the same as the old one: '%s'"
+msgstr ""
+
+#: builtin/replace.c:525
+#, c-format
+msgid ""
+"could not convert the following graft(s):\n"
+"%s"
+msgstr ""
+
+#: builtin/replace.c:546
+msgid "list replace refs"
+msgstr ""
+
+#: builtin/replace.c:547
+msgid "delete replace refs"
+msgstr ""
+
+#: builtin/replace.c:548
+msgid "edit existing object"
+msgstr ""
+
+#: builtin/replace.c:549
+msgid "change a commit's parents"
+msgstr ""
+
+#: builtin/replace.c:550
+msgid "convert existing graft file"
+msgstr ""
+
+#: builtin/replace.c:551
+msgid "replace the ref if it exists"
+msgstr ""
+
+#: builtin/replace.c:553
+msgid "do not pretty-print contents for --edit"
+msgstr ""
+
+#: builtin/replace.c:554
+msgid "use this format"
+msgstr ""
+
+#: builtin/replace.c:567
+msgid "--format cannot be used when not listing"
+msgstr ""
+
+#: builtin/replace.c:575
+msgid "-f only makes sense when writing a replacement"
+msgstr ""
+
+#: builtin/replace.c:579
+msgid "--raw only makes sense with --edit"
+msgstr ""
+
+#: builtin/replace.c:585
+msgid "-d needs at least one argument"
+msgstr ""
+
+#: builtin/replace.c:591
+msgid "bad number of arguments"
+msgstr ""
+
+#: builtin/replace.c:597
+msgid "-e needs exactly one argument"
+msgstr ""
+
+#: builtin/replace.c:603
+msgid "-g needs at least one argument"
+msgstr ""
+
+#: builtin/replace.c:609
+msgid "--convert-graft-file takes no argument"
+msgstr ""
+
+#: builtin/replace.c:615
+msgid "only one pattern can be given with -l"
+msgstr ""
+
+#: builtin/rerere.c:13
+msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
+msgstr ""
+
+#: builtin/rerere.c:60
+msgid "register clean resolutions in index"
+msgstr ""
+
+#: builtin/rerere.c:79
+msgid "'git rerere forget' without paths is deprecated"
+msgstr ""
+
+#: builtin/rerere.c:113
+#, c-format
+msgid "unable to generate diff for '%s'"
+msgstr ""
+
+#: builtin/reset.c:32
+msgid ""
+"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
+msgstr ""
+
+#: builtin/reset.c:33
+msgid "git reset [-q] [<tree-ish>] [--] <paths>..."
+msgstr ""
+
+#: builtin/reset.c:34
+msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
+msgstr ""
+
+#: builtin/reset.c:40
+msgid "mixed"
+msgstr ""
+
+#: builtin/reset.c:40
+msgid "soft"
+msgstr ""
+
+#: builtin/reset.c:40
+msgid "hard"
+msgstr ""
+
+#: builtin/reset.c:40
+msgid "merge"
+msgstr ""
+
+#: builtin/reset.c:40
+msgid "keep"
+msgstr ""
+
+#: builtin/reset.c:81
+msgid "You do not have a valid HEAD."
+msgstr ""
+
+#: builtin/reset.c:83
+msgid "Failed to find tree of HEAD."
+msgstr ""
+
+#: builtin/reset.c:89
+#, c-format
+msgid "Failed to find tree of %s."
+msgstr ""
+
+#: builtin/reset.c:193
+#, c-format
+msgid "Cannot do a %s reset in the middle of a merge."
+msgstr ""
+
+#: 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 ""
+"\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 ""
+
+#: 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:405
+msgid "cannot combine --exclude-promisor-objects and --missing"
+msgstr ""
+
+#: builtin/rev-list.c:466
+msgid "object filtering requires --objects"
+msgstr ""
+
+#: builtin/rev-list.c:469
+#, c-format
+msgid "invalid sparse value '%s'"
+msgstr ""
+
+#: builtin/rev-list.c:510
+msgid "rev-list does not support display of notes"
+msgstr ""
+
+#: builtin/rev-list.c:513
+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 ""
+"git rev-parse --parseopt [<options>] -- [<args>...]\n"
+" or: git rev-parse --sq-quote [<arg>...]\n"
+" or: git rev-parse [<options>] [<arg>...]\n"
"\n"
-"To squelch this message and still keep the default behaviour, set\n"
-"'receive.denyCurrentBranch' configuration variable to 'refuse'."
+"Run \"git rev-parse --parseopt -h\" for more information on the first usage."
+msgstr ""
+
+#: builtin/revert.c:24
+msgid "git revert [<options>] <commit-ish>..."
+msgstr ""
+
+#: builtin/revert.c:25
+msgid "git revert <subcommand>"
+msgstr ""
+
+#: builtin/revert.c:30
+msgid "git cherry-pick [<options>] <commit-ish>..."
+msgstr ""
+
+#: builtin/revert.c:31
+msgid "git cherry-pick <subcommand>"
+msgstr ""
+
+#: builtin/revert.c:72
+#, c-format
+msgid "option `%s' expects a number greater than zero"
+msgstr ""
+
+#: builtin/revert.c:92
+#, c-format
+msgid "%s: %s cannot be used with %s"
+msgstr ""
+
+#: 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:106
+msgid "don't automatically commit"
+msgstr ""
+
+#: builtin/revert.c:107
+msgid "edit the commit message"
+msgstr ""
+
+#: builtin/revert.c:110
+msgid "parent-number"
msgstr ""
-#: builtin/receive-pack.c:858
+#: builtin/revert.c:111
+msgid "select mainline parent"
+msgstr ""
+
+#: builtin/revert.c:113
+msgid "merge strategy"
+msgstr ""
+
+#: builtin/revert.c:115
+msgid "option for merge strategy"
+msgstr ""
+
+#: builtin/revert.c:124
+msgid "append commit name"
+msgstr ""
+
+#: builtin/revert.c:126
+msgid "preserve initially empty commits"
+msgstr ""
+
+#: builtin/revert.c:128
+msgid "keep redundant, empty commits"
+msgstr ""
+
+#: builtin/revert.c:227
+msgid "revert failed"
+msgstr ""
+
+#: builtin/revert.c:240
+msgid "cherry-pick failed"
+msgstr ""
+
+#: builtin/rm.c:19
+msgid "git rm [<options>] [--] <file>..."
+msgstr ""
+
+#: builtin/rm.c:207
+msgid ""
+"the following file has staged content different from both the\n"
+"file and the HEAD:"
+msgid_plural ""
+"the following files have staged content different from both the\n"
+"file and the HEAD:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/rm.c:212
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"
+"(use -f to force removal)"
+msgstr ""
+
+#: 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"
-"To squelch this message, you can set it to 'refuse'."
+"(use --cached to keep the file, or -f to force removal)"
msgstr ""
-#: builtin/receive-pack.c:1933
-msgid "quiet"
+#: 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 ""
-#: builtin/receive-pack.c:1947
-msgid "You must specify a directory."
+#: builtin/rm.c:243
+msgid "only remove from the index"
+msgstr ""
+
+#: builtin/rm.c:244
+msgid "override the up-to-date check"
+msgstr ""
+
+#: builtin/rm.c:245
+msgid "allow recursive removal"
+msgstr ""
+
+#: builtin/rm.c:247
+msgid "exit with a zero status even if nothing matched"
msgstr ""
-#: builtin/reflog.c:424
+#: builtin/rm.c:289
+msgid "please stage your changes to .gitmodules or stash them to proceed"
+msgstr ""
+
+#: builtin/rm.c:307
#, c-format
-msgid "'%s' for '%s' is not a valid timestamp"
+msgid "not removing '%s' recursively without -r"
msgstr ""
-#: builtin/reflog.c:541 builtin/reflog.c:546
+#: builtin/rm.c:346
#, c-format
-msgid "'%s' is not a valid timestamp"
+msgid "git rm: unable to remove %s"
msgstr ""
-#: builtin/remote.c:13
-msgid "git remote [-v | --verbose]"
+#: 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/remote.c:14
+#: builtin/shortlog.c:301
+msgid "too many arguments given outside repository"
+msgstr ""
+
+#: builtin/show-branch.c:13
msgid ""
-"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
-"mirror=<fetch|push>] <name> <url>"
+"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
+"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
+"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
+"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
msgstr ""
-#: builtin/remote.c:15 builtin/remote.c:35
-msgid "git remote rename <old> <new>"
+#: builtin/show-branch.c:17
+msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
msgstr ""
-#: builtin/remote.c:16 builtin/remote.c:40
-msgid "git remote remove <name>"
+#: 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:549
+#, c-format
+msgid "no matching refs with %s"
msgstr ""
-#: builtin/remote.c:17 builtin/remote.c:45
-msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
+#: builtin/show-branch.c:646
+msgid "show remote-tracking and local branches"
msgstr ""
-#: builtin/remote.c:18
-msgid "git remote [-v | --verbose] show [-n] <name>"
+#: builtin/show-branch.c:648
+msgid "show remote-tracking branches"
+msgstr ""
+
+#: builtin/show-branch.c:650
+msgid "color '*!+-' corresponding to the branch"
+msgstr ""
+
+#: builtin/show-branch.c:652
+msgid "show <n> more commits after the common ancestor"
+msgstr ""
+
+#: builtin/show-branch.c:654
+msgid "synonym to more=-1"
+msgstr ""
+
+#: builtin/show-branch.c:655
+msgid "suppress naming strings"
+msgstr ""
+
+#: builtin/show-branch.c:657
+msgid "include the current branch"
+msgstr ""
+
+#: builtin/show-branch.c:659
+msgid "name commits with their object names"
+msgstr ""
+
+#: builtin/show-branch.c:661
+msgid "show possible merge bases"
+msgstr ""
+
+#: builtin/show-branch.c:663
+msgid "show refs unreachable from any other ref"
+msgstr ""
+
+#: builtin/show-branch.c:665
+msgid "show commits in topological order"
+msgstr ""
+
+#: builtin/show-branch.c:668
+msgid "show only commits not on the first branch"
+msgstr ""
+
+#: builtin/show-branch.c:670
+msgid "show merges reachable from only one tip"
+msgstr ""
+
+#: builtin/show-branch.c:672
+msgid "topologically sort, maintaining date order where possible"
+msgstr ""
+
+#: builtin/show-branch.c:675
+msgid "<n>[,<base>]"
+msgstr ""
+
+#: builtin/show-branch.c:676
+msgid "show <n> most recent ref-log entries starting at base"
+msgstr ""
+
+#: builtin/show-branch.c:712
+msgid ""
+"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
+msgstr ""
+
+#: builtin/show-branch.c:736
+msgid "no branches given, and HEAD is not valid"
+msgstr ""
+
+#: builtin/show-branch.c:739
+msgid "--reflog option needs one branch name"
+msgstr ""
+
+#: builtin/show-branch.c:742
+#, 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:746
+#, c-format
+msgid "no such ref %s"
+msgstr ""
+
+#: builtin/show-branch.c:832
+#, 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:836
+#, c-format
+msgid "'%s' is not a valid ref."
+msgstr ""
+
+#: builtin/show-branch.c:839
+#, 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/remote.c:19
-msgid "git remote prune [-n | --dry-run] <name>"
+#: builtin/show-ref.c:179
+msgid "show refs from stdin that aren't in local repository"
msgstr ""
-#: builtin/remote.c:20
-msgid ""
-"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
+#: builtin/stash.c:22 builtin/stash.c:37
+msgid "git stash list [<options>]"
msgstr ""
-#: builtin/remote.c:21
-msgid "git remote set-branches [--add] <name> <branch>..."
+#: builtin/stash.c:23 builtin/stash.c:42
+msgid "git stash show [<options>] [<stash>]"
msgstr ""
-#: builtin/remote.c:22 builtin/remote.c:71
-msgid "git remote get-url [--push] [--all] <name>"
+#: builtin/stash.c:24 builtin/stash.c:47
+msgid "git stash drop [-q|--quiet] [<stash>]"
msgstr ""
-#: builtin/remote.c:23 builtin/remote.c:76
-msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
+#: builtin/stash.c:25
+msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
msgstr ""
-#: builtin/remote.c:24 builtin/remote.c:77
-msgid "git remote set-url --add <name> <newurl>"
+#: builtin/stash.c:26 builtin/stash.c:62
+msgid "git stash branch <branchname> [<stash>]"
msgstr ""
-#: builtin/remote.c:25 builtin/remote.c:78
-msgid "git remote set-url --delete <name> <url>"
+#: builtin/stash.c:27 builtin/stash.c:67
+msgid "git stash clear"
msgstr ""
-#: builtin/remote.c:30
-msgid "git remote add [<options>] <name> <url>"
+#: 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/remote.c:50
-msgid "git remote set-branches <name> <branch>..."
+#: 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/remote.c:51
-msgid "git remote set-branches --add <name> <branch>..."
+#: builtin/stash.c:52
+msgid "git stash pop [--index] [-q|--quiet] [<stash>]"
msgstr ""
-#: builtin/remote.c:56
-msgid "git remote show [<options>] <name>"
+#: builtin/stash.c:57
+msgid "git stash apply [--index] [-q|--quiet] [<stash>]"
msgstr ""
-#: builtin/remote.c:61
-msgid "git remote prune [<options>] <name>"
+#: builtin/stash.c:72
+msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>"
msgstr ""
-#: builtin/remote.c:66
-msgid "git remote update [<options>] [<group> | <remote>]..."
+#: builtin/stash.c:127
+#, c-format
+msgid "'%s' is not a stash-like commit"
msgstr ""
-#: builtin/remote.c:95
+#: builtin/stash.c:147
#, c-format
-msgid "Updating %s"
+msgid "Too many revisions specified:%s"
msgstr ""
-#: builtin/remote.c:127
-msgid ""
-"--mirror is dangerous and deprecated; please\n"
-"\t use --mirror=fetch or --mirror=push instead"
+#: builtin/stash.c:161 git-legacy-stash.sh:548
+msgid "No stash entries found."
msgstr ""
-#: builtin/remote.c:144
+#: builtin/stash.c:175
#, c-format
-msgid "unknown mirror argument: %s"
-msgstr ""
-
-#: builtin/remote.c:160
-msgid "fetch the remote branches"
+msgid "%s is not a valid reference"
msgstr ""
-#: builtin/remote.c:162
-msgid "import all tags and associated objects when fetching"
+#: builtin/stash.c:224 git-legacy-stash.sh:75
+msgid "git stash clear with parameters is unimplemented"
msgstr ""
-#: builtin/remote.c:165
-msgid "or do not fetch any tag at all (--no-tags)"
+#: builtin/stash.c:403
+msgid "cannot apply a stash in the middle of a merge"
msgstr ""
-#: builtin/remote.c:167
-msgid "branch(es) to track"
+#: builtin/stash.c:414
+#, c-format
+msgid "could not generate diff %s^!."
msgstr ""
-#: builtin/remote.c:168
-msgid "master branch"
+#: builtin/stash.c:421
+msgid "conflicts in index.Try without --index."
msgstr ""
-#: builtin/remote.c:169
-msgid "push|fetch"
+#: builtin/stash.c:427
+msgid "could not save index tree"
msgstr ""
-#: builtin/remote.c:170
-msgid "set up remote as a mirror to push to or fetch from"
+#: builtin/stash.c:434
+msgid "could not restore untracked files from stash"
msgstr ""
-#: builtin/remote.c:182
-msgid "specifying a master branch makes no sense with --mirror"
+#: builtin/stash.c:448
+#, c-format
+msgid "Merging %s with %s"
msgstr ""
-#: builtin/remote.c:184
-msgid "specifying branches to track makes sense only with fetch mirrors"
+#: builtin/stash.c:458 git-legacy-stash.sh:680
+msgid "Index was not unstashed."
msgstr ""
-#: builtin/remote.c:191 builtin/remote.c:630
-#, c-format
-msgid "remote %s already exists."
+#: builtin/stash.c:516 builtin/stash.c:615
+msgid "attempt to recreate the index"
msgstr ""
-#: builtin/remote.c:195 builtin/remote.c:634
+#: builtin/stash.c:549
#, c-format
-msgid "'%s' is not a valid remote name"
+msgid "Dropped %s (%s)"
msgstr ""
-#: builtin/remote.c:235
+#: builtin/stash.c:552
#, c-format
-msgid "Could not setup master '%s'"
+msgid "%s: Could not drop stash entry"
msgstr ""
-#: builtin/remote.c:337
+#: builtin/stash.c:577
#, c-format
-msgid "Could not get fetch map for refspec %s"
+msgid "'%s' is not a stash reference"
msgstr ""
-#: builtin/remote.c:438 builtin/remote.c:446
-msgid "(matching)"
+#: builtin/stash.c:627 git-legacy-stash.sh:694
+msgid "The stash entry is kept in case you need it again."
msgstr ""
-#: builtin/remote.c:450
-msgid "(delete)"
+#: builtin/stash.c:650 git-legacy-stash.sh:712
+msgid "No branch name specified"
msgstr ""
-#: builtin/remote.c:623 builtin/remote.c:758 builtin/remote.c:857
+#: builtin/stash.c:789 builtin/stash.c:826
#, c-format
-msgid "No such remote: %s"
+msgid "Cannot update %s with %s"
msgstr ""
-#: builtin/remote.c:640
-#, c-format
-msgid "Could not rename config section '%s' to '%s'"
+#: builtin/stash.c:807 builtin/stash.c:1474 builtin/stash.c:1510
+msgid "stash message"
msgstr ""
-#: builtin/remote.c:660
-#, c-format
-msgid ""
-"Not updating non-default fetch refspec\n"
-"\t%s\n"
-"\tPlease update the configuration manually if necessary."
+#: builtin/stash.c:817
+msgid "\"git stash store\" requires one <commit> argument"
msgstr ""
-#: builtin/remote.c:696
-#, c-format
-msgid "deleting '%s' failed"
+#: builtin/stash.c:1039 git-legacy-stash.sh:217
+msgid "No changes selected"
msgstr ""
-#: builtin/remote.c:730
-#, c-format
-msgid "creating '%s' failed"
+#: builtin/stash.c:1135 git-legacy-stash.sh:150
+msgid "You do not have the initial commit yet"
msgstr ""
-#: builtin/remote.c:795
-msgid ""
-"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
-"to delete it, use:"
-msgid_plural ""
-"Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
-"to delete them, use:"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/remote.c:809
-#, c-format
-msgid "Could not remove config section '%s'"
+#: builtin/stash.c:1162 git-legacy-stash.sh:165
+msgid "Cannot save the current index state"
msgstr ""
-#: builtin/remote.c:910
-#, c-format
-msgid " new (next fetch will store in remotes/%s)"
+#: builtin/stash.c:1171 git-legacy-stash.sh:180
+msgid "Cannot save the untracked files"
msgstr ""
-#: builtin/remote.c:913
-msgid " tracked"
+#: builtin/stash.c:1182 builtin/stash.c:1191 git-legacy-stash.sh:200
+#: git-legacy-stash.sh:213
+msgid "Cannot save the current worktree state"
msgstr ""
-#: builtin/remote.c:915
-msgid " stale (use 'git remote prune' to remove)"
+#: builtin/stash.c:1219 git-legacy-stash.sh:233
+msgid "Cannot record working tree state"
msgstr ""
-#: builtin/remote.c:917
-msgid " ???"
+#: builtin/stash.c:1268 git-legacy-stash.sh:337
+msgid "Can't use --patch and --include-untracked or --all at the same time"
msgstr ""
-#: builtin/remote.c:958
-#, c-format
-msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
+#: builtin/stash.c:1284
+msgid "Did you forget to 'git add'?"
msgstr ""
-#: builtin/remote.c:966
-#, c-format
-msgid "rebases interactively onto remote %s"
+#: builtin/stash.c:1299 git-legacy-stash.sh:345
+msgid "No local changes to save"
msgstr ""
-#: builtin/remote.c:967
-#, c-format
-msgid "rebases onto remote %s"
+#: builtin/stash.c:1306 git-legacy-stash.sh:350
+msgid "Cannot initialize stash"
msgstr ""
-#: builtin/remote.c:970
-#, c-format
-msgid " merges with remote %s"
+#: builtin/stash.c:1321 git-legacy-stash.sh:354
+msgid "Cannot save the current status"
msgstr ""
-#: builtin/remote.c:973
+#: builtin/stash.c:1326
#, c-format
-msgid "merges with remote %s"
+msgid "Saved working directory and index state %s"
msgstr ""
-#: builtin/remote.c:976
-#, c-format
-msgid "%-*s and with remote %s\n"
+#: builtin/stash.c:1430 git-legacy-stash.sh:384
+msgid "Cannot remove worktree changes"
msgstr ""
-#: builtin/remote.c:1019
-msgid "create"
+#: builtin/stash.c:1465 builtin/stash.c:1501
+msgid "keep index"
msgstr ""
-#: builtin/remote.c:1022
-msgid "delete"
+#: builtin/stash.c:1467 builtin/stash.c:1503
+msgid "stash in patch mode"
msgstr ""
-#: builtin/remote.c:1026
-msgid "up to date"
+#: builtin/stash.c:1468 builtin/stash.c:1504
+msgid "quiet mode"
msgstr ""
-#: builtin/remote.c:1029
-msgid "fast-forwardable"
+#: builtin/stash.c:1470 builtin/stash.c:1506
+msgid "include untracked files in stash"
msgstr ""
-#: builtin/remote.c:1032
-msgid "local out of date"
+#: builtin/stash.c:1472 builtin/stash.c:1508
+msgid "include ignore files"
msgstr ""
-#: builtin/remote.c:1039
+#: builtin/stash.c:1568
#, c-format
-msgid " %-*s forces to %-*s (%s)"
+msgid "could not exec %s"
msgstr ""
-#: builtin/remote.c:1042
-#, c-format
-msgid " %-*s pushes to %-*s (%s)"
+#: builtin/stripspace.c:18
+msgid "git stripspace [-s | --strip-comments]"
msgstr ""
-#: builtin/remote.c:1046
-#, c-format
-msgid " %-*s forces to %s"
+#: builtin/stripspace.c:19
+msgid "git stripspace [-c | --comment-lines]"
msgstr ""
-#: builtin/remote.c:1049
-#, c-format
-msgid " %-*s pushes to %s"
+#: builtin/stripspace.c:37
+msgid "skip and remove all lines starting with comment character"
msgstr ""
-#: builtin/remote.c:1117
-msgid "do not query remotes"
+#: builtin/stripspace.c:40
+msgid "prepend comment character and space to each line"
msgstr ""
-#: builtin/remote.c:1144
+#: builtin/submodule--helper.c:45 builtin/submodule--helper.c:1942
#, c-format
-msgid "* remote %s"
+msgid "Expecting a full ref name, got %s"
msgstr ""
-#: builtin/remote.c:1145
-#, c-format
-msgid " Fetch URL: %s"
+#: builtin/submodule--helper.c:62
+msgid "submodule--helper print-default-remote takes no arguments"
msgstr ""
-#: builtin/remote.c:1146 builtin/remote.c:1162 builtin/remote.c:1301
-msgid "(no URL)"
+#: builtin/submodule--helper.c:100
+#, c-format
+msgid "cannot strip one component off url '%s'"
msgstr ""
-#. TRANSLATORS: the colon ':' should align
-#. with the one in " Fetch URL: %s"
-#. translation.
-#.
-#: builtin/remote.c:1160 builtin/remote.c:1162
-#, c-format
-msgid " Push URL: %s"
+#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1367
+msgid "alternative anchor for relative paths"
msgstr ""
-#: builtin/remote.c:1164 builtin/remote.c:1166 builtin/remote.c:1168
-#, c-format
-msgid " HEAD branch: %s"
+#: builtin/submodule--helper.c:413
+msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr ""
-#: builtin/remote.c:1164
-msgid "(not queried)"
+#: builtin/submodule--helper.c:470 builtin/submodule--helper.c:627
+#: builtin/submodule--helper.c:650
+#, c-format
+msgid "No url found for submodule path '%s' in .gitmodules"
msgstr ""
-#: builtin/remote.c:1166
-msgid "(unknown)"
+#: builtin/submodule--helper.c:522
+#, c-format
+msgid "Entering '%s'\n"
msgstr ""
-#: builtin/remote.c:1170
+#: builtin/submodule--helper.c:525
#, c-format
msgid ""
-" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
+"run_command returned non-zero status for %s\n"
+"."
msgstr ""
-#: builtin/remote.c:1182
+#: builtin/submodule--helper.c:546
#, c-format
-msgid " Remote branch:%s"
-msgid_plural " Remote branches:%s"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/remote.c:1185 builtin/remote.c:1211
-msgid " (status not queried)"
+msgid ""
+"run_command returned non-zero status while recursing in the nested "
+"submodules of %s\n"
+"."
msgstr ""
-#: builtin/remote.c:1194
-msgid " Local branch configured for 'git pull':"
-msgid_plural " Local branches configured for 'git pull':"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/remote.c:1202
-msgid " Local refs will be mirrored by 'git push'"
+#: builtin/submodule--helper.c:562
+msgid "Suppress output of entering each submodule command"
msgstr ""
-#: builtin/remote.c:1208
-#, 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:1229
-msgid "set refs/remotes/<name>/HEAD according to remote"
+#: builtin/submodule--helper.c:564 builtin/submodule--helper.c:1049
+msgid "Recurse into nested submodules"
msgstr ""
-#: builtin/remote.c:1231
-msgid "delete refs/remotes/<name>/HEAD"
+#: builtin/submodule--helper.c:569
+msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
msgstr ""
-#: builtin/remote.c:1246
-msgid "Cannot determine remote HEAD"
+#: builtin/submodule--helper.c:596
+#, c-format
+msgid ""
+"could not look up configuration '%s'. Assuming this repository is its own "
+"authoritative upstream."
msgstr ""
-#: builtin/remote.c:1248
-msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
+#: builtin/submodule--helper.c:664
+#, c-format
+msgid "Failed to register url for submodule path '%s'"
msgstr ""
-#: builtin/remote.c:1258
+#: builtin/submodule--helper.c:668
#, c-format
-msgid "Could not delete %s"
+msgid "Submodule '%s' (%s) registered for path '%s'\n"
msgstr ""
-#: builtin/remote.c:1266
+#: builtin/submodule--helper.c:678
#, c-format
-msgid "Not a valid ref: %s"
+msgid "warning: command update mode suggested for submodule '%s'\n"
msgstr ""
-#: builtin/remote.c:1268
+#: builtin/submodule--helper.c:685
#, c-format
-msgid "Could not setup %s"
+msgid "Failed to register update mode for submodule path '%s'"
msgstr ""
-#: builtin/remote.c:1286
-#, c-format
-msgid " %s will become dangling!"
+#: builtin/submodule--helper.c:707
+msgid "Suppress output for initializing a submodule"
msgstr ""
-#: builtin/remote.c:1287
-#, c-format
-msgid " %s has become dangling!"
+#: builtin/submodule--helper.c:712
+msgid "git submodule--helper init [<options>] [<path>]"
msgstr ""
-#: builtin/remote.c:1297
+#: builtin/submodule--helper.c:784 builtin/submodule--helper.c:910
#, c-format
-msgid "Pruning %s"
+msgid "no submodule mapping found in .gitmodules for path '%s'"
msgstr ""
-#: builtin/remote.c:1298
+#: builtin/submodule--helper.c:823
#, c-format
-msgid "URL: %s"
+msgid "could not resolve HEAD ref inside the submodule '%s'"
msgstr ""
-#: builtin/remote.c:1314
+#: builtin/submodule--helper.c:850 builtin/submodule--helper.c:1019
#, c-format
-msgid " * [would prune] %s"
+msgid "failed to recurse into submodule '%s'"
msgstr ""
-#: builtin/remote.c:1317
-#, c-format
-msgid " * [pruned] %s"
+#: builtin/submodule--helper.c:874 builtin/submodule--helper.c:1185
+msgid "Suppress submodule status output"
msgstr ""
-#: builtin/remote.c:1362
-msgid "prune remotes after fetching"
+#: builtin/submodule--helper.c:875
+msgid ""
+"Use commit stored in the index instead of the one stored in the submodule "
+"HEAD"
msgstr ""
-#: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547
-#, c-format
-msgid "No such remote '%s'"
+#: builtin/submodule--helper.c:876
+msgid "recurse into nested submodules"
msgstr ""
-#: builtin/remote.c:1441
-msgid "add branch"
+#: builtin/submodule--helper.c:881
+msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
msgstr ""
-#: builtin/remote.c:1448
-msgid "no remote specified"
+#: builtin/submodule--helper.c:905
+msgid "git submodule--helper name <path>"
msgstr ""
-#: builtin/remote.c:1465
-msgid "query push URLs rather than fetch URLs"
+#: builtin/submodule--helper.c:969
+#, c-format
+msgid "Synchronizing submodule url for '%s'\n"
msgstr ""
-#: builtin/remote.c:1467
-msgid "return all URLs"
+#: builtin/submodule--helper.c:975
+#, c-format
+msgid "failed to register url for submodule path '%s'"
msgstr ""
-#: builtin/remote.c:1495
+#: builtin/submodule--helper.c:989
#, c-format
-msgid "no URLs configured for remote '%s'"
+msgid "failed to get the default remote for submodule '%s'"
msgstr ""
-#: builtin/remote.c:1521
-msgid "manipulate push URLs"
+#: builtin/submodule--helper.c:1000
+#, c-format
+msgid "failed to update remote for submodule '%s'"
msgstr ""
-#: builtin/remote.c:1523
-msgid "add URL"
+#: builtin/submodule--helper.c:1047
+msgid "Suppress output of synchronizing submodule url"
msgstr ""
-#: builtin/remote.c:1525
-msgid "delete URLs"
+#: builtin/submodule--helper.c:1054
+msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
msgstr ""
-#: builtin/remote.c:1532
-msgid "--add --delete doesn't make sense"
+#: builtin/submodule--helper.c:1108
+#, 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/remote.c:1573
+#: builtin/submodule--helper.c:1120
#, c-format
-msgid "Invalid old URL pattern: %s"
+msgid ""
+"Submodule work tree '%s' contains local modifications; use '-f' to discard "
+"them"
msgstr ""
-#: builtin/remote.c:1581
+#: builtin/submodule--helper.c:1128
#, c-format
-msgid "No such URL found: %s"
+msgid "Cleared directory '%s'\n"
msgstr ""
-#: builtin/remote.c:1583
-msgid "Will not delete all non-push URLs"
+#: builtin/submodule--helper.c:1130
+#, c-format
+msgid "Could not remove submodule work tree '%s'\n"
msgstr ""
-#: builtin/remote.c:1597
-msgid "be verbose; must be placed before a subcommand"
+#: builtin/submodule--helper.c:1141
+#, c-format
+msgid "could not create empty submodule directory %s"
msgstr ""
-#: builtin/remote.c:1628
+#: builtin/submodule--helper.c:1157
#, c-format
-msgid "Unknown subcommand: %s"
+msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
msgstr ""
-#: builtin/repack.c:18
-msgid "git repack [<options>]"
+#: builtin/submodule--helper.c:1186
+msgid "Remove submodule working trees even if they contain local changes"
msgstr ""
-#: builtin/repack.c:23
-msgid ""
-"Incremental repacks are incompatible with bitmap indexes. Use\n"
-"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
+#: builtin/submodule--helper.c:1187
+msgid "Unregister all submodules"
msgstr ""
-#: builtin/repack.c:168
-msgid "pack everything in a single pack"
+#: builtin/submodule--helper.c:1192
+msgid ""
+"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
msgstr ""
-#: builtin/repack.c:170
-msgid "same as -a, and turn unreachable objects loose"
+#: builtin/submodule--helper.c:1206
+msgid "Use '--all' if you really want to deinitialize all submodules"
msgstr ""
-#: builtin/repack.c:173
-msgid "remove redundant packs, and run git-prune-packed"
+#: builtin/submodule--helper.c:1301 builtin/submodule--helper.c:1304
+#, c-format
+msgid "submodule '%s' cannot add alternate: %s"
msgstr ""
-#: builtin/repack.c:175
-msgid "pass --no-reuse-delta to git-pack-objects"
+#: builtin/submodule--helper.c:1340
+#, c-format
+msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
msgstr ""
-#: builtin/repack.c:177
-msgid "pass --no-reuse-object to git-pack-objects"
+#: builtin/submodule--helper.c:1347
+#, c-format
+msgid "Value '%s' for submodule.alternateLocation is not recognized"
msgstr ""
-#: builtin/repack.c:179
-msgid "do not run git-update-server-info"
+#: builtin/submodule--helper.c:1370
+msgid "where the new submodule will be cloned to"
msgstr ""
-#: builtin/repack.c:182
-msgid "pass --local to git-pack-objects"
+#: builtin/submodule--helper.c:1373
+msgid "name of the new submodule"
msgstr ""
-#: builtin/repack.c:184
-msgid "write bitmap index"
+#: builtin/submodule--helper.c:1376
+msgid "url where to clone the submodule from"
msgstr ""
-#: builtin/repack.c:185
-msgid "approxidate"
+#: builtin/submodule--helper.c:1384
+msgid "depth for shallow clones"
msgstr ""
-#: builtin/repack.c:186
-msgid "with -A, do not loosen objects older than this"
+#: builtin/submodule--helper.c:1387 builtin/submodule--helper.c:1871
+msgid "force cloning progress"
msgstr ""
-#: builtin/repack.c:188
-msgid "with -a, repack unreachable objects"
+#: builtin/submodule--helper.c:1392
+msgid ""
+"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
+"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
msgstr ""
-#: builtin/repack.c:190
-msgid "size of the window used for delta compression"
+#: builtin/submodule--helper.c:1423
+#, c-format
+msgid "clone of '%s' into submodule path '%s' failed"
msgstr ""
-#: builtin/repack.c:191 builtin/repack.c:197
-msgid "bytes"
+#: builtin/submodule--helper.c:1437
+#, c-format
+msgid "could not get submodule directory for '%s'"
msgstr ""
-#: builtin/repack.c:192
-msgid "same as the above, but limit memory size instead of entries count"
+#: builtin/submodule--helper.c:1473
+#, c-format
+msgid "Invalid update mode '%s' for submodule path '%s'"
msgstr ""
-#: builtin/repack.c:194
-msgid "limits the maximum delta depth"
+#: builtin/submodule--helper.c:1477
+#, c-format
+msgid "Invalid update mode '%s' configured for submodule path '%s'"
msgstr ""
-#: builtin/repack.c:196
-msgid "limits the maximum number of threads"
+#: builtin/submodule--helper.c:1570
+#, c-format
+msgid "Submodule path '%s' not initialized"
msgstr ""
-#: builtin/repack.c:198
-msgid "maximum size of each packfile"
+#: builtin/submodule--helper.c:1574
+msgid "Maybe you want to use 'update --init'?"
msgstr ""
-#: builtin/repack.c:200
-msgid "repack objects in packs marked with .keep"
+#: builtin/submodule--helper.c:1604
+#, c-format
+msgid "Skipping unmerged submodule %s"
msgstr ""
-#: builtin/repack.c:210
-msgid "cannot delete packs in a precious-objects repo"
+#: builtin/submodule--helper.c:1633
+#, c-format
+msgid "Skipping submodule '%s'"
msgstr ""
-#: builtin/repack.c:214
-msgid "--keep-unreachable and -A are incompatible"
+#: builtin/submodule--helper.c:1777
+#, c-format
+msgid "Failed to clone '%s'. Retry scheduled"
msgstr ""
-#: builtin/repack.c:406 builtin/worktree.c:116
+#: builtin/submodule--helper.c:1788
#, c-format
-msgid "failed to remove '%s'"
+msgid "Failed to clone '%s' a second time, aborting"
msgstr ""
-#: builtin/replace.c:20
-msgid "git replace [-f] <object> <replacement>"
+#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:2092
+msgid "path into the working tree"
msgstr ""
-#: builtin/replace.c:21
-msgid "git replace [-f] --edit <object>"
+#: builtin/submodule--helper.c:1853
+msgid "path into the working tree, across nested submodule boundaries"
msgstr ""
-#: builtin/replace.c:22
-msgid "git replace [-f] --graft <commit> [<parent>...]"
+#: builtin/submodule--helper.c:1857
+msgid "rebase, merge, checkout or none"
msgstr ""
-#: builtin/replace.c:23
-msgid "git replace -d <object>..."
+#: builtin/submodule--helper.c:1863
+msgid "Create a shallow clone truncated to the specified number of revisions"
msgstr ""
-#: builtin/replace.c:24
-msgid "git replace [--format=<format>] [-l [<pattern>]]"
+#: builtin/submodule--helper.c:1866
+msgid "parallel jobs"
msgstr ""
-#: builtin/replace.c:331 builtin/replace.c:369 builtin/replace.c:397
-#, c-format
-msgid "Not a valid object name: '%s'"
+#: builtin/submodule--helper.c:1868
+msgid "whether the initial clone should follow the shallow recommendation"
msgstr ""
-#: builtin/replace.c:361
-#, c-format
-msgid "bad mergetag in commit '%s'"
+#: builtin/submodule--helper.c:1869
+msgid "don't print cloning progress"
msgstr ""
-#: builtin/replace.c:363
-#, c-format
-msgid "malformed mergetag in commit '%s'"
+#: builtin/submodule--helper.c:1876
+msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
+msgstr ""
+
+#: builtin/submodule--helper.c:1889
+msgid "bad value for update parameter"
msgstr ""
-#: builtin/replace.c:374
+#: builtin/submodule--helper.c:1937
#, c-format
msgid ""
-"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
-"instead of --graft"
+"Submodule (%s) branch configured to inherit branch from superproject, but "
+"the superproject is not on any branch"
msgstr ""
-#: builtin/replace.c:407
+#: builtin/submodule--helper.c:2060
#, c-format
-msgid "the original commit '%s' has a gpg signature."
+msgid "could not get a repository handle for submodule '%s'"
msgstr ""
-#: builtin/replace.c:408
-msgid "the signature will be removed in the replacement commit!"
+#: builtin/submodule--helper.c:2093
+msgid "recurse into submodules"
msgstr ""
-#: builtin/replace.c:414
-#, c-format
-msgid "could not write replacement commit for: '%s'"
+#: builtin/submodule--helper.c:2099
+msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
msgstr ""
-#: builtin/replace.c:438
-msgid "list replace refs"
+#: builtin/submodule--helper.c:2156
+msgid "check if it is safe to write to the .gitmodules file"
msgstr ""
-#: builtin/replace.c:439
-msgid "delete replace refs"
+#: builtin/submodule--helper.c:2159
+msgid "unset the config in the .gitmodules file"
msgstr ""
-#: builtin/replace.c:440
-msgid "edit existing object"
+#: builtin/submodule--helper.c:2164
+msgid "git submodule--helper config <name> [<value>]"
msgstr ""
-#: builtin/replace.c:441
-msgid "change a commit's parents"
+#: builtin/submodule--helper.c:2165
+msgid "git submodule--helper config --unset <name>"
msgstr ""
-#: builtin/replace.c:442
-msgid "replace the ref if it exists"
+#: builtin/submodule--helper.c:2166
+msgid "git submodule--helper config --check-writeable"
msgstr ""
-#: builtin/replace.c:443
-msgid "do not pretty-print contents for --edit"
+#: 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/replace.c:444
-msgid "use this format"
+#: builtin/submodule--helper.c:2235 git.c:433 git.c:685
+#, c-format
+msgid "%s doesn't support --super-prefix"
msgstr ""
-#: builtin/rerere.c:13
-msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
+#: builtin/submodule--helper.c:2241
+#, c-format
+msgid "'%s' is not a valid submodule--helper subcommand"
msgstr ""
-#: builtin/rerere.c:59
-msgid "register clean resolutions in index"
+#: builtin/symbolic-ref.c:8
+msgid "git symbolic-ref [<options>] <name> [<ref>]"
msgstr ""
-#: builtin/reset.c:29
-msgid ""
-"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
+#: builtin/symbolic-ref.c:9
+msgid "git symbolic-ref -d [-q] <name>"
msgstr ""
-#: builtin/reset.c:30
-msgid "git reset [-q] [<tree-ish>] [--] <paths>..."
+#: builtin/symbolic-ref.c:40
+msgid "suppress error message for non-symbolic (detached) refs"
msgstr ""
-#: builtin/reset.c:31
-msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
+#: builtin/symbolic-ref.c:41
+msgid "delete symbolic ref"
msgstr ""
-#: builtin/reset.c:37
-msgid "mixed"
+#: builtin/symbolic-ref.c:42
+msgid "shorten ref output"
msgstr ""
-#: builtin/reset.c:37
-msgid "soft"
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363
+msgid "reason"
msgstr ""
-#: builtin/reset.c:37
-msgid "hard"
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363
+msgid "reason of the update"
msgstr ""
-#: builtin/reset.c:37
-msgid "merge"
+#: builtin/tag.c:25
+msgid ""
+"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n"
+"\t\t<tagname> [<head>]"
msgstr ""
-#: builtin/reset.c:37
-msgid "keep"
+#: builtin/tag.c:27
+msgid "git tag -d <tagname>..."
msgstr ""
-#: builtin/reset.c:77
-msgid "You do not have a valid HEAD."
+#: 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/reset.c:79
-msgid "Failed to find tree of HEAD."
+#: builtin/tag.c:30
+msgid "git tag -v [--format=<format>] <tagname>..."
msgstr ""
-#: builtin/reset.c:85
+#: builtin/tag.c:88
#, c-format
-msgid "Failed to find tree of %s."
+msgid "tag '%s' not found."
msgstr ""
-#: builtin/reset.c:103
+#: builtin/tag.c:104
#, c-format
-msgid "HEAD is now at %s"
+msgid "Deleted tag '%s' (was %s)\n"
msgstr ""
-#: builtin/reset.c:186
+#: builtin/tag.c:134
#, c-format
-msgid "Cannot do a %s reset in the middle of a merge."
-msgstr ""
-
-#: builtin/reset.c:286
-msgid "be quiet, only report errors"
-msgstr ""
-
-#: builtin/reset.c:288
-msgid "reset HEAD and index"
-msgstr ""
-
-#: builtin/reset.c:289
-msgid "reset only HEAD"
-msgstr ""
-
-#: builtin/reset.c:291 builtin/reset.c:293
-msgid "reset HEAD, index and working tree"
+msgid ""
+"\n"
+"Write a message for tag:\n"
+" %s\n"
+"Lines starting with '%c' will be ignored.\n"
msgstr ""
-#: builtin/reset.c:295
-msgid "reset HEAD but keep local changes"
+#: builtin/tag.c:138
+#, c-format
+msgid ""
+"\n"
+"Write a message for tag:\n"
+" %s\n"
+"Lines starting with '%c' will be kept; you may remove them yourself if you "
+"want to.\n"
msgstr ""
-#: builtin/reset.c:301
-msgid "record only the fact that removed paths will be added later"
+#: builtin/tag.c:192
+msgid "unable to sign the tag"
msgstr ""
-#: builtin/reset.c:320
-#, c-format
-msgid "Failed to resolve '%s' as a valid revision."
+#: builtin/tag.c:194
+msgid "unable to write tag file"
msgstr ""
-#: builtin/reset.c:328
+#: builtin/tag.c:210
#, c-format
-msgid "Failed to resolve '%s' as a valid tree."
+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/reset.c:337
-msgid "--patch is incompatible with --{hard,mixed,soft}"
+#: builtin/tag.c:226
+msgid "bad object type."
msgstr ""
-#: builtin/reset.c:346
-msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
+#: builtin/tag.c:278
+msgid "no tag message?"
msgstr ""
-#: builtin/reset.c:348
+#: builtin/tag.c:285
#, c-format
-msgid "Cannot do %s reset with paths."
+msgid "The tag message has been left in %s\n"
msgstr ""
-#: builtin/reset.c:358
-#, c-format
-msgid "%s reset is not allowed in a bare repository"
+#: builtin/tag.c:396
+msgid "list tag names"
msgstr ""
-#: builtin/reset.c:362
-msgid "-N can only be used with --mixed"
+#: builtin/tag.c:398
+msgid "print <n> lines of each tag message"
msgstr ""
-#: builtin/reset.c:379
-msgid "Unstaged changes after reset:"
+#: builtin/tag.c:400
+msgid "delete tags"
msgstr ""
-#: builtin/reset.c:385
-#, c-format
-msgid "Could not reset index file to revision '%s'."
+#: builtin/tag.c:401
+msgid "verify tags"
msgstr ""
-#: builtin/reset.c:389
-msgid "Could not write new index file."
+#: builtin/tag.c:403
+msgid "Tag creation options"
msgstr ""
-#: builtin/rev-list.c:358
-msgid "rev-list does not support display of notes"
+#: builtin/tag.c:405
+msgid "annotated tag, needs a message"
msgstr ""
-#: builtin/rev-parse.c:394
-msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
+#: builtin/tag.c:407
+msgid "tag message"
msgstr ""
-#: builtin/rev-parse.c:399
-msgid "keep the `--` passed as an arg"
+#: builtin/tag.c:409
+msgid "force edit of tag message"
msgstr ""
-#: builtin/rev-parse.c:401
-msgid "stop parsing after the first non-option argument"
+#: builtin/tag.c:410
+msgid "annotated and GPG-signed tag"
msgstr ""
-#: builtin/rev-parse.c:404
-msgid "output in stuck long form"
+#: builtin/tag.c:413
+msgid "use another key to sign the tag"
msgstr ""
-#: builtin/rev-parse.c:535
-msgid ""
-"git rev-parse --parseopt [<options>] -- [<args>...]\n"
-" or: git rev-parse --sq-quote [<arg>...]\n"
-" or: git rev-parse [<options>] [<arg>...]\n"
-"\n"
-"Run \"git rev-parse --parseopt -h\" for more information on the first usage."
+#: builtin/tag.c:414
+msgid "replace the tag if exists"
msgstr ""
-#: builtin/revert.c:23
-msgid "git revert [<options>] <commit-ish>..."
+#: builtin/tag.c:415 builtin/update-ref.c:369
+msgid "create a reflog"
msgstr ""
-#: builtin/revert.c:24
-msgid "git revert <subcommand>"
+#: builtin/tag.c:417
+msgid "Tag listing options"
msgstr ""
-#: builtin/revert.c:29
-msgid "git cherry-pick [<options>] <commit-ish>..."
+#: builtin/tag.c:418
+msgid "show tag list in columns"
msgstr ""
-#: builtin/revert.c:30
-msgid "git cherry-pick <subcommand>"
+#: builtin/tag.c:419 builtin/tag.c:421
+msgid "print only tags that contain the commit"
msgstr ""
-#: builtin/revert.c:90
-#, c-format
-msgid "%s: %s cannot be used with %s"
+#: builtin/tag.c:420 builtin/tag.c:422
+msgid "print only tags that don't contain the commit"
msgstr ""
-#: builtin/revert.c:99
-msgid "end revert or cherry-pick sequence"
+#: builtin/tag.c:423
+msgid "print only tags that are merged"
msgstr ""
-#: builtin/revert.c:100
-msgid "resume revert or cherry-pick sequence"
+#: builtin/tag.c:424
+msgid "print only tags that are not merged"
msgstr ""
-#: builtin/revert.c:101
-msgid "cancel revert or cherry-pick sequence"
+#: builtin/tag.c:428
+msgid "print only tags of the object"
msgstr ""
-#: builtin/revert.c:102
-msgid "don't automatically commit"
+#: builtin/tag.c:472
+msgid "--column and -n are incompatible"
msgstr ""
-#: builtin/revert.c:103
-msgid "edit the commit message"
+#: builtin/tag.c:494
+msgid "-n option is only allowed in list mode"
msgstr ""
-#: builtin/revert.c:106
-msgid "parent-number"
+#: builtin/tag.c:496
+msgid "--contains option is only allowed in list mode"
msgstr ""
-#: builtin/revert.c:107
-msgid "select mainline parent"
+#: builtin/tag.c:498
+msgid "--no-contains option is only allowed in list mode"
msgstr ""
-#: builtin/revert.c:109
-msgid "merge strategy"
+#: builtin/tag.c:500
+msgid "--points-at option is only allowed in list mode"
msgstr ""
-#: builtin/revert.c:110
-msgid "option"
+#: builtin/tag.c:502
+msgid "--merged and --no-merged options are only allowed in list mode"
msgstr ""
-#: builtin/revert.c:111
-msgid "option for merge strategy"
+#: builtin/tag.c:513
+msgid "only one -F or -m option is allowed."
msgstr ""
-#: builtin/revert.c:120
-msgid "append commit name"
+#: builtin/tag.c:532
+msgid "too many params"
msgstr ""
-#: builtin/revert.c:122
-msgid "preserve initially empty commits"
+#: builtin/tag.c:538
+#, c-format
+msgid "'%s' is not a valid tag name."
msgstr ""
-#: builtin/revert.c:123
-msgid "allow commits with empty messages"
+#: builtin/tag.c:543
+#, c-format
+msgid "tag '%s' already exists"
msgstr ""
-#: builtin/revert.c:124
-msgid "keep redundant, empty commits"
+#: builtin/tag.c:574
+#, c-format
+msgid "Updated tag '%s' (was %s)\n"
msgstr ""
-#: builtin/revert.c:212
-msgid "revert failed"
+#: builtin/unpack-objects.c:500
+msgid "Unpacking objects"
msgstr ""
-#: builtin/revert.c:225
-msgid "cherry-pick failed"
+#: builtin/update-index.c:83
+#, c-format
+msgid "failed to create directory %s"
msgstr ""
-#: builtin/rm.c:18
-msgid "git rm [<options>] [--] <file>..."
+#: builtin/update-index.c:99
+#, c-format
+msgid "failed to create file %s"
msgstr ""
-#: builtin/rm.c:206
-msgid ""
-"the following file has staged content different from both the\n"
-"file and the HEAD:"
-msgid_plural ""
-"the following files have staged content different from both the\n"
-"file and the HEAD:"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/rm.c:211
-msgid ""
-"\n"
-"(use -f to force removal)"
+#: builtin/update-index.c:107
+#, c-format
+msgid "failed to delete file %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/update-index.c:114 builtin/update-index.c:220
+#, c-format
+msgid "failed to delete directory %s"
+msgstr ""
-#: builtin/rm.c:219 builtin/rm.c:228
-msgid ""
-"\n"
-"(use --cached to keep the file, or -f to force removal)"
+#: builtin/update-index.c:139
+#, c-format
+msgid "Testing mtime in '%s' "
msgstr ""
-#: builtin/rm.c:225
-msgid "the following file has local modifications:"
-msgid_plural "the following files have local modifications:"
-msgstr[0] ""
-msgstr[1] ""
+#: builtin/update-index.c:153
+msgid "directory stat info does not change after adding a new file"
+msgstr ""
-#: builtin/rm.c:243
-msgid "do not list removed files"
+#: builtin/update-index.c:166
+msgid "directory stat info does not change after adding a new directory"
msgstr ""
-#: builtin/rm.c:244
-msgid "only remove from the index"
+#: builtin/update-index.c:179
+msgid "directory stat info changes after updating a file"
msgstr ""
-#: builtin/rm.c:245
-msgid "override the up-to-date check"
+#: builtin/update-index.c:190
+msgid "directory stat info changes after adding a file inside subdirectory"
msgstr ""
-#: builtin/rm.c:246
-msgid "allow recursive removal"
+#: builtin/update-index.c:201
+msgid "directory stat info does not change after deleting a file"
msgstr ""
-#: builtin/rm.c:248
-msgid "exit with a zero status even if nothing matched"
+#: builtin/update-index.c:214
+msgid "directory stat info does not change after deleting a directory"
msgstr ""
-#: builtin/rm.c:308
-#, c-format
-msgid "not removing '%s' recursively without -r"
+#: builtin/update-index.c:221
+msgid " OK"
msgstr ""
-#: builtin/rm.c:347
-#, c-format
-msgid "git rm: unable to remove %s"
+#: builtin/update-index.c:589
+msgid "git update-index [<options>] [--] [<file>...]"
msgstr ""
-#: builtin/rm.c:370
-#, c-format
-msgid "could not remove '%s'"
+#: builtin/update-index.c:971
+msgid "continue refresh even when index needs update"
msgstr ""
-#: builtin/send-pack.c:19
-msgid ""
-"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
-"receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
-"[<ref>...]\n"
-" --all and explicit <ref> specification are mutually exclusive."
+#: builtin/update-index.c:974
+msgid "refresh: ignore submodules"
msgstr ""
-#: builtin/send-pack.c:162
-msgid "remote name"
+#: builtin/update-index.c:977
+msgid "do not ignore new files"
msgstr ""
-#: builtin/send-pack.c:176
-msgid "use stateless RPC protocol"
+#: builtin/update-index.c:979
+msgid "let files replace directories and vice-versa"
msgstr ""
-#: builtin/send-pack.c:177
-msgid "read refs from stdin"
+#: builtin/update-index.c:981
+msgid "notice files missing from worktree"
msgstr ""
-#: builtin/send-pack.c:178
-msgid "print status from remote helper"
+#: builtin/update-index.c:983
+msgid "refresh even if index contains unmerged entries"
msgstr ""
-#: builtin/shortlog.c:14
-msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
+#: builtin/update-index.c:986
+msgid "refresh stat information"
msgstr ""
-#: builtin/shortlog.c:249
-msgid "Group by committer rather than author"
+#: builtin/update-index.c:990
+msgid "like --refresh, but ignore assume-unchanged setting"
msgstr ""
-#: builtin/shortlog.c:251
-msgid "sort output according to the number of commits per author"
+#: builtin/update-index.c:994
+msgid "<mode>,<object>,<path>"
msgstr ""
-#: builtin/shortlog.c:253
-msgid "Suppress commit descriptions, only provides commit count"
+#: builtin/update-index.c:995
+msgid "add the specified entry to the index"
msgstr ""
-#: builtin/shortlog.c:255
-msgid "Show the email address of each author"
+#: builtin/update-index.c:1005
+msgid "mark files as \"not changing\""
msgstr ""
-#: builtin/shortlog.c:256
-msgid "w[,i1[,i2]]"
+#: builtin/update-index.c:1008
+msgid "clear assumed-unchanged bit"
msgstr ""
-#: builtin/shortlog.c:257
-msgid "Linewrap output"
+#: builtin/update-index.c:1011
+msgid "mark files as \"index-only\""
msgstr ""
-#: builtin/show-branch.c:12
-msgid ""
-"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
-"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
-"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
-"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
+#: builtin/update-index.c:1014
+msgid "clear skip-worktree bit"
msgstr ""
-#: builtin/show-branch.c:16
-msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
+#: builtin/update-index.c:1017
+msgid "add to index only; do not add content to object database"
msgstr ""
-#: builtin/show-branch.c:376
-#, c-format
-msgid "ignoring %s; cannot handle more than %d ref"
-msgid_plural "ignoring %s; cannot handle more than %d refs"
-msgstr[0] ""
-msgstr[1] ""
+#: builtin/update-index.c:1019
+msgid "remove named paths even if present in worktree"
+msgstr ""
-#: builtin/show-branch.c:530
-#, c-format
-msgid "no matching refs with %s"
+#: builtin/update-index.c:1021
+msgid "with --stdin: input lines are terminated by null bytes"
msgstr ""
-#: builtin/show-branch.c:626
-msgid "show remote-tracking and local branches"
+#: builtin/update-index.c:1023
+msgid "read list of paths to be updated from standard input"
msgstr ""
-#: builtin/show-branch.c:628
-msgid "show remote-tracking branches"
+#: builtin/update-index.c:1027
+msgid "add entries from standard input to the index"
msgstr ""
-#: builtin/show-branch.c:630
-msgid "color '*!+-' corresponding to the branch"
+#: builtin/update-index.c:1031
+msgid "repopulate stages #2 and #3 for the listed paths"
msgstr ""
-#: builtin/show-branch.c:632
-msgid "show <n> more commits after the common ancestor"
+#: builtin/update-index.c:1035
+msgid "only update entries that differ from HEAD"
msgstr ""
-#: builtin/show-branch.c:634
-msgid "synonym to more=-1"
+#: builtin/update-index.c:1039
+msgid "ignore files missing from worktree"
msgstr ""
-#: builtin/show-branch.c:635
-msgid "suppress naming strings"
+#: builtin/update-index.c:1042
+msgid "report actions to standard output"
msgstr ""
-#: builtin/show-branch.c:637
-msgid "include the current branch"
+#: builtin/update-index.c:1044
+msgid "(for porcelains) forget saved unresolved conflicts"
msgstr ""
-#: builtin/show-branch.c:639
-msgid "name commits with their object names"
+#: builtin/update-index.c:1048
+msgid "write index in this format"
msgstr ""
-#: builtin/show-branch.c:641
-msgid "show possible merge bases"
+#: builtin/update-index.c:1050
+msgid "enable or disable split index"
msgstr ""
-#: builtin/show-branch.c:643
-msgid "show refs unreachable from any other ref"
+#: builtin/update-index.c:1052
+msgid "enable/disable untracked cache"
msgstr ""
-#: builtin/show-branch.c:645
-msgid "show commits in topological order"
+#: builtin/update-index.c:1054
+msgid "test if the filesystem supports untracked cache"
msgstr ""
-#: builtin/show-branch.c:648
-msgid "show only commits not on the first branch"
+#: builtin/update-index.c:1056
+msgid "enable untracked cache without testing the filesystem"
msgstr ""
-#: builtin/show-branch.c:650
-msgid "show merges reachable from only one tip"
+#: builtin/update-index.c:1058
+msgid "write out the index even if is not flagged as changed"
msgstr ""
-#: builtin/show-branch.c:652
-msgid "topologically sort, maintaining date order where possible"
+#: builtin/update-index.c:1060
+msgid "enable or disable file system monitor"
msgstr ""
-#: builtin/show-branch.c:655
-msgid "<n>[,<base>]"
+#: builtin/update-index.c:1062
+msgid "mark files as fsmonitor valid"
msgstr ""
-#: builtin/show-branch.c:656
-msgid "show <n> most recent ref-log entries starting at base"
+#: builtin/update-index.c:1065
+msgid "clear fsmonitor valid bit"
msgstr ""
-#: builtin/show-branch.c:690
+#: builtin/update-index.c:1168
msgid ""
-"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
+"core.splitIndex is set to false; remove or change it, if you really want to "
+"enable split index"
msgstr ""
-#: builtin/show-branch.c:714
-msgid "no branches given, and HEAD is not valid"
+#: 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/show-branch.c:717
-msgid "--reflog option needs one branch name"
+#: 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/show-branch.c:720
-#, c-format
-msgid "only %d entry can be shown at one time."
-msgid_plural "only %d entries can be shown at one time."
-msgstr[0] ""
-msgstr[1] ""
+#: builtin/update-index.c:1192
+msgid "Untracked cache disabled"
+msgstr ""
-#: builtin/show-branch.c:724
-#, c-format
-msgid "no such ref %s"
+#: 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/show-branch.c:808
+#: builtin/update-index.c:1204
#, c-format
-msgid "cannot handle more than %d rev."
-msgid_plural "cannot handle more than %d revs."
-msgstr[0] ""
-msgstr[1] ""
+msgid "Untracked cache enabled for '%s'"
+msgstr ""
-#: builtin/show-branch.c:812
-#, c-format
-msgid "'%s' is not a valid ref."
+#: builtin/update-index.c:1212
+msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
msgstr ""
-#: builtin/show-branch.c:815
-#, c-format
-msgid "cannot find commit %s (%s)"
+#: builtin/update-index.c:1216
+msgid "fsmonitor enabled"
msgstr ""
-#: builtin/show-ref.c:10
+#: builtin/update-index.c:1219
msgid ""
-"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
-"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
+"core.fsmonitor is set; remove it if you really want to disable fsmonitor"
msgstr ""
-#: builtin/show-ref.c:11
-msgid "git show-ref --exclude-existing[=<pattern>]"
+#: builtin/update-index.c:1223
+msgid "fsmonitor disabled"
msgstr ""
-#: builtin/show-ref.c:159
-msgid "only show tags (can be combined with heads)"
+#: builtin/update-ref.c:10
+msgid "git update-ref [<options>] -d <refname> [<old-val>]"
msgstr ""
-#: builtin/show-ref.c:160
-msgid "only show heads (can be combined with tags)"
+#: builtin/update-ref.c:11
+msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]"
msgstr ""
-#: builtin/show-ref.c:161
-msgid "stricter reference checking, requires exact ref path"
+#: builtin/update-ref.c:12
+msgid "git update-ref [<options>] --stdin [-z]"
msgstr ""
-#: builtin/show-ref.c:164 builtin/show-ref.c:166
-msgid "show the HEAD reference, even if it would be filtered out"
+#: builtin/update-ref.c:364
+msgid "delete the reference"
msgstr ""
-#: builtin/show-ref.c:168
-msgid "dereference tags into object IDs"
+#: builtin/update-ref.c:366
+msgid "update <refname> not the one it points to"
msgstr ""
-#: builtin/show-ref.c:170
-msgid "only show SHA1 hash using <n> digits"
+#: builtin/update-ref.c:367
+msgid "stdin has NUL-terminated arguments"
msgstr ""
-#: builtin/show-ref.c:174
-msgid "do not print results to stdout (useful with --verify)"
+#: builtin/update-ref.c:368
+msgid "read updates from stdin"
msgstr ""
-#: builtin/show-ref.c:176
-msgid "show refs from stdin that aren't in local repository"
+#: builtin/update-server-info.c:7
+msgid "git update-server-info [--force]"
msgstr ""
-#: builtin/stripspace.c:18
-msgid "git stripspace [-s | --strip-comments]"
+#: builtin/update-server-info.c:15
+msgid "update the info files from scratch"
msgstr ""
-#: builtin/stripspace.c:19
-msgid "git stripspace [-c | --comment-lines]"
+#: builtin/upload-pack.c:11
+msgid "git upload-pack [<options>] <dir>"
msgstr ""
-#: builtin/stripspace.c:36
-msgid "skip and remove all lines starting with comment character"
+#: builtin/upload-pack.c:23 t/helper/test-serve-v2.c:17
+msgid "quit after a single request/response exchange"
msgstr ""
-#: builtin/stripspace.c:39
-msgid "prepend comment character and space to each line"
+#: builtin/upload-pack.c:25
+msgid "exit immediately after initial ref advertisement"
msgstr ""
-#: builtin/submodule--helper.c:25 builtin/submodule--helper.c:1075
-#, c-format
-msgid "No such ref: %s"
+#: builtin/upload-pack.c:27
+msgid "do not try <directory>/.git/ if <directory> is no Git directory"
msgstr ""
-#: builtin/submodule--helper.c:32 builtin/submodule--helper.c:1084
-#, c-format
-msgid "Expecting a full ref name, got %s"
+#: builtin/upload-pack.c:29
+msgid "interrupt transfer after <n> seconds of inactivity"
msgstr ""
-#: builtin/submodule--helper.c:72
-#, c-format
-msgid "cannot strip one component off url '%s'"
+#: builtin/verify-commit.c:20
+msgid "git verify-commit [-v | --verbose] <commit>..."
msgstr ""
-#: builtin/submodule--helper.c:305 builtin/submodule--helper.c:630
-msgid "alternative anchor for relative paths"
+#: builtin/verify-commit.c:76
+msgid "print commit contents"
msgstr ""
-#: builtin/submodule--helper.c:310
-msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
+#: builtin/verify-commit.c:77 builtin/verify-tag.c:38
+msgid "print raw gpg status output"
msgstr ""
-#: builtin/submodule--helper.c:356 builtin/submodule--helper.c:380
-#, c-format
-msgid "No url found for submodule path '%s' in .gitmodules"
+#: builtin/verify-pack.c:55
+msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
msgstr ""
-#: builtin/submodule--helper.c:395
-#, c-format
-msgid ""
-"could not lookup configuration '%s'. Assuming this repository is its own "
-"authoritative upstream."
+#: builtin/verify-pack.c:65
+msgid "verbose"
msgstr ""
-#: builtin/submodule--helper.c:406
-#, c-format
-msgid "Failed to register url for submodule path '%s'"
+#: builtin/verify-pack.c:67
+msgid "show statistics only"
msgstr ""
-#: builtin/submodule--helper.c:410
-#, c-format
-msgid "Submodule '%s' (%s) registered for path '%s'\n"
+#: builtin/verify-tag.c:19
+msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
msgstr ""
-#: builtin/submodule--helper.c:420
-#, c-format
-msgid "warning: command update mode suggested for submodule '%s'\n"
+#: builtin/verify-tag.c:37
+msgid "print tag contents"
msgstr ""
-#: builtin/submodule--helper.c:427
-#, c-format
-msgid "Failed to register update mode for submodule path '%s'"
+#: builtin/worktree.c:18
+msgid "git worktree add [<options>] <path> [<commit-ish>]"
msgstr ""
-#: builtin/submodule--helper.c:443
-msgid "Suppress output for initializing a submodule"
+#: builtin/worktree.c:19
+msgid "git worktree list [<options>]"
msgstr ""
-#: builtin/submodule--helper.c:448
-msgid "git submodule--helper init [<path>]"
+#: builtin/worktree.c:20
+msgid "git worktree lock [<options>] <path>"
msgstr ""
-#: builtin/submodule--helper.c:476
-msgid "git submodule--helper name <path>"
+#: builtin/worktree.c:21
+msgid "git worktree move <worktree> <new-path>"
msgstr ""
-#: builtin/submodule--helper.c:482
+#: 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:891
#, c-format
-msgid "no submodule mapping found in .gitmodules for path '%s'"
+msgid "failed to delete '%s'"
msgstr ""
-#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:568
+#: builtin/worktree.c:80
#, c-format
-msgid "submodule '%s' cannot add alternate: %s"
+msgid "Removing worktrees/%s: not a valid directory"
msgstr ""
-#: builtin/submodule--helper.c:604
+#: builtin/worktree.c:86
#, c-format
-msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
+msgid "Removing worktrees/%s: gitdir file does not exist"
msgstr ""
-#: builtin/submodule--helper.c:611
+#: builtin/worktree.c:91 builtin/worktree.c:100
#, c-format
-msgid "Value '%s' for submodule.alternateLocation is not recognized"
+msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
msgstr ""
-#: builtin/submodule--helper.c:633
-msgid "where the new submodule will be cloned to"
+#: builtin/worktree.c:110
+#, c-format
+msgid ""
+"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
+"%<PRIuMAX>)"
msgstr ""
-#: builtin/submodule--helper.c:636
-msgid "name of the new submodule"
+#: builtin/worktree.c:118
+#, c-format
+msgid "Removing worktrees/%s: invalid gitdir file"
msgstr ""
-#: builtin/submodule--helper.c:639
-msgid "url where to clone the submodule from"
+#: builtin/worktree.c:127
+#, c-format
+msgid "Removing worktrees/%s: gitdir file points to non-existent location"
msgstr ""
-#: builtin/submodule--helper.c:645
-msgid "depth for shallow clones"
+#: builtin/worktree.c:166
+msgid "report pruned working trees"
msgstr ""
-#: builtin/submodule--helper.c:648 builtin/submodule--helper.c:993
-msgid "force cloning progress"
+#: builtin/worktree.c:168
+msgid "expire working trees older than <time>"
msgstr ""
-#: builtin/submodule--helper.c:653
-msgid ""
-"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
-"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
+#: builtin/worktree.c:235
+#, c-format
+msgid "'%s' already exists"
msgstr ""
-#: builtin/submodule--helper.c:684
+#: builtin/worktree.c:252
#, c-format
-msgid "clone of '%s' into submodule path '%s' failed"
+msgid "unable to re-add worktree '%s'"
msgstr ""
-#: builtin/submodule--helper.c:699
+#: builtin/worktree.c:257
#, c-format
-msgid "could not get submodule directory for '%s'"
+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/submodule--helper.c:764
+#: builtin/worktree.c:259
#, c-format
-msgid "Submodule path '%s' not initialized"
+msgid ""
+"'%s' is a missing but already registered worktree;\n"
+"use 'add -f' to override, or 'prune' or 'remove' to clear"
msgstr ""
-#: builtin/submodule--helper.c:768
-msgid "Maybe you want to use 'update --init'?"
+#: builtin/worktree.c:302
+#, c-format
+msgid "could not create directory of '%s'"
msgstr ""
-#: builtin/submodule--helper.c:793
+#: builtin/worktree.c:432 builtin/worktree.c:438
#, c-format
-msgid "Skipping unmerged submodule %s"
+msgid "Preparing worktree (new branch '%s')"
msgstr ""
-#: builtin/submodule--helper.c:814
+#: builtin/worktree.c:434
#, c-format
-msgid "Skipping submodule '%s'"
+msgid "Preparing worktree (resetting branch '%s'; was at %s)"
msgstr ""
-#: builtin/submodule--helper.c:942
+#: builtin/worktree.c:443
#, c-format
-msgid "Failed to clone '%s'. Retry scheduled"
+msgid "Preparing worktree (checking out '%s')"
msgstr ""
-#: builtin/submodule--helper.c:953
+#: builtin/worktree.c:449
#, c-format
-msgid "Failed to clone '%s' a second time, aborting"
+msgid "Preparing worktree (detached HEAD %s)"
msgstr ""
-#: builtin/submodule--helper.c:974 builtin/submodule--helper.c:1162
-msgid "path into the working tree"
+#: builtin/worktree.c:490
+msgid "checkout <branch> even if already checked out in other worktree"
msgstr ""
-#: builtin/submodule--helper.c:977
-msgid "path into the working tree, across nested submodule boundaries"
+#: builtin/worktree.c:493
+msgid "create a new branch"
msgstr ""
-#: builtin/submodule--helper.c:981
-msgid "rebase, merge, checkout or none"
+#: builtin/worktree.c:495
+msgid "create or reset a branch"
msgstr ""
-#: builtin/submodule--helper.c:985
-msgid "Create a shallow clone truncated to the specified number of revisions"
+#: builtin/worktree.c:497
+msgid "populate the new working tree"
msgstr ""
-#: builtin/submodule--helper.c:988
-msgid "parallel jobs"
+#: builtin/worktree.c:498
+msgid "keep the new working tree locked"
msgstr ""
-#: builtin/submodule--helper.c:990
-msgid "whether the initial clone should follow the shallow recommendation"
+#: builtin/worktree.c:501
+msgid "set up tracking mode (see git-branch(1))"
msgstr ""
-#: builtin/submodule--helper.c:991
-msgid "don't print cloning progress"
+#: builtin/worktree.c:504
+msgid "try to match the new branch name with a remote-tracking branch"
msgstr ""
-#: builtin/submodule--helper.c:998
-msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
+#: builtin/worktree.c:512
+msgid "-b, -B, and --detach are mutually exclusive"
msgstr ""
-#: builtin/submodule--helper.c:1008
-msgid "bad value for update parameter"
+#: builtin/worktree.c:573
+msgid "--[no-]track can only be used if a new branch is created"
msgstr ""
-#: builtin/submodule--helper.c:1079
-#, c-format
-msgid ""
-"Submodule (%s) branch configured to inherit branch from superproject, but "
-"the superproject is not on any branch"
+#: builtin/worktree.c:673
+msgid "reason for locking"
msgstr ""
-#: builtin/submodule--helper.c:1163
-msgid "recurse into submodules"
+#: builtin/worktree.c:685 builtin/worktree.c:718 builtin/worktree.c:792
+#: builtin/worktree.c:919
+#, c-format
+msgid "'%s' is not a working tree"
msgstr ""
-#: builtin/submodule--helper.c:1169
-msgid "git submodule--helper embed-git-dir [<path>...]"
+#: builtin/worktree.c:687 builtin/worktree.c:720
+msgid "The main working tree cannot be locked or unlocked"
msgstr ""
-#: builtin/submodule--helper.c:1232
+#: builtin/worktree.c:692
#, c-format
-msgid "%s doesn't support --super-prefix"
+msgid "'%s' is already locked, reason: %s"
msgstr ""
-#: builtin/submodule--helper.c:1238
+#: builtin/worktree.c:694
#, c-format
-msgid "'%s' is not a valid submodule--helper subcommand"
+msgid "'%s' is already locked"
msgstr ""
-#: builtin/symbolic-ref.c:8
-msgid "git symbolic-ref [<options>] <name> [<ref>]"
+#: builtin/worktree.c:722
+#, c-format
+msgid "'%s' is not locked"
msgstr ""
-#: builtin/symbolic-ref.c:9
-msgid "git symbolic-ref -d [-q] <name>"
+#: builtin/worktree.c:763
+msgid "working trees containing submodules cannot be moved or removed"
msgstr ""
-#: builtin/symbolic-ref.c:41
-msgid "suppress error message for non-symbolic (detached) refs"
+#: builtin/worktree.c:771
+msgid "force move even if worktree is dirty or locked"
msgstr ""
-#: builtin/symbolic-ref.c:42
-msgid "delete symbolic ref"
+#: builtin/worktree.c:794 builtin/worktree.c:921
+#, c-format
+msgid "'%s' is a main working tree"
msgstr ""
-#: builtin/symbolic-ref.c:43
-msgid "shorten ref output"
+#: builtin/worktree.c:799
+#, c-format
+msgid "could not figure out destination name from '%s'"
msgstr ""
-#: builtin/symbolic-ref.c:44 builtin/update-ref.c:363
-msgid "reason"
+#: builtin/worktree.c:805
+#, c-format
+msgid "target '%s' already exists"
msgstr ""
-#: builtin/symbolic-ref.c:44 builtin/update-ref.c:363
-msgid "reason of the update"
+#: builtin/worktree.c:813
+#, c-format
+msgid ""
+"cannot move a locked working tree, lock reason: %s\n"
+"use 'move -f -f' to override or unlock first"
msgstr ""
-#: builtin/tag.c:24
+#: builtin/worktree.c:815
msgid ""
-"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
-"[<head>]"
+"cannot move a locked working tree;\n"
+"use 'move -f -f' to override or unlock first"
msgstr ""
-#: builtin/tag.c:25
-msgid "git tag -d <tagname>..."
+#: builtin/worktree.c:818
+#, c-format
+msgid "validation failed, cannot move working tree: %s"
msgstr ""
-#: builtin/tag.c:26
-msgid ""
-"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
-"points-at <object>]\n"
-"\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]"
+#: builtin/worktree.c:823
+#, c-format
+msgid "failed to move '%s' to '%s'"
msgstr ""
-#: builtin/tag.c:28
-msgid "git tag -v [--format=<format>] <tagname>..."
+#: builtin/worktree.c:871
+#, c-format
+msgid "failed to run 'git status' on '%s'"
msgstr ""
-#: builtin/tag.c:84
+#: builtin/worktree.c:875
#, c-format
-msgid "tag '%s' not found."
+msgid "'%s' is dirty, use --force to delete it"
msgstr ""
-#: builtin/tag.c:100
+#: builtin/worktree.c:880
#, c-format
-msgid "Deleted tag '%s' (was %s)\n"
+msgid "failed to run 'git status' on '%s', code %d"
+msgstr ""
+
+#: builtin/worktree.c:903
+msgid "force removal even if worktree is dirty or locked"
msgstr ""
-#: builtin/tag.c:129
+#: builtin/worktree.c:926
#, c-format
msgid ""
-"\n"
-"Write a message for tag:\n"
-" %s\n"
-"Lines starting with '%c' will be ignored.\n"
+"cannot remove a locked working tree, lock reason: %s\n"
+"use 'remove -f -f' to override or unlock first"
msgstr ""
-#: builtin/tag.c:133
-#, c-format
+#: builtin/worktree.c:928
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"
+"cannot remove a locked working tree;\n"
+"use 'remove -f -f' to override or unlock first"
msgstr ""
-#: builtin/tag.c:211
-msgid "unable to sign the tag"
+#: builtin/worktree.c:931
+#, c-format
+msgid "validation failed, cannot remove working tree: %s"
msgstr ""
-#: builtin/tag.c:213
-msgid "unable to write tag file"
+#: builtin/write-tree.c:15
+msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
msgstr ""
-#: builtin/tag.c:237
-msgid "bad object type."
+#: builtin/write-tree.c:28
+msgid "<prefix>/"
msgstr ""
-#: builtin/tag.c:283
-msgid "no tag message?"
+#: builtin/write-tree.c:29
+msgid "write tree object for a subdirectory <prefix>"
msgstr ""
-#: builtin/tag.c:290
-#, c-format
-msgid "The tag message has been left in %s\n"
+#: builtin/write-tree.c:31
+msgid "only useful for debugging"
msgstr ""
-#: builtin/tag.c:398
-msgid "list tag names"
+#: 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 ""
-#: builtin/tag.c:400
-msgid "print <n> lines of each tag message"
+#: credential-cache--daemon.c:272
+msgid "print debugging messages to stderr"
msgstr ""
-#: builtin/tag.c:402
-msgid "delete tags"
+#: t/helper/test-reach.c:152
+#, c-format
+msgid "commit %s is not marked reachable"
msgstr ""
-#: builtin/tag.c:403
-msgid "verify tags"
+#: t/helper/test-reach.c:162
+msgid "too many commits marked reachable"
msgstr ""
-#: builtin/tag.c:405
-msgid "Tag creation options"
+#: t/helper/test-serve-v2.c:7
+msgid "test-tool serve-v2 [<options>]"
msgstr ""
-#: builtin/tag.c:407
-msgid "annotated tag, needs a message"
+#: t/helper/test-serve-v2.c:19
+msgid "exit immediately after advertising capabilities"
msgstr ""
-#: builtin/tag.c:409
-msgid "tag message"
+#: 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 ""
-#: builtin/tag.c:411
-msgid "annotated and GPG-signed tag"
+#: git.c:34
+msgid ""
+"'git help -a' and 'git help -g' list available subcommands and some\n"
+"concept guides. See 'git help <command>' or 'git help <concept>'\n"
+"to read about a specific subcommand or concept."
msgstr ""
-#: builtin/tag.c:415
-msgid "use another key to sign the tag"
+#: git.c:185
+#, c-format
+msgid "no directory given for --git-dir\n"
msgstr ""
-#: builtin/tag.c:416
-msgid "replace the tag if exists"
+#: git.c:199
+#, c-format
+msgid "no namespace given for --namespace\n"
msgstr ""
-#: builtin/tag.c:417 builtin/update-ref.c:369
-msgid "create a reflog"
+#: git.c:213
+#, c-format
+msgid "no directory given for --work-tree\n"
msgstr ""
-#: builtin/tag.c:419
-msgid "Tag listing options"
+#: git.c:227
+#, c-format
+msgid "no prefix given for --super-prefix\n"
msgstr ""
-#: builtin/tag.c:420
-msgid "show tag list in columns"
+#: git.c:249
+#, c-format
+msgid "-c expects a configuration string\n"
msgstr ""
-#: builtin/tag.c:421 builtin/tag.c:423
-msgid "print only tags that contain the commit"
+#: git.c:287
+#, c-format
+msgid "no directory given for -C\n"
msgstr ""
-#: builtin/tag.c:422 builtin/tag.c:424
-msgid "print only tags that don't contain the commit"
+#: git.c:313
+#, c-format
+msgid "unknown option: %s\n"
msgstr ""
-#: builtin/tag.c:425
-msgid "print only tags that are merged"
+#: git.c:359
+#, c-format
+msgid "while expanding alias '%s': '%s'"
msgstr ""
-#: builtin/tag.c:426
-msgid "print only tags that are not merged"
+#: git.c:368
+#, c-format
+msgid ""
+"alias '%s' changes environment variables.\n"
+"You can use '!git' in the alias to do this"
msgstr ""
-#: builtin/tag.c:431
-msgid "print only tags of the object"
+#: git.c:376
+#, c-format
+msgid "empty alias for %s"
msgstr ""
-#: builtin/tag.c:470
-msgid "--column and -n are incompatible"
+#: git.c:379
+#, c-format
+msgid "recursive alias: %s"
msgstr ""
-#: builtin/tag.c:492
-msgid "-n option is only allowed in list mode"
+#: git.c:459
+msgid "write failure on standard output"
msgstr ""
-#: builtin/tag.c:494
-msgid "--contains option is only allowed in list mode"
+#: git.c:461
+msgid "unknown write failure on standard output"
msgstr ""
-#: builtin/tag.c:496
-msgid "--no-contains option is only allowed in list mode"
+#: git.c:463
+msgid "close failed on standard output"
msgstr ""
-#: builtin/tag.c:498
-msgid "--points-at option is only allowed in list mode"
+#: git.c:797
+#, c-format
+msgid "alias loop detected: expansion of '%s' does not terminate:%s"
msgstr ""
-#: builtin/tag.c:500
-msgid "--merged and --no-merged options are only allowed in list mode"
+#: git.c:847
+#, c-format
+msgid "cannot handle %s as a builtin"
msgstr ""
-#: builtin/tag.c:511
-msgid "only one -F or -m option is allowed."
+#: git.c:860
+#, c-format
+msgid ""
+"usage: %s\n"
+"\n"
msgstr ""
-#: builtin/tag.c:530
-msgid "too many params"
+#: git.c:880
+#, c-format
+msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
msgstr ""
-#: builtin/tag.c:536
+#: git.c:892
#, c-format
-msgid "'%s' is not a valid tag name."
+msgid "failed to run command '%s': %s\n"
msgstr ""
-#: builtin/tag.c:541
+#: http.c:378
#, c-format
-msgid "tag '%s' already exists"
+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 ""
-#: builtin/tag.c:571
+#: 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 "Updated tag '%s' (was %s)\n"
+msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
msgstr ""
-#: builtin/unpack-objects.c:494
-msgid "Unpacking objects"
+#: http.c:1092
+#, c-format
+msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
msgstr ""
-#: builtin/update-index.c:80
+#: http.c:1096
#, c-format
-msgid "failed to create directory %s"
+msgid "Could not set SSL backend to '%s': already set"
msgstr ""
-#: builtin/update-index.c:86
+#: http.c:1965
#, c-format
-msgid "failed to stat %s"
+msgid ""
+"unable to update url base from redirection:\n"
+" asked for: %s\n"
+" redirect: %s"
msgstr ""
-#: builtin/update-index.c:96
+#: remote-curl.c:157
#, c-format
-msgid "failed to create file %s"
+msgid "invalid quoting in push-option value: '%s'"
msgstr ""
-#: builtin/update-index.c:104
+#: remote-curl.c:254
#, c-format
-msgid "failed to delete file %s"
+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 ""
-#: builtin/update-index.c:111 builtin/update-index.c:217
+#: remote-curl.c:386
#, c-format
-msgid "failed to delete directory %s"
+msgid "invalid server response; got '%s'"
msgstr ""
-#: builtin/update-index.c:136
+#: remote-curl.c:446
#, c-format
-msgid "Testing mtime in '%s' "
+msgid "repository '%s' not found"
msgstr ""
-#: builtin/update-index.c:150
-msgid "directory stat info does not change after adding a new file"
+#: remote-curl.c:450
+#, c-format
+msgid "Authentication failed for '%s'"
msgstr ""
-#: builtin/update-index.c:163
-msgid "directory stat info does not change after adding a new directory"
+#: remote-curl.c:454
+#, c-format
+msgid "unable to access '%s': %s"
msgstr ""
-#: builtin/update-index.c:176
-msgid "directory stat info changes after updating a file"
+#: remote-curl.c:460
+#, c-format
+msgid "redirecting to %s"
msgstr ""
-#: builtin/update-index.c:187
-msgid "directory stat info changes after adding a file inside subdirectory"
+#: remote-curl.c:584
+msgid "shouldn't have EOF when not gentle on EOF"
msgstr ""
-#: builtin/update-index.c:198
-msgid "directory stat info does not change after deleting a file"
+#: remote-curl.c:664
+msgid "unable to rewind rpc post data - try increasing http.postBuffer"
msgstr ""
-#: builtin/update-index.c:211
-msgid "directory stat info does not change after deleting a directory"
+#: remote-curl.c:724
+#, c-format
+msgid "RPC failed; %s"
msgstr ""
-#: builtin/update-index.c:218
-msgid " OK"
+#: remote-curl.c:764
+msgid "cannot handle pushes this big"
msgstr ""
-#: builtin/update-index.c:569
-msgid "git update-index [<options>] [--] [<file>...]"
+#: remote-curl.c:879
+#, c-format
+msgid "cannot deflate request; zlib deflate error %d"
msgstr ""
-#: builtin/update-index.c:924
-msgid "continue refresh even when index needs update"
+#: remote-curl.c:883
+#, c-format
+msgid "cannot deflate request; zlib end error %d"
msgstr ""
-#: builtin/update-index.c:927
-msgid "refresh: ignore submodules"
+#: remote-curl.c:1014
+msgid "dumb http transport does not support shallow capabilities"
msgstr ""
-#: builtin/update-index.c:930
-msgid "do not ignore new files"
+#: remote-curl.c:1028
+msgid "fetch failed."
msgstr ""
-#: builtin/update-index.c:932
-msgid "let files replace directories and vice-versa"
+#: remote-curl.c:1076
+msgid "cannot fetch by sha1 over smart http"
msgstr ""
-#: builtin/update-index.c:934
-msgid "notice files missing from worktree"
+#: remote-curl.c:1120 remote-curl.c:1126
+#, c-format
+msgid "protocol error: expected sha/ref, got '%s'"
msgstr ""
-#: builtin/update-index.c:936
-msgid "refresh even if index contains unmerged entries"
+#: remote-curl.c:1138 remote-curl.c:1252
+#, c-format
+msgid "http transport does not support %s"
msgstr ""
-#: builtin/update-index.c:939
-msgid "refresh stat information"
+#: remote-curl.c:1174
+msgid "git-http-push failed"
msgstr ""
-#: builtin/update-index.c:943
-msgid "like --refresh, but ignore assume-unchanged setting"
+#: remote-curl.c:1360
+msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
msgstr ""
-#: builtin/update-index.c:947
-msgid "<mode>,<object>,<path>"
+#: remote-curl.c:1392
+msgid "remote-curl: error reading command stream from git"
msgstr ""
-#: builtin/update-index.c:948
-msgid "add the specified entry to the index"
+#: remote-curl.c:1399
+msgid "remote-curl: fetch attempted without a local repo"
msgstr ""
-#: builtin/update-index.c:957
-msgid "mark files as \"not changing\""
+#: remote-curl.c:1439
+#, c-format
+msgid "remote-curl: unknown command '%s' from git"
msgstr ""
-#: builtin/update-index.c:960
-msgid "clear assumed-unchanged bit"
+#: list-objects-filter-options.h:61
+msgid "args"
msgstr ""
-#: builtin/update-index.c:963
-msgid "mark files as \"index-only\""
+#: list-objects-filter-options.h:62
+msgid "object filtering"
msgstr ""
-#: builtin/update-index.c:966
-msgid "clear skip-worktree bit"
+#: parse-options.h:170
+msgid "expiry-date"
msgstr ""
-#: builtin/update-index.c:969
-msgid "add to index only; do not add content to object database"
+#: parse-options.h:184
+msgid "no-op (backward compatibility)"
msgstr ""
-#: builtin/update-index.c:971
-msgid "remove named paths even if present in worktree"
+#: parse-options.h:304
+msgid "be more verbose"
msgstr ""
-#: builtin/update-index.c:973
-msgid "with --stdin: input lines are terminated by null bytes"
+#: parse-options.h:306
+msgid "be more quiet"
msgstr ""
-#: builtin/update-index.c:975
-msgid "read list of paths to be updated from standard input"
+#: parse-options.h:312
+msgid "use <n> digits to display SHA-1s"
msgstr ""
-#: builtin/update-index.c:979
-msgid "add entries from standard input to the index"
+#: parse-options.h:331
+msgid "how to strip spaces and #comments from message"
msgstr ""
-#: builtin/update-index.c:983
-msgid "repopulate stages #2 and #3 for the listed paths"
+#: ref-filter.h:101
+msgid "key"
msgstr ""
-#: builtin/update-index.c:987
-msgid "only update entries that differ from HEAD"
+#: ref-filter.h:101
+msgid "field name to sort on"
msgstr ""
-#: builtin/update-index.c:991
-msgid "ignore files missing from worktree"
+#: rerere.h:44
+msgid "update the index with reused conflict resolution if possible"
msgstr ""
-#: builtin/update-index.c:994
-msgid "report actions to standard output"
+#: command-list.h:50
+msgid "Add file contents to the index"
msgstr ""
-#: builtin/update-index.c:996
-msgid "(for porcelains) forget saved unresolved conflicts"
+#: command-list.h:51
+msgid "Apply a series of patches from a mailbox"
msgstr ""
-#: builtin/update-index.c:1000
-msgid "write index in this format"
+#: command-list.h:52
+msgid "Annotate file lines with commit information"
msgstr ""
-#: builtin/update-index.c:1002
-msgid "enable or disable split index"
+#: command-list.h:53
+msgid "Apply a patch to files and/or to the index"
msgstr ""
-#: builtin/update-index.c:1004
-msgid "enable/disable untracked cache"
+#: command-list.h:54
+msgid "Import a GNU Arch repository into Git"
msgstr ""
-#: builtin/update-index.c:1006
-msgid "test if the filesystem supports untracked cache"
+#: command-list.h:55
+msgid "Create an archive of files from a named tree"
msgstr ""
-#: builtin/update-index.c:1008
-msgid "enable untracked cache without testing the filesystem"
+#: command-list.h:56
+msgid "Use binary search to find the commit that introduced a bug"
msgstr ""
-#: builtin/update-index.c:1108
-msgid ""
-"core.splitIndex is set to false; remove or change it, if you really want to "
-"enable split index"
+#: command-list.h:57
+msgid "Show what revision and author last modified each line of a file"
msgstr ""
-#: builtin/update-index.c:1117
-msgid ""
-"core.splitIndex is set to true; remove or change it, if you really want to "
-"disable split index"
+#: command-list.h:58
+msgid "List, create, or delete branches"
msgstr ""
-#: builtin/update-index.c:1128
-msgid ""
-"core.untrackedCache is set to true; remove or change it, if you really want "
-"to disable the untracked cache"
+#: command-list.h:59
+msgid "Move objects and refs by archive"
msgstr ""
-#: builtin/update-index.c:1132
-msgid "Untracked cache disabled"
+#: command-list.h:60
+msgid "Provide content or type and size information for repository objects"
msgstr ""
-#: builtin/update-index.c:1140
-msgid ""
-"core.untrackedCache is set to false; remove or change it, if you really want "
-"to enable the untracked cache"
+#: command-list.h:61
+msgid "Display gitattributes information"
msgstr ""
-#: builtin/update-index.c:1144
-#, c-format
-msgid "Untracked cache enabled for '%s'"
+#: command-list.h:62
+msgid "Debug gitignore / exclude files"
msgstr ""
-#: builtin/update-ref.c:10
-msgid "git update-ref [<options>] -d <refname> [<old-val>]"
+#: command-list.h:63
+msgid "Show canonical names and email addresses of contacts"
msgstr ""
-#: builtin/update-ref.c:11
-msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]"
+#: command-list.h:64
+msgid "Switch branches or restore working tree files"
msgstr ""
-#: builtin/update-ref.c:12
-msgid "git update-ref [<options>] --stdin [-z]"
+#: command-list.h:65
+msgid "Copy files from the index to the working tree"
msgstr ""
-#: builtin/update-ref.c:364
-msgid "delete the reference"
+#: command-list.h:66
+msgid "Ensures that a reference name is well formed"
msgstr ""
-#: builtin/update-ref.c:366
-msgid "update <refname> not the one it points to"
+#: command-list.h:67
+msgid "Find commits yet to be applied to upstream"
msgstr ""
-#: builtin/update-ref.c:367
-msgid "stdin has NUL-terminated arguments"
+#: command-list.h:68
+msgid "Apply the changes introduced by some existing commits"
msgstr ""
-#: builtin/update-ref.c:368
-msgid "read updates from stdin"
+#: command-list.h:69
+msgid "Graphical alternative to git-commit"
msgstr ""
-#: builtin/update-server-info.c:7
-msgid "git update-server-info [--force]"
+#: command-list.h:70
+msgid "Remove untracked files from the working tree"
msgstr ""
-#: builtin/update-server-info.c:15
-msgid "update the info files from scratch"
+#: command-list.h:71
+msgid "Clone a repository into a new directory"
msgstr ""
-#: builtin/verify-commit.c:18
-msgid "git verify-commit [-v | --verbose] <commit>..."
+#: command-list.h:72
+msgid "Display data in columns"
msgstr ""
-#: builtin/verify-commit.c:73
-msgid "print commit contents"
+#: command-list.h:73
+msgid "Record changes to the repository"
msgstr ""
-#: builtin/verify-commit.c:74 builtin/verify-tag.c:38
-msgid "print raw gpg status output"
+#: command-list.h:74
+msgid "Write and verify Git commit-graph files"
msgstr ""
-#: builtin/verify-pack.c:55
-msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
+#: command-list.h:75
+msgid "Create a new commit object"
msgstr ""
-#: builtin/verify-pack.c:65
-msgid "verbose"
+#: command-list.h:76
+msgid "Get and set repository or global options"
msgstr ""
-#: builtin/verify-pack.c:67
-msgid "show statistics only"
+#: command-list.h:77
+msgid "Count unpacked number of objects and their disk consumption"
msgstr ""
-#: builtin/verify-tag.c:19
-msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
+#: command-list.h:78
+msgid "Retrieve and store user credentials"
msgstr ""
-#: builtin/verify-tag.c:37
-msgid "print tag contents"
+#: command-list.h:79
+msgid "Helper to temporarily store passwords in memory"
msgstr ""
-#: builtin/worktree.c:16
-msgid "git worktree add [<options>] <path> [<branch>]"
+#: command-list.h:80
+msgid "Helper to store credentials on disk"
msgstr ""
-#: builtin/worktree.c:17
-msgid "git worktree list [<options>]"
+#: command-list.h:81
+msgid "Export a single commit to a CVS checkout"
msgstr ""
-#: builtin/worktree.c:18
-msgid "git worktree lock [<options>] <path>"
+#: command-list.h:82
+msgid "Salvage your data out of another SCM people love to hate"
msgstr ""
-#: builtin/worktree.c:19
-msgid "git worktree prune [<options>]"
+#: command-list.h:83
+msgid "A CVS server emulator for Git"
msgstr ""
-#: builtin/worktree.c:20
-msgid "git worktree unlock <path>"
+#: command-list.h:84
+msgid "A really simple server for Git repositories"
msgstr ""
-#: builtin/worktree.c:44
-#, c-format
-msgid "Removing worktrees/%s: not a valid directory"
+#: command-list.h:85
+msgid "Give an object a human readable name based on an available ref"
msgstr ""
-#: builtin/worktree.c:50
-#, c-format
-msgid "Removing worktrees/%s: gitdir file does not exist"
+#: command-list.h:86
+msgid "Show changes between commits, commit and working tree, etc"
msgstr ""
-#: builtin/worktree.c:55
-#, c-format
-msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
+#: command-list.h:87
+msgid "Compares files in the working tree and the index"
msgstr ""
-#: builtin/worktree.c:66
-#, c-format
-msgid "Removing worktrees/%s: invalid gitdir file"
+#: command-list.h:88
+msgid "Compare a tree to the working tree or index"
msgstr ""
-#: builtin/worktree.c:82
-#, c-format
-msgid "Removing worktrees/%s: gitdir file points to non-existent location"
+#: command-list.h:89
+msgid "Compares the content and mode of blobs found via two tree objects"
msgstr ""
-#: builtin/worktree.c:129
-msgid "report pruned working trees"
+#: command-list.h:90
+msgid "Show changes using common diff tools"
msgstr ""
-#: builtin/worktree.c:131
-msgid "expire working trees older than <time>"
+#: command-list.h:91
+msgid "Git data exporter"
msgstr ""
-#: builtin/worktree.c:205
-#, c-format
-msgid "'%s' already exists"
+#: command-list.h:92
+msgid "Backend for fast Git data importers"
msgstr ""
-#: builtin/worktree.c:236
-#, c-format
-msgid "could not create directory of '%s'"
+#: command-list.h:93
+msgid "Download objects and refs from another repository"
msgstr ""
-#: builtin/worktree.c:275
-#, c-format
-msgid "Preparing %s (identifier %s)"
+#: command-list.h:94
+msgid "Receive missing objects from another repository"
msgstr ""
-#: builtin/worktree.c:327
-msgid "checkout <branch> even if already checked out in other worktree"
+#: command-list.h:95
+msgid "Rewrite branches"
msgstr ""
-#: builtin/worktree.c:329
-msgid "create a new branch"
+#: command-list.h:96
+msgid "Produce a merge commit message"
msgstr ""
-#: builtin/worktree.c:331
-msgid "create or reset a branch"
+#: command-list.h:97
+msgid "Output information on each ref"
msgstr ""
-#: builtin/worktree.c:333
-msgid "populate the new working tree"
+#: command-list.h:98
+msgid "Prepare patches for e-mail submission"
msgstr ""
-#: builtin/worktree.c:334
-msgid "keep the new working tree locked"
+#: command-list.h:99
+msgid "Verifies the connectivity and validity of the objects in the database"
msgstr ""
-#: builtin/worktree.c:342
-msgid "-b, -B, and --detach are mutually exclusive"
+#: command-list.h:100
+msgid "Cleanup unnecessary files and optimize the local repository"
msgstr ""
-#: builtin/worktree.c:479
-msgid "reason for locking"
+#: command-list.h:101
+msgid "Extract commit ID from an archive created using git-archive"
msgstr ""
-#: builtin/worktree.c:491 builtin/worktree.c:524
-#, c-format
-msgid "'%s' is not a working tree"
+#: command-list.h:102
+msgid "Print lines matching a pattern"
msgstr ""
-#: builtin/worktree.c:493 builtin/worktree.c:526
-msgid "The main working tree cannot be locked or unlocked"
+#: command-list.h:103
+msgid "A portable graphical interface to Git"
msgstr ""
-#: builtin/worktree.c:498
-#, c-format
-msgid "'%s' is already locked, reason: %s"
+#: command-list.h:104
+msgid "Compute object ID and optionally creates a blob from a file"
msgstr ""
-#: builtin/worktree.c:500
-#, c-format
-msgid "'%s' is already locked"
+#: command-list.h:105
+msgid "Display help information about Git"
msgstr ""
-#: builtin/worktree.c:528
-#, c-format
-msgid "'%s' is not locked"
+#: command-list.h:106
+msgid "Server side implementation of Git over HTTP"
msgstr ""
-#: builtin/write-tree.c:14
-msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
+#: command-list.h:107
+msgid "Download from a remote Git repository via HTTP"
msgstr ""
-#: builtin/write-tree.c:27
-msgid "<prefix>/"
+#: command-list.h:108
+msgid "Push objects over HTTP/DAV to another repository"
msgstr ""
-#: builtin/write-tree.c:28
-msgid "write tree object for a subdirectory <prefix>"
+#: command-list.h:109
+msgid "Send a collection of patches from stdin to an IMAP folder"
msgstr ""
-#: builtin/write-tree.c:31
-msgid "only useful for debugging"
+#: command-list.h:110
+msgid "Build pack index file for an existing packed archive"
msgstr ""
-#: upload-pack.c:23
-msgid "git upload-pack [<options>] <dir>"
+#: command-list.h:111
+msgid "Create an empty Git repository or reinitialize an existing one"
msgstr ""
-#: upload-pack.c:1041
-msgid "quit after a single request/response exchange"
+#: command-list.h:112
+msgid "Instantly browse your working repository in gitweb"
msgstr ""
-#: upload-pack.c:1043
-msgid "exit immediately after initial ref advertisement"
+#: command-list.h:113
+msgid "Add or parse structured information in commit messages"
msgstr ""
-#: upload-pack.c:1045
-msgid "do not try <directory>/.git/ if <directory> is no Git directory"
+#: command-list.h:114
+msgid "The Git repository browser"
msgstr ""
-#: upload-pack.c:1047
-msgid "interrupt transfer after <n> seconds of inactivity"
+#: command-list.h:115
+msgid "Show commit logs"
msgstr ""
-#: credential-cache--daemon.c:224
-#, c-format
-msgid ""
-"The permissions on your socket directory are too loose; other\n"
-"users may be able to read your cached credentials. Consider running:\n"
-"\n"
-"\tchmod 0700 %s"
+#: command-list.h:116
+msgid "Show information about files in the index and the working tree"
msgstr ""
-#: credential-cache--daemon.c:272
-msgid "print debugging messages to stderr"
+#: command-list.h:117
+msgid "List references in a remote repository"
msgstr ""
-#: git.c:15
-msgid ""
-"'git help -a' and 'git help -g' list available subcommands and some\n"
-"concept guides. See 'git help <command>' or 'git help <concept>'\n"
-"to read about a specific subcommand or concept."
+#: command-list.h:118
+msgid "List the contents of a tree object"
msgstr ""
-#: http.c:337
-#, c-format
-msgid "negative value for http.postbuffer; defaulting to %d"
+#: command-list.h:119
+msgid "Extracts patch and authorship from a single e-mail message"
msgstr ""
-#: http.c:358
-msgid "Delegation control is not supported with cURL < 7.22.0"
+#: command-list.h:120
+msgid "Simple UNIX mbox splitter program"
msgstr ""
-#: http.c:367
-msgid "Public key pinning not supported with cURL < 7.44.0"
+#: command-list.h:121
+msgid "Join two or more development histories together"
msgstr ""
-#: http.c:1764
-#, c-format
-msgid ""
-"unable to update url base from redirection:\n"
-" asked for: %s\n"
-" redirect: %s"
+#: command-list.h:122
+msgid "Find as good common ancestors as possible for a merge"
msgstr ""
-#: remote-curl.c:324
-#, c-format
-msgid "redirecting to %s"
+#: command-list.h:123
+msgid "Run a three-way file merge"
msgstr ""
-#: common-cmds.h:9
-msgid "start a working area (see also: git help tutorial)"
+#: command-list.h:124
+msgid "Run a merge for files needing merging"
msgstr ""
-#: common-cmds.h:10
-msgid "work on the current change (see also: git help everyday)"
+#: command-list.h:125
+msgid "The standard helper program to use with git-merge-index"
msgstr ""
-#: common-cmds.h:11
-msgid "examine the history and state (see also: git help revisions)"
+#: command-list.h:126
+msgid "Run merge conflict resolution tools to resolve merge conflicts"
msgstr ""
-#: common-cmds.h:12
-msgid "grow, mark and tweak your common history"
+#: command-list.h:127
+msgid "Show three-way merge without touching index"
msgstr ""
-#: common-cmds.h:13
-msgid "collaborate (see also: git help workflows)"
+#: command-list.h:128
+msgid "Write and verify multi-pack-indexes"
msgstr ""
-#: common-cmds.h:17
-msgid "Add file contents to the index"
+#: command-list.h:129
+msgid "Creates a tag object"
msgstr ""
-#: common-cmds.h:18
-msgid "Use binary search to find the commit that introduced a bug"
+#: command-list.h:130
+msgid "Build a tree-object from ls-tree formatted text"
msgstr ""
-#: common-cmds.h:19
-msgid "List, create, or delete branches"
+#: command-list.h:131
+msgid "Move or rename a file, a directory, or a symlink"
msgstr ""
-#: common-cmds.h:20
-msgid "Switch branches or restore working tree files"
+#: command-list.h:132
+msgid "Find symbolic names for given revs"
msgstr ""
-#: common-cmds.h:21
-msgid "Clone a repository into a new directory"
+#: command-list.h:133
+msgid "Add or inspect object notes"
msgstr ""
-#: common-cmds.h:22
-msgid "Record changes to the repository"
+#: command-list.h:134
+msgid "Import from and submit to Perforce repositories"
msgstr ""
-#: common-cmds.h:23
-msgid "Show changes between commits, commit and working tree, etc"
+#: command-list.h:135
+msgid "Create a packed archive of objects"
msgstr ""
-#: common-cmds.h:24
-msgid "Download objects and refs from another repository"
+#: command-list.h:136
+msgid "Find redundant pack files"
msgstr ""
-#: common-cmds.h:25
-msgid "Print lines matching a pattern"
+#: command-list.h:137
+msgid "Pack heads and tags for efficient repository access"
msgstr ""
-#: common-cmds.h:26
-msgid "Create an empty Git repository or reinitialize an existing one"
+#: command-list.h:138
+msgid "Routines to help parsing remote repository access parameters"
msgstr ""
-#: common-cmds.h:27
-msgid "Show commit logs"
+#: command-list.h:139
+msgid "Compute unique ID for a patch"
msgstr ""
-#: common-cmds.h:28
-msgid "Join two or more development histories together"
+#: command-list.h:140
+msgid "Prune all unreachable objects from the object database"
msgstr ""
-#: common-cmds.h:29
-msgid "Move or rename a file, a directory, or a symlink"
+#: command-list.h:141
+msgid "Remove extra objects that are already in pack files"
msgstr ""
-#: common-cmds.h:30
+#: command-list.h:142
msgid "Fetch from and integrate with another repository or a local branch"
msgstr ""
-#: common-cmds.h:31
+#: command-list.h:143
msgid "Update remote refs along with associated objects"
msgstr ""
-#: common-cmds.h:32
-msgid "Reapply commits on top of another base tip"
+#: command-list.h:144
+msgid "Applies a quilt patchset onto the current branch"
msgstr ""
-#: common-cmds.h:33
-msgid "Reset current HEAD to the specified state"
+#: command-list.h:145
+msgid "Compare two commit ranges (e.g. two versions of a branch)"
msgstr ""
-#: common-cmds.h:34
-msgid "Remove files from the working tree and from the index"
+#: command-list.h:146
+msgid "Reads tree information into the index"
msgstr ""
-#: common-cmds.h:35
-msgid "Show various types of objects"
+#: command-list.h:147
+msgid "Reapply commits on top of another base tip"
msgstr ""
-#: common-cmds.h:36
-msgid "Show the working tree status"
+#: command-list.h:148
+msgid "Receive what is pushed into the repository"
msgstr ""
-#: common-cmds.h:37
-msgid "Create, list, delete or verify a tag object signed with GPG"
+#: command-list.h:149
+msgid "Manage reflog information"
msgstr ""
-#: parse-options.h:145
-msgid "expiry-date"
+#: command-list.h:150
+msgid "Manage set of tracked repositories"
msgstr ""
-#: parse-options.h:160
-msgid "no-op (backward compatibility)"
+#: command-list.h:151
+msgid "Pack unpacked objects in a repository"
msgstr ""
-#: parse-options.h:238
-msgid "be more verbose"
+#: command-list.h:152
+msgid "Create, list, delete refs to replace objects"
msgstr ""
-#: parse-options.h:240
-msgid "be more quiet"
+#: command-list.h:153
+msgid "Generates a summary of pending changes"
msgstr ""
-#: parse-options.h:246
-msgid "use <n> digits to display SHA-1s"
+#: command-list.h:154
+msgid "Reuse recorded resolution of conflicted merges"
msgstr ""
-#: rerere.h:40
-msgid "update the index with reused conflict resolution if possible"
+#: command-list.h:155
+msgid "Reset current HEAD to the specified state"
msgstr ""
-#: git-bisect.sh:54
-msgid "You need to start by \"git bisect start\""
+#: command-list.h:156
+msgid "Revert some existing commits"
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]? "
+#: command-list.h:157
+msgid "Lists commit objects in reverse chronological order"
msgstr ""
-#: git-bisect.sh:121
-#, sh-format
-msgid "unrecognised option: '$arg'"
+#: command-list.h:158
+msgid "Pick out and massage parameters"
msgstr ""
-#: git-bisect.sh:125
-#, sh-format
-msgid "'$arg' does not appear to be a valid revision"
+#: command-list.h:159
+msgid "Remove files from the working tree and from the index"
msgstr ""
-#: git-bisect.sh:154
-msgid "Bad HEAD - I need a HEAD"
+#: command-list.h:160
+msgid "Send a collection of patches as emails"
msgstr ""
-#: git-bisect.sh:167
-#, sh-format
-msgid ""
-"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
+#: command-list.h:161
+msgid "Push objects over Git protocol to another repository"
msgstr ""
-#: git-bisect.sh:177
-msgid "won't bisect on cg-seek'ed tree"
+#: command-list.h:162
+msgid "Restricted login shell for Git-only SSH access"
msgstr ""
-#: git-bisect.sh:181
-msgid "Bad HEAD - strange symbolic ref"
+#: command-list.h:163
+msgid "Summarize 'git log' output"
msgstr ""
-#: git-bisect.sh:233
-#, sh-format
-msgid "Bad bisect_write argument: $state"
+#: command-list.h:164
+msgid "Show various types of objects"
msgstr ""
-#: git-bisect.sh:262
-#, sh-format
-msgid "Bad rev input: $arg"
+#: command-list.h:165
+msgid "Show branches and their commits"
msgstr ""
-#: git-bisect.sh:281
-#, sh-format
-msgid "Bad rev input: $bisected_head"
+#: command-list.h:166
+msgid "Show packed archive index"
msgstr ""
-#: git-bisect.sh:290
-#, sh-format
-msgid "Bad rev input: $rev"
+#: command-list.h:167
+msgid "List references in a local repository"
msgstr ""
-#: git-bisect.sh:299
-#, sh-format
-msgid "'git bisect $TERM_BAD' can take only one argument."
+#: command-list.h:168
+msgid "Git's i18n setup code for shell scripts"
msgstr ""
-#: git-bisect.sh:322
-#, sh-format
-msgid "Warning: bisecting only with a $TERM_BAD commit."
+#: command-list.h:169
+msgid "Common Git shell script setup code"
msgstr ""
-#. TRANSLATORS: Make sure to include [Y] and [n] in your
-#. translation. The program will only accept English input
-#. at this point.
-#: git-bisect.sh:328
-msgid "Are you sure [Y/n]? "
+#: command-list.h:170
+msgid "Stash the changes in a dirty working directory away"
msgstr ""
-#: git-bisect.sh:340
-#, sh-format
-msgid ""
-"You need to give me at least one $bad_syn and one $good_syn revision.\n"
-"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
+#: command-list.h:171
+msgid "Add file contents to the staging area"
msgstr ""
-#: git-bisect.sh:343
-#, sh-format
-msgid ""
-"You need to start by \"git bisect start\".\n"
-"You then need to give me at least one $good_syn and one $bad_syn revision.\n"
-"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
+#: command-list.h:172
+msgid "Show the working tree status"
msgstr ""
-#: git-bisect.sh:414 git-bisect.sh:546
-msgid "We are not bisecting."
+#: command-list.h:173
+msgid "Remove unnecessary whitespace"
msgstr ""
-#: git-bisect.sh:421
-#, sh-format
-msgid "'$invalid' is not a valid commit"
+#: command-list.h:174
+msgid "Initialize, update or inspect submodules"
msgstr ""
-#: git-bisect.sh:430
-#, sh-format
-msgid ""
-"Could not check out original HEAD '$branch'.\n"
-"Try 'git bisect reset <commit>'."
+#: command-list.h:175
+msgid "Bidirectional operation between a Subversion repository and Git"
msgstr ""
-#: git-bisect.sh:458
-msgid "No logfile given"
+#: command-list.h:176
+msgid "Read, modify and delete symbolic refs"
msgstr ""
-#: git-bisect.sh:459
-#, sh-format
-msgid "cannot read $file for replaying"
+#: command-list.h:177
+msgid "Create, list, delete or verify a tag object signed with GPG"
msgstr ""
-#: git-bisect.sh:480
-msgid "?? what are you talking about?"
+#: command-list.h:178
+msgid "Creates a temporary file with a blob's contents"
msgstr ""
-#: git-bisect.sh:492
-#, sh-format
-msgid "running $command"
+#: command-list.h:179
+msgid "Unpack objects from a packed archive"
msgstr ""
-#: git-bisect.sh:499
-#, sh-format
-msgid ""
-"bisect run failed:\n"
-"exit code $res from '$command' is < 0 or >= 128"
+#: command-list.h:180
+msgid "Register file contents in the working tree to the index"
msgstr ""
-#: git-bisect.sh:525
-msgid "bisect run cannot continue any more"
+#: command-list.h:181
+msgid "Update the object name stored in a ref safely"
msgstr ""
-#: git-bisect.sh:531
-#, sh-format
-msgid ""
-"bisect run failed:\n"
-"'bisect_state $state' exited with error code $res"
+#: command-list.h:182
+msgid "Update auxiliary info file to help dumb servers"
msgstr ""
-#: git-bisect.sh:538
-msgid "bisect run success"
+#: command-list.h:183
+msgid "Send archive back to git-archive"
msgstr ""
-#: git-bisect.sh:565
-msgid "please use two different terms"
+#: command-list.h:184
+msgid "Send objects packed back to git-fetch-pack"
msgstr ""
-#: git-bisect.sh:575
-#, sh-format
-msgid "'$term' is not a valid term"
+#: command-list.h:185
+msgid "Show a Git logical variable"
msgstr ""
-#: git-bisect.sh:578
-#, sh-format
-msgid "can't use the builtin command '$term' as a term"
+#: command-list.h:186
+msgid "Check the GPG signature of commits"
msgstr ""
-#: git-bisect.sh:587 git-bisect.sh:593
-#, sh-format
-msgid "can't change the meaning of term '$term'"
+#: command-list.h:187
+msgid "Validate packed Git archive files"
msgstr ""
-#: git-bisect.sh:606
-#, sh-format
-msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect."
+#: command-list.h:188
+msgid "Check the GPG signature of tags"
msgstr ""
-#: git-bisect.sh:636
-msgid "no terms defined"
+#: command-list.h:189
+msgid "Git web interface (web frontend to Git repositories)"
msgstr ""
-#: git-bisect.sh:653
-#, sh-format
-msgid ""
-"invalid argument $arg for 'git bisect terms'.\n"
-"Supported options are: --term-good|--term-old and --term-bad|--term-new."
+#: command-list.h:190
+msgid "Show logs with difference each commit introduces"
msgstr ""
-#: git-merge-octopus.sh:46
-msgid ""
-"Error: Your local changes to the following files would be overwritten by "
-"merge"
+#: command-list.h:191
+msgid "Manage multiple working trees"
msgstr ""
-#: git-merge-octopus.sh:61
-msgid "Automated merge did not work."
+#: command-list.h:192
+msgid "Create a tree object from the current index"
msgstr ""
-
-#: git-merge-octopus.sh:62
-msgid "Should not be doing an octopus."
+
+#: command-list.h:193
+msgid "Defining attributes per path"
msgstr ""
-#: git-merge-octopus.sh:73
-#, sh-format
-msgid "Unable to find common commit with $pretty_name"
+#: command-list.h:194
+msgid "Git command-line interface and conventions"
msgstr ""
-#: git-merge-octopus.sh:77
-#, sh-format
-msgid "Already up-to-date with $pretty_name"
+#: command-list.h:195
+msgid "A Git core tutorial for developers"
msgstr ""
-#: git-merge-octopus.sh:89
-#, sh-format
-msgid "Fast-forwarding to: $pretty_name"
+#: command-list.h:196
+msgid "Git for CVS users"
msgstr ""
-#: git-merge-octopus.sh:97
-#, sh-format
-msgid "Trying simple merge with $pretty_name"
+#: command-list.h:197
+msgid "Tweaking diff output"
msgstr ""
-#: git-merge-octopus.sh:102
-msgid "Simple merge did not work, trying automatic merge."
+#: command-list.h:198
+msgid "A useful minimum set of commands for Everyday Git"
msgstr ""
-#: git-rebase.sh:58
-msgid ""
-"When you have resolved this problem, run \"git rebase --continue\".\n"
-"If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
-"To check out the original branch and stop rebasing, run \"git rebase --abort"
-"\"."
+#: command-list.h:199
+msgid "A Git Glossary"
msgstr ""
-#: git-rebase.sh:158 git-rebase.sh:397
-#, sh-format
-msgid "Could not move back to $head_name"
+#: command-list.h:200
+msgid "Hooks used by Git"
msgstr ""
-#: git-rebase.sh:169
-msgid "Applied autostash."
+#: command-list.h:201
+msgid "Specifies intentionally untracked files to ignore"
msgstr ""
-#: git-rebase.sh:172
-#, sh-format
-msgid "Cannot store $stash_sha1"
+#: command-list.h:202
+msgid "Defining submodule properties"
msgstr ""
-#: git-rebase.sh:212
-msgid "The pre-rebase hook refused to rebase."
+#: command-list.h:203
+msgid "Git namespaces"
msgstr ""
-#: git-rebase.sh:217
-msgid "It looks like git-am is in progress. Cannot rebase."
+#: command-list.h:204
+msgid "Git Repository Layout"
msgstr ""
-#: git-rebase.sh:358
-msgid "No rebase in progress?"
+#: command-list.h:205
+msgid "Specifying revisions and ranges for Git"
msgstr ""
-#: git-rebase.sh:369
-msgid "The --edit-todo action can only be used during interactive rebase."
+#: command-list.h:206
+msgid "A tutorial introduction to Git: part two"
msgstr ""
-#: git-rebase.sh:376
-msgid "Cannot read HEAD"
+#: command-list.h:207
+msgid "A tutorial introduction to Git"
msgstr ""
-#: git-rebase.sh:379
-msgid ""
-"You must edit all merge conflicts and then\n"
-"mark them as resolved using git add"
+#: command-list.h:208
+msgid "An overview of recommended workflows with Git"
msgstr ""
-#: git-rebase.sh:419
-#, 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."
+#: git-bisect.sh:54
+msgid "You need to start by \"git bisect start\""
msgstr ""
-#: git-rebase.sh:470
-#, sh-format
-msgid "invalid upstream $upstream_name"
+#. 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:494
+#: git-bisect.sh:101
#, sh-format
-msgid "$onto_name: there are more than one merge bases"
+msgid "Bad rev input: $arg"
msgstr ""
-#: git-rebase.sh:497 git-rebase.sh:501
+#: git-bisect.sh:121
#, sh-format
-msgid "$onto_name: there is no merge base"
+msgid "Bad rev input: $bisected_head"
msgstr ""
-#: git-rebase.sh:506
+#: git-bisect.sh:130
#, sh-format
-msgid "Does not point to a valid commit: $onto_name"
+msgid "Bad rev input: $rev"
msgstr ""
-#: git-rebase.sh:529
+#: git-bisect.sh:139
#, sh-format
-msgid "fatal: no such branch: $branch_name"
+msgid "'git bisect $TERM_BAD' can take only one argument."
msgstr ""
-#: git-rebase.sh:562
-msgid "Cannot autostash"
+#: git-bisect.sh:209
+msgid "No logfile given"
msgstr ""
-#: git-rebase.sh:567
+#: git-bisect.sh:210
#, sh-format
-msgid "Created autostash: $stash_abbrev"
+msgid "cannot read $file for replaying"
msgstr ""
-#: git-rebase.sh:571
-msgid "Please commit or stash them."
+#: git-bisect.sh:232
+msgid "?? what are you talking about?"
msgstr ""
-#: git-rebase.sh:591
-#, sh-format
-msgid "Current branch $branch_name is up to date."
+#: git-bisect.sh:241
+msgid "bisect run failed: no command provided."
msgstr ""
-#: git-rebase.sh:595
+#: git-bisect.sh:246
#, sh-format
-msgid "Current branch $branch_name is up to date, rebase forced."
+msgid "running $command"
msgstr ""
-#: git-rebase.sh:606
+#: 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:615
-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:625
+#: git-bisect.sh:285
#, sh-format
-msgid "Fast-forwarded $branch_name to $onto_name."
-msgstr ""
-
-#: git-stash.sh:54
-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:95
-msgid "You do not have the initial commit yet"
+#: git-bisect.sh:292
+msgid "bisect run success"
msgstr ""
-#: git-stash.sh:110
-msgid "Cannot save the current index state"
+#: git-bisect.sh:300
+msgid "We are not bisecting."
msgstr ""
-#: git-stash.sh:125
-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:145 git-stash.sh:158
-msgid "Cannot save the current worktree state"
+#: git-merge-octopus.sh:61
+msgid "Automated merge did not work."
msgstr ""
-#: git-stash.sh:162
-msgid "No changes selected"
+#: git-merge-octopus.sh:62
+msgid "Should not be doing an octopus."
msgstr ""
-#: git-stash.sh:165
-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:178
-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:210
+#: git-merge-octopus.sh:89
#, sh-format
-msgid "Cannot update $ref_stash with $w_commit"
+msgid "Fast-forwarding to: $pretty_name"
msgstr ""
-#. TRANSLATORS: $option is an invalid option, like
-#. `--blah-blah'. The 7 spaces at the beginning of the
-#. second line correspond to "error: ". So you should line
-#. up the second line with however many characters the
-#. translation of "error: " takes in your language. E.g. in
-#. English this is:
-#.
-#. $ git stash save --blah-blah 2>&1 | head -n 2
-#. error: unknown option for 'stash save': --blah-blah
-#. To provide a message, use git stash save -- '--blah-blah'
-#: git-stash.sh:266
+#: git-merge-octopus.sh:97
#, sh-format
-msgid ""
-"error: unknown option for 'stash save': $option\n"
-" To provide a message, use git stash save -- '$option'"
+msgid "Trying simple merge with $pretty_name"
msgstr ""
-#: git-stash.sh:281
-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:289
-msgid "No local changes to save"
+#: git-legacy-stash.sh:220
+msgid "Cannot remove temporary index (can't happen)"
msgstr ""
-#: git-stash.sh:294
-msgid "Cannot initialize stash"
+#: git-legacy-stash.sh:271
+#, sh-format
+msgid "Cannot update $ref_stash with $w_commit"
msgstr ""
-#: git-stash.sh:298
-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:299
+#: git-legacy-stash.sh:355
#, sh-format
msgid "Saved working directory and index state $stash_msg"
msgstr ""
-#: git-stash.sh:326
-msgid "Cannot remove worktree changes"
-msgstr ""
-
-#: git-stash.sh:474
+#: git-legacy-stash.sh:535
#, sh-format
msgid "unknown option: $opt"
msgstr ""
-#: git-stash.sh:487
-msgid "No stash entries found."
-msgstr ""
-
-#: git-stash.sh:494
+#: git-legacy-stash.sh:555
#, sh-format
msgid "Too many revisions specified: $REV"
msgstr ""
-#: git-stash.sh:509
+#: git-legacy-stash.sh:570
#, sh-format
msgid "$reference is not a valid reference"
msgstr ""
-#: git-stash.sh:537
+#: git-legacy-stash.sh:598
#, sh-format
msgid "'$args' is not a stash-like commit"
msgstr ""
-#: git-stash.sh:548
+#: git-legacy-stash.sh:609
#, sh-format
msgid "'$args' is not a stash reference"
msgstr ""
-#: git-stash.sh:556
+#: git-legacy-stash.sh:617
msgid "unable to refresh index"
msgstr ""
-#: git-stash.sh:560
+#: git-legacy-stash.sh:621
msgid "Cannot apply a stash in the middle of a merge"
msgstr ""
-#: git-stash.sh:568
+#: git-legacy-stash.sh:629
msgid "Conflicts in index. Try without --index."
msgstr ""
-#: git-stash.sh:570
+#: git-legacy-stash.sh:631
msgid "Could not save index tree"
msgstr ""
-#: git-stash.sh:579
+#: git-legacy-stash.sh:640
msgid "Could not restore untracked files from stash entry"
msgstr ""
-#: git-stash.sh:604
+#: git-legacy-stash.sh:665
msgid "Cannot unstage modified files"
msgstr ""
-#: git-stash.sh:619
-msgid "Index was not unstashed."
-msgstr ""
-
-#: git-stash.sh:633
-msgid "The stash entry is kept in case you need it again."
-msgstr ""
-
-#: git-stash.sh:642
+#: git-legacy-stash.sh:703
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr ""
-#: git-stash.sh:643
+#: git-legacy-stash.sh:704
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr ""
-#: git-stash.sh:651
-msgid "No branch name specified"
-msgstr ""
-
-#: git-stash.sh:730
+#: git-legacy-stash.sh:791
msgid "(To restore them type \"git stash apply\")"
msgstr ""
-#: git-submodule.sh:181
+#: git-submodule.sh:200
msgid "Relative path can only be used from the toplevel of the working tree"
msgstr ""
-#: git-submodule.sh:191
+#: git-submodule.sh:210
#, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
msgstr ""
-#: git-submodule.sh:210
+#: git-submodule.sh:229
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr ""
-#: git-submodule.sh:213
+#: git-submodule.sh:232
#, sh-format
msgid "'$sm_path' already exists in the index and is not a submodule"
msgstr ""
-#: git-submodule.sh:219
+#: 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:237
+#: git-submodule.sh:268
#, sh-format
msgid "Adding existing repo at '$sm_path' to the index"
msgstr ""
-#: git-submodule.sh:239
+#: git-submodule.sh:270
#, sh-format
msgid "'$sm_path' already exists and is not a valid git repo"
msgstr ""
-#: git-submodule.sh:247
+#: git-submodule.sh:278
#, sh-format
msgid "A git directory for '$sm_name' is found locally with remote(s):"
msgstr ""
-#: git-submodule.sh:249
+#: 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:255
+#: git-submodule.sh:286
#, sh-format
msgid "Reactivating local git directory for submodule '$sm_name'."
msgstr ""
-#: git-submodule.sh:267
+#: git-submodule.sh:298
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
msgstr ""
-#: git-submodule.sh:272
+#: git-submodule.sh:303
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr ""
-#: git-submodule.sh:281
+#: git-submodule.sh:312
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr ""
-#: git-submodule.sh:342
-#, sh-format
-msgid "Entering '$displaypath'"
-msgstr ""
-
-#: git-submodule.sh:362
-#, sh-format
-msgid "Stopping at '$displaypath'; script returned non-zero status."
-msgstr ""
-
-#: git-submodule.sh:433
-#, sh-format
-msgid "pathspec and --all are incompatible"
-msgstr ""
-
-#: git-submodule.sh:438
-#, sh-format
-msgid "Use '--all' if you really want to deinitialize all submodules"
-msgstr ""
-
-#: git-submodule.sh:458
-#, sh-format
-msgid ""
-"Submodule work tree '$displaypath' contains a .git directory\n"
-"(use 'rm -rf' if you really want to remove it including all of its history)"
-msgstr ""
-
-#: git-submodule.sh:466
-#, sh-format
-msgid ""
-"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
-"discard them"
-msgstr ""
-
-#: git-submodule.sh:469
-#, sh-format
-msgid "Cleared directory '$displaypath'"
-msgstr ""
-
-#: git-submodule.sh:470
-#, sh-format
-msgid "Could not remove submodule work tree '$displaypath'"
-msgstr ""
-
-#: git-submodule.sh:473
-#, sh-format
-msgid "Could not create empty submodule directory '$displaypath'"
-msgstr ""
-
-#: git-submodule.sh:482
-#, sh-format
-msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
-msgstr ""
-
-#: git-submodule.sh:638
+#: git-submodule.sh:573
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:648
+#: git-submodule.sh:583
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr ""
-#: git-submodule.sh:653
+#: git-submodule.sh:588
#, sh-format
msgid ""
"Unable to find current ${remote_name}/${branch} revision in submodule path "
"'$sm_path'"
msgstr ""
-#: git-submodule.sh:671
+#: 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:677
+#: 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:684
+#: git-submodule.sh:619
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:685
+#: git-submodule.sh:620
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr ""
-#: git-submodule.sh:689
+#: git-submodule.sh:624
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:690
+#: git-submodule.sh:625
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr ""
-#: git-submodule.sh:695
+#: git-submodule.sh:630
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:696
+#: git-submodule.sh:631
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr ""
-#: git-submodule.sh:701
+#: git-submodule.sh:636
#, sh-format
msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:702
+#: git-submodule.sh:637
#, sh-format
msgid "Submodule path '$displaypath': '$command $sha1'"
msgstr ""
-#: git-submodule.sh:733
+#: git-submodule.sh:668
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:841
+#: git-submodule.sh:830
msgid "The --cached option cannot be used with the --files option"
msgstr ""
-#: git-submodule.sh:893
+#: git-submodule.sh:882
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr ""
-#: git-submodule.sh:913
+#: git-submodule.sh:902
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr ""
-#: git-submodule.sh:916
+#: git-submodule.sh:905
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr ""
-#: git-submodule.sh:919
+#: git-submodule.sh:908
#, sh-format
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
msgstr ""
-#: git-submodule.sh:1065
-#, sh-format
-msgid "Failed to recurse into submodule path '$sm_path'"
-msgstr ""
-
-#: git-submodule.sh:1137
-#, sh-format
-msgid "Synchronizing submodule url for '$displaypath'"
-msgstr ""
-
#: git-parse-remote.sh:89
#, sh-format
msgid "See git-${cmd}(1) for details."
msgstr ""
-#: git-rebase--interactive.sh:140
+#: git-rebase--preserve-merges.sh:136
#, sh-format
msgid "Rebasing ($new_count/$total)"
msgstr ""
-#: git-rebase--interactive.sh:156
+#: git-rebase--preserve-merges.sh:152
msgid ""
"\n"
"Commands:\n"
-" p, pick = use commit\n"
-" r, reword = use commit, but edit the commit message\n"
-" e, edit = use commit, but stop for amending\n"
-" s, squash = use commit, but meld into previous commit\n"
-" f, fixup = like \"squash\", but discard this commit's log message\n"
-" x, exec = run command (the rest of the line) using shell\n"
-" d, drop = remove commit\n"
+"p, pick <commit> = use commit\n"
+"r, reword <commit> = use commit, but edit the commit message\n"
+"e, edit <commit> = use commit, but stop for amending\n"
+"s, squash <commit> = use commit, but meld into previous commit\n"
+"f, fixup <commit> = like \"squash\", but discard this commit's log message\n"
+"x, exec <commit> = run command (the rest of the line) using shell\n"
+"d, drop <commit> = remove commit\n"
+"l, label <label> = label current HEAD with a name\n"
+"t, reset <label> = reset HEAD to a label\n"
+"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
+". create a merge commit using the original merge commit's\n"
+". message (or the oneline, if no original merge commit was\n"
+". specified). Use -c <commit> to reword the commit message.\n"
"\n"
"These lines can be re-ordered; they are executed from top to bottom.\n"
msgstr ""
-#: git-rebase--interactive.sh:171
-msgid ""
-"\n"
-"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
-msgstr ""
-
-#: git-rebase--interactive.sh:175
-msgid ""
-"\n"
-"If you remove a line here THAT COMMIT WILL BE LOST.\n"
-msgstr ""
-
-#: git-rebase--interactive.sh:211
+#: git-rebase--preserve-merges.sh:215
#, sh-format
msgid ""
"You can amend the commit now, with\n"
"\tgit rebase --continue"
msgstr ""
-#: git-rebase--interactive.sh:236
+#: git-rebase--preserve-merges.sh:240
#, sh-format
msgid "$sha1: not a commit that can be picked"
msgstr ""
-#: git-rebase--interactive.sh:275
+#: git-rebase--preserve-merges.sh:279
#, sh-format
msgid "Invalid commit name: $sha1"
msgstr ""
-#: git-rebase--interactive.sh:317
+#: git-rebase--preserve-merges.sh:309
msgid "Cannot write current commit's replacement sha1"
msgstr ""
-#: git-rebase--interactive.sh:369
+#: git-rebase--preserve-merges.sh:360
#, sh-format
msgid "Fast-forward to $sha1"
msgstr ""
-#: git-rebase--interactive.sh:371
+#: git-rebase--preserve-merges.sh:362
#, sh-format
msgid "Cannot fast-forward to $sha1"
msgstr ""
-#: git-rebase--interactive.sh:380
+#: git-rebase--preserve-merges.sh:371
#, sh-format
msgid "Cannot move HEAD to $first_parent"
msgstr ""
-#: git-rebase--interactive.sh:385
+#: git-rebase--preserve-merges.sh:376
#, sh-format
msgid "Refusing to squash a merge: $sha1"
msgstr ""
-#: git-rebase--interactive.sh:399
+#: git-rebase--preserve-merges.sh:394
#, sh-format
msgid "Error redoing merge $sha1"
msgstr ""
-#: git-rebase--interactive.sh:407
+#: git-rebase--preserve-merges.sh:403
#, sh-format
msgid "Could not pick $sha1"
msgstr ""
-#: git-rebase--interactive.sh:416
+#: git-rebase--preserve-merges.sh:412
#, sh-format
msgid "This is the commit message #${n}:"
msgstr ""
-#: git-rebase--interactive.sh:421
+#: git-rebase--preserve-merges.sh:417
#, sh-format
msgid "The commit message #${n} will be skipped:"
msgstr ""
-#: git-rebase--interactive.sh:432
+#: git-rebase--preserve-merges.sh:428
#, sh-format
msgid "This is a combination of $count commit."
msgid_plural "This is a combination of $count commits."
msgstr[0] ""
msgstr[1] ""
-#: git-rebase--interactive.sh:441
+#: git-rebase--preserve-merges.sh:437
#, sh-format
msgid "Cannot write $fixup_msg"
msgstr ""
-#: git-rebase--interactive.sh:444
+#: git-rebase--preserve-merges.sh:440
msgid "This is a combination of 2 commits."
msgstr ""
-#: git-rebase--interactive.sh:485 git-rebase--interactive.sh:528
-#: git-rebase--interactive.sh:531
+#: git-rebase--preserve-merges.sh:481 git-rebase--preserve-merges.sh:524
+#: git-rebase--preserve-merges.sh:527
#, sh-format
msgid "Could not apply $sha1... $rest"
msgstr ""
-#: git-rebase--interactive.sh:559
+#: git-rebase--preserve-merges.sh:556
#, sh-format
msgid ""
"Could not amend commit after successfully picking $sha1... $rest\n"
"you are able to reword the commit."
msgstr ""
-#: git-rebase--interactive.sh:574
+#: git-rebase--preserve-merges.sh:571
#, sh-format
msgid "Stopped at $sha1_abbrev... $rest"
msgstr ""
-#: git-rebase--interactive.sh:589
+#: git-rebase--preserve-merges.sh:586
#, sh-format
msgid "Cannot '$squash_style' without a previous commit"
msgstr ""
-#: git-rebase--interactive.sh:631
+#: git-rebase--preserve-merges.sh:628
#, sh-format
msgid "Executing: $rest"
msgstr ""
-#: git-rebase--interactive.sh:639
+#: git-rebase--preserve-merges.sh:636
#, sh-format
msgid "Execution failed: $rest"
msgstr ""
-#: git-rebase--interactive.sh:641
+#: git-rebase--preserve-merges.sh:638
msgid "and made changes to the index and/or the working tree"
msgstr ""
-#: git-rebase--interactive.sh:643
+#: git-rebase--preserve-merges.sh:640
msgid ""
"You can fix the problem, and then run\n"
"\n"
msgstr ""
#. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--interactive.sh:656
+#: git-rebase--preserve-merges.sh:653
#, sh-format
msgid ""
"Execution succeeded: $rest\n"
"\tgit rebase --continue"
msgstr ""
-#: git-rebase--interactive.sh:667
+#: git-rebase--preserve-merges.sh:664
#, sh-format
msgid "Unknown command: $command $sha1 $rest"
msgstr ""
-#: git-rebase--interactive.sh:668
+#: git-rebase--preserve-merges.sh:665
msgid "Please fix this using 'git rebase --edit-todo'."
msgstr ""
-#: git-rebase--interactive.sh:703
+#: git-rebase--preserve-merges.sh:700
#, sh-format
msgid "Successfully rebased and updated $head_name."
msgstr ""
-#: git-rebase--interactive.sh:750
-msgid "Could not skip unnecessary pick commands"
-msgstr ""
-
-#: git-rebase--interactive.sh:908
-#, sh-format
-msgid ""
-"Warning: the SHA-1 is missing or isn't a commit in the following line:\n"
-" - $line"
-msgstr ""
-
-#: git-rebase--interactive.sh:941
-#, sh-format
-msgid ""
-"Warning: the command isn't recognized in the following line:\n"
-" - $line"
-msgstr ""
-
-#: git-rebase--interactive.sh:980
-msgid "could not detach HEAD"
-msgstr ""
-
-#: git-rebase--interactive.sh:1018
-msgid ""
-"Warning: some commits may have been dropped accidentally.\n"
-"Dropped commits (newer to older):"
-msgstr ""
-
-#: git-rebase--interactive.sh:1026
-msgid ""
-"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
-"\n"
-"Use 'git config rebase.missingCommitsCheck' to change the level of "
-"warnings.\n"
-"The possible behaviours are: ignore, warn, error."
-msgstr ""
-
-#: git-rebase--interactive.sh:1037
-#, sh-format
-msgid ""
-"Unrecognized setting $check_level for option rebase.missingCommitsCheck. "
-"Ignoring."
-msgstr ""
-
-#: git-rebase--interactive.sh:1054
-msgid ""
-"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
-"continue'."
-msgstr ""
-
-#: git-rebase--interactive.sh:1055
-msgid "Or you can abort the rebase with 'git rebase --abort'."
-msgstr ""
-
-#: git-rebase--interactive.sh:1083
+#: git-rebase--preserve-merges.sh:757
msgid "Could not remove CHERRY_PICK_HEAD"
msgstr ""
-#: git-rebase--interactive.sh:1088
+#: git-rebase--preserve-merges.sh:762
#, sh-format
msgid ""
"You have staged changes in your working tree.\n"
" git rebase --continue\n"
msgstr ""
-#: git-rebase--interactive.sh:1105
+#: git-rebase--preserve-merges.sh:779
msgid "Error trying to find the author identity to amend commit"
msgstr ""
-#: git-rebase--interactive.sh:1110
+#: git-rebase--preserve-merges.sh:784
msgid ""
"You have uncommitted changes in your working tree. Please commit them\n"
"first and then run 'git rebase --continue' again."
msgstr ""
-#: git-rebase--interactive.sh:1115 git-rebase--interactive.sh:1119
+#: git-rebase--preserve-merges.sh:789 git-rebase--preserve-merges.sh:793
msgid "Could not commit staged changes."
msgstr ""
-#: git-rebase--interactive.sh:1147
-msgid ""
-"\n"
-"You are editing the todo file of an ongoing interactive rebase.\n"
-"To continue rebase after editing, run:\n"
-" git rebase --continue\n"
-"\n"
-msgstr ""
-
-#: git-rebase--interactive.sh:1155 git-rebase--interactive.sh:1313
+#: git-rebase--preserve-merges.sh:824 git-rebase--preserve-merges.sh:910
msgid "Could not execute editor"
msgstr ""
-#: git-rebase--interactive.sh:1168
+#: git-rebase--preserve-merges.sh:845
#, sh-format
msgid "Could not checkout $switch_to"
msgstr ""
-#: git-rebase--interactive.sh:1173
+#: git-rebase--preserve-merges.sh:852
msgid "No HEAD?"
msgstr ""
-#: git-rebase--interactive.sh:1174
+#: git-rebase--preserve-merges.sh:853
#, sh-format
msgid "Could not create temporary $state_dir"
msgstr ""
-#: git-rebase--interactive.sh:1176
+#: git-rebase--preserve-merges.sh:856
msgid "Could not mark as interactive"
msgstr ""
-#: git-rebase--interactive.sh:1186 git-rebase--interactive.sh:1191
-msgid "Could not init rewritten commits"
-msgstr ""
-
-#: git-rebase--interactive.sh:1291
+#: git-rebase--preserve-merges.sh:888
#, sh-format
msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
msgstr[0] ""
msgstr[1] ""
-#: git-rebase--interactive.sh:1296
-msgid ""
-"\n"
-"However, if you remove everything, the rebase will be aborted.\n"
-"\n"
-msgstr ""
-
-#: git-rebase--interactive.sh:1303
-msgid "Note that empty commits are commented out"
+#: git-rebase--preserve-merges.sh:942 git-rebase--preserve-merges.sh:947
+msgid "Could not init rewritten commits"
msgstr ""
#: git-sh-setup.sh:89 git-sh-setup.sh:94
msgid "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 ""
msgid "unstaged"
msgstr ""
-#: git-add--interactive.perl:246 git-add--interactive.perl:271
+#: git-add--interactive.perl:253 git-add--interactive.perl:278
msgid "binary"
msgstr ""
-#: git-add--interactive.perl:255 git-add--interactive.perl:309
+#: git-add--interactive.perl:262 git-add--interactive.perl:316
msgid "nothing"
msgstr ""
-#: git-add--interactive.perl:291 git-add--interactive.perl:306
+#: git-add--interactive.perl:298 git-add--interactive.perl:313
msgid "unchanged"
msgstr ""
-#: git-add--interactive.perl:602
+#: git-add--interactive.perl:609
#, perl-format
msgid "added %d path\n"
msgid_plural "added %d paths\n"
msgstr[0] ""
msgstr[1] ""
-#: git-add--interactive.perl:605
+#: git-add--interactive.perl:612
#, perl-format
msgid "updated %d path\n"
msgid_plural "updated %d paths\n"
msgstr[0] ""
msgstr[1] ""
-#: git-add--interactive.perl:608
+#: git-add--interactive.perl:615
#, perl-format
msgid "reverted %d path\n"
msgid_plural "reverted %d paths\n"
msgstr[0] ""
msgstr[1] ""
-#: git-add--interactive.perl:611
+#: git-add--interactive.perl:618
#, perl-format
msgid "touched %d path\n"
msgid_plural "touched %d paths\n"
msgstr[0] ""
msgstr[1] ""
-#: git-add--interactive.perl:620
+#: git-add--interactive.perl:627
msgid "Update"
msgstr ""
-#: git-add--interactive.perl:632
+#: git-add--interactive.perl:639
msgid "Revert"
msgstr ""
-#: git-add--interactive.perl:655
+#: git-add--interactive.perl:662
#, perl-format
msgid "note: %s is untracked now.\n"
msgstr ""
-#: git-add--interactive.perl:666
+#: git-add--interactive.perl:673
msgid "Add untracked"
msgstr ""
-#: git-add--interactive.perl:672
+#: git-add--interactive.perl:679
msgid "No untracked files.\n"
msgstr ""
-#: git-add--interactive.perl:985
+#: git-add--interactive.perl:1033
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for staging."
msgstr ""
-#: git-add--interactive.perl:988
+#: git-add--interactive.perl:1036
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for stashing."
msgstr ""
-#: git-add--interactive.perl:991
+#: git-add--interactive.perl:1039
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for unstaging."
msgstr ""
-#: git-add--interactive.perl:994 git-add--interactive.perl:1003
+#: git-add--interactive.perl:1042 git-add--interactive.perl:1051
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for applying."
msgstr ""
-#: git-add--interactive.perl:997 git-add--interactive.perl:1000
+#: git-add--interactive.perl:1045 git-add--interactive.perl:1048
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for discarding."
msgstr ""
-#: git-add--interactive.perl:1013
+#: git-add--interactive.perl:1085
#, perl-format
msgid "failed to open hunk edit file for writing: %s"
msgstr ""
-#: git-add--interactive.perl:1014
+#: git-add--interactive.perl:1086
msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
msgstr ""
-#: git-add--interactive.perl:1020
+#: git-add--interactive.perl:1092
#, perl-format
msgid ""
"---\n"
msgstr ""
#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: git-add--interactive.perl:1028
+#: git-add--interactive.perl:1100
msgid ""
"If it does not apply cleanly, you will be given an opportunity to\n"
"edit again. If all lines of the hunk are removed, then the edit is\n"
"aborted and the hunk is left unchanged.\n"
msgstr ""
-#: git-add--interactive.perl:1042
+#: git-add--interactive.perl:1114
#, perl-format
msgid "failed to open hunk edit file for reading: %s"
msgstr ""
#. Consider translating (saying "no" discards!) as
#. (saying "n" for "no" discards!) if the translation
#. of the word "no" does not start with n.
-#: git-add--interactive.perl:1134
+#: git-add--interactive.perl:1213
msgid ""
"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
msgstr ""
-#: git-add--interactive.perl:1143
+#: git-add--interactive.perl:1222
msgid ""
"y - stage this hunk\n"
"n - do not stage this hunk\n"
"d - do not stage this hunk or any of the later hunks in the file"
msgstr ""
-#: git-add--interactive.perl:1149
+#: git-add--interactive.perl:1228
msgid ""
"y - stash this hunk\n"
"n - do not stash this hunk\n"
"d - do not stash this hunk or any of the later hunks in the file"
msgstr ""
-#: git-add--interactive.perl:1155
+#: git-add--interactive.perl:1234
msgid ""
"y - unstage this hunk\n"
"n - do not unstage this hunk\n"
"d - do not unstage this hunk or any of the later hunks in the file"
msgstr ""
-#: git-add--interactive.perl:1161
+#: git-add--interactive.perl:1240
msgid ""
"y - apply this hunk to index\n"
"n - do not apply this hunk to index\n"
"d - do not apply this hunk or any of the later hunks in the file"
msgstr ""
-#: git-add--interactive.perl:1167
+#: git-add--interactive.perl:1246
msgid ""
"y - discard this hunk from worktree\n"
"n - do not discard this hunk from worktree\n"
"d - do not discard this hunk or any of the later hunks in the file"
msgstr ""
-#: git-add--interactive.perl:1173
+#: git-add--interactive.perl:1252
msgid ""
"y - discard this hunk from index and worktree\n"
"n - do not discard this hunk from index and worktree\n"
"d - do not discard this hunk or any of the later hunks in the file"
msgstr ""
-#: git-add--interactive.perl:1179
+#: git-add--interactive.perl:1258
msgid ""
"y - apply this hunk to index and worktree\n"
"n - do not apply this hunk to index and worktree\n"
"d - do not apply this hunk or any of the later hunks in the file"
msgstr ""
-#: git-add--interactive.perl:1188
+#: git-add--interactive.perl:1273
msgid ""
"g - select a hunk to go to\n"
"/ - search for a hunk matching the given regex\n"
"? - print help\n"
msgstr ""
-#: git-add--interactive.perl:1219
+#: git-add--interactive.perl:1304
msgid "The selected hunks do not apply to the index!\n"
msgstr ""
-#: git-add--interactive.perl:1220
+#: git-add--interactive.perl:1305
msgid "Apply them to the worktree anyway? "
msgstr ""
-#: git-add--interactive.perl:1223
+#: git-add--interactive.perl:1308
msgid "Nothing was applied.\n"
msgstr ""
-#: git-add--interactive.perl:1234
+#: git-add--interactive.perl:1319
#, perl-format
msgid "ignoring unmerged: %s\n"
msgstr ""
-#: git-add--interactive.perl:1243
+#: git-add--interactive.perl:1328
msgid "Only binary files changed.\n"
msgstr ""
-#: git-add--interactive.perl:1245
+#: git-add--interactive.perl:1330
msgid "No changes.\n"
msgstr ""
-#: git-add--interactive.perl:1253
+#: git-add--interactive.perl:1338
msgid "Patch update"
msgstr ""
-#: git-add--interactive.perl:1305
+#: git-add--interactive.perl:1390
#, perl-format
-msgid "Stage mode change [y,n,q,a,d,/%s,?]? "
+msgid "Stage mode change [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1306
+#: git-add--interactive.perl:1391
#, perl-format
-msgid "Stage deletion [y,n,q,a,d,/%s,?]? "
+msgid "Stage deletion [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1307
+#: git-add--interactive.perl:1392
#, perl-format
-msgid "Stage this hunk [y,n,q,a,d,/%s,?]? "
+msgid "Stage this hunk [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1310
+#: git-add--interactive.perl:1395
#, perl-format
-msgid "Stash mode change [y,n,q,a,d,/%s,?]? "
+msgid "Stash mode change [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1311
+#: git-add--interactive.perl:1396
#, perl-format
-msgid "Stash deletion [y,n,q,a,d,/%s,?]? "
+msgid "Stash deletion [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1312
+#: git-add--interactive.perl:1397
#, perl-format
-msgid "Stash this hunk [y,n,q,a,d,/%s,?]? "
+msgid "Stash this hunk [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1315
+#: git-add--interactive.perl:1400
#, perl-format
-msgid "Unstage mode change [y,n,q,a,d,/%s,?]? "
+msgid "Unstage mode change [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1316
+#: git-add--interactive.perl:1401
#, perl-format
-msgid "Unstage deletion [y,n,q,a,d,/%s,?]? "
+msgid "Unstage deletion [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1317
+#: git-add--interactive.perl:1402
#, perl-format
-msgid "Unstage this hunk [y,n,q,a,d,/%s,?]? "
+msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1320
+#: git-add--interactive.perl:1405
#, perl-format
-msgid "Apply mode change to index [y,n,q,a,d,/%s,?]? "
+msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1321
+#: git-add--interactive.perl:1406
#, perl-format
-msgid "Apply deletion to index [y,n,q,a,d,/%s,?]? "
+msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1322
+#: git-add--interactive.perl:1407
#, perl-format
-msgid "Apply this hunk to index [y,n,q,a,d,/%s,?]? "
+msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1325
+#: git-add--interactive.perl:1410
#, perl-format
-msgid "Discard mode change from worktree [y,n,q,a,d,/%s,?]? "
+msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1326
+#: git-add--interactive.perl:1411
#, perl-format
-msgid "Discard deletion from worktree [y,n,q,a,d,/%s,?]? "
+msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1327
+#: git-add--interactive.perl:1412
#, perl-format
-msgid "Discard this hunk from worktree [y,n,q,a,d,/%s,?]? "
+msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1330
+#: git-add--interactive.perl:1415
#, perl-format
-msgid "Discard mode change from index and worktree [y,n,q,a,d,/%s,?]? "
+msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1331
+#: git-add--interactive.perl:1416
#, perl-format
-msgid "Discard deletion from index and worktree [y,n,q,a,d,/%s,?]? "
+msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1332
+#: git-add--interactive.perl:1417
#, perl-format
-msgid "Discard this hunk from index and worktree [y,n,q,a,d,/%s,?]? "
+msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1335
+#: git-add--interactive.perl:1420
#, perl-format
-msgid "Apply mode change to index and worktree [y,n,q,a,d,/%s,?]? "
+msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1336
+#: git-add--interactive.perl:1421
#, perl-format
-msgid "Apply deletion to index and worktree [y,n,q,a,d,/%s,?]? "
+msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1337
+#: git-add--interactive.perl:1422
#, perl-format
-msgid "Apply this hunk to index and worktree [y,n,q,a,d,/%s,?]? "
+msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
+msgstr ""
+
+#: git-add--interactive.perl:1522
+msgid "No other hunks to goto\n"
msgstr ""
-#: git-add--interactive.perl:1440
+#: git-add--interactive.perl:1529
msgid "go to which hunk (<ret> to see more)? "
msgstr ""
-#: git-add--interactive.perl:1442
+#: git-add--interactive.perl:1531
msgid "go to which hunk? "
msgstr ""
-#: git-add--interactive.perl:1451
+#: git-add--interactive.perl:1540
#, perl-format
msgid "Invalid number: '%s'\n"
msgstr ""
-#: git-add--interactive.perl:1456
+#: git-add--interactive.perl:1545
#, perl-format
msgid "Sorry, only %d hunk available.\n"
msgid_plural "Sorry, only %d hunks available.\n"
msgstr[0] ""
msgstr[1] ""
-#: git-add--interactive.perl:1482
+#: git-add--interactive.perl:1571
+msgid "No other hunks to search\n"
+msgstr ""
+
+#: git-add--interactive.perl:1575
msgid "search for regex? "
msgstr ""
-#: git-add--interactive.perl:1495
+#: git-add--interactive.perl:1588
#, perl-format
msgid "Malformed search regexp %s: %s\n"
msgstr ""
-#: git-add--interactive.perl:1505
+#: git-add--interactive.perl:1598
msgid "No hunk matches the given pattern\n"
msgstr ""
-#: git-add--interactive.perl:1517 git-add--interactive.perl:1539
+#: git-add--interactive.perl:1610 git-add--interactive.perl:1632
msgid "No previous hunk\n"
msgstr ""
-#: git-add--interactive.perl:1526 git-add--interactive.perl:1545
+#: git-add--interactive.perl:1619 git-add--interactive.perl:1638
msgid "No next hunk\n"
msgstr ""
-#: git-add--interactive.perl:1553
+#: git-add--interactive.perl:1644
+msgid "Sorry, cannot split this hunk\n"
+msgstr ""
+
+#: git-add--interactive.perl:1650
#, perl-format
msgid "Split into %d hunk.\n"
msgid_plural "Split into %d hunks.\n"
msgstr[0] ""
msgstr[1] ""
-#: git-add--interactive.perl:1605
+#: git-add--interactive.perl:1660
+msgid "Sorry, cannot edit this hunk\n"
+msgstr ""
+
+#: git-add--interactive.perl:1706
msgid "Review diff"
msgstr ""
#. TRANSLATORS: please do not translate the command names
#. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1624
+#: git-add--interactive.perl:1725
msgid ""
"status - show paths with changes\n"
"update - add working tree state to the staged set of changes\n"
"changes\n"
msgstr ""
-#: git-add--interactive.perl:1641 git-add--interactive.perl:1646
-#: git-add--interactive.perl:1649 git-add--interactive.perl:1656
-#: git-add--interactive.perl:1660 git-add--interactive.perl:1666
+#: git-add--interactive.perl:1742 git-add--interactive.perl:1747
+#: git-add--interactive.perl:1750 git-add--interactive.perl:1757
+#: git-add--interactive.perl:1761 git-add--interactive.perl:1767
msgid "missing --"
msgstr ""
-#: git-add--interactive.perl:1662
+#: git-add--interactive.perl:1763
#, perl-format
msgid "unknown --patch mode: %s"
msgstr ""
-#: git-add--interactive.perl:1668 git-add--interactive.perl:1674
+#: git-add--interactive.perl:1769 git-add--interactive.perl:1775
#, perl-format
msgid "invalid argument %s, expecting --"
msgstr ""
-#: git-send-email.perl:126
+#: git-send-email.perl:138
msgid "local zone differs from GMT by a non-minute interval\n"
msgstr ""
-#: git-send-email.perl:133 git-send-email.perl:139
+#: git-send-email.perl:145 git-send-email.perl:151
msgid "local time offset greater than or equal to 24 hours\n"
msgstr ""
-#: git-send-email.perl:208 git-send-email.perl:214
+#: git-send-email.perl:219 git-send-email.perl:225
msgid "the editor exited uncleanly, aborting everything"
msgstr ""
-#: git-send-email.perl:291
+#: git-send-email.perl:302
#, perl-format
msgid ""
"'%s' contains an intermediate version of the email you were composing.\n"
msgstr ""
-#: git-send-email.perl:296
+#: git-send-email.perl:307
#, perl-format
msgid "'%s.final' contains the composed email.\n"
msgstr ""
-#: git-send-email.perl:314
+#: git-send-email.perl:326
msgid "--dump-aliases incompatible with other options\n"
msgstr ""
-#: git-send-email.perl:379 git-send-email.perl:634
+#: git-send-email.perl:395 git-send-email.perl:656
msgid "Cannot run git format-patch from outside a repository\n"
msgstr ""
-#: git-send-email.perl:448
+#: git-send-email.perl:398
+msgid ""
+"`batch-size` and `relogin` must be specified together (via command-line or "
+"configuration option)\n"
+msgstr ""
+
+#: git-send-email.perl:470
#, perl-format
msgid "Unknown --suppress-cc field: '%s'\n"
msgstr ""
-#: git-send-email.perl:477
+#: git-send-email.perl:501
#, perl-format
msgid "Unknown --confirm setting: '%s'\n"
msgstr ""
-#: git-send-email.perl:509
+#: git-send-email.perl:529
#, perl-format
msgid "warning: sendmail alias with quotes is not supported: %s\n"
msgstr ""
-#: git-send-email.perl:511
+#: git-send-email.perl:531
#, perl-format
msgid "warning: `:include:` not supported: %s\n"
msgstr ""
-#: git-send-email.perl:513
+#: git-send-email.perl:533
#, perl-format
msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
msgstr ""
-#: git-send-email.perl:518
+#: git-send-email.perl:538
#, perl-format
msgid "warning: sendmail line is not recognized: %s\n"
msgstr ""
-#: git-send-email.perl:600
+#: git-send-email.perl:622
#, perl-format
msgid ""
"File '%s' exists but it could also be the range of commits\n"
" * Giving --format-patch option if you mean a range.\n"
msgstr ""
-#: git-send-email.perl:621
+#: git-send-email.perl:643
#, perl-format
msgid "Failed to opendir %s: %s"
msgstr ""
-#: git-send-email.perl:645
+#: git-send-email.perl:667
#, perl-format
msgid ""
"fatal: %s: %s\n"
"warning: no patches were sent\n"
msgstr ""
-#: git-send-email.perl:656
+#: git-send-email.perl:678
msgid ""
"\n"
"No patch files specified!\n"
"\n"
msgstr ""
-#: git-send-email.perl:669
+#: git-send-email.perl:691
#, perl-format
msgid "No subject line in %s?"
msgstr ""
-#: git-send-email.perl:679
+#: git-send-email.perl:701
#, perl-format
msgid "Failed to open for writing %s: %s"
msgstr ""
-#: git-send-email.perl:689
+#: git-send-email.perl:712
msgid ""
"Lines beginning in \"GIT:\" will be removed.\n"
"Consider including an overall diffstat or table of contents\n"
"Clear the body content if you don't wish to send a summary.\n"
msgstr ""
-#: git-send-email.perl:712
-#, perl-format
-msgid "Failed to open %s.final: %s"
-msgstr ""
-
-#: git-send-email.perl:715
+#: git-send-email.perl:736
#, perl-format
msgid "Failed to open %s: %s"
msgstr ""
-#: git-send-email.perl:750
-msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n"
+#: git-send-email.perl:753
+#, perl-format
+msgid "Failed to open %s.final: %s"
msgstr ""
-#: git-send-email.perl:759
+#: git-send-email.perl:796
msgid "Summary email is empty, skipping it\n"
msgstr ""
#. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:791
+#: git-send-email.perl:831
#, perl-format
msgid "Are you sure you want to use <%s> [y/N]? "
msgstr ""
-#: git-send-email.perl:820
+#: git-send-email.perl:886
msgid ""
"The following files are 8bit, but do not declare a Content-Transfer-"
"Encoding.\n"
msgstr ""
-#: git-send-email.perl:825
+#: git-send-email.perl:891
msgid "Which 8bit encoding should I declare [UTF-8]? "
msgstr ""
-#: git-send-email.perl:833
+#: git-send-email.perl:899
#, perl-format
msgid ""
"Refusing to send because the patch\n"
"want to send.\n"
msgstr ""
-#: git-send-email.perl:852
+#: git-send-email.perl:918
msgid "To whom should the emails be sent (if anyone)?"
msgstr ""
-#: git-send-email.perl:870
+#: git-send-email.perl:936
#, perl-format
msgid "fatal: alias '%s' expands to itself\n"
msgstr ""
-#: git-send-email.perl:882
+#: git-send-email.perl:948
msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
msgstr ""
-#: git-send-email.perl:932 git-send-email.perl:940
+#: git-send-email.perl:1006 git-send-email.perl:1014
#, perl-format
msgid "error: unable to extract a valid address from: %s\n"
msgstr ""
#. TRANSLATORS: Make sure to include [q] [d] [e] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-send-email.perl:944
+#: git-send-email.perl:1018
msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
msgstr ""
-#: git-send-email.perl:1245
+#: git-send-email.perl:1335
#, perl-format
msgid "CA path \"%s\" does not exist"
msgstr ""
-#: git-send-email.perl:1320
+#: git-send-email.perl:1418
msgid ""
" The Cc list above has been expanded by additional\n"
" addresses found in the patch commit message. By default\n"
"\n"
msgstr ""
-#. TRANSLATORS: Make sure to include [y] [n] [q] [a] in your
+#. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-send-email.perl:1335
-msgid "Send this email? ([y]es|[n]o|[q]uit|[a]ll): "
+#: git-send-email.perl:1433
+msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
msgstr ""
-#: git-send-email.perl:1338
+#: git-send-email.perl:1436
msgid "Send this email reply required"
msgstr ""
-#: git-send-email.perl:1364
+#: git-send-email.perl:1464
msgid "The required SMTP server is not properly defined."
msgstr ""
-#: git-send-email.perl:1411
+#: git-send-email.perl:1511
#, perl-format
msgid "Server does not support STARTTLS! %s"
msgstr ""
-#: git-send-email.perl:1416 git-send-email.perl:1420
+#: git-send-email.perl:1516 git-send-email.perl:1520
#, perl-format
msgid "STARTTLS failed! %s"
msgstr ""
-#: git-send-email.perl:1430
+#: git-send-email.perl:1529
msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
msgstr ""
-#: git-send-email.perl:1448
+#: git-send-email.perl:1547
#, perl-format
msgid "Failed to send %s\n"
msgstr ""
-#: git-send-email.perl:1451
+#: git-send-email.perl:1550
#, perl-format
msgid "Dry-Sent %s\n"
msgstr ""
-#: git-send-email.perl:1451
+#: git-send-email.perl:1550
#, perl-format
msgid "Sent %s\n"
msgstr ""
-#: git-send-email.perl:1453
+#: git-send-email.perl:1552
msgid "Dry-OK. Log says:\n"
msgstr ""
-#: git-send-email.perl:1453
+#: git-send-email.perl:1552
msgid "OK. Log says:\n"
msgstr ""
-#: git-send-email.perl:1465
+#: git-send-email.perl:1564
msgid "Result: "
msgstr ""
-#: git-send-email.perl:1468
+#: git-send-email.perl:1567
msgid "Result: OK\n"
msgstr ""
-#: git-send-email.perl:1481
+#: git-send-email.perl:1585
#, perl-format
msgid "can't open file %s"
msgstr ""
-#: git-send-email.perl:1528 git-send-email.perl:1548
+#: git-send-email.perl:1632 git-send-email.perl:1652
#, perl-format
msgid "(mbox) Adding cc: %s from line '%s'\n"
msgstr ""
-#: git-send-email.perl:1534
+#: git-send-email.perl:1638
#, perl-format
msgid "(mbox) Adding to: %s from line '%s'\n"
msgstr ""
-#: git-send-email.perl:1582
+#: git-send-email.perl:1691
#, perl-format
msgid "(non-mbox) Adding cc: %s from line '%s'\n"
msgstr ""
-#: git-send-email.perl:1605
+#: git-send-email.perl:1726
#, perl-format
msgid "(body) Adding cc: %s from line '%s'\n"
msgstr ""
-#: git-send-email.perl:1711
+#: git-send-email.perl:1837
#, perl-format
msgid "(%s) Could not execute '%s'"
msgstr ""
-#: git-send-email.perl:1718
+#: git-send-email.perl:1844
#, perl-format
msgid "(%s) Adding %s: %s from: '%s'\n"
msgstr ""
-#: git-send-email.perl:1722
+#: git-send-email.perl:1848
#, perl-format
msgid "(%s) failed to close pipe to '%s'"
msgstr ""
-#: git-send-email.perl:1749
+#: git-send-email.perl:1878
msgid "cannot send message as 7bit"
msgstr ""
-#: git-send-email.perl:1757
+#: git-send-email.perl:1886
msgid "invalid transfer encoding"
msgstr ""
-#: git-send-email.perl:1795 git-send-email.perl:1846 git-send-email.perl:1856
+#: git-send-email.perl:1927 git-send-email.perl:1979 git-send-email.perl:1989
#, perl-format
msgid "unable to open %s: %s\n"
msgstr ""
-#: git-send-email.perl:1798
+#: git-send-email.perl:1930
#, perl-format
msgid "%s: patch contains a line longer than 998 characters"
msgstr ""
-#: git-send-email.perl:1814
+#: git-send-email.perl:1947
#, perl-format
msgid "Skipping %s with backup suffix '%s'.\n"
msgstr ""
#. TRANSLATORS: please keep "[y|N]" as is.
-#: git-send-email.perl:1818
+#: git-send-email.perl:1951
#, perl-format
msgid "Do you really want to send %s? [y|N]: "
msgstr ""