msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2018-06-16 22:06+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:92
+#: advice.c:103
#, c-format
msgid "%shint: %.*s%s\n"
msgstr ""
-#: advice.c:137
+#: advice.c:156
msgid "Cherry-picking is not possible because you have unmerged files."
msgstr ""
-#: advice.c:139
+#: advice.c:158
msgid "Committing is not possible because you have unmerged files."
msgstr ""
-#: advice.c:141
+#: advice.c:160
msgid "Merging is not possible because you have unmerged files."
msgstr ""
-#: advice.c:143
+#: advice.c:162
msgid "Pulling is not possible because you have unmerged files."
msgstr ""
-#: advice.c:145
+#: advice.c:164
msgid "Reverting is not possible because you have unmerged files."
msgstr ""
-#: advice.c:147
+#: advice.c:166
#, c-format
msgid "It is not possible to %s because you have unmerged files."
msgstr ""
-#: advice.c:155
+#: 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:163
+#: advice.c:182
msgid "Exiting because of an unresolved conflict."
msgstr ""
-#: advice.c:168 builtin/merge.c:1250
+#: advice.c:187 builtin/merge.c:1320
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr ""
-#: advice.c:170
+#: advice.c:189
msgid "Please, commit your changes before merging."
msgstr ""
-#: advice.c:171
+#: advice.c:190
msgid "Exiting because of unfinished merge."
msgstr ""
-#: advice.c:177
+#: 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:122
+#: apply.c:129
msgid "--reject and --3way cannot be used together."
msgstr ""
-#: apply.c:124
+#: apply.c:131
msgid "--cached and --3way cannot be used together."
msgstr ""
-#: apply.c:127
+#: apply.c:134
msgid "--3way outside a repository"
msgstr ""
-#: apply.c:138
+#: apply.c:145
msgid "--index outside a repository"
msgstr ""
-#: apply.c:141
+#: apply.c:148
msgid "--cached outside a repository"
msgstr ""
-#: apply.c:821
+#: apply.c:829
#, c-format
msgid "Cannot prepare timestamp regexp %s"
msgstr ""
-#: apply.c:830
+#: apply.c:838
#, c-format
msgid "regexec returned %d for input: %s"
msgstr ""
-#: apply.c:904
+#: apply.c:912
#, c-format
msgid "unable to find filename in patch at line %d"
msgstr ""
-#: apply.c:942
+#: apply.c:950
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
msgstr ""
-#: apply.c:948
+#: apply.c:956
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr ""
-#: apply.c:949
+#: apply.c:957
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr ""
-#: apply.c:954
+#: apply.c:962
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr ""
-#: apply.c:983
+#: apply.c:991
#, c-format
msgid "invalid mode on line %d: %s"
msgstr ""
-#: apply.c:1301
+#: apply.c:1310
#, c-format
msgid "inconsistent header lines %d and %d"
msgstr ""
-#: apply.c:1473
+#: apply.c:1482
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr ""
-#: apply.c:1542
+#: apply.c:1551
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr ""
-#: apply.c:1562
+#: apply.c:1571
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
msgstr[0] ""
msgstr[1] ""
-#: apply.c:1575
+#: apply.c:1584
#, c-format
msgid "git diff header lacks filename information (line %d)"
msgstr ""
-#: apply.c:1763
+#: apply.c:1772
msgid "new file depends on old contents"
msgstr ""
-#: apply.c:1765
+#: apply.c:1774
msgid "deleted file still has contents"
msgstr ""
-#: apply.c:1799
+#: apply.c:1808
#, c-format
msgid "corrupt patch at line %d"
msgstr ""
-#: apply.c:1836
+#: apply.c:1845
#, c-format
msgid "new file %s depends on old contents"
msgstr ""
-#: apply.c:1838
+#: apply.c:1847
#, c-format
msgid "deleted file %s still has contents"
msgstr ""
-#: apply.c:1841
+#: apply.c:1850
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr ""
-#: apply.c:1988
+#: apply.c:1997
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr ""
-#: apply.c:2025
+#: apply.c:2034
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr ""
-#: apply.c:2185
+#: apply.c:2196
#, c-format
msgid "patch with only garbage at line %d"
msgstr ""
-#: apply.c:2271
+#: apply.c:2282
#, c-format
msgid "unable to read symlink %s"
msgstr ""
-#: apply.c:2275
+#: apply.c:2286
#, c-format
msgid "unable to open or read %s"
msgstr ""
-#: apply.c:2934
+#: apply.c:2945
#, c-format
msgid "invalid start of line: '%c'"
msgstr ""
-#: apply.c:3055
+#: 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:3067
+#: apply.c:3078
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr ""
-#: apply.c:3073
+#: apply.c:3084
#, c-format
msgid ""
"while searching for:\n"
"%.*s"
msgstr ""
-#: apply.c:3095
+#: apply.c:3106
#, c-format
msgid "missing binary patch data for '%s'"
msgstr ""
-#: apply.c:3103
+#: apply.c:3114
#, c-format
msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
msgstr ""
-#: apply.c:3149
+#: apply.c:3161
#, c-format
msgid "cannot apply binary patch to '%s' without full index line"
msgstr ""
-#: apply.c:3159
+#: apply.c:3171
#, c-format
msgid ""
"the patch applies to '%s' (%s), which does not match the current contents."
msgstr ""
-#: apply.c:3167
+#: apply.c:3179
#, c-format
msgid "the patch applies to an empty '%s' but it is not empty"
msgstr ""
-#: apply.c:3185
+#: apply.c:3197
#, c-format
msgid "the necessary postimage %s for '%s' cannot be read"
msgstr ""
-#: apply.c:3198
+#: apply.c:3210
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr ""
-#: apply.c:3204
+#: apply.c:3216
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr ""
-#: apply.c:3225
+#: apply.c:3237
#, c-format
msgid "patch failed: %s:%ld"
msgstr ""
-#: apply.c:3347
+#: apply.c:3360
#, c-format
msgid "cannot checkout %s"
msgstr ""
-#: apply.c:3396 apply.c:3407 apply.c:3453 setup.c:278
+#: 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:3404
+#: apply.c:3420
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr ""
-#: apply.c:3433 apply.c:3673
+#: apply.c:3449 apply.c:3692
#, c-format
msgid "path %s has been renamed/deleted"
msgstr ""
-#: apply.c:3516 apply.c:3687
+#: apply.c:3535 apply.c:3707
#, c-format
msgid "%s: does not exist in index"
msgstr ""
-#: apply.c:3525 apply.c:3695
+#: apply.c:3544 apply.c:3715
#, c-format
msgid "%s: does not match index"
msgstr ""
-#: apply.c:3560
+#: apply.c:3579
msgid "repository lacks the necessary blob to fall back on 3-way merge."
msgstr ""
-#: apply.c:3563
+#: apply.c:3582
#, c-format
msgid "Falling back to three-way merge...\n"
msgstr ""
-#: apply.c:3579 apply.c:3583
+#: apply.c:3598 apply.c:3602
#, c-format
msgid "cannot read the current contents of '%s'"
msgstr ""
-#: apply.c:3595
+#: apply.c:3614
#, c-format
msgid "Failed to fall back on three-way merge...\n"
msgstr ""
-#: apply.c:3609
+#: apply.c:3628
#, c-format
msgid "Applied patch to '%s' with conflicts.\n"
msgstr ""
-#: apply.c:3614
+#: apply.c:3633
#, c-format
msgid "Applied patch to '%s' cleanly.\n"
msgstr ""
-#: apply.c:3640
+#: apply.c:3659
msgid "removal patch leaves file contents"
msgstr ""
-#: apply.c:3712
+#: apply.c:3732
#, c-format
msgid "%s: wrong type"
msgstr ""
-#: apply.c:3714
+#: apply.c:3734
#, c-format
msgid "%s has type %o, expected %o"
msgstr ""
-#: apply.c:3864 apply.c:3866
+#: 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:3922
+#: apply.c:3943
#, c-format
msgid "%s: already exists in index"
msgstr ""
-#: apply.c:3925
+#: apply.c:3946
#, c-format
msgid "%s: already exists in working directory"
msgstr ""
-#: apply.c:3945
+#: apply.c:3966
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr ""
-#: apply.c:3950
+#: apply.c:3971
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr ""
-#: apply.c:3970
+#: apply.c:3991
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr ""
-#: apply.c:3974
+#: apply.c:3995
#, c-format
msgid "%s: patch does not apply"
msgstr ""
-#: apply.c:3989
+#: apply.c:4010
#, c-format
msgid "Checking patch %s..."
msgstr ""
-#: apply.c:4080
+#: apply.c:4102
#, c-format
msgid "sha1 information is lacking or useless for submodule %s"
msgstr ""
-#: apply.c:4087
+#: apply.c:4109
#, c-format
msgid "mode change for %s, which is not in current HEAD"
msgstr ""
-#: apply.c:4090
+#: apply.c:4112
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr ""
-#: apply.c:4095 builtin/checkout.c:235 builtin/reset.c:140
+#: apply.c:4117 builtin/checkout.c:257 builtin/reset.c:143
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr ""
-#: apply.c:4099
+#: apply.c:4121
#, c-format
msgid "could not add %s to temporary index"
msgstr ""
-#: apply.c:4109
+#: apply.c:4131
#, c-format
msgid "could not write temporary index to %s"
msgstr ""
-#: apply.c:4247
+#: apply.c:4269
#, c-format
msgid "unable to remove %s from index"
msgstr ""
-#: apply.c:4282
+#: apply.c:4303
#, c-format
msgid "corrupt patch for submodule %s"
msgstr ""
-#: apply.c:4288
+#: apply.c:4309
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr ""
-#: apply.c:4296
+#: apply.c:4317
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr ""
-#: apply.c:4302 apply.c:4446
+#: apply.c:4323 apply.c:4468
#, c-format
msgid "unable to add cache entry for %s"
msgstr ""
-#: apply.c:4343
+#: apply.c:4366
#, c-format
msgid "failed to write to '%s'"
msgstr ""
-#: apply.c:4347
+#: apply.c:4370
#, c-format
msgid "closing file '%s'"
msgstr ""
-#: apply.c:4417
+#: apply.c:4440
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr ""
-#: apply.c:4515
+#: apply.c:4538
#, c-format
msgid "Applied patch %s cleanly."
msgstr ""
-#: apply.c:4523
+#: apply.c:4546
msgid "internal error"
msgstr ""
-#: apply.c:4526
+#: 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:4537
+#: apply.c:4560
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr ""
-#: apply.c:4545 builtin/fetch.c:786 builtin/fetch.c:1036
+#: apply.c:4568 builtin/fetch.c:837 builtin/fetch.c:1118
#, c-format
msgid "cannot open %s"
msgstr ""
-#: apply.c:4559
+#: apply.c:4582
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr ""
-#: apply.c:4563
+#: apply.c:4586
#, c-format
msgid "Rejected hunk #%d."
msgstr ""
-#: apply.c:4673
+#: apply.c:4696
#, c-format
msgid "Skipped patch '%s'."
msgstr ""
-#: apply.c:4681
+#: apply.c:4704
msgid "unrecognized input"
msgstr ""
-#: apply.c:4700
+#: apply.c:4724
msgid "unable to read index file"
msgstr ""
-#: apply.c:4837
+#: apply.c:4879
#, c-format
msgid "can't open patch '%s': %s"
msgstr ""
-#: apply.c:4864
+#: apply.c:4906
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] ""
msgstr[1] ""
-#: apply.c:4870 apply.c:4885
+#: 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:4878
+#: 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:4894 builtin/add.c:538 builtin/mv.c:300 builtin/rm.c:389
+#: 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:2254 builtin/am.c:2257
-#: builtin/clone.c:120 builtin/fetch.c:126 builtin/pull.c:198
-#: builtin/submodule--helper.c:405 builtin/submodule--helper.c:1210
-#: builtin/submodule--helper.c:1213 builtin/submodule--helper.c:1584
-#: builtin/submodule--helper.c:1587 builtin/submodule--helper.c:1807
-#: 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:2263
+#: 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:4950
+#: apply.c:4994
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr ""
-#: apply.c:4952
+#: apply.c:4996
msgid "attempt three-way merge if a patch does not apply"
msgstr ""
-#: apply.c:4954
+#: apply.c:4998
msgid "build a temporary index based on embedded index information"
msgstr ""
-#: apply.c:4957 builtin/checkout-index.c:168 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:4959
+#: apply.c:5003
msgid "ensure at least <n> lines of context match"
msgstr ""
-#: apply.c:4960 builtin/am.c:2242 builtin/interpret-trailers.c:95
-#: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99
-#: builtin/pack-objects.c:3177
+#: 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:4961
+#: apply.c:5005
msgid "detect new or modified lines that have whitespace errors"
msgstr ""
-#: apply.c:4964 apply.c:4967
+#: apply.c:5008 apply.c:5011
msgid "ignore changes in whitespace when finding context"
msgstr ""
-#: apply.c:4970
+#: apply.c:5014
msgid "apply the patch in reverse"
msgstr ""
-#: apply.c:4972
+#: apply.c:5016
msgid "don't expect at least one line of context"
msgstr ""
-#: apply.c:4974
+#: apply.c:5018
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr ""
-#: apply.c:4976
+#: apply.c:5020
msgid "allow overlapping hunks"
msgstr ""
-#: apply.c:4977 builtin/add.c:290 builtin/check-ignore.c:21
-#: builtin/commit.c:1301 builtin/count-objects.c:98 builtin/fsck.c:666
-#: builtin/log.c:1901 builtin/mv.c:122 builtin/read-tree.c:124
+#: 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:4979
+#: apply.c:5023
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr ""
-#: apply.c:4982
+#: apply.c:5026
msgid "do not trust the line counts in the hunk headers"
msgstr ""
-#: apply.c:4984 builtin/am.c:2251
+#: apply.c:5028 builtin/am.c:2207
msgid "root"
msgstr ""
-#: apply.c:4985
+#: 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:351 builtin/add.c:176 builtin/add.c:514 builtin/rm.c:298
+#: archive.c:372 builtin/add.c:177 builtin/add.c:516 builtin/rm.c:299
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr ""
-#: archive.c:434
+#: 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:434
+#: archive.c:455
msgid "archive format"
msgstr ""
-#: archive.c:435 builtin/log.c:1462
+#: archive.c:456 builtin/log.c:1557
msgid "prefix"
msgstr ""
-#: archive.c:436
+#: archive.c:457
msgid "prepend prefix to each pathname in the archive"
msgstr ""
-#: archive.c:437 builtin/blame.c:813 builtin/blame.c:814 builtin/config.c:127
-#: builtin/fast-export.c:1007 builtin/fast-export.c:1009 builtin/grep.c:869
-#: builtin/hash-object.c:103 builtin/ls-files.c:551 builtin/ls-files.c:554
-#: builtin/notes.c:405 builtin/notes.c:568 builtin/read-tree.c:119
-#: parse-options.h:165
+#: 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:438 builtin/archive.c:89
+#: archive.c:459 builtin/archive.c:90
msgid "write the archive to this file"
msgstr ""
-#: archive.c:440
+#: archive.c:461
msgid "read .gitattributes in working directory"
msgstr ""
-#: archive.c:441
+#: archive.c:462
msgid "report archived files on stderr"
msgstr ""
-#: archive.c:442
+#: archive.c:463
msgid "store only"
msgstr ""
-#: archive.c:443
+#: archive.c:464
msgid "compress faster"
msgstr ""
-#: archive.c:451
+#: archive.c:472
msgid "compress better"
msgstr ""
-#: archive.c:454
+#: archive.c:475
msgid "list supported archive formats"
msgstr ""
-#: archive.c:456 builtin/archive.c:90 builtin/clone.c:110 builtin/clone.c:113
-#: builtin/submodule--helper.c:1222 builtin/submodule--helper.c:1593
+#: 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:457 builtin/archive.c:91
+#: archive.c:478 builtin/archive.c:92
msgid "retrieve the archive from remote repository <repo>"
msgstr ""
-#: archive.c:458 builtin/archive.c:92 builtin/notes.c:489
+#: archive.c:479 builtin/archive.c:93 builtin/difftool.c:707
+#: builtin/notes.c:498
msgid "command"
msgstr ""
-#: archive.c:459 builtin/archive.c:93
+#: archive.c:480 builtin/archive.c:94
msgid "path to the remote git-upload-archive command"
msgstr ""
-#: archive.c:466
+#: archive.c:487
msgid "Unexpected option --remote"
msgstr ""
-#: archive.c:468
+#: archive.c:489
msgid "Option --exec can only be used together with --remote"
msgstr ""
-#: archive.c:470
+#: archive.c:491
msgid "Unexpected option --output"
msgstr ""
-#: archive.c:492
+#: archive.c:513
#, c-format
msgid "Unknown archive format '%s'"
msgstr ""
-#: archive.c:499
+#: archive.c:520
#, c-format
msgid "Argument not supported for format '%s': -%d"
msgstr ""
-#: attr.c:218
+#: 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:415
+#: attr.c:368
+#, c-format
+msgid "%s not allowed: %s:%d"
+msgstr ""
+
+#: attr.c:408
msgid ""
"Negative patterns are ignored in git attributes\n"
"Use '\\!' for literal leading exclamation."
msgstr ""
-#: bisect.c:461
+#: bisect.c:468
#, c-format
msgid "Badly quoted content in file '%s': %s"
msgstr ""
-#: bisect.c:669
+#: bisect.c:678
#, c-format
msgid "We cannot bisect more!\n"
msgstr ""
-#: bisect.c:723
+#: bisect.c:733
#, c-format
msgid "Not a valid commit name %s"
msgstr ""
-#: bisect.c:747
+#: 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:752
+#: 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:757
+#: 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:765
+#: 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:778
+#: bisect.c:789
#, c-format
msgid ""
"the merge base between %s and [%s] must be skipped.\n"
"We continue anyway."
msgstr ""
-#: bisect.c:811
+#: bisect.c:822
#, c-format
msgid "Bisecting: a merge base must be tested\n"
msgstr ""
-#: bisect.c:851
+#: bisect.c:865
#, c-format
msgid "a %s revision is needed"
msgstr ""
-#: bisect.c:870 builtin/notes.c:175 builtin/tag.c:236
+#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:248
#, c-format
msgid "could not create file '%s'"
msgstr ""
-#: bisect.c:921
+#: bisect.c:928 builtin/merge.c:146
#, c-format
msgid "could not read file '%s'"
msgstr ""
-#: bisect.c:951
+#: bisect.c:958
msgid "reading bisect refs failed"
msgstr ""
-#: bisect.c:970
+#: bisect.c:977
#, c-format
msgid "%s was both %s and %s\n"
msgstr ""
-#: bisect.c:978
+#: bisect.c:985
#, c-format
msgid ""
"No testable commit found.\n"
"Maybe you started with bad path parameters?\n"
msgstr ""
-#: bisect.c:997
+#: 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:1003
+#: 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:1756
+#: blame.c:1794
msgid "--contents and --reverse do not blend well."
msgstr ""
-#: blame.c:1767
+#: blame.c:1808
msgid "cannot use --contents with final commit object name"
msgstr ""
-#: blame.c:1787
+#: blame.c:1829
msgid "--reverse and --first-parent together require specified latest commit"
msgstr ""
-#: blame.c:1796 bundle.c:160 ref-filter.c:2075 sequencer.c:1861
-#: sequencer.c:3632 builtin/commit.c:981 builtin/log.c:366 builtin/log.c:920
-#: builtin/log.c:1371 builtin/log.c:1702 builtin/log.c:1950 builtin/merge.c:372
+#: 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:1814
+#: blame.c:1856
msgid ""
"--reverse --first-parent together require range along first-parent chain"
msgstr ""
-#: blame.c:1825
+#: blame.c:1867
#, c-format
msgid "no such path %s in %s"
msgstr ""
-#: blame.c:1836
+#: blame.c:1878
#, c-format
msgid "cannot read blob %s for path %s"
msgstr ""
-#: branch.c:54
+#: branch.c:53
#, c-format
msgid ""
"\n"
"\"git branch --set-upstream-to=%s%s%s\"."
msgstr ""
-#: branch.c:68
+#: branch.c:67
#, c-format
msgid "Not setting branch %s as its own upstream."
msgstr ""
-#: branch.c:94
+#: branch.c:93
#, c-format
msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
msgstr ""
-#: branch.c:95
+#: branch.c:94
#, c-format
msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
msgstr ""
-#: branch.c:99
+#: branch.c:98
#, c-format
msgid "Branch '%s' set up to track local branch '%s' by rebasing."
msgstr ""
-#: branch.c:100
+#: branch.c:99
#, c-format
msgid "Branch '%s' set up to track local branch '%s'."
msgstr ""
-#: branch.c:105
+#: branch.c:104
#, c-format
msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
msgstr ""
-#: branch.c:106
+#: branch.c:105
#, c-format
msgid "Branch '%s' set up to track remote ref '%s'."
msgstr ""
-#: branch.c:110
+#: branch.c:109
#, c-format
msgid "Branch '%s' set up to track local ref '%s' by rebasing."
msgstr ""
-#: branch.c:111
+#: branch.c:110
#, c-format
msgid "Branch '%s' set up to track local ref '%s'."
msgstr ""
-#: branch.c:120
+#: branch.c:119
msgid "Unable to write upstream branch configuration"
msgstr ""
-#: branch.c:157
+#: branch.c:156
#, c-format
msgid "Not tracking: ambiguous information for ref %s"
msgstr ""
-#: branch.c:190
+#: branch.c:189
#, c-format
msgid "'%s' is not a valid branch name."
msgstr ""
-#: branch.c:209
+#: branch.c:208
#, c-format
msgid "A branch named '%s' already exists."
msgstr ""
-#: branch.c:214
+#: branch.c:213
msgid "Cannot force update the current branch."
msgstr ""
-#: branch.c:234
+#: branch.c:233
#, c-format
msgid "Cannot setup tracking information; starting point '%s' is not a branch."
msgstr ""
-#: branch.c:236
+#: branch.c:235
#, c-format
msgid "the requested upstream branch '%s' does not exist"
msgstr ""
-#: branch.c:238
+#: branch.c:237
msgid ""
"\n"
"If you are planning on basing your work on an upstream\n"
msgid "Not a valid branch point: '%s'."
msgstr ""
-#: branch.c:360
+#: branch.c:359
#, c-format
msgid "'%s' is already checked out at '%s'"
msgstr ""
-#: branch.c:383
+#: 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:2081 sequencer.c:2558 builtin/commit.c:755
+#: 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:139
+#: bundle.c:143
msgid "Repository lacks these prerequisite commits:"
msgstr ""
-#: bundle.c:190
+#: 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:197
+#: bundle.c:201
msgid "The bundle records a complete history."
msgstr ""
-#: bundle.c:199
+#: 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:258
+#: bundle.c:269
+msgid "unable to dup bundle descriptor"
+msgstr ""
+
+#: bundle.c:276
msgid "Could not spawn pack-objects"
msgstr ""
-#: bundle.c:269
+#: bundle.c:287
msgid "pack-objects died"
msgstr ""
-#: bundle.c:311
+#: bundle.c:329
msgid "rev-list died"
msgstr ""
-#: bundle.c:360
+#: bundle.c:378
#, c-format
msgid "ref '%s' is excluded by the rev-list options"
msgstr ""
-#: bundle.c:450 builtin/log.c:183 builtin/log.c:1607 builtin/shortlog.c:303
+#: bundle.c:457 builtin/log.c:197 builtin/log.c:1709 builtin/shortlog.c:306
#, c-format
msgid "unrecognized argument: %s"
msgstr ""
-#: bundle.c:458
+#: bundle.c:465
msgid "Refusing to create empty bundle."
msgstr ""
-#: bundle.c:470
+#: bundle.c:475
#, c-format
msgid "cannot create '%s'"
msgstr ""
-#: bundle.c:498
+#: bundle.c:500
msgid "index-pack died"
msgstr ""
msgid "invalid color value: %.*s"
msgstr ""
-#: commit.c:43 sequencer.c:2364 builtin/am.c:421 builtin/am.c:465
-#: builtin/am.c:1436 builtin/am.c:2072 builtin/replace.c:376
-#: builtin/replace.c:448
+#: 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:45
+#: commit.c:52
#, c-format
msgid "%s %s is not a commit!"
msgstr ""
-#: commit.c:182
+#: commit.c:193
msgid ""
"Support for <GIT_DIR>/info/grafts is deprecated\n"
"and will be removed in a future Git version.\n"
"\"git config advice.graftFileDeprecated false\""
msgstr ""
-#: commit.c:1540
+#: commit.c:1128
+#, c-format
+msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
+msgstr ""
+
+#: commit.c:1131
+#, c-format
+msgid "Commit %s has a bad GPG signature allegedly by %s."
+msgstr ""
+
+#: commit.c:1134
+#, c-format
+msgid "Commit %s does not have a GPG signature."
+msgstr ""
+
+#: commit.c:1137
+#, c-format
+msgid "Commit %s has a good GPG signature by %s\n"
+msgstr ""
+
+#: 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 ""
-#: commit-graph.c:669
-#, c-format
-msgid "the commit graph format cannot write %d commits"
+#: commit-graph.c:105
+msgid "commit-graph file is too small"
msgstr ""
-#: commit-graph.c:696
-msgid "too many commits to write graph"
+#: commit-graph.c:170
+#, c-format
+msgid "commit-graph signature %X does not match signature %X"
msgstr ""
-#: commit-graph.c:707 builtin/init-db.c:516 builtin/init-db.c:521
+#: commit-graph.c:177
#, c-format
-msgid "cannot mkdir %s"
+msgid "commit-graph version %X does not match version %X"
msgstr ""
-#: compat/obstack.c:405 compat/obstack.c:407
-msgid "memory exhausted"
+#: commit-graph.c:184
+#, c-format
+msgid "commit-graph hash version %X does not match version %X"
msgstr ""
-#: config.c:187
-msgid "relative config include conditionals must come from files"
+#: commit-graph.c:207
+msgid "commit-graph chunk lookup table entry missing; file may be incomplete"
msgstr ""
-#: config.c:788
+#: commit-graph.c:218
#, c-format
-msgid "bad config line %d in blob %s"
+msgid "commit-graph improper chunk offset %08x%08x"
msgstr ""
-#: config.c:792
+#: commit-graph.c:255
#, c-format
-msgid "bad config line %d in file %s"
+msgid "commit-graph chunk id %08x appears multiple times"
msgstr ""
-#: config.c:796
+#: commit-graph.c:390
#, c-format
-msgid "bad config line %d in standard input"
+msgid "could not find commit %s"
msgstr ""
-#: config.c:800
+#: commit-graph.c:732 builtin/pack-objects.c:2649
#, c-format
-msgid "bad config line %d in submodule-blob %s"
+msgid "unable to get type of object %s"
msgstr ""
-#: config.c:804
-#, c-format
-msgid "bad config line %d in command line %s"
+#: commit-graph.c:765
+msgid "Loading known commits in commit graph"
msgstr ""
-#: config.c:808
-#, c-format
-msgid "bad config line %d in %s"
+#: commit-graph.c:781
+msgid "Expanding reachable commits in commit graph"
msgstr ""
-#: config.c:936
-msgid "out of range"
+#: commit-graph.c:793
+msgid "Clearing commit marks in commit graph"
msgstr ""
-#: config.c:936
-msgid "invalid unit"
+#: commit-graph.c:813
+msgid "Computing commit graph generation numbers"
msgstr ""
-#: config.c:942
+#: commit-graph.c:930
#, c-format
-msgid "bad numeric config value '%s' for '%s': %s"
-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:947
+#: commit-graph.c:943
#, c-format
-msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
+msgid "error adding pack %s"
msgstr ""
-#: config.c:950
+#: commit-graph.c:945
#, c-format
-msgid "bad numeric config value '%s' for '%s' in file %s: %s"
+msgid "error opening index for %s"
msgstr ""
-#: config.c:953
+#: commit-graph.c:959
#, c-format
-msgid "bad numeric config value '%s' for '%s' in standard input: %s"
+msgid "Finding commits for commit graph from %d ref"
+msgid_plural "Finding commits for commit graph from %d refs"
+msgstr[0] ""
+msgstr[1] ""
+
+#: commit-graph.c:991
+msgid "Finding commits for commit graph among packed objects"
msgstr ""
-#: config.c:956
-#, c-format
-msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
+#: commit-graph.c:1004
+msgid "Counting distinct commits in commit graph"
msgstr ""
-#: config.c:959
+#: commit-graph.c:1017
#, c-format
-msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
+msgid "the commit graph format cannot write %d commits"
msgstr ""
-#: config.c:962
-#, c-format
-msgid "bad numeric config value '%s' for '%s' in %s: %s"
+#: commit-graph.c:1026
+msgid "Finding extra edges in commit graph"
msgstr ""
-#: config.c:1057
-#, c-format
-msgid "failed to expand user dir in: '%s'"
+#: commit-graph.c:1050
+msgid "too many commits to write graph"
msgstr ""
-#: config.c:1066
+#: commit-graph.c:1057 midx.c:819
#, c-format
-msgid "'%s' for '%s' is not a valid timestamp"
+msgid "unable to create leading directories of %s"
msgstr ""
-#: config.c:1171 config.c:1182
+#: commit-graph.c:1097
#, c-format
-msgid "bad zlib compression level %d"
+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:1307
+#: commit-graph.c:1172
#, c-format
-msgid "invalid mode for object creation: %s"
+msgid "commit-graph has incorrect OID order: %s then %s"
msgstr ""
-#: config.c:1473
+#: commit-graph.c:1182 commit-graph.c:1197
#, c-format
-msgid "bad pack compression level %d"
+msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
msgstr ""
-#: config.c:1681
-msgid "unable to parse command-line config"
+#: commit-graph.c:1189
+#, c-format
+msgid "failed to parse commit %s from commit-graph"
msgstr ""
-#: config.c:2013
-msgid "unknown error occurred while reading the configuration files"
+#: commit-graph.c:1206
+msgid "Verifying commits in commit graph"
msgstr ""
-#: config.c:2200
+#: commit-graph.c:1219
#, c-format
-msgid "Invalid %s: '%s'"
+msgid "failed to parse commit %s from object database for commit-graph"
msgstr ""
-#: config.c:2243
+#: commit-graph.c:1226
#, c-format
-msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
+msgid "root tree OID for commit %s in commit-graph is %s != %s"
msgstr ""
-#: config.c:2269
+#: commit-graph.c:1236
#, c-format
-msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
+msgid "commit-graph parent list for commit %s is too long"
msgstr ""
-#: config.c:2294
+#: commit-graph.c:1242
#, c-format
-msgid "unable to parse '%s' from command-line config"
+msgid "commit-graph parent for %s is %s != %s"
msgstr ""
-#: config.c:2296
+#: commit-graph.c:1255
#, c-format
-msgid "bad config variable '%s' in file '%s' at line %d"
+msgid "commit-graph parent list for commit %s terminates early"
msgstr ""
-#: config.c:2402
+#: commit-graph.c:1260
#, c-format
-msgid "%s has multiple values"
+msgid ""
+"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
msgstr ""
-#: config.c:2766 config.c:3019
+#: commit-graph.c:1264
#, c-format
-msgid "fstat on %s failed"
+msgid ""
+"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
msgstr ""
-#: config.c:2905
+#: commit-graph.c:1279
#, c-format
-msgid "could not set '%s' to '%s'"
+msgid "commit-graph generation for commit %s is %u != %u"
msgstr ""
-#: config.c:2907 builtin/remote.c:779
+#: commit-graph.c:1285
#, c-format
-msgid "could not unset '%s'"
+msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
msgstr ""
-#: connect.c:61
-msgid "The remote end hung up upon initial contact"
+#: compat/obstack.c:406 compat/obstack.c:408
+msgid "memory exhausted"
msgstr ""
-#: connect.c:63
+#: config.c:123
+#, c-format
msgid ""
-"Could not read from remote repository.\n"
-"\n"
-"Please make sure you have the correct access rights\n"
-"and the repository exists."
+"exceeded maximum include depth (%d) while including\n"
+"\t%s\n"
+"from\n"
+"\t%s\n"
+"This might be due to circular includes."
msgstr ""
-#: connected.c:66 builtin/fsck.c:201 builtin/prune.c:145
-msgid "Checking connectivity"
+#: config.c:139
+#, c-format
+msgid "could not expand include path '%s'"
msgstr ""
-#: connected.c:78
-msgid "Could not run 'git rev-list'"
+#: config.c:150
+msgid "relative config includes must come from files"
msgstr ""
-#: connected.c:98
-msgid "failed write to rev-list"
+#: config.c:190
+msgid "relative config include conditionals must come from files"
msgstr ""
-#: connected.c:105
-msgid "failed to close rev-list's stdin"
+#: config.c:348
+#, c-format
+msgid "key does not contain a section: %s"
msgstr ""
-#: convert.c:206
+#: config.c:354
#, c-format
-msgid "CRLF would be replaced by LF in %s."
+msgid "key does not contain variable name: %s"
msgstr ""
-#: convert.c:208
+#: config.c:378 sequencer.c:2459
#, c-format
-msgid ""
-"CRLF will be replaced by LF in %s.\n"
-"The file will have its original line endings in your working directory."
+msgid "invalid key: %s"
msgstr ""
-#: convert.c:216
+#: config.c:384
#, c-format
-msgid "LF would be replaced by CRLF in %s"
+msgid "invalid key (newline): %s"
msgstr ""
-#: convert.c:218
+#: config.c:420 config.c:432
#, 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 "bogus config parameter: %s"
msgstr ""
-#: convert.c:279
+#: config.c:467
#, c-format
-msgid "BOM is prohibited in '%s' if encoded as %s"
+msgid "bogus format in %s"
msgstr ""
-#: convert.c:286
+#: config.c:793
#, c-format
-msgid ""
-"The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-"
-"tree-encoding."
+msgid "bad config line %d in blob %s"
msgstr ""
-#: convert.c:304
+#: config.c:797
#, c-format
-msgid "BOM is required in '%s' if encoded as %s"
+msgid "bad config line %d in file %s"
msgstr ""
-#: convert.c:306
+#: config.c:801
#, c-format
-msgid ""
-"The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-"
-"%sLE (depending on the byte order) as working-tree-encoding."
+msgid "bad config line %d in standard input"
msgstr ""
-#: convert.c:424
+#: config.c:805
#, c-format
-msgid "failed to encode '%s' from %s to %s"
+msgid "bad config line %d in submodule-blob %s"
msgstr ""
-#: convert.c:467
+#: config.c:809
#, c-format
-msgid "encoding '%s' from %s to %s and back is not the same"
+msgid "bad config line %d in command line %s"
msgstr ""
-#: convert.c:1225
-msgid "true/false are no valid working-tree-encodings"
+#: config.c:813
+#, c-format
+msgid "bad config line %d in %s"
msgstr ""
-#: date.c:116
-msgid "in the future"
+#: config.c:952
+msgid "out of range"
+msgstr ""
+
+#: config.c:952
+msgid "invalid unit"
msgstr ""
-#: date.c:122
+#: config.c:958
#, c-format
-msgid "%<PRIuMAX> second ago"
-msgid_plural "%<PRIuMAX> seconds ago"
-msgstr[0] ""
-msgstr[1] ""
+msgid "bad numeric config value '%s' for '%s': %s"
+msgstr ""
-#: date.c:129
+#: config.c:963
#, c-format
-msgid "%<PRIuMAX> minute ago"
-msgid_plural "%<PRIuMAX> minutes ago"
-msgstr[0] ""
-msgstr[1] ""
+msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
+msgstr ""
-#: date.c:136
+#: config.c:966
#, c-format
-msgid "%<PRIuMAX> hour ago"
-msgid_plural "%<PRIuMAX> hours ago"
-msgstr[0] ""
-msgstr[1] ""
+msgid "bad numeric config value '%s' for '%s' in file %s: %s"
+msgstr ""
-#: date.c:143
+#: config.c:969
#, c-format
-msgid "%<PRIuMAX> day ago"
-msgid_plural "%<PRIuMAX> days ago"
-msgstr[0] ""
-msgstr[1] ""
+msgid "bad numeric config value '%s' for '%s' in standard input: %s"
+msgstr ""
-#: date.c:149
+#: config.c:972
#, c-format
-msgid "%<PRIuMAX> week ago"
-msgid_plural "%<PRIuMAX> weeks ago"
-msgstr[0] ""
-msgstr[1] ""
+msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
+msgstr ""
-#: date.c:156
+#: config.c:975
#, c-format
-msgid "%<PRIuMAX> month ago"
-msgid_plural "%<PRIuMAX> months ago"
-msgstr[0] ""
-msgstr[1] ""
+msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
+msgstr ""
-#: date.c:167
+#: config.c:978
#, c-format
-msgid "%<PRIuMAX> year"
-msgid_plural "%<PRIuMAX> years"
-msgstr[0] ""
-msgstr[1] ""
+msgid "bad numeric config value '%s' for '%s' in %s: %s"
+msgstr ""
-#. TRANSLATORS: "%s" is "<n> years"
-#: date.c:170
+#: config.c:1073
#, c-format
-msgid "%s, %<PRIuMAX> month ago"
-msgid_plural "%s, %<PRIuMAX> months ago"
-msgstr[0] ""
-msgstr[1] ""
-
-#: date.c:175 date.c:180
-#, c-format
-msgid "%<PRIuMAX> year ago"
-msgid_plural "%<PRIuMAX> years ago"
-msgstr[0] ""
-msgstr[1] ""
-
-#: diffcore-order.c:24
-#, c-format
-msgid "failed to read orderfile '%s'"
-msgstr ""
-
-#: diffcore-rename.c:535
-msgid "Performing inexact rename detection"
+msgid "failed to expand user dir in: '%s'"
msgstr ""
-#: diff.c:74
+#: config.c:1082
#, c-format
-msgid "option '%s' requires a value"
+msgid "'%s' for '%s' is not a valid timestamp"
msgstr ""
-#: diff.c:152
+#: config.c:1173
#, c-format
-msgid " Failed to parse dirstat cut-off percentage '%s'\n"
+msgid "abbrev length out of range: %d"
msgstr ""
-#: diff.c:157
+#: config.c:1187 config.c:1198
#, c-format
-msgid " Unknown dirstat parameter '%s'\n"
+msgid "bad zlib compression level %d"
msgstr ""
-#: diff.c:281
-msgid ""
-"color moved setting must be one of 'no', 'default', 'zebra', 'dimmed_zebra', "
-"'plain'"
+#: config.c:1290
+msgid "core.commentChar should only be one character"
msgstr ""
-#: diff.c:341
+#: config.c:1323
#, c-format
-msgid "Unknown value for 'diff.submodule' config variable: '%s'"
+msgid "invalid mode for object creation: %s"
msgstr ""
-#: diff.c:401
+#: config.c:1395
#, c-format
-msgid ""
-"Found errors in 'diff.dirstat' config variable:\n"
-"%s"
+msgid "malformed value for %s"
msgstr ""
-#: diff.c:3823
+#: config.c:1421
#, c-format
-msgid "external diff died, stopping at %s"
+msgid "malformed value for %s: %s"
msgstr ""
-#: diff.c:4153
-msgid "--name-only, --name-status, --check and -s are mutually exclusive"
+#: config.c:1422
+msgid "must be one of nothing, matching, simple, upstream or current"
msgstr ""
-#: diff.c:4156
-msgid "-G, -S and --find-object are mutually exclusive"
+#: config.c:1483 builtin/pack-objects.c:3397
+#, c-format
+msgid "bad pack compression level %d"
msgstr ""
-#: diff.c:4244
-msgid "--follow requires exactly one pathspec"
+#: config.c:1604
+#, c-format
+msgid "unable to load config blob object '%s'"
msgstr ""
-#: diff.c:4410
+#: config.c:1607
#, c-format
-msgid ""
-"Failed to parse --dirstat/-X option parameter:\n"
-"%s"
+msgid "reference '%s' does not point to a blob"
msgstr ""
-#: diff.c:4424
+#: config.c:1624
#, c-format
-msgid "Failed to parse --submodule option parameter: '%s'"
+msgid "unable to resolve config blob '%s'"
msgstr ""
-#: diff.c:5500
-msgid "inexact rename detection was skipped due to too many files."
+#: config.c:1654
+#, c-format
+msgid "failed to parse %s"
msgstr ""
-#: diff.c:5503
-msgid "only found copies from modified paths due to too many files."
+#: config.c:1710
+msgid "unable to parse command-line config"
msgstr ""
-#: diff.c:5506
-#, c-format
-msgid ""
-"you may want to set your %s variable to at least %d and retry the command."
+#: config.c:2059
+msgid "unknown error occurred while reading the configuration files"
msgstr ""
-#: dir.c:1867
+#: config.c:2229
#, c-format
-msgid "could not open directory '%s'"
+msgid "Invalid %s: '%s'"
msgstr ""
-#: dir.c:2109
-msgid "failed to get kernel name and information"
+#: config.c:2272
+#, c-format
+msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
msgstr ""
-#: dir.c:2233
-msgid "Untracked cache is disabled on this system or location."
+#: config.c:2298
+#, c-format
+msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
msgstr ""
-#: dir.c:3075 dir.c:3080
+#: config.c:2344
#, c-format
-msgid "could not create directories for %s"
+msgid "unable to parse '%s' from command-line config"
msgstr ""
-#: dir.c:3109
+#: config.c:2346
#, c-format
-msgid "could not migrate git directory from '%s' to '%s'"
+msgid "bad config variable '%s' in file '%s' at line %d"
msgstr ""
-#: editor.c:61
+#: config.c:2427
#, c-format
-msgid "hint: Waiting for your editor to close the file...%c"
+msgid "invalid section name '%s'"
msgstr ""
-#: entry.c:177
-msgid "Filtering content"
+#: config.c:2459
+#, c-format
+msgid "%s has multiple values"
msgstr ""
-#: entry.c:435
+#: config.c:2488
#, c-format
-msgid "could not stat file '%s'"
+msgid "failed to write new configuration file %s"
msgstr ""
-#: fetch-object.c:17
-msgid "Remote with no URL"
+#: config.c:2740 config.c:3064
+#, c-format
+msgid "could not lock config file %s"
msgstr ""
-#: fetch-pack.c:254
-msgid "git fetch-pack: expected shallow list"
+#: config.c:2751
+#, c-format
+msgid "opening %s"
msgstr ""
-#: fetch-pack.c:266
-msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
+#: config.c:2786 builtin/config.c:328
+#, c-format
+msgid "invalid pattern: %s"
msgstr ""
-#: fetch-pack.c:285 builtin/archive.c:63
+#: config.c:2811
#, c-format
-msgid "remote error: %s"
+msgid "invalid config file %s"
msgstr ""
-#: fetch-pack.c:286
+#: config.c:2824 config.c:3077
#, c-format
-msgid "git fetch-pack: expected ACK/NAK, got '%s'"
+msgid "fstat on %s failed"
msgstr ""
-#: fetch-pack.c:338
-msgid "--stateless-rpc requires multi_ack_detailed"
+#: config.c:2835
+#, c-format
+msgid "unable to mmap '%s'"
msgstr ""
-#: fetch-pack.c:429 fetch-pack.c:1310
+#: config.c:2844 config.c:3082
#, c-format
-msgid "invalid shallow line: %s"
+msgid "chmod on %s failed"
msgstr ""
-#: fetch-pack.c:435 fetch-pack.c:1316
+#: config.c:2929 config.c:3179
#, c-format
-msgid "invalid unshallow line: %s"
+msgid "could not write config file %s"
msgstr ""
-#: fetch-pack.c:437 fetch-pack.c:1318
+#: config.c:2963
#, c-format
-msgid "object not found: %s"
+msgid "could not set '%s' to '%s'"
msgstr ""
-#: fetch-pack.c:440 fetch-pack.c:1321
+#: config.c:2965 builtin/remote.c:782
#, c-format
-msgid "error in object: %s"
+msgid "could not unset '%s'"
msgstr ""
-#: fetch-pack.c:442 fetch-pack.c:1323
+#: config.c:3055
#, c-format
-msgid "no shallow found: %s"
+msgid "invalid section name: %s"
msgstr ""
-#: fetch-pack.c:445 fetch-pack.c:1326
+#: config.c:3222
#, c-format
-msgid "expected shallow/unshallow, got %s"
+msgid "missing value for '%s'"
msgstr ""
-#: fetch-pack.c:486
-#, c-format
-msgid "got %s %d %s"
+#: connect.c:61
+msgid "the remote end hung up upon initial contact"
+msgstr ""
+
+#: 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 ""
-#: fetch-pack.c:500
+#: connect.c:81
#, c-format
-msgid "invalid commit %s"
+msgid "server doesn't support '%s'"
msgstr ""
-#: fetch-pack.c:533
-msgid "giving up"
+#: connect.c:103
+#, c-format
+msgid "server doesn't support feature '%s'"
msgstr ""
-#: fetch-pack.c:543 progress.c:229
-msgid "done"
+#: connect.c:114
+msgid "expected flush after capabilities"
msgstr ""
-#: fetch-pack.c:555
+#: connect.c:233
#, c-format
-msgid "got %s (%d) %s"
+msgid "ignoring capabilities after first line '%s'"
msgstr ""
-#: fetch-pack.c:601
-#, c-format
-msgid "Marking %s as complete"
+#: connect.c:252
+msgid "protocol error: unexpected capabilities^{}"
msgstr ""
-#: fetch-pack.c:828
+#: connect.c:273
#, c-format
-msgid "already have %s (%s)"
+msgid "protocol error: expected shallow sha-1, got '%s'"
msgstr ""
-#: fetch-pack.c:869
-msgid "fetch-pack: unable to fork off sideband demultiplexer"
+#: connect.c:275
+msgid "repository on the other end cannot be shallow"
msgstr ""
-#: fetch-pack.c:877
-msgid "protocol error: bad pack header"
+#: connect.c:313
+msgid "invalid packet"
msgstr ""
-#: fetch-pack.c:944
+#: connect.c:333
#, c-format
-msgid "fetch-pack: unable to fork off %s"
+msgid "protocol error: unexpected '%s'"
msgstr ""
-#: fetch-pack.c:960
+#: connect.c:441
#, c-format
-msgid "%s failed"
+msgid "invalid ls-refs response: %s"
msgstr ""
-#: fetch-pack.c:962
-msgid "error in sideband demultiplexer"
+#: connect.c:445
+msgid "expected flush after ref listing"
msgstr ""
-#: fetch-pack.c:989
-msgid "Server does not support shallow clients"
+#: connect.c:544
+#, c-format
+msgid "protocol '%s' is not supported"
msgstr ""
-#: fetch-pack.c:993
-msgid "Server supports multi_ack_detailed"
+#: connect.c:595
+msgid "unable to set SO_KEEPALIVE on socket"
msgstr ""
-#: fetch-pack.c:996
-msgid "Server supports no-done"
+#: connect.c:635 connect.c:698
+#, c-format
+msgid "Looking up %s ... "
msgstr ""
-#: fetch-pack.c:1002
-msgid "Server supports multi_ack"
+#: connect.c:639
+#, c-format
+msgid "unable to look up %s (port %s) (%s)"
msgstr ""
-#: fetch-pack.c:1006
-msgid "Server supports side-band-64k"
+#. TRANSLATORS: this is the end of "Looking up %s ... "
+#: connect.c:643 connect.c:714
+#, c-format
+msgid ""
+"done.\n"
+"Connecting to %s (port %s) ... "
msgstr ""
-#: fetch-pack.c:1010
-msgid "Server supports side-band"
+#: connect.c:665 connect.c:742
+#, c-format
+msgid ""
+"unable to connect to %s:\n"
+"%s"
msgstr ""
-#: fetch-pack.c:1014
-msgid "Server supports allow-tip-sha1-in-want"
+#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
+#: connect.c:671 connect.c:748
+msgid "done."
msgstr ""
-#: fetch-pack.c:1018
-msgid "Server supports allow-reachable-sha1-in-want"
+#: connect.c:702
+#, c-format
+msgid "unable to look up %s (%s)"
msgstr ""
-#: fetch-pack.c:1028
-msgid "Server supports ofs-delta"
+#: connect.c:708
+#, c-format
+msgid "unknown port %s"
msgstr ""
-#: fetch-pack.c:1034 fetch-pack.c:1204
-msgid "Server supports filter"
+#: connect.c:845 connect.c:1171
+#, c-format
+msgid "strange hostname '%s' blocked"
msgstr ""
-#: fetch-pack.c:1042
+#: connect.c:847
#, c-format
-msgid "Server version is %.*s"
+msgid "strange port '%s' blocked"
msgstr ""
-#: fetch-pack.c:1048
-msgid "Server does not support --shallow-since"
+#: connect.c:857
+#, c-format
+msgid "cannot start proxy %s"
msgstr ""
-#: fetch-pack.c:1052
-msgid "Server does not support --shallow-exclude"
+#: connect.c:924
+msgid "no path specified; see 'git help pull' for valid url syntax"
msgstr ""
-#: fetch-pack.c:1054
-msgid "Server does not support --deepen"
+#: connect.c:1119
+msgid "ssh variant 'simple' does not support -4"
msgstr ""
-#: fetch-pack.c:1065
-msgid "no common commits"
+#: connect.c:1131
+msgid "ssh variant 'simple' does not support -6"
msgstr ""
-#: fetch-pack.c:1077 fetch-pack.c:1414
-msgid "git fetch-pack: fetch failed."
+#: connect.c:1148
+msgid "ssh variant 'simple' does not support setting port"
msgstr ""
-#: fetch-pack.c:1199
-msgid "Server does not support shallow requests"
+#: connect.c:1260
+#, c-format
+msgid "strange pathname '%s' blocked"
msgstr ""
-#: fetch-pack.c:1584
-msgid "no matching remote head"
+#: connect.c:1307
+msgid "unable to fork"
msgstr ""
-#: fetch-pack.c:1610
-#, c-format
-msgid "no such remote ref %s"
+#: connected.c:85 builtin/fsck.c:221 builtin/prune.c:43
+msgid "Checking connectivity"
msgstr ""
-#: fetch-pack.c:1613
-#, c-format
-msgid "Server does not allow request for unadvertised object %s"
+#: connected.c:97
+msgid "Could not run 'git rev-list'"
msgstr ""
-#: gpg-interface.c:185
-msgid "gpg failed to sign the data"
+#: connected.c:117
+msgid "failed write to rev-list"
msgstr ""
-#: gpg-interface.c:210
-msgid "could not create temporary file"
+#: connected.c:124
+msgid "failed to close rev-list's stdin"
msgstr ""
-#: gpg-interface.c:213
+#: convert.c:193
#, c-format
-msgid "failed writing detached signature to '%s'"
+msgid "illegal crlf_action %d"
msgstr ""
-#: graph.c:97
+#: convert.c:206
#, c-format
-msgid "ignore invalid color '%.*s' in log.graphColors"
+msgid "CRLF would be replaced by LF in %s"
msgstr ""
-#: grep.c:2020
+#: convert.c:208
#, c-format
-msgid "'%s': unable to read %s"
+msgid ""
+"CRLF will be replaced by LF in %s.\n"
+"The file will have its original line endings in your working directory"
msgstr ""
-#: grep.c:2037 setup.c:164 builtin/clone.c:409 builtin/diff.c:81
-#: builtin/rm.c:134
+#: convert.c:216
#, c-format
-msgid "failed to stat '%s'"
+msgid "LF would be replaced by CRLF in %s"
msgstr ""
-#: grep.c:2048
+#: convert.c:218
#, c-format
-msgid "'%s': short read"
+msgid ""
+"LF will be replaced by CRLF in %s.\n"
+"The file will have its original line endings in your working directory"
msgstr ""
-#: help.c:23
-msgid "start a working area (see also: git help tutorial)"
+#: convert.c:279
+#, c-format
+msgid "BOM is prohibited in '%s' if encoded as %s"
msgstr ""
-#: help.c:24
-msgid "work on the current change (see also: git help everyday)"
+#: convert.c:286
+#, c-format
+msgid ""
+"The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-"
+"tree-encoding."
msgstr ""
-#: help.c:25
-msgid "examine the history and state (see also: git help revisions)"
+#: convert.c:304
+#, c-format
+msgid "BOM is required in '%s' if encoded as %s"
msgstr ""
-#: help.c:26
-msgid "grow, mark and tweak your common history"
+#: convert.c:306
+#, c-format
+msgid ""
+"The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-"
+"%sLE (depending on the byte order) as working-tree-encoding."
msgstr ""
-#: help.c:27
-msgid "collaborate (see also: git help workflows)"
+#: convert.c:424 convert.c:495
+#, c-format
+msgid "failed to encode '%s' from %s to %s"
msgstr ""
-#: help.c:31
-msgid "Main Porcelain Commands"
+#: convert.c:467
+#, c-format
+msgid "encoding '%s' from %s to %s and back is not the same"
msgstr ""
-#: help.c:32
-msgid "Ancillary Commands / Manipulators"
+#: convert.c:673
+#, c-format
+msgid "cannot fork to run external filter '%s'"
msgstr ""
-#: help.c:33
-msgid "Ancillary Commands / Interrogators"
+#: convert.c:693
+#, c-format
+msgid "cannot feed the input to external filter '%s'"
msgstr ""
-#: help.c:34
-msgid "Interacting with Others"
+#: convert.c:700
+#, c-format
+msgid "external filter '%s' failed %d"
msgstr ""
-#: help.c:35
-msgid "Low-level Commands / Manipulators"
+#: convert.c:735 convert.c:738
+#, c-format
+msgid "read from external filter '%s' failed"
msgstr ""
-#: help.c:36
-msgid "Low-level Commands / Interrogators"
+#: convert.c:741 convert.c:796
+#, c-format
+msgid "external filter '%s' failed"
msgstr ""
-#: help.c:37
-msgid "Low-level Commands / Synching Repositories"
+#: convert.c:844
+msgid "unexpected filter type"
msgstr ""
-#: help.c:38
-msgid "Low-level Commands / Internal Helpers"
+#: convert.c:855
+msgid "path name too long for external filter"
msgstr ""
-#: help.c:293
+#: convert.c:929
#, c-format
-msgid "available git commands in '%s'"
-msgstr ""
-
-#: help.c:300
-msgid "git commands available from elsewhere on your $PATH"
+msgid ""
+"external filter '%s' is not available anymore although not all paths have "
+"been filtered"
msgstr ""
-#: help.c:309
-msgid "These are common Git commands used in various situations:"
+#: convert.c:1228
+msgid "true/false are no valid working-tree-encodings"
msgstr ""
-#: help.c:358 git.c:90
+#: convert.c:1398 convert.c:1432
#, c-format
-msgid "unsupported command listing type '%s'"
-msgstr ""
-
-#: help.c:405
-msgid "The common Git guides are:"
+msgid "%s: clean filter '%s' failed"
msgstr ""
-#: help.c:467
+#: convert.c:1476
#, c-format
-msgid ""
-"'%s' appears to be a git command, but we were not\n"
-"able to execute it. Maybe git-%s is broken?"
+msgid "%s: smudge filter %s failed"
msgstr ""
-#: help.c:526
-msgid "Uh oh. Your system reports no Git commands at all."
+#: date.c:137
+msgid "in the future"
msgstr ""
-#: help.c:548
+#: date.c:143
#, c-format
-msgid "WARNING: You called a Git command named '%s', which does not exist."
-msgstr ""
+msgid "%<PRIuMAX> second ago"
+msgid_plural "%<PRIuMAX> seconds ago"
+msgstr[0] ""
+msgstr[1] ""
-#: help.c:553
+#: date.c:150
#, c-format
-msgid "Continuing under the assumption that you meant '%s'."
-msgstr ""
+msgid "%<PRIuMAX> minute ago"
+msgid_plural "%<PRIuMAX> minutes ago"
+msgstr[0] ""
+msgstr[1] ""
-#: help.c:558
+#: date.c:157
#, c-format
-msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
-msgstr ""
+msgid "%<PRIuMAX> hour ago"
+msgid_plural "%<PRIuMAX> hours ago"
+msgstr[0] ""
+msgstr[1] ""
-#: help.c:566
+#: date.c:164
#, c-format
-msgid "git: '%s' is not a git command. See 'git --help'."
-msgstr ""
+msgid "%<PRIuMAX> day ago"
+msgid_plural "%<PRIuMAX> days ago"
+msgstr[0] ""
+msgstr[1] ""
-#: help.c:570
-msgid ""
-"\n"
-"The most similar command is"
-msgid_plural ""
-"\n"
-"The most similar commands are"
+#: date.c:170
+#, c-format
+msgid "%<PRIuMAX> week ago"
+msgid_plural "%<PRIuMAX> weeks ago"
msgstr[0] ""
msgstr[1] ""
-#: help.c:585
-msgid "git version [<options>]"
-msgstr ""
+#: date.c:177
+#, c-format
+msgid "%<PRIuMAX> month ago"
+msgid_plural "%<PRIuMAX> months ago"
+msgstr[0] ""
+msgstr[1] ""
-#: help.c:652
+#: date.c:188
#, c-format
-msgid "%s: %s - %s"
-msgstr ""
+msgid "%<PRIuMAX> year"
+msgid_plural "%<PRIuMAX> years"
+msgstr[0] ""
+msgstr[1] ""
-#: help.c:656
-msgid ""
-"\n"
-"Did you mean this?"
-msgid_plural ""
-"\n"
-"Did you mean one of these?"
+#. 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] ""
-#: ident.c:342
-msgid ""
-"\n"
-"*** Please tell me who you are.\n"
-"\n"
-"Run\n"
-"\n"
-" git config --global user.email \"you@example.com\"\n"
-" git config --global user.name \"Your Name\"\n"
-"\n"
-"to set your account's default identity.\n"
-"Omit --global to set the identity only in this repository.\n"
-"\n"
-msgstr ""
+#: date.c:196 date.c:201
+#, c-format
+msgid "%<PRIuMAX> year ago"
+msgid_plural "%<PRIuMAX> years ago"
+msgstr[0] ""
+msgstr[1] ""
-#: ident.c:366
-msgid "no email was given and auto-detection is disabled"
+#: delta-islands.c:272
+msgid "Propagating island marks"
msgstr ""
-#: ident.c:371
+#: delta-islands.c:290
#, c-format
-msgid "unable to auto-detect email address (got '%s')"
+msgid "bad tree object %s"
msgstr ""
-#: ident.c:381
-msgid "no name was given and auto-detection is disabled"
+#: delta-islands.c:334
+#, c-format
+msgid "failed to load island regex for '%s': %s"
msgstr ""
-#: ident.c:387
+#: delta-islands.c:390
#, c-format
-msgid "unable to auto-detect name (got '%s')"
+msgid "island regex from config has too many capture groups (max=%d)"
msgstr ""
-#: ident.c:395
+#: delta-islands.c:466
#, c-format
-msgid "empty ident name (for <%s>) not allowed"
+msgid "Marked %d islands, done.\n"
msgstr ""
-#: ident.c:401
+#: diffcore-order.c:24
#, c-format
-msgid "name consists only of disallowed characters: %s"
+msgid "failed to read orderfile '%s'"
msgstr ""
-#: ident.c:416 builtin/commit.c:587
-#, c-format
-msgid "invalid date format: %s"
+#: diffcore-rename.c:544
+msgid "Performing inexact rename detection"
msgstr ""
-#: list-objects-filter-options.c:36
-msgid "multiple filter-specs cannot be combined"
+#: diff-no-index.c:238
+msgid "git diff --no-index [<options>] <path> <path>"
msgstr ""
-#: list-objects-filter-options.c:126
-msgid "cannot change partial clone promisor remote"
+#: diff-no-index.c:263
+msgid ""
+"Not a git repository. Use --no-index to compare two paths outside a working "
+"tree"
msgstr ""
-#: lockfile.c:151
+#: diff.c:155
#, 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 " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr ""
-#: lockfile.c:159
+#: diff.c:160
#, c-format
-msgid "Unable to create '%s.lock': %s"
+msgid " Unknown dirstat parameter '%s'\n"
msgstr ""
-#: merge.c:71
-msgid "failed to read the cache"
+#: diff.c:296
+msgid ""
+"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
+"'dimmed-zebra', 'plain'"
msgstr ""
-#: merge.c:136 builtin/am.c:1946 builtin/am.c:1980 builtin/checkout.c:378
-#: builtin/checkout.c:606 builtin/clone.c:761
-msgid "unable to write new index file"
+#: diff.c:324
+#, c-format
+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:298
-msgid "(bad commit)\n"
+#: diff.c:332
+msgid ""
+"color-moved-ws: allow-indentation-change cannot be combined with other "
+"whitespace modes"
msgstr ""
-#: merge-recursive.c:320
+#: diff.c:405
#, c-format
-msgid "add_cacheinfo failed for path '%s'; merge aborting."
+msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr ""
-#: merge-recursive.c:328
+#: diff.c:465
#, c-format
-msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
+msgid ""
+"Found errors in 'diff.dirstat' config variable:\n"
+"%s"
msgstr ""
-#: merge-recursive.c:410
-msgid "error building trees"
+#: diff.c:4210
+#, c-format
+msgid "external diff died, stopping at %s"
msgstr ""
-#: merge-recursive.c:881
-#, c-format
-msgid "failed to create path '%s'%s"
+#: diff.c:4555
+msgid "--name-only, --name-status, --check and -s are mutually exclusive"
msgstr ""
-#: merge-recursive.c:892
-#, c-format
-msgid "Removing %s to make room for subdirectory\n"
+#: diff.c:4558
+msgid "-G, -S and --find-object are mutually exclusive"
msgstr ""
-#: merge-recursive.c:906 merge-recursive.c:925
-msgid ": perhaps a D/F conflict?"
+#: diff.c:4636
+msgid "--follow requires exactly one pathspec"
msgstr ""
-#: merge-recursive.c:915
+#: diff.c:4684
#, c-format
-msgid "refusing to lose untracked file at '%s'"
+msgid "invalid --stat value: %s"
msgstr ""
-#: merge-recursive.c:957 builtin/cat-file.c:37
+#: 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 "cannot read object %s '%s'"
+msgid "%s expects a numerical value"
msgstr ""
-#: merge-recursive.c:959
+#: diff.c:4721
#, c-format
-msgid "blob expected for %s '%s'"
+msgid ""
+"Failed to parse --dirstat/-X option parameter:\n"
+"%s"
msgstr ""
-#: merge-recursive.c:983
+#: diff.c:4806
#, c-format
-msgid "failed to open '%s': %s"
+msgid "unknown change class '%c' in --diff-filter=%s"
msgstr ""
-#: merge-recursive.c:994
+#: diff.c:4830
#, c-format
-msgid "failed to symlink '%s': %s"
+msgid "unknown value after ws-error-highlight=%.*s"
msgstr ""
-#: merge-recursive.c:999
+#: diff.c:4844
#, c-format
-msgid "do not know what to do with %06o %s '%s'"
+msgid "unable to resolve '%s'"
msgstr ""
-#: merge-recursive.c:1186
+#: diff.c:4894 diff.c:4900
#, c-format
-msgid "Failed to merge submodule %s (not checked out)"
+msgid "%s expects <n>/<m> form"
msgstr ""
-#: merge-recursive.c:1193
+#: diff.c:4912
#, c-format
-msgid "Failed to merge submodule %s (commits not present)"
+msgid "%s expects a character, got '%s'"
msgstr ""
-#: merge-recursive.c:1200
+#: diff.c:4933
#, c-format
-msgid "Failed to merge submodule %s (commits don't follow merge-base)"
+msgid "bad --color-moved argument: %s"
msgstr ""
-#: merge-recursive.c:1208 merge-recursive.c:1220
+#: diff.c:4952
#, c-format
-msgid "Fast-forwarding submodule %s to the following commit:"
+msgid "invalid mode '%s' in --color-moved-ws"
+msgstr ""
+
+#: diff.c:4992
+msgid ""
+"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
+"\"histogram\""
msgstr ""
-#: merge-recursive.c:1211 merge-recursive.c:1223
+#: diff.c:5028 diff.c:5048
#, c-format
-msgid "Fast-forwarding submodule %s"
+msgid "invalid argument to %s"
msgstr ""
-#: merge-recursive.c:1245
+#: diff.c:5186
#, c-format
-msgid "Failed to merge submodule %s (merge following commits not found)"
+msgid "failed to parse --submodule option parameter: '%s'"
msgstr ""
-#: merge-recursive.c:1249
+#: diff.c:5242
#, c-format
-msgid "Failed to merge submodule %s (not fast-forward)"
+msgid "bad --word-diff argument: %s"
msgstr ""
-#: merge-recursive.c:1250
-msgid "Found a possible merge resolution for the submodule:\n"
+#: diff.c:5265
+msgid "Diff output format options"
msgstr ""
-#: merge-recursive.c:1253
-#, c-format
-msgid ""
-"If this is correct simply add it to the index for example\n"
-"by using:\n"
-"\n"
-" git update-index --cacheinfo 160000 %s \"%s\"\n"
-"\n"
-"which will accept this suggestion.\n"
+#: diff.c:5267 diff.c:5273
+msgid "generate patch"
msgstr ""
-#: merge-recursive.c:1262
-#, c-format
-msgid "Failed to merge submodule %s (multiple merges found)"
+#: diff.c:5270 builtin/log.c:167
+msgid "suppress diff output"
msgstr ""
-#: merge-recursive.c:1321
-msgid "Failed to execute internal merge"
+#: diff.c:5275 diff.c:5389 diff.c:5396
+msgid "<n>"
msgstr ""
-#: merge-recursive.c:1326
-#, c-format
-msgid "Unable to add %s to database"
+#: diff.c:5276 diff.c:5279
+msgid "generate diffs with <n> lines context"
msgstr ""
-#: merge-recursive.c:1358
-#, c-format
-msgid "Auto-merging %s"
+#: diff.c:5281
+msgid "generate the diff in raw format"
msgstr ""
-#: merge-recursive.c:1423
-#, c-format
-msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
+#: diff.c:5284
+msgid "synonym for '-p --raw'"
msgstr ""
-#: merge-recursive.c:1475
-#, c-format
-msgid ""
-"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
-"in tree."
+#: diff.c:5288
+msgid "synonym for '-p --stat'"
msgstr ""
-#: merge-recursive.c:1480
-#, c-format
-msgid ""
-"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
-"left in tree."
+#: diff.c:5292
+msgid "machine friendly --stat"
msgstr ""
-#: merge-recursive.c:1487
-#, c-format
-msgid ""
-"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
-"in tree at %s."
+#: diff.c:5295
+msgid "output only the last line of --stat"
msgstr ""
-#: merge-recursive.c:1492
-#, c-format
+#: diff.c:5297 diff.c:5305
+msgid "<param1,param2>..."
+msgstr ""
+
+#: diff.c:5298
msgid ""
-"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
-"left in tree at %s."
+"output the distribution of relative amount of changes for each sub-directory"
msgstr ""
-#: merge-recursive.c:1526
-msgid "rename"
+#: diff.c:5302
+msgid "synonym for --dirstat=cumulative"
msgstr ""
-#: merge-recursive.c:1526
-msgid "renamed"
+#: diff.c:5306
+msgid "synonym for --dirstat=files,param1,param2..."
msgstr ""
-#: merge-recursive.c:1580 merge-recursive.c:1736 merge-recursive.c:2368
-#: merge-recursive.c:3086
-#, c-format
-msgid "Refusing to lose dirty file at %s"
+#: diff.c:5310
+msgid "warn if changes introduce conflict markers or whitespace errors"
msgstr ""
-#: merge-recursive.c:1594
-#, c-format
-msgid "%s is a directory in %s adding as %s instead"
+#: diff.c:5313
+msgid "condensed summary such as creations, renames and mode changes"
msgstr ""
-#: merge-recursive.c:1599
-#, c-format
-msgid "Refusing to lose untracked file at %s; adding as %s instead"
+#: diff.c:5316
+msgid "show only names of changed files"
msgstr ""
-#: merge-recursive.c:1625
-#, c-format
-msgid ""
-"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
-"\"->\"%s\" in \"%s\"%s"
+#: diff.c:5319
+msgid "show only names and status of changed files"
msgstr ""
-#: merge-recursive.c:1630
-msgid " (left unresolved)"
+#: diff.c:5321
+msgid "<width>[,<name-width>[,<count>]]"
msgstr ""
-#: merge-recursive.c:1694
-#, c-format
-msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
+#: diff.c:5322
+msgid "generate diffstat"
msgstr ""
-#: merge-recursive.c:1733
-#, c-format
-msgid "Renaming %s to %s and %s to %s instead"
+#: diff.c:5324 diff.c:5327 diff.c:5330
+msgid "<width>"
msgstr ""
-#: merge-recursive.c:1745
-#, c-format
-msgid "Refusing to lose untracked file at %s, even though it's in the way."
+#: diff.c:5325
+msgid "generate diffstat with a given width"
msgstr ""
-#: merge-recursive.c:1951
-#, c-format
-msgid ""
-"CONFLICT (directory rename split): Unclear where to place %s because "
-"directory %s was renamed to multiple other directories, with no destination "
-"getting a majority of the files."
+#: diff.c:5328
+msgid "generate diffstat with a given name width"
msgstr ""
-#: merge-recursive.c:1983
-#, c-format
-msgid ""
-"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
-"implicit directory rename(s) putting the following path(s) there: %s."
+#: diff.c:5331
+msgid "generate diffstat with a given graph width"
msgstr ""
-#: merge-recursive.c:1993
-#, c-format
-msgid ""
-"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
-"implicit directory renames tried to put these paths there: %s"
+#: diff.c:5333
+msgid "<count>"
msgstr ""
-#: merge-recursive.c:2085
-#, c-format
-msgid ""
-"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
-">%s in %s"
+#: diff.c:5334
+msgid "generate diffstat with limited lines"
msgstr ""
-#: merge-recursive.c:2330
-#, c-format
-msgid ""
-"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
-"renamed."
+#: diff.c:5337
+msgid "generate compact summary in diffstat"
msgstr ""
-#: merge-recursive.c:2736
-#, c-format
-msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
+#: diff.c:5340
+msgid "output a binary diff that can be applied"
msgstr ""
-#: merge-recursive.c:2751
-#, c-format
-msgid "Adding merged %s"
+#: diff.c:5343
+msgid "show full pre- and post-image object names on the \"index\" lines"
msgstr ""
-#: merge-recursive.c:2758 merge-recursive.c:3089
-#, c-format
-msgid "Adding as %s instead"
+#: diff.c:5345
+msgid "show colored diff"
msgstr ""
-#: merge-recursive.c:2914
-#, c-format
-msgid "cannot read object %s"
+#: diff.c:5346
+msgid "<kind>"
msgstr ""
-#: merge-recursive.c:2917
-#, c-format
-msgid "object %s is not a blob"
+#: diff.c:5347
+msgid ""
+"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
+"diff"
msgstr ""
-#: merge-recursive.c:2986
-msgid "modify"
+#: diff.c:5350
+msgid ""
+"do not munge pathnames and use NULs as output field terminators in --raw or "
+"--numstat"
msgstr ""
-#: merge-recursive.c:2986
-msgid "modified"
+#: diff.c:5353 diff.c:5356 diff.c:5359 diff.c:5465
+msgid "<prefix>"
msgstr ""
-#: merge-recursive.c:2997
-msgid "content"
+#: diff.c:5354
+msgid "show the given source prefix instead of \"a/\""
msgstr ""
-#: merge-recursive.c:3004
-msgid "add/add"
+#: diff.c:5357
+msgid "show the given destination prefix instead of \"b/\""
msgstr ""
-#: merge-recursive.c:3046
-#, c-format
-msgid "Skipped %s (merged same as existing)"
+#: diff.c:5360
+msgid "prepend an additional prefix to every line of output"
msgstr ""
-#: merge-recursive.c:3055 git-submodule.sh:895
-msgid "submodule"
+#: diff.c:5363
+msgid "do not show any source or destination prefix"
msgstr ""
-#: merge-recursive.c:3056
-#, c-format
-msgid "CONFLICT (%s): Merge conflict in %s"
+#: diff.c:5366
+msgid "show context between diff hunks up to the specified number of lines"
msgstr ""
-#: merge-recursive.c:3178
-#, c-format
-msgid "Removing %s"
+#: diff.c:5370 diff.c:5375 diff.c:5380
+msgid "<char>"
msgstr ""
-#: merge-recursive.c:3204
-msgid "file/directory"
+#: diff.c:5371
+msgid "specify the character to indicate a new line instead of '+'"
msgstr ""
-#: merge-recursive.c:3210
-msgid "directory/file"
+#: diff.c:5376
+msgid "specify the character to indicate an old line instead of '-'"
msgstr ""
-#: merge-recursive.c:3217
-#, c-format
-msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
+#: diff.c:5381
+msgid "specify the character to indicate a context instead of ' '"
msgstr ""
-#: merge-recursive.c:3226
-#, c-format
-msgid "Adding %s"
+#: diff.c:5384
+msgid "Diff rename options"
msgstr ""
-#: merge-recursive.c:3267
-#, c-format
-msgid "Dirty index: cannot merge (dirty: %s)"
+#: diff.c:5385
+msgid "<n>[/<m>]"
msgstr ""
-#: merge-recursive.c:3271
-msgid "Already up to date!"
+#: diff.c:5386
+msgid "break complete rewrite changes into pairs of delete and create"
msgstr ""
-#: merge-recursive.c:3280
-#, c-format
-msgid "merging of trees %s and %s failed"
+#: diff.c:5390
+msgid "detect renames"
msgstr ""
-#: merge-recursive.c:3379
-msgid "Merging:"
+#: diff.c:5394
+msgid "omit the preimage for deletes"
msgstr ""
-#: merge-recursive.c:3392
-#, c-format
-msgid "found %u common ancestor:"
-msgid_plural "found %u common ancestors:"
-msgstr[0] ""
-msgstr[1] ""
+#: diff.c:5397
+msgid "detect copies"
+msgstr ""
-#: merge-recursive.c:3431
-msgid "merge returned no commit"
+#: diff.c:5401
+msgid "use unmodified files as source to find copies"
msgstr ""
-#: merge-recursive.c:3495
-#, c-format
-msgid "Could not parse object '%s'"
+#: diff.c:5403
+msgid "disable rename detection"
msgstr ""
-#: merge-recursive.c:3511 builtin/merge.c:659 builtin/merge.c:816
-msgid "Unable to write index."
+#: diff.c:5406
+msgid "use empty blobs as rename source"
msgstr ""
-#: notes-merge.c:272
-#, c-format
+#: diff.c:5408
+msgid "continue listing the history of a file beyond renames"
+msgstr ""
+
+#: diff.c:5411
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."
+"prevent rename/copy detection if the number of rename/copy targets exceeds "
+"given limit"
msgstr ""
-#: notes-merge.c:279
-#, c-format
-msgid "You have not concluded your notes merge (%s exists)."
+#: diff.c:5413
+msgid "Diff algorithm options"
msgstr ""
-#: notes-utils.c:43
-msgid "Cannot commit uninitialized/unreferenced notes tree"
+#: diff.c:5415
+msgid "produce the smallest possible diff"
msgstr ""
-#: notes-utils.c:102
-#, c-format
-msgid "Bad notes.rewriteMode value: '%s'"
+#: diff.c:5418
+msgid "ignore whitespace when comparing lines"
msgstr ""
-#: notes-utils.c:112
-#, c-format
-msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
+#: diff.c:5421
+msgid "ignore changes in amount of whitespace"
msgstr ""
-#. TRANSLATORS: The first %s is the name of
-#. the environment variable, the second %s is
-#. its value.
-#.
-#: notes-utils.c:142
-#, c-format
-msgid "Bad %s value: '%s'"
+#: diff.c:5424
+msgid "ignore changes in whitespace at EOL"
msgstr ""
-#: object.c:242
-#, c-format
-msgid "unable to parse object: %s"
+#: diff.c:5427
+msgid "ignore carrier-return at the end of line"
msgstr ""
-#: packfile.c:563
-msgid "offset before end of packfile (broken .idx?)"
+#: diff.c:5430
+msgid "ignore changes whose lines are all blank"
msgstr ""
-#: packfile.c:1742
-#, c-format
-msgid "offset before start of pack index for %s (corrupt index?)"
+#: diff.c:5433
+msgid "heuristic to shift diff hunk boundaries for easy reading"
msgstr ""
-#: packfile.c:1746
-#, c-format
-msgid "offset beyond end of pack index for %s (truncated index?)"
+#: diff.c:5436
+msgid "generate diff using the \"patience diff\" algorithm"
msgstr ""
-#: parse-options.c:621
-msgid "..."
+#: diff.c:5440
+msgid "generate diff using the \"histogram diff\" algorithm"
msgstr ""
-#: parse-options.c:640
-#, c-format
-msgid "usage: %s"
+#: diff.c:5442
+msgid "<algorithm>"
msgstr ""
-#. TRANSLATORS: the colon here should align with the
-#. one in "usage: %s" translation.
-#.
-#: parse-options.c:646
-#, c-format
-msgid " or: %s"
+#: diff.c:5443
+msgid "choose a diff algorithm"
msgstr ""
-#: parse-options.c:649
-#, c-format
-msgid " %s"
+#: diff.c:5445
+msgid "<text>"
msgstr ""
-#: parse-options.c:688
-msgid "-NUM"
+#: diff.c:5446
+msgid "generate diff using the \"anchored diff\" algorithm"
msgstr ""
-#: parse-options-cb.c:44
-#, c-format
-msgid "malformed expiration date '%s'"
+#: diff.c:5448 diff.c:5457 diff.c:5460
+msgid "<mode>"
msgstr ""
-#: parse-options-cb.c:112
-#, c-format
-msgid "malformed object name '%s'"
+#: diff.c:5449
+msgid "show word diff, using <mode> to delimit changed words"
msgstr ""
-#: path.c:892
-#, c-format
-msgid "Could not make %s writable by group"
+#: diff.c:5451 diff.c:5454 diff.c:5499
+msgid "<regex>"
msgstr ""
-#: pathspec.c:129
-msgid "Escape character '\\' not allowed as last character in attr value"
+#: diff.c:5452
+msgid "use <regex> to decide what a word is"
msgstr ""
-#: pathspec.c:147
-msgid "Only one 'attr:' specification is allowed."
+#: diff.c:5455
+msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
msgstr ""
-#: pathspec.c:150
-msgid "attr spec must not be empty"
+#: diff.c:5458
+msgid "moved lines of code are colored differently"
msgstr ""
-#: pathspec.c:193
-#, c-format
-msgid "invalid attribute name %s"
+#: diff.c:5461
+msgid "how white spaces are ignored in --color-moved"
msgstr ""
-#: pathspec.c:258
-msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
+#: diff.c:5464
+msgid "Other diff options"
msgstr ""
-#: pathspec.c:265
-msgid ""
-"global 'literal' pathspec setting is incompatible with all other global "
-"pathspec settings"
+#: diff.c:5466
+msgid "when run from subdir, exclude changes outside and show relative paths"
msgstr ""
-#: pathspec.c:305
-msgid "invalid parameter for pathspec magic 'prefix'"
+#: diff.c:5470
+msgid "treat all files as text"
msgstr ""
-#: pathspec.c:326
-#, c-format
-msgid "Invalid pathspec magic '%.*s' in '%s'"
+#: diff.c:5472
+msgid "swap two inputs, reverse the diff"
msgstr ""
-#: pathspec.c:331
-#, c-format
-msgid "Missing ')' at the end of pathspec magic in '%s'"
+#: diff.c:5474
+msgid "exit with 1 if there were differences, 0 otherwise"
msgstr ""
-#: pathspec.c:369
-#, c-format
-msgid "Unimplemented pathspec magic '%c' in '%s'"
+#: diff.c:5476
+msgid "disable all output of the program"
msgstr ""
-#: pathspec.c:428
-#, c-format
-msgid "%s: 'literal' and 'glob' are incompatible"
+#: diff.c:5478
+msgid "allow an external diff helper to be executed"
msgstr ""
-#: pathspec.c:441
-#, c-format
-msgid "%s: '%s' is outside repository"
+#: diff.c:5480
+msgid "run external text conversion filters when comparing binary files"
msgstr ""
-#: pathspec.c:515
-#, c-format
-msgid "'%s' (mnemonic: '%c')"
+#: diff.c:5482
+msgid "<when>"
msgstr ""
-#: pathspec.c:525
-#, c-format
-msgid "%s: pathspec magic not supported by this command: %s"
+#: diff.c:5483
+msgid "ignore changes to submodules in the diff generation"
msgstr ""
-#: pathspec.c:592
-#, c-format
-msgid "pathspec '%s' is beyond a symbolic link"
+#: diff.c:5486
+msgid "<format>"
msgstr ""
-#: pretty.c:962
-msgid "unable to parse --pretty format"
+#: diff.c:5487
+msgid "specify how differences in submodules are shown"
msgstr ""
-#: read-cache.c:1500
-#, c-format
-msgid ""
-"index.version set, but the value is invalid.\n"
-"Using version %i"
+#: diff.c:5491
+msgid "hide 'git add -N' entries from the index"
msgstr ""
-#: read-cache.c:1510
-#, c-format
+#: diff.c:5494
+msgid "treat 'git add -N' entries as real in the index"
+msgstr ""
+
+#: diff.c:5496
+msgid "<string>"
+msgstr ""
+
+#: diff.c:5497
msgid ""
-"GIT_INDEX_VERSION set, but the value is invalid.\n"
-"Using version %i"
+"look for differences that change the number of occurrences of the specified "
+"string"
msgstr ""
-#: read-cache.c:2404 sequencer.c:4338 wrapper.c:658 builtin/merge.c:1048
-#, c-format
-msgid "could not close '%s'"
+#: diff.c:5500
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"regex"
msgstr ""
-#: read-cache.c:2477 sequencer.c:2102 sequencer.c:3234
-#, c-format
-msgid "could not stat '%s'"
+#: diff.c:5503
+msgid "show all changes in the changeset with -S or -G"
msgstr ""
-#: read-cache.c:2490
-#, c-format
-msgid "unable to open git dir: %s"
+#: diff.c:5506
+msgid "treat <string> in -S as extended POSIX regular expression"
msgstr ""
-#: read-cache.c:2502
-#, c-format
-msgid "unable to unlink: %s"
+#: diff.c:5509
+msgid "control the order in which files appear in the output"
msgstr ""
-#: refs.c:732 sequencer.c:4334 sequencer.c:4393 wrapper.c:225 wrapper.c:395
-#: builtin/am.c:779
-#, c-format
-msgid "could not open '%s' for writing"
+#: diff.c:5510
+msgid "<object-id>"
msgstr ""
-#: refs.c:1880
-msgid "ref updates forbidden inside quarantine environment"
+#: diff.c:5511
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"object"
msgstr ""
-#: refs/files-backend.c:1191
-#, c-format
-msgid "could not remove reference %s"
+#: diff.c:5513
+msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
msgstr ""
-#: refs/files-backend.c:1205 refs/packed-backend.c:1531
-#: refs/packed-backend.c:1541
-#, c-format
-msgid "could not delete reference %s: %s"
+#: diff.c:5514
+msgid "select files by diff type"
msgstr ""
-#: refs/files-backend.c:1208 refs/packed-backend.c:1544
-#, c-format
-msgid "could not delete references: %s"
+#: diff.c:5516
+msgid "<file>"
msgstr ""
-#: ref-filter.c:35 wt-status.c:1850
-msgid "gone"
+#: diff.c:5517
+msgid "Output to a specific file"
msgstr ""
-#: ref-filter.c:36
-#, c-format
-msgid "ahead %d"
+#: diff.c:6150
+msgid "inexact rename detection was skipped due to too many files."
msgstr ""
-#: ref-filter.c:37
-#, c-format
-msgid "behind %d"
+#: diff.c:6153
+msgid "only found copies from modified paths due to too many files."
msgstr ""
-#: ref-filter.c:38
+#: diff.c:6156
#, c-format
-msgid "ahead %d, behind %d"
+msgid ""
+"you may want to set your %s variable to at least %d and retry the command."
msgstr ""
-#: ref-filter.c:121
+#: dir.c:537
#, c-format
-msgid "expected format: %%(color:<color>)"
+msgid "pathspec '%s' did not match any file(s) known to git"
msgstr ""
-#: ref-filter.c:123
+#: dir.c:926
#, c-format
-msgid "unrecognized color: %%(color:%s)"
+msgid "cannot use %s as an exclude file"
msgstr ""
-#: ref-filter.c:145
+#: dir.c:1843
#, c-format
-msgid "Integer value expected refname:lstrip=%s"
+msgid "could not open directory '%s'"
msgstr ""
-#: ref-filter.c:149
-#, c-format
-msgid "Integer value expected refname:rstrip=%s"
+#: dir.c:2085
+msgid "failed to get kernel name and information"
msgstr ""
-#: ref-filter.c:151
-#, c-format
-msgid "unrecognized %%(%s) argument: %s"
+#: dir.c:2209
+msgid "untracked cache is disabled on this system or location"
msgstr ""
-#: ref-filter.c:206
+#: dir.c:3013
#, c-format
-msgid "%%(body) does not take arguments"
+msgid "index file corrupt in repo %s"
msgstr ""
-#: ref-filter.c:215
+#: dir.c:3058 dir.c:3063
#, c-format
-msgid "%%(subject) does not take arguments"
+msgid "could not create directories for %s"
msgstr ""
-#: ref-filter.c:235
+#: dir.c:3092
#, c-format
-msgid "unknown %%(trailers) argument: %s"
+msgid "could not migrate git directory from '%s' to '%s'"
msgstr ""
-#: ref-filter.c:264
+#: editor.c:73
#, c-format
-msgid "positive value expected contents:lines=%s"
+msgid "hint: Waiting for your editor to close the file...%c"
msgstr ""
-#: ref-filter.c:266
-#, c-format
-msgid "unrecognized %%(contents) argument: %s"
+#: entry.c:178
+msgid "Filtering content"
msgstr ""
-#: ref-filter.c:281
+#: entry.c:476
#, c-format
-msgid "positive value expected objectname:short=%s"
+msgid "could not stat file '%s'"
msgstr ""
-#: ref-filter.c:285
+#: environment.c:150
#, c-format
-msgid "unrecognized %%(objectname) argument: %s"
+msgid "bad git namespace path \"%s\""
msgstr ""
-#: ref-filter.c:315
+#: environment.c:332
#, c-format
-msgid "expected format: %%(align:<width>,<position>)"
+msgid "could not set GIT_DIR to '%s'"
msgstr ""
-#: ref-filter.c:327
+#: exec-cmd.c:363
#, c-format
-msgid "unrecognized position:%s"
+msgid "too many args to run %s"
msgstr ""
-#: ref-filter.c:334
-#, c-format
-msgid "unrecognized width:%s"
+#: fetch-object.c:17
+msgid "Remote with no URL"
msgstr ""
-#: ref-filter.c:343
-#, c-format
-msgid "unrecognized %%(align) argument: %s"
+#: fetch-pack.c:151
+msgid "git fetch-pack: expected shallow list"
msgstr ""
-#: ref-filter.c:351
-#, c-format
-msgid "positive width expected with the %%(align) atom"
+#: fetch-pack.c:154
+msgid "git fetch-pack: expected a flush packet after shallow list"
msgstr ""
-#: ref-filter.c:369
-#, c-format
-msgid "unrecognized %%(if) argument: %s"
+#: fetch-pack.c:165
+msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
msgstr ""
-#: ref-filter.c:464
+#: fetch-pack.c:185
#, c-format
-msgid "malformed field name: %.*s"
+msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr ""
-#: ref-filter.c:491
-#, c-format
-msgid "unknown field name: %.*s"
+#: fetch-pack.c:196
+msgid "unable to write to remote"
msgstr ""
-#: ref-filter.c:608
-#, c-format
-msgid "format: %%(if) atom used without a %%(then) atom"
+#: fetch-pack.c:258
+msgid "--stateless-rpc requires multi_ack_detailed"
msgstr ""
-#: ref-filter.c:671
+#: fetch-pack.c:360 fetch-pack.c:1271
#, c-format
-msgid "format: %%(then) atom used without an %%(if) atom"
+msgid "invalid shallow line: %s"
msgstr ""
-#: ref-filter.c:673
+#: fetch-pack.c:366 fetch-pack.c:1277
#, c-format
-msgid "format: %%(then) atom used more than once"
+msgid "invalid unshallow line: %s"
msgstr ""
-#: ref-filter.c:675
+#: fetch-pack.c:368 fetch-pack.c:1279
#, c-format
-msgid "format: %%(then) atom used after %%(else)"
+msgid "object not found: %s"
msgstr ""
-#: ref-filter.c:703
+#: fetch-pack.c:371 fetch-pack.c:1282
#, c-format
-msgid "format: %%(else) atom used without an %%(if) atom"
+msgid "error in object: %s"
msgstr ""
-#: ref-filter.c:705
+#: fetch-pack.c:373 fetch-pack.c:1284
#, c-format
-msgid "format: %%(else) atom used without a %%(then) atom"
+msgid "no shallow found: %s"
msgstr ""
-#: ref-filter.c:707
+#: fetch-pack.c:376 fetch-pack.c:1288
#, c-format
-msgid "format: %%(else) atom used more than once"
+msgid "expected shallow/unshallow, got %s"
msgstr ""
-#: ref-filter.c:722
+#: fetch-pack.c:417
#, c-format
-msgid "format: %%(end) atom used without corresponding atom"
+msgid "got %s %d %s"
msgstr ""
-#: ref-filter.c:779
+#: fetch-pack.c:434
#, c-format
-msgid "malformed format string %s"
+msgid "invalid commit %s"
msgstr ""
-#: ref-filter.c:1387
-#, c-format
-msgid "(no branch, rebasing %s)"
+#: fetch-pack.c:465
+msgid "giving up"
msgstr ""
-#: ref-filter.c:1390
-#, c-format
-msgid "(no branch, rebasing detached HEAD %s)"
+#: fetch-pack.c:477 progress.c:284
+msgid "done"
msgstr ""
-#: ref-filter.c:1393
+#: fetch-pack.c:489
#, c-format
-msgid "(no branch, bisect started on %s)"
+msgid "got %s (%d) %s"
msgstr ""
-#. TRANSLATORS: make sure this matches "HEAD
-#. detached at " in wt-status.c
-#.
-#: ref-filter.c:1401
+#: fetch-pack.c:535
#, c-format
-msgid "(HEAD detached at %s)"
+msgid "Marking %s as complete"
msgstr ""
-#. TRANSLATORS: make sure this matches "HEAD
-#. detached from " in wt-status.c
-#.
-#: ref-filter.c:1408
+#: fetch-pack.c:744
#, c-format
-msgid "(HEAD detached from %s)"
+msgid "already have %s (%s)"
msgstr ""
-#: ref-filter.c:1412
-msgid "(no branch)"
+#: fetch-pack.c:783
+msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr ""
-#: ref-filter.c:1442
-#, c-format
-msgid "missing object %s for %s"
+#: fetch-pack.c:791
+msgid "protocol error: bad pack header"
msgstr ""
-#: ref-filter.c:1445
+#: fetch-pack.c:859
#, c-format
-msgid "parse_object_buffer failed on %s for %s"
+msgid "fetch-pack: unable to fork off %s"
msgstr ""
-#: ref-filter.c:1902
+#: fetch-pack.c:875
#, c-format
-msgid "malformed object at '%s'"
+msgid "%s failed"
msgstr ""
-#: ref-filter.c:1984
-#, c-format
-msgid "ignoring ref with broken name %s"
+#: fetch-pack.c:877
+msgid "error in sideband demultiplexer"
msgstr ""
-#: ref-filter.c:1989
-#, c-format
-msgid "ignoring broken ref %s"
+#: fetch-pack.c:906
+msgid "Server does not support shallow clients"
msgstr ""
-#: ref-filter.c:2261
-#, c-format
-msgid "format: %%(end) atom missing"
+#: fetch-pack.c:910
+msgid "Server supports multi_ack_detailed"
msgstr ""
-#: ref-filter.c:2365
-#, c-format
-msgid "malformed object name %s"
+#: fetch-pack.c:913
+msgid "Server supports no-done"
msgstr ""
-#: remote.c:605
-#, c-format
-msgid "Cannot fetch both %s and %s to %s"
+#: fetch-pack.c:919
+msgid "Server supports multi_ack"
msgstr ""
-#: remote.c:609
-#, c-format
-msgid "%s usually tracks %s, not %s"
+#: fetch-pack.c:923
+msgid "Server supports side-band-64k"
msgstr ""
-#: remote.c:613
-#, c-format
-msgid "%s tracks both %s and %s"
+#: fetch-pack.c:927
+msgid "Server supports side-band"
msgstr ""
-#: remote.c:621
-msgid "Internal error"
+#: fetch-pack.c:931
+msgid "Server supports allow-tip-sha1-in-want"
msgstr ""
-#: remote.c:1534 remote.c:1635
-msgid "HEAD does not point to a branch"
+#: fetch-pack.c:935
+msgid "Server supports allow-reachable-sha1-in-want"
msgstr ""
-#: remote.c:1543
-#, c-format
-msgid "no such branch: '%s'"
+#: fetch-pack.c:945
+msgid "Server supports ofs-delta"
msgstr ""
-#: remote.c:1546
-#, c-format
-msgid "no upstream configured for branch '%s'"
+#: fetch-pack.c:951 fetch-pack.c:1144
+msgid "Server supports filter"
msgstr ""
-#: remote.c:1552
+#: fetch-pack.c:959
#, c-format
-msgid "upstream branch '%s' not stored as a remote-tracking branch"
+msgid "Server version is %.*s"
msgstr ""
-#: remote.c:1567
-#, c-format
-msgid "push destination '%s' on remote '%s' has no local tracking branch"
+#: fetch-pack.c:965
+msgid "Server does not support --shallow-since"
msgstr ""
-#: remote.c:1579
-#, c-format
-msgid "branch '%s' has no remote for pushing"
+#: fetch-pack.c:969
+msgid "Server does not support --shallow-exclude"
msgstr ""
-#: remote.c:1589
-#, c-format
-msgid "push refspecs for '%s' do not include '%s'"
+#: fetch-pack.c:971
+msgid "Server does not support --deepen"
msgstr ""
-#: remote.c:1602
-msgid "push has no destination (push.default is 'nothing')"
+#: fetch-pack.c:988
+msgid "no common commits"
msgstr ""
-#: remote.c:1624
-msgid "cannot resolve 'simple' push to a single destination"
+#: fetch-pack.c:1000 fetch-pack.c:1449
+msgid "git fetch-pack: fetch failed."
msgstr ""
-#: remote.c:1939
-#, c-format
-msgid "Your branch is based on '%s', but the upstream is gone.\n"
+#: fetch-pack.c:1138
+msgid "Server does not support shallow requests"
msgstr ""
-#: remote.c:1943
-msgid " (use \"git branch --unset-upstream\" to fixup)\n"
+#: fetch-pack.c:1171
+msgid "unable to write request to remote"
msgstr ""
-#: remote.c:1946
+#: fetch-pack.c:1189
#, c-format
-msgid "Your branch is up to date with '%s'.\n"
+msgid "error reading section header '%s'"
msgstr ""
-#: remote.c:1950
+#: fetch-pack.c:1195
#, c-format
-msgid "Your branch and '%s' refer to different commits.\n"
+msgid "expected '%s', received '%s'"
msgstr ""
-#: remote.c:1953
+#: fetch-pack.c:1234
#, c-format
-msgid " (use \"%s\" for details)\n"
+msgid "unexpected acknowledgment line: '%s'"
msgstr ""
-#: remote.c:1957
+#: fetch-pack.c:1239
#, 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] ""
+msgid "error processing acks: %d"
+msgstr ""
-#: remote.c:1963
-msgid " (use \"git push\" to publish your local commits)\n"
+#: fetch-pack.c:1249
+msgid "expected packfile to be sent after 'ready'"
+msgstr ""
+
+#: fetch-pack.c:1251
+msgid "expected no other sections to be sent after no 'ready'"
msgstr ""
-#: remote.c:1966
+#: fetch-pack.c:1293
#, c-format
-msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
-msgid_plural ""
-"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
-msgstr[0] ""
-msgstr[1] ""
+msgid "error processing shallow info: %d"
+msgstr ""
-#: remote.c:1974
-msgid " (use \"git pull\" to update your local branch)\n"
+#: fetch-pack.c:1340
+#, c-format
+msgid "expected wanted-ref, got '%s'"
msgstr ""
-#: remote.c:1977
+#: fetch-pack.c:1345
#, c-format
-msgid ""
-"Your branch and '%s' have diverged,\n"
-"and have %d and %d different commit each, respectively.\n"
-msgid_plural ""
-"Your branch and '%s' have diverged,\n"
-"and have %d and %d different commits each, respectively.\n"
-msgstr[0] ""
-msgstr[1] ""
+msgid "unexpected wanted-ref: '%s'"
+msgstr ""
-#: remote.c:1987
-msgid " (use \"git pull\" to merge the remote branch into yours)\n"
+#: fetch-pack.c:1350
+#, c-format
+msgid "error processing wanted refs: %d"
msgstr ""
-#: revision.c:2289
-msgid "your current branch appears to be broken"
+#: fetch-pack.c:1676
+msgid "no matching remote head"
msgstr ""
-#: revision.c:2292
+#: fetch-pack.c:1699 builtin/clone.c:673
+msgid "remote did not send all necessary objects"
+msgstr ""
+
+#: fetch-pack.c:1726
#, c-format
-msgid "your current branch '%s' does not have any commits yet"
+msgid "no such remote ref %s"
msgstr ""
-#: revision.c:2489
-msgid "--first-parent is incompatible with --bisect"
+#: fetch-pack.c:1729
+#, c-format
+msgid "Server does not allow request for unadvertised object %s"
msgstr ""
-#: run-command.c:728
-msgid "open /dev/null failed"
+#: gpg-interface.c:318
+msgid "gpg failed to sign the data"
+msgstr ""
+
+#: gpg-interface.c:344
+msgid "could not create temporary file"
msgstr ""
-#: run-command.c:1271
+#: gpg-interface.c:347
#, c-format
-msgid ""
-"The '%s' hook was ignored because it's not set as executable.\n"
-"You can disable this warning with `git config advice.ignoredHook false`."
+msgid "failed writing detached signature to '%s'"
msgstr ""
-#: send-pack.c:141
-msgid "unexpected flush packet while reading remote unpack status"
+#: graph.c:97
+#, c-format
+msgid "ignore invalid color '%.*s' in log.graphColors"
msgstr ""
-#: send-pack.c:143
+#: grep.c:2113
#, c-format
-msgid "unable to parse remote unpack status: %s"
+msgid "'%s': unable to read %s"
msgstr ""
-#: send-pack.c:145
+#: grep.c:2130 setup.c:164 builtin/clone.c:411 builtin/diff.c:82
+#: builtin/rm.c:135
#, c-format
-msgid "remote unpack failed: %s"
+msgid "failed to stat '%s'"
msgstr ""
-#: send-pack.c:308
-msgid "failed to sign the push certificate"
+#: grep.c:2141
+#, c-format
+msgid "'%s': short read"
msgstr ""
-#: send-pack.c:421
-msgid "the receiving end does not support --signed push"
+#: help.c:23
+msgid "start a working area (see also: git help tutorial)"
msgstr ""
-#: send-pack.c:423
-msgid ""
-"not sending a push certificate since the receiving end does not support --"
-"signed push"
+#: help.c:24
+msgid "work on the current change (see also: git help everyday)"
msgstr ""
-#: send-pack.c:435
-msgid "the receiving end does not support --atomic push"
+#: help.c:25
+msgid "examine the history and state (see also: git help revisions)"
msgstr ""
-#: send-pack.c:440
-msgid "the receiving end does not support push options"
+#: help.c:26
+msgid "grow, mark and tweak your common history"
msgstr ""
-#: sequencer.c:175
-#, c-format
-msgid "invalid commit message cleanup mode '%s'"
+#: help.c:27
+msgid "collaborate (see also: git help workflows)"
msgstr ""
-#: sequencer.c:275
-#, c-format
-msgid "could not delete '%s'"
+#: help.c:31
+msgid "Main Porcelain Commands"
msgstr ""
-#: sequencer.c:301
-msgid "revert"
+#: help.c:32
+msgid "Ancillary Commands / Manipulators"
msgstr ""
-#: sequencer.c:303
-msgid "cherry-pick"
+#: help.c:33
+msgid "Ancillary Commands / Interrogators"
msgstr ""
-#: sequencer.c:305
-msgid "rebase -i"
+#: help.c:34
+msgid "Interacting with Others"
msgstr ""
-#: sequencer.c:307
-#, c-format
-msgid "Unknown action: %d"
+#: help.c:35
+msgid "Low-level Commands / Manipulators"
msgstr ""
-#: sequencer.c:364
-msgid ""
-"after resolving the conflicts, mark the corrected paths\n"
-"with 'git add <paths>' or 'git rm <paths>'"
+#: help.c:36
+msgid "Low-level Commands / Interrogators"
msgstr ""
-#: sequencer.c:367
-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'"
+#: help.c:37
+msgid "Low-level Commands / Synching Repositories"
msgstr ""
-#: sequencer.c:380 sequencer.c:2468
-#, c-format
-msgid "could not lock '%s'"
+#: help.c:38
+msgid "Low-level Commands / Internal Helpers"
msgstr ""
-#: sequencer.c:382 sequencer.c:2346 sequencer.c:2472 sequencer.c:2486
-#: sequencer.c:2694 sequencer.c:4336 sequencer.c:4399 wrapper.c:656
+#: help.c:298
#, c-format
-msgid "could not write to '%s'"
+msgid "available git commands in '%s'"
msgstr ""
-#: sequencer.c:387
-#, c-format
-msgid "could not write eol to '%s'"
+#: help.c:305
+msgid "git commands available from elsewhere on your $PATH"
msgstr ""
-#: sequencer.c:392 sequencer.c:2351 sequencer.c:2474 sequencer.c:2488
-#: sequencer.c:2702
-#, c-format
-msgid "failed to finalize '%s'"
+#: help.c:314
+msgid "These are common Git commands used in various situations:"
msgstr ""
-#: sequencer.c:415 sequencer.c:804 sequencer.c:1493 sequencer.c:2371
-#: sequencer.c:2684 sequencer.c:2788 builtin/am.c:259 builtin/commit.c:727
-#: builtin/merge.c:1046
+#: help.c:363 git.c:97
#, c-format
-msgid "could not read '%s'"
+msgid "unsupported command listing type '%s'"
msgstr ""
-#: sequencer.c:441
-#, c-format
-msgid "your local changes would be overwritten by %s."
+#: help.c:403
+msgid "The common Git guides are:"
msgstr ""
-#: sequencer.c:445
-msgid "commit your changes or stash them to proceed."
+#: help.c:512
+msgid "See 'git help <command>' to read about a specific subcommand"
+msgstr ""
+
+#: help.c:517
+msgid "External commands"
msgstr ""
-#: sequencer.c:474
+#: help.c:532
+msgid "Command aliases"
+msgstr ""
+
+#: help.c:596
#, c-format
-msgid "%s: fast-forward"
+msgid ""
+"'%s' appears to be a git command, but we were not\n"
+"able to execute it. Maybe git-%s is broken?"
msgstr ""
-#. TRANSLATORS: %s will be "revert", "cherry-pick" or
-#. "rebase -i".
-#.
-#: sequencer.c:563
+#: help.c:655
+msgid "Uh oh. Your system reports no Git commands at all."
+msgstr ""
+
+#: help.c:677
#, c-format
-msgid "%s: Unable to write new index file"
+msgid "WARNING: You called a Git command named '%s', which does not exist."
msgstr ""
-#: sequencer.c:579
-msgid "unable to update cache tree"
+#: help.c:682
+#, c-format
+msgid "Continuing under the assumption that you meant '%s'."
msgstr ""
-#: sequencer.c:592
-msgid "could not resolve HEAD commit"
+#: help.c:687
+#, c-format
+msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
msgstr ""
-#: sequencer.c:749
+#: help.c:695
#, c-format
+msgid "git: '%s' is not a git command. See 'git --help'."
+msgstr ""
+
+#: help.c:699
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"
+"The most similar command is"
+msgid_plural ""
"\n"
-" git rebase --continue\n"
-msgstr ""
+"The most similar commands are"
+msgstr[0] ""
+msgstr[1] ""
-#: sequencer.c:818
-msgid "writing root commit"
+#: help.c:714
+msgid "git version [<options>]"
msgstr ""
-#: sequencer.c:1043
-msgid "'prepare-commit-msg' hook failed"
+#: help.c:782
+#, c-format
+msgid "%s: %s - %s"
msgstr ""
-#: sequencer.c:1050
+#: help.c:786
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"
+"Did you mean this?"
+msgid_plural ""
"\n"
-" git commit --amend --reset-author\n"
-msgstr ""
+"Did you mean one of these?"
+msgstr[0] ""
+msgstr[1] ""
-#: sequencer.c:1063
+#: ident.c:349
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"
+"*** Please tell me who you are.\n"
"\n"
-"After doing this, you may fix the identity used for this commit with:\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"
-" git commit --amend --reset-author\n"
msgstr ""
-#: sequencer.c:1103
-msgid "couldn't look up newly created commit"
+#: ident.c:379
+msgid "no email was given and auto-detection is disabled"
msgstr ""
-#: sequencer.c:1105
-msgid "could not parse newly created commit"
+#: ident.c:384
+#, c-format
+msgid "unable to auto-detect email address (got '%s')"
msgstr ""
-#: sequencer.c:1151
-msgid "unable to resolve HEAD after creating commit"
+#: ident.c:401
+msgid "no name was given and auto-detection is disabled"
msgstr ""
-#: sequencer.c:1153
-msgid "detached HEAD"
+#: ident.c:407
+#, c-format
+msgid "unable to auto-detect name (got '%s')"
msgstr ""
-#: sequencer.c:1157
-msgid " (root-commit)"
+#: ident.c:415
+#, c-format
+msgid "empty ident name (for <%s>) not allowed"
msgstr ""
-#: sequencer.c:1178
-msgid "could not parse HEAD"
+#: ident.c:421
+#, c-format
+msgid "name consists only of disallowed characters: %s"
msgstr ""
-#: sequencer.c:1180
+#: ident.c:436 builtin/commit.c:608
#, c-format
-msgid "HEAD %s is not a commit!"
+msgid "invalid date format: %s"
msgstr ""
-#: sequencer.c:1184 builtin/commit.c:1528
-msgid "could not parse HEAD commit"
+#: list-objects.c:129
+#, c-format
+msgid "entry '%s' in tree %s has tree mode, but is not a tree"
msgstr ""
-#: sequencer.c:1235 sequencer.c:1832
-msgid "unable to parse commit author"
+#: list-objects.c:142
+#, c-format
+msgid "entry '%s' in tree %s has blob mode, but is not a blob"
msgstr ""
-#: sequencer.c:1245 builtin/am.c:1630 builtin/merge.c:645
-msgid "git write-tree failed to write a tree"
+#: list-objects.c:378
+#, c-format
+msgid "unable to load root tree for commit %s"
msgstr ""
-#: sequencer.c:1262 sequencer.c:1317
-#, c-format
-msgid "unable to read commit message from '%s'"
+#: list-objects-filter-options.c:36
+msgid "multiple filter-specs cannot be combined"
msgstr ""
-#: sequencer.c:1284 builtin/am.c:1650 builtin/commit.c:1631 builtin/merge.c:825
-#: builtin/merge.c:850
-msgid "failed to write commit object"
+#: list-objects-filter-options.c:58
+msgid "expected 'tree:<depth>'"
msgstr ""
-#: sequencer.c:1344
-#, c-format
-msgid "could not parse commit %s"
+#: list-objects-filter-options.c:84
+msgid "sparse:path filters support has been dropped"
msgstr ""
-#: sequencer.c:1349
-#, c-format
-msgid "could not parse parent commit %s"
+#: list-objects-filter-options.c:158
+msgid "cannot change partial clone promisor remote"
msgstr ""
-#: sequencer.c:1500 sequencer.c:1525
+#: lockfile.c:151
#, c-format
-msgid "This is a combination of %d commits."
+msgid ""
+"Unable to create '%s.lock': %s.\n"
+"\n"
+"Another git process seems to be running in this repository, e.g.\n"
+"an editor opened by 'git commit'. Please make sure all processes\n"
+"are terminated then try again. If it still fails, a git process\n"
+"may have crashed in this repository earlier:\n"
+"remove the file manually to continue."
msgstr ""
-#: sequencer.c:1510 sequencer.c:4355
-msgid "need a HEAD to fixup"
+#: lockfile.c:159
+#, c-format
+msgid "Unable to create '%s.lock': %s"
msgstr ""
-#: sequencer.c:1512 sequencer.c:2729
-msgid "could not read HEAD"
+#: merge.c:41
+msgid "failed to read the cache"
msgstr ""
-#: sequencer.c:1514
-msgid "could not read HEAD's commit message"
+#: 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 ""
-#: sequencer.c:1520
-#, c-format
-msgid "cannot write '%s'"
+#: merge-recursive.c:322
+msgid "(bad commit)\n"
msgstr ""
-#: sequencer.c:1527 git-rebase--interactive.sh:457
-msgid "This is the 1st commit message:"
+#: merge-recursive.c:345
+#, c-format
+msgid "add_cacheinfo failed for path '%s'; merge aborting."
msgstr ""
-#: sequencer.c:1535
+#: merge-recursive.c:354
#, c-format
-msgid "could not read commit message of %s"
+msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
msgstr ""
-#: sequencer.c:1542
-#, c-format
-msgid "This is the commit message #%d:"
+#: merge-recursive.c:437
+msgid "error building trees"
msgstr ""
-#: sequencer.c:1548
+#: merge-recursive.c:861
#, c-format
-msgid "The commit message #%d will be skipped:"
+msgid "failed to create path '%s'%s"
msgstr ""
-#: sequencer.c:1553
+#: merge-recursive.c:872
#, c-format
-msgid "unknown command: %d"
+msgid "Removing %s to make room for subdirectory\n"
msgstr ""
-#: sequencer.c:1631
-msgid "your index file is unmerged."
+#: merge-recursive.c:886 merge-recursive.c:905
+msgid ": perhaps a D/F conflict?"
msgstr ""
-#: sequencer.c:1638
-msgid "cannot fixup root commit"
+#: merge-recursive.c:895
+#, c-format
+msgid "refusing to lose untracked file at '%s'"
msgstr ""
-#: sequencer.c:1657
+#: merge-recursive.c:936 builtin/cat-file.c:40
#, c-format
-msgid "commit %s is a merge but no -m option was given."
+msgid "cannot read object %s '%s'"
msgstr ""
-#: sequencer.c:1665
+#: merge-recursive.c:939
#, c-format
-msgid "commit %s does not have parent %d"
+msgid "blob expected for %s '%s'"
msgstr ""
-#: sequencer.c:1669
+#: merge-recursive.c:963
#, c-format
-msgid "mainline was specified but commit %s is not a merge."
+msgid "failed to open '%s': %s"
msgstr ""
-#: sequencer.c:1675
+#: merge-recursive.c:974
#, c-format
-msgid "cannot get commit message for %s"
+msgid "failed to symlink '%s': %s"
msgstr ""
-#. TRANSLATORS: The first %s will be a "todo" command like
-#. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:1694
+#: merge-recursive.c:979
#, c-format
-msgid "%s: cannot parse parent commit %s"
+msgid "do not know what to do with %06o %s '%s'"
msgstr ""
-#: sequencer.c:1759
+#: merge-recursive.c:1175
#, c-format
-msgid "could not rename '%s' to '%s'"
+msgid "Failed to merge submodule %s (not checked out)"
msgstr ""
-#: sequencer.c:1813
+#: merge-recursive.c:1182
#, c-format
-msgid "could not revert %s... %s"
+msgid "Failed to merge submodule %s (commits not present)"
msgstr ""
-#: sequencer.c:1814
+#: merge-recursive.c:1189
#, c-format
-msgid "could not apply %s... %s"
+msgid "Failed to merge submodule %s (commits don't follow merge-base)"
msgstr ""
-#: sequencer.c:1864
-msgid "empty commit set passed"
+#: merge-recursive.c:1197 merge-recursive.c:1209
+#, c-format
+msgid "Fast-forwarding submodule %s to the following commit:"
msgstr ""
-#: sequencer.c:1874
+#: merge-recursive.c:1200 merge-recursive.c:1212
#, c-format
-msgid "git %s: failed to read the index"
+msgid "Fast-forwarding submodule %s"
msgstr ""
-#: sequencer.c:1881
+#: merge-recursive.c:1235
#, c-format
-msgid "git %s: failed to refresh the index"
+msgid "Failed to merge submodule %s (merge following commits not found)"
msgstr ""
-#: sequencer.c:1961
+#: merge-recursive.c:1239
#, c-format
-msgid "%s does not accept arguments: '%s'"
+msgid "Failed to merge submodule %s (not fast-forward)"
msgstr ""
-#: sequencer.c:1970
-#, c-format
-msgid "missing arguments for %s"
+#: merge-recursive.c:1240
+msgid "Found a possible merge resolution for the submodule:\n"
msgstr ""
-#: sequencer.c:2029
+#: merge-recursive.c:1243
#, c-format
-msgid "invalid line %d: %.*s"
+msgid ""
+"If this is correct simply add it to the index for example\n"
+"by using:\n"
+"\n"
+" git update-index --cacheinfo 160000 %s \"%s\"\n"
+"\n"
+"which will accept this suggestion.\n"
msgstr ""
-#: sequencer.c:2037
+#: merge-recursive.c:1252
#, c-format
-msgid "cannot '%s' without a previous commit"
+msgid "Failed to merge submodule %s (multiple merges found)"
msgstr ""
-#: sequencer.c:2085 sequencer.c:4138 sequencer.c:4173
-#, c-format
-msgid "could not read '%s'."
+#: merge-recursive.c:1325
+msgid "Failed to execute internal merge"
msgstr ""
-#: sequencer.c:2108
-msgid "please fix this using 'git rebase --edit-todo'."
+#: merge-recursive.c:1330
+#, c-format
+msgid "Unable to add %s to database"
msgstr ""
-#: sequencer.c:2110
+#: merge-recursive.c:1362
#, c-format
-msgid "unusable instruction sheet: '%s'"
+msgid "Auto-merging %s"
msgstr ""
-#: sequencer.c:2115
-msgid "no commits parsed."
+#: merge-recursive.c:1385
+#, c-format
+msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
msgstr ""
-#: sequencer.c:2126
-msgid "cannot cherry-pick during a revert."
+#: merge-recursive.c:1457
+#, c-format
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
+"in tree."
msgstr ""
-#: sequencer.c:2128
-msgid "cannot revert during a cherry-pick."
+#: merge-recursive.c:1462
+#, c-format
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
+"left in tree."
msgstr ""
-#: sequencer.c:2195
+#: merge-recursive.c:1469
#, c-format
-msgid "invalid key: %s"
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
+"in tree at %s."
msgstr ""
-#: sequencer.c:2198
+#: merge-recursive.c:1474
#, c-format
-msgid "invalid value for %s: %s"
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
+"left in tree at %s."
msgstr ""
-#: sequencer.c:2269
-msgid "unusable squash-onto"
+#: merge-recursive.c:1509
+msgid "rename"
msgstr ""
-#: sequencer.c:2285
-#, c-format
-msgid "malformed options sheet: '%s'"
+#: merge-recursive.c:1509
+msgid "renamed"
msgstr ""
-#: sequencer.c:2323
-msgid "a cherry-pick or revert is already in progress"
+#: merge-recursive.c:1589 merge-recursive.c:2445 merge-recursive.c:3085
+#, c-format
+msgid "Refusing to lose dirty file at %s"
msgstr ""
-#: sequencer.c:2324
-msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
+#: merge-recursive.c:1599
+#, c-format
+msgid "Refusing to lose untracked file at %s, even though it's in the way."
msgstr ""
-#: sequencer.c:2327
+#: merge-recursive.c:1657
#, c-format
-msgid "could not create sequencer directory '%s'"
+msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
msgstr ""
-#: sequencer.c:2341
-msgid "could not lock HEAD"
+#: merge-recursive.c:1687
+#, c-format
+msgid "%s is a directory in %s adding as %s instead"
msgstr ""
-#: sequencer.c:2396 sequencer.c:3403
-msgid "no cherry-pick or revert in progress"
+#: merge-recursive.c:1692
+#, c-format
+msgid "Refusing to lose untracked file at %s; adding as %s instead"
msgstr ""
-#: sequencer.c:2398
-msgid "cannot resolve HEAD"
+#: merge-recursive.c:1711
+#, c-format
+msgid ""
+"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
+"\"->\"%s\" in \"%s\"%s"
msgstr ""
-#: sequencer.c:2400 sequencer.c:2435
-msgid "cannot abort from a branch yet to be born"
+#: merge-recursive.c:1716
+msgid " (left unresolved)"
msgstr ""
-#: sequencer.c:2421 builtin/grep.c:720
+#: merge-recursive.c:1825
#, c-format
-msgid "cannot open '%s'"
+msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr ""
-#: sequencer.c:2423
+#: merge-recursive.c:2030
#, c-format
-msgid "cannot read '%s': %s"
+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 ""
-#: sequencer.c:2424
-msgid "unexpected end of file"
+#: merge-recursive.c:2062
+#, c-format
+msgid ""
+"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
+"implicit directory rename(s) putting the following path(s) there: %s."
msgstr ""
-#: sequencer.c:2430
+#: merge-recursive.c:2072
#, c-format
-msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
+msgid ""
+"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
+"implicit directory renames tried to put these paths there: %s"
msgstr ""
-#: sequencer.c:2441
-msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
+#: merge-recursive.c:2164
+#, c-format
+msgid ""
+"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
+">%s in %s"
msgstr ""
-#: sequencer.c:2545 sequencer.c:3321
+#: merge-recursive.c:2408
#, c-format
-msgid "could not update %s"
+msgid ""
+"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
+"renamed."
msgstr ""
-#: sequencer.c:2583 sequencer.c:3301
-msgid "cannot read HEAD"
+#: merge-recursive.c:2929
+#, c-format
+msgid "cannot read object %s"
msgstr ""
-#: sequencer.c:2618 sequencer.c:2622 builtin/difftool.c:639
+#: merge-recursive.c:2932
#, c-format
-msgid "could not copy '%s' to '%s'"
+msgid "object %s is not a blob"
msgstr ""
-#: sequencer.c:2641
-msgid "could not read index"
+#: merge-recursive.c:2996
+msgid "modify"
msgstr ""
-#: sequencer.c:2646
-#, c-format
-msgid ""
-"execution failed: %s\n"
-"%sYou can fix the problem, and then run\n"
-"\n"
-" git rebase --continue\n"
-"\n"
+#: merge-recursive.c:2996
+msgid "modified"
msgstr ""
-#: sequencer.c:2652
-msgid "and made changes to the index and/or the working tree\n"
+#: merge-recursive.c:3008
+msgid "content"
msgstr ""
-#: sequencer.c:2658
-#, 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"
+#: merge-recursive.c:3012
+msgid "add/add"
msgstr ""
-#: sequencer.c:2771
-msgid "writing fake root commit"
+#: merge-recursive.c:3035
+#, c-format
+msgid "Skipped %s (merged same as existing)"
msgstr ""
-#: sequencer.c:2776
-msgid "writing squash-onto"
+#: merge-recursive.c:3057 git-submodule.sh:937
+msgid "submodule"
msgstr ""
-#: sequencer.c:2811
+#: merge-recursive.c:3058
#, c-format
-msgid "failed to find tree of %s"
+msgid "CONFLICT (%s): Merge conflict in %s"
msgstr ""
-#: sequencer.c:2829
-msgid "could not write index"
+#: merge-recursive.c:3088
+#, c-format
+msgid "Adding as %s instead"
msgstr ""
-#: sequencer.c:2861
-msgid "cannot merge without a current revision"
+#: merge-recursive.c:3170
+#, c-format
+msgid ""
+"Path updated: %s added in %s inside a directory that was renamed in %s; "
+"moving it to %s."
msgstr ""
-#: sequencer.c:2884
+#: merge-recursive.c:3173
#, c-format
-msgid "could not resolve '%s'"
+msgid ""
+"CONFLICT (file location): %s added in %s inside a directory that was renamed "
+"in %s, suggesting it should perhaps be moved to %s."
msgstr ""
-#: sequencer.c:2906
+#: merge-recursive.c:3177
#, c-format
-msgid "could not get commit message of '%s'"
+msgid ""
+"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
+"%s; moving it to %s."
msgstr ""
-#: sequencer.c:2916 sequencer.c:2941
+#: merge-recursive.c:3180
#, c-format
-msgid "could not write '%s'"
+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 ""
-#: sequencer.c:3005
+#: merge-recursive.c:3294
#, c-format
-msgid "could not even attempt to merge '%.*s'"
+msgid "Removing %s"
msgstr ""
-#: sequencer.c:3021
-msgid "merge: Unable to write new index file"
+#: merge-recursive.c:3317
+msgid "file/directory"
msgstr ""
-#: sequencer.c:3088
-#, c-format
-msgid "Applied autostash.\n"
+#: merge-recursive.c:3322
+msgid "directory/file"
msgstr ""
-#: sequencer.c:3100
+#: merge-recursive.c:3329
#, c-format
-msgid "cannot store %s"
+msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
msgstr ""
-#: sequencer.c:3103 git-rebase.sh:188
+#: merge-recursive.c:3338
#, 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 "Adding %s"
msgstr ""
-#: sequencer.c:3134
+#: merge-recursive.c:3347
#, c-format
-msgid ""
-"Could not execute the todo command\n"
-"\n"
-" %.*s\n"
-"It has been rescheduled; To edit the command before continuing, please\n"
-"edit the todo list first:\n"
-"\n"
-" git rebase --edit-todo\n"
-" git rebase --continue\n"
+msgid "CONFLICT (add/add): Merge conflict in %s"
msgstr ""
-#: sequencer.c:3202
+#: merge-recursive.c:3385
#, c-format
-msgid "Stopped at %s... %.*s\n"
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+" %s"
msgstr ""
-#: sequencer.c:3264
-#, c-format
-msgid "unknown command %d"
+#: merge-recursive.c:3396
+msgid "Already up to date!"
msgstr ""
-#: sequencer.c:3309
-msgid "could not read orig-head"
+#: merge-recursive.c:3405
+#, c-format
+msgid "merging of trees %s and %s failed"
msgstr ""
-#: sequencer.c:3314 sequencer.c:4352
-msgid "could not read 'onto'"
+#: merge-recursive.c:3504
+msgid "Merging:"
msgstr ""
-#: sequencer.c:3328
+#: merge-recursive.c:3517
#, c-format
-msgid "could not update HEAD to %s"
+msgid "found %u common ancestor:"
+msgid_plural "found %u common ancestors:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: merge-recursive.c:3556
+msgid "merge returned no commit"
msgstr ""
-#: sequencer.c:3414
-msgid "cannot rebase: You have unstaged changes."
+#: merge-recursive.c:3622
+#, c-format
+msgid "Could not parse object '%s'"
msgstr ""
-#: sequencer.c:3423
-msgid "cannot amend non-existing commit"
+#: merge-recursive.c:3638 builtin/merge.c:702 builtin/merge.c:873
+msgid "Unable to write index."
msgstr ""
-#: sequencer.c:3425
+#: midx.c:66
#, c-format
-msgid "invalid file: '%s'"
+msgid "multi-pack-index file %s is too small"
msgstr ""
-#: sequencer.c:3427
+#: midx.c:82
#, c-format
-msgid "invalid contents: '%s'"
+msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
msgstr ""
-#: sequencer.c:3430
-msgid ""
-"\n"
-"You have uncommitted changes in your working tree. Please, commit them\n"
-"first and then run 'git rebase --continue' again."
+#: midx.c:87
+#, c-format
+msgid "multi-pack-index version %d not recognized"
msgstr ""
-#: sequencer.c:3455 sequencer.c:3493
+#: midx.c:92
#, c-format
-msgid "could not write file: '%s'"
+msgid "hash version %u does not match"
msgstr ""
-#: sequencer.c:3508
-msgid "could not remove CHERRY_PICK_HEAD"
+#: midx.c:106
+msgid "invalid chunk offset (too large)"
msgstr ""
-#: sequencer.c:3515
-msgid "could not commit staged changes."
+#: midx.c:130
+msgid "terminating multi-pack-index chunk id appears earlier than expected"
msgstr ""
-#: sequencer.c:3612
-#, c-format
-msgid "%s: can't cherry-pick a %s"
+#: midx.c:143
+msgid "multi-pack-index missing required pack-name chunk"
msgstr ""
-#: sequencer.c:3616
-#, c-format
-msgid "%s: bad revision"
+#: midx.c:145
+msgid "multi-pack-index missing required OID fanout chunk"
msgstr ""
-#: sequencer.c:3649
-msgid "can't revert as initial commit"
+#: midx.c:147
+msgid "multi-pack-index missing required OID lookup chunk"
msgstr ""
-#: sequencer.c:4098
-msgid "make_script: unhandled options"
+#: midx.c:149
+msgid "multi-pack-index missing required object offsets chunk"
msgstr ""
-#: sequencer.c:4101
-msgid "make_script: error preparing revisions"
+#: midx.c:163
+#, c-format
+msgid "multi-pack-index pack names out of order: '%s' before '%s'"
msgstr ""
-#: sequencer.c:4142 sequencer.c:4177
+#: midx.c:208
#, c-format
-msgid "unusable todo list: '%s'"
+msgid "bad pack-int-id: %u (%u total packs)"
msgstr ""
-#: sequencer.c:4236
-#, c-format
-msgid ""
-"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
+#: midx.c:258
+msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
msgstr ""
-#: sequencer.c:4302
-#, c-format
-msgid ""
-"Warning: some commits may have been dropped accidentally.\n"
-"Dropped commits (newer to older):\n"
+#: midx.c:286
+msgid "error preparing packfile from multi-pack-index"
msgstr ""
-#: sequencer.c:4309
+#: midx.c:457
#, c-format
-msgid ""
-"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
-"\n"
-"Use 'git config rebase.missingCommitsCheck' to change the level of "
-"warnings.\n"
-"The possible behaviours are: ignore, warn, error.\n"
-"\n"
+msgid "failed to add packfile '%s'"
msgstr ""
-#: sequencer.c:4321
+#: midx.c:463
#, c-format
-msgid ""
-"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
-"continue'.\n"
-"Or you can abort the rebase with 'git rebase --abort'.\n"
+msgid "failed to open pack-index '%s'"
msgstr ""
-#: sequencer.c:4375
+#: midx.c:557
#, c-format
-msgid "could not parse commit '%s'"
+msgid "failed to locate object %d in packfile"
msgstr ""
-#: sequencer.c:4490
-msgid "the script was already rearranged."
+#: midx.c:993
+#, c-format
+msgid "failed to clear multi-pack-index at %s"
msgstr ""
-#: setup.c:123
-#, c-format
-msgid "'%s' is outside repository"
+#: midx.c:1048
+msgid "Looking for referenced packfiles"
msgstr ""
-#: setup.c:172
+#: midx.c:1063
#, c-format
msgid ""
-"%s: no such path in the working tree.\n"
-"Use 'git <command> -- <path>...' to specify paths that do not exist locally."
+"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
msgstr ""
-#: setup.c:185
-#, 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>...]'"
+#: midx.c:1067
+msgid "Verifying OID order in MIDX"
msgstr ""
-#: setup.c:234
+#: midx.c:1076
#, c-format
-msgid "option '%s' must come before non-option arguments"
+msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
msgstr ""
-#: setup.c:253
-#, c-format
-msgid ""
-"ambiguous argument '%s': both revision and filename\n"
-"Use '--' to separate paths from revisions, like this:\n"
-"'git <command> [<revision>...] -- [<file>...]'"
+#: midx.c:1095
+msgid "Sorting objects by packfile"
msgstr ""
-#: setup.c:389
-msgid "unable to set up work tree using invalid config"
+#: midx.c:1101
+msgid "Verifying object offsets"
msgstr ""
-#: setup.c:393
-msgid "this operation must be run in a work tree"
+#: midx.c:1117
+#, c-format
+msgid "failed to load pack entry for oid[%d] = %s"
msgstr ""
-#: setup.c:503
+#: midx.c:1123
#, c-format
-msgid "Expected git repo version <= %d, found %d"
+msgid "failed to load pack-index for packfile %s"
msgstr ""
-#: setup.c:511
-msgid "unknown repository extensions found:"
+#: midx.c:1132
+#, c-format
+msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
msgstr ""
-#: setup.c:530
+#: name-hash.c:531
#, c-format
-msgid "error opening '%s'"
+msgid "unable to create lazy_dir thread: %s"
msgstr ""
-#: setup.c:532
+#: name-hash.c:553
#, c-format
-msgid "too large to be a .git file: '%s'"
+msgid "unable to create lazy_name thread: %s"
msgstr ""
-#: setup.c:534
+#: name-hash.c:559
#, c-format
-msgid "error reading %s"
+msgid "unable to join lazy_name thread: %s"
msgstr ""
-#: setup.c:536
+#: notes-merge.c:277
#, c-format
-msgid "invalid gitfile format: %s"
+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 ""
-#: setup.c:538
+#: notes-merge.c:284
#, c-format
-msgid "no path in gitfile: %s"
+msgid "You have not concluded your notes merge (%s exists)."
msgstr ""
-#: setup.c:540
-#, c-format
-msgid "not a git repository: %s"
+#: notes-utils.c:46
+msgid "Cannot commit uninitialized/unreferenced notes tree"
msgstr ""
-#: setup.c:639
+#: notes-utils.c:105
#, c-format
-msgid "'$%s' too big"
+msgid "Bad notes.rewriteMode value: '%s'"
msgstr ""
-#: setup.c:653
+#: notes-utils.c:115
#, c-format
-msgid "not a git repository: '%s'"
+msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
msgstr ""
-#: setup.c:682 setup.c:684 setup.c:715
+#. TRANSLATORS: The first %s is the name of
+#. the environment variable, the second %s is
+#. its value.
+#.
+#: notes-utils.c:145
#, c-format
-msgid "cannot chdir to '%s'"
+msgid "Bad %s value: '%s'"
msgstr ""
-#: setup.c:687 setup.c:743 setup.c:753 setup.c:792 setup.c:800 setup.c:815
-msgid "cannot come back to cwd"
+#: object.c:54
+#, c-format
+msgid "invalid object type \"%s\""
msgstr ""
-#: setup.c:813
+#: object.c:174
#, c-format
-msgid "not a git repository (or any of the parent directories): %s"
+msgid "object %s is a %s, not a %s"
msgstr ""
-#: setup.c:824
+#: object.c:234
#, c-format
-msgid "failed to stat '%*s%s%s'"
+msgid "object %s has unknown type id %d"
msgstr ""
-#: setup.c:1054
-msgid "Unable to read current working directory"
+#: object.c:247
+#, c-format
+msgid "unable to parse object: %s"
msgstr ""
-#: setup.c:1066 setup.c:1072
+#: object.c:267 object.c:278
#, c-format
-msgid "cannot change to '%s'"
+msgid "hash mismatch %s"
+msgstr ""
+
+#: packfile.c:617
+msgid "offset before end of packfile (broken .idx?)"
msgstr ""
-#: setup.c:1085
+#: packfile.c:1868
#, c-format
-msgid ""
-"not a git repository (or any parent up to mount point %s)\n"
-"Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."
+msgid "offset before start of pack index for %s (corrupt index?)"
msgstr ""
-#: setup.c:1168
+#: packfile.c:1872
#, c-format
-msgid ""
-"problem with core.sharedRepository filemode value (0%.3o).\n"
-"The owner of files must always have read and write permissions."
+msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr ""
-#: setup.c:1211
-msgid "open /dev/null or dup failed"
+#: parse-options.c:38
+#, c-format
+msgid "%s requires a value"
msgstr ""
-#: setup.c:1226
-msgid "fork failed"
+#: parse-options.c:73
+#, c-format
+msgid "%s is incompatible with %s"
msgstr ""
-#: setup.c:1231
-msgid "setsid failed"
+#: parse-options.c:78
+#, c-format
+msgid "%s : incompatible with something else"
msgstr ""
-#: sha1-file.c:625
+#: parse-options.c:92 parse-options.c:96 parse-options.c:319
#, c-format
-msgid "path '%s' does not exist"
+msgid "%s takes no value"
msgstr ""
-#: sha1-file.c:651
+#: parse-options.c:94
#, c-format
-msgid "reference repository '%s' as a linked checkout is not supported yet."
+msgid "%s isn't available"
msgstr ""
-#: sha1-file.c:657
+#: parse-options.c:219
#, c-format
-msgid "reference repository '%s' is not a local repository."
+msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
msgstr ""
-#: sha1-file.c:663
+#: parse-options.c:389
#, c-format
-msgid "reference repository '%s' is shallow"
+msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
msgstr ""
-#: sha1-file.c:671
+#: parse-options.c:423 parse-options.c:431
#, c-format
-msgid "reference repository '%s' is grafted"
+msgid "did you mean `--%s` (with two dashes ?)"
msgstr ""
-#: sha1-name.c:442
+#: parse-options.c:859
#, c-format
-msgid "short SHA1 %s is ambiguous"
+msgid "unknown option `%s'"
msgstr ""
-#: sha1-name.c:453
-msgid "The candidates are:"
+#: parse-options.c:861
+#, c-format
+msgid "unknown switch `%c'"
msgstr ""
-#: sha1-name.c:695
-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\""
+#: parse-options.c:863
+#, c-format
+msgid "unknown non-ascii option in string: `%s'"
msgstr ""
-#: submodule.c:97 submodule.c:131
-msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
+#: parse-options.c:887
+msgid "..."
msgstr ""
-#: submodule.c:101 submodule.c:135
+#: parse-options.c:906
#, c-format
-msgid "Could not find section in .gitmodules where path=%s"
+msgid "usage: %s"
msgstr ""
-#: submodule.c:109
+#. TRANSLATORS: the colon here should align with the
+#. one in "usage: %s" translation.
+#.
+#: parse-options.c:912
#, c-format
-msgid "Could not update .gitmodules entry %s"
+msgid " or: %s"
msgstr ""
-#: submodule.c:142
+#: parse-options.c:915
#, c-format
-msgid "Could not remove .gitmodules entry for %s"
+msgid " %s"
msgstr ""
-#: submodule.c:153
-msgid "staging updated .gitmodules failed"
+#: parse-options.c:954
+msgid "-NUM"
msgstr ""
-#: submodule.c:315
+#: parse-options.c:968
#, c-format
-msgid "in unpopulated submodule '%s'"
+msgid "alias of --%s"
msgstr ""
-#: submodule.c:346
+#: parse-options-cb.c:20 parse-options-cb.c:24
#, c-format
-msgid "Pathspec '%s' is in submodule '%.*s'"
+msgid "option `%s' expects a numerical value"
msgstr ""
-#: submodule.c:837
+#: parse-options-cb.c:41
#, c-format
-msgid "submodule entry '%s' (%s) is a %s, not a commit"
+msgid "malformed expiration date '%s'"
msgstr ""
-#: submodule.c:1069 builtin/branch.c:651 builtin/submodule--helper.c:1743
-msgid "Failed to resolve HEAD as a valid ref."
+#: parse-options-cb.c:54
+#, c-format
+msgid "option `%s' expects \"always\", \"auto\", or \"never\""
msgstr ""
-#: submodule.c:1375
+#: parse-options-cb.c:130 parse-options-cb.c:147
#, c-format
-msgid "'%s' not recognized as a git repository"
+msgid "malformed object name '%s'"
msgstr ""
-#: submodule.c:1513
+#: path.c:897
#, c-format
-msgid "could not start 'git status' in submodule '%s'"
+msgid "Could not make %s writable by group"
msgstr ""
-#: submodule.c:1526
-#, c-format
-msgid "could not run 'git status' in submodule '%s'"
+#: pathspec.c:128
+msgid "Escape character '\\' not allowed as last character in attr value"
msgstr ""
-#: submodule.c:1619
-#, c-format
-msgid "submodule '%s' has dirty index"
+#: pathspec.c:146
+msgid "Only one 'attr:' specification is allowed."
msgstr ""
-#: submodule.c:1718
-#, c-format
-msgid ""
-"relocate_gitdir for submodule '%s' with more than one worktree not supported"
+#: pathspec.c:149
+msgid "attr spec must not be empty"
msgstr ""
-#: submodule.c:1730 submodule.c:1786
+#: pathspec.c:192
#, c-format
-msgid "could not lookup name for submodule '%s'"
+msgid "invalid attribute name %s"
msgstr ""
-#: submodule.c:1734 builtin/submodule--helper.c:1261
-#: builtin/submodule--helper.c:1271
-#, c-format
-msgid "could not create directory '%s'"
+#: pathspec.c:257
+msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
msgstr ""
-#: submodule.c:1737
-#, c-format
+#: pathspec.c:264
msgid ""
-"Migrating git directory of '%s%s' from\n"
-"'%s' to\n"
-"'%s'\n"
+"global 'literal' pathspec setting is incompatible with all other global "
+"pathspec settings"
msgstr ""
-#: submodule.c:1821
-#, c-format
-msgid "could not recurse into submodule '%s'"
+#: pathspec.c:304
+msgid "invalid parameter for pathspec magic 'prefix'"
msgstr ""
-#: submodule.c:1865
-msgid "could not start ls-files in .."
+#: pathspec.c:325
+#, c-format
+msgid "Invalid pathspec magic '%.*s' in '%s'"
msgstr ""
-#: submodule.c:1904
+#: pathspec.c:330
#, c-format
-msgid "ls-tree returned unexpected return code %d"
+msgid "Missing ')' at the end of pathspec magic in '%s'"
msgstr ""
-#: submodule-config.c:230
+#: pathspec.c:368
#, c-format
-msgid "ignoring suspicious submodule name: %s"
+msgid "Unimplemented pathspec magic '%c' in '%s'"
msgstr ""
-#: submodule-config.c:294
-msgid "negative values not allowed for submodule.fetchjobs"
+#: pathspec.c:427
+#, c-format
+msgid "%s: 'literal' and 'glob' are incompatible"
msgstr ""
-#: submodule-config.c:467
+#: pathspec.c:440
#, c-format
-msgid "invalid value for %s"
+msgid "%s: '%s' is outside repository"
msgstr ""
-#: trailer.c:238
+#: pathspec.c:514
#, c-format
-msgid "running trailer command '%s' failed"
+msgid "'%s' (mnemonic: '%c')"
msgstr ""
-#: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553
-#: trailer.c:557
+#: pathspec.c:524
#, c-format
-msgid "unknown value '%s' for key '%s'"
+msgid "%s: pathspec magic not supported by this command: %s"
msgstr ""
-#: trailer.c:539 trailer.c:544 builtin/remote.c:293
+#: pathspec.c:591
#, c-format
-msgid "more than one %s"
+msgid "pathspec '%s' is beyond a symbolic link"
msgstr ""
-#: trailer.c:730
-#, c-format
-msgid "empty trailer token in trailer '%.*s'"
+#: pkt-line.c:92
+msgid "unable to write flush packet"
msgstr ""
-#: trailer.c:750
-#, c-format
-msgid "could not read input file '%s'"
+#: pkt-line.c:99
+msgid "unable to write delim packet"
msgstr ""
-#: trailer.c:753
-msgid "could not read from stdin"
+#: pkt-line.c:106
+msgid "flush packet write failed"
msgstr ""
-#: trailer.c:1008 builtin/am.c:46
-#, c-format
-msgid "could not stat %s"
+#: pkt-line.c:146 pkt-line.c:232
+msgid "protocol error: impossibly long line"
msgstr ""
-#: trailer.c:1010
-#, c-format
-msgid "file %s is not a regular file"
+#: pkt-line.c:162 pkt-line.c:164
+msgid "packet write with format failed"
msgstr ""
-#: trailer.c:1012
-#, c-format
-msgid "file %s is not writable by user"
+#: pkt-line.c:196
+msgid "packet write failed - data exceeds max packet size"
msgstr ""
-#: trailer.c:1024
-msgid "could not open temporary file"
+#: pkt-line.c:203 pkt-line.c:210
+msgid "packet write failed"
+msgstr ""
+
+#: pkt-line.c:295
+msgid "read error"
+msgstr ""
+
+#: pkt-line.c:303
+msgid "the remote end hung up unexpectedly"
msgstr ""
-#: trailer.c:1064
+#: pkt-line.c:331
#, c-format
-msgid "could not rename temporary file to %s"
+msgid "protocol error: bad line length character: %.4s"
msgstr ""
-#: transport.c:116
+#: pkt-line.c:341 pkt-line.c:346
#, c-format
-msgid "Would set upstream of '%s' to '%s' of '%s'\n"
+msgid "protocol error: bad line length %d"
msgstr ""
-#: transport.c:208
+#: pkt-line.c:362
#, c-format
-msgid "transport: invalid depth option '%s'"
+msgid "remote error: %s"
msgstr ""
-#: transport.c:584
-msgid "could not parse transport.color.* config"
+#: preload-index.c:119
+msgid "Refreshing index"
msgstr ""
-#: transport.c:996
+#: preload-index.c:138
#, c-format
-msgid ""
-"The following submodule paths contain changes that can\n"
-"not be found on any remote:\n"
+msgid "unable to create threaded lstat: %s"
msgstr ""
-#: transport.c:1000
-#, 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"
+#: pretty.c:966
+msgid "unable to parse --pretty format"
msgstr ""
-#: transport.c:1008
-msgid "Aborting."
+#: range-diff.c:56
+msgid "could not start `log`"
+msgstr ""
+
+#: range-diff.c:59
+msgid "could not read `log` output"
msgstr ""
-#: transport-helper.c:1087
+#: range-diff.c:74 sequencer.c:4897
#, c-format
-msgid "Could not read ref %s"
+msgid "could not parse commit '%s'"
msgstr ""
-#: tree-walk.c:31
-msgid "too-short tree object"
+#: range-diff.c:224
+msgid "failed to generate diff"
msgstr ""
-#: tree-walk.c:37
-msgid "malformed mode in tree entry"
+#: range-diff.c:455 range-diff.c:457
+#, c-format
+msgid "could not parse log for '%s'"
msgstr ""
-#: tree-walk.c:41
-msgid "empty filename in tree entry"
+#: read-cache.c:680
+#, c-format
+msgid "will not add file alias '%s' ('%s' already exists in index)"
msgstr ""
-#: tree-walk.c:113
-msgid "too-short tree file"
+#: read-cache.c:696
+msgid "cannot create an empty blob in the object database"
msgstr ""
-#: unpack-trees.c:111
+#: read-cache.c:718
#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by checkout:\n"
-"%%sPlease commit your changes or stash them before you switch branches."
+msgid "%s: can only add regular files, symbolic links or git-directories"
msgstr ""
-#: unpack-trees.c:113
+#: read-cache.c:723
#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by checkout:\n"
-"%%s"
+msgid "'%s' does not have a commit checked out"
msgstr ""
-#: unpack-trees.c:116
+#: read-cache.c:775
#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by merge:\n"
-"%%sPlease commit your changes or stash them before you merge."
+msgid "unable to index file '%s'"
msgstr ""
-#: unpack-trees.c:118
+#: read-cache.c:794
#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by merge:\n"
-"%%s"
+msgid "unable to add '%s' to index"
msgstr ""
-#: unpack-trees.c:121
+#: read-cache.c:805
#, 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 "unable to stat '%s'"
msgstr ""
-#: unpack-trees.c:123
+#: read-cache.c:1314
#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by %s:\n"
-"%%s"
+msgid "'%s' appears as both a file and as a directory"
msgstr ""
-#: unpack-trees.c:128
-#, c-format
-msgid ""
-"Updating the following directories would lose untracked files in them:\n"
-"%s"
+#: read-cache.c:1499
+msgid "Refresh index"
msgstr ""
-#: unpack-trees.c:132
+#: read-cache.c:1613
#, c-format
msgid ""
-"The following untracked working tree files would be removed by checkout:\n"
-"%%sPlease move or remove them before you switch branches."
+"index.version set, but the value is invalid.\n"
+"Using version %i"
msgstr ""
-#: unpack-trees.c:134
+#: read-cache.c:1623
#, c-format
msgid ""
-"The following untracked working tree files would be removed by checkout:\n"
-"%%s"
+"GIT_INDEX_VERSION set, but the value is invalid.\n"
+"Using version %i"
msgstr ""
-#: unpack-trees.c:137
+#: read-cache.c:1679
#, c-format
-msgid ""
-"The following untracked working tree files would be removed by merge:\n"
-"%%sPlease move or remove them before you merge."
+msgid "bad signature 0x%08x"
msgstr ""
-#: unpack-trees.c:139
+#: read-cache.c:1682
#, c-format
-msgid ""
-"The following untracked working tree files would be removed by merge:\n"
-"%%s"
+msgid "bad index version %d"
msgstr ""
-#: 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."
+#: read-cache.c:1691
+msgid "bad index file sha1 signature"
msgstr ""
-#: unpack-trees.c:144
+#: read-cache.c:1721
#, c-format
-msgid ""
-"The following untracked working tree files would be removed by %s:\n"
-"%%s"
+msgid "index uses %.4s extension, which we do not understand"
msgstr ""
-#: unpack-trees.c:150
+#: read-cache.c:1723
#, 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 "ignoring %.4s extension"
msgstr ""
-#: unpack-trees.c:152
+#: read-cache.c:1760
#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by "
-"checkout:\n"
-"%%s"
+msgid "unknown index entry format 0x%08x"
msgstr ""
-#: unpack-trees.c:155
+#: read-cache.c:1776
#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by merge:\n"
-"%%sPlease move or remove them before you merge."
+msgid "malformed name field in the index, near path '%s'"
msgstr ""
-#: unpack-trees.c:157
-#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by merge:\n"
-"%%s"
+#: read-cache.c:1833
+msgid "unordered stage entries in index"
msgstr ""
-#: unpack-trees.c:160
+#: read-cache.c:1836
#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by %s:\n"
-"%%sPlease move or remove them before you %s."
+msgid "multiple stage entries for merged file '%s'"
msgstr ""
-#: unpack-trees.c:162
+#: read-cache.c:1839
#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by %s:\n"
-"%%s"
+msgid "unordered stage entries for '%s'"
msgstr ""
-#: unpack-trees.c:170
-#, c-format
-msgid "Entry '%s' overlaps with '%s'. Cannot bind."
+#: 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 ""
-#: unpack-trees.c:173
+#: read-cache.c:2087
#, c-format
-msgid ""
-"Cannot update sparse checkout: the following entries are not up to date:\n"
-"%s"
+msgid "unable to create load_cache_entries thread: %s"
msgstr ""
-#: unpack-trees.c:175
+#: read-cache.c:2100
#, c-format
-msgid ""
-"The following working tree files would be overwritten by sparse checkout "
-"update:\n"
-"%s"
+msgid "unable to join load_cache_entries thread: %s"
msgstr ""
-#: unpack-trees.c:177
+#: read-cache.c:2133
#, c-format
-msgid ""
-"The following working tree files would be removed by sparse checkout "
-"update:\n"
-"%s"
+msgid "%s: index file open failed"
msgstr ""
-#: unpack-trees.c:179
+#: read-cache.c:2137
#, c-format
-msgid ""
-"Cannot update submodule:\n"
-"%s"
+msgid "%s: cannot stat the open index"
msgstr ""
-#: unpack-trees.c:262
+#: read-cache.c:2141
#, c-format
-msgid "Aborting\n"
-msgstr ""
-
-#: unpack-trees.c:344
-msgid "Checking out files"
-msgstr ""
-
-#: urlmatch.c:163
-msgid "invalid URL scheme name or missing '://' suffix"
+msgid "%s: index file smaller than expected"
msgstr ""
-#: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405
+#: read-cache.c:2145
#, c-format
-msgid "invalid %XX escape sequence"
-msgstr ""
-
-#: urlmatch.c:215
-msgid "missing host and scheme is not 'file:'"
-msgstr ""
-
-#: urlmatch.c:232
-msgid "a 'file:' URL may not have a port number"
-msgstr ""
-
-#: urlmatch.c:247
-msgid "invalid characters in host name"
-msgstr ""
-
-#: urlmatch.c:292 urlmatch.c:303
-msgid "invalid port number"
+msgid "%s: unable to map index file"
msgstr ""
-#: urlmatch.c:371
-msgid "invalid '..' path segment"
+#: read-cache.c:2187
+#, c-format
+msgid "unable to create load_index_extensions thread: %s"
msgstr ""
-#: worktree.c:245 builtin/am.c:2147
+#: read-cache.c:2214
#, c-format
-msgid "failed to read '%s'"
+msgid "unable to join load_index_extensions thread: %s"
msgstr ""
-#: worktree.c:291
+#: read-cache.c:2246
#, c-format
-msgid "'%s' at main working tree is not the repository directory"
+msgid "could not freshen shared index '%s'"
msgstr ""
-#: worktree.c:302
+#: read-cache.c:2293
#, c-format
-msgid "'%s' file does not contain absolute path to the working tree location"
+msgid "broken index, expect %s in %s, got %s"
msgstr ""
-#: worktree.c:314
+#: read-cache.c:2989 wrapper.c:658 builtin/merge.c:1117
#, c-format
-msgid "'%s' does not exist"
+msgid "could not close '%s'"
msgstr ""
-#: worktree.c:320
+#: read-cache.c:3092 sequencer.c:2354 sequencer.c:3807
#, c-format
-msgid "'%s' is not a .git file, error code %d"
+msgid "could not stat '%s'"
msgstr ""
-#: worktree.c:328
+#: read-cache.c:3105
#, c-format
-msgid "'%s' does not point back to '%s'"
+msgid "unable to open git dir: %s"
msgstr ""
-#: wrapper.c:223 wrapper.c:393
+#: read-cache.c:3117
#, c-format
-msgid "could not open '%s' for reading and writing"
+msgid "unable to unlink: %s"
msgstr ""
-#: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:770
-#: builtin/am.c:862 builtin/merge.c:1043
+#: read-cache.c:3142
#, c-format
-msgid "could not open '%s' for reading"
+msgid "cannot fix permission bits on '%s'"
msgstr ""
-#: wrapper.c:424 wrapper.c:624
+#: read-cache.c:3291
#, c-format
-msgid "unable to access '%s'"
+msgid "%s: cannot drop to stage #0"
msgstr ""
-#: wrapper.c:632
-msgid "unable to get current working directory"
+#: rebase-interactive.c:26
+#, c-format
+msgid ""
+"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
msgstr ""
-#: wt-status.c:154
-msgid "Unmerged paths:"
+#: 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 ""
-#: wt-status.c:181 wt-status.c:208
+#: rebase-interactive.c:56
#, c-format
-msgid " (use \"git reset %s <file>...\" to unstage)"
-msgstr ""
+msgid "Rebase %s onto %s (%d command)"
+msgid_plural "Rebase %s onto %s (%d commands)"
+msgstr[0] ""
+msgstr[1] ""
-#: wt-status.c:183 wt-status.c:210
-msgid " (use \"git rm --cached <file>...\" to unstage)"
+#: 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 ""
-#: wt-status.c:187
-msgid " (use \"git add <file>...\" to mark resolution)"
+#: 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 ""
-#: wt-status.c:189 wt-status.c:193
-msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
+#: 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 ""
-#: wt-status.c:191
-msgid " (use \"git rm <file>...\" to mark resolution)"
+#: 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 ""
-#: wt-status.c:202 wt-status.c:1015
-msgid "Changes to be committed:"
+#: rebase-interactive.c:85 git-rebase--preserve-merges.sh:900
+msgid "Note that empty commits are commented out"
msgstr ""
-#: wt-status.c:220 wt-status.c:1024
-msgid "Changes not staged for commit:"
+#: 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 "could not write '%s'"
msgstr ""
-#: wt-status.c:224
-msgid " (use \"git add <file>...\" to update what will be committed)"
+#: rebase-interactive.c:108
+#, c-format
+msgid "could not copy '%s' to '%s'."
msgstr ""
-#: wt-status.c:226
-msgid " (use \"git add/rm <file>...\" to update what will be committed)"
+#: rebase-interactive.c:173
+#, c-format
+msgid ""
+"Warning: some commits may have been dropped accidentally.\n"
+"Dropped commits (newer to older):\n"
msgstr ""
-#: wt-status.c:227
+#: rebase-interactive.c:180
+#, c-format
msgid ""
-" (use \"git checkout -- <file>...\" to discard changes in working directory)"
+"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 ""
-#: wt-status.c:229
-msgid " (commit or discard the untracked or modified content in submodules)"
+#: refs.c:192
+#, c-format
+msgid "%s does not point to a valid object!"
msgstr ""
-#: wt-status.c:241
+#: refs.c:597
#, c-format
-msgid " (use \"git %s <file>...\" to include in what will be committed)"
+msgid "ignoring dangling symref %s"
msgstr ""
-#: wt-status.c:256
-msgid "both deleted:"
+#: refs.c:599 ref-filter.c:1982
+#, c-format
+msgid "ignoring broken ref %s"
msgstr ""
-#: wt-status.c:258
-msgid "added by us:"
+#: refs.c:734
+#, c-format
+msgid "could not open '%s' for writing: %s"
msgstr ""
-#: wt-status.c:260
-msgid "deleted by them:"
+#: refs.c:744 refs.c:795
+#, c-format
+msgid "could not read ref '%s'"
msgstr ""
-#: wt-status.c:262
-msgid "added by them:"
+#: refs.c:750
+#, c-format
+msgid "ref '%s' already exists"
msgstr ""
-#: wt-status.c:264
-msgid "deleted by us:"
+#: refs.c:755
+#, c-format
+msgid "unexpected object ID when writing '%s'"
msgstr ""
-#: wt-status.c:266
-msgid "both added:"
+#: 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 ""
-#: wt-status.c:268
-msgid "both modified:"
+#: 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 ""
-#: wt-status.c:278
-msgid "new file:"
+#: refs.c:797
+#, c-format
+msgid "unexpected object ID when deleting '%s'"
msgstr ""
-#: wt-status.c:280
-msgid "copied:"
+#: refs.c:928
+#, c-format
+msgid "log for ref %s has gap after %s"
msgstr ""
-#: wt-status.c:282
-msgid "deleted:"
+#: refs.c:934
+#, c-format
+msgid "log for ref %s unexpectedly ended on %s"
msgstr ""
-#: wt-status.c:284
-msgid "modified:"
+#: refs.c:993
+#, c-format
+msgid "log for %s is empty"
msgstr ""
-#: wt-status.c:286
-msgid "renamed:"
+#: refs.c:1085
+#, c-format
+msgid "refusing to update ref with bad name '%s'"
msgstr ""
-#: wt-status.c:288
-msgid "typechange:"
+#: refs.c:1161
+#, c-format
+msgid "update_ref failed for ref '%s': %s"
msgstr ""
-#: wt-status.c:290
-msgid "unknown:"
+#: refs.c:1942
+#, c-format
+msgid "multiple updates for ref '%s' not allowed"
msgstr ""
-#: wt-status.c:292
-msgid "unmerged:"
+#: refs.c:1974
+msgid "ref updates forbidden inside quarantine environment"
msgstr ""
-#: wt-status.c:372
-msgid "new commits, "
+#: refs.c:2070 refs.c:2100
+#, c-format
+msgid "'%s' exists; cannot create '%s'"
msgstr ""
-#: wt-status.c:374
-msgid "modified content, "
+#: refs.c:2076 refs.c:2111
+#, c-format
+msgid "cannot process '%s' and '%s' at the same time"
msgstr ""
-#: wt-status.c:376
-msgid "untracked content, "
+#: refs/files-backend.c:1234
+#, c-format
+msgid "could not remove reference %s"
msgstr ""
-#: wt-status.c:853
+#: refs/files-backend.c:1248 refs/packed-backend.c:1532
+#: refs/packed-backend.c:1542
#, c-format
-msgid "Your stash currently has %d entry"
-msgid_plural "Your stash currently has %d entries"
-msgstr[0] ""
-msgstr[1] ""
-
-#: wt-status.c:885
-msgid "Submodules changed but not updated:"
+msgid "could not delete reference %s: %s"
msgstr ""
-#: wt-status.c:887
-msgid "Submodule changes to be committed:"
+#: refs/files-backend.c:1251 refs/packed-backend.c:1545
+#, c-format
+msgid "could not delete references: %s"
msgstr ""
-#: wt-status.c:969
-msgid ""
-"Do not modify or remove the line above.\n"
-"Everything below it will be ignored."
+#: refspec.c:137
+#, c-format
+msgid "invalid refspec '%s'"
msgstr ""
-#: wt-status.c:1084
-msgid "You have unmerged paths."
+#: ref-filter.c:39 wt-status.c:1909
+msgid "gone"
msgstr ""
-#: wt-status.c:1087
-msgid " (fix conflicts and run \"git commit\")"
+#: ref-filter.c:40
+#, c-format
+msgid "ahead %d"
msgstr ""
-#: wt-status.c:1089
-msgid " (use \"git merge --abort\" to abort the merge)"
+#: ref-filter.c:41
+#, c-format
+msgid "behind %d"
msgstr ""
-#: wt-status.c:1094
-msgid "All conflicts fixed but you are still merging."
+#: ref-filter.c:42
+#, c-format
+msgid "ahead %d, behind %d"
msgstr ""
-#: wt-status.c:1097
-msgid " (use \"git commit\" to conclude merge)"
+#: ref-filter.c:138
+#, c-format
+msgid "expected format: %%(color:<color>)"
msgstr ""
-#: wt-status.c:1107
-msgid "You are in the middle of an am session."
+#: ref-filter.c:140
+#, c-format
+msgid "unrecognized color: %%(color:%s)"
msgstr ""
-#: wt-status.c:1110
-msgid "The current patch is empty."
+#: ref-filter.c:162
+#, c-format
+msgid "Integer value expected refname:lstrip=%s"
msgstr ""
-#: wt-status.c:1114
-msgid " (fix conflicts and then run \"git am --continue\")"
+#: ref-filter.c:166
+#, c-format
+msgid "Integer value expected refname:rstrip=%s"
msgstr ""
-#: wt-status.c:1116
-msgid " (use \"git am --skip\" to skip this patch)"
+#: ref-filter.c:168
+#, c-format
+msgid "unrecognized %%(%s) argument: %s"
msgstr ""
-#: wt-status.c:1118
-msgid " (use \"git am --abort\" to restore the original branch)"
+#: ref-filter.c:223
+#, c-format
+msgid "%%(objecttype) does not take arguments"
msgstr ""
-#: wt-status.c:1250
-msgid "git-rebase-todo is missing."
+#: ref-filter.c:245
+#, c-format
+msgid "unrecognized %%(objectsize) argument: %s"
msgstr ""
-#: wt-status.c:1252
-msgid "No commands done."
+#: ref-filter.c:253
+#, c-format
+msgid "%%(deltabase) does not take arguments"
msgstr ""
-#: wt-status.c:1255
+#: ref-filter.c:265
#, c-format
-msgid "Last command done (%d command done):"
-msgid_plural "Last commands done (%d commands done):"
-msgstr[0] ""
-msgstr[1] ""
+msgid "%%(body) does not take arguments"
+msgstr ""
-#: wt-status.c:1266
+#: ref-filter.c:274
#, c-format
-msgid " (see more in file %s)"
+msgid "%%(subject) does not take arguments"
msgstr ""
-#: wt-status.c:1271
-msgid "No commands remaining."
+#: ref-filter.c:296
+#, c-format
+msgid "unknown %%(trailers) argument: %s"
msgstr ""
-#: wt-status.c:1274
+#: ref-filter.c:325
#, 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:1282
-msgid " (use \"git rebase --edit-todo\" to view and edit)"
+msgid "positive value expected contents:lines=%s"
msgstr ""
-#: wt-status.c:1295
+#: ref-filter.c:327
#, c-format
-msgid "You are currently rebasing branch '%s' on '%s'."
+msgid "unrecognized %%(contents) argument: %s"
msgstr ""
-#: wt-status.c:1300
-msgid "You are currently rebasing."
+#: ref-filter.c:342
+#, c-format
+msgid "positive value expected objectname:short=%s"
msgstr ""
-#: wt-status.c:1314
-msgid " (fix conflicts and then run \"git rebase --continue\")"
+#: ref-filter.c:346
+#, c-format
+msgid "unrecognized %%(objectname) argument: %s"
msgstr ""
-#: wt-status.c:1316
-msgid " (use \"git rebase --skip\" to skip this patch)"
+#: ref-filter.c:376
+#, c-format
+msgid "expected format: %%(align:<width>,<position>)"
msgstr ""
-#: wt-status.c:1318
-msgid " (use \"git rebase --abort\" to check out the original branch)"
+#: ref-filter.c:388
+#, c-format
+msgid "unrecognized position:%s"
msgstr ""
-#: wt-status.c:1324
-msgid " (all conflicts fixed: run \"git rebase --continue\")"
+#: ref-filter.c:395
+#, c-format
+msgid "unrecognized width:%s"
msgstr ""
-#: wt-status.c:1328
+#: ref-filter.c:404
#, c-format
-msgid ""
-"You are currently splitting a commit while rebasing branch '%s' on '%s'."
+msgid "unrecognized %%(align) argument: %s"
msgstr ""
-#: wt-status.c:1333
-msgid "You are currently splitting a commit during a rebase."
+#: ref-filter.c:412
+#, c-format
+msgid "positive width expected with the %%(align) atom"
msgstr ""
-#: wt-status.c:1336
-msgid " (Once your working directory is clean, run \"git rebase --continue\")"
+#: ref-filter.c:430
+#, c-format
+msgid "unrecognized %%(if) argument: %s"
msgstr ""
-#: wt-status.c:1340
+#: ref-filter.c:531
#, c-format
-msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
+msgid "malformed field name: %.*s"
msgstr ""
-#: wt-status.c:1345
-msgid "You are currently editing a commit during a rebase."
+#: ref-filter.c:558
+#, c-format
+msgid "unknown field name: %.*s"
msgstr ""
-#: wt-status.c:1348
-msgid " (use \"git commit --amend\" to amend the current commit)"
+#: ref-filter.c:562
+#, c-format
+msgid ""
+"not a git repository, but the field '%.*s' requires access to object data"
msgstr ""
-#: wt-status.c:1350
-msgid ""
-" (use \"git rebase --continue\" once you are satisfied with your changes)"
+#: ref-filter.c:686
+#, c-format
+msgid "format: %%(if) atom used without a %%(then) atom"
msgstr ""
-#: wt-status.c:1360
+#: ref-filter.c:749
#, c-format
-msgid "You are currently cherry-picking commit %s."
+msgid "format: %%(then) atom used without an %%(if) atom"
msgstr ""
-#: wt-status.c:1365
-msgid " (fix conflicts and run \"git cherry-pick --continue\")"
+#: ref-filter.c:751
+#, c-format
+msgid "format: %%(then) atom used more than once"
msgstr ""
-#: wt-status.c:1368
-msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
+#: ref-filter.c:753
+#, c-format
+msgid "format: %%(then) atom used after %%(else)"
msgstr ""
-#: wt-status.c:1370
-msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
+#: ref-filter.c:781
+#, c-format
+msgid "format: %%(else) atom used without an %%(if) atom"
msgstr ""
-#: wt-status.c:1379
+#: ref-filter.c:783
#, c-format
-msgid "You are currently reverting commit %s."
+msgid "format: %%(else) atom used without a %%(then) atom"
msgstr ""
-#: wt-status.c:1384
-msgid " (fix conflicts and run \"git revert --continue\")"
+#: ref-filter.c:785
+#, c-format
+msgid "format: %%(else) atom used more than once"
msgstr ""
-#: wt-status.c:1387
-msgid " (all conflicts fixed: run \"git revert --continue\")"
+#: ref-filter.c:800
+#, c-format
+msgid "format: %%(end) atom used without corresponding atom"
msgstr ""
-#: wt-status.c:1389
-msgid " (use \"git revert --abort\" to cancel the revert operation)"
+#: ref-filter.c:857
+#, c-format
+msgid "malformed format string %s"
msgstr ""
-#: wt-status.c:1400
+#: ref-filter.c:1453
#, c-format
-msgid "You are currently bisecting, started from branch '%s'."
+msgid "(no branch, rebasing %s)"
msgstr ""
-#: wt-status.c:1404
-msgid "You are currently bisecting."
+#: ref-filter.c:1456
+#, c-format
+msgid "(no branch, rebasing detached HEAD %s)"
msgstr ""
-#: wt-status.c:1407
-msgid " (use \"git bisect reset\" to get back to the original branch)"
+#: ref-filter.c:1459
+#, c-format
+msgid "(no branch, bisect started on %s)"
msgstr ""
-#: wt-status.c:1604
-msgid "On branch "
+#. TRANSLATORS: make sure this matches "HEAD
+#. detached at " in wt-status.c
+#.
+#: ref-filter.c:1467
+#, c-format
+msgid "(HEAD detached at %s)"
msgstr ""
-#: wt-status.c:1610
-msgid "interactive rebase in progress; onto "
+#. TRANSLATORS: make sure this matches "HEAD
+#. detached from " in wt-status.c
+#.
+#: ref-filter.c:1474
+#, c-format
+msgid "(HEAD detached from %s)"
msgstr ""
-#: wt-status.c:1612
-msgid "rebase in progress; onto "
+#: ref-filter.c:1478
+msgid "(no branch)"
msgstr ""
-#: wt-status.c:1617
-msgid "HEAD detached at "
+#: ref-filter.c:1512 ref-filter.c:1669
+#, c-format
+msgid "missing object %s for %s"
msgstr ""
-#: wt-status.c:1619
-msgid "HEAD detached from "
+#: ref-filter.c:1522
+#, c-format
+msgid "parse_object_buffer failed on %s for %s"
msgstr ""
-#: wt-status.c:1622
-msgid "Not currently on any branch."
+#: ref-filter.c:1888
+#, c-format
+msgid "malformed object at '%s'"
msgstr ""
-#: wt-status.c:1642
-msgid "Initial commit"
+#: ref-filter.c:1977
+#, c-format
+msgid "ignoring ref with broken name %s"
msgstr ""
-#: wt-status.c:1643
-msgid "No commits yet"
+#: ref-filter.c:2263
+#, c-format
+msgid "format: %%(end) atom missing"
msgstr ""
-#: wt-status.c:1657
-msgid "Untracked files"
+#: ref-filter.c:2363
+#, c-format
+msgid "option `%s' is incompatible with --merged"
msgstr ""
-#: wt-status.c:1659
-msgid "Ignored files"
+#: ref-filter.c:2366
+#, c-format
+msgid "option `%s' is incompatible with --no-merged"
msgstr ""
-#: wt-status.c:1663
+#: ref-filter.c:2376
#, 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 "malformed object name %s"
msgstr ""
-#: wt-status.c:1669
+#: ref-filter.c:2381
#, c-format
-msgid "Untracked files not listed%s"
+msgid "option `%s' must point to a commit"
msgstr ""
-#: wt-status.c:1671
-msgid " (use -u option to show untracked files)"
+#: remote.c:363
+#, c-format
+msgid "config remote shorthand cannot begin with '/': %s"
msgstr ""
-#: wt-status.c:1677
-msgid "No changes"
+#: remote.c:410
+msgid "more than one receivepack given, using the first"
msgstr ""
-#: wt-status.c:1682
-#, c-format
-msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
+#: remote.c:418
+msgid "more than one uploadpack given, using the first"
msgstr ""
-#: wt-status.c:1685
+#: remote.c:608
#, c-format
-msgid "no changes added to commit\n"
+msgid "Cannot fetch both %s and %s to %s"
msgstr ""
-#: wt-status.c:1688
+#: remote.c:612
#, c-format
-msgid ""
-"nothing added to commit but untracked files present (use \"git add\" to "
-"track)\n"
+msgid "%s usually tracks %s, not %s"
msgstr ""
-#: wt-status.c:1691
+#: remote.c:616
#, c-format
-msgid "nothing added to commit but untracked files present\n"
+msgid "%s tracks both %s and %s"
msgstr ""
-#: wt-status.c:1694
+#: remote.c:684
#, c-format
-msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
+msgid "key '%s' of pattern had no '*'"
msgstr ""
-#: wt-status.c:1697 wt-status.c:1702
+#: remote.c:694
#, c-format
-msgid "nothing to commit\n"
+msgid "value '%s' of pattern has no '*'"
msgstr ""
-#: wt-status.c:1700
+#: remote.c:1000
#, c-format
-msgid "nothing to commit (use -u to show untracked files)\n"
+msgid "src refspec %s does not match any"
msgstr ""
-#: wt-status.c:1704
+#: remote.c:1005
#, c-format
-msgid "nothing to commit, working tree clean\n"
+msgid "src refspec %s matches more than one"
msgstr ""
-#: wt-status.c:1817
-msgid "No commits yet on "
+#. 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 ""
-#: wt-status.c:1821
-msgid "HEAD (no branch)"
+#: 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 ""
-#: wt-status.c:1852
-msgid "different"
+#: 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 ""
-#: wt-status.c:1854 wt-status.c:1862
-msgid "behind "
+#: 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 ""
-#: wt-status.c:1857 wt-status.c:1860
-msgid "ahead "
+#: 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 ""
-#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2366
+#: remote.c:1091
#, c-format
-msgid "cannot %s: You have unstaged changes."
+msgid "%s cannot be resolved to branch"
msgstr ""
-#: wt-status.c:2372
-msgid "additionally, your index contains uncommitted changes."
+#: remote.c:1102
+#, c-format
+msgid "unable to delete '%s': remote ref does not exist"
msgstr ""
-#: wt-status.c:2374
+#: remote.c:1114
#, c-format
-msgid "cannot %s: Your index contains uncommitted changes."
+msgid "dst refspec %s matches more than one"
msgstr ""
-#: compat/precompose_utf8.c:58 builtin/clone.c:442
+#: remote.c:1121
#, c-format
-msgid "failed to unlink '%s'"
+msgid "dst ref %s receives from more than one src"
msgstr ""
-#: builtin/add.c:24
-msgid "git add [<options>] [--] <pathspec>..."
+#: remote.c:1624 remote.c:1725
+msgid "HEAD does not point to a branch"
msgstr ""
-#: builtin/add.c:83
+#: remote.c:1633
#, c-format
-msgid "unexpected diff status %c"
+msgid "no such branch: '%s'"
msgstr ""
-#: builtin/add.c:88 builtin/commit.c:266
-msgid "updating files failed"
+#: remote.c:1636
+#, c-format
+msgid "no upstream configured for branch '%s'"
msgstr ""
-#: builtin/add.c:98
+#: remote.c:1642
#, c-format
-msgid "remove '%s'\n"
+msgid "upstream branch '%s' not stored as a remote-tracking branch"
msgstr ""
-#: builtin/add.c:173
-msgid "Unstaged changes after refreshing the index:"
+#: remote.c:1657
+#, c-format
+msgid "push destination '%s' on remote '%s' has no local tracking branch"
msgstr ""
-#: builtin/add.c:233 builtin/rev-parse.c:892
-msgid "Could not read the index"
+#: remote.c:1669
+#, c-format
+msgid "branch '%s' has no remote for pushing"
msgstr ""
-#: builtin/add.c:244
+#: remote.c:1679
#, c-format
-msgid "Could not open '%s' for writing."
+msgid "push refspecs for '%s' do not include '%s'"
msgstr ""
-#: builtin/add.c:248
-msgid "Could not write patch"
+#: remote.c:1692
+msgid "push has no destination (push.default is 'nothing')"
msgstr ""
-#: builtin/add.c:251
-msgid "editing patch failed"
+#: remote.c:1714
+msgid "cannot resolve 'simple' push to a single destination"
msgstr ""
-#: builtin/add.c:254
+#: remote.c:1840
#, c-format
-msgid "Could not stat '%s'"
-msgstr ""
-
-#: builtin/add.c:256
-msgid "Empty patch. Aborted."
+msgid "couldn't find remote ref %s"
msgstr ""
-#: builtin/add.c:261
+#: remote.c:1853
#, c-format
-msgid "Could not apply '%s'"
+msgid "* Ignoring funny ref '%s' locally"
msgstr ""
-#: builtin/add.c:269
-msgid "The following paths are ignored by one of your .gitignore files:\n"
+#: remote.c:2016
+#, c-format
+msgid "Your branch is based on '%s', but the upstream is gone.\n"
msgstr ""
-#: builtin/add.c:289 builtin/clean.c:911 builtin/fetch.c:145 builtin/mv.c:123
-#: builtin/prune-packed.c:55 builtin/pull.c:212 builtin/push.c:557
-#: builtin/remote.c:1342 builtin/rm.c:240 builtin/send-pack.c:165
-msgid "dry run"
+#: remote.c:2020
+msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr ""
-#: builtin/add.c:292
-msgid "interactive picking"
+#: remote.c:2023
+#, c-format
+msgid "Your branch is up to date with '%s'.\n"
msgstr ""
-#: builtin/add.c:293 builtin/checkout.c:1135 builtin/reset.c:302
-msgid "select hunks interactively"
+#: remote.c:2027
+#, c-format
+msgid "Your branch and '%s' refer to different commits.\n"
msgstr ""
-#: builtin/add.c:294
-msgid "edit current diff and apply"
+#: remote.c:2030
+#, c-format
+msgid " (use \"%s\" for details)\n"
msgstr ""
-#: builtin/add.c:295
-msgid "allow adding otherwise ignored files"
-msgstr ""
+#: remote.c:2034
+#, 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] ""
-#: builtin/add.c:296
-msgid "update tracked files"
+#: remote.c:2040
+msgid " (use \"git push\" to publish your local commits)\n"
msgstr ""
-#: builtin/add.c:297
-msgid "renormalize EOL of tracked files (implies -u)"
-msgstr ""
+#: remote.c:2043
+#, 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] ""
-#: builtin/add.c:298
-msgid "record only the fact that the path will be added later"
+#: remote.c:2051
+msgid " (use \"git pull\" to update your local branch)\n"
msgstr ""
-#: builtin/add.c:299
-msgid "add changes from all tracked and untracked files"
-msgstr ""
+#: remote.c:2054
+#, c-format
+msgid ""
+"Your branch and '%s' have diverged,\n"
+"and have %d and %d different commit each, respectively.\n"
+msgid_plural ""
+"Your branch and '%s' have diverged,\n"
+"and have %d and %d different commits each, respectively.\n"
+msgstr[0] ""
+msgstr[1] ""
-#: builtin/add.c:302
-msgid "ignore paths removed in the working tree (same as --no-all)"
+#: remote.c:2064
+msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr ""
-#: builtin/add.c:304
-msgid "don't add, only refresh the index"
+#: remote.c:2247
+#, c-format
+msgid "cannot parse expected object name '%s'"
msgstr ""
-#: builtin/add.c:305
-msgid "just skip files which cannot be added because of errors"
+#: replace-object.c:21
+#, c-format
+msgid "bad replace ref name: %s"
msgstr ""
-#: builtin/add.c:306
-msgid "check if - even missing - files are ignored in dry run"
+#: replace-object.c:30
+#, c-format
+msgid "duplicate replace ref: %s"
msgstr ""
-#: builtin/add.c:307 builtin/update-index.c:974
-msgid "(+/-)x"
+#: replace-object.c:73
+#, c-format
+msgid "replace depth too high for object %s"
msgstr ""
-#: builtin/add.c:307 builtin/update-index.c:975
-msgid "override the executable bit of the listed files"
+#: rerere.c:217 rerere.c:226 rerere.c:229
+msgid "corrupt MERGE_RR"
msgstr ""
-#: builtin/add.c:309
-msgid "warn when adding an embedded repository"
+#: rerere.c:264 rerere.c:269
+msgid "unable to write rerere record"
msgstr ""
-#: builtin/add.c:324
+#: rerere.c:495
#, 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 "there were errors while writing '%s' (%s)"
msgstr ""
-#: builtin/add.c:352
+#: rerere.c:498
#, c-format
-msgid "adding embedded git repository: %s"
+msgid "failed to flush '%s'"
msgstr ""
-#: builtin/add.c:370
+#: rerere.c:503 rerere.c:1039
#, c-format
-msgid "Use -f if you really want to add them.\n"
-msgstr ""
-
-#: builtin/add.c:378
-msgid "adding files failed"
-msgstr ""
-
-#: builtin/add.c:416
-msgid "-A and -u are mutually incompatible"
-msgstr ""
-
-#: builtin/add.c:423
-msgid "Option --ignore-missing can only be used together with --dry-run"
+msgid "could not parse conflict hunks in '%s'"
msgstr ""
-#: builtin/add.c:427
+#: rerere.c:684
#, c-format
-msgid "--chmod param '%s' must be either -x or +x"
+msgid "failed utime() on '%s'"
msgstr ""
-#: builtin/add.c:442
+#: rerere.c:694
#, c-format
-msgid "Nothing specified, nothing added.\n"
+msgid "writing '%s' failed"
msgstr ""
-#: builtin/add.c:443
+#: rerere.c:714
#, c-format
-msgid "Maybe you wanted to say 'git add .'?\n"
+msgid "Staged '%s' using previous resolution."
msgstr ""
-#: builtin/add.c:448 builtin/check-ignore.c:177 builtin/checkout.c:280
-#: builtin/checkout.c:483 builtin/clean.c:958 builtin/commit.c:325
-#: builtin/diff-tree.c:114 builtin/mv.c:144 builtin/reset.c:241
-#: builtin/rm.c:270 builtin/submodule--helper.c:328
-msgid "index file corrupt"
+#: rerere.c:753
+#, c-format
+msgid "Recorded resolution for '%s'."
msgstr ""
-#: builtin/am.c:414
-msgid "could not parse author script"
+#: rerere.c:788
+#, c-format
+msgid "Resolved '%s' using previous resolution."
msgstr ""
-#: builtin/am.c:498
+#: rerere.c:803
#, c-format
-msgid "'%s' was deleted by the applypatch-msg hook"
+msgid "cannot unlink stray '%s'"
msgstr ""
-#: builtin/am.c:539
+#: rerere.c:807
#, c-format
-msgid "Malformed input line: '%s'."
+msgid "Recorded preimage for '%s'"
msgstr ""
-#: builtin/am.c:576
+#: rerere.c:881 submodule.c:2024 builtin/log.c:1750
+#: builtin/submodule--helper.c:1417 builtin/submodule--helper.c:1427
#, c-format
-msgid "Failed to copy notes from '%s' to '%s'"
+msgid "could not create directory '%s'"
msgstr ""
-#: builtin/am.c:602
-msgid "fseek failed"
+#: rerere.c:1057
+#, c-format
+msgid "failed to update conflicted state in '%s'"
msgstr ""
-#: builtin/am.c:790
+#: rerere.c:1068 rerere.c:1075
#, c-format
-msgid "could not parse patch '%s'"
+msgid "no remembered resolution for '%s'"
msgstr ""
-#: builtin/am.c:855
-msgid "Only one StGIT patch series can be applied at once"
+#: rerere.c:1077
+#, c-format
+msgid "cannot unlink '%s'"
msgstr ""
-#: builtin/am.c:903
-msgid "invalid timestamp"
+#: rerere.c:1087
+#, c-format
+msgid "Updated preimage for '%s'"
msgstr ""
-#: builtin/am.c:908 builtin/am.c:920
-msgid "invalid Date line"
+#: rerere.c:1096
+#, c-format
+msgid "Forgot resolution for '%s'\n"
msgstr ""
-#: builtin/am.c:915
-msgid "invalid timezone offset"
+#: rerere.c:1199
+msgid "unable to open rr-cache directory"
msgstr ""
-#: builtin/am.c:1008
-msgid "Patch format detection failed."
+#: revision.c:2476
+msgid "your current branch appears to be broken"
msgstr ""
-#: builtin/am.c:1013 builtin/clone.c:407
+#: revision.c:2479
#, c-format
-msgid "failed to create directory '%s'"
+msgid "your current branch '%s' does not have any commits yet"
msgstr ""
-#: builtin/am.c:1018
-msgid "Failed to split patches."
+#: revision.c:2679
+msgid "--first-parent is incompatible with --bisect"
msgstr ""
-#: builtin/am.c:1148 builtin/commit.c:351
-msgid "unable to write index file"
+#: revision.c:2683
+msgid "-L does not yet support diff formats besides -p and -s"
msgstr ""
-#: builtin/am.c:1162
-#, c-format
-msgid "When you have resolved this problem, run \"%s --continue\"."
+#: run-command.c:763
+msgid "open /dev/null failed"
msgstr ""
-#: builtin/am.c:1163
+#: run-command.c:1269
#, c-format
-msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
+msgid "cannot create async thread: %s"
msgstr ""
-#: builtin/am.c:1164
+#: run-command.c:1333
#, c-format
-msgid "To restore the original branch and stop patching, run \"%s --abort\"."
+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/am.c:1271
-msgid "Patch is empty."
+#: send-pack.c:141
+msgid "unexpected flush packet while reading remote unpack status"
msgstr ""
-#: builtin/am.c:1337
+#: send-pack.c:143
#, c-format
-msgid "invalid ident line: %.*s"
+msgid "unable to parse remote unpack status: %s"
msgstr ""
-#: builtin/am.c:1359
+#: send-pack.c:145
#, c-format
-msgid "unable to parse commit %s"
+msgid "remote unpack failed: %s"
msgstr ""
-#: builtin/am.c:1554
-msgid "Repository lacks necessary blobs to fall back on 3-way merge."
+#: send-pack.c:306
+msgid "failed to sign the push certificate"
msgstr ""
-#: builtin/am.c:1556
-msgid "Using index info to reconstruct a base tree..."
+#: send-pack.c:420
+msgid "the receiving end does not support --signed push"
msgstr ""
-#: builtin/am.c:1575
+#: send-pack.c:422
msgid ""
-"Did you hand edit your patch?\n"
-"It does not apply to blobs recorded in its index."
+"not sending a push certificate since the receiving end does not support --"
+"signed push"
msgstr ""
-#: builtin/am.c:1581
-msgid "Falling back to patching base and 3-way merge..."
+#: send-pack.c:434
+msgid "the receiving end does not support --atomic push"
msgstr ""
-#: builtin/am.c:1606
-msgid "Failed to merge in the changes."
+#: send-pack.c:439
+msgid "the receiving end does not support push options"
msgstr ""
-#: builtin/am.c:1637
-msgid "applying to an empty history"
+#: sequencer.c:187
+#, c-format
+msgid "invalid commit message cleanup mode '%s'"
msgstr ""
-#: builtin/am.c:1683 builtin/am.c:1687
+#: sequencer.c:292
#, c-format
-msgid "cannot resume: %s does not exist."
+msgid "could not delete '%s'"
msgstr ""
-#: builtin/am.c:1703
-msgid "cannot be interactive without stdin connected to a terminal."
+#: sequencer.c:318
+msgid "revert"
msgstr ""
-#: builtin/am.c:1708
-msgid "Commit Body is:"
+#: sequencer.c:320
+msgid "cherry-pick"
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:1718
-msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
+#: sequencer.c:322
+msgid "rebase -i"
msgstr ""
-#: builtin/am.c:1768
+#: sequencer.c:324
#, c-format
-msgid "Dirty index: cannot apply patches (dirty: %s)"
+msgid "unknown action: %d"
msgstr ""
-#: builtin/am.c:1808 builtin/am.c:1879
-#, c-format
-msgid "Applying: %.*s"
+#: sequencer.c:382
+msgid ""
+"after resolving the conflicts, mark the corrected paths\n"
+"with 'git add <paths>' or 'git rm <paths>'"
msgstr ""
-#: builtin/am.c:1824
-msgid "No changes -- Patch already applied."
+#: 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/am.c:1832
+#: sequencer.c:398 sequencer.c:2801
#, c-format
-msgid "Patch failed at %s %.*s"
+msgid "could not lock '%s'"
msgstr ""
-#: builtin/am.c:1838
-msgid "Use 'git am --show-current-patch' to see the failed patch"
+#: sequencer.c:405
+#, c-format
+msgid "could not write eol to '%s'"
msgstr ""
-#: builtin/am.c:1882
-msgid ""
-"No changes - did you forget to use 'git add'?\n"
-"If there is nothing left to stage, chances are that something else\n"
-"already introduced the same changes; you might want to skip this patch."
+#: sequencer.c:410 sequencer.c:2684 sequencer.c:2807 sequencer.c:2821
+#: sequencer.c:3084
+#, c-format
+msgid "failed to finalize '%s'"
msgstr ""
-#: builtin/am.c:1889
-msgid ""
-"You still have unmerged paths in your index.\n"
-"You should 'git add' each file with resolved conflicts to mark them as "
-"such.\n"
-"You might run `git rm` on a file to accept \"deleted by them\" for it."
+#: 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 "could not read '%s'"
msgstr ""
-#: builtin/am.c:1996 builtin/am.c:2000 builtin/am.c:2012 builtin/reset.c:324
-#: builtin/reset.c:332
+#: sequencer.c:459
#, c-format
-msgid "Could not parse object '%s'."
+msgid "your local changes would be overwritten by %s."
msgstr ""
-#: builtin/am.c:2048
-msgid "failed to clean index"
+#: sequencer.c:463
+msgid "commit your changes or stash them to proceed."
msgstr ""
-#: builtin/am.c:2083
-msgid ""
-"You seem to have moved HEAD since the last 'am' failure.\n"
-"Not rewinding to ORIG_HEAD"
+#: sequencer.c:495
+#, c-format
+msgid "%s: fast-forward"
msgstr ""
-#: builtin/am.c:2174
+#: sequencer.c:534 builtin/tag.c:555
#, c-format
-msgid "Invalid value for --patch-format: %s"
+msgid "Invalid cleanup mode %s"
msgstr ""
-#: builtin/am.c:2210
-msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
+#. TRANSLATORS: %s will be "revert", "cherry-pick" or
+#. "rebase -i".
+#.
+#: sequencer.c:629
+#, c-format
+msgid "%s: Unable to write new index file"
msgstr ""
-#: builtin/am.c:2211
-msgid "git am [<options>] (--continue | --skip | --abort)"
+#: sequencer.c:646
+msgid "unable to update cache tree"
msgstr ""
-#: builtin/am.c:2217
-msgid "run interactively"
+#: sequencer.c:660
+msgid "could not resolve HEAD commit"
msgstr ""
-#: builtin/am.c:2219
-msgid "historical option -- no-op"
+#: sequencer.c:740
+#, c-format
+msgid "no key present in '%.*s'"
msgstr ""
-#: builtin/am.c:2221
-msgid "allow fall back on 3way merging if needed"
+#: sequencer.c:751
+#, c-format
+msgid "unable to dequote value of '%s'"
msgstr ""
-#: builtin/am.c:2222 builtin/init-db.c:484 builtin/prune-packed.c:57
-#: builtin/repack.c:192
-msgid "be quiet"
+#: 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 ""
-#: builtin/am.c:2224
-msgid "add a Signed-off-by line to the commit message"
+#: sequencer.c:798
+msgid "'GIT_AUTHOR_NAME' already given"
msgstr ""
-#: builtin/am.c:2227
-msgid "recode into utf8 (default)"
+#: sequencer.c:803
+msgid "'GIT_AUTHOR_EMAIL' already given"
msgstr ""
-#: builtin/am.c:2229
-msgid "pass -k flag to git-mailinfo"
+#: sequencer.c:808
+msgid "'GIT_AUTHOR_DATE' already given"
msgstr ""
-#: builtin/am.c:2231
-msgid "pass -b flag to git-mailinfo"
+#: sequencer.c:812
+#, c-format
+msgid "unknown variable '%s'"
msgstr ""
-#: builtin/am.c:2233
-msgid "pass -m flag to git-mailinfo"
+#: sequencer.c:817
+msgid "missing 'GIT_AUTHOR_NAME'"
msgstr ""
-#: builtin/am.c:2235
-msgid "pass --keep-cr flag to git-mailsplit for mbox format"
+#: sequencer.c:819
+msgid "missing 'GIT_AUTHOR_EMAIL'"
msgstr ""
-#: builtin/am.c:2238
-msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
+#: sequencer.c:821
+msgid "missing 'GIT_AUTHOR_DATE'"
msgstr ""
-#: builtin/am.c:2241
-msgid "strip everything before a scissors line"
+#: sequencer.c:881
+#, c-format
+msgid "invalid date format '%s' in '%s'"
msgstr ""
-#: builtin/am.c:2243 builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252
-#: builtin/am.c:2255 builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264
-#: builtin/am.c:2270
-msgid "pass it through git-apply"
+#: 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"
+" 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/am.c:2260 builtin/commit.c:1332 builtin/fmt-merge-msg.c:665
-#: builtin/fmt-merge-msg.c:668 builtin/grep.c:853 builtin/merge.c:208
-#: builtin/pull.c:150 builtin/pull.c:208 builtin/repack.c:201
-#: builtin/repack.c:205 builtin/repack.c:207 builtin/show-branch.c:631
-#: builtin/show-ref.c:169 builtin/tag.c:383 parse-options.h:144
-#: parse-options.h:146 parse-options.h:258
-msgid "n"
+#: sequencer.c:992
+msgid "writing root commit"
msgstr ""
-#: builtin/am.c:2266 builtin/branch.c:632 builtin/for-each-ref.c:38
-#: builtin/replace.c:543 builtin/tag.c:419 builtin/verify-tag.c:39
-msgid "format"
+#: sequencer.c:1213
+msgid "'prepare-commit-msg' hook failed"
msgstr ""
-#: builtin/am.c:2267
-msgid "format the patch(es) are in"
+#: sequencer.c:1220
+msgid ""
+"Your name and email address were configured automatically based\n"
+"on your username and hostname. Please check that they are accurate.\n"
+"You can suppress this message by setting them explicitly. Run the\n"
+"following command and follow the instructions in your editor to edit\n"
+"your configuration file:\n"
+"\n"
+" git config --global --edit\n"
+"\n"
+"After doing this, you may fix the identity used for this commit with:\n"
+"\n"
+" git commit --amend --reset-author\n"
msgstr ""
-#: builtin/am.c:2273
-msgid "override error message when patch failure occurs"
+#: sequencer.c:1233
+msgid ""
+"Your name and email address were configured automatically based\n"
+"on your username and hostname. Please check that they are accurate.\n"
+"You can suppress this message by setting them explicitly:\n"
+"\n"
+" git config --global user.name \"Your Name\"\n"
+" git config --global user.email you@example.com\n"
+"\n"
+"After doing this, you may fix the identity used for this commit with:\n"
+"\n"
+" git commit --amend --reset-author\n"
msgstr ""
-#: builtin/am.c:2275
-msgid "continue applying patches after resolving a conflict"
+#: sequencer.c:1275
+msgid "couldn't look up newly created commit"
msgstr ""
-#: builtin/am.c:2278
-msgid "synonyms for --continue"
+#: sequencer.c:1277
+msgid "could not parse newly created commit"
msgstr ""
-#: builtin/am.c:2281
-msgid "skip the current patch"
+#: sequencer.c:1323
+msgid "unable to resolve HEAD after creating commit"
msgstr ""
-#: builtin/am.c:2284
-msgid "restore the original branch and abort the patching operation."
+#: sequencer.c:1325
+msgid "detached HEAD"
msgstr ""
-#: builtin/am.c:2287
-msgid "abort the patching operation but keep HEAD where it is."
+#: sequencer.c:1329
+msgid " (root-commit)"
msgstr ""
-#: builtin/am.c:2290
-msgid "show the patch being applied."
+#: sequencer.c:1350
+msgid "could not parse HEAD"
msgstr ""
-#: builtin/am.c:2294
-msgid "lie about committer date"
+#: sequencer.c:1352
+#, c-format
+msgid "HEAD %s is not a commit!"
msgstr ""
-#: builtin/am.c:2296
-msgid "use current timestamp for author date"
+#: sequencer.c:1356 builtin/commit.c:1551
+msgid "could not parse HEAD commit"
msgstr ""
-#: builtin/am.c:2298 builtin/commit.c:1468 builtin/merge.c:239
-#: builtin/pull.c:183 builtin/revert.c:112 builtin/tag.c:399
-msgid "key-id"
+#: sequencer.c:1408 sequencer.c:2001
+msgid "unable to parse commit author"
msgstr ""
-#: builtin/am.c:2299
-msgid "GPG-sign commits"
+#: sequencer.c:1418 builtin/am.c:1572 builtin/merge.c:688
+msgid "git write-tree failed to write a tree"
msgstr ""
-#: builtin/am.c:2302
-msgid "(internal use for git-rebase)"
+#: sequencer.c:1435 sequencer.c:1496
+#, c-format
+msgid "unable to read commit message from '%s'"
msgstr ""
-#: builtin/am.c:2320
-msgid ""
-"The -b/--binary option has been a no-op for long time, and\n"
-"it will be removed. Please do not use it anymore."
+#: 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/am.c:2327
-msgid "failed to read the index"
+#: sequencer.c:1523
+#, c-format
+msgid "could not parse commit %s"
msgstr ""
-#: builtin/am.c:2342
+#: sequencer.c:1528
#, c-format
-msgid "previous rebase directory %s still exists but mbox given."
+msgid "could not parse parent commit %s"
msgstr ""
-#: builtin/am.c:2366
+#: sequencer.c:1602 sequencer.c:1712
#, c-format
-msgid ""
-"Stray %s directory found.\n"
-"Use \"git am --abort\" to remove it."
+msgid "unknown command: %d"
msgstr ""
-#: builtin/am.c:2372
-msgid "Resolve operation not in progress, we are not resuming."
+#: sequencer.c:1659 sequencer.c:1684
+#, c-format
+msgid "This is a combination of %d commits."
msgstr ""
-#: builtin/apply.c:8
-msgid "git apply [<options>] [<patch>...]"
+#: sequencer.c:1669
+msgid "need a HEAD to fixup"
msgstr ""
-#: builtin/archive.c:17
-#, c-format
-msgid "could not create archive file '%s'"
+#: sequencer.c:1671 sequencer.c:3111
+msgid "could not read HEAD"
msgstr ""
-#: builtin/archive.c:20
-msgid "could not redirect output"
+#: sequencer.c:1673
+msgid "could not read HEAD's commit message"
msgstr ""
-#: builtin/archive.c:37
-msgid "git archive: Remote with no URL"
+#: sequencer.c:1679
+#, c-format
+msgid "cannot write '%s'"
msgstr ""
-#: builtin/archive.c:58
-msgid "git archive: expected ACK/NAK, got a flush packet"
+#: sequencer.c:1686 git-rebase--preserve-merges.sh:441
+msgid "This is the 1st commit message:"
msgstr ""
-#: builtin/archive.c:61
+#: sequencer.c:1694
#, c-format
-msgid "git archive: NACK %s"
-msgstr ""
-
-#: builtin/archive.c:64
-msgid "git archive: protocol error"
+msgid "could not read commit message of %s"
msgstr ""
-#: builtin/archive.c:68
-msgid "git archive: expected a flush"
+#: sequencer.c:1701
+#, c-format
+msgid "This is the commit message #%d:"
msgstr ""
-#: builtin/bisect--helper.c:12
-msgid "git bisect--helper --next-all [--no-checkout]"
+#: sequencer.c:1707
+#, c-format
+msgid "The commit message #%d will be skipped:"
msgstr ""
-#: builtin/bisect--helper.c:13
-msgid "git bisect--helper --write-terms <bad_term> <good_term>"
+#: sequencer.c:1795
+msgid "your index file is unmerged."
msgstr ""
-#: builtin/bisect--helper.c:14
-msgid "git bisect--helper --bisect-clean-state"
+#: sequencer.c:1802
+msgid "cannot fixup root commit"
msgstr ""
-#: builtin/bisect--helper.c:46
+#: sequencer.c:1821
#, c-format
-msgid "'%s' is not a valid term"
+msgid "commit %s is a merge but no -m option was given."
msgstr ""
-#: builtin/bisect--helper.c:50
+#: sequencer.c:1829 sequencer.c:1837
#, c-format
-msgid "can't use the builtin command '%s' as a term"
+msgid "commit %s does not have parent %d"
msgstr ""
-#: builtin/bisect--helper.c:60
+#: sequencer.c:1843
#, c-format
-msgid "can't change the meaning of the term '%s'"
+msgid "cannot get commit message for %s"
msgstr ""
-#: builtin/bisect--helper.c:71
-msgid "please use two different terms"
+#. 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/bisect--helper.c:78
-msgid "could not open the file BISECT_TERMS"
+#: sequencer.c:1927
+#, c-format
+msgid "could not rename '%s' to '%s'"
msgstr ""
-#: builtin/bisect--helper.c:120
-msgid "perform 'git bisect next'"
+#: sequencer.c:1982
+#, c-format
+msgid "could not revert %s... %s"
msgstr ""
-#: builtin/bisect--helper.c:122
-msgid "write the terms to .git/BISECT_TERMS"
+#: sequencer.c:1983
+#, c-format
+msgid "could not apply %s... %s"
msgstr ""
-#: builtin/bisect--helper.c:124
-msgid "cleanup the bisection state"
+#: sequencer.c:2042
+#, c-format
+msgid "git %s: failed to read the index"
msgstr ""
-#: builtin/bisect--helper.c:126
-msgid "check for expected revs"
+#: sequencer.c:2049
+#, c-format
+msgid "git %s: failed to refresh the index"
msgstr ""
-#: builtin/bisect--helper.c:128
-msgid "update BISECT_HEAD instead of checking out the current commit"
+#: sequencer.c:2118
+#, c-format
+msgid "%s does not accept arguments: '%s'"
msgstr ""
-#: builtin/bisect--helper.c:143
-msgid "--write-terms requires two arguments"
+#: sequencer.c:2127
+#, c-format
+msgid "missing arguments for %s"
msgstr ""
-#: builtin/bisect--helper.c:147
-msgid "--bisect-clean-state requires no arguments"
+#: sequencer.c:2164
+#, c-format
+msgid "could not parse '%.*s'"
msgstr ""
-#: builtin/blame.c:29
-msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
+#: sequencer.c:2226
+#, c-format
+msgid "invalid line %d: %.*s"
msgstr ""
-#: builtin/blame.c:34
-msgid "<rev-opts> are documented in git-rev-list(1)"
+#: sequencer.c:2237
+#, c-format
+msgid "cannot '%s' without a previous commit"
msgstr ""
-#: builtin/blame.c:404
+#: sequencer.c:2285 builtin/rebase.c:153 builtin/rebase.c:178
+#: builtin/rebase.c:204 builtin/rebase.c:229
#, c-format
-msgid "expecting a color: %s"
+msgid "could not read '%s'."
msgstr ""
-#: builtin/blame.c:411
-msgid "must end with a color"
+#: sequencer.c:2360
+msgid "please fix this using 'git rebase --edit-todo'."
msgstr ""
-#: builtin/blame.c:697
+#: sequencer.c:2362
#, c-format
-msgid "invalid color '%s' in color.blame.repeatedLines"
+msgid "unusable instruction sheet: '%s'"
msgstr ""
-#: builtin/blame.c:715
-msgid "invalid value for blame.coloring"
+#: sequencer.c:2367
+msgid "no commits parsed."
msgstr ""
-#: builtin/blame.c:786
-msgid "Show blame entries as we find them, incrementally"
+#: sequencer.c:2378
+msgid "cannot cherry-pick during a revert."
msgstr ""
-#: builtin/blame.c:787
-msgid "Show blank SHA-1 for boundary commits (Default: off)"
+#: sequencer.c:2380
+msgid "cannot revert during a cherry-pick."
msgstr ""
-#: builtin/blame.c:788
-msgid "Do not treat root commits as boundaries (Default: off)"
+#: sequencer.c:2462
+#, c-format
+msgid "invalid value for %s: %s"
msgstr ""
-#: builtin/blame.c:789
-msgid "Show work cost statistics"
+#: sequencer.c:2549
+msgid "unusable squash-onto"
msgstr ""
-#: builtin/blame.c:790
-msgid "Force progress reporting"
+#: sequencer.c:2565
+#, c-format
+msgid "malformed options sheet: '%s'"
msgstr ""
-#: builtin/blame.c:791
-msgid "Show output score for blame entries"
+#: sequencer.c:2648 sequencer.c:4227
+msgid "empty commit set passed"
msgstr ""
-#: builtin/blame.c:792
-msgid "Show original filename (Default: auto)"
+#: sequencer.c:2656
+msgid "a cherry-pick or revert is already in progress"
msgstr ""
-#: builtin/blame.c:793
-msgid "Show original linenumber (Default: off)"
+#: sequencer.c:2657
+msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
msgstr ""
-#: builtin/blame.c:794
-msgid "Show in a format designed for machine consumption"
+#: sequencer.c:2660
+#, c-format
+msgid "could not create sequencer directory '%s'"
msgstr ""
-#: builtin/blame.c:795
-msgid "Show porcelain format with per-line commit information"
+#: sequencer.c:2674
+msgid "could not lock HEAD"
msgstr ""
-#: builtin/blame.c:796
-msgid "Use the same output mode as git-annotate (Default: off)"
+#: sequencer.c:2729 sequencer.c:3979
+msgid "no cherry-pick or revert in progress"
msgstr ""
-#: builtin/blame.c:797
-msgid "Show raw timestamp (Default: off)"
+#: sequencer.c:2731
+msgid "cannot resolve HEAD"
msgstr ""
-#: builtin/blame.c:798
-msgid "Show long commit SHA1 (Default: off)"
+#: sequencer.c:2733 sequencer.c:2768
+msgid "cannot abort from a branch yet to be born"
msgstr ""
-#: builtin/blame.c:799
-msgid "Suppress author name and timestamp (Default: off)"
+#: sequencer.c:2754 builtin/grep.c:732
+#, c-format
+msgid "cannot open '%s'"
msgstr ""
-#: builtin/blame.c:800
-msgid "Show author email instead of name (Default: off)"
+#: sequencer.c:2756
+#, c-format
+msgid "cannot read '%s': %s"
msgstr ""
-#: builtin/blame.c:801
-msgid "Ignore whitespace differences"
+#: sequencer.c:2757
+msgid "unexpected end of file"
msgstr ""
-#: builtin/blame.c:802
-msgid "color redundant metadata from previous line differently"
+#: sequencer.c:2763
+#, c-format
+msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr ""
-#: builtin/blame.c:803
-msgid "color lines by age"
+#: sequencer.c:2774
+msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr ""
-#: builtin/blame.c:810
-msgid "Use an experimental heuristic to improve diffs"
+#: sequencer.c:2903 sequencer.c:3894
+#, c-format
+msgid "could not update %s"
msgstr ""
-#: builtin/blame.c:812
-msgid "Spend extra cycles to find better match"
+#: sequencer.c:2941 sequencer.c:3874
+msgid "cannot read HEAD"
msgstr ""
-#: builtin/blame.c:813
-msgid "Use revisions from <file> instead of calling git-rev-list"
+#: sequencer.c:2958
+#, c-format
+msgid "unable to copy '%s' to '%s'"
msgstr ""
-#: builtin/blame.c:814
-msgid "Use <file>'s contents as the final image"
+#: sequencer.c:2966
+#, c-format
+msgid ""
+"You can amend the commit now, with\n"
+"\n"
+" git commit --amend %s\n"
+"\n"
+"Once you are satisfied with your changes, run\n"
+"\n"
+" git rebase --continue\n"
msgstr ""
-#: builtin/blame.c:815 builtin/blame.c:816
-msgid "score"
+#: sequencer.c:2976
+#, c-format
+msgid "Could not apply %s... %.*s"
msgstr ""
-#: builtin/blame.c:815
-msgid "Find line copies within and across files"
+#: sequencer.c:2983
+#, c-format
+msgid "Could not merge %.*s"
msgstr ""
-#: builtin/blame.c:816
-msgid "Find line movements within and across files"
+#: sequencer.c:2997 sequencer.c:3001 builtin/difftool.c:633
+#, c-format
+msgid "could not copy '%s' to '%s'"
msgstr ""
-#: builtin/blame.c:817
-msgid "n,m"
+#: 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/blame.c:817
-msgid "Process only line range n,m, counting from 1"
+#: sequencer.c:3028
+#, c-format
+msgid ""
+"execution failed: %s\n"
+"%sYou can fix the problem, and then run\n"
+"\n"
+" git rebase --continue\n"
+"\n"
msgstr ""
-#: builtin/blame.c:866
-msgid "--progress can't be used with --incremental or porcelain formats"
+#: sequencer.c:3034
+msgid "and made changes to the index and/or the working tree\n"
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:917
-msgid "4 years, 11 months ago"
+#: sequencer.c:3040
+#, c-format
+msgid ""
+"execution succeeded: %s\n"
+"but left changes to the index and/or the working tree\n"
+"Commit or stash your changes, and then run\n"
+"\n"
+" git rebase --continue\n"
+"\n"
msgstr ""
-#: builtin/blame.c:1003
+#: sequencer.c:3101
#, c-format
-msgid "file %s has only %lu line"
-msgid_plural "file %s has only %lu lines"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/blame.c:1049
-msgid "Blaming lines"
+msgid "illegal label name: '%.*s'"
msgstr ""
-#: builtin/branch.c:27
-msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
+#: sequencer.c:3155
+msgid "writing fake root commit"
msgstr ""
-#: builtin/branch.c:28
-msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
+#: sequencer.c:3160
+msgid "writing squash-onto"
msgstr ""
-#: builtin/branch.c:29
-msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
+#: sequencer.c:3198 builtin/rebase.c:844 builtin/rebase.c:850
+#, c-format
+msgid "failed to find tree of %s"
msgstr ""
-#: builtin/branch.c:30
-msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
+#: sequencer.c:3216 builtin/rebase.c:863
+msgid "could not write index"
msgstr ""
-#: builtin/branch.c:31
-msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
+#: sequencer.c:3243
+#, c-format
+msgid "could not resolve '%s'"
msgstr ""
-#: builtin/branch.c:32
-msgid "git branch [<options>] [-r | -a] [--points-at]"
+#: sequencer.c:3271
+msgid "cannot merge without a current revision"
msgstr ""
-#: builtin/branch.c:33
-msgid "git branch [<options>] [-r | -a] [--format]"
+#: sequencer.c:3293
+#, c-format
+msgid "unable to parse '%.*s'"
msgstr ""
-#: builtin/branch.c:146
+#: sequencer.c:3302
#, c-format
-msgid ""
-"deleting branch '%s' that has been merged to\n"
-" '%s', but not yet merged to HEAD."
+msgid "nothing to merge: '%.*s'"
msgstr ""
-#: builtin/branch.c:150
-#, c-format
-msgid ""
-"not deleting branch '%s' that is not yet merged to\n"
-" '%s', even though it is merged to HEAD."
+#: sequencer.c:3314
+msgid "octopus merge cannot be executed on top of a [new root]"
msgstr ""
-#: builtin/branch.c:164
+#: sequencer.c:3329
#, c-format
-msgid "Couldn't look up commit object for '%s'"
+msgid "could not get commit message of '%s'"
msgstr ""
-#: builtin/branch.c:168
+#: sequencer.c:3478
#, 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 "could not even attempt to merge '%.*s'"
msgstr ""
-#: builtin/branch.c:181
-msgid "Update of config-file failed"
+#: sequencer.c:3494
+msgid "merge: Unable to write new index file"
msgstr ""
-#: builtin/branch.c:212
-msgid "cannot use -a with -d"
+#: sequencer.c:3562 builtin/rebase.c:711
+#, c-format
+msgid "Applied autostash.\n"
msgstr ""
-#: builtin/branch.c:218
-msgid "Couldn't look up commit object for HEAD"
+#: sequencer.c:3574
+#, c-format
+msgid "cannot store %s"
msgstr ""
-#: builtin/branch.c:232
+#: sequencer.c:3577 builtin/rebase.c:727
#, c-format
-msgid "Cannot delete branch '%s' checked out at '%s'"
+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/branch.c:247
+#: sequencer.c:3638
#, c-format
-msgid "remote-tracking branch '%s' not found."
+msgid "could not checkout %s"
msgstr ""
-#: builtin/branch.c:248
+#: sequencer.c:3652
#, c-format
-msgid "branch '%s' not found."
+msgid "%s: not a valid OID"
msgstr ""
-#: builtin/branch.c:263
-#, c-format
-msgid "Error deleting remote-tracking branch '%s'"
+#: sequencer.c:3657 git-rebase--preserve-merges.sh:724
+msgid "could not detach HEAD"
msgstr ""
-#: builtin/branch.c:264
+#: sequencer.c:3672
#, c-format
-msgid "Error deleting branch '%s'"
+msgid "Stopped at HEAD\n"
msgstr ""
-#: builtin/branch.c:271
+#: sequencer.c:3674
#, c-format
-msgid "Deleted remote-tracking branch %s (was %s).\n"
+msgid "Stopped at %s\n"
msgstr ""
-#: builtin/branch.c:272
+#: sequencer.c:3682
#, c-format
-msgid "Deleted branch %s (was %s).\n"
-msgstr ""
-
-#: builtin/branch.c:416 builtin/tag.c:58
-msgid "unable to parse format string"
+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/branch.c:453
+#: sequencer.c:3759
#, c-format
-msgid "Branch %s is being rebased at %s"
+msgid "Stopped at %s... %.*s\n"
msgstr ""
-#: builtin/branch.c:457
+#: sequencer.c:3837
#, c-format
-msgid "Branch %s is being bisected at %s"
+msgid "unknown command %d"
msgstr ""
-#: builtin/branch.c:474
-msgid "cannot copy the current branch while not on any."
+#: sequencer.c:3882
+msgid "could not read orig-head"
msgstr ""
-#: builtin/branch.c:476
-msgid "cannot rename the current branch while not on any."
+#: sequencer.c:3887
+msgid "could not read 'onto'"
msgstr ""
-#: builtin/branch.c:487
+#: sequencer.c:3901
#, c-format
-msgid "Invalid branch name: '%s'"
+msgid "could not update HEAD to %s"
msgstr ""
-#: builtin/branch.c:514
-msgid "Branch rename failed"
+#: sequencer.c:3991
+msgid "cannot rebase: You have unstaged changes."
msgstr ""
-#: builtin/branch.c:516
-msgid "Branch copy failed"
+#: sequencer.c:4000
+msgid "cannot amend non-existing commit"
msgstr ""
-#: builtin/branch.c:520
+#: sequencer.c:4002
#, c-format
-msgid "Created a copy of a misnamed branch '%s'"
+msgid "invalid file: '%s'"
msgstr ""
-#: builtin/branch.c:523
+#: sequencer.c:4004
#, c-format
-msgid "Renamed a misnamed branch '%s' away"
+msgid "invalid contents: '%s'"
+msgstr ""
+
+#: 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/branch.c:529
+#: sequencer.c:4043 sequencer.c:4081
#, c-format
-msgid "Branch renamed to %s, but HEAD is not updated!"
+msgid "could not write file: '%s'"
msgstr ""
-#: builtin/branch.c:538
-msgid "Branch is renamed, but update of config-file failed"
+#: sequencer.c:4096
+msgid "could not remove CHERRY_PICK_HEAD"
msgstr ""
-#: builtin/branch.c:540
-msgid "Branch is copied, but update of config-file failed"
+#: sequencer.c:4103
+msgid "could not commit staged changes."
msgstr ""
-#: builtin/branch.c:556
+#: sequencer.c:4204
#, c-format
-msgid ""
-"Please edit the description for the branch\n"
-" %s\n"
-"Lines starting with '%c' will be stripped.\n"
+msgid "%s: can't cherry-pick a %s"
msgstr ""
-#: builtin/branch.c:589
-msgid "Generic options"
+#: sequencer.c:4208
+#, c-format
+msgid "%s: bad revision"
msgstr ""
-#: builtin/branch.c:591
-msgid "show hash and subject, give twice for upstream branch"
+#: sequencer.c:4243
+msgid "can't revert as initial commit"
msgstr ""
-#: builtin/branch.c:592
-msgid "suppress informational messages"
+#: sequencer.c:4686
+msgid "make_script: unhandled options"
msgstr ""
-#: builtin/branch.c:593
-msgid "set up tracking mode (see git-pull(1))"
+#: sequencer.c:4689
+msgid "make_script: error preparing revisions"
msgstr ""
-#: builtin/branch.c:595
-msgid "do not use"
+#: sequencer.c:4847
+msgid ""
+"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
+"continue'.\n"
+"Or you can abort the rebase with 'git rebase --abort'.\n"
msgstr ""
-#: builtin/branch.c:597
-msgid "upstream"
+#: sequencer.c:4959 sequencer.c:4976
+msgid "nothing to do"
msgstr ""
-#: builtin/branch.c:597
-msgid "change the upstream info"
+#: sequencer.c:4990
+msgid "could not skip unnecessary pick commands"
msgstr ""
-#: builtin/branch.c:598
-msgid "Unset the upstream info"
+#: sequencer.c:5073
+msgid "the script was already rearranged."
msgstr ""
-#: builtin/branch.c:599
-msgid "use colored output"
+#: setup.c:123
+#, c-format
+msgid "'%s' is outside repository"
msgstr ""
-#: builtin/branch.c:600
-msgid "act on remote-tracking branches"
+#: setup.c:173
+#, c-format
+msgid ""
+"%s: no such path in the working tree.\n"
+"Use 'git <command> -- <path>...' to specify paths that do not exist locally."
msgstr ""
-#: builtin/branch.c:602 builtin/branch.c:604
-msgid "print only branches that contain the commit"
+#: setup.c:186
+#, c-format
+msgid ""
+"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
+"Use '--' to separate paths from revisions, like this:\n"
+"'git <command> [<revision>...] -- [<file>...]'"
msgstr ""
-#: builtin/branch.c:603 builtin/branch.c:605
-msgid "print only branches that don't contain the commit"
+#: setup.c:235
+#, c-format
+msgid "option '%s' must come before non-option arguments"
msgstr ""
-#: builtin/branch.c:608
-msgid "Specific git-branch actions:"
+#: setup.c:254
+#, c-format
+msgid ""
+"ambiguous argument '%s': both revision and filename\n"
+"Use '--' to separate paths from revisions, like this:\n"
+"'git <command> [<revision>...] -- [<file>...]'"
msgstr ""
-#: builtin/branch.c:609
-msgid "list both remote-tracking and local branches"
+#: setup.c:390
+msgid "unable to set up work tree using invalid config"
msgstr ""
-#: builtin/branch.c:611
-msgid "delete fully merged branch"
+#: setup.c:394
+msgid "this operation must be run in a work tree"
msgstr ""
-#: builtin/branch.c:612
-msgid "delete branch (even if not merged)"
+#: setup.c:540
+#, c-format
+msgid "Expected git repo version <= %d, found %d"
msgstr ""
-#: builtin/branch.c:613
-msgid "move/rename a branch and its reflog"
+#: setup.c:548
+msgid "unknown repository extensions found:"
msgstr ""
-#: builtin/branch.c:614
-msgid "move/rename a branch, even if target exists"
+#: setup.c:567
+#, c-format
+msgid "error opening '%s'"
msgstr ""
-#: builtin/branch.c:615
-msgid "copy a branch and its reflog"
+#: setup.c:569
+#, c-format
+msgid "too large to be a .git file: '%s'"
msgstr ""
-#: builtin/branch.c:616
-msgid "copy a branch, even if target exists"
+#: setup.c:571
+#, c-format
+msgid "error reading %s"
msgstr ""
-#: builtin/branch.c:617
-msgid "list branch names"
+#: setup.c:573
+#, c-format
+msgid "invalid gitfile format: %s"
msgstr ""
-#: builtin/branch.c:618
-msgid "create the branch's reflog"
+#: setup.c:575
+#, c-format
+msgid "no path in gitfile: %s"
msgstr ""
-#: builtin/branch.c:620
-msgid "edit the description for the branch"
+#: setup.c:577
+#, c-format
+msgid "not a git repository: %s"
msgstr ""
-#: builtin/branch.c:621
-msgid "force creation, move/rename, deletion"
+#: setup.c:676
+#, c-format
+msgid "'$%s' too big"
msgstr ""
-#: builtin/branch.c:622
-msgid "print only branches that are merged"
+#: setup.c:690
+#, c-format
+msgid "not a git repository: '%s'"
msgstr ""
-#: builtin/branch.c:623
-msgid "print only branches that are not merged"
+#: setup.c:719 setup.c:721 setup.c:752
+#, c-format
+msgid "cannot chdir to '%s'"
msgstr ""
-#: builtin/branch.c:624
-msgid "list branches in columns"
+#: setup.c:724 setup.c:780 setup.c:790 setup.c:829 setup.c:837
+msgid "cannot come back to cwd"
msgstr ""
-#: builtin/branch.c:625 builtin/for-each-ref.c:40 builtin/ls-remote.c:70
-#: builtin/tag.c:412
-msgid "key"
+#: setup.c:851
+#, c-format
+msgid "failed to stat '%*s%s%s'"
msgstr ""
-#: builtin/branch.c:626 builtin/for-each-ref.c:41 builtin/ls-remote.c:71
-#: builtin/tag.c:413
-msgid "field name to sort on"
+#: setup.c:1083
+msgid "Unable to read current working directory"
msgstr ""
-#: builtin/branch.c:628 builtin/for-each-ref.c:43 builtin/notes.c:408
-#: builtin/notes.c:411 builtin/notes.c:571 builtin/notes.c:574
-#: builtin/tag.c:415
-msgid "object"
+#: setup.c:1092 setup.c:1098
+#, c-format
+msgid "cannot change to '%s'"
msgstr ""
-#: builtin/branch.c:629
-msgid "print only branches of the object"
+#: setup.c:1103
+#, c-format
+msgid "not a git repository (or any of the parent directories): %s"
msgstr ""
-#: builtin/branch.c:631 builtin/for-each-ref.c:49 builtin/tag.c:422
-msgid "sorting and filtering are case insensitive"
+#: 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/branch.c:632 builtin/for-each-ref.c:38 builtin/tag.c:420
-#: builtin/verify-tag.c:39
-msgid "format to use for the output"
+#: setup.c:1220
+#, c-format
+msgid ""
+"problem with core.sharedRepository filemode value (0%.3o).\n"
+"The owner of files must always have read and write permissions."
msgstr ""
-#: builtin/branch.c:655 builtin/clone.c:737
-msgid "HEAD not found below refs/heads!"
+#: setup.c:1264
+msgid "open /dev/null or dup failed"
msgstr ""
-#: builtin/branch.c:678
-msgid "--column and --verbose are incompatible"
+#: setup.c:1279
+msgid "fork failed"
msgstr ""
-#: builtin/branch.c:693 builtin/branch.c:745 builtin/branch.c:754
-msgid "branch name required"
+#: setup.c:1284
+msgid "setsid failed"
msgstr ""
-#: builtin/branch.c:721
-msgid "Cannot give description to detached HEAD"
+#: sha1-file.c:453
+#, c-format
+msgid "object directory %s does not exist; check .git/objects/info/alternates"
msgstr ""
-#: builtin/branch.c:726
-msgid "cannot edit description of more than one branch"
+#: sha1-file.c:504
+#, c-format
+msgid "unable to normalize alternate object path: %s"
msgstr ""
-#: builtin/branch.c:733
+#: sha1-file.c:576
#, c-format
-msgid "No commit on branch '%s' yet."
+msgid "%s: ignoring alternate object stores, nesting too deep"
msgstr ""
-#: builtin/branch.c:736
+#: sha1-file.c:583
#, c-format
-msgid "No branch named '%s'."
+msgid "unable to normalize object directory: %s"
msgstr ""
-#: builtin/branch.c:751
-msgid "too many branches for a copy operation"
+#: sha1-file.c:626
+msgid "unable to fdopen alternates lockfile"
msgstr ""
-#: builtin/branch.c:760
-msgid "too many arguments for a rename operation"
+#: sha1-file.c:644
+msgid "unable to read alternates file"
msgstr ""
-#: builtin/branch.c:765
-msgid "too many arguments to set new upstream"
+#: sha1-file.c:651
+msgid "unable to move new alternates file into place"
msgstr ""
-#: builtin/branch.c:769
+#: sha1-file.c:686
#, c-format
-msgid ""
-"could not set upstream of HEAD to %s when it does not point to any branch."
+msgid "path '%s' does not exist"
msgstr ""
-#: builtin/branch.c:772 builtin/branch.c:794 builtin/branch.c:810
+#: sha1-file.c:712
#, c-format
-msgid "no such branch '%s'"
+msgid "reference repository '%s' as a linked checkout is not supported yet."
msgstr ""
-#: builtin/branch.c:776
+#: sha1-file.c:718
#, c-format
-msgid "branch '%s' does not exist"
+msgid "reference repository '%s' is not a local repository."
msgstr ""
-#: builtin/branch.c:788
-msgid "too many arguments to unset upstream"
+#: sha1-file.c:724
+#, c-format
+msgid "reference repository '%s' is shallow"
msgstr ""
-#: builtin/branch.c:792
-msgid "could not unset upstream of HEAD when it does not point to any branch."
+#: sha1-file.c:732
+#, c-format
+msgid "reference repository '%s' is grafted"
msgstr ""
-#: builtin/branch.c:798
+#: sha1-file.c:846
#, c-format
-msgid "Branch '%s' has no upstream information"
+msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
msgstr ""
-#: builtin/branch.c:813
-msgid "-a and -r options to 'git branch' do not make sense with a branch name"
+#: sha1-file.c:871
+msgid "mmap failed"
msgstr ""
-#: builtin/branch.c:816
-msgid ""
-"the '--set-upstream' option is no longer supported. Please use '--track' or "
-"'--set-upstream-to' instead."
+#: sha1-file.c:1035
+#, c-format
+msgid "object file %s is empty"
msgstr ""
-#: builtin/bundle.c:45
+#: sha1-file.c:1159 sha1-file.c:2297
#, c-format
-msgid "%s is okay\n"
+msgid "corrupt loose object '%s'"
msgstr ""
-#: builtin/bundle.c:58
-msgid "Need a repository to create a bundle."
+#: sha1-file.c:1161 sha1-file.c:2301
+#, c-format
+msgid "garbage at end of loose object '%s'"
msgstr ""
-#: builtin/bundle.c:62
-msgid "Need a repository to unbundle."
+#: sha1-file.c:1203
+msgid "invalid object type"
msgstr ""
-#: builtin/cat-file.c:525
-msgid ""
-"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
-"p | <type> | --textconv | --filters) [--path=<path>] <object>"
+#: sha1-file.c:1287
+#, c-format
+msgid "unable to unpack %s header with --allow-unknown-type"
msgstr ""
-#: builtin/cat-file.c:526
-msgid ""
-"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
-"filters]"
+#: sha1-file.c:1290
+#, c-format
+msgid "unable to unpack %s header"
msgstr ""
-#: builtin/cat-file.c:563
-msgid "<type> can be one of: blob, tree, commit, tag"
+#: sha1-file.c:1296
+#, c-format
+msgid "unable to parse %s header with --allow-unknown-type"
msgstr ""
-#: builtin/cat-file.c:564
-msgid "show object type"
+#: sha1-file.c:1299
+#, c-format
+msgid "unable to parse %s header"
msgstr ""
-#: builtin/cat-file.c:565
-msgid "show object size"
+#: sha1-file.c:1490
+#, c-format
+msgid "failed to read object %s"
msgstr ""
-#: builtin/cat-file.c:567
-msgid "exit with zero when there's no error"
+#: sha1-file.c:1494
+#, c-format
+msgid "replacement %s not found for %s"
msgstr ""
-#: builtin/cat-file.c:568
-msgid "pretty-print object's content"
+#: sha1-file.c:1498
+#, c-format
+msgid "loose object %s (stored in %s) is corrupt"
msgstr ""
-#: builtin/cat-file.c:570
-msgid "for blob objects, run textconv on object's content"
+#: sha1-file.c:1502
+#, c-format
+msgid "packed object %s (stored in %s) is corrupt"
msgstr ""
-#: builtin/cat-file.c:572
-msgid "for blob objects, run filters on object's content"
+#: sha1-file.c:1604
+#, c-format
+msgid "unable to write file %s"
msgstr ""
-#: builtin/cat-file.c:573 git-submodule.sh:894
-msgid "blob"
+#: sha1-file.c:1611
+#, c-format
+msgid "unable to set permission to '%s'"
msgstr ""
-#: builtin/cat-file.c:574
-msgid "use a specific path for --textconv/--filters"
+#: sha1-file.c:1618
+msgid "file write error"
msgstr ""
-#: builtin/cat-file.c:576
-msgid "allow -s and -t to work with broken/corrupt objects"
+#: sha1-file.c:1637
+msgid "error when closing loose object file"
msgstr ""
-#: builtin/cat-file.c:577
-msgid "buffer --batch output"
+#: sha1-file.c:1702
+#, c-format
+msgid "insufficient permission for adding an object to repository database %s"
msgstr ""
-#: builtin/cat-file.c:579
-msgid "show info and content of objects fed from the standard input"
+#: sha1-file.c:1704
+msgid "unable to create temporary file"
msgstr ""
-#: builtin/cat-file.c:582
-msgid "show info about objects fed from the standard input"
+#: sha1-file.c:1728
+msgid "unable to write loose object file"
msgstr ""
-#: builtin/cat-file.c:585
-msgid "follow in-tree symlinks (used with --batch or --batch-check)"
+#: sha1-file.c:1734
+#, c-format
+msgid "unable to deflate new object %s (%d)"
msgstr ""
-#: builtin/cat-file.c:587
-msgid "show all objects with --batch or --batch-check"
+#: sha1-file.c:1738
+#, c-format
+msgid "deflateEnd on object %s failed (%d)"
msgstr ""
-#: builtin/check-attr.c:12
-msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
+#: sha1-file.c:1742
+#, c-format
+msgid "confused by unstable object source data for %s"
msgstr ""
-#: builtin/check-attr.c:13
-msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
+#: sha1-file.c:1752 builtin/pack-objects.c:920
+#, c-format
+msgid "failed utime() on %s"
msgstr ""
-#: builtin/check-attr.c:20
-msgid "report all attributes set on file"
-msgstr ""
-
-#: builtin/check-attr.c:21
-msgid "use .gitattributes only from the index"
-msgstr ""
-
-#: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:100
-msgid "read file names from stdin"
-msgstr ""
-
-#: builtin/check-attr.c:24 builtin/check-ignore.c:26
-msgid "terminate input and output records by a NUL character"
-msgstr ""
-
-#: builtin/check-ignore.c:20 builtin/checkout.c:1113 builtin/gc.c:500
-msgid "suppress progress reporting"
+#: sha1-file.c:1827
+#, c-format
+msgid "cannot read object for %s"
msgstr ""
-#: builtin/check-ignore.c:28
-msgid "show non-matching input paths"
+#: sha1-file.c:1867
+msgid "corrupt commit"
msgstr ""
-#: builtin/check-ignore.c:30
-msgid "ignore index when checking"
+#: sha1-file.c:1875
+msgid "corrupt tag"
msgstr ""
-#: builtin/check-ignore.c:159
-msgid "cannot specify pathnames with --stdin"
+#: sha1-file.c:1974
+#, c-format
+msgid "read error while indexing %s"
msgstr ""
-#: builtin/check-ignore.c:162
-msgid "-z only makes sense with --stdin"
+#: sha1-file.c:1977
+#, c-format
+msgid "short read while indexing %s"
msgstr ""
-#: builtin/check-ignore.c:164
-msgid "no path specified"
+#: sha1-file.c:2050 sha1-file.c:2059
+#, c-format
+msgid "%s: failed to insert into database"
msgstr ""
-#: builtin/check-ignore.c:168
-msgid "--quiet is only valid with a single pathname"
+#: sha1-file.c:2065
+#, c-format
+msgid "%s: unsupported file type"
msgstr ""
-#: builtin/check-ignore.c:170
-msgid "cannot have both --quiet and --verbose"
+#: sha1-file.c:2089
+#, c-format
+msgid "%s is not a valid object"
msgstr ""
-#: builtin/check-ignore.c:173
-msgid "--non-matching is only valid with --verbose"
+#: sha1-file.c:2091
+#, c-format
+msgid "%s is not a valid '%s' object"
msgstr ""
-#: builtin/check-mailmap.c:9
-msgid "git check-mailmap [<options>] <contact>..."
+#: sha1-file.c:2118 builtin/index-pack.c:154
+#, c-format
+msgid "unable to open %s"
msgstr ""
-#: builtin/check-mailmap.c:14
-msgid "also read contacts from stdin"
+#: sha1-file.c:2308 sha1-file.c:2360
+#, c-format
+msgid "hash mismatch for %s (expected %s)"
msgstr ""
-#: builtin/check-mailmap.c:25
+#: sha1-file.c:2332
#, c-format
-msgid "unable to parse contact: %s"
+msgid "unable to mmap %s"
msgstr ""
-#: builtin/check-mailmap.c:48
-msgid "no contacts specified"
+#: sha1-file.c:2337
+#, c-format
+msgid "unable to unpack header of %s"
msgstr ""
-#: builtin/checkout-index.c:128
-msgid "git checkout-index [<options>] [--] [<file>...]"
+#: sha1-file.c:2343
+#, c-format
+msgid "unable to parse header of %s"
msgstr ""
-#: builtin/checkout-index.c:143
-msgid "stage should be between 1 and 3 or all"
+#: sha1-file.c:2354
+#, c-format
+msgid "unable to unpack contents of %s"
msgstr ""
-#: builtin/checkout-index.c:159
-msgid "check out all files in the index"
+#: sha1-name.c:490
+#, c-format
+msgid "short SHA1 %s is ambiguous"
msgstr ""
-#: builtin/checkout-index.c:160
-msgid "force overwrite of existing files"
+#: sha1-name.c:501
+msgid "The candidates are:"
msgstr ""
-#: builtin/checkout-index.c:162
-msgid "no warning for existing files and files not in index"
+#: 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/checkout-index.c:164
-msgid "don't checkout new files"
+#: submodule.c:114 submodule.c:143
+msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
msgstr ""
-#: builtin/checkout-index.c:166
-msgid "update stat information in the index file"
+#: submodule.c:118 submodule.c:147
+#, c-format
+msgid "Could not find section in .gitmodules where path=%s"
msgstr ""
-#: builtin/checkout-index.c:170
-msgid "read list of paths from the standard input"
+#: submodule.c:154
+#, c-format
+msgid "Could not remove .gitmodules entry for %s"
msgstr ""
-#: builtin/checkout-index.c:172
-msgid "write the content to temporary files"
+#: submodule.c:165
+msgid "staging updated .gitmodules failed"
msgstr ""
-#: builtin/checkout-index.c:173 builtin/column.c:31
-#: builtin/submodule--helper.c:1216 builtin/submodule--helper.c:1219
-#: builtin/submodule--helper.c:1227 builtin/submodule--helper.c:1591
-#: builtin/worktree.c:610
-msgid "string"
+#: submodule.c:327
+#, c-format
+msgid "in unpopulated submodule '%s'"
msgstr ""
-#: builtin/checkout-index.c:174
-msgid "when creating files, prepend <string>"
+#: submodule.c:358
+#, c-format
+msgid "Pathspec '%s' is in submodule '%.*s'"
msgstr ""
-#: builtin/checkout-index.c:176
-msgid "copy out the files from named stage"
+#: submodule.c:910
+#, c-format
+msgid "submodule entry '%s' (%s) is a %s, not a commit"
msgstr ""
-#: builtin/checkout.c:27
-msgid "git checkout [<options>] <branch>"
+#: submodule.c:1147 builtin/branch.c:672 builtin/submodule--helper.c:1988
+msgid "Failed to resolve HEAD as a valid ref."
msgstr ""
-#: builtin/checkout.c:28
-msgid "git checkout [<options>] [<branch>] -- <file>..."
+#: submodule.c:1481
+#, c-format
+msgid "Could not access submodule '%s'"
msgstr ""
-#: builtin/checkout.c:136 builtin/checkout.c:169
+#: submodule.c:1651
#, c-format
-msgid "path '%s' does not have our version"
+msgid "'%s' not recognized as a git repository"
msgstr ""
-#: builtin/checkout.c:138 builtin/checkout.c:171
+#: submodule.c:1789
#, c-format
-msgid "path '%s' does not have their version"
+msgid "could not start 'git status' in submodule '%s'"
msgstr ""
-#: builtin/checkout.c:154
+#: submodule.c:1802
#, c-format
-msgid "path '%s' does not have all necessary versions"
+msgid "could not run 'git status' in submodule '%s'"
msgstr ""
-#: builtin/checkout.c:198
+#: submodule.c:1817
#, c-format
-msgid "path '%s' does not have necessary versions"
+msgid "Could not unset core.worktree setting in submodule '%s'"
msgstr ""
-#: builtin/checkout.c:215
+#: submodule.c:1907
#, c-format
-msgid "path '%s': cannot merge"
+msgid "submodule '%s' has dirty index"
msgstr ""
-#: builtin/checkout.c:231
+#: submodule.c:1959
#, c-format
-msgid "Unable to add merge result for '%s'"
+msgid "Submodule '%s' could not be updated."
msgstr ""
-#: builtin/checkout.c:253 builtin/checkout.c:256 builtin/checkout.c:259
-#: builtin/checkout.c:262
+#: submodule.c:2008
#, c-format
-msgid "'%s' cannot be used with updating paths"
+msgid ""
+"relocate_gitdir for submodule '%s' with more than one worktree not supported"
msgstr ""
-#: builtin/checkout.c:265 builtin/checkout.c:268
+#: submodule.c:2020 submodule.c:2076
#, c-format
-msgid "'%s' cannot be used with %s"
+msgid "could not lookup name for submodule '%s'"
msgstr ""
-#: builtin/checkout.c:271
+#: submodule.c:2027
#, c-format
-msgid "Cannot update paths and switch to branch '%s' at the same time."
+msgid ""
+"Migrating git directory of '%s%s' from\n"
+"'%s' to\n"
+"'%s'\n"
msgstr ""
-#: builtin/checkout.c:340 builtin/checkout.c:347
+#: submodule.c:2111
#, c-format
-msgid "path '%s' is unmerged"
+msgid "could not recurse into submodule '%s'"
msgstr ""
-#: builtin/checkout.c:506
-msgid "you need to resolve your current index first"
+#: submodule.c:2155
+msgid "could not start ls-files in .."
msgstr ""
-#: builtin/checkout.c:643
+#: submodule.c:2194
#, c-format
-msgid "Can not do reflog for '%s': %s\n"
+msgid "ls-tree returned unexpected return code %d"
msgstr ""
-#: builtin/checkout.c:684
-msgid "HEAD is now at"
+#: submodule-config.c:232
+#, c-format
+msgid "ignoring suspicious submodule name: %s"
msgstr ""
-#: builtin/checkout.c:688 builtin/clone.c:691
-msgid "unable to update HEAD"
+#: submodule-config.c:299
+msgid "negative values not allowed for submodule.fetchjobs"
msgstr ""
-#: builtin/checkout.c:692
+#: submodule-config.c:397
#, c-format
-msgid "Reset branch '%s'\n"
+msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
msgstr ""
-#: builtin/checkout.c:695
+#: submodule-config.c:486
#, c-format
-msgid "Already on '%s'\n"
+msgid "invalid value for %s"
msgstr ""
-#: builtin/checkout.c:699
+#: submodule-config.c:755
#, c-format
-msgid "Switched to and reset branch '%s'\n"
+msgid "Could not update .gitmodules entry %s"
msgstr ""
-#: builtin/checkout.c:701 builtin/checkout.c:1046
+#: trailer.c:238
#, c-format
-msgid "Switched to a new branch '%s'\n"
+msgid "running trailer command '%s' failed"
msgstr ""
-#: builtin/checkout.c:703
+#: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553
+#: trailer.c:557
#, c-format
-msgid "Switched to branch '%s'\n"
+msgid "unknown value '%s' for key '%s'"
msgstr ""
-#: builtin/checkout.c:754
+#: trailer.c:539 trailer.c:544 builtin/remote.c:295
#, c-format
-msgid " ... and %d more.\n"
+msgid "more than one %s"
msgstr ""
-#: builtin/checkout.c:760
-#, c-format
-msgid ""
-"Warning: you are leaving %d commit behind, not connected to\n"
-"any of your branches:\n"
-"\n"
-"%s\n"
-msgid_plural ""
-"Warning: you are leaving %d commits behind, not connected to\n"
-"any of your branches:\n"
-"\n"
-"%s\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/checkout.c:779
+#: trailer.c:730
#, c-format
-msgid ""
-"If you want to keep it by creating a new branch, this may be a good time\n"
-"to do so with:\n"
-"\n"
-" git branch <new-branch-name> %s\n"
-"\n"
-msgid_plural ""
-"If you want to keep them by creating a new branch, this may be a good time\n"
-"to do so with:\n"
-"\n"
-" git branch <new-branch-name> %s\n"
-"\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/checkout.c:811
-msgid "internal error in revision walk"
+msgid "empty trailer token in trailer '%.*s'"
msgstr ""
-#: builtin/checkout.c:815
-msgid "Previous HEAD position was"
+#: trailer.c:750
+#, c-format
+msgid "could not read input file '%s'"
msgstr ""
-#: builtin/checkout.c:843 builtin/checkout.c:1041
-msgid "You are on a branch yet to be born"
+#: trailer.c:753
+msgid "could not read from stdin"
msgstr ""
-#: builtin/checkout.c:947
+#: trailer.c:1011 wrapper.c:701
#, c-format
-msgid "only one reference expected, %d given."
+msgid "could not stat %s"
msgstr ""
-#: builtin/checkout.c:987 builtin/worktree.c:240 builtin/worktree.c:389
+#: trailer.c:1013
#, c-format
-msgid "invalid reference: %s"
+msgid "file %s is not a regular file"
msgstr ""
-#: builtin/checkout.c:1016
+#: trailer.c:1015
#, c-format
-msgid "reference is not a tree: %s"
+msgid "file %s is not writable by user"
msgstr ""
-#: builtin/checkout.c:1055
-msgid "paths cannot be used with switching branches"
+#: trailer.c:1027
+msgid "could not open temporary file"
msgstr ""
-#: builtin/checkout.c:1058 builtin/checkout.c:1062
+#: trailer.c:1067
#, c-format
-msgid "'%s' cannot be used with switching branches"
+msgid "could not rename temporary file to %s"
msgstr ""
-#: builtin/checkout.c:1066 builtin/checkout.c:1069 builtin/checkout.c:1074
-#: builtin/checkout.c:1077
+#: transport.c:116
#, c-format
-msgid "'%s' cannot be used with '%s'"
+msgid "Would set upstream of '%s' to '%s' of '%s'\n"
msgstr ""
-#: builtin/checkout.c:1082
+#: transport.c:142
#, c-format
-msgid "Cannot switch branch to a non-commit '%s'"
+msgid "could not read bundle '%s'"
msgstr ""
-#: builtin/checkout.c:1114 builtin/checkout.c:1116 builtin/clone.c:118
-#: builtin/remote.c:167 builtin/remote.c:169 builtin/worktree.c:433
-#: builtin/worktree.c:435
-msgid "branch"
+#: transport.c:208
+#, c-format
+msgid "transport: invalid depth option '%s'"
msgstr ""
-#: builtin/checkout.c:1115
-msgid "create and checkout a new branch"
+#: transport.c:259
+msgid "see protocol.version in 'git help config' for more details"
msgstr ""
-#: builtin/checkout.c:1117
-msgid "create/reset and checkout a branch"
+#: transport.c:260
+msgid "server options require protocol version 2 or later"
msgstr ""
-#: builtin/checkout.c:1118
-msgid "create reflog for new branch"
+#: transport.c:625
+msgid "could not parse transport.color.* config"
msgstr ""
-#: builtin/checkout.c:1119 builtin/worktree.c:437
-msgid "detach HEAD at named commit"
+#: transport.c:698
+msgid "support for protocol v2 not implemented yet"
msgstr ""
-#: builtin/checkout.c:1120
-msgid "set upstream info for new branch"
+#: transport.c:825
+#, c-format
+msgid "unknown value for config '%s': %s"
msgstr ""
-#: builtin/checkout.c:1122
-msgid "new-branch"
+#: transport.c:891
+#, c-format
+msgid "transport '%s' not allowed"
msgstr ""
-#: builtin/checkout.c:1122
-msgid "new unparented branch"
+#: transport.c:945
+msgid "git-over-rsync is no longer supported"
msgstr ""
-#: builtin/checkout.c:1123
-msgid "checkout our version for unmerged files"
+#: transport.c:1040
+#, c-format
+msgid ""
+"The following submodule paths contain changes that can\n"
+"not be found on any remote:\n"
msgstr ""
-#: builtin/checkout.c:1125
-msgid "checkout their version for unmerged files"
+#: transport.c:1044
+#, c-format
+msgid ""
+"\n"
+"Please try\n"
+"\n"
+"\tgit push --recurse-submodules=on-demand\n"
+"\n"
+"or cd to the path and use\n"
+"\n"
+"\tgit push\n"
+"\n"
+"to push them to a remote.\n"
+"\n"
msgstr ""
-#: builtin/checkout.c:1127
-msgid "force checkout (throw away local modifications)"
+#: transport.c:1052
+msgid "Aborting."
msgstr ""
-#: builtin/checkout.c:1129
-msgid "perform a 3-way merge with the new branch"
+#: transport.c:1193
+msgid "failed to push all needed submodules"
msgstr ""
-#: builtin/checkout.c:1131 builtin/merge.c:241
-msgid "update ignored files (default)"
+#: transport.c:1326 transport-helper.c:645
+msgid "operation not supported by protocol"
msgstr ""
-#: builtin/checkout.c:1133 builtin/log.c:1499 parse-options.h:264
-msgid "style"
+#: transport.c:1430
+#, c-format
+msgid "invalid line while parsing alternate refs: %s"
msgstr ""
-#: builtin/checkout.c:1134
-msgid "conflict style (merge or diff3)"
+#: transport-helper.c:51 transport-helper.c:80
+msgid "full write to remote helper failed"
msgstr ""
-#: builtin/checkout.c:1137
-msgid "do not limit pathspecs to sparse entries only"
+#: transport-helper.c:134
+#, c-format
+msgid "unable to find remote helper for '%s'"
msgstr ""
-#: builtin/checkout.c:1139
-msgid "second guess 'git checkout <no-such-branch>'"
+#: transport-helper.c:150 transport-helper.c:559
+msgid "can't dup helper output fd"
msgstr ""
-#: builtin/checkout.c:1141
-msgid "do not check if another worktree is holding the given ref"
+#: transport-helper.c:201
+#, c-format
+msgid ""
+"unknown mandatory capability %s; this remote helper probably needs newer "
+"version of Git"
msgstr ""
-#: builtin/checkout.c:1145 builtin/clone.c:85 builtin/fetch.c:149
-#: builtin/merge.c:238 builtin/pull.c:128 builtin/push.c:572
-#: builtin/send-pack.c:174
-msgid "force progress reporting"
+#: transport-helper.c:207
+msgid "this remote helper should implement refspec capability"
msgstr ""
-#: builtin/checkout.c:1175
-msgid "-b, -B and --orphan are mutually exclusive"
+#: transport-helper.c:274 transport-helper.c:414
+#, c-format
+msgid "%s unexpectedly said: '%s'"
msgstr ""
-#: builtin/checkout.c:1192
-msgid "--track needs a branch name"
+#: transport-helper.c:403
+#, c-format
+msgid "%s also locked %s"
msgstr ""
-#: builtin/checkout.c:1197
-msgid "Missing branch name; try -b"
+#: transport-helper.c:481
+msgid "couldn't run fast-import"
msgstr ""
-#: builtin/checkout.c:1233
-msgid "invalid path specification"
+#: transport-helper.c:504
+msgid "error while running fast-import"
msgstr ""
-#: builtin/checkout.c:1240
+#: transport-helper.c:533 transport-helper.c:1099
#, c-format
-msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
+msgid "could not read ref %s"
msgstr ""
-#: builtin/checkout.c:1244
+#: transport-helper.c:578
#, c-format
-msgid "git checkout: --detach does not take a path argument '%s'"
+msgid "unknown response to connect: %s"
msgstr ""
-#: builtin/checkout.c:1248
-msgid ""
-"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
-"checking out of the index."
+#: transport-helper.c:600
+msgid "setting remote service path not supported by protocol"
msgstr ""
-#: builtin/clean.c:26
-msgid ""
-"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
+#: transport-helper.c:602
+msgid "invalid remote service path"
msgstr ""
-#: builtin/clean.c:30
+#: transport-helper.c:648
#, c-format
-msgid "Removing %s\n"
+msgid "can't connect to subservice %s"
msgstr ""
-#: builtin/clean.c:31
+#: transport-helper.c:720
#, c-format
-msgid "Would remove %s\n"
+msgid "expected ok/error, helper said '%s'"
msgstr ""
-#: builtin/clean.c:32
+#: transport-helper.c:773
#, c-format
-msgid "Skipping repository %s\n"
+msgid "helper reported unexpected status of %s"
msgstr ""
-#: builtin/clean.c:33
+#: transport-helper.c:834
#, c-format
-msgid "Would skip repository %s\n"
+msgid "helper %s does not support dry-run"
msgstr ""
-#: builtin/clean.c:34
+#: transport-helper.c:837
#, c-format
-msgid "failed to remove %s"
+msgid "helper %s does not support --signed"
msgstr ""
-#: builtin/clean.c:302 git-add--interactive.perl:579
+#: transport-helper.c:840
#, c-format
-msgid ""
-"Prompt help:\n"
-"1 - select a numbered item\n"
-"foo - select item based on unique prefix\n"
-" - (empty) select nothing\n"
+msgid "helper %s does not support --signed=if-asked"
msgstr ""
-#: builtin/clean.c:306 git-add--interactive.perl:588
+#: transport-helper.c:847
+#, c-format
+msgid "helper %s does not support 'push-option'"
+msgstr ""
+
+#: transport-helper.c:939
+msgid "remote-helper doesn't support push; refspec needed"
+msgstr ""
+
+#: transport-helper.c:944
+#, c-format
+msgid "helper %s does not support 'force'"
+msgstr ""
+
+#: transport-helper.c:991
+msgid "couldn't run fast-export"
+msgstr ""
+
+#: transport-helper.c:996
+msgid "error while running fast-export"
+msgstr ""
+
+#: transport-helper.c:1021
#, 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"
+"No refs in common and none specified; doing nothing.\n"
+"Perhaps you should specify a branch such as 'master'.\n"
msgstr ""
-#: builtin/clean.c:522 git-add--interactive.perl:554
-#: git-add--interactive.perl:559
-#, c-format, perl-format
-msgid "Huh (%s)?\n"
+#: transport-helper.c:1085
+#, c-format
+msgid "malformed response in ref list: %s"
msgstr ""
-#: builtin/clean.c:664
+#: transport-helper.c:1238
#, c-format
-msgid "Input ignore patterns>> "
+msgid "read(%s) failed"
msgstr ""
-#: builtin/clean.c:701
+#: transport-helper.c:1265
#, c-format
-msgid "WARNING: Cannot find items matched by: %s"
+msgid "write(%s) failed"
msgstr ""
-#: builtin/clean.c:722
-msgid "Select items to delete"
+#: transport-helper.c:1314
+#, c-format
+msgid "%s thread failed"
msgstr ""
-#. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:763
+#: transport-helper.c:1318
#, c-format
-msgid "Remove %s [y/N]? "
+msgid "%s thread failed to join: %s"
msgstr ""
-#: builtin/clean.c:788 git-add--interactive.perl:1717
+#: transport-helper.c:1337 transport-helper.c:1341
#, c-format
-msgid "Bye.\n"
+msgid "can't start thread for copying data: %s"
+msgstr ""
+
+#: transport-helper.c:1378
+#, c-format
+msgid "%s process failed to wait"
+msgstr ""
+
+#: transport-helper.c:1382
+#, c-format
+msgid "%s process failed"
+msgstr ""
+
+#: transport-helper.c:1400 transport-helper.c:1409
+msgid "can't start thread for copying data"
+msgstr ""
+
+#: tree-walk.c:33
+msgid "too-short tree object"
+msgstr ""
+
+#: tree-walk.c:39
+msgid "malformed mode in tree entry"
+msgstr ""
+
+#: tree-walk.c:43
+msgid "empty filename in tree entry"
msgstr ""
-#: builtin/clean.c:796
+#: tree-walk.c:116
+msgid "too-short tree file"
+msgstr ""
+
+#: unpack-trees.c:111
+#, c-format
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"
+"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/clean.c:823 git-add--interactive.perl:1793
-msgid "*** Commands ***"
+#: unpack-trees.c:113
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by checkout:\n"
+"%%s"
msgstr ""
-#: builtin/clean.c:824 git-add--interactive.perl:1790
-msgid "What now"
+#: 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/clean.c:832
-msgid "Would remove the following item:"
-msgid_plural "Would remove the following items:"
-msgstr[0] ""
-msgstr[1] ""
+#: unpack-trees.c:118
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"%%s"
+msgstr ""
-#: builtin/clean.c:848
-msgid "No more files to clean, exiting."
+#: 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/clean.c:910
-msgid "do not print names of files removed"
+#: unpack-trees.c:123
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by %s:\n"
+"%%s"
msgstr ""
-#: builtin/clean.c:912
-msgid "force"
+#: unpack-trees.c:128
+#, c-format
+msgid ""
+"Updating the following directories would lose untracked files in them:\n"
+"%s"
msgstr ""
-#: builtin/clean.c:913
-msgid "interactive cleaning"
+#: 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/clean.c:915
-msgid "remove whole directories"
+#: unpack-trees.c:134
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%s"
msgstr ""
-#: builtin/clean.c:916 builtin/describe.c:533 builtin/describe.c:535
-#: builtin/grep.c:871 builtin/log.c:157 builtin/log.c:159
-#: builtin/ls-files.c:548 builtin/name-rev.c:397 builtin/name-rev.c:399
-#: builtin/show-ref.c:176
-msgid "pattern"
+#: 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/clean.c:917
-msgid "add <pattern> to ignore rules"
+#: unpack-trees.c:139
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%s"
msgstr ""
-#: builtin/clean.c:918
-msgid "remove ignored files, too"
+#: 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/clean.c:920
-msgid "remove only ignored files"
+#: unpack-trees.c:144
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%s"
msgstr ""
-#: builtin/clean.c:938
-msgid "-x and -X cannot be used together"
+#: 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/clean.c:942
+#: unpack-trees.c:152
+#, c-format
msgid ""
-"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
-"clean"
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%s"
+msgstr ""
+
+#: 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 ""
+
+#: unpack-trees.c:157
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%s"
+msgstr ""
+
+#: 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 ""
+
+#: unpack-trees.c:162
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%s"
+msgstr ""
+
+#: unpack-trees.c:170
+#, c-format
+msgid "Entry '%s' overlaps with '%s'. Cannot bind."
+msgstr ""
+
+#: unpack-trees.c:173
+#, c-format
+msgid ""
+"Cannot update sparse checkout: the following entries are not up to date:\n"
+"%s"
+msgstr ""
+
+#: unpack-trees.c:175
+#, c-format
+msgid ""
+"The following working tree files would be overwritten by sparse checkout "
+"update:\n"
+"%s"
+msgstr ""
+
+#: unpack-trees.c:177
+#, c-format
+msgid ""
+"The following working tree files would be removed by sparse checkout "
+"update:\n"
+"%s"
+msgstr ""
+
+#: unpack-trees.c:179
+#, c-format
+msgid ""
+"Cannot update submodule:\n"
+"%s"
+msgstr ""
+
+#: unpack-trees.c:256
+#, c-format
+msgid "Aborting\n"
+msgstr ""
+
+#: unpack-trees.c:318
+msgid "Checking out files"
+msgstr ""
+
+#: 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 ""
+
+#: urlmatch.c:163
+msgid "invalid URL scheme name or missing '://' suffix"
+msgstr ""
+
+#: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405
+#, c-format
+msgid "invalid %XX escape sequence"
+msgstr ""
+
+#: urlmatch.c:215
+msgid "missing host and scheme is not 'file:'"
+msgstr ""
+
+#: urlmatch.c:232
+msgid "a 'file:' URL may not have a port number"
+msgstr ""
+
+#: urlmatch.c:247
+msgid "invalid characters in host name"
+msgstr ""
+
+#: urlmatch.c:292 urlmatch.c:303
+msgid "invalid port number"
+msgstr ""
+
+#: urlmatch.c:371
+msgid "invalid '..' path segment"
+msgstr ""
+
+#: worktree.c:255 builtin/am.c:2097
+#, c-format
+msgid "failed to read '%s'"
+msgstr ""
+
+#: worktree.c:301
+#, c-format
+msgid "'%s' at main working tree is not the repository directory"
+msgstr ""
+
+#: worktree.c:312
+#, c-format
+msgid "'%s' file does not contain absolute path to the working tree location"
+msgstr ""
+
+#: worktree.c:324
+#, c-format
+msgid "'%s' does not exist"
+msgstr ""
+
+#: worktree.c:330
+#, c-format
+msgid "'%s' is not a .git file, error code %d"
+msgstr ""
+
+#: worktree.c:338
+#, c-format
+msgid "'%s' does not point back to '%s'"
+msgstr ""
+
+#: wrapper.c:223 wrapper.c:393
+#, c-format
+msgid "could not open '%s' for reading and writing"
+msgstr ""
+
+#: wrapper.c:424 wrapper.c:624
+#, c-format
+msgid "unable to access '%s'"
+msgstr ""
+
+#: wrapper.c:632
+msgid "unable to get current working directory"
+msgstr ""
+
+#: wt-status.c:156
+msgid "Unmerged paths:"
+msgstr ""
+
+#: wt-status.c:183 wt-status.c:210
+#, c-format
+msgid " (use \"git reset %s <file>...\" to unstage)"
+msgstr ""
+
+#: wt-status.c:185 wt-status.c:212
+msgid " (use \"git rm --cached <file>...\" to unstage)"
+msgstr ""
+
+#: wt-status.c:189
+msgid " (use \"git add <file>...\" to mark resolution)"
+msgstr ""
+
+#: wt-status.c:191 wt-status.c:195
+msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
+msgstr ""
+
+#: wt-status.c:193
+msgid " (use \"git rm <file>...\" to mark resolution)"
+msgstr ""
+
+#: wt-status.c:204 wt-status.c:1064
+msgid "Changes to be committed:"
+msgstr ""
+
+#: wt-status.c:222 wt-status.c:1073
+msgid "Changes not staged for commit:"
+msgstr ""
+
+#: wt-status.c:226
+msgid " (use \"git add <file>...\" to update what will be committed)"
+msgstr ""
+
+#: wt-status.c:228
+msgid " (use \"git add/rm <file>...\" to update what will be committed)"
+msgstr ""
+
+#: wt-status.c:229
+msgid ""
+" (use \"git checkout -- <file>...\" to discard changes in working directory)"
+msgstr ""
+
+#: wt-status.c:231
+msgid " (commit or discard the untracked or modified content in submodules)"
+msgstr ""
+
+#: wt-status.c:243
+#, c-format
+msgid " (use \"git %s <file>...\" to include in what will be committed)"
+msgstr ""
+
+#: wt-status.c:258
+msgid "both deleted:"
+msgstr ""
+
+#: wt-status.c:260
+msgid "added by us:"
+msgstr ""
+
+#: wt-status.c:262
+msgid "deleted by them:"
+msgstr ""
+
+#: wt-status.c:264
+msgid "added by them:"
+msgstr ""
+
+#: wt-status.c:266
+msgid "deleted by us:"
+msgstr ""
+
+#: wt-status.c:268
+msgid "both added:"
+msgstr ""
+
+#: wt-status.c:270
+msgid "both modified:"
+msgstr ""
+
+#: wt-status.c:280
+msgid "new file:"
+msgstr ""
+
+#: wt-status.c:282
+msgid "copied:"
+msgstr ""
+
+#: wt-status.c:284
+msgid "deleted:"
+msgstr ""
+
+#: wt-status.c:286
+msgid "modified:"
+msgstr ""
+
+#: wt-status.c:288
+msgid "renamed:"
+msgstr ""
+
+#: wt-status.c:290
+msgid "typechange:"
+msgstr ""
+
+#: wt-status.c:292
+msgid "unknown:"
+msgstr ""
+
+#: wt-status.c:294
+msgid "unmerged:"
+msgstr ""
+
+#: wt-status.c:374
+msgid "new commits, "
+msgstr ""
+
+#: wt-status.c:376
+msgid "modified content, "
+msgstr ""
+
+#: wt-status.c:378
+msgid "untracked content, "
+msgstr ""
+
+#: wt-status.c:896
+#, c-format
+msgid "Your stash currently has %d entry"
+msgid_plural "Your stash currently has %d entries"
+msgstr[0] ""
+msgstr[1] ""
+
+#: wt-status.c:928
+msgid "Submodules changed but not updated:"
+msgstr ""
+
+#: wt-status.c:930
+msgid "Submodule changes to be committed:"
+msgstr ""
+
+#: wt-status.c:1012
+msgid ""
+"Do not modify or remove the line above.\n"
+"Everything below it will be ignored."
+msgstr ""
+
+#: wt-status.c:1119
+msgid "You have unmerged paths."
+msgstr ""
+
+#: wt-status.c:1122
+msgid " (fix conflicts and run \"git commit\")"
+msgstr ""
+
+#: wt-status.c:1124
+msgid " (use \"git merge --abort\" to abort the merge)"
+msgstr ""
+
+#: wt-status.c:1128
+msgid "All conflicts fixed but you are still merging."
+msgstr ""
+
+#: wt-status.c:1131
+msgid " (use \"git commit\" to conclude merge)"
+msgstr ""
+
+#: wt-status.c:1140
+msgid "You are in the middle of an am session."
+msgstr ""
+
+#: wt-status.c:1143
+msgid "The current patch is empty."
+msgstr ""
+
+#: wt-status.c:1147
+msgid " (fix conflicts and then run \"git am --continue\")"
+msgstr ""
+
+#: wt-status.c:1149
+msgid " (use \"git am --skip\" to skip this patch)"
+msgstr ""
+
+#: wt-status.c:1151
+msgid " (use \"git am --abort\" to restore the original branch)"
+msgstr ""
+
+#: wt-status.c:1284
+msgid "git-rebase-todo is missing."
+msgstr ""
+
+#: wt-status.c:1286
+msgid "No commands done."
+msgstr ""
+
+#: wt-status.c:1289
+#, c-format
+msgid "Last command done (%d command done):"
+msgid_plural "Last commands done (%d commands done):"
+msgstr[0] ""
+msgstr[1] ""
+
+#: wt-status.c:1300
+#, c-format
+msgid " (see more in file %s)"
+msgstr ""
+
+#: wt-status.c:1305
+msgid "No commands remaining."
+msgstr ""
+
+#: wt-status.c:1308
+#, 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:1316
+msgid " (use \"git rebase --edit-todo\" to view and edit)"
+msgstr ""
+
+#: wt-status.c:1328
+#, c-format
+msgid "You are currently rebasing branch '%s' on '%s'."
+msgstr ""
+
+#: wt-status.c:1333
+msgid "You are currently rebasing."
+msgstr ""
+
+#: wt-status.c:1346
+msgid " (fix conflicts and then run \"git rebase --continue\")"
+msgstr ""
+
+#: wt-status.c:1348
+msgid " (use \"git rebase --skip\" to skip this patch)"
+msgstr ""
+
+#: wt-status.c:1350
+msgid " (use \"git rebase --abort\" to check out the original branch)"
+msgstr ""
+
+#: wt-status.c:1357
+msgid " (all conflicts fixed: run \"git rebase --continue\")"
+msgstr ""
+
+#: wt-status.c:1361
+#, c-format
+msgid ""
+"You are currently splitting a commit while rebasing branch '%s' on '%s'."
+msgstr ""
+
+#: wt-status.c:1366
+msgid "You are currently splitting a commit during a rebase."
+msgstr ""
+
+#: wt-status.c:1369
+msgid " (Once your working directory is clean, run \"git rebase --continue\")"
+msgstr ""
+
+#: wt-status.c:1373
+#, c-format
+msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
+msgstr ""
+
+#: wt-status.c:1378
+msgid "You are currently editing a commit during a rebase."
+msgstr ""
+
+#: wt-status.c:1381
+msgid " (use \"git commit --amend\" to amend the current commit)"
+msgstr ""
+
+#: wt-status.c:1383
+msgid ""
+" (use \"git rebase --continue\" once you are satisfied with your changes)"
+msgstr ""
+
+#: wt-status.c:1394
+msgid "Cherry-pick currently in progress."
+msgstr ""
+
+#: wt-status.c:1397
+#, c-format
+msgid "You are currently cherry-picking commit %s."
+msgstr ""
+
+#: wt-status.c:1404
+msgid " (fix conflicts and run \"git cherry-pick --continue\")"
+msgstr ""
+
+#: wt-status.c:1407
+msgid " (run \"git cherry-pick --continue\" to continue)"
+msgstr ""
+
+#: wt-status.c:1410
+msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
+msgstr ""
+
+#: wt-status.c:1412
+msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
+msgstr ""
+
+#: wt-status.c:1422
+msgid "Revert currently in progress."
+msgstr ""
+
+#: wt-status.c:1425
+#, c-format
+msgid "You are currently reverting commit %s."
+msgstr ""
+
+#: wt-status.c:1431
+msgid " (fix conflicts and run \"git revert --continue\")"
+msgstr ""
+
+#: wt-status.c:1434
+msgid " (run \"git revert --continue\" to continue)"
+msgstr ""
+
+#: wt-status.c:1437
+msgid " (all conflicts fixed: run \"git revert --continue\")"
+msgstr ""
+
+#: wt-status.c:1439
+msgid " (use \"git revert --abort\" to cancel the revert operation)"
+msgstr ""
+
+#: wt-status.c:1449
+#, c-format
+msgid "You are currently bisecting, started from branch '%s'."
+msgstr ""
+
+#: wt-status.c:1453
+msgid "You are currently bisecting."
+msgstr ""
+
+#: wt-status.c:1456
+msgid " (use \"git bisect reset\" to get back to the original branch)"
+msgstr ""
+
+#: wt-status.c:1665
+msgid "On branch "
+msgstr ""
+
+#: wt-status.c:1672
+msgid "interactive rebase in progress; onto "
+msgstr ""
+
+#: wt-status.c:1674
+msgid "rebase in progress; onto "
+msgstr ""
+
+#: wt-status.c:1679
+msgid "HEAD detached at "
+msgstr ""
+
+#: wt-status.c:1681
+msgid "HEAD detached from "
+msgstr ""
+
+#: wt-status.c:1684
+msgid "Not currently on any branch."
+msgstr ""
+
+#: wt-status.c:1701
+msgid "Initial commit"
+msgstr ""
+
+#: wt-status.c:1702
+msgid "No commits yet"
+msgstr ""
+
+#: wt-status.c:1716
+msgid "Untracked files"
+msgstr ""
+
+#: wt-status.c:1718
+msgid "Ignored files"
+msgstr ""
+
+#: 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 ""
+
+#: wt-status.c:1728
+#, c-format
+msgid "Untracked files not listed%s"
+msgstr ""
+
+#: wt-status.c:1730
+msgid " (use -u option to show untracked files)"
+msgstr ""
+
+#: wt-status.c:1736
+msgid "No changes"
+msgstr ""
+
+#: wt-status.c:1741
+#, c-format
+msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
+msgstr ""
+
+#: wt-status.c:1744
+#, c-format
+msgid "no changes added to commit\n"
+msgstr ""
+
+#: wt-status.c:1747
+#, c-format
+msgid ""
+"nothing added to commit but untracked files present (use \"git add\" to "
+"track)\n"
+msgstr ""
+
+#: wt-status.c:1750
+#, c-format
+msgid "nothing added to commit but untracked files present\n"
+msgstr ""
+
+#: wt-status.c:1753
+#, c-format
+msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
+msgstr ""
+
+#: wt-status.c:1756 wt-status.c:1761
+#, c-format
+msgid "nothing to commit\n"
+msgstr ""
+
+#: wt-status.c:1759
+#, c-format
+msgid "nothing to commit (use -u to show untracked files)\n"
+msgstr ""
+
+#: wt-status.c:1763
+#, c-format
+msgid "nothing to commit, working tree clean\n"
+msgstr ""
+
+#: wt-status.c:1876
+msgid "No commits yet on "
+msgstr ""
+
+#: wt-status.c:1880
+msgid "HEAD (no branch)"
+msgstr ""
+
+#: wt-status.c:1911
+msgid "different"
+msgstr ""
+
+#: wt-status.c:1913 wt-status.c:1921
+msgid "behind "
+msgstr ""
+
+#: wt-status.c:1916 wt-status.c:1919
+msgid "ahead "
+msgstr ""
+
+#. TRANSLATORS: the action is e.g. "pull with rebase"
+#: wt-status.c:2443
+#, c-format
+msgid "cannot %s: You have unstaged changes."
+msgstr ""
+
+#: wt-status.c:2449
+msgid "additionally, your index contains uncommitted changes."
+msgstr ""
+
+#: wt-status.c:2451
+#, c-format
+msgid "cannot %s: Your index contains uncommitted changes."
+msgstr ""
+
+#: builtin/add.c:25
+msgid "git add [<options>] [--] <pathspec>..."
+msgstr ""
+
+#: builtin/add.c:84
+#, c-format
+msgid "unexpected diff status %c"
+msgstr ""
+
+#: builtin/add.c:89 builtin/commit.c:285
+msgid "updating files failed"
+msgstr ""
+
+#: builtin/add.c:99
+#, c-format
+msgid "remove '%s'\n"
+msgstr ""
+
+#: builtin/add.c:174
+msgid "Unstaged changes after refreshing the index:"
+msgstr ""
+
+#: builtin/add.c:234 builtin/rev-parse.c:896
+msgid "Could not read the index"
+msgstr ""
+
+#: builtin/add.c:245
+#, c-format
+msgid "Could not open '%s' for writing."
+msgstr ""
+
+#: builtin/add.c:249
+msgid "Could not write patch"
+msgstr ""
+
+#: builtin/add.c:252
+msgid "editing patch failed"
+msgstr ""
+
+#: builtin/add.c:255
+#, c-format
+msgid "Could not stat '%s'"
+msgstr ""
+
+#: builtin/add.c:257
+msgid "Empty patch. Aborted."
+msgstr ""
+
+#: builtin/add.c:262
+#, c-format
+msgid "Could not apply '%s'"
+msgstr ""
+
+#: builtin/add.c:270
+msgid "The following paths are ignored by one of your .gitignore files:\n"
+msgstr ""
+
+#: 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/add.c:293
+msgid "interactive picking"
+msgstr ""
+
+#: builtin/add.c:294 builtin/checkout.c:1379 builtin/reset.c:306
+msgid "select hunks interactively"
+msgstr ""
+
+#: builtin/add.c:295
+msgid "edit current diff and apply"
+msgstr ""
+
+#: builtin/add.c:296
+msgid "allow adding otherwise ignored files"
+msgstr ""
+
+#: builtin/add.c:297
+msgid "update tracked files"
+msgstr ""
+
+#: builtin/add.c:298
+msgid "renormalize EOL of tracked files (implies -u)"
+msgstr ""
+
+#: builtin/add.c:299
+msgid "record only the fact that the path will be added later"
+msgstr ""
+
+#: builtin/add.c:300
+msgid "add changes from all tracked and untracked files"
+msgstr ""
+
+#: builtin/add.c:303
+msgid "ignore paths removed in the working tree (same as --no-all)"
+msgstr ""
+
+#: builtin/add.c:305
+msgid "don't add, only refresh the index"
+msgstr ""
+
+#: builtin/add.c:306
+msgid "just skip files which cannot be added because of errors"
+msgstr ""
+
+#: builtin/add.c:307
+msgid "check if - even missing - files are ignored in dry run"
+msgstr ""
+
+#: builtin/add.c:309 builtin/update-index.c:1001
+msgid "override the executable bit of the listed files"
+msgstr ""
+
+#: builtin/add.c:311
+msgid "warn when adding an embedded repository"
+msgstr ""
+
+#: 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/add.c:354
+#, c-format
+msgid "adding embedded git repository: %s"
+msgstr ""
+
+#: builtin/add.c:372
+#, c-format
+msgid "Use -f if you really want to add them.\n"
+msgstr ""
+
+#: builtin/add.c:379
+msgid "adding files failed"
+msgstr ""
+
+#: builtin/add.c:419
+msgid "-A and -u are mutually incompatible"
+msgstr ""
+
+#: builtin/add.c:426
+msgid "Option --ignore-missing can only be used together with --dry-run"
+msgstr ""
+
+#: builtin/add.c:430
+#, c-format
+msgid "--chmod param '%s' must be either -x or +x"
+msgstr ""
+
+#: builtin/add.c:445
+#, c-format
+msgid "Nothing specified, nothing added.\n"
+msgstr ""
+
+#: builtin/add.c:446
+#, c-format
+msgid "Maybe you wanted to say 'git add .'?\n"
+msgstr ""
+
+#: builtin/am.c:348
+msgid "could not parse author script"
+msgstr ""
+
+#: builtin/am.c:432
+#, c-format
+msgid "'%s' was deleted by the applypatch-msg hook"
+msgstr ""
+
+#: builtin/am.c:474
+#, c-format
+msgid "Malformed input line: '%s'."
+msgstr ""
+
+#: builtin/am.c:512
+#, c-format
+msgid "Failed to copy notes from '%s' to '%s'"
+msgstr ""
+
+#: builtin/am.c:538
+msgid "fseek failed"
+msgstr ""
+
+#: builtin/am.c:726
+#, c-format
+msgid "could not parse patch '%s'"
+msgstr ""
+
+#: builtin/am.c:791
+msgid "Only one StGIT patch series can be applied at once"
+msgstr ""
+
+#: builtin/am.c:839
+msgid "invalid timestamp"
+msgstr ""
+
+#: builtin/am.c:844 builtin/am.c:856
+msgid "invalid Date line"
+msgstr ""
+
+#: builtin/am.c:851
+msgid "invalid timezone offset"
+msgstr ""
+
+#: builtin/am.c:944
+msgid "Patch format detection failed."
+msgstr ""
+
+#: builtin/am.c:949 builtin/clone.c:409
+#, c-format
+msgid "failed to create directory '%s'"
+msgstr ""
+
+#: builtin/am.c:954
+msgid "Failed to split patches."
+msgstr ""
+
+#: builtin/am.c:1084 builtin/commit.c:371
+msgid "unable to write index file"
+msgstr ""
+
+#: builtin/am.c:1098
+#, c-format
+msgid "When you have resolved this problem, run \"%s --continue\"."
+msgstr ""
+
+#: builtin/am.c:1099
+#, c-format
+msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
+msgstr ""
+
+#: builtin/am.c:1100
+#, c-format
+msgid "To restore the original branch and stop patching, run \"%s --abort\"."
+msgstr ""
+
+#: builtin/am.c:1183
+msgid "Patch sent with format=flowed; space at the end of lines might be lost."
+msgstr ""
+
+#: builtin/am.c:1211
+msgid "Patch is empty."
+msgstr ""
+
+#: builtin/am.c:1277
+#, c-format
+msgid "invalid ident line: %.*s"
+msgstr ""
+
+#: builtin/am.c:1299
+#, c-format
+msgid "unable to parse commit %s"
+msgstr ""
+
+#: builtin/am.c:1495
+msgid "Repository lacks necessary blobs to fall back on 3-way merge."
+msgstr ""
+
+#: builtin/am.c:1497
+msgid "Using index info to reconstruct a base tree..."
+msgstr ""
+
+#: builtin/am.c:1516
+msgid ""
+"Did you hand edit your patch?\n"
+"It does not apply to blobs recorded in its index."
+msgstr ""
+
+#: builtin/am.c:1522
+msgid "Falling back to patching base and 3-way merge..."
+msgstr ""
+
+#: builtin/am.c:1548
+msgid "Failed to merge in the changes."
+msgstr ""
+
+#: builtin/am.c:1580
+msgid "applying to an empty history"
+msgstr ""
+
+#: builtin/am.c:1627 builtin/am.c:1631
+#, c-format
+msgid "cannot resume: %s does not exist."
+msgstr ""
+
+#: builtin/am.c:1647
+msgid "cannot be interactive without stdin connected to a terminal."
+msgstr ""
+
+#: builtin/am.c:1652
+msgid "Commit Body is:"
+msgstr ""
+
+#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
+#. in your translation. The program will only accept English
+#. input at this point.
+#.
+#: builtin/am.c:1662
+msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
+msgstr ""
+
+#: builtin/am.c:1712
+#, c-format
+msgid "Dirty index: cannot apply patches (dirty: %s)"
+msgstr ""
+
+#: builtin/am.c:1752 builtin/am.c:1820
+#, c-format
+msgid "Applying: %.*s"
+msgstr ""
+
+#: builtin/am.c:1769
+msgid "No changes -- Patch already applied."
+msgstr ""
+
+#: builtin/am.c:1775
+#, c-format
+msgid "Patch failed at %s %.*s"
+msgstr ""
+
+#: builtin/am.c:1779
+msgid "Use 'git am --show-current-patch' to see the failed patch"
+msgstr ""
+
+#: 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/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/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/am.c:1989
+msgid "failed to clean index"
+msgstr ""
+
+#: builtin/am.c:2033
+msgid ""
+"You seem to have moved HEAD since the last 'am' failure.\n"
+"Not rewinding to ORIG_HEAD"
+msgstr ""
+
+#: builtin/am.c:2130
+#, c-format
+msgid "Invalid value for --patch-format: %s"
+msgstr ""
+
+#: builtin/am.c:2166
+msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
+msgstr ""
+
+#: builtin/am.c:2167
+msgid "git am [<options>] (--continue | --skip | --abort)"
+msgstr ""
+
+#: builtin/am.c:2173
+msgid "run interactively"
+msgstr ""
+
+#: builtin/am.c:2175
+msgid "historical option -- no-op"
+msgstr ""
+
+#: builtin/am.c:2177
+msgid "allow fall back on 3way merging if needed"
+msgstr ""
+
+#: 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/am.c:2180
+msgid "add a Signed-off-by line to the commit message"
+msgstr ""
+
+#: builtin/am.c:2183
+msgid "recode into utf8 (default)"
+msgstr ""
+
+#: builtin/am.c:2185
+msgid "pass -k flag to git-mailinfo"
+msgstr ""
+
+#: builtin/am.c:2187
+msgid "pass -b flag to git-mailinfo"
+msgstr ""
+
+#: builtin/am.c:2189
+msgid "pass -m flag to git-mailinfo"
+msgstr ""
+
+#: builtin/am.c:2191
+msgid "pass --keep-cr flag to git-mailsplit for mbox format"
+msgstr ""
+
+#: builtin/am.c:2194
+msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
+msgstr ""
+
+#: builtin/am.c:2197
+msgid "strip everything before a scissors line"
+msgstr ""
+
+#: 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/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/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/am.c:2223
+msgid "format the patch(es) are in"
+msgstr ""
+
+#: builtin/am.c:2229
+msgid "override error message when patch failure occurs"
+msgstr ""
+
+#: builtin/am.c:2231
+msgid "continue applying patches after resolving a conflict"
+msgstr ""
+
+#: builtin/am.c:2234
+msgid "synonyms for --continue"
+msgstr ""
+
+#: builtin/am.c:2237
+msgid "skip the current patch"
+msgstr ""
+
+#: builtin/am.c:2240
+msgid "restore the original branch and abort the patching operation."
+msgstr ""
+
+#: builtin/am.c:2243
+msgid "abort the patching operation but keep HEAD where it is."
+msgstr ""
+
+#: builtin/am.c:2246
+msgid "show the patch being applied."
+msgstr ""
+
+#: builtin/am.c:2250
+msgid "lie about committer date"
+msgstr ""
+
+#: builtin/am.c:2252
+msgid "use current timestamp for author date"
+msgstr ""
+
+#: 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/am.c:2255 builtin/rebase.c:490 builtin/rebase.c:1454
+msgid "GPG-sign commits"
+msgstr ""
+
+#: builtin/am.c:2258
+msgid "(internal use for git-rebase)"
+msgstr ""
+
+#: 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/am.c:2283
+msgid "failed to read the index"
+msgstr ""
+
+#: builtin/am.c:2298
+#, c-format
+msgid "previous rebase directory %s still exists but mbox given."
+msgstr ""
+
+#: builtin/am.c:2322
+#, c-format
+msgid ""
+"Stray %s directory found.\n"
+"Use \"git am --abort\" to remove it."
+msgstr ""
+
+#: 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/archive.c:17
+#, c-format
+msgid "could not create archive file '%s'"
+msgstr ""
+
+#: builtin/archive.c:20
+msgid "could not redirect output"
+msgstr ""
+
+#: builtin/archive.c:37
+msgid "git archive: Remote with no URL"
+msgstr ""
+
+#: builtin/archive.c:61
+msgid "git archive: expected ACK/NAK, got a flush packet"
+msgstr ""
+
+#: builtin/archive.c:64
+#, c-format
+msgid "git archive: NACK %s"
+msgstr ""
+
+#: builtin/archive.c:65
+msgid "git archive: protocol error"
+msgstr ""
+
+#: builtin/archive.c:69
+msgid "git archive: expected a flush"
+msgstr ""
+
+#: builtin/bisect--helper.c:22
+msgid "git bisect--helper --next-all [--no-checkout]"
+msgstr ""
+
+#: builtin/bisect--helper.c:23
+msgid "git bisect--helper --write-terms <bad_term> <good_term>"
+msgstr ""
+
+#: builtin/bisect--helper.c:24
+msgid "git bisect--helper --bisect-clean-state"
+msgstr ""
+
+#: builtin/bisect--helper.c:25
+msgid "git bisect--helper --bisect-reset [<commit>]"
+msgstr ""
+
+#: builtin/bisect--helper.c:26
+msgid ""
+"git bisect--helper --bisect-write [--no-log] <state> <revision> <good_term> "
+"<bad_term>"
+msgstr ""
+
+#: builtin/bisect--helper.c:27
+msgid ""
+"git bisect--helper --bisect-check-and-set-terms <command> <good_term> "
+"<bad_term>"
+msgstr ""
+
+#: builtin/bisect--helper.c:28
+msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
+msgstr ""
+
+#: builtin/bisect--helper.c:29
+msgid ""
+"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
+"term-new]"
+msgstr ""
+
+#: 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/bisect--helper.c:86
+#, c-format
+msgid "'%s' is not a valid term"
+msgstr ""
+
+#: builtin/bisect--helper.c:90
+#, c-format
+msgid "can't use the builtin command '%s' as a term"
+msgstr ""
+
+#: builtin/bisect--helper.c:100
+#, c-format
+msgid "can't change the meaning of the term '%s'"
+msgstr ""
+
+#: builtin/bisect--helper.c:111
+msgid "please use two different terms"
+msgstr ""
+
+#: builtin/bisect--helper.c:118
+msgid "could not open the file BISECT_TERMS"
+msgstr ""
+
+#: builtin/bisect--helper.c:155
+#, c-format
+msgid "We are not bisecting.\n"
+msgstr ""
+
+#: builtin/bisect--helper.c:163
+#, c-format
+msgid "'%s' is not a valid commit"
+msgstr ""
+
+#: builtin/bisect--helper.c:174
+#, c-format
+msgid ""
+"could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
+msgstr ""
+
+#: builtin/bisect--helper.c:215
+#, c-format
+msgid "Bad bisect_write argument: %s"
+msgstr ""
+
+#: builtin/bisect--helper.c:220
+#, c-format
+msgid "couldn't get the oid of the rev '%s'"
+msgstr ""
+
+#: builtin/bisect--helper.c:232
+#, c-format
+msgid "couldn't open the file '%s'"
+msgstr ""
+
+#: builtin/bisect--helper.c:258
+#, c-format
+msgid "Invalid command: you're currently in a %s/%s bisect"
+msgstr ""
+
+#: 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/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/bisect--helper.c:321
+#, c-format
+msgid "bisecting only with a %s commit"
+msgstr ""
+
+#. 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/bisect--helper.c:376
+msgid "no terms defined"
+msgstr ""
+
+#: 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/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/bisect--helper.c:475
+#, c-format
+msgid "unrecognized option: '%s'"
+msgstr ""
+
+#: builtin/bisect--helper.c:479
+#, c-format
+msgid "'%s' does not appear to be a valid revision"
+msgstr ""
+
+#: builtin/bisect--helper.c:511
+msgid "bad HEAD - I need a HEAD"
+msgstr ""
+
+#: builtin/bisect--helper.c:526
+#, c-format
+msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
+msgstr ""
+
+#: builtin/bisect--helper.c:547
+msgid "won't bisect on cg-seek'ed tree"
+msgstr ""
+
+#: builtin/bisect--helper.c:550
+msgid "bad HEAD - strange symbolic ref"
+msgstr ""
+
+#: builtin/bisect--helper.c:627
+msgid "perform 'git bisect next'"
+msgstr ""
+
+#: builtin/bisect--helper.c:629
+msgid "write the terms to .git/BISECT_TERMS"
+msgstr ""
+
+#: builtin/bisect--helper.c:631
+msgid "cleanup the bisection state"
+msgstr ""
+
+#: builtin/bisect--helper.c:633
+msgid "check for expected revs"
+msgstr ""
+
+#: builtin/bisect--helper.c:635
+msgid "reset the bisection state"
+msgstr ""
+
+#: builtin/bisect--helper.c:637
+msgid "write out the bisection state in BISECT_LOG"
+msgstr ""
+
+#: builtin/bisect--helper.c:639
+msgid "check and set terms in a bisection state"
+msgstr ""
+
+#: builtin/bisect--helper.c:641
+msgid "check whether bad or good terms exist"
+msgstr ""
+
+#: builtin/bisect--helper.c:643
+msgid "print out the bisect terms"
+msgstr ""
+
+#: builtin/bisect--helper.c:645
+msgid "start the bisect session"
+msgstr ""
+
+#: builtin/bisect--helper.c:647
+msgid "update BISECT_HEAD instead of checking out the current commit"
+msgstr ""
+
+#: builtin/bisect--helper.c:649
+msgid "no log for BISECT_WRITE"
+msgstr ""
+
+#: builtin/bisect--helper.c:666
+msgid "--write-terms requires two arguments"
+msgstr ""
+
+#: builtin/bisect--helper.c:670
+msgid "--bisect-clean-state requires no arguments"
+msgstr ""
+
+#: builtin/bisect--helper.c:677
+msgid "--bisect-reset requires either no argument or a commit"
+msgstr ""
+
+#: builtin/bisect--helper.c:681
+msgid "--bisect-write requires either 4 or 5 arguments"
+msgstr ""
+
+#: builtin/bisect--helper.c:687
+msgid "--check-and-set-terms requires 3 arguments"
+msgstr ""
+
+#: builtin/bisect--helper.c:693
+msgid "--bisect-next-check requires 2 or 3 arguments"
+msgstr ""
+
+#: builtin/bisect--helper.c:699
+msgid "--bisect-terms requires 0 or 1 argument"
+msgstr ""
+
+#: builtin/blame.c:32
+msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
+msgstr ""
+
+#: builtin/blame.c:37
+msgid "<rev-opts> are documented in git-rev-list(1)"
+msgstr ""
+
+#: builtin/blame.c:407
+#, c-format
+msgid "expecting a color: %s"
+msgstr ""
+
+#: builtin/blame.c:414
+msgid "must end with a color"
+msgstr ""
+
+#: builtin/blame.c:701
+#, c-format
+msgid "invalid color '%s' in color.blame.repeatedLines"
+msgstr ""
+
+#: builtin/blame.c:719
+msgid "invalid value for blame.coloring"
+msgstr ""
+
+#: builtin/blame.c:794
+msgid "Show blame entries as we find them, incrementally"
+msgstr ""
+
+#: builtin/blame.c:795
+msgid "Show blank SHA-1 for boundary commits (Default: off)"
+msgstr ""
+
+#: builtin/blame.c:796
+msgid "Do not treat root commits as boundaries (Default: off)"
+msgstr ""
+
+#: builtin/blame.c:797
+msgid "Show work cost statistics"
+msgstr ""
+
+#: builtin/blame.c:798
+msgid "Force progress reporting"
+msgstr ""
+
+#: builtin/blame.c:799
+msgid "Show output score for blame entries"
+msgstr ""
+
+#: builtin/blame.c:800
+msgid "Show original filename (Default: auto)"
+msgstr ""
+
+#: builtin/blame.c:801
+msgid "Show original linenumber (Default: off)"
+msgstr ""
+
+#: builtin/blame.c:802
+msgid "Show in a format designed for machine consumption"
+msgstr ""
+
+#: builtin/blame.c:803
+msgid "Show porcelain format with per-line commit information"
+msgstr ""
+
+#: builtin/blame.c:804
+msgid "Use the same output mode as git-annotate (Default: off)"
+msgstr ""
+
+#: builtin/blame.c:805
+msgid "Show raw timestamp (Default: off)"
+msgstr ""
+
+#: builtin/blame.c:806
+msgid "Show long commit SHA1 (Default: off)"
+msgstr ""
+
+#: builtin/blame.c:807
+msgid "Suppress author name and timestamp (Default: off)"
+msgstr ""
+
+#: builtin/blame.c:808
+msgid "Show author email instead of name (Default: off)"
+msgstr ""
+
+#: builtin/blame.c:809
+msgid "Ignore whitespace differences"
+msgstr ""
+
+#: builtin/blame.c:810
+msgid "color redundant metadata from previous line differently"
+msgstr ""
+
+#: builtin/blame.c:811
+msgid "color lines by age"
+msgstr ""
+
+#: builtin/blame.c:818
+msgid "Use an experimental heuristic to improve diffs"
+msgstr ""
+
+#: builtin/blame.c:820
+msgid "Spend extra cycles to find better match"
+msgstr ""
+
+#: builtin/blame.c:821
+msgid "Use revisions from <file> instead of calling git-rev-list"
+msgstr ""
+
+#: builtin/blame.c:822
+msgid "Use <file>'s contents as the final image"
+msgstr ""
+
+#: builtin/blame.c:823 builtin/blame.c:824
+msgid "score"
+msgstr ""
+
+#: builtin/blame.c:823
+msgid "Find line copies within and across files"
+msgstr ""
+
+#: builtin/blame.c:824
+msgid "Find line movements within and across files"
+msgstr ""
+
+#: builtin/blame.c:825
+msgid "n,m"
+msgstr ""
+
+#: builtin/blame.c:825
+msgid "Process only line range n,m, counting from 1"
+msgstr ""
+
+#: builtin/blame.c:876
+msgid "--progress can't be used with --incremental or porcelain formats"
+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:927
+msgid "4 years, 11 months ago"
+msgstr ""
+
+#: 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/branch.c:29
+msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
+msgstr ""
+
+#: builtin/branch.c:30
+msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
+msgstr ""
+
+#: builtin/branch.c:31
+msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
+msgstr ""
+
+#: builtin/branch.c:32
+msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
+msgstr ""
+
+#: builtin/branch.c:33
+msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
+msgstr ""
+
+#: builtin/branch.c:34
+msgid "git branch [<options>] [-r | -a] [--points-at]"
+msgstr ""
+
+#: builtin/branch.c:35
+msgid "git branch [<options>] [-r | -a] [--format]"
+msgstr ""
+
+#: builtin/branch.c:151
+#, c-format
+msgid ""
+"deleting branch '%s' that has been merged to\n"
+" '%s', but not yet merged to HEAD."
+msgstr ""
+
+#: builtin/branch.c:155
+#, c-format
+msgid ""
+"not deleting branch '%s' that is not yet merged to\n"
+" '%s', even though it is merged to HEAD."
+msgstr ""
+
+#: builtin/branch.c:169
+#, c-format
+msgid "Couldn't look up commit object for '%s'"
+msgstr ""
+
+#: builtin/branch.c:173
+#, c-format
+msgid ""
+"The branch '%s' is not fully merged.\n"
+"If you are sure you want to delete it, run 'git branch -D %s'."
+msgstr ""
+
+#: builtin/branch.c:186
+msgid "Update of config-file failed"
+msgstr ""
+
+#: builtin/branch.c:217
+msgid "cannot use -a with -d"
+msgstr ""
+
+#: builtin/branch.c:223
+msgid "Couldn't look up commit object for HEAD"
+msgstr ""
+
+#: builtin/branch.c:237
+#, c-format
+msgid "Cannot delete branch '%s' checked out at '%s'"
+msgstr ""
+
+#: builtin/branch.c:252
+#, c-format
+msgid "remote-tracking branch '%s' not found."
+msgstr ""
+
+#: builtin/branch.c:253
+#, c-format
+msgid "branch '%s' not found."
+msgstr ""
+
+#: builtin/branch.c:268
+#, c-format
+msgid "Error deleting remote-tracking branch '%s'"
+msgstr ""
+
+#: builtin/branch.c:269
+#, c-format
+msgid "Error deleting branch '%s'"
+msgstr ""
+
+#: builtin/branch.c:276
+#, c-format
+msgid "Deleted remote-tracking branch %s (was %s).\n"
+msgstr ""
+
+#: builtin/branch.c:277
+#, c-format
+msgid "Deleted branch %s (was %s).\n"
+msgstr ""
+
+#: builtin/branch.c:421 builtin/tag.c:60
+msgid "unable to parse format string"
+msgstr ""
+
+#: builtin/branch.c:452
+msgid "could not resolve HEAD"
+msgstr ""
+
+#: builtin/branch.c:458
+#, c-format
+msgid "HEAD (%s) points outside of refs/heads/"
+msgstr ""
+
+#: builtin/branch.c:473
+#, c-format
+msgid "Branch %s is being rebased at %s"
+msgstr ""
+
+#: builtin/branch.c:477
+#, c-format
+msgid "Branch %s is being bisected at %s"
+msgstr ""
+
+#: builtin/branch.c:494
+msgid "cannot copy the current branch while not on any."
+msgstr ""
+
+#: builtin/branch.c:496
+msgid "cannot rename the current branch while not on any."
+msgstr ""
+
+#: builtin/branch.c:507
+#, c-format
+msgid "Invalid branch name: '%s'"
+msgstr ""
+
+#: builtin/branch.c:534
+msgid "Branch rename failed"
+msgstr ""
+
+#: builtin/branch.c:536
+msgid "Branch copy failed"
+msgstr ""
+
+#: builtin/branch.c:540
+#, c-format
+msgid "Created a copy of a misnamed branch '%s'"
+msgstr ""
+
+#: builtin/branch.c:543
+#, c-format
+msgid "Renamed a misnamed branch '%s' away"
+msgstr ""
+
+#: builtin/branch.c:549
+#, c-format
+msgid "Branch renamed to %s, but HEAD is not updated!"
+msgstr ""
+
+#: builtin/branch.c:558
+msgid "Branch is renamed, but update of config-file failed"
+msgstr ""
+
+#: builtin/branch.c:560
+msgid "Branch is copied, but update of config-file failed"
+msgstr ""
+
+#: 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/branch.c:610
+msgid "Generic options"
+msgstr ""
+
+#: builtin/branch.c:612
+msgid "show hash and subject, give twice for upstream branch"
+msgstr ""
+
+#: builtin/branch.c:613
+msgid "suppress informational messages"
+msgstr ""
+
+#: builtin/branch.c:614
+msgid "set up tracking mode (see git-pull(1))"
+msgstr ""
+
+#: builtin/branch.c:616
+msgid "do not use"
+msgstr ""
+
+#: builtin/branch.c:618 builtin/rebase.c:485
+msgid "upstream"
+msgstr ""
+
+#: builtin/branch.c:618
+msgid "change the upstream info"
+msgstr ""
+
+#: builtin/branch.c:619
+msgid "Unset the upstream info"
+msgstr ""
+
+#: builtin/branch.c:620
+msgid "use colored output"
+msgstr ""
+
+#: builtin/branch.c:621
+msgid "act on remote-tracking branches"
+msgstr ""
+
+#: builtin/branch.c:623 builtin/branch.c:625
+msgid "print only branches that contain the commit"
+msgstr ""
+
+#: builtin/branch.c:624 builtin/branch.c:626
+msgid "print only branches that don't contain the commit"
+msgstr ""
+
+#: builtin/branch.c:629
+msgid "Specific git-branch actions:"
+msgstr ""
+
+#: builtin/branch.c:630
+msgid "list both remote-tracking and local branches"
+msgstr ""
+
+#: builtin/branch.c:632
+msgid "delete fully merged branch"
+msgstr ""
+
+#: builtin/branch.c:633
+msgid "delete branch (even if not merged)"
+msgstr ""
+
+#: builtin/branch.c:634
+msgid "move/rename a branch and its reflog"
+msgstr ""
+
+#: builtin/branch.c:635
+msgid "move/rename a branch, even if target exists"
+msgstr ""
+
+#: builtin/branch.c:636
+msgid "copy a branch and its reflog"
+msgstr ""
+
+#: builtin/branch.c:637
+msgid "copy a branch, even if target exists"
+msgstr ""
+
+#: builtin/branch.c:638
+msgid "list branch names"
+msgstr ""
+
+#: builtin/branch.c:639
+msgid "show current branch name"
+msgstr ""
+
+#: builtin/branch.c:640
+msgid "create the branch's reflog"
+msgstr ""
+
+#: builtin/branch.c:642
+msgid "edit the description for the branch"
+msgstr ""
+
+#: builtin/branch.c:643
+msgid "force creation, move/rename, deletion"
+msgstr ""
+
+#: builtin/branch.c:644
+msgid "print only branches that are merged"
+msgstr ""
+
+#: builtin/branch.c:645
+msgid "print only branches that are not merged"
+msgstr ""
+
+#: builtin/branch.c:646
+msgid "list branches in columns"
+msgstr ""
+
+#: 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/branch.c:650
+msgid "print only branches of the object"
+msgstr ""
+
+#: builtin/branch.c:652 builtin/for-each-ref.c:48 builtin/tag.c:434
+msgid "sorting and filtering are case insensitive"
+msgstr ""
+
+#: 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/branch.c:676 builtin/clone.c:748
+msgid "HEAD not found below refs/heads!"
+msgstr ""
+
+#: builtin/branch.c:700
+msgid "--column and --verbose are incompatible"
+msgstr ""
+
+#: builtin/branch.c:715 builtin/branch.c:769 builtin/branch.c:778
+msgid "branch name required"
+msgstr ""
+
+#: builtin/branch.c:745
+msgid "Cannot give description to detached HEAD"
+msgstr ""
+
+#: builtin/branch.c:750
+msgid "cannot edit description of more than one branch"
+msgstr ""
+
+#: builtin/branch.c:757
+#, c-format
+msgid "No commit on branch '%s' yet."
+msgstr ""
+
+#: builtin/branch.c:760
+#, c-format
+msgid "No branch named '%s'."
+msgstr ""
+
+#: builtin/branch.c:775
+msgid "too many branches for a copy operation"
+msgstr ""
+
+#: builtin/branch.c:784
+msgid "too many arguments for a rename operation"
+msgstr ""
+
+#: builtin/branch.c:789
+msgid "too many arguments to set new upstream"
+msgstr ""
+
+#: builtin/branch.c:793
+#, c-format
+msgid ""
+"could not set upstream of HEAD to %s when it does not point to any branch."
+msgstr ""
+
+#: builtin/branch.c:796 builtin/branch.c:819
+#, c-format
+msgid "no such branch '%s'"
+msgstr ""
+
+#: builtin/branch.c:800
+#, c-format
+msgid "branch '%s' does not exist"
+msgstr ""
+
+#: builtin/branch.c:813
+msgid "too many arguments to unset upstream"
+msgstr ""
+
+#: builtin/branch.c:817
+msgid "could not unset upstream of HEAD when it does not point to any branch."
+msgstr ""
+
+#: builtin/branch.c:823
+#, c-format
+msgid "Branch '%s' has no upstream information"
+msgstr ""
+
+#: builtin/branch.c:833
+msgid "-a and -r options to 'git branch' do not make sense with a branch name"
+msgstr ""
+
+#: builtin/branch.c:836
+msgid ""
+"the '--set-upstream' option is no longer supported. Please use '--track' or "
+"'--set-upstream-to' instead."
+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."
+msgstr ""
+
+#: builtin/bundle.c:62
+msgid "Need a repository to unbundle."
+msgstr ""
+
+#: 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/cat-file.c:594
+msgid ""
+"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
+"filters]"
+msgstr ""
+
+#: builtin/cat-file.c:615
+msgid "only one batch option may be specified"
+msgstr ""
+
+#: builtin/cat-file.c:633
+msgid "<type> can be one of: blob, tree, commit, tag"
+msgstr ""
+
+#: builtin/cat-file.c:634
+msgid "show object type"
+msgstr ""
+
+#: builtin/cat-file.c:635
+msgid "show object size"
+msgstr ""
+
+#: builtin/cat-file.c:637
+msgid "exit with zero when there's no error"
+msgstr ""
+
+#: builtin/cat-file.c:638
+msgid "pretty-print object's content"
+msgstr ""
+
+#: builtin/cat-file.c:640
+msgid "for blob objects, run textconv on object's content"
+msgstr ""
+
+#: builtin/cat-file.c:642
+msgid "for blob objects, run filters on object's content"
+msgstr ""
+
+#: builtin/cat-file.c:643 git-submodule.sh:936
+msgid "blob"
+msgstr ""
+
+#: builtin/cat-file.c:644
+msgid "use a specific path for --textconv/--filters"
+msgstr ""
+
+#: builtin/cat-file.c:646
+msgid "allow -s and -t to work with broken/corrupt objects"
+msgstr ""
+
+#: builtin/cat-file.c:647
+msgid "buffer --batch output"
+msgstr ""
+
+#: builtin/cat-file.c:649
+msgid "show info and content of objects fed from the standard input"
+msgstr ""
+
+#: builtin/cat-file.c:653
+msgid "show info about objects fed from the standard input"
+msgstr ""
+
+#: builtin/cat-file.c:657
+msgid "follow in-tree symlinks (used with --batch or --batch-check)"
+msgstr ""
+
+#: builtin/cat-file.c:659
+msgid "show all objects with --batch or --batch-check"
+msgstr ""
+
+#: builtin/cat-file.c:661
+msgid "do not order --batch-all-objects output"
+msgstr ""
+
+#: builtin/check-attr.c:13
+msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
+msgstr ""
+
+#: builtin/check-attr.c:14
+msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
+msgstr ""
+
+#: builtin/check-attr.c:21
+msgid "report all attributes set on file"
+msgstr ""
+
+#: builtin/check-attr.c:22
+msgid "use .gitattributes only from the index"
+msgstr ""
+
+#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:102
+msgid "read file names from stdin"
+msgstr ""
+
+#: builtin/check-attr.c:25 builtin/check-ignore.c:27
+msgid "terminate input and output records by a NUL character"
+msgstr ""
+
+#: builtin/check-ignore.c:21 builtin/checkout.c:1355 builtin/gc.c:538
+#: builtin/worktree.c:499
+msgid "suppress progress reporting"
+msgstr ""
+
+#: builtin/check-ignore.c:29
+msgid "show non-matching input paths"
+msgstr ""
+
+#: builtin/check-ignore.c:31
+msgid "ignore index when checking"
+msgstr ""
+
+#: builtin/check-ignore.c:160
+msgid "cannot specify pathnames with --stdin"
+msgstr ""
+
+#: builtin/check-ignore.c:163
+msgid "-z only makes sense with --stdin"
+msgstr ""
+
+#: builtin/check-ignore.c:165
+msgid "no path specified"
+msgstr ""
+
+#: builtin/check-ignore.c:169
+msgid "--quiet is only valid with a single pathname"
+msgstr ""
+
+#: builtin/check-ignore.c:171
+msgid "cannot have both --quiet and --verbose"
+msgstr ""
+
+#: builtin/check-ignore.c:174
+msgid "--non-matching is only valid with --verbose"
+msgstr ""
+
+#: builtin/check-mailmap.c:9
+msgid "git check-mailmap [<options>] <contact>..."
+msgstr ""
+
+#: builtin/check-mailmap.c:14
+msgid "also read contacts from stdin"
+msgstr ""
+
+#: builtin/check-mailmap.c:25
+#, c-format
+msgid "unable to parse contact: %s"
+msgstr ""
+
+#: builtin/check-mailmap.c:48
+msgid "no contacts specified"
+msgstr ""
+
+#: builtin/checkout-index.c:131
+msgid "git checkout-index [<options>] [--] [<file>...]"
+msgstr ""
+
+#: builtin/checkout-index.c:148
+msgid "stage should be between 1 and 3 or all"
+msgstr ""
+
+#: builtin/checkout-index.c:164
+msgid "check out all files in the index"
+msgstr ""
+
+#: builtin/checkout-index.c:165
+msgid "force overwrite of existing files"
+msgstr ""
+
+#: builtin/checkout-index.c:167
+msgid "no warning for existing files and files not in index"
+msgstr ""
+
+#: builtin/checkout-index.c:169
+msgid "don't checkout new files"
+msgstr ""
+
+#: builtin/checkout-index.c:171
+msgid "update stat information in the index file"
+msgstr ""
+
+#: builtin/checkout-index.c:175
+msgid "read list of paths from the standard input"
+msgstr ""
+
+#: builtin/checkout-index.c:177
+msgid "write the content to temporary files"
+msgstr ""
+
+#: 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/checkout-index.c:179
+msgid "when creating files, prepend <string>"
+msgstr ""
+
+#: builtin/checkout-index.c:181
+msgid "copy out the files from named stage"
+msgstr ""
+
+#: builtin/checkout.c:32
+msgid "git checkout [<options>] <branch>"
+msgstr ""
+
+#: builtin/checkout.c:33
+msgid "git checkout [<options>] [<branch>] -- <file>..."
+msgstr ""
+
+#: builtin/checkout.c:151 builtin/checkout.c:190
+#, c-format
+msgid "path '%s' does not have our version"
+msgstr ""
+
+#: builtin/checkout.c:153 builtin/checkout.c:192
+#, c-format
+msgid "path '%s' does not have their version"
+msgstr ""
+
+#: builtin/checkout.c:169
+#, c-format
+msgid "path '%s' does not have all necessary versions"
+msgstr ""
+
+#: builtin/checkout.c:219
+#, c-format
+msgid "path '%s' does not have necessary versions"
+msgstr ""
+
+#: builtin/checkout.c:237
+#, c-format
+msgid "path '%s': cannot merge"
+msgstr ""
+
+#: builtin/checkout.c:253
+#, c-format
+msgid "Unable to add merge result for '%s'"
+msgstr ""
+
+#: 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/checkout.c:343 builtin/checkout.c:346
+#, c-format
+msgid "'%s' cannot be used with %s"
+msgstr ""
+
+#: builtin/checkout.c:349
+#, c-format
+msgid "Cannot update paths and switch to branch '%s' at the same time."
+msgstr ""
+
+#: builtin/checkout.c:396 builtin/checkout.c:403
+#, c-format
+msgid "path '%s' is unmerged"
+msgstr ""
+
+#: builtin/checkout.c:442
+#, c-format
+msgid "Recreated %d merge conflict"
+msgid_plural "Recreated %d merge conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/checkout.c:447
+#, c-format
+msgid "Updated %d path from %s"
+msgid_plural "Updated %d paths from %s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: 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/checkout.c:695
+msgid "you need to resolve your current index first"
+msgstr ""
+
+#: builtin/checkout.c:744
+#, c-format
+msgid ""
+"cannot continue with staged changes in the following files:\n"
+"%s"
+msgstr ""
+
+#: builtin/checkout.c:751
+#, c-format
+msgid "staged changes in the following files may be lost: %s"
+msgstr ""
+
+#: builtin/checkout.c:848
+#, c-format
+msgid "Can not do reflog for '%s': %s\n"
+msgstr ""
+
+#: builtin/checkout.c:890
+msgid "HEAD is now at"
+msgstr ""
+
+#: builtin/checkout.c:894 builtin/clone.c:701
+msgid "unable to update HEAD"
+msgstr ""
+
+#: builtin/checkout.c:898
+#, c-format
+msgid "Reset branch '%s'\n"
+msgstr ""
+
+#: builtin/checkout.c:901
+#, c-format
+msgid "Already on '%s'\n"
+msgstr ""
+
+#: builtin/checkout.c:905
+#, c-format
+msgid "Switched to and reset branch '%s'\n"
+msgstr ""
+
+#: builtin/checkout.c:907 builtin/checkout.c:1283
+#, c-format
+msgid "Switched to a new branch '%s'\n"
+msgstr ""
+
+#: builtin/checkout.c:909
+#, c-format
+msgid "Switched to branch '%s'\n"
+msgstr ""
+
+#: builtin/checkout.c:960
+#, c-format
+msgid " ... and %d more.\n"
+msgstr ""
+
+#: builtin/checkout.c:966
+#, c-format
+msgid ""
+"Warning: you are leaving %d commit behind, not connected to\n"
+"any of your branches:\n"
+"\n"
+"%s\n"
+msgid_plural ""
+"Warning: you are leaving %d commits behind, not connected to\n"
+"any of your branches:\n"
+"\n"
+"%s\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/checkout.c: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/checkout.c:1017
+msgid "internal error in revision walk"
+msgstr ""
+
+#: builtin/checkout.c:1021
+msgid "Previous HEAD position was"
+msgstr ""
+
+#: builtin/checkout.c:1052 builtin/checkout.c:1278
+msgid "You are on a branch yet to be born"
+msgstr ""
+
+#: builtin/checkout.c:1173
+#, c-format
+msgid "only one reference expected, %d given."
+msgstr ""
+
+#: 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/checkout.c:1222 builtin/worktree.c:290 builtin/worktree.c:448
+#, c-format
+msgid "invalid reference: %s"
+msgstr ""
+
+#: builtin/checkout.c:1251
+#, c-format
+msgid "reference is not a tree: %s"
+msgstr ""
+
+#: builtin/checkout.c:1292
+msgid "paths cannot be used with switching branches"
+msgstr ""
+
+#: builtin/checkout.c:1295 builtin/checkout.c:1299 builtin/checkout.c:1303
+#, c-format
+msgid "'%s' cannot be used with switching branches"
+msgstr ""
+
+#: 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/checkout.c:1323
+#, c-format
+msgid "Cannot switch branch to a non-commit '%s'"
+msgstr ""
+
+#: 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/checkout.c:1357
+msgid "create and checkout a new branch"
+msgstr ""
+
+#: builtin/checkout.c:1359
+msgid "create/reset and checkout a branch"
+msgstr ""
+
+#: builtin/checkout.c:1360
+msgid "create reflog for new branch"
+msgstr ""
+
+#: builtin/checkout.c:1361 builtin/worktree.c:496
+msgid "detach HEAD at named commit"
+msgstr ""
+
+#: builtin/checkout.c:1362
+msgid "set upstream info for new branch"
+msgstr ""
+
+#: builtin/checkout.c:1364
+msgid "new-branch"
+msgstr ""
+
+#: builtin/checkout.c:1364
+msgid "new unparented branch"
+msgstr ""
+
+#: builtin/checkout.c:1366
+msgid "checkout our version for unmerged files"
+msgstr ""
+
+#: builtin/checkout.c:1369
+msgid "checkout their version for unmerged files"
+msgstr ""
+
+#: builtin/checkout.c:1371
+msgid "force checkout (throw away local modifications)"
+msgstr ""
+
+#: builtin/checkout.c:1373
+msgid "perform a 3-way merge with the new branch"
+msgstr ""
+
+#: builtin/checkout.c:1375 builtin/merge.c:284
+msgid "update ignored files (default)"
+msgstr ""
+
+#: builtin/checkout.c:1377 builtin/log.c:1594 parse-options.h:317
+msgid "style"
+msgstr ""
+
+#: builtin/checkout.c:1378
+msgid "conflict style (merge or diff3)"
+msgstr ""
+
+#: builtin/checkout.c:1381
+msgid "do not limit pathspecs to sparse entries only"
+msgstr ""
+
+#: builtin/checkout.c:1383
+msgid "do not second guess 'git checkout <no-such-branch>'"
+msgstr ""
+
+#: builtin/checkout.c:1385
+msgid "do not check if another worktree is holding the given ref"
+msgstr ""
+
+#: 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/checkout.c:1390
+msgid "use overlay mode (default)"
+msgstr ""
+
+#: builtin/checkout.c:1422
+msgid "-b, -B and --orphan are mutually exclusive"
+msgstr ""
+
+#: builtin/checkout.c:1425
+msgid "-p and --overlay are mutually exclusive"
+msgstr ""
+
+#: builtin/checkout.c:1442
+msgid "--track needs a branch name"
+msgstr ""
+
+#: builtin/checkout.c:1447
+msgid "missing branch name; try -b"
+msgstr ""
+
+#: builtin/checkout.c:1484
+msgid "invalid path specification"
+msgstr ""
+
+#: builtin/checkout.c:1491
+#, c-format
+msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
+msgstr ""
+
+#: builtin/checkout.c:1495
+#, c-format
+msgid "git checkout: --detach does not take a path argument '%s'"
+msgstr ""
+
+#: builtin/checkout.c:1499
+msgid ""
+"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
+"checking out of the index."
+msgstr ""
+
+#: 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/clean.c:28
+msgid ""
+"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
+msgstr ""
+
+#: builtin/clean.c:32
+#, c-format
+msgid "Removing %s\n"
+msgstr ""
+
+#: builtin/clean.c:33
+#, c-format
+msgid "Would remove %s\n"
+msgstr ""
+
+#: builtin/clean.c:34
+#, c-format
+msgid "Skipping repository %s\n"
+msgstr ""
+
+#: builtin/clean.c:35
+#, c-format
+msgid "Would skip repository %s\n"
+msgstr ""
+
+#: builtin/clean.c:36
+#, c-format
+msgid "failed to remove %s"
+msgstr ""
+
+#: 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/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/clean.c:519 git-add--interactive.perl:554
+#: git-add--interactive.perl:559
+#, c-format, perl-format
+msgid "Huh (%s)?\n"
+msgstr ""
+
+#: builtin/clean.c:661
+#, c-format
+msgid "Input ignore patterns>> "
+msgstr ""
+
+#: builtin/clean.c:698
+#, c-format
+msgid "WARNING: Cannot find items matched by: %s"
+msgstr ""
+
+#: builtin/clean.c:719
+msgid "Select items to delete"
+msgstr ""
+
+#. TRANSLATORS: Make sure to keep [y/N] as is
+#: builtin/clean.c:760
+#, c-format
+msgid "Remove %s [y/N]? "
+msgstr ""
+
+#: builtin/clean.c:785 git-add--interactive.perl:1717
+#, c-format
+msgid "Bye.\n"
+msgstr ""
+
+#: 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/clean.c:820 git-add--interactive.perl:1793
+msgid "*** Commands ***"
+msgstr ""
+
+#: builtin/clean.c:821 git-add--interactive.perl:1790
+msgid "What now"
+msgstr ""
+
+#: 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/clean.c:907
+msgid "do not print names of files removed"
+msgstr ""
+
+#: builtin/clean.c:909
+msgid "force"
+msgstr ""
+
+#: builtin/clean.c:910
+msgid "interactive cleaning"
+msgstr ""
+
+#: builtin/clean.c:912
+msgid "remove whole directories"
+msgstr ""
+
+#: 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/clean.c:914
+msgid "add <pattern> to ignore rules"
+msgstr ""
+
+#: builtin/clean.c:915
+msgid "remove ignored files, too"
+msgstr ""
+
+#: builtin/clean.c:917
+msgid "remove only ignored files"
+msgstr ""
+
+#: builtin/clean.c:935
+msgid "-x and -X cannot be used together"
+msgstr ""
+
+#: builtin/clean.c:939
+msgid ""
+"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
+"clean"
+msgstr ""
+
+#: builtin/clean.c:942
+msgid ""
+"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
+"refusing to clean"
+msgstr ""
+
+#: builtin/clone.c:44
+msgid "git clone [<options>] [--] <repo> [<dir>]"
+msgstr ""
+
+#: builtin/clone.c:90
+msgid "don't create a checkout"
+msgstr ""
+
+#: builtin/clone.c:91 builtin/clone.c:93 builtin/init-db.c:489
+msgid "create a bare repository"
+msgstr ""
+
+#: builtin/clone.c:95
+msgid "create a mirror repository (implies bare)"
+msgstr ""
+
+#: builtin/clone.c:97
+msgid "to clone from a local repository"
+msgstr ""
+
+#: builtin/clone.c:99
+msgid "don't use local hardlinks, always copy"
+msgstr ""
+
+#: builtin/clone.c:101
+msgid "setup as shared repository"
+msgstr ""
+
+#: builtin/clone.c:104
+msgid "pathspec"
+msgstr ""
+
+#: builtin/clone.c:104
+msgid "initialize submodules in the clone"
+msgstr ""
+
+#: builtin/clone.c:107
+msgid "number of submodules cloned in parallel"
+msgstr ""
+
+#: builtin/clone.c:108 builtin/init-db.c:486
+msgid "template-directory"
+msgstr ""
+
+#: builtin/clone.c:109 builtin/init-db.c:487
+msgid "directory from which templates will be used"
+msgstr ""
+
+#: builtin/clone.c:111 builtin/clone.c:113 builtin/submodule--helper.c:1379
+#: builtin/submodule--helper.c:1859
+msgid "reference repository"
+msgstr ""
+
+#: builtin/clone.c:115 builtin/submodule--helper.c:1381
+#: builtin/submodule--helper.c:1861
+msgid "use --reference only while cloning"
+msgstr ""
+
+#: 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/clone.c:117
+msgid "use <name> instead of 'origin' to track upstream"
+msgstr ""
+
+#: builtin/clone.c:119
+msgid "checkout <branch> instead of the remote's HEAD"
+msgstr ""
+
+#: builtin/clone.c:121
+msgid "path to git-upload-pack on the remote"
+msgstr ""
+
+#: builtin/clone.c:122 builtin/fetch.c:142 builtin/grep.c:836
+#: builtin/pull.c:225
+msgid "depth"
+msgstr ""
+
+#: builtin/clone.c:123
+msgid "create a shallow clone of that depth"
+msgstr ""
+
+#: builtin/clone.c:124 builtin/fetch.c:144 builtin/pack-objects.c:3295
+msgid "time"
+msgstr ""
+
+#: builtin/clone.c:125
+msgid "create a shallow clone since a specific time"
+msgstr ""
+
+#: builtin/clone.c:126 builtin/fetch.c:146 builtin/fetch.c:169
+#: builtin/rebase.c:1389
+msgid "revision"
+msgstr ""
+
+#: builtin/clone.c:127 builtin/fetch.c:147
+msgid "deepen history of shallow clone, excluding rev"
+msgstr ""
+
+#: builtin/clone.c:129
+msgid "clone only one branch, HEAD or --branch"
+msgstr ""
+
+#: builtin/clone.c:131
+msgid "don't clone any tags, and make later fetches not to follow them"
+msgstr ""
+
+#: builtin/clone.c:133
+msgid "any cloned submodules will be shallow"
+msgstr ""
+
+#: builtin/clone.c:134 builtin/init-db.c:495
+msgid "gitdir"
+msgstr ""
+
+#: builtin/clone.c:135 builtin/init-db.c:496
+msgid "separate git dir from working tree"
+msgstr ""
+
+#: builtin/clone.c:136
+msgid "key=value"
+msgstr ""
+
+#: builtin/clone.c:137
+msgid "set config inside the new repository"
+msgstr ""
+
+#: 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/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/clone.c:140 builtin/fetch.c:165 builtin/pull.c:238
+#: builtin/push.c:586
+msgid "use IPv4 addresses only"
+msgstr ""
+
+#: builtin/clone.c:142 builtin/fetch.c:167 builtin/pull.c:241
+#: builtin/push.c:588
+msgid "use IPv6 addresses only"
+msgstr ""
+
+#: builtin/clone.c:280
+msgid ""
+"No directory name could be guessed.\n"
+"Please specify a directory on the command line"
+msgstr ""
+
+#: builtin/clone.c:333
+#, c-format
+msgid "info: Could not add alternate for '%s': %s\n"
+msgstr ""
+
+#: builtin/clone.c:405
+#, c-format
+msgid "failed to open '%s'"
+msgstr ""
+
+#: builtin/clone.c:413
+#, c-format
+msgid "%s exists and is not a directory"
+msgstr ""
+
+#: builtin/clone.c:427
+#, c-format
+msgid "failed to stat %s\n"
+msgstr ""
+
+#: builtin/clone.c:444
+#, c-format
+msgid "failed to unlink '%s'"
+msgstr ""
+
+#: builtin/clone.c:449
+#, c-format
+msgid "failed to create link '%s'"
+msgstr ""
+
+#: builtin/clone.c:453
+#, c-format
+msgid "failed to copy file to '%s'"
+msgstr ""
+
+#: builtin/clone.c:479
+#, c-format
+msgid "done.\n"
+msgstr ""
+
+#: 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/clone.c:570
+#, c-format
+msgid "Could not find remote branch %s to clone."
+msgstr ""
+
+#: builtin/clone.c:689
+#, c-format
+msgid "unable to update %s"
+msgstr ""
+
+#: builtin/clone.c:739
+msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
+msgstr ""
+
+#: builtin/clone.c:770
+msgid "unable to checkout working tree"
+msgstr ""
+
+#: builtin/clone.c:815
+msgid "unable to write parameters to config file"
+msgstr ""
+
+#: builtin/clone.c:878
+msgid "cannot repack to clean up"
+msgstr ""
+
+#: builtin/clone.c:880
+msgid "cannot unlink temporary alternates file"
+msgstr ""
+
+#: builtin/clone.c:920 builtin/receive-pack.c:1952
+msgid "Too many arguments."
+msgstr ""
+
+#: builtin/clone.c:924
+msgid "You must specify a repository to clone."
+msgstr ""
+
+#: builtin/clone.c:937
+#, c-format
+msgid "--bare and --origin %s options are incompatible."
+msgstr ""
+
+#: builtin/clone.c:940
+msgid "--bare and --separate-git-dir are incompatible."
+msgstr ""
+
+#: builtin/clone.c:953
+#, c-format
+msgid "repository '%s' does not exist"
+msgstr ""
+
+#: builtin/clone.c:959 builtin/fetch.c:1610
+#, c-format
+msgid "depth %s is not a positive number"
+msgstr ""
+
+#: builtin/clone.c:969
+#, c-format
+msgid "destination path '%s' already exists and is not an empty directory."
+msgstr ""
+
+#: builtin/clone.c:979
+#, c-format
+msgid "working tree '%s' already exists."
+msgstr ""
+
+#: 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/clone.c:999
+#, c-format
+msgid "could not create work tree dir '%s'"
+msgstr ""
+
+#: builtin/clone.c:1019
+#, c-format
+msgid "Cloning into bare repository '%s'...\n"
+msgstr ""
+
+#: builtin/clone.c:1021
+#, c-format
+msgid "Cloning into '%s'...\n"
+msgstr ""
+
+#: builtin/clone.c:1045
+msgid ""
+"clone --recursive is not compatible with both --reference and --reference-if-"
+"able"
+msgstr ""
+
+#: builtin/clone.c:1106
+msgid "--depth is ignored in local clones; use file:// instead."
+msgstr ""
+
+#: builtin/clone.c:1108
+msgid "--shallow-since is ignored in local clones; use file:// instead."
+msgstr ""
+
+#: builtin/clone.c:1110
+msgid "--shallow-exclude is ignored in local clones; use file:// instead."
+msgstr ""
+
+#: builtin/clone.c:1112
+msgid "--filter is ignored in local clones; use file:// instead."
+msgstr ""
+
+#: builtin/clone.c:1115
+msgid "source repository is shallow, ignoring --local"
+msgstr ""
+
+#: builtin/clone.c:1120
+msgid "--local is ignored"
+msgstr ""
+
+#: builtin/clone.c:1197 builtin/clone.c:1205
+#, c-format
+msgid "Remote branch %s not found in upstream %s"
+msgstr ""
+
+#: builtin/clone.c:1208
+msgid "You appear to have cloned an empty repository."
+msgstr ""
+
+#: builtin/column.c:10
+msgid "git column [<options>]"
+msgstr ""
+
+#: builtin/column.c:27
+msgid "lookup config vars"
+msgstr ""
+
+#: builtin/column.c:28 builtin/column.c:29
+msgid "layout to use"
+msgstr ""
+
+#: builtin/column.c:30
+msgid "Maximum width"
+msgstr ""
+
+#: builtin/column.c:31
+msgid "Padding space on left border"
+msgstr ""
+
+#: builtin/column.c:32
+msgid "Padding space on right border"
+msgstr ""
+
+#: builtin/column.c:33
+msgid "Padding space between columns"
+msgstr ""
+
+#: builtin/column.c:51
+msgid "--command must be the first argument"
+msgstr ""
+
+#: builtin/commit-tree.c:18
+msgid ""
+"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "
+"<file>)...] <tree>"
+msgstr ""
+
+#: builtin/commit-tree.c:31
+#, c-format
+msgid "duplicate parent %s ignored"
+msgstr ""
+
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:520
+#, c-format
+msgid "not a valid object name %s"
+msgstr ""
+
+#: builtin/commit-tree.c:93
+#, c-format
+msgid "git commit-tree: failed to open '%s'"
+msgstr ""
+
+#: builtin/commit-tree.c:96
+#, c-format
+msgid "git commit-tree: failed to read '%s'"
+msgstr ""
+
+#: builtin/commit-tree.c:98
+#, c-format
+msgid "git commit-tree: failed to close '%s'"
+msgstr ""
+
+#: builtin/commit-tree.c:111
+msgid "parent"
+msgstr ""
+
+#: builtin/commit-tree.c:112
+msgid "id of a parent commit object"
+msgstr ""
+
+#: 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/commit-tree.c:115 builtin/commit.c:1480
+msgid "commit message"
+msgstr ""
+
+#: builtin/commit-tree.c:118
+msgid "read commit log message from file"
+msgstr ""
+
+#: 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/commit-tree.c:133
+msgid "must give exactly one tree"
+msgstr ""
+
+#: builtin/commit-tree.c:140
+msgid "git commit-tree: failed to read"
+msgstr ""
+
+#: builtin/commit.c:41
+msgid "git commit [<options>] [--] <pathspec>..."
+msgstr ""
+
+#: builtin/commit.c:46
+msgid "git status [<options>] [--] <pathspec>..."
+msgstr ""
+
+#: 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/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/commit.c:63
+msgid "Otherwise, please use 'git reset'\n"
+msgstr ""
+
+#: 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/commit.c:312
+msgid "failed to unpack HEAD tree object"
+msgstr ""
+
+#: builtin/commit.c:353
+msgid "unable to create temporary index"
+msgstr ""
+
+#: builtin/commit.c:359
+msgid "interactive add failed"
+msgstr ""
+
+#: builtin/commit.c:373
+msgid "unable to update temporary index"
+msgstr ""
+
+#: builtin/commit.c:375
+msgid "Failed to update main cache tree"
+msgstr ""
+
+#: builtin/commit.c:400 builtin/commit.c:423 builtin/commit.c:469
+msgid "unable to write new_index file"
+msgstr ""
+
+#: builtin/commit.c:452
+msgid "cannot do a partial commit during a merge."
+msgstr ""
+
+#: builtin/commit.c:454
+msgid "cannot do a partial commit during a cherry-pick."
+msgstr ""
+
+#: builtin/commit.c:462
+msgid "cannot read the index"
+msgstr ""
+
+#: builtin/commit.c:481
+msgid "unable to write temporary index file"
+msgstr ""
+
+#: builtin/commit.c:579
+#, c-format
+msgid "commit '%s' lacks author header"
+msgstr ""
+
+#: builtin/commit.c:581
+#, c-format
+msgid "commit '%s' has malformed author line"
+msgstr ""
+
+#: builtin/commit.c:600
+msgid "malformed --author parameter"
+msgstr ""
+
+#: builtin/commit.c:653
+msgid ""
+"unable to select a comment character that is not used\n"
+"in the current commit message"
+msgstr ""
+
+#: builtin/commit.c:691 builtin/commit.c:724 builtin/commit.c:1069
+#, c-format
+msgid "could not lookup commit %s"
+msgstr ""
+
+#: builtin/commit.c:703 builtin/shortlog.c:319
+#, c-format
+msgid "(reading log message from standard input)\n"
+msgstr ""
+
+#: builtin/commit.c:705
+msgid "could not read log from standard input"
+msgstr ""
+
+#: builtin/commit.c:709
+#, c-format
+msgid "could not read log file '%s'"
+msgstr ""
+
+#: builtin/commit.c:740 builtin/commit.c:756
+msgid "could not read SQUASH_MSG"
+msgstr ""
+
+#: builtin/commit.c:747
+msgid "could not read MERGE_MSG"
+msgstr ""
+
+#: builtin/commit.c:807
+msgid "could not write commit template"
+msgstr ""
+
+#: 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/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/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/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/commit.c:869
+#, c-format
+msgid "%sAuthor: %.*s <%.*s>"
+msgstr ""
+
+#: builtin/commit.c:877
+#, c-format
+msgid "%sDate: %s"
+msgstr ""
+
+#: builtin/commit.c:884
+#, c-format
+msgid "%sCommitter: %.*s <%.*s>"
+msgstr ""
+
+#: builtin/commit.c:902
+msgid "Cannot read index"
+msgstr ""
+
+#: builtin/commit.c:969
+msgid "Error building trees"
+msgstr ""
+
+#: builtin/commit.c:983 builtin/tag.c:269
+#, c-format
+msgid "Please supply the message using either -m or -F option.\n"
+msgstr ""
+
+#: builtin/commit.c:1027
+#, c-format
+msgid "--author '%s' is not 'Name <email>' and matches no existing author"
+msgstr ""
+
+#: builtin/commit.c:1041
+#, c-format
+msgid "Invalid ignored mode '%s'"
+msgstr ""
+
+#: builtin/commit.c:1059 builtin/commit.c:1284
+#, c-format
+msgid "Invalid untracked files mode '%s'"
+msgstr ""
+
+#: builtin/commit.c:1097
+msgid "--long and -z are incompatible"
+msgstr ""
+
+#: builtin/commit.c:1130
+msgid "Using both --reset-author and --author does not make sense"
+msgstr ""
+
+#: builtin/commit.c:1139
+msgid "You have nothing to amend."
+msgstr ""
+
+#: builtin/commit.c:1142
+msgid "You are in the middle of a merge -- cannot amend."
+msgstr ""
+
+#: builtin/commit.c:1144
+msgid "You are in the middle of a cherry-pick -- cannot amend."
+msgstr ""
+
+#: builtin/commit.c:1147
+msgid "Options --squash and --fixup cannot be used together"
+msgstr ""
+
+#: builtin/commit.c:1157
+msgid "Only one of -c/-C/-F/--fixup can be used."
+msgstr ""
+
+#: builtin/commit.c:1159
+msgid "Option -m cannot be combined with -c/-C/-F."
+msgstr ""
+
+#: builtin/commit.c:1167
+msgid "--reset-author can be used only with -C, -c or --amend."
+msgstr ""
+
+#: builtin/commit.c:1184
+msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
+msgstr ""
+
+#: builtin/commit.c:1186
+msgid "No paths with --include/--only does not make sense."
+msgstr ""
+
+#: builtin/commit.c:1192
+#, c-format
+msgid "paths '%s ...' with -a does not make sense"
+msgstr ""
+
+#: builtin/commit.c:1319 builtin/commit.c:1503
+msgid "show status concisely"
+msgstr ""
+
+#: builtin/commit.c:1321 builtin/commit.c:1505
+msgid "show branch information"
+msgstr ""
+
+#: builtin/commit.c:1323
+msgid "show stash information"
+msgstr ""
+
+#: builtin/commit.c:1325 builtin/commit.c:1507
+msgid "compute full ahead/behind values"
+msgstr ""
+
+#: builtin/commit.c:1327
+msgid "version"
+msgstr ""
+
+#: builtin/commit.c:1327 builtin/commit.c:1509 builtin/push.c:561
+#: builtin/worktree.c:643
+msgid "machine-readable output"
+msgstr ""
+
+#: builtin/commit.c:1330 builtin/commit.c:1511
+msgid "show status in long format (default)"
+msgstr ""
+
+#: builtin/commit.c:1333 builtin/commit.c:1514
+msgid "terminate entries with NUL"
+msgstr ""
+
+#: 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/commit.c:1336 builtin/commit.c:1517
+msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
+msgstr ""
+
+#: builtin/commit.c:1340
+msgid ""
+"show ignored files, optional modes: traditional, matching, no. (Default: "
+"traditional)"
+msgstr ""
+
+#: builtin/commit.c:1342 parse-options.h:179
+msgid "when"
+msgstr ""
+
+#: builtin/commit.c:1343
+msgid ""
+"ignore changes to submodules, optional when: all, dirty, untracked. "
+"(Default: all)"
+msgstr ""
+
+#: builtin/commit.c:1345
+msgid "list untracked files in columns"
+msgstr ""
+
+#: builtin/commit.c:1346
+msgid "do not detect renames"
+msgstr ""
+
+#: builtin/commit.c:1348
+msgid "detect renames, optionally set similarity index"
+msgstr ""
+
+#: builtin/commit.c:1368
+msgid "Unsupported combination of ignored and untracked-files arguments"
+msgstr ""
+
+#: builtin/commit.c:1473
+msgid "suppress summary after successful commit"
+msgstr ""
+
+#: builtin/commit.c:1474
+msgid "show diff in commit message template"
+msgstr ""
+
+#: builtin/commit.c:1476
+msgid "Commit message options"
+msgstr ""
+
+#: builtin/commit.c:1477 builtin/merge.c:272 builtin/tag.c:408
+msgid "read message from file"
+msgstr ""
+
+#: builtin/commit.c:1478
+msgid "author"
+msgstr ""
+
+#: builtin/commit.c:1478
+msgid "override author for commit"
+msgstr ""
+
+#: builtin/commit.c:1479 builtin/gc.c:539
+msgid "date"
+msgstr ""
+
+#: builtin/commit.c:1479
+msgid "override date for commit"
+msgstr ""
+
+#: 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/commit.c:1481
+msgid "reuse and edit message from specified commit"
+msgstr ""
+
+#: builtin/commit.c:1482
+msgid "reuse message from specified commit"
+msgstr ""
+
+#: builtin/commit.c:1483
+msgid "use autosquash formatted message to fixup specified commit"
+msgstr ""
+
+#: builtin/commit.c:1484
+msgid "use autosquash formatted message to squash specified commit"
+msgstr ""
+
+#: builtin/commit.c:1485
+msgid "the commit is authored by me now (used with -C/-c/--amend)"
+msgstr ""
+
+#: 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/commit.c:1487
+msgid "use specified template file"
+msgstr ""
+
+#: builtin/commit.c:1488
+msgid "force edit of commit"
+msgstr ""
+
+#: builtin/commit.c:1490
+msgid "include status in commit message template"
+msgstr ""
+
+#: builtin/commit.c:1495
+msgid "Commit contents options"
+msgstr ""
+
+#: builtin/commit.c:1496
+msgid "commit all changed files"
+msgstr ""
+
+#: builtin/commit.c:1497
+msgid "add specified files to index for commit"
+msgstr ""
+
+#: builtin/commit.c:1498
+msgid "interactively add files"
+msgstr ""
+
+#: builtin/commit.c:1499
+msgid "interactively add changes"
+msgstr ""
+
+#: builtin/commit.c:1500
+msgid "commit only specified files"
+msgstr ""
+
+#: builtin/commit.c:1501
+msgid "bypass pre-commit and commit-msg hooks"
+msgstr ""
+
+#: builtin/commit.c:1502
+msgid "show what would be committed"
+msgstr ""
+
+#: builtin/commit.c:1515
+msgid "amend previous commit"
+msgstr ""
+
+#: builtin/commit.c:1516
+msgid "bypass post-rewrite hook"
+msgstr ""
+
+#: builtin/commit.c:1521
+msgid "ok to record an empty change"
+msgstr ""
+
+#: builtin/commit.c:1523
+msgid "ok to record a change with an empty message"
+msgstr ""
+
+#: builtin/commit.c:1596
+#, c-format
+msgid "Corrupt MERGE_HEAD file (%s)"
+msgstr ""
+
+#: builtin/commit.c:1603
+msgid "could not read MERGE_MODE"
+msgstr ""
+
+#: builtin/commit.c:1622
+#, c-format
+msgid "could not read commit message: %s"
+msgstr ""
+
+#: builtin/commit.c:1629
+#, c-format
+msgid "Aborting commit due to empty commit message.\n"
+msgstr ""
+
+#: builtin/commit.c:1634
+#, c-format
+msgid "Aborting commit; you did not edit the message.\n"
+msgstr ""
+
+#: builtin/commit.c:1668
+msgid ""
+"repository has been updated, but unable to write\n"
+"new_index file. Check that disk is not full and quota is\n"
+"not exceeded, and then \"git reset HEAD\" to recover."
+msgstr ""
+
+#: builtin/commit-graph.c:10
+msgid "git commit-graph [--object-dir <objdir>]"
+msgstr ""
+
+#: builtin/commit-graph.c:11 builtin/commit-graph.c:23
+msgid "git commit-graph read [--object-dir <objdir>]"
+msgstr ""
+
+#: builtin/commit-graph.c:12 builtin/commit-graph.c:18
+msgid "git commit-graph verify [--object-dir <objdir>]"
+msgstr ""
+
+#: builtin/commit-graph.c:13 builtin/commit-graph.c:28
+msgid ""
+"git commit-graph write [--object-dir <objdir>] [--append] [--reachable|--"
+"stdin-packs|--stdin-commits]"
+msgstr ""
+
+#: builtin/commit-graph.c: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/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/commit-graph.c:68 builtin/commit-graph.c:105
+#, c-format
+msgid "Could not open commit-graph '%s'"
+msgstr ""
+
+#: builtin/commit-graph.c:150
+msgid "start walk at all refs"
+msgstr ""
+
+#: builtin/commit-graph.c:152
+msgid "scan pack-indexes listed by stdin for commits"
+msgstr ""
+
+#: builtin/commit-graph.c:154
+msgid "start walk at commits listed by stdin"
+msgstr ""
+
+#: builtin/commit-graph.c:156
+msgid "include all commits already in the commit-graph file"
+msgstr ""
+
+#: builtin/commit-graph.c:165
+msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
+msgstr ""
+
+#: builtin/config.c:11
+msgid "git config [<options>]"
+msgstr ""
+
+#: builtin/config.c:103
+#, c-format
+msgid "unrecognized --type argument, %s"
+msgstr ""
+
+#: builtin/config.c:115
+msgid "only one type at a time"
+msgstr ""
+
+#: builtin/config.c:124
+msgid "Config file location"
+msgstr ""
+
+#: builtin/config.c:125
+msgid "use global config file"
+msgstr ""
+
+#: builtin/config.c:126
+msgid "use system config file"
+msgstr ""
+
+#: builtin/config.c:127
+msgid "use repository config file"
+msgstr ""
+
+#: builtin/config.c:128
+msgid "use per-worktree config file"
+msgstr ""
+
+#: builtin/config.c:129
+msgid "use given config file"
+msgstr ""
+
+#: builtin/config.c:130
+msgid "blob-id"
+msgstr ""
+
+#: builtin/config.c:130
+msgid "read config from given blob object"
+msgstr ""
+
+#: builtin/config.c:131
+msgid "Action"
+msgstr ""
+
+#: builtin/config.c:132
+msgid "get value: name [value-regex]"
+msgstr ""
+
+#: builtin/config.c:133
+msgid "get all values: key [value-regex]"
+msgstr ""
+
+#: builtin/config.c:134
+msgid "get values for regexp: name-regex [value-regex]"
+msgstr ""
+
+#: builtin/config.c:135
+msgid "get value specific for the URL: section[.var] URL"
+msgstr ""
+
+#: builtin/config.c:136
+msgid "replace all matching variables: name value [value_regex]"
+msgstr ""
+
+#: builtin/config.c:137
+msgid "add a new variable: name value"
+msgstr ""
+
+#: builtin/config.c:138
+msgid "remove a variable: name [value-regex]"
+msgstr ""
+
+#: builtin/config.c:139
+msgid "remove all matches: name [value-regex]"
+msgstr ""
+
+#: builtin/config.c:140
+msgid "rename section: old-name new-name"
+msgstr ""
+
+#: builtin/config.c:141
+msgid "remove a section: name"
+msgstr ""
+
+#: builtin/config.c:142
+msgid "list all"
+msgstr ""
+
+#: builtin/config.c:143
+msgid "open an editor"
+msgstr ""
+
+#: builtin/config.c:144
+msgid "find the color configured: slot [default]"
+msgstr ""
+
+#: builtin/config.c:145
+msgid "find the color setting: slot [stdout-is-tty]"
+msgstr ""
+
+#: builtin/config.c:146
+msgid "Type"
+msgstr ""
+
+#: builtin/config.c:147
+msgid "value is given this type"
+msgstr ""
+
+#: builtin/config.c:148
+msgid "value is \"true\" or \"false\""
+msgstr ""
+
+#: builtin/config.c:149
+msgid "value is decimal number"
+msgstr ""
+
+#: builtin/config.c:150
+msgid "value is --bool or --int"
+msgstr ""
+
+#: builtin/config.c:151
+msgid "value is a path (file or directory name)"
+msgstr ""
+
+#: builtin/config.c:152
+msgid "value is an expiry date"
+msgstr ""
+
+#: builtin/config.c:153
+msgid "Other"
+msgstr ""
+
+#: builtin/config.c:154
+msgid "terminate values with NUL byte"
+msgstr ""
+
+#: builtin/config.c:155
+msgid "show variable names only"
+msgstr ""
+
+#: builtin/config.c:156
+msgid "respect include directives on lookup"
+msgstr ""
+
+#: builtin/config.c:157
+msgid "show origin of config (file, standard input, blob, command line)"
+msgstr ""
+
+#: builtin/config.c:158
+msgid "value"
+msgstr ""
+
+#: builtin/config.c:158
+msgid "with --get, use default value when missing entry"
+msgstr ""
+
+#: builtin/config.c:172
+#, c-format
+msgid "wrong number of arguments, should be %d"
+msgstr ""
+
+#: builtin/config.c:174
+#, c-format
+msgid "wrong number of arguments, should be from %d to %d"
+msgstr ""
+
+#: builtin/config.c:308
+#, c-format
+msgid "invalid key pattern: %s"
+msgstr ""
+
+#: builtin/config.c:344
+#, c-format
+msgid "failed to format default config value: %s"
+msgstr ""
+
+#: builtin/config.c:401
+#, c-format
+msgid "cannot parse color '%s'"
+msgstr ""
+
+#: builtin/config.c:443
+msgid "unable to parse default color value"
msgstr ""
-#: builtin/clean.c:945
-msgid ""
-"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
-"refusing to clean"
+#: builtin/config.c:496 builtin/config.c:742
+msgid "not in a git directory"
msgstr ""
-#: builtin/clone.c:42
-msgid "git clone [<options>] [--] <repo> [<dir>]"
+#: builtin/config.c:499
+msgid "writing to stdin is not supported"
msgstr ""
-#: builtin/clone.c:87
-msgid "don't create a checkout"
+#: builtin/config.c:502
+msgid "writing config blobs is not supported"
msgstr ""
-#: builtin/clone.c:88 builtin/clone.c:90 builtin/init-db.c:479
-msgid "create a bare repository"
+#: builtin/config.c:587
+#, c-format
+msgid ""
+"# This is Git's per-user configuration file.\n"
+"[user]\n"
+"# Please adapt and uncomment the following lines:\n"
+"#\tname = %s\n"
+"#\temail = %s\n"
msgstr ""
-#: builtin/clone.c:92
-msgid "create a mirror repository (implies bare)"
+#: builtin/config.c:611
+msgid "only one config file at a time"
msgstr ""
-#: builtin/clone.c:94
-msgid "to clone from a local repository"
+#: builtin/config.c:616
+msgid "--local can only be used inside a git repository"
msgstr ""
-#: builtin/clone.c:96
-msgid "don't use local hardlinks, always copy"
+#: builtin/config.c:619
+msgid "--blob can only be used inside a git repository"
msgstr ""
-#: builtin/clone.c:98
-msgid "setup as shared repository"
+#: builtin/config.c:638
+msgid "$HOME not set"
msgstr ""
-#: builtin/clone.c:100 builtin/clone.c:104
-msgid "pathspec"
+#: 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/clone.c:100 builtin/clone.c:104
-msgid "initialize submodules in the clone"
+#: builtin/config.c:688
+msgid "--get-color and variable type are incoherent"
msgstr ""
-#: builtin/clone.c:107
-msgid "number of submodules cloned in parallel"
+#: builtin/config.c:693
+msgid "only one action at a time"
msgstr ""
-#: builtin/clone.c:108 builtin/init-db.c:476
-msgid "template-directory"
+#: builtin/config.c:706
+msgid "--name-only is only applicable to --list or --get-regexp"
msgstr ""
-#: builtin/clone.c:109 builtin/init-db.c:477
-msgid "directory from which templates will be used"
+#: builtin/config.c:712
+msgid ""
+"--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
+"list"
msgstr ""
-#: builtin/clone.c:111 builtin/clone.c:113 builtin/submodule--helper.c:1223
-#: builtin/submodule--helper.c:1594
-msgid "reference repository"
+#: builtin/config.c:718
+msgid "--default is only applicable to --get"
msgstr ""
-#: builtin/clone.c:115 builtin/submodule--helper.c:1225
-#: builtin/submodule--helper.c:1596
-msgid "use --reference only while cloning"
+#: builtin/config.c:731
+#, c-format
+msgid "unable to read config file '%s'"
msgstr ""
-#: builtin/clone.c:116 builtin/column.c:27 builtin/merge-file.c:44
-#: builtin/pack-objects.c:3166 builtin/repack.c:213
-msgid "name"
+#: builtin/config.c:734
+msgid "error processing config file(s)"
msgstr ""
-#: builtin/clone.c:117
-msgid "use <name> instead of 'origin' to track upstream"
+#: builtin/config.c:744
+msgid "editing stdin is not supported"
msgstr ""
-#: builtin/clone.c:119
-msgid "checkout <branch> instead of the remote's HEAD"
+#: builtin/config.c:746
+msgid "editing blobs is not supported"
msgstr ""
-#: builtin/clone.c:121
-msgid "path to git-upload-pack on the remote"
+#: builtin/config.c:760
+#, c-format
+msgid "cannot create configuration file %s"
msgstr ""
-#: builtin/clone.c:122 builtin/fetch.c:150 builtin/grep.c:813
-#: builtin/pull.c:216
-msgid "depth"
+#: builtin/config.c:773
+#, c-format
+msgid ""
+"cannot overwrite multiple values with a single value\n"
+" Use a regexp, --add or --replace-all to change %s."
msgstr ""
-#: builtin/clone.c:123
-msgid "create a shallow clone of that depth"
+#: builtin/config.c:847 builtin/config.c:858
+#, c-format
+msgid "no such section: %s"
msgstr ""
-#: builtin/clone.c:124 builtin/fetch.c:152 builtin/pack-objects.c:3157
-#: parse-options.h:154
-msgid "time"
+#: builtin/count-objects.c:90
+msgid "git count-objects [-v] [-H | --human-readable]"
msgstr ""
-#: builtin/clone.c:125
-msgid "create a shallow clone since a specific time"
+#: builtin/count-objects.c:100
+msgid "print sizes in human readable format"
msgstr ""
-#: builtin/clone.c:126 builtin/fetch.c:154
-msgid "revision"
+#: builtin/describe.c:27
+msgid "git describe [<options>] [<commit-ish>...]"
msgstr ""
-#: builtin/clone.c:127 builtin/fetch.c:155
-msgid "deepen history of shallow clone, excluding rev"
+#: builtin/describe.c:28
+msgid "git describe [<options>] --dirty"
msgstr ""
-#: builtin/clone.c:129
-msgid "clone only one branch, HEAD or --branch"
+#: builtin/describe.c:63
+msgid "head"
msgstr ""
-#: builtin/clone.c:131
-msgid "don't clone any tags, and make later fetches not to follow them"
+#: builtin/describe.c:63
+msgid "lightweight"
msgstr ""
-#: builtin/clone.c:133
-msgid "any cloned submodules will be shallow"
+#: builtin/describe.c:63
+msgid "annotated"
msgstr ""
-#: builtin/clone.c:134 builtin/init-db.c:485
-msgid "gitdir"
+#: builtin/describe.c:273
+#, c-format
+msgid "annotated tag %s not available"
msgstr ""
-#: builtin/clone.c:135 builtin/init-db.c:486
-msgid "separate git dir from working tree"
+#: builtin/describe.c:277
+#, c-format
+msgid "annotated tag %s has no embedded name"
msgstr ""
-#: builtin/clone.c:136
-msgid "key=value"
+#: builtin/describe.c:279
+#, c-format
+msgid "tag '%s' is really '%s' here"
msgstr ""
-#: builtin/clone.c:137
-msgid "set config inside the new repository"
+#: builtin/describe.c:323
+#, c-format
+msgid "no tag exactly matches '%s'"
msgstr ""
-#: builtin/clone.c:138 builtin/fetch.c:173 builtin/pull.c:229
-#: builtin/push.c:583
-msgid "use IPv4 addresses only"
+#: builtin/describe.c:325
+#, c-format
+msgid "No exact match on refs or tags, searching to describe\n"
msgstr ""
-#: builtin/clone.c:140 builtin/fetch.c:175 builtin/pull.c:232
-#: builtin/push.c:585
-msgid "use IPv6 addresses only"
+#: builtin/describe.c:379
+#, c-format
+msgid "finished search at %s\n"
msgstr ""
-#: builtin/clone.c:278
+#: builtin/describe.c:405
+#, c-format
msgid ""
-"No directory name could be guessed.\n"
-"Please specify a directory on the command line"
+"No annotated tags can describe '%s'.\n"
+"However, there were unannotated tags: try --tags."
msgstr ""
-#: builtin/clone.c:331
+#: builtin/describe.c:409
#, c-format
-msgid "info: Could not add alternate for '%s': %s\n"
+msgid ""
+"No tags can describe '%s'.\n"
+"Try --always, or create some tags."
msgstr ""
-#: builtin/clone.c:403
+#: builtin/describe.c:439
#, c-format
-msgid "failed to open '%s'"
+msgid "traversed %lu commits\n"
msgstr ""
-#: builtin/clone.c:411
+#: builtin/describe.c:442
#, c-format
-msgid "%s exists and is not a directory"
+msgid ""
+"more than %i tags found; listed %i most recent\n"
+"gave up search at %s\n"
msgstr ""
-#: builtin/clone.c:425
+#: builtin/describe.c:510
#, c-format
-msgid "failed to stat %s\n"
+msgid "describe %s\n"
msgstr ""
-#: builtin/clone.c:447
+#: builtin/describe.c:513
#, c-format
-msgid "failed to create link '%s'"
+msgid "Not a valid object name %s"
msgstr ""
-#: builtin/clone.c:451
+#: builtin/describe.c:521
#, c-format
-msgid "failed to copy file to '%s'"
+msgid "%s is neither a commit nor blob"
msgstr ""
-#: builtin/clone.c:477
-#, c-format
-msgid "done.\n"
+#: builtin/describe.c:535
+msgid "find the tag that comes after the commit"
msgstr ""
-#: builtin/clone.c:491
-msgid ""
-"Clone succeeded, but checkout failed.\n"
-"You can inspect what was checked out with 'git status'\n"
-"and retry the checkout with 'git checkout -f HEAD'\n"
+#: builtin/describe.c:536
+msgid "debug search strategy on stderr"
msgstr ""
-#: builtin/clone.c:568
-#, c-format
-msgid "Could not find remote branch %s to clone."
+#: builtin/describe.c:537
+msgid "use any ref"
msgstr ""
-#: builtin/clone.c:663
-msgid "remote did not send all necessary objects"
+#: builtin/describe.c:538
+msgid "use any tag, even unannotated"
msgstr ""
-#: builtin/clone.c:679
-#, c-format
-msgid "unable to update %s"
+#: builtin/describe.c:539
+msgid "always use long format"
msgstr ""
-#: builtin/clone.c:728
-msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
+#: builtin/describe.c:540
+msgid "only follow first parent"
msgstr ""
-#: builtin/clone.c:758
-msgid "unable to checkout working tree"
+#: builtin/describe.c:543
+msgid "only output exact matches"
msgstr ""
-#: builtin/clone.c:803
-msgid "unable to write parameters to config file"
+#: builtin/describe.c:545
+msgid "consider <n> most recent tags (default: 10)"
msgstr ""
-#: builtin/clone.c:866
-msgid "cannot repack to clean up"
+#: builtin/describe.c:547
+msgid "only consider tags matching <pattern>"
msgstr ""
-#: builtin/clone.c:868
-msgid "cannot unlink temporary alternates file"
+#: builtin/describe.c:549
+msgid "do not consider tags matching <pattern>"
msgstr ""
-#: builtin/clone.c:907 builtin/receive-pack.c:1947
-msgid "Too many arguments."
+#: builtin/describe.c:551 builtin/name-rev.c:426
+msgid "show abbreviated commit object as fallback"
msgstr ""
-#: builtin/clone.c:911
-msgid "You must specify a repository to clone."
+#: builtin/describe.c:552 builtin/describe.c:555
+msgid "mark"
msgstr ""
-#: builtin/clone.c:924
-#, c-format
-msgid "--bare and --origin %s options are incompatible."
+#: builtin/describe.c:553
+msgid "append <mark> on dirty working tree (default: \"-dirty\")"
msgstr ""
-#: builtin/clone.c:927
-msgid "--bare and --separate-git-dir are incompatible."
+#: builtin/describe.c:556
+msgid "append <mark> on broken working tree (default: \"-broken\")"
msgstr ""
-#: builtin/clone.c:940
-#, c-format
-msgid "repository '%s' does not exist"
+#: builtin/describe.c:574
+msgid "--long is incompatible with --abbrev=0"
msgstr ""
-#: builtin/clone.c:946 builtin/fetch.c:1460
-#, c-format
-msgid "depth %s is not a positive number"
+#: builtin/describe.c:603
+msgid "No names found, cannot describe anything."
msgstr ""
-#: builtin/clone.c:956
-#, c-format
-msgid "destination path '%s' already exists and is not an empty directory."
+#: builtin/describe.c:654
+msgid "--dirty is incompatible with commit-ishes"
msgstr ""
-#: builtin/clone.c:966
-#, c-format
-msgid "working tree '%s' already exists."
+#: builtin/describe.c:656
+msgid "--broken is incompatible with commit-ishes"
msgstr ""
-#: builtin/clone.c:981 builtin/clone.c:1002 builtin/difftool.c:270
-#: builtin/worktree.c:246 builtin/worktree.c:276
+#: builtin/diff.c:84
#, c-format
-msgid "could not create leading directories of '%s'"
+msgid "'%s': not a regular file or symlink"
msgstr ""
-#: builtin/clone.c:986
+#: builtin/diff.c:235
#, c-format
-msgid "could not create work tree dir '%s'"
+msgid "invalid option: %s"
+msgstr ""
+
+#: builtin/diff.c:350
+msgid "Not a git repository"
msgstr ""
-#: builtin/clone.c:1006
+#: builtin/diff.c:394
#, c-format
-msgid "Cloning into bare repository '%s'...\n"
+msgid "invalid object '%s' given."
msgstr ""
-#: builtin/clone.c:1008
+#: builtin/diff.c:403
#, c-format
-msgid "Cloning into '%s'...\n"
+msgid "more than two blobs given: '%s'"
msgstr ""
-#: builtin/clone.c:1032
-msgid ""
-"clone --recursive is not compatible with both --reference and --reference-if-"
-"able"
+#: builtin/diff.c:408
+#, c-format
+msgid "unhandled object '%s' given."
msgstr ""
-#: builtin/clone.c:1093
-msgid "--depth is ignored in local clones; use file:// instead."
+#: builtin/difftool.c:30
+msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
msgstr ""
-#: builtin/clone.c:1095
-msgid "--shallow-since is ignored in local clones; use file:// instead."
+#: builtin/difftool.c:253
+#, c-format
+msgid "failed: %d"
msgstr ""
-#: builtin/clone.c:1097
-msgid "--shallow-exclude is ignored in local clones; use file:// instead."
+#: builtin/difftool.c:295
+#, c-format
+msgid "could not read symlink %s"
msgstr ""
-#: builtin/clone.c:1099
-msgid "--filter is ignored in local clones; use file:// instead."
+#: builtin/difftool.c:297
+#, c-format
+msgid "could not read symlink file %s"
msgstr ""
-#: builtin/clone.c:1102
-msgid "source repository is shallow, ignoring --local"
+#: builtin/difftool.c:305
+#, c-format
+msgid "could not read object %s for symlink %s"
msgstr ""
-#: builtin/clone.c:1107
-msgid "--local is ignored"
+#: builtin/difftool.c:406
+msgid ""
+"combined diff formats('-c' and '--cc') are not supported in\n"
+"directory diff mode('-d' and '--dir-diff')."
msgstr ""
-#: builtin/clone.c:1169 builtin/clone.c:1177
+#: builtin/difftool.c:626
#, c-format
-msgid "Remote branch %s not found in upstream %s"
+msgid "both files modified: '%s' and '%s'."
msgstr ""
-#: builtin/clone.c:1180
-msgid "You appear to have cloned an empty repository."
+#: builtin/difftool.c:628
+msgid "working tree file has been left."
msgstr ""
-#: builtin/column.c:10
-msgid "git column [<options>]"
+#: builtin/difftool.c:639
+#, c-format
+msgid "temporary files exist in '%s'."
msgstr ""
-#: builtin/column.c:27
-msgid "lookup config vars"
+#: builtin/difftool.c:640
+msgid "you may want to cleanup or recover these."
msgstr ""
-#: builtin/column.c:28 builtin/column.c:29
-msgid "layout to use"
+#: builtin/difftool.c:689
+msgid "use `diff.guitool` instead of `diff.tool`"
msgstr ""
-#: builtin/column.c:30
-msgid "Maximum width"
+#: builtin/difftool.c:691
+msgid "perform a full-directory diff"
msgstr ""
-#: builtin/column.c:31
-msgid "Padding space on left border"
+#: builtin/difftool.c:693
+msgid "do not prompt before launching a diff tool"
msgstr ""
-#: builtin/column.c:32
-msgid "Padding space on right border"
+#: builtin/difftool.c:698
+msgid "use symlinks in dir-diff mode"
msgstr ""
-#: builtin/column.c:33
-msgid "Padding space between columns"
+#: builtin/difftool.c:699
+msgid "tool"
msgstr ""
-#: builtin/column.c:51
-msgid "--command must be the first argument"
+#: builtin/difftool.c:700
+msgid "use the specified diff tool"
msgstr ""
-#: builtin/commit.c:37
-msgid "git commit [<options>] [--] <pathspec>..."
+#: builtin/difftool.c:702
+msgid "print a list of diff tools that may be used with `--tool`"
msgstr ""
-#: builtin/commit.c:42
-msgid "git status [<options>] [--] <pathspec>..."
+#: builtin/difftool.c:705
+msgid ""
+"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
+"code"
msgstr ""
-#: builtin/commit.c:47
-msgid ""
-"You asked to amend the most recent commit, but doing so would make\n"
-"it empty. You can repeat your command with --allow-empty, or you can\n"
-"remove the commit entirely with \"git reset HEAD^\".\n"
+#: builtin/difftool.c:708
+msgid "specify a custom command for viewing diffs"
msgstr ""
-#: builtin/commit.c:52
-msgid ""
-"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
-"If you wish to commit it anyway, use:\n"
-"\n"
-" git commit --allow-empty\n"
-"\n"
+#: builtin/difftool.c:709
+msgid "passed to `diff`"
msgstr ""
-#: builtin/commit.c:59
-msgid "Otherwise, please use 'git reset'\n"
+#: builtin/difftool.c:724
+msgid "difftool requires worktree or --no-index"
msgstr ""
-#: builtin/commit.c:62
-msgid ""
-"If you wish to skip this commit, use:\n"
-"\n"
-" git reset\n"
-"\n"
-"Then \"git cherry-pick --continue\" will resume cherry-picking\n"
-"the remaining commits.\n"
+#: builtin/difftool.c:731
+msgid "--dir-diff is incompatible with --no-index"
+msgstr ""
+
+#: builtin/difftool.c:734
+msgid "--gui, --tool and --extcmd are mutually exclusive"
+msgstr ""
+
+#: builtin/difftool.c:742
+msgid "no <tool> given for --tool=<tool>"
msgstr ""
-#: builtin/commit.c:293
-msgid "failed to unpack HEAD tree object"
+#: builtin/difftool.c:749
+msgid "no <cmd> given for --extcmd=<cmd>"
msgstr ""
-#: builtin/commit.c:334
-msgid "unable to create temporary index"
+#: builtin/fast-export.c:29
+msgid "git fast-export [rev-list-opts]"
msgstr ""
-#: builtin/commit.c:340
-msgid "interactive add failed"
+#: builtin/fast-export.c:1084
+msgid "show progress after <n> objects"
msgstr ""
-#: builtin/commit.c:353
-msgid "unable to update temporary index"
+#: builtin/fast-export.c:1086
+msgid "select handling of signed tags"
msgstr ""
-#: builtin/commit.c:355
-msgid "Failed to update main cache tree"
+#: builtin/fast-export.c:1089
+msgid "select handling of tags that tag filtered objects"
msgstr ""
-#: builtin/commit.c:380 builtin/commit.c:403 builtin/commit.c:449
-msgid "unable to write new_index file"
+#: builtin/fast-export.c:1092
+msgid "Dump marks to this file"
msgstr ""
-#: builtin/commit.c:432
-msgid "cannot do a partial commit during a merge."
+#: builtin/fast-export.c:1094
+msgid "Import marks from this file"
msgstr ""
-#: builtin/commit.c:434
-msgid "cannot do a partial commit during a cherry-pick."
+#: builtin/fast-export.c:1096
+msgid "Fake a tagger when tags lack one"
msgstr ""
-#: builtin/commit.c:442
-msgid "cannot read the index"
+#: builtin/fast-export.c:1098
+msgid "Output full tree for each commit"
msgstr ""
-#: builtin/commit.c:461
-msgid "unable to write temporary index file"
+#: builtin/fast-export.c:1100
+msgid "Use the done feature to terminate the stream"
msgstr ""
-#: builtin/commit.c:558
-#, c-format
-msgid "commit '%s' lacks author header"
+#: builtin/fast-export.c:1101
+msgid "Skip output of blob data"
msgstr ""
-#: builtin/commit.c:560
-#, c-format
-msgid "commit '%s' has malformed author line"
+#: builtin/fast-export.c:1102 builtin/log.c:1609
+msgid "refspec"
msgstr ""
-#: builtin/commit.c:579
-msgid "malformed --author parameter"
+#: builtin/fast-export.c:1103
+msgid "Apply refspec to exported refs"
msgstr ""
-#: builtin/commit.c:631
-msgid ""
-"unable to select a comment character that is not used\n"
-"in the current commit message"
+#: builtin/fast-export.c:1104
+msgid "anonymize output"
msgstr ""
-#: builtin/commit.c:668 builtin/commit.c:701 builtin/commit.c:1029
-#, c-format
-msgid "could not lookup commit %s"
+#: builtin/fast-export.c:1106
+msgid "Reference parents which are not in fast-export stream by object id"
msgstr ""
-#: builtin/commit.c:680 builtin/shortlog.c:316
-#, c-format
-msgid "(reading log message from standard input)\n"
+#: builtin/fast-export.c:1108
+msgid "Show original object ids of blobs/commits"
msgstr ""
-#: builtin/commit.c:682
-msgid "could not read log from standard input"
+#: builtin/fetch.c:28
+msgid "git fetch [<options>] [<repository> [<refspec>...]]"
msgstr ""
-#: builtin/commit.c:686
-#, c-format
-msgid "could not read log file '%s'"
+#: builtin/fetch.c:29
+msgid "git fetch [<options>] <group>"
msgstr ""
-#: builtin/commit.c:715 builtin/commit.c:723
-msgid "could not read SQUASH_MSG"
+#: builtin/fetch.c:30
+msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
msgstr ""
-#: builtin/commit.c:720
-msgid "could not read MERGE_MSG"
+#: builtin/fetch.c:31
+msgid "git fetch --all [<options>]"
msgstr ""
-#: builtin/commit.c:774
-msgid "could not write commit template"
+#: builtin/fetch.c:115 builtin/pull.c:202
+msgid "fetch from all remotes"
msgstr ""
-#: builtin/commit.c:792
-#, c-format
-msgid ""
-"\n"
-"It looks like you may be committing a merge.\n"
-"If this is not correct, please remove the file\n"
-"\t%s\n"
-"and try again.\n"
+#: builtin/fetch.c:117 builtin/pull.c:205
+msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr ""
-#: builtin/commit.c:797
-#, c-format
-msgid ""
-"\n"
-"It looks like you may be committing a cherry-pick.\n"
-"If this is not correct, please remove the file\n"
-"\t%s\n"
-"and try again.\n"
+#: builtin/fetch.c:119 builtin/pull.c:208
+msgid "path to upload pack on remote end"
msgstr ""
-#: builtin/commit.c:810
-#, c-format
-msgid ""
-"Please enter the commit message for your changes. Lines starting\n"
-"with '%c' will be ignored, and an empty message aborts the commit.\n"
+#: builtin/fetch.c:120
+msgid "force overwrite of local reference"
msgstr ""
-#: builtin/commit.c:818
-#, c-format
-msgid ""
-"Please enter the commit message for your changes. Lines starting\n"
-"with '%c' will be kept; you may remove them yourself if you want to.\n"
-"An empty message aborts the commit.\n"
+#: builtin/fetch.c:122
+msgid "fetch from multiple remotes"
msgstr ""
-#: builtin/commit.c:835
-#, c-format
-msgid "%sAuthor: %.*s <%.*s>"
+#: builtin/fetch.c:124 builtin/pull.c:212
+msgid "fetch all tags and associated objects"
msgstr ""
-#: builtin/commit.c:843
-#, c-format
-msgid "%sDate: %s"
+#: builtin/fetch.c:126
+msgid "do not fetch all tags (--no-tags)"
msgstr ""
-#: builtin/commit.c:850
-#, c-format
-msgid "%sCommitter: %.*s <%.*s>"
+#: builtin/fetch.c:128
+msgid "number of submodules fetched in parallel"
msgstr ""
-#: builtin/commit.c:867
-msgid "Cannot read index"
+#: builtin/fetch.c:130 builtin/pull.c:215
+msgid "prune remote-tracking branches no longer on remote"
msgstr ""
-#: builtin/commit.c:933
-msgid "Error building trees"
+#: builtin/fetch.c:132
+msgid "prune local tags no longer on remote and clobber changed tags"
msgstr ""
-#: builtin/commit.c:947 builtin/tag.c:257
-#, c-format
-msgid "Please supply the message using either -m or -F option.\n"
+#: builtin/fetch.c:133 builtin/fetch.c:156 builtin/pull.c:139
+msgid "on-demand"
msgstr ""
-#: builtin/commit.c:991
-#, c-format
-msgid "--author '%s' is not 'Name <email>' and matches no existing author"
+#: builtin/fetch.c:134
+msgid "control recursive fetching of submodules"
msgstr ""
-#: builtin/commit.c:1005
-#, c-format
-msgid "Invalid ignored mode '%s'"
+#: builtin/fetch.c:138 builtin/pull.c:223
+msgid "keep downloaded pack"
msgstr ""
-#: builtin/commit.c:1019 builtin/commit.c:1269
-#, c-format
-msgid "Invalid untracked files mode '%s'"
+#: builtin/fetch.c:140
+msgid "allow updating of HEAD ref"
msgstr ""
-#: builtin/commit.c:1057
-msgid "--long and -z are incompatible"
+#: builtin/fetch.c:143 builtin/fetch.c:149 builtin/pull.c:226
+msgid "deepen history of shallow clone"
msgstr ""
-#: builtin/commit.c:1090
-msgid "Using both --reset-author and --author does not make sense"
+#: builtin/fetch.c:145
+msgid "deepen history of shallow repository based on time"
msgstr ""
-#: builtin/commit.c:1099
-msgid "You have nothing to amend."
+#: builtin/fetch.c:151 builtin/pull.c:229
+msgid "convert to a complete repository"
msgstr ""
-#: builtin/commit.c:1102
-msgid "You are in the middle of a merge -- cannot amend."
+#: builtin/fetch.c:154
+msgid "prepend this to submodule path output"
msgstr ""
-#: builtin/commit.c:1104
-msgid "You are in the middle of a cherry-pick -- cannot amend."
+#: builtin/fetch.c:157
+msgid ""
+"default for recursive fetching of submodules (lower priority than config "
+"files)"
msgstr ""
-#: builtin/commit.c:1107
-msgid "Options --squash and --fixup cannot be used together"
+#: builtin/fetch.c:161 builtin/pull.c:232
+msgid "accept refs that update .git/shallow"
msgstr ""
-#: builtin/commit.c:1117
-msgid "Only one of -c/-C/-F/--fixup can be used."
+#: builtin/fetch.c:162 builtin/pull.c:234
+msgid "refmap"
msgstr ""
-#: builtin/commit.c:1119
-msgid "Option -m cannot be combined with -c/-C/-F."
+#: builtin/fetch.c:163 builtin/pull.c:235
+msgid "specify fetch refmap"
msgstr ""
-#: builtin/commit.c:1127
-msgid "--reset-author can be used only with -C, -c or --amend."
+#: builtin/fetch.c:170
+msgid "report that we have only objects reachable from this object"
msgstr ""
-#: builtin/commit.c:1144
-msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
+#: builtin/fetch.c:469
+msgid "Couldn't find remote ref HEAD"
msgstr ""
-#: builtin/commit.c:1146
-msgid "No paths with --include/--only does not make sense."
+#: builtin/fetch.c:608
+#, c-format
+msgid "configuration fetch.output contains invalid value %s"
msgstr ""
-#: builtin/commit.c:1160 builtin/tag.c:543
+#: builtin/fetch.c:705
#, c-format
-msgid "Invalid cleanup mode %s"
+msgid "object %s not found"
msgstr ""
-#: builtin/commit.c:1165
-msgid "Paths with -a does not make sense."
+#: builtin/fetch.c:709
+msgid "[up to date]"
msgstr ""
-#: builtin/commit.c:1303 builtin/commit.c:1480
-msgid "show status concisely"
+#: builtin/fetch.c:722 builtin/fetch.c:738 builtin/fetch.c:801
+msgid "[rejected]"
msgstr ""
-#: builtin/commit.c:1305 builtin/commit.c:1482
-msgid "show branch information"
+#: builtin/fetch.c:723
+msgid "can't fetch in current branch"
msgstr ""
-#: builtin/commit.c:1307
-msgid "show stash information"
+#: builtin/fetch.c:733
+msgid "[tag update]"
msgstr ""
-#: builtin/commit.c:1309 builtin/commit.c:1484
-msgid "compute full ahead/behind values"
+#: builtin/fetch.c:734 builtin/fetch.c:771 builtin/fetch.c:784
+#: builtin/fetch.c:796
+msgid "unable to update local ref"
msgstr ""
-#: builtin/commit.c:1311
-msgid "version"
+#: builtin/fetch.c:738
+msgid "would clobber existing tag"
msgstr ""
-#: builtin/commit.c:1311 builtin/commit.c:1486 builtin/push.c:558
-#: builtin/worktree.c:581
-msgid "machine-readable output"
+#: builtin/fetch.c:760
+msgid "[new tag]"
msgstr ""
-#: builtin/commit.c:1314 builtin/commit.c:1488
-msgid "show status in long format (default)"
+#: builtin/fetch.c:763
+msgid "[new branch]"
msgstr ""
-#: builtin/commit.c:1317 builtin/commit.c:1491
-msgid "terminate entries with NUL"
+#: builtin/fetch.c:766
+msgid "[new ref]"
msgstr ""
-#: builtin/commit.c:1319 builtin/commit.c:1323 builtin/commit.c:1494
-#: builtin/fast-export.c:1001 builtin/fast-export.c:1004 builtin/tag.c:397
-msgid "mode"
+#: builtin/fetch.c:796
+msgid "forced update"
msgstr ""
-#: builtin/commit.c:1320 builtin/commit.c:1494
-msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
+#: builtin/fetch.c:801
+msgid "non-fast-forward"
msgstr ""
-#: builtin/commit.c:1324
-msgid ""
-"show ignored files, optional modes: traditional, matching, no. (Default: "
-"traditional)"
+#: builtin/fetch.c:847
+#, c-format
+msgid "%s did not send all necessary objects\n"
msgstr ""
-#: builtin/commit.c:1326 parse-options.h:167
-msgid "when"
+#: builtin/fetch.c:868
+#, c-format
+msgid "reject %s because shallow roots are not allowed to be updated"
msgstr ""
-#: builtin/commit.c:1327
+#: builtin/fetch.c:959 builtin/fetch.c:1081
+#, c-format
+msgid "From %.*s\n"
+msgstr ""
+
+#: builtin/fetch.c:970
+#, c-format
msgid ""
-"ignore changes to submodules, optional when: all, dirty, untracked. "
-"(Default: all)"
+"some local refs could not be updated; try running\n"
+" 'git remote prune %s' to remove any old, conflicting branches"
msgstr ""
-#: builtin/commit.c:1329
-msgid "list untracked files in columns"
+#: builtin/fetch.c:1051
+#, c-format
+msgid " (%s will become dangling)"
msgstr ""
-#: builtin/commit.c:1330
-msgid "do not detect renames"
+#: builtin/fetch.c:1052
+#, c-format
+msgid " (%s has become dangling)"
msgstr ""
-#: builtin/commit.c:1332
-msgid "detect renames, optionally set similarity index"
+#: builtin/fetch.c:1084
+msgid "[deleted]"
msgstr ""
-#: builtin/commit.c:1352
-msgid "Unsupported combination of ignored and untracked-files arguments"
+#: builtin/fetch.c:1085 builtin/remote.c:1036
+msgid "(none)"
msgstr ""
-#: builtin/commit.c:1450
-msgid "suppress summary after successful commit"
+#: builtin/fetch.c:1108
+#, c-format
+msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr ""
-#: builtin/commit.c:1451
-msgid "show diff in commit message template"
+#: builtin/fetch.c:1127
+#, c-format
+msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr ""
-#: builtin/commit.c:1453
-msgid "Commit message options"
+#: builtin/fetch.c:1130
+#, c-format
+msgid "Option \"%s\" is ignored for %s\n"
msgstr ""
-#: builtin/commit.c:1454 builtin/tag.c:394
-msgid "read message from file"
+#: builtin/fetch.c:1434
+#, c-format
+msgid "Fetching %s\n"
msgstr ""
-#: builtin/commit.c:1455
-msgid "author"
+#: builtin/fetch.c:1436 builtin/remote.c:100
+#, c-format
+msgid "Could not fetch %s"
msgstr ""
-#: builtin/commit.c:1455
-msgid "override author for commit"
+#: builtin/fetch.c:1482
+msgid ""
+"--filter can only be used with the remote configured in extensions."
+"partialClone"
msgstr ""
-#: builtin/commit.c:1456 builtin/gc.c:501
-msgid "date"
+#: 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/commit.c:1456
-msgid "override date for commit"
+#: builtin/fetch.c:1543
+msgid "You need to specify a tag name."
msgstr ""
-#: builtin/commit.c:1457 builtin/merge.c:228 builtin/notes.c:402
-#: builtin/notes.c:565 builtin/tag.c:392
-msgid "message"
+#: builtin/fetch.c:1594
+msgid "Negative depth in --deepen is not supported"
msgstr ""
-#: builtin/commit.c:1457
-msgid "commit message"
+#: builtin/fetch.c:1596
+msgid "--deepen and --depth are mutually exclusive"
msgstr ""
-#: builtin/commit.c:1458 builtin/commit.c:1459 builtin/commit.c:1460
-#: builtin/commit.c:1461 parse-options.h:270 ref-filter.h:92
-msgid "commit"
+#: builtin/fetch.c:1601
+msgid "--depth and --unshallow cannot be used together"
msgstr ""
-#: builtin/commit.c:1458
-msgid "reuse and edit message from specified commit"
+#: builtin/fetch.c:1603
+msgid "--unshallow on a complete repository does not make sense"
msgstr ""
-#: builtin/commit.c:1459
-msgid "reuse message from specified commit"
+#: builtin/fetch.c:1619
+msgid "fetch --all does not take a repository argument"
msgstr ""
-#: builtin/commit.c:1460
-msgid "use autosquash formatted message to fixup specified commit"
+#: builtin/fetch.c:1621
+msgid "fetch --all does not make sense with refspecs"
msgstr ""
-#: builtin/commit.c:1461
-msgid "use autosquash formatted message to squash specified commit"
+#: builtin/fetch.c:1630
+#, c-format
+msgid "No such remote or remote group: %s"
msgstr ""
-#: builtin/commit.c:1462
-msgid "the commit is authored by me now (used with -C/-c/--amend)"
+#: builtin/fetch.c:1637
+msgid "Fetching a group and specifying refspecs does not make sense"
msgstr ""
-#: builtin/commit.c:1463 builtin/log.c:1446 builtin/merge.c:242
-#: builtin/pull.c:154 builtin/revert.c:105
-msgid "add Signed-off-by:"
+#: builtin/fetch.c:1653
+msgid ""
+"--filter can only be used with the remote configured in extensions."
+"partialclone"
msgstr ""
-#: builtin/commit.c:1464
-msgid "use specified template file"
+#: builtin/fmt-merge-msg.c:18
+msgid ""
+"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
msgstr ""
-#: builtin/commit.c:1465
-msgid "force edit of commit"
+#: builtin/fmt-merge-msg.c:672
+msgid "populate log with at most <n> entries from shortlog"
msgstr ""
-#: builtin/commit.c:1466
-msgid "default"
+#: builtin/fmt-merge-msg.c:675
+msgid "alias for --log (deprecated)"
msgstr ""
-#: builtin/commit.c:1466 builtin/tag.c:398
-msgid "how to strip spaces and #comments from message"
+#: builtin/fmt-merge-msg.c:678
+msgid "text"
msgstr ""
-#: builtin/commit.c:1467
-msgid "include status in commit message template"
+#: builtin/fmt-merge-msg.c:679
+msgid "use <text> as start of message"
msgstr ""
-#: builtin/commit.c:1469 builtin/merge.c:240 builtin/pull.c:184
-#: builtin/revert.c:113
-msgid "GPG sign commit"
+#: builtin/fmt-merge-msg.c:680
+msgid "file to read from"
msgstr ""
-#: builtin/commit.c:1472
-msgid "Commit contents options"
+#: builtin/for-each-ref.c:10
+msgid "git for-each-ref [<options>] [<pattern>]"
msgstr ""
-#: builtin/commit.c:1473
-msgid "commit all changed files"
+#: builtin/for-each-ref.c:11
+msgid "git for-each-ref [--points-at <object>]"
msgstr ""
-#: builtin/commit.c:1474
-msgid "add specified files to index for commit"
+#: builtin/for-each-ref.c:12
+msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]"
msgstr ""
-#: builtin/commit.c:1475
-msgid "interactively add files"
+#: 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/commit.c:1476
-msgid "interactively add changes"
+#: builtin/for-each-ref.c:30
+msgid "quote placeholders suitably for perl"
msgstr ""
-#: builtin/commit.c:1477
-msgid "commit only specified files"
+#: builtin/for-each-ref.c:32
+msgid "quote placeholders suitably for python"
msgstr ""
-#: builtin/commit.c:1478
-msgid "bypass pre-commit and commit-msg hooks"
+#: builtin/for-each-ref.c:34
+msgid "quote placeholders suitably for Tcl"
msgstr ""
-#: builtin/commit.c:1479
-msgid "show what would be committed"
+#: builtin/for-each-ref.c:37
+msgid "show only <n> matched refs"
msgstr ""
-#: builtin/commit.c:1492
-msgid "amend previous commit"
+#: builtin/for-each-ref.c:39 builtin/tag.c:433
+msgid "respect format colors"
msgstr ""
-#: builtin/commit.c:1493
-msgid "bypass post-rewrite hook"
+#: builtin/for-each-ref.c:42
+msgid "print only refs which points at the given object"
msgstr ""
-#: builtin/commit.c:1498
-msgid "ok to record an empty change"
+#: builtin/for-each-ref.c:44
+msgid "print only refs that are merged"
msgstr ""
-#: builtin/commit.c:1500
-msgid "ok to record a change with an empty message"
+#: builtin/for-each-ref.c:45
+msgid "print only refs that are not merged"
msgstr ""
-#: builtin/commit.c:1573
-#, c-format
-msgid "Corrupt MERGE_HEAD file (%s)"
+#: builtin/for-each-ref.c:46
+msgid "print only refs which contain the commit"
msgstr ""
-#: builtin/commit.c:1580
-msgid "could not read MERGE_MODE"
+#: builtin/for-each-ref.c:47
+msgid "print only refs which don't contain the commit"
msgstr ""
-#: builtin/commit.c:1599
-#, c-format
-msgid "could not read commit message: %s"
+#: builtin/fsck.c:88 builtin/fsck.c:160 builtin/fsck.c:161
+msgid "unknown"
msgstr ""
-#: builtin/commit.c:1610
+#. TRANSLATORS: e.g. error in tree 01bfda: <more explanation>
+#: builtin/fsck.c:120 builtin/fsck.c:136
#, c-format
-msgid "Aborting commit due to empty commit message.\n"
+msgid "error in %s %s: %s"
msgstr ""
-#: builtin/commit.c:1615
+#. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation>
+#: builtin/fsck.c:131
#, c-format
-msgid "Aborting commit; you did not edit the message.\n"
-msgstr ""
-
-#: builtin/commit.c:1650
-msgid ""
-"Repository has been updated, but unable to write\n"
-"new_index file. Check that disk is not full and quota is\n"
-"not exceeded, and then \"git reset HEAD\" to recover."
+msgid "warning in %s %s: %s"
msgstr ""
-#: builtin/commit-graph.c:9
-msgid "git commit-graph [--object-dir <objdir>]"
+#: builtin/fsck.c:157 builtin/fsck.c:159
+#, c-format
+msgid "broken link from %7s %s"
msgstr ""
-#: builtin/commit-graph.c:10 builtin/commit-graph.c:16
-msgid "git commit-graph read [--object-dir <objdir>]"
+#: builtin/fsck.c:168
+msgid "wrong object type in link"
msgstr ""
-#: builtin/commit-graph.c:11 builtin/commit-graph.c:21
+#: builtin/fsck.c:184
+#, c-format
msgid ""
-"git commit-graph write [--object-dir <objdir>] [--append] [--stdin-packs|--"
-"stdin-commits]"
+"broken link from %7s %s\n"
+" to %7s %s"
msgstr ""
-#: builtin/commit-graph.c:39 builtin/commit-graph.c:92
-#: builtin/commit-graph.c:147 builtin/fetch.c:161 builtin/log.c:1466
-msgid "dir"
+#: builtin/fsck.c:295
+#, c-format
+msgid "missing %s %s"
msgstr ""
-#: builtin/commit-graph.c:40 builtin/commit-graph.c:93
-#: builtin/commit-graph.c:148
-msgid "The object directory to store the graph"
+#: builtin/fsck.c:321
+#, c-format
+msgid "unreachable %s %s"
msgstr ""
-#: builtin/commit-graph.c:95
-msgid "scan pack-indexes listed by stdin for commits"
+#: builtin/fsck.c:340
+#, c-format
+msgid "dangling %s %s"
msgstr ""
-#: builtin/commit-graph.c:97
-msgid "start walk at commits listed by stdin"
+#: builtin/fsck.c:349
+msgid "could not create lost-found"
msgstr ""
-#: builtin/commit-graph.c:99
-msgid "include all commits already in the commit-graph file"
+#: builtin/fsck.c:360
+#, c-format
+msgid "could not finish '%s'"
msgstr ""
-#: builtin/commit-graph.c:108
-msgid "cannot use both --stdin-commits and --stdin-packs"
+#: builtin/fsck.c:377
+#, c-format
+msgid "Checking %s"
msgstr ""
-#: builtin/config.c:10
-msgid "git config [<options>]"
+#: builtin/fsck.c:415
+#, c-format
+msgid "Checking connectivity (%d objects)"
msgstr ""
-#: builtin/config.c:101
+#: builtin/fsck.c:434
#, c-format
-msgid "unrecognized --type argument, %s"
+msgid "Checking %s %s"
msgstr ""
-#: builtin/config.c:123
-msgid "Config file location"
+#: builtin/fsck.c:438
+msgid "broken links"
msgstr ""
-#: builtin/config.c:124
-msgid "use global config file"
+#: builtin/fsck.c:447
+#, c-format
+msgid "root %s"
msgstr ""
-#: builtin/config.c:125
-msgid "use system config file"
+#: builtin/fsck.c:455
+#, c-format
+msgid "tagged %s %s (%s) in %s"
msgstr ""
-#: builtin/config.c:126
-msgid "use repository config file"
+#: builtin/fsck.c:484
+#, c-format
+msgid "%s: object corrupt or missing"
msgstr ""
-#: builtin/config.c:127
-msgid "use given config file"
+#: builtin/fsck.c:509
+#, c-format
+msgid "%s: invalid reflog entry %s"
msgstr ""
-#: builtin/config.c:128
-msgid "blob-id"
+#: builtin/fsck.c:523
+#, c-format
+msgid "Checking reflog %s->%s"
msgstr ""
-#: builtin/config.c:128
-msgid "read config from given blob object"
+#: builtin/fsck.c:557
+#, c-format
+msgid "%s: invalid sha1 pointer %s"
msgstr ""
-#: builtin/config.c:129
-msgid "Action"
+#: builtin/fsck.c:564
+#, c-format
+msgid "%s: not a commit"
msgstr ""
-#: builtin/config.c:130
-msgid "get value: name [value-regex]"
+#: builtin/fsck.c:619
+msgid "notice: No default references"
msgstr ""
-#: builtin/config.c:131
-msgid "get all values: key [value-regex]"
+#: builtin/fsck.c:634
+#, c-format
+msgid "%s: object corrupt or missing: %s"
msgstr ""
-#: builtin/config.c:132
-msgid "get values for regexp: name-regex [value-regex]"
+#: builtin/fsck.c:647
+#, c-format
+msgid "%s: object could not be parsed: %s"
msgstr ""
-#: builtin/config.c:133
-msgid "get value specific for the URL: section[.var] URL"
+#: builtin/fsck.c:667
+#, c-format
+msgid "bad sha1 file: %s"
msgstr ""
-#: builtin/config.c:134
-msgid "replace all matching variables: name value [value_regex]"
+#: builtin/fsck.c:682
+msgid "Checking object directory"
msgstr ""
-#: builtin/config.c:135
-msgid "add a new variable: name value"
+#: builtin/fsck.c:685
+msgid "Checking object directories"
msgstr ""
-#: builtin/config.c:136
-msgid "remove a variable: name [value-regex]"
+#: builtin/fsck.c:700
+#, c-format
+msgid "Checking %s link"
msgstr ""
-#: builtin/config.c:137
-msgid "remove all matches: name [value-regex]"
+#: builtin/fsck.c:705 builtin/index-pack.c:841
+#, c-format
+msgid "invalid %s"
msgstr ""
-#: builtin/config.c:138
-msgid "rename section: old-name new-name"
+#: builtin/fsck.c:712
+#, c-format
+msgid "%s points to something strange (%s)"
msgstr ""
-#: builtin/config.c:139
-msgid "remove a section: name"
+#: builtin/fsck.c:718
+#, c-format
+msgid "%s: detached HEAD points at nothing"
msgstr ""
-#: builtin/config.c:140
-msgid "list all"
+#: builtin/fsck.c:722
+#, c-format
+msgid "notice: %s points to an unborn branch (%s)"
msgstr ""
-#: builtin/config.c:141
-msgid "open an editor"
+#: builtin/fsck.c:734
+msgid "Checking cache tree"
msgstr ""
-#: builtin/config.c:142
-msgid "find the color configured: slot [default]"
+#: builtin/fsck.c:739
+#, c-format
+msgid "%s: invalid sha1 pointer in cache-tree"
msgstr ""
-#: builtin/config.c:143
-msgid "find the color setting: slot [stdout-is-tty]"
+#: builtin/fsck.c:750
+msgid "non-tree in cache-tree"
msgstr ""
-#: builtin/config.c:144
-msgid "Type"
+#: builtin/fsck.c:781
+msgid "git fsck [<options>] [<object>...]"
msgstr ""
-#: builtin/config.c:145
-msgid "value is given this type"
+#: builtin/fsck.c:787
+msgid "show unreachable objects"
msgstr ""
-#: builtin/config.c:146
-msgid "value is \"true\" or \"false\""
+#: builtin/fsck.c:788
+msgid "show dangling objects"
msgstr ""
-#: builtin/config.c:147
-msgid "value is decimal number"
+#: builtin/fsck.c:789
+msgid "report tags"
msgstr ""
-#: builtin/config.c:148
-msgid "value is --bool or --int"
+#: builtin/fsck.c:790
+msgid "report root nodes"
msgstr ""
-#: builtin/config.c:149
-msgid "value is a path (file or directory name)"
+#: builtin/fsck.c:791
+msgid "make index objects head nodes"
msgstr ""
-#: builtin/config.c:150
-msgid "value is an expiry date"
+#: builtin/fsck.c:792
+msgid "make reflogs head nodes (default)"
msgstr ""
-#: builtin/config.c:151
-msgid "Other"
+#: builtin/fsck.c:793
+msgid "also consider packs and alternate objects"
msgstr ""
-#: builtin/config.c:152
-msgid "terminate values with NUL byte"
+#: builtin/fsck.c:794
+msgid "check only connectivity"
msgstr ""
-#: builtin/config.c:153
-msgid "show variable names only"
+#: builtin/fsck.c:795
+msgid "enable more strict checking"
msgstr ""
-#: builtin/config.c:154
-msgid "respect include directives on lookup"
+#: builtin/fsck.c:797
+msgid "write dangling objects in .git/lost-found"
msgstr ""
-#: builtin/config.c:155
-msgid "show origin of config (file, standard input, blob, command line)"
+#: builtin/fsck.c:798 builtin/prune.c:132
+msgid "show progress"
msgstr ""
-#: builtin/config.c:156
-msgid "value"
+#: builtin/fsck.c:799
+msgid "show verbose names for reachable objects"
msgstr ""
-#: builtin/config.c:156
-msgid "with --get, use default value when missing entry"
+#: builtin/fsck.c:859 builtin/index-pack.c:224
+msgid "Checking objects"
msgstr ""
-#: builtin/config.c:332
+#: builtin/fsck.c:887
#, c-format
-msgid "failed to format default config value: %s"
+msgid "%s: object missing"
msgstr ""
-#: builtin/config.c:431
-msgid "unable to parse default color value"
-msgstr ""
-
-#: builtin/config.c:575
+#: builtin/fsck.c:899
#, c-format
-msgid ""
-"# This is Git's per-user configuration file.\n"
-"[user]\n"
-"# Please adapt and uncomment the following lines:\n"
-"#\tname = %s\n"
-"#\temail = %s\n"
-msgstr ""
-
-#: builtin/config.c:603
-msgid "--local can only be used inside a git repository"
+msgid "invalid parameter: expected sha1, got '%s'"
msgstr ""
-#: builtin/config.c:606
-msgid "--blob can only be used inside a git repository"
+#: builtin/gc.c:34
+msgid "git gc [<options>]"
msgstr ""
-#: builtin/config.c:735
+#: builtin/gc.c:90
#, c-format
-msgid "cannot create configuration file %s"
+msgid "Failed to fstat %s: %s"
msgstr ""
-#: builtin/config.c:748
+#: builtin/gc.c:126
#, c-format
-msgid ""
-"cannot overwrite multiple values with a single value\n"
-" Use a regexp, --add or --replace-all to change %s."
+msgid "failed to parse '%s' value '%s'"
msgstr ""
-#: builtin/count-objects.c:90
-msgid "git count-objects [-v] [-H | --human-readable]"
+#: builtin/gc.c:476 builtin/init-db.c:55
+#, c-format
+msgid "cannot stat '%s'"
msgstr ""
-#: builtin/count-objects.c:100
-msgid "print sizes in human readable format"
+#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:519
+#, c-format
+msgid "cannot read '%s'"
msgstr ""
-#: builtin/describe.c:22
-msgid "git describe [<options>] [<commit-ish>...]"
+#: 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/describe.c:23
-msgid "git describe [<options>] --dirty"
+#: builtin/gc.c:540
+msgid "prune unreferenced objects"
msgstr ""
-#: builtin/describe.c:57
-msgid "head"
+#: builtin/gc.c:542
+msgid "be more thorough (increased runtime)"
msgstr ""
-#: builtin/describe.c:57
-msgid "lightweight"
+#: builtin/gc.c:543
+msgid "enable auto-gc mode"
msgstr ""
-#: builtin/describe.c:57
-msgid "annotated"
+#: builtin/gc.c:546
+msgid "force running gc even if there may be another gc running"
msgstr ""
-#: builtin/describe.c:267
-#, c-format
-msgid "annotated tag %s not available"
+#: builtin/gc.c:549
+msgid "repack all other packs except the largest pack"
msgstr ""
-#: builtin/describe.c:271
+#: builtin/gc.c:566
#, c-format
-msgid "annotated tag %s has no embedded name"
+msgid "failed to parse gc.logexpiry value %s"
msgstr ""
-#: builtin/describe.c:273
+#: builtin/gc.c:577
#, c-format
-msgid "tag '%s' is really '%s' here"
+msgid "failed to parse prune expiry value %s"
msgstr ""
-#: builtin/describe.c:317
+#: builtin/gc.c:597
#, c-format
-msgid "no tag exactly matches '%s'"
+msgid "Auto packing the repository in background for optimum performance.\n"
msgstr ""
-#: builtin/describe.c:319
+#: builtin/gc.c:599
#, c-format
-msgid "No exact match on refs or tags, searching to describe\n"
+msgid "Auto packing the repository for optimum performance.\n"
msgstr ""
-#: builtin/describe.c:366
+#: builtin/gc.c:600
#, c-format
-msgid "finished search at %s\n"
+msgid "See \"git help gc\" for manual housekeeping.\n"
msgstr ""
-#: builtin/describe.c:392
+#: builtin/gc.c:640
#, c-format
msgid ""
-"No annotated tags can describe '%s'.\n"
-"However, there were unannotated tags: try --tags."
+"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
msgstr ""
-#: builtin/describe.c:396
-#, c-format
+#: builtin/gc.c:693
msgid ""
-"No tags can describe '%s'.\n"
-"Try --always, or create some tags."
-msgstr ""
-
-#: builtin/describe.c:426
-#, c-format
-msgid "traversed %lu commits\n"
+"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr ""
-#: builtin/describe.c:429
-#, c-format
-msgid ""
-"more than %i tags found; listed %i most recent\n"
-"gave up search at %s\n"
+#: builtin/grep.c:29
+msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
msgstr ""
-#: builtin/describe.c:497
+#: builtin/grep.c:225
#, c-format
-msgid "describe %s\n"
+msgid "grep: failed to create thread: %s"
msgstr ""
-#: builtin/describe.c:500 builtin/log.c:502
+#: builtin/grep.c:279
#, c-format
-msgid "Not a valid object name %s"
+msgid "invalid number of threads specified (%d) for %s"
msgstr ""
-#: builtin/describe.c:508
+#. 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 "%s is neither a commit nor blob"
-msgstr ""
-
-#: builtin/describe.c:522
-msgid "find the tag that comes after the commit"
-msgstr ""
-
-#: builtin/describe.c:523
-msgid "debug search strategy on stderr"
-msgstr ""
-
-#: builtin/describe.c:524
-msgid "use any ref"
+msgid "no threads support, ignoring %s"
msgstr ""
-#: builtin/describe.c:525
-msgid "use any tag, even unannotated"
+#: builtin/grep.c:466 builtin/grep.c:590 builtin/grep.c:631
+#, c-format
+msgid "unable to read tree (%s)"
msgstr ""
-#: builtin/describe.c:526
-msgid "always use long format"
+#: builtin/grep.c:646
+#, c-format
+msgid "unable to grep from object of type %s"
msgstr ""
-#: builtin/describe.c:527
-msgid "only follow first parent"
+#: builtin/grep.c:712
+#, c-format
+msgid "switch `%c' expects a numerical value"
msgstr ""
-#: builtin/describe.c:530
-msgid "only output exact matches"
+#: builtin/grep.c:811
+msgid "search in index instead of in the work tree"
msgstr ""
-#: builtin/describe.c:532
-msgid "consider <n> most recent tags (default: 10)"
+#: builtin/grep.c:813
+msgid "find in contents not managed by git"
msgstr ""
-#: builtin/describe.c:534
-msgid "only consider tags matching <pattern>"
+#: builtin/grep.c:815
+msgid "search in both tracked and untracked files"
msgstr ""
-#: builtin/describe.c:536
-msgid "do not consider tags matching <pattern>"
+#: builtin/grep.c:817
+msgid "ignore files specified via '.gitignore'"
msgstr ""
-#: builtin/describe.c:538 builtin/name-rev.c:406
-msgid "show abbreviated commit object as fallback"
+#: builtin/grep.c:819
+msgid "recursively search in each submodule"
msgstr ""
-#: builtin/describe.c:539 builtin/describe.c:542
-msgid "mark"
+#: builtin/grep.c:822
+msgid "show non-matching lines"
msgstr ""
-#: builtin/describe.c:540
-msgid "append <mark> on dirty working tree (default: \"-dirty\")"
+#: builtin/grep.c:824
+msgid "case insensitive matching"
msgstr ""
-#: builtin/describe.c:543
-msgid "append <mark> on broken working tree (default: \"-broken\")"
+#: builtin/grep.c:826
+msgid "match patterns only at word boundaries"
msgstr ""
-#: builtin/describe.c:561
-msgid "--long is incompatible with --abbrev=0"
+#: builtin/grep.c:828
+msgid "process binary files as text"
msgstr ""
-#: builtin/describe.c:590
-msgid "No names found, cannot describe anything."
+#: builtin/grep.c:830
+msgid "don't match patterns in binary files"
msgstr ""
-#: builtin/describe.c:640
-msgid "--dirty is incompatible with commit-ishes"
+#: builtin/grep.c:833
+msgid "process binary files with textconv filters"
msgstr ""
-#: builtin/describe.c:642
-msgid "--broken is incompatible with commit-ishes"
+#: builtin/grep.c:835
+msgid "search in subdirectories (default)"
msgstr ""
-#: builtin/diff.c:83
-#, c-format
-msgid "'%s': not a regular file or symlink"
+#: builtin/grep.c:837
+msgid "descend at most <depth> levels"
msgstr ""
-#: builtin/diff.c:234
-#, c-format
-msgid "invalid option: %s"
+#: builtin/grep.c:841
+msgid "use extended POSIX regular expressions"
msgstr ""
-#: builtin/diff.c:356
-msgid "Not a git repository"
+#: builtin/grep.c:844
+msgid "use basic POSIX regular expressions (default)"
msgstr ""
-#: builtin/diff.c:399
-#, c-format
-msgid "invalid object '%s' given."
+#: builtin/grep.c:847
+msgid "interpret patterns as fixed strings"
msgstr ""
-#: builtin/diff.c:408
-#, c-format
-msgid "more than two blobs given: '%s'"
+#: builtin/grep.c:850
+msgid "use Perl-compatible regular expressions"
msgstr ""
-#: builtin/diff.c:413
-#, c-format
-msgid "unhandled object '%s' given."
+#: builtin/grep.c:853
+msgid "show line numbers"
msgstr ""
-#: builtin/difftool.c:29
-msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
+#: builtin/grep.c:854
+msgid "show column number of first match"
msgstr ""
-#: builtin/difftool.c:259
-#, c-format
-msgid "failed: %d"
+#: builtin/grep.c:855
+msgid "don't show filenames"
msgstr ""
-#: builtin/difftool.c:301
-#, c-format
-msgid "could not read symlink %s"
+#: builtin/grep.c:856
+msgid "show filenames"
msgstr ""
-#: builtin/difftool.c:303
-#, c-format
-msgid "could not read symlink file %s"
+#: builtin/grep.c:858
+msgid "show filenames relative to top directory"
msgstr ""
-#: builtin/difftool.c:311
-#, c-format
-msgid "could not read object %s for symlink %s"
+#: builtin/grep.c:860
+msgid "show only filenames instead of matching lines"
msgstr ""
-#: builtin/difftool.c:412
-msgid ""
-"combined diff formats('-c' and '--cc') are not supported in\n"
-"directory diff mode('-d' and '--dir-diff')."
+#: builtin/grep.c:862
+msgid "synonym for --files-with-matches"
msgstr ""
-#: builtin/difftool.c:632
-#, c-format
-msgid "both files modified: '%s' and '%s'."
+#: builtin/grep.c:865
+msgid "show only the names of files without match"
msgstr ""
-#: builtin/difftool.c:634
-msgid "working tree file has been left."
+#: builtin/grep.c:867
+msgid "print NUL after filenames"
msgstr ""
-#: builtin/difftool.c:645
-#, c-format
-msgid "temporary files exist in '%s'."
+#: builtin/grep.c:870
+msgid "show only matching parts of a line"
msgstr ""
-#: builtin/difftool.c:646
-msgid "you may want to cleanup or recover these."
+#: builtin/grep.c:872
+msgid "show the number of matches instead of matching lines"
msgstr ""
-#: builtin/difftool.c:695
-msgid "use `diff.guitool` instead of `diff.tool`"
+#: builtin/grep.c:873
+msgid "highlight matches"
msgstr ""
-#: builtin/difftool.c:697
-msgid "perform a full-directory diff"
+#: builtin/grep.c:875
+msgid "print empty line between matches from different files"
msgstr ""
-#: builtin/difftool.c:699
-msgid "do not prompt before launching a diff tool"
+#: builtin/grep.c:877
+msgid "show filename only once above matches from same file"
msgstr ""
-#: builtin/difftool.c:704
-msgid "use symlinks in dir-diff mode"
+#: builtin/grep.c:880
+msgid "show <n> context lines before and after matches"
msgstr ""
-#: builtin/difftool.c:705
-msgid "<tool>"
+#: builtin/grep.c:883
+msgid "show <n> context lines before matches"
msgstr ""
-#: builtin/difftool.c:706
-msgid "use the specified diff tool"
+#: builtin/grep.c:885
+msgid "show <n> context lines after matches"
msgstr ""
-#: builtin/difftool.c:708
-msgid "print a list of diff tools that may be used with `--tool`"
+#: builtin/grep.c:887
+msgid "use <n> worker threads"
msgstr ""
-#: builtin/difftool.c:711
-msgid ""
-"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
-"code"
+#: builtin/grep.c:888
+msgid "shortcut for -C NUM"
msgstr ""
-#: builtin/difftool.c:713
-msgid "<command>"
+#: builtin/grep.c:891
+msgid "show a line with the function name before matches"
msgstr ""
-#: builtin/difftool.c:714
-msgid "specify a custom command for viewing diffs"
+#: builtin/grep.c:893
+msgid "show the surrounding function"
msgstr ""
-#: builtin/difftool.c:738
-msgid "no <tool> given for --tool=<tool>"
+#: builtin/grep.c:896
+msgid "read patterns from file"
msgstr ""
-#: builtin/difftool.c:745
-msgid "no <cmd> given for --extcmd=<cmd>"
+#: builtin/grep.c:898
+msgid "match <pattern>"
msgstr ""
-#: builtin/fast-export.c:27
-msgid "git fast-export [rev-list-opts]"
+#: builtin/grep.c:900
+msgid "combine patterns specified with -e"
msgstr ""
-#: builtin/fast-export.c:1000
-msgid "show progress after <n> objects"
+#: builtin/grep.c:912
+msgid "indicate hit with exit status without output"
msgstr ""
-#: builtin/fast-export.c:1002
-msgid "select handling of signed tags"
+#: builtin/grep.c:914
+msgid "show only matches from files that match all patterns"
msgstr ""
-#: builtin/fast-export.c:1005
-msgid "select handling of tags that tag filtered objects"
+#: builtin/grep.c:916
+msgid "show parse tree for grep expression"
msgstr ""
-#: builtin/fast-export.c:1008
-msgid "Dump marks to this file"
+#: builtin/grep.c:920
+msgid "pager"
msgstr ""
-#: builtin/fast-export.c:1010
-msgid "Import marks from this file"
+#: builtin/grep.c:920
+msgid "show matching files in the pager"
msgstr ""
-#: builtin/fast-export.c:1012
-msgid "Fake a tagger when tags lack one"
+#: builtin/grep.c:924
+msgid "allow calling of grep(1) (ignored by this build)"
msgstr ""
-#: builtin/fast-export.c:1014
-msgid "Output full tree for each commit"
+#: builtin/grep.c:988
+msgid "no pattern given"
msgstr ""
-#: builtin/fast-export.c:1016
-msgid "Use the done feature to terminate the stream"
+#: builtin/grep.c:1024
+msgid "--no-index or --untracked cannot be used with revs"
msgstr ""
-#: builtin/fast-export.c:1017
-msgid "Skip output of blob data"
+#: builtin/grep.c:1032
+#, c-format
+msgid "unable to resolve revision: %s"
msgstr ""
-#: builtin/fast-export.c:1018
-msgid "refspec"
+#: builtin/grep.c:1063
+msgid "invalid option combination, ignoring --threads"
msgstr ""
-#: builtin/fast-export.c:1019
-msgid "Apply refspec to exported refs"
+#: builtin/grep.c:1066 builtin/pack-objects.c:3403
+msgid "no threads support, ignoring --threads"
msgstr ""
-#: builtin/fast-export.c:1020
-msgid "anonymize output"
+#: 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/fetch.c:26
-msgid "git fetch [<options>] [<repository> [<refspec>...]]"
+#: builtin/grep.c:1092
+msgid "--open-files-in-pager only works on the worktree"
msgstr ""
-#: builtin/fetch.c:27
-msgid "git fetch [<options>] <group>"
+#: builtin/grep.c:1115
+msgid "option not supported with --recurse-submodules"
msgstr ""
-#: builtin/fetch.c:28
-msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
+#: builtin/grep.c:1121
+msgid "--cached or --untracked cannot be used with --no-index"
msgstr ""
-#: builtin/fetch.c:29
-msgid "git fetch --all [<options>]"
+#: builtin/grep.c:1127
+msgid "--[no-]exclude-standard cannot be used for tracked contents"
msgstr ""
-#: builtin/fetch.c:123 builtin/pull.c:193
-msgid "fetch from all remotes"
+#: builtin/grep.c:1135
+msgid "both --cached and trees are given"
msgstr ""
-#: builtin/fetch.c:125 builtin/pull.c:196
-msgid "append to .git/FETCH_HEAD instead of overwriting"
+#: builtin/hash-object.c:85
+msgid ""
+"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
+"[--] <file>..."
msgstr ""
-#: builtin/fetch.c:127 builtin/pull.c:199
-msgid "path to upload pack on remote end"
+#: builtin/hash-object.c:86
+msgid "git hash-object --stdin-paths"
msgstr ""
-#: builtin/fetch.c:128 builtin/pull.c:201
-msgid "force overwrite of local branch"
+#: builtin/hash-object.c:98
+msgid "type"
msgstr ""
-#: builtin/fetch.c:130
-msgid "fetch from multiple remotes"
+#: builtin/hash-object.c:98
+msgid "object type"
msgstr ""
-#: builtin/fetch.c:132 builtin/pull.c:203
-msgid "fetch all tags and associated objects"
+#: builtin/hash-object.c:99
+msgid "write the object into the object database"
msgstr ""
-#: builtin/fetch.c:134
-msgid "do not fetch all tags (--no-tags)"
+#: builtin/hash-object.c:101
+msgid "read the object from stdin"
msgstr ""
-#: builtin/fetch.c:136
-msgid "number of submodules fetched in parallel"
+#: builtin/hash-object.c:103
+msgid "store file as is without filters"
msgstr ""
-#: builtin/fetch.c:138 builtin/pull.c:206
-msgid "prune remote-tracking branches no longer on remote"
+#: builtin/hash-object.c:104
+msgid ""
+"just hash any random garbage to create corrupt objects for debugging Git"
msgstr ""
-#: builtin/fetch.c:140
-msgid "prune local tags no longer on remote and clobber changed tags"
+#: builtin/hash-object.c:105
+msgid "process file as it were from this path"
msgstr ""
-#: builtin/fetch.c:141 builtin/fetch.c:164 builtin/pull.c:131
-msgid "on-demand"
+#: builtin/help.c:46
+msgid "print all available commands"
msgstr ""
-#: builtin/fetch.c:142
-msgid "control recursive fetching of submodules"
+#: builtin/help.c:47
+msgid "exclude guides"
msgstr ""
-#: builtin/fetch.c:146 builtin/pull.c:214
-msgid "keep downloaded pack"
+#: builtin/help.c:48
+msgid "print list of useful guides"
msgstr ""
-#: builtin/fetch.c:148
-msgid "allow updating of HEAD ref"
+#: builtin/help.c:49
+msgid "print all configuration variable names"
msgstr ""
-#: builtin/fetch.c:151 builtin/fetch.c:157 builtin/pull.c:217
-msgid "deepen history of shallow clone"
+#: builtin/help.c:51
+msgid "show man page"
msgstr ""
-#: builtin/fetch.c:153
-msgid "deepen history of shallow repository based on time"
+#: builtin/help.c:52
+msgid "show manual in web browser"
msgstr ""
-#: builtin/fetch.c:159 builtin/pull.c:220
-msgid "convert to a complete repository"
+#: builtin/help.c:54
+msgid "show info page"
msgstr ""
-#: builtin/fetch.c:162
-msgid "prepend this to submodule path output"
+#: builtin/help.c:56
+msgid "print command description"
msgstr ""
-#: builtin/fetch.c:165
-msgid ""
-"default for recursive fetching of submodules (lower priority than config "
-"files)"
+#: builtin/help.c:61
+msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
msgstr ""
-#: builtin/fetch.c:169 builtin/pull.c:223
-msgid "accept refs that update .git/shallow"
+#: builtin/help.c:77
+#, c-format
+msgid "unrecognized help format '%s'"
msgstr ""
-#: builtin/fetch.c:170 builtin/pull.c:225
-msgid "refmap"
+#: builtin/help.c:104
+msgid "Failed to start emacsclient."
msgstr ""
-#: builtin/fetch.c:171 builtin/pull.c:226
-msgid "specify fetch refmap"
+#: builtin/help.c:117
+msgid "Failed to parse emacsclient version."
msgstr ""
-#: builtin/fetch.c:172 builtin/ls-remote.c:77 builtin/push.c:582
-#: builtin/send-pack.c:172
-msgid "server-specific"
+#: builtin/help.c:125
+#, c-format
+msgid "emacsclient version '%d' too old (< 22)."
msgstr ""
-#: builtin/fetch.c:172 builtin/ls-remote.c:77 builtin/push.c:582
-#: builtin/send-pack.c:173
-msgid "option to transmit"
+#: 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/fetch.c:442
-msgid "Couldn't find remote ref HEAD"
+#: builtin/help.c:221
+#, c-format
+msgid ""
+"'%s': path for unsupported man viewer.\n"
+"Please consider using 'man.<tool>.cmd' instead."
msgstr ""
-#: builtin/fetch.c:560
+#: builtin/help.c:233
#, c-format
-msgid "configuration fetch.output contains invalid value %s"
+msgid ""
+"'%s': cmd for supported man viewer.\n"
+"Please consider using 'man.<tool>.path' instead."
msgstr ""
-#: builtin/fetch.c:653
+#: builtin/help.c:350
#, c-format
-msgid "object %s not found"
+msgid "'%s': unknown man viewer."
msgstr ""
-#: builtin/fetch.c:657
-msgid "[up to date]"
+#: builtin/help.c:367
+msgid "no man viewer handled the request"
msgstr ""
-#: builtin/fetch.c:670 builtin/fetch.c:750
-msgid "[rejected]"
+#: builtin/help.c:375
+msgid "no info viewer handled the request"
msgstr ""
-#: builtin/fetch.c:671
-msgid "can't fetch in current branch"
+#: builtin/help.c:434 builtin/help.c:445 git.c:335
+#, c-format
+msgid "'%s' is aliased to '%s'"
msgstr ""
-#: builtin/fetch.c:680
-msgid "[tag update]"
+#: builtin/help.c:448 git.c:364
+#, c-format
+msgid "bad alias.%s string: %s"
msgstr ""
-#: builtin/fetch.c:681 builtin/fetch.c:714 builtin/fetch.c:730
-#: builtin/fetch.c:745
-msgid "unable to update local ref"
+#: builtin/help.c:477 builtin/help.c:507
+#, c-format
+msgid "usage: %s%s"
msgstr ""
-#: builtin/fetch.c:700
-msgid "[new tag]"
+#: builtin/help.c:491
+msgid "'git help config' for more information"
msgstr ""
-#: builtin/fetch.c:703
-msgid "[new branch]"
+#: builtin/index-pack.c:184
+#, c-format
+msgid "object type mismatch at %s"
msgstr ""
-#: builtin/fetch.c:706
-msgid "[new ref]"
+#: builtin/index-pack.c:204
+#, c-format
+msgid "did not receive expected object %s"
msgstr ""
-#: builtin/fetch.c:745
-msgid "forced update"
+#: builtin/index-pack.c:207
+#, c-format
+msgid "object %s: expected type %s, found %s"
msgstr ""
-#: builtin/fetch.c:750
-msgid "non-fast-forward"
+#: 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/fetch.c:795
-#, c-format
-msgid "%s did not send all necessary objects\n"
+#: builtin/index-pack.c:268
+msgid "read error on input"
msgstr ""
-#: builtin/fetch.c:815
-#, c-format
-msgid "reject %s because shallow roots are not allowed to be updated"
+#: builtin/index-pack.c:280
+msgid "used more bytes than were available"
msgstr ""
-#: builtin/fetch.c:903 builtin/fetch.c:999
-#, c-format
-msgid "From %.*s\n"
+#: builtin/index-pack.c:287 builtin/pack-objects.c:600
+msgid "pack too large for current definition of off_t"
msgstr ""
-#: builtin/fetch.c:914
-#, c-format
-msgid ""
-"some local refs could not be updated; try running\n"
-" 'git remote prune %s' to remove any old, conflicting branches"
+#: builtin/index-pack.c:290 builtin/unpack-objects.c:94
+msgid "pack exceeds maximum allowed size"
msgstr ""
-#: builtin/fetch.c:969
+#: builtin/index-pack.c:305 builtin/repack.c:250
#, c-format
-msgid " (%s will become dangling)"
+msgid "unable to create '%s'"
msgstr ""
-#: builtin/fetch.c:970
+#: builtin/index-pack.c:311
#, c-format
-msgid " (%s has become dangling)"
+msgid "cannot open packfile '%s'"
msgstr ""
-#: builtin/fetch.c:1002
-msgid "[deleted]"
+#: builtin/index-pack.c:325
+msgid "pack signature mismatch"
msgstr ""
-#: builtin/fetch.c:1003 builtin/remote.c:1033
-msgid "(none)"
+#: builtin/index-pack.c:327
+#, c-format
+msgid "pack version %<PRIu32> unsupported"
msgstr ""
-#: builtin/fetch.c:1026
+#: builtin/index-pack.c:345
#, c-format
-msgid "Refusing to fetch into current branch %s of non-bare repository"
+msgid "pack has bad object at offset %<PRIuMAX>: %s"
msgstr ""
-#: builtin/fetch.c:1045
+#: builtin/index-pack.c:465
#, c-format
-msgid "Option \"%s\" value \"%s\" is not valid for %s"
+msgid "inflate returned %d"
msgstr ""
-#: builtin/fetch.c:1048
-#, c-format
-msgid "Option \"%s\" is ignored for %s\n"
+#: builtin/index-pack.c:514
+msgid "offset value overflow for delta base object"
msgstr ""
-#: builtin/fetch.c:1287
-#, c-format
-msgid "Fetching %s\n"
+#: builtin/index-pack.c:522
+msgid "delta base offset is out of bound"
msgstr ""
-#: builtin/fetch.c:1289 builtin/remote.c:98
+#: builtin/index-pack.c:530
#, c-format
-msgid "Could not fetch %s"
+msgid "unknown object type %d"
msgstr ""
-#: builtin/fetch.c:1335 builtin/fetch.c:1503
-msgid ""
-"--filter can only be used with the remote configured in core.partialClone"
+#: builtin/index-pack.c:561
+msgid "cannot pread pack file"
msgstr ""
-#: builtin/fetch.c:1358
-msgid ""
-"No remote repository specified. Please, specify either a URL or a\n"
-"remote name from which new revisions should be fetched."
-msgstr ""
+#: builtin/index-pack.c: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/fetch.c:1395
-msgid "You need to specify a tag name."
+#: builtin/index-pack.c:589
+msgid "serious inflate inconsistency"
msgstr ""
-#: builtin/fetch.c:1444
-msgid "Negative depth in --deepen is not supported"
+#: 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/fetch.c:1446
-msgid "--deepen and --depth are mutually exclusive"
+#: 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/fetch.c:1451
-msgid "--depth and --unshallow cannot be used together"
+#: builtin/index-pack.c:800
+#, c-format
+msgid "cannot read existing object info %s"
msgstr ""
-#: builtin/fetch.c:1453
-msgid "--unshallow on a complete repository does not make sense"
+#: builtin/index-pack.c:808
+#, c-format
+msgid "cannot read existing object %s"
msgstr ""
-#: builtin/fetch.c:1469
-msgid "fetch --all does not take a repository argument"
+#: builtin/index-pack.c:822
+#, c-format
+msgid "invalid blob object %s"
msgstr ""
-#: builtin/fetch.c:1471
-msgid "fetch --all does not make sense with refspecs"
+#: builtin/index-pack.c:825 builtin/index-pack.c:844
+msgid "fsck error in packed object"
msgstr ""
-#: builtin/fetch.c:1480
+#: builtin/index-pack.c:846
#, c-format
-msgid "No such remote or remote group: %s"
+msgid "Not all child objects of %s are reachable"
msgstr ""
-#: builtin/fetch.c:1487
-msgid "Fetching a group and specifying refspecs does not make sense"
+#: builtin/index-pack.c:918 builtin/index-pack.c:949
+msgid "failed to apply delta"
msgstr ""
-#: builtin/fmt-merge-msg.c:15
-msgid ""
-"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
+#: builtin/index-pack.c:1117
+msgid "Receiving objects"
msgstr ""
-#: builtin/fmt-merge-msg.c:666
-msgid "populate log with at most <n> entries from shortlog"
+#: builtin/index-pack.c:1117
+msgid "Indexing objects"
msgstr ""
-#: builtin/fmt-merge-msg.c:669
-msgid "alias for --log (deprecated)"
+#: builtin/index-pack.c:1151
+msgid "pack is corrupted (SHA1 mismatch)"
msgstr ""
-#: builtin/fmt-merge-msg.c:672
-msgid "text"
+#: builtin/index-pack.c:1156
+msgid "cannot fstat packfile"
msgstr ""
-#: builtin/fmt-merge-msg.c:673
-msgid "use <text> as start of message"
+#: builtin/index-pack.c:1159
+msgid "pack has junk at the end"
msgstr ""
-#: builtin/fmt-merge-msg.c:674
-msgid "file to read from"
+#: builtin/index-pack.c:1171
+msgid "confusion beyond insanity in parse_pack_objects()"
msgstr ""
-#: builtin/for-each-ref.c:10
-msgid "git for-each-ref [<options>] [<pattern>]"
+#: builtin/index-pack.c:1194
+msgid "Resolving deltas"
msgstr ""
-#: builtin/for-each-ref.c:11
-msgid "git for-each-ref [--points-at <object>]"
+#: builtin/index-pack.c:1204 builtin/pack-objects.c:2489
+#, c-format
+msgid "unable to create thread: %s"
msgstr ""
-#: builtin/for-each-ref.c:12
-msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]"
+#: builtin/index-pack.c:1245
+msgid "confusion beyond insanity"
msgstr ""
-#: builtin/for-each-ref.c:13
-msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
-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/for-each-ref.c:28
-msgid "quote placeholders suitably for shells"
+#: builtin/index-pack.c:1263
+#, c-format
+msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr ""
-#: builtin/for-each-ref.c:30
-msgid "quote placeholders suitably for perl"
-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/for-each-ref.c:32
-msgid "quote placeholders suitably for python"
+#: builtin/index-pack.c:1291
+#, c-format
+msgid "unable to deflate appended object (%d)"
msgstr ""
-#: builtin/for-each-ref.c:34
-msgid "quote placeholders suitably for Tcl"
+#: builtin/index-pack.c:1368
+#, c-format
+msgid "local object %s is corrupt"
msgstr ""
-#: builtin/for-each-ref.c:37
-msgid "show only <n> matched refs"
+#: builtin/index-pack.c:1382
+#, c-format
+msgid "packfile name '%s' does not end with '.pack'"
msgstr ""
-#: builtin/for-each-ref.c:39 builtin/tag.c:421
-msgid "respect format colors"
+#: builtin/index-pack.c:1407
+#, c-format
+msgid "cannot write %s file '%s'"
msgstr ""
-#: builtin/for-each-ref.c:43
-msgid "print only refs which points at the given object"
+#: builtin/index-pack.c:1415
+#, c-format
+msgid "cannot close written %s file '%s'"
msgstr ""
-#: builtin/for-each-ref.c:45
-msgid "print only refs that are merged"
+#: builtin/index-pack.c:1439
+msgid "error while closing pack file"
msgstr ""
-#: builtin/for-each-ref.c:46
-msgid "print only refs that are not merged"
+#: builtin/index-pack.c:1453
+msgid "cannot store pack file"
msgstr ""
-#: builtin/for-each-ref.c:47
-msgid "print only refs which contain the commit"
+#: builtin/index-pack.c:1461
+msgid "cannot store index file"
msgstr ""
-#: builtin/for-each-ref.c:48
-msgid "print only refs which don't contain the commit"
+#: builtin/index-pack.c:1505 builtin/pack-objects.c:2728
+#, c-format
+msgid "bad pack.indexversion=%<PRIu32>"
msgstr ""
-#: builtin/fsck.c:569
-msgid "Checking object directories"
+#: builtin/index-pack.c:1573
+#, c-format
+msgid "Cannot open existing pack file '%s'"
msgstr ""
-#: builtin/fsck.c:661
-msgid "git fsck [<options>] [<object>...]"
+#: builtin/index-pack.c:1575
+#, c-format
+msgid "Cannot open existing pack idx file for '%s'"
msgstr ""
-#: builtin/fsck.c:667
-msgid "show unreachable objects"
-msgstr ""
+#: builtin/index-pack.c:1623
+#, c-format
+msgid "non delta: %d object"
+msgid_plural "non delta: %d objects"
+msgstr[0] ""
+msgstr[1] ""
-#: builtin/fsck.c:668
-msgid "show dangling objects"
-msgstr ""
+#: 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/fsck.c:669
-msgid "report tags"
+#: builtin/index-pack.c:1667
+msgid "Cannot come back to cwd"
msgstr ""
-#: builtin/fsck.c:670
-msgid "report root nodes"
+#: 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/fsck.c:671
-msgid "make index objects head nodes"
+#: builtin/index-pack.c:1755
+msgid "--fix-thin cannot be used without --stdin"
msgstr ""
-#: builtin/fsck.c:672
-msgid "make reflogs head nodes (default)"
+#: builtin/index-pack.c:1757
+msgid "--stdin requires a git repository"
msgstr ""
-#: builtin/fsck.c:673
-msgid "also consider packs and alternate objects"
+#: builtin/index-pack.c:1763
+msgid "--verify with no packfile name given"
msgstr ""
-#: builtin/fsck.c:674
-msgid "check only connectivity"
+#: builtin/index-pack.c:1811 builtin/unpack-objects.c:580
+msgid "fsck error in pack objects"
msgstr ""
-#: builtin/fsck.c:675
-msgid "enable more strict checking"
+#: builtin/init-db.c:61
+#, c-format
+msgid "cannot stat template '%s'"
msgstr ""
-#: builtin/fsck.c:677
-msgid "write dangling objects in .git/lost-found"
+#: builtin/init-db.c:66
+#, c-format
+msgid "cannot opendir '%s'"
msgstr ""
-#: builtin/fsck.c:678 builtin/prune.c:109
-msgid "show progress"
+#: builtin/init-db.c:78
+#, c-format
+msgid "cannot readlink '%s'"
msgstr ""
-#: builtin/fsck.c:679
-msgid "show verbose names for reachable objects"
+#: builtin/init-db.c:80
+#, c-format
+msgid "cannot symlink '%s' '%s'"
msgstr ""
-#: builtin/fsck.c:745
-msgid "Checking objects"
+#: builtin/init-db.c:86
+#, c-format
+msgid "cannot copy '%s' to '%s'"
msgstr ""
-#: builtin/gc.c:33
-msgid "git gc [<options>]"
+#: builtin/init-db.c:90
+#, c-format
+msgid "ignoring template %s"
msgstr ""
-#: builtin/gc.c:88
+#: builtin/init-db.c:121
#, c-format
-msgid "Failed to fstat %s: %s"
+msgid "templates not found in %s"
msgstr ""
-#: builtin/gc.c:452
+#: builtin/init-db.c:136
#, c-format
-msgid "Can't stat %s"
+msgid "not copying templates from '%s': %s"
msgstr ""
-#: builtin/gc.c:461
+#: builtin/init-db.c:334
#, c-format
-msgid ""
-"The last gc run reported the following. Please correct the root cause\n"
-"and remove %s.\n"
-"Automatic cleanup will not be performed until the file is removed.\n"
-"\n"
-"%s"
+msgid "unable to handle file type %d"
msgstr ""
-#: builtin/gc.c:502
-msgid "prune unreferenced objects"
+#: builtin/init-db.c:337
+#, c-format
+msgid "unable to move %s to %s"
msgstr ""
-#: builtin/gc.c:504
-msgid "be more thorough (increased runtime)"
+#: builtin/init-db.c:354 builtin/init-db.c:357
+#, c-format
+msgid "%s already exists"
msgstr ""
-#: builtin/gc.c:505
-msgid "enable auto-gc mode"
+#: builtin/init-db.c:413
+#, c-format
+msgid "Reinitialized existing shared Git repository in %s%s\n"
msgstr ""
-#: builtin/gc.c:508
-msgid "force running gc even if there may be another gc running"
+#: builtin/init-db.c:414
+#, c-format
+msgid "Reinitialized existing Git repository in %s%s\n"
msgstr ""
-#: builtin/gc.c:511
-msgid "repack all other packs except the largest pack"
+#: builtin/init-db.c:418
+#, c-format
+msgid "Initialized empty shared Git repository in %s%s\n"
msgstr ""
-#: builtin/gc.c:528
+#: builtin/init-db.c:419
#, c-format
-msgid "failed to parse gc.logexpiry value %s"
+msgid "Initialized empty Git repository in %s%s\n"
msgstr ""
-#: builtin/gc.c:539
-#, c-format
-msgid "failed to parse prune expiry value %s"
+#: builtin/init-db.c:468
+msgid ""
+"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
+"shared[=<permissions>]] [<directory>]"
msgstr ""
-#: builtin/gc.c:559
-#, c-format
-msgid "Auto packing the repository in background for optimum performance.\n"
+#: builtin/init-db.c:491
+msgid "permissions"
msgstr ""
-#: builtin/gc.c:561
-#, c-format
-msgid "Auto packing the repository for optimum performance.\n"
+#: builtin/init-db.c:492
+msgid "specify that the git repository is to be shared amongst several users"
msgstr ""
-#: builtin/gc.c:562
+#: builtin/init-db.c:526 builtin/init-db.c:531
#, c-format
-msgid "See \"git help gc\" for manual housekeeping.\n"
+msgid "cannot mkdir %s"
msgstr ""
-#: builtin/gc.c:598
+#: builtin/init-db.c:535
#, c-format
-msgid ""
-"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
+msgid "cannot chdir to %s"
msgstr ""
-#: builtin/gc.c:645
+#: builtin/init-db.c:556
+#, c-format
msgid ""
-"There are too many unreachable loose objects; run 'git prune' to remove them."
-msgstr ""
-
-#: builtin/grep.c:28
-msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
+"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
+"dir=<directory>)"
msgstr ""
-#: builtin/grep.c:226
+#: builtin/init-db.c:584
#, c-format
-msgid "grep: failed to create thread: %s"
+msgid "Cannot access work tree '%s'"
msgstr ""
-#: builtin/grep.c:284
-#, c-format
-msgid "invalid number of threads specified (%d) for %s"
+#: builtin/interpret-trailers.c:15
+msgid ""
+"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
+"<token>[(=|:)<value>])...] [<file>...]"
msgstr ""
-#. TRANSLATORS: %s is the configuration
-#. variable for tweaking threads, currently
-#. grep.threads
-#.
-#: builtin/grep.c:293 builtin/index-pack.c:1535 builtin/index-pack.c:1727
-#, c-format
-msgid "no threads support, ignoring %s"
+#: builtin/interpret-trailers.c:94
+msgid "edit files in place"
msgstr ""
-#: builtin/grep.c:461 builtin/grep.c:582 builtin/grep.c:623
-#, c-format
-msgid "unable to read tree (%s)"
+#: builtin/interpret-trailers.c:95
+msgid "trim empty trailers"
msgstr ""
-#: builtin/grep.c:638
-#, c-format
-msgid "unable to grep from object of type %s"
+#: builtin/interpret-trailers.c:98
+msgid "where to place the new trailer"
msgstr ""
-#: builtin/grep.c:703
-#, c-format
-msgid "switch `%c' expects a numerical value"
+#: builtin/interpret-trailers.c:100
+msgid "action if trailer already exists"
msgstr ""
-#: builtin/grep.c:790
-msgid "search in index instead of in the work tree"
+#: builtin/interpret-trailers.c:102
+msgid "action if trailer is missing"
msgstr ""
-#: builtin/grep.c:792
-msgid "find in contents not managed by git"
+#: builtin/interpret-trailers.c:104
+msgid "output only the trailers"
msgstr ""
-#: builtin/grep.c:794
-msgid "search in both tracked and untracked files"
+#: builtin/interpret-trailers.c:105
+msgid "do not apply config rules"
msgstr ""
-#: builtin/grep.c:796
-msgid "ignore files specified via '.gitignore'"
+#: builtin/interpret-trailers.c:106
+msgid "join whitespace-continued values"
msgstr ""
-#: builtin/grep.c:798
-msgid "recursively search in each submodule"
+#: builtin/interpret-trailers.c:107
+msgid "set parsing options"
msgstr ""
-#: builtin/grep.c:801
-msgid "show non-matching lines"
+#: builtin/interpret-trailers.c:109
+msgid "do not treat --- specially"
msgstr ""
-#: builtin/grep.c:803
-msgid "case insensitive matching"
+#: builtin/interpret-trailers.c:110
+msgid "trailer"
msgstr ""
-#: builtin/grep.c:805
-msgid "match patterns only at word boundaries"
+#: builtin/interpret-trailers.c:111
+msgid "trailer(s) to add"
msgstr ""
-#: builtin/grep.c:807
-msgid "process binary files as text"
+#: builtin/interpret-trailers.c:120
+msgid "--trailer with --only-input does not make sense"
msgstr ""
-#: builtin/grep.c:809
-msgid "don't match patterns in binary files"
+#: builtin/interpret-trailers.c:130
+msgid "no input file given for in-place editing"
msgstr ""
-#: builtin/grep.c:812
-msgid "process binary files with textconv filters"
+#: builtin/log.c:55
+msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
msgstr ""
-#: builtin/grep.c:814
-msgid "descend at most <depth> levels"
+#: builtin/log.c:56
+msgid "git show [<options>] <object>..."
msgstr ""
-#: builtin/grep.c:818
-msgid "use extended POSIX regular expressions"
+#: builtin/log.c:104
+#, c-format
+msgid "invalid --decorate option: %s"
msgstr ""
-#: builtin/grep.c:821
-msgid "use basic POSIX regular expressions (default)"
+#: builtin/log.c:168
+msgid "show source"
msgstr ""
-#: builtin/grep.c:824
-msgid "interpret patterns as fixed strings"
+#: builtin/log.c:169
+msgid "Use mail map file"
msgstr ""
-#: builtin/grep.c:827
-msgid "use Perl-compatible regular expressions"
+#: builtin/log.c:171
+msgid "only decorate refs that match <pattern>"
msgstr ""
-#: builtin/grep.c:830
-msgid "show line numbers"
+#: builtin/log.c:173
+msgid "do not decorate refs that match <pattern>"
msgstr ""
-#: builtin/grep.c:831
-msgid "don't show filenames"
+#: builtin/log.c:174
+msgid "decorate options"
msgstr ""
-#: builtin/grep.c:832
-msgid "show filenames"
+#: builtin/log.c:177
+msgid "Process line range n,m in file, counting from 1"
msgstr ""
-#: builtin/grep.c:834
-msgid "show filenames relative to top directory"
+#: builtin/log.c:275
+#, c-format
+msgid "Final output: %d %s\n"
msgstr ""
-#: builtin/grep.c:836
-msgid "show only filenames instead of matching lines"
+#: builtin/log.c:529
+#, c-format
+msgid "git show %s: bad file"
msgstr ""
-#: builtin/grep.c:838
-msgid "synonym for --files-with-matches"
+#: builtin/log.c:544 builtin/log.c:638
+#, c-format
+msgid "could not read object %s"
msgstr ""
-#: builtin/grep.c:841
-msgid "show only the names of files without match"
+#: builtin/log.c:663
+#, c-format
+msgid "unknown type: %d"
msgstr ""
-#: builtin/grep.c:843
-msgid "print NUL after filenames"
+#: builtin/log.c:784
+msgid "format.headers without value"
msgstr ""
-#: builtin/grep.c:846
-msgid "show the number of matches instead of matching lines"
+#: builtin/log.c:885
+msgid "name of output directory is too long"
msgstr ""
-#: builtin/grep.c:847
-msgid "highlight matches"
+#: builtin/log.c:901
+#, c-format
+msgid "cannot open patch file %s"
msgstr ""
-#: builtin/grep.c:849
-msgid "print empty line between matches from different files"
+#: builtin/log.c:918
+msgid "need exactly one range"
msgstr ""
-#: builtin/grep.c:851
-msgid "show filename only once above matches from same file"
+#: builtin/log.c:928
+msgid "not a range"
msgstr ""
-#: builtin/grep.c:854
-msgid "show <n> context lines before and after matches"
+#: builtin/log.c:1051
+msgid "cover letter needs email format"
msgstr ""
-#: builtin/grep.c:857
-msgid "show <n> context lines before matches"
+#: builtin/log.c:1057
+msgid "failed to create cover-letter file"
msgstr ""
-#: builtin/grep.c:859
-msgid "show <n> context lines after matches"
+#: builtin/log.c:1136
+#, c-format
+msgid "insane in-reply-to: %s"
msgstr ""
-#: builtin/grep.c:861
-msgid "use <n> worker threads"
+#: builtin/log.c:1163
+msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr ""
-#: builtin/grep.c:862
-msgid "shortcut for -C NUM"
+#: builtin/log.c:1221
+msgid "two output directories?"
msgstr ""
-#: builtin/grep.c:865
-msgid "show a line with the function name before matches"
+#: builtin/log.c:1332 builtin/log.c:2076 builtin/log.c:2078 builtin/log.c:2090
+#, c-format
+msgid "unknown commit %s"
msgstr ""
-#: builtin/grep.c:867
-msgid "show the surrounding function"
+#: 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/grep.c:870
-msgid "read patterns from file"
+#: builtin/log.c:1347
+msgid "could not find exact merge base"
msgstr ""
-#: builtin/grep.c:872
-msgid "match <pattern>"
+#: 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/grep.c:874
-msgid "combine patterns specified with -e"
+#: builtin/log.c:1371
+msgid "failed to find exact merge base"
msgstr ""
-#: builtin/grep.c:886
-msgid "indicate hit with exit status without output"
+#: builtin/log.c:1382
+msgid "base commit should be the ancestor of revision list"
msgstr ""
-#: builtin/grep.c:888
-msgid "show only matches from files that match all patterns"
+#: builtin/log.c:1386
+msgid "base commit shouldn't be in revision list"
msgstr ""
-#: builtin/grep.c:890
-msgid "show parse tree for grep expression"
+#: builtin/log.c:1439
+msgid "cannot get patch id"
msgstr ""
-#: builtin/grep.c:894
-msgid "pager"
+#: builtin/log.c:1491
+msgid "failed to infer range-diff ranges"
msgstr ""
-#: builtin/grep.c:894
-msgid "show matching files in the pager"
+#: builtin/log.c:1536
+msgid "use [PATCH n/m] even with a single patch"
msgstr ""
-#: builtin/grep.c:898
-msgid "allow calling of grep(1) (ignored by this build)"
+#: builtin/log.c:1539
+msgid "use [PATCH] even with multiple patches"
msgstr ""
-#: builtin/grep.c:962
-msgid "no pattern given."
+#: builtin/log.c:1543
+msgid "print patches to standard out"
msgstr ""
-#: builtin/grep.c:994
-msgid "--no-index or --untracked cannot be used with revs"
+#: builtin/log.c:1545
+msgid "generate a cover letter"
msgstr ""
-#: builtin/grep.c:1001
-#, c-format
-msgid "unable to resolve revision: %s"
+#: builtin/log.c:1547
+msgid "use simple number sequence for output file names"
msgstr ""
-#: builtin/grep.c:1036 builtin/index-pack.c:1531
-#, c-format
-msgid "invalid number of threads specified (%d)"
+#: builtin/log.c:1548
+msgid "sfx"
msgstr ""
-#: builtin/grep.c:1041
-msgid "no threads support, ignoring --threads"
+#: builtin/log.c:1549
+msgid "use <sfx> instead of '.patch'"
msgstr ""
-#: builtin/grep.c:1065
-msgid "--open-files-in-pager only works on the worktree"
+#: builtin/log.c:1551
+msgid "start numbering patches at <n> instead of 1"
msgstr ""
-#: builtin/grep.c:1088
-msgid "option not supported with --recurse-submodules."
+#: builtin/log.c:1553
+msgid "mark the series as Nth re-roll"
msgstr ""
-#: builtin/grep.c:1094
-msgid "--cached or --untracked cannot be used with --no-index."
+#: builtin/log.c:1555
+msgid "Use [RFC PATCH] instead of [PATCH]"
msgstr ""
-#: builtin/grep.c:1100
-msgid "--[no-]exclude-standard cannot be used for tracked contents."
+#: builtin/log.c:1558
+msgid "Use [<prefix>] instead of [PATCH]"
msgstr ""
-#: builtin/grep.c:1108
-msgid "both --cached and trees are given."
+#: builtin/log.c:1561
+msgid "store resulting files in <dir>"
msgstr ""
-#: builtin/hash-object.c:83
-msgid ""
-"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
-"[--] <file>..."
+#: builtin/log.c:1564
+msgid "don't strip/add [PATCH]"
msgstr ""
-#: builtin/hash-object.c:84
-msgid "git hash-object --stdin-paths"
+#: builtin/log.c:1567
+msgid "don't output binary diffs"
msgstr ""
-#: builtin/hash-object.c:96
-msgid "type"
+#: builtin/log.c:1569
+msgid "output all-zero hash in From header"
msgstr ""
-#: builtin/hash-object.c:96
-msgid "object type"
+#: builtin/log.c:1571
+msgid "don't include a patch matching a commit upstream"
msgstr ""
-#: builtin/hash-object.c:97
-msgid "write the object into the object database"
+#: builtin/log.c:1573
+msgid "show patch format instead of default (patch + stat)"
msgstr ""
-#: builtin/hash-object.c:99
-msgid "read the object from stdin"
+#: builtin/log.c:1575
+msgid "Messaging"
msgstr ""
-#: builtin/hash-object.c:101
-msgid "store file as is without filters"
+#: builtin/log.c:1576
+msgid "header"
msgstr ""
-#: builtin/hash-object.c:102
-msgid ""
-"just hash any random garbage to create corrupt objects for debugging Git"
+#: builtin/log.c:1577
+msgid "add email header"
msgstr ""
-#: builtin/hash-object.c:103
-msgid "process file as it were from this path"
+#: builtin/log.c:1578 builtin/log.c:1580
+msgid "email"
msgstr ""
-#: builtin/help.c:45
-msgid "print all available commands"
+#: builtin/log.c:1578
+msgid "add To: header"
msgstr ""
-#: builtin/help.c:46
-msgid "exclude guides"
+#: builtin/log.c:1580
+msgid "add Cc: header"
msgstr ""
-#: builtin/help.c:47
-msgid "print list of useful guides"
+#: builtin/log.c:1582
+msgid "ident"
msgstr ""
-#: builtin/help.c:48
-msgid "show man page"
+#: builtin/log.c:1583
+msgid "set From address to <ident> (or committer ident if absent)"
msgstr ""
-#: builtin/help.c:49
-msgid "show manual in web browser"
+#: builtin/log.c:1585
+msgid "message-id"
msgstr ""
-#: builtin/help.c:51
-msgid "show info page"
+#: builtin/log.c:1586
+msgid "make first mail a reply to <message-id>"
msgstr ""
-#: builtin/help.c:53
-msgid "print command description"
+#: builtin/log.c:1587 builtin/log.c:1590
+msgid "boundary"
msgstr ""
-#: builtin/help.c:58
-msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
+#: builtin/log.c:1588
+msgid "attach the patch"
msgstr ""
-#: builtin/help.c:70
-#, c-format
-msgid "unrecognized help format '%s'"
+#: builtin/log.c:1591
+msgid "inline the patch"
msgstr ""
-#: builtin/help.c:97
-msgid "Failed to start emacsclient."
+#: builtin/log.c:1595
+msgid "enable message threading, styles: shallow, deep"
msgstr ""
-#: builtin/help.c:110
-msgid "Failed to parse emacsclient version."
+#: builtin/log.c:1597
+msgid "signature"
msgstr ""
-#: builtin/help.c:118
-#, c-format
-msgid "emacsclient version '%d' too old (< 22)."
+#: builtin/log.c:1598
+msgid "add a signature"
msgstr ""
-#: builtin/help.c:136 builtin/help.c:158 builtin/help.c:168 builtin/help.c:176
-#, c-format
-msgid "failed to exec '%s'"
+#: builtin/log.c:1599
+msgid "base-commit"
msgstr ""
-#: builtin/help.c:214
-#, c-format
-msgid ""
-"'%s': path for unsupported man viewer.\n"
-"Please consider using 'man.<tool>.cmd' instead."
+#: builtin/log.c:1600
+msgid "add prerequisite tree info to the patch series"
msgstr ""
-#: builtin/help.c:226
-#, c-format
-msgid ""
-"'%s': cmd for supported man viewer.\n"
-"Please consider using 'man.<tool>.path' instead."
+#: builtin/log.c:1602
+msgid "add a signature from a file"
msgstr ""
-#: builtin/help.c:343
-#, c-format
-msgid "'%s': unknown man viewer."
+#: builtin/log.c:1603
+msgid "don't print the patch filenames"
msgstr ""
-#: builtin/help.c:360
-msgid "no man viewer handled the request"
+#: builtin/log.c:1605
+msgid "show progress while generating patches"
msgstr ""
-#: builtin/help.c:368
-msgid "no info viewer handled the request"
+#: builtin/log.c:1606
+msgid "rev"
msgstr ""
-#: builtin/help.c:415
-#, c-format
-msgid "'%s' is aliased to '%s'"
+#: builtin/log.c:1607
+msgid "show changes against <rev> in cover letter or single patch"
msgstr ""
-#: builtin/help.c:442 builtin/help.c:459
-#, c-format
-msgid "usage: %s%s"
+#: builtin/log.c:1610
+msgid "show changes against <refspec> in cover letter or single patch"
msgstr ""
-#: builtin/index-pack.c:158
-#, c-format
-msgid "unable to open %s"
+#: builtin/log.c:1612
+msgid "percentage by which creation is weighted"
msgstr ""
-#: builtin/index-pack.c:208
+#: builtin/log.c:1687
#, c-format
-msgid "object type mismatch at %s"
+msgid "invalid ident line: %s"
msgstr ""
-#: builtin/index-pack.c:228
-#, c-format
-msgid "did not receive expected object %s"
+#: builtin/log.c:1702
+msgid "-n and -k are mutually exclusive"
msgstr ""
-#: builtin/index-pack.c:231
-#, c-format
-msgid "object %s: expected type %s, found %s"
+#: builtin/log.c:1704
+msgid "--subject-prefix/--rfc and -k are mutually exclusive"
msgstr ""
-#: builtin/index-pack.c:273
-#, c-format
-msgid "cannot fill %d byte"
-msgid_plural "cannot fill %d bytes"
-msgstr[0] ""
-msgstr[1] ""
+#: builtin/log.c:1712
+msgid "--name-only does not make sense"
+msgstr ""
-#: builtin/index-pack.c:283
-msgid "early EOF"
+#: builtin/log.c:1714
+msgid "--name-status does not make sense"
msgstr ""
-#: builtin/index-pack.c:284
-msgid "read error on input"
+#: builtin/log.c:1716
+msgid "--check does not make sense"
msgstr ""
-#: builtin/index-pack.c:296
-msgid "used more bytes than were available"
+#: builtin/log.c:1748
+msgid "standard output, or directory, which one?"
msgstr ""
-#: builtin/index-pack.c:303
-msgid "pack too large for current definition of off_t"
+#: builtin/log.c:1837
+msgid "--interdiff requires --cover-letter or single patch"
msgstr ""
-#: builtin/index-pack.c:306 builtin/unpack-objects.c:93
-msgid "pack exceeds maximum allowed size"
+#: builtin/log.c:1841
+msgid "Interdiff:"
msgstr ""
-#: builtin/index-pack.c:321
+#: builtin/log.c:1842
#, c-format
-msgid "unable to create '%s'"
+msgid "Interdiff against v%d:"
msgstr ""
-#: builtin/index-pack.c:327
-#, c-format
-msgid "cannot open packfile '%s'"
+#: builtin/log.c:1848
+msgid "--creation-factor requires --range-diff"
msgstr ""
-#: builtin/index-pack.c:341
-msgid "pack signature mismatch"
+#: builtin/log.c:1852
+msgid "--range-diff requires --cover-letter or single patch"
msgstr ""
-#: builtin/index-pack.c:343
-#, c-format
-msgid "pack version %<PRIu32> unsupported"
+#: builtin/log.c:1860
+msgid "Range-diff:"
msgstr ""
-#: builtin/index-pack.c:361
+#: builtin/log.c:1861
#, c-format
-msgid "pack has bad object at offset %<PRIuMAX>: %s"
+msgid "Range-diff against v%d:"
msgstr ""
-#: builtin/index-pack.c:482
+#: builtin/log.c:1872
#, c-format
-msgid "inflate returned %d"
+msgid "unable to read signature file '%s'"
+msgstr ""
+
+#: builtin/log.c:1908
+msgid "Generating patches"
msgstr ""
-#: builtin/index-pack.c:531
-msgid "offset value overflow for delta base object"
+#: builtin/log.c:1952
+msgid "failed to create output files"
msgstr ""
-#: builtin/index-pack.c:539
-msgid "delta base offset is out of bound"
+#: builtin/log.c:2011
+msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr ""
-#: builtin/index-pack.c:547
+#: builtin/log.c:2065
#, c-format
-msgid "unknown object type %d"
+msgid ""
+"Could not find a tracked remote branch, please specify <upstream> manually.\n"
msgstr ""
-#: builtin/index-pack.c:578
-msgid "cannot pread pack file"
+#: builtin/ls-files.c:470
+msgid "git ls-files [<options>] [<file>...]"
msgstr ""
-#: builtin/index-pack.c:580
-#, c-format
-msgid "premature end of pack file, %<PRIuMAX> byte missing"
-msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
-msgstr[0] ""
-msgstr[1] ""
+#: builtin/ls-files.c:526
+msgid "identify the file status with tags"
+msgstr ""
-#: builtin/index-pack.c:606
-msgid "serious inflate inconsistency"
+#: builtin/ls-files.c:528
+msgid "use lowercase letters for 'assume unchanged' files"
msgstr ""
-#: builtin/index-pack.c:751 builtin/index-pack.c:757 builtin/index-pack.c:780
-#: builtin/index-pack.c:819 builtin/index-pack.c:828
-#, c-format
-msgid "SHA1 COLLISION FOUND WITH %s !"
+#: builtin/ls-files.c:530
+msgid "use lowercase letters for 'fsmonitor clean' files"
msgstr ""
-#: builtin/index-pack.c:754 builtin/pack-objects.c:198
-#: builtin/pack-objects.c:292
-#, c-format
-msgid "unable to read %s"
+#: builtin/ls-files.c:532
+msgid "show cached files in the output (default)"
msgstr ""
-#: builtin/index-pack.c:817
-#, c-format
-msgid "cannot read existing object info %s"
+#: builtin/ls-files.c:534
+msgid "show deleted files in the output"
msgstr ""
-#: builtin/index-pack.c:825
-#, c-format
-msgid "cannot read existing object %s"
+#: builtin/ls-files.c:536
+msgid "show modified files in the output"
msgstr ""
-#: builtin/index-pack.c:839
-#, c-format
-msgid "invalid blob object %s"
+#: builtin/ls-files.c:538
+msgid "show other files in the output"
msgstr ""
-#: builtin/index-pack.c:842 builtin/index-pack.c:860
-msgid "fsck error in packed object"
+#: builtin/ls-files.c:540
+msgid "show ignored files in the output"
msgstr ""
-#: builtin/index-pack.c:857
-#, c-format
-msgid "invalid %s"
+#: builtin/ls-files.c:543
+msgid "show staged contents' object name in the output"
msgstr ""
-#: builtin/index-pack.c:862
-#, c-format
-msgid "Not all child objects of %s are reachable"
+#: builtin/ls-files.c:545
+msgid "show files on the filesystem that need to be removed"
msgstr ""
-#: builtin/index-pack.c:934 builtin/index-pack.c:965
-msgid "failed to apply delta"
+#: builtin/ls-files.c:547
+msgid "show 'other' directories' names only"
msgstr ""
-#: builtin/index-pack.c:1135
-msgid "Receiving objects"
+#: builtin/ls-files.c:549
+msgid "show line endings of files"
msgstr ""
-#: builtin/index-pack.c:1135
-msgid "Indexing objects"
+#: builtin/ls-files.c:551
+msgid "don't show empty directories"
msgstr ""
-#: builtin/index-pack.c:1169
-msgid "pack is corrupted (SHA1 mismatch)"
+#: builtin/ls-files.c:554
+msgid "show unmerged files in the output"
msgstr ""
-#: builtin/index-pack.c:1174
-msgid "cannot fstat packfile"
+#: builtin/ls-files.c:556
+msgid "show resolve-undo information"
msgstr ""
-#: builtin/index-pack.c:1177
-msgid "pack has junk at the end"
+#: builtin/ls-files.c:558
+msgid "skip files matching pattern"
msgstr ""
-#: builtin/index-pack.c:1189
-msgid "confusion beyond insanity in parse_pack_objects()"
+#: builtin/ls-files.c:561
+msgid "exclude patterns are read from <file>"
msgstr ""
-#: builtin/index-pack.c:1212
-msgid "Resolving deltas"
+#: builtin/ls-files.c:564
+msgid "read additional per-directory exclude patterns in <file>"
msgstr ""
-#: builtin/index-pack.c:1223
-#, c-format
-msgid "unable to create thread: %s"
+#: builtin/ls-files.c:566
+msgid "add the standard git exclusions"
msgstr ""
-#: builtin/index-pack.c:1265
-msgid "confusion beyond insanity"
+#: builtin/ls-files.c:570
+msgid "make the output relative to the project top directory"
msgstr ""
-#: builtin/index-pack.c:1271
-#, c-format
-msgid "completed with %d local object"
-msgid_plural "completed with %d local objects"
-msgstr[0] ""
-msgstr[1] ""
+#: builtin/ls-files.c:573
+msgid "recurse through submodules"
+msgstr ""
-#: builtin/index-pack.c:1283
-#, c-format
-msgid "Unexpected tail checksum for %s (disk corruption?)"
+#: builtin/ls-files.c:575
+msgid "if any <file> is not in the index, treat this as an error"
msgstr ""
-#: builtin/index-pack.c:1287
-#, c-format
-msgid "pack has %d unresolved delta"
-msgid_plural "pack has %d unresolved deltas"
-msgstr[0] ""
-msgstr[1] ""
+#: builtin/ls-files.c:576
+msgid "tree-ish"
+msgstr ""
-#: builtin/index-pack.c:1311
-#, c-format
-msgid "unable to deflate appended object (%d)"
+#: builtin/ls-files.c:577
+msgid "pretend that paths removed since <tree-ish> are still present"
msgstr ""
-#: builtin/index-pack.c:1388
-#, c-format
-msgid "local object %s is corrupt"
+#: builtin/ls-files.c:579
+msgid "show debugging data"
msgstr ""
-#: builtin/index-pack.c:1402
-#, c-format
-msgid "packfile name '%s' does not end with '.pack'"
+#: 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/index-pack.c:1427
-#, c-format
-msgid "cannot write %s file '%s'"
+#: builtin/ls-remote.c:59
+msgid "do not print remote URL"
msgstr ""
-#: builtin/index-pack.c:1435
-#, c-format
-msgid "cannot close written %s file '%s'"
+#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1458
+msgid "exec"
msgstr ""
-#: builtin/index-pack.c:1459
-msgid "error while closing pack file"
+#: builtin/ls-remote.c:61 builtin/ls-remote.c:63
+msgid "path of git-upload-pack on the remote host"
msgstr ""
-#: builtin/index-pack.c:1473
-msgid "cannot store pack file"
+#: builtin/ls-remote.c:65
+msgid "limit to tags"
msgstr ""
-#: builtin/index-pack.c:1481
-msgid "cannot store index file"
+#: builtin/ls-remote.c:66
+msgid "limit to heads"
msgstr ""
-#: builtin/index-pack.c:1525
-#, c-format
-msgid "bad pack.indexversion=%<PRIu32>"
+#: builtin/ls-remote.c:67
+msgid "do not show peeled tags"
msgstr ""
-#: builtin/index-pack.c:1594
-#, c-format
-msgid "Cannot open existing pack file '%s'"
+#: builtin/ls-remote.c:69
+msgid "take url.<base>.insteadOf into account"
msgstr ""
-#: builtin/index-pack.c:1596
-#, c-format
-msgid "Cannot open existing pack idx file for '%s'"
+#: builtin/ls-remote.c:72
+msgid "exit with exit code 2 if no matching refs are found"
msgstr ""
-#: builtin/index-pack.c:1644
-#, c-format
-msgid "non delta: %d object"
-msgid_plural "non delta: %d objects"
-msgstr[0] ""
-msgstr[1] ""
+#: builtin/ls-remote.c:75
+msgid "show underlying ref in addition to the object pointed by it"
+msgstr ""
-#: builtin/index-pack.c:1651
-#, c-format
-msgid "chain length = %d: %lu object"
-msgid_plural "chain length = %d: %lu objects"
-msgstr[0] ""
-msgstr[1] ""
+#: builtin/ls-tree.c:30
+msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
+msgstr ""
-#: builtin/index-pack.c:1688
-msgid "Cannot come back to cwd"
+#: builtin/ls-tree.c:128
+msgid "only show trees"
msgstr ""
-#: builtin/index-pack.c:1739 builtin/index-pack.c:1742
-#: builtin/index-pack.c:1758 builtin/index-pack.c:1762
-#, c-format
-msgid "bad %s"
+#: builtin/ls-tree.c:130
+msgid "recurse into subtrees"
msgstr ""
-#: builtin/index-pack.c:1778
-msgid "--fix-thin cannot be used without --stdin"
+#: builtin/ls-tree.c:132
+msgid "show trees when recursing"
msgstr ""
-#: builtin/index-pack.c:1780
-msgid "--stdin requires a git repository"
+#: builtin/ls-tree.c:135
+msgid "terminate entries with NUL byte"
msgstr ""
-#: builtin/index-pack.c:1786
-msgid "--verify with no packfile name given"
+#: builtin/ls-tree.c:136
+msgid "include object size"
msgstr ""
-#: builtin/index-pack.c:1836 builtin/unpack-objects.c:578
-msgid "fsck error in pack objects"
+#: builtin/ls-tree.c:138 builtin/ls-tree.c:140
+msgid "list only filenames"
msgstr ""
-#: builtin/init-db.c:55
-#, c-format
-msgid "cannot stat '%s'"
+#: builtin/ls-tree.c:143
+msgid "use full path names"
msgstr ""
-#: builtin/init-db.c:61
-#, c-format
-msgid "cannot stat template '%s'"
+#: builtin/ls-tree.c:145
+msgid "list entire tree; not just current directory (implies --full-name)"
msgstr ""
-#: builtin/init-db.c:66
+#: builtin/mailsplit.c:241
#, c-format
-msgid "cannot opendir '%s'"
+msgid "empty mbox: '%s'"
msgstr ""
-#: builtin/init-db.c:77
-#, c-format
-msgid "cannot readlink '%s'"
+#: builtin/merge.c:54
+msgid "git merge [<options>] [<commit>...]"
msgstr ""
-#: builtin/init-db.c:79
-#, c-format
-msgid "cannot symlink '%s' '%s'"
+#: builtin/merge.c:55
+msgid "git merge --abort"
msgstr ""
-#: builtin/init-db.c:85
-#, c-format
-msgid "cannot copy '%s' to '%s'"
+#: builtin/merge.c:56
+msgid "git merge --continue"
msgstr ""
-#: builtin/init-db.c:89
-#, c-format
-msgid "ignoring template %s"
+#: builtin/merge.c:116
+msgid "switch `m' requires a value"
msgstr ""
-#: builtin/init-db.c:120
+#: builtin/merge.c:139
#, c-format
-msgid "templates not found in %s"
+msgid "option `%s' requires a value"
msgstr ""
-#: builtin/init-db.c:135
+#: builtin/merge.c:185
#, c-format
-msgid "not copying templates from '%s': %s"
+msgid "Could not find merge strategy '%s'.\n"
msgstr ""
-#: builtin/init-db.c:328
+#: builtin/merge.c:186
#, c-format
-msgid "unable to handle file type %d"
+msgid "Available strategies are:"
msgstr ""
-#: builtin/init-db.c:331
+#: builtin/merge.c:191
#, c-format
-msgid "unable to move %s to %s"
+msgid "Available custom strategies are:"
msgstr ""
-#: builtin/init-db.c:348 builtin/init-db.c:351
-#, c-format
-msgid "%s already exists"
+#: builtin/merge.c:242 builtin/pull.c:150
+msgid "do not show a diffstat at the end of the merge"
msgstr ""
-#: builtin/init-db.c:404
-#, c-format
-msgid "Reinitialized existing shared Git repository in %s%s\n"
+#: builtin/merge.c:245 builtin/pull.c:153
+msgid "show a diffstat at the end of the merge"
msgstr ""
-#: builtin/init-db.c:405
-#, c-format
-msgid "Reinitialized existing Git repository in %s%s\n"
+#: builtin/merge.c:246 builtin/pull.c:156
+msgid "(synonym to --stat)"
msgstr ""
-#: builtin/init-db.c:409
-#, c-format
-msgid "Initialized empty shared Git repository in %s%s\n"
+#: builtin/merge.c:248 builtin/pull.c:159
+msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr ""
-#: builtin/init-db.c:410
-#, c-format
-msgid "Initialized empty Git repository in %s%s\n"
+#: builtin/merge.c:251 builtin/pull.c:165
+msgid "create a single commit instead of doing a merge"
msgstr ""
-#: builtin/init-db.c:458
-msgid ""
-"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
-"shared[=<permissions>]] [<directory>]"
+#: builtin/merge.c:253 builtin/pull.c:168
+msgid "perform a commit if the merge succeeds (default)"
msgstr ""
-#: builtin/init-db.c:481
-msgid "permissions"
+#: builtin/merge.c:255 builtin/pull.c:171
+msgid "edit message before committing"
msgstr ""
-#: builtin/init-db.c:482
-msgid "specify that the git repository is to be shared amongst several users"
+#: builtin/merge.c:257
+msgid "allow fast-forward (default)"
msgstr ""
-#: builtin/init-db.c:525
-#, c-format
-msgid "cannot chdir to %s"
+#: builtin/merge.c:259 builtin/pull.c:178
+msgid "abort if fast-forward is not possible"
msgstr ""
-#: builtin/init-db.c:546
-#, c-format
-msgid ""
-"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
-"dir=<directory>)"
+#: builtin/merge.c:263 builtin/pull.c:181
+msgid "verify that the named commit has a valid GPG signature"
msgstr ""
-#: builtin/init-db.c:574
-#, c-format
-msgid "Cannot access work tree '%s'"
+#: 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/interpret-trailers.c:15
-msgid ""
-"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
-"<token>[(=|:)<value>])...] [<file>...]"
+#: builtin/merge.c:265 builtin/pull.c:186
+msgid "merge strategy to use"
msgstr ""
-#: builtin/interpret-trailers.c:92
-msgid "edit files in place"
+#: builtin/merge.c:266 builtin/pull.c:189
+msgid "option=value"
msgstr ""
-#: builtin/interpret-trailers.c:93
-msgid "trim empty trailers"
+#: builtin/merge.c:267 builtin/pull.c:190
+msgid "option for selected merge strategy"
msgstr ""
-#: builtin/interpret-trailers.c:96
-msgid "where to place the new trailer"
+#: builtin/merge.c:269
+msgid "merge commit message (for a non-fast-forward merge)"
msgstr ""
-#: builtin/interpret-trailers.c:98
-msgid "action if trailer already exists"
+#: builtin/merge.c:276
+msgid "abort the current in-progress merge"
msgstr ""
-#: builtin/interpret-trailers.c:100
-msgid "action if trailer is missing"
+#: builtin/merge.c:278
+msgid "continue the current in-progress merge"
msgstr ""
-#: builtin/interpret-trailers.c:102
-msgid "output only the trailers"
+#: builtin/merge.c:280 builtin/pull.c:197
+msgid "allow merging unrelated histories"
msgstr ""
-#: builtin/interpret-trailers.c:103
-msgid "do not apply config rules"
+#: builtin/merge.c:286
+msgid "verify commit-msg hook"
msgstr ""
-#: builtin/interpret-trailers.c:104
-msgid "join whitespace-continued values"
+#: builtin/merge.c:311
+msgid "could not run stash."
msgstr ""
-#: builtin/interpret-trailers.c:105
-msgid "set parsing options"
+#: builtin/merge.c:316
+msgid "stash failed"
msgstr ""
-#: builtin/interpret-trailers.c:107
-msgid "trailer"
+#: builtin/merge.c:321
+#, c-format
+msgid "not a valid object: %s"
msgstr ""
-#: builtin/interpret-trailers.c:108
-msgid "trailer(s) to add"
+#: builtin/merge.c:343 builtin/merge.c:360
+msgid "read-tree failed"
msgstr ""
-#: builtin/interpret-trailers.c:117
-msgid "--trailer with --only-input does not make sense"
+#: builtin/merge.c:390
+msgid " (nothing to squash)"
msgstr ""
-#: builtin/interpret-trailers.c:127
-msgid "no input file given for in-place editing"
+#: builtin/merge.c:401
+#, c-format
+msgid "Squash commit -- not updating HEAD\n"
msgstr ""
-#: builtin/log.c:48
-msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
+#: builtin/merge.c:451
+#, c-format
+msgid "No merge message -- not updating HEAD\n"
msgstr ""
-#: builtin/log.c:49
-msgid "git show [<options>] <object>..."
+#: builtin/merge.c:502
+#, c-format
+msgid "'%s' does not point to a commit"
msgstr ""
-#: builtin/log.c:93
+#: builtin/merge.c:589
#, c-format
-msgid "invalid --decorate option: %s"
+msgid "Bad branch.%s.mergeoptions string: %s"
msgstr ""
-#: builtin/log.c:153
-msgid "suppress diff output"
+#: builtin/merge.c:712
+msgid "Not handling anything other than two heads merge."
msgstr ""
-#: builtin/log.c:154
-msgid "show source"
+#: builtin/merge.c:726
+#, c-format
+msgid "Unknown option for merge-recursive: -X%s"
msgstr ""
-#: builtin/log.c:155
-msgid "Use mail map file"
+#: builtin/merge.c:741
+#, c-format
+msgid "unable to write %s"
msgstr ""
-#: builtin/log.c:157
-msgid "only decorate refs that match <pattern>"
+#: builtin/merge.c:793
+#, c-format
+msgid "Could not read from '%s'"
msgstr ""
-#: builtin/log.c:159
-msgid "do not decorate refs that match <pattern>"
+#: builtin/merge.c:802
+#, c-format
+msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr ""
-#: builtin/log.c:160
-msgid "decorate options"
+#: 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/log.c:163
-msgid "Process line range n,m in file, counting from 1"
+#: builtin/merge.c:813
+msgid "An empty message aborts the commit.\n"
msgstr ""
-#: builtin/log.c:259
+#: builtin/merge.c:816
#, c-format
-msgid "Final output: %d %s\n"
+msgid ""
+"Lines starting with '%c' will be ignored, and an empty message aborts\n"
+"the commit.\n"
msgstr ""
-#: builtin/log.c:510
-#, c-format
-msgid "git show %s: bad file"
+#: builtin/merge.c:857
+msgid "Empty commit message."
msgstr ""
-#: builtin/log.c:525 builtin/log.c:619
+#: builtin/merge.c:876
#, c-format
-msgid "Could not read object %s"
+msgid "Wonderful.\n"
msgstr ""
-#: builtin/log.c:643
+#: builtin/merge.c:936
#, c-format
-msgid "Unknown type: %d"
-msgstr ""
-
-#: builtin/log.c:764
-msgid "format.headers without value"
+msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr ""
-#: builtin/log.c:865
-msgid "name of output directory is too long"
+#: builtin/merge.c:975
+msgid "No current branch."
msgstr ""
-#: builtin/log.c:881
-#, c-format
-msgid "Cannot open patch file %s"
+#: builtin/merge.c:977
+msgid "No remote for the current branch."
msgstr ""
-#: builtin/log.c:898
-msgid "Need exactly one range."
+#: builtin/merge.c:979
+msgid "No default upstream defined for the current branch."
msgstr ""
-#: builtin/log.c:908
-msgid "Not a range."
+#: builtin/merge.c:984
+#, c-format
+msgid "No remote-tracking branch for %s from %s"
msgstr ""
-#: builtin/log.c:1014
-msgid "Cover letter needs email format"
+#: builtin/merge.c:1041
+#, c-format
+msgid "Bad value '%s' in environment '%s'"
msgstr ""
-#: builtin/log.c:1095
+#: builtin/merge.c:1144
#, c-format
-msgid "insane in-reply-to: %s"
+msgid "not something we can merge in %s: %s"
msgstr ""
-#: builtin/log.c:1122
-msgid "git format-patch [<options>] [<since> | <revision-range>]"
+#: builtin/merge.c:1178
+msgid "not something we can merge"
msgstr ""
-#: builtin/log.c:1172
-msgid "Two output directories?"
+#: builtin/merge.c:1281
+msgid "--abort expects no arguments"
msgstr ""
-#: builtin/log.c:1279 builtin/log.c:1932 builtin/log.c:1934 builtin/log.c:1946
-#, c-format
-msgid "Unknown commit %s"
+#: builtin/merge.c:1285
+msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr ""
-#: builtin/log.c:1289 builtin/notes.c:887 builtin/tag.c:523
-#, c-format
-msgid "Failed to resolve '%s' as a valid ref."
+#: builtin/merge.c:1297
+msgid "--continue expects no arguments"
msgstr ""
-#: builtin/log.c:1294
-msgid "Could not find exact merge base."
+#: builtin/merge.c:1301
+msgid "There is no merge in progress (MERGE_HEAD missing)."
msgstr ""
-#: builtin/log.c:1298
+#: builtin/merge.c:1317
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."
+"You have not concluded your merge (MERGE_HEAD exists).\n"
+"Please, commit your changes before you merge."
msgstr ""
-#: builtin/log.c:1318
-msgid "Failed to find exact merge base"
+#: 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/log.c:1329
-msgid "base commit should be the ancestor of revision list"
+#: builtin/merge.c:1327
+msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr ""
-#: builtin/log.c:1333
-msgid "base commit shouldn't be in revision list"
+#: builtin/merge.c:1341
+msgid "You cannot combine --squash with --no-ff."
msgstr ""
-#: builtin/log.c:1382
-msgid "cannot get patch id"
+#: builtin/merge.c:1349
+msgid "No commit specified and merge.defaultToUpstream not set."
msgstr ""
-#: builtin/log.c:1441
-msgid "use [PATCH n/m] even with a single patch"
+#: builtin/merge.c:1366
+msgid "Squash commit into empty head not supported yet"
msgstr ""
-#: builtin/log.c:1444
-msgid "use [PATCH] even with multiple patches"
+#: builtin/merge.c:1368
+msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr ""
-#: builtin/log.c:1448
-msgid "print patches to standard out"
+#: builtin/merge.c:1373
+#, c-format
+msgid "%s - not something we can merge"
msgstr ""
-#: builtin/log.c:1450
-msgid "generate a cover letter"
+#: builtin/merge.c:1375
+msgid "Can merge only exactly one commit into empty head"
msgstr ""
-#: builtin/log.c:1452
-msgid "use simple number sequence for output file names"
+#: builtin/merge.c:1454
+msgid "refusing to merge unrelated histories"
msgstr ""
-#: builtin/log.c:1453
-msgid "sfx"
+#: builtin/merge.c:1463
+msgid "Already up to date."
msgstr ""
-#: builtin/log.c:1454
-msgid "use <sfx> instead of '.patch'"
+#: builtin/merge.c:1473
+#, c-format
+msgid "Updating %s..%s\n"
msgstr ""
-#: builtin/log.c:1456
-msgid "start numbering patches at <n> instead of 1"
+#: builtin/merge.c:1515
+#, c-format
+msgid "Trying really trivial in-index merge...\n"
msgstr ""
-#: builtin/log.c:1458
-msgid "mark the series as Nth re-roll"
+#: builtin/merge.c:1522
+#, c-format
+msgid "Nope.\n"
msgstr ""
-#: builtin/log.c:1460
-msgid "Use [RFC PATCH] instead of [PATCH]"
+#: builtin/merge.c:1547
+msgid "Already up to date. Yeeah!"
msgstr ""
-#: builtin/log.c:1463
-msgid "Use [<prefix>] instead of [PATCH]"
+#: builtin/merge.c:1553
+msgid "Not possible to fast-forward, aborting."
msgstr ""
-#: builtin/log.c:1466
-msgid "store resulting files in <dir>"
+#: builtin/merge.c:1576 builtin/merge.c:1655
+#, c-format
+msgid "Rewinding the tree to pristine...\n"
msgstr ""
-#: builtin/log.c:1469
-msgid "don't strip/add [PATCH]"
+#: builtin/merge.c:1580
+#, c-format
+msgid "Trying merge strategy %s...\n"
msgstr ""
-#: builtin/log.c:1472
-msgid "don't output binary diffs"
+#: builtin/merge.c:1646
+#, c-format
+msgid "No merge strategy handled the merge.\n"
msgstr ""
-#: builtin/log.c:1474
-msgid "output all-zero hash in From header"
+#: builtin/merge.c:1648
+#, c-format
+msgid "Merge with strategy %s failed.\n"
msgstr ""
-#: builtin/log.c:1476
-msgid "don't include a patch matching a commit upstream"
+#: builtin/merge.c:1657
+#, c-format
+msgid "Using the %s to prepare resolving by hand.\n"
msgstr ""
-#: builtin/log.c:1478
-msgid "show patch format instead of default (patch + stat)"
+#: builtin/merge.c:1669
+#, c-format
+msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
-#: builtin/log.c:1480
-msgid "Messaging"
+#: builtin/merge-base.c:32
+msgid "git merge-base [-a | --all] <commit> <commit>..."
msgstr ""
-#: builtin/log.c:1481
-msgid "header"
+#: builtin/merge-base.c:33
+msgid "git merge-base [-a | --all] --octopus <commit>..."
msgstr ""
-#: builtin/log.c:1482
-msgid "add email header"
+#: builtin/merge-base.c:34
+msgid "git merge-base --independent <commit>..."
msgstr ""
-#: builtin/log.c:1483 builtin/log.c:1485
-msgid "email"
+#: builtin/merge-base.c:35
+msgid "git merge-base --is-ancestor <commit> <commit>"
msgstr ""
-#: builtin/log.c:1483
-msgid "add To: header"
+#: builtin/merge-base.c:36
+msgid "git merge-base --fork-point <ref> [<commit>]"
msgstr ""
-#: builtin/log.c:1485
-msgid "add Cc: header"
+#: builtin/merge-base.c:153
+msgid "output all common ancestors"
msgstr ""
-#: builtin/log.c:1487
-msgid "ident"
+#: builtin/merge-base.c:155
+msgid "find ancestors for a single n-way merge"
msgstr ""
-#: builtin/log.c:1488
-msgid "set From address to <ident> (or committer ident if absent)"
+#: builtin/merge-base.c:157
+msgid "list revs not reachable from others"
msgstr ""
-#: builtin/log.c:1490
-msgid "message-id"
+#: builtin/merge-base.c:159
+msgid "is the first one ancestor of the other?"
msgstr ""
-#: builtin/log.c:1491
-msgid "make first mail a reply to <message-id>"
+#: builtin/merge-base.c:161
+msgid "find where <commit> forked from reflog of <ref>"
msgstr ""
-#: builtin/log.c:1492 builtin/log.c:1495
-msgid "boundary"
+#: builtin/merge-file.c:9
+msgid ""
+"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
+"<orig-file> <file2>"
msgstr ""
-#: builtin/log.c:1493
-msgid "attach the patch"
+#: builtin/merge-file.c:35
+msgid "send results to standard output"
msgstr ""
-#: builtin/log.c:1496
-msgid "inline the patch"
+#: builtin/merge-file.c:36
+msgid "use a diff3 based merge"
msgstr ""
-#: builtin/log.c:1500
-msgid "enable message threading, styles: shallow, deep"
+#: builtin/merge-file.c:37
+msgid "for conflicts, use our version"
msgstr ""
-#: builtin/log.c:1502
-msgid "signature"
+#: builtin/merge-file.c:39
+msgid "for conflicts, use their version"
msgstr ""
-#: builtin/log.c:1503
-msgid "add a signature"
+#: builtin/merge-file.c:41
+msgid "for conflicts, use a union version"
msgstr ""
-#: builtin/log.c:1504
-msgid "base-commit"
+#: builtin/merge-file.c:44
+msgid "for conflicts, use this marker size"
msgstr ""
-#: builtin/log.c:1505
-msgid "add prerequisite tree info to the patch series"
+#: builtin/merge-file.c:45
+msgid "do not warn about conflicts"
msgstr ""
-#: builtin/log.c:1507
-msgid "add a signature from a file"
+#: builtin/merge-file.c:47
+msgid "set labels for file1/orig-file/file2"
msgstr ""
-#: builtin/log.c:1508
-msgid "don't print the patch filenames"
+#: builtin/merge-recursive.c:46
+#, c-format
+msgid "unknown option %s"
msgstr ""
-#: builtin/log.c:1510
-msgid "show progress while generating patches"
+#: builtin/merge-recursive.c:52
+#, c-format
+msgid "could not parse object '%s'"
msgstr ""
-#: builtin/log.c:1585
+#: builtin/merge-recursive.c:56
#, c-format
-msgid "invalid ident line: %s"
-msgstr ""
+msgid "cannot handle more than %d base. Ignoring %s."
+msgid_plural "cannot handle more than %d bases. Ignoring %s."
+msgstr[0] ""
+msgstr[1] ""
-#: builtin/log.c:1600
-msgid "-n and -k are mutually exclusive."
+#: builtin/merge-recursive.c:64
+msgid "not handling anything other than two heads merge."
msgstr ""
-#: builtin/log.c:1602
-msgid "--subject-prefix/--rfc and -k are mutually exclusive."
+#: builtin/merge-recursive.c:70 builtin/merge-recursive.c:72
+#, c-format
+msgid "could not resolve ref '%s'"
msgstr ""
-#: builtin/log.c:1610
-msgid "--name-only does not make sense"
+#: builtin/merge-recursive.c:78
+#, c-format
+msgid "Merging %s with %s\n"
msgstr ""
-#: builtin/log.c:1612
-msgid "--name-status does not make sense"
+#: builtin/mktree.c:66
+msgid "git mktree [-z] [--missing] [--batch]"
msgstr ""
-#: builtin/log.c:1614
-msgid "--check does not make sense"
+#: builtin/mktree.c:154
+msgid "input is NUL terminated"
msgstr ""
-#: builtin/log.c:1646
-msgid "standard output, or directory, which one?"
+#: builtin/mktree.c:155 builtin/write-tree.c:26
+msgid "allow missing objects"
msgstr ""
-#: builtin/log.c:1648
-#, c-format
-msgid "Could not create directory '%s'"
+#: builtin/mktree.c:156
+msgid "allow creation of more than one tree"
msgstr ""
-#: builtin/log.c:1741
-#, c-format
-msgid "unable to read signature file '%s'"
+#: builtin/multi-pack-index.c:9
+msgid "git multi-pack-index [--object-dir=<dir>] (write|verify)"
msgstr ""
-#: builtin/log.c:1773
-msgid "Generating patches"
+#: builtin/multi-pack-index.c:22
+msgid "object directory containing set of packfile and pack-index pairs"
msgstr ""
-#: builtin/log.c:1817
-msgid "Failed to create output files"
+#: builtin/multi-pack-index.c:40 builtin/prune-packed.c:67
+msgid "too many arguments"
msgstr ""
-#: builtin/log.c:1867
-msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
+#: builtin/multi-pack-index.c:51
+#, c-format
+msgid "unrecognized verb: %s"
msgstr ""
-#: builtin/log.c:1921
-#, c-format
-msgid ""
-"Could not find a tracked remote branch, please specify <upstream> manually.\n"
+#: builtin/mv.c:18
+msgid "git mv [<options>] <source>... <destination>"
msgstr ""
-#: builtin/ls-files.c:468
-msgid "git ls-files [<options>] [<file>...]"
+#: builtin/mv.c:83
+#, c-format
+msgid "Directory %s is in index and no submodule?"
msgstr ""
-#: builtin/ls-files.c:517
-msgid "identify the file status with tags"
+#: builtin/mv.c:85
+msgid "Please stage your changes to .gitmodules or stash them to proceed"
msgstr ""
-#: builtin/ls-files.c:519
-msgid "use lowercase letters for 'assume unchanged' files"
+#: builtin/mv.c:103
+#, c-format
+msgid "%.*s is in index"
msgstr ""
-#: builtin/ls-files.c:521
-msgid "use lowercase letters for 'fsmonitor clean' files"
+#: builtin/mv.c:125
+msgid "force move/rename even if target exists"
msgstr ""
-#: builtin/ls-files.c:523
-msgid "show cached files in the output (default)"
+#: builtin/mv.c:127
+msgid "skip move/rename errors"
msgstr ""
-#: builtin/ls-files.c:525
-msgid "show deleted files in the output"
+#: builtin/mv.c:169
+#, c-format
+msgid "destination '%s' is not a directory"
msgstr ""
-#: builtin/ls-files.c:527
-msgid "show modified files in the output"
+#: builtin/mv.c:180
+#, c-format
+msgid "Checking rename of '%s' to '%s'\n"
msgstr ""
-#: builtin/ls-files.c:529
-msgid "show other files in the output"
+#: builtin/mv.c:184
+msgid "bad source"
msgstr ""
-#: builtin/ls-files.c:531
-msgid "show ignored files in the output"
+#: builtin/mv.c:187
+msgid "can not move directory into itself"
msgstr ""
-#: builtin/ls-files.c:534
-msgid "show staged contents' object name in the output"
+#: builtin/mv.c:190
+msgid "cannot move directory over file"
msgstr ""
-#: builtin/ls-files.c:536
-msgid "show files on the filesystem that need to be removed"
+#: builtin/mv.c:199
+msgid "source directory is empty"
msgstr ""
-#: builtin/ls-files.c:538
-msgid "show 'other' directories' names only"
+#: builtin/mv.c:224
+msgid "not under version control"
msgstr ""
-#: builtin/ls-files.c:540
-msgid "show line endings of files"
+#: builtin/mv.c:227
+msgid "destination exists"
msgstr ""
-#: builtin/ls-files.c:542
-msgid "don't show empty directories"
+#: builtin/mv.c:235
+#, c-format
+msgid "overwriting '%s'"
msgstr ""
-#: builtin/ls-files.c:545
-msgid "show unmerged files in the output"
+#: builtin/mv.c:238
+msgid "Cannot overwrite"
msgstr ""
-#: builtin/ls-files.c:547
-msgid "show resolve-undo information"
+#: builtin/mv.c:241
+msgid "multiple sources for the same target"
msgstr ""
-#: builtin/ls-files.c:549
-msgid "skip files matching pattern"
+#: builtin/mv.c:243
+msgid "destination directory does not exist"
msgstr ""
-#: builtin/ls-files.c:552
-msgid "exclude patterns are read from <file>"
+#: builtin/mv.c:250
+#, c-format
+msgid "%s, source=%s, destination=%s"
msgstr ""
-#: builtin/ls-files.c:555
-msgid "read additional per-directory exclude patterns in <file>"
+#: builtin/mv.c:271
+#, c-format
+msgid "Renaming %s to %s\n"
msgstr ""
-#: builtin/ls-files.c:557
-msgid "add the standard git exclusions"
+#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:516
+#, c-format
+msgid "renaming '%s' failed"
msgstr ""
-#: builtin/ls-files.c:560
-msgid "make the output relative to the project top directory"
+#: builtin/name-rev.c:355
+msgid "git name-rev [<options>] <commit>..."
msgstr ""
-#: builtin/ls-files.c:563
-msgid "recurse through submodules"
+#: builtin/name-rev.c:356
+msgid "git name-rev [<options>] --all"
msgstr ""
-#: builtin/ls-files.c:565
-msgid "if any <file> is not in the index, treat this as an error"
+#: builtin/name-rev.c:357
+msgid "git name-rev [<options>] --stdin"
msgstr ""
-#: builtin/ls-files.c:566
-msgid "tree-ish"
+#: builtin/name-rev.c:415
+msgid "print only names (no SHA-1)"
msgstr ""
-#: builtin/ls-files.c:567
-msgid "pretend that paths removed since <tree-ish> are still present"
+#: builtin/name-rev.c:416
+msgid "only use tags to name the commits"
msgstr ""
-#: builtin/ls-files.c:569
-msgid "show debugging data"
+#: builtin/name-rev.c:418
+msgid "only use refs matching <pattern>"
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>...]]"
+#: builtin/name-rev.c:420
+msgid "ignore refs matching <pattern>"
msgstr ""
-#: builtin/ls-remote.c:59
-msgid "do not print remote URL"
+#: builtin/name-rev.c:422
+msgid "list all commits reachable from all refs"
msgstr ""
-#: builtin/ls-remote.c:60 builtin/ls-remote.c:62
-msgid "exec"
+#: builtin/name-rev.c:423
+msgid "read from stdin"
msgstr ""
-#: builtin/ls-remote.c:61 builtin/ls-remote.c:63
-msgid "path of git-upload-pack on the remote host"
+#: builtin/name-rev.c:424
+msgid "allow to print `undefined` names (default)"
msgstr ""
-#: builtin/ls-remote.c:65
-msgid "limit to tags"
+#: builtin/name-rev.c:430
+msgid "dereference tags in the input (internal use)"
msgstr ""
-#: builtin/ls-remote.c:66
-msgid "limit to heads"
+#: builtin/notes.c:28
+msgid "git notes [--ref <notes-ref>] [list [<object>]]"
msgstr ""
-#: builtin/ls-remote.c:67
-msgid "do not show peeled tags"
+#: builtin/notes.c:29
+msgid ""
+"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
+"| (-c | -C) <object>] [<object>]"
msgstr ""
-#: builtin/ls-remote.c:69
-msgid "take url.<base>.insteadOf into account"
+#: builtin/notes.c:30
+msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
msgstr ""
-#: builtin/ls-remote.c:73
-msgid "exit with exit code 2 if no matching refs are found"
+#: builtin/notes.c:31
+msgid ""
+"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
+"(-c | -C) <object>] [<object>]"
msgstr ""
-#: builtin/ls-remote.c:76
-msgid "show underlying ref in addition to the object pointed by it"
+#: builtin/notes.c:32
+msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
msgstr ""
-#: builtin/ls-tree.c:29
-msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
+#: builtin/notes.c:33
+msgid "git notes [--ref <notes-ref>] show [<object>]"
msgstr ""
-#: builtin/ls-tree.c:127
-msgid "only show trees"
+#: builtin/notes.c:34
+msgid ""
+"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
msgstr ""
-#: builtin/ls-tree.c:129
-msgid "recurse into subtrees"
+#: builtin/notes.c:35
+msgid "git notes merge --commit [-v | -q]"
msgstr ""
-#: builtin/ls-tree.c:131
-msgid "show trees when recursing"
+#: builtin/notes.c:36
+msgid "git notes merge --abort [-v | -q]"
msgstr ""
-#: builtin/ls-tree.c:134
-msgid "terminate entries with NUL byte"
+#: builtin/notes.c:37
+msgid "git notes [--ref <notes-ref>] remove [<object>...]"
msgstr ""
-#: builtin/ls-tree.c:135
-msgid "include object size"
+#: builtin/notes.c:38
+msgid "git notes [--ref <notes-ref>] prune [-n] [-v]"
msgstr ""
-#: builtin/ls-tree.c:137 builtin/ls-tree.c:139
-msgid "list only filenames"
+#: builtin/notes.c:39
+msgid "git notes [--ref <notes-ref>] get-ref"
msgstr ""
-#: builtin/ls-tree.c:142
-msgid "use full path names"
+#: builtin/notes.c:44
+msgid "git notes [list [<object>]]"
msgstr ""
-#: builtin/ls-tree.c:144
-msgid "list entire tree; not just current directory (implies --full-name)"
+#: builtin/notes.c:49
+msgid "git notes add [<options>] [<object>]"
msgstr ""
-#: builtin/mailsplit.c:241
-#, c-format
-msgid "empty mbox: '%s'"
+#: builtin/notes.c:54
+msgid "git notes copy [<options>] <from-object> <to-object>"
msgstr ""
-#: builtin/merge.c:51
-msgid "git merge [<options>] [<commit>...]"
+#: builtin/notes.c:55
+msgid "git notes copy --stdin [<from-object> <to-object>]..."
msgstr ""
-#: builtin/merge.c:52
-msgid "git merge --abort"
+#: builtin/notes.c:60
+msgid "git notes append [<options>] [<object>]"
msgstr ""
-#: builtin/merge.c:53
-msgid "git merge --continue"
+#: builtin/notes.c:65
+msgid "git notes edit [<object>]"
msgstr ""
-#: builtin/merge.c:110
-msgid "switch `m' requires a value"
+#: builtin/notes.c:70
+msgid "git notes show [<object>]"
msgstr ""
-#: builtin/merge.c:147
-#, c-format
-msgid "Could not find merge strategy '%s'.\n"
+#: builtin/notes.c:75
+msgid "git notes merge [<options>] <notes-ref>"
msgstr ""
-#: builtin/merge.c:148
-#, c-format
-msgid "Available strategies are:"
+#: builtin/notes.c:76
+msgid "git notes merge --commit [<options>]"
msgstr ""
-#: builtin/merge.c:153
-#, c-format
-msgid "Available custom strategies are:"
+#: builtin/notes.c:77
+msgid "git notes merge --abort [<options>]"
msgstr ""
-#: builtin/merge.c:203 builtin/pull.c:142
-msgid "do not show a diffstat at the end of the merge"
+#: builtin/notes.c:82
+msgid "git notes remove [<object>]"
msgstr ""
-#: builtin/merge.c:206 builtin/pull.c:145
-msgid "show a diffstat at the end of the merge"
+#: builtin/notes.c:87
+msgid "git notes prune [<options>]"
msgstr ""
-#: builtin/merge.c:207 builtin/pull.c:148
-msgid "(synonym to --stat)"
+#: builtin/notes.c:92
+msgid "git notes get-ref"
msgstr ""
-#: builtin/merge.c:209 builtin/pull.c:151
-msgid "add (at most <n>) entries from shortlog to merge commit message"
+#: builtin/notes.c:97
+msgid "Write/edit the notes for the following object:"
msgstr ""
-#: builtin/merge.c:212 builtin/pull.c:157
-msgid "create a single commit instead of doing a merge"
+#: builtin/notes.c:150
+#, c-format
+msgid "unable to start 'show' for object '%s'"
msgstr ""
-#: builtin/merge.c:214 builtin/pull.c:160
-msgid "perform a commit if the merge succeeds (default)"
+#: builtin/notes.c:154
+msgid "could not read 'show' output"
msgstr ""
-#: builtin/merge.c:216 builtin/pull.c:163
-msgid "edit message before committing"
+#: builtin/notes.c:162
+#, c-format
+msgid "failed to finish 'show' for object '%s'"
msgstr ""
-#: builtin/merge.c:217
-msgid "allow fast-forward (default)"
+#: builtin/notes.c:197
+msgid "please supply the note contents using either -m or -F option"
msgstr ""
-#: builtin/merge.c:219 builtin/pull.c:169
-msgid "abort if fast-forward is not possible"
+#: builtin/notes.c:206
+msgid "unable to write note object"
msgstr ""
-#: builtin/merge.c:223 builtin/pull.c:172
-msgid "verify that the named commit has a valid GPG signature"
+#: builtin/notes.c:208
+#, c-format
+msgid "the note contents have been left in %s"
msgstr ""
-#: builtin/merge.c:224 builtin/notes.c:777 builtin/pull.c:176
-#: builtin/revert.c:109
-msgid "strategy"
+#: builtin/notes.c:242 builtin/tag.c:522
+#, c-format
+msgid "could not open or read '%s'"
msgstr ""
-#: builtin/merge.c:225 builtin/pull.c:177
-msgid "merge strategy to use"
+#: 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/merge.c:226 builtin/pull.c:180
-msgid "option=value"
+#: builtin/notes.c:265
+#, c-format
+msgid "failed to read object '%s'."
msgstr ""
-#: builtin/merge.c:227 builtin/pull.c:181
-msgid "option for selected merge strategy"
+#: builtin/notes.c:268
+#, c-format
+msgid "cannot read note data from non-blob object '%s'."
msgstr ""
-#: builtin/merge.c:229
-msgid "merge commit message (for a non-fast-forward merge)"
+#: builtin/notes.c:309
+#, c-format
+msgid "malformed input line: '%s'."
msgstr ""
-#: builtin/merge.c:233
-msgid "abort the current in-progress merge"
+#: builtin/notes.c:324
+#, c-format
+msgid "failed to copy notes from '%s' to '%s'"
msgstr ""
-#: builtin/merge.c:235
-msgid "continue the current in-progress merge"
+#. 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/merge.c:237 builtin/pull.c:188
-msgid "allow merging unrelated histories"
+#: 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/merge.c:243
-msgid "verify commit-msg hook"
+#: builtin/notes.c:389 builtin/notes.c:678
+#, c-format
+msgid "no note found for object %s."
msgstr ""
-#: builtin/merge.c:268
-msgid "could not run stash."
+#: builtin/notes.c:410 builtin/notes.c:576
+msgid "note contents as a string"
msgstr ""
-#: builtin/merge.c:273
-msgid "stash failed"
+#: builtin/notes.c:413 builtin/notes.c:579
+msgid "note contents in a file"
msgstr ""
-#: builtin/merge.c:278
-#, c-format
-msgid "not a valid object: %s"
+#: builtin/notes.c:416 builtin/notes.c:582
+msgid "reuse and edit specified note object"
msgstr ""
-#: builtin/merge.c:300 builtin/merge.c:317
-msgid "read-tree failed"
+#: builtin/notes.c:419 builtin/notes.c:585
+msgid "reuse specified note object"
msgstr ""
-#: builtin/merge.c:347
-msgid " (nothing to squash)"
+#: builtin/notes.c:422 builtin/notes.c:588
+msgid "allow storing empty note"
msgstr ""
-#: builtin/merge.c:358
-#, c-format
-msgid "Squash commit -- not updating HEAD\n"
+#: builtin/notes.c:423 builtin/notes.c:496
+msgid "replace existing notes"
msgstr ""
-#: builtin/merge.c:408
+#: builtin/notes.c:448
#, c-format
-msgid "No merge message -- not updating HEAD\n"
+msgid ""
+"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
+"existing notes"
msgstr ""
-#: builtin/merge.c:458
+#: builtin/notes.c:463 builtin/notes.c:544
#, c-format
-msgid "'%s' does not point to a commit"
+msgid "Overwriting existing notes for object %s\n"
msgstr ""
-#: builtin/merge.c:548
+#: builtin/notes.c:475 builtin/notes.c:637 builtin/notes.c:902
#, c-format
-msgid "Bad branch.%s.mergeoptions string: %s"
+msgid "Removing note for object %s\n"
msgstr ""
-#: builtin/merge.c:669
-msgid "Not handling anything other than two heads merge."
+#: builtin/notes.c:497
+msgid "read objects from stdin"
msgstr ""
-#: builtin/merge.c:683
-#, c-format
-msgid "Unknown option for merge-recursive: -X%s"
+#: builtin/notes.c:499
+msgid "load rewriting config for <command> (implies --stdin)"
msgstr ""
-#: builtin/merge.c:698
-#, c-format
-msgid "unable to write %s"
+#: builtin/notes.c:517
+msgid "too few parameters"
msgstr ""
-#: builtin/merge.c:749
+#: builtin/notes.c:538
#, c-format
-msgid "Could not read from '%s'"
+msgid ""
+"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
+"existing notes"
msgstr ""
-#: builtin/merge.c:758
+#: builtin/notes.c:550
#, c-format
-msgid "Not committing merge; use 'git commit' to complete the merge.\n"
+msgid "missing notes on source object %s. Cannot copy."
msgstr ""
-#: builtin/merge.c:764
+#: builtin/notes.c:603
#, 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"
+"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/merge.c:800
-msgid "Empty commit message."
+#: builtin/notes.c:698
+msgid "failed to delete ref NOTES_MERGE_PARTIAL"
msgstr ""
-#: builtin/merge.c:819
-#, c-format
-msgid "Wonderful.\n"
+#: builtin/notes.c:700
+msgid "failed to delete ref NOTES_MERGE_REF"
msgstr ""
-#: builtin/merge.c:872
-#, c-format
-msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
+#: builtin/notes.c:702
+msgid "failed to remove 'git notes merge' worktree"
msgstr ""
-#: builtin/merge.c:911
-msgid "No current branch."
+#: builtin/notes.c:722
+msgid "failed to read ref NOTES_MERGE_PARTIAL"
msgstr ""
-#: builtin/merge.c:913
-msgid "No remote for the current branch."
+#: builtin/notes.c:724
+msgid "could not find commit from NOTES_MERGE_PARTIAL."
msgstr ""
-#: builtin/merge.c:915
-msgid "No default upstream defined for the current branch."
+#: builtin/notes.c:726
+msgid "could not parse commit from NOTES_MERGE_PARTIAL."
msgstr ""
-#: builtin/merge.c:920
-#, c-format
-msgid "No remote-tracking branch for %s from %s"
+#: builtin/notes.c:739
+msgid "failed to resolve NOTES_MERGE_REF"
msgstr ""
-#: builtin/merge.c:973
-#, c-format
-msgid "Bad value '%s' in environment '%s'"
+#: builtin/notes.c:742
+msgid "failed to finalize notes merge"
msgstr ""
-#: builtin/merge.c:1075
+#: builtin/notes.c:768
#, c-format
-msgid "not something we can merge in %s: %s"
-msgstr ""
-
-#: builtin/merge.c:1109
-msgid "not something we can merge"
-msgstr ""
-
-#: builtin/merge.c:1211
-msgid "--abort expects no arguments"
+msgid "unknown notes merge strategy %s"
msgstr ""
-#: builtin/merge.c:1215
-msgid "There is no merge to abort (MERGE_HEAD missing)."
+#: builtin/notes.c:784
+msgid "General options"
msgstr ""
-#: builtin/merge.c:1227
-msgid "--continue expects no arguments"
+#: builtin/notes.c:786
+msgid "Merge options"
msgstr ""
-#: builtin/merge.c:1231
-msgid "There is no merge in progress (MERGE_HEAD missing)."
+#: builtin/notes.c:788
+msgid ""
+"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
+"cat_sort_uniq)"
msgstr ""
-#: builtin/merge.c:1247
-msgid ""
-"You have not concluded your merge (MERGE_HEAD exists).\n"
-"Please, commit your changes before you merge."
+#: builtin/notes.c:790
+msgid "Committing unmerged notes"
msgstr ""
-#: builtin/merge.c:1254
-msgid ""
-"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
-"Please, commit your changes before you merge."
+#: builtin/notes.c:792
+msgid "finalize notes merge by committing unmerged notes"
msgstr ""
-#: builtin/merge.c:1257
-msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
+#: builtin/notes.c:794
+msgid "Aborting notes merge resolution"
msgstr ""
-#: builtin/merge.c:1266
-msgid "You cannot combine --squash with --no-ff."
+#: builtin/notes.c:796
+msgid "abort notes merge"
msgstr ""
-#: builtin/merge.c:1274
-msgid "No commit specified and merge.defaultToUpstream not set."
+#: builtin/notes.c:807
+msgid "cannot mix --commit, --abort or -s/--strategy"
msgstr ""
-#: builtin/merge.c:1291
-msgid "Squash commit into empty head not supported yet"
+#: builtin/notes.c:812
+msgid "must specify a notes ref to merge"
msgstr ""
-#: builtin/merge.c:1293
-msgid "Non-fast-forward commit does not make sense into an empty head"
+#: builtin/notes.c:836
+#, c-format
+msgid "unknown -s/--strategy: %s"
msgstr ""
-#: builtin/merge.c:1298
+#: builtin/notes.c:873
#, c-format
-msgid "%s - not something we can merge"
+msgid "a notes merge into %s is already in-progress at %s"
msgstr ""
-#: builtin/merge.c:1300
-msgid "Can merge only exactly one commit into empty head"
+#: builtin/notes.c:876
+#, c-format
+msgid "failed to store link to current notes ref (%s)"
msgstr ""
-#: builtin/merge.c:1334
+#: builtin/notes.c:878
#, c-format
-msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
+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/merge.c:1337
+#: builtin/notes.c:897 builtin/tag.c:535
#, c-format
-msgid "Commit %s has a bad GPG signature allegedly by %s."
+msgid "Failed to resolve '%s' as a valid ref."
msgstr ""
-#: builtin/merge.c:1340
+#: builtin/notes.c:900
#, c-format
-msgid "Commit %s does not have a GPG signature."
+msgid "Object %s has no note\n"
msgstr ""
-#: builtin/merge.c:1343
-#, c-format
-msgid "Commit %s has a good GPG signature by %s\n"
+#: builtin/notes.c:912
+msgid "attempt to remove non-existent note is not an error"
msgstr ""
-#: builtin/merge.c:1402
-msgid "refusing to merge unrelated histories"
+#: builtin/notes.c:915
+msgid "read object names from the standard input"
msgstr ""
-#: builtin/merge.c:1411
-msgid "Already up to date."
+#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:165
+msgid "do not remove, show only"
msgstr ""
-#: builtin/merge.c:1421
-#, c-format
-msgid "Updating %s..%s\n"
+#: builtin/notes.c:955
+msgid "report pruned notes"
msgstr ""
-#: builtin/merge.c:1462
-#, c-format
-msgid "Trying really trivial in-index merge...\n"
+#: builtin/notes.c:998
+msgid "notes-ref"
msgstr ""
-#: builtin/merge.c:1469
+#: builtin/notes.c:999
+msgid "use notes from <notes-ref>"
+msgstr ""
+
+#: builtin/notes.c:1034 builtin/stash.c:1611
#, c-format
-msgid "Nope.\n"
+msgid "unknown subcommand: %s"
msgstr ""
-#: builtin/merge.c:1494
-msgid "Already up to date. Yeeah!"
+#: builtin/pack-objects.c:52
+msgid ""
+"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
msgstr ""
-#: builtin/merge.c:1500
-msgid "Not possible to fast-forward, aborting."
+#: builtin/pack-objects.c:53
+msgid ""
+"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
msgstr ""
-#: builtin/merge.c:1523 builtin/merge.c:1602
+#: builtin/pack-objects.c:424
#, c-format
-msgid "Rewinding the tree to pristine...\n"
+msgid "bad packed object CRC for %s"
msgstr ""
-#: builtin/merge.c:1527
+#: builtin/pack-objects.c:435
#, c-format
-msgid "Trying merge strategy %s...\n"
+msgid "corrupt packed object for %s"
msgstr ""
-#: builtin/merge.c:1593
+#: builtin/pack-objects.c:566
#, c-format
-msgid "No merge strategy handled the merge.\n"
+msgid "recursive delta detected for object %s"
msgstr ""
-#: builtin/merge.c:1595
+#: builtin/pack-objects.c:777
#, c-format
-msgid "Merge with strategy %s failed.\n"
+msgid "ordered %u objects, expected %<PRIu32>"
msgstr ""
-#: builtin/merge.c:1604
+#: builtin/pack-objects.c:790
#, c-format
-msgid "Using the %s to prepare resolving by hand.\n"
+msgid "packfile is invalid: %s"
msgstr ""
-#: builtin/merge.c:1616
+#: builtin/pack-objects.c:794
#, c-format
-msgid "Automatic merge went well; stopped before committing as requested\n"
+msgid "unable to open packfile for reuse: %s"
msgstr ""
-#: builtin/merge-base.c:30
-msgid "git merge-base [-a | --all] <commit> <commit>..."
+#: builtin/pack-objects.c:798
+msgid "unable to seek in reused packfile"
msgstr ""
-#: builtin/merge-base.c:31
-msgid "git merge-base [-a | --all] --octopus <commit>..."
+#: builtin/pack-objects.c:809
+msgid "unable to read from reused packfile"
msgstr ""
-#: builtin/merge-base.c:32
-msgid "git merge-base --independent <commit>..."
+#: builtin/pack-objects.c:837
+msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
msgstr ""
-#: builtin/merge-base.c:33
-msgid "git merge-base --is-ancestor <commit> <commit>"
+#: builtin/pack-objects.c:850
+msgid "Writing objects"
msgstr ""
-#: builtin/merge-base.c:34
-msgid "git merge-base --fork-point <ref> [<commit>]"
+#: builtin/pack-objects.c:912 builtin/update-index.c:89
+#, c-format
+msgid "failed to stat %s"
msgstr ""
-#: builtin/merge-base.c:220
-msgid "output all common ancestors"
+#: builtin/pack-objects.c:965
+#, c-format
+msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
msgstr ""
-#: builtin/merge-base.c:222
-msgid "find ancestors for a single n-way merge"
+#: builtin/pack-objects.c:1161
+msgid "disabling bitmap writing, as some objects are not being packed"
msgstr ""
-#: builtin/merge-base.c:224
-msgid "list revs not reachable from others"
+#: builtin/pack-objects.c:1589
+#, c-format
+msgid "delta base offset overflow in pack for %s"
msgstr ""
-#: builtin/merge-base.c:226
-msgid "is the first one ancestor of the other?"
+#: builtin/pack-objects.c:1598
+#, c-format
+msgid "delta base offset out of bound for %s"
msgstr ""
-#: builtin/merge-base.c:228
-msgid "find where <commit> forked from reflog of <ref>"
+#: builtin/pack-objects.c:1867
+msgid "Counting objects"
msgstr ""
-#: builtin/merge-file.c:9
-msgid ""
-"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
-"<orig-file> <file2>"
+#: builtin/pack-objects.c:1997
+#, c-format
+msgid "unable to get size of %s"
msgstr ""
-#: builtin/merge-file.c:33
-msgid "send results to standard output"
+#: builtin/pack-objects.c:2012
+#, c-format
+msgid "unable to parse object header of %s"
msgstr ""
-#: builtin/merge-file.c:34
-msgid "use a diff3 based merge"
+#: 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/merge-file.c:35
-msgid "for conflicts, use our version"
+#: builtin/pack-objects.c:2085 builtin/pack-objects.c:2112
+#, c-format
+msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
msgstr ""
-#: builtin/merge-file.c:37
-msgid "for conflicts, use their version"
+#: builtin/pack-objects.c:2122
+msgid "suboptimal pack - out of memory"
msgstr ""
-#: builtin/merge-file.c:39
-msgid "for conflicts, use a union version"
+#: builtin/pack-objects.c:2448
+#, c-format
+msgid "Delta compression using up to %d threads"
msgstr ""
-#: builtin/merge-file.c:42
-msgid "for conflicts, use this marker size"
+#: builtin/pack-objects.c:2580
+#, c-format
+msgid "unable to pack objects reachable from tag %s"
msgstr ""
-#: builtin/merge-file.c:43
-msgid "do not warn about conflicts"
+#: builtin/pack-objects.c:2667
+msgid "Compressing objects"
msgstr ""
-#: builtin/merge-file.c:45
-msgid "set labels for file1/orig-file/file2"
+#: builtin/pack-objects.c:2673
+msgid "inconsistency with delta count"
msgstr ""
-#: builtin/merge-recursive.c:45
+#: builtin/pack-objects.c:2754
#, c-format
-msgid "unknown option %s"
+msgid ""
+"expected edge object ID, got garbage:\n"
+" %s"
msgstr ""
-#: builtin/merge-recursive.c:51
+#: builtin/pack-objects.c:2760
#, c-format
-msgid "could not parse object '%s'"
+msgid ""
+"expected object ID, got garbage:\n"
+" %s"
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/pack-objects.c:2858
+msgid "invalid value for --missing"
+msgstr ""
-#: builtin/merge-recursive.c:63
-msgid "not handling anything other than two heads merge."
+#: builtin/pack-objects.c:2917 builtin/pack-objects.c:3025
+msgid "cannot open pack index"
msgstr ""
-#: builtin/merge-recursive.c:69 builtin/merge-recursive.c:71
+#: builtin/pack-objects.c:2948
#, c-format
-msgid "could not resolve ref '%s'"
+msgid "loose object at %s could not be examined"
+msgstr ""
+
+#: builtin/pack-objects.c:3033
+msgid "unable to force loose object"
msgstr ""
-#: builtin/merge-recursive.c:77
+#: builtin/pack-objects.c:3125
#, c-format
-msgid "Merging %s with %s\n"
+msgid "not a rev '%s'"
msgstr ""
-#: builtin/mktree.c:65
-msgid "git mktree [-z] [--missing] [--batch]"
+#: builtin/pack-objects.c:3128
+#, c-format
+msgid "bad revision '%s'"
msgstr ""
-#: builtin/mktree.c:153
-msgid "input is NUL terminated"
+#: builtin/pack-objects.c:3153
+msgid "unable to add recent objects"
msgstr ""
-#: builtin/mktree.c:154 builtin/write-tree.c:25
-msgid "allow missing objects"
+#: builtin/pack-objects.c:3206
+#, c-format
+msgid "unsupported index version %s"
msgstr ""
-#: builtin/mktree.c:155
-msgid "allow creation of more than one tree"
+#: builtin/pack-objects.c:3210
+#, c-format
+msgid "bad index version '%s'"
msgstr ""
-#: builtin/mv.c:17
-msgid "git mv [<options>] <source>... <destination>"
+#: builtin/pack-objects.c:3240
+msgid "do not show progress meter"
msgstr ""
-#: builtin/mv.c:82
-#, c-format
-msgid "Directory %s is in index and no submodule?"
+#: builtin/pack-objects.c:3242
+msgid "show progress meter"
msgstr ""
-#: builtin/mv.c:84 builtin/rm.c:288
-msgid "Please stage your changes to .gitmodules or stash them to proceed"
+#: builtin/pack-objects.c:3244
+msgid "show progress meter during object writing phase"
msgstr ""
-#: builtin/mv.c:102
-#, c-format
-msgid "%.*s is in index"
+#: builtin/pack-objects.c:3247
+msgid "similar to --all-progress when progress meter is shown"
msgstr ""
-#: builtin/mv.c:124
-msgid "force move/rename even if target exists"
+#: builtin/pack-objects.c:3248
+msgid "<version>[,<offset>]"
msgstr ""
-#: builtin/mv.c:126
-msgid "skip move/rename errors"
+#: builtin/pack-objects.c:3249
+msgid "write the pack index file in the specified idx format version"
msgstr ""
-#: builtin/mv.c:168
-#, c-format
-msgid "destination '%s' is not a directory"
+#: builtin/pack-objects.c:3252
+msgid "maximum size of each output pack file"
msgstr ""
-#: builtin/mv.c:179
-#, c-format
-msgid "Checking rename of '%s' to '%s'\n"
+#: builtin/pack-objects.c:3254
+msgid "ignore borrowed objects from alternate object store"
msgstr ""
-#: builtin/mv.c:183
-msgid "bad source"
+#: builtin/pack-objects.c:3256
+msgid "ignore packed objects"
msgstr ""
-#: builtin/mv.c:186
-msgid "can not move directory into itself"
+#: builtin/pack-objects.c:3258
+msgid "limit pack window by objects"
msgstr ""
-#: builtin/mv.c:189
-msgid "cannot move directory over file"
+#: builtin/pack-objects.c:3260
+msgid "limit pack window by memory in addition to object limit"
msgstr ""
-#: builtin/mv.c:198
-msgid "source directory is empty"
+#: builtin/pack-objects.c:3262
+msgid "maximum length of delta chain allowed in the resulting pack"
msgstr ""
-#: builtin/mv.c:223
-msgid "not under version control"
+#: builtin/pack-objects.c:3264
+msgid "reuse existing deltas"
msgstr ""
-#: builtin/mv.c:226
-msgid "destination exists"
+#: builtin/pack-objects.c:3266
+msgid "reuse existing objects"
msgstr ""
-#: builtin/mv.c:234
-#, c-format
-msgid "overwriting '%s'"
+#: builtin/pack-objects.c:3268
+msgid "use OFS_DELTA objects"
msgstr ""
-#: builtin/mv.c:237
-msgid "Cannot overwrite"
+#: builtin/pack-objects.c:3270
+msgid "use threads when searching for best delta matches"
msgstr ""
-#: builtin/mv.c:240
-msgid "multiple sources for the same target"
+#: builtin/pack-objects.c:3272
+msgid "do not create an empty pack output"
msgstr ""
-#: builtin/mv.c:242
-msgid "destination directory does not exist"
+#: builtin/pack-objects.c:3274
+msgid "read revision arguments from standard input"
msgstr ""
-#: builtin/mv.c:249
-#, c-format
-msgid "%s, source=%s, destination=%s"
+#: builtin/pack-objects.c:3276
+msgid "limit the objects to those that are not yet packed"
msgstr ""
-#: builtin/mv.c:270
-#, c-format
-msgid "Renaming %s to %s\n"
+#: builtin/pack-objects.c:3279
+msgid "include objects reachable from any reference"
msgstr ""
-#: builtin/mv.c:276 builtin/remote.c:715 builtin/repack.c:409
-#, c-format
-msgid "renaming '%s' failed"
+#: builtin/pack-objects.c:3282
+msgid "include objects referred by reflog entries"
msgstr ""
-#: builtin/name-rev.c:338
-msgid "git name-rev [<options>] <commit>..."
+#: builtin/pack-objects.c:3285
+msgid "include objects referred to by the index"
msgstr ""
-#: builtin/name-rev.c:339
-msgid "git name-rev [<options>] --all"
+#: builtin/pack-objects.c:3288
+msgid "output pack to stdout"
msgstr ""
-#: builtin/name-rev.c:340
-msgid "git name-rev [<options>] --stdin"
+#: builtin/pack-objects.c:3290
+msgid "include tag objects that refer to objects to be packed"
msgstr ""
-#: builtin/name-rev.c:395
-msgid "print only names (no SHA-1)"
+#: builtin/pack-objects.c:3292
+msgid "keep unreachable objects"
msgstr ""
-#: builtin/name-rev.c:396
-msgid "only use tags to name the commits"
+#: builtin/pack-objects.c:3294
+msgid "pack loose unreachable objects"
msgstr ""
-#: builtin/name-rev.c:398
-msgid "only use refs matching <pattern>"
+#: builtin/pack-objects.c:3296
+msgid "unpack unreachable objects newer than <time>"
msgstr ""
-#: builtin/name-rev.c:400
-msgid "ignore refs matching <pattern>"
+#: builtin/pack-objects.c:3299
+msgid "use the sparse reachability algorithm"
msgstr ""
-#: builtin/name-rev.c:402
-msgid "list all commits reachable from all refs"
+#: builtin/pack-objects.c:3301
+msgid "create thin packs"
msgstr ""
-#: builtin/name-rev.c:403
-msgid "read from stdin"
+#: builtin/pack-objects.c:3303
+msgid "create packs suitable for shallow fetches"
msgstr ""
-#: builtin/name-rev.c:404
-msgid "allow to print `undefined` names (default)"
+#: builtin/pack-objects.c:3305
+msgid "ignore packs that have companion .keep file"
msgstr ""
-#: builtin/name-rev.c:410
-msgid "dereference tags in the input (internal use)"
+#: builtin/pack-objects.c:3307
+msgid "ignore this pack"
msgstr ""
-#: builtin/notes.c:26
-msgid "git notes [--ref <notes-ref>] [list [<object>]]"
+#: builtin/pack-objects.c:3309
+msgid "pack compression level"
msgstr ""
-#: builtin/notes.c:27
-msgid ""
-"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
-"| (-c | -C) <object>] [<object>]"
+#: builtin/pack-objects.c:3311
+msgid "do not hide commits by grafts"
msgstr ""
-#: builtin/notes.c:28
-msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
+#: builtin/pack-objects.c:3313
+msgid "use a bitmap index if available to speed up counting objects"
msgstr ""
-#: builtin/notes.c:29
-msgid ""
-"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
-"(-c | -C) <object>] [<object>]"
+#: builtin/pack-objects.c:3315
+msgid "write a bitmap index together with the pack index"
msgstr ""
-#: builtin/notes.c:30
-msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
+#: builtin/pack-objects.c:3318
+msgid "handling for missing objects"
msgstr ""
-#: builtin/notes.c:31
-msgid "git notes [--ref <notes-ref>] show [<object>]"
+#: builtin/pack-objects.c:3321
+msgid "do not pack objects in promisor packfiles"
msgstr ""
-#: builtin/notes.c:32
-msgid ""
-"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
+#: builtin/pack-objects.c:3323
+msgid "respect islands during delta compression"
msgstr ""
-#: builtin/notes.c:33
-msgid "git notes merge --commit [-v | -q]"
+#: builtin/pack-objects.c:3348
+#, c-format
+msgid "delta chain depth %d is too deep, forcing %d"
msgstr ""
-#: builtin/notes.c:34
-msgid "git notes merge --abort [-v | -q]"
+#: builtin/pack-objects.c:3353
+#, c-format
+msgid "pack.deltaCacheLimit is too high, forcing %d"
msgstr ""
-#: builtin/notes.c:35
-msgid "git notes [--ref <notes-ref>] remove [<object>...]"
+#: builtin/pack-objects.c:3407
+msgid "--max-pack-size cannot be used to build a pack for transfer"
msgstr ""
-#: builtin/notes.c:36
-msgid "git notes [--ref <notes-ref>] prune [-n] [-v]"
+#: builtin/pack-objects.c:3409
+msgid "minimum pack size limit is 1 MiB"
msgstr ""
-#: builtin/notes.c:37
-msgid "git notes [--ref <notes-ref>] get-ref"
+#: builtin/pack-objects.c:3414
+msgid "--thin cannot be used to build an indexable pack"
msgstr ""
-#: builtin/notes.c:42
-msgid "git notes [list [<object>]]"
+#: builtin/pack-objects.c:3417
+msgid "--keep-unreachable and --unpack-unreachable are incompatible"
msgstr ""
-#: builtin/notes.c:47
-msgid "git notes add [<options>] [<object>]"
+#: builtin/pack-objects.c:3423
+msgid "cannot use --filter without --stdout"
msgstr ""
-#: builtin/notes.c:52
-msgid "git notes copy [<options>] <from-object> <to-object>"
+#: builtin/pack-objects.c:3484
+msgid "Enumerating objects"
msgstr ""
-#: builtin/notes.c:53
-msgid "git notes copy --stdin [<from-object> <to-object>]..."
+#: builtin/pack-objects.c:3514
+#, c-format
+msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)"
msgstr ""
-#: builtin/notes.c:58
-msgid "git notes append [<options>] [<object>]"
+#: builtin/pack-refs.c:8
+msgid "git pack-refs [<options>]"
msgstr ""
-#: builtin/notes.c:63
-msgid "git notes edit [<object>]"
+#: builtin/pack-refs.c:16
+msgid "pack everything"
msgstr ""
-#: builtin/notes.c:68
-msgid "git notes show [<object>]"
+#: builtin/pack-refs.c:17
+msgid "prune loose refs (default)"
msgstr ""
-#: builtin/notes.c:73
-msgid "git notes merge [<options>] <notes-ref>"
+#: builtin/prune-packed.c:9
+msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
msgstr ""
-#: builtin/notes.c:74
-msgid "git notes merge --commit [<options>]"
+#: builtin/prune-packed.c:42
+msgid "Removing duplicate objects"
msgstr ""
-#: builtin/notes.c:75
-msgid "git notes merge --abort [<options>]"
+#: builtin/prune.c:12
+msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
msgstr ""
-#: builtin/notes.c:80
-msgid "git notes remove [<object>]"
+#: builtin/prune.c:131
+msgid "report pruned objects"
msgstr ""
-#: builtin/notes.c:85
-msgid "git notes prune [<options>]"
+#: builtin/prune.c:134
+msgid "expire objects older than <time>"
msgstr ""
-#: builtin/notes.c:90
-msgid "git notes get-ref"
+#: builtin/prune.c:136
+msgid "limit traversal to objects outside promisor packfiles"
msgstr ""
-#: builtin/notes.c:95
-msgid "Write/edit the notes for the following object:"
+#: builtin/prune.c:150
+msgid "cannot prune in a precious-objects repo"
msgstr ""
-#: builtin/notes.c:148
+#: builtin/pull.c:66 builtin/pull.c:68
#, c-format
-msgid "unable to start 'show' for object '%s'"
+msgid "Invalid value for %s: %s"
msgstr ""
-#: builtin/notes.c:152
-msgid "could not read 'show' output"
+#: builtin/pull.c:88
+msgid "git pull [<options>] [<repository> [<refspec>...]]"
msgstr ""
-#: builtin/notes.c:160
-#, c-format
-msgid "failed to finish 'show' for object '%s'"
+#: builtin/pull.c:140
+msgid "control for recursive fetching of submodules"
msgstr ""
-#: builtin/notes.c:195
-msgid "please supply the note contents using either -m or -F option"
+#: builtin/pull.c:144
+msgid "Options related to merging"
msgstr ""
-#: builtin/notes.c:204
-msgid "unable to write note object"
+#: builtin/pull.c:147
+msgid "incorporate changes by rebasing rather than merging"
msgstr ""
-#: builtin/notes.c:206
-#, c-format
-msgid "the note contents have been left in %s"
+#: builtin/pull.c:175 builtin/rebase.c:447 builtin/revert.c:125
+msgid "allow fast-forward"
msgstr ""
-#: builtin/notes.c:234 builtin/tag.c:507
-#, c-format
-msgid "cannot read '%s'"
+#: builtin/pull.c:184
+msgid "automatically stash/stash pop before and after rebase"
msgstr ""
-#: builtin/notes.c:236 builtin/tag.c:510
-#, c-format
-msgid "could not open or read '%s'"
+#: builtin/pull.c:200
+msgid "Options related to fetching"
msgstr ""
-#: builtin/notes.c:255 builtin/notes.c:306 builtin/notes.c:308
-#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:517
-#: builtin/notes.c:522 builtin/notes.c:600 builtin/notes.c:662
-#, c-format
-msgid "failed to resolve '%s' as a valid ref."
+#: builtin/pull.c:210
+msgid "force overwrite of local branch"
msgstr ""
-#: builtin/notes.c:258
-#, c-format
-msgid "failed to read object '%s'."
+#: builtin/pull.c:218
+msgid "number of submodules pulled in parallel"
msgstr ""
-#: builtin/notes.c:262
+#: builtin/pull.c:313
#, c-format
-msgid "cannot read note data from non-blob object '%s'."
+msgid "Invalid value for pull.ff: %s"
msgstr ""
-#: builtin/notes.c:302
-#, c-format
-msgid "malformed input line: '%s'."
+#: builtin/pull.c:430
+msgid ""
+"There is no candidate for rebasing against among the refs that you just "
+"fetched."
msgstr ""
-#: builtin/notes.c:317
-#, c-format
-msgid "failed to copy notes from '%s' to '%s'"
+#: builtin/pull.c:432
+msgid ""
+"There are no candidates for merging among the refs that you just fetched."
msgstr ""
-#. TRANSLATORS: the first %s will be replaced by a git
-#. notes command: 'add', 'merge', 'remove', etc.
-#.
-#: builtin/notes.c:349
+#: 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 "refusing to %s notes in %s (outside of refs/notes/)"
+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/notes.c:369 builtin/notes.c:424 builtin/notes.c:500
-#: builtin/notes.c:512 builtin/notes.c:588 builtin/notes.c:655
-#: builtin/notes.c:805 builtin/notes.c:952 builtin/notes.c:973
-msgid "too many parameters"
+#: builtin/pull.c:441 builtin/rebase.c:1321 git-parse-remote.sh:73
+msgid "You are not currently on a branch."
msgstr ""
-#: builtin/notes.c:382 builtin/notes.c:668
-#, c-format
-msgid "no note found for object %s."
+#: 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/notes.c:403 builtin/notes.c:566
-msgid "note contents as a string"
+#: 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/notes.c:406 builtin/notes.c:569
-msgid "note contents in a file"
+#: builtin/pull.c:446 builtin/pull.c:461
+msgid "See git-pull(1) for details."
msgstr ""
-#: builtin/notes.c:409 builtin/notes.c:572
-msgid "reuse and edit specified note object"
+#: 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/notes.c:412 builtin/notes.c:575
-msgid "reuse specified note object"
+#: builtin/pull.c:448 builtin/pull.c:463 builtin/pull.c:468
+#: git-parse-remote.sh:65
+msgid "<branch>"
msgstr ""
-#: builtin/notes.c:415 builtin/notes.c:578
-msgid "allow storing empty note"
+#: 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/notes.c:416 builtin/notes.c:487
-msgid "replace existing notes"
+#: 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/notes.c:441
+#: builtin/pull.c:470
#, c-format
msgid ""
-"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
-"existing notes"
+"Your configuration specifies to merge with the ref '%s'\n"
+"from the remote, but no such ref was fetched."
msgstr ""
-#: builtin/notes.c:456 builtin/notes.c:535
+#: builtin/pull.c:574
#, c-format
-msgid "Overwriting existing notes for object %s\n"
+msgid "unable to access commit %s"
msgstr ""
-#: builtin/notes.c:467 builtin/notes.c:627 builtin/notes.c:892
-#, c-format
-msgid "Removing note for object %s\n"
+#: builtin/pull.c:854
+msgid "ignoring --verify-signatures for rebase"
msgstr ""
-#: builtin/notes.c:488
-msgid "read objects from stdin"
+#: builtin/pull.c:909
+msgid "--[no-]autostash option is only valid with --rebase."
msgstr ""
-#: builtin/notes.c:490
-msgid "load rewriting config for <command> (implies --stdin)"
+#: builtin/pull.c:917
+msgid "Updating an unborn branch with changes added to the index."
msgstr ""
-#: builtin/notes.c:508
-msgid "too few parameters"
+#: builtin/pull.c:921
+msgid "pull with rebase"
msgstr ""
-#: builtin/notes.c:529
-#, c-format
-msgid ""
-"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
-"existing notes"
+#: builtin/pull.c:922
+msgid "please commit or stash them."
msgstr ""
-#: builtin/notes.c:541
+#: builtin/pull.c:947
#, c-format
-msgid "missing notes on source object %s. Cannot copy."
+msgid ""
+"fetch updated the current branch head.\n"
+"fast-forwarding your working tree from\n"
+"commit %s."
msgstr ""
-#: builtin/notes.c:593
+#: builtin/pull.c:953
#, 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"
+"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/notes.c:688
-msgid "failed to delete ref NOTES_MERGE_PARTIAL"
+#: builtin/pull.c:968
+msgid "Cannot merge multiple branches into empty head."
msgstr ""
-#: builtin/notes.c:690
-msgid "failed to delete ref NOTES_MERGE_REF"
+#: builtin/pull.c:972
+msgid "Cannot rebase onto multiple branches."
msgstr ""
-#: builtin/notes.c:692
-msgid "failed to remove 'git notes merge' worktree"
+#: builtin/pull.c:979
+msgid "cannot rebase with locally recorded submodule modifications"
msgstr ""
-#: builtin/notes.c:712
-msgid "failed to read ref NOTES_MERGE_PARTIAL"
+#: builtin/push.c:19
+msgid "git push [<options>] [<repository> [<refspec>...]]"
msgstr ""
-#: builtin/notes.c:714
-msgid "could not find commit from NOTES_MERGE_PARTIAL."
+#: builtin/push.c:111
+msgid "tag shorthand without <tag>"
msgstr ""
-#: builtin/notes.c:716
-msgid "could not parse commit from NOTES_MERGE_PARTIAL."
+#: builtin/push.c:121
+msgid "--delete only accepts plain target ref names"
msgstr ""
-#: builtin/notes.c:729
-msgid "failed to resolve NOTES_MERGE_REF"
+#: builtin/push.c:167
+msgid ""
+"\n"
+"To choose either option permanently, see push.default in 'git help config'."
msgstr ""
-#: builtin/notes.c:732
-msgid "failed to finalize notes merge"
+#: 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/notes.c:758
+#: builtin/push.c:185
#, c-format
-msgid "unknown notes merge strategy %s"
+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/notes.c:774
-msgid "General options"
+#: 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/notes.c:776
-msgid "Merge options"
+#: builtin/push.c:207
+#, c-format
+msgid "The current branch %s has multiple upstream branches, refusing to push."
msgstr ""
-#: builtin/notes.c:778
+#: builtin/push.c:210
+#, c-format
msgid ""
-"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
-"cat_sort_uniq)"
+"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/notes.c:780
-msgid "Committing unmerged notes"
+#: builtin/push.c:269
+msgid ""
+"You didn't specify any refspecs to push, and push.default is \"nothing\"."
msgstr ""
-#: builtin/notes.c:782
-msgid "finalize notes merge by committing unmerged notes"
+#: 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/notes.c:784
-msgid "Aborting notes merge resolution"
+#: 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/notes.c:786
-msgid "abort notes merge"
+#: 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/notes.c:797
-msgid "cannot mix --commit, --abort or -s/--strategy"
+#: builtin/push.c:295
+msgid "Updates were rejected because the tag already exists in the remote."
msgstr ""
-#: builtin/notes.c:802
-msgid "must specify a notes ref to merge"
+#: 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/notes.c:826
+#: builtin/push.c:359
#, c-format
-msgid "unknown -s/--strategy: %s"
+msgid "Pushing to %s\n"
msgstr ""
-#: builtin/notes.c:863
+#: builtin/push.c:364
#, c-format
-msgid "a notes merge into %s is already in-progress at %s"
+msgid "failed to push some refs to '%s'"
msgstr ""
-#: builtin/notes.c:866
+#: builtin/push.c:398
#, c-format
-msgid "failed to store link to current notes ref (%s)"
+msgid "bad repository '%s'"
msgstr ""
-#: builtin/notes.c:868
-#, c-format
+#: builtin/push.c:399
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:890
-#, c-format
-msgid "Object %s has no note\n"
-msgstr ""
-
-#: builtin/notes.c:902
-msgid "attempt to remove non-existent note is not an error"
-msgstr ""
-
-#: builtin/notes.c:905
-msgid "read object names from the standard input"
+"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/notes.c:943 builtin/prune.c:107 builtin/worktree.c:151
-msgid "do not remove, show only"
+#: builtin/push.c:554
+msgid "repository"
msgstr ""
-#: builtin/notes.c:944
-msgid "report pruned notes"
+#: builtin/push.c:555 builtin/send-pack.c:164
+msgid "push all refs"
msgstr ""
-#: builtin/notes.c:986
-msgid "notes-ref"
+#: builtin/push.c:556 builtin/send-pack.c:166
+msgid "mirror all refs"
msgstr ""
-#: builtin/notes.c:987
-msgid "use notes from <notes-ref>"
+#: builtin/push.c:558
+msgid "delete refs"
msgstr ""
-#: builtin/notes.c:1022
-#, c-format
-msgid "unknown subcommand: %s"
+#: builtin/push.c:559
+msgid "push tags (can't be used with --all or --mirror)"
msgstr ""
-#: builtin/pack-objects.c:48
-msgid ""
-"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
+#: builtin/push.c:562 builtin/send-pack.c:167
+msgid "force updates"
msgstr ""
-#: builtin/pack-objects.c:49
-msgid ""
-"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
+#: builtin/push.c:564 builtin/send-pack.c:181
+msgid "<refname>:<expect>"
msgstr ""
-#: builtin/pack-objects.c:211 builtin/pack-objects.c:214
-#, c-format
-msgid "deflate error (%d)"
+#: builtin/push.c:565 builtin/send-pack.c:182
+msgid "require old value of ref to be at this value"
msgstr ""
-#: builtin/pack-objects.c:810
-msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
+#: builtin/push.c:568
+msgid "control recursive pushing of submodules"
msgstr ""
-#: builtin/pack-objects.c:823
-msgid "Writing objects"
+#: builtin/push.c:570 builtin/send-pack.c:175
+msgid "use thin pack"
msgstr ""
-#: builtin/pack-objects.c:1106
-msgid "disabling bitmap writing, as some objects are not being packed"
+#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:161
+#: builtin/send-pack.c:162
+msgid "receive pack program"
msgstr ""
-#: builtin/pack-objects.c:1765
-msgid "Counting objects"
+#: builtin/push.c:573
+msgid "set upstream for git pull/status"
msgstr ""
-#: builtin/pack-objects.c:1895
-#, c-format
-msgid "unable to get size of %s"
+#: builtin/push.c:576
+msgid "prune locally removed refs"
msgstr ""
-#: builtin/pack-objects.c:1910
-#, c-format
-msgid "unable to parse object header of %s"
+#: builtin/push.c:578
+msgid "bypass pre-push hook"
msgstr ""
-#: builtin/pack-objects.c:2564
-msgid "Compressing objects"
+#: builtin/push.c:579
+msgid "push missing but relevant tags"
msgstr ""
-#: builtin/pack-objects.c:2735
-msgid "invalid value for --missing"
+#: builtin/push.c:582 builtin/send-pack.c:169
+msgid "GPG sign the push"
msgstr ""
-#: builtin/pack-objects.c:3067
-#, c-format
-msgid "unsupported index version %s"
+#: builtin/push.c:584 builtin/send-pack.c:176
+msgid "request atomic transaction on remote side"
msgstr ""
-#: builtin/pack-objects.c:3071
-#, c-format
-msgid "bad index version '%s'"
+#: builtin/push.c:602
+msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr ""
-#: builtin/pack-objects.c:3102
-msgid "do not show progress meter"
+#: builtin/push.c:604
+msgid "--delete doesn't make sense without any refs"
msgstr ""
-#: builtin/pack-objects.c:3104
-msgid "show progress meter"
+#: builtin/push.c:607
+msgid "--all and --tags are incompatible"
msgstr ""
-#: builtin/pack-objects.c:3106
-msgid "show progress meter during object writing phase"
+#: builtin/push.c:609
+msgid "--all can't be combined with refspecs"
msgstr ""
-#: builtin/pack-objects.c:3109
-msgid "similar to --all-progress when progress meter is shown"
+#: builtin/push.c:613
+msgid "--mirror and --tags are incompatible"
msgstr ""
-#: builtin/pack-objects.c:3110
-msgid "version[,offset]"
+#: builtin/push.c:615
+msgid "--mirror can't be combined with refspecs"
msgstr ""
-#: builtin/pack-objects.c:3111
-msgid "write the pack index file in the specified idx format version"
+#: builtin/push.c:618
+msgid "--all and --mirror are incompatible"
msgstr ""
-#: builtin/pack-objects.c:3114
-msgid "maximum size of each output pack file"
+#: builtin/push.c:637
+msgid "push options must not have new line characters"
msgstr ""
-#: builtin/pack-objects.c:3116
-msgid "ignore borrowed objects from alternate object store"
+#: builtin/range-diff.c:8
+msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>"
msgstr ""
-#: builtin/pack-objects.c:3118
-msgid "ignore packed objects"
+#: builtin/range-diff.c:9
+msgid "git range-diff [<options>] <old-tip>...<new-tip>"
msgstr ""
-#: builtin/pack-objects.c:3120
-msgid "limit pack window by objects"
+#: builtin/range-diff.c:10
+msgid "git range-diff [<options>] <base> <old-tip> <new-tip>"
msgstr ""
-#: builtin/pack-objects.c:3122
-msgid "limit pack window by memory in addition to object limit"
+#: builtin/range-diff.c:21
+msgid "Percentage by which creation is weighted"
msgstr ""
-#: builtin/pack-objects.c:3124
-msgid "maximum length of delta chain allowed in the resulting pack"
+#: builtin/range-diff.c:23
+msgid "use simple diff colors"
msgstr ""
-#: builtin/pack-objects.c:3126
-msgid "reuse existing deltas"
+#: builtin/range-diff.c:46 builtin/range-diff.c:50
+#, c-format
+msgid "no .. in range: '%s'"
msgstr ""
-#: builtin/pack-objects.c:3128
-msgid "reuse existing objects"
+#: builtin/range-diff.c:60
+msgid "single arg format must be symmetric range"
msgstr ""
-#: builtin/pack-objects.c:3130
-msgid "use OFS_DELTA objects"
+#: builtin/range-diff.c:75
+msgid "need two commit ranges"
msgstr ""
-#: builtin/pack-objects.c:3132
-msgid "use threads when searching for best delta matches"
+#: 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/pack-objects.c:3134
-msgid "do not create an empty pack output"
+#: builtin/read-tree.c:124
+msgid "write resulting index to <file>"
msgstr ""
-#: builtin/pack-objects.c:3136
-msgid "read revision arguments from standard input"
+#: builtin/read-tree.c:127
+msgid "only empty the index"
msgstr ""
-#: builtin/pack-objects.c:3138
-msgid "limit the objects to those that are not yet packed"
+#: builtin/read-tree.c:129
+msgid "Merging"
msgstr ""
-#: builtin/pack-objects.c:3141
-msgid "include objects reachable from any reference"
+#: builtin/read-tree.c:131
+msgid "perform a merge in addition to a read"
msgstr ""
-#: builtin/pack-objects.c:3144
-msgid "include objects referred by reflog entries"
+#: builtin/read-tree.c:133
+msgid "3-way merge if no file level merging required"
msgstr ""
-#: builtin/pack-objects.c:3147
-msgid "include objects referred to by the index"
+#: builtin/read-tree.c:135
+msgid "3-way merge in presence of adds and removes"
msgstr ""
-#: builtin/pack-objects.c:3150
-msgid "output pack to stdout"
+#: builtin/read-tree.c:137
+msgid "same as -m, but discard unmerged entries"
msgstr ""
-#: builtin/pack-objects.c:3152
-msgid "include tag objects that refer to objects to be packed"
+#: builtin/read-tree.c:138
+msgid "<subdirectory>/"
msgstr ""
-#: builtin/pack-objects.c:3154
-msgid "keep unreachable objects"
+#: builtin/read-tree.c:139
+msgid "read the tree into the index under <subdirectory>/"
msgstr ""
-#: builtin/pack-objects.c:3156
-msgid "pack loose unreachable objects"
+#: builtin/read-tree.c:142
+msgid "update working tree with merge result"
msgstr ""
-#: builtin/pack-objects.c:3158
-msgid "unpack unreachable objects newer than <time>"
+#: builtin/read-tree.c:144
+msgid "gitignore"
msgstr ""
-#: builtin/pack-objects.c:3161
-msgid "create thin packs"
+#: builtin/read-tree.c:145
+msgid "allow explicitly ignored files to be overwritten"
msgstr ""
-#: builtin/pack-objects.c:3163
-msgid "create packs suitable for shallow fetches"
+#: builtin/read-tree.c:148
+msgid "don't check the working tree after merging"
msgstr ""
-#: builtin/pack-objects.c:3165
-msgid "ignore packs that have companion .keep file"
+#: builtin/read-tree.c:149
+msgid "don't update the index or the work tree"
msgstr ""
-#: builtin/pack-objects.c:3167
-msgid "ignore this pack"
+#: builtin/read-tree.c:151
+msgid "skip applying sparse checkout filter"
msgstr ""
-#: builtin/pack-objects.c:3169
-msgid "pack compression level"
+#: builtin/read-tree.c:153
+msgid "debug unpack-trees"
msgstr ""
-#: builtin/pack-objects.c:3171
-msgid "do not hide commits by grafts"
+#: builtin/read-tree.c:157
+msgid "suppress feedback messages"
msgstr ""
-#: builtin/pack-objects.c:3173
-msgid "use a bitmap index if available to speed up counting objects"
+#: builtin/rebase.c:32
+msgid ""
+"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] "
+"[<branch>]"
msgstr ""
-#: builtin/pack-objects.c:3175
-msgid "write a bitmap index together with the pack index"
+#: builtin/rebase.c:34
+msgid ""
+"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]"
msgstr ""
-#: builtin/pack-objects.c:3178
-msgid "handling for missing objects"
+#: builtin/rebase.c:36
+msgid "git rebase --continue | --abort | --skip | --edit-todo"
msgstr ""
-#: builtin/pack-objects.c:3181
-msgid "do not pack objects in promisor packfiles"
+#: builtin/rebase.c:158 builtin/rebase.c:182 builtin/rebase.c:209
+#, c-format
+msgid "unusable todo list: '%s'"
msgstr ""
-#: builtin/pack-objects.c:3205
+#: builtin/rebase.c:167 builtin/rebase.c:193 builtin/rebase.c:217
#, c-format
-msgid "delta chain depth %d is too deep, forcing %d"
+msgid "could not write '%s'."
msgstr ""
-#: builtin/pack-objects.c:3210
-#, c-format
-msgid "pack.deltaCacheLimit is too high, forcing %d"
+#: builtin/rebase.c:252
+msgid "no HEAD?"
msgstr ""
-#: builtin/pack-objects.c:3338
-msgid "Enumerating objects"
+#: builtin/rebase.c:279
+#, c-format
+msgid "could not create temporary %s"
msgstr ""
-#: builtin/pack-refs.c:7
-msgid "git pack-refs [<options>]"
+#: builtin/rebase.c:285
+msgid "could not mark as interactive"
msgstr ""
-#: builtin/pack-refs.c:15
-msgid "pack everything"
+#: builtin/rebase.c:343
+msgid "could not generate todo list"
msgstr ""
-#: builtin/pack-refs.c:16
-msgid "prune loose refs (default)"
+#: builtin/rebase.c:382
+msgid "a base commit must be provided with --upstream or --onto"
msgstr ""
-#: builtin/prune-packed.c:8
-msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
+#: builtin/rebase.c:437
+msgid "git rebase--interactive [<options>]"
msgstr ""
-#: builtin/prune-packed.c:41
-msgid "Removing duplicate objects"
+#: builtin/rebase.c:449
+msgid "keep empty commits"
msgstr ""
-#: builtin/prune.c:11
-msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
+#: builtin/rebase.c:451 builtin/revert.c:127
+msgid "allow commits with empty messages"
msgstr ""
-#: builtin/prune.c:108
-msgid "report pruned objects"
+#: builtin/rebase.c:452
+msgid "rebase merge commits"
msgstr ""
-#: builtin/prune.c:111
-msgid "expire objects older than <time>"
+#: builtin/rebase.c:454
+msgid "keep original branch points of cousins"
msgstr ""
-#: builtin/prune.c:113
-msgid "limit traversal to objects outside promisor packfiles"
+#: builtin/rebase.c:456
+msgid "move commits that begin with squash!/fixup!"
msgstr ""
-#: builtin/prune.c:127
-msgid "cannot prune in a precious-objects repo"
+#: builtin/rebase.c:457
+msgid "sign commits"
msgstr ""
-#: builtin/pull.c:59 builtin/pull.c:61
-#, c-format
-msgid "Invalid value for %s: %s"
+#: builtin/rebase.c:459 builtin/rebase.c:1397
+msgid "display a diffstat of what changed upstream"
msgstr ""
-#: builtin/pull.c:81
-msgid "git pull [<options>] [<repository> [<refspec>...]]"
+#: builtin/rebase.c:461
+msgid "continue rebase"
msgstr ""
-#: builtin/pull.c:132
-msgid "control for recursive fetching of submodules"
+#: builtin/rebase.c:463
+msgid "skip commit"
msgstr ""
-#: builtin/pull.c:136
-msgid "Options related to merging"
+#: builtin/rebase.c:464
+msgid "edit the todo list"
msgstr ""
-#: builtin/pull.c:139
-msgid "incorporate changes by rebasing rather than merging"
+#: builtin/rebase.c:466
+msgid "show the current patch"
msgstr ""
-#: builtin/pull.c:166 builtin/rebase--helper.c:23 builtin/revert.c:121
-msgid "allow fast-forward"
+#: builtin/rebase.c:469
+msgid "shorten commit ids in the todo list"
msgstr ""
-#: builtin/pull.c:175
-msgid "automatically stash/stash pop before and after rebase"
+#: builtin/rebase.c:471
+msgid "expand commit ids in the todo list"
msgstr ""
-#: builtin/pull.c:191
-msgid "Options related to fetching"
+#: builtin/rebase.c:473
+msgid "check the todo list"
msgstr ""
-#: builtin/pull.c:209
-msgid "number of submodules pulled in parallel"
+#: builtin/rebase.c:475
+msgid "rearrange fixup/squash lines"
msgstr ""
-#: builtin/pull.c:304
-#, c-format
-msgid "Invalid value for pull.ff: %s"
+#: builtin/rebase.c:477
+msgid "insert exec commands in todo list"
msgstr ""
-#: builtin/pull.c:420
-msgid ""
-"There is no candidate for rebasing against among the refs that you just "
-"fetched."
+#: builtin/rebase.c:478
+msgid "onto"
msgstr ""
-#: builtin/pull.c:422
-msgid ""
-"There are no candidates for merging among the refs that you just fetched."
+#: builtin/rebase.c:481
+msgid "restrict-revision"
msgstr ""
-#: builtin/pull.c:423
-msgid ""
-"Generally this means that you provided a wildcard refspec which had no\n"
-"matches on the remote end."
+#: builtin/rebase.c:481
+msgid "restrict revision"
msgstr ""
-#: builtin/pull.c:426
-#, 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/rebase.c:483
+msgid "squash-onto"
msgstr ""
-#: builtin/pull.c:431 git-parse-remote.sh:73
-msgid "You are not currently on a branch."
+#: builtin/rebase.c:484
+msgid "squash onto"
msgstr ""
-#: builtin/pull.c:433 builtin/pull.c:448 git-parse-remote.sh:79
-msgid "Please specify which branch you want to rebase against."
+#: builtin/rebase.c:486
+msgid "the upstream commit"
msgstr ""
-#: builtin/pull.c:435 builtin/pull.c:450 git-parse-remote.sh:82
-msgid "Please specify which branch you want to merge with."
+#: builtin/rebase.c:488
+msgid "head-name"
msgstr ""
-#: builtin/pull.c:436 builtin/pull.c:451
-msgid "See git-pull(1) for details."
+#: builtin/rebase.c:488
+msgid "head name"
msgstr ""
-#: builtin/pull.c:438 builtin/pull.c:444 builtin/pull.c:453
-#: git-parse-remote.sh:64
-msgid "<remote>"
+#: builtin/rebase.c:493
+msgid "rebase strategy"
msgstr ""
-#: builtin/pull.c:438 builtin/pull.c:453 builtin/pull.c:458 git-rebase.sh:523
-#: git-parse-remote.sh:65
-msgid "<branch>"
+#: builtin/rebase.c:494
+msgid "strategy-opts"
msgstr ""
-#: builtin/pull.c:446 git-parse-remote.sh:75
-msgid "There is no tracking information for the current branch."
+#: builtin/rebase.c:495
+msgid "strategy options"
msgstr ""
-#: builtin/pull.c:455 git-parse-remote.sh:95
-msgid ""
-"If you wish to set tracking information for this branch you can do so with:"
+#: builtin/rebase.c:496
+msgid "switch-to"
msgstr ""
-#: builtin/pull.c:460
-#, c-format
-msgid ""
-"Your configuration specifies to merge with the ref '%s'\n"
-"from the remote, but no such ref was fetched."
+#: builtin/rebase.c:497
+msgid "the branch or commit to checkout"
msgstr ""
-#: builtin/pull.c:826
-msgid "ignoring --verify-signatures for rebase"
+#: builtin/rebase.c:498
+msgid "onto-name"
msgstr ""
-#: builtin/pull.c:874
-msgid "--[no-]autostash option is only valid with --rebase."
+#: builtin/rebase.c:498
+msgid "onto name"
msgstr ""
-#: builtin/pull.c:882
-msgid "Updating an unborn branch with changes added to the index."
+#: builtin/rebase.c:499
+msgid "cmd"
msgstr ""
-#: builtin/pull.c:885
-msgid "pull with rebase"
+#: builtin/rebase.c:499
+msgid "the command to run"
msgstr ""
-#: builtin/pull.c:886
-msgid "please commit or stash them."
+#: builtin/rebase.c:502 builtin/rebase.c:1480
+msgid "automatically re-schedule any `exec` that fails"
msgstr ""
-#: builtin/pull.c:911
-#, c-format
-msgid ""
-"fetch updated the current branch head.\n"
-"fast-forwarding your working tree from\n"
-"commit %s."
+#: builtin/rebase.c:518
+msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
msgstr ""
-#: builtin/pull.c:916
+#: builtin/rebase.c:534 builtin/rebase.c:1787
#, 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 "%s requires an interactive rebase"
msgstr ""
-#: builtin/pull.c:931
-msgid "Cannot merge multiple branches into empty head."
+#: builtin/rebase.c:586
+#, c-format
+msgid "could not get 'onto': '%s'"
msgstr ""
-#: builtin/pull.c:935
-msgid "Cannot rebase onto multiple branches."
+#: builtin/rebase.c:601
+#, c-format
+msgid "invalid orig-head: '%s'"
msgstr ""
-#: builtin/pull.c:942
-msgid "cannot rebase with locally recorded submodule modifications"
+#: builtin/rebase.c:626
+#, c-format
+msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
msgstr ""
-#: builtin/push.c:19
-msgid "git push [<options>] [<repository> [<refspec>...]]"
+#: builtin/rebase.c:702
+#, c-format
+msgid "Could not read '%s'"
msgstr ""
-#: builtin/push.c:111
-msgid "tag shorthand without <tag>"
+#: builtin/rebase.c:720
+#, c-format
+msgid "Cannot store %s"
msgstr ""
-#: builtin/push.c:121
-msgid "--delete only accepts plain target ref names"
+#: builtin/rebase.c:817
+msgid "could not determine HEAD revision"
msgstr ""
-#: builtin/push.c:165
+#: builtin/rebase.c:940
msgid ""
-"\n"
-"To choose either option permanently, see push.default in 'git help config'."
+"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/push.c:168
+#: builtin/rebase.c:1021
#, 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"
+"git encountered an error while preparing the patches to replay\n"
+"these revisions:\n"
"\n"
-"To push to the branch of the same name on the remote, use\n"
+" %s\n"
"\n"
-" git push %s %s\n"
-"%s"
+"As a result, git cannot rebase them."
msgstr ""
-#: builtin/push.c:183
+#: builtin/rebase.c:1313
#, 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"
+"%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"
-" git push %s HEAD:<name-of-remote-branch>\n"
msgstr ""
-#: builtin/push.c:197
+#: builtin/rebase.c:1329
#, 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"
+"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"
-" git push --set-upstream %s %s\n"
msgstr ""
-#: builtin/push.c:205
-#, c-format
-msgid "The current branch %s has multiple upstream branches, refusing to push."
+#: builtin/rebase.c:1359
+msgid "exec commands cannot contain newlines"
msgstr ""
-#: builtin/push.c:208
-#, c-format
-msgid ""
-"You are pushing to remote '%s', which is not the upstream of\n"
-"your current branch '%s', without telling me what to push\n"
-"to update which remote branch."
+#: builtin/rebase.c:1363
+msgid "empty exec command"
msgstr ""
-#: builtin/push.c:267
-msgid ""
-"You didn't specify any refspecs to push, and push.default is \"nothing\"."
+#: builtin/rebase.c:1390
+msgid "rebase onto given branch instead of upstream"
msgstr ""
-#: builtin/push.c:274
-msgid ""
-"Updates were rejected because the tip of your current branch is behind\n"
-"its remote counterpart. Integrate the remote changes (e.g.\n"
-"'git pull ...') before pushing again.\n"
-"See the 'Note about fast-forwards' in 'git push --help' for details."
+#: builtin/rebase.c:1392
+msgid "allow pre-rebase hook to run"
msgstr ""
-#: builtin/push.c:280
-msgid ""
-"Updates were rejected because a pushed branch tip is behind its remote\n"
-"counterpart. Check out this branch and integrate the remote changes\n"
-"(e.g. 'git pull ...') before pushing again.\n"
-"See the 'Note about fast-forwards' in 'git push --help' for details."
+#: builtin/rebase.c:1394
+msgid "be quiet. implies --no-stat"
msgstr ""
-#: builtin/push.c:286
-msgid ""
-"Updates were rejected because the remote contains work that you do\n"
-"not have locally. This is usually caused by another repository pushing\n"
-"to the same ref. You may want to first integrate the remote changes\n"
-"(e.g., 'git pull ...') before pushing again.\n"
-"See the 'Note about fast-forwards' in 'git push --help' for details."
+#: builtin/rebase.c:1400
+msgid "do not show diffstat of what changed upstream"
msgstr ""
-#: builtin/push.c:293
-msgid "Updates were rejected because the tag already exists in the remote."
+#: builtin/rebase.c:1403
+msgid "add a Signed-off-by: line to each commit"
msgstr ""
-#: builtin/push.c:296
-msgid ""
-"You cannot update a remote ref that points at a non-commit object,\n"
-"or update a remote ref to make it point at a non-commit object,\n"
-"without using the '--force' option.\n"
+#: builtin/rebase.c:1405 builtin/rebase.c:1409 builtin/rebase.c:1411
+msgid "passed to 'git am'"
msgstr ""
-#: builtin/push.c:357
-#, c-format
-msgid "Pushing to %s\n"
+#: builtin/rebase.c:1413 builtin/rebase.c:1415
+msgid "passed to 'git apply'"
msgstr ""
-#: builtin/push.c:361
-#, c-format
-msgid "failed to push some refs to '%s'"
+#: builtin/rebase.c:1417 builtin/rebase.c:1420
+msgid "cherry-pick all commits, even if unchanged"
msgstr ""
-#: builtin/push.c:395
-#, c-format
-msgid "bad repository '%s'"
+#: builtin/rebase.c:1422
+msgid "continue"
msgstr ""
-#: builtin/push.c:396
-msgid ""
-"No configured push destination.\n"
-"Either specify the URL from the command-line or configure a remote "
-"repository using\n"
-"\n"
-" git remote add <name> <url>\n"
-"\n"
-"and then push using the remote name\n"
-"\n"
-" git push <name>\n"
+#: builtin/rebase.c:1425
+msgid "skip current patch and continue"
+msgstr ""
+
+#: builtin/rebase.c:1427
+msgid "abort and check out the original branch"
msgstr ""
-#: builtin/push.c:551
-msgid "repository"
+#: builtin/rebase.c:1430
+msgid "abort but keep HEAD where it is"
msgstr ""
-#: builtin/push.c:552 builtin/send-pack.c:164
-msgid "push all refs"
+#: builtin/rebase.c:1431
+msgid "edit the todo list during an interactive rebase"
msgstr ""
-#: builtin/push.c:553 builtin/send-pack.c:166
-msgid "mirror all refs"
+#: builtin/rebase.c:1434
+msgid "show the patch file being applied or merged"
msgstr ""
-#: builtin/push.c:555
-msgid "delete refs"
+#: builtin/rebase.c:1437
+msgid "use merging strategies to rebase"
msgstr ""
-#: builtin/push.c:556
-msgid "push tags (can't be used with --all or --mirror)"
+#: builtin/rebase.c:1441
+msgid "let the user edit the list of commits to rebase"
msgstr ""
-#: builtin/push.c:559 builtin/send-pack.c:167
-msgid "force updates"
+#: builtin/rebase.c:1445
+msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
msgstr ""
-#: builtin/push.c:561 builtin/send-pack.c:181
-msgid "refname>:<expect"
+#: builtin/rebase.c:1449
+msgid "preserve empty commits during rebase"
msgstr ""
-#: builtin/push.c:562 builtin/send-pack.c:182
-msgid "require old value of ref to be at this value"
+#: builtin/rebase.c:1451
+msgid "move commits that begin with squash!/fixup! under -i"
msgstr ""
-#: builtin/push.c:565
-msgid "control recursive pushing of submodules"
+#: builtin/rebase.c:1457
+msgid "automatically stash/stash pop before and after"
msgstr ""
-#: builtin/push.c:567 builtin/send-pack.c:175
-msgid "use thin pack"
+#: builtin/rebase.c:1459
+msgid "add exec lines after each commit of the editable list"
msgstr ""
-#: builtin/push.c:568 builtin/push.c:569 builtin/send-pack.c:161
-#: builtin/send-pack.c:162
-msgid "receive pack program"
+#: builtin/rebase.c:1463
+msgid "allow rebasing commits with empty messages"
msgstr ""
-#: builtin/push.c:570
-msgid "set upstream for git pull/status"
+#: builtin/rebase.c:1466
+msgid "try to rebase merges instead of skipping them"
msgstr ""
-#: builtin/push.c:573
-msgid "prune locally removed refs"
+#: builtin/rebase.c:1469
+msgid "use 'merge-base --fork-point' to refine upstream"
msgstr ""
-#: builtin/push.c:575
-msgid "bypass pre-push hook"
+#: builtin/rebase.c:1471
+msgid "use the given merge strategy"
msgstr ""
-#: builtin/push.c:576
-msgid "push missing but relevant tags"
+#: builtin/rebase.c:1473 builtin/revert.c:114
+msgid "option"
msgstr ""
-#: builtin/push.c:579 builtin/send-pack.c:169
-msgid "GPG sign the push"
+#: builtin/rebase.c:1474
+msgid "pass the argument through to the merge strategy"
msgstr ""
-#: builtin/push.c:581 builtin/send-pack.c:176
-msgid "request atomic transaction on remote side"
+#: builtin/rebase.c:1477
+msgid "rebase all reachable commits up to the root(s)"
msgstr ""
-#: builtin/push.c:599
-msgid "--delete is incompatible with --all, --mirror and --tags"
+#: builtin/rebase.c:1498
+msgid ""
+"the rebase.useBuiltin support has been removed!\n"
+"See its entry in 'git help config' for details."
msgstr ""
-#: builtin/push.c:601
-msgid "--delete doesn't make sense without any refs"
+#: builtin/rebase.c:1504
+msgid "It looks like 'git am' is in progress. Cannot rebase."
msgstr ""
-#: builtin/push.c:604
-msgid "--all and --tags are incompatible"
+#: builtin/rebase.c:1545
+msgid ""
+"git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
msgstr ""
-#: builtin/push.c:606
-msgid "--all can't be combined with refspecs"
+#: builtin/rebase.c:1549
+msgid "No rebase in progress?"
msgstr ""
-#: builtin/push.c:610
-msgid "--mirror and --tags are incompatible"
+#: builtin/rebase.c:1553
+msgid "The --edit-todo action can only be used during interactive rebase."
msgstr ""
-#: builtin/push.c:612
-msgid "--mirror can't be combined with refspecs"
+#: builtin/rebase.c:1576
+msgid "Cannot read HEAD"
msgstr ""
-#: builtin/push.c:615
-msgid "--all and --mirror are incompatible"
+#: builtin/rebase.c:1588
+msgid ""
+"You must edit all merge conflicts and then\n"
+"mark them as resolved using git add"
msgstr ""
-#: builtin/push.c:634
-msgid "push options must not have new line characters"
+#: builtin/rebase.c:1607
+msgid "could not discard worktree changes"
msgstr ""
-#: builtin/read-tree.c:40
+#: 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 ""
-"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>]])"
+"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/read-tree.c:120
-msgid "write resulting index to <file>"
+#: builtin/rebase.c:1684
+msgid "switch `C' expects a numerical value"
msgstr ""
-#: builtin/read-tree.c:123
-msgid "only empty the index"
+#: builtin/rebase.c:1725
+#, c-format
+msgid "Unknown mode: %s"
msgstr ""
-#: builtin/read-tree.c:125
-msgid "Merging"
+#: builtin/rebase.c:1747
+msgid "--strategy requires --merge or --interactive"
msgstr ""
-#: builtin/read-tree.c:127
-msgid "perform a merge in addition to a read"
+#: builtin/rebase.c:1796
+msgid "cannot combine am options with either interactive or merge options"
msgstr ""
-#: builtin/read-tree.c:129
-msgid "3-way merge if no file level merging required"
+#: builtin/rebase.c:1815
+msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
msgstr ""
-#: builtin/read-tree.c:131
-msgid "3-way merge in presence of adds and removes"
+#: builtin/rebase.c:1819
+msgid ""
+"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
msgstr ""
-#: builtin/read-tree.c:133
-msgid "same as -m, but discard unmerged entries"
+#: builtin/rebase.c:1825
+msgid "cannot combine '--rebase-merges' with '--strategy-option'"
msgstr ""
-#: builtin/read-tree.c:134
-msgid "<subdirectory>/"
+#: builtin/rebase.c:1828
+msgid "cannot combine '--rebase-merges' with '--strategy'"
msgstr ""
-#: builtin/read-tree.c:135
-msgid "read the tree into the index under <subdirectory>/"
+#: builtin/rebase.c:1852
+#, c-format
+msgid "invalid upstream '%s'"
msgstr ""
-#: builtin/read-tree.c:138
-msgid "update working tree with merge result"
+#: builtin/rebase.c:1858
+msgid "Could not create new root commit"
msgstr ""
-#: builtin/read-tree.c:140
-msgid "gitignore"
+#: builtin/rebase.c:1876
+#, c-format
+msgid "'%s': need exactly one merge base"
msgstr ""
-#: builtin/read-tree.c:141
-msgid "allow explicitly ignored files to be overwritten"
+#: builtin/rebase.c:1883
+#, c-format
+msgid "Does not point to a valid commit '%s'"
msgstr ""
-#: builtin/read-tree.c:144
-msgid "don't check the working tree after merging"
+#: builtin/rebase.c:1908
+#, c-format
+msgid "fatal: no such branch/commit '%s'"
msgstr ""
-#: builtin/read-tree.c:145
-msgid "don't update the index or the work tree"
+#: builtin/rebase.c:1916 builtin/submodule--helper.c:38
+#: builtin/submodule--helper.c:1933
+#, c-format
+msgid "No such ref: %s"
msgstr ""
-#: builtin/read-tree.c:147
-msgid "skip applying sparse checkout filter"
+#: builtin/rebase.c:1927
+msgid "Could not resolve HEAD to a revision"
msgstr ""
-#: builtin/read-tree.c:149
-msgid "debug unpack-trees"
+#: builtin/rebase.c:1968
+msgid "Cannot autostash"
msgstr ""
-#: builtin/rebase--helper.c:8
-msgid "git rebase--helper [<options>]"
+#: builtin/rebase.c:1971
+#, c-format
+msgid "Unexpected stash response: '%s'"
msgstr ""
-#: builtin/rebase--helper.c:24
-msgid "keep empty commits"
+#: builtin/rebase.c:1977
+#, c-format
+msgid "Could not create directory for '%s'"
msgstr ""
-#: builtin/rebase--helper.c:26 builtin/revert.c:123
-msgid "allow commits with empty messages"
+#: builtin/rebase.c:1980
+#, c-format
+msgid "Created autostash: %s\n"
msgstr ""
-#: builtin/rebase--helper.c:27
-msgid "rebase merge commits"
+#: builtin/rebase.c:1983
+msgid "could not reset --hard"
msgstr ""
-#: builtin/rebase--helper.c:29
-msgid "keep original branch points of cousins"
+#: builtin/rebase.c:1984 builtin/reset.c:114
+#, c-format
+msgid "HEAD is now at %s"
msgstr ""
-#: builtin/rebase--helper.c:30
-msgid "continue rebase"
+#: builtin/rebase.c:2000
+msgid "Please commit or stash them."
msgstr ""
-#: builtin/rebase--helper.c:32
-msgid "abort rebase"
+#: builtin/rebase.c:2027
+#, c-format
+msgid "could not parse '%s'"
msgstr ""
-#: builtin/rebase--helper.c:35
-msgid "make rebase script"
+#: builtin/rebase.c:2040
+#, c-format
+msgid "could not switch to %s"
msgstr ""
-#: builtin/rebase--helper.c:37
-msgid "shorten commit ids in the todo list"
+#: builtin/rebase.c:2051
+msgid "HEAD is up to date."
msgstr ""
-#: builtin/rebase--helper.c:39
-msgid "expand commit ids in the todo list"
+#: builtin/rebase.c:2053
+#, c-format
+msgid "Current branch %s is up to date.\n"
msgstr ""
-#: builtin/rebase--helper.c:41
-msgid "check the todo list"
+#: builtin/rebase.c:2061
+msgid "HEAD is up to date, rebase forced."
msgstr ""
-#: builtin/rebase--helper.c:43
-msgid "skip unnecessary picks"
+#: builtin/rebase.c:2063
+#, c-format
+msgid "Current branch %s is up to date, rebase forced.\n"
msgstr ""
-#: builtin/rebase--helper.c:45
-msgid "rearrange fixup/squash lines"
+#: builtin/rebase.c:2071
+msgid "The pre-rebase hook refused to rebase."
msgstr ""
-#: builtin/rebase--helper.c:47
-msgid "insert exec commands in todo list"
+#: builtin/rebase.c:2078
+#, c-format
+msgid "Changes to %s:\n"
msgstr ""
-#: builtin/rebase--helper.c:68
-msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
+#: 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/receive-pack.c:31
+#: 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:842
+#: 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"
"'receive.denyCurrentBranch' configuration variable to 'refuse'."
msgstr ""
-#: builtin/receive-pack.c:862
+#: 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"
"To squelch this message, you can set it to 'refuse'."
msgstr ""
-#: builtin/receive-pack.c:1935
+#: builtin/receive-pack.c:1940
msgid "quiet"
msgstr ""
-#: builtin/receive-pack.c:1949
+#: builtin/receive-pack.c:1954
msgid "You must specify a directory."
msgstr ""
-#: builtin/reflog.c:532 builtin/reflog.c:537
+#: 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/remote.c:14
+#: 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:15
+#: 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:16 builtin/remote.c:36
+#: builtin/remote.c:18 builtin/remote.c:38
msgid "git remote rename <old> <new>"
msgstr ""
-#: builtin/remote.c:17 builtin/remote.c:41
+#: builtin/remote.c:19 builtin/remote.c:43
msgid "git remote remove <name>"
msgstr ""
-#: builtin/remote.c:18 builtin/remote.c:46
+#: builtin/remote.c:20 builtin/remote.c:48
msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
msgstr ""
-#: builtin/remote.c:19
+#: builtin/remote.c:21
msgid "git remote [-v | --verbose] show [-n] <name>"
msgstr ""
-#: builtin/remote.c:20
+#: builtin/remote.c:22
msgid "git remote prune [-n | --dry-run] <name>"
msgstr ""
-#: builtin/remote.c:21
+#: builtin/remote.c:23
msgid ""
"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
msgstr ""
-#: builtin/remote.c:22
+#: builtin/remote.c:24
msgid "git remote set-branches [--add] <name> <branch>..."
msgstr ""
-#: builtin/remote.c:23 builtin/remote.c:72
+#: builtin/remote.c:25 builtin/remote.c:74
msgid "git remote get-url [--push] [--all] <name>"
msgstr ""
-#: builtin/remote.c:24 builtin/remote.c:77
+#: builtin/remote.c:26 builtin/remote.c:79
msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
msgstr ""
-#: builtin/remote.c:25 builtin/remote.c:78
+#: builtin/remote.c:27 builtin/remote.c:80
msgid "git remote set-url --add <name> <newurl>"
msgstr ""
-#: builtin/remote.c:26 builtin/remote.c:79
+#: builtin/remote.c:28 builtin/remote.c:81
msgid "git remote set-url --delete <name> <url>"
msgstr ""
-#: builtin/remote.c:31
+#: builtin/remote.c:33
msgid "git remote add [<options>] <name> <url>"
msgstr ""
-#: builtin/remote.c:51
+#: builtin/remote.c:53
msgid "git remote set-branches <name> <branch>..."
msgstr ""
-#: builtin/remote.c:52
+#: builtin/remote.c:54
msgid "git remote set-branches --add <name> <branch>..."
msgstr ""
-#: builtin/remote.c:57
+#: builtin/remote.c:59
msgid "git remote show [<options>] <name>"
msgstr ""
-#: builtin/remote.c:62
+#: builtin/remote.c:64
msgid "git remote prune [<options>] <name>"
msgstr ""
-#: builtin/remote.c:67
+#: builtin/remote.c:69
msgid "git remote update [<options>] [<group> | <remote>]..."
msgstr ""
-#: builtin/remote.c:96
+#: builtin/remote.c:98
#, c-format
msgid "Updating %s"
msgstr ""
-#: builtin/remote.c:128
+#: builtin/remote.c:130
msgid ""
"--mirror is dangerous and deprecated; please\n"
"\t use --mirror=fetch or --mirror=push instead"
msgstr ""
-#: builtin/remote.c:145
+#: builtin/remote.c:147
#, c-format
msgid "unknown mirror argument: %s"
msgstr ""
-#: builtin/remote.c:161
+#: builtin/remote.c:163
msgid "fetch the remote branches"
msgstr ""
-#: builtin/remote.c:163
+#: builtin/remote.c:165
msgid "import all tags and associated objects when fetching"
msgstr ""
-#: builtin/remote.c:166
+#: builtin/remote.c:168
msgid "or do not fetch any tag at all (--no-tags)"
msgstr ""
-#: builtin/remote.c:168
+#: builtin/remote.c:170
msgid "branch(es) to track"
msgstr ""
-#: builtin/remote.c:169
+#: builtin/remote.c:171
msgid "master branch"
msgstr ""
-#: builtin/remote.c:170
-msgid "push|fetch"
-msgstr ""
-
-#: builtin/remote.c:171
+#: builtin/remote.c:173
msgid "set up remote as a mirror to push to or fetch from"
msgstr ""
-#: builtin/remote.c:183
+#: builtin/remote.c:185
msgid "specifying a master branch makes no sense with --mirror"
msgstr ""
-#: builtin/remote.c:185
+#: builtin/remote.c:187
msgid "specifying branches to track makes sense only with fetch mirrors"
msgstr ""
-#: builtin/remote.c:192 builtin/remote.c:634
+#: builtin/remote.c:194 builtin/remote.c:636
#, c-format
msgid "remote %s already exists."
msgstr ""
-#: builtin/remote.c:196 builtin/remote.c:638
+#: builtin/remote.c:198 builtin/remote.c:640
#, c-format
msgid "'%s' is not a valid remote name"
msgstr ""
-#: builtin/remote.c:236
+#: builtin/remote.c:238
#, c-format
msgid "Could not setup master '%s'"
msgstr ""
-#: builtin/remote.c:342
+#: builtin/remote.c:344
#, c-format
msgid "Could not get fetch map for refspec %s"
msgstr ""
-#: builtin/remote.c:441 builtin/remote.c:449
+#: builtin/remote.c:443 builtin/remote.c:451
msgid "(matching)"
msgstr ""
-#: builtin/remote.c:453
+#: builtin/remote.c:455
msgid "(delete)"
msgstr ""
-#: builtin/remote.c:627 builtin/remote.c:762 builtin/remote.c:861
+#: builtin/remote.c:629 builtin/remote.c:765 builtin/remote.c:864
#, c-format
-msgid "No such remote: %s"
+msgid "No such remote: '%s'"
msgstr ""
-#: builtin/remote.c:644
+#: builtin/remote.c:646
#, c-format
msgid "Could not rename config section '%s' to '%s'"
msgstr ""
-#: builtin/remote.c:664
+#: builtin/remote.c:666
#, c-format
msgid ""
"Not updating non-default fetch refspec\n"
"\tPlease update the configuration manually if necessary."
msgstr ""
-#: builtin/remote.c:700
+#: builtin/remote.c:702
#, c-format
msgid "deleting '%s' failed"
msgstr ""
-#: builtin/remote.c:734
+#: builtin/remote.c:736
#, c-format
msgid "creating '%s' failed"
msgstr ""
-#: builtin/remote.c:799
+#: builtin/remote.c:802
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
msgstr[0] ""
msgstr[1] ""
-#: builtin/remote.c:813
+#: builtin/remote.c:816
#, c-format
msgid "Could not remove config section '%s'"
msgstr ""
-#: builtin/remote.c:914
+#: builtin/remote.c:917
#, c-format
msgid " new (next fetch will store in remotes/%s)"
msgstr ""
-#: builtin/remote.c:917
+#: builtin/remote.c:920
msgid " tracked"
msgstr ""
-#: builtin/remote.c:919
+#: builtin/remote.c:922
msgid " stale (use 'git remote prune' to remove)"
msgstr ""
-#: builtin/remote.c:921
+#: builtin/remote.c:924
msgid " ???"
msgstr ""
-#: builtin/remote.c:962
+#: builtin/remote.c:965
#, c-format
msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
msgstr ""
-#: builtin/remote.c:971
+#: builtin/remote.c:974
#, c-format
msgid "rebases interactively onto remote %s"
msgstr ""
-#: builtin/remote.c:973
+#: builtin/remote.c:976
#, c-format
msgid "rebases interactively (with merges) onto remote %s"
msgstr ""
-#: builtin/remote.c:976
+#: builtin/remote.c:979
#, c-format
msgid "rebases onto remote %s"
msgstr ""
-#: builtin/remote.c:980
+#: builtin/remote.c:983
#, c-format
msgid " merges with remote %s"
msgstr ""
-#: builtin/remote.c:983
+#: builtin/remote.c:986
#, c-format
msgid "merges with remote %s"
msgstr ""
-#: builtin/remote.c:986
+#: builtin/remote.c:989
#, c-format
msgid "%-*s and with remote %s\n"
msgstr ""
-#: builtin/remote.c:1029
+#: builtin/remote.c:1032
msgid "create"
msgstr ""
-#: builtin/remote.c:1032
+#: builtin/remote.c:1035
msgid "delete"
msgstr ""
-#: builtin/remote.c:1036
+#: builtin/remote.c:1039
msgid "up to date"
msgstr ""
-#: builtin/remote.c:1039
+#: builtin/remote.c:1042
msgid "fast-forwardable"
msgstr ""
-#: builtin/remote.c:1042
+#: builtin/remote.c:1045
msgid "local out of date"
msgstr ""
-#: builtin/remote.c:1049
+#: builtin/remote.c:1052
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr ""
-#: builtin/remote.c:1052
+#: builtin/remote.c:1055
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr ""
-#: builtin/remote.c:1056
+#: builtin/remote.c:1059
#, c-format
msgid " %-*s forces to %s"
msgstr ""
-#: builtin/remote.c:1059
+#: builtin/remote.c:1062
#, c-format
msgid " %-*s pushes to %s"
msgstr ""
-#: builtin/remote.c:1127
+#: builtin/remote.c:1130
msgid "do not query remotes"
msgstr ""
-#: builtin/remote.c:1154
+#: builtin/remote.c:1157
#, c-format
msgid "* remote %s"
msgstr ""
-#: builtin/remote.c:1155
+#: builtin/remote.c:1158
#, c-format
msgid " Fetch URL: %s"
msgstr ""
-#: builtin/remote.c:1156 builtin/remote.c:1172 builtin/remote.c:1311
+#: builtin/remote.c:1159 builtin/remote.c:1175 builtin/remote.c:1314
msgid "(no URL)"
msgstr ""
#. with the one in " Fetch URL: %s"
#. translation.
#.
-#: builtin/remote.c:1170 builtin/remote.c:1172
+#: builtin/remote.c:1173 builtin/remote.c:1175
#, c-format
msgid " Push URL: %s"
msgstr ""
-#: builtin/remote.c:1174 builtin/remote.c:1176 builtin/remote.c:1178
+#: builtin/remote.c:1177 builtin/remote.c:1179 builtin/remote.c:1181
#, c-format
msgid " HEAD branch: %s"
msgstr ""
-#: builtin/remote.c:1174
+#: builtin/remote.c:1177
msgid "(not queried)"
msgstr ""
-#: builtin/remote.c:1176
+#: builtin/remote.c:1179
msgid "(unknown)"
msgstr ""
-#: builtin/remote.c:1180
+#: builtin/remote.c:1183
#, c-format
msgid ""
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
msgstr ""
-#: builtin/remote.c:1192
+#: builtin/remote.c:1195
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
msgstr[0] ""
msgstr[1] ""
-#: builtin/remote.c:1195 builtin/remote.c:1221
+#: builtin/remote.c:1198 builtin/remote.c:1224
msgid " (status not queried)"
msgstr ""
-#: builtin/remote.c:1204
+#: 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:1212
+#: builtin/remote.c:1215
msgid " Local refs will be mirrored by 'git push'"
msgstr ""
-#: builtin/remote.c:1218
+#: 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:1239
+#: builtin/remote.c:1242
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr ""
-#: builtin/remote.c:1241
+#: builtin/remote.c:1244
msgid "delete refs/remotes/<name>/HEAD"
msgstr ""
-#: builtin/remote.c:1256
+#: builtin/remote.c:1259
msgid "Cannot determine remote HEAD"
msgstr ""
-#: builtin/remote.c:1258
+#: builtin/remote.c:1261
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr ""
-#: builtin/remote.c:1268
+#: builtin/remote.c:1271
#, c-format
msgid "Could not delete %s"
msgstr ""
-#: builtin/remote.c:1276
+#: builtin/remote.c:1279
#, c-format
msgid "Not a valid ref: %s"
msgstr ""
-#: builtin/remote.c:1278
+#: builtin/remote.c:1281
#, c-format
msgid "Could not setup %s"
msgstr ""
-#: builtin/remote.c:1296
+#: builtin/remote.c:1299
#, c-format
msgid " %s will become dangling!"
msgstr ""
-#: builtin/remote.c:1297
+#: builtin/remote.c:1300
#, c-format
msgid " %s has become dangling!"
msgstr ""
-#: builtin/remote.c:1307
+#: builtin/remote.c:1310
#, c-format
msgid "Pruning %s"
msgstr ""
-#: builtin/remote.c:1308
+#: builtin/remote.c:1311
#, c-format
msgid "URL: %s"
msgstr ""
-#: builtin/remote.c:1324
+#: builtin/remote.c:1327
#, c-format
msgid " * [would prune] %s"
msgstr ""
-#: builtin/remote.c:1327
+#: builtin/remote.c:1330
#, c-format
msgid " * [pruned] %s"
msgstr ""
-#: builtin/remote.c:1372
+#: builtin/remote.c:1375
msgid "prune remotes after fetching"
msgstr ""
-#: builtin/remote.c:1435 builtin/remote.c:1489 builtin/remote.c:1557
+#: builtin/remote.c:1438 builtin/remote.c:1492 builtin/remote.c:1560
#, c-format
msgid "No such remote '%s'"
msgstr ""
-#: builtin/remote.c:1451
+#: builtin/remote.c:1454
msgid "add branch"
msgstr ""
-#: builtin/remote.c:1458
+#: builtin/remote.c:1461
msgid "no remote specified"
msgstr ""
-#: builtin/remote.c:1475
+#: builtin/remote.c:1478
msgid "query push URLs rather than fetch URLs"
msgstr ""
-#: builtin/remote.c:1477
+#: builtin/remote.c:1480
msgid "return all URLs"
msgstr ""
-#: builtin/remote.c:1505
+#: builtin/remote.c:1508
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr ""
-#: builtin/remote.c:1531
+#: builtin/remote.c:1534
msgid "manipulate push URLs"
msgstr ""
-#: builtin/remote.c:1533
+#: builtin/remote.c:1536
msgid "add URL"
msgstr ""
-#: builtin/remote.c:1535
+#: builtin/remote.c:1538
msgid "delete URLs"
msgstr ""
-#: builtin/remote.c:1542
+#: builtin/remote.c:1545
msgid "--add --delete doesn't make sense"
msgstr ""
-#: builtin/remote.c:1581
+#: builtin/remote.c:1584
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr ""
-#: builtin/remote.c:1589
+#: builtin/remote.c:1592
#, c-format
msgid "No such URL found: %s"
msgstr ""
-#: builtin/remote.c:1591
+#: builtin/remote.c:1594
msgid "Will not delete all non-push URLs"
msgstr ""
-#: builtin/remote.c:1607
+#: builtin/remote.c:1610
msgid "be verbose; must be placed before a subcommand"
msgstr ""
-#: builtin/remote.c:1638
+#: builtin/remote.c:1641
#, c-format
msgid "Unknown subcommand: %s"
msgstr ""
-#: builtin/repack.c:18
+#: builtin/repack.c:22
msgid "git repack [<options>]"
msgstr ""
-#: builtin/repack.c:23
+#: 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:180
+#: 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:182
+#: builtin/repack.c:296
msgid "same as -a, and turn unreachable objects loose"
msgstr ""
-#: builtin/repack.c:185
+#: builtin/repack.c:299
msgid "remove redundant packs, and run git-prune-packed"
msgstr ""
-#: builtin/repack.c:187
+#: builtin/repack.c:301
msgid "pass --no-reuse-delta to git-pack-objects"
msgstr ""
-#: builtin/repack.c:189
+#: builtin/repack.c:303
msgid "pass --no-reuse-object to git-pack-objects"
msgstr ""
-#: builtin/repack.c:191
+#: builtin/repack.c:305
msgid "do not run git-update-server-info"
msgstr ""
-#: builtin/repack.c:194
+#: builtin/repack.c:308
msgid "pass --local to git-pack-objects"
msgstr ""
-#: builtin/repack.c:196
+#: builtin/repack.c:310
msgid "write bitmap index"
msgstr ""
-#: builtin/repack.c:197
+#: builtin/repack.c:312
+msgid "pass --delta-islands to git-pack-objects"
+msgstr ""
+
+#: builtin/repack.c:313
msgid "approxidate"
msgstr ""
-#: builtin/repack.c:198
+#: builtin/repack.c:314
msgid "with -A, do not loosen objects older than this"
msgstr ""
-#: builtin/repack.c:200
+#: builtin/repack.c:316
msgid "with -a, repack unreachable objects"
msgstr ""
-#: builtin/repack.c:202
+#: builtin/repack.c:318
msgid "size of the window used for delta compression"
msgstr ""
-#: builtin/repack.c:203 builtin/repack.c:209
+#: builtin/repack.c:319 builtin/repack.c:325
msgid "bytes"
msgstr ""
-#: builtin/repack.c:204
+#: builtin/repack.c:320
msgid "same as the above, but limit memory size instead of entries count"
msgstr ""
-#: builtin/repack.c:206
+#: builtin/repack.c:322
msgid "limits the maximum delta depth"
msgstr ""
-#: builtin/repack.c:208
+#: builtin/repack.c:324
msgid "limits the maximum number of threads"
msgstr ""
-#: builtin/repack.c:210
+#: builtin/repack.c:326
msgid "maximum size of each packfile"
msgstr ""
-#: builtin/repack.c:212
+#: builtin/repack.c:328
msgid "repack objects in packs marked with .keep"
msgstr ""
-#: builtin/repack.c:214
+#: builtin/repack.c:330
msgid "do not repack this pack"
msgstr ""
-#: builtin/repack.c:224
+#: builtin/repack.c:340
msgid "cannot delete packs in a precious-objects repo"
msgstr ""
-#: builtin/repack.c:228
+#: builtin/repack.c:344
msgid "--keep-unreachable and -A are incompatible"
msgstr ""
-#: builtin/repack.c:425 builtin/worktree.c:139
+#: 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 ""
msgid "git replace [--format=<format>] [-l [<pattern>]]"
msgstr ""
-#: builtin/replace.c:371 builtin/replace.c:415 builtin/replace.c:445
+#: 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 "Not a valid object name: '%s'"
+msgid "could not parse %s as a commit"
msgstr ""
-#: builtin/replace.c:407
+#: builtin/replace.c:414
#, c-format
msgid "bad mergetag in commit '%s'"
msgstr ""
-#: builtin/replace.c:409
+#: builtin/replace.c:416
#, c-format
msgid "malformed mergetag in commit '%s'"
msgstr ""
-#: builtin/replace.c:421
+#: 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:460
+#: builtin/replace.c:467
#, c-format
-msgid "the original commit '%s' has a gpg signature."
+msgid "the original commit '%s' has a gpg signature"
msgstr ""
-#: builtin/replace.c:461
+#: builtin/replace.c:468
msgid "the signature will be removed in the replacement commit!"
msgstr ""
-#: builtin/replace.c:471
+#: builtin/replace.c:478
#, c-format
msgid "could not write replacement commit for: '%s'"
msgstr ""
-#: builtin/replace.c:514
+#: 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:535
+#: builtin/replace.c:546
msgid "list replace refs"
msgstr ""
-#: builtin/replace.c:536
+#: builtin/replace.c:547
msgid "delete replace refs"
msgstr ""
-#: builtin/replace.c:537
+#: builtin/replace.c:548
msgid "edit existing object"
msgstr ""
-#: builtin/replace.c:538
+#: builtin/replace.c:549
msgid "change a commit's parents"
msgstr ""
-#: builtin/replace.c:539
+#: builtin/replace.c:550
msgid "convert existing graft file"
msgstr ""
-#: builtin/replace.c:540
+#: builtin/replace.c:551
msgid "replace the ref if it exists"
msgstr ""
-#: builtin/replace.c:542
+#: builtin/replace.c:553
msgid "do not pretty-print contents for --edit"
msgstr ""
-#: builtin/replace.c:543
+#: 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:59
+#: builtin/rerere.c:60
msgid "register clean resolutions in index"
msgstr ""
-#: builtin/reset.c:29
+#: 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:30
+#: builtin/reset.c:33
msgid "git reset [-q] [<tree-ish>] [--] <paths>..."
msgstr ""
-#: builtin/reset.c:31
+#: builtin/reset.c:34
msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
msgstr ""
-#: builtin/reset.c:37
+#: builtin/reset.c:40
msgid "mixed"
msgstr ""
-#: builtin/reset.c:37
+#: builtin/reset.c:40
msgid "soft"
msgstr ""
-#: builtin/reset.c:37
+#: builtin/reset.c:40
msgid "hard"
msgstr ""
-#: builtin/reset.c:37
+#: builtin/reset.c:40
msgid "merge"
msgstr ""
-#: builtin/reset.c:37
+#: builtin/reset.c:40
msgid "keep"
msgstr ""
-#: builtin/reset.c:78
+#: builtin/reset.c:81
msgid "You do not have a valid HEAD."
msgstr ""
-#: builtin/reset.c:80
+#: builtin/reset.c:83
msgid "Failed to find tree of HEAD."
msgstr ""
-#: builtin/reset.c:86
+#: builtin/reset.c:89
#, c-format
msgid "Failed to find tree of %s."
msgstr ""
-#: builtin/reset.c:111
-#, c-format
-msgid "HEAD is now at %s"
-msgstr ""
-
-#: builtin/reset.c:189
+#: builtin/reset.c:193
#, c-format
msgid "Cannot do a %s reset in the middle of a merge."
msgstr ""
-#: builtin/reset.c:289
+#: 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:291
+#: builtin/reset.c:295
msgid "reset HEAD and index"
msgstr ""
-#: builtin/reset.c:292
+#: builtin/reset.c:296
msgid "reset only HEAD"
msgstr ""
-#: builtin/reset.c:294 builtin/reset.c:296
+#: builtin/reset.c:298 builtin/reset.c:300
msgid "reset HEAD, index and working tree"
msgstr ""
-#: builtin/reset.c:298
+#: builtin/reset.c:302
msgid "reset HEAD but keep local changes"
msgstr ""
-#: builtin/reset.c:304
+#: builtin/reset.c:308
msgid "record only the fact that removed paths will be added later"
msgstr ""
-#: builtin/reset.c:321
+#: builtin/reset.c:326
#, c-format
msgid "Failed to resolve '%s' as a valid revision."
msgstr ""
-#: builtin/reset.c:329
+#: builtin/reset.c:334
#, c-format
msgid "Failed to resolve '%s' as a valid tree."
msgstr ""
-#: builtin/reset.c:338
+#: builtin/reset.c:343
msgid "--patch is incompatible with --{hard,mixed,soft}"
msgstr ""
-#: builtin/reset.c:347
+#: builtin/reset.c:353
msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
msgstr ""
-#: builtin/reset.c:349
+#: builtin/reset.c:355
#, c-format
msgid "Cannot do %s reset with paths."
msgstr ""
-#: builtin/reset.c:359
+#: builtin/reset.c:370
#, c-format
msgid "%s reset is not allowed in a bare repository"
msgstr ""
-#: builtin/reset.c:363
+#: builtin/reset.c:374
msgid "-N can only be used with --mixed"
msgstr ""
-#: builtin/reset.c:380
+#: builtin/reset.c:395
msgid "Unstaged changes after reset:"
msgstr ""
-#: builtin/reset.c:386
+#: 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:390
+#: builtin/reset.c:412
msgid "Could not write new index file."
msgstr ""
-#: builtin/rev-list.c:397
+#: builtin/rev-list.c:405
msgid "cannot combine --exclude-promisor-objects and --missing"
msgstr ""
-#: builtin/rev-list.c:455
+#: builtin/rev-list.c:466
msgid "object filtering requires --objects"
msgstr ""
-#: builtin/rev-list.c:458
+#: builtin/rev-list.c:469
#, c-format
msgid "invalid sparse value '%s'"
msgstr ""
-#: builtin/rev-list.c:499
+#: builtin/rev-list.c:510
msgid "rev-list does not support display of notes"
msgstr ""
-#: builtin/rev-list.c:502
+#: builtin/rev-list.c:513
msgid "cannot combine --use-bitmap-index with object filtering"
msgstr ""
-#: builtin/rev-parse.c:406
+#: builtin/rev-parse.c:408
msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
msgstr ""
-#: builtin/rev-parse.c:411
+#: builtin/rev-parse.c:413
msgid "keep the `--` passed as an arg"
msgstr ""
-#: builtin/rev-parse.c:413
+#: builtin/rev-parse.c:415
msgid "stop parsing after the first non-option argument"
msgstr ""
-#: builtin/rev-parse.c:416
+#: builtin/rev-parse.c:418
msgid "output in stuck long form"
msgstr ""
-#: builtin/rev-parse.c:549
+#: builtin/rev-parse.c:551
msgid ""
"git rev-parse --parseopt [<options>] -- [<args>...]\n"
" or: git rev-parse --sq-quote [<arg>...]\n"
"Run \"git rev-parse --parseopt -h\" for more information on the first usage."
msgstr ""
-#: builtin/revert.c:23
+#: builtin/revert.c:24
msgid "git revert [<options>] <commit-ish>..."
msgstr ""
-#: builtin/revert.c:24
+#: builtin/revert.c:25
msgid "git revert <subcommand>"
msgstr ""
-#: builtin/revert.c:29
+#: builtin/revert.c:30
msgid "git cherry-pick [<options>] <commit-ish>..."
msgstr ""
-#: builtin/revert.c:30
+#: builtin/revert.c:31
msgid "git cherry-pick <subcommand>"
msgstr ""
-#: builtin/revert.c:90
+#: 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:99
+#: builtin/revert.c:102
msgid "end revert or cherry-pick sequence"
msgstr ""
-#: builtin/revert.c:100
+#: builtin/revert.c:103
msgid "resume revert or cherry-pick sequence"
msgstr ""
-#: builtin/revert.c:101
+#: builtin/revert.c:104
msgid "cancel revert or cherry-pick sequence"
msgstr ""
-#: builtin/revert.c:102
+#: builtin/revert.c:106
msgid "don't automatically commit"
msgstr ""
-#: builtin/revert.c:103
+#: builtin/revert.c:107
msgid "edit the commit message"
msgstr ""
-#: builtin/revert.c:106
+#: builtin/revert.c:110
msgid "parent-number"
msgstr ""
-#: builtin/revert.c:107
+#: builtin/revert.c:111
msgid "select mainline parent"
msgstr ""
-#: builtin/revert.c:109
+#: builtin/revert.c:113
msgid "merge strategy"
msgstr ""
-#: builtin/revert.c:110
-msgid "option"
-msgstr ""
-
-#: builtin/revert.c:111
+#: builtin/revert.c:115
msgid "option for merge strategy"
msgstr ""
-#: builtin/revert.c:120
+#: builtin/revert.c:124
msgid "append commit name"
msgstr ""
-#: builtin/revert.c:122
+#: builtin/revert.c:126
msgid "preserve initially empty commits"
msgstr ""
-#: builtin/revert.c:124
+#: builtin/revert.c:128
msgid "keep redundant, empty commits"
msgstr ""
-#: builtin/revert.c:214
+#: builtin/revert.c:227
msgid "revert failed"
msgstr ""
-#: builtin/revert.c:227
+#: builtin/revert.c:240
msgid "cherry-pick failed"
msgstr ""
-#: builtin/rm.c:18
+#: builtin/rm.c:19
msgid "git rm [<options>] [--] <file>..."
msgstr ""
-#: builtin/rm.c:206
+#: builtin/rm.c:207
msgid ""
"the following file has staged content different from both the\n"
"file and the HEAD:"
msgstr[0] ""
msgstr[1] ""
-#: builtin/rm.c:211
+#: builtin/rm.c:212
msgid ""
"\n"
"(use -f to force removal)"
msgstr ""
-#: builtin/rm.c:215
+#: 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:219 builtin/rm.c:228
+#: builtin/rm.c:220 builtin/rm.c:229
msgid ""
"\n"
"(use --cached to keep the file, or -f to force removal)"
msgstr ""
-#: builtin/rm.c:225
+#: 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:241
+#: builtin/rm.c:242
msgid "do not list removed files"
msgstr ""
-#: builtin/rm.c:242
+#: builtin/rm.c:243
msgid "only remove from the index"
msgstr ""
-#: builtin/rm.c:243
+#: builtin/rm.c:244
msgid "override the up-to-date check"
msgstr ""
-#: builtin/rm.c:244
+#: builtin/rm.c:245
msgid "allow recursive removal"
msgstr ""
-#: builtin/rm.c:246
+#: builtin/rm.c:247
msgid "exit with a zero status even if nothing matched"
msgstr ""
-#: builtin/rm.c:306
-#, c-format
-msgid "not removing '%s' recursively without -r"
+#: builtin/rm.c:289
+msgid "please stage your changes to .gitmodules or stash them to proceed"
msgstr ""
-#: builtin/rm.c:345
+#: builtin/rm.c:307
#, c-format
-msgid "git rm: unable to remove %s"
+msgid "not removing '%s' recursively without -r"
msgstr ""
-#: builtin/rm.c:368
+#: builtin/rm.c:346
#, c-format
-msgid "could not remove '%s'"
+msgid "git rm: unable to remove %s"
msgstr ""
#: builtin/send-pack.c:20
msgid "print status from remote helper"
msgstr ""
-#: builtin/serve.c:7
-msgid "git serve [<options>]"
-msgstr ""
-
-#: builtin/serve.c:17 builtin/upload-pack.c:23
-msgid "quit after a single request/response exchange"
-msgstr ""
-
-#: builtin/serve.c:19
-msgid "exit immediately after advertising capabilities"
-msgstr ""
-
#: builtin/shortlog.c:14
msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]"
msgstr ""
msgstr ""
#: builtin/shortlog.c:271
-msgid "w[,i1[,i2]]"
+msgid "<w>[,<i1>[,<i2>]]"
msgstr ""
#: builtin/shortlog.c:272
msgid "Linewrap output"
msgstr ""
-#: builtin/shortlog.c:298
+#: builtin/shortlog.c:301
msgid "too many arguments given outside repository"
msgstr ""
-#: builtin/show-branch.c:12
+#: builtin/show-branch.c:13
msgid ""
"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
msgstr ""
-#: builtin/show-branch.c:16
+#: builtin/show-branch.c:17
msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
msgstr ""
-#: builtin/show-branch.c:376
+#: 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:530
+#: builtin/show-branch.c:549
#, c-format
msgid "no matching refs with %s"
msgstr ""
-#: builtin/show-branch.c:626
+#: builtin/show-branch.c:646
msgid "show remote-tracking and local branches"
msgstr ""
-#: builtin/show-branch.c:628
+#: builtin/show-branch.c:648
msgid "show remote-tracking branches"
msgstr ""
-#: builtin/show-branch.c:630
+#: builtin/show-branch.c:650
msgid "color '*!+-' corresponding to the branch"
msgstr ""
-#: builtin/show-branch.c:632
+#: builtin/show-branch.c:652
msgid "show <n> more commits after the common ancestor"
msgstr ""
-#: builtin/show-branch.c:634
+#: builtin/show-branch.c:654
msgid "synonym to more=-1"
msgstr ""
-#: builtin/show-branch.c:635
+#: builtin/show-branch.c:655
msgid "suppress naming strings"
msgstr ""
-#: builtin/show-branch.c:637
+#: builtin/show-branch.c:657
msgid "include the current branch"
msgstr ""
-#: builtin/show-branch.c:639
+#: builtin/show-branch.c:659
msgid "name commits with their object names"
msgstr ""
-#: builtin/show-branch.c:641
+#: builtin/show-branch.c:661
msgid "show possible merge bases"
msgstr ""
-#: builtin/show-branch.c:643
+#: builtin/show-branch.c:663
msgid "show refs unreachable from any other ref"
msgstr ""
-#: builtin/show-branch.c:645
+#: builtin/show-branch.c:665
msgid "show commits in topological order"
msgstr ""
-#: builtin/show-branch.c:648
+#: builtin/show-branch.c:668
msgid "show only commits not on the first branch"
msgstr ""
-#: builtin/show-branch.c:650
+#: builtin/show-branch.c:670
msgid "show merges reachable from only one tip"
msgstr ""
-#: builtin/show-branch.c:652
+#: builtin/show-branch.c:672
msgid "topologically sort, maintaining date order where possible"
msgstr ""
-#: builtin/show-branch.c:655
+#: builtin/show-branch.c:675
msgid "<n>[,<base>]"
msgstr ""
-#: builtin/show-branch.c:656
+#: builtin/show-branch.c:676
msgid "show <n> most recent ref-log entries starting at base"
msgstr ""
-#: builtin/show-branch.c:690
+#: builtin/show-branch.c:712
msgid ""
"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
msgstr ""
-#: builtin/show-branch.c:714
+#: builtin/show-branch.c:736
msgid "no branches given, and HEAD is not valid"
msgstr ""
-#: builtin/show-branch.c:717
+#: builtin/show-branch.c:739
msgid "--reflog option needs one branch name"
msgstr ""
-#: builtin/show-branch.c:720
+#: 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:724
+#: builtin/show-branch.c:746
#, c-format
msgid "no such ref %s"
msgstr ""
-#: builtin/show-branch.c:808
+#: 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:812
+#: builtin/show-branch.c:836
#, c-format
msgid "'%s' is not a valid ref."
msgstr ""
-#: builtin/show-branch.c:815
+#: builtin/show-branch.c:839
#, c-format
msgid "cannot find commit %s (%s)"
msgstr ""
-#: builtin/show-ref.c:10
+#: 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:11
+#: builtin/show-ref.c:13
msgid "git show-ref --exclude-existing[=<pattern>]"
msgstr ""
-#: builtin/show-ref.c:159
+#: builtin/show-ref.c:162
msgid "only show tags (can be combined with heads)"
msgstr ""
-#: builtin/show-ref.c:160
+#: builtin/show-ref.c:163
msgid "only show heads (can be combined with tags)"
msgstr ""
-#: builtin/show-ref.c:161
+#: builtin/show-ref.c:164
msgid "stricter reference checking, requires exact ref path"
msgstr ""
-#: builtin/show-ref.c:164 builtin/show-ref.c:166
+#: 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:168
+#: builtin/show-ref.c:171
msgid "dereference tags into object IDs"
msgstr ""
-#: builtin/show-ref.c:170
+#: builtin/show-ref.c:173
msgid "only show SHA1 hash using <n> digits"
msgstr ""
-#: builtin/show-ref.c:174
+#: builtin/show-ref.c:177
msgid "do not print results to stdout (useful with --verify)"
msgstr ""
-#: builtin/show-ref.c:176
+#: builtin/show-ref.c:179
msgid "show refs from stdin that aren't in local repository"
msgstr ""
+#: builtin/stash.c:22 builtin/stash.c:37
+msgid "git stash list [<options>]"
+msgstr ""
+
+#: builtin/stash.c:23 builtin/stash.c:42
+msgid "git stash show [<options>] [<stash>]"
+msgstr ""
+
+#: builtin/stash.c:24 builtin/stash.c:47
+msgid "git stash drop [-q|--quiet] [<stash>]"
+msgstr ""
+
+#: builtin/stash.c:25
+msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
+msgstr ""
+
+#: builtin/stash.c:26 builtin/stash.c:62
+msgid "git stash branch <branchname> [<stash>]"
+msgstr ""
+
+#: builtin/stash.c:27 builtin/stash.c:67
+msgid "git stash clear"
+msgstr ""
+
+#: builtin/stash.c:28 builtin/stash.c:77
+msgid ""
+"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
+" [--] [<pathspec>...]]"
+msgstr ""
+
+#: builtin/stash.c:31 builtin/stash.c:84
+msgid ""
+"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+" [-u|--include-untracked] [-a|--all] [<message>]"
+msgstr ""
+
+#: builtin/stash.c:52
+msgid "git stash pop [--index] [-q|--quiet] [<stash>]"
+msgstr ""
+
+#: builtin/stash.c:57
+msgid "git stash apply [--index] [-q|--quiet] [<stash>]"
+msgstr ""
+
+#: builtin/stash.c:72
+msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>"
+msgstr ""
+
+#: builtin/stash.c:127
+#, c-format
+msgid "'%s' is not a stash-like commit"
+msgstr ""
+
+#: builtin/stash.c:147
+#, c-format
+msgid "Too many revisions specified:%s"
+msgstr ""
+
+#: builtin/stash.c:161 git-legacy-stash.sh:548
+msgid "No stash entries found."
+msgstr ""
+
+#: builtin/stash.c:175
+#, c-format
+msgid "%s is not a valid reference"
+msgstr ""
+
+#: builtin/stash.c:224 git-legacy-stash.sh:75
+msgid "git stash clear with parameters is unimplemented"
+msgstr ""
+
+#: builtin/stash.c:403
+msgid "cannot apply a stash in the middle of a merge"
+msgstr ""
+
+#: builtin/stash.c:414
+#, c-format
+msgid "could not generate diff %s^!."
+msgstr ""
+
+#: builtin/stash.c:421
+msgid "conflicts in index.Try without --index."
+msgstr ""
+
+#: builtin/stash.c:427
+msgid "could not save index tree"
+msgstr ""
+
+#: builtin/stash.c:434
+msgid "could not restore untracked files from stash"
+msgstr ""
+
+#: builtin/stash.c:448
+#, c-format
+msgid "Merging %s with %s"
+msgstr ""
+
+#: builtin/stash.c:458 git-legacy-stash.sh:680
+msgid "Index was not unstashed."
+msgstr ""
+
+#: builtin/stash.c:516 builtin/stash.c:615
+msgid "attempt to recreate the index"
+msgstr ""
+
+#: builtin/stash.c:549
+#, c-format
+msgid "Dropped %s (%s)"
+msgstr ""
+
+#: builtin/stash.c:552
+#, c-format
+msgid "%s: Could not drop stash entry"
+msgstr ""
+
+#: builtin/stash.c:577
+#, c-format
+msgid "'%s' is not a stash reference"
+msgstr ""
+
+#: builtin/stash.c:627 git-legacy-stash.sh:694
+msgid "The stash entry is kept in case you need it again."
+msgstr ""
+
+#: builtin/stash.c:650 git-legacy-stash.sh:712
+msgid "No branch name specified"
+msgstr ""
+
+#: builtin/stash.c:789 builtin/stash.c:826
+#, c-format
+msgid "Cannot update %s with %s"
+msgstr ""
+
+#: builtin/stash.c:807 builtin/stash.c:1474 builtin/stash.c:1510
+msgid "stash message"
+msgstr ""
+
+#: builtin/stash.c:817
+msgid "\"git stash store\" requires one <commit> argument"
+msgstr ""
+
+#: builtin/stash.c:1039 git-legacy-stash.sh:217
+msgid "No changes selected"
+msgstr ""
+
+#: builtin/stash.c:1135 git-legacy-stash.sh:150
+msgid "You do not have the initial commit yet"
+msgstr ""
+
+#: builtin/stash.c:1162 git-legacy-stash.sh:165
+msgid "Cannot save the current index state"
+msgstr ""
+
+#: builtin/stash.c:1171 git-legacy-stash.sh:180
+msgid "Cannot save the untracked files"
+msgstr ""
+
+#: 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/stash.c:1219 git-legacy-stash.sh:233
+msgid "Cannot record working tree state"
+msgstr ""
+
+#: 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/stash.c:1284
+msgid "Did you forget to 'git add'?"
+msgstr ""
+
+#: builtin/stash.c:1299 git-legacy-stash.sh:345
+msgid "No local changes to save"
+msgstr ""
+
+#: builtin/stash.c:1306 git-legacy-stash.sh:350
+msgid "Cannot initialize stash"
+msgstr ""
+
+#: builtin/stash.c:1321 git-legacy-stash.sh:354
+msgid "Cannot save the current status"
+msgstr ""
+
+#: builtin/stash.c:1326
+#, c-format
+msgid "Saved working directory and index state %s"
+msgstr ""
+
+#: builtin/stash.c:1430 git-legacy-stash.sh:384
+msgid "Cannot remove worktree changes"
+msgstr ""
+
+#: builtin/stash.c:1465 builtin/stash.c:1501
+msgid "keep index"
+msgstr ""
+
+#: builtin/stash.c:1467 builtin/stash.c:1503
+msgid "stash in patch mode"
+msgstr ""
+
+#: builtin/stash.c:1468 builtin/stash.c:1504
+msgid "quiet mode"
+msgstr ""
+
+#: builtin/stash.c:1470 builtin/stash.c:1506
+msgid "include untracked files in stash"
+msgstr ""
+
+#: builtin/stash.c:1472 builtin/stash.c:1508
+msgid "include ignore files"
+msgstr ""
+
+#: builtin/stash.c:1568
+#, c-format
+msgid "could not exec %s"
+msgstr ""
+
#: builtin/stripspace.c:18
msgid "git stripspace [-s | --strip-comments]"
msgstr ""
msgid "git stripspace [-c | --comment-lines]"
msgstr ""
-#: builtin/stripspace.c:36
+#: builtin/stripspace.c:37
msgid "skip and remove all lines starting with comment character"
msgstr ""
-#: builtin/stripspace.c:39
+#: builtin/stripspace.c:40
msgid "prepend comment character and space to each line"
msgstr ""
-#: builtin/submodule--helper.c:37 builtin/submodule--helper.c:1688
-#, c-format
-msgid "No such ref: %s"
-msgstr ""
-
-#: builtin/submodule--helper.c:44 builtin/submodule--helper.c:1697
+#: builtin/submodule--helper.c:45 builtin/submodule--helper.c:1942
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr ""
-#: builtin/submodule--helper.c:61
+#: builtin/submodule--helper.c:62
msgid "submodule--helper print-default-remote takes no arguments"
msgstr ""
-#: builtin/submodule--helper.c:98
+#: builtin/submodule--helper.c:100
#, c-format
msgid "cannot strip one component off url '%s'"
msgstr ""
-#: builtin/submodule--helper.c:406 builtin/submodule--helper.c:1211
+#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1367
msgid "alternative anchor for relative paths"
msgstr ""
-#: builtin/submodule--helper.c:411
+#: builtin/submodule--helper.c:413
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr ""
-#: builtin/submodule--helper.c:462 builtin/submodule--helper.c:485
+#: 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/submodule--helper.c:500
+#: builtin/submodule--helper.c:522
+#, c-format
+msgid "Entering '%s'\n"
+msgstr ""
+
+#: builtin/submodule--helper.c:525
+#, c-format
+msgid ""
+"run_command returned non-zero status for %s\n"
+"."
+msgstr ""
+
+#: builtin/submodule--helper.c:546
#, c-format
msgid ""
-"could not lookup configuration '%s'. Assuming this repository is its own "
+"run_command returned non-zero status while recursing in the nested "
+"submodules of %s\n"
+"."
+msgstr ""
+
+#: builtin/submodule--helper.c:562
+msgid "Suppress output of entering each submodule command"
+msgstr ""
+
+#: builtin/submodule--helper.c:564 builtin/submodule--helper.c:1049
+msgid "Recurse into nested submodules"
+msgstr ""
+
+#: builtin/submodule--helper.c:569
+msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
+msgstr ""
+
+#: builtin/submodule--helper.c:596
+#, c-format
+msgid ""
+"could not look up configuration '%s'. Assuming this repository is its own "
"authoritative upstream."
msgstr ""
-#: builtin/submodule--helper.c:511
+#: builtin/submodule--helper.c:664
#, c-format
msgid "Failed to register url for submodule path '%s'"
msgstr ""
-#: builtin/submodule--helper.c:515
+#: builtin/submodule--helper.c:668
#, c-format
msgid "Submodule '%s' (%s) registered for path '%s'\n"
msgstr ""
-#: builtin/submodule--helper.c:525
+#: builtin/submodule--helper.c:678
#, c-format
msgid "warning: command update mode suggested for submodule '%s'\n"
msgstr ""
-#: builtin/submodule--helper.c:532
+#: builtin/submodule--helper.c:685
#, c-format
msgid "Failed to register update mode for submodule path '%s'"
msgstr ""
-#: builtin/submodule--helper.c:554
+#: builtin/submodule--helper.c:707
msgid "Suppress output for initializing a submodule"
msgstr ""
-#: builtin/submodule--helper.c:559
-msgid "git submodule--helper init [<path>]"
+#: builtin/submodule--helper.c:712
+msgid "git submodule--helper init [<options>] [<path>]"
msgstr ""
-#: builtin/submodule--helper.c:631 builtin/submodule--helper.c:757
+#: builtin/submodule--helper.c:784 builtin/submodule--helper.c:910
#, c-format
msgid "no submodule mapping found in .gitmodules for path '%s'"
msgstr ""
-#: builtin/submodule--helper.c:670
+#: builtin/submodule--helper.c:823
#, c-format
msgid "could not resolve HEAD ref inside the submodule '%s'"
msgstr ""
-#: builtin/submodule--helper.c:697 builtin/submodule--helper.c:866
+#: builtin/submodule--helper.c:850 builtin/submodule--helper.c:1019
#, c-format
msgid "failed to recurse into submodule '%s'"
msgstr ""
-#: builtin/submodule--helper.c:721 builtin/submodule--helper.c:1031
+#: builtin/submodule--helper.c:874 builtin/submodule--helper.c:1185
msgid "Suppress submodule status output"
msgstr ""
-#: builtin/submodule--helper.c:722
+#: builtin/submodule--helper.c:875
msgid ""
"Use commit stored in the index instead of the one stored in the submodule "
"HEAD"
msgstr ""
-#: builtin/submodule--helper.c:723
+#: builtin/submodule--helper.c:876
msgid "recurse into nested submodules"
msgstr ""
-#: builtin/submodule--helper.c:728
+#: builtin/submodule--helper.c:881
msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
msgstr ""
-#: builtin/submodule--helper.c:752
+#: builtin/submodule--helper.c:905
msgid "git submodule--helper name <path>"
msgstr ""
-#: builtin/submodule--helper.c:816
+#: builtin/submodule--helper.c:969
#, c-format
msgid "Synchronizing submodule url for '%s'\n"
msgstr ""
-#: builtin/submodule--helper.c:822
+#: builtin/submodule--helper.c:975
#, c-format
msgid "failed to register url for submodule path '%s'"
msgstr ""
-#: builtin/submodule--helper.c:836
+#: builtin/submodule--helper.c:989
#, c-format
msgid "failed to get the default remote for submodule '%s'"
msgstr ""
-#: builtin/submodule--helper.c:847
+#: builtin/submodule--helper.c:1000
#, c-format
msgid "failed to update remote for submodule '%s'"
msgstr ""
-#: builtin/submodule--helper.c:895
-msgid "Suppress output of synchronizing submodule url"
-msgstr ""
-
-#: builtin/submodule--helper.c:897
-msgid "Recurse into nested submodules"
+#: builtin/submodule--helper.c:1047
+msgid "Suppress output of synchronizing submodule url"
msgstr ""
-#: builtin/submodule--helper.c:902
+#: builtin/submodule--helper.c:1054
msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
msgstr ""
-#: builtin/submodule--helper.c:956
+#: 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/submodule--helper.c:968
+#: builtin/submodule--helper.c:1120
#, c-format
msgid ""
"Submodule work tree '%s' contains local modifications; use '-f' to discard "
"them"
msgstr ""
-#: builtin/submodule--helper.c:976
+#: builtin/submodule--helper.c:1128
#, c-format
msgid "Cleared directory '%s'\n"
msgstr ""
-#: builtin/submodule--helper.c:978
+#: builtin/submodule--helper.c:1130
#, c-format
msgid "Could not remove submodule work tree '%s'\n"
msgstr ""
-#: builtin/submodule--helper.c:987
+#: builtin/submodule--helper.c:1141
#, c-format
msgid "could not create empty submodule directory %s"
msgstr ""
-#: builtin/submodule--helper.c:1003
+#: builtin/submodule--helper.c:1157
#, c-format
msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
msgstr ""
-#: builtin/submodule--helper.c:1032
+#: builtin/submodule--helper.c:1186
msgid "Remove submodule working trees even if they contain local changes"
msgstr ""
-#: builtin/submodule--helper.c:1033
+#: builtin/submodule--helper.c:1187
msgid "Unregister all submodules"
msgstr ""
-#: builtin/submodule--helper.c:1038
+#: builtin/submodule--helper.c:1192
msgid ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
msgstr ""
-#: builtin/submodule--helper.c:1052
+#: builtin/submodule--helper.c:1206
msgid "Use '--all' if you really want to deinitialize all submodules"
msgstr ""
-#: builtin/submodule--helper.c:1145 builtin/submodule--helper.c:1148
+#: builtin/submodule--helper.c:1301 builtin/submodule--helper.c:1304
#, c-format
msgid "submodule '%s' cannot add alternate: %s"
msgstr ""
-#: builtin/submodule--helper.c:1184
+#: builtin/submodule--helper.c:1340
#, c-format
msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
msgstr ""
-#: builtin/submodule--helper.c:1191
+#: builtin/submodule--helper.c:1347
#, c-format
msgid "Value '%s' for submodule.alternateLocation is not recognized"
msgstr ""
-#: builtin/submodule--helper.c:1214
+#: builtin/submodule--helper.c:1370
msgid "where the new submodule will be cloned to"
msgstr ""
-#: builtin/submodule--helper.c:1217
+#: builtin/submodule--helper.c:1373
msgid "name of the new submodule"
msgstr ""
-#: builtin/submodule--helper.c:1220
+#: builtin/submodule--helper.c:1376
msgid "url where to clone the submodule from"
msgstr ""
-#: builtin/submodule--helper.c:1228
+#: builtin/submodule--helper.c:1384
msgid "depth for shallow clones"
msgstr ""
-#: builtin/submodule--helper.c:1231 builtin/submodule--helper.c:1606
+#: builtin/submodule--helper.c:1387 builtin/submodule--helper.c:1871
msgid "force cloning progress"
msgstr ""
-#: builtin/submodule--helper.c:1236
+#: 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/submodule--helper.c:1267
+#: builtin/submodule--helper.c:1423
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr ""
-#: builtin/submodule--helper.c:1281
+#: builtin/submodule--helper.c:1437
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr ""
-#: builtin/submodule--helper.c:1347
+#: builtin/submodule--helper.c:1473
+#, c-format
+msgid "Invalid update mode '%s' for submodule path '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:1477
+#, c-format
+msgid "Invalid update mode '%s' configured for submodule path '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:1570
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr ""
-#: builtin/submodule--helper.c:1351
+#: builtin/submodule--helper.c:1574
msgid "Maybe you want to use 'update --init'?"
msgstr ""
-#: builtin/submodule--helper.c:1380
+#: builtin/submodule--helper.c:1604
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr ""
-#: builtin/submodule--helper.c:1409
+#: builtin/submodule--helper.c:1633
#, c-format
msgid "Skipping submodule '%s'"
msgstr ""
-#: builtin/submodule--helper.c:1544
+#: builtin/submodule--helper.c:1777
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr ""
-#: builtin/submodule--helper.c:1555
+#: builtin/submodule--helper.c:1788
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
msgstr ""
-#: builtin/submodule--helper.c:1585 builtin/submodule--helper.c:1808
+#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:2092
msgid "path into the working tree"
msgstr ""
-#: builtin/submodule--helper.c:1588
+#: builtin/submodule--helper.c:1853
msgid "path into the working tree, across nested submodule boundaries"
msgstr ""
-#: builtin/submodule--helper.c:1592
+#: builtin/submodule--helper.c:1857
msgid "rebase, merge, checkout or none"
msgstr ""
-#: builtin/submodule--helper.c:1598
+#: builtin/submodule--helper.c:1863
msgid "Create a shallow clone truncated to the specified number of revisions"
msgstr ""
-#: builtin/submodule--helper.c:1601
+#: builtin/submodule--helper.c:1866
msgid "parallel jobs"
msgstr ""
-#: builtin/submodule--helper.c:1603
+#: builtin/submodule--helper.c:1868
msgid "whether the initial clone should follow the shallow recommendation"
msgstr ""
-#: builtin/submodule--helper.c:1604
+#: builtin/submodule--helper.c:1869
msgid "don't print cloning progress"
msgstr ""
-#: builtin/submodule--helper.c:1611
+#: builtin/submodule--helper.c:1876
msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
msgstr ""
-#: builtin/submodule--helper.c:1624
+#: builtin/submodule--helper.c:1889
msgid "bad value for update parameter"
msgstr ""
-#: builtin/submodule--helper.c:1692
+#: builtin/submodule--helper.c:1937
#, c-format
msgid ""
"Submodule (%s) branch configured to inherit branch from superproject, but "
"the superproject is not on any branch"
msgstr ""
-#: builtin/submodule--helper.c:1809
+#: builtin/submodule--helper.c:2060
+#, c-format
+msgid "could not get a repository handle for submodule '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:2093
msgid "recurse into submodules"
msgstr ""
-#: builtin/submodule--helper.c:1815
-msgid "git submodule--helper embed-git-dir [<path>...]"
+#: builtin/submodule--helper.c:2099
+msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
+msgstr ""
+
+#: builtin/submodule--helper.c:2156
+msgid "check if it is safe to write to the .gitmodules file"
msgstr ""
-#: builtin/submodule--helper.c:1901
+#: builtin/submodule--helper.c:2159
+msgid "unset the config in the .gitmodules file"
+msgstr ""
+
+#: builtin/submodule--helper.c:2164
+msgid "git submodule--helper config <name> [<value>]"
+msgstr ""
+
+#: builtin/submodule--helper.c:2165
+msgid "git submodule--helper config --unset <name>"
+msgstr ""
+
+#: builtin/submodule--helper.c:2166
+msgid "git submodule--helper config --check-writeable"
+msgstr ""
+
+#: builtin/submodule--helper.c:2185 git-submodule.sh:171
+#, sh-format
+msgid "please make sure that the .gitmodules file is in the working tree"
+msgstr ""
+
+#: builtin/submodule--helper.c:2235 git.c:433 git.c:685
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr ""
-#: builtin/submodule--helper.c:1907
+#: builtin/submodule--helper.c:2241
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr ""
msgid "shorten ref output"
msgstr ""
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363
msgid "reason"
msgstr ""
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363
msgid "reason of the update"
msgstr ""
-#: builtin/tag.c:24
+#: builtin/tag.c:25
msgid ""
-"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
-"[<head>]"
+"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n"
+"\t\t<tagname> [<head>]"
msgstr ""
-#: builtin/tag.c:25
+#: builtin/tag.c:27
msgid "git tag -d <tagname>..."
msgstr ""
-#: builtin/tag.c:26
+#: builtin/tag.c:28
msgid ""
"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
"points-at <object>]\n"
"\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]"
msgstr ""
-#: builtin/tag.c:28
+#: builtin/tag.c:30
msgid "git tag -v [--format=<format>] <tagname>..."
msgstr ""
-#: builtin/tag.c:86
+#: builtin/tag.c:88
#, c-format
msgid "tag '%s' not found."
msgstr ""
-#: builtin/tag.c:102
+#: builtin/tag.c:104
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr ""
-#: builtin/tag.c:132
+#: builtin/tag.c:134
#, c-format
msgid ""
"\n"
"Lines starting with '%c' will be ignored.\n"
msgstr ""
-#: builtin/tag.c:136
+#: builtin/tag.c:138
#, c-format
msgid ""
"\n"
"want to.\n"
msgstr ""
-#: builtin/tag.c:190
+#: builtin/tag.c:192
msgid "unable to sign the tag"
msgstr ""
-#: builtin/tag.c:192
+#: builtin/tag.c:194
msgid "unable to write tag file"
msgstr ""
-#: builtin/tag.c:217
+#: builtin/tag.c:210
+#, c-format
+msgid ""
+"You have created a nested tag. The object referred to by your new tag is\n"
+"already a tag. If you meant to tag the object that it points to, use:\n"
+"\n"
+"\tgit tag -f %s %s^{}"
+msgstr ""
+
+#: builtin/tag.c:226
msgid "bad object type."
msgstr ""
-#: builtin/tag.c:266
+#: builtin/tag.c:278
msgid "no tag message?"
msgstr ""
-#: builtin/tag.c:273
+#: builtin/tag.c:285
#, c-format
msgid "The tag message has been left in %s\n"
msgstr ""
-#: builtin/tag.c:382
+#: builtin/tag.c:396
msgid "list tag names"
msgstr ""
-#: builtin/tag.c:384
+#: builtin/tag.c:398
msgid "print <n> lines of each tag message"
msgstr ""
-#: builtin/tag.c:386
+#: builtin/tag.c:400
msgid "delete tags"
msgstr ""
-#: builtin/tag.c:387
+#: builtin/tag.c:401
msgid "verify tags"
msgstr ""
-#: builtin/tag.c:389
+#: builtin/tag.c:403
msgid "Tag creation options"
msgstr ""
-#: builtin/tag.c:391
+#: builtin/tag.c:405
msgid "annotated tag, needs a message"
msgstr ""
-#: builtin/tag.c:393
+#: builtin/tag.c:407
msgid "tag message"
msgstr ""
-#: builtin/tag.c:395
+#: builtin/tag.c:409
msgid "force edit of tag message"
msgstr ""
-#: builtin/tag.c:396
+#: builtin/tag.c:410
msgid "annotated and GPG-signed tag"
msgstr ""
-#: builtin/tag.c:400
+#: builtin/tag.c:413
msgid "use another key to sign the tag"
msgstr ""
-#: builtin/tag.c:401
+#: builtin/tag.c:414
msgid "replace the tag if exists"
msgstr ""
-#: builtin/tag.c:402 builtin/update-ref.c:368
+#: builtin/tag.c:415 builtin/update-ref.c:369
msgid "create a reflog"
msgstr ""
-#: builtin/tag.c:404
+#: builtin/tag.c:417
msgid "Tag listing options"
msgstr ""
-#: builtin/tag.c:405
+#: builtin/tag.c:418
msgid "show tag list in columns"
msgstr ""
-#: builtin/tag.c:406 builtin/tag.c:408
+#: builtin/tag.c:419 builtin/tag.c:421
msgid "print only tags that contain the commit"
msgstr ""
-#: builtin/tag.c:407 builtin/tag.c:409
+#: builtin/tag.c:420 builtin/tag.c:422
msgid "print only tags that don't contain the commit"
msgstr ""
-#: builtin/tag.c:410
+#: builtin/tag.c:423
msgid "print only tags that are merged"
msgstr ""
-#: builtin/tag.c:411
+#: builtin/tag.c:424
msgid "print only tags that are not merged"
msgstr ""
-#: builtin/tag.c:416
+#: builtin/tag.c:428
msgid "print only tags of the object"
msgstr ""
-#: builtin/tag.c:460
+#: builtin/tag.c:472
msgid "--column and -n are incompatible"
msgstr ""
-#: builtin/tag.c:482
+#: builtin/tag.c:494
msgid "-n option is only allowed in list mode"
msgstr ""
-#: builtin/tag.c:484
+#: builtin/tag.c:496
msgid "--contains option is only allowed in list mode"
msgstr ""
-#: builtin/tag.c:486
+#: builtin/tag.c:498
msgid "--no-contains option is only allowed in list mode"
msgstr ""
-#: builtin/tag.c:488
+#: builtin/tag.c:500
msgid "--points-at option is only allowed in list mode"
msgstr ""
-#: builtin/tag.c:490
+#: builtin/tag.c:502
msgid "--merged and --no-merged options are only allowed in list mode"
msgstr ""
-#: builtin/tag.c:501
+#: builtin/tag.c:513
msgid "only one -F or -m option is allowed."
msgstr ""
-#: builtin/tag.c:520
+#: builtin/tag.c:532
msgid "too many params"
msgstr ""
-#: builtin/tag.c:526
+#: builtin/tag.c:538
#, c-format
msgid "'%s' is not a valid tag name."
msgstr ""
-#: builtin/tag.c:531
+#: builtin/tag.c:543
#, c-format
msgid "tag '%s' already exists"
msgstr ""
-#: builtin/tag.c:562
+#: builtin/tag.c:574
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr ""
-#: builtin/unpack-objects.c:498
+#: builtin/unpack-objects.c:500
msgid "Unpacking objects"
msgstr ""
-#: builtin/update-index.c:82
+#: builtin/update-index.c:83
#, c-format
msgid "failed to create directory %s"
msgstr ""
-#: builtin/update-index.c:88
-#, c-format
-msgid "failed to stat %s"
-msgstr ""
-
-#: builtin/update-index.c:98
+#: builtin/update-index.c:99
#, c-format
msgid "failed to create file %s"
msgstr ""
-#: builtin/update-index.c:106
+#: builtin/update-index.c:107
#, c-format
msgid "failed to delete file %s"
msgstr ""
-#: builtin/update-index.c:113 builtin/update-index.c:219
+#: builtin/update-index.c:114 builtin/update-index.c:220
#, c-format
msgid "failed to delete directory %s"
msgstr ""
-#: builtin/update-index.c:138
+#: builtin/update-index.c:139
#, c-format
msgid "Testing mtime in '%s' "
msgstr ""
-#: builtin/update-index.c:152
+#: builtin/update-index.c:153
msgid "directory stat info does not change after adding a new file"
msgstr ""
-#: builtin/update-index.c:165
+#: builtin/update-index.c:166
msgid "directory stat info does not change after adding a new directory"
msgstr ""
-#: builtin/update-index.c:178
+#: builtin/update-index.c:179
msgid "directory stat info changes after updating a file"
msgstr ""
-#: builtin/update-index.c:189
+#: builtin/update-index.c:190
msgid "directory stat info changes after adding a file inside subdirectory"
msgstr ""
-#: builtin/update-index.c:200
+#: builtin/update-index.c:201
msgid "directory stat info does not change after deleting a file"
msgstr ""
-#: builtin/update-index.c:213
+#: builtin/update-index.c:214
msgid "directory stat info does not change after deleting a directory"
msgstr ""
-#: builtin/update-index.c:220
+#: builtin/update-index.c:221
msgid " OK"
msgstr ""
msgid "git update-index [<options>] [--] [<file>...]"
msgstr ""
-#: builtin/update-index.c:946
+#: builtin/update-index.c:971
msgid "continue refresh even when index needs update"
msgstr ""
-#: builtin/update-index.c:949
+#: builtin/update-index.c:974
msgid "refresh: ignore submodules"
msgstr ""
-#: builtin/update-index.c:952
+#: builtin/update-index.c:977
msgid "do not ignore new files"
msgstr ""
-#: builtin/update-index.c:954
+#: builtin/update-index.c:979
msgid "let files replace directories and vice-versa"
msgstr ""
-#: builtin/update-index.c:956
+#: builtin/update-index.c:981
msgid "notice files missing from worktree"
msgstr ""
-#: builtin/update-index.c:958
+#: builtin/update-index.c:983
msgid "refresh even if index contains unmerged entries"
msgstr ""
-#: builtin/update-index.c:961
+#: builtin/update-index.c:986
msgid "refresh stat information"
msgstr ""
-#: builtin/update-index.c:965
+#: builtin/update-index.c:990
msgid "like --refresh, but ignore assume-unchanged setting"
msgstr ""
-#: builtin/update-index.c:969
+#: builtin/update-index.c:994
msgid "<mode>,<object>,<path>"
msgstr ""
-#: builtin/update-index.c:970
+#: builtin/update-index.c:995
msgid "add the specified entry to the index"
msgstr ""
-#: builtin/update-index.c:979
+#: builtin/update-index.c:1005
msgid "mark files as \"not changing\""
msgstr ""
-#: builtin/update-index.c:982
+#: builtin/update-index.c:1008
msgid "clear assumed-unchanged bit"
msgstr ""
-#: builtin/update-index.c:985
+#: builtin/update-index.c:1011
msgid "mark files as \"index-only\""
msgstr ""
-#: builtin/update-index.c:988
+#: builtin/update-index.c:1014
msgid "clear skip-worktree bit"
msgstr ""
-#: builtin/update-index.c:991
+#: builtin/update-index.c:1017
msgid "add to index only; do not add content to object database"
msgstr ""
-#: builtin/update-index.c:993
+#: builtin/update-index.c:1019
msgid "remove named paths even if present in worktree"
msgstr ""
-#: builtin/update-index.c:995
+#: builtin/update-index.c:1021
msgid "with --stdin: input lines are terminated by null bytes"
msgstr ""
-#: builtin/update-index.c:997
+#: builtin/update-index.c:1023
msgid "read list of paths to be updated from standard input"
msgstr ""
-#: builtin/update-index.c:1001
+#: builtin/update-index.c:1027
msgid "add entries from standard input to the index"
msgstr ""
-#: builtin/update-index.c:1005
+#: builtin/update-index.c:1031
msgid "repopulate stages #2 and #3 for the listed paths"
msgstr ""
-#: builtin/update-index.c:1009
+#: builtin/update-index.c:1035
msgid "only update entries that differ from HEAD"
msgstr ""
-#: builtin/update-index.c:1013
+#: builtin/update-index.c:1039
msgid "ignore files missing from worktree"
msgstr ""
-#: builtin/update-index.c:1016
+#: builtin/update-index.c:1042
msgid "report actions to standard output"
msgstr ""
-#: builtin/update-index.c:1018
+#: builtin/update-index.c:1044
msgid "(for porcelains) forget saved unresolved conflicts"
msgstr ""
-#: builtin/update-index.c:1022
+#: builtin/update-index.c:1048
msgid "write index in this format"
msgstr ""
-#: builtin/update-index.c:1024
+#: builtin/update-index.c:1050
msgid "enable or disable split index"
msgstr ""
-#: builtin/update-index.c:1026
+#: builtin/update-index.c:1052
msgid "enable/disable untracked cache"
msgstr ""
-#: builtin/update-index.c:1028
+#: builtin/update-index.c:1054
msgid "test if the filesystem supports untracked cache"
msgstr ""
-#: builtin/update-index.c:1030
+#: builtin/update-index.c:1056
msgid "enable untracked cache without testing the filesystem"
msgstr ""
-#: builtin/update-index.c:1032
+#: builtin/update-index.c:1058
msgid "write out the index even if is not flagged as changed"
msgstr ""
-#: builtin/update-index.c:1034
+#: builtin/update-index.c:1060
msgid "enable or disable file system monitor"
msgstr ""
-#: builtin/update-index.c:1036
+#: builtin/update-index.c:1062
msgid "mark files as fsmonitor valid"
msgstr ""
-#: builtin/update-index.c:1039
+#: builtin/update-index.c:1065
msgid "clear fsmonitor valid bit"
msgstr ""
-#: builtin/update-index.c:1138
+#: builtin/update-index.c:1168
msgid ""
"core.splitIndex is set to false; remove or change it, if you really want to "
"enable split index"
msgstr ""
-#: builtin/update-index.c:1147
+#: builtin/update-index.c:1177
msgid ""
"core.splitIndex is set to true; remove or change it, if you really want to "
"disable split index"
msgstr ""
-#: builtin/update-index.c:1158
+#: builtin/update-index.c:1188
msgid ""
"core.untrackedCache is set to true; remove or change it, if you really want "
"to disable the untracked cache"
msgstr ""
-#: builtin/update-index.c:1162
+#: builtin/update-index.c:1192
msgid "Untracked cache disabled"
msgstr ""
-#: builtin/update-index.c:1170
+#: builtin/update-index.c:1200
msgid ""
"core.untrackedCache is set to false; remove or change it, if you really want "
"to enable the untracked cache"
msgstr ""
-#: builtin/update-index.c:1174
+#: builtin/update-index.c:1204
#, c-format
msgid "Untracked cache enabled for '%s'"
msgstr ""
-#: builtin/update-index.c:1182
+#: builtin/update-index.c:1212
msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
msgstr ""
-#: builtin/update-index.c:1186
+#: builtin/update-index.c:1216
msgid "fsmonitor enabled"
msgstr ""
-#: builtin/update-index.c:1189
+#: builtin/update-index.c:1219
msgid ""
"core.fsmonitor is set; remove it if you really want to disable fsmonitor"
msgstr ""
-#: builtin/update-index.c:1193
+#: builtin/update-index.c:1223
msgid "fsmonitor disabled"
msgstr ""
msgid "git update-ref [<options>] --stdin [-z]"
msgstr ""
-#: builtin/update-ref.c:363
+#: builtin/update-ref.c:364
msgid "delete the reference"
msgstr ""
-#: builtin/update-ref.c:365
+#: builtin/update-ref.c:366
msgid "update <refname> not the one it points to"
msgstr ""
-#: builtin/update-ref.c:366
+#: builtin/update-ref.c:367
msgid "stdin has NUL-terminated arguments"
msgstr ""
-#: builtin/update-ref.c:367
+#: builtin/update-ref.c:368
msgid "read updates from stdin"
msgstr ""
msgid "git upload-pack [<options>] <dir>"
msgstr ""
+#: builtin/upload-pack.c:23 t/helper/test-serve-v2.c:17
+msgid "quit after a single request/response exchange"
+msgstr ""
+
#: builtin/upload-pack.c:25
msgid "exit immediately after initial ref advertisement"
msgstr ""
msgid "interrupt transfer after <n> seconds of inactivity"
msgstr ""
-#: builtin/verify-commit.c:18
+#: builtin/verify-commit.c:20
msgid "git verify-commit [-v | --verbose] <commit>..."
msgstr ""
-#: builtin/verify-commit.c:73
+#: builtin/verify-commit.c:76
msgid "print commit contents"
msgstr ""
-#: builtin/verify-commit.c:74 builtin/verify-tag.c:38
+#: builtin/verify-commit.c:77 builtin/verify-tag.c:38
msgid "print raw gpg status output"
msgstr ""
msgid "print tag contents"
msgstr ""
-#: builtin/worktree.c:17
+#: builtin/worktree.c:18
msgid "git worktree add [<options>] <path> [<commit-ish>]"
msgstr ""
-#: builtin/worktree.c:18
+#: builtin/worktree.c:19
msgid "git worktree list [<options>]"
msgstr ""
-#: builtin/worktree.c:19
+#: builtin/worktree.c:20
msgid "git worktree lock [<options>] <path>"
msgstr ""
-#: builtin/worktree.c:20
+#: builtin/worktree.c:21
msgid "git worktree move <worktree> <new-path>"
msgstr ""
-#: builtin/worktree.c:21
+#: builtin/worktree.c:22
msgid "git worktree prune [<options>]"
msgstr ""
-#: builtin/worktree.c:22
+#: builtin/worktree.c:23
msgid "git worktree remove [<options>] <worktree>"
msgstr ""
-#: builtin/worktree.c:23
+#: builtin/worktree.c:24
msgid "git worktree unlock <path>"
msgstr ""
-#: builtin/worktree.c:58
+#: builtin/worktree.c:61 builtin/worktree.c:891
+#, c-format
+msgid "failed to delete '%s'"
+msgstr ""
+
+#: builtin/worktree.c:80
#, c-format
msgid "Removing worktrees/%s: not a valid directory"
msgstr ""
-#: builtin/worktree.c:64
+#: builtin/worktree.c:86
#, c-format
msgid "Removing worktrees/%s: gitdir file does not exist"
msgstr ""
-#: builtin/worktree.c:69 builtin/worktree.c:78
+#: builtin/worktree.c:91 builtin/worktree.c:100
#, c-format
msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
msgstr ""
-#: builtin/worktree.c:88
+#: builtin/worktree.c:110
#, c-format
msgid ""
"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
"%<PRIuMAX>)"
msgstr ""
-#: builtin/worktree.c:96
+#: builtin/worktree.c:118
#, c-format
msgid "Removing worktrees/%s: invalid gitdir file"
msgstr ""
-#: builtin/worktree.c:105
+#: builtin/worktree.c:127
#, c-format
msgid "Removing worktrees/%s: gitdir file points to non-existent location"
msgstr ""
-#: builtin/worktree.c:152
+#: builtin/worktree.c:166
msgid "report pruned working trees"
msgstr ""
-#: builtin/worktree.c:154
+#: builtin/worktree.c:168
msgid "expire working trees older than <time>"
msgstr ""
-#: builtin/worktree.c:229
+#: builtin/worktree.c:235
#, c-format
msgid "'%s' already exists"
msgstr ""
-#: builtin/worktree.c:260
+#: builtin/worktree.c:252
+#, c-format
+msgid "unable to re-add worktree '%s'"
+msgstr ""
+
+#: builtin/worktree.c:257
+#, c-format
+msgid ""
+"'%s' is a missing but locked worktree;\n"
+"use 'add -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear"
+msgstr ""
+
+#: builtin/worktree.c:259
+#, c-format
+msgid ""
+"'%s' is a missing but already registered worktree;\n"
+"use 'add -f' to override, or 'prune' or 'remove' to clear"
+msgstr ""
+
+#: builtin/worktree.c:302
#, c-format
msgid "could not create directory of '%s'"
msgstr ""
-#: builtin/worktree.c:373 builtin/worktree.c:379
+#: builtin/worktree.c:432 builtin/worktree.c:438
#, c-format
msgid "Preparing worktree (new branch '%s')"
msgstr ""
-#: builtin/worktree.c:375
+#: builtin/worktree.c:434
#, c-format
msgid "Preparing worktree (resetting branch '%s'; was at %s)"
msgstr ""
-#: builtin/worktree.c:384
+#: builtin/worktree.c:443
#, c-format
msgid "Preparing worktree (checking out '%s')"
msgstr ""
-#: builtin/worktree.c:390
+#: builtin/worktree.c:449
#, c-format
msgid "Preparing worktree (detached HEAD %s)"
msgstr ""
-#: builtin/worktree.c:431
+#: builtin/worktree.c:490
msgid "checkout <branch> even if already checked out in other worktree"
msgstr ""
-#: builtin/worktree.c:434
+#: builtin/worktree.c:493
msgid "create a new branch"
msgstr ""
-#: builtin/worktree.c:436
+#: builtin/worktree.c:495
msgid "create or reset a branch"
msgstr ""
-#: builtin/worktree.c:438
+#: builtin/worktree.c:497
msgid "populate the new working tree"
msgstr ""
-#: builtin/worktree.c:439
+#: builtin/worktree.c:498
msgid "keep the new working tree locked"
msgstr ""
-#: builtin/worktree.c:441
+#: builtin/worktree.c:501
msgid "set up tracking mode (see git-branch(1))"
msgstr ""
-#: builtin/worktree.c:444
+#: builtin/worktree.c:504
msgid "try to match the new branch name with a remote-tracking branch"
msgstr ""
-#: builtin/worktree.c:452
+#: builtin/worktree.c:512
msgid "-b, -B, and --detach are mutually exclusive"
msgstr ""
-#: builtin/worktree.c:511
+#: builtin/worktree.c:573
msgid "--[no-]track can only be used if a new branch is created"
msgstr ""
-#: builtin/worktree.c:611
+#: builtin/worktree.c:673
msgid "reason for locking"
msgstr ""
-#: builtin/worktree.c:623 builtin/worktree.c:656 builtin/worktree.c:710
-#: builtin/worktree.c:850
+#: 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/worktree.c:625 builtin/worktree.c:658
+#: builtin/worktree.c:687 builtin/worktree.c:720
msgid "The main working tree cannot be locked or unlocked"
msgstr ""
-#: builtin/worktree.c:630
+#: builtin/worktree.c:692
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr ""
-#: builtin/worktree.c:632
+#: builtin/worktree.c:694
#, c-format
msgid "'%s' is already locked"
msgstr ""
-#: builtin/worktree.c:660
+#: builtin/worktree.c:722
#, c-format
msgid "'%s' is not locked"
msgstr ""
-#: builtin/worktree.c:685
+#: builtin/worktree.c:763
msgid "working trees containing submodules cannot be moved or removed"
msgstr ""
-#: builtin/worktree.c:712 builtin/worktree.c:852
+#: builtin/worktree.c:771
+msgid "force move even if worktree is dirty or locked"
+msgstr ""
+
+#: builtin/worktree.c:794 builtin/worktree.c:921
#, c-format
msgid "'%s' is a main working tree"
msgstr ""
-#: builtin/worktree.c:717
+#: builtin/worktree.c:799
#, c-format
msgid "could not figure out destination name from '%s'"
msgstr ""
-#: builtin/worktree.c:723
+#: builtin/worktree.c:805
#, c-format
msgid "target '%s' already exists"
msgstr ""
-#: builtin/worktree.c:730
+#: builtin/worktree.c:813
#, c-format
-msgid "cannot move a locked working tree, lock reason: %s"
+msgid ""
+"cannot move a locked working tree, lock reason: %s\n"
+"use 'move -f -f' to override or unlock first"
msgstr ""
-#: builtin/worktree.c:732
-msgid "cannot move a locked working tree"
+#: builtin/worktree.c:815
+msgid ""
+"cannot move a locked working tree;\n"
+"use 'move -f -f' to override or unlock first"
msgstr ""
-#: builtin/worktree.c:735
+#: builtin/worktree.c:818
#, c-format
msgid "validation failed, cannot move working tree: %s"
msgstr ""
-#: builtin/worktree.c:740
+#: builtin/worktree.c:823
#, c-format
msgid "failed to move '%s' to '%s'"
msgstr ""
-#: builtin/worktree.c:788
+#: builtin/worktree.c:871
#, c-format
msgid "failed to run 'git status' on '%s'"
msgstr ""
-#: builtin/worktree.c:792
+#: builtin/worktree.c:875
#, c-format
msgid "'%s' is dirty, use --force to delete it"
msgstr ""
-#: builtin/worktree.c:797
+#: builtin/worktree.c:880
#, c-format
msgid "failed to run 'git status' on '%s', code %d"
msgstr ""
-#: builtin/worktree.c:808 builtin/worktree.c:822
+#: builtin/worktree.c:903
+msgid "force removal even if worktree is dirty or locked"
+msgstr ""
+
+#: builtin/worktree.c:926
#, c-format
-msgid "failed to delete '%s'"
+msgid ""
+"cannot remove a locked working tree, lock reason: %s\n"
+"use 'remove -f -f' to override or unlock first"
+msgstr ""
+
+#: builtin/worktree.c:928
+msgid ""
+"cannot remove a locked working tree;\n"
+"use 'remove -f -f' to override or unlock first"
+msgstr ""
+
+#: builtin/worktree.c:931
+#, c-format
+msgid "validation failed, cannot remove working tree: %s"
+msgstr ""
+
+#: builtin/write-tree.c:15
+msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
+msgstr ""
+
+#: builtin/write-tree.c:28
+msgid "<prefix>/"
+msgstr ""
+
+#: builtin/write-tree.c:29
+msgid "write tree object for a subdirectory <prefix>"
+msgstr ""
+
+#: builtin/write-tree.c:31
+msgid "only useful for debugging"
+msgstr ""
+
+#: credential-cache--daemon.c:223
+#, c-format
+msgid ""
+"The permissions on your socket directory are too loose; other\n"
+"users may be able to read your cached credentials. Consider running:\n"
+"\n"
+"\tchmod 0700 %s"
+msgstr ""
+
+#: credential-cache--daemon.c:272
+msgid "print debugging messages to stderr"
+msgstr ""
+
+#: t/helper/test-reach.c:152
+#, c-format
+msgid "commit %s is not marked reachable"
+msgstr ""
+
+#: t/helper/test-reach.c:162
+msgid "too many commits marked reachable"
+msgstr ""
+
+#: t/helper/test-serve-v2.c:7
+msgid "test-tool serve-v2 [<options>]"
+msgstr ""
+
+#: t/helper/test-serve-v2.c:19
+msgid "exit immediately after advertising capabilities"
+msgstr ""
+
+#: git.c:27
+msgid ""
+"git [--version] [--help] [-C <path>] [-c <name>=<value>]\n"
+" [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n"
+" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
+"bare]\n"
+" [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
+" <command> [<args>]"
+msgstr ""
+
+#: git.c:34
+msgid ""
+"'git help -a' and 'git help -g' list available subcommands and some\n"
+"concept guides. See 'git help <command>' or 'git help <concept>'\n"
+"to read about a specific subcommand or concept."
+msgstr ""
+
+#: git.c:185
+#, c-format
+msgid "no directory given for --git-dir\n"
+msgstr ""
+
+#: git.c:199
+#, c-format
+msgid "no namespace given for --namespace\n"
+msgstr ""
+
+#: git.c:213
+#, c-format
+msgid "no directory given for --work-tree\n"
+msgstr ""
+
+#: git.c:227
+#, c-format
+msgid "no prefix given for --super-prefix\n"
+msgstr ""
+
+#: git.c:249
+#, c-format
+msgid "-c expects a configuration string\n"
+msgstr ""
+
+#: git.c:287
+#, c-format
+msgid "no directory given for -C\n"
+msgstr ""
+
+#: git.c:313
+#, c-format
+msgid "unknown option: %s\n"
msgstr ""
-#: builtin/worktree.c:834
-msgid "force removing even if the worktree is dirty"
+#: git.c:359
+#, c-format
+msgid "while expanding alias '%s': '%s'"
+msgstr ""
+
+#: git.c:368
+#, c-format
+msgid ""
+"alias '%s' changes environment variables.\n"
+"You can use '!git' in the alias to do this"
+msgstr ""
+
+#: git.c:376
+#, c-format
+msgid "empty alias for %s"
+msgstr ""
+
+#: git.c:379
+#, c-format
+msgid "recursive alias: %s"
+msgstr ""
+
+#: git.c:459
+msgid "write failure on standard output"
+msgstr ""
+
+#: git.c:461
+msgid "unknown write failure on standard output"
+msgstr ""
+
+#: git.c:463
+msgid "close failed on standard output"
+msgstr ""
+
+#: git.c:797
+#, c-format
+msgid "alias loop detected: expansion of '%s' does not terminate:%s"
+msgstr ""
+
+#: git.c:847
+#, c-format
+msgid "cannot handle %s as a builtin"
+msgstr ""
+
+#: git.c:860
+#, c-format
+msgid ""
+"usage: %s\n"
+"\n"
+msgstr ""
+
+#: git.c:880
+#, c-format
+msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
msgstr ""
-#: builtin/worktree.c:856
+#: git.c:892
#, c-format
-msgid "cannot remove a locked working tree, lock reason: %s"
+msgid "failed to run command '%s': %s\n"
+msgstr ""
+
+#: http.c:378
+#, c-format
+msgid "negative value for http.postbuffer; defaulting to %d"
+msgstr ""
+
+#: http.c:399
+msgid "Delegation control is not supported with cURL < 7.22.0"
+msgstr ""
+
+#: http.c:408
+msgid "Public key pinning not supported with cURL < 7.44.0"
+msgstr ""
+
+#: http.c:876
+msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
+msgstr ""
+
+#: http.c:949
+msgid "Protocol restrictions not supported with cURL < 7.19.4"
+msgstr ""
+
+#: http.c:1085
+#, c-format
+msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
+msgstr ""
+
+#: http.c:1092
+#, c-format
+msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
+msgstr ""
+
+#: http.c:1096
+#, c-format
+msgid "Could not set SSL backend to '%s': already set"
+msgstr ""
+
+#: http.c:1965
+#, c-format
+msgid ""
+"unable to update url base from redirection:\n"
+" asked for: %s\n"
+" redirect: %s"
msgstr ""
-#: builtin/worktree.c:858
-msgid "cannot remove a locked working tree"
+#: remote-curl.c:157
+#, c-format
+msgid "invalid quoting in push-option value: '%s'"
msgstr ""
-#: builtin/worktree.c:861
+#: remote-curl.c:254
#, c-format
-msgid "validation failed, cannot remove working tree: %s"
+msgid "%sinfo/refs not valid: is this a git repository?"
msgstr ""
-#: builtin/write-tree.c:14
-msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
+#: remote-curl.c:355
+msgid "invalid server response; expected service, got flush packet"
msgstr ""
-#: builtin/write-tree.c:27
-msgid "<prefix>/"
+#: remote-curl.c:386
+#, c-format
+msgid "invalid server response; got '%s'"
msgstr ""
-#: builtin/write-tree.c:28
-msgid "write tree object for a subdirectory <prefix>"
+#: remote-curl.c:446
+#, c-format
+msgid "repository '%s' not found"
msgstr ""
-#: builtin/write-tree.c:31
-msgid "only useful for debugging"
+#: remote-curl.c:450
+#, c-format
+msgid "Authentication failed for '%s'"
msgstr ""
-#: credential-cache--daemon.c:222
+#: remote-curl.c:454
#, 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"
+msgid "unable to access '%s': %s"
msgstr ""
-#: credential-cache--daemon.c:271
-msgid "print debugging messages to stderr"
+#: remote-curl.c:460
+#, c-format
+msgid "redirecting to %s"
msgstr ""
-#: git.c:27
-msgid ""
-"git [--version] [--help] [-C <path>] [-c <name>=<value>]\n"
-" [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n"
-" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
-"bare]\n"
-" [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
-" <command> [<args>]"
+#: remote-curl.c:584
+msgid "shouldn't have EOF when not gentle on EOF"
msgstr ""
-#: git.c:34
-msgid ""
-"'git help -a' and 'git help -g' list available subcommands and some\n"
-"concept guides. See 'git help <command>' or 'git help <concept>'\n"
-"to read about a specific subcommand or concept."
+#: remote-curl.c:664
+msgid "unable to rewind rpc post data - try increasing http.postBuffer"
msgstr ""
-#: git.c:173
+#: remote-curl.c:724
#, c-format
-msgid "no directory given for --git-dir\n"
+msgid "RPC failed; %s"
msgstr ""
-#: git.c:187
-#, c-format
-msgid "no namespace given for --namespace\n"
+#: remote-curl.c:764
+msgid "cannot handle pushes this big"
msgstr ""
-#: git.c:201
+#: remote-curl.c:879
#, c-format
-msgid "no directory given for --work-tree\n"
+msgid "cannot deflate request; zlib deflate error %d"
msgstr ""
-#: git.c:215
+#: remote-curl.c:883
#, c-format
-msgid "no prefix given for --super-prefix\n"
+msgid "cannot deflate request; zlib end error %d"
msgstr ""
-#: git.c:237
-#, c-format
-msgid "-c expects a configuration string\n"
+#: remote-curl.c:1014
+msgid "dumb http transport does not support shallow capabilities"
msgstr ""
-#: git.c:275
-#, c-format
-msgid "no directory given for -C\n"
+#: remote-curl.c:1028
+msgid "fetch failed."
msgstr ""
-#: git.c:300
-#, c-format
-msgid "unknown option: %s\n"
+#: remote-curl.c:1076
+msgid "cannot fetch by sha1 over smart http"
msgstr ""
-#: git.c:765
+#: remote-curl.c:1120 remote-curl.c:1126
#, c-format
-msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
+msgid "protocol error: expected sha/ref, got '%s'"
msgstr ""
-#: git.c:777
+#: remote-curl.c:1138 remote-curl.c:1252
#, c-format
-msgid "failed to run command '%s': %s\n"
+msgid "http transport does not support %s"
msgstr ""
-#: http.c:348
-#, c-format
-msgid "negative value for http.postbuffer; defaulting to %d"
+#: remote-curl.c:1174
+msgid "git-http-push failed"
msgstr ""
-#: http.c:369
-msgid "Delegation control is not supported with cURL < 7.22.0"
+#: remote-curl.c:1360
+msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
msgstr ""
-#: http.c:378
-msgid "Public key pinning not supported with cURL < 7.44.0"
+#: remote-curl.c:1392
+msgid "remote-curl: error reading command stream from git"
msgstr ""
-#: http.c:1854
-#, c-format
-msgid ""
-"unable to update url base from redirection:\n"
-" asked for: %s\n"
-" redirect: %s"
+#: remote-curl.c:1399
+msgid "remote-curl: fetch attempted without a local repo"
msgstr ""
-#: remote-curl.c:401
+#: remote-curl.c:1439
#, c-format
-msgid "redirecting to %s"
+msgid "remote-curl: unknown command '%s' from git"
msgstr ""
-#: list-objects-filter-options.h:59
+#: list-objects-filter-options.h:61
msgid "args"
msgstr ""
-#: list-objects-filter-options.h:60
+#: list-objects-filter-options.h:62
msgid "object filtering"
msgstr ""
-#: parse-options.h:157
+#: parse-options.h:170
msgid "expiry-date"
msgstr ""
-#: parse-options.h:172
+#: parse-options.h:184
msgid "no-op (backward compatibility)"
msgstr ""
-#: parse-options.h:251
+#: parse-options.h:304
msgid "be more verbose"
msgstr ""
-#: parse-options.h:253
+#: parse-options.h:306
msgid "be more quiet"
msgstr ""
-#: parse-options.h:259
+#: parse-options.h:312
msgid "use <n> digits to display SHA-1s"
msgstr ""
+#: parse-options.h:331
+msgid "how to strip spaces and #comments from message"
+msgstr ""
+
+#: ref-filter.h:101
+msgid "key"
+msgstr ""
+
+#: ref-filter.h:101
+msgid "field name to sort on"
+msgstr ""
+
+#: rerere.h:44
+msgid "update the index with reused conflict resolution if possible"
+msgstr ""
+
#: command-list.h:50
msgid "Add file contents to the index"
msgstr ""
msgstr ""
#: command-list.h:54
-msgid "Import an Arch repository into Git"
+msgid "Import a GNU Arch repository into Git"
msgstr ""
#: command-list.h:55
msgstr ""
#: command-list.h:74
-msgid "Write and verify Git commit graph files"
+msgid "Write and verify Git commit-graph files"
msgstr ""
#: command-list.h:75
msgstr ""
#: command-list.h:113
-msgid "add or parse structured information in commit messages"
+msgid "Add or parse structured information in commit messages"
msgstr ""
#: command-list.h:114
msgstr ""
#: command-list.h:128
-msgid "Creates a tag object"
+msgid "Write and verify multi-pack-indexes"
msgstr ""
#: command-list.h:129
-msgid "Build a tree-object from ls-tree formatted text"
+msgid "Creates a tag object"
msgstr ""
#: command-list.h:130
-msgid "Move or rename a file, a directory, or a symlink"
+msgid "Build a tree-object from ls-tree formatted text"
msgstr ""
#: command-list.h:131
-msgid "Find symbolic names for given revs"
+msgid "Move or rename a file, a directory, or a symlink"
msgstr ""
#: command-list.h:132
-msgid "Add or inspect object notes"
+msgid "Find symbolic names for given revs"
msgstr ""
#: command-list.h:133
-msgid "Import from and submit to Perforce repositories"
+msgid "Add or inspect object notes"
msgstr ""
#: command-list.h:134
-msgid "Create a packed archive of objects"
+msgid "Import from and submit to Perforce repositories"
msgstr ""
#: command-list.h:135
-msgid "Find redundant pack files"
+msgid "Create a packed archive of objects"
msgstr ""
#: command-list.h:136
-msgid "Pack heads and tags for efficient repository access"
+msgid "Find redundant pack files"
msgstr ""
#: command-list.h:137
-msgid "Routines to help parsing remote repository access parameters"
+msgid "Pack heads and tags for efficient repository access"
msgstr ""
#: command-list.h:138
-msgid "Compute unique ID for a patch"
+msgid "Routines to help parsing remote repository access parameters"
msgstr ""
#: command-list.h:139
-msgid "Prune all unreachable objects from the object database"
+msgid "Compute unique ID for a patch"
msgstr ""
#: command-list.h:140
-msgid "Remove extra objects that are already in pack files"
+msgid "Prune all unreachable objects from the object database"
msgstr ""
#: command-list.h:141
-msgid "Fetch from and integrate with another repository or a local branch"
+msgid "Remove extra objects that are already in pack files"
msgstr ""
#: command-list.h:142
-msgid "Update remote refs along with associated objects"
+msgid "Fetch from and integrate with another repository or a local branch"
msgstr ""
#: command-list.h:143
-msgid "Applies a quilt patchset onto the current branch"
+msgid "Update remote refs along with associated objects"
msgstr ""
#: command-list.h:144
-msgid "Reads tree information into the index"
+msgid "Applies a quilt patchset onto the current branch"
msgstr ""
#: command-list.h:145
-msgid "Reapply commits on top of another base tip"
+msgid "Compare two commit ranges (e.g. two versions of a branch)"
msgstr ""
#: command-list.h:146
-msgid "Receive what is pushed into the repository"
+msgid "Reads tree information into the index"
msgstr ""
#: command-list.h:147
-msgid "Manage reflog information"
+msgid "Reapply commits on top of another base tip"
msgstr ""
#: command-list.h:148
-msgid "Manage set of tracked repositories"
+msgid "Receive what is pushed into the repository"
msgstr ""
#: command-list.h:149
-msgid "Pack unpacked objects in a repository"
+msgid "Manage reflog information"
msgstr ""
#: command-list.h:150
-msgid "Create, list, delete refs to replace objects"
+msgid "Manage set of tracked repositories"
msgstr ""
#: command-list.h:151
-msgid "Generates a summary of pending changes"
+msgid "Pack unpacked objects in a repository"
msgstr ""
#: command-list.h:152
-msgid "Reuse recorded resolution of conflicted merges"
+msgid "Create, list, delete refs to replace objects"
msgstr ""
#: command-list.h:153
-msgid "Reset current HEAD to the specified state"
+msgid "Generates a summary of pending changes"
msgstr ""
#: command-list.h:154
-msgid "Revert some existing commits"
+msgid "Reuse recorded resolution of conflicted merges"
msgstr ""
#: command-list.h:155
-msgid "Lists commit objects in reverse chronological order"
+msgid "Reset current HEAD to the specified state"
msgstr ""
#: command-list.h:156
-msgid "Pick out and massage parameters"
+msgid "Revert some existing commits"
msgstr ""
#: command-list.h:157
-msgid "Remove files from the working tree and from the index"
+msgid "Lists commit objects in reverse chronological order"
msgstr ""
#: command-list.h:158
-msgid "Send a collection of patches as emails"
+msgid "Pick out and massage parameters"
msgstr ""
#: command-list.h:159
-msgid "Push objects over Git protocol to another repository"
+msgid "Remove files from the working tree and from the index"
msgstr ""
#: command-list.h:160
-msgid "Restricted login shell for Git-only SSH access"
+msgid "Send a collection of patches as emails"
msgstr ""
#: command-list.h:161
-msgid "Summarize 'git log' output"
+msgid "Push objects over Git protocol to another repository"
msgstr ""
#: command-list.h:162
-msgid "Show various types of objects"
+msgid "Restricted login shell for Git-only SSH access"
msgstr ""
#: command-list.h:163
-msgid "Show branches and their commits"
+msgid "Summarize 'git log' output"
msgstr ""
#: command-list.h:164
-msgid "Show packed archive index"
+msgid "Show various types of objects"
msgstr ""
#: command-list.h:165
-msgid "List references in a local repository"
+msgid "Show branches and their commits"
msgstr ""
#: command-list.h:166
-msgid "Git's i18n setup code for shell scripts"
+msgid "Show packed archive index"
msgstr ""
#: command-list.h:167
-msgid "Common Git shell script setup code"
+msgid "List references in a local repository"
msgstr ""
#: command-list.h:168
-msgid "Stash the changes in a dirty working directory away"
+msgid "Git's i18n setup code for shell scripts"
msgstr ""
#: command-list.h:169
-msgid "Add file contents to the staging area"
+msgid "Common Git shell script setup code"
msgstr ""
#: command-list.h:170
-msgid "Show the working tree status"
+msgid "Stash the changes in a dirty working directory away"
msgstr ""
#: command-list.h:171
-msgid "Remove unnecessary whitespace"
+msgid "Add file contents to the staging area"
msgstr ""
#: command-list.h:172
-msgid "Initialize, update or inspect submodules"
+msgid "Show the working tree status"
msgstr ""
#: command-list.h:173
-msgid "Bidirectional operation between a Subversion repository and Git"
+msgid "Remove unnecessary whitespace"
msgstr ""
#: command-list.h:174
-msgid "Read, modify and delete symbolic refs"
+msgid "Initialize, update or inspect submodules"
msgstr ""
#: command-list.h:175
-msgid "Create, list, delete or verify a tag object signed with GPG"
+msgid "Bidirectional operation between a Subversion repository and Git"
msgstr ""
#: command-list.h:176
-msgid "Creates a temporary file with a blob's contents"
+msgid "Read, modify and delete symbolic refs"
msgstr ""
#: command-list.h:177
-msgid "Unpack objects from a packed archive"
+msgid "Create, list, delete or verify a tag object signed with GPG"
msgstr ""
#: command-list.h:178
-msgid "Register file contents in the working tree to the index"
+msgid "Creates a temporary file with a blob's contents"
msgstr ""
#: command-list.h:179
-msgid "Update the object name stored in a ref safely"
+msgid "Unpack objects from a packed archive"
msgstr ""
#: command-list.h:180
-msgid "Update auxiliary info file to help dumb servers"
+msgid "Register file contents in the working tree to the index"
msgstr ""
#: command-list.h:181
-msgid "Send archive back to git-archive"
+msgid "Update the object name stored in a ref safely"
msgstr ""
#: command-list.h:182
-msgid "Send objects packed back to git-fetch-pack"
+msgid "Update auxiliary info file to help dumb servers"
msgstr ""
#: command-list.h:183
-msgid "Show a Git logical variable"
+msgid "Send archive back to git-archive"
msgstr ""
#: command-list.h:184
-msgid "Check the GPG signature of commits"
+msgid "Send objects packed back to git-fetch-pack"
msgstr ""
#: command-list.h:185
-msgid "Validate packed Git archive files"
+msgid "Show a Git logical variable"
msgstr ""
#: command-list.h:186
-msgid "Check the GPG signature of tags"
+msgid "Check the GPG signature of commits"
msgstr ""
#: command-list.h:187
-msgid "Git web interface (web frontend to Git repositories)"
+msgid "Validate packed Git archive files"
msgstr ""
#: command-list.h:188
-msgid "Show logs with difference each commit introduces"
+msgid "Check the GPG signature of tags"
msgstr ""
#: command-list.h:189
-msgid "Manage multiple working trees"
+msgid "Git web interface (web frontend to Git repositories)"
msgstr ""
#: command-list.h:190
-msgid "Create a tree object from the current index"
+msgid "Show logs with difference each commit introduces"
msgstr ""
#: command-list.h:191
-msgid "Defining attributes per path"
+msgid "Manage multiple working trees"
msgstr ""
#: command-list.h:192
-msgid "Git command-line interface and conventions"
+msgid "Create a tree object from the current index"
msgstr ""
#: command-list.h:193
-msgid "A Git core tutorial for developers"
+msgid "Defining attributes per path"
msgstr ""
#: command-list.h:194
-msgid "Git for CVS users"
+msgid "Git command-line interface and conventions"
msgstr ""
#: command-list.h:195
-msgid "Tweaking diff output"
+msgid "A Git core tutorial for developers"
msgstr ""
#: command-list.h:196
-msgid "A useful minimum set of commands for Everyday Git"
+msgid "Git for CVS users"
msgstr ""
#: command-list.h:197
-msgid "A Git Glossary"
-msgstr ""
-
-#: command-list.h:198
-msgid "Hooks used by Git"
-msgstr ""
-
-#: command-list.h:199
-msgid "Specifies intentionally untracked files to ignore"
-msgstr ""
-
-#: command-list.h:200
-msgid "Defining submodule properties"
-msgstr ""
-
-#: command-list.h:201
-msgid "Git namespaces"
-msgstr ""
-
-#: command-list.h:202
-msgid "Git Repository Layout"
-msgstr ""
-
-#: command-list.h:203
-msgid "Specifying revisions and ranges for Git"
-msgstr ""
-
-#: command-list.h:204
-msgid "A tutorial introduction to Git: part two"
-msgstr ""
-
-#: command-list.h:205
-msgid "A tutorial introduction to Git"
-msgstr ""
-
-#: command-list.h:206
-msgid "An overview of recommended workflows with Git"
-msgstr ""
-
-#: rerere.h:40
-msgid "update the index with reused conflict resolution if possible"
-msgstr ""
-
-#: git-bisect.sh:54
-msgid "You need to start by \"git bisect start\""
-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]? "
+msgid "Tweaking diff output"
msgstr ""
-#: git-bisect.sh:121
-#, sh-format
-msgid "unrecognised option: '$arg'"
+#: command-list.h:198
+msgid "A useful minimum set of commands for Everyday Git"
msgstr ""
-#: git-bisect.sh:125
-#, sh-format
-msgid "'$arg' does not appear to be a valid revision"
+#: command-list.h:199
+msgid "A Git Glossary"
msgstr ""
-#: git-bisect.sh:154
-msgid "Bad HEAD - I need a HEAD"
+#: command-list.h:200
+msgid "Hooks used by Git"
msgstr ""
-#: git-bisect.sh:167
-#, sh-format
-msgid ""
-"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
+#: command-list.h:201
+msgid "Specifies intentionally untracked files to ignore"
msgstr ""
-#: git-bisect.sh:177
-msgid "won't bisect on cg-seek'ed tree"
+#: command-list.h:202
+msgid "Defining submodule properties"
msgstr ""
-#: git-bisect.sh:181
-msgid "Bad HEAD - strange symbolic ref"
+#: command-list.h:203
+msgid "Git namespaces"
msgstr ""
-#: git-bisect.sh:233
-#, sh-format
-msgid "Bad bisect_write argument: $state"
+#: command-list.h:204
+msgid "Git Repository Layout"
msgstr ""
-#: git-bisect.sh:246
-#, sh-format
-msgid "Bad rev input: $arg"
+#: command-list.h:205
+msgid "Specifying revisions and ranges for Git"
msgstr ""
-#: git-bisect.sh:265
-#, sh-format
-msgid "Bad rev input: $bisected_head"
+#: command-list.h:206
+msgid "A tutorial introduction to Git: part two"
msgstr ""
-#: git-bisect.sh:274
-#, sh-format
-msgid "Bad rev input: $rev"
+#: command-list.h:207
+msgid "A tutorial introduction to Git"
msgstr ""
-#: git-bisect.sh:283
-#, sh-format
-msgid "'git bisect $TERM_BAD' can take only one argument."
+#: command-list.h:208
+msgid "An overview of recommended workflows with Git"
msgstr ""
-#: git-bisect.sh:306
-#, sh-format
-msgid "Warning: bisecting only with a $TERM_BAD commit."
+#: git-bisect.sh:54
+msgid "You need to start by \"git bisect start\""
msgstr ""
#. TRANSLATORS: Make sure to include [Y] and [n] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-bisect.sh:312
-msgid "Are you sure [Y/n]? "
+#: git-bisect.sh:60
+msgid "Do you want me to do it for you [Y/n]? "
msgstr ""
-#: git-bisect.sh:324
+#: git-bisect.sh:101
#, 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.)"
+msgid "Bad rev input: $arg"
msgstr ""
-#: git-bisect.sh:327
+#: git-bisect.sh:121
#, sh-format
-msgid ""
-"You need to start by \"git bisect start\".\n"
-"You then need to give me at least one $good_syn and one $bad_syn revision.\n"
-"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
-msgstr ""
-
-#: git-bisect.sh:398 git-bisect.sh:512
-msgid "We are not bisecting."
+msgid "Bad rev input: $bisected_head"
msgstr ""
-#: git-bisect.sh:405
+#: git-bisect.sh:130
#, sh-format
-msgid "'$invalid' is not a valid commit"
+msgid "Bad rev input: $rev"
msgstr ""
-#: git-bisect.sh:414
+#: git-bisect.sh:139
#, sh-format
-msgid ""
-"Could not check out original HEAD '$branch'.\n"
-"Try 'git bisect reset <commit>'."
+msgid "'git bisect $TERM_BAD' can take only one argument."
msgstr ""
-#: git-bisect.sh:422
+#: git-bisect.sh:209
msgid "No logfile given"
msgstr ""
-#: git-bisect.sh:423
+#: git-bisect.sh:210
#, sh-format
msgid "cannot read $file for replaying"
msgstr ""
-#: git-bisect.sh:444
+#: git-bisect.sh:232
msgid "?? what are you talking about?"
msgstr ""
-#: git-bisect.sh:453
+#: git-bisect.sh:241
msgid "bisect run failed: no command provided."
msgstr ""
-#: git-bisect.sh:458
+#: git-bisect.sh:246
#, sh-format
msgid "running $command"
msgstr ""
-#: git-bisect.sh:465
+#: git-bisect.sh:253
#, sh-format
msgid ""
"bisect run failed:\n"
"exit code $res from '$command' is < 0 or >= 128"
msgstr ""
-#: git-bisect.sh:491
+#: git-bisect.sh:279
msgid "bisect run cannot continue any more"
msgstr ""
-#: git-bisect.sh:497
+#: git-bisect.sh:285
#, sh-format
msgid ""
"bisect run failed:\n"
"'bisect_state $state' exited with error code $res"
msgstr ""
-#: git-bisect.sh:504
+#: git-bisect.sh:292
msgid "bisect run success"
msgstr ""
-#: git-bisect.sh:533
-#, sh-format
-msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect."
-msgstr ""
-
-#: git-bisect.sh:567
-msgid "no terms defined"
-msgstr ""
-
-#: git-bisect.sh:584
-#, sh-format
-msgid ""
-"invalid argument $arg for 'git bisect terms'.\n"
-"Supported options are: --term-good|--term-old and --term-bad|--term-new."
+#: git-bisect.sh:300
+msgid "We are not bisecting."
msgstr ""
#: git-merge-octopus.sh:46
msgid "Simple merge did not work, trying automatic merge."
msgstr ""
-#: git-rebase.sh:61
-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 ""
-
-#: git-rebase.sh:173 git-rebase.sh:442
-#, sh-format
-msgid "Could not move back to $head_name"
-msgstr ""
-
-#: git-rebase.sh:184
-msgid "Applied autostash."
-msgstr ""
-
-#: git-rebase.sh:187
-#, sh-format
-msgid "Cannot store $stash_sha1"
-msgstr ""
-
-#: git-rebase.sh:229
-msgid "The pre-rebase hook refused to rebase."
-msgstr ""
-
-#: git-rebase.sh:234
-msgid "It looks like 'git am' is in progress. Cannot rebase."
-msgstr ""
-
-#: git-rebase.sh:403
-msgid "No rebase in progress?"
-msgstr ""
-
-#: git-rebase.sh:414
-msgid "The --edit-todo action can only be used during interactive rebase."
-msgstr ""
-
-#: git-rebase.sh:421
-msgid "Cannot read HEAD"
-msgstr ""
-
-#: git-rebase.sh:424
-msgid ""
-"You must edit all merge conflicts and then\n"
-"mark them as resolved using git add"
-msgstr ""
-
-#: git-rebase.sh:468
-#, sh-format
-msgid ""
-"It seems that there is already a $state_dir_base directory, and\n"
-"I wonder if you are in the middle of another rebase. If that is the\n"
-"case, please try\n"
-"\t$cmd_live_rebase\n"
-"If that is not the case, please\n"
-"\t$cmd_clear_stale_rebase\n"
-"and run me again. I am stopping in case you still have something\n"
-"valuable there."
-msgstr ""
-
-#: git-rebase.sh:509
-msgid "error: cannot combine '--signoff' with '--preserve-merges'"
-msgstr ""
-
-#: git-rebase.sh:537
-#, sh-format
-msgid "invalid upstream '$upstream_name'"
-msgstr ""
-
-#: git-rebase.sh:561
-#, sh-format
-msgid "$onto_name: there are more than one merge bases"
-msgstr ""
-
-#: git-rebase.sh:564 git-rebase.sh:568
-#, sh-format
-msgid "$onto_name: there is no merge base"
-msgstr ""
-
-#: git-rebase.sh:573
-#, sh-format
-msgid "Does not point to a valid commit: $onto_name"
-msgstr ""
-
-#: git-rebase.sh:599
-#, sh-format
-msgid "fatal: no such branch/commit '$branch_name'"
-msgstr ""
-
-#: git-rebase.sh:632
-msgid "Cannot autostash"
-msgstr ""
-
-#: git-rebase.sh:637
-#, sh-format
-msgid "Created autostash: $stash_abbrev"
-msgstr ""
-
-#: git-rebase.sh:641
-msgid "Please commit or stash them."
-msgstr ""
-
-#: git-rebase.sh:664
-#, sh-format
-msgid "HEAD is up to date."
-msgstr ""
-
-#: git-rebase.sh:666
-#, sh-format
-msgid "Current branch $branch_name is up to date."
-msgstr ""
-
-#: git-rebase.sh:674
-#, sh-format
-msgid "HEAD is up to date, rebase forced."
-msgstr ""
-
-#: git-rebase.sh:676
-#, sh-format
-msgid "Current branch $branch_name is up to date, rebase forced."
-msgstr ""
-
-#: git-rebase.sh:688
-#, sh-format
-msgid "Changes from $mb to $onto:"
-msgstr ""
-
-#: git-rebase.sh:697
-msgid "First, rewinding head to replay your work on top of it..."
-msgstr ""
-
-#: git-rebase.sh:707
-#, sh-format
-msgid "Fast-forwarded $branch_name to $onto_name."
-msgstr ""
-
-#: git-stash.sh:61
-msgid "git stash clear with parameters is unimplemented"
-msgstr ""
-
-#: git-stash.sh:108
-msgid "You do not have the initial commit yet"
-msgstr ""
-
-#: git-stash.sh:123
-msgid "Cannot save the current index state"
-msgstr ""
-
-#: git-stash.sh:138
-msgid "Cannot save the untracked files"
-msgstr ""
-
-#: git-stash.sh:158 git-stash.sh:171
-msgid "Cannot save the current worktree state"
-msgstr ""
-
-#: git-stash.sh:175
-msgid "No changes selected"
-msgstr ""
-
-#: git-stash.sh:178
+#: git-legacy-stash.sh:220
msgid "Cannot remove temporary index (can't happen)"
msgstr ""
-#: git-stash.sh:191
-msgid "Cannot record working tree state"
-msgstr ""
-
-#: git-stash.sh:229
+#: git-legacy-stash.sh:271
#, sh-format
msgid "Cannot update $ref_stash with $w_commit"
msgstr ""
-#: git-stash.sh:281
+#: git-legacy-stash.sh:323
#, sh-format
msgid "error: unknown option for 'stash push': $option"
msgstr ""
-#: git-stash.sh:295
-msgid "Can't use --patch and --include-untracked or --all at the same time"
-msgstr ""
-
-#: git-stash.sh:303
-msgid "No local changes to save"
-msgstr ""
-
-#: git-stash.sh:308
-msgid "Cannot initialize stash"
-msgstr ""
-
-#: git-stash.sh:312
-msgid "Cannot save the current status"
-msgstr ""
-
-#: git-stash.sh:313
+#: git-legacy-stash.sh:355
#, sh-format
msgid "Saved working directory and index state $stash_msg"
msgstr ""
-#: git-stash.sh:342
-msgid "Cannot remove worktree changes"
-msgstr ""
-
-#: git-stash.sh:490
+#: git-legacy-stash.sh:535
#, sh-format
msgid "unknown option: $opt"
msgstr ""
-#: git-stash.sh:503
-msgid "No stash entries found."
-msgstr ""
-
-#: git-stash.sh:510
+#: git-legacy-stash.sh:555
#, sh-format
msgid "Too many revisions specified: $REV"
msgstr ""
-#: git-stash.sh:525
+#: git-legacy-stash.sh:570
#, sh-format
msgid "$reference is not a valid reference"
msgstr ""
-#: git-stash.sh:553
+#: git-legacy-stash.sh:598
#, sh-format
msgid "'$args' is not a stash-like commit"
msgstr ""
-#: git-stash.sh:564
+#: git-legacy-stash.sh:609
#, sh-format
msgid "'$args' is not a stash reference"
msgstr ""
-#: git-stash.sh:572
+#: git-legacy-stash.sh:617
msgid "unable to refresh index"
msgstr ""
-#: git-stash.sh:576
+#: git-legacy-stash.sh:621
msgid "Cannot apply a stash in the middle of a merge"
msgstr ""
-#: git-stash.sh:584
+#: git-legacy-stash.sh:629
msgid "Conflicts in index. Try without --index."
msgstr ""
-#: git-stash.sh:586
+#: git-legacy-stash.sh:631
msgid "Could not save index tree"
msgstr ""
-#: git-stash.sh:595
+#: git-legacy-stash.sh:640
msgid "Could not restore untracked files from stash entry"
msgstr ""
-#: git-stash.sh:620
+#: git-legacy-stash.sh:665
msgid "Cannot unstage modified files"
msgstr ""
-#: git-stash.sh:635
-msgid "Index was not unstashed."
-msgstr ""
-
-#: git-stash.sh:649
-msgid "The stash entry is kept in case you need it again."
-msgstr ""
-
-#: git-stash.sh:658
+#: git-legacy-stash.sh:703
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr ""
-#: git-stash.sh:659
+#: git-legacy-stash.sh:704
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr ""
-#: git-stash.sh:667
-msgid "No branch name specified"
-msgstr ""
-
-#: git-stash.sh:746
+#: git-legacy-stash.sh:791
msgid "(To restore them type \"git stash apply\")"
msgstr ""
-#: git-submodule.sh:188
+#: git-submodule.sh:200
msgid "Relative path can only be used from the toplevel of the working tree"
msgstr ""
-#: git-submodule.sh:198
+#: git-submodule.sh:210
#, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
msgstr ""
-#: git-submodule.sh:217
+#: git-submodule.sh:229
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr ""
-#: git-submodule.sh:220
+#: git-submodule.sh:232
#, sh-format
msgid "'$sm_path' already exists in the index and is not a submodule"
msgstr ""
-#: git-submodule.sh:226
+#: git-submodule.sh:239
+#, sh-format
+msgid "'$sm_path' does not have a commit checked out"
+msgstr ""
+
+#: git-submodule.sh:245
#, sh-format
msgid ""
"The following path is ignored by one of your .gitignore files:\n"
"Use -f if you really want to add it."
msgstr ""
-#: git-submodule.sh:249
+#: git-submodule.sh:268
#, sh-format
msgid "Adding existing repo at '$sm_path' to the index"
msgstr ""
-#: git-submodule.sh:251
+#: git-submodule.sh:270
#, sh-format
msgid "'$sm_path' already exists and is not a valid git repo"
msgstr ""
-#: git-submodule.sh:259
+#: git-submodule.sh:278
#, sh-format
msgid "A git directory for '$sm_name' is found locally with remote(s):"
msgstr ""
-#: git-submodule.sh:261
+#: git-submodule.sh:280
#, sh-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from\n"
"option."
msgstr ""
-#: git-submodule.sh:267
+#: git-submodule.sh:286
#, sh-format
msgid "Reactivating local git directory for submodule '$sm_name'."
msgstr ""
-#: git-submodule.sh:279
+#: git-submodule.sh:298
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
msgstr ""
-#: git-submodule.sh:284
+#: git-submodule.sh:303
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr ""
-#: git-submodule.sh:293
+#: git-submodule.sh:312
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr ""
-#: git-submodule.sh:354
-#, sh-format
-msgid "Entering '$displaypath'"
-msgstr ""
-
-#: git-submodule.sh:374
-#, sh-format
-msgid "Stopping at '$displaypath'; script returned non-zero status."
-msgstr ""
-
-#: git-submodule.sh:600
+#: git-submodule.sh:573
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:610
+#: git-submodule.sh:583
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr ""
-#: git-submodule.sh:615
+#: git-submodule.sh:588
#, sh-format
msgid ""
"Unable to find current ${remote_name}/${branch} revision in submodule path "
"'$sm_path'"
msgstr ""
-#: git-submodule.sh:633
+#: 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:639
+#: 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:646
+#: git-submodule.sh:619
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:647
+#: git-submodule.sh:620
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr ""
-#: git-submodule.sh:651
+#: git-submodule.sh:624
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:652
+#: git-submodule.sh:625
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr ""
-#: git-submodule.sh:657
+#: git-submodule.sh:630
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:658
+#: git-submodule.sh:631
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr ""
-#: git-submodule.sh:663
+#: git-submodule.sh:636
#, sh-format
msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:664
+#: git-submodule.sh:637
#, sh-format
msgid "Submodule path '$displaypath': '$command $sha1'"
msgstr ""
-#: git-submodule.sh:695
+#: git-submodule.sh:668
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:791
+#: git-submodule.sh:830
msgid "The --cached option cannot be used with the --files option"
msgstr ""
-#: git-submodule.sh:843
+#: git-submodule.sh:882
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr ""
-#: git-submodule.sh:863
+#: git-submodule.sh:902
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr ""
-#: git-submodule.sh:866
+#: git-submodule.sh:905
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr ""
-#: git-submodule.sh:869
+#: git-submodule.sh:908
#, sh-format
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
msgstr ""
msgid "See git-${cmd}(1) for details."
msgstr ""
-#: git-rebase--interactive.sh:142
+#: git-rebase--preserve-merges.sh:136
#, sh-format
msgid "Rebasing ($new_count/$total)"
msgstr ""
-#: git-rebase--interactive.sh:158
+#: git-rebase--preserve-merges.sh:152
msgid ""
"\n"
"Commands:\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"
+"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"
"These lines can be re-ordered; they are executed from top to bottom.\n"
msgstr ""
-#: git-rebase--interactive.sh:179
-msgid ""
-"\n"
-"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
-msgstr ""
-
-#: git-rebase--interactive.sh:183
-msgid ""
-"\n"
-"If you remove a line here THAT COMMIT WILL BE LOST.\n"
-msgstr ""
-
-#: git-rebase--interactive.sh:221
+#: 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:246
+#: git-rebase--preserve-merges.sh:240
#, sh-format
msgid "$sha1: not a commit that can be picked"
msgstr ""
-#: git-rebase--interactive.sh:285
+#: git-rebase--preserve-merges.sh:279
#, sh-format
msgid "Invalid commit name: $sha1"
msgstr ""
-#: git-rebase--interactive.sh:325
+#: git-rebase--preserve-merges.sh:309
msgid "Cannot write current commit's replacement sha1"
msgstr ""
-#: git-rebase--interactive.sh:376
+#: git-rebase--preserve-merges.sh:360
#, sh-format
msgid "Fast-forward to $sha1"
msgstr ""
-#: git-rebase--interactive.sh:378
+#: git-rebase--preserve-merges.sh:362
#, sh-format
msgid "Cannot fast-forward to $sha1"
msgstr ""
-#: git-rebase--interactive.sh:387
+#: git-rebase--preserve-merges.sh:371
#, sh-format
msgid "Cannot move HEAD to $first_parent"
msgstr ""
-#: git-rebase--interactive.sh:392
+#: git-rebase--preserve-merges.sh:376
#, sh-format
msgid "Refusing to squash a merge: $sha1"
msgstr ""
-#: git-rebase--interactive.sh:410
+#: git-rebase--preserve-merges.sh:394
#, sh-format
msgid "Error redoing merge $sha1"
msgstr ""
-#: git-rebase--interactive.sh:419
+#: git-rebase--preserve-merges.sh:403
#, sh-format
msgid "Could not pick $sha1"
msgstr ""
-#: git-rebase--interactive.sh:428
+#: git-rebase--preserve-merges.sh:412
#, sh-format
msgid "This is the commit message #${n}:"
msgstr ""
-#: git-rebase--interactive.sh:433
+#: git-rebase--preserve-merges.sh:417
#, sh-format
msgid "The commit message #${n} will be skipped:"
msgstr ""
-#: git-rebase--interactive.sh:444
+#: 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:453
+#: git-rebase--preserve-merges.sh:437
#, sh-format
msgid "Cannot write $fixup_msg"
msgstr ""
-#: git-rebase--interactive.sh:456
+#: git-rebase--preserve-merges.sh:440
msgid "This is a combination of 2 commits."
msgstr ""
-#: git-rebase--interactive.sh:497 git-rebase--interactive.sh:540
-#: git-rebase--interactive.sh:543
+#: 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:572
+#: 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:587
+#: git-rebase--preserve-merges.sh:571
#, sh-format
msgid "Stopped at $sha1_abbrev... $rest"
msgstr ""
-#: git-rebase--interactive.sh:602
+#: git-rebase--preserve-merges.sh:586
#, sh-format
msgid "Cannot '$squash_style' without a previous commit"
msgstr ""
-#: git-rebase--interactive.sh:644
+#: git-rebase--preserve-merges.sh:628
#, sh-format
msgid "Executing: $rest"
msgstr ""
-#: git-rebase--interactive.sh:652
+#: git-rebase--preserve-merges.sh:636
#, sh-format
msgid "Execution failed: $rest"
msgstr ""
-#: git-rebase--interactive.sh:654
+#: git-rebase--preserve-merges.sh:638
msgid "and made changes to the index and/or the working tree"
msgstr ""
-#: git-rebase--interactive.sh:656
+#: 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:669
+#: git-rebase--preserve-merges.sh:653
#, sh-format
msgid ""
"Execution succeeded: $rest\n"
"\tgit rebase --continue"
msgstr ""
-#: git-rebase--interactive.sh:680
+#: git-rebase--preserve-merges.sh:664
#, sh-format
msgid "Unknown command: $command $sha1 $rest"
msgstr ""
-#: git-rebase--interactive.sh:681
+#: git-rebase--preserve-merges.sh:665
msgid "Please fix this using 'git rebase --edit-todo'."
msgstr ""
-#: git-rebase--interactive.sh:716
+#: git-rebase--preserve-merges.sh:700
#, sh-format
msgid "Successfully rebased and updated $head_name."
msgstr ""
-#: git-rebase--interactive.sh:740
-msgid "could not detach HEAD"
-msgstr ""
-
-#: git-rebase--interactive.sh:778
+#: git-rebase--preserve-merges.sh:757
msgid "Could not remove CHERRY_PICK_HEAD"
msgstr ""
-#: git-rebase--interactive.sh:783
+#: 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:800
+#: git-rebase--preserve-merges.sh:779
msgid "Error trying to find the author identity to amend commit"
msgstr ""
-#: git-rebase--interactive.sh:805
+#: 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:810 git-rebase--interactive.sh:814
+#: git-rebase--preserve-merges.sh:789 git-rebase--preserve-merges.sh:793
msgid "Could not commit staged changes."
msgstr ""
-#: git-rebase--interactive.sh:843
-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:851 git-rebase--interactive.sh:937
+#: git-rebase--preserve-merges.sh:824 git-rebase--preserve-merges.sh:910
msgid "Could not execute editor"
msgstr ""
-#: git-rebase--interactive.sh:872
+#: git-rebase--preserve-merges.sh:845
#, sh-format
msgid "Could not checkout $switch_to"
msgstr ""
-#: git-rebase--interactive.sh:879
+#: git-rebase--preserve-merges.sh:852
msgid "No HEAD?"
msgstr ""
-#: git-rebase--interactive.sh:880
+#: git-rebase--preserve-merges.sh:853
#, sh-format
msgid "Could not create temporary $state_dir"
msgstr ""
-#: git-rebase--interactive.sh:883
+#: git-rebase--preserve-merges.sh:856
msgid "Could not mark as interactive"
msgstr ""
-#: git-rebase--interactive.sh:915
+#: 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:920
-msgid ""
-"\n"
-"\tHowever, if you remove everything, the rebase will be aborted.\n"
-"\n"
-"\t"
-msgstr ""
-
-#: git-rebase--interactive.sh:927
-msgid "Note that empty commits are commented out"
-msgstr ""
-
-#: git-rebase--interactive.sh:980
-msgid "Could not generate todo list"
-msgstr ""
-
-#: git-rebase--interactive.sh:1001 git-rebase--interactive.sh:1006
+#: git-rebase--preserve-merges.sh:942 git-rebase--preserve-merges.sh:947
msgid "Could not init rewritten commits"
msgstr ""
msgid "usage: $dashless $USAGE"
msgstr ""
-#: git-sh-setup.sh:190
+#: git-sh-setup.sh:191
#, sh-format
msgid "Cannot chdir to $cdup, the toplevel of the working tree"
msgstr ""
-#: git-sh-setup.sh:199 git-sh-setup.sh:206
+#: git-sh-setup.sh:200 git-sh-setup.sh:207
#, sh-format
msgid "fatal: $program_name cannot be used without a working tree."
msgstr ""
-#: git-sh-setup.sh:220
+#: git-sh-setup.sh:221
msgid "Cannot rebase: You have unstaged changes."
msgstr ""
-#: git-sh-setup.sh:223
+#: git-sh-setup.sh:224
msgid "Cannot rewrite branches: You have unstaged changes."
msgstr ""
-#: git-sh-setup.sh:226
+#: git-sh-setup.sh:227
msgid "Cannot pull with rebase: You have unstaged changes."
msgstr ""
-#: git-sh-setup.sh:229
+#: git-sh-setup.sh:230
#, sh-format
msgid "Cannot $action: You have unstaged changes."
msgstr ""
-#: git-sh-setup.sh:242
+#: git-sh-setup.sh:243
msgid "Cannot rebase: Your index contains uncommitted changes."
msgstr ""
-#: git-sh-setup.sh:245
+#: git-sh-setup.sh:246
msgid "Cannot pull with rebase: Your index contains uncommitted changes."
msgstr ""
-#: git-sh-setup.sh:248
+#: git-sh-setup.sh:249
#, sh-format
msgid "Cannot $action: Your index contains uncommitted changes."
msgstr ""
-#: git-sh-setup.sh:252
+#: git-sh-setup.sh:253
msgid "Additionally, your index contains uncommitted changes."
msgstr ""
-#: git-sh-setup.sh:372
+#: git-sh-setup.sh:373
msgid "You need to run this command from the toplevel of the working tree."
msgstr ""
-#: git-sh-setup.sh:377
+#: git-sh-setup.sh:378
msgid "Unable to determine absolute path of git directory"
msgstr ""
msgid "invalid argument %s, expecting --"
msgstr ""
-#: git-send-email.perl:130
+#: git-send-email.perl:138
msgid "local zone differs from GMT by a non-minute interval\n"
msgstr ""
-#: git-send-email.perl:137 git-send-email.perl:143
+#: git-send-email.perl:145 git-send-email.perl:151
msgid "local time offset greater than or equal to 24 hours\n"
msgstr ""
-#: git-send-email.perl:211 git-send-email.perl:217
+#: git-send-email.perl:219 git-send-email.perl:225
msgid "the editor exited uncleanly, aborting everything"
msgstr ""
-#: git-send-email.perl:294
+#: 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:299
+#: git-send-email.perl:307
#, perl-format
msgid "'%s.final' contains the composed email.\n"
msgstr ""
-#: git-send-email.perl:317
+#: git-send-email.perl:326
msgid "--dump-aliases incompatible with other options\n"
msgstr ""
-#: git-send-email.perl:383 git-send-email.perl:638
+#: 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:386
+#: 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:456
+#: git-send-email.perl:470
#, perl-format
msgid "Unknown --suppress-cc field: '%s'\n"
msgstr ""
-#: git-send-email.perl:485
+#: git-send-email.perl:501
#, perl-format
msgid "Unknown --confirm setting: '%s'\n"
msgstr ""
-#: git-send-email.perl:513
+#: git-send-email.perl:529
#, perl-format
msgid "warning: sendmail alias with quotes is not supported: %s\n"
msgstr ""
-#: git-send-email.perl:515
+#: git-send-email.perl:531
#, perl-format
msgid "warning: `:include:` not supported: %s\n"
msgstr ""
-#: git-send-email.perl:517
+#: git-send-email.perl:533
#, perl-format
msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
msgstr ""
-#: git-send-email.perl:522
+#: git-send-email.perl:538
#, perl-format
msgid "warning: sendmail line is not recognized: %s\n"
msgstr ""
-#: git-send-email.perl:604
+#: 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:625
+#: git-send-email.perl:643
#, perl-format
msgid "Failed to opendir %s: %s"
msgstr ""
-#: git-send-email.perl:649
+#: git-send-email.perl:667
#, perl-format
msgid ""
"fatal: %s: %s\n"
"warning: no patches were sent\n"
msgstr ""
-#: git-send-email.perl:660
+#: git-send-email.perl:678
msgid ""
"\n"
"No patch files specified!\n"
"\n"
msgstr ""
-#: git-send-email.perl:673
+#: git-send-email.perl:691
#, perl-format
msgid "No subject line in %s?"
msgstr ""
-#: git-send-email.perl:683
+#: git-send-email.perl:701
#, perl-format
msgid "Failed to open for writing %s: %s"
msgstr ""
-#: git-send-email.perl:694
+#: 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:718
+#: git-send-email.perl:736
#, perl-format
msgid "Failed to open %s: %s"
msgstr ""
-#: git-send-email.perl:735
+#: git-send-email.perl:753
#, perl-format
msgid "Failed to open %s.final: %s"
msgstr ""
-#: git-send-email.perl:778
+#: 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:813
+#: git-send-email.perl:831
#, perl-format
msgid "Are you sure you want to use <%s> [y/N]? "
msgstr ""
-#: git-send-email.perl:868
+#: 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:873
+#: git-send-email.perl:891
msgid "Which 8bit encoding should I declare [UTF-8]? "
msgstr ""
-#: git-send-email.perl:881
+#: git-send-email.perl:899
#, perl-format
msgid ""
"Refusing to send because the patch\n"
"want to send.\n"
msgstr ""
-#: git-send-email.perl:900
+#: git-send-email.perl:918
msgid "To whom should the emails be sent (if anyone)?"
msgstr ""
-#: git-send-email.perl:918
+#: git-send-email.perl:936
#, perl-format
msgid "fatal: alias '%s' expands to itself\n"
msgstr ""
-#: git-send-email.perl:930
+#: 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:988 git-send-email.perl:996
+#: 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:1000
+#: git-send-email.perl:1018
msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
msgstr ""
-#: git-send-email.perl:1317
+#: git-send-email.perl:1335
#, perl-format
msgid "CA path \"%s\" does not exist"
msgstr ""
-#: git-send-email.perl:1400
+#: 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"
#. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-send-email.perl:1415
+#: git-send-email.perl:1433
msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
msgstr ""
-#: git-send-email.perl:1418
+#: git-send-email.perl:1436
msgid "Send this email reply required"
msgstr ""
-#: git-send-email.perl:1446
+#: git-send-email.perl:1464
msgid "The required SMTP server is not properly defined."
msgstr ""
-#: git-send-email.perl:1493
+#: git-send-email.perl:1511
#, perl-format
msgid "Server does not support STARTTLS! %s"
msgstr ""
-#: git-send-email.perl:1498 git-send-email.perl:1502
+#: git-send-email.perl:1516 git-send-email.perl:1520
#, perl-format
msgid "STARTTLS failed! %s"
msgstr ""
-#: git-send-email.perl:1512
+#: git-send-email.perl:1529
msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
msgstr ""
-#: git-send-email.perl:1530
+#: git-send-email.perl:1547
#, perl-format
msgid "Failed to send %s\n"
msgstr ""
-#: git-send-email.perl:1533
+#: git-send-email.perl:1550
#, perl-format
msgid "Dry-Sent %s\n"
msgstr ""
-#: git-send-email.perl:1533
+#: git-send-email.perl:1550
#, perl-format
msgid "Sent %s\n"
msgstr ""
-#: git-send-email.perl:1535
+#: git-send-email.perl:1552
msgid "Dry-OK. Log says:\n"
msgstr ""
-#: git-send-email.perl:1535
+#: git-send-email.perl:1552
msgid "OK. Log says:\n"
msgstr ""
-#: git-send-email.perl:1547
+#: git-send-email.perl:1564
msgid "Result: "
msgstr ""
-#: git-send-email.perl:1550
+#: git-send-email.perl:1567
msgid "Result: OK\n"
msgstr ""
-#: git-send-email.perl:1568
+#: git-send-email.perl:1585
#, perl-format
msgid "can't open file %s"
msgstr ""
-#: git-send-email.perl:1615 git-send-email.perl:1635
+#: 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:1621
+#: git-send-email.perl:1638
#, perl-format
msgid "(mbox) Adding to: %s from line '%s'\n"
msgstr ""
-#: git-send-email.perl:1674
+#: git-send-email.perl:1691
#, perl-format
msgid "(non-mbox) Adding cc: %s from line '%s'\n"
msgstr ""
-#: git-send-email.perl:1699
+#: git-send-email.perl:1726
#, perl-format
msgid "(body) Adding cc: %s from line '%s'\n"
msgstr ""
-#: git-send-email.perl:1817
+#: git-send-email.perl:1837
#, perl-format
msgid "(%s) Could not execute '%s'"
msgstr ""
-#: git-send-email.perl:1824
+#: git-send-email.perl:1844
#, perl-format
msgid "(%s) Adding %s: %s from: '%s'\n"
msgstr ""
-#: git-send-email.perl:1828
+#: git-send-email.perl:1848
#, perl-format
msgid "(%s) failed to close pipe to '%s'"
msgstr ""
-#: git-send-email.perl:1855
+#: git-send-email.perl:1878
msgid "cannot send message as 7bit"
msgstr ""
-#: git-send-email.perl:1863
+#: git-send-email.perl:1886
msgid "invalid transfer encoding"
msgstr ""
-#: git-send-email.perl:1901 git-send-email.perl:1952 git-send-email.perl:1962
+#: 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:1904
+#: git-send-email.perl:1930
#, perl-format
msgid "%s: patch contains a line longer than 998 characters"
msgstr ""
-#: git-send-email.perl:1920
+#: 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:1924
+#: git-send-email.perl:1951
#, perl-format
msgid "Do you really want to send %s? [y|N]: "
msgstr ""