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-02-15 10:09+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:101
#, c-format
-msgid "hint: %.*s\n"
+msgid "%shint: %.*s%s\n"
msgstr ""
-#: advice.c:90
+#: advice.c:154
msgid "Cherry-picking is not possible because you have unmerged files."
msgstr ""
-#: advice.c:92
+#: advice.c:156
msgid "Committing is not possible because you have unmerged files."
msgstr ""
-#: advice.c:94
+#: advice.c:158
msgid "Merging is not possible because you have unmerged files."
msgstr ""
-#: advice.c:96
+#: advice.c:160
msgid "Pulling is not possible because you have unmerged files."
msgstr ""
-#: advice.c:98
+#: advice.c:162
msgid "Reverting is not possible because you have unmerged files."
msgstr ""
-#: advice.c:100
+#: advice.c:164
#, c-format
msgid "It is not possible to %s because you have unmerged files."
msgstr ""
-#: advice.c:108
+#: advice.c:172
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:180
msgid "Exiting because of an unresolved conflict."
msgstr ""
-#: advice.c:121 builtin/merge.c:1251
+#: advice.c:185 builtin/merge.c:1290
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr ""
-#: advice.c:123
+#: advice.c:187
msgid "Please, commit your changes before merging."
msgstr ""
-#: advice.c:124
+#: advice.c:188
msgid "Exiting because of unfinished merge."
msgstr ""
-#: advice.c:130
+#: advice.c:194
#, 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:59
#, c-format
msgid "unrecognized whitespace option '%s'"
msgstr ""
-#: apply.c:74
+#: apply.c:75
#, c-format
msgid "unrecognized whitespace ignore option '%s'"
msgstr ""
-#: apply.c:122
+#: apply.c:125
msgid "--reject and --3way cannot be used together."
msgstr ""
-#: apply.c:124
+#: apply.c:127
msgid "--cached and --3way cannot be used together."
msgstr ""
-#: apply.c:127
+#: apply.c:130
msgid "--3way outside a repository"
msgstr ""
-#: apply.c:138
+#: apply.c:141
msgid "--index outside a repository"
msgstr ""
-#: apply.c:141
+#: apply.c:144
msgid "--cached outside a repository"
msgstr ""
-#: apply.c:821
+#: apply.c:825
#, c-format
msgid "Cannot prepare timestamp regexp %s"
msgstr ""
-#: apply.c:830
+#: apply.c:834
#, c-format
msgid "regexec returned %d for input: %s"
msgstr ""
-#: apply.c:904
+#: apply.c:908
#, c-format
msgid "unable to find filename in patch at line %d"
msgstr ""
-#: apply.c:942
+#: apply.c:946
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
msgstr ""
-#: apply.c:948
+#: apply.c:952
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr ""
-#: apply.c:949
+#: apply.c:953
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr ""
-#: apply.c:954
+#: apply.c:958
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr ""
-#: apply.c:983
+#: apply.c:987
#, c-format
msgid "invalid mode on line %d: %s"
msgstr ""
-#: apply.c:1301
+#: apply.c:1306
#, c-format
msgid "inconsistent header lines %d and %d"
msgstr ""
-#: apply.c:1473
+#: apply.c:1478
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr ""
-#: apply.c:1542
+#: apply.c:1547
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr ""
-#: apply.c:1562
+#: apply.c:1567
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
msgstr[0] ""
msgstr[1] ""
-#: apply.c:1575
+#: apply.c:1580
#, c-format
msgid "git diff header lacks filename information (line %d)"
msgstr ""
-#: apply.c:1763
+#: apply.c:1768
msgid "new file depends on old contents"
msgstr ""
-#: apply.c:1765
+#: apply.c:1770
msgid "deleted file still has contents"
msgstr ""
-#: apply.c:1799
+#: apply.c:1804
#, c-format
msgid "corrupt patch at line %d"
msgstr ""
-#: apply.c:1836
+#: apply.c:1841
#, c-format
msgid "new file %s depends on old contents"
msgstr ""
-#: apply.c:1838
+#: apply.c:1843
#, c-format
msgid "deleted file %s still has contents"
msgstr ""
-#: apply.c:1841
+#: apply.c:1846
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr ""
-#: apply.c:1988
+#: apply.c:1993
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr ""
-#: apply.c:2025
+#: apply.c:2030
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr ""
-#: apply.c:2185
+#: apply.c:2192
#, c-format
msgid "patch with only garbage at line %d"
msgstr ""
-#: apply.c:2271
+#: apply.c:2278
#, c-format
msgid "unable to read symlink %s"
msgstr ""
-#: apply.c:2275
+#: apply.c:2282
#, c-format
msgid "unable to open or read %s"
msgstr ""
-#: apply.c:2934
+#: apply.c:2941
#, c-format
msgid "invalid start of line: '%c'"
msgstr ""
-#: apply.c:3055
+#: apply.c:3062
#, 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:3074
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr ""
-#: apply.c:3073
+#: apply.c:3080
#, c-format
msgid ""
"while searching for:\n"
"%.*s"
msgstr ""
-#: apply.c:3095
+#: apply.c:3102
#, c-format
msgid "missing binary patch data for '%s'"
msgstr ""
-#: apply.c:3103
+#: apply.c:3110
#, c-format
msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
msgstr ""
-#: apply.c:3149
+#: apply.c:3157
#, c-format
msgid "cannot apply binary patch to '%s' without full index line"
msgstr ""
-#: apply.c:3159
+#: apply.c:3167
#, c-format
msgid ""
"the patch applies to '%s' (%s), which does not match the current contents."
msgstr ""
-#: apply.c:3167
+#: apply.c:3175
#, c-format
msgid "the patch applies to an empty '%s' but it is not empty"
msgstr ""
-#: apply.c:3185
+#: apply.c:3193
#, c-format
msgid "the necessary postimage %s for '%s' cannot be read"
msgstr ""
-#: apply.c:3198
+#: apply.c:3206
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr ""
-#: apply.c:3204
+#: apply.c:3212
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr ""
-#: apply.c:3225
+#: apply.c:3233
#, c-format
msgid "patch failed: %s:%ld"
msgstr ""
-#: apply.c:3347
+#: apply.c:3356
#, c-format
msgid "cannot checkout %s"
msgstr ""
-#: apply.c:3396 apply.c:3407 apply.c:3453 setup.c:277
+#: apply.c:3408 apply.c:3419 apply.c:3465 midx.c:58 setup.c:278
#, c-format
msgid "failed to read %s"
msgstr ""
-#: apply.c:3404
+#: apply.c:3416
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr ""
-#: apply.c:3433 apply.c:3673
+#: apply.c:3445 apply.c:3688
#, c-format
msgid "path %s has been renamed/deleted"
msgstr ""
-#: apply.c:3516 apply.c:3687
+#: apply.c:3531 apply.c:3703
#, c-format
msgid "%s: does not exist in index"
msgstr ""
-#: apply.c:3525 apply.c:3695
+#: apply.c:3540 apply.c:3711
#, c-format
msgid "%s: does not match index"
msgstr ""
-#: apply.c:3560
+#: apply.c:3575
msgid "repository lacks the necessary blob to fall back on 3-way merge."
msgstr ""
-#: apply.c:3563
+#: apply.c:3578
#, c-format
msgid "Falling back to three-way merge...\n"
msgstr ""
-#: apply.c:3579 apply.c:3583
+#: apply.c:3594 apply.c:3598
#, c-format
msgid "cannot read the current contents of '%s'"
msgstr ""
-#: apply.c:3595
+#: apply.c:3610
#, c-format
msgid "Failed to fall back on three-way merge...\n"
msgstr ""
-#: apply.c:3609
+#: apply.c:3624
#, c-format
msgid "Applied patch to '%s' with conflicts.\n"
msgstr ""
-#: apply.c:3614
+#: apply.c:3629
#, c-format
msgid "Applied patch to '%s' cleanly.\n"
msgstr ""
-#: apply.c:3640
+#: apply.c:3655
msgid "removal patch leaves file contents"
msgstr ""
-#: apply.c:3712
+#: apply.c:3728
#, c-format
msgid "%s: wrong type"
msgstr ""
-#: apply.c:3714
+#: apply.c:3730
#, c-format
msgid "%s has type %o, expected %o"
msgstr ""
-#: apply.c:3864 apply.c:3866
+#: apply.c:3881 apply.c:3883 read-cache.c:820 read-cache.c:846
+#: read-cache.c:1299
#, c-format
msgid "invalid path '%s'"
msgstr ""
-#: apply.c:3922
+#: apply.c:3939
#, c-format
msgid "%s: already exists in index"
msgstr ""
-#: apply.c:3925
+#: apply.c:3942
#, c-format
msgid "%s: already exists in working directory"
msgstr ""
-#: apply.c:3945
+#: apply.c:3962
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr ""
-#: apply.c:3950
+#: apply.c:3967
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr ""
-#: apply.c:3970
+#: apply.c:3987
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr ""
-#: apply.c:3974
+#: apply.c:3991
#, c-format
msgid "%s: patch does not apply"
msgstr ""
-#: apply.c:3989
+#: apply.c:4006
#, c-format
msgid "Checking patch %s..."
msgstr ""
-#: apply.c:4080
+#: apply.c:4098
#, c-format
msgid "sha1 information is lacking or useless for submodule %s"
msgstr ""
-#: apply.c:4087
+#: apply.c:4105
#, c-format
msgid "mode change for %s, which is not in current HEAD"
msgstr ""
-#: apply.c:4090
+#: apply.c:4108
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr ""
-#: apply.c:4095 builtin/checkout.c:235 builtin/reset.c:140
+#: apply.c:4113 builtin/checkout.c:248 builtin/reset.c:143
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr ""
-#: apply.c:4099
+#: apply.c:4117
#, c-format
msgid "could not add %s to temporary index"
msgstr ""
-#: apply.c:4109
+#: apply.c:4127
#, c-format
msgid "could not write temporary index to %s"
msgstr ""
-#: apply.c:4247
+#: apply.c:4265
#, c-format
msgid "unable to remove %s from index"
msgstr ""
-#: apply.c:4282
+#: apply.c:4299
#, c-format
msgid "corrupt patch for submodule %s"
msgstr ""
-#: apply.c:4288
+#: apply.c:4305
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr ""
-#: apply.c:4296
+#: apply.c:4313
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr ""
-#: apply.c:4302 apply.c:4446
+#: apply.c:4319 apply.c:4464
#, c-format
msgid "unable to add cache entry for %s"
msgstr ""
-#: apply.c:4343
+#: apply.c:4362
#, c-format
msgid "failed to write to '%s'"
msgstr ""
-#: apply.c:4347
+#: apply.c:4366
#, c-format
msgid "closing file '%s'"
msgstr ""
-#: apply.c:4417
+#: apply.c:4436
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr ""
-#: apply.c:4515
+#: apply.c:4534
#, c-format
msgid "Applied patch %s cleanly."
msgstr ""
-#: apply.c:4523
+#: apply.c:4542
msgid "internal error"
msgstr ""
-#: apply.c:4526
+#: apply.c:4545
#, 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:4556
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr ""
-#: apply.c:4545 builtin/fetch.c:775 builtin/fetch.c:1025
+#: apply.c:4564 builtin/fetch.c:837 builtin/fetch.c:1118
#, c-format
msgid "cannot open %s"
msgstr ""
-#: apply.c:4559
+#: apply.c:4578
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr ""
-#: apply.c:4563
+#: apply.c:4582
#, c-format
msgid "Rejected hunk #%d."
msgstr ""
-#: apply.c:4673
+#: apply.c:4692
#, c-format
msgid "Skipped patch '%s'."
msgstr ""
-#: apply.c:4681
+#: apply.c:4700
msgid "unrecognized input"
msgstr ""
-#: apply.c:4700
+#: apply.c:4720
msgid "unable to read index file"
msgstr ""
-#: apply.c:4837
+#: apply.c:4875
#, c-format
msgid "can't open patch '%s': %s"
msgstr ""
-#: apply.c:4864
+#: apply.c:4902
#, 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:4908 apply.c:4923
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgstr[0] ""
msgstr[1] ""
-#: apply.c:4878
+#: apply.c:4916
#, 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:4932 builtin/add.c:539 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:4959 apply.c:4962 builtin/am.c:2203 builtin/am.c:2206
+#: builtin/clone.c:122 builtin/fetch.c:118 builtin/merge.c:263
+#: builtin/pull.c:200 builtin/submodule--helper.c:407
+#: builtin/submodule--helper.c:1366 builtin/submodule--helper.c:1369
+#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:1853
+#: builtin/submodule--helper.c:2092 git-add--interactive.perl:197
msgid "path"
msgstr ""
-#: apply.c:4922
+#: apply.c:4960
msgid "don't apply changes matching the given path"
msgstr ""
-#: apply.c:4925
+#: apply.c:4963
msgid "apply changes matching the given path"
msgstr ""
-#: apply.c:4927 builtin/am.c:2263
+#: apply.c:4965 builtin/am.c:2212
msgid "num"
msgstr ""
-#: apply.c:4928
+#: apply.c:4966
msgid "remove <num> leading slashes from traditional diff paths"
msgstr ""
-#: apply.c:4931
+#: apply.c:4969
msgid "ignore additions made by the patch"
msgstr ""
-#: apply.c:4933
+#: apply.c:4971
msgid "instead of applying the patch, output diffstat for the input"
msgstr ""
-#: apply.c:4937
+#: apply.c:4975
msgid "show number of added and deleted lines in decimal notation"
msgstr ""
-#: apply.c:4939
+#: apply.c:4977
msgid "instead of applying the patch, output a summary for the input"
msgstr ""
-#: apply.c:4941
+#: apply.c:4979
msgid "instead of applying the patch, see if the patch is applicable"
msgstr ""
-#: apply.c:4943
+#: apply.c:4981
msgid "make sure the patch is applicable to the current index"
msgstr ""
-#: apply.c:4945
+#: apply.c:4983
+msgid "mark new files with `git add --intent-to-add`"
+msgstr ""
+
+#: apply.c:4985
msgid "apply a patch without touching the working tree"
msgstr ""
-#: apply.c:4947
+#: apply.c:4987
msgid "accept a patch that touches outside the working area"
msgstr ""
-#: apply.c:4950
+#: apply.c:4990
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr ""
-#: apply.c:4952
+#: apply.c:4992
msgid "attempt three-way merge if a patch does not apply"
msgstr ""
-#: apply.c:4954
+#: apply.c:4994
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:4997 builtin/checkout-index.c:173 builtin/ls-files.c:524
msgid "paths are separated with NUL character"
msgstr ""
-#: apply.c:4959
+#: apply.c:4999
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:5000 builtin/am.c:2191 builtin/interpret-trailers.c:97
+#: builtin/interpret-trailers.c:99 builtin/interpret-trailers.c:101
+#: builtin/pack-objects.c:3314 builtin/rebase.c:1065
msgid "action"
msgstr ""
-#: apply.c:4961
+#: apply.c:5001
msgid "detect new or modified lines that have whitespace errors"
msgstr ""
-#: apply.c:4964 apply.c:4967
+#: apply.c:5004 apply.c:5007
msgid "ignore changes in whitespace when finding context"
msgstr ""
-#: apply.c:4970
+#: apply.c:5010
msgid "apply the patch in reverse"
msgstr ""
-#: apply.c:4972
+#: apply.c:5012
msgid "don't expect at least one line of context"
msgstr ""
-#: apply.c:4974
+#: apply.c:5014
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr ""
-#: apply.c:4976
+#: apply.c:5016
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:5017 builtin/add.c:291 builtin/check-ignore.c:22
+#: builtin/commit.c:1312 builtin/count-objects.c:98 builtin/fsck.c:724
+#: builtin/log.c:2037 builtin/mv.c:123 builtin/read-tree.c:128
+#: builtin/rebase--interactive.c:159
msgid "be verbose"
msgstr ""
-#: apply.c:4979
+#: apply.c:5019
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr ""
-#: apply.c:4982
+#: apply.c:5022
msgid "do not trust the line counts in the hunk headers"
msgstr ""
-#: apply.c:4984 builtin/am.c:2251
+#: apply.c:5024 builtin/am.c:2200
msgid "root"
msgstr ""
-#: apply.c:4985
+#: apply.c:5025
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:515 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:1549
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:820 builtin/blame.c:821 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:162
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:112 builtin/clone.c:115
+#: builtin/submodule--helper.c:1378 builtin/submodule--helper.c:1859
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:715
+#: 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:458
+#, c-format
+msgid "unable to start '%s' filter"
+msgstr ""
+
+#: archive-tar.c:461
+msgid "unable to redirect descriptor"
+msgstr ""
+
+#: archive-tar.c:468
+#, c-format
+msgid "'%s' filter reported error"
+msgstr ""
+
+#: archive-zip.c: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:225 builtin/pack-objects.c:228
+#, 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:237
#, c-format
msgid "could not create file '%s'"
msgstr ""
-#: bisect.c:920
+#: bisect.c:937 builtin/merge.c:139
#, c-format
msgid "could not read file '%s'"
msgstr ""
-#: bisect.c:950
+#: bisect.c:967
msgid "reading bisect refs failed"
msgstr ""
-#: bisect.c:969
+#: bisect.c:986
#, c-format
msgid "%s was both %s and %s\n"
msgstr ""
-#: bisect.c:977
+#: bisect.c:994
#, c-format
msgid ""
"No testable commit found.\n"
"Maybe you started with bad path parameters?\n"
msgstr ""
-#: bisect.c:996
+#: bisect.c:1013
#, 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:1019
#, 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:1792
msgid "--contents and --reverse do not blend well."
msgstr ""
-#: blame.c:1769
+#: blame.c:1806
msgid "cannot use --contents with final commit object name"
msgstr ""
-#: blame.c:1789
+#: blame.c:1827
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:1836 bundle.c:164 ref-filter.c:2071 remote.c:1948 sequencer.c:1993
+#: sequencer.c:4064 builtin/commit.c:1004 builtin/log.c:378 builtin/log.c:936
+#: builtin/log.c:1420 builtin/log.c:1796 builtin/log.c:2086 builtin/merge.c:407
+#: builtin/pack-objects.c:3137 builtin/pack-objects.c:3152
+#: builtin/shortlog.c:192
msgid "revision walk setup failed"
msgstr ""
-#: blame.c:1816
+#: blame.c:1854
msgid ""
"--reverse --first-parent together require range along first-parent chain"
msgstr ""
-#: blame.c:1827
+#: blame.c:1865
#, c-format
msgid "no such path %s in %s"
msgstr ""
-#: blame.c:1838
+#: blame.c:1876
#, c-format
msgid "cannot read blob %s for path %s"
msgstr ""
-#: branch.c:53
+#: branch.c:52
#, c-format
msgid ""
"\n"
"\"git branch --set-upstream-to=%s%s%s\"."
msgstr ""
-#: branch.c:67
+#: branch.c:66
#, c-format
msgid "Not setting branch %s as its own upstream."
msgstr ""
-#: branch.c:93
+#: branch.c:92
#, c-format
msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
msgstr ""
-#: branch.c:94
+#: branch.c:93
#, c-format
msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
msgstr ""
-#: branch.c:98
+#: branch.c:97
#, c-format
msgid "Branch '%s' set up to track local branch '%s' by rebasing."
msgstr ""
-#: branch.c:99
+#: branch.c:98
#, c-format
msgid "Branch '%s' set up to track local branch '%s'."
msgstr ""
-#: branch.c:104
+#: branch.c:103
#, c-format
msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
msgstr ""
-#: branch.c:105
+#: branch.c:104
#, c-format
msgid "Branch '%s' set up to track remote ref '%s'."
msgstr ""
-#: branch.c:109
+#: branch.c:108
#, c-format
msgid "Branch '%s' set up to track local ref '%s' by rebasing."
msgstr ""
-#: branch.c:110
+#: branch.c:109
#, c-format
msgid "Branch '%s' set up to track local ref '%s'."
msgstr ""
-#: branch.c:119
+#: branch.c:118
msgid "Unable to write upstream branch configuration"
msgstr ""
-#: branch.c:156
+#: branch.c:155
#, c-format
msgid "Not tracking: ambiguous information for ref %s"
msgstr ""
-#: branch.c:189
+#: branch.c:188
#, c-format
msgid "'%s' is not a valid branch name."
msgstr ""
-#: branch.c:208
+#: branch.c:207
#, c-format
msgid "A branch named '%s' already exists."
msgstr ""
-#: branch.c:213
+#: branch.c:212
msgid "Cannot force update the current branch."
msgstr ""
-#: branch.c:233
+#: branch.c:232
#, c-format
msgid "Cannot setup tracking information; starting point '%s' is not a branch."
msgstr ""
-#: branch.c:235
+#: branch.c:234
#, c-format
msgid "the requested upstream branch '%s' does not exist"
msgstr ""
-#: branch.c:237
+#: branch.c:236
msgid ""
"\n"
"If you are planning on basing your work on an upstream\n"
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:2215 sequencer.c:2763
+#: builtin/commit.c:776
#, 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:193 builtin/log.c:1701 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:2567 builtin/am.c:355 builtin/am.c:399
+#: builtin/am.c:1375 builtin/am.c:2019 builtin/replace.c:376
+#: builtin/replace.c:448
#, 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:1122
+#, c-format
+msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
+msgstr ""
+
+#: commit.c:1125
+#, c-format
+msgid "Commit %s has a bad GPG signature allegedly by %s."
+msgstr ""
+
+#: commit.c:1128
+#, c-format
+msgid "Commit %s does not have a GPG signature."
+msgstr ""
+
+#: commit.c:1131
+#, c-format
+msgid "Commit %s has a good GPG signature by %s\n"
+msgstr ""
+
+#: commit.c:1385
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
+#: commit-graph.c:101
+#, c-format
+msgid "graph file %s is too small"
+msgstr ""
+
+#: commit-graph.c:136
+#, c-format
+msgid "graph signature %X does not match signature %X"
+msgstr ""
+
+#: commit-graph.c:143
+#, c-format
+msgid "graph version %X does not match version %X"
+msgstr ""
+
+#: commit-graph.c:150
+#, c-format
+msgid "hash version %X does not match version %X"
+msgstr ""
+
+#: commit-graph.c:173
+msgid "chunk lookup table entry missing; graph file may be incomplete"
+msgstr ""
+
+#: commit-graph.c:184
+#, c-format
+msgid "improper chunk offset %08x%08x"
+msgstr ""
+
+#: commit-graph.c:221
+#, c-format
+msgid "chunk id %08x appears multiple times"
+msgstr ""
+
+#: commit-graph.c:334
+#, c-format
+msgid "could not find commit %s"
+msgstr ""
+
+#: commit-graph.c:671 builtin/pack-objects.c:2646
+#, c-format
+msgid "unable to get type of object %s"
+msgstr ""
+
+#: commit-graph.c:704
+msgid "Loading known commits in commit graph"
+msgstr ""
+
+#: commit-graph.c:720
+msgid "Expanding reachable commits in commit graph"
+msgstr ""
+
+#: commit-graph.c:732
+msgid "Clearing commit marks in commit graph"
+msgstr ""
+
+#: commit-graph.c:752
+msgid "Computing commit graph generation numbers"
+msgstr ""
+
+#: commit-graph.c:869
+#, c-format
+msgid "Finding commits for commit graph in %d pack"
+msgid_plural "Finding commits for commit graph in %d packs"
+msgstr[0] ""
+msgstr[1] ""
+
+#: commit-graph.c:882
+#, c-format
+msgid "error adding pack %s"
+msgstr ""
+
+#: commit-graph.c:884
+#, c-format
+msgid "error opening index for %s"
+msgstr ""
+
+#: commit-graph.c:898
+#, c-format
+msgid "Finding commits for commit graph from %d ref"
+msgid_plural "Finding commits for commit graph from %d refs"
+msgstr[0] ""
+msgstr[1] ""
+
+#: commit-graph.c:930
+msgid "Finding commits for commit graph among packed objects"
+msgstr ""
+
+#: commit-graph.c:943
+msgid "Counting distinct commits in commit graph"
+msgstr ""
+
+#: commit-graph.c:956
+#, c-format
+msgid "the commit graph format cannot write %d commits"
+msgstr ""
+
+#: commit-graph.c:965
+msgid "Finding extra edges in commit graph"
+msgstr ""
+
+#: commit-graph.c:989
+msgid "too many commits to write graph"
+msgstr ""
+
+#: commit-graph.c:996 midx.c:769
+#, c-format
+msgid "unable to create leading directories of %s"
+msgstr ""
+
+#: commit-graph.c:1036
+#, c-format
+msgid "Writing out commit graph in %d pass"
+msgid_plural "Writing out commit graph in %d passes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: commit-graph.c:1109
+msgid "the commit-graph file has incorrect checksum and is likely corrupt"
+msgstr ""
+
+#: commit-graph.c:1153
+msgid "Verifying commits in commit graph"
+msgstr ""
+
+#: compat/obstack.c:406 compat/obstack.c:408
msgid "memory exhausted"
msgstr ""
-#: config.c:186
+#: config.c:123
+#, c-format
+msgid ""
+"exceeded maximum include depth (%d) while including\n"
+"\t%s\n"
+"from\n"
+"\t%s\n"
+"This might be due to circular includes."
+msgstr ""
+
+#: config.c:139
+#, c-format
+msgid "could not expand include path '%s'"
+msgstr ""
+
+#: config.c:150
+msgid "relative config includes must come from files"
+msgstr ""
+
+#: config.c:190
msgid "relative config include conditionals must come from files"
msgstr ""
-#: config.c:720
+#: config.c:348
+#, c-format
+msgid "key does not contain a section: %s"
+msgstr ""
+
+#: config.c:354
+#, c-format
+msgid "key does not contain variable name: %s"
+msgstr ""
+
+#: config.c:378 sequencer.c:2330
+#, c-format
+msgid "invalid key: %s"
+msgstr ""
+
+#: config.c:384
+#, c-format
+msgid "invalid key (newline): %s"
+msgstr ""
+
+#: config.c:420 config.c:432
+#, c-format
+msgid "bogus config parameter: %s"
+msgstr ""
+
+#: config.c:467
+#, c-format
+msgid "bogus format in %s"
+msgstr ""
+
+#: config.c:793
#, c-format
msgid "bad config line %d in blob %s"
msgstr ""
-#: config.c:724
+#: config.c:797
#, c-format
msgid "bad config line %d in file %s"
msgstr ""
-#: config.c:728
+#: config.c:801
#, c-format
msgid "bad config line %d in standard input"
msgstr ""
-#: config.c:732
+#: config.c:805
#, c-format
msgid "bad config line %d in submodule-blob %s"
msgstr ""
-#: config.c:736
+#: config.c:809
#, c-format
msgid "bad config line %d in command line %s"
msgstr ""
-#: config.c:740
+#: config.c:813
#, c-format
msgid "bad config line %d in %s"
msgstr ""
-#: config.c:868
+#: config.c:952
msgid "out of range"
msgstr ""
-#: config.c:868
+#: config.c:952
msgid "invalid unit"
msgstr ""
-#: config.c:874
+#: config.c:958
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
msgstr ""
-#: config.c:879
+#: config.c:963
#, c-format
msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
msgstr ""
-#: config.c:882
+#: config.c:966
#, c-format
msgid "bad numeric config value '%s' for '%s' in file %s: %s"
msgstr ""
-#: config.c:885
+#: config.c:969
#, c-format
msgid "bad numeric config value '%s' for '%s' in standard input: %s"
msgstr ""
-#: config.c:888
+#: config.c:972
#, c-format
msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
msgstr ""
-#: config.c:891
+#: config.c:975
#, c-format
msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
msgstr ""
-#: config.c:894
+#: config.c:978
#, c-format
msgid "bad numeric config value '%s' for '%s' in %s: %s"
msgstr ""
-#: config.c:989
+#: config.c:1073
#, c-format
msgid "failed to expand user dir in: '%s'"
msgstr ""
-#: config.c:998
+#: config.c:1082
#, c-format
msgid "'%s' for '%s' is not a valid timestamp"
msgstr ""
-#: config.c:1094 config.c:1105
+#: config.c:1173
+#, c-format
+msgid "abbrev length out of range: %d"
+msgstr ""
+
+#: config.c:1187 config.c:1198
#, c-format
msgid "bad zlib compression level %d"
msgstr ""
-#: config.c:1225
+#: config.c:1290
+msgid "core.commentChar should only be one character"
+msgstr ""
+
+#: config.c:1323
#, c-format
msgid "invalid mode for object creation: %s"
msgstr ""
-#: config.c:1386
+#: config.c:1395
+#, c-format
+msgid "malformed value for %s"
+msgstr ""
+
+#: config.c:1421
+#, c-format
+msgid "malformed value for %s: %s"
+msgstr ""
+
+#: config.c:1422
+msgid "must be one of nothing, matching, simple, upstream or current"
+msgstr ""
+
+#: config.c:1481 builtin/pack-objects.c:3394
#, c-format
msgid "bad pack compression level %d"
msgstr ""
-#: config.c:1582
+#: config.c:1602
+#, c-format
+msgid "unable to load config blob object '%s'"
+msgstr ""
+
+#: config.c:1605
+#, c-format
+msgid "reference '%s' does not point to a blob"
+msgstr ""
+
+#: config.c:1622
+#, c-format
+msgid "unable to resolve config blob '%s'"
+msgstr ""
+
+#: config.c:1652
+#, c-format
+msgid "failed to parse %s"
+msgstr ""
+
+#: config.c:1705
msgid "unable to parse command-line config"
msgstr ""
-#: config.c:1914
+#: config.c:2037
msgid "unknown error occurred while reading the configuration files"
msgstr ""
-#: config.c:2101
+#: config.c:2207
#, c-format
msgid "Invalid %s: '%s'"
msgstr ""
-#: config.c:2144
+#: config.c:2250
#, c-format
msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
msgstr ""
-#: config.c:2170
+#: config.c:2276
#, c-format
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
msgstr ""
-#: config.c:2195
+#: config.c:2322
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr ""
-#: config.c:2197
+#: config.c:2324
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr ""
-#: config.c:2256
+#: config.c:2405
+#, c-format
+msgid "invalid section name '%s'"
+msgstr ""
+
+#: config.c:2437
#, c-format
msgid "%s has multiple values"
msgstr ""
-#: config.c:2599 config.c:2816
+#: config.c:2466
#, c-format
-msgid "fstat on %s failed"
+msgid "failed to write new configuration file %s"
msgstr ""
-#: config.c:2706
+#: config.c:2716 config.c:3040
#, c-format
-msgid "could not set '%s' to '%s'"
+msgid "could not lock config file %s"
msgstr ""
-#: config.c:2708 builtin/remote.c:776
+#: config.c:2727
#, c-format
-msgid "could not unset '%s'"
+msgid "opening %s"
msgstr ""
-#: connect.c:52
-msgid "The remote end hung up upon initial contact"
+#: config.c:2762 builtin/config.c:328
+#, c-format
+msgid "invalid pattern: %s"
msgstr ""
-#: connect.c:54
-msgid ""
-"Could not read from remote repository.\n"
-"\n"
-"Please make sure you have the correct access rights\n"
-"and the repository exists."
+#: config.c:2787
+#, c-format
+msgid "invalid config file %s"
msgstr ""
-#: connected.c:66 builtin/fsck.c:198 builtin/prune.c:144
-msgid "Checking connectivity"
+#: config.c:2800 config.c:3053
+#, c-format
+msgid "fstat on %s failed"
msgstr ""
-#: connected.c:78
-msgid "Could not run 'git rev-list'"
+#: config.c:2811
+#, c-format
+msgid "unable to mmap '%s'"
msgstr ""
-#: connected.c:98
-msgid "failed write to rev-list"
+#: config.c:2820 config.c:3058
+#, c-format
+msgid "chmod on %s failed"
msgstr ""
-#: connected.c:105
-msgid "failed to close rev-list's stdin"
+#: config.c:2905 config.c:3155
+#, c-format
+msgid "could not write config file %s"
msgstr ""
-#: convert.c:205
+#: config.c:2939
#, c-format
-msgid "CRLF would be replaced by LF in %s."
+msgid "could not set '%s' to '%s'"
msgstr ""
-#: convert.c:207
+#: config.c:2941 builtin/remote.c:782
+#, c-format
+msgid "could not unset '%s'"
+msgstr ""
+
+#: config.c:3031
+#, c-format
+msgid "invalid section name: %s"
+msgstr ""
+
+#: config.c:3198
+#, c-format
+msgid "missing value for '%s'"
+msgstr ""
+
+#: connect.c:61
+msgid "the remote end hung up upon initial contact"
+msgstr ""
+
+#: connect.c:63
+msgid ""
+"Could not read from remote repository.\n"
+"\n"
+"Please make sure you have the correct access rights\n"
+"and the repository exists."
+msgstr ""
+
+#: connect.c:81
+#, c-format
+msgid "server doesn't support '%s'"
+msgstr ""
+
+#: connect.c:103
+#, c-format
+msgid "server doesn't support feature '%s'"
+msgstr ""
+
+#: connect.c:114
+msgid "expected flush after capabilities"
+msgstr ""
+
+#: connect.c:233
+#, c-format
+msgid "ignoring capabilities after first line '%s'"
+msgstr ""
+
+#: connect.c:252
+msgid "protocol error: unexpected capabilities^{}"
+msgstr ""
+
+#: connect.c:273
+#, c-format
+msgid "protocol error: expected shallow sha-1, got '%s'"
+msgstr ""
+
+#: connect.c:275
+msgid "repository on the other end cannot be shallow"
+msgstr ""
+
+#: connect.c:313
+msgid "invalid packet"
+msgstr ""
+
+#: connect.c:333
+#, c-format
+msgid "protocol error: unexpected '%s'"
+msgstr ""
+
+#: connect.c:441
+#, c-format
+msgid "invalid ls-refs response: %s"
+msgstr ""
+
+#: connect.c:445
+msgid "expected flush after ref listing"
+msgstr ""
+
+#: connect.c:544
+#, c-format
+msgid "protocol '%s' is not supported"
+msgstr ""
+
+#: connect.c:595
+msgid "unable to set SO_KEEPALIVE on socket"
+msgstr ""
+
+#: connect.c:635 connect.c:698
+#, c-format
+msgid "Looking up %s ... "
+msgstr ""
+
+#: connect.c:639
+#, c-format
+msgid "unable to look up %s (port %s) (%s)"
+msgstr ""
+
+#. TRANSLATORS: this is the end of "Looking up %s ... "
+#: connect.c:643 connect.c:714
+#, c-format
+msgid ""
+"done.\n"
+"Connecting to %s (port %s) ... "
+msgstr ""
+
+#: connect.c:665 connect.c:742
+#, c-format
+msgid ""
+"unable to connect to %s:\n"
+"%s"
+msgstr ""
+
+#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
+#: connect.c:671 connect.c:748
+msgid "done."
+msgstr ""
+
+#: connect.c:702
+#, c-format
+msgid "unable to look up %s (%s)"
+msgstr ""
+
+#: connect.c:708
+#, c-format
+msgid "unknown port %s"
+msgstr ""
+
+#: connect.c:845 connect.c:1171
+#, c-format
+msgid "strange hostname '%s' blocked"
+msgstr ""
+
+#: connect.c:847
+#, c-format
+msgid "strange port '%s' blocked"
+msgstr ""
+
+#: connect.c:857
+#, c-format
+msgid "cannot start proxy %s"
+msgstr ""
+
+#: connect.c:924
+msgid "no path specified; see 'git help pull' for valid url syntax"
+msgstr ""
+
+#: connect.c:1119
+msgid "ssh variant 'simple' does not support -4"
+msgstr ""
+
+#: connect.c:1131
+msgid "ssh variant 'simple' does not support -6"
+msgstr ""
+
+#: connect.c:1148
+msgid "ssh variant 'simple' does not support setting port"
+msgstr ""
+
+#: connect.c:1259
+#, c-format
+msgid "strange pathname '%s' blocked"
+msgstr ""
+
+#: connect.c:1304
+msgid "unable to fork"
+msgstr ""
+
+#: connected.c:68 builtin/fsck.c:221 builtin/prune.c:146
+msgid "Checking connectivity"
+msgstr ""
+
+#: connected.c:80
+msgid "Could not run 'git rev-list'"
+msgstr ""
+
+#: connected.c:100
+msgid "failed write to rev-list"
+msgstr ""
+
+#: connected.c:107
+msgid "failed to close rev-list's stdin"
+msgstr ""
+
+#: convert.c:193
+#, c-format
+msgid "illegal crlf_action %d"
+msgstr ""
+
+#: convert.c:206
+#, c-format
+msgid "CRLF would be replaced by LF in %s"
+msgstr ""
+
+#: convert.c:208
#, c-format
msgid ""
"CRLF will be replaced by LF in %s.\n"
-"The file will have its original line endings in your working directory."
+"The file will have its original line endings in your working directory"
msgstr ""
-#: convert.c:215
+#: convert.c:216
#, c-format
msgid "LF would be replaced by CRLF in %s"
msgstr ""
-#: convert.c:217
+#: convert.c:218
#, c-format
msgid ""
"LF will be replaced by CRLF in %s.\n"
-"The file will have its original line endings in your working directory."
+"The file will have its original line endings in your working directory"
+msgstr ""
+
+#: convert.c:279
+#, c-format
+msgid "BOM is prohibited in '%s' if encoded as %s"
+msgstr ""
+
+#: convert.c:286
+#, c-format
+msgid ""
+"The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-"
+"tree-encoding."
+msgstr ""
+
+#: convert.c:304
+#, c-format
+msgid "BOM is required in '%s' if encoded as %s"
+msgstr ""
+
+#: convert.c:306
+#, c-format
+msgid ""
+"The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-"
+"%sLE (depending on the byte order) as working-tree-encoding."
+msgstr ""
+
+#: convert.c:424 convert.c:495
+#, c-format
+msgid "failed to encode '%s' from %s to %s"
+msgstr ""
+
+#: convert.c:467
+#, c-format
+msgid "encoding '%s' from %s to %s and back is not the same"
+msgstr ""
+
+#: convert.c:673
+#, c-format
+msgid "cannot fork to run external filter '%s'"
+msgstr ""
+
+#: convert.c:693
+#, c-format
+msgid "cannot feed the input to external filter '%s'"
+msgstr ""
+
+#: convert.c:700
+#, c-format
+msgid "external filter '%s' failed %d"
+msgstr ""
+
+#: convert.c:735 convert.c:738
+#, c-format
+msgid "read from external filter '%s' failed"
+msgstr ""
+
+#: convert.c:741 convert.c:796
+#, c-format
+msgid "external filter '%s' failed"
+msgstr ""
+
+#: convert.c:844
+msgid "unexpected filter type"
+msgstr ""
+
+#: convert.c:855
+msgid "path name too long for external filter"
+msgstr ""
+
+#: convert.c:929
+#, c-format
+msgid ""
+"external filter '%s' is not available anymore although not all paths have "
+"been filtered"
+msgstr ""
+
+#: convert.c:1228
+msgid "true/false are no valid working-tree-encodings"
msgstr ""
-#: date.c:116
+#: convert.c:1398 convert.c:1432
+#, c-format
+msgid "%s: clean filter '%s' failed"
+msgstr ""
+
+#: convert.c:1476
+#, c-format
+msgid "%s: smudge filter %s failed"
+msgstr ""
+
+#: date.c:137
msgid "in the future"
msgstr ""
-#: date.c:122
+#: date.c:143
#, c-format
msgid "%<PRIuMAX> second ago"
msgid_plural "%<PRIuMAX> seconds ago"
msgstr[0] ""
msgstr[1] ""
-#: date.c:129
+#: date.c:150
#, c-format
msgid "%<PRIuMAX> minute ago"
msgid_plural "%<PRIuMAX> minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: date.c:136
+#: date.c:157
#, c-format
msgid "%<PRIuMAX> hour ago"
msgid_plural "%<PRIuMAX> hours ago"
msgstr[0] ""
msgstr[1] ""
-#: date.c:143
+#: date.c:164
#, c-format
msgid "%<PRIuMAX> day ago"
msgid_plural "%<PRIuMAX> days ago"
msgstr[0] ""
msgstr[1] ""
-#: date.c:149
+#: date.c:170
#, c-format
msgid "%<PRIuMAX> week ago"
msgid_plural "%<PRIuMAX> weeks ago"
msgstr[0] ""
msgstr[1] ""
-#: date.c:156
+#: date.c:177
#, c-format
msgid "%<PRIuMAX> month ago"
msgid_plural "%<PRIuMAX> months ago"
msgstr[0] ""
msgstr[1] ""
-#: date.c:167
+#: date.c:188
#, c-format
msgid "%<PRIuMAX> year"
msgid_plural "%<PRIuMAX> years"
msgstr[1] ""
#. TRANSLATORS: "%s" is "<n> years"
-#: date.c:170
+#: date.c:191
#, c-format
msgid "%s, %<PRIuMAX> month ago"
msgid_plural "%s, %<PRIuMAX> months ago"
msgstr[0] ""
msgstr[1] ""
-#: date.c:175 date.c:180
+#: date.c:196 date.c:201
#, c-format
msgid "%<PRIuMAX> year ago"
msgid_plural "%<PRIuMAX> years ago"
msgstr[0] ""
msgstr[1] ""
+#: delta-islands.c:272
+msgid "Propagating island marks"
+msgstr ""
+
+#: delta-islands.c:290
+#, c-format
+msgid "bad tree object %s"
+msgstr ""
+
+#: delta-islands.c:334
+#, c-format
+msgid "failed to load island regex for '%s': %s"
+msgstr ""
+
+#: delta-islands.c:390
+#, c-format
+msgid "island regex from config has too many capture groups (max=%d)"
+msgstr ""
+
+#: delta-islands.c:466
+#, c-format
+msgid "Marked %d islands, done.\n"
+msgstr ""
+
#: diffcore-order.c:24
#, c-format
msgid "failed to read orderfile '%s'"
msgstr ""
-#: diffcore-rename.c:535
+#: diffcore-rename.c:544
msgid "Performing inexact rename detection"
msgstr ""
-#: diff.c:74
+#: diff.c:108
#, c-format
msgid "option '%s' requires a value"
msgstr ""
-#: diff.c:152
+#: diff.c:158
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr ""
-#: diff.c:157
+#: diff.c:163
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr ""
-#: diff.c:281
+#: diff.c:291
msgid ""
-"color moved setting must be one of 'no', 'default', 'zebra', 'dimmed_zebra', "
-"'plain'"
+"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
+"'dimmed-zebra', 'plain'"
msgstr ""
-#: diff.c:341
+#: diff.c:319
+#, c-format
+msgid ""
+"unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
+"'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-change'"
+msgstr ""
+
+#: diff.c:327
+msgid ""
+"color-moved-ws: allow-indentation-change cannot be combined with other "
+"whitespace modes"
+msgstr ""
+
+#: diff.c:400
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr ""
-#: diff.c:401
+#: diff.c:460
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
"%s"
msgstr ""
-#: diff.c:3822
+#: diff.c:4211
#, c-format
msgid "external diff died, stopping at %s"
msgstr ""
-#: diff.c:4146
+#: diff.c:4553
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
msgstr ""
-#: diff.c:4149
+#: diff.c:4556
msgid "-G, -S and --find-object are mutually exclusive"
msgstr ""
-#: diff.c:4237
+#: diff.c:4634
msgid "--follow requires exactly one pathspec"
msgstr ""
-#: diff.c:4403
+#: diff.c:4800
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
"%s"
msgstr ""
-#: diff.c:4417
+#: diff.c:4814
#, c-format
msgid "Failed to parse --submodule option parameter: '%s'"
msgstr ""
-#: diff.c:5493
+#: diff.c:5900
msgid "inexact rename detection was skipped due to too many files."
msgstr ""
-#: diff.c:5496
+#: diff.c:5903
msgid "only found copies from modified paths due to too many files."
msgstr ""
-#: diff.c:5499
+#: diff.c:5906
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
msgstr ""
-#: dir.c:1866
+#: dir.c:538
+#, c-format
+msgid "pathspec '%s' did not match any file(s) known to git"
+msgstr ""
+
+#: dir.c:927
+#, c-format
+msgid "cannot use %s as an exclude file"
+msgstr ""
+
+#: dir.c:1842
#, c-format
msgid "could not open directory '%s'"
msgstr ""
-#: dir.c:2108
+#: dir.c:2084
msgid "failed to get kernel name and information"
msgstr ""
-#: dir.c:2232
-msgid "Untracked cache is disabled on this system or location."
+#: dir.c:2208
+msgid "untracked cache is disabled on this system or location"
+msgstr ""
+
+#: dir.c:3009
+#, c-format
+msgid "index file corrupt in repo %s"
msgstr ""
-#: dir.c:3024 dir.c:3029
+#: dir.c:3054 dir.c:3059
#, c-format
msgid "could not create directories for %s"
msgstr ""
-#: dir.c:3054
+#: dir.c:3088
#, c-format
msgid "could not migrate git directory from '%s' to '%s'"
msgstr ""
-#: editor.c:61
+#: editor.c:73
#, c-format
msgid "hint: Waiting for your editor to close the file...%c"
msgstr ""
-#: entry.c:177
+#: entry.c:178
msgid "Filtering content"
msgstr ""
-#: entry.c:435
+#: entry.c:465
#, c-format
msgid "could not stat file '%s'"
msgstr ""
+#: environment.c:150
+#, c-format
+msgid "bad git namespace path \"%s\""
+msgstr ""
+
+#: environment.c:332
+#, c-format
+msgid "could not set GIT_DIR to '%s'"
+msgstr ""
+
+#: exec-cmd.c:361
+#, c-format
+msgid "too many args to run %s"
+msgstr ""
+
#: fetch-object.c:17
msgid "Remote with no URL"
msgstr ""
-#: fetch-pack.c:253
+#: fetch-pack.c:151
msgid "git fetch-pack: expected shallow list"
msgstr ""
-#: fetch-pack.c:265
-msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
+#: fetch-pack.c:154
+msgid "git fetch-pack: expected a flush packet after shallow list"
msgstr ""
-#: fetch-pack.c:284 builtin/archive.c:63
-#, c-format
-msgid "remote error: %s"
+#: fetch-pack.c:165
+msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
msgstr ""
-#: fetch-pack.c:285
+#: fetch-pack.c:185
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr ""
-#: fetch-pack.c:337
+#: fetch-pack.c:256
msgid "--stateless-rpc requires multi_ack_detailed"
msgstr ""
-#: fetch-pack.c:428
+#: fetch-pack.c:358 fetch-pack.c:1264
#, c-format
msgid "invalid shallow line: %s"
msgstr ""
-#: fetch-pack.c:434
+#: fetch-pack.c:364 fetch-pack.c:1271
#, c-format
msgid "invalid unshallow line: %s"
msgstr ""
-#: fetch-pack.c:436
+#: fetch-pack.c:366 fetch-pack.c:1273
#, c-format
msgid "object not found: %s"
msgstr ""
-#: fetch-pack.c:439
+#: fetch-pack.c:369 fetch-pack.c:1276
#, c-format
msgid "error in object: %s"
msgstr ""
-#: fetch-pack.c:441
+#: fetch-pack.c:371 fetch-pack.c:1278
#, c-format
msgid "no shallow found: %s"
msgstr ""
-#: fetch-pack.c:444
+#: fetch-pack.c:374 fetch-pack.c:1282
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr ""
-#: fetch-pack.c:485
+#: fetch-pack.c:415
#, c-format
msgid "got %s %d %s"
msgstr ""
-#: fetch-pack.c:499
+#: fetch-pack.c:432
#, c-format
msgid "invalid commit %s"
msgstr ""
-#: fetch-pack.c:532
+#: fetch-pack.c:463
msgid "giving up"
msgstr ""
-#: fetch-pack.c:542 progress.c:229
+#: fetch-pack.c:475 progress.c:229
msgid "done"
msgstr ""
-#: fetch-pack.c:554
+#: fetch-pack.c:487
#, c-format
msgid "got %s (%d) %s"
msgstr ""
-#: fetch-pack.c:600
+#: fetch-pack.c:533
#, c-format
msgid "Marking %s as complete"
msgstr ""
-#: fetch-pack.c:788
+#: fetch-pack.c:740
#, c-format
msgid "already have %s (%s)"
msgstr ""
-#: fetch-pack.c:829
+#: fetch-pack.c:779
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr ""
-#: fetch-pack.c:837
+#: fetch-pack.c:787
msgid "protocol error: bad pack header"
msgstr ""
-#: fetch-pack.c:895
+#: fetch-pack.c:855
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr ""
-#: fetch-pack.c:911
+#: fetch-pack.c:871
#, c-format
msgid "%s failed"
msgstr ""
-#: fetch-pack.c:913
+#: fetch-pack.c:873
msgid "error in sideband demultiplexer"
msgstr ""
-#: fetch-pack.c:940
+#: fetch-pack.c:902
msgid "Server does not support shallow clients"
msgstr ""
-#: fetch-pack.c:944
+#: fetch-pack.c:906
msgid "Server supports multi_ack_detailed"
msgstr ""
-#: fetch-pack.c:947
+#: fetch-pack.c:909
msgid "Server supports no-done"
msgstr ""
-#: fetch-pack.c:953
+#: fetch-pack.c:915
msgid "Server supports multi_ack"
msgstr ""
-#: fetch-pack.c:957
+#: fetch-pack.c:919
msgid "Server supports side-band-64k"
msgstr ""
-#: fetch-pack.c:961
+#: fetch-pack.c:923
msgid "Server supports side-band"
msgstr ""
-#: fetch-pack.c:965
+#: fetch-pack.c:927
msgid "Server supports allow-tip-sha1-in-want"
msgstr ""
-#: fetch-pack.c:969
+#: fetch-pack.c:931
msgid "Server supports allow-reachable-sha1-in-want"
msgstr ""
-#: fetch-pack.c:979
+#: fetch-pack.c:941
msgid "Server supports ofs-delta"
msgstr ""
-#: fetch-pack.c:985
+#: fetch-pack.c:947 fetch-pack.c:1140
msgid "Server supports filter"
msgstr ""
-#: fetch-pack.c:993
+#: fetch-pack.c:955
#, c-format
msgid "Server version is %.*s"
msgstr ""
-#: fetch-pack.c:999
+#: fetch-pack.c:961
msgid "Server does not support --shallow-since"
msgstr ""
-#: fetch-pack.c:1003
+#: fetch-pack.c:965
msgid "Server does not support --shallow-exclude"
msgstr ""
-#: fetch-pack.c:1005
+#: fetch-pack.c:967
msgid "Server does not support --deepen"
msgstr ""
-#: fetch-pack.c:1016
+#: fetch-pack.c:984
msgid "no common commits"
msgstr ""
-#: fetch-pack.c:1028
+#: fetch-pack.c:996 fetch-pack.c:1419
msgid "git fetch-pack: fetch failed."
msgstr ""
-#: fetch-pack.c:1190
-msgid "no matching remote head"
+#: fetch-pack.c:1134
+msgid "Server does not support shallow requests"
msgstr ""
-#: fetch-pack.c:1212
+#: fetch-pack.c:1184
#, c-format
-msgid "no such remote ref %s"
+msgid "error reading section header '%s'"
msgstr ""
-#: fetch-pack.c:1215
+#: fetch-pack.c:1190
#, c-format
-msgid "Server does not allow request for unadvertised object %s"
+msgid "expected '%s', received '%s'"
msgstr ""
-#: gpg-interface.c:181
-msgid "gpg failed to sign the data"
+#: fetch-pack.c:1229
+#, c-format
+msgid "unexpected acknowledgment line: '%s'"
msgstr ""
-#: gpg-interface.c:211
-msgid "could not create temporary file"
+#: fetch-pack.c:1234
+#, c-format
+msgid "error processing acks: %d"
msgstr ""
-#: gpg-interface.c:214
-#, c-format
-msgid "failed writing detached signature to '%s'"
+#: fetch-pack.c:1244
+msgid "expected packfile to be sent after 'ready'"
msgstr ""
-#: graph.c:97
-#, c-format
-msgid "ignore invalid color '%.*s' in log.graphColors"
+#: fetch-pack.c:1246
+msgid "expected no other sections to be sent after no 'ready'"
msgstr ""
-#: grep.c:2022
+#: fetch-pack.c:1287
#, c-format
-msgid "'%s': unable to read %s"
+msgid "error processing shallow info: %d"
msgstr ""
-#: grep.c:2039 setup.c:163 builtin/clone.c:407 builtin/diff.c:81
-#: builtin/rm.c:134
+#: fetch-pack.c:1308
#, c-format
-msgid "failed to stat '%s'"
+msgid "expected wanted-ref, got '%s'"
msgstr ""
-#: grep.c:2050
+#: fetch-pack.c:1318
#, c-format
-msgid "'%s': short read"
+msgid "unexpected wanted-ref: '%s'"
msgstr ""
-#: help.c:179
+#: fetch-pack.c:1322
#, c-format
-msgid "available git commands in '%s'"
+msgid "error processing wanted refs: %d"
msgstr ""
-#: help.c:186
-msgid "git commands available from elsewhere on your $PATH"
+#: fetch-pack.c:1646
+msgid "no matching remote head"
msgstr ""
-#: help.c:217
-msgid "These are common Git commands used in various situations:"
+#: fetch-pack.c:1664 builtin/clone.c:671
+msgid "remote did not send all necessary objects"
msgstr ""
-#: help.c:281
+#: fetch-pack.c:1690
#, c-format
-msgid ""
-"'%s' appears to be a git command, but we were not\n"
-"able to execute it. Maybe git-%s is broken?"
-msgstr ""
-
-#: help.c:336
-msgid "Uh oh. Your system reports no Git commands at all."
+msgid "no such remote ref %s"
msgstr ""
-#: help.c:358
+#: fetch-pack.c:1693
#, c-format
-msgid "WARNING: You called a Git command named '%s', which does not exist."
+msgid "Server does not allow request for unadvertised object %s"
msgstr ""
-#: help.c:363
-#, c-format
-msgid "Continuing under the assumption that you meant '%s'."
+#: gpg-interface.c:318
+msgid "gpg failed to sign the data"
msgstr ""
-#: help.c:368
-#, c-format
-msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
+#: gpg-interface.c:344
+msgid "could not create temporary file"
msgstr ""
-#: help.c:376
+#: gpg-interface.c:347
#, c-format
-msgid "git: '%s' is not a git command. See 'git --help'."
+msgid "failed writing detached signature to '%s'"
msgstr ""
-#: help.c:380
+#: graph.c:97
+#, c-format
+msgid "ignore invalid color '%.*s' in log.graphColors"
+msgstr ""
+
+#: grep.c:2113
+#, c-format
+msgid "'%s': unable to read %s"
+msgstr ""
+
+#: grep.c:2130 setup.c:164 builtin/clone.c:411 builtin/diff.c:82
+#: builtin/rm.c:135
+#, c-format
+msgid "failed to stat '%s'"
+msgstr ""
+
+#: grep.c:2141
+#, c-format
+msgid "'%s': short read"
+msgstr ""
+
+#: help.c:23
+msgid "start a working area (see also: git help tutorial)"
+msgstr ""
+
+#: help.c:24
+msgid "work on the current change (see also: git help everyday)"
+msgstr ""
+
+#: help.c:25
+msgid "examine the history and state (see also: git help revisions)"
+msgstr ""
+
+#: help.c:26
+msgid "grow, mark and tweak your common history"
+msgstr ""
+
+#: help.c:27
+msgid "collaborate (see also: git help workflows)"
+msgstr ""
+
+#: help.c:31
+msgid "Main Porcelain Commands"
+msgstr ""
+
+#: help.c:32
+msgid "Ancillary Commands / Manipulators"
+msgstr ""
+
+#: help.c:33
+msgid "Ancillary Commands / Interrogators"
+msgstr ""
+
+#: help.c:34
+msgid "Interacting with Others"
+msgstr ""
+
+#: help.c:35
+msgid "Low-level Commands / Manipulators"
+msgstr ""
+
+#: help.c:36
+msgid "Low-level Commands / Interrogators"
+msgstr ""
+
+#: help.c:37
+msgid "Low-level Commands / Synching Repositories"
+msgstr ""
+
+#: help.c:38
+msgid "Low-level Commands / Internal Helpers"
+msgstr ""
+
+#: help.c:298
+#, c-format
+msgid "available git commands in '%s'"
+msgstr ""
+
+#: help.c:305
+msgid "git commands available from elsewhere on your $PATH"
+msgstr ""
+
+#: help.c:314
+msgid "These are common Git commands used in various situations:"
+msgstr ""
+
+#: help.c:363 git.c:90
+#, c-format
+msgid "unsupported command listing type '%s'"
+msgstr ""
+
+#: help.c:410
+msgid "The common Git guides are:"
+msgstr ""
+
+#: help.c:519
+msgid "See 'git help <command>' to read about a specific subcommand"
+msgstr ""
+
+#: help.c:524
+msgid "External commands"
+msgstr ""
+
+#: help.c:539
+msgid "Command aliases"
+msgstr ""
+
+#: help.c:603
+#, c-format
+msgid ""
+"'%s' appears to be a git command, but we were not\n"
+"able to execute it. Maybe git-%s is broken?"
+msgstr ""
+
+#: help.c:662
+msgid "Uh oh. Your system reports no Git commands at all."
+msgstr ""
+
+#: help.c:684
+#, c-format
+msgid "WARNING: You called a Git command named '%s', which does not exist."
+msgstr ""
+
+#: help.c:689
+#, c-format
+msgid "Continuing under the assumption that you meant '%s'."
+msgstr ""
+
+#: help.c:694
+#, c-format
+msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
+msgstr ""
+
+#: help.c:702
+#, c-format
+msgid "git: '%s' is not a git command. See 'git --help'."
+msgstr ""
+
+#: help.c:706
msgid ""
"\n"
"The most similar command is"
msgstr[0] ""
msgstr[1] ""
-#: help.c:395
+#: help.c:721
msgid "git version [<options>]"
msgstr ""
-#: help.c:462
+#: help.c:789
#, c-format
msgid "%s: %s - %s"
msgstr ""
-#: help.c:466
+#: help.c:793
msgid ""
"\n"
"Did you mean this?"
msgstr[0] ""
msgstr[1] ""
-#: ident.c:342
+#: ident.c:345
msgid ""
"\n"
"*** Please tell me who you are.\n"
"\n"
msgstr ""
-#: ident.c:366
+#: ident.c:369
msgid "no email was given and auto-detection is disabled"
msgstr ""
-#: ident.c:371
+#: ident.c:374
#, c-format
msgid "unable to auto-detect email address (got '%s')"
msgstr ""
-#: ident.c:381
+#: ident.c:384
msgid "no name was given and auto-detection is disabled"
msgstr ""
-#: ident.c:387
+#: ident.c:390
#, c-format
msgid "unable to auto-detect name (got '%s')"
msgstr ""
-#: ident.c:395
+#: ident.c:398
#, c-format
msgid "empty ident name (for <%s>) not allowed"
msgstr ""
-#: ident.c:401
+#: ident.c:404
#, c-format
msgid "name consists only of disallowed characters: %s"
msgstr ""
-#: ident.c:416 builtin/commit.c:582
+#: ident.c:419 builtin/commit.c:608
#, c-format
msgid "invalid date format: %s"
msgstr ""
msgid "multiple filter-specs cannot be combined"
msgstr ""
-#: list-objects-filter-options.c:126
+#: list-objects-filter-options.c:58
+msgid "expected 'tree:<depth>'"
+msgstr ""
+
+#: list-objects-filter-options.c:152
msgid "cannot change partial clone promisor remote"
msgstr ""
msgid "Unable to create '%s.lock': %s"
msgstr ""
-#: merge.c:74
+#: merge.c:41
msgid "failed to read the cache"
msgstr ""
-#: merge.c:134 builtin/am.c:1946 builtin/am.c:1980 builtin/checkout.c:378
-#: builtin/checkout.c:599 builtin/clone.c:759
+#: merge.c:107 rerere.c:720 builtin/am.c:1884 builtin/am.c:1918
+#: builtin/checkout.c:416 builtin/checkout.c:745 builtin/clone.c:771
msgid "unable to write new index file"
msgstr ""
-#: merge-recursive.c:235
+#: merge-recursive.c:332
msgid "(bad commit)\n"
msgstr ""
-#: merge-recursive.c:257 merge-recursive.c:265
+#: merge-recursive.c:355
#, c-format
-msgid "addinfo_cache failed for path '%s'"
+msgid "add_cacheinfo failed for path '%s'; merge aborting."
msgstr ""
-#: merge-recursive.c:329
+#: merge-recursive.c:364
+#, c-format
+msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
+msgstr ""
+
+#: merge-recursive.c:447
msgid "error building trees"
msgstr ""
-#: merge-recursive.c:771
+#: merge-recursive.c:902
#, c-format
msgid "failed to create path '%s'%s"
msgstr ""
-#: merge-recursive.c:782
+#: merge-recursive.c:913
#, c-format
msgid "Removing %s to make room for subdirectory\n"
msgstr ""
-#: merge-recursive.c:796 merge-recursive.c:815
+#: merge-recursive.c:927 merge-recursive.c:946
msgid ": perhaps a D/F conflict?"
msgstr ""
-#: merge-recursive.c:805
+#: merge-recursive.c:936
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr ""
-#: merge-recursive.c:847 builtin/cat-file.c:37
+#: merge-recursive.c:978 builtin/cat-file.c:40
#, c-format
msgid "cannot read object %s '%s'"
msgstr ""
-#: merge-recursive.c:849
+#: merge-recursive.c:980
#, c-format
msgid "blob expected for %s '%s'"
msgstr ""
-#: merge-recursive.c:873
+#: merge-recursive.c:1004
#, c-format
msgid "failed to open '%s': %s"
msgstr ""
-#: merge-recursive.c:884
+#: merge-recursive.c:1015
#, c-format
msgid "failed to symlink '%s': %s"
msgstr ""
-#: merge-recursive.c:889
+#: merge-recursive.c:1020
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr ""
-#: merge-recursive.c:1029
+#: merge-recursive.c:1211
+#, c-format
+msgid "Failed to merge submodule %s (not checked out)"
+msgstr ""
+
+#: merge-recursive.c:1218
+#, c-format
+msgid "Failed to merge submodule %s (commits not present)"
+msgstr ""
+
+#: merge-recursive.c:1225
+#, c-format
+msgid "Failed to merge submodule %s (commits don't follow merge-base)"
+msgstr ""
+
+#: merge-recursive.c:1233 merge-recursive.c:1245
+#, c-format
+msgid "Fast-forwarding submodule %s to the following commit:"
+msgstr ""
+
+#: merge-recursive.c:1236 merge-recursive.c:1248
+#, c-format
+msgid "Fast-forwarding submodule %s"
+msgstr ""
+
+#: merge-recursive.c:1271
+#, c-format
+msgid "Failed to merge submodule %s (merge following commits not found)"
+msgstr ""
+
+#: merge-recursive.c:1275
+#, c-format
+msgid "Failed to merge submodule %s (not fast-forward)"
+msgstr ""
+
+#: merge-recursive.c:1276
+msgid "Found a possible merge resolution for the submodule:\n"
+msgstr ""
+
+#: merge-recursive.c:1279
+#, c-format
+msgid ""
+"If this is correct simply add it to the index for example\n"
+"by using:\n"
+"\n"
+" git update-index --cacheinfo 160000 %s \"%s\"\n"
+"\n"
+"which will accept this suggestion.\n"
+msgstr ""
+
+#: merge-recursive.c:1288
+#, c-format
+msgid "Failed to merge submodule %s (multiple merges found)"
+msgstr ""
+
+#: merge-recursive.c:1361
msgid "Failed to execute internal merge"
msgstr ""
-#: merge-recursive.c:1034
+#: merge-recursive.c:1366
#, c-format
msgid "Unable to add %s to database"
msgstr ""
-#: merge-recursive.c:1146
+#: merge-recursive.c:1398
+#, c-format
+msgid "Auto-merging %s"
+msgstr ""
+
+#: merge-recursive.c:1419
+#, c-format
+msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
+msgstr ""
+
+#: merge-recursive.c:1486
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
"in tree."
msgstr ""
-#: merge-recursive.c:1151
+#: merge-recursive.c:1491
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
"left in tree."
msgstr ""
-#: merge-recursive.c:1158
+#: merge-recursive.c:1498
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
"in tree at %s."
msgstr ""
-#: merge-recursive.c:1163
+#: merge-recursive.c:1503
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
"left in tree at %s."
msgstr ""
-#: merge-recursive.c:1197
+#: merge-recursive.c:1537
msgid "rename"
msgstr ""
-#: merge-recursive.c:1197
+#: merge-recursive.c:1537
msgid "renamed"
msgstr ""
-#: merge-recursive.c:1254
+#: merge-recursive.c:1633 merge-recursive.c:2481 merge-recursive.c:3213
+#, c-format
+msgid "Refusing to lose dirty file at %s"
+msgstr ""
+
+#: merge-recursive.c:1643
+#, c-format
+msgid "Refusing to lose untracked file at %s, even though it's in the way."
+msgstr ""
+
+#: merge-recursive.c:1706
+#, c-format
+msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
+msgstr ""
+
+#: merge-recursive.c:1734
#, c-format
msgid "%s is a directory in %s adding as %s instead"
msgstr ""
-#: merge-recursive.c:1279
+#: merge-recursive.c:1739
+#, c-format
+msgid "Refusing to lose untracked file at %s; adding as %s instead"
+msgstr ""
+
+#: merge-recursive.c:1759
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
"\"->\"%s\" in \"%s\"%s"
msgstr ""
-#: merge-recursive.c:1284
+#: merge-recursive.c:1764
msgid " (left unresolved)"
msgstr ""
-#: merge-recursive.c:1346
+#: merge-recursive.c:1868
#, c-format
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr ""
-#: merge-recursive.c:1379
+#: merge-recursive.c:2064
#, c-format
-msgid "Renaming %s to %s and %s to %s instead"
+msgid ""
+"CONFLICT (directory rename split): Unclear where to place %s because "
+"directory %s was renamed to multiple other directories, with no destination "
+"getting a majority of the files."
msgstr ""
-#: merge-recursive.c:1582
+#: merge-recursive.c:2096
#, c-format
-msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
+msgid ""
+"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
+"implicit directory rename(s) putting the following path(s) there: %s."
msgstr ""
-#: merge-recursive.c:1597
+#: merge-recursive.c:2106
#, c-format
-msgid "Adding merged %s"
+msgid ""
+"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
+"implicit directory renames tried to put these paths there: %s"
msgstr ""
-#: merge-recursive.c:1604 merge-recursive.c:1834
+#: merge-recursive.c:2198
#, c-format
-msgid "Adding as %s instead"
+msgid ""
+"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
+">%s in %s"
+msgstr ""
+
+#: merge-recursive.c:2443
+#, c-format
+msgid ""
+"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
+"renamed."
msgstr ""
-#: merge-recursive.c:1661
+#: merge-recursive.c:3022
#, c-format
msgid "cannot read object %s"
msgstr ""
-#: merge-recursive.c:1664
+#: merge-recursive.c:3025
#, c-format
msgid "object %s is not a blob"
msgstr ""
-#: merge-recursive.c:1733
+#: merge-recursive.c:3094
msgid "modify"
msgstr ""
-#: merge-recursive.c:1733
+#: merge-recursive.c:3094
msgid "modified"
msgstr ""
-#: merge-recursive.c:1743
+#: merge-recursive.c:3105
msgid "content"
msgstr ""
-#: merge-recursive.c:1750
+#: merge-recursive.c:3112
msgid "add/add"
msgstr ""
-#: merge-recursive.c:1786
+#: merge-recursive.c:3160
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr ""
-#: merge-recursive.c:1800
-#, c-format
-msgid "Auto-merging %s"
-msgstr ""
-
-#: merge-recursive.c:1804 git-submodule.sh:879
+#: merge-recursive.c:3182 git-submodule.sh:861
msgid "submodule"
msgstr ""
-#: merge-recursive.c:1805
+#: merge-recursive.c:3183
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr ""
-#: merge-recursive.c:1899
+#: merge-recursive.c:3216
+#, c-format
+msgid "Adding as %s instead"
+msgstr ""
+
+#: merge-recursive.c:3319
#, c-format
msgid "Removing %s"
msgstr ""
-#: merge-recursive.c:1925
+#: merge-recursive.c:3345
msgid "file/directory"
msgstr ""
-#: merge-recursive.c:1931
+#: merge-recursive.c:3351
msgid "directory/file"
msgstr ""
-#: merge-recursive.c:1938
+#: merge-recursive.c:3358
#, c-format
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
msgstr ""
-#: merge-recursive.c:1947
+#: merge-recursive.c:3367
#, c-format
msgid "Adding %s"
msgstr ""
-#: merge-recursive.c:1987
+#: merge-recursive.c:3376
+#, c-format
+msgid "CONFLICT (add/add): Merge conflict in %s"
+msgstr ""
+
+#: merge-recursive.c:3417
#, c-format
-msgid "Dirty index: cannot merge (dirty: %s)"
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+" %s"
msgstr ""
-#: merge-recursive.c:1991
+#: merge-recursive.c:3428
msgid "Already up to date!"
msgstr ""
-#: merge-recursive.c:2000
+#: merge-recursive.c:3437
#, c-format
msgid "merging of trees %s and %s failed"
msgstr ""
-#: merge-recursive.c:2097
+#: merge-recursive.c:3536
msgid "Merging:"
msgstr ""
-#: merge-recursive.c:2110
+#: merge-recursive.c:3549
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] ""
msgstr[1] ""
-#: merge-recursive.c:2149
+#: merge-recursive.c:3588
msgid "merge returned no commit"
msgstr ""
-#: merge-recursive.c:2212
+#: merge-recursive.c:3654
#, c-format
msgid "Could not parse object '%s'"
msgstr ""
-#: merge-recursive.c:2228 builtin/merge.c:657 builtin/merge.c:816
+#: merge-recursive.c:3670 builtin/merge.c:692 builtin/merge.c:850
msgid "Unable to write index."
msgstr ""
-#: notes-merge.c:272
+#: midx.c:65
#, 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."
+msgid "multi-pack-index file %s is too small"
msgstr ""
-#: notes-merge.c:279
+#: midx.c:81
#, c-format
-msgid "You have not concluded your notes merge (%s exists)."
-msgstr ""
-
-#: notes-utils.c:43
-msgid "Cannot commit uninitialized/unreferenced notes tree"
+msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
msgstr ""
-#: notes-utils.c:102
+#: midx.c:86
#, c-format
-msgid "Bad notes.rewriteMode value: '%s'"
+msgid "multi-pack-index version %d not recognized"
msgstr ""
-#: notes-utils.c:112
+#: midx.c:91
#, c-format
-msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
+msgid "hash version %u does not match"
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'"
+#: midx.c:105
+msgid "invalid chunk offset (too large)"
msgstr ""
-#: object.c:239
-#, c-format
-msgid "unable to parse object: %s"
+#: midx.c:129
+msgid "terminating multi-pack-index chunk id appears earlier than expected"
msgstr ""
-#: packfile.c:561
-msgid "offset before end of packfile (broken .idx?)"
+#: midx.c:142
+msgid "multi-pack-index missing required pack-name chunk"
msgstr ""
-#: packfile.c:1694
-#, c-format
-msgid "offset before start of pack index for %s (corrupt index?)"
+#: midx.c:144
+msgid "multi-pack-index missing required OID fanout chunk"
msgstr ""
-#: packfile.c:1698
-#, c-format
-msgid "offset beyond end of pack index for %s (truncated index?)"
+#: midx.c:146
+msgid "multi-pack-index missing required OID lookup chunk"
msgstr ""
-#: parse-options.c:619
-msgid "..."
+#: midx.c:148
+msgid "multi-pack-index missing required object offsets chunk"
msgstr ""
-#: parse-options.c:638
+#: midx.c:162
#, c-format
-msgid "usage: %s"
+msgid "multi-pack-index pack names out of order: '%s' before '%s'"
msgstr ""
-#. TRANSLATORS: the colon here should align with the
-#. one in "usage: %s" translation.
-#.
-#: parse-options.c:644
+#: midx.c:205
#, c-format
-msgid " or: %s"
+msgid "bad pack-int-id: %u (%u total packs)"
msgstr ""
-#: parse-options.c:647
-#, c-format
-msgid " %s"
+#: midx.c:246
+msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
msgstr ""
-#: parse-options.c:686
-msgid "-NUM"
+#: midx.c:271
+msgid "error preparing packfile from multi-pack-index"
msgstr ""
-#: parse-options-cb.c:108
+#: midx.c:407
#, c-format
-msgid "malformed object name '%s'"
+msgid "failed to add packfile '%s'"
msgstr ""
-#: path.c:891
+#: midx.c:413
#, c-format
-msgid "Could not make %s writable by group"
+msgid "failed to open pack-index '%s'"
msgstr ""
-#: pathspec.c:129
-msgid "Escape character '\\' not allowed as last character in attr value"
-msgstr ""
-
-#: pathspec.c:147
-msgid "Only one 'attr:' specification is allowed."
-msgstr ""
-
-#: pathspec.c:150
-msgid "attr spec must not be empty"
+#: midx.c:507
+#, c-format
+msgid "failed to locate object %d in packfile"
msgstr ""
-#: pathspec.c:193
+#: midx.c:943
#, c-format
-msgid "invalid attribute name %s"
+msgid "failed to clear multi-pack-index at %s"
msgstr ""
-#: pathspec.c:258
-msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
+#: midx.c:981
+#, c-format
+msgid ""
+"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
msgstr ""
-#: pathspec.c:265
-msgid ""
-"global 'literal' pathspec setting is incompatible with all other global "
-"pathspec settings"
+#: midx.c:992
+#, c-format
+msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
msgstr ""
-#: pathspec.c:305
-msgid "invalid parameter for pathspec magic 'prefix'"
+#: midx.c:996
+msgid "Verifying object offsets"
msgstr ""
-#: pathspec.c:326
+#: midx.c:1004
#, c-format
-msgid "Invalid pathspec magic '%.*s' in '%s'"
+msgid "failed to load pack entry for oid[%d] = %s"
msgstr ""
-#: pathspec.c:331
+#: midx.c:1010
#, c-format
-msgid "Missing ')' at the end of pathspec magic in '%s'"
+msgid "failed to load pack-index for packfile %s"
msgstr ""
-#: pathspec.c:369
+#: midx.c:1019
#, c-format
-msgid "Unimplemented pathspec magic '%c' in '%s'"
+msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
msgstr ""
-#: pathspec.c:428
+#: name-hash.c:531
#, c-format
-msgid "%s: 'literal' and 'glob' are incompatible"
+msgid "unable to create lazy_dir thread: %s"
msgstr ""
-#: pathspec.c:441
+#: name-hash.c:553
#, c-format
-msgid "%s: '%s' is outside repository"
+msgid "unable to create lazy_name thread: %s"
msgstr ""
-#: pathspec.c:515
+#: name-hash.c:559
#, c-format
-msgid "'%s' (mnemonic: '%c')"
+msgid "unable to join lazy_name thread: %s"
msgstr ""
-#: pathspec.c:525
+#: notes-merge.c:277
#, c-format
-msgid "%s: pathspec magic not supported by this command: %s"
+msgid ""
+"You have not concluded your previous notes merge (%s exists).\n"
+"Please, use 'git notes merge --commit' or 'git notes merge --abort' to "
+"commit/abort the previous merge before you start a new notes merge."
msgstr ""
-#: pathspec.c:592
+#: notes-merge.c:284
#, c-format
-msgid "pathspec '%s' is beyond a symbolic link"
+msgid "You have not concluded your notes merge (%s exists)."
msgstr ""
-#: pretty.c:962
-msgid "unable to parse --pretty format"
+#: notes-utils.c:46
+msgid "Cannot commit uninitialized/unreferenced notes tree"
msgstr ""
-#: read-cache.c:1473
+#: notes-utils.c:105
#, c-format
-msgid ""
-"index.version set, but the value is invalid.\n"
-"Using version %i"
+msgid "Bad notes.rewriteMode value: '%s'"
msgstr ""
-#: read-cache.c:1483
+#: notes-utils.c:115
#, c-format
-msgid ""
-"GIT_INDEX_VERSION set, but the value is invalid.\n"
-"Using version %i"
+msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
msgstr ""
-#: read-cache.c:2375 sequencer.c:3248 wrapper.c:658 builtin/merge.c:1049
+#. TRANSLATORS: The first %s is the name of
+#. the environment variable, the second %s is
+#. its value.
+#.
+#: notes-utils.c:145
#, c-format
-msgid "could not close '%s'"
+msgid "Bad %s value: '%s'"
msgstr ""
-#: read-cache.c:2448 sequencer.c:1900 sequencer.c:2627
+#: object.c:54
#, c-format
-msgid "could not stat '%s'"
+msgid "invalid object type \"%s\""
msgstr ""
-#: read-cache.c:2461
+#: object.c:174
#, c-format
-msgid "unable to open git dir: %s"
+msgid "object %s is a %s, not a %s"
msgstr ""
-#: read-cache.c:2473
+#: object.c:234
#, c-format
-msgid "unable to unlink: %s"
+msgid "object %s has unknown type id %d"
msgstr ""
-#: refs.c:706
+#: object.c:247
#, c-format
-msgid "Could not open '%s' for writing"
+msgid "unable to parse object: %s"
msgstr ""
-#: refs.c:1850
-msgid "ref updates forbidden inside quarantine environment"
+#: object.c:267 object.c:278
+#, c-format
+msgid "hash mismatch %s"
msgstr ""
-#: refs/files-backend.c:1189
-#, c-format
-msgid "could not remove reference %s"
+#: packfile.c:607
+msgid "offset before end of packfile (broken .idx?)"
msgstr ""
-#: refs/files-backend.c:1203 refs/packed-backend.c:1528
-#: refs/packed-backend.c:1538
+#: packfile.c:1870
#, c-format
-msgid "could not delete reference %s: %s"
+msgid "offset before start of pack index for %s (corrupt index?)"
msgstr ""
-#: refs/files-backend.c:1206 refs/packed-backend.c:1541
+#: packfile.c:1874
#, c-format
-msgid "could not delete references: %s"
+msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr ""
-#: ref-filter.c:35 wt-status.c:1842
-msgid "gone"
+#: parse-options.c:35
+#, c-format
+msgid "%s requires a value"
msgstr ""
-#: ref-filter.c:36
+#: parse-options.c:69
#, c-format
-msgid "ahead %d"
+msgid "%s is incompatible with %s"
msgstr ""
-#: ref-filter.c:37
+#: parse-options.c:74
#, c-format
-msgid "behind %d"
+msgid "%s : incompatible with something else"
msgstr ""
-#: ref-filter.c:38
+#: parse-options.c:88 parse-options.c:92 parse-options.c:260
#, c-format
-msgid "ahead %d, behind %d"
+msgid "%s takes no value"
msgstr ""
-#: ref-filter.c:107
+#: parse-options.c:90
#, c-format
-msgid "expected format: %%(color:<color>)"
+msgid "%s isn't available"
msgstr ""
-#: ref-filter.c:109
+#: parse-options.c:178
#, c-format
-msgid "unrecognized color: %%(color:%s)"
+msgid "%s expects a numerical value"
msgstr ""
-#: ref-filter.c:129
+#: parse-options.c:194
#, c-format
-msgid "Integer value expected refname:lstrip=%s"
+msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
msgstr ""
-#: ref-filter.c:133
+#: parse-options.c:322
#, c-format
-msgid "Integer value expected refname:rstrip=%s"
+msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
msgstr ""
-#: ref-filter.c:135
+#: parse-options.c:356 parse-options.c:364
#, c-format
-msgid "unrecognized %%(%s) argument: %s"
+msgid "did you mean `--%s` (with two dashes ?)"
msgstr ""
-#: ref-filter.c:184
+#: parse-options.c:649
#, c-format
-msgid "%%(body) does not take arguments"
+msgid "unknown option `%s'"
msgstr ""
-#: ref-filter.c:191
+#: parse-options.c:651
#, c-format
-msgid "%%(subject) does not take arguments"
+msgid "unknown switch `%c'"
msgstr ""
-#: ref-filter.c:209
+#: parse-options.c:653
#, c-format
-msgid "unknown %%(trailers) argument: %s"
+msgid "unknown non-ascii option in string: `%s'"
msgstr ""
-#: ref-filter.c:232
-#, c-format
-msgid "positive value expected contents:lines=%s"
+#: parse-options.c:675
+msgid "..."
msgstr ""
-#: ref-filter.c:234
+#: parse-options.c:694
#, c-format
-msgid "unrecognized %%(contents) argument: %s"
+msgid "usage: %s"
msgstr ""
-#: ref-filter.c:247
+#. TRANSLATORS: the colon here should align with the
+#. one in "usage: %s" translation.
+#.
+#: parse-options.c:700
#, c-format
-msgid "positive value expected objectname:short=%s"
+msgid " or: %s"
msgstr ""
-#: ref-filter.c:251
+#: parse-options.c:703
#, c-format
-msgid "unrecognized %%(objectname) argument: %s"
+msgid " %s"
msgstr ""
-#: ref-filter.c:278
-#, c-format
-msgid "expected format: %%(align:<width>,<position>)"
+#: parse-options.c:742
+msgid "-NUM"
msgstr ""
-#: ref-filter.c:290
+#: parse-options-cb.c:21
#, c-format
-msgid "unrecognized position:%s"
+msgid "option `%s' expects a numerical value"
msgstr ""
-#: ref-filter.c:294
+#: parse-options-cb.c:38
#, c-format
-msgid "unrecognized width:%s"
+msgid "malformed expiration date '%s'"
msgstr ""
-#: ref-filter.c:300
+#: parse-options-cb.c:51
#, c-format
-msgid "unrecognized %%(align) argument: %s"
+msgid "option `%s' expects \"always\", \"auto\", or \"never\""
msgstr ""
-#: ref-filter.c:304
+#: parse-options-cb.c:110
#, c-format
-msgid "positive width expected with the %%(align) atom"
+msgid "malformed object name '%s'"
msgstr ""
-#: ref-filter.c:319
+#: path.c:894
#, c-format
-msgid "unrecognized %%(if) argument: %s"
+msgid "Could not make %s writable by group"
msgstr ""
-#: ref-filter.c:409
-#, c-format
-msgid "malformed field name: %.*s"
+#: pathspec.c:128
+msgid "Escape character '\\' not allowed as last character in attr value"
msgstr ""
-#: ref-filter.c:435
-#, c-format
-msgid "unknown field name: %.*s"
+#: pathspec.c:146
+msgid "Only one 'attr:' specification is allowed."
msgstr ""
-#: ref-filter.c:547
-#, c-format
-msgid "format: %%(if) atom used without a %%(then) atom"
+#: pathspec.c:149
+msgid "attr spec must not be empty"
msgstr ""
-#: ref-filter.c:607
+#: pathspec.c:192
#, c-format
-msgid "format: %%(then) atom used without an %%(if) atom"
+msgid "invalid attribute name %s"
msgstr ""
-#: ref-filter.c:609
-#, c-format
-msgid "format: %%(then) atom used more than once"
+#: pathspec.c:257
+msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
msgstr ""
-#: ref-filter.c:611
-#, c-format
-msgid "format: %%(then) atom used after %%(else)"
+#: pathspec.c:264
+msgid ""
+"global 'literal' pathspec setting is incompatible with all other global "
+"pathspec settings"
msgstr ""
-#: ref-filter.c:637
-#, c-format
-msgid "format: %%(else) atom used without an %%(if) atom"
+#: pathspec.c:304
+msgid "invalid parameter for pathspec magic 'prefix'"
msgstr ""
-#: ref-filter.c:639
+#: pathspec.c:325
#, c-format
-msgid "format: %%(else) atom used without a %%(then) atom"
+msgid "Invalid pathspec magic '%.*s' in '%s'"
msgstr ""
-#: ref-filter.c:641
+#: pathspec.c:330
#, c-format
-msgid "format: %%(else) atom used more than once"
+msgid "Missing ')' at the end of pathspec magic in '%s'"
msgstr ""
-#: ref-filter.c:654
+#: pathspec.c:368
#, c-format
-msgid "format: %%(end) atom used without corresponding atom"
+msgid "Unimplemented pathspec magic '%c' in '%s'"
msgstr ""
-#: ref-filter.c:709
+#: pathspec.c:427
#, c-format
-msgid "malformed format string %s"
+msgid "%s: 'literal' and 'glob' are incompatible"
msgstr ""
-#: ref-filter.c:1313
+#: pathspec.c:440
#, c-format
-msgid "(no branch, rebasing %s)"
+msgid "%s: '%s' is outside repository"
msgstr ""
-#: ref-filter.c:1316
+#: pathspec.c:514
#, c-format
-msgid "(no branch, bisect started on %s)"
+msgid "'%s' (mnemonic: '%c')"
msgstr ""
-#. TRANSLATORS: make sure this matches "HEAD
-#. detached at " in wt-status.c
-#.
-#: ref-filter.c:1324
+#: pathspec.c:524
#, c-format
-msgid "(HEAD detached at %s)"
+msgid "%s: pathspec magic not supported by this command: %s"
msgstr ""
-#. TRANSLATORS: make sure this matches "HEAD
-#. detached from " in wt-status.c
-#.
-#: ref-filter.c:1331
+#: pathspec.c:591
#, c-format
-msgid "(HEAD detached from %s)"
+msgid "pathspec '%s' is beyond a symbolic link"
msgstr ""
-#: ref-filter.c:1335
-msgid "(no branch)"
+#: pkt-line.c:104
+msgid "flush packet write failed"
msgstr ""
-#: ref-filter.c:1364
-#, c-format
-msgid "missing object %s for %s"
+#: pkt-line.c:144 pkt-line.c:230
+msgid "protocol error: impossibly long line"
msgstr ""
-#: ref-filter.c:1367
-#, c-format
-msgid "parse_object_buffer failed on %s for %s"
+#: pkt-line.c:160 pkt-line.c:162
+msgid "packet write with format failed"
msgstr ""
-#: ref-filter.c:1819
-#, c-format
-msgid "malformed object at '%s'"
+#: pkt-line.c:194
+msgid "packet write failed - data exceeds max packet size"
msgstr ""
-#: ref-filter.c:1886
-#, c-format
-msgid "ignoring ref with broken name %s"
+#: pkt-line.c:201 pkt-line.c:208
+msgid "packet write failed"
+msgstr ""
+
+#: pkt-line.c:293
+msgid "read error"
+msgstr ""
+
+#: pkt-line.c:301
+msgid "the remote end hung up unexpectedly"
msgstr ""
-#: ref-filter.c:1891
+#: pkt-line.c:329
#, c-format
-msgid "ignoring broken ref %s"
+msgid "protocol error: bad line length character: %.4s"
msgstr ""
-#: ref-filter.c:2152
+#: pkt-line.c:339 pkt-line.c:344
#, c-format
-msgid "format: %%(end) atom missing"
+msgid "protocol error: bad line length %d"
msgstr ""
-#: ref-filter.c:2246
+#: pkt-line.c:353
#, c-format
-msgid "malformed object name %s"
+msgid "remote error: %s"
+msgstr ""
+
+#: preload-index.c:119
+msgid "Refreshing index"
msgstr ""
-#: remote.c:795
+#: preload-index.c:138
#, c-format
-msgid "Cannot fetch both %s and %s to %s"
+msgid "unable to create threaded lstat: %s"
+msgstr ""
+
+#: pretty.c:963
+msgid "unable to parse --pretty format"
+msgstr ""
+
+#: range-diff.c:56
+msgid "could not start `log`"
+msgstr ""
+
+#: range-diff.c:59
+msgid "could not read `log` output"
msgstr ""
-#: remote.c:799
+#: range-diff.c:74 sequencer.c:4828
#, c-format
-msgid "%s usually tracks %s, not %s"
+msgid "could not parse commit '%s'"
+msgstr ""
+
+#: range-diff.c:224
+msgid "failed to generate diff"
msgstr ""
-#: remote.c:803
+#: range-diff.c:455 range-diff.c:457
#, c-format
-msgid "%s tracks both %s and %s"
+msgid "could not parse log for '%s'"
msgstr ""
-#: remote.c:811
-msgid "Internal error"
+#: read-cache.c:673
+#, c-format
+msgid "will not add file alias '%s' ('%s' already exists in index)"
msgstr ""
-#: remote.c:1726 remote.c:1828
-msgid "HEAD does not point to a branch"
+#: read-cache.c:689
+msgid "cannot create an empty blob in the object database"
msgstr ""
-#: remote.c:1735
+#: read-cache.c:710
#, c-format
-msgid "no such branch: '%s'"
+msgid "%s: can only add regular files, symbolic links or git-directories"
msgstr ""
-#: remote.c:1738
+#: read-cache.c:765
#, c-format
-msgid "no upstream configured for branch '%s'"
+msgid "unable to index file '%s'"
msgstr ""
-#: remote.c:1744
+#: read-cache.c:784
#, c-format
-msgid "upstream branch '%s' not stored as a remote-tracking branch"
+msgid "unable to add '%s' to index"
msgstr ""
-#: remote.c:1759
+#: read-cache.c:795
#, c-format
-msgid "push destination '%s' on remote '%s' has no local tracking branch"
+msgid "unable to stat '%s'"
msgstr ""
-#: remote.c:1771
+#: read-cache.c:1304
#, c-format
-msgid "branch '%s' has no remote for pushing"
+msgid "'%s' appears as both a file and as a directory"
+msgstr ""
+
+#: read-cache.c:1489
+msgid "Refresh index"
msgstr ""
-#: remote.c:1782
+#: read-cache.c:1603
#, c-format
-msgid "push refspecs for '%s' do not include '%s'"
+msgid ""
+"index.version set, but the value is invalid.\n"
+"Using version %i"
msgstr ""
-#: remote.c:1795
-msgid "push has no destination (push.default is 'nothing')"
+#: read-cache.c:1613
+#, c-format
+msgid ""
+"GIT_INDEX_VERSION set, but the value is invalid.\n"
+"Using version %i"
msgstr ""
-#: remote.c:1817
-msgid "cannot resolve 'simple' push to a single destination"
+#: read-cache.c:1684
+#, c-format
+msgid "bad signature 0x%08x"
msgstr ""
-#: remote.c:2132
+#: read-cache.c:1687
#, c-format
-msgid "Your branch is based on '%s', but the upstream is gone.\n"
+msgid "bad index version %d"
msgstr ""
-#: remote.c:2136
-msgid " (use \"git branch --unset-upstream\" to fixup)\n"
+#: read-cache.c:1696
+msgid "bad index file sha1 signature"
msgstr ""
-#: remote.c:2139
+#: read-cache.c:1726
#, c-format
-msgid "Your branch is up to date with '%s'.\n"
+msgid "index uses %.4s extension, which we do not understand"
msgstr ""
-#: remote.c:2143
+#: read-cache.c:1728
#, c-format
-msgid "Your branch and '%s' refer to different commits.\n"
+msgid "ignoring %.4s extension"
msgstr ""
-#: remote.c:2146
+#: read-cache.c:1765
#, c-format
-msgid " (use \"%s\" for details)\n"
+msgid "unknown index entry format 0x%08x"
msgstr ""
-#: remote.c:2150
+#: read-cache.c:1781
#, c-format
-msgid "Your branch is ahead of '%s' by %d commit.\n"
-msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
-msgstr[0] ""
-msgstr[1] ""
+msgid "malformed name field in the index, near path '%s'"
+msgstr ""
-#: remote.c:2156
-msgid " (use \"git push\" to publish your local commits)\n"
+#: read-cache.c:1836
+msgid "unordered stage entries in index"
msgstr ""
-#: remote.c:2159
+#: read-cache.c:1839
#, 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"
+msgid "multiple stage entries for merged file '%s'"
msgstr ""
-#: remote.c:2170
+#: read-cache.c:1842
#, c-format
-msgid ""
-"Your branch and '%s' have diverged,\n"
-"and have %d and %d different commit each, respectively.\n"
-msgid_plural ""
-"Your branch and '%s' have diverged,\n"
-"and have %d and %d different commits each, respectively.\n"
-msgstr[0] ""
-msgstr[1] ""
+msgid "unordered stage entries for '%s'"
+msgstr ""
-#: remote.c:2180
-msgid " (use \"git pull\" to merge the remote branch into yours)\n"
+#: read-cache.c:1949 read-cache.c:2227 rerere.c:565 rerere.c:599 rerere.c:1111
+#: builtin/add.c:459 builtin/check-ignore.c:178 builtin/checkout.c:294
+#: builtin/checkout.c:622 builtin/checkout.c:991 builtin/clean.c:955
+#: builtin/commit.c:344 builtin/diff-tree.c:116 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 ""
-#: revision.c:2277
-msgid "your current branch appears to be broken"
+#: read-cache.c:2090
+#, c-format
+msgid "unable to create load_cache_entries thread: %s"
msgstr ""
-#: revision.c:2280
+#: read-cache.c:2103
#, c-format
-msgid "your current branch '%s' does not have any commits yet"
+msgid "unable to join load_cache_entries thread: %s"
msgstr ""
-#: revision.c:2477
-msgid "--first-parent is incompatible with --bisect"
+#: read-cache.c:2136
+#, c-format
+msgid "%s: index file open failed"
msgstr ""
-#: run-command.c:731
-msgid "open /dev/null failed"
+#: read-cache.c:2140
+#, c-format
+msgid "%s: cannot stat the open index"
msgstr ""
-#: run-command.c:1274
+#: read-cache.c:2144
#, c-format
-msgid ""
-"The '%s' hook was ignored because it's not set as executable.\n"
-"You can disable this warning with `git config advice.ignoredHook false`."
+msgid "%s: index file smaller than expected"
msgstr ""
-#: send-pack.c:141
-msgid "unexpected flush packet while reading remote unpack status"
+#: read-cache.c:2148
+#, c-format
+msgid "%s: unable to map index file"
msgstr ""
-#: send-pack.c:143
+#: read-cache.c:2190
#, c-format
-msgid "unable to parse remote unpack status: %s"
+msgid "unable to create load_index_extensions thread: %s"
msgstr ""
-#: send-pack.c:145
+#: read-cache.c:2217
#, c-format
-msgid "remote unpack failed: %s"
+msgid "unable to join load_index_extensions thread: %s"
msgstr ""
-#: send-pack.c:308
-msgid "failed to sign the push certificate"
+#: read-cache.c:2239
+#, c-format
+msgid "could not freshen shared index '%s'"
msgstr ""
-#: send-pack.c:421
-msgid "the receiving end does not support --signed push"
+#: read-cache.c:2274
+#, c-format
+msgid "broken index, expect %s in %s, got %s"
msgstr ""
-#: send-pack.c:423
-msgid ""
-"not sending a push certificate since the receiving end does not support --"
-"signed push"
+#: read-cache.c:2971 sequencer.c:4791 wrapper.c:658 builtin/merge.c:1087
+#, c-format
+msgid "could not close '%s'"
msgstr ""
-#: send-pack.c:435
-msgid "the receiving end does not support --atomic push"
+#: read-cache.c:3044 sequencer.c:2237 sequencer.c:3647
+#, c-format
+msgid "could not stat '%s'"
msgstr ""
-#: send-pack.c:440
-msgid "the receiving end does not support push options"
+#: read-cache.c:3057
+#, c-format
+msgid "unable to open git dir: %s"
msgstr ""
-#: sequencer.c:158
+#: read-cache.c:3069
#, c-format
-msgid "invalid commit message cleanup mode '%s'"
+msgid "unable to unlink: %s"
msgstr ""
-#: sequencer.c:267
-msgid "revert"
+#: read-cache.c:3088
+#, c-format
+msgid "cannot fix permission bits on '%s'"
msgstr ""
-#: sequencer.c:269
-msgid "cherry-pick"
+#: read-cache.c:3237
+#, c-format
+msgid "%s: cannot drop to stage #0"
msgstr ""
-#: sequencer.c:271
-msgid "rebase -i"
+#: rebase-interactive.c:10
+msgid ""
+"\n"
+"Commands:\n"
+"p, pick <commit> = use commit\n"
+"r, reword <commit> = use commit, but edit the commit message\n"
+"e, edit <commit> = use commit, but stop for amending\n"
+"s, squash <commit> = use commit, but meld into previous commit\n"
+"f, fixup <commit> = like \"squash\", but discard this commit's log message\n"
+"x, exec <command> = run command (the rest of the line) using shell\n"
+"b, break = stop here (continue rebase later with 'git rebase --continue')\n"
+"d, drop <commit> = remove commit\n"
+"l, label <label> = label current HEAD with a name\n"
+"t, reset <label> = reset HEAD to a label\n"
+"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
+". create a merge commit using the original merge commit's\n"
+". message (or the oneline, if no original merge commit was\n"
+". specified). Use -c <commit> to reword the commit message.\n"
+"\n"
+"These lines can be re-ordered; they are executed from top to bottom.\n"
msgstr ""
-#: sequencer.c:273
-#, c-format
-msgid "Unknown action: %d"
+#: rebase-interactive.c:31 git-rebase--preserve-merges.sh:173
+msgid ""
+"\n"
+"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
msgstr ""
-#: sequencer.c:330
+#: rebase-interactive.c:34 git-rebase--preserve-merges.sh:177
msgid ""
-"after resolving the conflicts, mark the corrected paths\n"
-"with 'git add <paths>' or 'git rm <paths>'"
+"\n"
+"If you remove a line here THAT COMMIT WILL BE LOST.\n"
msgstr ""
-#: sequencer.c:333
+#: rebase-interactive.c:40 git-rebase--preserve-merges.sh:816
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'"
+"\n"
+"You are editing the todo file of an ongoing interactive rebase.\n"
+"To continue rebase after editing, run:\n"
+" git rebase --continue\n"
+"\n"
msgstr ""
-#: sequencer.c:346 sequencer.c:2245
-#, c-format
-msgid "could not lock '%s'"
+#: rebase-interactive.c:45 git-rebase--preserve-merges.sh:893
+msgid ""
+"\n"
+"However, if you remove everything, the rebase will be aborted.\n"
+"\n"
msgstr ""
-#: sequencer.c:349 sequencer.c:2124 sequencer.c:2250 sequencer.c:2264
-#: sequencer.c:3246 sequencer.c:3310 wrapper.c:656
-#, c-format
-msgid "could not write to '%s'"
+#: rebase-interactive.c:51 git-rebase--preserve-merges.sh:900
+msgid "Note that empty commits are commented out"
msgstr ""
-#: sequencer.c:353
+#: rebase-interactive.c:62 rebase-interactive.c:75 sequencer.c:2219
+#: sequencer.c:4569 sequencer.c:4625 sequencer.c:4900
#, c-format
-msgid "could not write eol to '%s'"
+msgid "could not read '%s'."
msgstr ""
-#: sequencer.c:356 sequencer.c:2128 sequencer.c:2252
+#: refs.c:192
#, c-format
-msgid "failed to finalize '%s'"
+msgid "%s does not point to a valid object!"
msgstr ""
-#: sequencer.c:379 sequencer.c:1340 sequencer.c:2148 builtin/am.c:259
-#: builtin/commit.c:722 builtin/merge.c:1047
+#: refs.c:583
#, c-format
-msgid "could not read '%s'"
+msgid "ignoring dangling symref %s"
msgstr ""
-#: sequencer.c:405
+#: refs.c:585 ref-filter.c:1976
#, c-format
-msgid "your local changes would be overwritten by %s."
+msgid "ignoring broken ref %s"
msgstr ""
-#: sequencer.c:409
-msgid "commit your changes or stash them to proceed."
+#: refs.c:711
+#, c-format
+msgid "could not open '%s' for writing: %s"
msgstr ""
-#: sequencer.c:438
+#: refs.c:721 refs.c:772
#, c-format
-msgid "%s: fast-forward"
+msgid "could not read ref '%s'"
msgstr ""
-#. TRANSLATORS: %s will be "revert", "cherry-pick" or
-#. "rebase -i".
-#.
-#: sequencer.c:526
+#: refs.c:727
#, c-format
-msgid "%s: Unable to write new index file"
+msgid "ref '%s' already exists"
msgstr ""
-#: sequencer.c:542
-msgid "could not resolve HEAD commit"
+#: refs.c:732
+#, c-format
+msgid "unexpected object ID when writing '%s'"
msgstr ""
-#: sequencer.c:562
-msgid "unable to update cache tree"
+#: refs.c:740 sequencer.c:396 sequencer.c:2549 sequencer.c:2675
+#: sequencer.c:2689 sequencer.c:2923 sequencer.c:4789 sequencer.c:4852
+#: wrapper.c:656
+#, c-format
+msgid "could not write to '%s'"
msgstr ""
-#: sequencer.c:658
+#: refs.c:767 sequencer.c:4787 sequencer.c:4846 wrapper.c:225 wrapper.c:395
+#: builtin/am.c:713 builtin/rebase.c:575
#, c-format
-msgid ""
-"you have staged changes in your working tree\n"
-"If these changes are meant to be squashed into the previous commit, run:\n"
-"\n"
-" git commit --amend %s\n"
-"\n"
-"If they are meant to go into a new commit, run:\n"
-"\n"
-" git commit %s\n"
-"\n"
-"In both cases, once you're done, continue with:\n"
-"\n"
-" git rebase --continue\n"
+msgid "could not open '%s' for writing"
msgstr ""
-#: sequencer.c:915
-msgid "'prepare-commit-msg' hook failed"
+#: refs.c:774
+#, c-format
+msgid "unexpected object ID when deleting '%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"
+#: refs.c:905
+#, c-format
+msgid "log for ref %s has gap after %s"
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"
+#: refs.c:911
+#, c-format
+msgid "log for ref %s unexpectedly ended on %s"
msgstr ""
-#: sequencer.c:975
-msgid "couldn't look up newly created commit"
+#: refs.c:969
+#, c-format
+msgid "log for %s is empty"
msgstr ""
-#: sequencer.c:977
-msgid "could not parse newly created commit"
+#: refs.c:1061
+#, c-format
+msgid "refusing to update ref with bad name '%s'"
msgstr ""
-#: sequencer.c:1023
-msgid "unable to resolve HEAD after creating commit"
+#: refs.c:1137
+#, c-format
+msgid "update_ref failed for ref '%s': %s"
msgstr ""
-#: sequencer.c:1025
-msgid "detached HEAD"
+#: refs.c:1911
+#, c-format
+msgid "multiple updates for ref '%s' not allowed"
msgstr ""
-#: sequencer.c:1029
-msgid " (root-commit)"
+#: refs.c:1943
+msgid "ref updates forbidden inside quarantine environment"
msgstr ""
-#: sequencer.c:1050
-msgid "could not parse HEAD"
+#: refs.c:2039 refs.c:2069
+#, c-format
+msgid "'%s' exists; cannot create '%s'"
msgstr ""
-#: sequencer.c:1052
+#: refs.c:2045 refs.c:2080
#, c-format
-msgid "HEAD %s is not a commit!"
+msgid "cannot process '%s' and '%s' at the same time"
msgstr ""
-#: sequencer.c:1056 builtin/commit.c:1491
-msgid "could not parse HEAD commit"
+#: refs/files-backend.c:1228
+#, c-format
+msgid "could not remove reference %s"
msgstr ""
-#: sequencer.c:1107 sequencer.c:1673
-msgid "unable to parse commit author"
+#: refs/files-backend.c:1242 refs/packed-backend.c:1532
+#: refs/packed-backend.c:1542
+#, c-format
+msgid "could not delete reference %s: %s"
msgstr ""
-#: sequencer.c:1117 builtin/am.c:1630 builtin/merge.c:643
-msgid "git write-tree failed to write a tree"
+#: refs/files-backend.c:1245 refs/packed-backend.c:1545
+#, c-format
+msgid "could not delete references: %s"
msgstr ""
-#: sequencer.c:1134 sequencer.c:1186
+#: refspec.c:137
#, c-format
-msgid "unable to read commit message from '%s'"
+msgid "invalid refspec '%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"
+#: ref-filter.c:39 wt-status.c:1861
+msgid "gone"
msgstr ""
-#: sequencer.c:1213
+#: ref-filter.c:40
#, c-format
-msgid "could not parse commit %s"
+msgid "ahead %d"
msgstr ""
-#: sequencer.c:1218
+#: ref-filter.c:41
#, c-format
-msgid "could not parse parent commit %s"
+msgid "behind %d"
msgstr ""
-#: sequencer.c:1347
+#: ref-filter.c:42
#, c-format
-msgid ""
-"unexpected 1st line of squash message:\n"
-"\n"
-"\t%.*s"
+msgid "ahead %d, behind %d"
msgstr ""
-#: sequencer.c:1353
+#: ref-filter.c:138
#, c-format
-msgid ""
-"invalid 1st line of squash message:\n"
-"\n"
-"\t%.*s"
+msgid "expected format: %%(color:<color>)"
msgstr ""
-#: sequencer.c:1359 sequencer.c:1384
+#: ref-filter.c:140
#, c-format
-msgid "This is a combination of %d commits."
-msgstr ""
-
-#: sequencer.c:1368 sequencer.c:3265
-msgid "need a HEAD to fixup"
+msgid "unrecognized color: %%(color:%s)"
msgstr ""
-#: sequencer.c:1370
-msgid "could not read HEAD"
+#: ref-filter.c:162
+#, c-format
+msgid "Integer value expected refname:lstrip=%s"
msgstr ""
-#: sequencer.c:1372
-msgid "could not read HEAD's commit message"
+#: ref-filter.c:166
+#, c-format
+msgid "Integer value expected refname:rstrip=%s"
msgstr ""
-#: sequencer.c:1378
+#: ref-filter.c:168
#, c-format
-msgid "cannot write '%s'"
+msgid "unrecognized %%(%s) argument: %s"
msgstr ""
-#: sequencer.c:1387 git-rebase--interactive.sh:452
-msgid "This is the 1st commit message:"
+#: ref-filter.c:223
+#, c-format
+msgid "%%(objecttype) does not take arguments"
msgstr ""
-#: sequencer.c:1395
+#: ref-filter.c:245
#, c-format
-msgid "could not read commit message of %s"
+msgid "unrecognized %%(objectsize) argument: %s"
msgstr ""
-#: sequencer.c:1402
+#: ref-filter.c:253
#, c-format
-msgid "This is the commit message #%d:"
+msgid "%%(deltabase) does not take arguments"
msgstr ""
-#: sequencer.c:1407
+#: ref-filter.c:265
#, c-format
-msgid "The commit message #%d will be skipped:"
+msgid "%%(body) does not take arguments"
msgstr ""
-#: sequencer.c:1412
+#: ref-filter.c:274
#, c-format
-msgid "unknown command: %d"
+msgid "%%(subject) does not take arguments"
msgstr ""
-#: sequencer.c:1479
-msgid "your index file is unmerged."
+#: ref-filter.c:296
+#, c-format
+msgid "unknown %%(trailers) argument: %s"
msgstr ""
-#: sequencer.c:1498
+#: ref-filter.c:325
#, c-format
-msgid "commit %s is a merge but no -m option was given."
+msgid "positive value expected contents:lines=%s"
msgstr ""
-#: sequencer.c:1506
+#: ref-filter.c:327
#, c-format
-msgid "commit %s does not have parent %d"
+msgid "unrecognized %%(contents) argument: %s"
msgstr ""
-#: sequencer.c:1510
+#: ref-filter.c:342
#, c-format
-msgid "mainline was specified but commit %s is not a merge."
+msgid "positive value expected objectname:short=%s"
msgstr ""
-#: sequencer.c:1516
+#: ref-filter.c:346
#, c-format
-msgid "cannot get commit message for %s"
+msgid "unrecognized %%(objectname) argument: %s"
msgstr ""
-#. TRANSLATORS: The first %s will be a "todo" command like
-#. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:1535
+#: ref-filter.c:376
#, c-format
-msgid "%s: cannot parse parent commit %s"
+msgid "expected format: %%(align:<width>,<position>)"
msgstr ""
-#: sequencer.c:1600 sequencer.c:2397
+#: ref-filter.c:388
#, c-format
-msgid "could not rename '%s' to '%s'"
+msgid "unrecognized position:%s"
msgstr ""
-#: sequencer.c:1654
+#: ref-filter.c:395
#, c-format
-msgid "could not revert %s... %s"
+msgid "unrecognized width:%s"
msgstr ""
-#: sequencer.c:1655
+#: ref-filter.c:404
#, c-format
-msgid "could not apply %s... %s"
+msgid "unrecognized %%(align) argument: %s"
msgstr ""
-#: sequencer.c:1702
-msgid "empty commit set passed"
+#: ref-filter.c:412
+#, c-format
+msgid "positive width expected with the %%(align) atom"
msgstr ""
-#: sequencer.c:1712
+#: ref-filter.c:430
#, c-format
-msgid "git %s: failed to read the index"
+msgid "unrecognized %%(if) argument: %s"
msgstr ""
-#: sequencer.c:1718
+#: ref-filter.c:527
#, c-format
-msgid "git %s: failed to refresh the index"
+msgid "malformed field name: %.*s"
msgstr ""
-#: sequencer.c:1792
+#: ref-filter.c:554
#, c-format
-msgid "%s does not accept arguments: '%s'"
+msgid "unknown field name: %.*s"
msgstr ""
-#: sequencer.c:1801
+#: ref-filter.c:558
#, c-format
-msgid "missing arguments for %s"
+msgid ""
+"not a git repository, but the field '%.*s' requires access to object data"
msgstr ""
-#: sequencer.c:1844
+#: ref-filter.c:682
#, c-format
-msgid "invalid line %d: %.*s"
+msgid "format: %%(if) atom used without a %%(then) atom"
msgstr ""
-#: sequencer.c:1852
+#: ref-filter.c:745
#, c-format
-msgid "cannot '%s' without a previous commit"
+msgid "format: %%(then) atom used without an %%(if) atom"
msgstr ""
-#: sequencer.c:1883 sequencer.c:3056 sequencer.c:3091
+#: ref-filter.c:747
#, c-format
-msgid "could not read '%s'."
+msgid "format: %%(then) atom used more than once"
msgstr ""
-#: sequencer.c:1906
-msgid "please fix this using 'git rebase --edit-todo'."
+#: ref-filter.c:749
+#, c-format
+msgid "format: %%(then) atom used after %%(else)"
msgstr ""
-#: sequencer.c:1908
+#: ref-filter.c:777
#, c-format
-msgid "unusable instruction sheet: '%s'"
+msgid "format: %%(else) atom used without an %%(if) atom"
msgstr ""
-#: sequencer.c:1913
-msgid "no commits parsed."
+#: ref-filter.c:779
+#, c-format
+msgid "format: %%(else) atom used without a %%(then) atom"
msgstr ""
-#: sequencer.c:1924
-msgid "cannot cherry-pick during a revert."
+#: ref-filter.c:781
+#, c-format
+msgid "format: %%(else) atom used more than once"
msgstr ""
-#: sequencer.c:1926
-msgid "cannot revert during a cherry-pick."
+#: ref-filter.c:796
+#, c-format
+msgid "format: %%(end) atom used without corresponding atom"
msgstr ""
-#: sequencer.c:1993
+#: ref-filter.c:853
#, c-format
-msgid "invalid key: %s"
+msgid "malformed format string %s"
msgstr ""
-#: sequencer.c:1996
+#: ref-filter.c:1447
#, c-format
-msgid "invalid value for %s: %s"
+msgid "(no branch, rebasing %s)"
msgstr ""
-#: sequencer.c:2062
+#: ref-filter.c:1450
#, c-format
-msgid "malformed options sheet: '%s'"
+msgid "(no branch, rebasing detached HEAD %s)"
msgstr ""
-#: sequencer.c:2100
-msgid "a cherry-pick or revert is already in progress"
+#: ref-filter.c:1453
+#, c-format
+msgid "(no branch, bisect started on %s)"
msgstr ""
-#: sequencer.c:2101
-msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
+#. TRANSLATORS: make sure this matches "HEAD
+#. detached at " in wt-status.c
+#.
+#: ref-filter.c:1461
+#, c-format
+msgid "(HEAD detached at %s)"
msgstr ""
-#: sequencer.c:2104
+#. TRANSLATORS: make sure this matches "HEAD
+#. detached from " in wt-status.c
+#.
+#: ref-filter.c:1468
#, c-format
-msgid "could not create sequencer directory '%s'"
+msgid "(HEAD detached from %s)"
msgstr ""
-#: sequencer.c:2118
-msgid "could not lock HEAD"
+#: ref-filter.c:1472
+msgid "(no branch)"
msgstr ""
-#: sequencer.c:2173 sequencer.c:2761
-msgid "no cherry-pick or revert in progress"
+#: ref-filter.c:1506 ref-filter.c:1663
+#, c-format
+msgid "missing object %s for %s"
msgstr ""
-#: sequencer.c:2175
-msgid "cannot resolve HEAD"
+#: ref-filter.c:1516
+#, c-format
+msgid "parse_object_buffer failed on %s for %s"
msgstr ""
-#: sequencer.c:2177 sequencer.c:2212
-msgid "cannot abort from a branch yet to be born"
+#: ref-filter.c:1882
+#, c-format
+msgid "malformed object at '%s'"
msgstr ""
-#: sequencer.c:2198 builtin/grep.c:720
+#: ref-filter.c:1971
#, c-format
-msgid "cannot open '%s'"
+msgid "ignoring ref with broken name %s"
msgstr ""
-#: sequencer.c:2200
+#: ref-filter.c:2257
#, c-format
-msgid "cannot read '%s': %s"
+msgid "format: %%(end) atom missing"
msgstr ""
-#: sequencer.c:2201
-msgid "unexpected end of file"
+#: ref-filter.c:2352
+#, c-format
+msgid "option `%s' is incompatible with --merged"
msgstr ""
-#: sequencer.c:2207
+#: ref-filter.c:2355
#, c-format
-msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
+msgid "option `%s' is incompatible with --no-merged"
msgstr ""
-#: sequencer.c:2218
-msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
+#: ref-filter.c:2365
+#, c-format
+msgid "malformed object name %s"
msgstr ""
-#: sequencer.c:2324 sequencer.c:2679
+#: ref-filter.c:2370
#, c-format
-msgid "could not update %s"
+msgid "option `%s' must point to a commit"
msgstr ""
-#: sequencer.c:2362 sequencer.c:2659
-msgid "cannot read HEAD"
+#: remote.c:363
+#, c-format
+msgid "config remote shorthand cannot begin with '/': %s"
msgstr ""
-#: sequencer.c:2402 builtin/difftool.c:639
-#, c-format
-msgid "could not copy '%s' to '%s'"
+#: remote.c:410
+msgid "more than one receivepack given, using the first"
msgstr ""
-#: sequencer.c:2421
-msgid "could not read index"
+#: remote.c:418
+msgid "more than one uploadpack given, using the first"
msgstr ""
-#: sequencer.c:2426
+#: remote.c:608
#, c-format
-msgid ""
-"execution failed: %s\n"
-"%sYou can fix the problem, and then run\n"
-"\n"
-" git rebase --continue\n"
-"\n"
+msgid "Cannot fetch both %s and %s to %s"
msgstr ""
-#: sequencer.c:2432
-msgid "and made changes to the index and/or the working tree\n"
+#: remote.c:612
+#, c-format
+msgid "%s usually tracks %s, not %s"
msgstr ""
-#: sequencer.c:2438
+#: remote.c:616
#, c-format
-msgid ""
-"execution succeeded: %s\n"
-"but left changes to the index and/or the working tree\n"
-"Commit or stash your changes, and then run\n"
-"\n"
-" git rebase --continue\n"
-"\n"
+msgid "%s tracks both %s and %s"
msgstr ""
-#: sequencer.c:2497
+#: remote.c:684
#, c-format
-msgid "Applied autostash.\n"
+msgid "key '%s' of pattern had no '*'"
msgstr ""
-#: sequencer.c:2509
+#: remote.c:694
#, c-format
-msgid "cannot store %s"
+msgid "value '%s' of pattern has no '*'"
msgstr ""
-#: sequencer.c:2512 git-rebase.sh:178
+#: remote.c:1000
#, 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 "src refspec %s does not match any"
msgstr ""
-#: sequencer.c:2595
+#: remote.c:1005
#, c-format
-msgid "Stopped at %s... %.*s\n"
+msgid "src refspec %s matches more than one"
msgstr ""
-#: sequencer.c:2637
+#. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push
+#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
+#. the <src>.
+#.
+#: remote.c:1020
#, c-format
-msgid "unknown command %d"
+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 ""
-#: sequencer.c:2667
-msgid "could not read orig-head"
+#: remote.c:1040
+#, c-format
+msgid ""
+"The <src> part of the refspec is a commit object.\n"
+"Did you mean to create a new branch by pushing to\n"
+"'%s:refs/heads/%s'?"
msgstr ""
-#: sequencer.c:2672 sequencer.c:3262
-msgid "could not read 'onto'"
+#: remote.c:1045
+#, c-format
+msgid ""
+"The <src> part of the refspec is a tag object.\n"
+"Did you mean to create a new tag by pushing to\n"
+"'%s:refs/tags/%s'?"
msgstr ""
-#: sequencer.c:2686
+#: remote.c:1050
#, c-format
-msgid "could not update HEAD to %s"
+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 ""
-#: sequencer.c:2770
-msgid "cannot rebase: You have unstaged changes."
+#: remote.c:1055
+#, c-format
+msgid ""
+"The <src> part of the refspec is a blob object.\n"
+"Did you mean to tag a new blob by pushing to\n"
+"'%s:refs/tags/%s'?"
msgstr ""
-#: sequencer.c:2775
-msgid "could not remove CHERRY_PICK_HEAD"
+#: remote.c:1091
+#, c-format
+msgid "%s cannot be resolved to branch"
msgstr ""
-#: sequencer.c:2784
-msgid "cannot amend non-existing commit"
+#: remote.c:1102
+#, c-format
+msgid "unable to delete '%s': remote ref does not exist"
msgstr ""
-#: sequencer.c:2786
+#: remote.c:1114
#, c-format
-msgid "invalid file: '%s'"
+msgid "dst refspec %s matches more than one"
msgstr ""
-#: sequencer.c:2788
+#: remote.c:1121
#, c-format
-msgid "invalid contents: '%s'"
+msgid "dst ref %s receives from more than one src"
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."
+#: remote.c:1624 remote.c:1725
+msgid "HEAD does not point to a branch"
msgstr ""
-#: sequencer.c:2801
-msgid "could not commit staged changes."
+#: remote.c:1633
+#, c-format
+msgid "no such branch: '%s'"
msgstr ""
-#: sequencer.c:2881
+#: remote.c:1636
#, c-format
-msgid "%s: can't cherry-pick a %s"
+msgid "no upstream configured for branch '%s'"
msgstr ""
-#: sequencer.c:2885
+#: remote.c:1642
#, c-format
-msgid "%s: bad revision"
+msgid "upstream branch '%s' not stored as a remote-tracking branch"
msgstr ""
-#: sequencer.c:2918
-msgid "can't revert as initial commit"
+#: remote.c:1657
+#, c-format
+msgid "push destination '%s' on remote '%s' has no local tracking branch"
msgstr ""
-#: sequencer.c:3023
-msgid "make_script: unhandled options"
+#: remote.c:1669
+#, c-format
+msgid "branch '%s' has no remote for pushing"
msgstr ""
-#: sequencer.c:3026
-msgid "make_script: error preparing revisions"
+#: remote.c:1679
+#, c-format
+msgid "push refspecs for '%s' do not include '%s'"
msgstr ""
-#: sequencer.c:3060 sequencer.c:3095
-#, c-format
-msgid "unusable todo list: '%s'"
+#: remote.c:1692
+msgid "push has no destination (push.default is 'nothing')"
msgstr ""
-#: sequencer.c:3146
-#, c-format
-msgid ""
-"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
+#: remote.c:1714
+msgid "cannot resolve 'simple' push to a single destination"
msgstr ""
-#: sequencer.c:3212
+#: remote.c:1840
#, c-format
-msgid ""
-"Warning: some commits may have been dropped accidentally.\n"
-"Dropped commits (newer to older):\n"
+msgid "couldn't find remote ref %s"
msgstr ""
-#: sequencer.c:3219
+#: remote.c:1853
#, 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 "* Ignoring funny ref '%s' locally"
msgstr ""
-#: sequencer.c:3231
+#: remote.c:1990
#, 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 "Your branch is based on '%s', but the upstream is gone.\n"
msgstr ""
-#: sequencer.c:3244 sequencer.c:3304 wrapper.c:225 wrapper.c:395
-#: builtin/am.c:779
-#, c-format
-msgid "could not open '%s' for writing"
+#: remote.c:1994
+msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr ""
-#: sequencer.c:3285
+#: remote.c:1997
#, c-format
-msgid "could not parse commit '%s'"
+msgid "Your branch is up to date with '%s'.\n"
msgstr ""
-#: sequencer.c:3401
-msgid "the script was already rearranged."
+#: remote.c:2001
+#, c-format
+msgid "Your branch and '%s' refer to different commits.\n"
msgstr ""
-#: setup.c:122
+#: remote.c:2004
#, c-format
-msgid "'%s' is outside repository"
+msgid " (use \"%s\" for details)\n"
msgstr ""
-#: setup.c:171
+#: remote.c:2008
#, 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 "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:2014
+msgid " (use \"git push\" to publish your local commits)\n"
msgstr ""
-#: setup.c:184
+#: remote.c:2017
#, 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 "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:2025
+msgid " (use \"git pull\" to update your local branch)\n"
msgstr ""
-#: setup.c:233
+#: remote.c:2028
#, c-format
-msgid "option '%s' must come before non-option arguments"
+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:2038
+msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr ""
-#: setup.c:252
+#: remote.c:2221
#, 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 "cannot parse expected object name '%s'"
msgstr ""
-#: setup.c:388
-msgid "unable to set up work tree using invalid config"
+#: replace-object.c:21
+#, c-format
+msgid "bad replace ref name: %s"
msgstr ""
-#: setup.c:395
-msgid "this operation must be run in a work tree"
+#: replace-object.c:30
+#, c-format
+msgid "duplicate replace ref: %s"
msgstr ""
-#: setup.c:506
+#: replace-object.c:73
#, c-format
-msgid "Expected git repo version <= %d, found %d"
+msgid "replace depth too high for object %s"
msgstr ""
-#: setup.c:514
-msgid "unknown repository extensions found:"
+#: rerere.c:217 rerere.c:226 rerere.c:229
+msgid "corrupt MERGE_RR"
msgstr ""
-#: setup.c:533
-#, c-format
-msgid "error opening '%s'"
+#: rerere.c:264 rerere.c:269
+msgid "unable to write rerere record"
msgstr ""
-#: setup.c:535
+#: rerere.c:485 rerere.c:692 sequencer.c:3186 sequencer.c:3212
+#: builtin/fsck.c:314
#, c-format
-msgid "too large to be a .git file: '%s'"
+msgid "could not write '%s'"
msgstr ""
-#: setup.c:537
+#: rerere.c:495
#, c-format
-msgid "error reading %s"
+msgid "there were errors while writing '%s' (%s)"
msgstr ""
-#: setup.c:539
+#: rerere.c:498
#, c-format
-msgid "invalid gitfile format: %s"
+msgid "failed to flush '%s'"
msgstr ""
-#: setup.c:541
+#: rerere.c:503 rerere.c:1039
#, c-format
-msgid "no path in gitfile: %s"
+msgid "could not parse conflict hunks in '%s'"
msgstr ""
-#: setup.c:543
+#: rerere.c:684
#, c-format
-msgid "not a git repository: %s"
+msgid "failed utime() on '%s'"
msgstr ""
-#: setup.c:642
+#: rerere.c:694
#, c-format
-msgid "'$%s' too big"
+msgid "writing '%s' failed"
msgstr ""
-#: setup.c:656
+#: rerere.c:714
#, c-format
-msgid "not a git repository: '%s'"
+msgid "Staged '%s' using previous resolution."
msgstr ""
-#: setup.c:685 setup.c:687 setup.c:718
+#: rerere.c:753
#, c-format
-msgid "cannot chdir to '%s'"
+msgid "Recorded resolution for '%s'."
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"
+#: rerere.c:788
+#, c-format
+msgid "Resolved '%s' using previous resolution."
msgstr ""
-#: setup.c:816
+#: rerere.c:803
#, c-format
-msgid "not a git repository (or any of the parent directories): %s"
+msgid "cannot unlink stray '%s'"
msgstr ""
-#: setup.c:827
+#: rerere.c:807
#, c-format
-msgid "failed to stat '%*s%s%s'"
+msgid "Recorded preimage for '%s'"
msgstr ""
-#: setup.c:1057
-msgid "Unable to read current working directory"
+#: rerere.c:881 submodule.c:2012 builtin/submodule--helper.c:1417
+#: builtin/submodule--helper.c:1427
+#, c-format
+msgid "could not create directory '%s'"
msgstr ""
-#: setup.c:1069 setup.c:1075
+#: rerere.c:1057
#, c-format
-msgid "cannot change to '%s'"
+msgid "failed to update conflicted state in '%s'"
msgstr ""
-#: setup.c:1088
+#: rerere.c:1068 rerere.c:1075
#, c-format
-msgid ""
-"not a git repository (or any parent up to mount point %s)\n"
-"Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."
+msgid "no remembered resolution for '%s'"
msgstr ""
-#: setup.c:1172
+#: rerere.c:1077
#, c-format
-msgid ""
-"problem with core.sharedRepository filemode value (0%.3o).\n"
-"The owner of files must always have read and write permissions."
+msgid "cannot unlink '%s'"
msgstr ""
-#: setup.c:1215
-msgid "open /dev/null or dup failed"
+#: rerere.c:1087
+#, c-format
+msgid "Updated preimage for '%s'"
msgstr ""
-#: setup.c:1230
-msgid "fork failed"
+#: rerere.c:1096
+#, c-format
+msgid "Forgot resolution for '%s'\n"
msgstr ""
-#: setup.c:1235
-msgid "setsid failed"
+#: rerere.c:1199
+msgid "unable to open rr-cache directory"
msgstr ""
-#: sha1_file.c:592
-#, c-format
-msgid "path '%s' does not exist"
+#: revision.c:2484
+msgid "your current branch appears to be broken"
msgstr ""
-#: sha1_file.c:618
+#: revision.c:2487
#, c-format
-msgid "reference repository '%s' as a linked checkout is not supported yet."
+msgid "your current branch '%s' does not have any commits yet"
msgstr ""
-#: sha1_file.c:624
-#, c-format
-msgid "reference repository '%s' is not a local repository."
+#: revision.c:2684
+msgid "--first-parent is incompatible with --bisect"
msgstr ""
-#: sha1_file.c:630
-#, c-format
-msgid "reference repository '%s' is shallow"
+#: run-command.c:742
+msgid "open /dev/null failed"
msgstr ""
-#: sha1_file.c:638
+#: run-command.c:1231
#, c-format
-msgid "reference repository '%s' is grafted"
+msgid "cannot create async thread: %s"
msgstr ""
-#: sha1_name.c:422
+#: run-command.c:1295
#, c-format
-msgid "short SHA1 %s is ambiguous"
+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 ""
-#: sha1_name.c:433
-msgid "The candidates are:"
+#: send-pack.c:141
+msgid "unexpected flush packet while reading remote unpack status"
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\""
+#: send-pack.c:143
+#, c-format
+msgid "unable to parse remote unpack status: %s"
msgstr ""
-#: submodule.c:96 submodule.c:130
-msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
+#: send-pack.c:145
+#, c-format
+msgid "remote unpack failed: %s"
msgstr ""
-#: submodule.c:100 submodule.c:134
-#, c-format
-msgid "Could not find section in .gitmodules where path=%s"
+#: send-pack.c:306
+msgid "failed to sign the push certificate"
msgstr ""
-#: submodule.c:108
-#, c-format
-msgid "Could not update .gitmodules entry %s"
+#: send-pack.c:420
+msgid "the receiving end does not support --signed push"
msgstr ""
-#: submodule.c:141
-#, c-format
-msgid "Could not remove .gitmodules entry for %s"
+#: send-pack.c:422
+msgid ""
+"not sending a push certificate since the receiving end does not support --"
+"signed push"
msgstr ""
-#: submodule.c:152
-msgid "staging updated .gitmodules failed"
+#: send-pack.c:434
+msgid "the receiving end does not support --atomic push"
msgstr ""
-#: submodule.c:312
-#, c-format
-msgid "in unpopulated submodule '%s'"
+#: send-pack.c:439
+msgid "the receiving end does not support push options"
msgstr ""
-#: submodule.c:343
+#: sequencer.c:184
#, c-format
-msgid "Pathspec '%s' is in submodule '%.*s'"
+msgid "invalid commit message cleanup mode '%s'"
msgstr ""
-#: submodule.c:833
+#: sequencer.c:288
#, c-format
-msgid "submodule entry '%s' (%s) is a %s, not a commit"
+msgid "could not delete '%s'"
msgstr ""
-#: submodule.c:1065 builtin/branch.c:648 builtin/submodule--helper.c:1724
-msgid "Failed to resolve HEAD as a valid ref."
+#: sequencer.c:314
+msgid "revert"
msgstr ""
-#: submodule.c:1370
-#, c-format
-msgid "'%s' not recognized as a git repository"
+#: sequencer.c:316
+msgid "cherry-pick"
msgstr ""
-#: submodule.c:1508
-#, c-format
-msgid "could not start 'git status' in submodule '%s'"
+#: sequencer.c:318
+msgid "rebase -i"
msgstr ""
-#: submodule.c:1521
+#: sequencer.c:320
#, c-format
-msgid "could not run 'git status' in submodule '%s'"
+msgid "unknown action: %d"
msgstr ""
-#: submodule.c:1614
-#, c-format
-msgid "submodule '%s' has dirty index"
+#: sequencer.c:378
+msgid ""
+"after resolving the conflicts, mark the corrected paths\n"
+"with 'git add <paths>' or 'git rm <paths>'"
msgstr ""
-#: submodule.c:1878
-#, c-format
+#: sequencer.c:381
msgid ""
-"relocate_gitdir for submodule '%s' with more than one worktree not supported"
+"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 ""
-#: submodule.c:1890 submodule.c:1946
+#: sequencer.c:394 sequencer.c:2671
#, c-format
-msgid "could not lookup name for submodule '%s'"
+msgid "could not lock '%s'"
msgstr ""
-#: submodule.c:1894 builtin/submodule--helper.c:1246
-#: builtin/submodule--helper.c:1256
+#: sequencer.c:401
#, c-format
-msgid "could not create directory '%s'"
+msgid "could not write eol to '%s'"
msgstr ""
-#: submodule.c:1897
+#: sequencer.c:406 sequencer.c:2554 sequencer.c:2677 sequencer.c:2691
+#: sequencer.c:2931
#, c-format
-msgid ""
-"Migrating git directory of '%s%s' from\n"
-"'%s' to\n"
-"'%s'\n"
+msgid "failed to finalize '%s'"
msgstr ""
-#: submodule.c:1981
+#: sequencer.c:429 sequencer.c:931 sequencer.c:1615 sequencer.c:2574
+#: sequencer.c:2913 sequencer.c:3022 builtin/am.c:245 builtin/commit.c:748
+#: builtin/merge.c:1085 builtin/rebase.c:154
#, c-format
-msgid "could not recurse into submodule '%s'"
+msgid "could not read '%s'"
msgstr ""
-#: submodule.c:2025
-msgid "could not start ls-files in .."
+#: sequencer.c:455
+#, c-format
+msgid "your local changes would be overwritten by %s."
msgstr ""
-#: submodule.c:2045
-msgid "BUG: returned path string doesn't match cwd?"
+#: sequencer.c:459
+msgid "commit your changes or stash them to proceed."
msgstr ""
-#: submodule.c:2064
+#: sequencer.c:491
#, c-format
-msgid "ls-tree returned unexpected return code %d"
-msgstr ""
-
-#: submodule-config.c:263
-msgid "negative values not allowed for submodule.fetchjobs"
+msgid "%s: fast-forward"
msgstr ""
-#: submodule-config.c:436
+#. TRANSLATORS: %s will be "revert", "cherry-pick" or
+#. "rebase -i".
+#.
+#: sequencer.c:582
#, c-format
-msgid "invalid value for %s"
+msgid "%s: Unable to write new index file"
msgstr ""
-#: trailer.c:238
-#, c-format
-msgid "running trailer command '%s' failed"
+#: sequencer.c:598
+msgid "unable to update cache tree"
msgstr ""
-#: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553
-#: trailer.c:557
-#, c-format
-msgid "unknown value '%s' for key '%s'"
+#: sequencer.c:612
+msgid "could not resolve HEAD commit"
msgstr ""
-#: trailer.c:539 trailer.c:544 builtin/remote.c:290
+#: sequencer.c:692
#, c-format
-msgid "more than one %s"
+msgid "no key present in '%.*s'"
msgstr ""
-#: trailer.c:730
+#: sequencer.c:703
#, c-format
-msgid "empty trailer token in trailer '%.*s'"
+msgid "unable to dequote value of '%s'"
msgstr ""
-#: trailer.c:750
+#: sequencer.c:740 wrapper.c:227 wrapper.c:397 builtin/am.c:704
+#: builtin/am.c:796 builtin/merge.c:1082 builtin/rebase.c:617
#, c-format
-msgid "could not read input file '%s'"
+msgid "could not open '%s' for reading"
msgstr ""
-#: trailer.c:753
-msgid "could not read from stdin"
+#: sequencer.c:750
+msgid "'GIT_AUTHOR_NAME' already given"
msgstr ""
-#: trailer.c:1008 builtin/am.c:46
-#, c-format
-msgid "could not stat %s"
+#: sequencer.c:755
+msgid "'GIT_AUTHOR_EMAIL' already given"
msgstr ""
-#: trailer.c:1010
-#, c-format
-msgid "file %s is not a regular file"
+#: sequencer.c:760
+msgid "'GIT_AUTHOR_DATE' already given"
msgstr ""
-#: trailer.c:1012
+#: sequencer.c:764
#, c-format
-msgid "file %s is not writable by user"
-msgstr ""
-
-#: trailer.c:1024
-msgid "could not open temporary file"
+msgid "unknown variable '%s'"
msgstr ""
-#: trailer.c:1064
-#, c-format
-msgid "could not rename temporary file to %s"
+#: sequencer.c:769
+msgid "missing 'GIT_AUTHOR_NAME'"
msgstr ""
-#: transport.c:63
-#, c-format
-msgid "Would set upstream of '%s' to '%s' of '%s'\n"
+#: sequencer.c:771
+msgid "missing 'GIT_AUTHOR_EMAIL'"
msgstr ""
-#: transport.c:152
-#, c-format
-msgid "transport: invalid depth option '%s'"
+#: sequencer.c:773
+msgid "missing 'GIT_AUTHOR_DATE'"
msgstr ""
-#: transport.c:916
+#: sequencer.c:833
#, c-format
-msgid ""
-"The following submodule paths contain changes that can\n"
-"not be found on any remote:\n"
+msgid "invalid date format '%s' in '%s'"
msgstr ""
-#: transport.c:920
+#: sequencer.c:850
#, 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"
-"Please try\n"
+" git commit --amend %s\n"
"\n"
-"\tgit push --recurse-submodules=on-demand\n"
+"If they are meant to go into a new commit, run:\n"
"\n"
-"or cd to the path and use\n"
+" git commit %s\n"
"\n"
-"\tgit push\n"
-"\n"
-"to push them to a remote.\n"
+"In both cases, once you're done, continue with:\n"
"\n"
+" git rebase --continue\n"
msgstr ""
-#: transport.c:928
-msgid "Aborting."
+#: sequencer.c:945
+msgid "writing root commit"
msgstr ""
-#: transport-helper.c:1079
-#, c-format
-msgid "Could not read ref %s"
+#: sequencer.c:1155
+msgid "'prepare-commit-msg' hook failed"
msgstr ""
-#: tree-walk.c:31
-msgid "too-short tree object"
+#: sequencer.c:1162
+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 ""
-#: tree-walk.c:37
-msgid "malformed mode in tree entry"
+#: sequencer.c:1175
+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 ""
-#: tree-walk.c:41
-msgid "empty filename in tree entry"
+#: sequencer.c:1217
+msgid "couldn't look up newly created commit"
msgstr ""
-#: tree-walk.c:114
-msgid "too-short tree file"
+#: sequencer.c:1219
+msgid "could not parse newly created commit"
msgstr ""
-#: unpack-trees.c:108
-#, 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."
+#: sequencer.c:1265
+msgid "unable to resolve HEAD after creating commit"
msgstr ""
-#: unpack-trees.c:110
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by checkout:\n"
-"%%s"
+#: sequencer.c:1267
+msgid "detached HEAD"
msgstr ""
-#: unpack-trees.c:113
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by merge:\n"
-"%%sPlease commit your changes or stash them before you merge."
+#: sequencer.c:1271
+msgid " (root-commit)"
msgstr ""
-#: unpack-trees.c:115
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by merge:\n"
-"%%s"
+#: sequencer.c:1292
+msgid "could not parse HEAD"
msgstr ""
-#: unpack-trees.c:118
+#: sequencer.c:1294
#, 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 "HEAD %s is not a commit!"
msgstr ""
-#: unpack-trees.c:120
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by %s:\n"
-"%%s"
+#: sequencer.c:1298 builtin/commit.c:1546
+msgid "could not parse HEAD commit"
msgstr ""
-#: unpack-trees.c:125
-#, c-format
-msgid ""
-"Updating the following directories would lose untracked files in them:\n"
-"%s"
+#: sequencer.c:1350 sequencer.c:1964
+msgid "unable to parse commit author"
msgstr ""
-#: unpack-trees.c:129
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by checkout:\n"
-"%%sPlease move or remove them before you switch branches."
+#: sequencer.c:1360 builtin/am.c:1570 builtin/merge.c:678
+msgid "git write-tree failed to write a tree"
msgstr ""
-#: unpack-trees.c:131
+#: sequencer.c:1377 sequencer.c:1433
#, c-format
-msgid ""
-"The following untracked working tree files would be removed by checkout:\n"
-"%%s"
+msgid "unable to read commit message from '%s'"
msgstr ""
-#: unpack-trees.c:134
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by merge:\n"
-"%%sPlease move or remove them before you merge."
+#: sequencer.c:1399 builtin/am.c:1591 builtin/commit.c:1649 builtin/merge.c:859
+#: builtin/merge.c:884
+msgid "failed to write commit object"
msgstr ""
-#: unpack-trees.c:136
+#: sequencer.c:1460
#, c-format
-msgid ""
-"The following untracked working tree files would be removed by merge:\n"
-"%%s"
+msgid "could not parse commit %s"
msgstr ""
-#: unpack-trees.c:139
+#: sequencer.c:1465
#, c-format
-msgid ""
-"The following untracked working tree files would be removed by %s:\n"
-"%%sPlease move or remove them before you %s."
+msgid "could not parse parent commit %s"
msgstr ""
-#: unpack-trees.c:141
+#: sequencer.c:1565 sequencer.c:1675
#, c-format
-msgid ""
-"The following untracked working tree files would be removed by %s:\n"
-"%%s"
+msgid "unknown command: %d"
msgstr ""
-#: unpack-trees.c:146
+#: sequencer.c:1622 sequencer.c:1647
#, 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 "This is a combination of %d commits."
msgstr ""
-#: unpack-trees.c:148
-#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by "
-"checkout:\n"
-"%%s"
+#: sequencer.c:1632 sequencer.c:4808
+msgid "need a HEAD to fixup"
msgstr ""
-#: unpack-trees.c:151
-#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by merge:\n"
-"%%sPlease move or remove them before you merge."
+#: sequencer.c:1634 sequencer.c:2958
+msgid "could not read HEAD"
msgstr ""
-#: unpack-trees.c:153
-#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by merge:\n"
-"%%s"
+#: sequencer.c:1636
+msgid "could not read HEAD's commit message"
msgstr ""
-#: unpack-trees.c:156
+#: sequencer.c:1642
#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by %s:\n"
-"%%sPlease move or remove them before you %s."
+msgid "cannot write '%s'"
msgstr ""
-#: unpack-trees.c:158
-#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by %s:\n"
-"%%s"
+#: sequencer.c:1649 git-rebase--preserve-merges.sh:441
+msgid "This is the 1st commit message:"
msgstr ""
-#: unpack-trees.c:165
+#: sequencer.c:1657
#, c-format
-msgid "Entry '%s' overlaps with '%s'. Cannot bind."
+msgid "could not read commit message of %s"
msgstr ""
-#: unpack-trees.c:168
+#: sequencer.c:1664
#, c-format
-msgid ""
-"Cannot update sparse checkout: the following entries are not up to date:\n"
-"%s"
+msgid "This is the commit message #%d:"
msgstr ""
-#: unpack-trees.c:170
+#: sequencer.c:1670
#, c-format
-msgid ""
-"The following working tree files would be overwritten by sparse checkout "
-"update:\n"
-"%s"
+msgid "The commit message #%d will be skipped:"
msgstr ""
-#: unpack-trees.c:172
-#, c-format
-msgid ""
-"The following working tree files would be removed by sparse checkout "
-"update:\n"
-"%s"
+#: sequencer.c:1758
+msgid "your index file is unmerged."
msgstr ""
-#: unpack-trees.c:174
-#, c-format
-msgid ""
-"Cannot update submodule:\n"
-"%s"
+#: sequencer.c:1765
+msgid "cannot fixup root commit"
msgstr ""
-#: unpack-trees.c:251
+#: sequencer.c:1784
#, c-format
-msgid "Aborting\n"
-msgstr ""
-
-#: unpack-trees.c:333
-msgid "Checking out files"
-msgstr ""
-
-#: urlmatch.c:163
-msgid "invalid URL scheme name or missing '://' suffix"
+msgid "commit %s is a merge but no -m option was given."
msgstr ""
-#: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405
+#: sequencer.c:1792 sequencer.c:1800
#, c-format
-msgid "invalid %XX escape sequence"
+msgid "commit %s does not have parent %d"
msgstr ""
-#: urlmatch.c:215
-msgid "missing host and scheme is not 'file:'"
+#: sequencer.c:1806
+#, c-format
+msgid "cannot get commit message for %s"
msgstr ""
-#: urlmatch.c:232
-msgid "a 'file:' URL may not have a port number"
+#. TRANSLATORS: The first %s will be a "todo" command like
+#. "revert" or "pick", the second %s a SHA1.
+#: sequencer.c:1825
+#, c-format
+msgid "%s: cannot parse parent commit %s"
msgstr ""
-#: urlmatch.c:247
-msgid "invalid characters in host name"
+#: sequencer.c:1890
+#, c-format
+msgid "could not rename '%s' to '%s'"
msgstr ""
-#: urlmatch.c:292 urlmatch.c:303
-msgid "invalid port number"
+#: sequencer.c:1945
+#, c-format
+msgid "could not revert %s... %s"
msgstr ""
-#: urlmatch.c:371
-msgid "invalid '..' path segment"
+#: sequencer.c:1946
+#, c-format
+msgid "could not apply %s... %s"
msgstr ""
-#: worktree.c:245 builtin/am.c:2147
+#: sequencer.c:2005
#, c-format
-msgid "failed to read '%s'"
+msgid "git %s: failed to read the index"
msgstr ""
-#: worktree.c:291
+#: sequencer.c:2012
#, c-format
-msgid "'%s' at main working tree is not the repository directory"
+msgid "git %s: failed to refresh the index"
msgstr ""
-#: worktree.c:302
+#: sequencer.c:2094
#, c-format
-msgid "'%s' file does not contain absolute path to the working tree location"
+msgid "%s does not accept arguments: '%s'"
msgstr ""
-#: worktree.c:314
+#: sequencer.c:2103
#, c-format
-msgid "'%s' does not exist"
+msgid "missing arguments for %s"
msgstr ""
-#: worktree.c:320
+#: sequencer.c:2163
#, c-format
-msgid "'%s' is not a .git file, error code %d"
+msgid "invalid line %d: %.*s"
msgstr ""
-#: worktree.c:328
+#: sequencer.c:2171
#, c-format
-msgid "'%s' does not point back to '%s'"
+msgid "cannot '%s' without a previous commit"
msgstr ""
-#: wrapper.c:223 wrapper.c:393
-#, c-format
-msgid "could not open '%s' for reading and writing"
+#: sequencer.c:2243
+msgid "please fix this using 'git rebase --edit-todo'."
msgstr ""
-#: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:770
-#: builtin/am.c:862 builtin/merge.c:1044
+#: sequencer.c:2245
#, c-format
-msgid "could not open '%s' for reading"
+msgid "unusable instruction sheet: '%s'"
msgstr ""
-#: wrapper.c:424 wrapper.c:624
-#, c-format
-msgid "unable to access '%s'"
+#: sequencer.c:2250
+msgid "no commits parsed."
msgstr ""
-#: wrapper.c:632
-msgid "unable to get current working directory"
+#: sequencer.c:2261
+msgid "cannot cherry-pick during a revert."
msgstr ""
-#: wt-status.c:151
-msgid "Unmerged paths:"
+#: sequencer.c:2263
+msgid "cannot revert during a cherry-pick."
msgstr ""
-#: wt-status.c:178 wt-status.c:205
+#: sequencer.c:2333
#, c-format
-msgid " (use \"git reset %s <file>...\" to unstage)"
+msgid "invalid value for %s: %s"
msgstr ""
-#: wt-status.c:180 wt-status.c:207
-msgid " (use \"git rm --cached <file>...\" to unstage)"
+#: sequencer.c:2420
+msgid "unusable squash-onto"
msgstr ""
-#: wt-status.c:184
-msgid " (use \"git add <file>...\" to mark resolution)"
+#: sequencer.c:2436
+#, c-format
+msgid "malformed options sheet: '%s'"
msgstr ""
-#: wt-status.c:186 wt-status.c:190
-msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
+#: sequencer.c:2518 sequencer.c:4067
+msgid "empty commit set passed"
msgstr ""
-#: wt-status.c:188
-msgid " (use \"git rm <file>...\" to mark resolution)"
+#: sequencer.c:2526
+msgid "a cherry-pick or revert is already in progress"
msgstr ""
-#: wt-status.c:199 wt-status.c:1007
-msgid "Changes to be committed:"
+#: sequencer.c:2527
+msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
msgstr ""
-#: wt-status.c:217 wt-status.c:1016
-msgid "Changes not staged for commit:"
+#: sequencer.c:2530
+#, c-format
+msgid "could not create sequencer directory '%s'"
msgstr ""
-#: wt-status.c:221
-msgid " (use \"git add <file>...\" to update what will be committed)"
+#: sequencer.c:2544
+msgid "could not lock HEAD"
msgstr ""
-#: wt-status.c:223
-msgid " (use \"git add/rm <file>...\" to update what will be committed)"
+#: sequencer.c:2599 sequencer.c:3819
+msgid "no cherry-pick or revert in progress"
msgstr ""
-#: wt-status.c:224
-msgid ""
-" (use \"git checkout -- <file>...\" to discard changes in working directory)"
+#: sequencer.c:2601
+msgid "cannot resolve HEAD"
msgstr ""
-#: wt-status.c:226
-msgid " (commit or discard the untracked or modified content in submodules)"
+#: sequencer.c:2603 sequencer.c:2638
+msgid "cannot abort from a branch yet to be born"
msgstr ""
-#: wt-status.c:238
+#: sequencer.c:2624 builtin/grep.c:732
#, c-format
-msgid " (use \"git %s <file>...\" to include in what will be committed)"
+msgid "cannot open '%s'"
msgstr ""
-#: wt-status.c:253
-msgid "both deleted:"
+#: sequencer.c:2626
+#, c-format
+msgid "cannot read '%s': %s"
msgstr ""
-#: wt-status.c:255
-msgid "added by us:"
+#: sequencer.c:2627
+msgid "unexpected end of file"
msgstr ""
-#: wt-status.c:257
-msgid "deleted by them:"
+#: sequencer.c:2633
+#, c-format
+msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr ""
-#: wt-status.c:259
-msgid "added by them:"
+#: sequencer.c:2644
+msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr ""
-#: wt-status.c:261
-msgid "deleted by us:"
+#: sequencer.c:2750 sequencer.c:3735
+#, c-format
+msgid "could not update %s"
msgstr ""
-#: wt-status.c:263
-msgid "both added:"
+#: sequencer.c:2788 sequencer.c:3715
+msgid "cannot read HEAD"
msgstr ""
-#: wt-status.c:265
-msgid "both modified:"
+#: sequencer.c:2805
+#, c-format
+msgid "unable to copy '%s' to '%s'"
msgstr ""
-#: wt-status.c:275
-msgid "new file:"
+#: sequencer.c:2813
+#, c-format
+msgid ""
+"You can amend the commit now, with\n"
+"\n"
+" git commit --amend %s\n"
+"\n"
+"Once you are satisfied with your changes, run\n"
+"\n"
+" git rebase --continue\n"
msgstr ""
-#: wt-status.c:277
-msgid "copied:"
+#: sequencer.c:2823
+#, c-format
+msgid "Could not apply %s... %.*s"
msgstr ""
-#: wt-status.c:279
-msgid "deleted:"
+#: sequencer.c:2830
+#, c-format
+msgid "Could not merge %.*s"
msgstr ""
-#: wt-status.c:281
-msgid "modified:"
+#: sequencer.c:2844 sequencer.c:2848 builtin/difftool.c:641
+#, c-format
+msgid "could not copy '%s' to '%s'"
msgstr ""
-#: wt-status.c:283
-msgid "renamed:"
+#: sequencer.c:2870 sequencer.c:3293 builtin/rebase.c:424 builtin/rebase.c:1230
+#: builtin/rebase.c:1591 builtin/rebase.c:1646
+msgid "could not read index"
msgstr ""
-#: wt-status.c:285
-msgid "typechange:"
+#: sequencer.c:2875
+#, c-format
+msgid ""
+"execution failed: %s\n"
+"%sYou can fix the problem, and then run\n"
+"\n"
+" git rebase --continue\n"
+"\n"
msgstr ""
-#: wt-status.c:287
-msgid "unknown:"
+#: sequencer.c:2881
+msgid "and made changes to the index and/or the working tree\n"
msgstr ""
-#: wt-status.c:289
-msgid "unmerged:"
+#: sequencer.c:2887
+#, c-format
+msgid ""
+"execution succeeded: %s\n"
+"but left changes to the index and/or the working tree\n"
+"Commit or stash your changes, and then run\n"
+"\n"
+" git rebase --continue\n"
+"\n"
msgstr ""
-#: wt-status.c:369
-msgid "new commits, "
+#: sequencer.c:2948
+#, c-format
+msgid "illegal label name: '%.*s'"
msgstr ""
-#: wt-status.c:371
-msgid "modified content, "
+#: sequencer.c:3002
+msgid "writing fake root commit"
msgstr ""
-#: wt-status.c:373
-msgid "untracked content, "
+#: sequencer.c:3007
+msgid "writing squash-onto"
msgstr ""
-#: wt-status.c:847
+#: sequencer.c:3045 builtin/rebase.c:429 builtin/rebase.c:435
#, c-format
-msgid "Your stash currently has %d entry"
-msgid_plural "Your stash currently has %d entries"
-msgstr[0] ""
-msgstr[1] ""
+msgid "failed to find tree of %s"
+msgstr ""
-#: wt-status.c:879
-msgid "Submodules changed but not updated:"
+#: sequencer.c:3063 builtin/rebase.c:448
+msgid "could not write index"
msgstr ""
-#: wt-status.c:881
-msgid "Submodule changes to be committed:"
+#: sequencer.c:3090
+#, c-format
+msgid "could not resolve '%s'"
msgstr ""
-#: wt-status.c:963
-msgid ""
-"Do not modify or remove the line above.\n"
-"Everything below it will be ignored."
+#: sequencer.c:3118
+msgid "cannot merge without a current revision"
msgstr ""
-#: wt-status.c:1076
-msgid "You have unmerged paths."
+#: sequencer.c:3140
+#, c-format
+msgid "unable to parse '%.*s'"
msgstr ""
-#: wt-status.c:1079
-msgid " (fix conflicts and run \"git commit\")"
+#: sequencer.c:3149
+#, c-format
+msgid "nothing to merge: '%.*s'"
msgstr ""
-#: wt-status.c:1081
-msgid " (use \"git merge --abort\" to abort the merge)"
+#: sequencer.c:3161
+msgid "octopus merge cannot be executed on top of a [new root]"
msgstr ""
-#: wt-status.c:1086
-msgid "All conflicts fixed but you are still merging."
+#: sequencer.c:3176
+#, c-format
+msgid "could not get commit message of '%s'"
msgstr ""
-#: wt-status.c:1089
-msgid " (use \"git commit\" to conclude merge)"
+#: sequencer.c:3325
+#, c-format
+msgid "could not even attempt to merge '%.*s'"
msgstr ""
-#: wt-status.c:1099
-msgid "You are in the middle of an am session."
+#: sequencer.c:3341
+msgid "merge: Unable to write new index file"
msgstr ""
-#: wt-status.c:1102
-msgid "The current patch is empty."
+#: sequencer.c:3409 builtin/rebase.c:298
+#, c-format
+msgid "Applied autostash.\n"
msgstr ""
-#: wt-status.c:1106
-msgid " (fix conflicts and then run \"git am --continue\")"
+#: sequencer.c:3421
+#, c-format
+msgid "cannot store %s"
msgstr ""
-#: wt-status.c:1108
-msgid " (use \"git am --skip\" to skip this patch)"
+#: sequencer.c:3424 builtin/rebase.c:314
+#, c-format
+msgid ""
+"Applying autostash resulted in conflicts.\n"
+"Your changes are safe in the stash.\n"
+"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
msgstr ""
-#: wt-status.c:1110
-msgid " (use \"git am --abort\" to restore the original branch)"
+#: sequencer.c:3478
+#, c-format
+msgid "could not checkout %s"
msgstr ""
-#: wt-status.c:1242
-msgid "git-rebase-todo is missing."
+#: sequencer.c:3492
+#, c-format
+msgid "%s: not a valid OID"
msgstr ""
-#: wt-status.c:1244
-msgid "No commands done."
+#: sequencer.c:3497 git-rebase--preserve-merges.sh:724
+msgid "could not detach HEAD"
msgstr ""
-#: wt-status.c:1247
+#: sequencer.c:3512
#, c-format
-msgid "Last command done (%d command done):"
-msgid_plural "Last commands done (%d commands done):"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Stopped at HEAD\n"
+msgstr ""
-#: wt-status.c:1258
+#: sequencer.c:3514
#, c-format
-msgid " (see more in file %s)"
+msgid "Stopped at %s\n"
msgstr ""
-#: wt-status.c:1263
-msgid "No commands remaining."
+#: sequencer.c:3522
+#, 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 ""
-#: wt-status.c:1266
+#: sequencer.c:3597
#, 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:1274
-msgid " (use \"git rebase --edit-todo\" to view and edit)"
+msgid "Stopped at %s... %.*s\n"
msgstr ""
-#: wt-status.c:1287
+#: sequencer.c:3677
#, c-format
-msgid "You are currently rebasing branch '%s' on '%s'."
+msgid "unknown command %d"
msgstr ""
-#: wt-status.c:1292
-msgid "You are currently rebasing."
+#: sequencer.c:3723
+msgid "could not read orig-head"
msgstr ""
-#: wt-status.c:1306
-msgid " (fix conflicts and then run \"git rebase --continue\")"
+#: sequencer.c:3728 sequencer.c:4805
+msgid "could not read 'onto'"
msgstr ""
-#: wt-status.c:1308
-msgid " (use \"git rebase --skip\" to skip this patch)"
+#: sequencer.c:3742
+#, c-format
+msgid "could not update HEAD to %s"
msgstr ""
-#: wt-status.c:1310
-msgid " (use \"git rebase --abort\" to check out the original branch)"
+#: sequencer.c:3831
+msgid "cannot rebase: You have unstaged changes."
msgstr ""
-#: wt-status.c:1316
-msgid " (all conflicts fixed: run \"git rebase --continue\")"
+#: sequencer.c:3840
+msgid "cannot amend non-existing commit"
msgstr ""
-#: wt-status.c:1320
+#: sequencer.c:3842
#, c-format
-msgid ""
-"You are currently splitting a commit while rebasing branch '%s' on '%s'."
+msgid "invalid file: '%s'"
msgstr ""
-#: wt-status.c:1325
-msgid "You are currently splitting a commit during a rebase."
+#: sequencer.c:3844
+#, c-format
+msgid "invalid contents: '%s'"
msgstr ""
-#: wt-status.c:1328
-msgid " (Once your working directory is clean, run \"git rebase --continue\")"
+#: sequencer.c:3847
+msgid ""
+"\n"
+"You have uncommitted changes in your working tree. Please, commit them\n"
+"first and then run 'git rebase --continue' again."
msgstr ""
-#: wt-status.c:1332
+#: sequencer.c:3883 sequencer.c:3921
#, c-format
-msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
+msgid "could not write file: '%s'"
msgstr ""
-#: wt-status.c:1337
-msgid "You are currently editing a commit during a rebase."
+#: sequencer.c:3936
+msgid "could not remove CHERRY_PICK_HEAD"
msgstr ""
-#: wt-status.c:1340
-msgid " (use \"git commit --amend\" to amend the current commit)"
+#: sequencer.c:3943
+msgid "could not commit staged changes."
msgstr ""
-#: wt-status.c:1342
-msgid ""
-" (use \"git rebase --continue\" once you are satisfied with your changes)"
+#: sequencer.c:4044
+#, c-format
+msgid "%s: can't cherry-pick a %s"
msgstr ""
-#: wt-status.c:1352
+#: sequencer.c:4048
#, c-format
-msgid "You are currently cherry-picking commit %s."
+msgid "%s: bad revision"
msgstr ""
-#: wt-status.c:1357
-msgid " (fix conflicts and run \"git cherry-pick --continue\")"
+#: sequencer.c:4083
+msgid "can't revert as initial commit"
msgstr ""
-#: wt-status.c:1360
-msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
+#: sequencer.c:4529
+msgid "make_script: unhandled options"
msgstr ""
-#: wt-status.c:1362
-msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
+#: sequencer.c:4532
+msgid "make_script: error preparing revisions"
msgstr ""
-#: wt-status.c:1371
+#: sequencer.c:4573 sequencer.c:4629 sequencer.c:4904
#, c-format
-msgid "You are currently reverting commit %s."
+msgid "unusable todo list: '%s'"
msgstr ""
-#: wt-status.c:1376
-msgid " (fix conflicts and run \"git revert --continue\")"
+#: sequencer.c:4684
+#, c-format
+msgid ""
+"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
msgstr ""
-#: wt-status.c:1379
-msgid " (all conflicts fixed: run \"git revert --continue\")"
+#: sequencer.c:4754
+#, c-format
+msgid ""
+"Warning: some commits may have been dropped accidentally.\n"
+"Dropped commits (newer to older):\n"
msgstr ""
-#: wt-status.c:1381
-msgid " (use \"git revert --abort\" to cancel the revert operation)"
+#: sequencer.c:4761
+#, 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:1392
+#: sequencer.c:4774
#, c-format
-msgid "You are currently bisecting, started from branch '%s'."
+msgid ""
+"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
+"continue'.\n"
+"Or you can abort the rebase with 'git rebase --abort'.\n"
msgstr ""
-#: wt-status.c:1396
-msgid "You are currently bisecting."
+#: sequencer.c:4912 sequencer.c:4950
+msgid "nothing to do"
msgstr ""
-#: wt-status.c:1399
-msgid " (use \"git bisect reset\" to get back to the original branch)"
-msgstr ""
+#: sequencer.c:4916
+#, c-format
+msgid "Rebase %s onto %s (%d command)"
+msgid_plural "Rebase %s onto %s (%d commands)"
+msgstr[0] ""
+msgstr[1] ""
-#: wt-status.c:1596
-msgid "On branch "
+#: sequencer.c:4928
+#, c-format
+msgid "could not copy '%s' to '%s'."
msgstr ""
-#: wt-status.c:1602
-msgid "interactive rebase in progress; onto "
+#: sequencer.c:4932 sequencer.c:4961
+msgid "could not transform the todo list"
msgstr ""
-#: wt-status.c:1604
-msgid "rebase in progress; onto "
+#: sequencer.c:4964
+msgid "could not skip unnecessary pick commands"
msgstr ""
-#: wt-status.c:1609
-msgid "HEAD detached at "
+#: sequencer.c:5047
+msgid "the script was already rearranged."
msgstr ""
-#: wt-status.c:1611
-msgid "HEAD detached from "
+#: setup.c:123
+#, c-format
+msgid "'%s' is outside repository"
msgstr ""
-#: wt-status.c:1614
-msgid "Not currently on any branch."
+#: setup.c:172
+#, c-format
+msgid ""
+"%s: no such path in the working tree.\n"
+"Use 'git <command> -- <path>...' to specify paths that do not exist locally."
msgstr ""
-#: wt-status.c:1634
-msgid "Initial commit"
+#: setup.c:185
+#, c-format
+msgid ""
+"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
+"Use '--' to separate paths from revisions, like this:\n"
+"'git <command> [<revision>...] -- [<file>...]'"
msgstr ""
-#: wt-status.c:1635
-msgid "No commits yet"
+#: setup.c:234
+#, c-format
+msgid "option '%s' must come before non-option arguments"
msgstr ""
-#: wt-status.c:1649
-msgid "Untracked files"
+#: setup.c:253
+#, c-format
+msgid ""
+"ambiguous argument '%s': both revision and filename\n"
+"Use '--' to separate paths from revisions, like this:\n"
+"'git <command> [<revision>...] -- [<file>...]'"
msgstr ""
-#: wt-status.c:1651
-msgid "Ignored files"
+#: setup.c:389
+msgid "unable to set up work tree using invalid config"
msgstr ""
-#: wt-status.c:1655
-#, 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')."
+#: setup.c:393
+msgid "this operation must be run in a work tree"
msgstr ""
-#: wt-status.c:1661
+#: setup.c:527
#, c-format
-msgid "Untracked files not listed%s"
+msgid "Expected git repo version <= %d, found %d"
msgstr ""
-#: wt-status.c:1663
-msgid " (use -u option to show untracked files)"
+#: setup.c:535
+msgid "unknown repository extensions found:"
msgstr ""
-#: wt-status.c:1669
-msgid "No changes"
+#: setup.c:554
+#, c-format
+msgid "error opening '%s'"
msgstr ""
-#: wt-status.c:1674
+#: setup.c:556
#, c-format
-msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
+msgid "too large to be a .git file: '%s'"
msgstr ""
-#: wt-status.c:1677
+#: setup.c:558
#, c-format
-msgid "no changes added to commit\n"
+msgid "error reading %s"
msgstr ""
-#: wt-status.c:1680
+#: setup.c:560
#, c-format
-msgid ""
-"nothing added to commit but untracked files present (use \"git add\" to "
-"track)\n"
+msgid "invalid gitfile format: %s"
msgstr ""
-#: wt-status.c:1683
+#: setup.c:562
#, c-format
-msgid "nothing added to commit but untracked files present\n"
+msgid "no path in gitfile: %s"
msgstr ""
-#: wt-status.c:1686
+#: setup.c:564
#, c-format
-msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
+msgid "not a git repository: %s"
msgstr ""
-#: wt-status.c:1689 wt-status.c:1694
+#: setup.c:663
#, c-format
-msgid "nothing to commit\n"
+msgid "'$%s' too big"
msgstr ""
-#: wt-status.c:1692
+#: setup.c:677
#, c-format
-msgid "nothing to commit (use -u to show untracked files)\n"
+msgid "not a git repository: '%s'"
msgstr ""
-#: wt-status.c:1696
+#: setup.c:706 setup.c:708 setup.c:739
#, c-format
-msgid "nothing to commit, working tree clean\n"
-msgstr ""
-
-#: wt-status.c:1809
-msgid "No commits yet on "
-msgstr ""
-
-#: wt-status.c:1813
-msgid "HEAD (no branch)"
-msgstr ""
-
-#: wt-status.c:1844
-msgid "different"
-msgstr ""
-
-#: wt-status.c:1846 wt-status.c:1854
-msgid "behind "
+msgid "cannot chdir to '%s'"
msgstr ""
-#: wt-status.c:1849 wt-status.c:1852
-msgid "ahead "
+#: setup.c:711 setup.c:767 setup.c:777 setup.c:816 setup.c:824
+msgid "cannot come back to cwd"
msgstr ""
-#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2358
+#: setup.c:838
#, c-format
-msgid "cannot %s: You have unstaged changes."
+msgid "failed to stat '%*s%s%s'"
msgstr ""
-#: wt-status.c:2364
-msgid "additionally, your index contains uncommitted changes."
+#: setup.c:1068
+msgid "Unable to read current working directory"
msgstr ""
-#: wt-status.c:2366
+#: setup.c:1077 setup.c:1083
#, c-format
-msgid "cannot %s: Your index contains uncommitted changes."
+msgid "cannot change to '%s'"
msgstr ""
-#: compat/precompose_utf8.c:58 builtin/clone.c:440
+#: setup.c:1088
#, c-format
-msgid "failed to unlink '%s'"
-msgstr ""
-
-#: builtin/add.c:24
-msgid "git add [<options>] [--] <pathspec>..."
+msgid "not a git repository (or any of the parent directories): %s"
msgstr ""
-#: builtin/add.c:83
+#: setup.c:1094
#, c-format
-msgid "unexpected diff status %c"
-msgstr ""
-
-#: builtin/add.c:88 builtin/commit.c:257
-msgid "updating files failed"
+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/add.c:98
+#: setup.c:1204
#, c-format
-msgid "remove '%s'\n"
-msgstr ""
-
-#: builtin/add.c:173
-msgid "Unstaged changes after refreshing the index:"
+msgid ""
+"problem with core.sharedRepository filemode value (0%.3o).\n"
+"The owner of files must always have read and write permissions."
msgstr ""
-#: builtin/add.c:233 builtin/rev-parse.c:888
-msgid "Could not read the index"
+#: setup.c:1247
+msgid "open /dev/null or dup failed"
msgstr ""
-#: builtin/add.c:244
-#, c-format
-msgid "Could not open '%s' for writing."
+#: setup.c:1262
+msgid "fork failed"
msgstr ""
-#: builtin/add.c:248
-msgid "Could not write patch"
+#: setup.c:1267
+msgid "setsid failed"
msgstr ""
-#: builtin/add.c:251
-msgid "editing patch failed"
+#: sha1-file.c:445
+#, c-format
+msgid "object directory %s does not exist; check .git/objects/info/alternates"
msgstr ""
-#: builtin/add.c:254
+#: sha1-file.c:496
#, c-format
-msgid "Could not stat '%s'"
+msgid "unable to normalize alternate object path: %s"
msgstr ""
-#: builtin/add.c:256
-msgid "Empty patch. Aborted."
+#: sha1-file.c:568
+#, c-format
+msgid "%s: ignoring alternate object stores, nesting too deep"
msgstr ""
-#: builtin/add.c:261
+#: sha1-file.c:575
#, c-format
-msgid "Could not apply '%s'"
+msgid "unable to normalize object directory: %s"
msgstr ""
-#: builtin/add.c:271
-msgid "The following paths are ignored by one of your .gitignore files:\n"
+#: sha1-file.c:618
+msgid "unable to fdopen alternates lockfile"
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"
+#: sha1-file.c:636
+msgid "unable to read alternates file"
msgstr ""
-#: builtin/add.c:294
-msgid "interactive picking"
+#: sha1-file.c:643
+msgid "unable to move new alternates file into place"
msgstr ""
-#: builtin/add.c:295 builtin/checkout.c:1128 builtin/reset.c:302
-msgid "select hunks interactively"
+#: sha1-file.c:678
+#, c-format
+msgid "path '%s' does not exist"
msgstr ""
-#: builtin/add.c:296
-msgid "edit current diff and apply"
+#: sha1-file.c:704
+#, c-format
+msgid "reference repository '%s' as a linked checkout is not supported yet."
msgstr ""
-#: builtin/add.c:297
-msgid "allow adding otherwise ignored files"
+#: sha1-file.c:710
+#, c-format
+msgid "reference repository '%s' is not a local repository."
msgstr ""
-#: builtin/add.c:298
-msgid "update tracked files"
+#: sha1-file.c:716
+#, c-format
+msgid "reference repository '%s' is shallow"
msgstr ""
-#: builtin/add.c:299
-msgid "renormalize EOL of tracked files (implies -u)"
+#: sha1-file.c:724
+#, c-format
+msgid "reference repository '%s' is grafted"
msgstr ""
-#: builtin/add.c:300
-msgid "record only the fact that the path will be added later"
+#: sha1-file.c:838
+#, c-format
+msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
msgstr ""
-#: builtin/add.c:301
-msgid "add changes from all tracked and untracked files"
+#: sha1-file.c:863
+msgid "mmap failed"
msgstr ""
-#: builtin/add.c:304
-msgid "ignore paths removed in the working tree (same as --no-all)"
+#: sha1-file.c:1027
+#, c-format
+msgid "object file %s is empty"
msgstr ""
-#: builtin/add.c:306
-msgid "don't add, only refresh the index"
+#: sha1-file.c:1151 sha1-file.c:2288
+#, c-format
+msgid "corrupt loose object '%s'"
msgstr ""
-#: builtin/add.c:307
-msgid "just skip files which cannot be added because of errors"
+#: sha1-file.c:1153 sha1-file.c:2292
+#, c-format
+msgid "garbage at end of loose object '%s'"
msgstr ""
-#: builtin/add.c:308
-msgid "check if - even missing - files are ignored in dry run"
+#: sha1-file.c:1195
+msgid "invalid object type"
msgstr ""
-#: builtin/add.c:309 builtin/update-index.c:964
-msgid "(+/-)x"
+#: sha1-file.c:1279
+#, c-format
+msgid "unable to unpack %s header with --allow-unknown-type"
msgstr ""
-#: builtin/add.c:309 builtin/update-index.c:965
-msgid "override the executable bit of the listed files"
+#: sha1-file.c:1282
+#, c-format
+msgid "unable to unpack %s header"
msgstr ""
-#: builtin/add.c:311
-msgid "warn when adding an embedded repository"
+#: sha1-file.c:1288
+#, c-format
+msgid "unable to parse %s header with --allow-unknown-type"
msgstr ""
-#: builtin/add.c:326
+#: sha1-file.c:1291
#, c-format
-msgid ""
-"You've added another git repository inside your current repository.\n"
-"Clones of the outer repository will not contain the contents of\n"
-"the embedded repository and will not know how to obtain it.\n"
-"If you meant to add a submodule, use:\n"
-"\n"
-"\tgit submodule add <url> %s\n"
-"\n"
-"If you added this path by mistake, you can remove it from the\n"
-"index with:\n"
-"\n"
-"\tgit rm --cached %s\n"
-"\n"
-"See \"git help submodule\" for more information."
+msgid "unable to parse %s header"
msgstr ""
-#: builtin/add.c:354
+#: sha1-file.c:1481
#, c-format
-msgid "adding embedded git repository: %s"
+msgid "failed to read object %s"
msgstr ""
-#: builtin/add.c:372
+#: sha1-file.c:1485
#, c-format
-msgid "Use -f if you really want to add them.\n"
+msgid "replacement %s not found for %s"
msgstr ""
-#: builtin/add.c:380
-msgid "adding files failed"
+#: sha1-file.c:1489
+#, c-format
+msgid "loose object %s (stored in %s) is corrupt"
msgstr ""
-#: builtin/add.c:417
-msgid "-A and -u are mutually incompatible"
+#: sha1-file.c:1493
+#, c-format
+msgid "packed object %s (stored in %s) is corrupt"
msgstr ""
-#: builtin/add.c:424
-msgid "Option --ignore-missing can only be used together with --dry-run"
+#: sha1-file.c:1595
+#, c-format
+msgid "unable to write file %s"
msgstr ""
-#: builtin/add.c:428
+#: sha1-file.c:1602
#, c-format
-msgid "--chmod param '%s' must be either -x or +x"
+msgid "unable to set permission to '%s'"
msgstr ""
-#: builtin/add.c:443
-#, c-format
-msgid "Nothing specified, nothing added.\n"
+#: sha1-file.c:1609
+msgid "file write error"
msgstr ""
-#: builtin/add.c:444
+#: sha1-file.c:1628
+msgid "error when closing loose object file"
+msgstr ""
+
+#: sha1-file.c:1693
#, c-format
-msgid "Maybe you wanted to say 'git add .'?\n"
+msgid "insufficient permission for adding an object to repository database %s"
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"
+#: sha1-file.c:1695
+msgid "unable to create temporary file"
msgstr ""
-#: builtin/am.c:414
-msgid "could not parse author script"
+#: sha1-file.c:1719
+msgid "unable to write loose object file"
msgstr ""
-#: builtin/am.c:498
+#: sha1-file.c:1725
#, c-format
-msgid "'%s' was deleted by the applypatch-msg hook"
+msgid "unable to deflate new object %s (%d)"
msgstr ""
-#: builtin/am.c:539
+#: sha1-file.c:1729
#, c-format
-msgid "Malformed input line: '%s'."
+msgid "deflateEnd on object %s failed (%d)"
msgstr ""
-#: builtin/am.c:576
+#: sha1-file.c:1733
#, c-format
-msgid "Failed to copy notes from '%s' to '%s'"
+msgid "confused by unstable object source data for %s"
msgstr ""
-#: builtin/am.c:602
-msgid "fseek failed"
+#: sha1-file.c:1743 builtin/pack-objects.c:919
+#, c-format
+msgid "failed utime() on %s"
msgstr ""
-#: builtin/am.c:790
+#: sha1-file.c:1818
#, c-format
-msgid "could not parse patch '%s'"
+msgid "cannot read object for %s"
msgstr ""
-#: builtin/am.c:855
-msgid "Only one StGIT patch series can be applied at once"
+#: sha1-file.c:1858
+msgid "corrupt commit"
msgstr ""
-#: builtin/am.c:903
-msgid "invalid timestamp"
+#: sha1-file.c:1866
+msgid "corrupt tag"
msgstr ""
-#: builtin/am.c:908 builtin/am.c:920
-msgid "invalid Date line"
+#: sha1-file.c:1965
+#, c-format
+msgid "read error while indexing %s"
msgstr ""
-#: builtin/am.c:915
-msgid "invalid timezone offset"
+#: sha1-file.c:1968
+#, c-format
+msgid "short read while indexing %s"
msgstr ""
-#: builtin/am.c:1008
-msgid "Patch format detection failed."
+#: sha1-file.c:2041 sha1-file.c:2050
+#, c-format
+msgid "%s: failed to insert into database"
msgstr ""
-#: builtin/am.c:1013 builtin/clone.c:405
+#: sha1-file.c:2056
#, c-format
-msgid "failed to create directory '%s'"
+msgid "%s: unsupported file type"
msgstr ""
-#: builtin/am.c:1018
-msgid "Failed to split patches."
+#: sha1-file.c:2080
+#, c-format
+msgid "%s is not a valid object"
msgstr ""
-#: builtin/am.c:1148 builtin/commit.c:342
-msgid "unable to write index file"
+#: sha1-file.c:2082
+#, c-format
+msgid "%s is not a valid '%s' object"
msgstr ""
-#: builtin/am.c:1162
+#: sha1-file.c:2109 builtin/index-pack.c:154
#, c-format
-msgid "When you have resolved this problem, run \"%s --continue\"."
+msgid "unable to open %s"
msgstr ""
-#: builtin/am.c:1163
+#: sha1-file.c:2299 sha1-file.c:2351
#, c-format
-msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
+msgid "hash mismatch for %s (expected %s)"
msgstr ""
-#: builtin/am.c:1164
+#: sha1-file.c:2323
#, c-format
-msgid "To restore the original branch and stop patching, run \"%s --abort\"."
+msgid "unable to mmap %s"
msgstr ""
-#: builtin/am.c:1271
-msgid "Patch is empty."
+#: sha1-file.c:2328
+#, c-format
+msgid "unable to unpack header of %s"
msgstr ""
-#: builtin/am.c:1337
+#: sha1-file.c:2334
#, c-format
-msgid "invalid ident line: %.*s"
+msgid "unable to parse header of %s"
msgstr ""
-#: builtin/am.c:1359
+#: sha1-file.c:2345
#, c-format
-msgid "unable to parse commit %s"
+msgid "unable to unpack contents of %s"
msgstr ""
-#: builtin/am.c:1554
-msgid "Repository lacks necessary blobs to fall back on 3-way merge."
+#: sha1-name.c:448
+#, c-format
+msgid "short SHA1 %s is ambiguous"
msgstr ""
-#: builtin/am.c:1556
-msgid "Using index info to reconstruct a base tree..."
+#: sha1-name.c:459
+msgid "The candidates are:"
msgstr ""
-#: builtin/am.c:1575
+#: sha1-name.c:742
msgid ""
-"Did you hand edit your patch?\n"
-"It does not apply to blobs recorded in its index."
+"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/am.c:1581
-msgid "Falling back to patching base and 3-way merge..."
+#: submodule.c:114 submodule.c:143
+msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
msgstr ""
-#: builtin/am.c:1606
-msgid "Failed to merge in the changes."
+#: submodule.c:118 submodule.c:147
+#, c-format
+msgid "Could not find section in .gitmodules where path=%s"
msgstr ""
-#: builtin/am.c:1637
-msgid "applying to an empty history"
+#: submodule.c:154
+#, c-format
+msgid "Could not remove .gitmodules entry for %s"
+msgstr ""
+
+#: submodule.c:165
+msgid "staging updated .gitmodules failed"
msgstr ""
-#: builtin/am.c:1683 builtin/am.c:1687
+#: submodule.c:327
#, c-format
-msgid "cannot resume: %s does not exist."
+msgid "in unpopulated submodule '%s'"
msgstr ""
-#: builtin/am.c:1703
-msgid "cannot be interactive without stdin connected to a terminal."
+#: submodule.c:358
+#, c-format
+msgid "Pathspec '%s' is in submodule '%.*s'"
msgstr ""
-#: builtin/am.c:1708
-msgid "Commit Body is:"
+#: submodule.c:906
+#, c-format
+msgid "submodule entry '%s' (%s) is a %s, not a commit"
msgstr ""
-#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
-#. in your translation. The program will only accept English
-#. input at this point.
-#.
-#: builtin/am.c:1718
-msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
+#: submodule.c:1143 builtin/branch.c:656 builtin/submodule--helper.c:1989
+msgid "Failed to resolve HEAD as a valid ref."
msgstr ""
-#: builtin/am.c:1768
+#: submodule.c:1477
#, c-format
-msgid "Dirty index: cannot apply patches (dirty: %s)"
+msgid "Could not access submodule '%s'"
msgstr ""
-#: builtin/am.c:1808 builtin/am.c:1879
+#: submodule.c:1639
#, c-format
-msgid "Applying: %.*s"
+msgid "'%s' not recognized as a git repository"
msgstr ""
-#: builtin/am.c:1824
-msgid "No changes -- Patch already applied."
+#: submodule.c:1777
+#, c-format
+msgid "could not start 'git status' in submodule '%s'"
msgstr ""
-#: builtin/am.c:1832
+#: submodule.c:1790
#, c-format
-msgid "Patch failed at %s %.*s"
+msgid "could not run 'git status' in submodule '%s'"
msgstr ""
-#: builtin/am.c:1838
-msgid "Use 'git am --show-current-patch' to see the failed patch"
+#: submodule.c:1805
+#, c-format
+msgid "Could not unset core.worktree setting in submodule '%s'"
msgstr ""
-#: builtin/am.c:1882
-msgid ""
-"No changes - did you forget to use 'git add'?\n"
-"If there is nothing left to stage, chances are that something else\n"
-"already introduced the same changes; you might want to skip this patch."
+#: submodule.c:1895
+#, c-format
+msgid "submodule '%s' has dirty index"
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."
+#: submodule.c:1947
+#, c-format
+msgid "Submodule '%s' could not be updated."
msgstr ""
-#: builtin/am.c:1996 builtin/am.c:2000 builtin/am.c:2012 builtin/reset.c:324
-#: builtin/reset.c:332
+#: submodule.c:1996
#, c-format
-msgid "Could not parse object '%s'."
+msgid ""
+"relocate_gitdir for submodule '%s' with more than one worktree not supported"
msgstr ""
-#: builtin/am.c:2048
-msgid "failed to clean index"
+#: submodule.c:2008 submodule.c:2064
+#, c-format
+msgid "could not lookup name for submodule '%s'"
msgstr ""
-#: builtin/am.c:2083
+#: submodule.c:2015
+#, c-format
msgid ""
-"You seem to have moved HEAD since the last 'am' failure.\n"
-"Not rewinding to ORIG_HEAD"
+"Migrating git directory of '%s%s' from\n"
+"'%s' to\n"
+"'%s'\n"
msgstr ""
-#: builtin/am.c:2174
+#: submodule.c:2099
#, c-format
-msgid "Invalid value for --patch-format: %s"
+msgid "could not recurse into submodule '%s'"
msgstr ""
-#: builtin/am.c:2210
-msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
+#: submodule.c:2143
+msgid "could not start ls-files in .."
msgstr ""
-#: builtin/am.c:2211
-msgid "git am [<options>] (--continue | --skip | --abort)"
+#: submodule.c:2182
+#, c-format
+msgid "ls-tree returned unexpected return code %d"
msgstr ""
-#: builtin/am.c:2217
-msgid "run interactively"
+#: submodule-config.c:232
+#, c-format
+msgid "ignoring suspicious submodule name: %s"
msgstr ""
-#: builtin/am.c:2219
-msgid "historical option -- no-op"
+#: submodule-config.c:296
+msgid "negative values not allowed for submodule.fetchjobs"
msgstr ""
-#: builtin/am.c:2221
-msgid "allow fall back on 3way merging if needed"
+#: submodule-config.c:390
+#, c-format
+msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
msgstr ""
-#: builtin/am.c:2222 builtin/init-db.c:484 builtin/prune-packed.c:57
-#: builtin/repack.c:182
-msgid "be quiet"
+#: submodule-config.c:479
+#, c-format
+msgid "invalid value for %s"
msgstr ""
-#: builtin/am.c:2224
-msgid "add a Signed-off-by line to the commit message"
+#: submodule-config.c:754
+#, c-format
+msgid "Could not update .gitmodules entry %s"
msgstr ""
-#: builtin/am.c:2227
-msgid "recode into utf8 (default)"
+#: trailer.c:238
+#, c-format
+msgid "running trailer command '%s' failed"
msgstr ""
-#: builtin/am.c:2229
-msgid "pass -k flag to git-mailinfo"
+#: 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/am.c:2231
-msgid "pass -b flag to git-mailinfo"
+#: trailer.c:539 trailer.c:544 builtin/remote.c:295
+#, c-format
+msgid "more than one %s"
msgstr ""
-#: builtin/am.c:2233
-msgid "pass -m flag to git-mailinfo"
+#: trailer.c:730
+#, c-format
+msgid "empty trailer token in trailer '%.*s'"
msgstr ""
-#: builtin/am.c:2235
-msgid "pass --keep-cr flag to git-mailsplit for mbox format"
+#: trailer.c:750
+#, c-format
+msgid "could not read input file '%s'"
msgstr ""
-#: builtin/am.c:2238
-msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
+#: trailer.c:753
+msgid "could not read from stdin"
msgstr ""
-#: builtin/am.c:2241
-msgid "strip everything before a scissors line"
+#: trailer.c:1011 wrapper.c:701
+#, c-format
+msgid "could not stat %s"
msgstr ""
-#: builtin/am.c:2243 builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252
-#: builtin/am.c:2255 builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264
-#: builtin/am.c:2270
-msgid "pass it through git-apply"
+#: trailer.c:1013
+#, c-format
+msgid "file %s is not a regular file"
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"
+#: trailer.c:1015
+#, c-format
+msgid "file %s is not writable by user"
msgstr ""
-#: 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"
+#: trailer.c:1027
+msgid "could not open temporary file"
msgstr ""
-#: builtin/am.c:2267
-msgid "format the patch(es) are in"
+#: trailer.c:1067
+#, c-format
+msgid "could not rename temporary file to %s"
msgstr ""
-#: builtin/am.c:2273
-msgid "override error message when patch failure occurs"
+#: transport.c:116
+#, c-format
+msgid "Would set upstream of '%s' to '%s' of '%s'\n"
msgstr ""
-#: builtin/am.c:2275
-msgid "continue applying patches after resolving a conflict"
+#: transport.c:142
+#, c-format
+msgid "could not read bundle '%s'"
msgstr ""
-#: builtin/am.c:2278
-msgid "synonyms for --continue"
+#: transport.c:208
+#, c-format
+msgid "transport: invalid depth option '%s'"
msgstr ""
-#: builtin/am.c:2281
-msgid "skip the current patch"
+#: transport.c:617
+msgid "could not parse transport.color.* config"
msgstr ""
-#: builtin/am.c:2284
-msgid "restore the original branch and abort the patching operation."
+#: transport.c:690
+msgid "support for protocol v2 not implemented yet"
msgstr ""
-#: builtin/am.c:2287
-msgid "abort the patching operation but keep HEAD where it is."
+#: transport.c:817
+#, c-format
+msgid "unknown value for config '%s': %s"
msgstr ""
-#: builtin/am.c:2290
-msgid "show the patch being applied."
+#: transport.c:883
+#, c-format
+msgid "transport '%s' not allowed"
msgstr ""
-#: builtin/am.c:2294
-msgid "lie about committer date"
+#: transport.c:937
+msgid "git-over-rsync is no longer supported"
msgstr ""
-#: builtin/am.c:2296
-msgid "use current timestamp for author date"
+#: transport.c:1032
+#, c-format
+msgid ""
+"The following submodule paths contain changes that can\n"
+"not be found on any remote:\n"
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"
+#: transport.c:1036
+#, c-format
+msgid ""
+"\n"
+"Please try\n"
+"\n"
+"\tgit push --recurse-submodules=on-demand\n"
+"\n"
+"or cd to the path and use\n"
+"\n"
+"\tgit push\n"
+"\n"
+"to push them to a remote.\n"
+"\n"
msgstr ""
-#: builtin/am.c:2299
-msgid "GPG-sign commits"
+#: transport.c:1044
+msgid "Aborting."
msgstr ""
-#: builtin/am.c:2302
-msgid "(internal use for git-rebase)"
+#: transport.c:1184
+msgid "failed to push all needed submodules"
msgstr ""
-#: builtin/am.c:2320
-msgid ""
-"The -b/--binary option has been a no-op for long time, and\n"
-"it will be removed. Please do not use it anymore."
+#: transport.c:1317 transport-helper.c:643
+msgid "operation not supported by protocol"
msgstr ""
-#: builtin/am.c:2327
-msgid "failed to read the index"
+#: transport.c:1421
+#, c-format
+msgid "invalid line while parsing alternate refs: %s"
msgstr ""
-#: builtin/am.c:2342
-#, c-format
-msgid "previous rebase directory %s still exists but mbox given."
+#: transport-helper.c:51 transport-helper.c:80
+msgid "full write to remote helper failed"
msgstr ""
-#: builtin/am.c:2366
+#: transport-helper.c:132
#, c-format
-msgid ""
-"Stray %s directory found.\n"
-"Use \"git am --abort\" to remove it."
+msgid "unable to find remote helper for '%s'"
msgstr ""
-#: builtin/am.c:2372
-msgid "Resolve operation not in progress, we are not resuming."
+#: transport-helper.c:148 transport-helper.c:557
+msgid "can't dup helper output fd"
msgstr ""
-#: builtin/apply.c:8
-msgid "git apply [<options>] [<patch>...]"
+#: transport-helper.c:199
+#, c-format
+msgid ""
+"unknown mandatory capability %s; this remote helper probably needs newer "
+"version of Git"
msgstr ""
-#: builtin/archive.c:17
+#: transport-helper.c:205
+msgid "this remote helper should implement refspec capability"
+msgstr ""
+
+#: transport-helper.c:272 transport-helper.c:412
#, c-format
-msgid "could not create archive file '%s'"
+msgid "%s unexpectedly said: '%s'"
msgstr ""
-#: builtin/archive.c:20
-msgid "could not redirect output"
+#: transport-helper.c:401
+#, c-format
+msgid "%s also locked %s"
msgstr ""
-#: builtin/archive.c:37
-msgid "git archive: Remote with no URL"
+#: transport-helper.c:479
+msgid "couldn't run fast-import"
msgstr ""
-#: builtin/archive.c:58
-msgid "git archive: expected ACK/NAK, got a flush packet"
+#: transport-helper.c:502
+msgid "error while running fast-import"
msgstr ""
-#: builtin/archive.c:61
+#: transport-helper.c:531 transport-helper.c:1097
#, c-format
-msgid "git archive: NACK %s"
+msgid "could not read ref %s"
msgstr ""
-#: builtin/archive.c:64
-msgid "git archive: protocol error"
+#: transport-helper.c:576
+#, c-format
+msgid "unknown response to connect: %s"
msgstr ""
-#: builtin/archive.c:68
-msgid "git archive: expected a flush"
+#: transport-helper.c:598
+msgid "setting remote service path not supported by protocol"
msgstr ""
-#: builtin/bisect--helper.c:12
-msgid "git bisect--helper --next-all [--no-checkout]"
+#: transport-helper.c:600
+msgid "invalid remote service path"
msgstr ""
-#: builtin/bisect--helper.c:13
-msgid "git bisect--helper --write-terms <bad_term> <good_term>"
+#: transport-helper.c:646
+#, c-format
+msgid "can't connect to subservice %s"
msgstr ""
-#: builtin/bisect--helper.c:14
-msgid "git bisect--helper --bisect-clean-state"
+#: transport-helper.c:718
+#, c-format
+msgid "expected ok/error, helper said '%s'"
msgstr ""
-#: builtin/bisect--helper.c:46
+#: transport-helper.c:771
#, c-format
-msgid "'%s' is not a valid term"
+msgid "helper reported unexpected status of %s"
msgstr ""
-#: builtin/bisect--helper.c:50
+#: transport-helper.c:832
#, c-format
-msgid "can't use the builtin command '%s' as a term"
+msgid "helper %s does not support dry-run"
msgstr ""
-#: builtin/bisect--helper.c:60
+#: transport-helper.c:835
#, c-format
-msgid "can't change the meaning of the term '%s'"
+msgid "helper %s does not support --signed"
msgstr ""
-#: builtin/bisect--helper.c:71
-msgid "please use two different terms"
+#: transport-helper.c:838
+#, c-format
+msgid "helper %s does not support --signed=if-asked"
msgstr ""
-#: builtin/bisect--helper.c:78
-msgid "could not open the file BISECT_TERMS"
+#: transport-helper.c:845
+#, c-format
+msgid "helper %s does not support 'push-option'"
msgstr ""
-#: builtin/bisect--helper.c:120
-msgid "perform 'git bisect next'"
+#: transport-helper.c:937
+msgid "remote-helper doesn't support push; refspec needed"
msgstr ""
-#: builtin/bisect--helper.c:122
-msgid "write the terms to .git/BISECT_TERMS"
+#: transport-helper.c:942
+#, c-format
+msgid "helper %s does not support 'force'"
msgstr ""
-#: builtin/bisect--helper.c:124
-msgid "cleanup the bisection state"
+#: transport-helper.c:989
+msgid "couldn't run fast-export"
msgstr ""
-#: builtin/bisect--helper.c:126
-msgid "check for expected revs"
+#: transport-helper.c:994
+msgid "error while running fast-export"
msgstr ""
-#: builtin/bisect--helper.c:128
-msgid "update BISECT_HEAD instead of checking out the current commit"
+#: transport-helper.c:1019
+#, c-format
+msgid ""
+"No refs in common and none specified; doing nothing.\n"
+"Perhaps you should specify a branch such as 'master'.\n"
msgstr ""
-#: builtin/bisect--helper.c:143
-msgid "--write-terms requires two arguments"
+#: transport-helper.c:1083
+#, c-format
+msgid "malformed response in ref list: %s"
msgstr ""
-#: builtin/bisect--helper.c:147
-msgid "--bisect-clean-state requires no arguments"
+#: transport-helper.c:1236
+#, c-format
+msgid "read(%s) failed"
msgstr ""
-#: builtin/blame.c:27
-msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
+#: transport-helper.c:1263
+#, c-format
+msgid "write(%s) failed"
msgstr ""
-#: builtin/blame.c:32
-msgid "<rev-opts> are documented in git-rev-list(1)"
+#: transport-helper.c:1312
+#, c-format
+msgid "%s thread failed"
msgstr ""
-#: builtin/blame.c:677
-msgid "Show blame entries as we find them, incrementally"
+#: transport-helper.c:1316
+#, c-format
+msgid "%s thread failed to join: %s"
msgstr ""
-#: builtin/blame.c:678
-msgid "Show blank SHA-1 for boundary commits (Default: off)"
+#: transport-helper.c:1335 transport-helper.c:1339
+#, c-format
+msgid "can't start thread for copying data: %s"
msgstr ""
-#: builtin/blame.c:679
-msgid "Do not treat root commits as boundaries (Default: off)"
+#: transport-helper.c:1376
+#, c-format
+msgid "%s process failed to wait"
msgstr ""
-#: builtin/blame.c:680
-msgid "Show work cost statistics"
+#: transport-helper.c:1380
+#, c-format
+msgid "%s process failed"
msgstr ""
-#: builtin/blame.c:681
-msgid "Force progress reporting"
+#: transport-helper.c:1398 transport-helper.c:1407
+msgid "can't start thread for copying data"
msgstr ""
-#: builtin/blame.c:682
-msgid "Show output score for blame entries"
+#: tree-walk.c:33
+msgid "too-short tree object"
msgstr ""
-#: builtin/blame.c:683
-msgid "Show original filename (Default: auto)"
+#: tree-walk.c:39
+msgid "malformed mode in tree entry"
msgstr ""
-#: builtin/blame.c:684
-msgid "Show original linenumber (Default: off)"
+#: tree-walk.c:43
+msgid "empty filename in tree entry"
msgstr ""
-#: builtin/blame.c:685
-msgid "Show in a format designed for machine consumption"
+#: tree-walk.c:116
+msgid "too-short tree file"
msgstr ""
-#: builtin/blame.c:686
-msgid "Show porcelain format with per-line commit information"
+#: unpack-trees.c:111
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by checkout:\n"
+"%%sPlease commit your changes or stash them before you switch branches."
msgstr ""
-#: builtin/blame.c:687
-msgid "Use the same output mode as git-annotate (Default: off)"
+#: unpack-trees.c:113
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by checkout:\n"
+"%%s"
msgstr ""
-#: builtin/blame.c:688
-msgid "Show raw timestamp (Default: off)"
+#: 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/blame.c:689
-msgid "Show long commit SHA1 (Default: off)"
+#: unpack-trees.c:118
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"%%s"
msgstr ""
-#: builtin/blame.c:690
-msgid "Suppress author name and timestamp (Default: off)"
+#: unpack-trees.c:121
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by %s:\n"
+"%%sPlease commit your changes or stash them before you %s."
msgstr ""
-#: builtin/blame.c:691
-msgid "Show author email instead of name (Default: off)"
+#: unpack-trees.c:123
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by %s:\n"
+"%%s"
msgstr ""
-#: builtin/blame.c:692
-msgid "Ignore whitespace differences"
+#: unpack-trees.c:128
+#, c-format
+msgid ""
+"Updating the following directories would lose untracked files in them:\n"
+"%s"
msgstr ""
-#: builtin/blame.c:699
-msgid "Use an experimental heuristic to improve diffs"
+#: 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/blame.c:701
-msgid "Spend extra cycles to find better match"
+#: unpack-trees.c:134
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%s"
msgstr ""
-#: builtin/blame.c:702
-msgid "Use revisions from <file> instead of calling git-rev-list"
+#: 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/blame.c:703
-msgid "Use <file>'s contents as the final image"
+#: unpack-trees.c:139
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%s"
msgstr ""
-#: builtin/blame.c:704 builtin/blame.c:705
-msgid "score"
+#: unpack-trees.c:142
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%sPlease move or remove them before you %s."
msgstr ""
-#: builtin/blame.c:704
-msgid "Find line copies within and across files"
+#: unpack-trees.c:144
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%s"
msgstr ""
-#: builtin/blame.c:705
-msgid "Find line movements within and across files"
+#: unpack-trees.c:150
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%sPlease move or remove them before you switch branches."
msgstr ""
-#: builtin/blame.c:706
-msgid "n,m"
+#: unpack-trees.c:152
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%s"
msgstr ""
-#: builtin/blame.c:706
-msgid "Process only line range n,m, counting from 1"
+#: unpack-trees.c:155
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%sPlease move or remove them before you merge."
msgstr ""
-#: builtin/blame.c:753
-msgid "--progress can't be used with --incremental or porcelain formats"
+#: unpack-trees.c:157
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%s"
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"
+#: unpack-trees.c:160
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%sPlease move or remove them before you %s."
msgstr ""
-#: builtin/blame.c:890
+#: unpack-trees.c:162
#, c-format
-msgid "file %s has only %lu line"
-msgid_plural "file %s has only %lu lines"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/blame.c:936
-msgid "Blaming lines"
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%s"
msgstr ""
-#: builtin/branch.c:27
-msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
+#: unpack-trees.c:170
+#, c-format
+msgid "Entry '%s' overlaps with '%s'. Cannot bind."
msgstr ""
-#: builtin/branch.c:28
-msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
+#: unpack-trees.c:173
+#, c-format
+msgid ""
+"Cannot update sparse checkout: the following entries are not up to date:\n"
+"%s"
msgstr ""
-#: builtin/branch.c:29
-msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
+#: unpack-trees.c:175
+#, c-format
+msgid ""
+"The following working tree files would be overwritten by sparse checkout "
+"update:\n"
+"%s"
msgstr ""
-#: builtin/branch.c:30
-msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
+#: unpack-trees.c:177
+#, c-format
+msgid ""
+"The following working tree files would be removed by sparse checkout "
+"update:\n"
+"%s"
msgstr ""
-#: builtin/branch.c:31
-msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
+#: unpack-trees.c:179
+#, c-format
+msgid ""
+"Cannot update submodule:\n"
+"%s"
msgstr ""
-#: builtin/branch.c:32
-msgid "git branch [<options>] [-r | -a] [--points-at]"
+#: unpack-trees.c:253
+#, c-format
+msgid "Aborting\n"
msgstr ""
-#: builtin/branch.c:33
-msgid "git branch [<options>] [-r | -a] [--format]"
+#: unpack-trees.c:335
+msgid "Checking out files"
msgstr ""
-#: builtin/branch.c:146
-#, c-format
+#: unpack-trees.c:367
msgid ""
-"deleting branch '%s' that has been merged to\n"
-" '%s', but not yet merged to HEAD."
+"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/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."
+#: urlmatch.c:163
+msgid "invalid URL scheme name or missing '://' suffix"
msgstr ""
-#: builtin/branch.c:164
+#: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405
#, c-format
-msgid "Couldn't look up commit object for '%s'"
+msgid "invalid %XX escape sequence"
msgstr ""
-#: builtin/branch.c:168
-#, 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'."
+#: urlmatch.c:215
+msgid "missing host and scheme is not 'file:'"
msgstr ""
-#: builtin/branch.c:181
-msgid "Update of config-file failed"
+#: urlmatch.c:232
+msgid "a 'file:' URL may not have a port number"
msgstr ""
-#: builtin/branch.c:212
-msgid "cannot use -a with -d"
+#: urlmatch.c:247
+msgid "invalid characters in host name"
msgstr ""
-#: builtin/branch.c:218
-msgid "Couldn't look up commit object for HEAD"
+#: urlmatch.c:292 urlmatch.c:303
+msgid "invalid port number"
msgstr ""
-#: builtin/branch.c:232
-#, c-format
-msgid "Cannot delete branch '%s' checked out at '%s'"
+#: urlmatch.c:371
+msgid "invalid '..' path segment"
msgstr ""
-#: builtin/branch.c:247
+#: worktree.c:249 builtin/am.c:2094
#, c-format
-msgid "remote-tracking branch '%s' not found."
+msgid "failed to read '%s'"
msgstr ""
-#: builtin/branch.c:248
+#: worktree.c:295
#, c-format
-msgid "branch '%s' not found."
+msgid "'%s' at main working tree is not the repository directory"
msgstr ""
-#: builtin/branch.c:263
+#: worktree.c:306
#, c-format
-msgid "Error deleting remote-tracking branch '%s'"
+msgid "'%s' file does not contain absolute path to the working tree location"
msgstr ""
-#: builtin/branch.c:264
+#: worktree.c:318
#, c-format
-msgid "Error deleting branch '%s'"
+msgid "'%s' does not exist"
msgstr ""
-#: builtin/branch.c:271
+#: worktree.c:324
#, c-format
-msgid "Deleted remote-tracking branch %s (was %s).\n"
+msgid "'%s' is not a .git file, error code %d"
msgstr ""
-#: builtin/branch.c:272
+#: worktree.c:332
#, c-format
-msgid "Deleted branch %s (was %s).\n"
-msgstr ""
-
-#: builtin/branch.c:417 builtin/tag.c:58
-msgid "unable to parse format string"
+msgid "'%s' does not point back to '%s'"
msgstr ""
-#: builtin/branch.c:450
+#: wrapper.c:223 wrapper.c:393
#, c-format
-msgid "Branch %s is being rebased at %s"
+msgid "could not open '%s' for reading and writing"
msgstr ""
-#: builtin/branch.c:454
+#: wrapper.c:424 wrapper.c:624
#, c-format
-msgid "Branch %s is being bisected at %s"
+msgid "unable to access '%s'"
msgstr ""
-#: builtin/branch.c:471
-msgid "cannot copy the current branch while not on any."
+#: wrapper.c:632
+msgid "unable to get current working directory"
msgstr ""
-#: builtin/branch.c:473
-msgid "cannot rename the current branch while not on any."
+#: wt-status.c:155
+msgid "Unmerged paths:"
msgstr ""
-#: builtin/branch.c:484
+#: wt-status.c:182 wt-status.c:209
#, c-format
-msgid "Invalid branch name: '%s'"
-msgstr ""
-
-#: builtin/branch.c:511
-msgid "Branch rename failed"
+msgid " (use \"git reset %s <file>...\" to unstage)"
msgstr ""
-#: builtin/branch.c:513
-msgid "Branch copy failed"
+#: wt-status.c:184 wt-status.c:211
+msgid " (use \"git rm --cached <file>...\" to unstage)"
msgstr ""
-#: builtin/branch.c:517
-#, c-format
-msgid "Created a copy of a misnamed branch '%s'"
+#: wt-status.c:188
+msgid " (use \"git add <file>...\" to mark resolution)"
msgstr ""
-#: builtin/branch.c:520
-#, c-format
-msgid "Renamed a misnamed branch '%s' away"
+#: wt-status.c:190 wt-status.c:194
+msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
msgstr ""
-#: builtin/branch.c:526
-#, c-format
-msgid "Branch renamed to %s, but HEAD is not updated!"
+#: wt-status.c:192
+msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr ""
-#: builtin/branch.c:535
-msgid "Branch is renamed, but update of config-file failed"
+#: wt-status.c:203 wt-status.c:1046
+msgid "Changes to be committed:"
msgstr ""
-#: builtin/branch.c:537
-msgid "Branch is copied, but update of config-file failed"
+#: wt-status.c:221 wt-status.c:1055
+msgid "Changes not staged for commit:"
msgstr ""
-#: builtin/branch.c:553
-#, c-format
-msgid ""
-"Please edit the description for the branch\n"
-" %s\n"
-"Lines starting with '%c' will be stripped.\n"
+#: wt-status.c:225
+msgid " (use \"git add <file>...\" to update what will be committed)"
msgstr ""
-#: builtin/branch.c:586
-msgid "Generic options"
+#: wt-status.c:227
+msgid " (use \"git add/rm <file>...\" to update what will be committed)"
msgstr ""
-#: builtin/branch.c:588
-msgid "show hash and subject, give twice for upstream branch"
+#: wt-status.c:228
+msgid ""
+" (use \"git checkout -- <file>...\" to discard changes in working directory)"
msgstr ""
-#: builtin/branch.c:589
-msgid "suppress informational messages"
+#: wt-status.c:230
+msgid " (commit or discard the untracked or modified content in submodules)"
msgstr ""
-#: builtin/branch.c:590
-msgid "set up tracking mode (see git-pull(1))"
+#: wt-status.c:242
+#, c-format
+msgid " (use \"git %s <file>...\" to include in what will be committed)"
msgstr ""
-#: builtin/branch.c:592
-msgid "do not use"
+#: wt-status.c:257
+msgid "both deleted:"
msgstr ""
-#: builtin/branch.c:594
-msgid "upstream"
+#: wt-status.c:259
+msgid "added by us:"
msgstr ""
-#: builtin/branch.c:594
-msgid "change the upstream info"
+#: wt-status.c:261
+msgid "deleted by them:"
msgstr ""
-#: builtin/branch.c:595
-msgid "Unset the upstream info"
+#: wt-status.c:263
+msgid "added by them:"
msgstr ""
-#: builtin/branch.c:596
-msgid "use colored output"
+#: wt-status.c:265
+msgid "deleted by us:"
msgstr ""
-#: builtin/branch.c:597
-msgid "act on remote-tracking branches"
+#: wt-status.c:267
+msgid "both added:"
msgstr ""
-#: builtin/branch.c:599 builtin/branch.c:601
-msgid "print only branches that contain the commit"
+#: wt-status.c:269
+msgid "both modified:"
msgstr ""
-#: builtin/branch.c:600 builtin/branch.c:602
-msgid "print only branches that don't contain the commit"
+#: wt-status.c:279
+msgid "new file:"
msgstr ""
-#: builtin/branch.c:605
-msgid "Specific git-branch actions:"
+#: wt-status.c:281
+msgid "copied:"
msgstr ""
-#: builtin/branch.c:606
-msgid "list both remote-tracking and local branches"
+#: wt-status.c:283
+msgid "deleted:"
msgstr ""
-#: builtin/branch.c:608
-msgid "delete fully merged branch"
+#: wt-status.c:285
+msgid "modified:"
msgstr ""
-#: builtin/branch.c:609
-msgid "delete branch (even if not merged)"
+#: wt-status.c:287
+msgid "renamed:"
msgstr ""
-#: builtin/branch.c:610
-msgid "move/rename a branch and its reflog"
+#: wt-status.c:289
+msgid "typechange:"
msgstr ""
-#: builtin/branch.c:611
-msgid "move/rename a branch, even if target exists"
+#: wt-status.c:291
+msgid "unknown:"
msgstr ""
-#: builtin/branch.c:612
-msgid "copy a branch and its reflog"
+#: wt-status.c:293
+msgid "unmerged:"
msgstr ""
-#: builtin/branch.c:613
-msgid "copy a branch, even if target exists"
+#: wt-status.c:373
+msgid "new commits, "
msgstr ""
-#: builtin/branch.c:614
-msgid "list branch names"
+#: wt-status.c:375
+msgid "modified content, "
msgstr ""
-#: builtin/branch.c:615
-msgid "create the branch's reflog"
+#: wt-status.c:377
+msgid "untracked content, "
msgstr ""
-#: builtin/branch.c:617
-msgid "edit the description for the branch"
-msgstr ""
+#: wt-status.c:884
+#, c-format
+msgid "Your stash currently has %d entry"
+msgid_plural "Your stash currently has %d entries"
+msgstr[0] ""
+msgstr[1] ""
-#: builtin/branch.c:618
-msgid "force creation, move/rename, deletion"
+#: wt-status.c:916
+msgid "Submodules changed but not updated:"
msgstr ""
-#: builtin/branch.c:619
-msgid "print only branches that are merged"
+#: wt-status.c:918
+msgid "Submodule changes to be committed:"
msgstr ""
-#: builtin/branch.c:620
-msgid "print only branches that are not merged"
+#: wt-status.c:1000
+msgid ""
+"Do not modify or remove the line above.\n"
+"Everything below it will be ignored."
msgstr ""
-#: builtin/branch.c:621
-msgid "list branches in columns"
+#: wt-status.c:1101
+msgid "You have unmerged paths."
msgstr ""
-#: builtin/branch.c:622 builtin/for-each-ref.c:40 builtin/tag.c:411
-msgid "key"
+#: wt-status.c:1104
+msgid " (fix conflicts and run \"git commit\")"
msgstr ""
-#: builtin/branch.c:623 builtin/for-each-ref.c:41 builtin/tag.c:412
-msgid "field name to sort on"
+#: wt-status.c:1106
+msgid " (use \"git merge --abort\" to abort the merge)"
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"
+#: wt-status.c:1110
+msgid "All conflicts fixed but you are still merging."
msgstr ""
-#: builtin/branch.c:626
-msgid "print only branches of the object"
+#: wt-status.c:1113
+msgid " (use \"git commit\" to conclude merge)"
msgstr ""
-#: builtin/branch.c:628 builtin/for-each-ref.c:49 builtin/tag.c:421
-msgid "sorting and filtering are case insensitive"
+#: wt-status.c:1122
+msgid "You are in the middle of an am session."
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"
+#: wt-status.c:1125
+msgid "The current patch is empty."
msgstr ""
-#: builtin/branch.c:652 builtin/clone.c:735
-msgid "HEAD not found below refs/heads!"
+#: wt-status.c:1129
+msgid " (fix conflicts and then run \"git am --continue\")"
msgstr ""
-#: builtin/branch.c:675
-msgid "--column and --verbose are incompatible"
+#: wt-status.c:1131
+msgid " (use \"git am --skip\" to skip this patch)"
msgstr ""
-#: builtin/branch.c:690 builtin/branch.c:742 builtin/branch.c:751
-msgid "branch name required"
+#: wt-status.c:1133
+msgid " (use \"git am --abort\" to restore the original branch)"
msgstr ""
-#: builtin/branch.c:718
-msgid "Cannot give description to detached HEAD"
+#: wt-status.c:1264
+msgid "git-rebase-todo is missing."
msgstr ""
-#: builtin/branch.c:723
-msgid "cannot edit description of more than one branch"
+#: wt-status.c:1266
+msgid "No commands done."
msgstr ""
-#: builtin/branch.c:730
+#: wt-status.c:1269
#, c-format
-msgid "No commit on branch '%s' yet."
-msgstr ""
+msgid "Last command done (%d command done):"
+msgid_plural "Last commands done (%d commands done):"
+msgstr[0] ""
+msgstr[1] ""
-#: builtin/branch.c:733
+#: wt-status.c:1280
#, c-format
-msgid "No branch named '%s'."
+msgid " (see more in file %s)"
msgstr ""
-#: builtin/branch.c:748
-msgid "too many branches for a copy operation"
+#: wt-status.c:1285
+msgid "No commands remaining."
msgstr ""
-#: builtin/branch.c:757
-msgid "too many arguments for a rename operation"
-msgstr ""
+#: wt-status.c:1288
+#, c-format
+msgid "Next command to do (%d remaining command):"
+msgid_plural "Next commands to do (%d remaining commands):"
+msgstr[0] ""
+msgstr[1] ""
-#: builtin/branch.c:762
-msgid "too many arguments to set new upstream"
+#: wt-status.c:1296
+msgid " (use \"git rebase --edit-todo\" to view and edit)"
msgstr ""
-#: builtin/branch.c:766
+#: wt-status.c:1308
#, c-format
-msgid ""
-"could not set upstream of HEAD to %s when it does not point to any branch."
+msgid "You are currently rebasing branch '%s' on '%s'."
msgstr ""
-#: builtin/branch.c:769 builtin/branch.c:791 builtin/branch.c:807
-#, c-format
-msgid "no such branch '%s'"
+#: wt-status.c:1313
+msgid "You are currently rebasing."
msgstr ""
-#: builtin/branch.c:773
-#, c-format
-msgid "branch '%s' does not exist"
+#: wt-status.c:1326
+msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr ""
-#: builtin/branch.c:785
-msgid "too many arguments to unset upstream"
+#: wt-status.c:1328
+msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr ""
-#: builtin/branch.c:789
-msgid "could not unset upstream of HEAD when it does not point to any branch."
+#: wt-status.c:1330
+msgid " (use \"git rebase --abort\" to check out the original branch)"
+msgstr ""
+
+#: wt-status.c:1337
+msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr ""
-#: builtin/branch.c:795
+#: wt-status.c:1341
#, c-format
-msgid "Branch '%s' has no upstream information"
+msgid ""
+"You are currently splitting a commit while rebasing branch '%s' on '%s'."
msgstr ""
-#: builtin/branch.c:810
-msgid "-a and -r options to 'git branch' do not make sense with a branch name"
+#: wt-status.c:1346
+msgid "You are currently splitting a commit during a rebase."
msgstr ""
-#: builtin/branch.c:813
-msgid ""
-"the '--set-upstream' option is no longer supported. Please use '--track' or "
-"'--set-upstream-to' instead."
+#: wt-status.c:1349
+msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr ""
-#: builtin/bundle.c:45
+#: wt-status.c:1353
#, c-format
-msgid "%s is okay\n"
+msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr ""
-#: builtin/bundle.c:58
-msgid "Need a repository to create a bundle."
+#: wt-status.c:1358
+msgid "You are currently editing a commit during a rebase."
msgstr ""
-#: builtin/bundle.c:62
-msgid "Need a repository to unbundle."
+#: wt-status.c:1361
+msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr ""
-#: builtin/cat-file.c:523
+#: wt-status.c:1363
msgid ""
-"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
-"p | <type> | --textconv | --filters) [--path=<path>] <object>"
+" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr ""
-#: builtin/cat-file.c:524
-msgid ""
-"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
-"filters]"
+#: wt-status.c:1372
+#, c-format
+msgid "You are currently cherry-picking commit %s."
msgstr ""
-#: builtin/cat-file.c:561
-msgid "<type> can be one of: blob, tree, commit, tag"
+#: wt-status.c:1377
+msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr ""
-#: builtin/cat-file.c:562
-msgid "show object type"
+#: wt-status.c:1380
+msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr ""
-#: builtin/cat-file.c:563
-msgid "show object size"
+#: wt-status.c:1382
+msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr ""
-#: builtin/cat-file.c:565
-msgid "exit with zero when there's no error"
+#: wt-status.c:1390
+#, c-format
+msgid "You are currently reverting commit %s."
msgstr ""
-#: builtin/cat-file.c:566
-msgid "pretty-print object's content"
+#: wt-status.c:1395
+msgid " (fix conflicts and run \"git revert --continue\")"
msgstr ""
-#: builtin/cat-file.c:568
-msgid "for blob objects, run textconv on object's content"
+#: wt-status.c:1398
+msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr ""
-#: builtin/cat-file.c:570
-msgid "for blob objects, run filters on object's content"
+#: wt-status.c:1400
+msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr ""
-#: builtin/cat-file.c:571 git-submodule.sh:878
-msgid "blob"
+#: wt-status.c:1410
+#, c-format
+msgid "You are currently bisecting, started from branch '%s'."
msgstr ""
-#: builtin/cat-file.c:572
-msgid "use a specific path for --textconv/--filters"
+#: wt-status.c:1414
+msgid "You are currently bisecting."
msgstr ""
-#: builtin/cat-file.c:574
-msgid "allow -s and -t to work with broken/corrupt objects"
+#: wt-status.c:1417
+msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr ""
-#: builtin/cat-file.c:575
-msgid "buffer --batch output"
+#: wt-status.c:1617
+msgid "On branch "
msgstr ""
-#: builtin/cat-file.c:577
-msgid "show info and content of objects fed from the standard input"
+#: wt-status.c:1624
+msgid "interactive rebase in progress; onto "
msgstr ""
-#: builtin/cat-file.c:580
-msgid "show info about objects fed from the standard input"
+#: wt-status.c:1626
+msgid "rebase in progress; onto "
msgstr ""
-#: builtin/cat-file.c:583
-msgid "follow in-tree symlinks (used with --batch or --batch-check)"
+#: wt-status.c:1631
+msgid "HEAD detached at "
msgstr ""
-#: builtin/cat-file.c:585
-msgid "show all objects with --batch or --batch-check"
+#: wt-status.c:1633
+msgid "HEAD detached from "
msgstr ""
-#: builtin/check-attr.c:12
-msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
+#: wt-status.c:1636
+msgid "Not currently on any branch."
msgstr ""
-#: builtin/check-attr.c:13
-msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
+#: wt-status.c:1653
+msgid "Initial commit"
msgstr ""
-#: builtin/check-attr.c:20
-msgid "report all attributes set on file"
+#: wt-status.c:1654
+msgid "No commits yet"
msgstr ""
-#: builtin/check-attr.c:21
-msgid "use .gitattributes only from the index"
+#: wt-status.c:1668
+msgid "Untracked files"
msgstr ""
-#: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:100
-msgid "read file names from stdin"
+#: wt-status.c:1670
+msgid "Ignored files"
msgstr ""
-#: builtin/check-attr.c:24 builtin/check-ignore.c:26
-msgid "terminate input and output records by a NUL character"
+#: wt-status.c:1674
+#, 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/check-ignore.c:20 builtin/checkout.c:1106 builtin/gc.c:358
-msgid "suppress progress reporting"
+#: wt-status.c:1680
+#, c-format
+msgid "Untracked files not listed%s"
msgstr ""
-#: builtin/check-ignore.c:28
-msgid "show non-matching input paths"
+#: wt-status.c:1682
+msgid " (use -u option to show untracked files)"
msgstr ""
-#: builtin/check-ignore.c:30
-msgid "ignore index when checking"
+#: wt-status.c:1688
+msgid "No changes"
msgstr ""
-#: builtin/check-ignore.c:159
-msgid "cannot specify pathnames with --stdin"
+#: wt-status.c:1693
+#, c-format
+msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr ""
-#: builtin/check-ignore.c:162
-msgid "-z only makes sense with --stdin"
+#: wt-status.c:1696
+#, c-format
+msgid "no changes added to commit\n"
msgstr ""
-#: builtin/check-ignore.c:164
-msgid "no path specified"
+#: wt-status.c:1699
+#, c-format
+msgid ""
+"nothing added to commit but untracked files present (use \"git add\" to "
+"track)\n"
msgstr ""
-#: builtin/check-ignore.c:168
-msgid "--quiet is only valid with a single pathname"
+#: wt-status.c:1702
+#, c-format
+msgid "nothing added to commit but untracked files present\n"
msgstr ""
-#: builtin/check-ignore.c:170
-msgid "cannot have both --quiet and --verbose"
+#: wt-status.c:1705
+#, c-format
+msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr ""
-#: builtin/check-ignore.c:173
-msgid "--non-matching is only valid with --verbose"
+#: wt-status.c:1708 wt-status.c:1713
+#, c-format
+msgid "nothing to commit\n"
msgstr ""
-#: builtin/check-mailmap.c:9
-msgid "git check-mailmap [<options>] <contact>..."
+#: wt-status.c:1711
+#, c-format
+msgid "nothing to commit (use -u to show untracked files)\n"
msgstr ""
-#: builtin/check-mailmap.c:14
-msgid "also read contacts from stdin"
+#: wt-status.c:1715
+#, c-format
+msgid "nothing to commit, working tree clean\n"
msgstr ""
-#: builtin/check-mailmap.c:25
-#, c-format
-msgid "unable to parse contact: %s"
+#: wt-status.c:1828
+msgid "No commits yet on "
msgstr ""
-#: builtin/check-mailmap.c:48
-msgid "no contacts specified"
+#: wt-status.c:1832
+msgid "HEAD (no branch)"
msgstr ""
-#: builtin/checkout-index.c:128
-msgid "git checkout-index [<options>] [--] [<file>...]"
+#: wt-status.c:1863
+msgid "different"
msgstr ""
-#: builtin/checkout-index.c:143
-msgid "stage should be between 1 and 3 or all"
+#: wt-status.c:1865 wt-status.c:1873
+msgid "behind "
msgstr ""
-#: builtin/checkout-index.c:159
-msgid "check out all files in the index"
+#: wt-status.c:1868 wt-status.c:1871
+msgid "ahead "
msgstr ""
-#: builtin/checkout-index.c:160
-msgid "force overwrite of existing files"
+#. TRANSLATORS: the action is e.g. "pull with rebase"
+#: wt-status.c:2386
+#, c-format
+msgid "cannot %s: You have unstaged changes."
msgstr ""
-#: builtin/checkout-index.c:162
-msgid "no warning for existing files and files not in index"
+#: wt-status.c:2392
+msgid "additionally, your index contains uncommitted changes."
msgstr ""
-#: builtin/checkout-index.c:164
-msgid "don't checkout new files"
+#: wt-status.c:2394
+#, c-format
+msgid "cannot %s: Your index contains uncommitted changes."
msgstr ""
-#: builtin/checkout-index.c:166
-msgid "update stat information in the index file"
+#: builtin/add.c:25
+msgid "git add [<options>] [--] <pathspec>..."
msgstr ""
-#: builtin/checkout-index.c:170
-msgid "read list of paths from the standard input"
+#: builtin/add.c:84
+#, c-format
+msgid "unexpected diff status %c"
msgstr ""
-#: builtin/checkout-index.c:172
-msgid "write the content to temporary files"
+#: builtin/add.c:89 builtin/commit.c:285
+msgid "updating files failed"
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"
+#: builtin/add.c:99
+#, c-format
+msgid "remove '%s'\n"
msgstr ""
-#: builtin/checkout-index.c:174
-msgid "when creating files, prepend <string>"
+#: builtin/add.c:174
+msgid "Unstaged changes after refreshing the index:"
msgstr ""
-#: builtin/checkout-index.c:176
-msgid "copy out the files from named stage"
+#: builtin/add.c:234 builtin/rev-parse.c:896
+msgid "Could not read the index"
msgstr ""
-#: builtin/checkout.c:27
-msgid "git checkout [<options>] <branch>"
+#: builtin/add.c:245
+#, c-format
+msgid "Could not open '%s' for writing."
msgstr ""
-#: builtin/checkout.c:28
-msgid "git checkout [<options>] [<branch>] -- <file>..."
+#: builtin/add.c:249
+msgid "Could not write patch"
msgstr ""
-#: builtin/checkout.c:136 builtin/checkout.c:169
-#, c-format
-msgid "path '%s' does not have our version"
+#: builtin/add.c:252
+msgid "editing patch failed"
msgstr ""
-#: builtin/checkout.c:138 builtin/checkout.c:171
+#: builtin/add.c:255
#, c-format
-msgid "path '%s' does not have their version"
+msgid "Could not stat '%s'"
msgstr ""
-#: builtin/checkout.c:154
-#, c-format
-msgid "path '%s' does not have all necessary versions"
+#: builtin/add.c:257
+msgid "Empty patch. Aborted."
msgstr ""
-#: builtin/checkout.c:198
+#: builtin/add.c:262
#, c-format
-msgid "path '%s' does not have necessary versions"
+msgid "Could not apply '%s'"
msgstr ""
-#: builtin/checkout.c:215
-#, c-format
-msgid "path '%s': cannot merge"
+#: builtin/add.c:270
+msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr ""
-#: builtin/checkout.c:231
-#, c-format
-msgid "Unable to add merge result for '%s'"
+#: builtin/add.c:290 builtin/clean.c:908 builtin/fetch.c:137 builtin/mv.c:124
+#: builtin/prune-packed.c:56 builtin/pull.c:214 builtin/push.c:560
+#: builtin/remote.c:1345 builtin/rm.c:241 builtin/send-pack.c:165
+msgid "dry run"
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"
+#: builtin/add.c:293
+msgid "interactive picking"
msgstr ""
-#: builtin/checkout.c:265 builtin/checkout.c:268
-#, c-format
-msgid "'%s' cannot be used with %s"
+#: builtin/add.c:294 builtin/checkout.c:1304 builtin/reset.c:306
+msgid "select hunks interactively"
msgstr ""
-#: builtin/checkout.c:271
-#, c-format
-msgid "Cannot update paths and switch to branch '%s' at the same time."
+#: builtin/add.c:295
+msgid "edit current diff and apply"
msgstr ""
-#: builtin/checkout.c:340 builtin/checkout.c:347
-#, c-format
-msgid "path '%s' is unmerged"
+#: builtin/add.c:296
+msgid "allow adding otherwise ignored files"
msgstr ""
-#: builtin/checkout.c:505
-msgid "you need to resolve your current index first"
+#: builtin/add.c:297
+msgid "update tracked files"
msgstr ""
-#: builtin/checkout.c:636
-#, c-format
-msgid "Can not do reflog for '%s': %s\n"
+#: builtin/add.c:298
+msgid "renormalize EOL of tracked files (implies -u)"
msgstr ""
-#: builtin/checkout.c:677
-msgid "HEAD is now at"
+#: builtin/add.c:299
+msgid "record only the fact that the path will be added later"
msgstr ""
-#: builtin/checkout.c:681 builtin/clone.c:689
-msgid "unable to update HEAD"
+#: builtin/add.c:300
+msgid "add changes from all tracked and untracked files"
msgstr ""
-#: builtin/checkout.c:685
-#, c-format
-msgid "Reset branch '%s'\n"
+#: builtin/add.c:303
+msgid "ignore paths removed in the working tree (same as --no-all)"
msgstr ""
-#: builtin/checkout.c:688
-#, c-format
-msgid "Already on '%s'\n"
+#: builtin/add.c:305
+msgid "don't add, only refresh the index"
msgstr ""
-#: builtin/checkout.c:692
-#, c-format
-msgid "Switched to and reset branch '%s'\n"
+#: builtin/add.c:306
+msgid "just skip files which cannot be added because of errors"
msgstr ""
-#: builtin/checkout.c:694 builtin/checkout.c:1039
-#, c-format
-msgid "Switched to a new branch '%s'\n"
+#: builtin/add.c:307
+msgid "check if - even missing - files are ignored in dry run"
msgstr ""
-#: builtin/checkout.c:696
-#, c-format
-msgid "Switched to branch '%s'\n"
+#: builtin/add.c:309 builtin/update-index.c:991
+msgid "override the executable bit of the listed files"
msgstr ""
-#: builtin/checkout.c:747
-#, c-format
-msgid " ... and %d more.\n"
+#: builtin/add.c:311
+msgid "warn when adding an embedded repository"
msgstr ""
-#: builtin/checkout.c:753
+#: builtin/add.c:326
#, c-format
msgid ""
-"Warning: you are leaving %d commit behind, not connected to\n"
-"any of your branches:\n"
+"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"
-"%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
-#, 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"
+"\tgit submodule add <url> %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"
+"If you added this path by mistake, you can remove it from the\n"
+"index with:\n"
"\n"
-" git branch <new-branch-name> %s\n"
+"\tgit rm --cached %s\n"
"\n"
-msgstr[0] ""
-msgstr[1] ""
+"See \"git help submodule\" for more information."
+msgstr ""
-#: builtin/checkout.c:804
-msgid "internal error in revision walk"
+#: builtin/add.c:354
+#, c-format
+msgid "adding embedded git repository: %s"
msgstr ""
-#: builtin/checkout.c:808
-msgid "Previous HEAD position was"
+#: builtin/add.c:372
+#, c-format
+msgid "Use -f if you really want to add them.\n"
msgstr ""
-#: builtin/checkout.c:836 builtin/checkout.c:1034
-msgid "You are on a branch yet to be born"
+#: builtin/add.c:380
+msgid "adding files failed"
+msgstr ""
+
+#: builtin/add.c:418
+msgid "-A and -u are mutually incompatible"
msgstr ""
-#: builtin/checkout.c:940
+#: builtin/add.c:425
+msgid "Option --ignore-missing can only be used together with --dry-run"
+msgstr ""
+
+#: builtin/add.c:429
#, c-format
-msgid "only one reference expected, %d given."
+msgid "--chmod param '%s' must be either -x or +x"
msgstr ""
-#: builtin/checkout.c:980 builtin/worktree.c:249
+#: builtin/add.c:444
#, c-format
-msgid "invalid reference: %s"
+msgid "Nothing specified, nothing added.\n"
msgstr ""
-#: builtin/checkout.c:1009
+#: builtin/add.c:445
#, c-format
-msgid "reference is not a tree: %s"
+msgid "Maybe you wanted to say 'git add .'?\n"
msgstr ""
-#: builtin/checkout.c:1048
-msgid "paths cannot be used with switching branches"
+#: builtin/am.c:348
+msgid "could not parse author script"
msgstr ""
-#: builtin/checkout.c:1051 builtin/checkout.c:1055
+#: builtin/am.c:432
#, c-format
-msgid "'%s' cannot be used with switching branches"
+msgid "'%s' was deleted by the applypatch-msg hook"
msgstr ""
-#: builtin/checkout.c:1059 builtin/checkout.c:1062 builtin/checkout.c:1067
-#: builtin/checkout.c:1070
+#: builtin/am.c:473
#, c-format
-msgid "'%s' cannot be used with '%s'"
+msgid "Malformed input line: '%s'."
msgstr ""
-#: builtin/checkout.c:1075
+#: builtin/am.c:510
#, c-format
-msgid "Cannot switch branch to a non-commit '%s'"
+msgid "Failed to copy notes from '%s' to '%s'"
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"
+#: builtin/am.c:536
+msgid "fseek failed"
msgstr ""
-#: builtin/checkout.c:1108
-msgid "create and checkout a new branch"
+#: builtin/am.c:724
+#, c-format
+msgid "could not parse patch '%s'"
msgstr ""
-#: builtin/checkout.c:1110
-msgid "create/reset and checkout a branch"
+#: builtin/am.c:789
+msgid "Only one StGIT patch series can be applied at once"
msgstr ""
-#: builtin/checkout.c:1111
-msgid "create reflog for new branch"
+#: builtin/am.c:837
+msgid "invalid timestamp"
msgstr ""
-#: builtin/checkout.c:1112 builtin/worktree.c:391
-msgid "detach HEAD at named commit"
+#: builtin/am.c:842 builtin/am.c:854
+msgid "invalid Date line"
msgstr ""
-#: builtin/checkout.c:1113
-msgid "set upstream info for new branch"
+#: builtin/am.c:849
+msgid "invalid timezone offset"
msgstr ""
-#: builtin/checkout.c:1115
-msgid "new-branch"
+#: builtin/am.c:942
+msgid "Patch format detection failed."
msgstr ""
-#: builtin/checkout.c:1115
-msgid "new unparented branch"
+#: builtin/am.c:947 builtin/clone.c:409
+#, c-format
+msgid "failed to create directory '%s'"
msgstr ""
-#: builtin/checkout.c:1116
-msgid "checkout our version for unmerged files"
+#: builtin/am.c:952
+msgid "Failed to split patches."
msgstr ""
-#: builtin/checkout.c:1118
-msgid "checkout their version for unmerged files"
+#: builtin/am.c:1082 builtin/commit.c:371
+msgid "unable to write index file"
msgstr ""
-#: builtin/checkout.c:1120
-msgid "force checkout (throw away local modifications)"
+#: builtin/am.c:1096
+#, c-format
+msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr ""
-#: builtin/checkout.c:1122
-msgid "perform a 3-way merge with the new branch"
+#: builtin/am.c:1097
+#, c-format
+msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr ""
-#: builtin/checkout.c:1124 builtin/merge.c:239
-msgid "update ignored files (default)"
+#: builtin/am.c:1098
+#, c-format
+msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr ""
-#: builtin/checkout.c:1126 builtin/log.c:1499 parse-options.h:263
-msgid "style"
+#: builtin/am.c:1181
+msgid "Patch sent with format=flowed; space at the end of lines might be lost."
msgstr ""
-#: builtin/checkout.c:1127
-msgid "conflict style (merge or diff3)"
+#: builtin/am.c:1209
+msgid "Patch is empty."
msgstr ""
-#: builtin/checkout.c:1130
-msgid "do not limit pathspecs to sparse entries only"
+#: builtin/am.c:1275
+#, c-format
+msgid "invalid ident line: %.*s"
msgstr ""
-#: builtin/checkout.c:1132
-msgid "second guess 'git checkout <no-such-branch>'"
+#: builtin/am.c:1297
+#, c-format
+msgid "unable to parse commit %s"
msgstr ""
-#: builtin/checkout.c:1134
-msgid "do not check if another worktree is holding the given ref"
+#: builtin/am.c:1493
+msgid "Repository lacks necessary blobs to fall back on 3-way merge."
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"
+#: builtin/am.c:1495
+msgid "Using index info to reconstruct a base tree..."
msgstr ""
-#: builtin/checkout.c:1168
-msgid "-b, -B and --orphan are mutually exclusive"
+#: builtin/am.c:1514
+msgid ""
+"Did you hand edit your patch?\n"
+"It does not apply to blobs recorded in its index."
msgstr ""
-#: builtin/checkout.c:1185
-msgid "--track needs a branch name"
+#: builtin/am.c:1520
+msgid "Falling back to patching base and 3-way merge..."
msgstr ""
-#: builtin/checkout.c:1190
-msgid "Missing branch name; try -b"
+#: builtin/am.c:1546
+msgid "Failed to merge in the changes."
msgstr ""
-#: builtin/checkout.c:1226
-msgid "invalid path specification"
+#: builtin/am.c:1578
+msgid "applying to an empty history"
msgstr ""
-#: builtin/checkout.c:1233
+#: builtin/am.c:1624 builtin/am.c:1628
#, c-format
-msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
+msgid "cannot resume: %s does not exist."
msgstr ""
-#: builtin/checkout.c:1237
-#, c-format
-msgid "git checkout: --detach does not take a path argument '%s'"
+#: builtin/am.c:1644
+msgid "cannot be interactive without stdin connected to a terminal."
msgstr ""
-#: builtin/checkout.c:1241
-msgid ""
-"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
-"checking out of the index."
+#: builtin/am.c:1649
+msgid "Commit Body is:"
msgstr ""
-#: builtin/clean.c:26
-msgid ""
-"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
+#. 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:1659
+msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr ""
-#: builtin/clean.c:30
+#: builtin/am.c:1709
#, c-format
-msgid "Removing %s\n"
+msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr ""
-#: builtin/clean.c:31
+#: builtin/am.c:1749 builtin/am.c:1817
#, c-format
-msgid "Would remove %s\n"
+msgid "Applying: %.*s"
msgstr ""
-#: builtin/clean.c:32
-#, c-format
-msgid "Skipping repository %s\n"
+#: builtin/am.c:1766
+msgid "No changes -- Patch already applied."
msgstr ""
-#: builtin/clean.c:33
+#: builtin/am.c:1772
#, c-format
-msgid "Would skip repository %s\n"
+msgid "Patch failed at %s %.*s"
msgstr ""
-#: builtin/clean.c:34
-#, c-format
-msgid "failed to remove %s"
+#: builtin/am.c:1776
+msgid "Use 'git am --show-current-patch' to see the failed patch"
msgstr ""
-#: builtin/clean.c:302 git-add--interactive.perl:572
-#, c-format
+#: builtin/am.c:1820
msgid ""
-"Prompt help:\n"
-"1 - select a numbered item\n"
-"foo - select item based on unique prefix\n"
-" - (empty) select nothing\n"
+"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/clean.c:306 git-add--interactive.perl:581
-#, c-format
+#: builtin/am.c:1827
msgid ""
-"Prompt help:\n"
-"1 - select a single item\n"
-"3-5 - select a range of items\n"
-"2-3,6-9 - select multiple ranges\n"
-"foo - select item based on unique prefix\n"
-"-... - unselect specified items\n"
-"* - choose all items\n"
-" - (empty) finish selecting\n"
-msgstr ""
-
-#: builtin/clean.c:522 git-add--interactive.perl:547
-#: git-add--interactive.perl:552
-#, c-format, perl-format
-msgid "Huh (%s)?\n"
+"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/clean.c:664
+#: builtin/am.c:1934 builtin/am.c:1938 builtin/am.c:1950 builtin/reset.c:329
+#: builtin/reset.c:337
#, c-format
-msgid "Input ignore patterns>> "
+msgid "Could not parse object '%s'."
msgstr ""
-#: builtin/clean.c:701
-#, c-format
-msgid "WARNING: Cannot find items matched by: %s"
+#: builtin/am.c:1986
+msgid "failed to clean index"
msgstr ""
-#: builtin/clean.c:722
-msgid "Select items to delete"
+#: builtin/am.c:2030
+msgid ""
+"You seem to have moved HEAD since the last 'am' failure.\n"
+"Not rewinding to ORIG_HEAD"
msgstr ""
-#. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:763
+#: builtin/am.c:2123
#, c-format
-msgid "Remove %s [y/N]? "
+msgid "Invalid value for --patch-format: %s"
msgstr ""
-#: builtin/clean.c:788 git-add--interactive.perl:1710
-#, c-format
-msgid "Bye.\n"
+#: builtin/am.c:2159
+msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
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"
+#: builtin/am.c:2160
+msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr ""
-#: builtin/clean.c:823 git-add--interactive.perl:1786
-msgid "*** Commands ***"
+#: builtin/am.c:2166
+msgid "run interactively"
msgstr ""
-#: builtin/clean.c:824 git-add--interactive.perl:1783
-msgid "What now"
+#: builtin/am.c:2168
+msgid "historical option -- no-op"
msgstr ""
-#: builtin/clean.c:832
-msgid "Would remove the following item:"
-msgid_plural "Would remove the following items:"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/clean.c:848
-msgid "No more files to clean, exiting."
+#: builtin/am.c:2170
+msgid "allow fall back on 3way merging if needed"
msgstr ""
-#: builtin/clean.c:910
-msgid "do not print names of files removed"
+#: builtin/am.c:2171 builtin/init-db.c:486 builtin/prune-packed.c:58
+#: builtin/repack.c:306
+msgid "be quiet"
msgstr ""
-#: builtin/clean.c:912
-msgid "force"
+#: builtin/am.c:2173
+msgid "add a Signed-off-by line to the commit message"
msgstr ""
-#: builtin/clean.c:913
-msgid "interactive cleaning"
+#: builtin/am.c:2176
+msgid "recode into utf8 (default)"
msgstr ""
-#: builtin/clean.c:915
-msgid "remove whole directories"
+#: builtin/am.c:2178
+msgid "pass -k flag to git-mailinfo"
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"
+#: builtin/am.c:2180
+msgid "pass -b flag to git-mailinfo"
msgstr ""
-#: builtin/clean.c:917
-msgid "add <pattern> to ignore rules"
+#: builtin/am.c:2182
+msgid "pass -m flag to git-mailinfo"
msgstr ""
-#: builtin/clean.c:918
-msgid "remove ignored files, too"
+#: builtin/am.c:2184
+msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr ""
-#: builtin/clean.c:920
-msgid "remove only ignored files"
+#: builtin/am.c:2187
+msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr ""
-#: builtin/clean.c:938
-msgid "-x and -X cannot be used together"
+#: builtin/am.c:2190
+msgid "strip everything before a scissors line"
msgstr ""
-#: builtin/clean.c:942
-msgid ""
-"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
-"clean"
+#: builtin/am.c:2192 builtin/am.c:2195 builtin/am.c:2198 builtin/am.c:2201
+#: builtin/am.c:2204 builtin/am.c:2207 builtin/am.c:2210 builtin/am.c:2213
+#: builtin/am.c:2219
+msgid "pass it through git-apply"
msgstr ""
-#: builtin/clean.c:945
-msgid ""
-"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
-"refusing to clean"
+#: builtin/am.c:2209 builtin/commit.c:1343 builtin/fmt-merge-msg.c:671
+#: builtin/fmt-merge-msg.c:674 builtin/grep.c:879 builtin/merge.c:240
+#: builtin/pull.c:152 builtin/pull.c:210 builtin/rebase.c:1062
+#: builtin/repack.c:317 builtin/repack.c:321 builtin/repack.c:323
+#: builtin/show-branch.c:651 builtin/show-ref.c:171 builtin/tag.c:386
+#: parse-options.h:144 parse-options.h:146 parse-options.h:266
+msgid "n"
msgstr ""
-#: builtin/clone.c:40
-msgid "git clone [<options>] [--] <repo> [<dir>]"
+#: builtin/am.c:2215 builtin/branch.c:637 builtin/for-each-ref.c:38
+#: builtin/replace.c:544 builtin/tag.c:422 builtin/verify-tag.c:39
+msgid "format"
msgstr ""
-#: builtin/clone.c:85
-msgid "don't create a checkout"
+#: builtin/am.c:2216
+msgid "format the patch(es) are in"
msgstr ""
-#: builtin/clone.c:86 builtin/clone.c:88 builtin/init-db.c:479
-msgid "create a bare repository"
+#: builtin/am.c:2222
+msgid "override error message when patch failure occurs"
msgstr ""
-#: builtin/clone.c:90
-msgid "create a mirror repository (implies bare)"
+#: builtin/am.c:2224
+msgid "continue applying patches after resolving a conflict"
msgstr ""
-#: builtin/clone.c:92
-msgid "to clone from a local repository"
+#: builtin/am.c:2227
+msgid "synonyms for --continue"
msgstr ""
-#: builtin/clone.c:94
-msgid "don't use local hardlinks, always copy"
+#: builtin/am.c:2230
+msgid "skip the current patch"
msgstr ""
-#: builtin/clone.c:96
-msgid "setup as shared repository"
+#: builtin/am.c:2233
+msgid "restore the original branch and abort the patching operation."
msgstr ""
-#: builtin/clone.c:98 builtin/clone.c:102
-msgid "pathspec"
+#: builtin/am.c:2236
+msgid "abort the patching operation but keep HEAD where it is."
msgstr ""
-#: builtin/clone.c:98 builtin/clone.c:102
-msgid "initialize submodules in the clone"
+#: builtin/am.c:2239
+msgid "show the patch being applied."
msgstr ""
-#: builtin/clone.c:105
-msgid "number of submodules cloned in parallel"
+#: builtin/am.c:2243
+msgid "lie about committer date"
msgstr ""
-#: builtin/clone.c:106 builtin/init-db.c:476
-msgid "template-directory"
+#: builtin/am.c:2245
+msgid "use current timestamp for author date"
msgstr ""
-#: builtin/clone.c:107 builtin/init-db.c:477
-msgid "directory from which templates will be used"
+#: builtin/am.c:2247 builtin/commit.c:1486 builtin/merge.c:274
+#: builtin/pull.c:185 builtin/rebase.c:1106 builtin/rebase--interactive.c:185
+#: builtin/revert.c:114 builtin/tag.c:402
+msgid "key-id"
msgstr ""
-#: builtin/clone.c:109 builtin/clone.c:111 builtin/submodule--helper.c:1210
-#: builtin/submodule--helper.c:1577
-msgid "reference repository"
+#: builtin/am.c:2248 builtin/rebase.c:1107 builtin/rebase--interactive.c:186
+msgid "GPG-sign commits"
msgstr ""
-#: builtin/clone.c:113
-msgid "use --reference only while cloning"
+#: builtin/am.c:2251
+msgid "(internal use for git-rebase)"
msgstr ""
-#: builtin/clone.c:114 builtin/column.c:27 builtin/merge-file.c:44
-msgid "name"
+#: builtin/am.c:2269
+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/clone.c:115
-msgid "use <name> instead of 'origin' to track upstream"
+#: builtin/am.c:2276
+msgid "failed to read the index"
msgstr ""
-#: builtin/clone.c:117
-msgid "checkout <branch> instead of the remote's HEAD"
+#: builtin/am.c:2291
+#, c-format
+msgid "previous rebase directory %s still exists but mbox given."
msgstr ""
-#: builtin/clone.c:119
-msgid "path to git-upload-pack on the remote"
+#: builtin/am.c:2315
+#, c-format
+msgid ""
+"Stray %s directory found.\n"
+"Use \"git am --abort\" to remove it."
msgstr ""
-#: builtin/clone.c:120 builtin/fetch.c:151 builtin/grep.c:813
-#: builtin/pull.c:211
-msgid "depth"
+#: builtin/am.c:2321
+msgid "Resolve operation not in progress, we are not resuming."
msgstr ""
-#: builtin/clone.c:121
-msgid "create a shallow clone of that depth"
+#: builtin/apply.c:8
+msgid "git apply [<options>] [<patch>...]"
msgstr ""
-#: builtin/clone.c:122 builtin/fetch.c:153 builtin/pack-objects.c:3017
-#: parse-options.h:154
-msgid "time"
+#: builtin/archive.c:17
+#, c-format
+msgid "could not create archive file '%s'"
msgstr ""
-#: builtin/clone.c:123
-msgid "create a shallow clone since a specific time"
+#: builtin/archive.c:20
+msgid "could not redirect output"
msgstr ""
-#: builtin/clone.c:124 builtin/fetch.c:155
-msgid "revision"
+#: builtin/archive.c:37
+msgid "git archive: Remote with no URL"
msgstr ""
-#: builtin/clone.c:125 builtin/fetch.c:156
-msgid "deepen history of shallow clone, excluding rev"
+#: builtin/archive.c:61
+msgid "git archive: expected ACK/NAK, got a flush packet"
msgstr ""
-#: builtin/clone.c:127
-msgid "clone only one branch, HEAD or --branch"
+#: builtin/archive.c:64
+#, c-format
+msgid "git archive: NACK %s"
msgstr ""
-#: builtin/clone.c:129
-msgid "don't clone any tags, and make later fetches not to follow them"
+#: builtin/archive.c:65
+msgid "git archive: protocol error"
msgstr ""
-#: builtin/clone.c:131
-msgid "any cloned submodules will be shallow"
+#: builtin/archive.c:69
+msgid "git archive: expected a flush"
msgstr ""
-#: builtin/clone.c:132 builtin/init-db.c:485
-msgid "gitdir"
+#: builtin/bisect--helper.c:22
+msgid "git bisect--helper --next-all [--no-checkout]"
msgstr ""
-#: builtin/clone.c:133 builtin/init-db.c:486
-msgid "separate git dir from working tree"
+#: builtin/bisect--helper.c:23
+msgid "git bisect--helper --write-terms <bad_term> <good_term>"
msgstr ""
-#: builtin/clone.c:134
-msgid "key=value"
+#: builtin/bisect--helper.c:24
+msgid "git bisect--helper --bisect-clean-state"
msgstr ""
-#: builtin/clone.c:135
-msgid "set config inside the new repository"
+#: builtin/bisect--helper.c:25
+msgid "git bisect--helper --bisect-reset [<commit>]"
msgstr ""
-#: builtin/clone.c:136 builtin/fetch.c:173 builtin/pull.c:224
-#: builtin/push.c:567
-msgid "use IPv4 addresses only"
+#: builtin/bisect--helper.c:26
+msgid ""
+"git bisect--helper --bisect-write [--no-log] <state> <revision> <good_term> "
+"<bad_term>"
msgstr ""
-#: builtin/clone.c:138 builtin/fetch.c:175 builtin/pull.c:227
-#: builtin/push.c:569
-msgid "use IPv6 addresses only"
+#: builtin/bisect--helper.c:27
+msgid ""
+"git bisect--helper --bisect-check-and-set-terms <command> <good_term> "
+"<bad_term>"
+msgstr ""
+
+#: builtin/bisect--helper.c:28
+msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
msgstr ""
-#: builtin/clone.c:276
+#: builtin/bisect--helper.c:29
msgid ""
-"No directory name could be guessed.\n"
-"Please specify a directory on the command line"
+"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
+"term-new]"
msgstr ""
-#: builtin/clone.c:329
-#, c-format
-msgid "info: Could not add alternate for '%s': %s\n"
+#: builtin/bisect--helper.c:30
+msgid ""
+"git bisect--helper --bisect-start [--term-{old,good}=<term> --term-{new,bad}"
+"=<term>][--no-checkout] [<bad> [<good>...]] [--] [<paths>...]"
msgstr ""
-#: builtin/clone.c:401
+#: builtin/bisect--helper.c:86
#, c-format
-msgid "failed to open '%s'"
+msgid "'%s' is not a valid term"
msgstr ""
-#: builtin/clone.c:409
+#: builtin/bisect--helper.c:90
#, c-format
-msgid "%s exists and is not a directory"
+msgid "can't use the builtin command '%s' as a term"
msgstr ""
-#: builtin/clone.c:423
+#: builtin/bisect--helper.c:100
#, c-format
-msgid "failed to stat %s\n"
+msgid "can't change the meaning of the term '%s'"
msgstr ""
-#: builtin/clone.c:445
-#, c-format
-msgid "failed to create link '%s'"
+#: builtin/bisect--helper.c:111
+msgid "please use two different terms"
msgstr ""
-#: builtin/clone.c:449
-#, c-format
-msgid "failed to copy file to '%s'"
+#: builtin/bisect--helper.c:118
+msgid "could not open the file BISECT_TERMS"
msgstr ""
-#: builtin/clone.c:475
+#: builtin/bisect--helper.c:155
#, c-format
-msgid "done.\n"
+msgid "We are not bisecting.\n"
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"
+#: builtin/bisect--helper.c:163
+#, c-format
+msgid "'%s' is not a valid commit"
msgstr ""
-#: builtin/clone.c:566
+#: builtin/bisect--helper.c:174
#, c-format
-msgid "Could not find remote branch %s to clone."
+msgid ""
+"could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
msgstr ""
-#: builtin/clone.c:661
-msgid "remote did not send all necessary objects"
+#: builtin/bisect--helper.c:215
+#, c-format
+msgid "Bad bisect_write argument: %s"
msgstr ""
-#: builtin/clone.c:677
+#: builtin/bisect--helper.c:220
#, c-format
-msgid "unable to update %s"
+msgid "couldn't get the oid of the rev '%s'"
msgstr ""
-#: builtin/clone.c:726
-msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
+#: builtin/bisect--helper.c:232
+#, c-format
+msgid "couldn't open the file '%s'"
msgstr ""
-#: builtin/clone.c:756
-msgid "unable to checkout working tree"
+#: builtin/bisect--helper.c:258
+#, c-format
+msgid "Invalid command: you're currently in a %s/%s bisect"
msgstr ""
-#: builtin/clone.c:801
-msgid "unable to write parameters to config file"
+#: builtin/bisect--helper.c:285
+#, c-format
+msgid ""
+"You need to give me at least one %s and %s revision.\n"
+"You can use \"git bisect %s\" and \"git bisect %s\" for that."
msgstr ""
-#: builtin/clone.c:864
-msgid "cannot repack to clean up"
+#: builtin/bisect--helper.c:289
+#, c-format
+msgid ""
+"You need to start by \"git bisect start\".\n"
+"You then need to give me at least one %s and %s revision.\n"
+"You can use \"git bisect %s\" and \"git bisect %s\" for that."
msgstr ""
-#: builtin/clone.c:866
-msgid "cannot unlink temporary alternates file"
+#: builtin/bisect--helper.c:321
+#, c-format
+msgid "bisecting only with a %s commit"
msgstr ""
-#: builtin/clone.c:906 builtin/receive-pack.c:1946
-msgid "Too many arguments."
+#. TRANSLATORS: Make sure to include [Y] and [n] in your
+#. translation. The program will only accept English input
+#. at this point.
+#.
+#: builtin/bisect--helper.c:329
+msgid "Are you sure [Y/n]? "
msgstr ""
-#: builtin/clone.c:910
-msgid "You must specify a repository to clone."
+#: builtin/bisect--helper.c:376
+msgid "no terms defined"
msgstr ""
-#: builtin/clone.c:923
+#: builtin/bisect--helper.c:379
#, c-format
-msgid "--bare and --origin %s options are incompatible."
-msgstr ""
-
-#: builtin/clone.c:926
-msgid "--bare and --separate-git-dir are incompatible."
+msgid ""
+"Your current terms are %s for the old state\n"
+"and %s for the new state.\n"
msgstr ""
-#: builtin/clone.c:939
+#: builtin/bisect--helper.c:389
#, c-format
-msgid "repository '%s' does not exist"
+msgid ""
+"invalid argument %s for 'git bisect terms'.\n"
+"Supported options are: --term-good|--term-old and --term-bad|--term-new."
msgstr ""
-#: builtin/clone.c:945 builtin/fetch.c:1455
+#: builtin/bisect--helper.c:475
#, c-format
-msgid "depth %s is not a positive number"
+msgid "unrecognized option: '%s'"
msgstr ""
-#: builtin/clone.c:955
+#: builtin/bisect--helper.c:479
#, c-format
-msgid "destination path '%s' already exists and is not an empty directory."
+msgid "'%s' does not appear to be a valid revision"
msgstr ""
-#: builtin/clone.c:965
-#, c-format
-msgid "working tree '%s' already exists."
+#: builtin/bisect--helper.c:511
+msgid "bad HEAD - I need a HEAD"
msgstr ""
-#: builtin/clone.c:980 builtin/clone.c:1001 builtin/difftool.c:270
-#: builtin/worktree.c:255 builtin/worktree.c:285
+#: builtin/bisect--helper.c:526
#, c-format
-msgid "could not create leading directories of '%s'"
+msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
msgstr ""
-#: builtin/clone.c:985
-#, c-format
-msgid "could not create work tree dir '%s'"
+#: builtin/bisect--helper.c:547
+msgid "won't bisect on cg-seek'ed tree"
msgstr ""
-#: builtin/clone.c:1005
-#, c-format
-msgid "Cloning into bare repository '%s'...\n"
+#: builtin/bisect--helper.c:550
+msgid "bad HEAD - strange symbolic ref"
msgstr ""
-#: builtin/clone.c:1007
-#, c-format
-msgid "Cloning into '%s'...\n"
+#: builtin/bisect--helper.c:627
+msgid "perform 'git bisect next'"
msgstr ""
-#: builtin/clone.c:1031
-msgid ""
-"clone --recursive is not compatible with both --reference and --reference-if-"
-"able"
+#: builtin/bisect--helper.c:629
+msgid "write the terms to .git/BISECT_TERMS"
msgstr ""
-#: builtin/clone.c:1093
-msgid "--depth is ignored in local clones; use file:// instead."
+#: builtin/bisect--helper.c:631
+msgid "cleanup the bisection state"
msgstr ""
-#: builtin/clone.c:1095
-msgid "--shallow-since is ignored in local clones; use file:// instead."
+#: builtin/bisect--helper.c:633
+msgid "check for expected revs"
msgstr ""
-#: builtin/clone.c:1097
-msgid "--shallow-exclude is ignored in local clones; use file:// instead."
+#: builtin/bisect--helper.c:635
+msgid "reset the bisection state"
msgstr ""
-#: builtin/clone.c:1099
-msgid "--filter is ignored in local clones; use file:// instead."
+#: builtin/bisect--helper.c:637
+msgid "write out the bisection state in BISECT_LOG"
msgstr ""
-#: builtin/clone.c:1102
-msgid "source repository is shallow, ignoring --local"
+#: builtin/bisect--helper.c:639
+msgid "check and set terms in a bisection state"
msgstr ""
-#: builtin/clone.c:1107
-msgid "--local is ignored"
+#: builtin/bisect--helper.c:641
+msgid "check whether bad or good terms exist"
msgstr ""
-#: builtin/clone.c:1169 builtin/clone.c:1177
-#, c-format
-msgid "Remote branch %s not found in upstream %s"
+#: builtin/bisect--helper.c:643
+msgid "print out the bisect terms"
msgstr ""
-#: builtin/clone.c:1180
-msgid "You appear to have cloned an empty repository."
+#: builtin/bisect--helper.c:645
+msgid "start the bisect session"
msgstr ""
-#: builtin/column.c:10
-msgid "git column [<options>]"
+#: builtin/bisect--helper.c:647
+msgid "update BISECT_HEAD instead of checking out the current commit"
msgstr ""
-#: builtin/column.c:27
-msgid "lookup config vars"
+#: builtin/bisect--helper.c:649
+msgid "no log for BISECT_WRITE"
msgstr ""
-#: builtin/column.c:28 builtin/column.c:29
-msgid "layout to use"
+#: builtin/bisect--helper.c:666
+msgid "--write-terms requires two arguments"
msgstr ""
-#: builtin/column.c:30
-msgid "Maximum width"
+#: builtin/bisect--helper.c:670
+msgid "--bisect-clean-state requires no arguments"
msgstr ""
-#: builtin/column.c:31
-msgid "Padding space on left border"
+#: builtin/bisect--helper.c:677
+msgid "--bisect-reset requires either no argument or a commit"
msgstr ""
-#: builtin/column.c:32
-msgid "Padding space on right border"
+#: builtin/bisect--helper.c:681
+msgid "--bisect-write requires either 4 or 5 arguments"
msgstr ""
-#: builtin/column.c:33
-msgid "Padding space between columns"
+#: builtin/bisect--helper.c:687
+msgid "--check-and-set-terms requires 3 arguments"
msgstr ""
-#: builtin/column.c:52
-msgid "--command must be the first argument"
+#: builtin/bisect--helper.c:693
+msgid "--bisect-next-check requires 2 or 3 arguments"
msgstr ""
-#: builtin/commit.c:37
-msgid "git commit [<options>] [--] <pathspec>..."
+#: builtin/bisect--helper.c:699
+msgid "--bisect-terms requires 0 or 1 argument"
msgstr ""
-#: builtin/commit.c:42
-msgid "git status [<options>] [--] <pathspec>..."
+#: builtin/blame.c:31
+msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
msgstr ""
-#: builtin/commit.c:47
-msgid ""
-"You asked to amend the most recent commit, but doing so would make\n"
-"it empty. You can repeat your command with --allow-empty, or you can\n"
-"remove the commit entirely with \"git reset HEAD^\".\n"
+#: builtin/blame.c:36
+msgid "<rev-opts> are documented in git-rev-list(1)"
msgstr ""
-#: builtin/commit.c:52
-msgid ""
-"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
-"If you wish to commit it anyway, use:\n"
-"\n"
-" git commit --allow-empty\n"
-"\n"
+#: builtin/blame.c:406
+#, c-format
+msgid "expecting a color: %s"
msgstr ""
-#: builtin/commit.c:59
-msgid "Otherwise, please use 'git reset'\n"
+#: builtin/blame.c:413
+msgid "must end with a color"
msgstr ""
-#: builtin/commit.c:62
-msgid ""
-"If you wish to skip this commit, use:\n"
-"\n"
-" git reset\n"
-"\n"
-"Then \"git cherry-pick --continue\" will resume cherry-picking\n"
-"the remaining commits.\n"
+#: builtin/blame.c:700
+#, c-format
+msgid "invalid color '%s' in color.blame.repeatedLines"
msgstr ""
-#: builtin/commit.c:284
-msgid "failed to unpack HEAD tree object"
+#: builtin/blame.c:718
+msgid "invalid value for blame.coloring"
msgstr ""
-#: builtin/commit.c:325
-msgid "unable to create temporary index"
+#: builtin/blame.c:793
+msgid "Show blame entries as we find them, incrementally"
msgstr ""
-#: builtin/commit.c:331
-msgid "interactive add failed"
+#: builtin/blame.c:794
+msgid "Show blank SHA-1 for boundary commits (Default: off)"
msgstr ""
-#: builtin/commit.c:344
-msgid "unable to update temporary index"
+#: builtin/blame.c:795
+msgid "Do not treat root commits as boundaries (Default: off)"
msgstr ""
-#: builtin/commit.c:346
-msgid "Failed to update main cache tree"
+#: builtin/blame.c:796
+msgid "Show work cost statistics"
msgstr ""
-#: builtin/commit.c:371 builtin/commit.c:395 builtin/commit.c:444
-msgid "unable to write new_index file"
+#: builtin/blame.c:797
+msgid "Force progress reporting"
msgstr ""
-#: builtin/commit.c:427
-msgid "cannot do a partial commit during a merge."
+#: builtin/blame.c:798
+msgid "Show output score for blame entries"
msgstr ""
-#: builtin/commit.c:429
-msgid "cannot do a partial commit during a cherry-pick."
+#: builtin/blame.c:799
+msgid "Show original filename (Default: auto)"
msgstr ""
-#: builtin/commit.c:437
-msgid "cannot read the index"
+#: builtin/blame.c:800
+msgid "Show original linenumber (Default: off)"
msgstr ""
-#: builtin/commit.c:456
-msgid "unable to write temporary index file"
+#: builtin/blame.c:801
+msgid "Show in a format designed for machine consumption"
msgstr ""
-#: builtin/commit.c:553
-#, c-format
-msgid "commit '%s' lacks author header"
+#: builtin/blame.c:802
+msgid "Show porcelain format with per-line commit information"
msgstr ""
-#: builtin/commit.c:555
-#, c-format
-msgid "commit '%s' has malformed author line"
+#: builtin/blame.c:803
+msgid "Use the same output mode as git-annotate (Default: off)"
msgstr ""
-#: builtin/commit.c:574
-msgid "malformed --author parameter"
+#: builtin/blame.c:804
+msgid "Show raw timestamp (Default: off)"
msgstr ""
-#: builtin/commit.c:626
-msgid ""
-"unable to select a comment character that is not used\n"
-"in the current commit message"
+#: builtin/blame.c:805
+msgid "Show long commit SHA1 (Default: off)"
msgstr ""
-#: builtin/commit.c:663 builtin/commit.c:696 builtin/commit.c:1024
-#, c-format
-msgid "could not lookup commit %s"
+#: builtin/blame.c:806
+msgid "Suppress author name and timestamp (Default: off)"
msgstr ""
-#: builtin/commit.c:675 builtin/shortlog.c:309
-#, c-format
-msgid "(reading log message from standard input)\n"
+#: builtin/blame.c:807
+msgid "Show author email instead of name (Default: off)"
msgstr ""
-#: builtin/commit.c:677
-msgid "could not read log from standard input"
+#: builtin/blame.c:808
+msgid "Ignore whitespace differences"
msgstr ""
-#: builtin/commit.c:681
-#, c-format
-msgid "could not read log file '%s'"
+#: builtin/blame.c:809
+msgid "color redundant metadata from previous line differently"
msgstr ""
-#: builtin/commit.c:710 builtin/commit.c:718
-msgid "could not read SQUASH_MSG"
+#: builtin/blame.c:810
+msgid "color lines by age"
msgstr ""
-#: builtin/commit.c:715
-msgid "could not read MERGE_MSG"
+#: builtin/blame.c:817
+msgid "Use an experimental heuristic to improve diffs"
msgstr ""
-#: builtin/commit.c:769
-msgid "could not write commit template"
+#: builtin/blame.c:819
+msgid "Spend extra cycles to find better match"
msgstr ""
-#: builtin/commit.c:787
-#, c-format
-msgid ""
-"\n"
-"It looks like you may be committing a merge.\n"
-"If this is not correct, please remove the file\n"
-"\t%s\n"
-"and try again.\n"
+#: builtin/blame.c:820
+msgid "Use revisions from <file> instead of calling git-rev-list"
msgstr ""
-#: builtin/commit.c:792
-#, c-format
-msgid ""
-"\n"
-"It looks like you may be committing a cherry-pick.\n"
-"If this is not correct, please remove the file\n"
-"\t%s\n"
-"and try again.\n"
+#: builtin/blame.c:821
+msgid "Use <file>'s contents as the final image"
msgstr ""
-#: builtin/commit.c:805
-#, c-format
-msgid ""
-"Please enter the commit message for your changes. Lines starting\n"
-"with '%c' will be ignored, and an empty message aborts the commit.\n"
+#: builtin/blame.c:822 builtin/blame.c:823
+msgid "score"
msgstr ""
-#: builtin/commit.c:813
-#, c-format
-msgid ""
-"Please enter the commit message for your changes. Lines starting\n"
-"with '%c' will be kept; you may remove them yourself if you want to.\n"
-"An empty message aborts the commit.\n"
+#: builtin/blame.c:822
+msgid "Find line copies within and across files"
msgstr ""
-#: builtin/commit.c:830
-#, c-format
-msgid "%sAuthor: %.*s <%.*s>"
+#: builtin/blame.c:823
+msgid "Find line movements within and across files"
msgstr ""
-#: builtin/commit.c:838
-#, c-format
-msgid "%sDate: %s"
+#: builtin/blame.c:824
+msgid "n,m"
msgstr ""
-#: builtin/commit.c:845
-#, c-format
-msgid "%sCommitter: %.*s <%.*s>"
+#: builtin/blame.c:824
+msgid "Process only line range n,m, counting from 1"
msgstr ""
-#: builtin/commit.c:862
-msgid "Cannot read index"
+#: builtin/blame.c:875
+msgid "--progress can't be used with --incremental or porcelain formats"
msgstr ""
-#: builtin/commit.c:928
-msgid "Error building trees"
+#. 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:926
+msgid "4 years, 11 months ago"
msgstr ""
-#: builtin/commit.c:942 builtin/tag.c:256
+#: builtin/blame.c:1018
#, c-format
-msgid "Please supply the message using either -m or -F option.\n"
+msgid "file %s has only %lu line"
+msgid_plural "file %s has only %lu lines"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/blame.c:1064
+msgid "Blaming lines"
msgstr ""
-#: builtin/commit.c:986
-#, c-format
-msgid "--author '%s' is not 'Name <email>' and matches no existing author"
+#: builtin/branch.c:29
+msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
msgstr ""
-#: builtin/commit.c:1000
-#, c-format
-msgid "Invalid ignored mode '%s'"
+#: builtin/branch.c:30
+msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
msgstr ""
-#: builtin/commit.c:1014 builtin/commit.c:1264
-#, c-format
-msgid "Invalid untracked files mode '%s'"
+#: builtin/branch.c:31
+msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
msgstr ""
-#: builtin/commit.c:1052
-msgid "--long and -z are incompatible"
+#: builtin/branch.c:32
+msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
msgstr ""
-#: builtin/commit.c:1085
-msgid "Using both --reset-author and --author does not make sense"
+#: builtin/branch.c:33
+msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
msgstr ""
-#: builtin/commit.c:1094
-msgid "You have nothing to amend."
+#: builtin/branch.c:34
+msgid "git branch [<options>] [-r | -a] [--points-at]"
msgstr ""
-#: builtin/commit.c:1097
-msgid "You are in the middle of a merge -- cannot amend."
+#: builtin/branch.c:35
+msgid "git branch [<options>] [-r | -a] [--format]"
msgstr ""
-#: builtin/commit.c:1099
-msgid "You are in the middle of a cherry-pick -- cannot amend."
+#: 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/commit.c:1102
-msgid "Options --squash and --fixup cannot be used together"
+#: 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/commit.c:1112
-msgid "Only one of -c/-C/-F/--fixup can be used."
+#: builtin/branch.c:169
+#, c-format
+msgid "Couldn't look up commit object for '%s'"
msgstr ""
-#: builtin/commit.c:1114
-msgid "Option -m cannot be combined with -c/-C/-F."
+#: 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/commit.c:1122
-msgid "--reset-author can be used only with -C, -c or --amend."
+#: builtin/branch.c:186
+msgid "Update of config-file failed"
msgstr ""
-#: builtin/commit.c:1139
-msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
+#: builtin/branch.c:217
+msgid "cannot use -a with -d"
msgstr ""
-#: builtin/commit.c:1141
-msgid "No paths with --include/--only does not make sense."
+#: builtin/branch.c:223
+msgid "Couldn't look up commit object for HEAD"
msgstr ""
-#: builtin/commit.c:1155 builtin/tag.c:542
+#: builtin/branch.c:237
#, c-format
-msgid "Invalid cleanup mode %s"
+msgid "Cannot delete branch '%s' checked out at '%s'"
msgstr ""
-#: builtin/commit.c:1160
-msgid "Paths with -a does not make sense."
+#: builtin/branch.c:252
+#, c-format
+msgid "remote-tracking branch '%s' not found."
msgstr ""
-#: builtin/commit.c:1278 builtin/commit.c:1443
-msgid "show status concisely"
+#: builtin/branch.c:253
+#, c-format
+msgid "branch '%s' not found."
msgstr ""
-#: builtin/commit.c:1280 builtin/commit.c:1445
-msgid "show branch information"
+#: builtin/branch.c:268
+#, c-format
+msgid "Error deleting remote-tracking branch '%s'"
msgstr ""
-#: builtin/commit.c:1282
-msgid "show stash information"
+#: builtin/branch.c:269
+#, c-format
+msgid "Error deleting branch '%s'"
msgstr ""
-#: builtin/commit.c:1284 builtin/commit.c:1447
-msgid "compute full ahead/behind values"
+#: builtin/branch.c:276
+#, c-format
+msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr ""
-#: builtin/commit.c:1286
-msgid "version"
+#: builtin/branch.c:277
+#, c-format
+msgid "Deleted branch %s (was %s).\n"
msgstr ""
-#: builtin/commit.c:1286 builtin/commit.c:1449 builtin/push.c:542
-#: builtin/worktree.c:541
-msgid "machine-readable output"
+#: builtin/branch.c:421 builtin/tag.c:59
+msgid "unable to parse format string"
msgstr ""
-#: builtin/commit.c:1289 builtin/commit.c:1451
-msgid "show status in long format (default)"
+#: builtin/branch.c:458
+#, c-format
+msgid "Branch %s is being rebased at %s"
msgstr ""
-#: builtin/commit.c:1292 builtin/commit.c:1454
-msgid "terminate entries with NUL"
+#: builtin/branch.c:462
+#, c-format
+msgid "Branch %s is being bisected at %s"
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"
+#: builtin/branch.c:479
+msgid "cannot copy the current branch while not on any."
msgstr ""
-#: builtin/commit.c:1295 builtin/commit.c:1457
-msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
+#: builtin/branch.c:481
+msgid "cannot rename the current branch while not on any."
msgstr ""
-#: builtin/commit.c:1299
-msgid ""
-"show ignored files, optional modes: traditional, matching, no. (Default: "
-"traditional)"
+#: builtin/branch.c:492
+#, c-format
+msgid "Invalid branch name: '%s'"
msgstr ""
-#: builtin/commit.c:1301 parse-options.h:167
-msgid "when"
+#: builtin/branch.c:519
+msgid "Branch rename failed"
msgstr ""
-#: builtin/commit.c:1302
-msgid ""
-"ignore changes to submodules, optional when: all, dirty, untracked. "
-"(Default: all)"
+#: builtin/branch.c:521
+msgid "Branch copy failed"
msgstr ""
-#: builtin/commit.c:1304
-msgid "list untracked files in columns"
+#: builtin/branch.c:525
+#, c-format
+msgid "Created a copy of a misnamed branch '%s'"
msgstr ""
-#: builtin/commit.c:1323
-msgid "Unsupported combination of ignored and untracked-files arguments"
+#: builtin/branch.c:528
+#, c-format
+msgid "Renamed a misnamed branch '%s' away"
msgstr ""
-#: builtin/commit.c:1413
-msgid "suppress summary after successful commit"
+#: builtin/branch.c:534
+#, c-format
+msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr ""
-#: builtin/commit.c:1414
-msgid "show diff in commit message template"
+#: builtin/branch.c:543
+msgid "Branch is renamed, but update of config-file failed"
msgstr ""
-#: builtin/commit.c:1416
-msgid "Commit message options"
+#: builtin/branch.c:545
+msgid "Branch is copied, but update of config-file failed"
msgstr ""
-#: builtin/commit.c:1417 builtin/tag.c:393
-msgid "read message from file"
+#: builtin/branch.c:561
+#, c-format
+msgid ""
+"Please edit the description for the branch\n"
+" %s\n"
+"Lines starting with '%c' will be stripped.\n"
msgstr ""
-#: builtin/commit.c:1418
-msgid "author"
+#: builtin/branch.c:594
+msgid "Generic options"
msgstr ""
-#: builtin/commit.c:1418
-msgid "override author for commit"
+#: builtin/branch.c:596
+msgid "show hash and subject, give twice for upstream branch"
msgstr ""
-#: builtin/commit.c:1419 builtin/gc.c:359
-msgid "date"
+#: builtin/branch.c:597
+msgid "suppress informational messages"
msgstr ""
-#: builtin/commit.c:1419
-msgid "override date for commit"
+#: builtin/branch.c:598
+msgid "set up tracking mode (see git-pull(1))"
msgstr ""
-#: builtin/commit.c:1420 builtin/merge.c:226 builtin/notes.c:402
-#: builtin/notes.c:565 builtin/tag.c:391
-msgid "message"
+#: builtin/branch.c:600
+msgid "do not use"
msgstr ""
-#: builtin/commit.c:1420
-msgid "commit message"
+#: builtin/branch.c:602 builtin/rebase--interactive.c:182
+msgid "upstream"
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"
+#: builtin/branch.c:602
+msgid "change the upstream info"
msgstr ""
-#: builtin/commit.c:1421
-msgid "reuse and edit message from specified commit"
+#: builtin/branch.c:603
+msgid "Unset the upstream info"
msgstr ""
-#: builtin/commit.c:1422
-msgid "reuse message from specified commit"
+#: builtin/branch.c:604
+msgid "use colored output"
msgstr ""
-#: builtin/commit.c:1423
-msgid "use autosquash formatted message to fixup specified commit"
+#: builtin/branch.c:605
+msgid "act on remote-tracking branches"
msgstr ""
-#: builtin/commit.c:1424
-msgid "use autosquash formatted message to squash specified commit"
+#: builtin/branch.c:607 builtin/branch.c:609
+msgid "print only branches that contain the commit"
msgstr ""
-#: builtin/commit.c:1425
-msgid "the commit is authored by me now (used with -C/-c/--amend)"
+#: builtin/branch.c:608 builtin/branch.c:610
+msgid "print only branches that don't contain the commit"
msgstr ""
-#: 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:"
+#: builtin/branch.c:613
+msgid "Specific git-branch actions:"
msgstr ""
-#: builtin/commit.c:1427
-msgid "use specified template file"
+#: builtin/branch.c:614
+msgid "list both remote-tracking and local branches"
msgstr ""
-#: builtin/commit.c:1428
-msgid "force edit of commit"
+#: builtin/branch.c:616
+msgid "delete fully merged branch"
msgstr ""
-#: builtin/commit.c:1429
-msgid "default"
+#: builtin/branch.c:617
+msgid "delete branch (even if not merged)"
msgstr ""
-#: builtin/commit.c:1429 builtin/tag.c:397
-msgid "how to strip spaces and #comments from message"
+#: builtin/branch.c:618
+msgid "move/rename a branch and its reflog"
msgstr ""
-#: builtin/commit.c:1430
-msgid "include status in commit message template"
+#: builtin/branch.c:619
+msgid "move/rename a branch, even if target exists"
msgstr ""
-#: builtin/commit.c:1432 builtin/merge.c:238 builtin/pull.c:179
-#: builtin/revert.c:113
-msgid "GPG sign commit"
+#: builtin/branch.c:620
+msgid "copy a branch and its reflog"
msgstr ""
-#: builtin/commit.c:1435
-msgid "Commit contents options"
+#: builtin/branch.c:621
+msgid "copy a branch, even if target exists"
msgstr ""
-#: builtin/commit.c:1436
-msgid "commit all changed files"
+#: builtin/branch.c:622
+msgid "list branch names"
msgstr ""
-#: builtin/commit.c:1437
-msgid "add specified files to index for commit"
+#: builtin/branch.c:623
+msgid "create the branch's reflog"
msgstr ""
-#: builtin/commit.c:1438
-msgid "interactively add files"
+#: builtin/branch.c:625
+msgid "edit the description for the branch"
msgstr ""
-#: builtin/commit.c:1439
-msgid "interactively add changes"
+#: builtin/branch.c:626
+msgid "force creation, move/rename, deletion"
msgstr ""
-#: builtin/commit.c:1440
-msgid "commit only specified files"
+#: builtin/branch.c:627
+msgid "print only branches that are merged"
msgstr ""
-#: builtin/commit.c:1441
-msgid "bypass pre-commit and commit-msg hooks"
+#: builtin/branch.c:628
+msgid "print only branches that are not merged"
msgstr ""
-#: builtin/commit.c:1442
-msgid "show what would be committed"
+#: builtin/branch.c:629
+msgid "list branches in columns"
msgstr ""
-#: builtin/commit.c:1455
-msgid "amend previous commit"
+#: builtin/branch.c:630 builtin/for-each-ref.c:40 builtin/ls-remote.c:70
+#: builtin/tag.c:415
+msgid "key"
msgstr ""
-#: builtin/commit.c:1456
-msgid "bypass post-rewrite hook"
+#: builtin/branch.c:631 builtin/for-each-ref.c:41 builtin/ls-remote.c:71
+#: builtin/tag.c:416
+msgid "field name to sort on"
msgstr ""
-#: builtin/commit.c:1461
-msgid "ok to record an empty change"
+#: builtin/branch.c:633 builtin/for-each-ref.c:43 builtin/notes.c:415
+#: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584
+#: builtin/tag.c:418
+msgid "object"
msgstr ""
-#: builtin/commit.c:1463
-msgid "ok to record a change with an empty message"
+#: builtin/branch.c:634
+msgid "print only branches of the object"
msgstr ""
-#: builtin/commit.c:1536
-#, c-format
-msgid "Corrupt MERGE_HEAD file (%s)"
+#: builtin/branch.c:636 builtin/for-each-ref.c:49 builtin/tag.c:425
+msgid "sorting and filtering are case insensitive"
msgstr ""
-#: builtin/commit.c:1543
-msgid "could not read MERGE_MODE"
+#: builtin/branch.c:637 builtin/for-each-ref.c:38 builtin/tag.c:423
+#: builtin/verify-tag.c:39
+msgid "format to use for the output"
msgstr ""
-#: builtin/commit.c:1562
-#, c-format
-msgid "could not read commit message: %s"
+#: builtin/branch.c:660 builtin/clone.c:746
+msgid "HEAD not found below refs/heads!"
msgstr ""
-#: builtin/commit.c:1573
-#, c-format
-msgid "Aborting commit due to empty commit message.\n"
+#: builtin/branch.c:683
+msgid "--column and --verbose are incompatible"
msgstr ""
-#: builtin/commit.c:1578
-#, c-format
-msgid "Aborting commit; you did not edit the message.\n"
+#: builtin/branch.c:698 builtin/branch.c:749 builtin/branch.c:758
+msgid "branch name required"
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."
+#: builtin/branch.c:725
+msgid "Cannot give description to detached HEAD"
msgstr ""
-#: builtin/config.c:10
-msgid "git config [<options>]"
+#: builtin/branch.c:730
+msgid "cannot edit description of more than one branch"
msgstr ""
-#: builtin/config.c:58
-msgid "Config file location"
+#: builtin/branch.c:737
+#, c-format
+msgid "No commit on branch '%s' yet."
msgstr ""
-#: builtin/config.c:59
-msgid "use global config file"
+#: builtin/branch.c:740
+#, c-format
+msgid "No branch named '%s'."
msgstr ""
-#: builtin/config.c:60
-msgid "use system config file"
+#: builtin/branch.c:755
+msgid "too many branches for a copy operation"
msgstr ""
-#: builtin/config.c:61
-msgid "use repository config file"
+#: builtin/branch.c:764
+msgid "too many arguments for a rename operation"
msgstr ""
-#: builtin/config.c:62
-msgid "use given config file"
+#: builtin/branch.c:769
+msgid "too many arguments to set new upstream"
msgstr ""
-#: builtin/config.c:63
-msgid "blob-id"
+#: builtin/branch.c:773
+#, c-format
+msgid ""
+"could not set upstream of HEAD to %s when it does not point to any branch."
msgstr ""
-#: builtin/config.c:63
-msgid "read config from given blob object"
+#: builtin/branch.c:776 builtin/branch.c:799
+#, c-format
+msgid "no such branch '%s'"
msgstr ""
-#: builtin/config.c:64
-msgid "Action"
+#: builtin/branch.c:780
+#, c-format
+msgid "branch '%s' does not exist"
msgstr ""
-#: builtin/config.c:65
-msgid "get value: name [value-regex]"
+#: builtin/branch.c:793
+msgid "too many arguments to unset upstream"
msgstr ""
-#: builtin/config.c:66
-msgid "get all values: key [value-regex]"
+#: builtin/branch.c:797
+msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr ""
-#: builtin/config.c:67
-msgid "get values for regexp: name-regex [value-regex]"
+#: builtin/branch.c:803
+#, c-format
+msgid "Branch '%s' has no upstream information"
msgstr ""
-#: builtin/config.c:68
-msgid "get value specific for the URL: section[.var] URL"
+#: builtin/branch.c:813
+msgid "-a and -r options to 'git branch' do not make sense with a branch name"
msgstr ""
-#: builtin/config.c:69
-msgid "replace all matching variables: name value [value_regex]"
+#: builtin/branch.c:816
+msgid ""
+"the '--set-upstream' option is no longer supported. Please use '--track' or "
+"'--set-upstream-to' instead."
msgstr ""
-#: builtin/config.c:70
-msgid "add a new variable: name value"
+#: builtin/bundle.c:45
+#, c-format
+msgid "%s is okay\n"
msgstr ""
-#: builtin/config.c:71
-msgid "remove a variable: name [value-regex]"
+#: builtin/bundle.c:58
+msgid "Need a repository to create a bundle."
msgstr ""
-#: builtin/config.c:72
-msgid "remove all matches: name [value-regex]"
+#: builtin/bundle.c:62
+msgid "Need a repository to unbundle."
msgstr ""
-#: builtin/config.c:73
-msgid "rename section: old-name new-name"
+#: 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/config.c:74
-msgid "remove a section: name"
+#: builtin/cat-file.c:594
+msgid ""
+"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
+"filters]"
msgstr ""
-#: builtin/config.c:75
-msgid "list all"
+#: builtin/cat-file.c:615
+msgid "only one batch option may be specified"
msgstr ""
-#: builtin/config.c:76
-msgid "open an editor"
+#: builtin/cat-file.c:633
+msgid "<type> can be one of: blob, tree, commit, tag"
msgstr ""
-#: builtin/config.c:77
-msgid "find the color configured: slot [default]"
+#: builtin/cat-file.c:634
+msgid "show object type"
msgstr ""
-#: builtin/config.c:78
-msgid "find the color setting: slot [stdout-is-tty]"
+#: builtin/cat-file.c:635
+msgid "show object size"
msgstr ""
-#: builtin/config.c:79
-msgid "Type"
+#: builtin/cat-file.c:637
+msgid "exit with zero when there's no error"
msgstr ""
-#: builtin/config.c:80
-msgid "value is \"true\" or \"false\""
+#: builtin/cat-file.c:638
+msgid "pretty-print object's content"
msgstr ""
-#: builtin/config.c:81
-msgid "value is decimal number"
+#: builtin/cat-file.c:640
+msgid "for blob objects, run textconv on object's content"
msgstr ""
-#: builtin/config.c:82
-msgid "value is --bool or --int"
+#: builtin/cat-file.c:642
+msgid "for blob objects, run filters on object's content"
msgstr ""
-#: builtin/config.c:83
-msgid "value is a path (file or directory name)"
+#: builtin/cat-file.c:643 git-submodule.sh:860
+msgid "blob"
msgstr ""
-#: builtin/config.c:84
-msgid "value is an expiry date"
+#: builtin/cat-file.c:644
+msgid "use a specific path for --textconv/--filters"
msgstr ""
-#: builtin/config.c:85
-msgid "Other"
+#: builtin/cat-file.c:646
+msgid "allow -s and -t to work with broken/corrupt objects"
msgstr ""
-#: builtin/config.c:86
-msgid "terminate values with NUL byte"
+#: builtin/cat-file.c:647
+msgid "buffer --batch output"
msgstr ""
-#: builtin/config.c:87
-msgid "show variable names only"
+#: builtin/cat-file.c:649
+msgid "show info and content of objects fed from the standard input"
msgstr ""
-#: builtin/config.c:88
-msgid "respect include directives on lookup"
+#: builtin/cat-file.c:653
+msgid "show info about objects fed from the standard input"
msgstr ""
-#: builtin/config.c:89
-msgid "show origin of config (file, standard input, blob, command line)"
+#: builtin/cat-file.c:657
+msgid "follow in-tree symlinks (used with --batch or --batch-check)"
msgstr ""
-#: builtin/config.c:335
-msgid "unable to parse default color value"
+#: builtin/cat-file.c:659
+msgid "show all objects with --batch or --batch-check"
msgstr ""
-#: builtin/config.c:479
-#, 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"
+#: builtin/cat-file.c:661
+msgid "do not order --batch-all-objects output"
msgstr ""
-#: builtin/config.c:507
-msgid "--local can only be used inside a git repository"
+#: builtin/check-attr.c:13
+msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
msgstr ""
-#: builtin/config.c:632
-#, c-format
-msgid "cannot create configuration file %s"
+#: builtin/check-attr.c:14
+msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
msgstr ""
-#: builtin/config.c:645
-#, c-format
-msgid ""
-"cannot overwrite multiple values with a single value\n"
-" Use a regexp, --add or --replace-all to change %s."
+#: builtin/check-attr.c:21
+msgid "report all attributes set on file"
msgstr ""
-#: builtin/count-objects.c:88
-msgid "git count-objects [-v] [-H | --human-readable]"
+#: builtin/check-attr.c:22
+msgid "use .gitattributes only from the index"
msgstr ""
-#: builtin/count-objects.c:98
-msgid "print sizes in human readable format"
+#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:102
+msgid "read file names from stdin"
msgstr ""
-#: builtin/describe.c:22
-msgid "git describe [<options>] [<commit-ish>...]"
+#: builtin/check-attr.c:25 builtin/check-ignore.c:27
+msgid "terminate input and output records by a NUL character"
msgstr ""
-#: builtin/describe.c:23
-msgid "git describe [<options>] --dirty"
+#: builtin/check-ignore.c:21 builtin/checkout.c:1280 builtin/gc.c:517
+#: builtin/worktree.c:496
+msgid "suppress progress reporting"
msgstr ""
-#: builtin/describe.c:57
-msgid "head"
+#: builtin/check-ignore.c:29
+msgid "show non-matching input paths"
msgstr ""
-#: builtin/describe.c:57
-msgid "lightweight"
+#: builtin/check-ignore.c:31
+msgid "ignore index when checking"
msgstr ""
-#: builtin/describe.c:57
-msgid "annotated"
+#: builtin/check-ignore.c:160
+msgid "cannot specify pathnames with --stdin"
msgstr ""
-#: builtin/describe.c:267
-#, c-format
-msgid "annotated tag %s not available"
+#: builtin/check-ignore.c:163
+msgid "-z only makes sense with --stdin"
msgstr ""
-#: builtin/describe.c:271
-#, c-format
-msgid "annotated tag %s has no embedded name"
+#: builtin/check-ignore.c:165
+msgid "no path specified"
msgstr ""
-#: builtin/describe.c:273
-#, c-format
-msgid "tag '%s' is really '%s' here"
+#: builtin/check-ignore.c:169
+msgid "--quiet is only valid with a single pathname"
msgstr ""
-#: builtin/describe.c:317
-#, c-format
-msgid "no tag exactly matches '%s'"
+#: builtin/check-ignore.c:171
+msgid "cannot have both --quiet and --verbose"
msgstr ""
-#: builtin/describe.c:319
-#, c-format
-msgid "No exact match on refs or tags, searching to describe\n"
+#: builtin/check-ignore.c:174
+msgid "--non-matching is only valid with --verbose"
msgstr ""
-#: builtin/describe.c:366
-#, c-format
-msgid "finished search at %s\n"
+#: builtin/check-mailmap.c:9
+msgid "git check-mailmap [<options>] <contact>..."
msgstr ""
-#: builtin/describe.c:392
-#, c-format
-msgid ""
-"No annotated tags can describe '%s'.\n"
-"However, there were unannotated tags: try --tags."
+#: builtin/check-mailmap.c:14
+msgid "also read contacts from stdin"
msgstr ""
-#: builtin/describe.c:396
+#: builtin/check-mailmap.c:25
#, c-format
-msgid ""
-"No tags can describe '%s'.\n"
-"Try --always, or create some tags."
+msgid "unable to parse contact: %s"
msgstr ""
-#: builtin/describe.c:426
-#, c-format
-msgid "traversed %lu commits\n"
+#: builtin/check-mailmap.c:48
+msgid "no contacts specified"
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/checkout-index.c:131
+msgid "git checkout-index [<options>] [--] [<file>...]"
msgstr ""
-#: builtin/describe.c:497
-#, c-format
-msgid "describe %s\n"
+#: builtin/checkout-index.c:148
+msgid "stage should be between 1 and 3 or all"
msgstr ""
-#: builtin/describe.c:500 builtin/log.c:502
-#, c-format
-msgid "Not a valid object name %s"
+#: builtin/checkout-index.c:164
+msgid "check out all files in the index"
msgstr ""
-#: builtin/describe.c:508
-#, c-format
-msgid "%s is neither a commit nor blob"
+#: builtin/checkout-index.c:165
+msgid "force overwrite of existing files"
msgstr ""
-#: builtin/describe.c:522
-msgid "find the tag that comes after the commit"
+#: builtin/checkout-index.c:167
+msgid "no warning for existing files and files not in index"
msgstr ""
-#: builtin/describe.c:523
-msgid "debug search strategy on stderr"
+#: builtin/checkout-index.c:169
+msgid "don't checkout new files"
msgstr ""
-#: builtin/describe.c:524
-msgid "use any ref"
+#: builtin/checkout-index.c:171
+msgid "update stat information in the index file"
msgstr ""
-#: builtin/describe.c:525
-msgid "use any tag, even unannotated"
+#: builtin/checkout-index.c:175
+msgid "read list of paths from the standard input"
msgstr ""
-#: builtin/describe.c:526
-msgid "always use long format"
+#: builtin/checkout-index.c:177
+msgid "write the content to temporary files"
msgstr ""
-#: builtin/describe.c:527
-msgid "only follow first parent"
+#: 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:1857
+#: builtin/worktree.c:669
+msgid "string"
msgstr ""
-#: builtin/describe.c:530
-msgid "only output exact matches"
+#: builtin/checkout-index.c:179
+msgid "when creating files, prepend <string>"
msgstr ""
-#: builtin/describe.c:532
-msgid "consider <n> most recent tags (default: 10)"
+#: builtin/checkout-index.c:181
+msgid "copy out the files from named stage"
msgstr ""
-#: builtin/describe.c:534
-msgid "only consider tags matching <pattern>"
+#: builtin/checkout.c:32
+msgid "git checkout [<options>] <branch>"
msgstr ""
-#: builtin/describe.c:536
-msgid "do not consider tags matching <pattern>"
+#: builtin/checkout.c:33
+msgid "git checkout [<options>] [<branch>] -- <file>..."
msgstr ""
-#: builtin/describe.c:538 builtin/name-rev.c:406
-msgid "show abbreviated commit object as fallback"
+#: builtin/checkout.c:147 builtin/checkout.c:181
+#, c-format
+msgid "path '%s' does not have our version"
msgstr ""
-#: builtin/describe.c:539 builtin/describe.c:542
-msgid "mark"
+#: builtin/checkout.c:149 builtin/checkout.c:183
+#, c-format
+msgid "path '%s' does not have their version"
msgstr ""
-#: builtin/describe.c:540
-msgid "append <mark> on dirty working tree (default: \"-dirty\")"
+#: builtin/checkout.c:165
+#, c-format
+msgid "path '%s' does not have all necessary versions"
msgstr ""
-#: builtin/describe.c:543
-msgid "append <mark> on broken working tree (default: \"-broken\")"
+#: builtin/checkout.c:210
+#, c-format
+msgid "path '%s' does not have necessary versions"
msgstr ""
-#: builtin/describe.c:561
-msgid "--long is incompatible with --abbrev=0"
+#: builtin/checkout.c:228
+#, c-format
+msgid "path '%s': cannot merge"
msgstr ""
-#: builtin/describe.c:590
-msgid "No names found, cannot describe anything."
+#: builtin/checkout.c:244
+#, c-format
+msgid "Unable to add merge result for '%s'"
msgstr ""
-#: builtin/describe.c:640
-msgid "--dirty is incompatible with commit-ishes"
+#: builtin/checkout.c:267 builtin/checkout.c:270 builtin/checkout.c:273
+#: builtin/checkout.c:276
+#, c-format
+msgid "'%s' cannot be used with updating paths"
msgstr ""
-#: builtin/describe.c:642
-msgid "--broken is incompatible with commit-ishes"
+#: builtin/checkout.c:279 builtin/checkout.c:282
+#, c-format
+msgid "'%s' cannot be used with %s"
msgstr ""
-#: builtin/diff.c:83
+#: builtin/checkout.c:285
#, c-format
-msgid "'%s': not a regular file or symlink"
+msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr ""
-#: builtin/diff.c:234
+#: builtin/checkout.c:354 builtin/checkout.c:361
#, c-format
-msgid "invalid option: %s"
+msgid "path '%s' is unmerged"
msgstr ""
-#: builtin/diff.c:356
-msgid "Not a git repository"
-msgstr ""
+#: builtin/checkout.c:397
+#, c-format
+msgid "Recreated %d merge conflict"
+msgid_plural "Recreated %d merge conflicts"
+msgstr[0] ""
+msgstr[1] ""
-#: builtin/diff.c:399
+#: builtin/checkout.c:402
#, c-format
-msgid "invalid object '%s' given."
-msgstr ""
+msgid "Updated %d path from %s"
+msgid_plural "Updated %d paths from %s"
+msgstr[0] ""
+msgstr[1] ""
-#: builtin/diff.c:408
+#: builtin/checkout.c:409
#, c-format
-msgid "more than two blobs given: '%s'"
+msgid "Updated %d path from the index"
+msgid_plural "Updated %d paths from the index"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/checkout.c:645
+msgid "you need to resolve your current index first"
msgstr ""
-#: builtin/diff.c:413
+#: builtin/checkout.c:782
#, c-format
-msgid "unhandled object '%s' given."
+msgid "Can not do reflog for '%s': %s\n"
msgstr ""
-#: builtin/difftool.c:29
-msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
+#: builtin/checkout.c:824
+msgid "HEAD is now at"
msgstr ""
-#: builtin/difftool.c:259
-#, c-format
-msgid "failed: %d"
+#: builtin/checkout.c:828 builtin/clone.c:699
+msgid "unable to update HEAD"
msgstr ""
-#: builtin/difftool.c:301
+#: builtin/checkout.c:832
#, c-format
-msgid "could not read symlink %s"
+msgid "Reset branch '%s'\n"
msgstr ""
-#: builtin/difftool.c:303
+#: builtin/checkout.c:835
#, c-format
-msgid "could not read symlink file %s"
+msgid "Already on '%s'\n"
msgstr ""
-#: builtin/difftool.c:311
+#: builtin/checkout.c:839
#, c-format
-msgid "could not read object %s for symlink %s"
+msgid "Switched to and reset branch '%s'\n"
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/checkout.c:841 builtin/checkout.c:1212
+#, c-format
+msgid "Switched to a new branch '%s'\n"
msgstr ""
-#: builtin/difftool.c:632
+#: builtin/checkout.c:843
#, c-format
-msgid "both files modified: '%s' and '%s'."
+msgid "Switched to branch '%s'\n"
msgstr ""
-#: builtin/difftool.c:634
-msgid "working tree file has been left."
-msgstr ""
-
-#: builtin/difftool.c:645
+#: builtin/checkout.c:894
#, c-format
-msgid "temporary files exist in '%s'."
-msgstr ""
-
-#: builtin/difftool.c:646
-msgid "you may want to cleanup or recover these."
-msgstr ""
-
-#: builtin/difftool.c:695
-msgid "use `diff.guitool` instead of `diff.tool`"
+msgid " ... and %d more.\n"
msgstr ""
-#: builtin/difftool.c:697
-msgid "perform a full-directory diff"
-msgstr ""
+#: builtin/checkout.c:900
+#, 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/difftool.c:699
-msgid "do not prompt before launching a diff tool"
-msgstr ""
+#: builtin/checkout.c:919
+#, 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/difftool.c:705
-msgid "use symlinks in dir-diff mode"
+#: builtin/checkout.c:951
+msgid "internal error in revision walk"
msgstr ""
-#: builtin/difftool.c:706
-msgid "<tool>"
+#: builtin/checkout.c:955
+msgid "Previous HEAD position was"
msgstr ""
-#: builtin/difftool.c:707
-msgid "use the specified diff tool"
+#: builtin/checkout.c:983 builtin/checkout.c:1207
+msgid "You are on a branch yet to be born"
msgstr ""
-#: builtin/difftool.c:709
-msgid "print a list of diff tools that may be used with `--tool`"
+#: builtin/checkout.c:1104
+#, c-format
+msgid "only one reference expected, %d given."
msgstr ""
-#: builtin/difftool.c:712
+#: builtin/checkout.c:1140
+#, c-format
msgid ""
-"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
-"code"
+"'%s' could be both a local file and a tracking branch.\n"
+"Please use -- (and optionally --no-guess) to disambiguate"
msgstr ""
-#: builtin/difftool.c:714
-msgid "<command>"
+#: builtin/checkout.c:1153 builtin/worktree.c:290 builtin/worktree.c:445
+#, c-format
+msgid "invalid reference: %s"
msgstr ""
-#: builtin/difftool.c:715
-msgid "specify a custom command for viewing diffs"
+#: builtin/checkout.c:1182
+#, c-format
+msgid "reference is not a tree: %s"
msgstr ""
-#: builtin/difftool.c:739
-msgid "no <tool> given for --tool=<tool>"
+#: builtin/checkout.c:1221
+msgid "paths cannot be used with switching branches"
msgstr ""
-#: builtin/difftool.c:746
-msgid "no <cmd> given for --extcmd=<cmd>"
+#: builtin/checkout.c:1224 builtin/checkout.c:1228
+#, c-format
+msgid "'%s' cannot be used with switching branches"
msgstr ""
-#: builtin/fast-export.c:26
-msgid "git fast-export [rev-list-opts]"
+#: builtin/checkout.c:1232 builtin/checkout.c:1235 builtin/checkout.c:1240
+#: builtin/checkout.c:1243
+#, c-format
+msgid "'%s' cannot be used with '%s'"
msgstr ""
-#: builtin/fast-export.c:998
-msgid "show progress after <n> objects"
+#: builtin/checkout.c:1248
+#, c-format
+msgid "Cannot switch branch to a non-commit '%s'"
msgstr ""
-#: builtin/fast-export.c:1000
-msgid "select handling of signed tags"
+#: builtin/checkout.c:1281 builtin/checkout.c:1283 builtin/clone.c:120
+#: builtin/remote.c:169 builtin/remote.c:171 builtin/worktree.c:489
+#: builtin/worktree.c:491
+msgid "branch"
msgstr ""
-#: builtin/fast-export.c:1003
-msgid "select handling of tags that tag filtered objects"
+#: builtin/checkout.c:1282
+msgid "create and checkout a new branch"
msgstr ""
-#: builtin/fast-export.c:1006
-msgid "Dump marks to this file"
+#: builtin/checkout.c:1284
+msgid "create/reset and checkout a branch"
msgstr ""
-#: builtin/fast-export.c:1008
-msgid "Import marks from this file"
+#: builtin/checkout.c:1285
+msgid "create reflog for new branch"
msgstr ""
-#: builtin/fast-export.c:1010
-msgid "Fake a tagger when tags lack one"
+#: builtin/checkout.c:1286 builtin/worktree.c:493
+msgid "detach HEAD at named commit"
msgstr ""
-#: builtin/fast-export.c:1012
-msgid "Output full tree for each commit"
+#: builtin/checkout.c:1287
+msgid "set upstream info for new branch"
msgstr ""
-#: builtin/fast-export.c:1014
-msgid "Use the done feature to terminate the stream"
+#: builtin/checkout.c:1289
+msgid "new-branch"
msgstr ""
-#: builtin/fast-export.c:1015
-msgid "Skip output of blob data"
+#: builtin/checkout.c:1289
+msgid "new unparented branch"
msgstr ""
-#: builtin/fast-export.c:1016
-msgid "refspec"
+#: builtin/checkout.c:1291
+msgid "checkout our version for unmerged files"
msgstr ""
-#: builtin/fast-export.c:1017
-msgid "Apply refspec to exported refs"
+#: builtin/checkout.c:1294
+msgid "checkout their version for unmerged files"
msgstr ""
-#: builtin/fast-export.c:1018
-msgid "anonymize output"
+#: builtin/checkout.c:1296
+msgid "force checkout (throw away local modifications)"
msgstr ""
-#: builtin/fetch.c:25
-msgid "git fetch [<options>] [<repository> [<refspec>...]]"
+#: builtin/checkout.c:1298
+msgid "perform a 3-way merge with the new branch"
msgstr ""
-#: builtin/fetch.c:26
-msgid "git fetch [<options>] <group>"
+#: builtin/checkout.c:1300 builtin/merge.c:276
+msgid "update ignored files (default)"
msgstr ""
-#: builtin/fetch.c:27
-msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
+#: builtin/checkout.c:1302 builtin/log.c:1586 parse-options.h:272
+msgid "style"
msgstr ""
-#: builtin/fetch.c:28
-msgid "git fetch --all [<options>]"
+#: builtin/checkout.c:1303
+msgid "conflict style (merge or diff3)"
msgstr ""
-#: builtin/fetch.c:124 builtin/pull.c:188
-msgid "fetch from all remotes"
+#: builtin/checkout.c:1306
+msgid "do not limit pathspecs to sparse entries only"
msgstr ""
-#: builtin/fetch.c:126 builtin/pull.c:191
-msgid "append to .git/FETCH_HEAD instead of overwriting"
+#: builtin/checkout.c:1308
+msgid "do not second guess 'git checkout <no-such-branch>'"
msgstr ""
-#: builtin/fetch.c:128 builtin/pull.c:194
-msgid "path to upload pack on remote end"
+#: builtin/checkout.c:1310
+msgid "do not check if another worktree is holding the given ref"
msgstr ""
-#: builtin/fetch.c:129 builtin/pull.c:196
-msgid "force overwrite of local branch"
+#: builtin/checkout.c:1314 builtin/clone.c:87 builtin/fetch.c:141
+#: builtin/merge.c:273 builtin/pull.c:130 builtin/push.c:575
+#: builtin/send-pack.c:174
+msgid "force progress reporting"
msgstr ""
-#: builtin/fetch.c:131
-msgid "fetch from multiple remotes"
+#: builtin/checkout.c:1345
+msgid "-b, -B and --orphan are mutually exclusive"
msgstr ""
-#: builtin/fetch.c:133 builtin/pull.c:198
-msgid "fetch all tags and associated objects"
+#: builtin/checkout.c:1362
+msgid "--track needs a branch name"
msgstr ""
-#: builtin/fetch.c:135
-msgid "do not fetch all tags (--no-tags)"
+#: builtin/checkout.c:1367
+msgid "missing branch name; try -b"
msgstr ""
-#: builtin/fetch.c:137
-msgid "number of submodules fetched in parallel"
+#: builtin/checkout.c:1404
+msgid "invalid path specification"
msgstr ""
-#: builtin/fetch.c:139 builtin/pull.c:201
-msgid "prune remote-tracking branches no longer on remote"
+#: builtin/checkout.c:1411
+#, c-format
+msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
msgstr ""
-#: builtin/fetch.c:141
-msgid "prune local tags no longer on remote and clobber changed tags"
+#: builtin/checkout.c:1415
+#, c-format
+msgid "git checkout: --detach does not take a path argument '%s'"
msgstr ""
-#: builtin/fetch.c:142 builtin/fetch.c:165 builtin/pull.c:126
-msgid "on-demand"
+#: builtin/checkout.c:1419
+msgid ""
+"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
+"checking out of the index."
msgstr ""
-#: builtin/fetch.c:143
-msgid "control recursive fetching of submodules"
+#: builtin/checkout.c:1439
+#, 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/fetch.c:147 builtin/pull.c:209
-msgid "keep downloaded pack"
+#: builtin/clean.c:28
+msgid ""
+"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
msgstr ""
-#: builtin/fetch.c:149
-msgid "allow updating of HEAD ref"
+#: builtin/clean.c:32
+#, c-format
+msgid "Removing %s\n"
msgstr ""
-#: builtin/fetch.c:152 builtin/fetch.c:158 builtin/pull.c:212
-msgid "deepen history of shallow clone"
+#: builtin/clean.c:33
+#, c-format
+msgid "Would remove %s\n"
msgstr ""
-#: builtin/fetch.c:154
-msgid "deepen history of shallow repository based on time"
+#: builtin/clean.c:34
+#, c-format
+msgid "Skipping repository %s\n"
msgstr ""
-#: builtin/fetch.c:160 builtin/pull.c:215
-msgid "convert to a complete repository"
+#: builtin/clean.c:35
+#, c-format
+msgid "Would skip repository %s\n"
msgstr ""
-#: builtin/fetch.c:162 builtin/log.c:1466
-msgid "dir"
+#: builtin/clean.c:36
+#, c-format
+msgid "failed to remove %s"
msgstr ""
-#: builtin/fetch.c:163
-msgid "prepend this to submodule path output"
+#: 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/fetch.c:166
+#: builtin/clean.c:303 git-add--interactive.perl:588
+#, c-format
msgid ""
-"default for recursive fetching of submodules (lower priority than config "
-"files)"
+"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/fetch.c:170 builtin/pull.c:218
-msgid "accept refs that update .git/shallow"
+#: builtin/clean.c:519 git-add--interactive.perl:554
+#: git-add--interactive.perl:559
+#, c-format, perl-format
+msgid "Huh (%s)?\n"
msgstr ""
-#: builtin/fetch.c:171 builtin/pull.c:220
-msgid "refmap"
+#: builtin/clean.c:661
+#, c-format
+msgid "Input ignore patterns>> "
msgstr ""
-#: builtin/fetch.c:172 builtin/pull.c:221
-msgid "specify fetch refmap"
+#: builtin/clean.c:698
+#, c-format
+msgid "WARNING: Cannot find items matched by: %s"
msgstr ""
-#: builtin/fetch.c:431
-msgid "Couldn't find remote ref HEAD"
+#: builtin/clean.c:719
+msgid "Select items to delete"
msgstr ""
-#: builtin/fetch.c:549
+#. TRANSLATORS: Make sure to keep [y/N] as is
+#: builtin/clean.c:760
#, c-format
-msgid "configuration fetch.output contains invalid value %s"
+msgid "Remove %s [y/N]? "
msgstr ""
-#: builtin/fetch.c:642
+#: builtin/clean.c:785 git-add--interactive.perl:1717
#, c-format
-msgid "object %s not found"
+msgid "Bye.\n"
msgstr ""
-#: builtin/fetch.c:646
-msgid "[up to date]"
+#: 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/fetch.c:659 builtin/fetch.c:739
-msgid "[rejected]"
+#: builtin/clean.c:820 git-add--interactive.perl:1793
+msgid "*** Commands ***"
msgstr ""
-#: builtin/fetch.c:660
-msgid "can't fetch in current branch"
+#: builtin/clean.c:821 git-add--interactive.perl:1790
+msgid "What now"
msgstr ""
-#: builtin/fetch.c:669
-msgid "[tag update]"
+#: builtin/clean.c:829
+msgid "Would remove the following item:"
+msgid_plural "Would remove the following items:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/clean.c:845
+msgid "No more files to clean, exiting."
msgstr ""
-#: builtin/fetch.c:670 builtin/fetch.c:703 builtin/fetch.c:719
-#: builtin/fetch.c:734
-msgid "unable to update local ref"
+#: builtin/clean.c:907
+msgid "do not print names of files removed"
msgstr ""
-#: builtin/fetch.c:689
-msgid "[new tag]"
+#: builtin/clean.c:909
+msgid "force"
msgstr ""
-#: builtin/fetch.c:692
-msgid "[new branch]"
+#: builtin/clean.c:910
+msgid "interactive cleaning"
msgstr ""
-#: builtin/fetch.c:695
-msgid "[new ref]"
+#: builtin/clean.c:912
+msgid "remove whole directories"
msgstr ""
-#: builtin/fetch.c:734
-msgid "forced update"
+#: builtin/clean.c:913 builtin/describe.c:546 builtin/describe.c:548
+#: builtin/grep.c:897 builtin/log.c:167 builtin/log.c:169
+#: builtin/ls-files.c:557 builtin/name-rev.c:415 builtin/name-rev.c:417
+#: builtin/show-ref.c:178
+msgid "pattern"
msgstr ""
-#: builtin/fetch.c:739
-msgid "non-fast-forward"
+#: builtin/clean.c:914
+msgid "add <pattern> to ignore rules"
msgstr ""
-#: builtin/fetch.c:784
-#, c-format
-msgid "%s did not send all necessary objects\n"
+#: builtin/clean.c:915
+msgid "remove ignored files, too"
msgstr ""
-#: builtin/fetch.c:804
-#, c-format
-msgid "reject %s because shallow roots are not allowed to be updated"
+#: builtin/clean.c:917
+msgid "remove only ignored files"
msgstr ""
-#: builtin/fetch.c:892 builtin/fetch.c:988
-#, c-format
-msgid "From %.*s\n"
+#: builtin/clean.c:935
+msgid "-x and -X cannot be used together"
msgstr ""
-#: builtin/fetch.c:903
-#, c-format
+#: builtin/clean.c:939
msgid ""
-"some local refs could not be updated; try running\n"
-" 'git remote prune %s' to remove any old, conflicting branches"
+"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
+"clean"
msgstr ""
-#: builtin/fetch.c:958
-#, c-format
-msgid " (%s will become dangling)"
+#: builtin/clean.c:942
+msgid ""
+"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
+"refusing to clean"
msgstr ""
-#: builtin/fetch.c:959
-#, c-format
-msgid " (%s has become dangling)"
+#: builtin/clone.c:44
+msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr ""
-#: builtin/fetch.c:991
-msgid "[deleted]"
+#: builtin/clone.c:89
+msgid "don't create a checkout"
msgstr ""
-#: builtin/fetch.c:992 builtin/remote.c:1024
-msgid "(none)"
+#: builtin/clone.c:90 builtin/clone.c:92 builtin/init-db.c:481
+msgid "create a bare repository"
msgstr ""
-#: builtin/fetch.c:1015
-#, c-format
-msgid "Refusing to fetch into current branch %s of non-bare repository"
-msgstr ""
-
-#: builtin/fetch.c:1034
-#, c-format
-msgid "Option \"%s\" value \"%s\" is not valid for %s"
-msgstr ""
-
-#: builtin/fetch.c:1037
-#, c-format
-msgid "Option \"%s\" is ignored for %s\n"
+#: builtin/clone.c:94
+msgid "create a mirror repository (implies bare)"
msgstr ""
-#: builtin/fetch.c:1277
-#, c-format
-msgid "Fetching %s\n"
+#: builtin/clone.c:96
+msgid "to clone from a local repository"
msgstr ""
-#: builtin/fetch.c:1279 builtin/remote.c:97
-#, c-format
-msgid "Could not fetch %s"
+#: builtin/clone.c:98
+msgid "don't use local hardlinks, always copy"
msgstr ""
-#: builtin/fetch.c:1325 builtin/fetch.c:1498
-msgid ""
-"--filter can only be used with the remote configured in core.partialClone"
+#: builtin/clone.c:100
+msgid "setup as shared repository"
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/clone.c:102 builtin/clone.c:106
+msgid "pathspec"
msgstr ""
-#: builtin/fetch.c:1394
-msgid "You need to specify a tag name."
+#: builtin/clone.c:102 builtin/clone.c:106
+msgid "initialize submodules in the clone"
msgstr ""
-#: builtin/fetch.c:1439
-msgid "Negative depth in --deepen is not supported"
+#: builtin/clone.c:109
+msgid "number of submodules cloned in parallel"
msgstr ""
-#: builtin/fetch.c:1441
-msgid "--deepen and --depth are mutually exclusive"
+#: builtin/clone.c:110 builtin/init-db.c:478
+msgid "template-directory"
msgstr ""
-#: builtin/fetch.c:1446
-msgid "--depth and --unshallow cannot be used together"
+#: builtin/clone.c:111 builtin/init-db.c:479
+msgid "directory from which templates will be used"
msgstr ""
-#: builtin/fetch.c:1448
-msgid "--unshallow on a complete repository does not make sense"
+#: builtin/clone.c:113 builtin/clone.c:115 builtin/submodule--helper.c:1379
+#: builtin/submodule--helper.c:1860
+msgid "reference repository"
msgstr ""
-#: builtin/fetch.c:1464
-msgid "fetch --all does not take a repository argument"
+#: builtin/clone.c:117 builtin/submodule--helper.c:1381
+#: builtin/submodule--helper.c:1862
+msgid "use --reference only while cloning"
msgstr ""
-#: builtin/fetch.c:1466
-msgid "fetch --all does not make sense with refspecs"
+#: builtin/clone.c:118 builtin/column.c:27 builtin/merge-file.c:46
+#: builtin/pack-objects.c:3303 builtin/repack.c:329
+msgid "name"
msgstr ""
-#: builtin/fetch.c:1475
-#, c-format
-msgid "No such remote or remote group: %s"
+#: builtin/clone.c:119
+msgid "use <name> instead of 'origin' to track upstream"
msgstr ""
-#: builtin/fetch.c:1482
-msgid "Fetching a group and specifying refspecs does not make sense"
+#: builtin/clone.c:121
+msgid "checkout <branch> instead of the remote's HEAD"
msgstr ""
-#: builtin/fmt-merge-msg.c:15
-msgid ""
-"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
+#: builtin/clone.c:123
+msgid "path to git-upload-pack on the remote"
msgstr ""
-#: builtin/fmt-merge-msg.c:666
-msgid "populate log with at most <n> entries from shortlog"
+#: builtin/clone.c:124 builtin/fetch.c:142 builtin/grep.c:836
+#: builtin/pull.c:218
+msgid "depth"
msgstr ""
-#: builtin/fmt-merge-msg.c:669
-msgid "alias for --log (deprecated)"
+#: builtin/clone.c:125
+msgid "create a shallow clone of that depth"
msgstr ""
-#: builtin/fmt-merge-msg.c:672
-msgid "text"
+#: builtin/clone.c:126 builtin/fetch.c:144 builtin/pack-objects.c:3292
+msgid "time"
msgstr ""
-#: builtin/fmt-merge-msg.c:673
-msgid "use <text> as start of message"
+#: builtin/clone.c:127
+msgid "create a shallow clone since a specific time"
msgstr ""
-#: builtin/fmt-merge-msg.c:674
-msgid "file to read from"
+#: builtin/clone.c:128 builtin/fetch.c:146 builtin/fetch.c:169
+#: builtin/rebase.c:1039
+msgid "revision"
msgstr ""
-#: builtin/for-each-ref.c:10
-msgid "git for-each-ref [<options>] [<pattern>]"
+#: builtin/clone.c:129 builtin/fetch.c:147
+msgid "deepen history of shallow clone, excluding rev"
msgstr ""
-#: builtin/for-each-ref.c:11
-msgid "git for-each-ref [--points-at <object>]"
+#: builtin/clone.c:131
+msgid "clone only one branch, HEAD or --branch"
msgstr ""
-#: builtin/for-each-ref.c:12
-msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]"
+#: builtin/clone.c:133
+msgid "don't clone any tags, and make later fetches not to follow them"
msgstr ""
-#: builtin/for-each-ref.c:13
-msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
+#: builtin/clone.c:135
+msgid "any cloned submodules will be shallow"
msgstr ""
-#: builtin/for-each-ref.c:28
-msgid "quote placeholders suitably for shells"
+#: builtin/clone.c:136 builtin/init-db.c:487
+msgid "gitdir"
msgstr ""
-#: builtin/for-each-ref.c:30
-msgid "quote placeholders suitably for perl"
+#: builtin/clone.c:137 builtin/init-db.c:488
+msgid "separate git dir from working tree"
msgstr ""
-#: builtin/for-each-ref.c:32
-msgid "quote placeholders suitably for python"
+#: builtin/clone.c:138
+msgid "key=value"
msgstr ""
-#: builtin/for-each-ref.c:34
-msgid "quote placeholders suitably for Tcl"
+#: builtin/clone.c:139
+msgid "set config inside the new repository"
msgstr ""
-#: builtin/for-each-ref.c:37
-msgid "show only <n> matched refs"
+#: builtin/clone.c:140 builtin/fetch.c:165 builtin/pull.c:231
+#: builtin/push.c:586
+msgid "use IPv4 addresses only"
msgstr ""
-#: builtin/for-each-ref.c:39 builtin/tag.c:420
-msgid "respect format colors"
+#: builtin/clone.c:142 builtin/fetch.c:167 builtin/pull.c:234
+#: builtin/push.c:588
+msgid "use IPv6 addresses only"
msgstr ""
-#: builtin/for-each-ref.c:43
-msgid "print only refs which points at the given object"
+#: builtin/clone.c:280
+msgid ""
+"No directory name could be guessed.\n"
+"Please specify a directory on the command line"
msgstr ""
-#: builtin/for-each-ref.c:45
-msgid "print only refs that are merged"
+#: builtin/clone.c:333
+#, c-format
+msgid "info: Could not add alternate for '%s': %s\n"
msgstr ""
-#: builtin/for-each-ref.c:46
-msgid "print only refs that are not merged"
+#: builtin/clone.c:405
+#, c-format
+msgid "failed to open '%s'"
msgstr ""
-#: builtin/for-each-ref.c:47
-msgid "print only refs which contain the commit"
+#: builtin/clone.c:413
+#, c-format
+msgid "%s exists and is not a directory"
msgstr ""
-#: builtin/for-each-ref.c:48
-msgid "print only refs which don't contain the commit"
+#: builtin/clone.c:427
+#, c-format
+msgid "failed to stat %s\n"
msgstr ""
-#: builtin/fsck.c:568
-msgid "Checking object directories"
+#: builtin/clone.c:444
+#, c-format
+msgid "failed to unlink '%s'"
msgstr ""
-#: builtin/fsck.c:660
-msgid "git fsck [<options>] [<object>...]"
+#: builtin/clone.c:449
+#, c-format
+msgid "failed to create link '%s'"
msgstr ""
-#: builtin/fsck.c:666
-msgid "show unreachable objects"
+#: builtin/clone.c:453
+#, c-format
+msgid "failed to copy file to '%s'"
msgstr ""
-#: builtin/fsck.c:667
-msgid "show dangling objects"
+#: builtin/clone.c:479
+#, c-format
+msgid "done.\n"
msgstr ""
-#: builtin/fsck.c:668
-msgid "report tags"
+#: 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/fsck.c:669
-msgid "report root nodes"
+#: builtin/clone.c:570
+#, c-format
+msgid "Could not find remote branch %s to clone."
msgstr ""
-#: builtin/fsck.c:670
-msgid "make index objects head nodes"
+#: builtin/clone.c:687
+#, c-format
+msgid "unable to update %s"
msgstr ""
-#: builtin/fsck.c:671
-msgid "make reflogs head nodes (default)"
+#: builtin/clone.c:737
+msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr ""
-#: builtin/fsck.c:672
-msgid "also consider packs and alternate objects"
+#: builtin/clone.c:768
+msgid "unable to checkout working tree"
msgstr ""
-#: builtin/fsck.c:673
-msgid "check only connectivity"
+#: builtin/clone.c:813
+msgid "unable to write parameters to config file"
msgstr ""
-#: builtin/fsck.c:674
-msgid "enable more strict checking"
+#: builtin/clone.c:876
+msgid "cannot repack to clean up"
msgstr ""
-#: builtin/fsck.c:676
-msgid "write dangling objects in .git/lost-found"
+#: builtin/clone.c:878
+msgid "cannot unlink temporary alternates file"
msgstr ""
-#: builtin/fsck.c:677 builtin/prune.c:108
-msgid "show progress"
+#: builtin/clone.c:918 builtin/receive-pack.c:1941
+msgid "Too many arguments."
msgstr ""
-#: builtin/fsck.c:678
-msgid "show verbose names for reachable objects"
+#: builtin/clone.c:922
+msgid "You must specify a repository to clone."
msgstr ""
-#: builtin/fsck.c:742
-msgid "Checking objects"
+#: builtin/clone.c:935
+#, c-format
+msgid "--bare and --origin %s options are incompatible."
msgstr ""
-#: builtin/gc.c:27
-msgid "git gc [<options>]"
+#: builtin/clone.c:938
+msgid "--bare and --separate-git-dir are incompatible."
msgstr ""
-#: builtin/gc.c:80
+#: builtin/clone.c:951
#, c-format
-msgid "Failed to fstat %s: %s"
+msgid "repository '%s' does not exist"
msgstr ""
-#: builtin/gc.c:312
+#: builtin/clone.c:957 builtin/fetch.c:1608
#, c-format
-msgid "Can't stat %s"
+msgid "depth %s is not a positive number"
msgstr ""
-#: builtin/gc.c:321
+#: builtin/clone.c:967
#, c-format
-msgid ""
-"The last gc run reported the following. Please correct the root cause\n"
-"and remove %s.\n"
-"Automatic cleanup will not be performed until the file is removed.\n"
-"\n"
-"%s"
-msgstr ""
-
-#: builtin/gc.c:360
-msgid "prune unreferenced objects"
-msgstr ""
-
-#: builtin/gc.c:362
-msgid "be more thorough (increased runtime)"
-msgstr ""
-
-#: builtin/gc.c:363
-msgid "enable auto-gc mode"
-msgstr ""
-
-#: builtin/gc.c:366
-msgid "force running gc even if there may be another gc running"
+msgid "destination path '%s' already exists and is not an empty directory."
msgstr ""
-#: builtin/gc.c:384
+#: builtin/clone.c:977
#, c-format
-msgid "Failed to parse gc.logexpiry value %s"
+msgid "working tree '%s' already exists."
msgstr ""
-#: builtin/gc.c:412
+#: builtin/clone.c:992 builtin/clone.c:1013 builtin/difftool.c:272
+#: builtin/worktree.c:296 builtin/worktree.c:326
#, c-format
-msgid "Auto packing the repository in background for optimum performance.\n"
+msgid "could not create leading directories of '%s'"
msgstr ""
-#: builtin/gc.c:414
+#: builtin/clone.c:997
#, c-format
-msgid "Auto packing the repository for optimum performance.\n"
+msgid "could not create work tree dir '%s'"
msgstr ""
-#: builtin/gc.c:415
+#: builtin/clone.c:1017
#, c-format
-msgid "See \"git help gc\" for manual housekeeping.\n"
+msgid "Cloning into bare repository '%s'...\n"
msgstr ""
-#: builtin/gc.c:440
+#: builtin/clone.c:1019
#, c-format
-msgid ""
-"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
+msgid "Cloning into '%s'...\n"
msgstr ""
-#: builtin/gc.c:487
+#: builtin/clone.c:1043
msgid ""
-"There are too many unreachable loose objects; run 'git prune' to remove them."
+"clone --recursive is not compatible with both --reference and --reference-if-"
+"able"
msgstr ""
-#: builtin/grep.c:27
-msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
+#: builtin/clone.c:1104
+msgid "--depth is ignored in local clones; use file:// instead."
msgstr ""
-#: builtin/grep.c:225
-#, c-format
-msgid "grep: failed to create thread: %s"
+#: builtin/clone.c:1106
+msgid "--shallow-since is ignored in local clones; use file:// instead."
msgstr ""
-#: builtin/grep.c:283
-#, c-format
-msgid "invalid number of threads specified (%d) for %s"
+#: builtin/clone.c:1108
+msgid "--shallow-exclude is ignored in local clones; use file:// instead."
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/clone.c:1110
+msgid "--filter is ignored in local clones; use file:// instead."
msgstr ""
-#: builtin/grep.c:460 builtin/grep.c:580 builtin/grep.c:622
-#, c-format
-msgid "unable to read tree (%s)"
+#: builtin/clone.c:1113
+msgid "source repository is shallow, ignoring --local"
msgstr ""
-#: builtin/grep.c:637
-#, c-format
-msgid "unable to grep from object of type %s"
+#: builtin/clone.c:1118
+msgid "--local is ignored"
msgstr ""
-#: builtin/grep.c:703
+#: builtin/clone.c:1192 builtin/clone.c:1200
#, c-format
-msgid "switch `%c' expects a numerical value"
-msgstr ""
-
-#: builtin/grep.c:790
-msgid "search in index instead of in the work tree"
+msgid "Remote branch %s not found in upstream %s"
msgstr ""
-#: builtin/grep.c:792
-msgid "find in contents not managed by git"
+#: builtin/clone.c:1203
+msgid "You appear to have cloned an empty repository."
msgstr ""
-#: builtin/grep.c:794
-msgid "search in both tracked and untracked files"
+#: builtin/column.c:10
+msgid "git column [<options>]"
msgstr ""
-#: builtin/grep.c:796
-msgid "ignore files specified via '.gitignore'"
+#: builtin/column.c:27
+msgid "lookup config vars"
msgstr ""
-#: builtin/grep.c:798
-msgid "recursively search in each submodule"
+#: builtin/column.c:28 builtin/column.c:29
+msgid "layout to use"
msgstr ""
-#: builtin/grep.c:801
-msgid "show non-matching lines"
+#: builtin/column.c:30
+msgid "Maximum width"
msgstr ""
-#: builtin/grep.c:803
-msgid "case insensitive matching"
+#: builtin/column.c:31
+msgid "Padding space on left border"
msgstr ""
-#: builtin/grep.c:805
-msgid "match patterns only at word boundaries"
+#: builtin/column.c:32
+msgid "Padding space on right border"
msgstr ""
-#: builtin/grep.c:807
-msgid "process binary files as text"
+#: builtin/column.c:33
+msgid "Padding space between columns"
msgstr ""
-#: builtin/grep.c:809
-msgid "don't match patterns in binary files"
+#: builtin/column.c:51
+msgid "--command must be the first argument"
msgstr ""
-#: builtin/grep.c:812
-msgid "process binary files with textconv filters"
+#: builtin/commit.c:41
+msgid "git commit [<options>] [--] <pathspec>..."
msgstr ""
-#: builtin/grep.c:814
-msgid "descend at most <depth> levels"
+#: builtin/commit.c:46
+msgid "git status [<options>] [--] <pathspec>..."
msgstr ""
-#: builtin/grep.c:818
-msgid "use extended POSIX regular expressions"
+#: 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/grep.c:821
-msgid "use basic POSIX regular expressions (default)"
-msgstr ""
+#: builtin/commit.c:56
+msgid ""
+"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
+"If you wish to commit it anyway, use:\n"
+"\n"
+" git commit --allow-empty\n"
+"\n"
+msgstr ""
-#: builtin/grep.c:824
-msgid "interpret patterns as fixed strings"
+#: builtin/commit.c:63
+msgid "Otherwise, please use 'git reset'\n"
msgstr ""
-#: builtin/grep.c:827
-msgid "use Perl-compatible regular expressions"
+#: 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/grep.c:830
-msgid "show line numbers"
+#: builtin/commit.c:312
+msgid "failed to unpack HEAD tree object"
msgstr ""
-#: builtin/grep.c:831
-msgid "don't show filenames"
+#: builtin/commit.c:353
+msgid "unable to create temporary index"
msgstr ""
-#: builtin/grep.c:832
-msgid "show filenames"
+#: builtin/commit.c:359
+msgid "interactive add failed"
msgstr ""
-#: builtin/grep.c:834
-msgid "show filenames relative to top directory"
+#: builtin/commit.c:373
+msgid "unable to update temporary index"
msgstr ""
-#: builtin/grep.c:836
-msgid "show only filenames instead of matching lines"
+#: builtin/commit.c:375
+msgid "Failed to update main cache tree"
msgstr ""
-#: builtin/grep.c:838
-msgid "synonym for --files-with-matches"
+#: builtin/commit.c:400 builtin/commit.c:423 builtin/commit.c:469
+msgid "unable to write new_index file"
msgstr ""
-#: builtin/grep.c:841
-msgid "show only the names of files without match"
+#: builtin/commit.c:452
+msgid "cannot do a partial commit during a merge."
msgstr ""
-#: builtin/grep.c:843
-msgid "print NUL after filenames"
+#: builtin/commit.c:454
+msgid "cannot do a partial commit during a cherry-pick."
msgstr ""
-#: builtin/grep.c:846
-msgid "show the number of matches instead of matching lines"
+#: builtin/commit.c:462
+msgid "cannot read the index"
msgstr ""
-#: builtin/grep.c:847
-msgid "highlight matches"
+#: builtin/commit.c:481
+msgid "unable to write temporary index file"
msgstr ""
-#: builtin/grep.c:849
-msgid "print empty line between matches from different files"
+#: builtin/commit.c:579
+#, c-format
+msgid "commit '%s' lacks author header"
msgstr ""
-#: builtin/grep.c:851
-msgid "show filename only once above matches from same file"
+#: builtin/commit.c:581
+#, c-format
+msgid "commit '%s' has malformed author line"
msgstr ""
-#: builtin/grep.c:854
-msgid "show <n> context lines before and after matches"
+#: builtin/commit.c:600
+msgid "malformed --author parameter"
msgstr ""
-#: builtin/grep.c:857
-msgid "show <n> context lines before matches"
+#: builtin/commit.c:652
+msgid ""
+"unable to select a comment character that is not used\n"
+"in the current commit message"
msgstr ""
-#: builtin/grep.c:859
-msgid "show <n> context lines after matches"
+#: builtin/commit.c:689 builtin/commit.c:722 builtin/commit.c:1052
+#, c-format
+msgid "could not lookup commit %s"
msgstr ""
-#: builtin/grep.c:861
-msgid "use <n> worker threads"
+#: builtin/commit.c:701 builtin/shortlog.c:319
+#, c-format
+msgid "(reading log message from standard input)\n"
msgstr ""
-#: builtin/grep.c:862
-msgid "shortcut for -C NUM"
+#: builtin/commit.c:703
+msgid "could not read log from standard input"
msgstr ""
-#: builtin/grep.c:865
-msgid "show a line with the function name before matches"
+#: builtin/commit.c:707
+#, c-format
+msgid "could not read log file '%s'"
msgstr ""
-#: builtin/grep.c:867
-msgid "show the surrounding function"
+#: builtin/commit.c:736 builtin/commit.c:744
+msgid "could not read SQUASH_MSG"
msgstr ""
-#: builtin/grep.c:870
-msgid "read patterns from file"
+#: builtin/commit.c:741
+msgid "could not read MERGE_MSG"
msgstr ""
-#: builtin/grep.c:872
-msgid "match <pattern>"
+#: builtin/commit.c:795
+msgid "could not write commit template"
msgstr ""
-#: builtin/grep.c:874
-msgid "combine patterns specified with -e"
+#: builtin/commit.c:813
+#, c-format
+msgid ""
+"\n"
+"It looks like you may be committing a merge.\n"
+"If this is not correct, please remove the file\n"
+"\t%s\n"
+"and try again.\n"
msgstr ""
-#: builtin/grep.c:886
-msgid "indicate hit with exit status without output"
+#: builtin/commit.c:818
+#, c-format
+msgid ""
+"\n"
+"It looks like you may be committing a cherry-pick.\n"
+"If this is not correct, please remove the file\n"
+"\t%s\n"
+"and try again.\n"
msgstr ""
-#: builtin/grep.c:888
-msgid "show only matches from files that match all patterns"
+#: builtin/commit.c:831
+#, c-format
+msgid ""
+"Please enter the commit message for your changes. Lines starting\n"
+"with '%c' will be ignored, and an empty message aborts the commit.\n"
msgstr ""
-#: builtin/grep.c:890
-msgid "show parse tree for grep expression"
+#: builtin/commit.c:839
+#, c-format
+msgid ""
+"Please enter the commit message for your changes. Lines starting\n"
+"with '%c' will be kept; you may remove them yourself if you want to.\n"
+"An empty message aborts the commit.\n"
msgstr ""
-#: builtin/grep.c:894
-msgid "pager"
+#: builtin/commit.c:856
+#, c-format
+msgid "%sAuthor: %.*s <%.*s>"
msgstr ""
-#: builtin/grep.c:894
-msgid "show matching files in the pager"
+#: builtin/commit.c:864
+#, c-format
+msgid "%sDate: %s"
msgstr ""
-#: builtin/grep.c:898
-msgid "allow calling of grep(1) (ignored by this build)"
+#: builtin/commit.c:871
+#, c-format
+msgid "%sCommitter: %.*s <%.*s>"
msgstr ""
-#: builtin/grep.c:962
-msgid "no pattern given."
+#: builtin/commit.c:889
+msgid "Cannot read index"
msgstr ""
-#: builtin/grep.c:994
-msgid "--no-index or --untracked cannot be used with revs"
+#: builtin/commit.c:956
+msgid "Error building trees"
msgstr ""
-#: builtin/grep.c:1001
+#: builtin/commit.c:970 builtin/tag.c:258
#, c-format
-msgid "unable to resolve revision: %s"
+msgid "Please supply the message using either -m or -F option.\n"
msgstr ""
-#: builtin/grep.c:1036 builtin/index-pack.c:1519
+#: builtin/commit.c:1014
#, c-format
-msgid "invalid number of threads specified (%d)"
+msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr ""
-#: builtin/grep.c:1041
-msgid "no threads support, ignoring --threads"
+#: builtin/commit.c:1028
+#, c-format
+msgid "Invalid ignored mode '%s'"
msgstr ""
-#: builtin/grep.c:1065
-msgid "--open-files-in-pager only works on the worktree"
+#: builtin/commit.c:1042 builtin/commit.c:1279
+#, c-format
+msgid "Invalid untracked files mode '%s'"
msgstr ""
-#: builtin/grep.c:1088
-msgid "option not supported with --recurse-submodules."
+#: builtin/commit.c:1080
+msgid "--long and -z are incompatible"
msgstr ""
-#: builtin/grep.c:1094
-msgid "--cached or --untracked cannot be used with --no-index."
+#: builtin/commit.c:1113
+msgid "Using both --reset-author and --author does not make sense"
msgstr ""
-#: builtin/grep.c:1100
-msgid "--[no-]exclude-standard cannot be used for tracked contents."
+#: builtin/commit.c:1122
+msgid "You have nothing to amend."
msgstr ""
-#: builtin/grep.c:1108
-msgid "both --cached and trees are given."
+#: builtin/commit.c:1125
+msgid "You are in the middle of a merge -- cannot amend."
msgstr ""
-#: builtin/hash-object.c:83
-msgid ""
-"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
-"[--] <file>..."
+#: builtin/commit.c:1127
+msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr ""
-#: builtin/hash-object.c:84
-msgid "git hash-object --stdin-paths"
+#: builtin/commit.c:1130
+msgid "Options --squash and --fixup cannot be used together"
msgstr ""
-#: builtin/hash-object.c:96
-msgid "type"
+#: builtin/commit.c:1140
+msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr ""
-#: builtin/hash-object.c:96
-msgid "object type"
+#: builtin/commit.c:1142
+msgid "Option -m cannot be combined with -c/-C/-F."
msgstr ""
-#: builtin/hash-object.c:97
-msgid "write the object into the object database"
+#: builtin/commit.c:1150
+msgid "--reset-author can be used only with -C, -c or --amend."
msgstr ""
-#: builtin/hash-object.c:99
-msgid "read the object from stdin"
+#: builtin/commit.c:1167
+msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr ""
-#: builtin/hash-object.c:101
-msgid "store file as is without filters"
+#: builtin/commit.c:1169
+msgid "No paths with --include/--only does not make sense."
msgstr ""
-#: builtin/hash-object.c:102
-msgid ""
-"just hash any random garbage to create corrupt objects for debugging Git"
+#: builtin/commit.c:1183 builtin/tag.c:546
+#, c-format
+msgid "Invalid cleanup mode %s"
msgstr ""
-#: builtin/hash-object.c:103
-msgid "process file as it were from this path"
+#: builtin/commit.c:1188
+msgid "Paths with -a does not make sense."
msgstr ""
-#: builtin/help.c:43
-msgid "print all available commands"
+#: builtin/commit.c:1314 builtin/commit.c:1498
+msgid "show status concisely"
msgstr ""
-#: builtin/help.c:44
-msgid "exclude guides"
+#: builtin/commit.c:1316 builtin/commit.c:1500
+msgid "show branch information"
msgstr ""
-#: builtin/help.c:45
-msgid "print list of useful guides"
+#: builtin/commit.c:1318
+msgid "show stash information"
msgstr ""
-#: builtin/help.c:46
-msgid "show man page"
+#: builtin/commit.c:1320 builtin/commit.c:1502
+msgid "compute full ahead/behind values"
msgstr ""
-#: builtin/help.c:47
-msgid "show manual in web browser"
+#: builtin/commit.c:1322
+msgid "version"
msgstr ""
-#: builtin/help.c:49
-msgid "show info page"
+#: builtin/commit.c:1322 builtin/commit.c:1504 builtin/push.c:561
+#: builtin/worktree.c:640
+msgid "machine-readable output"
msgstr ""
-#: builtin/help.c:55
-msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
+#: builtin/commit.c:1325 builtin/commit.c:1506
+msgid "show status in long format (default)"
msgstr ""
-#: builtin/help.c:67
-#, c-format
-msgid "unrecognized help format '%s'"
+#: builtin/commit.c:1328 builtin/commit.c:1509
+msgid "terminate entries with NUL"
msgstr ""
-#: builtin/help.c:94
-msgid "Failed to start emacsclient."
+#: builtin/commit.c:1330 builtin/commit.c:1334 builtin/commit.c:1512
+#: builtin/fast-export.c:1085 builtin/fast-export.c:1088 builtin/rebase.c:1118
+#: builtin/tag.c:400
+msgid "mode"
msgstr ""
-#: builtin/help.c:107
-msgid "Failed to parse emacsclient version."
+#: builtin/commit.c:1331 builtin/commit.c:1512
+msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr ""
-#: builtin/help.c:115
-#, c-format
-msgid "emacsclient version '%d' too old (< 22)."
+#: builtin/commit.c:1335
+msgid ""
+"show ignored files, optional modes: traditional, matching, no. (Default: "
+"traditional)"
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/commit.c:1337 parse-options.h:164
+msgid "when"
msgstr ""
-#: builtin/help.c:211
-#, c-format
+#: builtin/commit.c:1338
msgid ""
-"'%s': path for unsupported man viewer.\n"
-"Please consider using 'man.<tool>.cmd' instead."
+"ignore changes to submodules, optional when: all, dirty, untracked. "
+"(Default: all)"
msgstr ""
-#: builtin/help.c:223
-#, c-format
-msgid ""
-"'%s': cmd for supported man viewer.\n"
-"Please consider using 'man.<tool>.path' instead."
+#: builtin/commit.c:1340
+msgid "list untracked files in columns"
msgstr ""
-#: builtin/help.c:340
-#, c-format
-msgid "'%s': unknown man viewer."
+#: builtin/commit.c:1341
+msgid "do not detect renames"
msgstr ""
-#: builtin/help.c:357
-msgid "no man viewer handled the request"
+#: builtin/commit.c:1343
+msgid "detect renames, optionally set similarity index"
msgstr ""
-#: builtin/help.c:365
-msgid "no info viewer handled the request"
+#: builtin/commit.c:1363
+msgid "Unsupported combination of ignored and untracked-files arguments"
msgstr ""
-#: builtin/help.c:407
-msgid "Defining attributes per path"
+#: builtin/commit.c:1468
+msgid "suppress summary after successful commit"
msgstr ""
-#: builtin/help.c:408
-msgid "Everyday Git With 20 Commands Or So"
+#: builtin/commit.c:1469
+msgid "show diff in commit message template"
msgstr ""
-#: builtin/help.c:409
-msgid "A Git glossary"
+#: builtin/commit.c:1471
+msgid "Commit message options"
msgstr ""
-#: builtin/help.c:410
-msgid "Specifies intentionally untracked files to ignore"
+#: builtin/commit.c:1472 builtin/merge.c:264 builtin/tag.c:397
+msgid "read message from file"
msgstr ""
-#: builtin/help.c:411
-msgid "Defining submodule properties"
+#: builtin/commit.c:1473
+msgid "author"
msgstr ""
-#: builtin/help.c:412
-msgid "Specifying revisions and ranges for Git"
+#: builtin/commit.c:1473
+msgid "override author for commit"
msgstr ""
-#: builtin/help.c:413
-msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
+#: builtin/commit.c:1474 builtin/gc.c:518
+msgid "date"
msgstr ""
-#: builtin/help.c:414
-msgid "An overview of recommended workflows with Git"
+#: builtin/commit.c:1474
+msgid "override date for commit"
msgstr ""
-#: builtin/help.c:426
-msgid "The common Git guides are:\n"
+#: builtin/commit.c:1475 builtin/merge.c:260 builtin/notes.c:409
+#: builtin/notes.c:575 builtin/tag.c:395
+msgid "message"
msgstr ""
-#: builtin/help.c:444
-#, c-format
-msgid "'%s' is aliased to '%s'"
+#: builtin/commit.c:1475
+msgid "commit message"
msgstr ""
-#: builtin/help.c:466 builtin/help.c:483
-#, c-format
-msgid "usage: %s%s"
+#: builtin/commit.c:1476 builtin/commit.c:1477 builtin/commit.c:1478
+#: builtin/commit.c:1479 parse-options.h:278 ref-filter.h:92
+msgid "commit"
msgstr ""
-#: builtin/index-pack.c:157
-#, c-format
-msgid "unable to open %s"
+#: builtin/commit.c:1476
+msgid "reuse and edit message from specified commit"
msgstr ""
-#: builtin/index-pack.c:207
-#, c-format
-msgid "object type mismatch at %s"
+#: builtin/commit.c:1477
+msgid "reuse message from specified commit"
msgstr ""
-#: builtin/index-pack.c:227
-#, c-format
-msgid "did not receive expected object %s"
+#: builtin/commit.c:1478
+msgid "use autosquash formatted message to fixup specified commit"
msgstr ""
-#: builtin/index-pack.c:230
-#, c-format
-msgid "object %s: expected type %s, found %s"
+#: builtin/commit.c:1479
+msgid "use autosquash formatted message to squash specified commit"
msgstr ""
-#: builtin/index-pack.c:272
-#, 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"
+#: builtin/commit.c:1480
+msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr ""
-#: builtin/index-pack.c:283
-msgid "read error on input"
+#: builtin/commit.c:1481 builtin/log.c:1533 builtin/merge.c:277
+#: builtin/pull.c:156 builtin/revert.c:107
+msgid "add Signed-off-by:"
msgstr ""
-#: builtin/index-pack.c:295
-msgid "used more bytes than were available"
+#: builtin/commit.c:1482
+msgid "use specified template file"
msgstr ""
-#: builtin/index-pack.c:302
-msgid "pack too large for current definition of off_t"
+#: builtin/commit.c:1483
+msgid "force edit of commit"
msgstr ""
-#: builtin/index-pack.c:305 builtin/unpack-objects.c:93
-msgid "pack exceeds maximum allowed size"
+#: builtin/commit.c:1484
+msgid "default"
msgstr ""
-#: builtin/index-pack.c:320
-#, c-format
-msgid "unable to create '%s'"
+#: builtin/commit.c:1484 builtin/tag.c:401
+msgid "how to strip spaces and #comments from message"
msgstr ""
-#: builtin/index-pack.c:326
-#, c-format
-msgid "cannot open packfile '%s'"
+#: builtin/commit.c:1485
+msgid "include status in commit message template"
msgstr ""
-#: builtin/index-pack.c:340
-msgid "pack signature mismatch"
+#: builtin/commit.c:1487 builtin/merge.c:275 builtin/pull.c:186
+#: builtin/revert.c:115
+msgid "GPG sign commit"
msgstr ""
-#: builtin/index-pack.c:342
-#, c-format
-msgid "pack version %<PRIu32> unsupported"
+#: builtin/commit.c:1490
+msgid "Commit contents options"
msgstr ""
-#: builtin/index-pack.c:360
-#, c-format
-msgid "pack has bad object at offset %<PRIuMAX>: %s"
+#: builtin/commit.c:1491
+msgid "commit all changed files"
msgstr ""
-#: builtin/index-pack.c:481
-#, c-format
-msgid "inflate returned %d"
+#: builtin/commit.c:1492
+msgid "add specified files to index for commit"
msgstr ""
-#: builtin/index-pack.c:530
-msgid "offset value overflow for delta base object"
+#: builtin/commit.c:1493
+msgid "interactively add files"
msgstr ""
-#: builtin/index-pack.c:538
-msgid "delta base offset is out of bound"
+#: builtin/commit.c:1494
+msgid "interactively add changes"
msgstr ""
-#: builtin/index-pack.c:546
-#, c-format
-msgid "unknown object type %d"
+#: builtin/commit.c:1495
+msgid "commit only specified files"
msgstr ""
-#: builtin/index-pack.c:577
-msgid "cannot pread pack file"
+#: builtin/commit.c:1496
+msgid "bypass pre-commit and commit-msg hooks"
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/commit.c:1497
+msgid "show what would be committed"
+msgstr ""
-#: builtin/index-pack.c:605
-msgid "serious inflate inconsistency"
+#: builtin/commit.c:1510
+msgid "amend previous commit"
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/commit.c:1511
+msgid "bypass post-rewrite hook"
msgstr ""
-#: builtin/index-pack.c:753 builtin/pack-objects.c:182
-#: builtin/pack-objects.c:276
-#, c-format
-msgid "unable to read %s"
+#: builtin/commit.c:1516
+msgid "ok to record an empty change"
+msgstr ""
+
+#: builtin/commit.c:1518
+msgid "ok to record a change with an empty message"
msgstr ""
-#: builtin/index-pack.c:816
+#: builtin/commit.c:1591
#, c-format
-msgid "cannot read existing object info %s"
+msgid "Corrupt MERGE_HEAD file (%s)"
+msgstr ""
+
+#: builtin/commit.c:1598
+msgid "could not read MERGE_MODE"
msgstr ""
-#: builtin/index-pack.c:824
+#: builtin/commit.c:1617
#, c-format
-msgid "cannot read existing object %s"
+msgid "could not read commit message: %s"
msgstr ""
-#: builtin/index-pack.c:838
+#: builtin/commit.c:1628
#, c-format
-msgid "invalid blob object %s"
+msgid "Aborting commit due to empty commit message.\n"
msgstr ""
-#: builtin/index-pack.c:853
+#: builtin/commit.c:1633
#, c-format
-msgid "invalid %s"
+msgid "Aborting commit; you did not edit the message.\n"
msgstr ""
-#: builtin/index-pack.c:856
-msgid "Error in object"
+#: builtin/commit.c:1668
+msgid ""
+"repository has been updated, but unable to write\n"
+"new_index file. Check that disk is not full and quota is\n"
+"not exceeded, and then \"git reset HEAD\" to recover."
msgstr ""
-#: builtin/index-pack.c:858
-#, c-format
-msgid "Not all child objects of %s are reachable"
+#: builtin/commit-graph.c:10
+msgid "git commit-graph [--object-dir <objdir>]"
msgstr ""
-#: builtin/index-pack.c:930 builtin/index-pack.c:961
-msgid "failed to apply delta"
+#: builtin/commit-graph.c:11 builtin/commit-graph.c:23
+msgid "git commit-graph read [--object-dir <objdir>]"
msgstr ""
-#: builtin/index-pack.c:1131
-msgid "Receiving objects"
+#: builtin/commit-graph.c:12 builtin/commit-graph.c:18
+msgid "git commit-graph verify [--object-dir <objdir>]"
msgstr ""
-#: builtin/index-pack.c:1131
-msgid "Indexing objects"
+#: 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/index-pack.c:1165
-msgid "pack is corrupted (SHA1 mismatch)"
+#: builtin/commit-graph.c:48 builtin/commit-graph.c:78
+#: builtin/commit-graph.c:132 builtin/commit-graph.c:190 builtin/fetch.c:153
+#: builtin/log.c:1553
+msgid "dir"
msgstr ""
-#: builtin/index-pack.c:1170
-msgid "cannot fstat packfile"
+#: builtin/commit-graph.c:49 builtin/commit-graph.c:79
+#: builtin/commit-graph.c:133 builtin/commit-graph.c:191
+msgid "The object directory to store the graph"
msgstr ""
-#: builtin/index-pack.c:1173
-msgid "pack has junk at the end"
+#: builtin/commit-graph.c:135
+msgid "start walk at all refs"
msgstr ""
-#: builtin/index-pack.c:1185
-msgid "confusion beyond insanity in parse_pack_objects()"
+#: builtin/commit-graph.c:137
+msgid "scan pack-indexes listed by stdin for commits"
msgstr ""
-#: builtin/index-pack.c:1208
-msgid "Resolving deltas"
+#: builtin/commit-graph.c:139
+msgid "start walk at commits listed by stdin"
msgstr ""
-#: builtin/index-pack.c:1219
-#, c-format
-msgid "unable to create thread: %s"
+#: builtin/commit-graph.c:141
+msgid "include all commits already in the commit-graph file"
msgstr ""
-#: builtin/index-pack.c:1261
-msgid "confusion beyond insanity"
+#: builtin/commit-graph.c:150
+msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
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/config.c:11
+msgid "git config [<options>]"
+msgstr ""
-#: builtin/index-pack.c:1279
+#: builtin/config.c:103
#, c-format
-msgid "Unexpected tail checksum for %s (disk corruption?)"
+msgid "unrecognized --type argument, %s"
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/config.c:115
+msgid "only one type at a time"
+msgstr ""
-#: builtin/index-pack.c:1307
-#, c-format
-msgid "unable to deflate appended object (%d)"
+#: builtin/config.c:124
+msgid "Config file location"
msgstr ""
-#: builtin/index-pack.c:1383
-#, c-format
-msgid "local object %s is corrupt"
+#: builtin/config.c:125
+msgid "use global config file"
msgstr ""
-#: builtin/index-pack.c:1397
-#, c-format
-msgid "packfile name '%s' does not end with '.pack'"
+#: builtin/config.c:126
+msgid "use system config file"
msgstr ""
-#: builtin/index-pack.c:1422
-#, c-format
-msgid "cannot write %s file '%s'"
+#: builtin/config.c:127
+msgid "use repository config file"
msgstr ""
-#: builtin/index-pack.c:1430
-#, c-format
-msgid "cannot close written %s file '%s'"
+#: builtin/config.c:128
+msgid "use per-worktree config file"
msgstr ""
-#: builtin/index-pack.c:1454
-msgid "error while closing pack file"
+#: builtin/config.c:129
+msgid "use given config file"
msgstr ""
-#: builtin/index-pack.c:1468
-msgid "cannot store pack file"
+#: builtin/config.c:130
+msgid "blob-id"
msgstr ""
-#: builtin/index-pack.c:1476
-msgid "cannot store index file"
+#: builtin/config.c:130
+msgid "read config from given blob object"
msgstr ""
-#: builtin/index-pack.c:1513
-#, c-format
-msgid "bad pack.indexversion=%<PRIu32>"
+#: builtin/config.c:131
+msgid "Action"
msgstr ""
-#: builtin/index-pack.c:1581
-#, c-format
-msgid "Cannot open existing pack file '%s'"
+#: builtin/config.c:132
+msgid "get value: name [value-regex]"
msgstr ""
-#: builtin/index-pack.c:1583
-#, c-format
-msgid "Cannot open existing pack idx file for '%s'"
+#: builtin/config.c:133
+msgid "get all values: key [value-regex]"
msgstr ""
-#: builtin/index-pack.c:1631
-#, c-format
-msgid "non delta: %d object"
-msgid_plural "non delta: %d objects"
-msgstr[0] ""
-msgstr[1] ""
+#: builtin/config.c:134
+msgid "get values for regexp: name-regex [value-regex]"
+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/config.c:135
+msgid "get value specific for the URL: section[.var] URL"
+msgstr ""
-#: builtin/index-pack.c:1675
-msgid "Cannot come back to cwd"
+#: builtin/config.c:136
+msgid "replace all matching variables: name value [value_regex]"
msgstr ""
-#: builtin/index-pack.c:1724 builtin/index-pack.c:1727
-#: builtin/index-pack.c:1743 builtin/index-pack.c:1747
-#, c-format
-msgid "bad %s"
+#: builtin/config.c:137
+msgid "add a new variable: name value"
msgstr ""
-#: builtin/index-pack.c:1763
-msgid "--fix-thin cannot be used without --stdin"
+#: builtin/config.c:138
+msgid "remove a variable: name [value-regex]"
msgstr ""
-#: builtin/index-pack.c:1765
-msgid "--stdin requires a git repository"
+#: builtin/config.c:139
+msgid "remove all matches: name [value-regex]"
msgstr ""
-#: builtin/index-pack.c:1771
-msgid "--verify with no packfile name given"
+#: builtin/config.c:140
+msgid "rename section: old-name new-name"
msgstr ""
-#: builtin/init-db.c:55
-#, c-format
-msgid "cannot stat '%s'"
+#: builtin/config.c:141
+msgid "remove a section: name"
msgstr ""
-#: builtin/init-db.c:61
-#, c-format
-msgid "cannot stat template '%s'"
+#: builtin/config.c:142
+msgid "list all"
msgstr ""
-#: builtin/init-db.c:66
-#, c-format
-msgid "cannot opendir '%s'"
+#: builtin/config.c:143
+msgid "open an editor"
msgstr ""
-#: builtin/init-db.c:77
-#, c-format
-msgid "cannot readlink '%s'"
+#: builtin/config.c:144
+msgid "find the color configured: slot [default]"
msgstr ""
-#: builtin/init-db.c:79
-#, c-format
-msgid "cannot symlink '%s' '%s'"
+#: builtin/config.c:145
+msgid "find the color setting: slot [stdout-is-tty]"
msgstr ""
-#: builtin/init-db.c:85
-#, c-format
-msgid "cannot copy '%s' to '%s'"
+#: builtin/config.c:146
+msgid "Type"
msgstr ""
-#: builtin/init-db.c:89
-#, c-format
-msgid "ignoring template %s"
+#: builtin/config.c:147
+msgid "value is given this type"
msgstr ""
-#: builtin/init-db.c:120
-#, c-format
-msgid "templates not found %s"
+#: builtin/config.c:148
+msgid "value is \"true\" or \"false\""
msgstr ""
-#: builtin/init-db.c:135
-#, c-format
-msgid "not copying templates from '%s': %s"
+#: builtin/config.c:149
+msgid "value is decimal number"
msgstr ""
-#: builtin/init-db.c:328
-#, c-format
-msgid "unable to handle file type %d"
+#: builtin/config.c:150
+msgid "value is --bool or --int"
msgstr ""
-#: builtin/init-db.c:331
-#, c-format
-msgid "unable to move %s to %s"
+#: builtin/config.c:151
+msgid "value is a path (file or directory name)"
msgstr ""
-#: builtin/init-db.c:348 builtin/init-db.c:351
-#, c-format
-msgid "%s already exists"
+#: builtin/config.c:152
+msgid "value is an expiry date"
msgstr ""
-#: builtin/init-db.c:404
-#, c-format
-msgid "Reinitialized existing shared Git repository in %s%s\n"
+#: builtin/config.c:153
+msgid "Other"
msgstr ""
-#: builtin/init-db.c:405
-#, c-format
-msgid "Reinitialized existing Git repository in %s%s\n"
+#: builtin/config.c:154
+msgid "terminate values with NUL byte"
msgstr ""
-#: builtin/init-db.c:409
-#, c-format
-msgid "Initialized empty shared Git repository in %s%s\n"
+#: builtin/config.c:155
+msgid "show variable names only"
msgstr ""
-#: builtin/init-db.c:410
-#, c-format
-msgid "Initialized empty Git repository in %s%s\n"
+#: builtin/config.c:156
+msgid "respect include directives on lookup"
msgstr ""
-#: builtin/init-db.c:458
-msgid ""
-"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
-"shared[=<permissions>]] [<directory>]"
+#: builtin/config.c:157
+msgid "show origin of config (file, standard input, blob, command line)"
msgstr ""
-#: builtin/init-db.c:481
-msgid "permissions"
+#: builtin/config.c:158
+msgid "value"
msgstr ""
-#: builtin/init-db.c:482
-msgid "specify that the git repository is to be shared amongst several users"
+#: builtin/config.c:158
+msgid "with --get, use default value when missing entry"
msgstr ""
-#: builtin/init-db.c:516 builtin/init-db.c:521
+#: builtin/config.c:172
#, c-format
-msgid "cannot mkdir %s"
+msgid "wrong number of arguments, should be %d"
msgstr ""
-#: builtin/init-db.c:525
+#: builtin/config.c:174
#, c-format
-msgid "cannot chdir to %s"
+msgid "wrong number of arguments, should be from %d to %d"
msgstr ""
-#: builtin/init-db.c:546
+#: builtin/config.c:308
#, c-format
-msgid ""
-"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
-"dir=<directory>)"
+msgid "invalid key pattern: %s"
msgstr ""
-#: builtin/init-db.c:574
+#: builtin/config.c:344
#, c-format
-msgid "Cannot access work tree '%s'"
+msgid "failed to format default config value: %s"
msgstr ""
-#: builtin/interpret-trailers.c:15
-msgid ""
-"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
-"<token>[(=|:)<value>])...] [<file>...]"
+#: builtin/config.c:401
+#, c-format
+msgid "cannot parse color '%s'"
msgstr ""
-#: builtin/interpret-trailers.c:92
-msgid "edit files in place"
+#: builtin/config.c:443
+msgid "unable to parse default color value"
msgstr ""
-#: builtin/interpret-trailers.c:93
-msgid "trim empty trailers"
+#: builtin/config.c:496 builtin/config.c:742
+msgid "not in a git directory"
msgstr ""
-#: builtin/interpret-trailers.c:96
-msgid "where to place the new trailer"
+#: builtin/config.c:499
+msgid "writing to stdin is not supported"
msgstr ""
-#: builtin/interpret-trailers.c:98
-msgid "action if trailer already exists"
+#: builtin/config.c:502
+msgid "writing config blobs is not supported"
msgstr ""
-#: builtin/interpret-trailers.c:100
-msgid "action if trailer is missing"
+#: builtin/config.c:587
+#, c-format
+msgid ""
+"# This is Git's per-user configuration file.\n"
+"[user]\n"
+"# Please adapt and uncomment the following lines:\n"
+"#\tname = %s\n"
+"#\temail = %s\n"
msgstr ""
-#: builtin/interpret-trailers.c:102
-msgid "output only the trailers"
+#: builtin/config.c:611
+msgid "only one config file at a time"
msgstr ""
-#: builtin/interpret-trailers.c:103
-msgid "do not apply config rules"
+#: builtin/config.c:616
+msgid "--local can only be used inside a git repository"
msgstr ""
-#: builtin/interpret-trailers.c:104
-msgid "join whitespace-continued values"
+#: builtin/config.c:619
+msgid "--blob can only be used inside a git repository"
msgstr ""
-#: builtin/interpret-trailers.c:105
-msgid "set parsing options"
+#: builtin/config.c:638
+msgid "$HOME not set"
msgstr ""
-#: builtin/interpret-trailers.c:107
-msgid "trailer"
+#: 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/interpret-trailers.c:108
-msgid "trailer(s) to add"
+#: builtin/config.c:688
+msgid "--get-color and variable type are incoherent"
msgstr ""
-#: builtin/interpret-trailers.c:117
-msgid "--trailer with --only-input does not make sense"
+#: builtin/config.c:693
+msgid "only one action at a time"
msgstr ""
-#: builtin/interpret-trailers.c:127
-msgid "no input file given for in-place editing"
+#: builtin/config.c:706
+msgid "--name-only is only applicable to --list or --get-regexp"
msgstr ""
-#: builtin/log.c:48
-msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
+#: builtin/config.c:712
+msgid ""
+"--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
+"list"
msgstr ""
-#: builtin/log.c:49
-msgid "git show [<options>] <object>..."
+#: builtin/config.c:718
+msgid "--default is only applicable to --get"
msgstr ""
-#: builtin/log.c:93
+#: builtin/config.c:731
#, c-format
-msgid "invalid --decorate option: %s"
+msgid "unable to read config file '%s'"
msgstr ""
-#: builtin/log.c:153
-msgid "suppress diff output"
+#: builtin/config.c:734
+msgid "error processing config file(s)"
msgstr ""
-#: builtin/log.c:154
-msgid "show source"
+#: builtin/config.c:744
+msgid "editing stdin is not supported"
msgstr ""
-#: builtin/log.c:155
-msgid "Use mail map file"
+#: builtin/config.c:746
+msgid "editing blobs is not supported"
msgstr ""
-#: builtin/log.c:157
-msgid "only decorate refs that match <pattern>"
+#: builtin/config.c:760
+#, c-format
+msgid "cannot create configuration file %s"
msgstr ""
-#: builtin/log.c:159
-msgid "do not decorate refs that match <pattern>"
+#: 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/log.c:160
-msgid "decorate options"
+#: builtin/config.c:847 builtin/config.c:858
+#, c-format
+msgid "no such section: %s"
msgstr ""
-#: builtin/log.c:163
-msgid "Process line range n,m in file, counting from 1"
+#: builtin/count-objects.c:90
+msgid "git count-objects [-v] [-H | --human-readable]"
msgstr ""
-#: builtin/log.c:259
-#, c-format
-msgid "Final output: %d %s\n"
+#: builtin/count-objects.c:100
+msgid "print sizes in human readable format"
msgstr ""
-#: builtin/log.c:510
-#, c-format
-msgid "git show %s: bad file"
+#: builtin/describe.c:27
+msgid "git describe [<options>] [<commit-ish>...]"
msgstr ""
-#: builtin/log.c:525 builtin/log.c:619
-#, c-format
-msgid "Could not read object %s"
+#: builtin/describe.c:28
+msgid "git describe [<options>] --dirty"
msgstr ""
-#: builtin/log.c:643
-#, c-format
-msgid "Unknown type: %d"
+#: builtin/describe.c:63
+msgid "head"
msgstr ""
-#: builtin/log.c:764
-msgid "format.headers without value"
+#: builtin/describe.c:63
+msgid "lightweight"
msgstr ""
-#: builtin/log.c:865
-msgid "name of output directory is too long"
+#: builtin/describe.c:63
+msgid "annotated"
msgstr ""
-#: builtin/log.c:881
+#: builtin/describe.c:273
#, c-format
-msgid "Cannot open patch file %s"
+msgid "annotated tag %s not available"
msgstr ""
-#: builtin/log.c:898
-msgid "Need exactly one range."
+#: builtin/describe.c:277
+#, c-format
+msgid "annotated tag %s has no embedded name"
msgstr ""
-#: builtin/log.c:908
-msgid "Not a range."
+#: builtin/describe.c:279
+#, c-format
+msgid "tag '%s' is really '%s' here"
msgstr ""
-#: builtin/log.c:1014
-msgid "Cover letter needs email format"
+#: builtin/describe.c:323
+#, c-format
+msgid "no tag exactly matches '%s'"
msgstr ""
-#: builtin/log.c:1095
+#: builtin/describe.c:325
#, c-format
-msgid "insane in-reply-to: %s"
+msgid "No exact match on refs or tags, searching to describe\n"
msgstr ""
-#: builtin/log.c:1122
-msgid "git format-patch [<options>] [<since> | <revision-range>]"
+#: builtin/describe.c:379
+#, c-format
+msgid "finished search at %s\n"
msgstr ""
-#: builtin/log.c:1172
-msgid "Two output directories?"
+#: builtin/describe.c:405
+#, c-format
+msgid ""
+"No annotated tags can describe '%s'.\n"
+"However, there were unannotated tags: try --tags."
msgstr ""
-#: builtin/log.c:1279 builtin/log.c:1932 builtin/log.c:1934 builtin/log.c:1946
+#: builtin/describe.c:409
#, c-format
-msgid "Unknown commit %s"
+msgid ""
+"No tags can describe '%s'.\n"
+"Try --always, or create some tags."
msgstr ""
-#: builtin/log.c:1289 builtin/notes.c:887 builtin/tag.c:522
+#: builtin/describe.c:439
#, c-format
-msgid "Failed to resolve '%s' as a valid ref."
+msgid "traversed %lu commits\n"
msgstr ""
-#: builtin/log.c:1294
-msgid "Could not find exact merge base."
+#: 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/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/describe.c:510
+#, c-format
+msgid "describe %s\n"
msgstr ""
-#: builtin/log.c:1318
-msgid "Failed to find exact merge base"
+#: builtin/describe.c:513 builtin/log.c:516
+#, c-format
+msgid "Not a valid object name %s"
msgstr ""
-#: builtin/log.c:1329
-msgid "base commit should be the ancestor of revision list"
+#: builtin/describe.c:521
+#, c-format
+msgid "%s is neither a commit nor blob"
msgstr ""
-#: builtin/log.c:1333
-msgid "base commit shouldn't be in revision list"
+#: builtin/describe.c:535
+msgid "find the tag that comes after the commit"
msgstr ""
-#: builtin/log.c:1382
-msgid "cannot get patch id"
+#: builtin/describe.c:536
+msgid "debug search strategy on stderr"
msgstr ""
-#: builtin/log.c:1441
-msgid "use [PATCH n/m] even with a single patch"
+#: builtin/describe.c:537
+msgid "use any ref"
msgstr ""
-#: builtin/log.c:1444
-msgid "use [PATCH] even with multiple patches"
+#: builtin/describe.c:538
+msgid "use any tag, even unannotated"
msgstr ""
-#: builtin/log.c:1448
-msgid "print patches to standard out"
+#: builtin/describe.c:539
+msgid "always use long format"
msgstr ""
-#: builtin/log.c:1450
-msgid "generate a cover letter"
+#: builtin/describe.c:540
+msgid "only follow first parent"
msgstr ""
-#: builtin/log.c:1452
-msgid "use simple number sequence for output file names"
+#: builtin/describe.c:543
+msgid "only output exact matches"
msgstr ""
-#: builtin/log.c:1453
-msgid "sfx"
+#: builtin/describe.c:545
+msgid "consider <n> most recent tags (default: 10)"
msgstr ""
-#: builtin/log.c:1454
-msgid "use <sfx> instead of '.patch'"
+#: builtin/describe.c:547
+msgid "only consider tags matching <pattern>"
msgstr ""
-#: builtin/log.c:1456
-msgid "start numbering patches at <n> instead of 1"
+#: builtin/describe.c:549
+msgid "do not consider tags matching <pattern>"
msgstr ""
-#: builtin/log.c:1458
-msgid "mark the series as Nth re-roll"
+#: builtin/describe.c:551 builtin/name-rev.c:424
+msgid "show abbreviated commit object as fallback"
msgstr ""
-#: builtin/log.c:1460
-msgid "Use [RFC PATCH] instead of [PATCH]"
+#: builtin/describe.c:552 builtin/describe.c:555
+msgid "mark"
msgstr ""
-#: builtin/log.c:1463
-msgid "Use [<prefix>] instead of [PATCH]"
+#: builtin/describe.c:553
+msgid "append <mark> on dirty working tree (default: \"-dirty\")"
msgstr ""
-#: builtin/log.c:1466
-msgid "store resulting files in <dir>"
+#: builtin/describe.c:556
+msgid "append <mark> on broken working tree (default: \"-broken\")"
msgstr ""
-#: builtin/log.c:1469
-msgid "don't strip/add [PATCH]"
+#: builtin/describe.c:574
+msgid "--long is incompatible with --abbrev=0"
msgstr ""
-#: builtin/log.c:1472
-msgid "don't output binary diffs"
+#: builtin/describe.c:603
+msgid "No names found, cannot describe anything."
msgstr ""
-#: builtin/log.c:1474
-msgid "output all-zero hash in From header"
+#: builtin/describe.c:654
+msgid "--dirty is incompatible with commit-ishes"
msgstr ""
-#: builtin/log.c:1476
-msgid "don't include a patch matching a commit upstream"
+#: builtin/describe.c:656
+msgid "--broken is incompatible with commit-ishes"
msgstr ""
-#: builtin/log.c:1478
-msgid "show patch format instead of default (patch + stat)"
+#: builtin/diff.c:84
+#, c-format
+msgid "'%s': not a regular file or symlink"
msgstr ""
-#: builtin/log.c:1480
-msgid "Messaging"
+#: builtin/diff.c:235
+#, c-format
+msgid "invalid option: %s"
msgstr ""
-#: builtin/log.c:1481
-msgid "header"
+#: builtin/diff.c:364
+msgid "Not a git repository"
msgstr ""
-#: builtin/log.c:1482
-msgid "add email header"
+#: builtin/diff.c:408
+#, c-format
+msgid "invalid object '%s' given."
msgstr ""
-#: builtin/log.c:1483 builtin/log.c:1485
-msgid "email"
+#: builtin/diff.c:417
+#, c-format
+msgid "more than two blobs given: '%s'"
msgstr ""
-#: builtin/log.c:1483
-msgid "add To: header"
+#: builtin/diff.c:422
+#, c-format
+msgid "unhandled object '%s' given."
msgstr ""
-#: builtin/log.c:1485
-msgid "add Cc: header"
+#: builtin/difftool.c:31
+msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
msgstr ""
-#: builtin/log.c:1487
-msgid "ident"
+#: builtin/difftool.c:261
+#, c-format
+msgid "failed: %d"
msgstr ""
-#: builtin/log.c:1488
-msgid "set From address to <ident> (or committer ident if absent)"
+#: builtin/difftool.c:303
+#, c-format
+msgid "could not read symlink %s"
msgstr ""
-#: builtin/log.c:1490
-msgid "message-id"
+#: builtin/difftool.c:305
+#, c-format
+msgid "could not read symlink file %s"
msgstr ""
-#: builtin/log.c:1491
-msgid "make first mail a reply to <message-id>"
+#: builtin/difftool.c:313
+#, c-format
+msgid "could not read object %s for symlink %s"
msgstr ""
-#: builtin/log.c:1492 builtin/log.c:1495
-msgid "boundary"
+#: builtin/difftool.c:414
+msgid ""
+"combined diff formats('-c' and '--cc') are not supported in\n"
+"directory diff mode('-d' and '--dir-diff')."
msgstr ""
-#: builtin/log.c:1493
-msgid "attach the patch"
+#: builtin/difftool.c:634
+#, c-format
+msgid "both files modified: '%s' and '%s'."
msgstr ""
-#: builtin/log.c:1496
-msgid "inline the patch"
+#: builtin/difftool.c:636
+msgid "working tree file has been left."
msgstr ""
-#: builtin/log.c:1500
-msgid "enable message threading, styles: shallow, deep"
+#: builtin/difftool.c:647
+#, c-format
+msgid "temporary files exist in '%s'."
msgstr ""
-#: builtin/log.c:1502
-msgid "signature"
+#: builtin/difftool.c:648
+msgid "you may want to cleanup or recover these."
msgstr ""
-#: builtin/log.c:1503
-msgid "add a signature"
+#: builtin/difftool.c:697
+msgid "use `diff.guitool` instead of `diff.tool`"
msgstr ""
-#: builtin/log.c:1504
-msgid "base-commit"
+#: builtin/difftool.c:699
+msgid "perform a full-directory diff"
msgstr ""
-#: builtin/log.c:1505
-msgid "add prerequisite tree info to the patch series"
+#: builtin/difftool.c:701
+msgid "do not prompt before launching a diff tool"
msgstr ""
-#: builtin/log.c:1507
-msgid "add a signature from a file"
+#: builtin/difftool.c:706
+msgid "use symlinks in dir-diff mode"
msgstr ""
-#: builtin/log.c:1508
-msgid "don't print the patch filenames"
+#: builtin/difftool.c:707
+msgid "tool"
msgstr ""
-#: builtin/log.c:1510
-msgid "show progress while generating patches"
+#: builtin/difftool.c:708
+msgid "use the specified diff tool"
msgstr ""
-#: builtin/log.c:1585
-#, c-format
-msgid "invalid ident line: %s"
+#: builtin/difftool.c:710
+msgid "print a list of diff tools that may be used with `--tool`"
msgstr ""
-#: builtin/log.c:1600
-msgid "-n and -k are mutually exclusive."
+#: builtin/difftool.c:713
+msgid ""
+"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
+"code"
msgstr ""
-#: builtin/log.c:1602
-msgid "--subject-prefix/--rfc and -k are mutually exclusive."
+#: builtin/difftool.c:716
+msgid "specify a custom command for viewing diffs"
msgstr ""
-#: builtin/log.c:1610
-msgid "--name-only does not make sense"
+#: builtin/difftool.c:740
+msgid "no <tool> given for --tool=<tool>"
msgstr ""
-#: builtin/log.c:1612
-msgid "--name-status does not make sense"
+#: builtin/difftool.c:747
+msgid "no <cmd> given for --extcmd=<cmd>"
msgstr ""
-#: builtin/log.c:1614
-msgid "--check does not make sense"
+#: builtin/fast-export.c:29
+msgid "git fast-export [rev-list-opts]"
msgstr ""
-#: builtin/log.c:1646
-msgid "standard output, or directory, which one?"
+#: builtin/fast-export.c:1084
+msgid "show progress after <n> objects"
msgstr ""
-#: builtin/log.c:1648
-#, c-format
-msgid "Could not create directory '%s'"
+#: builtin/fast-export.c:1086
+msgid "select handling of signed tags"
msgstr ""
-#: builtin/log.c:1741
-#, c-format
-msgid "unable to read signature file '%s'"
+#: builtin/fast-export.c:1089
+msgid "select handling of tags that tag filtered objects"
msgstr ""
-#: builtin/log.c:1773
-msgid "Generating patches"
+#: builtin/fast-export.c:1092
+msgid "Dump marks to this file"
msgstr ""
-#: builtin/log.c:1817
-msgid "Failed to create output files"
+#: builtin/fast-export.c:1094
+msgid "Import marks from this file"
msgstr ""
-#: builtin/log.c:1867
-msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
+#: builtin/fast-export.c:1096
+msgid "Fake a tagger when tags lack one"
msgstr ""
-#: builtin/log.c:1921
-#, c-format
-msgid ""
-"Could not find a tracked remote branch, please specify <upstream> manually.\n"
+#: builtin/fast-export.c:1098
+msgid "Output full tree for each commit"
msgstr ""
-#: builtin/ls-files.c:468
-msgid "git ls-files [<options>] [<file>...]"
+#: builtin/fast-export.c:1100
+msgid "Use the done feature to terminate the stream"
msgstr ""
-#: builtin/ls-files.c:517
-msgid "identify the file status with tags"
+#: builtin/fast-export.c:1101
+msgid "Skip output of blob data"
msgstr ""
-#: builtin/ls-files.c:519
-msgid "use lowercase letters for 'assume unchanged' files"
+#: builtin/fast-export.c:1102 builtin/log.c:1601
+msgid "refspec"
msgstr ""
-#: builtin/ls-files.c:521
-msgid "use lowercase letters for 'fsmonitor clean' files"
+#: builtin/fast-export.c:1103
+msgid "Apply refspec to exported refs"
msgstr ""
-#: builtin/ls-files.c:523
-msgid "show cached files in the output (default)"
+#: builtin/fast-export.c:1104
+msgid "anonymize output"
msgstr ""
-#: builtin/ls-files.c:525
-msgid "show deleted files in the output"
+#: builtin/fast-export.c:1106
+msgid "Reference parents which are not in fast-export stream by object id"
msgstr ""
-#: builtin/ls-files.c:527
-msgid "show modified files in the output"
+#: builtin/fast-export.c:1108
+msgid "Show original object ids of blobs/commits"
msgstr ""
-#: builtin/ls-files.c:529
-msgid "show other files in the output"
+#: builtin/fetch.c:28
+msgid "git fetch [<options>] [<repository> [<refspec>...]]"
msgstr ""
-#: builtin/ls-files.c:531
-msgid "show ignored files in the output"
+#: builtin/fetch.c:29
+msgid "git fetch [<options>] <group>"
msgstr ""
-#: builtin/ls-files.c:534
-msgid "show staged contents' object name in the output"
+#: builtin/fetch.c:30
+msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
msgstr ""
-#: builtin/ls-files.c:536
-msgid "show files on the filesystem that need to be removed"
+#: builtin/fetch.c:31
+msgid "git fetch --all [<options>]"
msgstr ""
-#: builtin/ls-files.c:538
-msgid "show 'other' directories' names only"
+#: builtin/fetch.c:115 builtin/pull.c:195
+msgid "fetch from all remotes"
msgstr ""
-#: builtin/ls-files.c:540
-msgid "show line endings of files"
+#: builtin/fetch.c:117 builtin/pull.c:198
+msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr ""
-#: builtin/ls-files.c:542
-msgid "don't show empty directories"
+#: builtin/fetch.c:119 builtin/pull.c:201
+msgid "path to upload pack on remote end"
msgstr ""
-#: builtin/ls-files.c:545
-msgid "show unmerged files in the output"
+#: builtin/fetch.c:120
+msgid "force overwrite of local reference"
msgstr ""
-#: builtin/ls-files.c:547
-msgid "show resolve-undo information"
+#: builtin/fetch.c:122
+msgid "fetch from multiple remotes"
msgstr ""
-#: builtin/ls-files.c:549
-msgid "skip files matching pattern"
+#: builtin/fetch.c:124 builtin/pull.c:205
+msgid "fetch all tags and associated objects"
msgstr ""
-#: builtin/ls-files.c:552
-msgid "exclude patterns are read from <file>"
+#: builtin/fetch.c:126
+msgid "do not fetch all tags (--no-tags)"
msgstr ""
-#: builtin/ls-files.c:555
-msgid "read additional per-directory exclude patterns in <file>"
+#: builtin/fetch.c:128
+msgid "number of submodules fetched in parallel"
msgstr ""
-#: builtin/ls-files.c:557
-msgid "add the standard git exclusions"
+#: builtin/fetch.c:130 builtin/pull.c:208
+msgid "prune remote-tracking branches no longer on remote"
msgstr ""
-#: builtin/ls-files.c:560
-msgid "make the output relative to the project top directory"
+#: builtin/fetch.c:132
+msgid "prune local tags no longer on remote and clobber changed tags"
msgstr ""
-#: builtin/ls-files.c:563
-msgid "recurse through submodules"
+#: builtin/fetch.c:133 builtin/fetch.c:156 builtin/pull.c:133
+msgid "on-demand"
msgstr ""
-#: builtin/ls-files.c:565
-msgid "if any <file> is not in the index, treat this as an error"
+#: builtin/fetch.c:134
+msgid "control recursive fetching of submodules"
msgstr ""
-#: builtin/ls-files.c:566
-msgid "tree-ish"
+#: builtin/fetch.c:138 builtin/pull.c:216
+msgid "keep downloaded pack"
msgstr ""
-#: builtin/ls-files.c:567
-msgid "pretend that paths removed since <tree-ish> are still present"
+#: builtin/fetch.c:140
+msgid "allow updating of HEAD ref"
msgstr ""
-#: builtin/ls-files.c:569
-msgid "show debugging data"
+#: builtin/fetch.c:143 builtin/fetch.c:149 builtin/pull.c:219
+msgid "deepen history of shallow clone"
+msgstr ""
+
+#: builtin/fetch.c:145
+msgid "deepen history of shallow repository based on time"
+msgstr ""
+
+#: builtin/fetch.c:151 builtin/pull.c:222
+msgid "convert to a complete repository"
msgstr ""
-#: builtin/ls-remote.c:7
+#: builtin/fetch.c:154
+msgid "prepend this to submodule path output"
+msgstr ""
+
+#: builtin/fetch.c:157
msgid ""
-"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
-" [-q | --quiet] [--exit-code] [--get-url]\n"
-" [--symref] [<repository> [<refs>...]]"
+"default for recursive fetching of submodules (lower priority than config "
+"files)"
msgstr ""
-#: builtin/ls-remote.c:52
-msgid "do not print remote URL"
+#: builtin/fetch.c:161 builtin/pull.c:225
+msgid "accept refs that update .git/shallow"
msgstr ""
-#: builtin/ls-remote.c:53 builtin/ls-remote.c:55
-msgid "exec"
+#: builtin/fetch.c:162 builtin/pull.c:227
+msgid "refmap"
msgstr ""
-#: builtin/ls-remote.c:54 builtin/ls-remote.c:56
-msgid "path of git-upload-pack on the remote host"
+#: builtin/fetch.c:163 builtin/pull.c:228
+msgid "specify fetch refmap"
msgstr ""
-#: builtin/ls-remote.c:58
-msgid "limit to tags"
+#: builtin/fetch.c:164 builtin/ls-remote.c:77 builtin/push.c:585
+#: builtin/send-pack.c:172
+msgid "server-specific"
msgstr ""
-#: builtin/ls-remote.c:59
-msgid "limit to heads"
+#: builtin/fetch.c:164 builtin/ls-remote.c:77 builtin/push.c:585
+#: builtin/send-pack.c:173
+msgid "option to transmit"
msgstr ""
-#: builtin/ls-remote.c:60
-msgid "do not show peeled tags"
+#: builtin/fetch.c:170
+msgid "report that we have only objects reachable from this object"
msgstr ""
-#: builtin/ls-remote.c:62
-msgid "take url.<base>.insteadOf into account"
+#: builtin/fetch.c:469
+msgid "Couldn't find remote ref HEAD"
msgstr ""
-#: builtin/ls-remote.c:64
-msgid "exit with exit code 2 if no matching refs are found"
+#: builtin/fetch.c:608
+#, c-format
+msgid "configuration fetch.output contains invalid value %s"
msgstr ""
-#: builtin/ls-remote.c:67
-msgid "show underlying ref in addition to the object pointed by it"
+#: builtin/fetch.c:705
+#, c-format
+msgid "object %s not found"
msgstr ""
-#: builtin/ls-tree.c:29
-msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
+#: builtin/fetch.c:709
+msgid "[up to date]"
msgstr ""
-#: builtin/ls-tree.c:127
-msgid "only show trees"
+#: builtin/fetch.c:722 builtin/fetch.c:738 builtin/fetch.c:801
+msgid "[rejected]"
msgstr ""
-#: builtin/ls-tree.c:129
-msgid "recurse into subtrees"
+#: builtin/fetch.c:723
+msgid "can't fetch in current branch"
msgstr ""
-#: builtin/ls-tree.c:131
-msgid "show trees when recursing"
+#: builtin/fetch.c:733
+msgid "[tag update]"
msgstr ""
-#: builtin/ls-tree.c:134
-msgid "terminate entries with NUL byte"
+#: builtin/fetch.c:734 builtin/fetch.c:771 builtin/fetch.c:784
+#: builtin/fetch.c:796
+msgid "unable to update local ref"
msgstr ""
-#: builtin/ls-tree.c:135
-msgid "include object size"
+#: builtin/fetch.c:738
+msgid "would clobber existing tag"
msgstr ""
-#: builtin/ls-tree.c:137 builtin/ls-tree.c:139
-msgid "list only filenames"
+#: builtin/fetch.c:760
+msgid "[new tag]"
msgstr ""
-#: builtin/ls-tree.c:142
-msgid "use full path names"
+#: builtin/fetch.c:763
+msgid "[new branch]"
msgstr ""
-#: builtin/ls-tree.c:144
-msgid "list entire tree; not just current directory (implies --full-name)"
+#: builtin/fetch.c:766
+msgid "[new ref]"
msgstr ""
-#: builtin/mailsplit.c:241
-#, c-format
-msgid "empty mbox: '%s'"
+#: builtin/fetch.c:796
+msgid "forced update"
msgstr ""
-#: builtin/merge.c:49
-msgid "git merge [<options>] [<commit>...]"
+#: builtin/fetch.c:801
+msgid "non-fast-forward"
msgstr ""
-#: builtin/merge.c:50
-msgid "git merge --abort"
+#: builtin/fetch.c:847
+#, c-format
+msgid "%s did not send all necessary objects\n"
msgstr ""
-#: builtin/merge.c:51
-msgid "git merge --continue"
+#: builtin/fetch.c:868
+#, c-format
+msgid "reject %s because shallow roots are not allowed to be updated"
msgstr ""
-#: builtin/merge.c:108
-msgid "switch `m' requires a value"
+#: builtin/fetch.c:959 builtin/fetch.c:1081
+#, c-format
+msgid "From %.*s\n"
msgstr ""
-#: builtin/merge.c:145
+#: builtin/fetch.c:970
#, c-format
-msgid "Could not find merge strategy '%s'.\n"
+msgid ""
+"some local refs could not be updated; try running\n"
+" 'git remote prune %s' to remove any old, conflicting branches"
msgstr ""
-#: builtin/merge.c:146
+#: builtin/fetch.c:1051
#, c-format
-msgid "Available strategies are:"
+msgid " (%s will become dangling)"
msgstr ""
-#: builtin/merge.c:151
+#: builtin/fetch.c:1052
#, c-format
-msgid "Available custom strategies are:"
+msgid " (%s has become dangling)"
msgstr ""
-#: builtin/merge.c:201 builtin/pull.c:137
-msgid "do not show a diffstat at the end of the merge"
+#: builtin/fetch.c:1084
+msgid "[deleted]"
msgstr ""
-#: builtin/merge.c:204 builtin/pull.c:140
-msgid "show a diffstat at the end of the merge"
+#: builtin/fetch.c:1085 builtin/remote.c:1036
+msgid "(none)"
msgstr ""
-#: builtin/merge.c:205 builtin/pull.c:143
-msgid "(synonym to --stat)"
+#: builtin/fetch.c:1108
+#, c-format
+msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr ""
-#: builtin/merge.c:207 builtin/pull.c:146
-msgid "add (at most <n>) entries from shortlog to merge commit message"
+#: builtin/fetch.c:1127
+#, c-format
+msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr ""
-#: builtin/merge.c:210 builtin/pull.c:152
-msgid "create a single commit instead of doing a merge"
+#: builtin/fetch.c:1130
+#, c-format
+msgid "Option \"%s\" is ignored for %s\n"
msgstr ""
-#: builtin/merge.c:212 builtin/pull.c:155
-msgid "perform a commit if the merge succeeds (default)"
+#: builtin/fetch.c:1434
+#, c-format
+msgid "Fetching %s\n"
msgstr ""
-#: builtin/merge.c:214 builtin/pull.c:158
-msgid "edit message before committing"
+#: builtin/fetch.c:1436 builtin/remote.c:100
+#, c-format
+msgid "Could not fetch %s"
msgstr ""
-#: builtin/merge.c:215
-msgid "allow fast-forward (default)"
+#: builtin/fetch.c:1482
+msgid ""
+"--filter can only be used with the remote configured in extensions."
+"partialClone"
msgstr ""
-#: builtin/merge.c:217 builtin/pull.c:164
-msgid "abort if fast-forward is not possible"
+#: 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/merge.c:221 builtin/pull.c:167
-msgid "verify that the named commit has a valid GPG signature"
+#: builtin/fetch.c:1543
+msgid "You need to specify a tag name."
msgstr ""
-#: builtin/merge.c:222 builtin/notes.c:777 builtin/pull.c:171
-#: builtin/revert.c:109
-msgid "strategy"
+#: builtin/fetch.c:1592
+msgid "Negative depth in --deepen is not supported"
msgstr ""
-#: builtin/merge.c:223 builtin/pull.c:172
-msgid "merge strategy to use"
+#: builtin/fetch.c:1594
+msgid "--deepen and --depth are mutually exclusive"
msgstr ""
-#: builtin/merge.c:224 builtin/pull.c:175
-msgid "option=value"
+#: builtin/fetch.c:1599
+msgid "--depth and --unshallow cannot be used together"
msgstr ""
-#: builtin/merge.c:225 builtin/pull.c:176
-msgid "option for selected merge strategy"
+#: builtin/fetch.c:1601
+msgid "--unshallow on a complete repository does not make sense"
msgstr ""
-#: builtin/merge.c:227
-msgid "merge commit message (for a non-fast-forward merge)"
+#: builtin/fetch.c:1617
+msgid "fetch --all does not take a repository argument"
msgstr ""
-#: builtin/merge.c:231
-msgid "abort the current in-progress merge"
+#: builtin/fetch.c:1619
+msgid "fetch --all does not make sense with refspecs"
msgstr ""
-#: builtin/merge.c:233
-msgid "continue the current in-progress merge"
+#: builtin/fetch.c:1628
+#, c-format
+msgid "No such remote or remote group: %s"
msgstr ""
-#: builtin/merge.c:235 builtin/pull.c:183
-msgid "allow merging unrelated histories"
+#: builtin/fetch.c:1635
+msgid "Fetching a group and specifying refspecs does not make sense"
msgstr ""
-#: builtin/merge.c:241
-msgid "verify commit-msg hook"
+#: builtin/fetch.c:1651
+msgid ""
+"--filter can only be used with the remote configured in extensions."
+"partialclone"
msgstr ""
-#: builtin/merge.c:266
-msgid "could not run stash."
+#: builtin/fmt-merge-msg.c:18
+msgid ""
+"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
msgstr ""
-#: builtin/merge.c:271
-msgid "stash failed"
+#: builtin/fmt-merge-msg.c:672
+msgid "populate log with at most <n> entries from shortlog"
msgstr ""
-#: builtin/merge.c:276
-#, c-format
-msgid "not a valid object: %s"
+#: builtin/fmt-merge-msg.c:675
+msgid "alias for --log (deprecated)"
msgstr ""
-#: builtin/merge.c:298 builtin/merge.c:315
-msgid "read-tree failed"
+#: builtin/fmt-merge-msg.c:678
+msgid "text"
msgstr ""
-#: builtin/merge.c:345
-msgid " (nothing to squash)"
+#: builtin/fmt-merge-msg.c:679
+msgid "use <text> as start of message"
msgstr ""
-#: builtin/merge.c:356
-#, c-format
-msgid "Squash commit -- not updating HEAD\n"
+#: builtin/fmt-merge-msg.c:680
+msgid "file to read from"
msgstr ""
-#: builtin/merge.c:406
-#, c-format
-msgid "No merge message -- not updating HEAD\n"
+#: builtin/for-each-ref.c:10
+msgid "git for-each-ref [<options>] [<pattern>]"
msgstr ""
-#: builtin/merge.c:456
-#, c-format
-msgid "'%s' does not point to a commit"
+#: builtin/for-each-ref.c:11
+msgid "git for-each-ref [--points-at <object>]"
msgstr ""
-#: builtin/merge.c:546
-#, c-format
-msgid "Bad branch.%s.mergeoptions string: %s"
+#: builtin/for-each-ref.c:12
+msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]"
msgstr ""
-#: builtin/merge.c:668
-msgid "Not handling anything other than two heads merge."
+#: builtin/for-each-ref.c:13
+msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
msgstr ""
-#: builtin/merge.c:682
-#, c-format
-msgid "Unknown option for merge-recursive: -X%s"
+#: builtin/for-each-ref.c:28
+msgid "quote placeholders suitably for shells"
msgstr ""
-#: builtin/merge.c:697
-#, c-format
-msgid "unable to write %s"
+#: builtin/for-each-ref.c:30
+msgid "quote placeholders suitably for perl"
msgstr ""
-#: builtin/merge.c:749
-#, c-format
-msgid "Could not read from '%s'"
+#: builtin/for-each-ref.c:32
+msgid "quote placeholders suitably for python"
msgstr ""
-#: builtin/merge.c:758
-#, c-format
-msgid "Not committing merge; use 'git commit' to complete the merge.\n"
+#: builtin/for-each-ref.c:34
+msgid "quote placeholders suitably for Tcl"
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/for-each-ref.c:37
+msgid "show only <n> matched refs"
msgstr ""
-#: builtin/merge.c:800
-msgid "Empty commit message."
+#: builtin/for-each-ref.c:39 builtin/tag.c:424
+msgid "respect format colors"
msgstr ""
-#: builtin/merge.c:820
-#, c-format
-msgid "Wonderful.\n"
+#: builtin/for-each-ref.c:43
+msgid "print only refs which points at the given object"
msgstr ""
-#: builtin/merge.c:873
-#, c-format
-msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
+#: builtin/for-each-ref.c:45
+msgid "print only refs that are merged"
msgstr ""
-#: builtin/merge.c:912
-msgid "No current branch."
+#: builtin/for-each-ref.c:46
+msgid "print only refs that are not merged"
msgstr ""
-#: builtin/merge.c:914
-msgid "No remote for the current branch."
+#: builtin/for-each-ref.c:47
+msgid "print only refs which contain the commit"
msgstr ""
-#: builtin/merge.c:916
-msgid "No default upstream defined for the current branch."
+#: builtin/for-each-ref.c:48
+msgid "print only refs which don't contain the commit"
msgstr ""
-#: builtin/merge.c:921
-#, c-format
-msgid "No remote-tracking branch for %s from %s"
+#: builtin/fsck.c:88 builtin/fsck.c:160 builtin/fsck.c:161
+msgid "unknown"
msgstr ""
-#: builtin/merge.c:974
+#. TRANSLATORS: e.g. error in tree 01bfda: <more explanation>
+#: builtin/fsck.c:120 builtin/fsck.c:136
#, c-format
-msgid "Bad value '%s' in environment '%s'"
+msgid "error in %s %s: %s"
msgstr ""
-#: builtin/merge.c:1076
+#. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation>
+#: builtin/fsck.c:131
#, c-format
-msgid "not something we can merge in %s: %s"
+msgid "warning in %s %s: %s"
msgstr ""
-#: builtin/merge.c:1110
-msgid "not something we can merge"
+#: builtin/fsck.c:157 builtin/fsck.c:159
+#, c-format
+msgid "broken link from %7s %s"
msgstr ""
-#: builtin/merge.c:1212
-msgid "--abort expects no arguments"
+#: builtin/fsck.c:168
+msgid "wrong object type in link"
msgstr ""
-#: builtin/merge.c:1216
-msgid "There is no merge to abort (MERGE_HEAD missing)."
+#: builtin/fsck.c:184
+#, c-format
+msgid ""
+"broken link from %7s %s\n"
+" to %7s %s"
msgstr ""
-#: builtin/merge.c:1228
-msgid "--continue expects no arguments"
+#: builtin/fsck.c:253
+#, c-format
+msgid "missing %s %s"
msgstr ""
-#: builtin/merge.c:1232
-msgid "There is no merge in progress (MERGE_HEAD missing)."
+#: builtin/fsck.c:279
+#, c-format
+msgid "unreachable %s %s"
msgstr ""
-#: builtin/merge.c:1248
-msgid ""
-"You have not concluded your merge (MERGE_HEAD exists).\n"
-"Please, commit your changes before you merge."
+#: builtin/fsck.c:298
+#, c-format
+msgid "dangling %s %s"
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/fsck.c:307
+msgid "could not create lost-found"
msgstr ""
-#: builtin/merge.c:1258
-msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
+#: builtin/fsck.c:318
+#, c-format
+msgid "could not finish '%s'"
msgstr ""
-#: builtin/merge.c:1267
-msgid "You cannot combine --squash with --no-ff."
+#: builtin/fsck.c:335
+#, c-format
+msgid "Checking %s"
msgstr ""
-#: builtin/merge.c:1275
-msgid "No commit specified and merge.defaultToUpstream not set."
+#: builtin/fsck.c:353
+#, c-format
+msgid "Checking connectivity (%d objects)"
msgstr ""
-#: builtin/merge.c:1292
-msgid "Squash commit into empty head not supported yet"
+#: builtin/fsck.c:372
+#, c-format
+msgid "Checking %s %s"
msgstr ""
-#: builtin/merge.c:1294
-msgid "Non-fast-forward commit does not make sense into an empty head"
+#: builtin/fsck.c:376
+msgid "broken links"
msgstr ""
-#: builtin/merge.c:1299
+#: builtin/fsck.c:385
#, c-format
-msgid "%s - not something we can merge"
+msgid "root %s"
msgstr ""
-#: builtin/merge.c:1301
-msgid "Can merge only exactly one commit into empty head"
+#: builtin/fsck.c:393
+#, c-format
+msgid "tagged %s %s (%s) in %s"
msgstr ""
-#: builtin/merge.c:1335
+#: builtin/fsck.c:422
#, c-format
-msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
+msgid "%s: object corrupt or missing"
msgstr ""
-#: builtin/merge.c:1338
+#: builtin/fsck.c:447
#, c-format
-msgid "Commit %s has a bad GPG signature allegedly by %s."
+msgid "%s: invalid reflog entry %s"
msgstr ""
-#: builtin/merge.c:1341
+#: builtin/fsck.c:461
#, c-format
-msgid "Commit %s does not have a GPG signature."
+msgid "Checking reflog %s->%s"
msgstr ""
-#: builtin/merge.c:1344
+#: builtin/fsck.c:495
#, c-format
-msgid "Commit %s has a good GPG signature by %s\n"
+msgid "%s: invalid sha1 pointer %s"
msgstr ""
-#: builtin/merge.c:1403
-msgid "refusing to merge unrelated histories"
+#: builtin/fsck.c:502
+#, c-format
+msgid "%s: not a commit"
msgstr ""
-#: builtin/merge.c:1412
-msgid "Already up to date."
+#: builtin/fsck.c:557
+msgid "notice: No default references"
msgstr ""
-#: builtin/merge.c:1422
+#: builtin/fsck.c:572
#, c-format
-msgid "Updating %s..%s\n"
+msgid "%s: object corrupt or missing: %s"
msgstr ""
-#: builtin/merge.c:1463
+#: builtin/fsck.c:585
#, c-format
-msgid "Trying really trivial in-index merge...\n"
+msgid "%s: object could not be parsed: %s"
msgstr ""
-#: builtin/merge.c:1470
+#: builtin/fsck.c:605
#, c-format
-msgid "Nope.\n"
+msgid "bad sha1 file: %s"
msgstr ""
-#: builtin/merge.c:1495
-msgid "Already up to date. Yeeah!"
+#: builtin/fsck.c:620
+msgid "Checking object directory"
msgstr ""
-#: builtin/merge.c:1501
-msgid "Not possible to fast-forward, aborting."
+#: builtin/fsck.c:623
+msgid "Checking object directories"
msgstr ""
-#: builtin/merge.c:1524 builtin/merge.c:1603
+#: builtin/fsck.c:638
#, c-format
-msgid "Rewinding the tree to pristine...\n"
+msgid "Checking %s link"
msgstr ""
-#: builtin/merge.c:1528
+#: builtin/fsck.c:643 builtin/index-pack.c:833
#, c-format
-msgid "Trying merge strategy %s...\n"
+msgid "invalid %s"
msgstr ""
-#: builtin/merge.c:1594
+#: builtin/fsck.c:650
#, c-format
-msgid "No merge strategy handled the merge.\n"
+msgid "%s points to something strange (%s)"
msgstr ""
-#: builtin/merge.c:1596
+#: builtin/fsck.c:656
#, c-format
-msgid "Merge with strategy %s failed.\n"
+msgid "%s: detached HEAD points at nothing"
msgstr ""
-#: builtin/merge.c:1605
+#: builtin/fsck.c:660
#, c-format
-msgid "Using the %s to prepare resolving by hand.\n"
+msgid "notice: %s points to an unborn branch (%s)"
+msgstr ""
+
+#: builtin/fsck.c:672
+msgid "Checking cache tree"
msgstr ""
-#: builtin/merge.c:1617
+#: builtin/fsck.c:677
#, c-format
-msgid "Automatic merge went well; stopped before committing as requested\n"
+msgid "%s: invalid sha1 pointer in cache-tree"
msgstr ""
-#: builtin/merge-base.c:30
-msgid "git merge-base [-a | --all] <commit> <commit>..."
+#: builtin/fsck.c:688
+msgid "non-tree in cache-tree"
msgstr ""
-#: builtin/merge-base.c:31
-msgid "git merge-base [-a | --all] --octopus <commit>..."
+#: builtin/fsck.c:719
+msgid "git fsck [<options>] [<object>...]"
msgstr ""
-#: builtin/merge-base.c:32
-msgid "git merge-base --independent <commit>..."
+#: builtin/fsck.c:725
+msgid "show unreachable objects"
msgstr ""
-#: builtin/merge-base.c:33
-msgid "git merge-base --is-ancestor <commit> <commit>"
+#: builtin/fsck.c:726
+msgid "show dangling objects"
msgstr ""
-#: builtin/merge-base.c:34
-msgid "git merge-base --fork-point <ref> [<commit>]"
+#: builtin/fsck.c:727
+msgid "report tags"
msgstr ""
-#: builtin/merge-base.c:220
-msgid "output all common ancestors"
+#: builtin/fsck.c:728
+msgid "report root nodes"
msgstr ""
-#: builtin/merge-base.c:222
-msgid "find ancestors for a single n-way merge"
+#: builtin/fsck.c:729
+msgid "make index objects head nodes"
msgstr ""
-#: builtin/merge-base.c:224
-msgid "list revs not reachable from others"
+#: builtin/fsck.c:730
+msgid "make reflogs head nodes (default)"
msgstr ""
-#: builtin/merge-base.c:226
-msgid "is the first one ancestor of the other?"
+#: builtin/fsck.c:731
+msgid "also consider packs and alternate objects"
msgstr ""
-#: builtin/merge-base.c:228
-msgid "find where <commit> forked from reflog of <ref>"
+#: builtin/fsck.c:732
+msgid "check only connectivity"
msgstr ""
-#: builtin/merge-file.c:9
-msgid ""
-"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
-"<orig-file> <file2>"
+#: builtin/fsck.c:733
+msgid "enable more strict checking"
msgstr ""
-#: builtin/merge-file.c:33
-msgid "send results to standard output"
+#: builtin/fsck.c:735
+msgid "write dangling objects in .git/lost-found"
msgstr ""
-#: builtin/merge-file.c:34
-msgid "use a diff3 based merge"
+#: builtin/fsck.c:736 builtin/prune.c:110
+msgid "show progress"
msgstr ""
-#: builtin/merge-file.c:35
-msgid "for conflicts, use our version"
+#: builtin/fsck.c:737
+msgid "show verbose names for reachable objects"
msgstr ""
-#: builtin/merge-file.c:37
-msgid "for conflicts, use their version"
+#: builtin/fsck.c:797
+msgid "Checking objects"
msgstr ""
-#: builtin/merge-file.c:39
-msgid "for conflicts, use a union version"
+#: builtin/fsck.c:825
+#, c-format
+msgid "%s: object missing"
msgstr ""
-#: builtin/merge-file.c:42
-msgid "for conflicts, use this marker size"
+#: builtin/fsck.c:837
+#, c-format
+msgid "invalid parameter: expected sha1, got '%s'"
msgstr ""
-#: builtin/merge-file.c:43
-msgid "do not warn about conflicts"
+#: builtin/gc.c:34
+msgid "git gc [<options>]"
msgstr ""
-#: builtin/merge-file.c:45
-msgid "set labels for file1/orig-file/file2"
+#: builtin/gc.c:90
+#, c-format
+msgid "Failed to fstat %s: %s"
msgstr ""
-#: builtin/merge-recursive.c:45
+#: builtin/gc.c:461 builtin/init-db.c:55
#, c-format
-msgid "unknown option %s"
+msgid "cannot stat '%s'"
msgstr ""
-#: builtin/merge-recursive.c:51
+#: builtin/gc.c:470 builtin/notes.c:240 builtin/tag.c:510
#, c-format
-msgid "could not parse object '%s'"
+msgid "cannot read '%s'"
msgstr ""
-#: builtin/merge-recursive.c:55
+#: builtin/gc.c:477
#, 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] ""
+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/merge-recursive.c:63
-msgid "not handling anything other than two heads merge."
+#: builtin/gc.c:519
+msgid "prune unreferenced objects"
msgstr ""
-#: builtin/merge-recursive.c:69 builtin/merge-recursive.c:71
-#, c-format
-msgid "could not resolve ref '%s'"
+#: builtin/gc.c:521
+msgid "be more thorough (increased runtime)"
msgstr ""
-#: builtin/merge-recursive.c:77
-#, c-format
-msgid "Merging %s with %s\n"
+#: builtin/gc.c:522
+msgid "enable auto-gc mode"
msgstr ""
-#: builtin/mktree.c:65
-msgid "git mktree [-z] [--missing] [--batch]"
+#: builtin/gc.c:525
+msgid "force running gc even if there may be another gc running"
msgstr ""
-#: builtin/mktree.c:153
-msgid "input is NUL terminated"
+#: builtin/gc.c:528
+msgid "repack all other packs except the largest pack"
msgstr ""
-#: builtin/mktree.c:154 builtin/write-tree.c:25
-msgid "allow missing objects"
+#: builtin/gc.c:545
+#, c-format
+msgid "failed to parse gc.logexpiry value %s"
msgstr ""
-#: builtin/mktree.c:155
-msgid "allow creation of more than one tree"
+#: builtin/gc.c:556
+#, c-format
+msgid "failed to parse prune expiry value %s"
msgstr ""
-#: builtin/mv.c:17
-msgid "git mv [<options>] <source>... <destination>"
+#: builtin/gc.c:576
+#, c-format
+msgid "Auto packing the repository in background for optimum performance.\n"
msgstr ""
-#: builtin/mv.c:83
+#: builtin/gc.c:578
#, c-format
-msgid "Directory %s is in index and no submodule?"
+msgid "Auto packing the repository for optimum performance.\n"
msgstr ""
-#: builtin/mv.c:85 builtin/rm.c:289
-msgid "Please stage your changes to .gitmodules or stash them to proceed"
+#: builtin/gc.c:579
+#, c-format
+msgid "See \"git help gc\" for manual housekeeping.\n"
msgstr ""
-#: builtin/mv.c:103
+#: builtin/gc.c:619
#, c-format
-msgid "%.*s is in index"
+msgid ""
+"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
msgstr ""
-#: builtin/mv.c:125
-msgid "force move/rename even if target exists"
+#: builtin/gc.c:672
+msgid ""
+"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr ""
-#: builtin/mv.c:127
-msgid "skip move/rename errors"
+#: builtin/grep.c:29
+msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
msgstr ""
-#: builtin/mv.c:168
+#: builtin/grep.c:225
#, c-format
-msgid "destination '%s' is not a directory"
+msgid "grep: failed to create thread: %s"
msgstr ""
-#: builtin/mv.c:179
+#: builtin/grep.c:279
#, c-format
-msgid "Checking rename of '%s' to '%s'\n"
+msgid "invalid number of threads specified (%d) for %s"
msgstr ""
-#: builtin/mv.c:183
-msgid "bad source"
+#. TRANSLATORS: %s is the configuration
+#. variable for tweaking threads, currently
+#. grep.threads
+#.
+#: builtin/grep.c:287 builtin/index-pack.c:1506 builtin/index-pack.c:1697
+#: builtin/pack-objects.c:2717
+#, c-format
+msgid "no threads support, ignoring %s"
msgstr ""
-#: builtin/mv.c:186
-msgid "can not move directory into itself"
+#: builtin/grep.c:466 builtin/grep.c:590 builtin/grep.c:631
+#, c-format
+msgid "unable to read tree (%s)"
msgstr ""
-#: builtin/mv.c:189
-msgid "cannot move directory over file"
+#: builtin/grep.c:646
+#, c-format
+msgid "unable to grep from object of type %s"
msgstr ""
-#: builtin/mv.c:198
-msgid "source directory is empty"
+#: builtin/grep.c:712
+#, c-format
+msgid "switch `%c' expects a numerical value"
msgstr ""
-#: builtin/mv.c:223
-msgid "not under version control"
+#: builtin/grep.c:811
+msgid "search in index instead of in the work tree"
msgstr ""
-#: builtin/mv.c:226
-msgid "destination exists"
+#: builtin/grep.c:813
+msgid "find in contents not managed by git"
msgstr ""
-#: builtin/mv.c:234
-#, c-format
-msgid "overwriting '%s'"
+#: builtin/grep.c:815
+msgid "search in both tracked and untracked files"
msgstr ""
-#: builtin/mv.c:237
-msgid "Cannot overwrite"
+#: builtin/grep.c:817
+msgid "ignore files specified via '.gitignore'"
msgstr ""
-#: builtin/mv.c:240
-msgid "multiple sources for the same target"
+#: builtin/grep.c:819
+msgid "recursively search in each submodule"
msgstr ""
-#: builtin/mv.c:242
-msgid "destination directory does not exist"
+#: builtin/grep.c:822
+msgid "show non-matching lines"
msgstr ""
-#: builtin/mv.c:249
-#, c-format
-msgid "%s, source=%s, destination=%s"
+#: builtin/grep.c:824
+msgid "case insensitive matching"
msgstr ""
-#: builtin/mv.c:270
-#, c-format
-msgid "Renaming %s to %s\n"
+#: builtin/grep.c:826
+msgid "match patterns only at word boundaries"
msgstr ""
-#: builtin/mv.c:276 builtin/remote.c:712 builtin/repack.c:394
-#, c-format
-msgid "renaming '%s' failed"
+#: builtin/grep.c:828
+msgid "process binary files as text"
msgstr ""
-#: builtin/name-rev.c:338
-msgid "git name-rev [<options>] <commit>..."
+#: builtin/grep.c:830
+msgid "don't match patterns in binary files"
msgstr ""
-#: builtin/name-rev.c:339
-msgid "git name-rev [<options>] --all"
+#: builtin/grep.c:833
+msgid "process binary files with textconv filters"
msgstr ""
-#: builtin/name-rev.c:340
-msgid "git name-rev [<options>] --stdin"
+#: builtin/grep.c:835
+msgid "search in subdirectories (default)"
msgstr ""
-#: builtin/name-rev.c:395
-msgid "print only names (no SHA-1)"
+#: builtin/grep.c:837
+msgid "descend at most <depth> levels"
msgstr ""
-#: builtin/name-rev.c:396
-msgid "only use tags to name the commits"
+#: builtin/grep.c:841
+msgid "use extended POSIX regular expressions"
msgstr ""
-#: builtin/name-rev.c:398
-msgid "only use refs matching <pattern>"
+#: builtin/grep.c:844
+msgid "use basic POSIX regular expressions (default)"
msgstr ""
-#: builtin/name-rev.c:400
-msgid "ignore refs matching <pattern>"
+#: builtin/grep.c:847
+msgid "interpret patterns as fixed strings"
msgstr ""
-#: builtin/name-rev.c:402
-msgid "list all commits reachable from all refs"
+#: builtin/grep.c:850
+msgid "use Perl-compatible regular expressions"
msgstr ""
-#: builtin/name-rev.c:403
-msgid "read from stdin"
+#: builtin/grep.c:853
+msgid "show line numbers"
msgstr ""
-#: builtin/name-rev.c:404
-msgid "allow to print `undefined` names (default)"
+#: builtin/grep.c:854
+msgid "show column number of first match"
msgstr ""
-#: builtin/name-rev.c:410
-msgid "dereference tags in the input (internal use)"
+#: builtin/grep.c:855
+msgid "don't show filenames"
msgstr ""
-#: builtin/notes.c:26
-msgid "git notes [--ref <notes-ref>] [list [<object>]]"
+#: builtin/grep.c:856
+msgid "show filenames"
msgstr ""
-#: builtin/notes.c:27
-msgid ""
-"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
-"| (-c | -C) <object>] [<object>]"
+#: builtin/grep.c:858
+msgid "show filenames relative to top directory"
msgstr ""
-#: builtin/notes.c:28
-msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
+#: builtin/grep.c:860
+msgid "show only filenames instead of matching lines"
msgstr ""
-#: builtin/notes.c:29
-msgid ""
-"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
-"(-c | -C) <object>] [<object>]"
+#: builtin/grep.c:862
+msgid "synonym for --files-with-matches"
msgstr ""
-#: builtin/notes.c:30
-msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
+#: builtin/grep.c:865
+msgid "show only the names of files without match"
msgstr ""
-#: builtin/notes.c:31
-msgid "git notes [--ref <notes-ref>] show [<object>]"
+#: builtin/grep.c:867
+msgid "print NUL after filenames"
msgstr ""
-#: builtin/notes.c:32
-msgid ""
-"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
+#: builtin/grep.c:870
+msgid "show only matching parts of a line"
msgstr ""
-#: builtin/notes.c:33
-msgid "git notes merge --commit [-v | -q]"
+#: builtin/grep.c:872
+msgid "show the number of matches instead of matching lines"
msgstr ""
-#: builtin/notes.c:34
-msgid "git notes merge --abort [-v | -q]"
+#: builtin/grep.c:873
+msgid "highlight matches"
msgstr ""
-#: builtin/notes.c:35
-msgid "git notes [--ref <notes-ref>] remove [<object>...]"
+#: builtin/grep.c:875
+msgid "print empty line between matches from different files"
msgstr ""
-#: builtin/notes.c:36
-msgid "git notes [--ref <notes-ref>] prune [-n] [-v]"
+#: builtin/grep.c:877
+msgid "show filename only once above matches from same file"
msgstr ""
-#: builtin/notes.c:37
-msgid "git notes [--ref <notes-ref>] get-ref"
+#: builtin/grep.c:880
+msgid "show <n> context lines before and after matches"
msgstr ""
-#: builtin/notes.c:42
-msgid "git notes [list [<object>]]"
+#: builtin/grep.c:883
+msgid "show <n> context lines before matches"
msgstr ""
-#: builtin/notes.c:47
-msgid "git notes add [<options>] [<object>]"
+#: builtin/grep.c:885
+msgid "show <n> context lines after matches"
msgstr ""
-#: builtin/notes.c:52
-msgid "git notes copy [<options>] <from-object> <to-object>"
+#: builtin/grep.c:887
+msgid "use <n> worker threads"
msgstr ""
-#: builtin/notes.c:53
-msgid "git notes copy --stdin [<from-object> <to-object>]..."
+#: builtin/grep.c:888
+msgid "shortcut for -C NUM"
msgstr ""
-#: builtin/notes.c:58
-msgid "git notes append [<options>] [<object>]"
+#: builtin/grep.c:891
+msgid "show a line with the function name before matches"
msgstr ""
-#: builtin/notes.c:63
-msgid "git notes edit [<object>]"
+#: builtin/grep.c:893
+msgid "show the surrounding function"
msgstr ""
-#: builtin/notes.c:68
-msgid "git notes show [<object>]"
+#: builtin/grep.c:896
+msgid "read patterns from file"
msgstr ""
-#: builtin/notes.c:73
-msgid "git notes merge [<options>] <notes-ref>"
+#: builtin/grep.c:898
+msgid "match <pattern>"
msgstr ""
-#: builtin/notes.c:74
-msgid "git notes merge --commit [<options>]"
+#: builtin/grep.c:900
+msgid "combine patterns specified with -e"
msgstr ""
-#: builtin/notes.c:75
-msgid "git notes merge --abort [<options>]"
+#: builtin/grep.c:912
+msgid "indicate hit with exit status without output"
msgstr ""
-#: builtin/notes.c:80
-msgid "git notes remove [<object>]"
+#: builtin/grep.c:914
+msgid "show only matches from files that match all patterns"
msgstr ""
-#: builtin/notes.c:85
-msgid "git notes prune [<options>]"
+#: builtin/grep.c:916
+msgid "show parse tree for grep expression"
msgstr ""
-#: builtin/notes.c:90
-msgid "git notes get-ref"
+#: builtin/grep.c:920
+msgid "pager"
msgstr ""
-#: builtin/notes.c:95
-msgid "Write/edit the notes for the following object:"
+#: builtin/grep.c:920
+msgid "show matching files in the pager"
msgstr ""
-#: builtin/notes.c:148
-#, c-format
-msgid "unable to start 'show' for object '%s'"
+#: builtin/grep.c:924
+msgid "allow calling of grep(1) (ignored by this build)"
msgstr ""
-#: builtin/notes.c:152
-msgid "could not read 'show' output"
+#: builtin/grep.c:988
+msgid "no pattern given"
msgstr ""
-#: builtin/notes.c:160
-#, c-format
-msgid "failed to finish 'show' for object '%s'"
+#: builtin/grep.c:1024
+msgid "--no-index or --untracked cannot be used with revs"
msgstr ""
-#: builtin/notes.c:195
-msgid "please supply the note contents using either -m or -F option"
-msgstr ""
-
-#: builtin/notes.c:204
-msgid "unable to write note object"
-msgstr ""
-
-#: builtin/notes.c:206
-#, c-format
-msgid "the note contents have been left in %s"
-msgstr ""
-
-#: builtin/notes.c:234 builtin/tag.c:506
+#: builtin/grep.c:1032
#, c-format
-msgid "cannot read '%s'"
+msgid "unable to resolve revision: %s"
msgstr ""
-#: builtin/notes.c:236 builtin/tag.c:509
-#, c-format
-msgid "could not open or read '%s'"
+#: builtin/grep.c:1063
+msgid "invalid option combination, ignoring --threads"
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/grep.c:1066 builtin/pack-objects.c:3400
+msgid "no threads support, ignoring --threads"
msgstr ""
-#: builtin/notes.c:258
+#: builtin/grep.c:1069 builtin/index-pack.c:1503 builtin/pack-objects.c:2714
#, c-format
-msgid "failed to read object '%s'."
+msgid "invalid number of threads specified (%d)"
msgstr ""
-#: builtin/notes.c:262
-#, c-format
-msgid "cannot read note data from non-blob object '%s'."
+#: builtin/grep.c:1092
+msgid "--open-files-in-pager only works on the worktree"
msgstr ""
-#: builtin/notes.c:302
-#, c-format
-msgid "malformed input line: '%s'."
+#: builtin/grep.c:1115
+msgid "option not supported with --recurse-submodules"
msgstr ""
-#: builtin/notes.c:317
-#, c-format
-msgid "failed to copy notes from '%s' to '%s'"
+#: builtin/grep.c:1121
+msgid "--cached or --untracked cannot be used with --no-index"
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/grep.c:1127
+msgid "--[no-]exclude-standard cannot be used for tracked contents"
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/grep.c:1135
+msgid "both --cached and trees are given"
msgstr ""
-#: builtin/notes.c:382 builtin/notes.c:668
-#, c-format
-msgid "no note found for object %s."
+#: builtin/hash-object.c:85
+msgid ""
+"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
+"[--] <file>..."
msgstr ""
-#: builtin/notes.c:403 builtin/notes.c:566
-msgid "note contents as a string"
+#: builtin/hash-object.c:86
+msgid "git hash-object --stdin-paths"
msgstr ""
-#: builtin/notes.c:406 builtin/notes.c:569
-msgid "note contents in a file"
+#: builtin/hash-object.c:98
+msgid "type"
msgstr ""
-#: builtin/notes.c:409 builtin/notes.c:572
-msgid "reuse and edit specified note object"
+#: builtin/hash-object.c:98
+msgid "object type"
msgstr ""
-#: builtin/notes.c:412 builtin/notes.c:575
-msgid "reuse specified note object"
+#: builtin/hash-object.c:99
+msgid "write the object into the object database"
msgstr ""
-#: builtin/notes.c:415 builtin/notes.c:578
-msgid "allow storing empty note"
+#: builtin/hash-object.c:101
+msgid "read the object from stdin"
msgstr ""
-#: builtin/notes.c:416 builtin/notes.c:487
-msgid "replace existing notes"
+#: builtin/hash-object.c:103
+msgid "store file as is without filters"
msgstr ""
-#: builtin/notes.c:441
-#, c-format
+#: builtin/hash-object.c:104
msgid ""
-"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
-"existing notes"
-msgstr ""
-
-#: builtin/notes.c:456 builtin/notes.c:535
-#, c-format
-msgid "Overwriting existing notes for object %s\n"
-msgstr ""
-
-#: builtin/notes.c:467 builtin/notes.c:627 builtin/notes.c:892
-#, c-format
-msgid "Removing note for object %s\n"
-msgstr ""
-
-#: builtin/notes.c:488
-msgid "read objects from stdin"
+"just hash any random garbage to create corrupt objects for debugging Git"
msgstr ""
-#: builtin/notes.c:490
-msgid "load rewriting config for <command> (implies --stdin)"
+#: builtin/hash-object.c:105
+msgid "process file as it were from this path"
msgstr ""
-#: builtin/notes.c:508
-msgid "too few parameters"
+#: builtin/help.c:46
+msgid "print all available commands"
msgstr ""
-#: builtin/notes.c:529
-#, c-format
-msgid ""
-"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
-"existing notes"
+#: builtin/help.c:47
+msgid "exclude guides"
msgstr ""
-#: builtin/notes.c:541
-#, c-format
-msgid "missing notes on source object %s. Cannot copy."
+#: builtin/help.c:48
+msgid "print list of useful guides"
msgstr ""
-#: builtin/notes.c: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/help.c:49
+msgid "print all configuration variable names"
msgstr ""
-#: builtin/notes.c:688
-msgid "failed to delete ref NOTES_MERGE_PARTIAL"
+#: builtin/help.c:51
+msgid "show man page"
msgstr ""
-#: builtin/notes.c:690
-msgid "failed to delete ref NOTES_MERGE_REF"
+#: builtin/help.c:52
+msgid "show manual in web browser"
msgstr ""
-#: builtin/notes.c:692
-msgid "failed to remove 'git notes merge' worktree"
+#: builtin/help.c:54
+msgid "show info page"
msgstr ""
-#: builtin/notes.c:712
-msgid "failed to read ref NOTES_MERGE_PARTIAL"
+#: builtin/help.c:56
+msgid "print command description"
msgstr ""
-#: builtin/notes.c:714
-msgid "could not find commit from NOTES_MERGE_PARTIAL."
+#: builtin/help.c:61
+msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
msgstr ""
-#: builtin/notes.c:716
-msgid "could not parse commit from NOTES_MERGE_PARTIAL."
+#: builtin/help.c:73
+#, c-format
+msgid "unrecognized help format '%s'"
msgstr ""
-#: builtin/notes.c:729
-msgid "failed to resolve NOTES_MERGE_REF"
+#: builtin/help.c:100
+msgid "Failed to start emacsclient."
msgstr ""
-#: builtin/notes.c:732
-msgid "failed to finalize notes merge"
+#: builtin/help.c:113
+msgid "Failed to parse emacsclient version."
msgstr ""
-#: builtin/notes.c:758
+#: builtin/help.c:121
#, c-format
-msgid "unknown notes merge strategy %s"
+msgid "emacsclient version '%d' too old (< 22)."
msgstr ""
-#: builtin/notes.c:774
-msgid "General options"
+#: builtin/help.c:139 builtin/help.c:161 builtin/help.c:171 builtin/help.c:179
+#, c-format
+msgid "failed to exec '%s'"
msgstr ""
-#: builtin/notes.c:776
-msgid "Merge options"
+#: builtin/help.c:217
+#, c-format
+msgid ""
+"'%s': path for unsupported man viewer.\n"
+"Please consider using 'man.<tool>.cmd' instead."
msgstr ""
-#: builtin/notes.c:778
+#: builtin/help.c:229
+#, c-format
msgid ""
-"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
-"cat_sort_uniq)"
+"'%s': cmd for supported man viewer.\n"
+"Please consider using 'man.<tool>.path' instead."
msgstr ""
-#: builtin/notes.c:780
-msgid "Committing unmerged notes"
+#: builtin/help.c:346
+#, c-format
+msgid "'%s': unknown man viewer."
msgstr ""
-#: builtin/notes.c:782
-msgid "finalize notes merge by committing unmerged notes"
+#: builtin/help.c:363
+msgid "no man viewer handled the request"
msgstr ""
-#: builtin/notes.c:784
-msgid "Aborting notes merge resolution"
+#: builtin/help.c:371
+msgid "no info viewer handled the request"
msgstr ""
-#: builtin/notes.c:786
-msgid "abort notes merge"
+#: builtin/help.c:430 builtin/help.c:441 git.c:323
+#, c-format
+msgid "'%s' is aliased to '%s'"
msgstr ""
-#: builtin/notes.c:797
-msgid "cannot mix --commit, --abort or -s/--strategy"
+#: builtin/help.c:444 git.c:347
+#, c-format
+msgid "bad alias.%s string: %s"
msgstr ""
-#: builtin/notes.c:802
-msgid "must specify a notes ref to merge"
+#: builtin/help.c:473 builtin/help.c:503
+#, c-format
+msgid "usage: %s%s"
msgstr ""
-#: builtin/notes.c:826
-#, c-format
-msgid "unknown -s/--strategy: %s"
+#: builtin/help.c:487
+msgid "'git help config' for more information"
msgstr ""
-#: builtin/notes.c:863
+#: builtin/index-pack.c:184
#, c-format
-msgid "a notes merge into %s is already in-progress at %s"
+msgid "object type mismatch at %s"
msgstr ""
-#: builtin/notes.c:866
+#: builtin/index-pack.c:204
#, c-format
-msgid "failed to store link to current notes ref (%s)"
+msgid "did not receive expected object %s"
msgstr ""
-#: builtin/notes.c:868
+#: builtin/index-pack.c:207
#, c-format
-msgid ""
-"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
-"'git notes merge --commit', or abort the merge with 'git notes merge --"
-"abort'.\n"
+msgid "object %s: expected type %s, found %s"
msgstr ""
-#: builtin/notes.c:890
+#: builtin/index-pack.c:249
#, c-format
-msgid "Object %s has no note\n"
-msgstr ""
+msgid "cannot fill %d byte"
+msgid_plural "cannot fill %d bytes"
+msgstr[0] ""
+msgstr[1] ""
-#: builtin/notes.c:902
-msgid "attempt to remove non-existent note is not an error"
+#: builtin/index-pack.c:259
+msgid "early EOF"
msgstr ""
-#: builtin/notes.c:905
-msgid "read object names from the standard input"
+#: builtin/index-pack.c:260
+msgid "read error on input"
msgstr ""
-#: builtin/notes.c:943 builtin/prune.c:106 builtin/worktree.c:160
-msgid "do not remove, show only"
+#: builtin/index-pack.c:272
+msgid "used more bytes than were available"
msgstr ""
-#: builtin/notes.c:944
-msgid "report pruned notes"
+#: builtin/index-pack.c:279 builtin/pack-objects.c:599
+msgid "pack too large for current definition of off_t"
msgstr ""
-#: builtin/notes.c:986
-msgid "notes-ref"
+#: builtin/index-pack.c:282 builtin/unpack-objects.c:94
+msgid "pack exceeds maximum allowed size"
msgstr ""
-#: builtin/notes.c:987
-msgid "use notes from <notes-ref>"
+#: builtin/index-pack.c:297 builtin/repack.c:250
+#, c-format
+msgid "unable to create '%s'"
msgstr ""
-#: builtin/notes.c:1022
+#: builtin/index-pack.c:303
#, c-format
-msgid "unknown subcommand: %s"
+msgid "cannot open packfile '%s'"
msgstr ""
-#: builtin/pack-objects.c:33
-msgid ""
-"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
+#: builtin/index-pack.c:317
+msgid "pack signature mismatch"
msgstr ""
-#: builtin/pack-objects.c:34
-msgid ""
-"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
+#: builtin/index-pack.c:319
+#, c-format
+msgid "pack version %<PRIu32> unsupported"
msgstr ""
-#: builtin/pack-objects.c:195 builtin/pack-objects.c:198
+#: builtin/index-pack.c:337
#, c-format
-msgid "deflate error (%d)"
+msgid "pack has bad object at offset %<PRIuMAX>: %s"
msgstr ""
-#: builtin/pack-objects.c:791
-msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
+#: builtin/index-pack.c:457
+#, c-format
+msgid "inflate returned %d"
msgstr ""
-#: builtin/pack-objects.c:804
-msgid "Writing objects"
+#: builtin/index-pack.c:506
+msgid "offset value overflow for delta base object"
msgstr ""
-#: builtin/pack-objects.c:1084
-msgid "disabling bitmap writing, as some objects are not being packed"
+#: builtin/index-pack.c:514
+msgid "delta base offset is out of bound"
msgstr ""
-#: builtin/pack-objects.c:2454
-msgid "Compressing objects"
+#: builtin/index-pack.c:522
+#, c-format
+msgid "unknown object type %d"
msgstr ""
-#: builtin/pack-objects.c:2625
-msgid "invalid value for --missing"
+#: builtin/index-pack.c:553
+msgid "cannot pread pack file"
msgstr ""
-#: builtin/pack-objects.c:2928
+#: builtin/index-pack.c:555
#, c-format
-msgid "unsupported index version %s"
+msgid "premature end of pack file, %<PRIuMAX> byte missing"
+msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/index-pack.c:581
+msgid "serious inflate inconsistency"
msgstr ""
-#: builtin/pack-objects.c:2932
+#: builtin/index-pack.c:726 builtin/index-pack.c:732 builtin/index-pack.c:755
+#: builtin/index-pack.c:794 builtin/index-pack.c:803
#, c-format
-msgid "bad index version '%s'"
+msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr ""
-#: builtin/pack-objects.c:2962
-msgid "do not show progress meter"
+#: builtin/index-pack.c:729 builtin/pack-objects.c:152
+#: builtin/pack-objects.c:212 builtin/pack-objects.c:306
+#, c-format
+msgid "unable to read %s"
msgstr ""
-#: builtin/pack-objects.c:2964
-msgid "show progress meter"
+#: builtin/index-pack.c:792
+#, c-format
+msgid "cannot read existing object info %s"
msgstr ""
-#: builtin/pack-objects.c:2966
-msgid "show progress meter during object writing phase"
+#: builtin/index-pack.c:800
+#, c-format
+msgid "cannot read existing object %s"
msgstr ""
-#: builtin/pack-objects.c:2969
-msgid "similar to --all-progress when progress meter is shown"
+#: builtin/index-pack.c:814
+#, c-format
+msgid "invalid blob object %s"
msgstr ""
-#: builtin/pack-objects.c:2970
-msgid "version[,offset]"
+#: builtin/index-pack.c:817 builtin/index-pack.c:836
+msgid "fsck error in packed object"
msgstr ""
-#: builtin/pack-objects.c:2971
-msgid "write the pack index file in the specified idx format version"
+#: builtin/index-pack.c:838
+#, c-format
+msgid "Not all child objects of %s are reachable"
msgstr ""
-#: builtin/pack-objects.c:2974
-msgid "maximum size of each output pack file"
+#: builtin/index-pack.c:910 builtin/index-pack.c:941
+msgid "failed to apply delta"
msgstr ""
-#: builtin/pack-objects.c:2976
-msgid "ignore borrowed objects from alternate object store"
+#: builtin/index-pack.c:1109
+msgid "Receiving objects"
msgstr ""
-#: builtin/pack-objects.c:2978
-msgid "ignore packed objects"
+#: builtin/index-pack.c:1109
+msgid "Indexing objects"
msgstr ""
-#: builtin/pack-objects.c:2980
-msgid "limit pack window by objects"
+#: builtin/index-pack.c:1143
+msgid "pack is corrupted (SHA1 mismatch)"
msgstr ""
-#: builtin/pack-objects.c:2982
-msgid "limit pack window by memory in addition to object limit"
+#: builtin/index-pack.c:1148
+msgid "cannot fstat packfile"
msgstr ""
-#: builtin/pack-objects.c:2984
-msgid "maximum length of delta chain allowed in the resulting pack"
+#: builtin/index-pack.c:1151
+msgid "pack has junk at the end"
msgstr ""
-#: builtin/pack-objects.c:2986
-msgid "reuse existing deltas"
+#: builtin/index-pack.c:1163
+msgid "confusion beyond insanity in parse_pack_objects()"
msgstr ""
-#: builtin/pack-objects.c:2988
-msgid "reuse existing objects"
+#: builtin/index-pack.c:1186
+msgid "Resolving deltas"
msgstr ""
-#: builtin/pack-objects.c:2990
-msgid "use OFS_DELTA objects"
+#: builtin/index-pack.c:1196 builtin/pack-objects.c:2486
+#, c-format
+msgid "unable to create thread: %s"
msgstr ""
-#: builtin/pack-objects.c:2992
-msgid "use threads when searching for best delta matches"
+#: builtin/index-pack.c:1237
+msgid "confusion beyond insanity"
msgstr ""
-#: builtin/pack-objects.c:2994
-msgid "do not create an empty pack output"
-msgstr ""
+#: builtin/index-pack.c:1243
+#, c-format
+msgid "completed with %d local object"
+msgid_plural "completed with %d local objects"
+msgstr[0] ""
+msgstr[1] ""
-#: builtin/pack-objects.c:2996
-msgid "read revision arguments from standard input"
+#: builtin/index-pack.c:1255
+#, c-format
+msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr ""
-#: builtin/pack-objects.c:2998
-msgid "limit the objects to those that are not yet packed"
+#: builtin/index-pack.c:1259
+#, c-format
+msgid "pack has %d unresolved delta"
+msgid_plural "pack has %d unresolved deltas"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/index-pack.c:1283
+#, c-format
+msgid "unable to deflate appended object (%d)"
msgstr ""
-#: builtin/pack-objects.c:3001
-msgid "include objects reachable from any reference"
+#: builtin/index-pack.c:1360
+#, c-format
+msgid "local object %s is corrupt"
msgstr ""
-#: builtin/pack-objects.c:3004
-msgid "include objects referred by reflog entries"
+#: builtin/index-pack.c:1374
+#, c-format
+msgid "packfile name '%s' does not end with '.pack'"
msgstr ""
-#: builtin/pack-objects.c:3007
-msgid "include objects referred to by the index"
+#: builtin/index-pack.c:1399
+#, c-format
+msgid "cannot write %s file '%s'"
msgstr ""
-#: builtin/pack-objects.c:3010
-msgid "output pack to stdout"
+#: builtin/index-pack.c:1407
+#, c-format
+msgid "cannot close written %s file '%s'"
msgstr ""
-#: builtin/pack-objects.c:3012
-msgid "include tag objects that refer to objects to be packed"
+#: builtin/index-pack.c:1431
+msgid "error while closing pack file"
msgstr ""
-#: builtin/pack-objects.c:3014
-msgid "keep unreachable objects"
+#: builtin/index-pack.c:1445
+msgid "cannot store pack file"
msgstr ""
-#: builtin/pack-objects.c:3016
-msgid "pack loose unreachable objects"
+#: builtin/index-pack.c:1453
+msgid "cannot store index file"
msgstr ""
-#: builtin/pack-objects.c:3018
-msgid "unpack unreachable objects newer than <time>"
+#: builtin/index-pack.c:1497 builtin/pack-objects.c:2725
+#, c-format
+msgid "bad pack.indexversion=%<PRIu32>"
msgstr ""
-#: builtin/pack-objects.c:3021
-msgid "create thin packs"
+#: builtin/index-pack.c:1565
+#, c-format
+msgid "Cannot open existing pack file '%s'"
msgstr ""
-#: builtin/pack-objects.c:3023
-msgid "create packs suitable for shallow fetches"
+#: builtin/index-pack.c:1567
+#, c-format
+msgid "Cannot open existing pack idx file for '%s'"
msgstr ""
-#: builtin/pack-objects.c:3025
-msgid "ignore packs that have companion .keep file"
-msgstr ""
+#: builtin/index-pack.c:1615
+#, c-format
+msgid "non delta: %d object"
+msgid_plural "non delta: %d objects"
+msgstr[0] ""
+msgstr[1] ""
-#: builtin/pack-objects.c:3027
-msgid "pack compression level"
-msgstr ""
+#: builtin/index-pack.c:1622
+#, c-format
+msgid "chain length = %d: %lu object"
+msgid_plural "chain length = %d: %lu objects"
+msgstr[0] ""
+msgstr[1] ""
-#: builtin/pack-objects.c:3029
-msgid "do not hide commits by grafts"
+#: builtin/index-pack.c:1659
+msgid "Cannot come back to cwd"
msgstr ""
-#: builtin/pack-objects.c:3031
-msgid "use a bitmap index if available to speed up counting objects"
+#: builtin/index-pack.c:1708 builtin/index-pack.c:1711
+#: builtin/index-pack.c:1727 builtin/index-pack.c:1731
+#, c-format
+msgid "bad %s"
msgstr ""
-#: builtin/pack-objects.c:3033
-msgid "write a bitmap index together with the pack index"
+#: builtin/index-pack.c:1747
+msgid "--fix-thin cannot be used without --stdin"
msgstr ""
-#: builtin/pack-objects.c:3036
-msgid "handling for missing objects"
+#: builtin/index-pack.c:1749
+msgid "--stdin requires a git repository"
msgstr ""
-#: builtin/pack-objects.c:3039
-msgid "do not pack objects in promisor packfiles"
+#: builtin/index-pack.c:1755
+msgid "--verify with no packfile name given"
msgstr ""
-#: builtin/pack-objects.c:3178
-msgid "Counting objects"
+#: builtin/index-pack.c:1803 builtin/unpack-objects.c:580
+msgid "fsck error in pack objects"
msgstr ""
-#: builtin/pack-refs.c:6
-msgid "git pack-refs [<options>]"
+#: builtin/init-db.c:61
+#, c-format
+msgid "cannot stat template '%s'"
msgstr ""
-#: builtin/pack-refs.c:14
-msgid "pack everything"
+#: builtin/init-db.c:66
+#, c-format
+msgid "cannot opendir '%s'"
msgstr ""
-#: builtin/pack-refs.c:15
-msgid "prune loose refs (default)"
+#: builtin/init-db.c:78
+#, c-format
+msgid "cannot readlink '%s'"
msgstr ""
-#: builtin/prune-packed.c:8
-msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
+#: builtin/init-db.c:80
+#, c-format
+msgid "cannot symlink '%s' '%s'"
msgstr ""
-#: builtin/prune-packed.c:41
-msgid "Removing duplicate objects"
+#: builtin/init-db.c:86
+#, c-format
+msgid "cannot copy '%s' to '%s'"
msgstr ""
-#: builtin/prune.c:11
-msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
+#: builtin/init-db.c:90
+#, c-format
+msgid "ignoring template %s"
msgstr ""
-#: builtin/prune.c:107
-msgid "report pruned objects"
+#: builtin/init-db.c:121
+#, c-format
+msgid "templates not found in %s"
msgstr ""
-#: builtin/prune.c:110
-msgid "expire objects older than <time>"
+#: builtin/init-db.c:136
+#, c-format
+msgid "not copying templates from '%s': %s"
msgstr ""
-#: builtin/prune.c:112
-msgid "limit traversal to objects outside promisor packfiles"
+#: builtin/init-db.c:329
+#, c-format
+msgid "unable to handle file type %d"
msgstr ""
-#: builtin/prune.c:126
-msgid "cannot prune in a precious-objects repo"
+#: builtin/init-db.c:332
+#, c-format
+msgid "unable to move %s to %s"
msgstr ""
-#: builtin/pull.c:54 builtin/pull.c:56
+#: builtin/init-db.c:349 builtin/init-db.c:352
#, c-format
-msgid "Invalid value for %s: %s"
+msgid "%s already exists"
msgstr ""
-#: builtin/pull.c:76
-msgid "git pull [<options>] [<repository> [<refspec>...]]"
+#: builtin/init-db.c:405
+#, c-format
+msgid "Reinitialized existing shared Git repository in %s%s\n"
msgstr ""
-#: builtin/pull.c:127
-msgid "control for recursive fetching of submodules"
+#: builtin/init-db.c:406
+#, c-format
+msgid "Reinitialized existing Git repository in %s%s\n"
msgstr ""
-#: builtin/pull.c:131
-msgid "Options related to merging"
+#: builtin/init-db.c:410
+#, c-format
+msgid "Initialized empty shared Git repository in %s%s\n"
msgstr ""
-#: builtin/pull.c:134
-msgid "incorporate changes by rebasing rather than merging"
+#: builtin/init-db.c:411
+#, c-format
+msgid "Initialized empty Git repository in %s%s\n"
msgstr ""
-#: builtin/pull.c:161 builtin/rebase--helper.c:23 builtin/revert.c:121
-msgid "allow fast-forward"
+#: builtin/init-db.c:460
+msgid ""
+"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
+"shared[=<permissions>]] [<directory>]"
msgstr ""
-#: builtin/pull.c:170
-msgid "automatically stash/stash pop before and after rebase"
+#: builtin/init-db.c:483
+msgid "permissions"
msgstr ""
-#: builtin/pull.c:186
-msgid "Options related to fetching"
+#: builtin/init-db.c:484
+msgid "specify that the git repository is to be shared amongst several users"
msgstr ""
-#: builtin/pull.c:204
-msgid "number of submodules pulled in parallel"
+#: builtin/init-db.c:518 builtin/init-db.c:523
+#, c-format
+msgid "cannot mkdir %s"
msgstr ""
-#: builtin/pull.c:299
+#: builtin/init-db.c:527
#, c-format
-msgid "Invalid value for pull.ff: %s"
+msgid "cannot chdir to %s"
msgstr ""
-#: builtin/pull.c:415
+#: builtin/init-db.c:548
+#, c-format
msgid ""
-"There is no candidate for rebasing against among the refs that you just "
-"fetched."
+"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
+"dir=<directory>)"
msgstr ""
-#: builtin/pull.c:417
-msgid ""
-"There are no candidates for merging among the refs that you just fetched."
+#: builtin/init-db.c:576
+#, c-format
+msgid "Cannot access work tree '%s'"
msgstr ""
-#: builtin/pull.c:418
+#: builtin/interpret-trailers.c:15
msgid ""
-"Generally this means that you provided a wildcard refspec which had no\n"
-"matches on the remote end."
+"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
+"<token>[(=|:)<value>])...] [<file>...]"
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/interpret-trailers.c:94
+msgid "edit files in place"
msgstr ""
-#: builtin/pull.c:426 git-parse-remote.sh:73
-msgid "You are not currently on a branch."
+#: builtin/interpret-trailers.c:95
+msgid "trim empty trailers"
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/interpret-trailers.c:98
+msgid "where to place the new trailer"
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/interpret-trailers.c:100
+msgid "action if trailer already exists"
msgstr ""
-#: builtin/pull.c:431 builtin/pull.c:446
-msgid "See git-pull(1) for details."
+#: builtin/interpret-trailers.c:102
+msgid "action if trailer is missing"
msgstr ""
-#: builtin/pull.c:433 builtin/pull.c:439 builtin/pull.c:448
-#: git-parse-remote.sh:64
-msgid "<remote>"
+#: builtin/interpret-trailers.c:104
+msgid "output only the trailers"
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/interpret-trailers.c:105
+msgid "do not apply config rules"
msgstr ""
-#: builtin/pull.c:441 git-parse-remote.sh:75
-msgid "There is no tracking information for the current branch."
+#: builtin/interpret-trailers.c:106
+msgid "join whitespace-continued values"
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/interpret-trailers.c:107
+msgid "set parsing options"
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/interpret-trailers.c:109
+msgid "do not treat --- specially"
msgstr ""
-#: builtin/pull.c:819
-msgid "ignoring --verify-signatures for rebase"
+#: builtin/interpret-trailers.c:110
+msgid "trailer"
msgstr ""
-#: builtin/pull.c:867
-msgid "--[no-]autostash option is only valid with --rebase."
+#: builtin/interpret-trailers.c:111
+msgid "trailer(s) to add"
msgstr ""
-#: builtin/pull.c:875
-msgid "Updating an unborn branch with changes added to the index."
+#: builtin/interpret-trailers.c:120
+msgid "--trailer with --only-input does not make sense"
msgstr ""
-#: builtin/pull.c:878
-msgid "pull with rebase"
+#: builtin/interpret-trailers.c:130
+msgid "no input file given for in-place editing"
msgstr ""
-#: builtin/pull.c:879
-msgid "please commit or stash them."
+#: builtin/log.c:55
+msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
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/log.c:56
+msgid "git show [<options>] <object>..."
msgstr ""
-#: builtin/pull.c:909
+#: builtin/log.c:100
#, c-format
-msgid ""
-"Cannot fast-forward your working tree.\n"
-"After making sure that you saved anything precious from\n"
-"$ git diff %s\n"
-"output, run\n"
-"$ git reset --hard\n"
-"to recover."
+msgid "invalid --decorate option: %s"
msgstr ""
-#: builtin/pull.c:924
-msgid "Cannot merge multiple branches into empty head."
+#: builtin/log.c:163
+msgid "suppress diff output"
msgstr ""
-#: builtin/pull.c:928
-msgid "Cannot rebase onto multiple branches."
+#: builtin/log.c:164
+msgid "show source"
msgstr ""
-#: builtin/pull.c:935
-msgid "cannot rebase with locally recorded submodule modifications"
+#: builtin/log.c:165
+msgid "Use mail map file"
msgstr ""
-#: builtin/push.c:17
-msgid "git push [<options>] [<repository> [<refspec>...]]"
+#: builtin/log.c:167
+msgid "only decorate refs that match <pattern>"
msgstr ""
-#: builtin/push.c:92
-msgid "tag shorthand without <tag>"
+#: builtin/log.c:169
+msgid "do not decorate refs that match <pattern>"
msgstr ""
-#: builtin/push.c:102
-msgid "--delete only accepts plain target ref names"
+#: builtin/log.c:170
+msgid "decorate options"
msgstr ""
-#: builtin/push.c:146
-msgid ""
-"\n"
-"To choose either option permanently, see push.default in 'git help config'."
+#: builtin/log.c:173
+msgid "Process line range n,m in file, counting from 1"
msgstr ""
-#: builtin/push.c:149
+#: builtin/log.c:271
#, c-format
-msgid ""
-"The upstream branch of your current branch does not match\n"
-"the name of your current branch. To push to the upstream branch\n"
-"on the remote, use\n"
-"\n"
-" git push %s HEAD:%s\n"
-"\n"
-"To push to the branch of the same name on the remote, use\n"
-"\n"
-" git push %s %s\n"
-"%s"
+msgid "Final output: %d %s\n"
msgstr ""
-#: builtin/push.c:164
+#: builtin/log.c:525
#, c-format
-msgid ""
-"You are not currently on a branch.\n"
-"To push the history leading to the current (detached HEAD)\n"
-"state now, use\n"
-"\n"
-" git push %s HEAD:<name-of-remote-branch>\n"
+msgid "git show %s: bad file"
msgstr ""
-#: builtin/push.c:178
+#: builtin/log.c:540 builtin/log.c:634
#, c-format
-msgid ""
-"The current branch %s has no upstream branch.\n"
-"To push the current branch and set the remote as upstream, use\n"
-"\n"
-" git push --set-upstream %s %s\n"
+msgid "Could not read object %s"
msgstr ""
-#: builtin/push.c:186
+#: builtin/log.c:659
#, c-format
-msgid "The current branch %s has multiple upstream branches, refusing to push."
+msgid "Unknown type: %d"
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/log.c:780
+msgid "format.headers without value"
msgstr ""
-#: builtin/push.c:248
-msgid ""
-"You didn't specify any refspecs to push, and push.default is \"nothing\"."
+#: builtin/log.c:881
+msgid "name of output directory is too long"
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/log.c:897
+#, c-format
+msgid "Cannot open patch file %s"
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/log.c:914
+msgid "Need exactly one range."
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/log.c:924
+msgid "Not a range."
msgstr ""
-#: builtin/push.c:274
-msgid "Updates were rejected because the tag already exists in the remote."
+#: builtin/log.c:1047
+msgid "Cover letter needs email format"
msgstr ""
-#: builtin/push.c:277
-msgid ""
-"You cannot update a remote ref that points at a non-commit object,\n"
-"or update a remote ref to make it point at a non-commit object,\n"
-"without using the '--force' option.\n"
+#: builtin/log.c:1132
+#, c-format
+msgid "insane in-reply-to: %s"
msgstr ""
-#: builtin/push.c:337
-#, c-format
-msgid "Pushing to %s\n"
+#: builtin/log.c:1159
+msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr ""
-#: builtin/push.c:341
+#: builtin/log.c:1217
+msgid "Two output directories?"
+msgstr ""
+
+#: builtin/log.c:1324 builtin/log.c:2068 builtin/log.c:2070 builtin/log.c:2082
#, c-format
-msgid "failed to push some refs to '%s'"
+msgid "Unknown commit %s"
msgstr ""
-#: builtin/push.c:372
+#: builtin/log.c:1334 builtin/notes.c:897 builtin/tag.c:526
#, c-format
-msgid "bad repository '%s'"
+msgid "Failed to resolve '%s' as a valid ref."
+msgstr ""
+
+#: builtin/log.c:1339
+msgid "Could not find exact merge base."
msgstr ""
-#: builtin/push.c:373
+#: builtin/log.c:1343
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"
+"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/push.c:391
-msgid "--all and --tags are incompatible"
+#: builtin/log.c:1363
+msgid "Failed to find exact merge base"
msgstr ""
-#: builtin/push.c:392
-msgid "--all can't be combined with refspecs"
+#: builtin/log.c:1374
+msgid "base commit should be the ancestor of revision list"
msgstr ""
-#: builtin/push.c:397
-msgid "--mirror and --tags are incompatible"
+#: builtin/log.c:1378
+msgid "base commit shouldn't be in revision list"
msgstr ""
-#: builtin/push.c:398
-msgid "--mirror can't be combined with refspecs"
+#: builtin/log.c:1431
+msgid "cannot get patch id"
msgstr ""
-#: builtin/push.c:403
-msgid "--all and --mirror are incompatible"
+#: builtin/log.c:1483
+msgid "failed to infer range-diff ranges"
msgstr ""
-#: builtin/push.c:535
-msgid "repository"
+#: builtin/log.c:1528
+msgid "use [PATCH n/m] even with a single patch"
msgstr ""
-#: builtin/push.c:536 builtin/send-pack.c:163
-msgid "push all refs"
+#: builtin/log.c:1531
+msgid "use [PATCH] even with multiple patches"
msgstr ""
-#: builtin/push.c:537 builtin/send-pack.c:165
-msgid "mirror all refs"
+#: builtin/log.c:1535
+msgid "print patches to standard out"
msgstr ""
-#: builtin/push.c:539
-msgid "delete refs"
+#: builtin/log.c:1537
+msgid "generate a cover letter"
msgstr ""
-#: builtin/push.c:540
-msgid "push tags (can't be used with --all or --mirror)"
+#: builtin/log.c:1539
+msgid "use simple number sequence for output file names"
msgstr ""
-#: builtin/push.c:543 builtin/send-pack.c:166
-msgid "force updates"
+#: builtin/log.c:1540
+msgid "sfx"
msgstr ""
-#: builtin/push.c:545 builtin/send-pack.c:180
-msgid "refname>:<expect"
+#: builtin/log.c:1541
+msgid "use <sfx> instead of '.patch'"
msgstr ""
-#: builtin/push.c:546 builtin/send-pack.c:181
-msgid "require old value of ref to be at this value"
+#: builtin/log.c:1543
+msgid "start numbering patches at <n> instead of 1"
msgstr ""
-#: builtin/push.c:549
-msgid "control recursive pushing of submodules"
+#: builtin/log.c:1545
+msgid "mark the series as Nth re-roll"
msgstr ""
-#: builtin/push.c:551 builtin/send-pack.c:174
-msgid "use thin pack"
+#: builtin/log.c:1547
+msgid "Use [RFC PATCH] instead of [PATCH]"
msgstr ""
-#: builtin/push.c:552 builtin/push.c:553 builtin/send-pack.c:160
-#: builtin/send-pack.c:161
-msgid "receive pack program"
+#: builtin/log.c:1550
+msgid "Use [<prefix>] instead of [PATCH]"
msgstr ""
-#: builtin/push.c:554
-msgid "set upstream for git pull/status"
+#: builtin/log.c:1553
+msgid "store resulting files in <dir>"
msgstr ""
-#: builtin/push.c:557
-msgid "prune locally removed refs"
+#: builtin/log.c:1556
+msgid "don't strip/add [PATCH]"
msgstr ""
-#: builtin/push.c:559
-msgid "bypass pre-push hook"
+#: builtin/log.c:1559
+msgid "don't output binary diffs"
msgstr ""
-#: builtin/push.c:560
-msgid "push missing but relevant tags"
+#: builtin/log.c:1561
+msgid "output all-zero hash in From header"
msgstr ""
-#: builtin/push.c:563 builtin/send-pack.c:168
-msgid "GPG sign the push"
+#: builtin/log.c:1563
+msgid "don't include a patch matching a commit upstream"
msgstr ""
-#: builtin/push.c:565 builtin/send-pack.c:175
-msgid "request atomic transaction on remote side"
+#: builtin/log.c:1565
+msgid "show patch format instead of default (patch + stat)"
msgstr ""
-#: builtin/push.c:566 builtin/send-pack.c:171
-msgid "server-specific"
+#: builtin/log.c:1567
+msgid "Messaging"
msgstr ""
-#: builtin/push.c:566 builtin/send-pack.c:172
-msgid "option to transmit"
+#: builtin/log.c:1568
+msgid "header"
msgstr ""
-#: builtin/push.c:583
-msgid "--delete is incompatible with --all, --mirror and --tags"
+#: builtin/log.c:1569
+msgid "add email header"
msgstr ""
-#: builtin/push.c:585
-msgid "--delete doesn't make sense without any refs"
+#: builtin/log.c:1570 builtin/log.c:1572
+msgid "email"
msgstr ""
-#: builtin/push.c:604
-msgid "push options must not have new line characters"
+#: builtin/log.c:1570
+msgid "add To: header"
msgstr ""
-#: builtin/read-tree.c:40
-msgid ""
-"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
-"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
-"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
+#: builtin/log.c:1572
+msgid "add Cc: header"
msgstr ""
-#: builtin/read-tree.c:121
-msgid "write resulting index to <file>"
+#: builtin/log.c:1574
+msgid "ident"
msgstr ""
-#: builtin/read-tree.c:124
-msgid "only empty the index"
+#: builtin/log.c:1575
+msgid "set From address to <ident> (or committer ident if absent)"
msgstr ""
-#: builtin/read-tree.c:126
-msgid "Merging"
+#: builtin/log.c:1577
+msgid "message-id"
msgstr ""
-#: builtin/read-tree.c:128
-msgid "perform a merge in addition to a read"
+#: builtin/log.c:1578
+msgid "make first mail a reply to <message-id>"
msgstr ""
-#: builtin/read-tree.c:130
-msgid "3-way merge if no file level merging required"
+#: builtin/log.c:1579 builtin/log.c:1582
+msgid "boundary"
msgstr ""
-#: builtin/read-tree.c:132
-msgid "3-way merge in presence of adds and removes"
+#: builtin/log.c:1580
+msgid "attach the patch"
msgstr ""
-#: builtin/read-tree.c:134
-msgid "same as -m, but discard unmerged entries"
+#: builtin/log.c:1583
+msgid "inline the patch"
msgstr ""
-#: builtin/read-tree.c:135
-msgid "<subdirectory>/"
+#: builtin/log.c:1587
+msgid "enable message threading, styles: shallow, deep"
msgstr ""
-#: builtin/read-tree.c:136
-msgid "read the tree into the index under <subdirectory>/"
+#: builtin/log.c:1589
+msgid "signature"
msgstr ""
-#: builtin/read-tree.c:139
-msgid "update working tree with merge result"
+#: builtin/log.c:1590
+msgid "add a signature"
msgstr ""
-#: builtin/read-tree.c:141
-msgid "gitignore"
+#: builtin/log.c:1591
+msgid "base-commit"
msgstr ""
-#: builtin/read-tree.c:142
-msgid "allow explicitly ignored files to be overwritten"
+#: builtin/log.c:1592
+msgid "add prerequisite tree info to the patch series"
msgstr ""
-#: builtin/read-tree.c:145
-msgid "don't check the working tree after merging"
+#: builtin/log.c:1594
+msgid "add a signature from a file"
msgstr ""
-#: builtin/read-tree.c:146
-msgid "don't update the index or the work tree"
+#: builtin/log.c:1595
+msgid "don't print the patch filenames"
msgstr ""
-#: builtin/read-tree.c:148
-msgid "skip applying sparse checkout filter"
+#: builtin/log.c:1597
+msgid "show progress while generating patches"
msgstr ""
-#: builtin/read-tree.c:150
-msgid "debug unpack-trees"
+#: builtin/log.c:1598
+msgid "rev"
msgstr ""
-#: builtin/rebase--helper.c:8
-msgid "git rebase--helper [<options>]"
+#: builtin/log.c:1599
+msgid "show changes against <rev> in cover letter or single patch"
msgstr ""
-#: builtin/rebase--helper.c:24
-msgid "keep empty commits"
+#: builtin/log.c:1602
+msgid "show changes against <refspec> in cover letter or single patch"
msgstr ""
-#: builtin/rebase--helper.c:26 builtin/revert.c:123
-msgid "allow commits with empty messages"
+#: builtin/log.c:1604
+msgid "percentage by which creation is weighted"
msgstr ""
-#: builtin/rebase--helper.c:27
-msgid "continue rebase"
+#: builtin/log.c:1679
+#, c-format
+msgid "invalid ident line: %s"
msgstr ""
-#: builtin/rebase--helper.c:29
-msgid "abort rebase"
+#: builtin/log.c:1694
+msgid "-n and -k are mutually exclusive"
msgstr ""
-#: builtin/rebase--helper.c:32
-msgid "make rebase script"
+#: builtin/log.c:1696
+msgid "--subject-prefix/--rfc and -k are mutually exclusive"
msgstr ""
-#: builtin/rebase--helper.c:34
-msgid "shorten commit ids in the todo list"
+#: builtin/log.c:1704
+msgid "--name-only does not make sense"
msgstr ""
-#: builtin/rebase--helper.c:36
-msgid "expand commit ids in the todo list"
+#: builtin/log.c:1706
+msgid "--name-status does not make sense"
msgstr ""
-#: builtin/rebase--helper.c:38
-msgid "check the todo list"
+#: builtin/log.c:1708
+msgid "--check does not make sense"
msgstr ""
-#: builtin/rebase--helper.c:40
-msgid "skip unnecessary picks"
+#: builtin/log.c:1740
+msgid "standard output, or directory, which one?"
msgstr ""
-#: builtin/rebase--helper.c:42
-msgid "rearrange fixup/squash lines"
+#: builtin/log.c:1742
+#, c-format
+msgid "Could not create directory '%s'"
msgstr ""
-#: builtin/rebase--helper.c:44
-msgid "insert exec commands in todo list"
+#: builtin/log.c:1829
+msgid "--interdiff requires --cover-letter or single patch"
msgstr ""
-#: builtin/receive-pack.c:30
-msgid "git receive-pack <git-dir>"
+#: builtin/log.c:1833
+msgid "Interdiff:"
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/log.c:1834
+#, c-format
+msgid "Interdiff against v%d:"
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/log.c:1840
+msgid "--creation-factor requires --range-diff"
msgstr ""
-#: builtin/receive-pack.c:1934
-msgid "quiet"
+#: builtin/log.c:1844
+msgid "--range-diff requires --cover-letter or single patch"
msgstr ""
-#: builtin/receive-pack.c:1948
-msgid "You must specify a directory."
+#: builtin/log.c:1852
+msgid "Range-diff:"
msgstr ""
-#: builtin/reflog.c:532 builtin/reflog.c:537
+#: builtin/log.c:1853
#, c-format
-msgid "'%s' is not a valid timestamp"
+msgid "Range-diff against v%d:"
msgstr ""
-#: builtin/remote.c:13
-msgid "git remote [-v | --verbose]"
+#: builtin/log.c:1864
+#, c-format
+msgid "unable to read signature file '%s'"
msgstr ""
-#: builtin/remote.c:14
-msgid ""
-"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
-"mirror=<fetch|push>] <name> <url>"
+#: builtin/log.c:1900
+msgid "Generating patches"
msgstr ""
-#: builtin/remote.c:15 builtin/remote.c:35
-msgid "git remote rename <old> <new>"
+#: builtin/log.c:1944
+msgid "Failed to create output files"
msgstr ""
-#: builtin/remote.c:16 builtin/remote.c:40
-msgid "git remote remove <name>"
+#: builtin/log.c:2003
+msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr ""
-#: builtin/remote.c:17 builtin/remote.c:45
-msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
+#: builtin/log.c:2057
+#, c-format
+msgid ""
+"Could not find a tracked remote branch, please specify <upstream> manually.\n"
msgstr ""
-#: builtin/remote.c:18
-msgid "git remote [-v | --verbose] show [-n] <name>"
+#: builtin/ls-files.c:470
+msgid "git ls-files [<options>] [<file>...]"
msgstr ""
-#: builtin/remote.c:19
-msgid "git remote prune [-n | --dry-run] <name>"
+#: builtin/ls-files.c:526
+msgid "identify the file status with tags"
msgstr ""
-#: builtin/remote.c:20
-msgid ""
-"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
+#: builtin/ls-files.c:528
+msgid "use lowercase letters for 'assume unchanged' files"
msgstr ""
-#: builtin/remote.c:21
-msgid "git remote set-branches [--add] <name> <branch>..."
+#: builtin/ls-files.c:530
+msgid "use lowercase letters for 'fsmonitor clean' files"
msgstr ""
-#: builtin/remote.c:22 builtin/remote.c:71
-msgid "git remote get-url [--push] [--all] <name>"
+#: builtin/ls-files.c:532
+msgid "show cached files in the output (default)"
msgstr ""
-#: builtin/remote.c:23 builtin/remote.c:76
-msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
+#: builtin/ls-files.c:534
+msgid "show deleted files in the output"
msgstr ""
-#: builtin/remote.c:24 builtin/remote.c:77
-msgid "git remote set-url --add <name> <newurl>"
+#: builtin/ls-files.c:536
+msgid "show modified files in the output"
msgstr ""
-#: builtin/remote.c:25 builtin/remote.c:78
-msgid "git remote set-url --delete <name> <url>"
+#: builtin/ls-files.c:538
+msgid "show other files in the output"
msgstr ""
-#: builtin/remote.c:30
-msgid "git remote add [<options>] <name> <url>"
+#: builtin/ls-files.c:540
+msgid "show ignored files in the output"
msgstr ""
-#: builtin/remote.c:50
-msgid "git remote set-branches <name> <branch>..."
+#: builtin/ls-files.c:543
+msgid "show staged contents' object name in the output"
msgstr ""
-#: builtin/remote.c:51
-msgid "git remote set-branches --add <name> <branch>..."
+#: builtin/ls-files.c:545
+msgid "show files on the filesystem that need to be removed"
msgstr ""
-#: builtin/remote.c:56
-msgid "git remote show [<options>] <name>"
+#: builtin/ls-files.c:547
+msgid "show 'other' directories' names only"
msgstr ""
-#: builtin/remote.c:61
-msgid "git remote prune [<options>] <name>"
+#: builtin/ls-files.c:549
+msgid "show line endings of files"
msgstr ""
-#: builtin/remote.c:66
-msgid "git remote update [<options>] [<group> | <remote>]..."
+#: builtin/ls-files.c:551
+msgid "don't show empty directories"
msgstr ""
-#: builtin/remote.c:95
-#, c-format
-msgid "Updating %s"
+#: builtin/ls-files.c:554
+msgid "show unmerged files in the output"
msgstr ""
-#: builtin/remote.c:127
-msgid ""
-"--mirror is dangerous and deprecated; please\n"
-"\t use --mirror=fetch or --mirror=push instead"
+#: builtin/ls-files.c:556
+msgid "show resolve-undo information"
msgstr ""
-#: builtin/remote.c:144
-#, c-format
-msgid "unknown mirror argument: %s"
+#: builtin/ls-files.c:558
+msgid "skip files matching pattern"
msgstr ""
-#: builtin/remote.c:160
-msgid "fetch the remote branches"
+#: builtin/ls-files.c:561
+msgid "exclude patterns are read from <file>"
msgstr ""
-#: builtin/remote.c:162
-msgid "import all tags and associated objects when fetching"
+#: builtin/ls-files.c:564
+msgid "read additional per-directory exclude patterns in <file>"
msgstr ""
-#: builtin/remote.c:165
-msgid "or do not fetch any tag at all (--no-tags)"
+#: builtin/ls-files.c:566
+msgid "add the standard git exclusions"
msgstr ""
-#: builtin/remote.c:167
-msgid "branch(es) to track"
+#: builtin/ls-files.c:570
+msgid "make the output relative to the project top directory"
msgstr ""
-#: builtin/remote.c:168
-msgid "master branch"
+#: 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:1111
+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:73
+msgid "exit with exit code 2 if no matching refs are found"
+msgstr ""
+
+#: builtin/ls-remote.c:76
+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:53
+msgid "git merge [<options>] [<commit>...]"
+msgstr ""
+
+#: builtin/merge.c:54
+msgid "git merge --abort"
+msgstr ""
+
+#: builtin/merge.c:55
+msgid "git merge --continue"
+msgstr ""
+
+#: builtin/merge.c:112
+msgid "switch `m' requires a value"
+msgstr ""
+
+#: builtin/merge.c:132
+#, c-format
+msgid "option `%s' requires a value"
+msgstr ""
+
+#: builtin/merge.c:178
+#, c-format
+msgid "Could not find merge strategy '%s'.\n"
+msgstr ""
+
+#: builtin/merge.c:179
+#, c-format
+msgid "Available strategies are:"
+msgstr ""
+
+#: builtin/merge.c:184
+#, c-format
+msgid "Available custom strategies are:"
+msgstr ""
+
+#: builtin/merge.c:235 builtin/pull.c:144
+msgid "do not show a diffstat at the end of the merge"
+msgstr ""
+
+#: builtin/merge.c:238 builtin/pull.c:147
+msgid "show a diffstat at the end of the merge"
+msgstr ""
+
+#: builtin/merge.c:239 builtin/pull.c:150
+msgid "(synonym to --stat)"
+msgstr ""
+
+#: builtin/merge.c:241 builtin/pull.c:153
+msgid "add (at most <n>) entries from shortlog to merge commit message"
+msgstr ""
+
+#: builtin/merge.c:244 builtin/pull.c:159
+msgid "create a single commit instead of doing a merge"
+msgstr ""
+
+#: builtin/merge.c:246 builtin/pull.c:162
+msgid "perform a commit if the merge succeeds (default)"
+msgstr ""
+
+#: builtin/merge.c:248 builtin/pull.c:165
+msgid "edit message before committing"
+msgstr ""
+
+#: builtin/merge.c:249
+msgid "allow fast-forward (default)"
+msgstr ""
+
+#: builtin/merge.c:251 builtin/pull.c:171
+msgid "abort if fast-forward is not possible"
+msgstr ""
+
+#: builtin/merge.c:255 builtin/pull.c:174
+msgid "verify that the named commit has a valid GPG signature"
+msgstr ""
+
+#: builtin/merge.c:256 builtin/notes.c:787 builtin/pull.c:178
+#: builtin/rebase.c:1124 builtin/rebase--interactive.c:188 builtin/revert.c:111
+msgid "strategy"
+msgstr ""
+
+#: builtin/merge.c:257 builtin/pull.c:179
+msgid "merge strategy to use"
+msgstr ""
+
+#: builtin/merge.c:258 builtin/pull.c:182
+msgid "option=value"
+msgstr ""
+
+#: builtin/merge.c:259 builtin/pull.c:183
+msgid "option for selected merge strategy"
+msgstr ""
+
+#: builtin/merge.c:261
+msgid "merge commit message (for a non-fast-forward merge)"
+msgstr ""
+
+#: builtin/merge.c:268
+msgid "abort the current in-progress merge"
+msgstr ""
+
+#: builtin/merge.c:270
+msgid "continue the current in-progress merge"
+msgstr ""
+
+#: builtin/merge.c:272 builtin/pull.c:190
+msgid "allow merging unrelated histories"
+msgstr ""
+
+#: builtin/merge.c:278
+msgid "verify commit-msg hook"
+msgstr ""
+
+#: builtin/merge.c:303
+msgid "could not run stash."
+msgstr ""
+
+#: builtin/merge.c:308
+msgid "stash failed"
+msgstr ""
+
+#: builtin/merge.c:313
+#, c-format
+msgid "not a valid object: %s"
+msgstr ""
+
+#: builtin/merge.c:335 builtin/merge.c:352
+msgid "read-tree failed"
+msgstr ""
+
+#: builtin/merge.c:382
+msgid " (nothing to squash)"
+msgstr ""
+
+#: builtin/merge.c:393
+#, c-format
+msgid "Squash commit -- not updating HEAD\n"
+msgstr ""
+
+#: builtin/merge.c:443
+#, c-format
+msgid "No merge message -- not updating HEAD\n"
+msgstr ""
+
+#: builtin/merge.c:494
+#, c-format
+msgid "'%s' does not point to a commit"
+msgstr ""
+
+#: builtin/merge.c:581
+#, c-format
+msgid "Bad branch.%s.mergeoptions string: %s"
+msgstr ""
+
+#: builtin/merge.c:702
+msgid "Not handling anything other than two heads merge."
+msgstr ""
+
+#: builtin/merge.c:716
+#, c-format
+msgid "Unknown option for merge-recursive: -X%s"
+msgstr ""
+
+#: builtin/merge.c:731
+#, c-format
+msgid "unable to write %s"
+msgstr ""
+
+#: builtin/merge.c:783
+#, c-format
+msgid "Could not read from '%s'"
+msgstr ""
+
+#: builtin/merge.c:792
+#, c-format
+msgid "Not committing merge; use 'git commit' to complete the merge.\n"
+msgstr ""
+
+#: builtin/merge.c:798
+#, c-format
+msgid ""
+"Please enter a commit message to explain why this merge is necessary,\n"
+"especially if it merges an updated upstream into a topic branch.\n"
+"\n"
+"Lines starting with '%c' will be ignored, and an empty message aborts\n"
+"the commit.\n"
+msgstr ""
+
+#: builtin/merge.c:834
+msgid "Empty commit message."
+msgstr ""
+
+#: builtin/merge.c:853
+#, c-format
+msgid "Wonderful.\n"
+msgstr ""
+
+#: builtin/merge.c:906
+#, c-format
+msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
+msgstr ""
+
+#: builtin/merge.c:945
+msgid "No current branch."
+msgstr ""
+
+#: builtin/merge.c:947
+msgid "No remote for the current branch."
+msgstr ""
+
+#: builtin/merge.c:949
+msgid "No default upstream defined for the current branch."
+msgstr ""
+
+#: builtin/merge.c:954
+#, c-format
+msgid "No remote-tracking branch for %s from %s"
+msgstr ""
+
+#: builtin/merge.c:1011
+#, c-format
+msgid "Bad value '%s' in environment '%s'"
+msgstr ""
+
+#: builtin/merge.c:1114
+#, c-format
+msgid "not something we can merge in %s: %s"
+msgstr ""
+
+#: builtin/merge.c:1148
+msgid "not something we can merge"
+msgstr ""
+
+#: builtin/merge.c:1251
+msgid "--abort expects no arguments"
+msgstr ""
+
+#: builtin/merge.c:1255
+msgid "There is no merge to abort (MERGE_HEAD missing)."
+msgstr ""
+
+#: builtin/merge.c:1267
+msgid "--continue expects no arguments"
+msgstr ""
+
+#: builtin/merge.c:1271
+msgid "There is no merge in progress (MERGE_HEAD missing)."
+msgstr ""
+
+#: builtin/merge.c:1287
+msgid ""
+"You have not concluded your merge (MERGE_HEAD exists).\n"
+"Please, commit your changes before you merge."
+msgstr ""
+
+#: builtin/merge.c:1294
+msgid ""
+"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
+"Please, commit your changes before you merge."
+msgstr ""
+
+#: builtin/merge.c:1297
+msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
+msgstr ""
+
+#: builtin/merge.c:1306
+msgid "You cannot combine --squash with --no-ff."
+msgstr ""
+
+#: builtin/merge.c:1314
+msgid "No commit specified and merge.defaultToUpstream not set."
+msgstr ""
+
+#: builtin/merge.c:1331
+msgid "Squash commit into empty head not supported yet"
+msgstr ""
+
+#: builtin/merge.c:1333
+msgid "Non-fast-forward commit does not make sense into an empty head"
+msgstr ""
+
+#: builtin/merge.c:1338
+#, c-format
+msgid "%s - not something we can merge"
+msgstr ""
+
+#: builtin/merge.c:1340
+msgid "Can merge only exactly one commit into empty head"
+msgstr ""
+
+#: builtin/merge.c:1422
+msgid "refusing to merge unrelated histories"
+msgstr ""
+
+#: builtin/merge.c:1431
+msgid "Already up to date."
+msgstr ""
+
+#: builtin/merge.c:1441
+#, c-format
+msgid "Updating %s..%s\n"
+msgstr ""
+
+#: builtin/merge.c:1483
+#, c-format
+msgid "Trying really trivial in-index merge...\n"
+msgstr ""
+
+#: builtin/merge.c:1490
+#, c-format
+msgid "Nope.\n"
+msgstr ""
+
+#: builtin/merge.c:1515
+msgid "Already up to date. Yeeah!"
+msgstr ""
+
+#: builtin/merge.c:1521
+msgid "Not possible to fast-forward, aborting."
+msgstr ""
+
+#: builtin/merge.c:1544 builtin/merge.c:1623
+#, c-format
+msgid "Rewinding the tree to pristine...\n"
+msgstr ""
+
+#: builtin/merge.c:1548
+#, c-format
+msgid "Trying merge strategy %s...\n"
+msgstr ""
+
+#: builtin/merge.c:1614
+#, c-format
+msgid "No merge strategy handled the merge.\n"
+msgstr ""
+
+#: builtin/merge.c:1616
+#, c-format
+msgid "Merge with strategy %s failed.\n"
+msgstr ""
+
+#: builtin/merge.c:1625
+#, c-format
+msgid "Using the %s to prepare resolving by hand.\n"
+msgstr ""
+
+#: builtin/merge.c:1637
+#, 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:8
+msgid "git multi-pack-index [--object-dir=<dir>] (write|verify)"
+msgstr ""
+
+#: builtin/multi-pack-index.c:21
+msgid "object directory containing set of packfile and pack-index pairs"
+msgstr ""
+
+#: builtin/multi-pack-index.c:39
+msgid "too many arguments"
+msgstr ""
+
+#: builtin/multi-pack-index.c:48
+#, 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:513
+#, 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:413
+msgid "print only names (no SHA-1)"
+msgstr ""
+
+#: builtin/name-rev.c:414
+msgid "only use tags to name the commits"
+msgstr ""
+
+#: builtin/name-rev.c:416
+msgid "only use refs matching <pattern>"
+msgstr ""
+
+#: builtin/name-rev.c:418
+msgid "ignore refs matching <pattern>"
+msgstr ""
+
+#: builtin/name-rev.c:420
+msgid "list all commits reachable from all refs"
+msgstr ""
+
+#: builtin/name-rev.c:421
+msgid "read from stdin"
+msgstr ""
+
+#: builtin/name-rev.c:422
+msgid "allow to print `undefined` names (default)"
+msgstr ""
+
+#: builtin/name-rev.c:428
+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:513
+#, 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: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:108 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
+#, c-format
+msgid "unknown subcommand: %s"
+msgstr ""
+
+#: builtin/pack-objects.c:51
+msgid ""
+"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
+msgstr ""
+
+#: builtin/pack-objects.c:52
+msgid ""
+"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
+msgstr ""
+
+#: builtin/pack-objects.c:423
+#, c-format
+msgid "bad packed object CRC for %s"
+msgstr ""
+
+#: builtin/pack-objects.c:434
+#, c-format
+msgid "corrupt packed object for %s"
+msgstr ""
+
+#: builtin/pack-objects.c:565
+#, c-format
+msgid "recursive delta detected for object %s"
+msgstr ""
+
+#: builtin/pack-objects.c:776
+#, c-format
+msgid "ordered %u objects, expected %<PRIu32>"
+msgstr ""
+
+#: builtin/pack-objects.c:789
+#, c-format
+msgid "packfile is invalid: %s"
+msgstr ""
+
+#: builtin/pack-objects.c:793
+#, c-format
+msgid "unable to open packfile for reuse: %s"
+msgstr ""
+
+#: builtin/pack-objects.c:797
+msgid "unable to seek in reused packfile"
+msgstr ""
+
+#: builtin/pack-objects.c:808
+msgid "unable to read from reused packfile"
+msgstr ""
+
+#: builtin/pack-objects.c:836
+msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
+msgstr ""
+
+#: builtin/pack-objects.c:849
+msgid "Writing objects"
+msgstr ""
+
+#: builtin/pack-objects.c:911 builtin/update-index.c:89
+#, c-format
+msgid "failed to stat %s"
+msgstr ""
+
+#: builtin/pack-objects.c:964
+#, c-format
+msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
+msgstr ""
+
+#: builtin/pack-objects.c:1158
+msgid "disabling bitmap writing, as some objects are not being packed"
+msgstr ""
+
+#: builtin/pack-objects.c:1586
+#, c-format
+msgid "delta base offset overflow in pack for %s"
+msgstr ""
+
+#: builtin/pack-objects.c:1595
+#, c-format
+msgid "delta base offset out of bound for %s"
+msgstr ""
+
+#: builtin/pack-objects.c:1864
+msgid "Counting objects"
+msgstr ""
+
+#: builtin/pack-objects.c:1994
+#, c-format
+msgid "unable to get size of %s"
+msgstr ""
+
+#: builtin/pack-objects.c:2009
+#, c-format
+msgid "unable to parse object header of %s"
+msgstr ""
+
+#: builtin/pack-objects.c:2079 builtin/pack-objects.c:2095
+#: builtin/pack-objects.c:2105
+#, c-format
+msgid "object %s cannot be read"
+msgstr ""
+
+#: builtin/pack-objects.c:2082 builtin/pack-objects.c:2109
+#, c-format
+msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
+msgstr ""
+
+#: builtin/pack-objects.c:2119
+msgid "suboptimal pack - out of memory"
+msgstr ""
+
+#: builtin/pack-objects.c:2445
+#, c-format
+msgid "Delta compression using up to %d threads"
+msgstr ""
+
+#: builtin/pack-objects.c:2577
+#, c-format
+msgid "unable to pack objects reachable from tag %s"
+msgstr ""
+
+#: builtin/pack-objects.c:2664
+msgid "Compressing objects"
+msgstr ""
+
+#: builtin/pack-objects.c:2670
+msgid "inconsistency with delta count"
+msgstr ""
+
+#: builtin/pack-objects.c:2751
+#, c-format
+msgid ""
+"expected edge object ID, got garbage:\n"
+" %s"
+msgstr ""
+
+#: builtin/pack-objects.c:2757
+#, c-format
+msgid ""
+"expected object ID, got garbage:\n"
+" %s"
+msgstr ""
+
+#: builtin/pack-objects.c:2855
+msgid "invalid value for --missing"
+msgstr ""
+
+#: builtin/pack-objects.c:2914 builtin/pack-objects.c:3022
+msgid "cannot open pack index"
+msgstr ""
+
+#: builtin/pack-objects.c:2945
+#, c-format
+msgid "loose object at %s could not be examined"
+msgstr ""
+
+#: builtin/pack-objects.c:3030
+msgid "unable to force loose object"
+msgstr ""
+
+#: builtin/pack-objects.c:3122
+#, c-format
+msgid "not a rev '%s'"
+msgstr ""
+
+#: builtin/pack-objects.c:3125
+#, c-format
+msgid "bad revision '%s'"
+msgstr ""
+
+#: builtin/pack-objects.c:3150
+msgid "unable to add recent objects"
+msgstr ""
+
+#: builtin/pack-objects.c:3203
+#, c-format
+msgid "unsupported index version %s"
+msgstr ""
+
+#: builtin/pack-objects.c:3207
+#, c-format
+msgid "bad index version '%s'"
+msgstr ""
+
+#: builtin/pack-objects.c:3237
+msgid "do not show progress meter"
+msgstr ""
+
+#: builtin/pack-objects.c:3239
+msgid "show progress meter"
+msgstr ""
+
+#: builtin/pack-objects.c:3241
+msgid "show progress meter during object writing phase"
+msgstr ""
+
+#: builtin/pack-objects.c:3244
+msgid "similar to --all-progress when progress meter is shown"
+msgstr ""
+
+#: builtin/pack-objects.c:3245
+msgid "<version>[,<offset>]"
+msgstr ""
+
+#: builtin/pack-objects.c:3246
+msgid "write the pack index file in the specified idx format version"
+msgstr ""
+
+#: builtin/pack-objects.c:3249
+msgid "maximum size of each output pack file"
+msgstr ""
+
+#: builtin/pack-objects.c:3251
+msgid "ignore borrowed objects from alternate object store"
+msgstr ""
+
+#: builtin/pack-objects.c:3253
+msgid "ignore packed objects"
+msgstr ""
+
+#: builtin/pack-objects.c:3255
+msgid "limit pack window by objects"
+msgstr ""
+
+#: builtin/pack-objects.c:3257
+msgid "limit pack window by memory in addition to object limit"
+msgstr ""
+
+#: builtin/pack-objects.c:3259
+msgid "maximum length of delta chain allowed in the resulting pack"
+msgstr ""
+
+#: builtin/pack-objects.c:3261
+msgid "reuse existing deltas"
+msgstr ""
+
+#: builtin/pack-objects.c:3263
+msgid "reuse existing objects"
+msgstr ""
+
+#: builtin/pack-objects.c:3265
+msgid "use OFS_DELTA objects"
+msgstr ""
+
+#: builtin/pack-objects.c:3267
+msgid "use threads when searching for best delta matches"
+msgstr ""
+
+#: builtin/pack-objects.c:3269
+msgid "do not create an empty pack output"
+msgstr ""
+
+#: builtin/pack-objects.c:3271
+msgid "read revision arguments from standard input"
+msgstr ""
+
+#: builtin/pack-objects.c:3273
+msgid "limit the objects to those that are not yet packed"
+msgstr ""
+
+#: builtin/pack-objects.c:3276
+msgid "include objects reachable from any reference"
+msgstr ""
+
+#: builtin/pack-objects.c:3279
+msgid "include objects referred by reflog entries"
+msgstr ""
+
+#: builtin/pack-objects.c:3282
+msgid "include objects referred to by the index"
+msgstr ""
+
+#: builtin/pack-objects.c:3285
+msgid "output pack to stdout"
+msgstr ""
+
+#: builtin/pack-objects.c:3287
+msgid "include tag objects that refer to objects to be packed"
+msgstr ""
+
+#: builtin/pack-objects.c:3289
+msgid "keep unreachable objects"
+msgstr ""
+
+#: builtin/pack-objects.c:3291
+msgid "pack loose unreachable objects"
+msgstr ""
+
+#: builtin/pack-objects.c:3293
+msgid "unpack unreachable objects newer than <time>"
+msgstr ""
+
+#: builtin/pack-objects.c:3296
+msgid "use the sparse reachability algorithm"
+msgstr ""
+
+#: builtin/pack-objects.c:3298
+msgid "create thin packs"
+msgstr ""
+
+#: builtin/pack-objects.c:3300
+msgid "create packs suitable for shallow fetches"
+msgstr ""
+
+#: builtin/pack-objects.c:3302
+msgid "ignore packs that have companion .keep file"
+msgstr ""
+
+#: builtin/pack-objects.c:3304
+msgid "ignore this pack"
+msgstr ""
+
+#: builtin/pack-objects.c:3306
+msgid "pack compression level"
+msgstr ""
+
+#: builtin/pack-objects.c:3308
+msgid "do not hide commits by grafts"
+msgstr ""
+
+#: builtin/pack-objects.c:3310
+msgid "use a bitmap index if available to speed up counting objects"
+msgstr ""
+
+#: builtin/pack-objects.c:3312
+msgid "write a bitmap index together with the pack index"
+msgstr ""
+
+#: builtin/pack-objects.c:3315
+msgid "handling for missing objects"
+msgstr ""
+
+#: builtin/pack-objects.c:3318
+msgid "do not pack objects in promisor packfiles"
+msgstr ""
+
+#: builtin/pack-objects.c:3320
+msgid "respect islands during delta compression"
+msgstr ""
+
+#: builtin/pack-objects.c:3345
+#, c-format
+msgid "delta chain depth %d is too deep, forcing %d"
+msgstr ""
+
+#: builtin/pack-objects.c:3350
+#, c-format
+msgid "pack.deltaCacheLimit is too high, forcing %d"
+msgstr ""
+
+#: builtin/pack-objects.c:3404
+msgid "--max-pack-size cannot be used to build a pack for transfer"
+msgstr ""
+
+#: builtin/pack-objects.c:3406
+msgid "minimum pack size limit is 1 MiB"
+msgstr ""
+
+#: builtin/pack-objects.c:3411
+msgid "--thin cannot be used to build an indexable pack"
+msgstr ""
+
+#: builtin/pack-objects.c:3414
+msgid "--keep-unreachable and --unpack-unreachable are incompatible"
+msgstr ""
+
+#: builtin/pack-objects.c:3420
+msgid "cannot use --filter without --stdout"
+msgstr ""
+
+#: builtin/pack-objects.c:3479
+msgid "Enumerating objects"
+msgstr ""
+
+#: builtin/pack-objects.c:3498
+#, c-format
+msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)"
+msgstr ""
+
+#: builtin/pack-refs.c:7
+msgid "git pack-refs [<options>]"
+msgstr ""
+
+#: builtin/pack-refs.c:15
+msgid "pack everything"
+msgstr ""
+
+#: builtin/pack-refs.c:16
+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:109
+msgid "report pruned objects"
+msgstr ""
+
+#: builtin/prune.c:112
+msgid "expire objects older than <time>"
+msgstr ""
+
+#: builtin/prune.c:114
+msgid "limit traversal to objects outside promisor packfiles"
+msgstr ""
+
+#: builtin/prune.c:128
+msgid "cannot prune in a precious-objects repo"
+msgstr ""
+
+#: builtin/pull.c:61 builtin/pull.c:63
+#, c-format
+msgid "Invalid value for %s: %s"
+msgstr ""
+
+#: builtin/pull.c:83
+msgid "git pull [<options>] [<repository> [<refspec>...]]"
+msgstr ""
+
+#: builtin/pull.c:134
+msgid "control for recursive fetching of submodules"
+msgstr ""
+
+#: builtin/pull.c:138
+msgid "Options related to merging"
+msgstr ""
+
+#: builtin/pull.c:141
+msgid "incorporate changes by rebasing rather than merging"
+msgstr ""
+
+#: builtin/pull.c:168 builtin/rebase--interactive.c:149 builtin/revert.c:123
+msgid "allow fast-forward"
+msgstr ""
+
+#: builtin/pull.c:177
+msgid "automatically stash/stash pop before and after rebase"
+msgstr ""
+
+#: builtin/pull.c:193
+msgid "Options related to fetching"
+msgstr ""
+
+#: builtin/pull.c:203
+msgid "force overwrite of local branch"
+msgstr ""
+
+#: builtin/pull.c:211
+msgid "number of submodules pulled in parallel"
+msgstr ""
+
+#: builtin/pull.c:306
+#, c-format
+msgid "Invalid value for pull.ff: %s"
+msgstr ""
+
+#: builtin/pull.c:422
+msgid ""
+"There is no candidate for rebasing against among the refs that you just "
+"fetched."
+msgstr ""
+
+#: builtin/pull.c:424
+msgid ""
+"There are no candidates for merging among the refs that you just fetched."
+msgstr ""
+
+#: builtin/pull.c:425
+msgid ""
+"Generally this means that you provided a wildcard refspec which had no\n"
+"matches on the remote end."
+msgstr ""
+
+#: builtin/pull.c:428
+#, 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:433 builtin/rebase.c:956 git-parse-remote.sh:73
+msgid "You are not currently on a branch."
+msgstr ""
+
+#: builtin/pull.c:435 builtin/pull.c:450 git-parse-remote.sh:79
+msgid "Please specify which branch you want to rebase against."
+msgstr ""
+
+#: builtin/pull.c:437 builtin/pull.c:452 git-parse-remote.sh:82
+msgid "Please specify which branch you want to merge with."
+msgstr ""
+
+#: builtin/pull.c:438 builtin/pull.c:453
+msgid "See git-pull(1) for details."
+msgstr ""
+
+#: builtin/pull.c:440 builtin/pull.c:446 builtin/pull.c:455
+#: builtin/rebase.c:962 git-parse-remote.sh:64
+msgid "<remote>"
+msgstr ""
+
+#: builtin/pull.c:440 builtin/pull.c:455 builtin/pull.c:460
+#: git-legacy-rebase.sh:564 git-parse-remote.sh:65
+msgid "<branch>"
+msgstr ""
+
+#: builtin/pull.c:448 builtin/rebase.c:954 git-parse-remote.sh:75
+msgid "There is no tracking information for the current branch."
+msgstr ""
+
+#: builtin/pull.c:457 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:462
+#, 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:566
+#, c-format
+msgid "unable to access commit %s"
+msgstr ""
+
+#: builtin/pull.c:844
+msgid "ignoring --verify-signatures for rebase"
+msgstr ""
+
+#: builtin/pull.c:892
+msgid "--[no-]autostash option is only valid with --rebase."
+msgstr ""
+
+#: builtin/pull.c:900
+msgid "Updating an unborn branch with changes added to the index."
+msgstr ""
+
+#: builtin/pull.c:904
+msgid "pull with rebase"
+msgstr ""
+
+#: builtin/pull.c:905
+msgid "please commit or stash them."
+msgstr ""
+
+#: builtin/pull.c:930
+#, c-format
+msgid ""
+"fetch updated the current branch head.\n"
+"fast-forwarding your working tree from\n"
+"commit %s."
+msgstr ""
+
+#: builtin/pull.c:936
+#, 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:951
+msgid "Cannot merge multiple branches into empty head."
+msgstr ""
+
+#: builtin/pull.c:955
+msgid "Cannot rebase onto multiple branches."
+msgstr ""
+
+#: builtin/pull.c:962
+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:61 builtin/range-diff.c:65
+#, c-format
+msgid "no .. in range: '%s'"
+msgstr ""
+
+#: builtin/range-diff.c:75
+msgid "single arg format must be symmetric range"
+msgstr ""
+
+#: builtin/range-diff.c:90
+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/rebase.c:30
+msgid ""
+"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] "
+"[<branch>]"
+msgstr ""
+
+#: builtin/rebase.c:32
+msgid ""
+"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]"
+msgstr ""
+
+#: builtin/rebase.c:34
+msgid "git rebase --continue | --abort | --skip | --edit-todo"
+msgstr ""
+
+#: builtin/rebase.c:121 builtin/rebase.c:1437
+#, c-format
+msgid "%s requires an interactive rebase"
+msgstr ""
+
+#: builtin/rebase.c:173
+#, c-format
+msgid "could not get 'onto': '%s'"
+msgstr ""
+
+#: builtin/rebase.c:188
+#, c-format
+msgid "invalid orig-head: '%s'"
+msgstr ""
+
+#: builtin/rebase.c:213
+#, c-format
+msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
+msgstr ""
+
+#: builtin/rebase.c:289
+#, c-format
+msgid "Could not read '%s'"
+msgstr ""
+
+#: builtin/rebase.c:307
+#, c-format
+msgid "Cannot store %s"
+msgstr ""
+
+#: builtin/rebase.c:402
+msgid "could not determine HEAD revision"
+msgstr ""
+
+#: builtin/rebase.c:522
+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:603
+#, 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:948
+#, 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:964
+#, 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:994
+msgid "exec commands cannot contain newlines"
+msgstr ""
+
+#: builtin/rebase.c:998
+msgid "empty exec command"
+msgstr ""
+
+#: builtin/rebase.c:1040
+msgid "rebase onto given branch instead of upstream"
+msgstr ""
+
+#: builtin/rebase.c:1042
+msgid "allow pre-rebase hook to run"
+msgstr ""
+
+#: builtin/rebase.c:1044
+msgid "be quiet. implies --no-stat"
+msgstr ""
+
+#: builtin/rebase.c:1047
+msgid "display a diffstat of what changed upstream"
+msgstr ""
+
+#: builtin/rebase.c:1050
+msgid "do not show diffstat of what changed upstream"
+msgstr ""
+
+#: builtin/rebase.c:1053
+msgid "add a Signed-off-by: line to each commit"
+msgstr ""
+
+#: builtin/rebase.c:1055 builtin/rebase.c:1059 builtin/rebase.c:1061
+msgid "passed to 'git am'"
+msgstr ""
+
+#: builtin/rebase.c:1063 builtin/rebase.c:1065
+msgid "passed to 'git apply'"
+msgstr ""
+
+#: builtin/rebase.c:1067 builtin/rebase.c:1070
+msgid "cherry-pick all commits, even if unchanged"
+msgstr ""
+
+#: builtin/rebase.c:1072
+msgid "continue"
+msgstr ""
+
+#: builtin/rebase.c:1075
+msgid "skip current patch and continue"
+msgstr ""
+
+#: builtin/rebase.c:1077
+msgid "abort and check out the original branch"
+msgstr ""
+
+#: builtin/rebase.c:1080
+msgid "abort but keep HEAD where it is"
+msgstr ""
+
+#: builtin/rebase.c:1081
+msgid "edit the todo list during an interactive rebase"
+msgstr ""
+
+#: builtin/rebase.c:1084
+msgid "show the patch file being applied or merged"
+msgstr ""
+
+#: builtin/rebase.c:1087
+msgid "use merging strategies to rebase"
+msgstr ""
+
+#: builtin/rebase.c:1091
+msgid "let the user edit the list of commits to rebase"
+msgstr ""
+
+#: builtin/rebase.c:1095
+msgid "try to recreate merges instead of ignoring them"
+msgstr ""
+
+#: builtin/rebase.c:1099
+msgid "allow rerere to update index with resolved conflict"
+msgstr ""
+
+#: builtin/rebase.c:1102
+msgid "preserve empty commits during rebase"
+msgstr ""
+
+#: builtin/rebase.c:1104
+msgid "move commits that begin with squash!/fixup! under -i"
+msgstr ""
+
+#: builtin/rebase.c:1110
+msgid "automatically stash/stash pop before and after"
+msgstr ""
+
+#: builtin/rebase.c:1112
+msgid "add exec lines after each commit of the editable list"
+msgstr ""
+
+#: builtin/rebase.c:1116
+msgid "allow rebasing commits with empty messages"
+msgstr ""
+
+#: builtin/rebase.c:1119
+msgid "try to rebase merges instead of skipping them"
+msgstr ""
+
+#: builtin/rebase.c:1122
+msgid "use 'merge-base --fork-point' to refine upstream"
+msgstr ""
+
+#: builtin/rebase.c:1124
+msgid "use the given merge strategy"
+msgstr ""
+
+#: builtin/rebase.c:1126 builtin/revert.c:112
+msgid "option"
+msgstr ""
+
+#: builtin/rebase.c:1127
+msgid "pass the argument through to the merge strategy"
+msgstr ""
+
+#: builtin/rebase.c:1130
+msgid "rebase all reachable commits up to the root(s)"
+msgstr ""
+
+#: builtin/rebase.c:1133 builtin/rebase--interactive.c:198
+msgid "automatically re-schedule any `exec` that fails"
+msgstr ""
+
+#: builtin/rebase.c:1149
+#, c-format
+msgid "could not exec %s"
+msgstr ""
+
+#: builtin/rebase.c:1167 git-legacy-rebase.sh:220
+msgid "It looks like 'git am' is in progress. Cannot rebase."
+msgstr ""
+
+#: builtin/rebase.c:1208 git-legacy-rebase.sh:406
+msgid "No rebase in progress?"
+msgstr ""
+
+#: builtin/rebase.c:1212 git-legacy-rebase.sh:417
+msgid "The --edit-todo action can only be used during interactive rebase."
+msgstr ""
+
+#: builtin/rebase.c:1226 git-legacy-rebase.sh:424
+msgid "Cannot read HEAD"
+msgstr ""
+
+#: builtin/rebase.c:1238 git-legacy-rebase.sh:427
+msgid ""
+"You must edit all merge conflicts and then\n"
+"mark them as resolved using git add"
+msgstr ""
+
+#: builtin/rebase.c:1257
+msgid "could not discard worktree changes"
+msgstr ""
+
+#: builtin/rebase.c:1276
+#, c-format
+msgid "could not move back to %s"
+msgstr ""
+
+#: builtin/rebase.c:1287 builtin/rm.c:369
+#, c-format
+msgid "could not remove '%s'"
+msgstr ""
+
+#: builtin/rebase.c:1313
+#, 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:1334
+msgid "switch `C' expects a numerical value"
+msgstr ""
+
+#: builtin/rebase.c:1375
+#, c-format
+msgid "Unknown mode: %s"
+msgstr ""
+
+#: builtin/rebase.c:1397
+msgid "--strategy requires --merge or --interactive"
+msgstr ""
+
+#: builtin/rebase.c:1446
+msgid "cannot combine am options with either interactive or merge options"
+msgstr ""
+
+#: builtin/rebase.c:1465
+msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
+msgstr ""
+
+#: builtin/rebase.c:1469 git-legacy-rebase.sh:544
+msgid ""
+"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
+msgstr ""
+
+#: builtin/rebase.c:1475
+msgid "cannot combine '--rebase-merges' with '--strategy-option'"
+msgstr ""
+
+#: builtin/rebase.c:1478
+msgid "cannot combine '--rebase-merges' with '--strategy'"
+msgstr ""
+
+#: builtin/rebase.c:1502
+#, c-format
+msgid "invalid upstream '%s'"
+msgstr ""
+
+#: builtin/rebase.c:1508
+msgid "Could not create new root commit"
+msgstr ""
+
+#: builtin/rebase.c:1526
+#, c-format
+msgid "'%s': need exactly one merge base"
+msgstr ""
+
+#: builtin/rebase.c:1533
+#, c-format
+msgid "Does not point to a valid commit '%s'"
+msgstr ""
+
+#: builtin/rebase.c:1558
+#, c-format
+msgid "fatal: no such branch/commit '%s'"
+msgstr ""
+
+#: builtin/rebase.c:1566 builtin/submodule--helper.c:38
+#: builtin/submodule--helper.c:1934
+#, c-format
+msgid "No such ref: %s"
+msgstr ""
+
+#: builtin/rebase.c:1578
+msgid "Could not resolve HEAD to a revision"
+msgstr ""
+
+#: builtin/rebase.c:1619 git-legacy-rebase.sh:673
+msgid "Cannot autostash"
+msgstr ""
+
+#: builtin/rebase.c:1622
+#, c-format
+msgid "Unexpected stash response: '%s'"
+msgstr ""
+
+#: builtin/rebase.c:1628
+#, c-format
+msgid "Could not create directory for '%s'"
+msgstr ""
+
+#: builtin/rebase.c:1631
+#, c-format
+msgid "Created autostash: %s\n"
+msgstr ""
+
+#: builtin/rebase.c:1634
+msgid "could not reset --hard"
+msgstr ""
+
+#: builtin/rebase.c:1635 builtin/reset.c:114
+#, c-format
+msgid "HEAD is now at %s"
+msgstr ""
+
+#: builtin/rebase.c:1651 git-legacy-rebase.sh:682
+msgid "Please commit or stash them."
+msgstr ""
+
+#: builtin/rebase.c:1678
+#, c-format
+msgid "could not parse '%s'"
+msgstr ""
+
+#: builtin/rebase.c:1691
+#, c-format
+msgid "could not switch to %s"
+msgstr ""
+
+#: builtin/rebase.c:1702 git-legacy-rebase.sh:705
+#, sh-format
+msgid "HEAD is up to date."
+msgstr ""
+
+#: builtin/rebase.c:1704
+#, c-format
+msgid "Current branch %s is up to date.\n"
+msgstr ""
+
+#: builtin/rebase.c:1712 git-legacy-rebase.sh:715
+#, sh-format
+msgid "HEAD is up to date, rebase forced."
+msgstr ""
+
+#: builtin/rebase.c:1714
+#, c-format
+msgid "Current branch %s is up to date, rebase forced.\n"
+msgstr ""
+
+#: builtin/rebase.c:1722 git-legacy-rebase.sh:215
+msgid "The pre-rebase hook refused to rebase."
+msgstr ""
+
+#: builtin/rebase.c:1729
+#, c-format
+msgid "Changes to %s:\n"
+msgstr ""
+
+#: builtin/rebase.c:1732
+#, c-format
+msgid "Changes from %s to %s:\n"
+msgstr ""
+
+#: builtin/rebase.c:1757
+#, c-format
+msgid "First, rewinding head to replay your work on top of it...\n"
+msgstr ""
+
+#: builtin/rebase.c:1765
+msgid "Could not detach HEAD"
+msgstr ""
+
+#: builtin/rebase.c:1774
+#, c-format
+msgid "Fast-forwarded %s to %s.\n"
+msgstr ""
+
+#: builtin/rebase--interactive.c:25
+msgid "no HEAD?"
+msgstr ""
+
+#: builtin/rebase--interactive.c:52
+#, c-format
+msgid "could not create temporary %s"
+msgstr ""
+
+#: builtin/rebase--interactive.c:58
+msgid "could not mark as interactive"
+msgstr ""
+
+#: builtin/rebase--interactive.c:102
+#, c-format
+msgid "could not open %s"
+msgstr ""
+
+#: builtin/rebase--interactive.c:115
+msgid "could not generate todo list"
+msgstr ""
+
+#: builtin/rebase--interactive.c:131
+msgid "git rebase--interactive [<options>]"
+msgstr ""
+
+#: builtin/rebase--interactive.c:150
+msgid "keep empty commits"
+msgstr ""
+
+#: builtin/rebase--interactive.c:152 builtin/revert.c:125
+msgid "allow commits with empty messages"
+msgstr ""
+
+#: builtin/rebase--interactive.c:153
+msgid "rebase merge commits"
+msgstr ""
+
+#: builtin/rebase--interactive.c:155
+msgid "keep original branch points of cousins"
+msgstr ""
+
+#: builtin/rebase--interactive.c:157
+msgid "move commits that begin with squash!/fixup!"
+msgstr ""
+
+#: builtin/rebase--interactive.c:158
+msgid "sign commits"
+msgstr ""
+
+#: builtin/rebase--interactive.c:160
+msgid "continue rebase"
+msgstr ""
+
+#: builtin/rebase--interactive.c:162
+msgid "skip commit"
+msgstr ""
+
+#: builtin/rebase--interactive.c:163
+msgid "edit the todo list"
+msgstr ""
+
+#: builtin/rebase--interactive.c:165
+msgid "show the current patch"
+msgstr ""
+
+#: builtin/rebase--interactive.c:168
+msgid "shorten commit ids in the todo list"
+msgstr ""
+
+#: builtin/rebase--interactive.c:170
+msgid "expand commit ids in the todo list"
+msgstr ""
+
+#: builtin/rebase--interactive.c:172
+msgid "check the todo list"
+msgstr ""
+
+#: builtin/rebase--interactive.c:174
+msgid "rearrange fixup/squash lines"
+msgstr ""
+
+#: builtin/rebase--interactive.c:176
+msgid "insert exec commands in todo list"
+msgstr ""
+
+#: builtin/rebase--interactive.c:177
+msgid "onto"
+msgstr ""
+
+#: builtin/rebase--interactive.c:179
+msgid "restrict-revision"
+msgstr ""
+
+#: builtin/rebase--interactive.c:179
+msgid "restrict revision"
+msgstr ""
+
+#: builtin/rebase--interactive.c:180
+msgid "squash-onto"
+msgstr ""
+
+#: builtin/rebase--interactive.c:181
+msgid "squash onto"
+msgstr ""
+
+#: builtin/rebase--interactive.c:183
+msgid "the upstream commit"
+msgstr ""
+
+#: builtin/rebase--interactive.c:184
+msgid "head-name"
+msgstr ""
+
+#: builtin/rebase--interactive.c:184
+msgid "head name"
+msgstr ""
+
+#: builtin/rebase--interactive.c:189
+msgid "rebase strategy"
+msgstr ""
+
+#: builtin/rebase--interactive.c:190
+msgid "strategy-opts"
+msgstr ""
+
+#: builtin/rebase--interactive.c:191
+msgid "strategy options"
+msgstr ""
+
+#: builtin/rebase--interactive.c:192
+msgid "switch-to"
+msgstr ""
+
+#: builtin/rebase--interactive.c:193
+msgid "the branch or commit to checkout"
+msgstr ""
+
+#: builtin/rebase--interactive.c:194
+msgid "onto-name"
+msgstr ""
+
+#: builtin/rebase--interactive.c:194
+msgid "onto name"
+msgstr ""
+
+#: builtin/rebase--interactive.c:195
+msgid "cmd"
+msgstr ""
+
+#: builtin/rebase--interactive.c:195
+msgid "the command to run"
+msgstr ""
+
+#: builtin/rebase--interactive.c:224
+msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
+msgstr ""
+
+#: builtin/rebase--interactive.c:230
+msgid "a base commit must be provided with --upstream or --onto"
+msgstr ""
+
+#: builtin/receive-pack.c:33
+msgid "git receive-pack <git-dir>"
+msgstr ""
+
+#: builtin/receive-pack.c:830
+msgid ""
+"By default, updating the current branch in a non-bare repository\n"
+"is denied, because it will make the index and work tree inconsistent\n"
+"with what you pushed, and will require 'git reset --hard' to match\n"
+"the work tree to HEAD.\n"
+"\n"
+"You can set the 'receive.denyCurrentBranch' configuration variable\n"
+"to 'ignore' or 'warn' in the remote repository to allow pushing into\n"
+"its current branch; however, this is not recommended unless you\n"
+"arranged to update its work tree to match what you pushed in some\n"
+"other way.\n"
+"\n"
+"To squelch this message and still keep the default behaviour, set\n"
+"'receive.denyCurrentBranch' configuration variable to 'refuse'."
+msgstr ""
+
+#: builtin/receive-pack.c:850
+msgid ""
+"By default, deleting the current branch is denied, because the next\n"
+"'git clone' won't result in any file checked out, causing confusion.\n"
+"\n"
+"You can set 'receive.denyDeleteCurrent' configuration variable to\n"
+"'warn' or 'ignore' in the remote repository to allow deleting the\n"
+"current branch, with or without a warning message.\n"
+"\n"
+"To squelch this message, you can set it to 'refuse'."
+msgstr ""
+
+#: builtin/receive-pack.c:1929
+msgid "quiet"
+msgstr ""
+
+#: builtin/receive-pack.c:1943
+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:411
+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:420
+msgid "Nothing new to pack."
+msgstr ""
+
+#: builtin/repack.c:481
+#, 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:529
+#, 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:58 builtin/replace.c:203 builtin/replace.c:206
+#, c-format
+msgid "failed to resolve '%s' as a valid ref"
+msgstr ""
+
+#: builtin/replace.c:86
+#, c-format
+msgid ""
+"invalid replace format '%s'\n"
+"valid formats are 'short', 'medium' and 'long'"
+msgstr ""
+
+#: builtin/replace.c:121
+#, c-format
+msgid "replace ref '%s' not found"
+msgstr ""
+
+#: builtin/replace.c:137
+#, c-format
+msgid "Deleted replace ref '%s'"
+msgstr ""
+
+#: builtin/replace.c:149
+#, c-format
+msgid "'%s' is not a valid ref name"
+msgstr ""
+
+#: builtin/replace.c:154
+#, c-format
+msgid "replace ref '%s' already exists"
+msgstr ""
+
+#: builtin/replace.c:174
+#, 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:225
+#, c-format
+msgid "unable to open %s for writing"
+msgstr ""
+
+#: builtin/replace.c:238
+msgid "cat-file reported failure"
+msgstr ""
+
+#: builtin/replace.c:254
+#, c-format
+msgid "unable to open %s for reading"
+msgstr ""
+
+#: builtin/replace.c:268
+msgid "unable to spawn mktree"
+msgstr ""
+
+#: builtin/replace.c:272
+msgid "unable to read from mktree"
+msgstr ""
+
+#: builtin/replace.c:281
+msgid "mktree reported failure"
+msgstr ""
+
+#: builtin/replace.c:285
+msgid "mktree did not return an object name"
+msgstr ""
+
+#: builtin/replace.c:294
+#, c-format
+msgid "unable to fstat %s"
+msgstr ""
+
+#: builtin/replace.c:299
+msgid "unable to write object to database"
+msgstr ""
+
+#: builtin/replace.c:318 builtin/replace.c:371 builtin/replace.c:415
+#: builtin/replace.c:445
+#, c-format
+msgid "not a valid object name: '%s'"
+msgstr ""
+
+#: builtin/replace.c:322
+#, c-format
+msgid "unable to get object type for %s"
+msgstr ""
+
+#: builtin/replace.c:338
+msgid "editing object file failed"
+msgstr ""
+
+#: builtin/replace.c:347
+#, c-format
+msgid "new object is the same as the old one: '%s'"
+msgstr ""
+
+#: builtin/replace.c:407
+#, c-format
+msgid "bad mergetag in commit '%s'"
+msgstr ""
+
+#: builtin/replace.c:409
+#, c-format
+msgid "malformed mergetag in commit '%s'"
+msgstr ""
+
+#: builtin/replace.c:421
+#, c-format
+msgid ""
+"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
+"instead of --graft"
+msgstr ""
+
+#: builtin/replace.c:460
+#, c-format
+msgid "the original commit '%s' has a gpg signature"
+msgstr ""
+
+#: builtin/replace.c:461
+msgid "the signature will be removed in the replacement commit!"
+msgstr ""
+
+#: builtin/replace.c:471
+#, c-format
+msgid "could not write replacement commit for: '%s'"
+msgstr ""
+
+#: builtin/replace.c:479
+#, c-format
+msgid "graft for '%s' unnecessary"
+msgstr ""
+
+#: builtin/replace.c:482
+#, c-format
+msgid "new commit is the same as the old one: '%s'"
+msgstr ""
+
+#: builtin/replace.c:515
+#, c-format
+msgid ""
+"could not convert the following graft(s):\n"
+"%s"
+msgstr ""
+
+#: builtin/replace.c:536
+msgid "list replace refs"
+msgstr ""
+
+#: builtin/replace.c:537
+msgid "delete replace refs"
+msgstr ""
+
+#: builtin/replace.c:538
+msgid "edit existing object"
+msgstr ""
+
+#: builtin/replace.c:539
+msgid "change a commit's parents"
+msgstr ""
+
+#: builtin/replace.c:540
+msgid "convert existing graft file"
+msgstr ""
+
+#: builtin/replace.c:541
+msgid "replace the ref if it exists"
+msgstr ""
+
+#: builtin/replace.c:543
+msgid "do not pretty-print contents for --edit"
+msgstr ""
+
+#: builtin/replace.c:544
+msgid "use this format"
+msgstr ""
+
+#: builtin/replace.c:557
+msgid "--format cannot be used when not listing"
+msgstr ""
+
+#: builtin/replace.c:565
+msgid "-f only makes sense when writing a replacement"
+msgstr ""
+
+#: builtin/replace.c:569
+msgid "--raw only makes sense with --edit"
+msgstr ""
+
+#: builtin/replace.c:575
+msgid "-d needs at least one argument"
+msgstr ""
+
+#: builtin/replace.c:581
+msgid "bad number of arguments"
+msgstr ""
+
+#: builtin/replace.c:587
+msgid "-e needs exactly one argument"
+msgstr ""
+
+#: builtin/replace.c:593
+msgid "-g needs at least one argument"
+msgstr ""
+
+#: builtin/replace.c:599
+msgid "--convert-graft-file takes no argument"
+msgstr ""
+
+#: builtin/replace.c:605
+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/remote.c:169
-msgid "push|fetch"
+#: builtin/reset.c:33
+msgid "git reset [-q] [<tree-ish>] [--] <paths>..."
msgstr ""
-#: builtin/remote.c:170
-msgid "set up remote as a mirror to push to or fetch from"
+#: builtin/reset.c:34
+msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
msgstr ""
-#: builtin/remote.c:182
-msgid "specifying a master branch makes no sense with --mirror"
+#: builtin/reset.c:40
+msgid "mixed"
msgstr ""
-#: builtin/remote.c:184
-msgid "specifying branches to track makes sense only with fetch mirrors"
+#: builtin/reset.c:40
+msgid "soft"
msgstr ""
-#: builtin/remote.c:191 builtin/remote.c:631
-#, c-format
-msgid "remote %s already exists."
+#: builtin/reset.c:40
+msgid "hard"
msgstr ""
-#: builtin/remote.c:195 builtin/remote.c:635
-#, c-format
-msgid "'%s' is not a valid remote name"
+#: 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/remote.c:235
+#: builtin/reset.c:89
#, c-format
-msgid "Could not setup master '%s'"
+msgid "Failed to find tree of %s."
msgstr ""
-#: builtin/remote.c:337
+#: builtin/reset.c:193
#, c-format
-msgid "Could not get fetch map for refspec %s"
+msgid "Cannot do a %s reset in the middle of a merge."
msgstr ""
-#: builtin/remote.c:438 builtin/remote.c:446
-msgid "(matching)"
+#: builtin/reset.c:293
+msgid "be quiet, only report errors"
msgstr ""
-#: builtin/remote.c:450
-msgid "(delete)"
+#: builtin/reset.c:295
+msgid "reset HEAD and index"
msgstr ""
-#: builtin/remote.c:624 builtin/remote.c:759 builtin/remote.c:858
-#, c-format
-msgid "No such remote: %s"
+#: 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/remote.c:641
+#: builtin/reset.c:308
+msgid "record only the fact that removed paths will be added later"
+msgstr ""
+
+#: builtin/reset.c:326
#, c-format
-msgid "Could not rename config section '%s' to '%s'"
+msgid "Failed to resolve '%s' as a valid revision."
msgstr ""
-#: builtin/remote.c:661
+#: builtin/reset.c:334
#, c-format
-msgid ""
-"Not updating non-default fetch refspec\n"
-"\t%s\n"
-"\tPlease update the configuration manually if necessary."
+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:352
+msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
msgstr ""
-#: builtin/remote.c:697
+#: builtin/reset.c:354
#, c-format
-msgid "deleting '%s' failed"
+msgid "Cannot do %s reset with paths."
msgstr ""
-#: builtin/remote.c:731
+#: builtin/reset.c:364
#, c-format
-msgid "creating '%s' failed"
+msgid "%s reset is not allowed in a bare repository"
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/reset.c:368
+msgid "-N can only be used with --mixed"
+msgstr ""
+
+#: builtin/reset.c:388
+msgid "Unstaged changes after reset:"
+msgstr ""
-#: builtin/remote.c:810
+#: builtin/reset.c:391
#, c-format
-msgid "Could not remove config section '%s'"
+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/remote.c:911
+#: builtin/reset.c:401
#, c-format
-msgid " new (next fetch will store in remotes/%s)"
+msgid "Could not reset index file to revision '%s'."
msgstr ""
-#: builtin/remote.c:914
-msgid " tracked"
+#: builtin/reset.c:405
+msgid "Could not write new index file."
msgstr ""
-#: builtin/remote.c:916
-msgid " stale (use 'git remote prune' to remove)"
+#: builtin/rev-list.c:406
+msgid "cannot combine --exclude-promisor-objects and --missing"
msgstr ""
-#: builtin/remote.c:918
-msgid " ???"
+#: builtin/rev-list.c:464
+msgid "object filtering requires --objects"
msgstr ""
-#: builtin/remote.c:959
+#: builtin/rev-list.c:467
#, c-format
-msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
+msgid "invalid sparse value '%s'"
msgstr ""
-#: builtin/remote.c:967
-#, c-format
-msgid "rebases interactively onto remote %s"
+#: builtin/rev-list.c:508
+msgid "rev-list does not support display of notes"
msgstr ""
-#: builtin/remote.c:968
-#, c-format
-msgid "rebases onto remote %s"
+#: builtin/rev-list.c:511
+msgid "cannot combine --use-bitmap-index with object filtering"
msgstr ""
-#: builtin/remote.c:971
-#, c-format
-msgid " merges with remote %s"
+#: builtin/rev-parse.c:408
+msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
msgstr ""
-#: builtin/remote.c:974
-#, c-format
-msgid "merges with remote %s"
+#: builtin/rev-parse.c:413
+msgid "keep the `--` passed as an arg"
msgstr ""
-#: builtin/remote.c:977
-#, c-format
-msgid "%-*s and with remote %s\n"
+#: builtin/rev-parse.c:415
+msgid "stop parsing after the first non-option argument"
msgstr ""
-#: builtin/remote.c:1020
-msgid "create"
+#: builtin/rev-parse.c:418
+msgid "output in stuck long form"
msgstr ""
-#: builtin/remote.c:1023
-msgid "delete"
+#: 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/remote.c:1027
-msgid "up to date"
+#: builtin/revert.c:24
+msgid "git revert [<options>] <commit-ish>..."
msgstr ""
-#: builtin/remote.c:1030
-msgid "fast-forwardable"
+#: builtin/revert.c:25
+msgid "git revert <subcommand>"
msgstr ""
-#: builtin/remote.c:1033
-msgid "local out of date"
+#: builtin/revert.c:30
+msgid "git cherry-pick [<options>] <commit-ish>..."
msgstr ""
-#: builtin/remote.c:1040
-#, c-format
-msgid " %-*s forces to %-*s (%s)"
+#: builtin/revert.c:31
+msgid "git cherry-pick <subcommand>"
msgstr ""
-#: builtin/remote.c:1043
+#: builtin/revert.c:72
#, c-format
-msgid " %-*s pushes to %-*s (%s)"
+msgid "option `%s' expects a number greater than zero"
msgstr ""
-#: builtin/remote.c:1047
+#: builtin/revert.c:92
#, c-format
-msgid " %-*s forces to %s"
+msgid "%s: %s cannot be used with %s"
msgstr ""
-#: builtin/remote.c:1050
-#, c-format
-msgid " %-*s pushes to %s"
+#: builtin/revert.c:101
+msgid "end revert or cherry-pick sequence"
msgstr ""
-#: builtin/remote.c:1118
-msgid "do not query remotes"
+#: builtin/revert.c:102
+msgid "resume revert or cherry-pick sequence"
msgstr ""
-#: builtin/remote.c:1145
-#, c-format
-msgid "* remote %s"
+#: builtin/revert.c:103
+msgid "cancel revert or cherry-pick sequence"
msgstr ""
-#: builtin/remote.c:1146
-#, c-format
-msgid " Fetch URL: %s"
+#: builtin/revert.c:104
+msgid "don't automatically commit"
msgstr ""
-#: builtin/remote.c:1147 builtin/remote.c:1163 builtin/remote.c:1302
-msgid "(no URL)"
+#: builtin/revert.c:105
+msgid "edit the commit message"
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/revert.c:108
+msgid "parent-number"
msgstr ""
-#: builtin/remote.c:1165 builtin/remote.c:1167 builtin/remote.c:1169
-#, c-format
-msgid " HEAD branch: %s"
+#: builtin/revert.c:109
+msgid "select mainline parent"
msgstr ""
-#: builtin/remote.c:1165
-msgid "(not queried)"
+#: builtin/revert.c:111
+msgid "merge strategy"
msgstr ""
-#: builtin/remote.c:1167
-msgid "(unknown)"
+#: builtin/revert.c:113
+msgid "option for merge strategy"
msgstr ""
-#: builtin/remote.c:1171
-#, c-format
-msgid ""
-" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
+#: builtin/revert.c:122
+msgid "append commit name"
msgstr ""
-#: builtin/remote.c:1183
-#, c-format
-msgid " Remote branch:%s"
-msgid_plural " Remote branches:%s"
+#: builtin/revert.c:124
+msgid "preserve initially empty commits"
+msgstr ""
+
+#: builtin/revert.c:126
+msgid "keep redundant, empty commits"
+msgstr ""
+
+#: builtin/revert.c:220
+msgid "revert failed"
+msgstr ""
+
+#: builtin/revert.c:233
+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/remote.c:1186 builtin/remote.c:1212
-msgid " (status not queried)"
+#: builtin/rm.c:212
+msgid ""
+"\n"
+"(use -f to force removal)"
msgstr ""
-#: builtin/remote.c:1195
-msgid " Local branch configured for 'git pull':"
-msgid_plural " Local branches configured for 'git pull':"
+#: 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/remote.c:1203
-msgid " Local refs will be mirrored by 'git push'"
+#: builtin/rm.c:220 builtin/rm.c:229
+msgid ""
+"\n"
+"(use --cached to keep the file, or -f to force removal)"
msgstr ""
-#: builtin/remote.c:1209
-#, c-format
-msgid " Local ref configured for 'git push'%s:"
-msgid_plural " Local refs configured for 'git push'%s:"
+#: builtin/rm.c:226
+msgid "the following file has local modifications:"
+msgid_plural "the following files have local modifications:"
msgstr[0] ""
msgstr[1] ""
-#: builtin/remote.c:1230
-msgid "set refs/remotes/<name>/HEAD according to remote"
+#: 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/serve.c:7
+msgid "git serve [<options>]"
msgstr ""
-#: builtin/remote.c:1232
-msgid "delete refs/remotes/<name>/HEAD"
+#: builtin/serve.c:17 builtin/upload-pack.c:23
+msgid "quit after a single request/response exchange"
msgstr ""
-#: builtin/remote.c:1247
-msgid "Cannot determine remote HEAD"
+#: builtin/serve.c:19
+msgid "exit immediately after advertising capabilities"
msgstr ""
-#: builtin/remote.c:1249
-msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
+#: builtin/shortlog.c:14
+msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]"
msgstr ""
-#: builtin/remote.c:1259
-#, c-format
-msgid "Could not delete %s"
+#: builtin/shortlog.c:15
+msgid "git log --pretty=short | git shortlog [<options>]"
msgstr ""
-#: builtin/remote.c:1267
-#, c-format
-msgid "Not a valid ref: %s"
+#: builtin/shortlog.c:264
+msgid "Group by committer rather than author"
msgstr ""
-#: builtin/remote.c:1269
-#, c-format
-msgid "Could not setup %s"
+#: builtin/shortlog.c:266
+msgid "sort output according to the number of commits per author"
msgstr ""
-#: builtin/remote.c:1287
-#, c-format
-msgid " %s will become dangling!"
+#: builtin/shortlog.c:268
+msgid "Suppress commit descriptions, only provides commit count"
msgstr ""
-#: builtin/remote.c:1288
-#, c-format
-msgid " %s has become dangling!"
+#: builtin/shortlog.c:270
+msgid "Show the email address of each author"
msgstr ""
-#: builtin/remote.c:1298
-#, c-format
-msgid "Pruning %s"
+#: builtin/shortlog.c:271
+msgid "<w>[,<i1>[,<i2>]]"
msgstr ""
-#: builtin/remote.c:1299
-#, c-format
-msgid "URL: %s"
+#: builtin/shortlog.c:272
+msgid "Linewrap output"
msgstr ""
-#: builtin/remote.c:1315
-#, c-format
-msgid " * [would prune] %s"
+#: builtin/shortlog.c:301
+msgid "too many arguments given outside repository"
msgstr ""
-#: builtin/remote.c:1318
-#, c-format
-msgid " * [pruned] %s"
+#: builtin/show-branch.c:13
+msgid ""
+"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
+"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
+"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
+"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
msgstr ""
-#: builtin/remote.c:1363
-msgid "prune remotes after fetching"
+#: builtin/show-branch.c:17
+msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
msgstr ""
-#: builtin/remote.c:1426 builtin/remote.c:1480 builtin/remote.c:1548
+#: builtin/show-branch.c:395
#, c-format
-msgid "No such remote '%s'"
+msgid "ignoring %s; cannot handle more than %d ref"
+msgid_plural "ignoring %s; cannot handle more than %d refs"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/show-branch.c:549
+#, c-format
+msgid "no matching refs with %s"
msgstr ""
-#: builtin/remote.c:1442
-msgid "add branch"
+#: builtin/show-branch.c:646
+msgid "show remote-tracking and local branches"
msgstr ""
-#: builtin/remote.c:1449
-msgid "no remote specified"
+#: builtin/show-branch.c:648
+msgid "show remote-tracking branches"
msgstr ""
-#: builtin/remote.c:1466
-msgid "query push URLs rather than fetch URLs"
+#: builtin/show-branch.c:650
+msgid "color '*!+-' corresponding to the branch"
msgstr ""
-#: builtin/remote.c:1468
-msgid "return all URLs"
+#: builtin/show-branch.c:652
+msgid "show <n> more commits after the common ancestor"
msgstr ""
-#: builtin/remote.c:1496
-#, c-format
-msgid "no URLs configured for remote '%s'"
+#: builtin/show-branch.c:654
+msgid "synonym to more=-1"
msgstr ""
-#: builtin/remote.c:1522
-msgid "manipulate push URLs"
+#: builtin/show-branch.c:655
+msgid "suppress naming strings"
msgstr ""
-#: builtin/remote.c:1524
-msgid "add URL"
+#: builtin/show-branch.c:657
+msgid "include the current branch"
msgstr ""
-#: builtin/remote.c:1526
-msgid "delete URLs"
+#: builtin/show-branch.c:659
+msgid "name commits with their object names"
msgstr ""
-#: builtin/remote.c:1533
-msgid "--add --delete doesn't make sense"
+#: builtin/show-branch.c:661
+msgid "show possible merge bases"
msgstr ""
-#: builtin/remote.c:1572
-#, c-format
-msgid "Invalid old URL pattern: %s"
+#: builtin/show-branch.c:663
+msgid "show refs unreachable from any other ref"
msgstr ""
-#: builtin/remote.c:1580
-#, c-format
-msgid "No such URL found: %s"
+#: builtin/show-branch.c:665
+msgid "show commits in topological order"
msgstr ""
-#: builtin/remote.c:1582
-msgid "Will not delete all non-push URLs"
+#: builtin/show-branch.c:668
+msgid "show only commits not on the first branch"
msgstr ""
-#: builtin/remote.c:1598
-msgid "be verbose; must be placed before a subcommand"
+#: builtin/show-branch.c:670
+msgid "show merges reachable from only one tip"
msgstr ""
-#: builtin/remote.c:1629
-#, c-format
-msgid "Unknown subcommand: %s"
+#: builtin/show-branch.c:672
+msgid "topologically sort, maintaining date order where possible"
msgstr ""
-#: builtin/repack.c:18
-msgid "git repack [<options>]"
+#: builtin/show-branch.c:675
+msgid "<n>[,<base>]"
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/show-branch.c:676
+msgid "show <n> most recent ref-log entries starting at base"
msgstr ""
-#: builtin/repack.c:170
-msgid "pack everything in a single pack"
+#: builtin/show-branch.c:712
+msgid ""
+"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
msgstr ""
-#: builtin/repack.c:172
-msgid "same as -a, and turn unreachable objects loose"
+#: builtin/show-branch.c:736
+msgid "no branches given, and HEAD is not valid"
msgstr ""
-#: builtin/repack.c:175
-msgid "remove redundant packs, and run git-prune-packed"
+#: builtin/show-branch.c:739
+msgid "--reflog option needs one branch name"
msgstr ""
-#: builtin/repack.c:177
-msgid "pass --no-reuse-delta to git-pack-objects"
+#: 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/repack.c:179
-msgid "pass --no-reuse-object to git-pack-objects"
+#: builtin/show-branch.c:830
+#, 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:834
+#, c-format
+msgid "'%s' is not a valid ref."
msgstr ""
-#: builtin/repack.c:181
-msgid "do not run git-update-server-info"
+#: builtin/show-branch.c:837
+#, c-format
+msgid "cannot find commit %s (%s)"
msgstr ""
-#: builtin/repack.c:184
-msgid "pass --local to git-pack-objects"
+#: builtin/show-ref.c:11
+msgid ""
+"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
+"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
msgstr ""
-#: builtin/repack.c:186
-msgid "write bitmap index"
+#: builtin/show-ref.c:12
+msgid "git show-ref --exclude-existing[=<pattern>]"
msgstr ""
-#: builtin/repack.c:187
-msgid "approxidate"
+#: builtin/show-ref.c:161
+msgid "only show tags (can be combined with heads)"
msgstr ""
-#: builtin/repack.c:188
-msgid "with -A, do not loosen objects older than this"
+#: builtin/show-ref.c:162
+msgid "only show heads (can be combined with tags)"
msgstr ""
-#: builtin/repack.c:190
-msgid "with -a, repack unreachable objects"
+#: builtin/show-ref.c:163
+msgid "stricter reference checking, requires exact ref path"
msgstr ""
-#: builtin/repack.c:192
-msgid "size of the window used for delta compression"
+#: builtin/show-ref.c:166 builtin/show-ref.c:168
+msgid "show the HEAD reference, even if it would be filtered out"
msgstr ""
-#: builtin/repack.c:193 builtin/repack.c:199
-msgid "bytes"
+#: builtin/show-ref.c:170
+msgid "dereference tags into object IDs"
msgstr ""
-#: builtin/repack.c:194
-msgid "same as the above, but limit memory size instead of entries count"
+#: builtin/show-ref.c:172
+msgid "only show SHA1 hash using <n> digits"
msgstr ""
-#: builtin/repack.c:196
-msgid "limits the maximum delta depth"
+#: builtin/show-ref.c:176
+msgid "do not print results to stdout (useful with --verify)"
msgstr ""
-#: builtin/repack.c:198
-msgid "limits the maximum number of threads"
+#: builtin/show-ref.c:178
+msgid "show refs from stdin that aren't in local repository"
msgstr ""
-#: builtin/repack.c:200
-msgid "maximum size of each packfile"
+#: builtin/stripspace.c:18
+msgid "git stripspace [-s | --strip-comments]"
msgstr ""
-#: builtin/repack.c:202
-msgid "repack objects in packs marked with .keep"
+#: builtin/stripspace.c:19
+msgid "git stripspace [-c | --comment-lines]"
msgstr ""
-#: builtin/repack.c:212
-msgid "cannot delete packs in a precious-objects repo"
+#: builtin/stripspace.c:37
+msgid "skip and remove all lines starting with comment character"
msgstr ""
-#: builtin/repack.c:216
-msgid "--keep-unreachable and -A are incompatible"
+#: builtin/stripspace.c:40
+msgid "prepend comment character and space to each line"
msgstr ""
-#: builtin/repack.c:410 builtin/worktree.c:148
+#: builtin/submodule--helper.c:45 builtin/submodule--helper.c:1943
#, c-format
-msgid "failed to remove '%s'"
+msgid "Expecting a full ref name, got %s"
msgstr ""
-#: builtin/replace.c:20
-msgid "git replace [-f] <object> <replacement>"
+#: builtin/submodule--helper.c:62
+msgid "submodule--helper print-default-remote takes no arguments"
msgstr ""
-#: builtin/replace.c:21
-msgid "git replace [-f] --edit <object>"
+#: builtin/submodule--helper.c:100
+#, c-format
+msgid "cannot strip one component off url '%s'"
msgstr ""
-#: builtin/replace.c:22
-msgid "git replace [-f] --graft <commit> [<parent>...]"
+#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1367
+msgid "alternative anchor for relative paths"
msgstr ""
-#: builtin/replace.c:23
-msgid "git replace -d <object>..."
+#: builtin/submodule--helper.c:413
+msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr ""
-#: builtin/replace.c:24
-msgid "git replace [--format=<format>] [-l [<pattern>]]"
+#: 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/replace.c:331 builtin/replace.c:369 builtin/replace.c:397
+#: builtin/submodule--helper.c:522
#, c-format
-msgid "Not a valid object name: '%s'"
+msgid "Entering '%s'\n"
msgstr ""
-#: builtin/replace.c:361
+#: builtin/submodule--helper.c:525
#, c-format
-msgid "bad mergetag in commit '%s'"
+msgid ""
+"run_command returned non-zero status for %s\n"
+"."
msgstr ""
-#: builtin/replace.c:363
+#: builtin/submodule--helper.c:546
#, c-format
-msgid "malformed mergetag in commit '%s'"
+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/replace.c:374
+#: builtin/submodule--helper.c:596
#, c-format
msgid ""
-"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
-"instead of --graft"
+"could not look up configuration '%s'. Assuming this repository is its own "
+"authoritative upstream."
msgstr ""
-#: builtin/replace.c:407
+#: builtin/submodule--helper.c:664
#, c-format
-msgid "the original commit '%s' has a gpg signature."
+msgid "Failed to register url for submodule path '%s'"
msgstr ""
-#: builtin/replace.c:408
-msgid "the signature will be removed in the replacement commit!"
+#: builtin/submodule--helper.c:668
+#, c-format
+msgid "Submodule '%s' (%s) registered for path '%s'\n"
msgstr ""
-#: builtin/replace.c:414
+#: builtin/submodule--helper.c:678
#, c-format
-msgid "could not write replacement commit for: '%s'"
+msgid "warning: command update mode suggested for submodule '%s'\n"
msgstr ""
-#: builtin/replace.c:438
-msgid "list replace refs"
+#: builtin/submodule--helper.c:685
+#, c-format
+msgid "Failed to register update mode for submodule path '%s'"
msgstr ""
-#: builtin/replace.c:439
-msgid "delete replace refs"
+#: builtin/submodule--helper.c:707
+msgid "Suppress output for initializing a submodule"
msgstr ""
-#: builtin/replace.c:440
-msgid "edit existing object"
+#: builtin/submodule--helper.c:712
+msgid "git submodule--helper init [<path>]"
msgstr ""
-#: builtin/replace.c:441
-msgid "change a commit's parents"
+#: builtin/submodule--helper.c:784 builtin/submodule--helper.c:910
+#, c-format
+msgid "no submodule mapping found in .gitmodules for path '%s'"
msgstr ""
-#: builtin/replace.c:442
-msgid "replace the ref if it exists"
+#: builtin/submodule--helper.c:823
+#, c-format
+msgid "could not resolve HEAD ref inside the submodule '%s'"
msgstr ""
-#: builtin/replace.c:444
-msgid "do not pretty-print contents for --edit"
+#: builtin/submodule--helper.c:850 builtin/submodule--helper.c:1019
+#, c-format
+msgid "failed to recurse into submodule '%s'"
msgstr ""
-#: builtin/replace.c:445
-msgid "use this format"
+#: builtin/submodule--helper.c:874 builtin/submodule--helper.c:1185
+msgid "Suppress submodule status output"
msgstr ""
-#: builtin/rerere.c:13
-msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
+#: builtin/submodule--helper.c:875
+msgid ""
+"Use commit stored in the index instead of the one stored in the submodule "
+"HEAD"
msgstr ""
-#: builtin/rerere.c:59
-msgid "register clean resolutions in index"
+#: builtin/submodule--helper.c:876
+msgid "recurse into nested submodules"
msgstr ""
-#: builtin/reset.c:29
-msgid ""
-"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
+#: builtin/submodule--helper.c:881
+msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
msgstr ""
-#: builtin/reset.c:30
-msgid "git reset [-q] [<tree-ish>] [--] <paths>..."
+#: builtin/submodule--helper.c:905
+msgid "git submodule--helper name <path>"
msgstr ""
-#: builtin/reset.c:31
-msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
+#: builtin/submodule--helper.c:969
+#, c-format
+msgid "Synchronizing submodule url for '%s'\n"
msgstr ""
-#: builtin/reset.c:37
-msgid "mixed"
+#: builtin/submodule--helper.c:975
+#, c-format
+msgid "failed to register url for submodule path '%s'"
msgstr ""
-#: builtin/reset.c:37
-msgid "soft"
+#: builtin/submodule--helper.c:989
+#, c-format
+msgid "failed to get the default remote for submodule '%s'"
msgstr ""
-#: builtin/reset.c:37
-msgid "hard"
+#: builtin/submodule--helper.c:1000
+#, c-format
+msgid "failed to update remote for submodule '%s'"
msgstr ""
-#: builtin/reset.c:37
-msgid "merge"
+#: builtin/submodule--helper.c:1047
+msgid "Suppress output of synchronizing submodule url"
msgstr ""
-#: builtin/reset.c:37
-msgid "keep"
+#: builtin/submodule--helper.c:1054
+msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
msgstr ""
-#: builtin/reset.c:78
-msgid "You do not have a valid HEAD."
+#: 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/reset.c:80
-msgid "Failed to find tree of HEAD."
+#: builtin/submodule--helper.c:1120
+#, c-format
+msgid ""
+"Submodule work tree '%s' contains local modifications; use '-f' to discard "
+"them"
msgstr ""
-#: builtin/reset.c:86
+#: builtin/submodule--helper.c:1128
#, c-format
-msgid "Failed to find tree of %s."
+msgid "Cleared directory '%s'\n"
msgstr ""
-#: builtin/reset.c:111
+#: builtin/submodule--helper.c:1130
#, c-format
-msgid "HEAD is now at %s"
+msgid "Could not remove submodule work tree '%s'\n"
msgstr ""
-#: builtin/reset.c:189
+#: builtin/submodule--helper.c:1141
#, c-format
-msgid "Cannot do a %s reset in the middle of a merge."
+msgid "could not create empty submodule directory %s"
msgstr ""
-#: builtin/reset.c:289
-msgid "be quiet, only report errors"
+#: builtin/submodule--helper.c:1157
+#, c-format
+msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
msgstr ""
-#: builtin/reset.c:291
-msgid "reset HEAD and index"
+#: builtin/submodule--helper.c:1186
+msgid "Remove submodule working trees even if they contain local changes"
msgstr ""
-#: builtin/reset.c:292
-msgid "reset only HEAD"
+#: builtin/submodule--helper.c:1187
+msgid "Unregister all submodules"
msgstr ""
-#: builtin/reset.c:294 builtin/reset.c:296
-msgid "reset HEAD, index and working tree"
+#: builtin/submodule--helper.c:1192
+msgid ""
+"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
msgstr ""
-#: builtin/reset.c:298
-msgid "reset HEAD but keep local changes"
+#: builtin/submodule--helper.c:1206
+msgid "Use '--all' if you really want to deinitialize all submodules"
msgstr ""
-#: builtin/reset.c:304
-msgid "record only the fact that removed paths will be added later"
+#: builtin/submodule--helper.c:1301 builtin/submodule--helper.c:1304
+#, c-format
+msgid "submodule '%s' cannot add alternate: %s"
msgstr ""
-#: builtin/reset.c:321
+#: builtin/submodule--helper.c:1340
#, c-format
-msgid "Failed to resolve '%s' as a valid revision."
+msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
msgstr ""
-#: builtin/reset.c:329
+#: builtin/submodule--helper.c:1347
#, c-format
-msgid "Failed to resolve '%s' as a valid tree."
+msgid "Value '%s' for submodule.alternateLocation is not recognized"
msgstr ""
-#: builtin/reset.c:338
-msgid "--patch is incompatible with --{hard,mixed,soft}"
+#: builtin/submodule--helper.c:1370
+msgid "where the new submodule will be cloned to"
msgstr ""
-#: builtin/reset.c:347
-msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
+#: builtin/submodule--helper.c:1373
+msgid "name of the new submodule"
msgstr ""
-#: builtin/reset.c:349
-#, c-format
-msgid "Cannot do %s reset with paths."
+#: builtin/submodule--helper.c:1376
+msgid "url where to clone the submodule from"
msgstr ""
-#: builtin/reset.c:359
-#, c-format
-msgid "%s reset is not allowed in a bare repository"
+#: builtin/submodule--helper.c:1384
+msgid "depth for shallow clones"
msgstr ""
-#: builtin/reset.c:363
-msgid "-N can only be used with --mixed"
+#: builtin/submodule--helper.c:1387 builtin/submodule--helper.c:1872
+msgid "force cloning progress"
msgstr ""
-#: builtin/reset.c:380
-msgid "Unstaged changes after reset:"
+#: 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/reset.c:386
+#: builtin/submodule--helper.c:1423
#, c-format
-msgid "Could not reset index file to revision '%s'."
+msgid "clone of '%s' into submodule path '%s' failed"
msgstr ""
-#: builtin/reset.c:390
-msgid "Could not write new index file."
+#: builtin/submodule--helper.c:1437
+#, c-format
+msgid "could not get submodule directory for '%s'"
msgstr ""
-#: builtin/rev-list.c:397
-msgid "cannot combine --exclude-promisor-objects and --missing"
+#: builtin/submodule--helper.c:1473
+#, c-format
+msgid "Invalid update mode '%s' for submodule path '%s'"
msgstr ""
-#: builtin/rev-list.c:455
-msgid "object filtering requires --objects"
+#: builtin/submodule--helper.c:1477
+#, c-format
+msgid "Invalid update mode '%s' configured for submodule path '%s'"
msgstr ""
-#: builtin/rev-list.c:458
+#: builtin/submodule--helper.c:1570
#, c-format
-msgid "invalid sparse value '%s'"
+msgid "Submodule path '%s' not initialized"
msgstr ""
-#: builtin/rev-list.c:499
-msgid "rev-list does not support display of notes"
+#: builtin/submodule--helper.c:1574
+msgid "Maybe you want to use 'update --init'?"
msgstr ""
-#: builtin/rev-list.c:502
-msgid "cannot combine --use-bitmap-index with object filtering"
+#: builtin/submodule--helper.c:1604
+#, c-format
+msgid "Skipping unmerged submodule %s"
msgstr ""
-#: builtin/rev-parse.c:402
-msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
+#: builtin/submodule--helper.c:1633
+#, c-format
+msgid "Skipping submodule '%s'"
msgstr ""
-#: builtin/rev-parse.c:407
-msgid "keep the `--` passed as an arg"
+#: builtin/submodule--helper.c:1777
+#, c-format
+msgid "Failed to clone '%s'. Retry scheduled"
msgstr ""
-#: builtin/rev-parse.c:409
-msgid "stop parsing after the first non-option argument"
+#: builtin/submodule--helper.c:1788
+#, c-format
+msgid "Failed to clone '%s' a second time, aborting"
msgstr ""
-#: builtin/rev-parse.c:412
-msgid "output in stuck long form"
+#: builtin/submodule--helper.c:1851 builtin/submodule--helper.c:2093
+msgid "path into the working tree"
msgstr ""
-#: 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/submodule--helper.c:1854
+msgid "path into the working tree, across nested submodule boundaries"
msgstr ""
-#: builtin/revert.c:23
-msgid "git revert [<options>] <commit-ish>..."
+#: builtin/submodule--helper.c:1858
+msgid "rebase, merge, checkout or none"
msgstr ""
-#: builtin/revert.c:24
-msgid "git revert <subcommand>"
+#: builtin/submodule--helper.c:1864
+msgid "Create a shallow clone truncated to the specified number of revisions"
msgstr ""
-#: builtin/revert.c:29
-msgid "git cherry-pick [<options>] <commit-ish>..."
+#: builtin/submodule--helper.c:1867
+msgid "parallel jobs"
msgstr ""
-#: builtin/revert.c:30
-msgid "git cherry-pick <subcommand>"
+#: builtin/submodule--helper.c:1869
+msgid "whether the initial clone should follow the shallow recommendation"
msgstr ""
-#: builtin/revert.c:90
-#, c-format
-msgid "%s: %s cannot be used with %s"
+#: builtin/submodule--helper.c:1870
+msgid "don't print cloning progress"
msgstr ""
-#: builtin/revert.c:99
-msgid "end revert or cherry-pick sequence"
+#: builtin/submodule--helper.c:1877
+msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
msgstr ""
-#: builtin/revert.c:100
-msgid "resume revert or cherry-pick sequence"
+#: builtin/submodule--helper.c:1890
+msgid "bad value for update parameter"
msgstr ""
-#: builtin/revert.c:101
-msgid "cancel revert or cherry-pick sequence"
+#: builtin/submodule--helper.c:1938
+#, c-format
+msgid ""
+"Submodule (%s) branch configured to inherit branch from superproject, but "
+"the superproject is not on any branch"
msgstr ""
-#: builtin/revert.c:102
-msgid "don't automatically commit"
+#: builtin/submodule--helper.c:2061
+#, c-format
+msgid "could not get a repository handle for submodule '%s'"
msgstr ""
-#: builtin/revert.c:103
-msgid "edit the commit message"
+#: builtin/submodule--helper.c:2094
+msgid "recurse into submodules"
msgstr ""
-#: builtin/revert.c:106
-msgid "parent-number"
+#: builtin/submodule--helper.c:2100
+msgid "git submodule--helper embed-git-dir [<path>...]"
msgstr ""
-#: builtin/revert.c:107
-msgid "select mainline parent"
+#: builtin/submodule--helper.c:2156
+msgid "check if it is safe to write to the .gitmodules file"
msgstr ""
-#: builtin/revert.c:109
-msgid "merge strategy"
+#: builtin/submodule--helper.c:2161
+msgid "git submodule--helper config name [value]"
msgstr ""
-#: builtin/revert.c:110
-msgid "option"
+#: builtin/submodule--helper.c:2162
+msgid "git submodule--helper config --check-writeable"
msgstr ""
-#: builtin/revert.c:111
-msgid "option for merge strategy"
+#: builtin/submodule--helper.c:2179 git-submodule.sh:169
+#, sh-format
+msgid "please make sure that the .gitmodules file is in the working tree"
msgstr ""
-#: builtin/revert.c:120
-msgid "append commit name"
+#: builtin/submodule--helper.c:2229 git.c:413 git.c:658
+#, c-format
+msgid "%s doesn't support --super-prefix"
msgstr ""
-#: builtin/revert.c:122
-msgid "preserve initially empty commits"
+#: builtin/submodule--helper.c:2235
+#, c-format
+msgid "'%s' is not a valid submodule--helper subcommand"
msgstr ""
-#: builtin/revert.c:124
-msgid "keep redundant, empty commits"
+#: builtin/symbolic-ref.c:8
+msgid "git symbolic-ref [<options>] <name> [<ref>]"
msgstr ""
-#: builtin/revert.c:214
-msgid "revert failed"
+#: builtin/symbolic-ref.c:9
+msgid "git symbolic-ref -d [-q] <name>"
msgstr ""
-#: builtin/revert.c:227
-msgid "cherry-pick failed"
+#: builtin/symbolic-ref.c:40
+msgid "suppress error message for non-symbolic (detached) refs"
msgstr ""
-#: builtin/rm.c:18
-msgid "git rm [<options>] [--] <file>..."
+#: builtin/symbolic-ref.c:41
+msgid "delete symbolic ref"
msgstr ""
-#: builtin/rm.c:206
-msgid ""
-"the following file has staged content different from both the\n"
-"file and the HEAD:"
-msgid_plural ""
-"the following files have staged content different from both the\n"
-"file and the HEAD:"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/rm.c:211
-msgid ""
-"\n"
-"(use -f to force removal)"
+#: builtin/symbolic-ref.c:42
+msgid "shorten ref output"
msgstr ""
-#: builtin/rm.c:215
-msgid "the following file has changes staged in the index:"
-msgid_plural "the following files have changes staged in the index:"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/rm.c:219 builtin/rm.c:228
-msgid ""
-"\n"
-"(use --cached to keep the file, or -f to force removal)"
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363
+msgid "reason"
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/rm.c:243
-msgid "do not list removed files"
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363
+msgid "reason of the update"
msgstr ""
-#: builtin/rm.c:244
-msgid "only remove from the index"
+#: builtin/tag.c:25
+msgid ""
+"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
+"[<head>]"
msgstr ""
-#: builtin/rm.c:245
-msgid "override the up-to-date check"
+#: builtin/tag.c:26
+msgid "git tag -d <tagname>..."
msgstr ""
-#: builtin/rm.c:246
-msgid "allow recursive removal"
+#: builtin/tag.c:27
+msgid ""
+"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
+"points-at <object>]\n"
+"\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]"
msgstr ""
-#: builtin/rm.c:248
-msgid "exit with a zero status even if nothing matched"
+#: builtin/tag.c:29
+msgid "git tag -v [--format=<format>] <tagname>..."
msgstr ""
-#: builtin/rm.c:307
+#: builtin/tag.c:87
#, c-format
-msgid "not removing '%s' recursively without -r"
+msgid "tag '%s' not found."
msgstr ""
-#: builtin/rm.c:346
+#: builtin/tag.c:103
#, c-format
-msgid "git rm: unable to remove %s"
+msgid "Deleted tag '%s' (was %s)\n"
msgstr ""
-#: builtin/rm.c:369
+#: builtin/tag.c:133
#, c-format
-msgid "could not remove '%s'"
+msgid ""
+"\n"
+"Write a message for tag:\n"
+" %s\n"
+"Lines starting with '%c' will be ignored.\n"
msgstr ""
-#: builtin/send-pack.c:19
+#: builtin/tag.c:137
+#, c-format
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."
+"\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/send-pack.c:162
-msgid "remote name"
+#: builtin/tag.c:191
+msgid "unable to sign the tag"
msgstr ""
-#: builtin/send-pack.c:176
-msgid "use stateless RPC protocol"
+#: builtin/tag.c:193
+msgid "unable to write tag file"
msgstr ""
-#: builtin/send-pack.c:177
-msgid "read refs from stdin"
+#: builtin/tag.c:218
+msgid "bad object type."
msgstr ""
-#: builtin/send-pack.c:178
-msgid "print status from remote helper"
+#: builtin/tag.c:267
+msgid "no tag message?"
msgstr ""
-#: builtin/shortlog.c:14
-msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
+#: builtin/tag.c:274
+#, c-format
+msgid "The tag message has been left in %s\n"
msgstr ""
-#: builtin/shortlog.c:263
-msgid "Group by committer rather than author"
+#: builtin/tag.c:385
+msgid "list tag names"
msgstr ""
-#: builtin/shortlog.c:265
-msgid "sort output according to the number of commits per author"
+#: builtin/tag.c:387
+msgid "print <n> lines of each tag message"
msgstr ""
-#: builtin/shortlog.c:267
-msgid "Suppress commit descriptions, only provides commit count"
+#: builtin/tag.c:389
+msgid "delete tags"
msgstr ""
-#: builtin/shortlog.c:269
-msgid "Show the email address of each author"
+#: builtin/tag.c:390
+msgid "verify tags"
msgstr ""
-#: builtin/shortlog.c:270
-msgid "w[,i1[,i2]]"
+#: builtin/tag.c:392
+msgid "Tag creation options"
msgstr ""
-#: builtin/shortlog.c:271
-msgid "Linewrap output"
+#: builtin/tag.c:394
+msgid "annotated tag, needs a message"
msgstr ""
-#: builtin/show-branch.c:12
-msgid ""
-"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
-"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
-"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
-"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
+#: builtin/tag.c:396
+msgid "tag message"
msgstr ""
-#: builtin/show-branch.c:16
-msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
+#: builtin/tag.c:398
+msgid "force edit of tag message"
msgstr ""
-#: builtin/show-branch.c:376
-#, c-format
-msgid "ignoring %s; cannot handle more than %d ref"
-msgid_plural "ignoring %s; cannot handle more than %d refs"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/show-branch.c:530
-#, c-format
-msgid "no matching refs with %s"
+#: builtin/tag.c:399
+msgid "annotated and GPG-signed tag"
msgstr ""
-#: builtin/show-branch.c:626
-msgid "show remote-tracking and local branches"
+#: builtin/tag.c:403
+msgid "use another key to sign the tag"
msgstr ""
-#: builtin/show-branch.c:628
-msgid "show remote-tracking branches"
+#: builtin/tag.c:404
+msgid "replace the tag if exists"
msgstr ""
-#: builtin/show-branch.c:630
-msgid "color '*!+-' corresponding to the branch"
+#: builtin/tag.c:405 builtin/update-ref.c:369
+msgid "create a reflog"
msgstr ""
-#: builtin/show-branch.c:632
-msgid "show <n> more commits after the common ancestor"
+#: builtin/tag.c:407
+msgid "Tag listing options"
msgstr ""
-#: builtin/show-branch.c:634
-msgid "synonym to more=-1"
+#: builtin/tag.c:408
+msgid "show tag list in columns"
msgstr ""
-#: builtin/show-branch.c:635
-msgid "suppress naming strings"
+#: builtin/tag.c:409 builtin/tag.c:411
+msgid "print only tags that contain the commit"
msgstr ""
-#: builtin/show-branch.c:637
-msgid "include the current branch"
+#: builtin/tag.c:410 builtin/tag.c:412
+msgid "print only tags that don't contain the commit"
msgstr ""
-#: builtin/show-branch.c:639
-msgid "name commits with their object names"
+#: builtin/tag.c:413
+msgid "print only tags that are merged"
msgstr ""
-#: builtin/show-branch.c:641
-msgid "show possible merge bases"
+#: builtin/tag.c:414
+msgid "print only tags that are not merged"
msgstr ""
-#: builtin/show-branch.c:643
-msgid "show refs unreachable from any other ref"
+#: builtin/tag.c:419
+msgid "print only tags of the object"
msgstr ""
-#: builtin/show-branch.c:645
-msgid "show commits in topological order"
+#: builtin/tag.c:463
+msgid "--column and -n are incompatible"
msgstr ""
-#: builtin/show-branch.c:648
-msgid "show only commits not on the first branch"
+#: builtin/tag.c:485
+msgid "-n option is only allowed in list mode"
msgstr ""
-#: builtin/show-branch.c:650
-msgid "show merges reachable from only one tip"
+#: builtin/tag.c:487
+msgid "--contains option is only allowed in list mode"
msgstr ""
-#: builtin/show-branch.c:652
-msgid "topologically sort, maintaining date order where possible"
+#: builtin/tag.c:489
+msgid "--no-contains option is only allowed in list mode"
msgstr ""
-#: builtin/show-branch.c:655
-msgid "<n>[,<base>]"
+#: builtin/tag.c:491
+msgid "--points-at option is only allowed in list mode"
msgstr ""
-#: builtin/show-branch.c:656
-msgid "show <n> most recent ref-log entries starting at base"
+#: builtin/tag.c:493
+msgid "--merged and --no-merged options are only allowed in list mode"
msgstr ""
-#: builtin/show-branch.c:690
-msgid ""
-"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
+#: builtin/tag.c:504
+msgid "only one -F or -m option is allowed."
msgstr ""
-#: builtin/show-branch.c:714
-msgid "no branches given, and HEAD is not valid"
+#: builtin/tag.c:523
+msgid "too many params"
msgstr ""
-#: builtin/show-branch.c:717
-msgid "--reflog option needs one branch name"
+#: builtin/tag.c:529
+#, c-format
+msgid "'%s' is not a valid tag name."
msgstr ""
-#: builtin/show-branch.c:720
+#: builtin/tag.c:534
#, 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] ""
+msgid "tag '%s' already exists"
+msgstr ""
-#: builtin/show-branch.c:724
+#: builtin/tag.c:565
#, c-format
-msgid "no such ref %s"
+msgid "Updated tag '%s' (was %s)\n"
msgstr ""
-#: builtin/show-branch.c:808
+#: builtin/unpack-objects.c:500
+msgid "Unpacking objects"
+msgstr ""
+
+#: builtin/update-index.c:83
#, c-format
-msgid "cannot handle more than %d rev."
-msgid_plural "cannot handle more than %d revs."
-msgstr[0] ""
-msgstr[1] ""
+msgid "failed to create directory %s"
+msgstr ""
-#: builtin/show-branch.c:812
+#: builtin/update-index.c:99
#, c-format
-msgid "'%s' is not a valid ref."
+msgid "failed to create file %s"
msgstr ""
-#: builtin/show-branch.c:815
+#: builtin/update-index.c:107
#, c-format
-msgid "cannot find commit %s (%s)"
+msgid "failed to delete file %s"
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/update-index.c:114 builtin/update-index.c:220
+#, c-format
+msgid "failed to delete directory %s"
msgstr ""
-#: builtin/show-ref.c:11
-msgid "git show-ref --exclude-existing[=<pattern>]"
+#: builtin/update-index.c:139
+#, c-format
+msgid "Testing mtime in '%s' "
msgstr ""
-#: builtin/show-ref.c:159
-msgid "only show tags (can be combined with heads)"
+#: builtin/update-index.c:153
+msgid "directory stat info does not change after adding a new file"
msgstr ""
-#: builtin/show-ref.c:160
-msgid "only show heads (can be combined with tags)"
+#: builtin/update-index.c:166
+msgid "directory stat info does not change after adding a new directory"
msgstr ""
-#: builtin/show-ref.c:161
-msgid "stricter reference checking, requires exact ref path"
+#: builtin/update-index.c:179
+msgid "directory stat info changes after updating a file"
msgstr ""
-#: builtin/show-ref.c:164 builtin/show-ref.c:166
-msgid "show the HEAD reference, even if it would be filtered out"
+#: builtin/update-index.c:190
+msgid "directory stat info changes after adding a file inside subdirectory"
msgstr ""
-#: builtin/show-ref.c:168
-msgid "dereference tags into object IDs"
+#: builtin/update-index.c:201
+msgid "directory stat info does not change after deleting a file"
msgstr ""
-#: builtin/show-ref.c:170
-msgid "only show SHA1 hash using <n> digits"
+#: builtin/update-index.c:214
+msgid "directory stat info does not change after deleting a directory"
msgstr ""
-#: builtin/show-ref.c:174
-msgid "do not print results to stdout (useful with --verify)"
+#: builtin/update-index.c:221
+msgid " OK"
msgstr ""
-#: builtin/show-ref.c:176
-msgid "show refs from stdin that aren't in local repository"
+#: builtin/update-index.c:589
+msgid "git update-index [<options>] [--] [<file>...]"
msgstr ""
-#: builtin/stripspace.c:18
-msgid "git stripspace [-s | --strip-comments]"
+#: builtin/update-index.c:962
+msgid "continue refresh even when index needs update"
msgstr ""
-#: builtin/stripspace.c:19
-msgid "git stripspace [-c | --comment-lines]"
+#: builtin/update-index.c:965
+msgid "refresh: ignore submodules"
msgstr ""
-#: builtin/stripspace.c:36
-msgid "skip and remove all lines starting with comment character"
+#: builtin/update-index.c:968
+msgid "do not ignore new files"
msgstr ""
-#: builtin/stripspace.c:39
-msgid "prepend comment character and space to each line"
+#: builtin/update-index.c:970
+msgid "let files replace directories and vice-versa"
msgstr ""
-#: builtin/submodule--helper.c:35 builtin/submodule--helper.c:1669
-#, c-format
-msgid "No such ref: %s"
+#: builtin/update-index.c:972
+msgid "notice files missing from worktree"
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:974
+msgid "refresh even if index contains unmerged entries"
msgstr ""
-#: builtin/submodule--helper.c:59
-msgid "submodule--helper print-default-remote takes no arguments"
+#: builtin/update-index.c:977
+msgid "refresh stat information"
msgstr ""
-#: builtin/submodule--helper.c:96
-#, c-format
-msgid "cannot strip one component off url '%s'"
+#: builtin/update-index.c:981
+msgid "like --refresh, but ignore assume-unchanged setting"
msgstr ""
-#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1198
-msgid "alternative anchor for relative paths"
+#: builtin/update-index.c:985
+msgid "<mode>,<object>,<path>"
msgstr ""
-#: builtin/submodule--helper.c:409
-msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
+#: builtin/update-index.c:986
+msgid "add the specified entry to the index"
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:995
+msgid "mark files as \"not changing\""
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:998
+msgid "clear assumed-unchanged bit"
msgstr ""
-#: builtin/submodule--helper.c:509
-#, c-format
-msgid "Failed to register url for submodule path '%s'"
+#: builtin/update-index.c:1001
+msgid "mark files as \"index-only\""
msgstr ""
-#: builtin/submodule--helper.c:513
-#, c-format
-msgid "Submodule '%s' (%s) registered for path '%s'\n"
+#: builtin/update-index.c:1004
+msgid "clear skip-worktree bit"
msgstr ""
-#: builtin/submodule--helper.c:523
-#, c-format
-msgid "warning: command update mode suggested for submodule '%s'\n"
+#: builtin/update-index.c:1007
+msgid "add to index only; do not add content to object database"
msgstr ""
-#: builtin/submodule--helper.c:530
-#, c-format
-msgid "Failed to register update mode for submodule path '%s'"
+#: builtin/update-index.c:1009
+msgid "remove named paths even if present in worktree"
msgstr ""
-#: builtin/submodule--helper.c:552
-msgid "Suppress output for initializing a submodule"
+#: builtin/update-index.c:1011
+msgid "with --stdin: input lines are terminated by null bytes"
msgstr ""
-#: builtin/submodule--helper.c:557
-msgid "git submodule--helper init [<path>]"
+#: builtin/update-index.c:1013
+msgid "read list of paths to be updated from standard input"
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:1017
+msgid "add entries from standard input to the index"
msgstr ""
-#: builtin/submodule--helper.c:660
-#, c-format
-msgid "could not resolve HEAD ref inside the submodule '%s'"
+#: builtin/update-index.c:1021
+msgid "repopulate stages #2 and #3 for the listed paths"
msgstr ""
-#: builtin/submodule--helper.c:687 builtin/submodule--helper.c:856
-#, c-format
-msgid "failed to recurse into submodule '%s'"
+#: builtin/update-index.c:1025
+msgid "only update entries that differ from HEAD"
msgstr ""
-#: builtin/submodule--helper.c:711 builtin/submodule--helper.c:1021
-msgid "Suppress submodule status output"
+#: builtin/update-index.c:1029
+msgid "ignore files missing from worktree"
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:1032
+msgid "report actions to standard output"
msgstr ""
-#: builtin/submodule--helper.c:713
-msgid "recurse into nested submodules"
+#: builtin/update-index.c:1034
+msgid "(for porcelains) forget saved unresolved conflicts"
msgstr ""
-#: builtin/submodule--helper.c:718
-msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
+#: builtin/update-index.c:1038
+msgid "write index in this format"
msgstr ""
-#: builtin/submodule--helper.c:742
-msgid "git submodule--helper name <path>"
+#: builtin/update-index.c:1040
+msgid "enable or disable split index"
msgstr ""
-#: builtin/submodule--helper.c:806
-#, c-format
-msgid "Synchronizing submodule url for '%s'\n"
+#: builtin/update-index.c:1042
+msgid "enable/disable untracked cache"
msgstr ""
-#: builtin/submodule--helper.c:812
-#, c-format
-msgid "failed to register url for submodule path '%s'"
+#: builtin/update-index.c:1044
+msgid "test if the filesystem supports untracked cache"
msgstr ""
-#: builtin/submodule--helper.c:826
-#, c-format
-msgid "failed to get the default remote for submodule '%s'"
+#: builtin/update-index.c:1046
+msgid "enable untracked cache without testing the filesystem"
msgstr ""
-#: builtin/submodule--helper.c:837
-#, c-format
-msgid "failed to update remote for submodule '%s'"
+#: builtin/update-index.c:1048
+msgid "write out the index even if is not flagged as changed"
msgstr ""
-#: builtin/submodule--helper.c:885
-msgid "Suppress output of synchronizing submodule url"
+#: builtin/update-index.c:1050
+msgid "enable or disable file system monitor"
msgstr ""
-#: builtin/submodule--helper.c:887
-msgid "Recurse into nested submodules"
+#: builtin/update-index.c:1052
+msgid "mark files as fsmonitor valid"
msgstr ""
-#: builtin/submodule--helper.c:892
-msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
+#: builtin/update-index.c:1055
+msgid "clear fsmonitor valid bit"
msgstr ""
-#: builtin/submodule--helper.c:946
-#, c-format
+#: builtin/update-index.c:1156
msgid ""
-"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
-"really want to remove it including all of its history)"
+"core.splitIndex is set to false; remove or change it, if you really want to "
+"enable split index"
msgstr ""
-#: builtin/submodule--helper.c:958
-#, c-format
+#: builtin/update-index.c:1165
msgid ""
-"Submodule work tree '%s' contains local modifications; use '-f' to discard "
-"them"
+"core.splitIndex is set to true; remove or change it, if you really want to "
+"disable split index"
msgstr ""
-#: builtin/submodule--helper.c:966
-#, c-format
-msgid "Cleared directory '%s'\n"
+#: builtin/update-index.c:1176
+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:968
-#, c-format
-msgid "Could not remove submodule work tree '%s'\n"
+#: builtin/update-index.c:1180
+msgid "Untracked cache disabled"
msgstr ""
-#: builtin/submodule--helper.c:977
-#, c-format
-msgid "could not create empty submodule directory %s"
+#: builtin/update-index.c:1188
+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:993
+#: builtin/update-index.c:1192
#, c-format
-msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
+msgid "Untracked cache enabled for '%s'"
msgstr ""
-#: builtin/submodule--helper.c:1022
-msgid "Remove submodule working trees even if they contain local changes"
+#: builtin/update-index.c:1200
+msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
msgstr ""
-#: builtin/submodule--helper.c:1023
-msgid "Unregister all submodules"
+#: builtin/update-index.c:1204
+msgid "fsmonitor enabled"
msgstr ""
-#: builtin/submodule--helper.c:1028
+#: builtin/update-index.c:1207
msgid ""
-"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
+"core.fsmonitor is set; remove it if you really want to disable fsmonitor"
msgstr ""
-#: builtin/submodule--helper.c:1042
-msgid "Use '--all' if you really want to deinitialize all submodules"
+#: builtin/update-index.c:1211
+msgid "fsmonitor disabled"
msgstr ""
-#: builtin/submodule--helper.c:1133 builtin/submodule--helper.c:1136
-#, c-format
-msgid "submodule '%s' cannot add alternate: %s"
+#: builtin/update-ref.c:10
+msgid "git update-ref [<options>] -d <refname> [<old-val>]"
msgstr ""
-#: builtin/submodule--helper.c:1172
-#, c-format
-msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
+#: builtin/update-ref.c:11
+msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]"
msgstr ""
-#: builtin/submodule--helper.c:1179
-#, c-format
-msgid "Value '%s' for submodule.alternateLocation is not recognized"
+#: builtin/update-ref.c:12
+msgid "git update-ref [<options>] --stdin [-z]"
msgstr ""
-#: builtin/submodule--helper.c:1201
-msgid "where the new submodule will be cloned to"
+#: builtin/update-ref.c:364
+msgid "delete the reference"
msgstr ""
-#: builtin/submodule--helper.c:1204
-msgid "name of the new submodule"
+#: builtin/update-ref.c:366
+msgid "update <refname> not the one it points to"
msgstr ""
-#: builtin/submodule--helper.c:1207
-msgid "url where to clone the submodule from"
+#: builtin/update-ref.c:367
+msgid "stdin has NUL-terminated arguments"
msgstr ""
-#: builtin/submodule--helper.c:1213
-msgid "depth for shallow clones"
+#: builtin/update-ref.c:368
+msgid "read updates from stdin"
msgstr ""
-#: builtin/submodule--helper.c:1216 builtin/submodule--helper.c:1587
-msgid "force cloning progress"
+#: builtin/update-server-info.c:7
+msgid "git update-server-info [--force]"
msgstr ""
-#: builtin/submodule--helper.c:1221
-msgid ""
-"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
-"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
+#: builtin/update-server-info.c:15
+msgid "update the info files from scratch"
msgstr ""
-#: builtin/submodule--helper.c:1252
-#, c-format
-msgid "clone of '%s' into submodule path '%s' failed"
+#: builtin/upload-pack.c:11
+msgid "git upload-pack [<options>] <dir>"
+msgstr ""
+
+#: builtin/upload-pack.c:25
+msgid "exit immediately after initial ref advertisement"
+msgstr ""
+
+#: builtin/upload-pack.c:27
+msgid "do not try <directory>/.git/ if <directory> is no Git directory"
msgstr ""
-#: builtin/submodule--helper.c:1267
-#, c-format
-msgid "could not get submodule directory for '%s'"
+#: builtin/upload-pack.c:29
+msgid "interrupt transfer after <n> seconds of inactivity"
msgstr ""
-#: builtin/submodule--helper.c:1332
-#, c-format
-msgid "Submodule path '%s' not initialized"
+#: builtin/verify-commit.c:20
+msgid "git verify-commit [-v | --verbose] <commit>..."
msgstr ""
-#: builtin/submodule--helper.c:1336
-msgid "Maybe you want to use 'update --init'?"
+#: builtin/verify-commit.c:76
+msgid "print commit contents"
msgstr ""
-#: builtin/submodule--helper.c:1365
-#, c-format
-msgid "Skipping unmerged submodule %s"
+#: builtin/verify-commit.c:77 builtin/verify-tag.c:38
+msgid "print raw gpg status output"
msgstr ""
-#: builtin/submodule--helper.c:1394
-#, c-format
-msgid "Skipping submodule '%s'"
+#: builtin/verify-pack.c:55
+msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
msgstr ""
-#: builtin/submodule--helper.c:1527
-#, c-format
-msgid "Failed to clone '%s'. Retry scheduled"
+#: builtin/verify-pack.c:65
+msgid "verbose"
msgstr ""
-#: builtin/submodule--helper.c:1538
-#, c-format
-msgid "Failed to clone '%s' a second time, aborting"
+#: builtin/verify-pack.c:67
+msgid "show statistics only"
msgstr ""
-#: builtin/submodule--helper.c:1568 builtin/submodule--helper.c:1788
-msgid "path into the working tree"
+#: builtin/verify-tag.c:19
+msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
msgstr ""
-#: builtin/submodule--helper.c:1571
-msgid "path into the working tree, across nested submodule boundaries"
+#: builtin/verify-tag.c:37
+msgid "print tag contents"
msgstr ""
-#: builtin/submodule--helper.c:1575
-msgid "rebase, merge, checkout or none"
+#: builtin/worktree.c:18
+msgid "git worktree add [<options>] <path> [<commit-ish>]"
msgstr ""
-#: builtin/submodule--helper.c:1579
-msgid "Create a shallow clone truncated to the specified number of revisions"
+#: builtin/worktree.c:19
+msgid "git worktree list [<options>]"
msgstr ""
-#: builtin/submodule--helper.c:1582
-msgid "parallel jobs"
+#: builtin/worktree.c:20
+msgid "git worktree lock [<options>] <path>"
msgstr ""
-#: builtin/submodule--helper.c:1584
-msgid "whether the initial clone should follow the shallow recommendation"
+#: builtin/worktree.c:21
+msgid "git worktree move <worktree> <new-path>"
msgstr ""
-#: builtin/submodule--helper.c:1585
-msgid "don't print cloning progress"
+#: builtin/worktree.c:22
+msgid "git worktree prune [<options>]"
msgstr ""
-#: builtin/submodule--helper.c:1592
-msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
+#: builtin/worktree.c:23
+msgid "git worktree remove [<options>] <worktree>"
msgstr ""
-#: builtin/submodule--helper.c:1605
-msgid "bad value for update parameter"
+#: builtin/worktree.c:24
+msgid "git worktree unlock <path>"
msgstr ""
-#: builtin/submodule--helper.c:1673
+#: builtin/worktree.c:61 builtin/worktree.c:888
#, c-format
-msgid ""
-"Submodule (%s) branch configured to inherit branch from superproject, but "
-"the superproject is not on any branch"
+msgid "failed to delete '%s'"
msgstr ""
-#: builtin/submodule--helper.c:1789
-msgid "recurse into submodules"
+#: builtin/worktree.c:80
+#, c-format
+msgid "Removing worktrees/%s: not a valid directory"
msgstr ""
-#: builtin/submodule--helper.c:1795
-msgid "git submodule--helper embed-git-dir [<path>...]"
+#: builtin/worktree.c:86
+#, c-format
+msgid "Removing worktrees/%s: gitdir file does not exist"
msgstr ""
-#: builtin/submodule--helper.c:1857
+#: builtin/worktree.c:91 builtin/worktree.c:100
#, c-format
-msgid "%s doesn't support --super-prefix"
+msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
msgstr ""
-#: builtin/submodule--helper.c:1863
+#: builtin/worktree.c:110
#, c-format
-msgid "'%s' is not a valid submodule--helper subcommand"
+msgid ""
+"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
+"%<PRIuMAX>)"
msgstr ""
-#: builtin/symbolic-ref.c:8
-msgid "git symbolic-ref [<options>] <name> [<ref>]"
+#: builtin/worktree.c:118
+#, c-format
+msgid "Removing worktrees/%s: invalid gitdir file"
msgstr ""
-#: builtin/symbolic-ref.c:9
-msgid "git symbolic-ref -d [-q] <name>"
+#: builtin/worktree.c:127
+#, c-format
+msgid "Removing worktrees/%s: gitdir file points to non-existent location"
msgstr ""
-#: builtin/symbolic-ref.c:40
-msgid "suppress error message for non-symbolic (detached) refs"
+#: builtin/worktree.c:166
+msgid "report pruned working trees"
msgstr ""
-#: builtin/symbolic-ref.c:41
-msgid "delete symbolic ref"
+#: builtin/worktree.c:168
+msgid "expire working trees older than <time>"
msgstr ""
-#: builtin/symbolic-ref.c:42
-msgid "shorten ref output"
+#: builtin/worktree.c:235
+#, c-format
+msgid "'%s' already exists"
msgstr ""
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
-msgid "reason"
+#: builtin/worktree.c:252
+#, c-format
+msgid "unable to re-add worktree '%s'"
msgstr ""
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
-msgid "reason of the update"
+#: 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:24
+#: builtin/worktree.c:259
+#, c-format
msgid ""
-"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
-"[<head>]"
+"'%s' is a missing but already registered worktree;\n"
+"use 'add -f' to override, or 'prune' or 'remove' to clear"
msgstr ""
-#: builtin/tag.c:25
-msgid "git tag -d <tagname>..."
+#: builtin/worktree.c:310
+#, c-format
+msgid "could not create directory of '%s'"
msgstr ""
-#: builtin/tag.c:26
-msgid ""
-"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
-"points-at <object>]\n"
-"\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]"
+#: builtin/worktree.c:429 builtin/worktree.c:435
+#, c-format
+msgid "Preparing worktree (new branch '%s')"
msgstr ""
-#: builtin/tag.c:28
-msgid "git tag -v [--format=<format>] <tagname>..."
+#: builtin/worktree.c:431
+#, c-format
+msgid "Preparing worktree (resetting branch '%s'; was at %s)"
msgstr ""
-#: builtin/tag.c:86
+#: builtin/worktree.c:440
#, c-format
-msgid "tag '%s' not found."
+msgid "Preparing worktree (checking out '%s')"
msgstr ""
-#: builtin/tag.c:102
+#: builtin/worktree.c:446
#, c-format
-msgid "Deleted tag '%s' (was %s)\n"
+msgid "Preparing worktree (detached HEAD %s)"
msgstr ""
-#: builtin/tag.c:131
-#, c-format
-msgid ""
-"\n"
-"Write a message for tag:\n"
-" %s\n"
-"Lines starting with '%c' will be ignored.\n"
+#: builtin/worktree.c:487
+msgid "checkout <branch> even if already checked out in other worktree"
msgstr ""
-#: builtin/tag.c:135
-#, c-format
-msgid ""
-"\n"
-"Write a message for tag:\n"
-" %s\n"
-"Lines starting with '%c' will be kept; you may remove them yourself if you "
-"want to.\n"
+#: builtin/worktree.c:490
+msgid "create a new branch"
msgstr ""
-#: builtin/tag.c:189
-msgid "unable to sign the tag"
+#: builtin/worktree.c:492
+msgid "create or reset a branch"
msgstr ""
-#: builtin/tag.c:191
-msgid "unable to write tag file"
+#: builtin/worktree.c:494
+msgid "populate the new working tree"
msgstr ""
-#: builtin/tag.c:216
-msgid "bad object type."
+#: builtin/worktree.c:495
+msgid "keep the new working tree locked"
msgstr ""
-#: builtin/tag.c:265
-msgid "no tag message?"
+#: builtin/worktree.c:498
+msgid "set up tracking mode (see git-branch(1))"
msgstr ""
-#: builtin/tag.c:272
-#, c-format
-msgid "The tag message has been left in %s\n"
+#: builtin/worktree.c:501
+msgid "try to match the new branch name with a remote-tracking branch"
msgstr ""
-#: builtin/tag.c:381
-msgid "list tag names"
+#: builtin/worktree.c:509
+msgid "-b, -B, and --detach are mutually exclusive"
msgstr ""
-#: builtin/tag.c:383
-msgid "print <n> lines of each tag message"
+#: builtin/worktree.c:570
+msgid "--[no-]track can only be used if a new branch is created"
msgstr ""
-#: builtin/tag.c:385
-msgid "delete tags"
+#: builtin/worktree.c:670
+msgid "reason for locking"
msgstr ""
-#: builtin/tag.c:386
-msgid "verify tags"
+#: builtin/worktree.c:682 builtin/worktree.c:715 builtin/worktree.c:789
+#: builtin/worktree.c:916
+#, c-format
+msgid "'%s' is not a working tree"
msgstr ""
-#: builtin/tag.c:388
-msgid "Tag creation options"
+#: builtin/worktree.c:684 builtin/worktree.c:717
+msgid "The main working tree cannot be locked or unlocked"
msgstr ""
-#: builtin/tag.c:390
-msgid "annotated tag, needs a message"
+#: builtin/worktree.c:689
+#, c-format
+msgid "'%s' is already locked, reason: %s"
msgstr ""
-#: builtin/tag.c:392
-msgid "tag message"
+#: builtin/worktree.c:691
+#, c-format
+msgid "'%s' is already locked"
msgstr ""
-#: builtin/tag.c:394
-msgid "force edit of tag message"
+#: builtin/worktree.c:719
+#, c-format
+msgid "'%s' is not locked"
msgstr ""
-#: builtin/tag.c:395
-msgid "annotated and GPG-signed tag"
+#: builtin/worktree.c:760
+msgid "working trees containing submodules cannot be moved or removed"
msgstr ""
-#: builtin/tag.c:399
-msgid "use another key to sign the tag"
+#: builtin/worktree.c:768
+msgid "force move even if worktree is dirty or locked"
msgstr ""
-#: builtin/tag.c:400
-msgid "replace the tag if exists"
+#: builtin/worktree.c:791 builtin/worktree.c:918
+#, c-format
+msgid "'%s' is a main working tree"
msgstr ""
-#: builtin/tag.c:401 builtin/update-ref.c:368
-msgid "create a reflog"
+#: builtin/worktree.c:796
+#, c-format
+msgid "could not figure out destination name from '%s'"
msgstr ""
-#: builtin/tag.c:403
-msgid "Tag listing options"
+#: builtin/worktree.c:802
+#, c-format
+msgid "target '%s' already exists"
msgstr ""
-#: builtin/tag.c:404
-msgid "show tag list in columns"
+#: builtin/worktree.c:810
+#, c-format
+msgid ""
+"cannot move a locked working tree, lock reason: %s\n"
+"use 'move -f -f' to override or unlock first"
msgstr ""
-#: builtin/tag.c:405 builtin/tag.c:407
-msgid "print only tags that contain the commit"
+#: builtin/worktree.c:812
+msgid ""
+"cannot move a locked working tree;\n"
+"use 'move -f -f' to override or unlock first"
msgstr ""
-#: builtin/tag.c:406 builtin/tag.c:408
-msgid "print only tags that don't contain the commit"
+#: builtin/worktree.c:815
+#, c-format
+msgid "validation failed, cannot move working tree: %s"
msgstr ""
-#: builtin/tag.c:409
-msgid "print only tags that are merged"
+#: builtin/worktree.c:820
+#, c-format
+msgid "failed to move '%s' to '%s'"
msgstr ""
-#: builtin/tag.c:410
-msgid "print only tags that are not merged"
+#: builtin/worktree.c:868
+#, c-format
+msgid "failed to run 'git status' on '%s'"
msgstr ""
-#: builtin/tag.c:415
-msgid "print only tags of the object"
+#: builtin/worktree.c:872
+#, c-format
+msgid "'%s' is dirty, use --force to delete it"
msgstr ""
-#: builtin/tag.c:459
-msgid "--column and -n are incompatible"
+#: builtin/worktree.c:877
+#, c-format
+msgid "failed to run 'git status' on '%s', code %d"
msgstr ""
-#: builtin/tag.c:481
-msgid "-n option is only allowed in list mode"
+#: builtin/worktree.c:900
+msgid "force removal even if worktree is dirty or locked"
msgstr ""
-#: builtin/tag.c:483
-msgid "--contains option is only allowed in list mode"
+#: builtin/worktree.c:923
+#, c-format
+msgid ""
+"cannot remove a locked working tree, lock reason: %s\n"
+"use 'remove -f -f' to override or unlock first"
msgstr ""
-#: builtin/tag.c:485
-msgid "--no-contains option is only allowed in list mode"
+#: builtin/worktree.c:925
+msgid ""
+"cannot remove a locked working tree;\n"
+"use 'remove -f -f' to override or unlock first"
msgstr ""
-#: builtin/tag.c:487
-msgid "--points-at option is only allowed in list mode"
+#: builtin/worktree.c:928
+#, c-format
+msgid "validation failed, cannot remove working tree: %s"
msgstr ""
-#: builtin/tag.c:489
-msgid "--merged and --no-merged options are only allowed in list mode"
+#: builtin/write-tree.c:15
+msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
msgstr ""
-#: builtin/tag.c:500
-msgid "only one -F or -m option is allowed."
+#: builtin/write-tree.c:28
+msgid "<prefix>/"
msgstr ""
-#: builtin/tag.c:519
-msgid "too many params"
+#: builtin/write-tree.c:29
+msgid "write tree object for a subdirectory <prefix>"
msgstr ""
-#: builtin/tag.c:525
-#, c-format
-msgid "'%s' is not a valid tag name."
+#: builtin/write-tree.c:31
+msgid "only useful for debugging"
msgstr ""
-#: builtin/tag.c:530
+#: credential-cache--daemon.c:223
#, c-format
-msgid "tag '%s' already exists"
+msgid ""
+"The permissions on your socket directory are too loose; other\n"
+"users may be able to read your cached credentials. Consider running:\n"
+"\n"
+"\tchmod 0700 %s"
+msgstr ""
+
+#: credential-cache--daemon.c:272
+msgid "print debugging messages to stderr"
msgstr ""
-#: builtin/tag.c:561
+#: t/helper/test-reach.c:152
#, c-format
-msgid "Updated tag '%s' (was %s)\n"
+msgid "commit %s is not marked reachable"
msgstr ""
-#: builtin/unpack-objects.c:498
-msgid "Unpacking objects"
+#: t/helper/test-reach.c:162
+msgid "too many commits marked reachable"
msgstr ""
-#: builtin/update-index.c:82
-#, c-format
-msgid "failed to create directory %s"
+#: 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:88
-#, c-format
-msgid "failed to stat %s"
+#: 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:98
+#: git.c:174
#, c-format
-msgid "failed to create file %s"
+msgid "no directory given for --git-dir\n"
msgstr ""
-#: builtin/update-index.c:106
+#: git.c:188
#, c-format
-msgid "failed to delete file %s"
+msgid "no namespace given for --namespace\n"
msgstr ""
-#: builtin/update-index.c:113 builtin/update-index.c:219
+#: git.c:202
#, c-format
-msgid "failed to delete directory %s"
+msgid "no directory given for --work-tree\n"
msgstr ""
-#: builtin/update-index.c:138
+#: git.c:216
#, c-format
-msgid "Testing mtime in '%s' "
+msgid "no prefix given for --super-prefix\n"
msgstr ""
-#: builtin/update-index.c:152
-msgid "directory stat info does not change after adding a new file"
+#: git.c:238
+#, c-format
+msgid "-c expects a configuration string\n"
msgstr ""
-#: builtin/update-index.c:165
-msgid "directory stat info does not change after adding a new directory"
+#: git.c:276
+#, c-format
+msgid "no directory given for -C\n"
msgstr ""
-#: builtin/update-index.c:178
-msgid "directory stat info changes after updating a file"
+#: git.c:301
+#, c-format
+msgid "unknown option: %s\n"
msgstr ""
-#: builtin/update-index.c:189
-msgid "directory stat info changes after adding a file inside subdirectory"
+#: git.c:342
+#, c-format
+msgid "while expanding alias '%s': '%s'"
msgstr ""
-#: builtin/update-index.c:200
-msgid "directory stat info does not change after deleting a file"
+#: git.c:351
+#, c-format
+msgid ""
+"alias '%s' changes environment variables.\n"
+"You can use '!git' in the alias to do this"
msgstr ""
-#: builtin/update-index.c:213
-msgid "directory stat info does not change after deleting a directory"
+#: git.c:359
+#, c-format
+msgid "empty alias for %s"
msgstr ""
-#: builtin/update-index.c:220
-msgid " OK"
+#: git.c:362
+#, c-format
+msgid "recursive alias: %s"
msgstr ""
-#: builtin/update-index.c:579
-msgid "git update-index [<options>] [--] [<file>...]"
+#: git.c:437
+msgid "write failure on standard output"
msgstr ""
-#: builtin/update-index.c:936
-msgid "continue refresh even when index needs update"
+#: git.c:439
+msgid "unknown write failure on standard output"
msgstr ""
-#: builtin/update-index.c:939
-msgid "refresh: ignore submodules"
+#: git.c:441
+msgid "close failed on standard output"
msgstr ""
-#: builtin/update-index.c:942
-msgid "do not ignore new files"
+#: git.c:720
+#, c-format
+msgid "alias loop detected: expansion of '%s' does not terminate:%s"
msgstr ""
-#: builtin/update-index.c:944
-msgid "let files replace directories and vice-versa"
+#: git.c:770
+#, c-format
+msgid "cannot handle %s as a builtin"
msgstr ""
-#: builtin/update-index.c:946
-msgid "notice files missing from worktree"
+#: git.c:783
+#, c-format
+msgid ""
+"usage: %s\n"
+"\n"
msgstr ""
-#: builtin/update-index.c:948
-msgid "refresh even if index contains unmerged entries"
+#: git.c:803
+#, c-format
+msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
msgstr ""
-#: builtin/update-index.c:951
-msgid "refresh stat information"
+#: git.c:815
+#, c-format
+msgid "failed to run command '%s': %s\n"
msgstr ""
-#: builtin/update-index.c:955
-msgid "like --refresh, but ignore assume-unchanged setting"
+#: http.c:378
+#, c-format
+msgid "negative value for http.postbuffer; defaulting to %d"
msgstr ""
-#: builtin/update-index.c:959
-msgid "<mode>,<object>,<path>"
+#: http.c:399
+msgid "Delegation control is not supported with cURL < 7.22.0"
msgstr ""
-#: builtin/update-index.c:960
-msgid "add the specified entry to the index"
+#: http.c:408
+msgid "Public key pinning not supported with cURL < 7.44.0"
msgstr ""
-#: builtin/update-index.c:969
-msgid "mark files as \"not changing\""
+#: http.c:876
+msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
msgstr ""
-#: builtin/update-index.c:972
-msgid "clear assumed-unchanged bit"
+#: http.c:949
+msgid "Protocol restrictions not supported with cURL < 7.19.4"
msgstr ""
-#: builtin/update-index.c:975
-msgid "mark files as \"index-only\""
+#: http.c:1085
+#, c-format
+msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
msgstr ""
-#: builtin/update-index.c:978
-msgid "clear skip-worktree bit"
+#: http.c:1092
+#, c-format
+msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
msgstr ""
-#: builtin/update-index.c:981
-msgid "add to index only; do not add content to object database"
+#: http.c:1096
+#, c-format
+msgid "Could not set SSL backend to '%s': already set"
msgstr ""
-#: builtin/update-index.c:983
-msgid "remove named paths even if present in worktree"
+#: http.c:1959
+#, c-format
+msgid ""
+"unable to update url base from redirection:\n"
+" asked for: %s\n"
+" redirect: %s"
msgstr ""
-#: builtin/update-index.c:985
-msgid "with --stdin: input lines are terminated by null bytes"
+#: remote-curl.c:455
+#, c-format
+msgid "redirecting to %s"
msgstr ""
-#: builtin/update-index.c:987
-msgid "read list of paths to be updated from standard input"
+#: parse-options.h:154
+msgid "expiry-date"
msgstr ""
-#: builtin/update-index.c:991
-msgid "add entries from standard input to the index"
+#: parse-options.h:169
+msgid "no-op (backward compatibility)"
msgstr ""
-#: builtin/update-index.c:995
-msgid "repopulate stages #2 and #3 for the listed paths"
+#: parse-options.h:259
+msgid "be more verbose"
msgstr ""
-#: builtin/update-index.c:999
-msgid "only update entries that differ from HEAD"
+#: parse-options.h:261
+msgid "be more quiet"
msgstr ""
-#: builtin/update-index.c:1003
-msgid "ignore files missing from worktree"
+#: parse-options.h:267
+msgid "use <n> digits to display SHA-1s"
msgstr ""
-#: builtin/update-index.c:1006
-msgid "report actions to standard output"
+#: command-list.h:50
+msgid "Add file contents to the index"
msgstr ""
-#: builtin/update-index.c:1008
-msgid "(for porcelains) forget saved unresolved conflicts"
+#: command-list.h:51
+msgid "Apply a series of patches from a mailbox"
msgstr ""
-#: builtin/update-index.c:1012
-msgid "write index in this format"
+#: command-list.h:52
+msgid "Annotate file lines with commit information"
msgstr ""
-#: builtin/update-index.c:1014
-msgid "enable or disable split index"
+#: command-list.h:53
+msgid "Apply a patch to files and/or to the index"
msgstr ""
-#: builtin/update-index.c:1016
-msgid "enable/disable untracked cache"
+#: command-list.h:54
+msgid "Import a GNU Arch repository into Git"
msgstr ""
-#: builtin/update-index.c:1018
-msgid "test if the filesystem supports untracked cache"
+#: command-list.h:55
+msgid "Create an archive of files from a named tree"
msgstr ""
-#: builtin/update-index.c:1020
-msgid "enable untracked cache without testing the filesystem"
+#: command-list.h:56
+msgid "Use binary search to find the commit that introduced a bug"
msgstr ""
-#: builtin/update-index.c:1022
-msgid "write out the index even if is not flagged as changed"
+#: command-list.h:57
+msgid "Show what revision and author last modified each line of a file"
msgstr ""
-#: builtin/update-index.c:1024
-msgid "enable or disable file system monitor"
+#: command-list.h:58
+msgid "List, create, or delete branches"
msgstr ""
-#: builtin/update-index.c:1026
-msgid "mark files as fsmonitor valid"
+#: command-list.h:59
+msgid "Move objects and refs by archive"
msgstr ""
-#: builtin/update-index.c:1029
-msgid "clear fsmonitor valid bit"
+#: command-list.h:60
+msgid "Provide content or type and size information for repository objects"
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"
+#: command-list.h:61
+msgid "Display gitattributes information"
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"
+#: command-list.h:62
+msgid "Debug gitignore / exclude files"
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"
+#: command-list.h:63
+msgid "Show canonical names and email addresses of contacts"
msgstr ""
-#: builtin/update-index.c:1151
-msgid "Untracked cache disabled"
+#: command-list.h:64
+msgid "Switch branches or restore working tree files"
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"
+#: command-list.h:65
+msgid "Copy files from the index to the working tree"
msgstr ""
-#: builtin/update-index.c:1163
-#, c-format
-msgid "Untracked cache enabled for '%s'"
+#: command-list.h:66
+msgid "Ensures that a reference name is well formed"
msgstr ""
-#: builtin/update-index.c:1171
-msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
+#: command-list.h:67
+msgid "Find commits yet to be applied to upstream"
msgstr ""
-#: builtin/update-index.c:1175
-msgid "fsmonitor enabled"
+#: command-list.h:68
+msgid "Apply the changes introduced by some existing commits"
msgstr ""
-#: builtin/update-index.c:1178
-msgid ""
-"core.fsmonitor is set; remove it if you really want to disable fsmonitor"
+#: command-list.h:69
+msgid "Graphical alternative to git-commit"
msgstr ""
-#: builtin/update-index.c:1182
-msgid "fsmonitor disabled"
+#: command-list.h:70
+msgid "Remove untracked files from the working tree"
msgstr ""
-#: builtin/update-ref.c:10
-msgid "git update-ref [<options>] -d <refname> [<old-val>]"
+#: command-list.h:71
+msgid "Clone a repository into a new directory"
msgstr ""
-#: builtin/update-ref.c:11
-msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]"
+#: command-list.h:72
+msgid "Display data in columns"
msgstr ""
-#: builtin/update-ref.c:12
-msgid "git update-ref [<options>] --stdin [-z]"
+#: command-list.h:73
+msgid "Record changes to the repository"
msgstr ""
-#: builtin/update-ref.c:363
-msgid "delete the reference"
+#: command-list.h:74
+msgid "Write and verify Git commit-graph files"
msgstr ""
-#: builtin/update-ref.c:365
-msgid "update <refname> not the one it points to"
+#: command-list.h:75
+msgid "Create a new commit object"
msgstr ""
-#: builtin/update-ref.c:366
-msgid "stdin has NUL-terminated arguments"
+#: command-list.h:76
+msgid "Get and set repository or global options"
msgstr ""
-#: builtin/update-ref.c:367
-msgid "read updates from stdin"
+#: command-list.h:77
+msgid "Count unpacked number of objects and their disk consumption"
msgstr ""
-#: builtin/update-server-info.c:7
-msgid "git update-server-info [--force]"
+#: command-list.h:78
+msgid "Retrieve and store user credentials"
msgstr ""
-#: builtin/update-server-info.c:15
-msgid "update the info files from scratch"
+#: command-list.h:79
+msgid "Helper to temporarily store passwords in memory"
msgstr ""
-#: builtin/verify-commit.c:18
-msgid "git verify-commit [-v | --verbose] <commit>..."
+#: command-list.h:80
+msgid "Helper to store credentials on disk"
msgstr ""
-#: builtin/verify-commit.c:73
-msgid "print commit contents"
+#: command-list.h:81
+msgid "Export a single commit to a CVS checkout"
msgstr ""
-#: builtin/verify-commit.c:74 builtin/verify-tag.c:38
-msgid "print raw gpg status output"
+#: command-list.h:82
+msgid "Salvage your data out of another SCM people love to hate"
msgstr ""
-#: builtin/verify-pack.c:55
-msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
+#: command-list.h:83
+msgid "A CVS server emulator for Git"
msgstr ""
-#: builtin/verify-pack.c:65
-msgid "verbose"
+#: command-list.h:84
+msgid "A really simple server for Git repositories"
msgstr ""
-#: builtin/verify-pack.c:67
-msgid "show statistics only"
+#: command-list.h:85
+msgid "Give an object a human readable name based on an available ref"
msgstr ""
-#: builtin/verify-tag.c:19
-msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
+#: command-list.h:86
+msgid "Show changes between commits, commit and working tree, etc"
msgstr ""
-#: builtin/verify-tag.c:37
-msgid "print tag contents"
+#: command-list.h:87
+msgid "Compares files in the working tree and the index"
msgstr ""
-#: builtin/worktree.c:17
-msgid "git worktree add [<options>] <path> [<commit-ish>]"
+#: command-list.h:88
+msgid "Compare a tree to the working tree or index"
msgstr ""
-#: builtin/worktree.c:18
-msgid "git worktree list [<options>]"
+#: command-list.h:89
+msgid "Compares the content and mode of blobs found via two tree objects"
msgstr ""
-#: builtin/worktree.c:19
-msgid "git worktree lock [<options>] <path>"
+#: command-list.h:90
+msgid "Show changes using common diff tools"
msgstr ""
-#: builtin/worktree.c:20
-msgid "git worktree move <worktree> <new-path>"
+#: command-list.h:91
+msgid "Git data exporter"
msgstr ""
-#: builtin/worktree.c:21
-msgid "git worktree prune [<options>]"
+#: command-list.h:92
+msgid "Backend for fast Git data importers"
msgstr ""
-#: builtin/worktree.c:22
-msgid "git worktree remove [<options>] <worktree>"
+#: command-list.h:93
+msgid "Download objects and refs from another repository"
msgstr ""
-#: builtin/worktree.c:23
-msgid "git worktree unlock <path>"
+#: command-list.h:94
+msgid "Receive missing objects from another repository"
msgstr ""
-#: builtin/worktree.c:60
-#, c-format
-msgid "Removing worktrees/%s: not a valid directory"
+#: command-list.h:95
+msgid "Rewrite branches"
msgstr ""
-#: builtin/worktree.c:66
-#, c-format
-msgid "Removing worktrees/%s: gitdir file does not exist"
+#: command-list.h:96
+msgid "Produce a merge commit message"
msgstr ""
-#: builtin/worktree.c:71 builtin/worktree.c:80
-#, c-format
-msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
+#: command-list.h:97
+msgid "Output information on each ref"
msgstr ""
-#: builtin/worktree.c:90
-#, c-format
-msgid ""
-"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
-"%<PRIuMAX>)"
+#: command-list.h:98
+msgid "Prepare patches for e-mail submission"
msgstr ""
-#: builtin/worktree.c:98
-#, c-format
-msgid "Removing worktrees/%s: invalid gitdir file"
+#: command-list.h:99
+msgid "Verifies the connectivity and validity of the objects in the database"
msgstr ""
-#: builtin/worktree.c:114
-#, c-format
-msgid "Removing worktrees/%s: gitdir file points to non-existent location"
+#: command-list.h:100
+msgid "Cleanup unnecessary files and optimize the local repository"
msgstr ""
-#: builtin/worktree.c:161
-msgid "report pruned working trees"
+#: command-list.h:101
+msgid "Extract commit ID from an archive created using git-archive"
msgstr ""
-#: builtin/worktree.c:163
-msgid "expire working trees older than <time>"
+#: command-list.h:102
+msgid "Print lines matching a pattern"
msgstr ""
-#: builtin/worktree.c:238
-#, c-format
-msgid "'%s' already exists"
+#: command-list.h:103
+msgid "A portable graphical interface to Git"
msgstr ""
-#: builtin/worktree.c:269
-#, c-format
-msgid "could not create directory of '%s'"
+#: command-list.h:104
+msgid "Compute object ID and optionally creates a blob from a file"
msgstr ""
-#: builtin/worktree.c:308
-#, c-format
-msgid "Preparing %s (identifier %s)"
+#: command-list.h:105
+msgid "Display help information about Git"
msgstr ""
-#: builtin/worktree.c:385
-msgid "checkout <branch> even if already checked out in other worktree"
+#: command-list.h:106
+msgid "Server side implementation of Git over HTTP"
msgstr ""
-#: builtin/worktree.c:388
-msgid "create a new branch"
+#: command-list.h:107
+msgid "Download from a remote Git repository via HTTP"
msgstr ""
-#: builtin/worktree.c:390
-msgid "create or reset a branch"
+#: command-list.h:108
+msgid "Push objects over HTTP/DAV to another repository"
msgstr ""
-#: builtin/worktree.c:392
-msgid "populate the new working tree"
+#: command-list.h:109
+msgid "Send a collection of patches from stdin to an IMAP folder"
msgstr ""
-#: builtin/worktree.c:393
-msgid "keep the new working tree locked"
+#: command-list.h:110
+msgid "Build pack index file for an existing packed archive"
msgstr ""
-#: builtin/worktree.c:395
-msgid "set up tracking mode (see git-branch(1))"
+#: command-list.h:111
+msgid "Create an empty Git repository or reinitialize an existing one"
msgstr ""
-#: builtin/worktree.c:398
-msgid "try to match the new branch name with a remote-tracking branch"
+#: command-list.h:112
+msgid "Instantly browse your working repository in gitweb"
msgstr ""
-#: builtin/worktree.c:406
-msgid "-b, -B, and --detach are mutually exclusive"
+#: command-list.h:113
+msgid "add or parse structured information in commit messages"
msgstr ""
-#: builtin/worktree.c:471
-msgid "--[no-]track can only be used if a new branch is created"
+#: command-list.h:114
+msgid "The Git repository browser"
msgstr ""
-#: builtin/worktree.c:571
-msgid "reason for locking"
+#: command-list.h:115
+msgid "Show commit logs"
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:116
+msgid "Show information about files in the index and the working tree"
msgstr ""
-#: builtin/worktree.c:585 builtin/worktree.c:618
-msgid "The main working tree cannot be locked or unlocked"
+#: command-list.h:117
+msgid "List references in a remote repository"
msgstr ""
-#: builtin/worktree.c:590
-#, c-format
-msgid "'%s' is already locked, reason: %s"
+#: command-list.h:118
+msgid "List the contents of a tree object"
msgstr ""
-#: builtin/worktree.c:592
-#, c-format
-msgid "'%s' is already locked"
+#: command-list.h:119
+msgid "Extracts patch and authorship from a single e-mail message"
msgstr ""
-#: builtin/worktree.c:620
-#, c-format
-msgid "'%s' is not locked"
+#: command-list.h:120
+msgid "Simple UNIX mbox splitter program"
msgstr ""
-#: builtin/worktree.c:645
-msgid "working trees containing submodules cannot be moved or removed"
+#: command-list.h:121
+msgid "Join two or more development histories together"
msgstr ""
-#: builtin/worktree.c:672 builtin/worktree.c:811
-#, c-format
-msgid "'%s' is a main working tree"
+#: command-list.h:122
+msgid "Find as good common ancestors as possible for a merge"
msgstr ""
-#: builtin/worktree.c:677
-#, c-format
-msgid "could not figure out destination name from '%s'"
+#: command-list.h:123
+msgid "Run a three-way file merge"
msgstr ""
-#: builtin/worktree.c:683
-#, c-format
-msgid "target '%s' already exists"
+#: command-list.h:124
+msgid "Run a merge for files needing merging"
msgstr ""
-#: builtin/worktree.c:690
-#, c-format
-msgid "cannot move a locked working tree, lock reason: %s"
+#: command-list.h:125
+msgid "The standard helper program to use with git-merge-index"
msgstr ""
-#: builtin/worktree.c:692
-msgid "cannot move a locked working tree"
+#: command-list.h:126
+msgid "Run merge conflict resolution tools to resolve merge conflicts"
msgstr ""
-#: builtin/worktree.c:695
-#, c-format
-msgid "validation failed, cannot move working tree: %s"
+#: command-list.h:127
+msgid "Show three-way merge without touching index"
msgstr ""
-#: builtin/worktree.c:700
-#, c-format
-msgid "failed to move '%s' to '%s'"
+#: command-list.h:128
+msgid "Write and verify multi-pack-indexes"
msgstr ""
-#: builtin/worktree.c:748
-#, c-format
-msgid "failed to run 'git status' on '%s'"
+#: command-list.h:129
+msgid "Creates a tag object"
msgstr ""
-#: builtin/worktree.c:752
-#, c-format
-msgid "'%s' is dirty, use --force to delete it"
+#: command-list.h:130
+msgid "Build a tree-object from ls-tree formatted text"
msgstr ""
-#: builtin/worktree.c:757
-#, c-format
-msgid "failed to run 'git status' on '%s', code %d"
+#: command-list.h:131
+msgid "Move or rename a file, a directory, or a symlink"
msgstr ""
-#: builtin/worktree.c:768 builtin/worktree.c:782
-#, c-format
-msgid "failed to delete '%s'"
+#: command-list.h:132
+msgid "Find symbolic names for given revs"
msgstr ""
-#: builtin/worktree.c:794
-msgid "force removing even if the worktree is dirty"
+#: command-list.h:133
+msgid "Add or inspect object notes"
msgstr ""
-#: builtin/worktree.c:815
-#, c-format
-msgid "cannot remove a locked working tree, lock reason: %s"
+#: command-list.h:134
+msgid "Import from and submit to Perforce repositories"
msgstr ""
-#: builtin/worktree.c:817
-msgid "cannot remove a locked working tree"
+#: command-list.h:135
+msgid "Create a packed archive of objects"
msgstr ""
-#: builtin/worktree.c:820
-#, c-format
-msgid "validation failed, cannot remove working tree: %s"
+#: command-list.h:136
+msgid "Find redundant pack files"
msgstr ""
-#: builtin/write-tree.c:14
-msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
+#: command-list.h:137
+msgid "Pack heads and tags for efficient repository access"
msgstr ""
-#: builtin/write-tree.c:27
-msgid "<prefix>/"
+#: command-list.h:138
+msgid "Routines to help parsing remote repository access parameters"
msgstr ""
-#: builtin/write-tree.c:28
-msgid "write tree object for a subdirectory <prefix>"
+#: command-list.h:139
+msgid "Compute unique ID for a patch"
msgstr ""
-#: builtin/write-tree.c:31
-msgid "only useful for debugging"
+#: command-list.h:140
+msgid "Prune all unreachable objects from the object database"
msgstr ""
-#: upload-pack.c:27
-msgid "git upload-pack [<options>] <dir>"
+#: command-list.h:141
+msgid "Remove extra objects that are already in pack files"
msgstr ""
-#: upload-pack.c:1070
-msgid "quit after a single request/response exchange"
+#: command-list.h:142
+msgid "Fetch from and integrate with another repository or a local branch"
msgstr ""
-#: upload-pack.c:1072
-msgid "exit immediately after initial ref advertisement"
+#: command-list.h:143
+msgid "Update remote refs along with associated objects"
msgstr ""
-#: upload-pack.c:1074
-msgid "do not try <directory>/.git/ if <directory> is no Git directory"
+#: command-list.h:144
+msgid "Applies a quilt patchset onto the current branch"
msgstr ""
-#: upload-pack.c:1076
-msgid "interrupt transfer after <n> seconds of inactivity"
+#: command-list.h:145
+msgid "Compare two commit ranges (e.g. two versions of a branch)"
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:146
+msgid "Reads tree information into the index"
msgstr ""
-#: credential-cache--daemon.c:271
-msgid "print debugging messages to stderr"
+#: command-list.h:147
+msgid "Reapply commits on top of another base tip"
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:148
+msgid "Receive what is pushed into the repository"
msgstr ""
-#: git.c:15
-msgid ""
-"'git help -a' and 'git help -g' list available subcommands and some\n"
-"concept guides. See 'git help <command>' or 'git help <concept>'\n"
-"to read about a specific subcommand or concept."
+#: command-list.h:149
+msgid "Manage reflog information"
msgstr ""
-#: git.c:95
-#, c-format
-msgid "no directory given for --git-dir\n"
+#: command-list.h:150
+msgid "Manage set of tracked repositories"
+msgstr ""
+
+#: command-list.h:151
+msgid "Pack unpacked objects in a repository"
msgstr ""
-#: git.c:109
-#, c-format
-msgid "no namespace given for --namespace\n"
+#: command-list.h:152
+msgid "Create, list, delete refs to replace objects"
msgstr ""
-#: git.c:123
-#, c-format
-msgid "no directory given for --work-tree\n"
+#: command-list.h:153
+msgid "Generates a summary of pending changes"
msgstr ""
-#: git.c:137
-#, c-format
-msgid "no prefix given for --super-prefix\n"
+#: command-list.h:154
+msgid "Reuse recorded resolution of conflicted merges"
msgstr ""
-#: git.c:159
-#, c-format
-msgid "-c expects a configuration string\n"
+#: command-list.h:155
+msgid "Reset current HEAD to the specified state"
msgstr ""
-#: git.c:197
-#, c-format
-msgid "no directory given for -C\n"
+#: command-list.h:156
+msgid "Revert some existing commits"
msgstr ""
-#: git.c:212
-#, c-format
-msgid "unknown option: %s\n"
+#: command-list.h:157
+msgid "Lists commit objects in reverse chronological order"
msgstr ""
-#: git.c:687
-#, c-format
-msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
+#: command-list.h:158
+msgid "Pick out and massage parameters"
msgstr ""
-#: git.c:699
-#, c-format
-msgid "failed to run command '%s': %s\n"
+#: command-list.h:159
+msgid "Remove files from the working tree and from the index"
msgstr ""
-#: http.c:342
-#, c-format
-msgid "negative value for http.postbuffer; defaulting to %d"
+#: command-list.h:160
+msgid "Send a collection of patches as emails"
msgstr ""
-#: http.c:363
-msgid "Delegation control is not supported with cURL < 7.22.0"
+#: command-list.h:161
+msgid "Push objects over Git protocol to another repository"
msgstr ""
-#: http.c:372
-msgid "Public key pinning not supported with cURL < 7.44.0"
+#: command-list.h:162
+msgid "Restricted login shell for Git-only SSH access"
msgstr ""
-#: http.c:1857
-#, c-format
-msgid ""
-"unable to update url base from redirection:\n"
-" asked for: %s\n"
-" redirect: %s"
+#: command-list.h:163
+msgid "Summarize 'git log' output"
msgstr ""
-#: remote-curl.c:345
-#, c-format
-msgid "redirecting to %s"
+#: command-list.h:164
+msgid "Show various types of objects"
msgstr ""
-#: list-objects-filter-options.h:59
-msgid "args"
+#: command-list.h:165
+msgid "Show branches and their commits"
msgstr ""
-#: list-objects-filter-options.h:60
-msgid "object filtering"
+#: command-list.h:166
+msgid "Show packed archive index"
msgstr ""
-#: common-cmds.h:9
-msgid "start a working area (see also: git help tutorial)"
+#: command-list.h:167
+msgid "List references in a local repository"
msgstr ""
-#: common-cmds.h:10
-msgid "work on the current change (see also: git help everyday)"
+#: command-list.h:168
+msgid "Git's i18n setup code for shell scripts"
msgstr ""
-#: common-cmds.h:11
-msgid "examine the history and state (see also: git help revisions)"
+#: command-list.h:169
+msgid "Common Git shell script setup code"
msgstr ""
-#: common-cmds.h:12
-msgid "grow, mark and tweak your common history"
+#: command-list.h:170
+msgid "Stash the changes in a dirty working directory away"
msgstr ""
-#: common-cmds.h:13
-msgid "collaborate (see also: git help workflows)"
+#: command-list.h:171
+msgid "Add file contents to the staging area"
msgstr ""
-#: common-cmds.h:17
-msgid "Add file contents to the index"
+#: command-list.h:172
+msgid "Show the working tree status"
msgstr ""
-#: common-cmds.h:18
-msgid "Use binary search to find the commit that introduced a bug"
+#: command-list.h:173
+msgid "Remove unnecessary whitespace"
msgstr ""
-#: common-cmds.h:19
-msgid "List, create, or delete branches"
+#: command-list.h:174
+msgid "Initialize, update or inspect submodules"
msgstr ""
-#: common-cmds.h:20
-msgid "Switch branches or restore working tree files"
+#: command-list.h:175
+msgid "Bidirectional operation between a Subversion repository and Git"
msgstr ""
-#: common-cmds.h:21
-msgid "Clone a repository into a new directory"
+#: command-list.h:176
+msgid "Read, modify and delete symbolic refs"
msgstr ""
-#: common-cmds.h:22
-msgid "Record changes to the repository"
+#: command-list.h:177
+msgid "Create, list, delete or verify a tag object signed with GPG"
msgstr ""
-#: common-cmds.h:23
-msgid "Show changes between commits, commit and working tree, etc"
+#: command-list.h:178
+msgid "Creates a temporary file with a blob's contents"
msgstr ""
-#: common-cmds.h:24
-msgid "Download objects and refs from another repository"
+#: command-list.h:179
+msgid "Unpack objects from a packed archive"
msgstr ""
-#: common-cmds.h:25
-msgid "Print lines matching a pattern"
+#: command-list.h:180
+msgid "Register file contents in the working tree to the index"
msgstr ""
-#: common-cmds.h:26
-msgid "Create an empty Git repository or reinitialize an existing one"
+#: command-list.h:181
+msgid "Update the object name stored in a ref safely"
msgstr ""
-#: common-cmds.h:27
-msgid "Show commit logs"
+#: command-list.h:182
+msgid "Update auxiliary info file to help dumb servers"
msgstr ""
-#: common-cmds.h:28
-msgid "Join two or more development histories together"
+#: command-list.h:183
+msgid "Send archive back to git-archive"
msgstr ""
-#: common-cmds.h:29
-msgid "Move or rename a file, a directory, or a symlink"
+#: command-list.h:184
+msgid "Send objects packed back to git-fetch-pack"
msgstr ""
-#: common-cmds.h:30
-msgid "Fetch from and integrate with another repository or a local branch"
+#: command-list.h:185
+msgid "Show a Git logical variable"
msgstr ""
-#: common-cmds.h:31
-msgid "Update remote refs along with associated objects"
+#: command-list.h:186
+msgid "Check the GPG signature of commits"
msgstr ""
-#: common-cmds.h:32
-msgid "Reapply commits on top of another base tip"
+#: command-list.h:187
+msgid "Validate packed Git archive files"
msgstr ""
-#: common-cmds.h:33
-msgid "Reset current HEAD to the specified state"
+#: command-list.h:188
+msgid "Check the GPG signature of tags"
msgstr ""
-#: common-cmds.h:34
-msgid "Remove files from the working tree and from the index"
+#: command-list.h:189
+msgid "Git web interface (web frontend to Git repositories)"
msgstr ""
-#: common-cmds.h:35
-msgid "Show various types of objects"
+#: command-list.h:190
+msgid "Show logs with difference each commit introduces"
msgstr ""
-#: common-cmds.h:36
-msgid "Show the working tree status"
+#: command-list.h:191
+msgid "Manage multiple working trees"
msgstr ""
-#: common-cmds.h:37
-msgid "Create, list, delete or verify a tag object signed with GPG"
+#: command-list.h:192
+msgid "Create a tree object from the current index"
msgstr ""
-#: parse-options.h:157
-msgid "expiry-date"
+#: command-list.h:193
+msgid "Defining attributes per path"
msgstr ""
-#: parse-options.h:172
-msgid "no-op (backward compatibility)"
+#: command-list.h:194
+msgid "Git command-line interface and conventions"
msgstr ""
-#: parse-options.h:250
-msgid "be more verbose"
+#: command-list.h:195
+msgid "A Git core tutorial for developers"
msgstr ""
-#: parse-options.h:252
-msgid "be more quiet"
+#: command-list.h:196
+msgid "Git for CVS users"
msgstr ""
-#: parse-options.h:258
-msgid "use <n> digits to display SHA-1s"
+#: command-list.h:197
+msgid "Tweaking diff output"
msgstr ""
-#: rerere.h:40
-msgid "update the index with reused conflict resolution if possible"
+#: command-list.h:198
+msgid "A useful minimum set of commands for Everyday Git"
msgstr ""
-#: git-bisect.sh:54
-msgid "You need to start by \"git bisect start\""
+#: command-list.h:199
+msgid "A Git Glossary"
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:200
+msgid "Hooks used by Git"
msgstr ""
-#: git-bisect.sh:121
-#, sh-format
-msgid "unrecognised option: '$arg'"
+#: command-list.h:201
+msgid "Specifies intentionally untracked files to ignore"
msgstr ""
-#: git-bisect.sh:125
-#, sh-format
-msgid "'$arg' does not appear to be a valid revision"
+#: command-list.h:202
+msgid "Defining submodule properties"
msgstr ""
-#: git-bisect.sh:154
-msgid "Bad HEAD - I need a HEAD"
+#: command-list.h:203
+msgid "Git namespaces"
msgstr ""
-#: git-bisect.sh:167
-#, sh-format
-msgid ""
-"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
+#: command-list.h:204
+msgid "Git Repository Layout"
msgstr ""
-#: git-bisect.sh:177
-msgid "won't bisect on cg-seek'ed tree"
+#: command-list.h:205
+msgid "Specifying revisions and ranges for Git"
msgstr ""
-#: git-bisect.sh:181
-msgid "Bad HEAD - strange symbolic ref"
+#: command-list.h:206
+msgid "A tutorial introduction to Git: part two"
msgstr ""
-#: git-bisect.sh:233
-#, sh-format
-msgid "Bad bisect_write argument: $state"
+#: command-list.h:207
+msgid "A tutorial introduction to Git"
msgstr ""
-#: git-bisect.sh:246
-#, sh-format
-msgid "Bad rev input: $arg"
+#: command-list.h:208
+msgid "An overview of recommended workflows with Git"
msgstr ""
-#: git-bisect.sh:265
-#, sh-format
-msgid "Bad rev input: $bisected_head"
+#: list-objects-filter-options.h:63
+msgid "args"
msgstr ""
-#: git-bisect.sh:274
-#, sh-format
-msgid "Bad rev input: $rev"
+#: list-objects-filter-options.h:64
+msgid "object filtering"
msgstr ""
-#: git-bisect.sh:283
-#, sh-format
-msgid "'git bisect $TERM_BAD' can take only one argument."
+#: rerere.h:44
+msgid "update the index with reused conflict resolution if possible"
msgstr ""
-#: git-bisect.sh:306
-#, sh-format
-msgid "Warning: bisecting only with a $TERM_BAD commit."
+#: git-bisect.sh:54
+msgid "You need to start by \"git bisect start\""
msgstr ""
#. TRANSLATORS: Make sure to include [Y] and [n] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-bisect.sh:312
-msgid "Are you sure [Y/n]? "
+#: git-bisect.sh:60
+msgid "Do you want me to do it for you [Y/n]? "
msgstr ""
-#: git-bisect.sh:324
+#: git-bisect.sh:101
#, sh-format
-msgid ""
-"You need to give me at least one $bad_syn and one $good_syn revision.\n"
-"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
+msgid "Bad rev input: $arg"
msgstr ""
-#: git-bisect.sh:327
+#: git-bisect.sh:121
#, sh-format
-msgid ""
-"You need to start by \"git bisect start\".\n"
-"You then need to give me at least one $good_syn and one $bad_syn revision.\n"
-"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
-msgstr ""
-
-#: git-bisect.sh:398 git-bisect.sh:512
-msgid "We are not bisecting."
+msgid "Bad rev input: $bisected_head"
msgstr ""
-#: git-bisect.sh:405
+#: git-bisect.sh:130
#, sh-format
-msgid "'$invalid' is not a valid commit"
+msgid "Bad rev input: $rev"
msgstr ""
-#: git-bisect.sh:414
+#: git-bisect.sh:139
#, sh-format
-msgid ""
-"Could not check out original HEAD '$branch'.\n"
-"Try 'git bisect reset <commit>'."
+msgid "'git bisect $TERM_BAD' can take only one argument."
msgstr ""
-#: git-bisect.sh:422
+#: git-bisect.sh:209
msgid "No logfile given"
msgstr ""
-#: git-bisect.sh:423
+#: git-bisect.sh:210
#, sh-format
msgid "cannot read $file for replaying"
msgstr ""
-#: git-bisect.sh:444
+#: git-bisect.sh:232
msgid "?? what are you talking about?"
msgstr ""
-#: git-bisect.sh:453
+#: git-bisect.sh:241
msgid "bisect run failed: no command provided."
msgstr ""
-#: git-bisect.sh:458
+#: git-bisect.sh:246
#, sh-format
msgid "running $command"
msgstr ""
-#: git-bisect.sh:465
+#: git-bisect.sh:253
#, sh-format
msgid ""
"bisect run failed:\n"
"exit code $res from '$command' is < 0 or >= 128"
msgstr ""
-#: git-bisect.sh:491
+#: git-bisect.sh:279
msgid "bisect run cannot continue any more"
msgstr ""
-#: git-bisect.sh:497
+#: git-bisect.sh:285
#, sh-format
msgid ""
"bisect run failed:\n"
"'bisect_state $state' exited with error code $res"
msgstr ""
-#: git-bisect.sh:504
+#: git-bisect.sh:292
msgid "bisect run success"
msgstr ""
-#: git-bisect.sh:533
-#, sh-format
-msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect."
-msgstr ""
-
-#: git-bisect.sh:567
-msgid "no terms defined"
-msgstr ""
-
-#: git-bisect.sh:584
-#, sh-format
-msgid ""
-"invalid argument $arg for 'git bisect terms'.\n"
-"Supported options are: --term-good|--term-old and --term-bad|--term-new."
+#: git-bisect.sh:300
+msgid "We are not bisecting."
msgstr ""
#: git-merge-octopus.sh:46
msgid "Simple merge did not work, trying automatic merge."
msgstr ""
-#: git-rebase.sh: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\"."
-msgstr ""
-
-#: git-rebase.sh:163 git-rebase.sh:409
+#: git-legacy-rebase.sh:445
#, sh-format
msgid "Could not move back to $head_name"
msgstr ""
-#: git-rebase.sh:174
-msgid "Applied autostash."
-msgstr ""
-
-#: git-rebase.sh:177
+#: git-legacy-rebase.sh:471
#, sh-format
-msgid "Cannot store $stash_sha1"
-msgstr ""
-
-#: git-rebase.sh:218
-msgid "The pre-rebase hook refused to rebase."
-msgstr ""
-
-#: git-rebase.sh:223
-msgid "It looks like 'git am' is in progress. Cannot rebase."
+msgid ""
+"It seems that there is already a $state_dir_base directory, and\n"
+"I wonder if you are in the middle of another rebase. If that is the\n"
+"case, please try\n"
+"\t$cmd_live_rebase\n"
+"If that is not the case, please\n"
+"\t$cmd_clear_stale_rebase\n"
+"and run me again. I am stopping in case you still have something\n"
+"valuable there."
msgstr ""
-#: git-rebase.sh:370
-msgid "No rebase in progress?"
+#: git-legacy-rebase.sh:523
+msgid ""
+"fatal: cannot combine am options with either interactive or merge options"
msgstr ""
-#: git-rebase.sh:381
-msgid "The --edit-todo action can only be used during interactive rebase."
+#: git-legacy-rebase.sh:530
+msgid "fatal: cannot combine '--signoff' with '--preserve-merges'"
msgstr ""
-#: git-rebase.sh:388
-msgid "Cannot read HEAD"
+#: git-legacy-rebase.sh:541
+msgid "fatal: cannot combine '--preserve-merges' with '--rebase-merges'"
msgstr ""
-#: git-rebase.sh:391
-msgid ""
-"You must edit all merge conflicts and then\n"
-"mark them as resolved using git add"
+#: git-legacy-rebase.sh:550
+msgid "fatal: cannot combine '--rebase-merges' with '--strategy-option'"
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."
+#: git-legacy-rebase.sh:552
+msgid "fatal: cannot combine '--rebase-merges' with '--strategy'"
msgstr ""
-#: git-rebase.sh:491
+#: git-legacy-rebase.sh:578
#, sh-format
msgid "invalid upstream '$upstream_name'"
msgstr ""
-#: git-rebase.sh:515
+#: git-legacy-rebase.sh:602
#, sh-format
msgid "$onto_name: there are more than one merge bases"
msgstr ""
-#: git-rebase.sh:518 git-rebase.sh:522
+#: git-legacy-rebase.sh:605 git-legacy-rebase.sh:609
#, sh-format
msgid "$onto_name: there is no merge base"
msgstr ""
-#: git-rebase.sh:527
+#: git-legacy-rebase.sh:614
#, sh-format
msgid "Does not point to a valid commit: $onto_name"
msgstr ""
-#: git-rebase.sh:553
+#: git-legacy-rebase.sh:640
#, sh-format
msgid "fatal: no such branch/commit '$branch_name'"
msgstr ""
-#: git-rebase.sh:586
-msgid "Cannot autostash"
-msgstr ""
-
-#: git-rebase.sh:591
+#: git-legacy-rebase.sh:678
#, sh-format
msgid "Created autostash: $stash_abbrev"
msgstr ""
-#: git-rebase.sh:595
-msgid "Please commit or stash them."
-msgstr ""
-
-#: git-rebase.sh:618
-#, sh-format
-msgid "HEAD is up to date."
-msgstr ""
-
-#: git-rebase.sh:620
+#: git-legacy-rebase.sh:707
#, sh-format
msgid "Current branch $branch_name is up to date."
msgstr ""
-#: git-rebase.sh:628
+#: git-legacy-rebase.sh:717
#, sh-format
-msgid "HEAD is up to date, rebase forced."
+msgid "Current branch $branch_name is up to date, rebase forced."
msgstr ""
-#: git-rebase.sh:630
+#: git-legacy-rebase.sh:731
#, sh-format
-msgid "Current branch $branch_name is up to date, rebase forced."
+msgid "Changes to $onto:"
msgstr ""
-#: git-rebase.sh:642
+#: git-legacy-rebase.sh:733
#, sh-format
msgid "Changes from $mb to $onto:"
msgstr ""
-#: git-rebase.sh:651
-msgid "First, rewinding head to replay your work on top of it..."
-msgstr ""
-
-#: git-rebase.sh:661
+#: git-legacy-rebase.sh:743
#, sh-format
msgid "Fast-forwarded $branch_name to $onto_name."
msgstr ""
-#: git-stash.sh:61
+#: git-legacy-rebase.sh:757
+msgid "First, rewinding head to replay your work on top of it..."
+msgstr ""
+
+#: git-stash.sh:75
msgid "git stash clear with parameters is unimplemented"
msgstr ""
-#: git-stash.sh:108
+#: git-stash.sh:125
msgid "You do not have the initial commit yet"
msgstr ""
-#: git-stash.sh:123
+#: git-stash.sh:140
msgid "Cannot save the current index state"
msgstr ""
-#: git-stash.sh:138
+#: git-stash.sh:155
msgid "Cannot save the untracked files"
msgstr ""
-#: git-stash.sh:158 git-stash.sh:171
+#: git-stash.sh:175 git-stash.sh:188
msgid "Cannot save the current worktree state"
msgstr ""
-#: git-stash.sh:175
+#: git-stash.sh:192
msgid "No changes selected"
msgstr ""
-#: git-stash.sh:178
+#: git-stash.sh:195
msgid "Cannot remove temporary index (can't happen)"
msgstr ""
-#: git-stash.sh:191
+#: git-stash.sh:208
msgid "Cannot record working tree state"
msgstr ""
-#: git-stash.sh:229
+#: git-stash.sh:246
#, sh-format
msgid "Cannot update $ref_stash with $w_commit"
msgstr ""
-#: git-stash.sh:281
+#: git-stash.sh:298
#, sh-format
msgid "error: unknown option for 'stash push': $option"
msgstr ""
-#: git-stash.sh:295
+#: git-stash.sh:312
msgid "Can't use --patch and --include-untracked or --all at the same time"
msgstr ""
-#: git-stash.sh:303
+#: git-stash.sh:320
msgid "No local changes to save"
msgstr ""
-#: git-stash.sh:308
+#: git-stash.sh:325
msgid "Cannot initialize stash"
msgstr ""
-#: git-stash.sh:312
+#: git-stash.sh:329
msgid "Cannot save the current status"
msgstr ""
-#: git-stash.sh:313
+#: git-stash.sh:330
#, sh-format
msgid "Saved working directory and index state $stash_msg"
msgstr ""
-#: git-stash.sh:340
+#: git-stash.sh:359
msgid "Cannot remove worktree changes"
msgstr ""
-#: git-stash.sh:488
+#: git-stash.sh:507
#, sh-format
msgid "unknown option: $opt"
msgstr ""
-#: git-stash.sh:501
+#: git-stash.sh:520
msgid "No stash entries found."
msgstr ""
-#: git-stash.sh:508
+#: git-stash.sh:527
#, sh-format
msgid "Too many revisions specified: $REV"
msgstr ""
-#: git-stash.sh:523
+#: git-stash.sh:542
#, sh-format
msgid "$reference is not a valid reference"
msgstr ""
-#: git-stash.sh:551
+#: git-stash.sh:570
#, sh-format
msgid "'$args' is not a stash-like commit"
msgstr ""
-#: git-stash.sh:562
+#: git-stash.sh:581
#, sh-format
msgid "'$args' is not a stash reference"
msgstr ""
-#: git-stash.sh:570
+#: git-stash.sh:589
msgid "unable to refresh index"
msgstr ""
-#: git-stash.sh:574
+#: git-stash.sh:593
msgid "Cannot apply a stash in the middle of a merge"
msgstr ""
-#: git-stash.sh:582
+#: git-stash.sh:601
msgid "Conflicts in index. Try without --index."
msgstr ""
-#: git-stash.sh:584
+#: git-stash.sh:603
msgid "Could not save index tree"
msgstr ""
-#: git-stash.sh:593
+#: git-stash.sh:612
msgid "Could not restore untracked files from stash entry"
msgstr ""
-#: git-stash.sh:618
+#: git-stash.sh:637
msgid "Cannot unstage modified files"
msgstr ""
-#: git-stash.sh:633
+#: git-stash.sh:652
msgid "Index was not unstashed."
msgstr ""
-#: git-stash.sh:647
+#: git-stash.sh:666
msgid "The stash entry is kept in case you need it again."
msgstr ""
-#: git-stash.sh:656
+#: git-stash.sh:675
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr ""
-#: git-stash.sh:657
+#: git-stash.sh:676
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr ""
-#: git-stash.sh:665
+#: git-stash.sh:684
msgid "No branch name specified"
msgstr ""
-#: git-stash.sh:744
+#: git-stash.sh:763
msgid "(To restore them type \"git stash apply\")"
msgstr ""
-#: git-submodule.sh:181
+#: git-submodule.sh:198
msgid "Relative path can only be used from the toplevel of the working tree"
msgstr ""
-#: git-submodule.sh:191
+#: git-submodule.sh:208
#, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
msgstr ""
-#: git-submodule.sh:210
+#: git-submodule.sh:227
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr ""
-#: git-submodule.sh:213
+#: git-submodule.sh:230
#, sh-format
msgid "'$sm_path' already exists in the index and is not a submodule"
msgstr ""
-#: git-submodule.sh:219
+#: git-submodule.sh:236
#, 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:259
#, sh-format
msgid "Adding existing repo at '$sm_path' to the index"
msgstr ""
-#: git-submodule.sh:239
+#: git-submodule.sh:261
#, sh-format
msgid "'$sm_path' already exists and is not a valid git repo"
msgstr ""
-#: git-submodule.sh:247
+#: git-submodule.sh:269
#, sh-format
msgid "A git directory for '$sm_name' is found locally with remote(s):"
msgstr ""
-#: git-submodule.sh:249
+#: git-submodule.sh:271
#, 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:277
#, sh-format
msgid "Reactivating local git directory for submodule '$sm_name'."
msgstr ""
-#: git-submodule.sh:267
+#: git-submodule.sh:289
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
msgstr ""
-#: git-submodule.sh:272
+#: git-submodule.sh:294
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr ""
-#: git-submodule.sh:281
+#: git-submodule.sh:303
#, 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:563
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:594
+#: git-submodule.sh:573
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr ""
-#: git-submodule.sh:599
+#: git-submodule.sh:578
#, sh-format
msgid ""
"Unable to find current ${remote_name}/${branch} revision in submodule path "
"'$sm_path'"
msgstr ""
-#: git-submodule.sh:617
+#: git-submodule.sh:596
#, sh-format
msgid "Unable to fetch in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:623
+#: git-submodule.sh:602
#, 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:609
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:631
+#: git-submodule.sh:610
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr ""
-#: git-submodule.sh:635
+#: git-submodule.sh:614
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:636
+#: git-submodule.sh:615
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr ""
-#: git-submodule.sh:641
+#: git-submodule.sh:620
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:642
+#: git-submodule.sh:621
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr ""
-#: git-submodule.sh:647
+#: git-submodule.sh:626
#, sh-format
msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:648
+#: git-submodule.sh:627
#, sh-format
msgid "Submodule path '$displaypath': '$command $sha1'"
msgstr ""
-#: git-submodule.sh:679
+#: git-submodule.sh:658
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:775
+#: git-submodule.sh:754
msgid "The --cached option cannot be used with the --files option"
msgstr ""
-#: git-submodule.sh:827
+#: git-submodule.sh:806
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr ""
-#: git-submodule.sh:847
+#: git-submodule.sh:826
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr ""
-#: git-submodule.sh:850
+#: git-submodule.sh:829
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr ""
-#: git-submodule.sh:853
+#: git-submodule.sh:832
#, 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 "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:650
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:468
#, perl-format
msgid "Unknown --suppress-cc field: '%s'\n"
msgstr ""
-#: git-send-email.perl:485
+#: git-send-email.perl:497
#, perl-format
msgid "Unknown --confirm setting: '%s'\n"
msgstr ""
-#: git-send-email.perl:513
+#: git-send-email.perl:525
#, perl-format
msgid "warning: sendmail alias with quotes is not supported: %s\n"
msgstr ""
-#: git-send-email.perl:515
+#: git-send-email.perl:527
#, perl-format
msgid "warning: `:include:` not supported: %s\n"
msgstr ""
-#: git-send-email.perl:517
+#: git-send-email.perl:529
#, perl-format
msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
msgstr ""
-#: git-send-email.perl:522
+#: git-send-email.perl:534
#, perl-format
msgid "warning: sendmail line is not recognized: %s\n"
msgstr ""
-#: git-send-email.perl:604
+#: git-send-email.perl:616
#, 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:637
#, perl-format
msgid "Failed to opendir %s: %s"
msgstr ""
-#: git-send-email.perl:649
+#: git-send-email.perl:661
#, perl-format
msgid ""
"fatal: %s: %s\n"
"warning: no patches were sent\n"
msgstr ""
-#: git-send-email.perl:660
+#: git-send-email.perl:672
msgid ""
"\n"
"No patch files specified!\n"
"\n"
msgstr ""
-#: git-send-email.perl:673
+#: git-send-email.perl:685
#, perl-format
msgid "No subject line in %s?"
msgstr ""
-#: git-send-email.perl:683
+#: git-send-email.perl:695
#, perl-format
msgid "Failed to open for writing %s: %s"
msgstr ""
-#: git-send-email.perl:694
+#: git-send-email.perl:706
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:730
#, perl-format
msgid "Failed to open %s: %s"
msgstr ""
-#: git-send-email.perl:735
+#: git-send-email.perl:747
#, perl-format
msgid "Failed to open %s.final: %s"
msgstr ""
-#: git-send-email.perl:778
+#: git-send-email.perl:790
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:825
#, perl-format
msgid "Are you sure you want to use <%s> [y/N]? "
msgstr ""
-#: git-send-email.perl:868
+#: git-send-email.perl:880
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:885
msgid "Which 8bit encoding should I declare [UTF-8]? "
msgstr ""
-#: git-send-email.perl:881
+#: git-send-email.perl:893
#, perl-format
msgid ""
"Refusing to send because the patch\n"
"want to send.\n"
msgstr ""
-#: git-send-email.perl:900
+#: git-send-email.perl:912
msgid "To whom should the emails be sent (if anyone)?"
msgstr ""
-#: git-send-email.perl:918
+#: git-send-email.perl:930
#, perl-format
msgid "fatal: alias '%s' expands to itself\n"
msgstr ""
-#: git-send-email.perl:930
+#: git-send-email.perl:942
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:1000 git-send-email.perl:1008
#, 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:1012
msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
msgstr ""
-#: git-send-email.perl:1317
+#: git-send-email.perl:1329
#, perl-format
msgid "CA path \"%s\" does not exist"
msgstr ""
-#: git-send-email.perl:1395
+#: git-send-email.perl:1412
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:1427
+msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
msgstr ""
-#: git-send-email.perl:1413
+#: git-send-email.perl:1430
msgid "Send this email reply required"
msgstr ""
-#: git-send-email.perl:1439
+#: git-send-email.perl:1458
msgid "The required SMTP server is not properly defined."
msgstr ""
-#: git-send-email.perl:1486
+#: git-send-email.perl:1505
#, perl-format
msgid "Server does not support STARTTLS! %s"
msgstr ""
-#: git-send-email.perl:1491 git-send-email.perl:1495
+#: git-send-email.perl:1510 git-send-email.perl:1514
#, perl-format
msgid "STARTTLS failed! %s"
msgstr ""
-#: git-send-email.perl:1505
+#: git-send-email.perl:1523
msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
msgstr ""
-#: git-send-email.perl:1523
+#: git-send-email.perl:1541
#, perl-format
msgid "Failed to send %s\n"
msgstr ""
-#: git-send-email.perl:1526
+#: git-send-email.perl:1544
#, perl-format
msgid "Dry-Sent %s\n"
msgstr ""
-#: git-send-email.perl:1526
+#: git-send-email.perl:1544
#, perl-format
msgid "Sent %s\n"
msgstr ""
-#: git-send-email.perl:1528
+#: git-send-email.perl:1546
msgid "Dry-OK. Log says:\n"
msgstr ""
-#: git-send-email.perl:1528
+#: git-send-email.perl:1546
msgid "OK. Log says:\n"
msgstr ""
-#: git-send-email.perl:1540
+#: git-send-email.perl:1558
msgid "Result: "
msgstr ""
-#: git-send-email.perl:1543
+#: git-send-email.perl:1561
msgid "Result: OK\n"
msgstr ""
-#: git-send-email.perl:1556
+#: git-send-email.perl:1579
#, perl-format
msgid "can't open file %s"
msgstr ""
-#: git-send-email.perl:1603 git-send-email.perl:1623
+#: git-send-email.perl:1626 git-send-email.perl:1646
#, perl-format
msgid "(mbox) Adding cc: %s from line '%s'\n"
msgstr ""
-#: git-send-email.perl:1609
+#: git-send-email.perl:1632
#, perl-format
msgid "(mbox) Adding to: %s from line '%s'\n"
msgstr ""
-#: git-send-email.perl:1657
+#: git-send-email.perl:1685
#, perl-format
msgid "(non-mbox) Adding cc: %s from line '%s'\n"
msgstr ""
-#: git-send-email.perl:1682
+#: git-send-email.perl:1720
#, perl-format
msgid "(body) Adding cc: %s from line '%s'\n"
msgstr ""
-#: git-send-email.perl:1788
+#: git-send-email.perl:1831
#, perl-format
msgid "(%s) Could not execute '%s'"
msgstr ""
-#: git-send-email.perl:1795
+#: git-send-email.perl:1838
#, perl-format
msgid "(%s) Adding %s: %s from: '%s'\n"
msgstr ""
-#: git-send-email.perl:1799
+#: git-send-email.perl:1842
#, perl-format
msgid "(%s) failed to close pipe to '%s'"
msgstr ""
-#: git-send-email.perl:1826
+#: git-send-email.perl:1872
msgid "cannot send message as 7bit"
msgstr ""
-#: git-send-email.perl:1834
+#: git-send-email.perl:1880
msgid "invalid transfer encoding"
msgstr ""
-#: git-send-email.perl:1872 git-send-email.perl:1923 git-send-email.perl:1933
+#: git-send-email.perl:1921 git-send-email.perl:1973 git-send-email.perl:1983
#, perl-format
msgid "unable to open %s: %s\n"
msgstr ""
-#: git-send-email.perl:1875
+#: git-send-email.perl:1924
#, perl-format
msgid "%s: patch contains a line longer than 998 characters"
msgstr ""
-#: git-send-email.perl:1891
+#: git-send-email.perl:1941
#, 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:1945
#, perl-format
msgid "Do you really want to send %s? [y|N]: "
msgstr ""