msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2017-07-24 21:54+0800\n"
+"POT-Creation-Date: 2017-10-17 09:44+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:117 builtin/merge.c:1184
+#: advice.c:117 builtin/merge.c:1211
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr ""
msgid "unrecognized whitespace ignore option '%s'"
msgstr ""
-#: apply.c:126
+#: apply.c:125
msgid "--reject and --3way cannot be used together."
msgstr ""
-#: apply.c:128
+#: apply.c:127
msgid "--cached and --3way cannot be used together."
msgstr ""
-#: apply.c:131
+#: apply.c:130
msgid "--3way outside a repository"
msgstr ""
-#: apply.c:142
+#: apply.c:141
msgid "--index outside a repository"
msgstr ""
-#: apply.c:145
+#: apply.c:144
msgid "--cached outside a repository"
msgstr ""
-#: apply.c:836
+#: apply.c:845
#, c-format
msgid "Cannot prepare timestamp regexp %s"
msgstr ""
-#: apply.c:845
+#: apply.c:854
#, c-format
msgid "regexec returned %d for input: %s"
msgstr ""
-#: apply.c:929
+#: apply.c:928
#, c-format
msgid "unable to find filename in patch at line %d"
msgstr ""
-#: apply.c:967
+#: apply.c:966
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
msgstr ""
-#: apply.c:973
+#: apply.c:972
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr ""
-#: apply.c:974
+#: apply.c:973
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr ""
-#: apply.c:979
+#: apply.c:978
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr ""
-#: apply.c:1008
+#: apply.c:1007
#, c-format
msgid "invalid mode on line %d: %s"
msgstr ""
-#: apply.c:1326
+#: apply.c:1325
#, c-format
msgid "inconsistent header lines %d and %d"
msgstr ""
-#: apply.c:1498
+#: apply.c:1497
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr ""
-#: apply.c:1567
+#: apply.c:1566
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr ""
-#: apply.c:1587
+#: apply.c:1586
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
msgstr[0] ""
msgstr[1] ""
-#: apply.c:1600
+#: apply.c:1599
#, c-format
msgid "git diff header lacks filename information (line %d)"
msgstr ""
-#: apply.c:1770
+#: apply.c:1787
msgid "new file depends on old contents"
msgstr ""
-#: apply.c:1772
+#: apply.c:1789
msgid "deleted file still has contents"
msgstr ""
-#: apply.c:1806
+#: apply.c:1823
#, c-format
msgid "corrupt patch at line %d"
msgstr ""
-#: apply.c:1843
+#: apply.c:1860
#, c-format
msgid "new file %s depends on old contents"
msgstr ""
-#: apply.c:1845
+#: apply.c:1862
#, c-format
msgid "deleted file %s still has contents"
msgstr ""
-#: apply.c:1848
+#: apply.c:1865
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr ""
-#: apply.c:1995
+#: apply.c:2012
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr ""
-#: apply.c:2032
+#: apply.c:2049
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr ""
-#: apply.c:2193
+#: apply.c:2209
#, c-format
msgid "patch with only garbage at line %d"
msgstr ""
-#: apply.c:2276
+#: apply.c:2295
#, c-format
msgid "unable to read symlink %s"
msgstr ""
-#: apply.c:2280
+#: apply.c:2299
#, c-format
msgid "unable to open or read %s"
msgstr ""
-#: apply.c:2933
+#: apply.c:2958
#, c-format
msgid "invalid start of line: '%c'"
msgstr ""
-#: apply.c:3052
+#: apply.c:3077
#, 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:3064
+#: apply.c:3089
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr ""
-#: apply.c:3070
+#: apply.c:3095
#, c-format
msgid ""
"while searching for:\n"
"%.*s"
msgstr ""
-#: apply.c:3092
+#: apply.c:3117
#, c-format
msgid "missing binary patch data for '%s'"
msgstr ""
-#: apply.c:3100
+#: apply.c:3125
#, c-format
msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
msgstr ""
-#: apply.c:3146
+#: apply.c:3171
#, c-format
msgid "cannot apply binary patch to '%s' without full index line"
msgstr ""
-#: apply.c:3156
+#: apply.c:3181
#, c-format
msgid ""
"the patch applies to '%s' (%s), which does not match the current contents."
msgstr ""
-#: apply.c:3164
+#: apply.c:3189
#, c-format
msgid "the patch applies to an empty '%s' but it is not empty"
msgstr ""
-#: apply.c:3182
+#: apply.c:3207
#, c-format
msgid "the necessary postimage %s for '%s' cannot be read"
msgstr ""
-#: apply.c:3195
+#: apply.c:3220
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr ""
-#: apply.c:3201
+#: apply.c:3226
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr ""
-#: apply.c:3222
+#: apply.c:3247
#, c-format
msgid "patch failed: %s:%ld"
msgstr ""
-#: apply.c:3344
+#: apply.c:3369
#, c-format
msgid "cannot checkout %s"
msgstr ""
-#: apply.c:3392 apply.c:3403 apply.c:3449 setup.c:277
+#: apply.c:3418 apply.c:3429 apply.c:3475 setup.c:277
#, c-format
msgid "failed to read %s"
msgstr ""
-#: apply.c:3400
+#: apply.c:3426
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr ""
-#: apply.c:3429 apply.c:3669
+#: apply.c:3455 apply.c:3695
#, c-format
msgid "path %s has been renamed/deleted"
msgstr ""
-#: apply.c:3512 apply.c:3683
+#: apply.c:3538 apply.c:3709
#, c-format
msgid "%s: does not exist in index"
msgstr ""
-#: apply.c:3521 apply.c:3691
+#: apply.c:3547 apply.c:3717
#, c-format
msgid "%s: does not match index"
msgstr ""
-#: apply.c:3556
+#: apply.c:3582
msgid "repository lacks the necessary blob to fall back on 3-way merge."
msgstr ""
-#: apply.c:3559
+#: apply.c:3585
#, c-format
msgid "Falling back to three-way merge...\n"
msgstr ""
-#: apply.c:3575 apply.c:3579
+#: apply.c:3601 apply.c:3605
#, c-format
msgid "cannot read the current contents of '%s'"
msgstr ""
-#: apply.c:3591
+#: apply.c:3617
#, c-format
msgid "Failed to fall back on three-way merge...\n"
msgstr ""
-#: apply.c:3605
+#: apply.c:3631
#, c-format
msgid "Applied patch to '%s' with conflicts.\n"
msgstr ""
-#: apply.c:3610
+#: apply.c:3636
#, c-format
msgid "Applied patch to '%s' cleanly.\n"
msgstr ""
-#: apply.c:3636
+#: apply.c:3662
msgid "removal patch leaves file contents"
msgstr ""
-#: apply.c:3708
+#: apply.c:3734
#, c-format
msgid "%s: wrong type"
msgstr ""
-#: apply.c:3710
+#: apply.c:3736
#, c-format
msgid "%s has type %o, expected %o"
msgstr ""
-#: apply.c:3860 apply.c:3862
+#: apply.c:3886 apply.c:3888
#, c-format
msgid "invalid path '%s'"
msgstr ""
-#: apply.c:3918
+#: apply.c:3944
#, c-format
msgid "%s: already exists in index"
msgstr ""
-#: apply.c:3921
+#: apply.c:3947
#, c-format
msgid "%s: already exists in working directory"
msgstr ""
-#: apply.c:3941
+#: apply.c:3967
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr ""
-#: apply.c:3946
+#: apply.c:3972
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr ""
-#: apply.c:3966
+#: apply.c:3992
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr ""
-#: apply.c:3970
+#: apply.c:3996
#, c-format
msgid "%s: patch does not apply"
msgstr ""
-#: apply.c:3985
+#: apply.c:4011
#, c-format
msgid "Checking patch %s..."
msgstr ""
-#: apply.c:4076
+#: apply.c:4102
#, c-format
msgid "sha1 information is lacking or useless for submodule %s"
msgstr ""
-#: apply.c:4083
+#: apply.c:4109
#, c-format
msgid "mode change for %s, which is not in current HEAD"
msgstr ""
-#: apply.c:4086
+#: apply.c:4112
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr ""
-#: apply.c:4091 builtin/checkout.c:235 builtin/reset.c:138
+#: apply.c:4117 builtin/checkout.c:235 builtin/reset.c:148
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr ""
-#: apply.c:4095
+#: apply.c:4121
#, c-format
msgid "could not add %s to temporary index"
msgstr ""
-#: apply.c:4105
+#: apply.c:4131
#, c-format
msgid "could not write temporary index to %s"
msgstr ""
-#: apply.c:4243
+#: apply.c:4269
#, c-format
msgid "unable to remove %s from index"
msgstr ""
-#: apply.c:4278
+#: apply.c:4304
#, c-format
msgid "corrupt patch for submodule %s"
msgstr ""
-#: apply.c:4284
+#: apply.c:4310
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr ""
-#: apply.c:4292
+#: apply.c:4318
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr ""
-#: apply.c:4298 apply.c:4442
+#: apply.c:4324 apply.c:4468
#, c-format
msgid "unable to add cache entry for %s"
msgstr ""
-#: apply.c:4339
+#: apply.c:4365
#, c-format
msgid "failed to write to '%s'"
msgstr ""
-#: apply.c:4343
+#: apply.c:4369
#, c-format
msgid "closing file '%s'"
msgstr ""
-#: apply.c:4413
+#: apply.c:4439
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr ""
-#: apply.c:4511
+#: apply.c:4537
#, c-format
msgid "Applied patch %s cleanly."
msgstr ""
-#: apply.c:4519
+#: apply.c:4545
msgid "internal error"
msgstr ""
-#: apply.c:4522
+#: apply.c:4548
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] ""
msgstr[1] ""
-#: apply.c:4533
+#: apply.c:4559
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr ""
-#: apply.c:4541 builtin/fetch.c:738 builtin/fetch.c:988
+#: apply.c:4567 builtin/fetch.c:760 builtin/fetch.c:1010
#, c-format
msgid "cannot open %s"
msgstr ""
-#: apply.c:4555
+#: apply.c:4581
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr ""
-#: apply.c:4559
+#: apply.c:4585
#, c-format
msgid "Rejected hunk #%d."
msgstr ""
-#: apply.c:4669
+#: apply.c:4695
#, c-format
msgid "Skipped patch '%s'."
msgstr ""
-#: apply.c:4677
+#: apply.c:4703
msgid "unrecognized input"
msgstr ""
-#: apply.c:4696
+#: apply.c:4722
msgid "unable to read index file"
msgstr ""
-#: apply.c:4833
+#: apply.c:4859
#, c-format
msgid "can't open patch '%s': %s"
msgstr ""
-#: apply.c:4860
+#: apply.c:4886
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] ""
msgstr[1] ""
-#: apply.c:4866 apply.c:4881
+#: apply.c:4892 apply.c:4907
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgstr[0] ""
msgstr[1] ""
-#: apply.c:4874
+#: apply.c:4900
#, 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:4890 builtin/add.c:513 builtin/mv.c:299 builtin/rm.c:391
+#: apply.c:4916 builtin/add.c:515 builtin/mv.c:298 builtin/rm.c:390
msgid "Unable to write new index file"
msgstr ""
-#: apply.c:4921 apply.c:4924 builtin/am.c:2257 builtin/am.c:2260
-#: builtin/clone.c:115 builtin/fetch.c:93 builtin/pull.c:187
-#: builtin/submodule--helper.c:304 builtin/submodule--helper.c:629
-#: builtin/submodule--helper.c:632 builtin/submodule--helper.c:973
-#: builtin/submodule--helper.c:976 builtin/submodule--helper.c:1161
+#: apply.c:4947 apply.c:4950 builtin/am.c:2256 builtin/am.c:2259
+#: builtin/clone.c:116 builtin/fetch.c:115 builtin/pull.c:187
+#: builtin/submodule--helper.c:301 builtin/submodule--helper.c:622
+#: builtin/submodule--helper.c:625 builtin/submodule--helper.c:992
+#: builtin/submodule--helper.c:995 builtin/submodule--helper.c:1212
#: git-add--interactive.perl:197
msgid "path"
msgstr ""
-#: apply.c:4922
+#: apply.c:4948
msgid "don't apply changes matching the given path"
msgstr ""
-#: apply.c:4925
+#: apply.c:4951
msgid "apply changes matching the given path"
msgstr ""
-#: apply.c:4927 builtin/am.c:2266
+#: apply.c:4953 builtin/am.c:2265
msgid "num"
msgstr ""
-#: apply.c:4928
+#: apply.c:4954
msgid "remove <num> leading slashes from traditional diff paths"
msgstr ""
-#: apply.c:4931
+#: apply.c:4957
msgid "ignore additions made by the patch"
msgstr ""
-#: apply.c:4933
+#: apply.c:4959
msgid "instead of applying the patch, output diffstat for the input"
msgstr ""
-#: apply.c:4937
+#: apply.c:4963
msgid "show number of added and deleted lines in decimal notation"
msgstr ""
-#: apply.c:4939
+#: apply.c:4965
msgid "instead of applying the patch, output a summary for the input"
msgstr ""
-#: apply.c:4941
+#: apply.c:4967
msgid "instead of applying the patch, see if the patch is applicable"
msgstr ""
-#: apply.c:4943
+#: apply.c:4969
msgid "make sure the patch is applicable to the current index"
msgstr ""
-#: apply.c:4945
+#: apply.c:4971
msgid "apply a patch without touching the working tree"
msgstr ""
-#: apply.c:4947
+#: apply.c:4973
msgid "accept a patch that touches outside the working area"
msgstr ""
-#: apply.c:4949
+#: apply.c:4975
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr ""
-#: apply.c:4951
+#: apply.c:4977
msgid "attempt three-way merge if a patch does not apply"
msgstr ""
-#: apply.c:4953
+#: apply.c:4979
msgid "build a temporary index based on embedded index information"
msgstr ""
-#: apply.c:4956 builtin/checkout-index.c:170 builtin/ls-files.c:515
+#: apply.c:4982 builtin/checkout-index.c:170 builtin/ls-files.c:513
msgid "paths are separated with NUL character"
msgstr ""
-#: apply.c:4958
+#: apply.c:4984
msgid "ensure at least <n> lines of context match"
msgstr ""
-#: apply.c:4959 builtin/am.c:2245
+#: apply.c:4985 builtin/am.c:2244 builtin/interpret-trailers.c:95
+#: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99
msgid "action"
msgstr ""
-#: apply.c:4960
+#: apply.c:4986
msgid "detect new or modified lines that have whitespace errors"
msgstr ""
-#: apply.c:4963 apply.c:4966
+#: apply.c:4989 apply.c:4992
msgid "ignore changes in whitespace when finding context"
msgstr ""
-#: apply.c:4969
+#: apply.c:4995
msgid "apply the patch in reverse"
msgstr ""
-#: apply.c:4971
+#: apply.c:4997
msgid "don't expect at least one line of context"
msgstr ""
-#: apply.c:4973
+#: apply.c:4999
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr ""
-#: apply.c:4975
+#: apply.c:5001
msgid "allow overlapping hunks"
msgstr ""
-#: apply.c:4976 builtin/add.c:270 builtin/check-ignore.c:21
-#: builtin/commit.c:1340 builtin/count-objects.c:95 builtin/fsck.c:651
-#: builtin/log.c:1877 builtin/mv.c:123 builtin/read-tree.c:125
+#: apply.c:5002 builtin/add.c:272 builtin/check-ignore.c:21
+#: builtin/commit.c:1347 builtin/count-objects.c:96 builtin/fsck.c:640
+#: builtin/log.c:1889 builtin/mv.c:123 builtin/read-tree.c:125
msgid "be verbose"
msgstr ""
-#: apply.c:4978
+#: apply.c:5004
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr ""
-#: apply.c:4981
+#: apply.c:5007
msgid "do not trust the line counts in the hunk headers"
msgstr ""
-#: apply.c:4983 builtin/am.c:2254
+#: apply.c:5009 builtin/am.c:2253
msgid "root"
msgstr ""
-#: apply.c:4984
+#: apply.c:5010
msgid "prepend <root> to all filenames"
msgstr ""
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr ""
-#: archive.c:333 builtin/add.c:154 builtin/add.c:492 builtin/rm.c:300
+#: archive.c:351 builtin/add.c:156 builtin/add.c:494 builtin/rm.c:299
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr ""
-#: archive.c:418
+#: archive.c:436
msgid "fmt"
msgstr ""
-#: archive.c:418
+#: archive.c:436
msgid "archive format"
msgstr ""
-#: archive.c:419 builtin/log.c:1446
+#: archive.c:437 builtin/log.c:1452
msgid "prefix"
msgstr ""
-#: archive.c:420
+#: archive.c:438
msgid "prepend prefix to each pathname in the archive"
msgstr ""
-#: archive.c:421 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:61
-#: builtin/fast-export.c:989 builtin/fast-export.c:991 builtin/grep.c:1080
-#: builtin/hash-object.c:102 builtin/ls-files.c:549 builtin/ls-files.c:552
-#: builtin/notes.c:404 builtin/notes.c:567 builtin/read-tree.c:120
+#: archive.c:439 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:61
+#: builtin/fast-export.c:1005 builtin/fast-export.c:1007 builtin/grep.c:859
+#: builtin/hash-object.c:102 builtin/ls-files.c:547 builtin/ls-files.c:550
+#: builtin/notes.c:405 builtin/notes.c:568 builtin/read-tree.c:120
#: parse-options.h:153
msgid "file"
msgstr ""
-#: archive.c:422 builtin/archive.c:89
+#: archive.c:440 builtin/archive.c:89
msgid "write the archive to this file"
msgstr ""
-#: archive.c:424
+#: archive.c:442
msgid "read .gitattributes in working directory"
msgstr ""
-#: archive.c:425
+#: archive.c:443
msgid "report archived files on stderr"
msgstr ""
-#: archive.c:426
+#: archive.c:444
msgid "store only"
msgstr ""
-#: archive.c:427
+#: archive.c:445
msgid "compress faster"
msgstr ""
-#: archive.c:435
+#: archive.c:453
msgid "compress better"
msgstr ""
-#: archive.c:438
+#: archive.c:456
msgid "list supported archive formats"
msgstr ""
-#: archive.c:440 builtin/archive.c:90 builtin/clone.c:105 builtin/clone.c:108
-#: builtin/submodule--helper.c:641 builtin/submodule--helper.c:982
+#: archive.c:458 builtin/archive.c:90 builtin/clone.c:106 builtin/clone.c:109
+#: builtin/submodule--helper.c:634 builtin/submodule--helper.c:1001
msgid "repo"
msgstr ""
-#: archive.c:441 builtin/archive.c:91
+#: archive.c:459 builtin/archive.c:91
msgid "retrieve the archive from remote repository <repo>"
msgstr ""
-#: archive.c:442 builtin/archive.c:92 builtin/notes.c:488
+#: archive.c:460 builtin/archive.c:92 builtin/notes.c:489
msgid "command"
msgstr ""
-#: archive.c:443 builtin/archive.c:93
+#: archive.c:461 builtin/archive.c:93
msgid "path to the remote git-upload-archive command"
msgstr ""
-#: archive.c:450
+#: archive.c:468
msgid "Unexpected option --remote"
msgstr ""
-#: archive.c:452
+#: archive.c:470
msgid "Option --exec can only be used together with --remote"
msgstr ""
-#: archive.c:454
+#: archive.c:472
msgid "Unexpected option --output"
msgstr ""
-#: archive.c:476
+#: archive.c:494
#, c-format
msgid "Unknown archive format '%s'"
msgstr ""
-#: archive.c:483
+#: archive.c:501
#, c-format
msgid "Argument not supported for format '%s': -%d"
msgstr ""
-#: attr.c:214
+#: attr.c:218
#, c-format
msgid "%.*s is not a valid attribute name"
msgstr ""
-#: attr.c:410
+#: attr.c:415
msgid ""
"Negative patterns are ignored in git attributes\n"
"Use '\\!' for literal leading exclamation."
msgid "Bisecting: a merge base must be tested\n"
msgstr ""
-#: bisect.c:849
+#: bisect.c:850
#, c-format
msgid "a %s revision is needed"
msgstr ""
-#: bisect.c:866 builtin/notes.c:175 builtin/tag.c:256
+#: bisect.c:867 builtin/notes.c:175 builtin/tag.c:234
#, c-format
msgid "could not create file '%s'"
msgstr ""
-#: bisect.c:917
+#: bisect.c:918
#, c-format
msgid "could not read file '%s'"
msgstr ""
-#: bisect.c:947
+#: bisect.c:948
msgid "reading bisect refs failed"
msgstr ""
-#: bisect.c:967
+#: bisect.c:968
#, c-format
msgid "%s was both %s and %s\n"
msgstr ""
-#: bisect.c:975
+#: bisect.c:976
#, c-format
msgid ""
"No testable commit found.\n"
"Maybe you started with bad path parameters?\n"
msgstr ""
-#: bisect.c:994
+#: bisect.c:995
#, c-format
msgid "(roughly %d step)"
msgid_plural "(roughly %d steps)"
#. TRANSLATORS: the last %s will be replaced with "(roughly %d
#. steps)" translation.
#.
-#: bisect.c:1000
+#: bisect.c:1001
#, c-format
msgid "Bisecting: %d revision left to test after this %s\n"
msgid_plural "Bisecting: %d revisions left to test after this %s\n"
msgid "--reverse and --first-parent together require specified latest commit"
msgstr ""
-#: blame.c:1797 bundle.c:164 ref-filter.c:1919 sequencer.c:1166
-#: sequencer.c:2328 builtin/commit.c:1058 builtin/log.c:356 builtin/log.c:907
-#: builtin/log.c:1357 builtin/log.c:1683 builtin/log.c:1926 builtin/merge.c:360
-#: builtin/shortlog.c:177
+#: blame.c:1797 bundle.c:169 ref-filter.c:1947 sequencer.c:1168
+#: sequencer.c:2351 builtin/commit.c:1065 builtin/log.c:357 builtin/log.c:911
+#: builtin/log.c:1361 builtin/log.c:1690 builtin/log.c:1938 builtin/merge.c:369
+#: builtin/shortlog.c:191
msgid "revision walk setup failed"
msgstr ""
#: branch.c:93
#, c-format
-msgid "Branch %s set up to track remote branch %s from %s by rebasing."
+msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
msgstr ""
#: branch.c:94
#, c-format
-msgid "Branch %s set up to track remote branch %s from %s."
+msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
msgstr ""
#: branch.c:98
#, c-format
-msgid "Branch %s set up to track local branch %s by rebasing."
+msgid "Branch '%s' set up to track local branch '%s' by rebasing."
msgstr ""
#: branch.c:99
#, c-format
-msgid "Branch %s set up to track local branch %s."
+msgid "Branch '%s' set up to track local branch '%s'."
msgstr ""
#: branch.c:104
#, c-format
-msgid "Branch %s set up to track remote ref %s by rebasing."
+msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
msgstr ""
#: branch.c:105
#, c-format
-msgid "Branch %s set up to track remote ref %s."
+msgid "Branch '%s' set up to track remote ref '%s'."
msgstr ""
#: branch.c:109
#, c-format
-msgid "Branch %s set up to track local ref %s by rebasing."
+msgid "Branch '%s' set up to track local ref '%s' by rebasing."
msgstr ""
#: branch.c:110
#, c-format
-msgid "Branch %s set up to track local ref %s."
+msgid "Branch '%s' set up to track local ref '%s'."
msgstr ""
#: branch.c:119
msgid "A branch named '%s' already exists."
msgstr ""
-#: branch.c:198
+#: branch.c:197
msgid "Cannot force update the current branch."
msgstr ""
-#: branch.c:218
+#: branch.c:217
#, c-format
msgid "Cannot setup tracking information; starting point '%s' is not a branch."
msgstr ""
-#: branch.c:220
+#: branch.c:219
#, c-format
msgid "the requested upstream branch '%s' does not exist"
msgstr ""
-#: branch.c:222
+#: branch.c:221
msgid ""
"\n"
"If you are planning on basing your work on an upstream\n"
"\"git push -u\" to set the upstream config as you push."
msgstr ""
-#: branch.c:265
+#: branch.c:264
#, c-format
msgid "Not a valid object name: '%s'."
msgstr ""
-#: branch.c:285
+#: branch.c:284
#, c-format
msgid "Ambiguous object name: '%s'."
msgstr ""
-#: branch.c:290
+#: branch.c:289
#, c-format
msgid "Not a valid branch point: '%s'."
msgstr ""
-#: branch.c:344
+#: branch.c:343
#, c-format
msgid "'%s' is already checked out at '%s'"
msgstr ""
msgid "unrecognized header: %s%s (%d)"
msgstr ""
-#: bundle.c:88 sequencer.c:1344 sequencer.c:1770 builtin/commit.c:778
+#: bundle.c:88 sequencer.c:1346 sequencer.c:1793 sequencer.c:2500
+#: sequencer.c:2583 sequencer.c:2609 sequencer.c:2687 sequencer.c:2807
+#: sequencer.c:2949 builtin/commit.c:782
#, c-format
msgid "could not open '%s'"
msgstr ""
msgid "Repository lacks these prerequisite commits:"
msgstr ""
-#: bundle.c:186
+#: bundle.c:193
#, c-format
msgid "The bundle contains this ref:"
msgid_plural "The bundle contains these %d refs:"
msgstr[0] ""
msgstr[1] ""
-#: bundle.c:193
+#: bundle.c:200
msgid "The bundle records a complete history."
msgstr ""
-#: bundle.c:195
+#: bundle.c:202
#, c-format
msgid "The bundle requires this ref:"
msgid_plural "The bundle requires these %d refs:"
msgstr[0] ""
msgstr[1] ""
-#: bundle.c:254
+#: bundle.c:261
msgid "Could not spawn pack-objects"
msgstr ""
-#: bundle.c:265
+#: bundle.c:272
msgid "pack-objects died"
msgstr ""
-#: bundle.c:307
+#: bundle.c:314
msgid "rev-list died"
msgstr ""
-#: bundle.c:356
+#: bundle.c:363
#, c-format
msgid "ref '%s' is excluded by the rev-list options"
msgstr ""
-#: bundle.c:446 builtin/log.c:173 builtin/log.c:1589 builtin/shortlog.c:282
+#: bundle.c:453 builtin/log.c:174 builtin/log.c:1597 builtin/shortlog.c:296
#, c-format
msgid "unrecognized argument: %s"
msgstr ""
-#: bundle.c:454
+#: bundle.c:461
msgid "Refusing to create empty bundle."
msgstr ""
-#: bundle.c:466
+#: bundle.c:473
#, c-format
msgid "cannot create '%s'"
msgstr ""
-#: bundle.c:494
+#: bundle.c:501
msgid "index-pack died"
msgstr ""
msgid "invalid color value: %.*s"
msgstr ""
-#: commit.c:41 sequencer.c:1582 builtin/am.c:420 builtin/am.c:456
-#: builtin/am.c:1469 builtin/am.c:2107
+#: commit.c:41 sequencer.c:1600 builtin/am.c:421 builtin/am.c:465
+#: builtin/am.c:1467 builtin/am.c:2105
#, c-format
msgid "could not parse %s"
msgstr ""
msgid "%s %s is not a commit!"
msgstr ""
-#: commit.c:1511
+#: commit.c:1517
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 "memory exhausted"
msgstr ""
-#: config.c:186
+#: config.c:187
msgid "relative config include conditionals must come from files"
msgstr ""
-#: config.c:720
+#: config.c:721
#, c-format
msgid "bad config line %d in blob %s"
msgstr ""
-#: config.c:724
+#: config.c:725
#, c-format
msgid "bad config line %d in file %s"
msgstr ""
-#: config.c:728
+#: config.c:729
#, c-format
msgid "bad config line %d in standard input"
msgstr ""
-#: config.c:732
+#: config.c:733
#, c-format
msgid "bad config line %d in submodule-blob %s"
msgstr ""
-#: config.c:736
+#: config.c:737
#, c-format
msgid "bad config line %d in command line %s"
msgstr ""
-#: config.c:740
+#: config.c:741
#, c-format
msgid "bad config line %d in %s"
msgstr ""
-#: config.c:868
+#: config.c:869
msgid "out of range"
msgstr ""
-#: config.c:868
+#: config.c:869
msgid "invalid unit"
msgstr ""
-#: config.c:874
+#: config.c:875
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
msgstr ""
-#: config.c:879
+#: config.c:880
#, c-format
msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
msgstr ""
-#: config.c:882
+#: config.c:883
#, c-format
msgid "bad numeric config value '%s' for '%s' in file %s: %s"
msgstr ""
-#: config.c:885
+#: config.c:886
#, c-format
msgid "bad numeric config value '%s' for '%s' in standard input: %s"
msgstr ""
-#: config.c:888
+#: config.c:889
#, c-format
msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
msgstr ""
-#: config.c:891
+#: config.c:892
#, c-format
msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
msgstr ""
-#: config.c:894
+#: config.c:895
#, c-format
msgid "bad numeric config value '%s' for '%s' in %s: %s"
msgstr ""
-#: config.c:989
+#: config.c:990
#, c-format
msgid "failed to expand user dir in: '%s'"
msgstr ""
-#: config.c:1084 config.c:1095
+#: config.c:1085 config.c:1096
#, c-format
msgid "bad zlib compression level %d"
msgstr ""
-#: config.c:1212
+#: config.c:1213
#, c-format
msgid "invalid mode for object creation: %s"
msgstr ""
-#: config.c:1368
+#: config.c:1372
#, c-format
msgid "bad pack compression level %d"
msgstr ""
-#: config.c:1564
+#: config.c:1568
msgid "unable to parse command-line config"
msgstr ""
-#: config.c:1894
+#: config.c:1900
msgid "unknown error occurred while reading the configuration files"
msgstr ""
-#: config.c:2064
+#: config.c:2087
#, c-format
msgid "Invalid %s: '%s'"
msgstr ""
-#: config.c:2085
+#: config.c:2130
#, c-format
msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
msgstr ""
-#: config.c:2111
+#: config.c:2156
#, c-format
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
msgstr ""
-#: config.c:2122
+#: config.c:2167
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr ""
-#: config.c:2124
+#: config.c:2169
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr ""
-#: config.c:2183
+#: config.c:2228
#, c-format
msgid "%s has multiple values"
msgstr ""
-#: config.c:2517 config.c:2745
+#: config.c:2571 config.c:2789
#, c-format
msgid "fstat on %s failed"
msgstr ""
-#: config.c:2635
+#: config.c:2678
#, c-format
msgid "could not set '%s' to '%s'"
msgstr ""
-#: config.c:2637 builtin/remote.c:775
+#: config.c:2680 builtin/remote.c:776
#, c-format
msgid "could not unset '%s'"
msgstr ""
"and the repository exists."
msgstr ""
-#: connected.c:63 builtin/fsck.c:191 builtin/prune.c:141
+#: connected.c:64 builtin/fsck.c:183 builtin/prune.c:141
msgid "Checking connectivity"
msgstr ""
-#: connected.c:75
+#: connected.c:76
msgid "Could not run 'git rev-list'"
msgstr ""
-#: connected.c:95
+#: connected.c:96
msgid "failed write to rev-list"
msgstr ""
-#: connected.c:102
+#: connected.c:103
msgid "failed to close rev-list's stdin"
msgstr ""
msgid "Performing inexact rename detection"
msgstr ""
-#: diff.c:63
+#: diff.c:74
#, c-format
msgid "option '%s' requires a value"
msgstr ""
-#: diff.c:125
+#: diff.c:152
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr ""
-#: diff.c:130
+#: diff.c:157
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr ""
-#: diff.c:282
+#: diff.c:281
+msgid ""
+"color moved setting must be one of 'no', 'default', 'zebra', 'dimmed_zebra', "
+"'plain'"
+msgstr ""
+
+#: diff.c:341
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr ""
-#: diff.c:342
+#: diff.c:398
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
"%s"
msgstr ""
-#: diff.c:3101
+#: diff.c:3861
#, c-format
msgid "external diff died, stopping at %s"
msgstr ""
-#: diff.c:3427
+#: diff.c:4189
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
msgstr ""
-#: diff.c:3517
+#: diff.c:4279
msgid "--follow requires exactly one pathspec"
msgstr ""
-#: diff.c:3680
+#: diff.c:4445
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
"%s"
msgstr ""
-#: diff.c:3694
+#: diff.c:4459
#, c-format
msgid "Failed to parse --submodule option parameter: '%s'"
msgstr ""
-#: diff.c:4716
+#: diff.c:5505
msgid "inexact rename detection was skipped due to too many files."
msgstr ""
-#: diff.c:4719
+#: diff.c:5508
msgid "only found copies from modified paths due to too many files."
msgstr ""
-#: diff.c:4722
+#: diff.c:5511
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
msgstr ""
-#: dir.c:1948
+#: dir.c:1983
msgid "failed to get kernel name and information"
msgstr ""
-#: dir.c:2067
+#: dir.c:2102
msgid "Untracked cache is disabled on this system or location."
msgstr ""
-#: dir.c:2846 dir.c:2851
+#: dir.c:2885 dir.c:2890
#, c-format
msgid "could not create directories for %s"
msgstr ""
-#: dir.c:2876
+#: dir.c:2915
#, c-format
msgid "could not migrate git directory from '%s' to '%s'"
msgstr ""
-#: entry.c:281
+#: entry.c:176
+msgid "Filtering content"
+msgstr ""
+
+#: entry.c:433
#, c-format
msgid "could not stat file '%s'"
msgstr ""
-#: fetch-pack.c:251
+#: fetch-pack.c:252
msgid "git fetch-pack: expected shallow list"
msgstr ""
-#: fetch-pack.c:263
+#: fetch-pack.c:264
msgid "git fetch-pack: expected ACK/NAK, got EOF"
msgstr ""
-#: fetch-pack.c:282 builtin/archive.c:63
+#: fetch-pack.c:283 builtin/archive.c:63
#, c-format
msgid "remote error: %s"
msgstr ""
-#: fetch-pack.c:283
+#: fetch-pack.c:284
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr ""
-#: fetch-pack.c:335
+#: fetch-pack.c:336
msgid "--stateless-rpc requires multi_ack_detailed"
msgstr ""
-#: fetch-pack.c:421
+#: fetch-pack.c:422
#, c-format
msgid "invalid shallow line: %s"
msgstr ""
-#: fetch-pack.c:427
+#: fetch-pack.c:428
#, c-format
msgid "invalid unshallow line: %s"
msgstr ""
-#: fetch-pack.c:429
+#: fetch-pack.c:430
#, c-format
msgid "object not found: %s"
msgstr ""
-#: fetch-pack.c:432
+#: fetch-pack.c:433
#, c-format
msgid "error in object: %s"
msgstr ""
-#: fetch-pack.c:434
+#: fetch-pack.c:435
#, c-format
msgid "no shallow found: %s"
msgstr ""
-#: fetch-pack.c:437
+#: fetch-pack.c:438
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr ""
-#: fetch-pack.c:476
+#: fetch-pack.c:477
#, c-format
msgid "got %s %d %s"
msgstr ""
-#: fetch-pack.c:490
+#: fetch-pack.c:491
#, c-format
msgid "invalid commit %s"
msgstr ""
-#: fetch-pack.c:523
+#: fetch-pack.c:524
msgid "giving up"
msgstr ""
-#: fetch-pack.c:533 progress.c:237
+#: fetch-pack.c:534 progress.c:242
msgid "done"
msgstr ""
-#: fetch-pack.c:545
+#: fetch-pack.c:546
#, c-format
msgid "got %s (%d) %s"
msgstr ""
-#: fetch-pack.c:591
+#: fetch-pack.c:592
#, c-format
msgid "Marking %s as complete"
msgstr ""
-#: fetch-pack.c:775
+#: fetch-pack.c:776
#, c-format
msgid "already have %s (%s)"
msgstr ""
-#: fetch-pack.c:813
+#: fetch-pack.c:814
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr ""
-#: fetch-pack.c:821
+#: fetch-pack.c:822
msgid "protocol error: bad pack header"
msgstr ""
-#: fetch-pack.c:877
+#: fetch-pack.c:878
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr ""
-#: fetch-pack.c:893
+#: fetch-pack.c:894
#, c-format
msgid "%s failed"
msgstr ""
-#: fetch-pack.c:895
+#: fetch-pack.c:896
msgid "error in sideband demultiplexer"
msgstr ""
-#: fetch-pack.c:922
+#: fetch-pack.c:923
msgid "Server does not support shallow clients"
msgstr ""
-#: fetch-pack.c:926
+#: fetch-pack.c:927
msgid "Server supports multi_ack_detailed"
msgstr ""
-#: fetch-pack.c:929
+#: fetch-pack.c:930
msgid "Server supports no-done"
msgstr ""
-#: fetch-pack.c:935
+#: fetch-pack.c:936
msgid "Server supports multi_ack"
msgstr ""
-#: fetch-pack.c:939
+#: fetch-pack.c:940
msgid "Server supports side-band-64k"
msgstr ""
-#: fetch-pack.c:943
+#: fetch-pack.c:944
msgid "Server supports side-band"
msgstr ""
-#: fetch-pack.c:947
+#: fetch-pack.c:948
msgid "Server supports allow-tip-sha1-in-want"
msgstr ""
-#: fetch-pack.c:951
+#: fetch-pack.c:952
msgid "Server supports allow-reachable-sha1-in-want"
msgstr ""
-#: fetch-pack.c:961
+#: fetch-pack.c:962
msgid "Server supports ofs-delta"
msgstr ""
-#: fetch-pack.c:968
+#: fetch-pack.c:969
#, c-format
msgid "Server version is %.*s"
msgstr ""
-#: fetch-pack.c:974
+#: fetch-pack.c:975
msgid "Server does not support --shallow-since"
msgstr ""
-#: fetch-pack.c:978
+#: fetch-pack.c:979
msgid "Server does not support --shallow-exclude"
msgstr ""
-#: fetch-pack.c:980
+#: fetch-pack.c:981
msgid "Server does not support --deepen"
msgstr ""
-#: fetch-pack.c:991
+#: fetch-pack.c:992
msgid "no common commits"
msgstr ""
-#: fetch-pack.c:1003
+#: fetch-pack.c:1004
msgid "git fetch-pack: fetch failed."
msgstr ""
-#: fetch-pack.c:1165
+#: fetch-pack.c:1166
msgid "no matching remote head"
msgstr ""
-#: fetch-pack.c:1187
+#: fetch-pack.c:1188
#, c-format
msgid "no such remote ref %s"
msgstr ""
-#: fetch-pack.c:1190
+#: fetch-pack.c:1191
#, c-format
msgid "Server does not allow request for unadvertised object %s"
msgstr ""
msgid "could not create temporary file"
msgstr ""
-#: gpg-interface.c:213
+#: gpg-interface.c:214
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr ""
msgid "ignore invalid color '%.*s' in log.graphColors"
msgstr ""
-#: grep.c:1981
+#: grep.c:1970
#, c-format
msgid "'%s': unable to read %s"
msgstr ""
-#: grep.c:1998 builtin/clone.c:403 builtin/diff.c:81 builtin/rm.c:134
+#: grep.c:1987 builtin/clone.c:404 builtin/diff.c:81 builtin/rm.c:134
#, c-format
msgid "failed to stat '%s'"
msgstr ""
-#: grep.c:2009
+#: grep.c:1998
#, c-format
msgid "'%s': short read"
msgstr ""
msgid "name consists only of disallowed characters: %s"
msgstr ""
-#: ident.c:416 builtin/commit.c:612
+#: ident.c:416 builtin/commit.c:616
#, c-format
msgid "invalid date format: %s"
msgstr ""
-#: lockfile.c:152
+#: lockfile.c:151
#, c-format
msgid ""
"Unable to create '%s.lock': %s.\n"
"remove the file manually to continue."
msgstr ""
-#: lockfile.c:160
+#: lockfile.c:159
#, c-format
msgid "Unable to create '%s.lock': %s"
msgstr ""
msgid "failed to read the cache"
msgstr ""
-#: merge.c:96 builtin/am.c:1980 builtin/am.c:2015 builtin/checkout.c:377
-#: builtin/checkout.c:591 builtin/clone.c:753
+#: merge.c:96 builtin/am.c:1978 builtin/am.c:2013 builtin/checkout.c:380
+#: builtin/checkout.c:595 builtin/clone.c:754
msgid "unable to write new index file"
msgstr ""
-#: merge-recursive.c:210
+#: merge-recursive.c:235
msgid "(bad commit)\n"
msgstr ""
-#: merge-recursive.c:232 merge-recursive.c:240
+#: merge-recursive.c:257 merge-recursive.c:265
#, c-format
msgid "addinfo_cache failed for path '%s'"
msgstr ""
-#: merge-recursive.c:304
+#: merge-recursive.c:329
msgid "error building trees"
msgstr ""
-#: merge-recursive.c:728
+#: merge-recursive.c:752
#, c-format
msgid "failed to create path '%s'%s"
msgstr ""
-#: merge-recursive.c:739
+#: merge-recursive.c:763
#, c-format
msgid "Removing %s to make room for subdirectory\n"
msgstr ""
-#: merge-recursive.c:753 merge-recursive.c:772
+#: merge-recursive.c:777 merge-recursive.c:796
msgid ": perhaps a D/F conflict?"
msgstr ""
-#: merge-recursive.c:762
+#: merge-recursive.c:786
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr ""
-#: merge-recursive.c:804 builtin/cat-file.c:36
+#: merge-recursive.c:828 builtin/cat-file.c:37
#, c-format
msgid "cannot read object %s '%s'"
msgstr ""
-#: merge-recursive.c:806
+#: merge-recursive.c:830
#, c-format
msgid "blob expected for %s '%s'"
msgstr ""
-#: merge-recursive.c:830
+#: merge-recursive.c:854
#, c-format
msgid "failed to open '%s': %s"
msgstr ""
-#: merge-recursive.c:841
+#: merge-recursive.c:865
#, c-format
msgid "failed to symlink '%s': %s"
msgstr ""
-#: merge-recursive.c:846
+#: merge-recursive.c:870
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr ""
-#: merge-recursive.c:986
+#: merge-recursive.c:1010
msgid "Failed to execute internal merge"
msgstr ""
-#: merge-recursive.c:990
+#: merge-recursive.c:1014
#, c-format
msgid "Unable to add %s to database"
msgstr ""
-#: merge-recursive.c:1093
+#: merge-recursive.c:1117
#, 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:1098
+#: merge-recursive.c:1122
#, 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:1105
+#: merge-recursive.c:1129
#, 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:1110
+#: merge-recursive.c:1134
#, 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:1144
+#: merge-recursive.c:1168
msgid "rename"
msgstr ""
-#: merge-recursive.c:1144
+#: merge-recursive.c:1168
msgid "renamed"
msgstr ""
-#: merge-recursive.c:1201
+#: merge-recursive.c:1225
#, c-format
msgid "%s is a directory in %s adding as %s instead"
msgstr ""
-#: merge-recursive.c:1226
+#: merge-recursive.c:1250
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
"\"->\"%s\" in \"%s\"%s"
msgstr ""
-#: merge-recursive.c:1231
+#: merge-recursive.c:1255
msgid " (left unresolved)"
msgstr ""
-#: merge-recursive.c:1293
+#: merge-recursive.c:1317
#, c-format
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr ""
-#: merge-recursive.c:1326
+#: merge-recursive.c:1350
#, c-format
msgid "Renaming %s to %s and %s to %s instead"
msgstr ""
-#: merge-recursive.c:1529
+#: merge-recursive.c:1553
#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
msgstr ""
-#: merge-recursive.c:1544
+#: merge-recursive.c:1568
#, c-format
msgid "Adding merged %s"
msgstr ""
-#: merge-recursive.c:1551 merge-recursive.c:1781
+#: merge-recursive.c:1575 merge-recursive.c:1805
#, c-format
msgid "Adding as %s instead"
msgstr ""
-#: merge-recursive.c:1608
+#: merge-recursive.c:1632
#, c-format
msgid "cannot read object %s"
msgstr ""
-#: merge-recursive.c:1611
+#: merge-recursive.c:1635
#, c-format
msgid "object %s is not a blob"
msgstr ""
-#: merge-recursive.c:1680
+#: merge-recursive.c:1704
msgid "modify"
msgstr ""
-#: merge-recursive.c:1680
+#: merge-recursive.c:1704
msgid "modified"
msgstr ""
-#: merge-recursive.c:1690
+#: merge-recursive.c:1714
msgid "content"
msgstr ""
-#: merge-recursive.c:1697
+#: merge-recursive.c:1721
msgid "add/add"
msgstr ""
-#: merge-recursive.c:1733
+#: merge-recursive.c:1757
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr ""
-#: merge-recursive.c:1747
+#: merge-recursive.c:1771
#, c-format
msgid "Auto-merging %s"
msgstr ""
-#: merge-recursive.c:1751 git-submodule.sh:945
+#: merge-recursive.c:1775 git-submodule.sh:944
msgid "submodule"
msgstr ""
-#: merge-recursive.c:1752
+#: merge-recursive.c:1776
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr ""
-#: merge-recursive.c:1846
+#: merge-recursive.c:1870
#, c-format
msgid "Removing %s"
msgstr ""
-#: merge-recursive.c:1872
+#: merge-recursive.c:1896
msgid "file/directory"
msgstr ""
-#: merge-recursive.c:1878
+#: merge-recursive.c:1902
msgid "directory/file"
msgstr ""
-#: merge-recursive.c:1884
+#: merge-recursive.c:1908
#, c-format
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
msgstr ""
-#: merge-recursive.c:1893
+#: merge-recursive.c:1917
#, c-format
msgid "Adding %s"
msgstr ""
-#: merge-recursive.c:1930
-msgid "Already up-to-date!"
+#: merge-recursive.c:1954
+msgid "Already up to date!"
msgstr ""
-#: merge-recursive.c:1939
+#: merge-recursive.c:1963
#, c-format
msgid "merging of trees %s and %s failed"
msgstr ""
-#: merge-recursive.c:2022
+#: merge-recursive.c:2060
msgid "Merging:"
msgstr ""
-#: merge-recursive.c:2035
+#: merge-recursive.c:2073
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] ""
msgstr[1] ""
-#: merge-recursive.c:2074
+#: merge-recursive.c:2112
msgid "merge returned no commit"
msgstr ""
-#: merge-recursive.c:2137
+#: merge-recursive.c:2175
#, c-format
msgid "Could not parse object '%s'"
msgstr ""
-#: merge-recursive.c:2151 builtin/merge.c:646 builtin/merge.c:793
+#: merge-recursive.c:2189 builtin/merge.c:655 builtin/merge.c:814
msgid "Unable to write index."
msgstr ""
-#: notes-merge.c:273
+#: notes-merge.c:272
#, c-format
msgid ""
"You have not concluded your previous notes merge (%s exists).\n"
"commit/abort the previous merge before you start a new notes merge."
msgstr ""
-#: notes-merge.c:280
+#: notes-merge.c:279
#, c-format
msgid "You have not concluded your notes merge (%s exists)."
msgstr ""
msgid "Bad %s value: '%s'"
msgstr ""
-#: object.c:240
+#: object.c:239
#, c-format
msgid "unable to parse object: %s"
msgstr ""
+#: packfile.c:556
+msgid "offset before end of packfile (broken .idx?)"
+msgstr ""
+
+#: packfile.c:1683
+#, c-format
+msgid "offset before start of pack index for %s (corrupt index?)"
+msgstr ""
+
+#: packfile.c:1687
+#, c-format
+msgid "offset beyond end of pack index for %s (truncated index?)"
+msgstr ""
+
#: parse-options.c:573
msgid "..."
msgstr ""
-#: parse-options.c:591
+#: parse-options.c:592
#, c-format
msgid "usage: %s"
msgstr ""
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation.
#.
-#: parse-options.c:597
+#: parse-options.c:598
#, c-format
msgid " or: %s"
msgstr ""
-#: parse-options.c:600
+#: parse-options.c:601
#, c-format
msgid " %s"
msgstr ""
-#: parse-options.c:634
+#: parse-options.c:640
msgid "-NUM"
msgstr ""
msgid "malformed object name '%s'"
msgstr ""
-#: path.c:890
+#: path.c:891
#, c-format
msgid "Could not make %s writable by group"
msgstr ""
msgid "%s: pathspec magic not supported by this command: %s"
msgstr ""
-#: pathspec.c:575
+#: pathspec.c:571
msgid ""
"empty strings as pathspecs will be made invalid in upcoming releases. please "
"use . instead if you meant to match all paths"
msgstr ""
-#: pathspec.c:599
+#: pathspec.c:595
#, c-format
msgid "pathspec '%s' is beyond a symbolic link"
msgstr ""
-#: pretty.c:963
+#: pretty.c:962
msgid "unable to parse --pretty format"
msgstr ""
"Using version %i"
msgstr ""
-#: read-cache.c:2308 builtin/merge.c:1019
+#: read-cache.c:2316 builtin/merge.c:1046
#, c-format
msgid "could not close '%s'"
msgstr ""
-#: read-cache.c:2383 sequencer.c:1353 sequencer.c:2054
+#: read-cache.c:2394 sequencer.c:1355 sequencer.c:2077
#, c-format
msgid "could not stat '%s'"
msgstr ""
-#: read-cache.c:2396
+#: read-cache.c:2407
#, c-format
msgid "unable to open git dir: %s"
msgstr ""
-#: read-cache.c:2408
+#: read-cache.c:2419
#, c-format
msgid "unable to unlink: %s"
msgstr ""
-#: refs.c:622
+#: refs.c:638
#, c-format
msgid "Could not open '%s' for writing"
msgstr ""
-#: refs.c:1769
+#: refs.c:1792
msgid "ref updates forbidden inside quarantine environment"
msgstr ""
-#: refs/files-backend.c:1664
+#: refs/files-backend.c:1136
#, c-format
-msgid "could not delete reference %s: %s"
+msgid "could not remove reference %s"
msgstr ""
-#: refs/files-backend.c:1667
+#: refs/files-backend.c:1150 refs/packed-backend.c:1430
+#: refs/packed-backend.c:1440
#, c-format
-msgid "could not delete references: %s"
+msgid "could not delete reference %s: %s"
msgstr ""
-#: refs/files-backend.c:1676
+#: refs/files-backend.c:1153 refs/packed-backend.c:1443
#, c-format
-msgid "could not remove reference %s"
+msgid "could not delete references: %s"
msgstr ""
#: ref-filter.c:35 wt-status.c:1811
msgid "unrecognized color: %%(color:%s)"
msgstr ""
-#: ref-filter.c:121
+#: ref-filter.c:127
#, c-format
msgid "Integer value expected refname:lstrip=%s"
msgstr ""
-#: ref-filter.c:125
+#: ref-filter.c:131
#, c-format
msgid "Integer value expected refname:rstrip=%s"
msgstr ""
-#: ref-filter.c:127
+#: ref-filter.c:133
#, c-format
msgid "unrecognized %%(%s) argument: %s"
msgstr ""
-#: ref-filter.c:167
+#: ref-filter.c:173
#, c-format
msgid "%%(body) does not take arguments"
msgstr ""
-#: ref-filter.c:174
+#: ref-filter.c:180
#, c-format
msgid "%%(subject) does not take arguments"
msgstr ""
-#: ref-filter.c:181
+#: ref-filter.c:198
#, c-format
-msgid "%%(trailers) does not take arguments"
+msgid "unknown %%(trailers) argument: %s"
msgstr ""
-#: ref-filter.c:200
+#: ref-filter.c:221
#, c-format
msgid "positive value expected contents:lines=%s"
msgstr ""
-#: ref-filter.c:202
+#: ref-filter.c:223
#, c-format
msgid "unrecognized %%(contents) argument: %s"
msgstr ""
-#: ref-filter.c:215
+#: ref-filter.c:236
#, c-format
msgid "positive value expected objectname:short=%s"
msgstr ""
-#: ref-filter.c:219
+#: ref-filter.c:240
#, c-format
msgid "unrecognized %%(objectname) argument: %s"
msgstr ""
-#: ref-filter.c:246
+#: ref-filter.c:267
#, c-format
msgid "expected format: %%(align:<width>,<position>)"
msgstr ""
-#: ref-filter.c:258
+#: ref-filter.c:279
#, c-format
msgid "unrecognized position:%s"
msgstr ""
-#: ref-filter.c:262
+#: ref-filter.c:283
#, c-format
msgid "unrecognized width:%s"
msgstr ""
-#: ref-filter.c:268
+#: ref-filter.c:289
#, c-format
msgid "unrecognized %%(align) argument: %s"
msgstr ""
-#: ref-filter.c:272
+#: ref-filter.c:293
#, c-format
msgid "positive width expected with the %%(align) atom"
msgstr ""
-#: ref-filter.c:287
+#: ref-filter.c:308
#, c-format
msgid "unrecognized %%(if) argument: %s"
msgstr ""
-#: ref-filter.c:378
+#: ref-filter.c:398
#, c-format
msgid "malformed field name: %.*s"
msgstr ""
-#: ref-filter.c:404
+#: ref-filter.c:424
#, c-format
msgid "unknown field name: %.*s"
msgstr ""
-#: ref-filter.c:508
+#: ref-filter.c:536
#, c-format
msgid "format: %%(if) atom used without a %%(then) atom"
msgstr ""
-#: ref-filter.c:568
+#: ref-filter.c:596
#, c-format
msgid "format: %%(then) atom used without an %%(if) atom"
msgstr ""
-#: ref-filter.c:570
+#: ref-filter.c:598
#, c-format
msgid "format: %%(then) atom used more than once"
msgstr ""
-#: ref-filter.c:572
+#: ref-filter.c:600
#, c-format
msgid "format: %%(then) atom used after %%(else)"
msgstr ""
-#: ref-filter.c:598
+#: ref-filter.c:626
#, c-format
msgid "format: %%(else) atom used without an %%(if) atom"
msgstr ""
-#: ref-filter.c:600
+#: ref-filter.c:628
#, c-format
msgid "format: %%(else) atom used without a %%(then) atom"
msgstr ""
-#: ref-filter.c:602
+#: ref-filter.c:630
#, c-format
msgid "format: %%(else) atom used more than once"
msgstr ""
-#: ref-filter.c:615
+#: ref-filter.c:643
#, c-format
msgid "format: %%(end) atom used without corresponding atom"
msgstr ""
-#: ref-filter.c:670
+#: ref-filter.c:698
#, c-format
msgid "malformed format string %s"
msgstr ""
-#: ref-filter.c:1254
+#: ref-filter.c:1283
#, c-format
msgid "(no branch, rebasing %s)"
msgstr ""
-#: ref-filter.c:1257
+#: ref-filter.c:1286
#, c-format
msgid "(no branch, bisect started on %s)"
msgstr ""
#. TRANSLATORS: make sure this matches "HEAD
#. detached at " in wt-status.c
#.
-#: ref-filter.c:1265
+#: ref-filter.c:1294
#, c-format
msgid "(HEAD detached at %s)"
msgstr ""
#. TRANSLATORS: make sure this matches "HEAD
#. detached from " in wt-status.c
#.
-#: ref-filter.c:1272
+#: ref-filter.c:1301
#, c-format
msgid "(HEAD detached from %s)"
msgstr ""
-#: ref-filter.c:1276
+#: ref-filter.c:1305
msgid "(no branch)"
msgstr ""
-#: ref-filter.c:1426 ref-filter.c:1457
+#: ref-filter.c:1454 ref-filter.c:1485
#, c-format
msgid "missing object %s for %s"
msgstr ""
-#: ref-filter.c:1429 ref-filter.c:1460
+#: ref-filter.c:1457 ref-filter.c:1488
#, c-format
msgid "parse_object_buffer failed on %s for %s"
msgstr ""
-#: ref-filter.c:1760
+#: ref-filter.c:1788
#, c-format
msgid "malformed object at '%s'"
msgstr ""
-#: ref-filter.c:1827
+#: ref-filter.c:1855
#, c-format
msgid "ignoring ref with broken name %s"
msgstr ""
-#: ref-filter.c:1832
+#: ref-filter.c:1860
#, c-format
msgid "ignoring broken ref %s"
msgstr ""
-#: ref-filter.c:2095
+#: ref-filter.c:2122
#, c-format
msgid "format: %%(end) atom missing"
msgstr ""
-#: ref-filter.c:2176
+#: ref-filter.c:2216
#, c-format
msgid "malformed object name %s"
msgstr ""
-#: remote.c:747
+#: remote.c:750
#, c-format
msgid "Cannot fetch both %s and %s to %s"
msgstr ""
-#: remote.c:751
+#: remote.c:754
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr ""
-#: remote.c:755
+#: remote.c:758
#, c-format
msgid "%s tracks both %s and %s"
msgstr ""
-#: remote.c:763
+#: remote.c:766
msgid "Internal error"
msgstr ""
-#: remote.c:1680 remote.c:1782
+#: remote.c:1681 remote.c:1783
msgid "HEAD does not point to a branch"
msgstr ""
-#: remote.c:1689
+#: remote.c:1690
#, c-format
msgid "no such branch: '%s'"
msgstr ""
-#: remote.c:1692
+#: remote.c:1693
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr ""
-#: remote.c:1698
+#: remote.c:1699
#, c-format
msgid "upstream branch '%s' not stored as a remote-tracking branch"
msgstr ""
-#: remote.c:1713
+#: remote.c:1714
#, c-format
msgid "push destination '%s' on remote '%s' has no local tracking branch"
msgstr ""
-#: remote.c:1725
+#: remote.c:1726
#, c-format
msgid "branch '%s' has no remote for pushing"
msgstr ""
-#: remote.c:1736
+#: remote.c:1737
#, c-format
msgid "push refspecs for '%s' do not include '%s'"
msgstr ""
-#: remote.c:1749
+#: remote.c:1750
msgid "push has no destination (push.default is 'nothing')"
msgstr ""
-#: remote.c:1771
+#: remote.c:1772
msgid "cannot resolve 'simple' push to a single destination"
msgstr ""
#: remote.c:2083
#, c-format
-msgid "Your branch is up-to-date with '%s'.\n"
+msgid "Your branch is up to date with '%s'.\n"
msgstr ""
#: remote.c:2087
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr ""
-#: revision.c:2187
+#: revision.c:2256
msgid "your current branch appears to be broken"
msgstr ""
-#: revision.c:2190
+#: revision.c:2259
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr ""
-#: revision.c:2384
+#: revision.c:2453
msgid "--first-parent is incompatible with --bisect"
msgstr ""
msgid "the receiving end does not support push options"
msgstr ""
-#: sequencer.c:216
+#: sequencer.c:218
msgid "revert"
msgstr ""
-#: sequencer.c:218
+#: sequencer.c:220
msgid "cherry-pick"
msgstr ""
-#: sequencer.c:220
+#: sequencer.c:222
msgid "rebase -i"
msgstr ""
-#: sequencer.c:222
+#: sequencer.c:224
#, c-format
msgid "Unknown action: %d"
msgstr ""
-#: sequencer.c:279
+#: sequencer.c:281
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
msgstr ""
-#: sequencer.c:282
+#: sequencer.c:284
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'\n"
"and commit the result with 'git commit'"
msgstr ""
-#: sequencer.c:295 sequencer.c:1685
+#: sequencer.c:297 sequencer.c:1704
#, c-format
msgid "could not lock '%s'"
msgstr ""
-#: sequencer.c:298 sequencer.c:1563 sequencer.c:1690 sequencer.c:1704
+#: sequencer.c:300 sequencer.c:1581 sequencer.c:1709 sequencer.c:1723
+#: sequencer.c:2733 sequencer.c:2749
#, c-format
msgid "could not write to '%s'"
msgstr ""
-#: sequencer.c:302
+#: sequencer.c:304
#, c-format
msgid "could not write eol to '%s'"
msgstr ""
-#: sequencer.c:306 sequencer.c:1568 sequencer.c:1692
+#: sequencer.c:308 sequencer.c:1586 sequencer.c:1711
#, c-format
msgid "failed to finalize '%s'."
msgstr ""
-#: sequencer.c:330 sequencer.c:817 sequencer.c:1589 builtin/am.c:258
-#: builtin/commit.c:750 builtin/merge.c:1017
+#: sequencer.c:332 sequencer.c:819 sequencer.c:1607 builtin/am.c:259
+#: builtin/commit.c:754 builtin/merge.c:1044
#, c-format
msgid "could not read '%s'"
msgstr ""
-#: sequencer.c:356
+#: sequencer.c:358
#, c-format
msgid "your local changes would be overwritten by %s."
msgstr ""
-#: sequencer.c:360
+#: sequencer.c:362
msgid "commit your changes or stash them to proceed."
msgstr ""
-#: sequencer.c:389
+#: sequencer.c:391
#, c-format
msgid "%s: fast-forward"
msgstr ""
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
#. "rebase -i".
#.
-#: sequencer.c:472
+#: sequencer.c:474
#, c-format
msgid "%s: Unable to write new index file"
msgstr ""
-#: sequencer.c:491
+#: sequencer.c:493
msgid "could not resolve HEAD commit\n"
msgstr ""
-#: sequencer.c:511
+#: sequencer.c:513
msgid "unable to update cache tree\n"
msgstr ""
-#: sequencer.c:595
+#: sequencer.c:597
#, c-format
msgid ""
"you have staged changes in your working tree\n"
" git rebase --continue\n"
msgstr ""
-#: sequencer.c:697
+#: sequencer.c:699
#, c-format
msgid "could not parse commit %s\n"
msgstr ""
-#: sequencer.c:702
+#: sequencer.c:704
#, c-format
msgid "could not parse parent commit %s\n"
msgstr ""
-#: sequencer.c:824
+#: sequencer.c:826
#, c-format
msgid ""
"unexpected 1st line of squash message:\n"
"\t%.*s"
msgstr ""
-#: sequencer.c:830
+#: sequencer.c:832
#, c-format
msgid ""
"invalid 1st line of squash message:\n"
"\t%.*s"
msgstr ""
-#: sequencer.c:836 sequencer.c:861
+#: sequencer.c:838 sequencer.c:863
#, c-format
msgid "This is a combination of %d commits."
msgstr ""
-#: sequencer.c:845
+#: sequencer.c:847 sequencer.c:2681
msgid "need a HEAD to fixup"
msgstr ""
-#: sequencer.c:847
+#: sequencer.c:849
msgid "could not read HEAD"
msgstr ""
-#: sequencer.c:849
+#: sequencer.c:851
msgid "could not read HEAD's commit message"
msgstr ""
-#: sequencer.c:855
+#: sequencer.c:857
#, c-format
msgid "cannot write '%s'"
msgstr ""
-#: sequencer.c:864 git-rebase--interactive.sh:445
+#: sequencer.c:866 git-rebase--interactive.sh:446
msgid "This is the 1st commit message:"
msgstr ""
-#: sequencer.c:872
+#: sequencer.c:874
#, c-format
msgid "could not read commit message of %s"
msgstr ""
-#: sequencer.c:879
+#: sequencer.c:881
#, c-format
msgid "This is the commit message #%d:"
msgstr ""
-#: sequencer.c:884
+#: sequencer.c:886
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr ""
-#: sequencer.c:889
+#: sequencer.c:891
#, c-format
msgid "unknown command: %d"
msgstr ""
-#: sequencer.c:955
+#: sequencer.c:957
msgid "your index file is unmerged."
msgstr ""
-#: sequencer.c:973
+#: sequencer.c:975
#, c-format
msgid "commit %s is a merge but no -m option was given."
msgstr ""
-#: sequencer.c:981
+#: sequencer.c:983
#, c-format
msgid "commit %s does not have parent %d"
msgstr ""
-#: sequencer.c:985
+#: sequencer.c:987
#, c-format
msgid "mainline was specified but commit %s is not a merge."
msgstr ""
-#: sequencer.c:991
+#: sequencer.c:993
#, 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:1012
+#: sequencer.c:1014
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr ""
-#: sequencer.c:1075 sequencer.c:1830
+#: sequencer.c:1077 sequencer.c:1853
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr ""
-#: sequencer.c:1126
+#: sequencer.c:1128
#, c-format
msgid "could not revert %s... %s"
msgstr ""
-#: sequencer.c:1127
+#: sequencer.c:1129
#, c-format
msgid "could not apply %s... %s"
msgstr ""
-#: sequencer.c:1169
+#: sequencer.c:1171
msgid "empty commit set passed"
msgstr ""
-#: sequencer.c:1179
+#: sequencer.c:1181
#, c-format
msgid "git %s: failed to read the index"
msgstr ""
-#: sequencer.c:1186
+#: sequencer.c:1188
#, c-format
msgid "git %s: failed to refresh the index"
msgstr ""
-#: sequencer.c:1306
+#: sequencer.c:1308
#, c-format
msgid "invalid line %d: %.*s"
msgstr ""
-#: sequencer.c:1314
+#: sequencer.c:1316
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr ""
-#: sequencer.c:1347
+#: sequencer.c:1349 sequencer.c:2503 sequencer.c:2588 sequencer.c:2614
+#: sequencer.c:2691 sequencer.c:2810 sequencer.c:2951
#, c-format
msgid "could not read '%s'."
msgstr ""
-#: sequencer.c:1359
+#: sequencer.c:1361
msgid "please fix this using 'git rebase --edit-todo'."
msgstr ""
-#: sequencer.c:1361
+#: sequencer.c:1363
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr ""
-#: sequencer.c:1366
+#: sequencer.c:1368
msgid "no commits parsed."
msgstr ""
-#: sequencer.c:1377
+#: sequencer.c:1379
msgid "cannot cherry-pick during a revert."
msgstr ""
-#: sequencer.c:1379
+#: sequencer.c:1381
msgid "cannot revert during a cherry-pick."
msgstr ""
-#: sequencer.c:1442
+#: sequencer.c:1448
#, c-format
msgid "invalid key: %s"
msgstr ""
-#: sequencer.c:1445
+#: sequencer.c:1451
#, c-format
msgid "invalid value for %s: %s"
msgstr ""
-#: sequencer.c:1502
+#: sequencer.c:1517
#, c-format
msgid "malformed options sheet: '%s'"
msgstr ""
-#: sequencer.c:1540
+#: sequencer.c:1555
msgid "a cherry-pick or revert is already in progress"
msgstr ""
-#: sequencer.c:1541
+#: sequencer.c:1556
msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
msgstr ""
-#: sequencer.c:1544
+#: sequencer.c:1559
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr ""
-#: sequencer.c:1558
+#: sequencer.c:1574
msgid "could not lock HEAD"
msgstr ""
-#: sequencer.c:1614 sequencer.c:2188
+#: sequencer.c:1632 sequencer.c:2211
msgid "no cherry-pick or revert in progress"
msgstr ""
-#: sequencer.c:1616
+#: sequencer.c:1634
msgid "cannot resolve HEAD"
msgstr ""
-#: sequencer.c:1618 sequencer.c:1652
+#: sequencer.c:1636 sequencer.c:1671
msgid "cannot abort from a branch yet to be born"
msgstr ""
-#: sequencer.c:1638 builtin/grep.c:929
+#: sequencer.c:1657 builtin/grep.c:711
#, c-format
msgid "cannot open '%s'"
msgstr ""
-#: sequencer.c:1640
+#: sequencer.c:1659
#, c-format
msgid "cannot read '%s': %s"
msgstr ""
-#: sequencer.c:1641
+#: sequencer.c:1660
msgid "unexpected end of file"
msgstr ""
-#: sequencer.c:1647
+#: sequencer.c:1666
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr ""
-#: sequencer.c:1658
+#: sequencer.c:1677
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr ""
-#: sequencer.c:1795 sequencer.c:2086
+#: sequencer.c:1818 sequencer.c:2109
msgid "cannot read HEAD"
msgstr ""
-#: sequencer.c:1835 builtin/difftool.c:633
+#: sequencer.c:1858 builtin/difftool.c:640
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr ""
-#: sequencer.c:1851
+#: sequencer.c:1874
msgid "could not read index"
msgstr ""
-#: sequencer.c:1856
+#: sequencer.c:1879
#, c-format
msgid ""
"execution failed: %s\n"
"\n"
msgstr ""
-#: sequencer.c:1862
+#: sequencer.c:1885
msgid "and made changes to the index and/or the working tree\n"
msgstr ""
-#: sequencer.c:1868
+#: sequencer.c:1891
#, c-format
msgid ""
"execution succeeded: %s\n"
"\n"
msgstr ""
-#: sequencer.c:1925
+#: sequencer.c:1948
#, c-format
msgid "Applied autostash.\n"
msgstr ""
-#: sequencer.c:1937
+#: sequencer.c:1960
#, c-format
msgid "cannot store %s"
msgstr ""
-#: sequencer.c:1940 git-rebase.sh:173
+#: sequencer.c:1963 git-rebase.sh:175
#, 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:2022
+#: sequencer.c:2045
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr ""
-#: sequencer.c:2064
+#: sequencer.c:2087
#, c-format
msgid "unknown command %d"
msgstr ""
-#: sequencer.c:2094
+#: sequencer.c:2117
msgid "could not read orig-head"
msgstr ""
-#: sequencer.c:2099
+#: sequencer.c:2122 sequencer.c:2678
msgid "could not read 'onto'"
msgstr ""
-#: sequencer.c:2106
+#: sequencer.c:2129
#, c-format
msgid "could not update %s"
msgstr ""
-#: sequencer.c:2113
+#: sequencer.c:2136
#, c-format
msgid "could not update HEAD to %s"
msgstr ""
-#: sequencer.c:2197
+#: sequencer.c:2220
msgid "cannot rebase: You have unstaged changes."
msgstr ""
-#: sequencer.c:2202
+#: sequencer.c:2225
msgid "could not remove CHERRY_PICK_HEAD"
msgstr ""
-#: sequencer.c:2211
+#: sequencer.c:2234
msgid "cannot amend non-existing commit"
msgstr ""
-#: sequencer.c:2213
+#: sequencer.c:2236
#, c-format
msgid "invalid file: '%s'"
msgstr ""
-#: sequencer.c:2215
+#: sequencer.c:2238
#, c-format
msgid "invalid contents: '%s'"
msgstr ""
-#: sequencer.c:2218
+#: sequencer.c:2241
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:2228
+#: sequencer.c:2251
msgid "could not commit staged changes."
msgstr ""
-#: sequencer.c:2308
+#: sequencer.c:2331
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr ""
-#: sequencer.c:2312
+#: sequencer.c:2335
#, c-format
msgid "%s: bad revision"
msgstr ""
-#: sequencer.c:2345
+#: sequencer.c:2368
msgid "can't revert as initial commit"
msgstr ""
+#: sequencer.c:2471
+msgid "make_script: unhandled options"
+msgstr ""
+
+#: sequencer.c:2474
+msgid "make_script: error preparing revisions"
+msgstr ""
+
+#: sequencer.c:2510
+#, c-format
+msgid "unusable todo list: '%s'"
+msgstr ""
+
+#: sequencer.c:2516
+#, c-format
+msgid "unable to open '%s' for writing"
+msgstr ""
+
+#: sequencer.c:2561
+#, c-format
+msgid ""
+"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
+msgstr ""
+
+#: sequencer.c:2641
+#, c-format
+msgid ""
+"Warning: some commits may have been dropped accidentally.\n"
+"Dropped commits (newer to older):\n"
+msgstr ""
+
+#: sequencer.c:2648
+#, c-format
+msgid ""
+"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
+"\n"
+"Use 'git config rebase.missingCommitsCheck' to change the level of "
+"warnings.\n"
+"The possible behaviours are: ignore, warn, error.\n"
+"\n"
+msgstr ""
+
+#: sequencer.c:2660
+#, c-format
+msgid ""
+"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
+"continue'.\n"
+"Or you can abort the rebase with 'git rebase --abort'.\n"
+msgstr ""
+
+#: sequencer.c:2708
+#, c-format
+msgid "could not parse commit '%s'"
+msgstr ""
+
+#: sequencer.c:2727 sequencer.c:2742 wrapper.c:225 wrapper.c:395
+#: builtin/am.c:775
+#, c-format
+msgid "could not open '%s' for writing"
+msgstr ""
+
+#: sequencer.c:2756
+#, c-format
+msgid "could not truncate '%s'"
+msgstr ""
+
+#: sequencer.c:2848
+msgid "the script was already rearranged."
+msgstr ""
+
+#: sequencer.c:2953
+#, c-format
+msgid "could not finish '%s'"
+msgstr ""
+
#: setup.c:171
#, c-format
msgid ""
"'git <command> [<revision>...] -- [<file>...]'"
msgstr ""
-#: setup.c:504
+#: setup.c:499
#, c-format
msgid "Expected git repo version <= %d, found %d"
msgstr ""
-#: setup.c:512
+#: setup.c:507
msgid "unknown repository extensions found:"
msgstr ""
-#: setup.c:810
+#: setup.c:806
#, c-format
msgid "Not a git repository (or any of the parent directories): %s"
msgstr ""
-#: setup.c:812 builtin/index-pack.c:1652
+#: setup.c:808 builtin/index-pack.c:1653
msgid "Cannot come back to cwd"
msgstr ""
-#: setup.c:1050
+#: setup.c:1046
msgid "Unable to read current working directory"
msgstr ""
-#: setup.c:1062 setup.c:1068
+#: setup.c:1058 setup.c:1064
#, c-format
msgid "Cannot change to '%s'"
msgstr ""
-#: setup.c:1081
+#: setup.c:1077
#, 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:1173
+#: setup.c:1159
#, c-format
msgid ""
"Problem with core.sharedRepository filemode value (0%.3o).\n"
"The owner of files must always have read and write permissions."
msgstr ""
-#: sha1_file.c:560
+#: sha1_file.c:528
#, c-format
msgid "path '%s' does not exist"
msgstr ""
-#: sha1_file.c:586
+#: sha1_file.c:554
#, c-format
msgid "reference repository '%s' as a linked checkout is not supported yet."
msgstr ""
-#: sha1_file.c:592
+#: sha1_file.c:560
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr ""
-#: sha1_file.c:598
+#: sha1_file.c:566
#, c-format
msgid "reference repository '%s' is shallow"
msgstr ""
-#: sha1_file.c:606
+#: sha1_file.c:574
#, c-format
msgid "reference repository '%s' is grafted"
msgstr ""
-#: sha1_file.c:1245
-msgid "offset before end of packfile (broken .idx?)"
-msgstr ""
-
-#: sha1_file.c:2729
-#, c-format
-msgid "offset before start of pack index for %s (corrupt index?)"
-msgstr ""
-
-#: sha1_file.c:2733
-#, c-format
-msgid "offset beyond end of pack index for %s (truncated index?)"
-msgstr ""
-
-#: sha1_name.c:419
+#: sha1_name.c:420
#, c-format
msgid "short SHA1 %s is ambiguous"
msgstr ""
-#: sha1_name.c:430
+#: sha1_name.c:431
msgid "The candidates are:"
msgstr ""
-#: sha1_name.c:589
+#: sha1_name.c:590
msgid ""
"Git normally never creates a ref that ends with 40 hex characters\n"
"because it will be ignored when you just specify 40-hex. These refs\n"
"running \"git config advice.objectNameWarning false\""
msgstr ""
-#: submodule.c:70 submodule.c:104
+#: submodule.c:93 submodule.c:127
msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
msgstr ""
-#: submodule.c:74 submodule.c:108
+#: submodule.c:97 submodule.c:131
#, c-format
msgid "Could not find section in .gitmodules where path=%s"
msgstr ""
-#: submodule.c:82
+#: submodule.c:105
#, c-format
msgid "Could not update .gitmodules entry %s"
msgstr ""
-#: submodule.c:115
+#: submodule.c:138
#, c-format
msgid "Could not remove .gitmodules entry for %s"
msgstr ""
-#: submodule.c:126
+#: submodule.c:149
msgid "staging updated .gitmodules failed"
msgstr ""
-#: submodule.c:165
-msgid "negative values not allowed for submodule.fetchJobs"
-msgstr ""
-
-#: submodule.c:376
+#: submodule.c:309
#, c-format
msgid "in unpopulated submodule '%s'"
msgstr ""
-#: submodule.c:407
+#: submodule.c:340
#, c-format
msgid "Pathspec '%s' is in submodule '%.*s'"
msgstr ""
-#: submodule.c:1337
+#: submodule.c:799
+#, c-format
+msgid "submodule entry '%s' (%s) is a %s, not a commit"
+msgstr ""
+
+#: submodule.c:1021 builtin/branch.c:641 builtin/submodule--helper.c:1149
+msgid "Failed to resolve HEAD as a valid ref."
+msgstr ""
+
+#: submodule.c:1304
#, c-format
msgid "'%s' not recognized as a git repository"
msgstr ""
-#: submodule.c:1475
+#: submodule.c:1442
#, c-format
msgid "could not start 'git status' in submodule '%s'"
msgstr ""
-#: submodule.c:1488
+#: submodule.c:1455
#, c-format
msgid "could not run 'git status' in submodule '%s'"
msgstr ""
-#: submodule.c:1581
+#: submodule.c:1548
#, c-format
msgid "submodule '%s' has dirty index"
msgstr ""
-#: submodule.c:1845
+#: submodule.c:1809
#, c-format
msgid ""
"relocate_gitdir for submodule '%s' with more than one worktree not supported"
msgstr ""
-#: submodule.c:1857 submodule.c:1913
+#: submodule.c:1821 submodule.c:1877
#, c-format
msgid "could not lookup name for submodule '%s'"
msgstr ""
-#: submodule.c:1861 builtin/submodule--helper.c:678
-#: builtin/submodule--helper.c:688
+#: submodule.c:1825 builtin/submodule--helper.c:671
+#: builtin/submodule--helper.c:681
#, c-format
msgid "could not create directory '%s'"
msgstr ""
-#: submodule.c:1864
+#: submodule.c:1828
#, c-format
msgid ""
"Migrating git directory of '%s%s' from\n"
"'%s'\n"
msgstr ""
-#: submodule.c:1948
+#: submodule.c:1912
#, c-format
msgid "could not recurse into submodule '%s'"
msgstr ""
-#: submodule.c:1992
+#: submodule.c:1956
msgid "could not start ls-files in .."
msgstr ""
-#: submodule.c:2012
+#: submodule.c:1976
msgid "BUG: returned path string doesn't match cwd?"
msgstr ""
-#: submodule.c:2031
+#: submodule.c:1995
#, c-format
msgid "ls-tree returned unexpected return code %d"
msgstr ""
-#: submodule-config.c:420
+#: submodule-config.c:263
+msgid "negative values not allowed for submodule.fetchjobs"
+msgstr ""
+
+#: submodule-config.c:436
#, c-format
msgid "invalid value for %s"
msgstr ""
-#: trailer.c:241
+#: trailer.c:238
#, c-format
msgid "running trailer command '%s' failed"
msgstr ""
-#: trailer.c:474 trailer.c:478 trailer.c:482 trailer.c:536 trailer.c:540
-#: trailer.c:544
+#: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553
+#: trailer.c:557
#, c-format
msgid "unknown value '%s' for key '%s'"
msgstr ""
-#: trailer.c:526 trailer.c:531 builtin/remote.c:290
+#: trailer.c:539 trailer.c:544 builtin/remote.c:290
#, c-format
msgid "more than one %s"
msgstr ""
-#: trailer.c:703
+#: trailer.c:730
#, c-format
msgid "empty trailer token in trailer '%.*s'"
msgstr ""
-#: trailer.c:723
+#: trailer.c:750
#, c-format
msgid "could not read input file '%s'"
msgstr ""
-#: trailer.c:726
+#: trailer.c:753
msgid "could not read from stdin"
msgstr ""
-#: trailer.c:950 builtin/am.c:45
+#: trailer.c:1008 builtin/am.c:46
#, c-format
msgid "could not stat %s"
msgstr ""
-#: trailer.c:952
+#: trailer.c:1010
#, c-format
msgid "file %s is not a regular file"
msgstr ""
-#: trailer.c:954
+#: trailer.c:1012
#, c-format
msgid "file %s is not writable by user"
msgstr ""
-#: trailer.c:966
+#: trailer.c:1024
msgid "could not open temporary file"
msgstr ""
-#: trailer.c:1002
+#: trailer.c:1064
#, c-format
msgid "could not rename temporary file to %s"
msgstr ""
-#: transport.c:63
+#: transport.c:62
#, c-format
msgid "Would set upstream of '%s' to '%s' of '%s'\n"
msgstr ""
-#: transport.c:152
+#: transport.c:151
#, c-format
msgid "transport: invalid depth option '%s'"
msgstr ""
-#: transport.c:890
+#: transport.c:888
#, c-format
msgid ""
"The following submodule paths contain changes that can\n"
"not be found on any remote:\n"
msgstr ""
-#: transport.c:894
+#: transport.c:892
#, c-format
msgid ""
"\n"
"\n"
msgstr ""
-#: transport.c:902
+#: transport.c:900
msgid "Aborting."
msgstr ""
msgid "empty filename in tree entry"
msgstr ""
-#: tree-walk.c:113
+#: tree-walk.c:114
msgid "too-short tree file"
msgstr ""
-#: unpack-trees.c:105
+#: unpack-trees.c:106
#, 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:107
+#: unpack-trees.c:108
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
"%%s"
msgstr ""
-#: unpack-trees.c:110
+#: unpack-trees.c:111
#, 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:112
+#: unpack-trees.c:113
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
"%%s"
msgstr ""
-#: unpack-trees.c:115
+#: unpack-trees.c:116
#, 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:117
+#: unpack-trees.c:118
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
"%%s"
msgstr ""
-#: unpack-trees.c:122
+#: unpack-trees.c:123
#, c-format
msgid ""
"Updating the following directories would lose untracked files in them:\n"
"%s"
msgstr ""
-#: unpack-trees.c:126
+#: unpack-trees.c:127
#, 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:128
+#: unpack-trees.c:129
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
"%%s"
msgstr ""
-#: unpack-trees.c:131
+#: unpack-trees.c:132
#, 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:133
+#: unpack-trees.c:134
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
"%%s"
msgstr ""
-#: unpack-trees.c:136
+#: unpack-trees.c:137
#, 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:138
+#: unpack-trees.c:139
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
"%%s"
msgstr ""
-#: unpack-trees.c:143
+#: unpack-trees.c:144
#, 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:145
+#: unpack-trees.c:146
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
"%%s"
msgstr ""
-#: unpack-trees.c:148
+#: unpack-trees.c:149
#, 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:150
+#: unpack-trees.c:151
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
"%%s"
msgstr ""
-#: unpack-trees.c:153
+#: unpack-trees.c:154
#, 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:155
+#: unpack-trees.c:156
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
"%%s"
msgstr ""
-#: unpack-trees.c:162
+#: unpack-trees.c:163
#, c-format
msgid "Entry '%s' overlaps with '%s'. Cannot bind."
msgstr ""
-#: unpack-trees.c:165
+#: unpack-trees.c:166
#, c-format
msgid ""
-"Cannot update sparse checkout: the following entries are not up-to-date:\n"
+"Cannot update sparse checkout: the following entries are not up to date:\n"
"%s"
msgstr ""
-#: unpack-trees.c:167
+#: unpack-trees.c:168
#, c-format
msgid ""
"The following working tree files would be overwritten by sparse checkout "
"%s"
msgstr ""
-#: unpack-trees.c:169
+#: unpack-trees.c:170
#, c-format
msgid ""
"The following working tree files would be removed by sparse checkout "
"%s"
msgstr ""
-#: unpack-trees.c:171
+#: unpack-trees.c:172
#, c-format
msgid ""
"Cannot update submodule:\n"
"%s"
msgstr ""
-#: unpack-trees.c:248
+#: unpack-trees.c:249
#, c-format
msgid "Aborting\n"
msgstr ""
-#: unpack-trees.c:277
-#, c-format
-msgid "submodule update strategy not supported for submodule '%s'"
-msgstr ""
-
-#: unpack-trees.c:346
+#: unpack-trees.c:331
msgid "Checking out files"
msgstr ""
msgid "could not open '%s' for reading and writing"
msgstr ""
-#: wrapper.c:225 wrapper.c:395 builtin/am.c:766
-#, c-format
-msgid "could not open '%s' for writing"
-msgstr ""
-
-#: wrapper.c:227 wrapper.c:397 builtin/am.c:319 builtin/am.c:757
-#: builtin/am.c:849 builtin/merge.c:1014
+#: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:766
+#: builtin/am.c:858 builtin/merge.c:1041
#, c-format
msgid "could not open '%s' for reading"
msgstr ""
msgid "could not close %s"
msgstr ""
-#: wt-status.c:152
+#: wt-status.c:150
msgid "Unmerged paths:"
msgstr ""
-#: wt-status.c:179 wt-status.c:206
+#: wt-status.c:177 wt-status.c:204
#, c-format
msgid " (use \"git reset %s <file>...\" to unstage)"
msgstr ""
-#: wt-status.c:181 wt-status.c:208
+#: wt-status.c:179 wt-status.c:206
msgid " (use \"git rm --cached <file>...\" to unstage)"
msgstr ""
-#: wt-status.c:185
+#: wt-status.c:183
msgid " (use \"git add <file>...\" to mark resolution)"
msgstr ""
-#: wt-status.c:187 wt-status.c:191
+#: wt-status.c:185 wt-status.c:189
msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
msgstr ""
-#: wt-status.c:189
+#: wt-status.c:187
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr ""
-#: wt-status.c:200 wt-status.c:981
+#: wt-status.c:198 wt-status.c:979
msgid "Changes to be committed:"
msgstr ""
-#: wt-status.c:218 wt-status.c:990
+#: wt-status.c:216 wt-status.c:988
msgid "Changes not staged for commit:"
msgstr ""
-#: wt-status.c:222
+#: wt-status.c:220
msgid " (use \"git add <file>...\" to update what will be committed)"
msgstr ""
-#: wt-status.c:224
+#: wt-status.c:222
msgid " (use \"git add/rm <file>...\" to update what will be committed)"
msgstr ""
-#: wt-status.c:225
+#: wt-status.c:223
msgid ""
" (use \"git checkout -- <file>...\" to discard changes in working directory)"
msgstr ""
-#: wt-status.c:227
+#: wt-status.c:225
msgid " (commit or discard the untracked or modified content in submodules)"
msgstr ""
-#: wt-status.c:239
+#: wt-status.c:237
#, c-format
msgid " (use \"git %s <file>...\" to include in what will be committed)"
msgstr ""
-#: wt-status.c:254
+#: wt-status.c:252
msgid "both deleted:"
msgstr ""
-#: wt-status.c:256
+#: wt-status.c:254
msgid "added by us:"
msgstr ""
-#: wt-status.c:258
+#: wt-status.c:256
msgid "deleted by them:"
msgstr ""
-#: wt-status.c:260
+#: wt-status.c:258
msgid "added by them:"
msgstr ""
-#: wt-status.c:262
+#: wt-status.c:260
msgid "deleted by us:"
msgstr ""
-#: wt-status.c:264
+#: wt-status.c:262
msgid "both added:"
msgstr ""
-#: wt-status.c:266
+#: wt-status.c:264
msgid "both modified:"
msgstr ""
-#: wt-status.c:276
+#: wt-status.c:274
msgid "new file:"
msgstr ""
-#: wt-status.c:278
+#: wt-status.c:276
msgid "copied:"
msgstr ""
-#: wt-status.c:280
+#: wt-status.c:278
msgid "deleted:"
msgstr ""
-#: wt-status.c:282
+#: wt-status.c:280
msgid "modified:"
msgstr ""
-#: wt-status.c:284
+#: wt-status.c:282
msgid "renamed:"
msgstr ""
-#: wt-status.c:286
+#: wt-status.c:284
msgid "typechange:"
msgstr ""
-#: wt-status.c:288
+#: wt-status.c:286
msgid "unknown:"
msgstr ""
-#: wt-status.c:290
+#: wt-status.c:288
msgid "unmerged:"
msgstr ""
-#: wt-status.c:372
+#: wt-status.c:370
msgid "new commits, "
msgstr ""
-#: wt-status.c:374
+#: wt-status.c:372
msgid "modified content, "
msgstr ""
-#: wt-status.c:376
+#: wt-status.c:374
msgid "untracked content, "
msgstr ""
-#: wt-status.c:821
+#: wt-status.c:819
#, c-format
msgid "Your stash currently has %d entry"
msgid_plural "Your stash currently has %d entries"
msgstr[0] ""
msgstr[1] ""
-#: wt-status.c:853
+#: wt-status.c:851
msgid "Submodules changed but not updated:"
msgstr ""
-#: wt-status.c:855
+#: wt-status.c:853
msgid "Submodule changes to be committed:"
msgstr ""
-#: wt-status.c:937
+#: wt-status.c:935
msgid ""
-"Do not touch the line above.\n"
-"Everything below will be removed."
+"Do not modify or remove the line above.\n"
+"Everything below it will be ignored."
msgstr ""
-#: wt-status.c:1049
+#: wt-status.c:1048
msgid "You have unmerged paths."
msgstr ""
-#: wt-status.c:1052
+#: wt-status.c:1051
msgid " (fix conflicts and run \"git commit\")"
msgstr ""
-#: wt-status.c:1054
+#: wt-status.c:1053
msgid " (use \"git merge --abort\" to abort the merge)"
msgstr ""
-#: wt-status.c:1059
+#: wt-status.c:1058
msgid "All conflicts fixed but you are still merging."
msgstr ""
-#: wt-status.c:1062
+#: wt-status.c:1061
msgid " (use \"git commit\" to conclude merge)"
msgstr ""
-#: wt-status.c:1072
+#: wt-status.c:1071
msgid "You are in the middle of an am session."
msgstr ""
-#: wt-status.c:1075
+#: wt-status.c:1074
msgid "The current patch is empty."
msgstr ""
-#: wt-status.c:1079
+#: wt-status.c:1078
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr ""
-#: wt-status.c:1081
+#: wt-status.c:1080
msgid " (use \"git am --skip\" to skip this patch)"
msgstr ""
-#: wt-status.c:1083
+#: wt-status.c:1082
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr ""
msgid "cannot %s: Your index contains uncommitted changes."
msgstr ""
-#: compat/precompose_utf8.c:58 builtin/clone.c:436
+#: compat/precompose_utf8.c:58 builtin/clone.c:437
#, c-format
msgid "failed to unlink '%s'"
msgstr ""
msgid "unexpected diff status %c"
msgstr ""
-#: builtin/add.c:87 builtin/commit.c:292
+#: builtin/add.c:87 builtin/commit.c:291
msgid "updating files failed"
msgstr ""
msgid "remove '%s'\n"
msgstr ""
-#: builtin/add.c:151
+#: builtin/add.c:153
msgid "Unstaged changes after refreshing the index:"
msgstr ""
-#: builtin/add.c:211 builtin/rev-parse.c:873
+#: builtin/add.c:213 builtin/rev-parse.c:888
msgid "Could not read the index"
msgstr ""
-#: builtin/add.c:222
+#: builtin/add.c:224
#, c-format
msgid "Could not open '%s' for writing."
msgstr ""
-#: builtin/add.c:226
+#: builtin/add.c:228
msgid "Could not write patch"
msgstr ""
-#: builtin/add.c:229
+#: builtin/add.c:231
msgid "editing patch failed"
msgstr ""
-#: builtin/add.c:232
+#: builtin/add.c:234
#, c-format
msgid "Could not stat '%s'"
msgstr ""
-#: builtin/add.c:234
+#: builtin/add.c:236
msgid "Empty patch. Aborted."
msgstr ""
-#: builtin/add.c:239
+#: builtin/add.c:241
#, c-format
msgid "Could not apply '%s'"
msgstr ""
-#: builtin/add.c:249
+#: builtin/add.c:251
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr ""
-#: builtin/add.c:269 builtin/clean.c:907 builtin/fetch.c:110 builtin/mv.c:124
+#: builtin/add.c:271 builtin/clean.c:910 builtin/fetch.c:132 builtin/mv.c:124
#: builtin/prune-packed.c:55 builtin/pull.c:201 builtin/push.c:529
-#: builtin/remote.c:1332 builtin/rm.c:242 builtin/send-pack.c:164
+#: builtin/remote.c:1333 builtin/rm.c:242 builtin/send-pack.c:164
msgid "dry run"
msgstr ""
-#: builtin/add.c:272
+#: builtin/add.c:274
msgid "interactive picking"
msgstr ""
-#: builtin/add.c:273 builtin/checkout.c:1162 builtin/reset.c:299
+#: builtin/add.c:275 builtin/checkout.c:1172 builtin/reset.c:310
msgid "select hunks interactively"
msgstr ""
-#: builtin/add.c:274
+#: builtin/add.c:276
msgid "edit current diff and apply"
msgstr ""
-#: builtin/add.c:275
+#: builtin/add.c:277
msgid "allow adding otherwise ignored files"
msgstr ""
-#: builtin/add.c:276
+#: builtin/add.c:278
msgid "update tracked files"
msgstr ""
-#: builtin/add.c:277
+#: builtin/add.c:279
msgid "record only the fact that the path will be added later"
msgstr ""
-#: builtin/add.c:278
+#: builtin/add.c:280
msgid "add changes from all tracked and untracked files"
msgstr ""
-#: builtin/add.c:281
+#: builtin/add.c:283
msgid "ignore paths removed in the working tree (same as --no-all)"
msgstr ""
-#: builtin/add.c:283
+#: builtin/add.c:285
msgid "don't add, only refresh the index"
msgstr ""
-#: builtin/add.c:284
+#: builtin/add.c:286
msgid "just skip files which cannot be added because of errors"
msgstr ""
-#: builtin/add.c:285
+#: builtin/add.c:287
msgid "check if - even missing - files are ignored in dry run"
msgstr ""
-#: builtin/add.c:286 builtin/update-index.c:952
+#: builtin/add.c:288 builtin/update-index.c:954
msgid "(+/-)x"
msgstr ""
-#: builtin/add.c:286 builtin/update-index.c:953
+#: builtin/add.c:288 builtin/update-index.c:955
msgid "override the executable bit of the listed files"
msgstr ""
-#: builtin/add.c:288
+#: builtin/add.c:290
msgid "warn when adding an embedded repository"
msgstr ""
-#: builtin/add.c:303
+#: builtin/add.c:305
#, c-format
msgid ""
"You've added another git repository inside your current repository.\n"
"See \"git help submodule\" for more information."
msgstr ""
-#: builtin/add.c:331
+#: builtin/add.c:333
#, c-format
msgid "adding embedded git repository: %s"
msgstr ""
-#: builtin/add.c:349
+#: builtin/add.c:351
#, c-format
msgid "Use -f if you really want to add them.\n"
msgstr ""
-#: builtin/add.c:357
+#: builtin/add.c:359
msgid "adding files failed"
msgstr ""
-#: builtin/add.c:394
+#: builtin/add.c:396
msgid "-A and -u are mutually incompatible"
msgstr ""
-#: builtin/add.c:401
+#: builtin/add.c:403
msgid "Option --ignore-missing can only be used together with --dry-run"
msgstr ""
-#: builtin/add.c:405
+#: builtin/add.c:407
#, c-format
msgid "--chmod param '%s' must be either -x or +x"
msgstr ""
-#: builtin/add.c:420
+#: builtin/add.c:422
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr ""
-#: builtin/add.c:421
+#: builtin/add.c:423
#, c-format
msgid "Maybe you wanted to say 'git add .'?\n"
msgstr ""
-#: builtin/add.c:426 builtin/check-ignore.c:176 builtin/checkout.c:282
-#: builtin/checkout.c:475 builtin/clean.c:954 builtin/commit.c:351
-#: builtin/mv.c:144 builtin/reset.c:238 builtin/rm.c:272
-#: builtin/submodule--helper.c:244
+#: builtin/add.c:428 builtin/check-ignore.c:176 builtin/checkout.c:282
+#: builtin/checkout.c:479 builtin/clean.c:957 builtin/commit.c:350
+#: builtin/mv.c:143 builtin/reset.c:249 builtin/rm.c:271
+#: builtin/submodule--helper.c:243
msgid "index file corrupt"
msgstr ""
-#: builtin/am.c:413
+#: builtin/am.c:414
msgid "could not parse author script"
msgstr ""
-#: builtin/am.c:489
+#: builtin/am.c:498
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr ""
-#: builtin/am.c:530
+#: builtin/am.c:539
#, c-format
msgid "Malformed input line: '%s'."
msgstr ""
-#: builtin/am.c:567
+#: builtin/am.c:576
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr ""
-#: builtin/am.c:593
+#: builtin/am.c:602
msgid "fseek failed"
msgstr ""
-#: builtin/am.c:777
+#: builtin/am.c:786
#, c-format
msgid "could not parse patch '%s'"
msgstr ""
-#: builtin/am.c:842
+#: builtin/am.c:851
msgid "Only one StGIT patch series can be applied at once"
msgstr ""
-#: builtin/am.c:889
+#: builtin/am.c:899
msgid "invalid timestamp"
msgstr ""
-#: builtin/am.c:892 builtin/am.c:900
+#: builtin/am.c:904 builtin/am.c:916
msgid "invalid Date line"
msgstr ""
-#: builtin/am.c:897
+#: builtin/am.c:911
msgid "invalid timezone offset"
msgstr ""
-#: builtin/am.c:986
+#: builtin/am.c:1004
msgid "Patch format detection failed."
msgstr ""
-#: builtin/am.c:991 builtin/clone.c:401
+#: builtin/am.c:1009 builtin/clone.c:402
#, c-format
msgid "failed to create directory '%s'"
msgstr ""
-#: builtin/am.c:995
+#: builtin/am.c:1013
msgid "Failed to split patches."
msgstr ""
-#: builtin/am.c:1120 builtin/commit.c:377
+#: builtin/am.c:1142 builtin/commit.c:376
msgid "unable to write index file"
msgstr ""
-#: builtin/am.c:1171
+#: builtin/am.c:1193
#, c-format
msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr ""
-#: builtin/am.c:1172
+#: builtin/am.c:1194
#, c-format
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr ""
-#: builtin/am.c:1173
+#: builtin/am.c:1195
#, c-format
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr ""
-#: builtin/am.c:1304
+#: builtin/am.c:1302
msgid "Patch is empty."
msgstr ""
-#: builtin/am.c:1370
+#: builtin/am.c:1368
#, c-format
msgid "invalid ident line: %.*s"
msgstr ""
-#: builtin/am.c:1392
+#: builtin/am.c:1390
#, c-format
msgid "unable to parse commit %s"
msgstr ""
-#: builtin/am.c:1586
+#: builtin/am.c:1584
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr ""
-#: builtin/am.c:1588
+#: builtin/am.c:1586
msgid "Using index info to reconstruct a base tree..."
msgstr ""
-#: builtin/am.c:1607
+#: builtin/am.c:1605
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
msgstr ""
-#: builtin/am.c:1613
+#: builtin/am.c:1611
msgid "Falling back to patching base and 3-way merge..."
msgstr ""
-#: builtin/am.c:1638
+#: builtin/am.c:1636
msgid "Failed to merge in the changes."
msgstr ""
-#: builtin/am.c:1662 builtin/merge.c:632
+#: builtin/am.c:1660 builtin/merge.c:641
msgid "git write-tree failed to write a tree"
msgstr ""
-#: builtin/am.c:1669
+#: builtin/am.c:1667
msgid "applying to an empty history"
msgstr ""
-#: builtin/am.c:1682 builtin/commit.c:1767 builtin/merge.c:803
-#: builtin/merge.c:828
+#: builtin/am.c:1680 builtin/commit.c:1776 builtin/merge.c:824
+#: builtin/merge.c:849
msgid "failed to write commit object"
msgstr ""
-#: builtin/am.c:1715 builtin/am.c:1719
+#: builtin/am.c:1713 builtin/am.c:1717
#, c-format
msgid "cannot resume: %s does not exist."
msgstr ""
-#: builtin/am.c:1735
+#: builtin/am.c:1733
msgid "cannot be interactive without stdin connected to a terminal."
msgstr ""
-#: builtin/am.c:1740
+#: builtin/am.c:1738
msgid "Commit Body is:"
msgstr ""
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1750
+#: builtin/am.c:1748
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr ""
-#: builtin/am.c:1800
+#: builtin/am.c:1798
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr ""
-#: builtin/am.c:1840 builtin/am.c:1912
+#: builtin/am.c:1838 builtin/am.c:1910
#, c-format
msgid "Applying: %.*s"
msgstr ""
-#: builtin/am.c:1856
+#: builtin/am.c:1854
msgid "No changes -- Patch already applied."
msgstr ""
-#: builtin/am.c:1864
+#: builtin/am.c:1862
#, c-format
msgid "Patch failed at %s %.*s"
msgstr ""
-#: builtin/am.c:1870
+#: builtin/am.c:1868
#, c-format
msgid "The copy of the patch that failed is found in: %s"
msgstr ""
-#: builtin/am.c:1915
+#: builtin/am.c:1913
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:1922
+#: builtin/am.c:1920
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:2031 builtin/am.c:2035 builtin/am.c:2047 builtin/reset.c:323
-#: builtin/reset.c:331
+#: builtin/am.c:2029 builtin/am.c:2033 builtin/am.c:2045 builtin/reset.c:332
+#: builtin/reset.c:340
#, c-format
msgid "Could not parse object '%s'."
msgstr ""
-#: builtin/am.c:2083
+#: builtin/am.c:2081
msgid "failed to clean index"
msgstr ""
-#: builtin/am.c:2117
+#: builtin/am.c:2116
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
msgstr ""
-#: builtin/am.c:2180
+#: builtin/am.c:2179
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr ""
-#: builtin/am.c:2213
+#: builtin/am.c:2212
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr ""
-#: builtin/am.c:2214
+#: builtin/am.c:2213
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr ""
-#: builtin/am.c:2220
+#: builtin/am.c:2219
msgid "run interactively"
msgstr ""
-#: builtin/am.c:2222
+#: builtin/am.c:2221
msgid "historical option -- no-op"
msgstr ""
-#: builtin/am.c:2224
+#: builtin/am.c:2223
msgid "allow fall back on 3way merging if needed"
msgstr ""
-#: builtin/am.c:2225 builtin/init-db.c:484 builtin/prune-packed.c:57
+#: builtin/am.c:2224 builtin/init-db.c:484 builtin/prune-packed.c:57
#: builtin/repack.c:180
msgid "be quiet"
msgstr ""
-#: builtin/am.c:2227
+#: builtin/am.c:2226
msgid "add a Signed-off-by line to the commit message"
msgstr ""
-#: builtin/am.c:2230
+#: builtin/am.c:2229
msgid "recode into utf8 (default)"
msgstr ""
-#: builtin/am.c:2232
+#: builtin/am.c:2231
msgid "pass -k flag to git-mailinfo"
msgstr ""
-#: builtin/am.c:2234
+#: builtin/am.c:2233
msgid "pass -b flag to git-mailinfo"
msgstr ""
-#: builtin/am.c:2236
+#: builtin/am.c:2235
msgid "pass -m flag to git-mailinfo"
msgstr ""
-#: builtin/am.c:2238
+#: builtin/am.c:2237
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr ""
-#: builtin/am.c:2241
+#: builtin/am.c:2240
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr ""
-#: builtin/am.c:2244
+#: builtin/am.c:2243
msgid "strip everything before a scissors line"
msgstr ""
-#: builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252 builtin/am.c:2255
-#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267
-#: builtin/am.c:2273
+#: builtin/am.c:2245 builtin/am.c:2248 builtin/am.c:2251 builtin/am.c:2254
+#: builtin/am.c:2257 builtin/am.c:2260 builtin/am.c:2263 builtin/am.c:2266
+#: builtin/am.c:2272
msgid "pass it through git-apply"
msgstr ""
-#: builtin/am.c:2263 builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666
-#: builtin/grep.c:1064 builtin/merge.c:202 builtin/pull.c:142
-#: builtin/pull.c:197 builtin/repack.c:189 builtin/repack.c:193
-#: builtin/repack.c:195 builtin/show-branch.c:631 builtin/show-ref.c:169
-#: builtin/tag.c:399 parse-options.h:132 parse-options.h:134
-#: parse-options.h:245
+#: builtin/am.c:2262 builtin/fmt-merge-msg.c:664 builtin/fmt-merge-msg.c:667
+#: builtin/grep.c:843 builtin/merge.c:205 builtin/pull.c:142 builtin/pull.c:197
+#: builtin/repack.c:189 builtin/repack.c:193 builtin/repack.c:195
+#: builtin/show-branch.c:631 builtin/show-ref.c:169 builtin/tag.c:377
+#: parse-options.h:132 parse-options.h:134 parse-options.h:245
msgid "n"
msgstr ""
-#: builtin/am.c:2269 builtin/branch.c:596 builtin/for-each-ref.c:38
-#: builtin/replace.c:444 builtin/tag.c:434 builtin/verify-tag.c:39
+#: builtin/am.c:2268 builtin/branch.c:622 builtin/for-each-ref.c:38
+#: builtin/replace.c:444 builtin/tag.c:412 builtin/verify-tag.c:39
msgid "format"
msgstr ""
-#: builtin/am.c:2270
+#: builtin/am.c:2269
msgid "format the patch(es) are in"
msgstr ""
-#: builtin/am.c:2276
+#: builtin/am.c:2275
msgid "override error message when patch failure occurs"
msgstr ""
-#: builtin/am.c:2278
+#: builtin/am.c:2277
msgid "continue applying patches after resolving a conflict"
msgstr ""
-#: builtin/am.c:2281
+#: builtin/am.c:2280
msgid "synonyms for --continue"
msgstr ""
-#: builtin/am.c:2284
+#: builtin/am.c:2283
msgid "skip the current patch"
msgstr ""
-#: builtin/am.c:2287
+#: builtin/am.c:2286
msgid "restore the original branch and abort the patching operation."
msgstr ""
-#: builtin/am.c:2291
+#: builtin/am.c:2290
msgid "lie about committer date"
msgstr ""
-#: builtin/am.c:2293
+#: builtin/am.c:2292
msgid "use current timestamp for author date"
msgstr ""
-#: builtin/am.c:2295 builtin/commit.c:1605 builtin/merge.c:233
-#: builtin/pull.c:172 builtin/revert.c:112 builtin/tag.c:414
+#: builtin/am.c:2294 builtin/commit.c:1614 builtin/merge.c:236
+#: builtin/pull.c:172 builtin/revert.c:112 builtin/tag.c:392
msgid "key-id"
msgstr ""
-#: builtin/am.c:2296
+#: builtin/am.c:2295
msgid "GPG-sign commits"
msgstr ""
-#: builtin/am.c:2299
+#: builtin/am.c:2298
msgid "(internal use for git-rebase)"
msgstr ""
-#: builtin/am.c:2317
+#: builtin/am.c:2316
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:2324
+#: builtin/am.c:2323
msgid "failed to read the index"
msgstr ""
-#: builtin/am.c:2339
+#: builtin/am.c:2338
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr ""
-#: builtin/am.c:2363
+#: builtin/am.c:2362
#, c-format
msgid ""
"Stray %s directory found.\n"
"Use \"git am --abort\" to remove it."
msgstr ""
-#: builtin/am.c:2369
+#: builtin/am.c:2368
msgid "Resolve operation not in progress, we are not resuming."
msgstr ""
msgstr ""
#: builtin/branch.c:31
-msgid "git branch [<options>] [-r | -a] [--points-at]"
+msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
msgstr ""
#: builtin/branch.c:32
+msgid "git branch [<options>] [-r | -a] [--points-at]"
+msgstr ""
+
+#: builtin/branch.c:33
msgid "git branch [<options>] [-r | -a] [--format]"
msgstr ""
-#: builtin/branch.c:145
+#: builtin/branch.c:146
#, c-format
msgid ""
"deleting branch '%s' that has been merged to\n"
" '%s', but not yet merged to HEAD."
msgstr ""
-#: builtin/branch.c:149
+#: builtin/branch.c:150
#, c-format
msgid ""
"not deleting branch '%s' that is not yet merged to\n"
" '%s', even though it is merged to HEAD."
msgstr ""
-#: builtin/branch.c:163
+#: builtin/branch.c:164
#, c-format
msgid "Couldn't look up commit object for '%s'"
msgstr ""
-#: builtin/branch.c:167
+#: builtin/branch.c:168
#, c-format
msgid ""
"The branch '%s' is not fully merged.\n"
"If you are sure you want to delete it, run 'git branch -D %s'."
msgstr ""
-#: builtin/branch.c:180
+#: builtin/branch.c:181
msgid "Update of config-file failed"
msgstr ""
-#: builtin/branch.c:211
+#: builtin/branch.c:212
msgid "cannot use -a with -d"
msgstr ""
-#: builtin/branch.c:217
+#: builtin/branch.c:218
msgid "Couldn't look up commit object for HEAD"
msgstr ""
-#: builtin/branch.c:231
+#: builtin/branch.c:232
#, c-format
msgid "Cannot delete branch '%s' checked out at '%s'"
msgstr ""
-#: builtin/branch.c:246
+#: builtin/branch.c:247
#, c-format
msgid "remote-tracking branch '%s' not found."
msgstr ""
-#: builtin/branch.c:247
+#: builtin/branch.c:248
#, c-format
msgid "branch '%s' not found."
msgstr ""
-#: builtin/branch.c:262
+#: builtin/branch.c:263
#, c-format
msgid "Error deleting remote-tracking branch '%s'"
msgstr ""
-#: builtin/branch.c:263
+#: builtin/branch.c:264
#, c-format
msgid "Error deleting branch '%s'"
msgstr ""
-#: builtin/branch.c:270
+#: builtin/branch.c:271
#, c-format
msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr ""
-#: builtin/branch.c:271
+#: builtin/branch.c:272
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr ""
-#: builtin/branch.c:445
+#: builtin/branch.c:417 builtin/tag.c:58
+msgid "unable to parse format string"
+msgstr ""
+
+#: builtin/branch.c:450
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr ""
-#: builtin/branch.c:449
+#: builtin/branch.c:454
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr ""
-#: builtin/branch.c:464
+#: builtin/branch.c:470
+msgid "cannot copy the current branch while not on any."
+msgstr ""
+
+#: builtin/branch.c:472
msgid "cannot rename the current branch while not on any."
msgstr ""
-#: builtin/branch.c:474
+#: builtin/branch.c:483
#, c-format
msgid "Invalid branch name: '%s'"
msgstr ""
-#: builtin/branch.c:491
+#: builtin/branch.c:504
msgid "Branch rename failed"
msgstr ""
-#: builtin/branch.c:494
+#: builtin/branch.c:506
+msgid "Branch copy failed"
+msgstr ""
+
+#: builtin/branch.c:510
+#, c-format
+msgid "Copied a misnamed branch '%s' away"
+msgstr ""
+
+#: builtin/branch.c:513
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr ""
-#: builtin/branch.c:497
+#: builtin/branch.c:519
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr ""
-#: builtin/branch.c:506
+#: builtin/branch.c:528
msgid "Branch is renamed, but update of config-file failed"
msgstr ""
-#: builtin/branch.c:522
+#: builtin/branch.c:530
+msgid "Branch is copied, but update of config-file failed"
+msgstr ""
+
+#: builtin/branch.c:546
#, c-format
msgid ""
"Please edit the description for the branch\n"
"Lines starting with '%c' will be stripped.\n"
msgstr ""
-#: builtin/branch.c:555
+#: builtin/branch.c:579
msgid "Generic options"
msgstr ""
-#: builtin/branch.c:557
+#: builtin/branch.c:581
msgid "show hash and subject, give twice for upstream branch"
msgstr ""
-#: builtin/branch.c:558
+#: builtin/branch.c:582
msgid "suppress informational messages"
msgstr ""
-#: builtin/branch.c:559
+#: builtin/branch.c:583
msgid "set up tracking mode (see git-pull(1))"
msgstr ""
-#: builtin/branch.c:561
-msgid "change upstream info"
+#: builtin/branch.c:585
+msgid "do not use"
msgstr ""
-#: builtin/branch.c:563
+#: builtin/branch.c:587
msgid "upstream"
msgstr ""
-#: builtin/branch.c:563
+#: builtin/branch.c:587
msgid "change the upstream info"
msgstr ""
-#: builtin/branch.c:564
+#: builtin/branch.c:588
msgid "Unset the upstream info"
msgstr ""
-#: builtin/branch.c:565
+#: builtin/branch.c:589
msgid "use colored output"
msgstr ""
-#: builtin/branch.c:566
+#: builtin/branch.c:590
msgid "act on remote-tracking branches"
msgstr ""
-#: builtin/branch.c:568 builtin/branch.c:570
+#: builtin/branch.c:592 builtin/branch.c:594
msgid "print only branches that contain the commit"
msgstr ""
-#: builtin/branch.c:569 builtin/branch.c:571
+#: builtin/branch.c:593 builtin/branch.c:595
msgid "print only branches that don't contain the commit"
msgstr ""
-#: builtin/branch.c:574
+#: builtin/branch.c:598
msgid "Specific git-branch actions:"
msgstr ""
-#: builtin/branch.c:575
+#: builtin/branch.c:599
msgid "list both remote-tracking and local branches"
msgstr ""
-#: builtin/branch.c:577
+#: builtin/branch.c:601
msgid "delete fully merged branch"
msgstr ""
-#: builtin/branch.c:578
+#: builtin/branch.c:602
msgid "delete branch (even if not merged)"
msgstr ""
-#: builtin/branch.c:579
+#: builtin/branch.c:603
msgid "move/rename a branch and its reflog"
msgstr ""
-#: builtin/branch.c:580
+#: builtin/branch.c:604
msgid "move/rename a branch, even if target exists"
msgstr ""
-#: builtin/branch.c:581
+#: builtin/branch.c:605
+msgid "copy a branch and its reflog"
+msgstr ""
+
+#: builtin/branch.c:606
+msgid "copy a branch, even if target exists"
+msgstr ""
+
+#: builtin/branch.c:607
msgid "list branch names"
msgstr ""
-#: builtin/branch.c:582
+#: builtin/branch.c:608
msgid "create the branch's reflog"
msgstr ""
-#: builtin/branch.c:584
+#: builtin/branch.c:610
msgid "edit the description for the branch"
msgstr ""
-#: builtin/branch.c:585
+#: builtin/branch.c:611
msgid "force creation, move/rename, deletion"
msgstr ""
-#: builtin/branch.c:586
+#: builtin/branch.c:612
msgid "print only branches that are merged"
msgstr ""
-#: builtin/branch.c:587
+#: builtin/branch.c:613
msgid "print only branches that are not merged"
msgstr ""
-#: builtin/branch.c:588
+#: builtin/branch.c:614
msgid "list branches in columns"
msgstr ""
-#: builtin/branch.c:589 builtin/for-each-ref.c:39 builtin/tag.c:427
+#: builtin/branch.c:615 builtin/for-each-ref.c:40 builtin/tag.c:405
msgid "key"
msgstr ""
-#: builtin/branch.c:590 builtin/for-each-ref.c:40 builtin/tag.c:428
+#: builtin/branch.c:616 builtin/for-each-ref.c:41 builtin/tag.c:406
msgid "field name to sort on"
msgstr ""
-#: builtin/branch.c:592 builtin/for-each-ref.c:42 builtin/notes.c:407
-#: builtin/notes.c:410 builtin/notes.c:570 builtin/notes.c:573
-#: builtin/tag.c:430
+#: builtin/branch.c:618 builtin/for-each-ref.c:43 builtin/notes.c:408
+#: builtin/notes.c:411 builtin/notes.c:571 builtin/notes.c:574
+#: builtin/tag.c:408
msgid "object"
msgstr ""
-#: builtin/branch.c:593
+#: builtin/branch.c:619
msgid "print only branches of the object"
msgstr ""
-#: builtin/branch.c:595 builtin/for-each-ref.c:48 builtin/tag.c:435
+#: builtin/branch.c:621 builtin/for-each-ref.c:49 builtin/tag.c:415
msgid "sorting and filtering are case insensitive"
msgstr ""
-#: builtin/branch.c:596 builtin/for-each-ref.c:38 builtin/tag.c:434
+#: builtin/branch.c:622 builtin/for-each-ref.c:38 builtin/tag.c:413
#: builtin/verify-tag.c:39
msgid "format to use for the output"
msgstr ""
-#: builtin/branch.c:615
-msgid "Failed to resolve HEAD as a valid ref."
-msgstr ""
-
-#: builtin/branch.c:619 builtin/clone.c:728
+#: builtin/branch.c:645 builtin/clone.c:729
msgid "HEAD not found below refs/heads!"
msgstr ""
-#: builtin/branch.c:642
+#: builtin/branch.c:668
msgid "--column and --verbose are incompatible"
msgstr ""
-#: builtin/branch.c:653 builtin/branch.c:705
+#: builtin/branch.c:680 builtin/branch.c:732 builtin/branch.c:741
msgid "branch name required"
msgstr ""
-#: builtin/branch.c:681
+#: builtin/branch.c:708
msgid "Cannot give description to detached HEAD"
msgstr ""
-#: builtin/branch.c:686
+#: builtin/branch.c:713
msgid "cannot edit description of more than one branch"
msgstr ""
-#: builtin/branch.c:693
+#: builtin/branch.c:720
#, c-format
msgid "No commit on branch '%s' yet."
msgstr ""
-#: builtin/branch.c:696
+#: builtin/branch.c:723
#, c-format
msgid "No branch named '%s'."
msgstr ""
-#: builtin/branch.c:711
-msgid "too many branches for a rename operation"
+#: builtin/branch.c:738
+msgid "too many branches for a copy operation"
msgstr ""
-#: builtin/branch.c:716
-msgid "too many branches to set new upstream"
+#: builtin/branch.c:747
+msgid "too many arguments for a rename operation"
msgstr ""
-#: builtin/branch.c:720
+#: builtin/branch.c:752
+msgid "too many arguments to set new upstream"
+msgstr ""
+
+#: builtin/branch.c:756
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
msgstr ""
-#: builtin/branch.c:723 builtin/branch.c:745 builtin/branch.c:766
+#: builtin/branch.c:759 builtin/branch.c:781 builtin/branch.c:800
#, c-format
msgid "no such branch '%s'"
msgstr ""
-#: builtin/branch.c:727
+#: builtin/branch.c:763
#, c-format
msgid "branch '%s' does not exist"
msgstr ""
-#: builtin/branch.c:739
-msgid "too many branches to unset upstream"
+#: builtin/branch.c:775
+msgid "too many arguments to unset upstream"
msgstr ""
-#: builtin/branch.c:743
+#: builtin/branch.c:779
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr ""
-#: builtin/branch.c:749
+#: builtin/branch.c:785
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr ""
-#: builtin/branch.c:763
+#: builtin/branch.c:797
msgid "it does not make sense to create 'HEAD' manually"
msgstr ""
-#: builtin/branch.c:769
+#: builtin/branch.c:803
msgid "-a and -r options to 'git branch' do not make sense with a branch name"
msgstr ""
-#: builtin/branch.c:772
-#, c-format
-msgid ""
-"The --set-upstream flag is deprecated and will be removed. Consider using --"
-"track or --set-upstream-to\n"
-msgstr ""
-
-#: builtin/branch.c:789
-#, c-format
+#: builtin/branch.c:806
msgid ""
-"\n"
-"If you wanted to make '%s' track '%s', do this:\n"
-"\n"
+"the '--set-upstream' option is no longer supported. Please use '--track' or "
+"'--set-upstream-to' instead."
msgstr ""
#: builtin/bundle.c:45
msgid "Need a repository to unbundle."
msgstr ""
-#: builtin/cat-file.c:519
+#: builtin/cat-file.c:521
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:520
+#: builtin/cat-file.c:522
msgid ""
"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
"filters]"
msgstr ""
-#: builtin/cat-file.c:557
+#: builtin/cat-file.c:559
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr ""
-#: builtin/cat-file.c:558
+#: builtin/cat-file.c:560
msgid "show object type"
msgstr ""
-#: builtin/cat-file.c:559
+#: builtin/cat-file.c:561
msgid "show object size"
msgstr ""
-#: builtin/cat-file.c:561
+#: builtin/cat-file.c:563
msgid "exit with zero when there's no error"
msgstr ""
-#: builtin/cat-file.c:562
+#: builtin/cat-file.c:564
msgid "pretty-print object's content"
msgstr ""
-#: builtin/cat-file.c:564
+#: builtin/cat-file.c:566
msgid "for blob objects, run textconv on object's content"
msgstr ""
-#: builtin/cat-file.c:566
+#: builtin/cat-file.c:568
msgid "for blob objects, run filters on object's content"
msgstr ""
-#: builtin/cat-file.c:567 git-submodule.sh:944
+#: builtin/cat-file.c:569 git-submodule.sh:943
msgid "blob"
msgstr ""
-#: builtin/cat-file.c:568
+#: builtin/cat-file.c:570
msgid "use a specific path for --textconv/--filters"
msgstr ""
-#: builtin/cat-file.c:570
+#: builtin/cat-file.c:572
msgid "allow -s and -t to work with broken/corrupt objects"
msgstr ""
-#: builtin/cat-file.c:571
+#: builtin/cat-file.c:573
msgid "buffer --batch output"
msgstr ""
-#: builtin/cat-file.c:573
+#: builtin/cat-file.c:575
msgid "show info and content of objects fed from the standard input"
msgstr ""
-#: builtin/cat-file.c:576
+#: builtin/cat-file.c:578
msgid "show info about objects fed from the standard input"
msgstr ""
-#: builtin/cat-file.c:579
+#: builtin/cat-file.c:581
msgid "follow in-tree symlinks (used with --batch or --batch-check)"
msgstr ""
-#: builtin/cat-file.c:581
+#: builtin/cat-file.c:583
msgid "show all objects with --batch or --batch-check"
msgstr ""
msgid "terminate input and output records by a NUL character"
msgstr ""
-#: builtin/check-ignore.c:20 builtin/checkout.c:1143 builtin/gc.c:357
+#: builtin/check-ignore.c:20 builtin/checkout.c:1153 builtin/gc.c:358
msgid "suppress progress reporting"
msgstr ""
msgstr ""
#: builtin/checkout-index.c:175 builtin/column.c:31
-#: builtin/submodule--helper.c:635 builtin/submodule--helper.c:638
-#: builtin/submodule--helper.c:644 builtin/submodule--helper.c:980
-#: builtin/worktree.c:478
+#: builtin/submodule--helper.c:628 builtin/submodule--helper.c:631
+#: builtin/submodule--helper.c:637 builtin/submodule--helper.c:999
+#: builtin/worktree.c:498
msgid "string"
msgstr ""
msgid "path '%s' is unmerged"
msgstr ""
-#: builtin/checkout.c:497
+#: builtin/checkout.c:501
msgid "you need to resolve your current index first"
msgstr ""
-#: builtin/checkout.c:628
+#: builtin/checkout.c:632
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr ""
-#: builtin/checkout.c:669
+#: builtin/checkout.c:673
msgid "HEAD is now at"
msgstr ""
-#: builtin/checkout.c:673 builtin/clone.c:682
+#: builtin/checkout.c:677 builtin/clone.c:683
msgid "unable to update HEAD"
msgstr ""
-#: builtin/checkout.c:677
+#: builtin/checkout.c:681
#, c-format
msgid "Reset branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:680
+#: builtin/checkout.c:684
#, c-format
msgid "Already on '%s'\n"
msgstr ""
-#: builtin/checkout.c:684
+#: builtin/checkout.c:688
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:686 builtin/checkout.c:1075
+#: builtin/checkout.c:690 builtin/checkout.c:1086
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:688
+#: builtin/checkout.c:692
#, c-format
msgid "Switched to branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:739
+#: builtin/checkout.c:743
#, c-format
msgid " ... and %d more.\n"
msgstr ""
-#: builtin/checkout.c:745
+#: builtin/checkout.c:749
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
msgstr[0] ""
msgstr[1] ""
-#: builtin/checkout.c:764
+#: builtin/checkout.c:768
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
msgstr[0] ""
msgstr[1] ""
-#: builtin/checkout.c:800
+#: builtin/checkout.c:809
msgid "internal error in revision walk"
msgstr ""
-#: builtin/checkout.c:804
+#: builtin/checkout.c:813
msgid "Previous HEAD position was"
msgstr ""
-#: builtin/checkout.c:832 builtin/checkout.c:1070
+#: builtin/checkout.c:843 builtin/checkout.c:1081
msgid "You are on a branch yet to be born"
msgstr ""
-#: builtin/checkout.c:976
+#: builtin/checkout.c:987
#, c-format
msgid "only one reference expected, %d given."
msgstr ""
-#: builtin/checkout.c:1016 builtin/worktree.c:215
+#: builtin/checkout.c:1027 builtin/worktree.c:233
#, c-format
msgid "invalid reference: %s"
msgstr ""
-#: builtin/checkout.c:1045
+#: builtin/checkout.c:1056
#, c-format
msgid "reference is not a tree: %s"
msgstr ""
-#: builtin/checkout.c:1084
+#: builtin/checkout.c:1095
msgid "paths cannot be used with switching branches"
msgstr ""
-#: builtin/checkout.c:1087 builtin/checkout.c:1091
+#: builtin/checkout.c:1098 builtin/checkout.c:1102
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr ""
-#: builtin/checkout.c:1095 builtin/checkout.c:1098 builtin/checkout.c:1103
-#: builtin/checkout.c:1106
+#: builtin/checkout.c:1106 builtin/checkout.c:1109 builtin/checkout.c:1114
+#: builtin/checkout.c:1117
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr ""
-#: builtin/checkout.c:1111
+#: builtin/checkout.c:1122
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr ""
-#: builtin/checkout.c:1144 builtin/checkout.c:1146 builtin/clone.c:113
-#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:328
-#: builtin/worktree.c:330
+#: builtin/checkout.c:1154 builtin/checkout.c:1156 builtin/clone.c:114
+#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:346
+#: builtin/worktree.c:348
msgid "branch"
msgstr ""
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1155
msgid "create and checkout a new branch"
msgstr ""
-#: builtin/checkout.c:1147
+#: builtin/checkout.c:1157
msgid "create/reset and checkout a branch"
msgstr ""
-#: builtin/checkout.c:1148
+#: builtin/checkout.c:1158
msgid "create reflog for new branch"
msgstr ""
-#: builtin/checkout.c:1149 builtin/worktree.c:332
+#: builtin/checkout.c:1159 builtin/worktree.c:350
msgid "detach HEAD at named commit"
msgstr ""
-#: builtin/checkout.c:1150
+#: builtin/checkout.c:1160
msgid "set upstream info for new branch"
msgstr ""
-#: builtin/checkout.c:1152
+#: builtin/checkout.c:1162
msgid "new-branch"
msgstr ""
-#: builtin/checkout.c:1152
+#: builtin/checkout.c:1162
msgid "new unparented branch"
msgstr ""
-#: builtin/checkout.c:1153
+#: builtin/checkout.c:1163
msgid "checkout our version for unmerged files"
msgstr ""
-#: builtin/checkout.c:1155
+#: builtin/checkout.c:1165
msgid "checkout their version for unmerged files"
msgstr ""
-#: builtin/checkout.c:1157
+#: builtin/checkout.c:1167
msgid "force checkout (throw away local modifications)"
msgstr ""
-#: builtin/checkout.c:1158
+#: builtin/checkout.c:1168
msgid "perform a 3-way merge with the new branch"
msgstr ""
-#: builtin/checkout.c:1159 builtin/merge.c:235
+#: builtin/checkout.c:1169 builtin/merge.c:238
msgid "update ignored files (default)"
msgstr ""
-#: builtin/checkout.c:1160 builtin/log.c:1483 parse-options.h:251
+#: builtin/checkout.c:1170 builtin/log.c:1489 parse-options.h:251
msgid "style"
msgstr ""
-#: builtin/checkout.c:1161
+#: builtin/checkout.c:1171
msgid "conflict style (merge or diff3)"
msgstr ""
-#: builtin/checkout.c:1164
+#: builtin/checkout.c:1174
msgid "do not limit pathspecs to sparse entries only"
msgstr ""
-#: builtin/checkout.c:1166
+#: builtin/checkout.c:1176
msgid "second guess 'git checkout <no-such-branch>'"
msgstr ""
-#: builtin/checkout.c:1168
+#: builtin/checkout.c:1178
msgid "do not check if another worktree is holding the given ref"
msgstr ""
-#: builtin/checkout.c:1172 builtin/clone.c:80 builtin/fetch.c:114
-#: builtin/merge.c:232 builtin/pull.c:120 builtin/push.c:544
+#: builtin/checkout.c:1182 builtin/clone.c:81 builtin/fetch.c:136
+#: builtin/merge.c:235 builtin/pull.c:120 builtin/push.c:544
#: builtin/send-pack.c:173
msgid "force progress reporting"
msgstr ""
-#: builtin/checkout.c:1203
+#: builtin/checkout.c:1212
msgid "-b, -B and --orphan are mutually exclusive"
msgstr ""
-#: builtin/checkout.c:1220
+#: builtin/checkout.c:1229
msgid "--track needs a branch name"
msgstr ""
-#: builtin/checkout.c:1225
+#: builtin/checkout.c:1234
msgid "Missing branch name; try -b"
msgstr ""
-#: builtin/checkout.c:1261
+#: builtin/checkout.c:1270
msgid "invalid path specification"
msgstr ""
-#: builtin/checkout.c:1268
+#: builtin/checkout.c:1277
#, c-format
msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
msgstr ""
-#: builtin/checkout.c:1272
+#: builtin/checkout.c:1281
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr ""
-#: builtin/checkout.c:1276
+#: builtin/checkout.c:1285
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
msgid "failed to remove %s"
msgstr ""
-#: builtin/clean.c:298 git-add--interactive.perl:572
+#: builtin/clean.c:301 git-add--interactive.perl:572
#, c-format
msgid ""
"Prompt help:\n"
" - (empty) select nothing\n"
msgstr ""
-#: builtin/clean.c:302 git-add--interactive.perl:581
+#: builtin/clean.c:305 git-add--interactive.perl:581
#, c-format
msgid ""
"Prompt help:\n"
" - (empty) finish selecting\n"
msgstr ""
-#: builtin/clean.c:518 git-add--interactive.perl:547
+#: builtin/clean.c:521 git-add--interactive.perl:547
#: git-add--interactive.perl:552
#, c-format, perl-format
msgid "Huh (%s)?\n"
msgstr ""
-#: builtin/clean.c:660
+#: builtin/clean.c:663
#, c-format
msgid "Input ignore patterns>> "
msgstr ""
-#: builtin/clean.c:697
+#: builtin/clean.c:700
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
msgstr ""
-#: builtin/clean.c:718
+#: builtin/clean.c:721
msgid "Select items to delete"
msgstr ""
#. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:759
+#: builtin/clean.c:762
#, c-format
msgid "Remove %s [y/N]? "
msgstr ""
-#: builtin/clean.c:784 git-add--interactive.perl:1616
+#: builtin/clean.c:787 git-add--interactive.perl:1616
#, c-format
msgid "Bye.\n"
msgstr ""
-#: builtin/clean.c:792
+#: 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:819 git-add--interactive.perl:1692
+#: builtin/clean.c:822 git-add--interactive.perl:1692
msgid "*** Commands ***"
msgstr ""
-#: builtin/clean.c:820 git-add--interactive.perl:1689
+#: builtin/clean.c:823 git-add--interactive.perl:1689
msgid "What now"
msgstr ""
-#: builtin/clean.c:828
+#: builtin/clean.c:831
msgid "Would remove the following item:"
msgid_plural "Would remove the following items:"
msgstr[0] ""
msgstr[1] ""
-#: builtin/clean.c:844
+#: builtin/clean.c:847
msgid "No more files to clean, exiting."
msgstr ""
-#: builtin/clean.c:906
+#: builtin/clean.c:909
msgid "do not print names of files removed"
msgstr ""
-#: builtin/clean.c:908
+#: builtin/clean.c:911
msgid "force"
msgstr ""
-#: builtin/clean.c:909
+#: builtin/clean.c:912
msgid "interactive cleaning"
msgstr ""
-#: builtin/clean.c:911
+#: builtin/clean.c:914
msgid "remove whole directories"
msgstr ""
-#: builtin/clean.c:912 builtin/describe.c:452 builtin/describe.c:454
-#: builtin/grep.c:1082 builtin/ls-files.c:546 builtin/name-rev.c:397
+#: builtin/clean.c:915 builtin/describe.c:463 builtin/describe.c:465
+#: builtin/grep.c:861 builtin/ls-files.c:544 builtin/name-rev.c:397
#: builtin/name-rev.c:399 builtin/show-ref.c:176
msgid "pattern"
msgstr ""
-#: builtin/clean.c:913
+#: builtin/clean.c:916
msgid "add <pattern> to ignore rules"
msgstr ""
-#: builtin/clean.c:914
+#: builtin/clean.c:917
msgid "remove ignored files, too"
msgstr ""
-#: builtin/clean.c:916
+#: builtin/clean.c:919
msgid "remove only ignored files"
msgstr ""
-#: builtin/clean.c:934
+#: builtin/clean.c:937
msgid "-x and -X cannot be used together"
msgstr ""
-#: builtin/clean.c:938
+#: builtin/clean.c:941
msgid ""
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
"clean"
msgstr ""
-#: builtin/clean.c:941
+#: builtin/clean.c:944
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
msgstr ""
-#: builtin/clone.c:38
+#: builtin/clone.c:39
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr ""
-#: builtin/clone.c:82
+#: builtin/clone.c:83
msgid "don't create a checkout"
msgstr ""
-#: builtin/clone.c:83 builtin/clone.c:85 builtin/init-db.c:479
+#: builtin/clone.c:84 builtin/clone.c:86 builtin/init-db.c:479
msgid "create a bare repository"
msgstr ""
-#: builtin/clone.c:87
+#: builtin/clone.c:88
msgid "create a mirror repository (implies bare)"
msgstr ""
-#: builtin/clone.c:89
+#: builtin/clone.c:90
msgid "to clone from a local repository"
msgstr ""
-#: builtin/clone.c:91
+#: builtin/clone.c:92
msgid "don't use local hardlinks, always copy"
msgstr ""
-#: builtin/clone.c:93
+#: builtin/clone.c:94
msgid "setup as shared repository"
msgstr ""
-#: builtin/clone.c:95 builtin/clone.c:99
+#: builtin/clone.c:96 builtin/clone.c:100
msgid "pathspec"
msgstr ""
-#: builtin/clone.c:95 builtin/clone.c:99
+#: builtin/clone.c:96 builtin/clone.c:100
msgid "initialize submodules in the clone"
msgstr ""
-#: builtin/clone.c:102
+#: builtin/clone.c:103
msgid "number of submodules cloned in parallel"
msgstr ""
-#: builtin/clone.c:103 builtin/init-db.c:476
+#: builtin/clone.c:104 builtin/init-db.c:476
msgid "template-directory"
msgstr ""
-#: builtin/clone.c:104 builtin/init-db.c:477
+#: builtin/clone.c:105 builtin/init-db.c:477
msgid "directory from which templates will be used"
msgstr ""
-#: builtin/clone.c:106 builtin/clone.c:108 builtin/submodule--helper.c:642
-#: builtin/submodule--helper.c:983
+#: builtin/clone.c:107 builtin/clone.c:109 builtin/submodule--helper.c:635
+#: builtin/submodule--helper.c:1002
msgid "reference repository"
msgstr ""
-#: builtin/clone.c:110
+#: builtin/clone.c:111
msgid "use --reference only while cloning"
msgstr ""
-#: builtin/clone.c:111 builtin/column.c:27 builtin/merge-file.c:44
+#: builtin/clone.c:112 builtin/column.c:27 builtin/merge-file.c:44
msgid "name"
msgstr ""
-#: builtin/clone.c:112
+#: builtin/clone.c:113
msgid "use <name> instead of 'origin' to track upstream"
msgstr ""
-#: builtin/clone.c:114
+#: builtin/clone.c:115
msgid "checkout <branch> instead of the remote's HEAD"
msgstr ""
-#: builtin/clone.c:116
+#: builtin/clone.c:117
msgid "path to git-upload-pack on the remote"
msgstr ""
-#: builtin/clone.c:117 builtin/fetch.c:115 builtin/grep.c:1025
+#: builtin/clone.c:118 builtin/fetch.c:137 builtin/grep.c:804
#: builtin/pull.c:205
msgid "depth"
msgstr ""
-#: builtin/clone.c:118
+#: builtin/clone.c:119
msgid "create a shallow clone of that depth"
msgstr ""
-#: builtin/clone.c:119 builtin/fetch.c:117 builtin/pack-objects.c:2932
+#: builtin/clone.c:120 builtin/fetch.c:139 builtin/pack-objects.c:2938
#: parse-options.h:142
msgid "time"
msgstr ""
-#: builtin/clone.c:120
+#: builtin/clone.c:121
msgid "create a shallow clone since a specific time"
msgstr ""
-#: builtin/clone.c:121 builtin/fetch.c:119
+#: builtin/clone.c:122 builtin/fetch.c:141
msgid "revision"
msgstr ""
-#: builtin/clone.c:122 builtin/fetch.c:120
+#: builtin/clone.c:123 builtin/fetch.c:142
msgid "deepen history of shallow clone, excluding rev"
msgstr ""
-#: builtin/clone.c:124
+#: builtin/clone.c:125
msgid "clone only one branch, HEAD or --branch"
msgstr ""
-#: builtin/clone.c:126
+#: builtin/clone.c:127
msgid "don't clone any tags, and make later fetches not to follow them"
msgstr ""
-#: builtin/clone.c:128
+#: builtin/clone.c:129
msgid "any cloned submodules will be shallow"
msgstr ""
-#: builtin/clone.c:129 builtin/init-db.c:485
+#: builtin/clone.c:130 builtin/init-db.c:485
msgid "gitdir"
msgstr ""
-#: builtin/clone.c:130 builtin/init-db.c:486
+#: builtin/clone.c:131 builtin/init-db.c:486
msgid "separate git dir from working tree"
msgstr ""
-#: builtin/clone.c:131
+#: builtin/clone.c:132
msgid "key=value"
msgstr ""
-#: builtin/clone.c:132
+#: builtin/clone.c:133
msgid "set config inside the new repository"
msgstr ""
-#: builtin/clone.c:133 builtin/fetch.c:137 builtin/push.c:555
+#: builtin/clone.c:134 builtin/fetch.c:159 builtin/push.c:555
msgid "use IPv4 addresses only"
msgstr ""
-#: builtin/clone.c:135 builtin/fetch.c:139 builtin/push.c:557
+#: builtin/clone.c:136 builtin/fetch.c:161 builtin/push.c:557
msgid "use IPv6 addresses only"
msgstr ""
-#: builtin/clone.c:272
+#: builtin/clone.c:273
msgid ""
"No directory name could be guessed.\n"
"Please specify a directory on the command line"
msgstr ""
-#: builtin/clone.c:325
+#: builtin/clone.c:326
#, c-format
msgid "info: Could not add alternate for '%s': %s\n"
msgstr ""
-#: builtin/clone.c:397
+#: builtin/clone.c:398
#, c-format
msgid "failed to open '%s'"
msgstr ""
-#: builtin/clone.c:405
+#: builtin/clone.c:406
#, c-format
msgid "%s exists and is not a directory"
msgstr ""
-#: builtin/clone.c:419
+#: builtin/clone.c:420
#, c-format
msgid "failed to stat %s\n"
msgstr ""
-#: builtin/clone.c:441
+#: builtin/clone.c:442
#, c-format
msgid "failed to create link '%s'"
msgstr ""
-#: builtin/clone.c:445
+#: builtin/clone.c:446
#, c-format
msgid "failed to copy file to '%s'"
msgstr ""
-#: builtin/clone.c:470
+#: builtin/clone.c:471
#, c-format
msgid "done.\n"
msgstr ""
-#: builtin/clone.c:482
+#: builtin/clone.c:483
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
"and retry the checkout with 'git checkout -f HEAD'\n"
msgstr ""
-#: builtin/clone.c:559
+#: builtin/clone.c:560
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr ""
-#: builtin/clone.c:654
+#: builtin/clone.c:655
msgid "remote did not send all necessary objects"
msgstr ""
-#: builtin/clone.c:670
+#: builtin/clone.c:671
#, c-format
msgid "unable to update %s"
msgstr ""
-#: builtin/clone.c:719
+#: builtin/clone.c:720
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr ""
-#: builtin/clone.c:750
+#: builtin/clone.c:751
msgid "unable to checkout working tree"
msgstr ""
-#: builtin/clone.c:792
+#: builtin/clone.c:796
msgid "unable to write parameters to config file"
msgstr ""
-#: builtin/clone.c:855
+#: builtin/clone.c:859
msgid "cannot repack to clean up"
msgstr ""
-#: builtin/clone.c:857
+#: builtin/clone.c:861
msgid "cannot unlink temporary alternates file"
msgstr ""
-#: builtin/clone.c:890 builtin/receive-pack.c:1945
+#: builtin/clone.c:894 builtin/receive-pack.c:1944
msgid "Too many arguments."
msgstr ""
-#: builtin/clone.c:894
+#: builtin/clone.c:898
msgid "You must specify a repository to clone."
msgstr ""
-#: builtin/clone.c:907
+#: builtin/clone.c:911
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr ""
-#: builtin/clone.c:910
+#: builtin/clone.c:914
msgid "--bare and --separate-git-dir are incompatible."
msgstr ""
-#: builtin/clone.c:923
+#: builtin/clone.c:927
#, c-format
msgid "repository '%s' does not exist"
msgstr ""
-#: builtin/clone.c:929 builtin/fetch.c:1337
+#: builtin/clone.c:933 builtin/fetch.c:1360
#, c-format
msgid "depth %s is not a positive number"
msgstr ""
-#: builtin/clone.c:939
+#: builtin/clone.c:943
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr ""
-#: builtin/clone.c:949
+#: builtin/clone.c:953
#, c-format
msgid "working tree '%s' already exists."
msgstr ""
-#: builtin/clone.c:964 builtin/clone.c:975 builtin/difftool.c:260
-#: builtin/worktree.c:222 builtin/worktree.c:252
+#: builtin/clone.c:968 builtin/clone.c:979 builtin/difftool.c:270
+#: builtin/worktree.c:240 builtin/worktree.c:270
#, c-format
msgid "could not create leading directories of '%s'"
msgstr ""
-#: builtin/clone.c:967
+#: builtin/clone.c:971
#, c-format
msgid "could not create work tree dir '%s'"
msgstr ""
-#: builtin/clone.c:979
+#: builtin/clone.c:983
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr ""
-#: builtin/clone.c:981
+#: builtin/clone.c:985
#, c-format
msgid "Cloning into '%s'...\n"
msgstr ""
-#: builtin/clone.c:1005
+#: builtin/clone.c:1009
msgid ""
"clone --recursive is not compatible with both --reference and --reference-if-"
"able"
msgstr ""
-#: builtin/clone.c:1067
+#: builtin/clone.c:1071
msgid "--depth is ignored in local clones; use file:// instead."
msgstr ""
-#: builtin/clone.c:1069
+#: builtin/clone.c:1073
msgid "--shallow-since is ignored in local clones; use file:// instead."
msgstr ""
-#: builtin/clone.c:1071
+#: builtin/clone.c:1075
msgid "--shallow-exclude is ignored in local clones; use file:// instead."
msgstr ""
-#: builtin/clone.c:1074
+#: builtin/clone.c:1078
msgid "source repository is shallow, ignoring --local"
msgstr ""
-#: builtin/clone.c:1079
+#: builtin/clone.c:1083
msgid "--local is ignored"
msgstr ""
-#: builtin/clone.c:1083
+#: builtin/clone.c:1087
#, c-format
msgid "Don't know how to clone %s"
msgstr ""
-#: builtin/clone.c:1138 builtin/clone.c:1146
+#: builtin/clone.c:1142 builtin/clone.c:1150
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr ""
-#: builtin/clone.c:1149
+#: builtin/clone.c:1153
msgid "You appear to have cloned an empty repository."
msgstr ""
"the remaining commits.\n"
msgstr ""
-#: builtin/commit.c:319
+#: builtin/commit.c:318
msgid "failed to unpack HEAD tree object"
msgstr ""
-#: builtin/commit.c:360
+#: builtin/commit.c:359
msgid "unable to create temporary index"
msgstr ""
-#: builtin/commit.c:366
+#: builtin/commit.c:365
msgid "interactive add failed"
msgstr ""
-#: builtin/commit.c:379
+#: builtin/commit.c:378
msgid "unable to update temporary index"
msgstr ""
-#: builtin/commit.c:381
+#: builtin/commit.c:380
msgid "Failed to update main cache tree"
msgstr ""
-#: builtin/commit.c:405 builtin/commit.c:428 builtin/commit.c:477
+#: builtin/commit.c:405 builtin/commit.c:429 builtin/commit.c:478
msgid "unable to write new_index file"
msgstr ""
-#: builtin/commit.c:459
+#: builtin/commit.c:461
msgid "cannot do a partial commit during a merge."
msgstr ""
-#: builtin/commit.c:461
+#: builtin/commit.c:463
msgid "cannot do a partial commit during a cherry-pick."
msgstr ""
-#: builtin/commit.c:470
+#: builtin/commit.c:471
msgid "cannot read the index"
msgstr ""
-#: builtin/commit.c:489
+#: builtin/commit.c:490
msgid "unable to write temporary index file"
msgstr ""
-#: builtin/commit.c:583
+#: builtin/commit.c:587
#, c-format
msgid "commit '%s' lacks author header"
msgstr ""
-#: builtin/commit.c:585
+#: builtin/commit.c:589
#, c-format
msgid "commit '%s' has malformed author line"
msgstr ""
-#: builtin/commit.c:604
+#: builtin/commit.c:608
msgid "malformed --author parameter"
msgstr ""
-#: builtin/commit.c:656
+#: builtin/commit.c:660
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
msgstr ""
-#: builtin/commit.c:693 builtin/commit.c:726 builtin/commit.c:1093
+#: builtin/commit.c:697 builtin/commit.c:730 builtin/commit.c:1100
#, c-format
msgid "could not lookup commit %s"
msgstr ""
-#: builtin/commit.c:705 builtin/shortlog.c:295
+#: builtin/commit.c:709 builtin/shortlog.c:309
#, c-format
msgid "(reading log message from standard input)\n"
msgstr ""
-#: builtin/commit.c:707
+#: builtin/commit.c:711
msgid "could not read log from standard input"
msgstr ""
-#: builtin/commit.c:711
+#: builtin/commit.c:715
#, c-format
msgid "could not read log file '%s'"
msgstr ""
-#: builtin/commit.c:738 builtin/commit.c:746
+#: builtin/commit.c:742 builtin/commit.c:750
msgid "could not read SQUASH_MSG"
msgstr ""
-#: builtin/commit.c:743
+#: builtin/commit.c:747
msgid "could not read MERGE_MSG"
msgstr ""
-#: builtin/commit.c:797
+#: builtin/commit.c:801
msgid "could not write commit template"
msgstr ""
-#: builtin/commit.c:815
+#: builtin/commit.c:819
#, c-format
msgid ""
"\n"
"and try again.\n"
msgstr ""
-#: builtin/commit.c:820
+#: builtin/commit.c:824
#, c-format
msgid ""
"\n"
"and try again.\n"
msgstr ""
-#: builtin/commit.c:833
+#: builtin/commit.c:837
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
"with '%c' will be ignored, and an empty message aborts the commit.\n"
msgstr ""
-#: builtin/commit.c:840
+#: builtin/commit.c:844
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
"An empty message aborts the commit.\n"
msgstr ""
-#: builtin/commit.c:857
+#: builtin/commit.c:861
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr ""
-#: builtin/commit.c:865
+#: builtin/commit.c:869
#, c-format
msgid "%sDate: %s"
msgstr ""
-#: builtin/commit.c:872
+#: builtin/commit.c:876
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr ""
-#: builtin/commit.c:889
+#: builtin/commit.c:893
msgid "Cannot read index"
msgstr ""
-#: builtin/commit.c:951
+#: builtin/commit.c:958
msgid "Error building trees"
msgstr ""
-#: builtin/commit.c:965 builtin/tag.c:274
+#: builtin/commit.c:972 builtin/tag.c:252
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr ""
-#: builtin/commit.c:1068
+#: builtin/commit.c:1075
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr ""
-#: builtin/commit.c:1083 builtin/commit.c:1328
+#: builtin/commit.c:1090 builtin/commit.c:1335
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr ""
-#: builtin/commit.c:1121
+#: builtin/commit.c:1128
msgid "--long and -z are incompatible"
msgstr ""
-#: builtin/commit.c:1151
+#: builtin/commit.c:1158
msgid "Using both --reset-author and --author does not make sense"
msgstr ""
-#: builtin/commit.c:1160
+#: builtin/commit.c:1167
msgid "You have nothing to amend."
msgstr ""
-#: builtin/commit.c:1163
+#: builtin/commit.c:1170
msgid "You are in the middle of a merge -- cannot amend."
msgstr ""
-#: builtin/commit.c:1165
+#: builtin/commit.c:1172
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr ""
-#: builtin/commit.c:1168
+#: builtin/commit.c:1175
msgid "Options --squash and --fixup cannot be used together"
msgstr ""
-#: builtin/commit.c:1178
+#: builtin/commit.c:1185
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr ""
-#: builtin/commit.c:1180
+#: builtin/commit.c:1187
msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
msgstr ""
-#: builtin/commit.c:1188
+#: builtin/commit.c:1195
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr ""
-#: builtin/commit.c:1205
+#: builtin/commit.c:1212
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr ""
-#: builtin/commit.c:1207
+#: builtin/commit.c:1214
msgid "No paths with --include/--only does not make sense."
msgstr ""
-#: builtin/commit.c:1219 builtin/tag.c:552
+#: builtin/commit.c:1226 builtin/tag.c:535
#, c-format
msgid "Invalid cleanup mode %s"
msgstr ""
-#: builtin/commit.c:1224
+#: builtin/commit.c:1231
msgid "Paths with -a does not make sense."
msgstr ""
-#: builtin/commit.c:1342 builtin/commit.c:1617
+#: builtin/commit.c:1349 builtin/commit.c:1626
msgid "show status concisely"
msgstr ""
-#: builtin/commit.c:1344 builtin/commit.c:1619
+#: builtin/commit.c:1351 builtin/commit.c:1628
msgid "show branch information"
msgstr ""
-#: builtin/commit.c:1346
+#: builtin/commit.c:1353
msgid "show stash information"
msgstr ""
-#: builtin/commit.c:1348
+#: builtin/commit.c:1355
msgid "version"
msgstr ""
-#: builtin/commit.c:1348 builtin/commit.c:1621 builtin/push.c:530
-#: builtin/worktree.c:449
+#: builtin/commit.c:1355 builtin/commit.c:1630 builtin/push.c:530
+#: builtin/worktree.c:469
msgid "machine-readable output"
msgstr ""
-#: builtin/commit.c:1351 builtin/commit.c:1623
+#: builtin/commit.c:1358 builtin/commit.c:1632
msgid "show status in long format (default)"
msgstr ""
-#: builtin/commit.c:1354 builtin/commit.c:1626
+#: builtin/commit.c:1361 builtin/commit.c:1635
msgid "terminate entries with NUL"
msgstr ""
-#: builtin/commit.c:1356 builtin/commit.c:1629 builtin/fast-export.c:983
-#: builtin/fast-export.c:986 builtin/tag.c:412
+#: builtin/commit.c:1363 builtin/commit.c:1638 builtin/fast-export.c:999
+#: builtin/fast-export.c:1002 builtin/tag.c:390
msgid "mode"
msgstr ""
-#: builtin/commit.c:1357 builtin/commit.c:1629
+#: builtin/commit.c:1364 builtin/commit.c:1638
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr ""
-#: builtin/commit.c:1360
+#: builtin/commit.c:1367
msgid "show ignored files"
msgstr ""
-#: builtin/commit.c:1361 parse-options.h:155
+#: builtin/commit.c:1368 parse-options.h:155
msgid "when"
msgstr ""
-#: builtin/commit.c:1362
+#: builtin/commit.c:1369
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
msgstr ""
-#: builtin/commit.c:1364
+#: builtin/commit.c:1371
msgid "list untracked files in columns"
msgstr ""
-#: builtin/commit.c:1440
+#: builtin/commit.c:1449
msgid "couldn't look up newly created commit"
msgstr ""
-#: builtin/commit.c:1442
+#: builtin/commit.c:1451
msgid "could not parse newly created commit"
msgstr ""
-#: builtin/commit.c:1487
+#: builtin/commit.c:1496
msgid "detached HEAD"
msgstr ""
-#: builtin/commit.c:1490
+#: builtin/commit.c:1499
msgid " (root-commit)"
msgstr ""
-#: builtin/commit.c:1587
+#: builtin/commit.c:1596
msgid "suppress summary after successful commit"
msgstr ""
-#: builtin/commit.c:1588
+#: builtin/commit.c:1597
msgid "show diff in commit message template"
msgstr ""
-#: builtin/commit.c:1590
+#: builtin/commit.c:1599
msgid "Commit message options"
msgstr ""
-#: builtin/commit.c:1591 builtin/tag.c:410
+#: builtin/commit.c:1600 builtin/tag.c:388
msgid "read message from file"
msgstr ""
-#: builtin/commit.c:1592
+#: builtin/commit.c:1601
msgid "author"
msgstr ""
-#: builtin/commit.c:1592
+#: builtin/commit.c:1601
msgid "override author for commit"
msgstr ""
-#: builtin/commit.c:1593 builtin/gc.c:358
+#: builtin/commit.c:1602 builtin/gc.c:359
msgid "date"
msgstr ""
-#: builtin/commit.c:1593
+#: builtin/commit.c:1602
msgid "override date for commit"
msgstr ""
-#: builtin/commit.c:1594 builtin/merge.c:222 builtin/notes.c:401
-#: builtin/notes.c:564 builtin/tag.c:408
+#: builtin/commit.c:1603 builtin/merge.c:225 builtin/notes.c:402
+#: builtin/notes.c:565 builtin/tag.c:386
msgid "message"
msgstr ""
-#: builtin/commit.c:1594
+#: builtin/commit.c:1603
msgid "commit message"
msgstr ""
-#: builtin/commit.c:1595 builtin/commit.c:1596 builtin/commit.c:1597
-#: builtin/commit.c:1598 parse-options.h:257 ref-filter.h:77
+#: builtin/commit.c:1604 builtin/commit.c:1605 builtin/commit.c:1606
+#: builtin/commit.c:1607 parse-options.h:257 ref-filter.h:92
msgid "commit"
msgstr ""
-#: builtin/commit.c:1595
+#: builtin/commit.c:1604
msgid "reuse and edit message from specified commit"
msgstr ""
-#: builtin/commit.c:1596
+#: builtin/commit.c:1605
msgid "reuse message from specified commit"
msgstr ""
-#: builtin/commit.c:1597
+#: builtin/commit.c:1606
msgid "use autosquash formatted message to fixup specified commit"
msgstr ""
-#: builtin/commit.c:1598
+#: builtin/commit.c:1607
msgid "use autosquash formatted message to squash specified commit"
msgstr ""
-#: builtin/commit.c:1599
+#: builtin/commit.c:1608
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr ""
-#: builtin/commit.c:1600 builtin/log.c:1430 builtin/revert.c:105
+#: builtin/commit.c:1609 builtin/log.c:1436 builtin/merge.c:239
+#: builtin/revert.c:105
msgid "add Signed-off-by:"
msgstr ""
-#: builtin/commit.c:1601
+#: builtin/commit.c:1610
msgid "use specified template file"
msgstr ""
-#: builtin/commit.c:1602
+#: builtin/commit.c:1611
msgid "force edit of commit"
msgstr ""
-#: builtin/commit.c:1603
+#: builtin/commit.c:1612
msgid "default"
msgstr ""
-#: builtin/commit.c:1603 builtin/tag.c:413
+#: builtin/commit.c:1612 builtin/tag.c:391
msgid "how to strip spaces and #comments from message"
msgstr ""
-#: builtin/commit.c:1604
+#: builtin/commit.c:1613
msgid "include status in commit message template"
msgstr ""
-#: builtin/commit.c:1606 builtin/merge.c:234 builtin/pull.c:173
+#: builtin/commit.c:1615 builtin/merge.c:237 builtin/pull.c:173
#: builtin/revert.c:113
msgid "GPG sign commit"
msgstr ""
-#: builtin/commit.c:1609
+#: builtin/commit.c:1618
msgid "Commit contents options"
msgstr ""
-#: builtin/commit.c:1610
+#: builtin/commit.c:1619
msgid "commit all changed files"
msgstr ""
-#: builtin/commit.c:1611
+#: builtin/commit.c:1620
msgid "add specified files to index for commit"
msgstr ""
-#: builtin/commit.c:1612
+#: builtin/commit.c:1621
msgid "interactively add files"
msgstr ""
-#: builtin/commit.c:1613
+#: builtin/commit.c:1622
msgid "interactively add changes"
msgstr ""
-#: builtin/commit.c:1614
+#: builtin/commit.c:1623
msgid "commit only specified files"
msgstr ""
-#: builtin/commit.c:1615
+#: builtin/commit.c:1624
msgid "bypass pre-commit and commit-msg hooks"
msgstr ""
-#: builtin/commit.c:1616
+#: builtin/commit.c:1625
msgid "show what would be committed"
msgstr ""
-#: builtin/commit.c:1627
+#: builtin/commit.c:1636
msgid "amend previous commit"
msgstr ""
-#: builtin/commit.c:1628
+#: builtin/commit.c:1637
msgid "bypass post-rewrite hook"
msgstr ""
-#: builtin/commit.c:1633
+#: builtin/commit.c:1642
msgid "ok to record an empty change"
msgstr ""
-#: builtin/commit.c:1635
+#: builtin/commit.c:1644
msgid "ok to record a change with an empty message"
msgstr ""
-#: builtin/commit.c:1665
+#: builtin/commit.c:1674
msgid "could not parse HEAD commit"
msgstr ""
-#: builtin/commit.c:1710
+#: builtin/commit.c:1719
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr ""
-#: builtin/commit.c:1717
+#: builtin/commit.c:1726
msgid "could not read MERGE_MODE"
msgstr ""
-#: builtin/commit.c:1736
+#: builtin/commit.c:1745
#, c-format
msgid "could not read commit message: %s"
msgstr ""
-#: builtin/commit.c:1747
+#: builtin/commit.c:1756
#, c-format
-msgid "Aborting commit; you did not edit the message.\n"
+msgid "Aborting commit due to empty commit message.\n"
msgstr ""
-#: builtin/commit.c:1752
+#: builtin/commit.c:1761
#, c-format
-msgid "Aborting commit due to empty commit message.\n"
+msgid "Aborting commit; you did not edit the message.\n"
msgstr ""
-#: builtin/commit.c:1800
+#: builtin/commit.c:1809
msgid ""
"Repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
msgid "--local can only be used inside a git repository"
msgstr ""
-#: builtin/config.c:621
+#: builtin/config.c:624
#, c-format
msgid "cannot create configuration file %s"
msgstr ""
-#: builtin/config.c:633
+#: builtin/config.c:637
#, c-format
msgid ""
"cannot overwrite multiple values with a single value\n"
" Use a regexp, --add or --replace-all to change %s."
msgstr ""
-#: builtin/count-objects.c:87
+#: builtin/count-objects.c:88
msgid "git count-objects [-v] [-H | --human-readable]"
msgstr ""
-#: builtin/count-objects.c:97
+#: builtin/count-objects.c:98
msgid "print sizes in human readable format"
msgstr ""
msgid "annotated"
msgstr ""
-#: builtin/describe.c:253
+#: builtin/describe.c:264
#, c-format
msgid "annotated tag %s not available"
msgstr ""
-#: builtin/describe.c:257
+#: builtin/describe.c:268
#, c-format
msgid "annotated tag %s has no embedded name"
msgstr ""
-#: builtin/describe.c:259
+#: builtin/describe.c:270
#, c-format
msgid "tag '%s' is really '%s' here"
msgstr ""
-#: builtin/describe.c:286 builtin/log.c:489
+#: builtin/describe.c:297 builtin/log.c:493
#, c-format
msgid "Not a valid object name %s"
msgstr ""
-#: builtin/describe.c:289
+#: builtin/describe.c:300
#, c-format
msgid "%s is not a valid '%s' object"
msgstr ""
-#: builtin/describe.c:306
+#: builtin/describe.c:317
#, c-format
msgid "no tag exactly matches '%s'"
msgstr ""
-#: builtin/describe.c:308
+#: builtin/describe.c:319
#, c-format
msgid "searching to describe %s\n"
msgstr ""
-#: builtin/describe.c:355
+#: builtin/describe.c:366
#, c-format
msgid "finished search at %s\n"
msgstr ""
-#: builtin/describe.c:382
+#: builtin/describe.c:393
#, c-format
msgid ""
"No annotated tags can describe '%s'.\n"
"However, there were unannotated tags: try --tags."
msgstr ""
-#: builtin/describe.c:386
+#: builtin/describe.c:397
#, c-format
msgid ""
"No tags can describe '%s'.\n"
"Try --always, or create some tags."
msgstr ""
-#: builtin/describe.c:416
+#: builtin/describe.c:427
#, c-format
msgid "traversed %lu commits\n"
msgstr ""
-#: builtin/describe.c:419
+#: builtin/describe.c:430
#, c-format
msgid ""
"more than %i tags found; listed %i most recent\n"
"gave up search at %s\n"
msgstr ""
-#: builtin/describe.c:441
+#: builtin/describe.c:452
msgid "find the tag that comes after the commit"
msgstr ""
-#: builtin/describe.c:442
+#: builtin/describe.c:453
msgid "debug search strategy on stderr"
msgstr ""
-#: builtin/describe.c:443
+#: builtin/describe.c:454
msgid "use any ref"
msgstr ""
-#: builtin/describe.c:444
+#: builtin/describe.c:455
msgid "use any tag, even unannotated"
msgstr ""
-#: builtin/describe.c:445
+#: builtin/describe.c:456
msgid "always use long format"
msgstr ""
-#: builtin/describe.c:446
+#: builtin/describe.c:457
msgid "only follow first parent"
msgstr ""
-#: builtin/describe.c:449
+#: builtin/describe.c:460
msgid "only output exact matches"
msgstr ""
-#: builtin/describe.c:451
+#: builtin/describe.c:462
msgid "consider <n> most recent tags (default: 10)"
msgstr ""
-#: builtin/describe.c:453
+#: builtin/describe.c:464
msgid "only consider tags matching <pattern>"
msgstr ""
-#: builtin/describe.c:455
+#: builtin/describe.c:466
msgid "do not consider tags matching <pattern>"
msgstr ""
-#: builtin/describe.c:457 builtin/name-rev.c:406
+#: builtin/describe.c:468 builtin/name-rev.c:406
msgid "show abbreviated commit object as fallback"
msgstr ""
-#: builtin/describe.c:458 builtin/describe.c:461
+#: builtin/describe.c:469 builtin/describe.c:472
msgid "mark"
msgstr ""
-#: builtin/describe.c:459
+#: builtin/describe.c:470
msgid "append <mark> on dirty working tree (default: \"-dirty\")"
msgstr ""
-#: builtin/describe.c:462
+#: builtin/describe.c:473
msgid "append <mark> on broken working tree (default: \"-broken\")"
msgstr ""
-#: builtin/describe.c:480
+#: builtin/describe.c:491
msgid "--long is incompatible with --abbrev=0"
msgstr ""
-#: builtin/describe.c:509
+#: builtin/describe.c:520
msgid "No names found, cannot describe anything."
msgstr ""
-#: builtin/describe.c:552
+#: builtin/describe.c:563
msgid "--dirty is incompatible with commit-ishes"
msgstr ""
-#: builtin/describe.c:554
+#: builtin/describe.c:565
msgid "--broken is incompatible with commit-ishes"
msgstr ""
msgid "invalid option: %s"
msgstr ""
-#: builtin/diff.c:359
+#: builtin/diff.c:357
msgid "Not a git repository"
msgstr ""
-#: builtin/diff.c:402
+#: builtin/diff.c:400
#, c-format
msgid "invalid object '%s' given."
msgstr ""
-#: builtin/diff.c:411
+#: builtin/diff.c:409
#, c-format
msgid "more than two blobs given: '%s'"
msgstr ""
-#: builtin/diff.c:416
+#: builtin/diff.c:414
#, c-format
msgid "unhandled object '%s' given."
msgstr ""
msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
msgstr ""
-#: builtin/difftool.c:249
+#: builtin/difftool.c:259
#, c-format
msgid "failed: %d"
msgstr ""
-#: builtin/difftool.c:291
+#: builtin/difftool.c:301
#, c-format
msgid "could not read symlink %s"
msgstr ""
-#: builtin/difftool.c:293
+#: builtin/difftool.c:303
#, c-format
msgid "could not read symlink file %s"
msgstr ""
-#: builtin/difftool.c:301
+#: builtin/difftool.c:311
#, c-format
msgid "could not read object %s for symlink %s"
msgstr ""
-#: builtin/difftool.c:403
+#: builtin/difftool.c:412
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:633
#, c-format
msgid "both files modified: '%s' and '%s'."
msgstr ""
-#: builtin/difftool.c:628
+#: builtin/difftool.c:635
msgid "working tree file has been left."
msgstr ""
-#: builtin/difftool.c:639
+#: builtin/difftool.c:646
#, c-format
msgid "temporary files exist in '%s'."
msgstr ""
-#: builtin/difftool.c:640
+#: builtin/difftool.c:647
msgid "you may want to cleanup or recover these."
msgstr ""
-#: builtin/difftool.c:689
+#: builtin/difftool.c:696
msgid "use `diff.guitool` instead of `diff.tool`"
msgstr ""
-#: builtin/difftool.c:691
+#: builtin/difftool.c:698
msgid "perform a full-directory diff"
msgstr ""
-#: builtin/difftool.c:693
+#: builtin/difftool.c:700
msgid "do not prompt before launching a diff tool"
msgstr ""
-#: builtin/difftool.c:699
+#: builtin/difftool.c:706
msgid "use symlinks in dir-diff mode"
msgstr ""
-#: builtin/difftool.c:700
+#: builtin/difftool.c:707
msgid "<tool>"
msgstr ""
-#: builtin/difftool.c:701
+#: builtin/difftool.c:708
msgid "use the specified diff tool"
msgstr ""
-#: builtin/difftool.c:703
+#: builtin/difftool.c:710
msgid "print a list of diff tools that may be used with `--tool`"
msgstr ""
-#: builtin/difftool.c:706
+#: 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:715
msgid "<command>"
msgstr ""
-#: builtin/difftool.c:709
+#: builtin/difftool.c:716
msgid "specify a custom command for viewing diffs"
msgstr ""
-#: builtin/difftool.c:733
+#: builtin/difftool.c:740
msgid "no <tool> given for --tool=<tool>"
msgstr ""
-#: builtin/difftool.c:740
+#: builtin/difftool.c:747
msgid "no <cmd> given for --extcmd=<cmd>"
msgstr ""
msgid "git fast-export [rev-list-opts]"
msgstr ""
-#: builtin/fast-export.c:982
+#: builtin/fast-export.c:998
msgid "show progress after <n> objects"
msgstr ""
-#: builtin/fast-export.c:984
+#: builtin/fast-export.c:1000
msgid "select handling of signed tags"
msgstr ""
-#: builtin/fast-export.c:987
+#: builtin/fast-export.c:1003
msgid "select handling of tags that tag filtered objects"
msgstr ""
-#: builtin/fast-export.c:990
+#: builtin/fast-export.c:1006
msgid "Dump marks to this file"
msgstr ""
-#: builtin/fast-export.c:992
+#: builtin/fast-export.c:1008
msgid "Import marks from this file"
msgstr ""
-#: builtin/fast-export.c:994
+#: builtin/fast-export.c:1010
msgid "Fake a tagger when tags lack one"
msgstr ""
-#: builtin/fast-export.c:996
+#: builtin/fast-export.c:1012
msgid "Output full tree for each commit"
msgstr ""
-#: builtin/fast-export.c:998
+#: builtin/fast-export.c:1014
msgid "Use the done feature to terminate the stream"
msgstr ""
-#: builtin/fast-export.c:999
+#: builtin/fast-export.c:1015
msgid "Skip output of blob data"
msgstr ""
-#: builtin/fast-export.c:1000
+#: builtin/fast-export.c:1016
msgid "refspec"
msgstr ""
-#: builtin/fast-export.c:1001
+#: builtin/fast-export.c:1017
msgid "Apply refspec to exported refs"
msgstr ""
-#: builtin/fast-export.c:1002
+#: builtin/fast-export.c:1018
msgid "anonymize output"
msgstr ""
-#: builtin/fetch.c:22
+#: builtin/fetch.c:23
msgid "git fetch [<options>] [<repository> [<refspec>...]]"
msgstr ""
-#: builtin/fetch.c:23
+#: builtin/fetch.c:24
msgid "git fetch [<options>] <group>"
msgstr ""
-#: builtin/fetch.c:24
+#: builtin/fetch.c:25
msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
msgstr ""
-#: builtin/fetch.c:25
+#: builtin/fetch.c:26
msgid "git fetch --all [<options>]"
msgstr ""
-#: builtin/fetch.c:90 builtin/pull.c:182
+#: builtin/fetch.c:112 builtin/pull.c:182
msgid "fetch from all remotes"
msgstr ""
-#: builtin/fetch.c:92 builtin/pull.c:185
+#: builtin/fetch.c:114 builtin/pull.c:185
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr ""
-#: builtin/fetch.c:94 builtin/pull.c:188
+#: builtin/fetch.c:116 builtin/pull.c:188
msgid "path to upload pack on remote end"
msgstr ""
-#: builtin/fetch.c:95 builtin/pull.c:190
+#: builtin/fetch.c:117 builtin/pull.c:190
msgid "force overwrite of local branch"
msgstr ""
-#: builtin/fetch.c:97
+#: builtin/fetch.c:119
msgid "fetch from multiple remotes"
msgstr ""
-#: builtin/fetch.c:99 builtin/pull.c:192
+#: builtin/fetch.c:121 builtin/pull.c:192
msgid "fetch all tags and associated objects"
msgstr ""
-#: builtin/fetch.c:101
+#: builtin/fetch.c:123
msgid "do not fetch all tags (--no-tags)"
msgstr ""
-#: builtin/fetch.c:103
+#: builtin/fetch.c:125
msgid "number of submodules fetched in parallel"
msgstr ""
-#: builtin/fetch.c:105 builtin/pull.c:195
+#: builtin/fetch.c:127 builtin/pull.c:195
msgid "prune remote-tracking branches no longer on remote"
msgstr ""
-#: builtin/fetch.c:106 builtin/fetch.c:129 builtin/pull.c:123
+#: builtin/fetch.c:128 builtin/fetch.c:151 builtin/pull.c:123
msgid "on-demand"
msgstr ""
-#: builtin/fetch.c:107
+#: builtin/fetch.c:129
msgid "control recursive fetching of submodules"
msgstr ""
-#: builtin/fetch.c:111 builtin/pull.c:203
+#: builtin/fetch.c:133 builtin/pull.c:203
msgid "keep downloaded pack"
msgstr ""
-#: builtin/fetch.c:113
+#: builtin/fetch.c:135
msgid "allow updating of HEAD ref"
msgstr ""
-#: builtin/fetch.c:116 builtin/fetch.c:122 builtin/pull.c:206
+#: builtin/fetch.c:138 builtin/fetch.c:144 builtin/pull.c:206
msgid "deepen history of shallow clone"
msgstr ""
-#: builtin/fetch.c:118
+#: builtin/fetch.c:140
msgid "deepen history of shallow repository based on time"
msgstr ""
-#: builtin/fetch.c:124 builtin/pull.c:209
+#: builtin/fetch.c:146 builtin/pull.c:209
msgid "convert to a complete repository"
msgstr ""
-#: builtin/fetch.c:126 builtin/log.c:1450
+#: builtin/fetch.c:148 builtin/log.c:1456
msgid "dir"
msgstr ""
-#: builtin/fetch.c:127
+#: builtin/fetch.c:149
msgid "prepend this to submodule path output"
msgstr ""
-#: builtin/fetch.c:130
+#: builtin/fetch.c:152
msgid ""
"default for recursive fetching of submodules (lower priority than config "
"files)"
msgstr ""
-#: builtin/fetch.c:134 builtin/pull.c:212
+#: builtin/fetch.c:156 builtin/pull.c:212
msgid "accept refs that update .git/shallow"
msgstr ""
-#: builtin/fetch.c:135 builtin/pull.c:214
+#: builtin/fetch.c:157 builtin/pull.c:214
msgid "refmap"
msgstr ""
-#: builtin/fetch.c:136 builtin/pull.c:215
+#: builtin/fetch.c:158 builtin/pull.c:215
msgid "specify fetch refmap"
msgstr ""
-#: builtin/fetch.c:394
+#: builtin/fetch.c:416
msgid "Couldn't find remote ref HEAD"
msgstr ""
-#: builtin/fetch.c:512
+#: builtin/fetch.c:534
#, c-format
msgid "configuration fetch.output contains invalid value %s"
msgstr ""
-#: builtin/fetch.c:605
+#: builtin/fetch.c:627
#, c-format
msgid "object %s not found"
msgstr ""
-#: builtin/fetch.c:609
+#: builtin/fetch.c:631
msgid "[up to date]"
msgstr ""
-#: builtin/fetch.c:622 builtin/fetch.c:702
+#: builtin/fetch.c:644 builtin/fetch.c:724
msgid "[rejected]"
msgstr ""
-#: builtin/fetch.c:623
+#: builtin/fetch.c:645
msgid "can't fetch in current branch"
msgstr ""
-#: builtin/fetch.c:632
+#: builtin/fetch.c:654
msgid "[tag update]"
msgstr ""
-#: builtin/fetch.c:633 builtin/fetch.c:666 builtin/fetch.c:682
-#: builtin/fetch.c:697
+#: builtin/fetch.c:655 builtin/fetch.c:688 builtin/fetch.c:704
+#: builtin/fetch.c:719
msgid "unable to update local ref"
msgstr ""
-#: builtin/fetch.c:652
+#: builtin/fetch.c:674
msgid "[new tag]"
msgstr ""
-#: builtin/fetch.c:655
+#: builtin/fetch.c:677
msgid "[new branch]"
msgstr ""
-#: builtin/fetch.c:658
+#: builtin/fetch.c:680
msgid "[new ref]"
msgstr ""
-#: builtin/fetch.c:697
+#: builtin/fetch.c:719
msgid "forced update"
msgstr ""
-#: builtin/fetch.c:702
+#: builtin/fetch.c:724
msgid "non-fast-forward"
msgstr ""
-#: builtin/fetch.c:747
+#: builtin/fetch.c:769
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr ""
-#: builtin/fetch.c:767
+#: builtin/fetch.c:789
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr ""
-#: builtin/fetch.c:855 builtin/fetch.c:951
+#: builtin/fetch.c:877 builtin/fetch.c:973
#, c-format
msgid "From %.*s\n"
msgstr ""
-#: builtin/fetch.c:866
+#: builtin/fetch.c:888
#, 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:921
+#: builtin/fetch.c:943
#, c-format
msgid " (%s will become dangling)"
msgstr ""
-#: builtin/fetch.c:922
+#: builtin/fetch.c:944
#, c-format
msgid " (%s has become dangling)"
msgstr ""
-#: builtin/fetch.c:954
+#: builtin/fetch.c:976
msgid "[deleted]"
msgstr ""
-#: builtin/fetch.c:955 builtin/remote.c:1023
+#: builtin/fetch.c:977 builtin/remote.c:1024
msgid "(none)"
msgstr ""
-#: builtin/fetch.c:978
+#: builtin/fetch.c:1000
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr ""
-#: builtin/fetch.c:997
+#: builtin/fetch.c:1019
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr ""
-#: builtin/fetch.c:1000
+#: builtin/fetch.c:1022
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr ""
-#: builtin/fetch.c:1076
+#: builtin/fetch.c:1098
#, c-format
msgid "Don't know how to fetch from %s"
msgstr ""
-#: builtin/fetch.c:1236
+#: builtin/fetch.c:1258
#, c-format
msgid "Fetching %s\n"
msgstr ""
-#: builtin/fetch.c:1238 builtin/remote.c:97
+#: builtin/fetch.c:1260 builtin/remote.c:97
#, c-format
msgid "Could not fetch %s"
msgstr ""
-#: builtin/fetch.c:1256
+#: builtin/fetch.c:1278
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:1279
+#: builtin/fetch.c:1301
msgid "You need to specify a tag name."
msgstr ""
-#: builtin/fetch.c:1321
+#: builtin/fetch.c:1344
msgid "Negative depth in --deepen is not supported"
msgstr ""
-#: builtin/fetch.c:1323
+#: builtin/fetch.c:1346
msgid "--deepen and --depth are mutually exclusive"
msgstr ""
-#: builtin/fetch.c:1328
+#: builtin/fetch.c:1351
msgid "--depth and --unshallow cannot be used together"
msgstr ""
-#: builtin/fetch.c:1330
+#: builtin/fetch.c:1353
msgid "--unshallow on a complete repository does not make sense"
msgstr ""
-#: builtin/fetch.c:1349
+#: builtin/fetch.c:1366
msgid "fetch --all does not take a repository argument"
msgstr ""
-#: builtin/fetch.c:1351
+#: builtin/fetch.c:1368
msgid "fetch --all does not make sense with refspecs"
msgstr ""
-#: builtin/fetch.c:1362
+#: builtin/fetch.c:1379
#, c-format
msgid "No such remote or remote group: %s"
msgstr ""
-#: builtin/fetch.c:1370
+#: builtin/fetch.c:1387
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr ""
"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
msgstr ""
-#: builtin/fmt-merge-msg.c:664
+#: builtin/fmt-merge-msg.c:665
msgid "populate log with at most <n> entries from shortlog"
msgstr ""
-#: builtin/fmt-merge-msg.c:667
+#: builtin/fmt-merge-msg.c:668
msgid "alias for --log (deprecated)"
msgstr ""
-#: builtin/fmt-merge-msg.c:670
+#: builtin/fmt-merge-msg.c:671
msgid "text"
msgstr ""
-#: builtin/fmt-merge-msg.c:671
+#: builtin/fmt-merge-msg.c:672
msgid "use <text> as start of message"
msgstr ""
-#: builtin/fmt-merge-msg.c:672
+#: builtin/fmt-merge-msg.c:673
msgid "file to read from"
msgstr ""
msgid "show only <n> matched refs"
msgstr ""
-#: builtin/for-each-ref.c:42
+#: builtin/for-each-ref.c:39 builtin/tag.c:414
+msgid "respect format colors"
+msgstr ""
+
+#: builtin/for-each-ref.c:43
msgid "print only refs which points at the given object"
msgstr ""
-#: builtin/for-each-ref.c:44
+#: builtin/for-each-ref.c:45
msgid "print only refs that are merged"
msgstr ""
-#: builtin/for-each-ref.c:45
+#: builtin/for-each-ref.c:46
msgid "print only refs that are not merged"
msgstr ""
-#: builtin/for-each-ref.c:46
+#: builtin/for-each-ref.c:47
msgid "print only refs which contain the commit"
msgstr ""
-#: builtin/for-each-ref.c:47
+#: builtin/for-each-ref.c:48
msgid "print only refs which don't contain the commit"
msgstr ""
-#: builtin/fsck.c:554
+#: builtin/fsck.c:543
msgid "Checking object directories"
msgstr ""
-#: builtin/fsck.c:646
+#: builtin/fsck.c:635
msgid "git fsck [<options>] [<object>...]"
msgstr ""
-#: builtin/fsck.c:652
+#: builtin/fsck.c:641
msgid "show unreachable objects"
msgstr ""
-#: builtin/fsck.c:653
+#: builtin/fsck.c:642
msgid "show dangling objects"
msgstr ""
-#: builtin/fsck.c:654
+#: builtin/fsck.c:643
msgid "report tags"
msgstr ""
-#: builtin/fsck.c:655
+#: builtin/fsck.c:644
msgid "report root nodes"
msgstr ""
-#: builtin/fsck.c:656
+#: builtin/fsck.c:645
msgid "make index objects head nodes"
msgstr ""
-#: builtin/fsck.c:657
+#: builtin/fsck.c:646
msgid "make reflogs head nodes (default)"
msgstr ""
-#: builtin/fsck.c:658
+#: builtin/fsck.c:647
msgid "also consider packs and alternate objects"
msgstr ""
-#: builtin/fsck.c:659
+#: builtin/fsck.c:648
msgid "check only connectivity"
msgstr ""
-#: builtin/fsck.c:660
+#: builtin/fsck.c:649
msgid "enable more strict checking"
msgstr ""
-#: builtin/fsck.c:662
+#: builtin/fsck.c:651
msgid "write dangling objects in .git/lost-found"
msgstr ""
-#: builtin/fsck.c:663 builtin/prune.c:107
+#: builtin/fsck.c:652 builtin/prune.c:107
msgid "show progress"
msgstr ""
-#: builtin/fsck.c:664
+#: builtin/fsck.c:653
msgid "show verbose names for reachable objects"
msgstr ""
-#: builtin/fsck.c:725
+#: builtin/fsck.c:714
msgid "Checking objects"
msgstr ""
-#: builtin/gc.c:26
+#: builtin/gc.c:27
msgid "git gc [<options>]"
msgstr ""
-#: builtin/gc.c:79
+#: builtin/gc.c:80
#, c-format
msgid "Failed to fstat %s: %s"
msgstr ""
-#: builtin/gc.c:311
+#: builtin/gc.c:312
#, c-format
msgid "Can't stat %s"
msgstr ""
-#: builtin/gc.c:320
+#: builtin/gc.c:321
#, c-format
msgid ""
"The last gc run reported the following. Please correct the root cause\n"
"%s"
msgstr ""
-#: builtin/gc.c:359
+#: builtin/gc.c:360
msgid "prune unreferenced objects"
msgstr ""
-#: builtin/gc.c:361
+#: builtin/gc.c:362
msgid "be more thorough (increased runtime)"
msgstr ""
-#: builtin/gc.c:362
+#: builtin/gc.c:363
msgid "enable auto-gc mode"
msgstr ""
-#: builtin/gc.c:363
+#: builtin/gc.c:364
msgid "force running gc even if there may be another gc running"
msgstr ""
-#: builtin/gc.c:380
+#: builtin/gc.c:381
#, c-format
msgid "Failed to parse gc.logexpiry value %s"
msgstr ""
-#: builtin/gc.c:408
+#: builtin/gc.c:409
#, c-format
msgid "Auto packing the repository in background for optimum performance.\n"
msgstr ""
-#: builtin/gc.c:410
+#: builtin/gc.c:411
#, c-format
msgid "Auto packing the repository for optimum performance.\n"
msgstr ""
-#: builtin/gc.c:411
+#: builtin/gc.c:412
#, c-format
msgid "See \"git help gc\" for manual housekeeping.\n"
msgstr ""
-#: builtin/gc.c:436
+#: builtin/gc.c:437
#, c-format
msgid ""
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
msgstr ""
-#: builtin/gc.c:480
+#: builtin/gc.c:481
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr ""
msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
msgstr ""
-#: builtin/grep.c:235
+#: builtin/grep.c:226
#, c-format
msgid "grep: failed to create thread: %s"
msgstr ""
-#: builtin/grep.c:293
+#: builtin/grep.c:284
#, c-format
msgid "invalid number of threads specified (%d) for %s"
msgstr ""
#. variable for tweaking threads, currently
#. grep.threads
#.
-#: builtin/grep.c:302 builtin/index-pack.c:1494 builtin/index-pack.c:1692
+#: builtin/grep.c:293 builtin/index-pack.c:1495 builtin/index-pack.c:1693
#, c-format
msgid "no threads support, ignoring %s"
msgstr ""
-#: builtin/grep.c:788 builtin/grep.c:829
+#: builtin/grep.c:451 builtin/grep.c:571 builtin/grep.c:613
#, c-format
msgid "unable to read tree (%s)"
msgstr ""
-#: builtin/grep.c:848
+#: builtin/grep.c:628
#, c-format
msgid "unable to grep from object of type %s"
msgstr ""
-#: builtin/grep.c:912
+#: builtin/grep.c:694
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr ""
-#: builtin/grep.c:999
+#: builtin/grep.c:781
msgid "search in index instead of in the work tree"
msgstr ""
-#: builtin/grep.c:1001
+#: builtin/grep.c:783
msgid "find in contents not managed by git"
msgstr ""
-#: builtin/grep.c:1003
+#: builtin/grep.c:785
msgid "search in both tracked and untracked files"
msgstr ""
-#: builtin/grep.c:1005
+#: builtin/grep.c:787
msgid "ignore files specified via '.gitignore'"
msgstr ""
-#: builtin/grep.c:1007
+#: builtin/grep.c:789
msgid "recursively search in each submodule"
msgstr ""
-#: builtin/grep.c:1009
-msgid "basename"
-msgstr ""
-
-#: builtin/grep.c:1010
-msgid "prepend parent project's basename to output"
-msgstr ""
-
-#: builtin/grep.c:1013
+#: builtin/grep.c:792
msgid "show non-matching lines"
msgstr ""
-#: builtin/grep.c:1015
+#: builtin/grep.c:794
msgid "case insensitive matching"
msgstr ""
-#: builtin/grep.c:1017
+#: builtin/grep.c:796
msgid "match patterns only at word boundaries"
msgstr ""
-#: builtin/grep.c:1019
+#: builtin/grep.c:798
msgid "process binary files as text"
msgstr ""
-#: builtin/grep.c:1021
+#: builtin/grep.c:800
msgid "don't match patterns in binary files"
msgstr ""
-#: builtin/grep.c:1024
+#: builtin/grep.c:803
msgid "process binary files with textconv filters"
msgstr ""
-#: builtin/grep.c:1026
+#: builtin/grep.c:805
msgid "descend at most <depth> levels"
msgstr ""
-#: builtin/grep.c:1030
+#: builtin/grep.c:809
msgid "use extended POSIX regular expressions"
msgstr ""
-#: builtin/grep.c:1033
+#: builtin/grep.c:812
msgid "use basic POSIX regular expressions (default)"
msgstr ""
-#: builtin/grep.c:1036
+#: builtin/grep.c:815
msgid "interpret patterns as fixed strings"
msgstr ""
-#: builtin/grep.c:1039
+#: builtin/grep.c:818
msgid "use Perl-compatible regular expressions"
msgstr ""
-#: builtin/grep.c:1042
+#: builtin/grep.c:821
msgid "show line numbers"
msgstr ""
-#: builtin/grep.c:1043
+#: builtin/grep.c:822
msgid "don't show filenames"
msgstr ""
-#: builtin/grep.c:1044
+#: builtin/grep.c:823
msgid "show filenames"
msgstr ""
-#: builtin/grep.c:1046
+#: builtin/grep.c:825
msgid "show filenames relative to top directory"
msgstr ""
-#: builtin/grep.c:1048
+#: builtin/grep.c:827
msgid "show only filenames instead of matching lines"
msgstr ""
-#: builtin/grep.c:1050
+#: builtin/grep.c:829
msgid "synonym for --files-with-matches"
msgstr ""
-#: builtin/grep.c:1053
+#: builtin/grep.c:832
msgid "show only the names of files without match"
msgstr ""
-#: builtin/grep.c:1055
+#: builtin/grep.c:834
msgid "print NUL after filenames"
msgstr ""
-#: builtin/grep.c:1057
+#: builtin/grep.c:836
msgid "show the number of matches instead of matching lines"
msgstr ""
-#: builtin/grep.c:1058
+#: builtin/grep.c:837
msgid "highlight matches"
msgstr ""
-#: builtin/grep.c:1060
+#: builtin/grep.c:839
msgid "print empty line between matches from different files"
msgstr ""
-#: builtin/grep.c:1062
+#: builtin/grep.c:841
msgid "show filename only once above matches from same file"
msgstr ""
-#: builtin/grep.c:1065
+#: builtin/grep.c:844
msgid "show <n> context lines before and after matches"
msgstr ""
-#: builtin/grep.c:1068
+#: builtin/grep.c:847
msgid "show <n> context lines before matches"
msgstr ""
-#: builtin/grep.c:1070
+#: builtin/grep.c:849
msgid "show <n> context lines after matches"
msgstr ""
-#: builtin/grep.c:1072
+#: builtin/grep.c:851
msgid "use <n> worker threads"
msgstr ""
-#: builtin/grep.c:1073
+#: builtin/grep.c:852
msgid "shortcut for -C NUM"
msgstr ""
-#: builtin/grep.c:1076
+#: builtin/grep.c:855
msgid "show a line with the function name before matches"
msgstr ""
-#: builtin/grep.c:1078
+#: builtin/grep.c:857
msgid "show the surrounding function"
msgstr ""
-#: builtin/grep.c:1081
+#: builtin/grep.c:860
msgid "read patterns from file"
msgstr ""
-#: builtin/grep.c:1083
+#: builtin/grep.c:862
msgid "match <pattern>"
msgstr ""
-#: builtin/grep.c:1085
+#: builtin/grep.c:864
msgid "combine patterns specified with -e"
msgstr ""
-#: builtin/grep.c:1097
+#: builtin/grep.c:876
msgid "indicate hit with exit status without output"
msgstr ""
-#: builtin/grep.c:1099
+#: builtin/grep.c:878
msgid "show only matches from files that match all patterns"
msgstr ""
-#: builtin/grep.c:1101
+#: builtin/grep.c:880
msgid "show parse tree for grep expression"
msgstr ""
-#: builtin/grep.c:1105
+#: builtin/grep.c:884
msgid "pager"
msgstr ""
-#: builtin/grep.c:1105
+#: builtin/grep.c:884
msgid "show matching files in the pager"
msgstr ""
-#: builtin/grep.c:1108
+#: builtin/grep.c:887
msgid "allow calling of grep(1) (ignored by this build)"
msgstr ""
-#: builtin/grep.c:1172
+#: builtin/grep.c:950
msgid "no pattern given."
msgstr ""
-#: builtin/grep.c:1204
+#: builtin/grep.c:982
msgid "--no-index or --untracked cannot be used with revs"
msgstr ""
-#: builtin/grep.c:1211
+#: builtin/grep.c:989
#, c-format
msgid "unable to resolve revision: %s"
msgstr ""
-#: builtin/grep.c:1245 builtin/index-pack.c:1490
+#: builtin/grep.c:1023 builtin/index-pack.c:1491
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr ""
-#: builtin/grep.c:1250
+#: builtin/grep.c:1028
msgid "no threads support, ignoring --threads"
msgstr ""
-#: builtin/grep.c:1281
+#: builtin/grep.c:1052
msgid "--open-files-in-pager only works on the worktree"
msgstr ""
-#: builtin/grep.c:1304
+#: builtin/grep.c:1075
msgid "option not supported with --recurse-submodules."
msgstr ""
-#: builtin/grep.c:1310
+#: builtin/grep.c:1081
msgid "--cached or --untracked cannot be used with --no-index."
msgstr ""
-#: builtin/grep.c:1316
+#: builtin/grep.c:1087
msgid "--[no-]exclude-standard cannot be used for tracked contents."
msgstr ""
-#: builtin/grep.c:1324
+#: builtin/grep.c:1095
msgid "both --cached and trees are given."
msgstr ""
msgid "emacsclient version '%d' too old (< 22)."
msgstr ""
-#: builtin/help.c:133 builtin/help.c:154 builtin/help.c:163 builtin/help.c:171
+#: builtin/help.c:133 builtin/help.c:155 builtin/help.c:165 builtin/help.c:173
#, c-format
msgid "failed to exec '%s'"
msgstr ""
-#: builtin/help.c:208
+#: builtin/help.c:211
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
"Please consider using 'man.<tool>.cmd' instead."
msgstr ""
-#: builtin/help.c:220
+#: builtin/help.c:223
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
"Please consider using 'man.<tool>.path' instead."
msgstr ""
-#: builtin/help.c:337
+#: builtin/help.c:340
#, c-format
msgid "'%s': unknown man viewer."
msgstr ""
-#: builtin/help.c:354
+#: builtin/help.c:357
msgid "no man viewer handled the request"
msgstr ""
-#: builtin/help.c:362
+#: builtin/help.c:365
msgid "no info viewer handled the request"
msgstr ""
-#: builtin/help.c:404
+#: builtin/help.c:407
msgid "Defining attributes per path"
msgstr ""
-#: builtin/help.c:405
+#: builtin/help.c:408
msgid "Everyday Git With 20 Commands Or So"
msgstr ""
-#: builtin/help.c:406
+#: builtin/help.c:409
msgid "A Git glossary"
msgstr ""
-#: builtin/help.c:407
+#: builtin/help.c:410
msgid "Specifies intentionally untracked files to ignore"
msgstr ""
-#: builtin/help.c:408
+#: builtin/help.c:411
msgid "Defining submodule properties"
msgstr ""
-#: builtin/help.c:409
+#: builtin/help.c:412
msgid "Specifying revisions and ranges for Git"
msgstr ""
-#: builtin/help.c:410
+#: builtin/help.c:413
msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
msgstr ""
-#: builtin/help.c:411
+#: builtin/help.c:414
msgid "An overview of recommended workflows with Git"
msgstr ""
-#: builtin/help.c:423
+#: builtin/help.c:426
msgid "The common Git guides are:\n"
msgstr ""
-#: builtin/help.c:441
+#: builtin/help.c:444
#, c-format
-msgid "`git %s' is aliased to `%s'"
+msgid "'%s' is aliased to '%s'"
msgstr ""
-#: builtin/help.c:463 builtin/help.c:480
+#: builtin/help.c:466 builtin/help.c:483
#, c-format
msgid "usage: %s%s"
msgstr ""
-#: builtin/index-pack.c:155
+#: builtin/index-pack.c:156
#, c-format
msgid "unable to open %s"
msgstr ""
-#: builtin/index-pack.c:205
+#: builtin/index-pack.c:206
#, c-format
msgid "object type mismatch at %s"
msgstr ""
-#: builtin/index-pack.c:225
+#: builtin/index-pack.c:226
#, c-format
msgid "did not receive expected object %s"
msgstr ""
-#: builtin/index-pack.c:228
+#: builtin/index-pack.c:229
#, c-format
msgid "object %s: expected type %s, found %s"
msgstr ""
-#: builtin/index-pack.c:270
+#: builtin/index-pack.c:271
#, c-format
msgid "cannot fill %d byte"
msgid_plural "cannot fill %d bytes"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:280
+#: builtin/index-pack.c:281
msgid "early EOF"
msgstr ""
-#: builtin/index-pack.c:281
+#: builtin/index-pack.c:282
msgid "read error on input"
msgstr ""
-#: builtin/index-pack.c:293
+#: builtin/index-pack.c:294
msgid "used more bytes than were available"
msgstr ""
-#: builtin/index-pack.c:300
+#: builtin/index-pack.c:301
msgid "pack too large for current definition of off_t"
msgstr ""
-#: builtin/index-pack.c:303 builtin/unpack-objects.c:93
+#: builtin/index-pack.c:304 builtin/unpack-objects.c:93
msgid "pack exceeds maximum allowed size"
msgstr ""
-#: builtin/index-pack.c:318
+#: builtin/index-pack.c:319
#, c-format
msgid "unable to create '%s'"
msgstr ""
-#: builtin/index-pack.c:324
+#: builtin/index-pack.c:325
#, c-format
msgid "cannot open packfile '%s'"
msgstr ""
-#: builtin/index-pack.c:338
+#: builtin/index-pack.c:339
msgid "pack signature mismatch"
msgstr ""
-#: builtin/index-pack.c:340
+#: builtin/index-pack.c:341
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr ""
-#: builtin/index-pack.c:358
+#: builtin/index-pack.c:359
#, c-format
msgid "pack has bad object at offset %<PRIuMAX>: %s"
msgstr ""
-#: builtin/index-pack.c:479
+#: builtin/index-pack.c:480
#, c-format
msgid "inflate returned %d"
msgstr ""
-#: builtin/index-pack.c:528
+#: builtin/index-pack.c:529
msgid "offset value overflow for delta base object"
msgstr ""
-#: builtin/index-pack.c:536
+#: builtin/index-pack.c:537
msgid "delta base offset is out of bound"
msgstr ""
-#: builtin/index-pack.c:544
+#: builtin/index-pack.c:545
#, c-format
msgid "unknown object type %d"
msgstr ""
-#: builtin/index-pack.c:575
+#: builtin/index-pack.c:576
msgid "cannot pread pack file"
msgstr ""
-#: builtin/index-pack.c:577
+#: builtin/index-pack.c:578
#, c-format
msgid "premature end of pack file, %<PRIuMAX> byte missing"
msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:603
+#: builtin/index-pack.c:604
msgid "serious inflate inconsistency"
msgstr ""
-#: builtin/index-pack.c:748 builtin/index-pack.c:754 builtin/index-pack.c:777
-#: builtin/index-pack.c:816 builtin/index-pack.c:825
+#: builtin/index-pack.c:749 builtin/index-pack.c:755 builtin/index-pack.c:778
+#: builtin/index-pack.c:817 builtin/index-pack.c:826
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr ""
-#: builtin/index-pack.c:751 builtin/pack-objects.c:167
-#: builtin/pack-objects.c:261
+#: builtin/index-pack.c:752 builtin/pack-objects.c:168
+#: builtin/pack-objects.c:262
#, c-format
msgid "unable to read %s"
msgstr ""
-#: builtin/index-pack.c:814
+#: builtin/index-pack.c:815
#, c-format
msgid "cannot read existing object info %s"
msgstr ""
-#: builtin/index-pack.c:822
+#: builtin/index-pack.c:823
#, c-format
msgid "cannot read existing object %s"
msgstr ""
-#: builtin/index-pack.c:836
+#: builtin/index-pack.c:837
#, c-format
msgid "invalid blob object %s"
msgstr ""
-#: builtin/index-pack.c:851
+#: builtin/index-pack.c:852
#, c-format
msgid "invalid %s"
msgstr ""
-#: builtin/index-pack.c:854
+#: builtin/index-pack.c:855
msgid "Error in object"
msgstr ""
-#: builtin/index-pack.c:856
+#: builtin/index-pack.c:857
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr ""
-#: builtin/index-pack.c:928 builtin/index-pack.c:959
+#: builtin/index-pack.c:929 builtin/index-pack.c:960
msgid "failed to apply delta"
msgstr ""
-#: builtin/index-pack.c:1130
+#: builtin/index-pack.c:1131
msgid "Receiving objects"
msgstr ""
-#: builtin/index-pack.c:1130
+#: builtin/index-pack.c:1131
msgid "Indexing objects"
msgstr ""
-#: builtin/index-pack.c:1164
+#: builtin/index-pack.c:1165
msgid "pack is corrupted (SHA1 mismatch)"
msgstr ""
-#: builtin/index-pack.c:1169
+#: builtin/index-pack.c:1170
msgid "cannot fstat packfile"
msgstr ""
-#: builtin/index-pack.c:1172
+#: builtin/index-pack.c:1173
msgid "pack has junk at the end"
msgstr ""
-#: builtin/index-pack.c:1184
+#: builtin/index-pack.c:1185
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr ""
-#: builtin/index-pack.c:1207
+#: builtin/index-pack.c:1208
msgid "Resolving deltas"
msgstr ""
-#: builtin/index-pack.c:1218
+#: builtin/index-pack.c:1219
#, c-format
msgid "unable to create thread: %s"
msgstr ""
-#: builtin/index-pack.c:1260
+#: builtin/index-pack.c:1261
msgid "confusion beyond insanity"
msgstr ""
-#: builtin/index-pack.c:1266
+#: builtin/index-pack.c:1267
#, c-format
msgid "completed with %d local object"
msgid_plural "completed with %d local objects"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:1278
+#: builtin/index-pack.c:1279
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr ""
-#: builtin/index-pack.c:1282
+#: builtin/index-pack.c:1283
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:1306
+#: builtin/index-pack.c:1307
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr ""
-#: builtin/index-pack.c:1382
+#: builtin/index-pack.c:1383
#, c-format
msgid "local object %s is corrupt"
msgstr ""
-#: builtin/index-pack.c:1408
+#: builtin/index-pack.c:1409
msgid "error while closing pack file"
msgstr ""
-#: builtin/index-pack.c:1420
+#: builtin/index-pack.c:1421
#, c-format
msgid "cannot write keep file '%s'"
msgstr ""
-#: builtin/index-pack.c:1428
+#: builtin/index-pack.c:1429
#, c-format
msgid "cannot close written keep file '%s'"
msgstr ""
-#: builtin/index-pack.c:1438
+#: builtin/index-pack.c:1439
msgid "cannot store pack file"
msgstr ""
-#: builtin/index-pack.c:1446
+#: builtin/index-pack.c:1447
msgid "cannot store index file"
msgstr ""
-#: builtin/index-pack.c:1484
+#: builtin/index-pack.c:1485
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr ""
-#: builtin/index-pack.c:1552
+#: builtin/index-pack.c:1553
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr ""
-#: builtin/index-pack.c:1554
+#: builtin/index-pack.c:1555
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr ""
-#: builtin/index-pack.c:1602
+#: builtin/index-pack.c:1603
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:1609
+#: builtin/index-pack.c:1610
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:1622
+#: builtin/index-pack.c:1623
#, c-format
msgid "packfile name '%s' does not end with '.pack'"
msgstr ""
-#: builtin/index-pack.c:1704 builtin/index-pack.c:1707
-#: builtin/index-pack.c:1723 builtin/index-pack.c:1727
+#: builtin/index-pack.c:1705 builtin/index-pack.c:1708
+#: builtin/index-pack.c:1724 builtin/index-pack.c:1728
#, c-format
msgid "bad %s"
msgstr ""
-#: builtin/index-pack.c:1743
+#: builtin/index-pack.c:1744
msgid "--fix-thin cannot be used without --stdin"
msgstr ""
-#: builtin/index-pack.c:1745
+#: builtin/index-pack.c:1746
msgid "--stdin requires a git repository"
msgstr ""
-#: builtin/index-pack.c:1753
+#: builtin/index-pack.c:1754
msgid "--verify with no packfile name given"
msgstr ""
"<token>[(=|:)<value>])...] [<file>...]"
msgstr ""
-#: builtin/interpret-trailers.c:26
+#: builtin/interpret-trailers.c:92
msgid "edit files in place"
msgstr ""
-#: builtin/interpret-trailers.c:27
+#: builtin/interpret-trailers.c:93
msgid "trim empty trailers"
msgstr ""
-#: builtin/interpret-trailers.c:28
+#: builtin/interpret-trailers.c:96
+msgid "where to place the new trailer"
+msgstr ""
+
+#: builtin/interpret-trailers.c:98
+msgid "action if trailer already exists"
+msgstr ""
+
+#: builtin/interpret-trailers.c:100
+msgid "action if trailer is missing"
+msgstr ""
+
+#: builtin/interpret-trailers.c:102
+msgid "output only the trailers"
+msgstr ""
+
+#: builtin/interpret-trailers.c:103
+msgid "do not apply config rules"
+msgstr ""
+
+#: builtin/interpret-trailers.c:104
+msgid "join whitespace-continued values"
+msgstr ""
+
+#: builtin/interpret-trailers.c:105
+msgid "set parsing options"
+msgstr ""
+
+#: builtin/interpret-trailers.c:107
msgid "trailer"
msgstr ""
-#: builtin/interpret-trailers.c:29
+#: builtin/interpret-trailers.c:108
msgid "trailer(s) to add"
msgstr ""
-#: builtin/interpret-trailers.c:42
+#: builtin/interpret-trailers.c:117
+msgid "--trailer with --only-input does not make sense"
+msgstr ""
+
+#: builtin/interpret-trailers.c:127
msgid "no input file given for in-place editing"
msgstr ""
-#: builtin/log.c:45
+#: builtin/log.c:46
msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
msgstr ""
-#: builtin/log.c:46
+#: builtin/log.c:47
msgid "git show [<options>] <object>..."
msgstr ""
-#: builtin/log.c:90
+#: builtin/log.c:91
#, c-format
msgid "invalid --decorate option: %s"
msgstr ""
-#: builtin/log.c:147
+#: builtin/log.c:148
msgid "suppress diff output"
msgstr ""
-#: builtin/log.c:148
+#: builtin/log.c:149
msgid "show source"
msgstr ""
-#: builtin/log.c:149
+#: builtin/log.c:150
msgid "Use mail map file"
msgstr ""
-#: builtin/log.c:150
+#: builtin/log.c:151
msgid "decorate options"
msgstr ""
-#: builtin/log.c:153
+#: builtin/log.c:154
msgid "Process line range n,m in file, counting from 1"
msgstr ""
-#: builtin/log.c:249
+#: builtin/log.c:250
#, c-format
msgid "Final output: %d %s\n"
msgstr ""
-#: builtin/log.c:497
+#: builtin/log.c:501
#, c-format
msgid "git show %s: bad file"
msgstr ""
-#: builtin/log.c:512 builtin/log.c:606
+#: builtin/log.c:516 builtin/log.c:610
#, c-format
msgid "Could not read object %s"
msgstr ""
-#: builtin/log.c:630
+#: builtin/log.c:634
#, c-format
msgid "Unknown type: %d"
msgstr ""
-#: builtin/log.c:751
+#: builtin/log.c:755
msgid "format.headers without value"
msgstr ""
-#: builtin/log.c:852
+#: builtin/log.c:856
msgid "name of output directory is too long"
msgstr ""
-#: builtin/log.c:868
+#: builtin/log.c:872
#, c-format
msgid "Cannot open patch file %s"
msgstr ""
-#: builtin/log.c:885
+#: builtin/log.c:889
msgid "Need exactly one range."
msgstr ""
-#: builtin/log.c:895
+#: builtin/log.c:899
msgid "Not a range."
msgstr ""
-#: builtin/log.c:1001
+#: builtin/log.c:1005
msgid "Cover letter needs email format"
msgstr ""
-#: builtin/log.c:1081
+#: builtin/log.c:1085
#, c-format
msgid "insane in-reply-to: %s"
msgstr ""
-#: builtin/log.c:1108
+#: builtin/log.c:1112
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr ""
-#: builtin/log.c:1158
+#: builtin/log.c:1162
msgid "Two output directories?"
msgstr ""
-#: builtin/log.c:1265 builtin/log.c:1908 builtin/log.c:1910 builtin/log.c:1922
+#: builtin/log.c:1269 builtin/log.c:1920 builtin/log.c:1922 builtin/log.c:1934
#, c-format
msgid "Unknown commit %s"
msgstr ""
-#: builtin/log.c:1275 builtin/notes.c:886 builtin/tag.c:533
+#: builtin/log.c:1279 builtin/notes.c:887 builtin/tag.c:516
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr ""
-#: builtin/log.c:1280
+#: builtin/log.c:1284
msgid "Could not find exact merge base."
msgstr ""
-#: builtin/log.c:1284
+#: builtin/log.c:1288
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:1304
+#: builtin/log.c:1308
msgid "Failed to find exact merge base"
msgstr ""
-#: builtin/log.c:1315
+#: builtin/log.c:1319
msgid "base commit should be the ancestor of revision list"
msgstr ""
-#: builtin/log.c:1319
+#: builtin/log.c:1323
msgid "base commit shouldn't be in revision list"
msgstr ""
-#: builtin/log.c:1368
+#: builtin/log.c:1372
msgid "cannot get patch id"
msgstr ""
-#: builtin/log.c:1425
+#: builtin/log.c:1431
msgid "use [PATCH n/m] even with a single patch"
msgstr ""
-#: builtin/log.c:1428
+#: builtin/log.c:1434
msgid "use [PATCH] even with multiple patches"
msgstr ""
-#: builtin/log.c:1432
+#: builtin/log.c:1438
msgid "print patches to standard out"
msgstr ""
-#: builtin/log.c:1434
+#: builtin/log.c:1440
msgid "generate a cover letter"
msgstr ""
-#: builtin/log.c:1436
+#: builtin/log.c:1442
msgid "use simple number sequence for output file names"
msgstr ""
-#: builtin/log.c:1437
+#: builtin/log.c:1443
msgid "sfx"
msgstr ""
-#: builtin/log.c:1438
+#: builtin/log.c:1444
msgid "use <sfx> instead of '.patch'"
msgstr ""
-#: builtin/log.c:1440
+#: builtin/log.c:1446
msgid "start numbering patches at <n> instead of 1"
msgstr ""
-#: builtin/log.c:1442
+#: builtin/log.c:1448
msgid "mark the series as Nth re-roll"
msgstr ""
-#: builtin/log.c:1444
+#: builtin/log.c:1450
msgid "Use [RFC PATCH] instead of [PATCH]"
msgstr ""
-#: builtin/log.c:1447
+#: builtin/log.c:1453
msgid "Use [<prefix>] instead of [PATCH]"
msgstr ""
-#: builtin/log.c:1450
+#: builtin/log.c:1456
msgid "store resulting files in <dir>"
msgstr ""
-#: builtin/log.c:1453
+#: builtin/log.c:1459
msgid "don't strip/add [PATCH]"
msgstr ""
-#: builtin/log.c:1456
+#: builtin/log.c:1462
msgid "don't output binary diffs"
msgstr ""
-#: builtin/log.c:1458
+#: builtin/log.c:1464
msgid "output all-zero hash in From header"
msgstr ""
-#: builtin/log.c:1460
+#: builtin/log.c:1466
msgid "don't include a patch matching a commit upstream"
msgstr ""
-#: builtin/log.c:1462
+#: builtin/log.c:1468
msgid "show patch format instead of default (patch + stat)"
msgstr ""
-#: builtin/log.c:1464
+#: builtin/log.c:1470
msgid "Messaging"
msgstr ""
-#: builtin/log.c:1465
+#: builtin/log.c:1471
msgid "header"
msgstr ""
-#: builtin/log.c:1466
+#: builtin/log.c:1472
msgid "add email header"
msgstr ""
-#: builtin/log.c:1467 builtin/log.c:1469
+#: builtin/log.c:1473 builtin/log.c:1475
msgid "email"
msgstr ""
-#: builtin/log.c:1467
+#: builtin/log.c:1473
msgid "add To: header"
msgstr ""
-#: builtin/log.c:1469
+#: builtin/log.c:1475
msgid "add Cc: header"
msgstr ""
-#: builtin/log.c:1471
+#: builtin/log.c:1477
msgid "ident"
msgstr ""
-#: builtin/log.c:1472
+#: builtin/log.c:1478
msgid "set From address to <ident> (or committer ident if absent)"
msgstr ""
-#: builtin/log.c:1474
+#: builtin/log.c:1480
msgid "message-id"
msgstr ""
-#: builtin/log.c:1475
+#: builtin/log.c:1481
msgid "make first mail a reply to <message-id>"
msgstr ""
-#: builtin/log.c:1476 builtin/log.c:1479
+#: builtin/log.c:1482 builtin/log.c:1485
msgid "boundary"
msgstr ""
-#: builtin/log.c:1477
+#: builtin/log.c:1483
msgid "attach the patch"
msgstr ""
-#: builtin/log.c:1480
+#: builtin/log.c:1486
msgid "inline the patch"
msgstr ""
-#: builtin/log.c:1484
+#: builtin/log.c:1490
msgid "enable message threading, styles: shallow, deep"
msgstr ""
-#: builtin/log.c:1486
+#: builtin/log.c:1492
msgid "signature"
msgstr ""
-#: builtin/log.c:1487
+#: builtin/log.c:1493
msgid "add a signature"
msgstr ""
-#: builtin/log.c:1488
+#: builtin/log.c:1494
msgid "base-commit"
msgstr ""
-#: builtin/log.c:1489
+#: builtin/log.c:1495
msgid "add prerequisite tree info to the patch series"
msgstr ""
-#: builtin/log.c:1491
+#: builtin/log.c:1497
msgid "add a signature from a file"
msgstr ""
-#: builtin/log.c:1492
+#: builtin/log.c:1498
msgid "don't print the patch filenames"
msgstr ""
-#: builtin/log.c:1567
+#: builtin/log.c:1500
+msgid "show progress while generating patches"
+msgstr ""
+
+#: builtin/log.c:1575
#, c-format
msgid "invalid ident line: %s"
msgstr ""
-#: builtin/log.c:1582
+#: builtin/log.c:1590
msgid "-n and -k are mutually exclusive."
msgstr ""
-#: builtin/log.c:1584
+#: builtin/log.c:1592
msgid "--subject-prefix/--rfc and -k are mutually exclusive."
msgstr ""
-#: builtin/log.c:1592
+#: builtin/log.c:1600
msgid "--name-only does not make sense"
msgstr ""
-#: builtin/log.c:1594
+#: builtin/log.c:1602
msgid "--name-status does not make sense"
msgstr ""
-#: builtin/log.c:1596
+#: builtin/log.c:1604
msgid "--check does not make sense"
msgstr ""
-#: builtin/log.c:1626
+#: builtin/log.c:1634
msgid "standard output, or directory, which one?"
msgstr ""
-#: builtin/log.c:1628
+#: builtin/log.c:1636
#, c-format
msgid "Could not create directory '%s'"
msgstr ""
-#: builtin/log.c:1722
+#: builtin/log.c:1729
#, c-format
msgid "unable to read signature file '%s'"
msgstr ""
-#: builtin/log.c:1794
+#: builtin/log.c:1761
+msgid "Generating patches"
+msgstr ""
+
+#: builtin/log.c:1805
msgid "Failed to create output files"
msgstr ""
-#: builtin/log.c:1843
+#: builtin/log.c:1855
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr ""
-#: builtin/log.c:1897
+#: builtin/log.c:1909
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
msgstr ""
-#: builtin/ls-files.c:468
+#: builtin/ls-files.c:466
msgid "git ls-files [<options>] [<file>...]"
msgstr ""
-#: builtin/ls-files.c:517
+#: builtin/ls-files.c:515
msgid "identify the file status with tags"
msgstr ""
-#: builtin/ls-files.c:519
+#: builtin/ls-files.c:517
msgid "use lowercase letters for 'assume unchanged' files"
msgstr ""
-#: builtin/ls-files.c:521
+#: builtin/ls-files.c:519
msgid "show cached files in the output (default)"
msgstr ""
-#: builtin/ls-files.c:523
+#: builtin/ls-files.c:521
msgid "show deleted files in the output"
msgstr ""
-#: builtin/ls-files.c:525
+#: builtin/ls-files.c:523
msgid "show modified files in the output"
msgstr ""
-#: builtin/ls-files.c:527
+#: builtin/ls-files.c:525
msgid "show other files in the output"
msgstr ""
-#: builtin/ls-files.c:529
+#: builtin/ls-files.c:527
msgid "show ignored files in the output"
msgstr ""
-#: builtin/ls-files.c:532
+#: builtin/ls-files.c:530
msgid "show staged contents' object name in the output"
msgstr ""
-#: builtin/ls-files.c:534
+#: builtin/ls-files.c:532
msgid "show files on the filesystem that need to be removed"
msgstr ""
-#: builtin/ls-files.c:536
+#: builtin/ls-files.c:534
msgid "show 'other' directories' names only"
msgstr ""
-#: builtin/ls-files.c:538
+#: builtin/ls-files.c:536
msgid "show line endings of files"
msgstr ""
-#: builtin/ls-files.c:540
+#: builtin/ls-files.c:538
msgid "don't show empty directories"
msgstr ""
-#: builtin/ls-files.c:543
+#: builtin/ls-files.c:541
msgid "show unmerged files in the output"
msgstr ""
-#: builtin/ls-files.c:545
+#: builtin/ls-files.c:543
msgid "show resolve-undo information"
msgstr ""
-#: builtin/ls-files.c:547
+#: builtin/ls-files.c:545
msgid "skip files matching pattern"
msgstr ""
-#: builtin/ls-files.c:550
+#: builtin/ls-files.c:548
msgid "exclude patterns are read from <file>"
msgstr ""
-#: builtin/ls-files.c:553
+#: builtin/ls-files.c:551
msgid "read additional per-directory exclude patterns in <file>"
msgstr ""
-#: builtin/ls-files.c:555
+#: builtin/ls-files.c:553
msgid "add the standard git exclusions"
msgstr ""
-#: builtin/ls-files.c:558
+#: builtin/ls-files.c:556
msgid "make the output relative to the project top directory"
msgstr ""
-#: builtin/ls-files.c:561
+#: builtin/ls-files.c:559
msgid "recurse through submodules"
msgstr ""
-#: builtin/ls-files.c:563
+#: builtin/ls-files.c:561
msgid "if any <file> is not in the index, treat this as an error"
msgstr ""
-#: builtin/ls-files.c:564
+#: builtin/ls-files.c:562
msgid "tree-ish"
msgstr ""
-#: builtin/ls-files.c:565
+#: builtin/ls-files.c:563
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr ""
-#: builtin/ls-files.c:567
+#: builtin/ls-files.c:565
msgid "show debugging data"
msgstr ""
msgid "empty mbox: '%s'"
msgstr ""
-#: builtin/merge.c:47
+#: builtin/merge.c:48
msgid "git merge [<options>] [<commit>...]"
msgstr ""
-#: builtin/merge.c:48
+#: builtin/merge.c:49
msgid "git merge --abort"
msgstr ""
-#: builtin/merge.c:49
+#: builtin/merge.c:50
msgid "git merge --continue"
msgstr ""
-#: builtin/merge.c:104
+#: builtin/merge.c:107
msgid "switch `m' requires a value"
msgstr ""
-#: builtin/merge.c:141
+#: builtin/merge.c:144
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr ""
-#: builtin/merge.c:142
+#: builtin/merge.c:145
#, c-format
msgid "Available strategies are:"
msgstr ""
-#: builtin/merge.c:147
+#: builtin/merge.c:150
#, c-format
msgid "Available custom strategies are:"
msgstr ""
-#: builtin/merge.c:197 builtin/pull.c:134
+#: builtin/merge.c:200 builtin/pull.c:134
msgid "do not show a diffstat at the end of the merge"
msgstr ""
-#: builtin/merge.c:200 builtin/pull.c:137
+#: builtin/merge.c:203 builtin/pull.c:137
msgid "show a diffstat at the end of the merge"
msgstr ""
-#: builtin/merge.c:201 builtin/pull.c:140
+#: builtin/merge.c:204 builtin/pull.c:140
msgid "(synonym to --stat)"
msgstr ""
-#: builtin/merge.c:203 builtin/pull.c:143
+#: builtin/merge.c:206 builtin/pull.c:143
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr ""
-#: builtin/merge.c:206 builtin/pull.c:146
+#: builtin/merge.c:209 builtin/pull.c:146
msgid "create a single commit instead of doing a merge"
msgstr ""
-#: builtin/merge.c:208 builtin/pull.c:149
+#: builtin/merge.c:211 builtin/pull.c:149
msgid "perform a commit if the merge succeeds (default)"
msgstr ""
-#: builtin/merge.c:210 builtin/pull.c:152
+#: builtin/merge.c:213 builtin/pull.c:152
msgid "edit message before committing"
msgstr ""
-#: builtin/merge.c:211
+#: builtin/merge.c:214
msgid "allow fast-forward (default)"
msgstr ""
-#: builtin/merge.c:213 builtin/pull.c:158
+#: builtin/merge.c:216 builtin/pull.c:158
msgid "abort if fast-forward is not possible"
msgstr ""
-#: builtin/merge.c:217 builtin/pull.c:161
+#: builtin/merge.c:220 builtin/pull.c:161
msgid "verify that the named commit has a valid GPG signature"
msgstr ""
-#: builtin/merge.c:218 builtin/notes.c:776 builtin/pull.c:165
+#: builtin/merge.c:221 builtin/notes.c:777 builtin/pull.c:165
#: builtin/revert.c:109
msgid "strategy"
msgstr ""
-#: builtin/merge.c:219 builtin/pull.c:166
+#: builtin/merge.c:222 builtin/pull.c:166
msgid "merge strategy to use"
msgstr ""
-#: builtin/merge.c:220 builtin/pull.c:169
+#: builtin/merge.c:223 builtin/pull.c:169
msgid "option=value"
msgstr ""
-#: builtin/merge.c:221 builtin/pull.c:170
+#: builtin/merge.c:224 builtin/pull.c:170
msgid "option for selected merge strategy"
msgstr ""
-#: builtin/merge.c:223
+#: builtin/merge.c:226
msgid "merge commit message (for a non-fast-forward merge)"
msgstr ""
-#: builtin/merge.c:227
+#: builtin/merge.c:230
msgid "abort the current in-progress merge"
msgstr ""
-#: builtin/merge.c:229
+#: builtin/merge.c:232
msgid "continue the current in-progress merge"
msgstr ""
-#: builtin/merge.c:231 builtin/pull.c:177
+#: builtin/merge.c:234 builtin/pull.c:177
msgid "allow merging unrelated histories"
msgstr ""
-#: builtin/merge.c:259
+#: builtin/merge.c:240
+msgid "verify commit-msg hook"
+msgstr ""
+
+#: builtin/merge.c:265
msgid "could not run stash."
msgstr ""
-#: builtin/merge.c:264
+#: builtin/merge.c:270
msgid "stash failed"
msgstr ""
-#: builtin/merge.c:269
+#: builtin/merge.c:275
#, c-format
msgid "not a valid object: %s"
msgstr ""
-#: builtin/merge.c:288 builtin/merge.c:305
+#: builtin/merge.c:297 builtin/merge.c:314
msgid "read-tree failed"
msgstr ""
-#: builtin/merge.c:335
+#: builtin/merge.c:344
msgid " (nothing to squash)"
msgstr ""
-#: builtin/merge.c:346
+#: builtin/merge.c:355
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr ""
-#: builtin/merge.c:396
+#: builtin/merge.c:405
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr ""
-#: builtin/merge.c:447
+#: builtin/merge.c:456
#, c-format
msgid "'%s' does not point to a commit"
msgstr ""
-#: builtin/merge.c:537
+#: builtin/merge.c:546
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr ""
-#: builtin/merge.c:657
+#: builtin/merge.c:666
msgid "Not handling anything other than two heads merge."
msgstr ""
-#: builtin/merge.c:671
+#: builtin/merge.c:680
#, c-format
msgid "Unknown option for merge-recursive: -X%s"
msgstr ""
-#: builtin/merge.c:686
+#: builtin/merge.c:695
#, c-format
msgid "unable to write %s"
msgstr ""
-#: builtin/merge.c:738
+#: builtin/merge.c:747
#, c-format
msgid "Could not read from '%s'"
msgstr ""
-#: builtin/merge.c:747
+#: builtin/merge.c:756
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr ""
-#: builtin/merge.c:753
+#: builtin/merge.c:762
#, c-format
msgid ""
"Please enter a commit message to explain why this merge is necessary,\n"
"the commit.\n"
msgstr ""
-#: builtin/merge.c:777
+#: builtin/merge.c:798
msgid "Empty commit message."
msgstr ""
-#: builtin/merge.c:797
+#: builtin/merge.c:818
#, c-format
msgid "Wonderful.\n"
msgstr ""
-#: builtin/merge.c:850
+#: builtin/merge.c:871
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr ""
-#: builtin/merge.c:889
+#: builtin/merge.c:910
msgid "No current branch."
msgstr ""
-#: builtin/merge.c:891
+#: builtin/merge.c:912
msgid "No remote for the current branch."
msgstr ""
-#: builtin/merge.c:893
+#: builtin/merge.c:914
msgid "No default upstream defined for the current branch."
msgstr ""
-#: builtin/merge.c:898
+#: builtin/merge.c:919
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr ""
-#: builtin/merge.c:945
+#: builtin/merge.c:972
#, c-format
msgid "Bad value '%s' in environment '%s'"
msgstr ""
-#: builtin/merge.c:1046
+#: builtin/merge.c:1073
#, c-format
msgid "not something we can merge in %s: %s"
msgstr ""
-#: builtin/merge.c:1080
+#: builtin/merge.c:1107
msgid "not something we can merge"
msgstr ""
-#: builtin/merge.c:1145
+#: builtin/merge.c:1172
msgid "--abort expects no arguments"
msgstr ""
-#: builtin/merge.c:1149
+#: builtin/merge.c:1176
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr ""
-#: builtin/merge.c:1161
+#: builtin/merge.c:1188
msgid "--continue expects no arguments"
msgstr ""
-#: builtin/merge.c:1165
+#: builtin/merge.c:1192
msgid "There is no merge in progress (MERGE_HEAD missing)."
msgstr ""
-#: builtin/merge.c:1181
+#: builtin/merge.c:1208
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
msgstr ""
-#: builtin/merge.c:1188
+#: builtin/merge.c:1215
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
msgstr ""
-#: builtin/merge.c:1191
+#: builtin/merge.c:1218
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr ""
-#: builtin/merge.c:1200
+#: builtin/merge.c:1227
msgid "You cannot combine --squash with --no-ff."
msgstr ""
-#: builtin/merge.c:1208
+#: builtin/merge.c:1235
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr ""
-#: builtin/merge.c:1225
+#: builtin/merge.c:1252
msgid "Squash commit into empty head not supported yet"
msgstr ""
-#: builtin/merge.c:1227
+#: builtin/merge.c:1254
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr ""
-#: builtin/merge.c:1232
+#: builtin/merge.c:1259
#, c-format
msgid "%s - not something we can merge"
msgstr ""
-#: builtin/merge.c:1234
+#: builtin/merge.c:1261
msgid "Can merge only exactly one commit into empty head"
msgstr ""
-#: builtin/merge.c:1268
+#: builtin/merge.c:1295
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr ""
-#: builtin/merge.c:1271
+#: builtin/merge.c:1298
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr ""
-#: builtin/merge.c:1274
+#: builtin/merge.c:1301
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr ""
-#: builtin/merge.c:1277
+#: builtin/merge.c:1304
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr ""
-#: builtin/merge.c:1339
+#: builtin/merge.c:1366
msgid "refusing to merge unrelated histories"
msgstr ""
-#: builtin/merge.c:1348
-msgid "Already up-to-date."
+#: builtin/merge.c:1375
+msgid "Already up to date."
msgstr ""
-#: builtin/merge.c:1358
+#: builtin/merge.c:1385
#, c-format
msgid "Updating %s..%s\n"
msgstr ""
-#: builtin/merge.c:1399
+#: builtin/merge.c:1426
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr ""
-#: builtin/merge.c:1406
+#: builtin/merge.c:1433
#, c-format
msgid "Nope.\n"
msgstr ""
-#: builtin/merge.c:1431
-msgid "Already up-to-date. Yeeah!"
+#: builtin/merge.c:1458
+msgid "Already up to date. Yeeah!"
msgstr ""
-#: builtin/merge.c:1437
+#: builtin/merge.c:1464
msgid "Not possible to fast-forward, aborting."
msgstr ""
-#: builtin/merge.c:1460 builtin/merge.c:1539
+#: builtin/merge.c:1487 builtin/merge.c:1566
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr ""
-#: builtin/merge.c:1464
+#: builtin/merge.c:1491
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr ""
-#: builtin/merge.c:1530
+#: builtin/merge.c:1557
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr ""
-#: builtin/merge.c:1532
+#: builtin/merge.c:1559
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr ""
-#: builtin/merge.c:1541
+#: builtin/merge.c:1568
#, c-format
msgid "Using the %s to prepare resolving by hand.\n"
msgstr ""
-#: builtin/merge.c:1553
+#: builtin/merge.c:1580
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
msgid "Directory %s is in index and no submodule?"
msgstr ""
-#: builtin/mv.c:85 builtin/rm.c:290
+#: builtin/mv.c:85 builtin/rm.c:289
msgid "Please stage your changes to .gitmodules or stash them to proceed"
msgstr ""
msgid "skip move/rename errors"
msgstr ""
-#: builtin/mv.c:168
+#: builtin/mv.c:167
#, c-format
msgid "destination '%s' is not a directory"
msgstr ""
-#: builtin/mv.c:179
+#: builtin/mv.c:178
#, c-format
msgid "Checking rename of '%s' to '%s'\n"
msgstr ""
-#: builtin/mv.c:183
+#: builtin/mv.c:182
msgid "bad source"
msgstr ""
-#: builtin/mv.c:186
+#: builtin/mv.c:185
msgid "can not move directory into itself"
msgstr ""
-#: builtin/mv.c:189
+#: builtin/mv.c:188
msgid "cannot move directory over file"
msgstr ""
-#: builtin/mv.c:198
+#: builtin/mv.c:197
msgid "source directory is empty"
msgstr ""
-#: builtin/mv.c:223
+#: builtin/mv.c:222
msgid "not under version control"
msgstr ""
-#: builtin/mv.c:226
+#: builtin/mv.c:225
msgid "destination exists"
msgstr ""
-#: builtin/mv.c:234
+#: builtin/mv.c:233
#, c-format
msgid "overwriting '%s'"
msgstr ""
-#: builtin/mv.c:237
+#: builtin/mv.c:236
msgid "Cannot overwrite"
msgstr ""
-#: builtin/mv.c:240
+#: builtin/mv.c:239
msgid "multiple sources for the same target"
msgstr ""
-#: builtin/mv.c:242
+#: builtin/mv.c:241
msgid "destination directory does not exist"
msgstr ""
-#: builtin/mv.c:249
+#: builtin/mv.c:248
#, c-format
msgid "%s, source=%s, destination=%s"
msgstr ""
-#: builtin/mv.c:270
+#: builtin/mv.c:269
#, c-format
msgid "Renaming %s to %s\n"
msgstr ""
-#: builtin/mv.c:276 builtin/remote.c:711 builtin/repack.c:390
+#: builtin/mv.c:275 builtin/remote.c:712 builtin/repack.c:390
#, c-format
msgid "renaming '%s' failed"
msgstr ""
msgid "the note contents have been left in %s"
msgstr ""
-#: builtin/notes.c:234 builtin/tag.c:517
+#: builtin/notes.c:234 builtin/tag.c:500
#, c-format
msgid "cannot read '%s'"
msgstr ""
-#: builtin/notes.c:236 builtin/tag.c:520
+#: builtin/notes.c:236 builtin/tag.c:503
#, c-format
msgid "could not open or read '%s'"
msgstr ""
#: builtin/notes.c:255 builtin/notes.c:306 builtin/notes.c:308
-#: builtin/notes.c:375 builtin/notes.c:430 builtin/notes.c:516
-#: builtin/notes.c:521 builtin/notes.c:599 builtin/notes.c:661
+#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:517
+#: builtin/notes.c:522 builtin/notes.c:600 builtin/notes.c:662
#, c-format
msgid "failed to resolve '%s' as a valid ref."
msgstr ""
#. TRANSLATORS: the first %s will be replaced by a git
#. notes command: 'add', 'merge', 'remove', etc.
#.
-#: builtin/notes.c:348
+#: builtin/notes.c:349
#, c-format
msgid "refusing to %s notes in %s (outside of refs/notes/)"
msgstr ""
-#: builtin/notes.c:368 builtin/notes.c:423 builtin/notes.c:499
-#: builtin/notes.c:511 builtin/notes.c:587 builtin/notes.c:654
-#: builtin/notes.c:804 builtin/notes.c:951 builtin/notes.c:972
+#: builtin/notes.c:369 builtin/notes.c:424 builtin/notes.c:500
+#: builtin/notes.c:512 builtin/notes.c:588 builtin/notes.c:655
+#: builtin/notes.c:805 builtin/notes.c:952 builtin/notes.c:973
msgid "too many parameters"
msgstr ""
-#: builtin/notes.c:381 builtin/notes.c:667
+#: builtin/notes.c:382 builtin/notes.c:668
#, c-format
msgid "no note found for object %s."
msgstr ""
-#: builtin/notes.c:402 builtin/notes.c:565
+#: builtin/notes.c:403 builtin/notes.c:566
msgid "note contents as a string"
msgstr ""
-#: builtin/notes.c:405 builtin/notes.c:568
+#: builtin/notes.c:406 builtin/notes.c:569
msgid "note contents in a file"
msgstr ""
-#: builtin/notes.c:408 builtin/notes.c:571
+#: builtin/notes.c:409 builtin/notes.c:572
msgid "reuse and edit specified note object"
msgstr ""
-#: builtin/notes.c:411 builtin/notes.c:574
+#: builtin/notes.c:412 builtin/notes.c:575
msgid "reuse specified note object"
msgstr ""
-#: builtin/notes.c:414 builtin/notes.c:577
+#: builtin/notes.c:415 builtin/notes.c:578
msgid "allow storing empty note"
msgstr ""
-#: builtin/notes.c:415 builtin/notes.c:486
+#: builtin/notes.c:416 builtin/notes.c:487
msgid "replace existing notes"
msgstr ""
-#: builtin/notes.c:440
+#: builtin/notes.c:441
#, c-format
msgid ""
"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
"existing notes"
msgstr ""
-#: builtin/notes.c:455 builtin/notes.c:534
+#: builtin/notes.c:456 builtin/notes.c:535
#, c-format
msgid "Overwriting existing notes for object %s\n"
msgstr ""
-#: builtin/notes.c:466 builtin/notes.c:626 builtin/notes.c:891
+#: builtin/notes.c:467 builtin/notes.c:627 builtin/notes.c:892
#, c-format
msgid "Removing note for object %s\n"
msgstr ""
-#: builtin/notes.c:487
+#: builtin/notes.c:488
msgid "read objects from stdin"
msgstr ""
-#: builtin/notes.c:489
+#: builtin/notes.c:490
msgid "load rewriting config for <command> (implies --stdin)"
msgstr ""
-#: builtin/notes.c:507
+#: builtin/notes.c:508
msgid "too few parameters"
msgstr ""
-#: builtin/notes.c:528
+#: builtin/notes.c:529
#, c-format
msgid ""
"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
"existing notes"
msgstr ""
-#: builtin/notes.c:540
+#: builtin/notes.c:541
#, c-format
msgid "missing notes on source object %s. Cannot copy."
msgstr ""
-#: builtin/notes.c:592
+#: builtin/notes.c:593
#, c-format
msgid ""
"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
msgstr ""
-#: builtin/notes.c:687
+#: builtin/notes.c:688
msgid "failed to delete ref NOTES_MERGE_PARTIAL"
msgstr ""
-#: builtin/notes.c:689
+#: builtin/notes.c:690
msgid "failed to delete ref NOTES_MERGE_REF"
msgstr ""
-#: builtin/notes.c:691
+#: builtin/notes.c:692
msgid "failed to remove 'git notes merge' worktree"
msgstr ""
-#: builtin/notes.c:711
+#: builtin/notes.c:712
msgid "failed to read ref NOTES_MERGE_PARTIAL"
msgstr ""
-#: builtin/notes.c:713
+#: builtin/notes.c:714
msgid "could not find commit from NOTES_MERGE_PARTIAL."
msgstr ""
-#: builtin/notes.c:715
+#: builtin/notes.c:716
msgid "could not parse commit from NOTES_MERGE_PARTIAL."
msgstr ""
-#: builtin/notes.c:728
+#: builtin/notes.c:729
msgid "failed to resolve NOTES_MERGE_REF"
msgstr ""
-#: builtin/notes.c:731
+#: builtin/notes.c:732
msgid "failed to finalize notes merge"
msgstr ""
-#: builtin/notes.c:757
+#: builtin/notes.c:758
#, c-format
msgid "unknown notes merge strategy %s"
msgstr ""
-#: builtin/notes.c:773
+#: builtin/notes.c:774
msgid "General options"
msgstr ""
-#: builtin/notes.c:775
+#: builtin/notes.c:776
msgid "Merge options"
msgstr ""
-#: builtin/notes.c:777
+#: builtin/notes.c:778
msgid ""
"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
"cat_sort_uniq)"
msgstr ""
-#: builtin/notes.c:779
+#: builtin/notes.c:780
msgid "Committing unmerged notes"
msgstr ""
-#: builtin/notes.c:781
+#: builtin/notes.c:782
msgid "finalize notes merge by committing unmerged notes"
msgstr ""
-#: builtin/notes.c:783
+#: builtin/notes.c:784
msgid "Aborting notes merge resolution"
msgstr ""
-#: builtin/notes.c:785
+#: builtin/notes.c:786
msgid "abort notes merge"
msgstr ""
-#: builtin/notes.c:796
+#: builtin/notes.c:797
msgid "cannot mix --commit, --abort or -s/--strategy"
msgstr ""
-#: builtin/notes.c:801
+#: builtin/notes.c:802
msgid "must specify a notes ref to merge"
msgstr ""
-#: builtin/notes.c:825
+#: builtin/notes.c:826
#, c-format
msgid "unknown -s/--strategy: %s"
msgstr ""
-#: builtin/notes.c:862
+#: builtin/notes.c:863
#, c-format
msgid "a notes merge into %s is already in-progress at %s"
msgstr ""
-#: builtin/notes.c:865
+#: builtin/notes.c:866
#, c-format
msgid "failed to store link to current notes ref (%s)"
msgstr ""
-#: builtin/notes.c:867
+#: builtin/notes.c:868
#, c-format
msgid ""
"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
"abort'.\n"
msgstr ""
-#: builtin/notes.c:889
+#: builtin/notes.c:890
#, c-format
msgid "Object %s has no note\n"
msgstr ""
-#: builtin/notes.c:901
+#: builtin/notes.c:902
msgid "attempt to remove non-existent note is not an error"
msgstr ""
-#: builtin/notes.c:904
+#: builtin/notes.c:905
msgid "read object names from the standard input"
msgstr ""
-#: builtin/notes.c:942 builtin/prune.c:105 builtin/worktree.c:128
+#: builtin/notes.c:943 builtin/prune.c:105 builtin/worktree.c:146
msgid "do not remove, show only"
msgstr ""
-#: builtin/notes.c:943
+#: builtin/notes.c:944
msgid "report pruned notes"
msgstr ""
-#: builtin/notes.c:985
+#: builtin/notes.c:986
msgid "notes-ref"
msgstr ""
-#: builtin/notes.c:986
+#: builtin/notes.c:987
msgid "use notes from <notes-ref>"
msgstr ""
-#: builtin/notes.c:1021
+#: builtin/notes.c:1022
#, c-format
msgid "unknown subcommand: %s"
msgstr ""
-#: builtin/pack-objects.c:30
+#: builtin/pack-objects.c:31
msgid ""
"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
msgstr ""
-#: builtin/pack-objects.c:31
+#: builtin/pack-objects.c:32
msgid ""
"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
msgstr ""
-#: builtin/pack-objects.c:180 builtin/pack-objects.c:183
+#: builtin/pack-objects.c:181 builtin/pack-objects.c:184
#, c-format
msgid "deflate error (%d)"
msgstr ""
-#: builtin/pack-objects.c:776
+#: builtin/pack-objects.c:777
msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
msgstr ""
-#: builtin/pack-objects.c:789
+#: builtin/pack-objects.c:790
msgid "Writing objects"
msgstr ""
-#: builtin/pack-objects.c:1069
+#: builtin/pack-objects.c:1070
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr ""
-#: builtin/pack-objects.c:2434
+#: builtin/pack-objects.c:2440
msgid "Compressing objects"
msgstr ""
-#: builtin/pack-objects.c:2843
+#: builtin/pack-objects.c:2849
#, c-format
msgid "unsupported index version %s"
msgstr ""
-#: builtin/pack-objects.c:2847
+#: builtin/pack-objects.c:2853
#, c-format
msgid "bad index version '%s'"
msgstr ""
-#: builtin/pack-objects.c:2877
+#: builtin/pack-objects.c:2883
msgid "do not show progress meter"
msgstr ""
-#: builtin/pack-objects.c:2879
+#: builtin/pack-objects.c:2885
msgid "show progress meter"
msgstr ""
-#: builtin/pack-objects.c:2881
+#: builtin/pack-objects.c:2887
msgid "show progress meter during object writing phase"
msgstr ""
-#: builtin/pack-objects.c:2884
+#: builtin/pack-objects.c:2890
msgid "similar to --all-progress when progress meter is shown"
msgstr ""
-#: builtin/pack-objects.c:2885
+#: builtin/pack-objects.c:2891
msgid "version[,offset]"
msgstr ""
-#: builtin/pack-objects.c:2886
+#: builtin/pack-objects.c:2892
msgid "write the pack index file in the specified idx format version"
msgstr ""
-#: builtin/pack-objects.c:2889
+#: builtin/pack-objects.c:2895
msgid "maximum size of each output pack file"
msgstr ""
-#: builtin/pack-objects.c:2891
+#: builtin/pack-objects.c:2897
msgid "ignore borrowed objects from alternate object store"
msgstr ""
-#: builtin/pack-objects.c:2893
+#: builtin/pack-objects.c:2899
msgid "ignore packed objects"
msgstr ""
-#: builtin/pack-objects.c:2895
+#: builtin/pack-objects.c:2901
msgid "limit pack window by objects"
msgstr ""
-#: builtin/pack-objects.c:2897
+#: builtin/pack-objects.c:2903
msgid "limit pack window by memory in addition to object limit"
msgstr ""
-#: builtin/pack-objects.c:2899
+#: builtin/pack-objects.c:2905
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr ""
-#: builtin/pack-objects.c:2901
+#: builtin/pack-objects.c:2907
msgid "reuse existing deltas"
msgstr ""
-#: builtin/pack-objects.c:2903
+#: builtin/pack-objects.c:2909
msgid "reuse existing objects"
msgstr ""
-#: builtin/pack-objects.c:2905
+#: builtin/pack-objects.c:2911
msgid "use OFS_DELTA objects"
msgstr ""
-#: builtin/pack-objects.c:2907
+#: builtin/pack-objects.c:2913
msgid "use threads when searching for best delta matches"
msgstr ""
-#: builtin/pack-objects.c:2909
+#: builtin/pack-objects.c:2915
msgid "do not create an empty pack output"
msgstr ""
-#: builtin/pack-objects.c:2911
+#: builtin/pack-objects.c:2917
msgid "read revision arguments from standard input"
msgstr ""
-#: builtin/pack-objects.c:2913
+#: builtin/pack-objects.c:2919
msgid "limit the objects to those that are not yet packed"
msgstr ""
-#: builtin/pack-objects.c:2916
+#: builtin/pack-objects.c:2922
msgid "include objects reachable from any reference"
msgstr ""
-#: builtin/pack-objects.c:2919
+#: builtin/pack-objects.c:2925
msgid "include objects referred by reflog entries"
msgstr ""
-#: builtin/pack-objects.c:2922
+#: builtin/pack-objects.c:2928
msgid "include objects referred to by the index"
msgstr ""
-#: builtin/pack-objects.c:2925
+#: builtin/pack-objects.c:2931
msgid "output pack to stdout"
msgstr ""
-#: builtin/pack-objects.c:2927
+#: builtin/pack-objects.c:2933
msgid "include tag objects that refer to objects to be packed"
msgstr ""
-#: builtin/pack-objects.c:2929
+#: builtin/pack-objects.c:2935
msgid "keep unreachable objects"
msgstr ""
-#: builtin/pack-objects.c:2931
+#: builtin/pack-objects.c:2937
msgid "pack loose unreachable objects"
msgstr ""
-#: builtin/pack-objects.c:2933
+#: builtin/pack-objects.c:2939
msgid "unpack unreachable objects newer than <time>"
msgstr ""
-#: builtin/pack-objects.c:2936
+#: builtin/pack-objects.c:2942
msgid "create thin packs"
msgstr ""
-#: builtin/pack-objects.c:2938
+#: builtin/pack-objects.c:2944
msgid "create packs suitable for shallow fetches"
msgstr ""
-#: builtin/pack-objects.c:2940
+#: builtin/pack-objects.c:2946
msgid "ignore packs that have companion .keep file"
msgstr ""
-#: builtin/pack-objects.c:2942
+#: builtin/pack-objects.c:2948
msgid "pack compression level"
msgstr ""
-#: builtin/pack-objects.c:2944
+#: builtin/pack-objects.c:2950
msgid "do not hide commits by grafts"
msgstr ""
-#: builtin/pack-objects.c:2946
+#: builtin/pack-objects.c:2952
msgid "use a bitmap index if available to speed up counting objects"
msgstr ""
-#: builtin/pack-objects.c:2948
+#: builtin/pack-objects.c:2954
msgid "write a bitmap index together with the pack index"
msgstr ""
-#: builtin/pack-objects.c:3075
+#: builtin/pack-objects.c:3081
msgid "Counting objects"
msgstr ""
msgid "prune loose refs (default)"
msgstr ""
-#: builtin/prune-packed.c:7
+#: builtin/prune-packed.c:8
msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
msgstr ""
-#: builtin/prune-packed.c:40
+#: builtin/prune-packed.c:41
msgid "Removing duplicate objects"
msgstr ""
msgid "incorporate changes by rebasing rather than merging"
msgstr ""
-#: builtin/pull.c:155 builtin/rebase--helper.c:19 builtin/revert.c:121
+#: builtin/pull.c:155 builtin/rebase--helper.c:21 builtin/revert.c:121
msgid "allow fast-forward"
msgstr ""
msgid "Invalid value for pull.ff: %s"
msgstr ""
-#: builtin/pull.c:399
+#: builtin/pull.c:403
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
msgstr ""
-#: builtin/pull.c:401
+#: builtin/pull.c:405
msgid ""
"There are no candidates for merging among the refs that you just fetched."
msgstr ""
-#: builtin/pull.c:402
+#: builtin/pull.c:406
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
msgstr ""
-#: builtin/pull.c:405
+#: builtin/pull.c:409
#, 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:410 git-parse-remote.sh:73
+#: builtin/pull.c:414 git-parse-remote.sh:73
msgid "You are not currently on a branch."
msgstr ""
-#: builtin/pull.c:412 builtin/pull.c:427 git-parse-remote.sh:79
+#: builtin/pull.c:416 builtin/pull.c:431 git-parse-remote.sh:79
msgid "Please specify which branch you want to rebase against."
msgstr ""
-#: builtin/pull.c:414 builtin/pull.c:429 git-parse-remote.sh:82
+#: builtin/pull.c:418 builtin/pull.c:433 git-parse-remote.sh:82
msgid "Please specify which branch you want to merge with."
msgstr ""
-#: builtin/pull.c:415 builtin/pull.c:430
+#: builtin/pull.c:419 builtin/pull.c:434
msgid "See git-pull(1) for details."
msgstr ""
-#: builtin/pull.c:417 builtin/pull.c:423 builtin/pull.c:432
+#: builtin/pull.c:421 builtin/pull.c:427 builtin/pull.c:436
#: git-parse-remote.sh:64
msgid "<remote>"
msgstr ""
-#: builtin/pull.c:417 builtin/pull.c:432 builtin/pull.c:437 git-rebase.sh:456
+#: builtin/pull.c:421 builtin/pull.c:436 builtin/pull.c:441 git-rebase.sh:466
#: git-parse-remote.sh:65
msgid "<branch>"
msgstr ""
-#: builtin/pull.c:425 git-parse-remote.sh:75
+#: builtin/pull.c:429 git-parse-remote.sh:75
msgid "There is no tracking information for the current branch."
msgstr ""
-#: builtin/pull.c:434 git-parse-remote.sh:95
+#: builtin/pull.c:438 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:439
+#: builtin/pull.c:443
#, 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:792
+#: builtin/pull.c:796
msgid "ignoring --verify-signatures for rebase"
msgstr ""
-#: builtin/pull.c:840
+#: builtin/pull.c:844
msgid "--[no-]autostash option is only valid with --rebase."
msgstr ""
-#: builtin/pull.c:848
+#: builtin/pull.c:852
msgid "Updating an unborn branch with changes added to the index."
msgstr ""
-#: builtin/pull.c:851
+#: builtin/pull.c:855
msgid "pull with rebase"
msgstr ""
-#: builtin/pull.c:852
+#: builtin/pull.c:856
msgid "please commit or stash them."
msgstr ""
-#: builtin/pull.c:877
+#: builtin/pull.c:881
#, c-format
msgid ""
"fetch updated the current branch head.\n"
"commit %s."
msgstr ""
-#: builtin/pull.c:882
+#: builtin/pull.c:886
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
"to recover."
msgstr ""
-#: builtin/pull.c:897
+#: builtin/pull.c:901
msgid "Cannot merge multiple branches into empty head."
msgstr ""
-#: builtin/pull.c:901
+#: builtin/pull.c:905
msgid "Cannot rebase onto multiple branches."
msgstr ""
-#: builtin/pull.c:908
+#: builtin/pull.c:912
msgid "cannot rebase with locally recorded submodule modifications"
msgstr ""
msgid "git rebase--helper [<options>]"
msgstr ""
-#: builtin/rebase--helper.c:20
+#: builtin/rebase--helper.c:22
+msgid "keep empty commits"
+msgstr ""
+
+#: builtin/rebase--helper.c:23
msgid "continue rebase"
msgstr ""
-#: builtin/rebase--helper.c:22
+#: builtin/rebase--helper.c:25
msgid "abort rebase"
msgstr ""
-#: builtin/receive-pack.c:28
+#: builtin/rebase--helper.c:28
+msgid "make rebase script"
+msgstr ""
+
+#: builtin/rebase--helper.c:30
+msgid "shorten SHA-1s in the todo list"
+msgstr ""
+
+#: builtin/rebase--helper.c:32
+msgid "expand SHA-1s in the todo list"
+msgstr ""
+
+#: builtin/rebase--helper.c:34
+msgid "check the todo list"
+msgstr ""
+
+#: builtin/rebase--helper.c:36
+msgid "skip unnecessary picks"
+msgstr ""
+
+#: builtin/rebase--helper.c:38
+msgid "rearrange fixup/squash lines"
+msgstr ""
+
+#: builtin/receive-pack.c:29
msgid "git receive-pack <git-dir>"
msgstr ""
-#: builtin/receive-pack.c:838
+#: builtin/receive-pack.c:839
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:858
+#: builtin/receive-pack.c:859
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:1933
+#: builtin/receive-pack.c:1932
msgid "quiet"
msgstr ""
-#: builtin/receive-pack.c:1947
+#: builtin/receive-pack.c:1946
msgid "You must specify a directory."
msgstr ""
msgid "specifying branches to track makes sense only with fetch mirrors"
msgstr ""
-#: builtin/remote.c:191 builtin/remote.c:630
+#: builtin/remote.c:191 builtin/remote.c:631
#, c-format
msgid "remote %s already exists."
msgstr ""
-#: builtin/remote.c:195 builtin/remote.c:634
+#: builtin/remote.c:195 builtin/remote.c:635
#, c-format
msgid "'%s' is not a valid remote name"
msgstr ""
msgid "(delete)"
msgstr ""
-#: builtin/remote.c:623 builtin/remote.c:758 builtin/remote.c:857
+#: builtin/remote.c:624 builtin/remote.c:759 builtin/remote.c:858
#, c-format
msgid "No such remote: %s"
msgstr ""
-#: builtin/remote.c:640
+#: builtin/remote.c:641
#, c-format
msgid "Could not rename config section '%s' to '%s'"
msgstr ""
-#: builtin/remote.c:660
+#: builtin/remote.c:661
#, c-format
msgid ""
"Not updating non-default fetch refspec\n"
"\tPlease update the configuration manually if necessary."
msgstr ""
-#: builtin/remote.c:696
+#: builtin/remote.c:697
#, c-format
msgid "deleting '%s' failed"
msgstr ""
-#: builtin/remote.c:730
+#: builtin/remote.c:731
#, c-format
msgid "creating '%s' failed"
msgstr ""
-#: builtin/remote.c:795
+#: builtin/remote.c:796
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
msgstr[0] ""
msgstr[1] ""
-#: builtin/remote.c:809
+#: builtin/remote.c:810
#, c-format
msgid "Could not remove config section '%s'"
msgstr ""
-#: builtin/remote.c:910
+#: builtin/remote.c:911
#, c-format
msgid " new (next fetch will store in remotes/%s)"
msgstr ""
-#: builtin/remote.c:913
+#: builtin/remote.c:914
msgid " tracked"
msgstr ""
-#: builtin/remote.c:915
+#: builtin/remote.c:916
msgid " stale (use 'git remote prune' to remove)"
msgstr ""
-#: builtin/remote.c:917
+#: builtin/remote.c:918
msgid " ???"
msgstr ""
-#: builtin/remote.c:958
+#: builtin/remote.c:959
#, c-format
msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
msgstr ""
-#: builtin/remote.c:966
+#: builtin/remote.c:967
#, c-format
msgid "rebases interactively onto remote %s"
msgstr ""
-#: builtin/remote.c:967
+#: builtin/remote.c:968
#, c-format
msgid "rebases onto remote %s"
msgstr ""
-#: builtin/remote.c:970
+#: builtin/remote.c:971
#, c-format
msgid " merges with remote %s"
msgstr ""
-#: builtin/remote.c:973
+#: builtin/remote.c:974
#, c-format
msgid "merges with remote %s"
msgstr ""
-#: builtin/remote.c:976
+#: builtin/remote.c:977
#, c-format
msgid "%-*s and with remote %s\n"
msgstr ""
-#: builtin/remote.c:1019
+#: builtin/remote.c:1020
msgid "create"
msgstr ""
-#: builtin/remote.c:1022
+#: builtin/remote.c:1023
msgid "delete"
msgstr ""
-#: builtin/remote.c:1026
+#: builtin/remote.c:1027
msgid "up to date"
msgstr ""
-#: builtin/remote.c:1029
+#: builtin/remote.c:1030
msgid "fast-forwardable"
msgstr ""
-#: builtin/remote.c:1032
+#: builtin/remote.c:1033
msgid "local out of date"
msgstr ""
-#: builtin/remote.c:1039
+#: builtin/remote.c:1040
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr ""
-#: builtin/remote.c:1042
+#: builtin/remote.c:1043
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr ""
-#: builtin/remote.c:1046
+#: builtin/remote.c:1047
#, c-format
msgid " %-*s forces to %s"
msgstr ""
-#: builtin/remote.c:1049
+#: builtin/remote.c:1050
#, c-format
msgid " %-*s pushes to %s"
msgstr ""
-#: builtin/remote.c:1117
+#: builtin/remote.c:1118
msgid "do not query remotes"
msgstr ""
-#: builtin/remote.c:1144
+#: builtin/remote.c:1145
#, c-format
msgid "* remote %s"
msgstr ""
-#: builtin/remote.c:1145
+#: builtin/remote.c:1146
#, c-format
msgid " Fetch URL: %s"
msgstr ""
-#: builtin/remote.c:1146 builtin/remote.c:1162 builtin/remote.c:1301
+#: builtin/remote.c:1147 builtin/remote.c:1163 builtin/remote.c:1302
msgid "(no URL)"
msgstr ""
#. with the one in " Fetch URL: %s"
#. translation.
#.
-#: builtin/remote.c:1160 builtin/remote.c:1162
+#: builtin/remote.c:1161 builtin/remote.c:1163
#, c-format
msgid " Push URL: %s"
msgstr ""
-#: builtin/remote.c:1164 builtin/remote.c:1166 builtin/remote.c:1168
+#: builtin/remote.c:1165 builtin/remote.c:1167 builtin/remote.c:1169
#, c-format
msgid " HEAD branch: %s"
msgstr ""
-#: builtin/remote.c:1164
+#: builtin/remote.c:1165
msgid "(not queried)"
msgstr ""
-#: builtin/remote.c:1166
+#: builtin/remote.c:1167
msgid "(unknown)"
msgstr ""
-#: builtin/remote.c:1170
+#: builtin/remote.c:1171
#, c-format
msgid ""
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
msgstr ""
-#: builtin/remote.c:1182
+#: builtin/remote.c:1183
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
msgstr[0] ""
msgstr[1] ""
-#: builtin/remote.c:1185 builtin/remote.c:1211
+#: builtin/remote.c:1186 builtin/remote.c:1212
msgid " (status not queried)"
msgstr ""
-#: builtin/remote.c:1194
+#: builtin/remote.c:1195
msgid " Local branch configured for 'git pull':"
msgid_plural " Local branches configured for 'git pull':"
msgstr[0] ""
msgstr[1] ""
-#: builtin/remote.c:1202
+#: builtin/remote.c:1203
msgid " Local refs will be mirrored by 'git push'"
msgstr ""
-#: builtin/remote.c:1208
+#: builtin/remote.c:1209
#, c-format
msgid " Local ref configured for 'git push'%s:"
msgid_plural " Local refs configured for 'git push'%s:"
msgstr[0] ""
msgstr[1] ""
-#: builtin/remote.c:1229
+#: builtin/remote.c:1230
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr ""
-#: builtin/remote.c:1231
+#: builtin/remote.c:1232
msgid "delete refs/remotes/<name>/HEAD"
msgstr ""
-#: builtin/remote.c:1246
+#: builtin/remote.c:1247
msgid "Cannot determine remote HEAD"
msgstr ""
-#: builtin/remote.c:1248
+#: builtin/remote.c:1249
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr ""
-#: builtin/remote.c:1258
+#: builtin/remote.c:1259
#, c-format
msgid "Could not delete %s"
msgstr ""
-#: builtin/remote.c:1266
+#: builtin/remote.c:1267
#, c-format
msgid "Not a valid ref: %s"
msgstr ""
-#: builtin/remote.c:1268
+#: builtin/remote.c:1269
#, c-format
msgid "Could not setup %s"
msgstr ""
-#: builtin/remote.c:1286
+#: builtin/remote.c:1287
#, c-format
msgid " %s will become dangling!"
msgstr ""
-#: builtin/remote.c:1287
+#: builtin/remote.c:1288
#, c-format
msgid " %s has become dangling!"
msgstr ""
-#: builtin/remote.c:1297
+#: builtin/remote.c:1298
#, c-format
msgid "Pruning %s"
msgstr ""
-#: builtin/remote.c:1298
+#: builtin/remote.c:1299
#, c-format
msgid "URL: %s"
msgstr ""
-#: builtin/remote.c:1314
+#: builtin/remote.c:1315
#, c-format
msgid " * [would prune] %s"
msgstr ""
-#: builtin/remote.c:1317
+#: builtin/remote.c:1318
#, c-format
msgid " * [pruned] %s"
msgstr ""
-#: builtin/remote.c:1362
+#: builtin/remote.c:1363
msgid "prune remotes after fetching"
msgstr ""
-#: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547
+#: builtin/remote.c:1426 builtin/remote.c:1480 builtin/remote.c:1548
#, c-format
msgid "No such remote '%s'"
msgstr ""
-#: builtin/remote.c:1441
+#: builtin/remote.c:1442
msgid "add branch"
msgstr ""
-#: builtin/remote.c:1448
+#: builtin/remote.c:1449
msgid "no remote specified"
msgstr ""
-#: builtin/remote.c:1465
+#: builtin/remote.c:1466
msgid "query push URLs rather than fetch URLs"
msgstr ""
-#: builtin/remote.c:1467
+#: builtin/remote.c:1468
msgid "return all URLs"
msgstr ""
-#: builtin/remote.c:1495
+#: builtin/remote.c:1496
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr ""
-#: builtin/remote.c:1521
+#: builtin/remote.c:1522
msgid "manipulate push URLs"
msgstr ""
-#: builtin/remote.c:1523
+#: builtin/remote.c:1524
msgid "add URL"
msgstr ""
-#: builtin/remote.c:1525
+#: builtin/remote.c:1526
msgid "delete URLs"
msgstr ""
-#: builtin/remote.c:1532
+#: builtin/remote.c:1533
msgid "--add --delete doesn't make sense"
msgstr ""
-#: builtin/remote.c:1573
+#: builtin/remote.c:1572
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr ""
-#: builtin/remote.c:1581
+#: builtin/remote.c:1580
#, c-format
msgid "No such URL found: %s"
msgstr ""
-#: builtin/remote.c:1583
+#: builtin/remote.c:1582
msgid "Will not delete all non-push URLs"
msgstr ""
-#: builtin/remote.c:1597
+#: builtin/remote.c:1598
msgid "be verbose; must be placed before a subcommand"
msgstr ""
-#: builtin/remote.c:1628
+#: builtin/remote.c:1629
#, c-format
msgid "Unknown subcommand: %s"
msgstr ""
msgid "--keep-unreachable and -A are incompatible"
msgstr ""
-#: builtin/repack.c:406 builtin/worktree.c:116
+#: builtin/repack.c:406 builtin/worktree.c:134
#, c-format
msgid "failed to remove '%s'"
msgstr ""
msgid "keep"
msgstr ""
-#: builtin/reset.c:77
+#: builtin/reset.c:78
msgid "You do not have a valid HEAD."
msgstr ""
-#: builtin/reset.c:79
+#: builtin/reset.c:80
msgid "Failed to find tree of HEAD."
msgstr ""
-#: builtin/reset.c:85
+#: builtin/reset.c:86
#, c-format
msgid "Failed to find tree of %s."
msgstr ""
-#: builtin/reset.c:103
+#: builtin/reset.c:113
#, c-format
msgid "HEAD is now at %s"
msgstr ""
-#: builtin/reset.c:186
+#: builtin/reset.c:197
#, c-format
msgid "Cannot do a %s reset in the middle of a merge."
msgstr ""
-#: builtin/reset.c:286
+#: builtin/reset.c:297
msgid "be quiet, only report errors"
msgstr ""
-#: builtin/reset.c:288
+#: builtin/reset.c:299
msgid "reset HEAD and index"
msgstr ""
-#: builtin/reset.c:289
+#: builtin/reset.c:300
msgid "reset only HEAD"
msgstr ""
-#: builtin/reset.c:291 builtin/reset.c:293
+#: builtin/reset.c:302 builtin/reset.c:304
msgid "reset HEAD, index and working tree"
msgstr ""
-#: builtin/reset.c:295
+#: builtin/reset.c:306
msgid "reset HEAD but keep local changes"
msgstr ""
-#: builtin/reset.c:301
+#: builtin/reset.c:312
msgid "record only the fact that removed paths will be added later"
msgstr ""
-#: builtin/reset.c:320
+#: builtin/reset.c:329
#, c-format
msgid "Failed to resolve '%s' as a valid revision."
msgstr ""
-#: builtin/reset.c:328
+#: builtin/reset.c:337
#, c-format
msgid "Failed to resolve '%s' as a valid tree."
msgstr ""
-#: builtin/reset.c:337
+#: builtin/reset.c:346
msgid "--patch is incompatible with --{hard,mixed,soft}"
msgstr ""
-#: builtin/reset.c:346
+#: builtin/reset.c:355
msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
msgstr ""
-#: builtin/reset.c:348
+#: builtin/reset.c:357
#, c-format
msgid "Cannot do %s reset with paths."
msgstr ""
-#: builtin/reset.c:358
+#: builtin/reset.c:367
#, c-format
msgid "%s reset is not allowed in a bare repository"
msgstr ""
-#: builtin/reset.c:362
+#: builtin/reset.c:371
msgid "-N can only be used with --mixed"
msgstr ""
-#: builtin/reset.c:379
+#: builtin/reset.c:388
msgid "Unstaged changes after reset:"
msgstr ""
-#: builtin/reset.c:385
+#: builtin/reset.c:394
#, c-format
msgid "Could not reset index file to revision '%s'."
msgstr ""
-#: builtin/reset.c:389
+#: builtin/reset.c:398
msgid "Could not write new index file."
msgstr ""
-#: builtin/rev-list.c:358
+#: builtin/rev-list.c:361
msgid "rev-list does not support display of notes"
msgstr ""
-#: builtin/rev-parse.c:394
+#: builtin/rev-parse.c:402
msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
msgstr ""
-#: builtin/rev-parse.c:399
+#: builtin/rev-parse.c:407
msgid "keep the `--` passed as an arg"
msgstr ""
-#: builtin/rev-parse.c:401
+#: builtin/rev-parse.c:409
msgid "stop parsing after the first non-option argument"
msgstr ""
-#: builtin/rev-parse.c:404
+#: builtin/rev-parse.c:412
msgid "output in stuck long form"
msgstr ""
-#: builtin/rev-parse.c:535
+#: builtin/rev-parse.c:545
msgid ""
"git rev-parse --parseopt [<options>] -- [<args>...]\n"
" or: git rev-parse --sq-quote [<arg>...]\n"
msgid "keep redundant, empty commits"
msgstr ""
-#: builtin/revert.c:212
+#: builtin/revert.c:214
msgid "revert failed"
msgstr ""
-#: builtin/revert.c:225
+#: builtin/revert.c:227
msgid "cherry-pick failed"
msgstr ""
msgid "exit with a zero status even if nothing matched"
msgstr ""
-#: builtin/rm.c:308
+#: builtin/rm.c:307
#, c-format
msgid "not removing '%s' recursively without -r"
msgstr ""
-#: builtin/rm.c:347
+#: builtin/rm.c:346
#, c-format
msgid "git rm: unable to remove %s"
msgstr ""
-#: builtin/rm.c:370
+#: builtin/rm.c:369
#, c-format
msgid "could not remove '%s'"
msgstr ""
msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
msgstr ""
-#: builtin/shortlog.c:249
+#: builtin/shortlog.c:263
msgid "Group by committer rather than author"
msgstr ""
-#: builtin/shortlog.c:251
+#: builtin/shortlog.c:265
msgid "sort output according to the number of commits per author"
msgstr ""
-#: builtin/shortlog.c:253
+#: builtin/shortlog.c:267
msgid "Suppress commit descriptions, only provides commit count"
msgstr ""
-#: builtin/shortlog.c:255
+#: builtin/shortlog.c:269
msgid "Show the email address of each author"
msgstr ""
-#: builtin/shortlog.c:256
+#: builtin/shortlog.c:270
msgid "w[,i1[,i2]]"
msgstr ""
-#: builtin/shortlog.c:257
+#: builtin/shortlog.c:271
msgid "Linewrap output"
msgstr ""
msgid "prepend comment character and space to each line"
msgstr ""
-#: builtin/submodule--helper.c:25 builtin/submodule--helper.c:1075
+#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1094
#, c-format
msgid "No such ref: %s"
msgstr ""
-#: builtin/submodule--helper.c:32 builtin/submodule--helper.c:1084
+#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1103
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr ""
-#: builtin/submodule--helper.c:72
+#: builtin/submodule--helper.c:71
#, c-format
msgid "cannot strip one component off url '%s'"
msgstr ""
-#: builtin/submodule--helper.c:305 builtin/submodule--helper.c:630
+#: builtin/submodule--helper.c:302 builtin/submodule--helper.c:623
msgid "alternative anchor for relative paths"
msgstr ""
-#: builtin/submodule--helper.c:310
+#: builtin/submodule--helper.c:307
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr ""
-#: builtin/submodule--helper.c:356 builtin/submodule--helper.c:380
+#: builtin/submodule--helper.c:350 builtin/submodule--helper.c:374
#, c-format
msgid "No url found for submodule path '%s' in .gitmodules"
msgstr ""
-#: builtin/submodule--helper.c:395
+#: builtin/submodule--helper.c:389
#, c-format
msgid ""
"could not lookup configuration '%s'. Assuming this repository is its own "
"authoritative upstream."
msgstr ""
-#: builtin/submodule--helper.c:406
+#: builtin/submodule--helper.c:400
#, c-format
msgid "Failed to register url for submodule path '%s'"
msgstr ""
-#: builtin/submodule--helper.c:410
+#: builtin/submodule--helper.c:404
#, c-format
msgid "Submodule '%s' (%s) registered for path '%s'\n"
msgstr ""
-#: builtin/submodule--helper.c:420
+#: builtin/submodule--helper.c:414
#, c-format
msgid "warning: command update mode suggested for submodule '%s'\n"
msgstr ""
-#: builtin/submodule--helper.c:427
+#: builtin/submodule--helper.c:421
#, c-format
msgid "Failed to register update mode for submodule path '%s'"
msgstr ""
-#: builtin/submodule--helper.c:443
+#: builtin/submodule--helper.c:437
msgid "Suppress output for initializing a submodule"
msgstr ""
-#: builtin/submodule--helper.c:448
+#: builtin/submodule--helper.c:442
msgid "git submodule--helper init [<path>]"
msgstr ""
-#: builtin/submodule--helper.c:476
+#: builtin/submodule--helper.c:470
msgid "git submodule--helper name <path>"
msgstr ""
-#: builtin/submodule--helper.c:482
+#: builtin/submodule--helper.c:475
#, c-format
msgid "no submodule mapping found in .gitmodules for path '%s'"
msgstr ""
-#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:568
+#: builtin/submodule--helper.c:558 builtin/submodule--helper.c:561
#, c-format
msgid "submodule '%s' cannot add alternate: %s"
msgstr ""
-#: builtin/submodule--helper.c:604
+#: builtin/submodule--helper.c:597
#, c-format
msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
msgstr ""
-#: builtin/submodule--helper.c:611
+#: builtin/submodule--helper.c:604
#, c-format
msgid "Value '%s' for submodule.alternateLocation is not recognized"
msgstr ""
-#: builtin/submodule--helper.c:633
+#: builtin/submodule--helper.c:626
msgid "where the new submodule will be cloned to"
msgstr ""
-#: builtin/submodule--helper.c:636
+#: builtin/submodule--helper.c:629
msgid "name of the new submodule"
msgstr ""
-#: builtin/submodule--helper.c:639
+#: builtin/submodule--helper.c:632
msgid "url where to clone the submodule from"
msgstr ""
-#: builtin/submodule--helper.c:645
+#: builtin/submodule--helper.c:638
msgid "depth for shallow clones"
msgstr ""
-#: builtin/submodule--helper.c:648 builtin/submodule--helper.c:993
+#: builtin/submodule--helper.c:641 builtin/submodule--helper.c:1012
msgid "force cloning progress"
msgstr ""
-#: builtin/submodule--helper.c:653
+#: builtin/submodule--helper.c:646
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
msgstr ""
-#: builtin/submodule--helper.c:684
+#: builtin/submodule--helper.c:677
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr ""
-#: builtin/submodule--helper.c:699
+#: builtin/submodule--helper.c:692
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr ""
-#: builtin/submodule--helper.c:764
+#: builtin/submodule--helper.c:757
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr ""
-#: builtin/submodule--helper.c:768
+#: builtin/submodule--helper.c:761
msgid "Maybe you want to use 'update --init'?"
msgstr ""
-#: builtin/submodule--helper.c:793
+#: builtin/submodule--helper.c:790
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr ""
-#: builtin/submodule--helper.c:814
+#: builtin/submodule--helper.c:819
#, c-format
msgid "Skipping submodule '%s'"
msgstr ""
-#: builtin/submodule--helper.c:942
+#: builtin/submodule--helper.c:952
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr ""
-#: builtin/submodule--helper.c:953
+#: builtin/submodule--helper.c:963
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
msgstr ""
-#: builtin/submodule--helper.c:974 builtin/submodule--helper.c:1162
+#: builtin/submodule--helper.c:993 builtin/submodule--helper.c:1213
msgid "path into the working tree"
msgstr ""
-#: builtin/submodule--helper.c:977
+#: builtin/submodule--helper.c:996
msgid "path into the working tree, across nested submodule boundaries"
msgstr ""
-#: builtin/submodule--helper.c:981
+#: builtin/submodule--helper.c:1000
msgid "rebase, merge, checkout or none"
msgstr ""
-#: builtin/submodule--helper.c:985
+#: builtin/submodule--helper.c:1004
msgid "Create a shallow clone truncated to the specified number of revisions"
msgstr ""
-#: builtin/submodule--helper.c:988
+#: builtin/submodule--helper.c:1007
msgid "parallel jobs"
msgstr ""
-#: builtin/submodule--helper.c:990
+#: builtin/submodule--helper.c:1009
msgid "whether the initial clone should follow the shallow recommendation"
msgstr ""
-#: builtin/submodule--helper.c:991
+#: builtin/submodule--helper.c:1010
msgid "don't print cloning progress"
msgstr ""
-#: builtin/submodule--helper.c:998
+#: builtin/submodule--helper.c:1017
msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
msgstr ""
-#: builtin/submodule--helper.c:1008
+#: builtin/submodule--helper.c:1030
msgid "bad value for update parameter"
msgstr ""
-#: builtin/submodule--helper.c:1079
+#: builtin/submodule--helper.c:1098
#, c-format
msgid ""
"Submodule (%s) branch configured to inherit branch from superproject, but "
"the superproject is not on any branch"
msgstr ""
-#: builtin/submodule--helper.c:1163
+#: builtin/submodule--helper.c:1214
msgid "recurse into submodules"
msgstr ""
-#: builtin/submodule--helper.c:1169
+#: builtin/submodule--helper.c:1220
msgid "git submodule--helper embed-git-dir [<path>...]"
msgstr ""
-#: builtin/submodule--helper.c:1232
+#: builtin/submodule--helper.c:1278
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr ""
-#: builtin/submodule--helper.c:1238
+#: builtin/submodule--helper.c:1284
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr ""
msgid "git symbolic-ref -d [-q] <name>"
msgstr ""
-#: builtin/symbolic-ref.c:41
+#: builtin/symbolic-ref.c:40
msgid "suppress error message for non-symbolic (detached) refs"
msgstr ""
-#: builtin/symbolic-ref.c:42
+#: builtin/symbolic-ref.c:41
msgid "delete symbolic ref"
msgstr ""
-#: builtin/symbolic-ref.c:43
+#: builtin/symbolic-ref.c:42
msgid "shorten ref output"
msgstr ""
-#: builtin/symbolic-ref.c:44 builtin/update-ref.c:363
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
msgid "reason"
msgstr ""
-#: builtin/symbolic-ref.c:44 builtin/update-ref.c:363
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
msgid "reason of the update"
msgstr ""
msgid "git tag -v [--format=<format>] <tagname>..."
msgstr ""
-#: builtin/tag.c:84
+#: builtin/tag.c:86
#, c-format
msgid "tag '%s' not found."
msgstr ""
-#: builtin/tag.c:100
+#: builtin/tag.c:102
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr ""
-#: builtin/tag.c:129
+#: builtin/tag.c:131
#, c-format
msgid ""
"\n"
"Lines starting with '%c' will be ignored.\n"
msgstr ""
-#: builtin/tag.c:133
+#: builtin/tag.c:135
#, c-format
msgid ""
"\n"
"want to.\n"
msgstr ""
-#: builtin/tag.c:211
+#: builtin/tag.c:189
msgid "unable to sign the tag"
msgstr ""
-#: builtin/tag.c:213
+#: builtin/tag.c:191
msgid "unable to write tag file"
msgstr ""
-#: builtin/tag.c:237
+#: builtin/tag.c:215
msgid "bad object type."
msgstr ""
-#: builtin/tag.c:283
+#: builtin/tag.c:261
msgid "no tag message?"
msgstr ""
-#: builtin/tag.c:290
+#: builtin/tag.c:268
#, c-format
msgid "The tag message has been left in %s\n"
msgstr ""
-#: builtin/tag.c:398
+#: builtin/tag.c:376
msgid "list tag names"
msgstr ""
-#: builtin/tag.c:400
+#: builtin/tag.c:378
msgid "print <n> lines of each tag message"
msgstr ""
-#: builtin/tag.c:402
+#: builtin/tag.c:380
msgid "delete tags"
msgstr ""
-#: builtin/tag.c:403
+#: builtin/tag.c:381
msgid "verify tags"
msgstr ""
-#: builtin/tag.c:405
+#: builtin/tag.c:383
msgid "Tag creation options"
msgstr ""
-#: builtin/tag.c:407
+#: builtin/tag.c:385
msgid "annotated tag, needs a message"
msgstr ""
-#: builtin/tag.c:409
+#: builtin/tag.c:387
msgid "tag message"
msgstr ""
-#: builtin/tag.c:411
+#: builtin/tag.c:389
msgid "annotated and GPG-signed tag"
msgstr ""
-#: builtin/tag.c:415
+#: builtin/tag.c:393
msgid "use another key to sign the tag"
msgstr ""
-#: builtin/tag.c:416
+#: builtin/tag.c:394
msgid "replace the tag if exists"
msgstr ""
-#: builtin/tag.c:417 builtin/update-ref.c:369
+#: builtin/tag.c:395 builtin/update-ref.c:368
msgid "create a reflog"
msgstr ""
-#: builtin/tag.c:419
+#: builtin/tag.c:397
msgid "Tag listing options"
msgstr ""
-#: builtin/tag.c:420
+#: builtin/tag.c:398
msgid "show tag list in columns"
msgstr ""
-#: builtin/tag.c:421 builtin/tag.c:423
+#: builtin/tag.c:399 builtin/tag.c:401
msgid "print only tags that contain the commit"
msgstr ""
-#: builtin/tag.c:422 builtin/tag.c:424
+#: builtin/tag.c:400 builtin/tag.c:402
msgid "print only tags that don't contain the commit"
msgstr ""
-#: builtin/tag.c:425
+#: builtin/tag.c:403
msgid "print only tags that are merged"
msgstr ""
-#: builtin/tag.c:426
+#: builtin/tag.c:404
msgid "print only tags that are not merged"
msgstr ""
-#: builtin/tag.c:431
+#: builtin/tag.c:409
msgid "print only tags of the object"
msgstr ""
-#: builtin/tag.c:470
+#: builtin/tag.c:453
msgid "--column and -n are incompatible"
msgstr ""
-#: builtin/tag.c:492
+#: builtin/tag.c:475
msgid "-n option is only allowed in list mode"
msgstr ""
-#: builtin/tag.c:494
+#: builtin/tag.c:477
msgid "--contains option is only allowed in list mode"
msgstr ""
-#: builtin/tag.c:496
+#: builtin/tag.c:479
msgid "--no-contains option is only allowed in list mode"
msgstr ""
-#: builtin/tag.c:498
+#: builtin/tag.c:481
msgid "--points-at option is only allowed in list mode"
msgstr ""
-#: builtin/tag.c:500
+#: builtin/tag.c:483
msgid "--merged and --no-merged options are only allowed in list mode"
msgstr ""
-#: builtin/tag.c:511
+#: builtin/tag.c:494
msgid "only one -F or -m option is allowed."
msgstr ""
-#: builtin/tag.c:530
+#: builtin/tag.c:513
msgid "too many params"
msgstr ""
-#: builtin/tag.c:536
+#: builtin/tag.c:519
#, c-format
msgid "'%s' is not a valid tag name."
msgstr ""
-#: builtin/tag.c:541
+#: builtin/tag.c:524
#, c-format
msgid "tag '%s' already exists"
msgstr ""
-#: builtin/tag.c:571
+#: builtin/tag.c:554
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr ""
msgid " OK"
msgstr ""
-#: builtin/update-index.c:569
+#: builtin/update-index.c:571
msgid "git update-index [<options>] [--] [<file>...]"
msgstr ""
-#: builtin/update-index.c:924
+#: builtin/update-index.c:926
msgid "continue refresh even when index needs update"
msgstr ""
-#: builtin/update-index.c:927
+#: builtin/update-index.c:929
msgid "refresh: ignore submodules"
msgstr ""
-#: builtin/update-index.c:930
+#: builtin/update-index.c:932
msgid "do not ignore new files"
msgstr ""
-#: builtin/update-index.c:932
+#: builtin/update-index.c:934
msgid "let files replace directories and vice-versa"
msgstr ""
-#: builtin/update-index.c:934
+#: builtin/update-index.c:936
msgid "notice files missing from worktree"
msgstr ""
-#: builtin/update-index.c:936
+#: builtin/update-index.c:938
msgid "refresh even if index contains unmerged entries"
msgstr ""
-#: builtin/update-index.c:939
+#: builtin/update-index.c:941
msgid "refresh stat information"
msgstr ""
-#: builtin/update-index.c:943
+#: builtin/update-index.c:945
msgid "like --refresh, but ignore assume-unchanged setting"
msgstr ""
-#: builtin/update-index.c:947
+#: builtin/update-index.c:949
msgid "<mode>,<object>,<path>"
msgstr ""
-#: builtin/update-index.c:948
+#: builtin/update-index.c:950
msgid "add the specified entry to the index"
msgstr ""
-#: builtin/update-index.c:957
+#: builtin/update-index.c:959
msgid "mark files as \"not changing\""
msgstr ""
-#: builtin/update-index.c:960
+#: builtin/update-index.c:962
msgid "clear assumed-unchanged bit"
msgstr ""
-#: builtin/update-index.c:963
+#: builtin/update-index.c:965
msgid "mark files as \"index-only\""
msgstr ""
-#: builtin/update-index.c:966
+#: builtin/update-index.c:968
msgid "clear skip-worktree bit"
msgstr ""
-#: builtin/update-index.c:969
+#: builtin/update-index.c:971
msgid "add to index only; do not add content to object database"
msgstr ""
-#: builtin/update-index.c:971
+#: builtin/update-index.c:973
msgid "remove named paths even if present in worktree"
msgstr ""
-#: builtin/update-index.c:973
+#: builtin/update-index.c:975
msgid "with --stdin: input lines are terminated by null bytes"
msgstr ""
-#: builtin/update-index.c:975
+#: builtin/update-index.c:977
msgid "read list of paths to be updated from standard input"
msgstr ""
-#: builtin/update-index.c:979
+#: builtin/update-index.c:981
msgid "add entries from standard input to the index"
msgstr ""
-#: builtin/update-index.c:983
+#: builtin/update-index.c:985
msgid "repopulate stages #2 and #3 for the listed paths"
msgstr ""
-#: builtin/update-index.c:987
+#: builtin/update-index.c:989
msgid "only update entries that differ from HEAD"
msgstr ""
-#: builtin/update-index.c:991
+#: builtin/update-index.c:993
msgid "ignore files missing from worktree"
msgstr ""
-#: builtin/update-index.c:994
+#: builtin/update-index.c:996
msgid "report actions to standard output"
msgstr ""
-#: builtin/update-index.c:996
+#: builtin/update-index.c:998
msgid "(for porcelains) forget saved unresolved conflicts"
msgstr ""
-#: builtin/update-index.c:1000
+#: builtin/update-index.c:1002
msgid "write index in this format"
msgstr ""
-#: builtin/update-index.c:1002
+#: builtin/update-index.c:1004
msgid "enable or disable split index"
msgstr ""
-#: builtin/update-index.c:1004
+#: builtin/update-index.c:1006
msgid "enable/disable untracked cache"
msgstr ""
-#: builtin/update-index.c:1006
+#: builtin/update-index.c:1008
msgid "test if the filesystem supports untracked cache"
msgstr ""
-#: builtin/update-index.c:1008
+#: builtin/update-index.c:1010
msgid "enable untracked cache without testing the filesystem"
msgstr ""
-#: builtin/update-index.c:1108
+#: builtin/update-index.c:1107
msgid ""
"core.splitIndex is set to false; remove or change it, if you really want to "
"enable split index"
msgstr ""
-#: builtin/update-index.c:1117
+#: builtin/update-index.c:1116
msgid ""
"core.splitIndex is set to true; remove or change it, if you really want to "
"disable split index"
msgstr ""
-#: builtin/update-index.c:1128
+#: builtin/update-index.c:1127
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:1132
+#: builtin/update-index.c:1131
msgid "Untracked cache disabled"
msgstr ""
-#: builtin/update-index.c:1140
+#: builtin/update-index.c:1139
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:1144
+#: builtin/update-index.c:1143
#, c-format
msgid "Untracked cache enabled for '%s'"
msgstr ""
msgid "git update-ref [<options>] --stdin [-z]"
msgstr ""
-#: builtin/update-ref.c:364
+#: builtin/update-ref.c:363
msgid "delete the reference"
msgstr ""
-#: builtin/update-ref.c:366
+#: builtin/update-ref.c:365
msgid "update <refname> not the one it points to"
msgstr ""
-#: builtin/update-ref.c:367
+#: builtin/update-ref.c:366
msgid "stdin has NUL-terminated arguments"
msgstr ""
-#: builtin/update-ref.c:368
+#: builtin/update-ref.c:367
msgid "read updates from stdin"
msgstr ""
msgid "git worktree unlock <path>"
msgstr ""
-#: builtin/worktree.c:44
+#: builtin/worktree.c:46
#, c-format
msgid "Removing worktrees/%s: not a valid directory"
msgstr ""
-#: builtin/worktree.c:50
+#: builtin/worktree.c:52
#, c-format
msgid "Removing worktrees/%s: gitdir file does not exist"
msgstr ""
-#: builtin/worktree.c:55
+#: builtin/worktree.c:57 builtin/worktree.c:66
#, c-format
msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
msgstr ""
-#: builtin/worktree.c:66
+#: builtin/worktree.c:76
+#, c-format
+msgid ""
+"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
+"%<PRIuMAX>)"
+msgstr ""
+
+#: builtin/worktree.c:84
#, c-format
msgid "Removing worktrees/%s: invalid gitdir file"
msgstr ""
-#: builtin/worktree.c:82
+#: builtin/worktree.c:100
#, c-format
msgid "Removing worktrees/%s: gitdir file points to non-existent location"
msgstr ""
-#: builtin/worktree.c:129
+#: builtin/worktree.c:147
msgid "report pruned working trees"
msgstr ""
-#: builtin/worktree.c:131
+#: builtin/worktree.c:149
msgid "expire working trees older than <time>"
msgstr ""
-#: builtin/worktree.c:205
+#: builtin/worktree.c:223
#, c-format
msgid "'%s' already exists"
msgstr ""
-#: builtin/worktree.c:236
+#: builtin/worktree.c:254
#, c-format
msgid "could not create directory of '%s'"
msgstr ""
-#: builtin/worktree.c:275
+#: builtin/worktree.c:293
#, c-format
msgid "Preparing %s (identifier %s)"
msgstr ""
-#: builtin/worktree.c:327
+#: builtin/worktree.c:345
msgid "checkout <branch> even if already checked out in other worktree"
msgstr ""
-#: builtin/worktree.c:329
+#: builtin/worktree.c:347
msgid "create a new branch"
msgstr ""
-#: builtin/worktree.c:331
+#: builtin/worktree.c:349
msgid "create or reset a branch"
msgstr ""
-#: builtin/worktree.c:333
+#: builtin/worktree.c:351
msgid "populate the new working tree"
msgstr ""
-#: builtin/worktree.c:334
+#: builtin/worktree.c:352
msgid "keep the new working tree locked"
msgstr ""
-#: builtin/worktree.c:342
+#: builtin/worktree.c:360
msgid "-b, -B, and --detach are mutually exclusive"
msgstr ""
-#: builtin/worktree.c:479
+#: builtin/worktree.c:499
msgid "reason for locking"
msgstr ""
-#: builtin/worktree.c:491 builtin/worktree.c:524
+#: builtin/worktree.c:511 builtin/worktree.c:544
#, c-format
msgid "'%s' is not a working tree"
msgstr ""
-#: builtin/worktree.c:493 builtin/worktree.c:526
+#: builtin/worktree.c:513 builtin/worktree.c:546
msgid "The main working tree cannot be locked or unlocked"
msgstr ""
-#: builtin/worktree.c:498
+#: builtin/worktree.c:518
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr ""
-#: builtin/worktree.c:500
+#: builtin/worktree.c:520
#, c-format
msgid "'%s' is already locked"
msgstr ""
-#: builtin/worktree.c:528
+#: builtin/worktree.c:548
#, c-format
msgid "'%s' is not locked"
msgstr ""
msgid "git upload-pack [<options>] <dir>"
msgstr ""
-#: upload-pack.c:1041
+#: upload-pack.c:1040
msgid "quit after a single request/response exchange"
msgstr ""
-#: upload-pack.c:1043
+#: upload-pack.c:1042
msgid "exit immediately after initial ref advertisement"
msgstr ""
-#: upload-pack.c:1045
+#: upload-pack.c:1044
msgid "do not try <directory>/.git/ if <directory> is no Git directory"
msgstr ""
-#: upload-pack.c:1047
+#: upload-pack.c:1046
msgid "interrupt transfer after <n> seconds of inactivity"
msgstr ""
-#: credential-cache--daemon.c:224
+#: credential-cache--daemon.c:222
#, c-format
msgid ""
"The permissions on your socket directory are too loose; other\n"
"\tchmod 0700 %s"
msgstr ""
-#: credential-cache--daemon.c:272
+#: credential-cache--daemon.c:271
msgid "print debugging messages to stderr"
msgstr ""
"to read about a specific subcommand or concept."
msgstr ""
-#: http.c:337
+#: http.c:338
#, c-format
msgid "negative value for http.postbuffer; defaulting to %d"
msgstr ""
-#: http.c:358
+#: http.c:359
msgid "Delegation control is not supported with cURL < 7.22.0"
msgstr ""
-#: http.c:367
+#: http.c:368
msgid "Public key pinning not supported with cURL < 7.44.0"
msgstr ""
-#: http.c:1764
+#: http.c:1768
#, c-format
msgid ""
"unable to update url base from redirection:\n"
#: git-merge-octopus.sh:77
#, sh-format
-msgid "Already up-to-date with $pretty_name"
+msgid "Already up to date with $pretty_name"
msgstr ""
#: git-merge-octopus.sh:89
#: git-rebase.sh:58
msgid ""
-"When you have resolved this problem, run \"git rebase --continue\".\n"
-"If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
-"To check out the original branch and stop rebasing, run \"git rebase --abort"
-"\"."
+"Resolve all conflicts manually, mark them as resolved with\n"
+"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
+"You can instead skip this commit: run \"git rebase --skip\".\n"
+"To abort and get back to the state before \"git rebase\", run \"git rebase --"
+"abort\"."
msgstr ""
-#: git-rebase.sh:158 git-rebase.sh:397
+#: git-rebase.sh:160 git-rebase.sh:402
#, sh-format
msgid "Could not move back to $head_name"
msgstr ""
-#: git-rebase.sh:169
+#: git-rebase.sh:171
msgid "Applied autostash."
msgstr ""
-#: git-rebase.sh:172
+#: git-rebase.sh:174
#, sh-format
msgid "Cannot store $stash_sha1"
msgstr ""
-#: git-rebase.sh:212
+#: git-rebase.sh:214
msgid "The pre-rebase hook refused to rebase."
msgstr ""
-#: git-rebase.sh:217
+#: git-rebase.sh:219
msgid "It looks like git-am is in progress. Cannot rebase."
msgstr ""
-#: git-rebase.sh:358
+#: git-rebase.sh:363
msgid "No rebase in progress?"
msgstr ""
-#: git-rebase.sh:369
+#: git-rebase.sh:374
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr ""
-#: git-rebase.sh:376
+#: git-rebase.sh:381
msgid "Cannot read HEAD"
msgstr ""
-#: git-rebase.sh:379
+#: git-rebase.sh:384
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
msgstr ""
-#: git-rebase.sh:419
+#: git-rebase.sh:424
#, sh-format
msgid ""
"It seems that there is already a $state_dir_base directory, and\n"
"valuable there."
msgstr ""
-#: git-rebase.sh:470
+#: git-rebase.sh:480
#, sh-format
msgid "invalid upstream $upstream_name"
msgstr ""
-#: git-rebase.sh:494
+#: git-rebase.sh:504
#, sh-format
msgid "$onto_name: there are more than one merge bases"
msgstr ""
-#: git-rebase.sh:497 git-rebase.sh:501
+#: git-rebase.sh:507 git-rebase.sh:511
#, sh-format
msgid "$onto_name: there is no merge base"
msgstr ""
-#: git-rebase.sh:506
+#: git-rebase.sh:516
#, sh-format
msgid "Does not point to a valid commit: $onto_name"
msgstr ""
-#: git-rebase.sh:529
+#: git-rebase.sh:539
#, sh-format
msgid "fatal: no such branch: $branch_name"
msgstr ""
-#: git-rebase.sh:562
+#: git-rebase.sh:572
msgid "Cannot autostash"
msgstr ""
-#: git-rebase.sh:567
+#: git-rebase.sh:577
#, sh-format
msgid "Created autostash: $stash_abbrev"
msgstr ""
-#: git-rebase.sh:571
+#: git-rebase.sh:581
msgid "Please commit or stash them."
msgstr ""
-#: git-rebase.sh:591
+#: git-rebase.sh:601
#, sh-format
msgid "Current branch $branch_name is up to date."
msgstr ""
-#: git-rebase.sh:595
+#: git-rebase.sh:605
#, sh-format
msgid "Current branch $branch_name is up to date, rebase forced."
msgstr ""
-#: git-rebase.sh:606
+#: git-rebase.sh:616
#, sh-format
msgid "Changes from $mb to $onto:"
msgstr ""
-#: git-rebase.sh:615
+#: git-rebase.sh:625
msgid "First, rewinding head to replay your work on top of it..."
msgstr ""
-#: git-rebase.sh:625
+#: git-rebase.sh:635
#, sh-format
msgid "Fast-forwarded $branch_name to $onto_name."
msgstr ""
-#: git-stash.sh:54
+#: git-stash.sh:61
msgid "git stash clear with parameters is unimplemented"
msgstr ""
-#: git-stash.sh:95
+#: git-stash.sh:102
msgid "You do not have the initial commit yet"
msgstr ""
-#: git-stash.sh:110
+#: git-stash.sh:117
msgid "Cannot save the current index state"
msgstr ""
-#: git-stash.sh:125
+#: git-stash.sh:132
msgid "Cannot save the untracked files"
msgstr ""
-#: git-stash.sh:145 git-stash.sh:158
+#: git-stash.sh:152 git-stash.sh:165
msgid "Cannot save the current worktree state"
msgstr ""
-#: git-stash.sh:162
+#: git-stash.sh:169
msgid "No changes selected"
msgstr ""
-#: git-stash.sh:165
+#: git-stash.sh:172
msgid "Cannot remove temporary index (can't happen)"
msgstr ""
-#: git-stash.sh:178
+#: git-stash.sh:185
msgid "Cannot record working tree state"
msgstr ""
-#: git-stash.sh:210
+#: git-stash.sh:217
#, sh-format
msgid "Cannot update $ref_stash with $w_commit"
msgstr ""
#. $ git stash save --blah-blah 2>&1 | head -n 2
#. error: unknown option for 'stash save': --blah-blah
#. To provide a message, use git stash save -- '--blah-blah'
-#: git-stash.sh:266
+#: git-stash.sh:273
#, sh-format
msgid ""
"error: unknown option for 'stash save': $option\n"
" To provide a message, use git stash save -- '$option'"
msgstr ""
-#: git-stash.sh:281
+#: git-stash.sh:288
msgid "Can't use --patch and --include-untracked or --all at the same time"
msgstr ""
-#: git-stash.sh:289
+#: git-stash.sh:296
msgid "No local changes to save"
msgstr ""
-#: git-stash.sh:294
+#: git-stash.sh:301
msgid "Cannot initialize stash"
msgstr ""
-#: git-stash.sh:298
+#: git-stash.sh:305
msgid "Cannot save the current status"
msgstr ""
-#: git-stash.sh:299
+#: git-stash.sh:306
#, sh-format
msgid "Saved working directory and index state $stash_msg"
msgstr ""
-#: git-stash.sh:326
+#: git-stash.sh:334
msgid "Cannot remove worktree changes"
msgstr ""
-#: git-stash.sh:474
+#: git-stash.sh:482
#, sh-format
msgid "unknown option: $opt"
msgstr ""
-#: git-stash.sh:487
+#: git-stash.sh:495
msgid "No stash entries found."
msgstr ""
-#: git-stash.sh:494
+#: git-stash.sh:502
#, sh-format
msgid "Too many revisions specified: $REV"
msgstr ""
-#: git-stash.sh:509
+#: git-stash.sh:517
#, sh-format
msgid "$reference is not a valid reference"
msgstr ""
-#: git-stash.sh:537
+#: git-stash.sh:545
#, sh-format
msgid "'$args' is not a stash-like commit"
msgstr ""
-#: git-stash.sh:548
+#: git-stash.sh:556
#, sh-format
msgid "'$args' is not a stash reference"
msgstr ""
-#: git-stash.sh:556
+#: git-stash.sh:564
msgid "unable to refresh index"
msgstr ""
-#: git-stash.sh:560
+#: git-stash.sh:568
msgid "Cannot apply a stash in the middle of a merge"
msgstr ""
-#: git-stash.sh:568
+#: git-stash.sh:576
msgid "Conflicts in index. Try without --index."
msgstr ""
-#: git-stash.sh:570
+#: git-stash.sh:578
msgid "Could not save index tree"
msgstr ""
-#: git-stash.sh:579
+#: git-stash.sh:587
msgid "Could not restore untracked files from stash entry"
msgstr ""
-#: git-stash.sh:604
+#: git-stash.sh:612
msgid "Cannot unstage modified files"
msgstr ""
-#: git-stash.sh:619
+#: git-stash.sh:627
msgid "Index was not unstashed."
msgstr ""
-#: git-stash.sh:633
+#: git-stash.sh:641
msgid "The stash entry is kept in case you need it again."
msgstr ""
-#: git-stash.sh:642
+#: git-stash.sh:650
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr ""
-#: git-stash.sh:643
+#: git-stash.sh:651
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr ""
-#: git-stash.sh:651
+#: git-stash.sh:659
msgid "No branch name specified"
msgstr ""
-#: git-stash.sh:730
+#: git-stash.sh:738
msgid "(To restore them type \"git stash apply\")"
msgstr ""
msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
msgstr ""
-#: git-submodule.sh:638
+#: git-submodule.sh:637
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:648
+#: git-submodule.sh:647
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr ""
-#: git-submodule.sh:653
+#: git-submodule.sh:652
#, sh-format
msgid ""
"Unable to find current ${remote_name}/${branch} revision in submodule path "
"'$sm_path'"
msgstr ""
-#: git-submodule.sh:671
+#: git-submodule.sh:670
#, sh-format
msgid "Unable to fetch in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:677
+#: git-submodule.sh:676
#, sh-format
msgid ""
"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
"Direct fetching of that commit failed."
msgstr ""
-#: git-submodule.sh:684
+#: git-submodule.sh:683
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:685
+#: git-submodule.sh:684
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr ""
-#: git-submodule.sh:689
+#: git-submodule.sh:688
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:690
+#: git-submodule.sh:689
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr ""
-#: git-submodule.sh:695
+#: git-submodule.sh:694
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:696
+#: git-submodule.sh:695
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr ""
-#: git-submodule.sh:701
+#: git-submodule.sh:700
#, sh-format
msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:702
+#: git-submodule.sh:701
#, sh-format
msgid "Submodule path '$displaypath': '$command $sha1'"
msgstr ""
-#: git-submodule.sh:733
+#: git-submodule.sh:732
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:841
+#: git-submodule.sh:840
msgid "The --cached option cannot be used with the --files option"
msgstr ""
-#: git-submodule.sh:893
+#: git-submodule.sh:892
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr ""
-#: git-submodule.sh:913
+#: git-submodule.sh:912
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr ""
-#: git-submodule.sh:916
+#: git-submodule.sh:915
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr ""
-#: git-submodule.sh:919
+#: git-submodule.sh:918
#, sh-format
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
msgstr ""
-#: git-submodule.sh:1065
+#: git-submodule.sh:1064
#, sh-format
msgid "Failed to recurse into submodule path '$sm_path'"
msgstr ""
-#: git-submodule.sh:1137
+#: git-submodule.sh:1136
#, sh-format
msgid "Synchronizing submodule url for '$displaypath'"
msgstr ""
msgid ""
"\n"
"Commands:\n"
-" p, pick = use commit\n"
-" r, reword = use commit, but edit the commit message\n"
-" e, edit = use commit, but stop for amending\n"
-" s, squash = use commit, but meld into previous commit\n"
-" f, fixup = like \"squash\", but discard this commit's log message\n"
-" x, exec = run command (the rest of the line) using shell\n"
-" d, drop = remove commit\n"
+"p, pick = use commit\n"
+"r, reword = use commit, but edit the commit message\n"
+"e, edit = use commit, but stop for amending\n"
+"s, squash = use commit, but meld into previous commit\n"
+"f, fixup = like \"squash\", but discard this commit's log message\n"
+"x, exec = run command (the rest of the line) using shell\n"
+"d, drop = remove commit\n"
"\n"
"These lines can be re-ordered; they are executed from top to bottom.\n"
msgstr ""
msgid "Refusing to squash a merge: $sha1"
msgstr ""
-#: git-rebase--interactive.sh:399
+#: git-rebase--interactive.sh:400
#, sh-format
msgid "Error redoing merge $sha1"
msgstr ""
-#: git-rebase--interactive.sh:407
+#: git-rebase--interactive.sh:408
#, sh-format
msgid "Could not pick $sha1"
msgstr ""
-#: git-rebase--interactive.sh:416
+#: git-rebase--interactive.sh:417
#, sh-format
msgid "This is the commit message #${n}:"
msgstr ""
-#: git-rebase--interactive.sh:421
+#: git-rebase--interactive.sh:422
#, sh-format
msgid "The commit message #${n} will be skipped:"
msgstr ""
-#: git-rebase--interactive.sh:432
+#: git-rebase--interactive.sh:433
#, sh-format
msgid "This is a combination of $count commit."
msgid_plural "This is a combination of $count commits."
msgstr[0] ""
msgstr[1] ""
-#: git-rebase--interactive.sh:441
+#: git-rebase--interactive.sh:442
#, sh-format
msgid "Cannot write $fixup_msg"
msgstr ""
-#: git-rebase--interactive.sh:444
+#: git-rebase--interactive.sh:445
msgid "This is a combination of 2 commits."
msgstr ""
-#: git-rebase--interactive.sh:485 git-rebase--interactive.sh:528
-#: git-rebase--interactive.sh:531
+#: git-rebase--interactive.sh:486 git-rebase--interactive.sh:529
+#: git-rebase--interactive.sh:532
#, sh-format
msgid "Could not apply $sha1... $rest"
msgstr ""
-#: git-rebase--interactive.sh:559
+#: git-rebase--interactive.sh:560
#, sh-format
msgid ""
"Could not amend commit after successfully picking $sha1... $rest\n"
"you are able to reword the commit."
msgstr ""
-#: git-rebase--interactive.sh:574
+#: git-rebase--interactive.sh:575
#, sh-format
msgid "Stopped at $sha1_abbrev... $rest"
msgstr ""
-#: git-rebase--interactive.sh:589
+#: git-rebase--interactive.sh:590
#, sh-format
msgid "Cannot '$squash_style' without a previous commit"
msgstr ""
-#: git-rebase--interactive.sh:631
+#: git-rebase--interactive.sh:632
#, sh-format
msgid "Executing: $rest"
msgstr ""
-#: git-rebase--interactive.sh:639
+#: git-rebase--interactive.sh:640
#, sh-format
msgid "Execution failed: $rest"
msgstr ""
-#: git-rebase--interactive.sh:641
+#: git-rebase--interactive.sh:642
msgid "and made changes to the index and/or the working tree"
msgstr ""
-#: git-rebase--interactive.sh:643
+#: git-rebase--interactive.sh:644
msgid ""
"You can fix the problem, and then run\n"
"\n"
msgstr ""
#. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--interactive.sh:656
+#: git-rebase--interactive.sh:657
#, sh-format
msgid ""
"Execution succeeded: $rest\n"
"\tgit rebase --continue"
msgstr ""
-#: git-rebase--interactive.sh:667
+#: git-rebase--interactive.sh:668
#, sh-format
msgid "Unknown command: $command $sha1 $rest"
msgstr ""
-#: git-rebase--interactive.sh:668
+#: git-rebase--interactive.sh:669
msgid "Please fix this using 'git rebase --edit-todo'."
msgstr ""
-#: git-rebase--interactive.sh:703
+#: git-rebase--interactive.sh:704
#, sh-format
msgid "Successfully rebased and updated $head_name."
msgstr ""
-#: git-rebase--interactive.sh:750
-msgid "Could not skip unnecessary pick commands"
-msgstr ""
-
-#: git-rebase--interactive.sh:908
-#, sh-format
-msgid ""
-"Warning: the SHA-1 is missing or isn't a commit in the following line:\n"
-" - $line"
-msgstr ""
-
-#: git-rebase--interactive.sh:941
-#, sh-format
-msgid ""
-"Warning: the command isn't recognized in the following line:\n"
-" - $line"
-msgstr ""
-
-#: git-rebase--interactive.sh:980
+#: git-rebase--interactive.sh:749
msgid "could not detach HEAD"
msgstr ""
-#: git-rebase--interactive.sh:1018
-msgid ""
-"Warning: some commits may have been dropped accidentally.\n"
-"Dropped commits (newer to older):"
-msgstr ""
-
-#: git-rebase--interactive.sh:1026
-msgid ""
-"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
-"\n"
-"Use 'git config rebase.missingCommitsCheck' to change the level of "
-"warnings.\n"
-"The possible behaviours are: ignore, warn, error."
-msgstr ""
-
-#: git-rebase--interactive.sh:1037
-#, sh-format
-msgid ""
-"Unrecognized setting $check_level for option rebase.missingCommitsCheck. "
-"Ignoring."
-msgstr ""
-
-#: git-rebase--interactive.sh:1054
-msgid ""
-"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
-"continue'."
-msgstr ""
-
-#: git-rebase--interactive.sh:1055
-msgid "Or you can abort the rebase with 'git rebase --abort'."
-msgstr ""
-
-#: git-rebase--interactive.sh:1083
+#: git-rebase--interactive.sh:784
msgid "Could not remove CHERRY_PICK_HEAD"
msgstr ""
-#: git-rebase--interactive.sh:1088
+#: git-rebase--interactive.sh:789
#, sh-format
msgid ""
"You have staged changes in your working tree.\n"
" git rebase --continue\n"
msgstr ""
-#: git-rebase--interactive.sh:1105
+#: git-rebase--interactive.sh:806
msgid "Error trying to find the author identity to amend commit"
msgstr ""
-#: git-rebase--interactive.sh:1110
+#: git-rebase--interactive.sh:811
msgid ""
"You have uncommitted changes in your working tree. Please commit them\n"
"first and then run 'git rebase --continue' again."
msgstr ""
-#: git-rebase--interactive.sh:1115 git-rebase--interactive.sh:1119
+#: git-rebase--interactive.sh:816 git-rebase--interactive.sh:820
msgid "Could not commit staged changes."
msgstr ""
-#: git-rebase--interactive.sh:1147
+#: git-rebase--interactive.sh:848
msgid ""
"\n"
"You are editing the todo file of an ongoing interactive rebase.\n"
"\n"
msgstr ""
-#: git-rebase--interactive.sh:1155 git-rebase--interactive.sh:1313
+#: git-rebase--interactive.sh:856 git-rebase--interactive.sh:1015
msgid "Could not execute editor"
msgstr ""
-#: git-rebase--interactive.sh:1168
+#: git-rebase--interactive.sh:869
#, sh-format
msgid "Could not checkout $switch_to"
msgstr ""
-#: git-rebase--interactive.sh:1173
+#: git-rebase--interactive.sh:874
msgid "No HEAD?"
msgstr ""
-#: git-rebase--interactive.sh:1174
+#: git-rebase--interactive.sh:875
#, sh-format
msgid "Could not create temporary $state_dir"
msgstr ""
-#: git-rebase--interactive.sh:1176
+#: git-rebase--interactive.sh:877
msgid "Could not mark as interactive"
msgstr ""
-#: git-rebase--interactive.sh:1186 git-rebase--interactive.sh:1191
+#: git-rebase--interactive.sh:887 git-rebase--interactive.sh:892
msgid "Could not init rewritten commits"
msgstr ""
-#: git-rebase--interactive.sh:1291
+#: git-rebase--interactive.sh:993
#, sh-format
msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
msgstr[0] ""
msgstr[1] ""
-#: git-rebase--interactive.sh:1296
+#: git-rebase--interactive.sh:998
msgid ""
"\n"
"However, if you remove everything, the rebase will be aborted.\n"
"\n"
msgstr ""
-#: git-rebase--interactive.sh:1303
+#: git-rebase--interactive.sh:1005
msgid "Note that empty commits are commented out"
msgstr ""
msgid "local time offset greater than or equal to 24 hours\n"
msgstr ""
-#: git-send-email.perl:208 git-send-email.perl:214
+#: git-send-email.perl:207 git-send-email.perl:213
msgid "the editor exited uncleanly, aborting everything"
msgstr ""
-#: git-send-email.perl:291
+#: git-send-email.perl:290
#, perl-format
msgid ""
"'%s' contains an intermediate version of the email you were composing.\n"
msgstr ""
-#: git-send-email.perl:296
+#: git-send-email.perl:295
#, perl-format
msgid "'%s.final' contains the composed email.\n"
msgstr ""
-#: git-send-email.perl:314
+#: git-send-email.perl:313
msgid "--dump-aliases incompatible with other options\n"
msgstr ""
-#: git-send-email.perl:379 git-send-email.perl:634
+#: git-send-email.perl:378 git-send-email.perl:629
msgid "Cannot run git format-patch from outside a repository\n"
msgstr ""
-#: git-send-email.perl:448
+#: git-send-email.perl:447
#, perl-format
msgid "Unknown --suppress-cc field: '%s'\n"
msgstr ""
-#: git-send-email.perl:477
+#: git-send-email.perl:476
#, perl-format
msgid "Unknown --confirm setting: '%s'\n"
msgstr ""
-#: git-send-email.perl:509
+#: git-send-email.perl:504
#, perl-format
msgid "warning: sendmail alias with quotes is not supported: %s\n"
msgstr ""
-#: git-send-email.perl:511
+#: git-send-email.perl:506
#, perl-format
msgid "warning: `:include:` not supported: %s\n"
msgstr ""
-#: git-send-email.perl:513
+#: git-send-email.perl:508
#, perl-format
msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
msgstr ""
-#: git-send-email.perl:518
+#: git-send-email.perl:513
#, perl-format
msgid "warning: sendmail line is not recognized: %s\n"
msgstr ""
-#: git-send-email.perl:600
+#: git-send-email.perl:595
#, perl-format
msgid ""
"File '%s' exists but it could also be the range of commits\n"
" * Giving --format-patch option if you mean a range.\n"
msgstr ""
-#: git-send-email.perl:621
+#: git-send-email.perl:616
#, perl-format
msgid "Failed to opendir %s: %s"
msgstr ""
-#: git-send-email.perl:645
+#: git-send-email.perl:640
#, perl-format
msgid ""
"fatal: %s: %s\n"
"warning: no patches were sent\n"
msgstr ""
-#: git-send-email.perl:656
+#: git-send-email.perl:651
msgid ""
"\n"
"No patch files specified!\n"
"\n"
msgstr ""
-#: git-send-email.perl:669
+#: git-send-email.perl:664
#, perl-format
msgid "No subject line in %s?"
msgstr ""
-#: git-send-email.perl:679
+#: git-send-email.perl:674
#, perl-format
msgid "Failed to open for writing %s: %s"
msgstr ""
-#: git-send-email.perl:689
+#: git-send-email.perl:684
msgid ""
"Lines beginning in \"GIT:\" will be removed.\n"
"Consider including an overall diffstat or table of contents\n"
"Clear the body content if you don't wish to send a summary.\n"
msgstr ""
-#: git-send-email.perl:712
+#: git-send-email.perl:707
#, perl-format
msgid "Failed to open %s.final: %s"
msgstr ""
-#: git-send-email.perl:715
+#: git-send-email.perl:710
#, perl-format
msgid "Failed to open %s: %s"
msgstr ""
-#: git-send-email.perl:750
+#: git-send-email.perl:745
msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n"
msgstr ""
-#: git-send-email.perl:759
+#: git-send-email.perl:754
msgid "Summary email is empty, skipping it\n"
msgstr ""
#. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:791
+#: git-send-email.perl:786
#, perl-format
msgid "Are you sure you want to use <%s> [y/N]? "
msgstr ""
-#: git-send-email.perl:820
+#: git-send-email.perl:815
msgid ""
"The following files are 8bit, but do not declare a Content-Transfer-"
"Encoding.\n"
msgstr ""
-#: git-send-email.perl:825
+#: git-send-email.perl:820
msgid "Which 8bit encoding should I declare [UTF-8]? "
msgstr ""
-#: git-send-email.perl:833
+#: git-send-email.perl:828
#, perl-format
msgid ""
"Refusing to send because the patch\n"
"want to send.\n"
msgstr ""
-#: git-send-email.perl:852
+#: git-send-email.perl:847
msgid "To whom should the emails be sent (if anyone)?"
msgstr ""
-#: git-send-email.perl:870
+#: git-send-email.perl:865
#, perl-format
msgid "fatal: alias '%s' expands to itself\n"
msgstr ""
-#: git-send-email.perl:882
+#: git-send-email.perl:877
msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
msgstr ""
-#: git-send-email.perl:932 git-send-email.perl:940
+#: git-send-email.perl:927 git-send-email.perl:935
#, perl-format
msgid "error: unable to extract a valid address from: %s\n"
msgstr ""
#. TRANSLATORS: Make sure to include [q] [d] [e] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-send-email.perl:944
+#: git-send-email.perl:939
msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
msgstr ""
-#: git-send-email.perl:1245
+#: git-send-email.perl:1260
#, perl-format
msgid "CA path \"%s\" does not exist"
msgstr ""
-#: git-send-email.perl:1320
+#: git-send-email.perl:1335
msgid ""
" The Cc list above has been expanded by additional\n"
" addresses found in the patch commit message. By default\n"
#. TRANSLATORS: Make sure to include [y] [n] [q] [a] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-send-email.perl:1335
+#: git-send-email.perl:1350
msgid "Send this email? ([y]es|[n]o|[q]uit|[a]ll): "
msgstr ""
-#: git-send-email.perl:1338
+#: git-send-email.perl:1353
msgid "Send this email reply required"
msgstr ""
-#: git-send-email.perl:1364
+#: git-send-email.perl:1379
msgid "The required SMTP server is not properly defined."
msgstr ""
-#: git-send-email.perl:1411
+#: git-send-email.perl:1426
#, perl-format
msgid "Server does not support STARTTLS! %s"
msgstr ""
-#: git-send-email.perl:1416 git-send-email.perl:1420
+#: git-send-email.perl:1431 git-send-email.perl:1435
#, perl-format
msgid "STARTTLS failed! %s"
msgstr ""
-#: git-send-email.perl:1430
+#: git-send-email.perl:1445
msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
msgstr ""
-#: git-send-email.perl:1448
+#: git-send-email.perl:1463
#, perl-format
msgid "Failed to send %s\n"
msgstr ""
-#: git-send-email.perl:1451
+#: git-send-email.perl:1466
#, perl-format
msgid "Dry-Sent %s\n"
msgstr ""
-#: git-send-email.perl:1451
+#: git-send-email.perl:1466
#, perl-format
msgid "Sent %s\n"
msgstr ""
-#: git-send-email.perl:1453
+#: git-send-email.perl:1468
msgid "Dry-OK. Log says:\n"
msgstr ""
-#: git-send-email.perl:1453
+#: git-send-email.perl:1468
msgid "OK. Log says:\n"
msgstr ""
-#: git-send-email.perl:1465
+#: git-send-email.perl:1480
msgid "Result: "
msgstr ""
-#: git-send-email.perl:1468
+#: git-send-email.perl:1483
msgid "Result: OK\n"
msgstr ""
-#: git-send-email.perl:1481
+#: git-send-email.perl:1496
#, perl-format
msgid "can't open file %s"
msgstr ""
-#: git-send-email.perl:1528 git-send-email.perl:1548
+#: git-send-email.perl:1543 git-send-email.perl:1563
#, perl-format
msgid "(mbox) Adding cc: %s from line '%s'\n"
msgstr ""
-#: git-send-email.perl:1534
+#: git-send-email.perl:1549
#, perl-format
msgid "(mbox) Adding to: %s from line '%s'\n"
msgstr ""
-#: git-send-email.perl:1582
+#: git-send-email.perl:1597
#, perl-format
msgid "(non-mbox) Adding cc: %s from line '%s'\n"
msgstr ""
-#: git-send-email.perl:1605
+#: git-send-email.perl:1622
#, perl-format
msgid "(body) Adding cc: %s from line '%s'\n"
msgstr ""
-#: git-send-email.perl:1711
+#: git-send-email.perl:1728
#, perl-format
msgid "(%s) Could not execute '%s'"
msgstr ""
-#: git-send-email.perl:1718
+#: git-send-email.perl:1735
#, perl-format
msgid "(%s) Adding %s: %s from: '%s'\n"
msgstr ""
-#: git-send-email.perl:1722
+#: git-send-email.perl:1739
#, perl-format
msgid "(%s) failed to close pipe to '%s'"
msgstr ""
-#: git-send-email.perl:1749
+#: git-send-email.perl:1766
msgid "cannot send message as 7bit"
msgstr ""
-#: git-send-email.perl:1757
+#: git-send-email.perl:1774
msgid "invalid transfer encoding"
msgstr ""
-#: git-send-email.perl:1795 git-send-email.perl:1846 git-send-email.perl:1856
+#: git-send-email.perl:1812 git-send-email.perl:1863 git-send-email.perl:1873
#, perl-format
msgid "unable to open %s: %s\n"
msgstr ""
-#: git-send-email.perl:1798
+#: git-send-email.perl:1815
#, perl-format
msgid "%s: patch contains a line longer than 998 characters"
msgstr ""
-#: git-send-email.perl:1814
+#: git-send-email.perl:1831
#, perl-format
msgid "Skipping %s with backup suffix '%s'.\n"
msgstr ""
#. TRANSLATORS: please keep "[y|N]" as is.
-#: git-send-email.perl:1818
+#: git-send-email.perl:1835
#, perl-format
msgid "Do you really want to send %s? [y|N]: "
msgstr ""