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: 2018-12-02 10:55+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:99
#, c-format
-msgid "hint: %.*s\n"
+msgid "%shint: %.*s%s\n"
msgstr ""
-#: advice.c:90
+#: advice.c:152
msgid "Cherry-picking is not possible because you have unmerged files."
msgstr ""
-#: advice.c:92
+#: advice.c:154
msgid "Committing is not possible because you have unmerged files."
msgstr ""
-#: advice.c:94
+#: advice.c:156
msgid "Merging is not possible because you have unmerged files."
msgstr ""
-#: advice.c:96
+#: advice.c:158
msgid "Pulling is not possible because you have unmerged files."
msgstr ""
-#: advice.c:98
+#: advice.c:160
msgid "Reverting is not possible because you have unmerged files."
msgstr ""
-#: advice.c:100
+#: advice.c:162
#, c-format
msgid "It is not possible to %s because you have unmerged files."
msgstr ""
-#: advice.c:108
+#: advice.c:170
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:178
msgid "Exiting because of an unresolved conflict."
msgstr ""
-#: advice.c:121 builtin/merge.c:1251
+#: advice.c:183 builtin/merge.c:1289
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr ""
-#: advice.c:123
+#: advice.c:185
msgid "Please, commit your changes before merging."
msgstr ""
-#: advice.c:124
+#: advice.c:186
msgid "Exiting because of unfinished merge."
msgstr ""
-#: advice.c:130
+#: advice.c:192
#, c-format
msgid ""
"Note: checking out '%s'.\n"
"\n"
msgstr ""
-#: apply.c:58
+#: 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:826
#, c-format
msgid "Cannot prepare timestamp regexp %s"
msgstr ""
-#: apply.c:830
+#: apply.c:835
#, c-format
msgid "regexec returned %d for input: %s"
msgstr ""
-#: apply.c:904
+#: apply.c:909
#, c-format
msgid "unable to find filename in patch at line %d"
msgstr ""
-#: apply.c:942
+#: apply.c:947
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
msgstr ""
-#: apply.c:948
+#: apply.c:953
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr ""
-#: apply.c:949
+#: apply.c:954
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr ""
-#: apply.c:954
+#: apply.c:959
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr ""
-#: apply.c:983
+#: apply.c:988
#, c-format
msgid "invalid mode on line %d: %s"
msgstr ""
-#: apply.c:1301
+#: apply.c:1307
#, c-format
msgid "inconsistent header lines %d and %d"
msgstr ""
-#: apply.c:1473
+#: apply.c:1479
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr ""
-#: apply.c:1542
+#: apply.c:1548
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr ""
-#: apply.c:1562
+#: apply.c:1568
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
msgstr[0] ""
msgstr[1] ""
-#: apply.c:1575
+#: apply.c:1581
#, c-format
msgid "git diff header lacks filename information (line %d)"
msgstr ""
-#: apply.c:1763
+#: apply.c:1769
msgid "new file depends on old contents"
msgstr ""
-#: apply.c:1765
+#: apply.c:1771
msgid "deleted file still has contents"
msgstr ""
-#: apply.c:1799
+#: apply.c:1805
#, c-format
msgid "corrupt patch at line %d"
msgstr ""
-#: apply.c:1836
+#: apply.c:1842
#, c-format
msgid "new file %s depends on old contents"
msgstr ""
-#: apply.c:1838
+#: apply.c:1844
#, c-format
msgid "deleted file %s still has contents"
msgstr ""
-#: apply.c:1841
+#: apply.c:1847
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr ""
-#: apply.c:1988
+#: apply.c:1994
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr ""
-#: apply.c:2025
+#: apply.c:2031
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr ""
-#: apply.c:2185
+#: apply.c:2193
#, c-format
msgid "patch with only garbage at line %d"
msgstr ""
-#: apply.c:2271
+#: apply.c:2279
#, c-format
msgid "unable to read symlink %s"
msgstr ""
-#: apply.c:2275
+#: apply.c:2283
#, c-format
msgid "unable to open or read %s"
msgstr ""
-#: apply.c:2934
+#: apply.c:2942
#, c-format
msgid "invalid start of line: '%c'"
msgstr ""
-#: apply.c:3055
+#: apply.c:3063
#, 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:3075
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr ""
-#: apply.c:3073
+#: apply.c:3081
#, c-format
msgid ""
"while searching for:\n"
"%.*s"
msgstr ""
-#: apply.c:3095
+#: apply.c:3103
#, c-format
msgid "missing binary patch data for '%s'"
msgstr ""
-#: apply.c:3103
+#: apply.c:3111
#, c-format
msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
msgstr ""
-#: apply.c:3149
+#: apply.c:3158
#, c-format
msgid "cannot apply binary patch to '%s' without full index line"
msgstr ""
-#: apply.c:3159
+#: apply.c:3168
#, c-format
msgid ""
"the patch applies to '%s' (%s), which does not match the current contents."
msgstr ""
-#: apply.c:3167
+#: apply.c:3176
#, c-format
msgid "the patch applies to an empty '%s' but it is not empty"
msgstr ""
-#: apply.c:3185
+#: apply.c:3194
#, c-format
msgid "the necessary postimage %s for '%s' cannot be read"
msgstr ""
-#: apply.c:3198
+#: apply.c:3207
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr ""
-#: apply.c:3204
+#: apply.c:3213
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr ""
-#: apply.c:3225
+#: apply.c:3234
#, 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
#, 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:244 builtin/reset.c:142
#, 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:843 builtin/fetch.c:1122
#, 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:4719
msgid "unable to read index file"
msgstr ""
-#: apply.c:4837
+#: apply.c:4874
#, c-format
msgid "can't open patch '%s': %s"
msgstr ""
-#: apply.c:4864
+#: apply.c:4901
#, 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:4907 apply.c:4922
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgstr[0] ""
msgstr[1] ""
-#: apply.c:4878
+#: apply.c:4915
#, 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:4931 builtin/add.c:538 builtin/mv.c:300 builtin/rm.c:389
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:4958 apply.c:4961 builtin/am.c:2209 builtin/am.c:2212
+#: builtin/clone.c:121 builtin/fetch.c:118 builtin/merge.c:262
+#: builtin/pull.c:199 builtin/submodule--helper.c:406
+#: builtin/submodule--helper.c:1362 builtin/submodule--helper.c:1365
+#: builtin/submodule--helper.c:1846 builtin/submodule--helper.c:1849
+#: builtin/submodule--helper.c:2088 git-add--interactive.perl:197
msgid "path"
msgstr ""
-#: apply.c:4922
+#: apply.c:4959
msgid "don't apply changes matching the given path"
msgstr ""
-#: apply.c:4925
+#: apply.c:4962
msgid "apply changes matching the given path"
msgstr ""
-#: apply.c:4927 builtin/am.c:2263
+#: apply.c:4964 builtin/am.c:2218
msgid "num"
msgstr ""
-#: apply.c:4928
+#: apply.c:4965
msgid "remove <num> leading slashes from traditional diff paths"
msgstr ""
-#: apply.c:4931
+#: apply.c:4968
msgid "ignore additions made by the patch"
msgstr ""
-#: apply.c:4933
+#: apply.c:4970
msgid "instead of applying the patch, output diffstat for the input"
msgstr ""
-#: apply.c:4937
+#: apply.c:4974
msgid "show number of added and deleted lines in decimal notation"
msgstr ""
-#: apply.c:4939
+#: apply.c:4976
msgid "instead of applying the patch, output a summary for the input"
msgstr ""
-#: apply.c:4941
+#: apply.c:4978
msgid "instead of applying the patch, see if the patch is applicable"
msgstr ""
-#: apply.c:4943
+#: apply.c:4980
msgid "make sure the patch is applicable to the current index"
msgstr ""
-#: apply.c:4945
+#: apply.c:4982
+msgid "mark new files with `git add --intent-to-add`"
+msgstr ""
+
+#: apply.c:4984
msgid "apply a patch without touching the working tree"
msgstr ""
-#: apply.c:4947
+#: apply.c:4986
msgid "accept a patch that touches outside the working area"
msgstr ""
-#: apply.c:4950
+#: apply.c:4989
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr ""
-#: apply.c:4952
+#: apply.c:4991
msgid "attempt three-way merge if a patch does not apply"
msgstr ""
-#: apply.c:4954
+#: apply.c:4993
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:4996 builtin/checkout-index.c:170 builtin/ls-files.c:523
msgid "paths are separated with NUL character"
msgstr ""
-#: apply.c:4959
+#: apply.c:4998
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:4999 builtin/am.c:2197 builtin/interpret-trailers.c:97
+#: builtin/interpret-trailers.c:99 builtin/interpret-trailers.c:101
+#: builtin/pack-objects.c:3312 builtin/rebase.c:857
msgid "action"
msgstr ""
-#: apply.c:4961
+#: apply.c:5000
msgid "detect new or modified lines that have whitespace errors"
msgstr ""
-#: apply.c:4964 apply.c:4967
+#: apply.c:5003 apply.c:5006
msgid "ignore changes in whitespace when finding context"
msgstr ""
-#: apply.c:4970
+#: apply.c:5009
msgid "apply the patch in reverse"
msgstr ""
-#: apply.c:4972
+#: apply.c:5011
msgid "don't expect at least one line of context"
msgstr ""
-#: apply.c:4974
+#: apply.c:5013
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr ""
-#: apply.c:4976
+#: apply.c:5015
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:5016 builtin/add.c:290 builtin/check-ignore.c:21
+#: builtin/commit.c:1309 builtin/count-objects.c:98 builtin/fsck.c:698
+#: builtin/log.c:2023 builtin/mv.c:122 builtin/read-tree.c:127
+#: builtin/rebase--interactive.c:157
msgid "be verbose"
msgstr ""
-#: apply.c:4979
+#: apply.c:5018
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr ""
-#: apply.c:4982
+#: apply.c:5021
msgid "do not trust the line counts in the hunk headers"
msgstr ""
-#: apply.c:4984 builtin/am.c:2251
+#: apply.c:5023 builtin/am.c:2206
msgid "root"
msgstr ""
-#: apply.c:4985
+#: apply.c:5024
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:370 builtin/add.c:176 builtin/add.c:514 builtin/rm.c:298
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr ""
-#: archive.c:436
+#: archive.c:453
msgid "fmt"
msgstr ""
-#: archive.c:436
+#: archive.c:453
msgid "archive format"
msgstr ""
-#: archive.c:437 builtin/log.c:1462
+#: archive.c:454 builtin/log.c:1536
msgid "prefix"
msgstr ""
-#: archive.c:438
+#: archive.c:455
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:456 builtin/blame.c:820 builtin/blame.c:821 builtin/config.c:129
+#: builtin/fast-export.c:1013 builtin/fast-export.c:1015 builtin/grep.c:884
+#: builtin/hash-object.c:104 builtin/ls-files.c:559 builtin/ls-files.c:562
+#: builtin/notes.c:412 builtin/notes.c:575 builtin/read-tree.c:122
+#: parse-options.h:162
msgid "file"
msgstr ""
-#: archive.c:440 builtin/archive.c:89
+#: archive.c:457 builtin/archive.c:89
msgid "write the archive to this file"
msgstr ""
-#: archive.c:442
+#: archive.c:459
msgid "read .gitattributes in working directory"
msgstr ""
-#: archive.c:443
+#: archive.c:460
msgid "report archived files on stderr"
msgstr ""
-#: archive.c:444
+#: archive.c:461
msgid "store only"
msgstr ""
-#: archive.c:445
+#: archive.c:462
msgid "compress faster"
msgstr ""
-#: archive.c:453
+#: archive.c:470
msgid "compress better"
msgstr ""
-#: archive.c:456
+#: archive.c:473
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:475 builtin/archive.c:90 builtin/clone.c:111 builtin/clone.c:114
+#: builtin/submodule--helper.c:1374 builtin/submodule--helper.c:1855
msgid "repo"
msgstr ""
-#: archive.c:459 builtin/archive.c:91
+#: archive.c:476 builtin/archive.c:91
msgid "retrieve the archive from remote repository <repo>"
msgstr ""
-#: archive.c:460 builtin/archive.c:92 builtin/notes.c:489
+#: archive.c:477 builtin/archive.c:92 builtin/difftool.c:714
+#: builtin/notes.c:496
msgid "command"
msgstr ""
-#: archive.c:461 builtin/archive.c:93
+#: archive.c:478 builtin/archive.c:93
msgid "path to the remote git-upload-archive command"
msgstr ""
-#: archive.c:468
+#: archive.c:485
msgid "Unexpected option --remote"
msgstr ""
-#: archive.c:470
+#: archive.c:487
msgid "Option --exec can only be used together with --remote"
msgstr ""
-#: archive.c:472
+#: archive.c:489
msgid "Unexpected option --output"
msgstr ""
-#: archive.c:494
+#: archive.c:511
#, c-format
msgid "Unknown archive format '%s'"
msgstr ""
-#: archive.c:501
+#: archive.c:518
#, 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:224 builtin/pack-objects.c:227
+#, c-format
+msgid "deflate error (%d)"
+msgstr ""
+
+#: archive-zip.c:609
+#, c-format
+msgid "timestamp too large for this system: %<PRIuMAX>"
+msgstr ""
+
+#: attr.c:212
#, c-format
msgid "%.*s is not a valid attribute name"
msgstr ""
-#: attr.c:415
+#: attr.c:409
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:676
#, c-format
msgid "We cannot bisect more!\n"
msgstr ""
-#: bisect.c:722
+#: bisect.c:730
#, c-format
msgid "Not a valid commit name %s"
msgstr ""
-#: bisect.c:746
+#: bisect.c:754
#, 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:759
#, 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:764
#, 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:772
#, 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:785
#, c-format
msgid ""
"the merge base between %s and [%s] must be skipped.\n"
"We continue anyway."
msgstr ""
-#: bisect.c:810
+#: bisect.c:818
#, c-format
msgid "Bisecting: a merge base must be tested\n"
msgstr ""
-#: bisect.c:850
+#: bisect.c:858
#, c-format
msgid "a %s revision is needed"
msgstr ""
-#: bisect.c:869 builtin/notes.c:175 builtin/tag.c:235
+#: bisect.c:877 builtin/notes.c:177 builtin/tag.c:237
#, c-format
msgid "could not create file '%s'"
msgstr ""
-#: bisect.c:920
+#: bisect.c:928 builtin/merge.c:138
#, c-format
msgid "could not read file '%s'"
msgstr ""
-#: bisect.c:950
+#: bisect.c:958
msgid "reading bisect refs failed"
msgstr ""
-#: bisect.c:969
+#: bisect.c:977
#, c-format
msgid "%s was both %s and %s\n"
msgstr ""
-#: bisect.c:977
+#: bisect.c:985
#, c-format
msgid ""
"No testable commit found.\n"
"Maybe you started with bad path parameters?\n"
msgstr ""
-#: bisect.c:996
+#: bisect.c:1004
#, c-format
msgid "(roughly %d step)"
msgid_plural "(roughly %d steps)"
#. TRANSLATORS: the last %s will be replaced with "(roughly %d
#. steps)" translation.
#.
-#: bisect.c:1002
+#: bisect.c:1010
#, c-format
msgid "Bisecting: %d revision left to test after this %s\n"
msgid_plural "Bisecting: %d revisions left to test after this %s\n"
msgstr[0] ""
msgstr[1] ""
-#: blame.c:1758
+#: blame.c:1787
msgid "--contents and --reverse do not blend well."
msgstr ""
-#: blame.c:1769
+#: blame.c:1801
msgid "cannot use --contents with final commit object name"
msgstr ""
-#: blame.c:1789
+#: blame.c:1822
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:1831 bundle.c:162 ref-filter.c:2046 sequencer.c:1963
+#: sequencer.c:4002 builtin/commit.c:1001 builtin/log.c:377 builtin/log.c:932
+#: builtin/log.c:1407 builtin/log.c:1783 builtin/log.c:2072 builtin/merge.c:406
+#: 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:1849
msgid ""
"--reverse --first-parent together require range along first-parent chain"
msgstr ""
-#: blame.c:1827
+#: blame.c:1860
#, c-format
msgid "no such path %s in %s"
msgstr ""
-#: blame.c:1838
+#: blame.c:1871
#, 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"
"\"git push -u\" to set the upstream config as you push."
msgstr ""
-#: branch.c:280
+#: branch.c:279
#, c-format
msgid "Not a valid object name: '%s'."
msgstr ""
-#: branch.c:300
+#: branch.c:299
#, c-format
msgid "Ambiguous object name: '%s'."
msgstr ""
-#: branch.c:305
+#: branch.c:304
#, c-format
msgid "Not a valid branch point: '%s'."
msgstr ""
-#: branch.c:359
+#: branch.c:358
#, c-format
msgid "'%s' is already checked out at '%s'"
msgstr ""
-#: branch.c:382
+#: branch.c:381
#, c-format
msgid "HEAD of working tree %s is not updated"
msgstr ""
-#: bundle.c:34
+#: bundle.c:36
#, c-format
msgid "'%s' does not look like a v2 bundle file"
msgstr ""
-#: bundle.c:62
+#: bundle.c:64
#, c-format
msgid "unrecognized header: %s%s (%d)"
msgstr ""
-#: bundle.c:88 sequencer.c:1879 sequencer.c:2337 builtin/commit.c:750
+#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2182 sequencer.c:2722
+#: builtin/commit.c:774
#, c-format
msgid "could not open '%s'"
msgstr ""
-#: bundle.c:139
+#: bundle.c:141
msgid "Repository lacks these prerequisite commits:"
msgstr ""
-#: bundle.c:190
+#: bundle.c:192
#, 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:199
msgid "The bundle records a complete history."
msgstr ""
-#: bundle.c:199
+#: bundle.c:201
#, 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:267
+msgid "unable to dup bundle descriptor"
+msgstr ""
+
+#: bundle.c:274
msgid "Could not spawn pack-objects"
msgstr ""
-#: bundle.c:269
+#: bundle.c:285
msgid "pack-objects died"
msgstr ""
-#: bundle.c:311
+#: bundle.c:327
msgid "rev-list died"
msgstr ""
-#: bundle.c:360
+#: bundle.c:376
#, 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:456 builtin/log.c:192 builtin/log.c:1688 builtin/shortlog.c:304
#, c-format
msgid "unrecognized argument: %s"
msgstr ""
-#: bundle.c:458
+#: bundle.c:464
msgid "Refusing to create empty bundle."
msgstr ""
-#: bundle.c:470
+#: bundle.c:474
#, c-format
msgid "cannot create '%s'"
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:2528 builtin/am.c:370 builtin/am.c:414
+#: builtin/am.c:1390 builtin/am.c:2025 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:1115
+#, c-format
+msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
+msgstr ""
+
+#: commit.c:1118
+#, c-format
+msgid "Commit %s has a bad GPG signature allegedly by %s."
+msgstr ""
+
+#: commit.c:1121
+#, c-format
+msgid "Commit %s does not have a GPG signature."
+msgstr ""
+
+#: commit.c:1124
+#, c-format
+msgid "Commit %s has a good GPG signature by %s\n"
+msgstr ""
+
+#: commit.c:1378
msgid ""
"Warning: commit message did not conform to UTF-8.\n"
"You may want to amend it after fixing the message, or set the config\n"
"variable i18n.commitencoding to the encoding your project uses.\n"
msgstr ""
+#: commit-graph.c:108
+#, c-format
+msgid "graph file %s is too small"
+msgstr ""
+
+#: commit-graph.c:115
+#, c-format
+msgid "graph signature %X does not match signature %X"
+msgstr ""
+
+#: commit-graph.c:122
+#, c-format
+msgid "graph version %X does not match version %X"
+msgstr ""
+
+#: commit-graph.c:129
+#, c-format
+msgid "hash version %X does not match version %X"
+msgstr ""
+
+#: commit-graph.c:153
+#, c-format
+msgid "improper chunk offset %08x%08x"
+msgstr ""
+
+#: commit-graph.c:189
+#, c-format
+msgid "chunk id %08x appears multiple times"
+msgstr ""
+
+#: commit-graph.c:308
+#, c-format
+msgid "could not find commit %s"
+msgstr ""
+
+#: commit-graph.c:617 builtin/pack-objects.c:2652
+#, c-format
+msgid "unable to get type of object %s"
+msgstr ""
+
+#: commit-graph.c:651
+msgid "Annotating commits in commit graph"
+msgstr ""
+
+#: commit-graph.c:691
+msgid "Computing commit graph generation numbers"
+msgstr ""
+
+#: commit-graph.c:803 commit-graph.c:826 commit-graph.c:852
+msgid "Finding commits for commit graph"
+msgstr ""
+
+#: commit-graph.c:812
+#, c-format
+msgid "error adding pack %s"
+msgstr ""
+
+#: commit-graph.c:814
+#, c-format
+msgid "error opening index for %s"
+msgstr ""
+
+#: commit-graph.c:868
+#, c-format
+msgid "the commit graph format cannot write %d commits"
+msgstr ""
+
+#: commit-graph.c:895
+msgid "too many commits to write graph"
+msgstr ""
+
+#: commit-graph.c:902 midx.c:769
+#, c-format
+msgid "unable to create leading directories of %s"
+msgstr ""
+
+#: commit-graph.c:1002
+msgid "the commit-graph file has incorrect checksum and is likely corrupt"
+msgstr ""
+
+#: commit-graph.c:1046
+msgid "Verifying commits in commit graph"
+msgstr ""
+
#: compat/obstack.c:405 compat/obstack.c:407
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:2296
+#, 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:3391
#, 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 "failed to write new configuration file %s"
+msgstr ""
+
+#: config.c:2717 config.c:3041
+#, c-format
+msgid "could not lock config file %s"
+msgstr ""
+
+#: config.c:2728
+#, c-format
+msgid "opening %s"
+msgstr ""
+
+#: config.c:2763 builtin/config.c:327
+#, c-format
+msgid "invalid pattern: %s"
+msgstr ""
+
+#: config.c:2788
+#, c-format
+msgid "invalid config file %s"
+msgstr ""
+
+#: config.c:2801 config.c:3054
#, c-format
msgid "fstat on %s failed"
msgstr ""
-#: config.c:2706
+#: config.c:2812
+#, c-format
+msgid "unable to mmap '%s'"
+msgstr ""
+
+#: config.c:2821 config.c:3059
+#, c-format
+msgid "chmod on %s failed"
+msgstr ""
+
+#: config.c:2906 config.c:3156
+#, c-format
+msgid "could not write config file %s"
+msgstr ""
+
+#: config.c:2940
#, c-format
msgid "could not set '%s' to '%s'"
msgstr ""
-#: config.c:2708 builtin/remote.c:776
+#: config.c:2942 builtin/remote.c:782
#, c-format
msgid "could not unset '%s'"
msgstr ""
-#: connect.c:52
-msgid "The remote end hung up upon initial contact"
+#: config.c:3032
+#, c-format
+msgid "invalid section name: %s"
+msgstr ""
+
+#: config.c:3199
+#, c-format
+msgid "missing value for '%s'"
+msgstr ""
+
+#: connect.c:61
+msgid "the remote end hung up upon initial contact"
msgstr ""
-#: connect.c:54
+#: connect.c:63
msgid ""
"Could not read from remote repository.\n"
"\n"
"and the repository exists."
msgstr ""
-#: connected.c:66 builtin/fsck.c:198 builtin/prune.c:144
-msgid "Checking connectivity"
+#: connect.c:81
+#, c-format
+msgid "server doesn't support '%s'"
msgstr ""
-#: connected.c:78
-msgid "Could not run 'git rev-list'"
+#: connect.c:103
+#, c-format
+msgid "server doesn't support feature '%s'"
msgstr ""
-#: connected.c:98
-msgid "failed write to rev-list"
+#: connect.c:114
+msgid "expected flush after capabilities"
msgstr ""
-#: connected.c:105
-msgid "failed to close rev-list's stdin"
+#: connect.c:233
+#, c-format
+msgid "ignoring capabilities after first line '%s'"
msgstr ""
-#: convert.c:205
-#, c-format
-msgid "CRLF would be replaced by LF in %s."
+#: connect.c:252
+msgid "protocol error: unexpected capabilities^{}"
msgstr ""
-#: convert.c:207
+#: connect.c:273
#, c-format
-msgid ""
-"CRLF will be replaced by LF in %s.\n"
-"The file will have its original line endings in your working directory."
+msgid "protocol error: expected shallow sha-1, got '%s'"
msgstr ""
-#: convert.c:215
-#, c-format
-msgid "LF would be replaced by CRLF in %s"
+#: connect.c:275
+msgid "repository on the other end cannot be shallow"
msgstr ""
-#: convert.c:217
+#: connect.c:310 fetch-pack.c:182 builtin/archive.c:63
#, c-format
-msgid ""
-"LF will be replaced by CRLF in %s.\n"
-"The file will have its original line endings in your working directory."
+msgid "remote error: %s"
msgstr ""
-#: date.c:116
-msgid "in the future"
+#: connect.c:316
+msgid "invalid packet"
+msgstr ""
+
+#: connect.c:336
+#, c-format
+msgid "protocol error: unexpected '%s'"
+msgstr ""
+
+#: connect.c:444
+#, c-format
+msgid "invalid ls-refs response: %s"
+msgstr ""
+
+#: connect.c:448
+msgid "expected flush after ref listing"
+msgstr ""
+
+#: connect.c:547
+#, c-format
+msgid "protocol '%s' is not supported"
+msgstr ""
+
+#: connect.c:598
+msgid "unable to set SO_KEEPALIVE on socket"
+msgstr ""
+
+#: connect.c:638 connect.c:701
+#, c-format
+msgid "Looking up %s ... "
+msgstr ""
+
+#: connect.c:642
+#, c-format
+msgid "unable to look up %s (port %s) (%s)"
+msgstr ""
+
+#. TRANSLATORS: this is the end of "Looking up %s ... "
+#: connect.c:646 connect.c:717
+#, c-format
+msgid ""
+"done.\n"
+"Connecting to %s (port %s) ... "
+msgstr ""
+
+#: connect.c:668 connect.c:745
+#, c-format
+msgid ""
+"unable to connect to %s:\n"
+"%s"
+msgstr ""
+
+#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
+#: connect.c:674 connect.c:751
+msgid "done."
+msgstr ""
+
+#: connect.c:705
+#, c-format
+msgid "unable to look up %s (%s)"
+msgstr ""
+
+#: connect.c:711
+#, c-format
+msgid "unknown port %s"
+msgstr ""
+
+#: connect.c:848 connect.c:1174
+#, c-format
+msgid "strange hostname '%s' blocked"
+msgstr ""
+
+#: connect.c:850
+#, c-format
+msgid "strange port '%s' blocked"
+msgstr ""
+
+#: connect.c:860
+#, c-format
+msgid "cannot start proxy %s"
+msgstr ""
+
+#: connect.c:927
+msgid "no path specified; see 'git help pull' for valid url syntax"
+msgstr ""
+
+#: connect.c:1122
+msgid "ssh variant 'simple' does not support -4"
+msgstr ""
+
+#: connect.c:1134
+msgid "ssh variant 'simple' does not support -6"
+msgstr ""
+
+#: connect.c:1151
+msgid "ssh variant 'simple' does not support setting port"
+msgstr ""
+
+#: connect.c:1262
+#, c-format
+msgid "strange pathname '%s' blocked"
+msgstr ""
+
+#: connect.c:1307
+msgid "unable to fork"
+msgstr ""
+
+#: connected.c:68 builtin/fsck.c:202 builtin/prune.c:147
+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:194
+#, c-format
+msgid "illegal crlf_action %d"
+msgstr ""
+
+#: convert.c:207
+#, c-format
+msgid "CRLF would be replaced by LF in %s"
+msgstr ""
+
+#: convert.c:209
+#, c-format
+msgid ""
+"CRLF will be replaced by LF in %s.\n"
+"The file will have its original line endings in your working directory"
+msgstr ""
+
+#: convert.c:217
+#, c-format
+msgid "LF would be replaced by CRLF in %s"
+msgstr ""
+
+#: convert.c:219
+#, c-format
+msgid ""
+"LF will be replaced by CRLF in %s.\n"
+"The file will have its original line endings in your working directory"
+msgstr ""
+
+#: convert.c:280
+#, c-format
+msgid "BOM is prohibited in '%s' if encoded as %s"
+msgstr ""
+
+#: convert.c:287
+#, c-format
+msgid ""
+"The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-"
+"tree-encoding."
+msgstr ""
+
+#: convert.c:305
+#, c-format
+msgid "BOM is required in '%s' if encoded as %s"
+msgstr ""
+
+#: convert.c:307
+#, c-format
+msgid ""
+"The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-"
+"%sLE (depending on the byte order) as working-tree-encoding."
+msgstr ""
+
+#: convert.c:425 convert.c:496
+#, c-format
+msgid "failed to encode '%s' from %s to %s"
+msgstr ""
+
+#: convert.c:468
+#, c-format
+msgid "encoding '%s' from %s to %s and back is not the same"
+msgstr ""
+
+#: convert.c:674
+#, c-format
+msgid "cannot fork to run external filter '%s'"
+msgstr ""
+
+#: convert.c:694
+#, c-format
+msgid "cannot feed the input to external filter '%s'"
+msgstr ""
+
+#: convert.c:701
+#, c-format
+msgid "external filter '%s' failed %d"
+msgstr ""
+
+#: convert.c:736 convert.c:739
+#, c-format
+msgid "read from external filter '%s' failed"
+msgstr ""
+
+#: convert.c:742 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 ""
+
+#: 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:116
+msgid "in the future"
msgstr ""
#: date.c:122
msgstr[0] ""
msgstr[1] ""
+#: delta-islands.c:268
+msgid "Propagating island marks"
+msgstr ""
+
+#: delta-islands.c:286
+#, c-format
+msgid "bad tree object %s"
+msgstr ""
+
+#: delta-islands.c:330
+#, c-format
+msgid "failed to load island regex for '%s': %s"
+msgstr ""
+
+#: delta-islands.c:386
+#, c-format
+msgid "island regex from config has too many capture groups (max=%d)"
+msgstr ""
+
+#: delta-islands.c:462
+#, 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', 'blocks', 'zebra', "
+"'dimmed-zebra', 'plain'"
+msgstr ""
+
+#: diff.c:316
+#, c-format
+msgid "ignoring unknown color-moved-ws mode '%s'"
+msgstr ""
+
+#: diff.c:323
msgid ""
-"color moved setting must be one of 'no', 'default', 'zebra', 'dimmed_zebra', "
-"'plain'"
+"color-moved-ws: allow-indentation-change cannot be combined with other white "
+"space modes"
msgstr ""
-#: diff.c:341
+#: diff.c:394
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr ""
-#: diff.c:401
+#: diff.c:454
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
"%s"
msgstr ""
-#: diff.c:3822
+#: diff.c:4140
#, c-format
msgid "external diff died, stopping at %s"
msgstr ""
-#: diff.c:4146
+#: diff.c:4482
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
msgstr ""
-#: diff.c:4149
+#: diff.c:4485
msgid "-G, -S and --find-object are mutually exclusive"
msgstr ""
-#: diff.c:4237
+#: diff.c:4563
msgid "--follow requires exactly one pathspec"
msgstr ""
-#: diff.c:4403
+#: diff.c:4729
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
"%s"
msgstr ""
-#: diff.c:4417
+#: diff.c:4743
#, c-format
msgid "Failed to parse --submodule option parameter: '%s'"
msgstr ""
-#: diff.c:5493
+#: diff.c:5823
msgid "inexact rename detection was skipped due to too many files."
msgstr ""
-#: diff.c:5496
+#: diff.c:5826
msgid "only found copies from modified paths due to too many files."
msgstr ""
-#: diff.c:5499
+#: diff.c:5829
#, 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:576
+#, c-format
+msgid "pathspec '%s' did not match any file(s) known to git"
+msgstr ""
+
+#: dir.c:965
+#, c-format
+msgid "cannot use %s as an exclude file"
+msgstr ""
+
+#: dir.c:1880
#, c-format
msgid "could not open directory '%s'"
msgstr ""
-#: dir.c:2108
+#: dir.c:2122
msgid "failed to get kernel name and information"
msgstr ""
-#: dir.c:2232
-msgid "Untracked cache is disabled on this system or location."
+#: dir.c:2246
+msgid "untracked cache is disabled on this system or location"
+msgstr ""
+
+#: dir.c:3047
+#, c-format
+msgid "index file corrupt in repo %s"
msgstr ""
-#: dir.c:3024 dir.c:3029
+#: dir.c:3092 dir.c:3097
#, c-format
msgid "could not create directories for %s"
msgstr ""
-#: dir.c:3054
+#: dir.c:3126
#, 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
+#: fetch-pack.c:163
msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
msgstr ""
-#: fetch-pack.c:284 builtin/archive.c:63
-#, c-format
-msgid "remote error: %s"
-msgstr ""
-
-#: fetch-pack.c:285
+#: fetch-pack.c:183
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr ""
-#: fetch-pack.c:337
+#: fetch-pack.c:253
msgid "--stateless-rpc requires multi_ack_detailed"
msgstr ""
-#: fetch-pack.c:428
+#: fetch-pack.c:347 fetch-pack.c:1277
#, c-format
msgid "invalid shallow line: %s"
msgstr ""
-#: fetch-pack.c:434
+#: fetch-pack.c:353 fetch-pack.c:1283
#, c-format
msgid "invalid unshallow line: %s"
msgstr ""
-#: fetch-pack.c:436
+#: fetch-pack.c:355 fetch-pack.c:1285
#, c-format
msgid "object not found: %s"
msgstr ""
-#: fetch-pack.c:439
+#: fetch-pack.c:358 fetch-pack.c:1288
#, c-format
msgid "error in object: %s"
msgstr ""
-#: fetch-pack.c:441
+#: fetch-pack.c:360 fetch-pack.c:1290
#, c-format
msgid "no shallow found: %s"
msgstr ""
-#: fetch-pack.c:444
+#: fetch-pack.c:363 fetch-pack.c:1293
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr ""
-#: fetch-pack.c:485
+#: fetch-pack.c:404
#, c-format
msgid "got %s %d %s"
msgstr ""
-#: fetch-pack.c:499
+#: fetch-pack.c:421
#, c-format
msgid "invalid commit %s"
msgstr ""
-#: fetch-pack.c:532
+#: fetch-pack.c:452
msgid "giving up"
msgstr ""
-#: fetch-pack.c:542 progress.c:229
+#: fetch-pack.c:464 progress.c:229
msgid "done"
msgstr ""
-#: fetch-pack.c:554
+#: fetch-pack.c:476
#, c-format
msgid "got %s (%d) %s"
msgstr ""
-#: fetch-pack.c:600
+#: fetch-pack.c:522
#, c-format
msgid "Marking %s as complete"
msgstr ""
-#: fetch-pack.c:788
+#: fetch-pack.c:764
#, c-format
msgid "already have %s (%s)"
msgstr ""
-#: fetch-pack.c:829
+#: fetch-pack.c:803
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr ""
-#: fetch-pack.c:837
+#: fetch-pack.c:811
msgid "protocol error: bad pack header"
msgstr ""
-#: fetch-pack.c:895
+#: fetch-pack.c:879
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr ""
-#: fetch-pack.c:911
+#: fetch-pack.c:895
#, c-format
msgid "%s failed"
msgstr ""
-#: fetch-pack.c:913
+#: fetch-pack.c:897
msgid "error in sideband demultiplexer"
msgstr ""
-#: fetch-pack.c:940
+#: fetch-pack.c:926
msgid "Server does not support shallow clients"
msgstr ""
-#: fetch-pack.c:944
+#: fetch-pack.c:930
msgid "Server supports multi_ack_detailed"
msgstr ""
-#: fetch-pack.c:947
+#: fetch-pack.c:933
msgid "Server supports no-done"
msgstr ""
-#: fetch-pack.c:953
+#: fetch-pack.c:939
msgid "Server supports multi_ack"
msgstr ""
-#: fetch-pack.c:957
+#: fetch-pack.c:943
msgid "Server supports side-band-64k"
msgstr ""
-#: fetch-pack.c:961
+#: fetch-pack.c:947
msgid "Server supports side-band"
msgstr ""
-#: fetch-pack.c:965
+#: fetch-pack.c:951
msgid "Server supports allow-tip-sha1-in-want"
msgstr ""
-#: fetch-pack.c:969
+#: fetch-pack.c:955
msgid "Server supports allow-reachable-sha1-in-want"
msgstr ""
-#: fetch-pack.c:979
+#: fetch-pack.c:965
msgid "Server supports ofs-delta"
msgstr ""
-#: fetch-pack.c:985
+#: fetch-pack.c:971 fetch-pack.c:1158
msgid "Server supports filter"
msgstr ""
-#: fetch-pack.c:993
+#: fetch-pack.c:979
#, c-format
msgid "Server version is %.*s"
msgstr ""
-#: fetch-pack.c:999
+#: fetch-pack.c:985
msgid "Server does not support --shallow-since"
msgstr ""
-#: fetch-pack.c:1003
+#: fetch-pack.c:989
msgid "Server does not support --shallow-exclude"
msgstr ""
-#: fetch-pack.c:1005
+#: fetch-pack.c:991
msgid "Server does not support --deepen"
msgstr ""
-#: fetch-pack.c:1016
+#: fetch-pack.c:1008
msgid "no common commits"
msgstr ""
-#: fetch-pack.c:1028
+#: fetch-pack.c:1020 fetch-pack.c:1418
msgid "git fetch-pack: fetch failed."
msgstr ""
-#: fetch-pack.c:1190
+#: fetch-pack.c:1153
+msgid "Server does not support shallow requests"
+msgstr ""
+
+#: fetch-pack.c:1199
+#, c-format
+msgid "error reading section header '%s'"
+msgstr ""
+
+#: fetch-pack.c:1205
+#, c-format
+msgid "expected '%s', received '%s'"
+msgstr ""
+
+#: fetch-pack.c:1244
+#, c-format
+msgid "unexpected acknowledgment line: '%s'"
+msgstr ""
+
+#: fetch-pack.c:1249
+#, c-format
+msgid "error processing acks: %d"
+msgstr ""
+
+#: fetch-pack.c:1259
+msgid "expected packfile to be sent after 'ready'"
+msgstr ""
+
+#: fetch-pack.c:1261
+msgid "expected no other sections to be sent after no 'ready'"
+msgstr ""
+
+#: fetch-pack.c:1298
+#, c-format
+msgid "error processing shallow info: %d"
+msgstr ""
+
+#: fetch-pack.c:1314
+#, c-format
+msgid "expected wanted-ref, got '%s'"
+msgstr ""
+
+#: fetch-pack.c:1324
+#, c-format
+msgid "unexpected wanted-ref: '%s'"
+msgstr ""
+
+#: fetch-pack.c:1328
+#, c-format
+msgid "error processing wanted refs: %d"
+msgstr ""
+
+#: fetch-pack.c:1642
msgid "no matching remote head"
msgstr ""
-#: fetch-pack.c:1212
+#: fetch-pack.c:1660 builtin/clone.c:664
+msgid "remote did not send all necessary objects"
+msgstr ""
+
+#: fetch-pack.c:1686
#, c-format
msgid "no such remote ref %s"
msgstr ""
-#: fetch-pack.c:1215
+#: fetch-pack.c:1689
#, c-format
msgid "Server does not allow request for unadvertised object %s"
msgstr ""
-#: gpg-interface.c:181
+#: gpg-interface.c:318
msgid "gpg failed to sign the data"
msgstr ""
-#: gpg-interface.c:211
+#: gpg-interface.c:344
msgid "could not create temporary file"
msgstr ""
-#: gpg-interface.c:214
+#: gpg-interface.c:347
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr ""
msgid "ignore invalid color '%.*s' in log.graphColors"
msgstr ""
-#: grep.c:2022
+#: grep.c:2113
#, c-format
msgid "'%s': unable to read %s"
msgstr ""
-#: grep.c:2039 setup.c:163 builtin/clone.c:407 builtin/diff.c:81
+#: grep.c:2130 setup.c:164 builtin/clone.c:410 builtin/diff.c:81
#: builtin/rm.c:134
#, c-format
msgid "failed to stat '%s'"
msgstr ""
-#: grep.c:2050
+#: grep.c:2141
#, c-format
msgid "'%s': short read"
msgstr ""
-#: help.c:179
-#, c-format
-msgid "available git commands in '%s'"
+#: help.c:23
+msgid "start a working area (see also: git help tutorial)"
msgstr ""
-#: help.c:186
-msgid "git commands available from elsewhere on your $PATH"
+#: help.c:24
+msgid "work on the current change (see also: git help everyday)"
msgstr ""
-#: help.c:217
-msgid "These are common Git commands used in various situations:"
+#: help.c:25
+msgid "examine the history and state (see also: git help revisions)"
msgstr ""
-#: help.c:281
-#, c-format
-msgid ""
-"'%s' appears to be a git command, but we were not\n"
-"able to execute it. Maybe git-%s is broken?"
+#: help.c:26
+msgid "grow, mark and tweak your common history"
msgstr ""
-#: help.c:336
-msgid "Uh oh. Your system reports no Git commands at all."
+#: help.c:27
+msgid "collaborate (see also: git help workflows)"
msgstr ""
-#: help.c:358
-#, c-format
-msgid "WARNING: You called a Git command named '%s', which does not exist."
+#: help.c:31
+msgid "Main Porcelain Commands"
msgstr ""
-#: help.c:363
-#, c-format
-msgid "Continuing under the assumption that you meant '%s'."
+#: help.c:32
+msgid "Ancillary Commands / Manipulators"
msgstr ""
-#: help.c:368
-#, c-format
-msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
+#: help.c:33
+msgid "Ancillary Commands / Interrogators"
msgstr ""
-#: help.c:376
-#, c-format
-msgid "git: '%s' is not a git command. See 'git --help'."
+#: help.c:34
+msgid "Interacting with Others"
msgstr ""
-#: help.c:380
+#: 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:296
+#, c-format
+msgid "available git commands in '%s'"
+msgstr ""
+
+#: help.c:303
+msgid "git commands available from elsewhere on your $PATH"
+msgstr ""
+
+#: help.c:312
+msgid "These are common Git commands used in various situations:"
+msgstr ""
+
+#: help.c:361 git.c:90
+#, c-format
+msgid "unsupported command listing type '%s'"
+msgstr ""
+
+#: help.c:408
+msgid "The common Git guides are:"
+msgstr ""
+
+#: help.c:517
+msgid "See 'git help <command>' to read about a specific subcommand"
+msgstr ""
+
+#: help.c:522
+msgid "External commands"
+msgstr ""
+
+#: help.c:530
+msgid "Command aliases"
+msgstr ""
+
+#: help.c:594
+#, 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:653
+msgid "Uh oh. Your system reports no Git commands at all."
+msgstr ""
+
+#: help.c:675
+#, c-format
+msgid "WARNING: You called a Git command named '%s', which does not exist."
+msgstr ""
+
+#: help.c:680
+#, c-format
+msgid "Continuing under the assumption that you meant '%s'."
+msgstr ""
+
+#: help.c:685
+#, c-format
+msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
+msgstr ""
+
+#: help.c:693
+#, c-format
+msgid "git: '%s' is not a git command. See 'git --help'."
+msgstr ""
+
+#: help.c:697
msgid ""
"\n"
"The most similar command is"
msgstr[0] ""
msgstr[1] ""
-#: help.c:395
+#: help.c:712
msgid "git version [<options>]"
msgstr ""
-#: help.c:462
+#: help.c:780
#, c-format
msgid "%s: %s - %s"
msgstr ""
-#: help.c:466
+#: help.c:784
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:606
#, c-format
msgid "invalid date format: %s"
msgstr ""
-#: list-objects-filter-options.c:36
+#: list-objects-filter-options.c:35
msgid "multiple filter-specs cannot be combined"
msgstr ""
-#: list-objects-filter-options.c:126
+#: list-objects-filter-options.c:58
+msgid "only 'tree:0' is supported"
+msgstr ""
+
+#: list-objects-filter-options.c:137
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:1899 builtin/am.c:1933
+#: builtin/checkout.c:387 builtin/checkout.c:708 builtin/clone.c:764
msgid "unable to write new index file"
msgstr ""
-#: merge-recursive.c:235
+#: merge-recursive.c:323
msgid "(bad commit)\n"
msgstr ""
-#: merge-recursive.c:257 merge-recursive.c:265
+#: merge-recursive.c:345
#, 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:353
+#, c-format
+msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
+msgstr ""
+
+#: merge-recursive.c:435
msgid "error building trees"
msgstr ""
-#: merge-recursive.c:771
+#: merge-recursive.c:906
#, c-format
msgid "failed to create path '%s'%s"
msgstr ""
-#: merge-recursive.c:782
+#: merge-recursive.c:917
#, c-format
msgid "Removing %s to make room for subdirectory\n"
msgstr ""
-#: merge-recursive.c:796 merge-recursive.c:815
+#: merge-recursive.c:931 merge-recursive.c:950
msgid ": perhaps a D/F conflict?"
msgstr ""
-#: merge-recursive.c:805
+#: merge-recursive.c:940
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr ""
-#: merge-recursive.c:847 builtin/cat-file.c:37
+#: merge-recursive.c:982 builtin/cat-file.c:39
#, c-format
msgid "cannot read object %s '%s'"
msgstr ""
-#: merge-recursive.c:849
+#: merge-recursive.c:984
#, c-format
msgid "blob expected for %s '%s'"
msgstr ""
-#: merge-recursive.c:873
+#: merge-recursive.c:1008
#, c-format
msgid "failed to open '%s': %s"
msgstr ""
-#: merge-recursive.c:884
+#: merge-recursive.c:1019
#, c-format
msgid "failed to symlink '%s': %s"
msgstr ""
-#: merge-recursive.c:889
+#: merge-recursive.c:1024
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr ""
-#: merge-recursive.c:1029
+#: merge-recursive.c:1212
+#, c-format
+msgid "Failed to merge submodule %s (not checked out)"
+msgstr ""
+
+#: merge-recursive.c:1219
+#, c-format
+msgid "Failed to merge submodule %s (commits not present)"
+msgstr ""
+
+#: merge-recursive.c:1226
+#, c-format
+msgid "Failed to merge submodule %s (commits don't follow merge-base)"
+msgstr ""
+
+#: merge-recursive.c:1234 merge-recursive.c:1246
+#, c-format
+msgid "Fast-forwarding submodule %s to the following commit:"
+msgstr ""
+
+#: merge-recursive.c:1237 merge-recursive.c:1249
+#, 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:1358
msgid "Failed to execute internal merge"
msgstr ""
-#: merge-recursive.c:1034
+#: merge-recursive.c:1363
#, c-format
msgid "Unable to add %s to database"
msgstr ""
-#: merge-recursive.c:1146
+#: merge-recursive.c:1395
+#, c-format
+msgid "Auto-merging %s"
+msgstr ""
+
+#: merge-recursive.c:1416
+#, c-format
+msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
+msgstr ""
+
+#: merge-recursive.c:1483
#, 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:1488
#, 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:1495
#, 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:1500
#, 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:1534
msgid "rename"
msgstr ""
-#: merge-recursive.c:1197
+#: merge-recursive.c:1534
msgid "renamed"
msgstr ""
-#: merge-recursive.c:1254
+#: merge-recursive.c:1588 merge-recursive.c:1737 merge-recursive.c:2369
+#: merge-recursive.c:3124
+#, c-format
+msgid "Refusing to lose dirty file at %s"
+msgstr ""
+
+#: merge-recursive.c:1602
#, c-format
msgid "%s is a directory in %s adding as %s instead"
msgstr ""
-#: merge-recursive.c:1279
+#: merge-recursive.c:1607
+#, c-format
+msgid "Refusing to lose untracked file at %s; adding as %s instead"
+msgstr ""
+
+#: merge-recursive.c:1633
#, 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:1638
msgid " (left unresolved)"
msgstr ""
-#: merge-recursive.c:1346
+#: merge-recursive.c:1699
#, c-format
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr ""
-#: merge-recursive.c:1379
+#: merge-recursive.c:1734
#, c-format
msgid "Renaming %s to %s and %s to %s instead"
msgstr ""
-#: merge-recursive.c:1582
+#: merge-recursive.c:1746
+#, c-format
+msgid "Refusing to lose untracked file at %s, even though it's in the way."
+msgstr ""
+
+#: merge-recursive.c:1952
+#, c-format
+msgid ""
+"CONFLICT (directory rename split): Unclear where to place %s because "
+"directory %s was renamed to multiple other directories, with no destination "
+"getting a majority of the files."
+msgstr ""
+
+#: merge-recursive.c:1984
+#, c-format
+msgid ""
+"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
+"implicit directory rename(s) putting the following path(s) there: %s."
+msgstr ""
+
+#: merge-recursive.c:1994
+#, c-format
+msgid ""
+"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
+"implicit directory renames tried to put these paths there: %s"
+msgstr ""
+
+#: merge-recursive.c:2086
+#, c-format
+msgid ""
+"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
+">%s in %s"
+msgstr ""
+
+#: merge-recursive.c:2331
+#, c-format
+msgid ""
+"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
+"renamed."
+msgstr ""
+
+#: merge-recursive.c:2737
#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
msgstr ""
-#: merge-recursive.c:1597
+#: merge-recursive.c:2763
#, c-format
msgid "Adding merged %s"
msgstr ""
-#: merge-recursive.c:1604 merge-recursive.c:1834
+#: merge-recursive.c:2770 merge-recursive.c:3127
#, c-format
msgid "Adding as %s instead"
msgstr ""
-#: merge-recursive.c:1661
+#: merge-recursive.c:2934
#, c-format
msgid "cannot read object %s"
msgstr ""
-#: merge-recursive.c:1664
+#: merge-recursive.c:2937
#, c-format
msgid "object %s is not a blob"
msgstr ""
-#: merge-recursive.c:1733
+#: merge-recursive.c:3006
msgid "modify"
msgstr ""
-#: merge-recursive.c:1733
+#: merge-recursive.c:3006
msgid "modified"
msgstr ""
-#: merge-recursive.c:1743
+#: merge-recursive.c:3017
msgid "content"
msgstr ""
-#: merge-recursive.c:1750
+#: merge-recursive.c:3024
msgid "add/add"
msgstr ""
-#: merge-recursive.c:1786
+#: merge-recursive.c:3071
#, 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:3093 git-submodule.sh:858
msgid "submodule"
msgstr ""
-#: merge-recursive.c:1805
+#: merge-recursive.c:3094
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr ""
-#: merge-recursive.c:1899
+#: merge-recursive.c:3216
#, c-format
msgid "Removing %s"
msgstr ""
-#: merge-recursive.c:1925
+#: merge-recursive.c:3242
msgid "file/directory"
msgstr ""
-#: merge-recursive.c:1931
+#: merge-recursive.c:3248
msgid "directory/file"
msgstr ""
-#: merge-recursive.c:1938
+#: merge-recursive.c:3255
#, 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:3264
#, c-format
msgid "Adding %s"
msgstr ""
-#: merge-recursive.c:1987
+#: merge-recursive.c:3300
#, 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:3311
msgid "Already up to date!"
msgstr ""
-#: merge-recursive.c:2000
+#: merge-recursive.c:3320
#, c-format
msgid "merging of trees %s and %s failed"
msgstr ""
-#: merge-recursive.c:2097
+#: merge-recursive.c:3419
msgid "Merging:"
msgstr ""
-#: merge-recursive.c:2110
+#: merge-recursive.c:3432
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] ""
msgstr[1] ""
-#: merge-recursive.c:2149
+#: merge-recursive.c:3471
msgid "merge returned no commit"
msgstr ""
-#: merge-recursive.c:2212
+#: merge-recursive.c:3537
#, c-format
msgid "Could not parse object '%s'"
msgstr ""
-#: merge-recursive.c:2228 builtin/merge.c:657 builtin/merge.c:816
+#: merge-recursive.c:3553 builtin/merge.c:691 builtin/merge.c:849
msgid "Unable to write index."
msgstr ""
-#: notes-merge.c:272
+#: midx.c:65
+#, c-format
+msgid "multi-pack-index file %s is too small"
+msgstr ""
+
+#: midx.c:81
+#, c-format
+msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
+msgstr ""
+
+#: midx.c:86
+#, c-format
+msgid "multi-pack-index version %d not recognized"
+msgstr ""
+
+#: midx.c:91
+#, c-format
+msgid "hash version %u does not match"
+msgstr ""
+
+#: midx.c:105
+msgid "invalid chunk offset (too large)"
+msgstr ""
+
+#: midx.c:129
+msgid "terminating multi-pack-index chunk id appears earlier than expected"
+msgstr ""
+
+#: midx.c:142
+msgid "multi-pack-index missing required pack-name chunk"
+msgstr ""
+
+#: midx.c:144
+msgid "multi-pack-index missing required OID fanout chunk"
+msgstr ""
+
+#: midx.c:146
+msgid "multi-pack-index missing required OID lookup chunk"
+msgstr ""
+
+#: midx.c:148
+msgid "multi-pack-index missing required object offsets chunk"
+msgstr ""
+
+#: midx.c:162
+#, c-format
+msgid "multi-pack-index pack names out of order: '%s' before '%s'"
+msgstr ""
+
+#: midx.c:205
+#, c-format
+msgid "bad pack-int-id: %u (%u total packs)"
+msgstr ""
+
+#: midx.c:246
+msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
+msgstr ""
+
+#: midx.c:271
+msgid "error preparing packfile from multi-pack-index"
+msgstr ""
+
+#: midx.c:407
+#, c-format
+msgid "failed to add packfile '%s'"
+msgstr ""
+
+#: midx.c:413
+#, c-format
+msgid "failed to open pack-index '%s'"
+msgstr ""
+
+#: midx.c:507
+#, c-format
+msgid "failed to locate object %d in packfile"
+msgstr ""
+
+#: midx.c:943
+#, c-format
+msgid "failed to clear multi-pack-index at %s"
+msgstr ""
+
+#: midx.c:981
+#, c-format
+msgid ""
+"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
+msgstr ""
+
+#: midx.c:992
+#, c-format
+msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
+msgstr ""
+
+#: midx.c:996
+msgid "Verifying object offsets"
+msgstr ""
+
+#: midx.c:1004
+#, c-format
+msgid "failed to load pack entry for oid[%d] = %s"
+msgstr ""
+
+#: midx.c:1010
+#, c-format
+msgid "failed to load pack-index for packfile %s"
+msgstr ""
+
+#: midx.c:1019
+#, c-format
+msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
+msgstr ""
+
+#: name-hash.c:532
+#, c-format
+msgid "unable to create lazy_dir thread: %s"
+msgstr ""
+
+#: name-hash.c:554
+#, c-format
+msgid "unable to create lazy_name thread: %s"
+msgstr ""
+
+#: name-hash.c:560
+#, c-format
+msgid "unable to join lazy_name thread: %s"
+msgstr ""
+
+#: notes-merge.c:275
#, c-format
msgid ""
"You have not concluded your previous notes merge (%s exists).\n"
"commit/abort the previous merge before you start a new notes merge."
msgstr ""
-#: notes-merge.c:279
+#: notes-merge.c:282
#, c-format
msgid "You have not concluded your notes merge (%s exists)."
msgstr ""
-#: notes-utils.c:43
+#: notes-utils.c:45
msgid "Cannot commit uninitialized/unreferenced notes tree"
msgstr ""
-#: notes-utils.c:102
+#: notes-utils.c:104
#, c-format
msgid "Bad notes.rewriteMode value: '%s'"
msgstr ""
-#: notes-utils.c:112
+#: notes-utils.c:114
#, c-format
msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
msgstr ""
#. the environment variable, the second %s is
#. its value.
#.
-#: notes-utils.c:142
+#: notes-utils.c:144
#, c-format
msgid "Bad %s value: '%s'"
msgstr ""
-#: object.c:239
+#: object.c:54
+#, c-format
+msgid "invalid object type \"%s\""
+msgstr ""
+
+#: object.c:173
+#, c-format
+msgid "object %s is a %s, not a %s"
+msgstr ""
+
+#: object.c:233
+#, c-format
+msgid "object %s has unknown type id %d"
+msgstr ""
+
+#: object.c:246
#, c-format
msgid "unable to parse object: %s"
msgstr ""
-#: packfile.c:561
+#: object.c:266 object.c:277
+#, c-format
+msgid "sha1 mismatch %s"
+msgstr ""
+
+#: packfile.c:607
msgid "offset before end of packfile (broken .idx?)"
msgstr ""
-#: packfile.c:1694
+#: packfile.c:1864
#, c-format
msgid "offset before start of pack index for %s (corrupt index?)"
msgstr ""
-#: packfile.c:1698
+#: packfile.c:1868
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr ""
-#: parse-options.c:619
+#: parse-options.c:672
msgid "..."
msgstr ""
-#: parse-options.c:638
+#: parse-options.c:691
#, c-format
msgid "usage: %s"
msgstr ""
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation.
#.
-#: parse-options.c:644
+#: parse-options.c:697
#, c-format
msgid " or: %s"
msgstr ""
-#: parse-options.c:647
+#: parse-options.c:700
#, c-format
msgid " %s"
msgstr ""
-#: parse-options.c:686
+#: parse-options.c:739
msgid "-NUM"
msgstr ""
-#: parse-options-cb.c:108
+#: parse-options-cb.c:37
+#, c-format
+msgid "malformed expiration date '%s'"
+msgstr ""
+
+#: parse-options-cb.c:109
#, c-format
msgid "malformed object name '%s'"
msgstr ""
-#: path.c:891
+#: path.c:894
#, c-format
msgid "Could not make %s writable by group"
msgstr ""
msgid "pathspec '%s' is beyond a symbolic link"
msgstr ""
-#: pretty.c:962
-msgid "unable to parse --pretty format"
+#: pkt-line.c:104
+msgid "flush packet write failed"
msgstr ""
-#: read-cache.c:1473
-#, c-format
-msgid ""
-"index.version set, but the value is invalid.\n"
-"Using version %i"
+#: pkt-line.c:142 pkt-line.c:228
+msgid "protocol error: impossibly long line"
msgstr ""
-#: read-cache.c:1483
-#, c-format
-msgid ""
-"GIT_INDEX_VERSION set, but the value is invalid.\n"
-"Using version %i"
+#: pkt-line.c:158 pkt-line.c:160
+msgid "packet write with format failed"
msgstr ""
-#: read-cache.c:2375 sequencer.c:3248 wrapper.c:658 builtin/merge.c:1049
-#, c-format
-msgid "could not close '%s'"
+#: pkt-line.c:192
+msgid "packet write failed - data exceeds max packet size"
msgstr ""
-#: read-cache.c:2448 sequencer.c:1900 sequencer.c:2627
-#, c-format
-msgid "could not stat '%s'"
+#: pkt-line.c:199 pkt-line.c:206
+msgid "packet write failed"
msgstr ""
-#: read-cache.c:2461
-#, c-format
-msgid "unable to open git dir: %s"
+#: pkt-line.c:291
+msgid "read error"
+msgstr ""
+
+#: pkt-line.c:299
+msgid "the remote end hung up unexpectedly"
msgstr ""
-#: read-cache.c:2473
+#: pkt-line.c:327
#, c-format
-msgid "unable to unlink: %s"
+msgid "protocol error: bad line length character: %.4s"
msgstr ""
-#: refs.c:706
+#: pkt-line.c:337 pkt-line.c:342
#, c-format
-msgid "Could not open '%s' for writing"
+msgid "protocol error: bad line length %d"
msgstr ""
-#: refs.c:1850
-msgid "ref updates forbidden inside quarantine environment"
+#: preload-index.c:118
+msgid "Refreshing index"
msgstr ""
-#: refs/files-backend.c:1189
+#: preload-index.c:137
#, c-format
-msgid "could not remove reference %s"
+msgid "unable to create threaded lstat: %s"
msgstr ""
-#: refs/files-backend.c:1203 refs/packed-backend.c:1528
-#: refs/packed-backend.c:1538
-#, c-format
-msgid "could not delete reference %s: %s"
+#: pretty.c:962
+msgid "unable to parse --pretty format"
msgstr ""
-#: refs/files-backend.c:1206 refs/packed-backend.c:1541
-#, c-format
-msgid "could not delete references: %s"
+#: range-diff.c:56
+msgid "could not start `log`"
msgstr ""
-#: ref-filter.c:35 wt-status.c:1842
-msgid "gone"
+#: range-diff.c:59
+msgid "could not read `log` output"
msgstr ""
-#: ref-filter.c:36
+#: range-diff.c:74 sequencer.c:4764
#, c-format
-msgid "ahead %d"
+msgid "could not parse commit '%s'"
msgstr ""
-#: ref-filter.c:37
-#, c-format
-msgid "behind %d"
+#: range-diff.c:224
+msgid "failed to generate diff"
msgstr ""
-#: ref-filter.c:38
+#: range-diff.c:455 range-diff.c:457
#, c-format
-msgid "ahead %d, behind %d"
+msgid "could not parse log for '%s'"
msgstr ""
-#: ref-filter.c:107
+#: read-cache.c:1490
+msgid "Refresh index"
+msgstr ""
+
+#: read-cache.c:1604
+#, c-format
+msgid ""
+"index.version set, but the value is invalid.\n"
+"Using version %i"
+msgstr ""
+
+#: read-cache.c:1614
+#, c-format
+msgid ""
+"GIT_INDEX_VERSION set, but the value is invalid.\n"
+"Using version %i"
+msgstr ""
+
+#: read-cache.c:1792
+#, c-format
+msgid "malformed name field in the index, near path '%s'"
+msgstr ""
+
+#: read-cache.c:1960 rerere.c:565 rerere.c:599 rerere.c:1111 builtin/add.c:458
+#: builtin/check-ignore.c:177 builtin/checkout.c:289 builtin/checkout.c:585
+#: builtin/checkout.c:953 builtin/clean.c:954 builtin/commit.c:343
+#: builtin/diff-tree.c:115 builtin/grep.c:489 builtin/mv.c:144
+#: builtin/reset.c:244 builtin/rm.c:270 builtin/submodule--helper.c:329
+msgid "index file corrupt"
+msgstr ""
+
+#: read-cache.c:2101
+#, c-format
+msgid "unable to create load_cache_entries thread: %s"
+msgstr ""
+
+#: read-cache.c:2114
+#, c-format
+msgid "unable to join load_cache_entries thread: %s"
+msgstr ""
+
+#: read-cache.c:2201
+#, c-format
+msgid "unable to create load_index_extensions thread: %s"
+msgstr ""
+
+#: read-cache.c:2228
+#, c-format
+msgid "unable to join load_index_extensions thread: %s"
+msgstr ""
+
+#: read-cache.c:2982 sequencer.c:4727 wrapper.c:658 builtin/merge.c:1086
+#, c-format
+msgid "could not close '%s'"
+msgstr ""
+
+#: read-cache.c:3055 sequencer.c:2203 sequencer.c:3592
+#, c-format
+msgid "could not stat '%s'"
+msgstr ""
+
+#: read-cache.c:3068
+#, c-format
+msgid "unable to open git dir: %s"
+msgstr ""
+
+#: read-cache.c:3080
+#, c-format
+msgid "unable to unlink: %s"
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: rebase-interactive.c:34 git-rebase--preserve-merges.sh:177
+msgid ""
+"\n"
+"If you remove a line here THAT COMMIT WILL BE LOST.\n"
+msgstr ""
+
+#: rebase-interactive.c:40 git-rebase--preserve-merges.sh:816
+msgid ""
+"\n"
+"You are editing the todo file of an ongoing interactive rebase.\n"
+"To continue rebase after editing, run:\n"
+" git rebase --continue\n"
+"\n"
+msgstr ""
+
+#: 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 ""
+
+#: rebase-interactive.c:51 git-rebase--preserve-merges.sh:900
+msgid "Note that empty commits are commented out"
+msgstr ""
+
+#: rebase-interactive.c:62 rebase-interactive.c:75 sequencer.c:2186
+#: sequencer.c:4505 sequencer.c:4561 sequencer.c:4836
+#, c-format
+msgid "could not read '%s'."
+msgstr ""
+
+#: refs.c:192
+#, c-format
+msgid "%s does not point to a valid object!"
+msgstr ""
+
+#: refs.c:583
+#, c-format
+msgid "ignoring dangling symref %s"
+msgstr ""
+
+#: refs.c:585 ref-filter.c:1951
+#, c-format
+msgid "ignoring broken ref %s"
+msgstr ""
+
+#: refs.c:711
+#, c-format
+msgid "could not open '%s' for writing: %s"
+msgstr ""
+
+#: refs.c:721 refs.c:772
+#, c-format
+msgid "could not read ref '%s'"
+msgstr ""
+
+#: refs.c:727
+#, c-format
+msgid "ref '%s' already exists"
+msgstr ""
+
+#: refs.c:732
+#, c-format
+msgid "unexpected object ID when writing '%s'"
+msgstr ""
+
+#: refs.c:740 sequencer.c:394 sequencer.c:2510 sequencer.c:2636
+#: sequencer.c:2650 sequencer.c:2877 sequencer.c:4725 sequencer.c:4788
+#: wrapper.c:656
+#, c-format
+msgid "could not write to '%s'"
+msgstr ""
+
+#: refs.c:767 sequencer.c:4723 sequencer.c:4782 wrapper.c:225 wrapper.c:395
+#: builtin/am.c:728
+#, c-format
+msgid "could not open '%s' for writing"
+msgstr ""
+
+#: refs.c:774
+#, c-format
+msgid "unexpected object ID when deleting '%s'"
+msgstr ""
+
+#: refs.c:905
+#, c-format
+msgid "log for ref %s has gap after %s"
+msgstr ""
+
+#: refs.c:911
+#, c-format
+msgid "log for ref %s unexpectedly ended on %s"
+msgstr ""
+
+#: refs.c:969
+#, c-format
+msgid "log for %s is empty"
+msgstr ""
+
+#: refs.c:1061
+#, c-format
+msgid "refusing to update ref with bad name '%s'"
+msgstr ""
+
+#: refs.c:1137
+#, c-format
+msgid "update_ref failed for ref '%s': %s"
+msgstr ""
+
+#: refs.c:1911
+#, c-format
+msgid "multiple updates for ref '%s' not allowed"
+msgstr ""
+
+#: refs.c:1943
+msgid "ref updates forbidden inside quarantine environment"
+msgstr ""
+
+#: refs.c:2039 refs.c:2069
+#, c-format
+msgid "'%s' exists; cannot create '%s'"
+msgstr ""
+
+#: refs.c:2045 refs.c:2080
+#, c-format
+msgid "cannot process '%s' and '%s' at the same time"
+msgstr ""
+
+#: refs/files-backend.c:1228
+#, c-format
+msgid "could not remove reference %s"
+msgstr ""
+
+#: 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 ""
+
+#: refs/files-backend.c:1245 refs/packed-backend.c:1545
+#, c-format
+msgid "could not delete references: %s"
+msgstr ""
+
+#: refspec.c:137
+#, c-format
+msgid "invalid refspec '%s'"
+msgstr ""
+
+#: ref-filter.c:39 wt-status.c:1855
+msgid "gone"
+msgstr ""
+
+#: ref-filter.c:40
+#, c-format
+msgid "ahead %d"
+msgstr ""
+
+#: ref-filter.c:41
+#, c-format
+msgid "behind %d"
+msgstr ""
+
+#: ref-filter.c:42
+#, c-format
+msgid "ahead %d, behind %d"
+msgstr ""
+
+#: ref-filter.c:138
#, c-format
msgid "expected format: %%(color:<color>)"
msgstr ""
-#: ref-filter.c:109
+#: ref-filter.c:140
#, c-format
msgid "unrecognized color: %%(color:%s)"
msgstr ""
-#: ref-filter.c:129
+#: ref-filter.c:162
#, c-format
msgid "Integer value expected refname:lstrip=%s"
msgstr ""
-#: ref-filter.c:133
+#: ref-filter.c:166
#, c-format
msgid "Integer value expected refname:rstrip=%s"
msgstr ""
-#: ref-filter.c:135
+#: ref-filter.c:168
#, c-format
msgid "unrecognized %%(%s) argument: %s"
msgstr ""
-#: ref-filter.c:184
+#: ref-filter.c:223
+#, c-format
+msgid "%%(objecttype) does not take arguments"
+msgstr ""
+
+#: ref-filter.c:235
+#, c-format
+msgid "%%(objectsize) does not take arguments"
+msgstr ""
+
+#: ref-filter.c:247
#, c-format
msgid "%%(body) does not take arguments"
msgstr ""
-#: ref-filter.c:191
+#: ref-filter.c:256
#, c-format
msgid "%%(subject) does not take arguments"
msgstr ""
-#: ref-filter.c:209
+#: ref-filter.c:278
#, c-format
msgid "unknown %%(trailers) argument: %s"
msgstr ""
-#: ref-filter.c:232
+#: ref-filter.c:307
#, c-format
msgid "positive value expected contents:lines=%s"
msgstr ""
-#: ref-filter.c:234
+#: ref-filter.c:309
#, c-format
msgid "unrecognized %%(contents) argument: %s"
msgstr ""
-#: ref-filter.c:247
+#: ref-filter.c:324
#, c-format
msgid "positive value expected objectname:short=%s"
msgstr ""
-#: ref-filter.c:251
+#: ref-filter.c:328
#, c-format
msgid "unrecognized %%(objectname) argument: %s"
msgstr ""
-#: ref-filter.c:278
+#: ref-filter.c:358
#, c-format
msgid "expected format: %%(align:<width>,<position>)"
msgstr ""
-#: ref-filter.c:290
+#: ref-filter.c:370
#, c-format
msgid "unrecognized position:%s"
msgstr ""
-#: ref-filter.c:294
+#: ref-filter.c:377
#, c-format
msgid "unrecognized width:%s"
msgstr ""
-#: ref-filter.c:300
+#: ref-filter.c:386
#, c-format
msgid "unrecognized %%(align) argument: %s"
msgstr ""
-#: ref-filter.c:304
+#: ref-filter.c:394
#, c-format
msgid "positive width expected with the %%(align) atom"
msgstr ""
-#: ref-filter.c:319
+#: ref-filter.c:412
#, c-format
msgid "unrecognized %%(if) argument: %s"
msgstr ""
-#: ref-filter.c:409
+#: ref-filter.c:508
#, c-format
msgid "malformed field name: %.*s"
msgstr ""
-#: ref-filter.c:435
+#: ref-filter.c:535
#, c-format
msgid "unknown field name: %.*s"
msgstr ""
-#: ref-filter.c:547
+#: ref-filter.c:539
+#, c-format
+msgid ""
+"not a git repository, but the field '%.*s' requires access to object data"
+msgstr ""
+
+#: ref-filter.c:663
#, c-format
msgid "format: %%(if) atom used without a %%(then) atom"
msgstr ""
-#: ref-filter.c:607
+#: ref-filter.c:726
#, c-format
msgid "format: %%(then) atom used without an %%(if) atom"
msgstr ""
-#: ref-filter.c:609
+#: ref-filter.c:728
#, c-format
msgid "format: %%(then) atom used more than once"
msgstr ""
-#: ref-filter.c:611
+#: ref-filter.c:730
#, c-format
msgid "format: %%(then) atom used after %%(else)"
msgstr ""
-#: ref-filter.c:637
+#: ref-filter.c:758
#, c-format
msgid "format: %%(else) atom used without an %%(if) atom"
msgstr ""
-#: ref-filter.c:639
+#: ref-filter.c:760
#, c-format
msgid "format: %%(else) atom used without a %%(then) atom"
msgstr ""
-#: ref-filter.c:641
+#: ref-filter.c:762
#, c-format
msgid "format: %%(else) atom used more than once"
msgstr ""
-#: ref-filter.c:654
+#: ref-filter.c:777
#, c-format
msgid "format: %%(end) atom used without corresponding atom"
msgstr ""
-#: ref-filter.c:709
+#: ref-filter.c:834
#, c-format
msgid "malformed format string %s"
msgstr ""
-#: ref-filter.c:1313
+#: ref-filter.c:1424
#, c-format
msgid "(no branch, rebasing %s)"
msgstr ""
-#: ref-filter.c:1316
+#: ref-filter.c:1427
+#, c-format
+msgid "(no branch, rebasing detached HEAD %s)"
+msgstr ""
+
+#: ref-filter.c:1430
#, c-format
msgid "(no branch, bisect started on %s)"
msgstr ""
#. TRANSLATORS: make sure this matches "HEAD
#. detached at " in wt-status.c
#.
-#: ref-filter.c:1324
+#: ref-filter.c:1438
#, c-format
msgid "(HEAD detached at %s)"
msgstr ""
#. TRANSLATORS: make sure this matches "HEAD
#. detached from " in wt-status.c
#.
-#: ref-filter.c:1331
+#: ref-filter.c:1445
#, c-format
msgid "(HEAD detached from %s)"
msgstr ""
-#: ref-filter.c:1335
+#: ref-filter.c:1449
msgid "(no branch)"
msgstr ""
-#: ref-filter.c:1364
+#: ref-filter.c:1483 ref-filter.c:1638
#, c-format
msgid "missing object %s for %s"
msgstr ""
-#: ref-filter.c:1367
+#: ref-filter.c:1491
#, c-format
msgid "parse_object_buffer failed on %s for %s"
msgstr ""
-#: ref-filter.c:1819
+#: ref-filter.c:1857
#, c-format
msgid "malformed object at '%s'"
msgstr ""
-#: ref-filter.c:1886
+#: ref-filter.c:1946
#, c-format
msgid "ignoring ref with broken name %s"
msgstr ""
-#: ref-filter.c:1891
-#, c-format
-msgid "ignoring broken ref %s"
-msgstr ""
-
-#: ref-filter.c:2152
+#: ref-filter.c:2232
#, c-format
msgid "format: %%(end) atom missing"
msgstr ""
-#: ref-filter.c:2246
+#: ref-filter.c:2338
#, c-format
msgid "malformed object name %s"
msgstr ""
-#: remote.c:795
+#: remote.c:607
#, c-format
msgid "Cannot fetch both %s and %s to %s"
msgstr ""
-#: remote.c:799
+#: remote.c:611
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr ""
-#: remote.c:803
+#: remote.c:615
#, c-format
msgid "%s tracks both %s and %s"
msgstr ""
-#: remote.c:811
+#: remote.c:623
msgid "Internal error"
msgstr ""
-#: remote.c:1726 remote.c:1828
+#: remote.c:1569 remote.c:1670
msgid "HEAD does not point to a branch"
msgstr ""
-#: remote.c:1735
+#: remote.c:1578
#, c-format
msgid "no such branch: '%s'"
msgstr ""
-#: remote.c:1738
+#: remote.c:1581
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr ""
-#: remote.c:1744
+#: remote.c:1587
#, c-format
msgid "upstream branch '%s' not stored as a remote-tracking branch"
msgstr ""
-#: remote.c:1759
+#: remote.c:1602
#, c-format
msgid "push destination '%s' on remote '%s' has no local tracking branch"
msgstr ""
-#: remote.c:1771
+#: remote.c:1614
#, c-format
msgid "branch '%s' has no remote for pushing"
msgstr ""
-#: remote.c:1782
+#: remote.c:1624
#, c-format
msgid "push refspecs for '%s' do not include '%s'"
msgstr ""
-#: remote.c:1795
+#: remote.c:1637
msgid "push has no destination (push.default is 'nothing')"
msgstr ""
-#: remote.c:1817
+#: remote.c:1659
msgid "cannot resolve 'simple' push to a single destination"
msgstr ""
-#: remote.c:2132
+#: remote.c:1935
#, c-format
msgid "Your branch is based on '%s', but the upstream is gone.\n"
msgstr ""
-#: remote.c:2136
+#: remote.c:1939
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr ""
-#: remote.c:2139
+#: remote.c:1942
#, c-format
msgid "Your branch is up to date with '%s'.\n"
msgstr ""
-#: remote.c:2143
+#: remote.c:1946
#, c-format
msgid "Your branch and '%s' refer to different commits.\n"
msgstr ""
-#: remote.c:2146
+#: remote.c:1949
#, c-format
msgid " (use \"%s\" for details)\n"
msgstr ""
-#: remote.c:2150
+#: remote.c:1953
#, c-format
msgid "Your branch is ahead of '%s' by %d commit.\n"
msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
msgstr[0] ""
msgstr[1] ""
-#: remote.c:2156
+#: remote.c:1959
msgid " (use \"git push\" to publish your local commits)\n"
msgstr ""
-#: remote.c:2159
+#: remote.c:1962
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: remote.c:2167
+#: remote.c:1970
msgid " (use \"git pull\" to update your local branch)\n"
msgstr ""
-#: remote.c:2170
+#: remote.c:1973
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
msgstr[0] ""
msgstr[1] ""
-#: remote.c:2180
+#: remote.c:1983
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr ""
-#: revision.c:2277
-msgid "your current branch appears to be broken"
-msgstr ""
-
-#: revision.c:2280
+#: replace-object.c:21
#, c-format
-msgid "your current branch '%s' does not have any commits yet"
+msgid "bad replace ref name: %s"
msgstr ""
-#: revision.c:2477
-msgid "--first-parent is incompatible with --bisect"
+#: replace-object.c:30
+#, c-format
+msgid "duplicate replace ref: %s"
msgstr ""
-#: run-command.c:731
-msgid "open /dev/null failed"
+#: replace-object.c:73
+#, c-format
+msgid "replace depth too high for object %s"
msgstr ""
-#: run-command.c:1274
-#, 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`."
+#: rerere.c:217 rerere.c:226 rerere.c:229
+msgid "corrupt MERGE_RR"
msgstr ""
-#: send-pack.c:141
-msgid "unexpected flush packet while reading remote unpack status"
+#: rerere.c:264 rerere.c:269
+msgid "unable to write rerere record"
msgstr ""
-#: send-pack.c:143
+#: rerere.c:485 rerere.c:692 sequencer.c:3136 sequencer.c:3162
#, c-format
-msgid "unable to parse remote unpack status: %s"
+msgid "could not write '%s'"
msgstr ""
-#: send-pack.c:145
+#: rerere.c:495
#, c-format
-msgid "remote unpack failed: %s"
+msgid "there were errors while writing '%s' (%s)"
msgstr ""
-#: send-pack.c:308
-msgid "failed to sign the push certificate"
+#: rerere.c:498
+#, c-format
+msgid "failed to flush '%s'"
msgstr ""
-#: send-pack.c:421
-msgid "the receiving end does not support --signed push"
+#: rerere.c:503 rerere.c:1039
+#, c-format
+msgid "could not parse conflict hunks in '%s'"
msgstr ""
-#: send-pack.c:423
-msgid ""
-"not sending a push certificate since the receiving end does not support --"
-"signed push"
+#: rerere.c:684
+#, c-format
+msgid "failed utime() on '%s'"
msgstr ""
-#: send-pack.c:435
-msgid "the receiving end does not support --atomic push"
+#: rerere.c:694
+#, c-format
+msgid "writing '%s' failed"
msgstr ""
-#: send-pack.c:440
-msgid "the receiving end does not support push options"
+#: rerere.c:714
+#, c-format
+msgid "Staged '%s' using previous resolution."
msgstr ""
-#: sequencer.c:158
+#: rerere.c:753
#, c-format
-msgid "invalid commit message cleanup mode '%s'"
+msgid "Recorded resolution for '%s'."
msgstr ""
-#: sequencer.c:267
-msgid "revert"
+#: rerere.c:788
+#, c-format
+msgid "Resolved '%s' using previous resolution."
msgstr ""
-#: sequencer.c:269
-msgid "cherry-pick"
+#: rerere.c:803
+#, c-format
+msgid "cannot unlink stray '%s'"
msgstr ""
-#: sequencer.c:271
-msgid "rebase -i"
+#: rerere.c:807
+#, c-format
+msgid "Recorded preimage for '%s'"
msgstr ""
-#: sequencer.c:273
+#: rerere.c:881 submodule.c:1763 builtin/submodule--helper.c:1413
+#: builtin/submodule--helper.c:1423
#, c-format
-msgid "Unknown action: %d"
+msgid "could not create directory '%s'"
msgstr ""
-#: sequencer.c:330
-msgid ""
-"after resolving the conflicts, mark the corrected paths\n"
-"with 'git add <paths>' or 'git rm <paths>'"
+#: rerere.c:1057
+#, c-format
+msgid "failed to update conflicted state in '%s'"
msgstr ""
-#: sequencer.c:333
-msgid ""
-"after resolving the conflicts, mark the corrected paths\n"
-"with 'git add <paths>' or 'git rm <paths>'\n"
-"and commit the result with 'git commit'"
+#: rerere.c:1068 rerere.c:1075
+#, c-format
+msgid "no remembered resolution for '%s'"
msgstr ""
-#: sequencer.c:346 sequencer.c:2245
+#: rerere.c:1077
#, c-format
-msgid "could not lock '%s'"
+msgid "cannot unlink '%s'"
msgstr ""
-#: sequencer.c:349 sequencer.c:2124 sequencer.c:2250 sequencer.c:2264
-#: sequencer.c:3246 sequencer.c:3310 wrapper.c:656
+#: rerere.c:1087
#, c-format
-msgid "could not write to '%s'"
+msgid "Updated preimage for '%s'"
msgstr ""
-#: sequencer.c:353
+#: rerere.c:1096
#, c-format
-msgid "could not write eol to '%s'"
+msgid "Forgot resolution for '%s'\n"
msgstr ""
-#: sequencer.c:356 sequencer.c:2128 sequencer.c:2252
-#, c-format
-msgid "failed to finalize '%s'"
+#: rerere.c:1199
+msgid "unable to open rr-cache directory"
msgstr ""
-#: sequencer.c:379 sequencer.c:1340 sequencer.c:2148 builtin/am.c:259
-#: builtin/commit.c:722 builtin/merge.c:1047
-#, c-format
-msgid "could not read '%s'"
+#: revision.c:2324
+msgid "your current branch appears to be broken"
msgstr ""
-#: sequencer.c:405
+#: revision.c:2327
#, c-format
-msgid "your local changes would be overwritten by %s."
+msgid "your current branch '%s' does not have any commits yet"
msgstr ""
-#: sequencer.c:409
+#: revision.c:2523
+msgid "--first-parent is incompatible with --bisect"
+msgstr ""
+
+#: run-command.c:740
+msgid "open /dev/null failed"
+msgstr ""
+
+#: run-command.c:1229
+#, c-format
+msgid "cannot create async thread: %s"
+msgstr ""
+
+#: run-command.c:1293
+#, c-format
+msgid ""
+"The '%s' hook was ignored because it's not set as executable.\n"
+"You can disable this warning with `git config advice.ignoredHook false`."
+msgstr ""
+
+#: send-pack.c:142
+msgid "unexpected flush packet while reading remote unpack status"
+msgstr ""
+
+#: send-pack.c:144
+#, c-format
+msgid "unable to parse remote unpack status: %s"
+msgstr ""
+
+#: send-pack.c:146
+#, c-format
+msgid "remote unpack failed: %s"
+msgstr ""
+
+#: send-pack.c:308
+msgid "failed to sign the push certificate"
+msgstr ""
+
+#: send-pack.c:421
+msgid "the receiving end does not support --signed push"
+msgstr ""
+
+#: send-pack.c:423
+msgid ""
+"not sending a push certificate since the receiving end does not support --"
+"signed push"
+msgstr ""
+
+#: send-pack.c:435
+msgid "the receiving end does not support --atomic push"
+msgstr ""
+
+#: send-pack.c:440
+msgid "the receiving end does not support push options"
+msgstr ""
+
+#: sequencer.c:183
+#, c-format
+msgid "invalid commit message cleanup mode '%s'"
+msgstr ""
+
+#: sequencer.c:287
+#, c-format
+msgid "could not delete '%s'"
+msgstr ""
+
+#: sequencer.c:313
+msgid "revert"
+msgstr ""
+
+#: sequencer.c:315
+msgid "cherry-pick"
+msgstr ""
+
+#: sequencer.c:317
+msgid "rebase -i"
+msgstr ""
+
+#: sequencer.c:319
+#, c-format
+msgid "unknown action: %d"
+msgstr ""
+
+#: sequencer.c:376
+msgid ""
+"after resolving the conflicts, mark the corrected paths\n"
+"with 'git add <paths>' or 'git rm <paths>'"
+msgstr ""
+
+#: sequencer.c:379
+msgid ""
+"after resolving the conflicts, mark the corrected paths\n"
+"with 'git add <paths>' or 'git rm <paths>'\n"
+"and commit the result with 'git commit'"
+msgstr ""
+
+#: sequencer.c:392 sequencer.c:2632
+#, c-format
+msgid "could not lock '%s'"
+msgstr ""
+
+#: sequencer.c:399
+#, c-format
+msgid "could not write eol to '%s'"
+msgstr ""
+
+#: sequencer.c:404 sequencer.c:2515 sequencer.c:2638 sequencer.c:2652
+#: sequencer.c:2885
+#, c-format
+msgid "failed to finalize '%s'"
+msgstr ""
+
+#: sequencer.c:427 sequencer.c:921 sequencer.c:1594 sequencer.c:2535
+#: sequencer.c:2867 sequencer.c:2974 builtin/am.c:260 builtin/commit.c:746
+#: builtin/merge.c:1084 builtin/rebase.c:152
+#, c-format
+msgid "could not read '%s'"
+msgstr ""
+
+#: sequencer.c:453
+#, c-format
+msgid "your local changes would be overwritten by %s."
+msgstr ""
+
+#: sequencer.c:457
msgid "commit your changes or stash them to proceed."
msgstr ""
-#: sequencer.c:438
+#: sequencer.c:486
#, c-format
msgid "%s: fast-forward"
msgstr ""
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
#. "rebase -i".
#.
-#: sequencer.c:526
+#: sequencer.c:575
#, c-format
msgid "%s: Unable to write new index file"
msgstr ""
-#: sequencer.c:542
+#: sequencer.c:591
+msgid "unable to update cache tree"
+msgstr ""
+
+#: sequencer.c:604
msgid "could not resolve HEAD commit"
msgstr ""
-#: sequencer.c:562
-msgid "unable to update cache tree"
+#: sequencer.c:684
+#, c-format
+msgid "no key present in '%.*s'"
+msgstr ""
+
+#: sequencer.c:695
+#, c-format
+msgid "unable to dequote value of '%s'"
+msgstr ""
+
+#: sequencer.c:732 wrapper.c:227 wrapper.c:397 builtin/am.c:719
+#: builtin/am.c:811 builtin/merge.c:1081
+#, c-format
+msgid "could not open '%s' for reading"
+msgstr ""
+
+#: sequencer.c:742
+msgid "'GIT_AUTHOR_NAME' already given"
+msgstr ""
+
+#: sequencer.c:747
+msgid "'GIT_AUTHOR_EMAIL' already given"
+msgstr ""
+
+#: sequencer.c:752
+msgid "'GIT_AUTHOR_DATE' already given"
+msgstr ""
+
+#: sequencer.c:756
+#, c-format
+msgid "unknown variable '%s'"
+msgstr ""
+
+#: sequencer.c:761
+msgid "missing 'GIT_AUTHOR_NAME'"
+msgstr ""
+
+#: sequencer.c:763
+msgid "missing 'GIT_AUTHOR_EMAIL'"
+msgstr ""
+
+#: sequencer.c:765
+msgid "missing 'GIT_AUTHOR_DATE'"
+msgstr ""
+
+#: sequencer.c:825
+#, c-format
+msgid "invalid date format '%s' in '%s'"
msgstr ""
-#: sequencer.c:658
+#: sequencer.c:842
#, c-format
msgid ""
"you have staged changes in your working tree\n"
" git rebase --continue\n"
msgstr ""
-#: sequencer.c:915
+#: sequencer.c:935
+msgid "writing root commit"
+msgstr ""
+
+#: sequencer.c:1142
msgid "'prepare-commit-msg' hook failed"
msgstr ""
-#: sequencer.c:922
+#: sequencer.c:1149
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
" git commit --amend --reset-author\n"
msgstr ""
-#: sequencer.c:935
+#: 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"
" git commit --amend --reset-author\n"
msgstr ""
-#: sequencer.c:975
+#: sequencer.c:1202
msgid "couldn't look up newly created commit"
msgstr ""
-#: sequencer.c:977
+#: sequencer.c:1204
msgid "could not parse newly created commit"
msgstr ""
-#: sequencer.c:1023
+#: sequencer.c:1250
msgid "unable to resolve HEAD after creating commit"
msgstr ""
-#: sequencer.c:1025
+#: sequencer.c:1252
msgid "detached HEAD"
msgstr ""
-#: sequencer.c:1029
+#: sequencer.c:1256
msgid " (root-commit)"
msgstr ""
-#: sequencer.c:1050
+#: sequencer.c:1277
msgid "could not parse HEAD"
msgstr ""
-#: sequencer.c:1052
+#: sequencer.c:1279
#, c-format
msgid "HEAD %s is not a commit!"
msgstr ""
-#: sequencer.c:1056 builtin/commit.c:1491
+#: sequencer.c:1283 builtin/commit.c:1543
msgid "could not parse HEAD commit"
msgstr ""
-#: sequencer.c:1107 sequencer.c:1673
+#: sequencer.c:1334 sequencer.c:1934
msgid "unable to parse commit author"
msgstr ""
-#: sequencer.c:1117 builtin/am.c:1630 builtin/merge.c:643
+#: sequencer.c:1344 builtin/am.c:1585 builtin/merge.c:677
msgid "git write-tree failed to write a tree"
msgstr ""
-#: sequencer.c:1134 sequencer.c:1186
+#: sequencer.c:1361 sequencer.c:1416
#, c-format
msgid "unable to read commit message from '%s'"
msgstr ""
-#: sequencer.c:1154 builtin/am.c:1650 builtin/commit.c:1594 builtin/merge.c:826
-#: builtin/merge.c:851
+#: sequencer.c:1383 builtin/am.c:1606 builtin/commit.c:1646 builtin/merge.c:858
+#: builtin/merge.c:883
msgid "failed to write commit object"
msgstr ""
-#: sequencer.c:1213
+#: sequencer.c:1443
#, c-format
msgid "could not parse commit %s"
msgstr ""
-#: sequencer.c:1218
+#: sequencer.c:1448
#, c-format
msgid "could not parse parent commit %s"
msgstr ""
-#: sequencer.c:1347
-#, c-format
-msgid ""
-"unexpected 1st line of squash message:\n"
-"\n"
-"\t%.*s"
-msgstr ""
-
-#: sequencer.c:1353
+#: sequencer.c:1546 sequencer.c:1654
#, c-format
-msgid ""
-"invalid 1st line of squash message:\n"
-"\n"
-"\t%.*s"
+msgid "unknown command: %d"
msgstr ""
-#: sequencer.c:1359 sequencer.c:1384
+#: sequencer.c:1601 sequencer.c:1626
#, c-format
msgid "This is a combination of %d commits."
msgstr ""
-#: sequencer.c:1368 sequencer.c:3265
+#: sequencer.c:1611 sequencer.c:4744
msgid "need a HEAD to fixup"
msgstr ""
-#: sequencer.c:1370
+#: sequencer.c:1613 sequencer.c:2912
msgid "could not read HEAD"
msgstr ""
-#: sequencer.c:1372
+#: sequencer.c:1615
msgid "could not read HEAD's commit message"
msgstr ""
-#: sequencer.c:1378
+#: sequencer.c:1621
#, c-format
msgid "cannot write '%s'"
msgstr ""
-#: sequencer.c:1387 git-rebase--interactive.sh:452
+#: sequencer.c:1628 git-rebase--preserve-merges.sh:441
msgid "This is the 1st commit message:"
msgstr ""
-#: sequencer.c:1395
+#: sequencer.c:1636
#, c-format
msgid "could not read commit message of %s"
msgstr ""
-#: sequencer.c:1402
+#: sequencer.c:1643
#, c-format
msgid "This is the commit message #%d:"
msgstr ""
-#: sequencer.c:1407
+#: sequencer.c:1649
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr ""
-#: sequencer.c:1412
-#, c-format
-msgid "unknown command: %d"
+#: sequencer.c:1732
+msgid "your index file is unmerged."
msgstr ""
-#: sequencer.c:1479
-msgid "your index file is unmerged."
+#: sequencer.c:1739
+msgid "cannot fixup root commit"
msgstr ""
-#: sequencer.c:1498
+#: sequencer.c:1758
#, c-format
msgid "commit %s is a merge but no -m option was given."
msgstr ""
-#: sequencer.c:1506
+#: sequencer.c:1766
#, c-format
msgid "commit %s does not have parent %d"
msgstr ""
-#: sequencer.c:1510
+#: sequencer.c:1770
#, c-format
msgid "mainline was specified but commit %s is not a merge."
msgstr ""
-#: sequencer.c:1516
+#: sequencer.c:1776
#, c-format
msgid "cannot get commit message for %s"
msgstr ""
#. TRANSLATORS: The first %s will be a "todo" command like
#. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:1535
+#: sequencer.c:1795
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr ""
-#: sequencer.c:1600 sequencer.c:2397
+#: sequencer.c:1860
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr ""
-#: sequencer.c:1654
+#: sequencer.c:1915
#, c-format
msgid "could not revert %s... %s"
msgstr ""
-#: sequencer.c:1655
+#: sequencer.c:1916
#, c-format
msgid "could not apply %s... %s"
msgstr ""
-#: sequencer.c:1702
-msgid "empty commit set passed"
-msgstr ""
-
-#: sequencer.c:1712
+#: sequencer.c:1974
#, c-format
msgid "git %s: failed to read the index"
msgstr ""
-#: sequencer.c:1718
+#: sequencer.c:1981
#, c-format
msgid "git %s: failed to refresh the index"
msgstr ""
-#: sequencer.c:1792
+#: sequencer.c:2062
#, c-format
msgid "%s does not accept arguments: '%s'"
msgstr ""
-#: sequencer.c:1801
+#: sequencer.c:2071
#, c-format
msgid "missing arguments for %s"
msgstr ""
-#: sequencer.c:1844
+#: sequencer.c:2130
#, c-format
msgid "invalid line %d: %.*s"
msgstr ""
-#: sequencer.c:1852
+#: sequencer.c:2138
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr ""
-#: sequencer.c:1883 sequencer.c:3056 sequencer.c:3091
-#, c-format
-msgid "could not read '%s'."
-msgstr ""
-
-#: sequencer.c:1906
+#: sequencer.c:2209
msgid "please fix this using 'git rebase --edit-todo'."
msgstr ""
-#: sequencer.c:1908
+#: sequencer.c:2211
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr ""
-#: sequencer.c:1913
+#: sequencer.c:2216
msgid "no commits parsed."
msgstr ""
-#: sequencer.c:1924
+#: sequencer.c:2227
msgid "cannot cherry-pick during a revert."
msgstr ""
-#: sequencer.c:1926
+#: sequencer.c:2229
msgid "cannot revert during a cherry-pick."
msgstr ""
-#: sequencer.c:1993
+#: sequencer.c:2299
#, c-format
-msgid "invalid key: %s"
+msgid "invalid value for %s: %s"
msgstr ""
-#: sequencer.c:1996
-#, c-format
-msgid "invalid value for %s: %s"
+#: sequencer.c:2380
+msgid "unusable squash-onto"
msgstr ""
-#: sequencer.c:2062
+#: sequencer.c:2396
#, c-format
msgid "malformed options sheet: '%s'"
msgstr ""
-#: sequencer.c:2100
+#: sequencer.c:2479 sequencer.c:4005
+msgid "empty commit set passed"
+msgstr ""
+
+#: sequencer.c:2487
msgid "a cherry-pick or revert is already in progress"
msgstr ""
-#: sequencer.c:2101
+#: sequencer.c:2488
msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
msgstr ""
-#: sequencer.c:2104
+#: sequencer.c:2491
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr ""
-#: sequencer.c:2118
+#: sequencer.c:2505
msgid "could not lock HEAD"
msgstr ""
-#: sequencer.c:2173 sequencer.c:2761
+#: sequencer.c:2560 sequencer.c:3761
msgid "no cherry-pick or revert in progress"
msgstr ""
-#: sequencer.c:2175
+#: sequencer.c:2562
msgid "cannot resolve HEAD"
msgstr ""
-#: sequencer.c:2177 sequencer.c:2212
+#: sequencer.c:2564 sequencer.c:2599
msgid "cannot abort from a branch yet to be born"
msgstr ""
-#: sequencer.c:2198 builtin/grep.c:720
+#: sequencer.c:2585 builtin/grep.c:721
#, c-format
msgid "cannot open '%s'"
msgstr ""
-#: sequencer.c:2200
+#: sequencer.c:2587
#, c-format
msgid "cannot read '%s': %s"
msgstr ""
-#: sequencer.c:2201
+#: sequencer.c:2588
msgid "unexpected end of file"
msgstr ""
-#: sequencer.c:2207
+#: sequencer.c:2594
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr ""
-#: sequencer.c:2218
+#: sequencer.c:2605
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr ""
-#: sequencer.c:2324 sequencer.c:2679
+#: sequencer.c:2709 sequencer.c:3679
#, c-format
msgid "could not update %s"
msgstr ""
-#: sequencer.c:2362 sequencer.c:2659
+#: sequencer.c:2747 sequencer.c:3659
msgid "cannot read HEAD"
msgstr ""
-#: sequencer.c:2402 builtin/difftool.c:639
+#: sequencer.c:2762
+#, c-format
+msgid "unable to copy '%s' to '%s'"
+msgstr ""
+
+#: sequencer.c:2770
+#, 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 ""
+
+#: sequencer.c:2780
+#, c-format
+msgid "Could not apply %s... %.*s"
+msgstr ""
+
+#: sequencer.c:2787
+#, c-format
+msgid "Could not merge %.*s"
+msgstr ""
+
+#: sequencer.c:2798 sequencer.c:2802 builtin/difftool.c:640
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr ""
-#: sequencer.c:2421
+#: sequencer.c:2824 sequencer.c:3242 builtin/rebase.c:580 builtin/rebase.c:1019
+#: builtin/rebase.c:1372 builtin/rebase.c:1426
msgid "could not read index"
msgstr ""
-#: sequencer.c:2426
+#: sequencer.c:2829
#, c-format
msgid ""
"execution failed: %s\n"
"\n"
msgstr ""
-#: sequencer.c:2432
+#: sequencer.c:2835
msgid "and made changes to the index and/or the working tree\n"
msgstr ""
-#: sequencer.c:2438
+#: sequencer.c:2841
#, c-format
msgid ""
"execution succeeded: %s\n"
"\n"
msgstr ""
-#: sequencer.c:2497
+#: sequencer.c:2902
+#, c-format
+msgid "illegal label name: '%.*s'"
+msgstr ""
+
+#: sequencer.c:2954
+msgid "writing fake root commit"
+msgstr ""
+
+#: sequencer.c:2959
+msgid "writing squash-onto"
+msgstr ""
+
+#: sequencer.c:2997 builtin/rebase.c:585 builtin/rebase.c:591
+#, c-format
+msgid "failed to find tree of %s"
+msgstr ""
+
+#: sequencer.c:3015 builtin/rebase.c:604
+msgid "could not write index"
+msgstr ""
+
+#: sequencer.c:3042
+#, c-format
+msgid "could not resolve '%s'"
+msgstr ""
+
+#: sequencer.c:3068
+msgid "cannot merge without a current revision"
+msgstr ""
+
+#: sequencer.c:3090
+#, c-format
+msgid "unable to parse '%.*s'"
+msgstr ""
+
+#: sequencer.c:3099
+#, c-format
+msgid "nothing to merge: '%.*s'"
+msgstr ""
+
+#: sequencer.c:3111
+msgid "octopus merge cannot be executed on top of a [new root]"
+msgstr ""
+
+#: sequencer.c:3126
+#, c-format
+msgid "could not get commit message of '%s'"
+msgstr ""
+
+#: sequencer.c:3274
+#, c-format
+msgid "could not even attempt to merge '%.*s'"
+msgstr ""
+
+#: sequencer.c:3290
+msgid "merge: Unable to write new index file"
+msgstr ""
+
+#: sequencer.c:3358 builtin/rebase.c:268
#, c-format
msgid "Applied autostash.\n"
msgstr ""
-#: sequencer.c:2509
+#: sequencer.c:3370
#, c-format
msgid "cannot store %s"
msgstr ""
-#: sequencer.c:2512 git-rebase.sh:178
+#: sequencer.c:3373 builtin/rebase.c:284
#, c-format
msgid ""
"Applying autostash resulted in conflicts.\n"
"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
msgstr ""
-#: sequencer.c:2595
+#: sequencer.c:3427
+#, c-format
+msgid "could not checkout %s"
+msgstr ""
+
+#: sequencer.c:3441
+#, c-format
+msgid "%s: not a valid OID"
+msgstr ""
+
+#: sequencer.c:3446 git-rebase--preserve-merges.sh:724
+msgid "could not detach HEAD"
+msgstr ""
+
+#: sequencer.c:3461
+#, c-format
+msgid "Stopped at HEAD\n"
+msgstr ""
+
+#: sequencer.c:3463
+#, c-format
+msgid "Stopped at %s\n"
+msgstr ""
+
+#: sequencer.c:3471
+#, 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 ""
+
+#: sequencer.c:3543
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr ""
-#: sequencer.c:2637
+#: sequencer.c:3622
#, c-format
msgid "unknown command %d"
msgstr ""
-#: sequencer.c:2667
+#: sequencer.c:3667
msgid "could not read orig-head"
msgstr ""
-#: sequencer.c:2672 sequencer.c:3262
+#: sequencer.c:3672 sequencer.c:4741
msgid "could not read 'onto'"
msgstr ""
-#: sequencer.c:2686
+#: sequencer.c:3686
#, c-format
msgid "could not update HEAD to %s"
msgstr ""
-#: sequencer.c:2770
+#: sequencer.c:3772
msgid "cannot rebase: You have unstaged changes."
msgstr ""
-#: sequencer.c:2775
-msgid "could not remove CHERRY_PICK_HEAD"
-msgstr ""
-
-#: sequencer.c:2784
+#: sequencer.c:3781
msgid "cannot amend non-existing commit"
msgstr ""
-#: sequencer.c:2786
+#: sequencer.c:3783
#, c-format
msgid "invalid file: '%s'"
msgstr ""
-#: sequencer.c:2788
+#: sequencer.c:3785
#, c-format
msgid "invalid contents: '%s'"
msgstr ""
-#: sequencer.c:2791
+#: sequencer.c:3788
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
"first and then run 'git rebase --continue' again."
msgstr ""
-#: sequencer.c:2801
+#: sequencer.c:3824 sequencer.c:3862
+#, c-format
+msgid "could not write file: '%s'"
+msgstr ""
+
+#: sequencer.c:3877
+msgid "could not remove CHERRY_PICK_HEAD"
+msgstr ""
+
+#: sequencer.c:3884
msgid "could not commit staged changes."
msgstr ""
-#: sequencer.c:2881
+#: sequencer.c:3982
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr ""
-#: sequencer.c:2885
+#: sequencer.c:3986
#, c-format
msgid "%s: bad revision"
msgstr ""
-#: sequencer.c:2918
+#: sequencer.c:4021
msgid "can't revert as initial commit"
msgstr ""
-#: sequencer.c:3023
+#: sequencer.c:4466
msgid "make_script: unhandled options"
msgstr ""
-#: sequencer.c:3026
+#: sequencer.c:4469
msgid "make_script: error preparing revisions"
msgstr ""
-#: sequencer.c:3060 sequencer.c:3095
+#: sequencer.c:4509 sequencer.c:4565 sequencer.c:4840
#, c-format
msgid "unusable todo list: '%s'"
msgstr ""
-#: sequencer.c:3146
+#: sequencer.c:4620
#, c-format
msgid ""
"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
msgstr ""
-#: sequencer.c:3212
+#: sequencer.c:4690
#, c-format
msgid ""
"Warning: some commits may have been dropped accidentally.\n"
"Dropped commits (newer to older):\n"
msgstr ""
-#: sequencer.c:3219
+#: sequencer.c:4697
#, c-format
msgid ""
"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
"\n"
msgstr ""
-#: sequencer.c:3231
+#: sequencer.c:4710
#, c-format
msgid ""
"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
"Or you can abort the rebase with 'git rebase --abort'.\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"
+#: sequencer.c:4848 sequencer.c:4886
+msgid "nothing to do"
msgstr ""
-#: sequencer.c:3285
+#: sequencer.c:4852
#, c-format
-msgid "could not parse commit '%s'"
+msgid "Rebase %s onto %s (%d command)"
+msgid_plural "Rebase %s onto %s (%d commands)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: sequencer.c:4864
+#, c-format
+msgid "could not copy '%s' to '%s'."
msgstr ""
-#: sequencer.c:3401
-msgid "the script was already rearranged."
+#: sequencer.c:4868 sequencer.c:4897
+msgid "could not transform the todo list"
msgstr ""
-#: setup.c:122
+#: sequencer.c:4900
+msgid "could not skip unnecessary pick commands"
+msgstr ""
+
+#: sequencer.c:4983
+msgid "the script was already rearranged."
+msgstr ""
+
+#: setup.c:123
#, c-format
msgid "'%s' is outside repository"
msgstr ""
-#: setup.c:171
+#: 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 ""
-#: setup.c:184
+#: setup.c:185
#, c-format
msgid ""
"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
"'git <command> [<revision>...] -- [<file>...]'"
msgstr ""
-#: setup.c:233
+#: setup.c:234
#, c-format
msgid "option '%s' must come before non-option arguments"
msgstr ""
-#: setup.c:252
+#: setup.c:253
#, c-format
msgid ""
"ambiguous argument '%s': both revision and filename\n"
"'git <command> [<revision>...] -- [<file>...]'"
msgstr ""
-#: setup.c:388
+#: setup.c:389
msgid "unable to set up work tree using invalid config"
msgstr ""
-#: setup.c:395
+#: setup.c:393
msgid "this operation must be run in a work tree"
msgstr ""
-#: setup.c:506
+#: setup.c:527
#, c-format
msgid "Expected git repo version <= %d, found %d"
msgstr ""
-#: setup.c:514
+#: setup.c:535
msgid "unknown repository extensions found:"
msgstr ""
-#: setup.c:533
+#: setup.c:554
#, c-format
msgid "error opening '%s'"
msgstr ""
-#: setup.c:535
+#: setup.c:556
#, c-format
msgid "too large to be a .git file: '%s'"
msgstr ""
-#: setup.c:537
+#: setup.c:558
#, c-format
msgid "error reading %s"
msgstr ""
-#: setup.c:539
+#: setup.c:560
#, c-format
msgid "invalid gitfile format: %s"
msgstr ""
-#: setup.c:541
+#: setup.c:562
#, c-format
msgid "no path in gitfile: %s"
msgstr ""
-#: setup.c:543
+#: setup.c:564
#, c-format
msgid "not a git repository: %s"
msgstr ""
-#: setup.c:642
+#: setup.c:663
#, c-format
msgid "'$%s' too big"
msgstr ""
-#: setup.c:656
+#: setup.c:677
#, c-format
msgid "not a git repository: '%s'"
msgstr ""
-#: setup.c:685 setup.c:687 setup.c:718
+#: setup.c:706 setup.c:708 setup.c:739
#, c-format
msgid "cannot chdir to '%s'"
msgstr ""
-#: setup.c:690 setup.c:746 setup.c:756 setup.c:795 setup.c:803 setup.c:818
+#: setup.c:711 setup.c:767 setup.c:777 setup.c:816 setup.c:824 setup.c:839
msgid "cannot come back to cwd"
msgstr ""
-#: setup.c:816
+#: setup.c:837
#, c-format
msgid "not a git repository (or any of the parent directories): %s"
msgstr ""
-#: setup.c:827
+#: setup.c:848
#, c-format
msgid "failed to stat '%*s%s%s'"
msgstr ""
-#: setup.c:1057
+#: setup.c:1078
msgid "Unable to read current working directory"
msgstr ""
-#: setup.c:1069 setup.c:1075
+#: setup.c:1090 setup.c:1096
#, c-format
msgid "cannot change to '%s'"
msgstr ""
-#: setup.c:1088
+#: setup.c:1109
#, c-format
msgid ""
"not a git repository (or any parent up to mount point %s)\n"
"Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."
msgstr ""
-#: setup.c:1172
+#: setup.c:1192
#, c-format
msgid ""
"problem with core.sharedRepository filemode value (0%.3o).\n"
"The owner of files must always have read and write permissions."
msgstr ""
-#: setup.c:1215
+#: setup.c:1235
msgid "open /dev/null or dup failed"
msgstr ""
-#: setup.c:1230
+#: setup.c:1250
msgid "fork failed"
msgstr ""
-#: setup.c:1235
+#: setup.c:1255
msgid "setsid failed"
msgstr ""
-#: sha1_file.c:592
+#: sha1-file.c:381
+#, c-format
+msgid "object directory %s does not exist; check .git/objects/info/alternates"
+msgstr ""
+
+#: sha1-file.c:432
+#, c-format
+msgid "unable to normalize alternate object path: %s"
+msgstr ""
+
+#: sha1-file.c:503
+#, c-format
+msgid "%s: ignoring alternate object stores, nesting too deep"
+msgstr ""
+
+#: sha1-file.c:510
+#, c-format
+msgid "unable to normalize object directory: %s"
+msgstr ""
+
+#: sha1-file.c:565
+msgid "unable to fdopen alternates lockfile"
+msgstr ""
+
+#: sha1-file.c:583
+msgid "unable to read alternates file"
+msgstr ""
+
+#: sha1-file.c:590
+msgid "unable to move new alternates file into place"
+msgstr ""
+
+#: sha1-file.c:625
#, c-format
msgid "path '%s' does not exist"
msgstr ""
-#: sha1_file.c:618
+#: sha1-file.c:651
#, c-format
msgid "reference repository '%s' as a linked checkout is not supported yet."
msgstr ""
-#: sha1_file.c:624
+#: sha1-file.c:657
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr ""
-#: sha1_file.c:630
+#: sha1-file.c:663
#, c-format
msgid "reference repository '%s' is shallow"
msgstr ""
-#: sha1_file.c:638
+#: sha1-file.c:671
#, c-format
msgid "reference repository '%s' is grafted"
msgstr ""
-#: sha1_name.c:422
+#: sha1-file.c:781
+#, c-format
+msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
+msgstr ""
+
+#: sha1-file.c:806
+msgid "mmap failed"
+msgstr ""
+
+#: sha1-file.c:973
+#, c-format
+msgid "object file %s is empty"
+msgstr ""
+
+#: sha1-file.c:1093 sha1-file.c:2215
+#, c-format
+msgid "corrupt loose object '%s'"
+msgstr ""
+
+#: sha1-file.c:1095 sha1-file.c:2219
+#, c-format
+msgid "garbage at end of loose object '%s'"
+msgstr ""
+
+#: sha1-file.c:1137
+msgid "invalid object type"
+msgstr ""
+
+#: sha1-file.c:1219
+#, c-format
+msgid "unable to unpack %s header with --allow-unknown-type"
+msgstr ""
+
+#: sha1-file.c:1222
+#, c-format
+msgid "unable to unpack %s header"
+msgstr ""
+
+#: sha1-file.c:1228
+#, c-format
+msgid "unable to parse %s header with --allow-unknown-type"
+msgstr ""
+
+#: sha1-file.c:1231
+#, c-format
+msgid "unable to parse %s header"
+msgstr ""
+
+#: sha1-file.c:1422
+#, c-format
+msgid "failed to read object %s"
+msgstr ""
+
+#: sha1-file.c:1426
+#, c-format
+msgid "replacement %s not found for %s"
+msgstr ""
+
+#: sha1-file.c:1430
+#, c-format
+msgid "loose object %s (stored in %s) is corrupt"
+msgstr ""
+
+#: sha1-file.c:1434
+#, c-format
+msgid "packed object %s (stored in %s) is corrupt"
+msgstr ""
+
+#: sha1-file.c:1536
+#, c-format
+msgid "unable to write sha1 filename %s"
+msgstr ""
+
+#: sha1-file.c:1543
+#, c-format
+msgid "unable to set permission to '%s'"
+msgstr ""
+
+#: sha1-file.c:1550
+msgid "file write error"
+msgstr ""
+
+#: sha1-file.c:1569
+msgid "error when closing sha1 file"
+msgstr ""
+
+#: sha1-file.c:1635
+#, c-format
+msgid "insufficient permission for adding an object to repository database %s"
+msgstr ""
+
+#: sha1-file.c:1637
+msgid "unable to create temporary file"
+msgstr ""
+
+#: sha1-file.c:1661
+msgid "unable to write sha1 file"
+msgstr ""
+
+#: sha1-file.c:1667
+#, c-format
+msgid "unable to deflate new object %s (%d)"
+msgstr ""
+
+#: sha1-file.c:1671
+#, c-format
+msgid "deflateEnd on object %s failed (%d)"
+msgstr ""
+
+#: sha1-file.c:1675
+#, c-format
+msgid "confused by unstable object source data for %s"
+msgstr ""
+
+#: sha1-file.c:1685 builtin/pack-objects.c:918
+#, c-format
+msgid "failed utime() on %s"
+msgstr ""
+
+#: sha1-file.c:1760
+#, c-format
+msgid "cannot read sha1_file for %s"
+msgstr ""
+
+#: sha1-file.c:1805
+msgid "corrupt commit"
+msgstr ""
+
+#: sha1-file.c:1813
+msgid "corrupt tag"
+msgstr ""
+
+#: sha1-file.c:1912
+#, c-format
+msgid "read error while indexing %s"
+msgstr ""
+
+#: sha1-file.c:1915
+#, c-format
+msgid "short read while indexing %s"
+msgstr ""
+
+#: sha1-file.c:1988 sha1-file.c:1997
+#, c-format
+msgid "%s: failed to insert into database"
+msgstr ""
+
+#: sha1-file.c:2003
+#, c-format
+msgid "%s: unsupported file type"
+msgstr ""
+
+#: sha1-file.c:2027
+#, c-format
+msgid "%s is not a valid object"
+msgstr ""
+
+#: sha1-file.c:2029
+#, c-format
+msgid "%s is not a valid '%s' object"
+msgstr ""
+
+#: sha1-file.c:2056 builtin/index-pack.c:154
+#, c-format
+msgid "unable to open %s"
+msgstr ""
+
+#: sha1-file.c:2226 sha1-file.c:2278
+#, c-format
+msgid "sha1 mismatch for %s (expected %s)"
+msgstr ""
+
+#: sha1-file.c:2250
+#, c-format
+msgid "unable to mmap %s"
+msgstr ""
+
+#: sha1-file.c:2255
+#, c-format
+msgid "unable to unpack header of %s"
+msgstr ""
+
+#: sha1-file.c:2261
+#, c-format
+msgid "unable to parse header of %s"
+msgstr ""
+
+#: sha1-file.c:2272
+#, c-format
+msgid "unable to unpack contents of %s"
+msgstr ""
+
+#: sha1-name.c:476
#, c-format
msgid "short SHA1 %s is ambiguous"
msgstr ""
-#: sha1_name.c:433
+#: sha1-name.c:487
msgid "The candidates are:"
msgstr ""
-#: sha1_name.c:693
+#: sha1-name.c:770
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"
"running \"git config advice.objectNameWarning false\""
msgstr ""
-#: submodule.c:96 submodule.c:130
+#: submodule.c:116 submodule.c:145
msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
msgstr ""
-#: submodule.c:100 submodule.c:134
+#: submodule.c:120 submodule.c:149
#, c-format
msgid "Could not find section in .gitmodules where path=%s"
msgstr ""
-#: submodule.c:108
-#, c-format
-msgid "Could not update .gitmodules entry %s"
-msgstr ""
-
-#: submodule.c:141
+#: submodule.c:156
#, c-format
msgid "Could not remove .gitmodules entry for %s"
msgstr ""
-#: submodule.c:152
+#: submodule.c:167
msgid "staging updated .gitmodules failed"
msgstr ""
-#: submodule.c:312
+#: submodule.c:329
#, c-format
msgid "in unpopulated submodule '%s'"
msgstr ""
-#: submodule.c:343
+#: submodule.c:360
#, c-format
msgid "Pathspec '%s' is in submodule '%.*s'"
msgstr ""
-#: submodule.c:833
+#: submodule.c:857
#, c-format
msgid "submodule entry '%s' (%s) is a %s, not a commit"
msgstr ""
-#: submodule.c:1065 builtin/branch.c:648 builtin/submodule--helper.c:1724
+#: submodule.c:1097 builtin/branch.c:656 builtin/submodule--helper.c:1985
msgid "Failed to resolve HEAD as a valid ref."
msgstr ""
-#: submodule.c:1370
+#: submodule.c:1404
#, c-format
msgid "'%s' not recognized as a git repository"
msgstr ""
-#: submodule.c:1508
+#: submodule.c:1542
#, c-format
msgid "could not start 'git status' in submodule '%s'"
msgstr ""
-#: submodule.c:1521
+#: submodule.c:1555
#, c-format
msgid "could not run 'git status' in submodule '%s'"
msgstr ""
-#: submodule.c:1614
+#: submodule.c:1648
#, c-format
msgid "submodule '%s' has dirty index"
msgstr ""
-#: submodule.c:1878
+#: submodule.c:1700
#, c-format
-msgid ""
-"relocate_gitdir for submodule '%s' with more than one worktree not supported"
+msgid "Submodule '%s' could not be updated."
msgstr ""
-#: submodule.c:1890 submodule.c:1946
+#: submodule.c:1747
#, c-format
-msgid "could not lookup name for submodule '%s'"
+msgid ""
+"relocate_gitdir for submodule '%s' with more than one worktree not supported"
msgstr ""
-#: submodule.c:1894 builtin/submodule--helper.c:1246
-#: builtin/submodule--helper.c:1256
+#: submodule.c:1759 submodule.c:1815
#, c-format
-msgid "could not create directory '%s'"
+msgid "could not lookup name for submodule '%s'"
msgstr ""
-#: submodule.c:1897
+#: submodule.c:1766
#, c-format
msgid ""
"Migrating git directory of '%s%s' from\n"
"'%s'\n"
msgstr ""
-#: submodule.c:1981
+#: submodule.c:1850
#, c-format
msgid "could not recurse into submodule '%s'"
msgstr ""
-#: submodule.c:2025
+#: submodule.c:1894
msgid "could not start ls-files in .."
msgstr ""
-#: submodule.c:2045
-msgid "BUG: returned path string doesn't match cwd?"
+#: submodule.c:1933
+#, c-format
+msgid "ls-tree returned unexpected return code %d"
msgstr ""
-#: submodule.c:2064
+#: submodule-config.c:232
#, c-format
-msgid "ls-tree returned unexpected return code %d"
+msgid "ignoring suspicious submodule name: %s"
msgstr ""
-#: submodule-config.c:263
+#: submodule-config.c:296
msgid "negative values not allowed for submodule.fetchjobs"
msgstr ""
-#: submodule-config.c:436
+#: submodule-config.c:390
+#, c-format
+msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
+msgstr ""
+
+#: submodule-config.c:479
#, c-format
msgid "invalid value for %s"
msgstr ""
+#: submodule-config.c:754
+#, c-format
+msgid "Could not update .gitmodules entry %s"
+msgstr ""
+
#: trailer.c:238
#, c-format
msgid "running trailer command '%s' failed"
msgid "unknown value '%s' for key '%s'"
msgstr ""
-#: trailer.c:539 trailer.c:544 builtin/remote.c:290
+#: trailer.c:539 trailer.c:544 builtin/remote.c:295
#, c-format
msgid "more than one %s"
msgstr ""
msgid "could not read from stdin"
msgstr ""
-#: trailer.c:1008 builtin/am.c:46
+#: trailer.c:1011 builtin/am.c:47
#, c-format
msgid "could not stat %s"
msgstr ""
-#: trailer.c:1010
+#: trailer.c:1013
#, c-format
msgid "file %s is not a regular file"
msgstr ""
-#: trailer.c:1012
+#: trailer.c:1015
#, c-format
msgid "file %s is not writable by user"
msgstr ""
-#: trailer.c:1024
+#: trailer.c:1027
msgid "could not open temporary file"
msgstr ""
-#: trailer.c:1064
+#: trailer.c:1067
#, c-format
msgid "could not rename temporary file to %s"
msgstr ""
-#: transport.c:63
+#: transport.c:116
#, c-format
msgid "Would set upstream of '%s' to '%s' of '%s'\n"
msgstr ""
-#: transport.c:152
+#: transport.c:142
+#, c-format
+msgid "could not read bundle '%s'"
+msgstr ""
+
+#: transport.c:208
#, c-format
msgid "transport: invalid depth option '%s'"
msgstr ""
-#: transport.c:916
+#: transport.c:616
+msgid "could not parse transport.color.* config"
+msgstr ""
+
+#: transport.c:689
+msgid "support for protocol v2 not implemented yet"
+msgstr ""
+
+#: transport.c:816
+#, c-format
+msgid "unknown value for config '%s': %s"
+msgstr ""
+
+#: transport.c:882
+#, c-format
+msgid "transport '%s' not allowed"
+msgstr ""
+
+#: transport.c:936
+msgid "git-over-rsync is no longer supported"
+msgstr ""
+
+#: transport.c:1031
#, c-format
msgid ""
"The following submodule paths contain changes that can\n"
"not be found on any remote:\n"
msgstr ""
-#: transport.c:920
+#: transport.c:1035
#, c-format
msgid ""
"\n"
"\n"
msgstr ""
-#: transport.c:928
+#: transport.c:1043
msgid "Aborting."
msgstr ""
-#: transport-helper.c:1079
-#, c-format
-msgid "Could not read ref %s"
+#: transport.c:1182
+msgid "failed to push all needed submodules"
msgstr ""
-#: tree-walk.c:31
-msgid "too-short tree object"
+#: transport.c:1315 transport-helper.c:643
+msgid "operation not supported by protocol"
msgstr ""
-#: tree-walk.c:37
-msgid "malformed mode in tree entry"
+#: transport.c:1419
+#, c-format
+msgid "invalid line while parsing alternate refs: %s"
msgstr ""
-#: tree-walk.c:41
-msgid "empty filename in tree entry"
+#: transport-helper.c:51 transport-helper.c:80
+msgid "full write to remote helper failed"
msgstr ""
-#: tree-walk.c:114
-msgid "too-short tree file"
+#: transport-helper.c:132
+#, c-format
+msgid "unable to find remote helper for '%s'"
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."
+#: transport-helper.c:148 transport-helper.c:557
+msgid "can't dup helper output fd"
msgstr ""
-#: unpack-trees.c:110
+#: transport-helper.c:199
#, c-format
msgid ""
-"Your local changes to the following files would be overwritten by checkout:\n"
-"%%s"
+"unknown mandatory capability %s; this remote helper probably needs newer "
+"version of Git"
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."
+#: transport-helper.c:205
+msgid "this remote helper should implement refspec capability"
msgstr ""
-#: unpack-trees.c:115
+#: transport-helper.c:272 transport-helper.c:412
#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by merge:\n"
-"%%s"
+msgid "%s unexpectedly said: '%s'"
msgstr ""
-#: unpack-trees.c:118
+#: transport-helper.c:401
#, 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 "%s also locked %s"
msgstr ""
-#: unpack-trees.c:120
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by %s:\n"
-"%%s"
+#: transport-helper.c:479
+msgid "couldn't run fast-import"
msgstr ""
-#: unpack-trees.c:125
-#, c-format
-msgid ""
-"Updating the following directories would lose untracked files in them:\n"
-"%s"
+#: transport-helper.c:502
+msgid "error while running fast-import"
msgstr ""
-#: unpack-trees.c:129
+#: transport-helper.c:531 transport-helper.c:1091
#, c-format
-msgid ""
-"The following untracked working tree files would be removed by checkout:\n"
-"%%sPlease move or remove them before you switch branches."
+msgid "could not read ref %s"
msgstr ""
-#: unpack-trees.c:131
+#: transport-helper.c:576
#, c-format
-msgid ""
-"The following untracked working tree files would be removed by checkout:\n"
-"%%s"
+msgid "unknown response to connect: %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."
+#: transport-helper.c:598
+msgid "setting remote service path not supported by protocol"
msgstr ""
-#: unpack-trees.c:136
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by merge:\n"
-"%%s"
+#: transport-helper.c:600
+msgid "invalid remote service path"
msgstr ""
-#: unpack-trees.c:139
+#: transport-helper.c:646
#, c-format
-msgid ""
-"The following untracked working tree files would be removed by %s:\n"
-"%%sPlease move or remove them before you %s."
+msgid "can't connect to subservice %s"
msgstr ""
-#: unpack-trees.c:141
+#: transport-helper.c:713
#, c-format
-msgid ""
-"The following untracked working tree files would be removed by %s:\n"
-"%%s"
+msgid "expected ok/error, helper said '%s'"
msgstr ""
-#: unpack-trees.c:146
+#: transport-helper.c:766
#, 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 "helper reported unexpected status of %s"
msgstr ""
-#: unpack-trees.c:148
+#: transport-helper.c:827
#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by "
-"checkout:\n"
-"%%s"
+msgid "helper %s does not support dry-run"
msgstr ""
-#: unpack-trees.c:151
+#: transport-helper.c:830
#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by merge:\n"
-"%%sPlease move or remove them before you merge."
+msgid "helper %s does not support --signed"
msgstr ""
-#: unpack-trees.c:153
+#: transport-helper.c:833
#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by merge:\n"
-"%%s"
+msgid "helper %s does not support --signed=if-asked"
msgstr ""
-#: unpack-trees.c:156
+#: transport-helper.c:840
#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by %s:\n"
-"%%sPlease move or remove them before you %s."
+msgid "helper %s does not support 'push-option'"
msgstr ""
-#: unpack-trees.c:158
-#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by %s:\n"
-"%%s"
+#: transport-helper.c:932
+msgid "remote-helper doesn't support push; refspec needed"
msgstr ""
-#: unpack-trees.c:165
+#: transport-helper.c:937
#, c-format
-msgid "Entry '%s' overlaps with '%s'. Cannot bind."
+msgid "helper %s does not support 'force'"
msgstr ""
-#: unpack-trees.c:168
-#, c-format
-msgid ""
+#: transport-helper.c:984
+msgid "couldn't run fast-export"
+msgstr ""
+
+#: transport-helper.c:989
+msgid "error while running fast-export"
+msgstr ""
+
+#: transport-helper.c:1014
+#, c-format
+msgid ""
+"No refs in common and none specified; doing nothing.\n"
+"Perhaps you should specify a branch such as 'master'.\n"
+msgstr ""
+
+#: transport-helper.c:1077
+#, c-format
+msgid "malformed response in ref list: %s"
+msgstr ""
+
+#: transport-helper.c:1231
+#, c-format
+msgid "read(%s) failed"
+msgstr ""
+
+#: transport-helper.c:1258
+#, c-format
+msgid "write(%s) failed"
+msgstr ""
+
+#: transport-helper.c:1307
+#, c-format
+msgid "%s thread failed"
+msgstr ""
+
+#: transport-helper.c:1311
+#, c-format
+msgid "%s thread failed to join: %s"
+msgstr ""
+
+#: transport-helper.c:1330 transport-helper.c:1334
+#, c-format
+msgid "can't start thread for copying data: %s"
+msgstr ""
+
+#: transport-helper.c:1371
+#, c-format
+msgid "%s process failed to wait"
+msgstr ""
+
+#: transport-helper.c:1375
+#, c-format
+msgid "%s process failed"
+msgstr ""
+
+#: transport-helper.c:1393 transport-helper.c:1402
+msgid "can't start thread for copying data"
+msgstr ""
+
+#: tree-walk.c:33
+msgid "too-short tree object"
+msgstr ""
+
+#: tree-walk.c:39
+msgid "malformed mode in tree entry"
+msgstr ""
+
+#: tree-walk.c:43
+msgid "empty filename in tree entry"
+msgstr ""
+
+#: tree-walk.c:115
+msgid "too-short tree file"
+msgstr ""
+
+#: unpack-trees.c:112
+#, 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 ""
+
+#: unpack-trees.c:114
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by checkout:\n"
+"%%s"
+msgstr ""
+
+#: unpack-trees.c:117
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"%%sPlease commit your changes or stash them before you merge."
+msgstr ""
+
+#: unpack-trees.c:119
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"%%s"
+msgstr ""
+
+#: unpack-trees.c:122
+#, 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 ""
+
+#: unpack-trees.c:124
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by %s:\n"
+"%%s"
+msgstr ""
+
+#: unpack-trees.c:129
+#, c-format
+msgid ""
+"Updating the following directories would lose untracked files in them:\n"
+"%s"
+msgstr ""
+
+#: unpack-trees.c:133
+#, 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 ""
+
+#: unpack-trees.c:135
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%s"
+msgstr ""
+
+#: unpack-trees.c:138
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%sPlease move or remove them before you merge."
+msgstr ""
+
+#: unpack-trees.c:140
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%s"
+msgstr ""
+
+#: unpack-trees.c:143
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%sPlease move or remove them before you %s."
+msgstr ""
+
+#: unpack-trees.c:145
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%s"
+msgstr ""
+
+#: unpack-trees.c:151
+#, 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 ""
+
+#: unpack-trees.c:153
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%s"
+msgstr ""
+
+#: unpack-trees.c:156
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%sPlease move or remove them before you merge."
+msgstr ""
+
+#: unpack-trees.c:158
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%s"
+msgstr ""
+
+#: unpack-trees.c:161
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%sPlease move or remove them before you %s."
+msgstr ""
+
+#: unpack-trees.c:163
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%s"
+msgstr ""
+
+#: unpack-trees.c:171
+#, c-format
+msgid "Entry '%s' overlaps with '%s'. Cannot bind."
+msgstr ""
+
+#: unpack-trees.c:174
+#, c-format
+msgid ""
"Cannot update sparse checkout: the following entries are not up to date:\n"
"%s"
msgstr ""
-#: unpack-trees.c:170
+#: unpack-trees.c:176
#, c-format
msgid ""
"The following working tree files would be overwritten by sparse checkout "
"%s"
msgstr ""
-#: unpack-trees.c:172
+#: unpack-trees.c:178
#, c-format
msgid ""
"The following working tree files would be removed by sparse checkout "
"%s"
msgstr ""
-#: unpack-trees.c:174
+#: unpack-trees.c:180
#, c-format
msgid ""
"Cannot update submodule:\n"
"%s"
msgstr ""
-#: unpack-trees.c:251
+#: unpack-trees.c:254
#, c-format
msgid "Aborting\n"
msgstr ""
-#: unpack-trees.c:333
+#: unpack-trees.c:336
msgid "Checking out files"
msgstr ""
+#: unpack-trees.c:368
+msgid ""
+"the following paths have collided (e.g. case-sensitive paths\n"
+"on a case-insensitive filesystem) and only one from the same\n"
+"colliding group is in the working tree:\n"
+msgstr ""
+
#: urlmatch.c:163
msgid "invalid URL scheme name or missing '://' suffix"
msgstr ""
msgid "invalid '..' path segment"
msgstr ""
-#: worktree.c:245 builtin/am.c:2147
+#: worktree.c:249 builtin/am.c:2100
#, c-format
msgid "failed to read '%s'"
msgstr ""
-#: worktree.c:291
+#: worktree.c:295
#, c-format
msgid "'%s' at main working tree is not the repository directory"
msgstr ""
-#: worktree.c:302
+#: worktree.c:306
#, c-format
msgid "'%s' file does not contain absolute path to the working tree location"
msgstr ""
-#: worktree.c:314
+#: worktree.c:318
#, c-format
msgid "'%s' does not exist"
msgstr ""
-#: worktree.c:320
+#: worktree.c:324
#, c-format
msgid "'%s' is not a .git file, error code %d"
msgstr ""
-#: worktree.c:328
+#: worktree.c:332
#, c-format
msgid "'%s' does not point back to '%s'"
msgstr ""
msgid "could not open '%s' for reading and writing"
msgstr ""
-#: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:770
-#: builtin/am.c:862 builtin/merge.c:1044
-#, c-format
-msgid "could not open '%s' for reading"
-msgstr ""
-
#: wrapper.c:424 wrapper.c:624
#, c-format
msgid "unable to access '%s'"
msgid "unable to get current working directory"
msgstr ""
-#: wt-status.c:151
+#: wt-status.c:154
msgid "Unmerged paths:"
msgstr ""
-#: wt-status.c:178 wt-status.c:205
+#: wt-status.c:181 wt-status.c:208
#, c-format
msgid " (use \"git reset %s <file>...\" to unstage)"
msgstr ""
-#: wt-status.c:180 wt-status.c:207
+#: wt-status.c:183 wt-status.c:210
msgid " (use \"git rm --cached <file>...\" to unstage)"
msgstr ""
-#: wt-status.c:184
+#: wt-status.c:187
msgid " (use \"git add <file>...\" to mark resolution)"
msgstr ""
-#: wt-status.c:186 wt-status.c:190
+#: wt-status.c:189 wt-status.c:193
msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
msgstr ""
-#: wt-status.c:188
+#: wt-status.c:191
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr ""
-#: wt-status.c:199 wt-status.c:1007
+#: wt-status.c:202 wt-status.c:1042
msgid "Changes to be committed:"
msgstr ""
-#: wt-status.c:217 wt-status.c:1016
+#: wt-status.c:220 wt-status.c:1051
msgid "Changes not staged for commit:"
msgstr ""
-#: wt-status.c:221
+#: wt-status.c:224
msgid " (use \"git add <file>...\" to update what will be committed)"
msgstr ""
-#: wt-status.c:223
+#: wt-status.c:226
msgid " (use \"git add/rm <file>...\" to update what will be committed)"
msgstr ""
-#: wt-status.c:224
+#: wt-status.c:227
msgid ""
" (use \"git checkout -- <file>...\" to discard changes in working directory)"
msgstr ""
-#: wt-status.c:226
+#: wt-status.c:229
msgid " (commit or discard the untracked or modified content in submodules)"
msgstr ""
-#: wt-status.c:238
+#: wt-status.c:241
#, c-format
msgid " (use \"git %s <file>...\" to include in what will be committed)"
msgstr ""
-#: wt-status.c:253
+#: wt-status.c:256
msgid "both deleted:"
msgstr ""
-#: wt-status.c:255
+#: wt-status.c:258
msgid "added by us:"
msgstr ""
-#: wt-status.c:257
+#: wt-status.c:260
msgid "deleted by them:"
msgstr ""
-#: wt-status.c:259
+#: wt-status.c:262
msgid "added by them:"
msgstr ""
-#: wt-status.c:261
+#: wt-status.c:264
msgid "deleted by us:"
msgstr ""
-#: wt-status.c:263
+#: wt-status.c:266
msgid "both added:"
msgstr ""
-#: wt-status.c:265
+#: wt-status.c:268
msgid "both modified:"
msgstr ""
-#: wt-status.c:275
+#: wt-status.c:278
msgid "new file:"
msgstr ""
-#: wt-status.c:277
+#: wt-status.c:280
msgid "copied:"
msgstr ""
-#: wt-status.c:279
+#: wt-status.c:282
msgid "deleted:"
msgstr ""
-#: wt-status.c:281
+#: wt-status.c:284
msgid "modified:"
msgstr ""
-#: wt-status.c:283
+#: wt-status.c:286
msgid "renamed:"
msgstr ""
-#: wt-status.c:285
+#: wt-status.c:288
msgid "typechange:"
msgstr ""
-#: wt-status.c:287
+#: wt-status.c:290
msgid "unknown:"
msgstr ""
-#: wt-status.c:289
+#: wt-status.c:292
msgid "unmerged:"
msgstr ""
-#: wt-status.c:369
+#: wt-status.c:372
msgid "new commits, "
msgstr ""
-#: wt-status.c:371
+#: wt-status.c:374
msgid "modified content, "
msgstr ""
-#: wt-status.c:373
+#: wt-status.c:376
msgid "untracked content, "
msgstr ""
-#: wt-status.c:847
+#: wt-status.c:880
#, c-format
msgid "Your stash currently has %d entry"
msgid_plural "Your stash currently has %d entries"
msgstr[0] ""
msgstr[1] ""
-#: wt-status.c:879
+#: wt-status.c:912
msgid "Submodules changed but not updated:"
msgstr ""
-#: wt-status.c:881
+#: wt-status.c:914
msgid "Submodule changes to be committed:"
msgstr ""
-#: wt-status.c:963
+#: wt-status.c:996
msgid ""
"Do not modify or remove the line above.\n"
"Everything below it will be ignored."
msgstr ""
-#: wt-status.c:1076
+#: wt-status.c:1097
msgid "You have unmerged paths."
msgstr ""
-#: wt-status.c:1079
+#: wt-status.c:1100
msgid " (fix conflicts and run \"git commit\")"
msgstr ""
-#: wt-status.c:1081
+#: wt-status.c:1102
msgid " (use \"git merge --abort\" to abort the merge)"
msgstr ""
-#: wt-status.c:1086
+#: wt-status.c:1106
msgid "All conflicts fixed but you are still merging."
msgstr ""
-#: wt-status.c:1089
+#: wt-status.c:1109
msgid " (use \"git commit\" to conclude merge)"
msgstr ""
-#: wt-status.c:1099
+#: wt-status.c:1118
msgid "You are in the middle of an am session."
msgstr ""
-#: wt-status.c:1102
+#: wt-status.c:1121
msgid "The current patch is empty."
msgstr ""
-#: wt-status.c:1106
+#: wt-status.c:1125
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr ""
-#: wt-status.c:1108
+#: wt-status.c:1127
msgid " (use \"git am --skip\" to skip this patch)"
msgstr ""
-#: wt-status.c:1110
+#: wt-status.c:1129
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr ""
-#: wt-status.c:1242
+#: wt-status.c:1260
msgid "git-rebase-todo is missing."
msgstr ""
-#: wt-status.c:1244
+#: wt-status.c:1262
msgid "No commands done."
msgstr ""
-#: wt-status.c:1247
+#: wt-status.c:1265
#, c-format
msgid "Last command done (%d command done):"
msgid_plural "Last commands done (%d commands done):"
msgstr[0] ""
msgstr[1] ""
-#: wt-status.c:1258
+#: wt-status.c:1276
#, c-format
msgid " (see more in file %s)"
msgstr ""
-#: wt-status.c:1263
+#: wt-status.c:1281
msgid "No commands remaining."
msgstr ""
-#: wt-status.c:1266
+#: wt-status.c:1284
#, 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
+#: wt-status.c:1292
msgid " (use \"git rebase --edit-todo\" to view and edit)"
msgstr ""
-#: wt-status.c:1287
+#: wt-status.c:1304
#, c-format
msgid "You are currently rebasing branch '%s' on '%s'."
msgstr ""
-#: wt-status.c:1292
+#: wt-status.c:1309
msgid "You are currently rebasing."
msgstr ""
-#: wt-status.c:1306
+#: wt-status.c:1322
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr ""
-#: wt-status.c:1308
+#: wt-status.c:1324
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr ""
-#: wt-status.c:1310
+#: wt-status.c:1326
msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr ""
-#: wt-status.c:1316
+#: wt-status.c:1333
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr ""
-#: wt-status.c:1320
+#: wt-status.c:1337
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
msgstr ""
-#: wt-status.c:1325
+#: wt-status.c:1342
msgid "You are currently splitting a commit during a rebase."
msgstr ""
-#: wt-status.c:1328
+#: wt-status.c:1345
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr ""
-#: wt-status.c:1332
+#: wt-status.c:1349
#, c-format
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr ""
-#: wt-status.c:1337
+#: wt-status.c:1354
msgid "You are currently editing a commit during a rebase."
msgstr ""
-#: wt-status.c:1340
+#: wt-status.c:1357
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr ""
-#: wt-status.c:1342
+#: wt-status.c:1359
msgid ""
" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr ""
-#: wt-status.c:1352
+#: wt-status.c:1368
#, c-format
msgid "You are currently cherry-picking commit %s."
msgstr ""
-#: wt-status.c:1357
+#: wt-status.c:1373
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr ""
-#: wt-status.c:1360
+#: wt-status.c:1376
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr ""
-#: wt-status.c:1362
+#: wt-status.c:1378
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr ""
-#: wt-status.c:1371
+#: wt-status.c:1386
#, c-format
msgid "You are currently reverting commit %s."
msgstr ""
-#: wt-status.c:1376
+#: wt-status.c:1391
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr ""
-#: wt-status.c:1379
+#: wt-status.c:1394
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr ""
-#: wt-status.c:1381
+#: wt-status.c:1396
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr ""
-#: wt-status.c:1392
+#: wt-status.c:1406
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
msgstr ""
-#: wt-status.c:1396
+#: wt-status.c:1410
msgid "You are currently bisecting."
msgstr ""
-#: wt-status.c:1399
+#: wt-status.c:1413
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr ""
-#: wt-status.c:1596
+#: wt-status.c:1611
msgid "On branch "
msgstr ""
-#: wt-status.c:1602
+#: wt-status.c:1618
msgid "interactive rebase in progress; onto "
msgstr ""
-#: wt-status.c:1604
+#: wt-status.c:1620
msgid "rebase in progress; onto "
msgstr ""
-#: wt-status.c:1609
+#: wt-status.c:1625
msgid "HEAD detached at "
msgstr ""
-#: wt-status.c:1611
+#: wt-status.c:1627
msgid "HEAD detached from "
msgstr ""
-#: wt-status.c:1614
+#: wt-status.c:1630
msgid "Not currently on any branch."
msgstr ""
-#: wt-status.c:1634
+#: wt-status.c:1647
msgid "Initial commit"
msgstr ""
-#: wt-status.c:1635
+#: wt-status.c:1648
msgid "No commits yet"
msgstr ""
-#: wt-status.c:1649
+#: wt-status.c:1662
msgid "Untracked files"
msgstr ""
-#: wt-status.c:1651
+#: wt-status.c:1664
msgid "Ignored files"
msgstr ""
-#: wt-status.c:1655
+#: wt-status.c:1668
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
"new files yourself (see 'git help status')."
msgstr ""
-#: wt-status.c:1661
+#: wt-status.c:1674
#, c-format
msgid "Untracked files not listed%s"
msgstr ""
-#: wt-status.c:1663
+#: wt-status.c:1676
msgid " (use -u option to show untracked files)"
msgstr ""
-#: wt-status.c:1669
+#: wt-status.c:1682
msgid "No changes"
msgstr ""
-#: wt-status.c:1674
+#: wt-status.c:1687
#, c-format
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr ""
-#: wt-status.c:1677
+#: wt-status.c:1690
#, c-format
msgid "no changes added to commit\n"
msgstr ""
-#: wt-status.c:1680
+#: wt-status.c:1693
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
"track)\n"
msgstr ""
-#: wt-status.c:1683
+#: wt-status.c:1696
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr ""
-#: wt-status.c:1686
+#: wt-status.c:1699
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr ""
-#: wt-status.c:1689 wt-status.c:1694
+#: wt-status.c:1702 wt-status.c:1707
#, c-format
msgid "nothing to commit\n"
msgstr ""
-#: wt-status.c:1692
+#: wt-status.c:1705
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr ""
-#: wt-status.c:1696
+#: wt-status.c:1709
#, c-format
msgid "nothing to commit, working tree clean\n"
msgstr ""
-#: wt-status.c:1809
+#: wt-status.c:1822
msgid "No commits yet on "
msgstr ""
-#: wt-status.c:1813
+#: wt-status.c:1826
msgid "HEAD (no branch)"
msgstr ""
-#: wt-status.c:1844
+#: wt-status.c:1857
msgid "different"
msgstr ""
-#: wt-status.c:1846 wt-status.c:1854
+#: wt-status.c:1859 wt-status.c:1867
msgid "behind "
msgstr ""
-#: wt-status.c:1849 wt-status.c:1852
+#: wt-status.c:1862 wt-status.c:1865
msgid "ahead "
msgstr ""
#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2358
+#: wt-status.c:2374
#, c-format
msgid "cannot %s: You have unstaged changes."
msgstr ""
-#: wt-status.c:2364
+#: wt-status.c:2380
msgid "additionally, your index contains uncommitted changes."
msgstr ""
-#: wt-status.c:2366
+#: wt-status.c:2382
#, c-format
msgid "cannot %s: Your index contains uncommitted changes."
msgstr ""
-#: compat/precompose_utf8.c:58 builtin/clone.c:440
-#, c-format
-msgid "failed to unlink '%s'"
-msgstr ""
-
#: builtin/add.c:24
msgid "git add [<options>] [--] <pathspec>..."
msgstr ""
msgid "unexpected diff status %c"
msgstr ""
-#: builtin/add.c:88 builtin/commit.c:257
+#: builtin/add.c:88 builtin/commit.c:284
msgid "updating files failed"
msgstr ""
msgid "Unstaged changes after refreshing the index:"
msgstr ""
-#: builtin/add.c:233 builtin/rev-parse.c:888
+#: builtin/add.c:233 builtin/rev-parse.c:895
msgid "Could not read the index"
msgstr ""
msgid "Could not apply '%s'"
msgstr ""
-#: builtin/add.c:271
+#: builtin/add.c:269
msgid "The following paths are ignored by one of your .gitignore files:\n"
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
+#: builtin/add.c:289 builtin/clean.c:907 builtin/fetch.c:137 builtin/mv.c:123
+#: builtin/prune-packed.c:56 builtin/pull.c:213 builtin/push.c:557
+#: builtin/remote.c:1345 builtin/rm.c:240 builtin/send-pack.c:165
msgid "dry run"
msgstr ""
-#: builtin/add.c:294
+#: builtin/add.c:292
msgid "interactive picking"
msgstr ""
-#: builtin/add.c:295 builtin/checkout.c:1128 builtin/reset.c:302
+#: builtin/add.c:293 builtin/checkout.c:1258 builtin/reset.c:305
msgid "select hunks interactively"
msgstr ""
-#: builtin/add.c:296
+#: builtin/add.c:294
msgid "edit current diff and apply"
msgstr ""
-#: builtin/add.c:297
+#: builtin/add.c:295
msgid "allow adding otherwise ignored files"
msgstr ""
-#: builtin/add.c:298
+#: builtin/add.c:296
msgid "update tracked files"
msgstr ""
-#: builtin/add.c:299
+#: builtin/add.c:297
msgid "renormalize EOL of tracked files (implies -u)"
msgstr ""
-#: builtin/add.c:300
+#: builtin/add.c:298
msgid "record only the fact that the path will be added later"
msgstr ""
-#: builtin/add.c:301
+#: builtin/add.c:299
msgid "add changes from all tracked and untracked files"
msgstr ""
-#: builtin/add.c:304
+#: builtin/add.c:302
msgid "ignore paths removed in the working tree (same as --no-all)"
msgstr ""
-#: builtin/add.c:306
+#: builtin/add.c:304
msgid "don't add, only refresh the index"
msgstr ""
-#: builtin/add.c:307
+#: builtin/add.c:305
msgid "just skip files which cannot be added because of errors"
msgstr ""
-#: builtin/add.c:308
+#: builtin/add.c:306
msgid "check if - even missing - files are ignored in dry run"
msgstr ""
-#: builtin/add.c:309 builtin/update-index.c:964
-msgid "(+/-)x"
-msgstr ""
-
-#: builtin/add.c:309 builtin/update-index.c:965
+#: builtin/add.c:308 builtin/update-index.c:990
msgid "override the executable bit of the listed files"
msgstr ""
-#: builtin/add.c:311
+#: builtin/add.c:310
msgid "warn when adding an embedded repository"
msgstr ""
-#: builtin/add.c:326
+#: builtin/add.c:325
#, c-format
msgid ""
"You've added another git repository inside your current repository.\n"
"See \"git help submodule\" for more information."
msgstr ""
-#: builtin/add.c:354
+#: builtin/add.c:353
#, c-format
msgid "adding embedded git repository: %s"
msgstr ""
-#: builtin/add.c:372
+#: builtin/add.c:371
#, c-format
msgid "Use -f if you really want to add them.\n"
msgstr ""
-#: builtin/add.c:380
+#: builtin/add.c:379
msgid "adding files failed"
msgstr ""
msgid "Maybe you wanted to say 'git add .'?\n"
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"
-msgstr ""
-
-#: builtin/am.c:414
+#: builtin/am.c:363
msgid "could not parse author script"
msgstr ""
-#: builtin/am.c:498
+#: builtin/am.c:447
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr ""
-#: builtin/am.c:539
+#: builtin/am.c:488
#, c-format
msgid "Malformed input line: '%s'."
msgstr ""
-#: builtin/am.c:576
+#: builtin/am.c:525
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr ""
-#: builtin/am.c:602
+#: builtin/am.c:551
msgid "fseek failed"
msgstr ""
-#: builtin/am.c:790
+#: builtin/am.c:739
#, c-format
msgid "could not parse patch '%s'"
msgstr ""
-#: builtin/am.c:855
+#: builtin/am.c:804
msgid "Only one StGIT patch series can be applied at once"
msgstr ""
-#: builtin/am.c:903
+#: builtin/am.c:852
msgid "invalid timestamp"
msgstr ""
-#: builtin/am.c:908 builtin/am.c:920
+#: builtin/am.c:857 builtin/am.c:869
msgid "invalid Date line"
msgstr ""
-#: builtin/am.c:915
+#: builtin/am.c:864
msgid "invalid timezone offset"
msgstr ""
-#: builtin/am.c:1008
+#: builtin/am.c:957
msgid "Patch format detection failed."
msgstr ""
-#: builtin/am.c:1013 builtin/clone.c:405
+#: builtin/am.c:962 builtin/clone.c:408
#, c-format
msgid "failed to create directory '%s'"
msgstr ""
-#: builtin/am.c:1018
+#: builtin/am.c:967
msgid "Failed to split patches."
msgstr ""
-#: builtin/am.c:1148 builtin/commit.c:342
+#: builtin/am.c:1097 builtin/commit.c:369
msgid "unable to write index file"
msgstr ""
-#: builtin/am.c:1162
+#: builtin/am.c:1111
#, c-format
msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr ""
-#: builtin/am.c:1163
+#: builtin/am.c:1112
#, c-format
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr ""
-#: builtin/am.c:1164
+#: builtin/am.c:1113
#, c-format
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr ""
-#: builtin/am.c:1271
+#: builtin/am.c:1196
+msgid "Patch sent with format=flowed; space at the end of lines might be lost."
+msgstr ""
+
+#: builtin/am.c:1224
msgid "Patch is empty."
msgstr ""
-#: builtin/am.c:1337
+#: builtin/am.c:1290
#, c-format
msgid "invalid ident line: %.*s"
msgstr ""
-#: builtin/am.c:1359
+#: builtin/am.c:1312
#, c-format
msgid "unable to parse commit %s"
msgstr ""
-#: builtin/am.c:1554
+#: builtin/am.c:1508
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr ""
-#: builtin/am.c:1556
+#: builtin/am.c:1510
msgid "Using index info to reconstruct a base tree..."
msgstr ""
-#: builtin/am.c:1575
+#: builtin/am.c:1529
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
msgstr ""
-#: builtin/am.c:1581
+#: builtin/am.c:1535
msgid "Falling back to patching base and 3-way merge..."
msgstr ""
-#: builtin/am.c:1606
+#: builtin/am.c:1561
msgid "Failed to merge in the changes."
msgstr ""
-#: builtin/am.c:1637
+#: builtin/am.c:1593
msgid "applying to an empty history"
msgstr ""
-#: builtin/am.c:1683 builtin/am.c:1687
+#: builtin/am.c:1639 builtin/am.c:1643
#, c-format
msgid "cannot resume: %s does not exist."
msgstr ""
-#: builtin/am.c:1703
+#: builtin/am.c:1659
msgid "cannot be interactive without stdin connected to a terminal."
msgstr ""
-#: builtin/am.c:1708
+#: builtin/am.c:1664
msgid "Commit Body is:"
msgstr ""
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1718
+#: builtin/am.c:1674
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr ""
-#: builtin/am.c:1768
+#: builtin/am.c:1724
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr ""
-#: builtin/am.c:1808 builtin/am.c:1879
+#: builtin/am.c:1764 builtin/am.c:1832
#, c-format
msgid "Applying: %.*s"
msgstr ""
-#: builtin/am.c:1824
+#: builtin/am.c:1781
msgid "No changes -- Patch already applied."
msgstr ""
-#: builtin/am.c:1832
+#: builtin/am.c:1787
#, c-format
msgid "Patch failed at %s %.*s"
msgstr ""
-#: builtin/am.c:1838
+#: builtin/am.c:1791
msgid "Use 'git am --show-current-patch' to see the failed patch"
msgstr ""
-#: builtin/am.c:1882
+#: builtin/am.c:1835
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
"already introduced the same changes; you might want to skip this patch."
msgstr ""
-#: builtin/am.c:1889
+#: builtin/am.c:1842
msgid ""
"You still have unmerged paths in your index.\n"
"You should 'git add' each file with resolved conflicts to mark them as "
"You might run `git rm` on a file to accept \"deleted by them\" for it."
msgstr ""
-#: builtin/am.c:1996 builtin/am.c:2000 builtin/am.c:2012 builtin/reset.c:324
-#: builtin/reset.c:332
+#: builtin/am.c:1949 builtin/am.c:1953 builtin/am.c:1965 builtin/reset.c:328
+#: builtin/reset.c:336
#, c-format
msgid "Could not parse object '%s'."
msgstr ""
-#: builtin/am.c:2048
+#: builtin/am.c:2001
msgid "failed to clean index"
msgstr ""
-#: builtin/am.c:2083
+#: builtin/am.c:2036
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
msgstr ""
-#: builtin/am.c:2174
+#: builtin/am.c:2129
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr ""
-#: builtin/am.c:2210
+#: builtin/am.c:2165
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr ""
-#: builtin/am.c:2211
+#: builtin/am.c:2166
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr ""
-#: builtin/am.c:2217
+#: builtin/am.c:2172
msgid "run interactively"
msgstr ""
-#: builtin/am.c:2219
+#: builtin/am.c:2174
msgid "historical option -- no-op"
msgstr ""
-#: builtin/am.c:2221
+#: builtin/am.c:2176
msgid "allow fall back on 3way merging if needed"
msgstr ""
-#: builtin/am.c:2222 builtin/init-db.c:484 builtin/prune-packed.c:57
-#: builtin/repack.c:182
+#: builtin/am.c:2177 builtin/init-db.c:486 builtin/prune-packed.c:58
+#: builtin/repack.c:306
msgid "be quiet"
msgstr ""
-#: builtin/am.c:2224
+#: builtin/am.c:2179
msgid "add a Signed-off-by line to the commit message"
msgstr ""
-#: builtin/am.c:2227
+#: builtin/am.c:2182
msgid "recode into utf8 (default)"
msgstr ""
-#: builtin/am.c:2229
+#: builtin/am.c:2184
msgid "pass -k flag to git-mailinfo"
msgstr ""
-#: builtin/am.c:2231
+#: builtin/am.c:2186
msgid "pass -b flag to git-mailinfo"
msgstr ""
-#: builtin/am.c:2233
+#: builtin/am.c:2188
msgid "pass -m flag to git-mailinfo"
msgstr ""
-#: builtin/am.c:2235
+#: builtin/am.c:2190
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr ""
-#: builtin/am.c:2238
+#: builtin/am.c:2193
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr ""
-#: builtin/am.c:2241
+#: builtin/am.c:2196
msgid "strip everything before a scissors line"
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
+#: 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:2216 builtin/am.c:2219
+#: builtin/am.c:2225
msgid "pass it through git-apply"
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
+#: builtin/am.c:2215 builtin/commit.c:1340 builtin/fmt-merge-msg.c:671
+#: builtin/fmt-merge-msg.c:674 builtin/grep.c:868 builtin/merge.c:239
+#: builtin/pull.c:151 builtin/pull.c:209 builtin/rebase.c:854
+#: 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:268
msgid "n"
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
+#: builtin/am.c:2221 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/am.c:2267
+#: builtin/am.c:2222
msgid "format the patch(es) are in"
msgstr ""
-#: builtin/am.c:2273
+#: builtin/am.c:2228
msgid "override error message when patch failure occurs"
msgstr ""
-#: builtin/am.c:2275
+#: builtin/am.c:2230
msgid "continue applying patches after resolving a conflict"
msgstr ""
-#: builtin/am.c:2278
+#: builtin/am.c:2233
msgid "synonyms for --continue"
msgstr ""
-#: builtin/am.c:2281
+#: builtin/am.c:2236
msgid "skip the current patch"
msgstr ""
-#: builtin/am.c:2284
+#: builtin/am.c:2239
msgid "restore the original branch and abort the patching operation."
msgstr ""
-#: builtin/am.c:2287
+#: builtin/am.c:2242
msgid "abort the patching operation but keep HEAD where it is."
msgstr ""
-#: builtin/am.c:2290
+#: builtin/am.c:2245
msgid "show the patch being applied."
msgstr ""
-#: builtin/am.c:2294
+#: builtin/am.c:2249
msgid "lie about committer date"
msgstr ""
-#: builtin/am.c:2296
+#: builtin/am.c:2251
msgid "use current timestamp for author date"
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
+#: builtin/am.c:2253 builtin/commit.c:1483 builtin/merge.c:273
+#: builtin/pull.c:184 builtin/rebase.c:898 builtin/rebase--interactive.c:183
+#: builtin/revert.c:113 builtin/tag.c:402
msgid "key-id"
msgstr ""
-#: builtin/am.c:2299
+#: builtin/am.c:2254 builtin/rebase.c:899 builtin/rebase--interactive.c:184
msgid "GPG-sign commits"
msgstr ""
-#: builtin/am.c:2302
+#: builtin/am.c:2257
msgid "(internal use for git-rebase)"
msgstr ""
-#: builtin/am.c:2320
+#: builtin/am.c:2275
msgid ""
"The -b/--binary option has been a no-op for long time, and\n"
"it will be removed. Please do not use it anymore."
msgstr ""
-#: builtin/am.c:2327
+#: builtin/am.c:2282
msgid "failed to read the index"
msgstr ""
-#: builtin/am.c:2342
+#: builtin/am.c:2297
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr ""
-#: builtin/am.c:2366
+#: builtin/am.c:2321
#, c-format
msgid ""
"Stray %s directory found.\n"
"Use \"git am --abort\" to remove it."
msgstr ""
-#: builtin/am.c:2372
+#: builtin/am.c:2327
msgid "Resolve operation not in progress, we are not resuming."
msgstr ""
msgid "--bisect-clean-state requires no arguments"
msgstr ""
-#: builtin/blame.c:27
+#: builtin/blame.c:31
msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
msgstr ""
-#: builtin/blame.c:32
+#: builtin/blame.c:36
msgid "<rev-opts> are documented in git-rev-list(1)"
msgstr ""
-#: builtin/blame.c:677
+#: builtin/blame.c:406
+#, c-format
+msgid "expecting a color: %s"
+msgstr ""
+
+#: builtin/blame.c:413
+msgid "must end with a color"
+msgstr ""
+
+#: builtin/blame.c:700
+#, c-format
+msgid "invalid color '%s' in color.blame.repeatedLines"
+msgstr ""
+
+#: builtin/blame.c:718
+msgid "invalid value for blame.coloring"
+msgstr ""
+
+#: builtin/blame.c:793
msgid "Show blame entries as we find them, incrementally"
msgstr ""
-#: builtin/blame.c:678
+#: builtin/blame.c:794
msgid "Show blank SHA-1 for boundary commits (Default: off)"
msgstr ""
-#: builtin/blame.c:679
+#: builtin/blame.c:795
msgid "Do not treat root commits as boundaries (Default: off)"
msgstr ""
-#: builtin/blame.c:680
+#: builtin/blame.c:796
msgid "Show work cost statistics"
msgstr ""
-#: builtin/blame.c:681
+#: builtin/blame.c:797
msgid "Force progress reporting"
msgstr ""
-#: builtin/blame.c:682
+#: builtin/blame.c:798
msgid "Show output score for blame entries"
msgstr ""
-#: builtin/blame.c:683
+#: builtin/blame.c:799
msgid "Show original filename (Default: auto)"
msgstr ""
-#: builtin/blame.c:684
+#: builtin/blame.c:800
msgid "Show original linenumber (Default: off)"
msgstr ""
-#: builtin/blame.c:685
+#: builtin/blame.c:801
msgid "Show in a format designed for machine consumption"
msgstr ""
-#: builtin/blame.c:686
+#: builtin/blame.c:802
msgid "Show porcelain format with per-line commit information"
msgstr ""
-#: builtin/blame.c:687
+#: builtin/blame.c:803
msgid "Use the same output mode as git-annotate (Default: off)"
msgstr ""
-#: builtin/blame.c:688
+#: builtin/blame.c:804
msgid "Show raw timestamp (Default: off)"
msgstr ""
-#: builtin/blame.c:689
+#: builtin/blame.c:805
msgid "Show long commit SHA1 (Default: off)"
msgstr ""
-#: builtin/blame.c:690
+#: builtin/blame.c:806
msgid "Suppress author name and timestamp (Default: off)"
msgstr ""
-#: builtin/blame.c:691
+#: builtin/blame.c:807
msgid "Show author email instead of name (Default: off)"
msgstr ""
-#: builtin/blame.c:692
+#: builtin/blame.c:808
msgid "Ignore whitespace differences"
msgstr ""
-#: builtin/blame.c:699
+#: builtin/blame.c:809
+msgid "color redundant metadata from previous line differently"
+msgstr ""
+
+#: builtin/blame.c:810
+msgid "color lines by age"
+msgstr ""
+
+#: builtin/blame.c:817
msgid "Use an experimental heuristic to improve diffs"
msgstr ""
-#: builtin/blame.c:701
+#: builtin/blame.c:819
msgid "Spend extra cycles to find better match"
msgstr ""
-#: builtin/blame.c:702
+#: builtin/blame.c:820
msgid "Use revisions from <file> instead of calling git-rev-list"
msgstr ""
-#: builtin/blame.c:703
+#: builtin/blame.c:821
msgid "Use <file>'s contents as the final image"
msgstr ""
-#: builtin/blame.c:704 builtin/blame.c:705
+#: builtin/blame.c:822 builtin/blame.c:823
msgid "score"
msgstr ""
-#: builtin/blame.c:704
+#: builtin/blame.c:822
msgid "Find line copies within and across files"
msgstr ""
-#: builtin/blame.c:705
+#: builtin/blame.c:823
msgid "Find line movements within and across files"
msgstr ""
-#: builtin/blame.c:706
+#: builtin/blame.c:824
msgid "n,m"
msgstr ""
-#: builtin/blame.c:706
+#: builtin/blame.c:824
msgid "Process only line range n,m, counting from 1"
msgstr ""
-#: builtin/blame.c:753
+#: builtin/blame.c:873
msgid "--progress can't be used with --incremental or porcelain formats"
msgstr ""
#. your language may need more or fewer display
#. columns.
#.
-#: builtin/blame.c:804
+#: builtin/blame.c:924
msgid "4 years, 11 months ago"
msgstr ""
-#: builtin/blame.c:890
+#: builtin/blame.c:1011
#, 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
+#: builtin/blame.c:1057
msgid "Blaming lines"
msgstr ""
-#: builtin/branch.c:27
+#: builtin/branch.c:29
msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
msgstr ""
-#: builtin/branch.c:28
+#: builtin/branch.c:30
msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
msgstr ""
-#: builtin/branch.c:29
+#: builtin/branch.c:31
msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
msgstr ""
-#: builtin/branch.c:30
+#: builtin/branch.c:32
msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
msgstr ""
-#: builtin/branch.c:31
+#: builtin/branch.c:33
msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
msgstr ""
-#: builtin/branch.c:32
+#: builtin/branch.c:34
msgid "git branch [<options>] [-r | -a] [--points-at]"
msgstr ""
-#: builtin/branch.c:33
+#: builtin/branch.c:35
msgid "git branch [<options>] [-r | -a] [--format]"
msgstr ""
-#: builtin/branch.c:146
+#: builtin/branch.c:151
#, c-format
msgid ""
"deleting branch '%s' that has been merged to\n"
" '%s', but not yet merged to HEAD."
msgstr ""
-#: builtin/branch.c:150
+#: builtin/branch.c:155
#, c-format
msgid ""
"not deleting branch '%s' that is not yet merged to\n"
" '%s', even though it is merged to HEAD."
msgstr ""
-#: builtin/branch.c:164
+#: builtin/branch.c:169
#, c-format
msgid "Couldn't look up commit object for '%s'"
msgstr ""
-#: builtin/branch.c:168
+#: builtin/branch.c:173
#, c-format
msgid ""
"The branch '%s' is not fully merged.\n"
"If you are sure you want to delete it, run 'git branch -D %s'."
msgstr ""
-#: builtin/branch.c:181
+#: builtin/branch.c:186
msgid "Update of config-file failed"
msgstr ""
-#: builtin/branch.c:212
+#: builtin/branch.c:217
msgid "cannot use -a with -d"
msgstr ""
-#: builtin/branch.c:218
+#: builtin/branch.c:223
msgid "Couldn't look up commit object for HEAD"
msgstr ""
-#: builtin/branch.c:232
+#: builtin/branch.c:237
#, c-format
msgid "Cannot delete branch '%s' checked out at '%s'"
msgstr ""
-#: builtin/branch.c:247
+#: builtin/branch.c:252
#, c-format
msgid "remote-tracking branch '%s' not found."
msgstr ""
-#: builtin/branch.c:248
+#: builtin/branch.c:253
#, c-format
msgid "branch '%s' not found."
msgstr ""
-#: builtin/branch.c:263
+#: builtin/branch.c:268
#, c-format
msgid "Error deleting remote-tracking branch '%s'"
msgstr ""
-#: builtin/branch.c:264
+#: builtin/branch.c:269
#, c-format
msgid "Error deleting branch '%s'"
msgstr ""
-#: builtin/branch.c:271
+#: builtin/branch.c:276
#, c-format
msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr ""
-#: builtin/branch.c:272
+#: builtin/branch.c:277
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr ""
-#: builtin/branch.c:417 builtin/tag.c:58
+#: builtin/branch.c:421 builtin/tag.c:59
msgid "unable to parse format string"
msgstr ""
-#: builtin/branch.c:450
+#: builtin/branch.c:458
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr ""
-#: builtin/branch.c:454
+#: builtin/branch.c:462
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr ""
-#: builtin/branch.c:471
+#: builtin/branch.c:479
msgid "cannot copy the current branch while not on any."
msgstr ""
-#: builtin/branch.c:473
+#: builtin/branch.c:481
msgid "cannot rename the current branch while not on any."
msgstr ""
-#: builtin/branch.c:484
+#: builtin/branch.c:492
#, c-format
msgid "Invalid branch name: '%s'"
msgstr ""
-#: builtin/branch.c:511
+#: builtin/branch.c:519
msgid "Branch rename failed"
msgstr ""
-#: builtin/branch.c:513
+#: builtin/branch.c:521
msgid "Branch copy failed"
msgstr ""
-#: builtin/branch.c:517
+#: builtin/branch.c:525
#, c-format
msgid "Created a copy of a misnamed branch '%s'"
msgstr ""
-#: builtin/branch.c:520
+#: builtin/branch.c:528
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr ""
-#: builtin/branch.c:526
+#: builtin/branch.c:534
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr ""
-#: builtin/branch.c:535
+#: builtin/branch.c:543
msgid "Branch is renamed, but update of config-file failed"
msgstr ""
-#: builtin/branch.c:537
+#: builtin/branch.c:545
msgid "Branch is copied, but update of config-file failed"
msgstr ""
-#: builtin/branch.c:553
+#: builtin/branch.c:561
#, c-format
msgid ""
"Please edit the description for the branch\n"
"Lines starting with '%c' will be stripped.\n"
msgstr ""
-#: builtin/branch.c:586
+#: builtin/branch.c:594
msgid "Generic options"
msgstr ""
-#: builtin/branch.c:588
+#: builtin/branch.c:596
msgid "show hash and subject, give twice for upstream branch"
msgstr ""
-#: builtin/branch.c:589
+#: builtin/branch.c:597
msgid "suppress informational messages"
msgstr ""
-#: builtin/branch.c:590
+#: builtin/branch.c:598
msgid "set up tracking mode (see git-pull(1))"
msgstr ""
-#: builtin/branch.c:592
+#: builtin/branch.c:600
msgid "do not use"
msgstr ""
-#: builtin/branch.c:594
+#: builtin/branch.c:602 builtin/rebase--interactive.c:180
msgid "upstream"
msgstr ""
-#: builtin/branch.c:594
+#: builtin/branch.c:602
msgid "change the upstream info"
msgstr ""
-#: builtin/branch.c:595
+#: builtin/branch.c:603
msgid "Unset the upstream info"
msgstr ""
-#: builtin/branch.c:596
+#: builtin/branch.c:604
msgid "use colored output"
msgstr ""
-#: builtin/branch.c:597
+#: builtin/branch.c:605
msgid "act on remote-tracking branches"
msgstr ""
-#: builtin/branch.c:599 builtin/branch.c:601
+#: builtin/branch.c:607 builtin/branch.c:609
msgid "print only branches that contain the commit"
msgstr ""
-#: builtin/branch.c:600 builtin/branch.c:602
+#: builtin/branch.c:608 builtin/branch.c:610
msgid "print only branches that don't contain the commit"
msgstr ""
-#: builtin/branch.c:605
+#: builtin/branch.c:613
msgid "Specific git-branch actions:"
msgstr ""
-#: builtin/branch.c:606
+#: builtin/branch.c:614
msgid "list both remote-tracking and local branches"
msgstr ""
-#: builtin/branch.c:608
+#: builtin/branch.c:616
msgid "delete fully merged branch"
msgstr ""
-#: builtin/branch.c:609
+#: builtin/branch.c:617
msgid "delete branch (even if not merged)"
msgstr ""
-#: builtin/branch.c:610
+#: builtin/branch.c:618
msgid "move/rename a branch and its reflog"
msgstr ""
-#: builtin/branch.c:611
+#: builtin/branch.c:619
msgid "move/rename a branch, even if target exists"
msgstr ""
-#: builtin/branch.c:612
+#: builtin/branch.c:620
msgid "copy a branch and its reflog"
msgstr ""
-#: builtin/branch.c:613
+#: builtin/branch.c:621
msgid "copy a branch, even if target exists"
msgstr ""
-#: builtin/branch.c:614
+#: builtin/branch.c:622
msgid "list branch names"
msgstr ""
-#: builtin/branch.c:615
+#: builtin/branch.c:623
msgid "create the branch's reflog"
msgstr ""
-#: builtin/branch.c:617
+#: builtin/branch.c:625
msgid "edit the description for the branch"
msgstr ""
-#: builtin/branch.c:618
+#: builtin/branch.c:626
msgid "force creation, move/rename, deletion"
msgstr ""
-#: builtin/branch.c:619
+#: builtin/branch.c:627
msgid "print only branches that are merged"
msgstr ""
-#: builtin/branch.c:620
+#: builtin/branch.c:628
msgid "print only branches that are not merged"
msgstr ""
-#: builtin/branch.c:621
+#: builtin/branch.c:629
msgid "list branches in columns"
msgstr ""
-#: builtin/branch.c:622 builtin/for-each-ref.c:40 builtin/tag.c:411
+#: builtin/branch.c:630 builtin/for-each-ref.c:40 builtin/ls-remote.c:70
+#: builtin/tag.c:415
msgid "key"
msgstr ""
-#: builtin/branch.c:623 builtin/for-each-ref.c:41 builtin/tag.c:412
+#: 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/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
+#: builtin/branch.c:633 builtin/for-each-ref.c:43 builtin/notes.c:415
+#: builtin/notes.c:418 builtin/notes.c:578 builtin/notes.c:581
+#: builtin/tag.c:418
msgid "object"
msgstr ""
-#: builtin/branch.c:626
+#: builtin/branch.c:634
msgid "print only branches of the object"
msgstr ""
-#: builtin/branch.c:628 builtin/for-each-ref.c:49 builtin/tag.c:421
+#: builtin/branch.c:636 builtin/for-each-ref.c:49 builtin/tag.c:425
msgid "sorting and filtering are case insensitive"
msgstr ""
-#: builtin/branch.c:629 builtin/for-each-ref.c:38 builtin/tag.c:419
+#: 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/branch.c:652 builtin/clone.c:735
+#: builtin/branch.c:660 builtin/clone.c:739
msgid "HEAD not found below refs/heads!"
msgstr ""
-#: builtin/branch.c:675
+#: builtin/branch.c:683
msgid "--column and --verbose are incompatible"
msgstr ""
-#: builtin/branch.c:690 builtin/branch.c:742 builtin/branch.c:751
+#: builtin/branch.c:698 builtin/branch.c:749 builtin/branch.c:758
msgid "branch name required"
msgstr ""
-#: builtin/branch.c:718
+#: builtin/branch.c:725
msgid "Cannot give description to detached HEAD"
msgstr ""
-#: builtin/branch.c:723
+#: builtin/branch.c:730
msgid "cannot edit description of more than one branch"
msgstr ""
-#: builtin/branch.c:730
+#: builtin/branch.c:737
#, c-format
msgid "No commit on branch '%s' yet."
msgstr ""
-#: builtin/branch.c:733
+#: builtin/branch.c:740
#, c-format
msgid "No branch named '%s'."
msgstr ""
-#: builtin/branch.c:748
+#: builtin/branch.c:755
msgid "too many branches for a copy operation"
msgstr ""
-#: builtin/branch.c:757
+#: builtin/branch.c:764
msgid "too many arguments for a rename operation"
msgstr ""
-#: builtin/branch.c:762
+#: builtin/branch.c:769
msgid "too many arguments to set new upstream"
msgstr ""
-#: builtin/branch.c:766
+#: 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/branch.c:769 builtin/branch.c:791 builtin/branch.c:807
+#: builtin/branch.c:776 builtin/branch.c:798
#, c-format
msgid "no such branch '%s'"
msgstr ""
-#: builtin/branch.c:773
+#: builtin/branch.c:780
#, c-format
msgid "branch '%s' does not exist"
msgstr ""
-#: builtin/branch.c:785
+#: builtin/branch.c:792
msgid "too many arguments to unset upstream"
msgstr ""
-#: builtin/branch.c:789
+#: builtin/branch.c:796
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr ""
-#: builtin/branch.c:795
+#: builtin/branch.c:802
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr ""
-#: builtin/branch.c:810
+#: builtin/branch.c:812
msgid "-a and -r options to 'git branch' do not make sense with a branch name"
msgstr ""
-#: builtin/branch.c:813
+#: builtin/branch.c:815
msgid ""
"the '--set-upstream' option is no longer supported. Please use '--track' or "
"'--set-upstream-to' instead."
msgid "Need a repository to unbundle."
msgstr ""
-#: builtin/cat-file.c:523
+#: builtin/cat-file.c:587
msgid ""
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
"p | <type> | --textconv | --filters) [--path=<path>] <object>"
msgstr ""
-#: builtin/cat-file.c:524
+#: builtin/cat-file.c:588
msgid ""
"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
"filters]"
msgstr ""
-#: builtin/cat-file.c:561
+#: builtin/cat-file.c:609
+msgid "only one batch option may be specified"
+msgstr ""
+
+#: builtin/cat-file.c:627
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr ""
-#: builtin/cat-file.c:562
+#: builtin/cat-file.c:628
msgid "show object type"
msgstr ""
-#: builtin/cat-file.c:563
+#: builtin/cat-file.c:629
msgid "show object size"
msgstr ""
-#: builtin/cat-file.c:565
+#: builtin/cat-file.c:631
msgid "exit with zero when there's no error"
msgstr ""
-#: builtin/cat-file.c:566
+#: builtin/cat-file.c:632
msgid "pretty-print object's content"
msgstr ""
-#: builtin/cat-file.c:568
+#: builtin/cat-file.c:634
msgid "for blob objects, run textconv on object's content"
msgstr ""
-#: builtin/cat-file.c:570
+#: builtin/cat-file.c:636
msgid "for blob objects, run filters on object's content"
msgstr ""
-#: builtin/cat-file.c:571 git-submodule.sh:878
+#: builtin/cat-file.c:637 git-submodule.sh:857
msgid "blob"
msgstr ""
-#: builtin/cat-file.c:572
+#: builtin/cat-file.c:638
msgid "use a specific path for --textconv/--filters"
msgstr ""
-#: builtin/cat-file.c:574
+#: builtin/cat-file.c:640
msgid "allow -s and -t to work with broken/corrupt objects"
msgstr ""
-#: builtin/cat-file.c:575
+#: builtin/cat-file.c:641
msgid "buffer --batch output"
msgstr ""
-#: builtin/cat-file.c:577
+#: builtin/cat-file.c:643
msgid "show info and content of objects fed from the standard input"
msgstr ""
-#: builtin/cat-file.c:580
+#: builtin/cat-file.c:647
msgid "show info about objects fed from the standard input"
msgstr ""
-#: builtin/cat-file.c:583
+#: builtin/cat-file.c:651
msgid "follow in-tree symlinks (used with --batch or --batch-check)"
msgstr ""
-#: builtin/cat-file.c:585
+#: builtin/cat-file.c:653
msgid "show all objects with --batch or --batch-check"
msgstr ""
+#: builtin/cat-file.c:655
+msgid "do not order --batch-all-objects output"
+msgstr ""
+
#: builtin/check-attr.c:12
msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
msgstr ""
msgid "use .gitattributes only from the index"
msgstr ""
-#: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:100
+#: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:101
msgid "read file names from stdin"
msgstr ""
msgid "terminate input and output records by a NUL character"
msgstr ""
-#: builtin/check-ignore.c:20 builtin/checkout.c:1106 builtin/gc.c:358
+#: builtin/check-ignore.c:20 builtin/checkout.c:1234 builtin/gc.c:517
+#: builtin/worktree.c:495
msgid "suppress progress reporting"
msgstr ""
msgid "git checkout-index [<options>] [--] [<file>...]"
msgstr ""
-#: builtin/checkout-index.c:143
+#: builtin/checkout-index.c:145
msgid "stage should be between 1 and 3 or all"
msgstr ""
-#: builtin/checkout-index.c:159
+#: builtin/checkout-index.c:161
msgid "check out all files in the index"
msgstr ""
-#: builtin/checkout-index.c:160
+#: builtin/checkout-index.c:162
msgid "force overwrite of existing files"
msgstr ""
-#: builtin/checkout-index.c:162
+#: builtin/checkout-index.c:164
msgid "no warning for existing files and files not in index"
msgstr ""
-#: builtin/checkout-index.c:164
+#: builtin/checkout-index.c:166
msgid "don't checkout new files"
msgstr ""
-#: builtin/checkout-index.c:166
+#: builtin/checkout-index.c:168
msgid "update stat information in the index file"
msgstr ""
-#: builtin/checkout-index.c:170
+#: builtin/checkout-index.c:172
msgid "read list of paths from the standard input"
msgstr ""
-#: builtin/checkout-index.c:172
+#: builtin/checkout-index.c:174
msgid "write the content to temporary files"
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
+#: builtin/checkout-index.c:175 builtin/column.c:31
+#: builtin/submodule--helper.c:1368 builtin/submodule--helper.c:1371
+#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1853
+#: builtin/worktree.c:668
msgid "string"
msgstr ""
-#: builtin/checkout-index.c:174
+#: builtin/checkout-index.c:176
msgid "when creating files, prepend <string>"
msgstr ""
-#: builtin/checkout-index.c:176
+#: builtin/checkout-index.c:178
msgid "copy out the files from named stage"
msgstr ""
-#: builtin/checkout.c:27
+#: builtin/checkout.c:31
msgid "git checkout [<options>] <branch>"
msgstr ""
-#: builtin/checkout.c:28
+#: builtin/checkout.c:32
msgid "git checkout [<options>] [<branch>] -- <file>..."
msgstr ""
-#: builtin/checkout.c:136 builtin/checkout.c:169
+#: builtin/checkout.c:144 builtin/checkout.c:177
#, c-format
msgid "path '%s' does not have our version"
msgstr ""
-#: builtin/checkout.c:138 builtin/checkout.c:171
+#: builtin/checkout.c:146 builtin/checkout.c:179
#, c-format
msgid "path '%s' does not have their version"
msgstr ""
-#: builtin/checkout.c:154
+#: builtin/checkout.c:162
#, c-format
msgid "path '%s' does not have all necessary versions"
msgstr ""
-#: builtin/checkout.c:198
+#: builtin/checkout.c:206
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr ""
-#: builtin/checkout.c:215
+#: builtin/checkout.c:224
#, c-format
msgid "path '%s': cannot merge"
msgstr ""
-#: builtin/checkout.c:231
+#: builtin/checkout.c:240
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr ""
-#: builtin/checkout.c:253 builtin/checkout.c:256 builtin/checkout.c:259
-#: builtin/checkout.c:262
+#: builtin/checkout.c:262 builtin/checkout.c:265 builtin/checkout.c:268
+#: builtin/checkout.c:271
#, c-format
msgid "'%s' cannot be used with updating paths"
msgstr ""
-#: builtin/checkout.c:265 builtin/checkout.c:268
+#: builtin/checkout.c:274 builtin/checkout.c:277
#, c-format
msgid "'%s' cannot be used with %s"
msgstr ""
-#: builtin/checkout.c:271
+#: builtin/checkout.c:280
#, c-format
msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr ""
-#: builtin/checkout.c:340 builtin/checkout.c:347
+#: builtin/checkout.c:349 builtin/checkout.c:356
#, c-format
msgid "path '%s' is unmerged"
msgstr ""
-#: builtin/checkout.c:505
+#: builtin/checkout.c:608
msgid "you need to resolve your current index first"
msgstr ""
-#: builtin/checkout.c:636
+#: builtin/checkout.c:745
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr ""
-#: builtin/checkout.c:677
+#: builtin/checkout.c:786
msgid "HEAD is now at"
msgstr ""
-#: builtin/checkout.c:681 builtin/clone.c:689
+#: builtin/checkout.c:790 builtin/clone.c:692
msgid "unable to update HEAD"
msgstr ""
-#: builtin/checkout.c:685
+#: builtin/checkout.c:794
#, c-format
msgid "Reset branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:688
+#: builtin/checkout.c:797
#, c-format
msgid "Already on '%s'\n"
msgstr ""
-#: builtin/checkout.c:692
+#: builtin/checkout.c:801
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:694 builtin/checkout.c:1039
+#: builtin/checkout.c:803 builtin/checkout.c:1166
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:696
+#: builtin/checkout.c:805
#, c-format
msgid "Switched to branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:747
+#: builtin/checkout.c:856
#, c-format
msgid " ... and %d more.\n"
msgstr ""
-#: builtin/checkout.c:753
+#: builtin/checkout.c:862
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
msgstr[0] ""
msgstr[1] ""
-#: builtin/checkout.c:772
+#: builtin/checkout.c:881
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
msgstr[0] ""
msgstr[1] ""
-#: builtin/checkout.c:804
+#: builtin/checkout.c:913
msgid "internal error in revision walk"
msgstr ""
-#: builtin/checkout.c:808
+#: builtin/checkout.c:917
msgid "Previous HEAD position was"
msgstr ""
-#: builtin/checkout.c:836 builtin/checkout.c:1034
+#: builtin/checkout.c:945 builtin/checkout.c:1161
msgid "You are on a branch yet to be born"
msgstr ""
-#: builtin/checkout.c:940
+#: builtin/checkout.c:1066
#, c-format
msgid "only one reference expected, %d given."
msgstr ""
-#: builtin/checkout.c:980 builtin/worktree.c:249
+#: builtin/checkout.c:1107 builtin/worktree.c:289 builtin/worktree.c:444
#, c-format
msgid "invalid reference: %s"
msgstr ""
-#: builtin/checkout.c:1009
+#: builtin/checkout.c:1136
#, c-format
msgid "reference is not a tree: %s"
msgstr ""
-#: builtin/checkout.c:1048
+#: builtin/checkout.c:1175
msgid "paths cannot be used with switching branches"
msgstr ""
-#: builtin/checkout.c:1051 builtin/checkout.c:1055
+#: builtin/checkout.c:1178 builtin/checkout.c:1182
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr ""
-#: builtin/checkout.c:1059 builtin/checkout.c:1062 builtin/checkout.c:1067
-#: builtin/checkout.c:1070
+#: builtin/checkout.c:1186 builtin/checkout.c:1189 builtin/checkout.c:1194
+#: builtin/checkout.c:1197
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr ""
-#: builtin/checkout.c:1075
+#: builtin/checkout.c:1202
#, c-format
msgid "Cannot switch branch to a non-commit '%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
+#: builtin/checkout.c:1235 builtin/checkout.c:1237 builtin/clone.c:119
+#: builtin/remote.c:169 builtin/remote.c:171 builtin/worktree.c:488
+#: builtin/worktree.c:490
msgid "branch"
msgstr ""
-#: builtin/checkout.c:1108
+#: builtin/checkout.c:1236
msgid "create and checkout a new branch"
msgstr ""
-#: builtin/checkout.c:1110
+#: builtin/checkout.c:1238
msgid "create/reset and checkout a branch"
msgstr ""
-#: builtin/checkout.c:1111
+#: builtin/checkout.c:1239
msgid "create reflog for new branch"
msgstr ""
-#: builtin/checkout.c:1112 builtin/worktree.c:391
+#: builtin/checkout.c:1240 builtin/worktree.c:492
msgid "detach HEAD at named commit"
msgstr ""
-#: builtin/checkout.c:1113
+#: builtin/checkout.c:1241
msgid "set upstream info for new branch"
msgstr ""
-#: builtin/checkout.c:1115
+#: builtin/checkout.c:1243
msgid "new-branch"
msgstr ""
-#: builtin/checkout.c:1115
+#: builtin/checkout.c:1243
msgid "new unparented branch"
msgstr ""
-#: builtin/checkout.c:1116
+#: builtin/checkout.c:1245
msgid "checkout our version for unmerged files"
msgstr ""
-#: builtin/checkout.c:1118
+#: builtin/checkout.c:1248
msgid "checkout their version for unmerged files"
msgstr ""
-#: builtin/checkout.c:1120
+#: builtin/checkout.c:1250
msgid "force checkout (throw away local modifications)"
msgstr ""
-#: builtin/checkout.c:1122
+#: builtin/checkout.c:1252
msgid "perform a 3-way merge with the new branch"
msgstr ""
-#: builtin/checkout.c:1124 builtin/merge.c:239
+#: builtin/checkout.c:1254 builtin/merge.c:275
msgid "update ignored files (default)"
msgstr ""
-#: builtin/checkout.c:1126 builtin/log.c:1499 parse-options.h:263
+#: builtin/checkout.c:1256 builtin/log.c:1573 parse-options.h:274
msgid "style"
msgstr ""
-#: builtin/checkout.c:1127
+#: builtin/checkout.c:1257
msgid "conflict style (merge or diff3)"
msgstr ""
-#: builtin/checkout.c:1130
+#: builtin/checkout.c:1260
msgid "do not limit pathspecs to sparse entries only"
msgstr ""
-#: builtin/checkout.c:1132
+#: builtin/checkout.c:1262
msgid "second guess 'git checkout <no-such-branch>'"
msgstr ""
-#: builtin/checkout.c:1134
+#: builtin/checkout.c:1264
msgid "do not check if another worktree is holding the given ref"
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
+#: builtin/checkout.c:1268 builtin/clone.c:86 builtin/fetch.c:141
+#: builtin/merge.c:272 builtin/pull.c:129 builtin/push.c:572
+#: builtin/send-pack.c:174
msgid "force progress reporting"
msgstr ""
-#: builtin/checkout.c:1168
+#: builtin/checkout.c:1298
msgid "-b, -B and --orphan are mutually exclusive"
msgstr ""
-#: builtin/checkout.c:1185
+#: builtin/checkout.c:1315
msgid "--track needs a branch name"
msgstr ""
-#: builtin/checkout.c:1190
-msgid "Missing branch name; try -b"
+#: builtin/checkout.c:1320
+msgid "missing branch name; try -b"
msgstr ""
-#: builtin/checkout.c:1226
+#: builtin/checkout.c:1357
msgid "invalid path specification"
msgstr ""
-#: builtin/checkout.c:1233
+#: builtin/checkout.c:1364
#, c-format
msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
msgstr ""
-#: builtin/checkout.c:1237
+#: builtin/checkout.c:1368
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr ""
-#: builtin/checkout.c:1241
+#: builtin/checkout.c:1372
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
msgstr ""
-#: builtin/clean.c:26
+#: builtin/checkout.c:1392
+#, c-format
+msgid ""
+"'%s' matched more than one remote tracking branch.\n"
+"We found %d remotes with a reference that matched. So we fell back\n"
+"on trying to resolve the argument as a path, but failed there too!\n"
+"\n"
+"If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
+"you can do so by fully qualifying the name with the --track option:\n"
+"\n"
+" git checkout --track origin/<name>\n"
+"\n"
+"If you'd like to always have checkouts of an ambiguous <name> prefer\n"
+"one remote, e.g. the 'origin' remote, consider setting\n"
+"checkout.defaultRemote=origin in your config."
+msgstr ""
+
+#: builtin/clean.c:27
msgid ""
"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
msgstr ""
-#: builtin/clean.c:30
+#: builtin/clean.c:31
#, c-format
msgid "Removing %s\n"
msgstr ""
-#: builtin/clean.c:31
+#: builtin/clean.c:32
#, c-format
msgid "Would remove %s\n"
msgstr ""
-#: builtin/clean.c:32
+#: builtin/clean.c:33
#, c-format
msgid "Skipping repository %s\n"
msgstr ""
-#: builtin/clean.c:33
+#: builtin/clean.c:34
#, c-format
msgid "Would skip repository %s\n"
msgstr ""
-#: builtin/clean.c:34
+#: builtin/clean.c:35
#, c-format
msgid "failed to remove %s"
msgstr ""
-#: builtin/clean.c:302 git-add--interactive.perl:572
+#: builtin/clean.c:298 git-add--interactive.perl:579
#, c-format
msgid ""
"Prompt help:\n"
" - (empty) select nothing\n"
msgstr ""
-#: builtin/clean.c:306 git-add--interactive.perl:581
+#: builtin/clean.c:302 git-add--interactive.perl:588
#, c-format
msgid ""
"Prompt help:\n"
" - (empty) finish selecting\n"
msgstr ""
-#: builtin/clean.c:522 git-add--interactive.perl:547
-#: git-add--interactive.perl:552
+#: builtin/clean.c:518 git-add--interactive.perl:554
+#: git-add--interactive.perl:559
#, c-format, perl-format
msgid "Huh (%s)?\n"
msgstr ""
-#: builtin/clean.c:664
+#: builtin/clean.c:660
#, c-format
msgid "Input ignore patterns>> "
msgstr ""
-#: builtin/clean.c:701
+#: builtin/clean.c:697
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
msgstr ""
-#: builtin/clean.c:722
+#: builtin/clean.c:718
msgid "Select items to delete"
msgstr ""
#. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:763
+#: builtin/clean.c:759
#, c-format
msgid "Remove %s [y/N]? "
msgstr ""
-#: builtin/clean.c:788 git-add--interactive.perl:1710
+#: builtin/clean.c:784 git-add--interactive.perl:1717
#, c-format
msgid "Bye.\n"
msgstr ""
-#: builtin/clean.c:796
+#: builtin/clean.c:792
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
"? - help for prompt selection"
msgstr ""
-#: builtin/clean.c:823 git-add--interactive.perl:1786
+#: builtin/clean.c:819 git-add--interactive.perl:1793
msgid "*** Commands ***"
msgstr ""
-#: builtin/clean.c:824 git-add--interactive.perl:1783
+#: builtin/clean.c:820 git-add--interactive.perl:1790
msgid "What now"
msgstr ""
-#: builtin/clean.c:832
+#: builtin/clean.c:828
msgid "Would remove the following item:"
msgid_plural "Would remove the following items:"
msgstr[0] ""
msgstr[1] ""
-#: builtin/clean.c:848
+#: builtin/clean.c:844
msgid "No more files to clean, exiting."
msgstr ""
-#: builtin/clean.c:910
+#: builtin/clean.c:906
msgid "do not print names of files removed"
msgstr ""
-#: builtin/clean.c:912
+#: builtin/clean.c:908
msgid "force"
msgstr ""
-#: builtin/clean.c:913
+#: builtin/clean.c:909
msgid "interactive cleaning"
msgstr ""
-#: builtin/clean.c:915
+#: builtin/clean.c:911
msgid "remove whole directories"
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
+#: builtin/clean.c:912 builtin/describe.c:545 builtin/describe.c:547
+#: builtin/grep.c:886 builtin/log.c:166 builtin/log.c:168
+#: builtin/ls-files.c:556 builtin/name-rev.c:415 builtin/name-rev.c:417
+#: builtin/show-ref.c:178
msgid "pattern"
msgstr ""
-#: builtin/clean.c:917
+#: builtin/clean.c:913
msgid "add <pattern> to ignore rules"
msgstr ""
-#: builtin/clean.c:918
+#: builtin/clean.c:914
msgid "remove ignored files, too"
msgstr ""
-#: builtin/clean.c:920
+#: builtin/clean.c:916
msgid "remove only ignored files"
msgstr ""
-#: builtin/clean.c:938
+#: builtin/clean.c:934
msgid "-x and -X cannot be used together"
msgstr ""
-#: builtin/clean.c:942
+#: builtin/clean.c:938
msgid ""
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
"clean"
msgstr ""
-#: builtin/clean.c:945
+#: builtin/clean.c:941
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
msgstr ""
-#: builtin/clone.c:40
+#: builtin/clone.c:43
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr ""
-#: builtin/clone.c:85
+#: builtin/clone.c:88
msgid "don't create a checkout"
msgstr ""
-#: builtin/clone.c:86 builtin/clone.c:88 builtin/init-db.c:479
+#: builtin/clone.c:89 builtin/clone.c:91 builtin/init-db.c:481
msgid "create a bare repository"
msgstr ""
-#: builtin/clone.c:90
+#: builtin/clone.c:93
msgid "create a mirror repository (implies bare)"
msgstr ""
-#: builtin/clone.c:92
+#: builtin/clone.c:95
msgid "to clone from a local repository"
msgstr ""
-#: builtin/clone.c:94
+#: builtin/clone.c:97
msgid "don't use local hardlinks, always copy"
msgstr ""
-#: builtin/clone.c:96
+#: builtin/clone.c:99
msgid "setup as shared repository"
msgstr ""
-#: builtin/clone.c:98 builtin/clone.c:102
+#: builtin/clone.c:101 builtin/clone.c:105
msgid "pathspec"
msgstr ""
-#: builtin/clone.c:98 builtin/clone.c:102
+#: builtin/clone.c:101 builtin/clone.c:105
msgid "initialize submodules in the clone"
msgstr ""
-#: builtin/clone.c:105
+#: builtin/clone.c:108
msgid "number of submodules cloned in parallel"
msgstr ""
-#: builtin/clone.c:106 builtin/init-db.c:476
+#: builtin/clone.c:109 builtin/init-db.c:478
msgid "template-directory"
msgstr ""
-#: builtin/clone.c:107 builtin/init-db.c:477
+#: builtin/clone.c:110 builtin/init-db.c:479
msgid "directory from which templates will be used"
msgstr ""
-#: builtin/clone.c:109 builtin/clone.c:111 builtin/submodule--helper.c:1210
-#: builtin/submodule--helper.c:1577
+#: builtin/clone.c:112 builtin/clone.c:114 builtin/submodule--helper.c:1375
+#: builtin/submodule--helper.c:1856
msgid "reference repository"
msgstr ""
-#: builtin/clone.c:113
+#: builtin/clone.c:116 builtin/submodule--helper.c:1377
+#: builtin/submodule--helper.c:1858
msgid "use --reference only while cloning"
msgstr ""
-#: builtin/clone.c:114 builtin/column.c:27 builtin/merge-file.c:44
+#: builtin/clone.c:117 builtin/column.c:27 builtin/merge-file.c:46
+#: builtin/pack-objects.c:3301 builtin/repack.c:329
msgid "name"
msgstr ""
-#: builtin/clone.c:115
+#: builtin/clone.c:118
msgid "use <name> instead of 'origin' to track upstream"
msgstr ""
-#: builtin/clone.c:117
+#: builtin/clone.c:120
msgid "checkout <branch> instead of the remote's HEAD"
msgstr ""
-#: builtin/clone.c:119
+#: builtin/clone.c:122
msgid "path to git-upload-pack on the remote"
msgstr ""
-#: builtin/clone.c:120 builtin/fetch.c:151 builtin/grep.c:813
-#: builtin/pull.c:211
+#: builtin/clone.c:123 builtin/fetch.c:142 builtin/grep.c:825
+#: builtin/pull.c:217
msgid "depth"
msgstr ""
-#: builtin/clone.c:121
+#: builtin/clone.c:124
msgid "create a shallow clone of that depth"
msgstr ""
-#: builtin/clone.c:122 builtin/fetch.c:153 builtin/pack-objects.c:3017
-#: parse-options.h:154
+#: builtin/clone.c:125 builtin/fetch.c:144 builtin/pack-objects.c:3292
msgid "time"
msgstr ""
-#: builtin/clone.c:123
+#: builtin/clone.c:126
msgid "create a shallow clone since a specific time"
msgstr ""
-#: builtin/clone.c:124 builtin/fetch.c:155
+#: builtin/clone.c:127 builtin/fetch.c:146 builtin/fetch.c:169
+#: builtin/rebase.c:831
msgid "revision"
msgstr ""
-#: builtin/clone.c:125 builtin/fetch.c:156
+#: builtin/clone.c:128 builtin/fetch.c:147
msgid "deepen history of shallow clone, excluding rev"
msgstr ""
-#: builtin/clone.c:127
+#: builtin/clone.c:130
msgid "clone only one branch, HEAD or --branch"
msgstr ""
-#: builtin/clone.c:129
+#: builtin/clone.c:132
msgid "don't clone any tags, and make later fetches not to follow them"
msgstr ""
-#: builtin/clone.c:131
+#: builtin/clone.c:134
msgid "any cloned submodules will be shallow"
msgstr ""
-#: builtin/clone.c:132 builtin/init-db.c:485
+#: builtin/clone.c:135 builtin/init-db.c:487
msgid "gitdir"
msgstr ""
-#: builtin/clone.c:133 builtin/init-db.c:486
+#: builtin/clone.c:136 builtin/init-db.c:488
msgid "separate git dir from working tree"
msgstr ""
-#: builtin/clone.c:134
+#: builtin/clone.c:137
msgid "key=value"
msgstr ""
-#: builtin/clone.c:135
+#: builtin/clone.c:138
msgid "set config inside the new repository"
msgstr ""
-#: builtin/clone.c:136 builtin/fetch.c:173 builtin/pull.c:224
-#: builtin/push.c:567
+#: builtin/clone.c:139 builtin/fetch.c:165 builtin/pull.c:230
+#: builtin/push.c:583
msgid "use IPv4 addresses only"
msgstr ""
-#: builtin/clone.c:138 builtin/fetch.c:175 builtin/pull.c:227
-#: builtin/push.c:569
+#: builtin/clone.c:141 builtin/fetch.c:167 builtin/pull.c:233
+#: builtin/push.c:585
msgid "use IPv6 addresses only"
msgstr ""
-#: builtin/clone.c:276
+#: builtin/clone.c:279
msgid ""
"No directory name could be guessed.\n"
"Please specify a directory on the command line"
msgstr ""
-#: builtin/clone.c:329
+#: builtin/clone.c:332
#, c-format
msgid "info: Could not add alternate for '%s': %s\n"
msgstr ""
-#: builtin/clone.c:401
+#: builtin/clone.c:404
#, c-format
msgid "failed to open '%s'"
msgstr ""
-#: builtin/clone.c:409
+#: builtin/clone.c:412
#, c-format
msgid "%s exists and is not a directory"
msgstr ""
-#: builtin/clone.c:423
+#: builtin/clone.c:426
#, c-format
msgid "failed to stat %s\n"
msgstr ""
-#: builtin/clone.c:445
+#: builtin/clone.c:443
+#, c-format
+msgid "failed to unlink '%s'"
+msgstr ""
+
+#: builtin/clone.c:448
#, c-format
msgid "failed to create link '%s'"
msgstr ""
-#: builtin/clone.c:449
+#: builtin/clone.c:452
#, c-format
msgid "failed to copy file to '%s'"
msgstr ""
-#: builtin/clone.c:475
+#: builtin/clone.c:478
#, c-format
msgid "done.\n"
msgstr ""
-#: builtin/clone.c:489
+#: builtin/clone.c:492
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
"and retry the checkout with 'git checkout -f HEAD'\n"
msgstr ""
-#: builtin/clone.c:566
+#: builtin/clone.c:569
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr ""
-#: builtin/clone.c:661
-msgid "remote did not send all necessary objects"
-msgstr ""
-
-#: builtin/clone.c:677
+#: builtin/clone.c:680
#, c-format
msgid "unable to update %s"
msgstr ""
-#: builtin/clone.c:726
+#: builtin/clone.c:730
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr ""
-#: builtin/clone.c:756
+#: builtin/clone.c:761
msgid "unable to checkout working tree"
msgstr ""
-#: builtin/clone.c:801
+#: builtin/clone.c:806
msgid "unable to write parameters to config file"
msgstr ""
-#: builtin/clone.c:864
+#: builtin/clone.c:869
msgid "cannot repack to clean up"
msgstr ""
-#: builtin/clone.c:866
+#: builtin/clone.c:871
msgid "cannot unlink temporary alternates file"
msgstr ""
-#: builtin/clone.c:906 builtin/receive-pack.c:1946
+#: builtin/clone.c:911 builtin/receive-pack.c:1941
msgid "Too many arguments."
msgstr ""
-#: builtin/clone.c:910
+#: builtin/clone.c:915
msgid "You must specify a repository to clone."
msgstr ""
-#: builtin/clone.c:923
+#: builtin/clone.c:928
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr ""
-#: builtin/clone.c:926
+#: builtin/clone.c:931
msgid "--bare and --separate-git-dir are incompatible."
msgstr ""
-#: builtin/clone.c:939
+#: builtin/clone.c:944
#, c-format
msgid "repository '%s' does not exist"
msgstr ""
-#: builtin/clone.c:945 builtin/fetch.c:1455
+#: builtin/clone.c:950 builtin/fetch.c:1606
#, c-format
msgid "depth %s is not a positive number"
msgstr ""
-#: builtin/clone.c:955
+#: builtin/clone.c:960
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr ""
-#: builtin/clone.c:965
+#: builtin/clone.c:970
#, c-format
msgid "working tree '%s' already exists."
msgstr ""
-#: builtin/clone.c:980 builtin/clone.c:1001 builtin/difftool.c:270
-#: builtin/worktree.c:255 builtin/worktree.c:285
+#: builtin/clone.c:985 builtin/clone.c:1006 builtin/difftool.c:271
+#: builtin/worktree.c:295 builtin/worktree.c:325
#, c-format
msgid "could not create leading directories of '%s'"
msgstr ""
-#: builtin/clone.c:985
+#: builtin/clone.c:990
#, c-format
msgid "could not create work tree dir '%s'"
msgstr ""
-#: builtin/clone.c:1005
+#: builtin/clone.c:1010
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr ""
-#: builtin/clone.c:1007
+#: builtin/clone.c:1012
#, c-format
msgid "Cloning into '%s'...\n"
msgstr ""
-#: builtin/clone.c:1031
+#: builtin/clone.c:1036
msgid ""
"clone --recursive is not compatible with both --reference and --reference-if-"
"able"
msgstr ""
-#: builtin/clone.c:1093
+#: builtin/clone.c:1097
msgid "--depth is ignored in local clones; use file:// instead."
msgstr ""
-#: builtin/clone.c:1095
+#: builtin/clone.c:1099
msgid "--shallow-since is ignored in local clones; use file:// instead."
msgstr ""
-#: builtin/clone.c:1097
+#: builtin/clone.c:1101
msgid "--shallow-exclude is ignored in local clones; use file:// instead."
msgstr ""
-#: builtin/clone.c:1099
+#: builtin/clone.c:1103
msgid "--filter is ignored in local clones; use file:// instead."
msgstr ""
-#: builtin/clone.c:1102
+#: builtin/clone.c:1106
msgid "source repository is shallow, ignoring --local"
msgstr ""
-#: builtin/clone.c:1107
+#: builtin/clone.c:1111
msgid "--local is ignored"
msgstr ""
-#: builtin/clone.c:1169 builtin/clone.c:1177
+#: builtin/clone.c:1181 builtin/clone.c:1189
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr ""
-#: builtin/clone.c:1180
+#: builtin/clone.c:1192
msgid "You appear to have cloned an empty repository."
msgstr ""
msgid "Padding space between columns"
msgstr ""
-#: builtin/column.c:52
+#: builtin/column.c:51
msgid "--command must be the first argument"
msgstr ""
-#: builtin/commit.c:37
+#: builtin/commit.c:40
msgid "git commit [<options>] [--] <pathspec>..."
msgstr ""
-#: builtin/commit.c:42
+#: builtin/commit.c:45
msgid "git status [<options>] [--] <pathspec>..."
msgstr ""
-#: builtin/commit.c:47
+#: builtin/commit.c:50
msgid ""
"You asked to amend the most recent commit, but doing so would make\n"
"it empty. You can repeat your command with --allow-empty, or you can\n"
"remove the commit entirely with \"git reset HEAD^\".\n"
msgstr ""
-#: builtin/commit.c:52
+#: builtin/commit.c:55
msgid ""
"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
"If you wish to commit it anyway, use:\n"
"\n"
msgstr ""
-#: builtin/commit.c:59
+#: builtin/commit.c:62
msgid "Otherwise, please use 'git reset'\n"
msgstr ""
-#: builtin/commit.c:62
+#: builtin/commit.c:65
msgid ""
"If you wish to skip this commit, use:\n"
"\n"
"the remaining commits.\n"
msgstr ""
-#: builtin/commit.c:284
+#: builtin/commit.c:311
msgid "failed to unpack HEAD tree object"
msgstr ""
-#: builtin/commit.c:325
+#: builtin/commit.c:352
msgid "unable to create temporary index"
msgstr ""
-#: builtin/commit.c:331
+#: builtin/commit.c:358
msgid "interactive add failed"
msgstr ""
-#: builtin/commit.c:344
+#: builtin/commit.c:371
msgid "unable to update temporary index"
msgstr ""
-#: builtin/commit.c:346
+#: builtin/commit.c:373
msgid "Failed to update main cache tree"
msgstr ""
-#: builtin/commit.c:371 builtin/commit.c:395 builtin/commit.c:444
+#: builtin/commit.c:398 builtin/commit.c:421 builtin/commit.c:467
msgid "unable to write new_index file"
msgstr ""
-#: builtin/commit.c:427
+#: builtin/commit.c:450
msgid "cannot do a partial commit during a merge."
msgstr ""
-#: builtin/commit.c:429
+#: builtin/commit.c:452
msgid "cannot do a partial commit during a cherry-pick."
msgstr ""
-#: builtin/commit.c:437
+#: builtin/commit.c:460
msgid "cannot read the index"
msgstr ""
-#: builtin/commit.c:456
+#: builtin/commit.c:479
msgid "unable to write temporary index file"
msgstr ""
-#: builtin/commit.c:553
+#: builtin/commit.c:577
#, c-format
msgid "commit '%s' lacks author header"
msgstr ""
-#: builtin/commit.c:555
+#: builtin/commit.c:579
#, c-format
msgid "commit '%s' has malformed author line"
msgstr ""
-#: builtin/commit.c:574
+#: builtin/commit.c:598
msgid "malformed --author parameter"
msgstr ""
-#: builtin/commit.c:626
+#: builtin/commit.c:650
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
msgstr ""
-#: builtin/commit.c:663 builtin/commit.c:696 builtin/commit.c:1024
+#: builtin/commit.c:687 builtin/commit.c:720 builtin/commit.c:1049
#, c-format
msgid "could not lookup commit %s"
msgstr ""
-#: builtin/commit.c:675 builtin/shortlog.c:309
+#: builtin/commit.c:699 builtin/shortlog.c:317
#, c-format
msgid "(reading log message from standard input)\n"
msgstr ""
-#: builtin/commit.c:677
+#: builtin/commit.c:701
msgid "could not read log from standard input"
msgstr ""
-#: builtin/commit.c:681
+#: builtin/commit.c:705
#, c-format
msgid "could not read log file '%s'"
msgstr ""
-#: builtin/commit.c:710 builtin/commit.c:718
+#: builtin/commit.c:734 builtin/commit.c:742
msgid "could not read SQUASH_MSG"
msgstr ""
-#: builtin/commit.c:715
+#: builtin/commit.c:739
msgid "could not read MERGE_MSG"
msgstr ""
-#: builtin/commit.c:769
+#: builtin/commit.c:793
msgid "could not write commit template"
msgstr ""
-#: builtin/commit.c:787
+#: builtin/commit.c:811
#, c-format
msgid ""
"\n"
"and try again.\n"
msgstr ""
-#: builtin/commit.c:792
+#: builtin/commit.c:816
#, c-format
msgid ""
"\n"
"and try again.\n"
msgstr ""
-#: builtin/commit.c:805
+#: builtin/commit.c:829
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
"with '%c' will be ignored, and an empty message aborts the commit.\n"
msgstr ""
-#: builtin/commit.c:813
+#: builtin/commit.c:837
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
"An empty message aborts the commit.\n"
msgstr ""
-#: builtin/commit.c:830
+#: builtin/commit.c:854
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr ""
-#: builtin/commit.c:838
+#: builtin/commit.c:862
#, c-format
msgid "%sDate: %s"
msgstr ""
-#: builtin/commit.c:845
+#: builtin/commit.c:869
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr ""
-#: builtin/commit.c:862
+#: builtin/commit.c:887
msgid "Cannot read index"
msgstr ""
-#: builtin/commit.c:928
+#: builtin/commit.c:953
msgid "Error building trees"
msgstr ""
-#: builtin/commit.c:942 builtin/tag.c:256
+#: builtin/commit.c:967 builtin/tag.c:258
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr ""
-#: builtin/commit.c:986
+#: builtin/commit.c:1011
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr ""
-#: builtin/commit.c:1000
+#: builtin/commit.c:1025
#, c-format
msgid "Invalid ignored mode '%s'"
msgstr ""
-#: builtin/commit.c:1014 builtin/commit.c:1264
+#: builtin/commit.c:1039 builtin/commit.c:1276
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr ""
-#: builtin/commit.c:1052
+#: builtin/commit.c:1077
msgid "--long and -z are incompatible"
msgstr ""
-#: builtin/commit.c:1085
+#: builtin/commit.c:1110
msgid "Using both --reset-author and --author does not make sense"
msgstr ""
-#: builtin/commit.c:1094
+#: builtin/commit.c:1119
msgid "You have nothing to amend."
msgstr ""
-#: builtin/commit.c:1097
+#: builtin/commit.c:1122
msgid "You are in the middle of a merge -- cannot amend."
msgstr ""
-#: builtin/commit.c:1099
+#: builtin/commit.c:1124
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr ""
-#: builtin/commit.c:1102
+#: builtin/commit.c:1127
msgid "Options --squash and --fixup cannot be used together"
msgstr ""
-#: builtin/commit.c:1112
+#: builtin/commit.c:1137
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr ""
-#: builtin/commit.c:1114
+#: builtin/commit.c:1139
msgid "Option -m cannot be combined with -c/-C/-F."
msgstr ""
-#: builtin/commit.c:1122
+#: builtin/commit.c:1147
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr ""
-#: builtin/commit.c:1139
+#: builtin/commit.c:1164
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr ""
-#: builtin/commit.c:1141
+#: builtin/commit.c:1166
msgid "No paths with --include/--only does not make sense."
msgstr ""
-#: builtin/commit.c:1155 builtin/tag.c:542
+#: builtin/commit.c:1180 builtin/tag.c:546
#, c-format
msgid "Invalid cleanup mode %s"
msgstr ""
-#: builtin/commit.c:1160
+#: builtin/commit.c:1185
msgid "Paths with -a does not make sense."
msgstr ""
-#: builtin/commit.c:1278 builtin/commit.c:1443
+#: builtin/commit.c:1311 builtin/commit.c:1495
msgid "show status concisely"
msgstr ""
-#: builtin/commit.c:1280 builtin/commit.c:1445
+#: builtin/commit.c:1313 builtin/commit.c:1497
msgid "show branch information"
msgstr ""
-#: builtin/commit.c:1282
+#: builtin/commit.c:1315
msgid "show stash information"
msgstr ""
-#: builtin/commit.c:1284 builtin/commit.c:1447
+#: builtin/commit.c:1317 builtin/commit.c:1499
msgid "compute full ahead/behind values"
msgstr ""
-#: builtin/commit.c:1286
+#: builtin/commit.c:1319
msgid "version"
msgstr ""
-#: builtin/commit.c:1286 builtin/commit.c:1449 builtin/push.c:542
-#: builtin/worktree.c:541
+#: builtin/commit.c:1319 builtin/commit.c:1501 builtin/push.c:558
+#: builtin/worktree.c:639
msgid "machine-readable output"
msgstr ""
-#: builtin/commit.c:1289 builtin/commit.c:1451
+#: builtin/commit.c:1322 builtin/commit.c:1503
msgid "show status in long format (default)"
msgstr ""
-#: builtin/commit.c:1292 builtin/commit.c:1454
+#: builtin/commit.c:1325 builtin/commit.c:1506
msgid "terminate entries with NUL"
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
+#: builtin/commit.c:1327 builtin/commit.c:1331 builtin/commit.c:1509
+#: builtin/fast-export.c:1007 builtin/fast-export.c:1010 builtin/rebase.c:910
+#: builtin/tag.c:400
msgid "mode"
msgstr ""
-#: builtin/commit.c:1295 builtin/commit.c:1457
+#: builtin/commit.c:1328 builtin/commit.c:1509
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr ""
-#: builtin/commit.c:1299
+#: builtin/commit.c:1332
msgid ""
"show ignored files, optional modes: traditional, matching, no. (Default: "
"traditional)"
msgstr ""
-#: builtin/commit.c:1301 parse-options.h:167
+#: builtin/commit.c:1334 parse-options.h:164
msgid "when"
msgstr ""
-#: builtin/commit.c:1302
+#: builtin/commit.c:1335
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
msgstr ""
-#: builtin/commit.c:1304
+#: builtin/commit.c:1337
msgid "list untracked files in columns"
msgstr ""
-#: builtin/commit.c:1323
+#: builtin/commit.c:1338
+msgid "do not detect renames"
+msgstr ""
+
+#: builtin/commit.c:1340
+msgid "detect renames, optionally set similarity index"
+msgstr ""
+
+#: builtin/commit.c:1360
msgid "Unsupported combination of ignored and untracked-files arguments"
msgstr ""
-#: builtin/commit.c:1413
+#: builtin/commit.c:1465
msgid "suppress summary after successful commit"
msgstr ""
-#: builtin/commit.c:1414
+#: builtin/commit.c:1466
msgid "show diff in commit message template"
msgstr ""
-#: builtin/commit.c:1416
+#: builtin/commit.c:1468
msgid "Commit message options"
msgstr ""
-#: builtin/commit.c:1417 builtin/tag.c:393
+#: builtin/commit.c:1469 builtin/merge.c:263 builtin/tag.c:397
msgid "read message from file"
msgstr ""
-#: builtin/commit.c:1418
+#: builtin/commit.c:1470
msgid "author"
msgstr ""
-#: builtin/commit.c:1418
+#: builtin/commit.c:1470
msgid "override author for commit"
msgstr ""
-#: builtin/commit.c:1419 builtin/gc.c:359
+#: builtin/commit.c:1471 builtin/gc.c:518
msgid "date"
msgstr ""
-#: builtin/commit.c:1419
+#: builtin/commit.c:1471
msgid "override date for commit"
msgstr ""
-#: builtin/commit.c:1420 builtin/merge.c:226 builtin/notes.c:402
-#: builtin/notes.c:565 builtin/tag.c:391
+#: builtin/commit.c:1472 builtin/merge.c:259 builtin/notes.c:409
+#: builtin/notes.c:572 builtin/tag.c:395
msgid "message"
msgstr ""
-#: builtin/commit.c:1420
+#: builtin/commit.c:1472
msgid "commit message"
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
+#: builtin/commit.c:1473 builtin/commit.c:1474 builtin/commit.c:1475
+#: builtin/commit.c:1476 ref-filter.h:92 parse-options.h:280
msgid "commit"
msgstr ""
-#: builtin/commit.c:1421
+#: builtin/commit.c:1473
msgid "reuse and edit message from specified commit"
msgstr ""
-#: builtin/commit.c:1422
+#: builtin/commit.c:1474
msgid "reuse message from specified commit"
msgstr ""
-#: builtin/commit.c:1423
+#: builtin/commit.c:1475
msgid "use autosquash formatted message to fixup specified commit"
msgstr ""
-#: builtin/commit.c:1424
+#: builtin/commit.c:1476
msgid "use autosquash formatted message to squash specified commit"
msgstr ""
-#: builtin/commit.c:1425
+#: builtin/commit.c:1477
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr ""
-#: builtin/commit.c:1426 builtin/log.c:1446 builtin/merge.c:240
-#: builtin/pull.c:149 builtin/revert.c:105
+#: builtin/commit.c:1478 builtin/log.c:1520 builtin/merge.c:276
+#: builtin/pull.c:155 builtin/revert.c:106
msgid "add Signed-off-by:"
msgstr ""
-#: builtin/commit.c:1427
+#: builtin/commit.c:1479
msgid "use specified template file"
msgstr ""
-#: builtin/commit.c:1428
+#: builtin/commit.c:1480
msgid "force edit of commit"
msgstr ""
-#: builtin/commit.c:1429
+#: builtin/commit.c:1481
msgid "default"
msgstr ""
-#: builtin/commit.c:1429 builtin/tag.c:397
+#: builtin/commit.c:1481 builtin/tag.c:401
msgid "how to strip spaces and #comments from message"
msgstr ""
-#: builtin/commit.c:1430
+#: builtin/commit.c:1482
msgid "include status in commit message template"
msgstr ""
-#: builtin/commit.c:1432 builtin/merge.c:238 builtin/pull.c:179
-#: builtin/revert.c:113
+#: builtin/commit.c:1484 builtin/merge.c:274 builtin/pull.c:185
+#: builtin/revert.c:114
msgid "GPG sign commit"
msgstr ""
-#: builtin/commit.c:1435
+#: builtin/commit.c:1487
msgid "Commit contents options"
msgstr ""
-#: builtin/commit.c:1436
+#: builtin/commit.c:1488
msgid "commit all changed files"
msgstr ""
-#: builtin/commit.c:1437
+#: builtin/commit.c:1489
msgid "add specified files to index for commit"
msgstr ""
-#: builtin/commit.c:1438
+#: builtin/commit.c:1490
msgid "interactively add files"
msgstr ""
-#: builtin/commit.c:1439
+#: builtin/commit.c:1491
msgid "interactively add changes"
msgstr ""
-#: builtin/commit.c:1440
+#: builtin/commit.c:1492
msgid "commit only specified files"
msgstr ""
-#: builtin/commit.c:1441
+#: builtin/commit.c:1493
msgid "bypass pre-commit and commit-msg hooks"
msgstr ""
-#: builtin/commit.c:1442
+#: builtin/commit.c:1494
msgid "show what would be committed"
msgstr ""
-#: builtin/commit.c:1455
+#: builtin/commit.c:1507
msgid "amend previous commit"
msgstr ""
-#: builtin/commit.c:1456
+#: builtin/commit.c:1508
msgid "bypass post-rewrite hook"
msgstr ""
-#: builtin/commit.c:1461
+#: builtin/commit.c:1513
msgid "ok to record an empty change"
msgstr ""
-#: builtin/commit.c:1463
+#: builtin/commit.c:1515
msgid "ok to record a change with an empty message"
msgstr ""
-#: builtin/commit.c:1536
+#: builtin/commit.c:1588
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr ""
-#: builtin/commit.c:1543
+#: builtin/commit.c:1595
msgid "could not read MERGE_MODE"
msgstr ""
-#: builtin/commit.c:1562
+#: builtin/commit.c:1614
#, c-format
msgid "could not read commit message: %s"
msgstr ""
-#: builtin/commit.c:1573
+#: builtin/commit.c:1625
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr ""
-#: builtin/commit.c:1578
+#: builtin/commit.c:1630
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr ""
-#: builtin/commit.c:1613
+#: builtin/commit.c:1665
msgid ""
-"Repository has been updated, but unable to write\n"
+"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/config.c:10
+#: builtin/commit-graph.c:10
+msgid "git commit-graph [--object-dir <objdir>]"
+msgstr ""
+
+#: builtin/commit-graph.c:11 builtin/commit-graph.c:23
+msgid "git commit-graph read [--object-dir <objdir>]"
+msgstr ""
+
+#: builtin/commit-graph.c:12 builtin/commit-graph.c:18
+msgid "git commit-graph verify [--object-dir <objdir>]"
+msgstr ""
+
+#: builtin/commit-graph.c:13 builtin/commit-graph.c:28
+msgid ""
+"git commit-graph write [--object-dir <objdir>] [--append] [--reachable|--"
+"stdin-packs|--stdin-commits]"
+msgstr ""
+
+#: builtin/commit-graph.c:48 builtin/commit-graph.c:78
+#: builtin/commit-graph.c:132 builtin/commit-graph.c:190 builtin/fetch.c:153
+#: builtin/log.c:1540
+msgid "dir"
+msgstr ""
+
+#: 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/commit-graph.c:135
+msgid "start walk at all refs"
+msgstr ""
+
+#: builtin/commit-graph.c:137
+msgid "scan pack-indexes listed by stdin for commits"
+msgstr ""
+
+#: builtin/commit-graph.c:139
+msgid "start walk at commits listed by stdin"
+msgstr ""
+
+#: builtin/commit-graph.c:141
+msgid "include all commits already in the commit-graph file"
+msgstr ""
+
+#: builtin/commit-graph.c:150
+msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
+msgstr ""
+
+#: builtin/config.c:11
msgid "git config [<options>]"
msgstr ""
-#: builtin/config.c:58
+#: builtin/config.c:103
+#, c-format
+msgid "unrecognized --type argument, %s"
+msgstr ""
+
+#: builtin/config.c:115
+msgid "only one type at a time"
+msgstr ""
+
+#: builtin/config.c:124
msgid "Config file location"
msgstr ""
-#: builtin/config.c:59
+#: builtin/config.c:125
msgid "use global config file"
msgstr ""
-#: builtin/config.c:60
+#: builtin/config.c:126
msgid "use system config file"
msgstr ""
-#: builtin/config.c:61
+#: builtin/config.c:127
msgid "use repository config file"
msgstr ""
-#: builtin/config.c:62
+#: builtin/config.c:128
+msgid "use per-worktree config file"
+msgstr ""
+
+#: builtin/config.c:129
msgid "use given config file"
msgstr ""
-#: builtin/config.c:63
+#: builtin/config.c:130
msgid "blob-id"
msgstr ""
-#: builtin/config.c:63
+#: builtin/config.c:130
msgid "read config from given blob object"
msgstr ""
-#: builtin/config.c:64
+#: builtin/config.c:131
msgid "Action"
msgstr ""
-#: builtin/config.c:65
+#: builtin/config.c:132
msgid "get value: name [value-regex]"
msgstr ""
-#: builtin/config.c:66
+#: builtin/config.c:133
msgid "get all values: key [value-regex]"
msgstr ""
-#: builtin/config.c:67
+#: builtin/config.c:134
msgid "get values for regexp: name-regex [value-regex]"
msgstr ""
-#: builtin/config.c:68
+#: builtin/config.c:135
msgid "get value specific for the URL: section[.var] URL"
msgstr ""
-#: builtin/config.c:69
+#: builtin/config.c:136
msgid "replace all matching variables: name value [value_regex]"
msgstr ""
-#: builtin/config.c:70
+#: builtin/config.c:137
msgid "add a new variable: name value"
msgstr ""
-#: builtin/config.c:71
+#: builtin/config.c:138
msgid "remove a variable: name [value-regex]"
msgstr ""
-#: builtin/config.c:72
+#: builtin/config.c:139
msgid "remove all matches: name [value-regex]"
msgstr ""
-#: builtin/config.c:73
+#: builtin/config.c:140
msgid "rename section: old-name new-name"
msgstr ""
-#: builtin/config.c:74
+#: builtin/config.c:141
msgid "remove a section: name"
msgstr ""
-#: builtin/config.c:75
+#: builtin/config.c:142
msgid "list all"
msgstr ""
-#: builtin/config.c:76
+#: builtin/config.c:143
msgid "open an editor"
msgstr ""
-#: builtin/config.c:77
+#: builtin/config.c:144
msgid "find the color configured: slot [default]"
msgstr ""
-#: builtin/config.c:78
+#: builtin/config.c:145
msgid "find the color setting: slot [stdout-is-tty]"
msgstr ""
-#: builtin/config.c:79
+#: builtin/config.c:146
msgid "Type"
msgstr ""
-#: builtin/config.c:80
+#: builtin/config.c:147
+msgid "value is given this type"
+msgstr ""
+
+#: builtin/config.c:148
msgid "value is \"true\" or \"false\""
msgstr ""
-#: builtin/config.c:81
+#: builtin/config.c:149
msgid "value is decimal number"
msgstr ""
-#: builtin/config.c:82
+#: builtin/config.c:150
msgid "value is --bool or --int"
msgstr ""
-#: builtin/config.c:83
+#: builtin/config.c:151
msgid "value is a path (file or directory name)"
msgstr ""
-#: builtin/config.c:84
+#: builtin/config.c:152
msgid "value is an expiry date"
msgstr ""
-#: builtin/config.c:85
+#: builtin/config.c:153
msgid "Other"
msgstr ""
-#: builtin/config.c:86
+#: builtin/config.c:154
msgid "terminate values with NUL byte"
msgstr ""
-#: builtin/config.c:87
+#: builtin/config.c:155
msgid "show variable names only"
msgstr ""
-#: builtin/config.c:88
+#: builtin/config.c:156
msgid "respect include directives on lookup"
msgstr ""
-#: builtin/config.c:89
+#: builtin/config.c:157
msgid "show origin of config (file, standard input, blob, command line)"
msgstr ""
-#: builtin/config.c:335
+#: builtin/config.c:158
+msgid "value"
+msgstr ""
+
+#: builtin/config.c:158
+msgid "with --get, use default value when missing entry"
+msgstr ""
+
+#: builtin/config.c:171
+#, c-format
+msgid "wrong number of arguments, should be %d"
+msgstr ""
+
+#: builtin/config.c:173
+#, c-format
+msgid "wrong number of arguments, should be from %d to %d"
+msgstr ""
+
+#: builtin/config.c:307
+#, c-format
+msgid "invalid key pattern: %s"
+msgstr ""
+
+#: builtin/config.c:343
+#, c-format
+msgid "failed to format default config value: %s"
+msgstr ""
+
+#: builtin/config.c:400
+#, c-format
+msgid "cannot parse color '%s'"
+msgstr ""
+
+#: builtin/config.c:442
msgid "unable to parse default color value"
msgstr ""
-#: builtin/config.c:479
+#: builtin/config.c:495 builtin/config.c:741
+msgid "not in a git directory"
+msgstr ""
+
+#: builtin/config.c:498
+msgid "writing to stdin is not supported"
+msgstr ""
+
+#: builtin/config.c:501
+msgid "writing config blobs is not supported"
+msgstr ""
+
+#: builtin/config.c:586
#, c-format
msgid ""
"# This is Git's per-user configuration file.\n"
"#\temail = %s\n"
msgstr ""
-#: builtin/config.c:507
+#: builtin/config.c:610
+msgid "only one config file at a time"
+msgstr ""
+
+#: builtin/config.c:615
msgid "--local can only be used inside a git repository"
msgstr ""
-#: builtin/config.c:632
+#: builtin/config.c:618
+msgid "--blob can only be used inside a git repository"
+msgstr ""
+
+#: builtin/config.c:637
+msgid "$HOME not set"
+msgstr ""
+
+#: builtin/config.c:657
+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/config.c:687
+msgid "--get-color and variable type are incoherent"
+msgstr ""
+
+#: builtin/config.c:692
+msgid "only one action at a time"
+msgstr ""
+
+#: builtin/config.c:705
+msgid "--name-only is only applicable to --list or --get-regexp"
+msgstr ""
+
+#: builtin/config.c:711
+msgid ""
+"--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
+"list"
+msgstr ""
+
+#: builtin/config.c:717
+msgid "--default is only applicable to --get"
+msgstr ""
+
+#: builtin/config.c:730
+#, c-format
+msgid "unable to read config file '%s'"
+msgstr ""
+
+#: builtin/config.c:733
+msgid "error processing config file(s)"
+msgstr ""
+
+#: builtin/config.c:743
+msgid "editing stdin is not supported"
+msgstr ""
+
+#: builtin/config.c:745
+msgid "editing blobs is not supported"
+msgstr ""
+
+#: builtin/config.c:759
#, c-format
msgid "cannot create configuration file %s"
msgstr ""
-#: builtin/config.c:645
+#: builtin/config.c:772
#, c-format
msgid ""
"cannot overwrite multiple values with a single value\n"
" Use a regexp, --add or --replace-all to change %s."
msgstr ""
-#: builtin/count-objects.c:88
+#: builtin/config.c:846 builtin/config.c:857
+#, c-format
+msgid "no such section: %s"
+msgstr ""
+
+#: builtin/count-objects.c:90
msgid "git count-objects [-v] [-H | --human-readable]"
msgstr ""
-#: builtin/count-objects.c:98
+#: builtin/count-objects.c:100
msgid "print sizes in human readable format"
msgstr ""
-#: builtin/describe.c:22
+#: builtin/describe.c:26
msgid "git describe [<options>] [<commit-ish>...]"
msgstr ""
-#: builtin/describe.c:23
+#: builtin/describe.c:27
msgid "git describe [<options>] --dirty"
msgstr ""
-#: builtin/describe.c:57
+#: builtin/describe.c:62
msgid "head"
msgstr ""
-#: builtin/describe.c:57
+#: builtin/describe.c:62
msgid "lightweight"
msgstr ""
-#: builtin/describe.c:57
+#: builtin/describe.c:62
msgid "annotated"
msgstr ""
-#: builtin/describe.c:267
+#: builtin/describe.c:272
#, c-format
msgid "annotated tag %s not available"
msgstr ""
-#: builtin/describe.c:271
+#: builtin/describe.c:276
#, c-format
msgid "annotated tag %s has no embedded name"
msgstr ""
-#: builtin/describe.c:273
+#: builtin/describe.c:278
#, c-format
msgid "tag '%s' is really '%s' here"
msgstr ""
-#: builtin/describe.c:317
+#: builtin/describe.c:322
#, c-format
msgid "no tag exactly matches '%s'"
msgstr ""
-#: builtin/describe.c:319
+#: builtin/describe.c:324
#, c-format
msgid "No exact match on refs or tags, searching to describe\n"
msgstr ""
-#: builtin/describe.c:366
+#: builtin/describe.c:378
#, c-format
msgid "finished search at %s\n"
msgstr ""
-#: builtin/describe.c:392
+#: builtin/describe.c:404
#, c-format
msgid ""
"No annotated tags can describe '%s'.\n"
"However, there were unannotated tags: try --tags."
msgstr ""
-#: builtin/describe.c:396
+#: builtin/describe.c:408
#, c-format
msgid ""
"No tags can describe '%s'.\n"
"Try --always, or create some tags."
msgstr ""
-#: builtin/describe.c:426
+#: builtin/describe.c:438
#, c-format
msgid "traversed %lu commits\n"
msgstr ""
-#: builtin/describe.c:429
+#: builtin/describe.c:441
#, c-format
msgid ""
"more than %i tags found; listed %i most recent\n"
"gave up search at %s\n"
msgstr ""
-#: builtin/describe.c:497
+#: builtin/describe.c:509
#, c-format
msgid "describe %s\n"
msgstr ""
-#: builtin/describe.c:500 builtin/log.c:502
+#: builtin/describe.c:512 builtin/log.c:513
#, c-format
msgid "Not a valid object name %s"
msgstr ""
-#: builtin/describe.c:508
+#: builtin/describe.c:520
#, c-format
msgid "%s is neither a commit nor blob"
msgstr ""
-#: builtin/describe.c:522
+#: builtin/describe.c:534
msgid "find the tag that comes after the commit"
msgstr ""
-#: builtin/describe.c:523
+#: builtin/describe.c:535
msgid "debug search strategy on stderr"
msgstr ""
-#: builtin/describe.c:524
+#: builtin/describe.c:536
msgid "use any ref"
msgstr ""
-#: builtin/describe.c:525
+#: builtin/describe.c:537
msgid "use any tag, even unannotated"
msgstr ""
-#: builtin/describe.c:526
+#: builtin/describe.c:538
msgid "always use long format"
msgstr ""
-#: builtin/describe.c:527
+#: builtin/describe.c:539
msgid "only follow first parent"
msgstr ""
-#: builtin/describe.c:530
+#: builtin/describe.c:542
msgid "only output exact matches"
msgstr ""
-#: builtin/describe.c:532
+#: builtin/describe.c:544
msgid "consider <n> most recent tags (default: 10)"
msgstr ""
-#: builtin/describe.c:534
+#: builtin/describe.c:546
msgid "only consider tags matching <pattern>"
msgstr ""
-#: builtin/describe.c:536
+#: builtin/describe.c:548
msgid "do not consider tags matching <pattern>"
msgstr ""
-#: builtin/describe.c:538 builtin/name-rev.c:406
+#: builtin/describe.c:550 builtin/name-rev.c:424
msgid "show abbreviated commit object as fallback"
msgstr ""
-#: builtin/describe.c:539 builtin/describe.c:542
+#: builtin/describe.c:551 builtin/describe.c:554
msgid "mark"
msgstr ""
-#: builtin/describe.c:540
+#: builtin/describe.c:552
msgid "append <mark> on dirty working tree (default: \"-dirty\")"
msgstr ""
-#: builtin/describe.c:543
+#: builtin/describe.c:555
msgid "append <mark> on broken working tree (default: \"-broken\")"
msgstr ""
-#: builtin/describe.c:561
+#: builtin/describe.c:573
msgid "--long is incompatible with --abbrev=0"
msgstr ""
-#: builtin/describe.c:590
+#: builtin/describe.c:602
msgid "No names found, cannot describe anything."
msgstr ""
-#: builtin/describe.c:640
+#: builtin/describe.c:652
msgid "--dirty is incompatible with commit-ishes"
msgstr ""
-#: builtin/describe.c:642
+#: builtin/describe.c:654
msgid "--broken is incompatible with commit-ishes"
msgstr ""
msgid "invalid option: %s"
msgstr ""
-#: builtin/diff.c:356
+#: builtin/diff.c:363
msgid "Not a git repository"
msgstr ""
-#: builtin/diff.c:399
+#: builtin/diff.c:407
#, c-format
msgid "invalid object '%s' given."
msgstr ""
-#: builtin/diff.c:408
+#: builtin/diff.c:416
#, c-format
msgid "more than two blobs given: '%s'"
msgstr ""
-#: builtin/diff.c:413
+#: builtin/diff.c:421
#, c-format
msgid "unhandled object '%s' given."
msgstr ""
-#: builtin/difftool.c:29
+#: builtin/difftool.c:30
msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
msgstr ""
-#: builtin/difftool.c:259
+#: builtin/difftool.c:260
#, c-format
msgid "failed: %d"
msgstr ""
-#: builtin/difftool.c:301
+#: builtin/difftool.c:302
#, c-format
msgid "could not read symlink %s"
msgstr ""
-#: builtin/difftool.c:303
+#: builtin/difftool.c:304
#, c-format
msgid "could not read symlink file %s"
msgstr ""
-#: builtin/difftool.c:311
+#: builtin/difftool.c:312
#, c-format
msgid "could not read object %s for symlink %s"
msgstr ""
-#: builtin/difftool.c:412
+#: builtin/difftool.c:413
msgid ""
"combined diff formats('-c' and '--cc') are not supported in\n"
"directory diff mode('-d' and '--dir-diff')."
msgstr ""
-#: builtin/difftool.c:632
+#: builtin/difftool.c:633
#, c-format
msgid "both files modified: '%s' and '%s'."
msgstr ""
-#: builtin/difftool.c:634
+#: builtin/difftool.c:635
msgid "working tree file has been left."
msgstr ""
-#: builtin/difftool.c:645
+#: builtin/difftool.c:646
#, c-format
msgid "temporary files exist in '%s'."
msgstr ""
-#: builtin/difftool.c:646
+#: builtin/difftool.c:647
msgid "you may want to cleanup or recover these."
msgstr ""
-#: builtin/difftool.c:695
+#: builtin/difftool.c:696
msgid "use `diff.guitool` instead of `diff.tool`"
msgstr ""
-#: builtin/difftool.c:697
+#: builtin/difftool.c:698
msgid "perform a full-directory diff"
msgstr ""
-#: builtin/difftool.c:699
+#: builtin/difftool.c:700
msgid "do not prompt before launching a diff tool"
msgstr ""
msgstr ""
#: builtin/difftool.c:706
-msgid "<tool>"
+msgid "tool"
msgstr ""
#: builtin/difftool.c:707
"code"
msgstr ""
-#: builtin/difftool.c:714
-msgid "<command>"
-msgstr ""
-
#: builtin/difftool.c:715
msgid "specify a custom command for viewing diffs"
msgstr ""
msgid "no <cmd> given for --extcmd=<cmd>"
msgstr ""
-#: builtin/fast-export.c:26
+#: builtin/fast-export.c:29
msgid "git fast-export [rev-list-opts]"
msgstr ""
-#: builtin/fast-export.c:998
+#: builtin/fast-export.c:1006
msgid "show progress after <n> objects"
msgstr ""
-#: builtin/fast-export.c:1000
+#: builtin/fast-export.c:1008
msgid "select handling of signed tags"
msgstr ""
-#: builtin/fast-export.c:1003
+#: builtin/fast-export.c:1011
msgid "select handling of tags that tag filtered objects"
msgstr ""
-#: builtin/fast-export.c:1006
+#: builtin/fast-export.c:1014
msgid "Dump marks to this file"
msgstr ""
-#: builtin/fast-export.c:1008
+#: builtin/fast-export.c:1016
msgid "Import marks from this file"
msgstr ""
-#: builtin/fast-export.c:1010
+#: builtin/fast-export.c:1018
msgid "Fake a tagger when tags lack one"
msgstr ""
-#: builtin/fast-export.c:1012
+#: builtin/fast-export.c:1020
msgid "Output full tree for each commit"
msgstr ""
-#: builtin/fast-export.c:1014
+#: builtin/fast-export.c:1022
msgid "Use the done feature to terminate the stream"
msgstr ""
-#: builtin/fast-export.c:1015
+#: builtin/fast-export.c:1023
msgid "Skip output of blob data"
msgstr ""
-#: builtin/fast-export.c:1016
+#: builtin/fast-export.c:1024 builtin/log.c:1588
msgid "refspec"
msgstr ""
-#: builtin/fast-export.c:1017
+#: builtin/fast-export.c:1025
msgid "Apply refspec to exported refs"
msgstr ""
-#: builtin/fast-export.c:1018
+#: builtin/fast-export.c:1026
msgid "anonymize output"
msgstr ""
-#: builtin/fetch.c:25
+#: builtin/fetch.c:28
msgid "git fetch [<options>] [<repository> [<refspec>...]]"
msgstr ""
-#: builtin/fetch.c:26
+#: builtin/fetch.c:29
msgid "git fetch [<options>] <group>"
msgstr ""
-#: builtin/fetch.c:27
+#: builtin/fetch.c:30
msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
msgstr ""
-#: builtin/fetch.c:28
+#: builtin/fetch.c:31
msgid "git fetch --all [<options>]"
msgstr ""
-#: builtin/fetch.c:124 builtin/pull.c:188
+#: builtin/fetch.c:115 builtin/pull.c:194
msgid "fetch from all remotes"
msgstr ""
-#: builtin/fetch.c:126 builtin/pull.c:191
+#: builtin/fetch.c:117 builtin/pull.c:197
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr ""
-#: builtin/fetch.c:128 builtin/pull.c:194
+#: builtin/fetch.c:119 builtin/pull.c:200
msgid "path to upload pack on remote end"
msgstr ""
-#: builtin/fetch.c:129 builtin/pull.c:196
-msgid "force overwrite of local branch"
+#: builtin/fetch.c:120
+msgid "force overwrite of local reference"
msgstr ""
-#: builtin/fetch.c:131
+#: builtin/fetch.c:122
msgid "fetch from multiple remotes"
msgstr ""
-#: builtin/fetch.c:133 builtin/pull.c:198
+#: builtin/fetch.c:124 builtin/pull.c:204
msgid "fetch all tags and associated objects"
msgstr ""
-#: builtin/fetch.c:135
+#: builtin/fetch.c:126
msgid "do not fetch all tags (--no-tags)"
msgstr ""
-#: builtin/fetch.c:137
+#: builtin/fetch.c:128
msgid "number of submodules fetched in parallel"
msgstr ""
-#: builtin/fetch.c:139 builtin/pull.c:201
+#: builtin/fetch.c:130 builtin/pull.c:207
msgid "prune remote-tracking branches no longer on remote"
msgstr ""
-#: builtin/fetch.c:141
+#: builtin/fetch.c:132
msgid "prune local tags no longer on remote and clobber changed tags"
msgstr ""
-#: builtin/fetch.c:142 builtin/fetch.c:165 builtin/pull.c:126
+#: builtin/fetch.c:133 builtin/fetch.c:156 builtin/pull.c:132
msgid "on-demand"
msgstr ""
-#: builtin/fetch.c:143
+#: builtin/fetch.c:134
msgid "control recursive fetching of submodules"
msgstr ""
-#: builtin/fetch.c:147 builtin/pull.c:209
+#: builtin/fetch.c:138 builtin/pull.c:215
msgid "keep downloaded pack"
msgstr ""
-#: builtin/fetch.c:149
+#: builtin/fetch.c:140
msgid "allow updating of HEAD ref"
msgstr ""
-#: builtin/fetch.c:152 builtin/fetch.c:158 builtin/pull.c:212
+#: builtin/fetch.c:143 builtin/fetch.c:149 builtin/pull.c:218
msgid "deepen history of shallow clone"
msgstr ""
-#: builtin/fetch.c:154
+#: builtin/fetch.c:145
msgid "deepen history of shallow repository based on time"
msgstr ""
-#: builtin/fetch.c:160 builtin/pull.c:215
+#: builtin/fetch.c:151 builtin/pull.c:221
msgid "convert to a complete repository"
msgstr ""
-#: builtin/fetch.c:162 builtin/log.c:1466
-msgid "dir"
-msgstr ""
-
-#: builtin/fetch.c:163
+#: builtin/fetch.c:154
msgid "prepend this to submodule path output"
msgstr ""
-#: builtin/fetch.c:166
+#: builtin/fetch.c:157
msgid ""
"default for recursive fetching of submodules (lower priority than config "
"files)"
msgstr ""
-#: builtin/fetch.c:170 builtin/pull.c:218
+#: builtin/fetch.c:161 builtin/pull.c:224
msgid "accept refs that update .git/shallow"
msgstr ""
-#: builtin/fetch.c:171 builtin/pull.c:220
+#: builtin/fetch.c:162 builtin/pull.c:226
msgid "refmap"
msgstr ""
-#: builtin/fetch.c:172 builtin/pull.c:221
+#: builtin/fetch.c:163 builtin/pull.c:227
msgid "specify fetch refmap"
msgstr ""
-#: builtin/fetch.c:431
+#: builtin/fetch.c:164 builtin/ls-remote.c:77 builtin/push.c:582
+#: builtin/send-pack.c:172
+msgid "server-specific"
+msgstr ""
+
+#: builtin/fetch.c:164 builtin/ls-remote.c:77 builtin/push.c:582
+#: builtin/send-pack.c:173
+msgid "option to transmit"
+msgstr ""
+
+#: builtin/fetch.c:170
+msgid "report that we have only objects reachable from this object"
+msgstr ""
+
+#: builtin/fetch.c:470
msgid "Couldn't find remote ref HEAD"
msgstr ""
-#: builtin/fetch.c:549
+#: builtin/fetch.c:609
#, c-format
msgid "configuration fetch.output contains invalid value %s"
msgstr ""
-#: builtin/fetch.c:642
+#: builtin/fetch.c:702
#, c-format
msgid "object %s not found"
msgstr ""
-#: builtin/fetch.c:646
+#: builtin/fetch.c:706
msgid "[up to date]"
msgstr ""
-#: builtin/fetch.c:659 builtin/fetch.c:739
+#: builtin/fetch.c:719 builtin/fetch.c:735 builtin/fetch.c:807
msgid "[rejected]"
msgstr ""
-#: builtin/fetch.c:660
+#: builtin/fetch.c:720
msgid "can't fetch in current branch"
msgstr ""
-#: builtin/fetch.c:669
+#: builtin/fetch.c:730
msgid "[tag update]"
msgstr ""
-#: builtin/fetch.c:670 builtin/fetch.c:703 builtin/fetch.c:719
-#: builtin/fetch.c:734
+#: builtin/fetch.c:731 builtin/fetch.c:771 builtin/fetch.c:787
+#: builtin/fetch.c:802
msgid "unable to update local ref"
msgstr ""
-#: builtin/fetch.c:689
+#: builtin/fetch.c:735
+msgid "would clobber existing tag"
+msgstr ""
+
+#: builtin/fetch.c:757
msgid "[new tag]"
msgstr ""
-#: builtin/fetch.c:692
+#: builtin/fetch.c:760
msgid "[new branch]"
msgstr ""
-#: builtin/fetch.c:695
+#: builtin/fetch.c:763
msgid "[new ref]"
msgstr ""
-#: builtin/fetch.c:734
+#: builtin/fetch.c:802
msgid "forced update"
msgstr ""
-#: builtin/fetch.c:739
+#: builtin/fetch.c:807
msgid "non-fast-forward"
msgstr ""
-#: builtin/fetch.c:784
+#: builtin/fetch.c:853
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr ""
-#: builtin/fetch.c:804
+#: builtin/fetch.c:874
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr ""
-#: builtin/fetch.c:892 builtin/fetch.c:988
+#: builtin/fetch.c:963 builtin/fetch.c:1085
#, c-format
msgid "From %.*s\n"
msgstr ""
-#: builtin/fetch.c:903
+#: builtin/fetch.c:974
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
" 'git remote prune %s' to remove any old, conflicting branches"
msgstr ""
-#: builtin/fetch.c:958
+#: builtin/fetch.c:1055
#, c-format
msgid " (%s will become dangling)"
msgstr ""
-#: builtin/fetch.c:959
+#: builtin/fetch.c:1056
#, c-format
msgid " (%s has become dangling)"
msgstr ""
-#: builtin/fetch.c:991
+#: builtin/fetch.c:1088
msgid "[deleted]"
msgstr ""
-#: builtin/fetch.c:992 builtin/remote.c:1024
+#: builtin/fetch.c:1089 builtin/remote.c:1036
msgid "(none)"
msgstr ""
-#: builtin/fetch.c:1015
+#: builtin/fetch.c:1112
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr ""
-#: builtin/fetch.c:1034
+#: builtin/fetch.c:1131
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr ""
-#: builtin/fetch.c:1037
+#: builtin/fetch.c:1134
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr ""
-#: builtin/fetch.c:1277
+#: builtin/fetch.c:1433
#, c-format
msgid "Fetching %s\n"
msgstr ""
-#: builtin/fetch.c:1279 builtin/remote.c:97
+#: builtin/fetch.c:1435 builtin/remote.c:100
#, c-format
msgid "Could not fetch %s"
msgstr ""
-#: builtin/fetch.c:1325 builtin/fetch.c:1498
+#: builtin/fetch.c:1481 builtin/fetch.c:1649
msgid ""
"--filter can only be used with the remote configured in core.partialClone"
msgstr ""
-#: builtin/fetch.c:1350
+#: builtin/fetch.c:1504
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
msgstr ""
-#: builtin/fetch.c:1394
+#: builtin/fetch.c:1541
msgid "You need to specify a tag name."
msgstr ""
-#: builtin/fetch.c:1439
+#: builtin/fetch.c:1590
msgid "Negative depth in --deepen is not supported"
msgstr ""
-#: builtin/fetch.c:1441
+#: builtin/fetch.c:1592
msgid "--deepen and --depth are mutually exclusive"
msgstr ""
-#: builtin/fetch.c:1446
+#: builtin/fetch.c:1597
msgid "--depth and --unshallow cannot be used together"
msgstr ""
-#: builtin/fetch.c:1448
+#: builtin/fetch.c:1599
msgid "--unshallow on a complete repository does not make sense"
msgstr ""
-#: builtin/fetch.c:1464
+#: builtin/fetch.c:1615
msgid "fetch --all does not take a repository argument"
msgstr ""
-#: builtin/fetch.c:1466
+#: builtin/fetch.c:1617
msgid "fetch --all does not make sense with refspecs"
msgstr ""
-#: builtin/fetch.c:1475
+#: builtin/fetch.c:1626
#, c-format
msgid "No such remote or remote group: %s"
msgstr ""
-#: builtin/fetch.c:1482
+#: builtin/fetch.c:1633
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr ""
-#: builtin/fmt-merge-msg.c:15
+#: builtin/fmt-merge-msg.c:18
msgid ""
"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
msgstr ""
-#: builtin/fmt-merge-msg.c:666
+#: builtin/fmt-merge-msg.c:672
msgid "populate log with at most <n> entries from shortlog"
msgstr ""
-#: builtin/fmt-merge-msg.c:669
+#: builtin/fmt-merge-msg.c:675
msgid "alias for --log (deprecated)"
msgstr ""
-#: builtin/fmt-merge-msg.c:672
+#: builtin/fmt-merge-msg.c:678
msgid "text"
msgstr ""
-#: builtin/fmt-merge-msg.c:673
+#: builtin/fmt-merge-msg.c:679
msgid "use <text> as start of message"
msgstr ""
-#: builtin/fmt-merge-msg.c:674
+#: builtin/fmt-merge-msg.c:680
msgid "file to read from"
msgstr ""
msgid "show only <n> matched refs"
msgstr ""
-#: builtin/for-each-ref.c:39 builtin/tag.c:420
+#: builtin/for-each-ref.c:39 builtin/tag.c:424
msgid "respect format colors"
msgstr ""
msgid "print only refs which don't contain the commit"
msgstr ""
-#: builtin/fsck.c:568
+#: builtin/fsck.c:598
msgid "Checking object directories"
msgstr ""
-#: builtin/fsck.c:660
+#: builtin/fsck.c:693
msgid "git fsck [<options>] [<object>...]"
msgstr ""
-#: builtin/fsck.c:666
+#: builtin/fsck.c:699
msgid "show unreachable objects"
msgstr ""
-#: builtin/fsck.c:667
+#: builtin/fsck.c:700
msgid "show dangling objects"
msgstr ""
-#: builtin/fsck.c:668
+#: builtin/fsck.c:701
msgid "report tags"
msgstr ""
-#: builtin/fsck.c:669
+#: builtin/fsck.c:702
msgid "report root nodes"
msgstr ""
-#: builtin/fsck.c:670
+#: builtin/fsck.c:703
msgid "make index objects head nodes"
msgstr ""
-#: builtin/fsck.c:671
+#: builtin/fsck.c:704
msgid "make reflogs head nodes (default)"
msgstr ""
-#: builtin/fsck.c:672
+#: builtin/fsck.c:705
msgid "also consider packs and alternate objects"
msgstr ""
-#: builtin/fsck.c:673
+#: builtin/fsck.c:706
msgid "check only connectivity"
msgstr ""
-#: builtin/fsck.c:674
+#: builtin/fsck.c:707
msgid "enable more strict checking"
msgstr ""
-#: builtin/fsck.c:676
+#: builtin/fsck.c:709
msgid "write dangling objects in .git/lost-found"
msgstr ""
-#: builtin/fsck.c:677 builtin/prune.c:108
+#: builtin/fsck.c:710 builtin/prune.c:110
msgid "show progress"
msgstr ""
-#: builtin/fsck.c:678
+#: builtin/fsck.c:711
msgid "show verbose names for reachable objects"
msgstr ""
-#: builtin/fsck.c:742
+#: builtin/fsck.c:776
msgid "Checking objects"
msgstr ""
-#: builtin/gc.c:27
+#: builtin/gc.c:34
msgid "git gc [<options>]"
msgstr ""
-#: builtin/gc.c:80
+#: builtin/gc.c:90
#, c-format
msgid "Failed to fstat %s: %s"
msgstr ""
-#: builtin/gc.c:312
+#: builtin/gc.c:461 builtin/init-db.c:55
+#, c-format
+msgid "cannot stat '%s'"
+msgstr ""
+
+#: builtin/gc.c:470 builtin/notes.c:240 builtin/tag.c:510
#, c-format
-msgid "Can't stat %s"
+msgid "cannot read '%s'"
msgstr ""
-#: builtin/gc.c:321
+#: builtin/gc.c:477
#, c-format
msgid ""
"The last gc run reported the following. Please correct the root cause\n"
"%s"
msgstr ""
-#: builtin/gc.c:360
+#: builtin/gc.c:519
msgid "prune unreferenced objects"
msgstr ""
-#: builtin/gc.c:362
+#: builtin/gc.c:521
msgid "be more thorough (increased runtime)"
msgstr ""
-#: builtin/gc.c:363
+#: builtin/gc.c:522
msgid "enable auto-gc mode"
msgstr ""
-#: builtin/gc.c:366
+#: builtin/gc.c:525
msgid "force running gc even if there may be another gc running"
msgstr ""
-#: builtin/gc.c:384
+#: builtin/gc.c:528
+msgid "repack all other packs except the largest pack"
+msgstr ""
+
+#: builtin/gc.c:545
#, c-format
-msgid "Failed to parse gc.logexpiry value %s"
+msgid "failed to parse gc.logexpiry value %s"
msgstr ""
-#: builtin/gc.c:412
+#: builtin/gc.c:556
+#, c-format
+msgid "failed to parse prune expiry value %s"
+msgstr ""
+
+#: builtin/gc.c:576
#, c-format
msgid "Auto packing the repository in background for optimum performance.\n"
msgstr ""
-#: builtin/gc.c:414
+#: builtin/gc.c:578
#, c-format
msgid "Auto packing the repository for optimum performance.\n"
msgstr ""
-#: builtin/gc.c:415
+#: builtin/gc.c:579
#, c-format
msgid "See \"git help gc\" for manual housekeeping.\n"
msgstr ""
-#: builtin/gc.c:440
+#: builtin/gc.c:619
#, c-format
msgid ""
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
msgstr ""
-#: builtin/gc.c:487
+#: builtin/gc.c:670
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr ""
-#: builtin/grep.c:27
+#: builtin/grep.c:28
msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
msgstr ""
-#: builtin/grep.c:225
+#: builtin/grep.c:224
#, c-format
msgid "grep: failed to create thread: %s"
msgstr ""
-#: builtin/grep.c:283
+#: builtin/grep.c:278
#, c-format
msgid "invalid number of threads specified (%d) for %s"
msgstr ""
#. variable for tweaking threads, currently
#. grep.threads
#.
-#: builtin/grep.c:292 builtin/index-pack.c:1523 builtin/index-pack.c:1712
+#: builtin/grep.c:286 builtin/index-pack.c:1506 builtin/index-pack.c:1697
+#: builtin/pack-objects.c:2719
#, c-format
msgid "no threads support, ignoring %s"
msgstr ""
-#: builtin/grep.c:460 builtin/grep.c:580 builtin/grep.c:622
+#: builtin/grep.c:458 builtin/grep.c:579 builtin/grep.c:620
#, c-format
msgid "unable to read tree (%s)"
msgstr ""
-#: builtin/grep.c:637
+#: builtin/grep.c:635
#, c-format
msgid "unable to grep from object of type %s"
msgstr ""
-#: builtin/grep.c:703
+#: builtin/grep.c:701
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr ""
-#: builtin/grep.c:790
+#: builtin/grep.c:800
msgid "search in index instead of in the work tree"
msgstr ""
-#: builtin/grep.c:792
+#: builtin/grep.c:802
msgid "find in contents not managed by git"
msgstr ""
-#: builtin/grep.c:794
+#: builtin/grep.c:804
msgid "search in both tracked and untracked files"
msgstr ""
-#: builtin/grep.c:796
+#: builtin/grep.c:806
msgid "ignore files specified via '.gitignore'"
msgstr ""
-#: builtin/grep.c:798
+#: builtin/grep.c:808
msgid "recursively search in each submodule"
msgstr ""
-#: builtin/grep.c:801
+#: builtin/grep.c:811
msgid "show non-matching lines"
msgstr ""
-#: builtin/grep.c:803
+#: builtin/grep.c:813
msgid "case insensitive matching"
msgstr ""
-#: builtin/grep.c:805
+#: builtin/grep.c:815
msgid "match patterns only at word boundaries"
msgstr ""
-#: builtin/grep.c:807
+#: builtin/grep.c:817
msgid "process binary files as text"
msgstr ""
-#: builtin/grep.c:809
+#: builtin/grep.c:819
msgid "don't match patterns in binary files"
msgstr ""
-#: builtin/grep.c:812
+#: builtin/grep.c:822
msgid "process binary files with textconv filters"
msgstr ""
-#: builtin/grep.c:814
+#: builtin/grep.c:824
+msgid "search in subdirectories (default)"
+msgstr ""
+
+#: builtin/grep.c:826
msgid "descend at most <depth> levels"
msgstr ""
-#: builtin/grep.c:818
+#: builtin/grep.c:830
msgid "use extended POSIX regular expressions"
msgstr ""
-#: builtin/grep.c:821
+#: builtin/grep.c:833
msgid "use basic POSIX regular expressions (default)"
msgstr ""
-#: builtin/grep.c:824
+#: builtin/grep.c:836
msgid "interpret patterns as fixed strings"
msgstr ""
-#: builtin/grep.c:827
+#: builtin/grep.c:839
msgid "use Perl-compatible regular expressions"
msgstr ""
-#: builtin/grep.c:830
+#: builtin/grep.c:842
msgid "show line numbers"
msgstr ""
-#: builtin/grep.c:831
+#: builtin/grep.c:843
+msgid "show column number of first match"
+msgstr ""
+
+#: builtin/grep.c:844
msgid "don't show filenames"
msgstr ""
-#: builtin/grep.c:832
+#: builtin/grep.c:845
msgid "show filenames"
msgstr ""
-#: builtin/grep.c:834
+#: builtin/grep.c:847
msgid "show filenames relative to top directory"
msgstr ""
-#: builtin/grep.c:836
+#: builtin/grep.c:849
msgid "show only filenames instead of matching lines"
msgstr ""
-#: builtin/grep.c:838
+#: builtin/grep.c:851
msgid "synonym for --files-with-matches"
msgstr ""
-#: builtin/grep.c:841
+#: builtin/grep.c:854
msgid "show only the names of files without match"
msgstr ""
-#: builtin/grep.c:843
+#: builtin/grep.c:856
msgid "print NUL after filenames"
msgstr ""
-#: builtin/grep.c:846
+#: builtin/grep.c:859
+msgid "show only matching parts of a line"
+msgstr ""
+
+#: builtin/grep.c:861
msgid "show the number of matches instead of matching lines"
msgstr ""
-#: builtin/grep.c:847
+#: builtin/grep.c:862
msgid "highlight matches"
msgstr ""
-#: builtin/grep.c:849
+#: builtin/grep.c:864
msgid "print empty line between matches from different files"
msgstr ""
-#: builtin/grep.c:851
+#: builtin/grep.c:866
msgid "show filename only once above matches from same file"
msgstr ""
-#: builtin/grep.c:854
+#: builtin/grep.c:869
msgid "show <n> context lines before and after matches"
msgstr ""
-#: builtin/grep.c:857
+#: builtin/grep.c:872
msgid "show <n> context lines before matches"
msgstr ""
-#: builtin/grep.c:859
+#: builtin/grep.c:874
msgid "show <n> context lines after matches"
msgstr ""
-#: builtin/grep.c:861
+#: builtin/grep.c:876
msgid "use <n> worker threads"
msgstr ""
-#: builtin/grep.c:862
+#: builtin/grep.c:877
msgid "shortcut for -C NUM"
msgstr ""
-#: builtin/grep.c:865
+#: builtin/grep.c:880
msgid "show a line with the function name before matches"
msgstr ""
-#: builtin/grep.c:867
+#: builtin/grep.c:882
msgid "show the surrounding function"
msgstr ""
-#: builtin/grep.c:870
+#: builtin/grep.c:885
msgid "read patterns from file"
msgstr ""
-#: builtin/grep.c:872
+#: builtin/grep.c:887
msgid "match <pattern>"
msgstr ""
-#: builtin/grep.c:874
+#: builtin/grep.c:889
msgid "combine patterns specified with -e"
msgstr ""
-#: builtin/grep.c:886
+#: builtin/grep.c:901
msgid "indicate hit with exit status without output"
msgstr ""
-#: builtin/grep.c:888
+#: builtin/grep.c:903
msgid "show only matches from files that match all patterns"
msgstr ""
-#: builtin/grep.c:890
+#: builtin/grep.c:905
msgid "show parse tree for grep expression"
msgstr ""
-#: builtin/grep.c:894
+#: builtin/grep.c:909
msgid "pager"
msgstr ""
-#: builtin/grep.c:894
+#: builtin/grep.c:909
msgid "show matching files in the pager"
msgstr ""
-#: builtin/grep.c:898
+#: builtin/grep.c:913
msgid "allow calling of grep(1) (ignored by this build)"
msgstr ""
-#: builtin/grep.c:962
-msgid "no pattern given."
+#: builtin/grep.c:977
+msgid "no pattern given"
msgstr ""
-#: builtin/grep.c:994
+#: builtin/grep.c:1013
msgid "--no-index or --untracked cannot be used with revs"
msgstr ""
-#: builtin/grep.c:1001
+#: builtin/grep.c:1020
#, c-format
msgid "unable to resolve revision: %s"
msgstr ""
-#: builtin/grep.c:1036 builtin/index-pack.c:1519
-#, c-format
-msgid "invalid number of threads specified (%d)"
+#: builtin/grep.c:1051
+msgid "invalid option combination, ignoring --threads"
msgstr ""
-#: builtin/grep.c:1041
+#: builtin/grep.c:1054 builtin/pack-objects.c:3397
msgid "no threads support, ignoring --threads"
msgstr ""
-#: builtin/grep.c:1065
+#: builtin/grep.c:1057 builtin/index-pack.c:1503 builtin/pack-objects.c:2716
+#, c-format
+msgid "invalid number of threads specified (%d)"
+msgstr ""
+
+#: builtin/grep.c:1080
msgid "--open-files-in-pager only works on the worktree"
msgstr ""
-#: builtin/grep.c:1088
-msgid "option not supported with --recurse-submodules."
+#: builtin/grep.c:1103
+msgid "option not supported with --recurse-submodules"
msgstr ""
-#: builtin/grep.c:1094
-msgid "--cached or --untracked cannot be used with --no-index."
+#: builtin/grep.c:1109
+msgid "--cached or --untracked cannot be used with --no-index"
msgstr ""
-#: builtin/grep.c:1100
-msgid "--[no-]exclude-standard cannot be used for tracked contents."
+#: builtin/grep.c:1115
+msgid "--[no-]exclude-standard cannot be used for tracked contents"
msgstr ""
-#: builtin/grep.c:1108
-msgid "both --cached and trees are given."
+#: builtin/grep.c:1123
+msgid "both --cached and trees are given"
msgstr ""
-#: builtin/hash-object.c:83
+#: builtin/hash-object.c:84
msgid ""
"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
"[--] <file>..."
msgstr ""
-#: builtin/hash-object.c:84
+#: builtin/hash-object.c:85
msgid "git hash-object --stdin-paths"
msgstr ""
-#: builtin/hash-object.c:96
+#: builtin/hash-object.c:97
msgid "type"
msgstr ""
-#: builtin/hash-object.c:96
+#: builtin/hash-object.c:97
msgid "object type"
msgstr ""
-#: builtin/hash-object.c:97
+#: builtin/hash-object.c:98
msgid "write the object into the object database"
msgstr ""
-#: builtin/hash-object.c:99
+#: builtin/hash-object.c:100
msgid "read the object from stdin"
msgstr ""
-#: builtin/hash-object.c:101
+#: builtin/hash-object.c:102
msgid "store file as is without filters"
msgstr ""
-#: builtin/hash-object.c:102
+#: builtin/hash-object.c:103
msgid ""
"just hash any random garbage to create corrupt objects for debugging Git"
msgstr ""
-#: builtin/hash-object.c:103
+#: builtin/hash-object.c:104
msgid "process file as it were from this path"
msgstr ""
-#: builtin/help.c:43
+#: builtin/help.c:46
msgid "print all available commands"
msgstr ""
-#: builtin/help.c:44
+#: builtin/help.c:47
msgid "exclude guides"
msgstr ""
-#: builtin/help.c:45
+#: builtin/help.c:48
msgid "print list of useful guides"
msgstr ""
-#: builtin/help.c:46
+#: builtin/help.c:49
+msgid "print all configuration variable names"
+msgstr ""
+
+#: builtin/help.c:51
msgid "show man page"
msgstr ""
-#: builtin/help.c:47
+#: builtin/help.c:52
msgid "show manual in web browser"
msgstr ""
-#: builtin/help.c:49
+#: builtin/help.c:54
msgid "show info page"
msgstr ""
-#: builtin/help.c:55
+#: builtin/help.c:56
+msgid "print command description"
+msgstr ""
+
+#: builtin/help.c:61
msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
msgstr ""
-#: builtin/help.c:67
+#: builtin/help.c:73
#, c-format
msgid "unrecognized help format '%s'"
msgstr ""
-#: builtin/help.c:94
+#: builtin/help.c:100
msgid "Failed to start emacsclient."
msgstr ""
-#: builtin/help.c:107
+#: builtin/help.c:113
msgid "Failed to parse emacsclient version."
msgstr ""
-#: builtin/help.c:115
+#: builtin/help.c:121
#, c-format
msgid "emacsclient version '%d' too old (< 22)."
msgstr ""
-#: builtin/help.c:133 builtin/help.c:155 builtin/help.c:165 builtin/help.c:173
+#: 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/help.c:211
+#: builtin/help.c:217
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
"Please consider using 'man.<tool>.cmd' instead."
msgstr ""
-#: builtin/help.c:223
+#: builtin/help.c:229
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
"Please consider using 'man.<tool>.path' instead."
msgstr ""
-#: builtin/help.c:340
+#: builtin/help.c:346
#, c-format
msgid "'%s': unknown man viewer."
msgstr ""
-#: builtin/help.c:357
+#: builtin/help.c:363
msgid "no man viewer handled the request"
msgstr ""
-#: builtin/help.c:365
+#: builtin/help.c:371
msgid "no info viewer handled the request"
msgstr ""
-#: builtin/help.c:407
-msgid "Defining attributes per path"
-msgstr ""
-
-#: builtin/help.c:408
-msgid "Everyday Git With 20 Commands Or So"
-msgstr ""
-
-#: builtin/help.c:409
-msgid "A Git glossary"
-msgstr ""
-
-#: builtin/help.c:410
-msgid "Specifies intentionally untracked files to ignore"
-msgstr ""
-
-#: builtin/help.c:411
-msgid "Defining submodule properties"
-msgstr ""
-
-#: builtin/help.c:412
-msgid "Specifying revisions and ranges for Git"
-msgstr ""
-
-#: builtin/help.c:413
-msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
-msgstr ""
-
-#: builtin/help.c:414
-msgid "An overview of recommended workflows with Git"
-msgstr ""
-
-#: builtin/help.c:426
-msgid "The common Git guides are:\n"
+#: builtin/help.c:430 builtin/help.c:441 git.c:322
+#, c-format
+msgid "'%s' is aliased to '%s'"
msgstr ""
#: builtin/help.c:444
#, c-format
-msgid "'%s' is aliased to '%s'"
+msgid "bad alias.%s string: %s"
msgstr ""
-#: builtin/help.c:466 builtin/help.c:483
+#: builtin/help.c:473 builtin/help.c:503
#, c-format
msgid "usage: %s%s"
msgstr ""
-#: builtin/index-pack.c:157
-#, c-format
-msgid "unable to open %s"
+#: builtin/help.c:487
+msgid "'git help config' for more information"
msgstr ""
-#: builtin/index-pack.c:207
+#: builtin/index-pack.c:184
#, c-format
msgid "object type mismatch at %s"
msgstr ""
-#: builtin/index-pack.c:227
+#: builtin/index-pack.c:204
#, c-format
msgid "did not receive expected object %s"
msgstr ""
-#: builtin/index-pack.c:230
+#: builtin/index-pack.c:207
#, c-format
msgid "object %s: expected type %s, found %s"
msgstr ""
-#: builtin/index-pack.c:272
+#: builtin/index-pack.c:249
#, c-format
msgid "cannot fill %d byte"
msgid_plural "cannot fill %d bytes"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:282
+#: builtin/index-pack.c:259
msgid "early EOF"
msgstr ""
-#: builtin/index-pack.c:283
+#: builtin/index-pack.c:260
msgid "read error on input"
msgstr ""
-#: builtin/index-pack.c:295
+#: builtin/index-pack.c:272
msgid "used more bytes than were available"
msgstr ""
-#: builtin/index-pack.c:302
+#: builtin/index-pack.c:279 builtin/pack-objects.c:598
msgid "pack too large for current definition of off_t"
msgstr ""
-#: builtin/index-pack.c:305 builtin/unpack-objects.c:93
+#: builtin/index-pack.c:282 builtin/unpack-objects.c:94
msgid "pack exceeds maximum allowed size"
msgstr ""
-#: builtin/index-pack.c:320
+#: builtin/index-pack.c:297
#, c-format
msgid "unable to create '%s'"
msgstr ""
-#: builtin/index-pack.c:326
+#: builtin/index-pack.c:303
#, c-format
msgid "cannot open packfile '%s'"
msgstr ""
-#: builtin/index-pack.c:340
+#: builtin/index-pack.c:317
msgid "pack signature mismatch"
msgstr ""
-#: builtin/index-pack.c:342
+#: builtin/index-pack.c:319
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr ""
-#: builtin/index-pack.c:360
+#: builtin/index-pack.c:337
#, c-format
msgid "pack has bad object at offset %<PRIuMAX>: %s"
msgstr ""
-#: builtin/index-pack.c:481
+#: builtin/index-pack.c:457
#, c-format
msgid "inflate returned %d"
msgstr ""
-#: builtin/index-pack.c:530
+#: builtin/index-pack.c:506
msgid "offset value overflow for delta base object"
msgstr ""
-#: builtin/index-pack.c:538
+#: builtin/index-pack.c:514
msgid "delta base offset is out of bound"
msgstr ""
-#: builtin/index-pack.c:546
+#: builtin/index-pack.c:522
#, c-format
msgid "unknown object type %d"
msgstr ""
-#: builtin/index-pack.c:577
+#: builtin/index-pack.c:553
msgid "cannot pread pack file"
msgstr ""
-#: builtin/index-pack.c:579
+#: builtin/index-pack.c:555
#, c-format
msgid "premature end of pack file, %<PRIuMAX> byte missing"
msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:605
+#: builtin/index-pack.c:581
msgid "serious inflate inconsistency"
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
+#: 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 "SHA1 COLLISION FOUND WITH %s !"
msgstr ""
-#: builtin/index-pack.c:753 builtin/pack-objects.c:182
-#: builtin/pack-objects.c:276
+#: builtin/index-pack.c:729 builtin/pack-objects.c:151
+#: builtin/pack-objects.c:211 builtin/pack-objects.c:305
#, c-format
msgid "unable to read %s"
msgstr ""
-#: builtin/index-pack.c:816
+#: builtin/index-pack.c:792
#, c-format
msgid "cannot read existing object info %s"
msgstr ""
-#: builtin/index-pack.c:824
+#: builtin/index-pack.c:800
#, c-format
msgid "cannot read existing object %s"
msgstr ""
-#: builtin/index-pack.c:838
+#: builtin/index-pack.c:814
#, c-format
msgid "invalid blob object %s"
msgstr ""
-#: builtin/index-pack.c:853
-#, c-format
-msgid "invalid %s"
+#: builtin/index-pack.c:817 builtin/index-pack.c:836
+msgid "fsck error in packed object"
msgstr ""
-#: builtin/index-pack.c:856
-msgid "Error in object"
+#: builtin/index-pack.c:833
+#, c-format
+msgid "invalid %s"
msgstr ""
-#: builtin/index-pack.c:858
+#: builtin/index-pack.c:838
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr ""
-#: builtin/index-pack.c:930 builtin/index-pack.c:961
+#: builtin/index-pack.c:910 builtin/index-pack.c:941
msgid "failed to apply delta"
msgstr ""
-#: builtin/index-pack.c:1131
+#: builtin/index-pack.c:1109
msgid "Receiving objects"
msgstr ""
-#: builtin/index-pack.c:1131
+#: builtin/index-pack.c:1109
msgid "Indexing objects"
msgstr ""
-#: builtin/index-pack.c:1165
+#: builtin/index-pack.c:1143
msgid "pack is corrupted (SHA1 mismatch)"
msgstr ""
-#: builtin/index-pack.c:1170
+#: builtin/index-pack.c:1148
msgid "cannot fstat packfile"
msgstr ""
-#: builtin/index-pack.c:1173
+#: builtin/index-pack.c:1151
msgid "pack has junk at the end"
msgstr ""
-#: builtin/index-pack.c:1185
+#: builtin/index-pack.c:1163
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr ""
-#: builtin/index-pack.c:1208
+#: builtin/index-pack.c:1186
msgid "Resolving deltas"
msgstr ""
-#: builtin/index-pack.c:1219
+#: builtin/index-pack.c:1196 builtin/pack-objects.c:2492
#, c-format
msgid "unable to create thread: %s"
msgstr ""
-#: builtin/index-pack.c:1261
+#: builtin/index-pack.c:1237
msgid "confusion beyond insanity"
msgstr ""
-#: builtin/index-pack.c:1267
+#: 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/index-pack.c:1279
+#: builtin/index-pack.c:1255
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr ""
-#: builtin/index-pack.c:1283
+#: 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:1307
+#: builtin/index-pack.c:1283
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr ""
-#: builtin/index-pack.c:1383
+#: builtin/index-pack.c:1360
#, c-format
msgid "local object %s is corrupt"
msgstr ""
-#: builtin/index-pack.c:1397
+#: builtin/index-pack.c:1374
#, c-format
msgid "packfile name '%s' does not end with '.pack'"
msgstr ""
-#: builtin/index-pack.c:1422
+#: builtin/index-pack.c:1399
#, c-format
msgid "cannot write %s file '%s'"
msgstr ""
-#: builtin/index-pack.c:1430
+#: builtin/index-pack.c:1407
#, c-format
msgid "cannot close written %s file '%s'"
msgstr ""
-#: builtin/index-pack.c:1454
+#: builtin/index-pack.c:1431
msgid "error while closing pack file"
msgstr ""
-#: builtin/index-pack.c:1468
+#: builtin/index-pack.c:1445
msgid "cannot store pack file"
msgstr ""
-#: builtin/index-pack.c:1476
+#: builtin/index-pack.c:1453
msgid "cannot store index file"
msgstr ""
-#: builtin/index-pack.c:1513
+#: builtin/index-pack.c:1497 builtin/pack-objects.c:2727
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr ""
-#: builtin/index-pack.c:1581
+#: builtin/index-pack.c:1565
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr ""
-#: builtin/index-pack.c:1583
+#: builtin/index-pack.c:1567
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr ""
-#: builtin/index-pack.c:1631
+#: builtin/index-pack.c:1615
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:1638
+#: 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/index-pack.c:1675
+#: builtin/index-pack.c:1659
msgid "Cannot come back to cwd"
msgstr ""
-#: builtin/index-pack.c:1724 builtin/index-pack.c:1727
-#: builtin/index-pack.c:1743 builtin/index-pack.c:1747
+#: 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/index-pack.c:1763
+#: builtin/index-pack.c:1747
msgid "--fix-thin cannot be used without --stdin"
msgstr ""
-#: builtin/index-pack.c:1765
+#: builtin/index-pack.c:1749
msgid "--stdin requires a git repository"
msgstr ""
-#: builtin/index-pack.c:1771
+#: builtin/index-pack.c:1755
msgid "--verify with no packfile name given"
msgstr ""
-#: builtin/init-db.c:55
-#, c-format
-msgid "cannot stat '%s'"
+#: builtin/index-pack.c:1803 builtin/unpack-objects.c:580
+msgid "fsck error in pack objects"
msgstr ""
#: builtin/init-db.c:61
msgid "cannot opendir '%s'"
msgstr ""
-#: builtin/init-db.c:77
+#: builtin/init-db.c:78
#, c-format
msgid "cannot readlink '%s'"
msgstr ""
-#: builtin/init-db.c:79
+#: builtin/init-db.c:80
#, c-format
msgid "cannot symlink '%s' '%s'"
msgstr ""
-#: builtin/init-db.c:85
+#: builtin/init-db.c:86
#, c-format
msgid "cannot copy '%s' to '%s'"
msgstr ""
-#: builtin/init-db.c:89
+#: builtin/init-db.c:90
#, c-format
msgid "ignoring template %s"
msgstr ""
-#: builtin/init-db.c:120
+#: builtin/init-db.c:121
#, c-format
-msgid "templates not found %s"
+msgid "templates not found in %s"
msgstr ""
-#: builtin/init-db.c:135
+#: builtin/init-db.c:136
#, c-format
msgid "not copying templates from '%s': %s"
msgstr ""
-#: builtin/init-db.c:328
+#: builtin/init-db.c:329
#, c-format
msgid "unable to handle file type %d"
msgstr ""
-#: builtin/init-db.c:331
+#: builtin/init-db.c:332
#, c-format
msgid "unable to move %s to %s"
msgstr ""
-#: builtin/init-db.c:348 builtin/init-db.c:351
+#: builtin/init-db.c:349 builtin/init-db.c:352
#, c-format
msgid "%s already exists"
msgstr ""
-#: builtin/init-db.c:404
+#: builtin/init-db.c:405
#, c-format
msgid "Reinitialized existing shared Git repository in %s%s\n"
msgstr ""
-#: builtin/init-db.c:405
+#: builtin/init-db.c:406
#, c-format
msgid "Reinitialized existing Git repository in %s%s\n"
msgstr ""
-#: builtin/init-db.c:409
+#: builtin/init-db.c:410
#, c-format
msgid "Initialized empty shared Git repository in %s%s\n"
msgstr ""
-#: builtin/init-db.c:410
+#: builtin/init-db.c:411
#, c-format
msgid "Initialized empty Git repository in %s%s\n"
msgstr ""
-#: builtin/init-db.c:458
+#: builtin/init-db.c:460
msgid ""
"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
"shared[=<permissions>]] [<directory>]"
msgstr ""
-#: builtin/init-db.c:481
+#: builtin/init-db.c:483
msgid "permissions"
msgstr ""
-#: builtin/init-db.c:482
+#: builtin/init-db.c:484
msgid "specify that the git repository is to be shared amongst several users"
msgstr ""
-#: builtin/init-db.c:516 builtin/init-db.c:521
+#: builtin/init-db.c:518 builtin/init-db.c:523
#, c-format
msgid "cannot mkdir %s"
msgstr ""
-#: builtin/init-db.c:525
+#: builtin/init-db.c:527
#, c-format
msgid "cannot chdir to %s"
msgstr ""
-#: builtin/init-db.c:546
+#: builtin/init-db.c:548
#, c-format
msgid ""
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
"dir=<directory>)"
msgstr ""
-#: builtin/init-db.c:574
+#: builtin/init-db.c:576
#, c-format
msgid "Cannot access work tree '%s'"
msgstr ""
"<token>[(=|:)<value>])...] [<file>...]"
msgstr ""
-#: builtin/interpret-trailers.c:92
+#: builtin/interpret-trailers.c:94
msgid "edit files in place"
msgstr ""
-#: builtin/interpret-trailers.c:93
+#: builtin/interpret-trailers.c:95
msgid "trim empty trailers"
msgstr ""
-#: builtin/interpret-trailers.c:96
+#: builtin/interpret-trailers.c:98
msgid "where to place the new trailer"
msgstr ""
-#: builtin/interpret-trailers.c:98
+#: builtin/interpret-trailers.c:100
msgid "action if trailer already exists"
msgstr ""
-#: builtin/interpret-trailers.c:100
+#: builtin/interpret-trailers.c:102
msgid "action if trailer is missing"
msgstr ""
-#: builtin/interpret-trailers.c:102
+#: builtin/interpret-trailers.c:104
msgid "output only the trailers"
msgstr ""
-#: builtin/interpret-trailers.c:103
+#: builtin/interpret-trailers.c:105
msgid "do not apply config rules"
msgstr ""
-#: builtin/interpret-trailers.c:104
+#: builtin/interpret-trailers.c:106
msgid "join whitespace-continued values"
msgstr ""
-#: builtin/interpret-trailers.c:105
+#: builtin/interpret-trailers.c:107
msgid "set parsing options"
msgstr ""
-#: builtin/interpret-trailers.c:107
+#: builtin/interpret-trailers.c:109
+msgid "do not treat --- specially"
+msgstr ""
+
+#: builtin/interpret-trailers.c:110
msgid "trailer"
msgstr ""
-#: builtin/interpret-trailers.c:108
+#: builtin/interpret-trailers.c:111
msgid "trailer(s) to add"
msgstr ""
-#: builtin/interpret-trailers.c:117
+#: builtin/interpret-trailers.c:120
msgid "--trailer with --only-input does not make sense"
msgstr ""
-#: builtin/interpret-trailers.c:127
+#: builtin/interpret-trailers.c:130
msgid "no input file given for in-place editing"
msgstr ""
-#: builtin/log.c:48
+#: builtin/log.c:54
msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
msgstr ""
-#: builtin/log.c:49
+#: builtin/log.c:55
msgid "git show [<options>] <object>..."
msgstr ""
-#: builtin/log.c:93
+#: builtin/log.c:99
#, c-format
msgid "invalid --decorate option: %s"
msgstr ""
-#: builtin/log.c:153
+#: builtin/log.c:162
msgid "suppress diff output"
msgstr ""
-#: builtin/log.c:154
+#: builtin/log.c:163
msgid "show source"
msgstr ""
-#: builtin/log.c:155
+#: builtin/log.c:164
msgid "Use mail map file"
msgstr ""
-#: builtin/log.c:157
+#: builtin/log.c:166
msgid "only decorate refs that match <pattern>"
msgstr ""
-#: builtin/log.c:159
+#: builtin/log.c:168
msgid "do not decorate refs that match <pattern>"
msgstr ""
-#: builtin/log.c:160
+#: builtin/log.c:169
msgid "decorate options"
msgstr ""
-#: builtin/log.c:163
+#: builtin/log.c:172
msgid "Process line range n,m in file, counting from 1"
msgstr ""
-#: builtin/log.c:259
+#: builtin/log.c:270
#, c-format
msgid "Final output: %d %s\n"
msgstr ""
-#: builtin/log.c:510
+#: builtin/log.c:522
#, c-format
msgid "git show %s: bad file"
msgstr ""
-#: builtin/log.c:525 builtin/log.c:619
+#: builtin/log.c:537 builtin/log.c:631
#, c-format
msgid "Could not read object %s"
msgstr ""
-#: builtin/log.c:643
+#: builtin/log.c:655
#, c-format
msgid "Unknown type: %d"
msgstr ""
-#: builtin/log.c:764
+#: builtin/log.c:776
msgid "format.headers without value"
msgstr ""
-#: builtin/log.c:865
+#: builtin/log.c:877
msgid "name of output directory is too long"
msgstr ""
-#: builtin/log.c:881
+#: builtin/log.c:893
#, c-format
msgid "Cannot open patch file %s"
msgstr ""
-#: builtin/log.c:898
+#: builtin/log.c:910
msgid "Need exactly one range."
msgstr ""
-#: builtin/log.c:908
+#: builtin/log.c:920
msgid "Not a range."
msgstr ""
-#: builtin/log.c:1014
+#: builtin/log.c:1043
msgid "Cover letter needs email format"
msgstr ""
-#: builtin/log.c:1095
+#: builtin/log.c:1119
#, c-format
msgid "insane in-reply-to: %s"
msgstr ""
-#: builtin/log.c:1122
+#: builtin/log.c:1146
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr ""
-#: builtin/log.c:1172
+#: builtin/log.c:1204
msgid "Two output directories?"
msgstr ""
-#: builtin/log.c:1279 builtin/log.c:1932 builtin/log.c:1934 builtin/log.c:1946
+#: builtin/log.c:1311 builtin/log.c:2054 builtin/log.c:2056 builtin/log.c:2068
#, c-format
msgid "Unknown commit %s"
msgstr ""
-#: builtin/log.c:1289 builtin/notes.c:887 builtin/tag.c:522
+#: builtin/log.c:1321 builtin/notes.c:894 builtin/tag.c:526
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr ""
-#: builtin/log.c:1294
+#: builtin/log.c:1326
msgid "Could not find exact merge base."
msgstr ""
-#: builtin/log.c:1298
+#: builtin/log.c:1330
msgid ""
"Failed to get upstream, if you want to record base commit automatically,\n"
"please use git branch --set-upstream-to to track a remote branch.\n"
"Or you could specify base commit by --base=<base-commit-id> manually."
msgstr ""
-#: builtin/log.c:1318
+#: builtin/log.c:1350
msgid "Failed to find exact merge base"
msgstr ""
-#: builtin/log.c:1329
+#: builtin/log.c:1361
msgid "base commit should be the ancestor of revision list"
msgstr ""
-#: builtin/log.c:1333
+#: builtin/log.c:1365
msgid "base commit shouldn't be in revision list"
msgstr ""
-#: builtin/log.c:1382
+#: builtin/log.c:1418
msgid "cannot get patch id"
msgstr ""
-#: builtin/log.c:1441
+#: builtin/log.c:1470
+msgid "failed to infer range-diff ranges"
+msgstr ""
+
+#: builtin/log.c:1515
msgid "use [PATCH n/m] even with a single patch"
msgstr ""
-#: builtin/log.c:1444
+#: builtin/log.c:1518
msgid "use [PATCH] even with multiple patches"
msgstr ""
-#: builtin/log.c:1448
+#: builtin/log.c:1522
msgid "print patches to standard out"
msgstr ""
-#: builtin/log.c:1450
+#: builtin/log.c:1524
msgid "generate a cover letter"
msgstr ""
-#: builtin/log.c:1452
+#: builtin/log.c:1526
msgid "use simple number sequence for output file names"
msgstr ""
-#: builtin/log.c:1453
+#: builtin/log.c:1527
msgid "sfx"
msgstr ""
-#: builtin/log.c:1454
+#: builtin/log.c:1528
msgid "use <sfx> instead of '.patch'"
msgstr ""
-#: builtin/log.c:1456
+#: builtin/log.c:1530
msgid "start numbering patches at <n> instead of 1"
msgstr ""
-#: builtin/log.c:1458
+#: builtin/log.c:1532
msgid "mark the series as Nth re-roll"
msgstr ""
-#: builtin/log.c:1460
+#: builtin/log.c:1534
msgid "Use [RFC PATCH] instead of [PATCH]"
msgstr ""
-#: builtin/log.c:1463
+#: builtin/log.c:1537
msgid "Use [<prefix>] instead of [PATCH]"
msgstr ""
-#: builtin/log.c:1466
+#: builtin/log.c:1540
msgid "store resulting files in <dir>"
msgstr ""
-#: builtin/log.c:1469
+#: builtin/log.c:1543
msgid "don't strip/add [PATCH]"
msgstr ""
-#: builtin/log.c:1472
+#: builtin/log.c:1546
msgid "don't output binary diffs"
msgstr ""
-#: builtin/log.c:1474
+#: builtin/log.c:1548
msgid "output all-zero hash in From header"
msgstr ""
-#: builtin/log.c:1476
+#: builtin/log.c:1550
msgid "don't include a patch matching a commit upstream"
msgstr ""
-#: builtin/log.c:1478
+#: builtin/log.c:1552
msgid "show patch format instead of default (patch + stat)"
msgstr ""
-#: builtin/log.c:1480
+#: builtin/log.c:1554
msgid "Messaging"
msgstr ""
-#: builtin/log.c:1481
+#: builtin/log.c:1555
msgid "header"
msgstr ""
-#: builtin/log.c:1482
+#: builtin/log.c:1556
msgid "add email header"
msgstr ""
-#: builtin/log.c:1483 builtin/log.c:1485
+#: builtin/log.c:1557 builtin/log.c:1559
msgid "email"
msgstr ""
-#: builtin/log.c:1483
+#: builtin/log.c:1557
msgid "add To: header"
msgstr ""
-#: builtin/log.c:1485
+#: builtin/log.c:1559
msgid "add Cc: header"
msgstr ""
-#: builtin/log.c:1487
+#: builtin/log.c:1561
msgid "ident"
msgstr ""
-#: builtin/log.c:1488
+#: builtin/log.c:1562
msgid "set From address to <ident> (or committer ident if absent)"
msgstr ""
-#: builtin/log.c:1490
+#: builtin/log.c:1564
msgid "message-id"
msgstr ""
-#: builtin/log.c:1491
+#: builtin/log.c:1565
msgid "make first mail a reply to <message-id>"
msgstr ""
-#: builtin/log.c:1492 builtin/log.c:1495
+#: builtin/log.c:1566 builtin/log.c:1569
msgid "boundary"
msgstr ""
-#: builtin/log.c:1493
+#: builtin/log.c:1567
msgid "attach the patch"
msgstr ""
-#: builtin/log.c:1496
+#: builtin/log.c:1570
msgid "inline the patch"
msgstr ""
-#: builtin/log.c:1500
+#: builtin/log.c:1574
msgid "enable message threading, styles: shallow, deep"
msgstr ""
-#: builtin/log.c:1502
+#: builtin/log.c:1576
msgid "signature"
msgstr ""
-#: builtin/log.c:1503
+#: builtin/log.c:1577
msgid "add a signature"
msgstr ""
-#: builtin/log.c:1504
+#: builtin/log.c:1578
msgid "base-commit"
msgstr ""
-#: builtin/log.c:1505
+#: builtin/log.c:1579
msgid "add prerequisite tree info to the patch series"
msgstr ""
-#: builtin/log.c:1507
+#: builtin/log.c:1581
msgid "add a signature from a file"
msgstr ""
-#: builtin/log.c:1508
+#: builtin/log.c:1582
msgid "don't print the patch filenames"
msgstr ""
-#: builtin/log.c:1510
+#: builtin/log.c:1584
msgid "show progress while generating patches"
msgstr ""
#: builtin/log.c:1585
+msgid "rev"
+msgstr ""
+
+#: builtin/log.c:1586
+msgid "show changes against <rev> in cover letter or single patch"
+msgstr ""
+
+#: builtin/log.c:1589
+msgid "show changes against <refspec> in cover letter or single patch"
+msgstr ""
+
+#: builtin/log.c:1591
+msgid "percentage by which creation is weighted"
+msgstr ""
+
+#: builtin/log.c:1666
#, c-format
msgid "invalid ident line: %s"
msgstr ""
-#: builtin/log.c:1600
-msgid "-n and -k are mutually exclusive."
+#: builtin/log.c:1681
+msgid "-n and -k are mutually exclusive"
msgstr ""
-#: builtin/log.c:1602
-msgid "--subject-prefix/--rfc and -k are mutually exclusive."
+#: builtin/log.c:1683
+msgid "--subject-prefix/--rfc and -k are mutually exclusive"
msgstr ""
-#: builtin/log.c:1610
+#: builtin/log.c:1691
msgid "--name-only does not make sense"
msgstr ""
-#: builtin/log.c:1612
+#: builtin/log.c:1693
msgid "--name-status does not make sense"
msgstr ""
-#: builtin/log.c:1614
+#: builtin/log.c:1695
msgid "--check does not make sense"
msgstr ""
-#: builtin/log.c:1646
+#: builtin/log.c:1727
msgid "standard output, or directory, which one?"
msgstr ""
-#: builtin/log.c:1648
+#: builtin/log.c:1729
#, c-format
msgid "Could not create directory '%s'"
msgstr ""
-#: builtin/log.c:1741
+#: builtin/log.c:1816
+msgid "--interdiff requires --cover-letter or single patch"
+msgstr ""
+
+#: builtin/log.c:1820
+msgid "Interdiff:"
+msgstr ""
+
+#: builtin/log.c:1821
+#, c-format
+msgid "Interdiff against v%d:"
+msgstr ""
+
+#: builtin/log.c:1827
+msgid "--creation-factor requires --range-diff"
+msgstr ""
+
+#: builtin/log.c:1831
+msgid "--range-diff requires --cover-letter or single patch"
+msgstr ""
+
+#: builtin/log.c:1839
+msgid "Range-diff:"
+msgstr ""
+
+#: builtin/log.c:1840
+#, c-format
+msgid "Range-diff against v%d:"
+msgstr ""
+
+#: builtin/log.c:1851
#, c-format
msgid "unable to read signature file '%s'"
msgstr ""
-#: builtin/log.c:1773
+#: builtin/log.c:1887
msgid "Generating patches"
msgstr ""
-#: builtin/log.c:1817
+#: builtin/log.c:1931
msgid "Failed to create output files"
msgstr ""
-#: builtin/log.c:1867
+#: builtin/log.c:1989
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr ""
-#: builtin/log.c:1921
+#: builtin/log.c:2043
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
msgstr ""
-#: builtin/ls-files.c:468
+#: builtin/ls-files.c:469
msgid "git ls-files [<options>] [<file>...]"
msgstr ""
-#: builtin/ls-files.c:517
+#: builtin/ls-files.c:525
msgid "identify the file status with tags"
msgstr ""
-#: builtin/ls-files.c:519
+#: builtin/ls-files.c:527
msgid "use lowercase letters for 'assume unchanged' files"
msgstr ""
-#: builtin/ls-files.c:521
+#: builtin/ls-files.c:529
msgid "use lowercase letters for 'fsmonitor clean' files"
msgstr ""
-#: builtin/ls-files.c:523
+#: builtin/ls-files.c:531
msgid "show cached files in the output (default)"
msgstr ""
-#: builtin/ls-files.c:525
+#: builtin/ls-files.c:533
msgid "show deleted files in the output"
msgstr ""
-#: builtin/ls-files.c:527
+#: builtin/ls-files.c:535
msgid "show modified files in the output"
msgstr ""
-#: builtin/ls-files.c:529
+#: builtin/ls-files.c:537
msgid "show other files in the output"
msgstr ""
-#: builtin/ls-files.c:531
+#: builtin/ls-files.c:539
msgid "show ignored files in the output"
msgstr ""
-#: builtin/ls-files.c:534
+#: builtin/ls-files.c:542
msgid "show staged contents' object name in the output"
msgstr ""
-#: builtin/ls-files.c:536
+#: builtin/ls-files.c:544
msgid "show files on the filesystem that need to be removed"
msgstr ""
-#: builtin/ls-files.c:538
+#: builtin/ls-files.c:546
msgid "show 'other' directories' names only"
msgstr ""
-#: builtin/ls-files.c:540
+#: builtin/ls-files.c:548
msgid "show line endings of files"
msgstr ""
-#: builtin/ls-files.c:542
+#: builtin/ls-files.c:550
msgid "don't show empty directories"
msgstr ""
-#: builtin/ls-files.c:545
+#: builtin/ls-files.c:553
msgid "show unmerged files in the output"
msgstr ""
-#: builtin/ls-files.c:547
+#: builtin/ls-files.c:555
msgid "show resolve-undo information"
msgstr ""
-#: builtin/ls-files.c:549
+#: builtin/ls-files.c:557
msgid "skip files matching pattern"
msgstr ""
-#: builtin/ls-files.c:552
+#: builtin/ls-files.c:560
msgid "exclude patterns are read from <file>"
msgstr ""
-#: builtin/ls-files.c:555
+#: builtin/ls-files.c:563
msgid "read additional per-directory exclude patterns in <file>"
msgstr ""
-#: builtin/ls-files.c:557
+#: builtin/ls-files.c:565
msgid "add the standard git exclusions"
msgstr ""
-#: builtin/ls-files.c:560
+#: builtin/ls-files.c:569
msgid "make the output relative to the project top directory"
msgstr ""
-#: builtin/ls-files.c:563
+#: builtin/ls-files.c:572
msgid "recurse through submodules"
msgstr ""
-#: builtin/ls-files.c:565
+#: builtin/ls-files.c:574
msgid "if any <file> is not in the index, treat this as an error"
msgstr ""
-#: builtin/ls-files.c:566
+#: builtin/ls-files.c:575
msgid "tree-ish"
msgstr ""
-#: builtin/ls-files.c:567
+#: builtin/ls-files.c:576
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr ""
-#: builtin/ls-files.c:569
+#: builtin/ls-files.c:578
msgid "show debugging data"
msgstr ""
-#: builtin/ls-remote.c:7
+#: 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:52
+#: builtin/ls-remote.c:59
msgid "do not print remote URL"
msgstr ""
-#: builtin/ls-remote.c:53 builtin/ls-remote.c:55
+#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:903
msgid "exec"
msgstr ""
-#: builtin/ls-remote.c:54 builtin/ls-remote.c:56
+#: 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:58
+#: builtin/ls-remote.c:65
msgid "limit to tags"
msgstr ""
-#: builtin/ls-remote.c:59
+#: builtin/ls-remote.c:66
msgid "limit to heads"
msgstr ""
-#: builtin/ls-remote.c:60
+#: builtin/ls-remote.c:67
msgid "do not show peeled tags"
msgstr ""
-#: builtin/ls-remote.c:62
+#: builtin/ls-remote.c:69
msgid "take url.<base>.insteadOf into account"
msgstr ""
-#: builtin/ls-remote.c:64
+#: builtin/ls-remote.c:73
msgid "exit with exit code 2 if no matching refs are found"
msgstr ""
-#: builtin/ls-remote.c:67
+#: builtin/ls-remote.c:76
msgid "show underlying ref in addition to the object pointed by it"
msgstr ""
-#: builtin/ls-tree.c:29
+#: builtin/ls-tree.c:30
msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
msgstr ""
-#: builtin/ls-tree.c:127
+#: builtin/ls-tree.c:128
msgid "only show trees"
msgstr ""
-#: builtin/ls-tree.c:129
+#: builtin/ls-tree.c:130
msgid "recurse into subtrees"
msgstr ""
-#: builtin/ls-tree.c:131
+#: builtin/ls-tree.c:132
msgid "show trees when recursing"
msgstr ""
-#: builtin/ls-tree.c:134
+#: builtin/ls-tree.c:135
msgid "terminate entries with NUL byte"
msgstr ""
-#: builtin/ls-tree.c:135
+#: builtin/ls-tree.c:136
msgid "include object size"
msgstr ""
-#: builtin/ls-tree.c:137 builtin/ls-tree.c:139
+#: builtin/ls-tree.c:138 builtin/ls-tree.c:140
msgid "list only filenames"
msgstr ""
-#: builtin/ls-tree.c:142
+#: builtin/ls-tree.c:143
msgid "use full path names"
msgstr ""
-#: builtin/ls-tree.c:144
+#: builtin/ls-tree.c:145
msgid "list entire tree; not just current directory (implies --full-name)"
msgstr ""
msgid "empty mbox: '%s'"
msgstr ""
-#: builtin/merge.c:49
+#: builtin/merge.c:52
msgid "git merge [<options>] [<commit>...]"
msgstr ""
-#: builtin/merge.c:50
+#: builtin/merge.c:53
msgid "git merge --abort"
msgstr ""
-#: builtin/merge.c:51
+#: builtin/merge.c:54
msgid "git merge --continue"
msgstr ""
-#: builtin/merge.c:108
+#: builtin/merge.c:111
msgid "switch `m' requires a value"
msgstr ""
-#: builtin/merge.c:145
+#: builtin/merge.c:177
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr ""
-#: builtin/merge.c:146
+#: builtin/merge.c:178
#, c-format
msgid "Available strategies are:"
msgstr ""
-#: builtin/merge.c:151
+#: builtin/merge.c:183
#, c-format
msgid "Available custom strategies are:"
msgstr ""
-#: builtin/merge.c:201 builtin/pull.c:137
+#: builtin/merge.c:234 builtin/pull.c:143
msgid "do not show a diffstat at the end of the merge"
msgstr ""
-#: builtin/merge.c:204 builtin/pull.c:140
+#: builtin/merge.c:237 builtin/pull.c:146
msgid "show a diffstat at the end of the merge"
msgstr ""
-#: builtin/merge.c:205 builtin/pull.c:143
+#: builtin/merge.c:238 builtin/pull.c:149
msgid "(synonym to --stat)"
msgstr ""
-#: builtin/merge.c:207 builtin/pull.c:146
+#: builtin/merge.c:240 builtin/pull.c:152
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr ""
-#: builtin/merge.c:210 builtin/pull.c:152
+#: builtin/merge.c:243 builtin/pull.c:158
msgid "create a single commit instead of doing a merge"
msgstr ""
-#: builtin/merge.c:212 builtin/pull.c:155
+#: builtin/merge.c:245 builtin/pull.c:161
msgid "perform a commit if the merge succeeds (default)"
msgstr ""
-#: builtin/merge.c:214 builtin/pull.c:158
+#: builtin/merge.c:247 builtin/pull.c:164
msgid "edit message before committing"
msgstr ""
-#: builtin/merge.c:215
+#: builtin/merge.c:248
msgid "allow fast-forward (default)"
msgstr ""
-#: builtin/merge.c:217 builtin/pull.c:164
+#: builtin/merge.c:250 builtin/pull.c:170
msgid "abort if fast-forward is not possible"
msgstr ""
-#: builtin/merge.c:221 builtin/pull.c:167
+#: builtin/merge.c:254 builtin/pull.c:173
msgid "verify that the named commit has a valid GPG signature"
msgstr ""
-#: builtin/merge.c:222 builtin/notes.c:777 builtin/pull.c:171
-#: builtin/revert.c:109
+#: builtin/merge.c:255 builtin/notes.c:784 builtin/pull.c:177
+#: builtin/rebase.c:916 builtin/rebase--interactive.c:186 builtin/revert.c:110
msgid "strategy"
msgstr ""
-#: builtin/merge.c:223 builtin/pull.c:172
+#: builtin/merge.c:256 builtin/pull.c:178
msgid "merge strategy to use"
msgstr ""
-#: builtin/merge.c:224 builtin/pull.c:175
+#: builtin/merge.c:257 builtin/pull.c:181
msgid "option=value"
msgstr ""
-#: builtin/merge.c:225 builtin/pull.c:176
+#: builtin/merge.c:258 builtin/pull.c:182
msgid "option for selected merge strategy"
msgstr ""
-#: builtin/merge.c:227
+#: builtin/merge.c:260
msgid "merge commit message (for a non-fast-forward merge)"
msgstr ""
-#: builtin/merge.c:231
+#: builtin/merge.c:267
msgid "abort the current in-progress merge"
msgstr ""
-#: builtin/merge.c:233
+#: builtin/merge.c:269
msgid "continue the current in-progress merge"
msgstr ""
-#: builtin/merge.c:235 builtin/pull.c:183
+#: builtin/merge.c:271 builtin/pull.c:189
msgid "allow merging unrelated histories"
msgstr ""
-#: builtin/merge.c:241
+#: builtin/merge.c:277
msgid "verify commit-msg hook"
msgstr ""
-#: builtin/merge.c:266
+#: builtin/merge.c:302
msgid "could not run stash."
msgstr ""
-#: builtin/merge.c:271
+#: builtin/merge.c:307
msgid "stash failed"
msgstr ""
-#: builtin/merge.c:276
+#: builtin/merge.c:312
#, c-format
msgid "not a valid object: %s"
msgstr ""
-#: builtin/merge.c:298 builtin/merge.c:315
+#: builtin/merge.c:334 builtin/merge.c:351
msgid "read-tree failed"
msgstr ""
-#: builtin/merge.c:345
+#: builtin/merge.c:381
msgid " (nothing to squash)"
msgstr ""
-#: builtin/merge.c:356
+#: builtin/merge.c:392
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr ""
-#: builtin/merge.c:406
+#: builtin/merge.c:442
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr ""
-#: builtin/merge.c:456
+#: builtin/merge.c:493
#, c-format
msgid "'%s' does not point to a commit"
msgstr ""
-#: builtin/merge.c:546
+#: builtin/merge.c:580
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr ""
-#: builtin/merge.c:668
+#: builtin/merge.c:701
msgid "Not handling anything other than two heads merge."
msgstr ""
-#: builtin/merge.c:682
+#: builtin/merge.c:715
#, c-format
msgid "Unknown option for merge-recursive: -X%s"
msgstr ""
-#: builtin/merge.c:697
+#: builtin/merge.c:730
#, c-format
msgid "unable to write %s"
msgstr ""
-#: builtin/merge.c:749
+#: builtin/merge.c:782
#, c-format
msgid "Could not read from '%s'"
msgstr ""
-#: builtin/merge.c:758
+#: builtin/merge.c:791
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr ""
-#: builtin/merge.c:764
+#: builtin/merge.c:797
#, c-format
msgid ""
"Please enter a commit message to explain why this merge is necessary,\n"
"the commit.\n"
msgstr ""
-#: builtin/merge.c:800
+#: builtin/merge.c:833
msgid "Empty commit message."
msgstr ""
-#: builtin/merge.c:820
+#: builtin/merge.c:852
#, c-format
msgid "Wonderful.\n"
msgstr ""
-#: builtin/merge.c:873
+#: builtin/merge.c:905
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr ""
-#: builtin/merge.c:912
+#: builtin/merge.c:944
msgid "No current branch."
msgstr ""
-#: builtin/merge.c:914
+#: builtin/merge.c:946
msgid "No remote for the current branch."
msgstr ""
-#: builtin/merge.c:916
+#: builtin/merge.c:948
msgid "No default upstream defined for the current branch."
msgstr ""
-#: builtin/merge.c:921
+#: builtin/merge.c:953
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr ""
-#: builtin/merge.c:974
+#: builtin/merge.c:1010
#, c-format
msgid "Bad value '%s' in environment '%s'"
msgstr ""
-#: builtin/merge.c:1076
+#: builtin/merge.c:1113
#, c-format
msgid "not something we can merge in %s: %s"
msgstr ""
-#: builtin/merge.c:1110
+#: builtin/merge.c:1147
msgid "not something we can merge"
msgstr ""
-#: builtin/merge.c:1212
+#: builtin/merge.c:1250
msgid "--abort expects no arguments"
msgstr ""
-#: builtin/merge.c:1216
+#: builtin/merge.c:1254
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr ""
-#: builtin/merge.c:1228
+#: builtin/merge.c:1266
msgid "--continue expects no arguments"
msgstr ""
-#: builtin/merge.c:1232
+#: builtin/merge.c:1270
msgid "There is no merge in progress (MERGE_HEAD missing)."
msgstr ""
-#: builtin/merge.c:1248
+#: builtin/merge.c:1286
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
msgstr ""
-#: builtin/merge.c:1255
+#: builtin/merge.c:1293
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
msgstr ""
-#: builtin/merge.c:1258
+#: builtin/merge.c:1296
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr ""
-#: builtin/merge.c:1267
+#: builtin/merge.c:1305
msgid "You cannot combine --squash with --no-ff."
msgstr ""
-#: builtin/merge.c:1275
+#: builtin/merge.c:1313
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr ""
-#: builtin/merge.c:1292
+#: builtin/merge.c:1330
msgid "Squash commit into empty head not supported yet"
msgstr ""
-#: builtin/merge.c:1294
+#: builtin/merge.c:1332
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr ""
-#: builtin/merge.c:1299
+#: builtin/merge.c:1337
#, c-format
msgid "%s - not something we can merge"
msgstr ""
-#: builtin/merge.c:1301
+#: builtin/merge.c:1339
msgid "Can merge only exactly one commit into empty head"
msgstr ""
-#: builtin/merge.c:1335
-#, c-format
-msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
-msgstr ""
-
-#: builtin/merge.c:1338
-#, c-format
-msgid "Commit %s has a bad GPG signature allegedly by %s."
-msgstr ""
-
-#: builtin/merge.c:1341
-#, c-format
-msgid "Commit %s does not have a GPG signature."
-msgstr ""
-
-#: builtin/merge.c:1344
-#, c-format
-msgid "Commit %s has a good GPG signature by %s\n"
-msgstr ""
-
-#: builtin/merge.c:1403
+#: builtin/merge.c:1421
msgid "refusing to merge unrelated histories"
msgstr ""
-#: builtin/merge.c:1412
+#: builtin/merge.c:1430
msgid "Already up to date."
msgstr ""
-#: builtin/merge.c:1422
+#: builtin/merge.c:1440
#, c-format
msgid "Updating %s..%s\n"
msgstr ""
-#: builtin/merge.c:1463
+#: builtin/merge.c:1482
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr ""
-#: builtin/merge.c:1470
+#: builtin/merge.c:1489
#, c-format
msgid "Nope.\n"
msgstr ""
-#: builtin/merge.c:1495
+#: builtin/merge.c:1514
msgid "Already up to date. Yeeah!"
msgstr ""
-#: builtin/merge.c:1501
+#: builtin/merge.c:1520
msgid "Not possible to fast-forward, aborting."
msgstr ""
-#: builtin/merge.c:1524 builtin/merge.c:1603
+#: builtin/merge.c:1543 builtin/merge.c:1622
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr ""
-#: builtin/merge.c:1528
+#: builtin/merge.c:1547
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr ""
-#: builtin/merge.c:1594
+#: builtin/merge.c:1613
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr ""
-#: builtin/merge.c:1596
+#: builtin/merge.c:1615
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr ""
-#: builtin/merge.c:1605
+#: builtin/merge.c:1624
#, c-format
msgid "Using the %s to prepare resolving by hand.\n"
msgstr ""
-#: builtin/merge.c:1617
+#: builtin/merge.c:1636
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
-#: builtin/merge-base.c:30
+#: builtin/merge-base.c:32
msgid "git merge-base [-a | --all] <commit> <commit>..."
msgstr ""
-#: builtin/merge-base.c:31
+#: builtin/merge-base.c:33
msgid "git merge-base [-a | --all] --octopus <commit>..."
msgstr ""
-#: builtin/merge-base.c:32
+#: builtin/merge-base.c:34
msgid "git merge-base --independent <commit>..."
msgstr ""
-#: builtin/merge-base.c:33
+#: builtin/merge-base.c:35
msgid "git merge-base --is-ancestor <commit> <commit>"
msgstr ""
-#: builtin/merge-base.c:34
+#: builtin/merge-base.c:36
msgid "git merge-base --fork-point <ref> [<commit>]"
msgstr ""
-#: builtin/merge-base.c:220
+#: builtin/merge-base.c:153
msgid "output all common ancestors"
msgstr ""
-#: builtin/merge-base.c:222
+#: builtin/merge-base.c:155
msgid "find ancestors for a single n-way merge"
msgstr ""
-#: builtin/merge-base.c:224
+#: builtin/merge-base.c:157
msgid "list revs not reachable from others"
msgstr ""
-#: builtin/merge-base.c:226
+#: builtin/merge-base.c:159
msgid "is the first one ancestor of the other?"
msgstr ""
-#: builtin/merge-base.c:228
+#: builtin/merge-base.c:161
msgid "find where <commit> forked from reflog of <ref>"
msgstr ""
"<orig-file> <file2>"
msgstr ""
-#: builtin/merge-file.c:33
+#: builtin/merge-file.c:35
msgid "send results to standard output"
msgstr ""
-#: builtin/merge-file.c:34
+#: builtin/merge-file.c:36
msgid "use a diff3 based merge"
msgstr ""
-#: builtin/merge-file.c:35
+#: builtin/merge-file.c:37
msgid "for conflicts, use our version"
msgstr ""
-#: builtin/merge-file.c:37
+#: builtin/merge-file.c:39
msgid "for conflicts, use their version"
msgstr ""
-#: builtin/merge-file.c:39
+#: builtin/merge-file.c:41
msgid "for conflicts, use a union version"
msgstr ""
-#: builtin/merge-file.c:42
+#: builtin/merge-file.c:44
msgid "for conflicts, use this marker size"
msgstr ""
-#: builtin/merge-file.c:43
+#: builtin/merge-file.c:45
msgid "do not warn about conflicts"
msgstr ""
-#: builtin/merge-file.c:45
+#: builtin/merge-file.c:47
msgid "set labels for file1/orig-file/file2"
msgstr ""
msgid "Merging %s with %s\n"
msgstr ""
-#: builtin/mktree.c:65
+#: builtin/mktree.c:66
msgid "git mktree [-z] [--missing] [--batch]"
msgstr ""
-#: builtin/mktree.c:153
+#: builtin/mktree.c:154
msgid "input is NUL terminated"
msgstr ""
-#: builtin/mktree.c:154 builtin/write-tree.c:25
+#: builtin/mktree.c:155 builtin/write-tree.c:25
msgid "allow missing objects"
msgstr ""
-#: builtin/mktree.c:155
+#: 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:17
msgid "git mv [<options>] <source>... <destination>"
msgstr ""
-#: builtin/mv.c:83
+#: builtin/mv.c:82
#, c-format
msgid "Directory %s is in index and no submodule?"
msgstr ""
-#: builtin/mv.c:85 builtin/rm.c:289
+#: builtin/mv.c:84
msgid "Please stage your changes to .gitmodules or stash them to proceed"
msgstr ""
-#: builtin/mv.c:103
+#: builtin/mv.c:102
#, c-format
msgid "%.*s is in index"
msgstr ""
-#: builtin/mv.c:125
+#: builtin/mv.c:124
msgid "force move/rename even if target exists"
msgstr ""
-#: builtin/mv.c:127
+#: builtin/mv.c:126
msgid "skip move/rename errors"
msgstr ""
msgid "Renaming %s to %s\n"
msgstr ""
-#: builtin/mv.c:276 builtin/remote.c:712 builtin/repack.c:394
+#: builtin/mv.c:276 builtin/remote.c:717 builtin/repack.c:511
#, c-format
msgid "renaming '%s' failed"
msgstr ""
-#: builtin/name-rev.c:338
+#: builtin/name-rev.c:355
msgid "git name-rev [<options>] <commit>..."
msgstr ""
-#: builtin/name-rev.c:339
+#: builtin/name-rev.c:356
msgid "git name-rev [<options>] --all"
msgstr ""
-#: builtin/name-rev.c:340
+#: builtin/name-rev.c:357
msgid "git name-rev [<options>] --stdin"
msgstr ""
-#: builtin/name-rev.c:395
+#: builtin/name-rev.c:413
msgid "print only names (no SHA-1)"
msgstr ""
-#: builtin/name-rev.c:396
+#: builtin/name-rev.c:414
msgid "only use tags to name the commits"
msgstr ""
-#: builtin/name-rev.c:398
+#: builtin/name-rev.c:416
msgid "only use refs matching <pattern>"
msgstr ""
-#: builtin/name-rev.c:400
+#: builtin/name-rev.c:418
msgid "ignore refs matching <pattern>"
msgstr ""
-#: builtin/name-rev.c:402
+#: builtin/name-rev.c:420
msgid "list all commits reachable from all refs"
msgstr ""
-#: builtin/name-rev.c:403
+#: builtin/name-rev.c:421
msgid "read from stdin"
msgstr ""
-#: builtin/name-rev.c:404
+#: builtin/name-rev.c:422
msgid "allow to print `undefined` names (default)"
msgstr ""
-#: builtin/name-rev.c:410
+#: builtin/name-rev.c:428
msgid "dereference tags in the input (internal use)"
msgstr ""
-#: builtin/notes.c:26
+#: builtin/notes.c:28
msgid "git notes [--ref <notes-ref>] [list [<object>]]"
msgstr ""
-#: builtin/notes.c:27
+#: 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:28
+#: builtin/notes.c:30
msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
msgstr ""
-#: builtin/notes.c:29
+#: 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:30
+#: builtin/notes.c:32
msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
msgstr ""
-#: builtin/notes.c:31
+#: builtin/notes.c:33
msgid "git notes [--ref <notes-ref>] show [<object>]"
msgstr ""
-#: builtin/notes.c:32
+#: builtin/notes.c:34
msgid ""
"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
msgstr ""
-#: builtin/notes.c:33
+#: builtin/notes.c:35
msgid "git notes merge --commit [-v | -q]"
msgstr ""
-#: builtin/notes.c:34
+#: builtin/notes.c:36
msgid "git notes merge --abort [-v | -q]"
msgstr ""
-#: builtin/notes.c:35
+#: builtin/notes.c:37
msgid "git notes [--ref <notes-ref>] remove [<object>...]"
msgstr ""
-#: builtin/notes.c:36
+#: builtin/notes.c:38
msgid "git notes [--ref <notes-ref>] prune [-n] [-v]"
msgstr ""
-#: builtin/notes.c:37
+#: builtin/notes.c:39
msgid "git notes [--ref <notes-ref>] get-ref"
msgstr ""
-#: builtin/notes.c:42
+#: builtin/notes.c:44
msgid "git notes [list [<object>]]"
msgstr ""
-#: builtin/notes.c:47
+#: builtin/notes.c:49
msgid "git notes add [<options>] [<object>]"
msgstr ""
-#: builtin/notes.c:52
+#: builtin/notes.c:54
msgid "git notes copy [<options>] <from-object> <to-object>"
msgstr ""
-#: builtin/notes.c:53
+#: builtin/notes.c:55
msgid "git notes copy --stdin [<from-object> <to-object>]..."
msgstr ""
-#: builtin/notes.c:58
+#: builtin/notes.c:60
msgid "git notes append [<options>] [<object>]"
msgstr ""
-#: builtin/notes.c:63
+#: builtin/notes.c:65
msgid "git notes edit [<object>]"
msgstr ""
-#: builtin/notes.c:68
+#: builtin/notes.c:70
msgid "git notes show [<object>]"
msgstr ""
-#: builtin/notes.c:73
+#: builtin/notes.c:75
msgid "git notes merge [<options>] <notes-ref>"
msgstr ""
-#: builtin/notes.c:74
+#: builtin/notes.c:76
msgid "git notes merge --commit [<options>]"
msgstr ""
-#: builtin/notes.c:75
+#: builtin/notes.c:77
msgid "git notes merge --abort [<options>]"
msgstr ""
-#: builtin/notes.c:80
+#: builtin/notes.c:82
msgid "git notes remove [<object>]"
msgstr ""
-#: builtin/notes.c:85
+#: builtin/notes.c:87
msgid "git notes prune [<options>]"
msgstr ""
-#: builtin/notes.c:90
+#: builtin/notes.c:92
msgid "git notes get-ref"
msgstr ""
-#: builtin/notes.c:95
+#: builtin/notes.c:97
msgid "Write/edit the notes for the following object:"
msgstr ""
-#: builtin/notes.c:148
+#: builtin/notes.c:150
#, c-format
msgid "unable to start 'show' for object '%s'"
msgstr ""
-#: builtin/notes.c:152
+#: builtin/notes.c:154
msgid "could not read 'show' output"
msgstr ""
-#: builtin/notes.c:160
+#: builtin/notes.c:162
#, c-format
msgid "failed to finish 'show' for object '%s'"
msgstr ""
-#: builtin/notes.c:195
+#: builtin/notes.c:197
msgid "please supply the note contents using either -m or -F option"
msgstr ""
-#: builtin/notes.c:204
+#: builtin/notes.c:206
msgid "unable to write note object"
msgstr ""
-#: builtin/notes.c:206
+#: builtin/notes.c:208
#, c-format
msgid "the note contents have been left in %s"
msgstr ""
-#: builtin/notes.c:234 builtin/tag.c:506
-#, c-format
-msgid "cannot read '%s'"
-msgstr ""
-
-#: builtin/notes.c:236 builtin/tag.c:509
+#: builtin/notes.c:242 builtin/tag.c:513
#, c-format
msgid "could not open or read '%s'"
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
+#: builtin/notes.c:263 builtin/notes.c:313 builtin/notes.c:315
+#: builtin/notes.c:383 builtin/notes.c:438 builtin/notes.c:524
+#: builtin/notes.c:529 builtin/notes.c:607 builtin/notes.c:669
#, c-format
msgid "failed to resolve '%s' as a valid ref."
msgstr ""
-#: builtin/notes.c:258
+#: builtin/notes.c:265
#, c-format
msgid "failed to read object '%s'."
msgstr ""
-#: builtin/notes.c:262
+#: builtin/notes.c:268
#, c-format
msgid "cannot read note data from non-blob object '%s'."
msgstr ""
-#: builtin/notes.c:302
+#: builtin/notes.c:309
#, c-format
msgid "malformed input line: '%s'."
msgstr ""
-#: builtin/notes.c:317
+#: 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:349
+#: builtin/notes.c:356
#, c-format
msgid "refusing to %s notes in %s (outside of refs/notes/)"
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
+#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:507
+#: builtin/notes.c:519 builtin/notes.c:595 builtin/notes.c:662
+#: builtin/notes.c:812 builtin/notes.c:959 builtin/notes.c:980
msgid "too many parameters"
msgstr ""
-#: builtin/notes.c:382 builtin/notes.c:668
+#: builtin/notes.c:389 builtin/notes.c:675
#, c-format
msgid "no note found for object %s."
msgstr ""
-#: builtin/notes.c:403 builtin/notes.c:566
+#: builtin/notes.c:410 builtin/notes.c:573
msgid "note contents as a string"
msgstr ""
-#: builtin/notes.c:406 builtin/notes.c:569
+#: builtin/notes.c:413 builtin/notes.c:576
msgid "note contents in a file"
msgstr ""
-#: builtin/notes.c:409 builtin/notes.c:572
+#: builtin/notes.c:416 builtin/notes.c:579
msgid "reuse and edit specified note object"
msgstr ""
-#: builtin/notes.c:412 builtin/notes.c:575
+#: builtin/notes.c:419 builtin/notes.c:582
msgid "reuse specified note object"
msgstr ""
-#: builtin/notes.c:415 builtin/notes.c:578
+#: builtin/notes.c:422 builtin/notes.c:585
msgid "allow storing empty note"
msgstr ""
-#: builtin/notes.c:416 builtin/notes.c:487
+#: builtin/notes.c:423 builtin/notes.c:494
msgid "replace existing notes"
msgstr ""
-#: builtin/notes.c:441
+#: 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:456 builtin/notes.c:535
+#: builtin/notes.c:463 builtin/notes.c:542
#, c-format
msgid "Overwriting existing notes for object %s\n"
msgstr ""
-#: builtin/notes.c:467 builtin/notes.c:627 builtin/notes.c:892
+#: builtin/notes.c:474 builtin/notes.c:634 builtin/notes.c:899
#, c-format
msgid "Removing note for object %s\n"
msgstr ""
-#: builtin/notes.c:488
+#: builtin/notes.c:495
msgid "read objects from stdin"
msgstr ""
-#: builtin/notes.c:490
+#: builtin/notes.c:497
msgid "load rewriting config for <command> (implies --stdin)"
msgstr ""
-#: builtin/notes.c:508
+#: builtin/notes.c:515
msgid "too few parameters"
msgstr ""
-#: builtin/notes.c:529
+#: builtin/notes.c:536
#, c-format
msgid ""
"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
"existing notes"
msgstr ""
-#: builtin/notes.c:541
+#: builtin/notes.c:548
#, c-format
msgid "missing notes on source object %s. Cannot copy."
msgstr ""
-#: builtin/notes.c:593
+#: builtin/notes.c:600
#, 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:688
+#: builtin/notes.c:695
msgid "failed to delete ref NOTES_MERGE_PARTIAL"
msgstr ""
-#: builtin/notes.c:690
+#: builtin/notes.c:697
msgid "failed to delete ref NOTES_MERGE_REF"
msgstr ""
-#: builtin/notes.c:692
+#: builtin/notes.c:699
msgid "failed to remove 'git notes merge' worktree"
msgstr ""
-#: builtin/notes.c:712
+#: builtin/notes.c:719
msgid "failed to read ref NOTES_MERGE_PARTIAL"
msgstr ""
-#: builtin/notes.c:714
+#: builtin/notes.c:721
msgid "could not find commit from NOTES_MERGE_PARTIAL."
msgstr ""
-#: builtin/notes.c:716
+#: builtin/notes.c:723
msgid "could not parse commit from NOTES_MERGE_PARTIAL."
msgstr ""
-#: builtin/notes.c:729
+#: builtin/notes.c:736
msgid "failed to resolve NOTES_MERGE_REF"
msgstr ""
-#: builtin/notes.c:732
+#: builtin/notes.c:739
msgid "failed to finalize notes merge"
msgstr ""
-#: builtin/notes.c:758
+#: builtin/notes.c:765
#, c-format
msgid "unknown notes merge strategy %s"
msgstr ""
-#: builtin/notes.c:774
+#: builtin/notes.c:781
msgid "General options"
msgstr ""
-#: builtin/notes.c:776
+#: builtin/notes.c:783
msgid "Merge options"
msgstr ""
-#: builtin/notes.c:778
+#: builtin/notes.c:785
msgid ""
"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
"cat_sort_uniq)"
msgstr ""
-#: builtin/notes.c:780
+#: builtin/notes.c:787
msgid "Committing unmerged notes"
msgstr ""
-#: builtin/notes.c:782
+#: builtin/notes.c:789
msgid "finalize notes merge by committing unmerged notes"
msgstr ""
-#: builtin/notes.c:784
+#: builtin/notes.c:791
msgid "Aborting notes merge resolution"
msgstr ""
-#: builtin/notes.c:786
+#: builtin/notes.c:793
msgid "abort notes merge"
msgstr ""
-#: builtin/notes.c:797
+#: builtin/notes.c:804
msgid "cannot mix --commit, --abort or -s/--strategy"
msgstr ""
-#: builtin/notes.c:802
+#: builtin/notes.c:809
msgid "must specify a notes ref to merge"
msgstr ""
-#: builtin/notes.c:826
+#: builtin/notes.c:833
#, c-format
msgid "unknown -s/--strategy: %s"
msgstr ""
-#: builtin/notes.c:863
+#: builtin/notes.c:870
#, c-format
msgid "a notes merge into %s is already in-progress at %s"
msgstr ""
-#: builtin/notes.c:866
+#: builtin/notes.c:873
#, c-format
msgid "failed to store link to current notes ref (%s)"
msgstr ""
-#: builtin/notes.c:868
+#: builtin/notes.c:875
#, c-format
msgid ""
"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
"abort'.\n"
msgstr ""
-#: builtin/notes.c:890
+#: builtin/notes.c:897
#, c-format
msgid "Object %s has no note\n"
msgstr ""
-#: builtin/notes.c:902
+#: builtin/notes.c:909
msgid "attempt to remove non-existent note is not an error"
msgstr ""
-#: builtin/notes.c:905
+#: builtin/notes.c:912
msgid "read object names from the standard input"
msgstr ""
-#: builtin/notes.c:943 builtin/prune.c:106 builtin/worktree.c:160
+#: builtin/notes.c:950 builtin/prune.c:108 builtin/worktree.c:164
msgid "do not remove, show only"
msgstr ""
-#: builtin/notes.c:944
+#: builtin/notes.c:951
msgid "report pruned notes"
msgstr ""
-#: builtin/notes.c:986
+#: builtin/notes.c:993
msgid "notes-ref"
msgstr ""
-#: builtin/notes.c:987
+#: builtin/notes.c:994
msgid "use notes from <notes-ref>"
msgstr ""
-#: builtin/notes.c:1022
+#: builtin/notes.c:1029
#, c-format
msgid "unknown subcommand: %s"
msgstr ""
-#: builtin/pack-objects.c:33
+#: builtin/pack-objects.c:51
msgid ""
"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
msgstr ""
-#: builtin/pack-objects.c:34
+#: builtin/pack-objects.c:52
msgid ""
"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
msgstr ""
-#: builtin/pack-objects.c:195 builtin/pack-objects.c:198
+#: builtin/pack-objects.c:422
#, c-format
-msgid "deflate error (%d)"
-msgstr ""
-
-#: builtin/pack-objects.c:791
-msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
-msgstr ""
-
-#: builtin/pack-objects.c:804
-msgid "Writing objects"
+msgid "bad packed object CRC for %s"
msgstr ""
-#: builtin/pack-objects.c:1084
-msgid "disabling bitmap writing, as some objects are not being packed"
+#: builtin/pack-objects.c:433
+#, c-format
+msgid "corrupt packed object for %s"
msgstr ""
-#: builtin/pack-objects.c:2454
-msgid "Compressing objects"
+#: builtin/pack-objects.c:564
+#, c-format
+msgid "recursive delta detected for object %s"
msgstr ""
-#: builtin/pack-objects.c:2625
-msgid "invalid value for --missing"
+#: builtin/pack-objects.c:775
+#, c-format
+msgid "ordered %u objects, expected %<PRIu32>"
msgstr ""
-#: builtin/pack-objects.c:2928
+#: builtin/pack-objects.c:788
#, c-format
-msgid "unsupported index version %s"
+msgid "packfile is invalid: %s"
msgstr ""
-#: builtin/pack-objects.c:2932
+#: builtin/pack-objects.c:792
#, c-format
-msgid "bad index version '%s'"
+msgid "unable to open packfile for reuse: %s"
msgstr ""
-#: builtin/pack-objects.c:2962
-msgid "do not show progress meter"
+#: builtin/pack-objects.c:796
+msgid "unable to seek in reused packfile"
msgstr ""
-#: builtin/pack-objects.c:2964
-msgid "show progress meter"
+#: builtin/pack-objects.c:807
+msgid "unable to read from reused packfile"
msgstr ""
-#: builtin/pack-objects.c:2966
-msgid "show progress meter during object writing phase"
+#: builtin/pack-objects.c:835
+msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
msgstr ""
-#: builtin/pack-objects.c:2969
-msgid "similar to --all-progress when progress meter is shown"
+#: builtin/pack-objects.c:848
+msgid "Writing objects"
msgstr ""
-#: builtin/pack-objects.c:2970
-msgid "version[,offset]"
+#: builtin/pack-objects.c:910 builtin/update-index.c:88
+#, c-format
+msgid "failed to stat %s"
msgstr ""
-#: builtin/pack-objects.c:2971
+#: builtin/pack-objects.c:963
+#, c-format
+msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
+msgstr ""
+
+#: builtin/pack-objects.c:1157
+msgid "disabling bitmap writing, as some objects are not being packed"
+msgstr ""
+
+#: builtin/pack-objects.c:1585
+#, c-format
+msgid "delta base offset overflow in pack for %s"
+msgstr ""
+
+#: builtin/pack-objects.c:1594
+#, c-format
+msgid "delta base offset out of bound for %s"
+msgstr ""
+
+#: builtin/pack-objects.c:1863
+msgid "Counting objects"
+msgstr ""
+
+#: builtin/pack-objects.c:1998
+#, c-format
+msgid "unable to get size of %s"
+msgstr ""
+
+#: builtin/pack-objects.c:2013
+#, c-format
+msgid "unable to parse object header of %s"
+msgstr ""
+
+#: builtin/pack-objects.c:2083 builtin/pack-objects.c:2099
+#: builtin/pack-objects.c:2109
+#, c-format
+msgid "object %s cannot be read"
+msgstr ""
+
+#: builtin/pack-objects.c:2086 builtin/pack-objects.c:2113
+#, c-format
+msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
+msgstr ""
+
+#: builtin/pack-objects.c:2123
+msgid "suboptimal pack - out of memory"
+msgstr ""
+
+#: builtin/pack-objects.c:2451
+#, c-format
+msgid "Delta compression using up to %d threads"
+msgstr ""
+
+#: builtin/pack-objects.c:2583
+#, c-format
+msgid "unable to pack objects reachable from tag %s"
+msgstr ""
+
+#: builtin/pack-objects.c:2670
+msgid "Compressing objects"
+msgstr ""
+
+#: builtin/pack-objects.c:2676
+msgid "inconsistency with delta count"
+msgstr ""
+
+#: builtin/pack-objects.c:2753
+#, c-format
+msgid ""
+"expected edge object ID, got garbage:\n"
+" %s"
+msgstr ""
+
+#: builtin/pack-objects.c:2759
+#, c-format
+msgid ""
+"expected object ID, got garbage:\n"
+" %s"
+msgstr ""
+
+#: builtin/pack-objects.c:2857
+msgid "invalid value for --missing"
+msgstr ""
+
+#: builtin/pack-objects.c:2916 builtin/pack-objects.c:3024
+msgid "cannot open pack index"
+msgstr ""
+
+#: builtin/pack-objects.c:2947
+#, c-format
+msgid "loose object at %s could not be examined"
+msgstr ""
+
+#: builtin/pack-objects.c:3032
+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:2974
+#: builtin/pack-objects.c:3249
msgid "maximum size of each output pack file"
msgstr ""
-#: builtin/pack-objects.c:2976
+#: builtin/pack-objects.c:3251
msgid "ignore borrowed objects from alternate object store"
msgstr ""
-#: builtin/pack-objects.c:2978
+#: builtin/pack-objects.c:3253
msgid "ignore packed objects"
msgstr ""
-#: builtin/pack-objects.c:2980
+#: builtin/pack-objects.c:3255
msgid "limit pack window by objects"
msgstr ""
-#: builtin/pack-objects.c:2982
+#: builtin/pack-objects.c:3257
msgid "limit pack window by memory in addition to object limit"
msgstr ""
-#: builtin/pack-objects.c:2984
+#: builtin/pack-objects.c:3259
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr ""
-#: builtin/pack-objects.c:2986
+#: builtin/pack-objects.c:3261
msgid "reuse existing deltas"
msgstr ""
-#: builtin/pack-objects.c:2988
+#: builtin/pack-objects.c:3263
msgid "reuse existing objects"
msgstr ""
-#: builtin/pack-objects.c:2990
+#: builtin/pack-objects.c:3265
msgid "use OFS_DELTA objects"
msgstr ""
-#: builtin/pack-objects.c:2992
+#: builtin/pack-objects.c:3267
msgid "use threads when searching for best delta matches"
msgstr ""
-#: builtin/pack-objects.c:2994
+#: builtin/pack-objects.c:3269
msgid "do not create an empty pack output"
msgstr ""
-#: builtin/pack-objects.c:2996
+#: builtin/pack-objects.c:3271
msgid "read revision arguments from standard input"
msgstr ""
-#: builtin/pack-objects.c:2998
+#: builtin/pack-objects.c:3273
msgid "limit the objects to those that are not yet packed"
msgstr ""
-#: builtin/pack-objects.c:3001
+#: builtin/pack-objects.c:3276
msgid "include objects reachable from any reference"
msgstr ""
-#: builtin/pack-objects.c:3004
+#: builtin/pack-objects.c:3279
msgid "include objects referred by reflog entries"
msgstr ""
-#: builtin/pack-objects.c:3007
+#: builtin/pack-objects.c:3282
msgid "include objects referred to by the index"
msgstr ""
-#: builtin/pack-objects.c:3010
+#: builtin/pack-objects.c:3285
msgid "output pack to stdout"
msgstr ""
-#: builtin/pack-objects.c:3012
+#: builtin/pack-objects.c:3287
msgid "include tag objects that refer to objects to be packed"
msgstr ""
-#: builtin/pack-objects.c:3014
+#: builtin/pack-objects.c:3289
msgid "keep unreachable objects"
msgstr ""
-#: builtin/pack-objects.c:3016
+#: builtin/pack-objects.c:3291
msgid "pack loose unreachable objects"
msgstr ""
-#: builtin/pack-objects.c:3018
+#: builtin/pack-objects.c:3293
msgid "unpack unreachable objects newer than <time>"
msgstr ""
-#: builtin/pack-objects.c:3021
+#: builtin/pack-objects.c:3296
msgid "create thin packs"
msgstr ""
-#: builtin/pack-objects.c:3023
+#: builtin/pack-objects.c:3298
msgid "create packs suitable for shallow fetches"
msgstr ""
-#: builtin/pack-objects.c:3025
+#: builtin/pack-objects.c:3300
msgid "ignore packs that have companion .keep file"
msgstr ""
-#: builtin/pack-objects.c:3027
+#: builtin/pack-objects.c:3302
+msgid "ignore this pack"
+msgstr ""
+
+#: builtin/pack-objects.c:3304
msgid "pack compression level"
msgstr ""
-#: builtin/pack-objects.c:3029
+#: builtin/pack-objects.c:3306
msgid "do not hide commits by grafts"
msgstr ""
-#: builtin/pack-objects.c:3031
+#: builtin/pack-objects.c:3308
msgid "use a bitmap index if available to speed up counting objects"
msgstr ""
-#: builtin/pack-objects.c:3033
+#: builtin/pack-objects.c:3310
msgid "write a bitmap index together with the pack index"
msgstr ""
-#: builtin/pack-objects.c:3036
+#: builtin/pack-objects.c:3313
msgid "handling for missing objects"
msgstr ""
-#: builtin/pack-objects.c:3039
+#: builtin/pack-objects.c:3316
msgid "do not pack objects in promisor packfiles"
msgstr ""
-#: builtin/pack-objects.c:3178
-msgid "Counting objects"
+#: builtin/pack-objects.c:3318
+msgid "respect islands during delta compression"
+msgstr ""
+
+#: builtin/pack-objects.c:3342
+#, c-format
+msgid "delta chain depth %d is too deep, forcing %d"
+msgstr ""
+
+#: builtin/pack-objects.c:3347
+#, c-format
+msgid "pack.deltaCacheLimit is too high, forcing %d"
+msgstr ""
+
+#: builtin/pack-objects.c:3401
+msgid "--max-pack-size cannot be used to build a pack for transfer"
+msgstr ""
+
+#: builtin/pack-objects.c:3403
+msgid "minimum pack size limit is 1 MiB"
+msgstr ""
+
+#: builtin/pack-objects.c:3408
+msgid "--thin cannot be used to build an indexable pack"
+msgstr ""
+
+#: builtin/pack-objects.c:3411
+msgid "--keep-unreachable and --unpack-unreachable are incompatible"
+msgstr ""
+
+#: builtin/pack-objects.c:3417
+msgid "cannot use --filter without --stdout"
+msgstr ""
+
+#: builtin/pack-objects.c:3476
+msgid "Enumerating objects"
+msgstr ""
+
+#: builtin/pack-objects.c:3495
+#, c-format
+msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)"
msgstr ""
-#: builtin/pack-refs.c:6
+#: builtin/pack-refs.c:7
msgid "git pack-refs [<options>]"
msgstr ""
-#: builtin/pack-refs.c:14
+#: builtin/pack-refs.c:15
msgid "pack everything"
msgstr ""
-#: builtin/pack-refs.c:15
+#: builtin/pack-refs.c:16
msgid "prune loose refs (default)"
msgstr ""
-#: builtin/prune-packed.c:8
+#: builtin/prune-packed.c:9
msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
msgstr ""
-#: builtin/prune-packed.c:41
+#: builtin/prune-packed.c:42
msgid "Removing duplicate objects"
msgstr ""
-#: builtin/prune.c:11
+#: builtin/prune.c:12
msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
msgstr ""
-#: builtin/prune.c:107
+#: builtin/prune.c:109
msgid "report pruned objects"
msgstr ""
-#: builtin/prune.c:110
+#: builtin/prune.c:112
msgid "expire objects older than <time>"
msgstr ""
-#: builtin/prune.c:112
+#: builtin/prune.c:114
msgid "limit traversal to objects outside promisor packfiles"
msgstr ""
-#: builtin/prune.c:126
+#: builtin/prune.c:129
msgid "cannot prune in a precious-objects repo"
msgstr ""
-#: builtin/pull.c:54 builtin/pull.c:56
+#: builtin/pull.c:60 builtin/pull.c:62
#, c-format
msgid "Invalid value for %s: %s"
msgstr ""
-#: builtin/pull.c:76
+#: builtin/pull.c:82
msgid "git pull [<options>] [<repository> [<refspec>...]]"
msgstr ""
-#: builtin/pull.c:127
+#: builtin/pull.c:133
msgid "control for recursive fetching of submodules"
msgstr ""
-#: builtin/pull.c:131
+#: builtin/pull.c:137
msgid "Options related to merging"
msgstr ""
-#: builtin/pull.c:134
+#: builtin/pull.c:140
msgid "incorporate changes by rebasing rather than merging"
msgstr ""
-#: builtin/pull.c:161 builtin/rebase--helper.c:23 builtin/revert.c:121
+#: builtin/pull.c:167 builtin/rebase--interactive.c:147 builtin/revert.c:122
msgid "allow fast-forward"
msgstr ""
-#: builtin/pull.c:170
+#: builtin/pull.c:176
msgid "automatically stash/stash pop before and after rebase"
msgstr ""
-#: builtin/pull.c:186
+#: builtin/pull.c:192
msgid "Options related to fetching"
msgstr ""
-#: builtin/pull.c:204
+#: builtin/pull.c:202
+msgid "force overwrite of local branch"
+msgstr ""
+
+#: builtin/pull.c:210
msgid "number of submodules pulled in parallel"
msgstr ""
-#: builtin/pull.c:299
+#: builtin/pull.c:305
#, c-format
msgid "Invalid value for pull.ff: %s"
msgstr ""
-#: builtin/pull.c:415
+#: builtin/pull.c:421
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
msgstr ""
-#: builtin/pull.c:417
+#: builtin/pull.c:423
msgid ""
"There are no candidates for merging among the refs that you just fetched."
msgstr ""
-#: builtin/pull.c:418
+#: builtin/pull.c:424
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
msgstr ""
-#: builtin/pull.c:421
+#: builtin/pull.c:427
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
"for your current branch, you must specify a branch on the command line."
msgstr ""
-#: builtin/pull.c:426 git-parse-remote.sh:73
+#: builtin/pull.c:432 builtin/rebase.c:761 git-parse-remote.sh:73
msgid "You are not currently on a branch."
msgstr ""
-#: builtin/pull.c:428 builtin/pull.c:443 git-parse-remote.sh:79
+#: builtin/pull.c:434 builtin/pull.c:449 git-parse-remote.sh:79
msgid "Please specify which branch you want to rebase against."
msgstr ""
-#: builtin/pull.c:430 builtin/pull.c:445 git-parse-remote.sh:82
+#: builtin/pull.c:436 builtin/pull.c:451 git-parse-remote.sh:82
msgid "Please specify which branch you want to merge with."
msgstr ""
-#: builtin/pull.c:431 builtin/pull.c:446
+#: builtin/pull.c:437 builtin/pull.c:452
msgid "See git-pull(1) for details."
msgstr ""
-#: builtin/pull.c:433 builtin/pull.c:439 builtin/pull.c:448
-#: git-parse-remote.sh:64
+#: builtin/pull.c:439 builtin/pull.c:445 builtin/pull.c:454
+#: builtin/rebase.c:767 git-parse-remote.sh:64
msgid "<remote>"
msgstr ""
-#: builtin/pull.c:433 builtin/pull.c:448 builtin/pull.c:453 git-rebase.sh:477
-#: git-parse-remote.sh:65
+#: builtin/pull.c:439 builtin/pull.c:454 builtin/pull.c:459
+#: git-legacy-rebase.sh:556 git-parse-remote.sh:65
msgid "<branch>"
msgstr ""
-#: builtin/pull.c:441 git-parse-remote.sh:75
+#: builtin/pull.c:447 builtin/rebase.c:759 git-parse-remote.sh:75
msgid "There is no tracking information for the current branch."
msgstr ""
-#: builtin/pull.c:450 git-parse-remote.sh:95
+#: builtin/pull.c:456 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:455
+#: builtin/pull.c:461
#, 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:819
+#: builtin/pull.c:565
+#, c-format
+msgid "unable to access commit %s"
+msgstr ""
+
+#: builtin/pull.c:843
msgid "ignoring --verify-signatures for rebase"
msgstr ""
-#: builtin/pull.c:867
+#: builtin/pull.c:891
msgid "--[no-]autostash option is only valid with --rebase."
msgstr ""
-#: builtin/pull.c:875
+#: builtin/pull.c:899
msgid "Updating an unborn branch with changes added to the index."
msgstr ""
-#: builtin/pull.c:878
+#: builtin/pull.c:902
msgid "pull with rebase"
msgstr ""
-#: builtin/pull.c:879
+#: builtin/pull.c:903
msgid "please commit or stash them."
msgstr ""
-#: builtin/pull.c:904
+#: builtin/pull.c:928
#, c-format
msgid ""
"fetch updated the current branch head.\n"
"commit %s."
msgstr ""
-#: builtin/pull.c:909
+#: builtin/pull.c:934
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
"to recover."
msgstr ""
-#: builtin/pull.c:924
+#: builtin/pull.c:949
msgid "Cannot merge multiple branches into empty head."
msgstr ""
-#: builtin/pull.c:928
+#: builtin/pull.c:953
msgid "Cannot rebase onto multiple branches."
msgstr ""
-#: builtin/pull.c:935
+#: builtin/pull.c:960
msgid "cannot rebase with locally recorded submodule modifications"
msgstr ""
-#: builtin/push.c:17
+#: builtin/push.c:19
msgid "git push [<options>] [<repository> [<refspec>...]]"
msgstr ""
-#: builtin/push.c:92
+#: builtin/push.c:111
msgid "tag shorthand without <tag>"
msgstr ""
-#: builtin/push.c:102
+#: builtin/push.c:121
msgid "--delete only accepts plain target ref names"
msgstr ""
-#: builtin/push.c:146
+#: builtin/push.c:165
msgid ""
"\n"
"To choose either option permanently, see push.default in 'git help config'."
msgstr ""
-#: builtin/push.c:149
+#: builtin/push.c:168
#, c-format
msgid ""
"The upstream branch of your current branch does not match\n"
"\n"
"To push to the branch of the same name on the remote, use\n"
"\n"
-" git push %s %s\n"
+" git push %s HEAD\n"
"%s"
msgstr ""
-#: builtin/push.c:164
+#: builtin/push.c:183
#, c-format
msgid ""
"You are not currently on a branch.\n"
" git push %s HEAD:<name-of-remote-branch>\n"
msgstr ""
-#: builtin/push.c:178
+#: builtin/push.c:197
#, c-format
msgid ""
"The current branch %s has no upstream branch.\n"
" git push --set-upstream %s %s\n"
msgstr ""
-#: builtin/push.c:186
+#: builtin/push.c:205
#, c-format
msgid "The current branch %s has multiple upstream branches, refusing to push."
msgstr ""
-#: builtin/push.c:189
+#: builtin/push.c:208
#, c-format
msgid ""
"You are pushing to remote '%s', which is not the upstream of\n"
"to update which remote branch."
msgstr ""
-#: builtin/push.c:248
+#: builtin/push.c:267
msgid ""
"You didn't specify any refspecs to push, and push.default is \"nothing\"."
msgstr ""
-#: builtin/push.c:255
+#: builtin/push.c:274
msgid ""
"Updates were rejected because the tip of your current branch is behind\n"
"its remote counterpart. Integrate the remote changes (e.g.\n"
"See the 'Note about fast-forwards' in 'git push --help' for details."
msgstr ""
-#: builtin/push.c:261
+#: builtin/push.c:280
msgid ""
"Updates were rejected because a pushed branch tip is behind its remote\n"
"counterpart. Check out this branch and integrate the remote changes\n"
"See the 'Note about fast-forwards' in 'git push --help' for details."
msgstr ""
-#: builtin/push.c:267
+#: builtin/push.c:286
msgid ""
"Updates were rejected because the remote contains work that you do\n"
"not have locally. This is usually caused by another repository pushing\n"
"See the 'Note about fast-forwards' in 'git push --help' for details."
msgstr ""
-#: builtin/push.c:274
+#: builtin/push.c:293
msgid "Updates were rejected because the tag already exists in the remote."
msgstr ""
-#: builtin/push.c:277
+#: builtin/push.c:296
msgid ""
"You cannot update a remote ref that points at a non-commit object,\n"
"or update a remote ref to make it point at a non-commit object,\n"
"without using the '--force' option.\n"
msgstr ""
-#: builtin/push.c:337
+#: builtin/push.c:357
#, c-format
msgid "Pushing to %s\n"
msgstr ""
-#: builtin/push.c:341
+#: builtin/push.c:361
#, c-format
msgid "failed to push some refs to '%s'"
msgstr ""
-#: builtin/push.c:372
+#: builtin/push.c:395
#, c-format
msgid "bad repository '%s'"
msgstr ""
-#: builtin/push.c:373
+#: builtin/push.c:396
msgid ""
"No configured push destination.\n"
"Either specify the URL from the command-line or configure a remote "
" git push <name>\n"
msgstr ""
-#: builtin/push.c:391
-msgid "--all and --tags are incompatible"
-msgstr ""
-
-#: builtin/push.c:392
-msgid "--all can't be combined with refspecs"
-msgstr ""
-
-#: builtin/push.c:397
-msgid "--mirror and --tags are incompatible"
-msgstr ""
-
-#: builtin/push.c:398
-msgid "--mirror can't be combined with refspecs"
-msgstr ""
-
-#: builtin/push.c:403
-msgid "--all and --mirror are incompatible"
-msgstr ""
-
-#: builtin/push.c:535
+#: builtin/push.c:551
msgid "repository"
msgstr ""
-#: builtin/push.c:536 builtin/send-pack.c:163
+#: builtin/push.c:552 builtin/send-pack.c:164
msgid "push all refs"
msgstr ""
-#: builtin/push.c:537 builtin/send-pack.c:165
+#: builtin/push.c:553 builtin/send-pack.c:166
msgid "mirror all refs"
msgstr ""
-#: builtin/push.c:539
+#: builtin/push.c:555
msgid "delete refs"
msgstr ""
-#: builtin/push.c:540
+#: builtin/push.c:556
msgid "push tags (can't be used with --all or --mirror)"
msgstr ""
-#: builtin/push.c:543 builtin/send-pack.c:166
+#: builtin/push.c:559 builtin/send-pack.c:167
msgid "force updates"
msgstr ""
-#: builtin/push.c:545 builtin/send-pack.c:180
-msgid "refname>:<expect"
+#: builtin/push.c:561 builtin/send-pack.c:181
+msgid "<refname>:<expect>"
msgstr ""
-#: builtin/push.c:546 builtin/send-pack.c:181
+#: builtin/push.c:562 builtin/send-pack.c:182
msgid "require old value of ref to be at this value"
msgstr ""
-#: builtin/push.c:549
+#: builtin/push.c:565
msgid "control recursive pushing of submodules"
msgstr ""
-#: builtin/push.c:551 builtin/send-pack.c:174
+#: builtin/push.c:567 builtin/send-pack.c:175
msgid "use thin pack"
msgstr ""
-#: builtin/push.c:552 builtin/push.c:553 builtin/send-pack.c:160
-#: builtin/send-pack.c:161
+#: builtin/push.c:568 builtin/push.c:569 builtin/send-pack.c:161
+#: builtin/send-pack.c:162
msgid "receive pack program"
msgstr ""
-#: builtin/push.c:554
+#: builtin/push.c:570
msgid "set upstream for git pull/status"
msgstr ""
-#: builtin/push.c:557
+#: builtin/push.c:573
msgid "prune locally removed refs"
msgstr ""
-#: builtin/push.c:559
+#: builtin/push.c:575
msgid "bypass pre-push hook"
msgstr ""
-#: builtin/push.c:560
+#: builtin/push.c:576
msgid "push missing but relevant tags"
msgstr ""
-#: builtin/push.c:563 builtin/send-pack.c:168
+#: builtin/push.c:579 builtin/send-pack.c:169
msgid "GPG sign the push"
msgstr ""
-#: builtin/push.c:565 builtin/send-pack.c:175
+#: builtin/push.c:581 builtin/send-pack.c:176
msgid "request atomic transaction on remote side"
msgstr ""
-#: builtin/push.c:566 builtin/send-pack.c:171
-msgid "server-specific"
+#: builtin/push.c:599
+msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr ""
-#: builtin/push.c:566 builtin/send-pack.c:172
-msgid "option to transmit"
+#: builtin/push.c:601
+msgid "--delete doesn't make sense without any refs"
msgstr ""
-#: builtin/push.c:583
-msgid "--delete is incompatible with --all, --mirror and --tags"
+#: builtin/push.c:604
+msgid "--all and --tags are incompatible"
msgstr ""
-#: builtin/push.c:585
-msgid "--delete doesn't make sense without any refs"
+#: builtin/push.c:606
+msgid "--all can't be combined with refspecs"
msgstr ""
-#: builtin/push.c:604
+#: builtin/push.c:610
+msgid "--mirror and --tags are incompatible"
+msgstr ""
+
+#: builtin/push.c:612
+msgid "--mirror can't be combined with refspecs"
+msgstr ""
+
+#: builtin/push.c:615
+msgid "--all and --mirror are incompatible"
+msgstr ""
+
+#: builtin/push.c:634
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:40
msgid ""
"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
msgstr ""
-#: builtin/read-tree.c:121
+#: builtin/read-tree.c:123
msgid "write resulting index to <file>"
msgstr ""
-#: builtin/read-tree.c:124
+#: builtin/read-tree.c:126
msgid "only empty the index"
msgstr ""
-#: builtin/read-tree.c:126
+#: builtin/read-tree.c:128
msgid "Merging"
msgstr ""
-#: builtin/read-tree.c:128
+#: builtin/read-tree.c:130
msgid "perform a merge in addition to a read"
msgstr ""
-#: builtin/read-tree.c:130
+#: builtin/read-tree.c:132
msgid "3-way merge if no file level merging required"
msgstr ""
-#: builtin/read-tree.c:132
+#: builtin/read-tree.c:134
msgid "3-way merge in presence of adds and removes"
msgstr ""
-#: builtin/read-tree.c:134
+#: builtin/read-tree.c:136
msgid "same as -m, but discard unmerged entries"
msgstr ""
-#: builtin/read-tree.c:135
+#: builtin/read-tree.c:137
msgid "<subdirectory>/"
msgstr ""
-#: builtin/read-tree.c:136
+#: builtin/read-tree.c:138
msgid "read the tree into the index under <subdirectory>/"
msgstr ""
-#: builtin/read-tree.c:139
+#: builtin/read-tree.c:141
msgid "update working tree with merge result"
msgstr ""
-#: builtin/read-tree.c:141
+#: builtin/read-tree.c:143
msgid "gitignore"
msgstr ""
-#: builtin/read-tree.c:142
+#: builtin/read-tree.c:144
msgid "allow explicitly ignored files to be overwritten"
msgstr ""
-#: builtin/read-tree.c:145
+#: builtin/read-tree.c:147
msgid "don't check the working tree after merging"
msgstr ""
-#: builtin/read-tree.c:146
+#: builtin/read-tree.c:148
msgid "don't update the index or the work tree"
msgstr ""
-#: builtin/read-tree.c:148
+#: builtin/read-tree.c:150
msgid "skip applying sparse checkout filter"
msgstr ""
-#: builtin/read-tree.c:150
+#: builtin/read-tree.c:152
msgid "debug unpack-trees"
msgstr ""
-#: builtin/rebase--helper.c:8
-msgid "git rebase--helper [<options>]"
-msgstr ""
-
-#: builtin/rebase--helper.c:24
-msgid "keep empty commits"
-msgstr ""
-
-#: builtin/rebase--helper.c:26 builtin/revert.c:123
-msgid "allow commits with empty messages"
+#: builtin/rebase.c:29
+msgid ""
+"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] "
+"[<branch>]"
msgstr ""
-#: builtin/rebase--helper.c:27
-msgid "continue rebase"
+#: builtin/rebase.c:31
+msgid ""
+"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]"
msgstr ""
-#: builtin/rebase--helper.c:29
-msgid "abort rebase"
+#: builtin/rebase.c:33
+msgid "git rebase --continue | --abort | --skip | --edit-todo"
msgstr ""
-#: builtin/rebase--helper.c:32
-msgid "make rebase script"
+#: builtin/rebase.c:119
+#, c-format
+msgid "%s requires an interactive rebase"
msgstr ""
-#: builtin/rebase--helper.c:34
-msgid "shorten commit ids in the todo list"
+#: builtin/rebase.c:171
+#, c-format
+msgid "could not get 'onto': '%s'"
msgstr ""
-#: builtin/rebase--helper.c:36
-msgid "expand commit ids in the todo list"
+#: builtin/rebase.c:186
+#, c-format
+msgid "invalid orig-head: '%s'"
msgstr ""
-#: builtin/rebase--helper.c:38
-msgid "check the todo list"
+#: builtin/rebase.c:214
+#, c-format
+msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
msgstr ""
-#: builtin/rebase--helper.c:40
-msgid "skip unnecessary picks"
+#: builtin/rebase.c:259
+#, c-format
+msgid "Could not read '%s'"
msgstr ""
-#: builtin/rebase--helper.c:42
-msgid "rearrange fixup/squash lines"
+#: builtin/rebase.c:277
+#, c-format
+msgid "Cannot store %s"
msgstr ""
-#: builtin/rebase--helper.c:44
-msgid "insert exec commands in todo list"
+#: builtin/rebase.c:337
+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/receive-pack.c:30
-msgid "git receive-pack <git-dir>"
+#: builtin/rebase.c:561
+msgid "could not determine HEAD revision"
msgstr ""
-#: builtin/receive-pack.c:841
+#: builtin/rebase.c:753
+#, c-format
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"
+"%s\n"
+"Please specify which branch you want to rebase against.\n"
+"See git-rebase(1) for details.\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"
+" git rebase '<branch>'\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:861
+#: builtin/rebase.c:769
+#, c-format
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"
+"If you wish to set tracking information for this branch you can do so with:\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"
+" git branch --set-upstream-to=%s/<branch> %s\n"
"\n"
-"To squelch this message, you can set it to 'refuse'."
msgstr ""
-#: builtin/receive-pack.c:1934
-msgid "quiet"
+#: builtin/rebase.c:832
+msgid "rebase onto given branch instead of upstream"
msgstr ""
-#: builtin/receive-pack.c:1948
-msgid "You must specify a directory."
+#: builtin/rebase.c:834
+msgid "allow pre-rebase hook to run"
msgstr ""
-#: builtin/reflog.c:532 builtin/reflog.c:537
-#, c-format
-msgid "'%s' is not a valid timestamp"
+#: builtin/rebase.c:836
+msgid "be quiet. implies --no-stat"
msgstr ""
-#: builtin/remote.c:13
-msgid "git remote [-v | --verbose]"
+#: builtin/rebase.c:839
+msgid "display a diffstat of what changed upstream"
msgstr ""
-#: builtin/remote.c:14
-msgid ""
-"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
-"mirror=<fetch|push>] <name> <url>"
-msgstr ""
-
-#: builtin/remote.c:15 builtin/remote.c:35
-msgid "git remote rename <old> <new>"
-msgstr ""
-
-#: builtin/remote.c:16 builtin/remote.c:40
-msgid "git remote remove <name>"
-msgstr ""
-
-#: builtin/remote.c:17 builtin/remote.c:45
-msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
+#: builtin/rebase.c:842
+msgid "do not show diffstat of what changed upstream"
msgstr ""
-#: builtin/remote.c:18
-msgid "git remote [-v | --verbose] show [-n] <name>"
+#: builtin/rebase.c:845
+msgid "add a Signed-off-by: line to each commit"
msgstr ""
-#: builtin/remote.c:19
-msgid "git remote prune [-n | --dry-run] <name>"
+#: builtin/rebase.c:847 builtin/rebase.c:851 builtin/rebase.c:853
+msgid "passed to 'git am'"
msgstr ""
-#: builtin/remote.c:20
-msgid ""
-"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
+#: builtin/rebase.c:855 builtin/rebase.c:857
+msgid "passed to 'git apply'"
msgstr ""
-#: builtin/remote.c:21
-msgid "git remote set-branches [--add] <name> <branch>..."
+#: builtin/rebase.c:859 builtin/rebase.c:862
+msgid "cherry-pick all commits, even if unchanged"
msgstr ""
-#: builtin/remote.c:22 builtin/remote.c:71
-msgid "git remote get-url [--push] [--all] <name>"
+#: builtin/rebase.c:864
+msgid "continue"
msgstr ""
-#: builtin/remote.c:23 builtin/remote.c:76
-msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
+#: builtin/rebase.c:867
+msgid "skip current patch and continue"
msgstr ""
-#: builtin/remote.c:24 builtin/remote.c:77
-msgid "git remote set-url --add <name> <newurl>"
+#: builtin/rebase.c:869
+msgid "abort and check out the original branch"
msgstr ""
-#: builtin/remote.c:25 builtin/remote.c:78
-msgid "git remote set-url --delete <name> <url>"
+#: builtin/rebase.c:872
+msgid "abort but keep HEAD where it is"
msgstr ""
-#: builtin/remote.c:30
-msgid "git remote add [<options>] <name> <url>"
+#: builtin/rebase.c:873
+msgid "edit the todo list during an interactive rebase"
msgstr ""
-#: builtin/remote.c:50
-msgid "git remote set-branches <name> <branch>..."
+#: builtin/rebase.c:876
+msgid "show the patch file being applied or merged"
msgstr ""
-#: builtin/remote.c:51
-msgid "git remote set-branches --add <name> <branch>..."
+#: builtin/rebase.c:879
+msgid "use merging strategies to rebase"
msgstr ""
-#: builtin/remote.c:56
-msgid "git remote show [<options>] <name>"
+#: builtin/rebase.c:883
+msgid "let the user edit the list of commits to rebase"
msgstr ""
-#: builtin/remote.c:61
-msgid "git remote prune [<options>] <name>"
+#: builtin/rebase.c:887
+msgid "try to recreate merges instead of ignoring them"
msgstr ""
-#: builtin/remote.c:66
-msgid "git remote update [<options>] [<group> | <remote>]..."
+#: builtin/rebase.c:891
+msgid "allow rerere to update index with resolved conflict"
msgstr ""
-#: builtin/remote.c:95
-#, c-format
-msgid "Updating %s"
+#: builtin/rebase.c:894
+msgid "preserve empty commits during rebase"
msgstr ""
-#: builtin/remote.c:127
-msgid ""
-"--mirror is dangerous and deprecated; please\n"
-"\t use --mirror=fetch or --mirror=push instead"
+#: builtin/rebase.c:896
+msgid "move commits that begin with squash!/fixup! under -i"
msgstr ""
-#: builtin/remote.c:144
-#, c-format
-msgid "unknown mirror argument: %s"
+#: builtin/rebase.c:902
+msgid "automatically stash/stash pop before and after"
msgstr ""
-#: builtin/remote.c:160
-msgid "fetch the remote branches"
+#: builtin/rebase.c:904
+msgid "add exec lines after each commit of the editable list"
msgstr ""
-#: builtin/remote.c:162
-msgid "import all tags and associated objects when fetching"
+#: builtin/rebase.c:908
+msgid "allow rebasing commits with empty messages"
msgstr ""
-#: builtin/remote.c:165
-msgid "or do not fetch any tag at all (--no-tags)"
+#: builtin/rebase.c:911
+msgid "try to rebase merges instead of skipping them"
msgstr ""
-#: builtin/remote.c:167
-msgid "branch(es) to track"
+#: builtin/rebase.c:914
+msgid "use 'merge-base --fork-point' to refine upstream"
msgstr ""
-#: builtin/remote.c:168
-msgid "master branch"
+#: builtin/rebase.c:916
+msgid "use the given merge strategy"
msgstr ""
-#: builtin/remote.c:169
-msgid "push|fetch"
+#: builtin/rebase.c:918 builtin/revert.c:111
+msgid "option"
msgstr ""
-#: builtin/remote.c:170
-msgid "set up remote as a mirror to push to or fetch from"
+#: builtin/rebase.c:919
+msgid "pass the argument through to the merge strategy"
msgstr ""
-#: builtin/remote.c:182
-msgid "specifying a master branch makes no sense with --mirror"
+#: builtin/rebase.c:922
+msgid "rebase all reachable commits up to the root(s)"
msgstr ""
-#: builtin/remote.c:184
-msgid "specifying branches to track makes sense only with fetch mirrors"
+#: builtin/rebase.c:938
+#, c-format
+msgid "could not exec %s"
msgstr ""
-#: builtin/remote.c:191 builtin/remote.c:631
-#, c-format
-msgid "remote %s already exists."
+#: builtin/rebase.c:956 git-legacy-rebase.sh:213
+msgid "It looks like 'git am' is in progress. Cannot rebase."
msgstr ""
-#: builtin/remote.c:195 builtin/remote.c:635
-#, c-format
-msgid "'%s' is not a valid remote name"
+#: builtin/rebase.c:997 git-legacy-rebase.sh:395
+msgid "No rebase in progress?"
msgstr ""
-#: builtin/remote.c:235
-#, c-format
-msgid "Could not setup master '%s'"
+#: builtin/rebase.c:1001 git-legacy-rebase.sh:406
+msgid "The --edit-todo action can only be used during interactive rebase."
msgstr ""
-#: builtin/remote.c:337
-#, c-format
-msgid "Could not get fetch map for refspec %s"
+#: builtin/rebase.c:1015 git-legacy-rebase.sh:413
+msgid "Cannot read HEAD"
msgstr ""
-#: builtin/remote.c:438 builtin/remote.c:446
-msgid "(matching)"
+#: builtin/rebase.c:1028 git-legacy-rebase.sh:416
+msgid ""
+"You must edit all merge conflicts and then\n"
+"mark them as resolved using git add"
msgstr ""
-#: builtin/remote.c:450
-msgid "(delete)"
+#: builtin/rebase.c:1047
+msgid "could not discard worktree changes"
msgstr ""
-#: builtin/remote.c:624 builtin/remote.c:759 builtin/remote.c:858
+#: builtin/rebase.c:1066
#, c-format
-msgid "No such remote: %s"
+msgid "could not move back to %s"
msgstr ""
-#: builtin/remote.c:641
+#: builtin/rebase.c:1077 builtin/rm.c:368
#, c-format
-msgid "Could not rename config section '%s' to '%s'"
+msgid "could not remove '%s'"
msgstr ""
-#: builtin/remote.c:661
+#: builtin/rebase.c:1103
#, c-format
msgid ""
-"Not updating non-default fetch refspec\n"
+"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"
-"\tPlease update the configuration manually if necessary."
+"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/remote.c:697
-#, c-format
-msgid "deleting '%s' failed"
+#: builtin/rebase.c:1124
+msgid "switch `C' expects a numerical value"
msgstr ""
-#: builtin/remote.c:731
+#: builtin/rebase.c:1161
#, c-format
-msgid "creating '%s' failed"
+msgid "Unknown mode: %s"
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/rebase.c:1183
+msgid "--strategy requires --merge or --interactive"
+msgstr ""
-#: builtin/remote.c:810
+#: builtin/rebase.c:1226
#, c-format
-msgid "Could not remove config section '%s'"
+msgid ""
+"error: cannot combine interactive options (--interactive, --exec, --rebase-"
+"merges, --preserve-merges, --keep-empty, --root + --onto) with am options "
+"(%s)"
msgstr ""
-#: builtin/remote.c:911
+#: builtin/rebase.c:1231
#, c-format
-msgid " new (next fetch will store in remotes/%s)"
+msgid ""
+"error: cannot combine merge options (--merge, --strategy, --strategy-option) "
+"with am options (%s)"
msgstr ""
-#: builtin/remote.c:914
-msgid " tracked"
+#: builtin/rebase.c:1251 git-legacy-rebase.sh:536
+msgid "error: cannot combine '--preserve-merges' with '--rebase-merges'"
msgstr ""
-#: builtin/remote.c:916
-msgid " stale (use 'git remote prune' to remove)"
+#: builtin/rebase.c:1256 git-legacy-rebase.sh:542
+msgid "error: cannot combine '--rebase-merges' with '--strategy-option'"
msgstr ""
-#: builtin/remote.c:918
-msgid " ???"
+#: builtin/rebase.c:1259 git-legacy-rebase.sh:544
+msgid "error: cannot combine '--rebase-merges' with '--strategy'"
msgstr ""
-#: builtin/remote.c:959
+#: builtin/rebase.c:1283
#, c-format
-msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
+msgid "invalid upstream '%s'"
msgstr ""
-#: builtin/remote.c:967
-#, c-format
-msgid "rebases interactively onto remote %s"
+#: builtin/rebase.c:1289
+msgid "Could not create new root commit"
msgstr ""
-#: builtin/remote.c:968
+#: builtin/rebase.c:1307
#, c-format
-msgid "rebases onto remote %s"
+msgid "'%s': need exactly one merge base"
msgstr ""
-#: builtin/remote.c:971
+#: builtin/rebase.c:1314
#, c-format
-msgid " merges with remote %s"
+msgid "Does not point to a valid commit '%s'"
msgstr ""
-#: builtin/remote.c:974
+#: builtin/rebase.c:1339
#, c-format
-msgid "merges with remote %s"
+msgid "fatal: no such branch/commit '%s'"
msgstr ""
-#: builtin/remote.c:977
+#: builtin/rebase.c:1347 builtin/submodule--helper.c:37
+#: builtin/submodule--helper.c:1930
#, c-format
-msgid "%-*s and with remote %s\n"
-msgstr ""
-
-#: builtin/remote.c:1020
-msgid "create"
-msgstr ""
-
-#: builtin/remote.c:1023
-msgid "delete"
-msgstr ""
-
-#: builtin/remote.c:1027
-msgid "up to date"
-msgstr ""
-
-#: builtin/remote.c:1030
-msgid "fast-forwardable"
+msgid "No such ref: %s"
msgstr ""
-#: builtin/remote.c:1033
-msgid "local out of date"
+#: builtin/rebase.c:1359
+msgid "Could not resolve HEAD to a revision"
msgstr ""
-#: builtin/remote.c:1040
-#, c-format
-msgid " %-*s forces to %-*s (%s)"
+#: builtin/rebase.c:1399 git-legacy-rebase.sh:665
+msgid "Cannot autostash"
msgstr ""
-#: builtin/remote.c:1043
+#: builtin/rebase.c:1402
#, c-format
-msgid " %-*s pushes to %-*s (%s)"
+msgid "Unexpected stash response: '%s'"
msgstr ""
-#: builtin/remote.c:1047
+#: builtin/rebase.c:1408
#, c-format
-msgid " %-*s forces to %s"
+msgid "Could not create directory for '%s'"
msgstr ""
-#: builtin/remote.c:1050
+#: builtin/rebase.c:1411
#, c-format
-msgid " %-*s pushes to %s"
-msgstr ""
-
-#: builtin/remote.c:1118
-msgid "do not query remotes"
+msgid "Created autostash: %s\n"
msgstr ""
-#: builtin/remote.c:1145
-#, c-format
-msgid "* remote %s"
+#: builtin/rebase.c:1414
+msgid "could not reset --hard"
msgstr ""
-#: builtin/remote.c:1146
+#: builtin/rebase.c:1415 builtin/reset.c:113
#, c-format
-msgid " Fetch URL: %s"
+msgid "HEAD is now at %s"
msgstr ""
-#: builtin/remote.c:1147 builtin/remote.c:1163 builtin/remote.c:1302
-msgid "(no URL)"
+#: builtin/rebase.c:1431 git-legacy-rebase.sh:674
+msgid "Please commit or stash them."
msgstr ""
-#. TRANSLATORS: the colon ':' should align
-#. with the one in " Fetch URL: %s"
-#. translation.
-#.
-#: builtin/remote.c:1161 builtin/remote.c:1163
+#: builtin/rebase.c:1458
#, c-format
-msgid " Push URL: %s"
+msgid "could not parse '%s'"
msgstr ""
-#: builtin/remote.c:1165 builtin/remote.c:1167 builtin/remote.c:1169
+#: builtin/rebase.c:1470
#, c-format
-msgid " HEAD branch: %s"
-msgstr ""
-
-#: builtin/remote.c:1165
-msgid "(not queried)"
-msgstr ""
-
-#: builtin/remote.c:1167
-msgid "(unknown)"
+msgid "could not switch to %s"
msgstr ""
-#: builtin/remote.c:1171
-#, c-format
-msgid ""
-" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
+#: builtin/rebase.c:1481 git-legacy-rebase.sh:697
+#, sh-format
+msgid "HEAD is up to date."
msgstr ""
-#: builtin/remote.c:1183
+#: builtin/rebase.c:1483
#, c-format
-msgid " Remote branch:%s"
-msgid_plural " Remote branches:%s"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/remote.c:1186 builtin/remote.c:1212
-msgid " (status not queried)"
+msgid "Current branch %s is up to date.\n"
msgstr ""
-#: builtin/remote.c:1195
-msgid " Local branch configured for 'git pull':"
-msgid_plural " Local branches configured for 'git pull':"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/remote.c:1203
-msgid " Local refs will be mirrored by 'git push'"
+#: builtin/rebase.c:1491 git-legacy-rebase.sh:707
+#, sh-format
+msgid "HEAD is up to date, rebase forced."
msgstr ""
-#: builtin/remote.c:1209
+#: builtin/rebase.c:1493
#, 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:1230
-msgid "set refs/remotes/<name>/HEAD according to remote"
-msgstr ""
-
-#: builtin/remote.c:1232
-msgid "delete refs/remotes/<name>/HEAD"
+msgid "Current branch %s is up to date, rebase forced.\n"
msgstr ""
-#: builtin/remote.c:1247
-msgid "Cannot determine remote HEAD"
+#: builtin/rebase.c:1501 git-legacy-rebase.sh:208
+msgid "The pre-rebase hook refused to rebase."
msgstr ""
-#: builtin/remote.c:1249
-msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
+#: builtin/rebase.c:1508
+#, c-format
+msgid "Changes to %s:\n"
msgstr ""
-#: builtin/remote.c:1259
+#: builtin/rebase.c:1511
#, c-format
-msgid "Could not delete %s"
+msgid "Changes from %s to %s:\n"
msgstr ""
-#: builtin/remote.c:1267
+#: builtin/rebase.c:1536
#, c-format
-msgid "Not a valid ref: %s"
+msgid "First, rewinding head to replay your work on top of it...\n"
msgstr ""
-#: builtin/remote.c:1269
-#, c-format
-msgid "Could not setup %s"
+#: builtin/rebase.c:1543
+msgid "Could not detach HEAD"
msgstr ""
-#: builtin/remote.c:1287
+#: builtin/rebase.c:1552
#, c-format
-msgid " %s will become dangling!"
+msgid "Fast-forwarded %s to %s.\n"
msgstr ""
-#: builtin/remote.c:1288
-#, c-format
-msgid " %s has become dangling!"
+#: builtin/rebase--interactive.c:24
+msgid "no HEAD?"
msgstr ""
-#: builtin/remote.c:1298
+#: builtin/rebase--interactive.c:51
#, c-format
-msgid "Pruning %s"
+msgid "could not create temporary %s"
msgstr ""
-#: builtin/remote.c:1299
-#, c-format
-msgid "URL: %s"
+#: builtin/rebase--interactive.c:57
+msgid "could not mark as interactive"
msgstr ""
-#: builtin/remote.c:1315
+#: builtin/rebase--interactive.c:101
#, c-format
-msgid " * [would prune] %s"
+msgid "could not open %s"
msgstr ""
-#: builtin/remote.c:1318
-#, c-format
-msgid " * [pruned] %s"
+#: builtin/rebase--interactive.c:114
+msgid "could not generate todo list"
msgstr ""
-#: builtin/remote.c:1363
-msgid "prune remotes after fetching"
+#: builtin/rebase--interactive.c:129
+msgid "git rebase--interactive [<options>]"
msgstr ""
-#: builtin/remote.c:1426 builtin/remote.c:1480 builtin/remote.c:1548
-#, c-format
-msgid "No such remote '%s'"
+#: builtin/rebase--interactive.c:148
+msgid "keep empty commits"
msgstr ""
-#: builtin/remote.c:1442
-msgid "add branch"
+#: builtin/rebase--interactive.c:150 builtin/revert.c:124
+msgid "allow commits with empty messages"
msgstr ""
-#: builtin/remote.c:1449
-msgid "no remote specified"
+#: builtin/rebase--interactive.c:151
+msgid "rebase merge commits"
msgstr ""
-#: builtin/remote.c:1466
-msgid "query push URLs rather than fetch URLs"
+#: builtin/rebase--interactive.c:153
+msgid "keep original branch points of cousins"
msgstr ""
-#: builtin/remote.c:1468
-msgid "return all URLs"
+#: builtin/rebase--interactive.c:155
+msgid "move commits that begin with squash!/fixup!"
msgstr ""
-#: builtin/remote.c:1496
-#, c-format
-msgid "no URLs configured for remote '%s'"
+#: builtin/rebase--interactive.c:156
+msgid "sign commits"
msgstr ""
-#: builtin/remote.c:1522
-msgid "manipulate push URLs"
+#: builtin/rebase--interactive.c:158
+msgid "continue rebase"
msgstr ""
-#: builtin/remote.c:1524
-msgid "add URL"
+#: builtin/rebase--interactive.c:160
+msgid "skip commit"
msgstr ""
-#: builtin/remote.c:1526
-msgid "delete URLs"
+#: builtin/rebase--interactive.c:161
+msgid "edit the todo list"
msgstr ""
-#: builtin/remote.c:1533
-msgid "--add --delete doesn't make sense"
+#: builtin/rebase--interactive.c:163
+msgid "show the current patch"
msgstr ""
-#: builtin/remote.c:1572
-#, c-format
-msgid "Invalid old URL pattern: %s"
+#: builtin/rebase--interactive.c:166
+msgid "shorten commit ids in the todo list"
msgstr ""
-#: builtin/remote.c:1580
-#, c-format
-msgid "No such URL found: %s"
+#: builtin/rebase--interactive.c:168
+msgid "expand commit ids in the todo list"
msgstr ""
-#: builtin/remote.c:1582
-msgid "Will not delete all non-push URLs"
+#: builtin/rebase--interactive.c:170
+msgid "check the todo list"
msgstr ""
-#: builtin/remote.c:1598
-msgid "be verbose; must be placed before a subcommand"
+#: builtin/rebase--interactive.c:172
+msgid "rearrange fixup/squash lines"
msgstr ""
-#: builtin/remote.c:1629
-#, c-format
-msgid "Unknown subcommand: %s"
+#: builtin/rebase--interactive.c:174
+msgid "insert exec commands in todo list"
msgstr ""
-#: builtin/repack.c:18
-msgid "git repack [<options>]"
+#: builtin/rebase--interactive.c:175
+msgid "onto"
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/rebase--interactive.c:177
+msgid "restrict-revision"
msgstr ""
-#: builtin/repack.c:170
-msgid "pack everything in a single pack"
+#: builtin/rebase--interactive.c:177
+msgid "restrict revision"
msgstr ""
-#: builtin/repack.c:172
-msgid "same as -a, and turn unreachable objects loose"
+#: builtin/rebase--interactive.c:178
+msgid "squash-onto"
msgstr ""
-#: builtin/repack.c:175
-msgid "remove redundant packs, and run git-prune-packed"
+#: builtin/rebase--interactive.c:179
+msgid "squash onto"
msgstr ""
-#: builtin/repack.c:177
-msgid "pass --no-reuse-delta to git-pack-objects"
+#: builtin/rebase--interactive.c:181
+msgid "the upstream commit"
msgstr ""
-#: builtin/repack.c:179
-msgid "pass --no-reuse-object to git-pack-objects"
+#: builtin/rebase--interactive.c:182
+msgid "head-name"
msgstr ""
-#: builtin/repack.c:181
-msgid "do not run git-update-server-info"
+#: builtin/rebase--interactive.c:182
+msgid "head name"
msgstr ""
-#: builtin/repack.c:184
-msgid "pass --local to git-pack-objects"
+#: builtin/rebase--interactive.c:187
+msgid "rebase strategy"
msgstr ""
-#: builtin/repack.c:186
-msgid "write bitmap index"
+#: builtin/rebase--interactive.c:188
+msgid "strategy-opts"
msgstr ""
-#: builtin/repack.c:187
-msgid "approxidate"
+#: builtin/rebase--interactive.c:189
+msgid "strategy options"
msgstr ""
-#: builtin/repack.c:188
-msgid "with -A, do not loosen objects older than this"
+#: builtin/rebase--interactive.c:190
+msgid "switch-to"
msgstr ""
-#: builtin/repack.c:190
-msgid "with -a, repack unreachable objects"
+#: builtin/rebase--interactive.c:191
+msgid "the branch or commit to checkout"
msgstr ""
-#: builtin/repack.c:192
-msgid "size of the window used for delta compression"
+#: builtin/rebase--interactive.c:192
+msgid "onto-name"
msgstr ""
-#: builtin/repack.c:193 builtin/repack.c:199
-msgid "bytes"
+#: builtin/rebase--interactive.c:192
+msgid "onto name"
msgstr ""
-#: builtin/repack.c:194
-msgid "same as the above, but limit memory size instead of entries count"
+#: builtin/rebase--interactive.c:193
+msgid "cmd"
msgstr ""
-#: builtin/repack.c:196
-msgid "limits the maximum delta depth"
+#: builtin/rebase--interactive.c:193
+msgid "the command to run"
msgstr ""
-#: builtin/repack.c:198
-msgid "limits the maximum number of threads"
+#: builtin/rebase--interactive.c:220
+msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
msgstr ""
-#: builtin/repack.c:200
-msgid "maximum size of each packfile"
+#: builtin/rebase--interactive.c:226
+msgid "a base commit must be provided with --upstream or --onto"
msgstr ""
-#: builtin/repack.c:202
-msgid "repack objects in packs marked with .keep"
+#: builtin/receive-pack.c:33
+msgid "git receive-pack <git-dir>"
msgstr ""
-#: builtin/repack.c:212
-msgid "cannot delete packs in a precious-objects repo"
+#: 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/repack.c:216
-msgid "--keep-unreachable and -A are incompatible"
+#: 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/repack.c:410 builtin/worktree.c:148
-#, c-format
-msgid "failed to remove '%s'"
+#: builtin/receive-pack.c:1929
+msgid "quiet"
msgstr ""
-#: builtin/replace.c:20
-msgid "git replace [-f] <object> <replacement>"
+#: builtin/receive-pack.c:1943
+msgid "You must specify a directory."
msgstr ""
-#: builtin/replace.c:21
-msgid "git replace [-f] --edit <object>"
+#: builtin/reflog.c:563 builtin/reflog.c:568
+#, c-format
+msgid "'%s' is not a valid timestamp"
msgstr ""
-#: builtin/replace.c:22
-msgid "git replace [-f] --graft <commit> [<parent>...]"
+#: builtin/remote.c:16
+msgid "git remote [-v | --verbose]"
msgstr ""
-#: builtin/replace.c:23
-msgid "git replace -d <object>..."
+#: builtin/remote.c:17
+msgid ""
+"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
+"mirror=<fetch|push>] <name> <url>"
msgstr ""
-#: builtin/replace.c:24
-msgid "git replace [--format=<format>] [-l [<pattern>]]"
+#: builtin/remote.c:18 builtin/remote.c:38
+msgid "git remote rename <old> <new>"
msgstr ""
-#: builtin/replace.c:331 builtin/replace.c:369 builtin/replace.c:397
-#, c-format
-msgid "Not a valid object name: '%s'"
+#: builtin/remote.c:19 builtin/remote.c:43
+msgid "git remote remove <name>"
msgstr ""
-#: builtin/replace.c:361
-#, c-format
-msgid "bad mergetag in commit '%s'"
+#: builtin/remote.c:20 builtin/remote.c:48
+msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
msgstr ""
-#: builtin/replace.c:363
-#, c-format
-msgid "malformed mergetag in commit '%s'"
+#: builtin/remote.c:21
+msgid "git remote [-v | --verbose] show [-n] <name>"
msgstr ""
-#: builtin/replace.c:374
-#, c-format
+#: builtin/remote.c:22
+msgid "git remote prune [-n | --dry-run] <name>"
+msgstr ""
+
+#: builtin/remote.c:23
msgid ""
-"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
-"instead of --graft"
+"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
msgstr ""
-#: builtin/replace.c:407
-#, c-format
-msgid "the original commit '%s' has a gpg signature."
+#: builtin/remote.c:24
+msgid "git remote set-branches [--add] <name> <branch>..."
msgstr ""
-#: builtin/replace.c:408
-msgid "the signature will be removed in the replacement commit!"
+#: builtin/remote.c:25 builtin/remote.c:74
+msgid "git remote get-url [--push] [--all] <name>"
msgstr ""
-#: builtin/replace.c:414
-#, c-format
-msgid "could not write replacement commit for: '%s'"
+#: builtin/remote.c:26 builtin/remote.c:79
+msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
msgstr ""
-#: builtin/replace.c:438
-msgid "list replace refs"
+#: builtin/remote.c:27 builtin/remote.c:80
+msgid "git remote set-url --add <name> <newurl>"
msgstr ""
-#: builtin/replace.c:439
-msgid "delete replace refs"
+#: builtin/remote.c:28 builtin/remote.c:81
+msgid "git remote set-url --delete <name> <url>"
msgstr ""
-#: builtin/replace.c:440
-msgid "edit existing object"
+#: builtin/remote.c:33
+msgid "git remote add [<options>] <name> <url>"
msgstr ""
-#: builtin/replace.c:441
-msgid "change a commit's parents"
+#: builtin/remote.c:53
+msgid "git remote set-branches <name> <branch>..."
msgstr ""
-#: builtin/replace.c:442
-msgid "replace the ref if it exists"
+#: builtin/remote.c:54
+msgid "git remote set-branches --add <name> <branch>..."
msgstr ""
-#: builtin/replace.c:444
-msgid "do not pretty-print contents for --edit"
+#: builtin/remote.c:59
+msgid "git remote show [<options>] <name>"
msgstr ""
-#: builtin/replace.c:445
-msgid "use this format"
+#: builtin/remote.c:64
+msgid "git remote prune [<options>] <name>"
msgstr ""
-#: builtin/rerere.c:13
-msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
+#: builtin/remote.c:69
+msgid "git remote update [<options>] [<group> | <remote>]..."
msgstr ""
-#: builtin/rerere.c:59
-msgid "register clean resolutions in index"
+#: builtin/remote.c:98
+#, c-format
+msgid "Updating %s"
msgstr ""
-#: builtin/reset.c:29
+#: builtin/remote.c:130
msgid ""
-"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
+"--mirror is dangerous and deprecated; please\n"
+"\t use --mirror=fetch or --mirror=push instead"
msgstr ""
-#: builtin/reset.c:30
-msgid "git reset [-q] [<tree-ish>] [--] <paths>..."
+#: builtin/remote.c:147
+#, c-format
+msgid "unknown mirror argument: %s"
msgstr ""
-#: builtin/reset.c:31
-msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
+#: builtin/remote.c:163
+msgid "fetch the remote branches"
msgstr ""
-#: builtin/reset.c:37
-msgid "mixed"
+#: builtin/remote.c:165
+msgid "import all tags and associated objects when fetching"
msgstr ""
-#: builtin/reset.c:37
-msgid "soft"
+#: builtin/remote.c:168
+msgid "or do not fetch any tag at all (--no-tags)"
msgstr ""
-#: builtin/reset.c:37
-msgid "hard"
+#: builtin/remote.c:170
+msgid "branch(es) to track"
msgstr ""
-#: builtin/reset.c:37
-msgid "merge"
+#: builtin/remote.c:171
+msgid "master branch"
msgstr ""
-#: builtin/reset.c:37
-msgid "keep"
+#: builtin/remote.c:173
+msgid "set up remote as a mirror to push to or fetch from"
msgstr ""
-#: builtin/reset.c:78
-msgid "You do not have a valid HEAD."
+#: builtin/remote.c:185
+msgid "specifying a master branch makes no sense with --mirror"
msgstr ""
-#: builtin/reset.c:80
-msgid "Failed to find tree of HEAD."
+#: builtin/remote.c:187
+msgid "specifying branches to track makes sense only with fetch mirrors"
msgstr ""
-#: builtin/reset.c:86
+#: builtin/remote.c:194 builtin/remote.c:636
#, c-format
-msgid "Failed to find tree of %s."
+msgid "remote %s already exists."
msgstr ""
-#: builtin/reset.c:111
+#: builtin/remote.c:198 builtin/remote.c:640
#, c-format
-msgid "HEAD is now at %s"
+msgid "'%s' is not a valid remote name"
msgstr ""
-#: builtin/reset.c:189
+#: builtin/remote.c:238
#, c-format
-msgid "Cannot do a %s reset in the middle of a merge."
-msgstr ""
-
-#: builtin/reset.c:289
-msgid "be quiet, only report errors"
+msgid "Could not setup master '%s'"
msgstr ""
-#: builtin/reset.c:291
-msgid "reset HEAD and index"
+#: builtin/remote.c:344
+#, c-format
+msgid "Could not get fetch map for refspec %s"
msgstr ""
-#: builtin/reset.c:292
-msgid "reset only HEAD"
+#: builtin/remote.c:443 builtin/remote.c:451
+msgid "(matching)"
msgstr ""
-#: builtin/reset.c:294 builtin/reset.c:296
-msgid "reset HEAD, index and working tree"
+#: builtin/remote.c:455
+msgid "(delete)"
msgstr ""
-#: builtin/reset.c:298
-msgid "reset HEAD but keep local changes"
+#: builtin/remote.c:629 builtin/remote.c:765 builtin/remote.c:864
+#, c-format
+msgid "No such remote: '%s'"
msgstr ""
-#: builtin/reset.c:304
-msgid "record only the fact that removed paths will be added later"
+#: builtin/remote.c:646
+#, c-format
+msgid "Could not rename config section '%s' to '%s'"
msgstr ""
-#: builtin/reset.c:321
+#: builtin/remote.c:666
#, c-format
-msgid "Failed to resolve '%s' as a valid revision."
+msgid ""
+"Not updating non-default fetch refspec\n"
+"\t%s\n"
+"\tPlease update the configuration manually if necessary."
msgstr ""
-#: builtin/reset.c:329
+#: builtin/remote.c:702
#, c-format
-msgid "Failed to resolve '%s' as a valid tree."
+msgid "deleting '%s' failed"
msgstr ""
-#: builtin/reset.c:338
-msgid "--patch is incompatible with --{hard,mixed,soft}"
+#: builtin/remote.c:736
+#, c-format
+msgid "creating '%s' failed"
msgstr ""
-#: builtin/reset.c:347
-msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
-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/reset.c:349
+#: builtin/remote.c:816
#, c-format
-msgid "Cannot do %s reset with paths."
+msgid "Could not remove config section '%s'"
msgstr ""
-#: builtin/reset.c:359
+#: builtin/remote.c:917
#, c-format
-msgid "%s reset is not allowed in a bare repository"
-msgstr ""
-
-#: builtin/reset.c:363
-msgid "-N can only be used with --mixed"
+msgid " new (next fetch will store in remotes/%s)"
msgstr ""
-#: builtin/reset.c:380
-msgid "Unstaged changes after reset:"
+#: builtin/remote.c:920
+msgid " tracked"
msgstr ""
-#: builtin/reset.c:386
-#, c-format
-msgid "Could not reset index file to revision '%s'."
+#: builtin/remote.c:922
+msgid " stale (use 'git remote prune' to remove)"
msgstr ""
-#: builtin/reset.c:390
-msgid "Could not write new index file."
+#: builtin/remote.c:924
+msgid " ???"
msgstr ""
-#: builtin/rev-list.c:397
-msgid "cannot combine --exclude-promisor-objects and --missing"
+#: builtin/remote.c:965
+#, c-format
+msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
msgstr ""
-#: builtin/rev-list.c:455
-msgid "object filtering requires --objects"
+#: builtin/remote.c:974
+#, c-format
+msgid "rebases interactively onto remote %s"
msgstr ""
-#: builtin/rev-list.c:458
+#: builtin/remote.c:976
#, c-format
-msgid "invalid sparse value '%s'"
+msgid "rebases interactively (with merges) onto remote %s"
msgstr ""
-#: builtin/rev-list.c:499
-msgid "rev-list does not support display of notes"
+#: builtin/remote.c:979
+#, c-format
+msgid "rebases onto remote %s"
msgstr ""
-#: builtin/rev-list.c:502
-msgid "cannot combine --use-bitmap-index with object filtering"
+#: builtin/remote.c:983
+#, c-format
+msgid " merges with remote %s"
msgstr ""
-#: builtin/rev-parse.c:402
-msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
+#: builtin/remote.c:986
+#, c-format
+msgid "merges with remote %s"
msgstr ""
-#: builtin/rev-parse.c:407
-msgid "keep the `--` passed as an arg"
+#: builtin/remote.c:989
+#, c-format
+msgid "%-*s and with remote %s\n"
msgstr ""
-#: builtin/rev-parse.c:409
-msgid "stop parsing after the first non-option argument"
+#: builtin/remote.c:1032
+msgid "create"
msgstr ""
-#: builtin/rev-parse.c:412
-msgid "output in stuck long form"
+#: builtin/remote.c:1035
+msgid "delete"
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/remote.c:1039
+msgid "up to date"
msgstr ""
-#: builtin/revert.c:23
-msgid "git revert [<options>] <commit-ish>..."
+#: builtin/remote.c:1042
+msgid "fast-forwardable"
msgstr ""
-#: builtin/revert.c:24
-msgid "git revert <subcommand>"
+#: builtin/remote.c:1045
+msgid "local out of date"
msgstr ""
-#: builtin/revert.c:29
-msgid "git cherry-pick [<options>] <commit-ish>..."
+#: builtin/remote.c:1052
+#, c-format
+msgid " %-*s forces to %-*s (%s)"
msgstr ""
-#: builtin/revert.c:30
-msgid "git cherry-pick <subcommand>"
+#: builtin/remote.c:1055
+#, c-format
+msgid " %-*s pushes to %-*s (%s)"
msgstr ""
-#: builtin/revert.c:90
+#: builtin/remote.c:1059
#, c-format
-msgid "%s: %s cannot be used with %s"
+msgid " %-*s forces to %s"
msgstr ""
-#: builtin/revert.c:99
-msgid "end revert or cherry-pick sequence"
+#: builtin/remote.c:1062
+#, c-format
+msgid " %-*s pushes to %s"
msgstr ""
-#: builtin/revert.c:100
-msgid "resume revert or cherry-pick sequence"
+#: builtin/remote.c:1130
+msgid "do not query remotes"
msgstr ""
-#: builtin/revert.c:101
-msgid "cancel revert or cherry-pick sequence"
+#: builtin/remote.c:1157
+#, c-format
+msgid "* remote %s"
msgstr ""
-#: builtin/revert.c:102
-msgid "don't automatically commit"
+#: builtin/remote.c:1158
+#, c-format
+msgid " Fetch URL: %s"
msgstr ""
-#: builtin/revert.c:103
-msgid "edit the commit message"
+#: builtin/remote.c:1159 builtin/remote.c:1175 builtin/remote.c:1314
+msgid "(no URL)"
msgstr ""
-#: builtin/revert.c:106
-msgid "parent-number"
+#. 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/revert.c:107
-msgid "select mainline parent"
+#: builtin/remote.c:1177 builtin/remote.c:1179 builtin/remote.c:1181
+#, c-format
+msgid " HEAD branch: %s"
msgstr ""
-#: builtin/revert.c:109
-msgid "merge strategy"
+#: builtin/remote.c:1177
+msgid "(not queried)"
msgstr ""
-#: builtin/revert.c:110
-msgid "option"
+#: builtin/remote.c:1179
+msgid "(unknown)"
msgstr ""
-#: builtin/revert.c:111
-msgid "option for merge strategy"
+#: builtin/remote.c:1183
+#, c-format
+msgid ""
+" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
msgstr ""
-#: builtin/revert.c:120
-msgid "append commit name"
-msgstr ""
+#: builtin/remote.c:1195
+#, c-format
+msgid " Remote branch:%s"
+msgid_plural " Remote branches:%s"
+msgstr[0] ""
+msgstr[1] ""
-#: builtin/revert.c:122
-msgid "preserve initially empty commits"
+#: builtin/remote.c:1198 builtin/remote.c:1224
+msgid " (status not queried)"
msgstr ""
-#: builtin/revert.c:124
-msgid "keep redundant, empty commits"
-msgstr ""
-
-#: builtin/revert.c:214
-msgid "revert failed"
-msgstr ""
-
-#: builtin/revert.c:227
-msgid "cherry-pick failed"
-msgstr ""
-
-#: builtin/rm.c:18
-msgid "git rm [<options>] [--] <file>..."
-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:"
+#: builtin/remote.c:1207
+msgid " Local branch configured for 'git pull':"
+msgid_plural " Local branches configured for 'git pull':"
msgstr[0] ""
msgstr[1] ""
-#: builtin/rm.c:211
-msgid ""
-"\n"
-"(use -f to force removal)"
+#: builtin/remote.c:1215
+msgid " Local refs will be mirrored by 'git push'"
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:"
+#: 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/rm.c:219 builtin/rm.c:228
-msgid ""
-"\n"
-"(use --cached to keep the file, or -f to force removal)"
+#: builtin/remote.c:1242
+msgid "set refs/remotes/<name>/HEAD according to remote"
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/remote.c:1244
+msgid "delete refs/remotes/<name>/HEAD"
+msgstr ""
-#: builtin/rm.c:243
-msgid "do not list removed files"
+#: builtin/remote.c:1259
+msgid "Cannot determine remote HEAD"
msgstr ""
-#: builtin/rm.c:244
-msgid "only remove from the index"
+#: builtin/remote.c:1261
+msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr ""
-#: builtin/rm.c:245
-msgid "override the up-to-date check"
+#: builtin/remote.c:1271
+#, c-format
+msgid "Could not delete %s"
msgstr ""
-#: builtin/rm.c:246
-msgid "allow recursive removal"
+#: builtin/remote.c:1279
+#, c-format
+msgid "Not a valid ref: %s"
msgstr ""
-#: builtin/rm.c:248
-msgid "exit with a zero status even if nothing matched"
+#: builtin/remote.c:1281
+#, c-format
+msgid "Could not setup %s"
msgstr ""
-#: builtin/rm.c:307
+#: builtin/remote.c:1299
#, c-format
-msgid "not removing '%s' recursively without -r"
+msgid " %s will become dangling!"
msgstr ""
-#: builtin/rm.c:346
+#: builtin/remote.c:1300
#, c-format
-msgid "git rm: unable to remove %s"
+msgid " %s has become dangling!"
msgstr ""
-#: builtin/rm.c:369
+#: builtin/remote.c:1310
#, c-format
-msgid "could not remove '%s'"
+msgid "Pruning %s"
msgstr ""
-#: builtin/send-pack.c:19
-msgid ""
-"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
-"receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
-"[<ref>...]\n"
-" --all and explicit <ref> specification are mutually exclusive."
+#: builtin/remote.c:1311
+#, c-format
+msgid "URL: %s"
msgstr ""
-#: builtin/send-pack.c:162
-msgid "remote name"
+#: builtin/remote.c:1327
+#, c-format
+msgid " * [would prune] %s"
msgstr ""
-#: builtin/send-pack.c:176
-msgid "use stateless RPC protocol"
+#: builtin/remote.c:1330
+#, c-format
+msgid " * [pruned] %s"
msgstr ""
-#: builtin/send-pack.c:177
-msgid "read refs from stdin"
+#: builtin/remote.c:1375
+msgid "prune remotes after fetching"
msgstr ""
-#: builtin/send-pack.c:178
-msgid "print status from remote helper"
+#: builtin/remote.c:1438 builtin/remote.c:1492 builtin/remote.c:1560
+#, c-format
+msgid "No such remote '%s'"
msgstr ""
-#: builtin/shortlog.c:14
-msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
+#: builtin/remote.c:1454
+msgid "add branch"
msgstr ""
-#: builtin/shortlog.c:263
-msgid "Group by committer rather than author"
+#: builtin/remote.c:1461
+msgid "no remote specified"
msgstr ""
-#: builtin/shortlog.c:265
-msgid "sort output according to the number of commits per author"
+#: builtin/remote.c:1478
+msgid "query push URLs rather than fetch URLs"
msgstr ""
-#: builtin/shortlog.c:267
-msgid "Suppress commit descriptions, only provides commit count"
+#: builtin/remote.c:1480
+msgid "return all URLs"
msgstr ""
-#: builtin/shortlog.c:269
-msgid "Show the email address of each author"
+#: builtin/remote.c:1508
+#, c-format
+msgid "no URLs configured for remote '%s'"
msgstr ""
-#: builtin/shortlog.c:270
-msgid "w[,i1[,i2]]"
+#: builtin/remote.c:1534
+msgid "manipulate push URLs"
msgstr ""
-#: builtin/shortlog.c:271
-msgid "Linewrap output"
+#: builtin/remote.c:1536
+msgid "add URL"
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/remote.c:1538
+msgid "delete URLs"
msgstr ""
-#: builtin/show-branch.c:16
-msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
+#: builtin/remote.c:1545
+msgid "--add --delete doesn't make sense"
msgstr ""
-#: builtin/show-branch.c:376
+#: builtin/remote.c:1584
#, c-format
-msgid "ignoring %s; cannot handle more than %d ref"
-msgid_plural "ignoring %s; cannot handle more than %d refs"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Invalid old URL pattern: %s"
+msgstr ""
-#: builtin/show-branch.c:530
+#: builtin/remote.c:1592
#, c-format
-msgid "no matching refs with %s"
+msgid "No such URL found: %s"
msgstr ""
-#: builtin/show-branch.c:626
-msgid "show remote-tracking and local branches"
+#: builtin/remote.c:1594
+msgid "Will not delete all non-push URLs"
msgstr ""
-#: builtin/show-branch.c:628
-msgid "show remote-tracking branches"
+#: builtin/remote.c:1610
+msgid "be verbose; must be placed before a subcommand"
msgstr ""
-#: builtin/show-branch.c:630
-msgid "color '*!+-' corresponding to the branch"
+#: builtin/remote.c:1641
+#, c-format
+msgid "Unknown subcommand: %s"
msgstr ""
-#: builtin/show-branch.c:632
-msgid "show <n> more commits after the common ancestor"
+#: builtin/repack.c:22
+msgid "git repack [<options>]"
msgstr ""
-#: builtin/show-branch.c:634
-msgid "synonym to more=-1"
+#: 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/show-branch.c:635
-msgid "suppress naming strings"
+#: builtin/repack.c:294
+msgid "pack everything in a single pack"
msgstr ""
-#: builtin/show-branch.c:637
-msgid "include the current branch"
+#: builtin/repack.c:296
+msgid "same as -a, and turn unreachable objects loose"
msgstr ""
-#: builtin/show-branch.c:639
-msgid "name commits with their object names"
+#: builtin/repack.c:299
+msgid "remove redundant packs, and run git-prune-packed"
msgstr ""
-#: builtin/show-branch.c:641
-msgid "show possible merge bases"
+#: builtin/repack.c:301
+msgid "pass --no-reuse-delta to git-pack-objects"
msgstr ""
-#: builtin/show-branch.c:643
-msgid "show refs unreachable from any other ref"
+#: builtin/repack.c:303
+msgid "pass --no-reuse-object to git-pack-objects"
msgstr ""
-#: builtin/show-branch.c:645
-msgid "show commits in topological order"
+#: builtin/repack.c:305
+msgid "do not run git-update-server-info"
msgstr ""
-#: builtin/show-branch.c:648
-msgid "show only commits not on the first branch"
+#: builtin/repack.c:308
+msgid "pass --local to git-pack-objects"
msgstr ""
-#: builtin/show-branch.c:650
-msgid "show merges reachable from only one tip"
+#: builtin/repack.c:310
+msgid "write bitmap index"
msgstr ""
-#: builtin/show-branch.c:652
-msgid "topologically sort, maintaining date order where possible"
+#: builtin/repack.c:312
+msgid "pass --delta-islands to git-pack-objects"
msgstr ""
-#: builtin/show-branch.c:655
-msgid "<n>[,<base>]"
+#: builtin/repack.c:313
+msgid "approxidate"
msgstr ""
-#: builtin/show-branch.c:656
-msgid "show <n> most recent ref-log entries starting at base"
+#: builtin/repack.c:314
+msgid "with -A, do not loosen objects older than this"
msgstr ""
-#: builtin/show-branch.c:690
-msgid ""
-"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
+#: builtin/repack.c:316
+msgid "with -a, repack unreachable objects"
msgstr ""
-#: builtin/show-branch.c:714
-msgid "no branches given, and HEAD is not valid"
+#: builtin/repack.c:318
+msgid "size of the window used for delta compression"
msgstr ""
-#: builtin/show-branch.c:717
-msgid "--reflog option needs one branch name"
+#: builtin/repack.c:319 builtin/repack.c:325
+msgid "bytes"
msgstr ""
-#: builtin/show-branch.c:720
-#, c-format
-msgid "only %d entry can be shown at one time."
-msgid_plural "only %d entries can be shown at one time."
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/show-branch.c:724
-#, c-format
-msgid "no such ref %s"
+#: builtin/repack.c:320
+msgid "same as the above, but limit memory size instead of entries count"
msgstr ""
-#: builtin/show-branch.c:808
-#, c-format
-msgid "cannot handle more than %d rev."
-msgid_plural "cannot handle more than %d revs."
-msgstr[0] ""
-msgstr[1] ""
+#: builtin/repack.c:322
+msgid "limits the maximum delta depth"
+msgstr ""
-#: builtin/show-branch.c:812
-#, c-format
-msgid "'%s' is not a valid ref."
+#: builtin/repack.c:324
+msgid "limits the maximum number of threads"
msgstr ""
-#: builtin/show-branch.c:815
-#, c-format
-msgid "cannot find commit %s (%s)"
+#: builtin/repack.c:326
+msgid "maximum size of each packfile"
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/repack.c:328
+msgid "repack objects in packs marked with .keep"
msgstr ""
-#: builtin/show-ref.c:11
-msgid "git show-ref --exclude-existing[=<pattern>]"
+#: builtin/repack.c:330
+msgid "do not repack this pack"
msgstr ""
-#: builtin/show-ref.c:159
-msgid "only show tags (can be combined with heads)"
+#: builtin/repack.c:340
+msgid "cannot delete packs in a precious-objects repo"
msgstr ""
-#: builtin/show-ref.c:160
-msgid "only show heads (can be combined with tags)"
+#: builtin/repack.c:344
+msgid "--keep-unreachable and -A are incompatible"
msgstr ""
-#: builtin/show-ref.c:161
-msgid "stricter reference checking, requires exact ref path"
+#: builtin/repack.c:527
+#, c-format
+msgid "failed to remove '%s'"
msgstr ""
-#: builtin/show-ref.c:164 builtin/show-ref.c:166
-msgid "show the HEAD reference, even if it would be filtered out"
+#: builtin/replace.c:22
+msgid "git replace [-f] <object> <replacement>"
msgstr ""
-#: builtin/show-ref.c:168
-msgid "dereference tags into object IDs"
+#: builtin/replace.c:23
+msgid "git replace [-f] --edit <object>"
msgstr ""
-#: builtin/show-ref.c:170
-msgid "only show SHA1 hash using <n> digits"
+#: builtin/replace.c:24
+msgid "git replace [-f] --graft <commit> [<parent>...]"
msgstr ""
-#: builtin/show-ref.c:174
-msgid "do not print results to stdout (useful with --verify)"
+#: builtin/replace.c:25
+msgid "git replace [-f] --convert-graft-file"
msgstr ""
-#: builtin/show-ref.c:176
-msgid "show refs from stdin that aren't in local repository"
+#: builtin/replace.c:26
+msgid "git replace -d <object>..."
msgstr ""
-#: builtin/stripspace.c:18
-msgid "git stripspace [-s | --strip-comments]"
+#: builtin/replace.c:27
+msgid "git replace [--format=<format>] [-l [<pattern>]]"
msgstr ""
-#: builtin/stripspace.c:19
-msgid "git stripspace [-c | --comment-lines]"
+#: 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/stripspace.c:36
-msgid "skip and remove all lines starting with comment character"
+#: builtin/replace.c:86
+#, c-format
+msgid ""
+"invalid replace format '%s'\n"
+"valid formats are 'short', 'medium' and 'long'"
msgstr ""
-#: builtin/stripspace.c:39
-msgid "prepend comment character and space to each line"
+#: builtin/replace.c:121
+#, c-format
+msgid "replace ref '%s' not found"
msgstr ""
-#: builtin/submodule--helper.c:35 builtin/submodule--helper.c:1669
+#: builtin/replace.c:137
#, c-format
-msgid "No such ref: %s"
+msgid "Deleted replace ref '%s'"
msgstr ""
-#: builtin/submodule--helper.c:42 builtin/submodule--helper.c:1678
+#: builtin/replace.c:149
#, c-format
-msgid "Expecting a full ref name, got %s"
+msgid "'%s' is not a valid ref name"
msgstr ""
-#: builtin/submodule--helper.c:59
-msgid "submodule--helper print-default-remote takes no arguments"
+#: builtin/replace.c:154
+#, c-format
+msgid "replace ref '%s' already exists"
msgstr ""
-#: builtin/submodule--helper.c:96
+#: builtin/replace.c:174
#, c-format
-msgid "cannot strip one component off url '%s'"
+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/submodule--helper.c:404 builtin/submodule--helper.c:1198
-msgid "alternative anchor for relative paths"
+#: builtin/replace.c:225
+#, c-format
+msgid "unable to open %s for writing"
msgstr ""
-#: builtin/submodule--helper.c:409
-msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
+#: builtin/replace.c:238
+msgid "cat-file reported failure"
msgstr ""
-#: builtin/submodule--helper.c:460 builtin/submodule--helper.c:483
+#: builtin/replace.c:254
#, c-format
-msgid "No url found for submodule path '%s' in .gitmodules"
+msgid "unable to open %s for reading"
msgstr ""
-#: builtin/submodule--helper.c:498
-#, c-format
-msgid ""
-"could not lookup configuration '%s'. Assuming this repository is its own "
-"authoritative upstream."
+#: builtin/replace.c:268
+msgid "unable to spawn mktree"
msgstr ""
-#: builtin/submodule--helper.c:509
-#, c-format
-msgid "Failed to register url for submodule path '%s'"
+#: builtin/replace.c:272
+msgid "unable to read from mktree"
msgstr ""
-#: builtin/submodule--helper.c:513
-#, c-format
-msgid "Submodule '%s' (%s) registered for path '%s'\n"
+#: builtin/replace.c:281
+msgid "mktree reported failure"
msgstr ""
-#: builtin/submodule--helper.c:523
-#, c-format
-msgid "warning: command update mode suggested for submodule '%s'\n"
+#: builtin/replace.c:285
+msgid "mktree did not return an object name"
msgstr ""
-#: builtin/submodule--helper.c:530
+#: builtin/replace.c:294
#, c-format
-msgid "Failed to register update mode for submodule path '%s'"
+msgid "unable to fstat %s"
msgstr ""
-#: builtin/submodule--helper.c:552
-msgid "Suppress output for initializing a submodule"
+#: builtin/replace.c:299
+msgid "unable to write object to database"
msgstr ""
-#: builtin/submodule--helper.c:557
-msgid "git submodule--helper init [<path>]"
+#: 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/submodule--helper.c:625 builtin/submodule--helper.c:747
+#: builtin/replace.c:322
#, c-format
-msgid "no submodule mapping found in .gitmodules for path '%s'"
+msgid "unable to get object type for %s"
msgstr ""
-#: builtin/submodule--helper.c:660
-#, c-format
-msgid "could not resolve HEAD ref inside the submodule '%s'"
+#: builtin/replace.c:338
+msgid "editing object file failed"
msgstr ""
-#: builtin/submodule--helper.c:687 builtin/submodule--helper.c:856
+#: builtin/replace.c:347
#, c-format
-msgid "failed to recurse into submodule '%s'"
+msgid "new object is the same as the old one: '%s'"
msgstr ""
-#: builtin/submodule--helper.c:711 builtin/submodule--helper.c:1021
-msgid "Suppress submodule status output"
+#: builtin/replace.c:407
+#, c-format
+msgid "bad mergetag in commit '%s'"
msgstr ""
-#: builtin/submodule--helper.c:712
-msgid ""
-"Use commit stored in the index instead of the one stored in the submodule "
-"HEAD"
+#: builtin/replace.c:409
+#, c-format
+msgid "malformed mergetag in commit '%s'"
msgstr ""
-#: builtin/submodule--helper.c:713
-msgid "recurse into nested submodules"
+#: builtin/replace.c:421
+#, c-format
+msgid ""
+"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
+"instead of --graft"
msgstr ""
-#: builtin/submodule--helper.c:718
-msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
+#: builtin/replace.c:460
+#, c-format
+msgid "the original commit '%s' has a gpg signature"
msgstr ""
-#: builtin/submodule--helper.c:742
-msgid "git submodule--helper name <path>"
+#: builtin/replace.c:461
+msgid "the signature will be removed in the replacement commit!"
msgstr ""
-#: builtin/submodule--helper.c:806
+#: builtin/replace.c:471
#, c-format
-msgid "Synchronizing submodule url for '%s'\n"
+msgid "could not write replacement commit for: '%s'"
msgstr ""
-#: builtin/submodule--helper.c:812
+#: builtin/replace.c:479
#, c-format
-msgid "failed to register url for submodule path '%s'"
+msgid "graft for '%s' unnecessary"
msgstr ""
-#: builtin/submodule--helper.c:826
+#: builtin/replace.c:482
#, c-format
-msgid "failed to get the default remote for submodule '%s'"
+msgid "new commit is the same as the old one: '%s'"
msgstr ""
-#: builtin/submodule--helper.c:837
+#: builtin/replace.c:515
#, c-format
-msgid "failed to update remote for submodule '%s'"
+msgid ""
+"could not convert the following graft(s):\n"
+"%s"
msgstr ""
-#: builtin/submodule--helper.c:885
-msgid "Suppress output of synchronizing submodule url"
+#: builtin/replace.c:536
+msgid "list replace refs"
msgstr ""
-#: builtin/submodule--helper.c:887
-msgid "Recurse into nested submodules"
+#: builtin/replace.c:537
+msgid "delete replace refs"
msgstr ""
-#: builtin/submodule--helper.c:892
-msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
+#: builtin/replace.c:538
+msgid "edit existing object"
msgstr ""
-#: builtin/submodule--helper.c:946
-#, c-format
-msgid ""
-"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
-"really want to remove it including all of its history)"
+#: builtin/replace.c:539
+msgid "change a commit's parents"
msgstr ""
-#: builtin/submodule--helper.c:958
-#, c-format
-msgid ""
-"Submodule work tree '%s' contains local modifications; use '-f' to discard "
-"them"
+#: builtin/replace.c:540
+msgid "convert existing graft file"
msgstr ""
-#: builtin/submodule--helper.c:966
-#, c-format
-msgid "Cleared directory '%s'\n"
+#: builtin/replace.c:541
+msgid "replace the ref if it exists"
msgstr ""
-#: builtin/submodule--helper.c:968
-#, c-format
-msgid "Could not remove submodule work tree '%s'\n"
+#: builtin/replace.c:543
+msgid "do not pretty-print contents for --edit"
msgstr ""
-#: builtin/submodule--helper.c:977
-#, c-format
-msgid "could not create empty submodule directory %s"
+#: builtin/replace.c:544
+msgid "use this format"
msgstr ""
-#: builtin/submodule--helper.c:993
-#, c-format
-msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
+#: builtin/replace.c:557
+msgid "--format cannot be used when not listing"
msgstr ""
-#: builtin/submodule--helper.c:1022
-msgid "Remove submodule working trees even if they contain local changes"
+#: builtin/replace.c:565
+msgid "-f only makes sense when writing a replacement"
msgstr ""
-#: builtin/submodule--helper.c:1023
-msgid "Unregister all submodules"
+#: builtin/replace.c:569
+msgid "--raw only makes sense with --edit"
msgstr ""
-#: builtin/submodule--helper.c:1028
-msgid ""
-"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
+#: builtin/replace.c:575
+msgid "-d needs at least one argument"
msgstr ""
-#: builtin/submodule--helper.c:1042
-msgid "Use '--all' if you really want to deinitialize all submodules"
+#: builtin/replace.c:581
+msgid "bad number of arguments"
msgstr ""
-#: builtin/submodule--helper.c:1133 builtin/submodule--helper.c:1136
-#, c-format
-msgid "submodule '%s' cannot add alternate: %s"
+#: builtin/replace.c:587
+msgid "-e needs exactly one argument"
msgstr ""
-#: builtin/submodule--helper.c:1172
-#, c-format
-msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
+#: builtin/replace.c:593
+msgid "-g needs at least one argument"
msgstr ""
-#: builtin/submodule--helper.c:1179
-#, c-format
-msgid "Value '%s' for submodule.alternateLocation is not recognized"
+#: builtin/replace.c:599
+msgid "--convert-graft-file takes no argument"
msgstr ""
-#: builtin/submodule--helper.c:1201
-msgid "where the new submodule will be cloned to"
+#: builtin/replace.c:605
+msgid "only one pattern can be given with -l"
msgstr ""
-#: builtin/submodule--helper.c:1204
-msgid "name of the new submodule"
+#: builtin/rerere.c:13
+msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
msgstr ""
-#: builtin/submodule--helper.c:1207
-msgid "url where to clone the submodule from"
+#: builtin/rerere.c:60
+msgid "register clean resolutions in index"
msgstr ""
-#: builtin/submodule--helper.c:1213
-msgid "depth for shallow clones"
+#: builtin/rerere.c:79
+msgid "'git rerere forget' without paths is deprecated"
msgstr ""
-#: builtin/submodule--helper.c:1216 builtin/submodule--helper.c:1587
-msgid "force cloning progress"
+#: builtin/rerere.c:111
+#, c-format
+msgid "unable to generate diff for '%s'"
msgstr ""
-#: builtin/submodule--helper.c:1221
+#: builtin/reset.c:31
msgid ""
-"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
-"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
+"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
msgstr ""
-#: builtin/submodule--helper.c:1252
-#, c-format
-msgid "clone of '%s' into submodule path '%s' failed"
+#: builtin/reset.c:32
+msgid "git reset [-q] [<tree-ish>] [--] <paths>..."
msgstr ""
-#: builtin/submodule--helper.c:1267
-#, c-format
-msgid "could not get submodule directory for '%s'"
+#: builtin/reset.c:33
+msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
msgstr ""
-#: builtin/submodule--helper.c:1332
-#, c-format
-msgid "Submodule path '%s' not initialized"
+#: builtin/reset.c:39
+msgid "mixed"
msgstr ""
-#: builtin/submodule--helper.c:1336
-msgid "Maybe you want to use 'update --init'?"
+#: builtin/reset.c:39
+msgid "soft"
msgstr ""
-#: builtin/submodule--helper.c:1365
-#, c-format
-msgid "Skipping unmerged submodule %s"
+#: builtin/reset.c:39
+msgid "hard"
msgstr ""
-#: builtin/submodule--helper.c:1394
-#, c-format
-msgid "Skipping submodule '%s'"
+#: builtin/reset.c:39
+msgid "merge"
msgstr ""
-#: builtin/submodule--helper.c:1527
-#, c-format
-msgid "Failed to clone '%s'. Retry scheduled"
+#: builtin/reset.c:39
+msgid "keep"
msgstr ""
-#: builtin/submodule--helper.c:1538
-#, c-format
-msgid "Failed to clone '%s' a second time, aborting"
+#: builtin/reset.c:80
+msgid "You do not have a valid HEAD."
msgstr ""
-#: builtin/submodule--helper.c:1568 builtin/submodule--helper.c:1788
-msgid "path into the working tree"
+#: builtin/reset.c:82
+msgid "Failed to find tree of HEAD."
msgstr ""
-#: builtin/submodule--helper.c:1571
-msgid "path into the working tree, across nested submodule boundaries"
+#: builtin/reset.c:88
+#, c-format
+msgid "Failed to find tree of %s."
msgstr ""
-#: builtin/submodule--helper.c:1575
-msgid "rebase, merge, checkout or none"
+#: builtin/reset.c:192
+#, c-format
+msgid "Cannot do a %s reset in the middle of a merge."
msgstr ""
-#: builtin/submodule--helper.c:1579
-msgid "Create a shallow clone truncated to the specified number of revisions"
+#: builtin/reset.c:292
+msgid "be quiet, only report errors"
msgstr ""
-#: builtin/submodule--helper.c:1582
-msgid "parallel jobs"
+#: builtin/reset.c:294
+msgid "reset HEAD and index"
msgstr ""
-#: builtin/submodule--helper.c:1584
-msgid "whether the initial clone should follow the shallow recommendation"
+#: builtin/reset.c:295
+msgid "reset only HEAD"
msgstr ""
-#: builtin/submodule--helper.c:1585
-msgid "don't print cloning progress"
+#: builtin/reset.c:297 builtin/reset.c:299
+msgid "reset HEAD, index and working tree"
msgstr ""
-#: builtin/submodule--helper.c:1592
-msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
+#: builtin/reset.c:301
+msgid "reset HEAD but keep local changes"
msgstr ""
-#: builtin/submodule--helper.c:1605
-msgid "bad value for update parameter"
+#: builtin/reset.c:307
+msgid "record only the fact that removed paths will be added later"
msgstr ""
-#: builtin/submodule--helper.c:1673
+#: builtin/reset.c:325
#, c-format
-msgid ""
-"Submodule (%s) branch configured to inherit branch from superproject, but "
-"the superproject is not on any branch"
+msgid "Failed to resolve '%s' as a valid revision."
msgstr ""
-#: builtin/submodule--helper.c:1789
-msgid "recurse into submodules"
+#: builtin/reset.c:333
+#, c-format
+msgid "Failed to resolve '%s' as a valid tree."
msgstr ""
-#: builtin/submodule--helper.c:1795
-msgid "git submodule--helper embed-git-dir [<path>...]"
+#: builtin/reset.c:342
+msgid "--patch is incompatible with --{hard,mixed,soft}"
+msgstr ""
+
+#: builtin/reset.c:351
+msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
msgstr ""
-#: builtin/submodule--helper.c:1857
+#: builtin/reset.c:353
#, c-format
-msgid "%s doesn't support --super-prefix"
+msgid "Cannot do %s reset with paths."
msgstr ""
-#: builtin/submodule--helper.c:1863
+#: builtin/reset.c:363
#, c-format
-msgid "'%s' is not a valid submodule--helper subcommand"
+msgid "%s reset is not allowed in a bare repository"
msgstr ""
-#: builtin/symbolic-ref.c:8
-msgid "git symbolic-ref [<options>] <name> [<ref>]"
+#: builtin/reset.c:367
+msgid "-N can only be used with --mixed"
msgstr ""
-#: builtin/symbolic-ref.c:9
-msgid "git symbolic-ref -d [-q] <name>"
+#: builtin/reset.c:387
+msgid "Unstaged changes after reset:"
msgstr ""
-#: builtin/symbolic-ref.c:40
-msgid "suppress error message for non-symbolic (detached) refs"
+#: builtin/reset.c:390
+#, c-format
+msgid ""
+"\n"
+"It took %.2f seconds to enumerate unstaged changes after reset. You can\n"
+"use '--quiet' to avoid this. Set the config setting reset.quiet to true\n"
+"to make this the default.\n"
msgstr ""
-#: builtin/symbolic-ref.c:41
-msgid "delete symbolic ref"
+#: builtin/reset.c:400
+#, c-format
+msgid "Could not reset index file to revision '%s'."
msgstr ""
-#: builtin/symbolic-ref.c:42
-msgid "shorten ref output"
+#: builtin/reset.c:404
+msgid "Could not write new index file."
msgstr ""
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
-msgid "reason"
+#: builtin/rev-list.c:403
+msgid "cannot combine --exclude-promisor-objects and --missing"
msgstr ""
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
-msgid "reason of the update"
+#: builtin/rev-list.c:461
+msgid "object filtering requires --objects"
msgstr ""
-#: builtin/tag.c:24
-msgid ""
-"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
-"[<head>]"
+#: builtin/rev-list.c:464
+#, c-format
+msgid "invalid sparse value '%s'"
msgstr ""
-#: builtin/tag.c:25
-msgid "git tag -d <tagname>..."
+#: builtin/rev-list.c:505
+msgid "rev-list does not support display of notes"
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/rev-list.c:508
+msgid "cannot combine --use-bitmap-index with object filtering"
msgstr ""
-#: builtin/tag.c:28
-msgid "git tag -v [--format=<format>] <tagname>..."
+#: builtin/rev-parse.c:407
+msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
msgstr ""
-#: builtin/tag.c:86
-#, c-format
-msgid "tag '%s' not found."
+#: builtin/rev-parse.c:412
+msgid "keep the `--` passed as an arg"
msgstr ""
-#: builtin/tag.c:102
-#, c-format
-msgid "Deleted tag '%s' (was %s)\n"
+#: builtin/rev-parse.c:414
+msgid "stop parsing after the first non-option argument"
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/rev-parse.c:417
+msgid "output in stuck long form"
msgstr ""
-#: builtin/tag.c:135
-#, c-format
+#: builtin/rev-parse.c:550
msgid ""
+"git rev-parse --parseopt [<options>] -- [<args>...]\n"
+" or: git rev-parse --sq-quote [<arg>...]\n"
+" or: git rev-parse [<options>] [<arg>...]\n"
"\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"
+"Run \"git rev-parse --parseopt -h\" for more information on the first usage."
msgstr ""
-#: builtin/tag.c:189
-msgid "unable to sign the tag"
+#: builtin/revert.c:24
+msgid "git revert [<options>] <commit-ish>..."
msgstr ""
-#: builtin/tag.c:191
-msgid "unable to write tag file"
+#: builtin/revert.c:25
+msgid "git revert <subcommand>"
msgstr ""
-#: builtin/tag.c:216
-msgid "bad object type."
+#: builtin/revert.c:30
+msgid "git cherry-pick [<options>] <commit-ish>..."
msgstr ""
-#: builtin/tag.c:265
-msgid "no tag message?"
+#: builtin/revert.c:31
+msgid "git cherry-pick <subcommand>"
msgstr ""
-#: builtin/tag.c:272
+#: builtin/revert.c:91
#, c-format
-msgid "The tag message has been left in %s\n"
+msgid "%s: %s cannot be used with %s"
msgstr ""
-#: builtin/tag.c:381
-msgid "list tag names"
+#: builtin/revert.c:100
+msgid "end revert or cherry-pick sequence"
msgstr ""
-#: builtin/tag.c:383
-msgid "print <n> lines of each tag message"
+#: builtin/revert.c:101
+msgid "resume revert or cherry-pick sequence"
msgstr ""
-#: builtin/tag.c:385
-msgid "delete tags"
+#: builtin/revert.c:102
+msgid "cancel revert or cherry-pick sequence"
msgstr ""
-#: builtin/tag.c:386
-msgid "verify tags"
+#: builtin/revert.c:103
+msgid "don't automatically commit"
msgstr ""
-#: builtin/tag.c:388
-msgid "Tag creation options"
+#: builtin/revert.c:104
+msgid "edit the commit message"
msgstr ""
-#: builtin/tag.c:390
-msgid "annotated tag, needs a message"
+#: builtin/revert.c:107
+msgid "parent-number"
msgstr ""
-#: builtin/tag.c:392
-msgid "tag message"
+#: builtin/revert.c:108
+msgid "select mainline parent"
msgstr ""
-#: builtin/tag.c:394
-msgid "force edit of tag message"
+#: builtin/revert.c:110
+msgid "merge strategy"
msgstr ""
-#: builtin/tag.c:395
-msgid "annotated and GPG-signed tag"
+#: builtin/revert.c:112
+msgid "option for merge strategy"
msgstr ""
-#: builtin/tag.c:399
-msgid "use another key to sign the tag"
+#: builtin/revert.c:121
+msgid "append commit name"
msgstr ""
-#: builtin/tag.c:400
-msgid "replace the tag if exists"
+#: builtin/revert.c:123
+msgid "preserve initially empty commits"
msgstr ""
-#: builtin/tag.c:401 builtin/update-ref.c:368
-msgid "create a reflog"
+#: builtin/revert.c:125
+msgid "keep redundant, empty commits"
msgstr ""
-#: builtin/tag.c:403
-msgid "Tag listing options"
+#: builtin/revert.c:219
+msgid "revert failed"
msgstr ""
-#: builtin/tag.c:404
+#: builtin/revert.c:232
+msgid "cherry-pick failed"
+msgstr ""
+
+#: builtin/rm.c:18
+msgid "git rm [<options>] [--] <file>..."
+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)"
+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)"
+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:241
+msgid "do not list removed files"
+msgstr ""
+
+#: builtin/rm.c:242
+msgid "only remove from the index"
+msgstr ""
+
+#: builtin/rm.c:243
+msgid "override the up-to-date check"
+msgstr ""
+
+#: builtin/rm.c:244
+msgid "allow recursive removal"
+msgstr ""
+
+#: builtin/rm.c:246
+msgid "exit with a zero status even if nothing matched"
+msgstr ""
+
+#: builtin/rm.c:288
+msgid "please stage your changes to .gitmodules or stash them to proceed"
+msgstr ""
+
+#: builtin/rm.c:306
+#, c-format
+msgid "not removing '%s' recursively without -r"
+msgstr ""
+
+#: builtin/rm.c:345
+#, 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/serve.c:17 builtin/upload-pack.c:23
+msgid "quit after a single request/response exchange"
+msgstr ""
+
+#: builtin/serve.c:19
+msgid "exit immediately after advertising capabilities"
+msgstr ""
+
+#: builtin/shortlog.c:14
+msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]"
+msgstr ""
+
+#: builtin/shortlog.c:15
+msgid "git log --pretty=short | git shortlog [<options>]"
+msgstr ""
+
+#: builtin/shortlog.c:264
+msgid "Group by committer rather than author"
+msgstr ""
+
+#: builtin/shortlog.c:266
+msgid "sort output according to the number of commits per author"
+msgstr ""
+
+#: builtin/shortlog.c:268
+msgid "Suppress commit descriptions, only provides commit count"
+msgstr ""
+
+#: builtin/shortlog.c:270
+msgid "Show the email address of each author"
+msgstr ""
+
+#: builtin/shortlog.c:271
+msgid "<w>[,<i1>[,<i2>]]"
+msgstr ""
+
+#: builtin/shortlog.c:272
+msgid "Linewrap output"
+msgstr ""
+
+#: builtin/shortlog.c:299
+msgid "too many arguments given outside repository"
+msgstr ""
+
+#: builtin/show-branch.c:13
+msgid ""
+"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
+"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
+"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
+"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
+msgstr ""
+
+#: builtin/show-branch.c:17
+msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
+msgstr ""
+
+#: builtin/show-branch.c:395
+#, c-format
+msgid "ignoring %s; cannot handle more than %d ref"
+msgid_plural "ignoring %s; cannot handle more than %d refs"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/show-branch.c:549
+#, c-format
+msgid "no matching refs with %s"
+msgstr ""
+
+#: builtin/show-branch.c:646
+msgid "show remote-tracking and local branches"
+msgstr ""
+
+#: builtin/show-branch.c:648
+msgid "show remote-tracking branches"
+msgstr ""
+
+#: builtin/show-branch.c:650
+msgid "color '*!+-' corresponding to the branch"
+msgstr ""
+
+#: builtin/show-branch.c:652
+msgid "show <n> more commits after the common ancestor"
+msgstr ""
+
+#: builtin/show-branch.c:654
+msgid "synonym to more=-1"
+msgstr ""
+
+#: builtin/show-branch.c:655
+msgid "suppress naming strings"
+msgstr ""
+
+#: builtin/show-branch.c:657
+msgid "include the current branch"
+msgstr ""
+
+#: builtin/show-branch.c:659
+msgid "name commits with their object names"
+msgstr ""
+
+#: builtin/show-branch.c:661
+msgid "show possible merge bases"
+msgstr ""
+
+#: builtin/show-branch.c:663
+msgid "show refs unreachable from any other ref"
+msgstr ""
+
+#: builtin/show-branch.c:665
+msgid "show commits in topological order"
+msgstr ""
+
+#: builtin/show-branch.c:668
+msgid "show only commits not on the first branch"
+msgstr ""
+
+#: builtin/show-branch.c:670
+msgid "show merges reachable from only one tip"
+msgstr ""
+
+#: builtin/show-branch.c:672
+msgid "topologically sort, maintaining date order where possible"
+msgstr ""
+
+#: builtin/show-branch.c:675
+msgid "<n>[,<base>]"
+msgstr ""
+
+#: builtin/show-branch.c:676
+msgid "show <n> most recent ref-log entries starting at base"
+msgstr ""
+
+#: builtin/show-branch.c:712
+msgid ""
+"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
+msgstr ""
+
+#: builtin/show-branch.c:736
+msgid "no branches given, and HEAD is not valid"
+msgstr ""
+
+#: builtin/show-branch.c:739
+msgid "--reflog option needs one branch name"
+msgstr ""
+
+#: builtin/show-branch.c:742
+#, c-format
+msgid "only %d entry can be shown at one time."
+msgid_plural "only %d entries can be shown at one time."
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/show-branch.c:746
+#, c-format
+msgid "no such ref %s"
+msgstr ""
+
+#: builtin/show-branch.c: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/show-branch.c:837
+#, c-format
+msgid "cannot find commit %s (%s)"
+msgstr ""
+
+#: 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/show-ref.c:12
+msgid "git show-ref --exclude-existing[=<pattern>]"
+msgstr ""
+
+#: builtin/show-ref.c:161
+msgid "only show tags (can be combined with heads)"
+msgstr ""
+
+#: builtin/show-ref.c:162
+msgid "only show heads (can be combined with tags)"
+msgstr ""
+
+#: builtin/show-ref.c:163
+msgid "stricter reference checking, requires exact ref path"
+msgstr ""
+
+#: builtin/show-ref.c:166 builtin/show-ref.c:168
+msgid "show the HEAD reference, even if it would be filtered out"
+msgstr ""
+
+#: builtin/show-ref.c:170
+msgid "dereference tags into object IDs"
+msgstr ""
+
+#: builtin/show-ref.c:172
+msgid "only show SHA1 hash using <n> digits"
+msgstr ""
+
+#: builtin/show-ref.c:176
+msgid "do not print results to stdout (useful with --verify)"
+msgstr ""
+
+#: builtin/show-ref.c:178
+msgid "show refs from stdin that aren't in local repository"
+msgstr ""
+
+#: builtin/stripspace.c:18
+msgid "git stripspace [-s | --strip-comments]"
+msgstr ""
+
+#: builtin/stripspace.c:19
+msgid "git stripspace [-c | --comment-lines]"
+msgstr ""
+
+#: builtin/stripspace.c:36
+msgid "skip and remove all lines starting with comment character"
+msgstr ""
+
+#: builtin/stripspace.c:39
+msgid "prepend comment character and space to each line"
+msgstr ""
+
+#: builtin/submodule--helper.c:44 builtin/submodule--helper.c:1939
+#, c-format
+msgid "Expecting a full ref name, got %s"
+msgstr ""
+
+#: builtin/submodule--helper.c:61
+msgid "submodule--helper print-default-remote takes no arguments"
+msgstr ""
+
+#: builtin/submodule--helper.c:99
+#, c-format
+msgid "cannot strip one component off url '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:407 builtin/submodule--helper.c:1363
+msgid "alternative anchor for relative paths"
+msgstr ""
+
+#: builtin/submodule--helper.c:412
+msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
+msgstr ""
+
+#: builtin/submodule--helper.c:469 builtin/submodule--helper.c:626
+#: builtin/submodule--helper.c:649
+#, c-format
+msgid "No url found for submodule path '%s' in .gitmodules"
+msgstr ""
+
+#: builtin/submodule--helper.c:521
+#, c-format
+msgid "Entering '%s'\n"
+msgstr ""
+
+#: builtin/submodule--helper.c:524
+#, c-format
+msgid ""
+"run_command returned non-zero status for %s\n"
+"."
+msgstr ""
+
+#: builtin/submodule--helper.c:545
+#, c-format
+msgid ""
+"run_command returned non-zero status while recursing in the nested "
+"submodules of %s\n"
+"."
+msgstr ""
+
+#: builtin/submodule--helper.c:561
+msgid "Suppress output of entering each submodule command"
+msgstr ""
+
+#: builtin/submodule--helper.c:563 builtin/submodule--helper.c:1048
+msgid "Recurse into nested submodules"
+msgstr ""
+
+#: builtin/submodule--helper.c:568
+msgid "git submodule--helper foreach [--quiet] [--recursive] <command>"
+msgstr ""
+
+#: builtin/submodule--helper.c:595
+#, c-format
+msgid ""
+"could not look up configuration '%s'. Assuming this repository is its own "
+"authoritative upstream."
+msgstr ""
+
+#: builtin/submodule--helper.c:663
+#, c-format
+msgid "Failed to register url for submodule path '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:667
+#, c-format
+msgid "Submodule '%s' (%s) registered for path '%s'\n"
+msgstr ""
+
+#: builtin/submodule--helper.c:677
+#, c-format
+msgid "warning: command update mode suggested for submodule '%s'\n"
+msgstr ""
+
+#: builtin/submodule--helper.c:684
+#, c-format
+msgid "Failed to register update mode for submodule path '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:706
+msgid "Suppress output for initializing a submodule"
+msgstr ""
+
+#: builtin/submodule--helper.c:711
+msgid "git submodule--helper init [<path>]"
+msgstr ""
+
+#: builtin/submodule--helper.c:783 builtin/submodule--helper.c:909
+#, c-format
+msgid "no submodule mapping found in .gitmodules for path '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:822
+#, c-format
+msgid "could not resolve HEAD ref inside the submodule '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:849 builtin/submodule--helper.c:1018
+#, c-format
+msgid "failed to recurse into submodule '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:873 builtin/submodule--helper.c:1182
+msgid "Suppress submodule status output"
+msgstr ""
+
+#: builtin/submodule--helper.c:874
+msgid ""
+"Use commit stored in the index instead of the one stored in the submodule "
+"HEAD"
+msgstr ""
+
+#: builtin/submodule--helper.c:875
+msgid "recurse into nested submodules"
+msgstr ""
+
+#: builtin/submodule--helper.c:880
+msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
+msgstr ""
+
+#: builtin/submodule--helper.c:904
+msgid "git submodule--helper name <path>"
+msgstr ""
+
+#: builtin/submodule--helper.c:968
+#, c-format
+msgid "Synchronizing submodule url for '%s'\n"
+msgstr ""
+
+#: builtin/submodule--helper.c:974
+#, c-format
+msgid "failed to register url for submodule path '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:988
+#, c-format
+msgid "failed to get the default remote for submodule '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:999
+#, c-format
+msgid "failed to update remote for submodule '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:1046
+msgid "Suppress output of synchronizing submodule url"
+msgstr ""
+
+#: builtin/submodule--helper.c:1053
+msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
+msgstr ""
+
+#: builtin/submodule--helper.c:1107
+#, c-format
+msgid ""
+"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
+"really want to remove it including all of its history)"
+msgstr ""
+
+#: builtin/submodule--helper.c:1119
+#, c-format
+msgid ""
+"Submodule work tree '%s' contains local modifications; use '-f' to discard "
+"them"
+msgstr ""
+
+#: builtin/submodule--helper.c:1127
+#, c-format
+msgid "Cleared directory '%s'\n"
+msgstr ""
+
+#: builtin/submodule--helper.c:1129
+#, c-format
+msgid "Could not remove submodule work tree '%s'\n"
+msgstr ""
+
+#: builtin/submodule--helper.c:1138
+#, c-format
+msgid "could not create empty submodule directory %s"
+msgstr ""
+
+#: builtin/submodule--helper.c:1154
+#, c-format
+msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
+msgstr ""
+
+#: builtin/submodule--helper.c:1183
+msgid "Remove submodule working trees even if they contain local changes"
+msgstr ""
+
+#: builtin/submodule--helper.c:1184
+msgid "Unregister all submodules"
+msgstr ""
+
+#: builtin/submodule--helper.c:1189
+msgid ""
+"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
+msgstr ""
+
+#: builtin/submodule--helper.c:1203
+msgid "Use '--all' if you really want to deinitialize all submodules"
+msgstr ""
+
+#: builtin/submodule--helper.c:1297 builtin/submodule--helper.c:1300
+#, c-format
+msgid "submodule '%s' cannot add alternate: %s"
+msgstr ""
+
+#: builtin/submodule--helper.c:1336
+#, c-format
+msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
+msgstr ""
+
+#: builtin/submodule--helper.c:1343
+#, c-format
+msgid "Value '%s' for submodule.alternateLocation is not recognized"
+msgstr ""
+
+#: builtin/submodule--helper.c:1366
+msgid "where the new submodule will be cloned to"
+msgstr ""
+
+#: builtin/submodule--helper.c:1369
+msgid "name of the new submodule"
+msgstr ""
+
+#: builtin/submodule--helper.c:1372
+msgid "url where to clone the submodule from"
+msgstr ""
+
+#: builtin/submodule--helper.c:1380
+msgid "depth for shallow clones"
+msgstr ""
+
+#: builtin/submodule--helper.c:1383 builtin/submodule--helper.c:1868
+msgid "force cloning progress"
+msgstr ""
+
+#: builtin/submodule--helper.c:1388
+msgid ""
+"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
+"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
+msgstr ""
+
+#: builtin/submodule--helper.c:1419
+#, c-format
+msgid "clone of '%s' into submodule path '%s' failed"
+msgstr ""
+
+#: builtin/submodule--helper.c:1433
+#, c-format
+msgid "could not get submodule directory for '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:1469
+#, c-format
+msgid "Invalid update mode '%s' for submodule path '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:1473
+#, c-format
+msgid "Invalid update mode '%s' configured for submodule path '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:1566
+#, c-format
+msgid "Submodule path '%s' not initialized"
+msgstr ""
+
+#: builtin/submodule--helper.c:1570
+msgid "Maybe you want to use 'update --init'?"
+msgstr ""
+
+#: builtin/submodule--helper.c:1600
+#, c-format
+msgid "Skipping unmerged submodule %s"
+msgstr ""
+
+#: builtin/submodule--helper.c:1629
+#, c-format
+msgid "Skipping submodule '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:1773
+#, c-format
+msgid "Failed to clone '%s'. Retry scheduled"
+msgstr ""
+
+#: builtin/submodule--helper.c:1784
+#, c-format
+msgid "Failed to clone '%s' a second time, aborting"
+msgstr ""
+
+#: builtin/submodule--helper.c:1847 builtin/submodule--helper.c:2089
+msgid "path into the working tree"
+msgstr ""
+
+#: builtin/submodule--helper.c:1850
+msgid "path into the working tree, across nested submodule boundaries"
+msgstr ""
+
+#: builtin/submodule--helper.c:1854
+msgid "rebase, merge, checkout or none"
+msgstr ""
+
+#: builtin/submodule--helper.c:1860
+msgid "Create a shallow clone truncated to the specified number of revisions"
+msgstr ""
+
+#: builtin/submodule--helper.c:1863
+msgid "parallel jobs"
+msgstr ""
+
+#: builtin/submodule--helper.c:1865
+msgid "whether the initial clone should follow the shallow recommendation"
+msgstr ""
+
+#: builtin/submodule--helper.c:1866
+msgid "don't print cloning progress"
+msgstr ""
+
+#: builtin/submodule--helper.c:1873
+msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
+msgstr ""
+
+#: builtin/submodule--helper.c:1886
+msgid "bad value for update parameter"
+msgstr ""
+
+#: builtin/submodule--helper.c:1934
+#, c-format
+msgid ""
+"Submodule (%s) branch configured to inherit branch from superproject, but "
+"the superproject is not on any branch"
+msgstr ""
+
+#: builtin/submodule--helper.c:2057
+#, c-format
+msgid "could not get a repository handle for submodule '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:2090
+msgid "recurse into submodules"
+msgstr ""
+
+#: builtin/submodule--helper.c:2096
+msgid "git submodule--helper embed-git-dir [<path>...]"
+msgstr ""
+
+#: builtin/submodule--helper.c:2152
+msgid "check if it is safe to write to the .gitmodules file"
+msgstr ""
+
+#: builtin/submodule--helper.c:2157
+msgid "git submodule--helper config name [value]"
+msgstr ""
+
+#: builtin/submodule--helper.c:2158
+msgid "git submodule--helper config --check-writeable"
+msgstr ""
+
+#: builtin/submodule--helper.c:2175 git-submodule.sh:169
+#, sh-format
+msgid "please make sure that the .gitmodules file is in the working tree"
+msgstr ""
+
+#: builtin/submodule--helper.c:2225
+#, c-format
+msgid "%s doesn't support --super-prefix"
+msgstr ""
+
+#: builtin/submodule--helper.c:2231
+#, c-format
+msgid "'%s' is not a valid submodule--helper subcommand"
+msgstr ""
+
+#: builtin/symbolic-ref.c:8
+msgid "git symbolic-ref [<options>] <name> [<ref>]"
+msgstr ""
+
+#: builtin/symbolic-ref.c:9
+msgid "git symbolic-ref -d [-q] <name>"
+msgstr ""
+
+#: builtin/symbolic-ref.c:40
+msgid "suppress error message for non-symbolic (detached) refs"
+msgstr ""
+
+#: builtin/symbolic-ref.c:41
+msgid "delete symbolic ref"
+msgstr ""
+
+#: builtin/symbolic-ref.c:42
+msgid "shorten ref output"
+msgstr ""
+
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363
+msgid "reason"
+msgstr ""
+
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363
+msgid "reason of the update"
+msgstr ""
+
+#: builtin/tag.c:25
+msgid ""
+"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
+"[<head>]"
+msgstr ""
+
+#: builtin/tag.c:26
+msgid "git tag -d <tagname>..."
+msgstr ""
+
+#: builtin/tag.c:27
+msgid ""
+"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
+"points-at <object>]\n"
+"\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]"
+msgstr ""
+
+#: builtin/tag.c:29
+msgid "git tag -v [--format=<format>] <tagname>..."
+msgstr ""
+
+#: builtin/tag.c:87
+#, c-format
+msgid "tag '%s' not found."
+msgstr ""
+
+#: builtin/tag.c:103
+#, c-format
+msgid "Deleted tag '%s' (was %s)\n"
+msgstr ""
+
+#: builtin/tag.c:133
+#, c-format
+msgid ""
+"\n"
+"Write a message for tag:\n"
+" %s\n"
+"Lines starting with '%c' will be ignored.\n"
+msgstr ""
+
+#: builtin/tag.c:137
+#, c-format
+msgid ""
+"\n"
+"Write a message for tag:\n"
+" %s\n"
+"Lines starting with '%c' will be kept; you may remove them yourself if you "
+"want to.\n"
+msgstr ""
+
+#: builtin/tag.c:191
+msgid "unable to sign the tag"
+msgstr ""
+
+#: builtin/tag.c:193
+msgid "unable to write tag file"
+msgstr ""
+
+#: builtin/tag.c:218
+msgid "bad object type."
+msgstr ""
+
+#: builtin/tag.c:267
+msgid "no tag message?"
+msgstr ""
+
+#: builtin/tag.c:274
+#, c-format
+msgid "The tag message has been left in %s\n"
+msgstr ""
+
+#: builtin/tag.c:385
+msgid "list tag names"
+msgstr ""
+
+#: builtin/tag.c:387
+msgid "print <n> lines of each tag message"
+msgstr ""
+
+#: builtin/tag.c:389
+msgid "delete tags"
+msgstr ""
+
+#: builtin/tag.c:390
+msgid "verify tags"
+msgstr ""
+
+#: builtin/tag.c:392
+msgid "Tag creation options"
+msgstr ""
+
+#: builtin/tag.c:394
+msgid "annotated tag, needs a message"
+msgstr ""
+
+#: builtin/tag.c:396
+msgid "tag message"
+msgstr ""
+
+#: builtin/tag.c:398
+msgid "force edit of tag message"
+msgstr ""
+
+#: builtin/tag.c:399
+msgid "annotated and GPG-signed tag"
+msgstr ""
+
+#: builtin/tag.c:403
+msgid "use another key to sign the tag"
+msgstr ""
+
+#: builtin/tag.c:404
+msgid "replace the tag if exists"
+msgstr ""
+
+#: builtin/tag.c:405 builtin/update-ref.c:369
+msgid "create a reflog"
+msgstr ""
+
+#: builtin/tag.c:407
+msgid "Tag listing options"
+msgstr ""
+
+#: builtin/tag.c:408
msgid "show tag list in columns"
msgstr ""
-#: builtin/tag.c:405 builtin/tag.c:407
-msgid "print only tags that contain the commit"
+#: builtin/tag.c:409 builtin/tag.c:411
+msgid "print only tags that contain the commit"
+msgstr ""
+
+#: builtin/tag.c:410 builtin/tag.c:412
+msgid "print only tags that don't contain the commit"
+msgstr ""
+
+#: builtin/tag.c:413
+msgid "print only tags that are merged"
+msgstr ""
+
+#: builtin/tag.c:414
+msgid "print only tags that are not merged"
+msgstr ""
+
+#: builtin/tag.c:419
+msgid "print only tags of the object"
+msgstr ""
+
+#: builtin/tag.c:463
+msgid "--column and -n are incompatible"
+msgstr ""
+
+#: builtin/tag.c:485
+msgid "-n option is only allowed in list mode"
+msgstr ""
+
+#: builtin/tag.c:487
+msgid "--contains option is only allowed in list mode"
+msgstr ""
+
+#: builtin/tag.c:489
+msgid "--no-contains option is only allowed in list mode"
+msgstr ""
+
+#: builtin/tag.c:491
+msgid "--points-at option is only allowed in list mode"
+msgstr ""
+
+#: builtin/tag.c:493
+msgid "--merged and --no-merged options are only allowed in list mode"
+msgstr ""
+
+#: builtin/tag.c:504
+msgid "only one -F or -m option is allowed."
+msgstr ""
+
+#: builtin/tag.c:523
+msgid "too many params"
+msgstr ""
+
+#: builtin/tag.c:529
+#, c-format
+msgid "'%s' is not a valid tag name."
+msgstr ""
+
+#: builtin/tag.c:534
+#, c-format
+msgid "tag '%s' already exists"
+msgstr ""
+
+#: builtin/tag.c:565
+#, c-format
+msgid "Updated tag '%s' (was %s)\n"
+msgstr ""
+
+#: builtin/unpack-objects.c:500
+msgid "Unpacking objects"
+msgstr ""
+
+#: builtin/update-index.c:82
+#, c-format
+msgid "failed to create directory %s"
+msgstr ""
+
+#: builtin/update-index.c:98
+#, c-format
+msgid "failed to create file %s"
+msgstr ""
+
+#: builtin/update-index.c:106
+#, c-format
+msgid "failed to delete file %s"
+msgstr ""
+
+#: builtin/update-index.c:113 builtin/update-index.c:219
+#, c-format
+msgid "failed to delete directory %s"
+msgstr ""
+
+#: builtin/update-index.c:138
+#, c-format
+msgid "Testing mtime in '%s' "
+msgstr ""
+
+#: builtin/update-index.c:152
+msgid "directory stat info does not change after adding a new file"
+msgstr ""
+
+#: builtin/update-index.c:165
+msgid "directory stat info does not change after adding a new directory"
+msgstr ""
+
+#: builtin/update-index.c:178
+msgid "directory stat info changes after updating a file"
+msgstr ""
+
+#: builtin/update-index.c:189
+msgid "directory stat info changes after adding a file inside subdirectory"
+msgstr ""
+
+#: builtin/update-index.c:200
+msgid "directory stat info does not change after deleting a file"
+msgstr ""
+
+#: builtin/update-index.c:213
+msgid "directory stat info does not change after deleting a directory"
+msgstr ""
+
+#: builtin/update-index.c:220
+msgid " OK"
+msgstr ""
+
+#: builtin/update-index.c:588
+msgid "git update-index [<options>] [--] [<file>...]"
+msgstr ""
+
+#: builtin/update-index.c:961
+msgid "continue refresh even when index needs update"
+msgstr ""
+
+#: builtin/update-index.c:964
+msgid "refresh: ignore submodules"
+msgstr ""
+
+#: builtin/update-index.c:967
+msgid "do not ignore new files"
+msgstr ""
+
+#: builtin/update-index.c:969
+msgid "let files replace directories and vice-versa"
+msgstr ""
+
+#: builtin/update-index.c:971
+msgid "notice files missing from worktree"
+msgstr ""
+
+#: builtin/update-index.c:973
+msgid "refresh even if index contains unmerged entries"
+msgstr ""
+
+#: builtin/update-index.c:976
+msgid "refresh stat information"
+msgstr ""
+
+#: builtin/update-index.c:980
+msgid "like --refresh, but ignore assume-unchanged setting"
+msgstr ""
+
+#: builtin/update-index.c:984
+msgid "<mode>,<object>,<path>"
+msgstr ""
+
+#: builtin/update-index.c:985
+msgid "add the specified entry to the index"
+msgstr ""
+
+#: builtin/update-index.c:994
+msgid "mark files as \"not changing\""
+msgstr ""
+
+#: builtin/update-index.c:997
+msgid "clear assumed-unchanged bit"
+msgstr ""
+
+#: builtin/update-index.c:1000
+msgid "mark files as \"index-only\""
+msgstr ""
+
+#: builtin/update-index.c:1003
+msgid "clear skip-worktree bit"
+msgstr ""
+
+#: builtin/update-index.c:1006
+msgid "add to index only; do not add content to object database"
+msgstr ""
+
+#: builtin/update-index.c:1008
+msgid "remove named paths even if present in worktree"
+msgstr ""
+
+#: builtin/update-index.c:1010
+msgid "with --stdin: input lines are terminated by null bytes"
+msgstr ""
+
+#: builtin/update-index.c:1012
+msgid "read list of paths to be updated from standard input"
+msgstr ""
+
+#: builtin/update-index.c:1016
+msgid "add entries from standard input to the index"
+msgstr ""
+
+#: builtin/update-index.c:1020
+msgid "repopulate stages #2 and #3 for the listed paths"
+msgstr ""
+
+#: builtin/update-index.c:1024
+msgid "only update entries that differ from HEAD"
+msgstr ""
+
+#: builtin/update-index.c:1028
+msgid "ignore files missing from worktree"
+msgstr ""
+
+#: builtin/update-index.c:1031
+msgid "report actions to standard output"
+msgstr ""
+
+#: builtin/update-index.c:1033
+msgid "(for porcelains) forget saved unresolved conflicts"
+msgstr ""
+
+#: builtin/update-index.c:1037
+msgid "write index in this format"
+msgstr ""
+
+#: builtin/update-index.c:1039
+msgid "enable or disable split index"
+msgstr ""
+
+#: builtin/update-index.c:1041
+msgid "enable/disable untracked cache"
+msgstr ""
+
+#: builtin/update-index.c:1043
+msgid "test if the filesystem supports untracked cache"
+msgstr ""
+
+#: builtin/update-index.c:1045
+msgid "enable untracked cache without testing the filesystem"
+msgstr ""
+
+#: builtin/update-index.c:1047
+msgid "write out the index even if is not flagged as changed"
+msgstr ""
+
+#: builtin/update-index.c:1049
+msgid "enable or disable file system monitor"
+msgstr ""
+
+#: builtin/update-index.c:1051
+msgid "mark files as fsmonitor valid"
+msgstr ""
+
+#: builtin/update-index.c:1054
+msgid "clear fsmonitor valid bit"
+msgstr ""
+
+#: builtin/update-index.c:1153
+msgid ""
+"core.splitIndex is set to false; remove or change it, if you really want to "
+"enable split index"
+msgstr ""
+
+#: builtin/update-index.c:1162
+msgid ""
+"core.splitIndex is set to true; remove or change it, if you really want to "
+"disable split index"
+msgstr ""
+
+#: builtin/update-index.c:1173
+msgid ""
+"core.untrackedCache is set to true; remove or change it, if you really want "
+"to disable the untracked cache"
+msgstr ""
+
+#: builtin/update-index.c:1177
+msgid "Untracked cache disabled"
+msgstr ""
+
+#: builtin/update-index.c:1185
+msgid ""
+"core.untrackedCache is set to false; remove or change it, if you really want "
+"to enable the untracked cache"
+msgstr ""
+
+#: builtin/update-index.c:1189
+#, c-format
+msgid "Untracked cache enabled for '%s'"
+msgstr ""
+
+#: builtin/update-index.c:1197
+msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
+msgstr ""
+
+#: builtin/update-index.c:1201
+msgid "fsmonitor enabled"
+msgstr ""
+
+#: builtin/update-index.c:1204
+msgid ""
+"core.fsmonitor is set; remove it if you really want to disable fsmonitor"
+msgstr ""
+
+#: builtin/update-index.c:1208
+msgid "fsmonitor disabled"
+msgstr ""
+
+#: builtin/update-ref.c:10
+msgid "git update-ref [<options>] -d <refname> [<old-val>]"
+msgstr ""
+
+#: builtin/update-ref.c:11
+msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]"
+msgstr ""
+
+#: builtin/update-ref.c:12
+msgid "git update-ref [<options>] --stdin [-z]"
+msgstr ""
+
+#: builtin/update-ref.c:364
+msgid "delete the reference"
+msgstr ""
+
+#: builtin/update-ref.c:366
+msgid "update <refname> not the one it points to"
+msgstr ""
+
+#: builtin/update-ref.c:367
+msgid "stdin has NUL-terminated arguments"
+msgstr ""
+
+#: builtin/update-ref.c:368
+msgid "read updates from stdin"
+msgstr ""
+
+#: builtin/update-server-info.c:7
+msgid "git update-server-info [--force]"
+msgstr ""
+
+#: builtin/update-server-info.c:15
+msgid "update the info files from scratch"
+msgstr ""
+
+#: builtin/upload-pack.c:11
+msgid "git upload-pack [<options>] <dir>"
+msgstr ""
+
+#: builtin/upload-pack.c:25
+msgid "exit immediately after initial ref advertisement"
+msgstr ""
+
+#: builtin/upload-pack.c:27
+msgid "do not try <directory>/.git/ if <directory> is no Git directory"
+msgstr ""
+
+#: builtin/upload-pack.c:29
+msgid "interrupt transfer after <n> seconds of inactivity"
+msgstr ""
+
+#: builtin/verify-commit.c:20
+msgid "git verify-commit [-v | --verbose] <commit>..."
+msgstr ""
+
+#: builtin/verify-commit.c:76
+msgid "print commit contents"
+msgstr ""
+
+#: builtin/verify-commit.c:77 builtin/verify-tag.c:38
+msgid "print raw gpg status output"
+msgstr ""
+
+#: builtin/verify-pack.c:55
+msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
+msgstr ""
+
+#: builtin/verify-pack.c:65
+msgid "verbose"
+msgstr ""
+
+#: builtin/verify-pack.c:67
+msgid "show statistics only"
+msgstr ""
+
+#: builtin/verify-tag.c:19
+msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
+msgstr ""
+
+#: builtin/verify-tag.c:37
+msgid "print tag contents"
+msgstr ""
+
+#: builtin/worktree.c:17
+msgid "git worktree add [<options>] <path> [<commit-ish>]"
+msgstr ""
+
+#: builtin/worktree.c:18
+msgid "git worktree list [<options>]"
+msgstr ""
+
+#: builtin/worktree.c:19
+msgid "git worktree lock [<options>] <path>"
+msgstr ""
+
+#: builtin/worktree.c:20
+msgid "git worktree move <worktree> <new-path>"
+msgstr ""
+
+#: builtin/worktree.c:21
+msgid "git worktree prune [<options>]"
+msgstr ""
+
+#: builtin/worktree.c:22
+msgid "git worktree remove [<options>] <worktree>"
+msgstr ""
+
+#: builtin/worktree.c:23
+msgid "git worktree unlock <path>"
+msgstr ""
+
+#: builtin/worktree.c:60 builtin/worktree.c:871
+#, c-format
+msgid "failed to delete '%s'"
+msgstr ""
+
+#: builtin/worktree.c:79
+#, c-format
+msgid "Removing worktrees/%s: not a valid directory"
+msgstr ""
+
+#: builtin/worktree.c:85
+#, c-format
+msgid "Removing worktrees/%s: gitdir file does not exist"
+msgstr ""
+
+#: builtin/worktree.c:90 builtin/worktree.c:99
+#, c-format
+msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
+msgstr ""
+
+#: builtin/worktree.c:109
+#, c-format
+msgid ""
+"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
+"%<PRIuMAX>)"
+msgstr ""
+
+#: builtin/worktree.c:117
+#, c-format
+msgid "Removing worktrees/%s: invalid gitdir file"
+msgstr ""
+
+#: builtin/worktree.c:126
+#, c-format
+msgid "Removing worktrees/%s: gitdir file points to non-existent location"
+msgstr ""
+
+#: builtin/worktree.c:165
+msgid "report pruned working trees"
+msgstr ""
+
+#: builtin/worktree.c:167
+msgid "expire working trees older than <time>"
+msgstr ""
+
+#: builtin/worktree.c:234
+#, c-format
+msgid "'%s' already exists"
+msgstr ""
+
+#: builtin/worktree.c:251
+#, c-format
+msgid "unable to re-add worktree '%s'"
+msgstr ""
+
+#: builtin/worktree.c:256
+#, c-format
+msgid ""
+"'%s' is a missing but locked worktree;\n"
+"use 'add -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear"
+msgstr ""
+
+#: builtin/worktree.c:258
+#, c-format
+msgid ""
+"'%s' is a missing but already registered worktree;\n"
+"use 'add -f' to override, or 'prune' or 'remove' to clear"
+msgstr ""
+
+#: builtin/worktree.c:309
+#, c-format
+msgid "could not create directory of '%s'"
+msgstr ""
+
+#: builtin/worktree.c:428 builtin/worktree.c:434
+#, c-format
+msgid "Preparing worktree (new branch '%s')"
+msgstr ""
+
+#: builtin/worktree.c:430
+#, c-format
+msgid "Preparing worktree (resetting branch '%s'; was at %s)"
+msgstr ""
+
+#: builtin/worktree.c:439
+#, c-format
+msgid "Preparing worktree (checking out '%s')"
+msgstr ""
+
+#: builtin/worktree.c:445
+#, c-format
+msgid "Preparing worktree (detached HEAD %s)"
+msgstr ""
+
+#: builtin/worktree.c:486
+msgid "checkout <branch> even if already checked out in other worktree"
+msgstr ""
+
+#: builtin/worktree.c:489
+msgid "create a new branch"
+msgstr ""
+
+#: builtin/worktree.c:491
+msgid "create or reset a branch"
+msgstr ""
+
+#: builtin/worktree.c:493
+msgid "populate the new working tree"
+msgstr ""
+
+#: builtin/worktree.c:494
+msgid "keep the new working tree locked"
+msgstr ""
+
+#: builtin/worktree.c:497
+msgid "set up tracking mode (see git-branch(1))"
+msgstr ""
+
+#: builtin/worktree.c:500
+msgid "try to match the new branch name with a remote-tracking branch"
+msgstr ""
+
+#: builtin/worktree.c:508
+msgid "-b, -B, and --detach are mutually exclusive"
+msgstr ""
+
+#: builtin/worktree.c:569
+msgid "--[no-]track can only be used if a new branch is created"
+msgstr ""
+
+#: builtin/worktree.c:669
+msgid "reason for locking"
+msgstr ""
+
+#: builtin/worktree.c:681 builtin/worktree.c:714 builtin/worktree.c:772
+#: builtin/worktree.c:899
+#, c-format
+msgid "'%s' is not a working tree"
+msgstr ""
+
+#: builtin/worktree.c:683 builtin/worktree.c:716
+msgid "The main working tree cannot be locked or unlocked"
+msgstr ""
+
+#: builtin/worktree.c:688
+#, c-format
+msgid "'%s' is already locked, reason: %s"
+msgstr ""
+
+#: builtin/worktree.c:690
+#, c-format
+msgid "'%s' is already locked"
+msgstr ""
+
+#: builtin/worktree.c:718
+#, c-format
+msgid "'%s' is not locked"
+msgstr ""
+
+#: builtin/worktree.c:743
+msgid "working trees containing submodules cannot be moved or removed"
+msgstr ""
+
+#: builtin/worktree.c:751
+msgid "force move even if worktree is dirty or locked"
+msgstr ""
+
+#: builtin/worktree.c:774 builtin/worktree.c:901
+#, c-format
+msgid "'%s' is a main working tree"
+msgstr ""
+
+#: builtin/worktree.c:779
+#, c-format
+msgid "could not figure out destination name from '%s'"
+msgstr ""
+
+#: builtin/worktree.c:785
+#, c-format
+msgid "target '%s' already exists"
+msgstr ""
+
+#: builtin/worktree.c:793
+#, c-format
+msgid ""
+"cannot move a locked working tree, lock reason: %s\n"
+"use 'move -f -f' to override or unlock first"
+msgstr ""
+
+#: builtin/worktree.c:795
+msgid ""
+"cannot move a locked working tree;\n"
+"use 'move -f -f' to override or unlock first"
+msgstr ""
+
+#: builtin/worktree.c:798
+#, c-format
+msgid "validation failed, cannot move working tree: %s"
+msgstr ""
+
+#: builtin/worktree.c:803
+#, c-format
+msgid "failed to move '%s' to '%s'"
+msgstr ""
+
+#: builtin/worktree.c:851
+#, c-format
+msgid "failed to run 'git status' on '%s'"
+msgstr ""
+
+#: builtin/worktree.c:855
+#, c-format
+msgid "'%s' is dirty, use --force to delete it"
+msgstr ""
+
+#: builtin/worktree.c:860
+#, c-format
+msgid "failed to run 'git status' on '%s', code %d"
+msgstr ""
+
+#: builtin/worktree.c:883
+msgid "force removal even if worktree is dirty or locked"
msgstr ""
-#: builtin/tag.c:406 builtin/tag.c:408
-msgid "print only tags that don't contain the commit"
+#: builtin/worktree.c:906
+#, 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:409
-msgid "print only tags that are merged"
+#: builtin/worktree.c:908
+msgid ""
+"cannot remove a locked working tree;\n"
+"use 'remove -f -f' to override or unlock first"
msgstr ""
-#: builtin/tag.c:410
-msgid "print only tags that are not merged"
+#: builtin/worktree.c:911
+#, c-format
+msgid "validation failed, cannot remove working tree: %s"
msgstr ""
-#: builtin/tag.c:415
-msgid "print only tags of the object"
+#: builtin/write-tree.c:14
+msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
msgstr ""
-#: builtin/tag.c:459
-msgid "--column and -n are incompatible"
+#: builtin/write-tree.c:27
+msgid "<prefix>/"
msgstr ""
-#: builtin/tag.c:481
-msgid "-n option is only allowed in list mode"
+#: builtin/write-tree.c:28
+msgid "write tree object for a subdirectory <prefix>"
msgstr ""
-#: builtin/tag.c:483
-msgid "--contains option is only allowed in list mode"
+#: builtin/write-tree.c:30
+msgid "only useful for debugging"
msgstr ""
-#: builtin/tag.c:485
-msgid "--no-contains option is only allowed in list mode"
+#: 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"
msgstr ""
-#: builtin/tag.c:487
-msgid "--points-at option is only allowed in list mode"
+#: credential-cache--daemon.c:271
+msgid "print debugging messages to stderr"
msgstr ""
-#: builtin/tag.c:489
-msgid "--merged and --no-merged options are only allowed in list mode"
+#: t/helper/test-reach.c:152
+#, c-format
+msgid "commit %s is not marked reachable"
msgstr ""
-#: builtin/tag.c:500
-msgid "only one -F or -m option is allowed."
+#: t/helper/test-reach.c:162
+msgid "too many commits marked reachable"
msgstr ""
-#: builtin/tag.c:519
-msgid "too many params"
+#: git.c:27
+msgid ""
+"git [--version] [--help] [-C <path>] [-c <name>=<value>]\n"
+" [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n"
+" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
+"bare]\n"
+" [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
+" <command> [<args>]"
msgstr ""
-#: builtin/tag.c:525
-#, c-format
-msgid "'%s' is not a valid tag name."
+#: git.c:34
+msgid ""
+"'git help -a' and 'git help -g' list available subcommands and some\n"
+"concept guides. See 'git help <command>' or 'git help <concept>'\n"
+"to read about a specific subcommand or concept."
msgstr ""
-#: builtin/tag.c:530
+#: git.c:173
#, c-format
-msgid "tag '%s' already exists"
+msgid "no directory given for --git-dir\n"
msgstr ""
-#: builtin/tag.c:561
+#: git.c:187
#, c-format
-msgid "Updated tag '%s' (was %s)\n"
+msgid "no namespace given for --namespace\n"
msgstr ""
-#: builtin/unpack-objects.c:498
-msgid "Unpacking objects"
+#: git.c:201
+#, c-format
+msgid "no directory given for --work-tree\n"
msgstr ""
-#: builtin/update-index.c:82
+#: git.c:215
#, c-format
-msgid "failed to create directory %s"
+msgid "no prefix given for --super-prefix\n"
msgstr ""
-#: builtin/update-index.c:88
+#: git.c:237
#, c-format
-msgid "failed to stat %s"
+msgid "-c expects a configuration string\n"
msgstr ""
-#: builtin/update-index.c:98
+#: git.c:275
#, c-format
-msgid "failed to create file %s"
+msgid "no directory given for -C\n"
msgstr ""
-#: builtin/update-index.c:106
+#: git.c:300
#, c-format
-msgid "failed to delete file %s"
+msgid "unknown option: %s\n"
msgstr ""
-#: builtin/update-index.c:113 builtin/update-index.c:219
+#: git.c:719
#, c-format
-msgid "failed to delete directory %s"
+msgid "alias loop detected: expansion of '%s' does not terminate:%s"
msgstr ""
-#: builtin/update-index.c:138
+#: git.c:802
#, c-format
-msgid "Testing mtime in '%s' "
+msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
msgstr ""
-#: builtin/update-index.c:152
-msgid "directory stat info does not change after adding a new file"
+#: git.c:814
+#, c-format
+msgid "failed to run command '%s': %s\n"
msgstr ""
-#: builtin/update-index.c:165
-msgid "directory stat info does not change after adding a new directory"
+#: http.c:374
+#, c-format
+msgid "negative value for http.postbuffer; defaulting to %d"
msgstr ""
-#: builtin/update-index.c:178
-msgid "directory stat info changes after updating a file"
+#: http.c:395
+msgid "Delegation control is not supported with cURL < 7.22.0"
msgstr ""
-#: builtin/update-index.c:189
-msgid "directory stat info changes after adding a file inside subdirectory"
+#: http.c:404
+msgid "Public key pinning not supported with cURL < 7.44.0"
msgstr ""
-#: builtin/update-index.c:200
-msgid "directory stat info does not change after deleting a file"
+#: http.c:837
+msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
msgstr ""
-#: builtin/update-index.c:213
-msgid "directory stat info does not change after deleting a directory"
+#: http.c:910
+msgid "Protocol restrictions not supported with cURL < 7.19.4"
msgstr ""
-#: builtin/update-index.c:220
-msgid " OK"
+#: http.c:1046
+#, c-format
+msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
msgstr ""
-#: builtin/update-index.c:579
-msgid "git update-index [<options>] [--] [<file>...]"
+#: http.c:1053
+#, c-format
+msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
msgstr ""
-#: builtin/update-index.c:936
-msgid "continue refresh even when index needs update"
+#: http.c:1057
+#, c-format
+msgid "Could not set SSL backend to '%s': already set"
msgstr ""
-#: builtin/update-index.c:939
-msgid "refresh: ignore submodules"
+#: http.c:1921
+#, c-format
+msgid ""
+"unable to update url base from redirection:\n"
+" asked for: %s\n"
+" redirect: %s"
msgstr ""
-#: builtin/update-index.c:942
-msgid "do not ignore new files"
+#: remote-curl.c:401
+#, c-format
+msgid "redirecting to %s"
msgstr ""
-#: builtin/update-index.c:944
-msgid "let files replace directories and vice-versa"
+#: list-objects-filter-options.h:60
+msgid "args"
msgstr ""
-#: builtin/update-index.c:946
-msgid "notice files missing from worktree"
+#: list-objects-filter-options.h:61
+msgid "object filtering"
msgstr ""
-#: builtin/update-index.c:948
-msgid "refresh even if index contains unmerged entries"
+#: parse-options.h:154
+msgid "expiry-date"
msgstr ""
-#: builtin/update-index.c:951
-msgid "refresh stat information"
+#: parse-options.h:169
+msgid "no-op (backward compatibility)"
msgstr ""
-#: builtin/update-index.c:955
-msgid "like --refresh, but ignore assume-unchanged setting"
+#: parse-options.h:261
+msgid "be more verbose"
msgstr ""
-#: builtin/update-index.c:959
-msgid "<mode>,<object>,<path>"
+#: parse-options.h:263
+msgid "be more quiet"
msgstr ""
-#: builtin/update-index.c:960
-msgid "add the specified entry to the index"
+#: parse-options.h:269
+msgid "use <n> digits to display SHA-1s"
msgstr ""
-#: builtin/update-index.c:969
-msgid "mark files as \"not changing\""
+#: command-list.h:50
+msgid "Add file contents to the index"
msgstr ""
-#: builtin/update-index.c:972
-msgid "clear assumed-unchanged bit"
+#: command-list.h:51
+msgid "Apply a series of patches from a mailbox"
msgstr ""
-#: builtin/update-index.c:975
-msgid "mark files as \"index-only\""
+#: command-list.h:52
+msgid "Annotate file lines with commit information"
msgstr ""
-#: builtin/update-index.c:978
-msgid "clear skip-worktree bit"
+#: command-list.h:53
+msgid "Apply a patch to files and/or to the index"
msgstr ""
-#: builtin/update-index.c:981
-msgid "add to index only; do not add content to object database"
+#: command-list.h:54
+msgid "Import a GNU Arch repository into Git"
msgstr ""
-#: builtin/update-index.c:983
-msgid "remove named paths even if present in worktree"
+#: command-list.h:55
+msgid "Create an archive of files from a named tree"
msgstr ""
-#: builtin/update-index.c:985
-msgid "with --stdin: input lines are terminated by null bytes"
+#: command-list.h:56
+msgid "Use binary search to find the commit that introduced a bug"
msgstr ""
-#: builtin/update-index.c:987
-msgid "read list of paths to be updated from standard input"
+#: command-list.h:57
+msgid "Show what revision and author last modified each line of a file"
msgstr ""
-#: builtin/update-index.c:991
-msgid "add entries from standard input to the index"
+#: command-list.h:58
+msgid "List, create, or delete branches"
msgstr ""
-#: builtin/update-index.c:995
-msgid "repopulate stages #2 and #3 for the listed paths"
+#: command-list.h:59
+msgid "Move objects and refs by archive"
msgstr ""
-#: builtin/update-index.c:999
-msgid "only update entries that differ from HEAD"
+#: command-list.h:60
+msgid "Provide content or type and size information for repository objects"
msgstr ""
-#: builtin/update-index.c:1003
-msgid "ignore files missing from worktree"
+#: command-list.h:61
+msgid "Display gitattributes information"
msgstr ""
-#: builtin/update-index.c:1006
-msgid "report actions to standard output"
+#: command-list.h:62
+msgid "Debug gitignore / exclude files"
msgstr ""
-#: builtin/update-index.c:1008
-msgid "(for porcelains) forget saved unresolved conflicts"
+#: command-list.h:63
+msgid "Show canonical names and email addresses of contacts"
msgstr ""
-#: builtin/update-index.c:1012
-msgid "write index in this format"
+#: command-list.h:64
+msgid "Switch branches or restore working tree files"
msgstr ""
-#: builtin/update-index.c:1014
-msgid "enable or disable split index"
+#: command-list.h:65
+msgid "Copy files from the index to the working tree"
msgstr ""
-#: builtin/update-index.c:1016
-msgid "enable/disable untracked cache"
+#: command-list.h:66
+msgid "Ensures that a reference name is well formed"
msgstr ""
-#: builtin/update-index.c:1018
-msgid "test if the filesystem supports untracked cache"
+#: command-list.h:67
+msgid "Find commits yet to be applied to upstream"
msgstr ""
-#: builtin/update-index.c:1020
-msgid "enable untracked cache without testing the filesystem"
+#: command-list.h:68
+msgid "Apply the changes introduced by some existing commits"
msgstr ""
-#: builtin/update-index.c:1022
-msgid "write out the index even if is not flagged as changed"
+#: command-list.h:69
+msgid "Graphical alternative to git-commit"
msgstr ""
-#: builtin/update-index.c:1024
-msgid "enable or disable file system monitor"
+#: command-list.h:70
+msgid "Remove untracked files from the working tree"
msgstr ""
-#: builtin/update-index.c:1026
-msgid "mark files as fsmonitor valid"
+#: command-list.h:71
+msgid "Clone a repository into a new directory"
msgstr ""
-#: builtin/update-index.c:1029
-msgid "clear fsmonitor valid bit"
+#: command-list.h:72
+msgid "Display data in columns"
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:73
+msgid "Record changes to the repository"
msgstr ""
-#: builtin/update-index.c:1136
-msgid ""
-"core.splitIndex is set to true; remove or change it, if you really want to "
-"disable split index"
+#: command-list.h:74
+msgid "Write and verify Git commit-graph 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:75
+msgid "Create a new commit object"
msgstr ""
-#: builtin/update-index.c:1151
-msgid "Untracked cache disabled"
+#: command-list.h:76
+msgid "Get and set repository or global options"
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:77
+msgid "Count unpacked number of objects and their disk consumption"
msgstr ""
-#: builtin/update-index.c:1163
-#, c-format
-msgid "Untracked cache enabled for '%s'"
+#: command-list.h:78
+msgid "Retrieve and store user credentials"
msgstr ""
-#: builtin/update-index.c:1171
-msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
+#: command-list.h:79
+msgid "Helper to temporarily store passwords in memory"
msgstr ""
-#: builtin/update-index.c:1175
-msgid "fsmonitor enabled"
+#: command-list.h:80
+msgid "Helper to store credentials on disk"
msgstr ""
-#: builtin/update-index.c:1178
-msgid ""
-"core.fsmonitor is set; remove it if you really want to disable fsmonitor"
+#: command-list.h:81
+msgid "Export a single commit to a CVS checkout"
msgstr ""
-#: builtin/update-index.c:1182
-msgid "fsmonitor disabled"
+#: command-list.h:82
+msgid "Salvage your data out of another SCM people love to hate"
msgstr ""
-#: builtin/update-ref.c:10
-msgid "git update-ref [<options>] -d <refname> [<old-val>]"
+#: command-list.h:83
+msgid "A CVS server emulator for Git"
msgstr ""
-#: builtin/update-ref.c:11
-msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]"
+#: command-list.h:84
+msgid "A really simple server for Git repositories"
msgstr ""
-#: builtin/update-ref.c:12
-msgid "git update-ref [<options>] --stdin [-z]"
+#: command-list.h:85
+msgid "Give an object a human readable name based on an available ref"
msgstr ""
-#: builtin/update-ref.c:363
-msgid "delete the reference"
+#: command-list.h:86
+msgid "Show changes between commits, commit and working tree, etc"
msgstr ""
-#: builtin/update-ref.c:365
-msgid "update <refname> not the one it points to"
+#: command-list.h:87
+msgid "Compares files in the working tree and the index"
msgstr ""
-#: builtin/update-ref.c:366
-msgid "stdin has NUL-terminated arguments"
+#: command-list.h:88
+msgid "Compare a tree to the working tree or index"
msgstr ""
-#: builtin/update-ref.c:367
-msgid "read updates from stdin"
+#: command-list.h:89
+msgid "Compares the content and mode of blobs found via two tree objects"
msgstr ""
-#: builtin/update-server-info.c:7
-msgid "git update-server-info [--force]"
+#: command-list.h:90
+msgid "Show changes using common diff tools"
msgstr ""
-#: builtin/update-server-info.c:15
-msgid "update the info files from scratch"
+#: command-list.h:91
+msgid "Git data exporter"
msgstr ""
-#: builtin/verify-commit.c:18
-msgid "git verify-commit [-v | --verbose] <commit>..."
+#: command-list.h:92
+msgid "Backend for fast Git data importers"
msgstr ""
-#: builtin/verify-commit.c:73
-msgid "print commit contents"
+#: command-list.h:93
+msgid "Download objects and refs from another repository"
msgstr ""
-#: builtin/verify-commit.c:74 builtin/verify-tag.c:38
-msgid "print raw gpg status output"
+#: command-list.h:94
+msgid "Receive missing objects from another repository"
msgstr ""
-#: builtin/verify-pack.c:55
-msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
+#: command-list.h:95
+msgid "Rewrite branches"
msgstr ""
-#: builtin/verify-pack.c:65
-msgid "verbose"
+#: command-list.h:96
+msgid "Produce a merge commit message"
msgstr ""
-#: builtin/verify-pack.c:67
-msgid "show statistics only"
+#: command-list.h:97
+msgid "Output information on each ref"
msgstr ""
-#: builtin/verify-tag.c:19
-msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
+#: command-list.h:98
+msgid "Prepare patches for e-mail submission"
msgstr ""
-#: builtin/verify-tag.c:37
-msgid "print tag contents"
+#: command-list.h:99
+msgid "Verifies the connectivity and validity of the objects in the database"
msgstr ""
-#: builtin/worktree.c:17
-msgid "git worktree add [<options>] <path> [<commit-ish>]"
+#: command-list.h:100
+msgid "Cleanup unnecessary files and optimize the local repository"
msgstr ""
-#: builtin/worktree.c:18
-msgid "git worktree list [<options>]"
+#: command-list.h:101
+msgid "Extract commit ID from an archive created using git-archive"
msgstr ""
-#: builtin/worktree.c:19
-msgid "git worktree lock [<options>] <path>"
+#: command-list.h:102
+msgid "Print lines matching a pattern"
msgstr ""
-#: builtin/worktree.c:20
-msgid "git worktree move <worktree> <new-path>"
+#: command-list.h:103
+msgid "A portable graphical interface to Git"
msgstr ""
-#: builtin/worktree.c:21
-msgid "git worktree prune [<options>]"
+#: command-list.h:104
+msgid "Compute object ID and optionally creates a blob from a file"
msgstr ""
-#: builtin/worktree.c:22
-msgid "git worktree remove [<options>] <worktree>"
+#: command-list.h:105
+msgid "Display help information about Git"
msgstr ""
-#: builtin/worktree.c:23
-msgid "git worktree unlock <path>"
+#: command-list.h:106
+msgid "Server side implementation of Git over HTTP"
msgstr ""
-#: builtin/worktree.c:60
-#, c-format
-msgid "Removing worktrees/%s: not a valid directory"
+#: command-list.h:107
+msgid "Download from a remote Git repository via HTTP"
msgstr ""
-#: builtin/worktree.c:66
-#, c-format
-msgid "Removing worktrees/%s: gitdir file does not exist"
+#: command-list.h:108
+msgid "Push objects over HTTP/DAV to another repository"
msgstr ""
-#: builtin/worktree.c:71 builtin/worktree.c:80
-#, c-format
-msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
+#: command-list.h:109
+msgid "Send a collection of patches from stdin to an IMAP folder"
msgstr ""
-#: builtin/worktree.c:90
-#, c-format
-msgid ""
-"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
-"%<PRIuMAX>)"
+#: command-list.h:110
+msgid "Build pack index file for an existing packed archive"
msgstr ""
-#: builtin/worktree.c:98
-#, c-format
-msgid "Removing worktrees/%s: invalid gitdir file"
+#: command-list.h:111
+msgid "Create an empty Git repository or reinitialize an existing one"
msgstr ""
-#: builtin/worktree.c:114
-#, c-format
-msgid "Removing worktrees/%s: gitdir file points to non-existent location"
+#: command-list.h:112
+msgid "Instantly browse your working repository in gitweb"
msgstr ""
-#: builtin/worktree.c:161
-msgid "report pruned working trees"
+#: command-list.h:113
+msgid "add or parse structured information in commit messages"
msgstr ""
-#: builtin/worktree.c:163
-msgid "expire working trees older than <time>"
+#: command-list.h:114
+msgid "The Git repository browser"
msgstr ""
-#: builtin/worktree.c:238
-#, c-format
-msgid "'%s' already exists"
+#: command-list.h:115
+msgid "Show commit logs"
msgstr ""
-#: builtin/worktree.c:269
-#, c-format
-msgid "could not create directory of '%s'"
+#: command-list.h:116
+msgid "Show information about files in the index and the working tree"
msgstr ""
-#: builtin/worktree.c:308
-#, c-format
-msgid "Preparing %s (identifier %s)"
+#: command-list.h:117
+msgid "List references in a remote repository"
msgstr ""
-#: builtin/worktree.c:385
-msgid "checkout <branch> even if already checked out in other worktree"
+#: command-list.h:118
+msgid "List the contents of a tree object"
msgstr ""
-#: builtin/worktree.c:388
-msgid "create a new branch"
+#: command-list.h:119
+msgid "Extracts patch and authorship from a single e-mail message"
msgstr ""
-#: builtin/worktree.c:390
-msgid "create or reset a branch"
+#: command-list.h:120
+msgid "Simple UNIX mbox splitter program"
msgstr ""
-#: builtin/worktree.c:392
-msgid "populate the new working tree"
+#: command-list.h:121
+msgid "Join two or more development histories together"
msgstr ""
-#: builtin/worktree.c:393
-msgid "keep the new working tree locked"
+#: command-list.h:122
+msgid "Find as good common ancestors as possible for a merge"
msgstr ""
-#: builtin/worktree.c:395
-msgid "set up tracking mode (see git-branch(1))"
+#: command-list.h:123
+msgid "Run a three-way file merge"
msgstr ""
-#: builtin/worktree.c:398
-msgid "try to match the new branch name with a remote-tracking branch"
+#: command-list.h:124
+msgid "Run a merge for files needing merging"
msgstr ""
-#: builtin/worktree.c:406
-msgid "-b, -B, and --detach are mutually exclusive"
+#: command-list.h:125
+msgid "The standard helper program to use with git-merge-index"
msgstr ""
-#: builtin/worktree.c:471
-msgid "--[no-]track can only be used if a new branch is created"
+#: command-list.h:126
+msgid "Run merge conflict resolution tools to resolve merge conflicts"
msgstr ""
-#: builtin/worktree.c:571
-msgid "reason for locking"
+#: command-list.h:127
+msgid "Show three-way merge without touching index"
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:128
+msgid "Write and verify multi-pack-indexes"
msgstr ""
-#: builtin/worktree.c:585 builtin/worktree.c:618
-msgid "The main working tree cannot be locked or unlocked"
+#: command-list.h:129
+msgid "Creates a tag object"
msgstr ""
-#: builtin/worktree.c:590
-#, c-format
-msgid "'%s' is already locked, reason: %s"
+#: command-list.h:130
+msgid "Build a tree-object from ls-tree formatted text"
msgstr ""
-#: builtin/worktree.c:592
-#, c-format
-msgid "'%s' is already locked"
+#: command-list.h:131
+msgid "Move or rename a file, a directory, or a symlink"
msgstr ""
-#: builtin/worktree.c:620
-#, c-format
-msgid "'%s' is not locked"
+#: command-list.h:132
+msgid "Find symbolic names for given revs"
msgstr ""
-#: builtin/worktree.c:645
-msgid "working trees containing submodules cannot be moved or removed"
+#: command-list.h:133
+msgid "Add or inspect object notes"
msgstr ""
-#: builtin/worktree.c:672 builtin/worktree.c:811
-#, c-format
-msgid "'%s' is a main working tree"
+#: command-list.h:134
+msgid "Import from and submit to Perforce repositories"
msgstr ""
-#: builtin/worktree.c:677
-#, c-format
-msgid "could not figure out destination name from '%s'"
+#: command-list.h:135
+msgid "Create a packed archive of objects"
msgstr ""
-#: builtin/worktree.c:683
-#, c-format
-msgid "target '%s' already exists"
+#: command-list.h:136
+msgid "Find redundant pack files"
msgstr ""
-#: builtin/worktree.c:690
-#, c-format
-msgid "cannot move a locked working tree, lock reason: %s"
+#: command-list.h:137
+msgid "Pack heads and tags for efficient repository access"
msgstr ""
-#: builtin/worktree.c:692
-msgid "cannot move a locked working tree"
+#: command-list.h:138
+msgid "Routines to help parsing remote repository access parameters"
msgstr ""
-#: builtin/worktree.c:695
-#, c-format
-msgid "validation failed, cannot move working tree: %s"
+#: command-list.h:139
+msgid "Compute unique ID for a patch"
msgstr ""
-#: builtin/worktree.c:700
-#, c-format
-msgid "failed to move '%s' to '%s'"
+#: command-list.h:140
+msgid "Prune all unreachable objects from the object database"
msgstr ""
-#: builtin/worktree.c:748
-#, c-format
-msgid "failed to run 'git status' on '%s'"
+#: command-list.h:141
+msgid "Remove extra objects that are already in pack files"
msgstr ""
-#: builtin/worktree.c:752
-#, c-format
-msgid "'%s' is dirty, use --force to delete it"
+#: command-list.h:142
+msgid "Fetch from and integrate with another repository or a local branch"
msgstr ""
-#: builtin/worktree.c:757
-#, c-format
-msgid "failed to run 'git status' on '%s', code %d"
+#: command-list.h:143
+msgid "Update remote refs along with associated objects"
msgstr ""
-#: builtin/worktree.c:768 builtin/worktree.c:782
-#, c-format
-msgid "failed to delete '%s'"
+#: command-list.h:144
+msgid "Applies a quilt patchset onto the current branch"
msgstr ""
-#: builtin/worktree.c:794
-msgid "force removing even if the worktree is dirty"
+#: command-list.h:145
+msgid "Compare two commit ranges (e.g. two versions of a branch)"
msgstr ""
-#: builtin/worktree.c:815
-#, c-format
-msgid "cannot remove a locked working tree, lock reason: %s"
+#: command-list.h:146
+msgid "Reads tree information into the index"
msgstr ""
-#: builtin/worktree.c:817
-msgid "cannot remove a locked working tree"
+#: command-list.h:147
+msgid "Reapply commits on top of another base tip"
msgstr ""
-#: builtin/worktree.c:820
-#, c-format
-msgid "validation failed, cannot remove working tree: %s"
+#: command-list.h:148
+msgid "Receive what is pushed into the repository"
msgstr ""
-#: builtin/write-tree.c:14
-msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
+#: command-list.h:149
+msgid "Manage reflog information"
msgstr ""
-#: builtin/write-tree.c:27
-msgid "<prefix>/"
+#: command-list.h:150
+msgid "Manage set of tracked repositories"
msgstr ""
-#: builtin/write-tree.c:28
-msgid "write tree object for a subdirectory <prefix>"
+#: command-list.h:151
+msgid "Pack unpacked objects in a repository"
msgstr ""
-#: builtin/write-tree.c:31
-msgid "only useful for debugging"
+#: command-list.h:152
+msgid "Create, list, delete refs to replace objects"
msgstr ""
-#: upload-pack.c:27
-msgid "git upload-pack [<options>] <dir>"
+#: command-list.h:153
+msgid "Generates a summary of pending changes"
msgstr ""
-#: upload-pack.c:1070
-msgid "quit after a single request/response exchange"
+#: command-list.h:154
+msgid "Reuse recorded resolution of conflicted merges"
msgstr ""
-#: upload-pack.c:1072
-msgid "exit immediately after initial ref advertisement"
+#: command-list.h:155
+msgid "Reset current HEAD to the specified state"
msgstr ""
-#: upload-pack.c:1074
-msgid "do not try <directory>/.git/ if <directory> is no Git directory"
+#: command-list.h:156
+msgid "Revert some existing commits"
msgstr ""
-#: upload-pack.c:1076
-msgid "interrupt transfer after <n> seconds of inactivity"
+#: command-list.h:157
+msgid "Lists commit objects in reverse chronological order"
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:158
+msgid "Pick out and massage parameters"
msgstr ""
-#: credential-cache--daemon.c:271
-msgid "print debugging messages to stderr"
+#: command-list.h:159
+msgid "Remove files from the working tree and from the index"
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:160
+msgid "Send a collection of patches as emails"
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:161
+msgid "Push objects over Git protocol to another repository"
msgstr ""
-#: git.c:95
-#, c-format
-msgid "no directory given for --git-dir\n"
+#: command-list.h:162
+msgid "Restricted login shell for Git-only SSH access"
msgstr ""
-#: git.c:109
-#, c-format
-msgid "no namespace given for --namespace\n"
+#: command-list.h:163
+msgid "Summarize 'git log' output"
msgstr ""
-#: git.c:123
-#, c-format
-msgid "no directory given for --work-tree\n"
+#: command-list.h:164
+msgid "Show various types of objects"
msgstr ""
-#: git.c:137
-#, c-format
-msgid "no prefix given for --super-prefix\n"
+#: command-list.h:165
+msgid "Show branches and their commits"
msgstr ""
-#: git.c:159
-#, c-format
-msgid "-c expects a configuration string\n"
+#: command-list.h:166
+msgid "Show packed archive index"
msgstr ""
-#: git.c:197
-#, c-format
-msgid "no directory given for -C\n"
+#: command-list.h:167
+msgid "List references in a local repository"
msgstr ""
-#: git.c:212
-#, c-format
-msgid "unknown option: %s\n"
+#: command-list.h:168
+msgid "Git's i18n setup code for shell scripts"
msgstr ""
-#: git.c:687
-#, c-format
-msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
+#: command-list.h:169
+msgid "Common Git shell script setup code"
msgstr ""
-#: git.c:699
-#, c-format
-msgid "failed to run command '%s': %s\n"
+#: command-list.h:170
+msgid "Stash the changes in a dirty working directory away"
msgstr ""
-#: http.c:342
-#, c-format
-msgid "negative value for http.postbuffer; defaulting to %d"
+#: command-list.h:171
+msgid "Add file contents to the staging area"
msgstr ""
-#: http.c:363
-msgid "Delegation control is not supported with cURL < 7.22.0"
+#: command-list.h:172
+msgid "Show the working tree status"
msgstr ""
-#: http.c:372
-msgid "Public key pinning not supported with cURL < 7.44.0"
+#: command-list.h:173
+msgid "Remove unnecessary whitespace"
msgstr ""
-#: http.c:1857
-#, c-format
-msgid ""
-"unable to update url base from redirection:\n"
-" asked for: %s\n"
-" redirect: %s"
+#: command-list.h:174
+msgid "Initialize, update or inspect submodules"
msgstr ""
-#: remote-curl.c:345
-#, c-format
-msgid "redirecting to %s"
+#: command-list.h:175
+msgid "Bidirectional operation between a Subversion repository and Git"
msgstr ""
-#: list-objects-filter-options.h:59
-msgid "args"
+#: command-list.h:176
+msgid "Read, modify and delete symbolic refs"
msgstr ""
-#: list-objects-filter-options.h:60
-msgid "object filtering"
+#: command-list.h:177
+msgid "Create, list, delete or verify a tag object signed with GPG"
msgstr ""
-#: common-cmds.h:9
-msgid "start a working area (see also: git help tutorial)"
+#: command-list.h:178
+msgid "Creates a temporary file with a blob's contents"
msgstr ""
-#: common-cmds.h:10
-msgid "work on the current change (see also: git help everyday)"
+#: command-list.h:179
+msgid "Unpack objects from a packed archive"
msgstr ""
-#: common-cmds.h:11
-msgid "examine the history and state (see also: git help revisions)"
+#: command-list.h:180
+msgid "Register file contents in the working tree to the index"
msgstr ""
-#: common-cmds.h:12
-msgid "grow, mark and tweak your common history"
+#: command-list.h:181
+msgid "Update the object name stored in a ref safely"
msgstr ""
-#: common-cmds.h:13
-msgid "collaborate (see also: git help workflows)"
+#: command-list.h:182
+msgid "Update auxiliary info file to help dumb servers"
msgstr ""
-#: common-cmds.h:17
-msgid "Add file contents to the index"
+#: command-list.h:183
+msgid "Send archive back to git-archive"
msgstr ""
-#: common-cmds.h:18
-msgid "Use binary search to find the commit that introduced a bug"
+#: command-list.h:184
+msgid "Send objects packed back to git-fetch-pack"
msgstr ""
-#: common-cmds.h:19
-msgid "List, create, or delete branches"
+#: command-list.h:185
+msgid "Show a Git logical variable"
msgstr ""
-#: common-cmds.h:20
-msgid "Switch branches or restore working tree files"
+#: command-list.h:186
+msgid "Check the GPG signature of commits"
msgstr ""
-#: common-cmds.h:21
-msgid "Clone a repository into a new directory"
+#: command-list.h:187
+msgid "Validate packed Git archive files"
msgstr ""
-#: common-cmds.h:22
-msgid "Record changes to the repository"
+#: command-list.h:188
+msgid "Check the GPG signature of tags"
msgstr ""
-#: common-cmds.h:23
-msgid "Show changes between commits, commit and working tree, etc"
+#: command-list.h:189
+msgid "Git web interface (web frontend to Git repositories)"
msgstr ""
-#: common-cmds.h:24
-msgid "Download objects and refs from another repository"
+#: command-list.h:190
+msgid "Show logs with difference each commit introduces"
msgstr ""
-#: common-cmds.h:25
-msgid "Print lines matching a pattern"
+#: command-list.h:191
+msgid "Manage multiple working trees"
msgstr ""
-#: common-cmds.h:26
-msgid "Create an empty Git repository or reinitialize an existing one"
+#: command-list.h:192
+msgid "Create a tree object from the current index"
msgstr ""
-#: common-cmds.h:27
-msgid "Show commit logs"
+#: command-list.h:193
+msgid "Defining attributes per path"
msgstr ""
-#: common-cmds.h:28
-msgid "Join two or more development histories together"
+#: command-list.h:194
+msgid "Git command-line interface and conventions"
msgstr ""
-#: common-cmds.h:29
-msgid "Move or rename a file, a directory, or a symlink"
+#: command-list.h:195
+msgid "A Git core tutorial for developers"
msgstr ""
-#: common-cmds.h:30
-msgid "Fetch from and integrate with another repository or a local branch"
+#: command-list.h:196
+msgid "Git for CVS users"
msgstr ""
-#: common-cmds.h:31
-msgid "Update remote refs along with associated objects"
+#: command-list.h:197
+msgid "Tweaking diff output"
msgstr ""
-#: common-cmds.h:32
-msgid "Reapply commits on top of another base tip"
+#: command-list.h:198
+msgid "A useful minimum set of commands for Everyday Git"
msgstr ""
-#: common-cmds.h:33
-msgid "Reset current HEAD to the specified state"
+#: command-list.h:199
+msgid "A Git Glossary"
msgstr ""
-#: common-cmds.h:34
-msgid "Remove files from the working tree and from the index"
+#: command-list.h:200
+msgid "Hooks used by Git"
msgstr ""
-#: common-cmds.h:35
-msgid "Show various types of objects"
+#: command-list.h:201
+msgid "Specifies intentionally untracked files to ignore"
msgstr ""
-#: common-cmds.h:36
-msgid "Show the working tree status"
+#: command-list.h:202
+msgid "Defining submodule properties"
msgstr ""
-#: common-cmds.h:37
-msgid "Create, list, delete or verify a tag object signed with GPG"
+#: command-list.h:203
+msgid "Git namespaces"
msgstr ""
-#: parse-options.h:157
-msgid "expiry-date"
+#: command-list.h:204
+msgid "Git Repository Layout"
msgstr ""
-#: parse-options.h:172
-msgid "no-op (backward compatibility)"
+#: command-list.h:205
+msgid "Specifying revisions and ranges for Git"
msgstr ""
-#: parse-options.h:250
-msgid "be more verbose"
+#: command-list.h:206
+msgid "A tutorial introduction to Git: part two"
msgstr ""
-#: parse-options.h:252
-msgid "be more quiet"
+#: command-list.h:207
+msgid "A tutorial introduction to Git"
msgstr ""
-#: parse-options.h:258
-msgid "use <n> digits to display SHA-1s"
+#: command-list.h:208
+msgid "An overview of recommended workflows with Git"
msgstr ""
-#: rerere.h:40
+#: rerere.h:44
msgid "update the index with reused conflict resolution if possible"
msgstr ""
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:434
#, sh-format
msgid "Could not move back to $head_name"
msgstr ""
-#: git-rebase.sh:174
-msgid "Applied autostash."
-msgstr ""
-
-#: git-rebase.sh:177
-#, 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."
-msgstr ""
-
-#: git-rebase.sh:370
-msgid "No rebase in progress?"
-msgstr ""
-
-#: git-rebase.sh:381
-msgid "The --edit-todo action can only be used during interactive rebase."
-msgstr ""
-
-#: git-rebase.sh:388
-msgid "Cannot read HEAD"
-msgstr ""
-
-#: git-rebase.sh:391
-msgid ""
-"You must edit all merge conflicts and then\n"
-"mark them as resolved using git add"
-msgstr ""
-
-#: git-rebase.sh:435
+#: git-legacy-rebase.sh:460
#, sh-format
msgid ""
"It seems that there is already a $state_dir_base directory, and\n"
"valuable there."
msgstr ""
-#: git-rebase.sh:491
+#: git-legacy-rebase.sh:525
+msgid "error: cannot combine '--signoff' with '--preserve-merges'"
+msgstr ""
+
+#: git-legacy-rebase.sh:570
#, sh-format
msgid "invalid upstream '$upstream_name'"
msgstr ""
-#: git-rebase.sh:515
+#: git-legacy-rebase.sh:594
#, 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:597 git-legacy-rebase.sh:601
#, sh-format
msgid "$onto_name: there is no merge base"
msgstr ""
-#: git-rebase.sh:527
+#: git-legacy-rebase.sh:606
#, sh-format
msgid "Does not point to a valid commit: $onto_name"
msgstr ""
-#: git-rebase.sh:553
+#: git-legacy-rebase.sh:632
#, 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:670
#, 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:699
#, sh-format
msgid "Current branch $branch_name is up to date."
msgstr ""
-#: git-rebase.sh:628
+#: git-legacy-rebase.sh:709
#, 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:723
#, 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:725
#, sh-format
msgid "Changes from $mb to $onto:"
msgstr ""
-#: git-rebase.sh:651
+#: git-legacy-rebase.sh:736
msgid "First, rewinding head to replay your work on top of it..."
msgstr ""
-#: git-rebase.sh:661
+#: git-legacy-rebase.sh:746
#, sh-format
msgid "Fast-forwarded $branch_name to $onto_name."
msgstr ""
msgid "Saved working directory and index state $stash_msg"
msgstr ""
-#: git-stash.sh:340
+#: git-stash.sh:342
msgid "Cannot remove worktree changes"
msgstr ""
-#: git-stash.sh:488
+#: git-stash.sh:490
#, sh-format
msgid "unknown option: $opt"
msgstr ""
-#: git-stash.sh:501
+#: git-stash.sh:503
msgid "No stash entries found."
msgstr ""
-#: git-stash.sh:508
+#: git-stash.sh:510
#, sh-format
msgid "Too many revisions specified: $REV"
msgstr ""
-#: git-stash.sh:523
+#: git-stash.sh:525
#, sh-format
msgid "$reference is not a valid reference"
msgstr ""
-#: git-stash.sh:551
+#: git-stash.sh:553
#, sh-format
msgid "'$args' is not a stash-like commit"
msgstr ""
-#: git-stash.sh:562
+#: git-stash.sh:564
#, sh-format
msgid "'$args' is not a stash reference"
msgstr ""
-#: git-stash.sh:570
+#: git-stash.sh:572
msgid "unable to refresh index"
msgstr ""
-#: git-stash.sh:574
+#: git-stash.sh:576
msgid "Cannot apply a stash in the middle of a merge"
msgstr ""
-#: git-stash.sh:582
+#: git-stash.sh:584
msgid "Conflicts in index. Try without --index."
msgstr ""
-#: git-stash.sh:584
+#: git-stash.sh:586
msgid "Could not save index tree"
msgstr ""
-#: git-stash.sh:593
+#: git-stash.sh:595
msgid "Could not restore untracked files from stash entry"
msgstr ""
-#: git-stash.sh:618
+#: git-stash.sh:620
msgid "Cannot unstage modified files"
msgstr ""
-#: git-stash.sh:633
+#: git-stash.sh:635
msgid "Index was not unstashed."
msgstr ""
-#: git-stash.sh:647
+#: git-stash.sh:649
msgid "The stash entry is kept in case you need it again."
msgstr ""
-#: git-stash.sh:656
+#: git-stash.sh:658
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr ""
-#: git-stash.sh:657
+#: git-stash.sh:659
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr ""
-#: git-stash.sh:665
+#: git-stash.sh:667
msgid "No branch name specified"
msgstr ""
-#: git-stash.sh:744
+#: git-stash.sh:746
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 ""
projects / platform / upstream / git.git / blobdiff