msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2019-08-10 20:12+0800\n"
+"POT-Creation-Date: 2019-10-21 19: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"
msgid "Exiting because of an unresolved conflict."
msgstr ""
-#: advice.c:193 builtin/merge.c:1327
+#: advice.c:193 builtin/merge.c:1332
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr ""
msgid "inconsistent header lines %d and %d"
msgstr ""
-#: apply.c:1460
-#, c-format
-msgid "recount: unexpected line: %.*s"
-msgstr ""
-
-#: apply.c:1529
-#, c-format
-msgid "patch fragment without header at line %d: %.*s"
-msgstr ""
-
-#: apply.c:1551
+#: apply.c:1372
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
msgstr[0] ""
msgstr[1] ""
-#: apply.c:1564
+#: apply.c:1385
#, c-format
msgid "git diff header lacks filename information (line %d)"
msgstr ""
-#: apply.c:1752
+#: apply.c:1481
+#, c-format
+msgid "recount: unexpected line: %.*s"
+msgstr ""
+
+#: apply.c:1550
+#, c-format
+msgid "patch fragment without header at line %d: %.*s"
+msgstr ""
+
+#: apply.c:1753
msgid "new file depends on old contents"
msgstr ""
-#: apply.c:1754
+#: apply.c:1755
msgid "deleted file still has contents"
msgstr ""
-#: apply.c:1788
+#: apply.c:1789
#, c-format
msgid "corrupt patch at line %d"
msgstr ""
-#: apply.c:1825
+#: apply.c:1826
#, c-format
msgid "new file %s depends on old contents"
msgstr ""
-#: apply.c:1827
+#: apply.c:1828
#, c-format
msgid "deleted file %s still has contents"
msgstr ""
-#: apply.c:1830
+#: apply.c:1831
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr ""
-#: apply.c:1977
+#: apply.c:1978
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr ""
-#: apply.c:2014
+#: apply.c:2015
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr ""
-#: apply.c:2176
+#: apply.c:2177
#, c-format
msgid "patch with only garbage at line %d"
msgstr ""
-#: apply.c:2262
+#: apply.c:2263
#, c-format
msgid "unable to read symlink %s"
msgstr ""
-#: apply.c:2266
+#: apply.c:2267
#, c-format
msgid "unable to open or read %s"
msgstr ""
-#: apply.c:2925
+#: apply.c:2926
#, c-format
msgid "invalid start of line: '%c'"
msgstr ""
-#: apply.c:3046
+#: apply.c:3047
#, 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:3058
+#: apply.c:3059
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr ""
-#: apply.c:3064
+#: apply.c:3065
#, c-format
msgid ""
"while searching for:\n"
"%.*s"
msgstr ""
-#: apply.c:3086
+#: apply.c:3087
#, c-format
msgid "missing binary patch data for '%s'"
msgstr ""
-#: apply.c:3094
+#: apply.c:3095
#, c-format
msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
msgstr ""
-#: apply.c:3141
+#: apply.c:3142
#, c-format
msgid "cannot apply binary patch to '%s' without full index line"
msgstr ""
-#: apply.c:3151
+#: apply.c:3152
#, c-format
msgid ""
"the patch applies to '%s' (%s), which does not match the current contents."
msgstr ""
-#: apply.c:3159
+#: apply.c:3160
#, c-format
msgid "the patch applies to an empty '%s' but it is not empty"
msgstr ""
-#: apply.c:3177
+#: apply.c:3178
#, c-format
msgid "the necessary postimage %s for '%s' cannot be read"
msgstr ""
-#: apply.c:3190
+#: apply.c:3191
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr ""
-#: apply.c:3196
+#: apply.c:3197
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr ""
-#: apply.c:3217
+#: apply.c:3218
#, c-format
msgid "patch failed: %s:%ld"
msgstr ""
-#: apply.c:3340
+#: apply.c:3341
#, c-format
msgid "cannot checkout %s"
msgstr ""
-#: apply.c:3392 apply.c:3403 apply.c:3449 midx.c:62 setup.c:279
+#: apply.c:3393 apply.c:3404 apply.c:3450 midx.c:61 setup.c:280
#, c-format
msgid "failed to read %s"
msgstr ""
-#: apply.c:3400
+#: apply.c:3401
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr ""
-#: apply.c:3429 apply.c:3672
+#: apply.c:3430 apply.c:3673
#, c-format
msgid "path %s has been renamed/deleted"
msgstr ""
-#: apply.c:3515 apply.c:3687
+#: apply.c:3516 apply.c:3688
#, c-format
msgid "%s: does not exist in index"
msgstr ""
-#: apply.c:3524 apply.c:3695
+#: apply.c:3525 apply.c:3696
#, c-format
msgid "%s: does not match index"
msgstr ""
-#: apply.c:3559
+#: apply.c:3560
msgid "repository lacks the necessary blob to fall back on 3-way merge."
msgstr ""
-#: apply.c:3562
+#: apply.c:3563
#, c-format
msgid "Falling back to three-way merge...\n"
msgstr ""
-#: apply.c:3578 apply.c:3582
+#: apply.c:3579 apply.c:3583
#, c-format
msgid "cannot read the current contents of '%s'"
msgstr ""
-#: apply.c:3594
+#: apply.c:3595
#, c-format
msgid "Failed to fall back on three-way merge...\n"
msgstr ""
-#: apply.c:3608
+#: apply.c:3609
#, c-format
msgid "Applied patch to '%s' with conflicts.\n"
msgstr ""
-#: apply.c:3613
+#: apply.c:3614
#, c-format
msgid "Applied patch to '%s' cleanly.\n"
msgstr ""
-#: apply.c:3639
+#: apply.c:3640
msgid "removal patch leaves file contents"
msgstr ""
-#: apply.c:3712
+#: apply.c:3713
#, c-format
msgid "%s: wrong type"
msgstr ""
-#: apply.c:3714
+#: apply.c:3715
#, c-format
msgid "%s has type %o, expected %o"
msgstr ""
-#: apply.c:3865 apply.c:3867 read-cache.c:830 read-cache.c:856
+#: apply.c:3866 apply.c:3868 read-cache.c:830 read-cache.c:856
#: read-cache.c:1309
#, c-format
msgid "invalid path '%s'"
msgstr ""
-#: apply.c:3923
+#: apply.c:3924
#, c-format
msgid "%s: already exists in index"
msgstr ""
-#: apply.c:3926
+#: apply.c:3927
#, c-format
msgid "%s: already exists in working directory"
msgstr ""
-#: apply.c:3946
+#: apply.c:3947
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr ""
-#: apply.c:3951
+#: apply.c:3952
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr ""
-#: apply.c:3971
+#: apply.c:3972
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr ""
-#: apply.c:3975
+#: apply.c:3976
#, c-format
msgid "%s: patch does not apply"
msgstr ""
-#: apply.c:3990
+#: apply.c:3991
#, c-format
msgid "Checking patch %s..."
msgstr ""
-#: apply.c:4082
+#: apply.c:4083
#, c-format
msgid "sha1 information is lacking or useless for submodule %s"
msgstr ""
-#: apply.c:4089
+#: apply.c:4090
#, c-format
msgid "mode change for %s, which is not in current HEAD"
msgstr ""
-#: apply.c:4092
+#: apply.c:4093
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr ""
-#: apply.c:4097 builtin/checkout.c:278 builtin/reset.c:143
+#: apply.c:4098 builtin/checkout.c:279 builtin/reset.c:143
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr ""
-#: apply.c:4101
+#: apply.c:4102
#, c-format
msgid "could not add %s to temporary index"
msgstr ""
-#: apply.c:4111
+#: apply.c:4112
#, c-format
msgid "could not write temporary index to %s"
msgstr ""
-#: apply.c:4249
+#: apply.c:4250
#, c-format
msgid "unable to remove %s from index"
msgstr ""
-#: apply.c:4283
+#: apply.c:4284
#, c-format
msgid "corrupt patch for submodule %s"
msgstr ""
-#: apply.c:4289
+#: apply.c:4290
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr ""
-#: apply.c:4297
+#: apply.c:4298
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr ""
-#: apply.c:4303 apply.c:4448
+#: apply.c:4304 apply.c:4449
#, c-format
msgid "unable to add cache entry for %s"
msgstr ""
-#: apply.c:4346
+#: apply.c:4347
#, c-format
msgid "failed to write to '%s'"
msgstr ""
-#: apply.c:4350
+#: apply.c:4351
#, c-format
msgid "closing file '%s'"
msgstr ""
-#: apply.c:4420
+#: apply.c:4421
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr ""
-#: apply.c:4518
+#: apply.c:4519
#, c-format
msgid "Applied patch %s cleanly."
msgstr ""
-#: apply.c:4526
+#: apply.c:4527
msgid "internal error"
msgstr ""
-#: apply.c:4529
+#: apply.c:4530
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] ""
msgstr[1] ""
-#: apply.c:4540
+#: apply.c:4541
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr ""
-#: apply.c:4548 builtin/fetch.c:878 builtin/fetch.c:1168
+#: apply.c:4549 builtin/fetch.c:898 builtin/fetch.c:1194
#, c-format
msgid "cannot open %s"
msgstr ""
-#: apply.c:4562
+#: apply.c:4563
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr ""
-#: apply.c:4566
+#: apply.c:4567
#, c-format
msgid "Rejected hunk #%d."
msgstr ""
-#: apply.c:4676
+#: apply.c:4686
#, c-format
msgid "Skipped patch '%s'."
msgstr ""
-#: apply.c:4684
+#: apply.c:4694
msgid "unrecognized input"
msgstr ""
-#: apply.c:4704
+#: apply.c:4714
msgid "unable to read index file"
msgstr ""
-#: apply.c:4859
+#: apply.c:4871
#, c-format
msgid "can't open patch '%s': %s"
msgstr ""
-#: apply.c:4886
+#: apply.c:4898
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] ""
msgstr[1] ""
-#: apply.c:4892 apply.c:4907
+#: apply.c:4904 apply.c:4919
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgstr[0] ""
msgstr[1] ""
-#: apply.c:4900
+#: apply.c:4912
#, 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:4916 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390
+#: apply.c:4928 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390
msgid "Unable to write new index file"
msgstr ""
-#: apply.c:4943 apply.c:4946 builtin/am.c:2208 builtin/am.c:2211
-#: builtin/clone.c:123 builtin/fetch.c:128 builtin/merge.c:273
-#: builtin/pull.c:208 builtin/submodule--helper.c:407
+#: apply.c:4955 apply.c:4958 builtin/am.c:2197 builtin/am.c:2200
+#: builtin/clone.c:122 builtin/fetch.c:143 builtin/merge.c:273
+#: builtin/pull.c:209 builtin/submodule--helper.c:407
#: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1370
#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:1853
#: builtin/submodule--helper.c:2092 git-add--interactive.perl:211
msgid "path"
msgstr ""
-#: apply.c:4944
+#: apply.c:4956
msgid "don't apply changes matching the given path"
msgstr ""
-#: apply.c:4947
+#: apply.c:4959
msgid "apply changes matching the given path"
msgstr ""
-#: apply.c:4949 builtin/am.c:2217
+#: apply.c:4961 builtin/am.c:2206
msgid "num"
msgstr ""
-#: apply.c:4950
+#: apply.c:4962
msgid "remove <num> leading slashes from traditional diff paths"
msgstr ""
-#: apply.c:4953
+#: apply.c:4965
msgid "ignore additions made by the patch"
msgstr ""
-#: apply.c:4955
+#: apply.c:4967
msgid "instead of applying the patch, output diffstat for the input"
msgstr ""
-#: apply.c:4959
+#: apply.c:4971
msgid "show number of added and deleted lines in decimal notation"
msgstr ""
-#: apply.c:4961
+#: apply.c:4973
msgid "instead of applying the patch, output a summary for the input"
msgstr ""
-#: apply.c:4963
+#: apply.c:4975
msgid "instead of applying the patch, see if the patch is applicable"
msgstr ""
-#: apply.c:4965
+#: apply.c:4977
msgid "make sure the patch is applicable to the current index"
msgstr ""
-#: apply.c:4967
+#: apply.c:4979
msgid "mark new files with `git add --intent-to-add`"
msgstr ""
-#: apply.c:4969
+#: apply.c:4981
msgid "apply a patch without touching the working tree"
msgstr ""
-#: apply.c:4971
+#: apply.c:4983
msgid "accept a patch that touches outside the working area"
msgstr ""
-#: apply.c:4974
+#: apply.c:4986
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr ""
-#: apply.c:4976
+#: apply.c:4988
msgid "attempt three-way merge if a patch does not apply"
msgstr ""
-#: apply.c:4978
+#: apply.c:4990
msgid "build a temporary index based on embedded index information"
msgstr ""
-#: apply.c:4981 builtin/checkout-index.c:173 builtin/ls-files.c:524
+#: apply.c:4993 builtin/checkout-index.c:173 builtin/ls-files.c:524
msgid "paths are separated with NUL character"
msgstr ""
-#: apply.c:4983
+#: apply.c:4995
msgid "ensure at least <n> lines of context match"
msgstr ""
-#: apply.c:4984 builtin/am.c:2196 builtin/interpret-trailers.c:98
+#: apply.c:4996 builtin/am.c:2185 builtin/interpret-trailers.c:98
#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102
-#: builtin/pack-objects.c:3330 builtin/rebase.c:1421
+#: builtin/pack-objects.c:3310 builtin/rebase.c:1445
msgid "action"
msgstr ""
-#: apply.c:4985
+#: apply.c:4997
msgid "detect new or modified lines that have whitespace errors"
msgstr ""
-#: apply.c:4988 apply.c:4991
+#: apply.c:5000 apply.c:5003
msgid "ignore changes in whitespace when finding context"
msgstr ""
-#: apply.c:4994
+#: apply.c:5006
msgid "apply the patch in reverse"
msgstr ""
-#: apply.c:4996
+#: apply.c:5008
msgid "don't expect at least one line of context"
msgstr ""
-#: apply.c:4998
+#: apply.c:5010
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr ""
-#: apply.c:5000
+#: apply.c:5012
msgid "allow overlapping hunks"
msgstr ""
-#: apply.c:5001 builtin/add.c:291 builtin/check-ignore.c:22
+#: apply.c:5013 builtin/add.c:291 builtin/check-ignore.c:22
#: builtin/commit.c:1337 builtin/count-objects.c:98 builtin/fsck.c:786
-#: builtin/log.c:2068 builtin/mv.c:123 builtin/read-tree.c:128
+#: builtin/log.c:2085 builtin/mv.c:123 builtin/read-tree.c:128
msgid "be verbose"
msgstr ""
-#: apply.c:5003
+#: apply.c:5015
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr ""
-#: apply.c:5006
+#: apply.c:5018
msgid "do not trust the line counts in the hunk headers"
msgstr ""
-#: apply.c:5008 builtin/am.c:2205
+#: apply.c:5020 builtin/am.c:2194
msgid "root"
msgstr ""
-#: apply.c:5009
+#: apply.c:5021
msgid "prepend <root> to all filenames"
msgstr ""
msgid "archive format"
msgstr ""
-#: archive.c:458 builtin/log.c:1580
+#: archive.c:458 builtin/log.c:1581
msgid "prefix"
msgstr ""
msgid "prepend prefix to each pathname in the archive"
msgstr ""
-#: archive.c:460 builtin/blame.c:862 builtin/blame.c:874 builtin/blame.c:875
-#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1134
-#: builtin/fast-export.c:1136 builtin/grep.c:897 builtin/hash-object.c:105
-#: builtin/ls-files.c:560 builtin/ls-files.c:563 builtin/notes.c:412
-#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:177
+#: archive.c:460 builtin/blame.c:861 builtin/blame.c:873 builtin/blame.c:874
+#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1162
+#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:899
+#: builtin/hash-object.c:105 builtin/ls-files.c:560 builtin/ls-files.c:563
+#: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123
+#: parse-options.h:186
msgid "file"
msgstr ""
msgid "list supported archive formats"
msgstr ""
-#: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116
+#: archive.c:479 builtin/archive.c:91 builtin/clone.c:112 builtin/clone.c:115
#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1859
msgid "repo"
msgstr ""
msgid "retrieve the archive from remote repository <repo>"
msgstr ""
-#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:707
+#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:715
#: builtin/notes.c:498
msgid "command"
msgstr ""
msgid "cannot stream blob %s"
msgstr ""
-#: archive-tar.c:260 archive-zip.c:363
+#: archive-tar.c:266 archive-zip.c:363
#, c-format
msgid "unsupported file mode: 0%o (SHA1: %s)"
msgstr ""
-#: archive-tar.c:287 archive-zip.c:353
+#: archive-tar.c:293 archive-zip.c:353
#, c-format
msgid "cannot read %s"
msgstr ""
-#: archive-tar.c:459
+#: archive-tar.c:465
#, c-format
msgid "unable to start '%s' filter"
msgstr ""
-#: archive-tar.c:462
+#: archive-tar.c:468
msgid "unable to redirect descriptor"
msgstr ""
-#: archive-tar.c:469
+#: archive-tar.c:475
#, c-format
msgid "'%s' filter reported error"
msgstr ""
msgid "timestamp too large for this system: %<PRIuMAX>"
msgstr ""
-#: attr.c:211
+#: attr.c:213
#, c-format
msgid "%.*s is not a valid attribute name"
msgstr ""
-#: attr.c:368
+#: attr.c:370
#, c-format
msgid "%s not allowed: %s:%d"
msgstr ""
-#: attr.c:408
+#: attr.c:410
msgid ""
"Negative patterns are ignored in git attributes\n"
"Use '\\!' for literal leading exclamation."
msgstr[0] ""
msgstr[1] ""
-#: blame.c:2697
+#: blame.c:2700
msgid "--contents and --reverse do not blend well."
msgstr ""
-#: blame.c:2711
+#: blame.c:2714
msgid "cannot use --contents with final commit object name"
msgstr ""
-#: blame.c:2732
+#: blame.c:2735
msgid "--reverse and --first-parent together require specified latest commit"
msgstr ""
-#: blame.c:2741 bundle.c:167 ref-filter.c:2196 remote.c:1938 sequencer.c:2033
-#: sequencer.c:4348 builtin/commit.c:1020 builtin/log.c:387 builtin/log.c:963
-#: builtin/log.c:1451 builtin/log.c:1827 builtin/log.c:2117 builtin/merge.c:411
-#: builtin/pack-objects.c:3148 builtin/pack-objects.c:3163
+#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1941 sequencer.c:1971
+#: sequencer.c:4305 builtin/commit.c:1020 builtin/log.c:387 builtin/log.c:964
+#: builtin/log.c:1452 builtin/log.c:1844 builtin/log.c:2134 builtin/merge.c:411
+#: builtin/pack-objects.c:3128 builtin/pack-objects.c:3143
#: builtin/shortlog.c:192
msgid "revision walk setup failed"
msgstr ""
-#: blame.c:2759
+#: blame.c:2762
msgid ""
"--reverse --first-parent together require range along first-parent chain"
msgstr ""
-#: blame.c:2770
+#: blame.c:2773
#, c-format
msgid "no such path %s in %s"
msgstr ""
-#: blame.c:2781
+#: blame.c:2784
#, c-format
msgid "cannot read blob %s for path %s"
msgstr ""
msgid "unrecognized header: %s%s (%d)"
msgstr ""
-#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2283 sequencer.c:3024
+#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2221 sequencer.c:2962
#: builtin/commit.c:791
#, c-format
msgid "could not open '%s'"
msgid "ref '%s' is excluded by the rev-list options"
msgstr ""
-#: bundle.c:460 builtin/log.c:202 builtin/log.c:1732 builtin/shortlog.c:306
+#: bundle.c:460 builtin/log.c:202 builtin/log.c:1733 builtin/shortlog.c:306
#, c-format
msgid "unrecognized argument: %s"
msgstr ""
msgid "invalid color value: %.*s"
msgstr ""
-#: commit.c:50 sequencer.c:2727 builtin/am.c:355 builtin/am.c:399
-#: builtin/am.c:1378 builtin/am.c:2020 builtin/replace.c:455
+#: commit.c:50 sequencer.c:2665 builtin/am.c:354 builtin/am.c:398
+#: builtin/am.c:1366 builtin/am.c:2009 builtin/replace.c:456
#, c-format
msgid "could not parse %s"
msgstr ""
"\"git config advice.graftFileDeprecated false\""
msgstr ""
-#: commit.c:1127
+#: commit.c:1128
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr ""
-#: commit.c:1130
+#: commit.c:1131
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr ""
-#: commit.c:1133
+#: commit.c:1134
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr ""
-#: commit.c:1136
+#: commit.c:1137
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr ""
-#: commit.c:1390
+#: commit.c:1391
msgid ""
"Warning: commit message did not conform to UTF-8.\n"
"You may want to amend it after fixing the message, or set the config\n"
msgid "unable to find all commit-graph files"
msgstr ""
-#: commit-graph.c:554 commit-graph.c:614
+#: commit-graph.c:561 commit-graph.c:621
msgid "invalid commit position. commit-graph is likely corrupt"
msgstr ""
-#: commit-graph.c:575
+#: commit-graph.c:582
#, c-format
msgid "could not find commit %s"
msgstr ""
-#: commit-graph.c:1002 builtin/pack-objects.c:2657
+#: commit-graph.c:855 builtin/am.c:1287
+#, c-format
+msgid "unable to parse commit %s"
+msgstr ""
+
+#: commit-graph.c:859
+#, c-format
+msgid "unable to get tree for %s"
+msgstr ""
+
+#: commit-graph.c:1017 builtin/pack-objects.c:2641
#, c-format
msgid "unable to get type of object %s"
msgstr ""
-#: commit-graph.c:1034
+#: commit-graph.c:1049
msgid "Loading known commits in commit graph"
msgstr ""
-#: commit-graph.c:1051
+#: commit-graph.c:1066
msgid "Expanding reachable commits in commit graph"
msgstr ""
-#: commit-graph.c:1070
+#: commit-graph.c:1085
msgid "Clearing commit marks in commit graph"
msgstr ""
-#: commit-graph.c:1089
+#: commit-graph.c:1104
msgid "Computing commit graph generation numbers"
msgstr ""
-#: commit-graph.c:1163
+#: commit-graph.c:1179
#, c-format
msgid "Finding commits for commit graph in %d pack"
msgid_plural "Finding commits for commit graph in %d packs"
msgstr[0] ""
msgstr[1] ""
-#: commit-graph.c:1176
+#: commit-graph.c:1192
#, c-format
msgid "error adding pack %s"
msgstr ""
-#: commit-graph.c:1180
+#: commit-graph.c:1196
#, c-format
msgid "error opening index for %s"
msgstr ""
-#: commit-graph.c:1204
+#: commit-graph.c:1220
#, c-format
msgid "Finding commits for commit graph from %d ref"
msgid_plural "Finding commits for commit graph from %d refs"
msgstr[0] ""
msgstr[1] ""
-#: commit-graph.c:1238
+#: commit-graph.c:1240
+#, c-format
+msgid "invalid commit object id: %s"
+msgstr ""
+
+#: commit-graph.c:1255
msgid "Finding commits for commit graph among packed objects"
msgstr ""
-#: commit-graph.c:1253
+#: commit-graph.c:1270
msgid "Counting distinct commits in commit graph"
msgstr ""
-#: commit-graph.c:1284
+#: commit-graph.c:1300
msgid "Finding extra edges in commit graph"
msgstr ""
-#: commit-graph.c:1332
+#: commit-graph.c:1346
msgid "failed to write correct number of base graph ids"
msgstr ""
-#: commit-graph.c:1365 midx.c:811
+#: commit-graph.c:1379 midx.c:810
#, c-format
msgid "unable to create leading directories of %s"
msgstr ""
-#: commit-graph.c:1377 builtin/index-pack.c:306 builtin/repack.c:240
+#: commit-graph.c:1391 builtin/index-pack.c:306 builtin/repack.c:241
#, c-format
msgid "unable to create '%s'"
msgstr ""
-#: commit-graph.c:1437
+#: commit-graph.c:1451
#, c-format
msgid "Writing out commit graph in %d pass"
msgid_plural "Writing out commit graph in %d passes"
msgstr[0] ""
msgstr[1] ""
-#: commit-graph.c:1478
+#: commit-graph.c:1492
msgid "unable to open commit-graph chain file"
msgstr ""
-#: commit-graph.c:1490
+#: commit-graph.c:1504
msgid "failed to rename base commit-graph file"
msgstr ""
-#: commit-graph.c:1510
+#: commit-graph.c:1524
msgid "failed to rename temporary commit-graph file"
msgstr ""
-#: commit-graph.c:1621
+#: commit-graph.c:1635
msgid "Scanning merged commits"
msgstr ""
-#: commit-graph.c:1632
+#: commit-graph.c:1646
#, c-format
msgid "unexpected duplicate commit id %s"
msgstr ""
-#: commit-graph.c:1657
+#: commit-graph.c:1670
msgid "Merging commit-graph"
msgstr ""
-#: commit-graph.c:1844
+#: commit-graph.c:1860
#, c-format
msgid "the commit graph format cannot write %d commits"
msgstr ""
-#: commit-graph.c:1855
+#: commit-graph.c:1871
msgid "too many commits to write graph"
msgstr ""
-#: commit-graph.c:1945
+#: commit-graph.c:1961
msgid "the commit-graph file has incorrect checksum and is likely corrupt"
msgstr ""
-#: commit-graph.c:1955
+#: commit-graph.c:1971
#, c-format
msgid "commit-graph has incorrect OID order: %s then %s"
msgstr ""
-#: commit-graph.c:1965 commit-graph.c:1980
+#: commit-graph.c:1981 commit-graph.c:1996
#, c-format
msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
msgstr ""
-#: commit-graph.c:1972
+#: commit-graph.c:1988
#, c-format
msgid "failed to parse commit %s from commit-graph"
msgstr ""
-#: commit-graph.c:1989
+#: commit-graph.c:2006
msgid "Verifying commits in commit graph"
msgstr ""
-#: commit-graph.c:2002
+#: commit-graph.c:2020
#, c-format
msgid "failed to parse commit %s from object database for commit-graph"
msgstr ""
-#: commit-graph.c:2009
+#: commit-graph.c:2027
#, c-format
msgid "root tree OID for commit %s in commit-graph is %s != %s"
msgstr ""
-#: commit-graph.c:2019
+#: commit-graph.c:2037
#, c-format
msgid "commit-graph parent list for commit %s is too long"
msgstr ""
-#: commit-graph.c:2028
+#: commit-graph.c:2046
#, c-format
msgid "commit-graph parent for %s is %s != %s"
msgstr ""
-#: commit-graph.c:2041
+#: commit-graph.c:2059
#, c-format
msgid "commit-graph parent list for commit %s terminates early"
msgstr ""
-#: commit-graph.c:2046
+#: commit-graph.c:2064
#, c-format
msgid ""
"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
msgstr ""
-#: commit-graph.c:2050
+#: commit-graph.c:2068
#, c-format
msgid ""
"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
msgstr ""
-#: commit-graph.c:2065
+#: commit-graph.c:2083
#, c-format
msgid "commit-graph generation for commit %s is %u != %u"
msgstr ""
-#: commit-graph.c:2071
+#: commit-graph.c:2089
#, c-format
msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
msgstr ""
msgid "key does not contain variable name: %s"
msgstr ""
-#: config.c:406 sequencer.c:2463
+#: config.c:406 sequencer.c:2401
#, c-format
msgid "invalid key: %s"
msgstr ""
msgid "invalid mode for object creation: %s"
msgstr ""
-#: config.c:1430
+#: config.c:1425
#, c-format
msgid "malformed value for %s"
msgstr ""
-#: config.c:1456
+#: config.c:1451
#, c-format
msgid "malformed value for %s: %s"
msgstr ""
-#: config.c:1457
+#: config.c:1452
msgid "must be one of nothing, matching, simple, upstream or current"
msgstr ""
-#: config.c:1518 builtin/pack-objects.c:3410
+#: config.c:1513 builtin/pack-objects.c:3394
#, c-format
msgid "bad pack compression level %d"
msgstr ""
-#: config.c:1639
+#: config.c:1634
#, c-format
msgid "unable to load config blob object '%s'"
msgstr ""
-#: config.c:1642
+#: config.c:1637
#, c-format
msgid "reference '%s' does not point to a blob"
msgstr ""
-#: config.c:1659
+#: config.c:1654
#, c-format
msgid "unable to resolve config blob '%s'"
msgstr ""
-#: config.c:1689
+#: config.c:1684
#, c-format
msgid "failed to parse %s"
msgstr ""
-#: config.c:1745
+#: config.c:1740
msgid "unable to parse command-line config"
msgstr ""
-#: config.c:2094
+#: config.c:2091
msgid "unknown error occurred while reading the configuration files"
msgstr ""
-#: config.c:2264
+#: config.c:2261
#, c-format
msgid "Invalid %s: '%s'"
msgstr ""
-#: config.c:2307
-#, c-format
-msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
-msgstr ""
-
-#: config.c:2333
+#: config.c:2306
#, c-format
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
msgstr ""
-#: config.c:2379
+#: config.c:2352
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr ""
-#: config.c:2381
+#: config.c:2354
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr ""
-#: config.c:2462
+#: config.c:2435
#, c-format
msgid "invalid section name '%s'"
msgstr ""
-#: config.c:2494
+#: config.c:2467
#, c-format
msgid "%s has multiple values"
msgstr ""
-#: config.c:2523
+#: config.c:2496
#, c-format
msgid "failed to write new configuration file %s"
msgstr ""
-#: config.c:2775 config.c:3099
+#: config.c:2748 config.c:3072
#, c-format
msgid "could not lock config file %s"
msgstr ""
-#: config.c:2786
+#: config.c:2759
#, c-format
msgid "opening %s"
msgstr ""
-#: config.c:2821 builtin/config.c:328
+#: config.c:2794 builtin/config.c:328
#, c-format
msgid "invalid pattern: %s"
msgstr ""
-#: config.c:2846
+#: config.c:2819
#, c-format
msgid "invalid config file %s"
msgstr ""
-#: config.c:2859 config.c:3112
+#: config.c:2832 config.c:3085
#, c-format
msgid "fstat on %s failed"
msgstr ""
-#: config.c:2870
+#: config.c:2843
#, c-format
msgid "unable to mmap '%s'"
msgstr ""
-#: config.c:2879 config.c:3117
+#: config.c:2852 config.c:3090
#, c-format
msgid "chmod on %s failed"
msgstr ""
-#: config.c:2964 config.c:3214
+#: config.c:2937 config.c:3187
#, c-format
msgid "could not write config file %s"
msgstr ""
-#: config.c:2998
+#: config.c:2971
#, c-format
msgid "could not set '%s' to '%s'"
msgstr ""
-#: config.c:3000 builtin/remote.c:782
+#: config.c:2973 builtin/remote.c:782
#, c-format
msgid "could not unset '%s'"
msgstr ""
-#: config.c:3090
+#: config.c:3063
#, c-format
msgid "invalid section name: %s"
msgstr ""
-#: config.c:3257
+#: config.c:3230
#, c-format
msgid "missing value for '%s'"
msgstr ""
msgid "unknown port %s"
msgstr ""
-#: connect.c:845 connect.c:1171
+#: connect.c:845 connect.c:1175
#, c-format
msgid "strange hostname '%s' blocked"
msgstr ""
msgid "cannot start proxy %s"
msgstr ""
-#: connect.c:924
+#: connect.c:928
msgid "no path specified; see 'git help pull' for valid url syntax"
msgstr ""
-#: connect.c:1119
+#: connect.c:1123
msgid "ssh variant 'simple' does not support -4"
msgstr ""
-#: connect.c:1131
+#: connect.c:1135
msgid "ssh variant 'simple' does not support -6"
msgstr ""
-#: connect.c:1148
+#: connect.c:1152
msgid "ssh variant 'simple' does not support setting port"
msgstr ""
-#: connect.c:1260
+#: connect.c:1264
#, c-format
msgid "strange pathname '%s' blocked"
msgstr ""
-#: connect.c:1307
+#: connect.c:1311
msgid "unable to fork"
msgstr ""
-#: connected.c:86 builtin/fsck.c:221 builtin/prune.c:43
+#: connected.c:88 builtin/fsck.c:221 builtin/prune.c:43
msgid "Checking connectivity"
msgstr ""
-#: connected.c:98
+#: connected.c:100
msgid "Could not run 'git rev-list'"
msgstr ""
-#: connected.c:118
+#: connected.c:120
msgid "failed write to rev-list"
msgstr ""
-#: connected.c:125
+#: connected.c:127
msgid "failed to close rev-list's stdin"
msgstr ""
-#: convert.c:193
+#: convert.c:194
#, c-format
msgid "illegal crlf_action %d"
msgstr ""
-#: convert.c:206
+#: convert.c:207
#, c-format
msgid "CRLF would be replaced by LF in %s"
msgstr ""
-#: convert.c:208
+#: 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:216
+#: convert.c:217
#, c-format
msgid "LF would be replaced by CRLF in %s"
msgstr ""
-#: convert.c:218
+#: 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:279
+#: convert.c:280
#, c-format
msgid "BOM is prohibited in '%s' if encoded as %s"
msgstr ""
-#: convert.c:286
+#: 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:304
+#: convert.c:305
#, c-format
msgid "BOM is required in '%s' if encoded as %s"
msgstr ""
-#: convert.c:306
+#: 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:424 convert.c:495
+#: convert.c:425 convert.c:496
#, c-format
msgid "failed to encode '%s' from %s to %s"
msgstr ""
-#: convert.c:467
+#: convert.c:468
#, c-format
msgid "encoding '%s' from %s to %s and back is not the same"
msgstr ""
-#: convert.c:673
+#: convert.c:674
#, c-format
msgid "cannot fork to run external filter '%s'"
msgstr ""
-#: convert.c:693
+#: convert.c:694
#, c-format
msgid "cannot feed the input to external filter '%s'"
msgstr ""
-#: convert.c:700
+#: convert.c:701
#, c-format
msgid "external filter '%s' failed %d"
msgstr ""
-#: convert.c:735 convert.c:738
+#: convert.c:736 convert.c:739
#, c-format
msgid "read from external filter '%s' failed"
msgstr ""
-#: convert.c:741 convert.c:796
+#: convert.c:742 convert.c:797
#, c-format
msgid "external filter '%s' failed"
msgstr ""
-#: convert.c:844
+#: convert.c:845
msgid "unexpected filter type"
msgstr ""
-#: convert.c:855
+#: convert.c:856
msgid "path name too long for external filter"
msgstr ""
-#: convert.c:929
+#: convert.c:930
#, c-format
msgid ""
"external filter '%s' is not available anymore although not all paths have "
"been filtered"
msgstr ""
-#: convert.c:1228
+#: convert.c:1229
msgid "true/false are no valid working-tree-encodings"
msgstr ""
-#: convert.c:1398 convert.c:1432
+#: convert.c:1417 convert.c:1451
#, c-format
msgid "%s: clean filter '%s' failed"
msgstr ""
-#: convert.c:1476
+#: convert.c:1495
#, c-format
msgid "%s: smudge filter %s failed"
msgstr ""
-#: date.c:137
+#: date.c:138
msgid "in the future"
msgstr ""
-#: date.c:143
+#: date.c:144
#, c-format
msgid "%<PRIuMAX> second ago"
msgid_plural "%<PRIuMAX> seconds ago"
msgstr[0] ""
msgstr[1] ""
-#: date.c:150
+#: date.c:151
#, c-format
msgid "%<PRIuMAX> minute ago"
msgid_plural "%<PRIuMAX> minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: date.c:157
+#: date.c:158
#, c-format
msgid "%<PRIuMAX> hour ago"
msgid_plural "%<PRIuMAX> hours ago"
msgstr[0] ""
msgstr[1] ""
-#: date.c:164
+#: date.c:165
#, c-format
msgid "%<PRIuMAX> day ago"
msgid_plural "%<PRIuMAX> days ago"
msgstr[0] ""
msgstr[1] ""
-#: date.c:170
+#: date.c:171
#, c-format
msgid "%<PRIuMAX> week ago"
msgid_plural "%<PRIuMAX> weeks ago"
msgstr[0] ""
msgstr[1] ""
-#: date.c:177
+#: date.c:178
#, c-format
msgid "%<PRIuMAX> month ago"
msgid_plural "%<PRIuMAX> months ago"
msgstr[0] ""
msgstr[1] ""
-#: date.c:188
+#: date.c:189
#, c-format
msgid "%<PRIuMAX> year"
msgid_plural "%<PRIuMAX> years"
msgstr[1] ""
#. TRANSLATORS: "%s" is "<n> years"
-#: date.c:191
+#: date.c:192
#, c-format
msgid "%s, %<PRIuMAX> month ago"
msgid_plural "%s, %<PRIuMAX> months ago"
msgstr[0] ""
msgstr[1] ""
-#: date.c:196 date.c:201
+#: date.c:197 date.c:202
#, c-format
msgid "%<PRIuMAX> year ago"
msgid_plural "%<PRIuMAX> years ago"
msgid "failed to read orderfile '%s'"
msgstr ""
-#: diffcore-rename.c:544
+#: diffcore-rename.c:543
msgid "Performing inexact rename detection"
msgstr ""
"%s"
msgstr ""
-#: diff.c:4215
+#: diff.c:4218
#, c-format
msgid "external diff died, stopping at %s"
msgstr ""
-#: diff.c:4560
+#: diff.c:4563
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
msgstr ""
-#: diff.c:4563
+#: diff.c:4566
msgid "-G, -S and --find-object are mutually exclusive"
msgstr ""
-#: diff.c:4641
+#: diff.c:4644
msgid "--follow requires exactly one pathspec"
msgstr ""
-#: diff.c:4689
+#: diff.c:4692
#, c-format
msgid "invalid --stat value: %s"
msgstr ""
-#: diff.c:4694 diff.c:4699 diff.c:4704 diff.c:4709 diff.c:5222
+#: diff.c:4697 diff.c:4702 diff.c:4707 diff.c:4712 diff.c:5225
#: parse-options.c:199 parse-options.c:203
#, c-format
msgid "%s expects a numerical value"
msgstr ""
-#: diff.c:4726
+#: diff.c:4729
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
"%s"
msgstr ""
-#: diff.c:4811
+#: diff.c:4814
#, c-format
msgid "unknown change class '%c' in --diff-filter=%s"
msgstr ""
-#: diff.c:4835
+#: diff.c:4838
#, c-format
msgid "unknown value after ws-error-highlight=%.*s"
msgstr ""
-#: diff.c:4849
+#: diff.c:4852
#, c-format
msgid "unable to resolve '%s'"
msgstr ""
-#: diff.c:4899 diff.c:4905
+#: diff.c:4902 diff.c:4908
#, c-format
msgid "%s expects <n>/<m> form"
msgstr ""
-#: diff.c:4917
+#: diff.c:4920
#, c-format
msgid "%s expects a character, got '%s'"
msgstr ""
-#: diff.c:4938
+#: diff.c:4941
#, c-format
msgid "bad --color-moved argument: %s"
msgstr ""
-#: diff.c:4957
+#: diff.c:4960
#, c-format
msgid "invalid mode '%s' in --color-moved-ws"
msgstr ""
-#: diff.c:4997
+#: diff.c:5000
msgid ""
"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
"\"histogram\""
msgstr ""
-#: diff.c:5033 diff.c:5053
+#: diff.c:5036 diff.c:5056
#, c-format
msgid "invalid argument to %s"
msgstr ""
-#: diff.c:5191
+#: diff.c:5194
#, c-format
msgid "failed to parse --submodule option parameter: '%s'"
msgstr ""
-#: diff.c:5247
+#: diff.c:5250
#, c-format
msgid "bad --word-diff argument: %s"
msgstr ""
-#: diff.c:5270
+#: diff.c:5273
msgid "Diff output format options"
msgstr ""
-#: diff.c:5272 diff.c:5278
+#: diff.c:5275 diff.c:5281
msgid "generate patch"
msgstr ""
-#: diff.c:5275 builtin/log.c:172
+#: diff.c:5278 builtin/log.c:172
msgid "suppress diff output"
msgstr ""
-#: diff.c:5280 diff.c:5394 diff.c:5401
+#: diff.c:5283 diff.c:5397 diff.c:5404
msgid "<n>"
msgstr ""
-#: diff.c:5281 diff.c:5284
+#: diff.c:5284 diff.c:5287
msgid "generate diffs with <n> lines context"
msgstr ""
-#: diff.c:5286
+#: diff.c:5289
msgid "generate the diff in raw format"
msgstr ""
-#: diff.c:5289
+#: diff.c:5292
msgid "synonym for '-p --raw'"
msgstr ""
-#: diff.c:5293
+#: diff.c:5296
msgid "synonym for '-p --stat'"
msgstr ""
-#: diff.c:5297
+#: diff.c:5300
msgid "machine friendly --stat"
msgstr ""
-#: diff.c:5300
+#: diff.c:5303
msgid "output only the last line of --stat"
msgstr ""
-#: diff.c:5302 diff.c:5310
+#: diff.c:5305 diff.c:5313
msgid "<param1,param2>..."
msgstr ""
-#: diff.c:5303
+#: diff.c:5306
msgid ""
"output the distribution of relative amount of changes for each sub-directory"
msgstr ""
-#: diff.c:5307
+#: diff.c:5310
msgid "synonym for --dirstat=cumulative"
msgstr ""
-#: diff.c:5311
+#: diff.c:5314
msgid "synonym for --dirstat=files,param1,param2..."
msgstr ""
-#: diff.c:5315
+#: diff.c:5318
msgid "warn if changes introduce conflict markers or whitespace errors"
msgstr ""
-#: diff.c:5318
+#: diff.c:5321
msgid "condensed summary such as creations, renames and mode changes"
msgstr ""
-#: diff.c:5321
+#: diff.c:5324
msgid "show only names of changed files"
msgstr ""
-#: diff.c:5324
+#: diff.c:5327
msgid "show only names and status of changed files"
msgstr ""
-#: diff.c:5326
+#: diff.c:5329
msgid "<width>[,<name-width>[,<count>]]"
msgstr ""
-#: diff.c:5327
+#: diff.c:5330
msgid "generate diffstat"
msgstr ""
-#: diff.c:5329 diff.c:5332 diff.c:5335
+#: diff.c:5332 diff.c:5335 diff.c:5338
msgid "<width>"
msgstr ""
-#: diff.c:5330
+#: diff.c:5333
msgid "generate diffstat with a given width"
msgstr ""
-#: diff.c:5333
+#: diff.c:5336
msgid "generate diffstat with a given name width"
msgstr ""
-#: diff.c:5336
+#: diff.c:5339
msgid "generate diffstat with a given graph width"
msgstr ""
-#: diff.c:5338
+#: diff.c:5341
msgid "<count>"
msgstr ""
-#: diff.c:5339
+#: diff.c:5342
msgid "generate diffstat with limited lines"
msgstr ""
-#: diff.c:5342
+#: diff.c:5345
msgid "generate compact summary in diffstat"
msgstr ""
-#: diff.c:5345
+#: diff.c:5348
msgid "output a binary diff that can be applied"
msgstr ""
-#: diff.c:5348
+#: diff.c:5351
msgid "show full pre- and post-image object names on the \"index\" lines"
msgstr ""
-#: diff.c:5350
+#: diff.c:5353
msgid "show colored diff"
msgstr ""
-#: diff.c:5351
+#: diff.c:5354
msgid "<kind>"
msgstr ""
-#: diff.c:5352
+#: diff.c:5355
msgid ""
"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
"diff"
msgstr ""
-#: diff.c:5355
+#: diff.c:5358
msgid ""
"do not munge pathnames and use NULs as output field terminators in --raw or "
"--numstat"
msgstr ""
-#: diff.c:5358 diff.c:5361 diff.c:5364 diff.c:5470
+#: diff.c:5361 diff.c:5364 diff.c:5367 diff.c:5473
msgid "<prefix>"
msgstr ""
-#: diff.c:5359
+#: diff.c:5362
msgid "show the given source prefix instead of \"a/\""
msgstr ""
-#: diff.c:5362
+#: diff.c:5365
msgid "show the given destination prefix instead of \"b/\""
msgstr ""
-#: diff.c:5365
+#: diff.c:5368
msgid "prepend an additional prefix to every line of output"
msgstr ""
-#: diff.c:5368
+#: diff.c:5371
msgid "do not show any source or destination prefix"
msgstr ""
-#: diff.c:5371
+#: diff.c:5374
msgid "show context between diff hunks up to the specified number of lines"
msgstr ""
-#: diff.c:5375 diff.c:5380 diff.c:5385
+#: diff.c:5378 diff.c:5383 diff.c:5388
msgid "<char>"
msgstr ""
-#: diff.c:5376
+#: diff.c:5379
msgid "specify the character to indicate a new line instead of '+'"
msgstr ""
-#: diff.c:5381
+#: diff.c:5384
msgid "specify the character to indicate an old line instead of '-'"
msgstr ""
-#: diff.c:5386
+#: diff.c:5389
msgid "specify the character to indicate a context instead of ' '"
msgstr ""
-#: diff.c:5389
+#: diff.c:5392
msgid "Diff rename options"
msgstr ""
-#: diff.c:5390
+#: diff.c:5393
msgid "<n>[/<m>]"
msgstr ""
-#: diff.c:5391
+#: diff.c:5394
msgid "break complete rewrite changes into pairs of delete and create"
msgstr ""
-#: diff.c:5395
+#: diff.c:5398
msgid "detect renames"
msgstr ""
-#: diff.c:5399
+#: diff.c:5402
msgid "omit the preimage for deletes"
msgstr ""
-#: diff.c:5402
+#: diff.c:5405
msgid "detect copies"
msgstr ""
-#: diff.c:5406
+#: diff.c:5409
msgid "use unmodified files as source to find copies"
msgstr ""
-#: diff.c:5408
+#: diff.c:5411
msgid "disable rename detection"
msgstr ""
-#: diff.c:5411
+#: diff.c:5414
msgid "use empty blobs as rename source"
msgstr ""
-#: diff.c:5413
+#: diff.c:5416
msgid "continue listing the history of a file beyond renames"
msgstr ""
-#: diff.c:5416
+#: diff.c:5419
msgid ""
"prevent rename/copy detection if the number of rename/copy targets exceeds "
"given limit"
msgstr ""
-#: diff.c:5418
+#: diff.c:5421
msgid "Diff algorithm options"
msgstr ""
-#: diff.c:5420
+#: diff.c:5423
msgid "produce the smallest possible diff"
msgstr ""
-#: diff.c:5423
+#: diff.c:5426
msgid "ignore whitespace when comparing lines"
msgstr ""
-#: diff.c:5426
+#: diff.c:5429
msgid "ignore changes in amount of whitespace"
msgstr ""
-#: diff.c:5429
+#: diff.c:5432
msgid "ignore changes in whitespace at EOL"
msgstr ""
-#: diff.c:5432
+#: diff.c:5435
msgid "ignore carrier-return at the end of line"
msgstr ""
-#: diff.c:5435
+#: diff.c:5438
msgid "ignore changes whose lines are all blank"
msgstr ""
-#: diff.c:5438
+#: diff.c:5441
msgid "heuristic to shift diff hunk boundaries for easy reading"
msgstr ""
-#: diff.c:5441
+#: diff.c:5444
msgid "generate diff using the \"patience diff\" algorithm"
msgstr ""
-#: diff.c:5445
+#: diff.c:5448
msgid "generate diff using the \"histogram diff\" algorithm"
msgstr ""
-#: diff.c:5447
+#: diff.c:5450
msgid "<algorithm>"
msgstr ""
-#: diff.c:5448
+#: diff.c:5451
msgid "choose a diff algorithm"
msgstr ""
-#: diff.c:5450
+#: diff.c:5453
msgid "<text>"
msgstr ""
-#: diff.c:5451
+#: diff.c:5454
msgid "generate diff using the \"anchored diff\" algorithm"
msgstr ""
-#: diff.c:5453 diff.c:5462 diff.c:5465
+#: diff.c:5456 diff.c:5465 diff.c:5468
msgid "<mode>"
msgstr ""
-#: diff.c:5454
+#: diff.c:5457
msgid "show word diff, using <mode> to delimit changed words"
msgstr ""
-#: diff.c:5456 diff.c:5459 diff.c:5504
+#: diff.c:5459 diff.c:5462 diff.c:5507
msgid "<regex>"
msgstr ""
-#: diff.c:5457
+#: diff.c:5460
msgid "use <regex> to decide what a word is"
msgstr ""
-#: diff.c:5460
+#: diff.c:5463
msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
msgstr ""
-#: diff.c:5463
+#: diff.c:5466
msgid "moved lines of code are colored differently"
msgstr ""
-#: diff.c:5466
+#: diff.c:5469
msgid "how white spaces are ignored in --color-moved"
msgstr ""
-#: diff.c:5469
+#: diff.c:5472
msgid "Other diff options"
msgstr ""
-#: diff.c:5471
+#: diff.c:5474
msgid "when run from subdir, exclude changes outside and show relative paths"
msgstr ""
-#: diff.c:5475
+#: diff.c:5478
msgid "treat all files as text"
msgstr ""
-#: diff.c:5477
+#: diff.c:5480
msgid "swap two inputs, reverse the diff"
msgstr ""
-#: diff.c:5479
+#: diff.c:5482
msgid "exit with 1 if there were differences, 0 otherwise"
msgstr ""
-#: diff.c:5481
+#: diff.c:5484
msgid "disable all output of the program"
msgstr ""
-#: diff.c:5483
+#: diff.c:5486
msgid "allow an external diff helper to be executed"
msgstr ""
-#: diff.c:5485
+#: diff.c:5488
msgid "run external text conversion filters when comparing binary files"
msgstr ""
-#: diff.c:5487
+#: diff.c:5490
msgid "<when>"
msgstr ""
-#: diff.c:5488
+#: diff.c:5491
msgid "ignore changes to submodules in the diff generation"
msgstr ""
-#: diff.c:5491
+#: diff.c:5494
msgid "<format>"
msgstr ""
-#: diff.c:5492
+#: diff.c:5495
msgid "specify how differences in submodules are shown"
msgstr ""
-#: diff.c:5496
+#: diff.c:5499
msgid "hide 'git add -N' entries from the index"
msgstr ""
-#: diff.c:5499
+#: diff.c:5502
msgid "treat 'git add -N' entries as real in the index"
msgstr ""
-#: diff.c:5501
+#: diff.c:5504
msgid "<string>"
msgstr ""
-#: diff.c:5502
+#: diff.c:5505
msgid ""
"look for differences that change the number of occurrences of the specified "
"string"
msgstr ""
-#: diff.c:5505
+#: diff.c:5508
msgid ""
"look for differences that change the number of occurrences of the specified "
"regex"
msgstr ""
-#: diff.c:5508
+#: diff.c:5511
msgid "show all changes in the changeset with -S or -G"
msgstr ""
-#: diff.c:5511
+#: diff.c:5514
msgid "treat <string> in -S as extended POSIX regular expression"
msgstr ""
-#: diff.c:5514
+#: diff.c:5517
msgid "control the order in which files appear in the output"
msgstr ""
-#: diff.c:5515
+#: diff.c:5518
msgid "<object-id>"
msgstr ""
-#: diff.c:5516
+#: diff.c:5519
msgid ""
"look for differences that change the number of occurrences of the specified "
"object"
msgstr ""
-#: diff.c:5518
+#: diff.c:5521
msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
msgstr ""
-#: diff.c:5519
+#: diff.c:5522
msgid "select files by diff type"
msgstr ""
-#: diff.c:5521
+#: diff.c:5524
msgid "<file>"
msgstr ""
-#: diff.c:5522
+#: diff.c:5525
msgid "Output to a specific file"
msgstr ""
-#: diff.c:6177
+#: diff.c:6180
msgid "inexact rename detection was skipped due to too many files."
msgstr ""
-#: diff.c:6180
+#: diff.c:6183
msgid "only found copies from modified paths due to too many files."
msgstr ""
-#: diff.c:6183
+#: diff.c:6186
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
msgstr ""
-#: dir.c:537
+#: dir.c:549
#, c-format
msgid "pathspec '%s' did not match any file(s) known to git"
msgstr ""
-#: dir.c:926
+#: dir.c:938
#, c-format
msgid "cannot use %s as an exclude file"
msgstr ""
-#: dir.c:1843
+#: dir.c:1877
#, c-format
msgid "could not open directory '%s'"
msgstr ""
-#: dir.c:2085
+#: dir.c:2128
msgid "failed to get kernel name and information"
msgstr ""
-#: dir.c:2209
+#: dir.c:2252
msgid "untracked cache is disabled on this system or location"
msgstr ""
-#: dir.c:3013
+#: dir.c:3056
#, c-format
msgid "index file corrupt in repo %s"
msgstr ""
-#: dir.c:3058 dir.c:3063
+#: dir.c:3101 dir.c:3106
#, c-format
msgid "could not create directories for %s"
msgstr ""
-#: dir.c:3092
+#: dir.c:3135
#, c-format
msgid "could not migrate git directory from '%s' to '%s'"
msgstr ""
msgid "could not stat file '%s'"
msgstr ""
-#: environment.c:150
+#: environment.c:148
#, c-format
msgid "bad git namespace path \"%s\""
msgstr ""
-#: environment.c:332
+#: environment.c:330
#, c-format
msgid "could not set GIT_DIR to '%s'"
msgstr ""
msgid "too many args to run %s"
msgstr ""
-#: fetch-object.c:17
-msgid "Remote with no URL"
-msgstr ""
-
-#: fetch-pack.c:151
+#: fetch-pack.c:150
msgid "git fetch-pack: expected shallow list"
msgstr ""
-#: fetch-pack.c:154
+#: fetch-pack.c:153
msgid "git fetch-pack: expected a flush packet after shallow list"
msgstr ""
-#: fetch-pack.c:165
+#: fetch-pack.c:164
msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
msgstr ""
-#: fetch-pack.c:185
+#: fetch-pack.c:184
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr ""
-#: fetch-pack.c:196
+#: fetch-pack.c:195
msgid "unable to write to remote"
msgstr ""
-#: fetch-pack.c:258
+#: fetch-pack.c:257
msgid "--stateless-rpc requires multi_ack_detailed"
msgstr ""
-#: fetch-pack.c:360 fetch-pack.c:1284
+#: fetch-pack.c:356 fetch-pack.c:1280
#, c-format
msgid "invalid shallow line: %s"
msgstr ""
-#: fetch-pack.c:366 fetch-pack.c:1290
+#: fetch-pack.c:362 fetch-pack.c:1286
#, c-format
msgid "invalid unshallow line: %s"
msgstr ""
-#: fetch-pack.c:368 fetch-pack.c:1292
+#: fetch-pack.c:364 fetch-pack.c:1288
#, c-format
msgid "object not found: %s"
msgstr ""
-#: fetch-pack.c:371 fetch-pack.c:1295
+#: fetch-pack.c:367 fetch-pack.c:1291
#, c-format
msgid "error in object: %s"
msgstr ""
-#: fetch-pack.c:373 fetch-pack.c:1297
+#: fetch-pack.c:369 fetch-pack.c:1293
#, c-format
msgid "no shallow found: %s"
msgstr ""
-#: fetch-pack.c:376 fetch-pack.c:1301
+#: fetch-pack.c:372 fetch-pack.c:1297
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr ""
-#: fetch-pack.c:417
+#: fetch-pack.c:414
#, c-format
msgid "got %s %d %s"
msgstr ""
-#: fetch-pack.c:434
+#: fetch-pack.c:431
#, c-format
msgid "invalid commit %s"
msgstr ""
-#: fetch-pack.c:465
+#: fetch-pack.c:462
msgid "giving up"
msgstr ""
-#: fetch-pack.c:477 progress.c:277
+#: fetch-pack.c:475 progress.c:312
msgid "done"
msgstr ""
-#: fetch-pack.c:489
+#: fetch-pack.c:487
#, c-format
msgid "got %s (%d) %s"
msgstr ""
-#: fetch-pack.c:535
+#: fetch-pack.c:533
#, c-format
msgid "Marking %s as complete"
msgstr ""
-#: fetch-pack.c:744
+#: fetch-pack.c:742
#, c-format
msgid "already have %s (%s)"
msgstr ""
-#: fetch-pack.c:783
+#: fetch-pack.c:781
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr ""
-#: fetch-pack.c:791
+#: fetch-pack.c:789
msgid "protocol error: bad pack header"
msgstr ""
-#: fetch-pack.c:859
+#: fetch-pack.c:857
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr ""
-#: fetch-pack.c:875
+#: fetch-pack.c:873
#, c-format
msgid "%s failed"
msgstr ""
-#: fetch-pack.c:877
+#: fetch-pack.c:875
msgid "error in sideband demultiplexer"
msgstr ""
-#: fetch-pack.c:908
+#: fetch-pack.c:907
#, c-format
msgid "Server version is %.*s"
msgstr ""
-#: fetch-pack.c:913 fetch-pack.c:919 fetch-pack.c:922 fetch-pack.c:928
-#: fetch-pack.c:932 fetch-pack.c:936 fetch-pack.c:940 fetch-pack.c:944
-#: fetch-pack.c:948 fetch-pack.c:952 fetch-pack.c:956 fetch-pack.c:960
-#: fetch-pack.c:966 fetch-pack.c:972 fetch-pack.c:977 fetch-pack.c:982
+#: fetch-pack.c:912 fetch-pack.c:918 fetch-pack.c:921 fetch-pack.c:927
+#: fetch-pack.c:931 fetch-pack.c:935 fetch-pack.c:939 fetch-pack.c:943
+#: fetch-pack.c:947 fetch-pack.c:951 fetch-pack.c:955 fetch-pack.c:959
+#: fetch-pack.c:965 fetch-pack.c:971 fetch-pack.c:976 fetch-pack.c:981
#, c-format
msgid "Server supports %s"
msgstr ""
-#: fetch-pack.c:915
+#: fetch-pack.c:914
msgid "Server does not support shallow clients"
msgstr ""
-#: fetch-pack.c:975
+#: fetch-pack.c:974
msgid "Server does not support --shallow-since"
msgstr ""
-#: fetch-pack.c:980
+#: fetch-pack.c:979
msgid "Server does not support --shallow-exclude"
msgstr ""
-#: fetch-pack.c:984
+#: fetch-pack.c:983
msgid "Server does not support --deepen"
msgstr ""
-#: fetch-pack.c:1001
+#: fetch-pack.c:1000
msgid "no common commits"
msgstr ""
-#: fetch-pack.c:1013 fetch-pack.c:1462
+#: fetch-pack.c:1012 fetch-pack.c:1468
msgid "git fetch-pack: fetch failed."
msgstr ""
-#: fetch-pack.c:1151
+#: fetch-pack.c:1150
msgid "Server does not support shallow requests"
msgstr ""
msgid "Server supports filter"
msgstr ""
-#: fetch-pack.c:1184
+#: fetch-pack.c:1180
msgid "unable to write request to remote"
msgstr ""
-#: fetch-pack.c:1202
+#: fetch-pack.c:1198
#, c-format
msgid "error reading section header '%s'"
msgstr ""
-#: fetch-pack.c:1208
+#: fetch-pack.c:1204
#, c-format
msgid "expected '%s', received '%s'"
msgstr ""
-#: fetch-pack.c:1247
+#: fetch-pack.c:1243
#, c-format
msgid "unexpected acknowledgment line: '%s'"
msgstr ""
-#: fetch-pack.c:1252
+#: fetch-pack.c:1248
#, c-format
msgid "error processing acks: %d"
msgstr ""
-#: fetch-pack.c:1262
+#: fetch-pack.c:1258
msgid "expected packfile to be sent after 'ready'"
msgstr ""
-#: fetch-pack.c:1264
+#: fetch-pack.c:1260
msgid "expected no other sections to be sent after no 'ready'"
msgstr ""
-#: fetch-pack.c:1306
+#: fetch-pack.c:1302
#, c-format
msgid "error processing shallow info: %d"
msgstr ""
-#: fetch-pack.c:1353
+#: fetch-pack.c:1349
#, c-format
msgid "expected wanted-ref, got '%s'"
msgstr ""
-#: fetch-pack.c:1358
+#: fetch-pack.c:1354
#, c-format
msgid "unexpected wanted-ref: '%s'"
msgstr ""
-#: fetch-pack.c:1363
+#: fetch-pack.c:1359
#, c-format
msgid "error processing wanted refs: %d"
msgstr ""
-#: fetch-pack.c:1689
+#: fetch-pack.c:1693
msgid "no matching remote head"
msgstr ""
-#: fetch-pack.c:1712 builtin/clone.c:686
+#: fetch-pack.c:1716 builtin/clone.c:685
msgid "remote did not send all necessary objects"
msgstr ""
-#: fetch-pack.c:1739
+#: fetch-pack.c:1743
#, c-format
msgid "no such remote ref %s"
msgstr ""
-#: fetch-pack.c:1742
+#: fetch-pack.c:1746
#, c-format
msgid "Server does not allow request for unadvertised object %s"
msgstr ""
msgid "ignore invalid color '%.*s' in log.graphColors"
msgstr ""
-#: grep.c:2117
+#: grep.c:627
+msgid ""
+"given pattern contains NULL byte (via -f <file>). This is only supported "
+"with -P under PCRE v2"
+msgstr ""
+
+#: grep.c:2083
#, c-format
msgid "'%s': unable to read %s"
msgstr ""
-#: grep.c:2134 setup.c:164 builtin/clone.c:409 builtin/diff.c:82
+#: grep.c:2100 setup.c:165 builtin/clone.c:408 builtin/diff.c:82
#: builtin/rm.c:135
#, c-format
msgid "failed to stat '%s'"
msgstr ""
-#: grep.c:2145
+#: grep.c:2111
#, c-format
msgid "'%s': short read"
msgstr ""
msgid "git version [<options>]"
msgstr ""
-#: help.c:782
+#: help.c:783
#, c-format
msgid "%s: %s - %s"
msgstr ""
-#: help.c:786
+#: help.c:787
msgid ""
"\n"
"Did you mean this?"
msgid "invalid date format: %s"
msgstr ""
-#: list-objects.c:129
+#: list-objects.c:127
#, c-format
msgid "entry '%s' in tree %s has tree mode, but is not a tree"
msgstr ""
-#: list-objects.c:142
+#: list-objects.c:140
#, c-format
msgid "entry '%s' in tree %s has blob mode, but is not a blob"
msgstr ""
-#: list-objects.c:378
+#: list-objects.c:375
#, c-format
msgid "unable to load root tree for commit %s"
msgstr ""
-#: list-objects-filter-options.c:36
-msgid "multiple filter-specs cannot be combined"
+#: list-objects-filter.c:492
+#, c-format
+msgid "unable to access sparse blob in '%s'"
+msgstr ""
+
+#: list-objects-filter.c:495
+#, c-format
+msgid "unable to parse sparse filter data in %s"
msgstr ""
#: list-objects-filter-options.c:58
msgid "expected 'tree:<depth>'"
msgstr ""
-#: list-objects-filter-options.c:84
+#: list-objects-filter-options.c:73
msgid "sparse:path filters support has been dropped"
msgstr ""
-#: list-objects-filter-options.c:94
+#: list-objects-filter-options.c:86
#, c-format
msgid "invalid filter-spec '%s'"
msgstr ""
-#: list-objects-filter-options.c:158
-msgid "cannot change partial clone promisor remote"
+#: list-objects-filter-options.c:102
+#, c-format
+msgid "must escape char in sub-filter-spec: '%c'"
+msgstr ""
+
+#: list-objects-filter-options.c:144
+msgid "expected something after combine:"
+msgstr ""
+
+#: list-objects-filter-options.c:226
+msgid "multiple filter-specs cannot be combined"
msgstr ""
#: lockfile.c:151
msgid "failed to read the cache"
msgstr ""
-#: merge.c:107 rerere.c:720 builtin/am.c:1885 builtin/am.c:1919
-#: builtin/checkout.c:536 builtin/checkout.c:796 builtin/clone.c:786
+#: merge.c:107 rerere.c:720 builtin/am.c:1874 builtin/am.c:1908
+#: builtin/checkout.c:537 builtin/checkout.c:796 builtin/clone.c:785
#: builtin/stash.c:264
msgid "unable to write new index file"
msgstr ""
-#: merge-recursive.c:322
+#: merge-recursive.c:367
msgid "(bad commit)\n"
msgstr ""
-#: merge-recursive.c:345
+#: merge-recursive.c:390
#, c-format
msgid "add_cacheinfo failed for path '%s'; merge aborting."
msgstr ""
-#: merge-recursive.c:354
+#: merge-recursive.c:399
#, c-format
msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
msgstr ""
-#: merge-recursive.c:437
-msgid "error building trees"
-msgstr ""
-
-#: merge-recursive.c:863
+#: merge-recursive.c:885
#, c-format
msgid "failed to create path '%s'%s"
msgstr ""
-#: merge-recursive.c:874
+#: merge-recursive.c:896
#, c-format
msgid "Removing %s to make room for subdirectory\n"
msgstr ""
-#: merge-recursive.c:888 merge-recursive.c:907
+#: merge-recursive.c:910 merge-recursive.c:929
msgid ": perhaps a D/F conflict?"
msgstr ""
-#: merge-recursive.c:897
+#: merge-recursive.c:919
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr ""
-#: merge-recursive.c:938 builtin/cat-file.c:40
+#: merge-recursive.c:960 builtin/cat-file.c:41
#, c-format
msgid "cannot read object %s '%s'"
msgstr ""
-#: merge-recursive.c:941
+#: merge-recursive.c:965
#, c-format
msgid "blob expected for %s '%s'"
msgstr ""
-#: merge-recursive.c:965
+#: merge-recursive.c:990
#, c-format
msgid "failed to open '%s': %s"
msgstr ""
-#: merge-recursive.c:976
+#: merge-recursive.c:1001
#, c-format
msgid "failed to symlink '%s': %s"
msgstr ""
-#: merge-recursive.c:981
+#: merge-recursive.c:1006
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr ""
-#: merge-recursive.c:1177
+#: merge-recursive.c:1199
#, c-format
msgid "Failed to merge submodule %s (not checked out)"
msgstr ""
-#: merge-recursive.c:1184
+#: merge-recursive.c:1206
#, c-format
msgid "Failed to merge submodule %s (commits not present)"
msgstr ""
-#: merge-recursive.c:1191
+#: merge-recursive.c:1213
#, c-format
msgid "Failed to merge submodule %s (commits don't follow merge-base)"
msgstr ""
-#: merge-recursive.c:1199 merge-recursive.c:1211
+#: merge-recursive.c:1221 merge-recursive.c:1233
#, c-format
msgid "Fast-forwarding submodule %s to the following commit:"
msgstr ""
-#: merge-recursive.c:1202 merge-recursive.c:1214
+#: merge-recursive.c:1224 merge-recursive.c:1236
#, c-format
msgid "Fast-forwarding submodule %s"
msgstr ""
-#: merge-recursive.c:1237
+#: merge-recursive.c:1259
#, c-format
msgid "Failed to merge submodule %s (merge following commits not found)"
msgstr ""
-#: merge-recursive.c:1241
+#: merge-recursive.c:1263
#, c-format
msgid "Failed to merge submodule %s (not fast-forward)"
msgstr ""
-#: merge-recursive.c:1242
+#: merge-recursive.c:1264
msgid "Found a possible merge resolution for the submodule:\n"
msgstr ""
-#: merge-recursive.c:1245
+#: merge-recursive.c:1267
#, c-format
msgid ""
"If this is correct simply add it to the index for example\n"
"which will accept this suggestion.\n"
msgstr ""
-#: merge-recursive.c:1254
+#: merge-recursive.c:1276
#, c-format
msgid "Failed to merge submodule %s (multiple merges found)"
msgstr ""
-#: merge-recursive.c:1327
+#: merge-recursive.c:1349
msgid "Failed to execute internal merge"
msgstr ""
-#: merge-recursive.c:1332
+#: merge-recursive.c:1354
#, c-format
msgid "Unable to add %s to database"
msgstr ""
-#: merge-recursive.c:1364
+#: merge-recursive.c:1386
#, c-format
msgid "Auto-merging %s"
msgstr ""
-#: merge-recursive.c:1387
+#: merge-recursive.c:1410
#, c-format
msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
msgstr ""
-#: merge-recursive.c:1459
+#: merge-recursive.c:1482
#, 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:1464
+#: merge-recursive.c:1487
#, 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:1471
+#: merge-recursive.c:1494
#, 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:1476
+#: merge-recursive.c:1499
#, 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:1511
+#: merge-recursive.c:1534
msgid "rename"
msgstr ""
-#: merge-recursive.c:1511
+#: merge-recursive.c:1534
msgid "renamed"
msgstr ""
-#: merge-recursive.c:1591 merge-recursive.c:2450 merge-recursive.c:3094
+#: merge-recursive.c:1614 merge-recursive.c:2472 merge-recursive.c:3117
#, c-format
msgid "Refusing to lose dirty file at %s"
msgstr ""
-#: merge-recursive.c:1601
+#: merge-recursive.c:1624
#, c-format
msgid "Refusing to lose untracked file at %s, even though it's in the way."
msgstr ""
-#: merge-recursive.c:1659
+#: merge-recursive.c:1682
#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
msgstr ""
-#: merge-recursive.c:1690
+#: merge-recursive.c:1713
#, c-format
msgid "%s is a directory in %s adding as %s instead"
msgstr ""
-#: merge-recursive.c:1695
+#: merge-recursive.c:1718
#, c-format
msgid "Refusing to lose untracked file at %s; adding as %s instead"
msgstr ""
-#: merge-recursive.c:1714
+#: merge-recursive.c:1737
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
"\"->\"%s\" in \"%s\"%s"
msgstr ""
-#: merge-recursive.c:1719
+#: merge-recursive.c:1742
msgid " (left unresolved)"
msgstr ""
-#: merge-recursive.c:1828
+#: merge-recursive.c:1851
#, c-format
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr ""
-#: merge-recursive.c:2035
+#: merge-recursive.c:2056
#, c-format
msgid ""
"CONFLICT (directory rename split): Unclear where to place %s because "
"getting a majority of the files."
msgstr ""
-#: merge-recursive.c:2067
+#: merge-recursive.c:2088
#, 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:2077
+#: merge-recursive.c:2098
#, 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:2169
+#: merge-recursive.c:2190
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
">%s in %s"
msgstr ""
-#: merge-recursive.c:2413
+#: merge-recursive.c:2435
#, c-format
msgid ""
"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
"renamed."
msgstr ""
-#: merge-recursive.c:2938
+#: merge-recursive.c:2961
#, c-format
msgid "cannot read object %s"
msgstr ""
-#: merge-recursive.c:2941
+#: merge-recursive.c:2964
#, c-format
msgid "object %s is not a blob"
msgstr ""
-#: merge-recursive.c:3005
+#: merge-recursive.c:3028
msgid "modify"
msgstr ""
-#: merge-recursive.c:3005
+#: merge-recursive.c:3028
msgid "modified"
msgstr ""
-#: merge-recursive.c:3017
+#: merge-recursive.c:3040
msgid "content"
msgstr ""
-#: merge-recursive.c:3021
+#: merge-recursive.c:3044
msgid "add/add"
msgstr ""
-#: merge-recursive.c:3044
+#: merge-recursive.c:3067
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr ""
-#: merge-recursive.c:3066 git-submodule.sh:937
+#: merge-recursive.c:3089 git-submodule.sh:937
msgid "submodule"
msgstr ""
-#: merge-recursive.c:3067
+#: merge-recursive.c:3090
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr ""
-#: merge-recursive.c:3097
+#: merge-recursive.c:3120
#, c-format
msgid "Adding as %s instead"
msgstr ""
-#: merge-recursive.c:3179
+#: merge-recursive.c:3203
#, c-format
msgid ""
"Path updated: %s added in %s inside a directory that was renamed in %s; "
"moving it to %s."
msgstr ""
-#: merge-recursive.c:3182
+#: merge-recursive.c:3206
#, c-format
msgid ""
"CONFLICT (file location): %s added in %s inside a directory that was renamed "
"in %s, suggesting it should perhaps be moved to %s."
msgstr ""
-#: merge-recursive.c:3186
+#: merge-recursive.c:3210
#, c-format
msgid ""
"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
"%s; moving it to %s."
msgstr ""
-#: merge-recursive.c:3189
+#: merge-recursive.c:3213
#, c-format
msgid ""
"CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
"was renamed in %s, suggesting it should perhaps be moved to %s."
msgstr ""
-#: merge-recursive.c:3303
+#: merge-recursive.c:3327
#, c-format
msgid "Removing %s"
msgstr ""
-#: merge-recursive.c:3326
+#: merge-recursive.c:3350
msgid "file/directory"
msgstr ""
-#: merge-recursive.c:3331
+#: merge-recursive.c:3355
msgid "directory/file"
msgstr ""
-#: merge-recursive.c:3338
+#: merge-recursive.c:3362
#, c-format
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
msgstr ""
-#: merge-recursive.c:3347
+#: merge-recursive.c:3371
#, c-format
msgid "Adding %s"
msgstr ""
-#: merge-recursive.c:3356
+#: merge-recursive.c:3380
#, c-format
msgid "CONFLICT (add/add): Merge conflict in %s"
msgstr ""
-#: merge-recursive.c:3394
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by merge:\n"
-" %s"
-msgstr ""
-
-#: merge-recursive.c:3405
+#: merge-recursive.c:3424
msgid "Already up to date!"
msgstr ""
-#: merge-recursive.c:3414
+#: merge-recursive.c:3433
#, c-format
msgid "merging of trees %s and %s failed"
msgstr ""
-#: merge-recursive.c:3513
+#: merge-recursive.c:3537
msgid "Merging:"
msgstr ""
-#: merge-recursive.c:3526
+#: merge-recursive.c:3550
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] ""
msgstr[1] ""
-#: merge-recursive.c:3565
+#: merge-recursive.c:3600
msgid "merge returned no commit"
msgstr ""
-#: merge-recursive.c:3631
+#: merge-recursive.c:3659
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+" %s"
+msgstr ""
+
+#: merge-recursive.c:3756
#, c-format
msgid "Could not parse object '%s'"
msgstr ""
-#: merge-recursive.c:3647 builtin/merge.c:698 builtin/merge.c:869
+#: merge-recursive.c:3774 builtin/merge.c:694 builtin/merge.c:874
msgid "Unable to write index."
msgstr ""
-#: midx.c:69
+#: midx.c:68
#, c-format
msgid "multi-pack-index file %s is too small"
msgstr ""
-#: midx.c:85
+#: midx.c:84
#, c-format
msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
msgstr ""
-#: midx.c:90
+#: midx.c:89
#, c-format
msgid "multi-pack-index version %d not recognized"
msgstr ""
-#: midx.c:95
+#: midx.c:94
#, c-format
msgid "hash version %u does not match"
msgstr ""
-#: midx.c:109
+#: midx.c:108
msgid "invalid chunk offset (too large)"
msgstr ""
-#: midx.c:133
+#: midx.c:132
msgid "terminating multi-pack-index chunk id appears earlier than expected"
msgstr ""
-#: midx.c:146
+#: midx.c:145
msgid "multi-pack-index missing required pack-name chunk"
msgstr ""
-#: midx.c:148
+#: midx.c:147
msgid "multi-pack-index missing required OID fanout chunk"
msgstr ""
-#: midx.c:150
+#: midx.c:149
msgid "multi-pack-index missing required OID lookup chunk"
msgstr ""
-#: midx.c:152
+#: midx.c:151
msgid "multi-pack-index missing required object offsets chunk"
msgstr ""
-#: midx.c:166
+#: midx.c:165
#, c-format
msgid "multi-pack-index pack names out of order: '%s' before '%s'"
msgstr ""
-#: midx.c:211
+#: midx.c:210
#, c-format
msgid "bad pack-int-id: %u (%u total packs)"
msgstr ""
-#: midx.c:261
+#: midx.c:260
msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
msgstr ""
-#: midx.c:289
+#: midx.c:288
msgid "error preparing packfile from multi-pack-index"
msgstr ""
-#: midx.c:470
+#: midx.c:469
#, c-format
msgid "failed to add packfile '%s'"
msgstr ""
-#: midx.c:476
+#: midx.c:475
#, c-format
msgid "failed to open pack-index '%s'"
msgstr ""
-#: midx.c:536
+#: midx.c:535
#, c-format
msgid "failed to locate object %d in packfile"
msgstr ""
-#: midx.c:865
+#: midx.c:864
#, c-format
msgid "did not see pack-file %s to drop"
msgstr ""
-#: midx.c:1036
+#: midx.c:1035
#, c-format
msgid "failed to clear multi-pack-index at %s"
msgstr ""
-#: midx.c:1091
+#: midx.c:1090
msgid "Looking for referenced packfiles"
msgstr ""
-#: midx.c:1106
+#: midx.c:1105
#, c-format
msgid ""
"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
msgstr ""
-#: midx.c:1110
+#: midx.c:1109
msgid "Verifying OID order in MIDX"
msgstr ""
-#: midx.c:1119
+#: midx.c:1118
#, c-format
msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
msgstr ""
-#: midx.c:1138
+#: midx.c:1137
msgid "Sorting objects by packfile"
msgstr ""
-#: midx.c:1144
+#: midx.c:1143
msgid "Verifying object offsets"
msgstr ""
-#: midx.c:1160
+#: midx.c:1159
#, c-format
msgid "failed to load pack entry for oid[%d] = %s"
msgstr ""
-#: midx.c:1166
+#: midx.c:1165
#, c-format
msgid "failed to load pack-index for packfile %s"
msgstr ""
-#: midx.c:1175
+#: midx.c:1174
#, c-format
msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
msgstr ""
-#: midx.c:1350
+#: midx.c:1349
msgid "could not start pack-objects"
msgstr ""
-#: midx.c:1369
+#: midx.c:1368
msgid "could not finish pack-objects"
msgstr ""
-#: name-hash.c:532
+#: name-hash.c:537
#, c-format
msgid "unable to create lazy_dir thread: %s"
msgstr ""
-#: name-hash.c:554
+#: name-hash.c:559
#, c-format
msgid "unable to create lazy_name thread: %s"
msgstr ""
-#: name-hash.c:560
+#: name-hash.c:565
#, c-format
msgid "unable to join lazy_name thread: %s"
msgstr ""
msgid "Bad %s value: '%s'"
msgstr ""
-#: object.c:54
+#: object.c:53
#, c-format
msgid "invalid object type \"%s\""
msgstr ""
-#: object.c:174
+#: object.c:173
#, c-format
msgid "object %s is a %s, not a %s"
msgstr ""
-#: object.c:234
+#: object.c:233
#, c-format
msgid "object %s has unknown type id %d"
msgstr ""
-#: object.c:247
+#: object.c:246
#, c-format
msgid "unable to parse object: %s"
msgstr ""
-#: object.c:267 object.c:278
+#: object.c:266 object.c:277
#, c-format
msgid "hash mismatch %s"
msgstr ""
-#: packfile.c:648
+#: packfile.c:641
msgid "offset before end of packfile (broken .idx?)"
msgstr ""
-#: packfile.c:1899
+#: packfile.c:1887
#, c-format
msgid "offset before start of pack index for %s (corrupt index?)"
msgstr ""
-#: packfile.c:1903
+#: packfile.c:1891
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr ""
msgid "did you mean `--%s` (with two dashes ?)"
msgstr ""
-#: parse-options.c:859
+#: parse-options.c:860
#, c-format
msgid "unknown option `%s'"
msgstr ""
-#: parse-options.c:861
+#: parse-options.c:862
#, c-format
msgid "unknown switch `%c'"
msgstr ""
-#: parse-options.c:863
+#: parse-options.c:864
#, c-format
msgid "unknown non-ascii option in string: `%s'"
msgstr ""
-#: parse-options.c:887
+#: parse-options.c:888
msgid "..."
msgstr ""
-#: parse-options.c:906
+#: parse-options.c:907
#, c-format
msgid "usage: %s"
msgstr ""
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation.
#.
-#: parse-options.c:912
+#: parse-options.c:913
#, c-format
msgid " or: %s"
msgstr ""
-#: parse-options.c:915
+#: parse-options.c:916
#, c-format
msgid " %s"
msgstr ""
-#: parse-options.c:954
+#: parse-options.c:955
msgid "-NUM"
msgstr ""
-#: parse-options.c:968
+#: parse-options.c:969
#, c-format
msgid "alias of --%s"
msgstr ""
msgid "unable to parse --pretty format"
msgstr ""
-#: range-diff.c:70
+#: promisor-remote.c:25
+msgid "Remote with no URL"
+msgstr ""
+
+#: promisor-remote.c:61
+#, c-format
+msgid "promisor remote name cannot begin with '/': %s"
+msgstr ""
+
+#: range-diff.c:71
msgid "could not start `log`"
msgstr ""
-#: range-diff.c:72
+#: range-diff.c:73
msgid "could not read `log` output"
msgstr ""
-#: range-diff.c:91 sequencer.c:5021
+#: range-diff.c:92 sequencer.c:4985
#, c-format
msgid "could not parse commit '%s'"
msgstr ""
-#: range-diff.c:117
+#: range-diff.c:118
#, c-format
msgid "could not parse git header '%.*s'"
msgstr ""
-#: range-diff.c:274
+#: range-diff.c:275
msgid "failed to generate diff"
msgstr ""
-#: range-diff.c:506 range-diff.c:508
+#: range-diff.c:507 range-diff.c:509
#, c-format
msgid "could not parse log for '%s'"
msgstr ""
msgid "'%s' appears as both a file and as a directory"
msgstr ""
-#: read-cache.c:1499
+#: read-cache.c:1520
msgid "Refresh index"
msgstr ""
-#: read-cache.c:1613
+#: read-cache.c:1635
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
"Using version %i"
msgstr ""
-#: read-cache.c:1623
+#: read-cache.c:1645
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
"Using version %i"
msgstr ""
-#: read-cache.c:1679
+#: read-cache.c:1701
#, c-format
msgid "bad signature 0x%08x"
msgstr ""
-#: read-cache.c:1682
+#: read-cache.c:1704
#, c-format
msgid "bad index version %d"
msgstr ""
-#: read-cache.c:1691
+#: read-cache.c:1713
msgid "bad index file sha1 signature"
msgstr ""
-#: read-cache.c:1721
+#: read-cache.c:1743
#, c-format
msgid "index uses %.4s extension, which we do not understand"
msgstr ""
-#: read-cache.c:1723
+#: read-cache.c:1745
#, c-format
msgid "ignoring %.4s extension"
msgstr ""
-#: read-cache.c:1760
+#: read-cache.c:1782
#, c-format
msgid "unknown index entry format 0x%08x"
msgstr ""
-#: read-cache.c:1776
+#: read-cache.c:1798
#, c-format
msgid "malformed name field in the index, near path '%s'"
msgstr ""
-#: read-cache.c:1833
+#: read-cache.c:1855
msgid "unordered stage entries in index"
msgstr ""
-#: read-cache.c:1836
+#: read-cache.c:1858
#, c-format
msgid "multiple stage entries for merged file '%s'"
msgstr ""
-#: read-cache.c:1839
+#: read-cache.c:1861
#, c-format
msgid "unordered stage entries for '%s'"
msgstr ""
-#: read-cache.c:1946 read-cache.c:2234 rerere.c:565 rerere.c:599 rerere.c:1111
-#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:467
-#: builtin/checkout.c:651 builtin/clean.c:956 builtin/commit.c:347
+#: read-cache.c:1967 read-cache.c:2255 rerere.c:565 rerere.c:599 rerere.c:1111
+#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:468
+#: builtin/checkout.c:652 builtin/clean.c:967 builtin/commit.c:347
#: builtin/diff-tree.c:120 builtin/grep.c:499 builtin/mv.c:145
#: builtin/reset.c:245 builtin/rm.c:271 builtin/submodule--helper.c:330
msgid "index file corrupt"
msgstr ""
-#: read-cache.c:2087
+#: read-cache.c:2108
#, c-format
msgid "unable to create load_cache_entries thread: %s"
msgstr ""
-#: read-cache.c:2100
+#: read-cache.c:2121
#, c-format
msgid "unable to join load_cache_entries thread: %s"
msgstr ""
-#: read-cache.c:2133
+#: read-cache.c:2154
#, c-format
msgid "%s: index file open failed"
msgstr ""
-#: read-cache.c:2137
+#: read-cache.c:2158
#, c-format
msgid "%s: cannot stat the open index"
msgstr ""
-#: read-cache.c:2141
+#: read-cache.c:2162
#, c-format
msgid "%s: index file smaller than expected"
msgstr ""
-#: read-cache.c:2145
+#: read-cache.c:2166
#, c-format
msgid "%s: unable to map index file"
msgstr ""
-#: read-cache.c:2187
+#: read-cache.c:2208
#, c-format
msgid "unable to create load_index_extensions thread: %s"
msgstr ""
-#: read-cache.c:2214
+#: read-cache.c:2235
#, c-format
msgid "unable to join load_index_extensions thread: %s"
msgstr ""
-#: read-cache.c:2246
+#: read-cache.c:2267
#, c-format
msgid "could not freshen shared index '%s'"
msgstr ""
-#: read-cache.c:2293
+#: read-cache.c:2314
#, c-format
msgid "broken index, expect %s in %s, got %s"
msgstr ""
-#: read-cache.c:2989 wrapper.c:658 builtin/merge.c:1114
+#: read-cache.c:3010 wrapper.c:622 builtin/merge.c:1119
#, c-format
msgid "could not close '%s'"
msgstr ""
-#: read-cache.c:3092 sequencer.c:2358 sequencer.c:3928
+#: read-cache.c:3113 sequencer.c:2296 sequencer.c:3917
#, c-format
msgid "could not stat '%s'"
msgstr ""
-#: read-cache.c:3105
+#: read-cache.c:3126
#, c-format
msgid "unable to open git dir: %s"
msgstr ""
-#: read-cache.c:3117
+#: read-cache.c:3138
#, c-format
msgid "unable to unlink: %s"
msgstr ""
-#: read-cache.c:3142
+#: read-cache.c:3163
#, c-format
msgid "cannot fix permission bits on '%s'"
msgstr ""
-#: read-cache.c:3291
+#: read-cache.c:3312
#, c-format
msgid "%s: cannot drop to stage #0"
msgstr ""
msgid "Note that empty commits are commented out"
msgstr ""
-#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3447
-#: sequencer.c:3473 sequencer.c:5120 builtin/fsck.c:356 builtin/rebase.c:235
+#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3388
+#: sequencer.c:3414 sequencer.c:5084 builtin/fsck.c:356 builtin/rebase.c:235
#, c-format
msgid "could not write '%s'"
msgstr ""
msgid "ignoring dangling symref %s"
msgstr ""
-#: refs.c:669 ref-filter.c:2092
+#: refs.c:669 ref-filter.c:2098
#, c-format
msgid "ignoring broken ref %s"
msgstr ""
msgid "unexpected object ID when writing '%s'"
msgstr ""
-#: refs.c:833 sequencer.c:403 sequencer.c:2709 sequencer.c:2913
-#: sequencer.c:2927 sequencer.c:3184 sequencer.c:5037 wrapper.c:656
+#: refs.c:833 sequencer.c:403 sequencer.c:2647 sequencer.c:2851
+#: sequencer.c:2865 sequencer.c:3122 sequencer.c:5001 wrapper.c:620
#, c-format
msgid "could not write to '%s'"
msgstr ""
-#: refs.c:860 wrapper.c:225 wrapper.c:395 builtin/am.c:715
-#: builtin/rebase.c:1003
+#: refs.c:860 wrapper.c:188 wrapper.c:358 builtin/am.c:714
+#: builtin/rebase.c:1004
#, c-format
msgid "could not open '%s' for writing"
msgstr ""
msgid "update_ref failed for ref '%s': %s"
msgstr ""
-#: refs.c:2012
+#: refs.c:2023
#, c-format
msgid "multiple updates for ref '%s' not allowed"
msgstr ""
-#: refs.c:2044
+#: refs.c:2055
msgid "ref updates forbidden inside quarantine environment"
msgstr ""
-#: refs.c:2140 refs.c:2170
+#: refs.c:2151 refs.c:2181
#, c-format
msgid "'%s' exists; cannot create '%s'"
msgstr ""
-#: refs.c:2146 refs.c:2181
+#: refs.c:2157 refs.c:2192
#, c-format
msgid "cannot process '%s' and '%s' at the same time"
msgstr ""
msgid "could not remove reference %s"
msgstr ""
-#: refs/files-backend.c:1248 refs/packed-backend.c:1532
-#: refs/packed-backend.c:1542
+#: refs/files-backend.c:1248 refs/packed-backend.c:1541
+#: refs/packed-backend.c:1551
#, c-format
msgid "could not delete reference %s: %s"
msgstr ""
-#: refs/files-backend.c:1251 refs/packed-backend.c:1545
+#: refs/files-backend.c:1251 refs/packed-backend.c:1554
#, c-format
msgid "could not delete references: %s"
msgstr ""
msgid "invalid refspec '%s'"
msgstr ""
-#: ref-filter.c:42 wt-status.c:1934
+#: ref-filter.c:42 wt-status.c:1938
msgid "gone"
msgstr ""
msgid "ahead %d, behind %d"
msgstr ""
-#: ref-filter.c:162
+#: ref-filter.c:165
#, c-format
msgid "expected format: %%(color:<color>)"
msgstr ""
-#: ref-filter.c:164
+#: ref-filter.c:167
#, c-format
msgid "unrecognized color: %%(color:%s)"
msgstr ""
-#: ref-filter.c:186
+#: ref-filter.c:189
#, c-format
msgid "Integer value expected refname:lstrip=%s"
msgstr ""
-#: ref-filter.c:190
+#: ref-filter.c:193
#, c-format
msgid "Integer value expected refname:rstrip=%s"
msgstr ""
-#: ref-filter.c:192
+#: ref-filter.c:195
#, c-format
msgid "unrecognized %%(%s) argument: %s"
msgstr ""
-#: ref-filter.c:247
+#: ref-filter.c:250
#, c-format
msgid "%%(objecttype) does not take arguments"
msgstr ""
-#: ref-filter.c:269
+#: ref-filter.c:272
#, c-format
msgid "unrecognized %%(objectsize) argument: %s"
msgstr ""
-#: ref-filter.c:277
+#: ref-filter.c:280
#, c-format
msgid "%%(deltabase) does not take arguments"
msgstr ""
-#: ref-filter.c:289
+#: ref-filter.c:292
#, c-format
msgid "%%(body) does not take arguments"
msgstr ""
-#: ref-filter.c:298
+#: ref-filter.c:301
#, c-format
msgid "%%(subject) does not take arguments"
msgstr ""
-#: ref-filter.c:320
+#: ref-filter.c:323
#, c-format
msgid "unknown %%(trailers) argument: %s"
msgstr ""
-#: ref-filter.c:349
+#: ref-filter.c:352
#, c-format
msgid "positive value expected contents:lines=%s"
msgstr ""
-#: ref-filter.c:351
+#: ref-filter.c:354
#, c-format
msgid "unrecognized %%(contents) argument: %s"
msgstr ""
-#: ref-filter.c:366
+#: ref-filter.c:369
#, c-format
msgid "positive value expected objectname:short=%s"
msgstr ""
-#: ref-filter.c:370
+#: ref-filter.c:373
#, c-format
msgid "unrecognized %%(objectname) argument: %s"
msgstr ""
-#: ref-filter.c:400
+#: ref-filter.c:403
#, c-format
msgid "expected format: %%(align:<width>,<position>)"
msgstr ""
-#: ref-filter.c:412
+#: ref-filter.c:415
#, c-format
msgid "unrecognized position:%s"
msgstr ""
-#: ref-filter.c:419
+#: ref-filter.c:422
#, c-format
msgid "unrecognized width:%s"
msgstr ""
-#: ref-filter.c:428
+#: ref-filter.c:431
#, c-format
msgid "unrecognized %%(align) argument: %s"
msgstr ""
-#: ref-filter.c:436
+#: ref-filter.c:439
#, c-format
msgid "positive width expected with the %%(align) atom"
msgstr ""
-#: ref-filter.c:454
+#: ref-filter.c:457
#, c-format
msgid "unrecognized %%(if) argument: %s"
msgstr ""
-#: ref-filter.c:556
+#: ref-filter.c:559
#, c-format
msgid "malformed field name: %.*s"
msgstr ""
-#: ref-filter.c:583
+#: ref-filter.c:586
#, c-format
msgid "unknown field name: %.*s"
msgstr ""
-#: ref-filter.c:587
+#: ref-filter.c:590
#, c-format
msgid ""
"not a git repository, but the field '%.*s' requires access to object data"
msgstr ""
-#: ref-filter.c:711
+#: ref-filter.c:714
#, c-format
msgid "format: %%(if) atom used without a %%(then) atom"
msgstr ""
-#: ref-filter.c:774
+#: ref-filter.c:777
#, c-format
msgid "format: %%(then) atom used without an %%(if) atom"
msgstr ""
-#: ref-filter.c:776
+#: ref-filter.c:779
#, c-format
msgid "format: %%(then) atom used more than once"
msgstr ""
-#: ref-filter.c:778
+#: ref-filter.c:781
#, c-format
msgid "format: %%(then) atom used after %%(else)"
msgstr ""
-#: ref-filter.c:806
+#: ref-filter.c:809
#, c-format
msgid "format: %%(else) atom used without an %%(if) atom"
msgstr ""
-#: ref-filter.c:808
+#: ref-filter.c:811
#, c-format
msgid "format: %%(else) atom used without a %%(then) atom"
msgstr ""
-#: ref-filter.c:810
+#: ref-filter.c:813
#, c-format
msgid "format: %%(else) atom used more than once"
msgstr ""
-#: ref-filter.c:825
+#: ref-filter.c:828
#, c-format
msgid "format: %%(end) atom used without corresponding atom"
msgstr ""
-#: ref-filter.c:882
+#: ref-filter.c:885
#, c-format
msgid "malformed format string %s"
msgstr ""
-#: ref-filter.c:1485
+#: ref-filter.c:1488
#, c-format
msgid "no branch, rebasing %s"
msgstr ""
-#: ref-filter.c:1488
+#: ref-filter.c:1491
#, c-format
msgid "no branch, rebasing detached HEAD %s"
msgstr ""
-#: ref-filter.c:1491
+#: ref-filter.c:1494
#, c-format
msgid "no branch, bisect started on %s"
msgstr ""
-#: ref-filter.c:1501
+#: ref-filter.c:1504
msgid "no branch"
msgstr ""
-#: ref-filter.c:1537 ref-filter.c:1743
+#: ref-filter.c:1540 ref-filter.c:1749
#, c-format
msgid "missing object %s for %s"
msgstr ""
-#: ref-filter.c:1547
+#: ref-filter.c:1550
#, c-format
msgid "parse_object_buffer failed on %s for %s"
msgstr ""
-#: ref-filter.c:1998
+#: ref-filter.c:2004
#, c-format
msgid "malformed object at '%s'"
msgstr ""
-#: ref-filter.c:2087
+#: ref-filter.c:2093
#, c-format
msgid "ignoring ref with broken name %s"
msgstr ""
-#: ref-filter.c:2382
+#: ref-filter.c:2389
#, c-format
msgid "format: %%(end) atom missing"
msgstr ""
-#: ref-filter.c:2482
+#: ref-filter.c:2489
#, c-format
msgid "option `%s' is incompatible with --merged"
msgstr ""
-#: ref-filter.c:2485
+#: ref-filter.c:2492
#, c-format
msgid "option `%s' is incompatible with --no-merged"
msgstr ""
-#: ref-filter.c:2495
+#: ref-filter.c:2502
#, c-format
msgid "malformed object name %s"
msgstr ""
-#: ref-filter.c:2500
+#: ref-filter.c:2507
#, c-format
msgid "option `%s' must point to a commit"
msgstr ""
-#: remote.c:363
+#: remote.c:366
#, c-format
msgid "config remote shorthand cannot begin with '/': %s"
msgstr ""
-#: remote.c:410
+#: remote.c:413
msgid "more than one receivepack given, using the first"
msgstr ""
-#: remote.c:418
+#: remote.c:421
msgid "more than one uploadpack given, using the first"
msgstr ""
-#: remote.c:608
+#: remote.c:611
#, c-format
msgid "Cannot fetch both %s and %s to %s"
msgstr ""
-#: remote.c:612
+#: remote.c:615
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr ""
-#: remote.c:616
+#: remote.c:619
#, c-format
msgid "%s tracks both %s and %s"
msgstr ""
-#: remote.c:684
+#: remote.c:687
#, c-format
msgid "key '%s' of pattern had no '*'"
msgstr ""
-#: remote.c:694
+#: remote.c:697
#, c-format
msgid "value '%s' of pattern has no '*'"
msgstr ""
-#: remote.c:1000
+#: remote.c:1003
#, c-format
msgid "src refspec %s does not match any"
msgstr ""
-#: remote.c:1005
+#: remote.c:1008
#, c-format
msgid "src refspec %s matches more than one"
msgstr ""
#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
#. the <src>.
#.
-#: remote.c:1020
+#: remote.c:1023
#, c-format
msgid ""
"The destination you provided is not a full refname (i.e.,\n"
"Neither worked, so we gave up. You must fully qualify the ref."
msgstr ""
-#: remote.c:1040
+#: remote.c:1043
#, c-format
msgid ""
"The <src> part of the refspec is a commit object.\n"
"'%s:refs/heads/%s'?"
msgstr ""
-#: remote.c:1045
+#: remote.c:1048
#, c-format
msgid ""
"The <src> part of the refspec is a tag object.\n"
"'%s:refs/tags/%s'?"
msgstr ""
-#: remote.c:1050
+#: remote.c:1053
#, c-format
msgid ""
"The <src> part of the refspec is a tree object.\n"
"'%s:refs/tags/%s'?"
msgstr ""
-#: remote.c:1055
+#: remote.c:1058
#, c-format
msgid ""
"The <src> part of the refspec is a blob object.\n"
"'%s:refs/tags/%s'?"
msgstr ""
-#: remote.c:1091
+#: remote.c:1094
#, c-format
msgid "%s cannot be resolved to branch"
msgstr ""
-#: remote.c:1102
+#: remote.c:1105
#, c-format
msgid "unable to delete '%s': remote ref does not exist"
msgstr ""
-#: remote.c:1114
+#: remote.c:1117
#, c-format
msgid "dst refspec %s matches more than one"
msgstr ""
-#: remote.c:1121
+#: remote.c:1124
#, c-format
msgid "dst ref %s receives from more than one src"
msgstr ""
-#: remote.c:1624 remote.c:1725
+#: remote.c:1627 remote.c:1728
msgid "HEAD does not point to a branch"
msgstr ""
-#: remote.c:1633
+#: remote.c:1636
#, c-format
msgid "no such branch: '%s'"
msgstr ""
-#: remote.c:1636
+#: remote.c:1639
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr ""
-#: remote.c:1642
+#: remote.c:1645
#, c-format
msgid "upstream branch '%s' not stored as a remote-tracking branch"
msgstr ""
-#: remote.c:1657
+#: remote.c:1660
#, c-format
msgid "push destination '%s' on remote '%s' has no local tracking branch"
msgstr ""
-#: remote.c:1669
+#: remote.c:1672
#, c-format
msgid "branch '%s' has no remote for pushing"
msgstr ""
-#: remote.c:1679
+#: remote.c:1682
#, c-format
msgid "push refspecs for '%s' do not include '%s'"
msgstr ""
-#: remote.c:1692
+#: remote.c:1695
msgid "push has no destination (push.default is 'nothing')"
msgstr ""
-#: remote.c:1714
+#: remote.c:1717
msgid "cannot resolve 'simple' push to a single destination"
msgstr ""
-#: remote.c:1840
+#: remote.c:1843
#, c-format
msgid "couldn't find remote ref %s"
msgstr ""
-#: remote.c:1853
+#: remote.c:1856
#, c-format
msgid "* Ignoring funny ref '%s' locally"
msgstr ""
-#: remote.c:2016
+#: remote.c:2019
#, c-format
msgid "Your branch is based on '%s', but the upstream is gone.\n"
msgstr ""
-#: remote.c:2020
+#: remote.c:2023
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr ""
-#: remote.c:2023
+#: remote.c:2026
#, c-format
msgid "Your branch is up to date with '%s'.\n"
msgstr ""
-#: remote.c:2027
+#: remote.c:2030
#, c-format
msgid "Your branch and '%s' refer to different commits.\n"
msgstr ""
-#: remote.c:2030
+#: remote.c:2033
#, c-format
msgid " (use \"%s\" for details)\n"
msgstr ""
-#: remote.c:2034
+#: remote.c:2037
#, 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:2040
+#: remote.c:2043
msgid " (use \"git push\" to publish your local commits)\n"
msgstr ""
-#: remote.c:2043
+#: remote.c:2046
#, 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:2051
+#: remote.c:2054
msgid " (use \"git pull\" to update your local branch)\n"
msgstr ""
-#: remote.c:2054
+#: remote.c:2057
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
msgstr[0] ""
msgstr[1] ""
-#: remote.c:2064
+#: remote.c:2067
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr ""
-#: remote.c:2247
+#: remote.c:2250
#, c-format
msgid "cannot parse expected object name '%s'"
msgstr ""
msgid "Recorded preimage for '%s'"
msgstr ""
-#: rerere.c:881 submodule.c:2023 builtin/log.c:1773
+#: rerere.c:881 submodule.c:2023 builtin/log.c:1790
#: builtin/submodule--helper.c:1418 builtin/submodule--helper.c:1428
#, c-format
msgid "could not create directory '%s'"
msgid "unable to open rr-cache directory"
msgstr ""
-#: revision.c:2507
+#: revision.c:2509
msgid "your current branch appears to be broken"
msgstr ""
-#: revision.c:2510
+#: revision.c:2512
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr ""
-#: revision.c:2710
+#: revision.c:2720
msgid "--first-parent is incompatible with --bisect"
msgstr ""
-#: revision.c:2714
+#: revision.c:2724
msgid "-L does not yet support diff formats besides -p and -s"
msgstr ""
"You can disable this warning with `git config advice.ignoredHook false`."
msgstr ""
-#: send-pack.c:141
+#: send-pack.c:142
msgid "unexpected flush packet while reading remote unpack status"
msgstr ""
-#: send-pack.c:143
+#: send-pack.c:144
#, c-format
msgid "unable to parse remote unpack status: %s"
msgstr ""
-#: send-pack.c:145
+#: send-pack.c:146
#, c-format
msgid "remote unpack failed: %s"
msgstr ""
-#: send-pack.c:306
+#: send-pack.c:307
msgid "failed to sign the push certificate"
msgstr ""
-#: send-pack.c:420
+#: send-pack.c:421
msgid "the receiving end does not support --signed push"
msgstr ""
-#: send-pack.c:422
+#: send-pack.c:423
msgid ""
"not sending a push certificate since the receiving end does not support --"
"signed push"
msgstr ""
-#: send-pack.c:434
+#: send-pack.c:435
msgid "the receiving end does not support --atomic push"
msgstr ""
-#: send-pack.c:439
+#: send-pack.c:440
msgid "the receiving end does not support push options"
msgstr ""
msgid "could not delete '%s'"
msgstr ""
-#: sequencer.c:311 builtin/rebase.c:759 builtin/rebase.c:1645 builtin/rm.c:369
+#: sequencer.c:311 builtin/rebase.c:760 builtin/rebase.c:1676 builtin/rm.c:369
#, c-format
msgid "could not remove '%s'"
msgstr ""
"and commit the result with 'git commit'"
msgstr ""
-#: sequencer.c:401 sequencer.c:2909
+#: sequencer.c:401 sequencer.c:2847
#, c-format
msgid "could not lock '%s'"
msgstr ""
msgid "could not write eol to '%s'"
msgstr ""
-#: sequencer.c:413 sequencer.c:2714 sequencer.c:2915 sequencer.c:2929
-#: sequencer.c:3192
+#: sequencer.c:413 sequencer.c:2652 sequencer.c:2853 sequencer.c:2867
+#: sequencer.c:3130
#, c-format
msgid "failed to finalize '%s'"
msgstr ""
-#: sequencer.c:436 sequencer.c:981 sequencer.c:1655 sequencer.c:2734
-#: sequencer.c:3174 sequencer.c:3283 builtin/am.c:245 builtin/commit.c:763
-#: builtin/merge.c:1112 builtin/rebase.c:567
+#: sequencer.c:436 sequencer.c:1585 sequencer.c:2672 sequencer.c:3112
+#: sequencer.c:3221 builtin/am.c:244 builtin/commit.c:763 builtin/merge.c:1117
+#: builtin/rebase.c:568
#, c-format
msgid "could not read '%s'"
msgstr ""
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
#. "rebase -i".
#.
-#: sequencer.c:632
+#: sequencer.c:631
#, c-format
msgid "%s: Unable to write new index file"
msgstr ""
-#: sequencer.c:649
+#: sequencer.c:648
msgid "unable to update cache tree"
msgstr ""
-#: sequencer.c:663
+#: sequencer.c:662
msgid "could not resolve HEAD commit"
msgstr ""
-#: sequencer.c:743
+#: sequencer.c:742
#, c-format
msgid "no key present in '%.*s'"
msgstr ""
-#: sequencer.c:754
+#: sequencer.c:753
#, c-format
msgid "unable to dequote value of '%s'"
msgstr ""
-#: sequencer.c:791 wrapper.c:227 wrapper.c:397 builtin/am.c:706
-#: builtin/am.c:798 builtin/merge.c:1109 builtin/rebase.c:1045
+#: sequencer.c:790 wrapper.c:190 wrapper.c:360 builtin/am.c:705
+#: builtin/am.c:797 builtin/merge.c:1114 builtin/rebase.c:1046
#, c-format
msgid "could not open '%s' for reading"
msgstr ""
-#: sequencer.c:801
+#: sequencer.c:800
msgid "'GIT_AUTHOR_NAME' already given"
msgstr ""
-#: sequencer.c:806
+#: sequencer.c:805
msgid "'GIT_AUTHOR_EMAIL' already given"
msgstr ""
-#: sequencer.c:811
+#: sequencer.c:810
msgid "'GIT_AUTHOR_DATE' already given"
msgstr ""
-#: sequencer.c:815
+#: sequencer.c:814
#, c-format
msgid "unknown variable '%s'"
msgstr ""
-#: sequencer.c:820
+#: sequencer.c:819
msgid "missing 'GIT_AUTHOR_NAME'"
msgstr ""
-#: sequencer.c:822
+#: sequencer.c:821
msgid "missing 'GIT_AUTHOR_EMAIL'"
msgstr ""
-#: sequencer.c:824
+#: sequencer.c:823
msgid "missing 'GIT_AUTHOR_DATE'"
msgstr ""
-#: sequencer.c:884
-#, c-format
-msgid "invalid date format '%s' in '%s'"
-msgstr ""
-
-#: sequencer.c:901
+#: sequencer.c:872
#, c-format
msgid ""
"you have staged changes in your working tree\n"
" git rebase --continue\n"
msgstr ""
-#: sequencer.c:995
-msgid "writing root commit"
-msgstr ""
-
-#: sequencer.c:1216
+#: sequencer.c:1146
msgid "'prepare-commit-msg' hook failed"
msgstr ""
-#: sequencer.c:1223
+#: sequencer.c:1153
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:1236
+#: sequencer.c:1166
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:1278
+#: sequencer.c:1208
msgid "couldn't look up newly created commit"
msgstr ""
-#: sequencer.c:1280
+#: sequencer.c:1210
msgid "could not parse newly created commit"
msgstr ""
-#: sequencer.c:1326
+#: sequencer.c:1256
msgid "unable to resolve HEAD after creating commit"
msgstr ""
-#: sequencer.c:1328
+#: sequencer.c:1258
msgid "detached HEAD"
msgstr ""
-#: sequencer.c:1332
+#: sequencer.c:1262
msgid " (root-commit)"
msgstr ""
-#: sequencer.c:1353
+#: sequencer.c:1283
msgid "could not parse HEAD"
msgstr ""
-#: sequencer.c:1355
+#: sequencer.c:1285
#, c-format
msgid "HEAD %s is not a commit!"
msgstr ""
-#: sequencer.c:1359 builtin/commit.c:1571
+#: sequencer.c:1289 builtin/commit.c:1571
msgid "could not parse HEAD commit"
msgstr ""
-#: sequencer.c:1411 sequencer.c:2004
+#: sequencer.c:1341 sequencer.c:1933
msgid "unable to parse commit author"
msgstr ""
-#: sequencer.c:1421 builtin/am.c:1573 builtin/merge.c:684
+#: sequencer.c:1352 builtin/am.c:1561 builtin/merge.c:684
msgid "git write-tree failed to write a tree"
msgstr ""
-#: sequencer.c:1438 sequencer.c:1499
+#: sequencer.c:1369 sequencer.c:1429
#, c-format
msgid "unable to read commit message from '%s'"
msgstr ""
-#: sequencer.c:1465 builtin/am.c:1595 builtin/commit.c:1670 builtin/merge.c:878
-#: builtin/merge.c:903
+#: sequencer.c:1396 builtin/am.c:1583 builtin/commit.c:1670 builtin/merge.c:883
+#: builtin/merge.c:908
msgid "failed to write commit object"
msgstr ""
-#: sequencer.c:1526
+#: sequencer.c:1456
#, c-format
msgid "could not parse commit %s"
msgstr ""
-#: sequencer.c:1531
+#: sequencer.c:1461
#, c-format
msgid "could not parse parent commit %s"
msgstr ""
-#: sequencer.c:1605 sequencer.c:1715
+#: sequencer.c:1535 sequencer.c:1645
#, c-format
msgid "unknown command: %d"
msgstr ""
-#: sequencer.c:1662 sequencer.c:1687
+#: sequencer.c:1592 sequencer.c:1617
#, c-format
msgid "This is a combination of %d commits."
msgstr ""
-#: sequencer.c:1672
+#: sequencer.c:1602
msgid "need a HEAD to fixup"
msgstr ""
-#: sequencer.c:1674 sequencer.c:3219
+#: sequencer.c:1604 sequencer.c:3157
msgid "could not read HEAD"
msgstr ""
-#: sequencer.c:1676
+#: sequencer.c:1606
msgid "could not read HEAD's commit message"
msgstr ""
-#: sequencer.c:1682
+#: sequencer.c:1612
#, c-format
msgid "cannot write '%s'"
msgstr ""
-#: sequencer.c:1689 git-rebase--preserve-merges.sh:496
+#: sequencer.c:1619 git-rebase--preserve-merges.sh:496
msgid "This is the 1st commit message:"
msgstr ""
-#: sequencer.c:1697
+#: sequencer.c:1627
#, c-format
msgid "could not read commit message of %s"
msgstr ""
-#: sequencer.c:1704
+#: sequencer.c:1634
#, c-format
msgid "This is the commit message #%d:"
msgstr ""
-#: sequencer.c:1710
+#: sequencer.c:1640
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr ""
-#: sequencer.c:1798
+#: sequencer.c:1728
msgid "your index file is unmerged."
msgstr ""
-#: sequencer.c:1805
+#: sequencer.c:1735
msgid "cannot fixup root commit"
msgstr ""
-#: sequencer.c:1824
+#: sequencer.c:1754
#, c-format
msgid "commit %s is a merge but no -m option was given."
msgstr ""
-#: sequencer.c:1832 sequencer.c:1840
+#: sequencer.c:1762 sequencer.c:1770
#, c-format
msgid "commit %s does not have parent %d"
msgstr ""
-#: sequencer.c:1846
+#: 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:1865
+#: sequencer.c:1795
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr ""
-#: sequencer.c:1930
+#: sequencer.c:1860
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr ""
-#: sequencer.c:1985
+#: sequencer.c:1915
#, c-format
msgid "could not revert %s... %s"
msgstr ""
-#: sequencer.c:1986
+#: sequencer.c:1916
#, c-format
msgid "could not apply %s... %s"
msgstr ""
-#: sequencer.c:2045
+#: sequencer.c:1983
#, c-format
msgid "git %s: failed to read the index"
msgstr ""
-#: sequencer.c:2052
+#: sequencer.c:1990
#, c-format
msgid "git %s: failed to refresh the index"
msgstr ""
-#: sequencer.c:2128
+#: sequencer.c:2066
#, c-format
msgid "%s does not accept arguments: '%s'"
msgstr ""
-#: sequencer.c:2137
+#: sequencer.c:2075
#, c-format
msgid "missing arguments for %s"
msgstr ""
-#: sequencer.c:2174
+#: sequencer.c:2112
#, c-format
msgid "could not parse '%.*s'"
msgstr ""
-#: sequencer.c:2228
+#: sequencer.c:2166
#, c-format
msgid "invalid line %d: %.*s"
msgstr ""
-#: sequencer.c:2239
+#: sequencer.c:2177
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr ""
-#: sequencer.c:2287 builtin/rebase.c:153 builtin/rebase.c:178
+#: sequencer.c:2225 builtin/rebase.c:153 builtin/rebase.c:178
#: builtin/rebase.c:204 builtin/rebase.c:229
#, c-format
msgid "could not read '%s'."
msgstr ""
-#: sequencer.c:2323
+#: sequencer.c:2261
msgid "cancelling a cherry picking in progress"
msgstr ""
-#: sequencer.c:2330
+#: sequencer.c:2268
msgid "cancelling a revert in progress"
msgstr ""
-#: sequencer.c:2364
+#: sequencer.c:2302
msgid "please fix this using 'git rebase --edit-todo'."
msgstr ""
-#: sequencer.c:2366
+#: sequencer.c:2304
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr ""
-#: sequencer.c:2371
+#: sequencer.c:2309
msgid "no commits parsed."
msgstr ""
-#: sequencer.c:2382
+#: sequencer.c:2320
msgid "cannot cherry-pick during a revert."
msgstr ""
-#: sequencer.c:2384
+#: sequencer.c:2322
msgid "cannot revert during a cherry-pick."
msgstr ""
-#: sequencer.c:2466
+#: sequencer.c:2404
#, c-format
msgid "invalid value for %s: %s"
msgstr ""
-#: sequencer.c:2553
+#: sequencer.c:2491
msgid "unusable squash-onto"
msgstr ""
-#: sequencer.c:2569
+#: sequencer.c:2507
#, c-format
msgid "malformed options sheet: '%s'"
msgstr ""
-#: sequencer.c:2652 sequencer.c:4351
+#: sequencer.c:2590 sequencer.c:4308
msgid "empty commit set passed"
msgstr ""
-#: sequencer.c:2668
+#: sequencer.c:2606
msgid "revert is already in progress"
msgstr ""
-#: sequencer.c:2670
+#: sequencer.c:2608
#, c-format
msgid "try \"git revert (--continue | %s--abort | --quit)\""
msgstr ""
-#: sequencer.c:2673
+#: sequencer.c:2611
msgid "cherry-pick is already in progress"
msgstr ""
-#: sequencer.c:2675
+#: sequencer.c:2613
#, c-format
msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
msgstr ""
-#: sequencer.c:2689
+#: sequencer.c:2627
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr ""
-#: sequencer.c:2704
+#: sequencer.c:2642
msgid "could not lock HEAD"
msgstr ""
-#: sequencer.c:2764 sequencer.c:4103
+#: sequencer.c:2702 sequencer.c:4057
msgid "no cherry-pick or revert in progress"
msgstr ""
-#: sequencer.c:2766 sequencer.c:2777
+#: sequencer.c:2704 sequencer.c:2715
msgid "cannot resolve HEAD"
msgstr ""
-#: sequencer.c:2768 sequencer.c:2812
+#: sequencer.c:2706 sequencer.c:2750
msgid "cannot abort from a branch yet to be born"
msgstr ""
-#: sequencer.c:2798 builtin/grep.c:734
+#: sequencer.c:2736 builtin/grep.c:736
#, c-format
msgid "cannot open '%s'"
msgstr ""
-#: sequencer.c:2800
+#: sequencer.c:2738
#, c-format
msgid "cannot read '%s': %s"
msgstr ""
-#: sequencer.c:2801
+#: sequencer.c:2739
msgid "unexpected end of file"
msgstr ""
-#: sequencer.c:2807
+#: sequencer.c:2745
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr ""
-#: sequencer.c:2818
+#: sequencer.c:2756
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr ""
-#: sequencer.c:2859
+#: sequencer.c:2797
msgid "no revert in progress"
msgstr ""
-#: sequencer.c:2867
+#: sequencer.c:2805
msgid "no cherry-pick in progress"
msgstr ""
-#: sequencer.c:2877
+#: sequencer.c:2815
msgid "failed to skip the commit"
msgstr ""
-#: sequencer.c:2884
+#: sequencer.c:2822
msgid "there is nothing to skip"
msgstr ""
-#: sequencer.c:2887
+#: sequencer.c:2825
#, c-format
msgid ""
"have you committed already?\n"
"try \"git %s --continue\""
msgstr ""
-#: sequencer.c:3011 sequencer.c:4015
+#: sequencer.c:2949 sequencer.c:3969
#, c-format
msgid "could not update %s"
msgstr ""
-#: sequencer.c:3049 sequencer.c:3995
+#: sequencer.c:2987 sequencer.c:3949
msgid "cannot read HEAD"
msgstr ""
-#: sequencer.c:3066
+#: sequencer.c:3004
#, c-format
msgid "unable to copy '%s' to '%s'"
msgstr ""
-#: sequencer.c:3074
+#: sequencer.c:3012
#, c-format
msgid ""
"You can amend the commit now, with\n"
" git rebase --continue\n"
msgstr ""
-#: sequencer.c:3084
+#: sequencer.c:3022
#, c-format
msgid "Could not apply %s... %.*s"
msgstr ""
-#: sequencer.c:3091
+#: sequencer.c:3029
#, c-format
msgid "Could not merge %.*s"
msgstr ""
-#: sequencer.c:3105 sequencer.c:3109 builtin/difftool.c:633
+#: sequencer.c:3043 sequencer.c:3047 builtin/difftool.c:641
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr ""
-#: sequencer.c:3131 sequencer.c:3558 builtin/rebase.c:849 builtin/rebase.c:1582
-#: builtin/rebase.c:1953 builtin/rebase.c:2008
+#: sequencer.c:3069 sequencer.c:3506 builtin/rebase.c:850 builtin/rebase.c:1613
+#: builtin/rebase.c:1987 builtin/rebase.c:2031
msgid "could not read index"
msgstr ""
-#: sequencer.c:3136
+#: sequencer.c:3074
#, c-format
msgid ""
"execution failed: %s\n"
"\n"
msgstr ""
-#: sequencer.c:3142
+#: sequencer.c:3080
msgid "and made changes to the index and/or the working tree\n"
msgstr ""
-#: sequencer.c:3148
+#: sequencer.c:3086
#, c-format
msgid ""
"execution succeeded: %s\n"
"\n"
msgstr ""
-#: sequencer.c:3209
+#: sequencer.c:3147
#, c-format
msgid "illegal label name: '%.*s'"
msgstr ""
-#: sequencer.c:3263
+#: sequencer.c:3201
msgid "writing fake root commit"
msgstr ""
-#: sequencer.c:3268
+#: sequencer.c:3206
msgid "writing squash-onto"
msgstr ""
-#: sequencer.c:3306 builtin/rebase.c:854 builtin/rebase.c:860
+#: sequencer.c:3244 builtin/rebase.c:855 builtin/rebase.c:861
#, c-format
msgid "failed to find tree of %s"
msgstr ""
-#: sequencer.c:3324 builtin/rebase.c:873
+#: sequencer.c:3262 builtin/rebase.c:874
msgid "could not write index"
msgstr ""
-#: sequencer.c:3351
+#: sequencer.c:3289
#, c-format
msgid "could not resolve '%s'"
msgstr ""
-#: sequencer.c:3379
+#: sequencer.c:3320
msgid "cannot merge without a current revision"
msgstr ""
-#: sequencer.c:3401
+#: sequencer.c:3342
#, c-format
msgid "unable to parse '%.*s'"
msgstr ""
-#: sequencer.c:3410
+#: sequencer.c:3351
#, c-format
msgid "nothing to merge: '%.*s'"
msgstr ""
-#: sequencer.c:3422
+#: sequencer.c:3363
msgid "octopus merge cannot be executed on top of a [new root]"
msgstr ""
-#: sequencer.c:3437
+#: sequencer.c:3378
#, c-format
msgid "could not get commit message of '%s'"
msgstr ""
-#: sequencer.c:3590
+#: sequencer.c:3538
#, c-format
msgid "could not even attempt to merge '%.*s'"
msgstr ""
-#: sequencer.c:3606
+#: sequencer.c:3554
msgid "merge: Unable to write new index file"
msgstr ""
-#: sequencer.c:3675 builtin/rebase.c:711
+#: sequencer.c:3623 builtin/rebase.c:712
#, c-format
msgid "Applied autostash.\n"
msgstr ""
-#: sequencer.c:3687
+#: sequencer.c:3635
#, c-format
msgid "cannot store %s"
msgstr ""
-#: sequencer.c:3690 builtin/rebase.c:727 git-rebase--preserve-merges.sh:113
+#: sequencer.c:3638 builtin/rebase.c:728 git-rebase--preserve-merges.sh:113
#, 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:3751
+#: sequencer.c:3699
#, c-format
msgid "could not checkout %s"
msgstr ""
-#: sequencer.c:3765
+#: sequencer.c:3713
#, c-format
msgid "%s: not a valid OID"
msgstr ""
-#: sequencer.c:3770 git-rebase--preserve-merges.sh:779
+#: sequencer.c:3718 git-rebase--preserve-merges.sh:779
msgid "could not detach HEAD"
msgstr ""
-#: sequencer.c:3785
+#: sequencer.c:3733
#, c-format
msgid "Stopped at HEAD\n"
msgstr ""
-#: sequencer.c:3787
+#: sequencer.c:3735
#, c-format
msgid "Stopped at %s\n"
msgstr ""
-#: sequencer.c:3795
+#: sequencer.c:3743
#, c-format
msgid ""
"Could not execute the todo command\n"
" git rebase --continue\n"
msgstr ""
-#: sequencer.c:3877
+#: sequencer.c:3827
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr ""
-#: sequencer.c:3958
+#: sequencer.c:3898
#, c-format
msgid "unknown command %d"
msgstr ""
-#: sequencer.c:4003
+#: sequencer.c:3957
msgid "could not read orig-head"
msgstr ""
-#: sequencer.c:4008
+#: sequencer.c:3962
msgid "could not read 'onto'"
msgstr ""
-#: sequencer.c:4022
+#: sequencer.c:3976
#, c-format
msgid "could not update HEAD to %s"
msgstr ""
-#: sequencer.c:4115
+#: sequencer.c:4069
msgid "cannot rebase: You have unstaged changes."
msgstr ""
-#: sequencer.c:4124
+#: sequencer.c:4078
msgid "cannot amend non-existing commit"
msgstr ""
-#: sequencer.c:4126
+#: sequencer.c:4080
#, c-format
msgid "invalid file: '%s'"
msgstr ""
-#: sequencer.c:4128
+#: sequencer.c:4082
#, c-format
msgid "invalid contents: '%s'"
msgstr ""
-#: sequencer.c:4131
+#: sequencer.c:4085
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:4167 sequencer.c:4205
+#: sequencer.c:4121 sequencer.c:4159
#, c-format
msgid "could not write file: '%s'"
msgstr ""
-#: sequencer.c:4220
+#: sequencer.c:4174
msgid "could not remove CHERRY_PICK_HEAD"
msgstr ""
-#: sequencer.c:4227
+#: sequencer.c:4181
msgid "could not commit staged changes."
msgstr ""
-#: sequencer.c:4328
+#: sequencer.c:4285
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr ""
-#: sequencer.c:4332
+#: sequencer.c:4289
#, c-format
msgid "%s: bad revision"
msgstr ""
-#: sequencer.c:4367
+#: sequencer.c:4324
msgid "can't revert as initial commit"
msgstr ""
-#: sequencer.c:4810
+#: sequencer.c:4774
msgid "make_script: unhandled options"
msgstr ""
-#: sequencer.c:4813
+#: sequencer.c:4777
msgid "make_script: error preparing revisions"
msgstr ""
-#: sequencer.c:4971
+#: sequencer.c:4935
msgid ""
"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
"continue'.\n"
"Or you can abort the rebase with 'git rebase --abort'.\n"
msgstr ""
-#: sequencer.c:5083 sequencer.c:5100
+#: sequencer.c:5047 sequencer.c:5064
msgid "nothing to do"
msgstr ""
-#: sequencer.c:5114
+#: sequencer.c:5078
msgid "could not skip unnecessary pick commands"
msgstr ""
-#: sequencer.c:5197
+#: sequencer.c:5166
msgid "the script was already rearranged."
msgstr ""
-#: setup.c:123
+#: setup.c:124
#, c-format
msgid "'%s' is outside repository"
msgstr ""
-#: setup.c:173
+#: setup.c:174
#, 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:186
+#: setup.c:187
#, c-format
msgid ""
"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
"'git <command> [<revision>...] -- [<file>...]'"
msgstr ""
-#: setup.c:235
+#: setup.c:236
#, c-format
msgid "option '%s' must come before non-option arguments"
msgstr ""
-#: setup.c:254
+#: setup.c:255
#, c-format
msgid ""
"ambiguous argument '%s': both revision and filename\n"
"'git <command> [<revision>...] -- [<file>...]'"
msgstr ""
-#: setup.c:390
+#: setup.c:391
msgid "unable to set up work tree using invalid config"
msgstr ""
-#: setup.c:394
+#: setup.c:395
msgid "this operation must be run in a work tree"
msgstr ""
-#: setup.c:540
+#: setup.c:541
#, c-format
msgid "Expected git repo version <= %d, found %d"
msgstr ""
-#: setup.c:548
+#: setup.c:549
msgid "unknown repository extensions found:"
msgstr ""
-#: setup.c:567
+#: setup.c:568
#, c-format
msgid "error opening '%s'"
msgstr ""
-#: setup.c:569
+#: setup.c:570
#, c-format
msgid "too large to be a .git file: '%s'"
msgstr ""
-#: setup.c:571
+#: setup.c:572
#, c-format
msgid "error reading %s"
msgstr ""
-#: setup.c:573
+#: setup.c:574
#, c-format
msgid "invalid gitfile format: %s"
msgstr ""
-#: setup.c:575
+#: setup.c:576
#, c-format
msgid "no path in gitfile: %s"
msgstr ""
-#: setup.c:577
+#: setup.c:578
#, c-format
msgid "not a git repository: %s"
msgstr ""
-#: setup.c:676
+#: setup.c:677
#, c-format
msgid "'$%s' too big"
msgstr ""
-#: setup.c:690
+#: setup.c:691
#, c-format
msgid "not a git repository: '%s'"
msgstr ""
-#: setup.c:719 setup.c:721 setup.c:752
+#: setup.c:720 setup.c:722 setup.c:753
#, c-format
msgid "cannot chdir to '%s'"
msgstr ""
-#: setup.c:724 setup.c:780 setup.c:790 setup.c:829 setup.c:837
+#: setup.c:725 setup.c:781 setup.c:791 setup.c:830 setup.c:838
msgid "cannot come back to cwd"
msgstr ""
-#: setup.c:851
+#: setup.c:852
#, c-format
msgid "failed to stat '%*s%s%s'"
msgstr ""
-#: setup.c:1083
+#: setup.c:1090
msgid "Unable to read current working directory"
msgstr ""
-#: setup.c:1092 setup.c:1098
+#: setup.c:1099 setup.c:1105
#, c-format
msgid "cannot change to '%s'"
msgstr ""
-#: setup.c:1103
+#: setup.c:1110
#, c-format
msgid "not a git repository (or any of the parent directories): %s"
msgstr ""
-#: setup.c:1109
+#: setup.c:1116
#, 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:1220
+#: setup.c:1227
#, 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:1264
+#: setup.c:1271
msgid "open /dev/null or dup failed"
msgstr ""
-#: setup.c:1279
+#: setup.c:1286
msgid "fork failed"
msgstr ""
-#: setup.c:1284
+#: setup.c:1291
msgid "setsid failed"
msgstr ""
-#: sha1-file.c:453
+#: sha1-file.c:452
#, c-format
msgid "object directory %s does not exist; check .git/objects/info/alternates"
msgstr ""
-#: sha1-file.c:504
+#: sha1-file.c:503
#, c-format
msgid "unable to normalize alternate object path: %s"
msgstr ""
-#: sha1-file.c:576
+#: sha1-file.c:575
#, c-format
msgid "%s: ignoring alternate object stores, nesting too deep"
msgstr ""
-#: sha1-file.c:583
+#: sha1-file.c:582
#, c-format
msgid "unable to normalize object directory: %s"
msgstr ""
-#: sha1-file.c:626
+#: sha1-file.c:625
msgid "unable to fdopen alternates lockfile"
msgstr ""
-#: sha1-file.c:644
+#: sha1-file.c:643
msgid "unable to read alternates file"
msgstr ""
-#: sha1-file.c:651
+#: sha1-file.c:650
msgid "unable to move new alternates file into place"
msgstr ""
-#: sha1-file.c:686
+#: sha1-file.c:685
#, c-format
msgid "path '%s' does not exist"
msgstr ""
-#: sha1-file.c:712
+#: sha1-file.c:711
#, c-format
msgid "reference repository '%s' as a linked checkout is not supported yet."
msgstr ""
-#: sha1-file.c:718
+#: sha1-file.c:717
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr ""
-#: sha1-file.c:724
+#: sha1-file.c:723
#, c-format
msgid "reference repository '%s' is shallow"
msgstr ""
-#: sha1-file.c:732
+#: sha1-file.c:731
#, c-format
msgid "reference repository '%s' is grafted"
msgstr ""
-#: sha1-file.c:792
+#: sha1-file.c:791
#, c-format
msgid "invalid line while parsing alternate refs: %s"
msgstr ""
-#: sha1-file.c:944
+#: sha1-file.c:943
#, c-format
msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
msgstr ""
-#: sha1-file.c:969
+#: sha1-file.c:964
msgid "mmap failed"
msgstr ""
-#: sha1-file.c:1133
+#: sha1-file.c:1128
#, c-format
msgid "object file %s is empty"
msgstr ""
-#: sha1-file.c:1257 sha1-file.c:2396
+#: sha1-file.c:1252 sha1-file.c:2392
#, c-format
msgid "corrupt loose object '%s'"
msgstr ""
-#: sha1-file.c:1259 sha1-file.c:2400
+#: sha1-file.c:1254 sha1-file.c:2396
#, c-format
msgid "garbage at end of loose object '%s'"
msgstr ""
-#: sha1-file.c:1301
+#: sha1-file.c:1296
msgid "invalid object type"
msgstr ""
-#: sha1-file.c:1385
+#: sha1-file.c:1380
#, c-format
msgid "unable to unpack %s header with --allow-unknown-type"
msgstr ""
-#: sha1-file.c:1388
+#: sha1-file.c:1383
#, c-format
msgid "unable to unpack %s header"
msgstr ""
-#: sha1-file.c:1394
+#: sha1-file.c:1389
#, c-format
msgid "unable to parse %s header with --allow-unknown-type"
msgstr ""
-#: sha1-file.c:1397
+#: sha1-file.c:1392
#, c-format
msgid "unable to parse %s header"
msgstr ""
-#: sha1-file.c:1588
+#: sha1-file.c:1584
#, c-format
msgid "failed to read object %s"
msgstr ""
-#: sha1-file.c:1592
+#: sha1-file.c:1588
#, c-format
msgid "replacement %s not found for %s"
msgstr ""
-#: sha1-file.c:1596
+#: sha1-file.c:1592
#, c-format
msgid "loose object %s (stored in %s) is corrupt"
msgstr ""
-#: sha1-file.c:1600
+#: sha1-file.c:1596
#, c-format
msgid "packed object %s (stored in %s) is corrupt"
msgstr ""
-#: sha1-file.c:1703
+#: sha1-file.c:1699
#, c-format
msgid "unable to write file %s"
msgstr ""
-#: sha1-file.c:1710
+#: sha1-file.c:1706
#, c-format
msgid "unable to set permission to '%s'"
msgstr ""
-#: sha1-file.c:1717
+#: sha1-file.c:1713
msgid "file write error"
msgstr ""
-#: sha1-file.c:1736
+#: sha1-file.c:1732
msgid "error when closing loose object file"
msgstr ""
-#: sha1-file.c:1801
+#: sha1-file.c:1797
#, c-format
msgid "insufficient permission for adding an object to repository database %s"
msgstr ""
-#: sha1-file.c:1803
+#: sha1-file.c:1799
msgid "unable to create temporary file"
msgstr ""
-#: sha1-file.c:1827
+#: sha1-file.c:1823
msgid "unable to write loose object file"
msgstr ""
-#: sha1-file.c:1833
+#: sha1-file.c:1829
#, c-format
msgid "unable to deflate new object %s (%d)"
msgstr ""
-#: sha1-file.c:1837
+#: sha1-file.c:1833
#, c-format
msgid "deflateEnd on object %s failed (%d)"
msgstr ""
-#: sha1-file.c:1841
+#: sha1-file.c:1837
#, c-format
msgid "confused by unstable object source data for %s"
msgstr ""
-#: sha1-file.c:1851 builtin/pack-objects.c:925
+#: sha1-file.c:1847 builtin/pack-objects.c:925
#, c-format
msgid "failed utime() on %s"
msgstr ""
-#: sha1-file.c:1926
+#: sha1-file.c:1922
#, c-format
msgid "cannot read object for %s"
msgstr ""
-#: sha1-file.c:1966
+#: sha1-file.c:1962
msgid "corrupt commit"
msgstr ""
-#: sha1-file.c:1974
+#: sha1-file.c:1970
msgid "corrupt tag"
msgstr ""
-#: sha1-file.c:2073
+#: sha1-file.c:2069
#, c-format
msgid "read error while indexing %s"
msgstr ""
-#: sha1-file.c:2076
+#: sha1-file.c:2072
#, c-format
msgid "short read while indexing %s"
msgstr ""
-#: sha1-file.c:2149 sha1-file.c:2158
+#: sha1-file.c:2145 sha1-file.c:2154
#, c-format
msgid "%s: failed to insert into database"
msgstr ""
-#: sha1-file.c:2164
+#: sha1-file.c:2160
#, c-format
msgid "%s: unsupported file type"
msgstr ""
-#: sha1-file.c:2188
+#: sha1-file.c:2184
#, c-format
msgid "%s is not a valid object"
msgstr ""
-#: sha1-file.c:2190
+#: sha1-file.c:2186
#, c-format
msgid "%s is not a valid '%s' object"
msgstr ""
-#: sha1-file.c:2217 builtin/index-pack.c:155
+#: sha1-file.c:2213 builtin/index-pack.c:155
#, c-format
msgid "unable to open %s"
msgstr ""
-#: sha1-file.c:2407 sha1-file.c:2459
+#: sha1-file.c:2403 sha1-file.c:2455
#, c-format
msgid "hash mismatch for %s (expected %s)"
msgstr ""
-#: sha1-file.c:2431
+#: sha1-file.c:2427
#, c-format
msgid "unable to mmap %s"
msgstr ""
-#: sha1-file.c:2436
+#: sha1-file.c:2432
#, c-format
msgid "unable to unpack header of %s"
msgstr ""
-#: sha1-file.c:2442
+#: sha1-file.c:2438
#, c-format
msgid "unable to parse header of %s"
msgstr ""
-#: sha1-file.c:2453
+#: sha1-file.c:2449
#, c-format
msgid "unable to unpack contents of %s"
msgstr ""
-#: sha1-name.c:490
+#: sha1-name.c:487
#, c-format
msgid "short SHA1 %s is ambiguous"
msgstr ""
-#: sha1-name.c:501
+#: sha1-name.c:498
msgid "The candidates are:"
msgstr ""
-#: sha1-name.c:800
+#: sha1-name.c:797
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"
msgstr ""
#. TRANSLATORS: IEC 80000-13:2008 gibibyte
-#: strbuf.c:821
+#: strbuf.c:822
#, c-format
msgid "%u.%2.2u GiB"
msgstr ""
#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
-#: strbuf.c:823
+#: strbuf.c:824
#, c-format
msgid "%u.%2.2u GiB/s"
msgstr ""
#. TRANSLATORS: IEC 80000-13:2008 mebibyte
-#: strbuf.c:831
+#: strbuf.c:832
#, c-format
msgid "%u.%2.2u MiB"
msgstr ""
#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
-#: strbuf.c:833
+#: strbuf.c:834
#, c-format
msgid "%u.%2.2u MiB/s"
msgstr ""
#. TRANSLATORS: IEC 80000-13:2008 kibibyte
-#: strbuf.c:840
+#: strbuf.c:841
#, c-format
msgid "%u.%2.2u KiB"
msgstr ""
#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
-#: strbuf.c:842
+#: strbuf.c:843
#, c-format
msgid "%u.%2.2u KiB/s"
msgstr ""
#. TRANSLATORS: IEC 80000-13:2008 byte
-#: strbuf.c:848
+#: strbuf.c:849
#, c-format
msgid "%u byte"
msgid_plural "%u bytes"
msgstr[1] ""
#. TRANSLATORS: IEC 80000-13:2008 byte/second
-#: strbuf.c:850
+#: strbuf.c:851
#, c-format
msgid "%u byte/s"
msgid_plural "%u bytes/s"
msgid "ls-tree returned unexpected return code %d"
msgstr ""
-#: submodule-config.c:232
+#: submodule-config.c:236
#, c-format
msgid "ignoring suspicious submodule name: %s"
msgstr ""
-#: submodule-config.c:299
+#: submodule-config.c:303
msgid "negative values not allowed for submodule.fetchjobs"
msgstr ""
-#: submodule-config.c:397
+#: submodule-config.c:401
#, c-format
msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
msgstr ""
-#: submodule-config.c:486
+#: submodule-config.c:490
#, c-format
msgid "invalid value for %s"
msgstr ""
-#: submodule-config.c:755
+#: submodule-config.c:761
#, c-format
msgid "Could not update .gitmodules entry %s"
msgstr ""
msgid "could not read from stdin"
msgstr ""
-#: trailer.c:1011 wrapper.c:701
+#: trailer.c:1011 wrapper.c:665
#, c-format
msgid "could not stat %s"
msgstr ""
msgid "Would set upstream of '%s' to '%s' of '%s'\n"
msgstr ""
-#: transport.c:142
+#: transport.c:145
#, c-format
msgid "could not read bundle '%s'"
msgstr ""
-#: transport.c:208
+#: transport.c:214
#, c-format
msgid "transport: invalid depth option '%s'"
msgstr ""
-#: transport.c:259
+#: transport.c:266
msgid "see protocol.version in 'git help config' for more details"
msgstr ""
-#: transport.c:260
+#: transport.c:267
msgid "server options require protocol version 2 or later"
msgstr ""
-#: transport.c:625
+#: transport.c:632
msgid "could not parse transport.color.* config"
msgstr ""
-#: transport.c:698
+#: transport.c:705
msgid "support for protocol v2 not implemented yet"
msgstr ""
-#: transport.c:825
+#: transport.c:831
#, c-format
msgid "unknown value for config '%s': %s"
msgstr ""
-#: transport.c:891
+#: transport.c:897
#, c-format
msgid "transport '%s' not allowed"
msgstr ""
-#: transport.c:945
+#: transport.c:949
msgid "git-over-rsync is no longer supported"
msgstr ""
-#: transport.c:1040
+#: transport.c:1044
#, c-format
msgid ""
"The following submodule paths contain changes that can\n"
"not be found on any remote:\n"
msgstr ""
-#: transport.c:1044
+#: transport.c:1048
#, c-format
msgid ""
"\n"
"\n"
msgstr ""
-#: transport.c:1052
+#: transport.c:1056
msgid "Aborting."
msgstr ""
-#: transport.c:1193
+#: transport.c:1201
msgid "failed to push all needed submodules"
msgstr ""
-#: transport.c:1340 transport-helper.c:645
+#: transport.c:1345 transport-helper.c:655
msgid "operation not supported by protocol"
msgstr ""
-#: transport-helper.c:51 transport-helper.c:80
+#: transport-helper.c:61 transport-helper.c:90
msgid "full write to remote helper failed"
msgstr ""
-#: transport-helper.c:134
+#: transport-helper.c:144
#, c-format
msgid "unable to find remote helper for '%s'"
msgstr ""
-#: transport-helper.c:150 transport-helper.c:559
+#: transport-helper.c:160 transport-helper.c:569
msgid "can't dup helper output fd"
msgstr ""
-#: transport-helper.c:201
+#: transport-helper.c:211
#, c-format
msgid ""
"unknown mandatory capability %s; this remote helper probably needs newer "
"version of Git"
msgstr ""
-#: transport-helper.c:207
+#: transport-helper.c:217
msgid "this remote helper should implement refspec capability"
msgstr ""
-#: transport-helper.c:274 transport-helper.c:414
+#: transport-helper.c:284 transport-helper.c:424
#, c-format
msgid "%s unexpectedly said: '%s'"
msgstr ""
-#: transport-helper.c:403
+#: transport-helper.c:413
#, c-format
msgid "%s also locked %s"
msgstr ""
-#: transport-helper.c:481
+#: transport-helper.c:491
msgid "couldn't run fast-import"
msgstr ""
-#: transport-helper.c:504
+#: transport-helper.c:514
msgid "error while running fast-import"
msgstr ""
-#: transport-helper.c:533 transport-helper.c:1105
+#: transport-helper.c:543 transport-helper.c:1128
#, c-format
msgid "could not read ref %s"
msgstr ""
-#: transport-helper.c:578
+#: transport-helper.c:588
#, c-format
msgid "unknown response to connect: %s"
msgstr ""
-#: transport-helper.c:600
+#: transport-helper.c:610
msgid "setting remote service path not supported by protocol"
msgstr ""
-#: transport-helper.c:602
+#: transport-helper.c:612
msgid "invalid remote service path"
msgstr ""
-#: transport-helper.c:648
+#: transport-helper.c:658
#, c-format
msgid "can't connect to subservice %s"
msgstr ""
-#: transport-helper.c:720
+#: transport-helper.c:734
#, c-format
msgid "expected ok/error, helper said '%s'"
msgstr ""
-#: transport-helper.c:773
+#: transport-helper.c:787
#, c-format
msgid "helper reported unexpected status of %s"
msgstr ""
-#: transport-helper.c:834
+#: transport-helper.c:848
#, c-format
msgid "helper %s does not support dry-run"
msgstr ""
-#: transport-helper.c:837
+#: transport-helper.c:851
#, c-format
msgid "helper %s does not support --signed"
msgstr ""
-#: transport-helper.c:840
+#: transport-helper.c:854
#, c-format
msgid "helper %s does not support --signed=if-asked"
msgstr ""
-#: transport-helper.c:847
+#: transport-helper.c:861
#, c-format
msgid "helper %s does not support 'push-option'"
msgstr ""
-#: transport-helper.c:945
+#: transport-helper.c:959
msgid "remote-helper doesn't support push; refspec needed"
msgstr ""
-#: transport-helper.c:950
+#: transport-helper.c:964
#, c-format
msgid "helper %s does not support 'force'"
msgstr ""
-#: transport-helper.c:997
+#: transport-helper.c:1011
msgid "couldn't run fast-export"
msgstr ""
-#: transport-helper.c:1002
+#: transport-helper.c:1016
msgid "error while running fast-export"
msgstr ""
-#: transport-helper.c:1027
+#: transport-helper.c:1041
#, 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:1091
+#: transport-helper.c:1114
#, c-format
msgid "malformed response in ref list: %s"
msgstr ""
-#: transport-helper.c:1244
+#: transport-helper.c:1266
#, c-format
msgid "read(%s) failed"
msgstr ""
-#: transport-helper.c:1271
+#: transport-helper.c:1293
#, c-format
msgid "write(%s) failed"
msgstr ""
-#: transport-helper.c:1320
+#: transport-helper.c:1342
#, c-format
msgid "%s thread failed"
msgstr ""
-#: transport-helper.c:1324
+#: transport-helper.c:1346
#, c-format
msgid "%s thread failed to join: %s"
msgstr ""
-#: transport-helper.c:1343 transport-helper.c:1347
+#: transport-helper.c:1365 transport-helper.c:1369
#, c-format
msgid "can't start thread for copying data: %s"
msgstr ""
-#: transport-helper.c:1384
+#: transport-helper.c:1406
#, c-format
msgid "%s process failed to wait"
msgstr ""
-#: transport-helper.c:1388
+#: transport-helper.c:1410
#, c-format
msgid "%s process failed"
msgstr ""
-#: transport-helper.c:1406 transport-helper.c:1415
+#: transport-helper.c:1428 transport-helper.c:1437
msgid "can't start thread for copying data"
msgstr ""
msgid "too-short tree file"
msgstr ""
-#: unpack-trees.c:111
+#: unpack-trees.c:110
#, 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:113
+#: unpack-trees.c:112
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
"%%s"
msgstr ""
-#: unpack-trees.c:116
+#: unpack-trees.c:115
#, 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:118
+#: unpack-trees.c:117
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
"%%s"
msgstr ""
-#: unpack-trees.c:121
+#: unpack-trees.c:120
#, 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:123
+#: unpack-trees.c:122
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
"%%s"
msgstr ""
-#: unpack-trees.c:128
+#: unpack-trees.c:127
#, c-format
msgid ""
"Updating the following directories would lose untracked files in them:\n"
"%s"
msgstr ""
-#: unpack-trees.c:132
+#: unpack-trees.c:131
#, 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:134
+#: unpack-trees.c:133
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
"%%s"
msgstr ""
-#: unpack-trees.c:137
+#: unpack-trees.c:136
#, 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:139
+#: unpack-trees.c:138
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
"%%s"
msgstr ""
-#: unpack-trees.c:142
+#: unpack-trees.c:141
#, 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:144
+#: unpack-trees.c:143
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
"%%s"
msgstr ""
-#: unpack-trees.c:150
+#: unpack-trees.c:149
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
"%%sPlease move or remove them before you switch branches."
msgstr ""
-#: unpack-trees.c:152
+#: unpack-trees.c:151
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
"%%s"
msgstr ""
-#: unpack-trees.c:155
+#: unpack-trees.c:154
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
"%%sPlease move or remove them before you merge."
msgstr ""
-#: unpack-trees.c:157
+#: unpack-trees.c:156
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
"%%s"
msgstr ""
-#: unpack-trees.c:160
+#: unpack-trees.c:159
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
"%%sPlease move or remove them before you %s."
msgstr ""
-#: unpack-trees.c:162
+#: unpack-trees.c:161
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
"%%s"
msgstr ""
-#: unpack-trees.c:170
+#: unpack-trees.c:169
#, c-format
msgid "Entry '%s' overlaps with '%s'. Cannot bind."
msgstr ""
-#: unpack-trees.c:173
+#: unpack-trees.c:172
#, c-format
msgid ""
"Cannot update sparse checkout: the following entries are not up to date:\n"
"%s"
msgstr ""
-#: unpack-trees.c:175
+#: unpack-trees.c:174
#, c-format
msgid ""
"The following working tree files would be overwritten by sparse checkout "
"%s"
msgstr ""
-#: unpack-trees.c:177
+#: unpack-trees.c:176
#, c-format
msgid ""
"The following working tree files would be removed by sparse checkout "
"%s"
msgstr ""
-#: unpack-trees.c:179
+#: unpack-trees.c:178
#, c-format
msgid ""
"Cannot update submodule:\n"
"%s"
msgstr ""
-#: unpack-trees.c:256
+#: unpack-trees.c:255
#, c-format
msgid "Aborting\n"
msgstr ""
-#: unpack-trees.c:318
+#: unpack-trees.c:317
msgid "Updating files"
msgstr ""
-#: unpack-trees.c:350
+#: unpack-trees.c:349
msgid ""
"the following paths have collided (e.g. case-sensitive paths\n"
"on a case-insensitive filesystem) and only one from the same\n"
msgid "invalid '..' path segment"
msgstr ""
-#: worktree.c:258 builtin/am.c:2095
+#: worktree.c:258 builtin/am.c:2084
#, c-format
msgid "failed to read '%s'"
msgstr ""
msgid "'%s' does not point back to '%s'"
msgstr ""
-#: wrapper.c:223 wrapper.c:393
+#: wrapper.c:186 wrapper.c:356
#, c-format
msgid "could not open '%s' for reading and writing"
msgstr ""
-#: wrapper.c:424 wrapper.c:624
+#: wrapper.c:387 wrapper.c:588
#, c-format
msgid "unable to access '%s'"
msgstr ""
-#: wrapper.c:632
+#: wrapper.c:596
msgid "unable to get current working directory"
msgstr ""
msgstr ""
#: wt-status.c:1437
+msgid " (use \"git cherry-pick --skip\" to skip this patch)"
+msgstr ""
+
+#: wt-status.c:1439
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr ""
-#: wt-status.c:1447
+#: wt-status.c:1449
msgid "Revert currently in progress."
msgstr ""
-#: wt-status.c:1450
+#: wt-status.c:1452
#, c-format
msgid "You are currently reverting commit %s."
msgstr ""
-#: wt-status.c:1456
+#: wt-status.c:1458
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr ""
-#: wt-status.c:1459
+#: wt-status.c:1461
msgid " (run \"git revert --continue\" to continue)"
msgstr ""
-#: wt-status.c:1462
+#: wt-status.c:1464
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr ""
-#: wt-status.c:1464
+#: wt-status.c:1466
+msgid " (use \"git revert --skip\" to skip this patch)"
+msgstr ""
+
+#: wt-status.c:1468
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr ""
-#: wt-status.c:1474
+#: wt-status.c:1478
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
msgstr ""
-#: wt-status.c:1478
+#: wt-status.c:1482
msgid "You are currently bisecting."
msgstr ""
-#: wt-status.c:1481
+#: wt-status.c:1485
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr ""
-#: wt-status.c:1690
+#: wt-status.c:1694
msgid "On branch "
msgstr ""
-#: wt-status.c:1697
+#: wt-status.c:1701
msgid "interactive rebase in progress; onto "
msgstr ""
-#: wt-status.c:1699
+#: wt-status.c:1703
msgid "rebase in progress; onto "
msgstr ""
-#: wt-status.c:1709
+#: wt-status.c:1713
msgid "Not currently on any branch."
msgstr ""
-#: wt-status.c:1726
+#: wt-status.c:1730
msgid "Initial commit"
msgstr ""
-#: wt-status.c:1727
+#: wt-status.c:1731
msgid "No commits yet"
msgstr ""
-#: wt-status.c:1741
+#: wt-status.c:1745
msgid "Untracked files"
msgstr ""
-#: wt-status.c:1743
+#: wt-status.c:1747
msgid "Ignored files"
msgstr ""
-#: wt-status.c:1747
+#: wt-status.c:1751
#, 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:1753
+#: wt-status.c:1757
#, c-format
msgid "Untracked files not listed%s"
msgstr ""
-#: wt-status.c:1755
+#: wt-status.c:1759
msgid " (use -u option to show untracked files)"
msgstr ""
-#: wt-status.c:1761
+#: wt-status.c:1765
msgid "No changes"
msgstr ""
-#: wt-status.c:1766
+#: wt-status.c:1770
#, c-format
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr ""
-#: wt-status.c:1769
+#: wt-status.c:1773
#, c-format
msgid "no changes added to commit\n"
msgstr ""
-#: wt-status.c:1772
+#: wt-status.c:1776
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
"track)\n"
msgstr ""
-#: wt-status.c:1775
+#: wt-status.c:1779
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr ""
-#: wt-status.c:1778
+#: wt-status.c:1782
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr ""
-#: wt-status.c:1781 wt-status.c:1786
+#: wt-status.c:1785 wt-status.c:1790
#, c-format
msgid "nothing to commit\n"
msgstr ""
-#: wt-status.c:1784
+#: wt-status.c:1788
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr ""
-#: wt-status.c:1788
+#: wt-status.c:1792
#, c-format
msgid "nothing to commit, working tree clean\n"
msgstr ""
-#: wt-status.c:1901
+#: wt-status.c:1905
msgid "No commits yet on "
msgstr ""
-#: wt-status.c:1905
+#: wt-status.c:1909
msgid "HEAD (no branch)"
msgstr ""
-#: wt-status.c:1936
+#: wt-status.c:1940
msgid "different"
msgstr ""
-#: wt-status.c:1938 wt-status.c:1946
+#: wt-status.c:1942 wt-status.c:1950
msgid "behind "
msgstr ""
-#: wt-status.c:1941 wt-status.c:1944
+#: wt-status.c:1945 wt-status.c:1948
msgid "ahead "
msgstr ""
#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2466
+#: wt-status.c:2470
#, c-format
msgid "cannot %s: You have unstaged changes."
msgstr ""
-#: wt-status.c:2472
+#: wt-status.c:2476
msgid "additionally, your index contains uncommitted changes."
msgstr ""
-#: wt-status.c:2474
+#: wt-status.c:2478
#, c-format
msgid "cannot %s: Your index contains uncommitted changes."
msgstr ""
+#: compat/precompose_utf8.c:58 builtin/clone.c:452
+#, c-format
+msgid "failed to unlink '%s'"
+msgstr ""
+
#: builtin/add.c:25
msgid "git add [<options>] [--] <pathspec>..."
msgstr ""
msgid "Unstaged changes after refreshing the index:"
msgstr ""
-#: builtin/add.c:234 builtin/rev-parse.c:896
+#: builtin/add.c:234 builtin/rev-parse.c:897
msgid "Could not read the index"
msgstr ""
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr ""
-#: builtin/add.c:290 builtin/clean.c:909 builtin/fetch.c:147 builtin/mv.c:124
-#: builtin/prune-packed.c:56 builtin/pull.c:222 builtin/push.c:560
+#: builtin/add.c:290 builtin/clean.c:910 builtin/fetch.c:162 builtin/mv.c:124
+#: builtin/prune-packed.c:56 builtin/pull.c:223 builtin/push.c:547
#: builtin/remote.c:1345 builtin/rm.c:241 builtin/send-pack.c:165
msgid "dry run"
msgstr ""
msgid "check if - even missing - files are ignored in dry run"
msgstr ""
-#: builtin/add.c:309 builtin/update-index.c:1001
+#: builtin/add.c:309 builtin/update-index.c:1002
msgid "override the executable bit of the listed files"
msgstr ""
msgid "Maybe you wanted to say 'git add .'?\n"
msgstr ""
-#: builtin/am.c:348
+#: builtin/am.c:347
msgid "could not parse author script"
msgstr ""
-#: builtin/am.c:432
+#: builtin/am.c:431
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr ""
-#: builtin/am.c:474
+#: builtin/am.c:473
#, c-format
msgid "Malformed input line: '%s'."
msgstr ""
-#: builtin/am.c:512
+#: builtin/am.c:511
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr ""
-#: builtin/am.c:538
+#: builtin/am.c:537
msgid "fseek failed"
msgstr ""
-#: builtin/am.c:726
+#: builtin/am.c:725
#, c-format
msgid "could not parse patch '%s'"
msgstr ""
-#: builtin/am.c:791
+#: builtin/am.c:790
msgid "Only one StGIT patch series can be applied at once"
msgstr ""
-#: builtin/am.c:839
+#: builtin/am.c:838
msgid "invalid timestamp"
msgstr ""
-#: builtin/am.c:844 builtin/am.c:856
+#: builtin/am.c:843 builtin/am.c:855
msgid "invalid Date line"
msgstr ""
-#: builtin/am.c:851
+#: builtin/am.c:850
msgid "invalid timezone offset"
msgstr ""
-#: builtin/am.c:944
+#: builtin/am.c:943
msgid "Patch format detection failed."
msgstr ""
-#: builtin/am.c:949 builtin/clone.c:407
+#: builtin/am.c:948 builtin/clone.c:406
#, c-format
msgid "failed to create directory '%s'"
msgstr ""
-#: builtin/am.c:954
+#: builtin/am.c:953
msgid "Failed to split patches."
msgstr ""
-#: builtin/am.c:1084 builtin/commit.c:374
-msgid "unable to write index file"
-msgstr ""
-
-#: builtin/am.c:1098
+#: builtin/am.c:1084
#, c-format
msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr ""
-#: builtin/am.c:1099
+#: builtin/am.c:1085
#, c-format
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr ""
-#: builtin/am.c:1100
+#: builtin/am.c:1086
#, c-format
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr ""
-#: builtin/am.c:1183
+#: builtin/am.c:1169
msgid "Patch sent with format=flowed; space at the end of lines might be lost."
msgstr ""
-#: builtin/am.c:1211
+#: builtin/am.c:1197
msgid "Patch is empty."
msgstr ""
-#: builtin/am.c:1277
+#: builtin/am.c:1262
#, c-format
-msgid "invalid ident line: %.*s"
+msgid "missing author line in commit %s"
msgstr ""
-#: builtin/am.c:1299
+#: builtin/am.c:1265
#, c-format
-msgid "unable to parse commit %s"
+msgid "invalid ident line: %.*s"
msgstr ""
-#: builtin/am.c:1496
+#: builtin/am.c:1484
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr ""
-#: builtin/am.c:1498
+#: builtin/am.c:1486
msgid "Using index info to reconstruct a base tree..."
msgstr ""
-#: builtin/am.c:1517
+#: builtin/am.c:1505
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
msgstr ""
-#: builtin/am.c:1523
+#: builtin/am.c:1511
msgid "Falling back to patching base and 3-way merge..."
msgstr ""
-#: builtin/am.c:1549
+#: builtin/am.c:1537
msgid "Failed to merge in the changes."
msgstr ""
-#: builtin/am.c:1581
+#: builtin/am.c:1569
msgid "applying to an empty history"
msgstr ""
-#: builtin/am.c:1628 builtin/am.c:1632
+#: builtin/am.c:1616 builtin/am.c:1620
#, c-format
msgid "cannot resume: %s does not exist."
msgstr ""
-#: builtin/am.c:1650
+#: builtin/am.c:1638
msgid "Commit Body is:"
msgstr ""
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1660
+#: builtin/am.c:1648
#, c-format
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr ""
-#: builtin/am.c:1710
+#: builtin/am.c:1695 builtin/commit.c:374
+msgid "unable to write index file"
+msgstr ""
+
+#: builtin/am.c:1699
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr ""
-#: builtin/am.c:1750 builtin/am.c:1818
+#: builtin/am.c:1739 builtin/am.c:1807
#, c-format
msgid "Applying: %.*s"
msgstr ""
-#: builtin/am.c:1767
+#: builtin/am.c:1756
msgid "No changes -- Patch already applied."
msgstr ""
-#: builtin/am.c:1773
+#: builtin/am.c:1762
#, c-format
msgid "Patch failed at %s %.*s"
msgstr ""
-#: builtin/am.c:1777
+#: builtin/am.c:1766
msgid "Use 'git am --show-current-patch' to see the failed patch"
msgstr ""
-#: builtin/am.c:1821
+#: builtin/am.c:1810
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:1828
+#: builtin/am.c:1817
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:1935 builtin/am.c:1939 builtin/am.c:1951 builtin/reset.c:329
+#: builtin/am.c:1924 builtin/am.c:1928 builtin/am.c:1940 builtin/reset.c:329
#: builtin/reset.c:337
#, c-format
msgid "Could not parse object '%s'."
msgstr ""
-#: builtin/am.c:1987
+#: builtin/am.c:1976
msgid "failed to clean index"
msgstr ""
-#: builtin/am.c:2031
+#: builtin/am.c:2020
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
msgstr ""
-#: builtin/am.c:2128
+#: builtin/am.c:2117
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr ""
-#: builtin/am.c:2164
+#: builtin/am.c:2153
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr ""
-#: builtin/am.c:2165
+#: builtin/am.c:2154
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr ""
-#: builtin/am.c:2171
+#: builtin/am.c:2160
msgid "run interactively"
msgstr ""
-#: builtin/am.c:2173
+#: builtin/am.c:2162
msgid "historical option -- no-op"
msgstr ""
-#: builtin/am.c:2175
+#: builtin/am.c:2164
msgid "allow fall back on 3way merging if needed"
msgstr ""
-#: builtin/am.c:2176 builtin/init-db.c:494 builtin/prune-packed.c:58
-#: builtin/repack.c:296 builtin/stash.c:806
+#: builtin/am.c:2165 builtin/init-db.c:494 builtin/prune-packed.c:58
+#: builtin/repack.c:297 builtin/stash.c:812
msgid "be quiet"
msgstr ""
-#: builtin/am.c:2178
+#: builtin/am.c:2167
msgid "add a Signed-off-by line to the commit message"
msgstr ""
-#: builtin/am.c:2181
+#: builtin/am.c:2170
msgid "recode into utf8 (default)"
msgstr ""
-#: builtin/am.c:2183
+#: builtin/am.c:2172
msgid "pass -k flag to git-mailinfo"
msgstr ""
-#: builtin/am.c:2185
+#: builtin/am.c:2174
msgid "pass -b flag to git-mailinfo"
msgstr ""
-#: builtin/am.c:2187
+#: builtin/am.c:2176
msgid "pass -m flag to git-mailinfo"
msgstr ""
-#: builtin/am.c:2189
+#: builtin/am.c:2178
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr ""
-#: builtin/am.c:2192
+#: builtin/am.c:2181
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr ""
-#: builtin/am.c:2195
+#: builtin/am.c:2184
msgid "strip everything before a scissors line"
msgstr ""
-#: builtin/am.c:2197 builtin/am.c:2200 builtin/am.c:2203 builtin/am.c:2206
-#: builtin/am.c:2209 builtin/am.c:2212 builtin/am.c:2215 builtin/am.c:2218
-#: builtin/am.c:2224
+#: builtin/am.c:2186 builtin/am.c:2189 builtin/am.c:2192 builtin/am.c:2195
+#: builtin/am.c:2198 builtin/am.c:2201 builtin/am.c:2204 builtin/am.c:2207
+#: builtin/am.c:2213
msgid "pass it through git-apply"
msgstr ""
-#: builtin/am.c:2214 builtin/commit.c:1368 builtin/fmt-merge-msg.c:671
-#: builtin/fmt-merge-msg.c:674 builtin/grep.c:881 builtin/merge.c:249
-#: builtin/pull.c:159 builtin/pull.c:218 builtin/rebase.c:1418
-#: builtin/repack.c:307 builtin/repack.c:311 builtin/repack.c:313
+#: builtin/am.c:2203 builtin/commit.c:1368 builtin/fmt-merge-msg.c:671
+#: builtin/fmt-merge-msg.c:674 builtin/grep.c:883 builtin/merge.c:249
+#: builtin/pull.c:160 builtin/pull.c:219 builtin/rebase.c:1442
+#: builtin/repack.c:308 builtin/repack.c:312 builtin/repack.c:314
#: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403
-#: parse-options.h:141 parse-options.h:162 parse-options.h:312
+#: parse-options.h:150 parse-options.h:171 parse-options.h:312
msgid "n"
msgstr ""
-#: builtin/am.c:2220 builtin/branch.c:661 builtin/for-each-ref.c:38
-#: builtin/replace.c:554 builtin/tag.c:437 builtin/verify-tag.c:38
+#: builtin/am.c:2209 builtin/branch.c:661 builtin/for-each-ref.c:38
+#: builtin/replace.c:555 builtin/tag.c:437 builtin/verify-tag.c:38
msgid "format"
msgstr ""
-#: builtin/am.c:2221
+#: builtin/am.c:2210
msgid "format the patch(es) are in"
msgstr ""
-#: builtin/am.c:2227
+#: builtin/am.c:2216
msgid "override error message when patch failure occurs"
msgstr ""
-#: builtin/am.c:2229
+#: builtin/am.c:2218
msgid "continue applying patches after resolving a conflict"
msgstr ""
-#: builtin/am.c:2232
+#: builtin/am.c:2221
msgid "synonyms for --continue"
msgstr ""
-#: builtin/am.c:2235
+#: builtin/am.c:2224
msgid "skip the current patch"
msgstr ""
-#: builtin/am.c:2238
+#: builtin/am.c:2227
msgid "restore the original branch and abort the patching operation."
msgstr ""
-#: builtin/am.c:2241
+#: builtin/am.c:2230
msgid "abort the patching operation but keep HEAD where it is."
msgstr ""
-#: builtin/am.c:2244
+#: builtin/am.c:2233
msgid "show the patch being applied."
msgstr ""
-#: builtin/am.c:2248
+#: builtin/am.c:2237
msgid "lie about committer date"
msgstr ""
-#: builtin/am.c:2250
+#: builtin/am.c:2239
msgid "use current timestamp for author date"
msgstr ""
-#: builtin/am.c:2252 builtin/commit-tree.c:120 builtin/commit.c:1511
-#: builtin/merge.c:286 builtin/pull.c:193 builtin/rebase.c:489
-#: builtin/rebase.c:1459 builtin/revert.c:117 builtin/tag.c:418
+#: builtin/am.c:2241 builtin/commit-tree.c:120 builtin/commit.c:1511
+#: builtin/merge.c:286 builtin/pull.c:194 builtin/rebase.c:490
+#: builtin/rebase.c:1483 builtin/revert.c:117 builtin/tag.c:418
msgid "key-id"
msgstr ""
-#: builtin/am.c:2253 builtin/rebase.c:490 builtin/rebase.c:1460
+#: builtin/am.c:2242 builtin/rebase.c:491 builtin/rebase.c:1484
msgid "GPG-sign commits"
msgstr ""
-#: builtin/am.c:2256
+#: builtin/am.c:2245
msgid "(internal use for git-rebase)"
msgstr ""
-#: builtin/am.c:2274
+#: builtin/am.c:2263
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:2281
+#: builtin/am.c:2270
msgid "failed to read the index"
msgstr ""
-#: builtin/am.c:2296
+#: builtin/am.c:2285
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr ""
-#: builtin/am.c:2320
+#: builtin/am.c:2309
#, c-format
msgid ""
"Stray %s directory found.\n"
"Use \"git am --abort\" to remove it."
msgstr ""
-#: builtin/am.c:2326
+#: builtin/am.c:2315
msgid "Resolve operation not in progress, we are not resuming."
msgstr ""
-#: builtin/am.c:2336
+#: builtin/am.c:2325
msgid "interactive mode requires patches on the command line"
msgstr ""
msgid "--bisect-terms requires 0 or 1 argument"
msgstr ""
-#: builtin/blame.c:32
+#: builtin/blame.c:31
msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
msgstr ""
-#: builtin/blame.c:37
+#: builtin/blame.c:36
msgid "<rev-opts> are documented in git-rev-list(1)"
msgstr ""
-#: builtin/blame.c:410
+#: builtin/blame.c:409
#, c-format
msgid "expecting a color: %s"
msgstr ""
-#: builtin/blame.c:417
+#: builtin/blame.c:416
msgid "must end with a color"
msgstr ""
-#: builtin/blame.c:730
+#: builtin/blame.c:729
#, c-format
msgid "invalid color '%s' in color.blame.repeatedLines"
msgstr ""
-#: builtin/blame.c:748
+#: builtin/blame.c:747
msgid "invalid value for blame.coloring"
msgstr ""
-#: builtin/blame.c:823
+#: builtin/blame.c:822
#, c-format
msgid "cannot find revision %s to ignore"
msgstr ""
-#: builtin/blame.c:845
+#: builtin/blame.c:844
msgid "Show blame entries as we find them, incrementally"
msgstr ""
-#: builtin/blame.c:846
+#: builtin/blame.c:845
msgid "Show blank SHA-1 for boundary commits (Default: off)"
msgstr ""
-#: builtin/blame.c:847
+#: builtin/blame.c:846
msgid "Do not treat root commits as boundaries (Default: off)"
msgstr ""
-#: builtin/blame.c:848
+#: builtin/blame.c:847
msgid "Show work cost statistics"
msgstr ""
-#: builtin/blame.c:849
+#: builtin/blame.c:848
msgid "Force progress reporting"
msgstr ""
-#: builtin/blame.c:850
+#: builtin/blame.c:849
msgid "Show output score for blame entries"
msgstr ""
-#: builtin/blame.c:851
+#: builtin/blame.c:850
msgid "Show original filename (Default: auto)"
msgstr ""
-#: builtin/blame.c:852
+#: builtin/blame.c:851
msgid "Show original linenumber (Default: off)"
msgstr ""
-#: builtin/blame.c:853
+#: builtin/blame.c:852
msgid "Show in a format designed for machine consumption"
msgstr ""
-#: builtin/blame.c:854
+#: builtin/blame.c:853
msgid "Show porcelain format with per-line commit information"
msgstr ""
-#: builtin/blame.c:855
+#: builtin/blame.c:854
msgid "Use the same output mode as git-annotate (Default: off)"
msgstr ""
-#: builtin/blame.c:856
+#: builtin/blame.c:855
msgid "Show raw timestamp (Default: off)"
msgstr ""
-#: builtin/blame.c:857
+#: builtin/blame.c:856
msgid "Show long commit SHA1 (Default: off)"
msgstr ""
-#: builtin/blame.c:858
+#: builtin/blame.c:857
msgid "Suppress author name and timestamp (Default: off)"
msgstr ""
-#: builtin/blame.c:859
+#: builtin/blame.c:858
msgid "Show author email instead of name (Default: off)"
msgstr ""
-#: builtin/blame.c:860
+#: builtin/blame.c:859
msgid "Ignore whitespace differences"
msgstr ""
-#: builtin/blame.c:861 builtin/log.c:1629
+#: builtin/blame.c:860 builtin/log.c:1630
msgid "rev"
msgstr ""
-#: builtin/blame.c:861
+#: builtin/blame.c:860
msgid "Ignore <rev> when blaming"
msgstr ""
-#: builtin/blame.c:862
+#: builtin/blame.c:861
msgid "Ignore revisions from <file>"
msgstr ""
-#: builtin/blame.c:863
+#: builtin/blame.c:862
msgid "color redundant metadata from previous line differently"
msgstr ""
-#: builtin/blame.c:864
+#: builtin/blame.c:863
msgid "color lines by age"
msgstr ""
-#: builtin/blame.c:871
+#: builtin/blame.c:870
msgid "Use an experimental heuristic to improve diffs"
msgstr ""
-#: builtin/blame.c:873
+#: builtin/blame.c:872
msgid "Spend extra cycles to find better match"
msgstr ""
-#: builtin/blame.c:874
+#: builtin/blame.c:873
msgid "Use revisions from <file> instead of calling git-rev-list"
msgstr ""
-#: builtin/blame.c:875
+#: builtin/blame.c:874
msgid "Use <file>'s contents as the final image"
msgstr ""
-#: builtin/blame.c:876 builtin/blame.c:877
+#: builtin/blame.c:875 builtin/blame.c:876
msgid "score"
msgstr ""
-#: builtin/blame.c:876
+#: builtin/blame.c:875
msgid "Find line copies within and across files"
msgstr ""
-#: builtin/blame.c:877
+#: builtin/blame.c:876
msgid "Find line movements within and across files"
msgstr ""
-#: builtin/blame.c:878
+#: builtin/blame.c:877
msgid "n,m"
msgstr ""
-#: builtin/blame.c:878
+#: builtin/blame.c:877
msgid "Process only line range n,m, counting from 1"
msgstr ""
msgid "do not use"
msgstr ""
-#: builtin/branch.c:626 builtin/rebase.c:485
+#: builtin/branch.c:626 builtin/rebase.c:486
msgid "upstream"
msgstr ""
msgid "format to use for the output"
msgstr ""
-#: builtin/branch.c:684 builtin/clone.c:761
+#: builtin/branch.c:684 builtin/clone.c:760
msgid "HEAD not found below refs/heads!"
msgstr ""
msgid "Need a repository to unbundle."
msgstr ""
-#: builtin/cat-file.c:594
+#: builtin/cat-file.c:595
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:595
+#: builtin/cat-file.c:596
msgid ""
"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
"filters]"
msgstr ""
-#: builtin/cat-file.c:616
+#: builtin/cat-file.c:617
msgid "only one batch option may be specified"
msgstr ""
-#: builtin/cat-file.c:634
+#: builtin/cat-file.c:635
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr ""
-#: builtin/cat-file.c:635
+#: builtin/cat-file.c:636
msgid "show object type"
msgstr ""
-#: builtin/cat-file.c:636
+#: builtin/cat-file.c:637
msgid "show object size"
msgstr ""
-#: builtin/cat-file.c:638
+#: builtin/cat-file.c:639
msgid "exit with zero when there's no error"
msgstr ""
-#: builtin/cat-file.c:639
+#: builtin/cat-file.c:640
msgid "pretty-print object's content"
msgstr ""
-#: builtin/cat-file.c:641
+#: builtin/cat-file.c:642
msgid "for blob objects, run textconv on object's content"
msgstr ""
-#: builtin/cat-file.c:643
+#: builtin/cat-file.c:644
msgid "for blob objects, run filters on object's content"
msgstr ""
-#: builtin/cat-file.c:644 git-submodule.sh:936
+#: builtin/cat-file.c:645 git-submodule.sh:936
msgid "blob"
msgstr ""
-#: builtin/cat-file.c:645
+#: builtin/cat-file.c:646
msgid "use a specific path for --textconv/--filters"
msgstr ""
-#: builtin/cat-file.c:647
+#: builtin/cat-file.c:648
msgid "allow -s and -t to work with broken/corrupt objects"
msgstr ""
-#: builtin/cat-file.c:648
+#: builtin/cat-file.c:649
msgid "buffer --batch output"
msgstr ""
-#: builtin/cat-file.c:650
+#: builtin/cat-file.c:651
msgid "show info and content of objects fed from the standard input"
msgstr ""
-#: builtin/cat-file.c:654
+#: builtin/cat-file.c:655
msgid "show info about objects fed from the standard input"
msgstr ""
-#: builtin/cat-file.c:658
+#: builtin/cat-file.c:659
msgid "follow in-tree symlinks (used with --batch or --batch-check)"
msgstr ""
-#: builtin/cat-file.c:660
+#: builtin/cat-file.c:661
msgid "show all objects with --batch or --batch-check"
msgstr ""
-#: builtin/cat-file.c:662
+#: builtin/cat-file.c:663
msgid "do not order --batch-all-objects output"
msgstr ""
msgid "terminate input and output records by a NUL character"
msgstr ""
-#: builtin/check-ignore.c:21 builtin/checkout.c:1433 builtin/gc.c:538
-#: builtin/worktree.c:507
+#: builtin/check-ignore.c:21 builtin/checkout.c:1433 builtin/gc.c:537
+#: builtin/worktree.c:506
msgid "suppress progress reporting"
msgstr ""
#: builtin/checkout-index.c:178 builtin/column.c:31
#: builtin/submodule--helper.c:1373 builtin/submodule--helper.c:1376
#: builtin/submodule--helper.c:1384 builtin/submodule--helper.c:1857
-#: builtin/worktree.c:680
+#: builtin/worktree.c:679
msgid "string"
msgstr ""
msgid "git restore [<options>] [--source=<branch>] <file>..."
msgstr ""
-#: builtin/checkout.c:172 builtin/checkout.c:211
+#: builtin/checkout.c:173 builtin/checkout.c:212
#, c-format
msgid "path '%s' does not have our version"
msgstr ""
-#: builtin/checkout.c:174 builtin/checkout.c:213
+#: builtin/checkout.c:175 builtin/checkout.c:214
#, c-format
msgid "path '%s' does not have their version"
msgstr ""
-#: builtin/checkout.c:190
+#: builtin/checkout.c:191
#, c-format
msgid "path '%s' does not have all necessary versions"
msgstr ""
-#: builtin/checkout.c:240
+#: builtin/checkout.c:241
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr ""
-#: builtin/checkout.c:258
+#: builtin/checkout.c:259
#, c-format
msgid "path '%s': cannot merge"
msgstr ""
-#: builtin/checkout.c:274
+#: builtin/checkout.c:275
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr ""
-#: builtin/checkout.c:374
+#: builtin/checkout.c:375
#, c-format
msgid "Recreated %d merge conflict"
msgid_plural "Recreated %d merge conflicts"
msgstr[0] ""
msgstr[1] ""
-#: builtin/checkout.c:379
+#: builtin/checkout.c:380
#, c-format
msgid "Updated %d path from %s"
msgid_plural "Updated %d paths from %s"
msgstr[0] ""
msgstr[1] ""
-#: builtin/checkout.c:386
+#: builtin/checkout.c:387
#, c-format
msgid "Updated %d path from the index"
msgid_plural "Updated %d paths from the index"
msgstr[0] ""
msgstr[1] ""
-#: builtin/checkout.c:409 builtin/checkout.c:412 builtin/checkout.c:415
-#: builtin/checkout.c:419
+#: builtin/checkout.c:410 builtin/checkout.c:413 builtin/checkout.c:416
+#: builtin/checkout.c:420
#, c-format
msgid "'%s' cannot be used with updating paths"
msgstr ""
-#: builtin/checkout.c:422 builtin/checkout.c:425
+#: builtin/checkout.c:423 builtin/checkout.c:426
#, c-format
msgid "'%s' cannot be used with %s"
msgstr ""
-#: builtin/checkout.c:429
+#: builtin/checkout.c:430
#, c-format
msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr ""
-#: builtin/checkout.c:433
+#: builtin/checkout.c:434
#, c-format
msgid "neither '%s' or '%s' is specified"
msgstr ""
-#: builtin/checkout.c:437
+#: builtin/checkout.c:438
#, c-format
msgid "'%s' must be used when '%s' is not specified"
msgstr ""
-#: builtin/checkout.c:442 builtin/checkout.c:447
+#: builtin/checkout.c:443 builtin/checkout.c:448
#, c-format
msgid "'%s' or '%s' cannot be used with %s"
msgstr ""
-#: builtin/checkout.c:506 builtin/checkout.c:513
+#: builtin/checkout.c:507 builtin/checkout.c:514
#, c-format
msgid "path '%s' is unmerged"
msgstr ""
-#: builtin/checkout.c:679
+#: builtin/checkout.c:680
msgid "you need to resolve your current index first"
msgstr ""
-#: builtin/checkout.c:729
+#: builtin/checkout.c:730
#, c-format
msgid ""
"cannot continue with staged changes in the following files:\n"
"%s"
msgstr ""
-#: builtin/checkout.c:736
-#, c-format
-msgid "staged changes in the following files may be lost: %s"
-msgstr ""
-
#: builtin/checkout.c:833
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgid "HEAD is now at"
msgstr ""
-#: builtin/checkout.c:879 builtin/clone.c:714
+#: builtin/checkout.c:879 builtin/clone.c:713
msgid "unable to update HEAD"
msgstr ""
"Please use -- (and optionally --no-guess) to disambiguate"
msgstr ""
-#: builtin/checkout.c:1243 builtin/worktree.c:291 builtin/worktree.c:456
+#: builtin/checkout.c:1243 builtin/worktree.c:290 builtin/worktree.c:455
#, c-format
msgid "invalid reference: %s"
msgstr ""
msgid "missing branch or commit argument"
msgstr ""
-#: builtin/checkout.c:1437 builtin/clone.c:91 builtin/fetch.c:151
-#: builtin/merge.c:285 builtin/pull.c:137 builtin/push.c:575
-#: builtin/send-pack.c:174
+#: builtin/checkout.c:1437 builtin/clone.c:90 builtin/commit-graph.c:59
+#: builtin/commit-graph.c:180 builtin/fetch.c:166 builtin/merge.c:285
+#: builtin/pull.c:138 builtin/push.c:562 builtin/send-pack.c:174
msgid "force progress reporting"
msgstr ""
msgid "perform a 3-way merge with the new branch"
msgstr ""
-#: builtin/checkout.c:1439 builtin/log.c:1617 parse-options.h:318
+#: builtin/checkout.c:1439 builtin/log.c:1618 parse-options.h:318
msgid "style"
msgstr ""
msgid "conflict style (merge or diff3)"
msgstr ""
-#: builtin/checkout.c:1452 builtin/worktree.c:504
+#: builtin/checkout.c:1452 builtin/worktree.c:503
msgid "detach HEAD at named commit"
msgstr ""
"checkout.defaultRemote=origin in your config."
msgstr ""
-#: builtin/checkout.c:1691 builtin/checkout.c:1693 builtin/checkout.c:1733
-#: builtin/checkout.c:1735 builtin/clone.c:121 builtin/remote.c:169
-#: builtin/remote.c:171 builtin/worktree.c:500 builtin/worktree.c:502
+#: builtin/checkout.c:1691 builtin/checkout.c:1693 builtin/checkout.c:1742
+#: builtin/checkout.c:1744 builtin/clone.c:120 builtin/remote.c:169
+#: builtin/remote.c:171 builtin/worktree.c:499 builtin/worktree.c:501
msgid "branch"
msgstr ""
msgid "use overlay mode (default)"
msgstr ""
-#: builtin/checkout.c:1734
+#: builtin/checkout.c:1743
msgid "create and switch to a new branch"
msgstr ""
-#: builtin/checkout.c:1736
+#: builtin/checkout.c:1745
msgid "create/reset and switch to a branch"
msgstr ""
-#: builtin/checkout.c:1738
+#: builtin/checkout.c:1747
msgid "second guess 'git switch <no-such-branch>'"
msgstr ""
-#: builtin/checkout.c:1740
+#: builtin/checkout.c:1749
msgid "throw away local modifications"
msgstr ""
-#: builtin/checkout.c:1772
+#: builtin/checkout.c:1781
msgid "which tree-ish to checkout from"
msgstr ""
-#: builtin/checkout.c:1774
+#: builtin/checkout.c:1783
msgid "restore the index"
msgstr ""
-#: builtin/checkout.c:1776
+#: builtin/checkout.c:1785
msgid "restore the working tree (default)"
msgstr ""
-#: builtin/checkout.c:1778
+#: builtin/checkout.c:1787
msgid "ignore unmerged entries"
msgstr ""
-#: builtin/checkout.c:1779
+#: builtin/checkout.c:1788
msgid "use overlay mode"
msgstr ""
msgid "could not lstat %s\n"
msgstr ""
-#: builtin/clean.c:300 git-add--interactive.perl:593
+#: builtin/clean.c:301 git-add--interactive.perl:593
#, c-format
msgid ""
"Prompt help:\n"
" - (empty) select nothing\n"
msgstr ""
-#: builtin/clean.c:304 git-add--interactive.perl:602
+#: builtin/clean.c:305 git-add--interactive.perl:602
#, c-format
msgid ""
"Prompt help:\n"
" - (empty) finish selecting\n"
msgstr ""
-#: builtin/clean.c:520 git-add--interactive.perl:568
+#: builtin/clean.c:521 git-add--interactive.perl:568
#: git-add--interactive.perl:573
#, c-format, perl-format
msgid "Huh (%s)?\n"
msgstr ""
-#: builtin/clean.c:662
+#: builtin/clean.c:663
#, c-format
msgid "Input ignore patterns>> "
msgstr ""
-#: builtin/clean.c:699
+#: builtin/clean.c:700
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
msgstr ""
-#: builtin/clean.c:720
+#: builtin/clean.c:721
msgid "Select items to delete"
msgstr ""
#. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:761
+#: builtin/clean.c:762
#, c-format
msgid "Remove %s [y/N]? "
msgstr ""
-#: builtin/clean.c:786 git-add--interactive.perl:1763
+#: builtin/clean.c:787 git-add--interactive.perl:1763
#, c-format
msgid "Bye.\n"
msgstr ""
-#: builtin/clean.c:794
+#: builtin/clean.c:795
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
"? - help for prompt selection"
msgstr ""
-#: builtin/clean.c:821 git-add--interactive.perl:1849
+#: builtin/clean.c:822 git-add--interactive.perl:1849
msgid "*** Commands ***"
msgstr ""
-#: builtin/clean.c:822 git-add--interactive.perl:1846
+#: builtin/clean.c:823 git-add--interactive.perl:1846
msgid "What now"
msgstr ""
-#: builtin/clean.c:830
+#: builtin/clean.c:831
msgid "Would remove the following item:"
msgid_plural "Would remove the following items:"
msgstr[0] ""
msgstr[1] ""
-#: builtin/clean.c:846
+#: builtin/clean.c:847
msgid "No more files to clean, exiting."
msgstr ""
-#: builtin/clean.c:908
+#: builtin/clean.c:909
msgid "do not print names of files removed"
msgstr ""
-#: builtin/clean.c:910
+#: builtin/clean.c:911
msgid "force"
msgstr ""
-#: builtin/clean.c:911
+#: builtin/clean.c:912
msgid "interactive cleaning"
msgstr ""
-#: builtin/clean.c:913
+#: builtin/clean.c:914
msgid "remove whole directories"
msgstr ""
-#: builtin/clean.c:914 builtin/describe.c:546 builtin/describe.c:548
-#: builtin/grep.c:899 builtin/log.c:176 builtin/log.c:178
-#: builtin/ls-files.c:557 builtin/name-rev.c:413 builtin/name-rev.c:415
+#: builtin/clean.c:915 builtin/describe.c:548 builtin/describe.c:550
+#: builtin/grep.c:901 builtin/log.c:176 builtin/log.c:178
+#: builtin/ls-files.c:557 builtin/name-rev.c:417 builtin/name-rev.c:419
#: builtin/show-ref.c:179
msgid "pattern"
msgstr ""
-#: builtin/clean.c:915
+#: builtin/clean.c:916
msgid "add <pattern> to ignore rules"
msgstr ""
-#: builtin/clean.c:916
+#: builtin/clean.c:917
msgid "remove ignored files, too"
msgstr ""
-#: builtin/clean.c:918
+#: builtin/clean.c:919
msgid "remove only ignored files"
msgstr ""
-#: builtin/clean.c:936
+#: builtin/clean.c:937
msgid "-x and -X cannot be used together"
msgstr ""
-#: builtin/clean.c:940
+#: builtin/clean.c:941
msgid ""
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
"clean"
msgstr ""
-#: builtin/clean.c:943
+#: builtin/clean.c:944
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
msgstr ""
-#: builtin/clone.c:46
+#: builtin/clone.c:45
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr ""
-#: builtin/clone.c:93
+#: builtin/clone.c:92
msgid "don't create a checkout"
msgstr ""
-#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:489
+#: builtin/clone.c:93 builtin/clone.c:95 builtin/init-db.c:489
msgid "create a bare repository"
msgstr ""
-#: builtin/clone.c:98
+#: builtin/clone.c:97
msgid "create a mirror repository (implies bare)"
msgstr ""
-#: builtin/clone.c:100
+#: builtin/clone.c:99
msgid "to clone from a local repository"
msgstr ""
-#: builtin/clone.c:102
+#: builtin/clone.c:101
msgid "don't use local hardlinks, always copy"
msgstr ""
-#: builtin/clone.c:104
+#: builtin/clone.c:103
msgid "setup as shared repository"
msgstr ""
-#: builtin/clone.c:107
+#: builtin/clone.c:106
msgid "pathspec"
msgstr ""
-#: builtin/clone.c:107
+#: builtin/clone.c:106
msgid "initialize submodules in the clone"
msgstr ""
-#: builtin/clone.c:110
+#: builtin/clone.c:109
msgid "number of submodules cloned in parallel"
msgstr ""
-#: builtin/clone.c:111 builtin/init-db.c:486
+#: builtin/clone.c:110 builtin/init-db.c:486
msgid "template-directory"
msgstr ""
-#: builtin/clone.c:112 builtin/init-db.c:487
+#: builtin/clone.c:111 builtin/init-db.c:487
msgid "directory from which templates will be used"
msgstr ""
-#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1380
+#: builtin/clone.c:113 builtin/clone.c:115 builtin/submodule--helper.c:1380
#: builtin/submodule--helper.c:1860
msgid "reference repository"
msgstr ""
-#: builtin/clone.c:118 builtin/submodule--helper.c:1382
+#: builtin/clone.c:117 builtin/submodule--helper.c:1382
#: builtin/submodule--helper.c:1862
msgid "use --reference only while cloning"
msgstr ""
-#: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46
-#: builtin/pack-objects.c:3314 builtin/repack.c:319
+#: builtin/clone.c:118 builtin/column.c:27 builtin/merge-file.c:46
+#: builtin/pack-objects.c:3294 builtin/repack.c:320
msgid "name"
msgstr ""
-#: builtin/clone.c:120
+#: builtin/clone.c:119
msgid "use <name> instead of 'origin' to track upstream"
msgstr ""
-#: builtin/clone.c:122
+#: builtin/clone.c:121
msgid "checkout <branch> instead of the remote's HEAD"
msgstr ""
-#: builtin/clone.c:124
+#: builtin/clone.c:123
msgid "path to git-upload-pack on the remote"
msgstr ""
-#: builtin/clone.c:125 builtin/fetch.c:152 builtin/grep.c:838
-#: builtin/pull.c:226
+#: builtin/clone.c:124 builtin/fetch.c:167 builtin/grep.c:840
+#: builtin/pull.c:227
msgid "depth"
msgstr ""
-#: builtin/clone.c:126
+#: builtin/clone.c:125
msgid "create a shallow clone of that depth"
msgstr ""
-#: builtin/clone.c:127 builtin/fetch.c:154 builtin/pack-objects.c:3303
+#: builtin/clone.c:126 builtin/fetch.c:169 builtin/pack-objects.c:3283
msgid "time"
msgstr ""
-#: builtin/clone.c:128
+#: builtin/clone.c:127
msgid "create a shallow clone since a specific time"
msgstr ""
-#: builtin/clone.c:129 builtin/fetch.c:156 builtin/fetch.c:179
-#: builtin/rebase.c:1395
+#: builtin/clone.c:128 builtin/fetch.c:171 builtin/fetch.c:194
+#: builtin/rebase.c:1417
msgid "revision"
msgstr ""
-#: builtin/clone.c:130 builtin/fetch.c:157
+#: builtin/clone.c:129 builtin/fetch.c:172
msgid "deepen history of shallow clone, excluding rev"
msgstr ""
-#: builtin/clone.c:132
+#: builtin/clone.c:131
msgid "clone only one branch, HEAD or --branch"
msgstr ""
-#: builtin/clone.c:134
+#: builtin/clone.c:133
msgid "don't clone any tags, and make later fetches not to follow them"
msgstr ""
-#: builtin/clone.c:136
+#: builtin/clone.c:135
msgid "any cloned submodules will be shallow"
msgstr ""
-#: builtin/clone.c:137 builtin/init-db.c:495
+#: builtin/clone.c:136 builtin/init-db.c:495
msgid "gitdir"
msgstr ""
-#: builtin/clone.c:138 builtin/init-db.c:496
+#: builtin/clone.c:137 builtin/init-db.c:496
msgid "separate git dir from working tree"
msgstr ""
-#: builtin/clone.c:139
+#: builtin/clone.c:138
msgid "key=value"
msgstr ""
-#: builtin/clone.c:140
+#: builtin/clone.c:139
msgid "set config inside the new repository"
msgstr ""
-#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76
-#: builtin/push.c:585 builtin/send-pack.c:172
+#: builtin/clone.c:141 builtin/fetch.c:189 builtin/ls-remote.c:76
+#: builtin/push.c:572 builtin/send-pack.c:172
msgid "server-specific"
msgstr ""
-#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76
-#: builtin/push.c:585 builtin/send-pack.c:173
+#: builtin/clone.c:141 builtin/fetch.c:189 builtin/ls-remote.c:76
+#: builtin/push.c:572 builtin/send-pack.c:173
msgid "option to transmit"
msgstr ""
-#: builtin/clone.c:143 builtin/fetch.c:175 builtin/pull.c:239
-#: builtin/push.c:586
+#: builtin/clone.c:142 builtin/fetch.c:190 builtin/pull.c:240
+#: builtin/push.c:573
msgid "use IPv4 addresses only"
msgstr ""
-#: builtin/clone.c:145 builtin/fetch.c:177 builtin/pull.c:242
-#: builtin/push.c:588
+#: builtin/clone.c:144 builtin/fetch.c:192 builtin/pull.c:243
+#: builtin/push.c:575
msgid "use IPv6 addresses only"
msgstr ""
-#: builtin/clone.c:149
+#: builtin/clone.c:148
msgid "any cloned submodules will use their remote-tracking branch"
msgstr ""
-#: builtin/clone.c:285
+#: builtin/clone.c:284
msgid ""
"No directory name could be guessed.\n"
"Please specify a directory on the command line"
msgstr ""
-#: builtin/clone.c:338
+#: builtin/clone.c:337
#, c-format
msgid "info: Could not add alternate for '%s': %s\n"
msgstr ""
-#: builtin/clone.c:411
+#: builtin/clone.c:410
#, c-format
msgid "%s exists and is not a directory"
msgstr ""
-#: builtin/clone.c:428
+#: builtin/clone.c:427
#, c-format
msgid "failed to start iterator over '%s'"
msgstr ""
-#: builtin/clone.c:453
-#, c-format
-msgid "failed to unlink '%s'"
-msgstr ""
-
-#: builtin/clone.c:458
+#: builtin/clone.c:457
#, c-format
msgid "failed to create link '%s'"
msgstr ""
-#: builtin/clone.c:462
+#: builtin/clone.c:461
#, c-format
msgid "failed to copy file to '%s'"
msgstr ""
-#: builtin/clone.c:467
+#: builtin/clone.c:466
#, c-format
msgid "failed to iterate over '%s'"
msgstr ""
-#: builtin/clone.c:492
+#: builtin/clone.c:491
#, c-format
msgid "done.\n"
msgstr ""
-#: builtin/clone.c:506
+#: builtin/clone.c:505
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
"and retry with 'git restore --source=HEAD :/'\n"
msgstr ""
-#: builtin/clone.c:583
+#: builtin/clone.c:582
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr ""
-#: builtin/clone.c:702
+#: builtin/clone.c:701
#, c-format
msgid "unable to update %s"
msgstr ""
-#: builtin/clone.c:752
+#: builtin/clone.c:751
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr ""
-#: builtin/clone.c:783
+#: builtin/clone.c:782
msgid "unable to checkout working tree"
msgstr ""
-#: builtin/clone.c:833
+#: builtin/clone.c:832
msgid "unable to write parameters to config file"
msgstr ""
-#: builtin/clone.c:896
+#: builtin/clone.c:895
msgid "cannot repack to clean up"
msgstr ""
-#: builtin/clone.c:898
+#: builtin/clone.c:897
msgid "cannot unlink temporary alternates file"
msgstr ""
-#: builtin/clone.c:938 builtin/receive-pack.c:1950
+#: builtin/clone.c:937 builtin/receive-pack.c:1948
msgid "Too many arguments."
msgstr ""
-#: builtin/clone.c:942
+#: builtin/clone.c:941
msgid "You must specify a repository to clone."
msgstr ""
-#: builtin/clone.c:955
+#: builtin/clone.c:954
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr ""
-#: builtin/clone.c:958
+#: builtin/clone.c:957
msgid "--bare and --separate-git-dir are incompatible."
msgstr ""
-#: builtin/clone.c:971
+#: builtin/clone.c:970
#, c-format
msgid "repository '%s' does not exist"
msgstr ""
-#: builtin/clone.c:977 builtin/fetch.c:1660
+#: builtin/clone.c:976 builtin/fetch.c:1790
#, c-format
msgid "depth %s is not a positive number"
msgstr ""
-#: builtin/clone.c:987
+#: builtin/clone.c:986
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr ""
-#: builtin/clone.c:997
+#: builtin/clone.c:996
#, c-format
msgid "working tree '%s' already exists."
msgstr ""
-#: builtin/clone.c:1012 builtin/clone.c:1033 builtin/difftool.c:264
-#: builtin/worktree.c:303 builtin/worktree.c:335
+#: builtin/clone.c:1011 builtin/clone.c:1032 builtin/difftool.c:271
+#: builtin/log.c:1785 builtin/worktree.c:302 builtin/worktree.c:334
#, c-format
msgid "could not create leading directories of '%s'"
msgstr ""
-#: builtin/clone.c:1017
+#: builtin/clone.c:1016
#, c-format
msgid "could not create work tree dir '%s'"
msgstr ""
-#: builtin/clone.c:1037
+#: builtin/clone.c:1036
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr ""
-#: builtin/clone.c:1039
+#: builtin/clone.c:1038
#, c-format
msgid "Cloning into '%s'...\n"
msgstr ""
-#: builtin/clone.c:1063
+#: builtin/clone.c:1062
msgid ""
"clone --recursive is not compatible with both --reference and --reference-if-"
"able"
msgstr ""
-#: builtin/clone.c:1124
+#: builtin/clone.c:1123
msgid "--depth is ignored in local clones; use file:// instead."
msgstr ""
-#: builtin/clone.c:1126
+#: builtin/clone.c:1125
msgid "--shallow-since is ignored in local clones; use file:// instead."
msgstr ""
-#: builtin/clone.c:1128
+#: builtin/clone.c:1127
msgid "--shallow-exclude is ignored in local clones; use file:// instead."
msgstr ""
-#: builtin/clone.c:1130
+#: builtin/clone.c:1129
msgid "--filter is ignored in local clones; use file:// instead."
msgstr ""
-#: builtin/clone.c:1133
+#: builtin/clone.c:1132
msgid "source repository is shallow, ignoring --local"
msgstr ""
-#: builtin/clone.c:1138
+#: builtin/clone.c:1137
msgid "--local is ignored"
msgstr ""
-#: builtin/clone.c:1215 builtin/clone.c:1223
+#: builtin/clone.c:1212 builtin/clone.c:1220
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr ""
-#: builtin/clone.c:1226
+#: builtin/clone.c:1223
msgid "You appear to have cloned an empty repository."
msgstr ""
msgstr ""
#: builtin/commit-tree.c:114 builtin/commit.c:1500 builtin/merge.c:270
-#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1460
+#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1469
#: builtin/tag.c:412
msgid "message"
msgstr ""
msgstr ""
#: builtin/commit-tree.c:121 builtin/commit.c:1512 builtin/merge.c:287
-#: builtin/pull.c:194 builtin/revert.c:118
+#: builtin/pull.c:195 builtin/revert.c:118
msgid "GPG sign commit"
msgstr ""
msgid "version"
msgstr ""
-#: builtin/commit.c:1347 builtin/commit.c:1529 builtin/push.c:561
-#: builtin/worktree.c:651
+#: builtin/commit.c:1347 builtin/commit.c:1529 builtin/push.c:548
+#: builtin/worktree.c:650
msgid "machine-readable output"
msgstr ""
msgstr ""
#: builtin/commit.c:1355 builtin/commit.c:1359 builtin/commit.c:1537
-#: builtin/fast-export.c:1125 builtin/fast-export.c:1128
-#: builtin/fast-export.c:1131 builtin/rebase.c:1471 parse-options.h:332
+#: builtin/fast-export.c:1153 builtin/fast-export.c:1156
+#: builtin/fast-export.c:1159 builtin/rebase.c:1495 parse-options.h:332
msgid "mode"
msgstr ""
"traditional)"
msgstr ""
-#: builtin/commit.c:1362 parse-options.h:179
+#: builtin/commit.c:1362 parse-options.h:188
msgid "when"
msgstr ""
msgid "override author for commit"
msgstr ""
-#: builtin/commit.c:1499 builtin/gc.c:539
+#: builtin/commit.c:1499 builtin/gc.c:538
msgid "date"
msgstr ""
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr ""
-#: builtin/commit.c:1506 builtin/log.c:1564 builtin/merge.c:289
-#: builtin/pull.c:163 builtin/revert.c:110
+#: builtin/commit.c:1506 builtin/log.c:1565 builtin/merge.c:289
+#: builtin/pull.c:164 builtin/revert.c:110
msgid "add Signed-off-by:"
msgstr ""
msgstr ""
#: builtin/commit-graph.c:13 builtin/commit-graph.c:19
-msgid "git commit-graph verify [--object-dir <objdir>] [--shallow]"
+msgid ""
+"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
msgstr ""
#: builtin/commit-graph.c:14 builtin/commit-graph.c:29
msgid ""
"git commit-graph write [--object-dir <objdir>] [--append|--split] [--"
-"reachable|--stdin-packs|--stdin-commits] <split options>"
+"reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <split options>"
msgstr ""
-#: builtin/commit-graph.c:54 builtin/commit-graph.c:100
-#: builtin/commit-graph.c:161 builtin/commit-graph.c:237 builtin/fetch.c:163
-#: builtin/log.c:1584
+#: builtin/commit-graph.c:55 builtin/commit-graph.c:107
+#: builtin/commit-graph.c:170 builtin/commit-graph.c:254 builtin/fetch.c:178
+#: builtin/log.c:1585
msgid "dir"
msgstr ""
-#: builtin/commit-graph.c:55 builtin/commit-graph.c:101
-#: builtin/commit-graph.c:162 builtin/commit-graph.c:238
+#: builtin/commit-graph.c:56 builtin/commit-graph.c:108
+#: builtin/commit-graph.c:171 builtin/commit-graph.c:255
msgid "The object directory to store the graph"
msgstr ""
-#: builtin/commit-graph.c:57
+#: builtin/commit-graph.c:58
msgid "if the commit-graph is split, only verify the tip file"
msgstr ""
-#: builtin/commit-graph.c:73 builtin/commit-graph.c:116
+#: builtin/commit-graph.c:80 builtin/commit-graph.c:125
#, c-format
msgid "Could not open commit-graph '%s'"
msgstr ""
-#: builtin/commit-graph.c:164
+#: builtin/commit-graph.c:173
msgid "start walk at all refs"
msgstr ""
-#: builtin/commit-graph.c:166
+#: builtin/commit-graph.c:175
msgid "scan pack-indexes listed by stdin for commits"
msgstr ""
-#: builtin/commit-graph.c:168
+#: builtin/commit-graph.c:177
msgid "start walk at commits listed by stdin"
msgstr ""
-#: builtin/commit-graph.c:170
+#: builtin/commit-graph.c:179
msgid "include all commits already in the commit-graph file"
msgstr ""
-#: builtin/commit-graph.c:172
+#: builtin/commit-graph.c:182
msgid "allow writing an incremental commit-graph file"
msgstr ""
-#: builtin/commit-graph.c:174 builtin/commit-graph.c:178
+#: builtin/commit-graph.c:184 builtin/commit-graph.c:188
msgid "maximum number of commits in a non-base split commit-graph"
msgstr ""
-#: builtin/commit-graph.c:176
+#: builtin/commit-graph.c:186
msgid "maximum ratio between two levels of a split commit-graph"
msgstr ""
-#: builtin/commit-graph.c:191
+#: builtin/commit-graph.c:204
msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
msgstr ""
msgid "print sizes in human readable format"
msgstr ""
-#: builtin/describe.c:27
+#: builtin/describe.c:26
msgid "git describe [<options>] [<commit-ish>...]"
msgstr ""
-#: builtin/describe.c:28
+#: builtin/describe.c:27
msgid "git describe [<options>] --dirty"
msgstr ""
-#: builtin/describe.c:63
+#: builtin/describe.c:62
msgid "head"
msgstr ""
-#: builtin/describe.c:63
+#: builtin/describe.c:62
msgid "lightweight"
msgstr ""
-#: builtin/describe.c:63
+#: builtin/describe.c:62
msgid "annotated"
msgstr ""
-#: builtin/describe.c:273
+#: builtin/describe.c:275
#, c-format
msgid "annotated tag %s not available"
msgstr ""
-#: builtin/describe.c:277
+#: builtin/describe.c:279
#, c-format
msgid "annotated tag %s has no embedded name"
msgstr ""
-#: builtin/describe.c:279
+#: builtin/describe.c:281
#, c-format
msgid "tag '%s' is really '%s' here"
msgstr ""
-#: builtin/describe.c:323
+#: builtin/describe.c:325
#, c-format
msgid "no tag exactly matches '%s'"
msgstr ""
-#: builtin/describe.c:325
+#: builtin/describe.c:327
#, c-format
msgid "No exact match on refs or tags, searching to describe\n"
msgstr ""
-#: builtin/describe.c:379
+#: builtin/describe.c:381
#, c-format
msgid "finished search at %s\n"
msgstr ""
-#: builtin/describe.c:405
+#: builtin/describe.c:407
#, c-format
msgid ""
"No annotated tags can describe '%s'.\n"
"However, there were unannotated tags: try --tags."
msgstr ""
-#: builtin/describe.c:409
+#: builtin/describe.c:411
#, c-format
msgid ""
"No tags can describe '%s'.\n"
"Try --always, or create some tags."
msgstr ""
-#: builtin/describe.c:439
+#: builtin/describe.c:441
#, c-format
msgid "traversed %lu commits\n"
msgstr ""
-#: builtin/describe.c:442
+#: builtin/describe.c:444
#, c-format
msgid ""
"more than %i tags found; listed %i most recent\n"
"gave up search at %s\n"
msgstr ""
-#: builtin/describe.c:510
+#: builtin/describe.c:512
#, c-format
msgid "describe %s\n"
msgstr ""
-#: builtin/describe.c:513
+#: builtin/describe.c:515
#, c-format
msgid "Not a valid object name %s"
msgstr ""
-#: builtin/describe.c:521
+#: builtin/describe.c:523
#, c-format
msgid "%s is neither a commit nor blob"
msgstr ""
-#: builtin/describe.c:535
+#: builtin/describe.c:537
msgid "find the tag that comes after the commit"
msgstr ""
-#: builtin/describe.c:536
+#: builtin/describe.c:538
msgid "debug search strategy on stderr"
msgstr ""
-#: builtin/describe.c:537
+#: builtin/describe.c:539
msgid "use any ref"
msgstr ""
-#: builtin/describe.c:538
+#: builtin/describe.c:540
msgid "use any tag, even unannotated"
msgstr ""
-#: builtin/describe.c:539
+#: builtin/describe.c:541
msgid "always use long format"
msgstr ""
-#: builtin/describe.c:540
+#: builtin/describe.c:542
msgid "only follow first parent"
msgstr ""
-#: builtin/describe.c:543
+#: builtin/describe.c:545
msgid "only output exact matches"
msgstr ""
-#: builtin/describe.c:545
+#: builtin/describe.c:547
msgid "consider <n> most recent tags (default: 10)"
msgstr ""
-#: builtin/describe.c:547
+#: builtin/describe.c:549
msgid "only consider tags matching <pattern>"
msgstr ""
-#: builtin/describe.c:549
+#: builtin/describe.c:551
msgid "do not consider tags matching <pattern>"
msgstr ""
-#: builtin/describe.c:551 builtin/name-rev.c:422
+#: builtin/describe.c:553 builtin/name-rev.c:426
msgid "show abbreviated commit object as fallback"
msgstr ""
-#: builtin/describe.c:552 builtin/describe.c:555
+#: builtin/describe.c:554 builtin/describe.c:557
msgid "mark"
msgstr ""
-#: builtin/describe.c:553
+#: builtin/describe.c:555
msgid "append <mark> on dirty working tree (default: \"-dirty\")"
msgstr ""
-#: builtin/describe.c:556
+#: builtin/describe.c:558
msgid "append <mark> on broken working tree (default: \"-broken\")"
msgstr ""
-#: builtin/describe.c:574
+#: builtin/describe.c:576
msgid "--long is incompatible with --abbrev=0"
msgstr ""
-#: builtin/describe.c:603
+#: builtin/describe.c:605
msgid "No names found, cannot describe anything."
msgstr ""
-#: builtin/describe.c:654
+#: builtin/describe.c:656
msgid "--dirty is incompatible with commit-ishes"
msgstr ""
-#: builtin/describe.c:656
+#: builtin/describe.c:658
msgid "--broken is incompatible with commit-ishes"
msgstr ""
msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
msgstr ""
-#: builtin/difftool.c:253
+#: builtin/difftool.c:260
#, c-format
msgid "failed: %d"
msgstr ""
-#: builtin/difftool.c:295
+#: builtin/difftool.c:302
#, c-format
msgid "could not read symlink %s"
msgstr ""
-#: builtin/difftool.c:297
+#: builtin/difftool.c:304
#, c-format
msgid "could not read symlink file %s"
msgstr ""
-#: builtin/difftool.c:305
+#: builtin/difftool.c:312
#, c-format
msgid "could not read object %s for symlink %s"
msgstr ""
-#: builtin/difftool.c:406
+#: 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:626
+#: builtin/difftool.c:634
#, c-format
msgid "both files modified: '%s' and '%s'."
msgstr ""
-#: builtin/difftool.c:628
+#: builtin/difftool.c:636
msgid "working tree file has been left."
msgstr ""
-#: builtin/difftool.c:639
+#: builtin/difftool.c:647
#, c-format
msgid "temporary files exist in '%s'."
msgstr ""
-#: builtin/difftool.c:640
+#: builtin/difftool.c:648
msgid "you may want to cleanup or recover these."
msgstr ""
-#: builtin/difftool.c:689
+#: builtin/difftool.c:697
msgid "use `diff.guitool` instead of `diff.tool`"
msgstr ""
-#: builtin/difftool.c:691
+#: builtin/difftool.c:699
msgid "perform a full-directory diff"
msgstr ""
-#: builtin/difftool.c:693
+#: builtin/difftool.c:701
msgid "do not prompt before launching a diff tool"
msgstr ""
-#: builtin/difftool.c:698
+#: builtin/difftool.c:706
msgid "use symlinks in dir-diff mode"
msgstr ""
-#: builtin/difftool.c:699
+#: builtin/difftool.c:707
msgid "tool"
msgstr ""
-#: builtin/difftool.c:700
+#: builtin/difftool.c:708
msgid "use the specified diff tool"
msgstr ""
-#: builtin/difftool.c:702
+#: builtin/difftool.c:710
msgid "print a list of diff tools that may be used with `--tool`"
msgstr ""
-#: builtin/difftool.c:705
+#: builtin/difftool.c:713
msgid ""
"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
"code"
msgstr ""
-#: builtin/difftool.c:708
+#: builtin/difftool.c:716
msgid "specify a custom command for viewing diffs"
msgstr ""
-#: builtin/difftool.c:709
+#: builtin/difftool.c:717
msgid "passed to `diff`"
msgstr ""
-#: builtin/difftool.c:724
+#: builtin/difftool.c:732
msgid "difftool requires worktree or --no-index"
msgstr ""
-#: builtin/difftool.c:731
+#: builtin/difftool.c:739
msgid "--dir-diff is incompatible with --no-index"
msgstr ""
-#: builtin/difftool.c:734
+#: builtin/difftool.c:742
msgid "--gui, --tool and --extcmd are mutually exclusive"
msgstr ""
-#: builtin/difftool.c:742
+#: builtin/difftool.c:750
msgid "no <tool> given for --tool=<tool>"
msgstr ""
-#: builtin/difftool.c:749
+#: builtin/difftool.c:757
msgid "no <cmd> given for --extcmd=<cmd>"
msgstr ""
msgid "git fast-export [rev-list-opts]"
msgstr ""
-#: builtin/fast-export.c:1124
+#: builtin/fast-export.c:852
+msgid "Error: Cannot export nested tags unless --mark-tags is specified."
+msgstr ""
+
+#: builtin/fast-export.c:1152
msgid "show progress after <n> objects"
msgstr ""
-#: builtin/fast-export.c:1126
+#: builtin/fast-export.c:1154
msgid "select handling of signed tags"
msgstr ""
-#: builtin/fast-export.c:1129
+#: builtin/fast-export.c:1157
msgid "select handling of tags that tag filtered objects"
msgstr ""
-#: builtin/fast-export.c:1132
+#: builtin/fast-export.c:1160
msgid "select handling of commit messages in an alternate encoding"
msgstr ""
-#: builtin/fast-export.c:1135
+#: builtin/fast-export.c:1163
msgid "Dump marks to this file"
msgstr ""
-#: builtin/fast-export.c:1137
+#: builtin/fast-export.c:1165
msgid "Import marks from this file"
msgstr ""
-#: builtin/fast-export.c:1139
+#: builtin/fast-export.c:1169
+msgid "Import marks from this file if it exists"
+msgstr ""
+
+#: builtin/fast-export.c:1171
msgid "Fake a tagger when tags lack one"
msgstr ""
-#: builtin/fast-export.c:1141
+#: builtin/fast-export.c:1173
msgid "Output full tree for each commit"
msgstr ""
-#: builtin/fast-export.c:1143
+#: builtin/fast-export.c:1175
msgid "Use the done feature to terminate the stream"
msgstr ""
-#: builtin/fast-export.c:1144
+#: builtin/fast-export.c:1176
msgid "Skip output of blob data"
msgstr ""
-#: builtin/fast-export.c:1145 builtin/log.c:1632
+#: builtin/fast-export.c:1177 builtin/log.c:1633
msgid "refspec"
msgstr ""
-#: builtin/fast-export.c:1146
+#: builtin/fast-export.c:1178
msgid "Apply refspec to exported refs"
msgstr ""
-#: builtin/fast-export.c:1147
+#: builtin/fast-export.c:1179
msgid "anonymize output"
msgstr ""
-#: builtin/fast-export.c:1149
+#: builtin/fast-export.c:1181
msgid "Reference parents which are not in fast-export stream by object id"
msgstr ""
-#: builtin/fast-export.c:1151
+#: builtin/fast-export.c:1183
msgid "Show original object ids of blobs/commits"
msgstr ""
-#: builtin/fetch.c:30
+#: builtin/fast-export.c:1185
+msgid "Label tags with mark ids"
+msgstr ""
+
+#: builtin/fast-export.c:1220
+msgid "Cannot pass both --import-marks and --import-marks-if-exists"
+msgstr ""
+
+#: builtin/fetch.c:34
msgid "git fetch [<options>] [<repository> [<refspec>...]]"
msgstr ""
-#: builtin/fetch.c:31
+#: builtin/fetch.c:35
msgid "git fetch [<options>] <group>"
msgstr ""
-#: builtin/fetch.c:32
+#: builtin/fetch.c:36
msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
msgstr ""
-#: builtin/fetch.c:33
+#: builtin/fetch.c:37
msgid "git fetch --all [<options>]"
msgstr ""
-#: builtin/fetch.c:125 builtin/pull.c:203
+#: builtin/fetch.c:115
+msgid "fetch.parallel cannot be negative"
+msgstr ""
+
+#: builtin/fetch.c:138 builtin/pull.c:204
msgid "fetch from all remotes"
msgstr ""
-#: builtin/fetch.c:127 builtin/pull.c:206
+#: builtin/fetch.c:140 builtin/pull.c:248
+msgid "set upstream for git pull/fetch"
+msgstr ""
+
+#: builtin/fetch.c:142 builtin/pull.c:207
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr ""
-#: builtin/fetch.c:129 builtin/pull.c:209
+#: builtin/fetch.c:144 builtin/pull.c:210
msgid "path to upload pack on remote end"
msgstr ""
-#: builtin/fetch.c:130
+#: builtin/fetch.c:145
msgid "force overwrite of local reference"
msgstr ""
-#: builtin/fetch.c:132
+#: builtin/fetch.c:147
msgid "fetch from multiple remotes"
msgstr ""
-#: builtin/fetch.c:134 builtin/pull.c:213
+#: builtin/fetch.c:149 builtin/pull.c:214
msgid "fetch all tags and associated objects"
msgstr ""
-#: builtin/fetch.c:136
+#: builtin/fetch.c:151
msgid "do not fetch all tags (--no-tags)"
msgstr ""
-#: builtin/fetch.c:138
+#: builtin/fetch.c:153
msgid "number of submodules fetched in parallel"
msgstr ""
-#: builtin/fetch.c:140 builtin/pull.c:216
+#: builtin/fetch.c:155 builtin/pull.c:217
msgid "prune remote-tracking branches no longer on remote"
msgstr ""
-#: builtin/fetch.c:142
+#: builtin/fetch.c:157
msgid "prune local tags no longer on remote and clobber changed tags"
msgstr ""
-#: builtin/fetch.c:143 builtin/fetch.c:166 builtin/pull.c:140
+#: builtin/fetch.c:158 builtin/fetch.c:181 builtin/pull.c:141
msgid "on-demand"
msgstr ""
-#: builtin/fetch.c:144
+#: builtin/fetch.c:159
msgid "control recursive fetching of submodules"
msgstr ""
-#: builtin/fetch.c:148 builtin/pull.c:224
+#: builtin/fetch.c:163 builtin/pull.c:225
msgid "keep downloaded pack"
msgstr ""
-#: builtin/fetch.c:150
+#: builtin/fetch.c:165
msgid "allow updating of HEAD ref"
msgstr ""
-#: builtin/fetch.c:153 builtin/fetch.c:159 builtin/pull.c:227
+#: builtin/fetch.c:168 builtin/fetch.c:174 builtin/pull.c:228
msgid "deepen history of shallow clone"
msgstr ""
-#: builtin/fetch.c:155
+#: builtin/fetch.c:170
msgid "deepen history of shallow repository based on time"
msgstr ""
-#: builtin/fetch.c:161 builtin/pull.c:230
+#: builtin/fetch.c:176 builtin/pull.c:231
msgid "convert to a complete repository"
msgstr ""
-#: builtin/fetch.c:164
+#: builtin/fetch.c:179
msgid "prepend this to submodule path output"
msgstr ""
-#: builtin/fetch.c:167
+#: builtin/fetch.c:182
msgid ""
"default for recursive fetching of submodules (lower priority than config "
"files)"
msgstr ""
-#: builtin/fetch.c:171 builtin/pull.c:233
+#: builtin/fetch.c:186 builtin/pull.c:234
msgid "accept refs that update .git/shallow"
msgstr ""
-#: builtin/fetch.c:172 builtin/pull.c:235
+#: builtin/fetch.c:187 builtin/pull.c:236
msgid "refmap"
msgstr ""
-#: builtin/fetch.c:173 builtin/pull.c:236
+#: builtin/fetch.c:188 builtin/pull.c:237
msgid "specify fetch refmap"
msgstr ""
-#: builtin/fetch.c:180
+#: builtin/fetch.c:195
msgid "report that we have only objects reachable from this object"
msgstr ""
-#: builtin/fetch.c:183
+#: builtin/fetch.c:198
msgid "run 'gc --auto' after fetching"
msgstr ""
-#: builtin/fetch.c:185 builtin/pull.c:245
+#: builtin/fetch.c:200 builtin/pull.c:246
msgid "check for forced-updates on all updated branches"
msgstr ""
-#: builtin/fetch.c:491
+#: builtin/fetch.c:510
msgid "Couldn't find remote ref HEAD"
msgstr ""
-#: builtin/fetch.c:630
+#: builtin/fetch.c:650
#, c-format
msgid "configuration fetch.output contains invalid value %s"
msgstr ""
-#: builtin/fetch.c:728
+#: builtin/fetch.c:748
#, c-format
msgid "object %s not found"
msgstr ""
-#: builtin/fetch.c:732
+#: builtin/fetch.c:752
msgid "[up to date]"
msgstr ""
-#: builtin/fetch.c:745 builtin/fetch.c:761 builtin/fetch.c:833
+#: builtin/fetch.c:765 builtin/fetch.c:781 builtin/fetch.c:853
msgid "[rejected]"
msgstr ""
-#: builtin/fetch.c:746
+#: builtin/fetch.c:766
msgid "can't fetch in current branch"
msgstr ""
-#: builtin/fetch.c:756
+#: builtin/fetch.c:776
msgid "[tag update]"
msgstr ""
-#: builtin/fetch.c:757 builtin/fetch.c:794 builtin/fetch.c:816
-#: builtin/fetch.c:828
+#: builtin/fetch.c:777 builtin/fetch.c:814 builtin/fetch.c:836
+#: builtin/fetch.c:848
msgid "unable to update local ref"
msgstr ""
-#: builtin/fetch.c:761
+#: builtin/fetch.c:781
msgid "would clobber existing tag"
msgstr ""
-#: builtin/fetch.c:783
+#: builtin/fetch.c:803
msgid "[new tag]"
msgstr ""
-#: builtin/fetch.c:786
+#: builtin/fetch.c:806
msgid "[new branch]"
msgstr ""
-#: builtin/fetch.c:789
+#: builtin/fetch.c:809
msgid "[new ref]"
msgstr ""
-#: builtin/fetch.c:828
+#: builtin/fetch.c:848
msgid "forced update"
msgstr ""
-#: builtin/fetch.c:833
+#: builtin/fetch.c:853
msgid "non-fast-forward"
msgstr ""
-#: builtin/fetch.c:854
+#: builtin/fetch.c:874
msgid ""
"Fetch normally indicates which branches had a forced update,\n"
"but that check has been disabled. To re-enable, use '--show-forced-updates'\n"
"flag or run 'git config fetch.showForcedUpdates true'."
msgstr ""
-#: builtin/fetch.c:858
+#: builtin/fetch.c:878
#, c-format
msgid ""
"It took %.2f seconds to check forced updates. You can use\n"
" to avoid this check.\n"
msgstr ""
-#: builtin/fetch.c:888
+#: builtin/fetch.c:908
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr ""
-#: builtin/fetch.c:909
+#: builtin/fetch.c:929
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr ""
-#: builtin/fetch.c:1000 builtin/fetch.c:1131
+#: builtin/fetch.c:1020 builtin/fetch.c:1157
#, c-format
msgid "From %.*s\n"
msgstr ""
-#: builtin/fetch.c:1011
+#: builtin/fetch.c:1031
#, 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:1101
+#: builtin/fetch.c:1127
#, c-format
msgid " (%s will become dangling)"
msgstr ""
-#: builtin/fetch.c:1102
+#: builtin/fetch.c:1128
#, c-format
msgid " (%s has become dangling)"
msgstr ""
-#: builtin/fetch.c:1134
+#: builtin/fetch.c:1160
msgid "[deleted]"
msgstr ""
-#: builtin/fetch.c:1135 builtin/remote.c:1036
+#: builtin/fetch.c:1161 builtin/remote.c:1036
msgid "(none)"
msgstr ""
-#: builtin/fetch.c:1158
+#: builtin/fetch.c:1184
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr ""
-#: builtin/fetch.c:1177
+#: builtin/fetch.c:1203
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr ""
-#: builtin/fetch.c:1180
+#: builtin/fetch.c:1206
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr ""
-#: builtin/fetch.c:1484
+#: builtin/fetch.c:1414
+msgid "multiple branch detected, incompatible with --set-upstream"
+msgstr ""
+
+#: builtin/fetch.c:1429
+msgid "not setting upstream for a remote remote-tracking branch"
+msgstr ""
+
+#: builtin/fetch.c:1431
+msgid "not setting upstream for a remote tag"
+msgstr ""
+
+#: builtin/fetch.c:1433
+msgid "unknown branch type"
+msgstr ""
+
+#: builtin/fetch.c:1435
+msgid ""
+"no source branch found.\n"
+"you need to specify exactly one branch with the --set-upstream option."
+msgstr ""
+
+#: builtin/fetch.c:1561 builtin/fetch.c:1623
#, c-format
msgid "Fetching %s\n"
msgstr ""
-#: builtin/fetch.c:1486 builtin/remote.c:100
+#: builtin/fetch.c:1571 builtin/fetch.c:1625 builtin/remote.c:100
#, c-format
msgid "Could not fetch %s"
msgstr ""
-#: builtin/fetch.c:1532
-msgid ""
-"--filter can only be used with the remote configured in extensions."
-"partialClone"
+#: builtin/fetch.c:1583
+#, c-format
+msgid "could not fetch '%s' (exit code: %d)\n"
msgstr ""
-#: builtin/fetch.c:1556
+#: builtin/fetch.c:1685
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:1593
+#: builtin/fetch.c:1722
msgid "You need to specify a tag name."
msgstr ""
-#: builtin/fetch.c:1644
+#: builtin/fetch.c:1774
msgid "Negative depth in --deepen is not supported"
msgstr ""
-#: builtin/fetch.c:1646
+#: builtin/fetch.c:1776
msgid "--deepen and --depth are mutually exclusive"
msgstr ""
-#: builtin/fetch.c:1651
+#: builtin/fetch.c:1781
msgid "--depth and --unshallow cannot be used together"
msgstr ""
-#: builtin/fetch.c:1653
+#: builtin/fetch.c:1783
msgid "--unshallow on a complete repository does not make sense"
msgstr ""
-#: builtin/fetch.c:1669
+#: builtin/fetch.c:1799
msgid "fetch --all does not take a repository argument"
msgstr ""
-#: builtin/fetch.c:1671
+#: builtin/fetch.c:1801
msgid "fetch --all does not make sense with refspecs"
msgstr ""
-#: builtin/fetch.c:1680
+#: builtin/fetch.c:1810
#, c-format
msgid "No such remote or remote group: %s"
msgstr ""
-#: builtin/fetch.c:1687
+#: builtin/fetch.c:1817
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr ""
-#: builtin/fetch.c:1703
+#: builtin/fetch.c:1835
msgid ""
"--filter can only be used with the remote configured in extensions."
"partialclone"
msgid "invalid parameter: expected sha1, got '%s'"
msgstr ""
-#: builtin/gc.c:34
+#: builtin/gc.c:35
msgid "git gc [<options>]"
msgstr ""
msgid "failed to parse '%s' value '%s'"
msgstr ""
-#: builtin/gc.c:476 builtin/init-db.c:55
+#: builtin/gc.c:475 builtin/init-db.c:55
#, c-format
msgid "cannot stat '%s'"
msgstr ""
-#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:529
+#: builtin/gc.c:484 builtin/notes.c:240 builtin/tag.c:529
#, c-format
msgid "cannot read '%s'"
msgstr ""
-#: builtin/gc.c:492
+#: builtin/gc.c:491
#, c-format
msgid ""
"The last gc run reported the following. Please correct the root cause\n"
"%s"
msgstr ""
-#: builtin/gc.c:540
+#: builtin/gc.c:539
msgid "prune unreferenced objects"
msgstr ""
-#: builtin/gc.c:542
+#: builtin/gc.c:541
msgid "be more thorough (increased runtime)"
msgstr ""
-#: builtin/gc.c:543
+#: builtin/gc.c:542
msgid "enable auto-gc mode"
msgstr ""
-#: builtin/gc.c:546
+#: builtin/gc.c:545
msgid "force running gc even if there may be another gc running"
msgstr ""
-#: builtin/gc.c:549
+#: builtin/gc.c:548
msgid "repack all other packs except the largest pack"
msgstr ""
-#: builtin/gc.c:566
+#: builtin/gc.c:565
#, c-format
msgid "failed to parse gc.logexpiry value %s"
msgstr ""
-#: builtin/gc.c:577
+#: builtin/gc.c:576
#, c-format
msgid "failed to parse prune expiry value %s"
msgstr ""
-#: builtin/gc.c:597
+#: builtin/gc.c:596
#, c-format
msgid "Auto packing the repository in background for optimum performance.\n"
msgstr ""
-#: builtin/gc.c:599
+#: builtin/gc.c:598
#, c-format
msgid "Auto packing the repository for optimum performance.\n"
msgstr ""
-#: builtin/gc.c:600
+#: builtin/gc.c:599
#, c-format
msgid "See \"git help gc\" for manual housekeeping.\n"
msgstr ""
-#: builtin/gc.c:640
+#: builtin/gc.c:639
#, c-format
msgid ""
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
msgstr ""
-#: builtin/gc.c:695
+#: builtin/gc.c:694
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr ""
#. grep.threads
#.
#: builtin/grep.c:287 builtin/index-pack.c:1534 builtin/index-pack.c:1727
-#: builtin/pack-objects.c:2728
+#: builtin/pack-objects.c:2708
#, c-format
msgid "no threads support, ignoring %s"
msgstr ""
-#: builtin/grep.c:467 builtin/grep.c:591 builtin/grep.c:633
+#: builtin/grep.c:467 builtin/grep.c:592 builtin/grep.c:635
#, c-format
msgid "unable to read tree (%s)"
msgstr ""
-#: builtin/grep.c:648
+#: builtin/grep.c:650
#, c-format
msgid "unable to grep from object of type %s"
msgstr ""
-#: builtin/grep.c:714
+#: builtin/grep.c:716
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr ""
-#: builtin/grep.c:813
+#: builtin/grep.c:815
msgid "search in index instead of in the work tree"
msgstr ""
-#: builtin/grep.c:815
+#: builtin/grep.c:817
msgid "find in contents not managed by git"
msgstr ""
-#: builtin/grep.c:817
+#: builtin/grep.c:819
msgid "search in both tracked and untracked files"
msgstr ""
-#: builtin/grep.c:819
+#: builtin/grep.c:821
msgid "ignore files specified via '.gitignore'"
msgstr ""
-#: builtin/grep.c:821
+#: builtin/grep.c:823
msgid "recursively search in each submodule"
msgstr ""
-#: builtin/grep.c:824
+#: builtin/grep.c:826
msgid "show non-matching lines"
msgstr ""
-#: builtin/grep.c:826
+#: builtin/grep.c:828
msgid "case insensitive matching"
msgstr ""
-#: builtin/grep.c:828
+#: builtin/grep.c:830
msgid "match patterns only at word boundaries"
msgstr ""
-#: builtin/grep.c:830
+#: builtin/grep.c:832
msgid "process binary files as text"
msgstr ""
-#: builtin/grep.c:832
+#: builtin/grep.c:834
msgid "don't match patterns in binary files"
msgstr ""
-#: builtin/grep.c:835
+#: builtin/grep.c:837
msgid "process binary files with textconv filters"
msgstr ""
-#: builtin/grep.c:837
+#: builtin/grep.c:839
msgid "search in subdirectories (default)"
msgstr ""
-#: builtin/grep.c:839
+#: builtin/grep.c:841
msgid "descend at most <depth> levels"
msgstr ""
-#: builtin/grep.c:843
+#: builtin/grep.c:845
msgid "use extended POSIX regular expressions"
msgstr ""
-#: builtin/grep.c:846
+#: builtin/grep.c:848
msgid "use basic POSIX regular expressions (default)"
msgstr ""
-#: builtin/grep.c:849
+#: builtin/grep.c:851
msgid "interpret patterns as fixed strings"
msgstr ""
-#: builtin/grep.c:852
+#: builtin/grep.c:854
msgid "use Perl-compatible regular expressions"
msgstr ""
-#: builtin/grep.c:855
+#: builtin/grep.c:857
msgid "show line numbers"
msgstr ""
-#: builtin/grep.c:856
+#: builtin/grep.c:858
msgid "show column number of first match"
msgstr ""
-#: builtin/grep.c:857
+#: builtin/grep.c:859
msgid "don't show filenames"
msgstr ""
-#: builtin/grep.c:858
+#: builtin/grep.c:860
msgid "show filenames"
msgstr ""
-#: builtin/grep.c:860
+#: builtin/grep.c:862
msgid "show filenames relative to top directory"
msgstr ""
-#: builtin/grep.c:862
+#: builtin/grep.c:864
msgid "show only filenames instead of matching lines"
msgstr ""
-#: builtin/grep.c:864
+#: builtin/grep.c:866
msgid "synonym for --files-with-matches"
msgstr ""
-#: builtin/grep.c:867
+#: builtin/grep.c:869
msgid "show only the names of files without match"
msgstr ""
-#: builtin/grep.c:869
+#: builtin/grep.c:871
msgid "print NUL after filenames"
msgstr ""
-#: builtin/grep.c:872
+#: builtin/grep.c:874
msgid "show only matching parts of a line"
msgstr ""
-#: builtin/grep.c:874
+#: builtin/grep.c:876
msgid "show the number of matches instead of matching lines"
msgstr ""
-#: builtin/grep.c:875
+#: builtin/grep.c:877
msgid "highlight matches"
msgstr ""
-#: builtin/grep.c:877
+#: builtin/grep.c:879
msgid "print empty line between matches from different files"
msgstr ""
-#: builtin/grep.c:879
+#: builtin/grep.c:881
msgid "show filename only once above matches from same file"
msgstr ""
-#: builtin/grep.c:882
+#: builtin/grep.c:884
msgid "show <n> context lines before and after matches"
msgstr ""
-#: builtin/grep.c:885
+#: builtin/grep.c:887
msgid "show <n> context lines before matches"
msgstr ""
-#: builtin/grep.c:887
+#: builtin/grep.c:889
msgid "show <n> context lines after matches"
msgstr ""
-#: builtin/grep.c:889
+#: builtin/grep.c:891
msgid "use <n> worker threads"
msgstr ""
-#: builtin/grep.c:890
+#: builtin/grep.c:892
msgid "shortcut for -C NUM"
msgstr ""
-#: builtin/grep.c:893
+#: builtin/grep.c:895
msgid "show a line with the function name before matches"
msgstr ""
-#: builtin/grep.c:895
+#: builtin/grep.c:897
msgid "show the surrounding function"
msgstr ""
-#: builtin/grep.c:898
+#: builtin/grep.c:900
msgid "read patterns from file"
msgstr ""
-#: builtin/grep.c:900
+#: builtin/grep.c:902
msgid "match <pattern>"
msgstr ""
-#: builtin/grep.c:902
+#: builtin/grep.c:904
msgid "combine patterns specified with -e"
msgstr ""
-#: builtin/grep.c:914
+#: builtin/grep.c:916
msgid "indicate hit with exit status without output"
msgstr ""
-#: builtin/grep.c:916
+#: builtin/grep.c:918
msgid "show only matches from files that match all patterns"
msgstr ""
-#: builtin/grep.c:918
+#: builtin/grep.c:920
msgid "show parse tree for grep expression"
msgstr ""
-#: builtin/grep.c:922
+#: builtin/grep.c:924
msgid "pager"
msgstr ""
-#: builtin/grep.c:922
+#: builtin/grep.c:924
msgid "show matching files in the pager"
msgstr ""
-#: builtin/grep.c:926
+#: builtin/grep.c:928
msgid "allow calling of grep(1) (ignored by this build)"
msgstr ""
-#: builtin/grep.c:990
+#: builtin/grep.c:992
msgid "no pattern given"
msgstr ""
-#: builtin/grep.c:1026
+#: builtin/grep.c:1028
msgid "--no-index or --untracked cannot be used with revs"
msgstr ""
-#: builtin/grep.c:1034
+#: builtin/grep.c:1036
#, c-format
msgid "unable to resolve revision: %s"
msgstr ""
-#: builtin/grep.c:1065
+#: builtin/grep.c:1067
msgid "invalid option combination, ignoring --threads"
msgstr ""
-#: builtin/grep.c:1068 builtin/pack-objects.c:3416
+#: builtin/grep.c:1070 builtin/pack-objects.c:3400
msgid "no threads support, ignoring --threads"
msgstr ""
-#: builtin/grep.c:1071 builtin/index-pack.c:1531 builtin/pack-objects.c:2725
+#: builtin/grep.c:1073 builtin/index-pack.c:1531 builtin/pack-objects.c:2705
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr ""
-#: builtin/grep.c:1094
+#: builtin/grep.c:1096
msgid "--open-files-in-pager only works on the worktree"
msgstr ""
-#: builtin/grep.c:1117
+#: builtin/grep.c:1119
msgid "option not supported with --recurse-submodules"
msgstr ""
-#: builtin/grep.c:1123
+#: builtin/grep.c:1125
msgid "--cached or --untracked cannot be used with --no-index"
msgstr ""
-#: builtin/grep.c:1129
+#: builtin/grep.c:1131
msgid "--[no-]exclude-standard cannot be used for tracked contents"
msgstr ""
-#: builtin/grep.c:1137
+#: builtin/grep.c:1139
msgid "both --cached and trees are given"
msgstr ""
msgid "Resolving deltas"
msgstr ""
-#: builtin/index-pack.c:1205 builtin/pack-objects.c:2497
+#: builtin/index-pack.c:1205 builtin/pack-objects.c:2481
#, c-format
msgid "unable to create thread: %s"
msgstr ""
msgid "cannot store index file"
msgstr ""
-#: builtin/index-pack.c:1525 builtin/pack-objects.c:2736
+#: builtin/index-pack.c:1525 builtin/pack-objects.c:2716
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr ""
msgid "git show %s: bad file"
msgstr ""
-#: builtin/log.c:549 builtin/log.c:643
+#: builtin/log.c:549 builtin/log.c:644
#, c-format
msgid "could not read object %s"
msgstr ""
-#: builtin/log.c:668
+#: builtin/log.c:669
#, c-format
msgid "unknown type: %d"
msgstr ""
-#: builtin/log.c:791
+#: builtin/log.c:792
msgid "format.headers without value"
msgstr ""
-#: builtin/log.c:908
+#: builtin/log.c:909
msgid "name of output directory is too long"
msgstr ""
-#: builtin/log.c:924
+#: builtin/log.c:925
#, c-format
msgid "cannot open patch file %s"
msgstr ""
-#: builtin/log.c:941
+#: builtin/log.c:942
msgid "need exactly one range"
msgstr ""
-#: builtin/log.c:951
+#: builtin/log.c:952
msgid "not a range"
msgstr ""
-#: builtin/log.c:1074
+#: builtin/log.c:1075
msgid "cover letter needs email format"
msgstr ""
-#: builtin/log.c:1080
+#: builtin/log.c:1081
msgid "failed to create cover-letter file"
msgstr ""
-#: builtin/log.c:1159
+#: builtin/log.c:1160
#, c-format
msgid "insane in-reply-to: %s"
msgstr ""
-#: builtin/log.c:1186
+#: builtin/log.c:1187
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr ""
-#: builtin/log.c:1244
+#: builtin/log.c:1245
msgid "two output directories?"
msgstr ""
-#: builtin/log.c:1355 builtin/log.c:2099 builtin/log.c:2101 builtin/log.c:2113
+#: builtin/log.c:1356 builtin/log.c:2116 builtin/log.c:2118 builtin/log.c:2130
#, c-format
msgid "unknown commit %s"
msgstr ""
-#: builtin/log.c:1365 builtin/replace.c:58 builtin/replace.c:207
+#: builtin/log.c:1366 builtin/replace.c:58 builtin/replace.c:207
#: builtin/replace.c:210
#, c-format
msgid "failed to resolve '%s' as a valid ref"
msgstr ""
-#: builtin/log.c:1370
+#: builtin/log.c:1371
msgid "could not find exact merge base"
msgstr ""
-#: builtin/log.c:1374
+#: builtin/log.c:1375
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:1394
+#: builtin/log.c:1395
msgid "failed to find exact merge base"
msgstr ""
-#: builtin/log.c:1405
+#: builtin/log.c:1406
msgid "base commit should be the ancestor of revision list"
msgstr ""
-#: builtin/log.c:1409
+#: builtin/log.c:1410
msgid "base commit shouldn't be in revision list"
msgstr ""
-#: builtin/log.c:1462
+#: builtin/log.c:1463
msgid "cannot get patch id"
msgstr ""
-#: builtin/log.c:1514
+#: builtin/log.c:1515
msgid "failed to infer range-diff ranges"
msgstr ""
-#: builtin/log.c:1559
+#: builtin/log.c:1560
msgid "use [PATCH n/m] even with a single patch"
msgstr ""
-#: builtin/log.c:1562
+#: builtin/log.c:1563
msgid "use [PATCH] even with multiple patches"
msgstr ""
-#: builtin/log.c:1566
+#: builtin/log.c:1567
msgid "print patches to standard out"
msgstr ""
-#: builtin/log.c:1568
+#: builtin/log.c:1569
msgid "generate a cover letter"
msgstr ""
-#: builtin/log.c:1570
+#: builtin/log.c:1571
msgid "use simple number sequence for output file names"
msgstr ""
-#: builtin/log.c:1571
+#: builtin/log.c:1572
msgid "sfx"
msgstr ""
-#: builtin/log.c:1572
+#: builtin/log.c:1573
msgid "use <sfx> instead of '.patch'"
msgstr ""
-#: builtin/log.c:1574
+#: builtin/log.c:1575
msgid "start numbering patches at <n> instead of 1"
msgstr ""
-#: builtin/log.c:1576
+#: builtin/log.c:1577
msgid "mark the series as Nth re-roll"
msgstr ""
-#: builtin/log.c:1578
+#: builtin/log.c:1579
msgid "Use [RFC PATCH] instead of [PATCH]"
msgstr ""
-#: builtin/log.c:1581
+#: builtin/log.c:1582
msgid "Use [<prefix>] instead of [PATCH]"
msgstr ""
-#: builtin/log.c:1584
+#: builtin/log.c:1585
msgid "store resulting files in <dir>"
msgstr ""
-#: builtin/log.c:1587
+#: builtin/log.c:1588
msgid "don't strip/add [PATCH]"
msgstr ""
-#: builtin/log.c:1590
+#: builtin/log.c:1591
msgid "don't output binary diffs"
msgstr ""
-#: builtin/log.c:1592
+#: builtin/log.c:1593
msgid "output all-zero hash in From header"
msgstr ""
-#: builtin/log.c:1594
+#: builtin/log.c:1595
msgid "don't include a patch matching a commit upstream"
msgstr ""
-#: builtin/log.c:1596
+#: builtin/log.c:1597
msgid "show patch format instead of default (patch + stat)"
msgstr ""
-#: builtin/log.c:1598
+#: builtin/log.c:1599
msgid "Messaging"
msgstr ""
-#: builtin/log.c:1599
+#: builtin/log.c:1600
msgid "header"
msgstr ""
-#: builtin/log.c:1600
+#: builtin/log.c:1601
msgid "add email header"
msgstr ""
-#: builtin/log.c:1601 builtin/log.c:1603
+#: builtin/log.c:1602 builtin/log.c:1604
msgid "email"
msgstr ""
-#: builtin/log.c:1601
+#: builtin/log.c:1602
msgid "add To: header"
msgstr ""
-#: builtin/log.c:1603
+#: builtin/log.c:1604
msgid "add Cc: header"
msgstr ""
-#: builtin/log.c:1605
+#: builtin/log.c:1606
msgid "ident"
msgstr ""
-#: builtin/log.c:1606
+#: builtin/log.c:1607
msgid "set From address to <ident> (or committer ident if absent)"
msgstr ""
-#: builtin/log.c:1608
+#: builtin/log.c:1609
msgid "message-id"
msgstr ""
-#: builtin/log.c:1609
+#: builtin/log.c:1610
msgid "make first mail a reply to <message-id>"
msgstr ""
-#: builtin/log.c:1610 builtin/log.c:1613
+#: builtin/log.c:1611 builtin/log.c:1614
msgid "boundary"
msgstr ""
-#: builtin/log.c:1611
+#: builtin/log.c:1612
msgid "attach the patch"
msgstr ""
-#: builtin/log.c:1614
+#: builtin/log.c:1615
msgid "inline the patch"
msgstr ""
-#: builtin/log.c:1618
+#: builtin/log.c:1619
msgid "enable message threading, styles: shallow, deep"
msgstr ""
-#: builtin/log.c:1620
+#: builtin/log.c:1621
msgid "signature"
msgstr ""
-#: builtin/log.c:1621
+#: builtin/log.c:1622
msgid "add a signature"
msgstr ""
-#: builtin/log.c:1622
+#: builtin/log.c:1623
msgid "base-commit"
msgstr ""
-#: builtin/log.c:1623
+#: builtin/log.c:1624
msgid "add prerequisite tree info to the patch series"
msgstr ""
-#: builtin/log.c:1625
+#: builtin/log.c:1626
msgid "add a signature from a file"
msgstr ""
-#: builtin/log.c:1626
+#: builtin/log.c:1627
msgid "don't print the patch filenames"
msgstr ""
-#: builtin/log.c:1628
+#: builtin/log.c:1629
msgid "show progress while generating patches"
msgstr ""
-#: builtin/log.c:1630
+#: builtin/log.c:1631
msgid "show changes against <rev> in cover letter or single patch"
msgstr ""
-#: builtin/log.c:1633
+#: builtin/log.c:1634
msgid "show changes against <refspec> in cover letter or single patch"
msgstr ""
-#: builtin/log.c:1635
+#: builtin/log.c:1636
msgid "percentage by which creation is weighted"
msgstr ""
-#: builtin/log.c:1710
+#: builtin/log.c:1711
#, c-format
msgid "invalid ident line: %s"
msgstr ""
-#: builtin/log.c:1725
+#: builtin/log.c:1726
msgid "-n and -k are mutually exclusive"
msgstr ""
-#: builtin/log.c:1727
+#: builtin/log.c:1728
msgid "--subject-prefix/--rfc and -k are mutually exclusive"
msgstr ""
-#: builtin/log.c:1735
+#: builtin/log.c:1736
msgid "--name-only does not make sense"
msgstr ""
-#: builtin/log.c:1737
+#: builtin/log.c:1738
msgid "--name-status does not make sense"
msgstr ""
-#: builtin/log.c:1739
+#: builtin/log.c:1740
msgid "--check does not make sense"
msgstr ""
-#: builtin/log.c:1771
+#: builtin/log.c:1773
msgid "standard output, or directory, which one?"
msgstr ""
-#: builtin/log.c:1860
+#: builtin/log.c:1877
msgid "--interdiff requires --cover-letter or single patch"
msgstr ""
-#: builtin/log.c:1864
+#: builtin/log.c:1881
msgid "Interdiff:"
msgstr ""
-#: builtin/log.c:1865
+#: builtin/log.c:1882
#, c-format
msgid "Interdiff against v%d:"
msgstr ""
-#: builtin/log.c:1871
+#: builtin/log.c:1888
msgid "--creation-factor requires --range-diff"
msgstr ""
-#: builtin/log.c:1875
+#: builtin/log.c:1892
msgid "--range-diff requires --cover-letter or single patch"
msgstr ""
-#: builtin/log.c:1883
+#: builtin/log.c:1900
msgid "Range-diff:"
msgstr ""
-#: builtin/log.c:1884
+#: builtin/log.c:1901
#, c-format
msgid "Range-diff against v%d:"
msgstr ""
-#: builtin/log.c:1895
+#: builtin/log.c:1912
#, c-format
msgid "unable to read signature file '%s'"
msgstr ""
-#: builtin/log.c:1931
+#: builtin/log.c:1948
msgid "Generating patches"
msgstr ""
-#: builtin/log.c:1975
+#: builtin/log.c:1992
msgid "failed to create output files"
msgstr ""
-#: builtin/log.c:2034
+#: builtin/log.c:2051
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr ""
-#: builtin/log.c:2088
+#: builtin/log.c:2105
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
msgid "do not print remote URL"
msgstr ""
-#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1464
+#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1488
msgid "exec"
msgstr ""
msgid "Available custom strategies are:"
msgstr ""
-#: builtin/merge.c:244 builtin/pull.c:151
+#: builtin/merge.c:244 builtin/pull.c:152
msgid "do not show a diffstat at the end of the merge"
msgstr ""
-#: builtin/merge.c:247 builtin/pull.c:154
+#: builtin/merge.c:247 builtin/pull.c:155
msgid "show a diffstat at the end of the merge"
msgstr ""
-#: builtin/merge.c:248 builtin/pull.c:157
+#: builtin/merge.c:248 builtin/pull.c:158
msgid "(synonym to --stat)"
msgstr ""
-#: builtin/merge.c:250 builtin/pull.c:160
+#: builtin/merge.c:250 builtin/pull.c:161
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr ""
-#: builtin/merge.c:253 builtin/pull.c:166
+#: builtin/merge.c:253 builtin/pull.c:167
msgid "create a single commit instead of doing a merge"
msgstr ""
-#: builtin/merge.c:255 builtin/pull.c:169
+#: builtin/merge.c:255 builtin/pull.c:170
msgid "perform a commit if the merge succeeds (default)"
msgstr ""
-#: builtin/merge.c:257 builtin/pull.c:172
+#: builtin/merge.c:257 builtin/pull.c:173
msgid "edit message before committing"
msgstr ""
msgid "allow fast-forward (default)"
msgstr ""
-#: builtin/merge.c:261 builtin/pull.c:179
+#: builtin/merge.c:261 builtin/pull.c:180
msgid "abort if fast-forward is not possible"
msgstr ""
-#: builtin/merge.c:265 builtin/pull.c:182
+#: builtin/merge.c:265 builtin/pull.c:183
msgid "verify that the named commit has a valid GPG signature"
msgstr ""
-#: builtin/merge.c:266 builtin/notes.c:787 builtin/pull.c:186
-#: builtin/rebase.c:492 builtin/rebase.c:1477 builtin/revert.c:114
+#: builtin/merge.c:266 builtin/notes.c:787 builtin/pull.c:187
+#: builtin/rebase.c:493 builtin/rebase.c:1501 builtin/revert.c:114
msgid "strategy"
msgstr ""
-#: builtin/merge.c:267 builtin/pull.c:187
+#: builtin/merge.c:267 builtin/pull.c:188
msgid "merge strategy to use"
msgstr ""
-#: builtin/merge.c:268 builtin/pull.c:190
+#: builtin/merge.c:268 builtin/pull.c:191
msgid "option=value"
msgstr ""
-#: builtin/merge.c:269 builtin/pull.c:191
+#: builtin/merge.c:269 builtin/pull.c:192
msgid "option for selected merge strategy"
msgstr ""
msgid "continue the current in-progress merge"
msgstr ""
-#: builtin/merge.c:284 builtin/pull.c:198
+#: builtin/merge.c:284 builtin/pull.c:199
msgid "allow merging unrelated histories"
msgstr ""
#: builtin/merge.c:290
-msgid "verify commit-msg hook"
+msgid "bypass pre-merge-commit and commit-msg hooks"
msgstr ""
#: builtin/merge.c:307
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr ""
-#: builtin/merge.c:708
+#: builtin/merge.c:705
msgid "Not handling anything other than two heads merge."
msgstr ""
-#: builtin/merge.c:722
+#: builtin/merge.c:719
#, c-format
msgid "Unknown option for merge-recursive: -X%s"
msgstr ""
-#: builtin/merge.c:737
+#: builtin/merge.c:734
#, c-format
msgid "unable to write %s"
msgstr ""
-#: builtin/merge.c:789
+#: builtin/merge.c:786
#, c-format
msgid "Could not read from '%s'"
msgstr ""
-#: builtin/merge.c:798
+#: builtin/merge.c:795
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr ""
-#: builtin/merge.c:804
+#: builtin/merge.c:801
msgid ""
"Please enter a commit message to explain why this merge is necessary,\n"
"especially if it merges an updated upstream into a topic branch.\n"
"\n"
msgstr ""
-#: builtin/merge.c:809
+#: builtin/merge.c:806
msgid "An empty message aborts the commit.\n"
msgstr ""
-#: builtin/merge.c:812
+#: builtin/merge.c:809
#, c-format
msgid ""
"Lines starting with '%c' will be ignored, and an empty message aborts\n"
"the commit.\n"
msgstr ""
-#: builtin/merge.c:853
+#: builtin/merge.c:862
msgid "Empty commit message."
msgstr ""
-#: builtin/merge.c:872
+#: builtin/merge.c:877
#, c-format
msgid "Wonderful.\n"
msgstr ""
-#: builtin/merge.c:933
+#: builtin/merge.c:938
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr ""
-#: builtin/merge.c:972
+#: builtin/merge.c:977
msgid "No current branch."
msgstr ""
-#: builtin/merge.c:974
+#: builtin/merge.c:979
msgid "No remote for the current branch."
msgstr ""
-#: builtin/merge.c:976
+#: builtin/merge.c:981
msgid "No default upstream defined for the current branch."
msgstr ""
-#: builtin/merge.c:981
+#: builtin/merge.c:986
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr ""
-#: builtin/merge.c:1038
+#: builtin/merge.c:1043
#, c-format
msgid "Bad value '%s' in environment '%s'"
msgstr ""
-#: builtin/merge.c:1141
+#: builtin/merge.c:1146
#, c-format
msgid "not something we can merge in %s: %s"
msgstr ""
-#: builtin/merge.c:1175
+#: builtin/merge.c:1180
msgid "not something we can merge"
msgstr ""
-#: builtin/merge.c:1278
+#: builtin/merge.c:1283
msgid "--abort expects no arguments"
msgstr ""
-#: builtin/merge.c:1282
+#: builtin/merge.c:1287
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr ""
-#: builtin/merge.c:1291
+#: builtin/merge.c:1296
msgid "--quit expects no arguments"
msgstr ""
-#: builtin/merge.c:1304
+#: builtin/merge.c:1309
msgid "--continue expects no arguments"
msgstr ""
-#: builtin/merge.c:1308
+#: builtin/merge.c:1313
msgid "There is no merge in progress (MERGE_HEAD missing)."
msgstr ""
-#: builtin/merge.c:1324
+#: builtin/merge.c:1329
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
msgstr ""
-#: builtin/merge.c:1331
+#: builtin/merge.c:1336
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
msgstr ""
-#: builtin/merge.c:1334
+#: builtin/merge.c:1339
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr ""
-#: builtin/merge.c:1348
+#: builtin/merge.c:1353
msgid "You cannot combine --squash with --no-ff."
msgstr ""
-#: builtin/merge.c:1350
+#: builtin/merge.c:1355
msgid "You cannot combine --squash with --commit."
msgstr ""
-#: builtin/merge.c:1366
+#: builtin/merge.c:1371
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr ""
-#: builtin/merge.c:1383
+#: builtin/merge.c:1388
msgid "Squash commit into empty head not supported yet"
msgstr ""
-#: builtin/merge.c:1385
+#: builtin/merge.c:1390
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr ""
-#: builtin/merge.c:1390
+#: builtin/merge.c:1395
#, c-format
msgid "%s - not something we can merge"
msgstr ""
-#: builtin/merge.c:1392
+#: builtin/merge.c:1397
msgid "Can merge only exactly one commit into empty head"
msgstr ""
-#: builtin/merge.c:1471
+#: builtin/merge.c:1476
msgid "refusing to merge unrelated histories"
msgstr ""
-#: builtin/merge.c:1480
+#: builtin/merge.c:1485
msgid "Already up to date."
msgstr ""
-#: builtin/merge.c:1490
+#: builtin/merge.c:1495
#, c-format
msgid "Updating %s..%s\n"
msgstr ""
-#: builtin/merge.c:1532
+#: builtin/merge.c:1537
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr ""
-#: builtin/merge.c:1539
+#: builtin/merge.c:1544
#, c-format
msgid "Nope.\n"
msgstr ""
-#: builtin/merge.c:1564
+#: builtin/merge.c:1569
msgid "Already up to date. Yeeah!"
msgstr ""
-#: builtin/merge.c:1570
+#: builtin/merge.c:1575
msgid "Not possible to fast-forward, aborting."
msgstr ""
-#: builtin/merge.c:1593 builtin/merge.c:1658
+#: builtin/merge.c:1598 builtin/merge.c:1663
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr ""
-#: builtin/merge.c:1597
+#: builtin/merge.c:1602
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr ""
-#: builtin/merge.c:1649
+#: builtin/merge.c:1654
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr ""
-#: builtin/merge.c:1651
+#: builtin/merge.c:1656
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr ""
-#: builtin/merge.c:1660
+#: builtin/merge.c:1665
#, c-format
msgid "Using the %s to prepare resolving by hand.\n"
msgstr ""
-#: builtin/merge.c:1672
+#: builtin/merge.c:1677
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
msgid "set labels for file1/orig-file/file2"
msgstr ""
-#: builtin/merge-recursive.c:46
+#: builtin/merge-recursive.c:47
#, c-format
msgid "unknown option %s"
msgstr ""
-#: builtin/merge-recursive.c:52
+#: builtin/merge-recursive.c:53
#, c-format
msgid "could not parse object '%s'"
msgstr ""
-#: builtin/merge-recursive.c:56
+#: builtin/merge-recursive.c:57
#, c-format
msgid "cannot handle more than %d base. Ignoring %s."
msgid_plural "cannot handle more than %d bases. Ignoring %s."
msgstr[0] ""
msgstr[1] ""
-#: builtin/merge-recursive.c:64
+#: builtin/merge-recursive.c:65
msgid "not handling anything other than two heads merge."
msgstr ""
-#: builtin/merge-recursive.c:70 builtin/merge-recursive.c:72
+#: builtin/merge-recursive.c:74 builtin/merge-recursive.c:76
#, c-format
msgid "could not resolve ref '%s'"
msgstr ""
-#: builtin/merge-recursive.c:78
+#: builtin/merge-recursive.c:82
#, c-format
msgid "Merging %s with %s\n"
msgstr ""
msgid "Renaming %s to %s\n"
msgstr ""
-#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:510
+#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:511
#, c-format
msgid "renaming '%s' failed"
msgstr ""
-#: builtin/name-rev.c:352
+#: builtin/name-rev.c:356
msgid "git name-rev [<options>] <commit>..."
msgstr ""
-#: builtin/name-rev.c:353
+#: builtin/name-rev.c:357
msgid "git name-rev [<options>] --all"
msgstr ""
-#: builtin/name-rev.c:354
+#: builtin/name-rev.c:358
msgid "git name-rev [<options>] --stdin"
msgstr ""
-#: builtin/name-rev.c:411
+#: builtin/name-rev.c:415
msgid "print only names (no SHA-1)"
msgstr ""
-#: builtin/name-rev.c:412
+#: builtin/name-rev.c:416
msgid "only use tags to name the commits"
msgstr ""
-#: builtin/name-rev.c:414
+#: builtin/name-rev.c:418
msgid "only use refs matching <pattern>"
msgstr ""
-#: builtin/name-rev.c:416
+#: builtin/name-rev.c:420
msgid "ignore refs matching <pattern>"
msgstr ""
-#: builtin/name-rev.c:418
+#: builtin/name-rev.c:422
msgid "list all commits reachable from all refs"
msgstr ""
-#: builtin/name-rev.c:419
+#: builtin/name-rev.c:423
msgid "read from stdin"
msgstr ""
-#: builtin/name-rev.c:420
+#: builtin/name-rev.c:424
msgid "allow to print `undefined` names (default)"
msgstr ""
-#: builtin/name-rev.c:426
+#: builtin/name-rev.c:430
msgid "dereference tags in the input (internal use)"
msgstr ""
msgid "read object names from the standard input"
msgstr ""
-#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:165
+#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:164
msgid "do not remove, show only"
msgstr ""
msgid "use notes from <notes-ref>"
msgstr ""
-#: builtin/notes.c:1034 builtin/stash.c:1598
+#: builtin/notes.c:1034 builtin/stash.c:1607
#, c-format
msgid "unknown subcommand: %s"
msgstr ""
msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
msgstr ""
-#: builtin/pack-objects.c:1166
+#: builtin/pack-objects.c:1164
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr ""
-#: builtin/pack-objects.c:1597
+#: builtin/pack-objects.c:1592
#, c-format
msgid "delta base offset overflow in pack for %s"
msgstr ""
-#: builtin/pack-objects.c:1606
+#: builtin/pack-objects.c:1601
#, c-format
msgid "delta base offset out of bound for %s"
msgstr ""
-#: builtin/pack-objects.c:1875
+#: builtin/pack-objects.c:1870
msgid "Counting objects"
msgstr ""
-#: builtin/pack-objects.c:2005
+#: builtin/pack-objects.c:2000
#, c-format
msgid "unable to get size of %s"
msgstr ""
-#: builtin/pack-objects.c:2020
+#: builtin/pack-objects.c:2015
#, c-format
msgid "unable to parse object header of %s"
msgstr ""
-#: builtin/pack-objects.c:2090 builtin/pack-objects.c:2106
-#: builtin/pack-objects.c:2116
+#: builtin/pack-objects.c:2085 builtin/pack-objects.c:2101
+#: builtin/pack-objects.c:2111
#, c-format
msgid "object %s cannot be read"
msgstr ""
-#: builtin/pack-objects.c:2093 builtin/pack-objects.c:2120
+#: builtin/pack-objects.c:2088 builtin/pack-objects.c:2115
#, c-format
msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
msgstr ""
-#: builtin/pack-objects.c:2130
+#: builtin/pack-objects.c:2125
msgid "suboptimal pack - out of memory"
msgstr ""
-#: builtin/pack-objects.c:2456
+#: builtin/pack-objects.c:2440
#, c-format
msgid "Delta compression using up to %d threads"
msgstr ""
-#: builtin/pack-objects.c:2588
+#: builtin/pack-objects.c:2572
#, c-format
msgid "unable to pack objects reachable from tag %s"
msgstr ""
-#: builtin/pack-objects.c:2675
+#: builtin/pack-objects.c:2659
msgid "Compressing objects"
msgstr ""
-#: builtin/pack-objects.c:2681
+#: builtin/pack-objects.c:2665
msgid "inconsistency with delta count"
msgstr ""
-#: builtin/pack-objects.c:2762
+#: builtin/pack-objects.c:2742
#, c-format
msgid ""
"expected edge object ID, got garbage:\n"
" %s"
msgstr ""
-#: builtin/pack-objects.c:2768
+#: builtin/pack-objects.c:2748
#, c-format
msgid ""
"expected object ID, got garbage:\n"
" %s"
msgstr ""
-#: builtin/pack-objects.c:2866
+#: builtin/pack-objects.c:2846
msgid "invalid value for --missing"
msgstr ""
-#: builtin/pack-objects.c:2925 builtin/pack-objects.c:3033
+#: builtin/pack-objects.c:2905 builtin/pack-objects.c:3013
msgid "cannot open pack index"
msgstr ""
-#: builtin/pack-objects.c:2956
+#: builtin/pack-objects.c:2936
#, c-format
msgid "loose object at %s could not be examined"
msgstr ""
-#: builtin/pack-objects.c:3041
+#: builtin/pack-objects.c:3021
msgid "unable to force loose object"
msgstr ""
-#: builtin/pack-objects.c:3133
+#: builtin/pack-objects.c:3113
#, c-format
msgid "not a rev '%s'"
msgstr ""
-#: builtin/pack-objects.c:3136
+#: builtin/pack-objects.c:3116
#, c-format
msgid "bad revision '%s'"
msgstr ""
-#: builtin/pack-objects.c:3161
+#: builtin/pack-objects.c:3141
msgid "unable to add recent objects"
msgstr ""
-#: builtin/pack-objects.c:3214
+#: builtin/pack-objects.c:3194
#, c-format
msgid "unsupported index version %s"
msgstr ""
-#: builtin/pack-objects.c:3218
+#: builtin/pack-objects.c:3198
#, c-format
msgid "bad index version '%s'"
msgstr ""
-#: builtin/pack-objects.c:3248
+#: builtin/pack-objects.c:3228
msgid "do not show progress meter"
msgstr ""
-#: builtin/pack-objects.c:3250
+#: builtin/pack-objects.c:3230
msgid "show progress meter"
msgstr ""
-#: builtin/pack-objects.c:3252
+#: builtin/pack-objects.c:3232
msgid "show progress meter during object writing phase"
msgstr ""
-#: builtin/pack-objects.c:3255
+#: builtin/pack-objects.c:3235
msgid "similar to --all-progress when progress meter is shown"
msgstr ""
-#: builtin/pack-objects.c:3256
+#: builtin/pack-objects.c:3236
msgid "<version>[,<offset>]"
msgstr ""
-#: builtin/pack-objects.c:3257
+#: builtin/pack-objects.c:3237
msgid "write the pack index file in the specified idx format version"
msgstr ""
-#: builtin/pack-objects.c:3260
+#: builtin/pack-objects.c:3240
msgid "maximum size of each output pack file"
msgstr ""
-#: builtin/pack-objects.c:3262
+#: builtin/pack-objects.c:3242
msgid "ignore borrowed objects from alternate object store"
msgstr ""
-#: builtin/pack-objects.c:3264
+#: builtin/pack-objects.c:3244
msgid "ignore packed objects"
msgstr ""
-#: builtin/pack-objects.c:3266
+#: builtin/pack-objects.c:3246
msgid "limit pack window by objects"
msgstr ""
-#: builtin/pack-objects.c:3268
+#: builtin/pack-objects.c:3248
msgid "limit pack window by memory in addition to object limit"
msgstr ""
-#: builtin/pack-objects.c:3270
+#: builtin/pack-objects.c:3250
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr ""
-#: builtin/pack-objects.c:3272
+#: builtin/pack-objects.c:3252
msgid "reuse existing deltas"
msgstr ""
-#: builtin/pack-objects.c:3274
+#: builtin/pack-objects.c:3254
msgid "reuse existing objects"
msgstr ""
-#: builtin/pack-objects.c:3276
+#: builtin/pack-objects.c:3256
msgid "use OFS_DELTA objects"
msgstr ""
-#: builtin/pack-objects.c:3278
+#: builtin/pack-objects.c:3258
msgid "use threads when searching for best delta matches"
msgstr ""
-#: builtin/pack-objects.c:3280
+#: builtin/pack-objects.c:3260
msgid "do not create an empty pack output"
msgstr ""
-#: builtin/pack-objects.c:3282
+#: builtin/pack-objects.c:3262
msgid "read revision arguments from standard input"
msgstr ""
-#: builtin/pack-objects.c:3284
+#: builtin/pack-objects.c:3264
msgid "limit the objects to those that are not yet packed"
msgstr ""
-#: builtin/pack-objects.c:3287
+#: builtin/pack-objects.c:3267
msgid "include objects reachable from any reference"
msgstr ""
-#: builtin/pack-objects.c:3290
+#: builtin/pack-objects.c:3270
msgid "include objects referred by reflog entries"
msgstr ""
-#: builtin/pack-objects.c:3293
+#: builtin/pack-objects.c:3273
msgid "include objects referred to by the index"
msgstr ""
-#: builtin/pack-objects.c:3296
+#: builtin/pack-objects.c:3276
msgid "output pack to stdout"
msgstr ""
-#: builtin/pack-objects.c:3298
+#: builtin/pack-objects.c:3278
msgid "include tag objects that refer to objects to be packed"
msgstr ""
-#: builtin/pack-objects.c:3300
+#: builtin/pack-objects.c:3280
msgid "keep unreachable objects"
msgstr ""
-#: builtin/pack-objects.c:3302
+#: builtin/pack-objects.c:3282
msgid "pack loose unreachable objects"
msgstr ""
-#: builtin/pack-objects.c:3304
+#: builtin/pack-objects.c:3284
msgid "unpack unreachable objects newer than <time>"
msgstr ""
-#: builtin/pack-objects.c:3307
+#: builtin/pack-objects.c:3287
msgid "use the sparse reachability algorithm"
msgstr ""
-#: builtin/pack-objects.c:3309
+#: builtin/pack-objects.c:3289
msgid "create thin packs"
msgstr ""
-#: builtin/pack-objects.c:3311
+#: builtin/pack-objects.c:3291
msgid "create packs suitable for shallow fetches"
msgstr ""
-#: builtin/pack-objects.c:3313
+#: builtin/pack-objects.c:3293
msgid "ignore packs that have companion .keep file"
msgstr ""
-#: builtin/pack-objects.c:3315
+#: builtin/pack-objects.c:3295
msgid "ignore this pack"
msgstr ""
-#: builtin/pack-objects.c:3317
+#: builtin/pack-objects.c:3297
msgid "pack compression level"
msgstr ""
-#: builtin/pack-objects.c:3319
+#: builtin/pack-objects.c:3299
msgid "do not hide commits by grafts"
msgstr ""
-#: builtin/pack-objects.c:3321
+#: builtin/pack-objects.c:3301
msgid "use a bitmap index if available to speed up counting objects"
msgstr ""
-#: builtin/pack-objects.c:3323
+#: builtin/pack-objects.c:3303
msgid "write a bitmap index together with the pack index"
msgstr ""
-#: builtin/pack-objects.c:3327
+#: builtin/pack-objects.c:3307
msgid "write a bitmap index if possible"
msgstr ""
-#: builtin/pack-objects.c:3331
+#: builtin/pack-objects.c:3311
msgid "handling for missing objects"
msgstr ""
-#: builtin/pack-objects.c:3334
+#: builtin/pack-objects.c:3314
msgid "do not pack objects in promisor packfiles"
msgstr ""
-#: builtin/pack-objects.c:3336
+#: builtin/pack-objects.c:3316
msgid "respect islands during delta compression"
msgstr ""
-#: builtin/pack-objects.c:3361
+#: builtin/pack-objects.c:3345
#, c-format
msgid "delta chain depth %d is too deep, forcing %d"
msgstr ""
-#: builtin/pack-objects.c:3366
+#: builtin/pack-objects.c:3350
#, c-format
msgid "pack.deltaCacheLimit is too high, forcing %d"
msgstr ""
-#: builtin/pack-objects.c:3420
+#: builtin/pack-objects.c:3404
msgid "--max-pack-size cannot be used to build a pack for transfer"
msgstr ""
-#: builtin/pack-objects.c:3422
+#: builtin/pack-objects.c:3406
msgid "minimum pack size limit is 1 MiB"
msgstr ""
-#: builtin/pack-objects.c:3427
+#: builtin/pack-objects.c:3411
msgid "--thin cannot be used to build an indexable pack"
msgstr ""
-#: builtin/pack-objects.c:3430
+#: builtin/pack-objects.c:3414
msgid "--keep-unreachable and --unpack-unreachable are incompatible"
msgstr ""
-#: builtin/pack-objects.c:3436
+#: builtin/pack-objects.c:3420
msgid "cannot use --filter without --stdout"
msgstr ""
-#: builtin/pack-objects.c:3497
+#: builtin/pack-objects.c:3481
msgid "Enumerating objects"
msgstr ""
-#: builtin/pack-objects.c:3527
+#: builtin/pack-objects.c:3511
#, c-format
msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)"
msgstr ""
msgid "git pull [<options>] [<repository> [<refspec>...]]"
msgstr ""
-#: builtin/pull.c:141
+#: builtin/pull.c:142
msgid "control for recursive fetching of submodules"
msgstr ""
-#: builtin/pull.c:145
+#: builtin/pull.c:146
msgid "Options related to merging"
msgstr ""
-#: builtin/pull.c:148
+#: builtin/pull.c:149
msgid "incorporate changes by rebasing rather than merging"
msgstr ""
-#: builtin/pull.c:176 builtin/rebase.c:447 builtin/revert.c:126
+#: builtin/pull.c:177 builtin/rebase.c:448 builtin/revert.c:126
msgid "allow fast-forward"
msgstr ""
-#: builtin/pull.c:185
+#: builtin/pull.c:186
msgid "automatically stash/stash pop before and after rebase"
msgstr ""
-#: builtin/pull.c:201
+#: builtin/pull.c:202
msgid "Options related to fetching"
msgstr ""
-#: builtin/pull.c:211
+#: builtin/pull.c:212
msgid "force overwrite of local branch"
msgstr ""
-#: builtin/pull.c:219
+#: builtin/pull.c:220
msgid "number of submodules pulled in parallel"
msgstr ""
-#: builtin/pull.c:316
+#: builtin/pull.c:320
#, c-format
msgid "Invalid value for pull.ff: %s"
msgstr ""
-#: builtin/pull.c:433
+#: builtin/pull.c:437
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
msgstr ""
-#: builtin/pull.c:435
+#: builtin/pull.c:439
msgid ""
"There are no candidates for merging among the refs that you just fetched."
msgstr ""
-#: builtin/pull.c:436
+#: builtin/pull.c:440
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
msgstr ""
-#: builtin/pull.c:439
+#: builtin/pull.c:443
#, 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:444 builtin/rebase.c:1326 git-parse-remote.sh:73
+#: builtin/pull.c:448 builtin/rebase.c:1347 git-parse-remote.sh:73
msgid "You are not currently on a branch."
msgstr ""
-#: builtin/pull.c:446 builtin/pull.c:461 git-parse-remote.sh:79
+#: builtin/pull.c:450 builtin/pull.c:465 git-parse-remote.sh:79
msgid "Please specify which branch you want to rebase against."
msgstr ""
-#: builtin/pull.c:448 builtin/pull.c:463 git-parse-remote.sh:82
+#: builtin/pull.c:452 builtin/pull.c:467 git-parse-remote.sh:82
msgid "Please specify which branch you want to merge with."
msgstr ""
-#: builtin/pull.c:449 builtin/pull.c:464
+#: builtin/pull.c:453 builtin/pull.c:468
msgid "See git-pull(1) for details."
msgstr ""
-#: builtin/pull.c:451 builtin/pull.c:457 builtin/pull.c:466
-#: builtin/rebase.c:1332 git-parse-remote.sh:64
+#: builtin/pull.c:455 builtin/pull.c:461 builtin/pull.c:470
+#: builtin/rebase.c:1353 git-parse-remote.sh:64
msgid "<remote>"
msgstr ""
-#: builtin/pull.c:451 builtin/pull.c:466 builtin/pull.c:471
+#: builtin/pull.c:455 builtin/pull.c:470 builtin/pull.c:475
#: git-parse-remote.sh:65
msgid "<branch>"
msgstr ""
-#: builtin/pull.c:459 builtin/rebase.c:1324 git-parse-remote.sh:75
+#: builtin/pull.c:463 builtin/rebase.c:1345 git-parse-remote.sh:75
msgid "There is no tracking information for the current branch."
msgstr ""
-#: builtin/pull.c:468 git-parse-remote.sh:95
+#: builtin/pull.c:472 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:473
+#: builtin/pull.c:477
#, 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:581
+#: builtin/pull.c:587
#, c-format
msgid "unable to access commit %s"
msgstr ""
-#: builtin/pull.c:861
+#: builtin/pull.c:867
msgid "ignoring --verify-signatures for rebase"
msgstr ""
-#: builtin/pull.c:916
+#: builtin/pull.c:922
msgid "--[no-]autostash option is only valid with --rebase."
msgstr ""
-#: builtin/pull.c:924
+#: builtin/pull.c:930
msgid "Updating an unborn branch with changes added to the index."
msgstr ""
-#: builtin/pull.c:928
+#: builtin/pull.c:934
msgid "pull with rebase"
msgstr ""
-#: builtin/pull.c:929
+#: builtin/pull.c:935
msgid "please commit or stash them."
msgstr ""
-#: builtin/pull.c:954
+#: builtin/pull.c:960
#, c-format
msgid ""
"fetch updated the current branch head.\n"
"commit %s."
msgstr ""
-#: builtin/pull.c:960
+#: builtin/pull.c:966
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
"to recover."
msgstr ""
-#: builtin/pull.c:975
+#: builtin/pull.c:981
msgid "Cannot merge multiple branches into empty head."
msgstr ""
-#: builtin/pull.c:979
+#: builtin/pull.c:985
msgid "Cannot rebase onto multiple branches."
msgstr ""
-#: builtin/pull.c:986
+#: builtin/pull.c:992
msgid "cannot rebase with locally recorded submodule modifications"
msgstr ""
msgid "Pushing to %s\n"
msgstr ""
-#: builtin/push.c:364
+#: builtin/push.c:366
#, c-format
msgid "failed to push some refs to '%s'"
msgstr ""
-#: builtin/push.c:398
-#, c-format
-msgid "bad repository '%s'"
-msgstr ""
-
-#: builtin/push.c:399
-msgid ""
-"No configured push destination.\n"
-"Either specify the URL from the command-line or configure a remote "
-"repository using\n"
-"\n"
-" git remote add <name> <url>\n"
-"\n"
-"and then push using the remote name\n"
-"\n"
-" git push <name>\n"
-msgstr ""
-
-#: builtin/push.c:554
+#: builtin/push.c:541
msgid "repository"
msgstr ""
-#: builtin/push.c:555 builtin/send-pack.c:164
+#: builtin/push.c:542 builtin/send-pack.c:164
msgid "push all refs"
msgstr ""
-#: builtin/push.c:556 builtin/send-pack.c:166
+#: builtin/push.c:543 builtin/send-pack.c:166
msgid "mirror all refs"
msgstr ""
-#: builtin/push.c:558
+#: builtin/push.c:545
msgid "delete refs"
msgstr ""
-#: builtin/push.c:559
+#: builtin/push.c:546
msgid "push tags (can't be used with --all or --mirror)"
msgstr ""
-#: builtin/push.c:562 builtin/send-pack.c:167
+#: builtin/push.c:549 builtin/send-pack.c:167
msgid "force updates"
msgstr ""
-#: builtin/push.c:564 builtin/send-pack.c:181
+#: builtin/push.c:551 builtin/send-pack.c:181
msgid "<refname>:<expect>"
msgstr ""
-#: builtin/push.c:565 builtin/send-pack.c:182
+#: builtin/push.c:552 builtin/send-pack.c:182
msgid "require old value of ref to be at this value"
msgstr ""
-#: builtin/push.c:568
+#: builtin/push.c:555
msgid "control recursive pushing of submodules"
msgstr ""
-#: builtin/push.c:570 builtin/send-pack.c:175
+#: builtin/push.c:557 builtin/send-pack.c:175
msgid "use thin pack"
msgstr ""
-#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:161
+#: builtin/push.c:558 builtin/push.c:559 builtin/send-pack.c:161
#: builtin/send-pack.c:162
msgid "receive pack program"
msgstr ""
-#: builtin/push.c:573
+#: builtin/push.c:560
msgid "set upstream for git pull/status"
msgstr ""
-#: builtin/push.c:576
+#: builtin/push.c:563
msgid "prune locally removed refs"
msgstr ""
-#: builtin/push.c:578
+#: builtin/push.c:565
msgid "bypass pre-push hook"
msgstr ""
-#: builtin/push.c:579
+#: builtin/push.c:566
msgid "push missing but relevant tags"
msgstr ""
-#: builtin/push.c:582 builtin/send-pack.c:169
+#: builtin/push.c:569 builtin/send-pack.c:169
msgid "GPG sign the push"
msgstr ""
-#: builtin/push.c:584 builtin/send-pack.c:176
+#: builtin/push.c:571 builtin/send-pack.c:176
msgid "request atomic transaction on remote side"
msgstr ""
-#: builtin/push.c:602
+#: builtin/push.c:589
msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr ""
-#: builtin/push.c:604
+#: builtin/push.c:591
msgid "--delete doesn't make sense without any refs"
msgstr ""
-#: builtin/push.c:607
+#: builtin/push.c:611
+#, c-format
+msgid "bad repository '%s'"
+msgstr ""
+
+#: builtin/push.c:612
+msgid ""
+"No configured push destination.\n"
+"Either specify the URL from the command-line or configure a remote "
+"repository using\n"
+"\n"
+" git remote add <name> <url>\n"
+"\n"
+"and then push using the remote name\n"
+"\n"
+" git push <name>\n"
+msgstr ""
+
+#: builtin/push.c:627
msgid "--all and --tags are incompatible"
msgstr ""
-#: builtin/push.c:609
+#: builtin/push.c:629
msgid "--all can't be combined with refspecs"
msgstr ""
-#: builtin/push.c:613
+#: builtin/push.c:633
msgid "--mirror and --tags are incompatible"
msgstr ""
-#: builtin/push.c:615
+#: builtin/push.c:635
msgid "--mirror can't be combined with refspecs"
msgstr ""
-#: builtin/push.c:618
+#: builtin/push.c:638
msgid "--all and --mirror are incompatible"
msgstr ""
-#: builtin/push.c:637
+#: builtin/push.c:642
msgid "push options must not have new line characters"
msgstr ""
#: builtin/rebase.c:32
msgid ""
-"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] "
-"[<branch>]"
+"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] "
+"[<upstream> [<branch>]]"
msgstr ""
#: builtin/rebase.c:34
msgid "could not generate todo list"
msgstr ""
-#: builtin/rebase.c:382
+#: builtin/rebase.c:383
msgid "a base commit must be provided with --upstream or --onto"
msgstr ""
-#: builtin/rebase.c:437
+#: builtin/rebase.c:438
msgid "git rebase--interactive [<options>]"
msgstr ""
-#: builtin/rebase.c:449
+#: builtin/rebase.c:450
msgid "keep empty commits"
msgstr ""
-#: builtin/rebase.c:451 builtin/revert.c:128
+#: builtin/rebase.c:452 builtin/revert.c:128
msgid "allow commits with empty messages"
msgstr ""
-#: builtin/rebase.c:452
+#: builtin/rebase.c:453
msgid "rebase merge commits"
msgstr ""
-#: builtin/rebase.c:454
+#: builtin/rebase.c:455
msgid "keep original branch points of cousins"
msgstr ""
-#: builtin/rebase.c:456
+#: builtin/rebase.c:457
msgid "move commits that begin with squash!/fixup!"
msgstr ""
-#: builtin/rebase.c:457
+#: builtin/rebase.c:458
msgid "sign commits"
msgstr ""
-#: builtin/rebase.c:459 builtin/rebase.c:1403
+#: builtin/rebase.c:460 builtin/rebase.c:1427
msgid "display a diffstat of what changed upstream"
msgstr ""
-#: builtin/rebase.c:461
+#: builtin/rebase.c:462
msgid "continue rebase"
msgstr ""
-#: builtin/rebase.c:463
+#: builtin/rebase.c:464
msgid "skip commit"
msgstr ""
-#: builtin/rebase.c:464
+#: builtin/rebase.c:465
msgid "edit the todo list"
msgstr ""
-#: builtin/rebase.c:466
+#: builtin/rebase.c:467
msgid "show the current patch"
msgstr ""
-#: builtin/rebase.c:469
+#: builtin/rebase.c:470
msgid "shorten commit ids in the todo list"
msgstr ""
-#: builtin/rebase.c:471
+#: builtin/rebase.c:472
msgid "expand commit ids in the todo list"
msgstr ""
-#: builtin/rebase.c:473
+#: builtin/rebase.c:474
msgid "check the todo list"
msgstr ""
-#: builtin/rebase.c:475
+#: builtin/rebase.c:476
msgid "rearrange fixup/squash lines"
msgstr ""
-#: builtin/rebase.c:477
+#: builtin/rebase.c:478
msgid "insert exec commands in todo list"
msgstr ""
-#: builtin/rebase.c:478
+#: builtin/rebase.c:479
msgid "onto"
msgstr ""
-#: builtin/rebase.c:481
+#: builtin/rebase.c:482
msgid "restrict-revision"
msgstr ""
-#: builtin/rebase.c:481
+#: builtin/rebase.c:482
msgid "restrict revision"
msgstr ""
-#: builtin/rebase.c:483
+#: builtin/rebase.c:484
msgid "squash-onto"
msgstr ""
-#: builtin/rebase.c:484
+#: builtin/rebase.c:485
msgid "squash onto"
msgstr ""
-#: builtin/rebase.c:486
+#: builtin/rebase.c:487
msgid "the upstream commit"
msgstr ""
-#: builtin/rebase.c:488
+#: builtin/rebase.c:489
msgid "head-name"
msgstr ""
-#: builtin/rebase.c:488
+#: builtin/rebase.c:489
msgid "head name"
msgstr ""
-#: builtin/rebase.c:493
+#: builtin/rebase.c:494
msgid "rebase strategy"
msgstr ""
-#: builtin/rebase.c:494
+#: builtin/rebase.c:495
msgid "strategy-opts"
msgstr ""
-#: builtin/rebase.c:495
+#: builtin/rebase.c:496
msgid "strategy options"
msgstr ""
-#: builtin/rebase.c:496
+#: builtin/rebase.c:497
msgid "switch-to"
msgstr ""
-#: builtin/rebase.c:497
+#: builtin/rebase.c:498
msgid "the branch or commit to checkout"
msgstr ""
-#: builtin/rebase.c:498
+#: builtin/rebase.c:499
msgid "onto-name"
msgstr ""
-#: builtin/rebase.c:498
+#: builtin/rebase.c:499
msgid "onto name"
msgstr ""
-#: builtin/rebase.c:499
+#: builtin/rebase.c:500
msgid "cmd"
msgstr ""
-#: builtin/rebase.c:499
+#: builtin/rebase.c:500
msgid "the command to run"
msgstr ""
-#: builtin/rebase.c:502 builtin/rebase.c:1486
+#: builtin/rebase.c:503 builtin/rebase.c:1510
msgid "automatically re-schedule any `exec` that fails"
msgstr ""
-#: builtin/rebase.c:518
+#: builtin/rebase.c:519
msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
msgstr ""
-#: builtin/rebase.c:534
+#: builtin/rebase.c:535
#, c-format
msgid "%s requires an interactive rebase"
msgstr ""
-#: builtin/rebase.c:586
+#: builtin/rebase.c:587
#, c-format
msgid "could not get 'onto': '%s'"
msgstr ""
-#: builtin/rebase.c:601
+#: builtin/rebase.c:602
#, c-format
msgid "invalid orig-head: '%s'"
msgstr ""
-#: builtin/rebase.c:626
+#: builtin/rebase.c:627
#, c-format
msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
msgstr ""
-#: builtin/rebase.c:702
+#: builtin/rebase.c:703
#, c-format
msgid "Could not read '%s'"
msgstr ""
-#: builtin/rebase.c:720
+#: builtin/rebase.c:721
#, c-format
msgid "Cannot store %s"
msgstr ""
-#: builtin/rebase.c:827
+#: builtin/rebase.c:828
msgid "could not determine HEAD revision"
msgstr ""
-#: builtin/rebase.c:950 git-rebase--preserve-merges.sh:81
+#: builtin/rebase.c:951 git-rebase--preserve-merges.sh:81
msgid ""
"Resolve all conflicts manually, mark them as resolved with\n"
"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
"abort\"."
msgstr ""
-#: builtin/rebase.c:1031
+#: builtin/rebase.c:1032
#, c-format
msgid ""
"\n"
"As a result, git cannot rebase them."
msgstr ""
-#: builtin/rebase.c:1318
+#: builtin/rebase.c:1339
#, c-format
msgid ""
"%s\n"
"\n"
msgstr ""
-#: builtin/rebase.c:1334
+#: builtin/rebase.c:1355
#, c-format
msgid ""
"If you wish to set tracking information for this branch you can do so with:\n"
"\n"
msgstr ""
-#: builtin/rebase.c:1364
+#: builtin/rebase.c:1385
msgid "exec commands cannot contain newlines"
msgstr ""
-#: builtin/rebase.c:1368
+#: builtin/rebase.c:1389
msgid "empty exec command"
msgstr ""
-#: builtin/rebase.c:1396
+#: builtin/rebase.c:1418
msgid "rebase onto given branch instead of upstream"
msgstr ""
-#: builtin/rebase.c:1398
+#: builtin/rebase.c:1420
+msgid "use the merge-base of upstream and branch as the current base"
+msgstr ""
+
+#: builtin/rebase.c:1422
msgid "allow pre-rebase hook to run"
msgstr ""
-#: builtin/rebase.c:1400
+#: builtin/rebase.c:1424
msgid "be quiet. implies --no-stat"
msgstr ""
-#: builtin/rebase.c:1406
+#: builtin/rebase.c:1430
msgid "do not show diffstat of what changed upstream"
msgstr ""
-#: builtin/rebase.c:1409
+#: builtin/rebase.c:1433
msgid "add a Signed-off-by: line to each commit"
msgstr ""
-#: builtin/rebase.c:1411 builtin/rebase.c:1415 builtin/rebase.c:1417
+#: builtin/rebase.c:1435 builtin/rebase.c:1439 builtin/rebase.c:1441
msgid "passed to 'git am'"
msgstr ""
-#: builtin/rebase.c:1419 builtin/rebase.c:1421
+#: builtin/rebase.c:1443 builtin/rebase.c:1445
msgid "passed to 'git apply'"
msgstr ""
-#: builtin/rebase.c:1423 builtin/rebase.c:1426
+#: builtin/rebase.c:1447 builtin/rebase.c:1450
msgid "cherry-pick all commits, even if unchanged"
msgstr ""
-#: builtin/rebase.c:1428
+#: builtin/rebase.c:1452
msgid "continue"
msgstr ""
-#: builtin/rebase.c:1431
+#: builtin/rebase.c:1455
msgid "skip current patch and continue"
msgstr ""
-#: builtin/rebase.c:1433
+#: builtin/rebase.c:1457
msgid "abort and check out the original branch"
msgstr ""
-#: builtin/rebase.c:1436
+#: builtin/rebase.c:1460
msgid "abort but keep HEAD where it is"
msgstr ""
-#: builtin/rebase.c:1437
+#: builtin/rebase.c:1461
msgid "edit the todo list during an interactive rebase"
msgstr ""
-#: builtin/rebase.c:1440
+#: builtin/rebase.c:1464
msgid "show the patch file being applied or merged"
msgstr ""
-#: builtin/rebase.c:1443
+#: builtin/rebase.c:1467
msgid "use merging strategies to rebase"
msgstr ""
-#: builtin/rebase.c:1447
+#: builtin/rebase.c:1471
msgid "let the user edit the list of commits to rebase"
msgstr ""
-#: builtin/rebase.c:1451
+#: builtin/rebase.c:1475
msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
msgstr ""
-#: builtin/rebase.c:1455
+#: builtin/rebase.c:1479
msgid "preserve empty commits during rebase"
msgstr ""
-#: builtin/rebase.c:1457
+#: builtin/rebase.c:1481
msgid "move commits that begin with squash!/fixup! under -i"
msgstr ""
-#: builtin/rebase.c:1463
+#: builtin/rebase.c:1487
msgid "automatically stash/stash pop before and after"
msgstr ""
-#: builtin/rebase.c:1465
+#: builtin/rebase.c:1489
msgid "add exec lines after each commit of the editable list"
msgstr ""
-#: builtin/rebase.c:1469
+#: builtin/rebase.c:1493
msgid "allow rebasing commits with empty messages"
msgstr ""
-#: builtin/rebase.c:1472
+#: builtin/rebase.c:1496
msgid "try to rebase merges instead of skipping them"
msgstr ""
-#: builtin/rebase.c:1475
+#: builtin/rebase.c:1499
msgid "use 'merge-base --fork-point' to refine upstream"
msgstr ""
-#: builtin/rebase.c:1477
+#: builtin/rebase.c:1501
msgid "use the given merge strategy"
msgstr ""
-#: builtin/rebase.c:1479 builtin/revert.c:115
+#: builtin/rebase.c:1503 builtin/revert.c:115
msgid "option"
msgstr ""
-#: builtin/rebase.c:1480
+#: builtin/rebase.c:1504
msgid "pass the argument through to the merge strategy"
msgstr ""
-#: builtin/rebase.c:1483
+#: builtin/rebase.c:1507
msgid "rebase all reachable commits up to the root(s)"
msgstr ""
-#: builtin/rebase.c:1500
+#: builtin/rebase.c:1524
msgid ""
"the rebase.useBuiltin support has been removed!\n"
"See its entry in 'git help config' for details."
msgstr ""
-#: builtin/rebase.c:1506
+#: builtin/rebase.c:1530
msgid "It looks like 'git am' is in progress. Cannot rebase."
msgstr ""
-#: builtin/rebase.c:1547
+#: builtin/rebase.c:1571
msgid ""
"git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
msgstr ""
-#: builtin/rebase.c:1551
+#: builtin/rebase.c:1576
+msgid "cannot combine '--keep-base' with '--onto'"
+msgstr ""
+
+#: builtin/rebase.c:1578
+msgid "cannot combine '--keep-base' with '--root'"
+msgstr ""
+
+#: builtin/rebase.c:1582
msgid "No rebase in progress?"
msgstr ""
-#: builtin/rebase.c:1555
+#: builtin/rebase.c:1586
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr ""
-#: builtin/rebase.c:1578
+#: builtin/rebase.c:1609
msgid "Cannot read HEAD"
msgstr ""
-#: builtin/rebase.c:1590
+#: builtin/rebase.c:1621
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
msgstr ""
-#: builtin/rebase.c:1609
+#: builtin/rebase.c:1640
msgid "could not discard worktree changes"
msgstr ""
-#: builtin/rebase.c:1628
+#: builtin/rebase.c:1659
#, c-format
msgid "could not move back to %s"
msgstr ""
-#: builtin/rebase.c:1673
+#: builtin/rebase.c:1704
#, c-format
msgid ""
"It seems that there is already a %s directory, and\n"
"valuable there.\n"
msgstr ""
-#: builtin/rebase.c:1694
+#: builtin/rebase.c:1725
msgid "switch `C' expects a numerical value"
msgstr ""
-#: builtin/rebase.c:1735
+#: builtin/rebase.c:1766
#, c-format
msgid "Unknown mode: %s"
msgstr ""
-#: builtin/rebase.c:1757
+#: builtin/rebase.c:1788
msgid "--strategy requires --merge or --interactive"
msgstr ""
-#: builtin/rebase.c:1797
+#: builtin/rebase.c:1828
msgid "--reschedule-failed-exec requires --exec or --interactive"
msgstr ""
-#: builtin/rebase.c:1809
+#: builtin/rebase.c:1840
msgid "cannot combine am options with either interactive or merge options"
msgstr ""
-#: builtin/rebase.c:1828
+#: builtin/rebase.c:1859
msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
msgstr ""
-#: builtin/rebase.c:1832
+#: builtin/rebase.c:1863
msgid ""
"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
msgstr ""
-#: builtin/rebase.c:1838
-msgid "cannot combine '--rebase-merges' with '--strategy-option'"
-msgstr ""
-
-#: builtin/rebase.c:1841
-msgid "cannot combine '--rebase-merges' with '--strategy'"
-msgstr ""
-
-#: builtin/rebase.c:1865
+#: builtin/rebase.c:1887
#, c-format
msgid "invalid upstream '%s'"
msgstr ""
-#: builtin/rebase.c:1871
+#: builtin/rebase.c:1893
msgid "Could not create new root commit"
msgstr ""
-#: builtin/rebase.c:1889
+#: builtin/rebase.c:1919
+#, c-format
+msgid "'%s': need exactly one merge base with branch"
+msgstr ""
+
+#: builtin/rebase.c:1922
#, c-format
msgid "'%s': need exactly one merge base"
msgstr ""
-#: builtin/rebase.c:1896
+#: builtin/rebase.c:1930
#, c-format
msgid "Does not point to a valid commit '%s'"
msgstr ""
-#: builtin/rebase.c:1921
+#: builtin/rebase.c:1955
#, c-format
msgid "fatal: no such branch/commit '%s'"
msgstr ""
-#: builtin/rebase.c:1929 builtin/submodule--helper.c:38
+#: builtin/rebase.c:1963 builtin/submodule--helper.c:38
#: builtin/submodule--helper.c:1934
#, c-format
msgid "No such ref: %s"
msgstr ""
-#: builtin/rebase.c:1940
+#: builtin/rebase.c:1974
msgid "Could not resolve HEAD to a revision"
msgstr ""
-#: builtin/rebase.c:1981
+#: builtin/rebase.c:2012
msgid "Cannot autostash"
msgstr ""
-#: builtin/rebase.c:1984
+#: builtin/rebase.c:2015
#, c-format
msgid "Unexpected stash response: '%s'"
msgstr ""
-#: builtin/rebase.c:1990
+#: builtin/rebase.c:2021
#, c-format
msgid "Could not create directory for '%s'"
msgstr ""
-#: builtin/rebase.c:1993
+#: builtin/rebase.c:2024
#, c-format
msgid "Created autostash: %s\n"
msgstr ""
-#: builtin/rebase.c:1996
+#: builtin/rebase.c:2027
msgid "could not reset --hard"
msgstr ""
-#: builtin/rebase.c:1997 builtin/reset.c:114
-#, c-format
-msgid "HEAD is now at %s"
-msgstr ""
-
-#: builtin/rebase.c:2013
+#: builtin/rebase.c:2036
msgid "Please commit or stash them."
msgstr ""
-#: builtin/rebase.c:2040
+#: builtin/rebase.c:2063
#, c-format
msgid "could not parse '%s'"
msgstr ""
-#: builtin/rebase.c:2053
+#: builtin/rebase.c:2076
#, c-format
msgid "could not switch to %s"
msgstr ""
-#: builtin/rebase.c:2064
+#: builtin/rebase.c:2087
msgid "HEAD is up to date."
msgstr ""
-#: builtin/rebase.c:2066
+#: builtin/rebase.c:2089
#, c-format
msgid "Current branch %s is up to date.\n"
msgstr ""
-#: builtin/rebase.c:2074
+#: builtin/rebase.c:2097
msgid "HEAD is up to date, rebase forced."
msgstr ""
-#: builtin/rebase.c:2076
+#: builtin/rebase.c:2099
#, c-format
msgid "Current branch %s is up to date, rebase forced.\n"
msgstr ""
-#: builtin/rebase.c:2084
+#: builtin/rebase.c:2107
msgid "The pre-rebase hook refused to rebase."
msgstr ""
-#: builtin/rebase.c:2091
+#: builtin/rebase.c:2114
#, c-format
msgid "Changes to %s:\n"
msgstr ""
-#: builtin/rebase.c:2094
+#: builtin/rebase.c:2117
#, c-format
msgid "Changes from %s to %s:\n"
msgstr ""
-#: builtin/rebase.c:2119
+#: builtin/rebase.c:2142
#, c-format
msgid "First, rewinding head to replay your work on top of it...\n"
msgstr ""
-#: builtin/rebase.c:2128
+#: builtin/rebase.c:2151
msgid "Could not detach HEAD"
msgstr ""
-#: builtin/rebase.c:2137
+#: builtin/rebase.c:2160
#, c-format
msgid "Fast-forwarded %s to %s.\n"
msgstr ""
msgid "git receive-pack <git-dir>"
msgstr ""
-#: builtin/receive-pack.c:832
+#: 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"
"'receive.denyCurrentBranch' configuration variable to 'refuse'."
msgstr ""
-#: builtin/receive-pack.c:852
+#: 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"
"To squelch this message, you can set it to 'refuse'."
msgstr ""
-#: builtin/receive-pack.c:1938
+#: builtin/receive-pack.c:1936
msgid "quiet"
msgstr ""
-#: builtin/receive-pack.c:1952
+#: builtin/receive-pack.c:1950
msgid "You must specify a directory."
msgstr ""
msgid "Unknown subcommand: %s"
msgstr ""
-#: builtin/repack.c:22
+#: builtin/repack.c:23
msgid "git repack [<options>]"
msgstr ""
-#: builtin/repack.c:27
+#: builtin/repack.c:28
msgid ""
"Incremental repacks are incompatible with bitmap indexes. Use\n"
"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
msgstr ""
-#: builtin/repack.c:190
+#: builtin/repack.c:191
msgid "could not start pack-objects to repack promisor objects"
msgstr ""
-#: builtin/repack.c:229 builtin/repack.c:408
+#: builtin/repack.c:230 builtin/repack.c:409
msgid "repack: Expecting full hex object ID lines only from pack-objects."
msgstr ""
-#: builtin/repack.c:246
+#: builtin/repack.c:247
msgid "could not finish pack-objects to repack promisor objects"
msgstr ""
-#: builtin/repack.c:284
+#: builtin/repack.c:285
msgid "pack everything in a single pack"
msgstr ""
-#: builtin/repack.c:286
+#: builtin/repack.c:287
msgid "same as -a, and turn unreachable objects loose"
msgstr ""
-#: builtin/repack.c:289
+#: builtin/repack.c:290
msgid "remove redundant packs, and run git-prune-packed"
msgstr ""
-#: builtin/repack.c:291
+#: builtin/repack.c:292
msgid "pass --no-reuse-delta to git-pack-objects"
msgstr ""
-#: builtin/repack.c:293
+#: builtin/repack.c:294
msgid "pass --no-reuse-object to git-pack-objects"
msgstr ""
-#: builtin/repack.c:295
+#: builtin/repack.c:296
msgid "do not run git-update-server-info"
msgstr ""
-#: builtin/repack.c:298
+#: builtin/repack.c:299
msgid "pass --local to git-pack-objects"
msgstr ""
-#: builtin/repack.c:300
+#: builtin/repack.c:301
msgid "write bitmap index"
msgstr ""
-#: builtin/repack.c:302
+#: builtin/repack.c:303
msgid "pass --delta-islands to git-pack-objects"
msgstr ""
-#: builtin/repack.c:303
+#: builtin/repack.c:304
msgid "approxidate"
msgstr ""
-#: builtin/repack.c:304
+#: builtin/repack.c:305
msgid "with -A, do not loosen objects older than this"
msgstr ""
-#: builtin/repack.c:306
+#: builtin/repack.c:307
msgid "with -a, repack unreachable objects"
msgstr ""
-#: builtin/repack.c:308
+#: builtin/repack.c:309
msgid "size of the window used for delta compression"
msgstr ""
-#: builtin/repack.c:309 builtin/repack.c:315
+#: builtin/repack.c:310 builtin/repack.c:316
msgid "bytes"
msgstr ""
-#: builtin/repack.c:310
+#: builtin/repack.c:311
msgid "same as the above, but limit memory size instead of entries count"
msgstr ""
-#: builtin/repack.c:312
+#: builtin/repack.c:313
msgid "limits the maximum delta depth"
msgstr ""
-#: builtin/repack.c:314
+#: builtin/repack.c:315
msgid "limits the maximum number of threads"
msgstr ""
-#: builtin/repack.c:316
+#: builtin/repack.c:317
msgid "maximum size of each packfile"
msgstr ""
-#: builtin/repack.c:318
+#: builtin/repack.c:319
msgid "repack objects in packs marked with .keep"
msgstr ""
-#: builtin/repack.c:320
+#: builtin/repack.c:321
msgid "do not repack this pack"
msgstr ""
-#: builtin/repack.c:330
+#: builtin/repack.c:331
msgid "cannot delete packs in a precious-objects repo"
msgstr ""
-#: builtin/repack.c:334
+#: builtin/repack.c:335
msgid "--keep-unreachable and -A are incompatible"
msgstr ""
-#: builtin/repack.c:417
+#: builtin/repack.c:418
msgid "Nothing new to pack."
msgstr ""
-#: builtin/repack.c:478
+#: builtin/repack.c:479
#, c-format
msgid ""
"WARNING: Some packs in use have been renamed by\n"
"WARNING: Please rename them in %s manually:\n"
msgstr ""
-#: builtin/repack.c:526
+#: builtin/repack.c:527
#, c-format
msgid "failed to remove '%s'"
msgstr ""
msgid "unable to write object to database"
msgstr ""
-#: builtin/replace.c:322 builtin/replace.c:377 builtin/replace.c:422
-#: builtin/replace.c:452
+#: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:423
+#: builtin/replace.c:453
#, c-format
msgid "not a valid object name: '%s'"
msgstr ""
msgid "new object is the same as the old one: '%s'"
msgstr ""
-#: builtin/replace.c:383
+#: builtin/replace.c:384
#, c-format
msgid "could not parse %s as a commit"
msgstr ""
-#: builtin/replace.c:414
+#: builtin/replace.c:415
#, c-format
msgid "bad mergetag in commit '%s'"
msgstr ""
-#: builtin/replace.c:416
+#: builtin/replace.c:417
#, c-format
msgid "malformed mergetag in commit '%s'"
msgstr ""
-#: builtin/replace.c:428
+#: builtin/replace.c:429
#, c-format
msgid ""
"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
"instead of --graft"
msgstr ""
-#: builtin/replace.c:467
+#: builtin/replace.c:468
#, c-format
msgid "the original commit '%s' has a gpg signature"
msgstr ""
-#: builtin/replace.c:468
+#: builtin/replace.c:469
msgid "the signature will be removed in the replacement commit!"
msgstr ""
-#: builtin/replace.c:478
+#: builtin/replace.c:479
#, c-format
msgid "could not write replacement commit for: '%s'"
msgstr ""
-#: builtin/replace.c:486
+#: builtin/replace.c:487
#, c-format
msgid "graft for '%s' unnecessary"
msgstr ""
-#: builtin/replace.c:490
+#: builtin/replace.c:491
#, c-format
msgid "new commit is the same as the old one: '%s'"
msgstr ""
-#: builtin/replace.c:525
+#: builtin/replace.c:526
#, c-format
msgid ""
"could not convert the following graft(s):\n"
"%s"
msgstr ""
-#: builtin/replace.c:546
+#: builtin/replace.c:547
msgid "list replace refs"
msgstr ""
-#: builtin/replace.c:547
+#: builtin/replace.c:548
msgid "delete replace refs"
msgstr ""
-#: builtin/replace.c:548
+#: builtin/replace.c:549
msgid "edit existing object"
msgstr ""
-#: builtin/replace.c:549
+#: builtin/replace.c:550
msgid "change a commit's parents"
msgstr ""
-#: builtin/replace.c:550
+#: builtin/replace.c:551
msgid "convert existing graft file"
msgstr ""
-#: builtin/replace.c:551
+#: builtin/replace.c:552
msgid "replace the ref if it exists"
msgstr ""
-#: builtin/replace.c:553
+#: builtin/replace.c:554
msgid "do not pretty-print contents for --edit"
msgstr ""
-#: builtin/replace.c:554
+#: builtin/replace.c:555
msgid "use this format"
msgstr ""
-#: builtin/replace.c:567
+#: builtin/replace.c:568
msgid "--format cannot be used when not listing"
msgstr ""
-#: builtin/replace.c:575
+#: builtin/replace.c:576
msgid "-f only makes sense when writing a replacement"
msgstr ""
-#: builtin/replace.c:579
+#: builtin/replace.c:580
msgid "--raw only makes sense with --edit"
msgstr ""
-#: builtin/replace.c:585
+#: builtin/replace.c:586
msgid "-d needs at least one argument"
msgstr ""
-#: builtin/replace.c:591
+#: builtin/replace.c:592
msgid "bad number of arguments"
msgstr ""
-#: builtin/replace.c:597
+#: builtin/replace.c:598
msgid "-e needs exactly one argument"
msgstr ""
-#: builtin/replace.c:603
+#: builtin/replace.c:604
msgid "-g needs at least one argument"
msgstr ""
-#: builtin/replace.c:609
+#: builtin/replace.c:610
msgid "--convert-graft-file takes no argument"
msgstr ""
-#: builtin/replace.c:615
+#: builtin/replace.c:616
msgid "only one pattern can be given with -l"
msgstr ""
msgid "Failed to find tree of %s."
msgstr ""
+#: builtin/reset.c:114
+#, c-format
+msgid "HEAD is now at %s"
+msgstr ""
+
#: builtin/reset.c:193
#, c-format
msgid "Cannot do a %s reset in the middle of a merge."
msgstr ""
-#: builtin/reset.c:293 builtin/stash.c:514 builtin/stash.c:589
-#: builtin/stash.c:613
+#: builtin/reset.c:293 builtin/stash.c:520 builtin/stash.c:595
+#: builtin/stash.c:619
msgid "be quiet, only report errors"
msgstr ""
msgid "Could not write new index file."
msgstr ""
-#: builtin/rev-list.c:412
+#: builtin/rev-list.c:411
msgid "cannot combine --exclude-promisor-objects and --missing"
msgstr ""
-#: builtin/rev-list.c:473
+#: builtin/rev-list.c:472
msgid "object filtering requires --objects"
msgstr ""
-#: builtin/rev-list.c:476
-#, c-format
-msgid "invalid sparse value '%s'"
-msgstr ""
-
-#: builtin/rev-list.c:527
+#: builtin/rev-list.c:522
msgid "rev-list does not support display of notes"
msgstr ""
-#: builtin/rev-list.c:530
+#: builtin/rev-list.c:525
msgid "cannot combine --use-bitmap-index with object filtering"
msgstr ""
msgid "could not save index tree"
msgstr ""
-#: builtin/stash.c:434
+#: builtin/stash.c:436
msgid "could not restore untracked files from stash"
msgstr ""
-#: builtin/stash.c:448
+#: builtin/stash.c:450
#, c-format
msgid "Merging %s with %s"
msgstr ""
-#: builtin/stash.c:458 git-legacy-stash.sh:680
+#: builtin/stash.c:460 git-legacy-stash.sh:680
msgid "Index was not unstashed."
msgstr ""
-#: builtin/stash.c:516 builtin/stash.c:615
+#: builtin/stash.c:522 builtin/stash.c:621
msgid "attempt to recreate the index"
msgstr ""
-#: builtin/stash.c:549
+#: builtin/stash.c:555
#, c-format
msgid "Dropped %s (%s)"
msgstr ""
-#: builtin/stash.c:552
+#: builtin/stash.c:558
#, c-format
msgid "%s: Could not drop stash entry"
msgstr ""
-#: builtin/stash.c:577
+#: builtin/stash.c:583
#, c-format
msgid "'%s' is not a stash reference"
msgstr ""
-#: builtin/stash.c:627 git-legacy-stash.sh:694
+#: builtin/stash.c:633 git-legacy-stash.sh:694
msgid "The stash entry is kept in case you need it again."
msgstr ""
-#: builtin/stash.c:650 git-legacy-stash.sh:712
+#: builtin/stash.c:656 git-legacy-stash.sh:712
msgid "No branch name specified"
msgstr ""
-#: builtin/stash.c:790 builtin/stash.c:827
+#: builtin/stash.c:796 builtin/stash.c:833
#, c-format
msgid "Cannot update %s with %s"
msgstr ""
-#: builtin/stash.c:808 builtin/stash.c:1461 builtin/stash.c:1497
+#: builtin/stash.c:814 builtin/stash.c:1470 builtin/stash.c:1506
msgid "stash message"
msgstr ""
-#: builtin/stash.c:818
+#: builtin/stash.c:824
msgid "\"git stash store\" requires one <commit> argument"
msgstr ""
-#: builtin/stash.c:1040 git-legacy-stash.sh:217
+#: builtin/stash.c:1046 git-legacy-stash.sh:217
msgid "No changes selected"
msgstr ""
-#: builtin/stash.c:1136 git-legacy-stash.sh:150
+#: builtin/stash.c:1145 git-legacy-stash.sh:150
msgid "You do not have the initial commit yet"
msgstr ""
-#: builtin/stash.c:1163 git-legacy-stash.sh:165
+#: builtin/stash.c:1172 git-legacy-stash.sh:165
msgid "Cannot save the current index state"
msgstr ""
-#: builtin/stash.c:1172 git-legacy-stash.sh:180
+#: builtin/stash.c:1181 git-legacy-stash.sh:180
msgid "Cannot save the untracked files"
msgstr ""
-#: builtin/stash.c:1183 builtin/stash.c:1192 git-legacy-stash.sh:200
+#: builtin/stash.c:1192 builtin/stash.c:1201 git-legacy-stash.sh:200
#: git-legacy-stash.sh:213
msgid "Cannot save the current worktree state"
msgstr ""
-#: builtin/stash.c:1220 git-legacy-stash.sh:233
+#: builtin/stash.c:1229 git-legacy-stash.sh:233
msgid "Cannot record working tree state"
msgstr ""
-#: builtin/stash.c:1269 git-legacy-stash.sh:337
+#: builtin/stash.c:1278 git-legacy-stash.sh:337
msgid "Can't use --patch and --include-untracked or --all at the same time"
msgstr ""
-#: builtin/stash.c:1285
+#: builtin/stash.c:1294
msgid "Did you forget to 'git add'?"
msgstr ""
-#: builtin/stash.c:1300 git-legacy-stash.sh:345
+#: builtin/stash.c:1309 git-legacy-stash.sh:345
msgid "No local changes to save"
msgstr ""
-#: builtin/stash.c:1307 git-legacy-stash.sh:350
+#: builtin/stash.c:1316 git-legacy-stash.sh:350
msgid "Cannot initialize stash"
msgstr ""
-#: builtin/stash.c:1322 git-legacy-stash.sh:354
+#: builtin/stash.c:1331 git-legacy-stash.sh:354
msgid "Cannot save the current status"
msgstr ""
-#: builtin/stash.c:1327
+#: builtin/stash.c:1336
#, c-format
msgid "Saved working directory and index state %s"
msgstr ""
-#: builtin/stash.c:1417 git-legacy-stash.sh:384
+#: builtin/stash.c:1426 git-legacy-stash.sh:384
msgid "Cannot remove worktree changes"
msgstr ""
-#: builtin/stash.c:1452 builtin/stash.c:1488
+#: builtin/stash.c:1461 builtin/stash.c:1497
msgid "keep index"
msgstr ""
-#: builtin/stash.c:1454 builtin/stash.c:1490
+#: builtin/stash.c:1463 builtin/stash.c:1499
msgid "stash in patch mode"
msgstr ""
-#: builtin/stash.c:1455 builtin/stash.c:1491
+#: builtin/stash.c:1464 builtin/stash.c:1500
msgid "quiet mode"
msgstr ""
-#: builtin/stash.c:1457 builtin/stash.c:1493
+#: builtin/stash.c:1466 builtin/stash.c:1502
msgid "include untracked files in stash"
msgstr ""
-#: builtin/stash.c:1459 builtin/stash.c:1495
+#: builtin/stash.c:1468 builtin/stash.c:1504
msgid "include ignore files"
msgstr ""
-#: builtin/stash.c:1555
+#: builtin/stash.c:1564
#, c-format
msgid "could not exec %s"
msgstr ""
msgstr ""
#: builtin/submodule--helper.c:1877
-msgid "git submodule--helper update
_clone [--prefix=<path>] [<path>...]"
+msgid "git submodule--helper update
-clone [--prefix=<path>] [<path>...]"
msgstr ""
#: builtin/submodule--helper.c:1890
msgid "please make sure that the .gitmodules file is in the working tree"
msgstr ""
-#: builtin/submodule--helper.c:2235 git.c:434 git.c:684
+#: builtin/submodule--helper.c:2235 git.c:433 git.c:683
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr ""
msgid "git update-index [<options>] [--] [<file>...]"
msgstr ""
-#: builtin/update-index.c:971
+#: builtin/update-index.c:972
msgid "continue refresh even when index needs update"
msgstr ""
-#: builtin/update-index.c:974
+#: builtin/update-index.c:975
msgid "refresh: ignore submodules"
msgstr ""
-#: builtin/update-index.c:977
+#: builtin/update-index.c:978
msgid "do not ignore new files"
msgstr ""
-#: builtin/update-index.c:979
+#: builtin/update-index.c:980
msgid "let files replace directories and vice-versa"
msgstr ""
-#: builtin/update-index.c:981
+#: builtin/update-index.c:982
msgid "notice files missing from worktree"
msgstr ""
-#: builtin/update-index.c:983
+#: builtin/update-index.c:984
msgid "refresh even if index contains unmerged entries"
msgstr ""
-#: builtin/update-index.c:986
+#: builtin/update-index.c:987
msgid "refresh stat information"
msgstr ""
-#: builtin/update-index.c:990
+#: builtin/update-index.c:991
msgid "like --refresh, but ignore assume-unchanged setting"
msgstr ""
-#: builtin/update-index.c:994
+#: builtin/update-index.c:995
msgid "<mode>,<object>,<path>"
msgstr ""
-#: builtin/update-index.c:995
+#: builtin/update-index.c:996
msgid "add the specified entry to the index"
msgstr ""
-#: builtin/update-index.c:1005
+#: builtin/update-index.c:1006
msgid "mark files as \"not changing\""
msgstr ""
-#: builtin/update-index.c:1008
+#: builtin/update-index.c:1009
msgid "clear assumed-unchanged bit"
msgstr ""
-#: builtin/update-index.c:1011
+#: builtin/update-index.c:1012
msgid "mark files as \"index-only\""
msgstr ""
-#: builtin/update-index.c:1014
+#: builtin/update-index.c:1015
msgid "clear skip-worktree bit"
msgstr ""
-#: builtin/update-index.c:1017
+#: builtin/update-index.c:1018
msgid "add to index only; do not add content to object database"
msgstr ""
-#: builtin/update-index.c:1019
+#: builtin/update-index.c:1020
msgid "remove named paths even if present in worktree"
msgstr ""
-#: builtin/update-index.c:1021
+#: builtin/update-index.c:1022
msgid "with --stdin: input lines are terminated by null bytes"
msgstr ""
-#: builtin/update-index.c:1023
+#: builtin/update-index.c:1024
msgid "read list of paths to be updated from standard input"
msgstr ""
-#: builtin/update-index.c:1027
+#: builtin/update-index.c:1028
msgid "add entries from standard input to the index"
msgstr ""
-#: builtin/update-index.c:1031
+#: builtin/update-index.c:1032
msgid "repopulate stages #2 and #3 for the listed paths"
msgstr ""
-#: builtin/update-index.c:1035
+#: builtin/update-index.c:1036
msgid "only update entries that differ from HEAD"
msgstr ""
-#: builtin/update-index.c:1039
+#: builtin/update-index.c:1040
msgid "ignore files missing from worktree"
msgstr ""
-#: builtin/update-index.c:1042
+#: builtin/update-index.c:1043
msgid "report actions to standard output"
msgstr ""
-#: builtin/update-index.c:1044
+#: builtin/update-index.c:1045
msgid "(for porcelains) forget saved unresolved conflicts"
msgstr ""
-#: builtin/update-index.c:1048
+#: builtin/update-index.c:1049
msgid "write index in this format"
msgstr ""
-#: builtin/update-index.c:1050
+#: builtin/update-index.c:1051
msgid "enable or disable split index"
msgstr ""
-#: builtin/update-index.c:1052
+#: builtin/update-index.c:1053
msgid "enable/disable untracked cache"
msgstr ""
-#: builtin/update-index.c:1054
+#: builtin/update-index.c:1055
msgid "test if the filesystem supports untracked cache"
msgstr ""
-#: builtin/update-index.c:1056
+#: builtin/update-index.c:1057
msgid "enable untracked cache without testing the filesystem"
msgstr ""
-#: builtin/update-index.c:1058
+#: builtin/update-index.c:1059
msgid "write out the index even if is not flagged as changed"
msgstr ""
-#: builtin/update-index.c:1060
+#: builtin/update-index.c:1061
msgid "enable or disable file system monitor"
msgstr ""
-#: builtin/update-index.c:1062
+#: builtin/update-index.c:1063
msgid "mark files as fsmonitor valid"
msgstr ""
-#: builtin/update-index.c:1065
+#: builtin/update-index.c:1066
msgid "clear fsmonitor valid bit"
msgstr ""
-#: builtin/update-index.c:1168
+#: builtin/update-index.c:1169
msgid ""
"core.splitIndex is set to false; remove or change it, if you really want to "
"enable split index"
msgstr ""
-#: builtin/update-index.c:1177
+#: builtin/update-index.c:1178
msgid ""
"core.splitIndex is set to true; remove or change it, if you really want to "
"disable split index"
msgstr ""
-#: builtin/update-index.c:1188
+#: builtin/update-index.c:1190
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:1192
+#: builtin/update-index.c:1194
msgid "Untracked cache disabled"
msgstr ""
-#: builtin/update-index.c:1200
+#: builtin/update-index.c:1202
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:1204
+#: builtin/update-index.c:1206
#, c-format
msgid "Untracked cache enabled for '%s'"
msgstr ""
-#: builtin/update-index.c:1212
+#: builtin/update-index.c:1214
msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
msgstr ""
-#: builtin/update-index.c:1216
+#: builtin/update-index.c:1218
msgid "fsmonitor enabled"
msgstr ""
-#: builtin/update-index.c:1219
+#: builtin/update-index.c:1221
msgid ""
"core.fsmonitor is set; remove it if you really want to disable fsmonitor"
msgstr ""
-#: builtin/update-index.c:1223
+#: builtin/update-index.c:1225
msgid "fsmonitor disabled"
msgstr ""
msgid "print tag contents"
msgstr ""
-#: builtin/worktree.c:18
+#: builtin/worktree.c:17
msgid "git worktree add [<options>] <path> [<commit-ish>]"
msgstr ""
-#: builtin/worktree.c:19
+#: builtin/worktree.c:18
msgid "git worktree list [<options>]"
msgstr ""
-#: builtin/worktree.c:20
+#: builtin/worktree.c:19
msgid "git worktree lock [<options>] <path>"
msgstr ""
-#: builtin/worktree.c:21
+#: builtin/worktree.c:20
msgid "git worktree move <worktree> <new-path>"
msgstr ""
-#: builtin/worktree.c:22
+#: builtin/worktree.c:21
msgid "git worktree prune [<options>]"
msgstr ""
-#: builtin/worktree.c:23
+#: builtin/worktree.c:22
msgid "git worktree remove [<options>] <worktree>"
msgstr ""
-#: builtin/worktree.c:24
+#: builtin/worktree.c:23
msgid "git worktree unlock <path>"
msgstr ""
-#: builtin/worktree.c:61 builtin/worktree.c:899
+#: builtin/worktree.c:60 builtin/worktree.c:898
#, c-format
msgid "failed to delete '%s'"
msgstr ""
-#: builtin/worktree.c:80
+#: builtin/worktree.c:79
#, c-format
msgid "Removing worktrees/%s: not a valid directory"
msgstr ""
-#: builtin/worktree.c:86
+#: builtin/worktree.c:85
#, c-format
msgid "Removing worktrees/%s: gitdir file does not exist"
msgstr ""
-#: builtin/worktree.c:91 builtin/worktree.c:100
+#: builtin/worktree.c:90 builtin/worktree.c:99
#, c-format
msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
msgstr ""
-#: builtin/worktree.c:110
+#: builtin/worktree.c:109
#, c-format
msgid ""
"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
"%<PRIuMAX>)"
msgstr ""
-#: builtin/worktree.c:118
+#: builtin/worktree.c:117
#, c-format
msgid "Removing worktrees/%s: invalid gitdir file"
msgstr ""
-#: builtin/worktree.c:127
+#: builtin/worktree.c:126
#, c-format
msgid "Removing worktrees/%s: gitdir file points to non-existent location"
msgstr ""
-#: builtin/worktree.c:166
+#: builtin/worktree.c:165
msgid "report pruned working trees"
msgstr ""
-#: builtin/worktree.c:168
+#: builtin/worktree.c:167
msgid "expire working trees older than <time>"
msgstr ""
-#: builtin/worktree.c:235
+#: builtin/worktree.c:234
#, c-format
msgid "'%s' already exists"
msgstr ""
-#: builtin/worktree.c:252
+#: builtin/worktree.c:251
#, c-format
msgid "unable to re-add worktree '%s'"
msgstr ""
-#: builtin/worktree.c:257
+#: 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:259
+#: 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
+#: builtin/worktree.c:308
#, c-format
msgid "could not create directory of '%s'"
msgstr ""
-#: builtin/worktree.c:440 builtin/worktree.c:446
+#: builtin/worktree.c:439 builtin/worktree.c:445
#, c-format
msgid "Preparing worktree (new branch '%s')"
msgstr ""
-#: builtin/worktree.c:442
+#: builtin/worktree.c:441
#, c-format
msgid "Preparing worktree (resetting branch '%s'; was at %s)"
msgstr ""
-#: builtin/worktree.c:451
+#: builtin/worktree.c:450
#, c-format
msgid "Preparing worktree (checking out '%s')"
msgstr ""
-#: builtin/worktree.c:457
+#: builtin/worktree.c:456
#, c-format
msgid "Preparing worktree (detached HEAD %s)"
msgstr ""
-#: builtin/worktree.c:498
+#: builtin/worktree.c:497
msgid "checkout <branch> even if already checked out in other worktree"
msgstr ""
-#: builtin/worktree.c:501
+#: builtin/worktree.c:500
msgid "create a new branch"
msgstr ""
-#: builtin/worktree.c:503
+#: builtin/worktree.c:502
msgid "create or reset a branch"
msgstr ""
-#: builtin/worktree.c:505
+#: builtin/worktree.c:504
msgid "populate the new working tree"
msgstr ""
-#: builtin/worktree.c:506
+#: builtin/worktree.c:505
msgid "keep the new working tree locked"
msgstr ""
-#: builtin/worktree.c:509
+#: builtin/worktree.c:508
msgid "set up tracking mode (see git-branch(1))"
msgstr ""
-#: builtin/worktree.c:512
+#: builtin/worktree.c:511
msgid "try to match the new branch name with a remote-tracking branch"
msgstr ""
-#: builtin/worktree.c:520
+#: builtin/worktree.c:519
msgid "-b, -B, and --detach are mutually exclusive"
msgstr ""
-#: builtin/worktree.c:581
+#: builtin/worktree.c:580
msgid "--[no-]track can only be used if a new branch is created"
msgstr ""
-#: builtin/worktree.c:681
+#: builtin/worktree.c:680
msgid "reason for locking"
msgstr ""
-#: builtin/worktree.c:693 builtin/worktree.c:726 builtin/worktree.c:800
-#: builtin/worktree.c:927
+#: builtin/worktree.c:692 builtin/worktree.c:725 builtin/worktree.c:799
+#: builtin/worktree.c:926
#, c-format
msgid "'%s' is not a working tree"
msgstr ""
-#: builtin/worktree.c:695 builtin/worktree.c:728
+#: builtin/worktree.c:694 builtin/worktree.c:727
msgid "The main working tree cannot be locked or unlocked"
msgstr ""
-#: builtin/worktree.c:700
+#: builtin/worktree.c:699
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr ""
-#: builtin/worktree.c:702
+#: builtin/worktree.c:701
#, c-format
msgid "'%s' is already locked"
msgstr ""
-#: builtin/worktree.c:730
+#: builtin/worktree.c:729
#, c-format
msgid "'%s' is not locked"
msgstr ""
-#: builtin/worktree.c:771
+#: builtin/worktree.c:770
msgid "working trees containing submodules cannot be moved or removed"
msgstr ""
-#: builtin/worktree.c:779
+#: builtin/worktree.c:778
msgid "force move even if worktree is dirty or locked"
msgstr ""
-#: builtin/worktree.c:802 builtin/worktree.c:929
+#: builtin/worktree.c:801 builtin/worktree.c:928
#, c-format
msgid "'%s' is a main working tree"
msgstr ""
-#: builtin/worktree.c:807
+#: builtin/worktree.c:806
#, c-format
msgid "could not figure out destination name from '%s'"
msgstr ""
-#: builtin/worktree.c:813
+#: builtin/worktree.c:812
#, c-format
msgid "target '%s' already exists"
msgstr ""
-#: builtin/worktree.c:821
+#: builtin/worktree.c:820
#, 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:823
+#: builtin/worktree.c:822
msgid ""
"cannot move a locked working tree;\n"
"use 'move -f -f' to override or unlock first"
msgstr ""
-#: builtin/worktree.c:826
+#: builtin/worktree.c:825
#, c-format
msgid "validation failed, cannot move working tree: %s"
msgstr ""
-#: builtin/worktree.c:831
+#: builtin/worktree.c:830
#, c-format
msgid "failed to move '%s' to '%s'"
msgstr ""
-#: builtin/worktree.c:879
+#: builtin/worktree.c:878
#, c-format
msgid "failed to run 'git status' on '%s'"
msgstr ""
-#: builtin/worktree.c:883
+#: builtin/worktree.c:882
#, c-format
-msgid "'%s' is dirty, use --force to delete it"
+msgid "'%s' contains modified or untracked files, use --force to delete it"
msgstr ""
-#: builtin/worktree.c:888
+#: builtin/worktree.c:887
#, c-format
msgid "failed to run 'git status' on '%s', code %d"
msgstr ""
-#: builtin/worktree.c:911
+#: builtin/worktree.c:910
msgid "force removal even if worktree is dirty or locked"
msgstr ""
-#: builtin/worktree.c:934
+#: builtin/worktree.c:933
#, c-format
msgid ""
"cannot remove a locked working tree, lock reason: %s\n"
"use 'remove -f -f' to override or unlock first"
msgstr ""
-#: builtin/worktree.c:936
+#: builtin/worktree.c:935
msgid ""
"cannot remove a locked working tree;\n"
"use 'remove -f -f' to override or unlock first"
msgstr ""
-#: builtin/worktree.c:939
+#: builtin/worktree.c:938
#, c-format
msgid "validation failed, cannot remove working tree: %s"
msgstr ""
msgid "only useful for debugging"
msgstr ""
+#: fast-import.c:3118
+#, c-format
+msgid "Expected 'mark' command, got %s"
+msgstr ""
+
+#: fast-import.c:3123
+#, c-format
+msgid "Expected 'to' command, got %s"
+msgstr ""
+
#: credential-cache--daemon.c:223
#, c-format
msgid ""
"You can use '!git' in the alias to do this"
msgstr ""
-#: git.c:377
+#: git.c:376
#, c-format
msgid "empty alias for %s"
msgstr ""
-#: git.c:380
+#: git.c:379
#, c-format
msgid "recursive alias: %s"
msgstr ""
-#: git.c:460
+#: git.c:459
msgid "write failure on standard output"
msgstr ""
-#: git.c:462
+#: git.c:461
msgid "unknown write failure on standard output"
msgstr ""
-#: git.c:464
+#: git.c:463
msgid "close failed on standard output"
msgstr ""
-#: git.c:793
+#: git.c:792
#, c-format
msgid "alias loop detected: expansion of '%s' does not terminate:%s"
msgstr ""
-#: git.c:843
+#: git.c:842
#, c-format
msgid "cannot handle %s as a builtin"
msgstr ""
-#: git.c:856
+#: git.c:855
#, c-format
msgid ""
"usage: %s\n"
"\n"
msgstr ""
-#: git.c:876
+#: git.c:875
#, c-format
msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
msgstr ""
-#: git.c:888
+#: git.c:887
#, c-format
msgid "failed to run command '%s': %s\n"
msgstr ""
msgid "Public key pinning not supported with cURL < 7.44.0"
msgstr ""
-#: http.c:876
+#: http.c:878
msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
msgstr ""
-#: http.c:949
+#: http.c:951
msgid "Protocol restrictions not supported with cURL < 7.19.4"
msgstr ""
-#: http.c:1085
+#: http.c:1088
#, c-format
msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
msgstr ""
-#: http.c:1092
+#: http.c:1095
#, c-format
msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
msgstr ""
-#: http.c:1096
+#: http.c:1099
#, c-format
msgid "Could not set SSL backend to '%s': already set"
msgstr ""
-#: http.c:1965
+#: http.c:1968
#, c-format
msgid ""
"unable to update url base from redirection:\n"
msgid "protocol error: expected sha/ref, got '%s'"
msgstr ""
-#: remote-curl.c:1138 remote-curl.c:1252
+#: remote-curl.c:1138 remote-curl.c:1250
#, c-format
msgid "http transport does not support %s"
msgstr ""
msgid "git-http-push failed"
msgstr ""
-#: remote-curl.c:1360
+#: remote-curl.c:1356
msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
msgstr ""
-#: remote-curl.c:1392
+#: remote-curl.c:1388
msgid "remote-curl: error reading command stream from git"
msgstr ""
-#: remote-curl.c:1399
+#: remote-curl.c:1395
msgid "remote-curl: fetch attempted without a local repo"
msgstr ""
-#: remote-curl.c:1439
+#: remote-curl.c:1435
#, c-format
msgid "remote-curl: unknown command '%s' from git"
msgstr ""
-#: list-objects-filter-options.h:61
+#: list-objects-filter-options.h:85
msgid "args"
msgstr ""
-#: list-objects-filter-options.h:62
+#: list-objects-filter-options.h:86
msgid "object filtering"
msgstr ""
-#: parse-options.h:170
+#: parse-options.h:179
msgid "expiry-date"
msgstr ""
-#: parse-options.h:184
+#: parse-options.h:193
msgid "no-op (backward compatibility)"
msgstr ""
projects / thirdparty / git.git / commitdiff
