msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2018-06-16 22:06+0800\n"
+"POT-Creation-Date: 2018-08-21 08:28+0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
-#: advice.c:92
+#: advice.c:97
#, c-format
msgid "%shint: %.*s%s\n"
msgstr ""
-#: advice.c:137
+#: advice.c:150
msgid "Cherry-picking is not possible because you have unmerged files."
msgstr ""
-#: advice.c:139
+#: advice.c:152
msgid "Committing is not possible because you have unmerged files."
msgstr ""
-#: advice.c:141
+#: advice.c:154
msgid "Merging is not possible because you have unmerged files."
msgstr ""
-#: advice.c:143
+#: advice.c:156
msgid "Pulling is not possible because you have unmerged files."
msgstr ""
-#: advice.c:145
+#: advice.c:158
msgid "Reverting is not possible because you have unmerged files."
msgstr ""
-#: advice.c:147
+#: advice.c:160
#, c-format
msgid "It is not possible to %s because you have unmerged files."
msgstr ""
-#: advice.c:155
+#: advice.c:168
msgid ""
"Fix them up in the work tree, and then use 'git add/rm <file>'\n"
"as appropriate to mark resolution and make a commit."
msgstr ""
-#: advice.c:163
+#: advice.c:176
msgid "Exiting because of an unresolved conflict."
msgstr ""
-#: advice.c:168 builtin/merge.c:1250
+#: advice.c:181 builtin/merge.c:1286
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr ""
-#: advice.c:170
+#: advice.c:183
msgid "Please, commit your changes before merging."
msgstr ""
-#: advice.c:171
+#: advice.c:184
msgid "Exiting because of unfinished merge."
msgstr ""
-#: advice.c:177
+#: advice.c:190
#, c-format
msgid ""
"Note: checking out '%s'.\n"
"\n"
msgstr ""
-#: apply.c:58
+#: apply.c:59
#, c-format
msgid "unrecognized whitespace option '%s'"
msgstr ""
-#: apply.c:74
+#: apply.c:75
#, c-format
msgid "unrecognized whitespace ignore option '%s'"
msgstr ""
-#: apply.c:122
+#: apply.c:125
msgid "--reject and --3way cannot be used together."
msgstr ""
-#: apply.c:124
+#: apply.c:127
msgid "--cached and --3way cannot be used together."
msgstr ""
-#: apply.c:127
+#: apply.c:130
msgid "--3way outside a repository"
msgstr ""
-#: apply.c:138
+#: apply.c:141
msgid "--index outside a repository"
msgstr ""
-#: apply.c:141
+#: apply.c:144
msgid "--cached outside a repository"
msgstr ""
-#: apply.c:821
+#: apply.c:826
#, c-format
msgid "Cannot prepare timestamp regexp %s"
msgstr ""
-#: apply.c:830
+#: apply.c:835
#, c-format
msgid "regexec returned %d for input: %s"
msgstr ""
-#: apply.c:904
+#: apply.c:909
#, c-format
msgid "unable to find filename in patch at line %d"
msgstr ""
-#: apply.c:942
+#: apply.c:947
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
msgstr ""
-#: apply.c:948
+#: apply.c:953
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr ""
-#: apply.c:949
+#: apply.c:954
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr ""
-#: apply.c:954
+#: apply.c:959
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr ""
-#: apply.c:983
+#: apply.c:988
#, c-format
msgid "invalid mode on line %d: %s"
msgstr ""
-#: apply.c:1301
+#: apply.c:1306
#, c-format
msgid "inconsistent header lines %d and %d"
msgstr ""
-#: apply.c:1473
+#: apply.c:1478
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr ""
-#: apply.c:1542
+#: apply.c:1547
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr ""
-#: apply.c:1562
+#: apply.c:1567
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
msgstr[0] ""
msgstr[1] ""
-#: apply.c:1575
+#: apply.c:1580
#, c-format
msgid "git diff header lacks filename information (line %d)"
msgstr ""
-#: apply.c:1763
+#: apply.c:1768
msgid "new file depends on old contents"
msgstr ""
-#: apply.c:1765
+#: apply.c:1770
msgid "deleted file still has contents"
msgstr ""
-#: apply.c:1799
+#: apply.c:1804
#, c-format
msgid "corrupt patch at line %d"
msgstr ""
-#: apply.c:1836
+#: apply.c:1841
#, c-format
msgid "new file %s depends on old contents"
msgstr ""
-#: apply.c:1838
+#: apply.c:1843
#, c-format
msgid "deleted file %s still has contents"
msgstr ""
-#: apply.c:1841
+#: apply.c:1846
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr ""
-#: apply.c:1988
+#: apply.c:1993
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr ""
-#: apply.c:2025
+#: apply.c:2030
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr ""
-#: apply.c:2185
+#: apply.c:2190
#, c-format
msgid "patch with only garbage at line %d"
msgstr ""
-#: apply.c:2271
+#: apply.c:2276
#, c-format
msgid "unable to read symlink %s"
msgstr ""
-#: apply.c:2275
+#: apply.c:2280
#, c-format
msgid "unable to open or read %s"
msgstr ""
-#: apply.c:2934
+#: apply.c:2939
#, c-format
msgid "invalid start of line: '%c'"
msgstr ""
-#: apply.c:3055
+#: apply.c:3060
#, c-format
msgid "Hunk #%d succeeded at %d (offset %d line)."
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
msgstr[0] ""
msgstr[1] ""
-#: apply.c:3067
+#: apply.c:3072
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr ""
-#: apply.c:3073
+#: apply.c:3078
#, c-format
msgid ""
"while searching for:\n"
"%.*s"
msgstr ""
-#: apply.c:3095
+#: apply.c:3100
#, c-format
msgid "missing binary patch data for '%s'"
msgstr ""
-#: apply.c:3103
+#: apply.c:3108
#, c-format
msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
msgstr ""
-#: apply.c:3149
+#: apply.c:3154
#, c-format
msgid "cannot apply binary patch to '%s' without full index line"
msgstr ""
-#: apply.c:3159
+#: apply.c:3164
#, c-format
msgid ""
"the patch applies to '%s' (%s), which does not match the current contents."
msgstr ""
-#: apply.c:3167
+#: apply.c:3172
#, c-format
msgid "the patch applies to an empty '%s' but it is not empty"
msgstr ""
-#: apply.c:3185
+#: apply.c:3190
#, c-format
msgid "the necessary postimage %s for '%s' cannot be read"
msgstr ""
-#: apply.c:3198
+#: apply.c:3203
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr ""
-#: apply.c:3204
+#: apply.c:3209
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr ""
-#: apply.c:3225
+#: apply.c:3230
#, c-format
msgid "patch failed: %s:%ld"
msgstr ""
-#: apply.c:3347
+#: apply.c:3352
#, c-format
msgid "cannot checkout %s"
msgstr ""
-#: apply.c:3396 apply.c:3407 apply.c:3453 setup.c:278
+#: apply.c:3404 apply.c:3415 apply.c:3461 setup.c:278
#, c-format
msgid "failed to read %s"
msgstr ""
-#: apply.c:3404
+#: apply.c:3412
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr ""
-#: apply.c:3433 apply.c:3673
+#: apply.c:3441 apply.c:3681
#, c-format
msgid "path %s has been renamed/deleted"
msgstr ""
-#: apply.c:3516 apply.c:3687
+#: apply.c:3524 apply.c:3696
#, c-format
msgid "%s: does not exist in index"
msgstr ""
-#: apply.c:3525 apply.c:3695
+#: apply.c:3533 apply.c:3704
#, c-format
msgid "%s: does not match index"
msgstr ""
-#: apply.c:3560
+#: apply.c:3568
msgid "repository lacks the necessary blob to fall back on 3-way merge."
msgstr ""
-#: apply.c:3563
+#: apply.c:3571
#, c-format
msgid "Falling back to three-way merge...\n"
msgstr ""
-#: apply.c:3579 apply.c:3583
+#: apply.c:3587 apply.c:3591
#, c-format
msgid "cannot read the current contents of '%s'"
msgstr ""
-#: apply.c:3595
+#: apply.c:3603
#, c-format
msgid "Failed to fall back on three-way merge...\n"
msgstr ""
-#: apply.c:3609
+#: apply.c:3617
#, c-format
msgid "Applied patch to '%s' with conflicts.\n"
msgstr ""
-#: apply.c:3614
+#: apply.c:3622
#, c-format
msgid "Applied patch to '%s' cleanly.\n"
msgstr ""
-#: apply.c:3640
+#: apply.c:3648
msgid "removal patch leaves file contents"
msgstr ""
-#: apply.c:3712
+#: apply.c:3721
#, c-format
msgid "%s: wrong type"
msgstr ""
-#: apply.c:3714
+#: apply.c:3723
#, c-format
msgid "%s has type %o, expected %o"
msgstr ""
-#: apply.c:3864 apply.c:3866
+#: apply.c:3874 apply.c:3876
#, c-format
msgid "invalid path '%s'"
msgstr ""
-#: apply.c:3922
+#: apply.c:3932
#, c-format
msgid "%s: already exists in index"
msgstr ""
-#: apply.c:3925
+#: apply.c:3935
#, c-format
msgid "%s: already exists in working directory"
msgstr ""
-#: apply.c:3945
+#: apply.c:3955
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr ""
-#: apply.c:3950
+#: apply.c:3960
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr ""
-#: apply.c:3970
+#: apply.c:3980
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr ""
-#: apply.c:3974
+#: apply.c:3984
#, c-format
msgid "%s: patch does not apply"
msgstr ""
-#: apply.c:3989
+#: apply.c:3999
#, c-format
msgid "Checking patch %s..."
msgstr ""
-#: apply.c:4080
+#: apply.c:4091
#, c-format
msgid "sha1 information is lacking or useless for submodule %s"
msgstr ""
-#: apply.c:4087
+#: apply.c:4098
#, c-format
msgid "mode change for %s, which is not in current HEAD"
msgstr ""
-#: apply.c:4090
+#: apply.c:4101
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr ""
-#: apply.c:4095 builtin/checkout.c:235 builtin/reset.c:140
+#: apply.c:4106 builtin/checkout.c:237 builtin/reset.c:140
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr ""
-#: apply.c:4099
+#: apply.c:4110
#, c-format
msgid "could not add %s to temporary index"
msgstr ""
-#: apply.c:4109
+#: apply.c:4120
#, c-format
msgid "could not write temporary index to %s"
msgstr ""
-#: apply.c:4247
+#: apply.c:4258
#, c-format
msgid "unable to remove %s from index"
msgstr ""
-#: apply.c:4282
+#: apply.c:4292
#, c-format
msgid "corrupt patch for submodule %s"
msgstr ""
-#: apply.c:4288
+#: apply.c:4298
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr ""
-#: apply.c:4296
+#: apply.c:4306
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr ""
-#: apply.c:4302 apply.c:4446
+#: apply.c:4312 apply.c:4457
#, c-format
msgid "unable to add cache entry for %s"
msgstr ""
-#: apply.c:4343
+#: apply.c:4355
#, c-format
msgid "failed to write to '%s'"
msgstr ""
-#: apply.c:4347
+#: apply.c:4359
#, c-format
msgid "closing file '%s'"
msgstr ""
-#: apply.c:4417
+#: apply.c:4429
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr ""
-#: apply.c:4515
+#: apply.c:4527
#, c-format
msgid "Applied patch %s cleanly."
msgstr ""
-#: apply.c:4523
+#: apply.c:4535
msgid "internal error"
msgstr ""
-#: apply.c:4526
+#: apply.c:4538
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] ""
msgstr[1] ""
-#: apply.c:4537
+#: apply.c:4549
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr ""
-#: apply.c:4545 builtin/fetch.c:786 builtin/fetch.c:1036
+#: apply.c:4557 builtin/fetch.c:780 builtin/fetch.c:1048
#, c-format
msgid "cannot open %s"
msgstr ""
-#: apply.c:4559
+#: apply.c:4571
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr ""
-#: apply.c:4563
+#: apply.c:4575
#, c-format
msgid "Rejected hunk #%d."
msgstr ""
-#: apply.c:4673
+#: apply.c:4685
#, c-format
msgid "Skipped patch '%s'."
msgstr ""
-#: apply.c:4681
+#: apply.c:4693
msgid "unrecognized input"
msgstr ""
-#: apply.c:4700
+#: apply.c:4712
msgid "unable to read index file"
msgstr ""
-#: apply.c:4837
+#: apply.c:4849
#, c-format
msgid "can't open patch '%s': %s"
msgstr ""
-#: apply.c:4864
+#: apply.c:4876
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] ""
msgstr[1] ""
-#: apply.c:4870 apply.c:4885
+#: apply.c:4882 apply.c:4897
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgstr[0] ""
msgstr[1] ""
-#: apply.c:4878
+#: apply.c:4890
#, c-format
msgid "%d line applied after fixing whitespace errors."
msgid_plural "%d lines applied after fixing whitespace errors."
msgstr[0] ""
msgstr[1] ""
-#: apply.c:4894 builtin/add.c:538 builtin/mv.c:300 builtin/rm.c:389
+#: apply.c:4906 builtin/add.c:539 builtin/mv.c:300 builtin/rm.c:389
msgid "Unable to write new index file"
msgstr ""
-#: apply.c:4921 apply.c:4924 builtin/am.c:2254 builtin/am.c:2257
-#: builtin/clone.c:120 builtin/fetch.c:126 builtin/pull.c:198
-#: builtin/submodule--helper.c:405 builtin/submodule--helper.c:1210
-#: builtin/submodule--helper.c:1213 builtin/submodule--helper.c:1584
-#: builtin/submodule--helper.c:1587 builtin/submodule--helper.c:1807
-#: git-add--interactive.perl:197
+#: apply.c:4933 apply.c:4936 builtin/am.c:2254 builtin/am.c:2257
+#: builtin/clone.c:121 builtin/fetch.c:115 builtin/merge.c:260
+#: builtin/pull.c:198 builtin/submodule--helper.c:406
+#: builtin/submodule--helper.c:1355 builtin/submodule--helper.c:1358
+#: builtin/submodule--helper.c:1729 builtin/submodule--helper.c:1732
+#: builtin/submodule--helper.c:1952 git-add--interactive.perl:197
msgid "path"
msgstr ""
-#: apply.c:4922
+#: apply.c:4934
msgid "don't apply changes matching the given path"
msgstr ""
-#: apply.c:4925
+#: apply.c:4937
msgid "apply changes matching the given path"
msgstr ""
-#: apply.c:4927 builtin/am.c:2263
+#: apply.c:4939 builtin/am.c:2263
msgid "num"
msgstr ""
-#: apply.c:4928
+#: apply.c:4940
msgid "remove <num> leading slashes from traditional diff paths"
msgstr ""
-#: apply.c:4931
+#: apply.c:4943
msgid "ignore additions made by the patch"
msgstr ""
-#: apply.c:4933
+#: apply.c:4945
msgid "instead of applying the patch, output diffstat for the input"
msgstr ""
-#: apply.c:4937
+#: apply.c:4949
msgid "show number of added and deleted lines in decimal notation"
msgstr ""
-#: apply.c:4939
+#: apply.c:4951
msgid "instead of applying the patch, output a summary for the input"
msgstr ""
-#: apply.c:4941
+#: apply.c:4953
msgid "instead of applying the patch, see if the patch is applicable"
msgstr ""
-#: apply.c:4943
+#: apply.c:4955
msgid "make sure the patch is applicable to the current index"
msgstr ""
-#: apply.c:4945
+#: apply.c:4957
+msgid "mark new files with `git add --intent-to-add`"
+msgstr ""
+
+#: apply.c:4959
msgid "apply a patch without touching the working tree"
msgstr ""
-#: apply.c:4947
+#: apply.c:4961
msgid "accept a patch that touches outside the working area"
msgstr ""
-#: apply.c:4950
+#: apply.c:4964
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr ""
-#: apply.c:4952
+#: apply.c:4966
msgid "attempt three-way merge if a patch does not apply"
msgstr ""
-#: apply.c:4954
+#: apply.c:4968
msgid "build a temporary index based on embedded index information"
msgstr ""
-#: apply.c:4957 builtin/checkout-index.c:168 builtin/ls-files.c:515
+#: apply.c:4971 builtin/checkout-index.c:168 builtin/ls-files.c:516
msgid "paths are separated with NUL character"
msgstr ""
-#: apply.c:4959
+#: apply.c:4973
msgid "ensure at least <n> lines of context match"
msgstr ""
-#: apply.c:4960 builtin/am.c:2242 builtin/interpret-trailers.c:95
+#: apply.c:4974 builtin/am.c:2242 builtin/interpret-trailers.c:95
#: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99
-#: builtin/pack-objects.c:3177
+#: builtin/pack-objects.c:3205
msgid "action"
msgstr ""
-#: apply.c:4961
+#: apply.c:4975
msgid "detect new or modified lines that have whitespace errors"
msgstr ""
-#: apply.c:4964 apply.c:4967
+#: apply.c:4978 apply.c:4981
msgid "ignore changes in whitespace when finding context"
msgstr ""
-#: apply.c:4970
+#: apply.c:4984
msgid "apply the patch in reverse"
msgstr ""
-#: apply.c:4972
+#: apply.c:4986
msgid "don't expect at least one line of context"
msgstr ""
-#: apply.c:4974
+#: apply.c:4988
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr ""
-#: apply.c:4976
+#: apply.c:4990
msgid "allow overlapping hunks"
msgstr ""
-#: apply.c:4977 builtin/add.c:290 builtin/check-ignore.c:21
-#: builtin/commit.c:1301 builtin/count-objects.c:98 builtin/fsck.c:666
-#: builtin/log.c:1901 builtin/mv.c:122 builtin/read-tree.c:124
+#: apply.c:4991 builtin/add.c:290 builtin/check-ignore.c:21
+#: builtin/commit.c:1301 builtin/count-objects.c:98 builtin/fsck.c:671
+#: builtin/log.c:1914 builtin/mv.c:122 builtin/read-tree.c:124
msgid "be verbose"
msgstr ""
-#: apply.c:4979
+#: apply.c:4993
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr ""
-#: apply.c:4982
+#: apply.c:4996
msgid "do not trust the line counts in the hunk headers"
msgstr ""
-#: apply.c:4984 builtin/am.c:2251
+#: apply.c:4998 builtin/am.c:2251
msgid "root"
msgstr ""
-#: apply.c:4985
+#: apply.c:4999
msgid "prepend <root> to all filenames"
msgstr ""
-#: archive.c:13
+#: archive.c:14
msgid "git archive [<options>] <tree-ish> [<path>...]"
msgstr ""
-#: archive.c:14
+#: archive.c:15
msgid "git archive --list"
msgstr ""
-#: archive.c:15
+#: archive.c:16
msgid ""
"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
msgstr ""
-#: archive.c:16
+#: archive.c:17
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr ""
-#: archive.c:351 builtin/add.c:176 builtin/add.c:514 builtin/rm.c:298
+#: archive.c:363 builtin/add.c:176 builtin/add.c:515 builtin/rm.c:298
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr ""
-#: archive.c:434
+#: archive.c:446
msgid "fmt"
msgstr ""
-#: archive.c:434
+#: archive.c:446
msgid "archive format"
msgstr ""
-#: archive.c:435 builtin/log.c:1462
+#: archive.c:447 builtin/log.c:1473
msgid "prefix"
msgstr ""
-#: archive.c:436
+#: archive.c:448
msgid "prepend prefix to each pathname in the archive"
msgstr ""
-#: archive.c:437 builtin/blame.c:813 builtin/blame.c:814 builtin/config.c:127
-#: builtin/fast-export.c:1007 builtin/fast-export.c:1009 builtin/grep.c:869
-#: builtin/hash-object.c:103 builtin/ls-files.c:551 builtin/ls-files.c:554
-#: builtin/notes.c:405 builtin/notes.c:568 builtin/read-tree.c:119
+#: archive.c:449 builtin/blame.c:816 builtin/blame.c:817 builtin/config.c:126
+#: builtin/fast-export.c:1013 builtin/fast-export.c:1015 builtin/grep.c:873
+#: builtin/hash-object.c:104 builtin/ls-files.c:552 builtin/ls-files.c:555
+#: builtin/notes.c:407 builtin/notes.c:570 builtin/read-tree.c:119
#: parse-options.h:165
msgid "file"
msgstr ""
-#: archive.c:438 builtin/archive.c:89
+#: archive.c:450 builtin/archive.c:89
msgid "write the archive to this file"
msgstr ""
-#: archive.c:440
+#: archive.c:452
msgid "read .gitattributes in working directory"
msgstr ""
-#: archive.c:441
+#: archive.c:453
msgid "report archived files on stderr"
msgstr ""
-#: archive.c:442
+#: archive.c:454
msgid "store only"
msgstr ""
-#: archive.c:443
+#: archive.c:455
msgid "compress faster"
msgstr ""
-#: archive.c:451
+#: archive.c:463
msgid "compress better"
msgstr ""
-#: archive.c:454
+#: archive.c:466
msgid "list supported archive formats"
msgstr ""
-#: archive.c:456 builtin/archive.c:90 builtin/clone.c:110 builtin/clone.c:113
-#: builtin/submodule--helper.c:1222 builtin/submodule--helper.c:1593
+#: archive.c:468 builtin/archive.c:90 builtin/clone.c:111 builtin/clone.c:114
+#: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1738
msgid "repo"
msgstr ""
-#: archive.c:457 builtin/archive.c:91
+#: archive.c:469 builtin/archive.c:91
msgid "retrieve the archive from remote repository <repo>"
msgstr ""
-#: archive.c:458 builtin/archive.c:92 builtin/notes.c:489
+#: archive.c:470 builtin/archive.c:92 builtin/difftool.c:714
+#: builtin/notes.c:491
msgid "command"
msgstr ""
-#: archive.c:459 builtin/archive.c:93
+#: archive.c:471 builtin/archive.c:93
msgid "path to the remote git-upload-archive command"
msgstr ""
-#: archive.c:466
+#: archive.c:478
msgid "Unexpected option --remote"
msgstr ""
-#: archive.c:468
+#: archive.c:480
msgid "Option --exec can only be used together with --remote"
msgstr ""
-#: archive.c:470
+#: archive.c:482
msgid "Unexpected option --output"
msgstr ""
-#: archive.c:492
+#: archive.c:504
#, c-format
msgid "Unknown archive format '%s'"
msgstr ""
-#: archive.c:499
+#: archive.c:511
#, c-format
msgid "Argument not supported for format '%s': -%d"
msgstr ""
+#: archive-tar.c:125 archive-zip.c:344
+#, c-format
+msgid "cannot stream blob %s"
+msgstr ""
+
+#: archive-tar.c:260 archive-zip.c:361
+#, c-format
+msgid "unsupported file mode: 0%o (SHA1: %s)"
+msgstr ""
+
+#: archive-tar.c:287 archive-zip.c:352
+#, c-format
+msgid "cannot read %s"
+msgstr ""
+
+#: archive-tar.c:458
+#, c-format
+msgid "unable to start '%s' filter"
+msgstr ""
+
+#: archive-tar.c:461
+msgid "unable to redirect descriptor"
+msgstr ""
+
+#: archive-tar.c:468
+#, c-format
+msgid "'%s' filter reported error"
+msgstr ""
+
+#: archive-zip.c:313
+#, c-format
+msgid "path is not valid UTF-8: %s"
+msgstr ""
+
+#: archive-zip.c:317
+#, c-format
+msgid "path too long (%d chars, SHA1: %s): %s"
+msgstr ""
+
+#: archive-zip.c:470 builtin/pack-objects.c:216 builtin/pack-objects.c:219
+#, c-format
+msgid "deflate error (%d)"
+msgstr ""
+
+#: archive-zip.c:605
+#, c-format
+msgid "timestamp too large for this system: %<PRIuMAX>"
+msgstr ""
+
#: attr.c:218
#, c-format
msgid "%.*s is not a valid attribute name"
"Use '\\!' for literal leading exclamation."
msgstr ""
-#: bisect.c:461
+#: bisect.c:467
#, c-format
msgid "Badly quoted content in file '%s': %s"
msgstr ""
-#: bisect.c:669
+#: bisect.c:675
#, c-format
msgid "We cannot bisect more!\n"
msgstr ""
-#: bisect.c:723
+#: bisect.c:729
#, c-format
msgid "Not a valid commit name %s"
msgstr ""
-#: bisect.c:747
+#: bisect.c:753
#, c-format
msgid ""
"The merge base %s is bad.\n"
"This means the bug has been fixed between %s and [%s].\n"
msgstr ""
-#: bisect.c:752
+#: bisect.c:758
#, c-format
msgid ""
"The merge base %s is new.\n"
"The property has changed between %s and [%s].\n"
msgstr ""
-#: bisect.c:757
+#: bisect.c:763
#, c-format
msgid ""
"The merge base %s is %s.\n"
"This means the first '%s' commit is between %s and [%s].\n"
msgstr ""
-#: bisect.c:765
+#: bisect.c:771
#, c-format
msgid ""
"Some %s revs are not ancestors of the %s rev.\n"
"Maybe you mistook %s and %s revs?\n"
msgstr ""
-#: bisect.c:778
+#: bisect.c:784
#, c-format
msgid ""
"the merge base between %s and [%s] must be skipped.\n"
"We continue anyway."
msgstr ""
-#: bisect.c:811
+#: bisect.c:817
#, c-format
msgid "Bisecting: a merge base must be tested\n"
msgstr ""
-#: bisect.c:851
+#: bisect.c:857
#, c-format
msgid "a %s revision is needed"
msgstr ""
-#: bisect.c:870 builtin/notes.c:175 builtin/tag.c:236
+#: bisect.c:876 builtin/notes.c:177 builtin/tag.c:237
#, c-format
msgid "could not create file '%s'"
msgstr ""
-#: bisect.c:921
+#: bisect.c:927 builtin/merge.c:137
#, c-format
msgid "could not read file '%s'"
msgstr ""
-#: bisect.c:951
+#: bisect.c:957
msgid "reading bisect refs failed"
msgstr ""
-#: bisect.c:970
+#: bisect.c:976
#, c-format
msgid "%s was both %s and %s\n"
msgstr ""
-#: bisect.c:978
+#: bisect.c:984
#, c-format
msgid ""
"No testable commit found.\n"
"Maybe you started with bad path parameters?\n"
msgstr ""
-#: bisect.c:997
+#: bisect.c:1003
#, 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:1003
+#: bisect.c:1009
#, c-format
msgid "Bisecting: %d revision left to test after this %s\n"
msgid_plural "Bisecting: %d revisions left to test after this %s\n"
msgstr[0] ""
msgstr[1] ""
-#: blame.c:1756
+#: blame.c:1786
msgid "--contents and --reverse do not blend well."
msgstr ""
-#: blame.c:1767
+#: blame.c:1800
msgid "cannot use --contents with final commit object name"
msgstr ""
-#: blame.c:1787
+#: blame.c:1821
msgid "--reverse and --first-parent together require specified latest commit"
msgstr ""
-#: blame.c:1796 bundle.c:160 ref-filter.c:2075 sequencer.c:1861
-#: sequencer.c:3632 builtin/commit.c:981 builtin/log.c:366 builtin/log.c:920
-#: builtin/log.c:1371 builtin/log.c:1702 builtin/log.c:1950 builtin/merge.c:372
+#: blame.c:1830 bundle.c:162 ref-filter.c:2154 sequencer.c:1874
+#: sequencer.c:3772 builtin/commit.c:994 builtin/log.c:372 builtin/log.c:926
+#: builtin/log.c:1381 builtin/log.c:1713 builtin/log.c:1963 builtin/merge.c:404
+#: builtin/pack-objects.c:3032 builtin/pack-objects.c:3047
#: builtin/shortlog.c:192
msgid "revision walk setup failed"
msgstr ""
-#: blame.c:1814
+#: blame.c:1848
msgid ""
"--reverse --first-parent together require range along first-parent chain"
msgstr ""
-#: blame.c:1825
+#: blame.c:1859
#, c-format
msgid "no such path %s in %s"
msgstr ""
-#: blame.c:1836
+#: blame.c:1870
#, c-format
msgid "cannot read blob %s for path %s"
msgstr ""
msgid "HEAD of working tree %s is not updated"
msgstr ""
-#: bundle.c:34
+#: bundle.c:36
#, c-format
msgid "'%s' does not look like a v2 bundle file"
msgstr ""
-#: bundle.c:62
+#: bundle.c:64
#, c-format
msgid "unrecognized header: %s%s (%d)"
msgstr ""
-#: bundle.c:88 sequencer.c:2081 sequencer.c:2558 builtin/commit.c:755
+#: bundle.c:90 sequencer.c:2092 sequencer.c:2578 builtin/commit.c:768
#, c-format
msgid "could not open '%s'"
msgstr ""
-#: bundle.c:139
+#: bundle.c:141
msgid "Repository lacks these prerequisite commits:"
msgstr ""
-#: bundle.c:190
+#: bundle.c:192
#, c-format
msgid "The bundle contains this ref:"
msgid_plural "The bundle contains these %d refs:"
msgstr[0] ""
msgstr[1] ""
-#: bundle.c:197
+#: bundle.c:199
msgid "The bundle records a complete history."
msgstr ""
-#: bundle.c:199
+#: bundle.c:201
#, c-format
msgid "The bundle requires this ref:"
msgid_plural "The bundle requires these %d refs:"
msgstr[0] ""
msgstr[1] ""
-#: bundle.c:258
+#: bundle.c:260
msgid "Could not spawn pack-objects"
msgstr ""
-#: bundle.c:269
+#: bundle.c:271
msgid "pack-objects died"
msgstr ""
-#: bundle.c:311
+#: bundle.c:313
msgid "rev-list died"
msgstr ""
-#: bundle.c:360
+#: bundle.c:362
#, c-format
msgid "ref '%s' is excluded by the rev-list options"
msgstr ""
-#: bundle.c:450 builtin/log.c:183 builtin/log.c:1607 builtin/shortlog.c:303
+#: bundle.c:453 builtin/log.c:187 builtin/log.c:1618 builtin/shortlog.c:304
#, c-format
msgid "unrecognized argument: %s"
msgstr ""
-#: bundle.c:458
+#: bundle.c:461
msgid "Refusing to create empty bundle."
msgstr ""
-#: bundle.c:470
+#: bundle.c:473
#, c-format
msgid "cannot create '%s'"
msgstr ""
-#: bundle.c:498
+#: bundle.c:501
msgid "index-pack died"
msgstr ""
msgid "invalid color value: %.*s"
msgstr ""
-#: commit.c:43 sequencer.c:2364 builtin/am.c:421 builtin/am.c:465
-#: builtin/am.c:1436 builtin/am.c:2072 builtin/replace.c:376
+#: commit.c:48 sequencer.c:2384 builtin/am.c:422 builtin/am.c:466
+#: builtin/am.c:1438 builtin/am.c:2072 builtin/replace.c:376
#: builtin/replace.c:448
#, c-format
msgid "could not parse %s"
msgstr ""
-#: commit.c:45
+#: commit.c:50
#, c-format
msgid "%s %s is not a commit!"
msgstr ""
-#: commit.c:182
+#: commit.c:191
msgid ""
"Support for <GIT_DIR>/info/grafts is deprecated\n"
"and will be removed in a future Git version.\n"
"\"git config advice.graftFileDeprecated false\""
msgstr ""
-#: commit.c:1540
+#: commit.c:1629
msgid ""
"Warning: commit message did not conform to UTF-8.\n"
"You may want to amend it after fixing the message, or set the config\n"
"variable i18n.commitencoding to the encoding your project uses.\n"
msgstr ""
-#: commit-graph.c:669
+#: commit-graph.c:83
+#, c-format
+msgid "graph file %s is too small"
+msgstr ""
+
+#: commit-graph.c:90
+#, c-format
+msgid "graph signature %X does not match signature %X"
+msgstr ""
+
+#: commit-graph.c:97
+#, c-format
+msgid "graph version %X does not match version %X"
+msgstr ""
+
+#: commit-graph.c:104
+#, c-format
+msgid "hash version %X does not match version %X"
+msgstr ""
+
+#: commit-graph.c:128
+#, c-format
+msgid "improper chunk offset %08x%08x"
+msgstr ""
+
+#: commit-graph.c:164
+#, c-format
+msgid "chunk id %08x appears multiple times"
+msgstr ""
+
+#: commit-graph.c:261
+#, c-format
+msgid "could not find commit %s"
+msgstr ""
+
+#: commit-graph.c:565 builtin/pack-objects.c:2571
+#, c-format
+msgid "unable to get type of object %s"
+msgstr ""
+
+#: commit-graph.c:730
+#, c-format
+msgid "error adding pack %s"
+msgstr ""
+
+#: commit-graph.c:732
+#, c-format
+msgid "error opening index for %s"
+msgstr ""
+
+#: commit-graph.c:773
#, c-format
msgid "the commit graph format cannot write %d commits"
msgstr ""
-#: commit-graph.c:696
+#: commit-graph.c:800
msgid "too many commits to write graph"
msgstr ""
-#: commit-graph.c:707 builtin/init-db.c:516 builtin/init-db.c:521
+#: commit-graph.c:806
#, c-format
-msgid "cannot mkdir %s"
+msgid "unable to create leading directories of %s"
+msgstr ""
+
+#: commit-graph.c:904
+msgid "the commit-graph file has incorrect checksum and is likely corrupt"
msgstr ""
#: compat/obstack.c:405 compat/obstack.c:407
msgid "memory exhausted"
msgstr ""
-#: config.c:187
+#: config.c:123
+#, c-format
+msgid ""
+"exceeded maximum include depth (%d) while including\n"
+"\t%s\n"
+"from\n"
+"\t%s\n"
+"Do you have circular includes?"
+msgstr ""
+
+#: config.c:139
+#, c-format
+msgid "could not expand include path '%s'"
+msgstr ""
+
+#: config.c:150
+msgid "relative config includes must come from files"
+msgstr ""
+
+#: config.c:190
msgid "relative config include conditionals must come from files"
msgstr ""
-#: config.c:788
+#: config.c:348
+#, c-format
+msgid "key does not contain a section: %s"
+msgstr ""
+
+#: config.c:354
+#, c-format
+msgid "key does not contain variable name: %s"
+msgstr ""
+
+#: config.c:378 sequencer.c:2206
+#, c-format
+msgid "invalid key: %s"
+msgstr ""
+
+#: config.c:384
+#, c-format
+msgid "invalid key (newline): %s"
+msgstr ""
+
+#: config.c:420 config.c:432
+#, c-format
+msgid "bogus config parameter: %s"
+msgstr ""
+
+#: config.c:467
+#, c-format
+msgid "bogus format in %s"
+msgstr ""
+
+#: config.c:793
#, c-format
msgid "bad config line %d in blob %s"
msgstr ""
-#: config.c:792
+#: config.c:797
#, c-format
msgid "bad config line %d in file %s"
msgstr ""
-#: config.c:796
+#: config.c:801
#, c-format
msgid "bad config line %d in standard input"
msgstr ""
-#: config.c:800
+#: config.c:805
#, c-format
msgid "bad config line %d in submodule-blob %s"
msgstr ""
-#: config.c:804
+#: config.c:809
#, c-format
msgid "bad config line %d in command line %s"
msgstr ""
-#: config.c:808
+#: config.c:813
#, c-format
msgid "bad config line %d in %s"
msgstr ""
-#: config.c:936
+#: config.c:952
msgid "out of range"
msgstr ""
-#: config.c:936
+#: config.c:952
msgid "invalid unit"
msgstr ""
-#: config.c:942
+#: config.c:958
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
msgstr ""
-#: config.c:947
+#: config.c:963
#, c-format
msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
msgstr ""
-#: config.c:950
+#: config.c:966
#, c-format
msgid "bad numeric config value '%s' for '%s' in file %s: %s"
msgstr ""
-#: config.c:953
+#: config.c:969
#, c-format
msgid "bad numeric config value '%s' for '%s' in standard input: %s"
msgstr ""
-#: config.c:956
+#: config.c:972
#, c-format
msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
msgstr ""
-#: config.c:959
+#: config.c:975
#, c-format
msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
msgstr ""
-#: config.c:962
+#: config.c:978
#, c-format
msgid "bad numeric config value '%s' for '%s' in %s: %s"
msgstr ""
-#: config.c:1057
+#: config.c:1073
#, c-format
msgid "failed to expand user dir in: '%s'"
msgstr ""
-#: config.c:1066
+#: config.c:1082
#, c-format
msgid "'%s' for '%s' is not a valid timestamp"
msgstr ""
-#: config.c:1171 config.c:1182
+#: config.c:1173
+#, c-format
+msgid "abbrev length out of range: %d"
+msgstr ""
+
+#: config.c:1187 config.c:1198
#, c-format
msgid "bad zlib compression level %d"
msgstr ""
-#: config.c:1307
+#: config.c:1290
+msgid "core.commentChar should only be one character"
+msgstr ""
+
+#: config.c:1323
#, c-format
msgid "invalid mode for object creation: %s"
msgstr ""
-#: config.c:1473
+#: config.c:1403
+#, c-format
+msgid "malformed value for %s"
+msgstr ""
+
+#: config.c:1429
+#, c-format
+msgid "malformed value for %s: %s"
+msgstr ""
+
+#: config.c:1430
+msgid "must be one of nothing, matching, simple, upstream or current"
+msgstr ""
+
+#: config.c:1489 builtin/pack-objects.c:3282
#, c-format
msgid "bad pack compression level %d"
msgstr ""
-#: config.c:1681
+#: config.c:1610
+#, c-format
+msgid "unable to load config blob object '%s'"
+msgstr ""
+
+#: config.c:1613
+#, c-format
+msgid "reference '%s' does not point to a blob"
+msgstr ""
+
+#: config.c:1630
+#, c-format
+msgid "unable to resolve config blob '%s'"
+msgstr ""
+
+#: config.c:1660
+#, c-format
+msgid "failed to parse %s"
+msgstr ""
+
+#: config.c:1700
msgid "unable to parse command-line config"
msgstr ""
-#: config.c:2013
+#: config.c:2032
msgid "unknown error occurred while reading the configuration files"
msgstr ""
-#: config.c:2200
+#: config.c:2202
#, c-format
msgid "Invalid %s: '%s'"
msgstr ""
-#: config.c:2243
+#: config.c:2245
#, c-format
msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
msgstr ""
-#: config.c:2269
+#: config.c:2271
#, c-format
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
msgstr ""
-#: config.c:2294
+#: config.c:2296
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr ""
-#: config.c:2296
+#: config.c:2298
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr ""
-#: config.c:2402
+#: config.c:2379
+#, c-format
+msgid "invalid section name '%s'"
+msgstr ""
+
+#: config.c:2411
#, c-format
msgid "%s has multiple values"
msgstr ""
-#: config.c:2766 config.c:3019
+#: config.c:2440
+#, c-format
+msgid "failed to write new configuration file %s"
+msgstr ""
+
+#: config.c:2691 config.c:3015
+#, c-format
+msgid "could not lock config file %s"
+msgstr ""
+
+#: config.c:2702
+#, c-format
+msgid "opening %s"
+msgstr ""
+
+#: config.c:2737 builtin/config.c:324
+#, c-format
+msgid "invalid pattern: %s"
+msgstr ""
+
+#: config.c:2762
+#, c-format
+msgid "invalid config file %s"
+msgstr ""
+
+#: config.c:2775 config.c:3028
#, c-format
msgid "fstat on %s failed"
msgstr ""
-#: config.c:2905
+#: config.c:2786
+#, c-format
+msgid "unable to mmap '%s'"
+msgstr ""
+
+#: config.c:2795 config.c:3033
+#, c-format
+msgid "chmod on %s failed"
+msgstr ""
+
+#: config.c:2880 config.c:3130
+#, c-format
+msgid "could not write config file %s"
+msgstr ""
+
+#: config.c:2914
#, c-format
msgid "could not set '%s' to '%s'"
msgstr ""
-#: config.c:2907 builtin/remote.c:779
+#: config.c:2916 builtin/remote.c:781
#, c-format
msgid "could not unset '%s'"
msgstr ""
+#: config.c:3006
+#, c-format
+msgid "invalid section name: %s"
+msgstr ""
+
+#: config.c:3173
+#, c-format
+msgid "missing value for '%s'"
+msgstr ""
+
#: connect.c:61
-msgid "The remote end hung up upon initial contact"
+msgid "the remote end hung up upon initial contact"
msgstr ""
#: connect.c:63
"and the repository exists."
msgstr ""
-#: connected.c:66 builtin/fsck.c:201 builtin/prune.c:145
-msgid "Checking connectivity"
+#: connect.c:81
+#, c-format
+msgid "server doesn't support '%s'"
msgstr ""
-#: connected.c:78
-msgid "Could not run 'git rev-list'"
+#: connect.c:103
+#, c-format
+msgid "server doesn't support feature '%s'"
msgstr ""
-#: connected.c:98
-msgid "failed write to rev-list"
+#: connect.c:114
+msgid "expected flush after capabilities"
msgstr ""
-#: connected.c:105
-msgid "failed to close rev-list's stdin"
+#: connect.c:233
+#, c-format
+msgid "ignoring capabilities after first line '%s'"
msgstr ""
-#: convert.c:206
-#, c-format
-msgid "CRLF would be replaced by LF in %s."
+#: connect.c:252
+msgid "protocol error: unexpected capabilities^{}"
msgstr ""
-#: convert.c:208
+#: connect.c:273
#, c-format
-msgid ""
-"CRLF will be replaced by LF in %s.\n"
-"The file will have its original line endings in your working directory."
+msgid "protocol error: expected shallow sha-1, got '%s'"
msgstr ""
-#: convert.c:216
-#, c-format
-msgid "LF would be replaced by CRLF in %s"
+#: connect.c:275
+msgid "repository on the other end cannot be shallow"
msgstr ""
-#: convert.c:218
+#: connect.c:310 fetch-pack.c:183 builtin/archive.c:63
#, c-format
-msgid ""
-"LF will be replaced by CRLF in %s.\n"
-"The file will have its original line endings in your working directory."
+msgid "remote error: %s"
msgstr ""
-#: convert.c:279
+#: connect.c:316
+msgid "invalid packet"
+msgstr ""
+
+#: connect.c:336
#, c-format
-msgid "BOM is prohibited in '%s' if encoded as %s"
+msgid "protocol error: unexpected '%s'"
msgstr ""
-#: convert.c:286
+#: connect.c:444
#, c-format
-msgid ""
-"The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-"
-"tree-encoding."
+msgid "invalid ls-refs response: %s"
+msgstr ""
+
+#: connect.c:448
+msgid "expected flush after ref listing"
msgstr ""
-#: convert.c:304
+#: connect.c:547
#, c-format
-msgid "BOM is required in '%s' if encoded as %s"
+msgid "protocol '%s' is not supported"
+msgstr ""
+
+#: connect.c:598
+msgid "unable to set SO_KEEPALIVE on socket"
msgstr ""
-#: convert.c:306
+#: connect.c:638 connect.c:701
#, c-format
-msgid ""
-"The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-"
-"%sLE (depending on the byte order) as working-tree-encoding."
+msgid "Looking up %s ... "
msgstr ""
-#: convert.c:424
+#: connect.c:642
#, c-format
-msgid "failed to encode '%s' from %s to %s"
+msgid "unable to look up %s (port %s) (%s)"
msgstr ""
-#: convert.c:467
+#. TRANSLATORS: this is the end of "Looking up %s ... "
+#: connect.c:646 connect.c:717
#, c-format
-msgid "encoding '%s' from %s to %s and back is not the same"
+msgid ""
+"done.\n"
+"Connecting to %s (port %s) ... "
msgstr ""
-#: convert.c:1225
-msgid "true/false are no valid working-tree-encodings"
+#: connect.c:668 connect.c:745
+#, c-format
+msgid ""
+"unable to connect to %s:\n"
+"%s"
msgstr ""
-#: date.c:116
-msgid "in the future"
+#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
+#: connect.c:674 connect.c:751
+msgid "done."
msgstr ""
-#: date.c:122
+#: connect.c:705
#, c-format
-msgid "%<PRIuMAX> second ago"
-msgid_plural "%<PRIuMAX> seconds ago"
-msgstr[0] ""
-msgstr[1] ""
+msgid "unable to look up %s (%s)"
+msgstr ""
-#: date.c:129
+#: connect.c:711
#, c-format
-msgid "%<PRIuMAX> minute ago"
-msgid_plural "%<PRIuMAX> minutes ago"
-msgstr[0] ""
-msgstr[1] ""
+msgid "unknown port %s"
+msgstr ""
-#: date.c:136
+#: connect.c:848 connect.c:1174
#, c-format
-msgid "%<PRIuMAX> hour ago"
-msgid_plural "%<PRIuMAX> hours ago"
-msgstr[0] ""
-msgstr[1] ""
+msgid "strange hostname '%s' blocked"
+msgstr ""
-#: date.c:143
+#: connect.c:850
#, c-format
-msgid "%<PRIuMAX> day ago"
-msgid_plural "%<PRIuMAX> days ago"
-msgstr[0] ""
-msgstr[1] ""
+msgid "strange port '%s' blocked"
+msgstr ""
-#: date.c:149
+#: connect.c:860
#, c-format
-msgid "%<PRIuMAX> week ago"
-msgid_plural "%<PRIuMAX> weeks ago"
-msgstr[0] ""
-msgstr[1] ""
+msgid "cannot start proxy %s"
+msgstr ""
+
+#: connect.c:927
+msgid "no path specified; see 'git help pull' for valid url syntax"
+msgstr ""
+
+#: connect.c:1122
+msgid "ssh variant 'simple' does not support -4"
+msgstr ""
+
+#: connect.c:1134
+msgid "ssh variant 'simple' does not support -6"
+msgstr ""
+
+#: connect.c:1151
+msgid "ssh variant 'simple' does not support setting port"
+msgstr ""
+
+#: connect.c:1262
+#, c-format
+msgid "strange pathname '%s' blocked"
+msgstr ""
+
+#: connect.c:1307
+msgid "unable to fork"
+msgstr ""
+
+#: connected.c:68 builtin/fsck.c:203 builtin/prune.c:146
+msgid "Checking connectivity"
+msgstr ""
+
+#: connected.c:80
+msgid "Could not run 'git rev-list'"
+msgstr ""
+
+#: connected.c:100
+msgid "failed write to rev-list"
+msgstr ""
+
+#: connected.c:107
+msgid "failed to close rev-list's stdin"
+msgstr ""
+
+#: convert.c:194
+#, c-format
+msgid "illegal crlf_action %d"
+msgstr ""
+
+#: convert.c:207
+#, c-format
+msgid "CRLF would be replaced by LF in %s"
+msgstr ""
+
+#: convert.c:209
+#, c-format
+msgid ""
+"CRLF will be replaced by LF in %s.\n"
+"The file will have its original line endings in your working directory"
+msgstr ""
+
+#: convert.c:217
+#, c-format
+msgid "LF would be replaced by CRLF in %s"
+msgstr ""
+
+#: convert.c:219
+#, c-format
+msgid ""
+"LF will be replaced by CRLF in %s.\n"
+"The file will have its original line endings in your working directory"
+msgstr ""
+
+#: convert.c:280
+#, c-format
+msgid "BOM is prohibited in '%s' if encoded as %s"
+msgstr ""
+
+#: convert.c:287
+#, c-format
+msgid ""
+"The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-"
+"tree-encoding."
+msgstr ""
+
+#: convert.c:305
+#, c-format
+msgid "BOM is required in '%s' if encoded as %s"
+msgstr ""
+
+#: convert.c:307
+#, c-format
+msgid ""
+"The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-"
+"%sLE (depending on the byte order) as working-tree-encoding."
+msgstr ""
+
+#: convert.c:425 convert.c:496
+#, c-format
+msgid "failed to encode '%s' from %s to %s"
+msgstr ""
+
+#: convert.c:468
+#, c-format
+msgid "encoding '%s' from %s to %s and back is not the same"
+msgstr ""
+
+#: convert.c:674
+#, c-format
+msgid "cannot fork to run external filter '%s'"
+msgstr ""
+
+#: convert.c:694
+#, c-format
+msgid "cannot feed the input to external filter '%s'"
+msgstr ""
+
+#: convert.c:701
+#, c-format
+msgid "external filter '%s' failed %d"
+msgstr ""
+
+#: convert.c:736 convert.c:739
+#, c-format
+msgid "read from external filter '%s' failed"
+msgstr ""
+
+#: convert.c:742 convert.c:796
+#, c-format
+msgid "external filter '%s' failed"
+msgstr ""
+
+#: convert.c:844
+msgid "unexpected filter type"
+msgstr ""
+
+#: convert.c:855
+msgid "path name too long for external filter"
+msgstr ""
+
+#: convert.c:929
+#, c-format
+msgid ""
+"external filter '%s' is not available anymore although not all paths have "
+"been filtered"
+msgstr ""
+
+#: convert.c:1228
+msgid "true/false are no valid working-tree-encodings"
+msgstr ""
+
+#: convert.c:1402 convert.c:1436
+#, c-format
+msgid "%s: clean filter '%s' failed"
+msgstr ""
+
+#: convert.c:1480
+#, c-format
+msgid "%s: smudge filter %s failed"
+msgstr ""
+
+#: date.c:116
+msgid "in the future"
+msgstr ""
+
+#: date.c:122
+#, c-format
+msgid "%<PRIuMAX> second ago"
+msgid_plural "%<PRIuMAX> seconds ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: date.c:129
+#, c-format
+msgid "%<PRIuMAX> minute ago"
+msgid_plural "%<PRIuMAX> minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: date.c:136
+#, c-format
+msgid "%<PRIuMAX> hour ago"
+msgid_plural "%<PRIuMAX> hours ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: date.c:143
+#, c-format
+msgid "%<PRIuMAX> day ago"
+msgid_plural "%<PRIuMAX> days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: date.c:149
+#, c-format
+msgid "%<PRIuMAX> week ago"
+msgid_plural "%<PRIuMAX> weeks ago"
+msgstr[0] ""
+msgstr[1] ""
#: date.c:156
#, c-format
msgid "failed to read orderfile '%s'"
msgstr ""
-#: diffcore-rename.c:535
+#: diffcore-rename.c:536
msgid "Performing inexact rename detection"
msgstr ""
-#: diff.c:74
+#: diff.c:108
#, c-format
msgid "option '%s' requires a value"
msgstr ""
-#: diff.c:152
+#: diff.c:158
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr ""
-#: diff.c:157
+#: diff.c:163
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr ""
-#: diff.c:281
+#: diff.c:291
msgid ""
-"color moved setting must be one of 'no', 'default', 'zebra', 'dimmed_zebra', "
-"'plain'"
+"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
+"'dimmed-zebra', 'plain'"
msgstr ""
-#: diff.c:341
+#: diff.c:316
+#, c-format
+msgid "ignoring unknown color-moved-ws mode '%s'"
+msgstr ""
+
+#: diff.c:323
+msgid ""
+"color-moved-ws: allow-indentation-change cannot be combined with other white "
+"space modes"
+msgstr ""
+
+#: diff.c:394
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr ""
-#: diff.c:401
+#: diff.c:454
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
"%s"
msgstr ""
-#: diff.c:3823
+#: diff.c:4096
#, c-format
msgid "external diff died, stopping at %s"
msgstr ""
-#: diff.c:4153
+#: diff.c:4427
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
msgstr ""
-#: diff.c:4156
+#: diff.c:4430
msgid "-G, -S and --find-object are mutually exclusive"
msgstr ""
-#: diff.c:4244
+#: diff.c:4508
msgid "--follow requires exactly one pathspec"
msgstr ""
-#: diff.c:4410
+#: diff.c:4674
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
"%s"
msgstr ""
-#: diff.c:4424
+#: diff.c:4688
#, c-format
msgid "Failed to parse --submodule option parameter: '%s'"
msgstr ""
-#: diff.c:5500
+#: diff.c:5766
msgid "inexact rename detection was skipped due to too many files."
msgstr ""
-#: diff.c:5503
+#: diff.c:5769
msgid "only found copies from modified paths due to too many files."
msgstr ""
-#: diff.c:5506
+#: diff.c:5772
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
msgstr ""
-#: dir.c:1867
+#: dir.c:569
+#, c-format
+msgid "pathspec '%s' did not match any file(s) known to git"
+msgstr ""
+
+#: dir.c:958
+#, c-format
+msgid "cannot use %s as an exclude file"
+msgstr ""
+
+#: dir.c:1873
#, c-format
msgid "could not open directory '%s'"
msgstr ""
-#: dir.c:2109
+#: dir.c:2115
msgid "failed to get kernel name and information"
msgstr ""
-#: dir.c:2233
-msgid "Untracked cache is disabled on this system or location."
+#: dir.c:2239
+msgid "untracked cache is disabled on this system or location"
msgstr ""
-#: dir.c:3075 dir.c:3080
+#: dir.c:3037
+#, c-format
+msgid "index file corrupt in repo %s"
+msgstr ""
+
+#: dir.c:3082 dir.c:3087
#, c-format
msgid "could not create directories for %s"
msgstr ""
-#: dir.c:3109
+#: dir.c:3116
#, c-format
msgid "could not migrate git directory from '%s' to '%s'"
msgstr ""
msgid "hint: Waiting for your editor to close the file...%c"
msgstr ""
-#: entry.c:177
+#: entry.c:178
msgid "Filtering content"
msgstr ""
-#: entry.c:435
+#: entry.c:437
#, c-format
msgid "could not stat file '%s'"
msgstr ""
+#: environment.c:150
+#, c-format
+msgid "bad git namespace path \"%s\""
+msgstr ""
+
+#: environment.c:332
+#, c-format
+msgid "could not set GIT_DIR to '%s'"
+msgstr ""
+
+#: exec-cmd.c:361
+#, c-format
+msgid "too many args to run %s"
+msgstr ""
+
#: fetch-object.c:17
msgid "Remote with no URL"
msgstr ""
-#: fetch-pack.c:254
+#: fetch-pack.c:152
msgid "git fetch-pack: expected shallow list"
msgstr ""
-#: fetch-pack.c:266
+#: fetch-pack.c:164
msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
msgstr ""
-#: fetch-pack.c:285 builtin/archive.c:63
-#, c-format
-msgid "remote error: %s"
-msgstr ""
-
-#: fetch-pack.c:286
+#: fetch-pack.c:184
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr ""
-#: fetch-pack.c:338
+#: fetch-pack.c:254
msgid "--stateless-rpc requires multi_ack_detailed"
msgstr ""
-#: fetch-pack.c:429 fetch-pack.c:1310
+#: fetch-pack.c:342 fetch-pack.c:1257
#, c-format
msgid "invalid shallow line: %s"
msgstr ""
-#: fetch-pack.c:435 fetch-pack.c:1316
+#: fetch-pack.c:348 fetch-pack.c:1263
#, c-format
msgid "invalid unshallow line: %s"
msgstr ""
-#: fetch-pack.c:437 fetch-pack.c:1318
+#: fetch-pack.c:350 fetch-pack.c:1265
#, c-format
msgid "object not found: %s"
msgstr ""
-#: fetch-pack.c:440 fetch-pack.c:1321
+#: fetch-pack.c:353 fetch-pack.c:1268
#, c-format
msgid "error in object: %s"
msgstr ""
-#: fetch-pack.c:442 fetch-pack.c:1323
+#: fetch-pack.c:355 fetch-pack.c:1270
#, c-format
msgid "no shallow found: %s"
msgstr ""
-#: fetch-pack.c:445 fetch-pack.c:1326
+#: fetch-pack.c:358 fetch-pack.c:1273
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr ""
-#: fetch-pack.c:486
+#: fetch-pack.c:399
#, c-format
msgid "got %s %d %s"
msgstr ""
-#: fetch-pack.c:500
+#: fetch-pack.c:416
#, c-format
msgid "invalid commit %s"
msgstr ""
-#: fetch-pack.c:533
+#: fetch-pack.c:447
msgid "giving up"
msgstr ""
-#: fetch-pack.c:543 progress.c:229
+#: fetch-pack.c:459 progress.c:229
msgid "done"
msgstr ""
-#: fetch-pack.c:555
+#: fetch-pack.c:471
#, c-format
msgid "got %s (%d) %s"
msgstr ""
-#: fetch-pack.c:601
+#: fetch-pack.c:517
#, c-format
msgid "Marking %s as complete"
msgstr ""
-#: fetch-pack.c:828
+#: fetch-pack.c:764
#, c-format
msgid "already have %s (%s)"
msgstr ""
-#: fetch-pack.c:869
+#: fetch-pack.c:803
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr ""
-#: fetch-pack.c:877
+#: fetch-pack.c:811
msgid "protocol error: bad pack header"
msgstr ""
-#: fetch-pack.c:944
+#: fetch-pack.c:879
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr ""
-#: fetch-pack.c:960
+#: fetch-pack.c:895
#, c-format
msgid "%s failed"
msgstr ""
-#: fetch-pack.c:962
+#: fetch-pack.c:897
msgid "error in sideband demultiplexer"
msgstr ""
-#: fetch-pack.c:989
+#: fetch-pack.c:926
msgid "Server does not support shallow clients"
msgstr ""
-#: fetch-pack.c:993
+#: fetch-pack.c:930
msgid "Server supports multi_ack_detailed"
msgstr ""
-#: fetch-pack.c:996
+#: fetch-pack.c:933
msgid "Server supports no-done"
msgstr ""
-#: fetch-pack.c:1002
+#: fetch-pack.c:939
msgid "Server supports multi_ack"
msgstr ""
-#: fetch-pack.c:1006
+#: fetch-pack.c:943
msgid "Server supports side-band-64k"
msgstr ""
-#: fetch-pack.c:1010
+#: fetch-pack.c:947
msgid "Server supports side-band"
msgstr ""
-#: fetch-pack.c:1014
+#: fetch-pack.c:951
msgid "Server supports allow-tip-sha1-in-want"
msgstr ""
-#: fetch-pack.c:1018
+#: fetch-pack.c:955
msgid "Server supports allow-reachable-sha1-in-want"
msgstr ""
-#: fetch-pack.c:1028
+#: fetch-pack.c:965
msgid "Server supports ofs-delta"
msgstr ""
-#: fetch-pack.c:1034 fetch-pack.c:1204
+#: fetch-pack.c:971 fetch-pack.c:1150
msgid "Server supports filter"
msgstr ""
-#: fetch-pack.c:1042
+#: fetch-pack.c:979
#, c-format
msgid "Server version is %.*s"
msgstr ""
-#: fetch-pack.c:1048
+#: fetch-pack.c:985
msgid "Server does not support --shallow-since"
msgstr ""
-#: fetch-pack.c:1052
+#: fetch-pack.c:989
msgid "Server does not support --shallow-exclude"
msgstr ""
-#: fetch-pack.c:1054
+#: fetch-pack.c:991
msgid "Server does not support --deepen"
msgstr ""
-#: fetch-pack.c:1065
+#: fetch-pack.c:1004
msgid "no common commits"
msgstr ""
-#: fetch-pack.c:1077 fetch-pack.c:1414
+#: fetch-pack.c:1016 fetch-pack.c:1393
msgid "git fetch-pack: fetch failed."
msgstr ""
-#: fetch-pack.c:1199
+#: fetch-pack.c:1145
msgid "Server does not support shallow requests"
msgstr ""
-#: fetch-pack.c:1584
+#: fetch-pack.c:1191
+#, c-format
+msgid "error reading section header '%s'"
+msgstr ""
+
+#: fetch-pack.c:1197
+#, c-format
+msgid "expected '%s', received '%s'"
+msgstr ""
+
+#: fetch-pack.c:1236
+#, c-format
+msgid "unexpected acknowledgment line: '%s'"
+msgstr ""
+
+#: fetch-pack.c:1241
+#, c-format
+msgid "error processing acks: %d"
+msgstr ""
+
+#: fetch-pack.c:1278
+#, c-format
+msgid "error processing shallow info: %d"
+msgstr ""
+
+#: fetch-pack.c:1294
+#, c-format
+msgid "expected wanted-ref, got '%s'"
+msgstr ""
+
+#: fetch-pack.c:1304
+#, c-format
+msgid "unexpected wanted-ref: '%s'"
+msgstr ""
+
+#: fetch-pack.c:1308
+#, c-format
+msgid "error processing wanted refs: %d"
+msgstr ""
+
+#: fetch-pack.c:1603
msgid "no matching remote head"
msgstr ""
-#: fetch-pack.c:1610
+#: fetch-pack.c:1621 builtin/clone.c:664
+msgid "remote did not send all necessary objects"
+msgstr ""
+
+#: fetch-pack.c:1647
#, c-format
msgid "no such remote ref %s"
msgstr ""
-#: fetch-pack.c:1613
+#: fetch-pack.c:1650
#, c-format
msgid "Server does not allow request for unadvertised object %s"
msgstr ""
-#: gpg-interface.c:185
+#: gpg-interface.c:253
msgid "gpg failed to sign the data"
msgstr ""
-#: gpg-interface.c:210
+#: gpg-interface.c:279
msgid "could not create temporary file"
msgstr ""
-#: gpg-interface.c:213
+#: gpg-interface.c:282
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr ""
msgid "ignore invalid color '%.*s' in log.graphColors"
msgstr ""
-#: grep.c:2020
+#: grep.c:2115
#, c-format
msgid "'%s': unable to read %s"
msgstr ""
-#: grep.c:2037 setup.c:164 builtin/clone.c:409 builtin/diff.c:81
+#: grep.c:2132 setup.c:164 builtin/clone.c:410 builtin/diff.c:81
#: builtin/rm.c:134
#, c-format
msgid "failed to stat '%s'"
msgstr ""
-#: grep.c:2048
+#: grep.c:2143
#, c-format
msgid "'%s': short read"
msgstr ""
msgid "The common Git guides are:"
msgstr ""
-#: help.c:467
+#: help.c:552
#, c-format
msgid ""
"'%s' appears to be a git command, but we were not\n"
"able to execute it. Maybe git-%s is broken?"
msgstr ""
-#: help.c:526
+#: help.c:611
msgid "Uh oh. Your system reports no Git commands at all."
msgstr ""
-#: help.c:548
+#: help.c:633
#, c-format
msgid "WARNING: You called a Git command named '%s', which does not exist."
msgstr ""
-#: help.c:553
+#: help.c:638
#, c-format
msgid "Continuing under the assumption that you meant '%s'."
msgstr ""
-#: help.c:558
+#: help.c:643
#, c-format
msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
msgstr ""
-#: help.c:566
+#: help.c:651
#, c-format
msgid "git: '%s' is not a git command. See 'git --help'."
msgstr ""
-#: help.c:570
+#: help.c:655
msgid ""
"\n"
"The most similar command is"
msgstr[0] ""
msgstr[1] ""
-#: help.c:585
+#: help.c:670
msgid "git version [<options>]"
msgstr ""
-#: help.c:652
+#: help.c:738
#, c-format
msgid "%s: %s - %s"
msgstr ""
-#: help.c:656
+#: help.c:742
msgid ""
"\n"
"Did you mean this?"
msgid "name consists only of disallowed characters: %s"
msgstr ""
-#: ident.c:416 builtin/commit.c:587
+#: ident.c:416 builtin/commit.c:600
#, c-format
msgid "invalid date format: %s"
msgstr ""
msgid "Unable to create '%s.lock': %s"
msgstr ""
-#: merge.c:71
+#: merge.c:40
msgid "failed to read the cache"
msgstr ""
-#: merge.c:136 builtin/am.c:1946 builtin/am.c:1980 builtin/checkout.c:378
-#: builtin/checkout.c:606 builtin/clone.c:761
+#: merge.c:105 builtin/am.c:1946 builtin/am.c:1980 builtin/checkout.c:380
+#: builtin/checkout.c:608 builtin/clone.c:763
msgid "unable to write new index file"
msgstr ""
-#: merge-recursive.c:298
+#: merge-recursive.c:303
msgid "(bad commit)\n"
msgstr ""
-#: merge-recursive.c:320
+#: merge-recursive.c:325
#, c-format
msgid "add_cacheinfo failed for path '%s'; merge aborting."
msgstr ""
-#: merge-recursive.c:328
+#: merge-recursive.c:333
#, c-format
msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
msgstr ""
-#: merge-recursive.c:410
+#: merge-recursive.c:415
msgid "error building trees"
msgstr ""
-#: merge-recursive.c:881
+#: merge-recursive.c:886
#, c-format
msgid "failed to create path '%s'%s"
msgstr ""
-#: merge-recursive.c:892
+#: merge-recursive.c:897
#, c-format
msgid "Removing %s to make room for subdirectory\n"
msgstr ""
-#: merge-recursive.c:906 merge-recursive.c:925
+#: merge-recursive.c:911 merge-recursive.c:930
msgid ": perhaps a D/F conflict?"
msgstr ""
-#: merge-recursive.c:915
+#: merge-recursive.c:920
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr ""
-#: merge-recursive.c:957 builtin/cat-file.c:37
+#: merge-recursive.c:962 builtin/cat-file.c:39
#, c-format
msgid "cannot read object %s '%s'"
msgstr ""
-#: merge-recursive.c:959
+#: merge-recursive.c:964
#, c-format
msgid "blob expected for %s '%s'"
msgstr ""
-#: merge-recursive.c:983
+#: merge-recursive.c:988
#, c-format
msgid "failed to open '%s': %s"
msgstr ""
-#: merge-recursive.c:994
+#: merge-recursive.c:999
#, c-format
msgid "failed to symlink '%s': %s"
msgstr ""
-#: merge-recursive.c:999
+#: merge-recursive.c:1004
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr ""
-#: merge-recursive.c:1186
+#: merge-recursive.c:1191
#, c-format
msgid "Failed to merge submodule %s (not checked out)"
msgstr ""
-#: merge-recursive.c:1193
+#: merge-recursive.c:1198
#, c-format
msgid "Failed to merge submodule %s (commits not present)"
msgstr ""
-#: merge-recursive.c:1200
+#: merge-recursive.c:1205
#, c-format
msgid "Failed to merge submodule %s (commits don't follow merge-base)"
msgstr ""
-#: merge-recursive.c:1208 merge-recursive.c:1220
+#: merge-recursive.c:1213 merge-recursive.c:1225
#, c-format
msgid "Fast-forwarding submodule %s to the following commit:"
msgstr ""
-#: merge-recursive.c:1211 merge-recursive.c:1223
+#: merge-recursive.c:1216 merge-recursive.c:1228
#, c-format
msgid "Fast-forwarding submodule %s"
msgstr ""
-#: merge-recursive.c:1245
+#: merge-recursive.c:1250
#, c-format
msgid "Failed to merge submodule %s (merge following commits not found)"
msgstr ""
-#: merge-recursive.c:1249
+#: merge-recursive.c:1254
#, c-format
msgid "Failed to merge submodule %s (not fast-forward)"
msgstr ""
-#: merge-recursive.c:1250
+#: merge-recursive.c:1255
msgid "Found a possible merge resolution for the submodule:\n"
msgstr ""
-#: merge-recursive.c:1253
+#: merge-recursive.c:1258
#, c-format
msgid ""
"If this is correct simply add it to the index for example\n"
"which will accept this suggestion.\n"
msgstr ""
-#: merge-recursive.c:1262
+#: merge-recursive.c:1267
#, c-format
msgid "Failed to merge submodule %s (multiple merges found)"
msgstr ""
-#: merge-recursive.c:1321
+#: merge-recursive.c:1326
msgid "Failed to execute internal merge"
msgstr ""
-#: merge-recursive.c:1326
+#: merge-recursive.c:1331
#, c-format
msgid "Unable to add %s to database"
msgstr ""
-#: merge-recursive.c:1358
+#: merge-recursive.c:1363
#, c-format
msgid "Auto-merging %s"
msgstr ""
-#: merge-recursive.c:1423
+#: merge-recursive.c:1434
#, c-format
msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
msgstr ""
-#: merge-recursive.c:1475
+#: merge-recursive.c:1501
#, 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:1480
+#: merge-recursive.c:1506
#, 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:1487
+#: merge-recursive.c:1513
#, 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:1492
+#: merge-recursive.c:1518
#, 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:1526
+#: merge-recursive.c:1552
msgid "rename"
msgstr ""
-#: merge-recursive.c:1526
+#: merge-recursive.c:1552
msgid "renamed"
msgstr ""
-#: merge-recursive.c:1580 merge-recursive.c:1736 merge-recursive.c:2368
-#: merge-recursive.c:3086
+#: merge-recursive.c:1606 merge-recursive.c:1762 merge-recursive.c:2394
+#: merge-recursive.c:3129
#, c-format
msgid "Refusing to lose dirty file at %s"
msgstr ""
-#: merge-recursive.c:1594
+#: merge-recursive.c:1620
#, c-format
msgid "%s is a directory in %s adding as %s instead"
msgstr ""
-#: merge-recursive.c:1599
+#: merge-recursive.c:1625
#, c-format
msgid "Refusing to lose untracked file at %s; adding as %s instead"
msgstr ""
-#: merge-recursive.c:1625
+#: merge-recursive.c:1651
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
"\"->\"%s\" in \"%s\"%s"
msgstr ""
-#: merge-recursive.c:1630
+#: merge-recursive.c:1656
msgid " (left unresolved)"
msgstr ""
-#: merge-recursive.c:1694
+#: merge-recursive.c:1720
#, c-format
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr ""
-#: merge-recursive.c:1733
+#: merge-recursive.c:1759
#, c-format
msgid "Renaming %s to %s and %s to %s instead"
msgstr ""
-#: merge-recursive.c:1745
+#: merge-recursive.c:1771
#, c-format
msgid "Refusing to lose untracked file at %s, even though it's in the way."
msgstr ""
-#: merge-recursive.c:1951
+#: merge-recursive.c:1977
#, c-format
msgid ""
"CONFLICT (directory rename split): Unclear where to place %s because "
"getting a majority of the files."
msgstr ""
-#: merge-recursive.c:1983
+#: merge-recursive.c:2009
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
"implicit directory rename(s) putting the following path(s) there: %s."
msgstr ""
-#: merge-recursive.c:1993
+#: merge-recursive.c:2019
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
"implicit directory renames tried to put these paths there: %s"
msgstr ""
-#: merge-recursive.c:2085
+#: merge-recursive.c:2111
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
">%s in %s"
msgstr ""
-#: merge-recursive.c:2330
+#: merge-recursive.c:2356
#, c-format
msgid ""
"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
"renamed."
msgstr ""
-#: merge-recursive.c:2736
+#: merge-recursive.c:2762
#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
msgstr ""
-#: merge-recursive.c:2751
+#: merge-recursive.c:2777
#, c-format
msgid "Adding merged %s"
msgstr ""
-#: merge-recursive.c:2758 merge-recursive.c:3089
+#: merge-recursive.c:2784 merge-recursive.c:3132
#, c-format
msgid "Adding as %s instead"
msgstr ""
-#: merge-recursive.c:2914
+#: merge-recursive.c:2941
#, c-format
msgid "cannot read object %s"
msgstr ""
-#: merge-recursive.c:2917
+#: merge-recursive.c:2944
#, c-format
msgid "object %s is not a blob"
msgstr ""
-#: merge-recursive.c:2986
+#: merge-recursive.c:3013
msgid "modify"
msgstr ""
-#: merge-recursive.c:2986
+#: merge-recursive.c:3013
msgid "modified"
msgstr ""
-#: merge-recursive.c:2997
+#: merge-recursive.c:3024
msgid "content"
msgstr ""
-#: merge-recursive.c:3004
+#: merge-recursive.c:3031
msgid "add/add"
msgstr ""
-#: merge-recursive.c:3046
+#: merge-recursive.c:3076
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr ""
-#: merge-recursive.c:3055 git-submodule.sh:895
+#: merge-recursive.c:3098 git-submodule.sh:865
msgid "submodule"
msgstr ""
-#: merge-recursive.c:3056
+#: merge-recursive.c:3099
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr ""
-#: merge-recursive.c:3178
+#: merge-recursive.c:3221
#, c-format
msgid "Removing %s"
msgstr ""
-#: merge-recursive.c:3204
+#: merge-recursive.c:3247
msgid "file/directory"
msgstr ""
-#: merge-recursive.c:3210
+#: merge-recursive.c:3253
msgid "directory/file"
msgstr ""
-#: merge-recursive.c:3217
+#: merge-recursive.c:3260
#, c-format
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
msgstr ""
-#: merge-recursive.c:3226
+#: merge-recursive.c:3269
#, c-format
msgid "Adding %s"
msgstr ""
-#: merge-recursive.c:3267
+#: merge-recursive.c:3303
#, c-format
-msgid "Dirty index: cannot merge (dirty: %s)"
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+" %s"
msgstr ""
-#: merge-recursive.c:3271
+#: merge-recursive.c:3314
msgid "Already up to date!"
msgstr ""
-#: merge-recursive.c:3280
+#: merge-recursive.c:3323
#, c-format
msgid "merging of trees %s and %s failed"
msgstr ""
-#: merge-recursive.c:3379
+#: merge-recursive.c:3422
msgid "Merging:"
msgstr ""
-#: merge-recursive.c:3392
+#: merge-recursive.c:3435
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] ""
msgstr[1] ""
-#: merge-recursive.c:3431
+#: merge-recursive.c:3474
msgid "merge returned no commit"
msgstr ""
-#: merge-recursive.c:3495
+#: merge-recursive.c:3540
#, c-format
msgid "Could not parse object '%s'"
msgstr ""
-#: merge-recursive.c:3511 builtin/merge.c:659 builtin/merge.c:816
+#: merge-recursive.c:3556 builtin/merge.c:689 builtin/merge.c:846
msgid "Unable to write index."
msgstr ""
-#: notes-merge.c:272
+#: notes-merge.c:274
#, c-format
msgid ""
"You have not concluded your previous notes merge (%s exists).\n"
"commit/abort the previous merge before you start a new notes merge."
msgstr ""
-#: notes-merge.c:279
+#: notes-merge.c:281
#, c-format
msgid "You have not concluded your notes merge (%s exists)."
msgstr ""
-#: notes-utils.c:43
+#: notes-utils.c:45
msgid "Cannot commit uninitialized/unreferenced notes tree"
msgstr ""
-#: notes-utils.c:102
+#: notes-utils.c:104
#, c-format
msgid "Bad notes.rewriteMode value: '%s'"
msgstr ""
-#: notes-utils.c:112
+#: notes-utils.c:114
#, c-format
msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
msgstr ""
#. the environment variable, the second %s is
#. its value.
#.
-#: notes-utils.c:142
+#: notes-utils.c:144
#, c-format
msgid "Bad %s value: '%s'"
msgstr ""
-#: object.c:242
+#: object.c:54
+#, c-format
+msgid "invalid object type \"%s\""
+msgstr ""
+
+#: object.c:173
+#, c-format
+msgid "object %s is a %s, not a %s"
+msgstr ""
+
+#: object.c:233
+#, c-format
+msgid "object %s has unknown type id %d"
+msgstr ""
+
+#: object.c:246
#, c-format
msgid "unable to parse object: %s"
msgstr ""
+#: object.c:266 object.c:277
+#, c-format
+msgid "sha1 mismatch %s"
+msgstr ""
+
#: packfile.c:563
msgid "offset before end of packfile (broken .idx?)"
msgstr ""
-#: packfile.c:1742
+#: packfile.c:1745
#, c-format
msgid "offset before start of pack index for %s (corrupt index?)"
msgstr ""
-#: packfile.c:1746
+#: packfile.c:1749
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr ""
-#: parse-options.c:621
+#: parse-options.c:672
msgid "..."
msgstr ""
-#: parse-options.c:640
+#: parse-options.c:691
#, c-format
msgid "usage: %s"
msgstr ""
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation.
#.
-#: parse-options.c:646
+#: parse-options.c:697
#, c-format
msgid " or: %s"
msgstr ""
-#: parse-options.c:649
+#: parse-options.c:700
#, c-format
msgid " %s"
msgstr ""
-#: parse-options.c:688
+#: parse-options.c:739
msgid "-NUM"
msgstr ""
msgid "pathspec '%s' is beyond a symbolic link"
msgstr ""
+#: pkt-line.c:104
+msgid "flush packet write failed"
+msgstr ""
+
+#: pkt-line.c:142 pkt-line.c:228
+msgid "protocol error: impossibly long line"
+msgstr ""
+
+#: pkt-line.c:158 pkt-line.c:160
+msgid "packet write with format failed"
+msgstr ""
+
+#: pkt-line.c:192
+msgid "packet write failed - data exceeds max packet size"
+msgstr ""
+
+#: pkt-line.c:199 pkt-line.c:206
+msgid "packet write failed"
+msgstr ""
+
+#: pkt-line.c:291
+msgid "read error"
+msgstr ""
+
+#: pkt-line.c:299
+msgid "the remote end hung up unexpectedly"
+msgstr ""
+
+#: pkt-line.c:327
+#, c-format
+msgid "protocol error: bad line length character: %.4s"
+msgstr ""
+
+#: pkt-line.c:337 pkt-line.c:342
+#, c-format
+msgid "protocol error: bad line length %d"
+msgstr ""
+
#: pretty.c:962
msgid "unable to parse --pretty format"
msgstr ""
-#: read-cache.c:1500
+#: range-diff.c:48
+msgid "could not start `log`"
+msgstr ""
+
+#: range-diff.c:51
+msgid "could not read `log` output"
+msgstr ""
+
+#: range-diff.c:66 sequencer.c:4540
+#, c-format
+msgid "could not parse commit '%s'"
+msgstr ""
+
+#: range-diff.c:196
+msgid "failed to generate diff"
+msgstr ""
+
+#: range-diff.c:421 range-diff.c:423
+#, c-format
+msgid "could not parse log for '%s'"
+msgstr ""
+
+#: read-cache.c:1579
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
"Using version %i"
msgstr ""
-#: read-cache.c:1510
+#: read-cache.c:1589
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
"Using version %i"
msgstr ""
-#: read-cache.c:2404 sequencer.c:4338 wrapper.c:658 builtin/merge.c:1048
+#: read-cache.c:2580 sequencer.c:4503 wrapper.c:658 builtin/merge.c:1083
#, c-format
msgid "could not close '%s'"
msgstr ""
-#: read-cache.c:2477 sequencer.c:2102 sequencer.c:3234
+#: read-cache.c:2653 sequencer.c:2113 sequencer.c:3374
#, c-format
msgid "could not stat '%s'"
msgstr ""
-#: read-cache.c:2490
+#: read-cache.c:2666
#, c-format
msgid "unable to open git dir: %s"
msgstr ""
-#: read-cache.c:2502
+#: read-cache.c:2678
#, c-format
msgid "unable to unlink: %s"
msgstr ""
-#: refs.c:732 sequencer.c:4334 sequencer.c:4393 wrapper.c:225 wrapper.c:395
-#: builtin/am.c:779
+#: refs.c:192
+#, c-format
+msgid "%s does not point to a valid object!"
+msgstr ""
+
+#: refs.c:579
+#, c-format
+msgid "ignoring dangling symref %s"
+msgstr ""
+
+#: refs.c:581 ref-filter.c:2067
+#, c-format
+msgid "ignoring broken ref %s"
+msgstr ""
+
+#: refs.c:685
+#, c-format
+msgid "could not open '%s' for writing: %s"
+msgstr ""
+
+#: refs.c:695 refs.c:746
+#, c-format
+msgid "could not read ref '%s'"
+msgstr ""
+
+#: refs.c:701
+#, c-format
+msgid "ref '%s' already exists"
+msgstr ""
+
+#: refs.c:706
+#, c-format
+msgid "unexpected object ID when writing '%s'"
+msgstr ""
+
+#: refs.c:714 sequencer.c:385 sequencer.c:2366 sequencer.c:2492
+#: sequencer.c:2506 sequencer.c:2733 sequencer.c:4501 sequencer.c:4564
+#: wrapper.c:656
+#, c-format
+msgid "could not write to '%s'"
+msgstr ""
+
+#: refs.c:741 sequencer.c:4499 sequencer.c:4558 wrapper.c:225 wrapper.c:395
+#: builtin/am.c:780
+#, c-format
+msgid "could not open '%s' for writing"
+msgstr ""
+
+#: refs.c:748
+#, c-format
+msgid "unexpected object ID when deleting '%s'"
+msgstr ""
+
+#: refs.c:879
+#, c-format
+msgid "log for ref %s has gap after %s"
+msgstr ""
+
+#: refs.c:885
+#, c-format
+msgid "log for ref %s unexpectedly ended on %s"
+msgstr ""
+
+#: refs.c:943
+#, c-format
+msgid "log for %s is empty"
+msgstr ""
+
+#: refs.c:1035
+#, c-format
+msgid "refusing to update ref with bad name '%s'"
+msgstr ""
+
+#: refs.c:1111
+#, c-format
+msgid "update_ref failed for ref '%s': %s"
+msgstr ""
+
+#: refs.c:1853
+#, c-format
+msgid "multiple updates for ref '%s' not allowed"
+msgstr ""
+
+#: refs.c:1885
+msgid "ref updates forbidden inside quarantine environment"
+msgstr ""
+
+#: refs.c:1981 refs.c:2011
#, c-format
-msgid "could not open '%s' for writing"
+msgid "'%s' exists; cannot create '%s'"
msgstr ""
-#: refs.c:1880
-msgid "ref updates forbidden inside quarantine environment"
+#: refs.c:1987 refs.c:2022
+#, c-format
+msgid "cannot process '%s' and '%s' at the same time"
msgstr ""
#: refs/files-backend.c:1191
msgid "could not remove reference %s"
msgstr ""
-#: refs/files-backend.c:1205 refs/packed-backend.c:1531
-#: refs/packed-backend.c:1541
+#: refs/files-backend.c:1205 refs/packed-backend.c:1532
+#: refs/packed-backend.c:1542
#, c-format
msgid "could not delete reference %s: %s"
msgstr ""
-#: refs/files-backend.c:1208 refs/packed-backend.c:1544
+#: refs/files-backend.c:1208 refs/packed-backend.c:1545
#, c-format
msgid "could not delete references: %s"
msgstr ""
-#: ref-filter.c:35 wt-status.c:1850
+#: refspec.c:137
+#, c-format
+msgid "invalid refspec '%s'"
+msgstr ""
+
+#: ref-filter.c:38 wt-status.c:1850
msgid "gone"
msgstr ""
-#: ref-filter.c:36
+#: ref-filter.c:39
#, c-format
msgid "ahead %d"
msgstr ""
-#: ref-filter.c:37
+#: ref-filter.c:40
#, c-format
msgid "behind %d"
msgstr ""
-#: ref-filter.c:38
+#: ref-filter.c:41
#, c-format
msgid "ahead %d, behind %d"
msgstr ""
-#: ref-filter.c:121
+#: ref-filter.c:137
#, c-format
msgid "expected format: %%(color:<color>)"
msgstr ""
-#: ref-filter.c:123
+#: ref-filter.c:139
#, c-format
msgid "unrecognized color: %%(color:%s)"
msgstr ""
-#: ref-filter.c:145
+#: ref-filter.c:161
#, c-format
msgid "Integer value expected refname:lstrip=%s"
msgstr ""
-#: ref-filter.c:149
+#: ref-filter.c:165
#, c-format
msgid "Integer value expected refname:rstrip=%s"
msgstr ""
-#: ref-filter.c:151
+#: ref-filter.c:167
#, c-format
msgid "unrecognized %%(%s) argument: %s"
msgstr ""
-#: ref-filter.c:206
+#: ref-filter.c:222
+#, c-format
+msgid "%%(objecttype) does not take arguments"
+msgstr ""
+
+#: ref-filter.c:234
+#, c-format
+msgid "%%(objectsize) does not take arguments"
+msgstr ""
+
+#: ref-filter.c:246
#, c-format
msgid "%%(body) does not take arguments"
msgstr ""
-#: ref-filter.c:215
+#: ref-filter.c:255
#, c-format
msgid "%%(subject) does not take arguments"
msgstr ""
-#: ref-filter.c:235
+#: ref-filter.c:275
#, c-format
msgid "unknown %%(trailers) argument: %s"
msgstr ""
-#: ref-filter.c:264
+#: ref-filter.c:304
#, c-format
msgid "positive value expected contents:lines=%s"
msgstr ""
-#: ref-filter.c:266
+#: ref-filter.c:306
#, c-format
msgid "unrecognized %%(contents) argument: %s"
msgstr ""
-#: ref-filter.c:281
+#: ref-filter.c:321
#, c-format
msgid "positive value expected objectname:short=%s"
msgstr ""
-#: ref-filter.c:285
+#: ref-filter.c:325
#, c-format
msgid "unrecognized %%(objectname) argument: %s"
msgstr ""
-#: ref-filter.c:315
+#: ref-filter.c:355
#, c-format
msgid "expected format: %%(align:<width>,<position>)"
msgstr ""
-#: ref-filter.c:327
+#: ref-filter.c:367
#, c-format
msgid "unrecognized position:%s"
msgstr ""
-#: ref-filter.c:334
+#: ref-filter.c:374
#, c-format
msgid "unrecognized width:%s"
msgstr ""
-#: ref-filter.c:343
+#: ref-filter.c:383
#, c-format
msgid "unrecognized %%(align) argument: %s"
msgstr ""
-#: ref-filter.c:351
+#: ref-filter.c:391
#, c-format
msgid "positive width expected with the %%(align) atom"
msgstr ""
-#: ref-filter.c:369
+#: ref-filter.c:409
#, c-format
msgid "unrecognized %%(if) argument: %s"
msgstr ""
-#: ref-filter.c:464
+#: ref-filter.c:505
#, c-format
msgid "malformed field name: %.*s"
msgstr ""
-#: ref-filter.c:491
+#: ref-filter.c:532
#, c-format
msgid "unknown field name: %.*s"
msgstr ""
-#: ref-filter.c:608
+#: ref-filter.c:656
#, c-format
msgid "format: %%(if) atom used without a %%(then) atom"
msgstr ""
-#: ref-filter.c:671
+#: ref-filter.c:719
#, c-format
msgid "format: %%(then) atom used without an %%(if) atom"
msgstr ""
-#: ref-filter.c:673
+#: ref-filter.c:721
#, c-format
msgid "format: %%(then) atom used more than once"
msgstr ""
-#: ref-filter.c:675
+#: ref-filter.c:723
#, c-format
msgid "format: %%(then) atom used after %%(else)"
msgstr ""
-#: ref-filter.c:703
+#: ref-filter.c:751
#, c-format
msgid "format: %%(else) atom used without an %%(if) atom"
msgstr ""
-#: ref-filter.c:705
+#: ref-filter.c:753
#, c-format
msgid "format: %%(else) atom used without a %%(then) atom"
msgstr ""
-#: ref-filter.c:707
+#: ref-filter.c:755
#, c-format
msgid "format: %%(else) atom used more than once"
msgstr ""
-#: ref-filter.c:722
+#: ref-filter.c:770
#, c-format
msgid "format: %%(end) atom used without corresponding atom"
msgstr ""
-#: ref-filter.c:779
+#: ref-filter.c:827
#, c-format
msgid "malformed format string %s"
msgstr ""
-#: ref-filter.c:1387
+#: ref-filter.c:1416
#, c-format
msgid "(no branch, rebasing %s)"
msgstr ""
-#: ref-filter.c:1390
+#: ref-filter.c:1419
#, c-format
msgid "(no branch, rebasing detached HEAD %s)"
msgstr ""
-#: ref-filter.c:1393
+#: ref-filter.c:1422
#, 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:1401
+#: ref-filter.c:1430
#, c-format
msgid "(HEAD detached at %s)"
msgstr ""
#. TRANSLATORS: make sure this matches "HEAD
#. detached from " in wt-status.c
#.
-#: ref-filter.c:1408
+#: ref-filter.c:1437
#, c-format
msgid "(HEAD detached from %s)"
msgstr ""
-#: ref-filter.c:1412
+#: ref-filter.c:1441
msgid "(no branch)"
msgstr ""
-#: ref-filter.c:1442
+#: ref-filter.c:1475 ref-filter.c:1623
#, c-format
msgid "missing object %s for %s"
msgstr ""
-#: ref-filter.c:1445
+#: ref-filter.c:1483
#, c-format
msgid "parse_object_buffer failed on %s for %s"
msgstr ""
-#: ref-filter.c:1902
+#: ref-filter.c:1980
#, c-format
msgid "malformed object at '%s'"
msgstr ""
-#: ref-filter.c:1984
+#: ref-filter.c:2062
#, c-format
msgid "ignoring ref with broken name %s"
msgstr ""
-#: ref-filter.c:1989
-#, c-format
-msgid "ignoring broken ref %s"
-msgstr ""
-
-#: ref-filter.c:2261
+#: ref-filter.c:2340
#, c-format
msgid "format: %%(end) atom missing"
msgstr ""
-#: ref-filter.c:2365
+#: ref-filter.c:2444
#, c-format
msgid "malformed object name %s"
msgstr ""
-#: remote.c:605
+#: remote.c:606
#, c-format
msgid "Cannot fetch both %s and %s to %s"
msgstr ""
-#: remote.c:609
+#: remote.c:610
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr ""
-#: remote.c:613
+#: remote.c:614
#, c-format
msgid "%s tracks both %s and %s"
msgstr ""
-#: remote.c:621
+#: remote.c:622
msgid "Internal error"
msgstr ""
-#: remote.c:1534 remote.c:1635
+#: remote.c:1536 remote.c:1637
msgid "HEAD does not point to a branch"
msgstr ""
-#: remote.c:1543
+#: remote.c:1545
#, c-format
msgid "no such branch: '%s'"
msgstr ""
-#: remote.c:1546
+#: remote.c:1548
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr ""
-#: remote.c:1552
+#: remote.c:1554
#, c-format
msgid "upstream branch '%s' not stored as a remote-tracking branch"
msgstr ""
-#: remote.c:1567
+#: remote.c:1569
#, c-format
msgid "push destination '%s' on remote '%s' has no local tracking branch"
msgstr ""
-#: remote.c:1579
+#: remote.c:1581
#, c-format
msgid "branch '%s' has no remote for pushing"
msgstr ""
-#: remote.c:1589
+#: remote.c:1591
#, c-format
msgid "push refspecs for '%s' do not include '%s'"
msgstr ""
-#: remote.c:1602
+#: remote.c:1604
msgid "push has no destination (push.default is 'nothing')"
msgstr ""
-#: remote.c:1624
+#: remote.c:1626
msgid "cannot resolve 'simple' push to a single destination"
msgstr ""
-#: remote.c:1939
+#: remote.c:1951
#, c-format
msgid "Your branch is based on '%s', but the upstream is gone.\n"
msgstr ""
-#: remote.c:1943
+#: remote.c:1955
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr ""
-#: remote.c:1946
+#: remote.c:1958
#, c-format
msgid "Your branch is up to date with '%s'.\n"
msgstr ""
-#: remote.c:1950
+#: remote.c:1962
#, c-format
msgid "Your branch and '%s' refer to different commits.\n"
msgstr ""
-#: remote.c:1953
+#: remote.c:1965
#, c-format
msgid " (use \"%s\" for details)\n"
msgstr ""
-#: remote.c:1957
+#: remote.c:1969
#, c-format
msgid "Your branch is ahead of '%s' by %d commit.\n"
msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
msgstr[0] ""
msgstr[1] ""
-#: remote.c:1963
+#: remote.c:1975
msgid " (use \"git push\" to publish your local commits)\n"
msgstr ""
-#: remote.c:1966
+#: remote.c:1978
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: remote.c:1974
+#: remote.c:1986
msgid " (use \"git pull\" to update your local branch)\n"
msgstr ""
-#: remote.c:1977
+#: remote.c:1989
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
msgstr[0] ""
msgstr[1] ""
-#: remote.c:1987
+#: remote.c:1999
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr ""
-#: revision.c:2289
+#: replace-object.c:20
+#, c-format
+msgid "bad replace ref name: %s"
+msgstr ""
+
+#: replace-object.c:29
+#, c-format
+msgid "duplicate replace ref: %s"
+msgstr ""
+
+#: replace-object.c:72
+#, c-format
+msgid "replace depth too high for object %s"
+msgstr ""
+
+#: revision.c:2305
msgid "your current branch appears to be broken"
msgstr ""
-#: revision.c:2292
+#: revision.c:2308
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr ""
-#: revision.c:2489
+#: revision.c:2505
msgid "--first-parent is incompatible with --bisect"
msgstr ""
"You can disable this warning with `git config advice.ignoredHook false`."
msgstr ""
-#: send-pack.c:141
+#: send-pack.c:142
msgid "unexpected flush packet while reading remote unpack status"
msgstr ""
-#: send-pack.c:143
+#: send-pack.c:144
#, c-format
msgid "unable to parse remote unpack status: %s"
msgstr ""
-#: send-pack.c:145
+#: send-pack.c:146
#, c-format
msgid "remote unpack failed: %s"
msgstr ""
-#: send-pack.c:308
+#: send-pack.c:309
msgid "failed to sign the push certificate"
msgstr ""
-#: send-pack.c:421
+#: send-pack.c:422
msgid "the receiving end does not support --signed push"
msgstr ""
-#: send-pack.c:423
+#: send-pack.c:424
msgid ""
"not sending a push certificate since the receiving end does not support --"
"signed push"
msgstr ""
-#: send-pack.c:435
+#: send-pack.c:436
msgid "the receiving end does not support --atomic push"
msgstr ""
-#: send-pack.c:440
+#: send-pack.c:441
msgid "the receiving end does not support push options"
msgstr ""
-#: sequencer.c:175
+#: sequencer.c:177
#, c-format
msgid "invalid commit message cleanup mode '%s'"
msgstr ""
-#: sequencer.c:275
+#: sequencer.c:278
#, c-format
msgid "could not delete '%s'"
msgstr ""
-#: sequencer.c:301
+#: sequencer.c:304
msgid "revert"
msgstr ""
-#: sequencer.c:303
+#: sequencer.c:306
msgid "cherry-pick"
msgstr ""
-#: sequencer.c:305
+#: sequencer.c:308
msgid "rebase -i"
msgstr ""
-#: sequencer.c:307
+#: sequencer.c:310
#, c-format
-msgid "Unknown action: %d"
+msgid "unknown action: %d"
msgstr ""
-#: sequencer.c:364
+#: sequencer.c:367
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
msgstr ""
-#: sequencer.c:367
+#: sequencer.c:370
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:380 sequencer.c:2468
+#: sequencer.c:383 sequencer.c:2488
#, c-format
msgid "could not lock '%s'"
msgstr ""
-#: sequencer.c:382 sequencer.c:2346 sequencer.c:2472 sequencer.c:2486
-#: sequencer.c:2694 sequencer.c:4336 sequencer.c:4399 wrapper.c:656
-#, c-format
-msgid "could not write to '%s'"
-msgstr ""
-
-#: sequencer.c:387
+#: sequencer.c:390
#, c-format
msgid "could not write eol to '%s'"
msgstr ""
-#: sequencer.c:392 sequencer.c:2351 sequencer.c:2474 sequencer.c:2488
-#: sequencer.c:2702
+#: sequencer.c:395 sequencer.c:2371 sequencer.c:2494 sequencer.c:2508
+#: sequencer.c:2741
#, c-format
msgid "failed to finalize '%s'"
msgstr ""
-#: sequencer.c:415 sequencer.c:804 sequencer.c:1493 sequencer.c:2371
-#: sequencer.c:2684 sequencer.c:2788 builtin/am.c:259 builtin/commit.c:727
-#: builtin/merge.c:1046
+#: sequencer.c:418 sequencer.c:816 sequencer.c:1505 sequencer.c:2391
+#: sequencer.c:2723 sequencer.c:2827 builtin/am.c:260 builtin/commit.c:740
+#: builtin/merge.c:1081
#, c-format
msgid "could not read '%s'"
msgstr ""
-#: sequencer.c:441
+#: sequencer.c:444
#, c-format
msgid "your local changes would be overwritten by %s."
msgstr ""
-#: sequencer.c:445
+#: sequencer.c:448
msgid "commit your changes or stash them to proceed."
msgstr ""
-#: sequencer.c:474
+#: sequencer.c:477
#, c-format
msgid "%s: fast-forward"
msgstr ""
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
#. "rebase -i".
#.
-#: sequencer.c:563
+#: sequencer.c:566
#, c-format
msgid "%s: Unable to write new index file"
msgstr ""
-#: sequencer.c:579
+#: sequencer.c:582
msgid "unable to update cache tree"
msgstr ""
-#: sequencer.c:592
+#: sequencer.c:595
msgid "could not resolve HEAD commit"
msgstr ""
-#: sequencer.c:749
+#: sequencer.c:723
+#, c-format
+msgid "could not parse '%s' (looking for '%s'"
+msgstr ""
+
+#: sequencer.c:731
+#, c-format
+msgid "bad quoting on %s value in '%s'"
+msgstr ""
+
+#: sequencer.c:740
+#, c-format
+msgid "could not parse '%s' (looking for '%s')"
+msgstr ""
+
+#: sequencer.c:747
+#, c-format
+msgid "invalid date format '%s' in '%s'"
+msgstr ""
+
+#: sequencer.c:761
#, c-format
msgid ""
"you have staged changes in your working tree\n"
" git rebase --continue\n"
msgstr ""
-#: sequencer.c:818
+#: sequencer.c:830
msgid "writing root commit"
msgstr ""
-#: sequencer.c:1043
+#: sequencer.c:1055
msgid "'prepare-commit-msg' hook failed"
msgstr ""
-#: sequencer.c:1050
+#: sequencer.c:1062
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
" git commit --amend --reset-author\n"
msgstr ""
-#: sequencer.c:1063
+#: sequencer.c:1075
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
" git commit --amend --reset-author\n"
msgstr ""
-#: sequencer.c:1103
+#: sequencer.c:1115
msgid "couldn't look up newly created commit"
msgstr ""
-#: sequencer.c:1105
+#: sequencer.c:1117
msgid "could not parse newly created commit"
msgstr ""
-#: sequencer.c:1151
+#: sequencer.c:1163
msgid "unable to resolve HEAD after creating commit"
msgstr ""
-#: sequencer.c:1153
+#: sequencer.c:1165
msgid "detached HEAD"
msgstr ""
-#: sequencer.c:1157
+#: sequencer.c:1169
msgid " (root-commit)"
msgstr ""
-#: sequencer.c:1178
+#: sequencer.c:1190
msgid "could not parse HEAD"
msgstr ""
-#: sequencer.c:1180
+#: sequencer.c:1192
#, c-format
msgid "HEAD %s is not a commit!"
msgstr ""
-#: sequencer.c:1184 builtin/commit.c:1528
+#: sequencer.c:1196 builtin/commit.c:1528
msgid "could not parse HEAD commit"
msgstr ""
-#: sequencer.c:1235 sequencer.c:1832
+#: sequencer.c:1247 sequencer.c:1845
msgid "unable to parse commit author"
msgstr ""
-#: sequencer.c:1245 builtin/am.c:1630 builtin/merge.c:645
+#: sequencer.c:1257 builtin/am.c:1632 builtin/merge.c:675
msgid "git write-tree failed to write a tree"
msgstr ""
-#: sequencer.c:1262 sequencer.c:1317
+#: sequencer.c:1274 sequencer.c:1329
#, c-format
msgid "unable to read commit message from '%s'"
msgstr ""
-#: sequencer.c:1284 builtin/am.c:1650 builtin/commit.c:1631 builtin/merge.c:825
-#: builtin/merge.c:850
+#: sequencer.c:1296 builtin/am.c:1653 builtin/commit.c:1631 builtin/merge.c:855
+#: builtin/merge.c:880
msgid "failed to write commit object"
msgstr ""
-#: sequencer.c:1344
+#: sequencer.c:1356
#, c-format
msgid "could not parse commit %s"
msgstr ""
-#: sequencer.c:1349
+#: sequencer.c:1361
#, c-format
msgid "could not parse parent commit %s"
msgstr ""
-#: sequencer.c:1500 sequencer.c:1525
+#: sequencer.c:1457 sequencer.c:1565
+#, c-format
+msgid "unknown command: %d"
+msgstr ""
+
+#: sequencer.c:1512 sequencer.c:1537
#, c-format
msgid "This is a combination of %d commits."
msgstr ""
-#: sequencer.c:1510 sequencer.c:4355
+#: sequencer.c:1522 sequencer.c:4520
msgid "need a HEAD to fixup"
msgstr ""
-#: sequencer.c:1512 sequencer.c:2729
+#: sequencer.c:1524 sequencer.c:2768
msgid "could not read HEAD"
msgstr ""
-#: sequencer.c:1514
+#: sequencer.c:1526
msgid "could not read HEAD's commit message"
msgstr ""
-#: sequencer.c:1520
+#: sequencer.c:1532
#, c-format
msgid "cannot write '%s'"
msgstr ""
-#: sequencer.c:1527 git-rebase--interactive.sh:457
+#: sequencer.c:1539 git-rebase--preserve-merges.sh:441
msgid "This is the 1st commit message:"
msgstr ""
-#: sequencer.c:1535
+#: sequencer.c:1547
#, c-format
msgid "could not read commit message of %s"
msgstr ""
-#: sequencer.c:1542
+#: sequencer.c:1554
#, c-format
msgid "This is the commit message #%d:"
msgstr ""
-#: sequencer.c:1548
+#: sequencer.c:1560
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr ""
-#: sequencer.c:1553
-#, c-format
-msgid "unknown command: %d"
-msgstr ""
-
-#: sequencer.c:1631
+#: sequencer.c:1643
msgid "your index file is unmerged."
msgstr ""
-#: sequencer.c:1638
+#: sequencer.c:1650
msgid "cannot fixup root commit"
msgstr ""
-#: sequencer.c:1657
+#: sequencer.c:1669
#, c-format
msgid "commit %s is a merge but no -m option was given."
msgstr ""
-#: sequencer.c:1665
+#: sequencer.c:1677
#, c-format
msgid "commit %s does not have parent %d"
msgstr ""
-#: sequencer.c:1669
+#: sequencer.c:1681
#, c-format
msgid "mainline was specified but commit %s is not a merge."
msgstr ""
-#: sequencer.c:1675
+#: sequencer.c:1687
#, 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:1694
+#: sequencer.c:1706
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr ""
-#: sequencer.c:1759
+#: sequencer.c:1771
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr ""
-#: sequencer.c:1813
+#: sequencer.c:1826
#, c-format
msgid "could not revert %s... %s"
msgstr ""
-#: sequencer.c:1814
+#: sequencer.c:1827
#, c-format
msgid "could not apply %s... %s"
msgstr ""
-#: sequencer.c:1864
-msgid "empty commit set passed"
-msgstr ""
-
-#: sequencer.c:1874
+#: sequencer.c:1885
#, c-format
msgid "git %s: failed to read the index"
msgstr ""
-#: sequencer.c:1881
+#: sequencer.c:1892
#, c-format
msgid "git %s: failed to refresh the index"
msgstr ""
-#: sequencer.c:1961
+#: sequencer.c:1972
#, c-format
msgid "%s does not accept arguments: '%s'"
msgstr ""
-#: sequencer.c:1970
+#: sequencer.c:1981
#, c-format
msgid "missing arguments for %s"
msgstr ""
-#: sequencer.c:2029
+#: sequencer.c:2040
#, c-format
msgid "invalid line %d: %.*s"
msgstr ""
-#: sequencer.c:2037
+#: sequencer.c:2048
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr ""
-#: sequencer.c:2085 sequencer.c:4138 sequencer.c:4173
+#: sequencer.c:2096 sequencer.c:4277 sequencer.c:4333
#, c-format
msgid "could not read '%s'."
msgstr ""
-#: sequencer.c:2108
+#: sequencer.c:2119
msgid "please fix this using 'git rebase --edit-todo'."
msgstr ""
-#: sequencer.c:2110
+#: sequencer.c:2121
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr ""
-#: sequencer.c:2115
+#: sequencer.c:2126
msgid "no commits parsed."
msgstr ""
-#: sequencer.c:2126
+#: sequencer.c:2137
msgid "cannot cherry-pick during a revert."
msgstr ""
-#: sequencer.c:2128
+#: sequencer.c:2139
msgid "cannot revert during a cherry-pick."
msgstr ""
-#: sequencer.c:2195
-#, c-format
-msgid "invalid key: %s"
-msgstr ""
-
-#: sequencer.c:2198
+#: sequencer.c:2209
#, c-format
msgid "invalid value for %s: %s"
msgstr ""
-#: sequencer.c:2269
+#: sequencer.c:2285
msgid "unusable squash-onto"
msgstr ""
-#: sequencer.c:2285
+#: sequencer.c:2301
#, c-format
msgid "malformed options sheet: '%s'"
msgstr ""
-#: sequencer.c:2323
+#: sequencer.c:2335 sequencer.c:3775
+msgid "empty commit set passed"
+msgstr ""
+
+#: sequencer.c:2343
msgid "a cherry-pick or revert is already in progress"
msgstr ""
-#: sequencer.c:2324
+#: sequencer.c:2344
msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
msgstr ""
-#: sequencer.c:2327
+#: sequencer.c:2347
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr ""
-#: sequencer.c:2341
+#: sequencer.c:2361
msgid "could not lock HEAD"
msgstr ""
-#: sequencer.c:2396 sequencer.c:3403
+#: sequencer.c:2416 sequencer.c:3543
msgid "no cherry-pick or revert in progress"
msgstr ""
-#: sequencer.c:2398
+#: sequencer.c:2418
msgid "cannot resolve HEAD"
msgstr ""
-#: sequencer.c:2400 sequencer.c:2435
+#: sequencer.c:2420 sequencer.c:2455
msgid "cannot abort from a branch yet to be born"
msgstr ""
-#: sequencer.c:2421 builtin/grep.c:720
+#: sequencer.c:2441 builtin/grep.c:721
#, c-format
msgid "cannot open '%s'"
msgstr ""
-#: sequencer.c:2423
+#: sequencer.c:2443
#, c-format
msgid "cannot read '%s': %s"
msgstr ""
-#: sequencer.c:2424
+#: sequencer.c:2444
msgid "unexpected end of file"
msgstr ""
-#: sequencer.c:2430
+#: sequencer.c:2450
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr ""
-#: sequencer.c:2441
+#: sequencer.c:2461
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr ""
-#: sequencer.c:2545 sequencer.c:3321
+#: sequencer.c:2565 sequencer.c:3461
#, c-format
msgid "could not update %s"
msgstr ""
-#: sequencer.c:2583 sequencer.c:3301
+#: sequencer.c:2603 sequencer.c:3441
msgid "cannot read HEAD"
msgstr ""
-#: sequencer.c:2618 sequencer.c:2622 builtin/difftool.c:639
+#: sequencer.c:2618
+#, c-format
+msgid "unable to copy '%s' to '%s'"
+msgstr ""
+
+#: sequencer.c:2626
+#, c-format
+msgid ""
+"You can amend the commit now, with\n"
+"\n"
+" git commit --amend %s\n"
+"\n"
+"Once you are satisfied with your changes, run\n"
+"\n"
+" git rebase --continue\n"
+msgstr ""
+
+#: sequencer.c:2636
+#, c-format
+msgid "Could not apply %s... %.*s"
+msgstr ""
+
+#: sequencer.c:2643
+#, c-format
+msgid "Could not merge %.*s"
+msgstr ""
+
+#: sequencer.c:2654 sequencer.c:2658 builtin/difftool.c:640
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr ""
-#: sequencer.c:2641
+#: sequencer.c:2680 sequencer.c:3095
msgid "could not read index"
msgstr ""
-#: sequencer.c:2646
+#: sequencer.c:2685
#, c-format
msgid ""
"execution failed: %s\n"
"\n"
msgstr ""
-#: sequencer.c:2652
+#: sequencer.c:2691
msgid "and made changes to the index and/or the working tree\n"
msgstr ""
-#: sequencer.c:2658
+#: sequencer.c:2697
#, c-format
msgid ""
"execution succeeded: %s\n"
"\n"
msgstr ""
-#: sequencer.c:2771
+#: sequencer.c:2758
+#, c-format
+msgid "illegal label name: '%.*s'"
+msgstr ""
+
+#: sequencer.c:2810
msgid "writing fake root commit"
msgstr ""
-#: sequencer.c:2776
+#: sequencer.c:2815
msgid "writing squash-onto"
msgstr ""
-#: sequencer.c:2811
+#: sequencer.c:2850
#, c-format
msgid "failed to find tree of %s"
msgstr ""
-#: sequencer.c:2829
+#: sequencer.c:2868
msgid "could not write index"
msgstr ""
-#: sequencer.c:2861
+#: sequencer.c:2895
+#, c-format
+msgid "could not resolve '%s'"
+msgstr ""
+
+#: sequencer.c:2921
msgid "cannot merge without a current revision"
msgstr ""
-#: sequencer.c:2884
+#: sequencer.c:2943
#, c-format
-msgid "could not resolve '%s'"
+msgid "unable to parse '%.*s'"
msgstr ""
-#: sequencer.c:2906
+#: sequencer.c:2952
+#, c-format
+msgid "nothing to merge: '%.*s'"
+msgstr ""
+
+#: sequencer.c:2964
+msgid "octopus merge cannot be executed on top of a [new root]"
+msgstr ""
+
+#: sequencer.c:2979
#, c-format
msgid "could not get commit message of '%s'"
msgstr ""
-#: sequencer.c:2916 sequencer.c:2941
+#: sequencer.c:2989 sequencer.c:3015
#, c-format
msgid "could not write '%s'"
msgstr ""
-#: sequencer.c:3005
+#: sequencer.c:3127
#, c-format
msgid "could not even attempt to merge '%.*s'"
msgstr ""
-#: sequencer.c:3021
+#: sequencer.c:3143
msgid "merge: Unable to write new index file"
msgstr ""
-#: sequencer.c:3088
+#: sequencer.c:3211
#, c-format
msgid "Applied autostash.\n"
msgstr ""
-#: sequencer.c:3100
+#: sequencer.c:3223
#, c-format
msgid "cannot store %s"
msgstr ""
-#: sequencer.c:3103 git-rebase.sh:188
+#: sequencer.c:3226 git-rebase.sh:188
#, 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:3134
+#: sequencer.c:3257
#, c-format
msgid ""
"Could not execute the todo command\n"
" git rebase --continue\n"
msgstr ""
-#: sequencer.c:3202
+#: sequencer.c:3325
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr ""
-#: sequencer.c:3264
+#: sequencer.c:3404
#, c-format
msgid "unknown command %d"
msgstr ""
-#: sequencer.c:3309
+#: sequencer.c:3449
msgid "could not read orig-head"
msgstr ""
-#: sequencer.c:3314 sequencer.c:4352
+#: sequencer.c:3454 sequencer.c:4517
msgid "could not read 'onto'"
msgstr ""
-#: sequencer.c:3328
+#: sequencer.c:3468
#, c-format
msgid "could not update HEAD to %s"
msgstr ""
-#: sequencer.c:3414
+#: sequencer.c:3554
msgid "cannot rebase: You have unstaged changes."
msgstr ""
-#: sequencer.c:3423
+#: sequencer.c:3563
msgid "cannot amend non-existing commit"
msgstr ""
-#: sequencer.c:3425
+#: sequencer.c:3565
#, c-format
msgid "invalid file: '%s'"
msgstr ""
-#: sequencer.c:3427
+#: sequencer.c:3567
#, c-format
msgid "invalid contents: '%s'"
msgstr ""
-#: sequencer.c:3430
+#: sequencer.c:3570
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:3455 sequencer.c:3493
+#: sequencer.c:3595 sequencer.c:3633
#, c-format
msgid "could not write file: '%s'"
msgstr ""
-#: sequencer.c:3508
+#: sequencer.c:3648
msgid "could not remove CHERRY_PICK_HEAD"
msgstr ""
-#: sequencer.c:3515
+#: sequencer.c:3655
msgid "could not commit staged changes."
msgstr ""
-#: sequencer.c:3612
+#: sequencer.c:3752
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr ""
-#: sequencer.c:3616
+#: sequencer.c:3756
#, c-format
msgid "%s: bad revision"
msgstr ""
-#: sequencer.c:3649
+#: sequencer.c:3791
msgid "can't revert as initial commit"
msgstr ""
-#: sequencer.c:4098
+#: sequencer.c:4238
msgid "make_script: unhandled options"
msgstr ""
-#: sequencer.c:4101
+#: sequencer.c:4241
msgid "make_script: error preparing revisions"
msgstr ""
-#: sequencer.c:4142 sequencer.c:4177
+#: sequencer.c:4281 sequencer.c:4337
#, c-format
msgid "unusable todo list: '%s'"
msgstr ""
-#: sequencer.c:4236
+#: sequencer.c:4396
#, c-format
msgid ""
"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
msgstr ""
-#: sequencer.c:4302
+#: sequencer.c:4466
#, c-format
msgid ""
"Warning: some commits may have been dropped accidentally.\n"
"Dropped commits (newer to older):\n"
msgstr ""
-#: sequencer.c:4309
+#: sequencer.c:4473
#, c-format
msgid ""
"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
"\n"
msgstr ""
-#: sequencer.c:4321
+#: sequencer.c:4486
#, c-format
msgid ""
"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
"Or you can abort the rebase with 'git rebase --abort'.\n"
msgstr ""
-#: sequencer.c:4375
-#, c-format
-msgid "could not parse commit '%s'"
-msgstr ""
-
-#: sequencer.c:4490
+#: sequencer.c:4660
msgid "the script was already rearranged."
msgstr ""
msgid "Unable to read current working directory"
msgstr ""
-#: setup.c:1066 setup.c:1072
+#: setup.c:1066 setup.c:1072
+#, c-format
+msgid "cannot change to '%s'"
+msgstr ""
+
+#: setup.c:1085
+#, 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:1168
+#, c-format
+msgid ""
+"problem with core.sharedRepository filemode value (0%.3o).\n"
+"The owner of files must always have read and write permissions."
+msgstr ""
+
+#: setup.c:1211
+msgid "open /dev/null or dup failed"
+msgstr ""
+
+#: setup.c:1226
+msgid "fork failed"
+msgstr ""
+
+#: setup.c:1231
+msgid "setsid failed"
+msgstr ""
+
+#: sha1-file.c:381
+#, c-format
+msgid "object directory %s does not exist; check .git/objects/info/alternates"
+msgstr ""
+
+#: sha1-file.c:432
+#, c-format
+msgid "unable to normalize alternate object path: %s"
+msgstr ""
+
+#: sha1-file.c:503
+#, c-format
+msgid "%s: ignoring alternate object stores, nesting too deep"
+msgstr ""
+
+#: sha1-file.c:510
+#, c-format
+msgid "unable to normalize object directory: %s"
+msgstr ""
+
+#: sha1-file.c:565
+msgid "unable to fdopen alternates lockfile"
+msgstr ""
+
+#: sha1-file.c:583
+msgid "unable to read alternates file"
+msgstr ""
+
+#: sha1-file.c:590
+msgid "unable to move new alternates file into place"
+msgstr ""
+
+#: sha1-file.c:625
+#, c-format
+msgid "path '%s' does not exist"
+msgstr ""
+
+#: sha1-file.c:651
+#, c-format
+msgid "reference repository '%s' as a linked checkout is not supported yet."
+msgstr ""
+
+#: sha1-file.c:657
+#, c-format
+msgid "reference repository '%s' is not a local repository."
+msgstr ""
+
+#: sha1-file.c:663
+#, c-format
+msgid "reference repository '%s' is shallow"
+msgstr ""
+
+#: sha1-file.c:671
+#, c-format
+msgid "reference repository '%s' is grafted"
+msgstr ""
+
+#: sha1-file.c:781
+#, c-format
+msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
+msgstr ""
+
+#: sha1-file.c:806
+msgid "mmap failed"
+msgstr ""
+
+#: sha1-file.c:973
+#, c-format
+msgid "object file %s is empty"
+msgstr ""
+
+#: sha1-file.c:1093 sha1-file.c:2206
+#, c-format
+msgid "corrupt loose object '%s'"
+msgstr ""
+
+#: sha1-file.c:1095 sha1-file.c:2210
+#, c-format
+msgid "garbage at end of loose object '%s'"
+msgstr ""
+
+#: sha1-file.c:1137
+msgid "invalid object type"
+msgstr ""
+
+#: sha1-file.c:1219
+#, c-format
+msgid "unable to unpack %s header with --allow-unknown-type"
+msgstr ""
+
+#: sha1-file.c:1222
+#, c-format
+msgid "unable to unpack %s header"
+msgstr ""
+
+#: sha1-file.c:1228
+#, c-format
+msgid "unable to parse %s header with --allow-unknown-type"
+msgstr ""
+
+#: sha1-file.c:1231
+#, c-format
+msgid "unable to parse %s header"
+msgstr ""
+
+#: sha1-file.c:1422
+#, c-format
+msgid "failed to read object %s"
+msgstr ""
+
+#: sha1-file.c:1426
+#, c-format
+msgid "replacement %s not found for %s"
+msgstr ""
+
+#: sha1-file.c:1430
+#, c-format
+msgid "loose object %s (stored in %s) is corrupt"
+msgstr ""
+
+#: sha1-file.c:1434
+#, c-format
+msgid "packed object %s (stored in %s) is corrupt"
+msgstr ""
+
+#: sha1-file.c:1536
+#, c-format
+msgid "unable to write sha1 filename %s"
+msgstr ""
+
+#: sha1-file.c:1543
+#, c-format
+msgid "unable to set permission to '%s'"
+msgstr ""
+
+#: sha1-file.c:1550
+msgid "file write error"
+msgstr ""
+
+#: sha1-file.c:1569
+msgid "error when closing sha1 file"
+msgstr ""
+
+#: sha1-file.c:1635
+#, c-format
+msgid "insufficient permission for adding an object to repository database %s"
+msgstr ""
+
+#: sha1-file.c:1637
+msgid "unable to create temporary file"
+msgstr ""
+
+#: sha1-file.c:1661
+msgid "unable to write sha1 file"
+msgstr ""
+
+#: sha1-file.c:1667
+#, c-format
+msgid "unable to deflate new object %s (%d)"
+msgstr ""
+
+#: sha1-file.c:1671
+#, c-format
+msgid "deflateEnd on object %s failed (%d)"
+msgstr ""
+
+#: sha1-file.c:1675
+#, c-format
+msgid "confused by unstable object source data for %s"
+msgstr ""
+
+#: sha1-file.c:1685 builtin/pack-objects.c:899
+#, c-format
+msgid "failed utime() on %s"
+msgstr ""
+
+#: sha1-file.c:1760
+#, c-format
+msgid "cannot read sha1_file for %s"
+msgstr ""
+
+#: sha1-file.c:1805
+msgid "corrupt commit"
+msgstr ""
+
+#: sha1-file.c:1813
+msgid "corrupt tag"
+msgstr ""
+
+#: sha1-file.c:1906
+#, c-format
+msgid "read error while indexing %s"
+msgstr ""
+
+#: sha1-file.c:1909
#, c-format
-msgid "cannot change to '%s'"
+msgid "short read while indexing %s"
msgstr ""
-#: setup.c:1085
+#: sha1-file.c:1980 sha1-file.c:1989
#, c-format
-msgid ""
-"not a git repository (or any parent up to mount point %s)\n"
-"Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."
+msgid "%s: failed to insert into database"
msgstr ""
-#: setup.c:1168
+#: sha1-file.c:1995
#, c-format
-msgid ""
-"problem with core.sharedRepository filemode value (0%.3o).\n"
-"The owner of files must always have read and write permissions."
+msgid "%s: unsupported file type"
msgstr ""
-#: setup.c:1211
-msgid "open /dev/null or dup failed"
+#: sha1-file.c:2019
+#, c-format
+msgid "%s is not a valid object"
msgstr ""
-#: setup.c:1226
-msgid "fork failed"
+#: sha1-file.c:2021
+#, c-format
+msgid "%s is not a valid '%s' object"
msgstr ""
-#: setup.c:1231
-msgid "setsid failed"
+#: sha1-file.c:2048 builtin/index-pack.c:158
+#, c-format
+msgid "unable to open %s"
msgstr ""
-#: sha1-file.c:625
+#: sha1-file.c:2217 sha1-file.c:2269
#, c-format
-msgid "path '%s' does not exist"
+msgid "sha1 mismatch for %s (expected %s)"
msgstr ""
-#: sha1-file.c:651
+#: sha1-file.c:2241
#, c-format
-msgid "reference repository '%s' as a linked checkout is not supported yet."
+msgid "unable to mmap %s"
msgstr ""
-#: sha1-file.c:657
+#: sha1-file.c:2246
#, c-format
-msgid "reference repository '%s' is not a local repository."
+msgid "unable to unpack header of %s"
msgstr ""
-#: sha1-file.c:663
+#: sha1-file.c:2252
#, c-format
-msgid "reference repository '%s' is shallow"
+msgid "unable to parse header of %s"
msgstr ""
-#: sha1-file.c:671
+#: sha1-file.c:2263
#, c-format
-msgid "reference repository '%s' is grafted"
+msgid "unable to unpack contents of %s"
msgstr ""
-#: sha1-name.c:442
+#: sha1-name.c:444
#, c-format
msgid "short SHA1 %s is ambiguous"
msgstr ""
-#: sha1-name.c:453
+#: sha1-name.c:455
msgid "The candidates are:"
msgstr ""
-#: sha1-name.c:695
+#: sha1-name.c:699
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"
msgid "Pathspec '%s' is in submodule '%.*s'"
msgstr ""
-#: submodule.c:837
+#: submodule.c:839
#, c-format
msgid "submodule entry '%s' (%s) is a %s, not a commit"
msgstr ""
-#: submodule.c:1069 builtin/branch.c:651 builtin/submodule--helper.c:1743
+#: submodule.c:1071 builtin/branch.c:662 builtin/submodule--helper.c:1888
msgid "Failed to resolve HEAD as a valid ref."
msgstr ""
-#: submodule.c:1375
+#: submodule.c:1377
#, c-format
msgid "'%s' not recognized as a git repository"
msgstr ""
-#: submodule.c:1513
+#: submodule.c:1515
#, c-format
msgid "could not start 'git status' in submodule '%s'"
msgstr ""
-#: submodule.c:1526
+#: submodule.c:1528
#, c-format
msgid "could not run 'git status' in submodule '%s'"
msgstr ""
-#: submodule.c:1619
+#: submodule.c:1543
+#, c-format
+msgid "Could not unset core.worktree setting in submodule '%s'"
+msgstr ""
+
+#: submodule.c:1633
#, c-format
msgid "submodule '%s' has dirty index"
msgstr ""
-#: submodule.c:1718
+#: submodule.c:1685
+#, c-format
+msgid "Submodule '%s' could not be updated."
+msgstr ""
+
+#: submodule.c:1734
#, c-format
msgid ""
"relocate_gitdir for submodule '%s' with more than one worktree not supported"
msgstr ""
-#: submodule.c:1730 submodule.c:1786
+#: submodule.c:1746 submodule.c:1802
#, c-format
msgid "could not lookup name for submodule '%s'"
msgstr ""
-#: submodule.c:1734 builtin/submodule--helper.c:1261
-#: builtin/submodule--helper.c:1271
+#: submodule.c:1750 builtin/submodule--helper.c:1406
+#: builtin/submodule--helper.c:1416
#, c-format
msgid "could not create directory '%s'"
msgstr ""
-#: submodule.c:1737
+#: submodule.c:1753
#, c-format
msgid ""
"Migrating git directory of '%s%s' from\n"
"'%s'\n"
msgstr ""
-#: submodule.c:1821
+#: submodule.c:1837
#, c-format
msgid "could not recurse into submodule '%s'"
msgstr ""
-#: submodule.c:1865
+#: submodule.c:1881
msgid "could not start ls-files in .."
msgstr ""
-#: submodule.c:1904
+#: submodule.c:1920
#, c-format
msgid "ls-tree returned unexpected return code %d"
msgstr ""
-#: submodule-config.c:230
+#: submodule-config.c:231
#, c-format
msgid "ignoring suspicious submodule name: %s"
msgstr ""
-#: submodule-config.c:294
+#: submodule-config.c:295
msgid "negative values not allowed for submodule.fetchjobs"
msgstr ""
-#: submodule-config.c:467
+#: submodule-config.c:468
#, c-format
msgid "invalid value for %s"
msgstr ""
msgid "unknown value '%s' for key '%s'"
msgstr ""
-#: trailer.c:539 trailer.c:544 builtin/remote.c:293
+#: trailer.c:539 trailer.c:544 builtin/remote.c:294
#, c-format
msgid "more than one %s"
msgstr ""
msgid "could not read from stdin"
msgstr ""
-#: trailer.c:1008 builtin/am.c:46
+#: trailer.c:1008 builtin/am.c:47
#, c-format
msgid "could not stat %s"
msgstr ""
msgid "Would set upstream of '%s' to '%s' of '%s'\n"
msgstr ""
+#: transport.c:142
+#, c-format
+msgid "could not read bundle '%s'"
+msgstr ""
+
#: transport.c:208
#, c-format
msgid "transport: invalid depth option '%s'"
msgstr ""
-#: transport.c:584
+#: transport.c:586
msgid "could not parse transport.color.* config"
msgstr ""
-#: transport.c:996
+#: transport.c:659
+msgid "support for protocol v2 not implemented yet"
+msgstr ""
+
+#: transport.c:785
+#, c-format
+msgid "unknown value for config '%s': %s"
+msgstr ""
+
+#: transport.c:851
+#, c-format
+msgid "transport '%s' not allowed"
+msgstr ""
+
+#: transport.c:903
+msgid "git-over-rsync is no longer supported"
+msgstr ""
+
+#: transport.c:998
#, c-format
msgid ""
"The following submodule paths contain changes that can\n"
"not be found on any remote:\n"
msgstr ""
-#: transport.c:1000
+#: transport.c:1002
#, c-format
msgid ""
"\n"
"\n"
msgstr ""
-#: transport.c:1008
+#: transport.c:1010
msgid "Aborting."
msgstr ""
-#: transport-helper.c:1087
+#: transport.c:1148
+msgid "failed to push all needed submodules"
+msgstr ""
+
+#: transport.c:1270 transport-helper.c:643
+msgid "operation not supported by protocol"
+msgstr ""
+
+#: transport.c:1352
+#, c-format
+msgid "invalid line while parsing alternate refs: %s"
+msgstr ""
+
+#: transport-helper.c:51 transport-helper.c:80
+msgid "full write to remote helper failed"
+msgstr ""
+
+#: transport-helper.c:132
+#, c-format
+msgid "unable to find remote helper for '%s'"
+msgstr ""
+
+#: transport-helper.c:148 transport-helper.c:557
+msgid "can't dup helper output fd"
+msgstr ""
+
+#: transport-helper.c:199
+#, c-format
+msgid ""
+"unknown mandatory capability %s; this remote helper probably needs newer "
+"version of Git"
+msgstr ""
+
+#: transport-helper.c:205
+msgid "this remote helper should implement refspec capability"
+msgstr ""
+
+#: transport-helper.c:272 transport-helper.c:412
+#, c-format
+msgid "%s unexpectedly said: '%s'"
+msgstr ""
+
+#: transport-helper.c:401
+#, c-format
+msgid "%s also locked %s"
+msgstr ""
+
+#: transport-helper.c:479
+msgid "couldn't run fast-import"
+msgstr ""
+
+#: transport-helper.c:502
+msgid "error while running fast-import"
+msgstr ""
+
+#: transport-helper.c:531 transport-helper.c:1091
+#, c-format
+msgid "could not read ref %s"
+msgstr ""
+
+#: transport-helper.c:576
+#, c-format
+msgid "unknown response to connect: %s"
+msgstr ""
+
+#: transport-helper.c:598
+msgid "setting remote service path not supported by protocol"
+msgstr ""
+
+#: transport-helper.c:600
+msgid "invalid remote service path"
+msgstr ""
+
+#: transport-helper.c:646
+#, c-format
+msgid "can't connect to subservice %s"
+msgstr ""
+
+#: transport-helper.c:713
+#, c-format
+msgid "expected ok/error, helper said '%s'"
+msgstr ""
+
+#: transport-helper.c:766
+#, c-format
+msgid "helper reported unexpected status of %s"
+msgstr ""
+
+#: transport-helper.c:827
+#, c-format
+msgid "helper %s does not support dry-run"
+msgstr ""
+
+#: transport-helper.c:830
+#, c-format
+msgid "helper %s does not support --signed"
+msgstr ""
+
+#: transport-helper.c:833
+#, c-format
+msgid "helper %s does not support --signed=if-asked"
+msgstr ""
+
+#: transport-helper.c:840
+#, c-format
+msgid "helper %s does not support 'push-option'"
+msgstr ""
+
+#: transport-helper.c:932
+msgid "remote-helper doesn't support push; refspec needed"
+msgstr ""
+
+#: transport-helper.c:937
+#, c-format
+msgid "helper %s does not support 'force'"
+msgstr ""
+
+#: transport-helper.c:984
+msgid "couldn't run fast-export"
+msgstr ""
+
+#: transport-helper.c:989
+msgid "error while running fast-export"
+msgstr ""
+
+#: transport-helper.c:1014
+#, c-format
+msgid ""
+"No refs in common and none specified; doing nothing.\n"
+"Perhaps you should specify a branch such as 'master'.\n"
+msgstr ""
+
+#: transport-helper.c:1077
+#, c-format
+msgid "malformed response in ref list: %s"
+msgstr ""
+
+#: transport-helper.c:1230
#, c-format
-msgid "Could not read ref %s"
+msgid "read(%s) failed"
msgstr ""
-#: tree-walk.c:31
+#: transport-helper.c:1257
+#, c-format
+msgid "write(%s) failed"
+msgstr ""
+
+#: transport-helper.c:1306
+#, c-format
+msgid "%s thread failed"
+msgstr ""
+
+#: transport-helper.c:1310
+#, c-format
+msgid "%s thread failed to join: %s"
+msgstr ""
+
+#: transport-helper.c:1329 transport-helper.c:1333
+#, c-format
+msgid "can't start thread for copying data: %s"
+msgstr ""
+
+#: transport-helper.c:1370
+#, c-format
+msgid "%s process failed to wait"
+msgstr ""
+
+#: transport-helper.c:1374
+#, c-format
+msgid "%s process failed"
+msgstr ""
+
+#: transport-helper.c:1392 transport-helper.c:1401
+msgid "can't start thread for copying data"
+msgstr ""
+
+#: tree-walk.c:33
msgid "too-short tree object"
msgstr ""
-#: tree-walk.c:37
+#: tree-walk.c:39
msgid "malformed mode in tree entry"
msgstr ""
-#: tree-walk.c:41
+#: tree-walk.c:43
msgid "empty filename in tree entry"
msgstr ""
-#: tree-walk.c:113
+#: tree-walk.c:115
msgid "too-short tree file"
msgstr ""
-#: unpack-trees.c:111
+#: unpack-trees.c:112
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
"%%sPlease commit your changes or stash them before you switch branches."
msgstr ""
-#: unpack-trees.c:113
+#: unpack-trees.c:114
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
"%%s"
msgstr ""
-#: unpack-trees.c:116
+#: unpack-trees.c:117
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
"%%sPlease commit your changes or stash them before you merge."
msgstr ""
-#: unpack-trees.c:118
+#: unpack-trees.c:119
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
"%%s"
msgstr ""
-#: unpack-trees.c:121
+#: unpack-trees.c:122
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
"%%sPlease commit your changes or stash them before you %s."
msgstr ""
-#: unpack-trees.c:123
+#: unpack-trees.c:124
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
"%%s"
msgstr ""
-#: unpack-trees.c:128
+#: unpack-trees.c:129
#, c-format
msgid ""
"Updating the following directories would lose untracked files in them:\n"
"%s"
msgstr ""
-#: unpack-trees.c:132
+#: unpack-trees.c:133
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
"%%sPlease move or remove them before you switch branches."
msgstr ""
-#: unpack-trees.c:134
+#: unpack-trees.c:135
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
"%%s"
msgstr ""
-#: unpack-trees.c:137
+#: unpack-trees.c:138
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
"%%sPlease move or remove them before you merge."
msgstr ""
-#: unpack-trees.c:139
+#: unpack-trees.c:140
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
"%%s"
msgstr ""
-#: unpack-trees.c:142
+#: unpack-trees.c:143
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
"%%sPlease move or remove them before you %s."
msgstr ""
-#: unpack-trees.c:144
+#: unpack-trees.c:145
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
"%%s"
msgstr ""
-#: unpack-trees.c:150
+#: unpack-trees.c:151
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
"%%sPlease move or remove them before you switch branches."
msgstr ""
-#: unpack-trees.c:152
+#: unpack-trees.c:153
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
"%%s"
msgstr ""
-#: unpack-trees.c:155
+#: unpack-trees.c:156
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
"%%sPlease move or remove them before you merge."
msgstr ""
-#: unpack-trees.c:157
+#: unpack-trees.c:158
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
"%%s"
msgstr ""
-#: unpack-trees.c:160
+#: unpack-trees.c:161
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
"%%sPlease move or remove them before you %s."
msgstr ""
-#: unpack-trees.c:162
+#: unpack-trees.c:163
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
"%%s"
msgstr ""
-#: unpack-trees.c:170
+#: unpack-trees.c:171
#, c-format
msgid "Entry '%s' overlaps with '%s'. Cannot bind."
msgstr ""
-#: unpack-trees.c:173
+#: unpack-trees.c:174
#, c-format
msgid ""
"Cannot update sparse checkout: the following entries are not up to date:\n"
"%s"
msgstr ""
-#: unpack-trees.c:175
+#: unpack-trees.c:176
#, c-format
msgid ""
"The following working tree files would be overwritten by sparse checkout "
"%s"
msgstr ""
-#: unpack-trees.c:177
+#: unpack-trees.c:178
#, c-format
msgid ""
"The following working tree files would be removed by sparse checkout "
"%s"
msgstr ""
-#: unpack-trees.c:179
+#: unpack-trees.c:180
#, c-format
msgid ""
"Cannot update submodule:\n"
"%s"
msgstr ""
-#: unpack-trees.c:262
+#: unpack-trees.c:254
#, c-format
msgid "Aborting\n"
msgstr ""
-#: unpack-trees.c:344
+#: unpack-trees.c:336
msgid "Checking out files"
msgstr ""
msgid "could not open '%s' for reading and writing"
msgstr ""
-#: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:770
-#: builtin/am.c:862 builtin/merge.c:1043
+#: wrapper.c:227 wrapper.c:397 builtin/am.c:321 builtin/am.c:771
+#: builtin/am.c:863 builtin/merge.c:1078
#, c-format
msgid "could not open '%s' for reading"
msgstr ""
msgstr ""
#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2366
+#: wt-status.c:2376
#, c-format
msgid "cannot %s: You have unstaged changes."
msgstr ""
-#: wt-status.c:2372
+#: wt-status.c:2382
msgid "additionally, your index contains uncommitted changes."
msgstr ""
-#: wt-status.c:2374
+#: wt-status.c:2384
#, c-format
msgid "cannot %s: Your index contains uncommitted changes."
msgstr ""
-#: compat/precompose_utf8.c:58 builtin/clone.c:442
+#: compat/precompose_utf8.c:58 builtin/clone.c:443
#, c-format
msgid "failed to unlink '%s'"
msgstr ""
msgid "unexpected diff status %c"
msgstr ""
-#: builtin/add.c:88 builtin/commit.c:266
+#: builtin/add.c:88 builtin/commit.c:279
msgid "updating files failed"
msgstr ""
msgid "Unstaged changes after refreshing the index:"
msgstr ""
-#: builtin/add.c:233 builtin/rev-parse.c:892
+#: builtin/add.c:233 builtin/rev-parse.c:893
msgid "Could not read the index"
msgstr ""
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr ""
-#: builtin/add.c:289 builtin/clean.c:911 builtin/fetch.c:145 builtin/mv.c:123
-#: builtin/prune-packed.c:55 builtin/pull.c:212 builtin/push.c:557
-#: builtin/remote.c:1342 builtin/rm.c:240 builtin/send-pack.c:165
+#: builtin/add.c:289 builtin/clean.c:906 builtin/fetch.c:134 builtin/mv.c:123
+#: builtin/prune-packed.c:56 builtin/pull.c:212 builtin/push.c:557
+#: builtin/remote.c:1344 builtin/rm.c:240 builtin/send-pack.c:165
msgid "dry run"
msgstr ""
msgid "interactive picking"
msgstr ""
-#: builtin/add.c:293 builtin/checkout.c:1135 builtin/reset.c:302
+#: builtin/add.c:293 builtin/checkout.c:1144 builtin/reset.c:302
msgid "select hunks interactively"
msgstr ""
msgid "check if - even missing - files are ignored in dry run"
msgstr ""
-#: builtin/add.c:307 builtin/update-index.c:974
-msgid "(+/-)x"
-msgstr ""
-
-#: builtin/add.c:307 builtin/update-index.c:975
+#: builtin/add.c:308 builtin/update-index.c:973
msgid "override the executable bit of the listed files"
msgstr ""
-#: builtin/add.c:309
+#: builtin/add.c:310
msgid "warn when adding an embedded repository"
msgstr ""
-#: builtin/add.c:324
+#: builtin/add.c:325
#, c-format
msgid ""
"You've added another git repository inside your current repository.\n"
"See \"git help submodule\" for more information."
msgstr ""
-#: builtin/add.c:352
+#: builtin/add.c:353
#, c-format
msgid "adding embedded git repository: %s"
msgstr ""
-#: builtin/add.c:370
+#: builtin/add.c:371
#, c-format
msgid "Use -f if you really want to add them.\n"
msgstr ""
-#: builtin/add.c:378
+#: builtin/add.c:379
msgid "adding files failed"
msgstr ""
-#: builtin/add.c:416
+#: builtin/add.c:417
msgid "-A and -u are mutually incompatible"
msgstr ""
-#: builtin/add.c:423
+#: builtin/add.c:424
msgid "Option --ignore-missing can only be used together with --dry-run"
msgstr ""
-#: builtin/add.c:427
+#: builtin/add.c:428
#, c-format
msgid "--chmod param '%s' must be either -x or +x"
msgstr ""
-#: builtin/add.c:442
+#: builtin/add.c:443
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr ""
-#: builtin/add.c:443
+#: builtin/add.c:444
#, c-format
msgid "Maybe you wanted to say 'git add .'?\n"
msgstr ""
-#: builtin/add.c:448 builtin/check-ignore.c:177 builtin/checkout.c:280
-#: builtin/checkout.c:483 builtin/clean.c:958 builtin/commit.c:325
-#: builtin/diff-tree.c:114 builtin/mv.c:144 builtin/reset.c:241
-#: builtin/rm.c:270 builtin/submodule--helper.c:328
+#: builtin/add.c:449 builtin/check-ignore.c:177 builtin/checkout.c:282
+#: builtin/checkout.c:485 builtin/clean.c:953 builtin/commit.c:338
+#: builtin/diff-tree.c:115 builtin/grep.c:492 builtin/mv.c:144
+#: builtin/reset.c:241 builtin/rm.c:270 builtin/submodule--helper.c:329
msgid "index file corrupt"
msgstr ""
-#: builtin/am.c:414
+#: builtin/am.c:415
msgid "could not parse author script"
msgstr ""
-#: builtin/am.c:498
+#: builtin/am.c:499
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr ""
-#: builtin/am.c:539
+#: builtin/am.c:540
#, c-format
msgid "Malformed input line: '%s'."
msgstr ""
-#: builtin/am.c:576
+#: builtin/am.c:577
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr ""
-#: builtin/am.c:602
+#: builtin/am.c:603
msgid "fseek failed"
msgstr ""
-#: builtin/am.c:790
+#: builtin/am.c:791
#, c-format
msgid "could not parse patch '%s'"
msgstr ""
-#: builtin/am.c:855
+#: builtin/am.c:856
msgid "Only one StGIT patch series can be applied at once"
msgstr ""
-#: builtin/am.c:903
+#: builtin/am.c:904
msgid "invalid timestamp"
msgstr ""
-#: builtin/am.c:908 builtin/am.c:920
+#: builtin/am.c:909 builtin/am.c:921
msgid "invalid Date line"
msgstr ""
-#: builtin/am.c:915
+#: builtin/am.c:916
msgid "invalid timezone offset"
msgstr ""
-#: builtin/am.c:1008
+#: builtin/am.c:1009
msgid "Patch format detection failed."
msgstr ""
-#: builtin/am.c:1013 builtin/clone.c:407
+#: builtin/am.c:1014 builtin/clone.c:408
#, c-format
msgid "failed to create directory '%s'"
msgstr ""
-#: builtin/am.c:1018
+#: builtin/am.c:1019
msgid "Failed to split patches."
msgstr ""
-#: builtin/am.c:1148 builtin/commit.c:351
+#: builtin/am.c:1149 builtin/commit.c:364
msgid "unable to write index file"
msgstr ""
-#: builtin/am.c:1162
+#: builtin/am.c:1163
#, c-format
msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr ""
-#: builtin/am.c:1163
+#: builtin/am.c:1164
#, c-format
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr ""
-#: builtin/am.c:1164
+#: builtin/am.c:1165
#, c-format
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr ""
-#: builtin/am.c:1271
+#: builtin/am.c:1272
msgid "Patch is empty."
msgstr ""
-#: builtin/am.c:1337
+#: builtin/am.c:1338
#, c-format
msgid "invalid ident line: %.*s"
msgstr ""
-#: builtin/am.c:1359
+#: builtin/am.c:1360
#, c-format
msgid "unable to parse commit %s"
msgstr ""
-#: builtin/am.c:1554
+#: builtin/am.c:1556
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr ""
-#: builtin/am.c:1556
+#: builtin/am.c:1558
msgid "Using index info to reconstruct a base tree..."
msgstr ""
-#: builtin/am.c:1575
+#: builtin/am.c:1577
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
msgstr ""
-#: builtin/am.c:1581
+#: builtin/am.c:1583
msgid "Falling back to patching base and 3-way merge..."
msgstr ""
-#: builtin/am.c:1606
+#: builtin/am.c:1608
msgid "Failed to merge in the changes."
msgstr ""
-#: builtin/am.c:1637
+#: builtin/am.c:1640
msgid "applying to an empty history"
msgstr ""
-#: builtin/am.c:1683 builtin/am.c:1687
+#: builtin/am.c:1686 builtin/am.c:1690
#, c-format
msgid "cannot resume: %s does not exist."
msgstr ""
-#: builtin/am.c:1703
+#: builtin/am.c:1706
msgid "cannot be interactive without stdin connected to a terminal."
msgstr ""
-#: builtin/am.c:1708
+#: builtin/am.c:1711
msgid "Commit Body is:"
msgstr ""
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1718
+#: builtin/am.c:1721
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr ""
-#: builtin/am.c:1768
+#: builtin/am.c:1771
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr ""
-#: builtin/am.c:1808 builtin/am.c:1879
+#: builtin/am.c:1811 builtin/am.c:1879
#, c-format
msgid "Applying: %.*s"
msgstr ""
-#: builtin/am.c:1824
+#: builtin/am.c:1828
msgid "No changes -- Patch already applied."
msgstr ""
-#: builtin/am.c:1832
+#: builtin/am.c:1834
#, c-format
msgid "Patch failed at %s %.*s"
msgstr ""
msgid "allow fall back on 3way merging if needed"
msgstr ""
-#: builtin/am.c:2222 builtin/init-db.c:484 builtin/prune-packed.c:57
-#: builtin/repack.c:192
+#: builtin/am.c:2222 builtin/init-db.c:485 builtin/prune-packed.c:58
+#: builtin/repack.c:299
msgid "be quiet"
msgstr ""
msgid "pass it through git-apply"
msgstr ""
-#: builtin/am.c:2260 builtin/commit.c:1332 builtin/fmt-merge-msg.c:665
-#: builtin/fmt-merge-msg.c:668 builtin/grep.c:853 builtin/merge.c:208
-#: builtin/pull.c:150 builtin/pull.c:208 builtin/repack.c:201
-#: builtin/repack.c:205 builtin/repack.c:207 builtin/show-branch.c:631
-#: builtin/show-ref.c:169 builtin/tag.c:383 parse-options.h:144
+#: builtin/am.c:2260 builtin/commit.c:1332 builtin/fmt-merge-msg.c:670
+#: builtin/fmt-merge-msg.c:673 builtin/grep.c:857 builtin/merge.c:237
+#: builtin/pull.c:150 builtin/pull.c:208 builtin/repack.c:308
+#: builtin/repack.c:312 builtin/repack.c:314 builtin/show-branch.c:650
+#: builtin/show-ref.c:170 builtin/tag.c:384 parse-options.h:144
#: parse-options.h:146 parse-options.h:258
msgid "n"
msgstr ""
-#: builtin/am.c:2266 builtin/branch.c:632 builtin/for-each-ref.c:38
-#: builtin/replace.c:543 builtin/tag.c:419 builtin/verify-tag.c:39
+#: builtin/am.c:2266 builtin/branch.c:643 builtin/for-each-ref.c:38
+#: builtin/replace.c:543 builtin/tag.c:420 builtin/verify-tag.c:39
msgid "format"
msgstr ""
msgid "use current timestamp for author date"
msgstr ""
-#: builtin/am.c:2298 builtin/commit.c:1468 builtin/merge.c:239
-#: builtin/pull.c:183 builtin/revert.c:112 builtin/tag.c:399
+#: builtin/am.c:2298 builtin/commit.c:1468 builtin/merge.c:271
+#: builtin/pull.c:183 builtin/revert.c:113 builtin/tag.c:400
msgid "key-id"
msgstr ""
msgid "--bisect-clean-state requires no arguments"
msgstr ""
-#: builtin/blame.c:29
+#: builtin/blame.c:31
msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
msgstr ""
-#: builtin/blame.c:34
+#: builtin/blame.c:36
msgid "<rev-opts> are documented in git-rev-list(1)"
msgstr ""
-#: builtin/blame.c:404
+#: builtin/blame.c:406
#, c-format
msgid "expecting a color: %s"
msgstr ""
-#: builtin/blame.c:411
+#: builtin/blame.c:413
msgid "must end with a color"
msgstr ""
-#: builtin/blame.c:697
+#: builtin/blame.c:700
#, c-format
msgid "invalid color '%s' in color.blame.repeatedLines"
msgstr ""
-#: builtin/blame.c:715
+#: builtin/blame.c:718
msgid "invalid value for blame.coloring"
msgstr ""
-#: builtin/blame.c:786
+#: builtin/blame.c:789
msgid "Show blame entries as we find them, incrementally"
msgstr ""
-#: builtin/blame.c:787
+#: builtin/blame.c:790
msgid "Show blank SHA-1 for boundary commits (Default: off)"
msgstr ""
-#: builtin/blame.c:788
+#: builtin/blame.c:791
msgid "Do not treat root commits as boundaries (Default: off)"
msgstr ""
-#: builtin/blame.c:789
+#: builtin/blame.c:792
msgid "Show work cost statistics"
msgstr ""
-#: builtin/blame.c:790
+#: builtin/blame.c:793
msgid "Force progress reporting"
msgstr ""
-#: builtin/blame.c:791
+#: builtin/blame.c:794
msgid "Show output score for blame entries"
msgstr ""
-#: builtin/blame.c:792
+#: builtin/blame.c:795
msgid "Show original filename (Default: auto)"
msgstr ""
-#: builtin/blame.c:793
+#: builtin/blame.c:796
msgid "Show original linenumber (Default: off)"
msgstr ""
-#: builtin/blame.c:794
+#: builtin/blame.c:797
msgid "Show in a format designed for machine consumption"
msgstr ""
-#: builtin/blame.c:795
+#: builtin/blame.c:798
msgid "Show porcelain format with per-line commit information"
msgstr ""
-#: builtin/blame.c:796
+#: builtin/blame.c:799
msgid "Use the same output mode as git-annotate (Default: off)"
msgstr ""
-#: builtin/blame.c:797
+#: builtin/blame.c:800
msgid "Show raw timestamp (Default: off)"
msgstr ""
-#: builtin/blame.c:798
+#: builtin/blame.c:801
msgid "Show long commit SHA1 (Default: off)"
msgstr ""
-#: builtin/blame.c:799
+#: builtin/blame.c:802
msgid "Suppress author name and timestamp (Default: off)"
msgstr ""
-#: builtin/blame.c:800
+#: builtin/blame.c:803
msgid "Show author email instead of name (Default: off)"
msgstr ""
-#: builtin/blame.c:801
+#: builtin/blame.c:804
msgid "Ignore whitespace differences"
msgstr ""
-#: builtin/blame.c:802
+#: builtin/blame.c:805
msgid "color redundant metadata from previous line differently"
msgstr ""
-#: builtin/blame.c:803
+#: builtin/blame.c:806
msgid "color lines by age"
msgstr ""
-#: builtin/blame.c:810
+#: builtin/blame.c:813
msgid "Use an experimental heuristic to improve diffs"
msgstr ""
-#: builtin/blame.c:812
+#: builtin/blame.c:815
msgid "Spend extra cycles to find better match"
msgstr ""
-#: builtin/blame.c:813
+#: builtin/blame.c:816
msgid "Use revisions from <file> instead of calling git-rev-list"
msgstr ""
-#: builtin/blame.c:814
+#: builtin/blame.c:817
msgid "Use <file>'s contents as the final image"
msgstr ""
-#: builtin/blame.c:815 builtin/blame.c:816
+#: builtin/blame.c:818 builtin/blame.c:819
msgid "score"
msgstr ""
-#: builtin/blame.c:815
+#: builtin/blame.c:818
msgid "Find line copies within and across files"
msgstr ""
-#: builtin/blame.c:816
+#: builtin/blame.c:819
msgid "Find line movements within and across files"
msgstr ""
-#: builtin/blame.c:817
+#: builtin/blame.c:820
msgid "n,m"
msgstr ""
-#: builtin/blame.c:817
+#: builtin/blame.c:820
msgid "Process only line range n,m, counting from 1"
msgstr ""
-#: builtin/blame.c:866
+#: builtin/blame.c:869
msgid "--progress can't be used with --incremental or porcelain formats"
msgstr ""
#. your language may need more or fewer display
#. columns.
#.
-#: builtin/blame.c:917
+#: builtin/blame.c:920
msgid "4 years, 11 months ago"
msgstr ""
-#: builtin/blame.c:1003
+#: builtin/blame.c:1007
#, c-format
msgid "file %s has only %lu line"
msgid_plural "file %s has only %lu lines"
msgstr[0] ""
msgstr[1] ""
-#: builtin/blame.c:1049
+#: builtin/blame.c:1053
msgid "Blaming lines"
msgstr ""
-#: builtin/branch.c:27
+#: builtin/branch.c:28
msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
msgstr ""
-#: builtin/branch.c:28
+#: builtin/branch.c:29
msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
msgstr ""
-#: builtin/branch.c:29
+#: builtin/branch.c:30
msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
msgstr ""
-#: builtin/branch.c:30
+#: builtin/branch.c:31
msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
msgstr ""
-#: builtin/branch.c:31
+#: builtin/branch.c:32
msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
msgstr ""
-#: builtin/branch.c:32
+#: builtin/branch.c:33
msgid "git branch [<options>] [-r | -a] [--points-at]"
msgstr ""
-#: builtin/branch.c:33
+#: builtin/branch.c:34
msgid "git branch [<options>] [-r | -a] [--format]"
msgstr ""
-#: builtin/branch.c:146
+#: builtin/branch.c:143
#, c-format
msgid ""
"deleting branch '%s' that has been merged to\n"
" '%s', but not yet merged to HEAD."
msgstr ""
-#: builtin/branch.c:150
+#: builtin/branch.c:147
#, c-format
msgid ""
"not deleting branch '%s' that is not yet merged to\n"
" '%s', even though it is merged to HEAD."
msgstr ""
-#: builtin/branch.c:164
+#: builtin/branch.c:161
#, c-format
msgid "Couldn't look up commit object for '%s'"
msgstr ""
-#: builtin/branch.c:168
+#: builtin/branch.c:165
#, c-format
msgid ""
"The branch '%s' is not fully merged.\n"
"If you are sure you want to delete it, run 'git branch -D %s'."
msgstr ""
-#: builtin/branch.c:181
+#: builtin/branch.c:178
msgid "Update of config-file failed"
msgstr ""
-#: builtin/branch.c:212
+#: builtin/branch.c:209
msgid "cannot use -a with -d"
msgstr ""
-#: builtin/branch.c:218
+#: builtin/branch.c:215
msgid "Couldn't look up commit object for HEAD"
msgstr ""
-#: builtin/branch.c:232
+#: builtin/branch.c:229
#, c-format
msgid "Cannot delete branch '%s' checked out at '%s'"
msgstr ""
-#: builtin/branch.c:247
+#: builtin/branch.c:244
#, c-format
msgid "remote-tracking branch '%s' not found."
msgstr ""
-#: builtin/branch.c:248
+#: builtin/branch.c:245
#, c-format
msgid "branch '%s' not found."
msgstr ""
-#: builtin/branch.c:263
+#: builtin/branch.c:260
#, c-format
msgid "Error deleting remote-tracking branch '%s'"
msgstr ""
-#: builtin/branch.c:264
+#: builtin/branch.c:261
#, c-format
msgid "Error deleting branch '%s'"
msgstr ""
-#: builtin/branch.c:271
+#: builtin/branch.c:268
#, c-format
msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr ""
-#: builtin/branch.c:272
+#: builtin/branch.c:269
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr ""
-#: builtin/branch.c:416 builtin/tag.c:58
+#: builtin/branch.c:413 builtin/tag.c:59
msgid "unable to parse format string"
msgstr ""
-#: builtin/branch.c:453
+#: builtin/branch.c:450
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr ""
-#: builtin/branch.c:457
+#: builtin/branch.c:454
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr ""
-#: builtin/branch.c:474
+#: builtin/branch.c:471
msgid "cannot copy the current branch while not on any."
msgstr ""
-#: builtin/branch.c:476
+#: builtin/branch.c:473
msgid "cannot rename the current branch while not on any."
msgstr ""
-#: builtin/branch.c:487
+#: builtin/branch.c:484
#, c-format
msgid "Invalid branch name: '%s'"
msgstr ""
-#: builtin/branch.c:514
+#: builtin/branch.c:511
msgid "Branch rename failed"
msgstr ""
-#: builtin/branch.c:516
+#: builtin/branch.c:513
msgid "Branch copy failed"
msgstr ""
-#: builtin/branch.c:520
+#: builtin/branch.c:517
#, c-format
msgid "Created a copy of a misnamed branch '%s'"
msgstr ""
-#: builtin/branch.c:523
+#: builtin/branch.c:520
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr ""
-#: builtin/branch.c:529
+#: builtin/branch.c:526
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr ""
-#: builtin/branch.c:538
+#: builtin/branch.c:535
msgid "Branch is renamed, but update of config-file failed"
msgstr ""
-#: builtin/branch.c:540
+#: builtin/branch.c:537
msgid "Branch is copied, but update of config-file failed"
msgstr ""
-#: builtin/branch.c:556
+#: builtin/branch.c:553
#, c-format
msgid ""
"Please edit the description for the branch\n"
"Lines starting with '%c' will be stripped.\n"
msgstr ""
-#: builtin/branch.c:589
+#: builtin/branch.c:594
msgid "Generic options"
msgstr ""
-#: builtin/branch.c:591
+#: builtin/branch.c:596
msgid "show hash and subject, give twice for upstream branch"
msgstr ""
-#: builtin/branch.c:592
+#: builtin/branch.c:597
msgid "suppress informational messages"
msgstr ""
-#: builtin/branch.c:593
+#: builtin/branch.c:598
msgid "set up tracking mode (see git-pull(1))"
msgstr ""
-#: builtin/branch.c:595
+#: builtin/branch.c:600
msgid "do not use"
msgstr ""
-#: builtin/branch.c:597
+#: builtin/branch.c:602
msgid "upstream"
msgstr ""
-#: builtin/branch.c:597
+#: builtin/branch.c:602
msgid "change the upstream info"
msgstr ""
-#: builtin/branch.c:598
+#: builtin/branch.c:603
msgid "Unset the upstream info"
msgstr ""
-#: builtin/branch.c:599
+#: builtin/branch.c:604
msgid "use colored output"
msgstr ""
-#: builtin/branch.c:600
+#: builtin/branch.c:605
msgid "act on remote-tracking branches"
msgstr ""
-#: builtin/branch.c:602 builtin/branch.c:604
+#: builtin/branch.c:607 builtin/branch.c:609
msgid "print only branches that contain the commit"
msgstr ""
-#: builtin/branch.c:603 builtin/branch.c:605
+#: builtin/branch.c:608 builtin/branch.c:610
msgid "print only branches that don't contain the commit"
msgstr ""
-#: builtin/branch.c:608
+#: builtin/branch.c:613
msgid "Specific git-branch actions:"
msgstr ""
-#: builtin/branch.c:609
+#: builtin/branch.c:614
msgid "list both remote-tracking and local branches"
msgstr ""
-#: builtin/branch.c:611
+#: builtin/branch.c:616
msgid "delete fully merged branch"
msgstr ""
-#: builtin/branch.c:612
+#: builtin/branch.c:617
msgid "delete branch (even if not merged)"
msgstr ""
-#: builtin/branch.c:613
+#: builtin/branch.c:618
msgid "move/rename a branch and its reflog"
msgstr ""
-#: builtin/branch.c:614
+#: builtin/branch.c:619
msgid "move/rename a branch, even if target exists"
msgstr ""
-#: builtin/branch.c:615
+#: builtin/branch.c:620
msgid "copy a branch and its reflog"
msgstr ""
-#: builtin/branch.c:616
+#: builtin/branch.c:621
msgid "copy a branch, even if target exists"
msgstr ""
-#: builtin/branch.c:617
+#: builtin/branch.c:622
msgid "list branch names"
msgstr ""
-#: builtin/branch.c:618
+#: builtin/branch.c:623
msgid "create the branch's reflog"
msgstr ""
-#: builtin/branch.c:620
+#: builtin/branch.c:626
+msgid "deprecated synonym for --create-reflog"
+msgstr ""
+
+#: builtin/branch.c:631
msgid "edit the description for the branch"
msgstr ""
-#: builtin/branch.c:621
+#: builtin/branch.c:632
msgid "force creation, move/rename, deletion"
msgstr ""
-#: builtin/branch.c:622
+#: builtin/branch.c:633
msgid "print only branches that are merged"
msgstr ""
-#: builtin/branch.c:623
+#: builtin/branch.c:634
msgid "print only branches that are not merged"
msgstr ""
-#: builtin/branch.c:624
+#: builtin/branch.c:635
msgid "list branches in columns"
msgstr ""
-#: builtin/branch.c:625 builtin/for-each-ref.c:40 builtin/ls-remote.c:70
-#: builtin/tag.c:412
+#: builtin/branch.c:636 builtin/for-each-ref.c:40 builtin/ls-remote.c:70
+#: builtin/tag.c:413
msgid "key"
msgstr ""
-#: builtin/branch.c:626 builtin/for-each-ref.c:41 builtin/ls-remote.c:71
-#: builtin/tag.c:413
+#: builtin/branch.c:637 builtin/for-each-ref.c:41 builtin/ls-remote.c:71
+#: builtin/tag.c:414
msgid "field name to sort on"
msgstr ""
-#: builtin/branch.c:628 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:415
+#: builtin/branch.c:639 builtin/for-each-ref.c:43 builtin/notes.c:410
+#: builtin/notes.c:413 builtin/notes.c:573 builtin/notes.c:576
+#: builtin/tag.c:416
msgid "object"
msgstr ""
-#: builtin/branch.c:629
+#: builtin/branch.c:640
msgid "print only branches of the object"
msgstr ""
-#: builtin/branch.c:631 builtin/for-each-ref.c:49 builtin/tag.c:422
+#: builtin/branch.c:642 builtin/for-each-ref.c:49 builtin/tag.c:423
msgid "sorting and filtering are case insensitive"
msgstr ""
-#: builtin/branch.c:632 builtin/for-each-ref.c:38 builtin/tag.c:420
+#: builtin/branch.c:643 builtin/for-each-ref.c:38 builtin/tag.c:421
#: builtin/verify-tag.c:39
msgid "format to use for the output"
msgstr ""
-#: builtin/branch.c:655 builtin/clone.c:737
+#: builtin/branch.c:666 builtin/clone.c:739
msgid "HEAD not found below refs/heads!"
msgstr ""
-#: builtin/branch.c:678
+#: builtin/branch.c:689
msgid "--column and --verbose are incompatible"
msgstr ""
-#: builtin/branch.c:693 builtin/branch.c:745 builtin/branch.c:754
+#: builtin/branch.c:709 builtin/branch.c:761 builtin/branch.c:770
msgid "branch name required"
msgstr ""
-#: builtin/branch.c:721
+#: builtin/branch.c:737
msgid "Cannot give description to detached HEAD"
msgstr ""
-#: builtin/branch.c:726
+#: builtin/branch.c:742
msgid "cannot edit description of more than one branch"
msgstr ""
-#: builtin/branch.c:733
+#: builtin/branch.c:749
#, c-format
msgid "No commit on branch '%s' yet."
msgstr ""
-#: builtin/branch.c:736
+#: builtin/branch.c:752
#, c-format
msgid "No branch named '%s'."
msgstr ""
-#: builtin/branch.c:751
+#: builtin/branch.c:767
msgid "too many branches for a copy operation"
msgstr ""
-#: builtin/branch.c:760
+#: builtin/branch.c:776
msgid "too many arguments for a rename operation"
msgstr ""
-#: builtin/branch.c:765
+#: builtin/branch.c:781
msgid "too many arguments to set new upstream"
msgstr ""
-#: builtin/branch.c:769
+#: builtin/branch.c:785
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
msgstr ""
-#: builtin/branch.c:772 builtin/branch.c:794 builtin/branch.c:810
+#: builtin/branch.c:788 builtin/branch.c:810 builtin/branch.c:826
#, c-format
msgid "no such branch '%s'"
msgstr ""
-#: builtin/branch.c:776
+#: builtin/branch.c:792
#, c-format
msgid "branch '%s' does not exist"
msgstr ""
-#: builtin/branch.c:788
+#: builtin/branch.c:804
msgid "too many arguments to unset upstream"
msgstr ""
-#: builtin/branch.c:792
+#: builtin/branch.c:808
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr ""
-#: builtin/branch.c:798
+#: builtin/branch.c:814
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr ""
-#: builtin/branch.c:813
+#: builtin/branch.c:829
msgid "-a and -r options to 'git branch' do not make sense with a branch name"
msgstr ""
-#: builtin/branch.c:816
+#: builtin/branch.c:832
msgid ""
"the '--set-upstream' option is no longer supported. Please use '--track' or "
"'--set-upstream-to' instead."
msgid "Need a repository to unbundle."
msgstr ""
-#: builtin/cat-file.c:525
+#: builtin/cat-file.c:577
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:526
+#: builtin/cat-file.c:578
msgid ""
"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
"filters]"
msgstr ""
-#: builtin/cat-file.c:563
+#: builtin/cat-file.c:615
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr ""
-#: builtin/cat-file.c:564
+#: builtin/cat-file.c:616
msgid "show object type"
msgstr ""
-#: builtin/cat-file.c:565
+#: builtin/cat-file.c:617
msgid "show object size"
msgstr ""
-#: builtin/cat-file.c:567
+#: builtin/cat-file.c:619
msgid "exit with zero when there's no error"
msgstr ""
-#: builtin/cat-file.c:568
+#: builtin/cat-file.c:620
msgid "pretty-print object's content"
msgstr ""
-#: builtin/cat-file.c:570
+#: builtin/cat-file.c:622
msgid "for blob objects, run textconv on object's content"
msgstr ""
-#: builtin/cat-file.c:572
+#: builtin/cat-file.c:624
msgid "for blob objects, run filters on object's content"
msgstr ""
-#: builtin/cat-file.c:573 git-submodule.sh:894
+#: builtin/cat-file.c:625 git-submodule.sh:864
msgid "blob"
msgstr ""
-#: builtin/cat-file.c:574
+#: builtin/cat-file.c:626
msgid "use a specific path for --textconv/--filters"
msgstr ""
-#: builtin/cat-file.c:576
+#: builtin/cat-file.c:628
msgid "allow -s and -t to work with broken/corrupt objects"
msgstr ""
-#: builtin/cat-file.c:577
+#: builtin/cat-file.c:629
msgid "buffer --batch output"
msgstr ""
-#: builtin/cat-file.c:579
+#: builtin/cat-file.c:631
msgid "show info and content of objects fed from the standard input"
msgstr ""
-#: builtin/cat-file.c:582
+#: builtin/cat-file.c:634
msgid "show info about objects fed from the standard input"
msgstr ""
-#: builtin/cat-file.c:585
+#: builtin/cat-file.c:637
msgid "follow in-tree symlinks (used with --batch or --batch-check)"
msgstr ""
-#: builtin/cat-file.c:587
+#: builtin/cat-file.c:639
msgid "show all objects with --batch or --batch-check"
msgstr ""
+#: builtin/cat-file.c:641
+msgid "do not order --batch-all-objects output"
+msgstr ""
+
#: builtin/check-attr.c:12
msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
msgstr ""
msgid "use .gitattributes only from the index"
msgstr ""
-#: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:100
+#: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:101
msgid "read file names from stdin"
msgstr ""
msgid "terminate input and output records by a NUL character"
msgstr ""
-#: builtin/check-ignore.c:20 builtin/checkout.c:1113 builtin/gc.c:500
+#: builtin/check-ignore.c:20 builtin/checkout.c:1120 builtin/gc.c:503
msgid "suppress progress reporting"
msgstr ""
msgstr ""
#: builtin/checkout-index.c:173 builtin/column.c:31
-#: builtin/submodule--helper.c:1216 builtin/submodule--helper.c:1219
-#: builtin/submodule--helper.c:1227 builtin/submodule--helper.c:1591
+#: builtin/submodule--helper.c:1361 builtin/submodule--helper.c:1364
+#: builtin/submodule--helper.c:1372 builtin/submodule--helper.c:1736
#: builtin/worktree.c:610
msgid "string"
msgstr ""
msgid "copy out the files from named stage"
msgstr ""
-#: builtin/checkout.c:27
+#: builtin/checkout.c:29
msgid "git checkout [<options>] <branch>"
msgstr ""
-#: builtin/checkout.c:28
+#: builtin/checkout.c:30
msgid "git checkout [<options>] [<branch>] -- <file>..."
msgstr ""
-#: builtin/checkout.c:136 builtin/checkout.c:169
+#: builtin/checkout.c:138 builtin/checkout.c:171
#, c-format
msgid "path '%s' does not have our version"
msgstr ""
-#: builtin/checkout.c:138 builtin/checkout.c:171
+#: builtin/checkout.c:140 builtin/checkout.c:173
#, c-format
msgid "path '%s' does not have their version"
msgstr ""
-#: builtin/checkout.c:154
+#: builtin/checkout.c:156
#, c-format
msgid "path '%s' does not have all necessary versions"
msgstr ""
-#: builtin/checkout.c:198
+#: builtin/checkout.c:200
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr ""
-#: builtin/checkout.c:215
+#: builtin/checkout.c:217
#, c-format
msgid "path '%s': cannot merge"
msgstr ""
-#: builtin/checkout.c:231
+#: builtin/checkout.c:233
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr ""
-#: builtin/checkout.c:253 builtin/checkout.c:256 builtin/checkout.c:259
-#: builtin/checkout.c:262
+#: builtin/checkout.c:255 builtin/checkout.c:258 builtin/checkout.c:261
+#: builtin/checkout.c:264
#, c-format
msgid "'%s' cannot be used with updating paths"
msgstr ""
-#: builtin/checkout.c:265 builtin/checkout.c:268
+#: builtin/checkout.c:267 builtin/checkout.c:270
#, c-format
msgid "'%s' cannot be used with %s"
msgstr ""
-#: builtin/checkout.c:271
+#: builtin/checkout.c:273
#, c-format
msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr ""
-#: builtin/checkout.c:340 builtin/checkout.c:347
+#: builtin/checkout.c:342 builtin/checkout.c:349
#, c-format
msgid "path '%s' is unmerged"
msgstr ""
-#: builtin/checkout.c:506
+#: builtin/checkout.c:508
msgid "you need to resolve your current index first"
msgstr ""
-#: builtin/checkout.c:643
+#: builtin/checkout.c:645
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr ""
-#: builtin/checkout.c:684
+#: builtin/checkout.c:686
msgid "HEAD is now at"
msgstr ""
-#: builtin/checkout.c:688 builtin/clone.c:691
+#: builtin/checkout.c:690 builtin/clone.c:692
msgid "unable to update HEAD"
msgstr ""
-#: builtin/checkout.c:692
+#: builtin/checkout.c:694
#, c-format
msgid "Reset branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:695
+#: builtin/checkout.c:697
#, c-format
msgid "Already on '%s'\n"
msgstr ""
-#: builtin/checkout.c:699
+#: builtin/checkout.c:701
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:701 builtin/checkout.c:1046
+#: builtin/checkout.c:703 builtin/checkout.c:1052
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:703
+#: builtin/checkout.c:705
#, c-format
msgid "Switched to branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:754
+#: builtin/checkout.c:756
#, c-format
msgid " ... and %d more.\n"
msgstr ""
-#: builtin/checkout.c:760
+#: builtin/checkout.c:762
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
msgstr[0] ""
msgstr[1] ""
-#: builtin/checkout.c:779
+#: builtin/checkout.c:781
#, 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:811
+#: builtin/checkout.c:813
msgid "internal error in revision walk"
msgstr ""
-#: builtin/checkout.c:815
+#: builtin/checkout.c:817
msgid "Previous HEAD position was"
msgstr ""
-#: builtin/checkout.c:843 builtin/checkout.c:1041
+#: builtin/checkout.c:845 builtin/checkout.c:1047
msgid "You are on a branch yet to be born"
msgstr ""
-#: builtin/checkout.c:947
+#: builtin/checkout.c:952
#, c-format
msgid "only one reference expected, %d given."
msgstr ""
-#: builtin/checkout.c:987 builtin/worktree.c:240 builtin/worktree.c:389
+#: builtin/checkout.c:993 builtin/worktree.c:240 builtin/worktree.c:389
#, c-format
msgid "invalid reference: %s"
msgstr ""
-#: builtin/checkout.c:1016
+#: builtin/checkout.c:1022
#, c-format
msgid "reference is not a tree: %s"
msgstr ""
-#: builtin/checkout.c:1055
+#: builtin/checkout.c:1061
msgid "paths cannot be used with switching branches"
msgstr ""
-#: builtin/checkout.c:1058 builtin/checkout.c:1062
+#: builtin/checkout.c:1064 builtin/checkout.c:1068
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr ""
-#: builtin/checkout.c:1066 builtin/checkout.c:1069 builtin/checkout.c:1074
-#: builtin/checkout.c:1077
+#: builtin/checkout.c:1072 builtin/checkout.c:1075 builtin/checkout.c:1080
+#: builtin/checkout.c:1083
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr ""
-#: builtin/checkout.c:1082
+#: builtin/checkout.c:1088
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr ""
-#: builtin/checkout.c:1114 builtin/checkout.c:1116 builtin/clone.c:118
-#: builtin/remote.c:167 builtin/remote.c:169 builtin/worktree.c:433
+#: builtin/checkout.c:1121 builtin/checkout.c:1123 builtin/clone.c:119
+#: builtin/remote.c:168 builtin/remote.c:170 builtin/worktree.c:433
#: builtin/worktree.c:435
msgid "branch"
msgstr ""
-#: builtin/checkout.c:1115
+#: builtin/checkout.c:1122
msgid "create and checkout a new branch"
msgstr ""
-#: builtin/checkout.c:1117
+#: builtin/checkout.c:1124
msgid "create/reset and checkout a branch"
msgstr ""
-#: builtin/checkout.c:1118
+#: builtin/checkout.c:1125
msgid "create reflog for new branch"
msgstr ""
-#: builtin/checkout.c:1119 builtin/worktree.c:437
+#: builtin/checkout.c:1126 builtin/worktree.c:437
msgid "detach HEAD at named commit"
msgstr ""
-#: builtin/checkout.c:1120
+#: builtin/checkout.c:1127
msgid "set upstream info for new branch"
msgstr ""
-#: builtin/checkout.c:1122
+#: builtin/checkout.c:1129
msgid "new-branch"
msgstr ""
-#: builtin/checkout.c:1122
+#: builtin/checkout.c:1129
msgid "new unparented branch"
msgstr ""
-#: builtin/checkout.c:1123
+#: builtin/checkout.c:1131
msgid "checkout our version for unmerged files"
msgstr ""
-#: builtin/checkout.c:1125
+#: builtin/checkout.c:1134
msgid "checkout their version for unmerged files"
msgstr ""
-#: builtin/checkout.c:1127
+#: builtin/checkout.c:1136
msgid "force checkout (throw away local modifications)"
msgstr ""
-#: builtin/checkout.c:1129
+#: builtin/checkout.c:1138
msgid "perform a 3-way merge with the new branch"
msgstr ""
-#: builtin/checkout.c:1131 builtin/merge.c:241
+#: builtin/checkout.c:1140 builtin/merge.c:273
msgid "update ignored files (default)"
msgstr ""
-#: builtin/checkout.c:1133 builtin/log.c:1499 parse-options.h:264
+#: builtin/checkout.c:1142 builtin/log.c:1510 parse-options.h:264
msgid "style"
msgstr ""
-#: builtin/checkout.c:1134
+#: builtin/checkout.c:1143
msgid "conflict style (merge or diff3)"
msgstr ""
-#: builtin/checkout.c:1137
+#: builtin/checkout.c:1146
msgid "do not limit pathspecs to sparse entries only"
msgstr ""
-#: builtin/checkout.c:1139
+#: builtin/checkout.c:1148
msgid "second guess 'git checkout <no-such-branch>'"
msgstr ""
-#: builtin/checkout.c:1141
+#: builtin/checkout.c:1150
msgid "do not check if another worktree is holding the given ref"
msgstr ""
-#: builtin/checkout.c:1145 builtin/clone.c:85 builtin/fetch.c:149
-#: builtin/merge.c:238 builtin/pull.c:128 builtin/push.c:572
+#: builtin/checkout.c:1154 builtin/clone.c:86 builtin/fetch.c:138
+#: builtin/merge.c:270 builtin/pull.c:128 builtin/push.c:572
#: builtin/send-pack.c:174
msgid "force progress reporting"
msgstr ""
-#: builtin/checkout.c:1175
+#: builtin/checkout.c:1184
msgid "-b, -B and --orphan are mutually exclusive"
msgstr ""
-#: builtin/checkout.c:1192
+#: builtin/checkout.c:1201
msgid "--track needs a branch name"
msgstr ""
-#: builtin/checkout.c:1197
-msgid "Missing branch name; try -b"
+#: builtin/checkout.c:1206
+msgid "missing branch name; try -b"
msgstr ""
-#: builtin/checkout.c:1233
+#: builtin/checkout.c:1243
msgid "invalid path specification"
msgstr ""
-#: builtin/checkout.c:1240
+#: builtin/checkout.c:1250
#, c-format
msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
msgstr ""
-#: builtin/checkout.c:1244
+#: builtin/checkout.c:1254
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr ""
-#: builtin/checkout.c:1248
+#: builtin/checkout.c:1258
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
msgstr ""
-#: builtin/clean.c:26
+#: builtin/checkout.c:1278
+#, c-format
+msgid ""
+"'%s' matched more than one remote tracking branch.\n"
+"We found %d remotes with a reference that matched. So we fell back\n"
+"on trying to resolve the argument as a path, but failed there too!\n"
+"\n"
+"If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
+"you can do so by fully qualifying the name with the --track option:\n"
+"\n"
+" git checkout --track origin/<name>\n"
+"\n"
+"If you'd like to always have checkouts of an ambiguous <name> prefer\n"
+"one remote, e.g. the 'origin' remote, consider setting\n"
+"checkout.defaultRemote=origin in your config."
+msgstr ""
+
+#: builtin/clean.c:27
msgid ""
"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
msgstr ""
-#: builtin/clean.c:30
+#: builtin/clean.c:31
#, c-format
msgid "Removing %s\n"
msgstr ""
-#: builtin/clean.c:31
+#: builtin/clean.c:32
#, c-format
msgid "Would remove %s\n"
msgstr ""
-#: builtin/clean.c:32
+#: builtin/clean.c:33
#, c-format
msgid "Skipping repository %s\n"
msgstr ""
-#: builtin/clean.c:33
+#: builtin/clean.c:34
#, c-format
msgid "Would skip repository %s\n"
msgstr ""
-#: builtin/clean.c:34
+#: builtin/clean.c:35
#, c-format
msgid "failed to remove %s"
msgstr ""
-#: builtin/clean.c:302 git-add--interactive.perl:579
+#: builtin/clean.c:297 git-add--interactive.perl:579
#, c-format
msgid ""
"Prompt help:\n"
" - (empty) select nothing\n"
msgstr ""
-#: builtin/clean.c:306 git-add--interactive.perl:588
+#: builtin/clean.c:301 git-add--interactive.perl:588
#, c-format
msgid ""
"Prompt help:\n"
" - (empty) finish selecting\n"
msgstr ""
-#: builtin/clean.c:522 git-add--interactive.perl:554
+#: builtin/clean.c:517 git-add--interactive.perl:554
#: git-add--interactive.perl:559
#, c-format, perl-format
msgid "Huh (%s)?\n"
msgstr ""
-#: builtin/clean.c:664
+#: builtin/clean.c:659
#, c-format
msgid "Input ignore patterns>> "
msgstr ""
-#: builtin/clean.c:701
+#: builtin/clean.c:696
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
msgstr ""
-#: builtin/clean.c:722
+#: builtin/clean.c:717
msgid "Select items to delete"
msgstr ""
#. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:763
+#: builtin/clean.c:758
#, c-format
msgid "Remove %s [y/N]? "
msgstr ""
-#: builtin/clean.c:788 git-add--interactive.perl:1717
+#: builtin/clean.c:783 git-add--interactive.perl:1717
#, c-format
msgid "Bye.\n"
msgstr ""
-#: builtin/clean.c:796
+#: builtin/clean.c:791
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
"? - help for prompt selection"
msgstr ""
-#: builtin/clean.c:823 git-add--interactive.perl:1793
+#: builtin/clean.c:818 git-add--interactive.perl:1793
msgid "*** Commands ***"
msgstr ""
-#: builtin/clean.c:824 git-add--interactive.perl:1790
+#: builtin/clean.c:819 git-add--interactive.perl:1790
msgid "What now"
msgstr ""
-#: builtin/clean.c:832
+#: builtin/clean.c:827
msgid "Would remove the following item:"
msgid_plural "Would remove the following items:"
msgstr[0] ""
msgstr[1] ""
-#: builtin/clean.c:848
+#: builtin/clean.c:843
msgid "No more files to clean, exiting."
msgstr ""
-#: builtin/clean.c:910
+#: builtin/clean.c:905
msgid "do not print names of files removed"
msgstr ""
-#: builtin/clean.c:912
+#: builtin/clean.c:907
msgid "force"
msgstr ""
-#: builtin/clean.c:913
+#: builtin/clean.c:908
msgid "interactive cleaning"
msgstr ""
-#: builtin/clean.c:915
+#: builtin/clean.c:910
msgid "remove whole directories"
msgstr ""
-#: builtin/clean.c:916 builtin/describe.c:533 builtin/describe.c:535
-#: builtin/grep.c:871 builtin/log.c:157 builtin/log.c:159
-#: builtin/ls-files.c:548 builtin/name-rev.c:397 builtin/name-rev.c:399
-#: builtin/show-ref.c:176
+#: builtin/clean.c:911 builtin/describe.c:545 builtin/describe.c:547
+#: builtin/grep.c:875 builtin/log.c:161 builtin/log.c:163
+#: builtin/ls-files.c:549 builtin/name-rev.c:415 builtin/name-rev.c:417
+#: builtin/show-ref.c:177
msgid "pattern"
msgstr ""
-#: builtin/clean.c:917
+#: builtin/clean.c:912
msgid "add <pattern> to ignore rules"
msgstr ""
-#: builtin/clean.c:918
+#: builtin/clean.c:913
msgid "remove ignored files, too"
msgstr ""
-#: builtin/clean.c:920
+#: builtin/clean.c:915
msgid "remove only ignored files"
msgstr ""
-#: builtin/clean.c:938
+#: builtin/clean.c:933
msgid "-x and -X cannot be used together"
msgstr ""
-#: builtin/clean.c:942
+#: builtin/clean.c:937
msgid ""
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
"clean"
msgstr ""
-#: builtin/clean.c:945
+#: builtin/clean.c:940
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
msgstr ""
-#: builtin/clone.c:42
+#: builtin/clone.c:43
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr ""
-#: builtin/clone.c:87
+#: builtin/clone.c:88
msgid "don't create a checkout"
msgstr ""
-#: builtin/clone.c:88 builtin/clone.c:90 builtin/init-db.c:479
+#: builtin/clone.c:89 builtin/clone.c:91 builtin/init-db.c:480
msgid "create a bare repository"
msgstr ""
-#: builtin/clone.c:92
+#: builtin/clone.c:93
msgid "create a mirror repository (implies bare)"
msgstr ""
-#: builtin/clone.c:94
+#: builtin/clone.c:95
msgid "to clone from a local repository"
msgstr ""
-#: builtin/clone.c:96
+#: builtin/clone.c:97
msgid "don't use local hardlinks, always copy"
msgstr ""
-#: builtin/clone.c:98
+#: builtin/clone.c:99
msgid "setup as shared repository"
msgstr ""
-#: builtin/clone.c:100 builtin/clone.c:104
+#: builtin/clone.c:101 builtin/clone.c:105
msgid "pathspec"
msgstr ""
-#: builtin/clone.c:100 builtin/clone.c:104
+#: builtin/clone.c:101 builtin/clone.c:105
msgid "initialize submodules in the clone"
msgstr ""
-#: builtin/clone.c:107
+#: builtin/clone.c:108
msgid "number of submodules cloned in parallel"
msgstr ""
-#: builtin/clone.c:108 builtin/init-db.c:476
+#: builtin/clone.c:109 builtin/init-db.c:477
msgid "template-directory"
msgstr ""
-#: builtin/clone.c:109 builtin/init-db.c:477
+#: builtin/clone.c:110 builtin/init-db.c:478
msgid "directory from which templates will be used"
msgstr ""
-#: builtin/clone.c:111 builtin/clone.c:113 builtin/submodule--helper.c:1223
-#: builtin/submodule--helper.c:1594
+#: builtin/clone.c:112 builtin/clone.c:114 builtin/submodule--helper.c:1368
+#: builtin/submodule--helper.c:1739
msgid "reference repository"
msgstr ""
-#: builtin/clone.c:115 builtin/submodule--helper.c:1225
-#: builtin/submodule--helper.c:1596
+#: builtin/clone.c:116 builtin/submodule--helper.c:1370
+#: builtin/submodule--helper.c:1741
msgid "use --reference only while cloning"
msgstr ""
-#: builtin/clone.c:116 builtin/column.c:27 builtin/merge-file.c:44
-#: builtin/pack-objects.c:3166 builtin/repack.c:213
+#: builtin/clone.c:117 builtin/column.c:27 builtin/merge-file.c:44
+#: builtin/pack-objects.c:3194 builtin/repack.c:320
msgid "name"
msgstr ""
-#: builtin/clone.c:117
+#: builtin/clone.c:118
msgid "use <name> instead of 'origin' to track upstream"
msgstr ""
-#: builtin/clone.c:119
+#: builtin/clone.c:120
msgid "checkout <branch> instead of the remote's HEAD"
msgstr ""
-#: builtin/clone.c:121
+#: builtin/clone.c:122
msgid "path to git-upload-pack on the remote"
msgstr ""
-#: builtin/clone.c:122 builtin/fetch.c:150 builtin/grep.c:813
+#: builtin/clone.c:123 builtin/fetch.c:139 builtin/grep.c:814
#: builtin/pull.c:216
msgid "depth"
msgstr ""
-#: builtin/clone.c:123
+#: builtin/clone.c:124
msgid "create a shallow clone of that depth"
msgstr ""
-#: builtin/clone.c:124 builtin/fetch.c:152 builtin/pack-objects.c:3157
+#: builtin/clone.c:125 builtin/fetch.c:141 builtin/pack-objects.c:3185
#: parse-options.h:154
msgid "time"
msgstr ""
-#: builtin/clone.c:125
+#: builtin/clone.c:126
msgid "create a shallow clone since a specific time"
msgstr ""
-#: builtin/clone.c:126 builtin/fetch.c:154
+#: builtin/clone.c:127 builtin/fetch.c:143 builtin/fetch.c:166
msgid "revision"
msgstr ""
-#: builtin/clone.c:127 builtin/fetch.c:155
+#: builtin/clone.c:128 builtin/fetch.c:144
msgid "deepen history of shallow clone, excluding rev"
msgstr ""
-#: builtin/clone.c:129
+#: builtin/clone.c:130
msgid "clone only one branch, HEAD or --branch"
msgstr ""
-#: builtin/clone.c:131
+#: builtin/clone.c:132
msgid "don't clone any tags, and make later fetches not to follow them"
msgstr ""
-#: builtin/clone.c:133
+#: builtin/clone.c:134
msgid "any cloned submodules will be shallow"
msgstr ""
-#: builtin/clone.c:134 builtin/init-db.c:485
+#: builtin/clone.c:135 builtin/init-db.c:486
msgid "gitdir"
msgstr ""
-#: builtin/clone.c:135 builtin/init-db.c:486
+#: builtin/clone.c:136 builtin/init-db.c:487
msgid "separate git dir from working tree"
msgstr ""
-#: builtin/clone.c:136
+#: builtin/clone.c:137
msgid "key=value"
msgstr ""
-#: builtin/clone.c:137
+#: builtin/clone.c:138
msgid "set config inside the new repository"
msgstr ""
-#: builtin/clone.c:138 builtin/fetch.c:173 builtin/pull.c:229
+#: builtin/clone.c:139 builtin/fetch.c:162 builtin/pull.c:229
#: builtin/push.c:583
msgid "use IPv4 addresses only"
msgstr ""
-#: builtin/clone.c:140 builtin/fetch.c:175 builtin/pull.c:232
+#: builtin/clone.c:141 builtin/fetch.c:164 builtin/pull.c:232
#: builtin/push.c:585
msgid "use IPv6 addresses only"
msgstr ""
-#: builtin/clone.c:278
+#: builtin/clone.c:279
msgid ""
"No directory name could be guessed.\n"
"Please specify a directory on the command line"
msgstr ""
-#: builtin/clone.c:331
+#: builtin/clone.c:332
#, c-format
msgid "info: Could not add alternate for '%s': %s\n"
msgstr ""
-#: builtin/clone.c:403
+#: builtin/clone.c:404
#, c-format
msgid "failed to open '%s'"
msgstr ""
-#: builtin/clone.c:411
+#: builtin/clone.c:412
#, c-format
msgid "%s exists and is not a directory"
msgstr ""
-#: builtin/clone.c:425
+#: builtin/clone.c:426
#, c-format
msgid "failed to stat %s\n"
msgstr ""
-#: builtin/clone.c:447
+#: builtin/clone.c:448
#, c-format
msgid "failed to create link '%s'"
msgstr ""
-#: builtin/clone.c:451
+#: builtin/clone.c:452
#, c-format
msgid "failed to copy file to '%s'"
msgstr ""
-#: builtin/clone.c:477
+#: builtin/clone.c:478
#, c-format
msgid "done.\n"
msgstr ""
-#: builtin/clone.c:491
+#: builtin/clone.c:492
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
"and retry the checkout with 'git checkout -f HEAD'\n"
msgstr ""
-#: builtin/clone.c:568
+#: builtin/clone.c:569
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr ""
-#: builtin/clone.c:663
-msgid "remote did not send all necessary objects"
-msgstr ""
-
-#: builtin/clone.c:679
+#: builtin/clone.c:680
#, c-format
msgid "unable to update %s"
msgstr ""
-#: builtin/clone.c:728
+#: builtin/clone.c:730
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr ""
-#: builtin/clone.c:758
+#: builtin/clone.c:760
msgid "unable to checkout working tree"
msgstr ""
-#: builtin/clone.c:803
+#: builtin/clone.c:805
msgid "unable to write parameters to config file"
msgstr ""
-#: builtin/clone.c:866
+#: builtin/clone.c:868
msgid "cannot repack to clean up"
msgstr ""
-#: builtin/clone.c:868
+#: builtin/clone.c:870
msgid "cannot unlink temporary alternates file"
msgstr ""
-#: builtin/clone.c:907 builtin/receive-pack.c:1947
+#: builtin/clone.c:910 builtin/receive-pack.c:1935
msgid "Too many arguments."
msgstr ""
-#: builtin/clone.c:911
+#: builtin/clone.c:914
msgid "You must specify a repository to clone."
msgstr ""
-#: builtin/clone.c:924
+#: builtin/clone.c:927
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr ""
-#: builtin/clone.c:927
+#: builtin/clone.c:930
msgid "--bare and --separate-git-dir are incompatible."
msgstr ""
-#: builtin/clone.c:940
+#: builtin/clone.c:943
#, c-format
msgid "repository '%s' does not exist"
msgstr ""
-#: builtin/clone.c:946 builtin/fetch.c:1460
+#: builtin/clone.c:949 builtin/fetch.c:1512
#, c-format
msgid "depth %s is not a positive number"
msgstr ""
-#: builtin/clone.c:956
+#: builtin/clone.c:959
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr ""
-#: builtin/clone.c:966
+#: builtin/clone.c:969
#, c-format
msgid "working tree '%s' already exists."
msgstr ""
-#: builtin/clone.c:981 builtin/clone.c:1002 builtin/difftool.c:270
+#: builtin/clone.c:984 builtin/clone.c:1005 builtin/difftool.c:271
#: builtin/worktree.c:246 builtin/worktree.c:276
#, c-format
msgid "could not create leading directories of '%s'"
msgstr ""
-#: builtin/clone.c:986
+#: builtin/clone.c:989
#, c-format
msgid "could not create work tree dir '%s'"
msgstr ""
-#: builtin/clone.c:1006
+#: builtin/clone.c:1009
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr ""
-#: builtin/clone.c:1008
+#: builtin/clone.c:1011
#, c-format
msgid "Cloning into '%s'...\n"
msgstr ""
-#: builtin/clone.c:1032
+#: builtin/clone.c:1035
msgid ""
"clone --recursive is not compatible with both --reference and --reference-if-"
"able"
msgstr ""
-#: builtin/clone.c:1093
+#: builtin/clone.c:1096
msgid "--depth is ignored in local clones; use file:// instead."
msgstr ""
-#: builtin/clone.c:1095
+#: builtin/clone.c:1098
msgid "--shallow-since is ignored in local clones; use file:// instead."
msgstr ""
-#: builtin/clone.c:1097
+#: builtin/clone.c:1100
msgid "--shallow-exclude is ignored in local clones; use file:// instead."
msgstr ""
-#: builtin/clone.c:1099
+#: builtin/clone.c:1102
msgid "--filter is ignored in local clones; use file:// instead."
msgstr ""
-#: builtin/clone.c:1102
+#: builtin/clone.c:1105
msgid "source repository is shallow, ignoring --local"
msgstr ""
-#: builtin/clone.c:1107
+#: builtin/clone.c:1110
msgid "--local is ignored"
msgstr ""
-#: builtin/clone.c:1169 builtin/clone.c:1177
+#: builtin/clone.c:1180 builtin/clone.c:1188
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr ""
-#: builtin/clone.c:1180
+#: builtin/clone.c:1191
msgid "You appear to have cloned an empty repository."
msgstr ""
msgid "--command must be the first argument"
msgstr ""
-#: builtin/commit.c:37
+#: builtin/commit.c:38
msgid "git commit [<options>] [--] <pathspec>..."
msgstr ""
-#: builtin/commit.c:42
+#: builtin/commit.c:43
msgid "git status [<options>] [--] <pathspec>..."
msgstr ""
-#: builtin/commit.c:47
+#: builtin/commit.c:48
msgid ""
"You asked to amend the most recent commit, but doing so would make\n"
"it empty. You can repeat your command with --allow-empty, or you can\n"
"remove the commit entirely with \"git reset HEAD^\".\n"
msgstr ""
-#: builtin/commit.c:52
+#: builtin/commit.c:53
msgid ""
"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
"If you wish to commit it anyway, use:\n"
"\n"
msgstr ""
-#: builtin/commit.c:59
+#: builtin/commit.c:60
msgid "Otherwise, please use 'git reset'\n"
msgstr ""
-#: builtin/commit.c:62
+#: builtin/commit.c:63
msgid ""
"If you wish to skip this commit, use:\n"
"\n"
"the remaining commits.\n"
msgstr ""
-#: builtin/commit.c:293
+#: builtin/commit.c:306
msgid "failed to unpack HEAD tree object"
msgstr ""
-#: builtin/commit.c:334
+#: builtin/commit.c:347
msgid "unable to create temporary index"
msgstr ""
-#: builtin/commit.c:340
+#: builtin/commit.c:353
msgid "interactive add failed"
msgstr ""
-#: builtin/commit.c:353
+#: builtin/commit.c:366
msgid "unable to update temporary index"
msgstr ""
-#: builtin/commit.c:355
+#: builtin/commit.c:368
msgid "Failed to update main cache tree"
msgstr ""
-#: builtin/commit.c:380 builtin/commit.c:403 builtin/commit.c:449
+#: builtin/commit.c:393 builtin/commit.c:416 builtin/commit.c:462
msgid "unable to write new_index file"
msgstr ""
-#: builtin/commit.c:432
+#: builtin/commit.c:445
msgid "cannot do a partial commit during a merge."
msgstr ""
-#: builtin/commit.c:434
+#: builtin/commit.c:447
msgid "cannot do a partial commit during a cherry-pick."
msgstr ""
-#: builtin/commit.c:442
+#: builtin/commit.c:455
msgid "cannot read the index"
msgstr ""
-#: builtin/commit.c:461
+#: builtin/commit.c:474
msgid "unable to write temporary index file"
msgstr ""
-#: builtin/commit.c:558
+#: builtin/commit.c:571
#, c-format
msgid "commit '%s' lacks author header"
msgstr ""
-#: builtin/commit.c:560
+#: builtin/commit.c:573
#, c-format
msgid "commit '%s' has malformed author line"
msgstr ""
-#: builtin/commit.c:579
+#: builtin/commit.c:592
msgid "malformed --author parameter"
msgstr ""
-#: builtin/commit.c:631
+#: builtin/commit.c:644
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
msgstr ""
-#: builtin/commit.c:668 builtin/commit.c:701 builtin/commit.c:1029
+#: builtin/commit.c:681 builtin/commit.c:714 builtin/commit.c:1042
#, c-format
msgid "could not lookup commit %s"
msgstr ""
-#: builtin/commit.c:680 builtin/shortlog.c:316
+#: builtin/commit.c:693 builtin/shortlog.c:317
#, c-format
msgid "(reading log message from standard input)\n"
msgstr ""
-#: builtin/commit.c:682
+#: builtin/commit.c:695
msgid "could not read log from standard input"
msgstr ""
-#: builtin/commit.c:686
+#: builtin/commit.c:699
#, c-format
msgid "could not read log file '%s'"
msgstr ""
-#: builtin/commit.c:715 builtin/commit.c:723
+#: builtin/commit.c:728 builtin/commit.c:736
msgid "could not read SQUASH_MSG"
msgstr ""
-#: builtin/commit.c:720
+#: builtin/commit.c:733
msgid "could not read MERGE_MSG"
msgstr ""
-#: builtin/commit.c:774
+#: builtin/commit.c:787
msgid "could not write commit template"
msgstr ""
-#: builtin/commit.c:792
+#: builtin/commit.c:805
#, c-format
msgid ""
"\n"
"and try again.\n"
msgstr ""
-#: builtin/commit.c:797
+#: builtin/commit.c:810
#, c-format
msgid ""
"\n"
"and try again.\n"
msgstr ""
-#: builtin/commit.c:810
+#: builtin/commit.c:823
#, 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:818
+#: builtin/commit.c:831
#, 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:835
+#: builtin/commit.c:848
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr ""
-#: builtin/commit.c:843
+#: builtin/commit.c:856
#, c-format
msgid "%sDate: %s"
msgstr ""
-#: builtin/commit.c:850
+#: builtin/commit.c:863
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr ""
-#: builtin/commit.c:867
+#: builtin/commit.c:880
msgid "Cannot read index"
msgstr ""
-#: builtin/commit.c:933
+#: builtin/commit.c:946
msgid "Error building trees"
msgstr ""
-#: builtin/commit.c:947 builtin/tag.c:257
+#: builtin/commit.c:960 builtin/tag.c:258
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr ""
-#: builtin/commit.c:991
+#: builtin/commit.c:1004
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr ""
-#: builtin/commit.c:1005
+#: builtin/commit.c:1018
#, c-format
msgid "Invalid ignored mode '%s'"
msgstr ""
-#: builtin/commit.c:1019 builtin/commit.c:1269
+#: builtin/commit.c:1032 builtin/commit.c:1269
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr ""
-#: builtin/commit.c:1057
+#: builtin/commit.c:1070
msgid "--long and -z are incompatible"
msgstr ""
-#: builtin/commit.c:1090
+#: builtin/commit.c:1103
msgid "Using both --reset-author and --author does not make sense"
msgstr ""
-#: builtin/commit.c:1099
+#: builtin/commit.c:1112
msgid "You have nothing to amend."
msgstr ""
-#: builtin/commit.c:1102
+#: builtin/commit.c:1115
msgid "You are in the middle of a merge -- cannot amend."
msgstr ""
-#: builtin/commit.c:1104
+#: builtin/commit.c:1117
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr ""
-#: builtin/commit.c:1107
+#: builtin/commit.c:1120
msgid "Options --squash and --fixup cannot be used together"
msgstr ""
-#: builtin/commit.c:1117
+#: builtin/commit.c:1130
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr ""
-#: builtin/commit.c:1119
+#: builtin/commit.c:1132
msgid "Option -m cannot be combined with -c/-C/-F."
msgstr ""
-#: builtin/commit.c:1127
+#: builtin/commit.c:1140
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr ""
-#: builtin/commit.c:1144
+#: builtin/commit.c:1157
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr ""
-#: builtin/commit.c:1146
+#: builtin/commit.c:1159
msgid "No paths with --include/--only does not make sense."
msgstr ""
-#: builtin/commit.c:1160 builtin/tag.c:543
+#: builtin/commit.c:1173 builtin/tag.c:544
#, c-format
msgid "Invalid cleanup mode %s"
msgstr ""
-#: builtin/commit.c:1165
+#: builtin/commit.c:1178
msgid "Paths with -a does not make sense."
msgstr ""
msgstr ""
#: builtin/commit.c:1319 builtin/commit.c:1323 builtin/commit.c:1494
-#: builtin/fast-export.c:1001 builtin/fast-export.c:1004 builtin/tag.c:397
+#: builtin/fast-export.c:1007 builtin/fast-export.c:1010 builtin/tag.c:398
msgid "mode"
msgstr ""
msgid "Commit message options"
msgstr ""
-#: builtin/commit.c:1454 builtin/tag.c:394
+#: builtin/commit.c:1454 builtin/merge.c:261 builtin/tag.c:395
msgid "read message from file"
msgstr ""
msgid "override author for commit"
msgstr ""
-#: builtin/commit.c:1456 builtin/gc.c:501
+#: builtin/commit.c:1456 builtin/gc.c:504
msgid "date"
msgstr ""
msgid "override date for commit"
msgstr ""
-#: builtin/commit.c:1457 builtin/merge.c:228 builtin/notes.c:402
-#: builtin/notes.c:565 builtin/tag.c:392
+#: builtin/commit.c:1457 builtin/merge.c:257 builtin/notes.c:404
+#: builtin/notes.c:567 builtin/tag.c:393
msgid "message"
msgstr ""
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr ""
-#: builtin/commit.c:1463 builtin/log.c:1446 builtin/merge.c:242
-#: builtin/pull.c:154 builtin/revert.c:105
+#: builtin/commit.c:1463 builtin/log.c:1457 builtin/merge.c:274
+#: builtin/pull.c:154 builtin/revert.c:106
msgid "add Signed-off-by:"
msgstr ""
msgid "default"
msgstr ""
-#: builtin/commit.c:1466 builtin/tag.c:398
+#: builtin/commit.c:1466 builtin/tag.c:399
msgid "how to strip spaces and #comments from message"
msgstr ""
msgid "include status in commit message template"
msgstr ""
-#: builtin/commit.c:1469 builtin/merge.c:240 builtin/pull.c:184
-#: builtin/revert.c:113
+#: builtin/commit.c:1469 builtin/merge.c:272 builtin/pull.c:184
+#: builtin/revert.c:114
msgid "GPG sign commit"
msgstr ""
#: builtin/commit.c:1650
msgid ""
-"Repository has been updated, but unable to write\n"
+"repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
"not exceeded, and then \"git reset HEAD\" to recover."
msgstr ""
-#: builtin/commit-graph.c:9
+#: builtin/commit-graph.c:10
msgid "git commit-graph [--object-dir <objdir>]"
msgstr ""
-#: builtin/commit-graph.c:10 builtin/commit-graph.c:16
+#: builtin/commit-graph.c:11 builtin/commit-graph.c:23
msgid "git commit-graph read [--object-dir <objdir>]"
msgstr ""
-#: builtin/commit-graph.c:11 builtin/commit-graph.c:21
+#: builtin/commit-graph.c:12 builtin/commit-graph.c:18
+msgid "git commit-graph verify [--object-dir <objdir>]"
+msgstr ""
+
+#: builtin/commit-graph.c:13 builtin/commit-graph.c:28
msgid ""
-"git commit-graph write [--object-dir <objdir>] [--append] [--stdin-packs|--"
-"stdin-commits]"
+"git commit-graph write [--object-dir <objdir>] [--append] [--reachable|--"
+"stdin-packs|--stdin-commits]"
msgstr ""
-#: builtin/commit-graph.c:39 builtin/commit-graph.c:92
-#: builtin/commit-graph.c:147 builtin/fetch.c:161 builtin/log.c:1466
+#: builtin/commit-graph.c:48 builtin/commit-graph.c:77
+#: builtin/commit-graph.c:131 builtin/commit-graph.c:184 builtin/fetch.c:150
+#: builtin/log.c:1477
msgid "dir"
msgstr ""
-#: builtin/commit-graph.c:40 builtin/commit-graph.c:93
-#: builtin/commit-graph.c:148
+#: builtin/commit-graph.c:49 builtin/commit-graph.c:78
+#: builtin/commit-graph.c:132 builtin/commit-graph.c:185
msgid "The object directory to store the graph"
msgstr ""
-#: builtin/commit-graph.c:95
+#: builtin/commit-graph.c:134
+msgid "start walk at all refs"
+msgstr ""
+
+#: builtin/commit-graph.c:136
msgid "scan pack-indexes listed by stdin for commits"
msgstr ""
-#: builtin/commit-graph.c:97
+#: builtin/commit-graph.c:138
msgid "start walk at commits listed by stdin"
msgstr ""
-#: builtin/commit-graph.c:99
+#: builtin/commit-graph.c:140
msgid "include all commits already in the commit-graph file"
msgstr ""
-#: builtin/commit-graph.c:108
-msgid "cannot use both --stdin-commits and --stdin-packs"
+#: builtin/commit-graph.c:149
+msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
msgstr ""
#: builtin/config.c:10
msgid "unrecognized --type argument, %s"
msgstr ""
-#: builtin/config.c:123
+#: builtin/config.c:113
+msgid "only one type at a time"
+msgstr ""
+
+#: builtin/config.c:122
msgid "Config file location"
msgstr ""
-#: builtin/config.c:124
+#: builtin/config.c:123
msgid "use global config file"
msgstr ""
-#: builtin/config.c:125
+#: builtin/config.c:124
msgid "use system config file"
msgstr ""
-#: builtin/config.c:126
+#: builtin/config.c:125
msgid "use repository config file"
msgstr ""
-#: builtin/config.c:127
+#: builtin/config.c:126
msgid "use given config file"
msgstr ""
-#: builtin/config.c:128
+#: builtin/config.c:127
msgid "blob-id"
msgstr ""
-#: builtin/config.c:128
+#: builtin/config.c:127
msgid "read config from given blob object"
msgstr ""
-#: builtin/config.c:129
+#: builtin/config.c:128
msgid "Action"
msgstr ""
-#: builtin/config.c:130
+#: builtin/config.c:129
msgid "get value: name [value-regex]"
msgstr ""
-#: builtin/config.c:131
+#: builtin/config.c:130
msgid "get all values: key [value-regex]"
msgstr ""
-#: builtin/config.c:132
+#: builtin/config.c:131
msgid "get values for regexp: name-regex [value-regex]"
msgstr ""
-#: builtin/config.c:133
+#: builtin/config.c:132
msgid "get value specific for the URL: section[.var] URL"
msgstr ""
-#: builtin/config.c:134
+#: builtin/config.c:133
msgid "replace all matching variables: name value [value_regex]"
msgstr ""
-#: builtin/config.c:135
+#: builtin/config.c:134
msgid "add a new variable: name value"
msgstr ""
-#: builtin/config.c:136
+#: builtin/config.c:135
msgid "remove a variable: name [value-regex]"
msgstr ""
-#: builtin/config.c:137
+#: builtin/config.c:136
msgid "remove all matches: name [value-regex]"
msgstr ""
-#: builtin/config.c:138
+#: builtin/config.c:137
msgid "rename section: old-name new-name"
msgstr ""
-#: builtin/config.c:139
+#: builtin/config.c:138
msgid "remove a section: name"
msgstr ""
-#: builtin/config.c:140
+#: builtin/config.c:139
msgid "list all"
msgstr ""
-#: builtin/config.c:141
+#: builtin/config.c:140
msgid "open an editor"
msgstr ""
-#: builtin/config.c:142
+#: builtin/config.c:141
msgid "find the color configured: slot [default]"
msgstr ""
-#: builtin/config.c:143
+#: builtin/config.c:142
msgid "find the color setting: slot [stdout-is-tty]"
msgstr ""
-#: builtin/config.c:144
+#: builtin/config.c:143
msgid "Type"
msgstr ""
-#: builtin/config.c:145
+#: builtin/config.c:144
msgid "value is given this type"
msgstr ""
-#: builtin/config.c:146
+#: builtin/config.c:145
msgid "value is \"true\" or \"false\""
msgstr ""
-#: builtin/config.c:147
+#: builtin/config.c:146
msgid "value is decimal number"
msgstr ""
-#: builtin/config.c:148
+#: builtin/config.c:147
msgid "value is --bool or --int"
msgstr ""
-#: builtin/config.c:149
+#: builtin/config.c:148
msgid "value is a path (file or directory name)"
msgstr ""
-#: builtin/config.c:150
+#: builtin/config.c:149
msgid "value is an expiry date"
msgstr ""
-#: builtin/config.c:151
+#: builtin/config.c:150
msgid "Other"
msgstr ""
-#: builtin/config.c:152
+#: builtin/config.c:151
msgid "terminate values with NUL byte"
msgstr ""
-#: builtin/config.c:153
+#: builtin/config.c:152
msgid "show variable names only"
msgstr ""
-#: builtin/config.c:154
+#: builtin/config.c:153
msgid "respect include directives on lookup"
msgstr ""
-#: builtin/config.c:155
+#: builtin/config.c:154
msgid "show origin of config (file, standard input, blob, command line)"
msgstr ""
-#: builtin/config.c:156
+#: builtin/config.c:155
msgid "value"
msgstr ""
-#: builtin/config.c:156
+#: builtin/config.c:155
msgid "with --get, use default value when missing entry"
msgstr ""
-#: builtin/config.c:332
+#: builtin/config.c:168
+#, c-format
+msgid "wrong number of arguments, should be %d"
+msgstr ""
+
+#: builtin/config.c:170
+#, c-format
+msgid "wrong number of arguments, should be from %d to %d"
+msgstr ""
+
+#: builtin/config.c:304
+#, c-format
+msgid "invalid key pattern: %s"
+msgstr ""
+
+#: builtin/config.c:340
#, c-format
msgid "failed to format default config value: %s"
msgstr ""
-#: builtin/config.c:431
+#: builtin/config.c:397
+#, c-format
+msgid "cannot parse color '%s'"
+msgstr ""
+
+#: builtin/config.c:439
msgid "unable to parse default color value"
msgstr ""
-#: builtin/config.c:575
+#: builtin/config.c:492 builtin/config.c:724
+msgid "not in a git directory"
+msgstr ""
+
+#: builtin/config.c:495
+msgid "writing to stdin is not supported"
+msgstr ""
+
+#: builtin/config.c:498
+msgid "writing config blobs is not supported"
+msgstr ""
+
+#: builtin/config.c:583
#, c-format
msgid ""
"# This is Git's per-user configuration file.\n"
"#\temail = %s\n"
msgstr ""
-#: builtin/config.c:603
+#: builtin/config.c:606
+msgid "only one config file at a time"
+msgstr ""
+
+#: builtin/config.c:611
msgid "--local can only be used inside a git repository"
msgstr ""
-#: builtin/config.c:606
+#: builtin/config.c:614
msgid "--blob can only be used inside a git repository"
msgstr ""
-#: builtin/config.c:735
+#: builtin/config.c:633
+msgid "$HOME not set"
+msgstr ""
+
+#: builtin/config.c:670
+msgid "--get-color and variable type are incoherent"
+msgstr ""
+
+#: builtin/config.c:675
+msgid "only one action at a time"
+msgstr ""
+
+#: builtin/config.c:688
+msgid "--name-only is only applicable to --list or --get-regexp"
+msgstr ""
+
+#: builtin/config.c:694
+msgid ""
+"--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
+"list"
+msgstr ""
+
+#: builtin/config.c:700
+msgid "--default is only applicable to --get"
+msgstr ""
+
+#: builtin/config.c:713
+#, c-format
+msgid "unable to read config file '%s'"
+msgstr ""
+
+#: builtin/config.c:716
+msgid "error processing config file(s)"
+msgstr ""
+
+#: builtin/config.c:726
+msgid "editing stdin is not supported"
+msgstr ""
+
+#: builtin/config.c:728
+msgid "editing blobs is not supported"
+msgstr ""
+
+#: builtin/config.c:742
#, c-format
msgid "cannot create configuration file %s"
msgstr ""
-#: builtin/config.c:748
+#: builtin/config.c:755
#, c-format
msgid ""
"cannot overwrite multiple values with a single value\n"
" Use a regexp, --add or --replace-all to change %s."
msgstr ""
+#: builtin/config.c:829 builtin/config.c:840
+#, c-format
+msgid "no such section: %s"
+msgstr ""
+
#: builtin/count-objects.c:90
msgid "git count-objects [-v] [-H | --human-readable]"
msgstr ""
msgid "print sizes in human readable format"
msgstr ""
-#: builtin/describe.c:22
+#: builtin/describe.c:26
msgid "git describe [<options>] [<commit-ish>...]"
msgstr ""
-#: builtin/describe.c:23
+#: builtin/describe.c:27
msgid "git describe [<options>] --dirty"
msgstr ""
-#: builtin/describe.c:57
+#: builtin/describe.c:62
msgid "head"
msgstr ""
-#: builtin/describe.c:57
+#: builtin/describe.c:62
msgid "lightweight"
msgstr ""
-#: builtin/describe.c:57
+#: builtin/describe.c:62
msgid "annotated"
msgstr ""
-#: builtin/describe.c:267
+#: builtin/describe.c:272
#, c-format
msgid "annotated tag %s not available"
msgstr ""
-#: builtin/describe.c:271
+#: builtin/describe.c:276
#, c-format
msgid "annotated tag %s has no embedded name"
msgstr ""
-#: builtin/describe.c:273
+#: builtin/describe.c:278
#, c-format
msgid "tag '%s' is really '%s' here"
msgstr ""
-#: builtin/describe.c:317
+#: builtin/describe.c:322
#, c-format
msgid "no tag exactly matches '%s'"
msgstr ""
-#: builtin/describe.c:319
+#: builtin/describe.c:324
#, c-format
msgid "No exact match on refs or tags, searching to describe\n"
msgstr ""
-#: builtin/describe.c:366
+#: builtin/describe.c:378
#, c-format
msgid "finished search at %s\n"
msgstr ""
-#: builtin/describe.c:392
+#: builtin/describe.c:404
#, c-format
msgid ""
"No annotated tags can describe '%s'.\n"
"However, there were unannotated tags: try --tags."
msgstr ""
-#: builtin/describe.c:396
+#: builtin/describe.c:408
#, c-format
msgid ""
"No tags can describe '%s'.\n"
"Try --always, or create some tags."
msgstr ""
-#: builtin/describe.c:426
+#: builtin/describe.c:438
#, c-format
msgid "traversed %lu commits\n"
msgstr ""
-#: builtin/describe.c:429
+#: builtin/describe.c:441
#, c-format
msgid ""
"more than %i tags found; listed %i most recent\n"
"gave up search at %s\n"
msgstr ""
-#: builtin/describe.c:497
+#: builtin/describe.c:509
#, c-format
msgid "describe %s\n"
msgstr ""
-#: builtin/describe.c:500 builtin/log.c:502
+#: builtin/describe.c:512 builtin/log.c:508
#, c-format
msgid "Not a valid object name %s"
msgstr ""
-#: builtin/describe.c:508
+#: builtin/describe.c:520
#, c-format
msgid "%s is neither a commit nor blob"
msgstr ""
-#: builtin/describe.c:522
+#: builtin/describe.c:534
msgid "find the tag that comes after the commit"
msgstr ""
-#: builtin/describe.c:523
+#: builtin/describe.c:535
msgid "debug search strategy on stderr"
msgstr ""
-#: builtin/describe.c:524
+#: builtin/describe.c:536
msgid "use any ref"
msgstr ""
-#: builtin/describe.c:525
+#: builtin/describe.c:537
msgid "use any tag, even unannotated"
msgstr ""
-#: builtin/describe.c:526
+#: builtin/describe.c:538
msgid "always use long format"
msgstr ""
-#: builtin/describe.c:527
+#: builtin/describe.c:539
msgid "only follow first parent"
msgstr ""
-#: builtin/describe.c:530
+#: builtin/describe.c:542
msgid "only output exact matches"
msgstr ""
-#: builtin/describe.c:532
+#: builtin/describe.c:544
msgid "consider <n> most recent tags (default: 10)"
msgstr ""
-#: builtin/describe.c:534
+#: builtin/describe.c:546
msgid "only consider tags matching <pattern>"
msgstr ""
-#: builtin/describe.c:536
+#: builtin/describe.c:548
msgid "do not consider tags matching <pattern>"
msgstr ""
-#: builtin/describe.c:538 builtin/name-rev.c:406
+#: builtin/describe.c:550 builtin/name-rev.c:424
msgid "show abbreviated commit object as fallback"
msgstr ""
-#: builtin/describe.c:539 builtin/describe.c:542
+#: builtin/describe.c:551 builtin/describe.c:554
msgid "mark"
msgstr ""
-#: builtin/describe.c:540
+#: builtin/describe.c:552
msgid "append <mark> on dirty working tree (default: \"-dirty\")"
msgstr ""
-#: builtin/describe.c:543
+#: builtin/describe.c:555
msgid "append <mark> on broken working tree (default: \"-broken\")"
msgstr ""
-#: builtin/describe.c:561
+#: builtin/describe.c:573
msgid "--long is incompatible with --abbrev=0"
msgstr ""
-#: builtin/describe.c:590
+#: builtin/describe.c:602
msgid "No names found, cannot describe anything."
msgstr ""
-#: builtin/describe.c:640
+#: builtin/describe.c:652
msgid "--dirty is incompatible with commit-ishes"
msgstr ""
-#: builtin/describe.c:642
+#: builtin/describe.c:654
msgid "--broken is incompatible with commit-ishes"
msgstr ""
msgid "invalid option: %s"
msgstr ""
-#: builtin/diff.c:356
+#: builtin/diff.c:363
msgid "Not a git repository"
msgstr ""
-#: builtin/diff.c:399
+#: builtin/diff.c:407
#, c-format
msgid "invalid object '%s' given."
msgstr ""
-#: builtin/diff.c:408
+#: builtin/diff.c:416
#, c-format
msgid "more than two blobs given: '%s'"
msgstr ""
-#: builtin/diff.c:413
+#: builtin/diff.c:421
#, c-format
msgid "unhandled object '%s' given."
msgstr ""
-#: builtin/difftool.c:29
+#: builtin/difftool.c:30
msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
msgstr ""
-#: builtin/difftool.c:259
+#: builtin/difftool.c:260
#, c-format
msgid "failed: %d"
msgstr ""
-#: builtin/difftool.c:301
+#: builtin/difftool.c:302
#, c-format
msgid "could not read symlink %s"
msgstr ""
-#: builtin/difftool.c:303
+#: builtin/difftool.c:304
#, c-format
msgid "could not read symlink file %s"
msgstr ""
-#: builtin/difftool.c:311
+#: builtin/difftool.c:312
#, c-format
msgid "could not read object %s for symlink %s"
msgstr ""
-#: builtin/difftool.c:412
+#: builtin/difftool.c:413
msgid ""
"combined diff formats('-c' and '--cc') are not supported in\n"
"directory diff mode('-d' and '--dir-diff')."
msgstr ""
-#: builtin/difftool.c:632
+#: builtin/difftool.c:633
#, c-format
msgid "both files modified: '%s' and '%s'."
msgstr ""
-#: builtin/difftool.c:634
+#: builtin/difftool.c:635
msgid "working tree file has been left."
msgstr ""
-#: builtin/difftool.c:645
+#: builtin/difftool.c:646
#, c-format
msgid "temporary files exist in '%s'."
msgstr ""
-#: builtin/difftool.c:646
+#: builtin/difftool.c:647
msgid "you may want to cleanup or recover these."
msgstr ""
-#: builtin/difftool.c:695
+#: builtin/difftool.c:696
msgid "use `diff.guitool` instead of `diff.tool`"
msgstr ""
-#: builtin/difftool.c:697
+#: builtin/difftool.c:698
msgid "perform a full-directory diff"
msgstr ""
-#: builtin/difftool.c:699
+#: builtin/difftool.c:700
msgid "do not prompt before launching a diff tool"
msgstr ""
-#: builtin/difftool.c:704
+#: builtin/difftool.c:705
msgid "use symlinks in dir-diff mode"
msgstr ""
-#: builtin/difftool.c:705
-msgid "<tool>"
+#: builtin/difftool.c:706
+msgid "tool"
msgstr ""
-#: builtin/difftool.c:706
+#: builtin/difftool.c:707
msgid "use the specified diff tool"
msgstr ""
-#: builtin/difftool.c:708
+#: builtin/difftool.c:709
msgid "print a list of diff tools that may be used with `--tool`"
msgstr ""
-#: builtin/difftool.c:711
+#: builtin/difftool.c:712
msgid ""
"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
"code"
msgstr ""
-#: builtin/difftool.c:713
-msgid "<command>"
-msgstr ""
-
-#: builtin/difftool.c:714
+#: builtin/difftool.c:715
msgid "specify a custom command for viewing diffs"
msgstr ""
-#: builtin/difftool.c:738
+#: builtin/difftool.c:739
msgid "no <tool> given for --tool=<tool>"
msgstr ""
-#: builtin/difftool.c:745
+#: builtin/difftool.c:746
msgid "no <cmd> given for --extcmd=<cmd>"
msgstr ""
-#: builtin/fast-export.c:27
+#: builtin/fast-export.c:29
msgid "git fast-export [rev-list-opts]"
msgstr ""
-#: builtin/fast-export.c:1000
+#: builtin/fast-export.c:1006
msgid "show progress after <n> objects"
msgstr ""
-#: builtin/fast-export.c:1002
+#: builtin/fast-export.c:1008
msgid "select handling of signed tags"
msgstr ""
-#: builtin/fast-export.c:1005
+#: builtin/fast-export.c:1011
msgid "select handling of tags that tag filtered objects"
msgstr ""
-#: builtin/fast-export.c:1008
+#: builtin/fast-export.c:1014
msgid "Dump marks to this file"
msgstr ""
-#: builtin/fast-export.c:1010
+#: builtin/fast-export.c:1016
msgid "Import marks from this file"
msgstr ""
-#: builtin/fast-export.c:1012
+#: builtin/fast-export.c:1018
msgid "Fake a tagger when tags lack one"
msgstr ""
-#: builtin/fast-export.c:1014
+#: builtin/fast-export.c:1020
msgid "Output full tree for each commit"
msgstr ""
-#: builtin/fast-export.c:1016
+#: builtin/fast-export.c:1022
msgid "Use the done feature to terminate the stream"
msgstr ""
-#: builtin/fast-export.c:1017
+#: builtin/fast-export.c:1023
msgid "Skip output of blob data"
msgstr ""
-#: builtin/fast-export.c:1018
+#: builtin/fast-export.c:1024
msgid "refspec"
msgstr ""
-#: builtin/fast-export.c:1019
+#: builtin/fast-export.c:1025
msgid "Apply refspec to exported refs"
msgstr ""
-#: builtin/fast-export.c:1020
+#: builtin/fast-export.c:1026
msgid "anonymize output"
msgstr ""
-#: builtin/fetch.c:26
+#: builtin/fetch.c:27
msgid "git fetch [<options>] [<repository> [<refspec>...]]"
msgstr ""
-#: builtin/fetch.c:27
+#: builtin/fetch.c:28
msgid "git fetch [<options>] <group>"
msgstr ""
-#: builtin/fetch.c:28
+#: builtin/fetch.c:29
msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
msgstr ""
-#: builtin/fetch.c:29
+#: builtin/fetch.c:30
msgid "git fetch --all [<options>]"
msgstr ""
-#: builtin/fetch.c:123 builtin/pull.c:193
+#: builtin/fetch.c:112 builtin/pull.c:193
msgid "fetch from all remotes"
msgstr ""
-#: builtin/fetch.c:125 builtin/pull.c:196
+#: builtin/fetch.c:114 builtin/pull.c:196
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr ""
-#: builtin/fetch.c:127 builtin/pull.c:199
+#: builtin/fetch.c:116 builtin/pull.c:199
msgid "path to upload pack on remote end"
msgstr ""
-#: builtin/fetch.c:128 builtin/pull.c:201
+#: builtin/fetch.c:117 builtin/pull.c:201
msgid "force overwrite of local branch"
msgstr ""
-#: builtin/fetch.c:130
+#: builtin/fetch.c:119
msgid "fetch from multiple remotes"
msgstr ""
-#: builtin/fetch.c:132 builtin/pull.c:203
+#: builtin/fetch.c:121 builtin/pull.c:203
msgid "fetch all tags and associated objects"
msgstr ""
-#: builtin/fetch.c:134
+#: builtin/fetch.c:123
msgid "do not fetch all tags (--no-tags)"
msgstr ""
-#: builtin/fetch.c:136
+#: builtin/fetch.c:125
msgid "number of submodules fetched in parallel"
msgstr ""
-#: builtin/fetch.c:138 builtin/pull.c:206
+#: builtin/fetch.c:127 builtin/pull.c:206
msgid "prune remote-tracking branches no longer on remote"
msgstr ""
-#: builtin/fetch.c:140
+#: builtin/fetch.c:129
msgid "prune local tags no longer on remote and clobber changed tags"
msgstr ""
-#: builtin/fetch.c:141 builtin/fetch.c:164 builtin/pull.c:131
+#: builtin/fetch.c:130 builtin/fetch.c:153 builtin/pull.c:131
msgid "on-demand"
msgstr ""
-#: builtin/fetch.c:142
+#: builtin/fetch.c:131
msgid "control recursive fetching of submodules"
msgstr ""
-#: builtin/fetch.c:146 builtin/pull.c:214
+#: builtin/fetch.c:135 builtin/pull.c:214
msgid "keep downloaded pack"
msgstr ""
-#: builtin/fetch.c:148
+#: builtin/fetch.c:137
msgid "allow updating of HEAD ref"
msgstr ""
-#: builtin/fetch.c:151 builtin/fetch.c:157 builtin/pull.c:217
+#: builtin/fetch.c:140 builtin/fetch.c:146 builtin/pull.c:217
msgid "deepen history of shallow clone"
msgstr ""
-#: builtin/fetch.c:153
+#: builtin/fetch.c:142
msgid "deepen history of shallow repository based on time"
msgstr ""
-#: builtin/fetch.c:159 builtin/pull.c:220
+#: builtin/fetch.c:148 builtin/pull.c:220
msgid "convert to a complete repository"
msgstr ""
-#: builtin/fetch.c:162
+#: builtin/fetch.c:151
msgid "prepend this to submodule path output"
msgstr ""
-#: builtin/fetch.c:165
+#: builtin/fetch.c:154
msgid ""
"default for recursive fetching of submodules (lower priority than config "
"files)"
msgstr ""
-#: builtin/fetch.c:169 builtin/pull.c:223
+#: builtin/fetch.c:158 builtin/pull.c:223
msgid "accept refs that update .git/shallow"
msgstr ""
-#: builtin/fetch.c:170 builtin/pull.c:225
+#: builtin/fetch.c:159 builtin/pull.c:225
msgid "refmap"
msgstr ""
-#: builtin/fetch.c:171 builtin/pull.c:226
+#: builtin/fetch.c:160 builtin/pull.c:226
msgid "specify fetch refmap"
msgstr ""
-#: builtin/fetch.c:172 builtin/ls-remote.c:77 builtin/push.c:582
+#: builtin/fetch.c:161 builtin/ls-remote.c:77 builtin/push.c:582
#: builtin/send-pack.c:172
msgid "server-specific"
msgstr ""
-#: builtin/fetch.c:172 builtin/ls-remote.c:77 builtin/push.c:582
+#: builtin/fetch.c:161 builtin/ls-remote.c:77 builtin/push.c:582
#: builtin/send-pack.c:173
msgid "option to transmit"
msgstr ""
-#: builtin/fetch.c:442
+#: builtin/fetch.c:167
+msgid "report that we have only objects reachable from this object"
+msgstr ""
+
+#: builtin/fetch.c:418
msgid "Couldn't find remote ref HEAD"
msgstr ""
-#: builtin/fetch.c:560
+#: builtin/fetch.c:552
#, c-format
msgid "configuration fetch.output contains invalid value %s"
msgstr ""
-#: builtin/fetch.c:653
+#: builtin/fetch.c:645
#, c-format
msgid "object %s not found"
msgstr ""
-#: builtin/fetch.c:657
+#: builtin/fetch.c:649
msgid "[up to date]"
msgstr ""
-#: builtin/fetch.c:670 builtin/fetch.c:750
+#: builtin/fetch.c:662 builtin/fetch.c:744
msgid "[rejected]"
msgstr ""
-#: builtin/fetch.c:671
+#: builtin/fetch.c:663
msgid "can't fetch in current branch"
msgstr ""
-#: builtin/fetch.c:680
+#: builtin/fetch.c:672
msgid "[tag update]"
msgstr ""
-#: builtin/fetch.c:681 builtin/fetch.c:714 builtin/fetch.c:730
-#: builtin/fetch.c:745
+#: builtin/fetch.c:673 builtin/fetch.c:708 builtin/fetch.c:724
+#: builtin/fetch.c:739
msgid "unable to update local ref"
msgstr ""
-#: builtin/fetch.c:700
+#: builtin/fetch.c:694
msgid "[new tag]"
msgstr ""
-#: builtin/fetch.c:703
+#: builtin/fetch.c:697
msgid "[new branch]"
msgstr ""
-#: builtin/fetch.c:706
+#: builtin/fetch.c:700
msgid "[new ref]"
msgstr ""
-#: builtin/fetch.c:745
+#: builtin/fetch.c:739
msgid "forced update"
msgstr ""
-#: builtin/fetch.c:750
+#: builtin/fetch.c:744
msgid "non-fast-forward"
msgstr ""
-#: builtin/fetch.c:795
+#: builtin/fetch.c:790
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr ""
-#: builtin/fetch.c:815
+#: builtin/fetch.c:811
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr ""
-#: builtin/fetch.c:903 builtin/fetch.c:999
+#: builtin/fetch.c:900 builtin/fetch.c:1011
#, c-format
msgid "From %.*s\n"
msgstr ""
-#: builtin/fetch.c:914
+#: builtin/fetch.c:911
#, 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:969
+#: builtin/fetch.c:981
#, c-format
msgid " (%s will become dangling)"
msgstr ""
-#: builtin/fetch.c:970
+#: builtin/fetch.c:982
#, c-format
msgid " (%s has become dangling)"
msgstr ""
-#: builtin/fetch.c:1002
+#: builtin/fetch.c:1014
msgid "[deleted]"
msgstr ""
-#: builtin/fetch.c:1003 builtin/remote.c:1033
+#: builtin/fetch.c:1015 builtin/remote.c:1035
msgid "(none)"
msgstr ""
-#: builtin/fetch.c:1026
+#: builtin/fetch.c:1038
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr ""
-#: builtin/fetch.c:1045
+#: builtin/fetch.c:1057
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr ""
-#: builtin/fetch.c:1048
+#: builtin/fetch.c:1060
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr ""
-#: builtin/fetch.c:1287
+#: builtin/fetch.c:1339
#, c-format
msgid "Fetching %s\n"
msgstr ""
-#: builtin/fetch.c:1289 builtin/remote.c:98
+#: builtin/fetch.c:1341 builtin/remote.c:99
#, c-format
msgid "Could not fetch %s"
msgstr ""
-#: builtin/fetch.c:1335 builtin/fetch.c:1503
+#: builtin/fetch.c:1387 builtin/fetch.c:1555
msgid ""
"--filter can only be used with the remote configured in core.partialClone"
msgstr ""
-#: builtin/fetch.c:1358
+#: builtin/fetch.c:1410
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:1395
+#: builtin/fetch.c:1447
msgid "You need to specify a tag name."
msgstr ""
-#: builtin/fetch.c:1444
+#: builtin/fetch.c:1496
msgid "Negative depth in --deepen is not supported"
msgstr ""
-#: builtin/fetch.c:1446
+#: builtin/fetch.c:1498
msgid "--deepen and --depth are mutually exclusive"
msgstr ""
-#: builtin/fetch.c:1451
+#: builtin/fetch.c:1503
msgid "--depth and --unshallow cannot be used together"
msgstr ""
-#: builtin/fetch.c:1453
+#: builtin/fetch.c:1505
msgid "--unshallow on a complete repository does not make sense"
msgstr ""
-#: builtin/fetch.c:1469
+#: builtin/fetch.c:1521
msgid "fetch --all does not take a repository argument"
msgstr ""
-#: builtin/fetch.c:1471
+#: builtin/fetch.c:1523
msgid "fetch --all does not make sense with refspecs"
msgstr ""
-#: builtin/fetch.c:1480
+#: builtin/fetch.c:1532
#, c-format
msgid "No such remote or remote group: %s"
msgstr ""
-#: builtin/fetch.c:1487
+#: builtin/fetch.c:1539
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr ""
-#: builtin/fmt-merge-msg.c:15
+#: builtin/fmt-merge-msg.c:17
msgid ""
"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
msgstr ""
-#: builtin/fmt-merge-msg.c:666
+#: builtin/fmt-merge-msg.c:671
msgid "populate log with at most <n> entries from shortlog"
msgstr ""
-#: builtin/fmt-merge-msg.c:669
+#: builtin/fmt-merge-msg.c:674
msgid "alias for --log (deprecated)"
msgstr ""
-#: builtin/fmt-merge-msg.c:672
+#: builtin/fmt-merge-msg.c:677
msgid "text"
msgstr ""
-#: builtin/fmt-merge-msg.c:673
+#: builtin/fmt-merge-msg.c:678
msgid "use <text> as start of message"
msgstr ""
-#: builtin/fmt-merge-msg.c:674
+#: builtin/fmt-merge-msg.c:679
msgid "file to read from"
msgstr ""
msgid "show only <n> matched refs"
msgstr ""
-#: builtin/for-each-ref.c:39 builtin/tag.c:421
+#: builtin/for-each-ref.c:39 builtin/tag.c:422
msgid "respect format colors"
msgstr ""
msgid "print only refs which don't contain the commit"
msgstr ""
-#: builtin/fsck.c:569
+#: builtin/fsck.c:574
msgid "Checking object directories"
msgstr ""
-#: builtin/fsck.c:661
+#: builtin/fsck.c:666
msgid "git fsck [<options>] [<object>...]"
msgstr ""
-#: builtin/fsck.c:667
+#: builtin/fsck.c:672
msgid "show unreachable objects"
msgstr ""
-#: builtin/fsck.c:668
+#: builtin/fsck.c:673
msgid "show dangling objects"
msgstr ""
-#: builtin/fsck.c:669
+#: builtin/fsck.c:674
msgid "report tags"
msgstr ""
-#: builtin/fsck.c:670
+#: builtin/fsck.c:675
msgid "report root nodes"
msgstr ""
-#: builtin/fsck.c:671
+#: builtin/fsck.c:676
msgid "make index objects head nodes"
msgstr ""
-#: builtin/fsck.c:672
+#: builtin/fsck.c:677
msgid "make reflogs head nodes (default)"
msgstr ""
-#: builtin/fsck.c:673
+#: builtin/fsck.c:678
msgid "also consider packs and alternate objects"
msgstr ""
-#: builtin/fsck.c:674
+#: builtin/fsck.c:679
msgid "check only connectivity"
msgstr ""
-#: builtin/fsck.c:675
+#: builtin/fsck.c:680
msgid "enable more strict checking"
msgstr ""
-#: builtin/fsck.c:677
+#: builtin/fsck.c:682
msgid "write dangling objects in .git/lost-found"
msgstr ""
-#: builtin/fsck.c:678 builtin/prune.c:109
+#: builtin/fsck.c:683 builtin/prune.c:110
msgid "show progress"
msgstr ""
-#: builtin/fsck.c:679
+#: builtin/fsck.c:684
msgid "show verbose names for reachable objects"
msgstr ""
-#: builtin/fsck.c:745
+#: builtin/fsck.c:750
msgid "Checking objects"
msgstr ""
-#: builtin/gc.c:33
+#: builtin/gc.c:34
msgid "git gc [<options>]"
msgstr ""
-#: builtin/gc.c:88
+#: builtin/gc.c:90
#, c-format
msgid "Failed to fstat %s: %s"
msgstr ""
-#: builtin/gc.c:452
+#: builtin/gc.c:455
#, c-format
msgid "Can't stat %s"
msgstr ""
-#: builtin/gc.c:461
+#: builtin/gc.c:464
#, c-format
msgid ""
"The last gc run reported the following. Please correct the root cause\n"
"%s"
msgstr ""
-#: builtin/gc.c:502
+#: builtin/gc.c:505
msgid "prune unreferenced objects"
msgstr ""
-#: builtin/gc.c:504
+#: builtin/gc.c:507
msgid "be more thorough (increased runtime)"
msgstr ""
-#: builtin/gc.c:505
+#: builtin/gc.c:508
msgid "enable auto-gc mode"
msgstr ""
-#: builtin/gc.c:508
+#: builtin/gc.c:511
msgid "force running gc even if there may be another gc running"
msgstr ""
-#: builtin/gc.c:511
+#: builtin/gc.c:514
msgid "repack all other packs except the largest pack"
msgstr ""
-#: builtin/gc.c:528
+#: builtin/gc.c:531
#, c-format
msgid "failed to parse gc.logexpiry value %s"
msgstr ""
-#: builtin/gc.c:539
+#: builtin/gc.c:542
#, c-format
msgid "failed to parse prune expiry value %s"
msgstr ""
-#: builtin/gc.c:559
+#: builtin/gc.c:562
#, c-format
msgid "Auto packing the repository in background for optimum performance.\n"
msgstr ""
-#: builtin/gc.c:561
+#: builtin/gc.c:564
#, c-format
msgid "Auto packing the repository for optimum performance.\n"
msgstr ""
-#: builtin/gc.c:562
+#: builtin/gc.c:565
#, c-format
msgid "See \"git help gc\" for manual housekeeping.\n"
msgstr ""
-#: builtin/gc.c:598
+#: builtin/gc.c:601
#, c-format
msgid ""
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
msgstr ""
-#: builtin/gc.c:645
+#: builtin/gc.c:652
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr ""
#. variable for tweaking threads, currently
#. grep.threads
#.
-#: builtin/grep.c:293 builtin/index-pack.c:1535 builtin/index-pack.c:1727
+#: builtin/grep.c:293 builtin/index-pack.c:1536 builtin/index-pack.c:1728
+#: builtin/pack-objects.c:2639
#, c-format
msgid "no threads support, ignoring %s"
msgstr ""
msgid "unable to grep from object of type %s"
msgstr ""
-#: builtin/grep.c:703
+#: builtin/grep.c:704
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr ""
-#: builtin/grep.c:790
+#: builtin/grep.c:791
msgid "search in index instead of in the work tree"
msgstr ""
-#: builtin/grep.c:792
+#: builtin/grep.c:793
msgid "find in contents not managed by git"
msgstr ""
-#: builtin/grep.c:794
+#: builtin/grep.c:795
msgid "search in both tracked and untracked files"
msgstr ""
-#: builtin/grep.c:796
+#: builtin/grep.c:797
msgid "ignore files specified via '.gitignore'"
msgstr ""
-#: builtin/grep.c:798
+#: builtin/grep.c:799
msgid "recursively search in each submodule"
msgstr ""
-#: builtin/grep.c:801
+#: builtin/grep.c:802
msgid "show non-matching lines"
msgstr ""
-#: builtin/grep.c:803
+#: builtin/grep.c:804
msgid "case insensitive matching"
msgstr ""
-#: builtin/grep.c:805
+#: builtin/grep.c:806
msgid "match patterns only at word boundaries"
msgstr ""
-#: builtin/grep.c:807
+#: builtin/grep.c:808
msgid "process binary files as text"
msgstr ""
-#: builtin/grep.c:809
+#: builtin/grep.c:810
msgid "don't match patterns in binary files"
msgstr ""
-#: builtin/grep.c:812
+#: builtin/grep.c:813
msgid "process binary files with textconv filters"
msgstr ""
-#: builtin/grep.c:814
+#: builtin/grep.c:815
msgid "descend at most <depth> levels"
msgstr ""
-#: builtin/grep.c:818
+#: builtin/grep.c:819
msgid "use extended POSIX regular expressions"
msgstr ""
-#: builtin/grep.c:821
+#: builtin/grep.c:822
msgid "use basic POSIX regular expressions (default)"
msgstr ""
-#: builtin/grep.c:824
+#: builtin/grep.c:825
msgid "interpret patterns as fixed strings"
msgstr ""
-#: builtin/grep.c:827
+#: builtin/grep.c:828
msgid "use Perl-compatible regular expressions"
msgstr ""
-#: builtin/grep.c:830
+#: builtin/grep.c:831
msgid "show line numbers"
msgstr ""
-#: builtin/grep.c:831
+#: builtin/grep.c:832
+msgid "show column number of first match"
+msgstr ""
+
+#: builtin/grep.c:833
msgid "don't show filenames"
msgstr ""
-#: builtin/grep.c:832
+#: builtin/grep.c:834
msgid "show filenames"
msgstr ""
-#: builtin/grep.c:834
+#: builtin/grep.c:836
msgid "show filenames relative to top directory"
msgstr ""
-#: builtin/grep.c:836
+#: builtin/grep.c:838
msgid "show only filenames instead of matching lines"
msgstr ""
-#: builtin/grep.c:838
+#: builtin/grep.c:840
msgid "synonym for --files-with-matches"
msgstr ""
-#: builtin/grep.c:841
+#: builtin/grep.c:843
msgid "show only the names of files without match"
msgstr ""
-#: builtin/grep.c:843
+#: builtin/grep.c:845
msgid "print NUL after filenames"
msgstr ""
-#: builtin/grep.c:846
+#: builtin/grep.c:848
+msgid "show only matching parts of a line"
+msgstr ""
+
+#: builtin/grep.c:850
msgid "show the number of matches instead of matching lines"
msgstr ""
-#: builtin/grep.c:847
+#: builtin/grep.c:851
msgid "highlight matches"
msgstr ""
-#: builtin/grep.c:849
+#: builtin/grep.c:853
msgid "print empty line between matches from different files"
msgstr ""
-#: builtin/grep.c:851
+#: builtin/grep.c:855
msgid "show filename only once above matches from same file"
msgstr ""
-#: builtin/grep.c:854
+#: builtin/grep.c:858
msgid "show <n> context lines before and after matches"
msgstr ""
-#: builtin/grep.c:857
+#: builtin/grep.c:861
msgid "show <n> context lines before matches"
msgstr ""
-#: builtin/grep.c:859
+#: builtin/grep.c:863
msgid "show <n> context lines after matches"
msgstr ""
-#: builtin/grep.c:861
+#: builtin/grep.c:865
msgid "use <n> worker threads"
msgstr ""
-#: builtin/grep.c:862
+#: builtin/grep.c:866
msgid "shortcut for -C NUM"
msgstr ""
-#: builtin/grep.c:865
+#: builtin/grep.c:869
msgid "show a line with the function name before matches"
msgstr ""
-#: builtin/grep.c:867
+#: builtin/grep.c:871
msgid "show the surrounding function"
msgstr ""
-#: builtin/grep.c:870
+#: builtin/grep.c:874
msgid "read patterns from file"
msgstr ""
-#: builtin/grep.c:872
+#: builtin/grep.c:876
msgid "match <pattern>"
msgstr ""
-#: builtin/grep.c:874
+#: builtin/grep.c:878
msgid "combine patterns specified with -e"
msgstr ""
-#: builtin/grep.c:886
+#: builtin/grep.c:890
msgid "indicate hit with exit status without output"
msgstr ""
-#: builtin/grep.c:888
+#: builtin/grep.c:892
msgid "show only matches from files that match all patterns"
msgstr ""
-#: builtin/grep.c:890
+#: builtin/grep.c:894
msgid "show parse tree for grep expression"
msgstr ""
-#: builtin/grep.c:894
+#: builtin/grep.c:898
msgid "pager"
msgstr ""
-#: builtin/grep.c:894
+#: builtin/grep.c:898
msgid "show matching files in the pager"
msgstr ""
-#: builtin/grep.c:898
+#: builtin/grep.c:902
msgid "allow calling of grep(1) (ignored by this build)"
msgstr ""
-#: builtin/grep.c:962
-msgid "no pattern given."
+#: builtin/grep.c:966
+msgid "no pattern given"
msgstr ""
-#: builtin/grep.c:994
+#: builtin/grep.c:1002
msgid "--no-index or --untracked cannot be used with revs"
msgstr ""
-#: builtin/grep.c:1001
+#: builtin/grep.c:1009
#, c-format
msgid "unable to resolve revision: %s"
msgstr ""
-#: builtin/grep.c:1036 builtin/index-pack.c:1531
+#: builtin/grep.c:1044 builtin/index-pack.c:1532 builtin/pack-objects.c:2635
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr ""
-#: builtin/grep.c:1041
+#: builtin/grep.c:1049 builtin/pack-objects.c:3289
msgid "no threads support, ignoring --threads"
msgstr ""
-#: builtin/grep.c:1065
+#: builtin/grep.c:1073
msgid "--open-files-in-pager only works on the worktree"
msgstr ""
-#: builtin/grep.c:1088
-msgid "option not supported with --recurse-submodules."
+#: builtin/grep.c:1096
+msgid "option not supported with --recurse-submodules"
msgstr ""
-#: builtin/grep.c:1094
-msgid "--cached or --untracked cannot be used with --no-index."
+#: builtin/grep.c:1102
+msgid "--cached or --untracked cannot be used with --no-index"
msgstr ""
-#: builtin/grep.c:1100
-msgid "--[no-]exclude-standard cannot be used for tracked contents."
+#: builtin/grep.c:1108
+msgid "--[no-]exclude-standard cannot be used for tracked contents"
msgstr ""
-#: builtin/grep.c:1108
-msgid "both --cached and trees are given."
+#: builtin/grep.c:1116
+msgid "both --cached and trees are given"
msgstr ""
-#: builtin/hash-object.c:83
+#: builtin/hash-object.c:84
msgid ""
"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
"[--] <file>..."
msgstr ""
-#: builtin/hash-object.c:84
+#: builtin/hash-object.c:85
msgid "git hash-object --stdin-paths"
msgstr ""
-#: builtin/hash-object.c:96
+#: builtin/hash-object.c:97
msgid "type"
msgstr ""
-#: builtin/hash-object.c:96
+#: builtin/hash-object.c:97
msgid "object type"
msgstr ""
-#: builtin/hash-object.c:97
+#: builtin/hash-object.c:98
msgid "write the object into the object database"
msgstr ""
-#: builtin/hash-object.c:99
+#: builtin/hash-object.c:100
msgid "read the object from stdin"
msgstr ""
-#: builtin/hash-object.c:101
+#: builtin/hash-object.c:102
msgid "store file as is without filters"
msgstr ""
-#: builtin/hash-object.c:102
+#: builtin/hash-object.c:103
msgid ""
"just hash any random garbage to create corrupt objects for debugging Git"
msgstr ""
-#: builtin/hash-object.c:103
+#: builtin/hash-object.c:104
msgid "process file as it were from this path"
msgstr ""
-#: builtin/help.c:45
+#: builtin/help.c:46
msgid "print all available commands"
msgstr ""
-#: builtin/help.c:46
+#: builtin/help.c:47
msgid "exclude guides"
msgstr ""
-#: builtin/help.c:47
+#: builtin/help.c:48
msgid "print list of useful guides"
msgstr ""
-#: builtin/help.c:48
+#: builtin/help.c:49
+msgid "print all configuration variable names"
+msgstr ""
+
+#: builtin/help.c:51
msgid "show man page"
msgstr ""
-#: builtin/help.c:49
+#: builtin/help.c:52
msgid "show manual in web browser"
msgstr ""
-#: builtin/help.c:51
+#: builtin/help.c:54
msgid "show info page"
msgstr ""
-#: builtin/help.c:53
+#: builtin/help.c:56
msgid "print command description"
msgstr ""
-#: builtin/help.c:58
+#: builtin/help.c:61
msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
msgstr ""
-#: builtin/help.c:70
+#: builtin/help.c:73
#, c-format
msgid "unrecognized help format '%s'"
msgstr ""
-#: builtin/help.c:97
+#: builtin/help.c:100
msgid "Failed to start emacsclient."
msgstr ""
-#: builtin/help.c:110
+#: builtin/help.c:113
msgid "Failed to parse emacsclient version."
msgstr ""
-#: builtin/help.c:118
+#: builtin/help.c:121
#, c-format
msgid "emacsclient version '%d' too old (< 22)."
msgstr ""
-#: builtin/help.c:136 builtin/help.c:158 builtin/help.c:168 builtin/help.c:176
+#: builtin/help.c:139 builtin/help.c:161 builtin/help.c:171 builtin/help.c:179
#, c-format
msgid "failed to exec '%s'"
msgstr ""
-#: builtin/help.c:214
+#: builtin/help.c:217
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
"Please consider using 'man.<tool>.cmd' instead."
msgstr ""
-#: builtin/help.c:226
+#: builtin/help.c:229
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
"Please consider using 'man.<tool>.path' instead."
msgstr ""
-#: builtin/help.c:343
+#: builtin/help.c:346
#, c-format
msgid "'%s': unknown man viewer."
msgstr ""
-#: builtin/help.c:360
+#: builtin/help.c:363
msgid "no man viewer handled the request"
msgstr ""
-#: builtin/help.c:368
+#: builtin/help.c:371
msgid "no info viewer handled the request"
msgstr ""
-#: builtin/help.c:415
+#: builtin/help.c:418
#, c-format
msgid "'%s' is aliased to '%s'"
msgstr ""
-#: builtin/help.c:442 builtin/help.c:459
+#: builtin/help.c:445 builtin/help.c:475
#, c-format
msgid "usage: %s%s"
msgstr ""
-#: builtin/index-pack.c:158
-#, c-format
-msgid "unable to open %s"
+#: builtin/help.c:459
+msgid "'git help config' for more information"
msgstr ""
#: builtin/index-pack.c:208
msgid "used more bytes than were available"
msgstr ""
-#: builtin/index-pack.c:303
+#: builtin/index-pack.c:303 builtin/pack-objects.c:590
msgid "pack too large for current definition of off_t"
msgstr ""
-#: builtin/index-pack.c:306 builtin/unpack-objects.c:93
+#: builtin/index-pack.c:306 builtin/unpack-objects.c:94
msgid "pack exceeds maximum allowed size"
msgstr ""
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr ""
-#: builtin/index-pack.c:754 builtin/pack-objects.c:198
-#: builtin/pack-objects.c:292
+#: builtin/index-pack.c:754 builtin/pack-objects.c:143
+#: builtin/pack-objects.c:203 builtin/pack-objects.c:297
#, c-format
msgid "unable to read %s"
msgstr ""
msgid "invalid blob object %s"
msgstr ""
-#: builtin/index-pack.c:842 builtin/index-pack.c:860
+#: builtin/index-pack.c:842 builtin/index-pack.c:861
msgid "fsck error in packed object"
msgstr ""
-#: builtin/index-pack.c:857
+#: builtin/index-pack.c:858
#, c-format
msgid "invalid %s"
msgstr ""
-#: builtin/index-pack.c:862
+#: builtin/index-pack.c:863
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr ""
-#: builtin/index-pack.c:934 builtin/index-pack.c:965
+#: builtin/index-pack.c:935 builtin/index-pack.c:966
msgid "failed to apply delta"
msgstr ""
-#: builtin/index-pack.c:1135
+#: builtin/index-pack.c:1136
msgid "Receiving objects"
msgstr ""
-#: builtin/index-pack.c:1135
+#: builtin/index-pack.c:1136
msgid "Indexing objects"
msgstr ""
-#: builtin/index-pack.c:1169
+#: builtin/index-pack.c:1170
msgid "pack is corrupted (SHA1 mismatch)"
msgstr ""
-#: builtin/index-pack.c:1174
+#: builtin/index-pack.c:1175
msgid "cannot fstat packfile"
msgstr ""
-#: builtin/index-pack.c:1177
+#: builtin/index-pack.c:1178
msgid "pack has junk at the end"
msgstr ""
-#: builtin/index-pack.c:1189
+#: builtin/index-pack.c:1190
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr ""
-#: builtin/index-pack.c:1212
+#: builtin/index-pack.c:1213
msgid "Resolving deltas"
msgstr ""
-#: builtin/index-pack.c:1223
+#: builtin/index-pack.c:1224 builtin/pack-objects.c:2410
#, c-format
msgid "unable to create thread: %s"
msgstr ""
-#: builtin/index-pack.c:1265
+#: builtin/index-pack.c:1266
msgid "confusion beyond insanity"
msgstr ""
-#: builtin/index-pack.c:1271
+#: builtin/index-pack.c:1272
#, c-format
msgid "completed with %d local object"
msgid_plural "completed with %d local objects"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:1283
+#: builtin/index-pack.c:1284
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr ""
-#: builtin/index-pack.c:1287
+#: builtin/index-pack.c:1288
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:1311
+#: builtin/index-pack.c:1312
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr ""
-#: builtin/index-pack.c:1388
+#: builtin/index-pack.c:1389
#, c-format
msgid "local object %s is corrupt"
msgstr ""
-#: builtin/index-pack.c:1402
+#: builtin/index-pack.c:1403
#, c-format
msgid "packfile name '%s' does not end with '.pack'"
msgstr ""
-#: builtin/index-pack.c:1427
+#: builtin/index-pack.c:1428
#, c-format
msgid "cannot write %s file '%s'"
msgstr ""
-#: builtin/index-pack.c:1435
+#: builtin/index-pack.c:1436
#, c-format
msgid "cannot close written %s file '%s'"
msgstr ""
-#: builtin/index-pack.c:1459
+#: builtin/index-pack.c:1460
msgid "error while closing pack file"
msgstr ""
-#: builtin/index-pack.c:1473
+#: builtin/index-pack.c:1474
msgid "cannot store pack file"
msgstr ""
-#: builtin/index-pack.c:1481
+#: builtin/index-pack.c:1482
msgid "cannot store index file"
msgstr ""
-#: builtin/index-pack.c:1525
+#: builtin/index-pack.c:1526 builtin/pack-objects.c:2648
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr ""
-#: builtin/index-pack.c:1594
+#: builtin/index-pack.c:1595
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr ""
-#: builtin/index-pack.c:1596
+#: builtin/index-pack.c:1597
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr ""
-#: builtin/index-pack.c:1644
+#: builtin/index-pack.c:1645
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:1651
+#: builtin/index-pack.c:1652
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:1688
+#: builtin/index-pack.c:1689
msgid "Cannot come back to cwd"
msgstr ""
-#: builtin/index-pack.c:1739 builtin/index-pack.c:1742
-#: builtin/index-pack.c:1758 builtin/index-pack.c:1762
+#: builtin/index-pack.c:1740 builtin/index-pack.c:1743
+#: builtin/index-pack.c:1759 builtin/index-pack.c:1763
#, c-format
msgid "bad %s"
msgstr ""
-#: builtin/index-pack.c:1778
+#: builtin/index-pack.c:1779
msgid "--fix-thin cannot be used without --stdin"
msgstr ""
-#: builtin/index-pack.c:1780
+#: builtin/index-pack.c:1781
msgid "--stdin requires a git repository"
msgstr ""
-#: builtin/index-pack.c:1786
+#: builtin/index-pack.c:1787
msgid "--verify with no packfile name given"
msgstr ""
-#: builtin/index-pack.c:1836 builtin/unpack-objects.c:578
+#: builtin/index-pack.c:1837 builtin/unpack-objects.c:580
msgid "fsck error in pack objects"
msgstr ""
msgid "cannot opendir '%s'"
msgstr ""
-#: builtin/init-db.c:77
+#: builtin/init-db.c:78
#, c-format
msgid "cannot readlink '%s'"
msgstr ""
-#: builtin/init-db.c:79
+#: builtin/init-db.c:80
#, c-format
msgid "cannot symlink '%s' '%s'"
msgstr ""
-#: builtin/init-db.c:85
+#: builtin/init-db.c:86
#, c-format
msgid "cannot copy '%s' to '%s'"
msgstr ""
-#: builtin/init-db.c:89
+#: builtin/init-db.c:90
#, c-format
msgid "ignoring template %s"
msgstr ""
-#: builtin/init-db.c:120
+#: builtin/init-db.c:121
#, c-format
msgid "templates not found in %s"
msgstr ""
-#: builtin/init-db.c:135
+#: builtin/init-db.c:136
#, c-format
msgid "not copying templates from '%s': %s"
msgstr ""
-#: builtin/init-db.c:328
+#: builtin/init-db.c:329
#, c-format
msgid "unable to handle file type %d"
msgstr ""
-#: builtin/init-db.c:331
+#: builtin/init-db.c:332
#, c-format
msgid "unable to move %s to %s"
msgstr ""
-#: builtin/init-db.c:348 builtin/init-db.c:351
+#: builtin/init-db.c:349 builtin/init-db.c:352
#, c-format
msgid "%s already exists"
msgstr ""
-#: builtin/init-db.c:404
+#: builtin/init-db.c:405
#, c-format
msgid "Reinitialized existing shared Git repository in %s%s\n"
msgstr ""
-#: builtin/init-db.c:405
+#: builtin/init-db.c:406
#, c-format
msgid "Reinitialized existing Git repository in %s%s\n"
msgstr ""
-#: builtin/init-db.c:409
+#: builtin/init-db.c:410
#, c-format
msgid "Initialized empty shared Git repository in %s%s\n"
msgstr ""
-#: builtin/init-db.c:410
+#: builtin/init-db.c:411
#, c-format
msgid "Initialized empty Git repository in %s%s\n"
msgstr ""
-#: builtin/init-db.c:458
+#: builtin/init-db.c:459
msgid ""
"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
"shared[=<permissions>]] [<directory>]"
msgstr ""
-#: builtin/init-db.c:481
+#: builtin/init-db.c:482
msgid "permissions"
msgstr ""
-#: builtin/init-db.c:482
+#: builtin/init-db.c:483
msgid "specify that the git repository is to be shared amongst several users"
msgstr ""
-#: builtin/init-db.c:525
+#: builtin/init-db.c:517 builtin/init-db.c:522
+#, c-format
+msgid "cannot mkdir %s"
+msgstr ""
+
+#: builtin/init-db.c:526
#, c-format
msgid "cannot chdir to %s"
msgstr ""
-#: builtin/init-db.c:546
+#: builtin/init-db.c:547
#, c-format
msgid ""
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
"dir=<directory>)"
msgstr ""
-#: builtin/init-db.c:574
+#: builtin/init-db.c:575
#, c-format
msgid "Cannot access work tree '%s'"
msgstr ""
msgid "no input file given for in-place editing"
msgstr ""
-#: builtin/log.c:48
+#: builtin/log.c:51
msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
msgstr ""
-#: builtin/log.c:49
+#: builtin/log.c:52
msgid "git show [<options>] <object>..."
msgstr ""
-#: builtin/log.c:93
+#: builtin/log.c:96
#, c-format
msgid "invalid --decorate option: %s"
msgstr ""
-#: builtin/log.c:153
+#: builtin/log.c:157
msgid "suppress diff output"
msgstr ""
-#: builtin/log.c:154
+#: builtin/log.c:158
msgid "show source"
msgstr ""
-#: builtin/log.c:155
+#: builtin/log.c:159
msgid "Use mail map file"
msgstr ""
-#: builtin/log.c:157
+#: builtin/log.c:161
msgid "only decorate refs that match <pattern>"
msgstr ""
-#: builtin/log.c:159
+#: builtin/log.c:163
msgid "do not decorate refs that match <pattern>"
msgstr ""
-#: builtin/log.c:160
+#: builtin/log.c:164
msgid "decorate options"
msgstr ""
-#: builtin/log.c:163
+#: builtin/log.c:167
msgid "Process line range n,m in file, counting from 1"
msgstr ""
-#: builtin/log.c:259
+#: builtin/log.c:265
#, c-format
msgid "Final output: %d %s\n"
msgstr ""
-#: builtin/log.c:510
+#: builtin/log.c:516
#, c-format
msgid "git show %s: bad file"
msgstr ""
-#: builtin/log.c:525 builtin/log.c:619
+#: builtin/log.c:531 builtin/log.c:625
#, c-format
msgid "Could not read object %s"
msgstr ""
-#: builtin/log.c:643
+#: builtin/log.c:649
#, c-format
msgid "Unknown type: %d"
msgstr ""
-#: builtin/log.c:764
+#: builtin/log.c:770
msgid "format.headers without value"
msgstr ""
-#: builtin/log.c:865
+#: builtin/log.c:871
msgid "name of output directory is too long"
msgstr ""
-#: builtin/log.c:881
+#: builtin/log.c:887
#, c-format
msgid "Cannot open patch file %s"
msgstr ""
-#: builtin/log.c:898
+#: builtin/log.c:904
msgid "Need exactly one range."
msgstr ""
-#: builtin/log.c:908
+#: builtin/log.c:914
msgid "Not a range."
msgstr ""
-#: builtin/log.c:1014
+#: builtin/log.c:1020
msgid "Cover letter needs email format"
msgstr ""
-#: builtin/log.c:1095
+#: builtin/log.c:1101
#, c-format
msgid "insane in-reply-to: %s"
msgstr ""
-#: builtin/log.c:1122
+#: builtin/log.c:1128
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr ""
-#: builtin/log.c:1172
+#: builtin/log.c:1178
msgid "Two output directories?"
msgstr ""
-#: builtin/log.c:1279 builtin/log.c:1932 builtin/log.c:1934 builtin/log.c:1946
+#: builtin/log.c:1285 builtin/log.c:1945 builtin/log.c:1947 builtin/log.c:1959
#, c-format
msgid "Unknown commit %s"
msgstr ""
-#: builtin/log.c:1289 builtin/notes.c:887 builtin/tag.c:523
+#: builtin/log.c:1295 builtin/notes.c:889 builtin/tag.c:524
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr ""
-#: builtin/log.c:1294
+#: builtin/log.c:1300
msgid "Could not find exact merge base."
msgstr ""
-#: builtin/log.c:1298
+#: builtin/log.c:1304
msgid ""
"Failed to get upstream, if you want to record base commit automatically,\n"
"please use git branch --set-upstream-to to track a remote branch.\n"
"Or you could specify base commit by --base=<base-commit-id> manually."
msgstr ""
-#: builtin/log.c:1318
+#: builtin/log.c:1324
msgid "Failed to find exact merge base"
msgstr ""
-#: builtin/log.c:1329
+#: builtin/log.c:1335
msgid "base commit should be the ancestor of revision list"
msgstr ""
-#: builtin/log.c:1333
+#: builtin/log.c:1339
msgid "base commit shouldn't be in revision list"
msgstr ""
-#: builtin/log.c:1382
+#: builtin/log.c:1392
msgid "cannot get patch id"
msgstr ""
-#: builtin/log.c:1441
+#: builtin/log.c:1452
msgid "use [PATCH n/m] even with a single patch"
msgstr ""
-#: builtin/log.c:1444
+#: builtin/log.c:1455
msgid "use [PATCH] even with multiple patches"
msgstr ""
-#: builtin/log.c:1448
+#: builtin/log.c:1459
msgid "print patches to standard out"
msgstr ""
-#: builtin/log.c:1450
+#: builtin/log.c:1461
msgid "generate a cover letter"
msgstr ""
-#: builtin/log.c:1452
+#: builtin/log.c:1463
msgid "use simple number sequence for output file names"
msgstr ""
-#: builtin/log.c:1453
+#: builtin/log.c:1464
msgid "sfx"
msgstr ""
-#: builtin/log.c:1454
+#: builtin/log.c:1465
msgid "use <sfx> instead of '.patch'"
msgstr ""
-#: builtin/log.c:1456
+#: builtin/log.c:1467
msgid "start numbering patches at <n> instead of 1"
msgstr ""
-#: builtin/log.c:1458
+#: builtin/log.c:1469
msgid "mark the series as Nth re-roll"
msgstr ""
-#: builtin/log.c:1460
+#: builtin/log.c:1471
msgid "Use [RFC PATCH] instead of [PATCH]"
msgstr ""
-#: builtin/log.c:1463
+#: builtin/log.c:1474
msgid "Use [<prefix>] instead of [PATCH]"
msgstr ""
-#: builtin/log.c:1466
+#: builtin/log.c:1477
msgid "store resulting files in <dir>"
msgstr ""
-#: builtin/log.c:1469
+#: builtin/log.c:1480
msgid "don't strip/add [PATCH]"
msgstr ""
-#: builtin/log.c:1472
+#: builtin/log.c:1483
msgid "don't output binary diffs"
msgstr ""
-#: builtin/log.c:1474
+#: builtin/log.c:1485
msgid "output all-zero hash in From header"
msgstr ""
-#: builtin/log.c:1476
+#: builtin/log.c:1487
msgid "don't include a patch matching a commit upstream"
msgstr ""
-#: builtin/log.c:1478
+#: builtin/log.c:1489
msgid "show patch format instead of default (patch + stat)"
msgstr ""
-#: builtin/log.c:1480
+#: builtin/log.c:1491
msgid "Messaging"
msgstr ""
-#: builtin/log.c:1481
+#: builtin/log.c:1492
msgid "header"
msgstr ""
-#: builtin/log.c:1482
+#: builtin/log.c:1493
msgid "add email header"
msgstr ""
-#: builtin/log.c:1483 builtin/log.c:1485
+#: builtin/log.c:1494 builtin/log.c:1496
msgid "email"
msgstr ""
-#: builtin/log.c:1483
+#: builtin/log.c:1494
msgid "add To: header"
msgstr ""
-#: builtin/log.c:1485
+#: builtin/log.c:1496
msgid "add Cc: header"
msgstr ""
-#: builtin/log.c:1487
+#: builtin/log.c:1498
msgid "ident"
msgstr ""
-#: builtin/log.c:1488
+#: builtin/log.c:1499
msgid "set From address to <ident> (or committer ident if absent)"
msgstr ""
-#: builtin/log.c:1490
+#: builtin/log.c:1501
msgid "message-id"
msgstr ""
-#: builtin/log.c:1491
+#: builtin/log.c:1502
msgid "make first mail a reply to <message-id>"
msgstr ""
-#: builtin/log.c:1492 builtin/log.c:1495
+#: builtin/log.c:1503 builtin/log.c:1506
msgid "boundary"
msgstr ""
-#: builtin/log.c:1493
+#: builtin/log.c:1504
msgid "attach the patch"
msgstr ""
-#: builtin/log.c:1496
+#: builtin/log.c:1507
msgid "inline the patch"
msgstr ""
-#: builtin/log.c:1500
+#: builtin/log.c:1511
msgid "enable message threading, styles: shallow, deep"
msgstr ""
-#: builtin/log.c:1502
+#: builtin/log.c:1513
msgid "signature"
msgstr ""
-#: builtin/log.c:1503
+#: builtin/log.c:1514
msgid "add a signature"
msgstr ""
-#: builtin/log.c:1504
+#: builtin/log.c:1515
msgid "base-commit"
msgstr ""
-#: builtin/log.c:1505
+#: builtin/log.c:1516
msgid "add prerequisite tree info to the patch series"
msgstr ""
-#: builtin/log.c:1507
+#: builtin/log.c:1518
msgid "add a signature from a file"
msgstr ""
-#: builtin/log.c:1508
+#: builtin/log.c:1519
msgid "don't print the patch filenames"
msgstr ""
-#: builtin/log.c:1510
+#: builtin/log.c:1521
msgid "show progress while generating patches"
msgstr ""
-#: builtin/log.c:1585
+#: builtin/log.c:1596
#, c-format
msgid "invalid ident line: %s"
msgstr ""
-#: builtin/log.c:1600
-msgid "-n and -k are mutually exclusive."
+#: builtin/log.c:1611
+msgid "-n and -k are mutually exclusive"
msgstr ""
-#: builtin/log.c:1602
-msgid "--subject-prefix/--rfc and -k are mutually exclusive."
+#: builtin/log.c:1613
+msgid "--subject-prefix/--rfc and -k are mutually exclusive"
msgstr ""
-#: builtin/log.c:1610
+#: builtin/log.c:1621
msgid "--name-only does not make sense"
msgstr ""
-#: builtin/log.c:1612
+#: builtin/log.c:1623
msgid "--name-status does not make sense"
msgstr ""
-#: builtin/log.c:1614
+#: builtin/log.c:1625
msgid "--check does not make sense"
msgstr ""
-#: builtin/log.c:1646
+#: builtin/log.c:1657
msgid "standard output, or directory, which one?"
msgstr ""
-#: builtin/log.c:1648
+#: builtin/log.c:1659
#, c-format
msgid "Could not create directory '%s'"
msgstr ""
-#: builtin/log.c:1741
+#: builtin/log.c:1752
#, c-format
msgid "unable to read signature file '%s'"
msgstr ""
-#: builtin/log.c:1773
+#: builtin/log.c:1785
msgid "Generating patches"
msgstr ""
-#: builtin/log.c:1817
+#: builtin/log.c:1829
msgid "Failed to create output files"
msgstr ""
-#: builtin/log.c:1867
+#: builtin/log.c:1880
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr ""
-#: builtin/log.c:1921
+#: builtin/log.c:1934
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
msgstr ""
-#: builtin/ls-files.c:468
+#: builtin/ls-files.c:469
msgid "git ls-files [<options>] [<file>...]"
msgstr ""
-#: builtin/ls-files.c:517
+#: builtin/ls-files.c:518
msgid "identify the file status with tags"
msgstr ""
-#: builtin/ls-files.c:519
+#: builtin/ls-files.c:520
msgid "use lowercase letters for 'assume unchanged' files"
msgstr ""
-#: builtin/ls-files.c:521
+#: builtin/ls-files.c:522
msgid "use lowercase letters for 'fsmonitor clean' files"
msgstr ""
-#: builtin/ls-files.c:523
+#: builtin/ls-files.c:524
msgid "show cached files in the output (default)"
msgstr ""
-#: builtin/ls-files.c:525
+#: builtin/ls-files.c:526
msgid "show deleted files in the output"
msgstr ""
-#: builtin/ls-files.c:527
+#: builtin/ls-files.c:528
msgid "show modified files in the output"
msgstr ""
-#: builtin/ls-files.c:529
+#: builtin/ls-files.c:530
msgid "show other files in the output"
msgstr ""
-#: builtin/ls-files.c:531
+#: builtin/ls-files.c:532
msgid "show ignored files in the output"
msgstr ""
-#: builtin/ls-files.c:534
+#: builtin/ls-files.c:535
msgid "show staged contents' object name in the output"
msgstr ""
-#: builtin/ls-files.c:536
+#: builtin/ls-files.c:537
msgid "show files on the filesystem that need to be removed"
msgstr ""
-#: builtin/ls-files.c:538
+#: builtin/ls-files.c:539
msgid "show 'other' directories' names only"
msgstr ""
-#: builtin/ls-files.c:540
+#: builtin/ls-files.c:541
msgid "show line endings of files"
msgstr ""
-#: builtin/ls-files.c:542
+#: builtin/ls-files.c:543
msgid "don't show empty directories"
msgstr ""
-#: builtin/ls-files.c:545
+#: builtin/ls-files.c:546
msgid "show unmerged files in the output"
msgstr ""
-#: builtin/ls-files.c:547
+#: builtin/ls-files.c:548
msgid "show resolve-undo information"
msgstr ""
-#: builtin/ls-files.c:549
+#: builtin/ls-files.c:550
msgid "skip files matching pattern"
msgstr ""
-#: builtin/ls-files.c:552
+#: builtin/ls-files.c:553
msgid "exclude patterns are read from <file>"
msgstr ""
-#: builtin/ls-files.c:555
+#: builtin/ls-files.c:556
msgid "read additional per-directory exclude patterns in <file>"
msgstr ""
-#: builtin/ls-files.c:557
+#: builtin/ls-files.c:558
msgid "add the standard git exclusions"
msgstr ""
-#: builtin/ls-files.c:560
+#: builtin/ls-files.c:561
msgid "make the output relative to the project top directory"
msgstr ""
-#: builtin/ls-files.c:563
+#: builtin/ls-files.c:564
msgid "recurse through submodules"
msgstr ""
-#: builtin/ls-files.c:565
+#: builtin/ls-files.c:566
msgid "if any <file> is not in the index, treat this as an error"
msgstr ""
-#: builtin/ls-files.c:566
+#: builtin/ls-files.c:567
msgid "tree-ish"
msgstr ""
-#: builtin/ls-files.c:567
+#: builtin/ls-files.c:568
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr ""
-#: builtin/ls-files.c:569
+#: builtin/ls-files.c:570
msgid "show debugging data"
msgstr ""
msgid "show underlying ref in addition to the object pointed by it"
msgstr ""
-#: builtin/ls-tree.c:29
+#: builtin/ls-tree.c:30
msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
msgstr ""
-#: builtin/ls-tree.c:127
+#: builtin/ls-tree.c:128
msgid "only show trees"
msgstr ""
-#: builtin/ls-tree.c:129
+#: builtin/ls-tree.c:130
msgid "recurse into subtrees"
msgstr ""
-#: builtin/ls-tree.c:131
+#: builtin/ls-tree.c:132
msgid "show trees when recursing"
msgstr ""
-#: builtin/ls-tree.c:134
+#: builtin/ls-tree.c:135
msgid "terminate entries with NUL byte"
msgstr ""
-#: builtin/ls-tree.c:135
+#: builtin/ls-tree.c:136
msgid "include object size"
msgstr ""
-#: builtin/ls-tree.c:137 builtin/ls-tree.c:139
+#: builtin/ls-tree.c:138 builtin/ls-tree.c:140
msgid "list only filenames"
msgstr ""
-#: builtin/ls-tree.c:142
+#: builtin/ls-tree.c:143
msgid "use full path names"
msgstr ""
-#: builtin/ls-tree.c:144
+#: builtin/ls-tree.c:145
msgid "list entire tree; not just current directory (implies --full-name)"
msgstr ""
msgid "switch `m' requires a value"
msgstr ""
-#: builtin/merge.c:147
+#: builtin/merge.c:176
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr ""
-#: builtin/merge.c:148
+#: builtin/merge.c:177
#, c-format
msgid "Available strategies are:"
msgstr ""
-#: builtin/merge.c:153
+#: builtin/merge.c:182
#, c-format
msgid "Available custom strategies are:"
msgstr ""
-#: builtin/merge.c:203 builtin/pull.c:142
+#: builtin/merge.c:232 builtin/pull.c:142
msgid "do not show a diffstat at the end of the merge"
msgstr ""
-#: builtin/merge.c:206 builtin/pull.c:145
+#: builtin/merge.c:235 builtin/pull.c:145
msgid "show a diffstat at the end of the merge"
msgstr ""
-#: builtin/merge.c:207 builtin/pull.c:148
+#: builtin/merge.c:236 builtin/pull.c:148
msgid "(synonym to --stat)"
msgstr ""
-#: builtin/merge.c:209 builtin/pull.c:151
+#: builtin/merge.c:238 builtin/pull.c:151
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr ""
-#: builtin/merge.c:212 builtin/pull.c:157
+#: builtin/merge.c:241 builtin/pull.c:157
msgid "create a single commit instead of doing a merge"
msgstr ""
-#: builtin/merge.c:214 builtin/pull.c:160
+#: builtin/merge.c:243 builtin/pull.c:160
msgid "perform a commit if the merge succeeds (default)"
msgstr ""
-#: builtin/merge.c:216 builtin/pull.c:163
+#: builtin/merge.c:245 builtin/pull.c:163
msgid "edit message before committing"
msgstr ""
-#: builtin/merge.c:217
+#: builtin/merge.c:246
msgid "allow fast-forward (default)"
msgstr ""
-#: builtin/merge.c:219 builtin/pull.c:169
+#: builtin/merge.c:248 builtin/pull.c:169
msgid "abort if fast-forward is not possible"
msgstr ""
-#: builtin/merge.c:223 builtin/pull.c:172
+#: builtin/merge.c:252 builtin/pull.c:172
msgid "verify that the named commit has a valid GPG signature"
msgstr ""
-#: builtin/merge.c:224 builtin/notes.c:777 builtin/pull.c:176
-#: builtin/revert.c:109
+#: builtin/merge.c:253 builtin/notes.c:779 builtin/pull.c:176
+#: builtin/revert.c:110
msgid "strategy"
msgstr ""
-#: builtin/merge.c:225 builtin/pull.c:177
+#: builtin/merge.c:254 builtin/pull.c:177
msgid "merge strategy to use"
msgstr ""
-#: builtin/merge.c:226 builtin/pull.c:180
+#: builtin/merge.c:255 builtin/pull.c:180
msgid "option=value"
msgstr ""
-#: builtin/merge.c:227 builtin/pull.c:181
+#: builtin/merge.c:256 builtin/pull.c:181
msgid "option for selected merge strategy"
msgstr ""
-#: builtin/merge.c:229
+#: builtin/merge.c:258
msgid "merge commit message (for a non-fast-forward merge)"
msgstr ""
-#: builtin/merge.c:233
+#: builtin/merge.c:265
msgid "abort the current in-progress merge"
msgstr ""
-#: builtin/merge.c:235
+#: builtin/merge.c:267
msgid "continue the current in-progress merge"
msgstr ""
-#: builtin/merge.c:237 builtin/pull.c:188
+#: builtin/merge.c:269 builtin/pull.c:188
msgid "allow merging unrelated histories"
msgstr ""
-#: builtin/merge.c:243
+#: builtin/merge.c:275
msgid "verify commit-msg hook"
msgstr ""
-#: builtin/merge.c:268
+#: builtin/merge.c:300
msgid "could not run stash."
msgstr ""
-#: builtin/merge.c:273
+#: builtin/merge.c:305
msgid "stash failed"
msgstr ""
-#: builtin/merge.c:278
+#: builtin/merge.c:310
#, c-format
msgid "not a valid object: %s"
msgstr ""
-#: builtin/merge.c:300 builtin/merge.c:317
+#: builtin/merge.c:332 builtin/merge.c:349
msgid "read-tree failed"
msgstr ""
-#: builtin/merge.c:347
+#: builtin/merge.c:379
msgid " (nothing to squash)"
msgstr ""
-#: builtin/merge.c:358
+#: builtin/merge.c:390
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr ""
-#: builtin/merge.c:408
+#: builtin/merge.c:440
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr ""
-#: builtin/merge.c:458
+#: builtin/merge.c:491
#, c-format
msgid "'%s' does not point to a commit"
msgstr ""
-#: builtin/merge.c:548
+#: builtin/merge.c:578
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr ""
-#: builtin/merge.c:669
+#: builtin/merge.c:699
msgid "Not handling anything other than two heads merge."
msgstr ""
-#: builtin/merge.c:683
+#: builtin/merge.c:713
#, c-format
msgid "Unknown option for merge-recursive: -X%s"
msgstr ""
-#: builtin/merge.c:698
+#: builtin/merge.c:728
#, c-format
msgid "unable to write %s"
msgstr ""
-#: builtin/merge.c:749
+#: builtin/merge.c:779
#, c-format
msgid "Could not read from '%s'"
msgstr ""
-#: builtin/merge.c:758
+#: builtin/merge.c:788
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr ""
-#: builtin/merge.c:764
+#: builtin/merge.c:794
#, c-format
msgid ""
"Please enter a commit message to explain why this merge is necessary,\n"
"the commit.\n"
msgstr ""
-#: builtin/merge.c:800
+#: builtin/merge.c:830
msgid "Empty commit message."
msgstr ""
-#: builtin/merge.c:819
+#: builtin/merge.c:849
#, c-format
msgid "Wonderful.\n"
msgstr ""
-#: builtin/merge.c:872
+#: builtin/merge.c:902
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr ""
-#: builtin/merge.c:911
+#: builtin/merge.c:941
msgid "No current branch."
msgstr ""
-#: builtin/merge.c:913
+#: builtin/merge.c:943
msgid "No remote for the current branch."
msgstr ""
-#: builtin/merge.c:915
+#: builtin/merge.c:945
msgid "No default upstream defined for the current branch."
msgstr ""
-#: builtin/merge.c:920
+#: builtin/merge.c:950
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr ""
-#: builtin/merge.c:973
+#: builtin/merge.c:1007
#, c-format
msgid "Bad value '%s' in environment '%s'"
msgstr ""
-#: builtin/merge.c:1075
+#: builtin/merge.c:1110
#, c-format
msgid "not something we can merge in %s: %s"
msgstr ""
-#: builtin/merge.c:1109
+#: builtin/merge.c:1144
msgid "not something we can merge"
msgstr ""
-#: builtin/merge.c:1211
+#: builtin/merge.c:1247
msgid "--abort expects no arguments"
msgstr ""
-#: builtin/merge.c:1215
+#: builtin/merge.c:1251
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr ""
-#: builtin/merge.c:1227
+#: builtin/merge.c:1263
msgid "--continue expects no arguments"
msgstr ""
-#: builtin/merge.c:1231
+#: builtin/merge.c:1267
msgid "There is no merge in progress (MERGE_HEAD missing)."
msgstr ""
-#: builtin/merge.c:1247
+#: builtin/merge.c:1283
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
msgstr ""
-#: builtin/merge.c:1254
+#: builtin/merge.c:1290
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
msgstr ""
-#: builtin/merge.c:1257
+#: builtin/merge.c:1293
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr ""
-#: builtin/merge.c:1266
+#: builtin/merge.c:1302
msgid "You cannot combine --squash with --no-ff."
msgstr ""
-#: builtin/merge.c:1274
+#: builtin/merge.c:1310
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr ""
-#: builtin/merge.c:1291
+#: builtin/merge.c:1327
msgid "Squash commit into empty head not supported yet"
msgstr ""
-#: builtin/merge.c:1293
+#: builtin/merge.c:1329
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr ""
-#: builtin/merge.c:1298
+#: builtin/merge.c:1334
#, c-format
msgid "%s - not something we can merge"
msgstr ""
-#: builtin/merge.c:1300
+#: builtin/merge.c:1336
msgid "Can merge only exactly one commit into empty head"
msgstr ""
-#: builtin/merge.c:1334
+#: builtin/merge.c:1370
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr ""
-#: builtin/merge.c:1337
+#: builtin/merge.c:1373
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr ""
-#: builtin/merge.c:1340
+#: builtin/merge.c:1376
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr ""
-#: builtin/merge.c:1343
+#: builtin/merge.c:1379
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr ""
-#: builtin/merge.c:1402
+#: builtin/merge.c:1438
msgid "refusing to merge unrelated histories"
msgstr ""
-#: builtin/merge.c:1411
+#: builtin/merge.c:1447
msgid "Already up to date."
msgstr ""
-#: builtin/merge.c:1421
+#: builtin/merge.c:1457
#, c-format
msgid "Updating %s..%s\n"
msgstr ""
-#: builtin/merge.c:1462
+#: builtin/merge.c:1498
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr ""
-#: builtin/merge.c:1469
+#: builtin/merge.c:1505
#, c-format
msgid "Nope.\n"
msgstr ""
-#: builtin/merge.c:1494
+#: builtin/merge.c:1530
msgid "Already up to date. Yeeah!"
msgstr ""
-#: builtin/merge.c:1500
+#: builtin/merge.c:1536
msgid "Not possible to fast-forward, aborting."
msgstr ""
-#: builtin/merge.c:1523 builtin/merge.c:1602
+#: builtin/merge.c:1559 builtin/merge.c:1638
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr ""
-#: builtin/merge.c:1527
+#: builtin/merge.c:1563
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr ""
-#: builtin/merge.c:1593
+#: builtin/merge.c:1629
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr ""
-#: builtin/merge.c:1595
+#: builtin/merge.c:1631
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr ""
-#: builtin/merge.c:1604
+#: builtin/merge.c:1640
#, c-format
msgid "Using the %s to prepare resolving by hand.\n"
msgstr ""
-#: builtin/merge.c:1616
+#: builtin/merge.c:1652
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
-#: builtin/merge-base.c:30
+#: builtin/merge-base.c:31
msgid "git merge-base [-a | --all] <commit> <commit>..."
msgstr ""
-#: builtin/merge-base.c:31
+#: builtin/merge-base.c:32
msgid "git merge-base [-a | --all] --octopus <commit>..."
msgstr ""
-#: builtin/merge-base.c:32
+#: builtin/merge-base.c:33
msgid "git merge-base --independent <commit>..."
msgstr ""
-#: builtin/merge-base.c:33
+#: builtin/merge-base.c:34
msgid "git merge-base --is-ancestor <commit> <commit>"
msgstr ""
-#: builtin/merge-base.c:34
+#: builtin/merge-base.c:35
msgid "git merge-base --fork-point <ref> [<commit>]"
msgstr ""
-#: builtin/merge-base.c:220
+#: builtin/merge-base.c:221
msgid "output all common ancestors"
msgstr ""
-#: builtin/merge-base.c:222
+#: builtin/merge-base.c:223
msgid "find ancestors for a single n-way merge"
msgstr ""
-#: builtin/merge-base.c:224
+#: builtin/merge-base.c:225
msgid "list revs not reachable from others"
msgstr ""
-#: builtin/merge-base.c:226
+#: builtin/merge-base.c:227
msgid "is the first one ancestor of the other?"
msgstr ""
-#: builtin/merge-base.c:228
+#: builtin/merge-base.c:229
msgid "find where <commit> forked from reflog of <ref>"
msgstr ""
msgid "Merging %s with %s\n"
msgstr ""
-#: builtin/mktree.c:65
+#: builtin/mktree.c:66
msgid "git mktree [-z] [--missing] [--batch]"
msgstr ""
-#: builtin/mktree.c:153
+#: builtin/mktree.c:154
msgid "input is NUL terminated"
msgstr ""
-#: builtin/mktree.c:154 builtin/write-tree.c:25
+#: builtin/mktree.c:155 builtin/write-tree.c:25
msgid "allow missing objects"
msgstr ""
-#: builtin/mktree.c:155
+#: builtin/mktree.c:156
msgid "allow creation of more than one tree"
msgstr ""
msgid "Directory %s is in index and no submodule?"
msgstr ""
-#: builtin/mv.c:84 builtin/rm.c:288
+#: builtin/mv.c:84
msgid "Please stage your changes to .gitmodules or stash them to proceed"
msgstr ""
msgid "Renaming %s to %s\n"
msgstr ""
-#: builtin/mv.c:276 builtin/remote.c:715 builtin/repack.c:409
+#: builtin/mv.c:276 builtin/remote.c:716 builtin/repack.c:494
#, c-format
msgid "renaming '%s' failed"
msgstr ""
-#: builtin/name-rev.c:338
+#: builtin/name-rev.c:355
msgid "git name-rev [<options>] <commit>..."
msgstr ""
-#: builtin/name-rev.c:339
+#: builtin/name-rev.c:356
msgid "git name-rev [<options>] --all"
msgstr ""
-#: builtin/name-rev.c:340
+#: builtin/name-rev.c:357
msgid "git name-rev [<options>] --stdin"
msgstr ""
-#: builtin/name-rev.c:395
+#: builtin/name-rev.c:413
msgid "print only names (no SHA-1)"
msgstr ""
-#: builtin/name-rev.c:396
+#: builtin/name-rev.c:414
msgid "only use tags to name the commits"
msgstr ""
-#: builtin/name-rev.c:398
+#: builtin/name-rev.c:416
msgid "only use refs matching <pattern>"
msgstr ""
-#: builtin/name-rev.c:400
+#: builtin/name-rev.c:418
msgid "ignore refs matching <pattern>"
msgstr ""
-#: builtin/name-rev.c:402
+#: builtin/name-rev.c:420
msgid "list all commits reachable from all refs"
msgstr ""
-#: builtin/name-rev.c:403
+#: builtin/name-rev.c:421
msgid "read from stdin"
msgstr ""
-#: builtin/name-rev.c:404
+#: builtin/name-rev.c:422
msgid "allow to print `undefined` names (default)"
msgstr ""
-#: builtin/name-rev.c:410
+#: builtin/name-rev.c:428
msgid "dereference tags in the input (internal use)"
msgstr ""
-#: builtin/notes.c:26
+#: builtin/notes.c:28
msgid "git notes [--ref <notes-ref>] [list [<object>]]"
msgstr ""
-#: builtin/notes.c:27
+#: builtin/notes.c:29
msgid ""
"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
"| (-c | -C) <object>] [<object>]"
msgstr ""
-#: builtin/notes.c:28
+#: builtin/notes.c:30
msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
msgstr ""
-#: builtin/notes.c:29
+#: builtin/notes.c:31
msgid ""
"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
"(-c | -C) <object>] [<object>]"
msgstr ""
-#: builtin/notes.c:30
+#: builtin/notes.c:32
msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
msgstr ""
-#: builtin/notes.c:31
+#: builtin/notes.c:33
msgid "git notes [--ref <notes-ref>] show [<object>]"
msgstr ""
-#: builtin/notes.c:32
+#: builtin/notes.c:34
msgid ""
"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
msgstr ""
-#: builtin/notes.c:33
+#: builtin/notes.c:35
msgid "git notes merge --commit [-v | -q]"
msgstr ""
-#: builtin/notes.c:34
+#: builtin/notes.c:36
msgid "git notes merge --abort [-v | -q]"
msgstr ""
-#: builtin/notes.c:35
+#: builtin/notes.c:37
msgid "git notes [--ref <notes-ref>] remove [<object>...]"
msgstr ""
-#: builtin/notes.c:36
+#: builtin/notes.c:38
msgid "git notes [--ref <notes-ref>] prune [-n] [-v]"
msgstr ""
-#: builtin/notes.c:37
+#: builtin/notes.c:39
msgid "git notes [--ref <notes-ref>] get-ref"
msgstr ""
-#: builtin/notes.c:42
+#: builtin/notes.c:44
msgid "git notes [list [<object>]]"
msgstr ""
-#: builtin/notes.c:47
+#: builtin/notes.c:49
msgid "git notes add [<options>] [<object>]"
msgstr ""
-#: builtin/notes.c:52
+#: builtin/notes.c:54
msgid "git notes copy [<options>] <from-object> <to-object>"
msgstr ""
-#: builtin/notes.c:53
+#: builtin/notes.c:55
msgid "git notes copy --stdin [<from-object> <to-object>]..."
msgstr ""
-#: builtin/notes.c:58
+#: builtin/notes.c:60
msgid "git notes append [<options>] [<object>]"
msgstr ""
-#: builtin/notes.c:63
+#: builtin/notes.c:65
msgid "git notes edit [<object>]"
msgstr ""
-#: builtin/notes.c:68
+#: builtin/notes.c:70
msgid "git notes show [<object>]"
msgstr ""
-#: builtin/notes.c:73
+#: builtin/notes.c:75
msgid "git notes merge [<options>] <notes-ref>"
msgstr ""
-#: builtin/notes.c:74
+#: builtin/notes.c:76
msgid "git notes merge --commit [<options>]"
msgstr ""
-#: builtin/notes.c:75
+#: builtin/notes.c:77
msgid "git notes merge --abort [<options>]"
msgstr ""
-#: builtin/notes.c:80
+#: builtin/notes.c:82
msgid "git notes remove [<object>]"
msgstr ""
-#: builtin/notes.c:85
+#: builtin/notes.c:87
msgid "git notes prune [<options>]"
msgstr ""
-#: builtin/notes.c:90
+#: builtin/notes.c:92
msgid "git notes get-ref"
msgstr ""
-#: builtin/notes.c:95
+#: builtin/notes.c:97
msgid "Write/edit the notes for the following object:"
msgstr ""
-#: builtin/notes.c:148
+#: builtin/notes.c:150
#, c-format
msgid "unable to start 'show' for object '%s'"
msgstr ""
-#: builtin/notes.c:152
+#: builtin/notes.c:154
msgid "could not read 'show' output"
msgstr ""
-#: builtin/notes.c:160
+#: builtin/notes.c:162
#, c-format
msgid "failed to finish 'show' for object '%s'"
msgstr ""
-#: builtin/notes.c:195
+#: builtin/notes.c:197
msgid "please supply the note contents using either -m or -F option"
msgstr ""
-#: builtin/notes.c:204
+#: builtin/notes.c:206
msgid "unable to write note object"
msgstr ""
-#: builtin/notes.c:206
+#: builtin/notes.c:208
#, c-format
msgid "the note contents have been left in %s"
msgstr ""
-#: builtin/notes.c:234 builtin/tag.c:507
+#: builtin/notes.c:236 builtin/tag.c:508
#, c-format
msgid "cannot read '%s'"
msgstr ""
-#: builtin/notes.c:236 builtin/tag.c:510
+#: builtin/notes.c:238 builtin/tag.c:511
#, c-format
msgid "could not open or read '%s'"
msgstr ""
-#: builtin/notes.c:255 builtin/notes.c:306 builtin/notes.c:308
-#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:517
-#: builtin/notes.c:522 builtin/notes.c:600 builtin/notes.c:662
+#: builtin/notes.c:257 builtin/notes.c:308 builtin/notes.c:310
+#: builtin/notes.c:378 builtin/notes.c:433 builtin/notes.c:519
+#: builtin/notes.c:524 builtin/notes.c:602 builtin/notes.c:664
#, c-format
msgid "failed to resolve '%s' as a valid ref."
msgstr ""
-#: builtin/notes.c:258
+#: builtin/notes.c:260
#, c-format
msgid "failed to read object '%s'."
msgstr ""
-#: builtin/notes.c:262
+#: builtin/notes.c:264
#, c-format
msgid "cannot read note data from non-blob object '%s'."
msgstr ""
-#: builtin/notes.c:302
+#: builtin/notes.c:304
#, c-format
msgid "malformed input line: '%s'."
msgstr ""
-#: builtin/notes.c:317
+#: builtin/notes.c:319
#, c-format
msgid "failed to copy notes from '%s' to '%s'"
msgstr ""
#. TRANSLATORS: the first %s will be replaced by a git
#. notes command: 'add', 'merge', 'remove', etc.
#.
-#: builtin/notes.c:349
+#: builtin/notes.c:351
#, c-format
msgid "refusing to %s notes in %s (outside of refs/notes/)"
msgstr ""
-#: builtin/notes.c:369 builtin/notes.c:424 builtin/notes.c:500
-#: builtin/notes.c:512 builtin/notes.c:588 builtin/notes.c:655
-#: builtin/notes.c:805 builtin/notes.c:952 builtin/notes.c:973
+#: builtin/notes.c:371 builtin/notes.c:426 builtin/notes.c:502
+#: builtin/notes.c:514 builtin/notes.c:590 builtin/notes.c:657
+#: builtin/notes.c:807 builtin/notes.c:954 builtin/notes.c:975
msgid "too many parameters"
msgstr ""
-#: builtin/notes.c:382 builtin/notes.c:668
+#: builtin/notes.c:384 builtin/notes.c:670
#, c-format
msgid "no note found for object %s."
msgstr ""
-#: builtin/notes.c:403 builtin/notes.c:566
+#: builtin/notes.c:405 builtin/notes.c:568
msgid "note contents as a string"
msgstr ""
-#: builtin/notes.c:406 builtin/notes.c:569
+#: builtin/notes.c:408 builtin/notes.c:571
msgid "note contents in a file"
msgstr ""
-#: builtin/notes.c:409 builtin/notes.c:572
+#: builtin/notes.c:411 builtin/notes.c:574
msgid "reuse and edit specified note object"
msgstr ""
-#: builtin/notes.c:412 builtin/notes.c:575
+#: builtin/notes.c:414 builtin/notes.c:577
msgid "reuse specified note object"
msgstr ""
-#: builtin/notes.c:415 builtin/notes.c:578
+#: builtin/notes.c:417 builtin/notes.c:580
msgid "allow storing empty note"
msgstr ""
-#: builtin/notes.c:416 builtin/notes.c:487
+#: builtin/notes.c:418 builtin/notes.c:489
msgid "replace existing notes"
msgstr ""
-#: builtin/notes.c:441
+#: builtin/notes.c:443
#, c-format
msgid ""
"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
"existing notes"
msgstr ""
-#: builtin/notes.c:456 builtin/notes.c:535
+#: builtin/notes.c:458 builtin/notes.c:537
#, c-format
msgid "Overwriting existing notes for object %s\n"
msgstr ""
-#: builtin/notes.c:467 builtin/notes.c:627 builtin/notes.c:892
+#: builtin/notes.c:469 builtin/notes.c:629 builtin/notes.c:894
#, c-format
msgid "Removing note for object %s\n"
msgstr ""
-#: builtin/notes.c:488
+#: builtin/notes.c:490
msgid "read objects from stdin"
msgstr ""
-#: builtin/notes.c:490
+#: builtin/notes.c:492
msgid "load rewriting config for <command> (implies --stdin)"
msgstr ""
-#: builtin/notes.c:508
+#: builtin/notes.c:510
msgid "too few parameters"
msgstr ""
-#: builtin/notes.c:529
+#: builtin/notes.c:531
#, c-format
msgid ""
"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
"existing notes"
msgstr ""
-#: builtin/notes.c:541
+#: builtin/notes.c:543
#, c-format
msgid "missing notes on source object %s. Cannot copy."
msgstr ""
-#: builtin/notes.c:593
+#: builtin/notes.c:595
#, c-format
msgid ""
"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
msgstr ""
-#: builtin/notes.c:688
+#: builtin/notes.c:690
msgid "failed to delete ref NOTES_MERGE_PARTIAL"
msgstr ""
-#: builtin/notes.c:690
+#: builtin/notes.c:692
msgid "failed to delete ref NOTES_MERGE_REF"
msgstr ""
-#: builtin/notes.c:692
+#: builtin/notes.c:694
msgid "failed to remove 'git notes merge' worktree"
msgstr ""
-#: builtin/notes.c:712
+#: builtin/notes.c:714
msgid "failed to read ref NOTES_MERGE_PARTIAL"
msgstr ""
-#: builtin/notes.c:714
+#: builtin/notes.c:716
msgid "could not find commit from NOTES_MERGE_PARTIAL."
msgstr ""
-#: builtin/notes.c:716
+#: builtin/notes.c:718
msgid "could not parse commit from NOTES_MERGE_PARTIAL."
msgstr ""
-#: builtin/notes.c:729
+#: builtin/notes.c:731
msgid "failed to resolve NOTES_MERGE_REF"
msgstr ""
-#: builtin/notes.c:732
+#: builtin/notes.c:734
msgid "failed to finalize notes merge"
msgstr ""
-#: builtin/notes.c:758
+#: builtin/notes.c:760
#, c-format
msgid "unknown notes merge strategy %s"
msgstr ""
-#: builtin/notes.c:774
+#: builtin/notes.c:776
msgid "General options"
msgstr ""
-#: builtin/notes.c:776
+#: builtin/notes.c:778
msgid "Merge options"
msgstr ""
-#: builtin/notes.c:778
+#: builtin/notes.c:780
msgid ""
"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
"cat_sort_uniq)"
msgstr ""
-#: builtin/notes.c:780
+#: builtin/notes.c:782
msgid "Committing unmerged notes"
msgstr ""
-#: builtin/notes.c:782
+#: builtin/notes.c:784
msgid "finalize notes merge by committing unmerged notes"
msgstr ""
-#: builtin/notes.c:784
+#: builtin/notes.c:786
msgid "Aborting notes merge resolution"
msgstr ""
-#: builtin/notes.c:786
+#: builtin/notes.c:788
msgid "abort notes merge"
msgstr ""
-#: builtin/notes.c:797
+#: builtin/notes.c:799
msgid "cannot mix --commit, --abort or -s/--strategy"
msgstr ""
-#: builtin/notes.c:802
+#: builtin/notes.c:804
msgid "must specify a notes ref to merge"
msgstr ""
-#: builtin/notes.c:826
+#: builtin/notes.c:828
#, c-format
msgid "unknown -s/--strategy: %s"
msgstr ""
-#: builtin/notes.c:863
+#: builtin/notes.c:865
#, c-format
msgid "a notes merge into %s is already in-progress at %s"
msgstr ""
-#: builtin/notes.c:866
+#: builtin/notes.c:868
#, c-format
msgid "failed to store link to current notes ref (%s)"
msgstr ""
-#: builtin/notes.c:868
+#: builtin/notes.c:870
#, c-format
msgid ""
"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
"abort'.\n"
msgstr ""
-#: builtin/notes.c:890
+#: builtin/notes.c:892
#, c-format
msgid "Object %s has no note\n"
msgstr ""
-#: builtin/notes.c:902
+#: builtin/notes.c:904
msgid "attempt to remove non-existent note is not an error"
msgstr ""
-#: builtin/notes.c:905
+#: builtin/notes.c:907
msgid "read object names from the standard input"
msgstr ""
-#: builtin/notes.c:943 builtin/prune.c:107 builtin/worktree.c:151
+#: builtin/notes.c:945 builtin/prune.c:108 builtin/worktree.c:151
msgid "do not remove, show only"
msgstr ""
-#: builtin/notes.c:944
+#: builtin/notes.c:946
msgid "report pruned notes"
msgstr ""
-#: builtin/notes.c:986
+#: builtin/notes.c:988
msgid "notes-ref"
msgstr ""
-#: builtin/notes.c:987
+#: builtin/notes.c:989
msgid "use notes from <notes-ref>"
msgstr ""
-#: builtin/notes.c:1022
+#: builtin/notes.c:1024
#, c-format
msgid "unknown subcommand: %s"
msgstr ""
"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
msgstr ""
-#: builtin/pack-objects.c:211 builtin/pack-objects.c:214
+#: builtin/pack-objects.c:414
#, c-format
-msgid "deflate error (%d)"
+msgid "bad packed object CRC for %s"
+msgstr ""
+
+#: builtin/pack-objects.c:425
+#, c-format
+msgid "corrupt packed object for %s"
+msgstr ""
+
+#: builtin/pack-objects.c:556
+#, c-format
+msgid "recursive delta detected for object %s"
+msgstr ""
+
+#: builtin/pack-objects.c:756
+#, c-format
+msgid "ordered %u objects, expected %<PRIu32>"
+msgstr ""
+
+#: builtin/pack-objects.c:769
+#, c-format
+msgid "packfile is invalid: %s"
+msgstr ""
+
+#: builtin/pack-objects.c:773
+#, c-format
+msgid "unable to open packfile for reuse: %s"
msgstr ""
-#: builtin/pack-objects.c:810
+#: builtin/pack-objects.c:777
+msgid "unable to seek in reused packfile"
+msgstr ""
+
+#: builtin/pack-objects.c:788
+msgid "unable to read from reused packfile"
+msgstr ""
+
+#: builtin/pack-objects.c:816
msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
msgstr ""
-#: builtin/pack-objects.c:823
+#: builtin/pack-objects.c:829
msgid "Writing objects"
msgstr ""
-#: builtin/pack-objects.c:1106
+#: builtin/pack-objects.c:891 builtin/update-index.c:88
+#, c-format
+msgid "failed to stat %s"
+msgstr ""
+
+#: builtin/pack-objects.c:944
+#, c-format
+msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
+msgstr ""
+
+#: builtin/pack-objects.c:1112
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr ""
-#: builtin/pack-objects.c:1765
+#: builtin/pack-objects.c:1489
+#, c-format
+msgid "delta base offset overflow in pack for %s"
+msgstr ""
+
+#: builtin/pack-objects.c:1498
+#, c-format
+msgid "delta base offset out of bound for %s"
+msgstr ""
+
+#: builtin/pack-objects.c:1771
msgid "Counting objects"
msgstr ""
-#: builtin/pack-objects.c:1895
+#: builtin/pack-objects.c:1913
#, c-format
msgid "unable to get size of %s"
msgstr ""
-#: builtin/pack-objects.c:1910
+#: builtin/pack-objects.c:1928
#, c-format
msgid "unable to parse object header of %s"
msgstr ""
-#: builtin/pack-objects.c:2564
+#: builtin/pack-objects.c:1995 builtin/pack-objects.c:2011
+#: builtin/pack-objects.c:2021
+#, c-format
+msgid "object %s cannot be read"
+msgstr ""
+
+#: builtin/pack-objects.c:1998 builtin/pack-objects.c:2025
+#, c-format
+msgid "object %s inconsistent object length (%lu vs %lu)"
+msgstr ""
+
+#: builtin/pack-objects.c:2035
+msgid "suboptimal pack - out of memory"
+msgstr ""
+
+#: builtin/pack-objects.c:2369
+#, c-format
+msgid "Delta compression using up to %d threads"
+msgstr ""
+
+#: builtin/pack-objects.c:2505
+#, c-format
+msgid "unable to pack objects reachable from tag %s"
+msgstr ""
+
+#: builtin/pack-objects.c:2589
msgid "Compressing objects"
msgstr ""
-#: builtin/pack-objects.c:2735
+#: builtin/pack-objects.c:2595
+msgid "inconsistency with delta count"
+msgstr ""
+
+#: builtin/pack-objects.c:2674
+#, c-format
+msgid ""
+"expected edge object ID, got garbage:\n"
+" %s"
+msgstr ""
+
+#: builtin/pack-objects.c:2680
+#, c-format
+msgid ""
+"expected object ID, got garbage:\n"
+" %s"
+msgstr ""
+
+#: builtin/pack-objects.c:2760
msgid "invalid value for --missing"
msgstr ""
-#: builtin/pack-objects.c:3067
+#: builtin/pack-objects.c:2819 builtin/pack-objects.c:2927
+msgid "cannot open pack index"
+msgstr ""
+
+#: builtin/pack-objects.c:2850
+#, c-format
+msgid "loose object at %s could not be examined"
+msgstr ""
+
+#: builtin/pack-objects.c:2935
+msgid "unable to force loose object"
+msgstr ""
+
+#: builtin/pack-objects.c:3022
+#, c-format
+msgid "not a rev '%s'"
+msgstr ""
+
+#: builtin/pack-objects.c:3025
+#, c-format
+msgid "bad revision '%s'"
+msgstr ""
+
+#: builtin/pack-objects.c:3045
+msgid "unable to add recent objects"
+msgstr ""
+
+#: builtin/pack-objects.c:3095
#, c-format
msgid "unsupported index version %s"
msgstr ""
-#: builtin/pack-objects.c:3071
+#: builtin/pack-objects.c:3099
#, c-format
msgid "bad index version '%s'"
msgstr ""
-#: builtin/pack-objects.c:3102
+#: builtin/pack-objects.c:3130
msgid "do not show progress meter"
msgstr ""
-#: builtin/pack-objects.c:3104
+#: builtin/pack-objects.c:3132
msgid "show progress meter"
msgstr ""
-#: builtin/pack-objects.c:3106
+#: builtin/pack-objects.c:3134
msgid "show progress meter during object writing phase"
msgstr ""
-#: builtin/pack-objects.c:3109
+#: builtin/pack-objects.c:3137
msgid "similar to --all-progress when progress meter is shown"
msgstr ""
-#: builtin/pack-objects.c:3110
-msgid "version[,offset]"
+#: builtin/pack-objects.c:3138
+msgid "<version>[,<offset>]"
msgstr ""
-#: builtin/pack-objects.c:3111
+#: builtin/pack-objects.c:3139
msgid "write the pack index file in the specified idx format version"
msgstr ""
-#: builtin/pack-objects.c:3114
+#: builtin/pack-objects.c:3142
msgid "maximum size of each output pack file"
msgstr ""
-#: builtin/pack-objects.c:3116
+#: builtin/pack-objects.c:3144
msgid "ignore borrowed objects from alternate object store"
msgstr ""
-#: builtin/pack-objects.c:3118
+#: builtin/pack-objects.c:3146
msgid "ignore packed objects"
msgstr ""
-#: builtin/pack-objects.c:3120
+#: builtin/pack-objects.c:3148
msgid "limit pack window by objects"
msgstr ""
-#: builtin/pack-objects.c:3122
+#: builtin/pack-objects.c:3150
msgid "limit pack window by memory in addition to object limit"
msgstr ""
-#: builtin/pack-objects.c:3124
+#: builtin/pack-objects.c:3152
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr ""
-#: builtin/pack-objects.c:3126
+#: builtin/pack-objects.c:3154
msgid "reuse existing deltas"
msgstr ""
-#: builtin/pack-objects.c:3128
+#: builtin/pack-objects.c:3156
msgid "reuse existing objects"
msgstr ""
-#: builtin/pack-objects.c:3130
+#: builtin/pack-objects.c:3158
msgid "use OFS_DELTA objects"
msgstr ""
-#: builtin/pack-objects.c:3132
+#: builtin/pack-objects.c:3160
msgid "use threads when searching for best delta matches"
msgstr ""
-#: builtin/pack-objects.c:3134
+#: builtin/pack-objects.c:3162
msgid "do not create an empty pack output"
msgstr ""
-#: builtin/pack-objects.c:3136
+#: builtin/pack-objects.c:3164
msgid "read revision arguments from standard input"
msgstr ""
-#: builtin/pack-objects.c:3138
+#: builtin/pack-objects.c:3166
msgid "limit the objects to those that are not yet packed"
msgstr ""
-#: builtin/pack-objects.c:3141
+#: builtin/pack-objects.c:3169
msgid "include objects reachable from any reference"
msgstr ""
-#: builtin/pack-objects.c:3144
+#: builtin/pack-objects.c:3172
msgid "include objects referred by reflog entries"
msgstr ""
-#: builtin/pack-objects.c:3147
+#: builtin/pack-objects.c:3175
msgid "include objects referred to by the index"
msgstr ""
-#: builtin/pack-objects.c:3150
+#: builtin/pack-objects.c:3178
msgid "output pack to stdout"
msgstr ""
-#: builtin/pack-objects.c:3152
+#: builtin/pack-objects.c:3180
msgid "include tag objects that refer to objects to be packed"
msgstr ""
-#: builtin/pack-objects.c:3154
+#: builtin/pack-objects.c:3182
msgid "keep unreachable objects"
msgstr ""
-#: builtin/pack-objects.c:3156
+#: builtin/pack-objects.c:3184
msgid "pack loose unreachable objects"
msgstr ""
-#: builtin/pack-objects.c:3158
+#: builtin/pack-objects.c:3186
msgid "unpack unreachable objects newer than <time>"
msgstr ""
-#: builtin/pack-objects.c:3161
+#: builtin/pack-objects.c:3189
msgid "create thin packs"
msgstr ""
-#: builtin/pack-objects.c:3163
+#: builtin/pack-objects.c:3191
msgid "create packs suitable for shallow fetches"
msgstr ""
-#: builtin/pack-objects.c:3165
+#: builtin/pack-objects.c:3193
msgid "ignore packs that have companion .keep file"
msgstr ""
-#: builtin/pack-objects.c:3167
+#: builtin/pack-objects.c:3195
msgid "ignore this pack"
msgstr ""
-#: builtin/pack-objects.c:3169
+#: builtin/pack-objects.c:3197
msgid "pack compression level"
msgstr ""
-#: builtin/pack-objects.c:3171
+#: builtin/pack-objects.c:3199
msgid "do not hide commits by grafts"
msgstr ""
-#: builtin/pack-objects.c:3173
+#: builtin/pack-objects.c:3201
msgid "use a bitmap index if available to speed up counting objects"
msgstr ""
-#: builtin/pack-objects.c:3175
+#: builtin/pack-objects.c:3203
msgid "write a bitmap index together with the pack index"
msgstr ""
-#: builtin/pack-objects.c:3178
-msgid "handling for missing objects"
+#: builtin/pack-objects.c:3206
+msgid "handling for missing objects"
+msgstr ""
+
+#: builtin/pack-objects.c:3209
+msgid "do not pack objects in promisor packfiles"
+msgstr ""
+
+#: builtin/pack-objects.c:3233
+#, c-format
+msgid "delta chain depth %d is too deep, forcing %d"
+msgstr ""
+
+#: builtin/pack-objects.c:3238
+#, c-format
+msgid "pack.deltaCacheLimit is too high, forcing %d"
+msgstr ""
+
+#: builtin/pack-objects.c:3294
+msgid "--max-pack-size cannot be used to build a pack for transfer"
+msgstr ""
+
+#: builtin/pack-objects.c:3296
+msgid "minimum pack size limit is 1 MiB"
msgstr ""
-#: builtin/pack-objects.c:3181
-msgid "do not pack objects in promisor packfiles"
+#: builtin/pack-objects.c:3301
+msgid "--thin cannot be used to build an indexable pack"
msgstr ""
-#: builtin/pack-objects.c:3205
-#, c-format
-msgid "delta chain depth %d is too deep, forcing %d"
+#: builtin/pack-objects.c:3304
+msgid "--keep-unreachable and --unpack-unreachable are incompatible"
msgstr ""
-#: builtin/pack-objects.c:3210
-#, c-format
-msgid "pack.deltaCacheLimit is too high, forcing %d"
+#: builtin/pack-objects.c:3310
+msgid "cannot use --filter without --stdout"
msgstr ""
-#: builtin/pack-objects.c:3338
+#: builtin/pack-objects.c:3366
msgid "Enumerating objects"
msgstr ""
+#: builtin/pack-objects.c:3385
+#, c-format
+msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)"
+msgstr ""
+
#: builtin/pack-refs.c:7
msgid "git pack-refs [<options>]"
msgstr ""
msgid "prune loose refs (default)"
msgstr ""
-#: builtin/prune-packed.c:8
+#: builtin/prune-packed.c:9
msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
msgstr ""
-#: builtin/prune-packed.c:41
+#: builtin/prune-packed.c:42
msgid "Removing duplicate objects"
msgstr ""
-#: builtin/prune.c:11
+#: builtin/prune.c:12
msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
msgstr ""
-#: builtin/prune.c:108
+#: builtin/prune.c:109
msgid "report pruned objects"
msgstr ""
-#: builtin/prune.c:111
+#: builtin/prune.c:112
msgid "expire objects older than <time>"
msgstr ""
-#: builtin/prune.c:113
+#: builtin/prune.c:114
msgid "limit traversal to objects outside promisor packfiles"
msgstr ""
-#: builtin/prune.c:127
+#: builtin/prune.c:128
msgid "cannot prune in a precious-objects repo"
msgstr ""
msgid "incorporate changes by rebasing rather than merging"
msgstr ""
-#: builtin/pull.c:166 builtin/rebase--helper.c:23 builtin/revert.c:121
+#: builtin/pull.c:166 builtin/rebase--helper.c:23 builtin/revert.c:122
msgid "allow fast-forward"
msgstr ""
msgid "<remote>"
msgstr ""
-#: builtin/pull.c:438 builtin/pull.c:453 builtin/pull.c:458 git-rebase.sh:523
+#: builtin/pull.c:438 builtin/pull.c:453 builtin/pull.c:458 git-rebase.sh:576
#: git-parse-remote.sh:65
msgid "<branch>"
msgstr ""
"from the remote, but no such ref was fetched."
msgstr ""
-#: builtin/pull.c:826
+#: builtin/pull.c:829
msgid "ignoring --verify-signatures for rebase"
msgstr ""
-#: builtin/pull.c:874
+#: builtin/pull.c:877
msgid "--[no-]autostash option is only valid with --rebase."
msgstr ""
-#: builtin/pull.c:882
+#: builtin/pull.c:885
msgid "Updating an unborn branch with changes added to the index."
msgstr ""
-#: builtin/pull.c:885
+#: builtin/pull.c:888
msgid "pull with rebase"
msgstr ""
-#: builtin/pull.c:886
+#: builtin/pull.c:889
msgid "please commit or stash them."
msgstr ""
-#: builtin/pull.c:911
+#: builtin/pull.c:914
#, c-format
msgid ""
"fetch updated the current branch head.\n"
"commit %s."
msgstr ""
-#: builtin/pull.c:916
+#: builtin/pull.c:919
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
"to recover."
msgstr ""
-#: builtin/pull.c:931
+#: builtin/pull.c:934
msgid "Cannot merge multiple branches into empty head."
msgstr ""
-#: builtin/pull.c:935
+#: builtin/pull.c:938
msgid "Cannot rebase onto multiple branches."
msgstr ""
-#: builtin/pull.c:942
+#: builtin/pull.c:945
msgid "cannot rebase with locally recorded submodule modifications"
msgstr ""
msgstr ""
#: builtin/push.c:561 builtin/send-pack.c:181
-msgid "refname>:<expect"
+msgid "<refname>:<expect>"
msgstr ""
#: builtin/push.c:562 builtin/send-pack.c:182
msgid "push options must not have new line characters"
msgstr ""
+#: builtin/range-diff.c:8
+msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>"
+msgstr ""
+
+#: builtin/range-diff.c:9
+msgid "git range-diff [<options>] <old-tip>...<new-tip>"
+msgstr ""
+
+#: builtin/range-diff.c:10
+msgid "git range-diff [<options>] <base> <old-tip> <new-tip>"
+msgstr ""
+
+#: builtin/range-diff.c:26
+msgid "Percentage by which creation is weighted"
+msgstr ""
+
+#: builtin/range-diff.c:28
+msgid "color both diff and diff-between-diffs"
+msgstr ""
+
+#: builtin/range-diff.c:75 builtin/range-diff.c:79
+#, c-format
+msgid "no .. in range: '%s'"
+msgstr ""
+
+#: builtin/range-diff.c:89
+msgid "single arg format must be symmetric range"
+msgstr ""
+
+#: builtin/range-diff.c:104
+msgid "need two commit ranges"
+msgstr ""
+
#: builtin/read-tree.c:40
msgid ""
"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
msgid "keep empty commits"
msgstr ""
-#: builtin/rebase--helper.c:26 builtin/revert.c:123
+#: builtin/rebase--helper.c:26 builtin/revert.c:124
msgid "allow commits with empty messages"
msgstr ""
msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
msgstr ""
-#: builtin/receive-pack.c:31
+#: builtin/receive-pack.c:32
msgid "git receive-pack <git-dir>"
msgstr ""
-#: builtin/receive-pack.c:842
+#: builtin/receive-pack.c:830
msgid ""
"By default, updating the current branch in a non-bare repository\n"
"is denied, because it will make the index and work tree inconsistent\n"
"'receive.denyCurrentBranch' configuration variable to 'refuse'."
msgstr ""
-#: builtin/receive-pack.c:862
+#: builtin/receive-pack.c:850
msgid ""
"By default, deleting the current branch is denied, because the next\n"
"'git clone' won't result in any file checked out, causing confusion.\n"
"To squelch this message, you can set it to 'refuse'."
msgstr ""
-#: builtin/receive-pack.c:1935
+#: builtin/receive-pack.c:1923
msgid "quiet"
msgstr ""
-#: builtin/receive-pack.c:1949
+#: builtin/receive-pack.c:1937
msgid "You must specify a directory."
msgstr ""
-#: builtin/reflog.c:532 builtin/reflog.c:537
+#: builtin/reflog.c:536 builtin/reflog.c:541
#, c-format
msgid "'%s' is not a valid timestamp"
msgstr ""
-#: builtin/remote.c:14
+#: builtin/remote.c:15
msgid "git remote [-v | --verbose]"
msgstr ""
-#: builtin/remote.c:15
+#: builtin/remote.c:16
msgid ""
"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
"mirror=<fetch|push>] <name> <url>"
msgstr ""
-#: builtin/remote.c:16 builtin/remote.c:36
+#: builtin/remote.c:17 builtin/remote.c:37
msgid "git remote rename <old> <new>"
msgstr ""
-#: builtin/remote.c:17 builtin/remote.c:41
+#: builtin/remote.c:18 builtin/remote.c:42
msgid "git remote remove <name>"
msgstr ""
-#: builtin/remote.c:18 builtin/remote.c:46
+#: builtin/remote.c:19 builtin/remote.c:47
msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
msgstr ""
-#: builtin/remote.c:19
+#: builtin/remote.c:20
msgid "git remote [-v | --verbose] show [-n] <name>"
msgstr ""
-#: builtin/remote.c:20
+#: builtin/remote.c:21
msgid "git remote prune [-n | --dry-run] <name>"
msgstr ""
-#: builtin/remote.c:21
+#: builtin/remote.c:22
msgid ""
"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
msgstr ""
-#: builtin/remote.c:22
+#: builtin/remote.c:23
msgid "git remote set-branches [--add] <name> <branch>..."
msgstr ""
-#: builtin/remote.c:23 builtin/remote.c:72
+#: builtin/remote.c:24 builtin/remote.c:73
msgid "git remote get-url [--push] [--all] <name>"
msgstr ""
-#: builtin/remote.c:24 builtin/remote.c:77
+#: builtin/remote.c:25 builtin/remote.c:78
msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
msgstr ""
-#: builtin/remote.c:25 builtin/remote.c:78
+#: builtin/remote.c:26 builtin/remote.c:79
msgid "git remote set-url --add <name> <newurl>"
msgstr ""
-#: builtin/remote.c:26 builtin/remote.c:79
+#: builtin/remote.c:27 builtin/remote.c:80
msgid "git remote set-url --delete <name> <url>"
msgstr ""
-#: builtin/remote.c:31
+#: builtin/remote.c:32
msgid "git remote add [<options>] <name> <url>"
msgstr ""
-#: builtin/remote.c:51
+#: builtin/remote.c:52
msgid "git remote set-branches <name> <branch>..."
msgstr ""
-#: builtin/remote.c:52
+#: builtin/remote.c:53
msgid "git remote set-branches --add <name> <branch>..."
msgstr ""
-#: builtin/remote.c:57
+#: builtin/remote.c:58
msgid "git remote show [<options>] <name>"
msgstr ""
-#: builtin/remote.c:62
+#: builtin/remote.c:63
msgid "git remote prune [<options>] <name>"
msgstr ""
-#: builtin/remote.c:67
+#: builtin/remote.c:68
msgid "git remote update [<options>] [<group> | <remote>]..."
msgstr ""
-#: builtin/remote.c:96
+#: builtin/remote.c:97
#, c-format
msgid "Updating %s"
msgstr ""
-#: builtin/remote.c:128
+#: builtin/remote.c:129
msgid ""
"--mirror is dangerous and deprecated; please\n"
"\t use --mirror=fetch or --mirror=push instead"
msgstr ""
-#: builtin/remote.c:145
+#: builtin/remote.c:146
#, c-format
msgid "unknown mirror argument: %s"
msgstr ""
-#: builtin/remote.c:161
+#: builtin/remote.c:162
msgid "fetch the remote branches"
msgstr ""
-#: builtin/remote.c:163
+#: builtin/remote.c:164
msgid "import all tags and associated objects when fetching"
msgstr ""
-#: builtin/remote.c:166
+#: builtin/remote.c:167
msgid "or do not fetch any tag at all (--no-tags)"
msgstr ""
-#: builtin/remote.c:168
+#: builtin/remote.c:169
msgid "branch(es) to track"
msgstr ""
-#: builtin/remote.c:169
+#: builtin/remote.c:170
msgid "master branch"
msgstr ""
-#: builtin/remote.c:170
+#: builtin/remote.c:171
msgid "push|fetch"
msgstr ""
-#: builtin/remote.c:171
+#: builtin/remote.c:172
msgid "set up remote as a mirror to push to or fetch from"
msgstr ""
-#: builtin/remote.c:183
+#: builtin/remote.c:184
msgid "specifying a master branch makes no sense with --mirror"
msgstr ""
-#: builtin/remote.c:185
+#: builtin/remote.c:186
msgid "specifying branches to track makes sense only with fetch mirrors"
msgstr ""
-#: builtin/remote.c:192 builtin/remote.c:634
+#: builtin/remote.c:193 builtin/remote.c:635
#, c-format
msgid "remote %s already exists."
msgstr ""
-#: builtin/remote.c:196 builtin/remote.c:638
+#: builtin/remote.c:197 builtin/remote.c:639
#, c-format
msgid "'%s' is not a valid remote name"
msgstr ""
-#: builtin/remote.c:236
+#: builtin/remote.c:237
#, c-format
msgid "Could not setup master '%s'"
msgstr ""
-#: builtin/remote.c:342
+#: builtin/remote.c:343
#, c-format
msgid "Could not get fetch map for refspec %s"
msgstr ""
-#: builtin/remote.c:441 builtin/remote.c:449
+#: builtin/remote.c:442 builtin/remote.c:450
msgid "(matching)"
msgstr ""
-#: builtin/remote.c:453
+#: builtin/remote.c:454
msgid "(delete)"
msgstr ""
-#: builtin/remote.c:627 builtin/remote.c:762 builtin/remote.c:861
+#: builtin/remote.c:628 builtin/remote.c:764 builtin/remote.c:863
#, c-format
msgid "No such remote: %s"
msgstr ""
-#: builtin/remote.c:644
+#: builtin/remote.c:645
#, c-format
msgid "Could not rename config section '%s' to '%s'"
msgstr ""
-#: builtin/remote.c:664
+#: builtin/remote.c:665
#, c-format
msgid ""
"Not updating non-default fetch refspec\n"
"\tPlease update the configuration manually if necessary."
msgstr ""
-#: builtin/remote.c:700
+#: builtin/remote.c:701
#, c-format
msgid "deleting '%s' failed"
msgstr ""
-#: builtin/remote.c:734
+#: builtin/remote.c:735
#, c-format
msgid "creating '%s' failed"
msgstr ""
-#: builtin/remote.c:799
+#: builtin/remote.c:801
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
msgstr[0] ""
msgstr[1] ""
-#: builtin/remote.c:813
+#: builtin/remote.c:815
#, c-format
msgid "Could not remove config section '%s'"
msgstr ""
-#: builtin/remote.c:914
+#: builtin/remote.c:916
#, c-format
msgid " new (next fetch will store in remotes/%s)"
msgstr ""
-#: builtin/remote.c:917
+#: builtin/remote.c:919
msgid " tracked"
msgstr ""
-#: builtin/remote.c:919
+#: builtin/remote.c:921
msgid " stale (use 'git remote prune' to remove)"
msgstr ""
-#: builtin/remote.c:921
+#: builtin/remote.c:923
msgid " ???"
msgstr ""
-#: builtin/remote.c:962
+#: builtin/remote.c:964
#, c-format
msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
msgstr ""
-#: builtin/remote.c:971
+#: builtin/remote.c:973
#, c-format
msgid "rebases interactively onto remote %s"
msgstr ""
-#: builtin/remote.c:973
+#: builtin/remote.c:975
#, c-format
msgid "rebases interactively (with merges) onto remote %s"
msgstr ""
-#: builtin/remote.c:976
+#: builtin/remote.c:978
#, c-format
msgid "rebases onto remote %s"
msgstr ""
-#: builtin/remote.c:980
+#: builtin/remote.c:982
#, c-format
msgid " merges with remote %s"
msgstr ""
-#: builtin/remote.c:983
+#: builtin/remote.c:985
#, c-format
msgid "merges with remote %s"
msgstr ""
-#: builtin/remote.c:986
+#: builtin/remote.c:988
#, c-format
msgid "%-*s and with remote %s\n"
msgstr ""
-#: builtin/remote.c:1029
+#: builtin/remote.c:1031
msgid "create"
msgstr ""
-#: builtin/remote.c:1032
+#: builtin/remote.c:1034
msgid "delete"
msgstr ""
-#: builtin/remote.c:1036
+#: builtin/remote.c:1038
msgid "up to date"
msgstr ""
-#: builtin/remote.c:1039
+#: builtin/remote.c:1041
msgid "fast-forwardable"
msgstr ""
-#: builtin/remote.c:1042
+#: builtin/remote.c:1044
msgid "local out of date"
msgstr ""
-#: builtin/remote.c:1049
+#: builtin/remote.c:1051
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr ""
-#: builtin/remote.c:1052
+#: builtin/remote.c:1054
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr ""
-#: builtin/remote.c:1056
+#: builtin/remote.c:1058
#, c-format
msgid " %-*s forces to %s"
msgstr ""
-#: builtin/remote.c:1059
+#: builtin/remote.c:1061
#, c-format
msgid " %-*s pushes to %s"
msgstr ""
-#: builtin/remote.c:1127
+#: builtin/remote.c:1129
msgid "do not query remotes"
msgstr ""
-#: builtin/remote.c:1154
+#: builtin/remote.c:1156
#, c-format
msgid "* remote %s"
msgstr ""
-#: builtin/remote.c:1155
+#: builtin/remote.c:1157
#, c-format
msgid " Fetch URL: %s"
msgstr ""
-#: builtin/remote.c:1156 builtin/remote.c:1172 builtin/remote.c:1311
+#: builtin/remote.c:1158 builtin/remote.c:1174 builtin/remote.c:1313
msgid "(no URL)"
msgstr ""
#. with the one in " Fetch URL: %s"
#. translation.
#.
-#: builtin/remote.c:1170 builtin/remote.c:1172
+#: builtin/remote.c:1172 builtin/remote.c:1174
#, c-format
msgid " Push URL: %s"
msgstr ""
-#: builtin/remote.c:1174 builtin/remote.c:1176 builtin/remote.c:1178
+#: builtin/remote.c:1176 builtin/remote.c:1178 builtin/remote.c:1180
#, c-format
msgid " HEAD branch: %s"
msgstr ""
-#: builtin/remote.c:1174
+#: builtin/remote.c:1176
msgid "(not queried)"
msgstr ""
-#: builtin/remote.c:1176
+#: builtin/remote.c:1178
msgid "(unknown)"
msgstr ""
-#: builtin/remote.c:1180
+#: builtin/remote.c:1182
#, c-format
msgid ""
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
msgstr ""
-#: builtin/remote.c:1192
+#: builtin/remote.c:1194
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
msgstr[0] ""
msgstr[1] ""
-#: builtin/remote.c:1195 builtin/remote.c:1221
+#: builtin/remote.c:1197 builtin/remote.c:1223
msgid " (status not queried)"
msgstr ""
-#: builtin/remote.c:1204
+#: builtin/remote.c:1206
msgid " Local branch configured for 'git pull':"
msgid_plural " Local branches configured for 'git pull':"
msgstr[0] ""
msgstr[1] ""
-#: builtin/remote.c:1212
+#: builtin/remote.c:1214
msgid " Local refs will be mirrored by 'git push'"
msgstr ""
-#: builtin/remote.c:1218
+#: builtin/remote.c:1220
#, 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:1239
+#: builtin/remote.c:1241
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr ""
-#: builtin/remote.c:1241
+#: builtin/remote.c:1243
msgid "delete refs/remotes/<name>/HEAD"
msgstr ""
-#: builtin/remote.c:1256
+#: builtin/remote.c:1258
msgid "Cannot determine remote HEAD"
msgstr ""
-#: builtin/remote.c:1258
+#: builtin/remote.c:1260
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr ""
-#: builtin/remote.c:1268
+#: builtin/remote.c:1270
#, c-format
msgid "Could not delete %s"
msgstr ""
-#: builtin/remote.c:1276
+#: builtin/remote.c:1278
#, c-format
msgid "Not a valid ref: %s"
msgstr ""
-#: builtin/remote.c:1278
+#: builtin/remote.c:1280
#, c-format
msgid "Could not setup %s"
msgstr ""
-#: builtin/remote.c:1296
+#: builtin/remote.c:1298
#, c-format
msgid " %s will become dangling!"
msgstr ""
-#: builtin/remote.c:1297
+#: builtin/remote.c:1299
#, c-format
msgid " %s has become dangling!"
msgstr ""
-#: builtin/remote.c:1307
+#: builtin/remote.c:1309
#, c-format
msgid "Pruning %s"
msgstr ""
-#: builtin/remote.c:1308
+#: builtin/remote.c:1310
#, c-format
msgid "URL: %s"
msgstr ""
-#: builtin/remote.c:1324
+#: builtin/remote.c:1326
#, c-format
msgid " * [would prune] %s"
msgstr ""
-#: builtin/remote.c:1327
+#: builtin/remote.c:1329
#, c-format
msgid " * [pruned] %s"
msgstr ""
-#: builtin/remote.c:1372
+#: builtin/remote.c:1374
msgid "prune remotes after fetching"
msgstr ""
-#: builtin/remote.c:1435 builtin/remote.c:1489 builtin/remote.c:1557
+#: builtin/remote.c:1437 builtin/remote.c:1491 builtin/remote.c:1559
#, c-format
msgid "No such remote '%s'"
msgstr ""
-#: builtin/remote.c:1451
+#: builtin/remote.c:1453
msgid "add branch"
msgstr ""
-#: builtin/remote.c:1458
+#: builtin/remote.c:1460
msgid "no remote specified"
msgstr ""
-#: builtin/remote.c:1475
+#: builtin/remote.c:1477
msgid "query push URLs rather than fetch URLs"
msgstr ""
-#: builtin/remote.c:1477
+#: builtin/remote.c:1479
msgid "return all URLs"
msgstr ""
-#: builtin/remote.c:1505
+#: builtin/remote.c:1507
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr ""
-#: builtin/remote.c:1531
+#: builtin/remote.c:1533
msgid "manipulate push URLs"
msgstr ""
-#: builtin/remote.c:1533
+#: builtin/remote.c:1535
msgid "add URL"
msgstr ""
-#: builtin/remote.c:1535
+#: builtin/remote.c:1537
msgid "delete URLs"
msgstr ""
-#: builtin/remote.c:1542
+#: builtin/remote.c:1544
msgid "--add --delete doesn't make sense"
msgstr ""
-#: builtin/remote.c:1581
+#: builtin/remote.c:1583
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr ""
-#: builtin/remote.c:1589
+#: builtin/remote.c:1591
#, c-format
msgid "No such URL found: %s"
msgstr ""
-#: builtin/remote.c:1591
+#: builtin/remote.c:1593
msgid "Will not delete all non-push URLs"
msgstr ""
-#: builtin/remote.c:1607
+#: builtin/remote.c:1609
msgid "be verbose; must be placed before a subcommand"
msgstr ""
-#: builtin/remote.c:1638
+#: builtin/remote.c:1640
#, c-format
msgid "Unknown subcommand: %s"
msgstr ""
-#: builtin/repack.c:18
+#: builtin/repack.c:20
msgid "git repack [<options>]"
msgstr ""
-#: builtin/repack.c:23
+#: builtin/repack.c:25
msgid ""
"Incremental repacks are incompatible with bitmap indexes. Use\n"
"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
msgstr ""
-#: builtin/repack.c:180
+#: builtin/repack.c:287
msgid "pack everything in a single pack"
msgstr ""
-#: builtin/repack.c:182
+#: builtin/repack.c:289
msgid "same as -a, and turn unreachable objects loose"
msgstr ""
-#: builtin/repack.c:185
+#: builtin/repack.c:292
msgid "remove redundant packs, and run git-prune-packed"
msgstr ""
-#: builtin/repack.c:187
+#: builtin/repack.c:294
msgid "pass --no-reuse-delta to git-pack-objects"
msgstr ""
-#: builtin/repack.c:189
+#: builtin/repack.c:296
msgid "pass --no-reuse-object to git-pack-objects"
msgstr ""
-#: builtin/repack.c:191
+#: builtin/repack.c:298
msgid "do not run git-update-server-info"
msgstr ""
-#: builtin/repack.c:194
+#: builtin/repack.c:301
msgid "pass --local to git-pack-objects"
msgstr ""
-#: builtin/repack.c:196
+#: builtin/repack.c:303
msgid "write bitmap index"
msgstr ""
-#: builtin/repack.c:197
+#: builtin/repack.c:304
msgid "approxidate"
msgstr ""
-#: builtin/repack.c:198
+#: builtin/repack.c:305
msgid "with -A, do not loosen objects older than this"
msgstr ""
-#: builtin/repack.c:200
+#: builtin/repack.c:307
msgid "with -a, repack unreachable objects"
msgstr ""
-#: builtin/repack.c:202
+#: builtin/repack.c:309
msgid "size of the window used for delta compression"
msgstr ""
-#: builtin/repack.c:203 builtin/repack.c:209
+#: builtin/repack.c:310 builtin/repack.c:316
msgid "bytes"
msgstr ""
-#: builtin/repack.c:204
+#: builtin/repack.c:311
msgid "same as the above, but limit memory size instead of entries count"
msgstr ""
-#: builtin/repack.c:206
+#: builtin/repack.c:313
msgid "limits the maximum delta depth"
msgstr ""
-#: builtin/repack.c:208
+#: builtin/repack.c:315
msgid "limits the maximum number of threads"
msgstr ""
-#: builtin/repack.c:210
+#: builtin/repack.c:317
msgid "maximum size of each packfile"
msgstr ""
-#: builtin/repack.c:212
+#: builtin/repack.c:319
msgid "repack objects in packs marked with .keep"
msgstr ""
-#: builtin/repack.c:214
+#: builtin/repack.c:321
msgid "do not repack this pack"
msgstr ""
-#: builtin/repack.c:224
+#: builtin/repack.c:331
msgid "cannot delete packs in a precious-objects repo"
msgstr ""
-#: builtin/repack.c:228
+#: builtin/repack.c:335
msgid "--keep-unreachable and -A are incompatible"
msgstr ""
-#: builtin/repack.c:425 builtin/worktree.c:139
+#: builtin/repack.c:510 builtin/worktree.c:139
#, c-format
msgid "failed to remove '%s'"
msgstr ""
msgid "git replace [--format=<format>] [-l [<pattern>]]"
msgstr ""
-#: builtin/replace.c:371 builtin/replace.c:415 builtin/replace.c:445
+#: builtin/replace.c:57 builtin/replace.c:203 builtin/replace.c:206
+#, c-format
+msgid "failed to resolve '%s' as a valid ref"
+msgstr ""
+
+#: builtin/replace.c:86
+#, c-format
+msgid ""
+"invalid replace format '%s'\n"
+"valid formats are 'short', 'medium' and 'long'"
+msgstr ""
+
+#: builtin/replace.c:121
+#, c-format
+msgid "replace ref '%s' not found"
+msgstr ""
+
+#: builtin/replace.c:137
+#, c-format
+msgid "Deleted replace ref '%s'"
+msgstr ""
+
+#: builtin/replace.c:149
+#, c-format
+msgid "'%s' is not a valid ref name"
+msgstr ""
+
+#: builtin/replace.c:154
+#, c-format
+msgid "replace ref '%s' already exists"
+msgstr ""
+
+#: builtin/replace.c:174
+#, c-format
+msgid ""
+"Objects must be of the same type.\n"
+"'%s' points to a replaced object of type '%s'\n"
+"while '%s' points to a replacement object of type '%s'."
+msgstr ""
+
+#: builtin/replace.c:225
#, c-format
-msgid "Not a valid object name: '%s'"
+msgid "unable to open %s for writing"
+msgstr ""
+
+#: builtin/replace.c:238
+msgid "cat-file reported failure"
+msgstr ""
+
+#: builtin/replace.c:254
+#, c-format
+msgid "unable to open %s for reading"
+msgstr ""
+
+#: builtin/replace.c:268
+msgid "unable to spawn mktree"
+msgstr ""
+
+#: builtin/replace.c:272
+msgid "unable to read from mktree"
+msgstr ""
+
+#: builtin/replace.c:281
+msgid "mktree reported failure"
+msgstr ""
+
+#: builtin/replace.c:285
+msgid "mktree did not return an object name"
+msgstr ""
+
+#: builtin/replace.c:294
+#, c-format
+msgid "unable to fstat %s"
+msgstr ""
+
+#: builtin/replace.c:299
+msgid "unable to write object to database"
+msgstr ""
+
+#: builtin/replace.c:318 builtin/replace.c:371 builtin/replace.c:415
+#: builtin/replace.c:445
+#, c-format
+msgid "not a valid object name: '%s'"
+msgstr ""
+
+#: builtin/replace.c:322
+#, c-format
+msgid "unable to get object type for %s"
+msgstr ""
+
+#: builtin/replace.c:338
+msgid "editing object file failed"
+msgstr ""
+
+#: builtin/replace.c:347
+#, c-format
+msgid "new object is the same as the old one: '%s'"
msgstr ""
#: builtin/replace.c:407
#: builtin/replace.c:460
#, c-format
-msgid "the original commit '%s' has a gpg signature."
+msgid "the original commit '%s' has a gpg signature"
msgstr ""
#: builtin/replace.c:461
msgid "could not write replacement commit for: '%s'"
msgstr ""
+#: builtin/replace.c:479
+#, c-format
+msgid "graft for '%s' unnecessary"
+msgstr ""
+
+#: builtin/replace.c:482
+#, c-format
+msgid "new commit is the same as the old one: '%s'"
+msgstr ""
+
#: builtin/replace.c:514
#, c-format
msgid ""
msgid "use this format"
msgstr ""
+#: builtin/replace.c:556
+msgid "--format cannot be used when not listing"
+msgstr ""
+
+#: builtin/replace.c:564
+msgid "-f only makes sense when writing a replacement"
+msgstr ""
+
+#: builtin/replace.c:568
+msgid "--raw only makes sense with --edit"
+msgstr ""
+
+#: builtin/replace.c:574
+msgid "-d needs at least one argument"
+msgstr ""
+
+#: builtin/replace.c:580
+msgid "bad number of arguments"
+msgstr ""
+
+#: builtin/replace.c:586
+msgid "-e needs exactly one argument"
+msgstr ""
+
+#: builtin/replace.c:592
+msgid "-g needs at least one argument"
+msgstr ""
+
+#: builtin/replace.c:598
+msgid "--convert-graft-file takes no argument"
+msgstr ""
+
+#: builtin/replace.c:604
+msgid "only one pattern can be given with -l"
+msgstr ""
+
#: builtin/rerere.c:13
msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
msgstr ""
msgid "Could not write new index file."
msgstr ""
-#: builtin/rev-list.c:397
+#: builtin/rev-list.c:399
msgid "cannot combine --exclude-promisor-objects and --missing"
msgstr ""
-#: builtin/rev-list.c:455
+#: builtin/rev-list.c:457
msgid "object filtering requires --objects"
msgstr ""
-#: builtin/rev-list.c:458
+#: builtin/rev-list.c:460
#, c-format
msgid "invalid sparse value '%s'"
msgstr ""
-#: builtin/rev-list.c:499
+#: builtin/rev-list.c:501
msgid "rev-list does not support display of notes"
msgstr ""
-#: builtin/rev-list.c:502
+#: builtin/rev-list.c:504
msgid "cannot combine --use-bitmap-index with object filtering"
msgstr ""
"Run \"git rev-parse --parseopt -h\" for more information on the first usage."
msgstr ""
-#: builtin/revert.c:23
+#: builtin/revert.c:24
msgid "git revert [<options>] <commit-ish>..."
msgstr ""
-#: builtin/revert.c:24
+#: builtin/revert.c:25
msgid "git revert <subcommand>"
msgstr ""
-#: builtin/revert.c:29
+#: builtin/revert.c:30
msgid "git cherry-pick [<options>] <commit-ish>..."
msgstr ""
-#: builtin/revert.c:30
+#: builtin/revert.c:31
msgid "git cherry-pick <subcommand>"
msgstr ""
-#: builtin/revert.c:90
+#: builtin/revert.c:91
#, c-format
msgid "%s: %s cannot be used with %s"
msgstr ""
-#: builtin/revert.c:99
+#: builtin/revert.c:100
msgid "end revert or cherry-pick sequence"
msgstr ""
-#: builtin/revert.c:100
+#: builtin/revert.c:101
msgid "resume revert or cherry-pick sequence"
msgstr ""
-#: builtin/revert.c:101
+#: builtin/revert.c:102
msgid "cancel revert or cherry-pick sequence"
msgstr ""
-#: builtin/revert.c:102
+#: builtin/revert.c:103
msgid "don't automatically commit"
msgstr ""
-#: builtin/revert.c:103
+#: builtin/revert.c:104
msgid "edit the commit message"
msgstr ""
-#: builtin/revert.c:106
+#: builtin/revert.c:107
msgid "parent-number"
msgstr ""
-#: builtin/revert.c:107
+#: builtin/revert.c:108
msgid "select mainline parent"
msgstr ""
-#: builtin/revert.c:109
+#: builtin/revert.c:110
msgid "merge strategy"
msgstr ""
-#: builtin/revert.c:110
+#: builtin/revert.c:111
msgid "option"
msgstr ""
-#: builtin/revert.c:111
+#: builtin/revert.c:112
msgid "option for merge strategy"
msgstr ""
-#: builtin/revert.c:120
+#: builtin/revert.c:121
msgid "append commit name"
msgstr ""
-#: builtin/revert.c:122
+#: builtin/revert.c:123
msgid "preserve initially empty commits"
msgstr ""
-#: builtin/revert.c:124
+#: builtin/revert.c:125
msgid "keep redundant, empty commits"
msgstr ""
-#: builtin/revert.c:214
+#: builtin/revert.c:219
msgid "revert failed"
msgstr ""
-#: builtin/revert.c:227
+#: builtin/revert.c:232
msgid "cherry-pick failed"
msgstr ""
msgid "exit with a zero status even if nothing matched"
msgstr ""
+#: builtin/rm.c:288
+msgid "please stage your changes to .gitmodules or stash them to proceed"
+msgstr ""
+
#: builtin/rm.c:306
#, c-format
msgid "not removing '%s' recursively without -r"
msgstr ""
#: builtin/shortlog.c:271
-msgid "w[,i1[,i2]]"
+msgid "<w>[,<i1>[,<i2>]]"
msgstr ""
#: builtin/shortlog.c:272
msgid "Linewrap output"
msgstr ""
-#: builtin/shortlog.c:298
+#: builtin/shortlog.c:299
msgid "too many arguments given outside repository"
msgstr ""
-#: builtin/show-branch.c:12
+#: builtin/show-branch.c:13
msgid ""
"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
msgstr ""
-#: builtin/show-branch.c:16
+#: builtin/show-branch.c:17
msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
msgstr ""
-#: builtin/show-branch.c:376
+#: builtin/show-branch.c:395
#, c-format
msgid "ignoring %s; cannot handle more than %d ref"
msgid_plural "ignoring %s; cannot handle more than %d refs"
msgstr[0] ""
msgstr[1] ""
-#: builtin/show-branch.c:530
+#: builtin/show-branch.c:549
#, c-format
msgid "no matching refs with %s"
msgstr ""
-#: builtin/show-branch.c:626
+#: builtin/show-branch.c:645
msgid "show remote-tracking and local branches"
msgstr ""
-#: builtin/show-branch.c:628
+#: builtin/show-branch.c:647
msgid "show remote-tracking branches"
msgstr ""
-#: builtin/show-branch.c:630
+#: builtin/show-branch.c:649
msgid "color '*!+-' corresponding to the branch"
msgstr ""
-#: builtin/show-branch.c:632
+#: builtin/show-branch.c:651
msgid "show <n> more commits after the common ancestor"
msgstr ""
-#: builtin/show-branch.c:634
+#: builtin/show-branch.c:653
msgid "synonym to more=-1"
msgstr ""
-#: builtin/show-branch.c:635
+#: builtin/show-branch.c:654
msgid "suppress naming strings"
msgstr ""
-#: builtin/show-branch.c:637
+#: builtin/show-branch.c:656
msgid "include the current branch"
msgstr ""
-#: builtin/show-branch.c:639
+#: builtin/show-branch.c:658
msgid "name commits with their object names"
msgstr ""
-#: builtin/show-branch.c:641
+#: builtin/show-branch.c:660
msgid "show possible merge bases"
msgstr ""
-#: builtin/show-branch.c:643
+#: builtin/show-branch.c:662
msgid "show refs unreachable from any other ref"
msgstr ""
-#: builtin/show-branch.c:645
+#: builtin/show-branch.c:664
msgid "show commits in topological order"
msgstr ""
-#: builtin/show-branch.c:648
+#: builtin/show-branch.c:667
msgid "show only commits not on the first branch"
msgstr ""
-#: builtin/show-branch.c:650
+#: builtin/show-branch.c:669
msgid "show merges reachable from only one tip"
msgstr ""
-#: builtin/show-branch.c:652
+#: builtin/show-branch.c:671
msgid "topologically sort, maintaining date order where possible"
msgstr ""
-#: builtin/show-branch.c:655
+#: builtin/show-branch.c:674
msgid "<n>[,<base>]"
msgstr ""
-#: builtin/show-branch.c:656
+#: builtin/show-branch.c:675
msgid "show <n> most recent ref-log entries starting at base"
msgstr ""
-#: builtin/show-branch.c:690
+#: builtin/show-branch.c:711
msgid ""
"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
msgstr ""
-#: builtin/show-branch.c:714
+#: builtin/show-branch.c:735
msgid "no branches given, and HEAD is not valid"
msgstr ""
-#: builtin/show-branch.c:717
+#: builtin/show-branch.c:738
msgid "--reflog option needs one branch name"
msgstr ""
-#: builtin/show-branch.c:720
+#: builtin/show-branch.c:741
#, c-format
msgid "only %d entry can be shown at one time."
msgid_plural "only %d entries can be shown at one time."
msgstr[0] ""
msgstr[1] ""
-#: builtin/show-branch.c:724
+#: builtin/show-branch.c:745
#, c-format
msgid "no such ref %s"
msgstr ""
-#: builtin/show-branch.c:808
+#: builtin/show-branch.c:829
#, c-format
msgid "cannot handle more than %d rev."
msgid_plural "cannot handle more than %d revs."
msgstr[0] ""
msgstr[1] ""
-#: builtin/show-branch.c:812
+#: builtin/show-branch.c:833
#, c-format
msgid "'%s' is not a valid ref."
msgstr ""
-#: builtin/show-branch.c:815
+#: builtin/show-branch.c:836
#, c-format
msgid "cannot find commit %s (%s)"
msgstr ""
-#: builtin/show-ref.c:10
+#: builtin/show-ref.c:11
msgid ""
"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
msgstr ""
-#: builtin/show-ref.c:11
+#: builtin/show-ref.c:12
msgid "git show-ref --exclude-existing[=<pattern>]"
msgstr ""
-#: builtin/show-ref.c:159
+#: builtin/show-ref.c:160
msgid "only show tags (can be combined with heads)"
msgstr ""
-#: builtin/show-ref.c:160
+#: builtin/show-ref.c:161
msgid "only show heads (can be combined with tags)"
msgstr ""
-#: builtin/show-ref.c:161
+#: builtin/show-ref.c:162
msgid "stricter reference checking, requires exact ref path"
msgstr ""
-#: builtin/show-ref.c:164 builtin/show-ref.c:166
+#: builtin/show-ref.c:165 builtin/show-ref.c:167
msgid "show the HEAD reference, even if it would be filtered out"
msgstr ""
-#: builtin/show-ref.c:168
+#: builtin/show-ref.c:169
msgid "dereference tags into object IDs"
msgstr ""
-#: builtin/show-ref.c:170
+#: builtin/show-ref.c:171
msgid "only show SHA1 hash using <n> digits"
msgstr ""
-#: builtin/show-ref.c:174
+#: builtin/show-ref.c:175
msgid "do not print results to stdout (useful with --verify)"
msgstr ""
-#: builtin/show-ref.c:176
+#: builtin/show-ref.c:177
msgid "show refs from stdin that aren't in local repository"
msgstr ""
msgid "prepend comment character and space to each line"
msgstr ""
-#: builtin/submodule--helper.c:37 builtin/submodule--helper.c:1688
+#: builtin/submodule--helper.c:37 builtin/submodule--helper.c:1833
#, c-format
msgid "No such ref: %s"
msgstr ""
-#: builtin/submodule--helper.c:44 builtin/submodule--helper.c:1697
+#: builtin/submodule--helper.c:44 builtin/submodule--helper.c:1842
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr ""
msgid "submodule--helper print-default-remote takes no arguments"
msgstr ""
-#: builtin/submodule--helper.c:98
+#: builtin/submodule--helper.c:99
#, c-format
msgid "cannot strip one component off url '%s'"
msgstr ""
-#: builtin/submodule--helper.c:406 builtin/submodule--helper.c:1211
+#: builtin/submodule--helper.c:407 builtin/submodule--helper.c:1356
msgid "alternative anchor for relative paths"
msgstr ""
-#: builtin/submodule--helper.c:411
+#: builtin/submodule--helper.c:412
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr ""
-#: builtin/submodule--helper.c:462 builtin/submodule--helper.c:485
+#: builtin/submodule--helper.c:469 builtin/submodule--helper.c:606
+#: builtin/submodule--helper.c:629
#, c-format
msgid "No url found for submodule path '%s' in .gitmodules"
msgstr ""
-#: builtin/submodule--helper.c:500
+#: builtin/submodule--helper.c:521
+#, c-format
+msgid "Entering '%s'\n"
+msgstr ""
+
+#: builtin/submodule--helper.c:524
+#, c-format
+msgid ""
+"run_command returned non-zero status for %s\n"
+"."
+msgstr ""
+
+#: builtin/submodule--helper.c:545
+#, c-format
+msgid ""
+"run_command returned non-zero status whilerecursing in the nested submodules "
+"of %s\n"
+"."
+msgstr ""
+
+#: builtin/submodule--helper.c:561
+msgid "Suppress output of entering each submodule command"
+msgstr ""
+
+#: builtin/submodule--helper.c:563 builtin/submodule--helper.c:1040
+msgid "Recurse into nested submodules"
+msgstr ""
+
+#: builtin/submodule--helper.c:568
+msgid "git submodule--helper foreach [--quiet] [--recursive] <command>"
+msgstr ""
+
+#: builtin/submodule--helper.c:644
#, c-format
msgid ""
"could not lookup configuration '%s'. Assuming this repository is its own "
"authoritative upstream."
msgstr ""
-#: builtin/submodule--helper.c:511
+#: builtin/submodule--helper.c:655
#, c-format
msgid "Failed to register url for submodule path '%s'"
msgstr ""
-#: builtin/submodule--helper.c:515
+#: builtin/submodule--helper.c:659
#, c-format
msgid "Submodule '%s' (%s) registered for path '%s'\n"
msgstr ""
-#: builtin/submodule--helper.c:525
+#: builtin/submodule--helper.c:669
#, c-format
msgid "warning: command update mode suggested for submodule '%s'\n"
msgstr ""
-#: builtin/submodule--helper.c:532
+#: builtin/submodule--helper.c:676
#, c-format
msgid "Failed to register update mode for submodule path '%s'"
msgstr ""
-#: builtin/submodule--helper.c:554
+#: builtin/submodule--helper.c:698
msgid "Suppress output for initializing a submodule"
msgstr ""
-#: builtin/submodule--helper.c:559
+#: builtin/submodule--helper.c:703
msgid "git submodule--helper init [<path>]"
msgstr ""
-#: builtin/submodule--helper.c:631 builtin/submodule--helper.c:757
+#: builtin/submodule--helper.c:775 builtin/submodule--helper.c:901
#, c-format
msgid "no submodule mapping found in .gitmodules for path '%s'"
msgstr ""
-#: builtin/submodule--helper.c:670
+#: builtin/submodule--helper.c:814
#, c-format
msgid "could not resolve HEAD ref inside the submodule '%s'"
msgstr ""
-#: builtin/submodule--helper.c:697 builtin/submodule--helper.c:866
+#: builtin/submodule--helper.c:841 builtin/submodule--helper.c:1010
#, c-format
msgid "failed to recurse into submodule '%s'"
msgstr ""
-#: builtin/submodule--helper.c:721 builtin/submodule--helper.c:1031
+#: builtin/submodule--helper.c:865 builtin/submodule--helper.c:1176
msgid "Suppress submodule status output"
msgstr ""
-#: builtin/submodule--helper.c:722
+#: builtin/submodule--helper.c:866
msgid ""
"Use commit stored in the index instead of the one stored in the submodule "
"HEAD"
msgstr ""
-#: builtin/submodule--helper.c:723
+#: builtin/submodule--helper.c:867
msgid "recurse into nested submodules"
msgstr ""
-#: builtin/submodule--helper.c:728
+#: builtin/submodule--helper.c:872
msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
msgstr ""
-#: builtin/submodule--helper.c:752
+#: builtin/submodule--helper.c:896
msgid "git submodule--helper name <path>"
msgstr ""
-#: builtin/submodule--helper.c:816
+#: builtin/submodule--helper.c:960
#, c-format
msgid "Synchronizing submodule url for '%s'\n"
msgstr ""
-#: builtin/submodule--helper.c:822
+#: builtin/submodule--helper.c:966
#, c-format
msgid "failed to register url for submodule path '%s'"
msgstr ""
-#: builtin/submodule--helper.c:836
+#: builtin/submodule--helper.c:980
#, c-format
msgid "failed to get the default remote for submodule '%s'"
msgstr ""
-#: builtin/submodule--helper.c:847
+#: builtin/submodule--helper.c:991
#, c-format
msgid "failed to update remote for submodule '%s'"
msgstr ""
-#: builtin/submodule--helper.c:895
+#: builtin/submodule--helper.c:1038
msgid "Suppress output of synchronizing submodule url"
msgstr ""
-#: builtin/submodule--helper.c:897
-msgid "Recurse into nested submodules"
-msgstr ""
-
-#: builtin/submodule--helper.c:902
+#: builtin/submodule--helper.c:1045
msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
msgstr ""
-#: builtin/submodule--helper.c:956
+#: builtin/submodule--helper.c:1099
#, c-format
msgid ""
"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
"really want to remove it including all of its history)"
msgstr ""
-#: builtin/submodule--helper.c:968
+#: builtin/submodule--helper.c:1111
#, c-format
msgid ""
"Submodule work tree '%s' contains local modifications; use '-f' to discard "
"them"
msgstr ""
-#: builtin/submodule--helper.c:976
+#: builtin/submodule--helper.c:1119
#, c-format
msgid "Cleared directory '%s'\n"
msgstr ""
-#: builtin/submodule--helper.c:978
+#: builtin/submodule--helper.c:1121
#, c-format
msgid "Could not remove submodule work tree '%s'\n"
msgstr ""
-#: builtin/submodule--helper.c:987
+#: builtin/submodule--helper.c:1132
#, c-format
msgid "could not create empty submodule directory %s"
msgstr ""
-#: builtin/submodule--helper.c:1003
+#: builtin/submodule--helper.c:1148
#, c-format
msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
msgstr ""
-#: builtin/submodule--helper.c:1032
+#: builtin/submodule--helper.c:1177
msgid "Remove submodule working trees even if they contain local changes"
msgstr ""
-#: builtin/submodule--helper.c:1033
+#: builtin/submodule--helper.c:1178
msgid "Unregister all submodules"
msgstr ""
-#: builtin/submodule--helper.c:1038
+#: builtin/submodule--helper.c:1183
msgid ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
msgstr ""
-#: builtin/submodule--helper.c:1052
+#: builtin/submodule--helper.c:1197
msgid "Use '--all' if you really want to deinitialize all submodules"
msgstr ""
-#: builtin/submodule--helper.c:1145 builtin/submodule--helper.c:1148
+#: builtin/submodule--helper.c:1290 builtin/submodule--helper.c:1293
#, c-format
msgid "submodule '%s' cannot add alternate: %s"
msgstr ""
-#: builtin/submodule--helper.c:1184
+#: builtin/submodule--helper.c:1329
#, c-format
msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
msgstr ""
-#: builtin/submodule--helper.c:1191
+#: builtin/submodule--helper.c:1336
#, c-format
msgid "Value '%s' for submodule.alternateLocation is not recognized"
msgstr ""
-#: builtin/submodule--helper.c:1214
+#: builtin/submodule--helper.c:1359
msgid "where the new submodule will be cloned to"
msgstr ""
-#: builtin/submodule--helper.c:1217
+#: builtin/submodule--helper.c:1362
msgid "name of the new submodule"
msgstr ""
-#: builtin/submodule--helper.c:1220
+#: builtin/submodule--helper.c:1365
msgid "url where to clone the submodule from"
msgstr ""
-#: builtin/submodule--helper.c:1228
+#: builtin/submodule--helper.c:1373
msgid "depth for shallow clones"
msgstr ""
-#: builtin/submodule--helper.c:1231 builtin/submodule--helper.c:1606
+#: builtin/submodule--helper.c:1376 builtin/submodule--helper.c:1751
msgid "force cloning progress"
msgstr ""
-#: builtin/submodule--helper.c:1236
+#: builtin/submodule--helper.c:1381
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
msgstr ""
-#: builtin/submodule--helper.c:1267
+#: builtin/submodule--helper.c:1412
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr ""
-#: builtin/submodule--helper.c:1281
+#: builtin/submodule--helper.c:1426
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr ""
-#: builtin/submodule--helper.c:1347
+#: builtin/submodule--helper.c:1492
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr ""
-#: builtin/submodule--helper.c:1351
+#: builtin/submodule--helper.c:1496
msgid "Maybe you want to use 'update --init'?"
msgstr ""
-#: builtin/submodule--helper.c:1380
+#: builtin/submodule--helper.c:1525
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr ""
-#: builtin/submodule--helper.c:1409
+#: builtin/submodule--helper.c:1554
#, c-format
msgid "Skipping submodule '%s'"
msgstr ""
-#: builtin/submodule--helper.c:1544
+#: builtin/submodule--helper.c:1689
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr ""
-#: builtin/submodule--helper.c:1555
+#: builtin/submodule--helper.c:1700
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
msgstr ""
-#: builtin/submodule--helper.c:1585 builtin/submodule--helper.c:1808
+#: builtin/submodule--helper.c:1730 builtin/submodule--helper.c:1953
msgid "path into the working tree"
msgstr ""
-#: builtin/submodule--helper.c:1588
+#: builtin/submodule--helper.c:1733
msgid "path into the working tree, across nested submodule boundaries"
msgstr ""
-#: builtin/submodule--helper.c:1592
+#: builtin/submodule--helper.c:1737
msgid "rebase, merge, checkout or none"
msgstr ""
-#: builtin/submodule--helper.c:1598
+#: builtin/submodule--helper.c:1743
msgid "Create a shallow clone truncated to the specified number of revisions"
msgstr ""
-#: builtin/submodule--helper.c:1601
+#: builtin/submodule--helper.c:1746
msgid "parallel jobs"
msgstr ""
-#: builtin/submodule--helper.c:1603
+#: builtin/submodule--helper.c:1748
msgid "whether the initial clone should follow the shallow recommendation"
msgstr ""
-#: builtin/submodule--helper.c:1604
+#: builtin/submodule--helper.c:1749
msgid "don't print cloning progress"
msgstr ""
-#: builtin/submodule--helper.c:1611
+#: builtin/submodule--helper.c:1756
msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
msgstr ""
-#: builtin/submodule--helper.c:1624
+#: builtin/submodule--helper.c:1769
msgid "bad value for update parameter"
msgstr ""
-#: builtin/submodule--helper.c:1692
+#: builtin/submodule--helper.c:1837
#, 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:1809
+#: builtin/submodule--helper.c:1954
msgid "recurse into submodules"
msgstr ""
-#: builtin/submodule--helper.c:1815
+#: builtin/submodule--helper.c:1960
msgid "git submodule--helper embed-git-dir [<path>...]"
msgstr ""
-#: builtin/submodule--helper.c:1901
+#: builtin/submodule--helper.c:2071
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr ""
-#: builtin/submodule--helper.c:1907
+#: builtin/submodule--helper.c:2077
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr ""
msgid "shorten ref output"
msgstr ""
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363
msgid "reason"
msgstr ""
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363
msgid "reason of the update"
msgstr ""
-#: builtin/tag.c:24
+#: builtin/tag.c:25
msgid ""
"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
"[<head>]"
msgstr ""
-#: builtin/tag.c:25
+#: builtin/tag.c:26
msgid "git tag -d <tagname>..."
msgstr ""
-#: builtin/tag.c:26
+#: builtin/tag.c:27
msgid ""
"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
"points-at <object>]\n"
"\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]"
msgstr ""
-#: builtin/tag.c:28
+#: builtin/tag.c:29
msgid "git tag -v [--format=<format>] <tagname>..."
msgstr ""
-#: builtin/tag.c:86
+#: builtin/tag.c:87
#, c-format
msgid "tag '%s' not found."
msgstr ""
-#: builtin/tag.c:102
+#: builtin/tag.c:103
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr ""
-#: builtin/tag.c:132
+#: builtin/tag.c:133
#, c-format
msgid ""
"\n"
"Lines starting with '%c' will be ignored.\n"
msgstr ""
-#: builtin/tag.c:136
+#: builtin/tag.c:137
#, c-format
msgid ""
"\n"
"want to.\n"
msgstr ""
-#: builtin/tag.c:190
+#: builtin/tag.c:191
msgid "unable to sign the tag"
msgstr ""
-#: builtin/tag.c:192
+#: builtin/tag.c:193
msgid "unable to write tag file"
msgstr ""
-#: builtin/tag.c:217
+#: builtin/tag.c:218
msgid "bad object type."
msgstr ""
-#: builtin/tag.c:266
+#: builtin/tag.c:267
msgid "no tag message?"
msgstr ""
-#: builtin/tag.c:273
+#: builtin/tag.c:274
#, c-format
msgid "The tag message has been left in %s\n"
msgstr ""
-#: builtin/tag.c:382
+#: builtin/tag.c:383
msgid "list tag names"
msgstr ""
-#: builtin/tag.c:384
+#: builtin/tag.c:385
msgid "print <n> lines of each tag message"
msgstr ""
-#: builtin/tag.c:386
+#: builtin/tag.c:387
msgid "delete tags"
msgstr ""
-#: builtin/tag.c:387
+#: builtin/tag.c:388
msgid "verify tags"
msgstr ""
-#: builtin/tag.c:389
+#: builtin/tag.c:390
msgid "Tag creation options"
msgstr ""
-#: builtin/tag.c:391
+#: builtin/tag.c:392
msgid "annotated tag, needs a message"
msgstr ""
-#: builtin/tag.c:393
+#: builtin/tag.c:394
msgid "tag message"
msgstr ""
-#: builtin/tag.c:395
+#: builtin/tag.c:396
msgid "force edit of tag message"
msgstr ""
-#: builtin/tag.c:396
+#: builtin/tag.c:397
msgid "annotated and GPG-signed tag"
msgstr ""
-#: builtin/tag.c:400
+#: builtin/tag.c:401
msgid "use another key to sign the tag"
msgstr ""
-#: builtin/tag.c:401
+#: builtin/tag.c:402
msgid "replace the tag if exists"
msgstr ""
-#: builtin/tag.c:402 builtin/update-ref.c:368
+#: builtin/tag.c:403 builtin/update-ref.c:369
msgid "create a reflog"
msgstr ""
-#: builtin/tag.c:404
+#: builtin/tag.c:405
msgid "Tag listing options"
msgstr ""
-#: builtin/tag.c:405
+#: builtin/tag.c:406
msgid "show tag list in columns"
msgstr ""
-#: builtin/tag.c:406 builtin/tag.c:408
+#: builtin/tag.c:407 builtin/tag.c:409
msgid "print only tags that contain the commit"
msgstr ""
-#: builtin/tag.c:407 builtin/tag.c:409
+#: builtin/tag.c:408 builtin/tag.c:410
msgid "print only tags that don't contain the commit"
msgstr ""
-#: builtin/tag.c:410
+#: builtin/tag.c:411
msgid "print only tags that are merged"
msgstr ""
-#: builtin/tag.c:411
+#: builtin/tag.c:412
msgid "print only tags that are not merged"
msgstr ""
-#: builtin/tag.c:416
+#: builtin/tag.c:417
msgid "print only tags of the object"
msgstr ""
-#: builtin/tag.c:460
+#: builtin/tag.c:461
msgid "--column and -n are incompatible"
msgstr ""
-#: builtin/tag.c:482
+#: builtin/tag.c:483
msgid "-n option is only allowed in list mode"
msgstr ""
-#: builtin/tag.c:484
+#: builtin/tag.c:485
msgid "--contains option is only allowed in list mode"
msgstr ""
-#: builtin/tag.c:486
+#: builtin/tag.c:487
msgid "--no-contains option is only allowed in list mode"
msgstr ""
-#: builtin/tag.c:488
+#: builtin/tag.c:489
msgid "--points-at option is only allowed in list mode"
msgstr ""
-#: builtin/tag.c:490
+#: builtin/tag.c:491
msgid "--merged and --no-merged options are only allowed in list mode"
msgstr ""
-#: builtin/tag.c:501
+#: builtin/tag.c:502
msgid "only one -F or -m option is allowed."
msgstr ""
-#: builtin/tag.c:520
+#: builtin/tag.c:521
msgid "too many params"
msgstr ""
-#: builtin/tag.c:526
+#: builtin/tag.c:527
#, c-format
msgid "'%s' is not a valid tag name."
msgstr ""
-#: builtin/tag.c:531
+#: builtin/tag.c:532
#, c-format
msgid "tag '%s' already exists"
msgstr ""
-#: builtin/tag.c:562
+#: builtin/tag.c:563
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr ""
-#: builtin/unpack-objects.c:498
+#: builtin/unpack-objects.c:500
msgid "Unpacking objects"
msgstr ""
msgid "failed to create directory %s"
msgstr ""
-#: builtin/update-index.c:88
-#, c-format
-msgid "failed to stat %s"
-msgstr ""
-
#: builtin/update-index.c:98
#, c-format
msgid "failed to create file %s"
msgid " OK"
msgstr ""
-#: builtin/update-index.c:589
+#: builtin/update-index.c:588
msgid "git update-index [<options>] [--] [<file>...]"
msgstr ""
-#: builtin/update-index.c:946
+#: builtin/update-index.c:944
msgid "continue refresh even when index needs update"
msgstr ""
-#: builtin/update-index.c:949
+#: builtin/update-index.c:947
msgid "refresh: ignore submodules"
msgstr ""
-#: builtin/update-index.c:952
+#: builtin/update-index.c:950
msgid "do not ignore new files"
msgstr ""
-#: builtin/update-index.c:954
+#: builtin/update-index.c:952
msgid "let files replace directories and vice-versa"
msgstr ""
-#: builtin/update-index.c:956
+#: builtin/update-index.c:954
msgid "notice files missing from worktree"
msgstr ""
-#: builtin/update-index.c:958
+#: builtin/update-index.c:956
msgid "refresh even if index contains unmerged entries"
msgstr ""
-#: builtin/update-index.c:961
+#: builtin/update-index.c:959
msgid "refresh stat information"
msgstr ""
-#: builtin/update-index.c:965
+#: builtin/update-index.c:963
msgid "like --refresh, but ignore assume-unchanged setting"
msgstr ""
-#: builtin/update-index.c:969
+#: builtin/update-index.c:967
msgid "<mode>,<object>,<path>"
msgstr ""
-#: builtin/update-index.c:970
+#: builtin/update-index.c:968
msgid "add the specified entry to the index"
msgstr ""
-#: builtin/update-index.c:979
+#: builtin/update-index.c:977
msgid "mark files as \"not changing\""
msgstr ""
-#: builtin/update-index.c:982
+#: builtin/update-index.c:980
msgid "clear assumed-unchanged bit"
msgstr ""
-#: builtin/update-index.c:985
+#: builtin/update-index.c:983
msgid "mark files as \"index-only\""
msgstr ""
-#: builtin/update-index.c:988
+#: builtin/update-index.c:986
msgid "clear skip-worktree bit"
msgstr ""
-#: builtin/update-index.c:991
+#: builtin/update-index.c:989
msgid "add to index only; do not add content to object database"
msgstr ""
-#: builtin/update-index.c:993
+#: builtin/update-index.c:991
msgid "remove named paths even if present in worktree"
msgstr ""
-#: builtin/update-index.c:995
+#: builtin/update-index.c:993
msgid "with --stdin: input lines are terminated by null bytes"
msgstr ""
-#: builtin/update-index.c:997
+#: builtin/update-index.c:995
msgid "read list of paths to be updated from standard input"
msgstr ""
-#: builtin/update-index.c:1001
+#: builtin/update-index.c:999
msgid "add entries from standard input to the index"
msgstr ""
-#: builtin/update-index.c:1005
+#: builtin/update-index.c:1003
msgid "repopulate stages #2 and #3 for the listed paths"
msgstr ""
-#: builtin/update-index.c:1009
+#: builtin/update-index.c:1007
msgid "only update entries that differ from HEAD"
msgstr ""
-#: builtin/update-index.c:1013
+#: builtin/update-index.c:1011
msgid "ignore files missing from worktree"
msgstr ""
-#: builtin/update-index.c:1016
+#: builtin/update-index.c:1014
msgid "report actions to standard output"
msgstr ""
-#: builtin/update-index.c:1018
+#: builtin/update-index.c:1016
msgid "(for porcelains) forget saved unresolved conflicts"
msgstr ""
-#: builtin/update-index.c:1022
+#: builtin/update-index.c:1020
msgid "write index in this format"
msgstr ""
-#: builtin/update-index.c:1024
+#: builtin/update-index.c:1022
msgid "enable or disable split index"
msgstr ""
-#: builtin/update-index.c:1026
+#: builtin/update-index.c:1024
msgid "enable/disable untracked cache"
msgstr ""
-#: builtin/update-index.c:1028
+#: builtin/update-index.c:1026
msgid "test if the filesystem supports untracked cache"
msgstr ""
-#: builtin/update-index.c:1030
+#: builtin/update-index.c:1028
msgid "enable untracked cache without testing the filesystem"
msgstr ""
-#: builtin/update-index.c:1032
+#: builtin/update-index.c:1030
msgid "write out the index even if is not flagged as changed"
msgstr ""
-#: builtin/update-index.c:1034
+#: builtin/update-index.c:1032
msgid "enable or disable file system monitor"
msgstr ""
-#: builtin/update-index.c:1036
+#: builtin/update-index.c:1034
msgid "mark files as fsmonitor valid"
msgstr ""
-#: builtin/update-index.c:1039
+#: builtin/update-index.c:1037
msgid "clear fsmonitor valid bit"
msgstr ""
-#: builtin/update-index.c:1138
+#: builtin/update-index.c:1136
msgid ""
"core.splitIndex is set to false; remove or change it, if you really want to "
"enable split index"
msgstr ""
-#: builtin/update-index.c:1147
+#: builtin/update-index.c:1145
msgid ""
"core.splitIndex is set to true; remove or change it, if you really want to "
"disable split index"
msgstr ""
-#: builtin/update-index.c:1158
+#: builtin/update-index.c:1156
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:1162
+#: builtin/update-index.c:1160
msgid "Untracked cache disabled"
msgstr ""
-#: builtin/update-index.c:1170
+#: builtin/update-index.c:1168
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:1174
+#: builtin/update-index.c:1172
#, c-format
msgid "Untracked cache enabled for '%s'"
msgstr ""
-#: builtin/update-index.c:1182
+#: builtin/update-index.c:1180
msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
msgstr ""
-#: builtin/update-index.c:1186
+#: builtin/update-index.c:1184
msgid "fsmonitor enabled"
msgstr ""
-#: builtin/update-index.c:1189
+#: builtin/update-index.c:1187
msgid ""
"core.fsmonitor is set; remove it if you really want to disable fsmonitor"
msgstr ""
-#: builtin/update-index.c:1193
+#: builtin/update-index.c:1191
msgid "fsmonitor disabled"
msgstr ""
msgid "git update-ref [<options>] --stdin [-z]"
msgstr ""
-#: builtin/update-ref.c:363
+#: builtin/update-ref.c:364
msgid "delete the reference"
msgstr ""
-#: builtin/update-ref.c:365
+#: builtin/update-ref.c:366
msgid "update <refname> not the one it points to"
msgstr ""
-#: builtin/update-ref.c:366
+#: builtin/update-ref.c:367
msgid "stdin has NUL-terminated arguments"
msgstr ""
-#: builtin/update-ref.c:367
+#: builtin/update-ref.c:368
msgid "read updates from stdin"
msgstr ""
msgid "interrupt transfer after <n> seconds of inactivity"
msgstr ""
-#: builtin/verify-commit.c:18
+#: builtin/verify-commit.c:20
msgid "git verify-commit [-v | --verbose] <commit>..."
msgstr ""
-#: builtin/verify-commit.c:73
+#: builtin/verify-commit.c:76
msgid "print commit contents"
msgstr ""
-#: builtin/verify-commit.c:74 builtin/verify-tag.c:38
+#: builtin/verify-commit.c:77 builtin/verify-tag.c:38
msgid "print raw gpg status output"
msgstr ""
msgid "write tree object for a subdirectory <prefix>"
msgstr ""
-#: builtin/write-tree.c:31
+#: builtin/write-tree.c:30
msgid "only useful for debugging"
msgstr ""
msgid "unknown option: %s\n"
msgstr ""
-#: git.c:765
+#: git.c:770
#, c-format
msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
msgstr ""
-#: git.c:777
+#: git.c:782
#, c-format
msgid "failed to run command '%s': %s\n"
msgstr ""
msgstr ""
#: command-list.h:144
-msgid "Reads tree information into the index"
+msgid "Compare two commit ranges (e.g. two versions of a branch)"
msgstr ""
#: command-list.h:145
-msgid "Reapply commits on top of another base tip"
+msgid "Reads tree information into the index"
msgstr ""
#: command-list.h:146
-msgid "Receive what is pushed into the repository"
+msgid "Reapply commits on top of another base tip"
msgstr ""
#: command-list.h:147
-msgid "Manage reflog information"
+msgid "Receive what is pushed into the repository"
msgstr ""
#: command-list.h:148
-msgid "Manage set of tracked repositories"
+msgid "Manage reflog information"
msgstr ""
#: command-list.h:149
-msgid "Pack unpacked objects in a repository"
+msgid "Manage set of tracked repositories"
msgstr ""
#: command-list.h:150
-msgid "Create, list, delete refs to replace objects"
+msgid "Pack unpacked objects in a repository"
msgstr ""
#: command-list.h:151
-msgid "Generates a summary of pending changes"
+msgid "Create, list, delete refs to replace objects"
msgstr ""
#: command-list.h:152
-msgid "Reuse recorded resolution of conflicted merges"
+msgid "Generates a summary of pending changes"
msgstr ""
#: command-list.h:153
-msgid "Reset current HEAD to the specified state"
+msgid "Reuse recorded resolution of conflicted merges"
msgstr ""
#: command-list.h:154
-msgid "Revert some existing commits"
+msgid "Reset current HEAD to the specified state"
msgstr ""
#: command-list.h:155
-msgid "Lists commit objects in reverse chronological order"
+msgid "Revert some existing commits"
msgstr ""
#: command-list.h:156
-msgid "Pick out and massage parameters"
+msgid "Lists commit objects in reverse chronological order"
msgstr ""
#: command-list.h:157
-msgid "Remove files from the working tree and from the index"
+msgid "Pick out and massage parameters"
msgstr ""
#: command-list.h:158
-msgid "Send a collection of patches as emails"
+msgid "Remove files from the working tree and from the index"
msgstr ""
#: command-list.h:159
-msgid "Push objects over Git protocol to another repository"
+msgid "Send a collection of patches as emails"
msgstr ""
#: command-list.h:160
-msgid "Restricted login shell for Git-only SSH access"
+msgid "Push objects over Git protocol to another repository"
msgstr ""
#: command-list.h:161
-msgid "Summarize 'git log' output"
+msgid "Restricted login shell for Git-only SSH access"
msgstr ""
#: command-list.h:162
-msgid "Show various types of objects"
+msgid "Summarize 'git log' output"
msgstr ""
#: command-list.h:163
-msgid "Show branches and their commits"
+msgid "Show various types of objects"
msgstr ""
#: command-list.h:164
-msgid "Show packed archive index"
+msgid "Show branches and their commits"
msgstr ""
#: command-list.h:165
-msgid "List references in a local repository"
+msgid "Show packed archive index"
msgstr ""
#: command-list.h:166
-msgid "Git's i18n setup code for shell scripts"
+msgid "List references in a local repository"
msgstr ""
#: command-list.h:167
-msgid "Common Git shell script setup code"
+msgid "Git's i18n setup code for shell scripts"
msgstr ""
#: command-list.h:168
-msgid "Stash the changes in a dirty working directory away"
+msgid "Common Git shell script setup code"
msgstr ""
#: command-list.h:169
-msgid "Add file contents to the staging area"
+msgid "Stash the changes in a dirty working directory away"
msgstr ""
#: command-list.h:170
-msgid "Show the working tree status"
+msgid "Add file contents to the staging area"
msgstr ""
#: command-list.h:171
-msgid "Remove unnecessary whitespace"
+msgid "Show the working tree status"
msgstr ""
#: command-list.h:172
-msgid "Initialize, update or inspect submodules"
+msgid "Remove unnecessary whitespace"
msgstr ""
#: command-list.h:173
-msgid "Bidirectional operation between a Subversion repository and Git"
+msgid "Initialize, update or inspect submodules"
msgstr ""
#: command-list.h:174
-msgid "Read, modify and delete symbolic refs"
+msgid "Bidirectional operation between a Subversion repository and Git"
msgstr ""
#: command-list.h:175
-msgid "Create, list, delete or verify a tag object signed with GPG"
+msgid "Read, modify and delete symbolic refs"
msgstr ""
#: command-list.h:176
-msgid "Creates a temporary file with a blob's contents"
+msgid "Create, list, delete or verify a tag object signed with GPG"
msgstr ""
#: command-list.h:177
-msgid "Unpack objects from a packed archive"
+msgid "Creates a temporary file with a blob's contents"
msgstr ""
#: command-list.h:178
-msgid "Register file contents in the working tree to the index"
+msgid "Unpack objects from a packed archive"
msgstr ""
#: command-list.h:179
-msgid "Update the object name stored in a ref safely"
+msgid "Register file contents in the working tree to the index"
msgstr ""
#: command-list.h:180
-msgid "Update auxiliary info file to help dumb servers"
+msgid "Update the object name stored in a ref safely"
msgstr ""
#: command-list.h:181
-msgid "Send archive back to git-archive"
+msgid "Update auxiliary info file to help dumb servers"
msgstr ""
#: command-list.h:182
-msgid "Send objects packed back to git-fetch-pack"
+msgid "Send archive back to git-archive"
msgstr ""
#: command-list.h:183
-msgid "Show a Git logical variable"
+msgid "Send objects packed back to git-fetch-pack"
msgstr ""
#: command-list.h:184
-msgid "Check the GPG signature of commits"
+msgid "Show a Git logical variable"
msgstr ""
#: command-list.h:185
-msgid "Validate packed Git archive files"
+msgid "Check the GPG signature of commits"
msgstr ""
#: command-list.h:186
-msgid "Check the GPG signature of tags"
+msgid "Validate packed Git archive files"
msgstr ""
#: command-list.h:187
-msgid "Git web interface (web frontend to Git repositories)"
+msgid "Check the GPG signature of tags"
msgstr ""
#: command-list.h:188
-msgid "Show logs with difference each commit introduces"
+msgid "Git web interface (web frontend to Git repositories)"
msgstr ""
#: command-list.h:189
-msgid "Manage multiple working trees"
+msgid "Show logs with difference each commit introduces"
msgstr ""
#: command-list.h:190
-msgid "Create a tree object from the current index"
+msgid "Manage multiple working trees"
msgstr ""
#: command-list.h:191
-msgid "Defining attributes per path"
+msgid "Create a tree object from the current index"
msgstr ""
#: command-list.h:192
-msgid "Git command-line interface and conventions"
+msgid "Defining attributes per path"
msgstr ""
#: command-list.h:193
-msgid "A Git core tutorial for developers"
+msgid "Git command-line interface and conventions"
msgstr ""
#: command-list.h:194
-msgid "Git for CVS users"
+msgid "A Git core tutorial for developers"
msgstr ""
#: command-list.h:195
-msgid "Tweaking diff output"
+msgid "Git for CVS users"
msgstr ""
#: command-list.h:196
-msgid "A useful minimum set of commands for Everyday Git"
+msgid "Tweaking diff output"
msgstr ""
#: command-list.h:197
-msgid "A Git Glossary"
+msgid "A useful minimum set of commands for Everyday Git"
msgstr ""
#: command-list.h:198
-msgid "Hooks used by Git"
+msgid "A Git Glossary"
msgstr ""
#: command-list.h:199
-msgid "Specifies intentionally untracked files to ignore"
+msgid "Hooks used by Git"
msgstr ""
#: command-list.h:200
-msgid "Defining submodule properties"
+msgid "Specifies intentionally untracked files to ignore"
msgstr ""
#: command-list.h:201
-msgid "Git namespaces"
+msgid "Defining submodule properties"
msgstr ""
#: command-list.h:202
-msgid "Git Repository Layout"
+msgid "Git namespaces"
msgstr ""
#: command-list.h:203
-msgid "Specifying revisions and ranges for Git"
+msgid "Git Repository Layout"
msgstr ""
#: command-list.h:204
-msgid "A tutorial introduction to Git: part two"
+msgid "Specifying revisions and ranges for Git"
msgstr ""
#: command-list.h:205
-msgid "A tutorial introduction to Git"
+msgid "A tutorial introduction to Git: part two"
msgstr ""
#: command-list.h:206
+msgid "A tutorial introduction to Git"
+msgstr ""
+
+#: command-list.h:207
msgid "An overview of recommended workflows with Git"
msgstr ""
"abort\"."
msgstr ""
-#: git-rebase.sh:173 git-rebase.sh:442
+#: git-rebase.sh:173 git-rebase.sh:454
#, sh-format
msgid "Could not move back to $head_name"
msgstr ""
msgid "Cannot store $stash_sha1"
msgstr ""
-#: git-rebase.sh:229
+#: git-rebase.sh:236
msgid "The pre-rebase hook refused to rebase."
msgstr ""
-#: git-rebase.sh:234
+#: git-rebase.sh:241
msgid "It looks like 'git am' is in progress. Cannot rebase."
msgstr ""
-#: git-rebase.sh:403
+#: git-rebase.sh:415
msgid "No rebase in progress?"
msgstr ""
-#: git-rebase.sh:414
+#: git-rebase.sh:426
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr ""
-#: git-rebase.sh:421
+#: git-rebase.sh:433
msgid "Cannot read HEAD"
msgstr ""
-#: git-rebase.sh:424
+#: git-rebase.sh:436
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
msgstr ""
-#: git-rebase.sh:468
+#: git-rebase.sh:480
#, sh-format
msgid ""
"It seems that there is already a $state_dir_base directory, and\n"
"valuable there."
msgstr ""
-#: git-rebase.sh:509
+#: git-rebase.sh:545
msgid "error: cannot combine '--signoff' with '--preserve-merges'"
msgstr ""
-#: git-rebase.sh:537
+#: git-rebase.sh:556
+msgid "error: cannot combine '--preserve_merges' with '--rebase-merges'"
+msgstr ""
+
+#: git-rebase.sh:562
+msgid "error: cannot combine '--rebase_merges' with '--strategy-option'"
+msgstr ""
+
+#: git-rebase.sh:564
+msgid "error: cannot combine '--rebase_merges' with '--strategy'"
+msgstr ""
+
+#: git-rebase.sh:590
#, sh-format
msgid "invalid upstream '$upstream_name'"
msgstr ""
-#: git-rebase.sh:561
+#: git-rebase.sh:614
#, sh-format
msgid "$onto_name: there are more than one merge bases"
msgstr ""
-#: git-rebase.sh:564 git-rebase.sh:568
+#: git-rebase.sh:617 git-rebase.sh:621
#, sh-format
msgid "$onto_name: there is no merge base"
msgstr ""
-#: git-rebase.sh:573
+#: git-rebase.sh:626
#, sh-format
msgid "Does not point to a valid commit: $onto_name"
msgstr ""
-#: git-rebase.sh:599
+#: git-rebase.sh:652
#, sh-format
msgid "fatal: no such branch/commit '$branch_name'"
msgstr ""
-#: git-rebase.sh:632
+#: git-rebase.sh:685
msgid "Cannot autostash"
msgstr ""
-#: git-rebase.sh:637
+#: git-rebase.sh:690
#, sh-format
msgid "Created autostash: $stash_abbrev"
msgstr ""
-#: git-rebase.sh:641
+#: git-rebase.sh:694
msgid "Please commit or stash them."
msgstr ""
-#: git-rebase.sh:664
+#: git-rebase.sh:717
#, sh-format
msgid "HEAD is up to date."
msgstr ""
-#: git-rebase.sh:666
+#: git-rebase.sh:719
#, sh-format
msgid "Current branch $branch_name is up to date."
msgstr ""
-#: git-rebase.sh:674
+#: git-rebase.sh:727
#, sh-format
msgid "HEAD is up to date, rebase forced."
msgstr ""
-#: git-rebase.sh:676
+#: git-rebase.sh:729
#, sh-format
msgid "Current branch $branch_name is up to date, rebase forced."
msgstr ""
-#: git-rebase.sh:688
+#: git-rebase.sh:741
#, sh-format
msgid "Changes from $mb to $onto:"
msgstr ""
-#: git-rebase.sh:697
+#: git-rebase.sh:750
msgid "First, rewinding head to replay your work on top of it..."
msgstr ""
-#: git-rebase.sh:707
+#: git-rebase.sh:760
#, sh-format
msgid "Fast-forwarded $branch_name to $onto_name."
msgstr ""
msgid "Failed to register submodule '$sm_path'"
msgstr ""
-#: git-submodule.sh:354
-#, sh-format
-msgid "Entering '$displaypath'"
-msgstr ""
-
-#: git-submodule.sh:374
-#, sh-format
-msgid "Stopping at '$displaypath'; script returned non-zero status."
-msgstr ""
-
-#: git-submodule.sh:600
+#: git-submodule.sh:565
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:610
+#: git-submodule.sh:575
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr ""
-#: git-submodule.sh:615
+#: git-submodule.sh:580
#, sh-format
msgid ""
"Unable to find current ${remote_name}/${branch} revision in submodule path "
"'$sm_path'"
msgstr ""
-#: git-submodule.sh:633
+#: git-submodule.sh:603
#, sh-format
msgid "Unable to fetch in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:639
+#: git-submodule.sh:609
#, sh-format
msgid ""
"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
"Direct fetching of that commit failed."
msgstr ""
-#: git-submodule.sh:646
+#: git-submodule.sh:616
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:647
+#: git-submodule.sh:617
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr ""
-#: git-submodule.sh:651
+#: git-submodule.sh:621
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:652
+#: git-submodule.sh:622
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr ""
-#: git-submodule.sh:657
+#: git-submodule.sh:627
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:658
+#: git-submodule.sh:628
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr ""
-#: git-submodule.sh:663
+#: git-submodule.sh:633
#, sh-format
msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:664
+#: git-submodule.sh:634
#, sh-format
msgid "Submodule path '$displaypath': '$command $sha1'"
msgstr ""
-#: git-submodule.sh:695
+#: git-submodule.sh:665
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:791
+#: git-submodule.sh:761
msgid "The --cached option cannot be used with the --files option"
msgstr ""
-#: git-submodule.sh:843
+#: git-submodule.sh:813
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr ""
-#: git-submodule.sh:863
+#: git-submodule.sh:833
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr ""
-#: git-submodule.sh:866
+#: git-submodule.sh:836
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr ""
-#: git-submodule.sh:869
+#: git-submodule.sh:839
#, sh-format
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
msgstr ""
msgid "See git-${cmd}(1) for details."
msgstr ""
-#: git-rebase--interactive.sh:142
-#, sh-format
-msgid "Rebasing ($new_count/$total)"
-msgstr ""
-
-#: git-rebase--interactive.sh:158
+#: git-rebase--interactive.sh:43
msgid ""
"\n"
"Commands:\n"
"These lines can be re-ordered; they are executed from top to bottom.\n"
msgstr ""
-#: git-rebase--interactive.sh:179
+#: git-rebase--interactive.sh:64 git-rebase--preserve-merges.sh:173
msgid ""
"\n"
"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
msgstr ""
-#: git-rebase--interactive.sh:183
+#: git-rebase--interactive.sh:68 git-rebase--preserve-merges.sh:177
msgid ""
"\n"
"If you remove a line here THAT COMMIT WILL BE LOST.\n"
msgstr ""
-#: git-rebase--interactive.sh:221
+#: git-rebase--interactive.sh:108 git-rebase--preserve-merges.sh:724
+msgid "could not detach HEAD"
+msgstr ""
+
+#: git-rebase--interactive.sh:147 git-rebase--preserve-merges.sh:816
+msgid ""
+"\n"
+"You are editing the todo file of an ongoing interactive rebase.\n"
+"To continue rebase after editing, run:\n"
+" git rebase --continue\n"
+"\n"
+msgstr ""
+
+#: git-rebase--interactive.sh:155 git-rebase--interactive.sh:241
+#: git-rebase--preserve-merges.sh:824 git-rebase--preserve-merges.sh:910
+msgid "Could not execute editor"
+msgstr ""
+
+#: git-rebase--interactive.sh:176 git-rebase--preserve-merges.sh:845
+#, sh-format
+msgid "Could not checkout $switch_to"
+msgstr ""
+
+#: git-rebase--interactive.sh:183 git-rebase--preserve-merges.sh:852
+msgid "No HEAD?"
+msgstr ""
+
+#: git-rebase--interactive.sh:184 git-rebase--preserve-merges.sh:853
+#, sh-format
+msgid "Could not create temporary $state_dir"
+msgstr ""
+
+#: git-rebase--interactive.sh:187 git-rebase--preserve-merges.sh:856
+msgid "Could not mark as interactive"
+msgstr ""
+
+#: git-rebase--interactive.sh:219 git-rebase--preserve-merges.sh:888
+#, sh-format
+msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
+msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: git-rebase--interactive.sh:224
+msgid ""
+"\n"
+"\tHowever, if you remove everything, the rebase will be aborted.\n"
+"\n"
+"\t"
+msgstr ""
+
+#: git-rebase--interactive.sh:231 git-rebase--preserve-merges.sh:900
+msgid "Note that empty commits are commented out"
+msgstr ""
+
+#: git-rebase--interactive.sh:280
+msgid "Could not generate todo list"
+msgstr ""
+
+#: git-rebase--preserve-merges.sh:136
+#, sh-format
+msgid "Rebasing ($new_count/$total)"
+msgstr ""
+
+#: git-rebase--preserve-merges.sh:152
+msgid ""
+"\n"
+"Commands:\n"
+"p, pick <commit> = use commit\n"
+"r, reword <commit> = use commit, but edit the commit message\n"
+"e, edit <commit> = use commit, but stop for amending\n"
+"s, squash <commit> = use commit, but meld into previous commit\n"
+"f, fixup <commit> = like \"squash\", but discard this commit's log message\n"
+"x, exec <commit> = run command (the rest of the line) using shell\n"
+"d, drop <commit> = remove commit\n"
+"l, label <label> = label current HEAD with a name\n"
+"t, reset <label> = reset HEAD to a label\n"
+"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
+". create a merge commit using the original merge commit's\n"
+". message (or the oneline, if no original merge commit was\n"
+". specified). Use -c <commit> to reword the commit message.\n"
+"\n"
+"These lines can be re-ordered; they are executed from top to bottom.\n"
+msgstr ""
+
+#: git-rebase--preserve-merges.sh:215
#, sh-format
msgid ""
"You can amend the commit now, with\n"
"\tgit rebase --continue"
msgstr ""
-#: git-rebase--interactive.sh:246
+#: git-rebase--preserve-merges.sh:240
#, sh-format
msgid "$sha1: not a commit that can be picked"
msgstr ""
-#: git-rebase--interactive.sh:285
+#: git-rebase--preserve-merges.sh:279
#, sh-format
msgid "Invalid commit name: $sha1"
msgstr ""
-#: git-rebase--interactive.sh:325
+#: git-rebase--preserve-merges.sh:309
msgid "Cannot write current commit's replacement sha1"
msgstr ""
-#: git-rebase--interactive.sh:376
+#: git-rebase--preserve-merges.sh:360
#, sh-format
msgid "Fast-forward to $sha1"
msgstr ""
-#: git-rebase--interactive.sh:378
+#: git-rebase--preserve-merges.sh:362
#, sh-format
msgid "Cannot fast-forward to $sha1"
msgstr ""
-#: git-rebase--interactive.sh:387
+#: git-rebase--preserve-merges.sh:371
#, sh-format
msgid "Cannot move HEAD to $first_parent"
msgstr ""
-#: git-rebase--interactive.sh:392
+#: git-rebase--preserve-merges.sh:376
#, sh-format
msgid "Refusing to squash a merge: $sha1"
msgstr ""
-#: git-rebase--interactive.sh:410
+#: git-rebase--preserve-merges.sh:394
#, sh-format
msgid "Error redoing merge $sha1"
msgstr ""
-#: git-rebase--interactive.sh:419
+#: git-rebase--preserve-merges.sh:403
#, sh-format
msgid "Could not pick $sha1"
msgstr ""
-#: git-rebase--interactive.sh:428
+#: git-rebase--preserve-merges.sh:412
#, sh-format
msgid "This is the commit message #${n}:"
msgstr ""
-#: git-rebase--interactive.sh:433
+#: git-rebase--preserve-merges.sh:417
#, sh-format
msgid "The commit message #${n} will be skipped:"
msgstr ""
-#: git-rebase--interactive.sh:444
+#: git-rebase--preserve-merges.sh:428
#, sh-format
msgid "This is a combination of $count commit."
msgid_plural "This is a combination of $count commits."
msgstr[0] ""
msgstr[1] ""
-#: git-rebase--interactive.sh:453
+#: git-rebase--preserve-merges.sh:437
#, sh-format
msgid "Cannot write $fixup_msg"
msgstr ""
-#: git-rebase--interactive.sh:456
+#: git-rebase--preserve-merges.sh:440
msgid "This is a combination of 2 commits."
msgstr ""
-#: git-rebase--interactive.sh:497 git-rebase--interactive.sh:540
-#: git-rebase--interactive.sh:543
+#: git-rebase--preserve-merges.sh:481 git-rebase--preserve-merges.sh:524
+#: git-rebase--preserve-merges.sh:527
#, sh-format
msgid "Could not apply $sha1... $rest"
msgstr ""
-#: git-rebase--interactive.sh:572
+#: git-rebase--preserve-merges.sh:556
#, sh-format
msgid ""
"Could not amend commit after successfully picking $sha1... $rest\n"
"you are able to reword the commit."
msgstr ""
-#: git-rebase--interactive.sh:587
+#: git-rebase--preserve-merges.sh:571
#, sh-format
msgid "Stopped at $sha1_abbrev... $rest"
msgstr ""
-#: git-rebase--interactive.sh:602
+#: git-rebase--preserve-merges.sh:586
#, sh-format
msgid "Cannot '$squash_style' without a previous commit"
msgstr ""
-#: git-rebase--interactive.sh:644
+#: git-rebase--preserve-merges.sh:628
#, sh-format
msgid "Executing: $rest"
msgstr ""
-#: git-rebase--interactive.sh:652
+#: git-rebase--preserve-merges.sh:636
#, sh-format
msgid "Execution failed: $rest"
msgstr ""
-#: git-rebase--interactive.sh:654
+#: git-rebase--preserve-merges.sh:638
msgid "and made changes to the index and/or the working tree"
msgstr ""
-#: git-rebase--interactive.sh:656
+#: git-rebase--preserve-merges.sh:640
msgid ""
"You can fix the problem, and then run\n"
"\n"
msgstr ""
#. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--interactive.sh:669
+#: git-rebase--preserve-merges.sh:653
#, sh-format
msgid ""
"Execution succeeded: $rest\n"
"\tgit rebase --continue"
msgstr ""
-#: git-rebase--interactive.sh:680
+#: git-rebase--preserve-merges.sh:664
#, sh-format
msgid "Unknown command: $command $sha1 $rest"
msgstr ""
-#: git-rebase--interactive.sh:681
+#: git-rebase--preserve-merges.sh:665
msgid "Please fix this using 'git rebase --edit-todo'."
msgstr ""
-#: git-rebase--interactive.sh:716
+#: git-rebase--preserve-merges.sh:700
#, sh-format
msgid "Successfully rebased and updated $head_name."
msgstr ""
-#: git-rebase--interactive.sh:740
-msgid "could not detach HEAD"
-msgstr ""
-
-#: git-rebase--interactive.sh:778
+#: git-rebase--preserve-merges.sh:757
msgid "Could not remove CHERRY_PICK_HEAD"
msgstr ""
-#: git-rebase--interactive.sh:783
+#: git-rebase--preserve-merges.sh:762
#, sh-format
msgid ""
"You have staged changes in your working tree.\n"
" git rebase --continue\n"
msgstr ""
-#: git-rebase--interactive.sh:800
+#: git-rebase--preserve-merges.sh:779
msgid "Error trying to find the author identity to amend commit"
msgstr ""
-#: git-rebase--interactive.sh:805
+#: git-rebase--preserve-merges.sh:784
msgid ""
"You have uncommitted changes in your working tree. Please commit them\n"
"first and then run 'git rebase --continue' again."
msgstr ""
-#: git-rebase--interactive.sh:810 git-rebase--interactive.sh:814
+#: git-rebase--preserve-merges.sh:789 git-rebase--preserve-merges.sh:793
msgid "Could not commit staged changes."
msgstr ""
-#: git-rebase--interactive.sh:843
-msgid ""
-"\n"
-"You are editing the todo file of an ongoing interactive rebase.\n"
-"To continue rebase after editing, run:\n"
-" git rebase --continue\n"
-"\n"
-msgstr ""
-
-#: git-rebase--interactive.sh:851 git-rebase--interactive.sh:937
-msgid "Could not execute editor"
-msgstr ""
-
-#: git-rebase--interactive.sh:872
-#, sh-format
-msgid "Could not checkout $switch_to"
-msgstr ""
-
-#: git-rebase--interactive.sh:879
-msgid "No HEAD?"
-msgstr ""
-
-#: git-rebase--interactive.sh:880
-#, sh-format
-msgid "Could not create temporary $state_dir"
-msgstr ""
-
-#: git-rebase--interactive.sh:883
-msgid "Could not mark as interactive"
-msgstr ""
-
-#: git-rebase--interactive.sh:915
-#, 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:920
+#: git-rebase--preserve-merges.sh:893
msgid ""
"\n"
-"\tHowever, if you remove everything, the rebase will be aborted.\n"
+"However, if you remove everything, the rebase will be aborted.\n"
"\n"
-"\t"
-msgstr ""
-
-#: git-rebase--interactive.sh:927
-msgid "Note that empty commits are commented out"
-msgstr ""
-
-#: git-rebase--interactive.sh:980
-msgid "Could not generate todo list"
msgstr ""
-#: git-rebase--interactive.sh:1001 git-rebase--interactive.sh:1006
+#: git-rebase--preserve-merges.sh:942 git-rebase--preserve-merges.sh:947
msgid "Could not init rewritten commits"
msgstr ""
msgid "STARTTLS failed! %s"
msgstr ""
-#: git-send-email.perl:1512
+#: git-send-email.perl:1511
msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
msgstr ""
-#: git-send-email.perl:1530
+#: git-send-email.perl:1529
#, perl-format
msgid "Failed to send %s\n"
msgstr ""
-#: git-send-email.perl:1533
+#: git-send-email.perl:1532
#, perl-format
msgid "Dry-Sent %s\n"
msgstr ""
-#: git-send-email.perl:1533
+#: git-send-email.perl:1532
#, perl-format
msgid "Sent %s\n"
msgstr ""
-#: git-send-email.perl:1535
+#: git-send-email.perl:1534
msgid "Dry-OK. Log says:\n"
msgstr ""
-#: git-send-email.perl:1535
+#: git-send-email.perl:1534
msgid "OK. Log says:\n"
msgstr ""
-#: git-send-email.perl:1547
+#: git-send-email.perl:1546
msgid "Result: "
msgstr ""
-#: git-send-email.perl:1550
+#: git-send-email.perl:1549
msgid "Result: OK\n"
msgstr ""
-#: git-send-email.perl:1568
+#: git-send-email.perl:1567
#, perl-format
msgid "can't open file %s"
msgstr ""
-#: git-send-email.perl:1615 git-send-email.perl:1635
+#: git-send-email.perl:1614 git-send-email.perl:1634
#, perl-format
msgid "(mbox) Adding cc: %s from line '%s'\n"
msgstr ""
-#: git-send-email.perl:1621
+#: git-send-email.perl:1620
#, perl-format
msgid "(mbox) Adding to: %s from line '%s'\n"
msgstr ""
-#: git-send-email.perl:1674
+#: git-send-email.perl:1673
#, perl-format
msgid "(non-mbox) Adding cc: %s from line '%s'\n"
msgstr ""
-#: git-send-email.perl:1699
+#: git-send-email.perl:1698
#, perl-format
msgid "(body) Adding cc: %s from line '%s'\n"
msgstr ""
-#: git-send-email.perl:1817
+#: git-send-email.perl:1809
#, perl-format
msgid "(%s) Could not execute '%s'"
msgstr ""
-#: git-send-email.perl:1824
+#: git-send-email.perl:1816
#, perl-format
msgid "(%s) Adding %s: %s from: '%s'\n"
msgstr ""
-#: git-send-email.perl:1828
+#: git-send-email.perl:1820
#, perl-format
msgid "(%s) failed to close pipe to '%s'"
msgstr ""
-#: git-send-email.perl:1855
+#: git-send-email.perl:1850
msgid "cannot send message as 7bit"
msgstr ""
-#: git-send-email.perl:1863
+#: git-send-email.perl:1858
msgid "invalid transfer encoding"
msgstr ""
-#: git-send-email.perl:1901 git-send-email.perl:1952 git-send-email.perl:1962
+#: git-send-email.perl:1899 git-send-email.perl:1951 git-send-email.perl:1961
#, perl-format
msgid "unable to open %s: %s\n"
msgstr ""
-#: git-send-email.perl:1904
+#: git-send-email.perl:1902
#, perl-format
msgid "%s: patch contains a line longer than 998 characters"
msgstr ""
-#: git-send-email.perl:1920
+#: git-send-email.perl:1919
#, perl-format
msgid "Skipping %s with backup suffix '%s'.\n"
msgstr ""
#. TRANSLATORS: please keep "[y|N]" as is.
-#: git-send-email.perl:1924
+#: git-send-email.perl:1923
#, perl-format
msgid "Do you really want to send %s? [y|N]: "
msgstr ""
projects / thirdparty / git.git / commitdiff
