msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2018-03-16 07:29+0800\n"
+"POT-Creation-Date: 2019-05-31 14:35+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:62
+#: advice.c:103
#, c-format
-msgid "hint: %.*s\n"
+msgid "%shint: %.*s%s\n"
msgstr ""
-#: advice.c:90
+#: advice.c:156
msgid "Cherry-picking is not possible because you have unmerged files."
msgstr ""
-#: advice.c:92
+#: advice.c:158
msgid "Committing is not possible because you have unmerged files."
msgstr ""
-#: advice.c:94
+#: advice.c:160
msgid "Merging is not possible because you have unmerged files."
msgstr ""
-#: advice.c:96
+#: advice.c:162
msgid "Pulling is not possible because you have unmerged files."
msgstr ""
-#: advice.c:98
+#: advice.c:164
msgid "Reverting is not possible because you have unmerged files."
msgstr ""
-#: advice.c:100
+#: advice.c:166
#, c-format
msgid "It is not possible to %s because you have unmerged files."
msgstr ""
-#: advice.c:108
+#: 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:116
+#: advice.c:182
msgid "Exiting because of an unresolved conflict."
msgstr ""
-#: advice.c:121 builtin/merge.c:1251
+#: advice.c:187 builtin/merge.c:1320
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr ""
-#: advice.c:123
+#: advice.c:189
msgid "Please, commit your changes before merging."
msgstr ""
-#: advice.c:124
+#: advice.c:190
msgid "Exiting because of unfinished merge."
msgstr ""
-#: advice.c:130
+#: 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:277
+#: apply.c:3412 apply.c:3423 apply.c:3469 midx.c:59 setup.c:279
#, c-format
msgid "failed to read %s"
msgstr ""
-#: apply.c: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:775 builtin/fetch.c:1025
+#: 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:539 builtin/mv.c:298 builtin/rm.c:390
+#: 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:118 builtin/fetch.c:127 builtin/pull.c:193
-#: builtin/submodule--helper.c:403 builtin/submodule--helper.c:1197
-#: builtin/submodule--helper.c:1200 builtin/submodule--helper.c:1567
-#: builtin/submodule--helper.c:1570 builtin/submodule--helper.c:1787
-#: 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:3035
+#: 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:292 builtin/check-ignore.c:21
-#: builtin/commit.c:1276 builtin/count-objects.c:96 builtin/fsck.c:665
-#: builtin/log.c:1901 builtin/mv.c:123 builtin/read-tree.c:125
+#: apply.c:5021 builtin/add.c:291 builtin/check-ignore.c:22
+#: builtin/commit.c:1317 builtin/count-objects.c:98 builtin/fsck.c:786
+#: builtin/log.c:2045 builtin/mv.c:123 builtin/read-tree.c:128
msgid "be verbose"
msgstr ""
-#: apply.c: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:515 builtin/rm.c:299
+#: 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:436
+#: 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:436
+#: archive.c:455
msgid "archive format"
msgstr ""
-#: archive.c:437 builtin/log.c:1462
+#: archive.c:456 builtin/log.c:1557
msgid "prefix"
msgstr ""
-#: archive.c:438
+#: archive.c:457
msgid "prepend prefix to each pathname in the archive"
msgstr ""
-#: archive.c:439 builtin/blame.c:702 builtin/blame.c:703 builtin/config.c:62
-#: builtin/fast-export.c:1005 builtin/fast-export.c:1007 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:120
-#: 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:440 builtin/archive.c:89
+#: archive.c:459 builtin/archive.c:90
msgid "write the archive to this file"
msgstr ""
-#: archive.c:442
+#: archive.c:461
msgid "read .gitattributes in working directory"
msgstr ""
-#: archive.c:443
+#: archive.c:462
msgid "report archived files on stderr"
msgstr ""
-#: archive.c:444
+#: archive.c:463
msgid "store only"
msgstr ""
-#: archive.c:445
+#: archive.c:464
msgid "compress faster"
msgstr ""
-#: archive.c:453
+#: archive.c:472
msgid "compress better"
msgstr ""
-#: archive.c:456
+#: archive.c:475
msgid "list supported archive formats"
msgstr ""
-#: archive.c:458 builtin/archive.c:90 builtin/clone.c:108 builtin/clone.c:111
-#: builtin/submodule--helper.c:1209 builtin/submodule--helper.c:1576
+#: 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:459 builtin/archive.c:91
+#: archive.c:478 builtin/archive.c:92
msgid "retrieve the archive from remote repository <repo>"
msgstr ""
-#: archive.c:460 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:461 builtin/archive.c:93
+#: archive.c:480 builtin/archive.c:94
msgid "path to the remote git-upload-archive command"
msgstr ""
-#: archive.c:468
+#: archive.c:487
msgid "Unexpected option --remote"
msgstr ""
-#: archive.c:470
+#: archive.c:489
msgid "Option --exec can only be used together with --remote"
msgstr ""
-#: archive.c:472
+#: archive.c:491
msgid "Unexpected option --output"
msgstr ""
-#: archive.c:494
+#: archive.c:513
#, c-format
msgid "Unknown archive format '%s'"
msgstr ""
-#: archive.c:501
+#: 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:460
+#: bisect.c:468
#, c-format
msgid "Badly quoted content in file '%s': %s"
msgstr ""
-#: bisect.c:668
+#: bisect.c:678
#, c-format
msgid "We cannot bisect more!\n"
msgstr ""
-#: bisect.c:722
+#: bisect.c:733
#, c-format
msgid "Not a valid commit name %s"
msgstr ""
-#: bisect.c:746
+#: 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:751
+#: 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:756
+#: 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:764
+#: 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:777
+#: bisect.c:789
#, c-format
msgid ""
"the merge base between %s and [%s] must be skipped.\n"
"We continue anyway."
msgstr ""
-#: bisect.c:810
+#: bisect.c:822
#, c-format
msgid "Bisecting: a merge base must be tested\n"
msgstr ""
-#: bisect.c:850
+#: bisect.c:865
#, c-format
msgid "a %s revision is needed"
msgstr ""
-#: bisect.c:869 builtin/notes.c:175 builtin/tag.c:235
+#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:248
#, c-format
msgid "could not create file '%s'"
msgstr ""
-#: bisect.c:920
+#: bisect.c:928 builtin/merge.c:146
#, c-format
msgid "could not read file '%s'"
msgstr ""
-#: bisect.c:950
+#: bisect.c:958
msgid "reading bisect refs failed"
msgstr ""
-#: bisect.c:969
+#: bisect.c:977
#, c-format
msgid "%s was both %s and %s\n"
msgstr ""
-#: bisect.c:977
+#: bisect.c:985
#, c-format
msgid ""
"No testable commit found.\n"
"Maybe you started with bad path parameters?\n"
msgstr ""
-#: bisect.c:996
+#: 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:1002
+#: 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:1758
+#: blame.c:1794
msgid "--contents and --reverse do not blend well."
msgstr ""
-#: blame.c:1769
+#: blame.c:1808
msgid "cannot use --contents with final commit object name"
msgstr ""
-#: blame.c:1789
+#: blame.c:1829
msgid "--reverse and --first-parent together require specified latest commit"
msgstr ""
-#: blame.c:1798 bundle.c:160 ref-filter.c:1978 sequencer.c:1699
-#: sequencer.c:2901 builtin/commit.c:976 builtin/log.c:366 builtin/log.c:920
-#: builtin/log.c:1371 builtin/log.c:1702 builtin/log.c:1950 builtin/merge.c:370
-#: builtin/shortlog.c:191
+#: 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:1816
+#: blame.c:1856
msgid ""
"--reverse --first-parent together require range along first-parent chain"
msgstr ""
-#: blame.c:1827
+#: blame.c:1867
#, c-format
msgid "no such path %s in %s"
msgstr ""
-#: blame.c:1838
+#: blame.c:1878
#, c-format
msgid "cannot read blob %s for path %s"
msgstr ""
"\"git push -u\" to set the upstream config as you push."
msgstr ""
-#: branch.c:280
+#: branch.c:281
#, c-format
msgid "Not a valid object name: '%s'."
msgstr ""
-#: branch.c:300
+#: branch.c:301
#, c-format
msgid "Ambiguous object name: '%s'."
msgstr ""
-#: branch.c:305
+#: branch.c:306
#, c-format
msgid "Not a valid branch point: '%s'."
msgstr ""
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:1879 sequencer.c:2337 builtin/commit.c:750
+#: 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:296
+#: 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:41 sequencer.c:2141 builtin/am.c:421 builtin/am.c:465
-#: builtin/am.c:1436 builtin/am.c:2072
+#: commit.c:50 sequencer.c:2697 builtin/am.c:355 builtin/am.c:399
+#: builtin/am.c:1377 builtin/am.c:2022 builtin/replace.c:455
#, c-format
msgid "could not parse %s"
msgstr ""
-#: commit.c:43
+#: commit.c:52
#, c-format
msgid "%s %s is not a commit!"
msgstr ""
-#: commit.c:1506
+#: commit.c:193
+msgid ""
+"Support for <GIT_DIR>/info/grafts is deprecated\n"
+"and will be removed in a future Git version.\n"
+"\n"
+"Please use \"git replace --convert-graft-file\"\n"
+"to convert the grafts into replace refs.\n"
+"\n"
+"Turn this message off by running\n"
+"\"git config advice.graftFileDeprecated false\""
+msgstr ""
+
+#: commit.c: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 ""
-#: compat/obstack.c:405 compat/obstack.c:407
-msgid "memory exhausted"
+#: commit-graph.c:105
+msgid "commit-graph file is too small"
msgstr ""
-#: config.c:186
-msgid "relative config include conditionals must come from files"
+#: commit-graph.c:170
+#, c-format
+msgid "commit-graph signature %X does not match signature %X"
msgstr ""
-#: config.c:720
+#: commit-graph.c:177
#, c-format
-msgid "bad config line %d in blob %s"
+msgid "commit-graph version %X does not match version %X"
msgstr ""
-#: config.c:724
+#: commit-graph.c:184
#, c-format
-msgid "bad config line %d in file %s"
+msgid "commit-graph hash version %X does not match version %X"
+msgstr ""
+
+#: commit-graph.c:207
+msgid "commit-graph chunk lookup table entry missing; file may be incomplete"
msgstr ""
-#: config.c:728
+#: commit-graph.c:218
#, c-format
-msgid "bad config line %d in standard input"
+msgid "commit-graph improper chunk offset %08x%08x"
msgstr ""
-#: config.c:732
+#: commit-graph.c:255
#, c-format
-msgid "bad config line %d in submodule-blob %s"
+msgid "commit-graph chunk id %08x appears multiple times"
msgstr ""
-#: config.c:736
+#: commit-graph.c:390
#, c-format
-msgid "bad config line %d in command line %s"
+msgid "could not find commit %s"
msgstr ""
-#: config.c:740
+#: commit-graph.c:732 builtin/pack-objects.c:2649
#, c-format
-msgid "bad config line %d in %s"
+msgid "unable to get type of object %s"
msgstr ""
-#: config.c:868
-msgid "out of range"
+#: commit-graph.c:765
+msgid "Loading known commits in commit graph"
msgstr ""
-#: config.c:868
-msgid "invalid unit"
+#: commit-graph.c:781
+msgid "Expanding reachable commits in commit graph"
msgstr ""
-#: config.c:874
-#, c-format
-msgid "bad numeric config value '%s' for '%s': %s"
+#: commit-graph.c:793
+msgid "Clearing commit marks in commit graph"
msgstr ""
-#: config.c:879
-#, c-format
-msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
+#: commit-graph.c:813
+msgid "Computing commit graph generation numbers"
msgstr ""
-#: config.c:882
+#: commit-graph.c:930
#, c-format
-msgid "bad numeric config value '%s' for '%s' in file %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:885
+#: commit-graph.c:943
#, c-format
-msgid "bad numeric config value '%s' for '%s' in standard input: %s"
+msgid "error adding pack %s"
msgstr ""
-#: config.c:888
+#: commit-graph.c:945
#, c-format
-msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
+msgid "error opening index for %s"
msgstr ""
-#: config.c:891
+#: commit-graph.c:959
#, c-format
-msgid "bad numeric config value '%s' for '%s' in command line %s: %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:894
-#, c-format
-msgid "bad numeric config value '%s' for '%s' in %s: %s"
+#: commit-graph.c:1004
+msgid "Counting distinct commits in commit graph"
msgstr ""
-#: config.c:989
+#: commit-graph.c:1017
#, c-format
-msgid "failed to expand user dir in: '%s'"
+msgid "the commit graph format cannot write %d commits"
+msgstr ""
+
+#: commit-graph.c:1026
+msgid "Finding extra edges in commit graph"
msgstr ""
-#: config.c:998
+#: commit-graph.c:1050
+msgid "too many commits to write graph"
+msgstr ""
+
+#: 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:1094 config.c:1105
+#: 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:1225
+#: 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:1386
+#: 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:1582
-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:1914
-msgid "unknown error occurred while reading the configuration files"
+#: commit-graph.c:1206
+msgid "Verifying commits in commit graph"
msgstr ""
-#: config.c:2101
+#: 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:2144
+#: 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:2170
+#: 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:2195
+#: 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:2197
+#: 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:2256
+#: 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:2599 config.c:2816
+#: 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:2706
+#: 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:2708 builtin/remote.c:776
+#: 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:52
-msgid "The remote end hung up upon initial contact"
+#: compat/obstack.c:406 compat/obstack.c:408
+msgid "memory exhausted"
msgstr ""
-#: connect.c:54
+#: 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:198 builtin/prune.c:144
-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:205
+#: 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:207
+#: 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:215
+#: config.c:384
#, c-format
-msgid "LF would be replaced by CRLF in %s"
+msgid "invalid key (newline): %s"
msgstr ""
-#: convert.c:217
+#: 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 ""
-#: date.c:116
-msgid "in the future"
+#: config.c:467
+#, c-format
+msgid "bogus format in %s"
msgstr ""
-#: date.c:122
+#: config.c:793
#, c-format
-msgid "%<PRIuMAX> second ago"
-msgid_plural "%<PRIuMAX> seconds ago"
-msgstr[0] ""
-msgstr[1] ""
+msgid "bad config line %d in blob %s"
+msgstr ""
-#: date.c:129
+#: config.c:797
#, c-format
-msgid "%<PRIuMAX> minute ago"
-msgid_plural "%<PRIuMAX> minutes ago"
-msgstr[0] ""
-msgstr[1] ""
+msgid "bad config line %d in file %s"
+msgstr ""
-#: date.c:136
+#: config.c:801
#, c-format
-msgid "%<PRIuMAX> hour ago"
-msgid_plural "%<PRIuMAX> hours ago"
-msgstr[0] ""
-msgstr[1] ""
+msgid "bad config line %d in standard input"
+msgstr ""
-#: date.c:143
+#: config.c:805
#, c-format
-msgid "%<PRIuMAX> day ago"
-msgid_plural "%<PRIuMAX> days ago"
-msgstr[0] ""
-msgstr[1] ""
+msgid "bad config line %d in submodule-blob %s"
+msgstr ""
-#: date.c:149
+#: config.c:809
#, c-format
-msgid "%<PRIuMAX> week ago"
-msgid_plural "%<PRIuMAX> weeks ago"
-msgstr[0] ""
-msgstr[1] ""
+msgid "bad config line %d in command line %s"
+msgstr ""
-#: date.c:156
+#: config.c:813
#, c-format
-msgid "%<PRIuMAX> month ago"
-msgid_plural "%<PRIuMAX> months ago"
-msgstr[0] ""
-msgstr[1] ""
+msgid "bad config line %d in %s"
+msgstr ""
-#: date.c:167
-#, c-format
-msgid "%<PRIuMAX> year"
-msgid_plural "%<PRIuMAX> years"
-msgstr[0] ""
-msgstr[1] ""
+#: config.c:952
+msgid "out of range"
+msgstr ""
-#. TRANSLATORS: "%s" is "<n> years"
-#: date.c:170
+#: config.c:952
+msgid "invalid unit"
+msgstr ""
+
+#: config.c:958
#, c-format
-msgid "%s, %<PRIuMAX> month ago"
-msgid_plural "%s, %<PRIuMAX> months ago"
-msgstr[0] ""
-msgstr[1] ""
+msgid "bad numeric config value '%s' for '%s': %s"
+msgstr ""
-#: date.c:175 date.c:180
+#: config.c:963
#, c-format
-msgid "%<PRIuMAX> year ago"
-msgid_plural "%<PRIuMAX> years ago"
-msgstr[0] ""
-msgstr[1] ""
+msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
+msgstr ""
-#: diffcore-order.c:24
+#: config.c:966
#, c-format
-msgid "failed to read orderfile '%s'"
+msgid "bad numeric config value '%s' for '%s' in file %s: %s"
msgstr ""
-#: diffcore-rename.c:535
-msgid "Performing inexact rename detection"
+#: config.c:969
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in standard input: %s"
msgstr ""
-#: diff.c:74
+#: config.c:972
#, c-format
-msgid "option '%s' requires a value"
+msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
msgstr ""
-#: diff.c:152
+#: config.c:975
#, c-format
-msgid " Failed to parse dirstat cut-off percentage '%s'\n"
+msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
msgstr ""
-#: diff.c:157
+#: config.c:978
#, c-format
-msgid " Unknown dirstat parameter '%s'\n"
+msgid "bad numeric config value '%s' for '%s' in %s: %s"
msgstr ""
-#: diff.c:281
-msgid ""
-"color moved setting must be one of 'no', 'default', 'zebra', 'dimmed_zebra', "
-"'plain'"
+#: config.c:1073
+#, c-format
+msgid "failed to expand user dir in: '%s'"
msgstr ""
-#: diff.c:341
+#: config.c:1082
#, c-format
-msgid "Unknown value for 'diff.submodule' config variable: '%s'"
+msgid "'%s' for '%s' is not a valid timestamp"
msgstr ""
-#: diff.c:401
+#: config.c:1173
#, c-format
-msgid ""
-"Found errors in 'diff.dirstat' config variable:\n"
-"%s"
+msgid "abbrev length out of range: %d"
msgstr ""
-#: diff.c:3822
+#: config.c:1187 config.c:1198
#, c-format
-msgid "external diff died, stopping at %s"
+msgid "bad zlib compression level %d"
msgstr ""
-#: diff.c:4146
-msgid "--name-only, --name-status, --check and -s are mutually exclusive"
-msgstr ""
-
-#: diff.c:4149
-msgid "-G, -S and --find-object are mutually exclusive"
+#: config.c:1290
+msgid "core.commentChar should only be one character"
msgstr ""
-#: diff.c:4237
-msgid "--follow requires exactly one pathspec"
-msgstr ""
-
-#: diff.c:4403
+#: config.c:1323
#, c-format
-msgid ""
-"Failed to parse --dirstat/-X option parameter:\n"
-"%s"
+msgid "invalid mode for object creation: %s"
msgstr ""
-#: diff.c:4417
+#: config.c:1395
#, c-format
-msgid "Failed to parse --submodule option parameter: '%s'"
+msgid "malformed value for %s"
msgstr ""
-#: diff.c:5493
-msgid "inexact rename detection was skipped due to too many files."
+#: config.c:1421
+#, c-format
+msgid "malformed value for %s: %s"
msgstr ""
-#: diff.c:5496
-msgid "only found copies from modified paths due to too many files."
+#: config.c:1422
+msgid "must be one of nothing, matching, simple, upstream or current"
msgstr ""
-#: diff.c:5499
+#: config.c:1483 builtin/pack-objects.c:3397
#, c-format
-msgid ""
-"you may want to set your %s variable to at least %d and retry the command."
+msgid "bad pack compression level %d"
msgstr ""
-#: dir.c:1866
+#: config.c:1604
#, c-format
-msgid "could not open directory '%s'"
-msgstr ""
-
-#: dir.c:2108
-msgid "failed to get kernel name and information"
+msgid "unable to load config blob object '%s'"
msgstr ""
-#: dir.c:2232
-msgid "Untracked cache is disabled on this system or location."
+#: config.c:1607
+#, c-format
+msgid "reference '%s' does not point to a blob"
msgstr ""
-#: dir.c:3024 dir.c:3029
+#: config.c:1624
#, c-format
-msgid "could not create directories for %s"
+msgid "unable to resolve config blob '%s'"
msgstr ""
-#: dir.c:3054
+#: config.c:1654
#, c-format
-msgid "could not migrate git directory from '%s' to '%s'"
+msgid "failed to parse %s"
msgstr ""
-#: editor.c:61
-#, c-format
-msgid "hint: Waiting for your editor to close the file...%c"
+#: config.c:1710
+msgid "unable to parse command-line config"
msgstr ""
-#: entry.c:177
-msgid "Filtering content"
+#: config.c:2059
+msgid "unknown error occurred while reading the configuration files"
msgstr ""
-#: entry.c:435
+#: config.c:2229
#, c-format
-msgid "could not stat file '%s'"
+msgid "Invalid %s: '%s'"
msgstr ""
-#: fetch-object.c:17
-msgid "Remote with no URL"
+#: config.c:2272
+#, c-format
+msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
msgstr ""
-#: fetch-pack.c:253
-msgid "git fetch-pack: expected shallow list"
+#: config.c:2298
+#, c-format
+msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
msgstr ""
-#: fetch-pack.c:265
-msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
+#: config.c:2344
+#, c-format
+msgid "unable to parse '%s' from command-line config"
msgstr ""
-#: fetch-pack.c:284 builtin/archive.c:63
+#: config.c:2346
#, c-format
-msgid "remote error: %s"
+msgid "bad config variable '%s' in file '%s' at line %d"
msgstr ""
-#: fetch-pack.c:285
+#: config.c:2427
#, c-format
-msgid "git fetch-pack: expected ACK/NAK, got '%s'"
+msgid "invalid section name '%s'"
msgstr ""
-#: fetch-pack.c:337
-msgid "--stateless-rpc requires multi_ack_detailed"
+#: config.c:2459
+#, c-format
+msgid "%s has multiple values"
msgstr ""
-#: fetch-pack.c:428
+#: config.c:2488
#, c-format
-msgid "invalid shallow line: %s"
+msgid "failed to write new configuration file %s"
msgstr ""
-#: fetch-pack.c:434
+#: config.c:2740 config.c:3064
#, c-format
-msgid "invalid unshallow line: %s"
+msgid "could not lock config file %s"
msgstr ""
-#: fetch-pack.c:436
+#: config.c:2751
#, c-format
-msgid "object not found: %s"
+msgid "opening %s"
msgstr ""
-#: fetch-pack.c:439
+#: config.c:2786 builtin/config.c:328
#, c-format
-msgid "error in object: %s"
+msgid "invalid pattern: %s"
msgstr ""
-#: fetch-pack.c:441
+#: config.c:2811
#, c-format
-msgid "no shallow found: %s"
+msgid "invalid config file %s"
msgstr ""
-#: fetch-pack.c:444
+#: config.c:2824 config.c:3077
#, c-format
-msgid "expected shallow/unshallow, got %s"
+msgid "fstat on %s failed"
msgstr ""
-#: fetch-pack.c:485
+#: config.c:2835
#, c-format
-msgid "got %s %d %s"
+msgid "unable to mmap '%s'"
msgstr ""
-#: fetch-pack.c:499
+#: config.c:2844 config.c:3082
#, c-format
-msgid "invalid commit %s"
+msgid "chmod on %s failed"
msgstr ""
-#: fetch-pack.c:532
-msgid "giving up"
+#: config.c:2929 config.c:3179
+#, c-format
+msgid "could not write config file %s"
msgstr ""
-#: fetch-pack.c:542 progress.c:229
-msgid "done"
+#: config.c:2963
+#, c-format
+msgid "could not set '%s' to '%s'"
msgstr ""
-#: fetch-pack.c:554
+#: config.c:2965 builtin/remote.c:782
#, c-format
-msgid "got %s (%d) %s"
+msgid "could not unset '%s'"
msgstr ""
-#: fetch-pack.c:600
+#: config.c:3055
#, c-format
-msgid "Marking %s as complete"
+msgid "invalid section name: %s"
msgstr ""
-#: fetch-pack.c:788
+#: config.c:3222
#, c-format
-msgid "already have %s (%s)"
+msgid "missing value for '%s'"
msgstr ""
-#: fetch-pack.c:829
-msgid "fetch-pack: unable to fork off sideband demultiplexer"
+#: connect.c:61
+msgid "the remote end hung up upon initial contact"
msgstr ""
-#: fetch-pack.c:837
-msgid "protocol error: bad pack header"
+#: 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:895
+#: connect.c:81
#, c-format
-msgid "fetch-pack: unable to fork off %s"
+msgid "server doesn't support '%s'"
msgstr ""
-#: fetch-pack.c:911
+#: connect.c:103
#, c-format
-msgid "%s failed"
-msgstr ""
-
-#: fetch-pack.c:913
-msgid "error in sideband demultiplexer"
+msgid "server doesn't support feature '%s'"
msgstr ""
-#: fetch-pack.c:940
-msgid "Server does not support shallow clients"
-msgstr ""
-
-#: fetch-pack.c:944
-msgid "Server supports multi_ack_detailed"
+#: connect.c:114
+msgid "expected flush after capabilities"
msgstr ""
-#: fetch-pack.c:947
-msgid "Server supports no-done"
+#: connect.c:233
+#, c-format
+msgid "ignoring capabilities after first line '%s'"
msgstr ""
-#: fetch-pack.c:953
-msgid "Server supports multi_ack"
+#: connect.c:252
+msgid "protocol error: unexpected capabilities^{}"
msgstr ""
-#: fetch-pack.c:957
-msgid "Server supports side-band-64k"
+#: connect.c:273
+#, c-format
+msgid "protocol error: expected shallow sha-1, got '%s'"
msgstr ""
-#: fetch-pack.c:961
-msgid "Server supports side-band"
+#: connect.c:275
+msgid "repository on the other end cannot be shallow"
msgstr ""
-#: fetch-pack.c:965
-msgid "Server supports allow-tip-sha1-in-want"
+#: connect.c:313
+msgid "invalid packet"
msgstr ""
-#: fetch-pack.c:969
-msgid "Server supports allow-reachable-sha1-in-want"
+#: connect.c:333
+#, c-format
+msgid "protocol error: unexpected '%s'"
msgstr ""
-#: fetch-pack.c:979
-msgid "Server supports ofs-delta"
+#: connect.c:441
+#, c-format
+msgid "invalid ls-refs response: %s"
msgstr ""
-#: fetch-pack.c:985
-msgid "Server supports filter"
+#: connect.c:445
+msgid "expected flush after ref listing"
msgstr ""
-#: fetch-pack.c:993
+#: connect.c:544
#, c-format
-msgid "Server version is %.*s"
+msgid "protocol '%s' is not supported"
msgstr ""
-#: fetch-pack.c:999
-msgid "Server does not support --shallow-since"
+#: connect.c:595
+msgid "unable to set SO_KEEPALIVE on socket"
msgstr ""
-#: fetch-pack.c:1003
-msgid "Server does not support --shallow-exclude"
+#: connect.c:635 connect.c:698
+#, c-format
+msgid "Looking up %s ... "
msgstr ""
-#: fetch-pack.c:1005
-msgid "Server does not support --deepen"
+#: connect.c:639
+#, c-format
+msgid "unable to look up %s (port %s) (%s)"
msgstr ""
-#: fetch-pack.c:1016
-msgid "no common commits"
+#. 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:1028
-msgid "git fetch-pack: fetch failed."
+#: connect.c:665 connect.c:742
+#, c-format
+msgid ""
+"unable to connect to %s:\n"
+"%s"
msgstr ""
-#: fetch-pack.c:1190
-msgid "no matching remote head"
+#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
+#: connect.c:671 connect.c:748
+msgid "done."
msgstr ""
-#: fetch-pack.c:1212
+#: connect.c:702
#, c-format
-msgid "no such remote ref %s"
+msgid "unable to look up %s (%s)"
msgstr ""
-#: fetch-pack.c:1215
+#: connect.c:708
#, c-format
-msgid "Server does not allow request for unadvertised object %s"
+msgid "unknown port %s"
msgstr ""
-#: gpg-interface.c:181
-msgid "gpg failed to sign the data"
+#: connect.c:845 connect.c:1171
+#, c-format
+msgid "strange hostname '%s' blocked"
msgstr ""
-#: gpg-interface.c:211
-msgid "could not create temporary file"
+#: connect.c:847
+#, c-format
+msgid "strange port '%s' blocked"
msgstr ""
-#: gpg-interface.c:214
+#: connect.c:857
#, c-format
-msgid "failed writing detached signature to '%s'"
+msgid "cannot start proxy %s"
msgstr ""
-#: graph.c:97
-#, c-format
-msgid "ignore invalid color '%.*s' in log.graphColors"
+#: connect.c:924
+msgid "no path specified; see 'git help pull' for valid url syntax"
msgstr ""
-#: grep.c:2022
-#, c-format
-msgid "'%s': unable to read %s"
+#: connect.c:1119
+msgid "ssh variant 'simple' does not support -4"
msgstr ""
-#: grep.c:2039 setup.c:163 builtin/clone.c:407 builtin/diff.c:81
-#: builtin/rm.c:134
-#, c-format
-msgid "failed to stat '%s'"
+#: connect.c:1131
+msgid "ssh variant 'simple' does not support -6"
msgstr ""
-#: grep.c:2050
-#, c-format
-msgid "'%s': short read"
+#: connect.c:1148
+msgid "ssh variant 'simple' does not support setting port"
msgstr ""
-#: help.c:179
+#: connect.c:1260
#, c-format
-msgid "available git commands in '%s'"
+msgid "strange pathname '%s' blocked"
msgstr ""
-#: help.c:186
-msgid "git commands available from elsewhere on your $PATH"
+#: connect.c:1307
+msgid "unable to fork"
msgstr ""
-#: help.c:217
-msgid "These are common Git commands used in various situations:"
+#: connected.c:85 builtin/fsck.c:221 builtin/prune.c:43
+msgid "Checking connectivity"
msgstr ""
-#: help.c:281
-#, c-format
-msgid ""
-"'%s' appears to be a git command, but we were not\n"
-"able to execute it. Maybe git-%s is broken?"
+#: connected.c:97
+msgid "Could not run 'git rev-list'"
msgstr ""
-#: help.c:336
-msgid "Uh oh. Your system reports no Git commands at all."
+#: connected.c:117
+msgid "failed write to rev-list"
msgstr ""
-#: help.c:358
-#, c-format
-msgid "WARNING: You called a Git command named '%s', which does not exist."
+#: connected.c:124
+msgid "failed to close rev-list's stdin"
msgstr ""
-#: help.c:363
+#: convert.c:193
#, c-format
-msgid "Continuing under the assumption that you meant '%s'."
+msgid "illegal crlf_action %d"
msgstr ""
-#: help.c:368
+#: convert.c:206
#, c-format
-msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
+msgid "CRLF would be replaced by LF in %s"
msgstr ""
-#: help.c:376
+#: convert.c:208
#, c-format
-msgid "git: '%s' is not a git command. See 'git --help'."
-msgstr ""
-
-#: help.c:380
msgid ""
-"\n"
-"The most similar command is"
-msgid_plural ""
-"\n"
-"The most similar commands are"
-msgstr[0] ""
-msgstr[1] ""
-
-#: help.c:395
-msgid "git version [<options>]"
+"CRLF will be replaced by LF in %s.\n"
+"The file will have its original line endings in your working directory"
msgstr ""
-#: help.c:462
+#: convert.c:216
#, c-format
-msgid "%s: %s - %s"
+msgid "LF would be replaced by CRLF in %s"
msgstr ""
-#: help.c:466
-msgid ""
-"\n"
-"Did you mean this?"
-msgid_plural ""
-"\n"
-"Did you mean one of these?"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ident.c:342
+#: convert.c:218
+#, c-format
msgid ""
-"\n"
-"*** Please tell me who you are.\n"
-"\n"
-"Run\n"
-"\n"
-" git config --global user.email \"you@example.com\"\n"
-" git config --global user.name \"Your Name\"\n"
-"\n"
-"to set your account's default identity.\n"
-"Omit --global to set the identity only in this repository.\n"
-"\n"
-msgstr ""
-
-#: ident.c:366
-msgid "no email was given and auto-detection is disabled"
+"LF will be replaced by CRLF in %s.\n"
+"The file will have its original line endings in your working directory"
msgstr ""
-#: ident.c:371
+#: convert.c:279
#, c-format
-msgid "unable to auto-detect email address (got '%s')"
+msgid "BOM is prohibited in '%s' if encoded as %s"
msgstr ""
-#: ident.c:381
-msgid "no name was given and auto-detection is disabled"
+#: convert.c:286
+#, c-format
+msgid ""
+"The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-"
+"tree-encoding."
msgstr ""
-#: ident.c:387
+#: convert.c:304
#, c-format
-msgid "unable to auto-detect name (got '%s')"
+msgid "BOM is required in '%s' if encoded as %s"
msgstr ""
-#: ident.c:395
+#: convert.c:306
#, c-format
-msgid "empty ident name (for <%s>) not allowed"
+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 ""
-#: ident.c:401
+#: convert.c:424 convert.c:495
#, c-format
-msgid "name consists only of disallowed characters: %s"
+msgid "failed to encode '%s' from %s to %s"
msgstr ""
-#: ident.c:416 builtin/commit.c:582
+#: convert.c:467
#, c-format
-msgid "invalid date format: %s"
+msgid "encoding '%s' from %s to %s and back is not the same"
msgstr ""
-#: list-objects-filter-options.c:36
-msgid "multiple filter-specs cannot be combined"
+#: convert.c:673
+#, c-format
+msgid "cannot fork to run external filter '%s'"
msgstr ""
-#: list-objects-filter-options.c:126
-msgid "cannot change partial clone promisor remote"
+#: convert.c:693
+#, c-format
+msgid "cannot feed the input to external filter '%s'"
msgstr ""
-#: lockfile.c:151
+#: convert.c:700
#, 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 "external filter '%s' failed %d"
msgstr ""
-#: lockfile.c:159
+#: convert.c:735 convert.c:738
#, c-format
-msgid "Unable to create '%s.lock': %s"
+msgid "read from external filter '%s' failed"
msgstr ""
-#: merge.c:74
-msgid "failed to read the cache"
+#: convert.c:741 convert.c:796
+#, c-format
+msgid "external filter '%s' failed"
msgstr ""
-#: merge.c:134 builtin/am.c:1946 builtin/am.c:1980 builtin/checkout.c:378
-#: builtin/checkout.c:599 builtin/clone.c:759
-msgid "unable to write new index file"
+#: convert.c:844
+msgid "unexpected filter type"
msgstr ""
-#: merge-recursive.c:235
-msgid "(bad commit)\n"
+#: convert.c:855
+msgid "path name too long for external filter"
msgstr ""
-#: merge-recursive.c:257 merge-recursive.c:265
+#: convert.c:929
#, c-format
-msgid "addinfo_cache failed for path '%s'"
+msgid ""
+"external filter '%s' is not available anymore although not all paths have "
+"been filtered"
msgstr ""
-#: merge-recursive.c:329
-msgid "error building trees"
+#: convert.c:1228
+msgid "true/false are no valid working-tree-encodings"
msgstr ""
-#: merge-recursive.c:771
+#: convert.c:1398 convert.c:1432
#, c-format
-msgid "failed to create path '%s'%s"
+msgid "%s: clean filter '%s' failed"
msgstr ""
-#: merge-recursive.c:782
+#: convert.c:1476
#, c-format
-msgid "Removing %s to make room for subdirectory\n"
+msgid "%s: smudge filter %s failed"
msgstr ""
-#: merge-recursive.c:796 merge-recursive.c:815
-msgid ": perhaps a D/F conflict?"
+#: date.c:137
+msgid "in the future"
msgstr ""
-#: merge-recursive.c:805
+#: date.c:143
#, c-format
-msgid "refusing to lose untracked file at '%s'"
-msgstr ""
+msgid "%<PRIuMAX> second ago"
+msgid_plural "%<PRIuMAX> seconds ago"
+msgstr[0] ""
+msgstr[1] ""
-#: merge-recursive.c:847 builtin/cat-file.c:37
+#: date.c:150
#, c-format
-msgid "cannot read object %s '%s'"
-msgstr ""
+msgid "%<PRIuMAX> minute ago"
+msgid_plural "%<PRIuMAX> minutes ago"
+msgstr[0] ""
+msgstr[1] ""
-#: merge-recursive.c:849
+#: date.c:157
#, c-format
-msgid "blob expected for %s '%s'"
-msgstr ""
+msgid "%<PRIuMAX> hour ago"
+msgid_plural "%<PRIuMAX> hours ago"
+msgstr[0] ""
+msgstr[1] ""
-#: merge-recursive.c:873
+#: date.c:164
#, c-format
-msgid "failed to open '%s': %s"
-msgstr ""
+msgid "%<PRIuMAX> day ago"
+msgid_plural "%<PRIuMAX> days ago"
+msgstr[0] ""
+msgstr[1] ""
-#: merge-recursive.c:884
+#: date.c:170
#, c-format
-msgid "failed to symlink '%s': %s"
-msgstr ""
+msgid "%<PRIuMAX> week ago"
+msgid_plural "%<PRIuMAX> weeks ago"
+msgstr[0] ""
+msgstr[1] ""
-#: merge-recursive.c:889
+#: date.c:177
#, c-format
-msgid "do not know what to do with %06o %s '%s'"
-msgstr ""
-
-#: merge-recursive.c:1029
-msgid "Failed to execute internal merge"
-msgstr ""
+msgid "%<PRIuMAX> month ago"
+msgid_plural "%<PRIuMAX> months ago"
+msgstr[0] ""
+msgstr[1] ""
-#: merge-recursive.c:1034
+#: date.c:188
#, c-format
-msgid "Unable to add %s to database"
-msgstr ""
+msgid "%<PRIuMAX> year"
+msgid_plural "%<PRIuMAX> years"
+msgstr[0] ""
+msgstr[1] ""
-#: merge-recursive.c:1146
+#. TRANSLATORS: "%s" is "<n> years"
+#: date.c:191
#, c-format
-msgid ""
-"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
-"in tree."
-msgstr ""
+msgid "%s, %<PRIuMAX> month ago"
+msgid_plural "%s, %<PRIuMAX> months ago"
+msgstr[0] ""
+msgstr[1] ""
-#: merge-recursive.c:1151
+#: date.c:196 date.c:201
#, c-format
-msgid ""
-"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
-"left in tree."
+msgid "%<PRIuMAX> year ago"
+msgid_plural "%<PRIuMAX> years ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: delta-islands.c:272
+msgid "Propagating island marks"
msgstr ""
-#: merge-recursive.c:1158
+#: delta-islands.c:290
#, c-format
-msgid ""
-"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
-"in tree at %s."
+msgid "bad tree object %s"
msgstr ""
-#: merge-recursive.c:1163
+#: delta-islands.c:334
#, c-format
-msgid ""
-"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
-"left in tree at %s."
+msgid "failed to load island regex for '%s': %s"
msgstr ""
-#: merge-recursive.c:1197
-msgid "rename"
+#: delta-islands.c:390
+#, c-format
+msgid "island regex from config has too many capture groups (max=%d)"
msgstr ""
-#: merge-recursive.c:1197
-msgid "renamed"
+#: delta-islands.c:466
+#, c-format
+msgid "Marked %d islands, done.\n"
msgstr ""
-#: merge-recursive.c:1254
+#: diffcore-order.c:24
#, c-format
-msgid "%s is a directory in %s adding as %s instead"
+msgid "failed to read orderfile '%s'"
msgstr ""
-#: merge-recursive.c:1279
-#, c-format
-msgid ""
-"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
-"\"->\"%s\" in \"%s\"%s"
+#: diffcore-rename.c:544
+msgid "Performing inexact rename detection"
msgstr ""
-#: merge-recursive.c:1284
-msgid " (left unresolved)"
+#: diff-no-index.c:238
+msgid "git diff --no-index [<options>] <path> <path>"
msgstr ""
-#: merge-recursive.c:1346
-#, c-format
-msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
+#: diff-no-index.c:263
+msgid ""
+"Not a git repository. Use --no-index to compare two paths outside a working "
+"tree"
msgstr ""
-#: merge-recursive.c:1379
+#: diff.c:155
#, c-format
-msgid "Renaming %s to %s and %s to %s instead"
+msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr ""
-#: merge-recursive.c:1582
+#: diff.c:160
#, c-format
-msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
+msgid " Unknown dirstat parameter '%s'\n"
msgstr ""
-#: merge-recursive.c:1597
-#, c-format
-msgid "Adding merged %s"
+#: diff.c:296
+msgid ""
+"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
+"'dimmed-zebra', 'plain'"
msgstr ""
-#: merge-recursive.c:1604 merge-recursive.c:1834
+#: diff.c:324
#, c-format
-msgid "Adding as %s instead"
+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:1661
+#: diff.c:332
+msgid ""
+"color-moved-ws: allow-indentation-change cannot be combined with other "
+"whitespace modes"
+msgstr ""
+
+#: diff.c:405
#, c-format
-msgid "cannot read object %s"
+msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr ""
-#: merge-recursive.c:1664
+#: diff.c:465
#, c-format
-msgid "object %s is not a blob"
+msgid ""
+"Found errors in 'diff.dirstat' config variable:\n"
+"%s"
msgstr ""
-#: merge-recursive.c:1733
-msgid "modify"
+#: diff.c:4210
+#, c-format
+msgid "external diff died, stopping at %s"
msgstr ""
-#: merge-recursive.c:1733
-msgid "modified"
+#: diff.c:4555
+msgid "--name-only, --name-status, --check and -s are mutually exclusive"
msgstr ""
-#: merge-recursive.c:1743
-msgid "content"
+#: diff.c:4558
+msgid "-G, -S and --find-object are mutually exclusive"
msgstr ""
-#: merge-recursive.c:1750
-msgid "add/add"
+#: diff.c:4636
+msgid "--follow requires exactly one pathspec"
msgstr ""
-#: merge-recursive.c:1786
+#: diff.c:4684
#, c-format
-msgid "Skipped %s (merged same as existing)"
+msgid "invalid --stat value: %s"
msgstr ""
-#: merge-recursive.c:1800
+#: 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 "Auto-merging %s"
+msgid "%s expects a numerical value"
msgstr ""
-#: merge-recursive.c:1804 git-submodule.sh:879
-msgid "submodule"
+#: diff.c:4721
+#, c-format
+msgid ""
+"Failed to parse --dirstat/-X option parameter:\n"
+"%s"
msgstr ""
-#: merge-recursive.c:1805
+#: diff.c:4806
#, c-format
-msgid "CONFLICT (%s): Merge conflict in %s"
+msgid "unknown change class '%c' in --diff-filter=%s"
msgstr ""
-#: merge-recursive.c:1899
+#: diff.c:4830
#, c-format
-msgid "Removing %s"
+msgid "unknown value after ws-error-highlight=%.*s"
msgstr ""
-#: merge-recursive.c:1925
-msgid "file/directory"
+#: diff.c:4844
+#, c-format
+msgid "unable to resolve '%s'"
msgstr ""
-#: merge-recursive.c:1931
-msgid "directory/file"
+#: diff.c:4894 diff.c:4900
+#, c-format
+msgid "%s expects <n>/<m> form"
msgstr ""
-#: merge-recursive.c:1938
+#: diff.c:4912
#, c-format
-msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
+msgid "%s expects a character, got '%s'"
msgstr ""
-#: merge-recursive.c:1947
+#: diff.c:4933
#, c-format
-msgid "Adding %s"
+msgid "bad --color-moved argument: %s"
msgstr ""
-#: merge-recursive.c:1987
+#: diff.c:4952
#, c-format
-msgid "Dirty index: cannot merge (dirty: %s)"
+msgid "invalid mode '%s' in --color-moved-ws"
msgstr ""
-#: merge-recursive.c:1991
-msgid "Already up to date!"
+#: diff.c:4992
+msgid ""
+"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
+"\"histogram\""
msgstr ""
-#: merge-recursive.c:2000
+#: diff.c:5028 diff.c:5048
#, c-format
-msgid "merging of trees %s and %s failed"
+msgid "invalid argument to %s"
msgstr ""
-#: merge-recursive.c:2097
-msgid "Merging:"
+#: diff.c:5186
+#, c-format
+msgid "failed to parse --submodule option parameter: '%s'"
msgstr ""
-#: merge-recursive.c:2110
+#: diff.c:5242
#, c-format
-msgid "found %u common ancestor:"
-msgid_plural "found %u common ancestors:"
-msgstr[0] ""
-msgstr[1] ""
+msgid "bad --word-diff argument: %s"
+msgstr ""
-#: merge-recursive.c:2149
-msgid "merge returned no commit"
+#: diff.c:5265
+msgid "Diff output format options"
msgstr ""
-#: merge-recursive.c:2212
-#, c-format
-msgid "Could not parse object '%s'"
+#: diff.c:5267 diff.c:5273
+msgid "generate patch"
msgstr ""
-#: merge-recursive.c:2228 builtin/merge.c:657 builtin/merge.c:816
-msgid "Unable to write index."
+#: diff.c:5270 builtin/log.c:167
+msgid "suppress diff output"
msgstr ""
-#: notes-merge.c:272
-#, c-format
-msgid ""
-"You have not concluded your previous notes merge (%s exists).\n"
-"Please, use 'git notes merge --commit' or 'git notes merge --abort' to "
-"commit/abort the previous merge before you start a new notes merge."
+#: diff.c:5275 diff.c:5389 diff.c:5396
+msgid "<n>"
msgstr ""
-#: notes-merge.c:279
-#, c-format
-msgid "You have not concluded your notes merge (%s exists)."
+#: diff.c:5276 diff.c:5279
+msgid "generate diffs with <n> lines context"
msgstr ""
-#: notes-utils.c:43
-msgid "Cannot commit uninitialized/unreferenced notes tree"
+#: diff.c:5281
+msgid "generate the diff in raw format"
msgstr ""
-#: notes-utils.c:102
-#, c-format
-msgid "Bad notes.rewriteMode value: '%s'"
+#: diff.c:5284
+msgid "synonym for '-p --raw'"
msgstr ""
-#: notes-utils.c:112
-#, c-format
-msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
+#: diff.c:5288
+msgid "synonym for '-p --stat'"
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:5292
+msgid "machine friendly --stat"
msgstr ""
-#: object.c:239
-#, c-format
-msgid "unable to parse object: %s"
+#: diff.c:5295
+msgid "output only the last line of --stat"
msgstr ""
-#: packfile.c:561
-msgid "offset before end of packfile (broken .idx?)"
+#: diff.c:5297 diff.c:5305
+msgid "<param1,param2>..."
msgstr ""
-#: packfile.c:1694
-#, c-format
-msgid "offset before start of pack index for %s (corrupt index?)"
+#: diff.c:5298
+msgid ""
+"output the distribution of relative amount of changes for each sub-directory"
msgstr ""
-#: packfile.c:1698
-#, c-format
-msgid "offset beyond end of pack index for %s (truncated index?)"
+#: diff.c:5302
+msgid "synonym for --dirstat=cumulative"
msgstr ""
-#: parse-options.c:619
-msgid "..."
+#: diff.c:5306
+msgid "synonym for --dirstat=files,param1,param2..."
msgstr ""
-#: parse-options.c:638
-#, c-format
-msgid "usage: %s"
+#: diff.c:5310
+msgid "warn if changes introduce conflict markers or whitespace errors"
msgstr ""
-#. TRANSLATORS: the colon here should align with the
-#. one in "usage: %s" translation.
-#.
-#: parse-options.c:644
-#, c-format
-msgid " or: %s"
+#: diff.c:5313
+msgid "condensed summary such as creations, renames and mode changes"
msgstr ""
-#: parse-options.c:647
-#, c-format
-msgid " %s"
+#: diff.c:5316
+msgid "show only names of changed files"
msgstr ""
-#: parse-options.c:686
-msgid "-NUM"
+#: diff.c:5319
+msgid "show only names and status of changed files"
msgstr ""
-#: parse-options-cb.c:108
-#, c-format
-msgid "malformed object name '%s'"
+#: diff.c:5321
+msgid "<width>[,<name-width>[,<count>]]"
msgstr ""
-#: path.c:891
-#, c-format
-msgid "Could not make %s writable by group"
+#: diff.c:5322
+msgid "generate diffstat"
msgstr ""
-#: pathspec.c:129
-msgid "Escape character '\\' not allowed as last character in attr value"
+#: diff.c:5324 diff.c:5327 diff.c:5330
+msgid "<width>"
msgstr ""
-#: pathspec.c:147
-msgid "Only one 'attr:' specification is allowed."
+#: diff.c:5325
+msgid "generate diffstat with a given width"
msgstr ""
-#: pathspec.c:150
-msgid "attr spec must not be empty"
+#: diff.c:5328
+msgid "generate diffstat with a given name width"
msgstr ""
-#: pathspec.c:193
-#, c-format
-msgid "invalid attribute name %s"
+#: diff.c:5331
+msgid "generate diffstat with a given graph width"
msgstr ""
-#: pathspec.c:258
-msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
+#: diff.c:5333
+msgid "<count>"
msgstr ""
-#: pathspec.c:265
-msgid ""
-"global 'literal' pathspec setting is incompatible with all other global "
-"pathspec settings"
+#: diff.c:5334
+msgid "generate diffstat with limited lines"
msgstr ""
-#: pathspec.c:305
-msgid "invalid parameter for pathspec magic 'prefix'"
+#: diff.c:5337
+msgid "generate compact summary in diffstat"
msgstr ""
-#: pathspec.c:326
-#, c-format
-msgid "Invalid pathspec magic '%.*s' in '%s'"
+#: diff.c:5340
+msgid "output a binary diff that can be applied"
msgstr ""
-#: pathspec.c:331
-#, c-format
-msgid "Missing ')' at the end of pathspec magic in '%s'"
+#: diff.c:5343
+msgid "show full pre- and post-image object names on the \"index\" lines"
msgstr ""
-#: pathspec.c:369
-#, c-format
-msgid "Unimplemented pathspec magic '%c' in '%s'"
+#: diff.c:5345
+msgid "show colored diff"
msgstr ""
-#: pathspec.c:428
-#, c-format
-msgid "%s: 'literal' and 'glob' are incompatible"
+#: diff.c:5346
+msgid "<kind>"
msgstr ""
-#: pathspec.c:441
-#, c-format
-msgid "%s: '%s' is outside repository"
+#: diff.c:5347
+msgid ""
+"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
+"diff"
msgstr ""
-#: pathspec.c:515
-#, c-format
-msgid "'%s' (mnemonic: '%c')"
+#: diff.c:5350
+msgid ""
+"do not munge pathnames and use NULs as output field terminators in --raw or "
+"--numstat"
msgstr ""
-#: pathspec.c:525
-#, c-format
-msgid "%s: pathspec magic not supported by this command: %s"
+#: diff.c:5353 diff.c:5356 diff.c:5359 diff.c:5465
+msgid "<prefix>"
msgstr ""
-#: pathspec.c:592
-#, c-format
-msgid "pathspec '%s' is beyond a symbolic link"
+#: diff.c:5354
+msgid "show the given source prefix instead of \"a/\""
msgstr ""
-#: pretty.c:962
-msgid "unable to parse --pretty format"
+#: diff.c:5357
+msgid "show the given source prefix instead of \"b/\""
msgstr ""
-#: read-cache.c:1473
-#, c-format
-msgid ""
-"index.version set, but the value is invalid.\n"
-"Using version %i"
+#: diff.c:5360
+msgid "prepend an additional prefix to every line of output"
msgstr ""
-#: read-cache.c:1483
-#, c-format
-msgid ""
-"GIT_INDEX_VERSION set, but the value is invalid.\n"
-"Using version %i"
+#: diff.c:5363
+msgid "do not show any source or destination prefix"
msgstr ""
-#: read-cache.c:2375 sequencer.c:3248 wrapper.c:658 builtin/merge.c:1049
-#, c-format
-msgid "could not close '%s'"
+#: diff.c:5366
+msgid "show context between diff hunks up to the specified number of lines"
msgstr ""
-#: read-cache.c:2448 sequencer.c:1900 sequencer.c:2627
-#, c-format
-msgid "could not stat '%s'"
+#: diff.c:5370 diff.c:5375 diff.c:5380
+msgid "<char>"
msgstr ""
-#: read-cache.c:2461
-#, c-format
-msgid "unable to open git dir: %s"
+#: diff.c:5371
+msgid "specify the character to indicate a new line instead of '+'"
msgstr ""
-#: read-cache.c:2473
-#, c-format
-msgid "unable to unlink: %s"
+#: diff.c:5376
+msgid "specify the character to indicate an old line instead of '-'"
msgstr ""
-#: refs.c:706
-#, c-format
-msgid "Could not open '%s' for writing"
+#: diff.c:5381
+msgid "specify the character to indicate a context instead of ' '"
msgstr ""
-#: refs.c:1850
-msgid "ref updates forbidden inside quarantine environment"
+#: diff.c:5384
+msgid "Diff rename options"
msgstr ""
-#: refs/files-backend.c:1189
-#, c-format
-msgid "could not remove reference %s"
+#: diff.c:5385
+msgid "<n>[/<m>]"
msgstr ""
-#: refs/files-backend.c:1203 refs/packed-backend.c:1528
-#: refs/packed-backend.c:1538
-#, c-format
-msgid "could not delete reference %s: %s"
+#: diff.c:5386
+msgid "break complete rewrite changes into pairs of delete and create"
msgstr ""
-#: refs/files-backend.c:1206 refs/packed-backend.c:1541
-#, c-format
-msgid "could not delete references: %s"
+#: diff.c:5390
+msgid "detect renames"
msgstr ""
-#: ref-filter.c:35 wt-status.c:1842
-msgid "gone"
+#: diff.c:5394
+msgid "omit the preimage for deletes"
msgstr ""
-#: ref-filter.c:36
-#, c-format
-msgid "ahead %d"
+#: diff.c:5397
+msgid "detect copies"
msgstr ""
-#: ref-filter.c:37
-#, c-format
-msgid "behind %d"
+#: diff.c:5401
+msgid "use unmodified files as source to find copies"
msgstr ""
-#: ref-filter.c:38
-#, c-format
-msgid "ahead %d, behind %d"
+#: diff.c:5403
+msgid "disable rename detection"
msgstr ""
-#: ref-filter.c:107
-#, c-format
-msgid "expected format: %%(color:<color>)"
+#: diff.c:5406
+msgid "use empty blobs as rename source"
msgstr ""
-#: ref-filter.c:109
-#, c-format
-msgid "unrecognized color: %%(color:%s)"
+#: diff.c:5408
+msgid "continue listing the history of a file beyond renames"
msgstr ""
-#: ref-filter.c:129
-#, c-format
-msgid "Integer value expected refname:lstrip=%s"
+#: diff.c:5411
+msgid ""
+"prevent rename/copy detection if the number of rename/copy targets exceeds "
+"given limit"
msgstr ""
-#: ref-filter.c:133
-#, c-format
-msgid "Integer value expected refname:rstrip=%s"
+#: diff.c:5413
+msgid "Diff algorithm options"
msgstr ""
-#: ref-filter.c:135
-#, c-format
-msgid "unrecognized %%(%s) argument: %s"
+#: diff.c:5415
+msgid "produce the smallest possible diff"
msgstr ""
-#: ref-filter.c:184
-#, c-format
-msgid "%%(body) does not take arguments"
+#: diff.c:5418
+msgid "ignore whitespace when comparing lines"
msgstr ""
-#: ref-filter.c:191
-#, c-format
-msgid "%%(subject) does not take arguments"
+#: diff.c:5421
+msgid "ignore changes in amount of whitespace"
msgstr ""
-#: ref-filter.c:209
-#, c-format
-msgid "unknown %%(trailers) argument: %s"
+#: diff.c:5424
+msgid "ignore changes in whitespace at EOL"
msgstr ""
-#: ref-filter.c:232
-#, c-format
-msgid "positive value expected contents:lines=%s"
+#: diff.c:5427
+msgid "ignore carrier-return at the end of line"
msgstr ""
-#: ref-filter.c:234
-#, c-format
-msgid "unrecognized %%(contents) argument: %s"
+#: diff.c:5430
+msgid "ignore changes whose lines are all blank"
msgstr ""
-#: ref-filter.c:247
-#, c-format
-msgid "positive value expected objectname:short=%s"
+#: diff.c:5433
+msgid "heuristic to shift diff hunk boundaries for easy reading"
msgstr ""
-#: ref-filter.c:251
-#, c-format
-msgid "unrecognized %%(objectname) argument: %s"
+#: diff.c:5436
+msgid "generate diff using the \"patience diff\" algorithm"
msgstr ""
-#: ref-filter.c:278
-#, c-format
-msgid "expected format: %%(align:<width>,<position>)"
+#: diff.c:5440
+msgid "generate diff using the \"histogram diff\" algorithm"
msgstr ""
-#: ref-filter.c:290
-#, c-format
-msgid "unrecognized position:%s"
+#: diff.c:5442
+msgid "<algorithm>"
msgstr ""
-#: ref-filter.c:294
-#, c-format
-msgid "unrecognized width:%s"
+#: diff.c:5443
+msgid "choose a diff algorithm"
msgstr ""
-#: ref-filter.c:300
-#, c-format
-msgid "unrecognized %%(align) argument: %s"
+#: diff.c:5445
+msgid "<text>"
msgstr ""
-#: ref-filter.c:304
-#, c-format
-msgid "positive width expected with the %%(align) atom"
+#: diff.c:5446
+msgid "generate diff using the \"anchored diff\" algorithm"
msgstr ""
-#: ref-filter.c:319
-#, c-format
-msgid "unrecognized %%(if) argument: %s"
+#: diff.c:5448 diff.c:5457 diff.c:5460
+msgid "<mode>"
msgstr ""
-#: ref-filter.c:409
-#, c-format
-msgid "malformed field name: %.*s"
+#: diff.c:5449
+msgid "show word diff, using <mode> to delimit changed words"
msgstr ""
-#: ref-filter.c:435
-#, c-format
-msgid "unknown field name: %.*s"
+#: diff.c:5451 diff.c:5454 diff.c:5499
+msgid "<regex>"
msgstr ""
-#: ref-filter.c:547
-#, c-format
-msgid "format: %%(if) atom used without a %%(then) atom"
+#: diff.c:5452
+msgid "use <regex> to decide what a word is"
msgstr ""
-#: ref-filter.c:607
-#, c-format
-msgid "format: %%(then) atom used without an %%(if) atom"
+#: diff.c:5455
+msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
msgstr ""
-#: ref-filter.c:609
-#, c-format
-msgid "format: %%(then) atom used more than once"
+#: diff.c:5458
+msgid "moved lines of code are colored differently"
msgstr ""
-#: ref-filter.c:611
-#, c-format
-msgid "format: %%(then) atom used after %%(else)"
+#: diff.c:5461
+msgid "how white spaces are ignored in --color-moved"
msgstr ""
-#: ref-filter.c:637
-#, c-format
-msgid "format: %%(else) atom used without an %%(if) atom"
+#: diff.c:5464
+msgid "Other diff options"
msgstr ""
-#: ref-filter.c:639
-#, c-format
-msgid "format: %%(else) atom used without a %%(then) atom"
-msgstr ""
-
-#: ref-filter.c:641
-#, c-format
-msgid "format: %%(else) atom used more than once"
-msgstr ""
-
-#: ref-filter.c:654
-#, c-format
-msgid "format: %%(end) atom used without corresponding atom"
+#: diff.c:5466
+msgid "when run from subdir, exclude changes outside and show relative paths"
msgstr ""
-#: ref-filter.c:709
-#, c-format
-msgid "malformed format string %s"
+#: diff.c:5470
+msgid "treat all files as text"
msgstr ""
-#: ref-filter.c:1313
-#, c-format
-msgid "(no branch, rebasing %s)"
+#: diff.c:5472
+msgid "swap two inputs, reverse the diff"
msgstr ""
-#: ref-filter.c:1316
-#, c-format
-msgid "(no branch, bisect started on %s)"
+#: diff.c:5474
+msgid "exit with 1 if there were differences, 0 otherwise"
msgstr ""
-#. TRANSLATORS: make sure this matches "HEAD
-#. detached at " in wt-status.c
-#.
-#: ref-filter.c:1324
-#, c-format
-msgid "(HEAD detached at %s)"
+#: diff.c:5476
+msgid "disable all output of the program"
msgstr ""
-#. TRANSLATORS: make sure this matches "HEAD
-#. detached from " in wt-status.c
-#.
-#: ref-filter.c:1331
-#, c-format
-msgid "(HEAD detached from %s)"
+#: diff.c:5478
+msgid "allow an external diff helper to be executed"
msgstr ""
-#: ref-filter.c:1335
-msgid "(no branch)"
+#: diff.c:5480
+msgid "run external text conversion filters when comparing binary files"
msgstr ""
-#: ref-filter.c:1364
-#, c-format
-msgid "missing object %s for %s"
+#: diff.c:5482
+msgid "<when>"
msgstr ""
-#: ref-filter.c:1367
-#, c-format
-msgid "parse_object_buffer failed on %s for %s"
+#: diff.c:5483
+msgid "ignore changes to submodules in the diff generation"
msgstr ""
-#: ref-filter.c:1819
-#, c-format
-msgid "malformed object at '%s'"
+#: diff.c:5486
+msgid "<format>"
msgstr ""
-#: ref-filter.c:1886
-#, c-format
-msgid "ignoring ref with broken name %s"
+#: diff.c:5487
+msgid "specify how differences in submodules are shown"
msgstr ""
-#: ref-filter.c:1891
-#, c-format
-msgid "ignoring broken ref %s"
+#: diff.c:5491
+msgid "hide 'git add -N' entries from the index"
msgstr ""
-#: ref-filter.c:2152
-#, c-format
-msgid "format: %%(end) atom missing"
+#: diff.c:5494
+msgid "treat 'git add -N' entries as real in the index"
msgstr ""
-#: ref-filter.c:2246
-#, c-format
-msgid "malformed object name %s"
+#: diff.c:5496
+msgid "<string>"
msgstr ""
-#: remote.c:795
-#, c-format
-msgid "Cannot fetch both %s and %s to %s"
+#: diff.c:5497
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"string"
msgstr ""
-#: remote.c:799
-#, c-format
-msgid "%s usually tracks %s, not %s"
+#: diff.c:5500
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"regex"
msgstr ""
-#: remote.c:803
-#, c-format
-msgid "%s tracks both %s and %s"
+#: diff.c:5503
+msgid "show all changes in the changeset with -S or -G"
msgstr ""
-#: remote.c:811
-msgid "Internal error"
+#: diff.c:5506
+msgid "treat <string> in -S as extended POSIX regular expression"
msgstr ""
-#: remote.c:1726 remote.c:1828
-msgid "HEAD does not point to a branch"
+#: diff.c:5509
+msgid "control the order in which files appear in the output"
msgstr ""
-#: remote.c:1735
-#, c-format
-msgid "no such branch: '%s'"
+#: diff.c:5510
+msgid "<object-id>"
msgstr ""
-#: remote.c:1738
-#, c-format
-msgid "no upstream configured for branch '%s'"
+#: diff.c:5511
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"object"
msgstr ""
-#: remote.c:1744
-#, c-format
-msgid "upstream branch '%s' not stored as a remote-tracking branch"
+#: diff.c:5513
+msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
msgstr ""
-#: remote.c:1759
-#, c-format
-msgid "push destination '%s' on remote '%s' has no local tracking branch"
+#: diff.c:5514
+msgid "select files by diff type"
msgstr ""
-#: remote.c:1771
-#, c-format
-msgid "branch '%s' has no remote for pushing"
+#: diff.c:5516
+msgid "<file>"
msgstr ""
-#: remote.c:1782
-#, c-format
-msgid "push refspecs for '%s' do not include '%s'"
+#: diff.c:5517
+msgid "Output to a specific file"
msgstr ""
-#: remote.c:1795
-msgid "push has no destination (push.default is 'nothing')"
+#: diff.c:6150
+msgid "inexact rename detection was skipped due to too many files."
msgstr ""
-#: remote.c:1817
-msgid "cannot resolve 'simple' push to a single destination"
+#: diff.c:6153
+msgid "only found copies from modified paths due to too many files."
msgstr ""
-#: remote.c:2132
+#: diff.c:6156
#, c-format
-msgid "Your branch is based on '%s', but the upstream is gone.\n"
-msgstr ""
-
-#: remote.c:2136
-msgid " (use \"git branch --unset-upstream\" to fixup)\n"
+msgid ""
+"you may want to set your %s variable to at least %d and retry the command."
msgstr ""
-#: remote.c:2139
+#: dir.c:537
#, c-format
-msgid "Your branch is up to date with '%s'.\n"
+msgid "pathspec '%s' did not match any file(s) known to git"
msgstr ""
-#: remote.c:2143
+#: dir.c:926
#, c-format
-msgid "Your branch and '%s' refer to different commits.\n"
+msgid "cannot use %s as an exclude file"
msgstr ""
-#: remote.c:2146
+#: dir.c:1843
#, c-format
-msgid " (use \"%s\" for details)\n"
+msgid "could not open directory '%s'"
msgstr ""
-#: remote.c:2150
-#, c-format
-msgid "Your branch is ahead of '%s' by %d commit.\n"
-msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: remote.c:2156
-msgid " (use \"git push\" to publish your local commits)\n"
+#: dir.c:2085
+msgid "failed to get kernel name and information"
msgstr ""
-#: remote.c:2159
-#, c-format
-msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
-msgid_plural ""
-"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: remote.c:2167
-msgid " (use \"git pull\" to update your local branch)\n"
+#: dir.c:2209
+msgid "untracked cache is disabled on this system or location"
msgstr ""
-#: remote.c:2170
+#: dir.c:3013
#, 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] ""
-
-#: remote.c:2180
-msgid " (use \"git pull\" to merge the remote branch into yours)\n"
+msgid "index file corrupt in repo %s"
msgstr ""
-#: revision.c:2277
-msgid "your current branch appears to be broken"
+#: dir.c:3058 dir.c:3063
+#, c-format
+msgid "could not create directories for %s"
msgstr ""
-#: revision.c:2280
+#: dir.c:3092
#, c-format
-msgid "your current branch '%s' does not have any commits yet"
+msgid "could not migrate git directory from '%s' to '%s'"
msgstr ""
-#: revision.c:2477
-msgid "--first-parent is incompatible with --bisect"
+#: editor.c:73
+#, c-format
+msgid "hint: Waiting for your editor to close the file...%c"
msgstr ""
-#: run-command.c:731
-msgid "open /dev/null failed"
+#: entry.c:178
+msgid "Filtering content"
msgstr ""
-#: run-command.c:1274
+#: entry.c:476
#, c-format
-msgid ""
-"The '%s' hook was ignored because it's not set as executable.\n"
-"You can disable this warning with `git config advice.ignoredHook false`."
-msgstr ""
-
-#: send-pack.c:141
-msgid "unexpected flush packet while reading remote unpack status"
+msgid "could not stat file '%s'"
msgstr ""
-#: send-pack.c:143
+#: environment.c:150
#, c-format
-msgid "unable to parse remote unpack status: %s"
+msgid "bad git namespace path \"%s\""
msgstr ""
-#: send-pack.c:145
+#: environment.c:332
#, c-format
-msgid "remote unpack failed: %s"
+msgid "could not set GIT_DIR to '%s'"
msgstr ""
-#: send-pack.c:308
-msgid "failed to sign the push certificate"
+#: exec-cmd.c:363
+#, c-format
+msgid "too many args to run %s"
msgstr ""
-#: send-pack.c:421
-msgid "the receiving end does not support --signed push"
+#: fetch-object.c:17
+msgid "Remote with no URL"
msgstr ""
-#: send-pack.c:423
-msgid ""
-"not sending a push certificate since the receiving end does not support --"
-"signed push"
+#: fetch-pack.c:151
+msgid "git fetch-pack: expected shallow list"
msgstr ""
-#: send-pack.c:435
-msgid "the receiving end does not support --atomic push"
+#: fetch-pack.c:154
+msgid "git fetch-pack: expected a flush packet after shallow list"
msgstr ""
-#: send-pack.c:440
-msgid "the receiving end does not support push options"
+#: fetch-pack.c:165
+msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
msgstr ""
-#: sequencer.c:158
+#: fetch-pack.c:185
#, c-format
-msgid "invalid commit message cleanup mode '%s'"
-msgstr ""
-
-#: sequencer.c:267
-msgid "revert"
+msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr ""
-#: sequencer.c:269
-msgid "cherry-pick"
+#: fetch-pack.c:196
+msgid "unable to write to remote"
msgstr ""
-#: sequencer.c:271
-msgid "rebase -i"
+#: fetch-pack.c:258
+msgid "--stateless-rpc requires multi_ack_detailed"
msgstr ""
-#: sequencer.c:273
+#: fetch-pack.c:360 fetch-pack.c:1271
#, c-format
-msgid "Unknown action: %d"
+msgid "invalid shallow line: %s"
msgstr ""
-#: sequencer.c:330
-msgid ""
-"after resolving the conflicts, mark the corrected paths\n"
-"with 'git add <paths>' or 'git rm <paths>'"
+#: fetch-pack.c:366 fetch-pack.c:1277
+#, c-format
+msgid "invalid unshallow line: %s"
msgstr ""
-#: sequencer.c:333
-msgid ""
-"after resolving the conflicts, mark the corrected paths\n"
-"with 'git add <paths>' or 'git rm <paths>'\n"
-"and commit the result with 'git commit'"
+#: fetch-pack.c:368 fetch-pack.c:1279
+#, c-format
+msgid "object not found: %s"
msgstr ""
-#: sequencer.c:346 sequencer.c:2245
+#: fetch-pack.c:371 fetch-pack.c:1282
#, c-format
-msgid "could not lock '%s'"
+msgid "error in object: %s"
msgstr ""
-#: sequencer.c:349 sequencer.c:2124 sequencer.c:2250 sequencer.c:2264
-#: sequencer.c:3246 sequencer.c:3310 wrapper.c:656
+#: fetch-pack.c:373 fetch-pack.c:1284
#, c-format
-msgid "could not write to '%s'"
+msgid "no shallow found: %s"
msgstr ""
-#: sequencer.c:353
+#: fetch-pack.c:376 fetch-pack.c:1288
#, c-format
-msgid "could not write eol to '%s'"
+msgid "expected shallow/unshallow, got %s"
msgstr ""
-#: sequencer.c:356 sequencer.c:2128 sequencer.c:2252
+#: fetch-pack.c:417
#, c-format
-msgid "failed to finalize '%s'"
+msgid "got %s %d %s"
msgstr ""
-#: sequencer.c:379 sequencer.c:1340 sequencer.c:2148 builtin/am.c:259
-#: builtin/commit.c:722 builtin/merge.c:1047
+#: fetch-pack.c:434
#, c-format
-msgid "could not read '%s'"
+msgid "invalid commit %s"
msgstr ""
-#: sequencer.c:405
-#, c-format
-msgid "your local changes would be overwritten by %s."
+#: fetch-pack.c:465
+msgid "giving up"
msgstr ""
-#: sequencer.c:409
-msgid "commit your changes or stash them to proceed."
+#: fetch-pack.c:477 progress.c:284
+msgid "done"
msgstr ""
-#: sequencer.c:438
+#: fetch-pack.c:489
#, c-format
-msgid "%s: fast-forward"
+msgid "got %s (%d) %s"
msgstr ""
-#. TRANSLATORS: %s will be "revert", "cherry-pick" or
-#. "rebase -i".
-#.
-#: sequencer.c:526
+#: fetch-pack.c:535
#, c-format
-msgid "%s: Unable to write new index file"
+msgid "Marking %s as complete"
msgstr ""
-#: sequencer.c:542
-msgid "could not resolve HEAD commit"
+#: fetch-pack.c:744
+#, c-format
+msgid "already have %s (%s)"
msgstr ""
-#: sequencer.c:562
-msgid "unable to update cache tree"
+#: fetch-pack.c:783
+msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr ""
-#: sequencer.c:658
-#, 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"
+#: fetch-pack.c:791
+msgid "protocol error: bad pack header"
msgstr ""
-#: sequencer.c:915
-msgid "'prepare-commit-msg' hook failed"
+#: fetch-pack.c:859
+#, c-format
+msgid "fetch-pack: unable to fork off %s"
msgstr ""
-#: sequencer.c:922
-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"
+#: fetch-pack.c:875
+#, c-format
+msgid "%s failed"
msgstr ""
-#: sequencer.c:935
-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"
+#: fetch-pack.c:877
+msgid "error in sideband demultiplexer"
msgstr ""
-#: sequencer.c:975
-msgid "couldn't look up newly created commit"
+#: fetch-pack.c:906
+msgid "Server does not support shallow clients"
msgstr ""
-#: sequencer.c:977
-msgid "could not parse newly created commit"
+#: fetch-pack.c:910
+msgid "Server supports multi_ack_detailed"
msgstr ""
-#: sequencer.c:1023
-msgid "unable to resolve HEAD after creating commit"
+#: fetch-pack.c:913
+msgid "Server supports no-done"
msgstr ""
-#: sequencer.c:1025
-msgid "detached HEAD"
+#: fetch-pack.c:919
+msgid "Server supports multi_ack"
msgstr ""
-#: sequencer.c:1029
-msgid " (root-commit)"
+#: fetch-pack.c:923
+msgid "Server supports side-band-64k"
msgstr ""
-#: sequencer.c:1050
-msgid "could not parse HEAD"
+#: fetch-pack.c:927
+msgid "Server supports side-band"
msgstr ""
-#: sequencer.c:1052
-#, c-format
-msgid "HEAD %s is not a commit!"
+#: fetch-pack.c:931
+msgid "Server supports allow-tip-sha1-in-want"
msgstr ""
-#: sequencer.c:1056 builtin/commit.c:1491
-msgid "could not parse HEAD commit"
+#: fetch-pack.c:935
+msgid "Server supports allow-reachable-sha1-in-want"
msgstr ""
-#: sequencer.c:1107 sequencer.c:1673
-msgid "unable to parse commit author"
+#: fetch-pack.c:945
+msgid "Server supports ofs-delta"
msgstr ""
-#: sequencer.c:1117 builtin/am.c:1630 builtin/merge.c:643
-msgid "git write-tree failed to write a tree"
+#: fetch-pack.c:951 fetch-pack.c:1144
+msgid "Server supports filter"
msgstr ""
-#: sequencer.c:1134 sequencer.c:1186
+#: fetch-pack.c:959
#, c-format
-msgid "unable to read commit message from '%s'"
+msgid "Server version is %.*s"
msgstr ""
-#: sequencer.c:1154 builtin/am.c:1650 builtin/commit.c:1594 builtin/merge.c:826
-#: builtin/merge.c:851
-msgid "failed to write commit object"
-msgstr ""
-
-#: sequencer.c:1213
-#, c-format
-msgid "could not parse commit %s"
-msgstr ""
-
-#: sequencer.c:1218
-#, c-format
-msgid "could not parse parent commit %s"
+#: fetch-pack.c:965
+msgid "Server does not support --shallow-since"
msgstr ""
-#: sequencer.c:1347
-#, c-format
-msgid ""
-"unexpected 1st line of squash message:\n"
-"\n"
-"\t%.*s"
+#: fetch-pack.c:969
+msgid "Server does not support --shallow-exclude"
msgstr ""
-#: sequencer.c:1353
-#, c-format
-msgid ""
-"invalid 1st line of squash message:\n"
-"\n"
-"\t%.*s"
+#: fetch-pack.c:971
+msgid "Server does not support --deepen"
msgstr ""
-#: sequencer.c:1359 sequencer.c:1384
-#, c-format
-msgid "This is a combination of %d commits."
+#: fetch-pack.c:988
+msgid "no common commits"
msgstr ""
-#: sequencer.c:1368 sequencer.c:3265
-msgid "need a HEAD to fixup"
+#: fetch-pack.c:1000 fetch-pack.c:1449
+msgid "git fetch-pack: fetch failed."
msgstr ""
-#: sequencer.c:1370
-msgid "could not read HEAD"
+#: fetch-pack.c:1138
+msgid "Server does not support shallow requests"
msgstr ""
-#: sequencer.c:1372
-msgid "could not read HEAD's commit message"
+#: fetch-pack.c:1171
+msgid "unable to write request to remote"
msgstr ""
-#: sequencer.c:1378
+#: fetch-pack.c:1189
#, c-format
-msgid "cannot write '%s'"
+msgid "error reading section header '%s'"
msgstr ""
-#: sequencer.c:1387 git-rebase--interactive.sh:452
-msgid "This is the 1st commit message:"
-msgstr ""
-
-#: sequencer.c:1395
+#: fetch-pack.c:1195
#, c-format
-msgid "could not read commit message of %s"
+msgid "expected '%s', received '%s'"
msgstr ""
-#: sequencer.c:1402
+#: fetch-pack.c:1234
#, c-format
-msgid "This is the commit message #%d:"
+msgid "unexpected acknowledgment line: '%s'"
msgstr ""
-#: sequencer.c:1407
+#: fetch-pack.c:1239
#, c-format
-msgid "The commit message #%d will be skipped:"
+msgid "error processing acks: %d"
msgstr ""
-#: sequencer.c:1412
-#, c-format
-msgid "unknown command: %d"
+#: fetch-pack.c:1249
+msgid "expected packfile to be sent after 'ready'"
msgstr ""
-#: sequencer.c:1479
-msgid "your index file is unmerged."
+#: fetch-pack.c:1251
+msgid "expected no other sections to be sent after no 'ready'"
msgstr ""
-#: sequencer.c:1498
+#: fetch-pack.c:1293
#, c-format
-msgid "commit %s is a merge but no -m option was given."
+msgid "error processing shallow info: %d"
msgstr ""
-#: sequencer.c:1506
+#: fetch-pack.c:1340
#, c-format
-msgid "commit %s does not have parent %d"
+msgid "expected wanted-ref, got '%s'"
msgstr ""
-#: sequencer.c:1510
+#: fetch-pack.c:1345
#, c-format
-msgid "mainline was specified but commit %s is not a merge."
+msgid "unexpected wanted-ref: '%s'"
msgstr ""
-#: sequencer.c:1516
+#: fetch-pack.c:1350
#, c-format
-msgid "cannot get commit message for %s"
+msgid "error processing wanted refs: %d"
msgstr ""
-#. TRANSLATORS: The first %s will be a "todo" command like
-#. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:1535
-#, c-format
-msgid "%s: cannot parse parent commit %s"
+#: fetch-pack.c:1676
+msgid "no matching remote head"
msgstr ""
-#: sequencer.c:1600 sequencer.c:2397
-#, c-format
-msgid "could not rename '%s' to '%s'"
+#: fetch-pack.c:1699 builtin/clone.c:673
+msgid "remote did not send all necessary objects"
msgstr ""
-#: sequencer.c:1654
+#: fetch-pack.c:1726
#, c-format
-msgid "could not revert %s... %s"
+msgid "no such remote ref %s"
msgstr ""
-#: sequencer.c:1655
+#: fetch-pack.c:1729
#, c-format
-msgid "could not apply %s... %s"
+msgid "Server does not allow request for unadvertised object %s"
msgstr ""
-#: sequencer.c:1702
-msgid "empty commit set passed"
+#: gpg-interface.c:318
+msgid "gpg failed to sign the data"
msgstr ""
-#: sequencer.c:1712
-#, c-format
-msgid "git %s: failed to read the index"
+#: gpg-interface.c:344
+msgid "could not create temporary file"
msgstr ""
-#: sequencer.c:1718
+#: gpg-interface.c:347
#, c-format
-msgid "git %s: failed to refresh the index"
+msgid "failed writing detached signature to '%s'"
msgstr ""
-#: sequencer.c:1792
+#: graph.c:97
#, c-format
-msgid "%s does not accept arguments: '%s'"
+msgid "ignore invalid color '%.*s' in log.graphColors"
msgstr ""
-#: sequencer.c:1801
+#: grep.c:2113
#, c-format
-msgid "missing arguments for %s"
+msgid "'%s': unable to read %s"
msgstr ""
-#: sequencer.c:1844
+#: grep.c:2130 setup.c:164 builtin/clone.c:411 builtin/diff.c:82
+#: builtin/rm.c:135
#, c-format
-msgid "invalid line %d: %.*s"
+msgid "failed to stat '%s'"
msgstr ""
-#: sequencer.c:1852
+#: grep.c:2141
#, c-format
-msgid "cannot '%s' without a previous commit"
+msgid "'%s': short read"
msgstr ""
-#: sequencer.c:1883 sequencer.c:3056 sequencer.c:3091
-#, c-format
-msgid "could not read '%s'."
+#: help.c:23
+msgid "start a working area (see also: git help tutorial)"
msgstr ""
-#: sequencer.c:1906
-msgid "please fix this using 'git rebase --edit-todo'."
+#: help.c:24
+msgid "work on the current change (see also: git help everyday)"
msgstr ""
-#: sequencer.c:1908
-#, c-format
-msgid "unusable instruction sheet: '%s'"
+#: help.c:25
+msgid "examine the history and state (see also: git help revisions)"
msgstr ""
-#: sequencer.c:1913
-msgid "no commits parsed."
+#: help.c:26
+msgid "grow, mark and tweak your common history"
msgstr ""
-#: sequencer.c:1924
-msgid "cannot cherry-pick during a revert."
+#: help.c:27
+msgid "collaborate (see also: git help workflows)"
msgstr ""
-#: sequencer.c:1926
-msgid "cannot revert during a cherry-pick."
+#: help.c:31
+msgid "Main Porcelain Commands"
msgstr ""
-#: sequencer.c:1993
-#, c-format
-msgid "invalid key: %s"
+#: help.c:32
+msgid "Ancillary Commands / Manipulators"
msgstr ""
-#: sequencer.c:1996
-#, c-format
-msgid "invalid value for %s: %s"
+#: help.c:33
+msgid "Ancillary Commands / Interrogators"
msgstr ""
-#: sequencer.c:2062
-#, c-format
-msgid "malformed options sheet: '%s'"
+#: help.c:34
+msgid "Interacting with Others"
msgstr ""
-#: sequencer.c:2100
-msgid "a cherry-pick or revert is already in progress"
+#: help.c:35
+msgid "Low-level Commands / Manipulators"
msgstr ""
-#: sequencer.c:2101
-msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
+#: help.c:36
+msgid "Low-level Commands / Interrogators"
msgstr ""
-#: sequencer.c:2104
-#, c-format
-msgid "could not create sequencer directory '%s'"
+#: help.c:37
+msgid "Low-level Commands / Synching Repositories"
msgstr ""
-#: sequencer.c:2118
-msgid "could not lock HEAD"
+#: help.c:38
+msgid "Low-level Commands / Internal Helpers"
msgstr ""
-#: sequencer.c:2173 sequencer.c:2761
-msgid "no cherry-pick or revert in progress"
+#: help.c:298
+#, c-format
+msgid "available git commands in '%s'"
msgstr ""
-#: sequencer.c:2175
-msgid "cannot resolve HEAD"
+#: help.c:305
+msgid "git commands available from elsewhere on your $PATH"
msgstr ""
-#: sequencer.c:2177 sequencer.c:2212
-msgid "cannot abort from a branch yet to be born"
+#: help.c:314
+msgid "These are common Git commands used in various situations:"
msgstr ""
-#: sequencer.c:2198 builtin/grep.c:720
+#: help.c:363 git.c:97
#, c-format
-msgid "cannot open '%s'"
+msgid "unsupported command listing type '%s'"
msgstr ""
-#: sequencer.c:2200
-#, c-format
-msgid "cannot read '%s': %s"
+#: help.c:403
+msgid "The common Git guides are:"
msgstr ""
-#: sequencer.c:2201
-msgid "unexpected end of file"
+#: help.c:512
+msgid "See 'git help <command>' to read about a specific subcommand"
msgstr ""
-#: sequencer.c:2207
-#, c-format
-msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
+#: help.c:517
+msgid "External commands"
msgstr ""
-#: sequencer.c:2218
-msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
+#: help.c:532
+msgid "Command aliases"
msgstr ""
-#: sequencer.c:2324 sequencer.c:2679
+#: help.c:596
#, c-format
-msgid "could not update %s"
+msgid ""
+"'%s' appears to be a git command, but we were not\n"
+"able to execute it. Maybe git-%s is broken?"
msgstr ""
-#: sequencer.c:2362 sequencer.c:2659
-msgid "cannot read HEAD"
+#: help.c:655
+msgid "Uh oh. Your system reports no Git commands at all."
msgstr ""
-#: sequencer.c:2402 builtin/difftool.c:639
+#: help.c:677
#, c-format
-msgid "could not copy '%s' to '%s'"
+msgid "WARNING: You called a Git command named '%s', which does not exist."
msgstr ""
-#: sequencer.c:2421
-msgid "could not read index"
+#: help.c:682
+#, c-format
+msgid "Continuing under the assumption that you meant '%s'."
+msgstr ""
+
+#: help.c:687
+#, c-format
+msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
msgstr ""
-#: sequencer.c:2426
+#: help.c:695
#, c-format
+msgid "git: '%s' is not a git command. See 'git --help'."
+msgstr ""
+
+#: help.c:699
msgid ""
-"execution failed: %s\n"
-"%sYou can fix the problem, and then run\n"
"\n"
-" git rebase --continue\n"
+"The most similar command is"
+msgid_plural ""
"\n"
-msgstr ""
+"The most similar commands are"
+msgstr[0] ""
+msgstr[1] ""
-#: sequencer.c:2432
-msgid "and made changes to the index and/or the working tree\n"
+#: help.c:714
+msgid "git version [<options>]"
msgstr ""
-#: sequencer.c:2438
+#: help.c:782
#, c-format
+msgid "%s: %s - %s"
+msgstr ""
+
+#: help.c:786
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"
+"Did you mean this?"
+msgid_plural ""
+"\n"
+"Did you mean one of these?"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ident.c:349
+msgid ""
+"\n"
+"*** Please tell me who you are.\n"
+"\n"
+"Run\n"
+"\n"
+" git config --global user.email \"you@example.com\"\n"
+" git config --global user.name \"Your Name\"\n"
+"\n"
+"to set your account's default identity.\n"
+"Omit --global to set the identity only in this repository.\n"
"\n"
msgstr ""
-#: sequencer.c:2497
+#: ident.c:379
+msgid "no email was given and auto-detection is disabled"
+msgstr ""
+
+#: ident.c:384
#, c-format
-msgid "Applied autostash.\n"
+msgid "unable to auto-detect email address (got '%s')"
+msgstr ""
+
+#: ident.c:401
+msgid "no name was given and auto-detection is disabled"
msgstr ""
-#: sequencer.c:2509
+#: ident.c:407
#, c-format
-msgid "cannot store %s"
+msgid "unable to auto-detect name (got '%s')"
msgstr ""
-#: sequencer.c:2512 git-rebase.sh:178
+#: ident.c:415
#, 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 "empty ident name (for <%s>) not allowed"
msgstr ""
-#: sequencer.c:2595
+#: ident.c:421
#, c-format
-msgid "Stopped at %s... %.*s\n"
+msgid "name consists only of disallowed characters: %s"
msgstr ""
-#: sequencer.c:2637
+#: ident.c:436 builtin/commit.c:608
#, c-format
-msgid "unknown command %d"
+msgid "invalid date format: %s"
msgstr ""
-#: sequencer.c:2667
-msgid "could not read orig-head"
+#: list-objects.c:129
+#, c-format
+msgid "entry '%s' in tree %s has tree mode, but is not a tree"
msgstr ""
-#: sequencer.c:2672 sequencer.c:3262
-msgid "could not read 'onto'"
+#: list-objects.c:142
+#, c-format
+msgid "entry '%s' in tree %s has blob mode, but is not a blob"
msgstr ""
-#: sequencer.c:2686
+#: list-objects.c:378
#, c-format
-msgid "could not update HEAD to %s"
+msgid "unable to load root tree for commit %s"
msgstr ""
-#: sequencer.c:2770
-msgid "cannot rebase: You have unstaged changes."
+#: list-objects-filter-options.c:36
+msgid "multiple filter-specs cannot be combined"
msgstr ""
-#: sequencer.c:2775
-msgid "could not remove CHERRY_PICK_HEAD"
+#: list-objects-filter-options.c:58
+msgid "expected 'tree:<depth>'"
msgstr ""
-#: sequencer.c:2784
-msgid "cannot amend non-existing commit"
+#: list-objects-filter-options.c:156
+msgid "cannot change partial clone promisor remote"
msgstr ""
-#: sequencer.c:2786
+#: lockfile.c:151
#, c-format
-msgid "invalid file: '%s'"
+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:2788
+#: lockfile.c:159
#, c-format
-msgid "invalid contents: '%s'"
+msgid "Unable to create '%s.lock': %s"
msgstr ""
-#: sequencer.c:2791
-msgid ""
-"\n"
-"You have uncommitted changes in your working tree. Please, commit them\n"
-"first and then run 'git rebase --continue' again."
+#: merge.c:41
+msgid "failed to read the cache"
msgstr ""
-#: sequencer.c:2801
-msgid "could not commit staged changes."
+#: 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:2881
+#: merge-recursive.c:322
+msgid "(bad commit)\n"
+msgstr ""
+
+#: merge-recursive.c:345
#, c-format
-msgid "%s: can't cherry-pick a %s"
+msgid "add_cacheinfo failed for path '%s'; merge aborting."
msgstr ""
-#: sequencer.c:2885
+#: merge-recursive.c:354
#, c-format
-msgid "%s: bad revision"
+msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
msgstr ""
-#: sequencer.c:2918
-msgid "can't revert as initial commit"
+#: merge-recursive.c:437
+msgid "error building trees"
msgstr ""
-#: sequencer.c:3023
-msgid "make_script: unhandled options"
+#: merge-recursive.c:861
+#, c-format
+msgid "failed to create path '%s'%s"
msgstr ""
-#: sequencer.c:3026
-msgid "make_script: error preparing revisions"
+#: merge-recursive.c:872
+#, c-format
+msgid "Removing %s to make room for subdirectory\n"
+msgstr ""
+
+#: merge-recursive.c:886 merge-recursive.c:905
+msgid ": perhaps a D/F conflict?"
msgstr ""
-#: sequencer.c:3060 sequencer.c:3095
+#: merge-recursive.c:895
#, c-format
-msgid "unusable todo list: '%s'"
+msgid "refusing to lose untracked file at '%s'"
msgstr ""
-#: sequencer.c:3146
+#: merge-recursive.c:936 builtin/cat-file.c:40
#, c-format
-msgid ""
-"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
+msgid "cannot read object %s '%s'"
msgstr ""
-#: sequencer.c:3212
+#: merge-recursive.c:939
#, c-format
-msgid ""
-"Warning: some commits may have been dropped accidentally.\n"
-"Dropped commits (newer to older):\n"
+msgid "blob expected for %s '%s'"
msgstr ""
-#: sequencer.c:3219
+#: merge-recursive.c:963
#, 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 open '%s': %s"
msgstr ""
-#: sequencer.c:3231
+#: merge-recursive.c:974
#, 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 symlink '%s': %s"
msgstr ""
-#: sequencer.c:3244 sequencer.c:3304 wrapper.c:225 wrapper.c:395
-#: builtin/am.c:779
+#: merge-recursive.c:979
#, c-format
-msgid "could not open '%s' for writing"
+msgid "do not know what to do with %06o %s '%s'"
msgstr ""
-#: sequencer.c:3285
+#: merge-recursive.c:1175
#, c-format
-msgid "could not parse commit '%s'"
+msgid "Failed to merge submodule %s (not checked out)"
msgstr ""
-#: sequencer.c:3401
-msgid "the script was already rearranged."
+#: merge-recursive.c:1182
+#, c-format
+msgid "Failed to merge submodule %s (commits not present)"
msgstr ""
-#: setup.c:122
+#: merge-recursive.c:1189
#, c-format
-msgid "'%s' is outside repository"
+msgid "Failed to merge submodule %s (commits don't follow merge-base)"
msgstr ""
-#: setup.c:171
+#: merge-recursive.c:1197 merge-recursive.c:1209
#, c-format
-msgid ""
-"%s: no such path in the working tree.\n"
-"Use 'git <command> -- <path>...' to specify paths that do not exist locally."
+msgid "Fast-forwarding submodule %s to the following commit:"
msgstr ""
-#: setup.c:184
+#: merge-recursive.c:1200 merge-recursive.c:1212
#, c-format
-msgid ""
-"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
-"Use '--' to separate paths from revisions, like this:\n"
-"'git <command> [<revision>...] -- [<file>...]'"
+msgid "Fast-forwarding submodule %s"
msgstr ""
-#: setup.c:233
+#: merge-recursive.c:1235
#, c-format
-msgid "option '%s' must come before non-option arguments"
+msgid "Failed to merge submodule %s (merge following commits not found)"
msgstr ""
-#: setup.c:252
+#: merge-recursive.c:1239
#, c-format
-msgid ""
-"ambiguous argument '%s': both revision and filename\n"
-"Use '--' to separate paths from revisions, like this:\n"
-"'git <command> [<revision>...] -- [<file>...]'"
+msgid "Failed to merge submodule %s (not fast-forward)"
msgstr ""
-#: setup.c:388
-msgid "unable to set up work tree using invalid config"
-msgstr ""
-
-#: setup.c:395
-msgid "this operation must be run in a work tree"
+#: merge-recursive.c:1240
+msgid "Found a possible merge resolution for the submodule:\n"
msgstr ""
-#: setup.c:506
+#: merge-recursive.c:1243
#, c-format
-msgid "Expected git repo version <= %d, found %d"
+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 ""
-#: setup.c:514
-msgid "unknown repository extensions found:"
+#: merge-recursive.c:1252
+#, c-format
+msgid "Failed to merge submodule %s (multiple merges found)"
msgstr ""
-#: setup.c:533
-#, c-format
-msgid "error opening '%s'"
+#: merge-recursive.c:1325
+msgid "Failed to execute internal merge"
msgstr ""
-#: setup.c:535
+#: merge-recursive.c:1330
#, c-format
-msgid "too large to be a .git file: '%s'"
+msgid "Unable to add %s to database"
msgstr ""
-#: setup.c:537
+#: merge-recursive.c:1362
#, c-format
-msgid "error reading %s"
+msgid "Auto-merging %s"
msgstr ""
-#: setup.c:539
+#: merge-recursive.c:1385
#, c-format
-msgid "invalid gitfile format: %s"
+msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
msgstr ""
-#: setup.c:541
+#: merge-recursive.c:1457
#, c-format
-msgid "no path in gitfile: %s"
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
+"in tree."
msgstr ""
-#: setup.c:543
+#: merge-recursive.c:1462
#, c-format
-msgid "not a git repository: %s"
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
+"left in tree."
msgstr ""
-#: setup.c:642
+#: merge-recursive.c:1469
#, c-format
-msgid "'$%s' too big"
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
+"in tree at %s."
msgstr ""
-#: setup.c:656
+#: merge-recursive.c:1474
#, c-format
-msgid "not a git repository: '%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 ""
-#: setup.c:685 setup.c:687 setup.c:718
-#, c-format
-msgid "cannot chdir to '%s'"
+#: merge-recursive.c:1509
+msgid "rename"
msgstr ""
-#: setup.c:690 setup.c:746 setup.c:756 setup.c:795 setup.c:803 setup.c:818
-msgid "cannot come back to cwd"
+#: merge-recursive.c:1509
+msgid "renamed"
msgstr ""
-#: setup.c:816
+#: merge-recursive.c:1589 merge-recursive.c:2445 merge-recursive.c:3085
#, c-format
-msgid "not a git repository (or any of the parent directories): %s"
+msgid "Refusing to lose dirty file at %s"
msgstr ""
-#: setup.c:827
+#: merge-recursive.c:1599
#, c-format
-msgid "failed to stat '%*s%s%s'"
+msgid "Refusing to lose untracked file at %s, even though it's in the way."
msgstr ""
-#: setup.c:1057
-msgid "Unable to read current working directory"
+#: merge-recursive.c:1657
+#, c-format
+msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
msgstr ""
-#: setup.c:1069 setup.c:1075
+#: merge-recursive.c:1687
#, c-format
-msgid "cannot change to '%s'"
+msgid "%s is a directory in %s adding as %s instead"
msgstr ""
-#: setup.c:1088
+#: merge-recursive.c:1692
#, 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 "Refusing to lose untracked file at %s; adding as %s instead"
msgstr ""
-#: setup.c:1172
+#: merge-recursive.c:1711
#, c-format
msgid ""
-"problem with core.sharedRepository filemode value (0%.3o).\n"
-"The owner of files must always have read and write permissions."
+"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
+"\"->\"%s\" in \"%s\"%s"
msgstr ""
-#: setup.c:1215
-msgid "open /dev/null or dup failed"
+#: merge-recursive.c:1716
+msgid " (left unresolved)"
msgstr ""
-#: setup.c:1230
-msgid "fork failed"
+#: merge-recursive.c:1825
+#, c-format
+msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr ""
-#: setup.c:1235
-msgid "setsid failed"
+#: merge-recursive.c:2030
+#, c-format
+msgid ""
+"CONFLICT (directory rename split): Unclear where to place %s because "
+"directory %s was renamed to multiple other directories, with no destination "
+"getting a majority of the files."
msgstr ""
-#: sha1_file.c:592
+#: merge-recursive.c:2062
#, c-format
-msgid "path '%s' does not exist"
+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 ""
-#: sha1_file.c:618
+#: merge-recursive.c:2072
#, c-format
-msgid "reference repository '%s' as a linked checkout is not supported yet."
+msgid ""
+"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
+"implicit directory renames tried to put these paths there: %s"
msgstr ""
-#: sha1_file.c:624
+#: merge-recursive.c:2164
#, c-format
-msgid "reference repository '%s' is not a local repository."
+msgid ""
+"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
+">%s in %s"
msgstr ""
-#: sha1_file.c:630
+#: merge-recursive.c:2408
#, c-format
-msgid "reference repository '%s' is shallow"
+msgid ""
+"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
+"renamed."
msgstr ""
-#: sha1_file.c:638
+#: merge-recursive.c:2929
#, c-format
-msgid "reference repository '%s' is grafted"
+msgid "cannot read object %s"
msgstr ""
-#: sha1_name.c:422
+#: merge-recursive.c:2932
#, c-format
-msgid "short SHA1 %s is ambiguous"
+msgid "object %s is not a blob"
msgstr ""
-#: sha1_name.c:433
-msgid "The candidates are:"
+#: merge-recursive.c:2996
+msgid "modify"
msgstr ""
-#: sha1_name.c:693
-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\""
+#: merge-recursive.c:2996
+msgid "modified"
msgstr ""
-#: submodule.c:96 submodule.c:130
-msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
+#: merge-recursive.c:3008
+msgid "content"
msgstr ""
-#: submodule.c:100 submodule.c:134
-#, c-format
-msgid "Could not find section in .gitmodules where path=%s"
+#: merge-recursive.c:3012
+msgid "add/add"
msgstr ""
-#: submodule.c:108
+#: merge-recursive.c:3035
#, c-format
-msgid "Could not update .gitmodules entry %s"
+msgid "Skipped %s (merged same as existing)"
msgstr ""
-#: submodule.c:141
-#, c-format
-msgid "Could not remove .gitmodules entry for %s"
+#: merge-recursive.c:3057 git-submodule.sh:937
+msgid "submodule"
msgstr ""
-#: submodule.c:152
-msgid "staging updated .gitmodules failed"
+#: merge-recursive.c:3058
+#, c-format
+msgid "CONFLICT (%s): Merge conflict in %s"
msgstr ""
-#: submodule.c:312
+#: merge-recursive.c:3088
#, c-format
-msgid "in unpopulated submodule '%s'"
+msgid "Adding as %s instead"
msgstr ""
-#: submodule.c:343
+#: merge-recursive.c:3170
#, c-format
-msgid "Pathspec '%s' is in submodule '%.*s'"
+msgid ""
+"Path updated: %s added in %s inside a directory that was renamed in %s; "
+"moving it to %s."
msgstr ""
-#: submodule.c:833
+#: merge-recursive.c:3173
#, c-format
-msgid "submodule entry '%s' (%s) is a %s, not a commit"
+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 ""
-#: submodule.c:1065 builtin/branch.c:648 builtin/submodule--helper.c:1724
-msgid "Failed to resolve HEAD as a valid ref."
+#: merge-recursive.c:3177
+#, c-format
+msgid ""
+"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
+"%s; moving it to %s."
msgstr ""
-#: submodule.c:1370
+#: merge-recursive.c:3180
#, c-format
-msgid "'%s' not recognized as a git repository"
+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 ""
-#: submodule.c:1508
+#: merge-recursive.c:3294
#, c-format
-msgid "could not start 'git status' in submodule '%s'"
+msgid "Removing %s"
msgstr ""
-#: submodule.c:1521
-#, c-format
-msgid "could not run 'git status' in submodule '%s'"
+#: merge-recursive.c:3317
+msgid "file/directory"
msgstr ""
-#: submodule.c:1614
-#, c-format
-msgid "submodule '%s' has dirty index"
+#: merge-recursive.c:3322
+msgid "directory/file"
msgstr ""
-#: submodule.c:1878
+#: merge-recursive.c:3329
#, c-format
-msgid ""
-"relocate_gitdir for submodule '%s' with more than one worktree not supported"
+msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
msgstr ""
-#: submodule.c:1890 submodule.c:1946
+#: merge-recursive.c:3338
#, c-format
-msgid "could not lookup name for submodule '%s'"
+msgid "Adding %s"
msgstr ""
-#: submodule.c:1894 builtin/submodule--helper.c:1246
-#: builtin/submodule--helper.c:1256
+#: merge-recursive.c:3347
#, c-format
-msgid "could not create directory '%s'"
+msgid "CONFLICT (add/add): Merge conflict in %s"
msgstr ""
-#: submodule.c:1897
+#: merge-recursive.c:3385
#, c-format
msgid ""
-"Migrating git directory of '%s%s' from\n"
-"'%s' to\n"
-"'%s'\n"
+"Your local changes to the following files would be overwritten by merge:\n"
+" %s"
+msgstr ""
+
+#: merge-recursive.c:3396
+msgid "Already up to date!"
msgstr ""
-#: submodule.c:1981
+#: merge-recursive.c:3405
#, c-format
-msgid "could not recurse into submodule '%s'"
+msgid "merging of trees %s and %s failed"
msgstr ""
-#: submodule.c:2025
-msgid "could not start ls-files in .."
+#: merge-recursive.c:3504
+msgid "Merging:"
msgstr ""
-#: submodule.c:2045
-msgid "BUG: returned path string doesn't match cwd?"
+#: merge-recursive.c:3517
+#, c-format
+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 ""
-#: submodule.c:2064
+#: merge-recursive.c:3622
#, c-format
-msgid "ls-tree returned unexpected return code %d"
+msgid "Could not parse object '%s'"
msgstr ""
-#: submodule-config.c:263
-msgid "negative values not allowed for submodule.fetchjobs"
+#: merge-recursive.c:3638 builtin/merge.c:702 builtin/merge.c:873
+msgid "Unable to write index."
msgstr ""
-#: submodule-config.c:436
+#: midx.c:66
#, c-format
-msgid "invalid value for %s"
+msgid "multi-pack-index file %s is too small"
msgstr ""
-#: trailer.c:238
+#: midx.c:82
#, c-format
-msgid "running trailer command '%s' failed"
+msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
msgstr ""
-#: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553
-#: trailer.c:557
+#: midx.c:87
#, c-format
-msgid "unknown value '%s' for key '%s'"
+msgid "multi-pack-index version %d not recognized"
msgstr ""
-#: trailer.c:539 trailer.c:544 builtin/remote.c:290
+#: midx.c:92
#, c-format
-msgid "more than one %s"
+msgid "hash version %u does not match"
msgstr ""
-#: trailer.c:730
-#, c-format
-msgid "empty trailer token in trailer '%.*s'"
+#: midx.c:106
+msgid "invalid chunk offset (too large)"
msgstr ""
-#: trailer.c:750
-#, c-format
-msgid "could not read input file '%s'"
+#: midx.c:130
+msgid "terminating multi-pack-index chunk id appears earlier than expected"
msgstr ""
-#: trailer.c:753
-msgid "could not read from stdin"
+#: midx.c:143
+msgid "multi-pack-index missing required pack-name chunk"
msgstr ""
-#: trailer.c:1008 builtin/am.c:46
-#, c-format
-msgid "could not stat %s"
+#: midx.c:145
+msgid "multi-pack-index missing required OID fanout chunk"
+msgstr ""
+
+#: midx.c:147
+msgid "multi-pack-index missing required OID lookup chunk"
msgstr ""
-#: trailer.c:1010
+#: midx.c:149
+msgid "multi-pack-index missing required object offsets chunk"
+msgstr ""
+
+#: midx.c:163
#, c-format
-msgid "file %s is not a regular file"
+msgid "multi-pack-index pack names out of order: '%s' before '%s'"
msgstr ""
-#: trailer.c:1012
+#: midx.c:208
#, c-format
-msgid "file %s is not writable by user"
+msgid "bad pack-int-id: %u (%u total packs)"
msgstr ""
-#: trailer.c:1024
-msgid "could not open temporary file"
+#: midx.c:258
+msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
msgstr ""
-#: trailer.c:1064
-#, c-format
-msgid "could not rename temporary file to %s"
+#: midx.c:286
+msgid "error preparing packfile from multi-pack-index"
msgstr ""
-#: transport.c:63
+#: midx.c:457
#, c-format
-msgid "Would set upstream of '%s' to '%s' of '%s'\n"
+msgid "failed to add packfile '%s'"
msgstr ""
-#: transport.c:152
+#: midx.c:463
#, c-format
-msgid "transport: invalid depth option '%s'"
+msgid "failed to open pack-index '%s'"
msgstr ""
-#: transport.c:916
+#: midx.c:557
#, c-format
-msgid ""
-"The following submodule paths contain changes that can\n"
-"not be found on any remote:\n"
+msgid "failed to locate object %d in packfile"
msgstr ""
-#: transport.c:920
+#: midx.c:993
#, c-format
-msgid ""
-"\n"
-"Please try\n"
-"\n"
-"\tgit push --recurse-submodules=on-demand\n"
-"\n"
-"or cd to the path and use\n"
-"\n"
-"\tgit push\n"
-"\n"
-"to push them to a remote.\n"
-"\n"
+msgid "failed to clear multi-pack-index at %s"
msgstr ""
-#: transport.c:928
-msgid "Aborting."
+#: midx.c:1048
+msgid "Looking for referenced packfiles"
msgstr ""
-#: transport-helper.c:1079
+#: midx.c:1063
#, c-format
-msgid "Could not read ref %s"
+msgid ""
+"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
msgstr ""
-#: tree-walk.c:31
-msgid "too-short tree object"
+#: midx.c:1067
+msgid "Verifying OID order in MIDX"
msgstr ""
-#: tree-walk.c:37
-msgid "malformed mode in tree entry"
+#: midx.c:1076
+#, c-format
+msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
msgstr ""
-#: tree-walk.c:41
-msgid "empty filename in tree entry"
+#: midx.c:1095
+msgid "Sorting objects by packfile"
msgstr ""
-#: tree-walk.c:114
-msgid "too-short tree file"
+#: midx.c:1101
+msgid "Verifying object offsets"
msgstr ""
-#: unpack-trees.c:108
+#: midx.c:1117
#, 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 "failed to load pack entry for oid[%d] = %s"
msgstr ""
-#: unpack-trees.c:110
+#: midx.c:1123
#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by checkout:\n"
-"%%s"
+msgid "failed to load pack-index for packfile %s"
msgstr ""
-#: unpack-trees.c:113
+#: midx.c:1132
#, 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 "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
msgstr ""
-#: unpack-trees.c:115
+#: name-hash.c:531
#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by merge:\n"
-"%%s"
+msgid "unable to create lazy_dir thread: %s"
msgstr ""
-#: unpack-trees.c:118
+#: name-hash.c:553
#, 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 create lazy_name thread: %s"
msgstr ""
-#: unpack-trees.c:120
+#: name-hash.c:559
#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by %s:\n"
-"%%s"
+msgid "unable to join lazy_name thread: %s"
msgstr ""
-#: unpack-trees.c:125
+#: notes-merge.c:277
#, c-format
msgid ""
-"Updating the following directories would lose untracked files in them:\n"
-"%s"
+"You have not concluded your previous notes merge (%s exists).\n"
+"Please, use 'git notes merge --commit' or 'git notes merge --abort' to "
+"commit/abort the previous merge before you start a new notes merge."
msgstr ""
-#: unpack-trees.c:129
+#: notes-merge.c:284
#, c-format
-msgid ""
-"The following untracked working tree files would be removed by checkout:\n"
-"%%sPlease move or remove them before you switch branches."
+msgid "You have not concluded your notes merge (%s exists)."
msgstr ""
-#: unpack-trees.c:131
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by checkout:\n"
-"%%s"
+#: notes-utils.c:46
+msgid "Cannot commit uninitialized/unreferenced notes tree"
msgstr ""
-#: unpack-trees.c:134
+#: notes-utils.c:105
#, 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 notes.rewriteMode value: '%s'"
msgstr ""
-#: unpack-trees.c:136
+#: notes-utils.c:115
#, c-format
-msgid ""
-"The following untracked working tree files would be removed by merge:\n"
-"%%s"
+msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
msgstr ""
-#: unpack-trees.c:139
+#. TRANSLATORS: The first %s is the name of
+#. the environment variable, the second %s is
+#. its value.
+#.
+#: notes-utils.c:145
#, c-format
-msgid ""
-"The following untracked working tree files would be removed by %s:\n"
-"%%sPlease move or remove them before you %s."
+msgid "Bad %s value: '%s'"
msgstr ""
-#: unpack-trees.c:141
+#: object.c:54
#, c-format
-msgid ""
-"The following untracked working tree files would be removed by %s:\n"
-"%%s"
+msgid "invalid object type \"%s\""
msgstr ""
-#: unpack-trees.c:146
+#: object.c:174
#, 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 "object %s is a %s, not a %s"
msgstr ""
-#: unpack-trees.c:148
+#: object.c:234
#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by "
-"checkout:\n"
-"%%s"
+msgid "object %s has unknown type id %d"
msgstr ""
-#: unpack-trees.c:151
+#: object.c:247
#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by merge:\n"
-"%%sPlease move or remove them before you merge."
+msgid "unable to parse object: %s"
msgstr ""
-#: unpack-trees.c:153
+#: object.c:267 object.c:278
#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by merge:\n"
-"%%s"
+msgid "hash mismatch %s"
msgstr ""
-#: unpack-trees.c:156
-#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by %s:\n"
-"%%sPlease move or remove them before you %s."
+#: packfile.c:617
+msgid "offset before end of packfile (broken .idx?)"
msgstr ""
-#: unpack-trees.c:158
+#: packfile.c:1868
#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by %s:\n"
-"%%s"
+msgid "offset before start of pack index for %s (corrupt index?)"
msgstr ""
-#: unpack-trees.c:165
+#: packfile.c:1872
#, c-format
-msgid "Entry '%s' overlaps with '%s'. Cannot bind."
+msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr ""
-#: unpack-trees.c:168
+#: parse-options.c:38
#, c-format
-msgid ""
-"Cannot update sparse checkout: the following entries are not up to date:\n"
-"%s"
+msgid "%s requires a value"
msgstr ""
-#: unpack-trees.c:170
+#: parse-options.c:73
#, c-format
-msgid ""
-"The following working tree files would be overwritten by sparse checkout "
-"update:\n"
-"%s"
+msgid "%s is incompatible with %s"
msgstr ""
-#: unpack-trees.c:172
+#: parse-options.c:78
#, c-format
-msgid ""
-"The following working tree files would be removed by sparse checkout "
-"update:\n"
-"%s"
+msgid "%s : incompatible with something else"
msgstr ""
-#: unpack-trees.c:174
+#: parse-options.c:92 parse-options.c:96 parse-options.c:319
#, c-format
-msgid ""
-"Cannot update submodule:\n"
-"%s"
+msgid "%s takes no value"
msgstr ""
-#: unpack-trees.c:251
+#: parse-options.c:94
#, c-format
-msgid "Aborting\n"
+msgid "%s isn't available"
msgstr ""
-#: unpack-trees.c:333
-msgid "Checking out files"
+#: parse-options.c:219
+#, c-format
+msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
msgstr ""
-#: urlmatch.c:163
-msgid "invalid URL scheme name or missing '://' suffix"
+#: parse-options.c:389
+#, c-format
+msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
msgstr ""
-#: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405
+#: parse-options.c:423 parse-options.c:431
#, c-format
-msgid "invalid %XX escape sequence"
+msgid "did you mean `--%s` (with two dashes ?)"
msgstr ""
-#: urlmatch.c:215
-msgid "missing host and scheme is not 'file:'"
+#: parse-options.c:859
+#, c-format
+msgid "unknown option `%s'"
msgstr ""
-#: urlmatch.c:232
-msgid "a 'file:' URL may not have a port number"
+#: parse-options.c:861
+#, c-format
+msgid "unknown switch `%c'"
msgstr ""
-#: urlmatch.c:247
-msgid "invalid characters in host name"
+#: parse-options.c:863
+#, c-format
+msgid "unknown non-ascii option in string: `%s'"
msgstr ""
-#: urlmatch.c:292 urlmatch.c:303
-msgid "invalid port number"
+#: parse-options.c:887
+msgid "..."
msgstr ""
-#: urlmatch.c:371
-msgid "invalid '..' path segment"
+#: parse-options.c:906
+#, c-format
+msgid "usage: %s"
msgstr ""
-#: worktree.c:245 builtin/am.c:2147
+#. TRANSLATORS: the colon here should align with the
+#. one in "usage: %s" translation.
+#.
+#: parse-options.c:912
#, c-format
-msgid "failed to read '%s'"
+msgid " or: %s"
msgstr ""
-#: worktree.c:291
+#: parse-options.c:915
#, c-format
-msgid "'%s' at main working tree is not the repository directory"
+msgid " %s"
msgstr ""
-#: worktree.c:302
-#, c-format
-msgid "'%s' file does not contain absolute path to the working tree location"
+#: parse-options.c:954
+msgid "-NUM"
msgstr ""
-#: worktree.c:314
+#: parse-options.c:968
#, c-format
-msgid "'%s' does not exist"
+msgid "alias of --%s"
msgstr ""
-#: worktree.c:320
+#: parse-options-cb.c:20 parse-options-cb.c:24
#, c-format
-msgid "'%s' is not a .git file, error code %d"
+msgid "option `%s' expects a numerical value"
msgstr ""
-#: worktree.c:328
+#: parse-options-cb.c:41
#, c-format
-msgid "'%s' does not point back to '%s'"
+msgid "malformed expiration date '%s'"
msgstr ""
-#: wrapper.c:223 wrapper.c:393
+#: parse-options-cb.c:54
#, c-format
-msgid "could not open '%s' for reading and writing"
+msgid "option `%s' expects \"always\", \"auto\", or \"never\""
msgstr ""
-#: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:770
-#: builtin/am.c:862 builtin/merge.c:1044
+#: parse-options-cb.c:130 parse-options-cb.c:147
#, c-format
-msgid "could not open '%s' for reading"
+msgid "malformed object name '%s'"
msgstr ""
-#: wrapper.c:424 wrapper.c:624
+#: path.c:897
#, c-format
-msgid "unable to access '%s'"
+msgid "Could not make %s writable by group"
msgstr ""
-#: wrapper.c:632
-msgid "unable to get current working directory"
+#: pathspec.c:128
+msgid "Escape character '\\' not allowed as last character in attr value"
msgstr ""
-#: wt-status.c:151
-msgid "Unmerged paths:"
+#: pathspec.c:146
+msgid "Only one 'attr:' specification is allowed."
msgstr ""
-#: wt-status.c:178 wt-status.c:205
-#, c-format
-msgid " (use \"git reset %s <file>...\" to unstage)"
+#: pathspec.c:149
+msgid "attr spec must not be empty"
msgstr ""
-#: wt-status.c:180 wt-status.c:207
-msgid " (use \"git rm --cached <file>...\" to unstage)"
+#: pathspec.c:192
+#, c-format
+msgid "invalid attribute name %s"
msgstr ""
-#: wt-status.c:184
-msgid " (use \"git add <file>...\" to mark resolution)"
+#: pathspec.c:257
+msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
msgstr ""
-#: wt-status.c:186 wt-status.c:190
-msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
+#: pathspec.c:264
+msgid ""
+"global 'literal' pathspec setting is incompatible with all other global "
+"pathspec settings"
msgstr ""
-#: wt-status.c:188
-msgid " (use \"git rm <file>...\" to mark resolution)"
+#: pathspec.c:304
+msgid "invalid parameter for pathspec magic 'prefix'"
msgstr ""
-#: wt-status.c:199 wt-status.c:1007
-msgid "Changes to be committed:"
+#: pathspec.c:325
+#, c-format
+msgid "Invalid pathspec magic '%.*s' in '%s'"
msgstr ""
-#: wt-status.c:217 wt-status.c:1016
-msgid "Changes not staged for commit:"
+#: pathspec.c:330
+#, c-format
+msgid "Missing ')' at the end of pathspec magic in '%s'"
msgstr ""
-#: wt-status.c:221
-msgid " (use \"git add <file>...\" to update what will be committed)"
+#: pathspec.c:368
+#, c-format
+msgid "Unimplemented pathspec magic '%c' in '%s'"
msgstr ""
-#: wt-status.c:223
-msgid " (use \"git add/rm <file>...\" to update what will be committed)"
+#: pathspec.c:427
+#, c-format
+msgid "%s: 'literal' and 'glob' are incompatible"
msgstr ""
-#: wt-status.c:224
-msgid ""
-" (use \"git checkout -- <file>...\" to discard changes in working directory)"
+#: pathspec.c:440
+#, c-format
+msgid "%s: '%s' is outside repository"
msgstr ""
-#: wt-status.c:226
-msgid " (commit or discard the untracked or modified content in submodules)"
+#: pathspec.c:514
+#, c-format
+msgid "'%s' (mnemonic: '%c')"
msgstr ""
-#: wt-status.c:238
+#: pathspec.c:524
#, c-format
-msgid " (use \"git %s <file>...\" to include in what will be committed)"
+msgid "%s: pathspec magic not supported by this command: %s"
msgstr ""
-#: wt-status.c:253
-msgid "both deleted:"
+#: pathspec.c:591
+#, c-format
+msgid "pathspec '%s' is beyond a symbolic link"
msgstr ""
-#: wt-status.c:255
-msgid "added by us:"
+#: pkt-line.c:92
+msgid "unable to write flush packet"
msgstr ""
-#: wt-status.c:257
-msgid "deleted by them:"
+#: pkt-line.c:99
+msgid "unable to write delim packet"
msgstr ""
-#: wt-status.c:259
-msgid "added by them:"
+#: pkt-line.c:106
+msgid "flush packet write failed"
msgstr ""
-#: wt-status.c:261
-msgid "deleted by us:"
+#: pkt-line.c:146 pkt-line.c:232
+msgid "protocol error: impossibly long line"
msgstr ""
-#: wt-status.c:263
-msgid "both added:"
+#: pkt-line.c:162 pkt-line.c:164
+msgid "packet write with format failed"
msgstr ""
-#: wt-status.c:265
-msgid "both modified:"
+#: pkt-line.c:196
+msgid "packet write failed - data exceeds max packet size"
msgstr ""
-#: wt-status.c:275
-msgid "new file:"
+#: pkt-line.c:203 pkt-line.c:210
+msgid "packet write failed"
msgstr ""
-#: wt-status.c:277
-msgid "copied:"
+#: pkt-line.c:295
+msgid "read error"
msgstr ""
-#: wt-status.c:279
-msgid "deleted:"
+#: pkt-line.c:303
+msgid "the remote end hung up unexpectedly"
msgstr ""
-#: wt-status.c:281
-msgid "modified:"
+#: pkt-line.c:331
+#, c-format
+msgid "protocol error: bad line length character: %.4s"
msgstr ""
-#: wt-status.c:283
-msgid "renamed:"
+#: pkt-line.c:341 pkt-line.c:346
+#, c-format
+msgid "protocol error: bad line length %d"
msgstr ""
-#: wt-status.c:285
-msgid "typechange:"
+#: pkt-line.c:362
+#, c-format
+msgid "remote error: %s"
msgstr ""
-#: wt-status.c:287
-msgid "unknown:"
+#: preload-index.c:119
+msgid "Refreshing index"
msgstr ""
-#: wt-status.c:289
-msgid "unmerged:"
+#: preload-index.c:138
+#, c-format
+msgid "unable to create threaded lstat: %s"
msgstr ""
-#: wt-status.c:369
-msgid "new commits, "
+#: pretty.c:966
+msgid "unable to parse --pretty format"
msgstr ""
-#: wt-status.c:371
-msgid "modified content, "
+#: range-diff.c:56
+msgid "could not start `log`"
msgstr ""
-#: wt-status.c:373
-msgid "untracked content, "
+#: range-diff.c:59
+msgid "could not read `log` output"
msgstr ""
-#: wt-status.c:847
+#: range-diff.c:74 sequencer.c:4897
#, c-format
-msgid "Your stash currently has %d entry"
-msgid_plural "Your stash currently has %d entries"
-msgstr[0] ""
-msgstr[1] ""
-
-#: wt-status.c:879
-msgid "Submodules changed but not updated:"
+msgid "could not parse commit '%s'"
msgstr ""
-#: wt-status.c:881
-msgid "Submodule changes to be committed:"
+#: range-diff.c:224
+msgid "failed to generate diff"
msgstr ""
-#: wt-status.c:963
-msgid ""
-"Do not modify or remove the line above.\n"
-"Everything below it will be ignored."
+#: range-diff.c:455 range-diff.c:457
+#, c-format
+msgid "could not parse log for '%s'"
msgstr ""
-#: wt-status.c:1076
-msgid "You have unmerged paths."
+#: read-cache.c:680
+#, c-format
+msgid "will not add file alias '%s' ('%s' already exists in index)"
msgstr ""
-#: wt-status.c:1079
-msgid " (fix conflicts and run \"git commit\")"
+#: read-cache.c:696
+msgid "cannot create an empty blob in the object database"
msgstr ""
-#: wt-status.c:1081
-msgid " (use \"git merge --abort\" to abort the merge)"
+#: read-cache.c:718
+#, c-format
+msgid "%s: can only add regular files, symbolic links or git-directories"
msgstr ""
-#: wt-status.c:1086
-msgid "All conflicts fixed but you are still merging."
+#: read-cache.c:723
+#, c-format
+msgid "'%s' does not have a commit checked out"
msgstr ""
-#: wt-status.c:1089
-msgid " (use \"git commit\" to conclude merge)"
+#: read-cache.c:775
+#, c-format
+msgid "unable to index file '%s'"
msgstr ""
-#: wt-status.c:1099
-msgid "You are in the middle of an am session."
+#: read-cache.c:794
+#, c-format
+msgid "unable to add '%s' to index"
msgstr ""
-#: wt-status.c:1102
-msgid "The current patch is empty."
+#: read-cache.c:805
+#, c-format
+msgid "unable to stat '%s'"
msgstr ""
-#: wt-status.c:1106
-msgid " (fix conflicts and then run \"git am --continue\")"
+#: read-cache.c:1314
+#, c-format
+msgid "'%s' appears as both a file and as a directory"
msgstr ""
-#: wt-status.c:1108
-msgid " (use \"git am --skip\" to skip this patch)"
+#: read-cache.c:1499
+msgid "Refresh index"
msgstr ""
-#: wt-status.c:1110
-msgid " (use \"git am --abort\" to restore the original branch)"
+#: read-cache.c:1613
+#, c-format
+msgid ""
+"index.version set, but the value is invalid.\n"
+"Using version %i"
msgstr ""
-#: wt-status.c:1242
-msgid "git-rebase-todo is missing."
+#: read-cache.c:1623
+#, c-format
+msgid ""
+"GIT_INDEX_VERSION set, but the value is invalid.\n"
+"Using version %i"
msgstr ""
-#: wt-status.c:1244
-msgid "No commands done."
+#: read-cache.c:1679
+#, c-format
+msgid "bad signature 0x%08x"
msgstr ""
-#: wt-status.c:1247
+#: read-cache.c:1682
#, c-format
-msgid "Last command done (%d command done):"
-msgid_plural "Last commands done (%d commands done):"
-msgstr[0] ""
-msgstr[1] ""
+msgid "bad index version %d"
+msgstr ""
-#: wt-status.c:1258
-#, c-format
-msgid " (see more in file %s)"
+#: read-cache.c:1691
+msgid "bad index file sha1 signature"
msgstr ""
-#: wt-status.c:1263
-msgid "No commands remaining."
+#: read-cache.c:1721
+#, c-format
+msgid "index uses %.4s extension, which we do not understand"
msgstr ""
-#: wt-status.c:1266
+#: read-cache.c:1723
#, c-format
-msgid "Next command to do (%d remaining command):"
-msgid_plural "Next commands to do (%d remaining commands):"
-msgstr[0] ""
-msgstr[1] ""
+msgid "ignoring %.4s extension"
+msgstr ""
-#: wt-status.c:1274
-msgid " (use \"git rebase --edit-todo\" to view and edit)"
+#: read-cache.c:1760
+#, c-format
+msgid "unknown index entry format 0x%08x"
msgstr ""
-#: wt-status.c:1287
+#: read-cache.c:1776
#, c-format
-msgid "You are currently rebasing branch '%s' on '%s'."
+msgid "malformed name field in the index, near path '%s'"
msgstr ""
-#: wt-status.c:1292
-msgid "You are currently rebasing."
+#: read-cache.c:1833
+msgid "unordered stage entries in index"
msgstr ""
-#: wt-status.c:1306
-msgid " (fix conflicts and then run \"git rebase --continue\")"
+#: read-cache.c:1836
+#, c-format
+msgid "multiple stage entries for merged file '%s'"
msgstr ""
-#: wt-status.c:1308
-msgid " (use \"git rebase --skip\" to skip this patch)"
+#: read-cache.c:1839
+#, c-format
+msgid "unordered stage entries for '%s'"
msgstr ""
-#: wt-status.c:1310
-msgid " (use \"git rebase --abort\" to check out the original branch)"
+#: 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 ""
-#: wt-status.c:1316
-msgid " (all conflicts fixed: run \"git rebase --continue\")"
+#: read-cache.c:2087
+#, c-format
+msgid "unable to create load_cache_entries thread: %s"
msgstr ""
-#: wt-status.c:1320
+#: read-cache.c:2100
#, c-format
-msgid ""
-"You are currently splitting a commit while rebasing branch '%s' on '%s'."
+msgid "unable to join load_cache_entries thread: %s"
msgstr ""
-#: wt-status.c:1325
-msgid "You are currently splitting a commit during a rebase."
+#: read-cache.c:2133
+#, c-format
+msgid "%s: index file open failed"
msgstr ""
-#: wt-status.c:1328
-msgid " (Once your working directory is clean, run \"git rebase --continue\")"
+#: read-cache.c:2137
+#, c-format
+msgid "%s: cannot stat the open index"
msgstr ""
-#: wt-status.c:1332
+#: read-cache.c:2141
#, c-format
-msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
+msgid "%s: index file smaller than expected"
msgstr ""
-#: wt-status.c:1337
-msgid "You are currently editing a commit during a rebase."
+#: read-cache.c:2145
+#, c-format
+msgid "%s: unable to map index file"
msgstr ""
-#: wt-status.c:1340
-msgid " (use \"git commit --amend\" to amend the current commit)"
+#: read-cache.c:2187
+#, c-format
+msgid "unable to create load_index_extensions thread: %s"
msgstr ""
-#: wt-status.c:1342
-msgid ""
-" (use \"git rebase --continue\" once you are satisfied with your changes)"
+#: read-cache.c:2214
+#, c-format
+msgid "unable to join load_index_extensions thread: %s"
msgstr ""
-#: wt-status.c:1352
+#: read-cache.c:2246
#, c-format
-msgid "You are currently cherry-picking commit %s."
+msgid "could not freshen shared index '%s'"
msgstr ""
-#: wt-status.c:1357
-msgid " (fix conflicts and run \"git cherry-pick --continue\")"
+#: read-cache.c:2293
+#, c-format
+msgid "broken index, expect %s in %s, got %s"
msgstr ""
-#: wt-status.c:1360
-msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
+#: read-cache.c:2989 wrapper.c:658 builtin/merge.c:1117
+#, c-format
+msgid "could not close '%s'"
msgstr ""
-#: wt-status.c:1362
-msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
+#: read-cache.c:3092 sequencer.c:2354 sequencer.c:3807
+#, c-format
+msgid "could not stat '%s'"
msgstr ""
-#: wt-status.c:1371
+#: read-cache.c:3105
#, c-format
-msgid "You are currently reverting commit %s."
+msgid "unable to open git dir: %s"
msgstr ""
-#: wt-status.c:1376
-msgid " (fix conflicts and run \"git revert --continue\")"
+#: read-cache.c:3117
+#, c-format
+msgid "unable to unlink: %s"
msgstr ""
-#: wt-status.c:1379
-msgid " (all conflicts fixed: run \"git revert --continue\")"
-msgstr ""
-
-#: wt-status.c:1381
-msgid " (use \"git revert --abort\" to cancel the revert operation)"
+#: read-cache.c:3142
+#, c-format
+msgid "cannot fix permission bits on '%s'"
msgstr ""
-#: wt-status.c:1392
+#: read-cache.c:3291
#, c-format
-msgid "You are currently bisecting, started from branch '%s'."
+msgid "%s: cannot drop to stage #0"
msgstr ""
-#: wt-status.c:1396
-msgid "You are currently bisecting."
+#: rebase-interactive.c:26
+#, c-format
+msgid ""
+"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
msgstr ""
-#: wt-status.c:1399
-msgid " (use \"git bisect reset\" to get back to the original branch)"
+#: 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:1596
-msgid "On branch "
-msgstr ""
+#: rebase-interactive.c:56
+#, c-format
+msgid "Rebase %s onto %s (%d command)"
+msgid_plural "Rebase %s onto %s (%d commands)"
+msgstr[0] ""
+msgstr[1] ""
-#: wt-status.c:1602
-msgid "interactive rebase in progress; onto "
+#: 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:1604
-msgid "rebase in progress; onto "
+#: 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:1609
-msgid "HEAD detached at "
+#: 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:1611
-msgid "HEAD detached from "
+#: 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:1614
-msgid "Not currently on any branch."
+#: rebase-interactive.c:85 git-rebase--preserve-merges.sh:900
+msgid "Note that empty commits are commented out"
msgstr ""
-#: wt-status.c:1634
-msgid "Initial 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:1635
-msgid "No commits yet"
+#: rebase-interactive.c:108
+#, c-format
+msgid "could not copy '%s' to '%s'."
msgstr ""
-#: wt-status.c:1649
-msgid "Untracked files"
+#: 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:1651
-msgid "Ignored files"
+#: rebase-interactive.c:180
+#, c-format
+msgid ""
+"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
+"\n"
+"Use 'git config rebase.missingCommitsCheck' to change the level of "
+"warnings.\n"
+"The possible behaviours are: ignore, warn, error.\n"
+"\n"
msgstr ""
-#: wt-status.c:1655
+#: refs.c:192
#, c-format
-msgid ""
-"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
-"may speed it up, but you have to be careful not to forget to add\n"
-"new files yourself (see 'git help status')."
+msgid "%s does not point to a valid object!"
msgstr ""
-#: wt-status.c:1661
+#: refs.c:597
#, c-format
-msgid "Untracked files not listed%s"
+msgid "ignoring dangling symref %s"
msgstr ""
-#: wt-status.c:1663
-msgid " (use -u option to show untracked files)"
+#: refs.c:599 ref-filter.c:1982
+#, c-format
+msgid "ignoring broken ref %s"
msgstr ""
-#: wt-status.c:1669
-msgid "No changes"
+#: refs.c:734
+#, c-format
+msgid "could not open '%s' for writing: %s"
msgstr ""
-#: wt-status.c:1674
+#: refs.c:744 refs.c:795
#, c-format
-msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
+msgid "could not read ref '%s'"
msgstr ""
-#: wt-status.c:1677
+#: refs.c:750
#, c-format
-msgid "no changes added to commit\n"
+msgid "ref '%s' already exists"
msgstr ""
-#: wt-status.c:1680
+#: refs.c:755
#, c-format
-msgid ""
-"nothing added to commit but untracked files present (use \"git add\" to "
-"track)\n"
+msgid "unexpected object ID when writing '%s'"
msgstr ""
-#: wt-status.c:1683
+#: 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 "nothing added to commit but untracked files present\n"
+msgid "could not write to '%s'"
msgstr ""
-#: wt-status.c:1686
+#: refs.c:790 wrapper.c:225 wrapper.c:395 builtin/am.c:715 builtin/rebase.c:993
#, c-format
-msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
+msgid "could not open '%s' for writing"
msgstr ""
-#: wt-status.c:1689 wt-status.c:1694
+#: refs.c:797
#, c-format
-msgid "nothing to commit\n"
+msgid "unexpected object ID when deleting '%s'"
msgstr ""
-#: wt-status.c:1692
+#: refs.c:928
#, c-format
-msgid "nothing to commit (use -u to show untracked files)\n"
+msgid "log for ref %s has gap after %s"
msgstr ""
-#: wt-status.c:1696
+#: refs.c:934
#, c-format
-msgid "nothing to commit, working tree clean\n"
+msgid "log for ref %s unexpectedly ended on %s"
msgstr ""
-#: wt-status.c:1809
-msgid "No commits yet on "
+#: refs.c:993
+#, c-format
+msgid "log for %s is empty"
msgstr ""
-#: wt-status.c:1813
-msgid "HEAD (no branch)"
+#: refs.c:1085
+#, c-format
+msgid "refusing to update ref with bad name '%s'"
msgstr ""
-#: wt-status.c:1844
-msgid "different"
+#: refs.c:1161
+#, c-format
+msgid "update_ref failed for ref '%s': %s"
msgstr ""
-#: wt-status.c:1846 wt-status.c:1854
-msgid "behind "
+#: refs.c:1942
+#, c-format
+msgid "multiple updates for ref '%s' not allowed"
msgstr ""
-#: wt-status.c:1849 wt-status.c:1852
-msgid "ahead "
+#: refs.c:1974
+msgid "ref updates forbidden inside quarantine environment"
msgstr ""
-#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2358
+#: refs.c:2070 refs.c:2100
#, c-format
-msgid "cannot %s: You have unstaged changes."
+msgid "'%s' exists; cannot create '%s'"
msgstr ""
-#: wt-status.c:2364
-msgid "additionally, your index contains uncommitted changes."
+#: refs.c:2076 refs.c:2111
+#, c-format
+msgid "cannot process '%s' and '%s' at the same time"
msgstr ""
-#: wt-status.c:2366
+#: refs/files-backend.c:1234
#, c-format
-msgid "cannot %s: Your index contains uncommitted changes."
+msgid "could not remove reference %s"
msgstr ""
-#: compat/precompose_utf8.c:58 builtin/clone.c:440
+#: refs/files-backend.c:1248 refs/packed-backend.c:1532
+#: refs/packed-backend.c:1542
#, c-format
-msgid "failed to unlink '%s'"
+msgid "could not delete reference %s: %s"
msgstr ""
-#: builtin/add.c:24
-msgid "git add [<options>] [--] <pathspec>..."
+#: refs/files-backend.c:1251 refs/packed-backend.c:1545
+#, c-format
+msgid "could not delete references: %s"
msgstr ""
-#: builtin/add.c:83
+#: refspec.c:137
#, c-format
-msgid "unexpected diff status %c"
+msgid "invalid refspec '%s'"
msgstr ""
-#: builtin/add.c:88 builtin/commit.c:257
-msgid "updating files failed"
+#: ref-filter.c:39 wt-status.c:1909
+msgid "gone"
msgstr ""
-#: builtin/add.c:98
+#: ref-filter.c:40
#, c-format
-msgid "remove '%s'\n"
+msgid "ahead %d"
msgstr ""
-#: builtin/add.c:173
-msgid "Unstaged changes after refreshing the index:"
+#: ref-filter.c:41
+#, c-format
+msgid "behind %d"
msgstr ""
-#: builtin/add.c:233 builtin/rev-parse.c:888
-msgid "Could not read the index"
+#: ref-filter.c:42
+#, c-format
+msgid "ahead %d, behind %d"
msgstr ""
-#: builtin/add.c:244
+#: ref-filter.c:138
#, c-format
-msgid "Could not open '%s' for writing."
+msgid "expected format: %%(color:<color>)"
msgstr ""
-#: builtin/add.c:248
-msgid "Could not write patch"
+#: ref-filter.c:140
+#, c-format
+msgid "unrecognized color: %%(color:%s)"
msgstr ""
-#: builtin/add.c:251
-msgid "editing patch failed"
+#: ref-filter.c:162
+#, c-format
+msgid "Integer value expected refname:lstrip=%s"
msgstr ""
-#: builtin/add.c:254
+#: ref-filter.c:166
#, c-format
-msgid "Could not stat '%s'"
+msgid "Integer value expected refname:rstrip=%s"
msgstr ""
-#: builtin/add.c:256
-msgid "Empty patch. Aborted."
+#: ref-filter.c:168
+#, c-format
+msgid "unrecognized %%(%s) argument: %s"
msgstr ""
-#: builtin/add.c:261
+#: ref-filter.c:223
#, c-format
-msgid "Could not apply '%s'"
+msgid "%%(objecttype) does not take arguments"
msgstr ""
-#: builtin/add.c:271
-msgid "The following paths are ignored by one of your .gitignore files:\n"
+#: ref-filter.c:245
+#, c-format
+msgid "unrecognized %%(objectsize) argument: %s"
msgstr ""
-#: builtin/add.c:291 builtin/clean.c:911 builtin/fetch.c:146 builtin/mv.c:124
-#: builtin/prune-packed.c:55 builtin/pull.c:207 builtin/push.c:541
-#: builtin/remote.c:1333 builtin/rm.c:242 builtin/send-pack.c:164
-msgid "dry run"
+#: ref-filter.c:253
+#, c-format
+msgid "%%(deltabase) does not take arguments"
msgstr ""
-#: builtin/add.c:294
-msgid "interactive picking"
+#: ref-filter.c:265
+#, c-format
+msgid "%%(body) does not take arguments"
msgstr ""
-#: builtin/add.c:295 builtin/checkout.c:1128 builtin/reset.c:302
-msgid "select hunks interactively"
+#: ref-filter.c:274
+#, c-format
+msgid "%%(subject) does not take arguments"
msgstr ""
-#: builtin/add.c:296
-msgid "edit current diff and apply"
+#: ref-filter.c:296
+#, c-format
+msgid "unknown %%(trailers) argument: %s"
msgstr ""
-#: builtin/add.c:297
-msgid "allow adding otherwise ignored files"
+#: ref-filter.c:325
+#, c-format
+msgid "positive value expected contents:lines=%s"
msgstr ""
-#: builtin/add.c:298
-msgid "update tracked files"
+#: ref-filter.c:327
+#, c-format
+msgid "unrecognized %%(contents) argument: %s"
msgstr ""
-#: builtin/add.c:299
-msgid "renormalize EOL of tracked files (implies -u)"
+#: ref-filter.c:342
+#, c-format
+msgid "positive value expected objectname:short=%s"
msgstr ""
-#: builtin/add.c:300
-msgid "record only the fact that the path will be added later"
+#: ref-filter.c:346
+#, c-format
+msgid "unrecognized %%(objectname) argument: %s"
msgstr ""
-#: builtin/add.c:301
-msgid "add changes from all tracked and untracked files"
+#: ref-filter.c:376
+#, c-format
+msgid "expected format: %%(align:<width>,<position>)"
msgstr ""
-#: builtin/add.c:304
-msgid "ignore paths removed in the working tree (same as --no-all)"
+#: ref-filter.c:388
+#, c-format
+msgid "unrecognized position:%s"
msgstr ""
-#: builtin/add.c:306
-msgid "don't add, only refresh the index"
+#: ref-filter.c:395
+#, c-format
+msgid "unrecognized width:%s"
msgstr ""
-#: builtin/add.c:307
-msgid "just skip files which cannot be added because of errors"
+#: ref-filter.c:404
+#, c-format
+msgid "unrecognized %%(align) argument: %s"
msgstr ""
-#: builtin/add.c:308
-msgid "check if - even missing - files are ignored in dry run"
+#: ref-filter.c:412
+#, c-format
+msgid "positive width expected with the %%(align) atom"
msgstr ""
-#: builtin/add.c:309 builtin/update-index.c:964
-msgid "(+/-)x"
+#: ref-filter.c:430
+#, c-format
+msgid "unrecognized %%(if) argument: %s"
msgstr ""
-#: builtin/add.c:309 builtin/update-index.c:965
-msgid "override the executable bit of the listed files"
+#: ref-filter.c:531
+#, c-format
+msgid "malformed field name: %.*s"
msgstr ""
-#: builtin/add.c:311
-msgid "warn when adding an embedded repository"
+#: ref-filter.c:558
+#, c-format
+msgid "unknown field name: %.*s"
msgstr ""
-#: builtin/add.c:326
+#: ref-filter.c:562
#, 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."
+"not a git repository, but the field '%.*s' requires access to object data"
msgstr ""
-#: builtin/add.c:354
+#: ref-filter.c:686
#, c-format
-msgid "adding embedded git repository: %s"
+msgid "format: %%(if) atom used without a %%(then) atom"
msgstr ""
-#: builtin/add.c:372
+#: ref-filter.c:749
#, c-format
-msgid "Use -f if you really want to add them.\n"
-msgstr ""
-
-#: builtin/add.c:380
-msgid "adding files failed"
+msgid "format: %%(then) atom used without an %%(if) atom"
msgstr ""
-#: builtin/add.c:417
-msgid "-A and -u are mutually incompatible"
+#: ref-filter.c:751
+#, c-format
+msgid "format: %%(then) atom used more than once"
msgstr ""
-#: builtin/add.c:424
-msgid "Option --ignore-missing can only be used together with --dry-run"
+#: ref-filter.c:753
+#, c-format
+msgid "format: %%(then) atom used after %%(else)"
msgstr ""
-#: builtin/add.c:428
+#: ref-filter.c:781
#, c-format
-msgid "--chmod param '%s' must be either -x or +x"
+msgid "format: %%(else) atom used without an %%(if) atom"
msgstr ""
-#: builtin/add.c:443
+#: ref-filter.c:783
#, c-format
-msgid "Nothing specified, nothing added.\n"
+msgid "format: %%(else) atom used without a %%(then) atom"
msgstr ""
-#: builtin/add.c:444
+#: ref-filter.c:785
#, c-format
-msgid "Maybe you wanted to say 'git add .'?\n"
+msgid "format: %%(else) atom used more than once"
msgstr ""
-#: builtin/add.c:449 builtin/check-ignore.c:177 builtin/checkout.c:280
-#: builtin/checkout.c:483 builtin/clean.c:958 builtin/commit.c:316
-#: builtin/diff-tree.c:114 builtin/mv.c:144 builtin/reset.c:241
-#: builtin/rm.c:271 builtin/submodule--helper.c:326
-msgid "index file corrupt"
+#: ref-filter.c:800
+#, c-format
+msgid "format: %%(end) atom used without corresponding atom"
msgstr ""
-#: builtin/am.c:414
-msgid "could not parse author script"
+#: ref-filter.c:857
+#, c-format
+msgid "malformed format string %s"
msgstr ""
-#: builtin/am.c:498
+#: ref-filter.c:1453
#, c-format
-msgid "'%s' was deleted by the applypatch-msg hook"
+msgid "(no branch, rebasing %s)"
msgstr ""
-#: builtin/am.c:539
+#: ref-filter.c:1456
#, c-format
-msgid "Malformed input line: '%s'."
+msgid "(no branch, rebasing detached HEAD %s)"
msgstr ""
-#: builtin/am.c:576
+#: ref-filter.c:1459
#, c-format
-msgid "Failed to copy notes from '%s' to '%s'"
+msgid "(no branch, bisect started on %s)"
msgstr ""
-#: builtin/am.c:602
-msgid "fseek failed"
+#. TRANSLATORS: make sure this matches "HEAD
+#. detached at " in wt-status.c
+#.
+#: ref-filter.c:1467
+#, c-format
+msgid "(HEAD detached at %s)"
msgstr ""
-#: builtin/am.c:790
+#. TRANSLATORS: make sure this matches "HEAD
+#. detached from " in wt-status.c
+#.
+#: ref-filter.c:1474
#, c-format
-msgid "could not parse patch '%s'"
+msgid "(HEAD detached from %s)"
msgstr ""
-#: builtin/am.c:855
-msgid "Only one StGIT patch series can be applied at once"
+#: ref-filter.c:1478
+msgid "(no branch)"
msgstr ""
-#: builtin/am.c:903
-msgid "invalid timestamp"
+#: ref-filter.c:1512 ref-filter.c:1669
+#, c-format
+msgid "missing object %s for %s"
msgstr ""
-#: builtin/am.c:908 builtin/am.c:920
-msgid "invalid Date line"
+#: ref-filter.c:1522
+#, c-format
+msgid "parse_object_buffer failed on %s for %s"
msgstr ""
-#: builtin/am.c:915
-msgid "invalid timezone offset"
+#: ref-filter.c:1888
+#, c-format
+msgid "malformed object at '%s'"
msgstr ""
-#: builtin/am.c:1008
-msgid "Patch format detection failed."
-msgstr ""
-
-#: builtin/am.c:1013 builtin/clone.c:405
+#: ref-filter.c:1977
#, c-format
-msgid "failed to create directory '%s'"
-msgstr ""
-
-#: builtin/am.c:1018
-msgid "Failed to split patches."
-msgstr ""
-
-#: builtin/am.c:1148 builtin/commit.c:342
-msgid "unable to write index file"
+msgid "ignoring ref with broken name %s"
msgstr ""
-#: builtin/am.c:1162
+#: ref-filter.c:2263
#, c-format
-msgid "When you have resolved this problem, run \"%s --continue\"."
+msgid "format: %%(end) atom missing"
msgstr ""
-#: builtin/am.c:1163
+#: ref-filter.c:2363
#, c-format
-msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
+msgid "option `%s' is incompatible with --merged"
msgstr ""
-#: builtin/am.c:1164
+#: ref-filter.c:2366
#, c-format
-msgid "To restore the original branch and stop patching, run \"%s --abort\"."
+msgid "option `%s' is incompatible with --no-merged"
msgstr ""
-#: builtin/am.c:1271
-msgid "Patch is empty."
+#: ref-filter.c:2376
+#, c-format
+msgid "malformed object name %s"
msgstr ""
-#: builtin/am.c:1337
+#: ref-filter.c:2381
#, c-format
-msgid "invalid ident line: %.*s"
+msgid "option `%s' must point to a commit"
msgstr ""
-#: builtin/am.c:1359
+#: remote.c:363
#, c-format
-msgid "unable to parse commit %s"
+msgid "config remote shorthand cannot begin with '/': %s"
msgstr ""
-#: builtin/am.c:1554
-msgid "Repository lacks necessary blobs to fall back on 3-way merge."
+#: remote.c:410
+msgid "more than one receivepack given, using the first"
msgstr ""
-#: builtin/am.c:1556
-msgid "Using index info to reconstruct a base tree..."
+#: remote.c:418
+msgid "more than one uploadpack given, using the first"
msgstr ""
-#: builtin/am.c:1575
-msgid ""
-"Did you hand edit your patch?\n"
-"It does not apply to blobs recorded in its index."
+#: remote.c:608
+#, c-format
+msgid "Cannot fetch both %s and %s to %s"
msgstr ""
-#: builtin/am.c:1581
-msgid "Falling back to patching base and 3-way merge..."
+#: remote.c:612
+#, c-format
+msgid "%s usually tracks %s, not %s"
msgstr ""
-#: builtin/am.c:1606
-msgid "Failed to merge in the changes."
+#: remote.c:616
+#, c-format
+msgid "%s tracks both %s and %s"
msgstr ""
-#: builtin/am.c:1637
-msgid "applying to an empty history"
+#: remote.c:684
+#, c-format
+msgid "key '%s' of pattern had no '*'"
msgstr ""
-#: builtin/am.c:1683 builtin/am.c:1687
+#: remote.c:694
#, c-format
-msgid "cannot resume: %s does not exist."
+msgid "value '%s' of pattern has no '*'"
msgstr ""
-#: builtin/am.c:1703
-msgid "cannot be interactive without stdin connected to a terminal."
+#: remote.c:1000
+#, c-format
+msgid "src refspec %s does not match any"
msgstr ""
-#: builtin/am.c:1708
-msgid "Commit Body is:"
+#: remote.c:1005
+#, c-format
+msgid "src refspec %s matches more than one"
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.
+#. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push
+#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
+#. the <src>.
#.
-#: builtin/am.c:1718
-msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
+#: remote.c:1020
+#, c-format
+msgid ""
+"The destination you provided is not a full refname (i.e.,\n"
+"starting with \"refs/\"). We tried to guess what you meant by:\n"
+"\n"
+"- Looking for a ref that matches '%s' on the remote side.\n"
+"- Checking if the <src> being pushed ('%s')\n"
+" is a ref in \"refs/{heads,tags}/\". If so we add a corresponding\n"
+" refs/{heads,tags}/ prefix on the remote side.\n"
+"\n"
+"Neither worked, so we gave up. You must fully qualify the ref."
msgstr ""
-#: builtin/am.c:1768
+#: remote.c:1040
#, c-format
-msgid "Dirty index: cannot apply patches (dirty: %s)"
+msgid ""
+"The <src> part of the refspec is a commit object.\n"
+"Did you mean to create a new branch by pushing to\n"
+"'%s:refs/heads/%s'?"
msgstr ""
-#: builtin/am.c:1808 builtin/am.c:1879
+#: remote.c:1045
#, c-format
-msgid "Applying: %.*s"
+msgid ""
+"The <src> part of the refspec is a tag object.\n"
+"Did you mean to create a new tag by pushing to\n"
+"'%s:refs/tags/%s'?"
msgstr ""
-#: builtin/am.c:1824
-msgid "No changes -- Patch already applied."
+#: remote.c:1050
+#, c-format
+msgid ""
+"The <src> part of the refspec is a tree object.\n"
+"Did you mean to tag a new tree by pushing to\n"
+"'%s:refs/tags/%s'?"
msgstr ""
-#: builtin/am.c:1832
+#: remote.c:1055
#, c-format
-msgid "Patch failed at %s %.*s"
+msgid ""
+"The <src> part of the refspec is a blob object.\n"
+"Did you mean to tag a new blob by pushing to\n"
+"'%s:refs/tags/%s'?"
msgstr ""
-#: builtin/am.c:1838
-msgid "Use 'git am --show-current-patch' to see the failed patch"
+#: remote.c:1091
+#, c-format
+msgid "%s cannot be resolved to branch"
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."
+#: remote.c:1102
+#, c-format
+msgid "unable to delete '%s': remote ref does not exist"
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."
+#: remote.c:1114
+#, c-format
+msgid "dst refspec %s matches more than one"
msgstr ""
-#: builtin/am.c:1996 builtin/am.c:2000 builtin/am.c:2012 builtin/reset.c:324
-#: builtin/reset.c:332
+#: remote.c:1121
#, c-format
-msgid "Could not parse object '%s'."
+msgid "dst ref %s receives from more than one src"
msgstr ""
-#: builtin/am.c:2048
-msgid "failed to clean index"
+#: remote.c:1624 remote.c:1725
+msgid "HEAD does not point to a branch"
msgstr ""
-#: builtin/am.c:2083
-msgid ""
-"You seem to have moved HEAD since the last 'am' failure.\n"
-"Not rewinding to ORIG_HEAD"
+#: remote.c:1633
+#, c-format
+msgid "no such branch: '%s'"
msgstr ""
-#: builtin/am.c:2174
+#: remote.c:1636
#, c-format
-msgid "Invalid value for --patch-format: %s"
+msgid "no upstream configured for branch '%s'"
msgstr ""
-#: builtin/am.c:2210
-msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
+#: remote.c:1642
+#, c-format
+msgid "upstream branch '%s' not stored as a remote-tracking branch"
msgstr ""
-#: builtin/am.c:2211
-msgid "git am [<options>] (--continue | --skip | --abort)"
+#: remote.c:1657
+#, c-format
+msgid "push destination '%s' on remote '%s' has no local tracking branch"
msgstr ""
-#: builtin/am.c:2217
-msgid "run interactively"
+#: remote.c:1669
+#, c-format
+msgid "branch '%s' has no remote for pushing"
msgstr ""
-#: builtin/am.c:2219
-msgid "historical option -- no-op"
+#: remote.c:1679
+#, c-format
+msgid "push refspecs for '%s' do not include '%s'"
msgstr ""
-#: builtin/am.c:2221
-msgid "allow fall back on 3way merging if needed"
+#: remote.c:1692
+msgid "push has no destination (push.default is 'nothing')"
msgstr ""
-#: builtin/am.c:2222 builtin/init-db.c:484 builtin/prune-packed.c:57
-#: builtin/repack.c:182
-msgid "be quiet"
+#: remote.c:1714
+msgid "cannot resolve 'simple' push to a single destination"
msgstr ""
-#: builtin/am.c:2224
-msgid "add a Signed-off-by line to the commit message"
+#: remote.c:1840
+#, c-format
+msgid "couldn't find remote ref %s"
msgstr ""
-#: builtin/am.c:2227
-msgid "recode into utf8 (default)"
+#: remote.c:1853
+#, c-format
+msgid "* Ignoring funny ref '%s' locally"
msgstr ""
-#: builtin/am.c:2229
-msgid "pass -k flag to git-mailinfo"
+#: remote.c:2016
+#, c-format
+msgid "Your branch is based on '%s', but the upstream is gone.\n"
msgstr ""
-#: builtin/am.c:2231
-msgid "pass -b flag to git-mailinfo"
+#: remote.c:2020
+msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr ""
-#: builtin/am.c:2233
-msgid "pass -m flag to git-mailinfo"
+#: remote.c:2023
+#, c-format
+msgid "Your branch is up to date with '%s'.\n"
msgstr ""
-#: builtin/am.c:2235
-msgid "pass --keep-cr flag to git-mailsplit for mbox format"
+#: remote.c:2027
+#, c-format
+msgid "Your branch and '%s' refer to different commits.\n"
msgstr ""
-#: builtin/am.c:2238
-msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
+#: remote.c:2030
+#, c-format
+msgid " (use \"%s\" for details)\n"
msgstr ""
-#: builtin/am.c:2241
-msgid "strip everything before a scissors line"
-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/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"
+#: remote.c:2040
+msgid " (use \"git push\" to publish your local commits)\n"
msgstr ""
-#: builtin/am.c:2260 builtin/fmt-merge-msg.c:665 builtin/fmt-merge-msg.c:668
-#: builtin/grep.c:853 builtin/merge.c:206 builtin/pull.c:145 builtin/pull.c:203
-#: builtin/repack.c:191 builtin/repack.c:195 builtin/repack.c:197
-#: builtin/show-branch.c:631 builtin/show-ref.c:169 builtin/tag.c:382
-#: parse-options.h:144 parse-options.h:146 parse-options.h:257
-msgid "n"
-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/am.c:2266 builtin/branch.c:629 builtin/for-each-ref.c:38
-#: builtin/replace.c:445 builtin/tag.c:418 builtin/verify-tag.c:39
-msgid "format"
+#: remote.c:2051
+msgid " (use \"git pull\" to update your local branch)\n"
msgstr ""
-#: builtin/am.c:2267
-msgid "format the patch(es) are in"
-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/am.c:2273
-msgid "override error message when patch failure occurs"
+#: remote.c:2064
+msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr ""
-#: builtin/am.c:2275
-msgid "continue applying patches after resolving a conflict"
+#: remote.c:2247
+#, c-format
+msgid "cannot parse expected object name '%s'"
msgstr ""
-#: builtin/am.c:2278
-msgid "synonyms for --continue"
+#: replace-object.c:21
+#, c-format
+msgid "bad replace ref name: %s"
msgstr ""
-#: builtin/am.c:2281
-msgid "skip the current patch"
+#: replace-object.c:30
+#, c-format
+msgid "duplicate replace ref: %s"
msgstr ""
-#: builtin/am.c:2284
-msgid "restore the original branch and abort the patching operation."
+#: replace-object.c:73
+#, c-format
+msgid "replace depth too high for object %s"
msgstr ""
-#: builtin/am.c:2287
-msgid "abort the patching operation but keep HEAD where it is."
+#: rerere.c:217 rerere.c:226 rerere.c:229
+msgid "corrupt MERGE_RR"
msgstr ""
-#: builtin/am.c:2290
-msgid "show the patch being applied."
+#: rerere.c:264 rerere.c:269
+msgid "unable to write rerere record"
msgstr ""
-#: builtin/am.c:2294
-msgid "lie about committer date"
+#: rerere.c:495
+#, c-format
+msgid "there were errors while writing '%s' (%s)"
msgstr ""
-#: builtin/am.c:2296
-msgid "use current timestamp for author date"
+#: rerere.c:498
+#, c-format
+msgid "failed to flush '%s'"
msgstr ""
-#: builtin/am.c:2298 builtin/commit.c:1431 builtin/merge.c:237
-#: builtin/pull.c:178 builtin/revert.c:112 builtin/tag.c:398
-msgid "key-id"
+#: rerere.c:503 rerere.c:1039
+#, c-format
+msgid "could not parse conflict hunks in '%s'"
msgstr ""
-#: builtin/am.c:2299
-msgid "GPG-sign commits"
+#: rerere.c:684
+#, c-format
+msgid "failed utime() on '%s'"
msgstr ""
-#: builtin/am.c:2302
-msgid "(internal use for git-rebase)"
+#: rerere.c:694
+#, c-format
+msgid "writing '%s' failed"
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."
+#: rerere.c:714
+#, c-format
+msgid "Staged '%s' using previous resolution."
msgstr ""
-#: builtin/am.c:2327
-msgid "failed to read the index"
+#: rerere.c:753
+#, c-format
+msgid "Recorded resolution for '%s'."
msgstr ""
-#: builtin/am.c:2342
+#: rerere.c:788
#, c-format
-msgid "previous rebase directory %s still exists but mbox given."
+msgid "Resolved '%s' using previous resolution."
msgstr ""
-#: builtin/am.c:2366
+#: rerere.c:803
#, c-format
-msgid ""
-"Stray %s directory found.\n"
-"Use \"git am --abort\" to remove it."
+msgid "cannot unlink stray '%s'"
msgstr ""
-#: builtin/am.c:2372
-msgid "Resolve operation not in progress, we are not resuming."
+#: rerere.c:807
+#, c-format
+msgid "Recorded preimage for '%s'"
msgstr ""
-#: builtin/apply.c:8
-msgid "git apply [<options>] [<patch>...]"
+#: rerere.c:881 submodule.c:2024 builtin/log.c:1750
+#: builtin/submodule--helper.c:1417 builtin/submodule--helper.c:1427
+#, c-format
+msgid "could not create directory '%s'"
msgstr ""
-#: builtin/archive.c:17
+#: rerere.c:1057
#, c-format
-msgid "could not create archive file '%s'"
+msgid "failed to update conflicted state in '%s'"
msgstr ""
-#: builtin/archive.c:20
-msgid "could not redirect output"
+#: rerere.c:1068 rerere.c:1075
+#, c-format
+msgid "no remembered resolution for '%s'"
msgstr ""
-#: builtin/archive.c:37
-msgid "git archive: Remote with no URL"
+#: rerere.c:1077
+#, c-format
+msgid "cannot unlink '%s'"
msgstr ""
-#: builtin/archive.c:58
-msgid "git archive: expected ACK/NAK, got a flush packet"
+#: rerere.c:1087
+#, c-format
+msgid "Updated preimage for '%s'"
msgstr ""
-#: builtin/archive.c:61
+#: rerere.c:1096
#, c-format
-msgid "git archive: NACK %s"
+msgid "Forgot resolution for '%s'\n"
msgstr ""
-#: builtin/archive.c:64
-msgid "git archive: protocol error"
+#: rerere.c:1199
+msgid "unable to open rr-cache directory"
msgstr ""
-#: builtin/archive.c:68
-msgid "git archive: expected a flush"
+#: revision.c:2476
+msgid "your current branch appears to be broken"
msgstr ""
-#: builtin/bisect--helper.c:12
-msgid "git bisect--helper --next-all [--no-checkout]"
+#: revision.c:2479
+#, c-format
+msgid "your current branch '%s' does not have any commits yet"
msgstr ""
-#: builtin/bisect--helper.c:13
-msgid "git bisect--helper --write-terms <bad_term> <good_term>"
+#: revision.c:2679
+msgid "--first-parent is incompatible with --bisect"
msgstr ""
-#: builtin/bisect--helper.c:14
-msgid "git bisect--helper --bisect-clean-state"
+#: revision.c:2683
+msgid "-L does not yet support diff formats besides -p and -s"
msgstr ""
-#: builtin/bisect--helper.c:46
-#, c-format
-msgid "'%s' is not a valid term"
+#: run-command.c:763
+msgid "open /dev/null failed"
msgstr ""
-#: builtin/bisect--helper.c:50
+#: run-command.c:1269
#, c-format
-msgid "can't use the builtin command '%s' as a term"
+msgid "cannot create async thread: %s"
msgstr ""
-#: builtin/bisect--helper.c:60
+#: run-command.c:1333
#, c-format
-msgid "can't change the meaning of the term '%s'"
+msgid ""
+"The '%s' hook was ignored because it's not set as executable.\n"
+"You can disable this warning with `git config advice.ignoredHook false`."
msgstr ""
-#: builtin/bisect--helper.c:71
-msgid "please use two different terms"
+#: send-pack.c:141
+msgid "unexpected flush packet while reading remote unpack status"
msgstr ""
-#: builtin/bisect--helper.c:78
-msgid "could not open the file BISECT_TERMS"
+#: send-pack.c:143
+#, c-format
+msgid "unable to parse remote unpack status: %s"
msgstr ""
-#: builtin/bisect--helper.c:120
-msgid "perform 'git bisect next'"
+#: send-pack.c:145
+#, c-format
+msgid "remote unpack failed: %s"
msgstr ""
-#: builtin/bisect--helper.c:122
-msgid "write the terms to .git/BISECT_TERMS"
+#: send-pack.c:306
+msgid "failed to sign the push certificate"
msgstr ""
-#: builtin/bisect--helper.c:124
-msgid "cleanup the bisection state"
+#: send-pack.c:420
+msgid "the receiving end does not support --signed push"
msgstr ""
-#: builtin/bisect--helper.c:126
-msgid "check for expected revs"
+#: send-pack.c:422
+msgid ""
+"not sending a push certificate since the receiving end does not support --"
+"signed push"
msgstr ""
-#: builtin/bisect--helper.c:128
-msgid "update BISECT_HEAD instead of checking out the current commit"
+#: send-pack.c:434
+msgid "the receiving end does not support --atomic push"
msgstr ""
-#: builtin/bisect--helper.c:143
-msgid "--write-terms requires two arguments"
+#: send-pack.c:439
+msgid "the receiving end does not support push options"
msgstr ""
-#: builtin/bisect--helper.c:147
-msgid "--bisect-clean-state requires no arguments"
+#: sequencer.c:187
+#, c-format
+msgid "invalid commit message cleanup mode '%s'"
msgstr ""
-#: builtin/blame.c:27
-msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
+#: sequencer.c:292
+#, c-format
+msgid "could not delete '%s'"
msgstr ""
-#: builtin/blame.c:32
-msgid "<rev-opts> are documented in git-rev-list(1)"
+#: sequencer.c:318
+msgid "revert"
msgstr ""
-#: builtin/blame.c:677
-msgid "Show blame entries as we find them, incrementally"
+#: sequencer.c:320
+msgid "cherry-pick"
msgstr ""
-#: builtin/blame.c:678
-msgid "Show blank SHA-1 for boundary commits (Default: off)"
+#: sequencer.c:322
+msgid "rebase -i"
msgstr ""
-#: builtin/blame.c:679
-msgid "Do not treat root commits as boundaries (Default: off)"
+#: sequencer.c:324
+#, c-format
+msgid "unknown action: %d"
msgstr ""
-#: builtin/blame.c:680
-msgid "Show work cost statistics"
+#: sequencer.c:382
+msgid ""
+"after resolving the conflicts, mark the corrected paths\n"
+"with 'git add <paths>' or 'git rm <paths>'"
msgstr ""
-#: builtin/blame.c:681
-msgid "Force progress reporting"
-msgstr ""
-
-#: builtin/blame.c:682
-msgid "Show output score for blame entries"
+#: 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/blame.c:683
-msgid "Show original filename (Default: auto)"
+#: sequencer.c:398 sequencer.c:2801
+#, c-format
+msgid "could not lock '%s'"
msgstr ""
-#: builtin/blame.c:684
-msgid "Show original linenumber (Default: off)"
+#: sequencer.c:405
+#, c-format
+msgid "could not write eol to '%s'"
msgstr ""
-#: builtin/blame.c:685
-msgid "Show in a format designed for machine consumption"
+#: sequencer.c:410 sequencer.c:2684 sequencer.c:2807 sequencer.c:2821
+#: sequencer.c:3084
+#, c-format
+msgid "failed to finalize '%s'"
msgstr ""
-#: builtin/blame.c:686
-msgid "Show porcelain format with per-line commit information"
+#: 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/blame.c:687
-msgid "Use the same output mode as git-annotate (Default: off)"
+#: sequencer.c:459
+#, c-format
+msgid "your local changes would be overwritten by %s."
msgstr ""
-#: builtin/blame.c:688
-msgid "Show raw timestamp (Default: off)"
+#: sequencer.c:463
+msgid "commit your changes or stash them to proceed."
msgstr ""
-#: builtin/blame.c:689
-msgid "Show long commit SHA1 (Default: off)"
+#: sequencer.c:495
+#, c-format
+msgid "%s: fast-forward"
msgstr ""
-#: builtin/blame.c:690
-msgid "Suppress author name and timestamp (Default: off)"
+#: sequencer.c:534 builtin/tag.c:555
+#, c-format
+msgid "Invalid cleanup mode %s"
msgstr ""
-#: builtin/blame.c:691
-msgid "Show author email instead of name (Default: off)"
+#. 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/blame.c:692
-msgid "Ignore whitespace differences"
+#: sequencer.c:646
+msgid "unable to update cache tree"
msgstr ""
-#: builtin/blame.c:699
-msgid "Use an experimental heuristic to improve diffs"
+#: sequencer.c:660
+msgid "could not resolve HEAD commit"
msgstr ""
-#: builtin/blame.c:701
-msgid "Spend extra cycles to find better match"
+#: sequencer.c:740
+#, c-format
+msgid "no key present in '%.*s'"
msgstr ""
-#: builtin/blame.c:702
-msgid "Use revisions from <file> instead of calling git-rev-list"
+#: sequencer.c:751
+#, c-format
+msgid "unable to dequote value of '%s'"
msgstr ""
-#: builtin/blame.c:703
-msgid "Use <file>'s contents as the final image"
+#: 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/blame.c:704 builtin/blame.c:705
-msgid "score"
+#: sequencer.c:798
+msgid "'GIT_AUTHOR_NAME' already given"
msgstr ""
-#: builtin/blame.c:704
-msgid "Find line copies within and across files"
+#: sequencer.c:803
+msgid "'GIT_AUTHOR_EMAIL' already given"
msgstr ""
-#: builtin/blame.c:705
-msgid "Find line movements within and across files"
+#: sequencer.c:808
+msgid "'GIT_AUTHOR_DATE' already given"
msgstr ""
-#: builtin/blame.c:706
-msgid "n,m"
+#: sequencer.c:812
+#, c-format
+msgid "unknown variable '%s'"
msgstr ""
-#: builtin/blame.c:706
-msgid "Process only line range n,m, counting from 1"
+#: sequencer.c:817
+msgid "missing 'GIT_AUTHOR_NAME'"
msgstr ""
-#: builtin/blame.c:753
-msgid "--progress can't be used with --incremental or porcelain formats"
+#: sequencer.c:819
+msgid "missing 'GIT_AUTHOR_EMAIL'"
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:804
-msgid "4 years, 11 months ago"
+#: sequencer.c:821
+msgid "missing 'GIT_AUTHOR_DATE'"
msgstr ""
-#: builtin/blame.c:890
+#: sequencer.c:881
#, c-format
-msgid "file %s has only %lu line"
-msgid_plural "file %s has only %lu lines"
-msgstr[0] ""
-msgstr[1] ""
+msgid "invalid date format '%s' in '%s'"
+msgstr ""
-#: builtin/blame.c:936
-msgid "Blaming lines"
+#: 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/branch.c:27
-msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
+#: sequencer.c:992
+msgid "writing root commit"
msgstr ""
-#: builtin/branch.c:28
-msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
+#: sequencer.c:1213
+msgid "'prepare-commit-msg' hook failed"
msgstr ""
-#: builtin/branch.c:29
-msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
+#: 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/branch.c:30
-msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
+#: 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/branch.c:31
-msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
+#: sequencer.c:1275
+msgid "couldn't look up newly created commit"
msgstr ""
-#: builtin/branch.c:32
-msgid "git branch [<options>] [-r | -a] [--points-at]"
+#: sequencer.c:1277
+msgid "could not parse newly created commit"
msgstr ""
-#: builtin/branch.c:33
-msgid "git branch [<options>] [-r | -a] [--format]"
+#: sequencer.c:1323
+msgid "unable to resolve HEAD after creating commit"
msgstr ""
-#: builtin/branch.c:146
-#, c-format
-msgid ""
-"deleting branch '%s' that has been merged to\n"
-" '%s', but not yet merged to HEAD."
+#: sequencer.c:1325
+msgid "detached HEAD"
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:1329
+msgid " (root-commit)"
msgstr ""
-#: builtin/branch.c:164
-#, c-format
-msgid "Couldn't look up commit object for '%s'"
+#: sequencer.c:1350
+msgid "could not parse HEAD"
msgstr ""
-#: builtin/branch.c:168
+#: sequencer.c:1352
#, 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 "HEAD %s is not a commit!"
msgstr ""
-#: builtin/branch.c:181
-msgid "Update of config-file failed"
+#: sequencer.c:1356 builtin/commit.c:1551
+msgid "could not parse HEAD commit"
msgstr ""
-#: builtin/branch.c:212
-msgid "cannot use -a with -d"
+#: sequencer.c:1408 sequencer.c:2001
+msgid "unable to parse commit author"
msgstr ""
-#: builtin/branch.c:218
-msgid "Couldn't look up commit object for HEAD"
+#: sequencer.c:1418 builtin/am.c:1572 builtin/merge.c:688
+msgid "git write-tree failed to write a tree"
msgstr ""
-#: builtin/branch.c:232
+#: sequencer.c:1435 sequencer.c:1496
#, c-format
-msgid "Cannot delete branch '%s' checked out at '%s'"
+msgid "unable to read commit message from '%s'"
msgstr ""
-#: builtin/branch.c:247
-#, c-format
-msgid "remote-tracking branch '%s' not found."
+#: 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/branch.c:248
+#: sequencer.c:1523
#, c-format
-msgid "branch '%s' not found."
+msgid "could not parse commit %s"
msgstr ""
-#: builtin/branch.c:263
+#: sequencer.c:1528
#, c-format
-msgid "Error deleting remote-tracking branch '%s'"
+msgid "could not parse parent commit %s"
msgstr ""
-#: builtin/branch.c:264
+#: sequencer.c:1602 sequencer.c:1712
#, c-format
-msgid "Error deleting branch '%s'"
+msgid "unknown command: %d"
msgstr ""
-#: builtin/branch.c:271
+#: sequencer.c:1659 sequencer.c:1684
#, c-format
-msgid "Deleted remote-tracking branch %s (was %s).\n"
+msgid "This is a combination of %d commits."
msgstr ""
-#: builtin/branch.c:272
-#, c-format
-msgid "Deleted branch %s (was %s).\n"
+#: sequencer.c:1669
+msgid "need a HEAD to fixup"
msgstr ""
-#: builtin/branch.c:417 builtin/tag.c:58
-msgid "unable to parse format string"
+#: sequencer.c:1671 sequencer.c:3111
+msgid "could not read HEAD"
msgstr ""
-#: builtin/branch.c:450
-#, c-format
-msgid "Branch %s is being rebased at %s"
+#: sequencer.c:1673
+msgid "could not read HEAD's commit message"
msgstr ""
-#: builtin/branch.c:454
+#: sequencer.c:1679
#, c-format
-msgid "Branch %s is being bisected at %s"
+msgid "cannot write '%s'"
msgstr ""
-#: builtin/branch.c:471
-msgid "cannot copy the current branch while not on any."
+#: sequencer.c:1686 git-rebase--preserve-merges.sh:441
+msgid "This is the 1st commit message:"
msgstr ""
-#: builtin/branch.c:473
-msgid "cannot rename the current branch while not on any."
+#: sequencer.c:1694
+#, c-format
+msgid "could not read commit message of %s"
msgstr ""
-#: builtin/branch.c:484
+#: sequencer.c:1701
#, c-format
-msgid "Invalid branch name: '%s'"
+msgid "This is the commit message #%d:"
msgstr ""
-#: builtin/branch.c:511
-msgid "Branch rename failed"
+#: sequencer.c:1707
+#, c-format
+msgid "The commit message #%d will be skipped:"
msgstr ""
-#: builtin/branch.c:513
-msgid "Branch copy failed"
+#: sequencer.c:1795
+msgid "your index file is unmerged."
msgstr ""
-#: builtin/branch.c:517
+#: sequencer.c:1802
+msgid "cannot fixup root commit"
+msgstr ""
+
+#: sequencer.c:1821
#, c-format
-msgid "Created a copy of a misnamed branch '%s'"
+msgid "commit %s is a merge but no -m option was given."
msgstr ""
-#: builtin/branch.c:520
+#: sequencer.c:1829 sequencer.c:1837
#, c-format
-msgid "Renamed a misnamed branch '%s' away"
+msgid "commit %s does not have parent %d"
msgstr ""
-#: builtin/branch.c:526
+#: sequencer.c:1843
#, c-format
-msgid "Branch renamed to %s, but HEAD is not updated!"
+msgid "cannot get commit message for %s"
msgstr ""
-#: builtin/branch.c:535
-msgid "Branch is renamed, but update of config-file failed"
+#. 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/branch.c:537
-msgid "Branch is copied, but update of config-file failed"
+#: sequencer.c:1927
+#, c-format
+msgid "could not rename '%s' to '%s'"
msgstr ""
-#: builtin/branch.c:553
+#: sequencer.c:1982
#, c-format
-msgid ""
-"Please edit the description for the branch\n"
-" %s\n"
-"Lines starting with '%c' will be stripped.\n"
+msgid "could not revert %s... %s"
msgstr ""
-#: builtin/branch.c:586
-msgid "Generic options"
+#: sequencer.c:1983
+#, c-format
+msgid "could not apply %s... %s"
msgstr ""
-#: builtin/branch.c:588
-msgid "show hash and subject, give twice for upstream branch"
+#: sequencer.c:2042
+#, c-format
+msgid "git %s: failed to read the index"
msgstr ""
-#: builtin/branch.c:589
-msgid "suppress informational messages"
+#: sequencer.c:2049
+#, c-format
+msgid "git %s: failed to refresh the index"
msgstr ""
-#: builtin/branch.c:590
-msgid "set up tracking mode (see git-pull(1))"
+#: sequencer.c:2118
+#, c-format
+msgid "%s does not accept arguments: '%s'"
msgstr ""
-#: builtin/branch.c:592
-msgid "do not use"
+#: sequencer.c:2127
+#, c-format
+msgid "missing arguments for %s"
msgstr ""
-#: builtin/branch.c:594
-msgid "upstream"
+#: sequencer.c:2164
+#, c-format
+msgid "could not parse '%.*s'"
msgstr ""
-#: builtin/branch.c:594
-msgid "change the upstream info"
+#: sequencer.c:2226
+#, c-format
+msgid "invalid line %d: %.*s"
msgstr ""
-#: builtin/branch.c:595
-msgid "Unset the upstream info"
+#: sequencer.c:2237
+#, c-format
+msgid "cannot '%s' without a previous commit"
msgstr ""
-#: builtin/branch.c:596
-msgid "use colored output"
+#: sequencer.c:2285 builtin/rebase.c:153 builtin/rebase.c:178
+#: builtin/rebase.c:204 builtin/rebase.c:229
+#, c-format
+msgid "could not read '%s'."
msgstr ""
-#: builtin/branch.c:597
-msgid "act on remote-tracking branches"
+#: sequencer.c:2360
+msgid "please fix this using 'git rebase --edit-todo'."
msgstr ""
-#: builtin/branch.c:599 builtin/branch.c:601
-msgid "print only branches that contain the commit"
+#: sequencer.c:2362
+#, c-format
+msgid "unusable instruction sheet: '%s'"
msgstr ""
-#: builtin/branch.c:600 builtin/branch.c:602
-msgid "print only branches that don't contain the commit"
+#: sequencer.c:2367
+msgid "no commits parsed."
msgstr ""
-#: builtin/branch.c:605
-msgid "Specific git-branch actions:"
+#: sequencer.c:2378
+msgid "cannot cherry-pick during a revert."
msgstr ""
-#: builtin/branch.c:606
-msgid "list both remote-tracking and local branches"
+#: sequencer.c:2380
+msgid "cannot revert during a cherry-pick."
msgstr ""
-#: builtin/branch.c:608
-msgid "delete fully merged branch"
+#: sequencer.c:2462
+#, c-format
+msgid "invalid value for %s: %s"
msgstr ""
-#: builtin/branch.c:609
-msgid "delete branch (even if not merged)"
+#: sequencer.c:2549
+msgid "unusable squash-onto"
msgstr ""
-#: builtin/branch.c:610
-msgid "move/rename a branch and its reflog"
+#: sequencer.c:2565
+#, c-format
+msgid "malformed options sheet: '%s'"
msgstr ""
-#: builtin/branch.c:611
-msgid "move/rename a branch, even if target exists"
+#: sequencer.c:2648 sequencer.c:4227
+msgid "empty commit set passed"
msgstr ""
-#: builtin/branch.c:612
-msgid "copy a branch and its reflog"
+#: sequencer.c:2656
+msgid "a cherry-pick or revert is already in progress"
msgstr ""
-#: builtin/branch.c:613
-msgid "copy a branch, even if target exists"
+#: sequencer.c:2657
+msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
msgstr ""
-#: builtin/branch.c:614
-msgid "list branch names"
+#: sequencer.c:2660
+#, c-format
+msgid "could not create sequencer directory '%s'"
msgstr ""
-#: builtin/branch.c:615
-msgid "create the branch's reflog"
+#: sequencer.c:2674
+msgid "could not lock HEAD"
msgstr ""
-#: builtin/branch.c:617
-msgid "edit the description for the branch"
+#: sequencer.c:2729 sequencer.c:3979
+msgid "no cherry-pick or revert in progress"
msgstr ""
-#: builtin/branch.c:618
-msgid "force creation, move/rename, deletion"
+#: sequencer.c:2731
+msgid "cannot resolve HEAD"
msgstr ""
-#: builtin/branch.c:619
-msgid "print only branches that are merged"
+#: sequencer.c:2733 sequencer.c:2768
+msgid "cannot abort from a branch yet to be born"
msgstr ""
-#: builtin/branch.c:620
-msgid "print only branches that are not merged"
+#: sequencer.c:2754 builtin/grep.c:732
+#, c-format
+msgid "cannot open '%s'"
msgstr ""
-#: builtin/branch.c:621
-msgid "list branches in columns"
+#: sequencer.c:2756
+#, c-format
+msgid "cannot read '%s': %s"
msgstr ""
-#: builtin/branch.c:622 builtin/for-each-ref.c:40 builtin/tag.c:411
-msgid "key"
+#: sequencer.c:2757
+msgid "unexpected end of file"
msgstr ""
-#: builtin/branch.c:623 builtin/for-each-ref.c:41 builtin/tag.c:412
-msgid "field name to sort on"
+#: sequencer.c:2763
+#, c-format
+msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr ""
-#: builtin/branch.c:625 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:414
-msgid "object"
+#: sequencer.c:2774
+msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr ""
-#: builtin/branch.c:626
-msgid "print only branches of the object"
+#: sequencer.c:2903 sequencer.c:3894
+#, c-format
+msgid "could not update %s"
msgstr ""
-#: builtin/branch.c:628 builtin/for-each-ref.c:49 builtin/tag.c:421
-msgid "sorting and filtering are case insensitive"
+#: sequencer.c:2941 sequencer.c:3874
+msgid "cannot read HEAD"
msgstr ""
-#: builtin/branch.c:629 builtin/for-each-ref.c:38 builtin/tag.c:419
-#: builtin/verify-tag.c:39
-msgid "format to use for the output"
+#: sequencer.c:2958
+#, c-format
+msgid "unable to copy '%s' to '%s'"
msgstr ""
-#: builtin/branch.c:652 builtin/clone.c:735
-msgid "HEAD not found below refs/heads!"
+#: 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/branch.c:675
-msgid "--column and --verbose are incompatible"
+#: sequencer.c:2976
+#, c-format
+msgid "Could not apply %s... %.*s"
msgstr ""
-#: builtin/branch.c:690 builtin/branch.c:742 builtin/branch.c:751
-msgid "branch name required"
+#: sequencer.c:2983
+#, c-format
+msgid "Could not merge %.*s"
msgstr ""
-#: builtin/branch.c:718
-msgid "Cannot give description to detached HEAD"
+#: sequencer.c:2997 sequencer.c:3001 builtin/difftool.c:633
+#, c-format
+msgid "could not copy '%s' to '%s'"
msgstr ""
-#: builtin/branch.c:723
-msgid "cannot edit description of more than one branch"
+#: 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/branch.c:730
+#: sequencer.c:3028
#, c-format
-msgid "No commit on branch '%s' yet."
+msgid ""
+"execution failed: %s\n"
+"%sYou can fix the problem, and then run\n"
+"\n"
+" git rebase --continue\n"
+"\n"
+msgstr ""
+
+#: sequencer.c:3034
+msgid "and made changes to the index and/or the working tree\n"
msgstr ""
-#: builtin/branch.c:733
+#: sequencer.c:3040
#, c-format
-msgid "No branch named '%s'."
+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/branch.c:748
-msgid "too many branches for a copy operation"
+#: sequencer.c:3101
+#, c-format
+msgid "illegal label name: '%.*s'"
msgstr ""
-#: builtin/branch.c:757
-msgid "too many arguments for a rename operation"
+#: sequencer.c:3155
+msgid "writing fake root commit"
msgstr ""
-#: builtin/branch.c:762
-msgid "too many arguments to set new upstream"
+#: sequencer.c:3160
+msgid "writing squash-onto"
msgstr ""
-#: builtin/branch.c:766
+#: sequencer.c:3198 builtin/rebase.c:844 builtin/rebase.c:850
#, c-format
-msgid ""
-"could not set upstream of HEAD to %s when it does not point to any branch."
+msgid "failed to find tree of %s"
msgstr ""
-#: builtin/branch.c:769 builtin/branch.c:791 builtin/branch.c:807
-#, c-format
-msgid "no such branch '%s'"
+#: sequencer.c:3216 builtin/rebase.c:863
+msgid "could not write index"
msgstr ""
-#: builtin/branch.c:773
+#: sequencer.c:3243
#, c-format
-msgid "branch '%s' does not exist"
+msgid "could not resolve '%s'"
msgstr ""
-#: builtin/branch.c:785
-msgid "too many arguments to unset upstream"
+#: sequencer.c:3271
+msgid "cannot merge without a current revision"
msgstr ""
-#: builtin/branch.c:789
-msgid "could not unset upstream of HEAD when it does not point to any branch."
+#: sequencer.c:3293
+#, c-format
+msgid "unable to parse '%.*s'"
msgstr ""
-#: builtin/branch.c:795
+#: sequencer.c:3302
#, c-format
-msgid "Branch '%s' has no upstream information"
+msgid "nothing to merge: '%.*s'"
msgstr ""
-#: builtin/branch.c:810
-msgid "-a and -r options to 'git branch' do not make sense with a branch name"
+#: sequencer.c:3314
+msgid "octopus merge cannot be executed on top of a [new root]"
msgstr ""
-#: builtin/branch.c:813
-msgid ""
-"the '--set-upstream' option is no longer supported. Please use '--track' or "
-"'--set-upstream-to' instead."
+#: sequencer.c:3329
+#, c-format
+msgid "could not get commit message of '%s'"
msgstr ""
-#: builtin/bundle.c:45
+#: sequencer.c:3478
#, c-format
-msgid "%s is okay\n"
+msgid "could not even attempt to merge '%.*s'"
msgstr ""
-#: builtin/bundle.c:58
-msgid "Need a repository to create a bundle."
+#: sequencer.c:3494
+msgid "merge: Unable to write new index file"
msgstr ""
-#: builtin/bundle.c:62
-msgid "Need a repository to unbundle."
+#: sequencer.c:3562 builtin/rebase.c:711
+#, c-format
+msgid "Applied autostash.\n"
msgstr ""
-#: builtin/cat-file.c:523
-msgid ""
-"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
-"p | <type> | --textconv | --filters) [--path=<path>] <object>"
+#: sequencer.c:3574
+#, c-format
+msgid "cannot store %s"
msgstr ""
-#: builtin/cat-file.c:524
+#: sequencer.c:3577 builtin/rebase.c:727
+#, c-format
msgid ""
-"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
-"filters]"
+"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/cat-file.c:561
-msgid "<type> can be one of: blob, tree, commit, tag"
+#: sequencer.c:3638
+#, c-format
+msgid "could not checkout %s"
msgstr ""
-#: builtin/cat-file.c:562
-msgid "show object type"
+#: sequencer.c:3652
+#, c-format
+msgid "%s: not a valid OID"
msgstr ""
-#: builtin/cat-file.c:563
-msgid "show object size"
+#: sequencer.c:3657 git-rebase--preserve-merges.sh:724
+msgid "could not detach HEAD"
msgstr ""
-#: builtin/cat-file.c:565
-msgid "exit with zero when there's no error"
+#: sequencer.c:3672
+#, c-format
+msgid "Stopped at HEAD\n"
msgstr ""
-#: builtin/cat-file.c:566
-msgid "pretty-print object's content"
+#: sequencer.c:3674
+#, c-format
+msgid "Stopped at %s\n"
msgstr ""
-#: builtin/cat-file.c:568
-msgid "for blob objects, run textconv on object's content"
+#: sequencer.c:3682
+#, c-format
+msgid ""
+"Could not execute the todo command\n"
+"\n"
+" %.*s\n"
+"It has been rescheduled; To edit the command before continuing, please\n"
+"edit the todo list first:\n"
+"\n"
+" git rebase --edit-todo\n"
+" git rebase --continue\n"
msgstr ""
-#: builtin/cat-file.c:570
-msgid "for blob objects, run filters on object's content"
+#: sequencer.c:3759
+#, c-format
+msgid "Stopped at %s... %.*s\n"
msgstr ""
-#: builtin/cat-file.c:571 git-submodule.sh:878
-msgid "blob"
+#: sequencer.c:3837
+#, c-format
+msgid "unknown command %d"
msgstr ""
-#: builtin/cat-file.c:572
-msgid "use a specific path for --textconv/--filters"
+#: sequencer.c:3882
+msgid "could not read orig-head"
msgstr ""
-#: builtin/cat-file.c:574
-msgid "allow -s and -t to work with broken/corrupt objects"
+#: sequencer.c:3887
+msgid "could not read 'onto'"
msgstr ""
-#: builtin/cat-file.c:575
-msgid "buffer --batch output"
+#: sequencer.c:3901
+#, c-format
+msgid "could not update HEAD to %s"
msgstr ""
-#: builtin/cat-file.c:577
-msgid "show info and content of objects fed from the standard input"
+#: sequencer.c:3991
+msgid "cannot rebase: You have unstaged changes."
msgstr ""
-#: builtin/cat-file.c:580
-msgid "show info about objects fed from the standard input"
+#: sequencer.c:4000
+msgid "cannot amend non-existing commit"
msgstr ""
-#: builtin/cat-file.c:583
-msgid "follow in-tree symlinks (used with --batch or --batch-check)"
+#: sequencer.c:4002
+#, c-format
+msgid "invalid file: '%s'"
msgstr ""
-#: builtin/cat-file.c:585
-msgid "show all objects with --batch or --batch-check"
+#: sequencer.c:4004
+#, c-format
+msgid "invalid contents: '%s'"
msgstr ""
-#: builtin/check-attr.c:12
-msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
+#: 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/check-attr.c:13
-msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
+#: sequencer.c:4043 sequencer.c:4081
+#, c-format
+msgid "could not write file: '%s'"
msgstr ""
-#: builtin/check-attr.c:20
-msgid "report all attributes set on file"
+#: sequencer.c:4096
+msgid "could not remove CHERRY_PICK_HEAD"
msgstr ""
-#: builtin/check-attr.c:21
-msgid "use .gitattributes only from the index"
+#: sequencer.c:4103
+msgid "could not commit staged changes."
msgstr ""
-#: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:100
-msgid "read file names from stdin"
+#: sequencer.c:4204
+#, c-format
+msgid "%s: can't cherry-pick a %s"
msgstr ""
-#: builtin/check-attr.c:24 builtin/check-ignore.c:26
-msgid "terminate input and output records by a NUL character"
+#: sequencer.c:4208
+#, c-format
+msgid "%s: bad revision"
msgstr ""
-#: builtin/check-ignore.c:20 builtin/checkout.c:1106 builtin/gc.c:358
-msgid "suppress progress reporting"
+#: sequencer.c:4243
+msgid "can't revert as initial commit"
msgstr ""
-#: builtin/check-ignore.c:28
-msgid "show non-matching input paths"
+#: sequencer.c:4686
+msgid "make_script: unhandled options"
msgstr ""
-#: builtin/check-ignore.c:30
-msgid "ignore index when checking"
+#: sequencer.c:4689
+msgid "make_script: error preparing revisions"
msgstr ""
-#: builtin/check-ignore.c:159
-msgid "cannot specify pathnames with --stdin"
+#: 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/check-ignore.c:162
-msgid "-z only makes sense with --stdin"
+#: sequencer.c:4959 sequencer.c:4976
+msgid "nothing to do"
msgstr ""
-#: builtin/check-ignore.c:164
-msgid "no path specified"
+#: sequencer.c:4990
+msgid "could not skip unnecessary pick commands"
msgstr ""
-#: builtin/check-ignore.c:168
-msgid "--quiet is only valid with a single pathname"
+#: sequencer.c:5073
+msgid "the script was already rearranged."
msgstr ""
-#: builtin/check-ignore.c:170
-msgid "cannot have both --quiet and --verbose"
+#: setup.c:123
+#, c-format
+msgid "'%s' is outside repository"
msgstr ""
-#: builtin/check-ignore.c:173
-msgid "--non-matching is only valid with --verbose"
+#: 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/check-mailmap.c:9
-msgid "git check-mailmap [<options>] <contact>..."
+#: 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/check-mailmap.c:14
-msgid "also read contacts from stdin"
+#: setup.c:235
+#, c-format
+msgid "option '%s' must come before non-option arguments"
msgstr ""
-#: builtin/check-mailmap.c:25
+#: setup.c:254
#, c-format
-msgid "unable to parse contact: %s"
+msgid ""
+"ambiguous argument '%s': both revision and filename\n"
+"Use '--' to separate paths from revisions, like this:\n"
+"'git <command> [<revision>...] -- [<file>...]'"
msgstr ""
-#: builtin/check-mailmap.c:48
-msgid "no contacts specified"
+#: setup.c:390
+msgid "unable to set up work tree using invalid config"
msgstr ""
-#: builtin/checkout-index.c:128
-msgid "git checkout-index [<options>] [--] [<file>...]"
+#: setup.c:394
+msgid "this operation must be run in a work tree"
msgstr ""
-#: builtin/checkout-index.c:143
-msgid "stage should be between 1 and 3 or all"
+#: setup.c:540
+#, c-format
+msgid "Expected git repo version <= %d, found %d"
msgstr ""
-#: builtin/checkout-index.c:159
-msgid "check out all files in the index"
+#: setup.c:548
+msgid "unknown repository extensions found:"
msgstr ""
-#: builtin/checkout-index.c:160
-msgid "force overwrite of existing files"
+#: setup.c:567
+#, c-format
+msgid "error opening '%s'"
msgstr ""
-#: builtin/checkout-index.c:162
-msgid "no warning for existing files and files not in index"
+#: setup.c:569
+#, c-format
+msgid "too large to be a .git file: '%s'"
msgstr ""
-#: builtin/checkout-index.c:164
-msgid "don't checkout new files"
+#: setup.c:571
+#, c-format
+msgid "error reading %s"
msgstr ""
-#: builtin/checkout-index.c:166
-msgid "update stat information in the index file"
+#: setup.c:573
+#, c-format
+msgid "invalid gitfile format: %s"
msgstr ""
-#: builtin/checkout-index.c:170
-msgid "read list of paths from the standard input"
+#: setup.c:575
+#, c-format
+msgid "no path in gitfile: %s"
msgstr ""
-#: builtin/checkout-index.c:172
-msgid "write the content to temporary files"
+#: setup.c:577
+#, c-format
+msgid "not a git repository: %s"
msgstr ""
-#: builtin/checkout-index.c:173 builtin/column.c:31
-#: builtin/submodule--helper.c:1203 builtin/submodule--helper.c:1206
-#: builtin/submodule--helper.c:1212 builtin/submodule--helper.c:1574
-#: builtin/worktree.c:570
-msgid "string"
+#: setup.c:676
+#, c-format
+msgid "'$%s' too big"
msgstr ""
-#: builtin/checkout-index.c:174
-msgid "when creating files, prepend <string>"
+#: setup.c:690
+#, c-format
+msgid "not a git repository: '%s'"
msgstr ""
-#: builtin/checkout-index.c:176
-msgid "copy out the files from named stage"
+#: setup.c:719 setup.c:721 setup.c:752
+#, c-format
+msgid "cannot chdir to '%s'"
msgstr ""
-#: builtin/checkout.c:27
-msgid "git checkout [<options>] <branch>"
+#: setup.c:724 setup.c:780 setup.c:790 setup.c:829 setup.c:837
+msgid "cannot come back to cwd"
msgstr ""
-#: builtin/checkout.c:28
-msgid "git checkout [<options>] [<branch>] -- <file>..."
+#: setup.c:851
+#, c-format
+msgid "failed to stat '%*s%s%s'"
msgstr ""
-#: builtin/checkout.c:136 builtin/checkout.c:169
-#, c-format
-msgid "path '%s' does not have our version"
+#: setup.c:1083
+msgid "Unable to read current working directory"
msgstr ""
-#: builtin/checkout.c:138 builtin/checkout.c:171
+#: setup.c:1092 setup.c:1098
#, c-format
-msgid "path '%s' does not have their version"
+msgid "cannot change to '%s'"
msgstr ""
-#: builtin/checkout.c:154
+#: setup.c:1103
#, c-format
-msgid "path '%s' does not have all necessary versions"
+msgid "not a git repository (or any of the parent directories): %s"
msgstr ""
-#: builtin/checkout.c:198
+#: setup.c:1109
#, c-format
-msgid "path '%s' does not have necessary versions"
+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/checkout.c:215
+#: setup.c:1220
#, c-format
-msgid "path '%s': cannot merge"
+msgid ""
+"problem with core.sharedRepository filemode value (0%.3o).\n"
+"The owner of files must always have read and write permissions."
msgstr ""
-#: builtin/checkout.c:231
-#, c-format
-msgid "Unable to add merge result for '%s'"
+#: setup.c:1264
+msgid "open /dev/null or dup failed"
msgstr ""
-#: builtin/checkout.c:253 builtin/checkout.c:256 builtin/checkout.c:259
-#: builtin/checkout.c:262
-#, c-format
-msgid "'%s' cannot be used with updating paths"
+#: setup.c:1279
+msgid "fork failed"
msgstr ""
-#: builtin/checkout.c:265 builtin/checkout.c:268
-#, c-format
-msgid "'%s' cannot be used with %s"
+#: setup.c:1284
+msgid "setsid failed"
msgstr ""
-#: builtin/checkout.c:271
+#: sha1-file.c:453
#, c-format
-msgid "Cannot update paths and switch to branch '%s' at the same time."
+msgid "object directory %s does not exist; check .git/objects/info/alternates"
msgstr ""
-#: builtin/checkout.c:340 builtin/checkout.c:347
+#: sha1-file.c:504
#, c-format
-msgid "path '%s' is unmerged"
+msgid "unable to normalize alternate object path: %s"
msgstr ""
-#: builtin/checkout.c:505
-msgid "you need to resolve your current index first"
+#: sha1-file.c:576
+#, c-format
+msgid "%s: ignoring alternate object stores, nesting too deep"
msgstr ""
-#: builtin/checkout.c:636
+#: sha1-file.c:583
#, c-format
-msgid "Can not do reflog for '%s': %s\n"
+msgid "unable to normalize object directory: %s"
msgstr ""
-#: builtin/checkout.c:677
-msgid "HEAD is now at"
+#: sha1-file.c:626
+msgid "unable to fdopen alternates lockfile"
msgstr ""
-#: builtin/checkout.c:681 builtin/clone.c:689
-msgid "unable to update HEAD"
+#: sha1-file.c:644
+msgid "unable to read alternates file"
msgstr ""
-#: builtin/checkout.c:685
-#, c-format
-msgid "Reset branch '%s'\n"
+#: sha1-file.c:651
+msgid "unable to move new alternates file into place"
msgstr ""
-#: builtin/checkout.c:688
+#: sha1-file.c:686
#, c-format
-msgid "Already on '%s'\n"
+msgid "path '%s' does not exist"
msgstr ""
-#: builtin/checkout.c:692
+#: sha1-file.c:712
#, c-format
-msgid "Switched to and reset branch '%s'\n"
+msgid "reference repository '%s' as a linked checkout is not supported yet."
msgstr ""
-#: builtin/checkout.c:694 builtin/checkout.c:1039
+#: sha1-file.c:718
#, c-format
-msgid "Switched to a new branch '%s'\n"
+msgid "reference repository '%s' is not a local repository."
msgstr ""
-#: builtin/checkout.c:696
+#: sha1-file.c:724
#, c-format
-msgid "Switched to branch '%s'\n"
+msgid "reference repository '%s' is shallow"
msgstr ""
-#: builtin/checkout.c:747
+#: sha1-file.c:732
#, c-format
-msgid " ... and %d more.\n"
+msgid "reference repository '%s' is grafted"
msgstr ""
-#: builtin/checkout.c:753
-#, 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:772
+#: sha1-file.c:846
#, 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:804
-msgid "internal error in revision walk"
+msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
msgstr ""
-#: builtin/checkout.c:808
-msgid "Previous HEAD position was"
-msgstr ""
-
-#: builtin/checkout.c:836 builtin/checkout.c:1034
-msgid "You are on a branch yet to be born"
+#: sha1-file.c:871
+msgid "mmap failed"
msgstr ""
-#: builtin/checkout.c:940
+#: sha1-file.c:1035
#, c-format
-msgid "only one reference expected, %d given."
+msgid "object file %s is empty"
msgstr ""
-#: builtin/checkout.c:980 builtin/worktree.c:249
+#: sha1-file.c:1159 sha1-file.c:2297
#, c-format
-msgid "invalid reference: %s"
+msgid "corrupt loose object '%s'"
msgstr ""
-#: builtin/checkout.c:1009
+#: sha1-file.c:1161 sha1-file.c:2301
#, c-format
-msgid "reference is not a tree: %s"
+msgid "garbage at end of loose object '%s'"
msgstr ""
-#: builtin/checkout.c:1048
-msgid "paths cannot be used with switching branches"
+#: sha1-file.c:1203
+msgid "invalid object type"
msgstr ""
-#: builtin/checkout.c:1051 builtin/checkout.c:1055
+#: sha1-file.c:1287
#, c-format
-msgid "'%s' cannot be used with switching branches"
+msgid "unable to unpack %s header with --allow-unknown-type"
msgstr ""
-#: builtin/checkout.c:1059 builtin/checkout.c:1062 builtin/checkout.c:1067
-#: builtin/checkout.c:1070
+#: sha1-file.c:1290
#, c-format
-msgid "'%s' cannot be used with '%s'"
+msgid "unable to unpack %s header"
msgstr ""
-#: builtin/checkout.c:1075
+#: sha1-file.c:1296
#, c-format
-msgid "Cannot switch branch to a non-commit '%s'"
+msgid "unable to parse %s header with --allow-unknown-type"
msgstr ""
-#: builtin/checkout.c:1107 builtin/checkout.c:1109 builtin/clone.c:116
-#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:387
-#: builtin/worktree.c:389
-msgid "branch"
+#: sha1-file.c:1299
+#, c-format
+msgid "unable to parse %s header"
msgstr ""
-#: builtin/checkout.c:1108
-msgid "create and checkout a new branch"
+#: sha1-file.c:1490
+#, c-format
+msgid "failed to read object %s"
msgstr ""
-#: builtin/checkout.c:1110
-msgid "create/reset and checkout a branch"
+#: sha1-file.c:1494
+#, c-format
+msgid "replacement %s not found for %s"
msgstr ""
-#: builtin/checkout.c:1111
-msgid "create reflog for new branch"
+#: sha1-file.c:1498
+#, c-format
+msgid "loose object %s (stored in %s) is corrupt"
msgstr ""
-#: builtin/checkout.c:1112 builtin/worktree.c:391
-msgid "detach HEAD at named commit"
+#: sha1-file.c:1502
+#, c-format
+msgid "packed object %s (stored in %s) is corrupt"
msgstr ""
-#: builtin/checkout.c:1113
-msgid "set upstream info for new branch"
+#: sha1-file.c:1604
+#, c-format
+msgid "unable to write file %s"
msgstr ""
-#: builtin/checkout.c:1115
-msgid "new-branch"
+#: sha1-file.c:1611
+#, c-format
+msgid "unable to set permission to '%s'"
msgstr ""
-#: builtin/checkout.c:1115
-msgid "new unparented branch"
+#: sha1-file.c:1618
+msgid "file write error"
msgstr ""
-#: builtin/checkout.c:1116
-msgid "checkout our version for unmerged files"
+#: sha1-file.c:1637
+msgid "error when closing loose object file"
msgstr ""
-#: builtin/checkout.c:1118
-msgid "checkout their version for unmerged files"
+#: sha1-file.c:1702
+#, c-format
+msgid "insufficient permission for adding an object to repository database %s"
msgstr ""
-#: builtin/checkout.c:1120
-msgid "force checkout (throw away local modifications)"
+#: sha1-file.c:1704
+msgid "unable to create temporary file"
msgstr ""
-#: builtin/checkout.c:1122
-msgid "perform a 3-way merge with the new branch"
+#: sha1-file.c:1728
+msgid "unable to write loose object file"
msgstr ""
-#: builtin/checkout.c:1124 builtin/merge.c:239
-msgid "update ignored files (default)"
+#: sha1-file.c:1734
+#, c-format
+msgid "unable to deflate new object %s (%d)"
msgstr ""
-#: builtin/checkout.c:1126 builtin/log.c:1499 parse-options.h:263
-msgid "style"
+#: sha1-file.c:1738
+#, c-format
+msgid "deflateEnd on object %s failed (%d)"
msgstr ""
-#: builtin/checkout.c:1127
-msgid "conflict style (merge or diff3)"
+#: sha1-file.c:1742
+#, c-format
+msgid "confused by unstable object source data for %s"
msgstr ""
-#: builtin/checkout.c:1130
-msgid "do not limit pathspecs to sparse entries only"
+#: sha1-file.c:1752 builtin/pack-objects.c:920
+#, c-format
+msgid "failed utime() on %s"
msgstr ""
-#: builtin/checkout.c:1132
-msgid "second guess 'git checkout <no-such-branch>'"
+#: sha1-file.c:1827
+#, c-format
+msgid "cannot read object for %s"
msgstr ""
-#: builtin/checkout.c:1134
-msgid "do not check if another worktree is holding the given ref"
+#: sha1-file.c:1867
+msgid "corrupt commit"
msgstr ""
-#: builtin/checkout.c:1138 builtin/clone.c:83 builtin/fetch.c:150
-#: builtin/merge.c:236 builtin/pull.c:123 builtin/push.c:556
-#: builtin/send-pack.c:173
-msgid "force progress reporting"
+#: sha1-file.c:1875
+msgid "corrupt tag"
msgstr ""
-#: builtin/checkout.c:1168
-msgid "-b, -B and --orphan are mutually exclusive"
+#: sha1-file.c:1974
+#, c-format
+msgid "read error while indexing %s"
msgstr ""
-#: builtin/checkout.c:1185
-msgid "--track needs a branch name"
+#: sha1-file.c:1977
+#, c-format
+msgid "short read while indexing %s"
msgstr ""
-#: builtin/checkout.c:1190
-msgid "Missing branch name; try -b"
+#: sha1-file.c:2050 sha1-file.c:2059
+#, c-format
+msgid "%s: failed to insert into database"
msgstr ""
-#: builtin/checkout.c:1226
-msgid "invalid path specification"
+#: sha1-file.c:2065
+#, c-format
+msgid "%s: unsupported file type"
msgstr ""
-#: builtin/checkout.c:1233
+#: sha1-file.c:2089
#, c-format
-msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
+msgid "%s is not a valid object"
msgstr ""
-#: builtin/checkout.c:1237
+#: sha1-file.c:2091
#, c-format
-msgid "git checkout: --detach does not take a path argument '%s'"
+msgid "%s is not a valid '%s' object"
msgstr ""
-#: builtin/checkout.c:1241
-msgid ""
-"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
-"checking out of the index."
+#: sha1-file.c:2118 builtin/index-pack.c:154
+#, c-format
+msgid "unable to open %s"
msgstr ""
-#: builtin/clean.c:26
-msgid ""
-"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
+#: sha1-file.c:2308 sha1-file.c:2360
+#, c-format
+msgid "hash mismatch for %s (expected %s)"
msgstr ""
-#: builtin/clean.c:30
+#: sha1-file.c:2332
#, c-format
-msgid "Removing %s\n"
+msgid "unable to mmap %s"
msgstr ""
-#: builtin/clean.c:31
+#: sha1-file.c:2337
#, c-format
-msgid "Would remove %s\n"
+msgid "unable to unpack header of %s"
msgstr ""
-#: builtin/clean.c:32
+#: sha1-file.c:2343
#, c-format
-msgid "Skipping repository %s\n"
+msgid "unable to parse header of %s"
msgstr ""
-#: builtin/clean.c:33
+#: sha1-file.c:2354
#, c-format
-msgid "Would skip repository %s\n"
+msgid "unable to unpack contents of %s"
msgstr ""
-#: builtin/clean.c:34
+#: sha1-name.c:490
#, c-format
-msgid "failed to remove %s"
+msgid "short SHA1 %s is ambiguous"
msgstr ""
-#: builtin/clean.c:302 git-add--interactive.perl:572
-#, c-format
-msgid ""
-"Prompt help:\n"
-"1 - select a numbered item\n"
-"foo - select item based on unique prefix\n"
-" - (empty) select nothing\n"
+#: sha1-name.c:501
+msgid "The candidates are:"
msgstr ""
-#: builtin/clean.c:306 git-add--interactive.perl:581
-#, c-format
+#: sha1-name.c:800
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"
+"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/clean.c:522 git-add--interactive.perl:547
-#: git-add--interactive.perl:552
-#, c-format, perl-format
-msgid "Huh (%s)?\n"
+#: submodule.c:114 submodule.c:143
+msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
msgstr ""
-#: builtin/clean.c:664
+#: submodule.c:118 submodule.c:147
#, c-format
-msgid "Input ignore patterns>> "
+msgid "Could not find section in .gitmodules where path=%s"
msgstr ""
-#: builtin/clean.c:701
+#: submodule.c:154
#, c-format
-msgid "WARNING: Cannot find items matched by: %s"
+msgid "Could not remove .gitmodules entry for %s"
msgstr ""
-#: builtin/clean.c:722
-msgid "Select items to delete"
+#: submodule.c:165
+msgid "staging updated .gitmodules failed"
msgstr ""
-#. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:763
+#: submodule.c:327
#, c-format
-msgid "Remove %s [y/N]? "
+msgid "in unpopulated submodule '%s'"
msgstr ""
-#: builtin/clean.c:788 git-add--interactive.perl:1710
+#: submodule.c:358
#, c-format
-msgid "Bye.\n"
+msgid "Pathspec '%s' is in submodule '%.*s'"
msgstr ""
-#: builtin/clean.c:796
-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"
+#: submodule.c:910
+#, c-format
+msgid "submodule entry '%s' (%s) is a %s, not a commit"
msgstr ""
-#: builtin/clean.c:823 git-add--interactive.perl:1786
-msgid "*** Commands ***"
+#: submodule.c:1147 builtin/branch.c:672 builtin/submodule--helper.c:1988
+msgid "Failed to resolve HEAD as a valid ref."
msgstr ""
-#: builtin/clean.c:824 git-add--interactive.perl:1783
-msgid "What now"
+#: submodule.c:1481
+#, c-format
+msgid "Could not access submodule '%s'"
msgstr ""
-#: builtin/clean.c:832
-msgid "Would remove the following item:"
-msgid_plural "Would remove the following items:"
-msgstr[0] ""
-msgstr[1] ""
+#: submodule.c:1651
+#, c-format
+msgid "'%s' not recognized as a git repository"
+msgstr ""
-#: builtin/clean.c:848
-msgid "No more files to clean, exiting."
+#: submodule.c:1789
+#, c-format
+msgid "could not start 'git status' in submodule '%s'"
msgstr ""
-#: builtin/clean.c:910
-msgid "do not print names of files removed"
+#: submodule.c:1802
+#, c-format
+msgid "could not run 'git status' in submodule '%s'"
msgstr ""
-#: builtin/clean.c:912
-msgid "force"
+#: submodule.c:1817
+#, c-format
+msgid "Could not unset core.worktree setting in submodule '%s'"
msgstr ""
-#: builtin/clean.c:913
-msgid "interactive cleaning"
+#: submodule.c:1907
+#, c-format
+msgid "submodule '%s' has dirty index"
msgstr ""
-#: builtin/clean.c:915
-msgid "remove whole directories"
+#: submodule.c:1959
+#, c-format
+msgid "Submodule '%s' could not be updated."
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"
+#: submodule.c:2008
+#, c-format
+msgid ""
+"relocate_gitdir for submodule '%s' with more than one worktree not supported"
msgstr ""
-#: builtin/clean.c:917
-msgid "add <pattern> to ignore rules"
+#: submodule.c:2020 submodule.c:2076
+#, c-format
+msgid "could not lookup name for submodule '%s'"
msgstr ""
-#: builtin/clean.c:918
-msgid "remove ignored files, too"
+#: submodule.c:2027
+#, c-format
+msgid ""
+"Migrating git directory of '%s%s' from\n"
+"'%s' to\n"
+"'%s'\n"
msgstr ""
-#: builtin/clean.c:920
-msgid "remove only ignored files"
+#: submodule.c:2111
+#, c-format
+msgid "could not recurse into submodule '%s'"
msgstr ""
-#: builtin/clean.c:938
-msgid "-x and -X cannot be used together"
+#: submodule.c:2155
+msgid "could not start ls-files in .."
msgstr ""
-#: builtin/clean.c:942
-msgid ""
-"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
-"clean"
+#: submodule.c:2194
+#, c-format
+msgid "ls-tree returned unexpected return code %d"
msgstr ""
-#: builtin/clean.c:945
-msgid ""
-"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
-"refusing to clean"
+#: submodule-config.c:232
+#, c-format
+msgid "ignoring suspicious submodule name: %s"
msgstr ""
-#: builtin/clone.c:40
-msgid "git clone [<options>] [--] <repo> [<dir>]"
+#: submodule-config.c:299
+msgid "negative values not allowed for submodule.fetchjobs"
msgstr ""
-#: builtin/clone.c:85
-msgid "don't create a checkout"
+#: submodule-config.c:397
+#, c-format
+msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
msgstr ""
-#: builtin/clone.c:86 builtin/clone.c:88 builtin/init-db.c:479
-msgid "create a bare repository"
+#: submodule-config.c:486
+#, c-format
+msgid "invalid value for %s"
msgstr ""
-#: builtin/clone.c:90
-msgid "create a mirror repository (implies bare)"
+#: submodule-config.c:755
+#, c-format
+msgid "Could not update .gitmodules entry %s"
msgstr ""
-#: builtin/clone.c:92
-msgid "to clone from a local repository"
+#: trailer.c:238
+#, c-format
+msgid "running trailer command '%s' failed"
msgstr ""
-#: builtin/clone.c:94
-msgid "don't use local hardlinks, always copy"
+#: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553
+#: trailer.c:557
+#, c-format
+msgid "unknown value '%s' for key '%s'"
msgstr ""
-#: builtin/clone.c:96
-msgid "setup as shared repository"
+#: trailer.c:539 trailer.c:544 builtin/remote.c:295
+#, c-format
+msgid "more than one %s"
msgstr ""
-#: builtin/clone.c:98 builtin/clone.c:102
-msgid "pathspec"
+#: trailer.c:730
+#, c-format
+msgid "empty trailer token in trailer '%.*s'"
msgstr ""
-#: builtin/clone.c:98 builtin/clone.c:102
-msgid "initialize submodules in the clone"
+#: trailer.c:750
+#, c-format
+msgid "could not read input file '%s'"
msgstr ""
-#: builtin/clone.c:105
-msgid "number of submodules cloned in parallel"
+#: trailer.c:753
+msgid "could not read from stdin"
msgstr ""
-#: builtin/clone.c:106 builtin/init-db.c:476
-msgid "template-directory"
+#: trailer.c:1011 wrapper.c:701
+#, c-format
+msgid "could not stat %s"
msgstr ""
-#: builtin/clone.c:107 builtin/init-db.c:477
-msgid "directory from which templates will be used"
+#: trailer.c:1013
+#, c-format
+msgid "file %s is not a regular file"
msgstr ""
-#: builtin/clone.c:109 builtin/clone.c:111 builtin/submodule--helper.c:1210
-#: builtin/submodule--helper.c:1577
-msgid "reference repository"
+#: trailer.c:1015
+#, c-format
+msgid "file %s is not writable by user"
msgstr ""
-#: builtin/clone.c:113
-msgid "use --reference only while cloning"
+#: trailer.c:1027
+msgid "could not open temporary file"
msgstr ""
-#: builtin/clone.c:114 builtin/column.c:27 builtin/merge-file.c:44
-msgid "name"
+#: trailer.c:1067
+#, c-format
+msgid "could not rename temporary file to %s"
msgstr ""
-#: builtin/clone.c:115
-msgid "use <name> instead of 'origin' to track upstream"
+#: transport.c:116
+#, c-format
+msgid "Would set upstream of '%s' to '%s' of '%s'\n"
msgstr ""
-#: builtin/clone.c:117
-msgid "checkout <branch> instead of the remote's HEAD"
+#: transport.c:142
+#, c-format
+msgid "could not read bundle '%s'"
msgstr ""
-#: builtin/clone.c:119
-msgid "path to git-upload-pack on the remote"
+#: transport.c:208
+#, c-format
+msgid "transport: invalid depth option '%s'"
msgstr ""
-#: builtin/clone.c:120 builtin/fetch.c:151 builtin/grep.c:813
-#: builtin/pull.c:211
-msgid "depth"
+#: transport.c:259
+msgid "see protocol.version in 'git help config' for more details"
msgstr ""
-#: builtin/clone.c:121
-msgid "create a shallow clone of that depth"
+#: transport.c:260
+msgid "server options require protocol version 2 or later"
msgstr ""
-#: builtin/clone.c:122 builtin/fetch.c:153 builtin/pack-objects.c:3017
-#: parse-options.h:154
-msgid "time"
+#: transport.c:625
+msgid "could not parse transport.color.* config"
msgstr ""
-#: builtin/clone.c:123
-msgid "create a shallow clone since a specific time"
+#: transport.c:698
+msgid "support for protocol v2 not implemented yet"
msgstr ""
-#: builtin/clone.c:124 builtin/fetch.c:155
-msgid "revision"
+#: transport.c:825
+#, c-format
+msgid "unknown value for config '%s': %s"
msgstr ""
-#: builtin/clone.c:125 builtin/fetch.c:156
-msgid "deepen history of shallow clone, excluding rev"
+#: transport.c:891
+#, c-format
+msgid "transport '%s' not allowed"
msgstr ""
-#: builtin/clone.c:127
-msgid "clone only one branch, HEAD or --branch"
+#: transport.c:945
+msgid "git-over-rsync is no longer supported"
msgstr ""
-#: builtin/clone.c:129
-msgid "don't clone any tags, and make later fetches not to follow them"
+#: transport.c:1040
+#, c-format
+msgid ""
+"The following submodule paths contain changes that can\n"
+"not be found on any remote:\n"
msgstr ""
-#: builtin/clone.c:131
-msgid "any cloned submodules will be shallow"
+#: 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/clone.c:132 builtin/init-db.c:485
-msgid "gitdir"
+#: transport.c:1052
+msgid "Aborting."
msgstr ""
-#: builtin/clone.c:133 builtin/init-db.c:486
-msgid "separate git dir from working tree"
+#: transport.c:1193
+msgid "failed to push all needed submodules"
msgstr ""
-#: builtin/clone.c:134
-msgid "key=value"
+#: transport.c:1326 transport-helper.c:645
+msgid "operation not supported by protocol"
msgstr ""
-#: builtin/clone.c:135
-msgid "set config inside the new repository"
+#: transport.c:1430
+#, c-format
+msgid "invalid line while parsing alternate refs: %s"
msgstr ""
-#: builtin/clone.c:136 builtin/fetch.c:173 builtin/pull.c:224
-#: builtin/push.c:567
-msgid "use IPv4 addresses only"
+#: transport-helper.c:51 transport-helper.c:80
+msgid "full write to remote helper failed"
msgstr ""
-#: builtin/clone.c:138 builtin/fetch.c:175 builtin/pull.c:227
-#: builtin/push.c:569
-msgid "use IPv6 addresses only"
+#: transport-helper.c:134
+#, c-format
+msgid "unable to find remote helper for '%s'"
msgstr ""
-#: builtin/clone.c:276
-msgid ""
-"No directory name could be guessed.\n"
-"Please specify a directory on the command line"
+#: transport-helper.c:150 transport-helper.c:559
+msgid "can't dup helper output fd"
msgstr ""
-#: builtin/clone.c:329
+#: transport-helper.c:201
#, c-format
-msgid "info: Could not add alternate for '%s': %s\n"
+msgid ""
+"unknown mandatory capability %s; this remote helper probably needs newer "
+"version of Git"
msgstr ""
-#: builtin/clone.c:401
-#, c-format
-msgid "failed to open '%s'"
+#: transport-helper.c:207
+msgid "this remote helper should implement refspec capability"
msgstr ""
-#: builtin/clone.c:409
+#: transport-helper.c:274 transport-helper.c:414
#, c-format
-msgid "%s exists and is not a directory"
+msgid "%s unexpectedly said: '%s'"
msgstr ""
-#: builtin/clone.c:423
+#: transport-helper.c:403
#, c-format
-msgid "failed to stat %s\n"
+msgid "%s also locked %s"
msgstr ""
-#: builtin/clone.c:445
-#, c-format
-msgid "failed to create link '%s'"
+#: transport-helper.c:481
+msgid "couldn't run fast-import"
msgstr ""
-#: builtin/clone.c:449
-#, c-format
-msgid "failed to copy file to '%s'"
+#: transport-helper.c:504
+msgid "error while running fast-import"
msgstr ""
-#: builtin/clone.c:475
+#: transport-helper.c:533 transport-helper.c:1099
#, c-format
-msgid "done.\n"
+msgid "could not read ref %s"
msgstr ""
-#: builtin/clone.c:489
-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"
+#: transport-helper.c:578
+#, c-format
+msgid "unknown response to connect: %s"
msgstr ""
-#: builtin/clone.c:566
-#, c-format
-msgid "Could not find remote branch %s to clone."
+#: transport-helper.c:600
+msgid "setting remote service path not supported by protocol"
msgstr ""
-#: builtin/clone.c:661
-msgid "remote did not send all necessary objects"
+#: transport-helper.c:602
+msgid "invalid remote service path"
msgstr ""
-#: builtin/clone.c:677
+#: transport-helper.c:648
#, c-format
-msgid "unable to update %s"
+msgid "can't connect to subservice %s"
msgstr ""
-#: builtin/clone.c:726
-msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
+#: transport-helper.c:720
+#, c-format
+msgid "expected ok/error, helper said '%s'"
msgstr ""
-#: builtin/clone.c:756
-msgid "unable to checkout working tree"
+#: transport-helper.c:773
+#, c-format
+msgid "helper reported unexpected status of %s"
msgstr ""
-#: builtin/clone.c:801
-msgid "unable to write parameters to config file"
+#: transport-helper.c:834
+#, c-format
+msgid "helper %s does not support dry-run"
msgstr ""
-#: builtin/clone.c:864
-msgid "cannot repack to clean up"
+#: transport-helper.c:837
+#, c-format
+msgid "helper %s does not support --signed"
msgstr ""
-#: builtin/clone.c:866
-msgid "cannot unlink temporary alternates file"
+#: transport-helper.c:840
+#, c-format
+msgid "helper %s does not support --signed=if-asked"
msgstr ""
-#: builtin/clone.c:906 builtin/receive-pack.c:1946
-msgid "Too many arguments."
+#: transport-helper.c:847
+#, c-format
+msgid "helper %s does not support 'push-option'"
msgstr ""
-#: builtin/clone.c:910
-msgid "You must specify a repository to clone."
+#: transport-helper.c:939
+msgid "remote-helper doesn't support push; refspec needed"
msgstr ""
-#: builtin/clone.c:923
+#: transport-helper.c:944
#, c-format
-msgid "--bare and --origin %s options are incompatible."
+msgid "helper %s does not support 'force'"
msgstr ""
-#: builtin/clone.c:926
-msgid "--bare and --separate-git-dir are incompatible."
+#: transport-helper.c:991
+msgid "couldn't run fast-export"
msgstr ""
-#: builtin/clone.c:939
-#, c-format
-msgid "repository '%s' does not exist"
+#: transport-helper.c:996
+msgid "error while running fast-export"
msgstr ""
-#: builtin/clone.c:945 builtin/fetch.c:1455
+#: transport-helper.c:1021
#, c-format
-msgid "depth %s is not a positive number"
+msgid ""
+"No refs in common and none specified; doing nothing.\n"
+"Perhaps you should specify a branch such as 'master'.\n"
msgstr ""
-#: builtin/clone.c:955
+#: transport-helper.c:1085
#, c-format
-msgid "destination path '%s' already exists and is not an empty directory."
+msgid "malformed response in ref list: %s"
msgstr ""
-#: builtin/clone.c:965
+#: transport-helper.c:1238
#, c-format
-msgid "working tree '%s' already exists."
+msgid "read(%s) failed"
msgstr ""
-#: builtin/clone.c:980 builtin/clone.c:1001 builtin/difftool.c:270
-#: builtin/worktree.c:255 builtin/worktree.c:285
+#: transport-helper.c:1265
#, c-format
-msgid "could not create leading directories of '%s'"
+msgid "write(%s) failed"
msgstr ""
-#: builtin/clone.c:985
+#: transport-helper.c:1314
#, c-format
-msgid "could not create work tree dir '%s'"
+msgid "%s thread failed"
msgstr ""
-#: builtin/clone.c:1005
+#: transport-helper.c:1318
#, c-format
-msgid "Cloning into bare repository '%s'...\n"
+msgid "%s thread failed to join: %s"
msgstr ""
-#: builtin/clone.c:1007
+#: transport-helper.c:1337 transport-helper.c:1341
#, c-format
-msgid "Cloning into '%s'...\n"
+msgid "can't start thread for copying data: %s"
msgstr ""
-#: builtin/clone.c:1031
-msgid ""
-"clone --recursive is not compatible with both --reference and --reference-if-"
-"able"
+#: transport-helper.c:1378
+#, c-format
+msgid "%s process failed to wait"
msgstr ""
-#: builtin/clone.c:1093
-msgid "--depth is ignored in local clones; use file:// instead."
+#: transport-helper.c:1382
+#, c-format
+msgid "%s process failed"
msgstr ""
-#: builtin/clone.c:1095
-msgid "--shallow-since is ignored in local clones; use file:// instead."
+#: transport-helper.c:1400 transport-helper.c:1409
+msgid "can't start thread for copying data"
msgstr ""
-#: builtin/clone.c:1097
-msgid "--shallow-exclude is ignored in local clones; use file:// instead."
+#: tree-walk.c:33
+msgid "too-short tree object"
msgstr ""
-#: builtin/clone.c:1099
-msgid "--filter is ignored in local clones; use file:// instead."
+#: tree-walk.c:39
+msgid "malformed mode in tree entry"
msgstr ""
-#: builtin/clone.c:1102
-msgid "source repository is shallow, ignoring --local"
+#: tree-walk.c:43
+msgid "empty filename in tree entry"
msgstr ""
-#: builtin/clone.c:1107
-msgid "--local is ignored"
+#: tree-walk.c:116
+msgid "too-short tree file"
msgstr ""
-#: builtin/clone.c:1169 builtin/clone.c:1177
+#: unpack-trees.c:111
#, c-format
-msgid "Remote branch %s not found in upstream %s"
+msgid ""
+"Your local changes to the following files would be overwritten by checkout:\n"
+"%%sPlease commit your changes or stash them before you switch branches."
msgstr ""
-#: builtin/clone.c:1180
-msgid "You appear to have cloned an empty repository."
+#: unpack-trees.c:113
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by checkout:\n"
+"%%s"
msgstr ""
-#: builtin/column.c:10
-msgid "git column [<options>]"
+#: 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/column.c:27
-msgid "lookup config vars"
+#: unpack-trees.c:118
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"%%s"
msgstr ""
-#: builtin/column.c:28 builtin/column.c:29
-msgid "layout to use"
+#: 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/column.c:30
-msgid "Maximum width"
+#: unpack-trees.c:123
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by %s:\n"
+"%%s"
msgstr ""
-#: builtin/column.c:31
-msgid "Padding space on left border"
+#: unpack-trees.c:128
+#, c-format
+msgid ""
+"Updating the following directories would lose untracked files in them:\n"
+"%s"
msgstr ""
-#: builtin/column.c:32
-msgid "Padding space on right border"
+#: 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/column.c:33
-msgid "Padding space between columns"
+#: unpack-trees.c:134
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%s"
msgstr ""
-#: builtin/column.c:52
-msgid "--command must be the first argument"
+#: unpack-trees.c:137
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%sPlease move or remove them before you merge."
msgstr ""
-#: builtin/commit.c:37
-msgid "git commit [<options>] [--] <pathspec>..."
+#: unpack-trees.c:139
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%s"
msgstr ""
-#: builtin/commit.c:42
-msgid "git status [<options>] [--] <pathspec>..."
+#: unpack-trees.c:142
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%sPlease move or remove them before you %s."
msgstr ""
-#: builtin/commit.c:47
+#: unpack-trees.c:144
+#, c-format
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"
+"The following untracked working tree files would be removed by %s:\n"
+"%%s"
msgstr ""
-#: builtin/commit.c:52
+#: unpack-trees.c:150
+#, c-format
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"
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%sPlease move or remove them before you switch branches."
msgstr ""
-#: builtin/commit.c:59
-msgid "Otherwise, please use 'git reset'\n"
+#: unpack-trees.c:152
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%s"
msgstr ""
-#: builtin/commit.c:62
+#: unpack-trees.c:155
+#, c-format
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"
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%sPlease move or remove them before you merge."
msgstr ""
-#: builtin/commit.c:284
-msgid "failed to unpack HEAD tree object"
-msgstr ""
-
-#: builtin/commit.c:325
-msgid "unable to create temporary index"
-msgstr ""
-
-#: builtin/commit.c:331
-msgid "interactive add failed"
-msgstr ""
-
-#: builtin/commit.c:344
-msgid "unable to update temporary index"
+#: unpack-trees.c:157
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%s"
msgstr ""
-#: builtin/commit.c:346
-msgid "Failed to update main cache tree"
+#: unpack-trees.c:160
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%sPlease move or remove them before you %s."
msgstr ""
-#: builtin/commit.c:371 builtin/commit.c:395 builtin/commit.c:444
-msgid "unable to write new_index file"
+#: unpack-trees.c:162
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%s"
msgstr ""
-#: builtin/commit.c:427
-msgid "cannot do a partial commit during a merge."
+#: unpack-trees.c:170
+#, c-format
+msgid "Entry '%s' overlaps with '%s'. Cannot bind."
msgstr ""
-#: builtin/commit.c:429
-msgid "cannot do a partial commit during a cherry-pick."
+#: unpack-trees.c:173
+#, c-format
+msgid ""
+"Cannot update sparse checkout: the following entries are not up to date:\n"
+"%s"
msgstr ""
-#: builtin/commit.c:437
-msgid "cannot read the index"
+#: unpack-trees.c:175
+#, c-format
+msgid ""
+"The following working tree files would be overwritten by sparse checkout "
+"update:\n"
+"%s"
msgstr ""
-#: builtin/commit.c:456
-msgid "unable to write temporary index file"
+#: unpack-trees.c:177
+#, c-format
+msgid ""
+"The following working tree files would be removed by sparse checkout "
+"update:\n"
+"%s"
msgstr ""
-#: builtin/commit.c:553
+#: unpack-trees.c:179
#, c-format
-msgid "commit '%s' lacks author header"
+msgid ""
+"Cannot update submodule:\n"
+"%s"
msgstr ""
-#: builtin/commit.c:555
+#: unpack-trees.c:256
#, c-format
-msgid "commit '%s' has malformed author line"
+msgid "Aborting\n"
msgstr ""
-#: builtin/commit.c:574
-msgid "malformed --author parameter"
+#: unpack-trees.c:318
+msgid "Checking out files"
msgstr ""
-#: builtin/commit.c:626
+#: unpack-trees.c:350
msgid ""
-"unable to select a comment character that is not used\n"
-"in the current commit message"
+"the following paths have collided (e.g. case-sensitive paths\n"
+"on a case-insensitive filesystem) and only one from the same\n"
+"colliding group is in the working tree:\n"
msgstr ""
-#: builtin/commit.c:663 builtin/commit.c:696 builtin/commit.c:1024
-#, c-format
-msgid "could not lookup commit %s"
+#: urlmatch.c:163
+msgid "invalid URL scheme name or missing '://' suffix"
msgstr ""
-#: builtin/commit.c:675 builtin/shortlog.c:309
+#: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405
#, c-format
-msgid "(reading log message from standard input)\n"
+msgid "invalid %XX escape sequence"
msgstr ""
-#: builtin/commit.c:677
-msgid "could not read log from standard input"
+#: urlmatch.c:215
+msgid "missing host and scheme is not 'file:'"
msgstr ""
-#: builtin/commit.c:681
-#, c-format
-msgid "could not read log file '%s'"
+#: urlmatch.c:232
+msgid "a 'file:' URL may not have a port number"
msgstr ""
-#: builtin/commit.c:710 builtin/commit.c:718
-msgid "could not read SQUASH_MSG"
+#: urlmatch.c:247
+msgid "invalid characters in host name"
msgstr ""
-#: builtin/commit.c:715
-msgid "could not read MERGE_MSG"
+#: urlmatch.c:292 urlmatch.c:303
+msgid "invalid port number"
msgstr ""
-#: builtin/commit.c:769
-msgid "could not write commit template"
+#: urlmatch.c:371
+msgid "invalid '..' path segment"
msgstr ""
-#: builtin/commit.c:787
+#: worktree.c:255 builtin/am.c:2097
#, c-format
-msgid ""
-"\n"
-"It looks like you may be committing a merge.\n"
-"If this is not correct, please remove the file\n"
-"\t%s\n"
-"and try again.\n"
+msgid "failed to read '%s'"
msgstr ""
-#: builtin/commit.c:792
+#: worktree.c:301
#, c-format
-msgid ""
-"\n"
-"It looks like you may be committing a cherry-pick.\n"
-"If this is not correct, please remove the file\n"
-"\t%s\n"
-"and try again.\n"
+msgid "'%s' at main working tree is not the repository directory"
msgstr ""
-#: builtin/commit.c:805
+#: worktree.c:312
#, c-format
-msgid ""
-"Please enter the commit message for your changes. Lines starting\n"
-"with '%c' will be ignored, and an empty message aborts the commit.\n"
+msgid "'%s' file does not contain absolute path to the working tree location"
msgstr ""
-#: builtin/commit.c:813
+#: worktree.c:324
#, c-format
-msgid ""
-"Please enter the commit message for your changes. Lines starting\n"
-"with '%c' will be kept; you may remove them yourself if you want to.\n"
-"An empty message aborts the commit.\n"
+msgid "'%s' does not exist"
msgstr ""
-#: builtin/commit.c:830
+#: worktree.c:330
#, c-format
-msgid "%sAuthor: %.*s <%.*s>"
+msgid "'%s' is not a .git file, error code %d"
msgstr ""
-#: builtin/commit.c:838
+#: worktree.c:338
#, c-format
-msgid "%sDate: %s"
+msgid "'%s' does not point back to '%s'"
msgstr ""
-#: builtin/commit.c:845
+#: wrapper.c:223 wrapper.c:393
#, c-format
-msgid "%sCommitter: %.*s <%.*s>"
+msgid "could not open '%s' for reading and writing"
msgstr ""
-#: builtin/commit.c:862
-msgid "Cannot read index"
+#: wrapper.c:424 wrapper.c:624
+#, c-format
+msgid "unable to access '%s'"
msgstr ""
-#: builtin/commit.c:928
-msgid "Error building trees"
+#: wrapper.c:632
+msgid "unable to get current working directory"
msgstr ""
-#: builtin/commit.c:942 builtin/tag.c:256
-#, c-format
-msgid "Please supply the message using either -m or -F option.\n"
+#: wt-status.c:156
+msgid "Unmerged paths:"
msgstr ""
-#: builtin/commit.c:986
+#: wt-status.c:183 wt-status.c:210
#, c-format
-msgid "--author '%s' is not 'Name <email>' and matches no existing author"
+msgid " (use \"git reset %s <file>...\" to unstage)"
msgstr ""
-#: builtin/commit.c:1000
-#, c-format
-msgid "Invalid ignored mode '%s'"
+#: wt-status.c:185 wt-status.c:212
+msgid " (use \"git rm --cached <file>...\" to unstage)"
msgstr ""
-#: builtin/commit.c:1014 builtin/commit.c:1264
-#, c-format
-msgid "Invalid untracked files mode '%s'"
+#: wt-status.c:189
+msgid " (use \"git add <file>...\" to mark resolution)"
msgstr ""
-#: builtin/commit.c:1052
-msgid "--long and -z are incompatible"
+#: wt-status.c:191 wt-status.c:195
+msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
msgstr ""
-#: builtin/commit.c:1085
-msgid "Using both --reset-author and --author does not make sense"
+#: wt-status.c:193
+msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr ""
-#: builtin/commit.c:1094
-msgid "You have nothing to amend."
+#: wt-status.c:204 wt-status.c:1064
+msgid "Changes to be committed:"
msgstr ""
-#: builtin/commit.c:1097
-msgid "You are in the middle of a merge -- cannot amend."
+#: wt-status.c:222 wt-status.c:1073
+msgid "Changes not staged for commit:"
msgstr ""
-#: builtin/commit.c:1099
-msgid "You are in the middle of a cherry-pick -- cannot amend."
+#: wt-status.c:226
+msgid " (use \"git add <file>...\" to update what will be committed)"
msgstr ""
-#: builtin/commit.c:1102
-msgid "Options --squash and --fixup cannot be used together"
+#: wt-status.c:228
+msgid " (use \"git add/rm <file>...\" to update what will be committed)"
msgstr ""
-#: builtin/commit.c:1112
-msgid "Only one of -c/-C/-F/--fixup can be used."
+#: wt-status.c:229
+msgid ""
+" (use \"git checkout -- <file>...\" to discard changes in working directory)"
msgstr ""
-#: builtin/commit.c:1114
-msgid "Option -m cannot be combined with -c/-C/-F."
+#: wt-status.c:231
+msgid " (commit or discard the untracked or modified content in submodules)"
msgstr ""
-#: builtin/commit.c:1122
-msgid "--reset-author can be used only with -C, -c or --amend."
+#: wt-status.c:243
+#, c-format
+msgid " (use \"git %s <file>...\" to include in what will be committed)"
msgstr ""
-#: builtin/commit.c:1139
-msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
+#: wt-status.c:258
+msgid "both deleted:"
msgstr ""
-#: builtin/commit.c:1141
-msgid "No paths with --include/--only does not make sense."
+#: wt-status.c:260
+msgid "added by us:"
msgstr ""
-#: builtin/commit.c:1155 builtin/tag.c:542
-#, c-format
-msgid "Invalid cleanup mode %s"
+#: wt-status.c:262
+msgid "deleted by them:"
msgstr ""
-#: builtin/commit.c:1160
-msgid "Paths with -a does not make sense."
+#: wt-status.c:264
+msgid "added by them:"
msgstr ""
-#: builtin/commit.c:1278 builtin/commit.c:1443
-msgid "show status concisely"
+#: wt-status.c:266
+msgid "deleted by us:"
msgstr ""
-#: builtin/commit.c:1280 builtin/commit.c:1445
-msgid "show branch information"
+#: wt-status.c:268
+msgid "both added:"
msgstr ""
-#: builtin/commit.c:1282
-msgid "show stash information"
+#: wt-status.c:270
+msgid "both modified:"
msgstr ""
-#: builtin/commit.c:1284 builtin/commit.c:1447
-msgid "compute full ahead/behind values"
+#: wt-status.c:280
+msgid "new file:"
msgstr ""
-#: builtin/commit.c:1286
-msgid "version"
+#: wt-status.c:282
+msgid "copied:"
msgstr ""
-#: builtin/commit.c:1286 builtin/commit.c:1449 builtin/push.c:542
-#: builtin/worktree.c:541
-msgid "machine-readable output"
+#: wt-status.c:284
+msgid "deleted:"
msgstr ""
-#: builtin/commit.c:1289 builtin/commit.c:1451
-msgid "show status in long format (default)"
+#: wt-status.c:286
+msgid "modified:"
msgstr ""
-#: builtin/commit.c:1292 builtin/commit.c:1454
-msgid "terminate entries with NUL"
+#: wt-status.c:288
+msgid "renamed:"
msgstr ""
-#: builtin/commit.c:1294 builtin/commit.c:1298 builtin/commit.c:1457
-#: builtin/fast-export.c:999 builtin/fast-export.c:1002 builtin/tag.c:396
-msgid "mode"
+#: wt-status.c:290
+msgid "typechange:"
msgstr ""
-#: builtin/commit.c:1295 builtin/commit.c:1457
-msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
+#: wt-status.c:292
+msgid "unknown:"
msgstr ""
-#: builtin/commit.c:1299
-msgid ""
-"show ignored files, optional modes: traditional, matching, no. (Default: "
-"traditional)"
+#: wt-status.c:294
+msgid "unmerged:"
msgstr ""
-#: builtin/commit.c:1301 parse-options.h:167
-msgid "when"
+#: wt-status.c:374
+msgid "new commits, "
msgstr ""
-#: builtin/commit.c:1302
-msgid ""
-"ignore changes to submodules, optional when: all, dirty, untracked. "
-"(Default: all)"
+#: wt-status.c:376
+msgid "modified content, "
msgstr ""
-#: builtin/commit.c:1304
-msgid "list untracked files in columns"
+#: wt-status.c:378
+msgid "untracked content, "
msgstr ""
-#: builtin/commit.c:1323
-msgid "Unsupported combination of ignored and untracked-files arguments"
-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] ""
-#: builtin/commit.c:1413
-msgid "suppress summary after successful commit"
+#: wt-status.c:928
+msgid "Submodules changed but not updated:"
msgstr ""
-#: builtin/commit.c:1414
-msgid "show diff in commit message template"
+#: wt-status.c:930
+msgid "Submodule changes to be committed:"
msgstr ""
-#: builtin/commit.c:1416
-msgid "Commit message options"
+#: wt-status.c:1012
+msgid ""
+"Do not modify or remove the line above.\n"
+"Everything below it will be ignored."
msgstr ""
-#: builtin/commit.c:1417 builtin/tag.c:393
-msgid "read message from file"
+#: wt-status.c:1119
+msgid "You have unmerged paths."
msgstr ""
-#: builtin/commit.c:1418
-msgid "author"
+#: wt-status.c:1122
+msgid " (fix conflicts and run \"git commit\")"
msgstr ""
-#: builtin/commit.c:1418
-msgid "override author for commit"
+#: wt-status.c:1124
+msgid " (use \"git merge --abort\" to abort the merge)"
msgstr ""
-#: builtin/commit.c:1419 builtin/gc.c:359
-msgid "date"
+#: wt-status.c:1128
+msgid "All conflicts fixed but you are still merging."
msgstr ""
-#: builtin/commit.c:1419
-msgid "override date for commit"
+#: wt-status.c:1131
+msgid " (use \"git commit\" to conclude merge)"
msgstr ""
-#: builtin/commit.c:1420 builtin/merge.c:226 builtin/notes.c:402
-#: builtin/notes.c:565 builtin/tag.c:391
-msgid "message"
+#: wt-status.c:1140
+msgid "You are in the middle of an am session."
msgstr ""
-#: builtin/commit.c:1420
-msgid "commit message"
+#: wt-status.c:1143
+msgid "The current patch is empty."
msgstr ""
-#: builtin/commit.c:1421 builtin/commit.c:1422 builtin/commit.c:1423
-#: builtin/commit.c:1424 parse-options.h:269 ref-filter.h:92
-msgid "commit"
+#: wt-status.c:1147
+msgid " (fix conflicts and then run \"git am --continue\")"
msgstr ""
-#: builtin/commit.c:1421
-msgid "reuse and edit message from specified commit"
+#: wt-status.c:1149
+msgid " (use \"git am --skip\" to skip this patch)"
msgstr ""
-#: builtin/commit.c:1422
-msgid "reuse message from specified commit"
+#: wt-status.c:1151
+msgid " (use \"git am --abort\" to restore the original branch)"
msgstr ""
-#: builtin/commit.c:1423
-msgid "use autosquash formatted message to fixup specified commit"
+#: wt-status.c:1284
+msgid "git-rebase-todo is missing."
msgstr ""
-#: builtin/commit.c:1424
-msgid "use autosquash formatted message to squash specified commit"
+#: wt-status.c:1286
+msgid "No commands done."
msgstr ""
-#: builtin/commit.c:1425
-msgid "the commit is authored by me now (used with -C/-c/--amend)"
-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] ""
-#: builtin/commit.c:1426 builtin/log.c:1446 builtin/merge.c:240
-#: builtin/pull.c:149 builtin/revert.c:105
-msgid "add Signed-off-by:"
+#: wt-status.c:1300
+#, c-format
+msgid " (see more in file %s)"
msgstr ""
-#: builtin/commit.c:1427
-msgid "use specified template file"
+#: wt-status.c:1305
+msgid "No commands remaining."
msgstr ""
-#: builtin/commit.c:1428
-msgid "force edit of commit"
+#: 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 ""
-#: builtin/commit.c:1429
-msgid "default"
+#: wt-status.c:1328
+#, c-format
+msgid "You are currently rebasing branch '%s' on '%s'."
msgstr ""
-#: builtin/commit.c:1429 builtin/tag.c:397
-msgid "how to strip spaces and #comments from message"
+#: wt-status.c:1333
+msgid "You are currently rebasing."
msgstr ""
-#: builtin/commit.c:1430
-msgid "include status in commit message template"
-msgstr ""
-
-#: builtin/commit.c:1432 builtin/merge.c:238 builtin/pull.c:179
-#: builtin/revert.c:113
-msgid "GPG sign commit"
-msgstr ""
-
-#: builtin/commit.c:1435
-msgid "Commit contents options"
-msgstr ""
-
-#: builtin/commit.c:1436
-msgid "commit all changed files"
-msgstr ""
-
-#: builtin/commit.c:1437
-msgid "add specified files to index for commit"
-msgstr ""
-
-#: builtin/commit.c:1438
-msgid "interactively add files"
-msgstr ""
-
-#: builtin/commit.c:1439
-msgid "interactively add changes"
-msgstr ""
-
-#: builtin/commit.c:1440
-msgid "commit only specified files"
-msgstr ""
-
-#: builtin/commit.c:1441
-msgid "bypass pre-commit and commit-msg hooks"
-msgstr ""
-
-#: builtin/commit.c:1442
-msgid "show what would be committed"
-msgstr ""
-
-#: builtin/commit.c:1455
-msgid "amend previous commit"
+#: wt-status.c:1346
+msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr ""
-#: builtin/commit.c:1456
-msgid "bypass post-rewrite hook"
+#: wt-status.c:1348
+msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr ""
-#: builtin/commit.c:1461
-msgid "ok to record an empty change"
+#: wt-status.c:1350
+msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr ""
-#: builtin/commit.c:1463
-msgid "ok to record a change with an empty message"
+#: wt-status.c:1357
+msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr ""
-#: builtin/commit.c:1536
+#: wt-status.c:1361
#, c-format
-msgid "Corrupt MERGE_HEAD file (%s)"
-msgstr ""
-
-#: builtin/commit.c:1543
-msgid "could not read MERGE_MODE"
+msgid ""
+"You are currently splitting a commit while rebasing branch '%s' on '%s'."
msgstr ""
-#: builtin/commit.c:1562
-#, c-format
-msgid "could not read commit message: %s"
+#: wt-status.c:1366
+msgid "You are currently splitting a commit during a rebase."
msgstr ""
-#: builtin/commit.c:1573
-#, c-format
-msgid "Aborting commit due to empty commit message.\n"
+#: wt-status.c:1369
+msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr ""
-#: builtin/commit.c:1578
+#: wt-status.c:1373
#, c-format
-msgid "Aborting commit; you did not edit the message.\n"
+msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr ""
-#: builtin/commit.c:1613
-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."
+#: wt-status.c:1378
+msgid "You are currently editing a commit during a rebase."
msgstr ""
-#: builtin/config.c:10
-msgid "git config [<options>]"
+#: wt-status.c:1381
+msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr ""
-#: builtin/config.c:58
-msgid "Config file location"
+#: wt-status.c:1383
+msgid ""
+" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr ""
-#: builtin/config.c:59
-msgid "use global config file"
+#: wt-status.c:1394
+msgid "Cherry-pick currently in progress."
msgstr ""
-#: builtin/config.c:60
-msgid "use system config file"
+#: wt-status.c:1397
+#, c-format
+msgid "You are currently cherry-picking commit %s."
msgstr ""
-#: builtin/config.c:61
-msgid "use repository config file"
+#: wt-status.c:1404
+msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr ""
-#: builtin/config.c:62
-msgid "use given config file"
+#: wt-status.c:1407
+msgid " (run \"git cherry-pick --continue\" to continue)"
msgstr ""
-#: builtin/config.c:63
-msgid "blob-id"
+#: wt-status.c:1410
+msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr ""
-#: builtin/config.c:63
-msgid "read config from given blob object"
+#: wt-status.c:1412
+msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr ""
-#: builtin/config.c:64
-msgid "Action"
+#: wt-status.c:1422
+msgid "Revert currently in progress."
msgstr ""
-#: builtin/config.c:65
-msgid "get value: name [value-regex]"
+#: wt-status.c:1425
+#, c-format
+msgid "You are currently reverting commit %s."
msgstr ""
-#: builtin/config.c:66
-msgid "get all values: key [value-regex]"
+#: wt-status.c:1431
+msgid " (fix conflicts and run \"git revert --continue\")"
msgstr ""
-#: builtin/config.c:67
-msgid "get values for regexp: name-regex [value-regex]"
+#: wt-status.c:1434
+msgid " (run \"git revert --continue\" to continue)"
msgstr ""
-#: builtin/config.c:68
-msgid "get value specific for the URL: section[.var] URL"
+#: wt-status.c:1437
+msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr ""
-#: builtin/config.c:69
-msgid "replace all matching variables: name value [value_regex]"
+#: wt-status.c:1439
+msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr ""
-#: builtin/config.c:70
-msgid "add a new variable: name value"
+#: wt-status.c:1449
+#, c-format
+msgid "You are currently bisecting, started from branch '%s'."
msgstr ""
-#: builtin/config.c:71
-msgid "remove a variable: name [value-regex]"
+#: wt-status.c:1453
+msgid "You are currently bisecting."
msgstr ""
-#: builtin/config.c:72
-msgid "remove all matches: name [value-regex]"
+#: wt-status.c:1456
+msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr ""
-#: builtin/config.c:73
-msgid "rename section: old-name new-name"
+#: wt-status.c:1665
+msgid "On branch "
msgstr ""
-#: builtin/config.c:74
-msgid "remove a section: name"
+#: wt-status.c:1672
+msgid "interactive rebase in progress; onto "
msgstr ""
-#: builtin/config.c:75
-msgid "list all"
+#: wt-status.c:1674
+msgid "rebase in progress; onto "
msgstr ""
-#: builtin/config.c:76
-msgid "open an editor"
+#: wt-status.c:1679
+msgid "HEAD detached at "
msgstr ""
-#: builtin/config.c:77
-msgid "find the color configured: slot [default]"
+#: wt-status.c:1681
+msgid "HEAD detached from "
msgstr ""
-#: builtin/config.c:78
-msgid "find the color setting: slot [stdout-is-tty]"
+#: wt-status.c:1684
+msgid "Not currently on any branch."
msgstr ""
-#: builtin/config.c:79
-msgid "Type"
+#: wt-status.c:1701
+msgid "Initial commit"
msgstr ""
-#: builtin/config.c:80
-msgid "value is \"true\" or \"false\""
+#: wt-status.c:1702
+msgid "No commits yet"
msgstr ""
-#: builtin/config.c:81
-msgid "value is decimal number"
+#: wt-status.c:1716
+msgid "Untracked files"
msgstr ""
-#: builtin/config.c:82
-msgid "value is --bool or --int"
+#: wt-status.c:1718
+msgid "Ignored files"
msgstr ""
-#: builtin/config.c:83
-msgid "value is a path (file or directory name)"
+#: wt-status.c:1722
+#, c-format
+msgid ""
+"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
+"may speed it up, but you have to be careful not to forget to add\n"
+"new files yourself (see 'git help status')."
msgstr ""
-#: builtin/config.c:84
-msgid "value is an expiry date"
+#: wt-status.c:1728
+#, c-format
+msgid "Untracked files not listed%s"
msgstr ""
-#: builtin/config.c:85
-msgid "Other"
+#: wt-status.c:1730
+msgid " (use -u option to show untracked files)"
msgstr ""
-#: builtin/config.c:86
-msgid "terminate values with NUL byte"
+#: wt-status.c:1736
+msgid "No changes"
msgstr ""
-#: builtin/config.c:87
-msgid "show variable names only"
+#: wt-status.c:1741
+#, c-format
+msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr ""
-#: builtin/config.c:88
-msgid "respect include directives on lookup"
+#: wt-status.c:1744
+#, c-format
+msgid "no changes added to commit\n"
msgstr ""
-#: builtin/config.c:89
-msgid "show origin of config (file, standard input, blob, command line)"
+#: wt-status.c:1747
+#, c-format
+msgid ""
+"nothing added to commit but untracked files present (use \"git add\" to "
+"track)\n"
msgstr ""
-#: builtin/config.c:335
-msgid "unable to parse default color value"
+#: wt-status.c:1750
+#, c-format
+msgid "nothing added to commit but untracked files present\n"
msgstr ""
-#: builtin/config.c:479
+#: wt-status.c:1753
#, c-format
-msgid ""
-"# This is Git's per-user configuration file.\n"
-"[user]\n"
-"# Please adapt and uncomment the following lines:\n"
-"#\tname = %s\n"
-"#\temail = %s\n"
+msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr ""
-#: builtin/config.c:507
-msgid "--local can only be used inside a git repository"
+#: wt-status.c:1756 wt-status.c:1761
+#, c-format
+msgid "nothing to commit\n"
msgstr ""
-#: builtin/config.c:632
+#: wt-status.c:1759
#, c-format
-msgid "cannot create configuration file %s"
+msgid "nothing to commit (use -u to show untracked files)\n"
msgstr ""
-#: builtin/config.c:645
+#: wt-status.c:1763
#, c-format
-msgid ""
-"cannot overwrite multiple values with a single value\n"
-" Use a regexp, --add or --replace-all to change %s."
+msgid "nothing to commit, working tree clean\n"
msgstr ""
-#: builtin/count-objects.c:88
-msgid "git count-objects [-v] [-H | --human-readable]"
+#: wt-status.c:1876
+msgid "No commits yet on "
msgstr ""
-#: builtin/count-objects.c:98
-msgid "print sizes in human readable format"
+#: wt-status.c:1880
+msgid "HEAD (no branch)"
msgstr ""
-#: builtin/describe.c:22
-msgid "git describe [<options>] [<commit-ish>...]"
+#: wt-status.c:1911
+msgid "different"
msgstr ""
-#: builtin/describe.c:23
-msgid "git describe [<options>] --dirty"
+#: wt-status.c:1913 wt-status.c:1921
+msgid "behind "
msgstr ""
-#: builtin/describe.c:57
-msgid "head"
+#: wt-status.c:1916 wt-status.c:1919
+msgid "ahead "
msgstr ""
-#: builtin/describe.c:57
-msgid "lightweight"
+#. TRANSLATORS: the action is e.g. "pull with rebase"
+#: wt-status.c:2443
+#, c-format
+msgid "cannot %s: You have unstaged changes."
msgstr ""
-#: builtin/describe.c:57
-msgid "annotated"
+#: wt-status.c:2449
+msgid "additionally, your index contains uncommitted changes."
msgstr ""
-#: builtin/describe.c:267
+#: wt-status.c:2451
#, c-format
-msgid "annotated tag %s not available"
+msgid "cannot %s: Your index contains uncommitted changes."
msgstr ""
-#: builtin/describe.c:271
-#, c-format
-msgid "annotated tag %s has no embedded name"
+#: builtin/add.c:25
+msgid "git add [<options>] [--] <pathspec>..."
msgstr ""
-#: builtin/describe.c:273
+#: builtin/add.c:84
#, c-format
-msgid "tag '%s' is really '%s' here"
+msgid "unexpected diff status %c"
msgstr ""
-#: builtin/describe.c:317
-#, c-format
-msgid "no tag exactly matches '%s'"
+#: builtin/add.c:89 builtin/commit.c:285
+msgid "updating files failed"
msgstr ""
-#: builtin/describe.c:319
+#: builtin/add.c:99
#, c-format
-msgid "No exact match on refs or tags, searching to describe\n"
+msgid "remove '%s'\n"
msgstr ""
-#: builtin/describe.c:366
-#, c-format
-msgid "finished search at %s\n"
+#: builtin/add.c:174
+msgid "Unstaged changes after refreshing the index:"
msgstr ""
-#: builtin/describe.c:392
-#, c-format
-msgid ""
-"No annotated tags can describe '%s'.\n"
-"However, there were unannotated tags: try --tags."
+#: builtin/add.c:234 builtin/rev-parse.c:896
+msgid "Could not read the index"
msgstr ""
-#: builtin/describe.c:396
+#: builtin/add.c:245
#, c-format
-msgid ""
-"No tags can describe '%s'.\n"
-"Try --always, or create some tags."
+msgid "Could not open '%s' for writing."
msgstr ""
-#: builtin/describe.c:426
-#, c-format
-msgid "traversed %lu commits\n"
+#: builtin/add.c:249
+msgid "Could not write patch"
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/add.c:252
+msgid "editing patch failed"
msgstr ""
-#: builtin/describe.c:497
+#: builtin/add.c:255
#, c-format
-msgid "describe %s\n"
+msgid "Could not stat '%s'"
msgstr ""
-#: builtin/describe.c:500 builtin/log.c:502
-#, c-format
-msgid "Not a valid object name %s"
+#: builtin/add.c:257
+msgid "Empty patch. Aborted."
msgstr ""
-#: builtin/describe.c:508
+#: builtin/add.c:262
#, c-format
-msgid "%s is neither a commit nor blob"
+msgid "Could not apply '%s'"
msgstr ""
-#: builtin/describe.c:522
-msgid "find the tag that comes after the commit"
+#: builtin/add.c:270
+msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr ""
-#: builtin/describe.c:523
-msgid "debug search strategy on stderr"
+#: 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/describe.c:524
-msgid "use any ref"
+#: builtin/add.c:293
+msgid "interactive picking"
msgstr ""
-#: builtin/describe.c:525
-msgid "use any tag, even unannotated"
+#: builtin/add.c:294 builtin/checkout.c:1379 builtin/reset.c:306
+msgid "select hunks interactively"
msgstr ""
-#: builtin/describe.c:526
-msgid "always use long format"
+#: builtin/add.c:295
+msgid "edit current diff and apply"
msgstr ""
-#: builtin/describe.c:527
-msgid "only follow first parent"
+#: builtin/add.c:296
+msgid "allow adding otherwise ignored files"
msgstr ""
-#: builtin/describe.c:530
-msgid "only output exact matches"
+#: builtin/add.c:297
+msgid "update tracked files"
msgstr ""
-#: builtin/describe.c:532
-msgid "consider <n> most recent tags (default: 10)"
+#: builtin/add.c:298
+msgid "renormalize EOL of tracked files (implies -u)"
msgstr ""
-#: builtin/describe.c:534
-msgid "only consider tags matching <pattern>"
+#: builtin/add.c:299
+msgid "record only the fact that the path will be added later"
msgstr ""
-#: builtin/describe.c:536
-msgid "do not consider tags matching <pattern>"
+#: builtin/add.c:300
+msgid "add changes from all tracked and untracked files"
msgstr ""
-#: builtin/describe.c:538 builtin/name-rev.c:406
-msgid "show abbreviated commit object as fallback"
+#: builtin/add.c:303
+msgid "ignore paths removed in the working tree (same as --no-all)"
msgstr ""
-#: builtin/describe.c:539 builtin/describe.c:542
-msgid "mark"
+#: builtin/add.c:305
+msgid "don't add, only refresh the index"
msgstr ""
-#: builtin/describe.c:540
-msgid "append <mark> on dirty working tree (default: \"-dirty\")"
+#: builtin/add.c:306
+msgid "just skip files which cannot be added because of errors"
msgstr ""
-#: builtin/describe.c:543
-msgid "append <mark> on broken working tree (default: \"-broken\")"
+#: builtin/add.c:307
+msgid "check if - even missing - files are ignored in dry run"
msgstr ""
-#: builtin/describe.c:561
-msgid "--long is incompatible with --abbrev=0"
+#: builtin/add.c:309 builtin/update-index.c:1001
+msgid "override the executable bit of the listed files"
msgstr ""
-#: builtin/describe.c:590
-msgid "No names found, cannot describe anything."
+#: builtin/add.c:311
+msgid "warn when adding an embedded repository"
msgstr ""
-#: builtin/describe.c:640
-msgid "--dirty is incompatible with commit-ishes"
+#: 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/describe.c:642
-msgid "--broken is incompatible with commit-ishes"
+#: builtin/add.c:354
+#, c-format
+msgid "adding embedded git repository: %s"
msgstr ""
-#: builtin/diff.c:83
+#: builtin/add.c:372
#, c-format
-msgid "'%s': not a regular file or symlink"
+msgid "Use -f if you really want to add them.\n"
msgstr ""
-#: builtin/diff.c:234
-#, c-format
-msgid "invalid option: %s"
+#: builtin/add.c:379
+msgid "adding files failed"
msgstr ""
-#: builtin/diff.c:356
-msgid "Not a git repository"
+#: builtin/add.c:419
+msgid "-A and -u are mutually incompatible"
msgstr ""
-#: builtin/diff.c:399
-#, c-format
-msgid "invalid object '%s' given."
+#: builtin/add.c:426
+msgid "Option --ignore-missing can only be used together with --dry-run"
msgstr ""
-#: builtin/diff.c:408
+#: builtin/add.c:430
#, c-format
-msgid "more than two blobs given: '%s'"
+msgid "--chmod param '%s' must be either -x or +x"
msgstr ""
-#: builtin/diff.c:413
+#: builtin/add.c:445
#, c-format
-msgid "unhandled object '%s' given."
+msgid "Nothing specified, nothing added.\n"
msgstr ""
-#: builtin/difftool.c:29
-msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
+#: builtin/add.c:446
+#, c-format
+msgid "Maybe you wanted to say 'git add .'?\n"
msgstr ""
-#: builtin/difftool.c:259
-#, c-format
-msgid "failed: %d"
+#: builtin/am.c:348
+msgid "could not parse author script"
msgstr ""
-#: builtin/difftool.c:301
+#: builtin/am.c:432
#, c-format
-msgid "could not read symlink %s"
+msgid "'%s' was deleted by the applypatch-msg hook"
msgstr ""
-#: builtin/difftool.c:303
+#: builtin/am.c:474
#, c-format
-msgid "could not read symlink file %s"
+msgid "Malformed input line: '%s'."
msgstr ""
-#: builtin/difftool.c:311
+#: builtin/am.c:512
#, c-format
-msgid "could not read object %s for symlink %s"
+msgid "Failed to copy notes from '%s' to '%s'"
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/am.c:538
+msgid "fseek failed"
msgstr ""
-#: builtin/difftool.c:632
+#: builtin/am.c:726
#, c-format
-msgid "both files modified: '%s' and '%s'."
+msgid "could not parse patch '%s'"
msgstr ""
-#: builtin/difftool.c:634
-msgid "working tree file has been left."
+#: builtin/am.c:791
+msgid "Only one StGIT patch series can be applied at once"
msgstr ""
-#: builtin/difftool.c:645
-#, c-format
-msgid "temporary files exist in '%s'."
+#: builtin/am.c:839
+msgid "invalid timestamp"
msgstr ""
-#: builtin/difftool.c:646
-msgid "you may want to cleanup or recover these."
+#: builtin/am.c:844 builtin/am.c:856
+msgid "invalid Date line"
msgstr ""
-#: builtin/difftool.c:695
-msgid "use `diff.guitool` instead of `diff.tool`"
+#: builtin/am.c:851
+msgid "invalid timezone offset"
msgstr ""
-#: builtin/difftool.c:697
-msgid "perform a full-directory diff"
+#: builtin/am.c:944
+msgid "Patch format detection failed."
msgstr ""
-#: builtin/difftool.c:699
-msgid "do not prompt before launching a diff tool"
+#: builtin/am.c:949 builtin/clone.c:409
+#, c-format
+msgid "failed to create directory '%s'"
msgstr ""
-#: builtin/difftool.c:705
-msgid "use symlinks in dir-diff mode"
+#: builtin/am.c:954
+msgid "Failed to split patches."
msgstr ""
-#: builtin/difftool.c:706
-msgid "<tool>"
+#: builtin/am.c:1084 builtin/commit.c:371
+msgid "unable to write index file"
msgstr ""
-#: builtin/difftool.c:707
-msgid "use the specified diff tool"
+#: builtin/am.c:1098
+#, c-format
+msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr ""
-#: builtin/difftool.c:709
-msgid "print a list of diff tools that may be used with `--tool`"
+#: builtin/am.c:1099
+#, c-format
+msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr ""
-#: builtin/difftool.c:712
-msgid ""
-"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
-"code"
+#: builtin/am.c:1100
+#, c-format
+msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr ""
-#: builtin/difftool.c:714
-msgid "<command>"
+#: builtin/am.c:1183
+msgid "Patch sent with format=flowed; space at the end of lines might be lost."
msgstr ""
-#: builtin/difftool.c:715
-msgid "specify a custom command for viewing diffs"
+#: builtin/am.c:1211
+msgid "Patch is empty."
msgstr ""
-#: builtin/difftool.c:739
-msgid "no <tool> given for --tool=<tool>"
+#: builtin/am.c:1277
+#, c-format
+msgid "invalid ident line: %.*s"
msgstr ""
-#: builtin/difftool.c:746
-msgid "no <cmd> given for --extcmd=<cmd>"
+#: builtin/am.c:1299
+#, c-format
+msgid "unable to parse commit %s"
msgstr ""
-#: builtin/fast-export.c:26
-msgid "git fast-export [rev-list-opts]"
+#: builtin/am.c:1495
+msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr ""
-#: builtin/fast-export.c:998
-msgid "show progress after <n> objects"
+#: builtin/am.c:1497
+msgid "Using index info to reconstruct a base tree..."
msgstr ""
-#: builtin/fast-export.c:1000
-msgid "select handling of signed tags"
+#: builtin/am.c:1516
+msgid ""
+"Did you hand edit your patch?\n"
+"It does not apply to blobs recorded in its index."
msgstr ""
-#: builtin/fast-export.c:1003
-msgid "select handling of tags that tag filtered objects"
+#: builtin/am.c:1522
+msgid "Falling back to patching base and 3-way merge..."
msgstr ""
-#: builtin/fast-export.c:1006
-msgid "Dump marks to this file"
+#: builtin/am.c:1548
+msgid "Failed to merge in the changes."
msgstr ""
-#: builtin/fast-export.c:1008
-msgid "Import marks from this file"
+#: builtin/am.c:1580
+msgid "applying to an empty history"
msgstr ""
-#: builtin/fast-export.c:1010
-msgid "Fake a tagger when tags lack one"
+#: builtin/am.c:1627 builtin/am.c:1631
+#, c-format
+msgid "cannot resume: %s does not exist."
msgstr ""
-#: builtin/fast-export.c:1012
-msgid "Output full tree for each commit"
+#: builtin/am.c:1647
+msgid "cannot be interactive without stdin connected to a terminal."
msgstr ""
-#: builtin/fast-export.c:1014
-msgid "Use the done feature to terminate the stream"
+#: builtin/am.c:1652
+msgid "Commit Body is:"
msgstr ""
-#: builtin/fast-export.c:1015
-msgid "Skip output of blob data"
+#. 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/fast-export.c:1016
-msgid "refspec"
+#: builtin/am.c:1712
+#, c-format
+msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr ""
-#: builtin/fast-export.c:1017
-msgid "Apply refspec to exported refs"
+#: builtin/am.c:1752 builtin/am.c:1820
+#, c-format
+msgid "Applying: %.*s"
msgstr ""
-#: builtin/fast-export.c:1018
-msgid "anonymize output"
+#: builtin/am.c:1769
+msgid "No changes -- Patch already applied."
msgstr ""
-#: builtin/fetch.c:25
-msgid "git fetch [<options>] [<repository> [<refspec>...]]"
+#: builtin/am.c:1775
+#, c-format
+msgid "Patch failed at %s %.*s"
msgstr ""
-#: builtin/fetch.c:26
-msgid "git fetch [<options>] <group>"
+#: builtin/am.c:1779
+msgid "Use 'git am --show-current-patch' to see the failed patch"
msgstr ""
-#: builtin/fetch.c:27
-msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
+#: 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/fetch.c:28
-msgid "git fetch --all [<options>]"
+#: 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/fetch.c:124 builtin/pull.c:188
-msgid "fetch from all remotes"
+#: 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/fetch.c:126 builtin/pull.c:191
-msgid "append to .git/FETCH_HEAD instead of overwriting"
+#: builtin/am.c:1989
+msgid "failed to clean index"
msgstr ""
-#: builtin/fetch.c:128 builtin/pull.c:194
-msgid "path to upload pack on remote end"
+#: builtin/am.c:2033
+msgid ""
+"You seem to have moved HEAD since the last 'am' failure.\n"
+"Not rewinding to ORIG_HEAD"
msgstr ""
-#: builtin/fetch.c:129 builtin/pull.c:196
-msgid "force overwrite of local branch"
+#: builtin/am.c:2130
+#, c-format
+msgid "Invalid value for --patch-format: %s"
msgstr ""
-#: builtin/fetch.c:131
-msgid "fetch from multiple remotes"
+#: builtin/am.c:2166
+msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr ""
-#: builtin/fetch.c:133 builtin/pull.c:198
-msgid "fetch all tags and associated objects"
+#: builtin/am.c:2167
+msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr ""
-#: builtin/fetch.c:135
-msgid "do not fetch all tags (--no-tags)"
+#: builtin/am.c:2173
+msgid "run interactively"
msgstr ""
-#: builtin/fetch.c:137
-msgid "number of submodules fetched in parallel"
+#: builtin/am.c:2175
+msgid "historical option -- no-op"
msgstr ""
-#: builtin/fetch.c:139 builtin/pull.c:201
-msgid "prune remote-tracking branches no longer on remote"
+#: builtin/am.c:2177
+msgid "allow fall back on 3way merging if needed"
msgstr ""
-#: builtin/fetch.c:141
-msgid "prune local tags no longer on remote and clobber changed tags"
+#: 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/fetch.c:142 builtin/fetch.c:165 builtin/pull.c:126
-msgid "on-demand"
+#: builtin/am.c:2180
+msgid "add a Signed-off-by line to the commit message"
msgstr ""
-#: builtin/fetch.c:143
-msgid "control recursive fetching of submodules"
+#: builtin/am.c:2183
+msgid "recode into utf8 (default)"
msgstr ""
-#: builtin/fetch.c:147 builtin/pull.c:209
-msgid "keep downloaded pack"
+#: builtin/am.c:2185
+msgid "pass -k flag to git-mailinfo"
msgstr ""
-#: builtin/fetch.c:149
-msgid "allow updating of HEAD ref"
+#: builtin/am.c:2187
+msgid "pass -b flag to git-mailinfo"
msgstr ""
-#: builtin/fetch.c:152 builtin/fetch.c:158 builtin/pull.c:212
-msgid "deepen history of shallow clone"
+#: builtin/am.c:2189
+msgid "pass -m flag to git-mailinfo"
msgstr ""
-#: builtin/fetch.c:154
-msgid "deepen history of shallow repository based on time"
+#: builtin/am.c:2191
+msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr ""
-#: builtin/fetch.c:160 builtin/pull.c:215
-msgid "convert to a complete repository"
+#: builtin/am.c:2194
+msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr ""
-#: builtin/fetch.c:162 builtin/log.c:1466
-msgid "dir"
+#: builtin/am.c:2197
+msgid "strip everything before a scissors line"
msgstr ""
-#: builtin/fetch.c:163
-msgid "prepend this to submodule path output"
+#: 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/fetch.c:166
-msgid ""
-"default for recursive fetching of submodules (lower priority than config "
-"files)"
+#: 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/fetch.c:170 builtin/pull.c:218
-msgid "accept refs that update .git/shallow"
+#: 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/fetch.c:171 builtin/pull.c:220
-msgid "refmap"
+#: builtin/am.c:2223
+msgid "format the patch(es) are in"
msgstr ""
-#: builtin/fetch.c:172 builtin/pull.c:221
-msgid "specify fetch refmap"
+#: builtin/am.c:2229
+msgid "override error message when patch failure occurs"
msgstr ""
-#: builtin/fetch.c:431
-msgid "Couldn't find remote ref HEAD"
+#: builtin/am.c:2231
+msgid "continue applying patches after resolving a conflict"
msgstr ""
-#: builtin/fetch.c:549
-#, c-format
-msgid "configuration fetch.output contains invalid value %s"
+#: builtin/am.c:2234
+msgid "synonyms for --continue"
msgstr ""
-#: builtin/fetch.c:642
-#, c-format
-msgid "object %s not found"
+#: builtin/am.c:2237
+msgid "skip the current patch"
msgstr ""
-#: builtin/fetch.c:646
-msgid "[up to date]"
+#: builtin/am.c:2240
+msgid "restore the original branch and abort the patching operation."
msgstr ""
-#: builtin/fetch.c:659 builtin/fetch.c:739
-msgid "[rejected]"
+#: builtin/am.c:2243
+msgid "abort the patching operation but keep HEAD where it is."
msgstr ""
-#: builtin/fetch.c:660
-msgid "can't fetch in current branch"
+#: builtin/am.c:2246
+msgid "show the patch being applied."
msgstr ""
-#: builtin/fetch.c:669
-msgid "[tag update]"
+#: builtin/am.c:2250
+msgid "lie about committer date"
msgstr ""
-#: builtin/fetch.c:670 builtin/fetch.c:703 builtin/fetch.c:719
-#: builtin/fetch.c:734
-msgid "unable to update local ref"
+#: builtin/am.c:2252
+msgid "use current timestamp for author date"
msgstr ""
-#: builtin/fetch.c:689
-msgid "[new tag]"
+#: 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/fetch.c:692
-msgid "[new branch]"
+#: builtin/am.c:2255 builtin/rebase.c:490 builtin/rebase.c:1454
+msgid "GPG-sign commits"
msgstr ""
-#: builtin/fetch.c:695
-msgid "[new ref]"
+#: builtin/am.c:2258
+msgid "(internal use for git-rebase)"
msgstr ""
-#: builtin/fetch.c:734
-msgid "forced update"
+#: 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/fetch.c:739
-msgid "non-fast-forward"
+#: builtin/am.c:2283
+msgid "failed to read the index"
msgstr ""
-#: builtin/fetch.c:784
+#: builtin/am.c:2298
#, c-format
-msgid "%s did not send all necessary objects\n"
+msgid "previous rebase directory %s still exists but mbox given."
msgstr ""
-#: builtin/fetch.c:804
+#: builtin/am.c:2322
#, c-format
-msgid "reject %s because shallow roots are not allowed to be updated"
+msgid ""
+"Stray %s directory found.\n"
+"Use \"git am --abort\" to remove it."
msgstr ""
-#: builtin/fetch.c:892 builtin/fetch.c:988
-#, c-format
-msgid "From %.*s\n"
+#: builtin/am.c:2328
+msgid "Resolve operation not in progress, we are not resuming."
msgstr ""
-#: builtin/fetch.c:903
-#, c-format
-msgid ""
-"some local refs could not be updated; try running\n"
-" 'git remote prune %s' to remove any old, conflicting branches"
+#: builtin/apply.c:8
+msgid "git apply [<options>] [<patch>...]"
msgstr ""
-#: builtin/fetch.c:958
+#: builtin/archive.c:17
#, c-format
-msgid " (%s will become dangling)"
+msgid "could not create archive file '%s'"
msgstr ""
-#: builtin/fetch.c:959
-#, c-format
-msgid " (%s has become dangling)"
+#: builtin/archive.c:20
+msgid "could not redirect output"
msgstr ""
-#: builtin/fetch.c:991
-msgid "[deleted]"
+#: builtin/archive.c:37
+msgid "git archive: Remote with no URL"
msgstr ""
-#: builtin/fetch.c:992 builtin/remote.c:1024
-msgid "(none)"
+#: builtin/archive.c:61
+msgid "git archive: expected ACK/NAK, got a flush packet"
msgstr ""
-#: builtin/fetch.c:1015
+#: builtin/archive.c:64
#, c-format
-msgid "Refusing to fetch into current branch %s of non-bare repository"
+msgid "git archive: NACK %s"
msgstr ""
-#: builtin/fetch.c:1034
-#, c-format
-msgid "Option \"%s\" value \"%s\" is not valid for %s"
+#: builtin/archive.c:65
+msgid "git archive: protocol error"
msgstr ""
-#: builtin/fetch.c:1037
-#, c-format
-msgid "Option \"%s\" is ignored for %s\n"
+#: builtin/archive.c:69
+msgid "git archive: expected a flush"
msgstr ""
-#: builtin/fetch.c:1277
-#, c-format
-msgid "Fetching %s\n"
+#: builtin/bisect--helper.c:22
+msgid "git bisect--helper --next-all [--no-checkout]"
msgstr ""
-#: builtin/fetch.c:1279 builtin/remote.c:97
-#, c-format
-msgid "Could not fetch %s"
+#: builtin/bisect--helper.c:23
+msgid "git bisect--helper --write-terms <bad_term> <good_term>"
msgstr ""
-#: builtin/fetch.c:1325 builtin/fetch.c:1498
-msgid ""
-"--filter can only be used with the remote configured in core.partialClone"
+#: builtin/bisect--helper.c:24
+msgid "git bisect--helper --bisect-clean-state"
msgstr ""
-#: builtin/fetch.c:1350
-msgid ""
-"No remote repository specified. Please, specify either a URL or a\n"
-"remote name from which new revisions should be fetched."
+#: builtin/bisect--helper.c:25
+msgid "git bisect--helper --bisect-reset [<commit>]"
msgstr ""
-#: builtin/fetch.c:1394
-msgid "You need to specify a tag name."
+#: builtin/bisect--helper.c:26
+msgid ""
+"git bisect--helper --bisect-write [--no-log] <state> <revision> <good_term> "
+"<bad_term>"
msgstr ""
-#: builtin/fetch.c:1439
-msgid "Negative depth in --deepen is not supported"
+#: builtin/bisect--helper.c:27
+msgid ""
+"git bisect--helper --bisect-check-and-set-terms <command> <good_term> "
+"<bad_term>"
msgstr ""
-#: builtin/fetch.c:1441
-msgid "--deepen and --depth are mutually exclusive"
+#: builtin/bisect--helper.c:28
+msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
msgstr ""
-#: builtin/fetch.c:1446
-msgid "--depth and --unshallow cannot be used together"
+#: builtin/bisect--helper.c:29
+msgid ""
+"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
+"term-new]"
msgstr ""
-#: builtin/fetch.c:1448
-msgid "--unshallow on a complete repository does not make sense"
+#: 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/fetch.c:1464
-msgid "fetch --all does not take a repository argument"
+#: builtin/bisect--helper.c:86
+#, c-format
+msgid "'%s' is not a valid term"
msgstr ""
-#: builtin/fetch.c:1466
-msgid "fetch --all does not make sense with refspecs"
+#: builtin/bisect--helper.c:90
+#, c-format
+msgid "can't use the builtin command '%s' as a term"
msgstr ""
-#: builtin/fetch.c:1475
+#: builtin/bisect--helper.c:100
#, c-format
-msgid "No such remote or remote group: %s"
+msgid "can't change the meaning of the term '%s'"
msgstr ""
-#: builtin/fetch.c:1482
-msgid "Fetching a group and specifying refspecs does not make sense"
+#: builtin/bisect--helper.c:111
+msgid "please use two different terms"
msgstr ""
-#: builtin/fmt-merge-msg.c:15
-msgid ""
-"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
+#: builtin/bisect--helper.c:118
+msgid "could not open the file BISECT_TERMS"
msgstr ""
-#: builtin/fmt-merge-msg.c:666
-msgid "populate log with at most <n> entries from shortlog"
+#: builtin/bisect--helper.c:155
+#, c-format
+msgid "We are not bisecting.\n"
msgstr ""
-#: builtin/fmt-merge-msg.c:669
-msgid "alias for --log (deprecated)"
+#: builtin/bisect--helper.c:163
+#, c-format
+msgid "'%s' is not a valid commit"
msgstr ""
-#: builtin/fmt-merge-msg.c:672
-msgid "text"
+#: builtin/bisect--helper.c:174
+#, c-format
+msgid ""
+"could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
msgstr ""
-#: builtin/fmt-merge-msg.c:673
-msgid "use <text> as start of message"
+#: builtin/bisect--helper.c:215
+#, c-format
+msgid "Bad bisect_write argument: %s"
msgstr ""
-#: builtin/fmt-merge-msg.c:674
-msgid "file to read from"
+#: builtin/bisect--helper.c:220
+#, c-format
+msgid "couldn't get the oid of the rev '%s'"
msgstr ""
-#: builtin/for-each-ref.c:10
-msgid "git for-each-ref [<options>] [<pattern>]"
+#: builtin/bisect--helper.c:232
+#, c-format
+msgid "couldn't open the file '%s'"
msgstr ""
-#: builtin/for-each-ref.c:11
-msgid "git for-each-ref [--points-at <object>]"
+#: builtin/bisect--helper.c:258
+#, c-format
+msgid "Invalid command: you're currently in a %s/%s bisect"
msgstr ""
-#: builtin/for-each-ref.c:12
-msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]"
+#: 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/for-each-ref.c:13
-msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
+#: 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/for-each-ref.c:28
-msgid "quote placeholders suitably for shells"
+#: builtin/bisect--helper.c:321
+#, c-format
+msgid "bisecting only with a %s commit"
msgstr ""
-#: builtin/for-each-ref.c:30
-msgid "quote placeholders suitably for perl"
+#. 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/for-each-ref.c:32
-msgid "quote placeholders suitably for python"
+#: builtin/bisect--helper.c:376
+msgid "no terms defined"
msgstr ""
-#: builtin/for-each-ref.c:34
-msgid "quote placeholders suitably for Tcl"
+#: 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/for-each-ref.c:37
-msgid "show only <n> matched refs"
+#: 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/for-each-ref.c:39 builtin/tag.c:420
-msgid "respect format colors"
+#: builtin/bisect--helper.c:475
+#, c-format
+msgid "unrecognized option: '%s'"
msgstr ""
-#: builtin/for-each-ref.c:43
-msgid "print only refs which points at the given object"
+#: builtin/bisect--helper.c:479
+#, c-format
+msgid "'%s' does not appear to be a valid revision"
msgstr ""
-#: builtin/for-each-ref.c:45
-msgid "print only refs that are merged"
+#: builtin/bisect--helper.c:511
+msgid "bad HEAD - I need a HEAD"
msgstr ""
-#: builtin/for-each-ref.c:46
-msgid "print only refs that are not merged"
+#: builtin/bisect--helper.c:526
+#, c-format
+msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
msgstr ""
-#: builtin/for-each-ref.c:47
-msgid "print only refs which contain the commit"
+#: builtin/bisect--helper.c:547
+msgid "won't bisect on cg-seek'ed tree"
msgstr ""
-#: builtin/for-each-ref.c:48
-msgid "print only refs which don't contain the commit"
+#: builtin/bisect--helper.c:550
+msgid "bad HEAD - strange symbolic ref"
msgstr ""
-#: builtin/fsck.c:568
-msgid "Checking object directories"
+#: builtin/bisect--helper.c:627
+msgid "perform 'git bisect next'"
msgstr ""
-#: builtin/fsck.c:660
-msgid "git fsck [<options>] [<object>...]"
+#: builtin/bisect--helper.c:629
+msgid "write the terms to .git/BISECT_TERMS"
msgstr ""
-#: builtin/fsck.c:666
-msgid "show unreachable objects"
+#: builtin/bisect--helper.c:631
+msgid "cleanup the bisection state"
msgstr ""
-#: builtin/fsck.c:667
-msgid "show dangling objects"
+#: builtin/bisect--helper.c:633
+msgid "check for expected revs"
msgstr ""
-#: builtin/fsck.c:668
-msgid "report tags"
+#: builtin/bisect--helper.c:635
+msgid "reset the bisection state"
msgstr ""
-#: builtin/fsck.c:669
-msgid "report root nodes"
+#: builtin/bisect--helper.c:637
+msgid "write out the bisection state in BISECT_LOG"
msgstr ""
-#: builtin/fsck.c:670
-msgid "make index objects head nodes"
+#: builtin/bisect--helper.c:639
+msgid "check and set terms in a bisection state"
msgstr ""
-#: builtin/fsck.c:671
-msgid "make reflogs head nodes (default)"
+#: builtin/bisect--helper.c:641
+msgid "check whether bad or good terms exist"
msgstr ""
-#: builtin/fsck.c:672
-msgid "also consider packs and alternate objects"
+#: builtin/bisect--helper.c:643
+msgid "print out the bisect terms"
msgstr ""
-#: builtin/fsck.c:673
-msgid "check only connectivity"
+#: builtin/bisect--helper.c:645
+msgid "start the bisect session"
msgstr ""
-#: builtin/fsck.c:674
-msgid "enable more strict checking"
+#: builtin/bisect--helper.c:647
+msgid "update BISECT_HEAD instead of checking out the current commit"
msgstr ""
-#: builtin/fsck.c:676
-msgid "write dangling objects in .git/lost-found"
+#: builtin/bisect--helper.c:649
+msgid "no log for BISECT_WRITE"
msgstr ""
-#: builtin/fsck.c:677 builtin/prune.c:108
-msgid "show progress"
+#: builtin/bisect--helper.c:666
+msgid "--write-terms requires two arguments"
msgstr ""
-#: builtin/fsck.c:678
-msgid "show verbose names for reachable objects"
+#: builtin/bisect--helper.c:670
+msgid "--bisect-clean-state requires no arguments"
msgstr ""
-#: builtin/fsck.c:742
-msgid "Checking objects"
+#: builtin/bisect--helper.c:677
+msgid "--bisect-reset requires either no argument or a commit"
msgstr ""
-#: builtin/gc.c:27
-msgid "git gc [<options>]"
+#: builtin/bisect--helper.c:681
+msgid "--bisect-write requires either 4 or 5 arguments"
msgstr ""
-#: builtin/gc.c:80
-#, c-format
-msgid "Failed to fstat %s: %s"
+#: builtin/bisect--helper.c:687
+msgid "--check-and-set-terms requires 3 arguments"
msgstr ""
-#: builtin/gc.c:312
-#, c-format
-msgid "Can't stat %s"
+#: builtin/bisect--helper.c:693
+msgid "--bisect-next-check requires 2 or 3 arguments"
msgstr ""
-#: builtin/gc.c:321
-#, c-format
-msgid ""
-"The last gc run reported the following. Please correct the root cause\n"
-"and remove %s.\n"
-"Automatic cleanup will not be performed until the file is removed.\n"
-"\n"
-"%s"
+#: builtin/bisect--helper.c:699
+msgid "--bisect-terms requires 0 or 1 argument"
msgstr ""
-#: builtin/gc.c:360
-msgid "prune unreferenced objects"
+#: builtin/blame.c:32
+msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
msgstr ""
-#: builtin/gc.c:362
-msgid "be more thorough (increased runtime)"
+#: builtin/blame.c:37
+msgid "<rev-opts> are documented in git-rev-list(1)"
msgstr ""
-#: builtin/gc.c:363
-msgid "enable auto-gc mode"
+#: builtin/blame.c:407
+#, c-format
+msgid "expecting a color: %s"
msgstr ""
-#: builtin/gc.c:366
-msgid "force running gc even if there may be another gc running"
+#: builtin/blame.c:414
+msgid "must end with a color"
msgstr ""
-#: builtin/gc.c:384
+#: builtin/blame.c:701
#, c-format
-msgid "Failed to parse gc.logexpiry value %s"
+msgid "invalid color '%s' in color.blame.repeatedLines"
msgstr ""
-#: builtin/gc.c:412
-#, c-format
-msgid "Auto packing the repository in background for optimum performance.\n"
+#: builtin/blame.c:719
+msgid "invalid value for blame.coloring"
msgstr ""
-#: builtin/gc.c:414
-#, c-format
-msgid "Auto packing the repository for optimum performance.\n"
+#: builtin/blame.c:794
+msgid "Show blame entries as we find them, incrementally"
msgstr ""
-#: builtin/gc.c:415
-#, c-format
-msgid "See \"git help gc\" for manual housekeeping.\n"
+#: builtin/blame.c:795
+msgid "Show blank SHA-1 for boundary commits (Default: off)"
msgstr ""
-#: builtin/gc.c:440
-#, c-format
-msgid ""
-"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
+#: builtin/blame.c:796
+msgid "Do not treat root commits as boundaries (Default: off)"
msgstr ""
-#: builtin/gc.c:487
-msgid ""
-"There are too many unreachable loose objects; run 'git prune' to remove them."
+#: builtin/blame.c:797
+msgid "Show work cost statistics"
msgstr ""
-#: builtin/grep.c:27
-msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
+#: builtin/blame.c:798
+msgid "Force progress reporting"
msgstr ""
-#: builtin/grep.c:225
-#, c-format
-msgid "grep: failed to create thread: %s"
+#: builtin/blame.c:799
+msgid "Show output score for blame entries"
msgstr ""
-#: builtin/grep.c:283
-#, c-format
-msgid "invalid number of threads specified (%d) for %s"
+#: builtin/blame.c:800
+msgid "Show original filename (Default: auto)"
msgstr ""
-#. TRANSLATORS: %s is the configuration
-#. variable for tweaking threads, currently
-#. grep.threads
-#.
-#: builtin/grep.c:292 builtin/index-pack.c:1523 builtin/index-pack.c:1712
-#, c-format
-msgid "no threads support, ignoring %s"
+#: builtin/blame.c:801
+msgid "Show original linenumber (Default: off)"
msgstr ""
-#: builtin/grep.c:460 builtin/grep.c:580 builtin/grep.c:622
-#, c-format
-msgid "unable to read tree (%s)"
+#: builtin/blame.c:802
+msgid "Show in a format designed for machine consumption"
msgstr ""
-#: builtin/grep.c:637
-#, c-format
-msgid "unable to grep from object of type %s"
+#: builtin/blame.c:803
+msgid "Show porcelain format with per-line commit information"
msgstr ""
-#: builtin/grep.c:703
-#, c-format
-msgid "switch `%c' expects a numerical value"
+#: builtin/blame.c:804
+msgid "Use the same output mode as git-annotate (Default: off)"
msgstr ""
-#: builtin/grep.c:790
-msgid "search in index instead of in the work tree"
+#: builtin/blame.c:805
+msgid "Show raw timestamp (Default: off)"
msgstr ""
-#: builtin/grep.c:792
-msgid "find in contents not managed by git"
+#: builtin/blame.c:806
+msgid "Show long commit SHA1 (Default: off)"
msgstr ""
-#: builtin/grep.c:794
-msgid "search in both tracked and untracked files"
+#: builtin/blame.c:807
+msgid "Suppress author name and timestamp (Default: off)"
msgstr ""
-#: builtin/grep.c:796
-msgid "ignore files specified via '.gitignore'"
+#: builtin/blame.c:808
+msgid "Show author email instead of name (Default: off)"
msgstr ""
-#: builtin/grep.c:798
-msgid "recursively search in each submodule"
+#: builtin/blame.c:809
+msgid "Ignore whitespace differences"
msgstr ""
-#: builtin/grep.c:801
-msgid "show non-matching lines"
+#: builtin/blame.c:810
+msgid "color redundant metadata from previous line differently"
msgstr ""
-#: builtin/grep.c:803
-msgid "case insensitive matching"
+#: builtin/blame.c:811
+msgid "color lines by age"
msgstr ""
-#: builtin/grep.c:805
-msgid "match patterns only at word boundaries"
+#: builtin/blame.c:818
+msgid "Use an experimental heuristic to improve diffs"
msgstr ""
-#: builtin/grep.c:807
-msgid "process binary files as text"
+#: builtin/blame.c:820
+msgid "Spend extra cycles to find better match"
msgstr ""
-#: builtin/grep.c:809
-msgid "don't match patterns in binary files"
+#: builtin/blame.c:821
+msgid "Use revisions from <file> instead of calling git-rev-list"
msgstr ""
-#: builtin/grep.c:812
-msgid "process binary files with textconv filters"
+#: builtin/blame.c:822
+msgid "Use <file>'s contents as the final image"
msgstr ""
-#: builtin/grep.c:814
-msgid "descend at most <depth> levels"
+#: builtin/blame.c:823 builtin/blame.c:824
+msgid "score"
msgstr ""
-#: builtin/grep.c:818
-msgid "use extended POSIX regular expressions"
+#: builtin/blame.c:823
+msgid "Find line copies within and across files"
msgstr ""
-#: builtin/grep.c:821
-msgid "use basic POSIX regular expressions (default)"
+#: builtin/blame.c:824
+msgid "Find line movements within and across files"
msgstr ""
-#: builtin/grep.c:824
-msgid "interpret patterns as fixed strings"
+#: builtin/blame.c:825
+msgid "n,m"
msgstr ""
-#: builtin/grep.c:827
-msgid "use Perl-compatible regular expressions"
+#: builtin/blame.c:825
+msgid "Process only line range n,m, counting from 1"
msgstr ""
-#: builtin/grep.c:830
-msgid "show line numbers"
+#: builtin/blame.c:876
+msgid "--progress can't be used with --incremental or porcelain formats"
msgstr ""
-#: builtin/grep.c:831
-msgid "don't show filenames"
+#. 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/grep.c:832
-msgid "show filenames"
-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/grep.c:834
-msgid "show filenames relative to top directory"
+#: builtin/blame.c:1077
+msgid "Blaming lines"
msgstr ""
-#: builtin/grep.c:836
-msgid "show only filenames instead of matching lines"
+#: builtin/branch.c:29
+msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
msgstr ""
-#: builtin/grep.c:838
-msgid "synonym for --files-with-matches"
+#: builtin/branch.c:30
+msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
msgstr ""
-#: builtin/grep.c:841
-msgid "show only the names of files without match"
+#: builtin/branch.c:31
+msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
msgstr ""
-#: builtin/grep.c:843
-msgid "print NUL after filenames"
-msgstr ""
-
-#: builtin/grep.c:846
-msgid "show the number of matches instead of matching lines"
+#: builtin/branch.c:32
+msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
msgstr ""
-#: builtin/grep.c:847
-msgid "highlight matches"
+#: builtin/branch.c:33
+msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
msgstr ""
-#: builtin/grep.c:849
-msgid "print empty line between matches from different files"
+#: builtin/branch.c:34
+msgid "git branch [<options>] [-r | -a] [--points-at]"
msgstr ""
-#: builtin/grep.c:851
-msgid "show filename only once above matches from same file"
+#: builtin/branch.c:35
+msgid "git branch [<options>] [-r | -a] [--format]"
msgstr ""
-#: builtin/grep.c:854
-msgid "show <n> context lines before and after matches"
+#: 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/grep.c:857
-msgid "show <n> context lines before matches"
+#: 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/grep.c:859
-msgid "show <n> context lines after matches"
+#: builtin/branch.c:169
+#, c-format
+msgid "Couldn't look up commit object for '%s'"
msgstr ""
-#: builtin/grep.c:861
-msgid "use <n> worker threads"
+#: 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/grep.c:862
-msgid "shortcut for -C NUM"
+#: builtin/branch.c:186
+msgid "Update of config-file failed"
msgstr ""
-#: builtin/grep.c:865
-msgid "show a line with the function name before matches"
+#: builtin/branch.c:217
+msgid "cannot use -a with -d"
msgstr ""
-#: builtin/grep.c:867
-msgid "show the surrounding function"
+#: builtin/branch.c:223
+msgid "Couldn't look up commit object for HEAD"
msgstr ""
-#: builtin/grep.c:870
-msgid "read patterns from file"
+#: builtin/branch.c:237
+#, c-format
+msgid "Cannot delete branch '%s' checked out at '%s'"
msgstr ""
-#: builtin/grep.c:872
-msgid "match <pattern>"
+#: builtin/branch.c:252
+#, c-format
+msgid "remote-tracking branch '%s' not found."
msgstr ""
-#: builtin/grep.c:874
-msgid "combine patterns specified with -e"
+#: builtin/branch.c:253
+#, c-format
+msgid "branch '%s' not found."
msgstr ""
-#: builtin/grep.c:886
-msgid "indicate hit with exit status without output"
+#: builtin/branch.c:268
+#, c-format
+msgid "Error deleting remote-tracking branch '%s'"
msgstr ""
-#: builtin/grep.c:888
-msgid "show only matches from files that match all patterns"
+#: builtin/branch.c:269
+#, c-format
+msgid "Error deleting branch '%s'"
msgstr ""
-#: builtin/grep.c:890
-msgid "show parse tree for grep expression"
+#: builtin/branch.c:276
+#, c-format
+msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr ""
-#: builtin/grep.c:894
-msgid "pager"
+#: builtin/branch.c:277
+#, c-format
+msgid "Deleted branch %s (was %s).\n"
msgstr ""
-#: builtin/grep.c:894
-msgid "show matching files in the pager"
+#: builtin/branch.c:421 builtin/tag.c:60
+msgid "unable to parse format string"
msgstr ""
-#: builtin/grep.c:898
-msgid "allow calling of grep(1) (ignored by this build)"
+#: builtin/branch.c:452
+msgid "could not resolve HEAD"
msgstr ""
-#: builtin/grep.c:962
-msgid "no pattern given."
+#: builtin/branch.c:458
+#, c-format
+msgid "HEAD (%s) points outside of refs/heads/"
msgstr ""
-#: builtin/grep.c:994
-msgid "--no-index or --untracked cannot be used with revs"
+#: builtin/branch.c:473
+#, c-format
+msgid "Branch %s is being rebased at %s"
msgstr ""
-#: builtin/grep.c:1001
+#: builtin/branch.c:477
#, c-format
-msgid "unable to resolve revision: %s"
+msgid "Branch %s is being bisected at %s"
msgstr ""
-#: builtin/grep.c:1036 builtin/index-pack.c:1519
-#, c-format
-msgid "invalid number of threads specified (%d)"
+#: builtin/branch.c:494
+msgid "cannot copy the current branch while not on any."
msgstr ""
-#: builtin/grep.c:1041
-msgid "no threads support, ignoring --threads"
+#: builtin/branch.c:496
+msgid "cannot rename the current branch while not on any."
msgstr ""
-#: builtin/grep.c:1065
-msgid "--open-files-in-pager only works on the worktree"
+#: builtin/branch.c:507
+#, c-format
+msgid "Invalid branch name: '%s'"
msgstr ""
-#: builtin/grep.c:1088
-msgid "option not supported with --recurse-submodules."
+#: builtin/branch.c:534
+msgid "Branch rename failed"
msgstr ""
-#: builtin/grep.c:1094
-msgid "--cached or --untracked cannot be used with --no-index."
+#: builtin/branch.c:536
+msgid "Branch copy failed"
msgstr ""
-#: builtin/grep.c:1100
-msgid "--[no-]exclude-standard cannot be used for tracked contents."
+#: builtin/branch.c:540
+#, c-format
+msgid "Created a copy of a misnamed branch '%s'"
msgstr ""
-#: builtin/grep.c:1108
-msgid "both --cached and trees are given."
+#: builtin/branch.c:543
+#, c-format
+msgid "Renamed a misnamed branch '%s' away"
msgstr ""
-#: builtin/hash-object.c:83
-msgid ""
-"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
-"[--] <file>..."
+#: builtin/branch.c:549
+#, c-format
+msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr ""
-#: builtin/hash-object.c:84
-msgid "git hash-object --stdin-paths"
+#: builtin/branch.c:558
+msgid "Branch is renamed, but update of config-file failed"
msgstr ""
-#: builtin/hash-object.c:96
-msgid "type"
+#: builtin/branch.c:560
+msgid "Branch is copied, but update of config-file failed"
msgstr ""
-#: builtin/hash-object.c:96
-msgid "object type"
+#: 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/hash-object.c:97
-msgid "write the object into the object database"
+#: builtin/branch.c:610
+msgid "Generic options"
msgstr ""
-#: builtin/hash-object.c:99
-msgid "read the object from stdin"
+#: builtin/branch.c:612
+msgid "show hash and subject, give twice for upstream branch"
msgstr ""
-#: builtin/hash-object.c:101
-msgid "store file as is without filters"
+#: builtin/branch.c:613
+msgid "suppress informational messages"
msgstr ""
-#: builtin/hash-object.c:102
-msgid ""
-"just hash any random garbage to create corrupt objects for debugging Git"
+#: builtin/branch.c:614
+msgid "set up tracking mode (see git-pull(1))"
msgstr ""
-#: builtin/hash-object.c:103
-msgid "process file as it were from this path"
+#: builtin/branch.c:616
+msgid "do not use"
msgstr ""
-#: builtin/help.c:43
-msgid "print all available commands"
+#: builtin/branch.c:618 builtin/rebase.c:485
+msgid "upstream"
msgstr ""
-#: builtin/help.c:44
-msgid "exclude guides"
+#: builtin/branch.c:618
+msgid "change the upstream info"
msgstr ""
-#: builtin/help.c:45
-msgid "print list of useful guides"
+#: builtin/branch.c:619
+msgid "Unset the upstream info"
msgstr ""
-#: builtin/help.c:46
-msgid "show man page"
+#: builtin/branch.c:620
+msgid "use colored output"
msgstr ""
-#: builtin/help.c:47
-msgid "show manual in web browser"
+#: builtin/branch.c:621
+msgid "act on remote-tracking branches"
msgstr ""
-#: builtin/help.c:49
-msgid "show info page"
+#: builtin/branch.c:623 builtin/branch.c:625
+msgid "print only branches that contain the commit"
msgstr ""
-#: builtin/help.c:55
-msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
+#: builtin/branch.c:624 builtin/branch.c:626
+msgid "print only branches that don't contain the commit"
msgstr ""
-#: builtin/help.c:67
-#, c-format
-msgid "unrecognized help format '%s'"
+#: builtin/branch.c:629
+msgid "Specific git-branch actions:"
msgstr ""
-#: builtin/help.c:94
-msgid "Failed to start emacsclient."
+#: builtin/branch.c:630
+msgid "list both remote-tracking and local branches"
msgstr ""
-#: builtin/help.c:107
-msgid "Failed to parse emacsclient version."
+#: builtin/branch.c:632
+msgid "delete fully merged branch"
msgstr ""
-#: builtin/help.c:115
-#, c-format
-msgid "emacsclient version '%d' too old (< 22)."
+#: builtin/branch.c:633
+msgid "delete branch (even if not merged)"
msgstr ""
-#: builtin/help.c:133 builtin/help.c:155 builtin/help.c:165 builtin/help.c:173
-#, c-format
-msgid "failed to exec '%s'"
+#: builtin/branch.c:634
+msgid "move/rename a branch and its reflog"
msgstr ""
-#: builtin/help.c:211
-#, c-format
-msgid ""
-"'%s': path for unsupported man viewer.\n"
-"Please consider using 'man.<tool>.cmd' instead."
+#: builtin/branch.c:635
+msgid "move/rename a branch, even if target exists"
msgstr ""
-#: builtin/help.c:223
-#, c-format
-msgid ""
-"'%s': cmd for supported man viewer.\n"
-"Please consider using 'man.<tool>.path' instead."
+#: builtin/branch.c:636
+msgid "copy a branch and its reflog"
msgstr ""
-#: builtin/help.c:340
-#, c-format
-msgid "'%s': unknown man viewer."
+#: builtin/branch.c:637
+msgid "copy a branch, even if target exists"
msgstr ""
-#: builtin/help.c:357
-msgid "no man viewer handled the request"
+#: builtin/branch.c:638
+msgid "list branch names"
msgstr ""
-#: builtin/help.c:365
-msgid "no info viewer handled the request"
+#: builtin/branch.c:639
+msgid "show current branch name"
msgstr ""
-#: builtin/help.c:407
-msgid "Defining attributes per path"
+#: builtin/branch.c:640
+msgid "create the branch's reflog"
msgstr ""
-#: builtin/help.c:408
-msgid "Everyday Git With 20 Commands Or So"
+#: builtin/branch.c:642
+msgid "edit the description for the branch"
msgstr ""
-#: builtin/help.c:409
-msgid "A Git glossary"
+#: builtin/branch.c:643
+msgid "force creation, move/rename, deletion"
msgstr ""
-#: builtin/help.c:410
-msgid "Specifies intentionally untracked files to ignore"
+#: builtin/branch.c:644
+msgid "print only branches that are merged"
msgstr ""
-#: builtin/help.c:411
-msgid "Defining submodule properties"
+#: builtin/branch.c:645
+msgid "print only branches that are not merged"
msgstr ""
-#: builtin/help.c:412
-msgid "Specifying revisions and ranges for Git"
+#: builtin/branch.c:646
+msgid "list branches in columns"
msgstr ""
-#: builtin/help.c:413
-msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
+#: 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/help.c:414
-msgid "An overview of recommended workflows with Git"
+#: builtin/branch.c:650
+msgid "print only branches of the object"
msgstr ""
-#: builtin/help.c:426
-msgid "The common Git guides are:\n"
+#: builtin/branch.c:652 builtin/for-each-ref.c:48 builtin/tag.c:434
+msgid "sorting and filtering are case insensitive"
msgstr ""
-#: builtin/help.c:444
-#, c-format
-msgid "'%s' is aliased to '%s'"
+#: builtin/branch.c:653 builtin/for-each-ref.c:38 builtin/tag.c:432
+#: builtin/verify-tag.c:39
+msgid "format to use for the output"
msgstr ""
-#: builtin/help.c:466 builtin/help.c:483
-#, c-format
-msgid "usage: %s%s"
+#: builtin/branch.c:676 builtin/clone.c:748
+msgid "HEAD not found below refs/heads!"
msgstr ""
-#: builtin/index-pack.c:157
-#, c-format
-msgid "unable to open %s"
+#: builtin/branch.c:700
+msgid "--column and --verbose are incompatible"
msgstr ""
-#: builtin/index-pack.c:207
-#, c-format
-msgid "object type mismatch at %s"
+#: builtin/branch.c:715 builtin/branch.c:769 builtin/branch.c:778
+msgid "branch name required"
msgstr ""
-#: builtin/index-pack.c:227
-#, c-format
-msgid "did not receive expected object %s"
+#: builtin/branch.c:745
+msgid "Cannot give description to detached HEAD"
msgstr ""
-#: builtin/index-pack.c:230
-#, c-format
-msgid "object %s: expected type %s, found %s"
+#: builtin/branch.c:750
+msgid "cannot edit description of more than one branch"
msgstr ""
-#: builtin/index-pack.c:272
+#: builtin/branch.c:757
#, c-format
-msgid "cannot fill %d byte"
-msgid_plural "cannot fill %d bytes"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/index-pack.c:282
-msgid "early EOF"
+msgid "No commit on branch '%s' yet."
msgstr ""
-#: builtin/index-pack.c:283
-msgid "read error on input"
+#: builtin/branch.c:760
+#, c-format
+msgid "No branch named '%s'."
msgstr ""
-#: builtin/index-pack.c:295
-msgid "used more bytes than were available"
+#: builtin/branch.c:775
+msgid "too many branches for a copy operation"
msgstr ""
-#: builtin/index-pack.c:302
-msgid "pack too large for current definition of off_t"
+#: builtin/branch.c:784
+msgid "too many arguments for a rename operation"
msgstr ""
-#: builtin/index-pack.c:305 builtin/unpack-objects.c:93
-msgid "pack exceeds maximum allowed size"
+#: builtin/branch.c:789
+msgid "too many arguments to set new upstream"
msgstr ""
-#: builtin/index-pack.c:320
+#: builtin/branch.c:793
#, c-format
-msgid "unable to create '%s'"
+msgid ""
+"could not set upstream of HEAD to %s when it does not point to any branch."
msgstr ""
-#: builtin/index-pack.c:326
+#: builtin/branch.c:796 builtin/branch.c:819
#, c-format
-msgid "cannot open packfile '%s'"
+msgid "no such branch '%s'"
msgstr ""
-#: builtin/index-pack.c:340
-msgid "pack signature mismatch"
+#: builtin/branch.c:800
+#, c-format
+msgid "branch '%s' does not exist"
msgstr ""
-#: builtin/index-pack.c:342
-#, c-format
-msgid "pack version %<PRIu32> unsupported"
+#: builtin/branch.c:813
+msgid "too many arguments to unset upstream"
msgstr ""
-#: builtin/index-pack.c:360
-#, c-format
-msgid "pack has bad object at offset %<PRIuMAX>: %s"
+#: builtin/branch.c:817
+msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr ""
-#: builtin/index-pack.c:481
+#: builtin/branch.c:823
#, c-format
-msgid "inflate returned %d"
+msgid "Branch '%s' has no upstream information"
msgstr ""
-#: builtin/index-pack.c:530
-msgid "offset value overflow for delta base object"
+#: builtin/branch.c:833
+msgid "-a and -r options to 'git branch' do not make sense with a branch name"
msgstr ""
-#: builtin/index-pack.c:538
-msgid "delta base offset is out of bound"
+#: builtin/branch.c:836
+msgid ""
+"the '--set-upstream' option is no longer supported. Please use '--track' or "
+"'--set-upstream-to' instead."
msgstr ""
-#: builtin/index-pack.c:546
+#: builtin/bundle.c:45
#, c-format
-msgid "unknown object type %d"
+msgid "%s is okay\n"
msgstr ""
-#: builtin/index-pack.c:577
-msgid "cannot pread pack file"
+#: builtin/bundle.c:58
+msgid "Need a repository to create a bundle."
msgstr ""
-#: builtin/index-pack.c:579
-#, 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/bundle.c:62
+msgid "Need a repository to unbundle."
+msgstr ""
-#: builtin/index-pack.c:605
-msgid "serious inflate inconsistency"
+#: 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/index-pack.c:750 builtin/index-pack.c:756 builtin/index-pack.c:779
-#: builtin/index-pack.c:818 builtin/index-pack.c:827
-#, c-format
-msgid "SHA1 COLLISION FOUND WITH %s !"
+#: builtin/cat-file.c:594
+msgid ""
+"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
+"filters]"
msgstr ""
-#: builtin/index-pack.c:753 builtin/pack-objects.c:182
-#: builtin/pack-objects.c:276
-#, c-format
-msgid "unable to read %s"
+#: builtin/cat-file.c:615
+msgid "only one batch option may be specified"
msgstr ""
-#: builtin/index-pack.c:816
-#, c-format
-msgid "cannot read existing object info %s"
+#: builtin/cat-file.c:633
+msgid "<type> can be one of: blob, tree, commit, tag"
msgstr ""
-#: builtin/index-pack.c:824
-#, c-format
-msgid "cannot read existing object %s"
+#: builtin/cat-file.c:634
+msgid "show object type"
msgstr ""
-#: builtin/index-pack.c:838
-#, c-format
-msgid "invalid blob object %s"
+#: builtin/cat-file.c:635
+msgid "show object size"
msgstr ""
-#: builtin/index-pack.c:853
-#, c-format
-msgid "invalid %s"
+#: builtin/cat-file.c:637
+msgid "exit with zero when there's no error"
msgstr ""
-#: builtin/index-pack.c:856
-msgid "Error in object"
+#: builtin/cat-file.c:638
+msgid "pretty-print object's content"
msgstr ""
-#: builtin/index-pack.c:858
-#, c-format
-msgid "Not all child objects of %s are reachable"
+#: builtin/cat-file.c:640
+msgid "for blob objects, run textconv on object's content"
msgstr ""
-#: builtin/index-pack.c:930 builtin/index-pack.c:961
-msgid "failed to apply delta"
+#: builtin/cat-file.c:642
+msgid "for blob objects, run filters on object's content"
msgstr ""
-#: builtin/index-pack.c:1131
-msgid "Receiving objects"
+#: builtin/cat-file.c:643 git-submodule.sh:936
+msgid "blob"
msgstr ""
-#: builtin/index-pack.c:1131
-msgid "Indexing objects"
+#: builtin/cat-file.c:644
+msgid "use a specific path for --textconv/--filters"
msgstr ""
-#: builtin/index-pack.c:1165
-msgid "pack is corrupted (SHA1 mismatch)"
+#: builtin/cat-file.c:646
+msgid "allow -s and -t to work with broken/corrupt objects"
msgstr ""
-#: builtin/index-pack.c:1170
-msgid "cannot fstat packfile"
+#: builtin/cat-file.c:647
+msgid "buffer --batch output"
msgstr ""
-#: builtin/index-pack.c:1173
-msgid "pack has junk at the end"
+#: builtin/cat-file.c:649
+msgid "show info and content of objects fed from the standard input"
msgstr ""
-#: builtin/index-pack.c:1185
-msgid "confusion beyond insanity in parse_pack_objects()"
+#: builtin/cat-file.c:653
+msgid "show info about objects fed from the standard input"
msgstr ""
-#: builtin/index-pack.c:1208
-msgid "Resolving deltas"
+#: builtin/cat-file.c:657
+msgid "follow in-tree symlinks (used with --batch or --batch-check)"
msgstr ""
-#: builtin/index-pack.c:1219
-#, c-format
-msgid "unable to create thread: %s"
+#: builtin/cat-file.c:659
+msgid "show all objects with --batch or --batch-check"
msgstr ""
-#: builtin/index-pack.c:1261
-msgid "confusion beyond insanity"
+#: builtin/cat-file.c:661
+msgid "do not order --batch-all-objects output"
msgstr ""
-#: builtin/index-pack.c:1267
-#, c-format
-msgid "completed with %d local object"
-msgid_plural "completed with %d local objects"
-msgstr[0] ""
-msgstr[1] ""
+#: builtin/check-attr.c:13
+msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
+msgstr ""
-#: builtin/index-pack.c:1279
-#, c-format
-msgid "Unexpected tail checksum for %s (disk corruption?)"
+#: builtin/check-attr.c:14
+msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
msgstr ""
-#: builtin/index-pack.c:1283
-#, c-format
-msgid "pack has %d unresolved delta"
-msgid_plural "pack has %d unresolved deltas"
-msgstr[0] ""
-msgstr[1] ""
+#: builtin/check-attr.c:21
+msgid "report all attributes set on file"
+msgstr ""
-#: builtin/index-pack.c:1307
-#, c-format
-msgid "unable to deflate appended object (%d)"
+#: builtin/check-attr.c:22
+msgid "use .gitattributes only from the index"
msgstr ""
-#: builtin/index-pack.c:1383
-#, c-format
-msgid "local object %s is corrupt"
+#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:102
+msgid "read file names from stdin"
msgstr ""
-#: builtin/index-pack.c:1397
-#, c-format
-msgid "packfile name '%s' does not end with '.pack'"
+#: builtin/check-attr.c:25 builtin/check-ignore.c:27
+msgid "terminate input and output records by a NUL character"
msgstr ""
-#: builtin/index-pack.c:1422
-#, c-format
-msgid "cannot write %s file '%s'"
+#: builtin/check-ignore.c:21 builtin/checkout.c:1355 builtin/gc.c:538
+#: builtin/worktree.c:499
+msgid "suppress progress reporting"
msgstr ""
-#: builtin/index-pack.c:1430
-#, c-format
-msgid "cannot close written %s file '%s'"
+#: builtin/check-ignore.c:29
+msgid "show non-matching input paths"
msgstr ""
-#: builtin/index-pack.c:1454
-msgid "error while closing pack file"
+#: builtin/check-ignore.c:31
+msgid "ignore index when checking"
msgstr ""
-#: builtin/index-pack.c:1468
-msgid "cannot store pack file"
+#: builtin/check-ignore.c:160
+msgid "cannot specify pathnames with --stdin"
msgstr ""
-#: builtin/index-pack.c:1476
-msgid "cannot store index file"
+#: builtin/check-ignore.c:163
+msgid "-z only makes sense with --stdin"
msgstr ""
-#: builtin/index-pack.c:1513
-#, c-format
-msgid "bad pack.indexversion=%<PRIu32>"
+#: builtin/check-ignore.c:165
+msgid "no path specified"
msgstr ""
-#: builtin/index-pack.c:1581
-#, c-format
-msgid "Cannot open existing pack file '%s'"
+#: builtin/check-ignore.c:169
+msgid "--quiet is only valid with a single pathname"
msgstr ""
-#: builtin/index-pack.c:1583
-#, c-format
-msgid "Cannot open existing pack idx file for '%s'"
+#: builtin/check-ignore.c:171
+msgid "cannot have both --quiet and --verbose"
msgstr ""
-#: builtin/index-pack.c:1631
-#, c-format
-msgid "non delta: %d object"
-msgid_plural "non delta: %d objects"
-msgstr[0] ""
-msgstr[1] ""
+#: builtin/check-ignore.c:174
+msgid "--non-matching is only valid with --verbose"
+msgstr ""
-#: builtin/index-pack.c:1638
-#, c-format
-msgid "chain length = %d: %lu object"
-msgid_plural "chain length = %d: %lu objects"
-msgstr[0] ""
-msgstr[1] ""
+#: builtin/check-mailmap.c:9
+msgid "git check-mailmap [<options>] <contact>..."
+msgstr ""
-#: builtin/index-pack.c:1675
-msgid "Cannot come back to cwd"
+#: builtin/check-mailmap.c:14
+msgid "also read contacts from stdin"
msgstr ""
-#: builtin/index-pack.c:1724 builtin/index-pack.c:1727
-#: builtin/index-pack.c:1743 builtin/index-pack.c:1747
+#: builtin/check-mailmap.c:25
#, c-format
-msgid "bad %s"
+msgid "unable to parse contact: %s"
msgstr ""
-#: builtin/index-pack.c:1763
-msgid "--fix-thin cannot be used without --stdin"
+#: builtin/check-mailmap.c:48
+msgid "no contacts specified"
msgstr ""
-#: builtin/index-pack.c:1765
-msgid "--stdin requires a git repository"
+#: builtin/checkout-index.c:131
+msgid "git checkout-index [<options>] [--] [<file>...]"
msgstr ""
-#: builtin/index-pack.c:1771
-msgid "--verify with no packfile name given"
+#: builtin/checkout-index.c:148
+msgid "stage should be between 1 and 3 or all"
msgstr ""
-#: builtin/init-db.c:55
-#, c-format
-msgid "cannot stat '%s'"
+#: builtin/checkout-index.c:164
+msgid "check out all files in the index"
msgstr ""
-#: builtin/init-db.c:61
-#, c-format
-msgid "cannot stat template '%s'"
+#: builtin/checkout-index.c:165
+msgid "force overwrite of existing files"
msgstr ""
-#: builtin/init-db.c:66
-#, c-format
-msgid "cannot opendir '%s'"
+#: builtin/checkout-index.c:167
+msgid "no warning for existing files and files not in index"
msgstr ""
-#: builtin/init-db.c:77
-#, c-format
-msgid "cannot readlink '%s'"
+#: builtin/checkout-index.c:169
+msgid "don't checkout new files"
msgstr ""
-#: builtin/init-db.c:79
-#, c-format
-msgid "cannot symlink '%s' '%s'"
+#: builtin/checkout-index.c:171
+msgid "update stat information in the index file"
msgstr ""
-#: builtin/init-db.c:85
-#, c-format
-msgid "cannot copy '%s' to '%s'"
+#: builtin/checkout-index.c:175
+msgid "read list of paths from the standard input"
msgstr ""
-#: builtin/init-db.c:89
-#, c-format
-msgid "ignoring template %s"
+#: builtin/checkout-index.c:177
+msgid "write the content to temporary files"
msgstr ""
-#: builtin/init-db.c:120
-#, c-format
-msgid "templates not found %s"
+#: 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/init-db.c:135
-#, c-format
-msgid "not copying templates from '%s': %s"
+#: builtin/checkout-index.c:179
+msgid "when creating files, prepend <string>"
msgstr ""
-#: builtin/init-db.c:328
-#, c-format
-msgid "unable to handle file type %d"
+#: builtin/checkout-index.c:181
+msgid "copy out the files from named stage"
msgstr ""
-#: builtin/init-db.c:331
-#, c-format
-msgid "unable to move %s to %s"
+#: builtin/checkout.c:32
+msgid "git checkout [<options>] <branch>"
msgstr ""
-#: builtin/init-db.c:348 builtin/init-db.c:351
-#, c-format
-msgid "%s already exists"
+#: builtin/checkout.c:33
+msgid "git checkout [<options>] [<branch>] -- <file>..."
msgstr ""
-#: builtin/init-db.c:404
+#: builtin/checkout.c:151 builtin/checkout.c:190
#, c-format
-msgid "Reinitialized existing shared Git repository in %s%s\n"
+msgid "path '%s' does not have our version"
msgstr ""
-#: builtin/init-db.c:405
+#: builtin/checkout.c:153 builtin/checkout.c:192
#, c-format
-msgid "Reinitialized existing Git repository in %s%s\n"
+msgid "path '%s' does not have their version"
msgstr ""
-#: builtin/init-db.c:409
+#: builtin/checkout.c:169
#, c-format
-msgid "Initialized empty shared Git repository in %s%s\n"
+msgid "path '%s' does not have all necessary versions"
msgstr ""
-#: builtin/init-db.c:410
+#: builtin/checkout.c:219
#, c-format
-msgid "Initialized empty Git repository in %s%s\n"
+msgid "path '%s' does not have necessary versions"
msgstr ""
-#: builtin/init-db.c:458
-msgid ""
-"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
-"shared[=<permissions>]] [<directory>]"
+#: builtin/checkout.c:237
+#, c-format
+msgid "path '%s': cannot merge"
msgstr ""
-#: builtin/init-db.c:481
-msgid "permissions"
+#: builtin/checkout.c:253
+#, c-format
+msgid "Unable to add merge result for '%s'"
msgstr ""
-#: builtin/init-db.c:482
-msgid "specify that the git repository is to be shared amongst several users"
+#: 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/init-db.c:516 builtin/init-db.c:521
+#: builtin/checkout.c:343 builtin/checkout.c:346
#, c-format
-msgid "cannot mkdir %s"
+msgid "'%s' cannot be used with %s"
msgstr ""
-#: builtin/init-db.c:525
+#: builtin/checkout.c:349
#, c-format
-msgid "cannot chdir to %s"
+msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr ""
-#: builtin/init-db.c:546
+#: builtin/checkout.c:396 builtin/checkout.c:403
#, c-format
-msgid ""
-"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
-"dir=<directory>)"
+msgid "path '%s' is unmerged"
msgstr ""
-#: builtin/init-db.c:574
+#: builtin/checkout.c:442
#, c-format
-msgid "Cannot access work tree '%s'"
-msgstr ""
+msgid "Recreated %d merge conflict"
+msgid_plural "Recreated %d merge conflicts"
+msgstr[0] ""
+msgstr[1] ""
-#: builtin/interpret-trailers.c:15
-msgid ""
-"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
-"<token>[(=|:)<value>])...] [<file>...]"
-msgstr ""
+#: builtin/checkout.c:447
+#, c-format
+msgid "Updated %d path from %s"
+msgid_plural "Updated %d paths from %s"
+msgstr[0] ""
+msgstr[1] ""
-#: builtin/interpret-trailers.c:92
-msgid "edit files in place"
-msgstr ""
+#: builtin/checkout.c:454
+#, c-format
+msgid "Updated %d path from the index"
+msgid_plural "Updated %d paths from the index"
+msgstr[0] ""
+msgstr[1] ""
-#: builtin/interpret-trailers.c:93
-msgid "trim empty trailers"
+#: builtin/checkout.c:695
+msgid "you need to resolve your current index first"
msgstr ""
-#: builtin/interpret-trailers.c:96
-msgid "where to place the new trailer"
+#: builtin/checkout.c:744
+#, c-format
+msgid ""
+"cannot continue with staged changes in the following files:\n"
+"%s"
msgstr ""
-#: builtin/interpret-trailers.c:98
-msgid "action if trailer already exists"
+#: builtin/checkout.c:751
+#, c-format
+msgid "staged changes in the following files may be lost: %s"
msgstr ""
-#: builtin/interpret-trailers.c:100
-msgid "action if trailer is missing"
+#: builtin/checkout.c:848
+#, c-format
+msgid "Can not do reflog for '%s': %s\n"
msgstr ""
-#: builtin/interpret-trailers.c:102
-msgid "output only the trailers"
+#: builtin/checkout.c:890
+msgid "HEAD is now at"
msgstr ""
-#: builtin/interpret-trailers.c:103
-msgid "do not apply config rules"
+#: builtin/checkout.c:894 builtin/clone.c:701
+msgid "unable to update HEAD"
msgstr ""
-#: builtin/interpret-trailers.c:104
-msgid "join whitespace-continued values"
+#: builtin/checkout.c:898
+#, c-format
+msgid "Reset branch '%s'\n"
msgstr ""
-#: builtin/interpret-trailers.c:105
-msgid "set parsing options"
+#: builtin/checkout.c:901
+#, c-format
+msgid "Already on '%s'\n"
msgstr ""
-#: builtin/interpret-trailers.c:107
-msgid "trailer"
+#: builtin/checkout.c:905
+#, c-format
+msgid "Switched to and reset branch '%s'\n"
msgstr ""
-#: builtin/interpret-trailers.c:108
-msgid "trailer(s) to add"
+#: builtin/checkout.c:907 builtin/checkout.c:1283
+#, c-format
+msgid "Switched to a new branch '%s'\n"
msgstr ""
-#: builtin/interpret-trailers.c:117
-msgid "--trailer with --only-input does not make sense"
+#: builtin/checkout.c:909
+#, c-format
+msgid "Switched to branch '%s'\n"
msgstr ""
-#: builtin/interpret-trailers.c:127
-msgid "no input file given for in-place editing"
+#: builtin/checkout.c:960
+#, c-format
+msgid " ... and %d more.\n"
msgstr ""
-#: builtin/log.c:48
-msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
-msgstr ""
-
-#: builtin/log.c:49
-msgid "git show [<options>] <object>..."
-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/log.c:93
+#: builtin/checkout.c:985
#, c-format
-msgid "invalid --decorate option: %s"
-msgstr ""
+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/log.c:153
-msgid "suppress diff output"
+#: builtin/checkout.c:1017
+msgid "internal error in revision walk"
msgstr ""
-#: builtin/log.c:154
-msgid "show source"
+#: builtin/checkout.c:1021
+msgid "Previous HEAD position was"
msgstr ""
-#: builtin/log.c:155
-msgid "Use mail map file"
+#: builtin/checkout.c:1052 builtin/checkout.c:1278
+msgid "You are on a branch yet to be born"
msgstr ""
-#: builtin/log.c:157
-msgid "only decorate refs that match <pattern>"
+#: builtin/checkout.c:1173
+#, c-format
+msgid "only one reference expected, %d given."
msgstr ""
-#: builtin/log.c:159
-msgid "do not decorate refs that match <pattern>"
+#: 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/log.c:160
-msgid "decorate options"
+#: builtin/checkout.c:1222 builtin/worktree.c:290 builtin/worktree.c:448
+#, c-format
+msgid "invalid reference: %s"
msgstr ""
-#: builtin/log.c:163
-msgid "Process line range n,m in file, counting from 1"
+#: builtin/checkout.c:1251
+#, c-format
+msgid "reference is not a tree: %s"
msgstr ""
-#: builtin/log.c:259
-#, c-format
-msgid "Final output: %d %s\n"
+#: builtin/checkout.c:1292
+msgid "paths cannot be used with switching branches"
msgstr ""
-#: builtin/log.c:510
+#: builtin/checkout.c:1295 builtin/checkout.c:1299 builtin/checkout.c:1303
#, c-format
-msgid "git show %s: bad file"
+msgid "'%s' cannot be used with switching branches"
msgstr ""
-#: builtin/log.c:525 builtin/log.c:619
+#: builtin/checkout.c:1307 builtin/checkout.c:1310 builtin/checkout.c:1315
+#: builtin/checkout.c:1318
#, c-format
-msgid "Could not read object %s"
+msgid "'%s' cannot be used with '%s'"
msgstr ""
-#: builtin/log.c:643
+#: builtin/checkout.c:1323
#, c-format
-msgid "Unknown type: %d"
+msgid "Cannot switch branch to a non-commit '%s'"
msgstr ""
-#: builtin/log.c:764
-msgid "format.headers without value"
+#: 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/log.c:865
-msgid "name of output directory is too long"
+#: builtin/checkout.c:1357
+msgid "create and checkout a new branch"
msgstr ""
-#: builtin/log.c:881
-#, c-format
-msgid "Cannot open patch file %s"
+#: builtin/checkout.c:1359
+msgid "create/reset and checkout a branch"
msgstr ""
-#: builtin/log.c:898
-msgid "Need exactly one range."
+#: builtin/checkout.c:1360
+msgid "create reflog for new branch"
msgstr ""
-#: builtin/log.c:908
-msgid "Not a range."
+#: builtin/checkout.c:1361 builtin/worktree.c:496
+msgid "detach HEAD at named commit"
msgstr ""
-#: builtin/log.c:1014
-msgid "Cover letter needs email format"
+#: builtin/checkout.c:1362
+msgid "set upstream info for new branch"
msgstr ""
-#: builtin/log.c:1095
-#, c-format
-msgid "insane in-reply-to: %s"
+#: builtin/checkout.c:1364
+msgid "new-branch"
msgstr ""
-#: builtin/log.c:1122
-msgid "git format-patch [<options>] [<since> | <revision-range>]"
+#: builtin/checkout.c:1364
+msgid "new unparented branch"
msgstr ""
-#: builtin/log.c:1172
-msgid "Two output directories?"
+#: builtin/checkout.c:1366
+msgid "checkout our version for unmerged files"
msgstr ""
-#: builtin/log.c:1279 builtin/log.c:1932 builtin/log.c:1934 builtin/log.c:1946
-#, c-format
-msgid "Unknown commit %s"
+#: builtin/checkout.c:1369
+msgid "checkout their version for unmerged files"
msgstr ""
-#: builtin/log.c:1289 builtin/notes.c:887 builtin/tag.c:522
-#, c-format
-msgid "Failed to resolve '%s' as a valid ref."
+#: builtin/checkout.c:1371
+msgid "force checkout (throw away local modifications)"
msgstr ""
-#: builtin/log.c:1294
-msgid "Could not find exact merge base."
+#: builtin/checkout.c:1373
+msgid "perform a 3-way merge with the new branch"
msgstr ""
-#: builtin/log.c:1298
-msgid ""
-"Failed to get upstream, if you want to record base commit automatically,\n"
-"please use git branch --set-upstream-to to track a remote branch.\n"
-"Or you could specify base commit by --base=<base-commit-id> manually."
+#: builtin/checkout.c:1375 builtin/merge.c:284
+msgid "update ignored files (default)"
msgstr ""
-#: builtin/log.c:1318
-msgid "Failed to find exact merge base"
+#: builtin/checkout.c:1377 builtin/log.c:1594 parse-options.h:317
+msgid "style"
msgstr ""
-#: builtin/log.c:1329
-msgid "base commit should be the ancestor of revision list"
+#: builtin/checkout.c:1378
+msgid "conflict style (merge or diff3)"
msgstr ""
-#: builtin/log.c:1333
-msgid "base commit shouldn't be in revision list"
+#: builtin/checkout.c:1381
+msgid "do not limit pathspecs to sparse entries only"
msgstr ""
-#: builtin/log.c:1382
-msgid "cannot get patch id"
+#: builtin/checkout.c:1383
+msgid "do not second guess 'git checkout <no-such-branch>'"
msgstr ""
-#: builtin/log.c:1441
-msgid "use [PATCH n/m] even with a single patch"
+#: builtin/checkout.c:1385
+msgid "do not check if another worktree is holding the given ref"
msgstr ""
-#: builtin/log.c:1444
-msgid "use [PATCH] even with multiple patches"
+#: 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/log.c:1448
-msgid "print patches to standard out"
+#: builtin/checkout.c:1390
+msgid "use overlay mode (default)"
msgstr ""
-#: builtin/log.c:1450
-msgid "generate a cover letter"
+#: builtin/checkout.c:1422
+msgid "-b, -B and --orphan are mutually exclusive"
msgstr ""
-#: builtin/log.c:1452
-msgid "use simple number sequence for output file names"
+#: builtin/checkout.c:1425
+msgid "-p and --overlay are mutually exclusive"
msgstr ""
-#: builtin/log.c:1453
-msgid "sfx"
+#: builtin/checkout.c:1442
+msgid "--track needs a branch name"
msgstr ""
-#: builtin/log.c:1454
-msgid "use <sfx> instead of '.patch'"
+#: builtin/checkout.c:1447
+msgid "missing branch name; try -b"
msgstr ""
-#: builtin/log.c:1456
-msgid "start numbering patches at <n> instead of 1"
+#: builtin/checkout.c:1484
+msgid "invalid path specification"
msgstr ""
-#: builtin/log.c:1458
-msgid "mark the series as Nth re-roll"
+#: builtin/checkout.c:1491
+#, c-format
+msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
msgstr ""
-#: builtin/log.c:1460
-msgid "Use [RFC PATCH] instead of [PATCH]"
+#: builtin/checkout.c:1495
+#, c-format
+msgid "git checkout: --detach does not take a path argument '%s'"
msgstr ""
-#: builtin/log.c:1463
-msgid "Use [<prefix>] instead of [PATCH]"
+#: builtin/checkout.c:1499
+msgid ""
+"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
+"checking out of the index."
msgstr ""
-#: builtin/log.c:1466
-msgid "store resulting files in <dir>"
+#: 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/log.c:1469
-msgid "don't strip/add [PATCH]"
+#: builtin/clean.c:28
+msgid ""
+"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
msgstr ""
-#: builtin/log.c:1472
-msgid "don't output binary diffs"
+#: builtin/clean.c:32
+#, c-format
+msgid "Removing %s\n"
msgstr ""
-#: builtin/log.c:1474
-msgid "output all-zero hash in From header"
+#: builtin/clean.c:33
+#, c-format
+msgid "Would remove %s\n"
msgstr ""
-#: builtin/log.c:1476
-msgid "don't include a patch matching a commit upstream"
+#: builtin/clean.c:34
+#, c-format
+msgid "Skipping repository %s\n"
msgstr ""
-#: builtin/log.c:1478
-msgid "show patch format instead of default (patch + stat)"
+#: builtin/clean.c:35
+#, c-format
+msgid "Would skip repository %s\n"
msgstr ""
-#: builtin/log.c:1480
-msgid "Messaging"
+#: builtin/clean.c:36
+#, c-format
+msgid "failed to remove %s"
msgstr ""
-#: builtin/log.c:1481
-msgid "header"
+#: 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/log.c:1482
-msgid "add email header"
+#: 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/log.c:1483 builtin/log.c:1485
-msgid "email"
+#: builtin/clean.c:519 git-add--interactive.perl:554
+#: git-add--interactive.perl:559
+#, c-format, perl-format
+msgid "Huh (%s)?\n"
msgstr ""
-#: builtin/log.c:1483
-msgid "add To: header"
+#: builtin/clean.c:661
+#, c-format
+msgid "Input ignore patterns>> "
msgstr ""
-#: builtin/log.c:1485
-msgid "add Cc: header"
+#: builtin/clean.c:698
+#, c-format
+msgid "WARNING: Cannot find items matched by: %s"
msgstr ""
-#: builtin/log.c:1487
-msgid "ident"
+#: builtin/clean.c:719
+msgid "Select items to delete"
msgstr ""
-#: builtin/log.c:1488
-msgid "set From address to <ident> (or committer ident if absent)"
+#. TRANSLATORS: Make sure to keep [y/N] as is
+#: builtin/clean.c:760
+#, c-format
+msgid "Remove %s [y/N]? "
msgstr ""
-#: builtin/log.c:1490
-msgid "message-id"
+#: builtin/clean.c:785 git-add--interactive.perl:1717
+#, c-format
+msgid "Bye.\n"
msgstr ""
-#: builtin/log.c:1491
-msgid "make first mail a reply to <message-id>"
+#: 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/log.c:1492 builtin/log.c:1495
-msgid "boundary"
+#: builtin/clean.c:820 git-add--interactive.perl:1793
+msgid "*** Commands ***"
msgstr ""
-#: builtin/log.c:1493
-msgid "attach the patch"
+#: builtin/clean.c:821 git-add--interactive.perl:1790
+msgid "What now"
msgstr ""
-#: builtin/log.c:1496
-msgid "inline the patch"
-msgstr ""
+#: builtin/clean.c:829
+msgid "Would remove the following item:"
+msgid_plural "Would remove the following items:"
+msgstr[0] ""
+msgstr[1] ""
-#: builtin/log.c:1500
-msgid "enable message threading, styles: shallow, deep"
+#: builtin/clean.c:845
+msgid "No more files to clean, exiting."
msgstr ""
-#: builtin/log.c:1502
-msgid "signature"
+#: builtin/clean.c:907
+msgid "do not print names of files removed"
msgstr ""
-#: builtin/log.c:1503
-msgid "add a signature"
+#: builtin/clean.c:909
+msgid "force"
msgstr ""
-#: builtin/log.c:1504
-msgid "base-commit"
+#: builtin/clean.c:910
+msgid "interactive cleaning"
msgstr ""
-#: builtin/log.c:1505
-msgid "add prerequisite tree info to the patch series"
+#: builtin/clean.c:912
+msgid "remove whole directories"
msgstr ""
-#: builtin/log.c:1507
-msgid "add a signature from a file"
+#: 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/log.c:1508
-msgid "don't print the patch filenames"
+#: builtin/clean.c:914
+msgid "add <pattern> to ignore rules"
msgstr ""
-#: builtin/log.c:1510
-msgid "show progress while generating patches"
+#: builtin/clean.c:915
+msgid "remove ignored files, too"
msgstr ""
-#: builtin/log.c:1585
-#, c-format
-msgid "invalid ident line: %s"
+#: builtin/clean.c:917
+msgid "remove only ignored files"
msgstr ""
-#: builtin/log.c:1600
-msgid "-n and -k are mutually exclusive."
+#: builtin/clean.c:935
+msgid "-x and -X cannot be used together"
msgstr ""
-#: builtin/log.c:1602
-msgid "--subject-prefix/--rfc and -k are mutually exclusive."
+#: builtin/clean.c:939
+msgid ""
+"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
+"clean"
msgstr ""
-#: builtin/log.c:1610
-msgid "--name-only does not make sense"
+#: builtin/clean.c:942
+msgid ""
+"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
+"refusing to clean"
msgstr ""
-#: builtin/log.c:1612
-msgid "--name-status does not make sense"
+#: builtin/clone.c:44
+msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr ""
-#: builtin/log.c:1614
-msgid "--check does not make sense"
+#: builtin/clone.c:90
+msgid "don't create a checkout"
msgstr ""
-#: builtin/log.c:1646
-msgid "standard output, or directory, which one?"
+#: builtin/clone.c:91 builtin/clone.c:93 builtin/init-db.c:489
+msgid "create a bare repository"
msgstr ""
-#: builtin/log.c:1648
-#, c-format
-msgid "Could not create directory '%s'"
+#: builtin/clone.c:95
+msgid "create a mirror repository (implies bare)"
msgstr ""
-#: builtin/log.c:1741
-#, c-format
-msgid "unable to read signature file '%s'"
+#: builtin/clone.c:97
+msgid "to clone from a local repository"
msgstr ""
-#: builtin/log.c:1773
-msgid "Generating patches"
+#: builtin/clone.c:99
+msgid "don't use local hardlinks, always copy"
msgstr ""
-#: builtin/log.c:1817
-msgid "Failed to create output files"
+#: builtin/clone.c:101
+msgid "setup as shared repository"
msgstr ""
-#: builtin/log.c:1867
-msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
+#: builtin/clone.c:104
+msgid "pathspec"
msgstr ""
-#: builtin/log.c:1921
-#, c-format
-msgid ""
-"Could not find a tracked remote branch, please specify <upstream> manually.\n"
+#: builtin/clone.c:104
+msgid "initialize submodules in the clone"
msgstr ""
-#: builtin/ls-files.c:468
-msgid "git ls-files [<options>] [<file>...]"
+#: builtin/clone.c:107
+msgid "number of submodules cloned in parallel"
msgstr ""
-#: builtin/ls-files.c:517
-msgid "identify the file status with tags"
+#: builtin/clone.c:108 builtin/init-db.c:486
+msgid "template-directory"
msgstr ""
-#: builtin/ls-files.c:519
-msgid "use lowercase letters for 'assume unchanged' files"
+#: builtin/clone.c:109 builtin/init-db.c:487
+msgid "directory from which templates will be used"
msgstr ""
-#: builtin/ls-files.c:521
-msgid "use lowercase letters for 'fsmonitor clean' files"
+#: builtin/clone.c:111 builtin/clone.c:113 builtin/submodule--helper.c:1379
+#: builtin/submodule--helper.c:1859
+msgid "reference repository"
msgstr ""
-#: builtin/ls-files.c:523
-msgid "show cached files in the output (default)"
+#: builtin/clone.c:115 builtin/submodule--helper.c:1381
+#: builtin/submodule--helper.c:1861
+msgid "use --reference only while cloning"
msgstr ""
-#: builtin/ls-files.c:525
-msgid "show deleted files in the output"
+#: 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/ls-files.c:527
-msgid "show modified files in the output"
+#: builtin/clone.c:117
+msgid "use <name> instead of 'origin' to track upstream"
msgstr ""
-#: builtin/ls-files.c:529
-msgid "show other files in the output"
+#: builtin/clone.c:119
+msgid "checkout <branch> instead of the remote's HEAD"
msgstr ""
-#: builtin/ls-files.c:531
-msgid "show ignored files in the output"
+#: builtin/clone.c:121
+msgid "path to git-upload-pack on the remote"
msgstr ""
-#: builtin/ls-files.c:534
-msgid "show staged contents' object name in the output"
+#: builtin/clone.c:122 builtin/fetch.c:142 builtin/grep.c:836
+#: builtin/pull.c:225
+msgid "depth"
msgstr ""
-#: builtin/ls-files.c:536
-msgid "show files on the filesystem that need to be removed"
+#: builtin/clone.c:123
+msgid "create a shallow clone of that depth"
msgstr ""
-#: builtin/ls-files.c:538
-msgid "show 'other' directories' names only"
+#: builtin/clone.c:124 builtin/fetch.c:144 builtin/pack-objects.c:3295
+msgid "time"
msgstr ""
-#: builtin/ls-files.c:540
-msgid "show line endings of files"
+#: builtin/clone.c:125
+msgid "create a shallow clone since a specific time"
msgstr ""
-#: builtin/ls-files.c:542
-msgid "don't show empty directories"
+#: builtin/clone.c:126 builtin/fetch.c:146 builtin/fetch.c:169
+#: builtin/rebase.c:1389
+msgid "revision"
msgstr ""
-#: builtin/ls-files.c:545
-msgid "show unmerged files in the output"
+#: builtin/clone.c:127 builtin/fetch.c:147
+msgid "deepen history of shallow clone, excluding rev"
msgstr ""
-#: builtin/ls-files.c:547
-msgid "show resolve-undo information"
+#: builtin/clone.c:129
+msgid "clone only one branch, HEAD or --branch"
msgstr ""
-#: builtin/ls-files.c:549
-msgid "skip files matching pattern"
+#: builtin/clone.c:131
+msgid "don't clone any tags, and make later fetches not to follow them"
msgstr ""
-#: builtin/ls-files.c:552
-msgid "exclude patterns are read from <file>"
+#: builtin/clone.c:133
+msgid "any cloned submodules will be shallow"
msgstr ""
-#: builtin/ls-files.c:555
-msgid "read additional per-directory exclude patterns in <file>"
+#: builtin/clone.c:134 builtin/init-db.c:495
+msgid "gitdir"
msgstr ""
-#: builtin/ls-files.c:557
-msgid "add the standard git exclusions"
+#: builtin/clone.c:135 builtin/init-db.c:496
+msgid "separate git dir from working tree"
msgstr ""
-#: builtin/ls-files.c:560
-msgid "make the output relative to the project top directory"
+#: builtin/clone.c:136
+msgid "key=value"
msgstr ""
-#: builtin/ls-files.c:563
-msgid "recurse through submodules"
+#: builtin/clone.c:137
+msgid "set config inside the new repository"
msgstr ""
-#: builtin/ls-files.c:565
-msgid "if any <file> is not in the index, treat this as an error"
+#: 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/ls-files.c:566
-msgid "tree-ish"
+#: 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/ls-files.c:567
-msgid "pretend that paths removed since <tree-ish> are still present"
+#: builtin/clone.c:140 builtin/fetch.c:165 builtin/pull.c:238
+#: builtin/push.c:586
+msgid "use IPv4 addresses only"
msgstr ""
-#: builtin/ls-files.c:569
-msgid "show debugging data"
+#: builtin/clone.c:142 builtin/fetch.c:167 builtin/pull.c:241
+#: builtin/push.c:588
+msgid "use IPv6 addresses only"
msgstr ""
-#: builtin/ls-remote.c:7
+#: builtin/clone.c:280
msgid ""
-"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
-" [-q | --quiet] [--exit-code] [--get-url]\n"
-" [--symref] [<repository> [<refs>...]]"
+"No directory name could be guessed.\n"
+"Please specify a directory on the command line"
msgstr ""
-#: builtin/ls-remote.c:52
-msgid "do not print remote URL"
+#: builtin/clone.c:333
+#, c-format
+msgid "info: Could not add alternate for '%s': %s\n"
msgstr ""
-#: builtin/ls-remote.c:53 builtin/ls-remote.c:55
-msgid "exec"
+#: builtin/clone.c:405
+#, c-format
+msgid "failed to open '%s'"
msgstr ""
-#: builtin/ls-remote.c:54 builtin/ls-remote.c:56
-msgid "path of git-upload-pack on the remote host"
+#: builtin/clone.c:413
+#, c-format
+msgid "%s exists and is not a directory"
msgstr ""
-#: builtin/ls-remote.c:58
-msgid "limit to tags"
+#: builtin/clone.c:427
+#, c-format
+msgid "failed to stat %s\n"
msgstr ""
-#: builtin/ls-remote.c:59
-msgid "limit to heads"
+#: builtin/clone.c:444
+#, c-format
+msgid "failed to unlink '%s'"
msgstr ""
-#: builtin/ls-remote.c:60
-msgid "do not show peeled tags"
+#: builtin/clone.c:449
+#, c-format
+msgid "failed to create link '%s'"
msgstr ""
-#: builtin/ls-remote.c:62
-msgid "take url.<base>.insteadOf into account"
+#: builtin/clone.c:453
+#, c-format
+msgid "failed to copy file to '%s'"
msgstr ""
-#: builtin/ls-remote.c:64
-msgid "exit with exit code 2 if no matching refs are found"
+#: builtin/clone.c:479
+#, c-format
+msgid "done.\n"
msgstr ""
-#: builtin/ls-remote.c:67
-msgid "show underlying ref in addition to the object pointed by it"
+#: 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/ls-tree.c:29
-msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
+#: builtin/clone.c:570
+#, c-format
+msgid "Could not find remote branch %s to clone."
msgstr ""
-#: builtin/ls-tree.c:127
-msgid "only show trees"
+#: builtin/clone.c:689
+#, c-format
+msgid "unable to update %s"
msgstr ""
-#: builtin/ls-tree.c:129
-msgid "recurse into subtrees"
+#: builtin/clone.c:739
+msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr ""
-#: builtin/ls-tree.c:131
-msgid "show trees when recursing"
+#: builtin/clone.c:770
+msgid "unable to checkout working tree"
msgstr ""
-#: builtin/ls-tree.c:134
-msgid "terminate entries with NUL byte"
+#: builtin/clone.c:815
+msgid "unable to write parameters to config file"
msgstr ""
-#: builtin/ls-tree.c:135
-msgid "include object size"
+#: builtin/clone.c:878
+msgid "cannot repack to clean up"
msgstr ""
-#: builtin/ls-tree.c:137 builtin/ls-tree.c:139
-msgid "list only filenames"
+#: builtin/clone.c:880
+msgid "cannot unlink temporary alternates file"
msgstr ""
-#: builtin/ls-tree.c:142
-msgid "use full path names"
+#: builtin/clone.c:920 builtin/receive-pack.c:1952
+msgid "Too many arguments."
msgstr ""
-#: builtin/ls-tree.c:144
-msgid "list entire tree; not just current directory (implies --full-name)"
+#: builtin/clone.c:924
+msgid "You must specify a repository to clone."
msgstr ""
-#: builtin/mailsplit.c:241
+#: builtin/clone.c:937
#, c-format
-msgid "empty mbox: '%s'"
-msgstr ""
-
-#: builtin/merge.c:49
-msgid "git merge [<options>] [<commit>...]"
+msgid "--bare and --origin %s options are incompatible."
msgstr ""
-#: builtin/merge.c:50
-msgid "git merge --abort"
+#: builtin/clone.c:940
+msgid "--bare and --separate-git-dir are incompatible."
msgstr ""
-#: builtin/merge.c:51
-msgid "git merge --continue"
+#: builtin/clone.c:953
+#, c-format
+msgid "repository '%s' does not exist"
msgstr ""
-#: builtin/merge.c:108
-msgid "switch `m' requires a value"
+#: builtin/clone.c:959 builtin/fetch.c:1610
+#, c-format
+msgid "depth %s is not a positive number"
msgstr ""
-#: builtin/merge.c:145
+#: builtin/clone.c:969
#, c-format
-msgid "Could not find merge strategy '%s'.\n"
+msgid "destination path '%s' already exists and is not an empty directory."
msgstr ""
-#: builtin/merge.c:146
+#: builtin/clone.c:979
#, c-format
-msgid "Available strategies are:"
+msgid "working tree '%s' already exists."
msgstr ""
-#: builtin/merge.c:151
+#: builtin/clone.c:994 builtin/clone.c:1015 builtin/difftool.c:264
+#: builtin/worktree.c:296 builtin/worktree.c:328
#, c-format
-msgid "Available custom strategies are:"
+msgid "could not create leading directories of '%s'"
msgstr ""
-#: builtin/merge.c:201 builtin/pull.c:137
-msgid "do not show a diffstat at the end of the merge"
+#: builtin/clone.c:999
+#, c-format
+msgid "could not create work tree dir '%s'"
msgstr ""
-#: builtin/merge.c:204 builtin/pull.c:140
-msgid "show a diffstat at the end of the merge"
+#: builtin/clone.c:1019
+#, c-format
+msgid "Cloning into bare repository '%s'...\n"
msgstr ""
-#: builtin/merge.c:205 builtin/pull.c:143
-msgid "(synonym to --stat)"
+#: builtin/clone.c:1021
+#, c-format
+msgid "Cloning into '%s'...\n"
msgstr ""
-#: builtin/merge.c:207 builtin/pull.c:146
-msgid "add (at most <n>) entries from shortlog to merge commit message"
+#: builtin/clone.c:1045
+msgid ""
+"clone --recursive is not compatible with both --reference and --reference-if-"
+"able"
msgstr ""
-#: builtin/merge.c:210 builtin/pull.c:152
-msgid "create a single commit instead of doing a merge"
+#: builtin/clone.c:1106
+msgid "--depth is ignored in local clones; use file:// instead."
msgstr ""
-#: builtin/merge.c:212 builtin/pull.c:155
-msgid "perform a commit if the merge succeeds (default)"
+#: builtin/clone.c:1108
+msgid "--shallow-since is ignored in local clones; use file:// instead."
msgstr ""
-#: builtin/merge.c:214 builtin/pull.c:158
-msgid "edit message before committing"
+#: builtin/clone.c:1110
+msgid "--shallow-exclude is ignored in local clones; use file:// instead."
msgstr ""
-#: builtin/merge.c:215
-msgid "allow fast-forward (default)"
+#: builtin/clone.c:1112
+msgid "--filter is ignored in local clones; use file:// instead."
msgstr ""
-#: builtin/merge.c:217 builtin/pull.c:164
-msgid "abort if fast-forward is not possible"
+#: builtin/clone.c:1115
+msgid "source repository is shallow, ignoring --local"
msgstr ""
-#: builtin/merge.c:221 builtin/pull.c:167
-msgid "verify that the named commit has a valid GPG signature"
+#: builtin/clone.c:1120
+msgid "--local is ignored"
msgstr ""
-#: builtin/merge.c:222 builtin/notes.c:777 builtin/pull.c:171
-#: builtin/revert.c:109
-msgid "strategy"
+#: builtin/clone.c:1197 builtin/clone.c:1205
+#, c-format
+msgid "Remote branch %s not found in upstream %s"
msgstr ""
-#: builtin/merge.c:223 builtin/pull.c:172
-msgid "merge strategy to use"
+#: builtin/clone.c:1208
+msgid "You appear to have cloned an empty repository."
msgstr ""
-#: builtin/merge.c:224 builtin/pull.c:175
-msgid "option=value"
+#: builtin/column.c:10
+msgid "git column [<options>]"
msgstr ""
-#: builtin/merge.c:225 builtin/pull.c:176
-msgid "option for selected merge strategy"
+#: builtin/column.c:27
+msgid "lookup config vars"
msgstr ""
-#: builtin/merge.c:227
-msgid "merge commit message (for a non-fast-forward merge)"
+#: builtin/column.c:28 builtin/column.c:29
+msgid "layout to use"
msgstr ""
-#: builtin/merge.c:231
-msgid "abort the current in-progress merge"
+#: builtin/column.c:30
+msgid "Maximum width"
msgstr ""
-#: builtin/merge.c:233
-msgid "continue the current in-progress merge"
+#: builtin/column.c:31
+msgid "Padding space on left border"
msgstr ""
-#: builtin/merge.c:235 builtin/pull.c:183
-msgid "allow merging unrelated histories"
+#: builtin/column.c:32
+msgid "Padding space on right border"
msgstr ""
-#: builtin/merge.c:241
-msgid "verify commit-msg hook"
+#: builtin/column.c:33
+msgid "Padding space between columns"
msgstr ""
-#: builtin/merge.c:266
-msgid "could not run stash."
+#: builtin/column.c:51
+msgid "--command must be the first argument"
msgstr ""
-#: builtin/merge.c:271
-msgid "stash failed"
+#: builtin/commit-tree.c:18
+msgid ""
+"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "
+"<file>)...] <tree>"
msgstr ""
-#: builtin/merge.c:276
+#: builtin/commit-tree.c:31
#, c-format
-msgid "not a valid object: %s"
-msgstr ""
-
-#: builtin/merge.c:298 builtin/merge.c:315
-msgid "read-tree failed"
+msgid "duplicate parent %s ignored"
msgstr ""
-#: builtin/merge.c:345
-msgid " (nothing to squash)"
+#: 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/merge.c:356
+#: builtin/commit-tree.c:93
#, c-format
-msgid "Squash commit -- not updating HEAD\n"
+msgid "git commit-tree: failed to open '%s'"
msgstr ""
-#: builtin/merge.c:406
+#: builtin/commit-tree.c:96
#, c-format
-msgid "No merge message -- not updating HEAD\n"
+msgid "git commit-tree: failed to read '%s'"
msgstr ""
-#: builtin/merge.c:456
+#: builtin/commit-tree.c:98
#, c-format
-msgid "'%s' does not point to a commit"
+msgid "git commit-tree: failed to close '%s'"
msgstr ""
-#: builtin/merge.c:546
-#, c-format
-msgid "Bad branch.%s.mergeoptions string: %s"
+#: builtin/commit-tree.c:111
+msgid "parent"
msgstr ""
-#: builtin/merge.c:668
-msgid "Not handling anything other than two heads merge."
+#: builtin/commit-tree.c:112
+msgid "id of a parent commit object"
msgstr ""
-#: builtin/merge.c:682
-#, c-format
-msgid "Unknown option for merge-recursive: -X%s"
+#: 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/merge.c:697
-#, c-format
-msgid "unable to write %s"
+#: builtin/commit-tree.c:115 builtin/commit.c:1480
+msgid "commit message"
msgstr ""
-#: builtin/merge.c:749
-#, c-format
-msgid "Could not read from '%s'"
+#: builtin/commit-tree.c:118
+msgid "read commit log message from file"
msgstr ""
-#: builtin/merge.c:758
-#, c-format
-msgid "Not committing merge; use 'git commit' to complete the merge.\n"
+#: 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/merge.c:764
-#, c-format
-msgid ""
-"Please enter a commit message to explain why this merge is necessary,\n"
-"especially if it merges an updated upstream into a topic branch.\n"
-"\n"
-"Lines starting with '%c' will be ignored, and an empty message aborts\n"
-"the commit.\n"
+#: builtin/commit-tree.c:133
+msgid "must give exactly one tree"
msgstr ""
-#: builtin/merge.c:800
-msgid "Empty commit message."
+#: builtin/commit-tree.c:140
+msgid "git commit-tree: failed to read"
msgstr ""
-#: builtin/merge.c:820
-#, c-format
-msgid "Wonderful.\n"
+#: builtin/commit.c:41
+msgid "git commit [<options>] [--] <pathspec>..."
msgstr ""
-#: builtin/merge.c:873
-#, c-format
-msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
+#: builtin/commit.c:46
+msgid "git status [<options>] [--] <pathspec>..."
msgstr ""
-#: builtin/merge.c:912
-msgid "No current branch."
+#: 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/merge.c:914
-msgid "No remote for the current branch."
+#: 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/merge.c:916
-msgid "No default upstream defined for the current branch."
+#: builtin/commit.c:63
+msgid "Otherwise, please use 'git reset'\n"
msgstr ""
-#: builtin/merge.c:921
-#, c-format
-msgid "No remote-tracking branch for %s from %s"
+#: 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/merge.c:974
-#, c-format
-msgid "Bad value '%s' in environment '%s'"
+#: builtin/commit.c:312
+msgid "failed to unpack HEAD tree object"
msgstr ""
-#: builtin/merge.c:1076
-#, c-format
-msgid "not something we can merge in %s: %s"
+#: builtin/commit.c:353
+msgid "unable to create temporary index"
msgstr ""
-#: builtin/merge.c:1110
-msgid "not something we can merge"
+#: builtin/commit.c:359
+msgid "interactive add failed"
msgstr ""
-#: builtin/merge.c:1212
-msgid "--abort expects no arguments"
+#: builtin/commit.c:373
+msgid "unable to update temporary index"
msgstr ""
-#: builtin/merge.c:1216
-msgid "There is no merge to abort (MERGE_HEAD missing)."
+#: builtin/commit.c:375
+msgid "Failed to update main cache tree"
msgstr ""
-#: builtin/merge.c:1228
-msgid "--continue expects no arguments"
+#: builtin/commit.c:400 builtin/commit.c:423 builtin/commit.c:469
+msgid "unable to write new_index file"
msgstr ""
-#: builtin/merge.c:1232
-msgid "There is no merge in progress (MERGE_HEAD missing)."
+#: builtin/commit.c:452
+msgid "cannot do a partial commit during a merge."
msgstr ""
-#: builtin/merge.c:1248
-msgid ""
-"You have not concluded your merge (MERGE_HEAD exists).\n"
-"Please, commit your changes before you merge."
+#: builtin/commit.c:454
+msgid "cannot do a partial commit during a cherry-pick."
msgstr ""
-#: builtin/merge.c:1255
-msgid ""
-"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
-"Please, commit your changes before you merge."
+#: builtin/commit.c:462
+msgid "cannot read the index"
msgstr ""
-#: builtin/merge.c:1258
-msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
+#: builtin/commit.c:481
+msgid "unable to write temporary index file"
msgstr ""
-#: builtin/merge.c:1267
-msgid "You cannot combine --squash with --no-ff."
+#: builtin/commit.c:579
+#, c-format
+msgid "commit '%s' lacks author header"
msgstr ""
-#: builtin/merge.c:1275
-msgid "No commit specified and merge.defaultToUpstream not set."
+#: builtin/commit.c:581
+#, c-format
+msgid "commit '%s' has malformed author line"
msgstr ""
-#: builtin/merge.c:1292
-msgid "Squash commit into empty head not supported yet"
+#: builtin/commit.c:600
+msgid "malformed --author parameter"
msgstr ""
-#: builtin/merge.c:1294
-msgid "Non-fast-forward commit does not make sense into an empty head"
+#: builtin/commit.c:653
+msgid ""
+"unable to select a comment character that is not used\n"
+"in the current commit message"
msgstr ""
-#: builtin/merge.c:1299
+#: builtin/commit.c:691 builtin/commit.c:724 builtin/commit.c:1069
#, c-format
-msgid "%s - not something we can merge"
-msgstr ""
-
-#: builtin/merge.c:1301
-msgid "Can merge only exactly one commit into empty head"
+msgid "could not lookup commit %s"
msgstr ""
-#: builtin/merge.c:1335
+#: builtin/commit.c:703 builtin/shortlog.c:319
#, c-format
-msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
+msgid "(reading log message from standard input)\n"
msgstr ""
-#: builtin/merge.c:1338
-#, c-format
-msgid "Commit %s has a bad GPG signature allegedly by %s."
+#: builtin/commit.c:705
+msgid "could not read log from standard input"
msgstr ""
-#: builtin/merge.c:1341
+#: builtin/commit.c:709
#, c-format
-msgid "Commit %s does not have a GPG signature."
+msgid "could not read log file '%s'"
msgstr ""
-#: builtin/merge.c:1344
-#, c-format
-msgid "Commit %s has a good GPG signature by %s\n"
+#: builtin/commit.c:740 builtin/commit.c:756
+msgid "could not read SQUASH_MSG"
msgstr ""
-#: builtin/merge.c:1403
-msgid "refusing to merge unrelated histories"
+#: builtin/commit.c:747
+msgid "could not read MERGE_MSG"
msgstr ""
-#: builtin/merge.c:1412
-msgid "Already up to date."
+#: builtin/commit.c:807
+msgid "could not write commit template"
msgstr ""
-#: builtin/merge.c:1422
+#: builtin/commit.c:826
#, c-format
-msgid "Updating %s..%s\n"
+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/merge.c:1463
+#: builtin/commit.c:831
#, c-format
-msgid "Trying really trivial in-index merge...\n"
+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/merge.c:1470
+#: builtin/commit.c:844
#, c-format
-msgid "Nope.\n"
+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/merge.c:1495
-msgid "Already up to date. Yeeah!"
+#: 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/merge.c:1501
-msgid "Not possible to fast-forward, aborting."
+#: builtin/commit.c:869
+#, c-format
+msgid "%sAuthor: %.*s <%.*s>"
msgstr ""
-#: builtin/merge.c:1524 builtin/merge.c:1603
+#: builtin/commit.c:877
#, c-format
-msgid "Rewinding the tree to pristine...\n"
+msgid "%sDate: %s"
msgstr ""
-#: builtin/merge.c:1528
+#: builtin/commit.c:884
#, c-format
-msgid "Trying merge strategy %s...\n"
+msgid "%sCommitter: %.*s <%.*s>"
msgstr ""
-#: builtin/merge.c:1594
-#, c-format
-msgid "No merge strategy handled the merge.\n"
+#: builtin/commit.c:902
+msgid "Cannot read index"
msgstr ""
-#: builtin/merge.c:1596
-#, c-format
-msgid "Merge with strategy %s failed.\n"
+#: builtin/commit.c:969
+msgid "Error building trees"
msgstr ""
-#: builtin/merge.c:1605
+#: builtin/commit.c:983 builtin/tag.c:269
#, c-format
-msgid "Using the %s to prepare resolving by hand.\n"
+msgid "Please supply the message using either -m or -F option.\n"
msgstr ""
-#: builtin/merge.c:1617
+#: builtin/commit.c:1027
#, c-format
-msgid "Automatic merge went well; stopped before committing as requested\n"
+msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr ""
-#: builtin/merge-base.c:30
-msgid "git merge-base [-a | --all] <commit> <commit>..."
+#: builtin/commit.c:1041
+#, c-format
+msgid "Invalid ignored mode '%s'"
msgstr ""
-#: builtin/merge-base.c:31
-msgid "git merge-base [-a | --all] --octopus <commit>..."
+#: builtin/commit.c:1059 builtin/commit.c:1284
+#, c-format
+msgid "Invalid untracked files mode '%s'"
msgstr ""
-#: builtin/merge-base.c:32
-msgid "git merge-base --independent <commit>..."
+#: builtin/commit.c:1097
+msgid "--long and -z are incompatible"
msgstr ""
-#: builtin/merge-base.c:33
-msgid "git merge-base --is-ancestor <commit> <commit>"
+#: builtin/commit.c:1130
+msgid "Using both --reset-author and --author does not make sense"
msgstr ""
-#: builtin/merge-base.c:34
-msgid "git merge-base --fork-point <ref> [<commit>]"
+#: builtin/commit.c:1139
+msgid "You have nothing to amend."
msgstr ""
-#: builtin/merge-base.c:220
-msgid "output all common ancestors"
+#: builtin/commit.c:1142
+msgid "You are in the middle of a merge -- cannot amend."
msgstr ""
-#: builtin/merge-base.c:222
-msgid "find ancestors for a single n-way merge"
+#: builtin/commit.c:1144
+msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr ""
-#: builtin/merge-base.c:224
-msgid "list revs not reachable from others"
+#: builtin/commit.c:1147
+msgid "Options --squash and --fixup cannot be used together"
msgstr ""
-#: builtin/merge-base.c:226
-msgid "is the first one ancestor of the other?"
+#: builtin/commit.c:1157
+msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr ""
-#: builtin/merge-base.c:228
-msgid "find where <commit> forked from reflog of <ref>"
+#: builtin/commit.c:1159
+msgid "Option -m cannot be combined with -c/-C/-F."
msgstr ""
-#: builtin/merge-file.c:9
-msgid ""
-"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
-"<orig-file> <file2>"
+#: builtin/commit.c:1167
+msgid "--reset-author can be used only with -C, -c or --amend."
msgstr ""
-#: builtin/merge-file.c:33
-msgid "send results to standard output"
+#: builtin/commit.c:1184
+msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr ""
-#: builtin/merge-file.c:34
-msgid "use a diff3 based merge"
+#: builtin/commit.c:1186
+msgid "No paths with --include/--only does not make sense."
msgstr ""
-#: builtin/merge-file.c:35
-msgid "for conflicts, use our version"
+#: builtin/commit.c:1192
+#, c-format
+msgid "paths '%s ...' with -a does not make sense"
msgstr ""
-#: builtin/merge-file.c:37
-msgid "for conflicts, use their version"
+#: builtin/commit.c:1319 builtin/commit.c:1503
+msgid "show status concisely"
msgstr ""
-#: builtin/merge-file.c:39
-msgid "for conflicts, use a union version"
+#: builtin/commit.c:1321 builtin/commit.c:1505
+msgid "show branch information"
msgstr ""
-#: builtin/merge-file.c:42
-msgid "for conflicts, use this marker size"
+#: builtin/commit.c:1323
+msgid "show stash information"
msgstr ""
-#: builtin/merge-file.c:43
-msgid "do not warn about conflicts"
+#: builtin/commit.c:1325 builtin/commit.c:1507
+msgid "compute full ahead/behind values"
msgstr ""
-#: builtin/merge-file.c:45
-msgid "set labels for file1/orig-file/file2"
+#: builtin/commit.c:1327
+msgid "version"
msgstr ""
-#: builtin/merge-recursive.c:45
-#, c-format
-msgid "unknown option %s"
+#: builtin/commit.c:1327 builtin/commit.c:1509 builtin/push.c:561
+#: builtin/worktree.c:643
+msgid "machine-readable output"
msgstr ""
-#: builtin/merge-recursive.c:51
-#, c-format
-msgid "could not parse object '%s'"
+#: builtin/commit.c:1330 builtin/commit.c:1511
+msgid "show status in long format (default)"
msgstr ""
-#: builtin/merge-recursive.c:55
-#, c-format
-msgid "cannot handle more than %d base. Ignoring %s."
-msgid_plural "cannot handle more than %d bases. Ignoring %s."
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/merge-recursive.c:63
-msgid "not handling anything other than two heads merge."
+#: builtin/commit.c:1333 builtin/commit.c:1514
+msgid "terminate entries with NUL"
msgstr ""
-#: builtin/merge-recursive.c:69 builtin/merge-recursive.c:71
-#, c-format
-msgid "could not resolve ref '%s'"
+#: 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/merge-recursive.c:77
-#, c-format
-msgid "Merging %s with %s\n"
+#: builtin/commit.c:1336 builtin/commit.c:1517
+msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr ""
-#: builtin/mktree.c:65
-msgid "git mktree [-z] [--missing] [--batch]"
+#: builtin/commit.c:1340
+msgid ""
+"show ignored files, optional modes: traditional, matching, no. (Default: "
+"traditional)"
msgstr ""
-#: builtin/mktree.c:153
-msgid "input is NUL terminated"
+#: builtin/commit.c:1342 parse-options.h:179
+msgid "when"
msgstr ""
-#: builtin/mktree.c:154 builtin/write-tree.c:25
-msgid "allow missing objects"
+#: builtin/commit.c:1343
+msgid ""
+"ignore changes to submodules, optional when: all, dirty, untracked. "
+"(Default: all)"
msgstr ""
-#: builtin/mktree.c:155
-msgid "allow creation of more than one tree"
+#: builtin/commit.c:1345
+msgid "list untracked files in columns"
msgstr ""
-#: builtin/mv.c:17
-msgid "git mv [<options>] <source>... <destination>"
+#: builtin/commit.c:1346
+msgid "do not detect renames"
msgstr ""
-#: builtin/mv.c:83
-#, c-format
-msgid "Directory %s is in index and no submodule?"
+#: builtin/commit.c:1348
+msgid "detect renames, optionally set similarity index"
msgstr ""
-#: builtin/mv.c:85 builtin/rm.c:289
-msgid "Please stage your changes to .gitmodules or stash them to proceed"
+#: builtin/commit.c:1368
+msgid "Unsupported combination of ignored and untracked-files arguments"
msgstr ""
-#: builtin/mv.c:103
-#, c-format
-msgid "%.*s is in index"
+#: builtin/commit.c:1473
+msgid "suppress summary after successful commit"
msgstr ""
-#: builtin/mv.c:125
-msgid "force move/rename even if target exists"
+#: builtin/commit.c:1474
+msgid "show diff in commit message template"
msgstr ""
-#: builtin/mv.c:127
-msgid "skip move/rename errors"
+#: builtin/commit.c:1476
+msgid "Commit message options"
msgstr ""
-#: builtin/mv.c:168
-#, c-format
-msgid "destination '%s' is not a directory"
+#: builtin/commit.c:1477 builtin/merge.c:272 builtin/tag.c:408
+msgid "read message from file"
msgstr ""
-#: builtin/mv.c:179
-#, c-format
-msgid "Checking rename of '%s' to '%s'\n"
+#: builtin/commit.c:1478
+msgid "author"
msgstr ""
-#: builtin/mv.c:183
-msgid "bad source"
+#: builtin/commit.c:1478
+msgid "override author for commit"
msgstr ""
-#: builtin/mv.c:186
-msgid "can not move directory into itself"
+#: builtin/commit.c:1479 builtin/gc.c:539
+msgid "date"
msgstr ""
-#: builtin/mv.c:189
-msgid "cannot move directory over file"
+#: builtin/commit.c:1479
+msgid "override date for commit"
msgstr ""
-#: builtin/mv.c:198
-msgid "source directory is empty"
+#: 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/mv.c:223
-msgid "not under version control"
+#: builtin/commit.c:1481
+msgid "reuse and edit message from specified commit"
msgstr ""
-#: builtin/mv.c:226
-msgid "destination exists"
+#: builtin/commit.c:1482
+msgid "reuse message from specified commit"
msgstr ""
-#: builtin/mv.c:234
-#, c-format
-msgid "overwriting '%s'"
+#: builtin/commit.c:1483
+msgid "use autosquash formatted message to fixup specified commit"
msgstr ""
-#: builtin/mv.c:237
-msgid "Cannot overwrite"
+#: builtin/commit.c:1484
+msgid "use autosquash formatted message to squash specified commit"
msgstr ""
-#: builtin/mv.c:240
-msgid "multiple sources for the same target"
+#: builtin/commit.c:1485
+msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr ""
-#: builtin/mv.c:242
-msgid "destination directory does not exist"
+#: 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/mv.c:249
-#, c-format
-msgid "%s, source=%s, destination=%s"
+#: builtin/commit.c:1487
+msgid "use specified template file"
msgstr ""
-#: builtin/mv.c:270
-#, c-format
-msgid "Renaming %s to %s\n"
+#: builtin/commit.c:1488
+msgid "force edit of commit"
msgstr ""
-#: builtin/mv.c:276 builtin/remote.c:712 builtin/repack.c:394
-#, c-format
-msgid "renaming '%s' failed"
+#: builtin/commit.c:1490
+msgid "include status in commit message template"
msgstr ""
-#: builtin/name-rev.c:338
-msgid "git name-rev [<options>] <commit>..."
+#: builtin/commit.c:1495
+msgid "Commit contents options"
msgstr ""
-#: builtin/name-rev.c:339
-msgid "git name-rev [<options>] --all"
+#: builtin/commit.c:1496
+msgid "commit all changed files"
msgstr ""
-#: builtin/name-rev.c:340
-msgid "git name-rev [<options>] --stdin"
+#: builtin/commit.c:1497
+msgid "add specified files to index for commit"
msgstr ""
-#: builtin/name-rev.c:395
-msgid "print only names (no SHA-1)"
+#: builtin/commit.c:1498
+msgid "interactively add files"
msgstr ""
-#: builtin/name-rev.c:396
-msgid "only use tags to name the commits"
+#: builtin/commit.c:1499
+msgid "interactively add changes"
msgstr ""
-#: builtin/name-rev.c:398
-msgid "only use refs matching <pattern>"
+#: builtin/commit.c:1500
+msgid "commit only specified files"
msgstr ""
-#: builtin/name-rev.c:400
-msgid "ignore refs matching <pattern>"
+#: builtin/commit.c:1501
+msgid "bypass pre-commit and commit-msg hooks"
msgstr ""
-#: builtin/name-rev.c:402
-msgid "list all commits reachable from all refs"
+#: builtin/commit.c:1502
+msgid "show what would be committed"
msgstr ""
-#: builtin/name-rev.c:403
-msgid "read from stdin"
+#: builtin/commit.c:1515
+msgid "amend previous commit"
msgstr ""
-#: builtin/name-rev.c:404
-msgid "allow to print `undefined` names (default)"
+#: builtin/commit.c:1516
+msgid "bypass post-rewrite hook"
msgstr ""
-#: builtin/name-rev.c:410
-msgid "dereference tags in the input (internal use)"
+#: builtin/commit.c:1521
+msgid "ok to record an empty change"
msgstr ""
-#: builtin/notes.c:26
-msgid "git notes [--ref <notes-ref>] [list [<object>]]"
+#: builtin/commit.c:1523
+msgid "ok to record a change with an empty message"
msgstr ""
-#: builtin/notes.c:27
-msgid ""
-"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
-"| (-c | -C) <object>] [<object>]"
+#: builtin/commit.c:1596
+#, c-format
+msgid "Corrupt MERGE_HEAD file (%s)"
msgstr ""
-#: builtin/notes.c:28
-msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
+#: builtin/commit.c:1603
+msgid "could not read MERGE_MODE"
msgstr ""
-#: builtin/notes.c:29
-msgid ""
-"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
-"(-c | -C) <object>] [<object>]"
+#: builtin/commit.c:1622
+#, c-format
+msgid "could not read commit message: %s"
msgstr ""
-#: builtin/notes.c:30
-msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
+#: builtin/commit.c:1629
+#, c-format
+msgid "Aborting commit due to empty commit message.\n"
msgstr ""
-#: builtin/notes.c:31
-msgid "git notes [--ref <notes-ref>] show [<object>]"
+#: builtin/commit.c:1634
+#, c-format
+msgid "Aborting commit; you did not edit the message.\n"
msgstr ""
-#: builtin/notes.c:32
+#: builtin/commit.c:1668
msgid ""
-"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
+"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/notes.c:33
-msgid "git notes merge --commit [-v | -q]"
+#: builtin/commit-graph.c:10
+msgid "git commit-graph [--object-dir <objdir>]"
msgstr ""
-#: builtin/notes.c:34
-msgid "git notes merge --abort [-v | -q]"
+#: builtin/commit-graph.c:11 builtin/commit-graph.c:23
+msgid "git commit-graph read [--object-dir <objdir>]"
msgstr ""
-#: builtin/notes.c:35
-msgid "git notes [--ref <notes-ref>] remove [<object>...]"
+#: builtin/commit-graph.c:12 builtin/commit-graph.c:18
+msgid "git commit-graph verify [--object-dir <objdir>]"
msgstr ""
-#: builtin/notes.c:36
-msgid "git notes [--ref <notes-ref>] prune [-n] [-v]"
+#: 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/notes.c:37
-msgid "git notes [--ref <notes-ref>] get-ref"
+#: 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/notes.c:42
-msgid "git notes [list [<object>]]"
+#: 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/notes.c:47
-msgid "git notes add [<options>] [<object>]"
+#: builtin/commit-graph.c:68 builtin/commit-graph.c:105
+#, c-format
+msgid "Could not open commit-graph '%s'"
msgstr ""
-#: builtin/notes.c:52
-msgid "git notes copy [<options>] <from-object> <to-object>"
+#: builtin/commit-graph.c:150
+msgid "start walk at all refs"
msgstr ""
-#: builtin/notes.c:53
-msgid "git notes copy --stdin [<from-object> <to-object>]..."
+#: builtin/commit-graph.c:152
+msgid "scan pack-indexes listed by stdin for commits"
msgstr ""
-#: builtin/notes.c:58
-msgid "git notes append [<options>] [<object>]"
+#: builtin/commit-graph.c:154
+msgid "start walk at commits listed by stdin"
msgstr ""
-#: builtin/notes.c:63
-msgid "git notes edit [<object>]"
+#: builtin/commit-graph.c:156
+msgid "include all commits already in the commit-graph file"
msgstr ""
-#: builtin/notes.c:68
-msgid "git notes show [<object>]"
+#: builtin/commit-graph.c:165
+msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
msgstr ""
-#: builtin/notes.c:73
-msgid "git notes merge [<options>] <notes-ref>"
+#: builtin/config.c:11
+msgid "git config [<options>]"
msgstr ""
-#: builtin/notes.c:74
-msgid "git notes merge --commit [<options>]"
+#: builtin/config.c:103
+#, c-format
+msgid "unrecognized --type argument, %s"
msgstr ""
-#: builtin/notes.c:75
-msgid "git notes merge --abort [<options>]"
+#: builtin/config.c:115
+msgid "only one type at a time"
msgstr ""
-#: builtin/notes.c:80
-msgid "git notes remove [<object>]"
+#: builtin/config.c:124
+msgid "Config file location"
msgstr ""
-#: builtin/notes.c:85
-msgid "git notes prune [<options>]"
+#: builtin/config.c:125
+msgid "use global config file"
msgstr ""
-#: builtin/notes.c:90
-msgid "git notes get-ref"
+#: builtin/config.c:126
+msgid "use system config file"
msgstr ""
-#: builtin/notes.c:95
-msgid "Write/edit the notes for the following object:"
+#: builtin/config.c:127
+msgid "use repository config file"
msgstr ""
-#: builtin/notes.c:148
-#, c-format
-msgid "unable to start 'show' for object '%s'"
+#: builtin/config.c:128
+msgid "use per-worktree config file"
msgstr ""
-#: builtin/notes.c:152
-msgid "could not read 'show' output"
+#: builtin/config.c:129
+msgid "use given config file"
msgstr ""
-#: builtin/notes.c:160
-#, c-format
-msgid "failed to finish 'show' for object '%s'"
+#: builtin/config.c:130
+msgid "blob-id"
msgstr ""
-#: builtin/notes.c:195
-msgid "please supply the note contents using either -m or -F option"
+#: builtin/config.c:130
+msgid "read config from given blob object"
msgstr ""
-#: builtin/notes.c:204
-msgid "unable to write note object"
+#: builtin/config.c:131
+msgid "Action"
msgstr ""
-#: builtin/notes.c:206
-#, c-format
-msgid "the note contents have been left in %s"
+#: builtin/config.c:132
+msgid "get value: name [value-regex]"
msgstr ""
-#: builtin/notes.c:234 builtin/tag.c:506
-#, c-format
-msgid "cannot read '%s'"
+#: builtin/config.c:133
+msgid "get all values: key [value-regex]"
msgstr ""
-#: builtin/notes.c:236 builtin/tag.c:509
-#, c-format
-msgid "could not open or read '%s'"
+#: builtin/config.c:134
+msgid "get values for regexp: name-regex [value-regex]"
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/config.c:135
+msgid "get value specific for the URL: section[.var] URL"
msgstr ""
-#: builtin/notes.c:258
-#, c-format
-msgid "failed to read object '%s'."
+#: builtin/config.c:136
+msgid "replace all matching variables: name value [value_regex]"
msgstr ""
-#: builtin/notes.c:262
-#, c-format
-msgid "cannot read note data from non-blob object '%s'."
+#: builtin/config.c:137
+msgid "add a new variable: name value"
msgstr ""
-#: builtin/notes.c:302
-#, c-format
-msgid "malformed input line: '%s'."
+#: builtin/config.c:138
+msgid "remove a variable: name [value-regex]"
msgstr ""
-#: builtin/notes.c:317
-#, c-format
-msgid "failed to copy notes from '%s' to '%s'"
+#: builtin/config.c:139
+msgid "remove all matches: name [value-regex]"
msgstr ""
-#. TRANSLATORS: the first %s will be replaced by a git
-#. notes command: 'add', 'merge', 'remove', etc.
-#.
-#: builtin/notes.c:349
-#, c-format
-msgid "refusing to %s notes in %s (outside of refs/notes/)"
+#: builtin/config.c:140
+msgid "rename section: old-name new-name"
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/config.c:141
+msgid "remove a section: name"
msgstr ""
-#: builtin/notes.c:382 builtin/notes.c:668
-#, c-format
-msgid "no note found for object %s."
+#: builtin/config.c:142
+msgid "list all"
msgstr ""
-#: builtin/notes.c:403 builtin/notes.c:566
-msgid "note contents as a string"
+#: builtin/config.c:143
+msgid "open an editor"
msgstr ""
-#: builtin/notes.c:406 builtin/notes.c:569
-msgid "note contents in a file"
+#: builtin/config.c:144
+msgid "find the color configured: slot [default]"
msgstr ""
-#: builtin/notes.c:409 builtin/notes.c:572
-msgid "reuse and edit specified note object"
+#: builtin/config.c:145
+msgid "find the color setting: slot [stdout-is-tty]"
msgstr ""
-#: builtin/notes.c:412 builtin/notes.c:575
-msgid "reuse specified note object"
+#: builtin/config.c:146
+msgid "Type"
msgstr ""
-#: builtin/notes.c:415 builtin/notes.c:578
-msgid "allow storing empty note"
+#: builtin/config.c:147
+msgid "value is given this type"
msgstr ""
-#: builtin/notes.c:416 builtin/notes.c:487
-msgid "replace existing notes"
+#: builtin/config.c:148
+msgid "value is \"true\" or \"false\""
msgstr ""
-#: builtin/notes.c:441
-#, c-format
-msgid ""
-"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
-"existing notes"
+#: builtin/config.c:149
+msgid "value is decimal number"
msgstr ""
-#: builtin/notes.c:456 builtin/notes.c:535
-#, c-format
-msgid "Overwriting existing notes for object %s\n"
+#: builtin/config.c:150
+msgid "value is --bool or --int"
msgstr ""
-#: builtin/notes.c:467 builtin/notes.c:627 builtin/notes.c:892
-#, c-format
-msgid "Removing note for object %s\n"
+#: builtin/config.c:151
+msgid "value is a path (file or directory name)"
msgstr ""
-#: builtin/notes.c:488
-msgid "read objects from stdin"
+#: builtin/config.c:152
+msgid "value is an expiry date"
msgstr ""
-#: builtin/notes.c:490
-msgid "load rewriting config for <command> (implies --stdin)"
+#: builtin/config.c:153
+msgid "Other"
msgstr ""
-#: builtin/notes.c:508
-msgid "too few parameters"
+#: builtin/config.c:154
+msgid "terminate values with NUL byte"
msgstr ""
-#: builtin/notes.c:529
-#, c-format
-msgid ""
-"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
-"existing notes"
+#: builtin/config.c:155
+msgid "show variable names only"
msgstr ""
-#: builtin/notes.c:541
-#, c-format
-msgid "missing notes on source object %s. Cannot copy."
+#: builtin/config.c:156
+msgid "respect include directives on lookup"
msgstr ""
-#: builtin/notes.c:593
-#, c-format
-msgid ""
-"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
-"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
+#: builtin/config.c:157
+msgid "show origin of config (file, standard input, blob, command line)"
msgstr ""
-#: builtin/notes.c:688
-msgid "failed to delete ref NOTES_MERGE_PARTIAL"
+#: builtin/config.c:158
+msgid "value"
msgstr ""
-#: builtin/notes.c:690
-msgid "failed to delete ref NOTES_MERGE_REF"
+#: builtin/config.c:158
+msgid "with --get, use default value when missing entry"
msgstr ""
-#: builtin/notes.c:692
-msgid "failed to remove 'git notes merge' worktree"
+#: builtin/config.c:172
+#, c-format
+msgid "wrong number of arguments, should be %d"
msgstr ""
-#: builtin/notes.c:712
-msgid "failed to read ref NOTES_MERGE_PARTIAL"
+#: builtin/config.c:174
+#, c-format
+msgid "wrong number of arguments, should be from %d to %d"
msgstr ""
-#: builtin/notes.c:714
-msgid "could not find commit from NOTES_MERGE_PARTIAL."
+#: builtin/config.c:308
+#, c-format
+msgid "invalid key pattern: %s"
msgstr ""
-#: builtin/notes.c:716
-msgid "could not parse commit from NOTES_MERGE_PARTIAL."
+#: builtin/config.c:344
+#, c-format
+msgid "failed to format default config value: %s"
msgstr ""
-#: builtin/notes.c:729
-msgid "failed to resolve NOTES_MERGE_REF"
+#: builtin/config.c:401
+#, c-format
+msgid "cannot parse color '%s'"
msgstr ""
-#: builtin/notes.c:732
-msgid "failed to finalize notes merge"
+#: builtin/config.c:443
+msgid "unable to parse default color value"
msgstr ""
-#: builtin/notes.c:758
-#, c-format
-msgid "unknown notes merge strategy %s"
+#: builtin/config.c:496 builtin/config.c:742
+msgid "not in a git directory"
msgstr ""
-#: builtin/notes.c:774
-msgid "General options"
+#: builtin/config.c:499
+msgid "writing to stdin is not supported"
msgstr ""
-#: builtin/notes.c:776
-msgid "Merge options"
+#: builtin/config.c:502
+msgid "writing config blobs is not supported"
msgstr ""
-#: builtin/notes.c:778
+#: builtin/config.c:587
+#, c-format
msgid ""
-"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
-"cat_sort_uniq)"
+"# 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/notes.c:780
-msgid "Committing unmerged notes"
+#: builtin/config.c:611
+msgid "only one config file at a time"
msgstr ""
-#: builtin/notes.c:782
-msgid "finalize notes merge by committing unmerged notes"
+#: builtin/config.c:616
+msgid "--local can only be used inside a git repository"
msgstr ""
-#: builtin/notes.c:784
-msgid "Aborting notes merge resolution"
+#: builtin/config.c:619
+msgid "--blob can only be used inside a git repository"
msgstr ""
-#: builtin/notes.c:786
-msgid "abort notes merge"
+#: builtin/config.c:638
+msgid "$HOME not set"
msgstr ""
-#: builtin/notes.c:797
-msgid "cannot mix --commit, --abort or -s/--strategy"
+#: 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/notes.c:802
-msgid "must specify a notes ref to merge"
+#: builtin/config.c:688
+msgid "--get-color and variable type are incoherent"
msgstr ""
-#: builtin/notes.c:826
-#, c-format
-msgid "unknown -s/--strategy: %s"
+#: builtin/config.c:693
+msgid "only one action at a time"
msgstr ""
-#: builtin/notes.c:863
-#, c-format
-msgid "a notes merge into %s is already in-progress at %s"
+#: builtin/config.c:706
+msgid "--name-only is only applicable to --list or --get-regexp"
msgstr ""
-#: builtin/notes.c:866
-#, c-format
-msgid "failed to store link to current notes ref (%s)"
+#: builtin/config.c:712
+msgid ""
+"--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
+"list"
msgstr ""
-#: builtin/notes.c:868
-#, c-format
-msgid ""
-"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
-"'git notes merge --commit', or abort the merge with 'git notes merge --"
-"abort'.\n"
+#: builtin/config.c:718
+msgid "--default is only applicable to --get"
msgstr ""
-#: builtin/notes.c:890
+#: builtin/config.c:731
#, c-format
-msgid "Object %s has no note\n"
+msgid "unable to read config file '%s'"
msgstr ""
-#: builtin/notes.c:902
-msgid "attempt to remove non-existent note is not an error"
+#: builtin/config.c:734
+msgid "error processing config file(s)"
msgstr ""
-#: builtin/notes.c:905
-msgid "read object names from the standard input"
+#: builtin/config.c:744
+msgid "editing stdin is not supported"
msgstr ""
-#: builtin/notes.c:943 builtin/prune.c:106 builtin/worktree.c:160
-msgid "do not remove, show only"
+#: builtin/config.c:746
+msgid "editing blobs is not supported"
msgstr ""
-#: builtin/notes.c:944
-msgid "report pruned notes"
+#: builtin/config.c:760
+#, c-format
+msgid "cannot create configuration file %s"
msgstr ""
-#: builtin/notes.c:986
-msgid "notes-ref"
+#: 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/notes.c:987
-msgid "use notes from <notes-ref>"
+#: builtin/config.c:847 builtin/config.c:858
+#, c-format
+msgid "no such section: %s"
msgstr ""
-#: builtin/notes.c:1022
-#, c-format
-msgid "unknown subcommand: %s"
+#: builtin/count-objects.c:90
+msgid "git count-objects [-v] [-H | --human-readable]"
msgstr ""
-#: builtin/pack-objects.c:33
-msgid ""
-"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
+#: builtin/count-objects.c:100
+msgid "print sizes in human readable format"
msgstr ""
-#: builtin/pack-objects.c:34
-msgid ""
-"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
+#: builtin/describe.c:27
+msgid "git describe [<options>] [<commit-ish>...]"
msgstr ""
-#: builtin/pack-objects.c:195 builtin/pack-objects.c:198
-#, c-format
-msgid "deflate error (%d)"
+#: builtin/describe.c:28
+msgid "git describe [<options>] --dirty"
msgstr ""
-#: builtin/pack-objects.c:791
-msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
+#: builtin/describe.c:63
+msgid "head"
msgstr ""
-#: builtin/pack-objects.c:804
-msgid "Writing objects"
+#: builtin/describe.c:63
+msgid "lightweight"
msgstr ""
-#: builtin/pack-objects.c:1084
-msgid "disabling bitmap writing, as some objects are not being packed"
+#: builtin/describe.c:63
+msgid "annotated"
msgstr ""
-#: builtin/pack-objects.c:2454
-msgid "Compressing objects"
+#: builtin/describe.c:273
+#, c-format
+msgid "annotated tag %s not available"
msgstr ""
-#: builtin/pack-objects.c:2625
-msgid "invalid value for --missing"
+#: builtin/describe.c:277
+#, c-format
+msgid "annotated tag %s has no embedded name"
msgstr ""
-#: builtin/pack-objects.c:2928
+#: builtin/describe.c:279
#, c-format
-msgid "unsupported index version %s"
+msgid "tag '%s' is really '%s' here"
msgstr ""
-#: builtin/pack-objects.c:2932
+#: builtin/describe.c:323
#, c-format
-msgid "bad index version '%s'"
+msgid "no tag exactly matches '%s'"
msgstr ""
-#: builtin/pack-objects.c:2962
-msgid "do not show progress meter"
+#: builtin/describe.c:325
+#, c-format
+msgid "No exact match on refs or tags, searching to describe\n"
msgstr ""
-#: builtin/pack-objects.c:2964
-msgid "show progress meter"
+#: builtin/describe.c:379
+#, c-format
+msgid "finished search at %s\n"
msgstr ""
-#: builtin/pack-objects.c:2966
-msgid "show progress meter during object writing phase"
+#: builtin/describe.c:405
+#, c-format
+msgid ""
+"No annotated tags can describe '%s'.\n"
+"However, there were unannotated tags: try --tags."
msgstr ""
-#: builtin/pack-objects.c:2969
-msgid "similar to --all-progress when progress meter is shown"
+#: builtin/describe.c:409
+#, c-format
+msgid ""
+"No tags can describe '%s'.\n"
+"Try --always, or create some tags."
msgstr ""
-#: builtin/pack-objects.c:2970
-msgid "version[,offset]"
+#: builtin/describe.c:439
+#, c-format
+msgid "traversed %lu commits\n"
msgstr ""
-#: builtin/pack-objects.c:2971
-msgid "write the pack index file in the specified idx format version"
+#: builtin/describe.c:442
+#, c-format
+msgid ""
+"more than %i tags found; listed %i most recent\n"
+"gave up search at %s\n"
msgstr ""
-#: builtin/pack-objects.c:2974
-msgid "maximum size of each output pack file"
+#: builtin/describe.c:510
+#, c-format
+msgid "describe %s\n"
msgstr ""
-#: builtin/pack-objects.c:2976
-msgid "ignore borrowed objects from alternate object store"
+#: builtin/describe.c:513
+#, c-format
+msgid "Not a valid object name %s"
msgstr ""
-#: builtin/pack-objects.c:2978
-msgid "ignore packed objects"
+#: builtin/describe.c:521
+#, c-format
+msgid "%s is neither a commit nor blob"
msgstr ""
-#: builtin/pack-objects.c:2980
-msgid "limit pack window by objects"
+#: builtin/describe.c:535
+msgid "find the tag that comes after the commit"
msgstr ""
-#: builtin/pack-objects.c:2982
-msgid "limit pack window by memory in addition to object limit"
+#: builtin/describe.c:536
+msgid "debug search strategy on stderr"
msgstr ""
-#: builtin/pack-objects.c:2984
-msgid "maximum length of delta chain allowed in the resulting pack"
+#: builtin/describe.c:537
+msgid "use any ref"
msgstr ""
-#: builtin/pack-objects.c:2986
-msgid "reuse existing deltas"
+#: builtin/describe.c:538
+msgid "use any tag, even unannotated"
msgstr ""
-#: builtin/pack-objects.c:2988
-msgid "reuse existing objects"
+#: builtin/describe.c:539
+msgid "always use long format"
msgstr ""
-#: builtin/pack-objects.c:2990
-msgid "use OFS_DELTA objects"
+#: builtin/describe.c:540
+msgid "only follow first parent"
msgstr ""
-#: builtin/pack-objects.c:2992
-msgid "use threads when searching for best delta matches"
+#: builtin/describe.c:543
+msgid "only output exact matches"
msgstr ""
-#: builtin/pack-objects.c:2994
-msgid "do not create an empty pack output"
+#: builtin/describe.c:545
+msgid "consider <n> most recent tags (default: 10)"
msgstr ""
-#: builtin/pack-objects.c:2996
-msgid "read revision arguments from standard input"
+#: builtin/describe.c:547
+msgid "only consider tags matching <pattern>"
msgstr ""
-#: builtin/pack-objects.c:2998
-msgid "limit the objects to those that are not yet packed"
+#: builtin/describe.c:549
+msgid "do not consider tags matching <pattern>"
msgstr ""
-#: builtin/pack-objects.c:3001
-msgid "include objects reachable from any reference"
+#: builtin/describe.c:551 builtin/name-rev.c:426
+msgid "show abbreviated commit object as fallback"
msgstr ""
-#: builtin/pack-objects.c:3004
-msgid "include objects referred by reflog entries"
+#: builtin/describe.c:552 builtin/describe.c:555
+msgid "mark"
msgstr ""
-#: builtin/pack-objects.c:3007
-msgid "include objects referred to by the index"
+#: builtin/describe.c:553
+msgid "append <mark> on dirty working tree (default: \"-dirty\")"
msgstr ""
-#: builtin/pack-objects.c:3010
-msgid "output pack to stdout"
+#: builtin/describe.c:556
+msgid "append <mark> on broken working tree (default: \"-broken\")"
msgstr ""
-#: builtin/pack-objects.c:3012
-msgid "include tag objects that refer to objects to be packed"
+#: builtin/describe.c:574
+msgid "--long is incompatible with --abbrev=0"
msgstr ""
-#: builtin/pack-objects.c:3014
-msgid "keep unreachable objects"
+#: builtin/describe.c:603
+msgid "No names found, cannot describe anything."
msgstr ""
-#: builtin/pack-objects.c:3016
-msgid "pack loose unreachable objects"
+#: builtin/describe.c:654
+msgid "--dirty is incompatible with commit-ishes"
msgstr ""
-#: builtin/pack-objects.c:3018
-msgid "unpack unreachable objects newer than <time>"
+#: builtin/describe.c:656
+msgid "--broken is incompatible with commit-ishes"
msgstr ""
-#: builtin/pack-objects.c:3021
-msgid "create thin packs"
+#: builtin/diff.c:84
+#, c-format
+msgid "'%s': not a regular file or symlink"
msgstr ""
-#: builtin/pack-objects.c:3023
-msgid "create packs suitable for shallow fetches"
+#: builtin/diff.c:235
+#, c-format
+msgid "invalid option: %s"
msgstr ""
-#: builtin/pack-objects.c:3025
-msgid "ignore packs that have companion .keep file"
+#: builtin/diff.c:350
+msgid "Not a git repository"
msgstr ""
-#: builtin/pack-objects.c:3027
-msgid "pack compression level"
+#: builtin/diff.c:394
+#, c-format
+msgid "invalid object '%s' given."
msgstr ""
-#: builtin/pack-objects.c:3029
-msgid "do not hide commits by grafts"
+#: builtin/diff.c:403
+#, c-format
+msgid "more than two blobs given: '%s'"
msgstr ""
-#: builtin/pack-objects.c:3031
-msgid "use a bitmap index if available to speed up counting objects"
+#: builtin/diff.c:408
+#, c-format
+msgid "unhandled object '%s' given."
msgstr ""
-#: builtin/pack-objects.c:3033
-msgid "write a bitmap index together with the pack index"
+#: builtin/difftool.c:30
+msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
msgstr ""
-#: builtin/pack-objects.c:3036
-msgid "handling for missing objects"
+#: builtin/difftool.c:253
+#, c-format
+msgid "failed: %d"
msgstr ""
-#: builtin/pack-objects.c:3039
-msgid "do not pack objects in promisor packfiles"
+#: builtin/difftool.c:295
+#, c-format
+msgid "could not read symlink %s"
msgstr ""
-#: builtin/pack-objects.c:3178
-msgid "Counting objects"
+#: builtin/difftool.c:297
+#, c-format
+msgid "could not read symlink file %s"
msgstr ""
-#: builtin/pack-refs.c:6
-msgid "git pack-refs [<options>]"
+#: builtin/difftool.c:305
+#, c-format
+msgid "could not read object %s for symlink %s"
msgstr ""
-#: builtin/pack-refs.c:14
-msgid "pack everything"
+#: 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/pack-refs.c:15
-msgid "prune loose refs (default)"
+#: builtin/difftool.c:626
+#, c-format
+msgid "both files modified: '%s' and '%s'."
msgstr ""
-#: builtin/prune-packed.c:8
-msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
+#: builtin/difftool.c:628
+msgid "working tree file has been left."
msgstr ""
-#: builtin/prune-packed.c:41
-msgid "Removing duplicate objects"
+#: builtin/difftool.c:639
+#, c-format
+msgid "temporary files exist in '%s'."
msgstr ""
-#: builtin/prune.c:11
-msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
+#: builtin/difftool.c:640
+msgid "you may want to cleanup or recover these."
msgstr ""
-#: builtin/prune.c:107
-msgid "report pruned objects"
+#: builtin/difftool.c:689
+msgid "use `diff.guitool` instead of `diff.tool`"
msgstr ""
-#: builtin/prune.c:110
-msgid "expire objects older than <time>"
+#: builtin/difftool.c:691
+msgid "perform a full-directory diff"
msgstr ""
-#: builtin/prune.c:112
-msgid "limit traversal to objects outside promisor packfiles"
+#: builtin/difftool.c:693
+msgid "do not prompt before launching a diff tool"
msgstr ""
-#: builtin/prune.c:126
-msgid "cannot prune in a precious-objects repo"
+#: builtin/difftool.c:698
+msgid "use symlinks in dir-diff mode"
msgstr ""
-#: builtin/pull.c:54 builtin/pull.c:56
-#, c-format
-msgid "Invalid value for %s: %s"
+#: builtin/difftool.c:699
+msgid "tool"
msgstr ""
-#: builtin/pull.c:76
-msgid "git pull [<options>] [<repository> [<refspec>...]]"
+#: builtin/difftool.c:700
+msgid "use the specified diff tool"
msgstr ""
-#: builtin/pull.c:127
-msgid "control for recursive fetching of submodules"
+#: builtin/difftool.c:702
+msgid "print a list of diff tools that may be used with `--tool`"
msgstr ""
-#: builtin/pull.c:131
-msgid "Options related to merging"
+#: builtin/difftool.c:705
+msgid ""
+"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
+"code"
msgstr ""
-#: builtin/pull.c:134
-msgid "incorporate changes by rebasing rather than merging"
+#: builtin/difftool.c:708
+msgid "specify a custom command for viewing diffs"
msgstr ""
-#: builtin/pull.c:161 builtin/rebase--helper.c:23 builtin/revert.c:121
-msgid "allow fast-forward"
+#: builtin/difftool.c:709
+msgid "passed to `diff`"
msgstr ""
-#: builtin/pull.c:170
-msgid "automatically stash/stash pop before and after rebase"
+#: builtin/difftool.c:724
+msgid "difftool requires worktree or --no-index"
msgstr ""
-#: builtin/pull.c:186
-msgid "Options related to fetching"
+#: builtin/difftool.c:731
+msgid "--dir-diff is incompatible with --no-index"
msgstr ""
-#: builtin/pull.c:204
-msgid "number of submodules pulled in parallel"
+#: builtin/difftool.c:734
+msgid "--gui, --tool and --extcmd are mutually exclusive"
msgstr ""
-#: builtin/pull.c:299
-#, c-format
-msgid "Invalid value for pull.ff: %s"
+#: builtin/difftool.c:742
+msgid "no <tool> given for --tool=<tool>"
msgstr ""
-#: builtin/pull.c:415
-msgid ""
-"There is no candidate for rebasing against among the refs that you just "
-"fetched."
+#: builtin/difftool.c:749
+msgid "no <cmd> given for --extcmd=<cmd>"
msgstr ""
-#: builtin/pull.c:417
-msgid ""
-"There are no candidates for merging among the refs that you just fetched."
+#: builtin/fast-export.c:29
+msgid "git fast-export [rev-list-opts]"
msgstr ""
-#: builtin/pull.c:418
-msgid ""
-"Generally this means that you provided a wildcard refspec which had no\n"
-"matches on the remote end."
+#: builtin/fast-export.c:1084
+msgid "show progress after <n> objects"
msgstr ""
-#: builtin/pull.c:421
-#, 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/fast-export.c:1086
+msgid "select handling of signed tags"
msgstr ""
-#: builtin/pull.c:426 git-parse-remote.sh:73
-msgid "You are not currently on a branch."
+#: builtin/fast-export.c:1089
+msgid "select handling of tags that tag filtered objects"
msgstr ""
-#: builtin/pull.c:428 builtin/pull.c:443 git-parse-remote.sh:79
-msgid "Please specify which branch you want to rebase against."
+#: builtin/fast-export.c:1092
+msgid "Dump marks to this file"
msgstr ""
-#: builtin/pull.c:430 builtin/pull.c:445 git-parse-remote.sh:82
-msgid "Please specify which branch you want to merge with."
+#: builtin/fast-export.c:1094
+msgid "Import marks from this file"
msgstr ""
-#: builtin/pull.c:431 builtin/pull.c:446
-msgid "See git-pull(1) for details."
+#: builtin/fast-export.c:1096
+msgid "Fake a tagger when tags lack one"
msgstr ""
-#: builtin/pull.c:433 builtin/pull.c:439 builtin/pull.c:448
-#: git-parse-remote.sh:64
-msgid "<remote>"
+#: builtin/fast-export.c:1098
+msgid "Output full tree for each commit"
msgstr ""
-#: builtin/pull.c:433 builtin/pull.c:448 builtin/pull.c:453 git-rebase.sh:477
-#: git-parse-remote.sh:65
-msgid "<branch>"
+#: builtin/fast-export.c:1100
+msgid "Use the done feature to terminate the stream"
msgstr ""
-#: builtin/pull.c:441 git-parse-remote.sh:75
-msgid "There is no tracking information for the current branch."
+#: builtin/fast-export.c:1101
+msgid "Skip output of blob data"
msgstr ""
-#: builtin/pull.c:450 git-parse-remote.sh:95
-msgid ""
-"If you wish to set tracking information for this branch you can do so with:"
+#: builtin/fast-export.c:1102 builtin/log.c:1609
+msgid "refspec"
msgstr ""
-#: builtin/pull.c:455
-#, c-format
-msgid ""
-"Your configuration specifies to merge with the ref '%s'\n"
-"from the remote, but no such ref was fetched."
+#: builtin/fast-export.c:1103
+msgid "Apply refspec to exported refs"
msgstr ""
-#: builtin/pull.c:819
-msgid "ignoring --verify-signatures for rebase"
+#: builtin/fast-export.c:1104
+msgid "anonymize output"
msgstr ""
-#: builtin/pull.c:867
-msgid "--[no-]autostash option is only valid with --rebase."
+#: builtin/fast-export.c:1106
+msgid "Reference parents which are not in fast-export stream by object id"
msgstr ""
-#: builtin/pull.c:875
-msgid "Updating an unborn branch with changes added to the index."
+#: builtin/fast-export.c:1108
+msgid "Show original object ids of blobs/commits"
msgstr ""
-#: builtin/pull.c:878
-msgid "pull with rebase"
+#: builtin/fetch.c:28
+msgid "git fetch [<options>] [<repository> [<refspec>...]]"
msgstr ""
-#: builtin/pull.c:879
-msgid "please commit or stash them."
+#: builtin/fetch.c:29
+msgid "git fetch [<options>] <group>"
msgstr ""
-#: builtin/pull.c:904
-#, c-format
-msgid ""
-"fetch updated the current branch head.\n"
-"fast-forwarding your working tree from\n"
-"commit %s."
+#: builtin/fetch.c:30
+msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
msgstr ""
-#: builtin/pull.c:909
-#, c-format
-msgid ""
-"Cannot fast-forward your working tree.\n"
-"After making sure that you saved anything precious from\n"
-"$ git diff %s\n"
-"output, run\n"
-"$ git reset --hard\n"
-"to recover."
+#: builtin/fetch.c:31
+msgid "git fetch --all [<options>]"
msgstr ""
-#: builtin/pull.c:924
-msgid "Cannot merge multiple branches into empty head."
+#: builtin/fetch.c:115 builtin/pull.c:202
+msgid "fetch from all remotes"
msgstr ""
-#: builtin/pull.c:928
-msgid "Cannot rebase onto multiple branches."
+#: builtin/fetch.c:117 builtin/pull.c:205
+msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr ""
-#: builtin/pull.c:935
-msgid "cannot rebase with locally recorded submodule modifications"
+#: builtin/fetch.c:119 builtin/pull.c:208
+msgid "path to upload pack on remote end"
msgstr ""
-#: builtin/push.c:17
-msgid "git push [<options>] [<repository> [<refspec>...]]"
+#: builtin/fetch.c:120
+msgid "force overwrite of local reference"
msgstr ""
-#: builtin/push.c:92
-msgid "tag shorthand without <tag>"
+#: builtin/fetch.c:122
+msgid "fetch from multiple remotes"
msgstr ""
-#: builtin/push.c:102
-msgid "--delete only accepts plain target ref names"
+#: builtin/fetch.c:124 builtin/pull.c:212
+msgid "fetch all tags and associated objects"
msgstr ""
-#: builtin/push.c:146
-msgid ""
-"\n"
-"To choose either option permanently, see push.default in 'git help config'."
+#: builtin/fetch.c:126
+msgid "do not fetch all tags (--no-tags)"
msgstr ""
-#: builtin/push.c:149
-#, c-format
-msgid ""
-"The upstream branch of your current branch does not match\n"
-"the name of your current branch. To push to the upstream branch\n"
-"on the remote, use\n"
-"\n"
-" git push %s HEAD:%s\n"
-"\n"
-"To push to the branch of the same name on the remote, use\n"
-"\n"
-" git push %s %s\n"
-"%s"
+#: builtin/fetch.c:128
+msgid "number of submodules fetched in parallel"
msgstr ""
-#: builtin/push.c:164
-#, c-format
-msgid ""
-"You are not currently on a branch.\n"
-"To push the history leading to the current (detached HEAD)\n"
-"state now, use\n"
-"\n"
-" git push %s HEAD:<name-of-remote-branch>\n"
+#: builtin/fetch.c:130 builtin/pull.c:215
+msgid "prune remote-tracking branches no longer on remote"
msgstr ""
-#: builtin/push.c:178
-#, c-format
-msgid ""
-"The current branch %s has no upstream branch.\n"
-"To push the current branch and set the remote as upstream, use\n"
-"\n"
-" git push --set-upstream %s %s\n"
+#: builtin/fetch.c:132
+msgid "prune local tags no longer on remote and clobber changed tags"
msgstr ""
-#: builtin/push.c:186
-#, c-format
-msgid "The current branch %s has multiple upstream branches, refusing to push."
+#: builtin/fetch.c:133 builtin/fetch.c:156 builtin/pull.c:139
+msgid "on-demand"
msgstr ""
-#: builtin/push.c:189
-#, 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/fetch.c:134
+msgid "control recursive fetching of submodules"
msgstr ""
-#: builtin/push.c:248
-msgid ""
-"You didn't specify any refspecs to push, and push.default is \"nothing\"."
+#: builtin/fetch.c:138 builtin/pull.c:223
+msgid "keep downloaded pack"
msgstr ""
-#: builtin/push.c:255
-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/fetch.c:140
+msgid "allow updating of HEAD ref"
msgstr ""
-#: builtin/push.c:261
-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/fetch.c:143 builtin/fetch.c:149 builtin/pull.c:226
+msgid "deepen history of shallow clone"
msgstr ""
-#: builtin/push.c:267
-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/fetch.c:145
+msgid "deepen history of shallow repository based on time"
msgstr ""
-#: builtin/push.c:274
-msgid "Updates were rejected because the tag already exists in the remote."
+#: builtin/fetch.c:151 builtin/pull.c:229
+msgid "convert to a complete repository"
+msgstr ""
+
+#: builtin/fetch.c:154
+msgid "prepend this to submodule path output"
msgstr ""
-#: builtin/push.c:277
+#: builtin/fetch.c:157
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"
+"default for recursive fetching of submodules (lower priority than config "
+"files)"
msgstr ""
-#: builtin/push.c:337
-#, c-format
-msgid "Pushing to %s\n"
+#: builtin/fetch.c:161 builtin/pull.c:232
+msgid "accept refs that update .git/shallow"
msgstr ""
-#: builtin/push.c:341
-#, c-format
-msgid "failed to push some refs to '%s'"
+#: builtin/fetch.c:162 builtin/pull.c:234
+msgid "refmap"
msgstr ""
-#: builtin/push.c:372
-#, c-format
-msgid "bad repository '%s'"
+#: builtin/fetch.c:163 builtin/pull.c:235
+msgid "specify fetch refmap"
msgstr ""
-#: builtin/push.c:373
-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/fetch.c:170
+msgid "report that we have only objects reachable from this object"
msgstr ""
-#: builtin/push.c:391
-msgid "--all and --tags are incompatible"
+#: builtin/fetch.c:469
+msgid "Couldn't find remote ref HEAD"
msgstr ""
-#: builtin/push.c:392
-msgid "--all can't be combined with refspecs"
+#: builtin/fetch.c:608
+#, c-format
+msgid "configuration fetch.output contains invalid value %s"
msgstr ""
-#: builtin/push.c:397
-msgid "--mirror and --tags are incompatible"
+#: builtin/fetch.c:705
+#, c-format
+msgid "object %s not found"
msgstr ""
-#: builtin/push.c:398
-msgid "--mirror can't be combined with refspecs"
+#: builtin/fetch.c:709
+msgid "[up to date]"
msgstr ""
-#: builtin/push.c:403
-msgid "--all and --mirror are incompatible"
+#: builtin/fetch.c:722 builtin/fetch.c:738 builtin/fetch.c:801
+msgid "[rejected]"
msgstr ""
-#: builtin/push.c:535
-msgid "repository"
+#: builtin/fetch.c:723
+msgid "can't fetch in current branch"
msgstr ""
-#: builtin/push.c:536 builtin/send-pack.c:163
-msgid "push all refs"
+#: builtin/fetch.c:733
+msgid "[tag update]"
msgstr ""
-#: builtin/push.c:537 builtin/send-pack.c:165
-msgid "mirror all refs"
+#: builtin/fetch.c:734 builtin/fetch.c:771 builtin/fetch.c:784
+#: builtin/fetch.c:796
+msgid "unable to update local ref"
msgstr ""
-#: builtin/push.c:539
-msgid "delete refs"
+#: builtin/fetch.c:738
+msgid "would clobber existing tag"
msgstr ""
-#: builtin/push.c:540
-msgid "push tags (can't be used with --all or --mirror)"
+#: builtin/fetch.c:760
+msgid "[new tag]"
msgstr ""
-#: builtin/push.c:543 builtin/send-pack.c:166
-msgid "force updates"
+#: builtin/fetch.c:763
+msgid "[new branch]"
msgstr ""
-#: builtin/push.c:545 builtin/send-pack.c:180
-msgid "refname>:<expect"
+#: builtin/fetch.c:766
+msgid "[new ref]"
msgstr ""
-#: builtin/push.c:546 builtin/send-pack.c:181
-msgid "require old value of ref to be at this value"
+#: builtin/fetch.c:796
+msgid "forced update"
msgstr ""
-#: builtin/push.c:549
-msgid "control recursive pushing of submodules"
+#: builtin/fetch.c:801
+msgid "non-fast-forward"
msgstr ""
-#: builtin/push.c:551 builtin/send-pack.c:174
-msgid "use thin pack"
+#: builtin/fetch.c:847
+#, c-format
+msgid "%s did not send all necessary objects\n"
msgstr ""
-#: builtin/push.c:552 builtin/push.c:553 builtin/send-pack.c:160
-#: builtin/send-pack.c:161
-msgid "receive pack program"
+#: builtin/fetch.c:868
+#, c-format
+msgid "reject %s because shallow roots are not allowed to be updated"
msgstr ""
-#: builtin/push.c:554
-msgid "set upstream for git pull/status"
+#: builtin/fetch.c:959 builtin/fetch.c:1081
+#, c-format
+msgid "From %.*s\n"
msgstr ""
-#: builtin/push.c:557
-msgid "prune locally removed refs"
+#: builtin/fetch.c:970
+#, c-format
+msgid ""
+"some local refs could not be updated; try running\n"
+" 'git remote prune %s' to remove any old, conflicting branches"
msgstr ""
-#: builtin/push.c:559
-msgid "bypass pre-push hook"
+#: builtin/fetch.c:1051
+#, c-format
+msgid " (%s will become dangling)"
msgstr ""
-#: builtin/push.c:560
-msgid "push missing but relevant tags"
+#: builtin/fetch.c:1052
+#, c-format
+msgid " (%s has become dangling)"
msgstr ""
-#: builtin/push.c:563 builtin/send-pack.c:168
-msgid "GPG sign the push"
+#: builtin/fetch.c:1084
+msgid "[deleted]"
msgstr ""
-#: builtin/push.c:565 builtin/send-pack.c:175
-msgid "request atomic transaction on remote side"
+#: builtin/fetch.c:1085 builtin/remote.c:1036
+msgid "(none)"
msgstr ""
-#: builtin/push.c:566 builtin/send-pack.c:171
-msgid "server-specific"
+#: builtin/fetch.c:1108
+#, c-format
+msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr ""
-#: builtin/push.c:566 builtin/send-pack.c:172
-msgid "option to transmit"
+#: builtin/fetch.c:1127
+#, c-format
+msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr ""
-#: builtin/push.c:583
-msgid "--delete is incompatible with --all, --mirror and --tags"
+#: builtin/fetch.c:1130
+#, c-format
+msgid "Option \"%s\" is ignored for %s\n"
msgstr ""
-#: builtin/push.c:585
-msgid "--delete doesn't make sense without any refs"
+#: builtin/fetch.c:1434
+#, c-format
+msgid "Fetching %s\n"
msgstr ""
-#: builtin/push.c:604
-msgid "push options must not have new line characters"
+#: builtin/fetch.c:1436 builtin/remote.c:100
+#, c-format
+msgid "Could not fetch %s"
msgstr ""
-#: builtin/read-tree.c:40
+#: builtin/fetch.c:1482
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>]])"
+"--filter can only be used with the remote configured in extensions."
+"partialClone"
msgstr ""
-#: builtin/read-tree.c:121
-msgid "write resulting index to <file>"
+#: 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/read-tree.c:124
-msgid "only empty the index"
+#: builtin/fetch.c:1543
+msgid "You need to specify a tag name."
msgstr ""
-#: builtin/read-tree.c:126
-msgid "Merging"
+#: builtin/fetch.c:1594
+msgid "Negative depth in --deepen is not supported"
msgstr ""
-#: builtin/read-tree.c:128
-msgid "perform a merge in addition to a read"
+#: builtin/fetch.c:1596
+msgid "--deepen and --depth are mutually exclusive"
msgstr ""
-#: builtin/read-tree.c:130
-msgid "3-way merge if no file level merging required"
+#: builtin/fetch.c:1601
+msgid "--depth and --unshallow cannot be used together"
msgstr ""
-#: builtin/read-tree.c:132
-msgid "3-way merge in presence of adds and removes"
+#: builtin/fetch.c:1603
+msgid "--unshallow on a complete repository does not make sense"
msgstr ""
-#: builtin/read-tree.c:134
-msgid "same as -m, but discard unmerged entries"
+#: builtin/fetch.c:1619
+msgid "fetch --all does not take a repository argument"
msgstr ""
-#: builtin/read-tree.c:135
-msgid "<subdirectory>/"
+#: builtin/fetch.c:1621
+msgid "fetch --all does not make sense with refspecs"
msgstr ""
-#: builtin/read-tree.c:136
-msgid "read the tree into the index under <subdirectory>/"
+#: builtin/fetch.c:1630
+#, c-format
+msgid "No such remote or remote group: %s"
msgstr ""
-#: builtin/read-tree.c:139
-msgid "update working tree with merge result"
+#: builtin/fetch.c:1637
+msgid "Fetching a group and specifying refspecs does not make sense"
msgstr ""
-#: builtin/read-tree.c:141
-msgid "gitignore"
+#: builtin/fetch.c:1653
+msgid ""
+"--filter can only be used with the remote configured in extensions."
+"partialclone"
msgstr ""
-#: builtin/read-tree.c:142
-msgid "allow explicitly ignored files to be overwritten"
+#: builtin/fmt-merge-msg.c:18
+msgid ""
+"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
msgstr ""
-#: builtin/read-tree.c:145
-msgid "don't check the working tree after merging"
+#: builtin/fmt-merge-msg.c:672
+msgid "populate log with at most <n> entries from shortlog"
msgstr ""
-#: builtin/read-tree.c:146
-msgid "don't update the index or the work tree"
+#: builtin/fmt-merge-msg.c:675
+msgid "alias for --log (deprecated)"
msgstr ""
-#: builtin/read-tree.c:148
-msgid "skip applying sparse checkout filter"
+#: builtin/fmt-merge-msg.c:678
+msgid "text"
msgstr ""
-#: builtin/read-tree.c:150
-msgid "debug unpack-trees"
+#: builtin/fmt-merge-msg.c:679
+msgid "use <text> as start of message"
msgstr ""
-#: builtin/rebase--helper.c:8
-msgid "git rebase--helper [<options>]"
+#: builtin/fmt-merge-msg.c:680
+msgid "file to read from"
msgstr ""
-#: builtin/rebase--helper.c:24
-msgid "keep empty commits"
+#: builtin/for-each-ref.c:10
+msgid "git for-each-ref [<options>] [<pattern>]"
msgstr ""
-#: builtin/rebase--helper.c:26 builtin/revert.c:123
-msgid "allow commits with empty messages"
+#: builtin/for-each-ref.c:11
+msgid "git for-each-ref [--points-at <object>]"
msgstr ""
-#: builtin/rebase--helper.c:27
-msgid "continue rebase"
+#: builtin/for-each-ref.c:12
+msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]"
msgstr ""
-#: builtin/rebase--helper.c:29
-msgid "abort rebase"
+#: builtin/for-each-ref.c:13
+msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
msgstr ""
-#: builtin/rebase--helper.c:32
-msgid "make rebase script"
+#: builtin/for-each-ref.c:28
+msgid "quote placeholders suitably for shells"
msgstr ""
-#: builtin/rebase--helper.c:34
-msgid "shorten commit ids in the todo list"
+#: builtin/for-each-ref.c:30
+msgid "quote placeholders suitably for perl"
msgstr ""
-#: builtin/rebase--helper.c:36
-msgid "expand commit ids in the todo list"
+#: builtin/for-each-ref.c:32
+msgid "quote placeholders suitably for python"
msgstr ""
-#: builtin/rebase--helper.c:38
-msgid "check the todo list"
+#: builtin/for-each-ref.c:34
+msgid "quote placeholders suitably for Tcl"
msgstr ""
-#: builtin/rebase--helper.c:40
-msgid "skip unnecessary picks"
+#: builtin/for-each-ref.c:37
+msgid "show only <n> matched refs"
msgstr ""
-#: builtin/rebase--helper.c:42
-msgid "rearrange fixup/squash lines"
+#: builtin/for-each-ref.c:39 builtin/tag.c:433
+msgid "respect format colors"
msgstr ""
-#: builtin/rebase--helper.c:44
-msgid "insert exec commands in todo list"
+#: builtin/for-each-ref.c:42
+msgid "print only refs which points at the given object"
msgstr ""
-#: builtin/receive-pack.c:30
-msgid "git receive-pack <git-dir>"
+#: builtin/for-each-ref.c:44
+msgid "print only refs that are merged"
msgstr ""
-#: builtin/receive-pack.c:841
-msgid ""
-"By default, updating the current branch in a non-bare repository\n"
-"is denied, because it will make the index and work tree inconsistent\n"
-"with what you pushed, and will require 'git reset --hard' to match\n"
-"the work tree to HEAD.\n"
-"\n"
-"You can set the 'receive.denyCurrentBranch' configuration variable\n"
-"to 'ignore' or 'warn' in the remote repository to allow pushing into\n"
-"its current branch; however, this is not recommended unless you\n"
-"arranged to update its work tree to match what you pushed in some\n"
-"other way.\n"
-"\n"
-"To squelch this message and still keep the default behaviour, set\n"
-"'receive.denyCurrentBranch' configuration variable to 'refuse'."
+#: builtin/for-each-ref.c:45
+msgid "print only refs that are not merged"
msgstr ""
-#: builtin/receive-pack.c:861
-msgid ""
-"By default, deleting the current branch is denied, because the next\n"
-"'git clone' won't result in any file checked out, causing confusion.\n"
-"\n"
-"You can set 'receive.denyDeleteCurrent' configuration variable to\n"
-"'warn' or 'ignore' in the remote repository to allow deleting the\n"
-"current branch, with or without a warning message.\n"
-"\n"
-"To squelch this message, you can set it to 'refuse'."
+#: builtin/for-each-ref.c:46
+msgid "print only refs which contain the commit"
msgstr ""
-#: builtin/receive-pack.c:1934
-msgid "quiet"
+#: builtin/for-each-ref.c:47
+msgid "print only refs which don't contain the commit"
msgstr ""
-#: builtin/receive-pack.c:1948
-msgid "You must specify a directory."
+#: builtin/fsck.c:88 builtin/fsck.c:160 builtin/fsck.c:161
+msgid "unknown"
msgstr ""
-#: builtin/reflog.c:532 builtin/reflog.c:537
+#. TRANSLATORS: e.g. error in tree 01bfda: <more explanation>
+#: builtin/fsck.c:120 builtin/fsck.c:136
#, c-format
-msgid "'%s' is not a valid timestamp"
+msgid "error in %s %s: %s"
msgstr ""
-#: builtin/remote.c:13
-msgid "git remote [-v | --verbose]"
+#. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation>
+#: builtin/fsck.c:131
+#, c-format
+msgid "warning in %s %s: %s"
msgstr ""
-#: builtin/remote.c:14
-msgid ""
-"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
-"mirror=<fetch|push>] <name> <url>"
+#: builtin/fsck.c:157 builtin/fsck.c:159
+#, c-format
+msgid "broken link from %7s %s"
msgstr ""
-#: builtin/remote.c:15 builtin/remote.c:35
-msgid "git remote rename <old> <new>"
+#: builtin/fsck.c:168
+msgid "wrong object type in link"
msgstr ""
-#: builtin/remote.c:16 builtin/remote.c:40
-msgid "git remote remove <name>"
+#: builtin/fsck.c:184
+#, c-format
+msgid ""
+"broken link from %7s %s\n"
+" to %7s %s"
msgstr ""
-#: builtin/remote.c:17 builtin/remote.c:45
-msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
+#: builtin/fsck.c:295
+#, c-format
+msgid "missing %s %s"
msgstr ""
-#: builtin/remote.c:18
-msgid "git remote [-v | --verbose] show [-n] <name>"
+#: builtin/fsck.c:321
+#, c-format
+msgid "unreachable %s %s"
msgstr ""
-#: builtin/remote.c:19
-msgid "git remote prune [-n | --dry-run] <name>"
+#: builtin/fsck.c:340
+#, c-format
+msgid "dangling %s %s"
msgstr ""
-#: builtin/remote.c:20
-msgid ""
-"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
+#: builtin/fsck.c:349
+msgid "could not create lost-found"
msgstr ""
-#: builtin/remote.c:21
-msgid "git remote set-branches [--add] <name> <branch>..."
+#: builtin/fsck.c:360
+#, c-format
+msgid "could not finish '%s'"
msgstr ""
-#: builtin/remote.c:22 builtin/remote.c:71
-msgid "git remote get-url [--push] [--all] <name>"
+#: builtin/fsck.c:377
+#, c-format
+msgid "Checking %s"
msgstr ""
-#: builtin/remote.c:23 builtin/remote.c:76
-msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
+#: builtin/fsck.c:415
+#, c-format
+msgid "Checking connectivity (%d objects)"
msgstr ""
-#: builtin/remote.c:24 builtin/remote.c:77
-msgid "git remote set-url --add <name> <newurl>"
+#: builtin/fsck.c:434
+#, c-format
+msgid "Checking %s %s"
msgstr ""
-#: builtin/remote.c:25 builtin/remote.c:78
-msgid "git remote set-url --delete <name> <url>"
+#: builtin/fsck.c:438
+msgid "broken links"
msgstr ""
-#: builtin/remote.c:30
-msgid "git remote add [<options>] <name> <url>"
+#: builtin/fsck.c:447
+#, c-format
+msgid "root %s"
msgstr ""
-#: builtin/remote.c:50
-msgid "git remote set-branches <name> <branch>..."
+#: builtin/fsck.c:455
+#, c-format
+msgid "tagged %s %s (%s) in %s"
msgstr ""
-#: builtin/remote.c:51
-msgid "git remote set-branches --add <name> <branch>..."
+#: builtin/fsck.c:484
+#, c-format
+msgid "%s: object corrupt or missing"
msgstr ""
-#: builtin/remote.c:56
-msgid "git remote show [<options>] <name>"
+#: builtin/fsck.c:509
+#, c-format
+msgid "%s: invalid reflog entry %s"
msgstr ""
-#: builtin/remote.c:61
-msgid "git remote prune [<options>] <name>"
+#: builtin/fsck.c:523
+#, c-format
+msgid "Checking reflog %s->%s"
msgstr ""
-#: builtin/remote.c:66
-msgid "git remote update [<options>] [<group> | <remote>]..."
+#: builtin/fsck.c:557
+#, c-format
+msgid "%s: invalid sha1 pointer %s"
msgstr ""
-#: builtin/remote.c:95
+#: builtin/fsck.c:564
#, c-format
-msgid "Updating %s"
+msgid "%s: not a commit"
msgstr ""
-#: builtin/remote.c:127
-msgid ""
-"--mirror is dangerous and deprecated; please\n"
-"\t use --mirror=fetch or --mirror=push instead"
+#: builtin/fsck.c:619
+msgid "notice: No default references"
msgstr ""
-#: builtin/remote.c:144
+#: builtin/fsck.c:634
#, c-format
-msgid "unknown mirror argument: %s"
+msgid "%s: object corrupt or missing: %s"
msgstr ""
-#: builtin/remote.c:160
-msgid "fetch the remote branches"
+#: builtin/fsck.c:647
+#, c-format
+msgid "%s: object could not be parsed: %s"
msgstr ""
-#: builtin/remote.c:162
-msgid "import all tags and associated objects when fetching"
+#: builtin/fsck.c:667
+#, c-format
+msgid "bad sha1 file: %s"
msgstr ""
-#: builtin/remote.c:165
-msgid "or do not fetch any tag at all (--no-tags)"
+#: builtin/fsck.c:682
+msgid "Checking object directory"
msgstr ""
-#: builtin/remote.c:167
-msgid "branch(es) to track"
+#: builtin/fsck.c:685
+msgid "Checking object directories"
msgstr ""
-#: builtin/remote.c:168
-msgid "master branch"
+#: builtin/fsck.c:700
+#, c-format
+msgid "Checking %s link"
msgstr ""
-#: builtin/remote.c:169
-msgid "push|fetch"
+#: builtin/fsck.c:705 builtin/index-pack.c:841
+#, c-format
+msgid "invalid %s"
msgstr ""
-#: builtin/remote.c:170
-msgid "set up remote as a mirror to push to or fetch from"
+#: builtin/fsck.c:712
+#, c-format
+msgid "%s points to something strange (%s)"
msgstr ""
-#: builtin/remote.c:182
-msgid "specifying a master branch makes no sense with --mirror"
+#: builtin/fsck.c:718
+#, c-format
+msgid "%s: detached HEAD points at nothing"
msgstr ""
-#: builtin/remote.c:184
-msgid "specifying branches to track makes sense only with fetch mirrors"
+#: builtin/fsck.c:722
+#, c-format
+msgid "notice: %s points to an unborn branch (%s)"
msgstr ""
-#: builtin/remote.c:191 builtin/remote.c:631
-#, c-format
-msgid "remote %s already exists."
+#: builtin/fsck.c:734
+msgid "Checking cache tree"
msgstr ""
-#: builtin/remote.c:195 builtin/remote.c:635
+#: builtin/fsck.c:739
#, c-format
-msgid "'%s' is not a valid remote name"
+msgid "%s: invalid sha1 pointer in cache-tree"
msgstr ""
-#: builtin/remote.c:235
-#, c-format
-msgid "Could not setup master '%s'"
+#: builtin/fsck.c:750
+msgid "non-tree in cache-tree"
msgstr ""
-#: builtin/remote.c:337
-#, c-format
-msgid "Could not get fetch map for refspec %s"
+#: builtin/fsck.c:781
+msgid "git fsck [<options>] [<object>...]"
msgstr ""
-#: builtin/remote.c:438 builtin/remote.c:446
-msgid "(matching)"
+#: builtin/fsck.c:787
+msgid "show unreachable objects"
msgstr ""
-#: builtin/remote.c:450
-msgid "(delete)"
+#: builtin/fsck.c:788
+msgid "show dangling objects"
msgstr ""
-#: builtin/remote.c:624 builtin/remote.c:759 builtin/remote.c:858
-#, c-format
-msgid "No such remote: %s"
+#: builtin/fsck.c:789
+msgid "report tags"
msgstr ""
-#: builtin/remote.c:641
-#, c-format
-msgid "Could not rename config section '%s' to '%s'"
+#: builtin/fsck.c:790
+msgid "report root nodes"
msgstr ""
-#: builtin/remote.c:661
-#, c-format
-msgid ""
-"Not updating non-default fetch refspec\n"
-"\t%s\n"
-"\tPlease update the configuration manually if necessary."
+#: builtin/fsck.c:791
+msgid "make index objects head nodes"
msgstr ""
-#: builtin/remote.c:697
-#, c-format
-msgid "deleting '%s' failed"
+#: builtin/fsck.c:792
+msgid "make reflogs head nodes (default)"
msgstr ""
-#: builtin/remote.c:731
-#, c-format
-msgid "creating '%s' failed"
+#: builtin/fsck.c:793
+msgid "also consider packs and alternate objects"
msgstr ""
-#: builtin/remote.c:796
-msgid ""
-"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
-"to delete it, use:"
-msgid_plural ""
-"Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
-"to delete them, use:"
-msgstr[0] ""
-msgstr[1] ""
+#: builtin/fsck.c:794
+msgid "check only connectivity"
+msgstr ""
-#: builtin/remote.c:810
-#, c-format
-msgid "Could not remove config section '%s'"
+#: builtin/fsck.c:795
+msgid "enable more strict checking"
msgstr ""
-#: builtin/remote.c:911
-#, c-format
-msgid " new (next fetch will store in remotes/%s)"
+#: builtin/fsck.c:797
+msgid "write dangling objects in .git/lost-found"
msgstr ""
-#: builtin/remote.c:914
-msgid " tracked"
+#: builtin/fsck.c:798 builtin/prune.c:132
+msgid "show progress"
msgstr ""
-#: builtin/remote.c:916
-msgid " stale (use 'git remote prune' to remove)"
+#: builtin/fsck.c:799
+msgid "show verbose names for reachable objects"
msgstr ""
-#: builtin/remote.c:918
-msgid " ???"
+#: builtin/fsck.c:859 builtin/index-pack.c:224
+msgid "Checking objects"
msgstr ""
-#: builtin/remote.c:959
+#: builtin/fsck.c:887
#, c-format
-msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
+msgid "%s: object missing"
msgstr ""
-#: builtin/remote.c:967
+#: builtin/fsck.c:899
#, c-format
-msgid "rebases interactively onto remote %s"
+msgid "invalid parameter: expected sha1, got '%s'"
+msgstr ""
+
+#: builtin/gc.c:34
+msgid "git gc [<options>]"
msgstr ""
-#: builtin/remote.c:968
+#: builtin/gc.c:90
#, c-format
-msgid "rebases onto remote %s"
+msgid "Failed to fstat %s: %s"
msgstr ""
-#: builtin/remote.c:971
+#: builtin/gc.c:126
#, c-format
-msgid " merges with remote %s"
+msgid "failed to parse '%s' value '%s'"
msgstr ""
-#: builtin/remote.c:974
+#: builtin/gc.c:476 builtin/init-db.c:55
#, c-format
-msgid "merges with remote %s"
+msgid "cannot stat '%s'"
msgstr ""
-#: builtin/remote.c:977
+#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:519
#, c-format
-msgid "%-*s and with remote %s\n"
+msgid "cannot read '%s'"
msgstr ""
-#: builtin/remote.c:1020
-msgid "create"
+#: 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/remote.c:1023
-msgid "delete"
+#: builtin/gc.c:540
+msgid "prune unreferenced objects"
msgstr ""
-#: builtin/remote.c:1027
-msgid "up to date"
+#: builtin/gc.c:542
+msgid "be more thorough (increased runtime)"
msgstr ""
-#: builtin/remote.c:1030
-msgid "fast-forwardable"
+#: builtin/gc.c:543
+msgid "enable auto-gc mode"
msgstr ""
-#: builtin/remote.c:1033
-msgid "local out of date"
+#: builtin/gc.c:546
+msgid "force running gc even if there may be another gc running"
msgstr ""
-#: builtin/remote.c:1040
-#, c-format
-msgid " %-*s forces to %-*s (%s)"
+#: builtin/gc.c:549
+msgid "repack all other packs except the largest pack"
msgstr ""
-#: builtin/remote.c:1043
+#: builtin/gc.c:566
#, c-format
-msgid " %-*s pushes to %-*s (%s)"
+msgid "failed to parse gc.logexpiry value %s"
msgstr ""
-#: builtin/remote.c:1047
+#: builtin/gc.c:577
#, c-format
-msgid " %-*s forces to %s"
+msgid "failed to parse prune expiry value %s"
msgstr ""
-#: builtin/remote.c:1050
+#: builtin/gc.c:597
#, c-format
-msgid " %-*s pushes to %s"
+msgid "Auto packing the repository in background for optimum performance.\n"
msgstr ""
-#: builtin/remote.c:1118
-msgid "do not query remotes"
+#: builtin/gc.c:599
+#, c-format
+msgid "Auto packing the repository for optimum performance.\n"
msgstr ""
-#: builtin/remote.c:1145
+#: builtin/gc.c:600
#, c-format
-msgid "* remote %s"
+msgid "See \"git help gc\" for manual housekeeping.\n"
msgstr ""
-#: builtin/remote.c:1146
+#: builtin/gc.c:640
#, c-format
-msgid " Fetch URL: %s"
+msgid ""
+"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
msgstr ""
-#: builtin/remote.c:1147 builtin/remote.c:1163 builtin/remote.c:1302
-msgid "(no URL)"
+#: builtin/gc.c:693
+msgid ""
+"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr ""
-#. TRANSLATORS: the colon ':' should align
-#. with the one in " Fetch URL: %s"
-#. translation.
-#.
-#: builtin/remote.c:1161 builtin/remote.c:1163
-#, c-format
-msgid " Push URL: %s"
+#: builtin/grep.c:29
+msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
msgstr ""
-#: builtin/remote.c:1165 builtin/remote.c:1167 builtin/remote.c:1169
+#: builtin/grep.c:225
#, c-format
-msgid " HEAD branch: %s"
-msgstr ""
-
-#: builtin/remote.c:1165
-msgid "(not queried)"
+msgid "grep: failed to create thread: %s"
msgstr ""
-#: builtin/remote.c:1167
-msgid "(unknown)"
+#: builtin/grep.c:279
+#, c-format
+msgid "invalid number of threads specified (%d) for %s"
msgstr ""
-#: builtin/remote.c:1171
+#. 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 ""
-" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
+msgid "no threads support, ignoring %s"
msgstr ""
-#: builtin/remote.c:1183
+#: builtin/grep.c:466 builtin/grep.c:590 builtin/grep.c:631
#, c-format
-msgid " Remote branch:%s"
-msgid_plural " Remote branches:%s"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/remote.c:1186 builtin/remote.c:1212
-msgid " (status not queried)"
+msgid "unable to read tree (%s)"
msgstr ""
-#: builtin/remote.c:1195
-msgid " Local branch configured for 'git pull':"
-msgid_plural " Local branches configured for 'git pull':"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/remote.c:1203
-msgid " Local refs will be mirrored by 'git push'"
+#: builtin/grep.c:646
+#, c-format
+msgid "unable to grep from object of type %s"
msgstr ""
-#: builtin/remote.c:1209
+#: builtin/grep.c:712
#, c-format
-msgid " Local ref configured for 'git push'%s:"
-msgid_plural " Local refs configured for 'git push'%s:"
-msgstr[0] ""
-msgstr[1] ""
+msgid "switch `%c' expects a numerical value"
+msgstr ""
-#: builtin/remote.c:1230
-msgid "set refs/remotes/<name>/HEAD according to remote"
+#: builtin/grep.c:811
+msgid "search in index instead of in the work tree"
msgstr ""
-#: builtin/remote.c:1232
-msgid "delete refs/remotes/<name>/HEAD"
+#: builtin/grep.c:813
+msgid "find in contents not managed by git"
msgstr ""
-#: builtin/remote.c:1247
-msgid "Cannot determine remote HEAD"
+#: builtin/grep.c:815
+msgid "search in both tracked and untracked files"
msgstr ""
-#: builtin/remote.c:1249
-msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
+#: builtin/grep.c:817
+msgid "ignore files specified via '.gitignore'"
msgstr ""
-#: builtin/remote.c:1259
-#, c-format
-msgid "Could not delete %s"
+#: builtin/grep.c:819
+msgid "recursively search in each submodule"
msgstr ""
-#: builtin/remote.c:1267
-#, c-format
-msgid "Not a valid ref: %s"
+#: builtin/grep.c:822
+msgid "show non-matching lines"
msgstr ""
-#: builtin/remote.c:1269
-#, c-format
-msgid "Could not setup %s"
+#: builtin/grep.c:824
+msgid "case insensitive matching"
msgstr ""
-#: builtin/remote.c:1287
-#, c-format
-msgid " %s will become dangling!"
+#: builtin/grep.c:826
+msgid "match patterns only at word boundaries"
msgstr ""
-#: builtin/remote.c:1288
-#, c-format
-msgid " %s has become dangling!"
+#: builtin/grep.c:828
+msgid "process binary files as text"
msgstr ""
-#: builtin/remote.c:1298
-#, c-format
-msgid "Pruning %s"
+#: builtin/grep.c:830
+msgid "don't match patterns in binary files"
msgstr ""
-#: builtin/remote.c:1299
-#, c-format
-msgid "URL: %s"
+#: builtin/grep.c:833
+msgid "process binary files with textconv filters"
msgstr ""
-#: builtin/remote.c:1315
-#, c-format
-msgid " * [would prune] %s"
+#: builtin/grep.c:835
+msgid "search in subdirectories (default)"
msgstr ""
-#: builtin/remote.c:1318
-#, c-format
-msgid " * [pruned] %s"
+#: builtin/grep.c:837
+msgid "descend at most <depth> levels"
msgstr ""
-#: builtin/remote.c:1363
-msgid "prune remotes after fetching"
+#: builtin/grep.c:841
+msgid "use extended POSIX regular expressions"
msgstr ""
-#: builtin/remote.c:1426 builtin/remote.c:1480 builtin/remote.c:1548
-#, c-format
-msgid "No such remote '%s'"
+#: builtin/grep.c:844
+msgid "use basic POSIX regular expressions (default)"
msgstr ""
-#: builtin/remote.c:1442
-msgid "add branch"
+#: builtin/grep.c:847
+msgid "interpret patterns as fixed strings"
msgstr ""
-#: builtin/remote.c:1449
-msgid "no remote specified"
+#: builtin/grep.c:850
+msgid "use Perl-compatible regular expressions"
msgstr ""
-#: builtin/remote.c:1466
-msgid "query push URLs rather than fetch URLs"
+#: builtin/grep.c:853
+msgid "show line numbers"
msgstr ""
-#: builtin/remote.c:1468
-msgid "return all URLs"
+#: builtin/grep.c:854
+msgid "show column number of first match"
msgstr ""
-#: builtin/remote.c:1496
-#, c-format
-msgid "no URLs configured for remote '%s'"
+#: builtin/grep.c:855
+msgid "don't show filenames"
msgstr ""
-#: builtin/remote.c:1522
-msgid "manipulate push URLs"
+#: builtin/grep.c:856
+msgid "show filenames"
msgstr ""
-#: builtin/remote.c:1524
-msgid "add URL"
+#: builtin/grep.c:858
+msgid "show filenames relative to top directory"
msgstr ""
-#: builtin/remote.c:1526
-msgid "delete URLs"
+#: builtin/grep.c:860
+msgid "show only filenames instead of matching lines"
msgstr ""
-#: builtin/remote.c:1533
-msgid "--add --delete doesn't make sense"
+#: builtin/grep.c:862
+msgid "synonym for --files-with-matches"
msgstr ""
-#: builtin/remote.c:1572
-#, c-format
-msgid "Invalid old URL pattern: %s"
+#: builtin/grep.c:865
+msgid "show only the names of files without match"
msgstr ""
-#: builtin/remote.c:1580
-#, c-format
-msgid "No such URL found: %s"
+#: builtin/grep.c:867
+msgid "print NUL after filenames"
msgstr ""
-#: builtin/remote.c:1582
-msgid "Will not delete all non-push URLs"
-msgstr ""
-
-#: builtin/remote.c:1598
-msgid "be verbose; must be placed before a subcommand"
-msgstr ""
-
-#: builtin/remote.c:1629
-#, c-format
-msgid "Unknown subcommand: %s"
+#: builtin/grep.c:870
+msgid "show only matching parts of a line"
msgstr ""
-#: builtin/repack.c:18
-msgid "git repack [<options>]"
+#: builtin/grep.c:872
+msgid "show the number of matches instead of matching lines"
msgstr ""
-#: builtin/repack.c:23
-msgid ""
-"Incremental repacks are incompatible with bitmap indexes. Use\n"
-"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
+#: builtin/grep.c:873
+msgid "highlight matches"
msgstr ""
-#: builtin/repack.c:170
-msgid "pack everything in a single pack"
+#: builtin/grep.c:875
+msgid "print empty line between matches from different files"
msgstr ""
-#: builtin/repack.c:172
-msgid "same as -a, and turn unreachable objects loose"
+#: builtin/grep.c:877
+msgid "show filename only once above matches from same file"
msgstr ""
-#: builtin/repack.c:175
-msgid "remove redundant packs, and run git-prune-packed"
+#: builtin/grep.c:880
+msgid "show <n> context lines before and after matches"
msgstr ""
-#: builtin/repack.c:177
-msgid "pass --no-reuse-delta to git-pack-objects"
+#: builtin/grep.c:883
+msgid "show <n> context lines before matches"
msgstr ""
-#: builtin/repack.c:179
-msgid "pass --no-reuse-object to git-pack-objects"
+#: builtin/grep.c:885
+msgid "show <n> context lines after matches"
msgstr ""
-#: builtin/repack.c:181
-msgid "do not run git-update-server-info"
+#: builtin/grep.c:887
+msgid "use <n> worker threads"
msgstr ""
-#: builtin/repack.c:184
-msgid "pass --local to git-pack-objects"
+#: builtin/grep.c:888
+msgid "shortcut for -C NUM"
msgstr ""
-#: builtin/repack.c:186
-msgid "write bitmap index"
+#: builtin/grep.c:891
+msgid "show a line with the function name before matches"
msgstr ""
-#: builtin/repack.c:187
-msgid "approxidate"
+#: builtin/grep.c:893
+msgid "show the surrounding function"
msgstr ""
-#: builtin/repack.c:188
-msgid "with -A, do not loosen objects older than this"
+#: builtin/grep.c:896
+msgid "read patterns from file"
msgstr ""
-#: builtin/repack.c:190
-msgid "with -a, repack unreachable objects"
+#: builtin/grep.c:898
+msgid "match <pattern>"
msgstr ""
-#: builtin/repack.c:192
-msgid "size of the window used for delta compression"
+#: builtin/grep.c:900
+msgid "combine patterns specified with -e"
msgstr ""
-#: builtin/repack.c:193 builtin/repack.c:199
-msgid "bytes"
+#: builtin/grep.c:912
+msgid "indicate hit with exit status without output"
msgstr ""
-#: builtin/repack.c:194
-msgid "same as the above, but limit memory size instead of entries count"
+#: builtin/grep.c:914
+msgid "show only matches from files that match all patterns"
msgstr ""
-#: builtin/repack.c:196
-msgid "limits the maximum delta depth"
+#: builtin/grep.c:916
+msgid "show parse tree for grep expression"
msgstr ""
-#: builtin/repack.c:198
-msgid "limits the maximum number of threads"
+#: builtin/grep.c:920
+msgid "pager"
msgstr ""
-#: builtin/repack.c:200
-msgid "maximum size of each packfile"
+#: builtin/grep.c:920
+msgid "show matching files in the pager"
msgstr ""
-#: builtin/repack.c:202
-msgid "repack objects in packs marked with .keep"
+#: builtin/grep.c:924
+msgid "allow calling of grep(1) (ignored by this build)"
msgstr ""
-#: builtin/repack.c:212
-msgid "cannot delete packs in a precious-objects repo"
+#: builtin/grep.c:988
+msgid "no pattern given"
msgstr ""
-#: builtin/repack.c:216
-msgid "--keep-unreachable and -A are incompatible"
+#: builtin/grep.c:1024
+msgid "--no-index or --untracked cannot be used with revs"
msgstr ""
-#: builtin/repack.c:410 builtin/worktree.c:148
+#: builtin/grep.c:1032
#, c-format
-msgid "failed to remove '%s'"
+msgid "unable to resolve revision: %s"
msgstr ""
-#: builtin/replace.c:20
-msgid "git replace [-f] <object> <replacement>"
+#: builtin/grep.c:1063
+msgid "invalid option combination, ignoring --threads"
msgstr ""
-#: builtin/replace.c:21
-msgid "git replace [-f] --edit <object>"
+#: builtin/grep.c:1066 builtin/pack-objects.c:3403
+msgid "no threads support, ignoring --threads"
msgstr ""
-#: builtin/replace.c:22
-msgid "git replace [-f] --graft <commit> [<parent>...]"
+#: 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/replace.c:23
-msgid "git replace -d <object>..."
+#: builtin/grep.c:1092
+msgid "--open-files-in-pager only works on the worktree"
msgstr ""
-#: builtin/replace.c:24
-msgid "git replace [--format=<format>] [-l [<pattern>]]"
+#: builtin/grep.c:1115
+msgid "option not supported with --recurse-submodules"
msgstr ""
-#: builtin/replace.c:331 builtin/replace.c:369 builtin/replace.c:397
-#, c-format
-msgid "Not a valid object name: '%s'"
+#: builtin/grep.c:1121
+msgid "--cached or --untracked cannot be used with --no-index"
msgstr ""
-#: builtin/replace.c:361
-#, c-format
-msgid "bad mergetag in commit '%s'"
+#: builtin/grep.c:1127
+msgid "--[no-]exclude-standard cannot be used for tracked contents"
msgstr ""
-#: builtin/replace.c:363
-#, c-format
-msgid "malformed mergetag in commit '%s'"
+#: builtin/grep.c:1135
+msgid "both --cached and trees are given"
msgstr ""
-#: builtin/replace.c:374
-#, c-format
+#: builtin/hash-object.c:85
msgid ""
-"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
-"instead of --graft"
+"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
+"[--] <file>..."
msgstr ""
-#: builtin/replace.c:407
-#, c-format
-msgid "the original commit '%s' has a gpg signature."
+#: builtin/hash-object.c:86
+msgid "git hash-object --stdin-paths"
msgstr ""
-#: builtin/replace.c:408
-msgid "the signature will be removed in the replacement commit!"
+#: builtin/hash-object.c:98
+msgid "type"
msgstr ""
-#: builtin/replace.c:414
-#, c-format
-msgid "could not write replacement commit for: '%s'"
+#: builtin/hash-object.c:98
+msgid "object type"
msgstr ""
-#: builtin/replace.c:438
-msgid "list replace refs"
+#: builtin/hash-object.c:99
+msgid "write the object into the object database"
msgstr ""
-#: builtin/replace.c:439
-msgid "delete replace refs"
+#: builtin/hash-object.c:101
+msgid "read the object from stdin"
msgstr ""
-#: builtin/replace.c:440
-msgid "edit existing object"
+#: builtin/hash-object.c:103
+msgid "store file as is without filters"
msgstr ""
-#: builtin/replace.c:441
-msgid "change a commit's parents"
+#: builtin/hash-object.c:104
+msgid ""
+"just hash any random garbage to create corrupt objects for debugging Git"
msgstr ""
-#: builtin/replace.c:442
-msgid "replace the ref if it exists"
+#: builtin/hash-object.c:105
+msgid "process file as it were from this path"
msgstr ""
-#: builtin/replace.c:444
-msgid "do not pretty-print contents for --edit"
+#: builtin/help.c:46
+msgid "print all available commands"
msgstr ""
-#: builtin/replace.c:445
-msgid "use this format"
+#: builtin/help.c:47
+msgid "exclude guides"
msgstr ""
-#: builtin/rerere.c:13
-msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
+#: builtin/help.c:48
+msgid "print list of useful guides"
msgstr ""
-#: builtin/rerere.c:59
-msgid "register clean resolutions in index"
+#: builtin/help.c:49
+msgid "print all configuration variable names"
msgstr ""
-#: builtin/reset.c:29
-msgid ""
-"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
+#: builtin/help.c:51
+msgid "show man page"
msgstr ""
-#: builtin/reset.c:30
-msgid "git reset [-q] [<tree-ish>] [--] <paths>..."
+#: builtin/help.c:52
+msgid "show manual in web browser"
msgstr ""
-#: builtin/reset.c:31
-msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
+#: builtin/help.c:54
+msgid "show info page"
msgstr ""
-#: builtin/reset.c:37
-msgid "mixed"
+#: builtin/help.c:56
+msgid "print command description"
msgstr ""
-#: builtin/reset.c:37
-msgid "soft"
+#: builtin/help.c:61
+msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
msgstr ""
-#: builtin/reset.c:37
-msgid "hard"
+#: builtin/help.c:77
+#, c-format
+msgid "unrecognized help format '%s'"
msgstr ""
-#: builtin/reset.c:37
-msgid "merge"
+#: builtin/help.c:104
+msgid "Failed to start emacsclient."
msgstr ""
-#: builtin/reset.c:37
-msgid "keep"
+#: builtin/help.c:117
+msgid "Failed to parse emacsclient version."
msgstr ""
-#: builtin/reset.c:78
-msgid "You do not have a valid HEAD."
+#: builtin/help.c:125
+#, c-format
+msgid "emacsclient version '%d' too old (< 22)."
msgstr ""
-#: builtin/reset.c:80
-msgid "Failed to find tree of HEAD."
+#: 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/reset.c:86
+#: builtin/help.c:221
#, c-format
-msgid "Failed to find tree of %s."
+msgid ""
+"'%s': path for unsupported man viewer.\n"
+"Please consider using 'man.<tool>.cmd' instead."
msgstr ""
-#: builtin/reset.c:111
+#: builtin/help.c:233
#, c-format
-msgid "HEAD is now at %s"
+msgid ""
+"'%s': cmd for supported man viewer.\n"
+"Please consider using 'man.<tool>.path' instead."
msgstr ""
-#: builtin/reset.c:189
+#: builtin/help.c:350
#, c-format
-msgid "Cannot do a %s reset in the middle of a merge."
+msgid "'%s': unknown man viewer."
msgstr ""
-#: builtin/reset.c:289
-msgid "be quiet, only report errors"
+#: builtin/help.c:367
+msgid "no man viewer handled the request"
msgstr ""
-#: builtin/reset.c:291
-msgid "reset HEAD and index"
+#: builtin/help.c:375
+msgid "no info viewer handled the request"
msgstr ""
-#: builtin/reset.c:292
-msgid "reset only HEAD"
+#: builtin/help.c:434 builtin/help.c:445 git.c:335
+#, c-format
+msgid "'%s' is aliased to '%s'"
msgstr ""
-#: builtin/reset.c:294 builtin/reset.c:296
-msgid "reset HEAD, index and working tree"
+#: builtin/help.c:448 git.c:364
+#, c-format
+msgid "bad alias.%s string: %s"
msgstr ""
-#: builtin/reset.c:298
-msgid "reset HEAD but keep local changes"
+#: builtin/help.c:477 builtin/help.c:507
+#, c-format
+msgid "usage: %s%s"
msgstr ""
-#: builtin/reset.c:304
-msgid "record only the fact that removed paths will be added later"
+#: builtin/help.c:491
+msgid "'git help config' for more information"
msgstr ""
-#: builtin/reset.c:321
+#: builtin/index-pack.c:184
#, c-format
-msgid "Failed to resolve '%s' as a valid revision."
+msgid "object type mismatch at %s"
msgstr ""
-#: builtin/reset.c:329
+#: builtin/index-pack.c:204
#, c-format
-msgid "Failed to resolve '%s' as a valid tree."
+msgid "did not receive expected object %s"
msgstr ""
-#: builtin/reset.c:338
-msgid "--patch is incompatible with --{hard,mixed,soft}"
+#: builtin/index-pack.c:207
+#, c-format
+msgid "object %s: expected type %s, found %s"
msgstr ""
-#: builtin/reset.c:347
-msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
+#: 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/reset.c:349
-#, c-format
-msgid "Cannot do %s reset with paths."
+#: builtin/index-pack.c:268
+msgid "read error on input"
msgstr ""
-#: builtin/reset.c:359
-#, c-format
-msgid "%s reset is not allowed in a bare repository"
+#: builtin/index-pack.c:280
+msgid "used more bytes than were available"
msgstr ""
-#: builtin/reset.c:363
-msgid "-N can only be used with --mixed"
+#: builtin/index-pack.c:287 builtin/pack-objects.c:600
+msgid "pack too large for current definition of off_t"
msgstr ""
-#: builtin/reset.c:380
-msgid "Unstaged changes after reset:"
+#: builtin/index-pack.c:290 builtin/unpack-objects.c:94
+msgid "pack exceeds maximum allowed size"
msgstr ""
-#: builtin/reset.c:386
+#: builtin/index-pack.c:305 builtin/repack.c:250
#, c-format
-msgid "Could not reset index file to revision '%s'."
+msgid "unable to create '%s'"
msgstr ""
-#: builtin/reset.c:390
-msgid "Could not write new index file."
+#: builtin/index-pack.c:311
+#, c-format
+msgid "cannot open packfile '%s'"
msgstr ""
-#: builtin/rev-list.c:397
-msgid "cannot combine --exclude-promisor-objects and --missing"
+#: builtin/index-pack.c:325
+msgid "pack signature mismatch"
msgstr ""
-#: builtin/rev-list.c:455
-msgid "object filtering requires --objects"
+#: builtin/index-pack.c:327
+#, c-format
+msgid "pack version %<PRIu32> unsupported"
msgstr ""
-#: builtin/rev-list.c:458
+#: builtin/index-pack.c:345
#, c-format
-msgid "invalid sparse value '%s'"
+msgid "pack has bad object at offset %<PRIuMAX>: %s"
msgstr ""
-#: builtin/rev-list.c:499
-msgid "rev-list does not support display of notes"
+#: builtin/index-pack.c:465
+#, c-format
+msgid "inflate returned %d"
msgstr ""
-#: builtin/rev-list.c:502
-msgid "cannot combine --use-bitmap-index with object filtering"
+#: builtin/index-pack.c:514
+msgid "offset value overflow for delta base object"
msgstr ""
-#: builtin/rev-parse.c:402
-msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
+#: builtin/index-pack.c:522
+msgid "delta base offset is out of bound"
msgstr ""
-#: builtin/rev-parse.c:407
-msgid "keep the `--` passed as an arg"
+#: builtin/index-pack.c:530
+#, c-format
+msgid "unknown object type %d"
msgstr ""
-#: builtin/rev-parse.c:409
-msgid "stop parsing after the first non-option argument"
+#: builtin/index-pack.c:561
+msgid "cannot pread pack file"
msgstr ""
-#: builtin/rev-parse.c:412
-msgid "output in stuck long form"
-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/rev-parse.c:545
-msgid ""
-"git rev-parse --parseopt [<options>] -- [<args>...]\n"
-" or: git rev-parse --sq-quote [<arg>...]\n"
-" or: git rev-parse [<options>] [<arg>...]\n"
-"\n"
-"Run \"git rev-parse --parseopt -h\" for more information on the first usage."
+#: builtin/index-pack.c:589
+msgid "serious inflate inconsistency"
msgstr ""
-#: builtin/revert.c:23
-msgid "git revert [<options>] <commit-ish>..."
+#: 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/revert.c:24
-msgid "git revert <subcommand>"
+#: 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/revert.c:29
-msgid "git cherry-pick [<options>] <commit-ish>..."
+#: builtin/index-pack.c:800
+#, c-format
+msgid "cannot read existing object info %s"
msgstr ""
-#: builtin/revert.c:30
-msgid "git cherry-pick <subcommand>"
+#: builtin/index-pack.c:808
+#, c-format
+msgid "cannot read existing object %s"
msgstr ""
-#: builtin/revert.c:90
+#: builtin/index-pack.c:822
#, c-format
-msgid "%s: %s cannot be used with %s"
+msgid "invalid blob object %s"
msgstr ""
-#: builtin/revert.c:99
-msgid "end revert or cherry-pick sequence"
+#: builtin/index-pack.c:825 builtin/index-pack.c:844
+msgid "fsck error in packed object"
msgstr ""
-#: builtin/revert.c:100
-msgid "resume revert or cherry-pick sequence"
+#: builtin/index-pack.c:846
+#, c-format
+msgid "Not all child objects of %s are reachable"
msgstr ""
-#: builtin/revert.c:101
-msgid "cancel revert or cherry-pick sequence"
+#: builtin/index-pack.c:918 builtin/index-pack.c:949
+msgid "failed to apply delta"
msgstr ""
-#: builtin/revert.c:102
-msgid "don't automatically commit"
+#: builtin/index-pack.c:1117
+msgid "Receiving objects"
msgstr ""
-#: builtin/revert.c:103
-msgid "edit the commit message"
+#: builtin/index-pack.c:1117
+msgid "Indexing objects"
msgstr ""
-#: builtin/revert.c:106
-msgid "parent-number"
+#: builtin/index-pack.c:1151
+msgid "pack is corrupted (SHA1 mismatch)"
+msgstr ""
+
+#: builtin/index-pack.c:1156
+msgid "cannot fstat packfile"
+msgstr ""
+
+#: builtin/index-pack.c:1159
+msgid "pack has junk at the end"
+msgstr ""
+
+#: builtin/index-pack.c:1171
+msgid "confusion beyond insanity in parse_pack_objects()"
+msgstr ""
+
+#: builtin/index-pack.c:1194
+msgid "Resolving deltas"
+msgstr ""
+
+#: builtin/index-pack.c:1204 builtin/pack-objects.c:2489
+#, c-format
+msgid "unable to create thread: %s"
+msgstr ""
+
+#: builtin/index-pack.c:1245
+msgid "confusion beyond insanity"
+msgstr ""
+
+#: builtin/index-pack.c:1251
+#, c-format
+msgid "completed with %d local object"
+msgid_plural "completed with %d local objects"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/index-pack.c:1263
+#, c-format
+msgid "Unexpected tail checksum for %s (disk corruption?)"
+msgstr ""
+
+#: builtin/index-pack.c:1267
+#, c-format
+msgid "pack has %d unresolved delta"
+msgid_plural "pack has %d unresolved deltas"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/index-pack.c:1291
+#, c-format
+msgid "unable to deflate appended object (%d)"
+msgstr ""
+
+#: builtin/index-pack.c:1368
+#, c-format
+msgid "local object %s is corrupt"
+msgstr ""
+
+#: builtin/index-pack.c:1382
+#, c-format
+msgid "packfile name '%s' does not end with '.pack'"
+msgstr ""
+
+#: builtin/index-pack.c:1407
+#, c-format
+msgid "cannot write %s file '%s'"
+msgstr ""
+
+#: builtin/index-pack.c:1415
+#, c-format
+msgid "cannot close written %s file '%s'"
+msgstr ""
+
+#: builtin/index-pack.c:1439
+msgid "error while closing pack file"
+msgstr ""
+
+#: builtin/index-pack.c:1453
+msgid "cannot store pack file"
+msgstr ""
+
+#: builtin/index-pack.c:1461
+msgid "cannot store index file"
+msgstr ""
+
+#: builtin/index-pack.c:1505 builtin/pack-objects.c:2728
+#, c-format
+msgid "bad pack.indexversion=%<PRIu32>"
+msgstr ""
+
+#: builtin/index-pack.c:1573
+#, c-format
+msgid "Cannot open existing pack file '%s'"
+msgstr ""
+
+#: builtin/index-pack.c:1575
+#, c-format
+msgid "Cannot open existing pack idx file for '%s'"
+msgstr ""
+
+#: builtin/index-pack.c:1623
+#, c-format
+msgid "non delta: %d object"
+msgid_plural "non delta: %d objects"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/index-pack.c:1630
+#, c-format
+msgid "chain length = %d: %lu object"
+msgid_plural "chain length = %d: %lu objects"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/index-pack.c:1667
+msgid "Cannot come back to cwd"
+msgstr ""
+
+#: builtin/index-pack.c:1716 builtin/index-pack.c:1719
+#: builtin/index-pack.c:1735 builtin/index-pack.c:1739
+#, c-format
+msgid "bad %s"
+msgstr ""
+
+#: builtin/index-pack.c:1755
+msgid "--fix-thin cannot be used without --stdin"
+msgstr ""
+
+#: builtin/index-pack.c:1757
+msgid "--stdin requires a git repository"
+msgstr ""
+
+#: builtin/index-pack.c:1763
+msgid "--verify with no packfile name given"
+msgstr ""
+
+#: builtin/index-pack.c:1811 builtin/unpack-objects.c:580
+msgid "fsck error in pack objects"
+msgstr ""
+
+#: builtin/init-db.c:61
+#, c-format
+msgid "cannot stat template '%s'"
+msgstr ""
+
+#: builtin/init-db.c:66
+#, c-format
+msgid "cannot opendir '%s'"
+msgstr ""
+
+#: builtin/init-db.c:78
+#, c-format
+msgid "cannot readlink '%s'"
+msgstr ""
+
+#: builtin/init-db.c:80
+#, c-format
+msgid "cannot symlink '%s' '%s'"
+msgstr ""
+
+#: builtin/init-db.c:86
+#, c-format
+msgid "cannot copy '%s' to '%s'"
+msgstr ""
+
+#: builtin/init-db.c:90
+#, c-format
+msgid "ignoring template %s"
+msgstr ""
+
+#: builtin/init-db.c:121
+#, c-format
+msgid "templates not found in %s"
+msgstr ""
+
+#: builtin/init-db.c:136
+#, c-format
+msgid "not copying templates from '%s': %s"
+msgstr ""
+
+#: builtin/init-db.c:334
+#, c-format
+msgid "unable to handle file type %d"
+msgstr ""
+
+#: builtin/init-db.c:337
+#, c-format
+msgid "unable to move %s to %s"
+msgstr ""
+
+#: builtin/init-db.c:354 builtin/init-db.c:357
+#, c-format
+msgid "%s already exists"
+msgstr ""
+
+#: builtin/init-db.c:413
+#, c-format
+msgid "Reinitialized existing shared Git repository in %s%s\n"
+msgstr ""
+
+#: builtin/init-db.c:414
+#, c-format
+msgid "Reinitialized existing Git repository in %s%s\n"
+msgstr ""
+
+#: builtin/init-db.c:418
+#, c-format
+msgid "Initialized empty shared Git repository in %s%s\n"
+msgstr ""
+
+#: builtin/init-db.c:419
+#, c-format
+msgid "Initialized empty Git repository in %s%s\n"
+msgstr ""
+
+#: builtin/init-db.c:468
+msgid ""
+"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
+"shared[=<permissions>]] [<directory>]"
+msgstr ""
+
+#: builtin/init-db.c:491
+msgid "permissions"
+msgstr ""
+
+#: builtin/init-db.c:492
+msgid "specify that the git repository is to be shared amongst several users"
+msgstr ""
+
+#: builtin/init-db.c:526 builtin/init-db.c:531
+#, c-format
+msgid "cannot mkdir %s"
+msgstr ""
+
+#: builtin/init-db.c:535
+#, c-format
+msgid "cannot chdir to %s"
+msgstr ""
+
+#: builtin/init-db.c:556
+#, c-format
+msgid ""
+"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
+"dir=<directory>)"
+msgstr ""
+
+#: builtin/init-db.c:584
+#, c-format
+msgid "Cannot access work tree '%s'"
+msgstr ""
+
+#: builtin/interpret-trailers.c:15
+msgid ""
+"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
+"<token>[(=|:)<value>])...] [<file>...]"
+msgstr ""
+
+#: builtin/interpret-trailers.c:94
+msgid "edit files in place"
+msgstr ""
+
+#: builtin/interpret-trailers.c:95
+msgid "trim empty trailers"
+msgstr ""
+
+#: builtin/interpret-trailers.c:98
+msgid "where to place the new trailer"
+msgstr ""
+
+#: builtin/interpret-trailers.c:100
+msgid "action if trailer already exists"
+msgstr ""
+
+#: builtin/interpret-trailers.c:102
+msgid "action if trailer is missing"
+msgstr ""
+
+#: builtin/interpret-trailers.c:104
+msgid "output only the trailers"
+msgstr ""
+
+#: builtin/interpret-trailers.c:105
+msgid "do not apply config rules"
+msgstr ""
+
+#: builtin/interpret-trailers.c:106
+msgid "join whitespace-continued values"
+msgstr ""
+
+#: builtin/interpret-trailers.c:107
+msgid "set parsing options"
+msgstr ""
+
+#: builtin/interpret-trailers.c:109
+msgid "do not treat --- specially"
+msgstr ""
+
+#: builtin/interpret-trailers.c:110
+msgid "trailer"
+msgstr ""
+
+#: builtin/interpret-trailers.c:111
+msgid "trailer(s) to add"
+msgstr ""
+
+#: builtin/interpret-trailers.c:120
+msgid "--trailer with --only-input does not make sense"
+msgstr ""
+
+#: builtin/interpret-trailers.c:130
+msgid "no input file given for in-place editing"
+msgstr ""
+
+#: builtin/log.c:55
+msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
+msgstr ""
+
+#: builtin/log.c:56
+msgid "git show [<options>] <object>..."
+msgstr ""
+
+#: builtin/log.c:104
+#, c-format
+msgid "invalid --decorate option: %s"
+msgstr ""
+
+#: builtin/log.c:168
+msgid "show source"
+msgstr ""
+
+#: builtin/log.c:169
+msgid "Use mail map file"
+msgstr ""
+
+#: builtin/log.c:171
+msgid "only decorate refs that match <pattern>"
+msgstr ""
+
+#: builtin/log.c:173
+msgid "do not decorate refs that match <pattern>"
+msgstr ""
+
+#: builtin/log.c:174
+msgid "decorate options"
+msgstr ""
+
+#: builtin/log.c:177
+msgid "Process line range n,m in file, counting from 1"
+msgstr ""
+
+#: builtin/log.c:275
+#, c-format
+msgid "Final output: %d %s\n"
+msgstr ""
+
+#: builtin/log.c:529
+#, c-format
+msgid "git show %s: bad file"
+msgstr ""
+
+#: builtin/log.c:544 builtin/log.c:638
+#, c-format
+msgid "could not read object %s"
+msgstr ""
+
+#: builtin/log.c:663
+#, c-format
+msgid "unknown type: %d"
+msgstr ""
+
+#: builtin/log.c:784
+msgid "format.headers without value"
+msgstr ""
+
+#: builtin/log.c:885
+msgid "name of output directory is too long"
+msgstr ""
+
+#: builtin/log.c:901
+#, c-format
+msgid "cannot open patch file %s"
+msgstr ""
+
+#: builtin/log.c:918
+msgid "need exactly one range"
+msgstr ""
+
+#: builtin/log.c:928
+msgid "not a range"
+msgstr ""
+
+#: builtin/log.c:1051
+msgid "cover letter needs email format"
+msgstr ""
+
+#: builtin/log.c:1057
+msgid "failed to create cover-letter file"
+msgstr ""
+
+#: builtin/log.c:1136
+#, c-format
+msgid "insane in-reply-to: %s"
+msgstr ""
+
+#: builtin/log.c:1163
+msgid "git format-patch [<options>] [<since> | <revision-range>]"
+msgstr ""
+
+#: builtin/log.c:1221
+msgid "two output directories?"
+msgstr ""
+
+#: builtin/log.c:1332 builtin/log.c:2076 builtin/log.c:2078 builtin/log.c:2090
+#, c-format
+msgid "unknown commit %s"
+msgstr ""
+
+#: builtin/log.c:1342 builtin/replace.c:58 builtin/replace.c:207
+#: builtin/replace.c:210
+#, c-format
+msgid "failed to resolve '%s' as a valid ref"
+msgstr ""
+
+#: builtin/log.c:1347
+msgid "could not find exact merge base"
+msgstr ""
+
+#: builtin/log.c:1351
+msgid ""
+"failed to get upstream, if you want to record base commit automatically,\n"
+"please use git branch --set-upstream-to to track a remote branch.\n"
+"Or you could specify base commit by --base=<base-commit-id> manually"
+msgstr ""
+
+#: builtin/log.c:1371
+msgid "failed to find exact merge base"
+msgstr ""
+
+#: builtin/log.c:1382
+msgid "base commit should be the ancestor of revision list"
+msgstr ""
+
+#: builtin/log.c:1386
+msgid "base commit shouldn't be in revision list"
+msgstr ""
+
+#: builtin/log.c:1439
+msgid "cannot get patch id"
+msgstr ""
+
+#: builtin/log.c:1491
+msgid "failed to infer range-diff ranges"
+msgstr ""
+
+#: builtin/log.c:1536
+msgid "use [PATCH n/m] even with a single patch"
+msgstr ""
+
+#: builtin/log.c:1539
+msgid "use [PATCH] even with multiple patches"
+msgstr ""
+
+#: builtin/log.c:1543
+msgid "print patches to standard out"
+msgstr ""
+
+#: builtin/log.c:1545
+msgid "generate a cover letter"
+msgstr ""
+
+#: builtin/log.c:1547
+msgid "use simple number sequence for output file names"
+msgstr ""
+
+#: builtin/log.c:1548
+msgid "sfx"
+msgstr ""
+
+#: builtin/log.c:1549
+msgid "use <sfx> instead of '.patch'"
+msgstr ""
+
+#: builtin/log.c:1551
+msgid "start numbering patches at <n> instead of 1"
+msgstr ""
+
+#: builtin/log.c:1553
+msgid "mark the series as Nth re-roll"
+msgstr ""
+
+#: builtin/log.c:1555
+msgid "Use [RFC PATCH] instead of [PATCH]"
+msgstr ""
+
+#: builtin/log.c:1558
+msgid "Use [<prefix>] instead of [PATCH]"
+msgstr ""
+
+#: builtin/log.c:1561
+msgid "store resulting files in <dir>"
+msgstr ""
+
+#: builtin/log.c:1564
+msgid "don't strip/add [PATCH]"
+msgstr ""
+
+#: builtin/log.c:1567
+msgid "don't output binary diffs"
+msgstr ""
+
+#: builtin/log.c:1569
+msgid "output all-zero hash in From header"
+msgstr ""
+
+#: builtin/log.c:1571
+msgid "don't include a patch matching a commit upstream"
+msgstr ""
+
+#: builtin/log.c:1573
+msgid "show patch format instead of default (patch + stat)"
+msgstr ""
+
+#: builtin/log.c:1575
+msgid "Messaging"
+msgstr ""
+
+#: builtin/log.c:1576
+msgid "header"
+msgstr ""
+
+#: builtin/log.c:1577
+msgid "add email header"
+msgstr ""
+
+#: builtin/log.c:1578 builtin/log.c:1580
+msgid "email"
+msgstr ""
+
+#: builtin/log.c:1578
+msgid "add To: header"
+msgstr ""
+
+#: builtin/log.c:1580
+msgid "add Cc: header"
+msgstr ""
+
+#: builtin/log.c:1582
+msgid "ident"
+msgstr ""
+
+#: builtin/log.c:1583
+msgid "set From address to <ident> (or committer ident if absent)"
+msgstr ""
+
+#: builtin/log.c:1585
+msgid "message-id"
+msgstr ""
+
+#: builtin/log.c:1586
+msgid "make first mail a reply to <message-id>"
+msgstr ""
+
+#: builtin/log.c:1587 builtin/log.c:1590
+msgid "boundary"
+msgstr ""
+
+#: builtin/log.c:1588
+msgid "attach the patch"
+msgstr ""
+
+#: builtin/log.c:1591
+msgid "inline the patch"
+msgstr ""
+
+#: builtin/log.c:1595
+msgid "enable message threading, styles: shallow, deep"
+msgstr ""
+
+#: builtin/log.c:1597
+msgid "signature"
+msgstr ""
+
+#: builtin/log.c:1598
+msgid "add a signature"
+msgstr ""
+
+#: builtin/log.c:1599
+msgid "base-commit"
+msgstr ""
+
+#: builtin/log.c:1600
+msgid "add prerequisite tree info to the patch series"
+msgstr ""
+
+#: builtin/log.c:1602
+msgid "add a signature from a file"
+msgstr ""
+
+#: builtin/log.c:1603
+msgid "don't print the patch filenames"
+msgstr ""
+
+#: builtin/log.c:1605
+msgid "show progress while generating patches"
+msgstr ""
+
+#: builtin/log.c:1606
+msgid "rev"
+msgstr ""
+
+#: builtin/log.c:1607
+msgid "show changes against <rev> in cover letter or single patch"
+msgstr ""
+
+#: builtin/log.c:1610
+msgid "show changes against <refspec> in cover letter or single patch"
+msgstr ""
+
+#: builtin/log.c:1612
+msgid "percentage by which creation is weighted"
+msgstr ""
+
+#: builtin/log.c:1687
+#, c-format
+msgid "invalid ident line: %s"
+msgstr ""
+
+#: builtin/log.c:1702
+msgid "-n and -k are mutually exclusive"
+msgstr ""
+
+#: builtin/log.c:1704
+msgid "--subject-prefix/--rfc and -k are mutually exclusive"
+msgstr ""
+
+#: builtin/log.c:1712
+msgid "--name-only does not make sense"
+msgstr ""
+
+#: builtin/log.c:1714
+msgid "--name-status does not make sense"
+msgstr ""
+
+#: builtin/log.c:1716
+msgid "--check does not make sense"
+msgstr ""
+
+#: builtin/log.c:1748
+msgid "standard output, or directory, which one?"
+msgstr ""
+
+#: builtin/log.c:1837
+msgid "--interdiff requires --cover-letter or single patch"
+msgstr ""
+
+#: builtin/log.c:1841
+msgid "Interdiff:"
+msgstr ""
+
+#: builtin/log.c:1842
+#, c-format
+msgid "Interdiff against v%d:"
+msgstr ""
+
+#: builtin/log.c:1848
+msgid "--creation-factor requires --range-diff"
+msgstr ""
+
+#: builtin/log.c:1852
+msgid "--range-diff requires --cover-letter or single patch"
+msgstr ""
+
+#: builtin/log.c:1860
+msgid "Range-diff:"
+msgstr ""
+
+#: builtin/log.c:1861
+#, c-format
+msgid "Range-diff against v%d:"
+msgstr ""
+
+#: builtin/log.c:1872
+#, c-format
+msgid "unable to read signature file '%s'"
+msgstr ""
+
+#: builtin/log.c:1908
+msgid "Generating patches"
+msgstr ""
+
+#: builtin/log.c:1952
+msgid "failed to create output files"
+msgstr ""
+
+#: builtin/log.c:2011
+msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
+msgstr ""
+
+#: builtin/log.c:2065
+#, c-format
+msgid ""
+"Could not find a tracked remote branch, please specify <upstream> manually.\n"
+msgstr ""
+
+#: builtin/ls-files.c:470
+msgid "git ls-files [<options>] [<file>...]"
+msgstr ""
+
+#: builtin/ls-files.c:526
+msgid "identify the file status with tags"
+msgstr ""
+
+#: builtin/ls-files.c:528
+msgid "use lowercase letters for 'assume unchanged' files"
+msgstr ""
+
+#: builtin/ls-files.c:530
+msgid "use lowercase letters for 'fsmonitor clean' files"
+msgstr ""
+
+#: builtin/ls-files.c:532
+msgid "show cached files in the output (default)"
+msgstr ""
+
+#: builtin/ls-files.c:534
+msgid "show deleted files in the output"
+msgstr ""
+
+#: builtin/ls-files.c:536
+msgid "show modified files in the output"
+msgstr ""
+
+#: builtin/ls-files.c:538
+msgid "show other files in the output"
+msgstr ""
+
+#: builtin/ls-files.c:540
+msgid "show ignored files in the output"
+msgstr ""
+
+#: builtin/ls-files.c:543
+msgid "show staged contents' object name in the output"
+msgstr ""
+
+#: builtin/ls-files.c:545
+msgid "show files on the filesystem that need to be removed"
+msgstr ""
+
+#: builtin/ls-files.c:547
+msgid "show 'other' directories' names only"
+msgstr ""
+
+#: builtin/ls-files.c:549
+msgid "show line endings of files"
+msgstr ""
+
+#: builtin/ls-files.c:551
+msgid "don't show empty directories"
+msgstr ""
+
+#: builtin/ls-files.c:554
+msgid "show unmerged files in the output"
+msgstr ""
+
+#: builtin/ls-files.c:556
+msgid "show resolve-undo information"
+msgstr ""
+
+#: builtin/ls-files.c:558
+msgid "skip files matching pattern"
+msgstr ""
+
+#: builtin/ls-files.c:561
+msgid "exclude patterns are read from <file>"
+msgstr ""
+
+#: builtin/ls-files.c:564
+msgid "read additional per-directory exclude patterns in <file>"
+msgstr ""
+
+#: builtin/ls-files.c:566
+msgid "add the standard git exclusions"
+msgstr ""
+
+#: builtin/ls-files.c:570
+msgid "make the output relative to the project top directory"
+msgstr ""
+
+#: builtin/ls-files.c:573
+msgid "recurse through submodules"
+msgstr ""
+
+#: builtin/ls-files.c:575
+msgid "if any <file> is not in the index, treat this as an error"
+msgstr ""
+
+#: builtin/ls-files.c:576
+msgid "tree-ish"
+msgstr ""
+
+#: builtin/ls-files.c:577
+msgid "pretend that paths removed since <tree-ish> are still present"
+msgstr ""
+
+#: builtin/ls-files.c:579
+msgid "show debugging data"
+msgstr ""
+
+#: builtin/ls-remote.c:9
+msgid ""
+"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
+" [-q | --quiet] [--exit-code] [--get-url]\n"
+" [--symref] [<repository> [<refs>...]]"
+msgstr ""
+
+#: builtin/ls-remote.c:59
+msgid "do not print remote URL"
+msgstr ""
+
+#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1458
+msgid "exec"
+msgstr ""
+
+#: builtin/ls-remote.c:61 builtin/ls-remote.c:63
+msgid "path of git-upload-pack on the remote host"
+msgstr ""
+
+#: builtin/ls-remote.c:65
+msgid "limit to tags"
+msgstr ""
+
+#: builtin/ls-remote.c:66
+msgid "limit to heads"
+msgstr ""
+
+#: builtin/ls-remote.c:67
+msgid "do not show peeled tags"
+msgstr ""
+
+#: builtin/ls-remote.c:69
+msgid "take url.<base>.insteadOf into account"
+msgstr ""
+
+#: builtin/ls-remote.c:72
+msgid "exit with exit code 2 if no matching refs are found"
+msgstr ""
+
+#: builtin/ls-remote.c:75
+msgid "show underlying ref in addition to the object pointed by it"
+msgstr ""
+
+#: builtin/ls-tree.c:30
+msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
+msgstr ""
+
+#: builtin/ls-tree.c:128
+msgid "only show trees"
+msgstr ""
+
+#: builtin/ls-tree.c:130
+msgid "recurse into subtrees"
+msgstr ""
+
+#: builtin/ls-tree.c:132
+msgid "show trees when recursing"
+msgstr ""
+
+#: builtin/ls-tree.c:135
+msgid "terminate entries with NUL byte"
+msgstr ""
+
+#: builtin/ls-tree.c:136
+msgid "include object size"
+msgstr ""
+
+#: builtin/ls-tree.c:138 builtin/ls-tree.c:140
+msgid "list only filenames"
+msgstr ""
+
+#: builtin/ls-tree.c:143
+msgid "use full path names"
+msgstr ""
+
+#: builtin/ls-tree.c:145
+msgid "list entire tree; not just current directory (implies --full-name)"
+msgstr ""
+
+#: builtin/mailsplit.c:241
+#, c-format
+msgid "empty mbox: '%s'"
+msgstr ""
+
+#: builtin/merge.c:54
+msgid "git merge [<options>] [<commit>...]"
+msgstr ""
+
+#: builtin/merge.c:55
+msgid "git merge --abort"
+msgstr ""
+
+#: builtin/merge.c:56
+msgid "git merge --continue"
+msgstr ""
+
+#: builtin/merge.c:116
+msgid "switch `m' requires a value"
+msgstr ""
+
+#: builtin/merge.c:139
+#, c-format
+msgid "option `%s' requires a value"
+msgstr ""
+
+#: builtin/merge.c:185
+#, c-format
+msgid "Could not find merge strategy '%s'.\n"
+msgstr ""
+
+#: builtin/merge.c:186
+#, c-format
+msgid "Available strategies are:"
+msgstr ""
+
+#: builtin/merge.c:191
+#, c-format
+msgid "Available custom strategies are:"
+msgstr ""
+
+#: builtin/merge.c:242 builtin/pull.c:150
+msgid "do not show a diffstat at the end of the merge"
+msgstr ""
+
+#: builtin/merge.c:245 builtin/pull.c:153
+msgid "show a diffstat at the end of the merge"
+msgstr ""
+
+#: builtin/merge.c:246 builtin/pull.c:156
+msgid "(synonym to --stat)"
+msgstr ""
+
+#: builtin/merge.c:248 builtin/pull.c:159
+msgid "add (at most <n>) entries from shortlog to merge commit message"
+msgstr ""
+
+#: builtin/merge.c:251 builtin/pull.c:165
+msgid "create a single commit instead of doing a merge"
+msgstr ""
+
+#: builtin/merge.c:253 builtin/pull.c:168
+msgid "perform a commit if the merge succeeds (default)"
+msgstr ""
+
+#: builtin/merge.c:255 builtin/pull.c:171
+msgid "edit message before committing"
+msgstr ""
+
+#: builtin/merge.c:257
+msgid "allow fast-forward (default)"
+msgstr ""
+
+#: builtin/merge.c:259 builtin/pull.c:178
+msgid "abort if fast-forward is not possible"
+msgstr ""
+
+#: builtin/merge.c:263 builtin/pull.c:181
+msgid "verify that the named commit has a valid GPG signature"
+msgstr ""
+
+#: builtin/merge.c:264 builtin/notes.c:787 builtin/pull.c:185
+#: builtin/rebase.c:492 builtin/rebase.c:1471 builtin/revert.c:113
+msgid "strategy"
+msgstr ""
+
+#: builtin/merge.c:265 builtin/pull.c:186
+msgid "merge strategy to use"
+msgstr ""
+
+#: builtin/merge.c:266 builtin/pull.c:189
+msgid "option=value"
+msgstr ""
+
+#: builtin/merge.c:267 builtin/pull.c:190
+msgid "option for selected merge strategy"
+msgstr ""
+
+#: builtin/merge.c:269
+msgid "merge commit message (for a non-fast-forward merge)"
+msgstr ""
+
+#: builtin/merge.c:276
+msgid "abort the current in-progress merge"
+msgstr ""
+
+#: builtin/merge.c:278
+msgid "continue the current in-progress merge"
+msgstr ""
+
+#: builtin/merge.c:280 builtin/pull.c:197
+msgid "allow merging unrelated histories"
+msgstr ""
+
+#: builtin/merge.c:286
+msgid "verify commit-msg hook"
+msgstr ""
+
+#: builtin/merge.c:311
+msgid "could not run stash."
+msgstr ""
+
+#: builtin/merge.c:316
+msgid "stash failed"
+msgstr ""
+
+#: builtin/merge.c:321
+#, c-format
+msgid "not a valid object: %s"
+msgstr ""
+
+#: builtin/merge.c:343 builtin/merge.c:360
+msgid "read-tree failed"
+msgstr ""
+
+#: builtin/merge.c:390
+msgid " (nothing to squash)"
+msgstr ""
+
+#: builtin/merge.c:401
+#, c-format
+msgid "Squash commit -- not updating HEAD\n"
+msgstr ""
+
+#: builtin/merge.c:451
+#, c-format
+msgid "No merge message -- not updating HEAD\n"
+msgstr ""
+
+#: builtin/merge.c:502
+#, c-format
+msgid "'%s' does not point to a commit"
+msgstr ""
+
+#: builtin/merge.c:589
+#, c-format
+msgid "Bad branch.%s.mergeoptions string: %s"
+msgstr ""
+
+#: builtin/merge.c:712
+msgid "Not handling anything other than two heads merge."
+msgstr ""
+
+#: builtin/merge.c:726
+#, c-format
+msgid "Unknown option for merge-recursive: -X%s"
+msgstr ""
+
+#: builtin/merge.c:741
+#, c-format
+msgid "unable to write %s"
+msgstr ""
+
+#: builtin/merge.c:793
+#, c-format
+msgid "Could not read from '%s'"
+msgstr ""
+
+#: builtin/merge.c:802
+#, c-format
+msgid "Not committing merge; use 'git commit' to complete the merge.\n"
+msgstr ""
+
+#: builtin/merge.c:808
+msgid ""
+"Please enter a commit message to explain why this merge is necessary,\n"
+"especially if it merges an updated upstream into a topic branch.\n"
+"\n"
+msgstr ""
+
+#: builtin/merge.c:813
+msgid "An empty message aborts the commit.\n"
+msgstr ""
+
+#: builtin/merge.c:816
+#, c-format
+msgid ""
+"Lines starting with '%c' will be ignored, and an empty message aborts\n"
+"the commit.\n"
+msgstr ""
+
+#: builtin/merge.c:857
+msgid "Empty commit message."
+msgstr ""
+
+#: builtin/merge.c:876
+#, c-format
+msgid "Wonderful.\n"
+msgstr ""
+
+#: builtin/merge.c:936
+#, c-format
+msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
+msgstr ""
+
+#: builtin/merge.c:975
+msgid "No current branch."
+msgstr ""
+
+#: builtin/merge.c:977
+msgid "No remote for the current branch."
+msgstr ""
+
+#: builtin/merge.c:979
+msgid "No default upstream defined for the current branch."
+msgstr ""
+
+#: builtin/merge.c:984
+#, c-format
+msgid "No remote-tracking branch for %s from %s"
+msgstr ""
+
+#: builtin/merge.c:1041
+#, c-format
+msgid "Bad value '%s' in environment '%s'"
+msgstr ""
+
+#: builtin/merge.c:1144
+#, c-format
+msgid "not something we can merge in %s: %s"
+msgstr ""
+
+#: builtin/merge.c:1178
+msgid "not something we can merge"
+msgstr ""
+
+#: builtin/merge.c:1281
+msgid "--abort expects no arguments"
+msgstr ""
+
+#: builtin/merge.c:1285
+msgid "There is no merge to abort (MERGE_HEAD missing)."
+msgstr ""
+
+#: builtin/merge.c:1297
+msgid "--continue expects no arguments"
+msgstr ""
+
+#: builtin/merge.c:1301
+msgid "There is no merge in progress (MERGE_HEAD missing)."
+msgstr ""
+
+#: builtin/merge.c:1317
+msgid ""
+"You have not concluded your merge (MERGE_HEAD exists).\n"
+"Please, commit your changes before you merge."
+msgstr ""
+
+#: builtin/merge.c:1324
+msgid ""
+"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
+"Please, commit your changes before you merge."
+msgstr ""
+
+#: builtin/merge.c:1327
+msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
+msgstr ""
+
+#: builtin/merge.c:1341
+msgid "You cannot combine --squash with --no-ff."
+msgstr ""
+
+#: builtin/merge.c:1349
+msgid "No commit specified and merge.defaultToUpstream not set."
+msgstr ""
+
+#: builtin/merge.c:1366
+msgid "Squash commit into empty head not supported yet"
+msgstr ""
+
+#: builtin/merge.c:1368
+msgid "Non-fast-forward commit does not make sense into an empty head"
+msgstr ""
+
+#: builtin/merge.c:1373
+#, c-format
+msgid "%s - not something we can merge"
+msgstr ""
+
+#: builtin/merge.c:1375
+msgid "Can merge only exactly one commit into empty head"
+msgstr ""
+
+#: builtin/merge.c:1454
+msgid "refusing to merge unrelated histories"
+msgstr ""
+
+#: builtin/merge.c:1463
+msgid "Already up to date."
+msgstr ""
+
+#: builtin/merge.c:1473
+#, c-format
+msgid "Updating %s..%s\n"
+msgstr ""
+
+#: builtin/merge.c:1515
+#, c-format
+msgid "Trying really trivial in-index merge...\n"
+msgstr ""
+
+#: builtin/merge.c:1522
+#, c-format
+msgid "Nope.\n"
+msgstr ""
+
+#: builtin/merge.c:1547
+msgid "Already up to date. Yeeah!"
+msgstr ""
+
+#: builtin/merge.c:1553
+msgid "Not possible to fast-forward, aborting."
+msgstr ""
+
+#: builtin/merge.c:1576 builtin/merge.c:1655
+#, c-format
+msgid "Rewinding the tree to pristine...\n"
+msgstr ""
+
+#: builtin/merge.c:1580
+#, c-format
+msgid "Trying merge strategy %s...\n"
+msgstr ""
+
+#: builtin/merge.c:1646
+#, c-format
+msgid "No merge strategy handled the merge.\n"
+msgstr ""
+
+#: builtin/merge.c:1648
+#, c-format
+msgid "Merge with strategy %s failed.\n"
+msgstr ""
+
+#: builtin/merge.c:1657
+#, c-format
+msgid "Using the %s to prepare resolving by hand.\n"
+msgstr ""
+
+#: builtin/merge.c:1669
+#, c-format
+msgid "Automatic merge went well; stopped before committing as requested\n"
+msgstr ""
+
+#: builtin/merge-base.c:32
+msgid "git merge-base [-a | --all] <commit> <commit>..."
+msgstr ""
+
+#: builtin/merge-base.c:33
+msgid "git merge-base [-a | --all] --octopus <commit>..."
+msgstr ""
+
+#: builtin/merge-base.c:34
+msgid "git merge-base --independent <commit>..."
+msgstr ""
+
+#: builtin/merge-base.c:35
+msgid "git merge-base --is-ancestor <commit> <commit>"
+msgstr ""
+
+#: builtin/merge-base.c:36
+msgid "git merge-base --fork-point <ref> [<commit>]"
+msgstr ""
+
+#: builtin/merge-base.c:153
+msgid "output all common ancestors"
+msgstr ""
+
+#: builtin/merge-base.c:155
+msgid "find ancestors for a single n-way merge"
+msgstr ""
+
+#: builtin/merge-base.c:157
+msgid "list revs not reachable from others"
+msgstr ""
+
+#: builtin/merge-base.c:159
+msgid "is the first one ancestor of the other?"
+msgstr ""
+
+#: builtin/merge-base.c:161
+msgid "find where <commit> forked from reflog of <ref>"
+msgstr ""
+
+#: builtin/merge-file.c:9
+msgid ""
+"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
+"<orig-file> <file2>"
+msgstr ""
+
+#: builtin/merge-file.c:35
+msgid "send results to standard output"
+msgstr ""
+
+#: builtin/merge-file.c:36
+msgid "use a diff3 based merge"
+msgstr ""
+
+#: builtin/merge-file.c:37
+msgid "for conflicts, use our version"
+msgstr ""
+
+#: builtin/merge-file.c:39
+msgid "for conflicts, use their version"
+msgstr ""
+
+#: builtin/merge-file.c:41
+msgid "for conflicts, use a union version"
+msgstr ""
+
+#: builtin/merge-file.c:44
+msgid "for conflicts, use this marker size"
+msgstr ""
+
+#: builtin/merge-file.c:45
+msgid "do not warn about conflicts"
+msgstr ""
+
+#: builtin/merge-file.c:47
+msgid "set labels for file1/orig-file/file2"
+msgstr ""
+
+#: builtin/merge-recursive.c:46
+#, c-format
+msgid "unknown option %s"
+msgstr ""
+
+#: builtin/merge-recursive.c:52
+#, c-format
+msgid "could not parse object '%s'"
+msgstr ""
+
+#: builtin/merge-recursive.c:56
+#, c-format
+msgid "cannot handle more than %d base. Ignoring %s."
+msgid_plural "cannot handle more than %d bases. Ignoring %s."
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/merge-recursive.c:64
+msgid "not handling anything other than two heads merge."
+msgstr ""
+
+#: builtin/merge-recursive.c:70 builtin/merge-recursive.c:72
+#, c-format
+msgid "could not resolve ref '%s'"
+msgstr ""
+
+#: builtin/merge-recursive.c:78
+#, c-format
+msgid "Merging %s with %s\n"
+msgstr ""
+
+#: builtin/mktree.c:66
+msgid "git mktree [-z] [--missing] [--batch]"
+msgstr ""
+
+#: builtin/mktree.c:154
+msgid "input is NUL terminated"
+msgstr ""
+
+#: builtin/mktree.c:155 builtin/write-tree.c:26
+msgid "allow missing objects"
+msgstr ""
+
+#: builtin/mktree.c:156
+msgid "allow creation of more than one tree"
+msgstr ""
+
+#: builtin/multi-pack-index.c:9
+msgid "git multi-pack-index [--object-dir=<dir>] (write|verify)"
+msgstr ""
+
+#: builtin/multi-pack-index.c:22
+msgid "object directory containing set of packfile and pack-index pairs"
+msgstr ""
+
+#: builtin/multi-pack-index.c:40 builtin/prune-packed.c:67
+msgid "too many arguments"
+msgstr ""
+
+#: builtin/multi-pack-index.c:51
+#, c-format
+msgid "unrecognized verb: %s"
+msgstr ""
+
+#: builtin/mv.c:18
+msgid "git mv [<options>] <source>... <destination>"
+msgstr ""
+
+#: builtin/mv.c:83
+#, c-format
+msgid "Directory %s is in index and no submodule?"
+msgstr ""
+
+#: builtin/mv.c:85
+msgid "Please stage your changes to .gitmodules or stash them to proceed"
+msgstr ""
+
+#: builtin/mv.c:103
+#, c-format
+msgid "%.*s is in index"
+msgstr ""
+
+#: builtin/mv.c:125
+msgid "force move/rename even if target exists"
+msgstr ""
+
+#: builtin/mv.c:127
+msgid "skip move/rename errors"
+msgstr ""
+
+#: builtin/mv.c:169
+#, c-format
+msgid "destination '%s' is not a directory"
+msgstr ""
+
+#: builtin/mv.c:180
+#, c-format
+msgid "Checking rename of '%s' to '%s'\n"
+msgstr ""
+
+#: builtin/mv.c:184
+msgid "bad source"
+msgstr ""
+
+#: builtin/mv.c:187
+msgid "can not move directory into itself"
+msgstr ""
+
+#: builtin/mv.c:190
+msgid "cannot move directory over file"
+msgstr ""
+
+#: builtin/mv.c:199
+msgid "source directory is empty"
+msgstr ""
+
+#: builtin/mv.c:224
+msgid "not under version control"
+msgstr ""
+
+#: builtin/mv.c:227
+msgid "destination exists"
+msgstr ""
+
+#: builtin/mv.c:235
+#, c-format
+msgid "overwriting '%s'"
+msgstr ""
+
+#: builtin/mv.c:238
+msgid "Cannot overwrite"
+msgstr ""
+
+#: builtin/mv.c:241
+msgid "multiple sources for the same target"
+msgstr ""
+
+#: builtin/mv.c:243
+msgid "destination directory does not exist"
+msgstr ""
+
+#: builtin/mv.c:250
+#, c-format
+msgid "%s, source=%s, destination=%s"
+msgstr ""
+
+#: builtin/mv.c:271
+#, c-format
+msgid "Renaming %s to %s\n"
+msgstr ""
+
+#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:516
+#, c-format
+msgid "renaming '%s' failed"
+msgstr ""
+
+#: builtin/name-rev.c:355
+msgid "git name-rev [<options>] <commit>..."
+msgstr ""
+
+#: builtin/name-rev.c:356
+msgid "git name-rev [<options>] --all"
+msgstr ""
+
+#: builtin/name-rev.c:357
+msgid "git name-rev [<options>] --stdin"
+msgstr ""
+
+#: builtin/name-rev.c:415
+msgid "print only names (no SHA-1)"
+msgstr ""
+
+#: builtin/name-rev.c:416
+msgid "only use tags to name the commits"
+msgstr ""
+
+#: builtin/name-rev.c:418
+msgid "only use refs matching <pattern>"
+msgstr ""
+
+#: builtin/name-rev.c:420
+msgid "ignore refs matching <pattern>"
+msgstr ""
+
+#: builtin/name-rev.c:422
+msgid "list all commits reachable from all refs"
+msgstr ""
+
+#: builtin/name-rev.c:423
+msgid "read from stdin"
+msgstr ""
+
+#: builtin/name-rev.c:424
+msgid "allow to print `undefined` names (default)"
+msgstr ""
+
+#: builtin/name-rev.c:430
+msgid "dereference tags in the input (internal use)"
+msgstr ""
+
+#: builtin/notes.c:28
+msgid "git notes [--ref <notes-ref>] [list [<object>]]"
+msgstr ""
+
+#: builtin/notes.c:29
+msgid ""
+"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
+"| (-c | -C) <object>] [<object>]"
+msgstr ""
+
+#: builtin/notes.c:30
+msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
+msgstr ""
+
+#: builtin/notes.c:31
+msgid ""
+"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
+"(-c | -C) <object>] [<object>]"
+msgstr ""
+
+#: builtin/notes.c:32
+msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
+msgstr ""
+
+#: builtin/notes.c:33
+msgid "git notes [--ref <notes-ref>] show [<object>]"
+msgstr ""
+
+#: builtin/notes.c:34
+msgid ""
+"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
+msgstr ""
+
+#: builtin/notes.c:35
+msgid "git notes merge --commit [-v | -q]"
+msgstr ""
+
+#: builtin/notes.c:36
+msgid "git notes merge --abort [-v | -q]"
+msgstr ""
+
+#: builtin/notes.c:37
+msgid "git notes [--ref <notes-ref>] remove [<object>...]"
+msgstr ""
+
+#: builtin/notes.c:38
+msgid "git notes [--ref <notes-ref>] prune [-n] [-v]"
+msgstr ""
+
+#: builtin/notes.c:39
+msgid "git notes [--ref <notes-ref>] get-ref"
+msgstr ""
+
+#: builtin/notes.c:44
+msgid "git notes [list [<object>]]"
+msgstr ""
+
+#: builtin/notes.c:49
+msgid "git notes add [<options>] [<object>]"
+msgstr ""
+
+#: builtin/notes.c:54
+msgid "git notes copy [<options>] <from-object> <to-object>"
+msgstr ""
+
+#: builtin/notes.c:55
+msgid "git notes copy --stdin [<from-object> <to-object>]..."
+msgstr ""
+
+#: builtin/notes.c:60
+msgid "git notes append [<options>] [<object>]"
+msgstr ""
+
+#: builtin/notes.c:65
+msgid "git notes edit [<object>]"
+msgstr ""
+
+#: builtin/notes.c:70
+msgid "git notes show [<object>]"
+msgstr ""
+
+#: builtin/notes.c:75
+msgid "git notes merge [<options>] <notes-ref>"
+msgstr ""
+
+#: builtin/notes.c:76
+msgid "git notes merge --commit [<options>]"
+msgstr ""
+
+#: builtin/notes.c:77
+msgid "git notes merge --abort [<options>]"
+msgstr ""
+
+#: builtin/notes.c:82
+msgid "git notes remove [<object>]"
+msgstr ""
+
+#: builtin/notes.c:87
+msgid "git notes prune [<options>]"
+msgstr ""
+
+#: builtin/notes.c:92
+msgid "git notes get-ref"
+msgstr ""
+
+#: builtin/notes.c:97
+msgid "Write/edit the notes for the following object:"
+msgstr ""
+
+#: builtin/notes.c:150
+#, c-format
+msgid "unable to start 'show' for object '%s'"
+msgstr ""
+
+#: builtin/notes.c:154
+msgid "could not read 'show' output"
+msgstr ""
+
+#: builtin/notes.c:162
+#, c-format
+msgid "failed to finish 'show' for object '%s'"
+msgstr ""
+
+#: builtin/notes.c:197
+msgid "please supply the note contents using either -m or -F option"
+msgstr ""
+
+#: builtin/notes.c:206
+msgid "unable to write note object"
+msgstr ""
+
+#: builtin/notes.c:208
+#, c-format
+msgid "the note contents have been left in %s"
+msgstr ""
+
+#: builtin/notes.c:242 builtin/tag.c:522
+#, c-format
+msgid "could not open or read '%s'"
+msgstr ""
+
+#: builtin/notes.c:263 builtin/notes.c:313 builtin/notes.c:315
+#: builtin/notes.c:383 builtin/notes.c:438 builtin/notes.c:526
+#: builtin/notes.c:531 builtin/notes.c:610 builtin/notes.c:672
+#, c-format
+msgid "failed to resolve '%s' as a valid ref."
+msgstr ""
+
+#: builtin/notes.c:265
+#, c-format
+msgid "failed to read object '%s'."
+msgstr ""
+
+#: builtin/notes.c:268
+#, c-format
+msgid "cannot read note data from non-blob object '%s'."
+msgstr ""
+
+#: builtin/notes.c:309
+#, c-format
+msgid "malformed input line: '%s'."
+msgstr ""
+
+#: builtin/notes.c:324
+#, c-format
+msgid "failed to copy notes from '%s' to '%s'"
+msgstr ""
+
+#. TRANSLATORS: the first %s will be replaced by a git
+#. notes command: 'add', 'merge', 'remove', etc.
+#.
+#: builtin/notes.c:356
+#, c-format
+msgid "refusing to %s notes in %s (outside of refs/notes/)"
+msgstr ""
+
+#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:509
+#: builtin/notes.c:521 builtin/notes.c:598 builtin/notes.c:665
+#: builtin/notes.c:815 builtin/notes.c:963 builtin/notes.c:985
+msgid "too many parameters"
+msgstr ""
+
+#: builtin/notes.c:389 builtin/notes.c:678
+#, c-format
+msgid "no note found for object %s."
+msgstr ""
+
+#: builtin/notes.c:410 builtin/notes.c:576
+msgid "note contents as a string"
+msgstr ""
+
+#: builtin/notes.c:413 builtin/notes.c:579
+msgid "note contents in a file"
+msgstr ""
+
+#: builtin/notes.c:416 builtin/notes.c:582
+msgid "reuse and edit specified note object"
+msgstr ""
+
+#: builtin/notes.c:419 builtin/notes.c:585
+msgid "reuse specified note object"
+msgstr ""
+
+#: builtin/notes.c:422 builtin/notes.c:588
+msgid "allow storing empty note"
+msgstr ""
+
+#: builtin/notes.c:423 builtin/notes.c:496
+msgid "replace existing notes"
+msgstr ""
+
+#: builtin/notes.c:448
+#, c-format
+msgid ""
+"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
+"existing notes"
+msgstr ""
+
+#: builtin/notes.c:463 builtin/notes.c:544
+#, c-format
+msgid "Overwriting existing notes for object %s\n"
+msgstr ""
+
+#: builtin/notes.c:475 builtin/notes.c:637 builtin/notes.c:902
+#, c-format
+msgid "Removing note for object %s\n"
+msgstr ""
+
+#: builtin/notes.c:497
+msgid "read objects from stdin"
+msgstr ""
+
+#: builtin/notes.c:499
+msgid "load rewriting config for <command> (implies --stdin)"
+msgstr ""
+
+#: builtin/notes.c:517
+msgid "too few parameters"
+msgstr ""
+
+#: builtin/notes.c:538
+#, c-format
+msgid ""
+"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
+"existing notes"
+msgstr ""
+
+#: builtin/notes.c:550
+#, c-format
+msgid "missing notes on source object %s. Cannot copy."
+msgstr ""
+
+#: builtin/notes.c:603
+#, c-format
+msgid ""
+"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
+"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
+msgstr ""
+
+#: builtin/notes.c:698
+msgid "failed to delete ref NOTES_MERGE_PARTIAL"
+msgstr ""
+
+#: builtin/notes.c:700
+msgid "failed to delete ref NOTES_MERGE_REF"
+msgstr ""
+
+#: builtin/notes.c:702
+msgid "failed to remove 'git notes merge' worktree"
+msgstr ""
+
+#: builtin/notes.c:722
+msgid "failed to read ref NOTES_MERGE_PARTIAL"
+msgstr ""
+
+#: builtin/notes.c:724
+msgid "could not find commit from NOTES_MERGE_PARTIAL."
+msgstr ""
+
+#: builtin/notes.c:726
+msgid "could not parse commit from NOTES_MERGE_PARTIAL."
+msgstr ""
+
+#: builtin/notes.c:739
+msgid "failed to resolve NOTES_MERGE_REF"
+msgstr ""
+
+#: builtin/notes.c:742
+msgid "failed to finalize notes merge"
+msgstr ""
+
+#: builtin/notes.c:768
+#, c-format
+msgid "unknown notes merge strategy %s"
+msgstr ""
+
+#: builtin/notes.c:784
+msgid "General options"
+msgstr ""
+
+#: builtin/notes.c:786
+msgid "Merge options"
+msgstr ""
+
+#: builtin/notes.c:788
+msgid ""
+"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
+"cat_sort_uniq)"
+msgstr ""
+
+#: builtin/notes.c:790
+msgid "Committing unmerged notes"
+msgstr ""
+
+#: builtin/notes.c:792
+msgid "finalize notes merge by committing unmerged notes"
+msgstr ""
+
+#: builtin/notes.c:794
+msgid "Aborting notes merge resolution"
+msgstr ""
+
+#: builtin/notes.c:796
+msgid "abort notes merge"
+msgstr ""
+
+#: builtin/notes.c:807
+msgid "cannot mix --commit, --abort or -s/--strategy"
+msgstr ""
+
+#: builtin/notes.c:812
+msgid "must specify a notes ref to merge"
+msgstr ""
+
+#: builtin/notes.c:836
+#, c-format
+msgid "unknown -s/--strategy: %s"
+msgstr ""
+
+#: builtin/notes.c:873
+#, c-format
+msgid "a notes merge into %s is already in-progress at %s"
+msgstr ""
+
+#: builtin/notes.c:876
+#, c-format
+msgid "failed to store link to current notes ref (%s)"
+msgstr ""
+
+#: builtin/notes.c:878
+#, c-format
+msgid ""
+"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
+"'git notes merge --commit', or abort the merge with 'git notes merge --"
+"abort'.\n"
+msgstr ""
+
+#: builtin/notes.c:897 builtin/tag.c:535
+#, c-format
+msgid "Failed to resolve '%s' as a valid ref."
+msgstr ""
+
+#: builtin/notes.c:900
+#, c-format
+msgid "Object %s has no note\n"
+msgstr ""
+
+#: builtin/notes.c:912
+msgid "attempt to remove non-existent note is not an error"
+msgstr ""
+
+#: builtin/notes.c:915
+msgid "read object names from the standard input"
+msgstr ""
+
+#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:165
+msgid "do not remove, show only"
+msgstr ""
+
+#: builtin/notes.c:955
+msgid "report pruned notes"
+msgstr ""
+
+#: builtin/notes.c:998
+msgid "notes-ref"
+msgstr ""
+
+#: builtin/notes.c:999
+msgid "use notes from <notes-ref>"
+msgstr ""
+
+#: builtin/notes.c:1034 builtin/stash.c:1611
+#, c-format
+msgid "unknown subcommand: %s"
+msgstr ""
+
+#: builtin/pack-objects.c:52
+msgid ""
+"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
+msgstr ""
+
+#: builtin/pack-objects.c:53
+msgid ""
+"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
+msgstr ""
+
+#: builtin/pack-objects.c:424
+#, c-format
+msgid "bad packed object CRC for %s"
+msgstr ""
+
+#: builtin/pack-objects.c:435
+#, c-format
+msgid "corrupt packed object for %s"
+msgstr ""
+
+#: builtin/pack-objects.c:566
+#, c-format
+msgid "recursive delta detected for object %s"
+msgstr ""
+
+#: builtin/pack-objects.c:777
+#, c-format
+msgid "ordered %u objects, expected %<PRIu32>"
+msgstr ""
+
+#: builtin/pack-objects.c:790
+#, c-format
+msgid "packfile is invalid: %s"
+msgstr ""
+
+#: builtin/pack-objects.c:794
+#, c-format
+msgid "unable to open packfile for reuse: %s"
+msgstr ""
+
+#: builtin/pack-objects.c:798
+msgid "unable to seek in reused packfile"
+msgstr ""
+
+#: builtin/pack-objects.c:809
+msgid "unable to read from reused packfile"
+msgstr ""
+
+#: builtin/pack-objects.c:837
+msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
+msgstr ""
+
+#: builtin/pack-objects.c:850
+msgid "Writing objects"
+msgstr ""
+
+#: builtin/pack-objects.c:912 builtin/update-index.c:89
+#, c-format
+msgid "failed to stat %s"
+msgstr ""
+
+#: builtin/pack-objects.c:965
+#, c-format
+msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
+msgstr ""
+
+#: builtin/pack-objects.c:1161
+msgid "disabling bitmap writing, as some objects are not being packed"
+msgstr ""
+
+#: builtin/pack-objects.c:1589
+#, c-format
+msgid "delta base offset overflow in pack for %s"
+msgstr ""
+
+#: builtin/pack-objects.c:1598
+#, c-format
+msgid "delta base offset out of bound for %s"
+msgstr ""
+
+#: builtin/pack-objects.c:1867
+msgid "Counting objects"
+msgstr ""
+
+#: builtin/pack-objects.c:1997
+#, c-format
+msgid "unable to get size of %s"
+msgstr ""
+
+#: builtin/pack-objects.c:2012
+#, c-format
+msgid "unable to parse object header of %s"
+msgstr ""
+
+#: builtin/pack-objects.c:2082 builtin/pack-objects.c:2098
+#: builtin/pack-objects.c:2108
+#, c-format
+msgid "object %s cannot be read"
+msgstr ""
+
+#: builtin/pack-objects.c:2085 builtin/pack-objects.c:2112
+#, c-format
+msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
+msgstr ""
+
+#: builtin/pack-objects.c:2122
+msgid "suboptimal pack - out of memory"
+msgstr ""
+
+#: builtin/pack-objects.c:2448
+#, c-format
+msgid "Delta compression using up to %d threads"
+msgstr ""
+
+#: builtin/pack-objects.c:2580
+#, c-format
+msgid "unable to pack objects reachable from tag %s"
+msgstr ""
+
+#: builtin/pack-objects.c:2667
+msgid "Compressing objects"
+msgstr ""
+
+#: builtin/pack-objects.c:2673
+msgid "inconsistency with delta count"
+msgstr ""
+
+#: builtin/pack-objects.c:2754
+#, c-format
+msgid ""
+"expected edge object ID, got garbage:\n"
+" %s"
+msgstr ""
+
+#: builtin/pack-objects.c:2760
+#, c-format
+msgid ""
+"expected object ID, got garbage:\n"
+" %s"
+msgstr ""
+
+#: builtin/pack-objects.c:2858
+msgid "invalid value for --missing"
+msgstr ""
+
+#: builtin/pack-objects.c:2917 builtin/pack-objects.c:3025
+msgid "cannot open pack index"
+msgstr ""
+
+#: builtin/pack-objects.c:2948
+#, c-format
+msgid "loose object at %s could not be examined"
+msgstr ""
+
+#: builtin/pack-objects.c:3033
+msgid "unable to force loose object"
+msgstr ""
+
+#: builtin/pack-objects.c:3125
+#, c-format
+msgid "not a rev '%s'"
+msgstr ""
+
+#: builtin/pack-objects.c:3128
+#, c-format
+msgid "bad revision '%s'"
+msgstr ""
+
+#: builtin/pack-objects.c:3153
+msgid "unable to add recent objects"
+msgstr ""
+
+#: builtin/pack-objects.c:3206
+#, c-format
+msgid "unsupported index version %s"
+msgstr ""
+
+#: builtin/pack-objects.c:3210
+#, c-format
+msgid "bad index version '%s'"
+msgstr ""
+
+#: builtin/pack-objects.c:3240
+msgid "do not show progress meter"
+msgstr ""
+
+#: builtin/pack-objects.c:3242
+msgid "show progress meter"
+msgstr ""
+
+#: builtin/pack-objects.c:3244
+msgid "show progress meter during object writing phase"
+msgstr ""
+
+#: builtin/pack-objects.c:3247
+msgid "similar to --all-progress when progress meter is shown"
+msgstr ""
+
+#: builtin/pack-objects.c:3248
+msgid "<version>[,<offset>]"
+msgstr ""
+
+#: builtin/pack-objects.c:3249
+msgid "write the pack index file in the specified idx format version"
+msgstr ""
+
+#: builtin/pack-objects.c:3252
+msgid "maximum size of each output pack file"
+msgstr ""
+
+#: builtin/pack-objects.c:3254
+msgid "ignore borrowed objects from alternate object store"
+msgstr ""
+
+#: builtin/pack-objects.c:3256
+msgid "ignore packed objects"
+msgstr ""
+
+#: builtin/pack-objects.c:3258
+msgid "limit pack window by objects"
+msgstr ""
+
+#: builtin/pack-objects.c:3260
+msgid "limit pack window by memory in addition to object limit"
+msgstr ""
+
+#: builtin/pack-objects.c:3262
+msgid "maximum length of delta chain allowed in the resulting pack"
+msgstr ""
+
+#: builtin/pack-objects.c:3264
+msgid "reuse existing deltas"
+msgstr ""
+
+#: builtin/pack-objects.c:3266
+msgid "reuse existing objects"
+msgstr ""
+
+#: builtin/pack-objects.c:3268
+msgid "use OFS_DELTA objects"
+msgstr ""
+
+#: builtin/pack-objects.c:3270
+msgid "use threads when searching for best delta matches"
+msgstr ""
+
+#: builtin/pack-objects.c:3272
+msgid "do not create an empty pack output"
+msgstr ""
+
+#: builtin/pack-objects.c:3274
+msgid "read revision arguments from standard input"
+msgstr ""
+
+#: builtin/pack-objects.c:3276
+msgid "limit the objects to those that are not yet packed"
+msgstr ""
+
+#: builtin/pack-objects.c:3279
+msgid "include objects reachable from any reference"
+msgstr ""
+
+#: builtin/pack-objects.c:3282
+msgid "include objects referred by reflog entries"
+msgstr ""
+
+#: builtin/pack-objects.c:3285
+msgid "include objects referred to by the index"
+msgstr ""
+
+#: builtin/pack-objects.c:3288
+msgid "output pack to stdout"
+msgstr ""
+
+#: builtin/pack-objects.c:3290
+msgid "include tag objects that refer to objects to be packed"
+msgstr ""
+
+#: builtin/pack-objects.c:3292
+msgid "keep unreachable objects"
+msgstr ""
+
+#: builtin/pack-objects.c:3294
+msgid "pack loose unreachable objects"
+msgstr ""
+
+#: builtin/pack-objects.c:3296
+msgid "unpack unreachable objects newer than <time>"
+msgstr ""
+
+#: builtin/pack-objects.c:3299
+msgid "use the sparse reachability algorithm"
+msgstr ""
+
+#: builtin/pack-objects.c:3301
+msgid "create thin packs"
+msgstr ""
+
+#: builtin/pack-objects.c:3303
+msgid "create packs suitable for shallow fetches"
+msgstr ""
+
+#: builtin/pack-objects.c:3305
+msgid "ignore packs that have companion .keep file"
+msgstr ""
+
+#: builtin/pack-objects.c:3307
+msgid "ignore this pack"
+msgstr ""
+
+#: builtin/pack-objects.c:3309
+msgid "pack compression level"
+msgstr ""
+
+#: builtin/pack-objects.c:3311
+msgid "do not hide commits by grafts"
+msgstr ""
+
+#: builtin/pack-objects.c:3313
+msgid "use a bitmap index if available to speed up counting objects"
+msgstr ""
+
+#: builtin/pack-objects.c:3315
+msgid "write a bitmap index together with the pack index"
+msgstr ""
+
+#: builtin/pack-objects.c:3318
+msgid "handling for missing objects"
+msgstr ""
+
+#: builtin/pack-objects.c:3321
+msgid "do not pack objects in promisor packfiles"
+msgstr ""
+
+#: builtin/pack-objects.c:3323
+msgid "respect islands during delta compression"
+msgstr ""
+
+#: builtin/pack-objects.c:3348
+#, c-format
+msgid "delta chain depth %d is too deep, forcing %d"
+msgstr ""
+
+#: builtin/pack-objects.c:3353
+#, c-format
+msgid "pack.deltaCacheLimit is too high, forcing %d"
+msgstr ""
+
+#: builtin/pack-objects.c:3407
+msgid "--max-pack-size cannot be used to build a pack for transfer"
+msgstr ""
+
+#: builtin/pack-objects.c:3409
+msgid "minimum pack size limit is 1 MiB"
+msgstr ""
+
+#: builtin/pack-objects.c:3414
+msgid "--thin cannot be used to build an indexable pack"
+msgstr ""
+
+#: builtin/pack-objects.c:3417
+msgid "--keep-unreachable and --unpack-unreachable are incompatible"
+msgstr ""
+
+#: builtin/pack-objects.c:3423
+msgid "cannot use --filter without --stdout"
+msgstr ""
+
+#: builtin/pack-objects.c:3484
+msgid "Enumerating objects"
+msgstr ""
+
+#: builtin/pack-objects.c:3514
+#, c-format
+msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)"
+msgstr ""
+
+#: builtin/pack-refs.c:8
+msgid "git pack-refs [<options>]"
+msgstr ""
+
+#: builtin/pack-refs.c:16
+msgid "pack everything"
+msgstr ""
+
+#: builtin/pack-refs.c:17
+msgid "prune loose refs (default)"
+msgstr ""
+
+#: builtin/prune-packed.c:9
+msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
+msgstr ""
+
+#: builtin/prune-packed.c:42
+msgid "Removing duplicate objects"
+msgstr ""
+
+#: builtin/prune.c:12
+msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
+msgstr ""
+
+#: builtin/prune.c:131
+msgid "report pruned objects"
+msgstr ""
+
+#: builtin/prune.c:134
+msgid "expire objects older than <time>"
+msgstr ""
+
+#: builtin/prune.c:136
+msgid "limit traversal to objects outside promisor packfiles"
+msgstr ""
+
+#: builtin/prune.c:150
+msgid "cannot prune in a precious-objects repo"
+msgstr ""
+
+#: builtin/pull.c:66 builtin/pull.c:68
+#, c-format
+msgid "Invalid value for %s: %s"
+msgstr ""
+
+#: builtin/pull.c:88
+msgid "git pull [<options>] [<repository> [<refspec>...]]"
+msgstr ""
+
+#: builtin/pull.c:140
+msgid "control for recursive fetching of submodules"
+msgstr ""
+
+#: builtin/pull.c:144
+msgid "Options related to merging"
+msgstr ""
+
+#: builtin/pull.c:147
+msgid "incorporate changes by rebasing rather than merging"
+msgstr ""
+
+#: builtin/pull.c:175 builtin/rebase.c:447 builtin/revert.c:125
+msgid "allow fast-forward"
+msgstr ""
+
+#: builtin/pull.c:184
+msgid "automatically stash/stash pop before and after rebase"
+msgstr ""
+
+#: builtin/pull.c:200
+msgid "Options related to fetching"
+msgstr ""
+
+#: builtin/pull.c:210
+msgid "force overwrite of local branch"
+msgstr ""
+
+#: builtin/pull.c:218
+msgid "number of submodules pulled in parallel"
+msgstr ""
+
+#: builtin/pull.c:313
+#, c-format
+msgid "Invalid value for pull.ff: %s"
+msgstr ""
+
+#: builtin/pull.c:430
+msgid ""
+"There is no candidate for rebasing against among the refs that you just "
+"fetched."
+msgstr ""
+
+#: builtin/pull.c:432
+msgid ""
+"There are no candidates for merging among the refs that you just fetched."
+msgstr ""
+
+#: builtin/pull.c:433
+msgid ""
+"Generally this means that you provided a wildcard refspec which had no\n"
+"matches on the remote end."
+msgstr ""
+
+#: builtin/pull.c:436
+#, c-format
+msgid ""
+"You asked to pull from the remote '%s', but did not specify\n"
+"a branch. Because this is not the default configured remote\n"
+"for your current branch, you must specify a branch on the command line."
+msgstr ""
+
+#: builtin/pull.c:441 builtin/rebase.c:1321 git-parse-remote.sh:73
+msgid "You are not currently on a branch."
+msgstr ""
+
+#: builtin/pull.c:443 builtin/pull.c:458 git-parse-remote.sh:79
+msgid "Please specify which branch you want to rebase against."
+msgstr ""
+
+#: builtin/pull.c:445 builtin/pull.c:460 git-parse-remote.sh:82
+msgid "Please specify which branch you want to merge with."
+msgstr ""
+
+#: builtin/pull.c:446 builtin/pull.c:461
+msgid "See git-pull(1) for details."
+msgstr ""
+
+#: builtin/pull.c:448 builtin/pull.c:454 builtin/pull.c:463
+#: builtin/rebase.c:1327 git-parse-remote.sh:64
+msgid "<remote>"
+msgstr ""
+
+#: builtin/pull.c:448 builtin/pull.c:463 builtin/pull.c:468
+#: git-parse-remote.sh:65
+msgid "<branch>"
+msgstr ""
+
+#: builtin/pull.c:456 builtin/rebase.c:1319 git-parse-remote.sh:75
+msgid "There is no tracking information for the current branch."
+msgstr ""
+
+#: builtin/pull.c:465 git-parse-remote.sh:95
+msgid ""
+"If you wish to set tracking information for this branch you can do so with:"
+msgstr ""
+
+#: builtin/pull.c:470
+#, c-format
+msgid ""
+"Your configuration specifies to merge with the ref '%s'\n"
+"from the remote, but no such ref was fetched."
+msgstr ""
+
+#: builtin/pull.c:574
+#, c-format
+msgid "unable to access commit %s"
+msgstr ""
+
+#: builtin/pull.c:854
+msgid "ignoring --verify-signatures for rebase"
+msgstr ""
+
+#: builtin/pull.c:909
+msgid "--[no-]autostash option is only valid with --rebase."
+msgstr ""
+
+#: builtin/pull.c:917
+msgid "Updating an unborn branch with changes added to the index."
+msgstr ""
+
+#: builtin/pull.c:921
+msgid "pull with rebase"
+msgstr ""
+
+#: builtin/pull.c:922
+msgid "please commit or stash them."
+msgstr ""
+
+#: builtin/pull.c:947
+#, c-format
+msgid ""
+"fetch updated the current branch head.\n"
+"fast-forwarding your working tree from\n"
+"commit %s."
+msgstr ""
+
+#: builtin/pull.c:953
+#, c-format
+msgid ""
+"Cannot fast-forward your working tree.\n"
+"After making sure that you saved anything precious from\n"
+"$ git diff %s\n"
+"output, run\n"
+"$ git reset --hard\n"
+"to recover."
+msgstr ""
+
+#: builtin/pull.c:968
+msgid "Cannot merge multiple branches into empty head."
+msgstr ""
+
+#: builtin/pull.c:972
+msgid "Cannot rebase onto multiple branches."
+msgstr ""
+
+#: builtin/pull.c:979
+msgid "cannot rebase with locally recorded submodule modifications"
+msgstr ""
+
+#: builtin/push.c:19
+msgid "git push [<options>] [<repository> [<refspec>...]]"
+msgstr ""
+
+#: builtin/push.c:111
+msgid "tag shorthand without <tag>"
+msgstr ""
+
+#: builtin/push.c:121
+msgid "--delete only accepts plain target ref names"
+msgstr ""
+
+#: builtin/push.c:167
+msgid ""
+"\n"
+"To choose either option permanently, see push.default in 'git help config'."
+msgstr ""
+
+#: builtin/push.c:170
+#, c-format
+msgid ""
+"The upstream branch of your current branch does not match\n"
+"the name of your current branch. To push to the upstream branch\n"
+"on the remote, use\n"
+"\n"
+" git push %s HEAD:%s\n"
+"\n"
+"To push to the branch of the same name on the remote, use\n"
+"\n"
+" git push %s HEAD\n"
+"%s"
+msgstr ""
+
+#: builtin/push.c:185
+#, c-format
+msgid ""
+"You are not currently on a branch.\n"
+"To push the history leading to the current (detached HEAD)\n"
+"state now, use\n"
+"\n"
+" git push %s HEAD:<name-of-remote-branch>\n"
+msgstr ""
+
+#: builtin/push.c:199
+#, c-format
+msgid ""
+"The current branch %s has no upstream branch.\n"
+"To push the current branch and set the remote as upstream, use\n"
+"\n"
+" git push --set-upstream %s %s\n"
+msgstr ""
+
+#: builtin/push.c:207
+#, c-format
+msgid "The current branch %s has multiple upstream branches, refusing to push."
+msgstr ""
+
+#: builtin/push.c:210
+#, c-format
+msgid ""
+"You are pushing to remote '%s', which is not the upstream of\n"
+"your current branch '%s', without telling me what to push\n"
+"to update which remote branch."
+msgstr ""
+
+#: builtin/push.c:269
+msgid ""
+"You didn't specify any refspecs to push, and push.default is \"nothing\"."
+msgstr ""
+
+#: builtin/push.c:276
+msgid ""
+"Updates were rejected because the tip of your current branch is behind\n"
+"its remote counterpart. Integrate the remote changes (e.g.\n"
+"'git pull ...') before pushing again.\n"
+"See the 'Note about fast-forwards' in 'git push --help' for details."
+msgstr ""
+
+#: builtin/push.c:282
+msgid ""
+"Updates were rejected because a pushed branch tip is behind its remote\n"
+"counterpart. Check out this branch and integrate the remote changes\n"
+"(e.g. 'git pull ...') before pushing again.\n"
+"See the 'Note about fast-forwards' in 'git push --help' for details."
+msgstr ""
+
+#: builtin/push.c:288
+msgid ""
+"Updates were rejected because the remote contains work that you do\n"
+"not have locally. This is usually caused by another repository pushing\n"
+"to the same ref. You may want to first integrate the remote changes\n"
+"(e.g., 'git pull ...') before pushing again.\n"
+"See the 'Note about fast-forwards' in 'git push --help' for details."
+msgstr ""
+
+#: builtin/push.c:295
+msgid "Updates were rejected because the tag already exists in the remote."
+msgstr ""
+
+#: builtin/push.c:298
+msgid ""
+"You cannot update a remote ref that points at a non-commit object,\n"
+"or update a remote ref to make it point at a non-commit object,\n"
+"without using the '--force' option.\n"
+msgstr ""
+
+#: builtin/push.c:359
+#, c-format
+msgid "Pushing to %s\n"
+msgstr ""
+
+#: builtin/push.c:364
+#, c-format
+msgid "failed to push some refs to '%s'"
+msgstr ""
+
+#: builtin/push.c:398
+#, c-format
+msgid "bad repository '%s'"
+msgstr ""
+
+#: builtin/push.c:399
+msgid ""
+"No configured push destination.\n"
+"Either specify the URL from the command-line or configure a remote "
+"repository using\n"
+"\n"
+" git remote add <name> <url>\n"
+"\n"
+"and then push using the remote name\n"
+"\n"
+" git push <name>\n"
+msgstr ""
+
+#: builtin/push.c:554
+msgid "repository"
+msgstr ""
+
+#: builtin/push.c:555 builtin/send-pack.c:164
+msgid "push all refs"
+msgstr ""
+
+#: builtin/push.c:556 builtin/send-pack.c:166
+msgid "mirror all refs"
+msgstr ""
+
+#: builtin/push.c:558
+msgid "delete refs"
+msgstr ""
+
+#: builtin/push.c:559
+msgid "push tags (can't be used with --all or --mirror)"
+msgstr ""
+
+#: builtin/push.c:562 builtin/send-pack.c:167
+msgid "force updates"
+msgstr ""
+
+#: builtin/push.c:564 builtin/send-pack.c:181
+msgid "<refname>:<expect>"
+msgstr ""
+
+#: builtin/push.c:565 builtin/send-pack.c:182
+msgid "require old value of ref to be at this value"
+msgstr ""
+
+#: builtin/push.c:568
+msgid "control recursive pushing of submodules"
+msgstr ""
+
+#: builtin/push.c:570 builtin/send-pack.c:175
+msgid "use thin pack"
+msgstr ""
+
+#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:161
+#: builtin/send-pack.c:162
+msgid "receive pack program"
+msgstr ""
+
+#: builtin/push.c:573
+msgid "set upstream for git pull/status"
+msgstr ""
+
+#: builtin/push.c:576
+msgid "prune locally removed refs"
+msgstr ""
+
+#: builtin/push.c:578
+msgid "bypass pre-push hook"
+msgstr ""
+
+#: builtin/push.c:579
+msgid "push missing but relevant tags"
+msgstr ""
+
+#: builtin/push.c:582 builtin/send-pack.c:169
+msgid "GPG sign the push"
+msgstr ""
+
+#: builtin/push.c:584 builtin/send-pack.c:176
+msgid "request atomic transaction on remote side"
+msgstr ""
+
+#: builtin/push.c:602
+msgid "--delete is incompatible with --all, --mirror and --tags"
+msgstr ""
+
+#: builtin/push.c:604
+msgid "--delete doesn't make sense without any refs"
+msgstr ""
+
+#: builtin/push.c:607
+msgid "--all and --tags are incompatible"
+msgstr ""
+
+#: builtin/push.c:609
+msgid "--all can't be combined with refspecs"
+msgstr ""
+
+#: builtin/push.c:613
+msgid "--mirror and --tags are incompatible"
+msgstr ""
+
+#: builtin/push.c:615
+msgid "--mirror can't be combined with refspecs"
+msgstr ""
+
+#: builtin/push.c:618
+msgid "--all and --mirror are incompatible"
+msgstr ""
+
+#: builtin/push.c:637
+msgid "push options must not have new line characters"
+msgstr ""
+
+#: builtin/range-diff.c:8
+msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>"
+msgstr ""
+
+#: builtin/range-diff.c:9
+msgid "git range-diff [<options>] <old-tip>...<new-tip>"
+msgstr ""
+
+#: builtin/range-diff.c:10
+msgid "git range-diff [<options>] <base> <old-tip> <new-tip>"
+msgstr ""
+
+#: builtin/range-diff.c:21
+msgid "Percentage by which creation is weighted"
+msgstr ""
+
+#: builtin/range-diff.c:23
+msgid "use simple diff colors"
+msgstr ""
+
+#: builtin/range-diff.c:46 builtin/range-diff.c:50
+#, c-format
+msgid "no .. in range: '%s'"
+msgstr ""
+
+#: builtin/range-diff.c:60
+msgid "single arg format must be symmetric range"
+msgstr ""
+
+#: builtin/range-diff.c:75
+msgid "need two commit ranges"
+msgstr ""
+
+#: builtin/read-tree.c:41
+msgid ""
+"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
+"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
+"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
+msgstr ""
+
+#: builtin/read-tree.c:124
+msgid "write resulting index to <file>"
+msgstr ""
+
+#: builtin/read-tree.c:127
+msgid "only empty the index"
+msgstr ""
+
+#: builtin/read-tree.c:129
+msgid "Merging"
+msgstr ""
+
+#: builtin/read-tree.c:131
+msgid "perform a merge in addition to a read"
+msgstr ""
+
+#: builtin/read-tree.c:133
+msgid "3-way merge if no file level merging required"
+msgstr ""
+
+#: builtin/read-tree.c:135
+msgid "3-way merge in presence of adds and removes"
+msgstr ""
+
+#: builtin/read-tree.c:137
+msgid "same as -m, but discard unmerged entries"
+msgstr ""
+
+#: builtin/read-tree.c:138
+msgid "<subdirectory>/"
+msgstr ""
+
+#: builtin/read-tree.c:139
+msgid "read the tree into the index under <subdirectory>/"
+msgstr ""
+
+#: builtin/read-tree.c:142
+msgid "update working tree with merge result"
+msgstr ""
+
+#: builtin/read-tree.c:144
+msgid "gitignore"
+msgstr ""
+
+#: builtin/read-tree.c:145
+msgid "allow explicitly ignored files to be overwritten"
+msgstr ""
+
+#: builtin/read-tree.c:148
+msgid "don't check the working tree after merging"
+msgstr ""
+
+#: builtin/read-tree.c:149
+msgid "don't update the index or the work tree"
+msgstr ""
+
+#: builtin/read-tree.c:151
+msgid "skip applying sparse checkout filter"
+msgstr ""
+
+#: builtin/read-tree.c:153
+msgid "debug unpack-trees"
+msgstr ""
+
+#: builtin/read-tree.c:157
+msgid "suppress feedback messages"
+msgstr ""
+
+#: builtin/rebase.c:32
+msgid ""
+"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] "
+"[<branch>]"
+msgstr ""
+
+#: builtin/rebase.c:34
+msgid ""
+"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]"
+msgstr ""
+
+#: builtin/rebase.c:36
+msgid "git rebase --continue | --abort | --skip | --edit-todo"
+msgstr ""
+
+#: builtin/rebase.c:158 builtin/rebase.c:182 builtin/rebase.c:209
+#, c-format
+msgid "unusable todo list: '%s'"
+msgstr ""
+
+#: builtin/rebase.c:167 builtin/rebase.c:193 builtin/rebase.c:217
+#, c-format
+msgid "could not write '%s'."
+msgstr ""
+
+#: builtin/rebase.c:252
+msgid "no HEAD?"
+msgstr ""
+
+#: builtin/rebase.c:279
+#, c-format
+msgid "could not create temporary %s"
+msgstr ""
+
+#: builtin/rebase.c:285
+msgid "could not mark as interactive"
+msgstr ""
+
+#: builtin/rebase.c:343
+msgid "could not generate todo list"
+msgstr ""
+
+#: builtin/rebase.c:382
+msgid "a base commit must be provided with --upstream or --onto"
+msgstr ""
+
+#: builtin/rebase.c:437
+msgid "git rebase--interactive [<options>]"
+msgstr ""
+
+#: builtin/rebase.c:449
+msgid "keep empty commits"
+msgstr ""
+
+#: builtin/rebase.c:451 builtin/revert.c:127
+msgid "allow commits with empty messages"
+msgstr ""
+
+#: builtin/rebase.c:452
+msgid "rebase merge commits"
+msgstr ""
+
+#: builtin/rebase.c:454
+msgid "keep original branch points of cousins"
+msgstr ""
+
+#: builtin/rebase.c:456
+msgid "move commits that begin with squash!/fixup!"
+msgstr ""
+
+#: builtin/rebase.c:457
+msgid "sign commits"
+msgstr ""
+
+#: builtin/rebase.c:459 builtin/rebase.c:1397
+msgid "display a diffstat of what changed upstream"
+msgstr ""
+
+#: builtin/rebase.c:461
+msgid "continue rebase"
+msgstr ""
+
+#: builtin/rebase.c:463
+msgid "skip commit"
+msgstr ""
+
+#: builtin/rebase.c:464
+msgid "edit the todo list"
+msgstr ""
+
+#: builtin/rebase.c:466
+msgid "show the current patch"
+msgstr ""
+
+#: builtin/rebase.c:469
+msgid "shorten commit ids in the todo list"
+msgstr ""
+
+#: builtin/rebase.c:471
+msgid "expand commit ids in the todo list"
+msgstr ""
+
+#: builtin/rebase.c:473
+msgid "check the todo list"
+msgstr ""
+
+#: builtin/rebase.c:475
+msgid "rearrange fixup/squash lines"
+msgstr ""
+
+#: builtin/rebase.c:477
+msgid "insert exec commands in todo list"
+msgstr ""
+
+#: builtin/rebase.c:478
+msgid "onto"
+msgstr ""
+
+#: builtin/rebase.c:481
+msgid "restrict-revision"
+msgstr ""
+
+#: builtin/rebase.c:481
+msgid "restrict revision"
+msgstr ""
+
+#: builtin/rebase.c:483
+msgid "squash-onto"
+msgstr ""
+
+#: builtin/rebase.c:484
+msgid "squash onto"
+msgstr ""
+
+#: builtin/rebase.c:486
+msgid "the upstream commit"
+msgstr ""
+
+#: builtin/rebase.c:488
+msgid "head-name"
+msgstr ""
+
+#: builtin/rebase.c:488
+msgid "head name"
+msgstr ""
+
+#: builtin/rebase.c:493
+msgid "rebase strategy"
+msgstr ""
+
+#: builtin/rebase.c:494
+msgid "strategy-opts"
+msgstr ""
+
+#: builtin/rebase.c:495
+msgid "strategy options"
+msgstr ""
+
+#: builtin/rebase.c:496
+msgid "switch-to"
+msgstr ""
+
+#: builtin/rebase.c:497
+msgid "the branch or commit to checkout"
+msgstr ""
+
+#: builtin/rebase.c:498
+msgid "onto-name"
+msgstr ""
+
+#: builtin/rebase.c:498
+msgid "onto name"
+msgstr ""
+
+#: builtin/rebase.c:499
+msgid "cmd"
+msgstr ""
+
+#: builtin/rebase.c:499
+msgid "the command to run"
+msgstr ""
+
+#: builtin/rebase.c:502 builtin/rebase.c:1480
+msgid "automatically re-schedule any `exec` that fails"
+msgstr ""
+
+#: builtin/rebase.c:518
+msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
+msgstr ""
+
+#: builtin/rebase.c:534 builtin/rebase.c:1787
+#, c-format
+msgid "%s requires an interactive rebase"
+msgstr ""
+
+#: builtin/rebase.c:586
+#, c-format
+msgid "could not get 'onto': '%s'"
+msgstr ""
+
+#: builtin/rebase.c:601
+#, c-format
+msgid "invalid orig-head: '%s'"
+msgstr ""
+
+#: builtin/rebase.c:626
+#, c-format
+msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
+msgstr ""
+
+#: builtin/rebase.c:702
+#, c-format
+msgid "Could not read '%s'"
+msgstr ""
+
+#: builtin/rebase.c:720
+#, c-format
+msgid "Cannot store %s"
+msgstr ""
+
+#: builtin/rebase.c:817
+msgid "could not determine HEAD revision"
+msgstr ""
+
+#: builtin/rebase.c:940
+msgid ""
+"Resolve all conflicts manually, mark them as resolved with\n"
+"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
+"You can instead skip this commit: run \"git rebase --skip\".\n"
+"To abort and get back to the state before \"git rebase\", run \"git rebase --"
+"abort\"."
+msgstr ""
+
+#: builtin/rebase.c:1021
+#, c-format
+msgid ""
+"\n"
+"git encountered an error while preparing the patches to replay\n"
+"these revisions:\n"
+"\n"
+" %s\n"
+"\n"
+"As a result, git cannot rebase them."
+msgstr ""
+
+#: builtin/rebase.c:1313
+#, c-format
+msgid ""
+"%s\n"
+"Please specify which branch you want to rebase against.\n"
+"See git-rebase(1) for details.\n"
+"\n"
+" git rebase '<branch>'\n"
+"\n"
+msgstr ""
+
+#: builtin/rebase.c:1329
+#, c-format
+msgid ""
+"If you wish to set tracking information for this branch you can do so with:\n"
+"\n"
+" git branch --set-upstream-to=%s/<branch> %s\n"
+"\n"
+msgstr ""
+
+#: builtin/rebase.c:1359
+msgid "exec commands cannot contain newlines"
+msgstr ""
+
+#: builtin/rebase.c:1363
+msgid "empty exec command"
+msgstr ""
+
+#: builtin/rebase.c:1390
+msgid "rebase onto given branch instead of upstream"
+msgstr ""
+
+#: builtin/rebase.c:1392
+msgid "allow pre-rebase hook to run"
+msgstr ""
+
+#: builtin/rebase.c:1394
+msgid "be quiet. implies --no-stat"
+msgstr ""
+
+#: builtin/rebase.c:1400
+msgid "do not show diffstat of what changed upstream"
+msgstr ""
+
+#: builtin/rebase.c:1403
+msgid "add a Signed-off-by: line to each commit"
+msgstr ""
+
+#: builtin/rebase.c:1405 builtin/rebase.c:1409 builtin/rebase.c:1411
+msgid "passed to 'git am'"
+msgstr ""
+
+#: builtin/rebase.c:1413 builtin/rebase.c:1415
+msgid "passed to 'git apply'"
+msgstr ""
+
+#: builtin/rebase.c:1417 builtin/rebase.c:1420
+msgid "cherry-pick all commits, even if unchanged"
+msgstr ""
+
+#: builtin/rebase.c:1422
+msgid "continue"
+msgstr ""
+
+#: builtin/rebase.c:1425
+msgid "skip current patch and continue"
+msgstr ""
+
+#: builtin/rebase.c:1427
+msgid "abort and check out the original branch"
+msgstr ""
+
+#: builtin/rebase.c:1430
+msgid "abort but keep HEAD where it is"
+msgstr ""
+
+#: builtin/rebase.c:1431
+msgid "edit the todo list during an interactive rebase"
+msgstr ""
+
+#: builtin/rebase.c:1434
+msgid "show the patch file being applied or merged"
+msgstr ""
+
+#: builtin/rebase.c:1437
+msgid "use merging strategies to rebase"
+msgstr ""
+
+#: builtin/rebase.c:1441
+msgid "let the user edit the list of commits to rebase"
+msgstr ""
+
+#: builtin/rebase.c:1445
+msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
+msgstr ""
+
+#: builtin/rebase.c:1449
+msgid "preserve empty commits during rebase"
+msgstr ""
+
+#: builtin/rebase.c:1451
+msgid "move commits that begin with squash!/fixup! under -i"
+msgstr ""
+
+#: builtin/rebase.c:1457
+msgid "automatically stash/stash pop before and after"
+msgstr ""
+
+#: builtin/rebase.c:1459
+msgid "add exec lines after each commit of the editable list"
+msgstr ""
+
+#: builtin/rebase.c:1463
+msgid "allow rebasing commits with empty messages"
+msgstr ""
+
+#: builtin/rebase.c:1466
+msgid "try to rebase merges instead of skipping them"
+msgstr ""
+
+#: builtin/rebase.c:1469
+msgid "use 'merge-base --fork-point' to refine upstream"
+msgstr ""
+
+#: builtin/rebase.c:1471
+msgid "use the given merge strategy"
+msgstr ""
+
+#: builtin/rebase.c:1473 builtin/revert.c:114
+msgid "option"
+msgstr ""
+
+#: builtin/rebase.c:1474
+msgid "pass the argument through to the merge strategy"
+msgstr ""
+
+#: builtin/rebase.c:1477
+msgid "rebase all reachable commits up to the root(s)"
+msgstr ""
+
+#: builtin/rebase.c:1498
+msgid ""
+"the rebase.useBuiltin support has been removed!\n"
+"See its entry in 'git help config' for details."
+msgstr ""
+
+#: builtin/rebase.c:1504
+msgid "It looks like 'git am' is in progress. Cannot rebase."
+msgstr ""
+
+#: builtin/rebase.c:1545
+msgid ""
+"git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
+msgstr ""
+
+#: builtin/rebase.c:1549
+msgid "No rebase in progress?"
+msgstr ""
+
+#: builtin/rebase.c:1553
+msgid "The --edit-todo action can only be used during interactive rebase."
+msgstr ""
+
+#: builtin/rebase.c:1576
+msgid "Cannot read HEAD"
+msgstr ""
+
+#: builtin/rebase.c:1588
+msgid ""
+"You must edit all merge conflicts and then\n"
+"mark them as resolved using git add"
+msgstr ""
+
+#: builtin/rebase.c:1607
+msgid "could not discard worktree changes"
+msgstr ""
+
+#: builtin/rebase.c:1626
+#, c-format
+msgid "could not move back to %s"
+msgstr ""
+
+#: builtin/rebase.c:1637 builtin/rm.c:369
+#, c-format
+msgid "could not remove '%s'"
+msgstr ""
+
+#: builtin/rebase.c:1663
+#, c-format
+msgid ""
+"It seems that there is already a %s directory, and\n"
+"I wonder if you are in the middle of another rebase. If that is the\n"
+"case, please try\n"
+"\t%s\n"
+"If that is not the case, please\n"
+"\t%s\n"
+"and run me again. I am stopping in case you still have something\n"
+"valuable there.\n"
+msgstr ""
+
+#: builtin/rebase.c:1684
+msgid "switch `C' expects a numerical value"
+msgstr ""
+
+#: builtin/rebase.c:1725
+#, c-format
+msgid "Unknown mode: %s"
+msgstr ""
+
+#: builtin/rebase.c:1747
+msgid "--strategy requires --merge or --interactive"
+msgstr ""
+
+#: builtin/rebase.c:1796
+msgid "cannot combine am options with either interactive or merge options"
+msgstr ""
+
+#: builtin/rebase.c:1815
+msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
+msgstr ""
+
+#: builtin/rebase.c:1819
+msgid ""
+"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
+msgstr ""
+
+#: builtin/rebase.c:1825
+msgid "cannot combine '--rebase-merges' with '--strategy-option'"
+msgstr ""
+
+#: builtin/rebase.c:1828
+msgid "cannot combine '--rebase-merges' with '--strategy'"
+msgstr ""
+
+#: builtin/rebase.c:1852
+#, c-format
+msgid "invalid upstream '%s'"
+msgstr ""
+
+#: builtin/rebase.c:1858
+msgid "Could not create new root commit"
+msgstr ""
+
+#: builtin/rebase.c:1876
+#, c-format
+msgid "'%s': need exactly one merge base"
+msgstr ""
+
+#: builtin/rebase.c:1883
+#, c-format
+msgid "Does not point to a valid commit '%s'"
+msgstr ""
+
+#: builtin/rebase.c:1908
+#, c-format
+msgid "fatal: no such branch/commit '%s'"
+msgstr ""
+
+#: builtin/rebase.c:1916 builtin/submodule--helper.c:38
+#: builtin/submodule--helper.c:1933
+#, c-format
+msgid "No such ref: %s"
+msgstr ""
+
+#: builtin/rebase.c:1927
+msgid "Could not resolve HEAD to a revision"
+msgstr ""
+
+#: builtin/rebase.c:1968
+msgid "Cannot autostash"
+msgstr ""
+
+#: builtin/rebase.c:1971
+#, c-format
+msgid "Unexpected stash response: '%s'"
+msgstr ""
+
+#: builtin/rebase.c:1977
+#, c-format
+msgid "Could not create directory for '%s'"
+msgstr ""
+
+#: builtin/rebase.c:1980
+#, c-format
+msgid "Created autostash: %s\n"
+msgstr ""
+
+#: builtin/rebase.c:1983
+msgid "could not reset --hard"
+msgstr ""
+
+#: builtin/rebase.c:1984 builtin/reset.c:114
+#, c-format
+msgid "HEAD is now at %s"
+msgstr ""
+
+#: builtin/rebase.c:2000
+msgid "Please commit or stash them."
+msgstr ""
+
+#: builtin/rebase.c:2027
+#, c-format
+msgid "could not parse '%s'"
+msgstr ""
+
+#: builtin/rebase.c:2040
+#, c-format
+msgid "could not switch to %s"
+msgstr ""
+
+#: builtin/rebase.c:2051
+msgid "HEAD is up to date."
+msgstr ""
+
+#: builtin/rebase.c:2053
+#, c-format
+msgid "Current branch %s is up to date.\n"
+msgstr ""
+
+#: builtin/rebase.c:2061
+msgid "HEAD is up to date, rebase forced."
+msgstr ""
+
+#: builtin/rebase.c:2063
+#, c-format
+msgid "Current branch %s is up to date, rebase forced.\n"
+msgstr ""
+
+#: builtin/rebase.c:2071
+msgid "The pre-rebase hook refused to rebase."
+msgstr ""
+
+#: builtin/rebase.c:2078
+#, c-format
+msgid "Changes to %s:\n"
+msgstr ""
+
+#: builtin/rebase.c:2081
+#, c-format
+msgid "Changes from %s to %s:\n"
+msgstr ""
+
+#: builtin/rebase.c:2106
+#, c-format
+msgid "First, rewinding head to replay your work on top of it...\n"
+msgstr ""
+
+#: builtin/rebase.c:2115
+msgid "Could not detach HEAD"
+msgstr ""
+
+#: builtin/rebase.c:2124
+#, c-format
+msgid "Fast-forwarded %s to %s.\n"
+msgstr ""
+
+#: builtin/receive-pack.c:33
+msgid "git receive-pack <git-dir>"
+msgstr ""
+
+#: builtin/receive-pack.c:833
+msgid ""
+"By default, updating the current branch in a non-bare repository\n"
+"is denied, because it will make the index and work tree inconsistent\n"
+"with what you pushed, and will require 'git reset --hard' to match\n"
+"the work tree to HEAD.\n"
+"\n"
+"You can set the 'receive.denyCurrentBranch' configuration variable\n"
+"to 'ignore' or 'warn' in the remote repository to allow pushing into\n"
+"its current branch; however, this is not recommended unless you\n"
+"arranged to update its work tree to match what you pushed in some\n"
+"other way.\n"
+"\n"
+"To squelch this message and still keep the default behaviour, set\n"
+"'receive.denyCurrentBranch' configuration variable to 'refuse'."
+msgstr ""
+
+#: builtin/receive-pack.c:853
+msgid ""
+"By default, deleting the current branch is denied, because the next\n"
+"'git clone' won't result in any file checked out, causing confusion.\n"
+"\n"
+"You can set 'receive.denyDeleteCurrent' configuration variable to\n"
+"'warn' or 'ignore' in the remote repository to allow deleting the\n"
+"current branch, with or without a warning message.\n"
+"\n"
+"To squelch this message, you can set it to 'refuse'."
+msgstr ""
+
+#: builtin/receive-pack.c:1940
+msgid "quiet"
+msgstr ""
+
+#: builtin/receive-pack.c:1954
+msgid "You must specify a directory."
+msgstr ""
+
+#: builtin/reflog.c:17
+msgid ""
+"git reflog expire [--expire=<time>] [--expire-unreachable=<time>] [--"
+"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] "
+"<refs>..."
+msgstr ""
+
+#: builtin/reflog.c:22
+msgid ""
+"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] "
+"<refs>..."
+msgstr ""
+
+#: builtin/reflog.c:25
+msgid "git reflog exists <ref>"
+msgstr ""
+
+#: builtin/reflog.c:567 builtin/reflog.c:572
+#, c-format
+msgid "'%s' is not a valid timestamp"
+msgstr ""
+
+#: builtin/reflog.c:605
+#, c-format
+msgid "Marking reachable objects..."
+msgstr ""
+
+#: builtin/reflog.c:643
+#, c-format
+msgid "%s points nowhere!"
+msgstr ""
+
+#: builtin/reflog.c:695
+msgid "no reflog specified to delete"
+msgstr ""
+
+#: builtin/reflog.c:704
+#, c-format
+msgid "not a reflog: %s"
+msgstr ""
+
+#: builtin/reflog.c:709
+#, c-format
+msgid "no reflog for '%s'"
+msgstr ""
+
+#: builtin/reflog.c:755
+#, c-format
+msgid "invalid ref format: %s"
+msgstr ""
+
+#: builtin/reflog.c:764
+msgid "git reflog [ show | expire | delete | exists ]"
+msgstr ""
+
+#: builtin/remote.c:16
+msgid "git remote [-v | --verbose]"
+msgstr ""
+
+#: builtin/remote.c:17
+msgid ""
+"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
+"mirror=<fetch|push>] <name> <url>"
+msgstr ""
+
+#: builtin/remote.c:18 builtin/remote.c:38
+msgid "git remote rename <old> <new>"
+msgstr ""
+
+#: builtin/remote.c:19 builtin/remote.c:43
+msgid "git remote remove <name>"
+msgstr ""
+
+#: builtin/remote.c:20 builtin/remote.c:48
+msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
+msgstr ""
+
+#: builtin/remote.c:21
+msgid "git remote [-v | --verbose] show [-n] <name>"
+msgstr ""
+
+#: builtin/remote.c:22
+msgid "git remote prune [-n | --dry-run] <name>"
+msgstr ""
+
+#: builtin/remote.c:23
+msgid ""
+"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
+msgstr ""
+
+#: builtin/remote.c:24
+msgid "git remote set-branches [--add] <name> <branch>..."
+msgstr ""
+
+#: builtin/remote.c:25 builtin/remote.c:74
+msgid "git remote get-url [--push] [--all] <name>"
+msgstr ""
+
+#: builtin/remote.c:26 builtin/remote.c:79
+msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
+msgstr ""
+
+#: builtin/remote.c:27 builtin/remote.c:80
+msgid "git remote set-url --add <name> <newurl>"
+msgstr ""
+
+#: builtin/remote.c:28 builtin/remote.c:81
+msgid "git remote set-url --delete <name> <url>"
+msgstr ""
+
+#: builtin/remote.c:33
+msgid "git remote add [<options>] <name> <url>"
+msgstr ""
+
+#: builtin/remote.c:53
+msgid "git remote set-branches <name> <branch>..."
+msgstr ""
+
+#: builtin/remote.c:54
+msgid "git remote set-branches --add <name> <branch>..."
+msgstr ""
+
+#: builtin/remote.c:59
+msgid "git remote show [<options>] <name>"
+msgstr ""
+
+#: builtin/remote.c:64
+msgid "git remote prune [<options>] <name>"
+msgstr ""
+
+#: builtin/remote.c:69
+msgid "git remote update [<options>] [<group> | <remote>]..."
+msgstr ""
+
+#: builtin/remote.c:98
+#, c-format
+msgid "Updating %s"
+msgstr ""
+
+#: builtin/remote.c:130
+msgid ""
+"--mirror is dangerous and deprecated; please\n"
+"\t use --mirror=fetch or --mirror=push instead"
+msgstr ""
+
+#: builtin/remote.c:147
+#, c-format
+msgid "unknown mirror argument: %s"
+msgstr ""
+
+#: builtin/remote.c:163
+msgid "fetch the remote branches"
+msgstr ""
+
+#: builtin/remote.c:165
+msgid "import all tags and associated objects when fetching"
+msgstr ""
+
+#: builtin/remote.c:168
+msgid "or do not fetch any tag at all (--no-tags)"
+msgstr ""
+
+#: builtin/remote.c:170
+msgid "branch(es) to track"
+msgstr ""
+
+#: builtin/remote.c:171
+msgid "master branch"
+msgstr ""
+
+#: builtin/remote.c:173
+msgid "set up remote as a mirror to push to or fetch from"
+msgstr ""
+
+#: builtin/remote.c:185
+msgid "specifying a master branch makes no sense with --mirror"
+msgstr ""
+
+#: builtin/remote.c:187
+msgid "specifying branches to track makes sense only with fetch mirrors"
+msgstr ""
+
+#: builtin/remote.c:194 builtin/remote.c:636
+#, c-format
+msgid "remote %s already exists."
+msgstr ""
+
+#: builtin/remote.c:198 builtin/remote.c:640
+#, c-format
+msgid "'%s' is not a valid remote name"
+msgstr ""
+
+#: builtin/remote.c:238
+#, c-format
+msgid "Could not setup master '%s'"
+msgstr ""
+
+#: builtin/remote.c:344
+#, c-format
+msgid "Could not get fetch map for refspec %s"
+msgstr ""
+
+#: builtin/remote.c:443 builtin/remote.c:451
+msgid "(matching)"
+msgstr ""
+
+#: builtin/remote.c:455
+msgid "(delete)"
+msgstr ""
+
+#: builtin/remote.c:629 builtin/remote.c:765 builtin/remote.c:864
+#, c-format
+msgid "No such remote: '%s'"
+msgstr ""
+
+#: builtin/remote.c:646
+#, c-format
+msgid "Could not rename config section '%s' to '%s'"
+msgstr ""
+
+#: builtin/remote.c:666
+#, c-format
+msgid ""
+"Not updating non-default fetch refspec\n"
+"\t%s\n"
+"\tPlease update the configuration manually if necessary."
+msgstr ""
+
+#: builtin/remote.c:702
+#, c-format
+msgid "deleting '%s' failed"
+msgstr ""
+
+#: builtin/remote.c:736
+#, c-format
+msgid "creating '%s' failed"
+msgstr ""
+
+#: builtin/remote.c:802
+msgid ""
+"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
+"to delete it, use:"
+msgid_plural ""
+"Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
+"to delete them, use:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/remote.c:816
+#, c-format
+msgid "Could not remove config section '%s'"
+msgstr ""
+
+#: builtin/remote.c:917
+#, c-format
+msgid " new (next fetch will store in remotes/%s)"
+msgstr ""
+
+#: builtin/remote.c:920
+msgid " tracked"
+msgstr ""
+
+#: builtin/remote.c:922
+msgid " stale (use 'git remote prune' to remove)"
+msgstr ""
+
+#: builtin/remote.c:924
+msgid " ???"
+msgstr ""
+
+#: builtin/remote.c:965
+#, c-format
+msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
+msgstr ""
+
+#: builtin/remote.c:974
+#, c-format
+msgid "rebases interactively onto remote %s"
+msgstr ""
+
+#: builtin/remote.c:976
+#, c-format
+msgid "rebases interactively (with merges) onto remote %s"
+msgstr ""
+
+#: builtin/remote.c:979
+#, c-format
+msgid "rebases onto remote %s"
+msgstr ""
+
+#: builtin/remote.c:983
+#, c-format
+msgid " merges with remote %s"
+msgstr ""
+
+#: builtin/remote.c:986
+#, c-format
+msgid "merges with remote %s"
+msgstr ""
+
+#: builtin/remote.c:989
+#, c-format
+msgid "%-*s and with remote %s\n"
+msgstr ""
+
+#: builtin/remote.c:1032
+msgid "create"
+msgstr ""
+
+#: builtin/remote.c:1035
+msgid "delete"
+msgstr ""
+
+#: builtin/remote.c:1039
+msgid "up to date"
+msgstr ""
+
+#: builtin/remote.c:1042
+msgid "fast-forwardable"
+msgstr ""
+
+#: builtin/remote.c:1045
+msgid "local out of date"
+msgstr ""
+
+#: builtin/remote.c:1052
+#, c-format
+msgid " %-*s forces to %-*s (%s)"
+msgstr ""
+
+#: builtin/remote.c:1055
+#, c-format
+msgid " %-*s pushes to %-*s (%s)"
+msgstr ""
+
+#: builtin/remote.c:1059
+#, c-format
+msgid " %-*s forces to %s"
+msgstr ""
+
+#: builtin/remote.c:1062
+#, c-format
+msgid " %-*s pushes to %s"
+msgstr ""
+
+#: builtin/remote.c:1130
+msgid "do not query remotes"
+msgstr ""
+
+#: builtin/remote.c:1157
+#, c-format
+msgid "* remote %s"
+msgstr ""
+
+#: builtin/remote.c:1158
+#, c-format
+msgid " Fetch URL: %s"
+msgstr ""
+
+#: builtin/remote.c:1159 builtin/remote.c:1175 builtin/remote.c:1314
+msgid "(no URL)"
+msgstr ""
+
+#. TRANSLATORS: the colon ':' should align
+#. with the one in " Fetch URL: %s"
+#. translation.
+#.
+#: builtin/remote.c:1173 builtin/remote.c:1175
+#, c-format
+msgid " Push URL: %s"
+msgstr ""
+
+#: builtin/remote.c:1177 builtin/remote.c:1179 builtin/remote.c:1181
+#, c-format
+msgid " HEAD branch: %s"
+msgstr ""
+
+#: builtin/remote.c:1177
+msgid "(not queried)"
+msgstr ""
+
+#: builtin/remote.c:1179
+msgid "(unknown)"
+msgstr ""
+
+#: builtin/remote.c:1183
+#, c-format
+msgid ""
+" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
+msgstr ""
+
+#: builtin/remote.c:1195
+#, c-format
+msgid " Remote branch:%s"
+msgid_plural " Remote branches:%s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/remote.c:1198 builtin/remote.c:1224
+msgid " (status not queried)"
+msgstr ""
+
+#: builtin/remote.c:1207
+msgid " Local branch configured for 'git pull':"
+msgid_plural " Local branches configured for 'git pull':"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/remote.c:1215
+msgid " Local refs will be mirrored by 'git push'"
+msgstr ""
+
+#: builtin/remote.c:1221
+#, c-format
+msgid " Local ref configured for 'git push'%s:"
+msgid_plural " Local refs configured for 'git push'%s:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/remote.c:1242
+msgid "set refs/remotes/<name>/HEAD according to remote"
+msgstr ""
+
+#: builtin/remote.c:1244
+msgid "delete refs/remotes/<name>/HEAD"
+msgstr ""
+
+#: builtin/remote.c:1259
+msgid "Cannot determine remote HEAD"
+msgstr ""
+
+#: builtin/remote.c:1261
+msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
+msgstr ""
+
+#: builtin/remote.c:1271
+#, c-format
+msgid "Could not delete %s"
+msgstr ""
+
+#: builtin/remote.c:1279
+#, c-format
+msgid "Not a valid ref: %s"
+msgstr ""
+
+#: builtin/remote.c:1281
+#, c-format
+msgid "Could not setup %s"
+msgstr ""
+
+#: builtin/remote.c:1299
+#, c-format
+msgid " %s will become dangling!"
+msgstr ""
+
+#: builtin/remote.c:1300
+#, c-format
+msgid " %s has become dangling!"
+msgstr ""
+
+#: builtin/remote.c:1310
+#, c-format
+msgid "Pruning %s"
+msgstr ""
+
+#: builtin/remote.c:1311
+#, c-format
+msgid "URL: %s"
+msgstr ""
+
+#: builtin/remote.c:1327
+#, c-format
+msgid " * [would prune] %s"
+msgstr ""
+
+#: builtin/remote.c:1330
+#, c-format
+msgid " * [pruned] %s"
+msgstr ""
+
+#: builtin/remote.c:1375
+msgid "prune remotes after fetching"
+msgstr ""
+
+#: builtin/remote.c:1438 builtin/remote.c:1492 builtin/remote.c:1560
+#, c-format
+msgid "No such remote '%s'"
+msgstr ""
+
+#: builtin/remote.c:1454
+msgid "add branch"
+msgstr ""
+
+#: builtin/remote.c:1461
+msgid "no remote specified"
+msgstr ""
+
+#: builtin/remote.c:1478
+msgid "query push URLs rather than fetch URLs"
+msgstr ""
+
+#: builtin/remote.c:1480
+msgid "return all URLs"
+msgstr ""
+
+#: builtin/remote.c:1508
+#, c-format
+msgid "no URLs configured for remote '%s'"
+msgstr ""
+
+#: builtin/remote.c:1534
+msgid "manipulate push URLs"
+msgstr ""
+
+#: builtin/remote.c:1536
+msgid "add URL"
+msgstr ""
+
+#: builtin/remote.c:1538
+msgid "delete URLs"
+msgstr ""
+
+#: builtin/remote.c:1545
+msgid "--add --delete doesn't make sense"
+msgstr ""
+
+#: builtin/remote.c:1584
+#, c-format
+msgid "Invalid old URL pattern: %s"
+msgstr ""
+
+#: builtin/remote.c:1592
+#, c-format
+msgid "No such URL found: %s"
+msgstr ""
+
+#: builtin/remote.c:1594
+msgid "Will not delete all non-push URLs"
+msgstr ""
+
+#: builtin/remote.c:1610
+msgid "be verbose; must be placed before a subcommand"
+msgstr ""
+
+#: builtin/remote.c:1641
+#, c-format
+msgid "Unknown subcommand: %s"
+msgstr ""
+
+#: builtin/repack.c:22
+msgid "git repack [<options>]"
+msgstr ""
+
+#: builtin/repack.c:27
+msgid ""
+"Incremental repacks are incompatible with bitmap indexes. Use\n"
+"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
+msgstr ""
+
+#: builtin/repack.c:200
+msgid "could not start pack-objects to repack promisor objects"
+msgstr ""
+
+#: builtin/repack.c:239 builtin/repack.c:414
+msgid "repack: Expecting full hex object ID lines only from pack-objects."
+msgstr ""
+
+#: builtin/repack.c:256
+msgid "could not finish pack-objects to repack promisor objects"
+msgstr ""
+
+#: builtin/repack.c:294
+msgid "pack everything in a single pack"
+msgstr ""
+
+#: builtin/repack.c:296
+msgid "same as -a, and turn unreachable objects loose"
+msgstr ""
+
+#: builtin/repack.c:299
+msgid "remove redundant packs, and run git-prune-packed"
+msgstr ""
+
+#: builtin/repack.c:301
+msgid "pass --no-reuse-delta to git-pack-objects"
+msgstr ""
+
+#: builtin/repack.c:303
+msgid "pass --no-reuse-object to git-pack-objects"
+msgstr ""
+
+#: builtin/repack.c:305
+msgid "do not run git-update-server-info"
+msgstr ""
+
+#: builtin/repack.c:308
+msgid "pass --local to git-pack-objects"
+msgstr ""
+
+#: builtin/repack.c:310
+msgid "write bitmap index"
+msgstr ""
+
+#: builtin/repack.c:312
+msgid "pass --delta-islands to git-pack-objects"
+msgstr ""
+
+#: builtin/repack.c:313
+msgid "approxidate"
+msgstr ""
+
+#: builtin/repack.c:314
+msgid "with -A, do not loosen objects older than this"
+msgstr ""
+
+#: builtin/repack.c:316
+msgid "with -a, repack unreachable objects"
+msgstr ""
+
+#: builtin/repack.c:318
+msgid "size of the window used for delta compression"
+msgstr ""
+
+#: builtin/repack.c:319 builtin/repack.c:325
+msgid "bytes"
+msgstr ""
+
+#: builtin/repack.c:320
+msgid "same as the above, but limit memory size instead of entries count"
+msgstr ""
+
+#: builtin/repack.c:322
+msgid "limits the maximum delta depth"
+msgstr ""
+
+#: builtin/repack.c:324
+msgid "limits the maximum number of threads"
+msgstr ""
+
+#: builtin/repack.c:326
+msgid "maximum size of each packfile"
+msgstr ""
+
+#: builtin/repack.c:328
+msgid "repack objects in packs marked with .keep"
+msgstr ""
+
+#: builtin/repack.c:330
+msgid "do not repack this pack"
+msgstr ""
+
+#: builtin/repack.c:340
+msgid "cannot delete packs in a precious-objects repo"
+msgstr ""
+
+#: builtin/repack.c:344
+msgid "--keep-unreachable and -A are incompatible"
+msgstr ""
+
+#: builtin/repack.c:423
+msgid "Nothing new to pack."
+msgstr ""
+
+#: builtin/repack.c:484
+#, c-format
+msgid ""
+"WARNING: Some packs in use have been renamed by\n"
+"WARNING: prefixing old- to their name, in order to\n"
+"WARNING: replace them with the new version of the\n"
+"WARNING: file. But the operation failed, and the\n"
+"WARNING: attempt to rename them back to their\n"
+"WARNING: original names also failed.\n"
+"WARNING: Please rename them in %s manually:\n"
+msgstr ""
+
+#: builtin/repack.c:532
+#, c-format
+msgid "failed to remove '%s'"
+msgstr ""
+
+#: builtin/replace.c:22
+msgid "git replace [-f] <object> <replacement>"
+msgstr ""
+
+#: builtin/replace.c:23
+msgid "git replace [-f] --edit <object>"
+msgstr ""
+
+#: builtin/replace.c:24
+msgid "git replace [-f] --graft <commit> [<parent>...]"
+msgstr ""
+
+#: builtin/replace.c:25
+msgid "git replace [-f] --convert-graft-file"
+msgstr ""
+
+#: builtin/replace.c:26
+msgid "git replace -d <object>..."
+msgstr ""
+
+#: builtin/replace.c:27
+msgid "git replace [--format=<format>] [-l [<pattern>]]"
+msgstr ""
+
+#: builtin/replace.c:90
+#, c-format
+msgid ""
+"invalid replace format '%s'\n"
+"valid formats are 'short', 'medium' and 'long'"
+msgstr ""
+
+#: builtin/replace.c:125
+#, c-format
+msgid "replace ref '%s' not found"
+msgstr ""
+
+#: builtin/replace.c:141
+#, c-format
+msgid "Deleted replace ref '%s'"
+msgstr ""
+
+#: builtin/replace.c:153
+#, c-format
+msgid "'%s' is not a valid ref name"
+msgstr ""
+
+#: builtin/replace.c:158
+#, c-format
+msgid "replace ref '%s' already exists"
+msgstr ""
+
+#: builtin/replace.c:178
+#, c-format
+msgid ""
+"Objects must be of the same type.\n"
+"'%s' points to a replaced object of type '%s'\n"
+"while '%s' points to a replacement object of type '%s'."
+msgstr ""
+
+#: builtin/replace.c:229
+#, c-format
+msgid "unable to open %s for writing"
+msgstr ""
+
+#: builtin/replace.c:242
+msgid "cat-file reported failure"
+msgstr ""
+
+#: builtin/replace.c:258
+#, c-format
+msgid "unable to open %s for reading"
+msgstr ""
+
+#: builtin/replace.c:272
+msgid "unable to spawn mktree"
+msgstr ""
+
+#: builtin/replace.c:276
+msgid "unable to read from mktree"
+msgstr ""
+
+#: builtin/replace.c:285
+msgid "mktree reported failure"
+msgstr ""
+
+#: builtin/replace.c:289
+msgid "mktree did not return an object name"
+msgstr ""
+
+#: builtin/replace.c:298
+#, c-format
+msgid "unable to fstat %s"
+msgstr ""
+
+#: builtin/replace.c:303
+msgid "unable to write object to database"
+msgstr ""
+
+#: builtin/replace.c:322 builtin/replace.c:377 builtin/replace.c:422
+#: builtin/replace.c:452
+#, c-format
+msgid "not a valid object name: '%s'"
+msgstr ""
+
+#: builtin/replace.c:326
+#, c-format
+msgid "unable to get object type for %s"
+msgstr ""
+
+#: builtin/replace.c:342
+msgid "editing object file failed"
+msgstr ""
+
+#: builtin/replace.c:351
+#, c-format
+msgid "new object is the same as the old one: '%s'"
+msgstr ""
+
+#: builtin/replace.c:383
+#, c-format
+msgid "could not parse %s as a commit"
+msgstr ""
+
+#: builtin/replace.c:414
+#, c-format
+msgid "bad mergetag in commit '%s'"
+msgstr ""
+
+#: builtin/replace.c:416
+#, c-format
+msgid "malformed mergetag in commit '%s'"
+msgstr ""
+
+#: builtin/replace.c:428
+#, c-format
+msgid ""
+"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
+"instead of --graft"
+msgstr ""
+
+#: builtin/replace.c:467
+#, c-format
+msgid "the original commit '%s' has a gpg signature"
+msgstr ""
+
+#: builtin/replace.c:468
+msgid "the signature will be removed in the replacement commit!"
+msgstr ""
+
+#: builtin/replace.c:478
+#, c-format
+msgid "could not write replacement commit for: '%s'"
+msgstr ""
+
+#: builtin/replace.c:486
+#, c-format
+msgid "graft for '%s' unnecessary"
+msgstr ""
+
+#: builtin/replace.c:490
+#, c-format
+msgid "new commit is the same as the old one: '%s'"
+msgstr ""
+
+#: builtin/replace.c:525
+#, c-format
+msgid ""
+"could not convert the following graft(s):\n"
+"%s"
+msgstr ""
+
+#: builtin/replace.c:546
+msgid "list replace refs"
+msgstr ""
+
+#: builtin/replace.c:547
+msgid "delete replace refs"
+msgstr ""
+
+#: builtin/replace.c:548
+msgid "edit existing object"
+msgstr ""
+
+#: builtin/replace.c:549
+msgid "change a commit's parents"
+msgstr ""
+
+#: builtin/replace.c:550
+msgid "convert existing graft file"
+msgstr ""
+
+#: builtin/replace.c:551
+msgid "replace the ref if it exists"
+msgstr ""
+
+#: builtin/replace.c:553
+msgid "do not pretty-print contents for --edit"
+msgstr ""
+
+#: builtin/replace.c:554
+msgid "use this format"
+msgstr ""
+
+#: builtin/replace.c:567
+msgid "--format cannot be used when not listing"
+msgstr ""
+
+#: builtin/replace.c:575
+msgid "-f only makes sense when writing a replacement"
+msgstr ""
+
+#: builtin/replace.c:579
+msgid "--raw only makes sense with --edit"
+msgstr ""
+
+#: builtin/replace.c:585
+msgid "-d needs at least one argument"
+msgstr ""
+
+#: builtin/replace.c:591
+msgid "bad number of arguments"
+msgstr ""
+
+#: builtin/replace.c:597
+msgid "-e needs exactly one argument"
+msgstr ""
+
+#: builtin/replace.c:603
+msgid "-g needs at least one argument"
+msgstr ""
+
+#: builtin/replace.c:609
+msgid "--convert-graft-file takes no argument"
+msgstr ""
+
+#: builtin/replace.c:615
+msgid "only one pattern can be given with -l"
+msgstr ""
+
+#: builtin/rerere.c:13
+msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
+msgstr ""
+
+#: builtin/rerere.c:60
+msgid "register clean resolutions in index"
+msgstr ""
+
+#: builtin/rerere.c:79
+msgid "'git rerere forget' without paths is deprecated"
+msgstr ""
+
+#: builtin/rerere.c:113
+#, c-format
+msgid "unable to generate diff for '%s'"
+msgstr ""
+
+#: builtin/reset.c:32
+msgid ""
+"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
+msgstr ""
+
+#: builtin/reset.c:33
+msgid "git reset [-q] [<tree-ish>] [--] <paths>..."
+msgstr ""
+
+#: builtin/reset.c:34
+msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
+msgstr ""
+
+#: builtin/reset.c:40
+msgid "mixed"
+msgstr ""
+
+#: builtin/reset.c:40
+msgid "soft"
+msgstr ""
+
+#: builtin/reset.c:40
+msgid "hard"
+msgstr ""
+
+#: builtin/reset.c:40
+msgid "merge"
+msgstr ""
+
+#: builtin/reset.c:40
+msgid "keep"
+msgstr ""
+
+#: builtin/reset.c:81
+msgid "You do not have a valid HEAD."
+msgstr ""
+
+#: builtin/reset.c:83
+msgid "Failed to find tree of HEAD."
+msgstr ""
+
+#: builtin/reset.c:89
+#, c-format
+msgid "Failed to find tree of %s."
+msgstr ""
+
+#: builtin/reset.c:193
+#, c-format
+msgid "Cannot do a %s reset in the middle of a merge."
+msgstr ""
+
+#: builtin/reset.c:293 builtin/stash.c:514 builtin/stash.c:589
+#: builtin/stash.c:613
+msgid "be quiet, only report errors"
+msgstr ""
+
+#: builtin/reset.c:295
+msgid "reset HEAD and index"
+msgstr ""
+
+#: builtin/reset.c:296
+msgid "reset only HEAD"
+msgstr ""
+
+#: builtin/reset.c:298 builtin/reset.c:300
+msgid "reset HEAD, index and working tree"
+msgstr ""
+
+#: builtin/reset.c:302
+msgid "reset HEAD but keep local changes"
+msgstr ""
+
+#: builtin/reset.c:308
+msgid "record only the fact that removed paths will be added later"
+msgstr ""
+
+#: builtin/reset.c:326
+#, c-format
+msgid "Failed to resolve '%s' as a valid revision."
+msgstr ""
+
+#: builtin/reset.c:334
+#, c-format
+msgid "Failed to resolve '%s' as a valid tree."
+msgstr ""
+
+#: builtin/reset.c:343
+msgid "--patch is incompatible with --{hard,mixed,soft}"
+msgstr ""
+
+#: builtin/reset.c:353
+msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
+msgstr ""
+
+#: builtin/reset.c:355
+#, c-format
+msgid "Cannot do %s reset with paths."
+msgstr ""
+
+#: builtin/reset.c:370
+#, c-format
+msgid "%s reset is not allowed in a bare repository"
+msgstr ""
+
+#: builtin/reset.c:374
+msgid "-N can only be used with --mixed"
+msgstr ""
+
+#: builtin/reset.c:395
+msgid "Unstaged changes after reset:"
+msgstr ""
+
+#: builtin/reset.c:398
+#, c-format
+msgid ""
+"\n"
+"It took %.2f seconds to enumerate unstaged changes after reset. You can\n"
+"use '--quiet' to avoid this. Set the config setting reset.quiet to true\n"
+"to make this the default.\n"
+msgstr ""
+
+#: builtin/reset.c:408
+#, c-format
+msgid "Could not reset index file to revision '%s'."
+msgstr ""
+
+#: builtin/reset.c:412
+msgid "Could not write new index file."
+msgstr ""
+
+#: builtin/rev-list.c:405
+msgid "cannot combine --exclude-promisor-objects and --missing"
+msgstr ""
+
+#: builtin/rev-list.c:466
+msgid "object filtering requires --objects"
+msgstr ""
+
+#: builtin/rev-list.c:469
+#, c-format
+msgid "invalid sparse value '%s'"
+msgstr ""
+
+#: builtin/rev-list.c:510
+msgid "rev-list does not support display of notes"
+msgstr ""
+
+#: builtin/rev-list.c:513
+msgid "cannot combine --use-bitmap-index with object filtering"
+msgstr ""
+
+#: builtin/rev-parse.c:408
+msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
+msgstr ""
+
+#: builtin/rev-parse.c:413
+msgid "keep the `--` passed as an arg"
+msgstr ""
+
+#: builtin/rev-parse.c:415
+msgid "stop parsing after the first non-option argument"
+msgstr ""
+
+#: builtin/rev-parse.c:418
+msgid "output in stuck long form"
+msgstr ""
+
+#: builtin/rev-parse.c:551
+msgid ""
+"git rev-parse --parseopt [<options>] -- [<args>...]\n"
+" or: git rev-parse --sq-quote [<arg>...]\n"
+" or: git rev-parse [<options>] [<arg>...]\n"
+"\n"
+"Run \"git rev-parse --parseopt -h\" for more information on the first usage."
+msgstr ""
+
+#: builtin/revert.c:24
+msgid "git revert [<options>] <commit-ish>..."
+msgstr ""
+
+#: builtin/revert.c:25
+msgid "git revert <subcommand>"
+msgstr ""
+
+#: builtin/revert.c:30
+msgid "git cherry-pick [<options>] <commit-ish>..."
+msgstr ""
+
+#: builtin/revert.c:31
+msgid "git cherry-pick <subcommand>"
+msgstr ""
+
+#: builtin/revert.c:72
+#, c-format
+msgid "option `%s' expects a number greater than zero"
+msgstr ""
+
+#: builtin/revert.c:92
+#, c-format
+msgid "%s: %s cannot be used with %s"
+msgstr ""
+
+#: builtin/revert.c:102
+msgid "end revert or cherry-pick sequence"
+msgstr ""
+
+#: builtin/revert.c:103
+msgid "resume revert or cherry-pick sequence"
+msgstr ""
+
+#: builtin/revert.c:104
+msgid "cancel revert or cherry-pick sequence"
+msgstr ""
+
+#: builtin/revert.c:106
+msgid "don't automatically commit"
+msgstr ""
+
+#: builtin/revert.c:107
+msgid "edit the commit message"
+msgstr ""
+
+#: builtin/revert.c:110
+msgid "parent-number"
+msgstr ""
+
+#: builtin/revert.c:111
+msgid "select mainline parent"
+msgstr ""
+
+#: builtin/revert.c:113
+msgid "merge strategy"
+msgstr ""
+
+#: builtin/revert.c:115
+msgid "option for merge strategy"
+msgstr ""
+
+#: builtin/revert.c:124
+msgid "append commit name"
+msgstr ""
+
+#: builtin/revert.c:126
+msgid "preserve initially empty commits"
+msgstr ""
+
+#: builtin/revert.c:128
+msgid "keep redundant, empty commits"
+msgstr ""
+
+#: builtin/revert.c:227
+msgid "revert failed"
+msgstr ""
+
+#: builtin/revert.c:240
+msgid "cherry-pick failed"
+msgstr ""
+
+#: builtin/rm.c:19
+msgid "git rm [<options>] [--] <file>..."
+msgstr ""
+
+#: builtin/rm.c:207
+msgid ""
+"the following file has staged content different from both the\n"
+"file and the HEAD:"
+msgid_plural ""
+"the following files have staged content different from both the\n"
+"file and the HEAD:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/rm.c:212
+msgid ""
+"\n"
+"(use -f to force removal)"
+msgstr ""
+
+#: builtin/rm.c:216
+msgid "the following file has changes staged in the index:"
+msgid_plural "the following files have changes staged in the index:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/rm.c:220 builtin/rm.c:229
+msgid ""
+"\n"
+"(use --cached to keep the file, or -f to force removal)"
+msgstr ""
+
+#: builtin/rm.c:226
+msgid "the following file has local modifications:"
+msgid_plural "the following files have local modifications:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/rm.c:242
+msgid "do not list removed files"
+msgstr ""
+
+#: builtin/rm.c:243
+msgid "only remove from the index"
+msgstr ""
+
+#: builtin/rm.c:244
+msgid "override the up-to-date check"
+msgstr ""
+
+#: builtin/rm.c:245
+msgid "allow recursive removal"
+msgstr ""
+
+#: builtin/rm.c:247
+msgid "exit with a zero status even if nothing matched"
+msgstr ""
+
+#: builtin/rm.c:289
+msgid "please stage your changes to .gitmodules or stash them to proceed"
+msgstr ""
+
+#: builtin/rm.c:307
+#, c-format
+msgid "not removing '%s' recursively without -r"
+msgstr ""
+
+#: builtin/rm.c:346
+#, c-format
+msgid "git rm: unable to remove %s"
+msgstr ""
+
+#: builtin/send-pack.c:20
+msgid ""
+"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
+"receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
+"[<ref>...]\n"
+" --all and explicit <ref> specification are mutually exclusive."
+msgstr ""
+
+#: builtin/send-pack.c:163
+msgid "remote name"
+msgstr ""
+
+#: builtin/send-pack.c:177
+msgid "use stateless RPC protocol"
+msgstr ""
+
+#: builtin/send-pack.c:178
+msgid "read refs from stdin"
+msgstr ""
+
+#: builtin/send-pack.c:179
+msgid "print status from remote helper"
+msgstr ""
+
+#: builtin/shortlog.c:14
+msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]"
+msgstr ""
+
+#: builtin/shortlog.c:15
+msgid "git log --pretty=short | git shortlog [<options>]"
+msgstr ""
+
+#: builtin/shortlog.c:264
+msgid "Group by committer rather than author"
+msgstr ""
+
+#: builtin/shortlog.c:266
+msgid "sort output according to the number of commits per author"
+msgstr ""
+
+#: builtin/shortlog.c:268
+msgid "Suppress commit descriptions, only provides commit count"
+msgstr ""
+
+#: builtin/shortlog.c:270
+msgid "Show the email address of each author"
+msgstr ""
+
+#: builtin/shortlog.c:271
+msgid "<w>[,<i1>[,<i2>]]"
+msgstr ""
+
+#: builtin/shortlog.c:272
+msgid "Linewrap output"
+msgstr ""
+
+#: builtin/shortlog.c:301
+msgid "too many arguments given outside repository"
+msgstr ""
+
+#: builtin/show-branch.c:13
+msgid ""
+"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
+"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
+"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
+"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
+msgstr ""
+
+#: builtin/show-branch.c:17
+msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
+msgstr ""
+
+#: builtin/show-branch.c:395
+#, c-format
+msgid "ignoring %s; cannot handle more than %d ref"
+msgid_plural "ignoring %s; cannot handle more than %d refs"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/show-branch.c:549
+#, c-format
+msgid "no matching refs with %s"
+msgstr ""
+
+#: builtin/show-branch.c:646
+msgid "show remote-tracking and local branches"
+msgstr ""
+
+#: builtin/show-branch.c:648
+msgid "show remote-tracking branches"
+msgstr ""
+
+#: builtin/show-branch.c:650
+msgid "color '*!+-' corresponding to the branch"
+msgstr ""
+
+#: builtin/show-branch.c:652
+msgid "show <n> more commits after the common ancestor"
+msgstr ""
+
+#: builtin/show-branch.c:654
+msgid "synonym to more=-1"
+msgstr ""
+
+#: builtin/show-branch.c:655
+msgid "suppress naming strings"
+msgstr ""
+
+#: builtin/show-branch.c:657
+msgid "include the current branch"
+msgstr ""
+
+#: builtin/show-branch.c:659
+msgid "name commits with their object names"
+msgstr ""
+
+#: builtin/show-branch.c:661
+msgid "show possible merge bases"
+msgstr ""
+
+#: builtin/show-branch.c:663
+msgid "show refs unreachable from any other ref"
+msgstr ""
+
+#: builtin/show-branch.c:665
+msgid "show commits in topological order"
+msgstr ""
+
+#: builtin/show-branch.c:668
+msgid "show only commits not on the first branch"
+msgstr ""
+
+#: builtin/show-branch.c:670
+msgid "show merges reachable from only one tip"
+msgstr ""
+
+#: builtin/show-branch.c:672
+msgid "topologically sort, maintaining date order where possible"
+msgstr ""
+
+#: builtin/show-branch.c:675
+msgid "<n>[,<base>]"
+msgstr ""
+
+#: builtin/show-branch.c:676
+msgid "show <n> most recent ref-log entries starting at base"
+msgstr ""
+
+#: builtin/show-branch.c:712
+msgid ""
+"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
+msgstr ""
+
+#: builtin/show-branch.c:736
+msgid "no branches given, and HEAD is not valid"
+msgstr ""
+
+#: builtin/show-branch.c:739
+msgid "--reflog option needs one branch name"
+msgstr ""
+
+#: builtin/show-branch.c:742
+#, c-format
+msgid "only %d entry can be shown at one time."
+msgid_plural "only %d entries can be shown at one time."
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/show-branch.c:746
+#, c-format
+msgid "no such ref %s"
+msgstr ""
+
+#: builtin/show-branch.c:832
+#, c-format
+msgid "cannot handle more than %d rev."
+msgid_plural "cannot handle more than %d revs."
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/show-branch.c:836
+#, c-format
+msgid "'%s' is not a valid ref."
+msgstr ""
+
+#: builtin/show-branch.c:839
+#, c-format
+msgid "cannot find commit %s (%s)"
+msgstr ""
+
+#: builtin/show-ref.c:12
+msgid ""
+"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
+"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
+msgstr ""
+
+#: builtin/show-ref.c:13
+msgid "git show-ref --exclude-existing[=<pattern>]"
+msgstr ""
+
+#: builtin/show-ref.c:162
+msgid "only show tags (can be combined with heads)"
+msgstr ""
+
+#: builtin/show-ref.c:163
+msgid "only show heads (can be combined with tags)"
+msgstr ""
+
+#: builtin/show-ref.c:164
+msgid "stricter reference checking, requires exact ref path"
+msgstr ""
+
+#: builtin/show-ref.c:167 builtin/show-ref.c:169
+msgid "show the HEAD reference, even if it would be filtered out"
+msgstr ""
+
+#: builtin/show-ref.c:171
+msgid "dereference tags into object IDs"
+msgstr ""
+
+#: builtin/show-ref.c:173
+msgid "only show SHA1 hash using <n> digits"
+msgstr ""
+
+#: builtin/show-ref.c:177
+msgid "do not print results to stdout (useful with --verify)"
+msgstr ""
+
+#: builtin/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/revert.c:107
-msgid "select mainline parent"
+#: builtin/stash.c:1472 builtin/stash.c:1508
+msgid "include ignore files"
msgstr ""
-#: builtin/revert.c:109
-msgid "merge strategy"
+#: builtin/stash.c:1568
+#, c-format
+msgid "could not exec %s"
msgstr ""
-#: builtin/revert.c:110
-msgid "option"
+#: builtin/stripspace.c:18
+msgid "git stripspace [-s | --strip-comments]"
msgstr ""
-#: builtin/revert.c:111
-msgid "option for merge strategy"
+#: builtin/stripspace.c:19
+msgid "git stripspace [-c | --comment-lines]"
+msgstr ""
+
+#: builtin/stripspace.c:37
+msgid "skip and remove all lines starting with comment character"
+msgstr ""
+
+#: builtin/stripspace.c:40
+msgid "prepend comment character and space to each line"
+msgstr ""
+
+#: builtin/submodule--helper.c:45 builtin/submodule--helper.c:1942
+#, c-format
+msgid "Expecting a full ref name, got %s"
+msgstr ""
+
+#: builtin/submodule--helper.c:62
+msgid "submodule--helper print-default-remote takes no arguments"
+msgstr ""
+
+#: builtin/submodule--helper.c:100
+#, c-format
+msgid "cannot strip one component off url '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1367
+msgid "alternative anchor for relative paths"
+msgstr ""
+
+#: builtin/submodule--helper.c:413
+msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
+msgstr ""
+
+#: builtin/submodule--helper.c:470 builtin/submodule--helper.c:627
+#: builtin/submodule--helper.c:650
+#, c-format
+msgid "No url found for submodule path '%s' in .gitmodules"
+msgstr ""
+
+#: builtin/submodule--helper.c:522
+#, c-format
+msgid "Entering '%s'\n"
+msgstr ""
+
+#: builtin/submodule--helper.c:525
+#, c-format
+msgid ""
+"run_command returned non-zero status for %s\n"
+"."
+msgstr ""
+
+#: builtin/submodule--helper.c:546
+#, c-format
+msgid ""
+"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:664
+#, c-format
+msgid "Failed to register url for submodule path '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:668
+#, c-format
+msgid "Submodule '%s' (%s) registered for path '%s'\n"
+msgstr ""
+
+#: builtin/submodule--helper.c:678
+#, c-format
+msgid "warning: command update mode suggested for submodule '%s'\n"
+msgstr ""
+
+#: builtin/submodule--helper.c:685
+#, c-format
+msgid "Failed to register update mode for submodule path '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:707
+msgid "Suppress output for initializing a submodule"
+msgstr ""
+
+#: builtin/submodule--helper.c:712
+msgid "git submodule--helper init [<options>] [<path>]"
+msgstr ""
+
+#: 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:823
+#, c-format
+msgid "could not resolve HEAD ref inside the submodule '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:850 builtin/submodule--helper.c:1019
+#, c-format
+msgid "failed to recurse into submodule '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:874 builtin/submodule--helper.c:1185
+msgid "Suppress submodule status output"
+msgstr ""
+
+#: 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:876
+msgid "recurse into nested submodules"
+msgstr ""
+
+#: builtin/submodule--helper.c:881
+msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
+msgstr ""
+
+#: builtin/submodule--helper.c:905
+msgid "git submodule--helper name <path>"
+msgstr ""
+
+#: builtin/submodule--helper.c:969
+#, c-format
+msgid "Synchronizing submodule url for '%s'\n"
+msgstr ""
+
+#: builtin/submodule--helper.c:975
+#, c-format
+msgid "failed to register url for submodule path '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:989
+#, c-format
+msgid "failed to get the default remote for submodule '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:1000
+#, c-format
+msgid "failed to update remote for submodule '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:1047
+msgid "Suppress output of synchronizing submodule url"
+msgstr ""
+
+#: builtin/submodule--helper.c:1054
+msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
+msgstr ""
+
+#: 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:1120
+#, c-format
+msgid ""
+"Submodule work tree '%s' contains local modifications; use '-f' to discard "
+"them"
+msgstr ""
+
+#: builtin/submodule--helper.c:1128
+#, c-format
+msgid "Cleared directory '%s'\n"
+msgstr ""
+
+#: builtin/submodule--helper.c:1130
+#, c-format
+msgid "Could not remove submodule work tree '%s'\n"
+msgstr ""
+
+#: builtin/submodule--helper.c:1141
+#, c-format
+msgid "could not create empty submodule directory %s"
+msgstr ""
+
+#: builtin/submodule--helper.c:1157
+#, c-format
+msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
+msgstr ""
+
+#: builtin/submodule--helper.c:1186
+msgid "Remove submodule working trees even if they contain local changes"
+msgstr ""
+
+#: builtin/submodule--helper.c:1187
+msgid "Unregister all submodules"
+msgstr ""
+
+#: builtin/submodule--helper.c:1192
+msgid ""
+"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
+msgstr ""
+
+#: builtin/submodule--helper.c:1206
+msgid "Use '--all' if you really want to deinitialize all submodules"
+msgstr ""
+
+#: builtin/submodule--helper.c:1301 builtin/submodule--helper.c:1304
+#, c-format
+msgid "submodule '%s' cannot add alternate: %s"
+msgstr ""
+
+#: builtin/submodule--helper.c:1340
+#, c-format
+msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
+msgstr ""
+
+#: builtin/submodule--helper.c:1347
+#, c-format
+msgid "Value '%s' for submodule.alternateLocation is not recognized"
+msgstr ""
+
+#: builtin/submodule--helper.c:1370
+msgid "where the new submodule will be cloned to"
+msgstr ""
+
+#: builtin/submodule--helper.c:1373
+msgid "name of the new submodule"
+msgstr ""
+
+#: builtin/submodule--helper.c:1376
+msgid "url where to clone the submodule from"
+msgstr ""
+
+#: builtin/submodule--helper.c:1384
+msgid "depth for shallow clones"
+msgstr ""
+
+#: builtin/submodule--helper.c:1387 builtin/submodule--helper.c:1871
+msgid "force cloning progress"
+msgstr ""
+
+#: 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:1423
+#, c-format
+msgid "clone of '%s' into submodule path '%s' failed"
+msgstr ""
+
+#: builtin/submodule--helper.c:1437
+#, c-format
+msgid "could not get submodule directory for '%s'"
+msgstr ""
+
+#: 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:1574
+msgid "Maybe you want to use 'update --init'?"
+msgstr ""
+
+#: builtin/submodule--helper.c:1604
+#, c-format
+msgid "Skipping unmerged submodule %s"
+msgstr ""
+
+#: builtin/submodule--helper.c:1633
+#, c-format
+msgid "Skipping submodule '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:1777
+#, c-format
+msgid "Failed to clone '%s'. Retry scheduled"
+msgstr ""
+
+#: builtin/submodule--helper.c:1788
+#, c-format
+msgid "Failed to clone '%s' a second time, aborting"
+msgstr ""
+
+#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:2092
+msgid "path into the working tree"
+msgstr ""
+
+#: builtin/submodule--helper.c:1853
+msgid "path into the working tree, across nested submodule boundaries"
+msgstr ""
+
+#: builtin/submodule--helper.c:1857
+msgid "rebase, merge, checkout or none"
msgstr ""
-#: builtin/revert.c:120
-msgid "append commit name"
+#: builtin/submodule--helper.c:1863
+msgid "Create a shallow clone truncated to the specified number of revisions"
msgstr ""
-#: builtin/revert.c:122
-msgid "preserve initially empty commits"
+#: builtin/submodule--helper.c:1866
+msgid "parallel jobs"
msgstr ""
-#: builtin/revert.c:124
-msgid "keep redundant, empty commits"
+#: builtin/submodule--helper.c:1868
+msgid "whether the initial clone should follow the shallow recommendation"
msgstr ""
-#: builtin/revert.c:214
-msgid "revert failed"
+#: builtin/submodule--helper.c:1869
+msgid "don't print cloning progress"
msgstr ""
-#: builtin/revert.c:227
-msgid "cherry-pick failed"
+#: builtin/submodule--helper.c:1876
+msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
msgstr ""
-#: builtin/rm.c:18
-msgid "git rm [<options>] [--] <file>..."
+#: builtin/submodule--helper.c:1889
+msgid "bad value for update parameter"
msgstr ""
-#: builtin/rm.c:206
+#: builtin/submodule--helper.c:1937
+#, c-format
msgid ""
-"the following file has staged content different from both the\n"
-"file and the HEAD:"
-msgid_plural ""
-"the following files have staged content different from both the\n"
-"file and the HEAD:"
-msgstr[0] ""
-msgstr[1] ""
+"Submodule (%s) branch configured to inherit branch from superproject, but "
+"the superproject is not on any branch"
+msgstr ""
-#: builtin/rm.c:211
-msgid ""
-"\n"
-"(use -f to force removal)"
+#: builtin/submodule--helper.c:2060
+#, c-format
+msgid "could not get a repository handle for submodule '%s'"
msgstr ""
-#: builtin/rm.c:215
-msgid "the following file has changes staged in the index:"
-msgid_plural "the following files have changes staged in the index:"
-msgstr[0] ""
-msgstr[1] ""
+#: builtin/submodule--helper.c:2093
+msgid "recurse into submodules"
+msgstr ""
-#: builtin/rm.c:219 builtin/rm.c:228
-msgid ""
-"\n"
-"(use --cached to keep the file, or -f to force removal)"
+#: builtin/submodule--helper.c:2099
+msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
msgstr ""
-#: builtin/rm.c:225
-msgid "the following file has local modifications:"
-msgid_plural "the following files have local modifications:"
-msgstr[0] ""
-msgstr[1] ""
+#: builtin/submodule--helper.c:2156
+msgid "check if it is safe to write to the .gitmodules file"
+msgstr ""
-#: builtin/rm.c:243
-msgid "do not list removed files"
+#: builtin/submodule--helper.c:2159
+msgid "unset the config in the .gitmodules file"
msgstr ""
-#: builtin/rm.c:244
-msgid "only remove from the index"
+#: builtin/submodule--helper.c:2164
+msgid "git submodule--helper config <name> [<value>]"
msgstr ""
-#: builtin/rm.c:245
-msgid "override the up-to-date check"
+#: builtin/submodule--helper.c:2165
+msgid "git submodule--helper config --unset <name>"
msgstr ""
-#: builtin/rm.c:246
-msgid "allow recursive removal"
+#: builtin/submodule--helper.c:2166
+msgid "git submodule--helper config --check-writeable"
msgstr ""
-#: builtin/rm.c:248
-msgid "exit with a zero status even if nothing matched"
+#: 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/rm.c:307
+#: builtin/submodule--helper.c:2235 git.c:433 git.c:685
#, c-format
-msgid "not removing '%s' recursively without -r"
+msgid "%s doesn't support --super-prefix"
msgstr ""
-#: builtin/rm.c:346
+#: builtin/submodule--helper.c:2241
#, c-format
-msgid "git rm: unable to remove %s"
+msgid "'%s' is not a valid submodule--helper subcommand"
msgstr ""
-#: builtin/rm.c:369
-#, c-format
-msgid "could not remove '%s'"
+#: builtin/symbolic-ref.c:8
+msgid "git symbolic-ref [<options>] <name> [<ref>]"
msgstr ""
-#: builtin/send-pack.c:19
-msgid ""
-"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
-"receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
-"[<ref>...]\n"
-" --all and explicit <ref> specification are mutually exclusive."
+#: builtin/symbolic-ref.c:9
+msgid "git symbolic-ref -d [-q] <name>"
msgstr ""
-#: builtin/send-pack.c:162
-msgid "remote name"
+#: builtin/symbolic-ref.c:40
+msgid "suppress error message for non-symbolic (detached) refs"
msgstr ""
-#: builtin/send-pack.c:176
-msgid "use stateless RPC protocol"
+#: builtin/symbolic-ref.c:41
+msgid "delete symbolic ref"
msgstr ""
-#: builtin/send-pack.c:177
-msgid "read refs from stdin"
+#: builtin/symbolic-ref.c:42
+msgid "shorten ref output"
msgstr ""
-#: builtin/send-pack.c:178
-msgid "print status from remote helper"
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363
+msgid "reason"
msgstr ""
-#: builtin/shortlog.c:14
-msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363
+msgid "reason of the update"
msgstr ""
-#: builtin/shortlog.c:263
-msgid "Group by committer rather than author"
+#: builtin/tag.c:25
+msgid ""
+"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n"
+"\t\t<tagname> [<head>]"
msgstr ""
-#: builtin/shortlog.c:265
-msgid "sort output according to the number of commits per author"
+#: builtin/tag.c:27
+msgid "git tag -d <tagname>..."
msgstr ""
-#: builtin/shortlog.c:267
-msgid "Suppress commit descriptions, only provides commit count"
+#: 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/shortlog.c:269
-msgid "Show the email address of each author"
+#: builtin/tag.c:30
+msgid "git tag -v [--format=<format>] <tagname>..."
msgstr ""
-#: builtin/shortlog.c:270
-msgid "w[,i1[,i2]]"
+#: builtin/tag.c:88
+#, c-format
+msgid "tag '%s' not found."
msgstr ""
-#: builtin/shortlog.c:271
-msgid "Linewrap output"
+#: builtin/tag.c:104
+#, c-format
+msgid "Deleted tag '%s' (was %s)\n"
msgstr ""
-#: builtin/show-branch.c:12
+#: builtin/tag.c:134
+#, c-format
msgid ""
-"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
-"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
-"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
-"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
+"\n"
+"Write a message for tag:\n"
+" %s\n"
+"Lines starting with '%c' will be ignored.\n"
msgstr ""
-#: builtin/show-branch.c:16
-msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
+#: builtin/tag.c:138
+#, c-format
+msgid ""
+"\n"
+"Write a message for tag:\n"
+" %s\n"
+"Lines starting with '%c' will be kept; you may remove them yourself if you "
+"want to.\n"
+msgstr ""
+
+#: builtin/tag.c:192
+msgid "unable to sign the tag"
+msgstr ""
+
+#: builtin/tag.c:194
+msgid "unable to write tag file"
msgstr ""
-#: builtin/show-branch.c:376
+#: builtin/tag.c:210
#, c-format
-msgid "ignoring %s; cannot handle more than %d ref"
-msgid_plural "ignoring %s; cannot handle more than %d refs"
-msgstr[0] ""
-msgstr[1] ""
+msgid ""
+"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/show-branch.c:530
+#: builtin/tag.c:226
+msgid "bad object type."
+msgstr ""
+
+#: builtin/tag.c:278
+msgid "no tag message?"
+msgstr ""
+
+#: builtin/tag.c:285
#, c-format
-msgid "no matching refs with %s"
+msgid "The tag message has been left in %s\n"
msgstr ""
-#: builtin/show-branch.c:626
-msgid "show remote-tracking and local branches"
+#: builtin/tag.c:396
+msgid "list tag names"
msgstr ""
-#: builtin/show-branch.c:628
-msgid "show remote-tracking branches"
+#: builtin/tag.c:398
+msgid "print <n> lines of each tag message"
msgstr ""
-#: builtin/show-branch.c:630
-msgid "color '*!+-' corresponding to the branch"
+#: builtin/tag.c:400
+msgid "delete tags"
msgstr ""
-#: builtin/show-branch.c:632
-msgid "show <n> more commits after the common ancestor"
+#: builtin/tag.c:401
+msgid "verify tags"
msgstr ""
-#: builtin/show-branch.c:634
-msgid "synonym to more=-1"
+#: builtin/tag.c:403
+msgid "Tag creation options"
msgstr ""
-#: builtin/show-branch.c:635
-msgid "suppress naming strings"
+#: builtin/tag.c:405
+msgid "annotated tag, needs a message"
msgstr ""
-#: builtin/show-branch.c:637
-msgid "include the current branch"
+#: builtin/tag.c:407
+msgid "tag message"
msgstr ""
-#: builtin/show-branch.c:639
-msgid "name commits with their object names"
+#: builtin/tag.c:409
+msgid "force edit of tag message"
msgstr ""
-#: builtin/show-branch.c:641
-msgid "show possible merge bases"
+#: builtin/tag.c:410
+msgid "annotated and GPG-signed tag"
msgstr ""
-#: builtin/show-branch.c:643
-msgid "show refs unreachable from any other ref"
+#: builtin/tag.c:413
+msgid "use another key to sign the tag"
msgstr ""
-#: builtin/show-branch.c:645
-msgid "show commits in topological order"
+#: builtin/tag.c:414
+msgid "replace the tag if exists"
msgstr ""
-#: builtin/show-branch.c:648
-msgid "show only commits not on the first branch"
+#: builtin/tag.c:415 builtin/update-ref.c:369
+msgid "create a reflog"
msgstr ""
-#: builtin/show-branch.c:650
-msgid "show merges reachable from only one tip"
+#: builtin/tag.c:417
+msgid "Tag listing options"
msgstr ""
-#: builtin/show-branch.c:652
-msgid "topologically sort, maintaining date order where possible"
+#: builtin/tag.c:418
+msgid "show tag list in columns"
msgstr ""
-#: builtin/show-branch.c:655
-msgid "<n>[,<base>]"
+#: builtin/tag.c:419 builtin/tag.c:421
+msgid "print only tags that contain the commit"
msgstr ""
-#: builtin/show-branch.c:656
-msgid "show <n> most recent ref-log entries starting at base"
+#: builtin/tag.c:420 builtin/tag.c:422
+msgid "print only tags that don't contain the commit"
msgstr ""
-#: builtin/show-branch.c:690
-msgid ""
-"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
+#: builtin/tag.c:423
+msgid "print only tags that are merged"
msgstr ""
-#: builtin/show-branch.c:714
-msgid "no branches given, and HEAD is not valid"
+#: builtin/tag.c:424
+msgid "print only tags that are not merged"
msgstr ""
-#: builtin/show-branch.c:717
-msgid "--reflog option needs one branch name"
+#: builtin/tag.c:428
+msgid "print only tags of the object"
msgstr ""
-#: builtin/show-branch.c:720
-#, c-format
-msgid "only %d entry can be shown at one time."
-msgid_plural "only %d entries can be shown at one time."
-msgstr[0] ""
-msgstr[1] ""
+#: builtin/tag.c:472
+msgid "--column and -n are incompatible"
+msgstr ""
-#: builtin/show-branch.c:724
-#, c-format
-msgid "no such ref %s"
+#: builtin/tag.c:494
+msgid "-n option is only allowed in list mode"
msgstr ""
-#: builtin/show-branch.c:808
-#, c-format
-msgid "cannot handle more than %d rev."
-msgid_plural "cannot handle more than %d revs."
-msgstr[0] ""
-msgstr[1] ""
+#: builtin/tag.c:496
+msgid "--contains option is only allowed in list mode"
+msgstr ""
-#: builtin/show-branch.c:812
-#, c-format
-msgid "'%s' is not a valid ref."
+#: builtin/tag.c:498
+msgid "--no-contains option is only allowed in list mode"
msgstr ""
-#: builtin/show-branch.c:815
-#, c-format
-msgid "cannot find commit %s (%s)"
+#: builtin/tag.c:500
+msgid "--points-at option is only allowed in list mode"
msgstr ""
-#: builtin/show-ref.c:10
-msgid ""
-"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
-"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
+#: builtin/tag.c:502
+msgid "--merged and --no-merged options are only allowed in list mode"
msgstr ""
-#: builtin/show-ref.c:11
-msgid "git show-ref --exclude-existing[=<pattern>]"
+#: builtin/tag.c:513
+msgid "only one -F or -m option is allowed."
msgstr ""
-#: builtin/show-ref.c:159
-msgid "only show tags (can be combined with heads)"
+#: builtin/tag.c:532
+msgid "too many params"
msgstr ""
-#: builtin/show-ref.c:160
-msgid "only show heads (can be combined with tags)"
+#: builtin/tag.c:538
+#, c-format
+msgid "'%s' is not a valid tag name."
msgstr ""
-#: builtin/show-ref.c:161
-msgid "stricter reference checking, requires exact ref path"
+#: builtin/tag.c:543
+#, c-format
+msgid "tag '%s' already exists"
msgstr ""
-#: builtin/show-ref.c:164 builtin/show-ref.c:166
-msgid "show the HEAD reference, even if it would be filtered out"
+#: builtin/tag.c:574
+#, c-format
+msgid "Updated tag '%s' (was %s)\n"
msgstr ""
-#: builtin/show-ref.c:168
-msgid "dereference tags into object IDs"
+#: builtin/unpack-objects.c:500
+msgid "Unpacking objects"
msgstr ""
-#: builtin/show-ref.c:170
-msgid "only show SHA1 hash using <n> digits"
+#: builtin/update-index.c:83
+#, c-format
+msgid "failed to create directory %s"
msgstr ""
-#: builtin/show-ref.c:174
-msgid "do not print results to stdout (useful with --verify)"
+#: builtin/update-index.c:99
+#, c-format
+msgid "failed to create file %s"
msgstr ""
-#: builtin/show-ref.c:176
-msgid "show refs from stdin that aren't in local repository"
+#: builtin/update-index.c:107
+#, c-format
+msgid "failed to delete file %s"
msgstr ""
-#: builtin/stripspace.c:18
-msgid "git stripspace [-s | --strip-comments]"
+#: builtin/update-index.c:114 builtin/update-index.c:220
+#, c-format
+msgid "failed to delete directory %s"
msgstr ""
-#: builtin/stripspace.c:19
-msgid "git stripspace [-c | --comment-lines]"
+#: builtin/update-index.c:139
+#, c-format
+msgid "Testing mtime in '%s' "
msgstr ""
-#: builtin/stripspace.c:36
-msgid "skip and remove all lines starting with comment character"
+#: builtin/update-index.c:153
+msgid "directory stat info does not change after adding a new file"
msgstr ""
-#: builtin/stripspace.c:39
-msgid "prepend comment character and space to each line"
+#: builtin/update-index.c:166
+msgid "directory stat info does not change after adding a new directory"
msgstr ""
-#: builtin/submodule--helper.c:35 builtin/submodule--helper.c:1669
-#, c-format
-msgid "No such ref: %s"
+#: builtin/update-index.c:179
+msgid "directory stat info changes after updating a file"
msgstr ""
-#: builtin/submodule--helper.c:42 builtin/submodule--helper.c:1678
-#, c-format
-msgid "Expecting a full ref name, got %s"
+#: builtin/update-index.c:190
+msgid "directory stat info changes after adding a file inside subdirectory"
msgstr ""
-#: builtin/submodule--helper.c:59
-msgid "submodule--helper print-default-remote takes no arguments"
+#: builtin/update-index.c:201
+msgid "directory stat info does not change after deleting a file"
msgstr ""
-#: builtin/submodule--helper.c:96
-#, c-format
-msgid "cannot strip one component off url '%s'"
+#: builtin/update-index.c:214
+msgid "directory stat info does not change after deleting a directory"
msgstr ""
-#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1198
-msgid "alternative anchor for relative paths"
+#: builtin/update-index.c:221
+msgid " OK"
msgstr ""
-#: builtin/submodule--helper.c:409
-msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
+#: builtin/update-index.c:589
+msgid "git update-index [<options>] [--] [<file>...]"
msgstr ""
-#: builtin/submodule--helper.c:460 builtin/submodule--helper.c:483
-#, c-format
-msgid "No url found for submodule path '%s' in .gitmodules"
+#: builtin/update-index.c:971
+msgid "continue refresh even when index needs update"
msgstr ""
-#: builtin/submodule--helper.c:498
-#, c-format
-msgid ""
-"could not lookup configuration '%s'. Assuming this repository is its own "
-"authoritative upstream."
+#: builtin/update-index.c:974
+msgid "refresh: ignore submodules"
msgstr ""
-#: builtin/submodule--helper.c:509
-#, c-format
-msgid "Failed to register url for submodule path '%s'"
+#: builtin/update-index.c:977
+msgid "do not ignore new files"
msgstr ""
-#: builtin/submodule--helper.c:513
-#, c-format
-msgid "Submodule '%s' (%s) registered for path '%s'\n"
+#: builtin/update-index.c:979
+msgid "let files replace directories and vice-versa"
msgstr ""
-#: builtin/submodule--helper.c:523
-#, c-format
-msgid "warning: command update mode suggested for submodule '%s'\n"
+#: builtin/update-index.c:981
+msgid "notice files missing from worktree"
msgstr ""
-#: builtin/submodule--helper.c:530
-#, c-format
-msgid "Failed to register update mode for submodule path '%s'"
+#: builtin/update-index.c:983
+msgid "refresh even if index contains unmerged entries"
msgstr ""
-#: builtin/submodule--helper.c:552
-msgid "Suppress output for initializing a submodule"
+#: builtin/update-index.c:986
+msgid "refresh stat information"
msgstr ""
-#: builtin/submodule--helper.c:557
-msgid "git submodule--helper init [<path>]"
+#: builtin/update-index.c:990
+msgid "like --refresh, but ignore assume-unchanged setting"
msgstr ""
-#: builtin/submodule--helper.c:625 builtin/submodule--helper.c:747
-#, c-format
-msgid "no submodule mapping found in .gitmodules for path '%s'"
+#: builtin/update-index.c:994
+msgid "<mode>,<object>,<path>"
msgstr ""
-#: builtin/submodule--helper.c:660
-#, c-format
-msgid "could not resolve HEAD ref inside the submodule '%s'"
+#: builtin/update-index.c:995
+msgid "add the specified entry to the index"
msgstr ""
-#: builtin/submodule--helper.c:687 builtin/submodule--helper.c:856
-#, c-format
-msgid "failed to recurse into submodule '%s'"
+#: builtin/update-index.c:1005
+msgid "mark files as \"not changing\""
msgstr ""
-#: builtin/submodule--helper.c:711 builtin/submodule--helper.c:1021
-msgid "Suppress submodule status output"
+#: builtin/update-index.c:1008
+msgid "clear assumed-unchanged bit"
msgstr ""
-#: builtin/submodule--helper.c:712
-msgid ""
-"Use commit stored in the index instead of the one stored in the submodule "
-"HEAD"
+#: builtin/update-index.c:1011
+msgid "mark files as \"index-only\""
msgstr ""
-#: builtin/submodule--helper.c:713
-msgid "recurse into nested submodules"
+#: builtin/update-index.c:1014
+msgid "clear skip-worktree bit"
msgstr ""
-#: builtin/submodule--helper.c:718
-msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
+#: builtin/update-index.c:1017
+msgid "add to index only; do not add content to object database"
msgstr ""
-#: builtin/submodule--helper.c:742
-msgid "git submodule--helper name <path>"
+#: builtin/update-index.c:1019
+msgid "remove named paths even if present in worktree"
msgstr ""
-#: builtin/submodule--helper.c:806
-#, c-format
-msgid "Synchronizing submodule url for '%s'\n"
+#: builtin/update-index.c:1021
+msgid "with --stdin: input lines are terminated by null bytes"
msgstr ""
-#: builtin/submodule--helper.c:812
-#, c-format
-msgid "failed to register url for submodule path '%s'"
+#: builtin/update-index.c:1023
+msgid "read list of paths to be updated from standard input"
msgstr ""
-#: builtin/submodule--helper.c:826
-#, c-format
-msgid "failed to get the default remote for submodule '%s'"
+#: builtin/update-index.c:1027
+msgid "add entries from standard input to the index"
msgstr ""
-#: builtin/submodule--helper.c:837
-#, c-format
-msgid "failed to update remote for submodule '%s'"
+#: builtin/update-index.c:1031
+msgid "repopulate stages #2 and #3 for the listed paths"
msgstr ""
-#: builtin/submodule--helper.c:885
-msgid "Suppress output of synchronizing submodule url"
+#: builtin/update-index.c:1035
+msgid "only update entries that differ from HEAD"
msgstr ""
-#: builtin/submodule--helper.c:887
-msgid "Recurse into nested submodules"
+#: builtin/update-index.c:1039
+msgid "ignore files missing from worktree"
msgstr ""
-#: builtin/submodule--helper.c:892
-msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
+#: builtin/update-index.c:1042
+msgid "report actions to standard output"
msgstr ""
-#: builtin/submodule--helper.c:946
-#, 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)"
+#: builtin/update-index.c:1044
+msgid "(for porcelains) forget saved unresolved conflicts"
msgstr ""
-#: builtin/submodule--helper.c:958
-#, c-format
-msgid ""
-"Submodule work tree '%s' contains local modifications; use '-f' to discard "
-"them"
+#: builtin/update-index.c:1048
+msgid "write index in this format"
msgstr ""
-#: builtin/submodule--helper.c:966
-#, c-format
-msgid "Cleared directory '%s'\n"
+#: builtin/update-index.c:1050
+msgid "enable or disable split index"
msgstr ""
-#: builtin/submodule--helper.c:968
-#, c-format
-msgid "Could not remove submodule work tree '%s'\n"
+#: builtin/update-index.c:1052
+msgid "enable/disable untracked cache"
msgstr ""
-#: builtin/submodule--helper.c:977
-#, c-format
-msgid "could not create empty submodule directory %s"
+#: builtin/update-index.c:1054
+msgid "test if the filesystem supports untracked cache"
msgstr ""
-#: builtin/submodule--helper.c:993
-#, c-format
-msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
+#: builtin/update-index.c:1056
+msgid "enable untracked cache without testing the filesystem"
msgstr ""
-#: builtin/submodule--helper.c:1022
-msgid "Remove submodule working trees even if they contain local changes"
+#: builtin/update-index.c:1058
+msgid "write out the index even if is not flagged as changed"
msgstr ""
-#: builtin/submodule--helper.c:1023
-msgid "Unregister all submodules"
+#: builtin/update-index.c:1060
+msgid "enable or disable file system monitor"
msgstr ""
-#: builtin/submodule--helper.c:1028
-msgid ""
-"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
+#: builtin/update-index.c:1062
+msgid "mark files as fsmonitor valid"
msgstr ""
-#: builtin/submodule--helper.c:1042
-msgid "Use '--all' if you really want to deinitialize all submodules"
+#: builtin/update-index.c:1065
+msgid "clear fsmonitor valid bit"
msgstr ""
-#: builtin/submodule--helper.c:1133 builtin/submodule--helper.c:1136
-#, c-format
-msgid "submodule '%s' cannot add alternate: %s"
+#: 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/submodule--helper.c:1172
-#, c-format
-msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
+#: 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/submodule--helper.c:1179
-#, c-format
-msgid "Value '%s' for submodule.alternateLocation is not recognized"
+#: 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/submodule--helper.c:1201
-msgid "where the new submodule will be cloned to"
+#: builtin/update-index.c:1192
+msgid "Untracked cache disabled"
msgstr ""
-#: builtin/submodule--helper.c:1204
-msgid "name of the new submodule"
+#: 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/submodule--helper.c:1207
-msgid "url where to clone the submodule from"
+#: builtin/update-index.c:1204
+#, c-format
+msgid "Untracked cache enabled for '%s'"
msgstr ""
-#: builtin/submodule--helper.c:1213
-msgid "depth for shallow clones"
+#: builtin/update-index.c:1212
+msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
msgstr ""
-#: builtin/submodule--helper.c:1216 builtin/submodule--helper.c:1587
-msgid "force cloning progress"
+#: builtin/update-index.c:1216
+msgid "fsmonitor enabled"
msgstr ""
-#: builtin/submodule--helper.c:1221
+#: builtin/update-index.c:1219
msgid ""
-"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
-"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
-msgstr ""
-
-#: builtin/submodule--helper.c:1252
-#, c-format
-msgid "clone of '%s' into submodule path '%s' failed"
+"core.fsmonitor is set; remove it if you really want to disable fsmonitor"
msgstr ""
-#: builtin/submodule--helper.c:1267
-#, c-format
-msgid "could not get submodule directory for '%s'"
+#: builtin/update-index.c:1223
+msgid "fsmonitor disabled"
msgstr ""
-#: builtin/submodule--helper.c:1332
-#, c-format
-msgid "Submodule path '%s' not initialized"
+#: builtin/update-ref.c:10
+msgid "git update-ref [<options>] -d <refname> [<old-val>]"
msgstr ""
-#: builtin/submodule--helper.c:1336
-msgid "Maybe you want to use 'update --init'?"
+#: builtin/update-ref.c:11
+msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]"
msgstr ""
-#: builtin/submodule--helper.c:1365
-#, c-format
-msgid "Skipping unmerged submodule %s"
+#: builtin/update-ref.c:12
+msgid "git update-ref [<options>] --stdin [-z]"
msgstr ""
-#: builtin/submodule--helper.c:1394
-#, c-format
-msgid "Skipping submodule '%s'"
+#: builtin/update-ref.c:364
+msgid "delete the reference"
msgstr ""
-#: builtin/submodule--helper.c:1527
-#, c-format
-msgid "Failed to clone '%s'. Retry scheduled"
+#: builtin/update-ref.c:366
+msgid "update <refname> not the one it points to"
msgstr ""
-#: builtin/submodule--helper.c:1538
-#, c-format
-msgid "Failed to clone '%s' a second time, aborting"
+#: builtin/update-ref.c:367
+msgid "stdin has NUL-terminated arguments"
msgstr ""
-#: builtin/submodule--helper.c:1568 builtin/submodule--helper.c:1788
-msgid "path into the working tree"
+#: builtin/update-ref.c:368
+msgid "read updates from stdin"
msgstr ""
-#: builtin/submodule--helper.c:1571
-msgid "path into the working tree, across nested submodule boundaries"
+#: builtin/update-server-info.c:7
+msgid "git update-server-info [--force]"
msgstr ""
-#: builtin/submodule--helper.c:1575
-msgid "rebase, merge, checkout or none"
+#: builtin/update-server-info.c:15
+msgid "update the info files from scratch"
msgstr ""
-#: builtin/submodule--helper.c:1579
-msgid "Create a shallow clone truncated to the specified number of revisions"
+#: builtin/upload-pack.c:11
+msgid "git upload-pack [<options>] <dir>"
msgstr ""
-#: builtin/submodule--helper.c:1582
-msgid "parallel jobs"
+#: builtin/upload-pack.c:23 t/helper/test-serve-v2.c:17
+msgid "quit after a single request/response exchange"
msgstr ""
-#: builtin/submodule--helper.c:1584
-msgid "whether the initial clone should follow the shallow recommendation"
+#: builtin/upload-pack.c:25
+msgid "exit immediately after initial ref advertisement"
msgstr ""
-#: builtin/submodule--helper.c:1585
-msgid "don't print cloning progress"
+#: builtin/upload-pack.c:27
+msgid "do not try <directory>/.git/ if <directory> is no Git directory"
msgstr ""
-#: builtin/submodule--helper.c:1592
-msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
+#: builtin/upload-pack.c:29
+msgid "interrupt transfer after <n> seconds of inactivity"
msgstr ""
-#: builtin/submodule--helper.c:1605
-msgid "bad value for update parameter"
+#: builtin/verify-commit.c:20
+msgid "git verify-commit [-v | --verbose] <commit>..."
msgstr ""
-#: builtin/submodule--helper.c:1673
-#, c-format
-msgid ""
-"Submodule (%s) branch configured to inherit branch from superproject, but "
-"the superproject is not on any branch"
+#: builtin/verify-commit.c:76
+msgid "print commit contents"
msgstr ""
-#: builtin/submodule--helper.c:1789
-msgid "recurse into submodules"
+#: builtin/verify-commit.c:77 builtin/verify-tag.c:38
+msgid "print raw gpg status output"
msgstr ""
-#: builtin/submodule--helper.c:1795
-msgid "git submodule--helper embed-git-dir [<path>...]"
+#: builtin/verify-pack.c:55
+msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
msgstr ""
-#: builtin/submodule--helper.c:1857
-#, c-format
-msgid "%s doesn't support --super-prefix"
+#: builtin/verify-pack.c:65
+msgid "verbose"
msgstr ""
-#: builtin/submodule--helper.c:1863
-#, c-format
-msgid "'%s' is not a valid submodule--helper subcommand"
+#: builtin/verify-pack.c:67
+msgid "show statistics only"
msgstr ""
-#: builtin/symbolic-ref.c:8
-msgid "git symbolic-ref [<options>] <name> [<ref>]"
+#: builtin/verify-tag.c:19
+msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
msgstr ""
-#: builtin/symbolic-ref.c:9
-msgid "git symbolic-ref -d [-q] <name>"
+#: builtin/verify-tag.c:37
+msgid "print tag contents"
msgstr ""
-#: builtin/symbolic-ref.c:40
-msgid "suppress error message for non-symbolic (detached) refs"
+#: builtin/worktree.c:18
+msgid "git worktree add [<options>] <path> [<commit-ish>]"
msgstr ""
-#: builtin/symbolic-ref.c:41
-msgid "delete symbolic ref"
+#: builtin/worktree.c:19
+msgid "git worktree list [<options>]"
msgstr ""
-#: builtin/symbolic-ref.c:42
-msgid "shorten ref output"
+#: builtin/worktree.c:20
+msgid "git worktree lock [<options>] <path>"
msgstr ""
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
-msgid "reason"
+#: builtin/worktree.c:21
+msgid "git worktree move <worktree> <new-path>"
msgstr ""
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
-msgid "reason of the update"
+#: builtin/worktree.c:22
+msgid "git worktree prune [<options>]"
msgstr ""
-#: builtin/tag.c:24
-msgid ""
-"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
-"[<head>]"
+#: builtin/worktree.c:23
+msgid "git worktree remove [<options>] <worktree>"
msgstr ""
-#: builtin/tag.c:25
-msgid "git tag -d <tagname>..."
+#: builtin/worktree.c:24
+msgid "git worktree unlock <path>"
msgstr ""
-#: builtin/tag.c:26
-msgid ""
-"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
-"points-at <object>]\n"
-"\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]"
+#: builtin/worktree.c:61 builtin/worktree.c:891
+#, c-format
+msgid "failed to delete '%s'"
msgstr ""
-#: builtin/tag.c:28
-msgid "git tag -v [--format=<format>] <tagname>..."
+#: builtin/worktree.c:80
+#, c-format
+msgid "Removing worktrees/%s: not a valid directory"
msgstr ""
-#: builtin/tag.c:86
+#: builtin/worktree.c:86
#, c-format
-msgid "tag '%s' not found."
+msgid "Removing worktrees/%s: gitdir file does not exist"
msgstr ""
-#: builtin/tag.c:102
+#: builtin/worktree.c:91 builtin/worktree.c:100
#, c-format
-msgid "Deleted tag '%s' (was %s)\n"
+msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
msgstr ""
-#: builtin/tag.c:131
+#: builtin/worktree.c:110
#, c-format
msgid ""
-"\n"
-"Write a message for tag:\n"
-" %s\n"
-"Lines starting with '%c' will be ignored.\n"
+"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
+"%<PRIuMAX>)"
msgstr ""
-#: builtin/tag.c:135
+#: builtin/worktree.c:118
#, c-format
-msgid ""
-"\n"
-"Write a message for tag:\n"
-" %s\n"
-"Lines starting with '%c' will be kept; you may remove them yourself if you "
-"want to.\n"
+msgid "Removing worktrees/%s: invalid gitdir file"
msgstr ""
-#: builtin/tag.c:189
-msgid "unable to sign the tag"
+#: builtin/worktree.c:127
+#, c-format
+msgid "Removing worktrees/%s: gitdir file points to non-existent location"
msgstr ""
-#: builtin/tag.c:191
-msgid "unable to write tag file"
+#: builtin/worktree.c:166
+msgid "report pruned working trees"
msgstr ""
-#: builtin/tag.c:216
-msgid "bad object type."
+#: builtin/worktree.c:168
+msgid "expire working trees older than <time>"
msgstr ""
-#: builtin/tag.c:265
-msgid "no tag message?"
+#: builtin/worktree.c:235
+#, c-format
+msgid "'%s' already exists"
msgstr ""
-#: builtin/tag.c:272
+#: builtin/worktree.c:252
#, c-format
-msgid "The tag message has been left in %s\n"
+msgid "unable to re-add worktree '%s'"
msgstr ""
-#: builtin/tag.c:381
-msgid "list tag names"
+#: 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/tag.c:383
-msgid "print <n> lines of each tag message"
+#: 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/tag.c:385
-msgid "delete tags"
+#: builtin/worktree.c:302
+#, c-format
+msgid "could not create directory of '%s'"
msgstr ""
-#: builtin/tag.c:386
-msgid "verify tags"
+#: builtin/worktree.c:432 builtin/worktree.c:438
+#, c-format
+msgid "Preparing worktree (new branch '%s')"
msgstr ""
-#: builtin/tag.c:388
-msgid "Tag creation options"
+#: builtin/worktree.c:434
+#, c-format
+msgid "Preparing worktree (resetting branch '%s'; was at %s)"
msgstr ""
-#: builtin/tag.c:390
-msgid "annotated tag, needs a message"
+#: builtin/worktree.c:443
+#, c-format
+msgid "Preparing worktree (checking out '%s')"
msgstr ""
-#: builtin/tag.c:392
-msgid "tag message"
+#: builtin/worktree.c:449
+#, c-format
+msgid "Preparing worktree (detached HEAD %s)"
msgstr ""
-#: builtin/tag.c:394
-msgid "force edit of tag message"
+#: builtin/worktree.c:490
+msgid "checkout <branch> even if already checked out in other worktree"
msgstr ""
-#: builtin/tag.c:395
-msgid "annotated and GPG-signed tag"
+#: builtin/worktree.c:493
+msgid "create a new branch"
msgstr ""
-#: builtin/tag.c:399
-msgid "use another key to sign the tag"
+#: builtin/worktree.c:495
+msgid "create or reset a branch"
msgstr ""
-#: builtin/tag.c:400
-msgid "replace the tag if exists"
+#: builtin/worktree.c:497
+msgid "populate the new working tree"
msgstr ""
-#: builtin/tag.c:401 builtin/update-ref.c:368
-msgid "create a reflog"
+#: builtin/worktree.c:498
+msgid "keep the new working tree locked"
msgstr ""
-#: builtin/tag.c:403
-msgid "Tag listing options"
+#: builtin/worktree.c:501
+msgid "set up tracking mode (see git-branch(1))"
msgstr ""
-#: builtin/tag.c:404
-msgid "show tag list in columns"
+#: builtin/worktree.c:504
+msgid "try to match the new branch name with a remote-tracking branch"
msgstr ""
-#: builtin/tag.c:405 builtin/tag.c:407
-msgid "print only tags that contain the commit"
+#: builtin/worktree.c:512
+msgid "-b, -B, and --detach are mutually exclusive"
msgstr ""
-#: builtin/tag.c:406 builtin/tag.c:408
-msgid "print only tags that don't contain the commit"
+#: builtin/worktree.c:573
+msgid "--[no-]track can only be used if a new branch is created"
msgstr ""
-#: builtin/tag.c:409
-msgid "print only tags that are merged"
+#: builtin/worktree.c:673
+msgid "reason for locking"
msgstr ""
-#: builtin/tag.c:410
-msgid "print only tags that are not merged"
+#: 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/tag.c:415
-msgid "print only tags of the object"
+#: builtin/worktree.c:687 builtin/worktree.c:720
+msgid "The main working tree cannot be locked or unlocked"
msgstr ""
-#: builtin/tag.c:459
-msgid "--column and -n are incompatible"
+#: builtin/worktree.c:692
+#, c-format
+msgid "'%s' is already locked, reason: %s"
msgstr ""
-#: builtin/tag.c:481
-msgid "-n option is only allowed in list mode"
+#: builtin/worktree.c:694
+#, c-format
+msgid "'%s' is already locked"
msgstr ""
-#: builtin/tag.c:483
-msgid "--contains option is only allowed in list mode"
+#: builtin/worktree.c:722
+#, c-format
+msgid "'%s' is not locked"
msgstr ""
-#: builtin/tag.c:485
-msgid "--no-contains option is only allowed in list mode"
+#: builtin/worktree.c:763
+msgid "working trees containing submodules cannot be moved or removed"
msgstr ""
-#: builtin/tag.c:487
-msgid "--points-at option is only allowed in list mode"
+#: builtin/worktree.c:771
+msgid "force move even if worktree is dirty or locked"
msgstr ""
-#: builtin/tag.c:489
-msgid "--merged and --no-merged options are only allowed in list mode"
+#: builtin/worktree.c:794 builtin/worktree.c:921
+#, c-format
+msgid "'%s' is a main working tree"
msgstr ""
-#: builtin/tag.c:500
-msgid "only one -F or -m option is allowed."
+#: builtin/worktree.c:799
+#, c-format
+msgid "could not figure out destination name from '%s'"
msgstr ""
-#: builtin/tag.c:519
-msgid "too many params"
+#: builtin/worktree.c:805
+#, c-format
+msgid "target '%s' already exists"
msgstr ""
-#: builtin/tag.c:525
+#: builtin/worktree.c:813
#, c-format
-msgid "'%s' is not a valid tag name."
+msgid ""
+"cannot move a locked working tree, lock reason: %s\n"
+"use 'move -f -f' to override or unlock first"
msgstr ""
-#: builtin/tag.c:530
-#, c-format
-msgid "tag '%s' already exists"
+#: builtin/worktree.c:815
+msgid ""
+"cannot move a locked working tree;\n"
+"use 'move -f -f' to override or unlock first"
msgstr ""
-#: builtin/tag.c:561
+#: builtin/worktree.c:818
#, c-format
-msgid "Updated tag '%s' (was %s)\n"
+msgid "validation failed, cannot move working tree: %s"
msgstr ""
-#: builtin/unpack-objects.c:498
-msgid "Unpacking objects"
+#: builtin/worktree.c:823
+#, c-format
+msgid "failed to move '%s' to '%s'"
msgstr ""
-#: builtin/update-index.c:82
+#: builtin/worktree.c:871
#, c-format
-msgid "failed to create directory %s"
+msgid "failed to run 'git status' on '%s'"
msgstr ""
-#: builtin/update-index.c:88
+#: builtin/worktree.c:875
#, c-format
-msgid "failed to stat %s"
+msgid "'%s' is dirty, use --force to delete it"
msgstr ""
-#: builtin/update-index.c:98
+#: builtin/worktree.c:880
#, c-format
-msgid "failed to create file %s"
+msgid "failed to run 'git status' on '%s', code %d"
msgstr ""
-#: builtin/update-index.c:106
-#, c-format
-msgid "failed to delete file %s"
+#: builtin/worktree.c:903
+msgid "force removal even if worktree is dirty or locked"
msgstr ""
-#: builtin/update-index.c:113 builtin/update-index.c:219
+#: builtin/worktree.c:926
#, c-format
-msgid "failed to delete directory %s"
+msgid ""
+"cannot remove a locked working tree, lock reason: %s\n"
+"use 'remove -f -f' to override or unlock first"
msgstr ""
-#: builtin/update-index.c:138
+#: 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 "Testing mtime in '%s' "
+msgid "validation failed, cannot remove working tree: %s"
msgstr ""
-#: builtin/update-index.c:152
-msgid "directory stat info does not change after adding a new file"
+#: builtin/write-tree.c:15
+msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
msgstr ""
-#: builtin/update-index.c:165
-msgid "directory stat info does not change after adding a new directory"
+#: builtin/write-tree.c:28
+msgid "<prefix>/"
msgstr ""
-#: builtin/update-index.c:178
-msgid "directory stat info changes after updating a file"
+#: builtin/write-tree.c:29
+msgid "write tree object for a subdirectory <prefix>"
msgstr ""
-#: builtin/update-index.c:189
-msgid "directory stat info changes after adding a file inside subdirectory"
+#: builtin/write-tree.c:31
+msgid "only useful for debugging"
msgstr ""
-#: builtin/update-index.c:200
-msgid "directory stat info does not change after deleting a file"
+#: credential-cache--daemon.c:223
+#, c-format
+msgid ""
+"The permissions on your socket directory are too loose; other\n"
+"users may be able to read your cached credentials. Consider running:\n"
+"\n"
+"\tchmod 0700 %s"
msgstr ""
-#: builtin/update-index.c:213
-msgid "directory stat info does not change after deleting a directory"
+#: credential-cache--daemon.c:272
+msgid "print debugging messages to stderr"
msgstr ""
-#: builtin/update-index.c:220
-msgid " OK"
+#: t/helper/test-reach.c:152
+#, c-format
+msgid "commit %s is not marked reachable"
msgstr ""
-#: builtin/update-index.c:579
-msgid "git update-index [<options>] [--] [<file>...]"
+#: t/helper/test-reach.c:162
+msgid "too many commits marked reachable"
msgstr ""
-#: builtin/update-index.c:936
-msgid "continue refresh even when index needs update"
+#: t/helper/test-serve-v2.c:7
+msgid "test-tool serve-v2 [<options>]"
msgstr ""
-#: builtin/update-index.c:939
-msgid "refresh: ignore submodules"
+#: t/helper/test-serve-v2.c:19
+msgid "exit immediately after advertising capabilities"
msgstr ""
-#: builtin/update-index.c:942
-msgid "do not ignore new files"
+#: git.c:27
+msgid ""
+"git [--version] [--help] [-C <path>] [-c <name>=<value>]\n"
+" [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n"
+" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
+"bare]\n"
+" [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
+" <command> [<args>]"
msgstr ""
-#: builtin/update-index.c:944
-msgid "let files replace directories and vice-versa"
+#: git.c:34
+msgid ""
+"'git help -a' and 'git help -g' list available subcommands and some\n"
+"concept guides. See 'git help <command>' or 'git help <concept>'\n"
+"to read about a specific subcommand or concept."
msgstr ""
-#: builtin/update-index.c:946
-msgid "notice files missing from worktree"
+#: git.c:185
+#, c-format
+msgid "no directory given for --git-dir\n"
msgstr ""
-#: builtin/update-index.c:948
-msgid "refresh even if index contains unmerged entries"
+#: git.c:199
+#, c-format
+msgid "no namespace given for --namespace\n"
msgstr ""
-#: builtin/update-index.c:951
-msgid "refresh stat information"
+#: git.c:213
+#, c-format
+msgid "no directory given for --work-tree\n"
msgstr ""
-#: builtin/update-index.c:955
-msgid "like --refresh, but ignore assume-unchanged setting"
+#: git.c:227
+#, c-format
+msgid "no prefix given for --super-prefix\n"
msgstr ""
-#: builtin/update-index.c:959
-msgid "<mode>,<object>,<path>"
+#: git.c:249
+#, c-format
+msgid "-c expects a configuration string\n"
msgstr ""
-#: builtin/update-index.c:960
-msgid "add the specified entry to the index"
+#: git.c:287
+#, c-format
+msgid "no directory given for -C\n"
msgstr ""
-#: builtin/update-index.c:969
-msgid "mark files as \"not changing\""
+#: git.c:313
+#, c-format
+msgid "unknown option: %s\n"
msgstr ""
-#: builtin/update-index.c:972
-msgid "clear assumed-unchanged bit"
+#: git.c:359
+#, c-format
+msgid "while expanding alias '%s': '%s'"
msgstr ""
-#: builtin/update-index.c:975
-msgid "mark files as \"index-only\""
+#: git.c:368
+#, c-format
+msgid ""
+"alias '%s' changes environment variables.\n"
+"You can use '!git' in the alias to do this"
msgstr ""
-#: builtin/update-index.c:978
-msgid "clear skip-worktree bit"
+#: git.c:376
+#, c-format
+msgid "empty alias for %s"
msgstr ""
-#: builtin/update-index.c:981
-msgid "add to index only; do not add content to object database"
+#: git.c:379
+#, c-format
+msgid "recursive alias: %s"
msgstr ""
-#: builtin/update-index.c:983
-msgid "remove named paths even if present in worktree"
+#: git.c:459
+msgid "write failure on standard output"
msgstr ""
-#: builtin/update-index.c:985
-msgid "with --stdin: input lines are terminated by null bytes"
+#: git.c:461
+msgid "unknown write failure on standard output"
msgstr ""
-#: builtin/update-index.c:987
-msgid "read list of paths to be updated from standard input"
+#: git.c:463
+msgid "close failed on standard output"
msgstr ""
-#: builtin/update-index.c:991
-msgid "add entries from standard input to the index"
+#: git.c:797
+#, c-format
+msgid "alias loop detected: expansion of '%s' does not terminate:%s"
msgstr ""
-#: builtin/update-index.c:995
-msgid "repopulate stages #2 and #3 for the listed paths"
+#: git.c:847
+#, c-format
+msgid "cannot handle %s as a builtin"
msgstr ""
-#: builtin/update-index.c:999
-msgid "only update entries that differ from HEAD"
+#: git.c:860
+#, c-format
+msgid ""
+"usage: %s\n"
+"\n"
msgstr ""
-#: builtin/update-index.c:1003
-msgid "ignore files missing from worktree"
+#: git.c:880
+#, c-format
+msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
msgstr ""
-#: builtin/update-index.c:1006
-msgid "report actions to standard output"
+#: git.c:892
+#, c-format
+msgid "failed to run command '%s': %s\n"
msgstr ""
-#: builtin/update-index.c:1008
-msgid "(for porcelains) forget saved unresolved conflicts"
+#: http.c:378
+#, c-format
+msgid "negative value for http.postbuffer; defaulting to %d"
msgstr ""
-#: builtin/update-index.c:1012
-msgid "write index in this format"
+#: http.c:399
+msgid "Delegation control is not supported with cURL < 7.22.0"
msgstr ""
-#: builtin/update-index.c:1014
-msgid "enable or disable split index"
+#: http.c:408
+msgid "Public key pinning not supported with cURL < 7.44.0"
msgstr ""
-#: builtin/update-index.c:1016
-msgid "enable/disable untracked cache"
+#: http.c:876
+msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
msgstr ""
-#: builtin/update-index.c:1018
-msgid "test if the filesystem supports untracked cache"
+#: http.c:949
+msgid "Protocol restrictions not supported with cURL < 7.19.4"
msgstr ""
-#: builtin/update-index.c:1020
-msgid "enable untracked cache without testing the filesystem"
+#: http.c:1085
+#, c-format
+msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
msgstr ""
-#: builtin/update-index.c:1022
-msgid "write out the index even if is not flagged as changed"
+#: http.c:1092
+#, c-format
+msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
msgstr ""
-#: builtin/update-index.c:1024
-msgid "enable or disable file system monitor"
+#: http.c:1096
+#, c-format
+msgid "Could not set SSL backend to '%s': already set"
msgstr ""
-#: builtin/update-index.c:1026
-msgid "mark files as fsmonitor valid"
+#: http.c:1965
+#, c-format
+msgid ""
+"unable to update url base from redirection:\n"
+" asked for: %s\n"
+" redirect: %s"
msgstr ""
-#: builtin/update-index.c:1029
-msgid "clear fsmonitor valid bit"
+#: remote-curl.c:157
+#, c-format
+msgid "invalid quoting in push-option value: '%s'"
msgstr ""
-#: builtin/update-index.c:1127
-msgid ""
-"core.splitIndex is set to false; remove or change it, if you really want to "
-"enable split index"
+#: remote-curl.c:254
+#, c-format
+msgid "%sinfo/refs not valid: is this a git repository?"
msgstr ""
-#: builtin/update-index.c:1136
-msgid ""
-"core.splitIndex is set to true; remove or change it, if you really want to "
-"disable split index"
+#: remote-curl.c:355
+msgid "invalid server response; expected service, got flush packet"
msgstr ""
-#: builtin/update-index.c:1147
-msgid ""
-"core.untrackedCache is set to true; remove or change it, if you really want "
-"to disable the untracked cache"
+#: remote-curl.c:386
+#, c-format
+msgid "invalid server response; got '%s'"
msgstr ""
-#: builtin/update-index.c:1151
-msgid "Untracked cache disabled"
+#: remote-curl.c:446
+#, c-format
+msgid "repository '%s' not found"
msgstr ""
-#: builtin/update-index.c:1159
-msgid ""
-"core.untrackedCache is set to false; remove or change it, if you really want "
-"to enable the untracked cache"
+#: remote-curl.c:450
+#, c-format
+msgid "Authentication failed for '%s'"
msgstr ""
-#: builtin/update-index.c:1163
+#: remote-curl.c:454
#, c-format
-msgid "Untracked cache enabled for '%s'"
+msgid "unable to access '%s': %s"
msgstr ""
-#: builtin/update-index.c:1171
-msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
+#: remote-curl.c:460
+#, c-format
+msgid "redirecting to %s"
msgstr ""
-#: builtin/update-index.c:1175
-msgid "fsmonitor enabled"
+#: remote-curl.c:584
+msgid "shouldn't have EOF when not gentle on EOF"
msgstr ""
-#: builtin/update-index.c:1178
-msgid ""
-"core.fsmonitor is set; remove it if you really want to disable fsmonitor"
+#: remote-curl.c:664
+msgid "unable to rewind rpc post data - try increasing http.postBuffer"
+msgstr ""
+
+#: remote-curl.c:724
+#, c-format
+msgid "RPC failed; %s"
msgstr ""
-#: builtin/update-index.c:1182
-msgid "fsmonitor disabled"
+#: remote-curl.c:764
+msgid "cannot handle pushes this big"
msgstr ""
-#: builtin/update-ref.c:10
-msgid "git update-ref [<options>] -d <refname> [<old-val>]"
+#: remote-curl.c:879
+#, c-format
+msgid "cannot deflate request; zlib deflate error %d"
msgstr ""
-#: builtin/update-ref.c:11
-msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]"
+#: remote-curl.c:883
+#, c-format
+msgid "cannot deflate request; zlib end error %d"
msgstr ""
-#: builtin/update-ref.c:12
-msgid "git update-ref [<options>] --stdin [-z]"
+#: remote-curl.c:1014
+msgid "dumb http transport does not support shallow capabilities"
msgstr ""
-#: builtin/update-ref.c:363
-msgid "delete the reference"
+#: remote-curl.c:1028
+msgid "fetch failed."
msgstr ""
-#: builtin/update-ref.c:365
-msgid "update <refname> not the one it points to"
+#: remote-curl.c:1076
+msgid "cannot fetch by sha1 over smart http"
msgstr ""
-#: builtin/update-ref.c:366
-msgid "stdin has NUL-terminated arguments"
+#: remote-curl.c:1120 remote-curl.c:1126
+#, c-format
+msgid "protocol error: expected sha/ref, got %s'"
msgstr ""
-#: builtin/update-ref.c:367
-msgid "read updates from stdin"
+#: remote-curl.c:1138 remote-curl.c:1252
+#, c-format
+msgid "http transport does not support %s"
msgstr ""
-#: builtin/update-server-info.c:7
-msgid "git update-server-info [--force]"
+#: remote-curl.c:1174
+msgid "git-http-push failed"
msgstr ""
-#: builtin/update-server-info.c:15
-msgid "update the info files from scratch"
+#: remote-curl.c:1360
+msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
msgstr ""
-#: builtin/verify-commit.c:18
-msgid "git verify-commit [-v | --verbose] <commit>..."
+#: remote-curl.c:1392
+msgid "remote-curl: error reading command stream from git"
msgstr ""
-#: builtin/verify-commit.c:73
-msgid "print commit contents"
+#: remote-curl.c:1399
+msgid "remote-curl: fetch attempted without a local repo"
msgstr ""
-#: builtin/verify-commit.c:74 builtin/verify-tag.c:38
-msgid "print raw gpg status output"
+#: remote-curl.c:1439
+#, c-format
+msgid "remote-curl: unknown command '%s' from git"
msgstr ""
-#: builtin/verify-pack.c:55
-msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
+#: list-objects-filter-options.h:63
+msgid "args"
msgstr ""
-#: builtin/verify-pack.c:65
-msgid "verbose"
+#: list-objects-filter-options.h:64
+msgid "object filtering"
msgstr ""
-#: builtin/verify-pack.c:67
-msgid "show statistics only"
+#: parse-options.h:170
+msgid "expiry-date"
msgstr ""
-#: builtin/verify-tag.c:19
-msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
+#: parse-options.h:184
+msgid "no-op (backward compatibility)"
msgstr ""
-#: builtin/verify-tag.c:37
-msgid "print tag contents"
+#: parse-options.h:304
+msgid "be more verbose"
msgstr ""
-#: builtin/worktree.c:17
-msgid "git worktree add [<options>] <path> [<commit-ish>]"
+#: parse-options.h:306
+msgid "be more quiet"
msgstr ""
-#: builtin/worktree.c:18
-msgid "git worktree list [<options>]"
+#: parse-options.h:312
+msgid "use <n> digits to display SHA-1s"
msgstr ""
-#: builtin/worktree.c:19
-msgid "git worktree lock [<options>] <path>"
+#: parse-options.h:331
+msgid "how to strip spaces and #comments from message"
msgstr ""
-#: builtin/worktree.c:20
-msgid "git worktree move <worktree> <new-path>"
+#: ref-filter.h:101
+msgid "key"
msgstr ""
-#: builtin/worktree.c:21
-msgid "git worktree prune [<options>]"
+#: ref-filter.h:101
+msgid "field name to sort on"
msgstr ""
-#: builtin/worktree.c:22
-msgid "git worktree remove [<options>] <worktree>"
+#: rerere.h:44
+msgid "update the index with reused conflict resolution if possible"
msgstr ""
-#: builtin/worktree.c:23
-msgid "git worktree unlock <path>"
+#: command-list.h:50
+msgid "Add file contents to the index"
msgstr ""
-#: builtin/worktree.c:60
-#, c-format
-msgid "Removing worktrees/%s: not a valid directory"
+#: command-list.h:51
+msgid "Apply a series of patches from a mailbox"
msgstr ""
-#: builtin/worktree.c:66
-#, c-format
-msgid "Removing worktrees/%s: gitdir file does not exist"
+#: command-list.h:52
+msgid "Annotate file lines with commit information"
msgstr ""
-#: builtin/worktree.c:71 builtin/worktree.c:80
-#, c-format
-msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
+#: command-list.h:53
+msgid "Apply a patch to files and/or to the index"
msgstr ""
-#: builtin/worktree.c:90
-#, c-format
-msgid ""
-"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
-"%<PRIuMAX>)"
+#: command-list.h:54
+msgid "Import a GNU Arch repository into Git"
msgstr ""
-#: builtin/worktree.c:98
-#, c-format
-msgid "Removing worktrees/%s: invalid gitdir file"
+#: command-list.h:55
+msgid "Create an archive of files from a named tree"
msgstr ""
-#: builtin/worktree.c:114
-#, c-format
-msgid "Removing worktrees/%s: gitdir file points to non-existent location"
+#: command-list.h:56
+msgid "Use binary search to find the commit that introduced a bug"
msgstr ""
-#: builtin/worktree.c:161
-msgid "report pruned working trees"
+#: command-list.h:57
+msgid "Show what revision and author last modified each line of a file"
msgstr ""
-#: builtin/worktree.c:163
-msgid "expire working trees older than <time>"
+#: command-list.h:58
+msgid "List, create, or delete branches"
msgstr ""
-#: builtin/worktree.c:238
-#, c-format
-msgid "'%s' already exists"
+#: command-list.h:59
+msgid "Move objects and refs by archive"
msgstr ""
-#: builtin/worktree.c:269
-#, c-format
-msgid "could not create directory of '%s'"
+#: command-list.h:60
+msgid "Provide content or type and size information for repository objects"
msgstr ""
-#: builtin/worktree.c:308
-#, c-format
-msgid "Preparing %s (identifier %s)"
+#: command-list.h:61
+msgid "Display gitattributes information"
msgstr ""
-#: builtin/worktree.c:385
-msgid "checkout <branch> even if already checked out in other worktree"
+#: command-list.h:62
+msgid "Debug gitignore / exclude files"
msgstr ""
-#: builtin/worktree.c:388
-msgid "create a new branch"
+#: command-list.h:63
+msgid "Show canonical names and email addresses of contacts"
msgstr ""
-#: builtin/worktree.c:390
-msgid "create or reset a branch"
+#: command-list.h:64
+msgid "Switch branches or restore working tree files"
msgstr ""
-#: builtin/worktree.c:392
-msgid "populate the new working tree"
+#: command-list.h:65
+msgid "Copy files from the index to the working tree"
msgstr ""
-#: builtin/worktree.c:393
-msgid "keep the new working tree locked"
+#: command-list.h:66
+msgid "Ensures that a reference name is well formed"
msgstr ""
-#: builtin/worktree.c:395
-msgid "set up tracking mode (see git-branch(1))"
+#: command-list.h:67
+msgid "Find commits yet to be applied to upstream"
msgstr ""
-#: builtin/worktree.c:398
-msgid "try to match the new branch name with a remote-tracking branch"
+#: command-list.h:68
+msgid "Apply the changes introduced by some existing commits"
msgstr ""
-#: builtin/worktree.c:406
-msgid "-b, -B, and --detach are mutually exclusive"
+#: command-list.h:69
+msgid "Graphical alternative to git-commit"
msgstr ""
-#: builtin/worktree.c:471
-msgid "--[no-]track can only be used if a new branch is created"
+#: command-list.h:70
+msgid "Remove untracked files from the working tree"
msgstr ""
-#: builtin/worktree.c:571
-msgid "reason for locking"
+#: command-list.h:71
+msgid "Clone a repository into a new directory"
msgstr ""
-#: builtin/worktree.c:583 builtin/worktree.c:616 builtin/worktree.c:670
-#: builtin/worktree.c:809
-#, c-format
-msgid "'%s' is not a working tree"
+#: command-list.h:72
+msgid "Display data in columns"
msgstr ""
-#: builtin/worktree.c:585 builtin/worktree.c:618
-msgid "The main working tree cannot be locked or unlocked"
+#: command-list.h:73
+msgid "Record changes to the repository"
msgstr ""
-#: builtin/worktree.c:590
-#, c-format
-msgid "'%s' is already locked, reason: %s"
+#: command-list.h:74
+msgid "Write and verify Git commit-graph files"
msgstr ""
-#: builtin/worktree.c:592
-#, c-format
-msgid "'%s' is already locked"
+#: command-list.h:75
+msgid "Create a new commit object"
msgstr ""
-#: builtin/worktree.c:620
-#, c-format
-msgid "'%s' is not locked"
+#: command-list.h:76
+msgid "Get and set repository or global options"
msgstr ""
-#: builtin/worktree.c:645
-msgid "working trees containing submodules cannot be moved or removed"
+#: command-list.h:77
+msgid "Count unpacked number of objects and their disk consumption"
msgstr ""
-#: builtin/worktree.c:672 builtin/worktree.c:811
-#, c-format
-msgid "'%s' is a main working tree"
+#: command-list.h:78
+msgid "Retrieve and store user credentials"
msgstr ""
-#: builtin/worktree.c:677
-#, c-format
-msgid "could not figure out destination name from '%s'"
+#: command-list.h:79
+msgid "Helper to temporarily store passwords in memory"
msgstr ""
-#: builtin/worktree.c:683
-#, c-format
-msgid "target '%s' already exists"
+#: command-list.h:80
+msgid "Helper to store credentials on disk"
msgstr ""
-#: builtin/worktree.c:690
-#, c-format
-msgid "cannot move a locked working tree, lock reason: %s"
+#: command-list.h:81
+msgid "Export a single commit to a CVS checkout"
msgstr ""
-#: builtin/worktree.c:692
-msgid "cannot move a locked working tree"
+#: command-list.h:82
+msgid "Salvage your data out of another SCM people love to hate"
msgstr ""
-#: builtin/worktree.c:695
-#, c-format
-msgid "validation failed, cannot move working tree: %s"
+#: command-list.h:83
+msgid "A CVS server emulator for Git"
msgstr ""
-#: builtin/worktree.c:700
-#, c-format
-msgid "failed to move '%s' to '%s'"
+#: command-list.h:84
+msgid "A really simple server for Git repositories"
msgstr ""
-#: builtin/worktree.c:748
-#, c-format
-msgid "failed to run 'git status' on '%s'"
+#: command-list.h:85
+msgid "Give an object a human readable name based on an available ref"
msgstr ""
-#: builtin/worktree.c:752
-#, c-format
-msgid "'%s' is dirty, use --force to delete it"
+#: command-list.h:86
+msgid "Show changes between commits, commit and working tree, etc"
msgstr ""
-#: builtin/worktree.c:757
-#, c-format
-msgid "failed to run 'git status' on '%s', code %d"
+#: command-list.h:87
+msgid "Compares files in the working tree and the index"
msgstr ""
-#: builtin/worktree.c:768 builtin/worktree.c:782
-#, c-format
-msgid "failed to delete '%s'"
+#: command-list.h:88
+msgid "Compare a tree to the working tree or index"
msgstr ""
-#: builtin/worktree.c:794
-msgid "force removing even if the worktree is dirty"
+#: command-list.h:89
+msgid "Compares the content and mode of blobs found via two tree objects"
msgstr ""
-#: builtin/worktree.c:815
-#, c-format
-msgid "cannot remove a locked working tree, lock reason: %s"
+#: command-list.h:90
+msgid "Show changes using common diff tools"
msgstr ""
-#: builtin/worktree.c:817
-msgid "cannot remove a locked working tree"
+#: command-list.h:91
+msgid "Git data exporter"
msgstr ""
-#: builtin/worktree.c:820
-#, c-format
-msgid "validation failed, cannot remove working tree: %s"
+#: command-list.h:92
+msgid "Backend for fast Git data importers"
msgstr ""
-#: builtin/write-tree.c:14
-msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
+#: command-list.h:93
+msgid "Download objects and refs from another repository"
msgstr ""
-#: builtin/write-tree.c:27
-msgid "<prefix>/"
+#: command-list.h:94
+msgid "Receive missing objects from another repository"
msgstr ""
-#: builtin/write-tree.c:28
-msgid "write tree object for a subdirectory <prefix>"
+#: command-list.h:95
+msgid "Rewrite branches"
msgstr ""
-#: builtin/write-tree.c:31
-msgid "only useful for debugging"
+#: command-list.h:96
+msgid "Produce a merge commit message"
msgstr ""
-#: upload-pack.c:27
-msgid "git upload-pack [<options>] <dir>"
+#: command-list.h:97
+msgid "Output information on each ref"
msgstr ""
-#: upload-pack.c:1070
-msgid "quit after a single request/response exchange"
+#: command-list.h:98
+msgid "Prepare patches for e-mail submission"
msgstr ""
-#: upload-pack.c:1072
-msgid "exit immediately after initial ref advertisement"
+#: command-list.h:99
+msgid "Verifies the connectivity and validity of the objects in the database"
msgstr ""
-#: upload-pack.c:1074
-msgid "do not try <directory>/.git/ if <directory> is no Git directory"
+#: command-list.h:100
+msgid "Cleanup unnecessary files and optimize the local repository"
msgstr ""
-#: upload-pack.c:1076
-msgid "interrupt transfer after <n> seconds of inactivity"
+#: command-list.h:101
+msgid "Extract commit ID from an archive created using git-archive"
msgstr ""
-#: credential-cache--daemon.c:222
-#, c-format
-msgid ""
-"The permissions on your socket directory are too loose; other\n"
-"users may be able to read your cached credentials. Consider running:\n"
-"\n"
-"\tchmod 0700 %s"
+#: command-list.h:102
+msgid "Print lines matching a pattern"
msgstr ""
-#: credential-cache--daemon.c:271
-msgid "print debugging messages to stderr"
+#: command-list.h:103
+msgid "A portable graphical interface to Git"
msgstr ""
-#: git.c:8
-msgid ""
-"git [--version] [--help] [-C <path>] [-c <name>=<value>]\n"
-" [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n"
-" [-p | --paginate | --no-pager] [--no-replace-objects] [--bare]\n"
-" [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
-" <command> [<args>]"
+#: command-list.h:104
+msgid "Compute object ID and optionally creates a blob from a file"
msgstr ""
-#: git.c:15
-msgid ""
-"'git help -a' and 'git help -g' list available subcommands and some\n"
-"concept guides. See 'git help <command>' or 'git help <concept>'\n"
-"to read about a specific subcommand or concept."
+#: command-list.h:105
+msgid "Display help information about Git"
msgstr ""
-#: git.c:95
-#, c-format
-msgid "no directory given for --git-dir\n"
+#: command-list.h:106
+msgid "Server side implementation of Git over HTTP"
msgstr ""
-#: git.c:109
-#, c-format
-msgid "no namespace given for --namespace\n"
+#: command-list.h:107
+msgid "Download from a remote Git repository via HTTP"
msgstr ""
-#: git.c:123
-#, c-format
-msgid "no directory given for --work-tree\n"
+#: command-list.h:108
+msgid "Push objects over HTTP/DAV to another repository"
msgstr ""
-#: git.c:137
-#, c-format
-msgid "no prefix given for --super-prefix\n"
+#: command-list.h:109
+msgid "Send a collection of patches from stdin to an IMAP folder"
msgstr ""
-#: git.c:159
-#, c-format
-msgid "-c expects a configuration string\n"
+#: command-list.h:110
+msgid "Build pack index file for an existing packed archive"
msgstr ""
-#: git.c:197
-#, c-format
-msgid "no directory given for -C\n"
+#: command-list.h:111
+msgid "Create an empty Git repository or reinitialize an existing one"
msgstr ""
-#: git.c:212
-#, c-format
-msgid "unknown option: %s\n"
+#: command-list.h:112
+msgid "Instantly browse your working repository in gitweb"
msgstr ""
-#: git.c:687
-#, c-format
-msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
+#: command-list.h:113
+msgid "Add or parse structured information in commit messages"
msgstr ""
-#: git.c:699
-#, c-format
-msgid "failed to run command '%s': %s\n"
+#: command-list.h:114
+msgid "The Git repository browser"
msgstr ""
-#: http.c:342
-#, c-format
-msgid "negative value for http.postbuffer; defaulting to %d"
+#: command-list.h:115
+msgid "Show commit logs"
msgstr ""
-#: http.c:363
-msgid "Delegation control is not supported with cURL < 7.22.0"
+#: command-list.h:116
+msgid "Show information about files in the index and the working tree"
msgstr ""
-#: http.c:372
-msgid "Public key pinning not supported with cURL < 7.44.0"
+#: command-list.h:117
+msgid "List references in a remote repository"
msgstr ""
-#: http.c:1857
-#, c-format
-msgid ""
-"unable to update url base from redirection:\n"
-" asked for: %s\n"
-" redirect: %s"
+#: command-list.h:118
+msgid "List the contents of a tree object"
msgstr ""
-#: remote-curl.c:345
-#, c-format
-msgid "redirecting to %s"
+#: command-list.h:119
+msgid "Extracts patch and authorship from a single e-mail message"
msgstr ""
-#: list-objects-filter-options.h:59
-msgid "args"
+#: command-list.h:120
+msgid "Simple UNIX mbox splitter program"
msgstr ""
-#: list-objects-filter-options.h:60
-msgid "object filtering"
+#: command-list.h:121
+msgid "Join two or more development histories together"
msgstr ""
-#: common-cmds.h:9
-msgid "start a working area (see also: git help tutorial)"
+#: command-list.h:122
+msgid "Find as good common ancestors as possible for a merge"
msgstr ""
-#: common-cmds.h:10
-msgid "work on the current change (see also: git help everyday)"
+#: command-list.h:123
+msgid "Run a three-way file merge"
msgstr ""
-#: common-cmds.h:11
-msgid "examine the history and state (see also: git help revisions)"
+#: command-list.h:124
+msgid "Run a merge for files needing merging"
msgstr ""
-#: common-cmds.h:12
-msgid "grow, mark and tweak your common history"
+#: command-list.h:125
+msgid "The standard helper program to use with git-merge-index"
msgstr ""
-#: common-cmds.h:13
-msgid "collaborate (see also: git help workflows)"
+#: command-list.h:126
+msgid "Run merge conflict resolution tools to resolve merge conflicts"
msgstr ""
-#: common-cmds.h:17
-msgid "Add file contents to the index"
+#: command-list.h:127
+msgid "Show three-way merge without touching index"
msgstr ""
-#: common-cmds.h:18
-msgid "Use binary search to find the commit that introduced a bug"
+#: command-list.h:128
+msgid "Write and verify multi-pack-indexes"
msgstr ""
-#: common-cmds.h:19
-msgid "List, create, or delete branches"
+#: command-list.h:129
+msgid "Creates a tag object"
msgstr ""
-#: common-cmds.h:20
-msgid "Switch branches or restore working tree files"
+#: command-list.h:130
+msgid "Build a tree-object from ls-tree formatted text"
msgstr ""
-#: common-cmds.h:21
-msgid "Clone a repository into a new directory"
+#: command-list.h:131
+msgid "Move or rename a file, a directory, or a symlink"
msgstr ""
-#: common-cmds.h:22
-msgid "Record changes to the repository"
+#: command-list.h:132
+msgid "Find symbolic names for given revs"
msgstr ""
-#: common-cmds.h:23
-msgid "Show changes between commits, commit and working tree, etc"
+#: command-list.h:133
+msgid "Add or inspect object notes"
msgstr ""
-#: common-cmds.h:24
-msgid "Download objects and refs from another repository"
+#: command-list.h:134
+msgid "Import from and submit to Perforce repositories"
msgstr ""
-#: common-cmds.h:25
-msgid "Print lines matching a pattern"
+#: command-list.h:135
+msgid "Create a packed archive of objects"
msgstr ""
-#: common-cmds.h:26
-msgid "Create an empty Git repository or reinitialize an existing one"
+#: command-list.h:136
+msgid "Find redundant pack files"
msgstr ""
-#: common-cmds.h:27
-msgid "Show commit logs"
+#: command-list.h:137
+msgid "Pack heads and tags for efficient repository access"
msgstr ""
-#: common-cmds.h:28
-msgid "Join two or more development histories together"
+#: command-list.h:138
+msgid "Routines to help parsing remote repository access parameters"
msgstr ""
-#: common-cmds.h:29
-msgid "Move or rename a file, a directory, or a symlink"
+#: command-list.h:139
+msgid "Compute unique ID for a patch"
msgstr ""
-#: common-cmds.h:30
-msgid "Fetch from and integrate with another repository or a local branch"
+#: command-list.h:140
+msgid "Prune all unreachable objects from the object database"
msgstr ""
-#: common-cmds.h:31
-msgid "Update remote refs along with associated objects"
+#: command-list.h:141
+msgid "Remove extra objects that are already in pack files"
msgstr ""
-#: common-cmds.h:32
-msgid "Reapply commits on top of another base tip"
+#: command-list.h:142
+msgid "Fetch from and integrate with another repository or a local branch"
msgstr ""
-#: common-cmds.h:33
-msgid "Reset current HEAD to the specified state"
+#: command-list.h:143
+msgid "Update remote refs along with associated objects"
msgstr ""
-#: common-cmds.h:34
-msgid "Remove files from the working tree and from the index"
+#: command-list.h:144
+msgid "Applies a quilt patchset onto the current branch"
msgstr ""
-#: common-cmds.h:35
-msgid "Show various types of objects"
+#: command-list.h:145
+msgid "Compare two commit ranges (e.g. two versions of a branch)"
msgstr ""
-#: common-cmds.h:36
-msgid "Show the working tree status"
+#: command-list.h:146
+msgid "Reads tree information into the index"
msgstr ""
-#: common-cmds.h:37
-msgid "Create, list, delete or verify a tag object signed with GPG"
+#: command-list.h:147
+msgid "Reapply commits on top of another base tip"
msgstr ""
-#: parse-options.h:157
-msgid "expiry-date"
+#: command-list.h:148
+msgid "Receive what is pushed into the repository"
msgstr ""
-#: parse-options.h:172
-msgid "no-op (backward compatibility)"
+#: command-list.h:149
+msgid "Manage reflog information"
msgstr ""
-#: parse-options.h:250
-msgid "be more verbose"
+#: command-list.h:150
+msgid "Manage set of tracked repositories"
msgstr ""
-#: parse-options.h:252
-msgid "be more quiet"
+#: command-list.h:151
+msgid "Pack unpacked objects in a repository"
msgstr ""
-#: parse-options.h:258
-msgid "use <n> digits to display SHA-1s"
+#: command-list.h:152
+msgid "Create, list, delete refs to replace objects"
msgstr ""
-#: rerere.h:40
-msgid "update the index with reused conflict resolution if possible"
+#: command-list.h:153
+msgid "Generates a summary of pending changes"
msgstr ""
-#: git-bisect.sh:54
-msgid "You need to start by \"git bisect start\""
+#: command-list.h:154
+msgid "Reuse recorded resolution of conflicted merges"
msgstr ""
-#. TRANSLATORS: Make sure to include [Y] and [n] in your
-#. translation. The program will only accept English input
-#. at this point.
-#: git-bisect.sh:60
-msgid "Do you want me to do it for you [Y/n]? "
+#: command-list.h:155
+msgid "Reset current HEAD to the specified state"
msgstr ""
-#: git-bisect.sh:121
-#, sh-format
-msgid "unrecognised option: '$arg'"
+#: command-list.h:156
+msgid "Revert some existing commits"
msgstr ""
-#: git-bisect.sh:125
-#, sh-format
-msgid "'$arg' does not appear to be a valid revision"
+#: command-list.h:157
+msgid "Lists commit objects in reverse chronological order"
msgstr ""
-#: git-bisect.sh:154
-msgid "Bad HEAD - I need a HEAD"
+#: command-list.h:158
+msgid "Pick out and massage parameters"
msgstr ""
-#: git-bisect.sh:167
-#, sh-format
-msgid ""
-"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
+#: command-list.h:159
+msgid "Remove files from the working tree and from the index"
msgstr ""
-#: git-bisect.sh:177
-msgid "won't bisect on cg-seek'ed tree"
+#: command-list.h:160
+msgid "Send a collection of patches as emails"
msgstr ""
-#: git-bisect.sh:181
-msgid "Bad HEAD - strange symbolic ref"
+#: command-list.h:161
+msgid "Push objects over Git protocol to another repository"
msgstr ""
-#: git-bisect.sh:233
-#, sh-format
-msgid "Bad bisect_write argument: $state"
+#: command-list.h:162
+msgid "Restricted login shell for Git-only SSH access"
msgstr ""
-#: git-bisect.sh:246
-#, sh-format
-msgid "Bad rev input: $arg"
+#: command-list.h:163
+msgid "Summarize 'git log' output"
msgstr ""
-#: git-bisect.sh:265
-#, sh-format
-msgid "Bad rev input: $bisected_head"
+#: command-list.h:164
+msgid "Show various types of objects"
msgstr ""
-#: git-bisect.sh:274
-#, sh-format
-msgid "Bad rev input: $rev"
+#: command-list.h:165
+msgid "Show branches and their commits"
msgstr ""
-#: git-bisect.sh:283
-#, sh-format
-msgid "'git bisect $TERM_BAD' can take only one argument."
+#: command-list.h:166
+msgid "Show packed archive index"
msgstr ""
-#: git-bisect.sh:306
-#, sh-format
-msgid "Warning: bisecting only with a $TERM_BAD commit."
+#: command-list.h:167
+msgid "List references in a local repository"
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]? "
+#: command-list.h:168
+msgid "Git's i18n setup code for shell scripts"
msgstr ""
-#: git-bisect.sh:324
-#, sh-format
-msgid ""
-"You need to give me at least one $bad_syn and one $good_syn revision.\n"
-"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
+#: command-list.h:169
+msgid "Common Git shell script setup code"
msgstr ""
-#: git-bisect.sh:327
-#, sh-format
-msgid ""
-"You need to start by \"git bisect start\".\n"
-"You then need to give me at least one $good_syn and one $bad_syn revision.\n"
-"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
+#: command-list.h:170
+msgid "Stash the changes in a dirty working directory away"
msgstr ""
-#: git-bisect.sh:398 git-bisect.sh:512
-msgid "We are not bisecting."
+#: command-list.h:171
+msgid "Add file contents to the staging area"
msgstr ""
-#: git-bisect.sh:405
-#, sh-format
-msgid "'$invalid' is not a valid commit"
+#: command-list.h:172
+msgid "Show the working tree status"
msgstr ""
-#: git-bisect.sh:414
-#, sh-format
-msgid ""
-"Could not check out original HEAD '$branch'.\n"
-"Try 'git bisect reset <commit>'."
+#: command-list.h:173
+msgid "Remove unnecessary whitespace"
msgstr ""
-#: git-bisect.sh:422
-msgid "No logfile given"
+#: command-list.h:174
+msgid "Initialize, update or inspect submodules"
msgstr ""
-#: git-bisect.sh:423
-#, sh-format
-msgid "cannot read $file for replaying"
+#: command-list.h:175
+msgid "Bidirectional operation between a Subversion repository and Git"
msgstr ""
-#: git-bisect.sh:444
-msgid "?? what are you talking about?"
+#: command-list.h:176
+msgid "Read, modify and delete symbolic refs"
msgstr ""
-#: git-bisect.sh:453
-msgid "bisect run failed: no command provided."
+#: command-list.h:177
+msgid "Create, list, delete or verify a tag object signed with GPG"
msgstr ""
-#: git-bisect.sh:458
-#, sh-format
-msgid "running $command"
+#: command-list.h:178
+msgid "Creates a temporary file with a blob's contents"
msgstr ""
-#: git-bisect.sh:465
-#, sh-format
-msgid ""
-"bisect run failed:\n"
-"exit code $res from '$command' is < 0 or >= 128"
+#: command-list.h:179
+msgid "Unpack objects from a packed archive"
msgstr ""
-#: git-bisect.sh:491
-msgid "bisect run cannot continue any more"
+#: command-list.h:180
+msgid "Register file contents in the working tree to the index"
msgstr ""
-#: git-bisect.sh:497
-#, sh-format
-msgid ""
-"bisect run failed:\n"
-"'bisect_state $state' exited with error code $res"
+#: command-list.h:181
+msgid "Update the object name stored in a ref safely"
msgstr ""
-#: git-bisect.sh:504
-msgid "bisect run success"
+#: command-list.h:182
+msgid "Update auxiliary info file to help dumb servers"
msgstr ""
-#: git-bisect.sh:533
-#, sh-format
-msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect."
+#: command-list.h:183
+msgid "Send archive back to git-archive"
msgstr ""
-#: git-bisect.sh:567
-msgid "no terms defined"
+#: command-list.h:184
+msgid "Send objects packed back to git-fetch-pack"
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."
+#: command-list.h:185
+msgid "Show a Git logical variable"
msgstr ""
-#: git-merge-octopus.sh:46
-msgid ""
-"Error: Your local changes to the following files would be overwritten by "
-"merge"
+#: command-list.h:186
+msgid "Check the GPG signature of commits"
msgstr ""
-#: git-merge-octopus.sh:61
-msgid "Automated merge did not work."
+#: command-list.h:187
+msgid "Validate packed Git archive files"
msgstr ""
-#: git-merge-octopus.sh:62
-msgid "Should not be doing an octopus."
+#: command-list.h:188
+msgid "Check the GPG signature of tags"
msgstr ""
-#: git-merge-octopus.sh:73
-#, sh-format
-msgid "Unable to find common commit with $pretty_name"
+#: command-list.h:189
+msgid "Git web interface (web frontend to Git repositories)"
msgstr ""
-#: git-merge-octopus.sh:77
-#, sh-format
-msgid "Already up to date with $pretty_name"
+#: command-list.h:190
+msgid "Show logs with difference each commit introduces"
msgstr ""
-#: git-merge-octopus.sh:89
-#, sh-format
-msgid "Fast-forwarding to: $pretty_name"
+#: command-list.h:191
+msgid "Manage multiple working trees"
msgstr ""
-#: git-merge-octopus.sh:97
-#, sh-format
-msgid "Trying simple merge with $pretty_name"
+#: command-list.h:192
+msgid "Create a tree object from the current index"
msgstr ""
-#: git-merge-octopus.sh:102
-msgid "Simple merge did not work, trying automatic merge."
+#: command-list.h:193
+msgid "Defining attributes per path"
msgstr ""
-#: git-rebase.sh:60
-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\"."
+#: command-list.h:194
+msgid "Git command-line interface and conventions"
msgstr ""
-#: git-rebase.sh:163 git-rebase.sh:409
-#, sh-format
-msgid "Could not move back to $head_name"
+#: command-list.h:195
+msgid "A Git core tutorial for developers"
msgstr ""
-#: git-rebase.sh:174
-msgid "Applied autostash."
+#: command-list.h:196
+msgid "Git for CVS users"
msgstr ""
-#: git-rebase.sh:177
-#, sh-format
-msgid "Cannot store $stash_sha1"
+#: command-list.h:197
+msgid "Tweaking diff output"
msgstr ""
-#: git-rebase.sh:218
-msgid "The pre-rebase hook refused to rebase."
+#: command-list.h:198
+msgid "A useful minimum set of commands for Everyday Git"
msgstr ""
-#: git-rebase.sh:223
-msgid "It looks like 'git am' is in progress. Cannot rebase."
+#: command-list.h:199
+msgid "A Git Glossary"
msgstr ""
-#: git-rebase.sh:370
-msgid "No rebase in progress?"
+#: command-list.h:200
+msgid "Hooks used by Git"
msgstr ""
-#: git-rebase.sh:381
-msgid "The --edit-todo action can only be used during interactive rebase."
+#: command-list.h:201
+msgid "Specifies intentionally untracked files to ignore"
msgstr ""
-#: git-rebase.sh:388
-msgid "Cannot read HEAD"
+#: command-list.h:202
+msgid "Defining submodule properties"
msgstr ""
-#: git-rebase.sh:391
-msgid ""
-"You must edit all merge conflicts and then\n"
-"mark them as resolved using git add"
+#: command-list.h:203
+msgid "Git namespaces"
msgstr ""
-#: git-rebase.sh:435
-#, sh-format
-msgid ""
-"It seems that there is already a $state_dir_base directory, and\n"
-"I wonder if you are in the middle of another rebase. If that is the\n"
-"case, please try\n"
-"\t$cmd_live_rebase\n"
-"If that is not the case, please\n"
-"\t$cmd_clear_stale_rebase\n"
-"and run me again. I am stopping in case you still have something\n"
-"valuable there."
+#: command-list.h:204
+msgid "Git Repository Layout"
msgstr ""
-#: git-rebase.sh:491
-#, sh-format
-msgid "invalid upstream '$upstream_name'"
+#: command-list.h:205
+msgid "Specifying revisions and ranges for Git"
msgstr ""
-#: git-rebase.sh:515
-#, sh-format
-msgid "$onto_name: there are more than one merge bases"
+#: command-list.h:206
+msgid "A tutorial introduction to Git: part two"
msgstr ""
-#: git-rebase.sh:518 git-rebase.sh:522
-#, sh-format
-msgid "$onto_name: there is no merge base"
+#: command-list.h:207
+msgid "A tutorial introduction to Git"
msgstr ""
-#: git-rebase.sh:527
-#, sh-format
-msgid "Does not point to a valid commit: $onto_name"
+#: command-list.h:208
+msgid "An overview of recommended workflows with Git"
msgstr ""
-#: git-rebase.sh:553
-#, sh-format
-msgid "fatal: no such branch/commit '$branch_name'"
+#: git-bisect.sh:54
+msgid "You need to start by \"git bisect start\""
msgstr ""
-#: git-rebase.sh:586
-msgid "Cannot autostash"
+#. TRANSLATORS: Make sure to include [Y] and [n] in your
+#. translation. The program will only accept English input
+#. at this point.
+#: git-bisect.sh:60
+msgid "Do you want me to do it for you [Y/n]? "
msgstr ""
-#: git-rebase.sh:591
+#: git-bisect.sh:101
#, sh-format
-msgid "Created autostash: $stash_abbrev"
+msgid "Bad rev input: $arg"
msgstr ""
-#: git-rebase.sh:595
-msgid "Please commit or stash them."
+#: git-bisect.sh:121
+#, sh-format
+msgid "Bad rev input: $bisected_head"
msgstr ""
-#: git-rebase.sh:618
+#: git-bisect.sh:130
#, sh-format
-msgid "HEAD is up to date."
+msgid "Bad rev input: $rev"
msgstr ""
-#: git-rebase.sh:620
+#: git-bisect.sh:139
#, sh-format
-msgid "Current branch $branch_name is up to date."
+msgid "'git bisect $TERM_BAD' can take only one argument."
msgstr ""
-#: git-rebase.sh:628
-#, sh-format
-msgid "HEAD is up to date, rebase forced."
+#: git-bisect.sh:209
+msgid "No logfile given"
msgstr ""
-#: git-rebase.sh:630
+#: git-bisect.sh:210
#, sh-format
-msgid "Current branch $branch_name is up to date, rebase forced."
+msgid "cannot read $file for replaying"
msgstr ""
-#: git-rebase.sh:642
-#, sh-format
-msgid "Changes from $mb to $onto:"
+#: git-bisect.sh:232
+msgid "?? what are you talking about?"
msgstr ""
-#: git-rebase.sh:651
-msgid "First, rewinding head to replay your work on top of it..."
+#: git-bisect.sh:241
+msgid "bisect run failed: no command provided."
msgstr ""
-#: git-rebase.sh:661
+#: git-bisect.sh:246
#, sh-format
-msgid "Fast-forwarded $branch_name to $onto_name."
+msgid "running $command"
msgstr ""
-#: git-stash.sh:61
-msgid "git stash clear with parameters is unimplemented"
+#: git-bisect.sh:253
+#, sh-format
+msgid ""
+"bisect run failed:\n"
+"exit code $res from '$command' is < 0 or >= 128"
msgstr ""
-#: git-stash.sh:108
-msgid "You do not have the initial commit yet"
+#: git-bisect.sh:279
+msgid "bisect run cannot continue any more"
msgstr ""
-#: git-stash.sh:123
-msgid "Cannot save the current index state"
+#: git-bisect.sh:285
+#, sh-format
+msgid ""
+"bisect run failed:\n"
+"'bisect_state $state' exited with error code $res"
msgstr ""
-#: git-stash.sh:138
-msgid "Cannot save the untracked files"
+#: git-bisect.sh:292
+msgid "bisect run success"
msgstr ""
-#: git-stash.sh:158 git-stash.sh:171
-msgid "Cannot save the current worktree state"
+#: git-bisect.sh:300
+msgid "We are not bisecting."
msgstr ""
-#: git-stash.sh:175
-msgid "No changes selected"
+#: git-merge-octopus.sh:46
+msgid ""
+"Error: Your local changes to the following files would be overwritten by "
+"merge"
msgstr ""
-#: git-stash.sh:178
-msgid "Cannot remove temporary index (can't happen)"
+#: git-merge-octopus.sh:61
+msgid "Automated merge did not work."
msgstr ""
-#: git-stash.sh:191
-msgid "Cannot record working tree state"
+#: git-merge-octopus.sh:62
+msgid "Should not be doing an octopus."
msgstr ""
-#: git-stash.sh:229
+#: git-merge-octopus.sh:73
#, sh-format
-msgid "Cannot update $ref_stash with $w_commit"
+msgid "Unable to find common commit with $pretty_name"
msgstr ""
-#: git-stash.sh:281
+#: git-merge-octopus.sh:77
#, sh-format
-msgid "error: unknown option for 'stash push': $option"
+msgid "Already up to date with $pretty_name"
msgstr ""
-#: git-stash.sh:295
-msgid "Can't use --patch and --include-untracked or --all at the same time"
+#: git-merge-octopus.sh:89
+#, sh-format
+msgid "Fast-forwarding to: $pretty_name"
msgstr ""
-#: git-stash.sh:303
-msgid "No local changes to save"
+#: git-merge-octopus.sh:97
+#, sh-format
+msgid "Trying simple merge with $pretty_name"
msgstr ""
-#: git-stash.sh:308
-msgid "Cannot initialize stash"
+#: git-merge-octopus.sh:102
+msgid "Simple merge did not work, trying automatic merge."
msgstr ""
-#: git-stash.sh:312
-msgid "Cannot save the current status"
+#: git-legacy-stash.sh:220
+msgid "Cannot remove temporary index (can't happen)"
msgstr ""
-#: git-stash.sh:313
+#: git-legacy-stash.sh:271
#, sh-format
-msgid "Saved working directory and index state $stash_msg"
+msgid "Cannot update $ref_stash with $w_commit"
msgstr ""
-#: git-stash.sh:340
-msgid "Cannot remove worktree changes"
+#: git-legacy-stash.sh:323
+#, sh-format
+msgid "error: unknown option for 'stash push': $option"
msgstr ""
-#: git-stash.sh:488
+#: git-legacy-stash.sh:355
#, sh-format
-msgid "unknown option: $opt"
+msgid "Saved working directory and index state $stash_msg"
msgstr ""
-#: git-stash.sh:501
-msgid "No stash entries found."
+#: git-legacy-stash.sh:535
+#, sh-format
+msgid "unknown option: $opt"
msgstr ""
-#: git-stash.sh:508
+#: git-legacy-stash.sh:555
#, sh-format
msgid "Too many revisions specified: $REV"
msgstr ""
-#: git-stash.sh:523
+#: git-legacy-stash.sh:570
#, sh-format
msgid "$reference is not a valid reference"
msgstr ""
-#: git-stash.sh:551
+#: git-legacy-stash.sh:598
#, sh-format
msgid "'$args' is not a stash-like commit"
msgstr ""
-#: git-stash.sh:562
+#: git-legacy-stash.sh:609
#, sh-format
msgid "'$args' is not a stash reference"
msgstr ""
-#: git-stash.sh:570
+#: git-legacy-stash.sh:617
msgid "unable to refresh index"
msgstr ""
-#: git-stash.sh:574
+#: git-legacy-stash.sh:621
msgid "Cannot apply a stash in the middle of a merge"
msgstr ""
-#: git-stash.sh:582
+#: git-legacy-stash.sh:629
msgid "Conflicts in index. Try without --index."
msgstr ""
-#: git-stash.sh:584
+#: git-legacy-stash.sh:631
msgid "Could not save index tree"
msgstr ""
-#: git-stash.sh:593
+#: git-legacy-stash.sh:640
msgid "Could not restore untracked files from stash entry"
msgstr ""
-#: git-stash.sh:618
+#: git-legacy-stash.sh:665
msgid "Cannot unstage modified files"
msgstr ""
-#: git-stash.sh:633
-msgid "Index was not unstashed."
-msgstr ""
-
-#: git-stash.sh:647
-msgid "The stash entry is kept in case you need it again."
-msgstr ""
-
-#: git-stash.sh:656
+#: git-legacy-stash.sh:703
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr ""
-#: git-stash.sh:657
+#: git-legacy-stash.sh:704
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr ""
-#: git-stash.sh:665
-msgid "No branch name specified"
-msgstr ""
-
-#: git-stash.sh:744
+#: git-legacy-stash.sh:791
msgid "(To restore them type \"git stash apply\")"
msgstr ""
-#: git-submodule.sh:181
+#: git-submodule.sh:200
msgid "Relative path can only be used from the toplevel of the working tree"
msgstr ""
-#: git-submodule.sh:191
+#: git-submodule.sh:210
#, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
msgstr ""
-#: git-submodule.sh:210
+#: git-submodule.sh:229
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr ""
-#: git-submodule.sh:213
+#: git-submodule.sh:232
#, sh-format
msgid "'$sm_path' already exists in the index and is not a submodule"
msgstr ""
-#: git-submodule.sh:219
+#: git-submodule.sh:239
+#, sh-format
+msgid "'$sm_path' does not have a commit checked out"
+msgstr ""
+
+#: git-submodule.sh:245
#, sh-format
msgid ""
"The following path is ignored by one of your .gitignore files:\n"
"Use -f if you really want to add it."
msgstr ""
-#: git-submodule.sh:237
+#: git-submodule.sh:268
#, sh-format
msgid "Adding existing repo at '$sm_path' to the index"
msgstr ""
-#: git-submodule.sh:239
+#: git-submodule.sh:270
#, sh-format
msgid "'$sm_path' already exists and is not a valid git repo"
msgstr ""
-#: git-submodule.sh:247
+#: git-submodule.sh:278
#, sh-format
msgid "A git directory for '$sm_name' is found locally with remote(s):"
msgstr ""
-#: git-submodule.sh:249
+#: git-submodule.sh:280
#, sh-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from\n"
"option."
msgstr ""
-#: git-submodule.sh:255
+#: git-submodule.sh:286
#, sh-format
msgid "Reactivating local git directory for submodule '$sm_name'."
msgstr ""
-#: git-submodule.sh:267
+#: git-submodule.sh:298
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
msgstr ""
-#: git-submodule.sh:272
+#: git-submodule.sh:303
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr ""
-#: git-submodule.sh:281
+#: git-submodule.sh:312
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr ""
-#: git-submodule.sh:342
-#, sh-format
-msgid "Entering '$displaypath'"
-msgstr ""
-
-#: git-submodule.sh:362
-#, sh-format
-msgid "Stopping at '$displaypath'; script returned non-zero status."
-msgstr ""
-
-#: git-submodule.sh:584
+#: git-submodule.sh:573
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:594
+#: git-submodule.sh:583
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr ""
-#: git-submodule.sh:599
+#: git-submodule.sh:588
#, sh-format
msgid ""
"Unable to find current ${remote_name}/${branch} revision in submodule path "
"'$sm_path'"
msgstr ""
-#: git-submodule.sh:617
+#: 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:623
+#: 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:630
+#: git-submodule.sh:619
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:631
+#: git-submodule.sh:620
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr ""
-#: git-submodule.sh:635
+#: git-submodule.sh:624
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:636
+#: git-submodule.sh:625
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr ""
-#: git-submodule.sh:641
+#: git-submodule.sh:630
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:642
+#: git-submodule.sh:631
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr ""
-#: git-submodule.sh:647
+#: git-submodule.sh:636
#, sh-format
msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:648
+#: git-submodule.sh:637
#, sh-format
msgid "Submodule path '$displaypath': '$command $sha1'"
msgstr ""
-#: git-submodule.sh:679
+#: git-submodule.sh:668
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:775
+#: git-submodule.sh:830
msgid "The --cached option cannot be used with the --files option"
msgstr ""
-#: git-submodule.sh:827
+#: git-submodule.sh:882
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr ""
-#: git-submodule.sh:847
+#: git-submodule.sh:902
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr ""
-#: git-submodule.sh:850
+#: git-submodule.sh:905
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr ""
-#: git-submodule.sh:853
+#: 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:140
+#: git-rebase--preserve-merges.sh:136
#, sh-format
msgid "Rebasing ($new_count/$total)"
msgstr ""
-#: git-rebase--interactive.sh:156
+#: git-rebase--preserve-merges.sh:152
msgid ""
"\n"
"Commands:\n"
-"p, pick = use commit\n"
-"r, reword = use commit, but edit the commit message\n"
-"e, edit = use commit, but stop for amending\n"
-"s, squash = use commit, but meld into previous commit\n"
-"f, fixup = like \"squash\", but discard this commit's log message\n"
-"x, exec = run command (the rest of the line) using shell\n"
-"d, drop = remove commit\n"
+"p, pick <commit> = use commit\n"
+"r, reword <commit> = use commit, but edit the commit message\n"
+"e, edit <commit> = use commit, but stop for amending\n"
+"s, squash <commit> = use commit, but meld into previous commit\n"
+"f, fixup <commit> = like \"squash\", but discard this commit's log message\n"
+"x, exec <commit> = run command (the rest of the line) using shell\n"
+"d, drop <commit> = remove commit\n"
+"l, label <label> = label current HEAD with a name\n"
+"t, reset <label> = reset HEAD to a label\n"
+"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
+". create a merge commit using the original merge commit's\n"
+". message (or the oneline, if no original merge commit was\n"
+". specified). Use -c <commit> to reword the commit message.\n"
"\n"
"These lines can be re-ordered; they are executed from top to bottom.\n"
msgstr ""
-#: git-rebase--interactive.sh:171
-msgid ""
-"\n"
-"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
-msgstr ""
-
-#: git-rebase--interactive.sh:175
-msgid ""
-"\n"
-"If you remove a line here THAT COMMIT WILL BE LOST.\n"
-msgstr ""
-
-#: git-rebase--interactive.sh:213
+#: 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:238
+#: git-rebase--preserve-merges.sh:240
#, sh-format
msgid "$sha1: not a commit that can be picked"
msgstr ""
-#: git-rebase--interactive.sh:277
+#: git-rebase--preserve-merges.sh:279
#, sh-format
msgid "Invalid commit name: $sha1"
msgstr ""
-#: git-rebase--interactive.sh:319
+#: git-rebase--preserve-merges.sh:309
msgid "Cannot write current commit's replacement sha1"
msgstr ""
-#: git-rebase--interactive.sh:371
+#: git-rebase--preserve-merges.sh:360
#, sh-format
msgid "Fast-forward to $sha1"
msgstr ""
-#: git-rebase--interactive.sh:373
+#: git-rebase--preserve-merges.sh:362
#, sh-format
msgid "Cannot fast-forward to $sha1"
msgstr ""
-#: git-rebase--interactive.sh:382
+#: git-rebase--preserve-merges.sh:371
#, sh-format
msgid "Cannot move HEAD to $first_parent"
msgstr ""
-#: git-rebase--interactive.sh:387
+#: git-rebase--preserve-merges.sh:376
#, sh-format
msgid "Refusing to squash a merge: $sha1"
msgstr ""
-#: git-rebase--interactive.sh:405
+#: git-rebase--preserve-merges.sh:394
#, sh-format
msgid "Error redoing merge $sha1"
msgstr ""
-#: git-rebase--interactive.sh:414
+#: git-rebase--preserve-merges.sh:403
#, sh-format
msgid "Could not pick $sha1"
msgstr ""
-#: git-rebase--interactive.sh:423
+#: git-rebase--preserve-merges.sh:412
#, sh-format
msgid "This is the commit message #${n}:"
msgstr ""
-#: git-rebase--interactive.sh:428
+#: git-rebase--preserve-merges.sh:417
#, sh-format
msgid "The commit message #${n} will be skipped:"
msgstr ""
-#: git-rebase--interactive.sh:439
+#: 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:448
+#: git-rebase--preserve-merges.sh:437
#, sh-format
msgid "Cannot write $fixup_msg"
msgstr ""
-#: git-rebase--interactive.sh:451
+#: git-rebase--preserve-merges.sh:440
msgid "This is a combination of 2 commits."
msgstr ""
-#: git-rebase--interactive.sh:492 git-rebase--interactive.sh:535
-#: git-rebase--interactive.sh:538
+#: 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:567
+#: 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:582
+#: git-rebase--preserve-merges.sh:571
#, sh-format
msgid "Stopped at $sha1_abbrev... $rest"
msgstr ""
-#: git-rebase--interactive.sh:597
+#: git-rebase--preserve-merges.sh:586
#, sh-format
msgid "Cannot '$squash_style' without a previous commit"
msgstr ""
-#: git-rebase--interactive.sh:639
+#: git-rebase--preserve-merges.sh:628
#, sh-format
msgid "Executing: $rest"
msgstr ""
-#: git-rebase--interactive.sh:647
+#: git-rebase--preserve-merges.sh:636
#, sh-format
msgid "Execution failed: $rest"
msgstr ""
-#: git-rebase--interactive.sh:649
+#: git-rebase--preserve-merges.sh:638
msgid "and made changes to the index and/or the working tree"
msgstr ""
-#: git-rebase--interactive.sh:651
+#: 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:664
+#: git-rebase--preserve-merges.sh:653
#, sh-format
msgid ""
"Execution succeeded: $rest\n"
"\tgit rebase --continue"
msgstr ""
-#: git-rebase--interactive.sh:675
+#: git-rebase--preserve-merges.sh:664
#, sh-format
msgid "Unknown command: $command $sha1 $rest"
msgstr ""
-#: git-rebase--interactive.sh:676
+#: git-rebase--preserve-merges.sh:665
msgid "Please fix this using 'git rebase --edit-todo'."
msgstr ""
-#: git-rebase--interactive.sh:711
+#: git-rebase--preserve-merges.sh:700
#, sh-format
msgid "Successfully rebased and updated $head_name."
msgstr ""
-#: git-rebase--interactive.sh:735
-msgid "could not detach HEAD"
-msgstr ""
-
-#: git-rebase--interactive.sh:771
+#: git-rebase--preserve-merges.sh:757
msgid "Could not remove CHERRY_PICK_HEAD"
msgstr ""
-#: git-rebase--interactive.sh:776
+#: 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:793
+#: git-rebase--preserve-merges.sh:779
msgid "Error trying to find the author identity to amend commit"
msgstr ""
-#: git-rebase--interactive.sh:798
+#: 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:803 git-rebase--interactive.sh:807
+#: git-rebase--preserve-merges.sh:789 git-rebase--preserve-merges.sh:793
msgid "Could not commit staged changes."
msgstr ""
-#: git-rebase--interactive.sh:836
-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:844 git-rebase--interactive.sh:1008
+#: git-rebase--preserve-merges.sh:824 git-rebase--preserve-merges.sh:910
msgid "Could not execute editor"
msgstr ""
-#: git-rebase--interactive.sh:860
+#: git-rebase--preserve-merges.sh:845
#, sh-format
msgid "Could not checkout $switch_to"
msgstr ""
-#: git-rebase--interactive.sh:865
+#: git-rebase--preserve-merges.sh:852
msgid "No HEAD?"
msgstr ""
-#: git-rebase--interactive.sh:866
+#: git-rebase--preserve-merges.sh:853
#, sh-format
msgid "Could not create temporary $state_dir"
msgstr ""
-#: git-rebase--interactive.sh:869
+#: git-rebase--preserve-merges.sh:856
msgid "Could not mark as interactive"
msgstr ""
-#: git-rebase--interactive.sh:879 git-rebase--interactive.sh:884
-msgid "Could not init rewritten commits"
-msgstr ""
-
-#: git-rebase--interactive.sh:910
-msgid "Could not generate todo list"
-msgstr ""
-
-#: git-rebase--interactive.sh:986
+#: 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:991
-msgid ""
-"\n"
-"However, if you remove everything, the rebase will be aborted.\n"
-"\n"
-msgstr ""
-
-#: git-rebase--interactive.sh:998
-msgid "Note that empty commits are commented out"
+#: git-rebase--preserve-merges.sh:942 git-rebase--preserve-merges.sh:947
+msgid "Could not init rewritten commits"
msgstr ""
#: git-sh-setup.sh:89 git-sh-setup.sh:94
msgid "usage: $dashless $USAGE"
msgstr ""
-#: git-sh-setup.sh:190
+#: git-sh-setup.sh:191
#, sh-format
msgid "Cannot chdir to $cdup, the toplevel of the working tree"
msgstr ""
-#: git-sh-setup.sh:199 git-sh-setup.sh:206
+#: git-sh-setup.sh:200 git-sh-setup.sh:207
#, sh-format
msgid "fatal: $program_name cannot be used without a working tree."
msgstr ""
-#: git-sh-setup.sh:220
+#: git-sh-setup.sh:221
msgid "Cannot rebase: You have unstaged changes."
msgstr ""
-#: git-sh-setup.sh:223
+#: git-sh-setup.sh:224
msgid "Cannot rewrite branches: You have unstaged changes."
msgstr ""
-#: git-sh-setup.sh:226
+#: git-sh-setup.sh:227
msgid "Cannot pull with rebase: You have unstaged changes."
msgstr ""
-#: git-sh-setup.sh:229
+#: git-sh-setup.sh:230
#, sh-format
msgid "Cannot $action: You have unstaged changes."
msgstr ""
-#: git-sh-setup.sh:242
+#: git-sh-setup.sh:243
msgid "Cannot rebase: Your index contains uncommitted changes."
msgstr ""
-#: git-sh-setup.sh:245
+#: git-sh-setup.sh:246
msgid "Cannot pull with rebase: Your index contains uncommitted changes."
msgstr ""
-#: git-sh-setup.sh:248
+#: git-sh-setup.sh:249
#, sh-format
msgid "Cannot $action: Your index contains uncommitted changes."
msgstr ""
-#: git-sh-setup.sh:252
+#: git-sh-setup.sh:253
msgid "Additionally, your index contains uncommitted changes."
msgstr ""
-#: git-sh-setup.sh:372
+#: git-sh-setup.sh:373
msgid "You need to run this command from the toplevel of the working tree."
msgstr ""
-#: git-sh-setup.sh:377
+#: git-sh-setup.sh:378
msgid "Unable to determine absolute path of git directory"
msgstr ""
msgid "unstaged"
msgstr ""
-#: git-add--interactive.perl:246 git-add--interactive.perl:271
+#: git-add--interactive.perl:253 git-add--interactive.perl:278
msgid "binary"
msgstr ""
-#: git-add--interactive.perl:255 git-add--interactive.perl:309
+#: git-add--interactive.perl:262 git-add--interactive.perl:316
msgid "nothing"
msgstr ""
-#: git-add--interactive.perl:291 git-add--interactive.perl:306
+#: git-add--interactive.perl:298 git-add--interactive.perl:313
msgid "unchanged"
msgstr ""
-#: git-add--interactive.perl:602
+#: git-add--interactive.perl:609
#, perl-format
msgid "added %d path\n"
msgid_plural "added %d paths\n"
msgstr[0] ""
msgstr[1] ""
-#: git-add--interactive.perl:605
+#: git-add--interactive.perl:612
#, perl-format
msgid "updated %d path\n"
msgid_plural "updated %d paths\n"
msgstr[0] ""
msgstr[1] ""
-#: git-add--interactive.perl:608
+#: git-add--interactive.perl:615
#, perl-format
msgid "reverted %d path\n"
msgid_plural "reverted %d paths\n"
msgstr[0] ""
msgstr[1] ""
-#: git-add--interactive.perl:611
+#: git-add--interactive.perl:618
#, perl-format
msgid "touched %d path\n"
msgid_plural "touched %d paths\n"
msgstr[0] ""
msgstr[1] ""
-#: git-add--interactive.perl:620
+#: git-add--interactive.perl:627
msgid "Update"
msgstr ""
-#: git-add--interactive.perl:632
+#: git-add--interactive.perl:639
msgid "Revert"
msgstr ""
-#: git-add--interactive.perl:655
+#: git-add--interactive.perl:662
#, perl-format
msgid "note: %s is untracked now.\n"
msgstr ""
-#: git-add--interactive.perl:666
+#: git-add--interactive.perl:673
msgid "Add untracked"
msgstr ""
-#: git-add--interactive.perl:672
+#: git-add--interactive.perl:679
msgid "No untracked files.\n"
msgstr ""
-#: git-add--interactive.perl:1026
+#: git-add--interactive.perl:1033
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for staging."
msgstr ""
-#: git-add--interactive.perl:1029
+#: git-add--interactive.perl:1036
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for stashing."
msgstr ""
-#: git-add--interactive.perl:1032
+#: git-add--interactive.perl:1039
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for unstaging."
msgstr ""
-#: git-add--interactive.perl:1035 git-add--interactive.perl:1044
+#: git-add--interactive.perl:1042 git-add--interactive.perl:1051
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for applying."
msgstr ""
-#: git-add--interactive.perl:1038 git-add--interactive.perl:1041
+#: git-add--interactive.perl:1045 git-add--interactive.perl:1048
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for discarding."
msgstr ""
-#: git-add--interactive.perl:1078
+#: git-add--interactive.perl:1085
#, perl-format
msgid "failed to open hunk edit file for writing: %s"
msgstr ""
-#: git-add--interactive.perl:1079
+#: git-add--interactive.perl:1086
msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
msgstr ""
-#: git-add--interactive.perl:1085
+#: git-add--interactive.perl:1092
#, perl-format
msgid ""
"---\n"
msgstr ""
#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: git-add--interactive.perl:1093
+#: git-add--interactive.perl:1100
msgid ""
"If it does not apply cleanly, you will be given an opportunity to\n"
"edit again. If all lines of the hunk are removed, then the edit is\n"
"aborted and the hunk is left unchanged.\n"
msgstr ""
-#: git-add--interactive.perl:1107
+#: git-add--interactive.perl:1114
#, perl-format
msgid "failed to open hunk edit file for reading: %s"
msgstr ""
#. Consider translating (saying "no" discards!) as
#. (saying "n" for "no" discards!) if the translation
#. of the word "no" does not start with n.
-#: git-add--interactive.perl:1206
+#: git-add--interactive.perl:1213
msgid ""
"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
msgstr ""
-#: git-add--interactive.perl:1215
+#: git-add--interactive.perl:1222
msgid ""
"y - stage this hunk\n"
"n - do not stage this hunk\n"
"d - do not stage this hunk or any of the later hunks in the file"
msgstr ""
-#: git-add--interactive.perl:1221
+#: git-add--interactive.perl:1228
msgid ""
"y - stash this hunk\n"
"n - do not stash this hunk\n"
"d - do not stash this hunk or any of the later hunks in the file"
msgstr ""
-#: git-add--interactive.perl:1227
+#: git-add--interactive.perl:1234
msgid ""
"y - unstage this hunk\n"
"n - do not unstage this hunk\n"
"d - do not unstage this hunk or any of the later hunks in the file"
msgstr ""
-#: git-add--interactive.perl:1233
+#: git-add--interactive.perl:1240
msgid ""
"y - apply this hunk to index\n"
"n - do not apply this hunk to index\n"
"d - do not apply this hunk or any of the later hunks in the file"
msgstr ""
-#: git-add--interactive.perl:1239
+#: git-add--interactive.perl:1246
msgid ""
"y - discard this hunk from worktree\n"
"n - do not discard this hunk from worktree\n"
"d - do not discard this hunk or any of the later hunks in the file"
msgstr ""
-#: git-add--interactive.perl:1245
+#: git-add--interactive.perl:1252
msgid ""
"y - discard this hunk from index and worktree\n"
"n - do not discard this hunk from index and worktree\n"
"d - do not discard this hunk or any of the later hunks in the file"
msgstr ""
-#: git-add--interactive.perl:1251
+#: git-add--interactive.perl:1258
msgid ""
"y - apply this hunk to index and worktree\n"
"n - do not apply this hunk to index and worktree\n"
"d - do not apply this hunk or any of the later hunks in the file"
msgstr ""
-#: git-add--interactive.perl:1266
+#: git-add--interactive.perl:1273
msgid ""
"g - select a hunk to go to\n"
"/ - search for a hunk matching the given regex\n"
"? - print help\n"
msgstr ""
-#: git-add--interactive.perl:1297
+#: git-add--interactive.perl:1304
msgid "The selected hunks do not apply to the index!\n"
msgstr ""
-#: git-add--interactive.perl:1298
+#: git-add--interactive.perl:1305
msgid "Apply them to the worktree anyway? "
msgstr ""
-#: git-add--interactive.perl:1301
+#: git-add--interactive.perl:1308
msgid "Nothing was applied.\n"
msgstr ""
-#: git-add--interactive.perl:1312
+#: git-add--interactive.perl:1319
#, perl-format
msgid "ignoring unmerged: %s\n"
msgstr ""
-#: git-add--interactive.perl:1321
+#: git-add--interactive.perl:1328
msgid "Only binary files changed.\n"
msgstr ""
-#: git-add--interactive.perl:1323
+#: git-add--interactive.perl:1330
msgid "No changes.\n"
msgstr ""
-#: git-add--interactive.perl:1331
+#: git-add--interactive.perl:1338
msgid "Patch update"
msgstr ""
-#: git-add--interactive.perl:1383
+#: git-add--interactive.perl:1390
#, perl-format
msgid "Stage mode change [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1384
+#: git-add--interactive.perl:1391
#, perl-format
msgid "Stage deletion [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1385
+#: git-add--interactive.perl:1392
#, perl-format
msgid "Stage this hunk [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1388
+#: git-add--interactive.perl:1395
#, perl-format
msgid "Stash mode change [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1389
+#: git-add--interactive.perl:1396
#, perl-format
msgid "Stash deletion [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1390
+#: git-add--interactive.perl:1397
#, perl-format
msgid "Stash this hunk [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1393
+#: git-add--interactive.perl:1400
#, perl-format
msgid "Unstage mode change [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1394
+#: git-add--interactive.perl:1401
#, perl-format
msgid "Unstage deletion [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1395
+#: git-add--interactive.perl:1402
#, perl-format
msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1398
+#: git-add--interactive.perl:1405
#, perl-format
msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1399
+#: git-add--interactive.perl:1406
#, perl-format
msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1400
+#: git-add--interactive.perl:1407
#, perl-format
msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1403
+#: git-add--interactive.perl:1410
#, perl-format
msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1404
+#: git-add--interactive.perl:1411
#, perl-format
msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1405
+#: git-add--interactive.perl:1412
#, perl-format
msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1408
+#: git-add--interactive.perl:1415
#, perl-format
msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1409
+#: git-add--interactive.perl:1416
#, perl-format
msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1410
+#: git-add--interactive.perl:1417
#, perl-format
msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1413
+#: git-add--interactive.perl:1420
#, perl-format
msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1414
+#: git-add--interactive.perl:1421
#, perl-format
msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1415
+#: git-add--interactive.perl:1422
#, perl-format
msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1515
+#: git-add--interactive.perl:1522
msgid "No other hunks to goto\n"
msgstr ""
-#: git-add--interactive.perl:1522
+#: git-add--interactive.perl:1529
msgid "go to which hunk (<ret> to see more)? "
msgstr ""
-#: git-add--interactive.perl:1524
+#: git-add--interactive.perl:1531
msgid "go to which hunk? "
msgstr ""
-#: git-add--interactive.perl:1533
+#: git-add--interactive.perl:1540
#, perl-format
msgid "Invalid number: '%s'\n"
msgstr ""
-#: git-add--interactive.perl:1538
+#: git-add--interactive.perl:1545
#, perl-format
msgid "Sorry, only %d hunk available.\n"
msgid_plural "Sorry, only %d hunks available.\n"
msgstr[0] ""
msgstr[1] ""
-#: git-add--interactive.perl:1564
+#: git-add--interactive.perl:1571
msgid "No other hunks to search\n"
msgstr ""
-#: git-add--interactive.perl:1568
+#: git-add--interactive.perl:1575
msgid "search for regex? "
msgstr ""
-#: git-add--interactive.perl:1581
+#: git-add--interactive.perl:1588
#, perl-format
msgid "Malformed search regexp %s: %s\n"
msgstr ""
-#: git-add--interactive.perl:1591
+#: git-add--interactive.perl:1598
msgid "No hunk matches the given pattern\n"
msgstr ""
-#: git-add--interactive.perl:1603 git-add--interactive.perl:1625
+#: git-add--interactive.perl:1610 git-add--interactive.perl:1632
msgid "No previous hunk\n"
msgstr ""
-#: git-add--interactive.perl:1612 git-add--interactive.perl:1631
+#: git-add--interactive.perl:1619 git-add--interactive.perl:1638
msgid "No next hunk\n"
msgstr ""
-#: git-add--interactive.perl:1637
+#: git-add--interactive.perl:1644
msgid "Sorry, cannot split this hunk\n"
msgstr ""
-#: git-add--interactive.perl:1643
+#: git-add--interactive.perl:1650
#, perl-format
msgid "Split into %d hunk.\n"
msgid_plural "Split into %d hunks.\n"
msgstr[0] ""
msgstr[1] ""
-#: git-add--interactive.perl:1653
+#: git-add--interactive.perl:1660
msgid "Sorry, cannot edit this hunk\n"
msgstr ""
-#: git-add--interactive.perl:1699
+#: git-add--interactive.perl:1706
msgid "Review diff"
msgstr ""
#. TRANSLATORS: please do not translate the command names
#. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1718
+#: git-add--interactive.perl:1725
msgid ""
"status - show paths with changes\n"
"update - add working tree state to the staged set of changes\n"
"changes\n"
msgstr ""
-#: git-add--interactive.perl:1735 git-add--interactive.perl:1740
-#: git-add--interactive.perl:1743 git-add--interactive.perl:1750
-#: git-add--interactive.perl:1754 git-add--interactive.perl:1760
+#: git-add--interactive.perl:1742 git-add--interactive.perl:1747
+#: git-add--interactive.perl:1750 git-add--interactive.perl:1757
+#: git-add--interactive.perl:1761 git-add--interactive.perl:1767
msgid "missing --"
msgstr ""
-#: git-add--interactive.perl:1756
+#: git-add--interactive.perl:1763
#, perl-format
msgid "unknown --patch mode: %s"
msgstr ""
-#: git-add--interactive.perl:1762 git-add--interactive.perl:1768
+#: git-add--interactive.perl:1769 git-add--interactive.perl:1775
#, perl-format
msgid "invalid argument %s, expecting --"
msgstr ""
-#: git-send-email.perl:130
+#: git-send-email.perl:138
msgid "local zone differs from GMT by a non-minute interval\n"
msgstr ""
-#: git-send-email.perl:137 git-send-email.perl:143
+#: git-send-email.perl:145 git-send-email.perl:151
msgid "local time offset greater than or equal to 24 hours\n"
msgstr ""
-#: git-send-email.perl:211 git-send-email.perl:217
+#: git-send-email.perl: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:1395
+#: git-send-email.perl:1418
msgid ""
" The Cc list above has been expanded by additional\n"
" addresses found in the patch commit message. By default\n"
"\n"
msgstr ""
-#. TRANSLATORS: Make sure to include [y] [n] [q] [a] in your
+#. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-send-email.perl:1410
-msgid "Send this email? ([y]es|[n]o|[q]uit|[a]ll): "
+#: git-send-email.perl:1433
+msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
msgstr ""
-#: git-send-email.perl:1413
+#: git-send-email.perl:1436
msgid "Send this email reply required"
msgstr ""
-#: git-send-email.perl:1439
+#: git-send-email.perl:1464
msgid "The required SMTP server is not properly defined."
msgstr ""
-#: git-send-email.perl:1486
+#: git-send-email.perl:1511
#, perl-format
msgid "Server does not support STARTTLS! %s"
msgstr ""
-#: git-send-email.perl:1491 git-send-email.perl:1495
+#: git-send-email.perl:1516 git-send-email.perl:1520
#, perl-format
msgid "STARTTLS failed! %s"
msgstr ""
-#: git-send-email.perl:1505
+#: git-send-email.perl:1529
msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
msgstr ""
-#: git-send-email.perl:1523
+#: git-send-email.perl:1547
#, perl-format
msgid "Failed to send %s\n"
msgstr ""
-#: git-send-email.perl:1526
+#: git-send-email.perl:1550
#, perl-format
msgid "Dry-Sent %s\n"
msgstr ""
-#: git-send-email.perl:1526
+#: git-send-email.perl:1550
#, perl-format
msgid "Sent %s\n"
msgstr ""
-#: git-send-email.perl:1528
+#: git-send-email.perl:1552
msgid "Dry-OK. Log says:\n"
msgstr ""
-#: git-send-email.perl:1528
+#: git-send-email.perl:1552
msgid "OK. Log says:\n"
msgstr ""
-#: git-send-email.perl:1540
+#: git-send-email.perl:1564
msgid "Result: "
msgstr ""
-#: git-send-email.perl:1543
+#: git-send-email.perl:1567
msgid "Result: OK\n"
msgstr ""
-#: git-send-email.perl:1556
+#: git-send-email.perl:1585
#, perl-format
msgid "can't open file %s"
msgstr ""
-#: git-send-email.perl:1603 git-send-email.perl:1623
+#: 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:1609
+#: git-send-email.perl:1638
#, perl-format
msgid "(mbox) Adding to: %s from line '%s'\n"
msgstr ""
-#: git-send-email.perl:1657
+#: git-send-email.perl:1691
#, perl-format
msgid "(non-mbox) Adding cc: %s from line '%s'\n"
msgstr ""
-#: git-send-email.perl:1682
+#: git-send-email.perl:1726
#, perl-format
msgid "(body) Adding cc: %s from line '%s'\n"
msgstr ""
-#: git-send-email.perl:1788
+#: git-send-email.perl:1837
#, perl-format
msgid "(%s) Could not execute '%s'"
msgstr ""
-#: git-send-email.perl:1795
+#: git-send-email.perl:1844
#, perl-format
msgid "(%s) Adding %s: %s from: '%s'\n"
msgstr ""
-#: git-send-email.perl:1799
+#: git-send-email.perl:1848
#, perl-format
msgid "(%s) failed to close pipe to '%s'"
msgstr ""
-#: git-send-email.perl:1826
+#: git-send-email.perl:1878
msgid "cannot send message as 7bit"
msgstr ""
-#: git-send-email.perl:1834
+#: git-send-email.perl:1886
msgid "invalid transfer encoding"
msgstr ""
-#: git-send-email.perl:1872 git-send-email.perl:1923 git-send-email.perl:1933
+#: 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:1875
+#: git-send-email.perl:1930
#, perl-format
msgid "%s: patch contains a line longer than 998 characters"
msgstr ""
-#: git-send-email.perl:1891
+#: 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:1895
+#: git-send-email.perl:1951
#, perl-format
msgid "Do you really want to send %s? [y|N]: "
msgstr ""