msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2018-09-04 08:50+0800\n"
+"POT-Creation-Date: 2019-02-15 10:09+0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
-#: advice.c:97
+#: advice.c:101
#, c-format
msgid "%shint: %.*s%s\n"
msgstr ""
-#: advice.c:150
+#: advice.c:154
msgid "Cherry-picking is not possible because you have unmerged files."
msgstr ""
-#: advice.c:152
+#: advice.c:156
msgid "Committing is not possible because you have unmerged files."
msgstr ""
-#: advice.c:154
+#: advice.c:158
msgid "Merging is not possible because you have unmerged files."
msgstr ""
-#: advice.c:156
+#: advice.c:160
msgid "Pulling is not possible because you have unmerged files."
msgstr ""
-#: advice.c:158
+#: advice.c:162
msgid "Reverting is not possible because you have unmerged files."
msgstr ""
-#: advice.c:160
+#: advice.c:164
#, c-format
msgid "It is not possible to %s because you have unmerged files."
msgstr ""
-#: advice.c:168
+#: advice.c:172
msgid ""
"Fix them up in the work tree, and then use 'git add/rm <file>'\n"
"as appropriate to mark resolution and make a commit."
msgstr ""
-#: advice.c:176
+#: advice.c:180
msgid "Exiting because of an unresolved conflict."
msgstr ""
-#: advice.c:181 builtin/merge.c:1286
+#: advice.c:185 builtin/merge.c:1290
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr ""
-#: advice.c:183
+#: advice.c:187
msgid "Please, commit your changes before merging."
msgstr ""
-#: advice.c:184
+#: advice.c:188
msgid "Exiting because of unfinished merge."
msgstr ""
-#: advice.c:190
+#: advice.c:194
#, c-format
msgid ""
"Note: checking out '%s'.\n"
"\n"
msgstr ""
+#: alias.c:50
+msgid "cmdline ends with \\"
+msgstr ""
+
+#: alias.c:51
+msgid "unclosed quote"
+msgstr ""
+
#: apply.c:59
#, c-format
msgid "unrecognized whitespace option '%s'"
msgid "--cached outside a repository"
msgstr ""
-#: apply.c:826
+#: apply.c:825
#, c-format
msgid "Cannot prepare timestamp regexp %s"
msgstr ""
-#: apply.c:835
+#: apply.c:834
#, c-format
msgid "regexec returned %d for input: %s"
msgstr ""
-#: apply.c:909
+#: apply.c:908
#, c-format
msgid "unable to find filename in patch at line %d"
msgstr ""
-#: apply.c:947
+#: apply.c:946
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
msgstr ""
-#: apply.c:953
+#: apply.c:952
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr ""
-#: apply.c:954
+#: apply.c:953
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr ""
-#: apply.c:959
+#: apply.c:958
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr ""
-#: apply.c:988
+#: apply.c:987
#, c-format
msgid "invalid mode on line %d: %s"
msgstr ""
msgid "unrecognized binary patch at line %d"
msgstr ""
-#: apply.c:2190
+#: apply.c:2192
#, c-format
msgid "patch with only garbage at line %d"
msgstr ""
-#: apply.c:2276
+#: apply.c:2278
#, c-format
msgid "unable to read symlink %s"
msgstr ""
-#: apply.c:2280
+#: apply.c:2282
#, c-format
msgid "unable to open or read %s"
msgstr ""
-#: apply.c:2939
+#: apply.c:2941
#, c-format
msgid "invalid start of line: '%c'"
msgstr ""
-#: apply.c:3060
+#: apply.c:3062
#, c-format
msgid "Hunk #%d succeeded at %d (offset %d line)."
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
msgstr[0] ""
msgstr[1] ""
-#: apply.c:3072
+#: apply.c:3074
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr ""
-#: apply.c:3078
+#: apply.c:3080
#, c-format
msgid ""
"while searching for:\n"
"%.*s"
msgstr ""
-#: apply.c:3100
+#: apply.c:3102
#, c-format
msgid "missing binary patch data for '%s'"
msgstr ""
-#: apply.c:3108
+#: apply.c:3110
#, c-format
msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
msgstr ""
-#: apply.c:3154
+#: apply.c:3157
#, c-format
msgid "cannot apply binary patch to '%s' without full index line"
msgstr ""
-#: apply.c:3164
+#: apply.c:3167
#, c-format
msgid ""
"the patch applies to '%s' (%s), which does not match the current contents."
msgstr ""
-#: apply.c:3172
+#: apply.c:3175
#, c-format
msgid "the patch applies to an empty '%s' but it is not empty"
msgstr ""
-#: apply.c:3190
+#: apply.c:3193
#, c-format
msgid "the necessary postimage %s for '%s' cannot be read"
msgstr ""
-#: apply.c:3203
+#: apply.c:3206
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr ""
-#: apply.c:3209
+#: apply.c:3212
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr ""
-#: apply.c:3230
+#: apply.c:3233
#, c-format
msgid "patch failed: %s:%ld"
msgstr ""
-#: apply.c:3352
+#: apply.c:3356
#, c-format
msgid "cannot checkout %s"
msgstr ""
-#: apply.c:3404 apply.c:3415 apply.c:3461 setup.c:278
+#: apply.c:3408 apply.c:3419 apply.c:3465 midx.c:58 setup.c:278
#, c-format
msgid "failed to read %s"
msgstr ""
-#: apply.c:3412
+#: apply.c:3416
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr ""
-#: apply.c:3441 apply.c:3681
+#: apply.c:3445 apply.c:3688
#, c-format
msgid "path %s has been renamed/deleted"
msgstr ""
-#: apply.c:3524 apply.c:3696
+#: apply.c:3531 apply.c:3703
#, c-format
msgid "%s: does not exist in index"
msgstr ""
-#: apply.c:3533 apply.c:3704
+#: apply.c:3540 apply.c:3711
#, c-format
msgid "%s: does not match index"
msgstr ""
-#: apply.c:3568
+#: apply.c:3575
msgid "repository lacks the necessary blob to fall back on 3-way merge."
msgstr ""
-#: apply.c:3571
+#: apply.c:3578
#, c-format
msgid "Falling back to three-way merge...\n"
msgstr ""
-#: apply.c:3587 apply.c:3591
+#: apply.c:3594 apply.c:3598
#, c-format
msgid "cannot read the current contents of '%s'"
msgstr ""
-#: apply.c:3603
+#: apply.c:3610
#, c-format
msgid "Failed to fall back on three-way merge...\n"
msgstr ""
-#: apply.c:3617
+#: apply.c:3624
#, c-format
msgid "Applied patch to '%s' with conflicts.\n"
msgstr ""
-#: apply.c:3622
+#: apply.c:3629
#, c-format
msgid "Applied patch to '%s' cleanly.\n"
msgstr ""
-#: apply.c:3648
+#: apply.c:3655
msgid "removal patch leaves file contents"
msgstr ""
-#: apply.c:3721
+#: apply.c:3728
#, c-format
msgid "%s: wrong type"
msgstr ""
-#: apply.c:3723
+#: apply.c:3730
#, c-format
msgid "%s has type %o, expected %o"
msgstr ""
-#: apply.c:3874 apply.c:3876
+#: apply.c:3881 apply.c:3883 read-cache.c:820 read-cache.c:846
+#: read-cache.c:1299
#, c-format
msgid "invalid path '%s'"
msgstr ""
-#: apply.c:3932
+#: apply.c:3939
#, c-format
msgid "%s: already exists in index"
msgstr ""
-#: apply.c:3935
+#: apply.c:3942
#, c-format
msgid "%s: already exists in working directory"
msgstr ""
-#: apply.c:3955
+#: apply.c:3962
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr ""
-#: apply.c:3960
+#: apply.c:3967
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr ""
-#: apply.c:3980
+#: apply.c:3987
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr ""
-#: apply.c:3984
+#: apply.c:3991
#, c-format
msgid "%s: patch does not apply"
msgstr ""
-#: apply.c:3999
+#: apply.c:4006
#, c-format
msgid "Checking patch %s..."
msgstr ""
-#: apply.c:4091
+#: apply.c:4098
#, c-format
msgid "sha1 information is lacking or useless for submodule %s"
msgstr ""
-#: apply.c:4098
+#: apply.c:4105
#, c-format
msgid "mode change for %s, which is not in current HEAD"
msgstr ""
-#: apply.c:4101
+#: apply.c:4108
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr ""
-#: apply.c:4106 builtin/checkout.c:237 builtin/reset.c:140
+#: apply.c:4113 builtin/checkout.c:248 builtin/reset.c:143
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr ""
-#: apply.c:4110
+#: apply.c:4117
#, c-format
msgid "could not add %s to temporary index"
msgstr ""
-#: apply.c:4120
+#: apply.c:4127
#, c-format
msgid "could not write temporary index to %s"
msgstr ""
-#: apply.c:4258
+#: apply.c:4265
#, c-format
msgid "unable to remove %s from index"
msgstr ""
-#: apply.c:4292
+#: apply.c:4299
#, c-format
msgid "corrupt patch for submodule %s"
msgstr ""
-#: apply.c:4298
+#: apply.c:4305
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr ""
-#: apply.c:4306
+#: apply.c:4313
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr ""
-#: apply.c:4312 apply.c:4457
+#: apply.c:4319 apply.c:4464
#, c-format
msgid "unable to add cache entry for %s"
msgstr ""
-#: apply.c:4355
+#: apply.c:4362
#, c-format
msgid "failed to write to '%s'"
msgstr ""
-#: apply.c:4359
+#: apply.c:4366
#, c-format
msgid "closing file '%s'"
msgstr ""
-#: apply.c:4429
+#: apply.c:4436
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr ""
-#: apply.c:4527
+#: apply.c:4534
#, c-format
msgid "Applied patch %s cleanly."
msgstr ""
-#: apply.c:4535
+#: apply.c:4542
msgid "internal error"
msgstr ""
-#: apply.c:4538
+#: apply.c:4545
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] ""
msgstr[1] ""
-#: apply.c:4549
+#: apply.c:4556
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr ""
-#: apply.c:4557 builtin/fetch.c:780 builtin/fetch.c:1048
+#: apply.c:4564 builtin/fetch.c:837 builtin/fetch.c:1118
#, c-format
msgid "cannot open %s"
msgstr ""
-#: apply.c:4571
+#: apply.c:4578
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr ""
-#: apply.c:4575
+#: apply.c:4582
#, c-format
msgid "Rejected hunk #%d."
msgstr ""
-#: apply.c:4685
+#: apply.c:4692
#, c-format
msgid "Skipped patch '%s'."
msgstr ""
-#: apply.c:4693
+#: apply.c:4700
msgid "unrecognized input"
msgstr ""
-#: apply.c:4712
+#: apply.c:4720
msgid "unable to read index file"
msgstr ""
-#: apply.c:4849
+#: apply.c:4875
#, c-format
msgid "can't open patch '%s': %s"
msgstr ""
-#: apply.c:4876
+#: apply.c:4902
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] ""
msgstr[1] ""
-#: apply.c:4882 apply.c:4897
+#: apply.c:4908 apply.c:4923
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgstr[0] ""
msgstr[1] ""
-#: apply.c:4890
+#: apply.c:4916
#, c-format
msgid "%d line applied after fixing whitespace errors."
msgid_plural "%d lines applied after fixing whitespace errors."
msgstr[0] ""
msgstr[1] ""
-#: apply.c:4906 builtin/add.c:539 builtin/mv.c:300 builtin/rm.c:389
+#: apply.c:4932 builtin/add.c:539 builtin/mv.c:301 builtin/rm.c:390
msgid "Unable to write new index file"
msgstr ""
-#: apply.c: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
+#: apply.c:4959 apply.c:4962 builtin/am.c:2203 builtin/am.c:2206
+#: builtin/clone.c:122 builtin/fetch.c:118 builtin/merge.c:263
+#: builtin/pull.c:200 builtin/submodule--helper.c:407
+#: builtin/submodule--helper.c:1366 builtin/submodule--helper.c:1369
+#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:1853
+#: builtin/submodule--helper.c:2092 git-add--interactive.perl:197
msgid "path"
msgstr ""
-#: apply.c:4934
+#: apply.c:4960
msgid "don't apply changes matching the given path"
msgstr ""
-#: apply.c:4937
+#: apply.c:4963
msgid "apply changes matching the given path"
msgstr ""
-#: apply.c:4939 builtin/am.c:2263
+#: apply.c:4965 builtin/am.c:2212
msgid "num"
msgstr ""
-#: apply.c:4940
+#: apply.c:4966
msgid "remove <num> leading slashes from traditional diff paths"
msgstr ""
-#: apply.c:4943
+#: apply.c:4969
msgid "ignore additions made by the patch"
msgstr ""
-#: apply.c:4945
+#: apply.c:4971
msgid "instead of applying the patch, output diffstat for the input"
msgstr ""
-#: apply.c:4949
+#: apply.c:4975
msgid "show number of added and deleted lines in decimal notation"
msgstr ""
-#: apply.c:4951
+#: apply.c:4977
msgid "instead of applying the patch, output a summary for the input"
msgstr ""
-#: apply.c:4953
+#: apply.c:4979
msgid "instead of applying the patch, see if the patch is applicable"
msgstr ""
-#: apply.c:4955
+#: apply.c:4981
msgid "make sure the patch is applicable to the current index"
msgstr ""
-#: apply.c:4957
+#: apply.c:4983
msgid "mark new files with `git add --intent-to-add`"
msgstr ""
-#: apply.c:4959
+#: apply.c:4985
msgid "apply a patch without touching the working tree"
msgstr ""
-#: apply.c:4961
+#: apply.c:4987
msgid "accept a patch that touches outside the working area"
msgstr ""
-#: apply.c:4964
+#: apply.c:4990
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr ""
-#: apply.c:4966
+#: apply.c:4992
msgid "attempt three-way merge if a patch does not apply"
msgstr ""
-#: apply.c:4968
+#: apply.c:4994
msgid "build a temporary index based on embedded index information"
msgstr ""
-#: apply.c:4971 builtin/checkout-index.c:168 builtin/ls-files.c:516
+#: apply.c:4997 builtin/checkout-index.c:173 builtin/ls-files.c:524
msgid "paths are separated with NUL character"
msgstr ""
-#: apply.c:4973
+#: apply.c:4999
msgid "ensure at least <n> lines of context match"
msgstr ""
-#: 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:3202
+#: apply.c:5000 builtin/am.c:2191 builtin/interpret-trailers.c:97
+#: builtin/interpret-trailers.c:99 builtin/interpret-trailers.c:101
+#: builtin/pack-objects.c:3314 builtin/rebase.c:1065
msgid "action"
msgstr ""
-#: apply.c:4975
+#: apply.c:5001
msgid "detect new or modified lines that have whitespace errors"
msgstr ""
-#: apply.c:4978 apply.c:4981
+#: apply.c:5004 apply.c:5007
msgid "ignore changes in whitespace when finding context"
msgstr ""
-#: apply.c:4984
+#: apply.c:5010
msgid "apply the patch in reverse"
msgstr ""
-#: apply.c:4986
+#: apply.c:5012
msgid "don't expect at least one line of context"
msgstr ""
-#: apply.c:4988
+#: apply.c:5014
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr ""
-#: apply.c:4990
+#: apply.c:5016
msgid "allow overlapping hunks"
msgstr ""
-#: 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
+#: apply.c:5017 builtin/add.c:291 builtin/check-ignore.c:22
+#: builtin/commit.c:1312 builtin/count-objects.c:98 builtin/fsck.c:724
+#: builtin/log.c:2037 builtin/mv.c:123 builtin/read-tree.c:128
+#: builtin/rebase--interactive.c:159
msgid "be verbose"
msgstr ""
-#: apply.c:4993
+#: apply.c:5019
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr ""
-#: apply.c:4996
+#: apply.c:5022
msgid "do not trust the line counts in the hunk headers"
msgstr ""
-#: apply.c:4998 builtin/am.c:2251
+#: apply.c:5024 builtin/am.c:2200
msgid "root"
msgstr ""
-#: apply.c:4999
+#: apply.c:5025
msgid "prepend <root> to all filenames"
msgstr ""
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr ""
-#: archive.c:363 builtin/add.c:176 builtin/add.c:515 builtin/rm.c:298
+#: archive.c:372 builtin/add.c:177 builtin/add.c:515 builtin/rm.c:299
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr ""
-#: archive.c:446
+#: archive.c:396
+#, c-format
+msgid "no such ref: %.*s"
+msgstr ""
+
+#: archive.c:401
+#, c-format
+msgid "not a valid object name: %s"
+msgstr ""
+
+#: archive.c:414
+#, c-format
+msgid "not a tree object: %s"
+msgstr ""
+
+#: archive.c:424
+msgid "current working directory is untracked"
+msgstr ""
+
+#: archive.c:455
msgid "fmt"
msgstr ""
-#: archive.c:446
+#: archive.c:455
msgid "archive format"
msgstr ""
-#: archive.c:447 builtin/log.c:1473
+#: archive.c:456 builtin/log.c:1549
msgid "prefix"
msgstr ""
-#: archive.c:448
+#: archive.c:457
msgid "prepend prefix to each pathname in the archive"
msgstr ""
-#: 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
+#: archive.c:458 builtin/blame.c:820 builtin/blame.c:821 builtin/config.c:129
+#: builtin/fast-export.c:1091 builtin/fast-export.c:1093 builtin/grep.c:895
+#: builtin/hash-object.c:105 builtin/ls-files.c:560 builtin/ls-files.c:563
+#: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123
+#: parse-options.h:162
msgid "file"
msgstr ""
-#: archive.c:450 builtin/archive.c:89
+#: archive.c:459 builtin/archive.c:90
msgid "write the archive to this file"
msgstr ""
-#: archive.c:452
+#: archive.c:461
msgid "read .gitattributes in working directory"
msgstr ""
-#: archive.c:453
+#: archive.c:462
msgid "report archived files on stderr"
msgstr ""
-#: archive.c:454
+#: archive.c:463
msgid "store only"
msgstr ""
-#: archive.c:455
+#: archive.c:464
msgid "compress faster"
msgstr ""
-#: archive.c:463
+#: archive.c:472
msgid "compress better"
msgstr ""
-#: archive.c:466
+#: archive.c:475
msgid "list supported archive formats"
msgstr ""
-#: 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
+#: archive.c:477 builtin/archive.c:91 builtin/clone.c:112 builtin/clone.c:115
+#: builtin/submodule--helper.c:1378 builtin/submodule--helper.c:1859
msgid "repo"
msgstr ""
-#: archive.c:469 builtin/archive.c:91
+#: archive.c:478 builtin/archive.c:92
msgid "retrieve the archive from remote repository <repo>"
msgstr ""
-#: archive.c:470 builtin/archive.c:92 builtin/difftool.c:714
-#: builtin/notes.c:491
+#: archive.c:479 builtin/archive.c:93 builtin/difftool.c:715
+#: builtin/notes.c:498
msgid "command"
msgstr ""
-#: archive.c:471 builtin/archive.c:93
+#: archive.c:480 builtin/archive.c:94
msgid "path to the remote git-upload-archive command"
msgstr ""
-#: archive.c:478
+#: archive.c:487
msgid "Unexpected option --remote"
msgstr ""
-#: archive.c:480
+#: archive.c:489
msgid "Option --exec can only be used together with --remote"
msgstr ""
-#: archive.c:482
+#: archive.c:491
msgid "Unexpected option --output"
msgstr ""
-#: archive.c:504
+#: archive.c:513
#, c-format
msgid "Unknown archive format '%s'"
msgstr ""
-#: archive.c:511
+#: archive.c:520
#, c-format
msgid "Argument not supported for format '%s': -%d"
msgstr ""
-#: archive-tar.c:125 archive-zip.c:344
+#: archive-tar.c:125 archive-zip.c:345
#, c-format
msgid "cannot stream blob %s"
msgstr ""
-#: archive-tar.c:260 archive-zip.c:361
+#: archive-tar.c:260 archive-zip.c:363
#, c-format
msgid "unsupported file mode: 0%o (SHA1: %s)"
msgstr ""
-#: archive-tar.c:287 archive-zip.c:352
+#: archive-tar.c:287 archive-zip.c:353
#, c-format
msgid "cannot read %s"
msgstr ""
msgid "'%s' filter reported error"
msgstr ""
-#: archive-zip.c:313
+#: archive-zip.c:314
#, c-format
msgid "path is not valid UTF-8: %s"
msgstr ""
-#: archive-zip.c:317
+#: archive-zip.c:318
#, 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
+#: archive-zip.c:474 builtin/pack-objects.c:225 builtin/pack-objects.c:228
#, c-format
msgid "deflate error (%d)"
msgstr ""
-#: archive-zip.c:605
+#: archive-zip.c:609
#, c-format
msgid "timestamp too large for this system: %<PRIuMAX>"
msgstr ""
-#: attr.c:218
+#: attr.c:211
#, c-format
msgid "%.*s is not a valid attribute name"
msgstr ""
-#: attr.c:415
+#: attr.c:368
+#, c-format
+msgid "%s not allowed: %s:%d"
+msgstr ""
+
+#: attr.c:408
msgid ""
"Negative patterns are ignored in git attributes\n"
"Use '\\!' for literal leading exclamation."
msgstr ""
-#: bisect.c:467
+#: bisect.c:468
#, c-format
msgid "Badly quoted content in file '%s': %s"
msgstr ""
-#: bisect.c:675
+#: bisect.c:678
#, c-format
msgid "We cannot bisect more!\n"
msgstr ""
-#: bisect.c:729
+#: bisect.c:733
#, c-format
msgid "Not a valid commit name %s"
msgstr ""
-#: bisect.c:753
+#: bisect.c:758
#, c-format
msgid ""
"The merge base %s is bad.\n"
"This means the bug has been fixed between %s and [%s].\n"
msgstr ""
-#: bisect.c:758
+#: bisect.c:763
#, c-format
msgid ""
"The merge base %s is new.\n"
"The property has changed between %s and [%s].\n"
msgstr ""
-#: bisect.c:763
+#: bisect.c:768
#, c-format
msgid ""
"The merge base %s is %s.\n"
"This means the first '%s' commit is between %s and [%s].\n"
msgstr ""
-#: bisect.c:771
+#: bisect.c:776
#, c-format
msgid ""
"Some %s revs are not ancestors of the %s rev.\n"
"Maybe you mistook %s and %s revs?\n"
msgstr ""
-#: bisect.c:784
+#: bisect.c:789
#, c-format
msgid ""
"the merge base between %s and [%s] must be skipped.\n"
"We continue anyway."
msgstr ""
-#: bisect.c:817
+#: bisect.c:822
#, c-format
msgid "Bisecting: a merge base must be tested\n"
msgstr ""
-#: bisect.c:857
+#: bisect.c:865
#, c-format
msgid "a %s revision is needed"
msgstr ""
-#: bisect.c:876 builtin/notes.c:177 builtin/tag.c:237
+#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:237
#, c-format
msgid "could not create file '%s'"
msgstr ""
-#: bisect.c:927 builtin/merge.c:137
+#: bisect.c:937 builtin/merge.c:139
#, c-format
msgid "could not read file '%s'"
msgstr ""
-#: bisect.c:957
+#: bisect.c:967
msgid "reading bisect refs failed"
msgstr ""
-#: bisect.c:976
+#: bisect.c:986
#, c-format
msgid "%s was both %s and %s\n"
msgstr ""
-#: bisect.c:984
+#: bisect.c:994
#, c-format
msgid ""
"No testable commit found.\n"
"Maybe you started with bad path parameters?\n"
msgstr ""
-#: bisect.c:1003
+#: bisect.c:1013
#, c-format
msgid "(roughly %d step)"
msgid_plural "(roughly %d steps)"
#. TRANSLATORS: the last %s will be replaced with "(roughly %d
#. steps)" translation.
#.
-#: bisect.c:1009
+#: bisect.c:1019
#, c-format
msgid "Bisecting: %d revision left to test after this %s\n"
msgid_plural "Bisecting: %d revisions left to test after this %s\n"
msgstr[0] ""
msgstr[1] ""
-#: blame.c:1784
+#: blame.c:1792
msgid "--contents and --reverse do not blend well."
msgstr ""
-#: blame.c:1798
+#: blame.c:1806
msgid "cannot use --contents with final commit object name"
msgstr ""
-#: blame.c:1819
+#: blame.c:1827
msgid "--reverse and --first-parent together require specified latest commit"
msgstr ""
-#: blame.c:1828 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:3029 builtin/pack-objects.c:3044
+#: blame.c:1836 bundle.c:164 ref-filter.c:2071 remote.c:1948 sequencer.c:1993
+#: sequencer.c:4064 builtin/commit.c:1004 builtin/log.c:378 builtin/log.c:936
+#: builtin/log.c:1420 builtin/log.c:1796 builtin/log.c:2086 builtin/merge.c:407
+#: builtin/pack-objects.c:3137 builtin/pack-objects.c:3152
#: builtin/shortlog.c:192
msgid "revision walk setup failed"
msgstr ""
-#: blame.c:1846
+#: blame.c:1854
msgid ""
"--reverse --first-parent together require range along first-parent chain"
msgstr ""
-#: blame.c:1857
+#: blame.c:1865
#, c-format
msgid "no such path %s in %s"
msgstr ""
-#: blame.c:1868
+#: blame.c:1876
#, c-format
msgid "cannot read blob %s for path %s"
msgstr ""
"\"git push -u\" to set the upstream config as you push."
msgstr ""
-#: branch.c:279
+#: branch.c:280
#, c-format
msgid "Not a valid object name: '%s'."
msgstr ""
-#: branch.c:299
+#: branch.c:300
#, c-format
msgid "Ambiguous object name: '%s'."
msgstr ""
-#: branch.c:304
+#: branch.c:305
#, c-format
msgid "Not a valid branch point: '%s'."
msgstr ""
-#: branch.c:358
+#: branch.c:359
#, c-format
msgid "'%s' is already checked out at '%s'"
msgstr ""
-#: branch.c:381
+#: branch.c:382
#, c-format
msgid "HEAD of working tree %s is not updated"
msgstr ""
msgid "unrecognized header: %s%s (%d)"
msgstr ""
-#: bundle.c:90 sequencer.c:2092 sequencer.c:2578 builtin/commit.c:768
+#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2215 sequencer.c:2763
+#: builtin/commit.c:776
#, c-format
msgid "could not open '%s'"
msgstr ""
-#: bundle.c:141
+#: bundle.c:143
msgid "Repository lacks these prerequisite commits:"
msgstr ""
-#: bundle.c:192
+#: bundle.c:194
#, c-format
msgid "The bundle contains this ref:"
msgid_plural "The bundle contains these %d refs:"
msgstr[0] ""
msgstr[1] ""
-#: bundle.c:199
+#: bundle.c:201
msgid "The bundle records a complete history."
msgstr ""
-#: bundle.c:201
+#: bundle.c:203
#, c-format
msgid "The bundle requires this ref:"
msgid_plural "The bundle requires these %d refs:"
msgstr[0] ""
msgstr[1] ""
-#: bundle.c:260
+#: bundle.c:269
+msgid "unable to dup bundle descriptor"
+msgstr ""
+
+#: bundle.c:276
msgid "Could not spawn pack-objects"
msgstr ""
-#: bundle.c:271
+#: bundle.c:287
msgid "pack-objects died"
msgstr ""
-#: bundle.c:313
+#: bundle.c:329
msgid "rev-list died"
msgstr ""
-#: bundle.c:362
+#: bundle.c:378
#, c-format
msgid "ref '%s' is excluded by the rev-list options"
msgstr ""
-#: bundle.c:453 builtin/log.c:187 builtin/log.c:1618 builtin/shortlog.c:304
+#: bundle.c:457 builtin/log.c:193 builtin/log.c:1701 builtin/shortlog.c:306
#, c-format
msgid "unrecognized argument: %s"
msgstr ""
-#: bundle.c:461
+#: bundle.c:465
msgid "Refusing to create empty bundle."
msgstr ""
-#: bundle.c:473
+#: bundle.c:475
#, c-format
msgid "cannot create '%s'"
msgstr ""
-#: bundle.c:501
+#: bundle.c:500
msgid "index-pack died"
msgstr ""
msgid "invalid color value: %.*s"
msgstr ""
-#: 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
+#: commit.c:50 sequencer.c:2567 builtin/am.c:355 builtin/am.c:399
+#: builtin/am.c:1375 builtin/am.c:2019 builtin/replace.c:376
#: builtin/replace.c:448
#, c-format
msgid "could not parse %s"
msgstr ""
-#: commit.c:50
+#: commit.c:52
#, c-format
msgid "%s %s is not a commit!"
msgstr ""
-#: commit.c:191
+#: commit.c:193
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:1629
+#: commit.c:1122
+#, c-format
+msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
+msgstr ""
+
+#: commit.c:1125
+#, c-format
+msgid "Commit %s has a bad GPG signature allegedly by %s."
+msgstr ""
+
+#: commit.c:1128
+#, c-format
+msgid "Commit %s does not have a GPG signature."
+msgstr ""
+
+#: commit.c:1131
+#, c-format
+msgid "Commit %s has a good GPG signature by %s\n"
+msgstr ""
+
+#: commit.c:1385
msgid ""
"Warning: commit message did not conform to UTF-8.\n"
"You may want to amend it after fixing the message, or set the config\n"
"variable i18n.commitencoding to the encoding your project uses.\n"
msgstr ""
-#: commit-graph.c:83
+#: commit-graph.c:101
#, c-format
msgid "graph file %s is too small"
msgstr ""
-#: commit-graph.c:90
+#: commit-graph.c:136
#, c-format
msgid "graph signature %X does not match signature %X"
msgstr ""
-#: commit-graph.c:97
+#: commit-graph.c:143
#, c-format
msgid "graph version %X does not match version %X"
msgstr ""
-#: commit-graph.c:104
+#: commit-graph.c:150
#, c-format
msgid "hash version %X does not match version %X"
msgstr ""
-#: commit-graph.c:128
+#: commit-graph.c:173
+msgid "chunk lookup table entry missing; graph file may be incomplete"
+msgstr ""
+
+#: commit-graph.c:184
#, c-format
msgid "improper chunk offset %08x%08x"
msgstr ""
-#: commit-graph.c:164
+#: commit-graph.c:221
#, c-format
msgid "chunk id %08x appears multiple times"
msgstr ""
-#: commit-graph.c:261
+#: commit-graph.c:334
#, c-format
msgid "could not find commit %s"
msgstr ""
-#: commit-graph.c:565 builtin/pack-objects.c:2568
+#: commit-graph.c:671 builtin/pack-objects.c:2646
#, c-format
msgid "unable to get type of object %s"
msgstr ""
-#: commit-graph.c:730
+#: commit-graph.c:704
+msgid "Loading known commits in commit graph"
+msgstr ""
+
+#: commit-graph.c:720
+msgid "Expanding reachable commits in commit graph"
+msgstr ""
+
+#: commit-graph.c:732
+msgid "Clearing commit marks in commit graph"
+msgstr ""
+
+#: commit-graph.c:752
+msgid "Computing commit graph generation numbers"
+msgstr ""
+
+#: commit-graph.c:869
+#, c-format
+msgid "Finding commits for commit graph in %d pack"
+msgid_plural "Finding commits for commit graph in %d packs"
+msgstr[0] ""
+msgstr[1] ""
+
+#: commit-graph.c:882
#, c-format
msgid "error adding pack %s"
msgstr ""
-#: commit-graph.c:732
+#: commit-graph.c:884
#, c-format
msgid "error opening index for %s"
msgstr ""
-#: commit-graph.c:773
+#: commit-graph.c:898
+#, c-format
+msgid "Finding commits for commit graph from %d ref"
+msgid_plural "Finding commits for commit graph from %d refs"
+msgstr[0] ""
+msgstr[1] ""
+
+#: commit-graph.c:930
+msgid "Finding commits for commit graph among packed objects"
+msgstr ""
+
+#: commit-graph.c:943
+msgid "Counting distinct commits in commit graph"
+msgstr ""
+
+#: commit-graph.c:956
#, c-format
msgid "the commit graph format cannot write %d commits"
msgstr ""
-#: commit-graph.c:800
+#: commit-graph.c:965
+msgid "Finding extra edges in commit graph"
+msgstr ""
+
+#: commit-graph.c:989
msgid "too many commits to write graph"
msgstr ""
-#: commit-graph.c:806
+#: commit-graph.c:996 midx.c:769
#, c-format
msgid "unable to create leading directories of %s"
msgstr ""
-#: commit-graph.c:904
+#: commit-graph.c:1036
+#, c-format
+msgid "Writing out commit graph in %d pass"
+msgid_plural "Writing out commit graph in %d passes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: commit-graph.c:1109
msgid "the commit-graph file has incorrect checksum and is likely corrupt"
msgstr ""
-#: compat/obstack.c:405 compat/obstack.c:407
+#: commit-graph.c:1153
+msgid "Verifying commits in commit graph"
+msgstr ""
+
+#: compat/obstack.c:406 compat/obstack.c:408
msgid "memory exhausted"
msgstr ""
msgid "key does not contain variable name: %s"
msgstr ""
-#: config.c:378 sequencer.c:2206
+#: config.c:378 sequencer.c:2330
#, c-format
msgid "invalid key: %s"
msgstr ""
msgid "invalid mode for object creation: %s"
msgstr ""
-#: config.c:1403
+#: config.c:1395
#, c-format
msgid "malformed value for %s"
msgstr ""
-#: config.c:1429
+#: config.c:1421
#, c-format
msgid "malformed value for %s: %s"
msgstr ""
-#: config.c:1430
+#: config.c:1422
msgid "must be one of nothing, matching, simple, upstream or current"
msgstr ""
-#: config.c:1489 builtin/pack-objects.c:3279
+#: config.c:1481 builtin/pack-objects.c:3394
#, c-format
msgid "bad pack compression level %d"
msgstr ""
-#: config.c:1610
+#: config.c:1602
#, c-format
msgid "unable to load config blob object '%s'"
msgstr ""
-#: config.c:1613
+#: config.c:1605
#, c-format
msgid "reference '%s' does not point to a blob"
msgstr ""
-#: config.c:1630
+#: config.c:1622
#, c-format
msgid "unable to resolve config blob '%s'"
msgstr ""
-#: config.c:1660
+#: config.c:1652
#, c-format
msgid "failed to parse %s"
msgstr ""
-#: config.c:1700
+#: config.c:1705
msgid "unable to parse command-line config"
msgstr ""
-#: config.c:2032
+#: config.c:2037
msgid "unknown error occurred while reading the configuration files"
msgstr ""
-#: config.c:2202
+#: config.c:2207
#, c-format
msgid "Invalid %s: '%s'"
msgstr ""
-#: config.c:2245
+#: config.c:2250
#, c-format
msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
msgstr ""
-#: config.c:2271
+#: config.c:2276
#, c-format
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
msgstr ""
-#: config.c:2296
+#: config.c:2322
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr ""
-#: config.c:2298
+#: config.c:2324
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr ""
-#: config.c:2379
+#: config.c:2405
#, c-format
msgid "invalid section name '%s'"
msgstr ""
-#: config.c:2411
+#: config.c:2437
#, c-format
msgid "%s has multiple values"
msgstr ""
-#: config.c:2440
+#: config.c:2466
#, c-format
msgid "failed to write new configuration file %s"
msgstr ""
-#: config.c:2691 config.c:3015
+#: config.c:2716 config.c:3040
#, c-format
msgid "could not lock config file %s"
msgstr ""
-#: config.c:2702
+#: config.c:2727
#, c-format
msgid "opening %s"
msgstr ""
-#: config.c:2737 builtin/config.c:324
+#: config.c:2762 builtin/config.c:328
#, c-format
msgid "invalid pattern: %s"
msgstr ""
-#: config.c:2762
+#: config.c:2787
#, c-format
msgid "invalid config file %s"
msgstr ""
-#: config.c:2775 config.c:3028
+#: config.c:2800 config.c:3053
#, c-format
msgid "fstat on %s failed"
msgstr ""
-#: config.c:2786
+#: config.c:2811
#, c-format
msgid "unable to mmap '%s'"
msgstr ""
-#: config.c:2795 config.c:3033
+#: config.c:2820 config.c:3058
#, c-format
msgid "chmod on %s failed"
msgstr ""
-#: config.c:2880 config.c:3130
+#: config.c:2905 config.c:3155
#, c-format
msgid "could not write config file %s"
msgstr ""
-#: config.c:2914
+#: config.c:2939
#, c-format
msgid "could not set '%s' to '%s'"
msgstr ""
-#: config.c:2916 builtin/remote.c:781
+#: config.c:2941 builtin/remote.c:782
#, c-format
msgid "could not unset '%s'"
msgstr ""
-#: config.c:3006
+#: config.c:3031
#, c-format
msgid "invalid section name: %s"
msgstr ""
-#: config.c:3173
+#: config.c:3198
#, c-format
msgid "missing value for '%s'"
msgstr ""
msgid "repository on the other end cannot be shallow"
msgstr ""
-#: connect.c:310 fetch-pack.c:183 builtin/archive.c:63
-#, c-format
-msgid "remote error: %s"
-msgstr ""
-
-#: connect.c:316
+#: connect.c:313
msgid "invalid packet"
msgstr ""
-#: connect.c:336
+#: connect.c:333
#, c-format
msgid "protocol error: unexpected '%s'"
msgstr ""
-#: connect.c:444
+#: connect.c:441
#, c-format
msgid "invalid ls-refs response: %s"
msgstr ""
-#: connect.c:448
+#: connect.c:445
msgid "expected flush after ref listing"
msgstr ""
-#: connect.c:547
+#: connect.c:544
#, c-format
msgid "protocol '%s' is not supported"
msgstr ""
-#: connect.c:598
+#: connect.c:595
msgid "unable to set SO_KEEPALIVE on socket"
msgstr ""
-#: connect.c:638 connect.c:701
+#: connect.c:635 connect.c:698
#, c-format
msgid "Looking up %s ... "
msgstr ""
-#: connect.c:642
+#: connect.c:639
#, c-format
msgid "unable to look up %s (port %s) (%s)"
msgstr ""
#. TRANSLATORS: this is the end of "Looking up %s ... "
-#: connect.c:646 connect.c:717
+#: connect.c:643 connect.c:714
#, c-format
msgid ""
"done.\n"
"Connecting to %s (port %s) ... "
msgstr ""
-#: connect.c:668 connect.c:745
+#: connect.c:665 connect.c:742
#, c-format
msgid ""
"unable to connect to %s:\n"
msgstr ""
#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
-#: connect.c:674 connect.c:751
+#: connect.c:671 connect.c:748
msgid "done."
msgstr ""
-#: connect.c:705
+#: connect.c:702
#, c-format
msgid "unable to look up %s (%s)"
msgstr ""
-#: connect.c:711
+#: connect.c:708
#, c-format
msgid "unknown port %s"
msgstr ""
-#: connect.c:848 connect.c:1174
+#: connect.c:845 connect.c:1171
#, c-format
msgid "strange hostname '%s' blocked"
msgstr ""
-#: connect.c:850
+#: connect.c:847
#, c-format
msgid "strange port '%s' blocked"
msgstr ""
-#: connect.c:860
+#: connect.c:857
#, c-format
msgid "cannot start proxy %s"
msgstr ""
-#: connect.c:927
+#: connect.c:924
msgid "no path specified; see 'git help pull' for valid url syntax"
msgstr ""
-#: connect.c:1122
+#: connect.c:1119
msgid "ssh variant 'simple' does not support -4"
msgstr ""
-#: connect.c:1134
+#: connect.c:1131
msgid "ssh variant 'simple' does not support -6"
msgstr ""
-#: connect.c:1151
+#: connect.c:1148
msgid "ssh variant 'simple' does not support setting port"
msgstr ""
-#: connect.c:1262
+#: connect.c:1259
#, c-format
msgid "strange pathname '%s' blocked"
msgstr ""
-#: connect.c:1307
+#: connect.c:1304
msgid "unable to fork"
msgstr ""
-#: connected.c:68 builtin/fsck.c:203 builtin/prune.c:146
+#: connected.c:68 builtin/fsck.c:221 builtin/prune.c:146
msgid "Checking connectivity"
msgstr ""
msgid "failed to close rev-list's stdin"
msgstr ""
-#: convert.c:194
+#: convert.c:193
#, c-format
msgid "illegal crlf_action %d"
msgstr ""
-#: convert.c:207
+#: convert.c:206
#, c-format
msgid "CRLF would be replaced by LF in %s"
msgstr ""
-#: convert.c:209
+#: convert.c:208
#, c-format
msgid ""
"CRLF will be replaced by LF in %s.\n"
"The file will have its original line endings in your working directory"
msgstr ""
-#: convert.c:217
+#: convert.c:216
#, c-format
msgid "LF would be replaced by CRLF in %s"
msgstr ""
-#: convert.c:219
+#: convert.c:218
#, c-format
msgid ""
"LF will be replaced by CRLF in %s.\n"
"The file will have its original line endings in your working directory"
msgstr ""
-#: convert.c:280
+#: convert.c:279
#, c-format
msgid "BOM is prohibited in '%s' if encoded as %s"
msgstr ""
-#: convert.c:287
+#: convert.c:286
#, c-format
msgid ""
"The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-"
"tree-encoding."
msgstr ""
-#: convert.c:305
+#: convert.c:304
#, c-format
msgid "BOM is required in '%s' if encoded as %s"
msgstr ""
-#: convert.c:307
+#: convert.c:306
#, c-format
msgid ""
"The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-"
"%sLE (depending on the byte order) as working-tree-encoding."
msgstr ""
-#: convert.c:425 convert.c:496
+#: convert.c:424 convert.c:495
#, c-format
msgid "failed to encode '%s' from %s to %s"
msgstr ""
-#: convert.c:468
+#: convert.c:467
#, c-format
msgid "encoding '%s' from %s to %s and back is not the same"
msgstr ""
-#: convert.c:674
+#: convert.c:673
#, c-format
msgid "cannot fork to run external filter '%s'"
msgstr ""
-#: convert.c:694
+#: convert.c:693
#, c-format
msgid "cannot feed the input to external filter '%s'"
msgstr ""
-#: convert.c:701
+#: convert.c:700
#, c-format
msgid "external filter '%s' failed %d"
msgstr ""
-#: convert.c:736 convert.c:739
+#: convert.c:735 convert.c:738
#, c-format
msgid "read from external filter '%s' failed"
msgstr ""
-#: convert.c:742 convert.c:796
+#: convert.c:741 convert.c:796
#, c-format
msgid "external filter '%s' failed"
msgstr ""
msgid "true/false are no valid working-tree-encodings"
msgstr ""
-#: convert.c:1402 convert.c:1436
+#: convert.c:1398 convert.c:1432
#, c-format
msgid "%s: clean filter '%s' failed"
msgstr ""
-#: convert.c:1480
+#: convert.c:1476
#, c-format
msgid "%s: smudge filter %s failed"
msgstr ""
-#: date.c:116
+#: date.c:137
msgid "in the future"
msgstr ""
-#: date.c:122
+#: date.c:143
#, c-format
msgid "%<PRIuMAX> second ago"
msgid_plural "%<PRIuMAX> seconds ago"
msgstr[0] ""
msgstr[1] ""
-#: date.c:129
+#: date.c:150
#, c-format
msgid "%<PRIuMAX> minute ago"
msgid_plural "%<PRIuMAX> minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: date.c:136
+#: date.c:157
#, c-format
msgid "%<PRIuMAX> hour ago"
msgid_plural "%<PRIuMAX> hours ago"
msgstr[0] ""
msgstr[1] ""
-#: date.c:143
+#: date.c:164
#, c-format
msgid "%<PRIuMAX> day ago"
msgid_plural "%<PRIuMAX> days ago"
msgstr[0] ""
msgstr[1] ""
-#: date.c:149
+#: date.c:170
#, c-format
msgid "%<PRIuMAX> week ago"
msgid_plural "%<PRIuMAX> weeks ago"
msgstr[0] ""
msgstr[1] ""
-#: date.c:156
+#: date.c:177
#, c-format
msgid "%<PRIuMAX> month ago"
msgid_plural "%<PRIuMAX> months ago"
msgstr[0] ""
msgstr[1] ""
-#: date.c:167
+#: date.c:188
#, c-format
msgid "%<PRIuMAX> year"
msgid_plural "%<PRIuMAX> years"
msgstr[1] ""
#. TRANSLATORS: "%s" is "<n> years"
-#: date.c:170
+#: date.c:191
#, c-format
msgid "%s, %<PRIuMAX> month ago"
msgid_plural "%s, %<PRIuMAX> months ago"
msgstr[0] ""
msgstr[1] ""
-#: date.c:175 date.c:180
+#: date.c:196 date.c:201
#, c-format
msgid "%<PRIuMAX> year ago"
msgid_plural "%<PRIuMAX> years ago"
msgstr[0] ""
msgstr[1] ""
+#: delta-islands.c:272
+msgid "Propagating island marks"
+msgstr ""
+
+#: delta-islands.c:290
+#, c-format
+msgid "bad tree object %s"
+msgstr ""
+
+#: delta-islands.c:334
+#, c-format
+msgid "failed to load island regex for '%s': %s"
+msgstr ""
+
+#: delta-islands.c:390
+#, c-format
+msgid "island regex from config has too many capture groups (max=%d)"
+msgstr ""
+
+#: delta-islands.c:466
+#, c-format
+msgid "Marked %d islands, done.\n"
+msgstr ""
+
#: diffcore-order.c:24
#, c-format
msgid "failed to read orderfile '%s'"
msgstr ""
-#: diffcore-rename.c:536
+#: diffcore-rename.c:544
msgid "Performing inexact rename detection"
msgstr ""
"'dimmed-zebra', 'plain'"
msgstr ""
-#: diff.c:316
+#: diff.c:319
#, c-format
-msgid "ignoring unknown color-moved-ws mode '%s'"
+msgid ""
+"unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
+"'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-change'"
msgstr ""
-#: diff.c:323
+#: diff.c:327
msgid ""
-"color-moved-ws: allow-indentation-change cannot be combined with other white "
-"space modes"
+"color-moved-ws: allow-indentation-change cannot be combined with other "
+"whitespace modes"
msgstr ""
-#: diff.c:394
+#: diff.c:400
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr ""
-#: diff.c:454
+#: diff.c:460
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
"%s"
msgstr ""
-#: diff.c:4096
+#: diff.c:4211
#, c-format
msgid "external diff died, stopping at %s"
msgstr ""
-#: diff.c:4427
+#: diff.c:4553
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
msgstr ""
-#: diff.c:4430
+#: diff.c:4556
msgid "-G, -S and --find-object are mutually exclusive"
msgstr ""
-#: diff.c:4508
+#: diff.c:4634
msgid "--follow requires exactly one pathspec"
msgstr ""
-#: diff.c:4674
+#: diff.c:4800
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
"%s"
msgstr ""
-#: diff.c:4688
+#: diff.c:4814
#, c-format
msgid "Failed to parse --submodule option parameter: '%s'"
msgstr ""
-#: diff.c:5766
+#: diff.c:5900
msgid "inexact rename detection was skipped due to too many files."
msgstr ""
-#: diff.c:5769
+#: diff.c:5903
msgid "only found copies from modified paths due to too many files."
msgstr ""
-#: diff.c:5772
+#: diff.c:5906
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
msgstr ""
-#: dir.c:569
+#: dir.c:538
#, c-format
msgid "pathspec '%s' did not match any file(s) known to git"
msgstr ""
-#: dir.c:958
+#: dir.c:927
#, c-format
msgid "cannot use %s as an exclude file"
msgstr ""
-#: dir.c:1873
+#: dir.c:1842
#, c-format
msgid "could not open directory '%s'"
msgstr ""
-#: dir.c:2115
+#: dir.c:2084
msgid "failed to get kernel name and information"
msgstr ""
-#: dir.c:2239
+#: dir.c:2208
msgid "untracked cache is disabled on this system or location"
msgstr ""
-#: dir.c:3037
+#: dir.c:3009
#, c-format
msgid "index file corrupt in repo %s"
msgstr ""
-#: dir.c:3082 dir.c:3087
+#: dir.c:3054 dir.c:3059
#, c-format
msgid "could not create directories for %s"
msgstr ""
-#: dir.c:3116
+#: dir.c:3088
#, c-format
msgid "could not migrate git directory from '%s' to '%s'"
msgstr ""
-#: editor.c:61
+#: editor.c:73
#, c-format
msgid "hint: Waiting for your editor to close the file...%c"
msgstr ""
msgid "Filtering content"
msgstr ""
-#: entry.c:437
+#: entry.c:465
#, c-format
msgid "could not stat file '%s'"
msgstr ""
msgid "Remote with no URL"
msgstr ""
-#: fetch-pack.c:152
+#: fetch-pack.c:151
msgid "git fetch-pack: expected shallow list"
msgstr ""
-#: fetch-pack.c:164
+#: fetch-pack.c:154
+msgid "git fetch-pack: expected a flush packet after shallow list"
+msgstr ""
+
+#: fetch-pack.c:165
msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
msgstr ""
-#: fetch-pack.c:184
+#: fetch-pack.c:185
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr ""
-#: fetch-pack.c:254
+#: fetch-pack.c:256
msgid "--stateless-rpc requires multi_ack_detailed"
msgstr ""
-#: fetch-pack.c:342 fetch-pack.c:1257
+#: fetch-pack.c:358 fetch-pack.c:1264
#, c-format
msgid "invalid shallow line: %s"
msgstr ""
-#: fetch-pack.c:348 fetch-pack.c:1263
+#: fetch-pack.c:364 fetch-pack.c:1271
#, c-format
msgid "invalid unshallow line: %s"
msgstr ""
-#: fetch-pack.c:350 fetch-pack.c:1265
+#: fetch-pack.c:366 fetch-pack.c:1273
#, c-format
msgid "object not found: %s"
msgstr ""
-#: fetch-pack.c:353 fetch-pack.c:1268
+#: fetch-pack.c:369 fetch-pack.c:1276
#, c-format
msgid "error in object: %s"
msgstr ""
-#: fetch-pack.c:355 fetch-pack.c:1270
+#: fetch-pack.c:371 fetch-pack.c:1278
#, c-format
msgid "no shallow found: %s"
msgstr ""
-#: fetch-pack.c:358 fetch-pack.c:1273
+#: fetch-pack.c:374 fetch-pack.c:1282
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr ""
-#: fetch-pack.c:399
+#: fetch-pack.c:415
#, c-format
msgid "got %s %d %s"
msgstr ""
-#: fetch-pack.c:416
+#: fetch-pack.c:432
#, c-format
msgid "invalid commit %s"
msgstr ""
-#: fetch-pack.c:447
+#: fetch-pack.c:463
msgid "giving up"
msgstr ""
-#: fetch-pack.c:459 progress.c:229
+#: fetch-pack.c:475 progress.c:229
msgid "done"
msgstr ""
-#: fetch-pack.c:471
+#: fetch-pack.c:487
#, c-format
msgid "got %s (%d) %s"
msgstr ""
-#: fetch-pack.c:517
+#: fetch-pack.c:533
#, c-format
msgid "Marking %s as complete"
msgstr ""
-#: fetch-pack.c:764
+#: fetch-pack.c:740
#, c-format
msgid "already have %s (%s)"
msgstr ""
-#: fetch-pack.c:803
+#: fetch-pack.c:779
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr ""
-#: fetch-pack.c:811
+#: fetch-pack.c:787
msgid "protocol error: bad pack header"
msgstr ""
-#: fetch-pack.c:879
+#: fetch-pack.c:855
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr ""
-#: fetch-pack.c:895
+#: fetch-pack.c:871
#, c-format
msgid "%s failed"
msgstr ""
-#: fetch-pack.c:897
+#: fetch-pack.c:873
msgid "error in sideband demultiplexer"
msgstr ""
-#: fetch-pack.c:926
+#: fetch-pack.c:902
msgid "Server does not support shallow clients"
msgstr ""
-#: fetch-pack.c:930
+#: fetch-pack.c:906
msgid "Server supports multi_ack_detailed"
msgstr ""
-#: fetch-pack.c:933
+#: fetch-pack.c:909
msgid "Server supports no-done"
msgstr ""
-#: fetch-pack.c:939
+#: fetch-pack.c:915
msgid "Server supports multi_ack"
msgstr ""
-#: fetch-pack.c:943
+#: fetch-pack.c:919
msgid "Server supports side-band-64k"
msgstr ""
-#: fetch-pack.c:947
+#: fetch-pack.c:923
msgid "Server supports side-band"
msgstr ""
-#: fetch-pack.c:951
+#: fetch-pack.c:927
msgid "Server supports allow-tip-sha1-in-want"
msgstr ""
-#: fetch-pack.c:955
+#: fetch-pack.c:931
msgid "Server supports allow-reachable-sha1-in-want"
msgstr ""
-#: fetch-pack.c:965
+#: fetch-pack.c:941
msgid "Server supports ofs-delta"
msgstr ""
-#: fetch-pack.c:971 fetch-pack.c:1150
+#: fetch-pack.c:947 fetch-pack.c:1140
msgid "Server supports filter"
msgstr ""
-#: fetch-pack.c:979
+#: fetch-pack.c:955
#, c-format
msgid "Server version is %.*s"
msgstr ""
-#: fetch-pack.c:985
+#: fetch-pack.c:961
msgid "Server does not support --shallow-since"
msgstr ""
-#: fetch-pack.c:989
+#: fetch-pack.c:965
msgid "Server does not support --shallow-exclude"
msgstr ""
-#: fetch-pack.c:991
+#: fetch-pack.c:967
msgid "Server does not support --deepen"
msgstr ""
-#: fetch-pack.c:1004
+#: fetch-pack.c:984
msgid "no common commits"
msgstr ""
-#: fetch-pack.c:1016 fetch-pack.c:1393
+#: fetch-pack.c:996 fetch-pack.c:1419
msgid "git fetch-pack: fetch failed."
msgstr ""
-#: fetch-pack.c:1145
+#: fetch-pack.c:1134
msgid "Server does not support shallow requests"
msgstr ""
-#: fetch-pack.c:1191
+#: fetch-pack.c:1184
#, c-format
msgid "error reading section header '%s'"
msgstr ""
-#: fetch-pack.c:1197
+#: fetch-pack.c:1190
#, c-format
msgid "expected '%s', received '%s'"
msgstr ""
-#: fetch-pack.c:1236
+#: fetch-pack.c:1229
#, c-format
msgid "unexpected acknowledgment line: '%s'"
msgstr ""
-#: fetch-pack.c:1241
+#: fetch-pack.c:1234
#, c-format
msgid "error processing acks: %d"
msgstr ""
-#: fetch-pack.c:1278
+#: fetch-pack.c:1244
+msgid "expected packfile to be sent after 'ready'"
+msgstr ""
+
+#: fetch-pack.c:1246
+msgid "expected no other sections to be sent after no 'ready'"
+msgstr ""
+
+#: fetch-pack.c:1287
#, c-format
msgid "error processing shallow info: %d"
msgstr ""
-#: fetch-pack.c:1294
+#: fetch-pack.c:1308
#, c-format
msgid "expected wanted-ref, got '%s'"
msgstr ""
-#: fetch-pack.c:1304
+#: fetch-pack.c:1318
#, c-format
msgid "unexpected wanted-ref: '%s'"
msgstr ""
-#: fetch-pack.c:1308
+#: fetch-pack.c:1322
#, c-format
msgid "error processing wanted refs: %d"
msgstr ""
-#: fetch-pack.c:1603
+#: fetch-pack.c:1646
msgid "no matching remote head"
msgstr ""
-#: fetch-pack.c:1621 builtin/clone.c:664
+#: fetch-pack.c:1664 builtin/clone.c:671
msgid "remote did not send all necessary objects"
msgstr ""
-#: fetch-pack.c:1647
+#: fetch-pack.c:1690
#, c-format
msgid "no such remote ref %s"
msgstr ""
-#: fetch-pack.c:1650
+#: fetch-pack.c:1693
#, c-format
msgid "Server does not allow request for unadvertised object %s"
msgstr ""
-#: gpg-interface.c:253
+#: gpg-interface.c:318
msgid "gpg failed to sign the data"
msgstr ""
-#: gpg-interface.c:279
+#: gpg-interface.c:344
msgid "could not create temporary file"
msgstr ""
-#: gpg-interface.c:282
+#: gpg-interface.c:347
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr ""
msgid "ignore invalid color '%.*s' in log.graphColors"
msgstr ""
-#: grep.c:2115
+#: grep.c:2113
#, c-format
msgid "'%s': unable to read %s"
msgstr ""
-#: grep.c:2132 setup.c:164 builtin/clone.c:410 builtin/diff.c:81
-#: builtin/rm.c:134
+#: grep.c:2130 setup.c:164 builtin/clone.c:411 builtin/diff.c:82
+#: builtin/rm.c:135
#, c-format
msgid "failed to stat '%s'"
msgstr ""
-#: grep.c:2143
+#: grep.c:2141
#, c-format
msgid "'%s': short read"
msgstr ""
msgid "Low-level Commands / Internal Helpers"
msgstr ""
-#: help.c:293
+#: help.c:298
#, c-format
msgid "available git commands in '%s'"
msgstr ""
-#: help.c:300
+#: help.c:305
msgid "git commands available from elsewhere on your $PATH"
msgstr ""
-#: help.c:309
+#: help.c:314
msgid "These are common Git commands used in various situations:"
msgstr ""
-#: help.c:358 git.c:90
+#: help.c:363 git.c:90
#, c-format
msgid "unsupported command listing type '%s'"
msgstr ""
-#: help.c:405
+#: help.c:410
msgid "The common Git guides are:"
msgstr ""
-#: help.c:552
+#: help.c:519
+msgid "See 'git help <command>' to read about a specific subcommand"
+msgstr ""
+
+#: help.c:524
+msgid "External commands"
+msgstr ""
+
+#: help.c:539
+msgid "Command aliases"
+msgstr ""
+
+#: help.c:603
#, c-format
msgid ""
"'%s' appears to be a git command, but we were not\n"
"able to execute it. Maybe git-%s is broken?"
msgstr ""
-#: help.c:611
+#: help.c:662
msgid "Uh oh. Your system reports no Git commands at all."
msgstr ""
-#: help.c:633
+#: help.c:684
#, c-format
msgid "WARNING: You called a Git command named '%s', which does not exist."
msgstr ""
-#: help.c:638
+#: help.c:689
#, c-format
msgid "Continuing under the assumption that you meant '%s'."
msgstr ""
-#: help.c:643
+#: help.c:694
#, c-format
msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
msgstr ""
-#: help.c:651
+#: help.c:702
#, c-format
msgid "git: '%s' is not a git command. See 'git --help'."
msgstr ""
-#: help.c:655
+#: help.c:706
msgid ""
"\n"
"The most similar command is"
msgstr[0] ""
msgstr[1] ""
-#: help.c:670
+#: help.c:721
msgid "git version [<options>]"
msgstr ""
-#: help.c:738
+#: help.c:789
#, c-format
msgid "%s: %s - %s"
msgstr ""
-#: help.c:742
+#: help.c:793
msgid ""
"\n"
"Did you mean this?"
msgstr[0] ""
msgstr[1] ""
-#: ident.c:342
+#: ident.c:345
msgid ""
"\n"
"*** Please tell me who you are.\n"
"\n"
msgstr ""
-#: ident.c:366
+#: ident.c:369
msgid "no email was given and auto-detection is disabled"
msgstr ""
-#: ident.c:371
+#: ident.c:374
#, c-format
msgid "unable to auto-detect email address (got '%s')"
msgstr ""
-#: ident.c:381
+#: ident.c:384
msgid "no name was given and auto-detection is disabled"
msgstr ""
-#: ident.c:387
+#: ident.c:390
#, c-format
msgid "unable to auto-detect name (got '%s')"
msgstr ""
-#: ident.c:395
+#: ident.c:398
#, c-format
msgid "empty ident name (for <%s>) not allowed"
msgstr ""
-#: ident.c:401
+#: ident.c:404
#, c-format
msgid "name consists only of disallowed characters: %s"
msgstr ""
-#: ident.c:416 builtin/commit.c:600
+#: ident.c:419 builtin/commit.c:608
#, c-format
msgid "invalid date format: %s"
msgstr ""
msgid "multiple filter-specs cannot be combined"
msgstr ""
-#: list-objects-filter-options.c:126
+#: list-objects-filter-options.c:58
+msgid "expected 'tree:<depth>'"
+msgstr ""
+
+#: list-objects-filter-options.c:152
msgid "cannot change partial clone promisor remote"
msgstr ""
msgid "Unable to create '%s.lock': %s"
msgstr ""
-#: merge.c:40
+#: merge.c:41
msgid "failed to read the cache"
msgstr ""
-#: merge.c:105 builtin/am.c:1946 builtin/am.c:1980 builtin/checkout.c:380
-#: builtin/checkout.c:608 builtin/clone.c:763
+#: merge.c:107 rerere.c:720 builtin/am.c:1884 builtin/am.c:1918
+#: builtin/checkout.c:416 builtin/checkout.c:745 builtin/clone.c:771
msgid "unable to write new index file"
msgstr ""
-#: merge-recursive.c:303
+#: merge-recursive.c:332
msgid "(bad commit)\n"
msgstr ""
-#: merge-recursive.c:325
+#: merge-recursive.c:355
#, c-format
msgid "add_cacheinfo failed for path '%s'; merge aborting."
msgstr ""
-#: merge-recursive.c:333
+#: merge-recursive.c:364
#, c-format
msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
msgstr ""
-#: merge-recursive.c:415
+#: merge-recursive.c:447
msgid "error building trees"
msgstr ""
-#: merge-recursive.c:886
+#: merge-recursive.c:902
#, c-format
msgid "failed to create path '%s'%s"
msgstr ""
-#: merge-recursive.c:897
+#: merge-recursive.c:913
#, c-format
msgid "Removing %s to make room for subdirectory\n"
msgstr ""
-#: merge-recursive.c:911 merge-recursive.c:930
+#: merge-recursive.c:927 merge-recursive.c:946
msgid ": perhaps a D/F conflict?"
msgstr ""
-#: merge-recursive.c:920
+#: merge-recursive.c:936
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr ""
-#: merge-recursive.c:962 builtin/cat-file.c:39
+#: merge-recursive.c:978 builtin/cat-file.c:40
#, c-format
msgid "cannot read object %s '%s'"
msgstr ""
-#: merge-recursive.c:964
+#: merge-recursive.c:980
#, c-format
msgid "blob expected for %s '%s'"
msgstr ""
-#: merge-recursive.c:988
+#: merge-recursive.c:1004
#, c-format
msgid "failed to open '%s': %s"
msgstr ""
-#: merge-recursive.c:999
+#: merge-recursive.c:1015
#, c-format
msgid "failed to symlink '%s': %s"
msgstr ""
-#: merge-recursive.c:1004
+#: merge-recursive.c:1020
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr ""
-#: merge-recursive.c:1191
+#: merge-recursive.c:1211
#, c-format
msgid "Failed to merge submodule %s (not checked out)"
msgstr ""
-#: merge-recursive.c:1198
+#: merge-recursive.c:1218
#, c-format
msgid "Failed to merge submodule %s (commits not present)"
msgstr ""
-#: merge-recursive.c:1205
+#: merge-recursive.c:1225
#, c-format
msgid "Failed to merge submodule %s (commits don't follow merge-base)"
msgstr ""
-#: merge-recursive.c:1213 merge-recursive.c:1225
+#: merge-recursive.c:1233 merge-recursive.c:1245
#, c-format
msgid "Fast-forwarding submodule %s to the following commit:"
msgstr ""
-#: merge-recursive.c:1216 merge-recursive.c:1228
+#: merge-recursive.c:1236 merge-recursive.c:1248
#, c-format
msgid "Fast-forwarding submodule %s"
msgstr ""
-#: merge-recursive.c:1250
+#: merge-recursive.c:1271
#, c-format
msgid "Failed to merge submodule %s (merge following commits not found)"
msgstr ""
-#: merge-recursive.c:1254
+#: merge-recursive.c:1275
#, c-format
msgid "Failed to merge submodule %s (not fast-forward)"
msgstr ""
-#: merge-recursive.c:1255
+#: merge-recursive.c:1276
msgid "Found a possible merge resolution for the submodule:\n"
msgstr ""
-#: merge-recursive.c:1258
+#: merge-recursive.c:1279
#, 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:1267
+#: merge-recursive.c:1288
#, c-format
msgid "Failed to merge submodule %s (multiple merges found)"
msgstr ""
-#: merge-recursive.c:1326
+#: merge-recursive.c:1361
msgid "Failed to execute internal merge"
msgstr ""
-#: merge-recursive.c:1331
+#: merge-recursive.c:1366
#, c-format
msgid "Unable to add %s to database"
msgstr ""
-#: merge-recursive.c:1363
+#: merge-recursive.c:1398
#, c-format
msgid "Auto-merging %s"
msgstr ""
-#: merge-recursive.c:1434
+#: merge-recursive.c:1419
#, c-format
msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
msgstr ""
-#: merge-recursive.c:1501
+#: merge-recursive.c:1486
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
"in tree."
msgstr ""
-#: merge-recursive.c:1506
+#: merge-recursive.c:1491
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
"left in tree."
msgstr ""
-#: merge-recursive.c:1513
+#: merge-recursive.c:1498
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
"in tree at %s."
msgstr ""
-#: merge-recursive.c:1518
+#: merge-recursive.c:1503
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
"left in tree at %s."
msgstr ""
-#: merge-recursive.c:1552
+#: merge-recursive.c:1537
msgid "rename"
msgstr ""
-#: merge-recursive.c:1552
+#: merge-recursive.c:1537
msgid "renamed"
msgstr ""
-#: merge-recursive.c:1606 merge-recursive.c:1762 merge-recursive.c:2394
-#: merge-recursive.c:3129
+#: merge-recursive.c:1633 merge-recursive.c:2481 merge-recursive.c:3213
#, c-format
msgid "Refusing to lose dirty file at %s"
msgstr ""
-#: merge-recursive.c:1620
+#: merge-recursive.c:1643
+#, c-format
+msgid "Refusing to lose untracked file at %s, even though it's in the way."
+msgstr ""
+
+#: merge-recursive.c:1706
+#, c-format
+msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
+msgstr ""
+
+#: merge-recursive.c:1734
#, c-format
msgid "%s is a directory in %s adding as %s instead"
msgstr ""
-#: merge-recursive.c:1625
+#: merge-recursive.c:1739
#, c-format
msgid "Refusing to lose untracked file at %s; adding as %s instead"
msgstr ""
-#: merge-recursive.c:1651
+#: merge-recursive.c:1759
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
"\"->\"%s\" in \"%s\"%s"
msgstr ""
-#: merge-recursive.c:1656
+#: merge-recursive.c:1764
msgid " (left unresolved)"
msgstr ""
-#: merge-recursive.c:1720
+#: merge-recursive.c:1868
#, c-format
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr ""
-#: merge-recursive.c:1759
-#, c-format
-msgid "Renaming %s to %s and %s to %s instead"
-msgstr ""
-
-#: 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:1977
+#: merge-recursive.c:2064
#, c-format
msgid ""
"CONFLICT (directory rename split): Unclear where to place %s because "
"getting a majority of the files."
msgstr ""
-#: merge-recursive.c:2009
+#: merge-recursive.c:2096
#, 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:2019
+#: merge-recursive.c:2106
#, 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:2111
+#: merge-recursive.c:2198
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
">%s in %s"
msgstr ""
-#: merge-recursive.c:2356
+#: merge-recursive.c:2443
#, c-format
msgid ""
"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
"renamed."
msgstr ""
-#: merge-recursive.c:2762
-#, c-format
-msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
-msgstr ""
-
-#: merge-recursive.c:2777
-#, c-format
-msgid "Adding merged %s"
-msgstr ""
-
-#: merge-recursive.c:2784 merge-recursive.c:3132
-#, c-format
-msgid "Adding as %s instead"
-msgstr ""
-
-#: merge-recursive.c:2941
+#: merge-recursive.c:3022
#, c-format
msgid "cannot read object %s"
msgstr ""
-#: merge-recursive.c:2944
+#: merge-recursive.c:3025
#, c-format
msgid "object %s is not a blob"
msgstr ""
-#: merge-recursive.c:3013
+#: merge-recursive.c:3094
msgid "modify"
msgstr ""
-#: merge-recursive.c:3013
+#: merge-recursive.c:3094
msgid "modified"
msgstr ""
-#: merge-recursive.c:3024
+#: merge-recursive.c:3105
msgid "content"
msgstr ""
-#: merge-recursive.c:3031
+#: merge-recursive.c:3112
msgid "add/add"
msgstr ""
-#: merge-recursive.c:3076
+#: merge-recursive.c:3160
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr ""
-#: merge-recursive.c:3098 git-submodule.sh:865
+#: merge-recursive.c:3182 git-submodule.sh:861
msgid "submodule"
msgstr ""
-#: merge-recursive.c:3099
+#: merge-recursive.c:3183
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr ""
-#: merge-recursive.c:3221
+#: merge-recursive.c:3216
+#, c-format
+msgid "Adding as %s instead"
+msgstr ""
+
+#: merge-recursive.c:3319
#, c-format
msgid "Removing %s"
msgstr ""
-#: merge-recursive.c:3247
+#: merge-recursive.c:3345
msgid "file/directory"
msgstr ""
-#: merge-recursive.c:3253
+#: merge-recursive.c:3351
msgid "directory/file"
msgstr ""
-#: merge-recursive.c:3260
+#: merge-recursive.c:3358
#, c-format
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
msgstr ""
-#: merge-recursive.c:3269
+#: merge-recursive.c:3367
#, c-format
msgid "Adding %s"
msgstr ""
-#: merge-recursive.c:3303
+#: merge-recursive.c:3376
+#, c-format
+msgid "CONFLICT (add/add): Merge conflict in %s"
+msgstr ""
+
+#: merge-recursive.c:3417
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
" %s"
msgstr ""
-#: merge-recursive.c:3314
+#: merge-recursive.c:3428
msgid "Already up to date!"
msgstr ""
-#: merge-recursive.c:3323
+#: merge-recursive.c:3437
#, c-format
msgid "merging of trees %s and %s failed"
msgstr ""
-#: merge-recursive.c:3422
+#: merge-recursive.c:3536
msgid "Merging:"
msgstr ""
-#: merge-recursive.c:3435
+#: merge-recursive.c:3549
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] ""
msgstr[1] ""
-#: merge-recursive.c:3474
+#: merge-recursive.c:3588
msgid "merge returned no commit"
msgstr ""
-#: merge-recursive.c:3540
+#: merge-recursive.c:3654
#, c-format
msgid "Could not parse object '%s'"
msgstr ""
-#: merge-recursive.c:3556 builtin/merge.c:689 builtin/merge.c:846
+#: merge-recursive.c:3670 builtin/merge.c:692 builtin/merge.c:850
msgid "Unable to write index."
msgstr ""
-#: notes-merge.c:274
+#: midx.c:65
#, c-format
-msgid ""
-"You have not concluded your previous notes merge (%s exists).\n"
-"Please, use 'git notes merge --commit' or 'git notes merge --abort' to "
-"commit/abort the previous merge before you start a new notes merge."
+msgid "multi-pack-index file %s is too small"
msgstr ""
-#: notes-merge.c:281
+#: midx.c:81
#, c-format
-msgid "You have not concluded your notes merge (%s exists)."
+msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
msgstr ""
-#: notes-utils.c:45
-msgid "Cannot commit uninitialized/unreferenced notes tree"
+#: midx.c:86
+#, c-format
+msgid "multi-pack-index version %d not recognized"
msgstr ""
-#: notes-utils.c:104
+#: midx.c:91
#, c-format
-msgid "Bad notes.rewriteMode value: '%s'"
+msgid "hash version %u does not match"
msgstr ""
-#: notes-utils.c:114
-#, c-format
-msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
+#: midx.c:105
+msgid "invalid chunk offset (too large)"
msgstr ""
-#. TRANSLATORS: The first %s is the name of
-#. the environment variable, the second %s is
-#. its value.
-#.
-#: notes-utils.c:144
-#, c-format
-msgid "Bad %s value: '%s'"
+#: midx.c:129
+msgid "terminating multi-pack-index chunk id appears earlier than expected"
msgstr ""
-#: object.c:54
-#, c-format
-msgid "invalid object type \"%s\""
+#: midx.c:142
+msgid "multi-pack-index missing required pack-name chunk"
msgstr ""
-#: object.c:173
-#, c-format
-msgid "object %s is a %s, not a %s"
+#: midx.c:144
+msgid "multi-pack-index missing required OID fanout chunk"
msgstr ""
-#: object.c:233
-#, c-format
-msgid "object %s has unknown type id %d"
+#: midx.c:146
+msgid "multi-pack-index missing required OID lookup chunk"
msgstr ""
-#: object.c:246
+#: midx.c:148
+msgid "multi-pack-index missing required object offsets chunk"
+msgstr ""
+
+#: midx.c:162
#, c-format
-msgid "unable to parse object: %s"
+msgid "multi-pack-index pack names out of order: '%s' before '%s'"
msgstr ""
-#: object.c:266 object.c:277
+#: midx.c:205
#, c-format
-msgid "sha1 mismatch %s"
+msgid "bad pack-int-id: %u (%u total packs)"
msgstr ""
-#: packfile.c:563
-msgid "offset before end of packfile (broken .idx?)"
+#: midx.c:246
+msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
msgstr ""
-#: packfile.c:1745
+#: midx.c:271
+msgid "error preparing packfile from multi-pack-index"
+msgstr ""
+
+#: midx.c:407
#, c-format
-msgid "offset before start of pack index for %s (corrupt index?)"
+msgid "failed to add packfile '%s'"
msgstr ""
-#: packfile.c:1749
+#: midx.c:413
#, c-format
-msgid "offset beyond end of pack index for %s (truncated index?)"
+msgid "failed to open pack-index '%s'"
msgstr ""
-#: parse-options.c:672
-msgid "..."
+#: midx.c:507
+#, c-format
+msgid "failed to locate object %d in packfile"
msgstr ""
-#: parse-options.c:691
+#: midx.c:943
#, c-format
-msgid "usage: %s"
+msgid "failed to clear multi-pack-index at %s"
msgstr ""
-#. TRANSLATORS: the colon here should align with the
-#. one in "usage: %s" translation.
-#.
-#: parse-options.c:697
+#: midx.c:981
#, c-format
-msgid " or: %s"
+msgid ""
+"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
msgstr ""
-#: parse-options.c:700
+#: midx.c:992
#, c-format
-msgid " %s"
+msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
msgstr ""
-#: parse-options.c:739
-msgid "-NUM"
+#: midx.c:996
+msgid "Verifying object offsets"
msgstr ""
-#: parse-options-cb.c:44
+#: midx.c:1004
#, c-format
-msgid "malformed expiration date '%s'"
+msgid "failed to load pack entry for oid[%d] = %s"
msgstr ""
-#: parse-options-cb.c:112
+#: midx.c:1010
#, c-format
-msgid "malformed object name '%s'"
+msgid "failed to load pack-index for packfile %s"
msgstr ""
-#: path.c:892
+#: midx.c:1019
#, c-format
-msgid "Could not make %s writable by group"
+msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
msgstr ""
-#: pathspec.c:129
-msgid "Escape character '\\' not allowed as last character in attr value"
+#: name-hash.c:531
+#, c-format
+msgid "unable to create lazy_dir thread: %s"
msgstr ""
-#: pathspec.c:147
-msgid "Only one 'attr:' specification is allowed."
+#: name-hash.c:553
+#, c-format
+msgid "unable to create lazy_name thread: %s"
msgstr ""
-#: pathspec.c:150
-msgid "attr spec must not be empty"
+#: name-hash.c:559
+#, c-format
+msgid "unable to join lazy_name thread: %s"
msgstr ""
-#: pathspec.c:193
+#: notes-merge.c:277
#, c-format
-msgid "invalid attribute name %s"
+msgid ""
+"You have not concluded your previous notes merge (%s exists).\n"
+"Please, use 'git notes merge --commit' or 'git notes merge --abort' to "
+"commit/abort the previous merge before you start a new notes merge."
msgstr ""
-#: pathspec.c:258
-msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
+#: notes-merge.c:284
+#, c-format
+msgid "You have not concluded your notes merge (%s exists)."
msgstr ""
-#: pathspec.c:265
-msgid ""
-"global 'literal' pathspec setting is incompatible with all other global "
-"pathspec settings"
+#: notes-utils.c:46
+msgid "Cannot commit uninitialized/unreferenced notes tree"
msgstr ""
-#: pathspec.c:305
-msgid "invalid parameter for pathspec magic 'prefix'"
+#: notes-utils.c:105
+#, c-format
+msgid "Bad notes.rewriteMode value: '%s'"
msgstr ""
-#: pathspec.c:326
+#: notes-utils.c:115
#, c-format
-msgid "Invalid pathspec magic '%.*s' in '%s'"
+msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
msgstr ""
-#: pathspec.c:331
+#. TRANSLATORS: The first %s is the name of
+#. the environment variable, the second %s is
+#. its value.
+#.
+#: notes-utils.c:145
#, c-format
-msgid "Missing ')' at the end of pathspec magic in '%s'"
+msgid "Bad %s value: '%s'"
msgstr ""
-#: pathspec.c:369
+#: object.c:54
#, c-format
-msgid "Unimplemented pathspec magic '%c' in '%s'"
+msgid "invalid object type \"%s\""
msgstr ""
-#: pathspec.c:428
+#: object.c:174
#, c-format
-msgid "%s: 'literal' and 'glob' are incompatible"
+msgid "object %s is a %s, not a %s"
msgstr ""
-#: pathspec.c:441
+#: object.c:234
#, c-format
-msgid "%s: '%s' is outside repository"
-msgstr ""
-
-#: pathspec.c:515
-#, c-format
-msgid "'%s' (mnemonic: '%c')"
+msgid "object %s has unknown type id %d"
msgstr ""
-#: pathspec.c:525
+#: object.c:247
#, c-format
-msgid "%s: pathspec magic not supported by this command: %s"
+msgid "unable to parse object: %s"
msgstr ""
-#: pathspec.c:592
+#: object.c:267 object.c:278
#, c-format
-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"
+msgid "hash mismatch %s"
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"
+#: packfile.c:607
+msgid "offset before end of packfile (broken .idx?)"
msgstr ""
-#: pkt-line.c:327
+#: packfile.c:1870
#, c-format
-msgid "protocol error: bad line length character: %.4s"
+msgid "offset before start of pack index for %s (corrupt index?)"
msgstr ""
-#: pkt-line.c:337 pkt-line.c:342
+#: packfile.c:1874
#, c-format
-msgid "protocol error: bad line length %d"
+msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr ""
-#: pretty.c:962
-msgid "unable to parse --pretty format"
+#: parse-options.c:35
+#, c-format
+msgid "%s requires a value"
msgstr ""
-#: range-diff.c:48
-msgid "could not start `log`"
+#: parse-options.c:69
+#, c-format
+msgid "%s is incompatible with %s"
msgstr ""
-#: range-diff.c:51
-msgid "could not read `log` output"
+#: parse-options.c:74
+#, c-format
+msgid "%s : incompatible with something else"
msgstr ""
-#: range-diff.c:66 sequencer.c:4540
+#: parse-options.c:88 parse-options.c:92 parse-options.c:260
#, c-format
-msgid "could not parse commit '%s'"
+msgid "%s takes no value"
msgstr ""
-#: range-diff.c:196
-msgid "failed to generate diff"
+#: parse-options.c:90
+#, c-format
+msgid "%s isn't available"
msgstr ""
-#: range-diff.c:421 range-diff.c:423
+#: parse-options.c:178
#, c-format
-msgid "could not parse log for '%s'"
+msgid "%s expects a numerical value"
msgstr ""
-#: read-cache.c:1579
+#: parse-options.c:194
#, c-format
-msgid ""
-"index.version set, but the value is invalid.\n"
-"Using version %i"
+msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
msgstr ""
-#: read-cache.c:1589
+#: parse-options.c:322
#, c-format
-msgid ""
-"GIT_INDEX_VERSION set, but the value is invalid.\n"
-"Using version %i"
+msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
msgstr ""
-#: read-cache.c:2580 sequencer.c:4503 wrapper.c:658 builtin/merge.c:1083
+#: parse-options.c:356 parse-options.c:364
#, c-format
-msgid "could not close '%s'"
+msgid "did you mean `--%s` (with two dashes ?)"
msgstr ""
-#: read-cache.c:2653 sequencer.c:2113 sequencer.c:3374
+#: parse-options.c:649
#, c-format
-msgid "could not stat '%s'"
+msgid "unknown option `%s'"
msgstr ""
-#: read-cache.c:2666
+#: parse-options.c:651
#, c-format
-msgid "unable to open git dir: %s"
+msgid "unknown switch `%c'"
msgstr ""
-#: read-cache.c:2678
+#: parse-options.c:653
#, c-format
-msgid "unable to unlink: %s"
+msgid "unknown non-ascii option in string: `%s'"
msgstr ""
-#: refs.c:192
-#, c-format
-msgid "%s does not point to a valid object!"
+#: parse-options.c:675
+msgid "..."
msgstr ""
-#: refs.c:579
+#: parse-options.c:694
#, c-format
-msgid "ignoring dangling symref %s"
+msgid "usage: %s"
msgstr ""
-#: refs.c:581 ref-filter.c:2067
+#. TRANSLATORS: the colon here should align with the
+#. one in "usage: %s" translation.
+#.
+#: parse-options.c:700
#, c-format
-msgid "ignoring broken ref %s"
+msgid " or: %s"
msgstr ""
-#: refs.c:685
+#: parse-options.c:703
#, c-format
-msgid "could not open '%s' for writing: %s"
+msgid " %s"
msgstr ""
-#: refs.c:695 refs.c:746
-#, c-format
-msgid "could not read ref '%s'"
+#: parse-options.c:742
+msgid "-NUM"
msgstr ""
-#: refs.c:701
+#: parse-options-cb.c:21
#, c-format
-msgid "ref '%s' already exists"
+msgid "option `%s' expects a numerical value"
msgstr ""
-#: refs.c:706
+#: parse-options-cb.c:38
#, c-format
-msgid "unexpected object ID when writing '%s'"
+msgid "malformed expiration date '%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
+#: parse-options-cb.c:51
#, c-format
-msgid "could not write to '%s'"
+msgid "option `%s' expects \"always\", \"auto\", or \"never\""
msgstr ""
-#: refs.c:741 sequencer.c:4499 sequencer.c:4558 wrapper.c:225 wrapper.c:395
-#: builtin/am.c:780
+#: parse-options-cb.c:110
#, c-format
-msgid "could not open '%s' for writing"
+msgid "malformed object name '%s'"
msgstr ""
-#: refs.c:748
+#: path.c:894
#, c-format
-msgid "unexpected object ID when deleting '%s'"
+msgid "Could not make %s writable by group"
msgstr ""
-#: refs.c:879
-#, c-format
-msgid "log for ref %s has gap after %s"
+#: pathspec.c:128
+msgid "Escape character '\\' not allowed as last character in attr value"
msgstr ""
-#: refs.c:885
-#, c-format
-msgid "log for ref %s unexpectedly ended on %s"
+#: pathspec.c:146
+msgid "Only one 'attr:' specification is allowed."
msgstr ""
-#: refs.c:943
-#, c-format
-msgid "log for %s is empty"
+#: pathspec.c:149
+msgid "attr spec must not be empty"
msgstr ""
-#: refs.c:1035
+#: pathspec.c:192
#, c-format
-msgid "refusing to update ref with bad name '%s'"
+msgid "invalid attribute name %s"
msgstr ""
-#: refs.c:1111
-#, c-format
-msgid "update_ref failed for ref '%s': %s"
+#: pathspec.c:257
+msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
msgstr ""
-#: refs.c:1853
-#, c-format
-msgid "multiple updates for ref '%s' not allowed"
+#: pathspec.c:264
+msgid ""
+"global 'literal' pathspec setting is incompatible with all other global "
+"pathspec settings"
msgstr ""
-#: refs.c:1885
-msgid "ref updates forbidden inside quarantine environment"
+#: pathspec.c:304
+msgid "invalid parameter for pathspec magic 'prefix'"
msgstr ""
-#: refs.c:1981 refs.c:2011
+#: pathspec.c:325
#, c-format
-msgid "'%s' exists; cannot create '%s'"
+msgid "Invalid pathspec magic '%.*s' in '%s'"
msgstr ""
-#: refs.c:1987 refs.c:2022
+#: pathspec.c:330
#, c-format
-msgid "cannot process '%s' and '%s' at the same time"
+msgid "Missing ')' at the end of pathspec magic in '%s'"
msgstr ""
-#: refs/files-backend.c:1191
+#: pathspec.c:368
#, c-format
-msgid "could not remove reference %s"
+msgid "Unimplemented pathspec magic '%c' in '%s'"
msgstr ""
-#: refs/files-backend.c:1205 refs/packed-backend.c:1532
-#: refs/packed-backend.c:1542
+#: pathspec.c:427
#, c-format
-msgid "could not delete reference %s: %s"
+msgid "%s: 'literal' and 'glob' are incompatible"
msgstr ""
-#: refs/files-backend.c:1208 refs/packed-backend.c:1545
+#: pathspec.c:440
#, c-format
-msgid "could not delete references: %s"
+msgid "%s: '%s' is outside repository"
msgstr ""
-#: refspec.c:137
+#: pathspec.c:514
#, c-format
-msgid "invalid refspec '%s'"
+msgid "'%s' (mnemonic: '%c')"
msgstr ""
-#: ref-filter.c:38 wt-status.c:1850
-msgid "gone"
+#: pathspec.c:524
+#, c-format
+msgid "%s: pathspec magic not supported by this command: %s"
msgstr ""
-#: ref-filter.c:39
+#: pathspec.c:591
#, c-format
-msgid "ahead %d"
+msgid "pathspec '%s' is beyond a symbolic link"
msgstr ""
-#: ref-filter.c:40
-#, c-format
-msgid "behind %d"
+#: pkt-line.c:104
+msgid "flush packet write failed"
msgstr ""
-#: ref-filter.c:41
-#, c-format
-msgid "ahead %d, behind %d"
+#: pkt-line.c:144 pkt-line.c:230
+msgid "protocol error: impossibly long line"
msgstr ""
-#: ref-filter.c:137
-#, c-format
-msgid "expected format: %%(color:<color>)"
+#: pkt-line.c:160 pkt-line.c:162
+msgid "packet write with format failed"
msgstr ""
-#: ref-filter.c:139
-#, c-format
-msgid "unrecognized color: %%(color:%s)"
+#: pkt-line.c:194
+msgid "packet write failed - data exceeds max packet size"
msgstr ""
-#: ref-filter.c:161
-#, c-format
-msgid "Integer value expected refname:lstrip=%s"
+#: pkt-line.c:201 pkt-line.c:208
+msgid "packet write failed"
msgstr ""
-#: ref-filter.c:165
-#, c-format
-msgid "Integer value expected refname:rstrip=%s"
+#: pkt-line.c:293
+msgid "read error"
msgstr ""
-#: ref-filter.c:167
-#, c-format
-msgid "unrecognized %%(%s) argument: %s"
+#: pkt-line.c:301
+msgid "the remote end hung up unexpectedly"
msgstr ""
-#: ref-filter.c:222
+#: pkt-line.c:329
#, c-format
-msgid "%%(objecttype) does not take arguments"
+msgid "protocol error: bad line length character: %.4s"
msgstr ""
-#: ref-filter.c:234
+#: pkt-line.c:339 pkt-line.c:344
#, c-format
-msgid "%%(objectsize) does not take arguments"
+msgid "protocol error: bad line length %d"
msgstr ""
-#: ref-filter.c:246
+#: pkt-line.c:353
#, c-format
-msgid "%%(body) does not take arguments"
+msgid "remote error: %s"
msgstr ""
-#: ref-filter.c:255
-#, c-format
-msgid "%%(subject) does not take arguments"
+#: preload-index.c:119
+msgid "Refreshing index"
msgstr ""
-#: ref-filter.c:275
+#: preload-index.c:138
#, c-format
-msgid "unknown %%(trailers) argument: %s"
+msgid "unable to create threaded lstat: %s"
msgstr ""
-#: ref-filter.c:304
-#, c-format
-msgid "positive value expected contents:lines=%s"
+#: pretty.c:963
+msgid "unable to parse --pretty format"
msgstr ""
-#: ref-filter.c:306
-#, c-format
-msgid "unrecognized %%(contents) argument: %s"
+#: range-diff.c:56
+msgid "could not start `log`"
msgstr ""
-#: ref-filter.c:321
-#, c-format
-msgid "positive value expected objectname:short=%s"
+#: range-diff.c:59
+msgid "could not read `log` output"
msgstr ""
-#: ref-filter.c:325
+#: range-diff.c:74 sequencer.c:4828
#, c-format
-msgid "unrecognized %%(objectname) argument: %s"
+msgid "could not parse commit '%s'"
msgstr ""
-#: ref-filter.c:355
-#, c-format
-msgid "expected format: %%(align:<width>,<position>)"
+#: range-diff.c:224
+msgid "failed to generate diff"
msgstr ""
-#: ref-filter.c:367
+#: range-diff.c:455 range-diff.c:457
#, c-format
-msgid "unrecognized position:%s"
+msgid "could not parse log for '%s'"
msgstr ""
-#: ref-filter.c:374
+#: read-cache.c:673
#, c-format
-msgid "unrecognized width:%s"
+msgid "will not add file alias '%s' ('%s' already exists in index)"
msgstr ""
-#: ref-filter.c:383
-#, c-format
-msgid "unrecognized %%(align) argument: %s"
+#: read-cache.c:689
+msgid "cannot create an empty blob in the object database"
msgstr ""
-#: ref-filter.c:391
+#: read-cache.c:710
#, c-format
-msgid "positive width expected with the %%(align) atom"
+msgid "%s: can only add regular files, symbolic links or git-directories"
msgstr ""
-#: ref-filter.c:409
+#: read-cache.c:765
#, c-format
-msgid "unrecognized %%(if) argument: %s"
+msgid "unable to index file '%s'"
msgstr ""
-#: ref-filter.c:505
+#: read-cache.c:784
#, c-format
-msgid "malformed field name: %.*s"
+msgid "unable to add '%s' to index"
msgstr ""
-#: ref-filter.c:532
+#: read-cache.c:795
#, c-format
-msgid "unknown field name: %.*s"
+msgid "unable to stat '%s'"
msgstr ""
-#: ref-filter.c:656
+#: read-cache.c:1304
#, c-format
-msgid "format: %%(if) atom used without a %%(then) atom"
+msgid "'%s' appears as both a file and as a directory"
msgstr ""
-#: ref-filter.c:719
-#, c-format
-msgid "format: %%(then) atom used without an %%(if) atom"
+#: read-cache.c:1489
+msgid "Refresh index"
msgstr ""
-#: ref-filter.c:721
+#: read-cache.c:1603
#, c-format
-msgid "format: %%(then) atom used more than once"
+msgid ""
+"index.version set, but the value is invalid.\n"
+"Using version %i"
msgstr ""
-#: ref-filter.c:723
+#: read-cache.c:1613
#, c-format
-msgid "format: %%(then) atom used after %%(else)"
+msgid ""
+"GIT_INDEX_VERSION set, but the value is invalid.\n"
+"Using version %i"
msgstr ""
-#: ref-filter.c:751
+#: read-cache.c:1684
#, c-format
-msgid "format: %%(else) atom used without an %%(if) atom"
+msgid "bad signature 0x%08x"
msgstr ""
-#: ref-filter.c:753
+#: read-cache.c:1687
#, c-format
-msgid "format: %%(else) atom used without a %%(then) atom"
+msgid "bad index version %d"
msgstr ""
-#: ref-filter.c:755
-#, c-format
-msgid "format: %%(else) atom used more than once"
+#: read-cache.c:1696
+msgid "bad index file sha1 signature"
msgstr ""
-#: ref-filter.c:770
+#: read-cache.c:1726
#, c-format
-msgid "format: %%(end) atom used without corresponding atom"
+msgid "index uses %.4s extension, which we do not understand"
msgstr ""
-#: ref-filter.c:827
+#: read-cache.c:1728
#, c-format
-msgid "malformed format string %s"
+msgid "ignoring %.4s extension"
msgstr ""
-#: ref-filter.c:1416
+#: read-cache.c:1765
#, c-format
-msgid "(no branch, rebasing %s)"
+msgid "unknown index entry format 0x%08x"
msgstr ""
-#: ref-filter.c:1419
+#: read-cache.c:1781
#, c-format
-msgid "(no branch, rebasing detached HEAD %s)"
+msgid "malformed name field in the index, near path '%s'"
msgstr ""
-#: ref-filter.c:1422
-#, c-format
-msgid "(no branch, bisect started on %s)"
+#: read-cache.c:1836
+msgid "unordered stage entries in index"
msgstr ""
-#. TRANSLATORS: make sure this matches "HEAD
-#. detached at " in wt-status.c
-#.
-#: ref-filter.c:1430
+#: read-cache.c:1839
#, c-format
-msgid "(HEAD detached at %s)"
+msgid "multiple stage entries for merged file '%s'"
msgstr ""
-#. TRANSLATORS: make sure this matches "HEAD
-#. detached from " in wt-status.c
-#.
-#: ref-filter.c:1437
+#: read-cache.c:1842
#, c-format
-msgid "(HEAD detached from %s)"
+msgid "unordered stage entries for '%s'"
msgstr ""
-#: ref-filter.c:1441
-msgid "(no branch)"
+#: read-cache.c:1949 read-cache.c:2227 rerere.c:565 rerere.c:599 rerere.c:1111
+#: builtin/add.c:459 builtin/check-ignore.c:178 builtin/checkout.c:294
+#: builtin/checkout.c:622 builtin/checkout.c:991 builtin/clean.c:955
+#: builtin/commit.c:344 builtin/diff-tree.c:116 builtin/grep.c:498
+#: builtin/mv.c:145 builtin/reset.c:245 builtin/rm.c:271
+#: builtin/submodule--helper.c:330
+msgid "index file corrupt"
msgstr ""
-#: ref-filter.c:1475 ref-filter.c:1623
+#: read-cache.c:2090
#, c-format
-msgid "missing object %s for %s"
+msgid "unable to create load_cache_entries thread: %s"
msgstr ""
-#: ref-filter.c:1483
+#: read-cache.c:2103
#, c-format
-msgid "parse_object_buffer failed on %s for %s"
+msgid "unable to join load_cache_entries thread: %s"
msgstr ""
-#: ref-filter.c:1980
+#: read-cache.c:2136
#, c-format
-msgid "malformed object at '%s'"
+msgid "%s: index file open failed"
msgstr ""
-#: ref-filter.c:2062
+#: read-cache.c:2140
#, c-format
-msgid "ignoring ref with broken name %s"
+msgid "%s: cannot stat the open index"
msgstr ""
-#: ref-filter.c:2340
+#: read-cache.c:2144
#, c-format
-msgid "format: %%(end) atom missing"
+msgid "%s: index file smaller than expected"
msgstr ""
-#: ref-filter.c:2444
+#: read-cache.c:2148
#, c-format
-msgid "malformed object name %s"
+msgid "%s: unable to map index file"
msgstr ""
-#: remote.c:606
+#: read-cache.c:2190
#, c-format
-msgid "Cannot fetch both %s and %s to %s"
+msgid "unable to create load_index_extensions thread: %s"
msgstr ""
-#: remote.c:610
+#: read-cache.c:2217
#, c-format
-msgid "%s usually tracks %s, not %s"
+msgid "unable to join load_index_extensions thread: %s"
msgstr ""
-#: remote.c:614
+#: read-cache.c:2239
#, c-format
-msgid "%s tracks both %s and %s"
+msgid "could not freshen shared index '%s'"
msgstr ""
-#: remote.c:622
-msgid "Internal error"
+#: read-cache.c:2274
+#, c-format
+msgid "broken index, expect %s in %s, got %s"
msgstr ""
-#: remote.c:1536 remote.c:1637
-msgid "HEAD does not point to a branch"
+#: read-cache.c:2971 sequencer.c:4791 wrapper.c:658 builtin/merge.c:1087
+#, c-format
+msgid "could not close '%s'"
msgstr ""
-#: remote.c:1545
+#: read-cache.c:3044 sequencer.c:2237 sequencer.c:3647
#, c-format
-msgid "no such branch: '%s'"
+msgid "could not stat '%s'"
msgstr ""
-#: remote.c:1548
+#: read-cache.c:3057
#, c-format
-msgid "no upstream configured for branch '%s'"
+msgid "unable to open git dir: %s"
msgstr ""
-#: remote.c:1554
+#: read-cache.c:3069
#, c-format
-msgid "upstream branch '%s' not stored as a remote-tracking branch"
+msgid "unable to unlink: %s"
msgstr ""
-#: remote.c:1569
+#: read-cache.c:3088
#, c-format
-msgid "push destination '%s' on remote '%s' has no local tracking branch"
+msgid "cannot fix permission bits on '%s'"
msgstr ""
-#: remote.c:1581
+#: read-cache.c:3237
#, c-format
-msgid "branch '%s' has no remote for pushing"
+msgid "%s: cannot drop to stage #0"
msgstr ""
-#: remote.c:1591
-#, c-format
-msgid "push refspecs for '%s' do not include '%s'"
+#: rebase-interactive.c:10
+msgid ""
+"\n"
+"Commands:\n"
+"p, pick <commit> = use commit\n"
+"r, reword <commit> = use commit, but edit the commit message\n"
+"e, edit <commit> = use commit, but stop for amending\n"
+"s, squash <commit> = use commit, but meld into previous commit\n"
+"f, fixup <commit> = like \"squash\", but discard this commit's log message\n"
+"x, exec <command> = run command (the rest of the line) using shell\n"
+"b, break = stop here (continue rebase later with 'git rebase --continue')\n"
+"d, drop <commit> = remove commit\n"
+"l, label <label> = label current HEAD with a name\n"
+"t, reset <label> = reset HEAD to a label\n"
+"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
+". create a merge commit using the original merge commit's\n"
+". message (or the oneline, if no original merge commit was\n"
+". specified). Use -c <commit> to reword the commit message.\n"
+"\n"
+"These lines can be re-ordered; they are executed from top to bottom.\n"
msgstr ""
-#: remote.c:1604
-msgid "push has no destination (push.default is 'nothing')"
+#: rebase-interactive.c:31 git-rebase--preserve-merges.sh:173
+msgid ""
+"\n"
+"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
msgstr ""
-#: remote.c:1626
-msgid "cannot resolve 'simple' push to a single destination"
+#: rebase-interactive.c:34 git-rebase--preserve-merges.sh:177
+msgid ""
+"\n"
+"If you remove a line here THAT COMMIT WILL BE LOST.\n"
msgstr ""
-#: remote.c:1951
-#, c-format
-msgid "Your branch is based on '%s', but the upstream is gone.\n"
+#: rebase-interactive.c:40 git-rebase--preserve-merges.sh:816
+msgid ""
+"\n"
+"You are editing the todo file of an ongoing interactive rebase.\n"
+"To continue rebase after editing, run:\n"
+" git rebase --continue\n"
+"\n"
msgstr ""
-#: remote.c:1955
-msgid " (use \"git branch --unset-upstream\" to fixup)\n"
+#: rebase-interactive.c:45 git-rebase--preserve-merges.sh:893
+msgid ""
+"\n"
+"However, if you remove everything, the rebase will be aborted.\n"
+"\n"
msgstr ""
-#: remote.c:1958
-#, c-format
-msgid "Your branch is up to date with '%s'.\n"
+#: rebase-interactive.c:51 git-rebase--preserve-merges.sh:900
+msgid "Note that empty commits are commented out"
msgstr ""
-#: remote.c:1962
+#: rebase-interactive.c:62 rebase-interactive.c:75 sequencer.c:2219
+#: sequencer.c:4569 sequencer.c:4625 sequencer.c:4900
#, c-format
-msgid "Your branch and '%s' refer to different commits.\n"
+msgid "could not read '%s'."
msgstr ""
-#: remote.c:1965
+#: refs.c:192
#, c-format
-msgid " (use \"%s\" for details)\n"
+msgid "%s does not point to a valid object!"
msgstr ""
-#: remote.c:1969
+#: refs.c:583
#, 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:1975
-msgid " (use \"git push\" to publish your local commits)\n"
+msgid "ignoring dangling symref %s"
msgstr ""
-#: remote.c:1978
+#: refs.c:585 ref-filter.c:1976
#, c-format
-msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
-msgid_plural ""
-"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: remote.c:1986
-msgid " (use \"git pull\" to update your local branch)\n"
+msgid "ignoring broken ref %s"
msgstr ""
-#: remote.c:1989
+#: refs.c:711
#, c-format
-msgid ""
-"Your branch and '%s' have diverged,\n"
-"and have %d and %d different commit each, respectively.\n"
-msgid_plural ""
-"Your branch and '%s' have diverged,\n"
-"and have %d and %d different commits each, respectively.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: remote.c:1999
-msgid " (use \"git pull\" to merge the remote branch into yours)\n"
+msgid "could not open '%s' for writing: %s"
msgstr ""
-#: replace-object.c:20
+#: refs.c:721 refs.c:772
#, c-format
-msgid "bad replace ref name: %s"
+msgid "could not read ref '%s'"
msgstr ""
-#: replace-object.c:29
+#: refs.c:727
#, c-format
-msgid "duplicate replace ref: %s"
+msgid "ref '%s' already exists"
msgstr ""
-#: replace-object.c:72
+#: refs.c:732
#, c-format
-msgid "replace depth too high for object %s"
+msgid "unexpected object ID when writing '%s'"
msgstr ""
-#: revision.c:2305
-msgid "your current branch appears to be broken"
+#: refs.c:740 sequencer.c:396 sequencer.c:2549 sequencer.c:2675
+#: sequencer.c:2689 sequencer.c:2923 sequencer.c:4789 sequencer.c:4852
+#: wrapper.c:656
+#, c-format
+msgid "could not write to '%s'"
msgstr ""
-#: revision.c:2308
+#: refs.c:767 sequencer.c:4787 sequencer.c:4846 wrapper.c:225 wrapper.c:395
+#: builtin/am.c:713 builtin/rebase.c:575
#, c-format
-msgid "your current branch '%s' does not have any commits yet"
+msgid "could not open '%s' for writing"
msgstr ""
-#: revision.c:2505
-msgid "--first-parent is incompatible with --bisect"
+#: refs.c:774
+#, c-format
+msgid "unexpected object ID when deleting '%s'"
msgstr ""
-#: run-command.c:728
-msgid "open /dev/null failed"
+#: refs.c:905
+#, c-format
+msgid "log for ref %s has gap after %s"
msgstr ""
-#: run-command.c:1271
+#: refs.c:911
#, c-format
-msgid ""
-"The '%s' hook was ignored because it's not set as executable.\n"
-"You can disable this warning with `git config advice.ignoredHook false`."
+msgid "log for ref %s unexpectedly ended on %s"
msgstr ""
-#: send-pack.c:142
-msgid "unexpected flush packet while reading remote unpack status"
+#: refs.c:969
+#, c-format
+msgid "log for %s is empty"
msgstr ""
-#: send-pack.c:144
+#: refs.c:1061
#, c-format
-msgid "unable to parse remote unpack status: %s"
+msgid "refusing to update ref with bad name '%s'"
msgstr ""
-#: send-pack.c:146
+#: refs.c:1137
#, c-format
-msgid "remote unpack failed: %s"
+msgid "update_ref failed for ref '%s': %s"
msgstr ""
-#: send-pack.c:309
-msgid "failed to sign the push certificate"
+#: refs.c:1911
+#, c-format
+msgid "multiple updates for ref '%s' not allowed"
msgstr ""
-#: send-pack.c:422
-msgid "the receiving end does not support --signed push"
+#: refs.c:1943
+msgid "ref updates forbidden inside quarantine environment"
msgstr ""
-#: send-pack.c:424
-msgid ""
-"not sending a push certificate since the receiving end does not support --"
-"signed push"
+#: refs.c:2039 refs.c:2069
+#, c-format
+msgid "'%s' exists; cannot create '%s'"
msgstr ""
-#: send-pack.c:436
-msgid "the receiving end does not support --atomic push"
+#: refs.c:2045 refs.c:2080
+#, c-format
+msgid "cannot process '%s' and '%s' at the same time"
msgstr ""
-#: send-pack.c:441
-msgid "the receiving end does not support push options"
+#: refs/files-backend.c:1228
+#, c-format
+msgid "could not remove reference %s"
msgstr ""
-#: sequencer.c:177
+#: refs/files-backend.c:1242 refs/packed-backend.c:1532
+#: refs/packed-backend.c:1542
#, c-format
-msgid "invalid commit message cleanup mode '%s'"
+msgid "could not delete reference %s: %s"
msgstr ""
-#: sequencer.c:278
+#: refs/files-backend.c:1245 refs/packed-backend.c:1545
#, c-format
-msgid "could not delete '%s'"
+msgid "could not delete references: %s"
msgstr ""
-#: sequencer.c:304
-msgid "revert"
+#: refspec.c:137
+#, c-format
+msgid "invalid refspec '%s'"
msgstr ""
-#: sequencer.c:306
-msgid "cherry-pick"
+#: ref-filter.c:39 wt-status.c:1861
+msgid "gone"
msgstr ""
-#: sequencer.c:308
-msgid "rebase -i"
+#: ref-filter.c:40
+#, c-format
+msgid "ahead %d"
msgstr ""
-#: sequencer.c:310
+#: ref-filter.c:41
#, c-format
-msgid "unknown action: %d"
+msgid "behind %d"
msgstr ""
-#: sequencer.c:367
-msgid ""
-"after resolving the conflicts, mark the corrected paths\n"
-"with 'git add <paths>' or 'git rm <paths>'"
+#: ref-filter.c:42
+#, c-format
+msgid "ahead %d, behind %d"
msgstr ""
-#: 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'"
+#: ref-filter.c:138
+#, c-format
+msgid "expected format: %%(color:<color>)"
msgstr ""
-#: sequencer.c:383 sequencer.c:2488
+#: ref-filter.c:140
#, c-format
-msgid "could not lock '%s'"
+msgid "unrecognized color: %%(color:%s)"
msgstr ""
-#: sequencer.c:390
+#: ref-filter.c:162
#, c-format
-msgid "could not write eol to '%s'"
+msgid "Integer value expected refname:lstrip=%s"
msgstr ""
-#: sequencer.c:395 sequencer.c:2371 sequencer.c:2494 sequencer.c:2508
-#: sequencer.c:2741
+#: ref-filter.c:166
#, c-format
-msgid "failed to finalize '%s'"
+msgid "Integer value expected refname:rstrip=%s"
msgstr ""
-#: 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
+#: ref-filter.c:168
#, c-format
-msgid "could not read '%s'"
+msgid "unrecognized %%(%s) argument: %s"
msgstr ""
-#: sequencer.c:444
+#: ref-filter.c:223
#, c-format
-msgid "your local changes would be overwritten by %s."
+msgid "%%(objecttype) does not take arguments"
msgstr ""
-#: sequencer.c:448
-msgid "commit your changes or stash them to proceed."
+#: ref-filter.c:245
+#, c-format
+msgid "unrecognized %%(objectsize) argument: %s"
msgstr ""
-#: sequencer.c:477
+#: ref-filter.c:253
#, c-format
-msgid "%s: fast-forward"
+msgid "%%(deltabase) does not take arguments"
msgstr ""
-#. TRANSLATORS: %s will be "revert", "cherry-pick" or
-#. "rebase -i".
-#.
-#: sequencer.c:566
+#: ref-filter.c:265
#, c-format
-msgid "%s: Unable to write new index file"
+msgid "%%(body) does not take arguments"
msgstr ""
-#: sequencer.c:582
-msgid "unable to update cache tree"
+#: ref-filter.c:274
+#, c-format
+msgid "%%(subject) does not take arguments"
msgstr ""
-#: sequencer.c:595
-msgid "could not resolve HEAD commit"
+#: ref-filter.c:296
+#, c-format
+msgid "unknown %%(trailers) argument: %s"
msgstr ""
-#: sequencer.c:723 sequencer.c:740
+#: ref-filter.c:325
#, c-format
-msgid "could not parse '%s' (looking for '%s')"
+msgid "positive value expected contents:lines=%s"
msgstr ""
-#: sequencer.c:731
+#: ref-filter.c:327
#, c-format
-msgid "bad quoting on %s value in '%s'"
+msgid "unrecognized %%(contents) argument: %s"
msgstr ""
-#: sequencer.c:747
+#: ref-filter.c:342
#, c-format
-msgid "invalid date format '%s' in '%s'"
+msgid "positive value expected objectname:short=%s"
msgstr ""
-#: sequencer.c:761
+#: ref-filter.c:346
#, c-format
-msgid ""
-"you have staged changes in your working tree\n"
-"If these changes are meant to be squashed into the previous commit, run:\n"
-"\n"
-" git commit --amend %s\n"
-"\n"
-"If they are meant to go into a new commit, run:\n"
-"\n"
-" git commit %s\n"
-"\n"
-"In both cases, once you're done, continue with:\n"
-"\n"
-" git rebase --continue\n"
+msgid "unrecognized %%(objectname) argument: %s"
msgstr ""
-#: sequencer.c:830
-msgid "writing root commit"
+#: ref-filter.c:376
+#, c-format
+msgid "expected format: %%(align:<width>,<position>)"
msgstr ""
-#: sequencer.c:1055
-msgid "'prepare-commit-msg' hook failed"
+#: ref-filter.c:388
+#, c-format
+msgid "unrecognized position:%s"
msgstr ""
-#: 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"
-"You can suppress this message by setting them explicitly. Run the\n"
-"following command and follow the instructions in your editor to edit\n"
-"your configuration file:\n"
-"\n"
-" git config --global --edit\n"
-"\n"
-"After doing this, you may fix the identity used for this commit with:\n"
-"\n"
-" git commit --amend --reset-author\n"
+#: ref-filter.c:395
+#, c-format
+msgid "unrecognized width:%s"
msgstr ""
-#: 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"
-"You can suppress this message by setting them explicitly:\n"
-"\n"
-" git config --global user.name \"Your Name\"\n"
-" git config --global user.email you@example.com\n"
-"\n"
-"After doing this, you may fix the identity used for this commit with:\n"
-"\n"
-" git commit --amend --reset-author\n"
+#: ref-filter.c:404
+#, c-format
+msgid "unrecognized %%(align) argument: %s"
msgstr ""
-#: sequencer.c:1115
-msgid "couldn't look up newly created commit"
+#: ref-filter.c:412
+#, c-format
+msgid "positive width expected with the %%(align) atom"
msgstr ""
-#: sequencer.c:1117
-msgid "could not parse newly created commit"
+#: ref-filter.c:430
+#, c-format
+msgid "unrecognized %%(if) argument: %s"
msgstr ""
-#: sequencer.c:1163
-msgid "unable to resolve HEAD after creating commit"
+#: ref-filter.c:527
+#, c-format
+msgid "malformed field name: %.*s"
msgstr ""
-#: sequencer.c:1165
-msgid "detached HEAD"
+#: ref-filter.c:554
+#, c-format
+msgid "unknown field name: %.*s"
msgstr ""
-#: sequencer.c:1169
-msgid " (root-commit)"
+#: ref-filter.c:558
+#, c-format
+msgid ""
+"not a git repository, but the field '%.*s' requires access to object data"
msgstr ""
-#: sequencer.c:1190
-msgid "could not parse HEAD"
+#: ref-filter.c:682
+#, c-format
+msgid "format: %%(if) atom used without a %%(then) atom"
msgstr ""
-#: sequencer.c:1192
+#: ref-filter.c:745
#, c-format
-msgid "HEAD %s is not a commit!"
+msgid "format: %%(then) atom used without an %%(if) atom"
msgstr ""
-#: sequencer.c:1196 builtin/commit.c:1528
-msgid "could not parse HEAD commit"
+#: ref-filter.c:747
+#, c-format
+msgid "format: %%(then) atom used more than once"
msgstr ""
-#: sequencer.c:1247 sequencer.c:1845
-msgid "unable to parse commit author"
+#: ref-filter.c:749
+#, c-format
+msgid "format: %%(then) atom used after %%(else)"
msgstr ""
-#: sequencer.c:1257 builtin/am.c:1632 builtin/merge.c:675
-msgid "git write-tree failed to write a tree"
+#: ref-filter.c:777
+#, c-format
+msgid "format: %%(else) atom used without an %%(if) atom"
msgstr ""
-#: sequencer.c:1274 sequencer.c:1329
+#: ref-filter.c:779
#, c-format
-msgid "unable to read commit message from '%s'"
+msgid "format: %%(else) atom used without a %%(then) atom"
msgstr ""
-#: 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"
+#: ref-filter.c:781
+#, c-format
+msgid "format: %%(else) atom used more than once"
msgstr ""
-#: sequencer.c:1356
+#: ref-filter.c:796
#, c-format
-msgid "could not parse commit %s"
+msgid "format: %%(end) atom used without corresponding atom"
msgstr ""
-#: sequencer.c:1361
+#: ref-filter.c:853
#, c-format
-msgid "could not parse parent commit %s"
+msgid "malformed format string %s"
msgstr ""
-#: sequencer.c:1457 sequencer.c:1565
+#: ref-filter.c:1447
#, c-format
-msgid "unknown command: %d"
+msgid "(no branch, rebasing %s)"
msgstr ""
-#: sequencer.c:1512 sequencer.c:1537
+#: ref-filter.c:1450
#, c-format
-msgid "This is a combination of %d commits."
+msgid "(no branch, rebasing detached HEAD %s)"
msgstr ""
-#: sequencer.c:1522 sequencer.c:4520
-msgid "need a HEAD to fixup"
+#: ref-filter.c:1453
+#, c-format
+msgid "(no branch, bisect started on %s)"
msgstr ""
-#: sequencer.c:1524 sequencer.c:2768
-msgid "could not read HEAD"
+#. TRANSLATORS: make sure this matches "HEAD
+#. detached at " in wt-status.c
+#.
+#: ref-filter.c:1461
+#, c-format
+msgid "(HEAD detached at %s)"
msgstr ""
-#: sequencer.c:1526
-msgid "could not read HEAD's commit message"
+#. TRANSLATORS: make sure this matches "HEAD
+#. detached from " in wt-status.c
+#.
+#: ref-filter.c:1468
+#, c-format
+msgid "(HEAD detached from %s)"
msgstr ""
-#: sequencer.c:1532
-#, c-format
-msgid "cannot write '%s'"
+#: ref-filter.c:1472
+msgid "(no branch)"
msgstr ""
-#: sequencer.c:1539 git-rebase--preserve-merges.sh:441
-msgid "This is the 1st commit message:"
+#: ref-filter.c:1506 ref-filter.c:1663
+#, c-format
+msgid "missing object %s for %s"
msgstr ""
-#: sequencer.c:1547
+#: ref-filter.c:1516
#, c-format
-msgid "could not read commit message of %s"
+msgid "parse_object_buffer failed on %s for %s"
msgstr ""
-#: sequencer.c:1554
+#: ref-filter.c:1882
#, c-format
-msgid "This is the commit message #%d:"
+msgid "malformed object at '%s'"
msgstr ""
-#: sequencer.c:1560
+#: ref-filter.c:1971
#, c-format
-msgid "The commit message #%d will be skipped:"
+msgid "ignoring ref with broken name %s"
msgstr ""
-#: sequencer.c:1643
-msgid "your index file is unmerged."
+#: ref-filter.c:2257
+#, c-format
+msgid "format: %%(end) atom missing"
msgstr ""
-#: sequencer.c:1650
-msgid "cannot fixup root commit"
+#: ref-filter.c:2352
+#, c-format
+msgid "option `%s' is incompatible with --merged"
msgstr ""
-#: sequencer.c:1669
+#: ref-filter.c:2355
#, c-format
-msgid "commit %s is a merge but no -m option was given."
+msgid "option `%s' is incompatible with --no-merged"
msgstr ""
-#: sequencer.c:1677
+#: ref-filter.c:2365
#, c-format
-msgid "commit %s does not have parent %d"
+msgid "malformed object name %s"
msgstr ""
-#: sequencer.c:1681
+#: ref-filter.c:2370
#, c-format
-msgid "mainline was specified but commit %s is not a merge."
+msgid "option `%s' must point to a commit"
msgstr ""
-#: sequencer.c:1687
+#: remote.c:363
#, c-format
-msgid "cannot get commit message for %s"
+msgid "config remote shorthand cannot begin with '/': %s"
msgstr ""
-#. TRANSLATORS: The first %s will be a "todo" command like
-#. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:1706
-#, c-format
-msgid "%s: cannot parse parent commit %s"
+#: remote.c:410
+msgid "more than one receivepack given, using the first"
+msgstr ""
+
+#: remote.c:418
+msgid "more than one uploadpack given, using the first"
msgstr ""
-#: sequencer.c:1771
+#: remote.c:608
#, c-format
-msgid "could not rename '%s' to '%s'"
+msgid "Cannot fetch both %s and %s to %s"
msgstr ""
-#: sequencer.c:1826
+#: remote.c:612
#, c-format
-msgid "could not revert %s... %s"
+msgid "%s usually tracks %s, not %s"
msgstr ""
-#: sequencer.c:1827
+#: remote.c:616
#, c-format
-msgid "could not apply %s... %s"
+msgid "%s tracks both %s and %s"
msgstr ""
-#: sequencer.c:1885
+#: remote.c:684
#, c-format
-msgid "git %s: failed to read the index"
+msgid "key '%s' of pattern had no '*'"
msgstr ""
-#: sequencer.c:1892
+#: remote.c:694
#, c-format
-msgid "git %s: failed to refresh the index"
+msgid "value '%s' of pattern has no '*'"
msgstr ""
-#: sequencer.c:1972
+#: remote.c:1000
#, c-format
-msgid "%s does not accept arguments: '%s'"
+msgid "src refspec %s does not match any"
msgstr ""
-#: sequencer.c:1981
+#: remote.c:1005
#, c-format
-msgid "missing arguments for %s"
+msgid "src refspec %s matches more than one"
msgstr ""
-#: sequencer.c:2040
+#. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push
+#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
+#. the <src>.
+#.
+#: remote.c:1020
#, c-format
-msgid "invalid line %d: %.*s"
+msgid ""
+"The destination you provided is not a full refname (i.e.,\n"
+"starting with \"refs/\"). We tried to guess what you meant by:\n"
+"\n"
+"- Looking for a ref that matches '%s' on the remote side.\n"
+"- Checking if the <src> being pushed ('%s')\n"
+" is a ref in \"refs/{heads,tags}/\". If so we add a corresponding\n"
+" refs/{heads,tags}/ prefix on the remote side.\n"
+"\n"
+"Neither worked, so we gave up. You must fully qualify the ref."
msgstr ""
-#: sequencer.c:2048
+#: remote.c:1040
#, c-format
-msgid "cannot '%s' without a previous commit"
+msgid ""
+"The <src> part of the refspec is a commit object.\n"
+"Did you mean to create a new branch by pushing to\n"
+"'%s:refs/heads/%s'?"
msgstr ""
-#: sequencer.c:2096 sequencer.c:4277 sequencer.c:4333
+#: remote.c:1045
#, c-format
-msgid "could not read '%s'."
+msgid ""
+"The <src> part of the refspec is a tag object.\n"
+"Did you mean to create a new tag by pushing to\n"
+"'%s:refs/tags/%s'?"
msgstr ""
-#: sequencer.c:2119
-msgid "please fix this using 'git rebase --edit-todo'."
+#: remote.c:1050
+#, c-format
+msgid ""
+"The <src> part of the refspec is a tree object.\n"
+"Did you mean to tag a new tree by pushing to\n"
+"'%s:refs/tags/%s'?"
msgstr ""
-#: sequencer.c:2121
+#: remote.c:1055
#, c-format
-msgid "unusable instruction sheet: '%s'"
+msgid ""
+"The <src> part of the refspec is a blob object.\n"
+"Did you mean to tag a new blob by pushing to\n"
+"'%s:refs/tags/%s'?"
msgstr ""
-#: sequencer.c:2126
-msgid "no commits parsed."
+#: remote.c:1091
+#, c-format
+msgid "%s cannot be resolved to branch"
msgstr ""
-#: sequencer.c:2137
-msgid "cannot cherry-pick during a revert."
+#: remote.c:1102
+#, c-format
+msgid "unable to delete '%s': remote ref does not exist"
msgstr ""
-#: sequencer.c:2139
-msgid "cannot revert during a cherry-pick."
+#: remote.c:1114
+#, c-format
+msgid "dst refspec %s matches more than one"
msgstr ""
-#: sequencer.c:2209
+#: remote.c:1121
#, c-format
-msgid "invalid value for %s: %s"
+msgid "dst ref %s receives from more than one src"
msgstr ""
-#: sequencer.c:2285
-msgid "unusable squash-onto"
+#: remote.c:1624 remote.c:1725
+msgid "HEAD does not point to a branch"
msgstr ""
-#: sequencer.c:2301
+#: remote.c:1633
#, c-format
-msgid "malformed options sheet: '%s'"
+msgid "no such branch: '%s'"
msgstr ""
-#: sequencer.c:2335 sequencer.c:3775
-msgid "empty commit set passed"
+#: remote.c:1636
+#, c-format
+msgid "no upstream configured for branch '%s'"
msgstr ""
-#: sequencer.c:2343
-msgid "a cherry-pick or revert is already in progress"
+#: remote.c:1642
+#, c-format
+msgid "upstream branch '%s' not stored as a remote-tracking branch"
msgstr ""
-#: sequencer.c:2344
-msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
+#: remote.c:1657
+#, c-format
+msgid "push destination '%s' on remote '%s' has no local tracking branch"
msgstr ""
-#: sequencer.c:2347
+#: remote.c:1669
#, c-format
-msgid "could not create sequencer directory '%s'"
+msgid "branch '%s' has no remote for pushing"
msgstr ""
-#: sequencer.c:2361
-msgid "could not lock HEAD"
+#: remote.c:1679
+#, c-format
+msgid "push refspecs for '%s' do not include '%s'"
msgstr ""
-#: sequencer.c:2416 sequencer.c:3543
-msgid "no cherry-pick or revert in progress"
+#: remote.c:1692
+msgid "push has no destination (push.default is 'nothing')"
msgstr ""
-#: sequencer.c:2418
-msgid "cannot resolve HEAD"
+#: remote.c:1714
+msgid "cannot resolve 'simple' push to a single destination"
msgstr ""
-#: sequencer.c:2420 sequencer.c:2455
-msgid "cannot abort from a branch yet to be born"
+#: remote.c:1840
+#, c-format
+msgid "couldn't find remote ref %s"
msgstr ""
-#: sequencer.c:2441 builtin/grep.c:721
+#: remote.c:1853
#, c-format
-msgid "cannot open '%s'"
+msgid "* Ignoring funny ref '%s' locally"
msgstr ""
-#: sequencer.c:2443
+#: remote.c:1990
#, c-format
-msgid "cannot read '%s': %s"
+msgid "Your branch is based on '%s', but the upstream is gone.\n"
msgstr ""
-#: sequencer.c:2444
-msgid "unexpected end of file"
+#: remote.c:1994
+msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr ""
-#: sequencer.c:2450
+#: remote.c:1997
#, c-format
-msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
+msgid "Your branch is up to date with '%s'.\n"
msgstr ""
-#: sequencer.c:2461
-msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
+#: remote.c:2001
+#, c-format
+msgid "Your branch and '%s' refer to different commits.\n"
msgstr ""
-#: sequencer.c:2565 sequencer.c:3461
+#: remote.c:2004
#, c-format
-msgid "could not update %s"
+msgid " (use \"%s\" for details)\n"
msgstr ""
-#: sequencer.c:2603 sequencer.c:3441
-msgid "cannot read HEAD"
+#: remote.c:2008
+#, 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:2014
+msgid " (use \"git push\" to publish your local commits)\n"
msgstr ""
-#: sequencer.c:2618
+#: remote.c:2017
#, c-format
-msgid "unable to copy '%s' to '%s'"
+msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
+msgid_plural ""
+"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: remote.c:2025
+msgid " (use \"git pull\" to update your local branch)\n"
msgstr ""
-#: sequencer.c:2626
+#: remote.c:2028
#, 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 ""
+"Your branch and '%s' have diverged,\n"
+"and have %d and %d different commit each, respectively.\n"
+msgid_plural ""
+"Your branch and '%s' have diverged,\n"
+"and have %d and %d different commits each, respectively.\n"
+msgstr[0] ""
+msgstr[1] ""
-#: sequencer.c:2636
-#, c-format
-msgid "Could not apply %s... %.*s"
+#: remote.c:2038
+msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr ""
-#: sequencer.c:2643
+#: remote.c:2221
#, c-format
-msgid "Could not merge %.*s"
+msgid "cannot parse expected object name '%s'"
msgstr ""
-#: sequencer.c:2654 sequencer.c:2658 builtin/difftool.c:640
+#: replace-object.c:21
#, c-format
-msgid "could not copy '%s' to '%s'"
+msgid "bad replace ref name: %s"
msgstr ""
-#: sequencer.c:2680 sequencer.c:3095
-msgid "could not read index"
+#: replace-object.c:30
+#, c-format
+msgid "duplicate replace ref: %s"
msgstr ""
-#: sequencer.c:2685
+#: replace-object.c:73
#, c-format
-msgid ""
-"execution failed: %s\n"
-"%sYou can fix the problem, and then run\n"
-"\n"
-" git rebase --continue\n"
-"\n"
+msgid "replace depth too high for object %s"
msgstr ""
-#: sequencer.c:2691
-msgid "and made changes to the index and/or the working tree\n"
+#: rerere.c:217 rerere.c:226 rerere.c:229
+msgid "corrupt MERGE_RR"
msgstr ""
-#: sequencer.c:2697
-#, c-format
-msgid ""
-"execution succeeded: %s\n"
-"but left changes to the index and/or the working tree\n"
-"Commit or stash your changes, and then run\n"
-"\n"
-" git rebase --continue\n"
-"\n"
+#: rerere.c:264 rerere.c:269
+msgid "unable to write rerere record"
msgstr ""
-#: sequencer.c:2758
+#: rerere.c:485 rerere.c:692 sequencer.c:3186 sequencer.c:3212
+#: builtin/fsck.c:314
#, c-format
-msgid "illegal label name: '%.*s'"
+msgid "could not write '%s'"
msgstr ""
-#: sequencer.c:2810
-msgid "writing fake root commit"
+#: rerere.c:495
+#, c-format
+msgid "there were errors while writing '%s' (%s)"
msgstr ""
-#: sequencer.c:2815
-msgid "writing squash-onto"
+#: rerere.c:498
+#, c-format
+msgid "failed to flush '%s'"
msgstr ""
-#: sequencer.c:2850
+#: rerere.c:503 rerere.c:1039
#, c-format
-msgid "failed to find tree of %s"
+msgid "could not parse conflict hunks in '%s'"
msgstr ""
-#: sequencer.c:2868
-msgid "could not write index"
+#: rerere.c:684
+#, c-format
+msgid "failed utime() on '%s'"
msgstr ""
-#: sequencer.c:2895
+#: rerere.c:694
#, c-format
-msgid "could not resolve '%s'"
+msgid "writing '%s' failed"
msgstr ""
-#: sequencer.c:2921
-msgid "cannot merge without a current revision"
+#: rerere.c:714
+#, c-format
+msgid "Staged '%s' using previous resolution."
msgstr ""
-#: sequencer.c:2943
+#: rerere.c:753
#, c-format
-msgid "unable to parse '%.*s'"
+msgid "Recorded resolution for '%s'."
msgstr ""
-#: sequencer.c:2952
+#: rerere.c:788
#, c-format
-msgid "nothing to merge: '%.*s'"
+msgid "Resolved '%s' using previous resolution."
msgstr ""
-#: sequencer.c:2964
-msgid "octopus merge cannot be executed on top of a [new root]"
+#: rerere.c:803
+#, c-format
+msgid "cannot unlink stray '%s'"
msgstr ""
-#: sequencer.c:2979
+#: rerere.c:807
#, c-format
-msgid "could not get commit message of '%s'"
+msgid "Recorded preimage for '%s'"
msgstr ""
-#: sequencer.c:2989 sequencer.c:3015
+#: rerere.c:881 submodule.c:2012 builtin/submodule--helper.c:1417
+#: builtin/submodule--helper.c:1427
#, c-format
-msgid "could not write '%s'"
+msgid "could not create directory '%s'"
msgstr ""
-#: sequencer.c:3127
+#: rerere.c:1057
#, c-format
-msgid "could not even attempt to merge '%.*s'"
+msgid "failed to update conflicted state in '%s'"
msgstr ""
-#: sequencer.c:3143
-msgid "merge: Unable to write new index file"
+#: rerere.c:1068 rerere.c:1075
+#, c-format
+msgid "no remembered resolution for '%s'"
msgstr ""
-#: sequencer.c:3211
+#: rerere.c:1077
#, c-format
-msgid "Applied autostash.\n"
+msgid "cannot unlink '%s'"
msgstr ""
-#: sequencer.c:3223
+#: rerere.c:1087
#, c-format
-msgid "cannot store %s"
+msgid "Updated preimage for '%s'"
msgstr ""
-#: sequencer.c:3226 git-rebase.sh:188
+#: rerere.c:1096
#, c-format
-msgid ""
-"Applying autostash resulted in conflicts.\n"
-"Your changes are safe in the stash.\n"
-"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
+msgid "Forgot resolution for '%s'\n"
msgstr ""
-#: sequencer.c:3257
-#, c-format
-msgid ""
-"Could not execute the todo command\n"
-"\n"
-" %.*s\n"
-"It has been rescheduled; To edit the command before continuing, please\n"
-"edit the todo list first:\n"
-"\n"
-" git rebase --edit-todo\n"
-" git rebase --continue\n"
+#: rerere.c:1199
+msgid "unable to open rr-cache directory"
msgstr ""
-#: sequencer.c:3325
-#, c-format
-msgid "Stopped at %s... %.*s\n"
+#: revision.c:2484
+msgid "your current branch appears to be broken"
msgstr ""
-#: sequencer.c:3404
+#: revision.c:2487
#, c-format
-msgid "unknown command %d"
+msgid "your current branch '%s' does not have any commits yet"
msgstr ""
-#: sequencer.c:3449
-msgid "could not read orig-head"
+#: revision.c:2684
+msgid "--first-parent is incompatible with --bisect"
msgstr ""
-#: sequencer.c:3454 sequencer.c:4517
-msgid "could not read 'onto'"
+#: run-command.c:742
+msgid "open /dev/null failed"
msgstr ""
-#: sequencer.c:3468
+#: run-command.c:1231
#, c-format
-msgid "could not update HEAD to %s"
+msgid "cannot create async thread: %s"
msgstr ""
-#: sequencer.c:3554
-msgid "cannot rebase: You have unstaged changes."
+#: run-command.c:1295
+#, c-format
+msgid ""
+"The '%s' hook was ignored because it's not set as executable.\n"
+"You can disable this warning with `git config advice.ignoredHook false`."
msgstr ""
-#: sequencer.c:3563
-msgid "cannot amend non-existing commit"
+#: send-pack.c:141
+msgid "unexpected flush packet while reading remote unpack status"
msgstr ""
-#: sequencer.c:3565
+#: send-pack.c:143
#, c-format
-msgid "invalid file: '%s'"
+msgid "unable to parse remote unpack status: %s"
msgstr ""
-#: sequencer.c:3567
+#: send-pack.c:145
#, c-format
-msgid "invalid contents: '%s'"
+msgid "remote unpack failed: %s"
msgstr ""
-#: 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."
+#: send-pack.c:306
+msgid "failed to sign the push certificate"
msgstr ""
-#: sequencer.c:3595 sequencer.c:3633
-#, c-format
-msgid "could not write file: '%s'"
+#: send-pack.c:420
+msgid "the receiving end does not support --signed push"
msgstr ""
-#: sequencer.c:3648
-msgid "could not remove CHERRY_PICK_HEAD"
+#: send-pack.c:422
+msgid ""
+"not sending a push certificate since the receiving end does not support --"
+"signed push"
msgstr ""
-#: sequencer.c:3655
-msgid "could not commit staged changes."
+#: send-pack.c:434
+msgid "the receiving end does not support --atomic push"
+msgstr ""
+
+#: send-pack.c:439
+msgid "the receiving end does not support push options"
msgstr ""
-#: sequencer.c:3752
+#: sequencer.c:184
#, c-format
-msgid "%s: can't cherry-pick a %s"
+msgid "invalid commit message cleanup mode '%s'"
msgstr ""
-#: sequencer.c:3756
+#: sequencer.c:288
#, c-format
-msgid "%s: bad revision"
+msgid "could not delete '%s'"
msgstr ""
-#: sequencer.c:3791
-msgid "can't revert as initial commit"
+#: sequencer.c:314
+msgid "revert"
msgstr ""
-#: sequencer.c:4238
-msgid "make_script: unhandled options"
+#: sequencer.c:316
+msgid "cherry-pick"
msgstr ""
-#: sequencer.c:4241
-msgid "make_script: error preparing revisions"
+#: sequencer.c:318
+msgid "rebase -i"
msgstr ""
-#: sequencer.c:4281 sequencer.c:4337
+#: sequencer.c:320
#, c-format
-msgid "unusable todo list: '%s'"
+msgid "unknown action: %d"
msgstr ""
-#: sequencer.c:4396
-#, c-format
+#: sequencer.c:378
msgid ""
-"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
+"after resolving the conflicts, mark the corrected paths\n"
+"with 'git add <paths>' or 'git rm <paths>'"
msgstr ""
-#: sequencer.c:4466
-#, c-format
+#: sequencer.c:381
msgid ""
-"Warning: some commits may have been dropped accidentally.\n"
-"Dropped commits (newer to older):\n"
+"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:4473
+#: sequencer.c:394 sequencer.c:2671
#, c-format
-msgid ""
-"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
-"\n"
-"Use 'git config rebase.missingCommitsCheck' to change the level of "
-"warnings.\n"
-"The possible behaviours are: ignore, warn, error.\n"
-"\n"
+msgid "could not lock '%s'"
msgstr ""
-#: sequencer.c:4486
+#: sequencer.c:401
#, c-format
-msgid ""
-"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
-"continue'.\n"
-"Or you can abort the rebase with 'git rebase --abort'.\n"
-msgstr ""
-
-#: sequencer.c:4660
-msgid "the script was already rearranged."
+msgid "could not write eol to '%s'"
msgstr ""
-#: setup.c:123
+#: sequencer.c:406 sequencer.c:2554 sequencer.c:2677 sequencer.c:2691
+#: sequencer.c:2931
#, c-format
-msgid "'%s' is outside repository"
+msgid "failed to finalize '%s'"
msgstr ""
-#: setup.c:172
+#: sequencer.c:429 sequencer.c:931 sequencer.c:1615 sequencer.c:2574
+#: sequencer.c:2913 sequencer.c:3022 builtin/am.c:245 builtin/commit.c:748
+#: builtin/merge.c:1085 builtin/rebase.c:154
#, c-format
-msgid ""
-"%s: no such path in the working tree.\n"
-"Use 'git <command> -- <path>...' to specify paths that do not exist locally."
+msgid "could not read '%s'"
msgstr ""
-#: setup.c:185
+#: sequencer.c:455
#, c-format
-msgid ""
-"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
-"Use '--' to separate paths from revisions, like this:\n"
-"'git <command> [<revision>...] -- [<file>...]'"
+msgid "your local changes would be overwritten by %s."
msgstr ""
-#: setup.c:234
-#, c-format
-msgid "option '%s' must come before non-option arguments"
+#: sequencer.c:459
+msgid "commit your changes or stash them to proceed."
msgstr ""
-#: setup.c:253
+#: sequencer.c:491
#, c-format
-msgid ""
-"ambiguous argument '%s': both revision and filename\n"
-"Use '--' to separate paths from revisions, like this:\n"
-"'git <command> [<revision>...] -- [<file>...]'"
-msgstr ""
-
-#: setup.c:389
-msgid "unable to set up work tree using invalid config"
+msgid "%s: fast-forward"
msgstr ""
-#: setup.c:393
-msgid "this operation must be run in a work tree"
+#. TRANSLATORS: %s will be "revert", "cherry-pick" or
+#. "rebase -i".
+#.
+#: sequencer.c:582
+#, c-format
+msgid "%s: Unable to write new index file"
msgstr ""
-#: setup.c:503
-#, c-format
-msgid "Expected git repo version <= %d, found %d"
+#: sequencer.c:598
+msgid "unable to update cache tree"
msgstr ""
-#: setup.c:511
-msgid "unknown repository extensions found:"
+#: sequencer.c:612
+msgid "could not resolve HEAD commit"
msgstr ""
-#: setup.c:530
+#: sequencer.c:692
#, c-format
-msgid "error opening '%s'"
+msgid "no key present in '%.*s'"
msgstr ""
-#: setup.c:532
+#: sequencer.c:703
#, c-format
-msgid "too large to be a .git file: '%s'"
+msgid "unable to dequote value of '%s'"
msgstr ""
-#: setup.c:534
+#: sequencer.c:740 wrapper.c:227 wrapper.c:397 builtin/am.c:704
+#: builtin/am.c:796 builtin/merge.c:1082 builtin/rebase.c:617
#, c-format
-msgid "error reading %s"
+msgid "could not open '%s' for reading"
msgstr ""
-#: setup.c:536
-#, c-format
-msgid "invalid gitfile format: %s"
+#: sequencer.c:750
+msgid "'GIT_AUTHOR_NAME' already given"
msgstr ""
-#: setup.c:538
-#, c-format
-msgid "no path in gitfile: %s"
+#: sequencer.c:755
+msgid "'GIT_AUTHOR_EMAIL' already given"
msgstr ""
-#: setup.c:540
-#, c-format
-msgid "not a git repository: %s"
+#: sequencer.c:760
+msgid "'GIT_AUTHOR_DATE' already given"
msgstr ""
-#: setup.c:639
+#: sequencer.c:764
#, c-format
-msgid "'$%s' too big"
+msgid "unknown variable '%s'"
msgstr ""
-#: setup.c:653
-#, c-format
-msgid "not a git repository: '%s'"
+#: sequencer.c:769
+msgid "missing 'GIT_AUTHOR_NAME'"
msgstr ""
-#: setup.c:682 setup.c:684 setup.c:715
-#, c-format
-msgid "cannot chdir to '%s'"
+#: sequencer.c:771
+msgid "missing 'GIT_AUTHOR_EMAIL'"
msgstr ""
-#: setup.c:687 setup.c:743 setup.c:753 setup.c:792 setup.c:800 setup.c:815
-msgid "cannot come back to cwd"
+#: sequencer.c:773
+msgid "missing 'GIT_AUTHOR_DATE'"
msgstr ""
-#: setup.c:813
+#: sequencer.c:833
#, c-format
-msgid "not a git repository (or any of the parent directories): %s"
+msgid "invalid date format '%s' in '%s'"
msgstr ""
-#: setup.c:824
+#: sequencer.c:850
#, c-format
-msgid "failed to stat '%*s%s%s'"
+msgid ""
+"you have staged changes in your working tree\n"
+"If these changes are meant to be squashed into the previous commit, run:\n"
+"\n"
+" git commit --amend %s\n"
+"\n"
+"If they are meant to go into a new commit, run:\n"
+"\n"
+" git commit %s\n"
+"\n"
+"In both cases, once you're done, continue with:\n"
+"\n"
+" git rebase --continue\n"
msgstr ""
-#: setup.c:1054
-msgid "Unable to read current working directory"
+#: sequencer.c:945
+msgid "writing root commit"
msgstr ""
-#: setup.c:1066 setup.c:1072
-#, c-format
-msgid "cannot change to '%s'"
+#: sequencer.c:1155
+msgid "'prepare-commit-msg' hook failed"
msgstr ""
-#: setup.c:1085
-#, c-format
+#: sequencer.c:1162
msgid ""
-"not a git repository (or any parent up to mount point %s)\n"
-"Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."
+"Your name and email address were configured automatically based\n"
+"on your username and hostname. Please check that they are accurate.\n"
+"You can suppress this message by setting them explicitly. Run the\n"
+"following command and follow the instructions in your editor to edit\n"
+"your configuration file:\n"
+"\n"
+" git config --global --edit\n"
+"\n"
+"After doing this, you may fix the identity used for this commit with:\n"
+"\n"
+" git commit --amend --reset-author\n"
msgstr ""
-#: setup.c:1168
-#, c-format
+#: sequencer.c:1175
msgid ""
-"problem with core.sharedRepository filemode value (0%.3o).\n"
-"The owner of files must always have read and write permissions."
+"Your name and email address were configured automatically based\n"
+"on your username and hostname. Please check that they are accurate.\n"
+"You can suppress this message by setting them explicitly:\n"
+"\n"
+" git config --global user.name \"Your Name\"\n"
+" git config --global user.email you@example.com\n"
+"\n"
+"After doing this, you may fix the identity used for this commit with:\n"
+"\n"
+" git commit --amend --reset-author\n"
msgstr ""
-#: setup.c:1211
-msgid "open /dev/null or dup failed"
+#: sequencer.c:1217
+msgid "couldn't look up newly created commit"
msgstr ""
-#: setup.c:1226
-msgid "fork failed"
+#: sequencer.c:1219
+msgid "could not parse newly created commit"
msgstr ""
-#: setup.c:1231
-msgid "setsid failed"
+#: sequencer.c:1265
+msgid "unable to resolve HEAD after creating commit"
msgstr ""
-#: sha1-file.c:381
-#, c-format
-msgid "object directory %s does not exist; check .git/objects/info/alternates"
+#: sequencer.c:1267
+msgid "detached HEAD"
msgstr ""
-#: sha1-file.c:432
-#, c-format
-msgid "unable to normalize alternate object path: %s"
+#: sequencer.c:1271
+msgid " (root-commit)"
msgstr ""
-#: sha1-file.c:503
-#, c-format
-msgid "%s: ignoring alternate object stores, nesting too deep"
+#: sequencer.c:1292
+msgid "could not parse HEAD"
msgstr ""
-#: sha1-file.c:510
+#: sequencer.c:1294
#, c-format
-msgid "unable to normalize object directory: %s"
+msgid "HEAD %s is not a commit!"
msgstr ""
-#: sha1-file.c:565
-msgid "unable to fdopen alternates lockfile"
+#: sequencer.c:1298 builtin/commit.c:1546
+msgid "could not parse HEAD commit"
msgstr ""
-#: sha1-file.c:583
-msgid "unable to read alternates file"
+#: sequencer.c:1350 sequencer.c:1964
+msgid "unable to parse commit author"
msgstr ""
-#: sha1-file.c:590
-msgid "unable to move new alternates file into place"
+#: sequencer.c:1360 builtin/am.c:1570 builtin/merge.c:678
+msgid "git write-tree failed to write a tree"
msgstr ""
-#: sha1-file.c:625
+#: sequencer.c:1377 sequencer.c:1433
#, c-format
-msgid "path '%s' does not exist"
+msgid "unable to read commit message from '%s'"
msgstr ""
-#: sha1-file.c:651
-#, c-format
-msgid "reference repository '%s' as a linked checkout is not supported yet."
+#: sequencer.c:1399 builtin/am.c:1591 builtin/commit.c:1649 builtin/merge.c:859
+#: builtin/merge.c:884
+msgid "failed to write commit object"
msgstr ""
-#: sha1-file.c:657
+#: sequencer.c:1460
#, c-format
-msgid "reference repository '%s' is not a local repository."
+msgid "could not parse commit %s"
msgstr ""
-#: sha1-file.c:663
+#: sequencer.c:1465
#, c-format
-msgid "reference repository '%s' is shallow"
+msgid "could not parse parent commit %s"
msgstr ""
-#: sha1-file.c:671
+#: sequencer.c:1565 sequencer.c:1675
#, c-format
-msgid "reference repository '%s' is grafted"
+msgid "unknown command: %d"
msgstr ""
-#: sha1-file.c:781
+#: sequencer.c:1622 sequencer.c:1647
#, c-format
-msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
+msgid "This is a combination of %d commits."
msgstr ""
-#: sha1-file.c:806
-msgid "mmap failed"
+#: sequencer.c:1632 sequencer.c:4808
+msgid "need a HEAD to fixup"
msgstr ""
-#: sha1-file.c:973
-#, c-format
-msgid "object file %s is empty"
+#: sequencer.c:1634 sequencer.c:2958
+msgid "could not read HEAD"
msgstr ""
-#: sha1-file.c:1093 sha1-file.c:2206
-#, c-format
-msgid "corrupt loose object '%s'"
+#: sequencer.c:1636
+msgid "could not read HEAD's commit message"
msgstr ""
-#: sha1-file.c:1095 sha1-file.c:2210
+#: sequencer.c:1642
#, c-format
-msgid "garbage at end of loose object '%s'"
+msgid "cannot write '%s'"
msgstr ""
-#: sha1-file.c:1137
-msgid "invalid object type"
+#: sequencer.c:1649 git-rebase--preserve-merges.sh:441
+msgid "This is the 1st commit message:"
msgstr ""
-#: sha1-file.c:1219
+#: sequencer.c:1657
#, c-format
-msgid "unable to unpack %s header with --allow-unknown-type"
+msgid "could not read commit message of %s"
msgstr ""
-#: sha1-file.c:1222
+#: sequencer.c:1664
#, c-format
-msgid "unable to unpack %s header"
+msgid "This is the commit message #%d:"
msgstr ""
-#: sha1-file.c:1228
+#: sequencer.c:1670
#, c-format
-msgid "unable to parse %s header with --allow-unknown-type"
+msgid "The commit message #%d will be skipped:"
msgstr ""
-#: sha1-file.c:1231
-#, c-format
-msgid "unable to parse %s header"
+#: sequencer.c:1758
+msgid "your index file is unmerged."
msgstr ""
-#: sha1-file.c:1422
-#, c-format
-msgid "failed to read object %s"
+#: sequencer.c:1765
+msgid "cannot fixup root commit"
msgstr ""
-#: sha1-file.c:1426
+#: sequencer.c:1784
#, c-format
-msgid "replacement %s not found for %s"
+msgid "commit %s is a merge but no -m option was given."
msgstr ""
-#: sha1-file.c:1430
+#: sequencer.c:1792 sequencer.c:1800
#, c-format
-msgid "loose object %s (stored in %s) is corrupt"
+msgid "commit %s does not have parent %d"
msgstr ""
-#: sha1-file.c:1434
+#: sequencer.c:1806
#, c-format
-msgid "packed object %s (stored in %s) is corrupt"
+msgid "cannot get commit message for %s"
msgstr ""
-#: sha1-file.c:1536
+#. TRANSLATORS: The first %s will be a "todo" command like
+#. "revert" or "pick", the second %s a SHA1.
+#: sequencer.c:1825
#, c-format
-msgid "unable to write sha1 filename %s"
+msgid "%s: cannot parse parent commit %s"
msgstr ""
-#: sha1-file.c:1543
+#: sequencer.c:1890
#, c-format
-msgid "unable to set permission to '%s'"
+msgid "could not rename '%s' to '%s'"
msgstr ""
-#: sha1-file.c:1550
-msgid "file write error"
+#: sequencer.c:1945
+#, c-format
+msgid "could not revert %s... %s"
msgstr ""
-#: sha1-file.c:1569
-msgid "error when closing sha1 file"
+#: sequencer.c:1946
+#, c-format
+msgid "could not apply %s... %s"
msgstr ""
-#: sha1-file.c:1635
+#: sequencer.c:2005
#, c-format
-msgid "insufficient permission for adding an object to repository database %s"
+msgid "git %s: failed to read the index"
msgstr ""
-#: sha1-file.c:1637
-msgid "unable to create temporary file"
+#: sequencer.c:2012
+#, c-format
+msgid "git %s: failed to refresh the index"
msgstr ""
-#: sha1-file.c:1661
-msgid "unable to write sha1 file"
+#: sequencer.c:2094
+#, c-format
+msgid "%s does not accept arguments: '%s'"
msgstr ""
-#: sha1-file.c:1667
+#: sequencer.c:2103
#, c-format
-msgid "unable to deflate new object %s (%d)"
+msgid "missing arguments for %s"
msgstr ""
-#: sha1-file.c:1671
+#: sequencer.c:2163
#, c-format
-msgid "deflateEnd on object %s failed (%d)"
+msgid "invalid line %d: %.*s"
msgstr ""
-#: sha1-file.c:1675
+#: sequencer.c:2171
#, c-format
-msgid "confused by unstable object source data for %s"
+msgid "cannot '%s' without a previous commit"
msgstr ""
-#: sha1-file.c:1685 builtin/pack-objects.c:899
-#, c-format
-msgid "failed utime() on %s"
+#: sequencer.c:2243
+msgid "please fix this using 'git rebase --edit-todo'."
msgstr ""
-#: sha1-file.c:1760
+#: sequencer.c:2245
#, c-format
-msgid "cannot read sha1_file for %s"
+msgid "unusable instruction sheet: '%s'"
msgstr ""
-#: sha1-file.c:1805
-msgid "corrupt commit"
+#: sequencer.c:2250
+msgid "no commits parsed."
msgstr ""
-#: sha1-file.c:1813
-msgid "corrupt tag"
+#: sequencer.c:2261
+msgid "cannot cherry-pick during a revert."
msgstr ""
-#: sha1-file.c:1906
-#, c-format
-msgid "read error while indexing %s"
+#: sequencer.c:2263
+msgid "cannot revert during a cherry-pick."
msgstr ""
-#: sha1-file.c:1909
+#: sequencer.c:2333
#, c-format
-msgid "short read while indexing %s"
+msgid "invalid value for %s: %s"
msgstr ""
-#: sha1-file.c:1980 sha1-file.c:1989
-#, c-format
-msgid "%s: failed to insert into database"
+#: sequencer.c:2420
+msgid "unusable squash-onto"
msgstr ""
-#: sha1-file.c:1995
+#: sequencer.c:2436
#, c-format
-msgid "%s: unsupported file type"
+msgid "malformed options sheet: '%s'"
msgstr ""
-#: sha1-file.c:2019
-#, c-format
-msgid "%s is not a valid object"
+#: sequencer.c:2518 sequencer.c:4067
+msgid "empty commit set passed"
msgstr ""
-#: sha1-file.c:2021
-#, c-format
-msgid "%s is not a valid '%s' object"
+#: sequencer.c:2526
+msgid "a cherry-pick or revert is already in progress"
msgstr ""
-#: sha1-file.c:2048 builtin/index-pack.c:158
-#, c-format
-msgid "unable to open %s"
+#: sequencer.c:2527
+msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
msgstr ""
-#: sha1-file.c:2217 sha1-file.c:2269
+#: sequencer.c:2530
#, c-format
-msgid "sha1 mismatch for %s (expected %s)"
+msgid "could not create sequencer directory '%s'"
msgstr ""
-#: sha1-file.c:2241
-#, c-format
-msgid "unable to mmap %s"
+#: sequencer.c:2544
+msgid "could not lock HEAD"
msgstr ""
-#: sha1-file.c:2246
-#, c-format
-msgid "unable to unpack header of %s"
+#: sequencer.c:2599 sequencer.c:3819
+msgid "no cherry-pick or revert in progress"
msgstr ""
-#: sha1-file.c:2252
-#, c-format
-msgid "unable to parse header of %s"
+#: sequencer.c:2601
+msgid "cannot resolve HEAD"
+msgstr ""
+
+#: sequencer.c:2603 sequencer.c:2638
+msgid "cannot abort from a branch yet to be born"
msgstr ""
-#: sha1-file.c:2263
+#: sequencer.c:2624 builtin/grep.c:732
#, c-format
-msgid "unable to unpack contents of %s"
+msgid "cannot open '%s'"
msgstr ""
-#: sha1-name.c:444
+#: sequencer.c:2626
#, c-format
-msgid "short SHA1 %s is ambiguous"
+msgid "cannot read '%s': %s"
msgstr ""
-#: sha1-name.c:455
-msgid "The candidates are:"
+#: sequencer.c:2627
+msgid "unexpected end of file"
msgstr ""
-#: 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"
-"may be created by mistake. For example,\n"
-"\n"
-" git checkout -b $br $(git rev-parse ...)\n"
-"\n"
-"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
-"examine these refs and maybe delete them. Turn this message off by\n"
-"running \"git config advice.objectNameWarning false\""
+#: sequencer.c:2633
+#, c-format
+msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr ""
-#: submodule.c:97 submodule.c:131
-msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
+#: sequencer.c:2644
+msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr ""
-#: submodule.c:101 submodule.c:135
+#: sequencer.c:2750 sequencer.c:3735
#, c-format
-msgid "Could not find section in .gitmodules where path=%s"
+msgid "could not update %s"
msgstr ""
-#: submodule.c:109
-#, c-format
-msgid "Could not update .gitmodules entry %s"
+#: sequencer.c:2788 sequencer.c:3715
+msgid "cannot read HEAD"
msgstr ""
-#: submodule.c:142
+#: sequencer.c:2805
#, c-format
-msgid "Could not remove .gitmodules entry for %s"
+msgid "unable to copy '%s' to '%s'"
msgstr ""
-#: submodule.c:153
-msgid "staging updated .gitmodules failed"
+#: sequencer.c:2813
+#, c-format
+msgid ""
+"You can amend the commit now, with\n"
+"\n"
+" git commit --amend %s\n"
+"\n"
+"Once you are satisfied with your changes, run\n"
+"\n"
+" git rebase --continue\n"
msgstr ""
-#: submodule.c:315
+#: sequencer.c:2823
#, c-format
-msgid "in unpopulated submodule '%s'"
+msgid "Could not apply %s... %.*s"
msgstr ""
-#: submodule.c:346
+#: sequencer.c:2830
#, c-format
-msgid "Pathspec '%s' is in submodule '%.*s'"
+msgid "Could not merge %.*s"
msgstr ""
-#: submodule.c:839
+#: sequencer.c:2844 sequencer.c:2848 builtin/difftool.c:641
#, c-format
-msgid "submodule entry '%s' (%s) is a %s, not a commit"
+msgid "could not copy '%s' to '%s'"
msgstr ""
-#: submodule.c:1071 builtin/branch.c:670 builtin/submodule--helper.c:1888
-msgid "Failed to resolve HEAD as a valid ref."
+#: sequencer.c:2870 sequencer.c:3293 builtin/rebase.c:424 builtin/rebase.c:1230
+#: builtin/rebase.c:1591 builtin/rebase.c:1646
+msgid "could not read index"
msgstr ""
-#: submodule.c:1377
+#: sequencer.c:2875
#, c-format
-msgid "'%s' not recognized as a git repository"
+msgid ""
+"execution failed: %s\n"
+"%sYou can fix the problem, and then run\n"
+"\n"
+" git rebase --continue\n"
+"\n"
msgstr ""
-#: submodule.c:1515
-#, c-format
-msgid "could not start 'git status' in submodule '%s'"
+#: sequencer.c:2881
+msgid "and made changes to the index and/or the working tree\n"
msgstr ""
-#: submodule.c:1528
+#: sequencer.c:2887
#, c-format
-msgid "could not run 'git status' in submodule '%s'"
+msgid ""
+"execution succeeded: %s\n"
+"but left changes to the index and/or the working tree\n"
+"Commit or stash your changes, and then run\n"
+"\n"
+" git rebase --continue\n"
+"\n"
msgstr ""
-#: submodule.c:1543
+#: sequencer.c:2948
#, c-format
-msgid "Could not unset core.worktree setting in submodule '%s'"
+msgid "illegal label name: '%.*s'"
msgstr ""
-#: submodule.c:1633
-#, c-format
-msgid "submodule '%s' has dirty index"
+#: sequencer.c:3002
+msgid "writing fake root commit"
msgstr ""
-#: submodule.c:1685
-#, c-format
-msgid "Submodule '%s' could not be updated."
+#: sequencer.c:3007
+msgid "writing squash-onto"
msgstr ""
-#: submodule.c:1734
+#: sequencer.c:3045 builtin/rebase.c:429 builtin/rebase.c:435
#, c-format
-msgid ""
-"relocate_gitdir for submodule '%s' with more than one worktree not supported"
+msgid "failed to find tree of %s"
msgstr ""
-#: submodule.c:1746 submodule.c:1802
-#, c-format
-msgid "could not lookup name for submodule '%s'"
+#: sequencer.c:3063 builtin/rebase.c:448
+msgid "could not write index"
msgstr ""
-#: submodule.c:1750 builtin/submodule--helper.c:1406
-#: builtin/submodule--helper.c:1416
+#: sequencer.c:3090
#, c-format
-msgid "could not create directory '%s'"
+msgid "could not resolve '%s'"
msgstr ""
-#: submodule.c:1753
-#, c-format
-msgid ""
-"Migrating git directory of '%s%s' from\n"
-"'%s' to\n"
-"'%s'\n"
+#: sequencer.c:3118
+msgid "cannot merge without a current revision"
msgstr ""
-#: submodule.c:1837
+#: sequencer.c:3140
#, c-format
-msgid "could not recurse into submodule '%s'"
+msgid "unable to parse '%.*s'"
msgstr ""
-#: submodule.c:1881
-msgid "could not start ls-files in .."
+#: sequencer.c:3149
+#, c-format
+msgid "nothing to merge: '%.*s'"
msgstr ""
-#: submodule.c:1920
-#, c-format
-msgid "ls-tree returned unexpected return code %d"
+#: sequencer.c:3161
+msgid "octopus merge cannot be executed on top of a [new root]"
msgstr ""
-#: submodule-config.c:231
+#: sequencer.c:3176
#, c-format
-msgid "ignoring suspicious submodule name: %s"
+msgid "could not get commit message of '%s'"
msgstr ""
-#: submodule-config.c:295
-msgid "negative values not allowed for submodule.fetchjobs"
+#: sequencer.c:3325
+#, c-format
+msgid "could not even attempt to merge '%.*s'"
msgstr ""
-#: submodule-config.c:468
-#, c-format
-msgid "invalid value for %s"
+#: sequencer.c:3341
+msgid "merge: Unable to write new index file"
msgstr ""
-#: trailer.c:238
+#: sequencer.c:3409 builtin/rebase.c:298
#, c-format
-msgid "running trailer command '%s' failed"
+msgid "Applied autostash.\n"
msgstr ""
-#: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553
-#: trailer.c:557
+#: sequencer.c:3421
#, c-format
-msgid "unknown value '%s' for key '%s'"
+msgid "cannot store %s"
msgstr ""
-#: trailer.c:539 trailer.c:544 builtin/remote.c:294
+#: sequencer.c:3424 builtin/rebase.c:314
#, c-format
-msgid "more than one %s"
+msgid ""
+"Applying autostash resulted in conflicts.\n"
+"Your changes are safe in the stash.\n"
+"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
msgstr ""
-#: trailer.c:730
+#: sequencer.c:3478
#, c-format
-msgid "empty trailer token in trailer '%.*s'"
+msgid "could not checkout %s"
msgstr ""
-#: trailer.c:750
+#: sequencer.c:3492
#, c-format
-msgid "could not read input file '%s'"
+msgid "%s: not a valid OID"
msgstr ""
-#: trailer.c:753
-msgid "could not read from stdin"
+#: sequencer.c:3497 git-rebase--preserve-merges.sh:724
+msgid "could not detach HEAD"
msgstr ""
-#: trailer.c:1008 builtin/am.c:47
+#: sequencer.c:3512
#, c-format
-msgid "could not stat %s"
+msgid "Stopped at HEAD\n"
msgstr ""
-#: trailer.c:1010
+#: sequencer.c:3514
#, c-format
-msgid "file %s is not a regular file"
+msgid "Stopped at %s\n"
msgstr ""
-#: trailer.c:1012
+#: sequencer.c:3522
#, c-format
-msgid "file %s is not writable by user"
+msgid ""
+"Could not execute the todo command\n"
+"\n"
+" %.*s\n"
+"It has been rescheduled; To edit the command before continuing, please\n"
+"edit the todo list first:\n"
+"\n"
+" git rebase --edit-todo\n"
+" git rebase --continue\n"
msgstr ""
-#: trailer.c:1024
-msgid "could not open temporary file"
+#: sequencer.c:3597
+#, c-format
+msgid "Stopped at %s... %.*s\n"
msgstr ""
-#: trailer.c:1064
+#: sequencer.c:3677
#, c-format
-msgid "could not rename temporary file to %s"
+msgid "unknown command %d"
msgstr ""
-#: transport.c:116
-#, c-format
-msgid "Would set upstream of '%s' to '%s' of '%s'\n"
+#: sequencer.c:3723
+msgid "could not read orig-head"
msgstr ""
-#: transport.c:142
-#, c-format
-msgid "could not read bundle '%s'"
+#: sequencer.c:3728 sequencer.c:4805
+msgid "could not read 'onto'"
msgstr ""
-#: transport.c:208
+#: sequencer.c:3742
#, c-format
-msgid "transport: invalid depth option '%s'"
+msgid "could not update HEAD to %s"
msgstr ""
-#: transport.c:586
-msgid "could not parse transport.color.* config"
+#: sequencer.c:3831
+msgid "cannot rebase: You have unstaged changes."
msgstr ""
-#: transport.c:659
-msgid "support for protocol v2 not implemented yet"
+#: sequencer.c:3840
+msgid "cannot amend non-existing commit"
msgstr ""
-#: transport.c:785
+#: sequencer.c:3842
#, c-format
-msgid "unknown value for config '%s': %s"
+msgid "invalid file: '%s'"
msgstr ""
-#: transport.c:851
+#: sequencer.c:3844
#, c-format
-msgid "transport '%s' not allowed"
-msgstr ""
-
-#: transport.c:903
-msgid "git-over-rsync is no longer supported"
+msgid "invalid contents: '%s'"
msgstr ""
-#: transport.c:998
-#, c-format
+#: sequencer.c:3847
msgid ""
-"The following submodule paths contain changes that can\n"
-"not be found on any remote:\n"
+"\n"
+"You have uncommitted changes in your working tree. Please, commit them\n"
+"first and then run 'git rebase --continue' again."
msgstr ""
-#: transport.c:1002
+#: sequencer.c:3883 sequencer.c:3921
#, c-format
-msgid ""
-"\n"
-"Please try\n"
-"\n"
-"\tgit push --recurse-submodules=on-demand\n"
-"\n"
-"or cd to the path and use\n"
-"\n"
-"\tgit push\n"
-"\n"
-"to push them to a remote.\n"
-"\n"
+msgid "could not write file: '%s'"
msgstr ""
-#: transport.c:1010
-msgid "Aborting."
+#: sequencer.c:3936
+msgid "could not remove CHERRY_PICK_HEAD"
msgstr ""
-#: transport.c:1148
-msgid "failed to push all needed submodules"
+#: sequencer.c:3943
+msgid "could not commit staged changes."
msgstr ""
-#: transport.c:1270 transport-helper.c:643
-msgid "operation not supported by protocol"
+#: sequencer.c:4044
+#, c-format
+msgid "%s: can't cherry-pick a %s"
msgstr ""
-#: transport.c:1352
+#: sequencer.c:4048
#, c-format
-msgid "invalid line while parsing alternate refs: %s"
+msgid "%s: bad revision"
msgstr ""
-#: transport-helper.c:51 transport-helper.c:80
-msgid "full write to remote helper failed"
+#: sequencer.c:4083
+msgid "can't revert as initial commit"
msgstr ""
-#: transport-helper.c:132
-#, c-format
-msgid "unable to find remote helper for '%s'"
+#: sequencer.c:4529
+msgid "make_script: unhandled options"
msgstr ""
-#: transport-helper.c:148 transport-helper.c:557
-msgid "can't dup helper output fd"
+#: sequencer.c:4532
+msgid "make_script: error preparing revisions"
msgstr ""
-#: transport-helper.c:199
+#: sequencer.c:4573 sequencer.c:4629 sequencer.c:4904
#, c-format
-msgid ""
-"unknown mandatory capability %s; this remote helper probably needs newer "
-"version of Git"
+msgid "unusable todo list: '%s'"
msgstr ""
-#: transport-helper.c:205
-msgid "this remote helper should implement refspec capability"
+#: sequencer.c:4684
+#, c-format
+msgid ""
+"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
msgstr ""
-#: transport-helper.c:272 transport-helper.c:412
+#: sequencer.c:4754
#, c-format
-msgid "%s unexpectedly said: '%s'"
+msgid ""
+"Warning: some commits may have been dropped accidentally.\n"
+"Dropped commits (newer to older):\n"
msgstr ""
-#: transport-helper.c:401
+#: sequencer.c:4761
#, c-format
-msgid "%s also locked %s"
+msgid ""
+"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
+"\n"
+"Use 'git config rebase.missingCommitsCheck' to change the level of "
+"warnings.\n"
+"The possible behaviours are: ignore, warn, error.\n"
+"\n"
msgstr ""
-#: transport-helper.c:479
-msgid "couldn't run fast-import"
+#: sequencer.c:4774
+#, c-format
+msgid ""
+"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
+"continue'.\n"
+"Or you can abort the rebase with 'git rebase --abort'.\n"
msgstr ""
-#: transport-helper.c:502
-msgid "error while running fast-import"
+#: sequencer.c:4912 sequencer.c:4950
+msgid "nothing to do"
msgstr ""
-#: transport-helper.c:531 transport-helper.c:1091
+#: sequencer.c:4916
#, c-format
-msgid "could not read ref %s"
-msgstr ""
+msgid "Rebase %s onto %s (%d command)"
+msgid_plural "Rebase %s onto %s (%d commands)"
+msgstr[0] ""
+msgstr[1] ""
-#: transport-helper.c:576
+#: sequencer.c:4928
#, c-format
-msgid "unknown response to connect: %s"
+msgid "could not copy '%s' to '%s'."
msgstr ""
-#: transport-helper.c:598
-msgid "setting remote service path not supported by protocol"
+#: sequencer.c:4932 sequencer.c:4961
+msgid "could not transform the todo list"
msgstr ""
-#: transport-helper.c:600
-msgid "invalid remote service path"
+#: sequencer.c:4964
+msgid "could not skip unnecessary pick commands"
msgstr ""
-#: transport-helper.c:646
-#, c-format
-msgid "can't connect to subservice %s"
+#: sequencer.c:5047
+msgid "the script was already rearranged."
msgstr ""
-#: transport-helper.c:713
+#: setup.c:123
#, c-format
-msgid "expected ok/error, helper said '%s'"
+msgid "'%s' is outside repository"
msgstr ""
-#: transport-helper.c:766
+#: setup.c:172
#, c-format
-msgid "helper reported unexpected status of %s"
+msgid ""
+"%s: no such path in the working tree.\n"
+"Use 'git <command> -- <path>...' to specify paths that do not exist locally."
msgstr ""
-#: transport-helper.c:827
+#: setup.c:185
#, c-format
-msgid "helper %s does not support dry-run"
+msgid ""
+"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
+"Use '--' to separate paths from revisions, like this:\n"
+"'git <command> [<revision>...] -- [<file>...]'"
msgstr ""
-#: transport-helper.c:830
+#: setup.c:234
#, c-format
-msgid "helper %s does not support --signed"
+msgid "option '%s' must come before non-option arguments"
msgstr ""
-#: transport-helper.c:833
+#: setup.c:253
#, 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'"
+msgid ""
+"ambiguous argument '%s': both revision and filename\n"
+"Use '--' to separate paths from revisions, like this:\n"
+"'git <command> [<revision>...] -- [<file>...]'"
msgstr ""
-#: transport-helper.c:932
-msgid "remote-helper doesn't support push; refspec needed"
+#: setup.c:389
+msgid "unable to set up work tree using invalid config"
msgstr ""
-#: transport-helper.c:937
-#, c-format
-msgid "helper %s does not support 'force'"
+#: setup.c:393
+msgid "this operation must be run in a work tree"
msgstr ""
-#: transport-helper.c:984
-msgid "couldn't run fast-export"
+#: setup.c:527
+#, c-format
+msgid "Expected git repo version <= %d, found %d"
msgstr ""
-#: transport-helper.c:989
-msgid "error while running fast-export"
+#: setup.c:535
+msgid "unknown repository extensions found:"
msgstr ""
-#: transport-helper.c:1014
+#: setup.c:554
#, c-format
-msgid ""
-"No refs in common and none specified; doing nothing.\n"
-"Perhaps you should specify a branch such as 'master'.\n"
+msgid "error opening '%s'"
msgstr ""
-#: transport-helper.c:1077
+#: setup.c:556
#, c-format
-msgid "malformed response in ref list: %s"
+msgid "too large to be a .git file: '%s'"
msgstr ""
-#: transport-helper.c:1230
+#: setup.c:558
#, c-format
-msgid "read(%s) failed"
+msgid "error reading %s"
msgstr ""
-#: transport-helper.c:1257
+#: setup.c:560
#, c-format
-msgid "write(%s) failed"
+msgid "invalid gitfile format: %s"
msgstr ""
-#: transport-helper.c:1306
+#: setup.c:562
#, c-format
-msgid "%s thread failed"
+msgid "no path in gitfile: %s"
msgstr ""
-#: transport-helper.c:1310
+#: setup.c:564
#, c-format
-msgid "%s thread failed to join: %s"
+msgid "not a git repository: %s"
msgstr ""
-#: transport-helper.c:1329 transport-helper.c:1333
+#: setup.c:663
#, c-format
-msgid "can't start thread for copying data: %s"
+msgid "'$%s' too big"
msgstr ""
-#: transport-helper.c:1370
+#: setup.c:677
#, c-format
-msgid "%s process failed to wait"
+msgid "not a git repository: '%s'"
msgstr ""
-#: transport-helper.c:1374
+#: setup.c:706 setup.c:708 setup.c:739
#, c-format
-msgid "%s process failed"
+msgid "cannot chdir to '%s'"
msgstr ""
-#: transport-helper.c:1392 transport-helper.c:1401
-msgid "can't start thread for copying data"
+#: setup.c:711 setup.c:767 setup.c:777 setup.c:816 setup.c:824
+msgid "cannot come back to cwd"
msgstr ""
-#: tree-walk.c:33
-msgid "too-short tree object"
+#: setup.c:838
+#, c-format
+msgid "failed to stat '%*s%s%s'"
msgstr ""
-#: tree-walk.c:39
-msgid "malformed mode in tree entry"
+#: setup.c:1068
+msgid "Unable to read current working directory"
msgstr ""
-#: tree-walk.c:43
-msgid "empty filename in tree entry"
+#: setup.c:1077 setup.c:1083
+#, c-format
+msgid "cannot change to '%s'"
msgstr ""
-#: tree-walk.c:115
-msgid "too-short tree file"
+#: setup.c:1088
+#, c-format
+msgid "not a git repository (or any of the parent directories): %s"
msgstr ""
-#: unpack-trees.c:112
+#: setup.c:1094
#, 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."
+"not a git repository (or any parent up to mount point %s)\n"
+"Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."
msgstr ""
-#: unpack-trees.c:114
+#: setup.c:1204
#, c-format
msgid ""
-"Your local changes to the following files would be overwritten by checkout:\n"
-"%%s"
+"problem with core.sharedRepository filemode value (0%.3o).\n"
+"The owner of files must always have read and write permissions."
msgstr ""
-#: unpack-trees.c:117
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by merge:\n"
-"%%sPlease commit your changes or stash them before you merge."
+#: setup.c:1247
+msgid "open /dev/null or dup failed"
msgstr ""
-#: unpack-trees.c:119
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by merge:\n"
-"%%s"
+#: setup.c:1262
+msgid "fork failed"
msgstr ""
-#: unpack-trees.c:122
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by %s:\n"
-"%%sPlease commit your changes or stash them before you %s."
+#: setup.c:1267
+msgid "setsid failed"
msgstr ""
-#: unpack-trees.c:124
+#: sha1-file.c:445
#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by %s:\n"
-"%%s"
+msgid "object directory %s does not exist; check .git/objects/info/alternates"
msgstr ""
-#: unpack-trees.c:129
+#: sha1-file.c:496
#, c-format
-msgid ""
-"Updating the following directories would lose untracked files in them:\n"
-"%s"
+msgid "unable to normalize alternate object path: %s"
msgstr ""
-#: unpack-trees.c:133
+#: sha1-file.c:568
#, c-format
-msgid ""
-"The following untracked working tree files would be removed by checkout:\n"
-"%%sPlease move or remove them before you switch branches."
+msgid "%s: ignoring alternate object stores, nesting too deep"
msgstr ""
-#: unpack-trees.c:135
+#: sha1-file.c:575
#, c-format
-msgid ""
-"The following untracked working tree files would be removed by checkout:\n"
-"%%s"
+msgid "unable to normalize object directory: %s"
msgstr ""
-#: unpack-trees.c:138
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by merge:\n"
-"%%sPlease move or remove them before you merge."
+#: sha1-file.c:618
+msgid "unable to fdopen alternates lockfile"
msgstr ""
-#: unpack-trees.c:140
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by merge:\n"
-"%%s"
+#: sha1-file.c:636
+msgid "unable to read alternates file"
msgstr ""
-#: unpack-trees.c:143
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by %s:\n"
-"%%sPlease move or remove them before you %s."
+#: sha1-file.c:643
+msgid "unable to move new alternates file into place"
msgstr ""
-#: unpack-trees.c:145
+#: sha1-file.c:678
#, c-format
-msgid ""
-"The following untracked working tree files would be removed by %s:\n"
-"%%s"
+msgid "path '%s' does not exist"
msgstr ""
-#: unpack-trees.c:151
+#: sha1-file.c:704
#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by "
-"checkout:\n"
-"%%sPlease move or remove them before you switch branches."
+msgid "reference repository '%s' as a linked checkout is not supported yet."
msgstr ""
-#: unpack-trees.c:153
+#: sha1-file.c:710
#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by "
-"checkout:\n"
-"%%s"
+msgid "reference repository '%s' is not a local repository."
msgstr ""
-#: unpack-trees.c:156
+#: sha1-file.c:716
#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by merge:\n"
-"%%sPlease move or remove them before you merge."
+msgid "reference repository '%s' is shallow"
msgstr ""
-#: unpack-trees.c:158
+#: sha1-file.c:724
#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by merge:\n"
-"%%s"
+msgid "reference repository '%s' is grafted"
msgstr ""
-#: unpack-trees.c:161
+#: sha1-file.c:838
#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by %s:\n"
-"%%sPlease move or remove them before you %s."
+msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
msgstr ""
-#: unpack-trees.c:163
+#: sha1-file.c:863
+msgid "mmap failed"
+msgstr ""
+
+#: sha1-file.c:1027
#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by %s:\n"
-"%%s"
+msgid "object file %s is empty"
msgstr ""
-#: unpack-trees.c:171
+#: sha1-file.c:1151 sha1-file.c:2288
#, c-format
-msgid "Entry '%s' overlaps with '%s'. Cannot bind."
+msgid "corrupt loose object '%s'"
msgstr ""
-#: unpack-trees.c:174
+#: sha1-file.c:1153 sha1-file.c:2292
#, c-format
-msgid ""
-"Cannot update sparse checkout: the following entries are not up to date:\n"
-"%s"
+msgid "garbage at end of loose object '%s'"
+msgstr ""
+
+#: sha1-file.c:1195
+msgid "invalid object type"
msgstr ""
-#: unpack-trees.c:176
+#: sha1-file.c:1279
#, c-format
-msgid ""
-"The following working tree files would be overwritten by sparse checkout "
-"update:\n"
-"%s"
+msgid "unable to unpack %s header with --allow-unknown-type"
msgstr ""
-#: unpack-trees.c:178
+#: sha1-file.c:1282
#, c-format
-msgid ""
-"The following working tree files would be removed by sparse checkout "
-"update:\n"
-"%s"
+msgid "unable to unpack %s header"
msgstr ""
-#: unpack-trees.c:180
+#: sha1-file.c:1288
#, c-format
-msgid ""
-"Cannot update submodule:\n"
-"%s"
+msgid "unable to parse %s header with --allow-unknown-type"
msgstr ""
-#: unpack-trees.c:254
+#: sha1-file.c:1291
#, c-format
-msgid "Aborting\n"
+msgid "unable to parse %s header"
msgstr ""
-#: unpack-trees.c:336
-msgid "Checking out files"
+#: sha1-file.c:1481
+#, c-format
+msgid "failed to read object %s"
msgstr ""
-#: urlmatch.c:163
-msgid "invalid URL scheme name or missing '://' suffix"
+#: sha1-file.c:1485
+#, c-format
+msgid "replacement %s not found for %s"
msgstr ""
-#: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405
+#: sha1-file.c:1489
#, c-format
-msgid "invalid %XX escape sequence"
+msgid "loose object %s (stored in %s) is corrupt"
msgstr ""
-#: urlmatch.c:215
-msgid "missing host and scheme is not 'file:'"
+#: sha1-file.c:1493
+#, c-format
+msgid "packed object %s (stored in %s) is corrupt"
msgstr ""
-#: urlmatch.c:232
-msgid "a 'file:' URL may not have a port number"
+#: sha1-file.c:1595
+#, c-format
+msgid "unable to write file %s"
msgstr ""
-#: urlmatch.c:247
-msgid "invalid characters in host name"
+#: sha1-file.c:1602
+#, c-format
+msgid "unable to set permission to '%s'"
msgstr ""
-#: urlmatch.c:292 urlmatch.c:303
-msgid "invalid port number"
+#: sha1-file.c:1609
+msgid "file write error"
msgstr ""
-#: urlmatch.c:371
-msgid "invalid '..' path segment"
+#: sha1-file.c:1628
+msgid "error when closing loose object file"
msgstr ""
-#: worktree.c:245 builtin/am.c:2147
+#: sha1-file.c:1693
#, c-format
-msgid "failed to read '%s'"
+msgid "insufficient permission for adding an object to repository database %s"
msgstr ""
-#: worktree.c:291
-#, c-format
-msgid "'%s' at main working tree is not the repository directory"
+#: sha1-file.c:1695
+msgid "unable to create temporary file"
msgstr ""
-#: worktree.c:302
-#, c-format
-msgid "'%s' file does not contain absolute path to the working tree location"
+#: sha1-file.c:1719
+msgid "unable to write loose object file"
msgstr ""
-#: worktree.c:314
+#: sha1-file.c:1725
#, c-format
-msgid "'%s' does not exist"
+msgid "unable to deflate new object %s (%d)"
msgstr ""
-#: worktree.c:320
+#: sha1-file.c:1729
#, c-format
-msgid "'%s' is not a .git file, error code %d"
+msgid "deflateEnd on object %s failed (%d)"
msgstr ""
-#: worktree.c:328
+#: sha1-file.c:1733
#, c-format
-msgid "'%s' does not point back to '%s'"
+msgid "confused by unstable object source data for %s"
msgstr ""
-#: wrapper.c:223 wrapper.c:393
+#: sha1-file.c:1743 builtin/pack-objects.c:919
#, c-format
-msgid "could not open '%s' for reading and writing"
+msgid "failed utime() on %s"
msgstr ""
-#: wrapper.c:227 wrapper.c:397 builtin/am.c:321 builtin/am.c:771
-#: builtin/am.c:863 builtin/merge.c:1078
+#: sha1-file.c:1818
#, c-format
-msgid "could not open '%s' for reading"
+msgid "cannot read object for %s"
msgstr ""
-#: wrapper.c:424 wrapper.c:624
-#, c-format
-msgid "unable to access '%s'"
+#: sha1-file.c:1858
+msgid "corrupt commit"
msgstr ""
-#: wrapper.c:632
-msgid "unable to get current working directory"
+#: sha1-file.c:1866
+msgid "corrupt tag"
msgstr ""
-#: wt-status.c:154
-msgid "Unmerged paths:"
+#: sha1-file.c:1965
+#, c-format
+msgid "read error while indexing %s"
msgstr ""
-#: wt-status.c:181 wt-status.c:208
+#: sha1-file.c:1968
#, c-format
-msgid " (use \"git reset %s <file>...\" to unstage)"
+msgid "short read while indexing %s"
msgstr ""
-#: wt-status.c:183 wt-status.c:210
-msgid " (use \"git rm --cached <file>...\" to unstage)"
+#: sha1-file.c:2041 sha1-file.c:2050
+#, c-format
+msgid "%s: failed to insert into database"
msgstr ""
-#: wt-status.c:187
-msgid " (use \"git add <file>...\" to mark resolution)"
+#: sha1-file.c:2056
+#, c-format
+msgid "%s: unsupported file type"
msgstr ""
-#: wt-status.c:189 wt-status.c:193
-msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
+#: sha1-file.c:2080
+#, c-format
+msgid "%s is not a valid object"
msgstr ""
-#: wt-status.c:191
-msgid " (use \"git rm <file>...\" to mark resolution)"
+#: sha1-file.c:2082
+#, c-format
+msgid "%s is not a valid '%s' object"
msgstr ""
-#: wt-status.c:202 wt-status.c:1015
-msgid "Changes to be committed:"
+#: sha1-file.c:2109 builtin/index-pack.c:154
+#, c-format
+msgid "unable to open %s"
msgstr ""
-#: wt-status.c:220 wt-status.c:1024
-msgid "Changes not staged for commit:"
+#: sha1-file.c:2299 sha1-file.c:2351
+#, c-format
+msgid "hash mismatch for %s (expected %s)"
msgstr ""
-#: wt-status.c:224
-msgid " (use \"git add <file>...\" to update what will be committed)"
+#: sha1-file.c:2323
+#, c-format
+msgid "unable to mmap %s"
msgstr ""
-#: wt-status.c:226
-msgid " (use \"git add/rm <file>...\" to update what will be committed)"
+#: sha1-file.c:2328
+#, c-format
+msgid "unable to unpack header of %s"
msgstr ""
-#: wt-status.c:227
-msgid ""
-" (use \"git checkout -- <file>...\" to discard changes in working directory)"
+#: sha1-file.c:2334
+#, c-format
+msgid "unable to parse header of %s"
msgstr ""
-#: wt-status.c:229
-msgid " (commit or discard the untracked or modified content in submodules)"
+#: sha1-file.c:2345
+#, c-format
+msgid "unable to unpack contents of %s"
msgstr ""
-#: wt-status.c:241
+#: sha1-name.c:448
#, c-format
-msgid " (use \"git %s <file>...\" to include in what will be committed)"
+msgid "short SHA1 %s is ambiguous"
msgstr ""
-#: wt-status.c:256
-msgid "both deleted:"
-msgstr ""
-
-#: wt-status.c:258
-msgid "added by us:"
+#: sha1-name.c:459
+msgid "The candidates are:"
msgstr ""
-#: wt-status.c:260
-msgid "deleted by them:"
+#: sha1-name.c:742
+msgid ""
+"Git normally never creates a ref that ends with 40 hex characters\n"
+"because it will be ignored when you just specify 40-hex. These refs\n"
+"may be created by mistake. For example,\n"
+"\n"
+" git checkout -b $br $(git rev-parse ...)\n"
+"\n"
+"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
+"examine these refs and maybe delete them. Turn this message off by\n"
+"running \"git config advice.objectNameWarning false\""
msgstr ""
-#: wt-status.c:262
-msgid "added by them:"
+#: submodule.c:114 submodule.c:143
+msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
msgstr ""
-#: wt-status.c:264
-msgid "deleted by us:"
+#: submodule.c:118 submodule.c:147
+#, c-format
+msgid "Could not find section in .gitmodules where path=%s"
msgstr ""
-#: wt-status.c:266
-msgid "both added:"
+#: submodule.c:154
+#, c-format
+msgid "Could not remove .gitmodules entry for %s"
msgstr ""
-#: wt-status.c:268
-msgid "both modified:"
+#: submodule.c:165
+msgid "staging updated .gitmodules failed"
msgstr ""
-#: wt-status.c:278
-msgid "new file:"
+#: submodule.c:327
+#, c-format
+msgid "in unpopulated submodule '%s'"
msgstr ""
-#: wt-status.c:280
-msgid "copied:"
+#: submodule.c:358
+#, c-format
+msgid "Pathspec '%s' is in submodule '%.*s'"
msgstr ""
-#: wt-status.c:282
-msgid "deleted:"
+#: submodule.c:906
+#, c-format
+msgid "submodule entry '%s' (%s) is a %s, not a commit"
msgstr ""
-#: wt-status.c:284
-msgid "modified:"
+#: submodule.c:1143 builtin/branch.c:656 builtin/submodule--helper.c:1989
+msgid "Failed to resolve HEAD as a valid ref."
msgstr ""
-#: wt-status.c:286
-msgid "renamed:"
+#: submodule.c:1477
+#, c-format
+msgid "Could not access submodule '%s'"
msgstr ""
-#: wt-status.c:288
-msgid "typechange:"
+#: submodule.c:1639
+#, c-format
+msgid "'%s' not recognized as a git repository"
msgstr ""
-#: wt-status.c:290
-msgid "unknown:"
+#: submodule.c:1777
+#, c-format
+msgid "could not start 'git status' in submodule '%s'"
msgstr ""
-#: wt-status.c:292
-msgid "unmerged:"
+#: submodule.c:1790
+#, c-format
+msgid "could not run 'git status' in submodule '%s'"
msgstr ""
-#: wt-status.c:372
-msgid "new commits, "
+#: submodule.c:1805
+#, c-format
+msgid "Could not unset core.worktree setting in submodule '%s'"
msgstr ""
-#: wt-status.c:374
-msgid "modified content, "
+#: submodule.c:1895
+#, c-format
+msgid "submodule '%s' has dirty index"
msgstr ""
-#: wt-status.c:376
-msgid "untracked content, "
+#: submodule.c:1947
+#, c-format
+msgid "Submodule '%s' could not be updated."
msgstr ""
-#: wt-status.c:853
+#: submodule.c:1996
#, c-format
-msgid "Your stash currently has %d entry"
-msgid_plural "Your stash currently has %d entries"
-msgstr[0] ""
-msgstr[1] ""
-
-#: wt-status.c:885
-msgid "Submodules changed but not updated:"
+msgid ""
+"relocate_gitdir for submodule '%s' with more than one worktree not supported"
msgstr ""
-#: wt-status.c:887
-msgid "Submodule changes to be committed:"
+#: submodule.c:2008 submodule.c:2064
+#, c-format
+msgid "could not lookup name for submodule '%s'"
msgstr ""
-#: wt-status.c:969
+#: submodule.c:2015
+#, c-format
msgid ""
-"Do not modify or remove the line above.\n"
-"Everything below it will be ignored."
-msgstr ""
-
-#: wt-status.c:1084
-msgid "You have unmerged paths."
+"Migrating git directory of '%s%s' from\n"
+"'%s' to\n"
+"'%s'\n"
msgstr ""
-#: wt-status.c:1087
-msgid " (fix conflicts and run \"git commit\")"
+#: submodule.c:2099
+#, c-format
+msgid "could not recurse into submodule '%s'"
msgstr ""
-#: wt-status.c:1089
-msgid " (use \"git merge --abort\" to abort the merge)"
+#: submodule.c:2143
+msgid "could not start ls-files in .."
msgstr ""
-#: wt-status.c:1094
-msgid "All conflicts fixed but you are still merging."
+#: submodule.c:2182
+#, c-format
+msgid "ls-tree returned unexpected return code %d"
msgstr ""
-#: wt-status.c:1097
-msgid " (use \"git commit\" to conclude merge)"
+#: submodule-config.c:232
+#, c-format
+msgid "ignoring suspicious submodule name: %s"
msgstr ""
-#: wt-status.c:1107
-msgid "You are in the middle of an am session."
+#: submodule-config.c:296
+msgid "negative values not allowed for submodule.fetchjobs"
msgstr ""
-#: wt-status.c:1110
-msgid "The current patch is empty."
+#: submodule-config.c:390
+#, c-format
+msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
msgstr ""
-#: wt-status.c:1114
-msgid " (fix conflicts and then run \"git am --continue\")"
+#: submodule-config.c:479
+#, c-format
+msgid "invalid value for %s"
msgstr ""
-#: wt-status.c:1116
-msgid " (use \"git am --skip\" to skip this patch)"
+#: submodule-config.c:754
+#, c-format
+msgid "Could not update .gitmodules entry %s"
msgstr ""
-#: wt-status.c:1118
-msgid " (use \"git am --abort\" to restore the original branch)"
+#: trailer.c:238
+#, c-format
+msgid "running trailer command '%s' failed"
msgstr ""
-#: wt-status.c:1250
-msgid "git-rebase-todo is missing."
+#: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553
+#: trailer.c:557
+#, c-format
+msgid "unknown value '%s' for key '%s'"
msgstr ""
-#: wt-status.c:1252
-msgid "No commands done."
+#: trailer.c:539 trailer.c:544 builtin/remote.c:295
+#, c-format
+msgid "more than one %s"
msgstr ""
-#: wt-status.c:1255
+#: trailer.c:730
#, c-format
-msgid "Last command done (%d command done):"
-msgid_plural "Last commands done (%d commands done):"
-msgstr[0] ""
-msgstr[1] ""
+msgid "empty trailer token in trailer '%.*s'"
+msgstr ""
-#: wt-status.c:1266
+#: trailer.c:750
#, c-format
-msgid " (see more in file %s)"
+msgid "could not read input file '%s'"
msgstr ""
-#: wt-status.c:1271
-msgid "No commands remaining."
+#: trailer.c:753
+msgid "could not read from stdin"
msgstr ""
-#: wt-status.c:1274
+#: trailer.c:1011 wrapper.c:701
#, c-format
-msgid "Next command to do (%d remaining command):"
-msgid_plural "Next commands to do (%d remaining commands):"
-msgstr[0] ""
-msgstr[1] ""
-
-#: wt-status.c:1282
-msgid " (use \"git rebase --edit-todo\" to view and edit)"
+msgid "could not stat %s"
msgstr ""
-#: wt-status.c:1295
+#: trailer.c:1013
#, c-format
-msgid "You are currently rebasing branch '%s' on '%s'."
+msgid "file %s is not a regular file"
msgstr ""
-#: wt-status.c:1300
-msgid "You are currently rebasing."
+#: trailer.c:1015
+#, c-format
+msgid "file %s is not writable by user"
msgstr ""
-#: wt-status.c:1314
-msgid " (fix conflicts and then run \"git rebase --continue\")"
+#: trailer.c:1027
+msgid "could not open temporary file"
msgstr ""
-#: wt-status.c:1316
-msgid " (use \"git rebase --skip\" to skip this patch)"
+#: trailer.c:1067
+#, c-format
+msgid "could not rename temporary file to %s"
msgstr ""
-#: wt-status.c:1318
-msgid " (use \"git rebase --abort\" to check out the original branch)"
+#: transport.c:116
+#, c-format
+msgid "Would set upstream of '%s' to '%s' of '%s'\n"
msgstr ""
-#: wt-status.c:1324
-msgid " (all conflicts fixed: run \"git rebase --continue\")"
+#: transport.c:142
+#, c-format
+msgid "could not read bundle '%s'"
msgstr ""
-#: wt-status.c:1328
+#: transport.c:208
#, c-format
-msgid ""
-"You are currently splitting a commit while rebasing branch '%s' on '%s'."
+msgid "transport: invalid depth option '%s'"
msgstr ""
-#: wt-status.c:1333
-msgid "You are currently splitting a commit during a rebase."
+#: transport.c:617
+msgid "could not parse transport.color.* config"
msgstr ""
-#: wt-status.c:1336
-msgid " (Once your working directory is clean, run \"git rebase --continue\")"
+#: transport.c:690
+msgid "support for protocol v2 not implemented yet"
msgstr ""
-#: wt-status.c:1340
+#: transport.c:817
#, c-format
-msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
+msgid "unknown value for config '%s': %s"
msgstr ""
-#: wt-status.c:1345
-msgid "You are currently editing a commit during a rebase."
+#: transport.c:883
+#, c-format
+msgid "transport '%s' not allowed"
msgstr ""
-#: wt-status.c:1348
-msgid " (use \"git commit --amend\" to amend the current commit)"
+#: transport.c:937
+msgid "git-over-rsync is no longer supported"
msgstr ""
-#: wt-status.c:1350
+#: transport.c:1032
+#, c-format
msgid ""
-" (use \"git rebase --continue\" once you are satisfied with your changes)"
+"The following submodule paths contain changes that can\n"
+"not be found on any remote:\n"
msgstr ""
-#: wt-status.c:1360
+#: transport.c:1036
#, c-format
-msgid "You are currently cherry-picking commit %s."
+msgid ""
+"\n"
+"Please try\n"
+"\n"
+"\tgit push --recurse-submodules=on-demand\n"
+"\n"
+"or cd to the path and use\n"
+"\n"
+"\tgit push\n"
+"\n"
+"to push them to a remote.\n"
+"\n"
msgstr ""
-#: wt-status.c:1365
-msgid " (fix conflicts and run \"git cherry-pick --continue\")"
+#: transport.c:1044
+msgid "Aborting."
msgstr ""
-#: wt-status.c:1368
-msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
+#: transport.c:1184
+msgid "failed to push all needed submodules"
msgstr ""
-#: wt-status.c:1370
-msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
+#: transport.c:1317 transport-helper.c:643
+msgid "operation not supported by protocol"
msgstr ""
-#: wt-status.c:1379
+#: transport.c:1421
#, c-format
-msgid "You are currently reverting commit %s."
+msgid "invalid line while parsing alternate refs: %s"
msgstr ""
-#: wt-status.c:1384
-msgid " (fix conflicts and run \"git revert --continue\")"
+#: transport-helper.c:51 transport-helper.c:80
+msgid "full write to remote helper failed"
msgstr ""
-#: wt-status.c:1387
-msgid " (all conflicts fixed: run \"git revert --continue\")"
+#: transport-helper.c:132
+#, c-format
+msgid "unable to find remote helper for '%s'"
msgstr ""
-#: wt-status.c:1389
-msgid " (use \"git revert --abort\" to cancel the revert operation)"
+#: transport-helper.c:148 transport-helper.c:557
+msgid "can't dup helper output fd"
msgstr ""
-#: wt-status.c:1400
+#: transport-helper.c:199
#, c-format
-msgid "You are currently bisecting, started from branch '%s'."
+msgid ""
+"unknown mandatory capability %s; this remote helper probably needs newer "
+"version of Git"
msgstr ""
-#: wt-status.c:1404
-msgid "You are currently bisecting."
+#: transport-helper.c:205
+msgid "this remote helper should implement refspec capability"
msgstr ""
-#: wt-status.c:1407
-msgid " (use \"git bisect reset\" to get back to the original branch)"
+#: transport-helper.c:272 transport-helper.c:412
+#, c-format
+msgid "%s unexpectedly said: '%s'"
msgstr ""
-#: wt-status.c:1604
-msgid "On branch "
+#: transport-helper.c:401
+#, c-format
+msgid "%s also locked %s"
msgstr ""
-#: wt-status.c:1610
-msgid "interactive rebase in progress; onto "
+#: transport-helper.c:479
+msgid "couldn't run fast-import"
msgstr ""
-#: wt-status.c:1612
-msgid "rebase in progress; onto "
+#: transport-helper.c:502
+msgid "error while running fast-import"
msgstr ""
-#: wt-status.c:1617
-msgid "HEAD detached at "
+#: transport-helper.c:531 transport-helper.c:1097
+#, c-format
+msgid "could not read ref %s"
msgstr ""
-#: wt-status.c:1619
-msgid "HEAD detached from "
+#: transport-helper.c:576
+#, c-format
+msgid "unknown response to connect: %s"
msgstr ""
-#: wt-status.c:1622
-msgid "Not currently on any branch."
+#: transport-helper.c:598
+msgid "setting remote service path not supported by protocol"
msgstr ""
-#: wt-status.c:1642
-msgid "Initial commit"
+#: transport-helper.c:600
+msgid "invalid remote service path"
msgstr ""
-#: wt-status.c:1643
-msgid "No commits yet"
+#: transport-helper.c:646
+#, c-format
+msgid "can't connect to subservice %s"
msgstr ""
-#: wt-status.c:1657
-msgid "Untracked files"
+#: transport-helper.c:718
+#, c-format
+msgid "expected ok/error, helper said '%s'"
msgstr ""
-#: wt-status.c:1659
-msgid "Ignored files"
+#: transport-helper.c:771
+#, c-format
+msgid "helper reported unexpected status of %s"
msgstr ""
-#: wt-status.c:1663
+#: transport-helper.c:832
#, c-format
-msgid ""
-"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
-"may speed it up, but you have to be careful not to forget to add\n"
-"new files yourself (see 'git help status')."
+msgid "helper %s does not support dry-run"
msgstr ""
-#: wt-status.c:1669
+#: transport-helper.c:835
#, c-format
-msgid "Untracked files not listed%s"
+msgid "helper %s does not support --signed"
msgstr ""
-#: wt-status.c:1671
-msgid " (use -u option to show untracked files)"
+#: transport-helper.c:838
+#, c-format
+msgid "helper %s does not support --signed=if-asked"
msgstr ""
-#: wt-status.c:1677
-msgid "No changes"
+#: transport-helper.c:845
+#, c-format
+msgid "helper %s does not support 'push-option'"
msgstr ""
-#: wt-status.c:1682
-#, c-format
-msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
+#: transport-helper.c:937
+msgid "remote-helper doesn't support push; refspec needed"
msgstr ""
-#: wt-status.c:1685
+#: transport-helper.c:942
#, c-format
-msgid "no changes added to commit\n"
+msgid "helper %s does not support 'force'"
msgstr ""
-#: wt-status.c:1688
+#: transport-helper.c:989
+msgid "couldn't run fast-export"
+msgstr ""
+
+#: transport-helper.c:994
+msgid "error while running fast-export"
+msgstr ""
+
+#: transport-helper.c:1019
#, c-format
msgid ""
-"nothing added to commit but untracked files present (use \"git add\" to "
-"track)\n"
+"No refs in common and none specified; doing nothing.\n"
+"Perhaps you should specify a branch such as 'master'.\n"
msgstr ""
-#: wt-status.c:1691
+#: transport-helper.c:1083
#, c-format
-msgid "nothing added to commit but untracked files present\n"
+msgid "malformed response in ref list: %s"
msgstr ""
-#: wt-status.c:1694
+#: transport-helper.c:1236
#, c-format
-msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
+msgid "read(%s) failed"
msgstr ""
-#: wt-status.c:1697 wt-status.c:1702
+#: transport-helper.c:1263
#, c-format
-msgid "nothing to commit\n"
+msgid "write(%s) failed"
msgstr ""
-#: wt-status.c:1700
+#: transport-helper.c:1312
#, c-format
-msgid "nothing to commit (use -u to show untracked files)\n"
+msgid "%s thread failed"
msgstr ""
-#: wt-status.c:1704
+#: transport-helper.c:1316
#, c-format
-msgid "nothing to commit, working tree clean\n"
+msgid "%s thread failed to join: %s"
msgstr ""
-#: wt-status.c:1817
-msgid "No commits yet on "
+#: transport-helper.c:1335 transport-helper.c:1339
+#, c-format
+msgid "can't start thread for copying data: %s"
msgstr ""
-#: wt-status.c:1821
-msgid "HEAD (no branch)"
+#: transport-helper.c:1376
+#, c-format
+msgid "%s process failed to wait"
msgstr ""
-#: wt-status.c:1852
-msgid "different"
+#: transport-helper.c:1380
+#, c-format
+msgid "%s process failed"
msgstr ""
-#: wt-status.c:1854 wt-status.c:1862
-msgid "behind "
+#: transport-helper.c:1398 transport-helper.c:1407
+msgid "can't start thread for copying data"
msgstr ""
-#: wt-status.c:1857 wt-status.c:1860
-msgid "ahead "
+#: tree-walk.c:33
+msgid "too-short tree object"
msgstr ""
-#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2376
-#, c-format
-msgid "cannot %s: You have unstaged changes."
+#: tree-walk.c:39
+msgid "malformed mode in tree entry"
msgstr ""
-#: wt-status.c:2382
-msgid "additionally, your index contains uncommitted changes."
+#: tree-walk.c:43
+msgid "empty filename in tree entry"
msgstr ""
-#: wt-status.c:2384
-#, c-format
-msgid "cannot %s: Your index contains uncommitted changes."
+#: tree-walk.c:116
+msgid "too-short tree file"
msgstr ""
-#: compat/precompose_utf8.c:58 builtin/clone.c:443
+#: unpack-trees.c:111
#, c-format
-msgid "failed to unlink '%s'"
-msgstr ""
-
-#: builtin/add.c:24
-msgid "git add [<options>] [--] <pathspec>..."
+msgid ""
+"Your local changes to the following files would be overwritten by checkout:\n"
+"%%sPlease commit your changes or stash them before you switch branches."
msgstr ""
-#: builtin/add.c:83
+#: unpack-trees.c:113
#, c-format
-msgid "unexpected diff status %c"
+msgid ""
+"Your local changes to the following files would be overwritten by checkout:\n"
+"%%s"
msgstr ""
-#: builtin/add.c:88 builtin/commit.c:279
-msgid "updating files failed"
+#: unpack-trees.c:116
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"%%sPlease commit your changes or stash them before you merge."
msgstr ""
-#: builtin/add.c:98
+#: unpack-trees.c:118
#, c-format
-msgid "remove '%s'\n"
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"%%s"
msgstr ""
-#: builtin/add.c:173
-msgid "Unstaged changes after refreshing the index:"
+#: unpack-trees.c:121
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by %s:\n"
+"%%sPlease commit your changes or stash them before you %s."
msgstr ""
-#: builtin/add.c:233 builtin/rev-parse.c:893
-msgid "Could not read the index"
+#: unpack-trees.c:123
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by %s:\n"
+"%%s"
msgstr ""
-#: builtin/add.c:244
+#: unpack-trees.c:128
#, c-format
-msgid "Could not open '%s' for writing."
+msgid ""
+"Updating the following directories would lose untracked files in them:\n"
+"%s"
msgstr ""
-#: builtin/add.c:248
-msgid "Could not write patch"
+#: unpack-trees.c:132
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%sPlease move or remove them before you switch branches."
msgstr ""
-#: builtin/add.c:251
-msgid "editing patch failed"
+#: unpack-trees.c:134
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%s"
msgstr ""
-#: builtin/add.c:254
+#: unpack-trees.c:137
#, c-format
-msgid "Could not stat '%s'"
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%sPlease move or remove them before you merge."
msgstr ""
-#: builtin/add.c:256
-msgid "Empty patch. Aborted."
+#: unpack-trees.c:139
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%s"
msgstr ""
-#: builtin/add.c:261
+#: unpack-trees.c:142
#, c-format
-msgid "Could not apply '%s'"
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%sPlease move or remove them before you %s."
msgstr ""
-#: builtin/add.c:269
-msgid "The following paths are ignored by one of your .gitignore files:\n"
+#: unpack-trees.c:144
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%s"
msgstr ""
-#: 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"
+#: unpack-trees.c:150
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%sPlease move or remove them before you switch branches."
msgstr ""
-#: builtin/add.c:292
-msgid "interactive picking"
+#: unpack-trees.c:152
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%s"
msgstr ""
-#: builtin/add.c:293 builtin/checkout.c:1144 builtin/reset.c:302
-msgid "select hunks interactively"
+#: unpack-trees.c:155
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%sPlease move or remove them before you merge."
msgstr ""
-#: builtin/add.c:294
-msgid "edit current diff and apply"
+#: unpack-trees.c:157
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%s"
msgstr ""
-#: builtin/add.c:295
-msgid "allow adding otherwise ignored files"
+#: unpack-trees.c:160
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%sPlease move or remove them before you %s."
msgstr ""
-#: builtin/add.c:296
-msgid "update tracked files"
+#: unpack-trees.c:162
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%s"
msgstr ""
-#: builtin/add.c:297
-msgid "renormalize EOL of tracked files (implies -u)"
+#: unpack-trees.c:170
+#, c-format
+msgid "Entry '%s' overlaps with '%s'. Cannot bind."
msgstr ""
-#: builtin/add.c:298
-msgid "record only the fact that the path will be added later"
+#: unpack-trees.c:173
+#, c-format
+msgid ""
+"Cannot update sparse checkout: the following entries are not up to date:\n"
+"%s"
msgstr ""
-#: builtin/add.c:299
-msgid "add changes from all tracked and untracked files"
+#: unpack-trees.c:175
+#, c-format
+msgid ""
+"The following working tree files would be overwritten by sparse checkout "
+"update:\n"
+"%s"
msgstr ""
-#: builtin/add.c:302
-msgid "ignore paths removed in the working tree (same as --no-all)"
+#: unpack-trees.c:177
+#, c-format
+msgid ""
+"The following working tree files would be removed by sparse checkout "
+"update:\n"
+"%s"
msgstr ""
-#: builtin/add.c:304
-msgid "don't add, only refresh the index"
+#: unpack-trees.c:179
+#, c-format
+msgid ""
+"Cannot update submodule:\n"
+"%s"
msgstr ""
-#: builtin/add.c:305
-msgid "just skip files which cannot be added because of errors"
+#: unpack-trees.c:253
+#, c-format
+msgid "Aborting\n"
msgstr ""
-#: builtin/add.c:306
-msgid "check if - even missing - files are ignored in dry run"
+#: unpack-trees.c:335
+msgid "Checking out files"
msgstr ""
-#: builtin/add.c:308 builtin/update-index.c:973
-msgid "override the executable bit of the listed files"
+#: unpack-trees.c:367
+msgid ""
+"the following paths have collided (e.g. case-sensitive paths\n"
+"on a case-insensitive filesystem) and only one from the same\n"
+"colliding group is in the working tree:\n"
msgstr ""
-#: builtin/add.c:310
-msgid "warn when adding an embedded repository"
+#: urlmatch.c:163
+msgid "invalid URL scheme name or missing '://' suffix"
msgstr ""
-#: builtin/add.c:325
+#: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405
#, c-format
-msgid ""
-"You've added another git repository inside your current repository.\n"
-"Clones of the outer repository will not contain the contents of\n"
-"the embedded repository and will not know how to obtain it.\n"
-"If you meant to add a submodule, use:\n"
-"\n"
-"\tgit submodule add <url> %s\n"
-"\n"
-"If you added this path by mistake, you can remove it from the\n"
-"index with:\n"
-"\n"
-"\tgit rm --cached %s\n"
-"\n"
-"See \"git help submodule\" for more information."
+msgid "invalid %XX escape sequence"
msgstr ""
-#: builtin/add.c:353
-#, c-format
-msgid "adding embedded git repository: %s"
+#: urlmatch.c:215
+msgid "missing host and scheme is not 'file:'"
msgstr ""
-#: builtin/add.c:371
-#, c-format
-msgid "Use -f if you really want to add them.\n"
+#: urlmatch.c:232
+msgid "a 'file:' URL may not have a port number"
msgstr ""
-#: builtin/add.c:379
-msgid "adding files failed"
+#: urlmatch.c:247
+msgid "invalid characters in host name"
msgstr ""
-#: builtin/add.c:417
-msgid "-A and -u are mutually incompatible"
+#: urlmatch.c:292 urlmatch.c:303
+msgid "invalid port number"
msgstr ""
-#: builtin/add.c:424
-msgid "Option --ignore-missing can only be used together with --dry-run"
+#: urlmatch.c:371
+msgid "invalid '..' path segment"
msgstr ""
-#: builtin/add.c:428
+#: worktree.c:249 builtin/am.c:2094
#, c-format
-msgid "--chmod param '%s' must be either -x or +x"
+msgid "failed to read '%s'"
msgstr ""
-#: builtin/add.c:443
+#: worktree.c:295
#, c-format
-msgid "Nothing specified, nothing added.\n"
+msgid "'%s' at main working tree is not the repository directory"
msgstr ""
-#: builtin/add.c:444
+#: worktree.c:306
#, c-format
-msgid "Maybe you wanted to say 'git add .'?\n"
+msgid "'%s' file does not contain absolute path to the working tree location"
msgstr ""
-#: 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"
+#: worktree.c:318
+#, c-format
+msgid "'%s' does not exist"
msgstr ""
-#: builtin/am.c:415
-msgid "could not parse author script"
+#: worktree.c:324
+#, c-format
+msgid "'%s' is not a .git file, error code %d"
msgstr ""
-#: builtin/am.c:499
+#: worktree.c:332
#, c-format
-msgid "'%s' was deleted by the applypatch-msg hook"
+msgid "'%s' does not point back to '%s'"
msgstr ""
-#: builtin/am.c:540
+#: wrapper.c:223 wrapper.c:393
#, c-format
-msgid "Malformed input line: '%s'."
+msgid "could not open '%s' for reading and writing"
msgstr ""
-#: builtin/am.c:577
+#: wrapper.c:424 wrapper.c:624
#, c-format
-msgid "Failed to copy notes from '%s' to '%s'"
+msgid "unable to access '%s'"
msgstr ""
-#: builtin/am.c:603
-msgid "fseek failed"
+#: wrapper.c:632
+msgid "unable to get current working directory"
msgstr ""
-#: builtin/am.c:791
-#, c-format
-msgid "could not parse patch '%s'"
+#: wt-status.c:155
+msgid "Unmerged paths:"
msgstr ""
-#: builtin/am.c:856
-msgid "Only one StGIT patch series can be applied at once"
-msgstr ""
-
-#: builtin/am.c:904
-msgid "invalid timestamp"
+#: wt-status.c:182 wt-status.c:209
+#, c-format
+msgid " (use \"git reset %s <file>...\" to unstage)"
msgstr ""
-#: builtin/am.c:909 builtin/am.c:921
-msgid "invalid Date line"
+#: wt-status.c:184 wt-status.c:211
+msgid " (use \"git rm --cached <file>...\" to unstage)"
msgstr ""
-#: builtin/am.c:916
-msgid "invalid timezone offset"
+#: wt-status.c:188
+msgid " (use \"git add <file>...\" to mark resolution)"
msgstr ""
-#: builtin/am.c:1009
-msgid "Patch format detection failed."
+#: wt-status.c:190 wt-status.c:194
+msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
msgstr ""
-#: builtin/am.c:1014 builtin/clone.c:408
-#, c-format
-msgid "failed to create directory '%s'"
+#: wt-status.c:192
+msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr ""
-#: builtin/am.c:1019
-msgid "Failed to split patches."
+#: wt-status.c:203 wt-status.c:1046
+msgid "Changes to be committed:"
msgstr ""
-#: builtin/am.c:1149 builtin/commit.c:364
-msgid "unable to write index file"
+#: wt-status.c:221 wt-status.c:1055
+msgid "Changes not staged for commit:"
msgstr ""
-#: builtin/am.c:1163
-#, c-format
-msgid "When you have resolved this problem, run \"%s --continue\"."
+#: wt-status.c:225
+msgid " (use \"git add <file>...\" to update what will be committed)"
msgstr ""
-#: builtin/am.c:1164
-#, c-format
-msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
+#: wt-status.c:227
+msgid " (use \"git add/rm <file>...\" to update what will be committed)"
msgstr ""
-#: builtin/am.c:1165
-#, c-format
-msgid "To restore the original branch and stop patching, run \"%s --abort\"."
+#: wt-status.c:228
+msgid ""
+" (use \"git checkout -- <file>...\" to discard changes in working directory)"
msgstr ""
-#: builtin/am.c:1272
-msgid "Patch is empty."
+#: wt-status.c:230
+msgid " (commit or discard the untracked or modified content in submodules)"
msgstr ""
-#: builtin/am.c:1338
+#: wt-status.c:242
#, c-format
-msgid "invalid ident line: %.*s"
+msgid " (use \"git %s <file>...\" to include in what will be committed)"
msgstr ""
-#: builtin/am.c:1360
-#, c-format
-msgid "unable to parse commit %s"
+#: wt-status.c:257
+msgid "both deleted:"
msgstr ""
-#: builtin/am.c:1556
-msgid "Repository lacks necessary blobs to fall back on 3-way merge."
+#: wt-status.c:259
+msgid "added by us:"
msgstr ""
-#: builtin/am.c:1558
-msgid "Using index info to reconstruct a base tree..."
+#: wt-status.c:261
+msgid "deleted by them:"
msgstr ""
-#: builtin/am.c:1577
-msgid ""
-"Did you hand edit your patch?\n"
-"It does not apply to blobs recorded in its index."
+#: wt-status.c:263
+msgid "added by them:"
msgstr ""
-#: builtin/am.c:1583
-msgid "Falling back to patching base and 3-way merge..."
+#: wt-status.c:265
+msgid "deleted by us:"
msgstr ""
-#: builtin/am.c:1608
-msgid "Failed to merge in the changes."
+#: wt-status.c:267
+msgid "both added:"
msgstr ""
-#: builtin/am.c:1640
-msgid "applying to an empty history"
+#: wt-status.c:269
+msgid "both modified:"
msgstr ""
-#: builtin/am.c:1686 builtin/am.c:1690
-#, c-format
-msgid "cannot resume: %s does not exist."
+#: wt-status.c:279
+msgid "new file:"
msgstr ""
-#: builtin/am.c:1706
-msgid "cannot be interactive without stdin connected to a terminal."
+#: wt-status.c:281
+msgid "copied:"
msgstr ""
-#: builtin/am.c:1711
-msgid "Commit Body is:"
+#: wt-status.c:283
+msgid "deleted:"
msgstr ""
-#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
-#. in your translation. The program will only accept English
-#. input at this point.
-#.
-#: builtin/am.c:1721
-msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
+#: wt-status.c:285
+msgid "modified:"
msgstr ""
-#: builtin/am.c:1771
-#, c-format
-msgid "Dirty index: cannot apply patches (dirty: %s)"
+#: wt-status.c:287
+msgid "renamed:"
msgstr ""
-#: builtin/am.c:1811 builtin/am.c:1879
-#, c-format
-msgid "Applying: %.*s"
+#: wt-status.c:289
+msgid "typechange:"
msgstr ""
-#: builtin/am.c:1828
-msgid "No changes -- Patch already applied."
+#: wt-status.c:291
+msgid "unknown:"
msgstr ""
-#: builtin/am.c:1834
-#, c-format
-msgid "Patch failed at %s %.*s"
+#: wt-status.c:293
+msgid "unmerged:"
msgstr ""
-#: builtin/am.c:1838
-msgid "Use 'git am --show-current-patch' to see the failed patch"
+#: wt-status.c:373
+msgid "new commits, "
msgstr ""
-#: builtin/am.c:1882
-msgid ""
-"No changes - did you forget to use 'git add'?\n"
-"If there is nothing left to stage, chances are that something else\n"
-"already introduced the same changes; you might want to skip this patch."
+#: wt-status.c:375
+msgid "modified content, "
msgstr ""
-#: builtin/am.c:1889
-msgid ""
-"You still have unmerged paths in your index.\n"
-"You should 'git add' each file with resolved conflicts to mark them as "
-"such.\n"
-"You might run `git rm` on a file to accept \"deleted by them\" for it."
+#: wt-status.c:377
+msgid "untracked content, "
msgstr ""
-#: builtin/am.c:1996 builtin/am.c:2000 builtin/am.c:2012 builtin/reset.c:324
-#: builtin/reset.c:332
+#: wt-status.c:884
#, c-format
-msgid "Could not parse object '%s'."
+msgid "Your stash currently has %d entry"
+msgid_plural "Your stash currently has %d entries"
+msgstr[0] ""
+msgstr[1] ""
+
+#: wt-status.c:916
+msgid "Submodules changed but not updated:"
msgstr ""
-#: builtin/am.c:2048
-msgid "failed to clean index"
+#: wt-status.c:918
+msgid "Submodule changes to be committed:"
msgstr ""
-#: builtin/am.c:2083
+#: wt-status.c:1000
msgid ""
-"You seem to have moved HEAD since the last 'am' failure.\n"
-"Not rewinding to ORIG_HEAD"
+"Do not modify or remove the line above.\n"
+"Everything below it will be ignored."
msgstr ""
-#: builtin/am.c:2174
-#, c-format
-msgid "Invalid value for --patch-format: %s"
+#: wt-status.c:1101
+msgid "You have unmerged paths."
msgstr ""
-#: builtin/am.c:2210
-msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
+#: wt-status.c:1104
+msgid " (fix conflicts and run \"git commit\")"
msgstr ""
-#: builtin/am.c:2211
-msgid "git am [<options>] (--continue | --skip | --abort)"
+#: wt-status.c:1106
+msgid " (use \"git merge --abort\" to abort the merge)"
msgstr ""
-#: builtin/am.c:2217
-msgid "run interactively"
+#: wt-status.c:1110
+msgid "All conflicts fixed but you are still merging."
msgstr ""
-#: builtin/am.c:2219
-msgid "historical option -- no-op"
+#: wt-status.c:1113
+msgid " (use \"git commit\" to conclude merge)"
msgstr ""
-#: builtin/am.c:2221
-msgid "allow fall back on 3way merging if needed"
+#: wt-status.c:1122
+msgid "You are in the middle of an am session."
msgstr ""
-#: builtin/am.c:2222 builtin/init-db.c:485 builtin/prune-packed.c:58
-#: builtin/repack.c:299
-msgid "be quiet"
+#: wt-status.c:1125
+msgid "The current patch is empty."
msgstr ""
-#: builtin/am.c:2224
-msgid "add a Signed-off-by line to the commit message"
+#: wt-status.c:1129
+msgid " (fix conflicts and then run \"git am --continue\")"
msgstr ""
-#: builtin/am.c:2227
-msgid "recode into utf8 (default)"
+#: wt-status.c:1131
+msgid " (use \"git am --skip\" to skip this patch)"
msgstr ""
-#: builtin/am.c:2229
-msgid "pass -k flag to git-mailinfo"
+#: wt-status.c:1133
+msgid " (use \"git am --abort\" to restore the original branch)"
msgstr ""
-#: builtin/am.c:2231
-msgid "pass -b flag to git-mailinfo"
+#: wt-status.c:1264
+msgid "git-rebase-todo is missing."
msgstr ""
-#: builtin/am.c:2233
-msgid "pass -m flag to git-mailinfo"
+#: wt-status.c:1266
+msgid "No commands done."
msgstr ""
-#: builtin/am.c:2235
-msgid "pass --keep-cr flag to git-mailsplit for mbox format"
-msgstr ""
+#: wt-status.c:1269
+#, c-format
+msgid "Last command done (%d command done):"
+msgid_plural "Last commands done (%d commands done):"
+msgstr[0] ""
+msgstr[1] ""
-#: builtin/am.c:2238
-msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
+#: wt-status.c:1280
+#, c-format
+msgid " (see more in file %s)"
msgstr ""
-#: builtin/am.c:2241
-msgid "strip everything before a scissors line"
+#: wt-status.c:1285
+msgid "No commands remaining."
msgstr ""
-#: builtin/am.c:2243 builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252
-#: builtin/am.c:2255 builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264
-#: builtin/am.c:2270
-msgid "pass it through git-apply"
+#: wt-status.c:1288
+#, c-format
+msgid "Next command to do (%d remaining command):"
+msgid_plural "Next commands to do (%d remaining commands):"
+msgstr[0] ""
+msgstr[1] ""
+
+#: wt-status.c:1296
+msgid " (use \"git rebase --edit-todo\" to view and edit)"
msgstr ""
-#: 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"
+#: wt-status.c:1308
+#, c-format
+msgid "You are currently rebasing branch '%s' on '%s'."
msgstr ""
-#: builtin/am.c:2266 builtin/branch.c:651 builtin/for-each-ref.c:38
-#: builtin/replace.c:543 builtin/tag.c:420 builtin/verify-tag.c:39
-msgid "format"
+#: wt-status.c:1313
+msgid "You are currently rebasing."
msgstr ""
-#: builtin/am.c:2267
-msgid "format the patch(es) are in"
+#: wt-status.c:1326
+msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr ""
-#: builtin/am.c:2273
-msgid "override error message when patch failure occurs"
+#: wt-status.c:1328
+msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr ""
-#: builtin/am.c:2275
-msgid "continue applying patches after resolving a conflict"
+#: wt-status.c:1330
+msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr ""
-#: builtin/am.c:2278
-msgid "synonyms for --continue"
+#: wt-status.c:1337
+msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr ""
-#: builtin/am.c:2281
-msgid "skip the current patch"
+#: wt-status.c:1341
+#, c-format
+msgid ""
+"You are currently splitting a commit while rebasing branch '%s' on '%s'."
msgstr ""
-#: builtin/am.c:2284
-msgid "restore the original branch and abort the patching operation."
+#: wt-status.c:1346
+msgid "You are currently splitting a commit during a rebase."
msgstr ""
-#: builtin/am.c:2287
-msgid "abort the patching operation but keep HEAD where it is."
+#: wt-status.c:1349
+msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr ""
-#: builtin/am.c:2290
-msgid "show the patch being applied."
+#: wt-status.c:1353
+#, c-format
+msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr ""
-#: builtin/am.c:2294
-msgid "lie about committer date"
+#: wt-status.c:1358
+msgid "You are currently editing a commit during a rebase."
msgstr ""
-#: builtin/am.c:2296
-msgid "use current timestamp for author date"
+#: wt-status.c:1361
+msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr ""
-#: 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"
+#: wt-status.c:1363
+msgid ""
+" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr ""
-#: builtin/am.c:2299
-msgid "GPG-sign commits"
+#: wt-status.c:1372
+#, c-format
+msgid "You are currently cherry-picking commit %s."
msgstr ""
-#: builtin/am.c:2302
-msgid "(internal use for git-rebase)"
+#: wt-status.c:1377
+msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr ""
-#: builtin/am.c:2320
-msgid ""
-"The -b/--binary option has been a no-op for long time, and\n"
-"it will be removed. Please do not use it anymore."
+#: wt-status.c:1380
+msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr ""
-#: builtin/am.c:2327
-msgid "failed to read the index"
+#: wt-status.c:1382
+msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr ""
-#: builtin/am.c:2342
+#: wt-status.c:1390
#, c-format
-msgid "previous rebase directory %s still exists but mbox given."
+msgid "You are currently reverting commit %s."
msgstr ""
-#: builtin/am.c:2366
-#, c-format
-msgid ""
-"Stray %s directory found.\n"
-"Use \"git am --abort\" to remove it."
+#: wt-status.c:1395
+msgid " (fix conflicts and run \"git revert --continue\")"
msgstr ""
-#: builtin/am.c:2372
-msgid "Resolve operation not in progress, we are not resuming."
+#: wt-status.c:1398
+msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr ""
-#: builtin/apply.c:8
-msgid "git apply [<options>] [<patch>...]"
+#: wt-status.c:1400
+msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr ""
-#: builtin/archive.c:17
+#: wt-status.c:1410
#, c-format
-msgid "could not create archive file '%s'"
+msgid "You are currently bisecting, started from branch '%s'."
msgstr ""
-#: builtin/archive.c:20
-msgid "could not redirect output"
+#: wt-status.c:1414
+msgid "You are currently bisecting."
msgstr ""
-#: builtin/archive.c:37
-msgid "git archive: Remote with no URL"
+#: wt-status.c:1417
+msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr ""
-#: builtin/archive.c:58
-msgid "git archive: expected ACK/NAK, got a flush packet"
+#: wt-status.c:1617
+msgid "On branch "
msgstr ""
-#: builtin/archive.c:61
-#, c-format
-msgid "git archive: NACK %s"
+#: wt-status.c:1624
+msgid "interactive rebase in progress; onto "
msgstr ""
-#: builtin/archive.c:64
-msgid "git archive: protocol error"
+#: wt-status.c:1626
+msgid "rebase in progress; onto "
msgstr ""
-#: builtin/archive.c:68
-msgid "git archive: expected a flush"
+#: wt-status.c:1631
+msgid "HEAD detached at "
msgstr ""
-#: builtin/bisect--helper.c:12
-msgid "git bisect--helper --next-all [--no-checkout]"
+#: wt-status.c:1633
+msgid "HEAD detached from "
msgstr ""
-#: builtin/bisect--helper.c:13
-msgid "git bisect--helper --write-terms <bad_term> <good_term>"
+#: wt-status.c:1636
+msgid "Not currently on any branch."
msgstr ""
-#: builtin/bisect--helper.c:14
-msgid "git bisect--helper --bisect-clean-state"
+#: wt-status.c:1653
+msgid "Initial commit"
msgstr ""
-#: builtin/bisect--helper.c:46
-#, c-format
-msgid "'%s' is not a valid term"
+#: wt-status.c:1654
+msgid "No commits yet"
msgstr ""
-#: builtin/bisect--helper.c:50
-#, c-format
-msgid "can't use the builtin command '%s' as a term"
+#: wt-status.c:1668
+msgid "Untracked files"
msgstr ""
-#: builtin/bisect--helper.c:60
-#, c-format
-msgid "can't change the meaning of the term '%s'"
+#: wt-status.c:1670
+msgid "Ignored files"
msgstr ""
-#: builtin/bisect--helper.c:71
-msgid "please use two different terms"
+#: wt-status.c:1674
+#, c-format
+msgid ""
+"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
+"may speed it up, but you have to be careful not to forget to add\n"
+"new files yourself (see 'git help status')."
msgstr ""
-#: builtin/bisect--helper.c:78
-msgid "could not open the file BISECT_TERMS"
+#: wt-status.c:1680
+#, c-format
+msgid "Untracked files not listed%s"
msgstr ""
-#: builtin/bisect--helper.c:120
-msgid "perform 'git bisect next'"
+#: wt-status.c:1682
+msgid " (use -u option to show untracked files)"
msgstr ""
-#: builtin/bisect--helper.c:122
-msgid "write the terms to .git/BISECT_TERMS"
-msgstr ""
-
-#: builtin/bisect--helper.c:124
-msgid "cleanup the bisection state"
-msgstr ""
-
-#: builtin/bisect--helper.c:126
-msgid "check for expected revs"
-msgstr ""
-
-#: builtin/bisect--helper.c:128
-msgid "update BISECT_HEAD instead of checking out the current commit"
-msgstr ""
-
-#: builtin/bisect--helper.c:143
-msgid "--write-terms requires two arguments"
-msgstr ""
-
-#: builtin/bisect--helper.c:147
-msgid "--bisect-clean-state requires no arguments"
+#: wt-status.c:1688
+msgid "No changes"
msgstr ""
-#: builtin/blame.c:31
-msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
+#: wt-status.c:1693
+#, c-format
+msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr ""
-#: builtin/blame.c:36
-msgid "<rev-opts> are documented in git-rev-list(1)"
+#: wt-status.c:1696
+#, c-format
+msgid "no changes added to commit\n"
msgstr ""
-#: builtin/blame.c:406
+#: wt-status.c:1699
#, c-format
-msgid "expecting a color: %s"
+msgid ""
+"nothing added to commit but untracked files present (use \"git add\" to "
+"track)\n"
msgstr ""
-#: builtin/blame.c:413
-msgid "must end with a color"
+#: wt-status.c:1702
+#, c-format
+msgid "nothing added to commit but untracked files present\n"
msgstr ""
-#: builtin/blame.c:700
+#: wt-status.c:1705
#, c-format
-msgid "invalid color '%s' in color.blame.repeatedLines"
+msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr ""
-#: builtin/blame.c:718
-msgid "invalid value for blame.coloring"
+#: wt-status.c:1708 wt-status.c:1713
+#, c-format
+msgid "nothing to commit\n"
msgstr ""
-#: builtin/blame.c:789
-msgid "Show blame entries as we find them, incrementally"
+#: wt-status.c:1711
+#, c-format
+msgid "nothing to commit (use -u to show untracked files)\n"
msgstr ""
-#: builtin/blame.c:790
-msgid "Show blank SHA-1 for boundary commits (Default: off)"
+#: wt-status.c:1715
+#, c-format
+msgid "nothing to commit, working tree clean\n"
msgstr ""
-#: builtin/blame.c:791
-msgid "Do not treat root commits as boundaries (Default: off)"
+#: wt-status.c:1828
+msgid "No commits yet on "
msgstr ""
-#: builtin/blame.c:792
-msgid "Show work cost statistics"
+#: wt-status.c:1832
+msgid "HEAD (no branch)"
msgstr ""
-#: builtin/blame.c:793
-msgid "Force progress reporting"
+#: wt-status.c:1863
+msgid "different"
msgstr ""
-#: builtin/blame.c:794
-msgid "Show output score for blame entries"
+#: wt-status.c:1865 wt-status.c:1873
+msgid "behind "
msgstr ""
-#: builtin/blame.c:795
-msgid "Show original filename (Default: auto)"
+#: wt-status.c:1868 wt-status.c:1871
+msgid "ahead "
msgstr ""
-#: builtin/blame.c:796
-msgid "Show original linenumber (Default: off)"
+#. TRANSLATORS: the action is e.g. "pull with rebase"
+#: wt-status.c:2386
+#, c-format
+msgid "cannot %s: You have unstaged changes."
msgstr ""
-#: builtin/blame.c:797
-msgid "Show in a format designed for machine consumption"
+#: wt-status.c:2392
+msgid "additionally, your index contains uncommitted changes."
msgstr ""
-#: builtin/blame.c:798
-msgid "Show porcelain format with per-line commit information"
+#: wt-status.c:2394
+#, c-format
+msgid "cannot %s: Your index contains uncommitted changes."
msgstr ""
-#: builtin/blame.c:799
-msgid "Use the same output mode as git-annotate (Default: off)"
+#: builtin/add.c:25
+msgid "git add [<options>] [--] <pathspec>..."
msgstr ""
-#: builtin/blame.c:800
-msgid "Show raw timestamp (Default: off)"
+#: builtin/add.c:84
+#, c-format
+msgid "unexpected diff status %c"
msgstr ""
-#: builtin/blame.c:801
-msgid "Show long commit SHA1 (Default: off)"
+#: builtin/add.c:89 builtin/commit.c:285
+msgid "updating files failed"
msgstr ""
-#: builtin/blame.c:802
-msgid "Suppress author name and timestamp (Default: off)"
+#: builtin/add.c:99
+#, c-format
+msgid "remove '%s'\n"
msgstr ""
-#: builtin/blame.c:803
-msgid "Show author email instead of name (Default: off)"
+#: builtin/add.c:174
+msgid "Unstaged changes after refreshing the index:"
msgstr ""
-#: builtin/blame.c:804
-msgid "Ignore whitespace differences"
+#: builtin/add.c:234 builtin/rev-parse.c:896
+msgid "Could not read the index"
msgstr ""
-#: builtin/blame.c:805
-msgid "color redundant metadata from previous line differently"
+#: builtin/add.c:245
+#, c-format
+msgid "Could not open '%s' for writing."
msgstr ""
-#: builtin/blame.c:806
-msgid "color lines by age"
+#: builtin/add.c:249
+msgid "Could not write patch"
msgstr ""
-#: builtin/blame.c:813
-msgid "Use an experimental heuristic to improve diffs"
+#: builtin/add.c:252
+msgid "editing patch failed"
msgstr ""
-#: builtin/blame.c:815
-msgid "Spend extra cycles to find better match"
+#: builtin/add.c:255
+#, c-format
+msgid "Could not stat '%s'"
msgstr ""
-#: builtin/blame.c:816
-msgid "Use revisions from <file> instead of calling git-rev-list"
+#: builtin/add.c:257
+msgid "Empty patch. Aborted."
msgstr ""
-#: builtin/blame.c:817
-msgid "Use <file>'s contents as the final image"
+#: builtin/add.c:262
+#, c-format
+msgid "Could not apply '%s'"
msgstr ""
-#: builtin/blame.c:818 builtin/blame.c:819
-msgid "score"
+#: builtin/add.c:270
+msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr ""
-#: builtin/blame.c:818
-msgid "Find line copies within and across files"
+#: builtin/add.c:290 builtin/clean.c:908 builtin/fetch.c:137 builtin/mv.c:124
+#: builtin/prune-packed.c:56 builtin/pull.c:214 builtin/push.c:560
+#: builtin/remote.c:1345 builtin/rm.c:241 builtin/send-pack.c:165
+msgid "dry run"
msgstr ""
-#: builtin/blame.c:819
-msgid "Find line movements within and across files"
+#: builtin/add.c:293
+msgid "interactive picking"
msgstr ""
-#: builtin/blame.c:820
-msgid "n,m"
+#: builtin/add.c:294 builtin/checkout.c:1304 builtin/reset.c:306
+msgid "select hunks interactively"
msgstr ""
-#: builtin/blame.c:820
-msgid "Process only line range n,m, counting from 1"
+#: builtin/add.c:295
+msgid "edit current diff and apply"
msgstr ""
-#: builtin/blame.c:869
-msgid "--progress can't be used with --incremental or porcelain formats"
+#: builtin/add.c:296
+msgid "allow adding otherwise ignored files"
msgstr ""
-#. TRANSLATORS: This string is used to tell us the
-#. maximum display width for a relative timestamp in
-#. "git blame" output. For C locale, "4 years, 11
-#. months ago", which takes 22 places, is the longest
-#. among various forms of relative timestamps, but
-#. your language may need more or fewer display
-#. columns.
-#.
-#: builtin/blame.c:920
-msgid "4 years, 11 months ago"
+#: builtin/add.c:297
+msgid "update tracked files"
msgstr ""
-#: 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:1053
-msgid "Blaming lines"
+#: builtin/add.c:298
+msgid "renormalize EOL of tracked files (implies -u)"
msgstr ""
-#: builtin/branch.c:28
-msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
+#: builtin/add.c:299
+msgid "record only the fact that the path will be added later"
msgstr ""
-#: builtin/branch.c:29
-msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
+#: builtin/add.c:300
+msgid "add changes from all tracked and untracked files"
msgstr ""
-#: builtin/branch.c:30
-msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
+#: builtin/add.c:303
+msgid "ignore paths removed in the working tree (same as --no-all)"
msgstr ""
-#: builtin/branch.c:31
-msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
+#: builtin/add.c:305
+msgid "don't add, only refresh the index"
msgstr ""
-#: builtin/branch.c:32
-msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
+#: builtin/add.c:306
+msgid "just skip files which cannot be added because of errors"
msgstr ""
-#: builtin/branch.c:33
-msgid "git branch [<options>] [-r | -a] [--points-at]"
+#: builtin/add.c:307
+msgid "check if - even missing - files are ignored in dry run"
msgstr ""
-#: builtin/branch.c:34
-msgid "git branch [<options>] [-r | -a] [--format]"
+#: builtin/add.c:309 builtin/update-index.c:991
+msgid "override the executable bit of the listed files"
msgstr ""
-#: builtin/branch.c:151
-#, c-format
-msgid ""
-"deleting branch '%s' that has been merged to\n"
-" '%s', but not yet merged to HEAD."
+#: builtin/add.c:311
+msgid "warn when adding an embedded repository"
msgstr ""
-#: builtin/branch.c:155
+#: builtin/add.c:326
#, c-format
msgid ""
-"not deleting branch '%s' that is not yet merged to\n"
-" '%s', even though it is merged to HEAD."
+"You've added another git repository inside your current repository.\n"
+"Clones of the outer repository will not contain the contents of\n"
+"the embedded repository and will not know how to obtain it.\n"
+"If you meant to add a submodule, use:\n"
+"\n"
+"\tgit submodule add <url> %s\n"
+"\n"
+"If you added this path by mistake, you can remove it from the\n"
+"index with:\n"
+"\n"
+"\tgit rm --cached %s\n"
+"\n"
+"See \"git help submodule\" for more information."
msgstr ""
-#: builtin/branch.c:169
+#: builtin/add.c:354
#, c-format
-msgid "Couldn't look up commit object for '%s'"
+msgid "adding embedded git repository: %s"
msgstr ""
-#: builtin/branch.c:173
+#: builtin/add.c:372
#, 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'."
+msgid "Use -f if you really want to add them.\n"
msgstr ""
-#: builtin/branch.c:186
-msgid "Update of config-file failed"
+#: builtin/add.c:380
+msgid "adding files failed"
msgstr ""
-#: builtin/branch.c:217
-msgid "cannot use -a with -d"
+#: builtin/add.c:418
+msgid "-A and -u are mutually incompatible"
msgstr ""
-#: builtin/branch.c:223
-msgid "Couldn't look up commit object for HEAD"
+#: builtin/add.c:425
+msgid "Option --ignore-missing can only be used together with --dry-run"
msgstr ""
-#: builtin/branch.c:237
+#: builtin/add.c:429
#, c-format
-msgid "Cannot delete branch '%s' checked out at '%s'"
+msgid "--chmod param '%s' must be either -x or +x"
msgstr ""
-#: builtin/branch.c:252
+#: builtin/add.c:444
#, c-format
-msgid "remote-tracking branch '%s' not found."
+msgid "Nothing specified, nothing added.\n"
msgstr ""
-#: builtin/branch.c:253
+#: builtin/add.c:445
#, c-format
-msgid "branch '%s' not found."
+msgid "Maybe you wanted to say 'git add .'?\n"
msgstr ""
-#: builtin/branch.c:268
-#, c-format
-msgid "Error deleting remote-tracking branch '%s'"
+#: builtin/am.c:348
+msgid "could not parse author script"
msgstr ""
-#: builtin/branch.c:269
+#: builtin/am.c:432
#, c-format
-msgid "Error deleting branch '%s'"
+msgid "'%s' was deleted by the applypatch-msg hook"
msgstr ""
-#: builtin/branch.c:276
+#: builtin/am.c:473
#, c-format
-msgid "Deleted remote-tracking branch %s (was %s).\n"
+msgid "Malformed input line: '%s'."
msgstr ""
-#: builtin/branch.c:277
+#: builtin/am.c:510
#, c-format
-msgid "Deleted branch %s (was %s).\n"
+msgid "Failed to copy notes from '%s' to '%s'"
msgstr ""
-#: builtin/branch.c:421 builtin/tag.c:59
-msgid "unable to parse format string"
+#: builtin/am.c:536
+msgid "fseek failed"
msgstr ""
-#: builtin/branch.c:458
+#: builtin/am.c:724
#, c-format
-msgid "Branch %s is being rebased at %s"
+msgid "could not parse patch '%s'"
msgstr ""
-#: builtin/branch.c:462
-#, c-format
-msgid "Branch %s is being bisected at %s"
+#: builtin/am.c:789
+msgid "Only one StGIT patch series can be applied at once"
msgstr ""
-#: builtin/branch.c:479
-msgid "cannot copy the current branch while not on any."
+#: builtin/am.c:837
+msgid "invalid timestamp"
msgstr ""
-#: builtin/branch.c:481
-msgid "cannot rename the current branch while not on any."
+#: builtin/am.c:842 builtin/am.c:854
+msgid "invalid Date line"
msgstr ""
-#: builtin/branch.c:492
-#, c-format
-msgid "Invalid branch name: '%s'"
+#: builtin/am.c:849
+msgid "invalid timezone offset"
msgstr ""
-#: builtin/branch.c:519
-msgid "Branch rename failed"
+#: builtin/am.c:942
+msgid "Patch format detection failed."
msgstr ""
-#: builtin/branch.c:521
-msgid "Branch copy failed"
+#: builtin/am.c:947 builtin/clone.c:409
+#, c-format
+msgid "failed to create directory '%s'"
msgstr ""
-#: builtin/branch.c:525
+#: builtin/am.c:952
+msgid "Failed to split patches."
+msgstr ""
+
+#: builtin/am.c:1082 builtin/commit.c:371
+msgid "unable to write index file"
+msgstr ""
+
+#: builtin/am.c:1096
#, c-format
-msgid "Created a copy of a misnamed branch '%s'"
+msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr ""
-#: builtin/branch.c:528
+#: builtin/am.c:1097
#, c-format
-msgid "Renamed a misnamed branch '%s' away"
+msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr ""
-#: builtin/branch.c:534
+#: builtin/am.c:1098
#, c-format
-msgid "Branch renamed to %s, but HEAD is not updated!"
+msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr ""
-#: builtin/branch.c:543
-msgid "Branch is renamed, but update of config-file failed"
+#: builtin/am.c:1181
+msgid "Patch sent with format=flowed; space at the end of lines might be lost."
msgstr ""
-#: builtin/branch.c:545
-msgid "Branch is copied, but update of config-file failed"
+#: builtin/am.c:1209
+msgid "Patch is empty."
msgstr ""
-#: builtin/branch.c:561
+#: builtin/am.c:1275
#, c-format
-msgid ""
-"Please edit the description for the branch\n"
-" %s\n"
-"Lines starting with '%c' will be stripped.\n"
+msgid "invalid ident line: %.*s"
msgstr ""
-#: builtin/branch.c:602
-msgid "Generic options"
+#: builtin/am.c:1297
+#, c-format
+msgid "unable to parse commit %s"
msgstr ""
-#: builtin/branch.c:604
-msgid "show hash and subject, give twice for upstream branch"
+#: builtin/am.c:1493
+msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr ""
-#: builtin/branch.c:605
-msgid "suppress informational messages"
+#: builtin/am.c:1495
+msgid "Using index info to reconstruct a base tree..."
msgstr ""
-#: builtin/branch.c:606
-msgid "set up tracking mode (see git-pull(1))"
+#: builtin/am.c:1514
+msgid ""
+"Did you hand edit your patch?\n"
+"It does not apply to blobs recorded in its index."
msgstr ""
-#: builtin/branch.c:608
-msgid "do not use"
+#: builtin/am.c:1520
+msgid "Falling back to patching base and 3-way merge..."
msgstr ""
-#: builtin/branch.c:610
-msgid "upstream"
+#: builtin/am.c:1546
+msgid "Failed to merge in the changes."
msgstr ""
-#: builtin/branch.c:610
-msgid "change the upstream info"
+#: builtin/am.c:1578
+msgid "applying to an empty history"
msgstr ""
-#: builtin/branch.c:611
-msgid "Unset the upstream info"
+#: builtin/am.c:1624 builtin/am.c:1628
+#, c-format
+msgid "cannot resume: %s does not exist."
msgstr ""
-#: builtin/branch.c:612
-msgid "use colored output"
+#: builtin/am.c:1644
+msgid "cannot be interactive without stdin connected to a terminal."
msgstr ""
-#: builtin/branch.c:613
-msgid "act on remote-tracking branches"
+#: builtin/am.c:1649
+msgid "Commit Body is:"
msgstr ""
-#: builtin/branch.c:615 builtin/branch.c:617
-msgid "print only branches that contain the commit"
+#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
+#. in your translation. The program will only accept English
+#. input at this point.
+#.
+#: builtin/am.c:1659
+msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr ""
-#: builtin/branch.c:616 builtin/branch.c:618
-msgid "print only branches that don't contain the commit"
+#: builtin/am.c:1709
+#, c-format
+msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr ""
-#: builtin/branch.c:621
-msgid "Specific git-branch actions:"
+#: builtin/am.c:1749 builtin/am.c:1817
+#, c-format
+msgid "Applying: %.*s"
msgstr ""
-#: builtin/branch.c:622
-msgid "list both remote-tracking and local branches"
+#: builtin/am.c:1766
+msgid "No changes -- Patch already applied."
msgstr ""
-#: builtin/branch.c:624
-msgid "delete fully merged branch"
+#: builtin/am.c:1772
+#, c-format
+msgid "Patch failed at %s %.*s"
msgstr ""
-#: builtin/branch.c:625
-msgid "delete branch (even if not merged)"
+#: builtin/am.c:1776
+msgid "Use 'git am --show-current-patch' to see the failed patch"
msgstr ""
-#: builtin/branch.c:626
-msgid "move/rename a branch and its reflog"
+#: builtin/am.c:1820
+msgid ""
+"No changes - did you forget to use 'git add'?\n"
+"If there is nothing left to stage, chances are that something else\n"
+"already introduced the same changes; you might want to skip this patch."
msgstr ""
-#: builtin/branch.c:627
-msgid "move/rename a branch, even if target exists"
+#: builtin/am.c:1827
+msgid ""
+"You still have unmerged paths in your index.\n"
+"You should 'git add' each file with resolved conflicts to mark them as "
+"such.\n"
+"You might run `git rm` on a file to accept \"deleted by them\" for it."
msgstr ""
-#: builtin/branch.c:628
-msgid "copy a branch and its reflog"
+#: builtin/am.c:1934 builtin/am.c:1938 builtin/am.c:1950 builtin/reset.c:329
+#: builtin/reset.c:337
+#, c-format
+msgid "Could not parse object '%s'."
msgstr ""
-#: builtin/branch.c:629
-msgid "copy a branch, even if target exists"
+#: builtin/am.c:1986
+msgid "failed to clean index"
msgstr ""
-#: builtin/branch.c:630
-msgid "list branch names"
+#: builtin/am.c:2030
+msgid ""
+"You seem to have moved HEAD since the last 'am' failure.\n"
+"Not rewinding to ORIG_HEAD"
msgstr ""
-#: builtin/branch.c:631
-msgid "create the branch's reflog"
+#: builtin/am.c:2123
+#, c-format
+msgid "Invalid value for --patch-format: %s"
msgstr ""
-#: builtin/branch.c:634
-msgid "deprecated synonym for --create-reflog"
+#: builtin/am.c:2159
+msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr ""
-#: builtin/branch.c:639
-msgid "edit the description for the branch"
+#: builtin/am.c:2160
+msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr ""
-#: builtin/branch.c:640
-msgid "force creation, move/rename, deletion"
+#: builtin/am.c:2166
+msgid "run interactively"
msgstr ""
-#: builtin/branch.c:641
-msgid "print only branches that are merged"
+#: builtin/am.c:2168
+msgid "historical option -- no-op"
msgstr ""
-#: builtin/branch.c:642
-msgid "print only branches that are not merged"
+#: builtin/am.c:2170
+msgid "allow fall back on 3way merging if needed"
msgstr ""
-#: builtin/branch.c:643
-msgid "list branches in columns"
+#: builtin/am.c:2171 builtin/init-db.c:486 builtin/prune-packed.c:58
+#: builtin/repack.c:306
+msgid "be quiet"
msgstr ""
-#: builtin/branch.c:644 builtin/for-each-ref.c:40 builtin/ls-remote.c:70
-#: builtin/tag.c:413
-msgid "key"
+#: builtin/am.c:2173
+msgid "add a Signed-off-by line to the commit message"
msgstr ""
-#: builtin/branch.c:645 builtin/for-each-ref.c:41 builtin/ls-remote.c:71
-#: builtin/tag.c:414
-msgid "field name to sort on"
+#: builtin/am.c:2176
+msgid "recode into utf8 (default)"
msgstr ""
-#: builtin/branch.c:647 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"
+#: builtin/am.c:2178
+msgid "pass -k flag to git-mailinfo"
msgstr ""
-#: builtin/branch.c:648
-msgid "print only branches of the object"
+#: builtin/am.c:2180
+msgid "pass -b flag to git-mailinfo"
msgstr ""
-#: builtin/branch.c:650 builtin/for-each-ref.c:49 builtin/tag.c:423
-msgid "sorting and filtering are case insensitive"
+#: builtin/am.c:2182
+msgid "pass -m flag to git-mailinfo"
msgstr ""
-#: builtin/branch.c:651 builtin/for-each-ref.c:38 builtin/tag.c:421
-#: builtin/verify-tag.c:39
-msgid "format to use for the output"
+#: builtin/am.c:2184
+msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr ""
-#: builtin/branch.c:674 builtin/clone.c:739
-msgid "HEAD not found below refs/heads!"
+#: builtin/am.c:2187
+msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr ""
-#: builtin/branch.c:697
-msgid "--column and --verbose are incompatible"
+#: builtin/am.c:2190
+msgid "strip everything before a scissors line"
msgstr ""
-#: builtin/branch.c:717 builtin/branch.c:769 builtin/branch.c:778
-msgid "branch name required"
+#: builtin/am.c:2192 builtin/am.c:2195 builtin/am.c:2198 builtin/am.c:2201
+#: builtin/am.c:2204 builtin/am.c:2207 builtin/am.c:2210 builtin/am.c:2213
+#: builtin/am.c:2219
+msgid "pass it through git-apply"
msgstr ""
-#: builtin/branch.c:745
-msgid "Cannot give description to detached HEAD"
+#: builtin/am.c:2209 builtin/commit.c:1343 builtin/fmt-merge-msg.c:671
+#: builtin/fmt-merge-msg.c:674 builtin/grep.c:879 builtin/merge.c:240
+#: builtin/pull.c:152 builtin/pull.c:210 builtin/rebase.c:1062
+#: builtin/repack.c:317 builtin/repack.c:321 builtin/repack.c:323
+#: builtin/show-branch.c:651 builtin/show-ref.c:171 builtin/tag.c:386
+#: parse-options.h:144 parse-options.h:146 parse-options.h:266
+msgid "n"
msgstr ""
-#: builtin/branch.c:750
-msgid "cannot edit description of more than one branch"
+#: builtin/am.c:2215 builtin/branch.c:637 builtin/for-each-ref.c:38
+#: builtin/replace.c:544 builtin/tag.c:422 builtin/verify-tag.c:39
+msgid "format"
msgstr ""
-#: builtin/branch.c:757
-#, c-format
-msgid "No commit on branch '%s' yet."
+#: builtin/am.c:2216
+msgid "format the patch(es) are in"
msgstr ""
-#: builtin/branch.c:760
-#, c-format
-msgid "No branch named '%s'."
+#: builtin/am.c:2222
+msgid "override error message when patch failure occurs"
msgstr ""
-#: builtin/branch.c:775
-msgid "too many branches for a copy operation"
+#: builtin/am.c:2224
+msgid "continue applying patches after resolving a conflict"
msgstr ""
-#: builtin/branch.c:784
-msgid "too many arguments for a rename operation"
+#: builtin/am.c:2227
+msgid "synonyms for --continue"
msgstr ""
-#: builtin/branch.c:789
-msgid "too many arguments to set new upstream"
+#: builtin/am.c:2230
+msgid "skip the current patch"
msgstr ""
-#: builtin/branch.c:793
-#, c-format
-msgid ""
-"could not set upstream of HEAD to %s when it does not point to any branch."
+#: builtin/am.c:2233
+msgid "restore the original branch and abort the patching operation."
msgstr ""
-#: builtin/branch.c:796 builtin/branch.c:818 builtin/branch.c:834
-#, c-format
-msgid "no such branch '%s'"
+#: builtin/am.c:2236
+msgid "abort the patching operation but keep HEAD where it is."
msgstr ""
-#: builtin/branch.c:800
-#, c-format
-msgid "branch '%s' does not exist"
+#: builtin/am.c:2239
+msgid "show the patch being applied."
msgstr ""
-#: builtin/branch.c:812
-msgid "too many arguments to unset upstream"
+#: builtin/am.c:2243
+msgid "lie about committer date"
msgstr ""
-#: builtin/branch.c:816
-msgid "could not unset upstream of HEAD when it does not point to any branch."
+#: builtin/am.c:2245
+msgid "use current timestamp for author date"
msgstr ""
-#: builtin/branch.c:822
-#, c-format
-msgid "Branch '%s' has no upstream information"
+#: builtin/am.c:2247 builtin/commit.c:1486 builtin/merge.c:274
+#: builtin/pull.c:185 builtin/rebase.c:1106 builtin/rebase--interactive.c:185
+#: builtin/revert.c:114 builtin/tag.c:402
+msgid "key-id"
msgstr ""
-#: builtin/branch.c:837
-msgid "-a and -r options to 'git branch' do not make sense with a branch name"
+#: builtin/am.c:2248 builtin/rebase.c:1107 builtin/rebase--interactive.c:186
+msgid "GPG-sign commits"
msgstr ""
-#: builtin/branch.c:840
-msgid ""
-"the '--set-upstream' option is no longer supported. Please use '--track' or "
-"'--set-upstream-to' instead."
+#: builtin/am.c:2251
+msgid "(internal use for git-rebase)"
msgstr ""
-#: builtin/bundle.c:45
-#, c-format
-msgid "%s is okay\n"
+#: builtin/am.c:2269
+msgid ""
+"The -b/--binary option has been a no-op for long time, and\n"
+"it will be removed. Please do not use it anymore."
msgstr ""
-#: builtin/bundle.c:58
-msgid "Need a repository to create a bundle."
+#: builtin/am.c:2276
+msgid "failed to read the index"
msgstr ""
-#: builtin/bundle.c:62
-msgid "Need a repository to unbundle."
+#: builtin/am.c:2291
+#, c-format
+msgid "previous rebase directory %s still exists but mbox given."
msgstr ""
-#: builtin/cat-file.c:577
+#: builtin/am.c:2315
+#, c-format
msgid ""
-"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
-"p | <type> | --textconv | --filters) [--path=<path>] <object>"
+"Stray %s directory found.\n"
+"Use \"git am --abort\" to remove it."
msgstr ""
-#: builtin/cat-file.c:578
-msgid ""
-"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
-"filters]"
+#: builtin/am.c:2321
+msgid "Resolve operation not in progress, we are not resuming."
msgstr ""
-#: builtin/cat-file.c:615
-msgid "<type> can be one of: blob, tree, commit, tag"
+#: builtin/apply.c:8
+msgid "git apply [<options>] [<patch>...]"
msgstr ""
-#: builtin/cat-file.c:616
-msgid "show object type"
+#: builtin/archive.c:17
+#, c-format
+msgid "could not create archive file '%s'"
msgstr ""
-#: builtin/cat-file.c:617
-msgid "show object size"
+#: builtin/archive.c:20
+msgid "could not redirect output"
msgstr ""
-#: builtin/cat-file.c:619
-msgid "exit with zero when there's no error"
+#: builtin/archive.c:37
+msgid "git archive: Remote with no URL"
msgstr ""
-#: builtin/cat-file.c:620
-msgid "pretty-print object's content"
+#: builtin/archive.c:61
+msgid "git archive: expected ACK/NAK, got a flush packet"
msgstr ""
-#: builtin/cat-file.c:622
-msgid "for blob objects, run textconv on object's content"
+#: builtin/archive.c:64
+#, c-format
+msgid "git archive: NACK %s"
msgstr ""
-#: builtin/cat-file.c:624
-msgid "for blob objects, run filters on object's content"
+#: builtin/archive.c:65
+msgid "git archive: protocol error"
msgstr ""
-#: builtin/cat-file.c:625 git-submodule.sh:864
-msgid "blob"
+#: builtin/archive.c:69
+msgid "git archive: expected a flush"
msgstr ""
-#: builtin/cat-file.c:626
-msgid "use a specific path for --textconv/--filters"
+#: builtin/bisect--helper.c:22
+msgid "git bisect--helper --next-all [--no-checkout]"
msgstr ""
-#: builtin/cat-file.c:628
-msgid "allow -s and -t to work with broken/corrupt objects"
+#: builtin/bisect--helper.c:23
+msgid "git bisect--helper --write-terms <bad_term> <good_term>"
msgstr ""
-#: builtin/cat-file.c:629
-msgid "buffer --batch output"
+#: builtin/bisect--helper.c:24
+msgid "git bisect--helper --bisect-clean-state"
msgstr ""
-#: builtin/cat-file.c:631
-msgid "show info and content of objects fed from the standard input"
+#: builtin/bisect--helper.c:25
+msgid "git bisect--helper --bisect-reset [<commit>]"
msgstr ""
-#: builtin/cat-file.c:634
-msgid "show info about objects fed from the standard input"
+#: builtin/bisect--helper.c:26
+msgid ""
+"git bisect--helper --bisect-write [--no-log] <state> <revision> <good_term> "
+"<bad_term>"
msgstr ""
-#: builtin/cat-file.c:637
-msgid "follow in-tree symlinks (used with --batch or --batch-check)"
+#: builtin/bisect--helper.c:27
+msgid ""
+"git bisect--helper --bisect-check-and-set-terms <command> <good_term> "
+"<bad_term>"
msgstr ""
-#: builtin/cat-file.c:639
-msgid "show all objects with --batch or --batch-check"
+#: builtin/bisect--helper.c:28
+msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
msgstr ""
-#: builtin/cat-file.c:641
-msgid "do not order --batch-all-objects output"
+#: builtin/bisect--helper.c:29
+msgid ""
+"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
+"term-new]"
msgstr ""
-#: builtin/check-attr.c:12
-msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
+#: builtin/bisect--helper.c:30
+msgid ""
+"git bisect--helper --bisect-start [--term-{old,good}=<term> --term-{new,bad}"
+"=<term>][--no-checkout] [<bad> [<good>...]] [--] [<paths>...]"
msgstr ""
-#: builtin/check-attr.c:13
-msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
+#: builtin/bisect--helper.c:86
+#, c-format
+msgid "'%s' is not a valid term"
msgstr ""
-#: builtin/check-attr.c:20
-msgid "report all attributes set on file"
+#: builtin/bisect--helper.c:90
+#, c-format
+msgid "can't use the builtin command '%s' as a term"
msgstr ""
-#: builtin/check-attr.c:21
-msgid "use .gitattributes only from the index"
+#: builtin/bisect--helper.c:100
+#, c-format
+msgid "can't change the meaning of the term '%s'"
msgstr ""
-#: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:101
-msgid "read file names from stdin"
+#: builtin/bisect--helper.c:111
+msgid "please use two different terms"
msgstr ""
-#: builtin/check-attr.c:24 builtin/check-ignore.c:26
-msgid "terminate input and output records by a NUL character"
+#: builtin/bisect--helper.c:118
+msgid "could not open the file BISECT_TERMS"
msgstr ""
-#: builtin/check-ignore.c:20 builtin/checkout.c:1120 builtin/gc.c:503
-#: builtin/worktree.c:447
-msgid "suppress progress reporting"
+#: builtin/bisect--helper.c:155
+#, c-format
+msgid "We are not bisecting.\n"
msgstr ""
-#: builtin/check-ignore.c:28
-msgid "show non-matching input paths"
+#: builtin/bisect--helper.c:163
+#, c-format
+msgid "'%s' is not a valid commit"
msgstr ""
-#: builtin/check-ignore.c:30
-msgid "ignore index when checking"
+#: builtin/bisect--helper.c:174
+#, c-format
+msgid ""
+"could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
msgstr ""
-#: builtin/check-ignore.c:159
-msgid "cannot specify pathnames with --stdin"
+#: builtin/bisect--helper.c:215
+#, c-format
+msgid "Bad bisect_write argument: %s"
msgstr ""
-#: builtin/check-ignore.c:162
-msgid "-z only makes sense with --stdin"
+#: builtin/bisect--helper.c:220
+#, c-format
+msgid "couldn't get the oid of the rev '%s'"
msgstr ""
-#: builtin/check-ignore.c:164
-msgid "no path specified"
+#: builtin/bisect--helper.c:232
+#, c-format
+msgid "couldn't open the file '%s'"
msgstr ""
-#: builtin/check-ignore.c:168
-msgid "--quiet is only valid with a single pathname"
+#: builtin/bisect--helper.c:258
+#, c-format
+msgid "Invalid command: you're currently in a %s/%s bisect"
msgstr ""
-#: builtin/check-ignore.c:170
-msgid "cannot have both --quiet and --verbose"
+#: builtin/bisect--helper.c:285
+#, c-format
+msgid ""
+"You need to give me at least one %s and %s revision.\n"
+"You can use \"git bisect %s\" and \"git bisect %s\" for that."
msgstr ""
-#: builtin/check-ignore.c:173
-msgid "--non-matching is only valid with --verbose"
+#: builtin/bisect--helper.c:289
+#, c-format
+msgid ""
+"You need to start by \"git bisect start\".\n"
+"You then need to give me at least one %s and %s revision.\n"
+"You can use \"git bisect %s\" and \"git bisect %s\" for that."
msgstr ""
-#: builtin/check-mailmap.c:9
-msgid "git check-mailmap [<options>] <contact>..."
+#: builtin/bisect--helper.c:321
+#, c-format
+msgid "bisecting only with a %s commit"
msgstr ""
-#: builtin/check-mailmap.c:14
-msgid "also read contacts from stdin"
+#. TRANSLATORS: Make sure to include [Y] and [n] in your
+#. translation. The program will only accept English input
+#. at this point.
+#.
+#: builtin/bisect--helper.c:329
+msgid "Are you sure [Y/n]? "
msgstr ""
-#: builtin/check-mailmap.c:25
-#, c-format
-msgid "unable to parse contact: %s"
+#: builtin/bisect--helper.c:376
+msgid "no terms defined"
msgstr ""
-#: builtin/check-mailmap.c:48
-msgid "no contacts specified"
+#: builtin/bisect--helper.c:379
+#, c-format
+msgid ""
+"Your current terms are %s for the old state\n"
+"and %s for the new state.\n"
msgstr ""
-#: builtin/checkout-index.c:128
-msgid "git checkout-index [<options>] [--] [<file>...]"
+#: builtin/bisect--helper.c:389
+#, c-format
+msgid ""
+"invalid argument %s for 'git bisect terms'.\n"
+"Supported options are: --term-good|--term-old and --term-bad|--term-new."
msgstr ""
-#: builtin/checkout-index.c:143
-msgid "stage should be between 1 and 3 or all"
+#: builtin/bisect--helper.c:475
+#, c-format
+msgid "unrecognized option: '%s'"
msgstr ""
-#: builtin/checkout-index.c:159
-msgid "check out all files in the index"
+#: builtin/bisect--helper.c:479
+#, c-format
+msgid "'%s' does not appear to be a valid revision"
msgstr ""
-#: builtin/checkout-index.c:160
-msgid "force overwrite of existing files"
+#: builtin/bisect--helper.c:511
+msgid "bad HEAD - I need a HEAD"
msgstr ""
-#: builtin/checkout-index.c:162
-msgid "no warning for existing files and files not in index"
+#: builtin/bisect--helper.c:526
+#, c-format
+msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
msgstr ""
-#: builtin/checkout-index.c:164
-msgid "don't checkout new files"
+#: builtin/bisect--helper.c:547
+msgid "won't bisect on cg-seek'ed tree"
msgstr ""
-#: builtin/checkout-index.c:166
-msgid "update stat information in the index file"
+#: builtin/bisect--helper.c:550
+msgid "bad HEAD - strange symbolic ref"
msgstr ""
-#: builtin/checkout-index.c:170
-msgid "read list of paths from the standard input"
+#: builtin/bisect--helper.c:627
+msgid "perform 'git bisect next'"
msgstr ""
-#: builtin/checkout-index.c:172
-msgid "write the content to temporary files"
+#: builtin/bisect--helper.c:629
+msgid "write the terms to .git/BISECT_TERMS"
msgstr ""
-#: builtin/checkout-index.c:173 builtin/column.c:31
-#: builtin/submodule--helper.c:1361 builtin/submodule--helper.c:1364
-#: builtin/submodule--helper.c:1372 builtin/submodule--helper.c:1736
-#: builtin/worktree.c:620
-msgid "string"
+#: builtin/bisect--helper.c:631
+msgid "cleanup the bisection state"
msgstr ""
-#: builtin/checkout-index.c:174
-msgid "when creating files, prepend <string>"
+#: builtin/bisect--helper.c:633
+msgid "check for expected revs"
msgstr ""
-#: builtin/checkout-index.c:176
-msgid "copy out the files from named stage"
+#: builtin/bisect--helper.c:635
+msgid "reset the bisection state"
msgstr ""
-#: builtin/checkout.c:29
-msgid "git checkout [<options>] <branch>"
+#: builtin/bisect--helper.c:637
+msgid "write out the bisection state in BISECT_LOG"
msgstr ""
-#: builtin/checkout.c:30
-msgid "git checkout [<options>] [<branch>] -- <file>..."
+#: builtin/bisect--helper.c:639
+msgid "check and set terms in a bisection state"
msgstr ""
-#: builtin/checkout.c:138 builtin/checkout.c:171
-#, c-format
-msgid "path '%s' does not have our version"
+#: builtin/bisect--helper.c:641
+msgid "check whether bad or good terms exist"
msgstr ""
-#: builtin/checkout.c:140 builtin/checkout.c:173
-#, c-format
-msgid "path '%s' does not have their version"
+#: builtin/bisect--helper.c:643
+msgid "print out the bisect terms"
msgstr ""
-#: builtin/checkout.c:156
-#, c-format
-msgid "path '%s' does not have all necessary versions"
+#: builtin/bisect--helper.c:645
+msgid "start the bisect session"
msgstr ""
-#: builtin/checkout.c:200
-#, c-format
-msgid "path '%s' does not have necessary versions"
+#: builtin/bisect--helper.c:647
+msgid "update BISECT_HEAD instead of checking out the current commit"
msgstr ""
-#: builtin/checkout.c:217
-#, c-format
-msgid "path '%s': cannot merge"
+#: builtin/bisect--helper.c:649
+msgid "no log for BISECT_WRITE"
msgstr ""
-#: builtin/checkout.c:233
-#, c-format
-msgid "Unable to add merge result for '%s'"
+#: builtin/bisect--helper.c:666
+msgid "--write-terms requires two arguments"
msgstr ""
-#: 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"
+#: builtin/bisect--helper.c:670
+msgid "--bisect-clean-state requires no arguments"
msgstr ""
-#: builtin/checkout.c:267 builtin/checkout.c:270
-#, c-format
-msgid "'%s' cannot be used with %s"
+#: builtin/bisect--helper.c:677
+msgid "--bisect-reset requires either no argument or a commit"
msgstr ""
-#: builtin/checkout.c:273
-#, c-format
-msgid "Cannot update paths and switch to branch '%s' at the same time."
+#: builtin/bisect--helper.c:681
+msgid "--bisect-write requires either 4 or 5 arguments"
msgstr ""
-#: builtin/checkout.c:342 builtin/checkout.c:349
-#, c-format
-msgid "path '%s' is unmerged"
+#: builtin/bisect--helper.c:687
+msgid "--check-and-set-terms requires 3 arguments"
msgstr ""
-#: builtin/checkout.c:508
-msgid "you need to resolve your current index first"
+#: builtin/bisect--helper.c:693
+msgid "--bisect-next-check requires 2 or 3 arguments"
msgstr ""
-#: builtin/checkout.c:645
-#, c-format
-msgid "Can not do reflog for '%s': %s\n"
+#: builtin/bisect--helper.c:699
+msgid "--bisect-terms requires 0 or 1 argument"
msgstr ""
-#: builtin/checkout.c:686
-msgid "HEAD is now at"
+#: builtin/blame.c:31
+msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
msgstr ""
-#: builtin/checkout.c:690 builtin/clone.c:692
-msgid "unable to update HEAD"
+#: builtin/blame.c:36
+msgid "<rev-opts> are documented in git-rev-list(1)"
msgstr ""
-#: builtin/checkout.c:694
+#: builtin/blame.c:406
#, c-format
-msgid "Reset branch '%s'\n"
+msgid "expecting a color: %s"
msgstr ""
-#: builtin/checkout.c:697
-#, c-format
-msgid "Already on '%s'\n"
+#: builtin/blame.c:413
+msgid "must end with a color"
msgstr ""
-#: builtin/checkout.c:701
+#: builtin/blame.c:700
#, c-format
-msgid "Switched to and reset branch '%s'\n"
+msgid "invalid color '%s' in color.blame.repeatedLines"
msgstr ""
-#: builtin/checkout.c:703 builtin/checkout.c:1052
-#, c-format
-msgid "Switched to a new branch '%s'\n"
+#: builtin/blame.c:718
+msgid "invalid value for blame.coloring"
msgstr ""
-#: builtin/checkout.c:705
-#, c-format
-msgid "Switched to branch '%s'\n"
+#: builtin/blame.c:793
+msgid "Show blame entries as we find them, incrementally"
msgstr ""
-#: builtin/checkout.c:756
-#, c-format
-msgid " ... and %d more.\n"
+#: builtin/blame.c:794
+msgid "Show blank SHA-1 for boundary commits (Default: off)"
msgstr ""
-#: builtin/checkout.c:762
-#, c-format
-msgid ""
-"Warning: you are leaving %d commit behind, not connected to\n"
-"any of your branches:\n"
-"\n"
-"%s\n"
-msgid_plural ""
-"Warning: you are leaving %d commits behind, not connected to\n"
-"any of your branches:\n"
-"\n"
-"%s\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/checkout.c:781
-#, c-format
-msgid ""
-"If you want to keep it by creating a new branch, this may be a good time\n"
-"to do so with:\n"
-"\n"
-" git branch <new-branch-name> %s\n"
-"\n"
-msgid_plural ""
-"If you want to keep them by creating a new branch, this may be a good time\n"
-"to do so with:\n"
-"\n"
-" git branch <new-branch-name> %s\n"
-"\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/checkout.c:813
-msgid "internal error in revision walk"
+#: builtin/blame.c:795
+msgid "Do not treat root commits as boundaries (Default: off)"
msgstr ""
-#: builtin/checkout.c:817
-msgid "Previous HEAD position was"
+#: builtin/blame.c:796
+msgid "Show work cost statistics"
msgstr ""
-#: builtin/checkout.c:845 builtin/checkout.c:1047
-msgid "You are on a branch yet to be born"
+#: builtin/blame.c:797
+msgid "Force progress reporting"
msgstr ""
-#: builtin/checkout.c:952
-#, c-format
-msgid "only one reference expected, %d given."
+#: builtin/blame.c:798
+msgid "Show output score for blame entries"
msgstr ""
-#: builtin/checkout.c:993 builtin/worktree.c:241 builtin/worktree.c:396
-#, c-format
-msgid "invalid reference: %s"
+#: builtin/blame.c:799
+msgid "Show original filename (Default: auto)"
msgstr ""
-#: builtin/checkout.c:1022
-#, c-format
-msgid "reference is not a tree: %s"
+#: builtin/blame.c:800
+msgid "Show original linenumber (Default: off)"
msgstr ""
-#: builtin/checkout.c:1061
-msgid "paths cannot be used with switching branches"
+#: builtin/blame.c:801
+msgid "Show in a format designed for machine consumption"
msgstr ""
-#: builtin/checkout.c:1064 builtin/checkout.c:1068
-#, c-format
-msgid "'%s' cannot be used with switching branches"
+#: builtin/blame.c:802
+msgid "Show porcelain format with per-line commit information"
msgstr ""
-#: 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'"
+#: builtin/blame.c:803
+msgid "Use the same output mode as git-annotate (Default: off)"
msgstr ""
-#: builtin/checkout.c:1088
-#, c-format
-msgid "Cannot switch branch to a non-commit '%s'"
+#: builtin/blame.c:804
+msgid "Show raw timestamp (Default: off)"
msgstr ""
-#: builtin/checkout.c:1121 builtin/checkout.c:1123 builtin/clone.c:119
-#: builtin/remote.c:168 builtin/remote.c:170 builtin/worktree.c:440
-#: builtin/worktree.c:442
-msgid "branch"
+#: builtin/blame.c:805
+msgid "Show long commit SHA1 (Default: off)"
msgstr ""
-#: builtin/checkout.c:1122
-msgid "create and checkout a new branch"
+#: builtin/blame.c:806
+msgid "Suppress author name and timestamp (Default: off)"
msgstr ""
-#: builtin/checkout.c:1124
-msgid "create/reset and checkout a branch"
+#: builtin/blame.c:807
+msgid "Show author email instead of name (Default: off)"
msgstr ""
-#: builtin/checkout.c:1125
-msgid "create reflog for new branch"
+#: builtin/blame.c:808
+msgid "Ignore whitespace differences"
msgstr ""
-#: builtin/checkout.c:1126 builtin/worktree.c:444
-msgid "detach HEAD at named commit"
+#: builtin/blame.c:809
+msgid "color redundant metadata from previous line differently"
msgstr ""
-#: builtin/checkout.c:1127
-msgid "set upstream info for new branch"
+#: builtin/blame.c:810
+msgid "color lines by age"
msgstr ""
-#: builtin/checkout.c:1129
-msgid "new-branch"
+#: builtin/blame.c:817
+msgid "Use an experimental heuristic to improve diffs"
msgstr ""
-#: builtin/checkout.c:1129
-msgid "new unparented branch"
+#: builtin/blame.c:819
+msgid "Spend extra cycles to find better match"
msgstr ""
-#: builtin/checkout.c:1131
-msgid "checkout our version for unmerged files"
+#: builtin/blame.c:820
+msgid "Use revisions from <file> instead of calling git-rev-list"
msgstr ""
-#: builtin/checkout.c:1134
-msgid "checkout their version for unmerged files"
+#: builtin/blame.c:821
+msgid "Use <file>'s contents as the final image"
msgstr ""
-#: builtin/checkout.c:1136
-msgid "force checkout (throw away local modifications)"
+#: builtin/blame.c:822 builtin/blame.c:823
+msgid "score"
msgstr ""
-#: builtin/checkout.c:1138
-msgid "perform a 3-way merge with the new branch"
+#: builtin/blame.c:822
+msgid "Find line copies within and across files"
msgstr ""
-#: builtin/checkout.c:1140 builtin/merge.c:273
-msgid "update ignored files (default)"
+#: builtin/blame.c:823
+msgid "Find line movements within and across files"
msgstr ""
-#: builtin/checkout.c:1142 builtin/log.c:1510 parse-options.h:264
-msgid "style"
+#: builtin/blame.c:824
+msgid "n,m"
msgstr ""
-#: builtin/checkout.c:1143
-msgid "conflict style (merge or diff3)"
+#: builtin/blame.c:824
+msgid "Process only line range n,m, counting from 1"
msgstr ""
-#: builtin/checkout.c:1146
-msgid "do not limit pathspecs to sparse entries only"
+#: builtin/blame.c:875
+msgid "--progress can't be used with --incremental or porcelain formats"
msgstr ""
-#: builtin/checkout.c:1148
-msgid "second guess 'git checkout <no-such-branch>'"
+#. TRANSLATORS: This string is used to tell us the
+#. maximum display width for a relative timestamp in
+#. "git blame" output. For C locale, "4 years, 11
+#. months ago", which takes 22 places, is the longest
+#. among various forms of relative timestamps, but
+#. your language may need more or fewer display
+#. columns.
+#.
+#: builtin/blame.c:926
+msgid "4 years, 11 months ago"
msgstr ""
-#: builtin/checkout.c:1150
-msgid "do not check if another worktree is holding the given ref"
-msgstr ""
+#: builtin/blame.c:1018
+#, c-format
+msgid "file %s has only %lu line"
+msgid_plural "file %s has only %lu lines"
+msgstr[0] ""
+msgstr[1] ""
-#: 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"
+#: builtin/blame.c:1064
+msgid "Blaming lines"
msgstr ""
-#: builtin/checkout.c:1184
-msgid "-b, -B and --orphan are mutually exclusive"
+#: builtin/branch.c:29
+msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
msgstr ""
-#: builtin/checkout.c:1201
+#: builtin/branch.c:30
+msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
+msgstr ""
+
+#: builtin/branch.c:31
+msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
+msgstr ""
+
+#: builtin/branch.c:32
+msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
+msgstr ""
+
+#: builtin/branch.c:33
+msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
+msgstr ""
+
+#: builtin/branch.c:34
+msgid "git branch [<options>] [-r | -a] [--points-at]"
+msgstr ""
+
+#: builtin/branch.c:35
+msgid "git branch [<options>] [-r | -a] [--format]"
+msgstr ""
+
+#: builtin/branch.c:151
+#, c-format
+msgid ""
+"deleting branch '%s' that has been merged to\n"
+" '%s', but not yet merged to HEAD."
+msgstr ""
+
+#: builtin/branch.c:155
+#, c-format
+msgid ""
+"not deleting branch '%s' that is not yet merged to\n"
+" '%s', even though it is merged to HEAD."
+msgstr ""
+
+#: builtin/branch.c:169
+#, c-format
+msgid "Couldn't look up commit object for '%s'"
+msgstr ""
+
+#: builtin/branch.c:173
+#, c-format
+msgid ""
+"The branch '%s' is not fully merged.\n"
+"If you are sure you want to delete it, run 'git branch -D %s'."
+msgstr ""
+
+#: builtin/branch.c:186
+msgid "Update of config-file failed"
+msgstr ""
+
+#: builtin/branch.c:217
+msgid "cannot use -a with -d"
+msgstr ""
+
+#: builtin/branch.c:223
+msgid "Couldn't look up commit object for HEAD"
+msgstr ""
+
+#: builtin/branch.c:237
+#, c-format
+msgid "Cannot delete branch '%s' checked out at '%s'"
+msgstr ""
+
+#: builtin/branch.c:252
+#, c-format
+msgid "remote-tracking branch '%s' not found."
+msgstr ""
+
+#: builtin/branch.c:253
+#, c-format
+msgid "branch '%s' not found."
+msgstr ""
+
+#: builtin/branch.c:268
+#, c-format
+msgid "Error deleting remote-tracking branch '%s'"
+msgstr ""
+
+#: builtin/branch.c:269
+#, c-format
+msgid "Error deleting branch '%s'"
+msgstr ""
+
+#: builtin/branch.c:276
+#, c-format
+msgid "Deleted remote-tracking branch %s (was %s).\n"
+msgstr ""
+
+#: builtin/branch.c:277
+#, c-format
+msgid "Deleted branch %s (was %s).\n"
+msgstr ""
+
+#: builtin/branch.c:421 builtin/tag.c:59
+msgid "unable to parse format string"
+msgstr ""
+
+#: builtin/branch.c:458
+#, c-format
+msgid "Branch %s is being rebased at %s"
+msgstr ""
+
+#: builtin/branch.c:462
+#, c-format
+msgid "Branch %s is being bisected at %s"
+msgstr ""
+
+#: builtin/branch.c:479
+msgid "cannot copy the current branch while not on any."
+msgstr ""
+
+#: builtin/branch.c:481
+msgid "cannot rename the current branch while not on any."
+msgstr ""
+
+#: builtin/branch.c:492
+#, c-format
+msgid "Invalid branch name: '%s'"
+msgstr ""
+
+#: builtin/branch.c:519
+msgid "Branch rename failed"
+msgstr ""
+
+#: builtin/branch.c:521
+msgid "Branch copy failed"
+msgstr ""
+
+#: builtin/branch.c:525
+#, c-format
+msgid "Created a copy of a misnamed branch '%s'"
+msgstr ""
+
+#: builtin/branch.c:528
+#, c-format
+msgid "Renamed a misnamed branch '%s' away"
+msgstr ""
+
+#: builtin/branch.c:534
+#, c-format
+msgid "Branch renamed to %s, but HEAD is not updated!"
+msgstr ""
+
+#: builtin/branch.c:543
+msgid "Branch is renamed, but update of config-file failed"
+msgstr ""
+
+#: builtin/branch.c:545
+msgid "Branch is copied, but update of config-file failed"
+msgstr ""
+
+#: builtin/branch.c:561
+#, c-format
+msgid ""
+"Please edit the description for the branch\n"
+" %s\n"
+"Lines starting with '%c' will be stripped.\n"
+msgstr ""
+
+#: builtin/branch.c:594
+msgid "Generic options"
+msgstr ""
+
+#: builtin/branch.c:596
+msgid "show hash and subject, give twice for upstream branch"
+msgstr ""
+
+#: builtin/branch.c:597
+msgid "suppress informational messages"
+msgstr ""
+
+#: builtin/branch.c:598
+msgid "set up tracking mode (see git-pull(1))"
+msgstr ""
+
+#: builtin/branch.c:600
+msgid "do not use"
+msgstr ""
+
+#: builtin/branch.c:602 builtin/rebase--interactive.c:182
+msgid "upstream"
+msgstr ""
+
+#: builtin/branch.c:602
+msgid "change the upstream info"
+msgstr ""
+
+#: builtin/branch.c:603
+msgid "Unset the upstream info"
+msgstr ""
+
+#: builtin/branch.c:604
+msgid "use colored output"
+msgstr ""
+
+#: builtin/branch.c:605
+msgid "act on remote-tracking branches"
+msgstr ""
+
+#: builtin/branch.c:607 builtin/branch.c:609
+msgid "print only branches that contain the commit"
+msgstr ""
+
+#: builtin/branch.c:608 builtin/branch.c:610
+msgid "print only branches that don't contain the commit"
+msgstr ""
+
+#: builtin/branch.c:613
+msgid "Specific git-branch actions:"
+msgstr ""
+
+#: builtin/branch.c:614
+msgid "list both remote-tracking and local branches"
+msgstr ""
+
+#: builtin/branch.c:616
+msgid "delete fully merged branch"
+msgstr ""
+
+#: builtin/branch.c:617
+msgid "delete branch (even if not merged)"
+msgstr ""
+
+#: builtin/branch.c:618
+msgid "move/rename a branch and its reflog"
+msgstr ""
+
+#: builtin/branch.c:619
+msgid "move/rename a branch, even if target exists"
+msgstr ""
+
+#: builtin/branch.c:620
+msgid "copy a branch and its reflog"
+msgstr ""
+
+#: builtin/branch.c:621
+msgid "copy a branch, even if target exists"
+msgstr ""
+
+#: builtin/branch.c:622
+msgid "list branch names"
+msgstr ""
+
+#: builtin/branch.c:623
+msgid "create the branch's reflog"
+msgstr ""
+
+#: builtin/branch.c:625
+msgid "edit the description for the branch"
+msgstr ""
+
+#: builtin/branch.c:626
+msgid "force creation, move/rename, deletion"
+msgstr ""
+
+#: builtin/branch.c:627
+msgid "print only branches that are merged"
+msgstr ""
+
+#: builtin/branch.c:628
+msgid "print only branches that are not merged"
+msgstr ""
+
+#: builtin/branch.c:629
+msgid "list branches in columns"
+msgstr ""
+
+#: builtin/branch.c:630 builtin/for-each-ref.c:40 builtin/ls-remote.c:70
+#: builtin/tag.c:415
+msgid "key"
+msgstr ""
+
+#: builtin/branch.c:631 builtin/for-each-ref.c:41 builtin/ls-remote.c:71
+#: builtin/tag.c:416
+msgid "field name to sort on"
+msgstr ""
+
+#: builtin/branch.c:633 builtin/for-each-ref.c:43 builtin/notes.c:415
+#: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584
+#: builtin/tag.c:418
+msgid "object"
+msgstr ""
+
+#: builtin/branch.c:634
+msgid "print only branches of the object"
+msgstr ""
+
+#: builtin/branch.c:636 builtin/for-each-ref.c:49 builtin/tag.c:425
+msgid "sorting and filtering are case insensitive"
+msgstr ""
+
+#: builtin/branch.c:637 builtin/for-each-ref.c:38 builtin/tag.c:423
+#: builtin/verify-tag.c:39
+msgid "format to use for the output"
+msgstr ""
+
+#: builtin/branch.c:660 builtin/clone.c:746
+msgid "HEAD not found below refs/heads!"
+msgstr ""
+
+#: builtin/branch.c:683
+msgid "--column and --verbose are incompatible"
+msgstr ""
+
+#: builtin/branch.c:698 builtin/branch.c:749 builtin/branch.c:758
+msgid "branch name required"
+msgstr ""
+
+#: builtin/branch.c:725
+msgid "Cannot give description to detached HEAD"
+msgstr ""
+
+#: builtin/branch.c:730
+msgid "cannot edit description of more than one branch"
+msgstr ""
+
+#: builtin/branch.c:737
+#, c-format
+msgid "No commit on branch '%s' yet."
+msgstr ""
+
+#: builtin/branch.c:740
+#, c-format
+msgid "No branch named '%s'."
+msgstr ""
+
+#: builtin/branch.c:755
+msgid "too many branches for a copy operation"
+msgstr ""
+
+#: builtin/branch.c:764
+msgid "too many arguments for a rename operation"
+msgstr ""
+
+#: builtin/branch.c:769
+msgid "too many arguments to set new upstream"
+msgstr ""
+
+#: builtin/branch.c:773
+#, c-format
+msgid ""
+"could not set upstream of HEAD to %s when it does not point to any branch."
+msgstr ""
+
+#: builtin/branch.c:776 builtin/branch.c:799
+#, c-format
+msgid "no such branch '%s'"
+msgstr ""
+
+#: builtin/branch.c:780
+#, c-format
+msgid "branch '%s' does not exist"
+msgstr ""
+
+#: builtin/branch.c:793
+msgid "too many arguments to unset upstream"
+msgstr ""
+
+#: builtin/branch.c:797
+msgid "could not unset upstream of HEAD when it does not point to any branch."
+msgstr ""
+
+#: builtin/branch.c:803
+#, c-format
+msgid "Branch '%s' has no upstream information"
+msgstr ""
+
+#: builtin/branch.c:813
+msgid "-a and -r options to 'git branch' do not make sense with a branch name"
+msgstr ""
+
+#: builtin/branch.c:816
+msgid ""
+"the '--set-upstream' option is no longer supported. Please use '--track' or "
+"'--set-upstream-to' instead."
+msgstr ""
+
+#: builtin/bundle.c:45
+#, c-format
+msgid "%s is okay\n"
+msgstr ""
+
+#: builtin/bundle.c:58
+msgid "Need a repository to create a bundle."
+msgstr ""
+
+#: builtin/bundle.c:62
+msgid "Need a repository to unbundle."
+msgstr ""
+
+#: builtin/cat-file.c:593
+msgid ""
+"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
+"p | <type> | --textconv | --filters) [--path=<path>] <object>"
+msgstr ""
+
+#: builtin/cat-file.c:594
+msgid ""
+"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
+"filters]"
+msgstr ""
+
+#: builtin/cat-file.c:615
+msgid "only one batch option may be specified"
+msgstr ""
+
+#: builtin/cat-file.c:633
+msgid "<type> can be one of: blob, tree, commit, tag"
+msgstr ""
+
+#: builtin/cat-file.c:634
+msgid "show object type"
+msgstr ""
+
+#: builtin/cat-file.c:635
+msgid "show object size"
+msgstr ""
+
+#: builtin/cat-file.c:637
+msgid "exit with zero when there's no error"
+msgstr ""
+
+#: builtin/cat-file.c:638
+msgid "pretty-print object's content"
+msgstr ""
+
+#: builtin/cat-file.c:640
+msgid "for blob objects, run textconv on object's content"
+msgstr ""
+
+#: builtin/cat-file.c:642
+msgid "for blob objects, run filters on object's content"
+msgstr ""
+
+#: builtin/cat-file.c:643 git-submodule.sh:860
+msgid "blob"
+msgstr ""
+
+#: builtin/cat-file.c:644
+msgid "use a specific path for --textconv/--filters"
+msgstr ""
+
+#: builtin/cat-file.c:646
+msgid "allow -s and -t to work with broken/corrupt objects"
+msgstr ""
+
+#: builtin/cat-file.c:647
+msgid "buffer --batch output"
+msgstr ""
+
+#: builtin/cat-file.c:649
+msgid "show info and content of objects fed from the standard input"
+msgstr ""
+
+#: builtin/cat-file.c:653
+msgid "show info about objects fed from the standard input"
+msgstr ""
+
+#: builtin/cat-file.c:657
+msgid "follow in-tree symlinks (used with --batch or --batch-check)"
+msgstr ""
+
+#: builtin/cat-file.c:659
+msgid "show all objects with --batch or --batch-check"
+msgstr ""
+
+#: builtin/cat-file.c:661
+msgid "do not order --batch-all-objects output"
+msgstr ""
+
+#: builtin/check-attr.c:13
+msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
+msgstr ""
+
+#: builtin/check-attr.c:14
+msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
+msgstr ""
+
+#: builtin/check-attr.c:21
+msgid "report all attributes set on file"
+msgstr ""
+
+#: builtin/check-attr.c:22
+msgid "use .gitattributes only from the index"
+msgstr ""
+
+#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:102
+msgid "read file names from stdin"
+msgstr ""
+
+#: builtin/check-attr.c:25 builtin/check-ignore.c:27
+msgid "terminate input and output records by a NUL character"
+msgstr ""
+
+#: builtin/check-ignore.c:21 builtin/checkout.c:1280 builtin/gc.c:517
+#: builtin/worktree.c:496
+msgid "suppress progress reporting"
+msgstr ""
+
+#: builtin/check-ignore.c:29
+msgid "show non-matching input paths"
+msgstr ""
+
+#: builtin/check-ignore.c:31
+msgid "ignore index when checking"
+msgstr ""
+
+#: builtin/check-ignore.c:160
+msgid "cannot specify pathnames with --stdin"
+msgstr ""
+
+#: builtin/check-ignore.c:163
+msgid "-z only makes sense with --stdin"
+msgstr ""
+
+#: builtin/check-ignore.c:165
+msgid "no path specified"
+msgstr ""
+
+#: builtin/check-ignore.c:169
+msgid "--quiet is only valid with a single pathname"
+msgstr ""
+
+#: builtin/check-ignore.c:171
+msgid "cannot have both --quiet and --verbose"
+msgstr ""
+
+#: builtin/check-ignore.c:174
+msgid "--non-matching is only valid with --verbose"
+msgstr ""
+
+#: builtin/check-mailmap.c:9
+msgid "git check-mailmap [<options>] <contact>..."
+msgstr ""
+
+#: builtin/check-mailmap.c:14
+msgid "also read contacts from stdin"
+msgstr ""
+
+#: builtin/check-mailmap.c:25
+#, c-format
+msgid "unable to parse contact: %s"
+msgstr ""
+
+#: builtin/check-mailmap.c:48
+msgid "no contacts specified"
+msgstr ""
+
+#: builtin/checkout-index.c:131
+msgid "git checkout-index [<options>] [--] [<file>...]"
+msgstr ""
+
+#: builtin/checkout-index.c:148
+msgid "stage should be between 1 and 3 or all"
+msgstr ""
+
+#: builtin/checkout-index.c:164
+msgid "check out all files in the index"
+msgstr ""
+
+#: builtin/checkout-index.c:165
+msgid "force overwrite of existing files"
+msgstr ""
+
+#: builtin/checkout-index.c:167
+msgid "no warning for existing files and files not in index"
+msgstr ""
+
+#: builtin/checkout-index.c:169
+msgid "don't checkout new files"
+msgstr ""
+
+#: builtin/checkout-index.c:171
+msgid "update stat information in the index file"
+msgstr ""
+
+#: builtin/checkout-index.c:175
+msgid "read list of paths from the standard input"
+msgstr ""
+
+#: builtin/checkout-index.c:177
+msgid "write the content to temporary files"
+msgstr ""
+
+#: builtin/checkout-index.c:178 builtin/column.c:31
+#: builtin/submodule--helper.c:1372 builtin/submodule--helper.c:1375
+#: builtin/submodule--helper.c:1383 builtin/submodule--helper.c:1857
+#: builtin/worktree.c:669
+msgid "string"
+msgstr ""
+
+#: builtin/checkout-index.c:179
+msgid "when creating files, prepend <string>"
+msgstr ""
+
+#: builtin/checkout-index.c:181
+msgid "copy out the files from named stage"
+msgstr ""
+
+#: builtin/checkout.c:32
+msgid "git checkout [<options>] <branch>"
+msgstr ""
+
+#: builtin/checkout.c:33
+msgid "git checkout [<options>] [<branch>] -- <file>..."
+msgstr ""
+
+#: builtin/checkout.c:147 builtin/checkout.c:181
+#, c-format
+msgid "path '%s' does not have our version"
+msgstr ""
+
+#: builtin/checkout.c:149 builtin/checkout.c:183
+#, c-format
+msgid "path '%s' does not have their version"
+msgstr ""
+
+#: builtin/checkout.c:165
+#, c-format
+msgid "path '%s' does not have all necessary versions"
+msgstr ""
+
+#: builtin/checkout.c:210
+#, c-format
+msgid "path '%s' does not have necessary versions"
+msgstr ""
+
+#: builtin/checkout.c:228
+#, c-format
+msgid "path '%s': cannot merge"
+msgstr ""
+
+#: builtin/checkout.c:244
+#, c-format
+msgid "Unable to add merge result for '%s'"
+msgstr ""
+
+#: builtin/checkout.c:267 builtin/checkout.c:270 builtin/checkout.c:273
+#: builtin/checkout.c:276
+#, c-format
+msgid "'%s' cannot be used with updating paths"
+msgstr ""
+
+#: builtin/checkout.c:279 builtin/checkout.c:282
+#, c-format
+msgid "'%s' cannot be used with %s"
+msgstr ""
+
+#: builtin/checkout.c:285
+#, c-format
+msgid "Cannot update paths and switch to branch '%s' at the same time."
+msgstr ""
+
+#: builtin/checkout.c:354 builtin/checkout.c:361
+#, c-format
+msgid "path '%s' is unmerged"
+msgstr ""
+
+#: builtin/checkout.c:397
+#, c-format
+msgid "Recreated %d merge conflict"
+msgid_plural "Recreated %d merge conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/checkout.c:402
+#, c-format
+msgid "Updated %d path from %s"
+msgid_plural "Updated %d paths from %s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/checkout.c:409
+#, c-format
+msgid "Updated %d path from the index"
+msgid_plural "Updated %d paths from the index"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/checkout.c:645
+msgid "you need to resolve your current index first"
+msgstr ""
+
+#: builtin/checkout.c:782
+#, c-format
+msgid "Can not do reflog for '%s': %s\n"
+msgstr ""
+
+#: builtin/checkout.c:824
+msgid "HEAD is now at"
+msgstr ""
+
+#: builtin/checkout.c:828 builtin/clone.c:699
+msgid "unable to update HEAD"
+msgstr ""
+
+#: builtin/checkout.c:832
+#, c-format
+msgid "Reset branch '%s'\n"
+msgstr ""
+
+#: builtin/checkout.c:835
+#, c-format
+msgid "Already on '%s'\n"
+msgstr ""
+
+#: builtin/checkout.c:839
+#, c-format
+msgid "Switched to and reset branch '%s'\n"
+msgstr ""
+
+#: builtin/checkout.c:841 builtin/checkout.c:1212
+#, c-format
+msgid "Switched to a new branch '%s'\n"
+msgstr ""
+
+#: builtin/checkout.c:843
+#, c-format
+msgid "Switched to branch '%s'\n"
+msgstr ""
+
+#: builtin/checkout.c:894
+#, c-format
+msgid " ... and %d more.\n"
+msgstr ""
+
+#: builtin/checkout.c:900
+#, c-format
+msgid ""
+"Warning: you are leaving %d commit behind, not connected to\n"
+"any of your branches:\n"
+"\n"
+"%s\n"
+msgid_plural ""
+"Warning: you are leaving %d commits behind, not connected to\n"
+"any of your branches:\n"
+"\n"
+"%s\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/checkout.c:919
+#, c-format
+msgid ""
+"If you want to keep it by creating a new branch, this may be a good time\n"
+"to do so with:\n"
+"\n"
+" git branch <new-branch-name> %s\n"
+"\n"
+msgid_plural ""
+"If you want to keep them by creating a new branch, this may be a good time\n"
+"to do so with:\n"
+"\n"
+" git branch <new-branch-name> %s\n"
+"\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/checkout.c:951
+msgid "internal error in revision walk"
+msgstr ""
+
+#: builtin/checkout.c:955
+msgid "Previous HEAD position was"
+msgstr ""
+
+#: builtin/checkout.c:983 builtin/checkout.c:1207
+msgid "You are on a branch yet to be born"
+msgstr ""
+
+#: builtin/checkout.c:1104
+#, c-format
+msgid "only one reference expected, %d given."
+msgstr ""
+
+#: builtin/checkout.c:1140
+#, c-format
+msgid ""
+"'%s' could be both a local file and a tracking branch.\n"
+"Please use -- (and optionally --no-guess) to disambiguate"
+msgstr ""
+
+#: builtin/checkout.c:1153 builtin/worktree.c:290 builtin/worktree.c:445
+#, c-format
+msgid "invalid reference: %s"
+msgstr ""
+
+#: builtin/checkout.c:1182
+#, c-format
+msgid "reference is not a tree: %s"
+msgstr ""
+
+#: builtin/checkout.c:1221
+msgid "paths cannot be used with switching branches"
+msgstr ""
+
+#: builtin/checkout.c:1224 builtin/checkout.c:1228
+#, c-format
+msgid "'%s' cannot be used with switching branches"
+msgstr ""
+
+#: builtin/checkout.c:1232 builtin/checkout.c:1235 builtin/checkout.c:1240
+#: builtin/checkout.c:1243
+#, c-format
+msgid "'%s' cannot be used with '%s'"
+msgstr ""
+
+#: builtin/checkout.c:1248
+#, c-format
+msgid "Cannot switch branch to a non-commit '%s'"
+msgstr ""
+
+#: builtin/checkout.c:1281 builtin/checkout.c:1283 builtin/clone.c:120
+#: builtin/remote.c:169 builtin/remote.c:171 builtin/worktree.c:489
+#: builtin/worktree.c:491
+msgid "branch"
+msgstr ""
+
+#: builtin/checkout.c:1282
+msgid "create and checkout a new branch"
+msgstr ""
+
+#: builtin/checkout.c:1284
+msgid "create/reset and checkout a branch"
+msgstr ""
+
+#: builtin/checkout.c:1285
+msgid "create reflog for new branch"
+msgstr ""
+
+#: builtin/checkout.c:1286 builtin/worktree.c:493
+msgid "detach HEAD at named commit"
+msgstr ""
+
+#: builtin/checkout.c:1287
+msgid "set upstream info for new branch"
+msgstr ""
+
+#: builtin/checkout.c:1289
+msgid "new-branch"
+msgstr ""
+
+#: builtin/checkout.c:1289
+msgid "new unparented branch"
+msgstr ""
+
+#: builtin/checkout.c:1291
+msgid "checkout our version for unmerged files"
+msgstr ""
+
+#: builtin/checkout.c:1294
+msgid "checkout their version for unmerged files"
+msgstr ""
+
+#: builtin/checkout.c:1296
+msgid "force checkout (throw away local modifications)"
+msgstr ""
+
+#: builtin/checkout.c:1298
+msgid "perform a 3-way merge with the new branch"
+msgstr ""
+
+#: builtin/checkout.c:1300 builtin/merge.c:276
+msgid "update ignored files (default)"
+msgstr ""
+
+#: builtin/checkout.c:1302 builtin/log.c:1586 parse-options.h:272
+msgid "style"
+msgstr ""
+
+#: builtin/checkout.c:1303
+msgid "conflict style (merge or diff3)"
+msgstr ""
+
+#: builtin/checkout.c:1306
+msgid "do not limit pathspecs to sparse entries only"
+msgstr ""
+
+#: builtin/checkout.c:1308
+msgid "do not second guess 'git checkout <no-such-branch>'"
+msgstr ""
+
+#: builtin/checkout.c:1310
+msgid "do not check if another worktree is holding the given ref"
+msgstr ""
+
+#: builtin/checkout.c:1314 builtin/clone.c:87 builtin/fetch.c:141
+#: builtin/merge.c:273 builtin/pull.c:130 builtin/push.c:575
+#: builtin/send-pack.c:174
+msgid "force progress reporting"
+msgstr ""
+
+#: builtin/checkout.c:1345
+msgid "-b, -B and --orphan are mutually exclusive"
+msgstr ""
+
+#: builtin/checkout.c:1362
msgid "--track needs a branch name"
msgstr ""
-#: builtin/checkout.c:1206
-msgid "missing branch name; try -b"
+#: builtin/checkout.c:1367
+msgid "missing branch name; try -b"
+msgstr ""
+
+#: builtin/checkout.c:1404
+msgid "invalid path specification"
+msgstr ""
+
+#: builtin/checkout.c:1411
+#, c-format
+msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
+msgstr ""
+
+#: builtin/checkout.c:1415
+#, c-format
+msgid "git checkout: --detach does not take a path argument '%s'"
+msgstr ""
+
+#: builtin/checkout.c:1419
+msgid ""
+"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
+"checking out of the index."
+msgstr ""
+
+#: builtin/checkout.c:1439
+#, c-format
+msgid ""
+"'%s' matched more than one remote tracking branch.\n"
+"We found %d remotes with a reference that matched. So we fell back\n"
+"on trying to resolve the argument as a path, but failed there too!\n"
+"\n"
+"If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
+"you can do so by fully qualifying the name with the --track option:\n"
+"\n"
+" git checkout --track origin/<name>\n"
+"\n"
+"If you'd like to always have checkouts of an ambiguous <name> prefer\n"
+"one remote, e.g. the 'origin' remote, consider setting\n"
+"checkout.defaultRemote=origin in your config."
+msgstr ""
+
+#: builtin/clean.c:28
+msgid ""
+"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
+msgstr ""
+
+#: builtin/clean.c:32
+#, c-format
+msgid "Removing %s\n"
+msgstr ""
+
+#: builtin/clean.c:33
+#, c-format
+msgid "Would remove %s\n"
+msgstr ""
+
+#: builtin/clean.c:34
+#, c-format
+msgid "Skipping repository %s\n"
+msgstr ""
+
+#: builtin/clean.c:35
+#, c-format
+msgid "Would skip repository %s\n"
+msgstr ""
+
+#: builtin/clean.c:36
+#, c-format
+msgid "failed to remove %s"
+msgstr ""
+
+#: builtin/clean.c:299 git-add--interactive.perl:579
+#, c-format
+msgid ""
+"Prompt help:\n"
+"1 - select a numbered item\n"
+"foo - select item based on unique prefix\n"
+" - (empty) select nothing\n"
+msgstr ""
+
+#: builtin/clean.c:303 git-add--interactive.perl:588
+#, c-format
+msgid ""
+"Prompt help:\n"
+"1 - select a single item\n"
+"3-5 - select a range of items\n"
+"2-3,6-9 - select multiple ranges\n"
+"foo - select item based on unique prefix\n"
+"-... - unselect specified items\n"
+"* - choose all items\n"
+" - (empty) finish selecting\n"
+msgstr ""
+
+#: builtin/clean.c:519 git-add--interactive.perl:554
+#: git-add--interactive.perl:559
+#, c-format, perl-format
+msgid "Huh (%s)?\n"
+msgstr ""
+
+#: builtin/clean.c:661
+#, c-format
+msgid "Input ignore patterns>> "
+msgstr ""
+
+#: builtin/clean.c:698
+#, c-format
+msgid "WARNING: Cannot find items matched by: %s"
+msgstr ""
+
+#: builtin/clean.c:719
+msgid "Select items to delete"
+msgstr ""
+
+#. TRANSLATORS: Make sure to keep [y/N] as is
+#: builtin/clean.c:760
+#, c-format
+msgid "Remove %s [y/N]? "
+msgstr ""
+
+#: builtin/clean.c:785 git-add--interactive.perl:1717
+#, c-format
+msgid "Bye.\n"
+msgstr ""
+
+#: builtin/clean.c:793
+msgid ""
+"clean - start cleaning\n"
+"filter by pattern - exclude items from deletion\n"
+"select by numbers - select items to be deleted by numbers\n"
+"ask each - confirm each deletion (like \"rm -i\")\n"
+"quit - stop cleaning\n"
+"help - this screen\n"
+"? - help for prompt selection"
+msgstr ""
+
+#: builtin/clean.c:820 git-add--interactive.perl:1793
+msgid "*** Commands ***"
+msgstr ""
+
+#: builtin/clean.c:821 git-add--interactive.perl:1790
+msgid "What now"
+msgstr ""
+
+#: builtin/clean.c:829
+msgid "Would remove the following item:"
+msgid_plural "Would remove the following items:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/clean.c:845
+msgid "No more files to clean, exiting."
+msgstr ""
+
+#: builtin/clean.c:907
+msgid "do not print names of files removed"
+msgstr ""
+
+#: builtin/clean.c:909
+msgid "force"
+msgstr ""
+
+#: builtin/clean.c:910
+msgid "interactive cleaning"
+msgstr ""
+
+#: builtin/clean.c:912
+msgid "remove whole directories"
+msgstr ""
+
+#: builtin/clean.c:913 builtin/describe.c:546 builtin/describe.c:548
+#: builtin/grep.c:897 builtin/log.c:167 builtin/log.c:169
+#: builtin/ls-files.c:557 builtin/name-rev.c:415 builtin/name-rev.c:417
+#: builtin/show-ref.c:178
+msgid "pattern"
+msgstr ""
+
+#: builtin/clean.c:914
+msgid "add <pattern> to ignore rules"
+msgstr ""
+
+#: builtin/clean.c:915
+msgid "remove ignored files, too"
+msgstr ""
+
+#: builtin/clean.c:917
+msgid "remove only ignored files"
+msgstr ""
+
+#: builtin/clean.c:935
+msgid "-x and -X cannot be used together"
+msgstr ""
+
+#: builtin/clean.c:939
+msgid ""
+"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
+"clean"
+msgstr ""
+
+#: builtin/clean.c:942
+msgid ""
+"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
+"refusing to clean"
+msgstr ""
+
+#: builtin/clone.c:44
+msgid "git clone [<options>] [--] <repo> [<dir>]"
+msgstr ""
+
+#: builtin/clone.c:89
+msgid "don't create a checkout"
+msgstr ""
+
+#: builtin/clone.c:90 builtin/clone.c:92 builtin/init-db.c:481
+msgid "create a bare repository"
+msgstr ""
+
+#: builtin/clone.c:94
+msgid "create a mirror repository (implies bare)"
+msgstr ""
+
+#: builtin/clone.c:96
+msgid "to clone from a local repository"
+msgstr ""
+
+#: builtin/clone.c:98
+msgid "don't use local hardlinks, always copy"
+msgstr ""
+
+#: builtin/clone.c:100
+msgid "setup as shared repository"
+msgstr ""
+
+#: builtin/clone.c:102 builtin/clone.c:106
+msgid "pathspec"
+msgstr ""
+
+#: builtin/clone.c:102 builtin/clone.c:106
+msgid "initialize submodules in the clone"
+msgstr ""
+
+#: builtin/clone.c:109
+msgid "number of submodules cloned in parallel"
+msgstr ""
+
+#: builtin/clone.c:110 builtin/init-db.c:478
+msgid "template-directory"
+msgstr ""
+
+#: builtin/clone.c:111 builtin/init-db.c:479
+msgid "directory from which templates will be used"
+msgstr ""
+
+#: builtin/clone.c:113 builtin/clone.c:115 builtin/submodule--helper.c:1379
+#: builtin/submodule--helper.c:1860
+msgid "reference repository"
+msgstr ""
+
+#: builtin/clone.c:117 builtin/submodule--helper.c:1381
+#: builtin/submodule--helper.c:1862
+msgid "use --reference only while cloning"
+msgstr ""
+
+#: builtin/clone.c:118 builtin/column.c:27 builtin/merge-file.c:46
+#: builtin/pack-objects.c:3303 builtin/repack.c:329
+msgid "name"
+msgstr ""
+
+#: builtin/clone.c:119
+msgid "use <name> instead of 'origin' to track upstream"
+msgstr ""
+
+#: builtin/clone.c:121
+msgid "checkout <branch> instead of the remote's HEAD"
+msgstr ""
+
+#: builtin/clone.c:123
+msgid "path to git-upload-pack on the remote"
+msgstr ""
+
+#: builtin/clone.c:124 builtin/fetch.c:142 builtin/grep.c:836
+#: builtin/pull.c:218
+msgid "depth"
+msgstr ""
+
+#: builtin/clone.c:125
+msgid "create a shallow clone of that depth"
+msgstr ""
+
+#: builtin/clone.c:126 builtin/fetch.c:144 builtin/pack-objects.c:3292
+msgid "time"
+msgstr ""
+
+#: builtin/clone.c:127
+msgid "create a shallow clone since a specific time"
+msgstr ""
+
+#: builtin/clone.c:128 builtin/fetch.c:146 builtin/fetch.c:169
+#: builtin/rebase.c:1039
+msgid "revision"
+msgstr ""
+
+#: builtin/clone.c:129 builtin/fetch.c:147
+msgid "deepen history of shallow clone, excluding rev"
+msgstr ""
+
+#: builtin/clone.c:131
+msgid "clone only one branch, HEAD or --branch"
+msgstr ""
+
+#: builtin/clone.c:133
+msgid "don't clone any tags, and make later fetches not to follow them"
+msgstr ""
+
+#: builtin/clone.c:135
+msgid "any cloned submodules will be shallow"
+msgstr ""
+
+#: builtin/clone.c:136 builtin/init-db.c:487
+msgid "gitdir"
+msgstr ""
+
+#: builtin/clone.c:137 builtin/init-db.c:488
+msgid "separate git dir from working tree"
+msgstr ""
+
+#: builtin/clone.c:138
+msgid "key=value"
+msgstr ""
+
+#: builtin/clone.c:139
+msgid "set config inside the new repository"
+msgstr ""
+
+#: builtin/clone.c:140 builtin/fetch.c:165 builtin/pull.c:231
+#: builtin/push.c:586
+msgid "use IPv4 addresses only"
+msgstr ""
+
+#: builtin/clone.c:142 builtin/fetch.c:167 builtin/pull.c:234
+#: builtin/push.c:588
+msgid "use IPv6 addresses only"
+msgstr ""
+
+#: builtin/clone.c:280
+msgid ""
+"No directory name could be guessed.\n"
+"Please specify a directory on the command line"
+msgstr ""
+
+#: builtin/clone.c:333
+#, c-format
+msgid "info: Could not add alternate for '%s': %s\n"
+msgstr ""
+
+#: builtin/clone.c:405
+#, c-format
+msgid "failed to open '%s'"
+msgstr ""
+
+#: builtin/clone.c:413
+#, c-format
+msgid "%s exists and is not a directory"
+msgstr ""
+
+#: builtin/clone.c:427
+#, c-format
+msgid "failed to stat %s\n"
+msgstr ""
+
+#: builtin/clone.c:444
+#, c-format
+msgid "failed to unlink '%s'"
+msgstr ""
+
+#: builtin/clone.c:449
+#, c-format
+msgid "failed to create link '%s'"
+msgstr ""
+
+#: builtin/clone.c:453
+#, c-format
+msgid "failed to copy file to '%s'"
+msgstr ""
+
+#: builtin/clone.c:479
+#, c-format
+msgid "done.\n"
+msgstr ""
+
+#: builtin/clone.c:493
+msgid ""
+"Clone succeeded, but checkout failed.\n"
+"You can inspect what was checked out with 'git status'\n"
+"and retry the checkout with 'git checkout -f HEAD'\n"
+msgstr ""
+
+#: builtin/clone.c:570
+#, c-format
+msgid "Could not find remote branch %s to clone."
+msgstr ""
+
+#: builtin/clone.c:687
+#, c-format
+msgid "unable to update %s"
+msgstr ""
+
+#: builtin/clone.c:737
+msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
+msgstr ""
+
+#: builtin/clone.c:768
+msgid "unable to checkout working tree"
+msgstr ""
+
+#: builtin/clone.c:813
+msgid "unable to write parameters to config file"
+msgstr ""
+
+#: builtin/clone.c:876
+msgid "cannot repack to clean up"
+msgstr ""
+
+#: builtin/clone.c:878
+msgid "cannot unlink temporary alternates file"
+msgstr ""
+
+#: builtin/clone.c:918 builtin/receive-pack.c:1941
+msgid "Too many arguments."
+msgstr ""
+
+#: builtin/clone.c:922
+msgid "You must specify a repository to clone."
+msgstr ""
+
+#: builtin/clone.c:935
+#, c-format
+msgid "--bare and --origin %s options are incompatible."
+msgstr ""
+
+#: builtin/clone.c:938
+msgid "--bare and --separate-git-dir are incompatible."
+msgstr ""
+
+#: builtin/clone.c:951
+#, c-format
+msgid "repository '%s' does not exist"
+msgstr ""
+
+#: builtin/clone.c:957 builtin/fetch.c:1608
+#, c-format
+msgid "depth %s is not a positive number"
+msgstr ""
+
+#: builtin/clone.c:967
+#, c-format
+msgid "destination path '%s' already exists and is not an empty directory."
+msgstr ""
+
+#: builtin/clone.c:977
+#, c-format
+msgid "working tree '%s' already exists."
+msgstr ""
+
+#: builtin/clone.c:992 builtin/clone.c:1013 builtin/difftool.c:272
+#: builtin/worktree.c:296 builtin/worktree.c:326
+#, c-format
+msgid "could not create leading directories of '%s'"
+msgstr ""
+
+#: builtin/clone.c:997
+#, c-format
+msgid "could not create work tree dir '%s'"
+msgstr ""
+
+#: builtin/clone.c:1017
+#, c-format
+msgid "Cloning into bare repository '%s'...\n"
+msgstr ""
+
+#: builtin/clone.c:1019
+#, c-format
+msgid "Cloning into '%s'...\n"
+msgstr ""
+
+#: builtin/clone.c:1043
+msgid ""
+"clone --recursive is not compatible with both --reference and --reference-if-"
+"able"
+msgstr ""
+
+#: builtin/clone.c:1104
+msgid "--depth is ignored in local clones; use file:// instead."
+msgstr ""
+
+#: builtin/clone.c:1106
+msgid "--shallow-since is ignored in local clones; use file:// instead."
+msgstr ""
+
+#: builtin/clone.c:1108
+msgid "--shallow-exclude is ignored in local clones; use file:// instead."
+msgstr ""
+
+#: builtin/clone.c:1110
+msgid "--filter is ignored in local clones; use file:// instead."
+msgstr ""
+
+#: builtin/clone.c:1113
+msgid "source repository is shallow, ignoring --local"
msgstr ""
-#: builtin/checkout.c:1243
-msgid "invalid path specification"
+#: builtin/clone.c:1118
+msgid "--local is ignored"
msgstr ""
-#: builtin/checkout.c:1250
+#: builtin/clone.c:1192 builtin/clone.c:1200
#, c-format
-msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
+msgid "Remote branch %s not found in upstream %s"
+msgstr ""
+
+#: builtin/clone.c:1203
+msgid "You appear to have cloned an empty repository."
+msgstr ""
+
+#: builtin/column.c:10
+msgid "git column [<options>]"
+msgstr ""
+
+#: builtin/column.c:27
+msgid "lookup config vars"
+msgstr ""
+
+#: builtin/column.c:28 builtin/column.c:29
+msgid "layout to use"
+msgstr ""
+
+#: builtin/column.c:30
+msgid "Maximum width"
+msgstr ""
+
+#: builtin/column.c:31
+msgid "Padding space on left border"
+msgstr ""
+
+#: builtin/column.c:32
+msgid "Padding space on right border"
+msgstr ""
+
+#: builtin/column.c:33
+msgid "Padding space between columns"
+msgstr ""
+
+#: builtin/column.c:51
+msgid "--command must be the first argument"
+msgstr ""
+
+#: builtin/commit.c:41
+msgid "git commit [<options>] [--] <pathspec>..."
+msgstr ""
+
+#: builtin/commit.c:46
+msgid "git status [<options>] [--] <pathspec>..."
+msgstr ""
+
+#: builtin/commit.c:51
+msgid ""
+"You asked to amend the most recent commit, but doing so would make\n"
+"it empty. You can repeat your command with --allow-empty, or you can\n"
+"remove the commit entirely with \"git reset HEAD^\".\n"
+msgstr ""
+
+#: builtin/commit.c:56
+msgid ""
+"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
+"If you wish to commit it anyway, use:\n"
+"\n"
+" git commit --allow-empty\n"
+"\n"
+msgstr ""
+
+#: builtin/commit.c:63
+msgid "Otherwise, please use 'git reset'\n"
+msgstr ""
+
+#: builtin/commit.c:66
+msgid ""
+"If you wish to skip this commit, use:\n"
+"\n"
+" git reset\n"
+"\n"
+"Then \"git cherry-pick --continue\" will resume cherry-picking\n"
+"the remaining commits.\n"
+msgstr ""
+
+#: builtin/commit.c:312
+msgid "failed to unpack HEAD tree object"
+msgstr ""
+
+#: builtin/commit.c:353
+msgid "unable to create temporary index"
+msgstr ""
+
+#: builtin/commit.c:359
+msgid "interactive add failed"
+msgstr ""
+
+#: builtin/commit.c:373
+msgid "unable to update temporary index"
+msgstr ""
+
+#: builtin/commit.c:375
+msgid "Failed to update main cache tree"
+msgstr ""
+
+#: builtin/commit.c:400 builtin/commit.c:423 builtin/commit.c:469
+msgid "unable to write new_index file"
+msgstr ""
+
+#: builtin/commit.c:452
+msgid "cannot do a partial commit during a merge."
+msgstr ""
+
+#: builtin/commit.c:454
+msgid "cannot do a partial commit during a cherry-pick."
+msgstr ""
+
+#: builtin/commit.c:462
+msgid "cannot read the index"
+msgstr ""
+
+#: builtin/commit.c:481
+msgid "unable to write temporary index file"
msgstr ""
-#: builtin/checkout.c:1254
+#: builtin/commit.c:579
#, c-format
-msgid "git checkout: --detach does not take a path argument '%s'"
+msgid "commit '%s' lacks author header"
+msgstr ""
+
+#: builtin/commit.c:581
+#, c-format
+msgid "commit '%s' has malformed author line"
+msgstr ""
+
+#: builtin/commit.c:600
+msgid "malformed --author parameter"
msgstr ""
-#: builtin/checkout.c:1258
+#: builtin/commit.c:652
msgid ""
-"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
-"checking out of the index."
+"unable to select a comment character that is not used\n"
+"in the current commit message"
+msgstr ""
+
+#: builtin/commit.c:689 builtin/commit.c:722 builtin/commit.c:1052
+#, c-format
+msgid "could not lookup commit %s"
+msgstr ""
+
+#: builtin/commit.c:701 builtin/shortlog.c:319
+#, c-format
+msgid "(reading log message from standard input)\n"
+msgstr ""
+
+#: builtin/commit.c:703
+msgid "could not read log from standard input"
+msgstr ""
+
+#: builtin/commit.c:707
+#, c-format
+msgid "could not read log file '%s'"
+msgstr ""
+
+#: builtin/commit.c:736 builtin/commit.c:744
+msgid "could not read SQUASH_MSG"
+msgstr ""
+
+#: builtin/commit.c:741
+msgid "could not read MERGE_MSG"
+msgstr ""
+
+#: builtin/commit.c:795
+msgid "could not write commit template"
msgstr ""
-#: builtin/checkout.c:1278
+#: builtin/commit.c:813
#, 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"
+"It looks like you may be committing a merge.\n"
+"If this is not correct, please remove the file\n"
+"\t%s\n"
+"and try again.\n"
+msgstr ""
+
+#: builtin/commit.c:818
+#, c-format
+msgid ""
"\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."
+"It looks like you may be committing a cherry-pick.\n"
+"If this is not correct, please remove the file\n"
+"\t%s\n"
+"and try again.\n"
msgstr ""
-#: builtin/clean.c:27
+#: builtin/commit.c:831
+#, c-format
msgid ""
-"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
+"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/clean.c:31
+#: builtin/commit.c:839
#, c-format
-msgid "Removing %s\n"
+msgid ""
+"Please enter the commit message for your changes. Lines starting\n"
+"with '%c' will be kept; you may remove them yourself if you want to.\n"
+"An empty message aborts the commit.\n"
msgstr ""
-#: builtin/clean.c:32
+#: builtin/commit.c:856
#, c-format
-msgid "Would remove %s\n"
+msgid "%sAuthor: %.*s <%.*s>"
+msgstr ""
+
+#: builtin/commit.c:864
+#, c-format
+msgid "%sDate: %s"
+msgstr ""
+
+#: builtin/commit.c:871
+#, c-format
+msgid "%sCommitter: %.*s <%.*s>"
+msgstr ""
+
+#: builtin/commit.c:889
+msgid "Cannot read index"
+msgstr ""
+
+#: builtin/commit.c:956
+msgid "Error building trees"
+msgstr ""
+
+#: builtin/commit.c:970 builtin/tag.c:258
+#, c-format
+msgid "Please supply the message using either -m or -F option.\n"
+msgstr ""
+
+#: builtin/commit.c:1014
+#, c-format
+msgid "--author '%s' is not 'Name <email>' and matches no existing author"
+msgstr ""
+
+#: builtin/commit.c:1028
+#, c-format
+msgid "Invalid ignored mode '%s'"
+msgstr ""
+
+#: builtin/commit.c:1042 builtin/commit.c:1279
+#, c-format
+msgid "Invalid untracked files mode '%s'"
+msgstr ""
+
+#: builtin/commit.c:1080
+msgid "--long and -z are incompatible"
+msgstr ""
+
+#: builtin/commit.c:1113
+msgid "Using both --reset-author and --author does not make sense"
+msgstr ""
+
+#: builtin/commit.c:1122
+msgid "You have nothing to amend."
+msgstr ""
+
+#: builtin/commit.c:1125
+msgid "You are in the middle of a merge -- cannot amend."
+msgstr ""
+
+#: builtin/commit.c:1127
+msgid "You are in the middle of a cherry-pick -- cannot amend."
+msgstr ""
+
+#: builtin/commit.c:1130
+msgid "Options --squash and --fixup cannot be used together"
+msgstr ""
+
+#: builtin/commit.c:1140
+msgid "Only one of -c/-C/-F/--fixup can be used."
+msgstr ""
+
+#: builtin/commit.c:1142
+msgid "Option -m cannot be combined with -c/-C/-F."
+msgstr ""
+
+#: builtin/commit.c:1150
+msgid "--reset-author can be used only with -C, -c or --amend."
+msgstr ""
+
+#: builtin/commit.c:1167
+msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
+msgstr ""
+
+#: builtin/commit.c:1169
+msgid "No paths with --include/--only does not make sense."
+msgstr ""
+
+#: builtin/commit.c:1183 builtin/tag.c:546
+#, c-format
+msgid "Invalid cleanup mode %s"
+msgstr ""
+
+#: builtin/commit.c:1188
+msgid "Paths with -a does not make sense."
+msgstr ""
+
+#: builtin/commit.c:1314 builtin/commit.c:1498
+msgid "show status concisely"
msgstr ""
-#: builtin/clean.c:33
-#, c-format
-msgid "Skipping repository %s\n"
+#: builtin/commit.c:1316 builtin/commit.c:1500
+msgid "show branch information"
msgstr ""
-#: builtin/clean.c:34
-#, c-format
-msgid "Would skip repository %s\n"
+#: builtin/commit.c:1318
+msgid "show stash information"
msgstr ""
-#: builtin/clean.c:35
-#, c-format
-msgid "failed to remove %s"
+#: builtin/commit.c:1320 builtin/commit.c:1502
+msgid "compute full ahead/behind values"
msgstr ""
-#: builtin/clean.c:297 git-add--interactive.perl:579
-#, c-format
-msgid ""
-"Prompt help:\n"
-"1 - select a numbered item\n"
-"foo - select item based on unique prefix\n"
-" - (empty) select nothing\n"
+#: builtin/commit.c:1322
+msgid "version"
msgstr ""
-#: builtin/clean.c:301 git-add--interactive.perl:588
-#, c-format
-msgid ""
-"Prompt help:\n"
-"1 - select a single item\n"
-"3-5 - select a range of items\n"
-"2-3,6-9 - select multiple ranges\n"
-"foo - select item based on unique prefix\n"
-"-... - unselect specified items\n"
-"* - choose all items\n"
-" - (empty) finish selecting\n"
+#: builtin/commit.c:1322 builtin/commit.c:1504 builtin/push.c:561
+#: builtin/worktree.c:640
+msgid "machine-readable output"
msgstr ""
-#: builtin/clean.c:517 git-add--interactive.perl:554
-#: git-add--interactive.perl:559
-#, c-format, perl-format
-msgid "Huh (%s)?\n"
+#: builtin/commit.c:1325 builtin/commit.c:1506
+msgid "show status in long format (default)"
msgstr ""
-#: builtin/clean.c:659
-#, c-format
-msgid "Input ignore patterns>> "
+#: builtin/commit.c:1328 builtin/commit.c:1509
+msgid "terminate entries with NUL"
msgstr ""
-#: builtin/clean.c:696
-#, c-format
-msgid "WARNING: Cannot find items matched by: %s"
+#: builtin/commit.c:1330 builtin/commit.c:1334 builtin/commit.c:1512
+#: builtin/fast-export.c:1085 builtin/fast-export.c:1088 builtin/rebase.c:1118
+#: builtin/tag.c:400
+msgid "mode"
msgstr ""
-#: builtin/clean.c:717
-msgid "Select items to delete"
+#: builtin/commit.c:1331 builtin/commit.c:1512
+msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr ""
-#. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:758
-#, c-format
-msgid "Remove %s [y/N]? "
+#: builtin/commit.c:1335
+msgid ""
+"show ignored files, optional modes: traditional, matching, no. (Default: "
+"traditional)"
msgstr ""
-#: builtin/clean.c:783 git-add--interactive.perl:1717
-#, c-format
-msgid "Bye.\n"
+#: builtin/commit.c:1337 parse-options.h:164
+msgid "when"
msgstr ""
-#: builtin/clean.c:791
+#: builtin/commit.c:1338
msgid ""
-"clean - start cleaning\n"
-"filter by pattern - exclude items from deletion\n"
-"select by numbers - select items to be deleted by numbers\n"
-"ask each - confirm each deletion (like \"rm -i\")\n"
-"quit - stop cleaning\n"
-"help - this screen\n"
-"? - help for prompt selection"
+"ignore changes to submodules, optional when: all, dirty, untracked. "
+"(Default: all)"
msgstr ""
-#: builtin/clean.c:818 git-add--interactive.perl:1793
-msgid "*** Commands ***"
+#: builtin/commit.c:1340
+msgid "list untracked files in columns"
msgstr ""
-#: builtin/clean.c:819 git-add--interactive.perl:1790
-msgid "What now"
+#: builtin/commit.c:1341
+msgid "do not detect renames"
msgstr ""
-#: builtin/clean.c:827
-msgid "Would remove the following item:"
-msgid_plural "Would remove the following items:"
-msgstr[0] ""
-msgstr[1] ""
+#: builtin/commit.c:1343
+msgid "detect renames, optionally set similarity index"
+msgstr ""
-#: builtin/clean.c:843
-msgid "No more files to clean, exiting."
+#: builtin/commit.c:1363
+msgid "Unsupported combination of ignored and untracked-files arguments"
msgstr ""
-#: builtin/clean.c:905
-msgid "do not print names of files removed"
+#: builtin/commit.c:1468
+msgid "suppress summary after successful commit"
msgstr ""
-#: builtin/clean.c:907
-msgid "force"
+#: builtin/commit.c:1469
+msgid "show diff in commit message template"
msgstr ""
-#: builtin/clean.c:908
-msgid "interactive cleaning"
+#: builtin/commit.c:1471
+msgid "Commit message options"
msgstr ""
-#: builtin/clean.c:910
-msgid "remove whole directories"
+#: builtin/commit.c:1472 builtin/merge.c:264 builtin/tag.c:397
+msgid "read message from file"
msgstr ""
-#: 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"
+#: builtin/commit.c:1473
+msgid "author"
msgstr ""
-#: builtin/clean.c:912
-msgid "add <pattern> to ignore rules"
+#: builtin/commit.c:1473
+msgid "override author for commit"
msgstr ""
-#: builtin/clean.c:913
-msgid "remove ignored files, too"
+#: builtin/commit.c:1474 builtin/gc.c:518
+msgid "date"
msgstr ""
-#: builtin/clean.c:915
-msgid "remove only ignored files"
+#: builtin/commit.c:1474
+msgid "override date for commit"
msgstr ""
-#: builtin/clean.c:933
-msgid "-x and -X cannot be used together"
+#: builtin/commit.c:1475 builtin/merge.c:260 builtin/notes.c:409
+#: builtin/notes.c:575 builtin/tag.c:395
+msgid "message"
msgstr ""
-#: builtin/clean.c:937
-msgid ""
-"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
-"clean"
+#: builtin/commit.c:1475
+msgid "commit message"
msgstr ""
-#: builtin/clean.c:940
-msgid ""
-"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
-"refusing to clean"
+#: builtin/commit.c:1476 builtin/commit.c:1477 builtin/commit.c:1478
+#: builtin/commit.c:1479 parse-options.h:278 ref-filter.h:92
+msgid "commit"
msgstr ""
-#: builtin/clone.c:43
-msgid "git clone [<options>] [--] <repo> [<dir>]"
+#: builtin/commit.c:1476
+msgid "reuse and edit message from specified commit"
msgstr ""
-#: builtin/clone.c:88
-msgid "don't create a checkout"
+#: builtin/commit.c:1477
+msgid "reuse message from specified commit"
msgstr ""
-#: builtin/clone.c:89 builtin/clone.c:91 builtin/init-db.c:480
-msgid "create a bare repository"
+#: builtin/commit.c:1478
+msgid "use autosquash formatted message to fixup specified commit"
msgstr ""
-#: builtin/clone.c:93
-msgid "create a mirror repository (implies bare)"
+#: builtin/commit.c:1479
+msgid "use autosquash formatted message to squash specified commit"
msgstr ""
-#: builtin/clone.c:95
-msgid "to clone from a local repository"
+#: builtin/commit.c:1480
+msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr ""
-#: builtin/clone.c:97
-msgid "don't use local hardlinks, always copy"
+#: builtin/commit.c:1481 builtin/log.c:1533 builtin/merge.c:277
+#: builtin/pull.c:156 builtin/revert.c:107
+msgid "add Signed-off-by:"
msgstr ""
-#: builtin/clone.c:99
-msgid "setup as shared repository"
+#: builtin/commit.c:1482
+msgid "use specified template file"
msgstr ""
-#: builtin/clone.c:101 builtin/clone.c:105
-msgid "pathspec"
+#: builtin/commit.c:1483
+msgid "force edit of commit"
msgstr ""
-#: builtin/clone.c:101 builtin/clone.c:105
-msgid "initialize submodules in the clone"
+#: builtin/commit.c:1484
+msgid "default"
msgstr ""
-#: builtin/clone.c:108
-msgid "number of submodules cloned in parallel"
+#: builtin/commit.c:1484 builtin/tag.c:401
+msgid "how to strip spaces and #comments from message"
msgstr ""
-#: builtin/clone.c:109 builtin/init-db.c:477
-msgid "template-directory"
+#: builtin/commit.c:1485
+msgid "include status in commit message template"
msgstr ""
-#: builtin/clone.c:110 builtin/init-db.c:478
-msgid "directory from which templates will be used"
+#: builtin/commit.c:1487 builtin/merge.c:275 builtin/pull.c:186
+#: builtin/revert.c:115
+msgid "GPG sign commit"
msgstr ""
-#: builtin/clone.c:112 builtin/clone.c:114 builtin/submodule--helper.c:1368
-#: builtin/submodule--helper.c:1739
-msgid "reference repository"
+#: builtin/commit.c:1490
+msgid "Commit contents options"
msgstr ""
-#: builtin/clone.c:116 builtin/submodule--helper.c:1370
-#: builtin/submodule--helper.c:1741
-msgid "use --reference only while cloning"
+#: builtin/commit.c:1491
+msgid "commit all changed files"
msgstr ""
-#: builtin/clone.c:117 builtin/column.c:27 builtin/merge-file.c:44
-#: builtin/pack-objects.c:3191 builtin/repack.c:320
-msgid "name"
+#: builtin/commit.c:1492
+msgid "add specified files to index for commit"
msgstr ""
-#: builtin/clone.c:118
-msgid "use <name> instead of 'origin' to track upstream"
+#: builtin/commit.c:1493
+msgid "interactively add files"
msgstr ""
-#: builtin/clone.c:120
-msgid "checkout <branch> instead of the remote's HEAD"
+#: builtin/commit.c:1494
+msgid "interactively add changes"
msgstr ""
-#: builtin/clone.c:122
-msgid "path to git-upload-pack on the remote"
+#: builtin/commit.c:1495
+msgid "commit only specified files"
msgstr ""
-#: builtin/clone.c:123 builtin/fetch.c:139 builtin/grep.c:814
-#: builtin/pull.c:216
-msgid "depth"
+#: builtin/commit.c:1496
+msgid "bypass pre-commit and commit-msg hooks"
msgstr ""
-#: builtin/clone.c:124
-msgid "create a shallow clone of that depth"
+#: builtin/commit.c:1497
+msgid "show what would be committed"
msgstr ""
-#: builtin/clone.c:125 builtin/fetch.c:141 builtin/pack-objects.c:3182
-#: parse-options.h:154
-msgid "time"
+#: builtin/commit.c:1510
+msgid "amend previous commit"
msgstr ""
-#: builtin/clone.c:126
-msgid "create a shallow clone since a specific time"
+#: builtin/commit.c:1511
+msgid "bypass post-rewrite hook"
msgstr ""
-#: builtin/clone.c:127 builtin/fetch.c:143 builtin/fetch.c:166
-msgid "revision"
+#: builtin/commit.c:1516
+msgid "ok to record an empty change"
msgstr ""
-#: builtin/clone.c:128 builtin/fetch.c:144
-msgid "deepen history of shallow clone, excluding rev"
+#: builtin/commit.c:1518
+msgid "ok to record a change with an empty message"
msgstr ""
-#: builtin/clone.c:130
-msgid "clone only one branch, HEAD or --branch"
+#: builtin/commit.c:1591
+#, c-format
+msgid "Corrupt MERGE_HEAD file (%s)"
msgstr ""
-#: builtin/clone.c:132
-msgid "don't clone any tags, and make later fetches not to follow them"
+#: builtin/commit.c:1598
+msgid "could not read MERGE_MODE"
msgstr ""
-#: builtin/clone.c:134
-msgid "any cloned submodules will be shallow"
+#: builtin/commit.c:1617
+#, c-format
+msgid "could not read commit message: %s"
msgstr ""
-#: builtin/clone.c:135 builtin/init-db.c:486
-msgid "gitdir"
+#: builtin/commit.c:1628
+#, c-format
+msgid "Aborting commit due to empty commit message.\n"
msgstr ""
-#: builtin/clone.c:136 builtin/init-db.c:487
-msgid "separate git dir from working tree"
+#: builtin/commit.c:1633
+#, c-format
+msgid "Aborting commit; you did not edit the message.\n"
msgstr ""
-#: builtin/clone.c:137
-msgid "key=value"
+#: builtin/commit.c:1668
+msgid ""
+"repository has been updated, but unable to write\n"
+"new_index file. Check that disk is not full and quota is\n"
+"not exceeded, and then \"git reset HEAD\" to recover."
msgstr ""
-#: builtin/clone.c:138
-msgid "set config inside the new repository"
+#: builtin/commit-graph.c:10
+msgid "git commit-graph [--object-dir <objdir>]"
msgstr ""
-#: builtin/clone.c:139 builtin/fetch.c:162 builtin/pull.c:229
-#: builtin/push.c:583
-msgid "use IPv4 addresses only"
+#: builtin/commit-graph.c:11 builtin/commit-graph.c:23
+msgid "git commit-graph read [--object-dir <objdir>]"
msgstr ""
-#: builtin/clone.c:141 builtin/fetch.c:164 builtin/pull.c:232
-#: builtin/push.c:585
-msgid "use IPv6 addresses only"
+#: builtin/commit-graph.c:12 builtin/commit-graph.c:18
+msgid "git commit-graph verify [--object-dir <objdir>]"
msgstr ""
-#: builtin/clone.c:279
+#: builtin/commit-graph.c:13 builtin/commit-graph.c:28
msgid ""
-"No directory name could be guessed.\n"
-"Please specify a directory on the command line"
+"git commit-graph write [--object-dir <objdir>] [--append] [--reachable|--"
+"stdin-packs|--stdin-commits]"
msgstr ""
-#: builtin/clone.c:332
-#, c-format
-msgid "info: Could not add alternate for '%s': %s\n"
+#: builtin/commit-graph.c:48 builtin/commit-graph.c:78
+#: builtin/commit-graph.c:132 builtin/commit-graph.c:190 builtin/fetch.c:153
+#: builtin/log.c:1553
+msgid "dir"
msgstr ""
-#: builtin/clone.c:404
-#, c-format
-msgid "failed to open '%s'"
+#: builtin/commit-graph.c:49 builtin/commit-graph.c:79
+#: builtin/commit-graph.c:133 builtin/commit-graph.c:191
+msgid "The object directory to store the graph"
msgstr ""
-#: builtin/clone.c:412
-#, c-format
-msgid "%s exists and is not a directory"
+#: builtin/commit-graph.c:135
+msgid "start walk at all refs"
msgstr ""
-#: builtin/clone.c:426
-#, c-format
-msgid "failed to stat %s\n"
+#: builtin/commit-graph.c:137
+msgid "scan pack-indexes listed by stdin for commits"
msgstr ""
-#: builtin/clone.c:448
-#, c-format
-msgid "failed to create link '%s'"
+#: builtin/commit-graph.c:139
+msgid "start walk at commits listed by stdin"
msgstr ""
-#: builtin/clone.c:452
-#, c-format
-msgid "failed to copy file to '%s'"
+#: builtin/commit-graph.c:141
+msgid "include all commits already in the commit-graph file"
msgstr ""
-#: builtin/clone.c:478
-#, c-format
-msgid "done.\n"
+#: builtin/commit-graph.c:150
+msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
msgstr ""
-#: 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"
+#: builtin/config.c:11
+msgid "git config [<options>]"
msgstr ""
-#: builtin/clone.c:569
+#: builtin/config.c:103
#, c-format
-msgid "Could not find remote branch %s to clone."
+msgid "unrecognized --type argument, %s"
msgstr ""
-#: builtin/clone.c:680
-#, c-format
-msgid "unable to update %s"
+#: builtin/config.c:115
+msgid "only one type at a time"
msgstr ""
-#: builtin/clone.c:730
-msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
+#: builtin/config.c:124
+msgid "Config file location"
msgstr ""
-#: builtin/clone.c:760
-msgid "unable to checkout working tree"
+#: builtin/config.c:125
+msgid "use global config file"
msgstr ""
-#: builtin/clone.c:805
-msgid "unable to write parameters to config file"
+#: builtin/config.c:126
+msgid "use system config file"
msgstr ""
-#: builtin/clone.c:868
-msgid "cannot repack to clean up"
+#: builtin/config.c:127
+msgid "use repository config file"
msgstr ""
-#: builtin/clone.c:870
-msgid "cannot unlink temporary alternates file"
+#: builtin/config.c:128
+msgid "use per-worktree config file"
msgstr ""
-#: builtin/clone.c:910 builtin/receive-pack.c:1935
-msgid "Too many arguments."
+#: builtin/config.c:129
+msgid "use given config file"
msgstr ""
-#: builtin/clone.c:914
-msgid "You must specify a repository to clone."
+#: builtin/config.c:130
+msgid "blob-id"
msgstr ""
-#: builtin/clone.c:927
-#, c-format
-msgid "--bare and --origin %s options are incompatible."
+#: builtin/config.c:130
+msgid "read config from given blob object"
msgstr ""
-#: builtin/clone.c:930
-msgid "--bare and --separate-git-dir are incompatible."
+#: builtin/config.c:131
+msgid "Action"
msgstr ""
-#: builtin/clone.c:943
-#, c-format
-msgid "repository '%s' does not exist"
+#: builtin/config.c:132
+msgid "get value: name [value-regex]"
msgstr ""
-#: builtin/clone.c:949 builtin/fetch.c:1512
-#, c-format
-msgid "depth %s is not a positive number"
+#: builtin/config.c:133
+msgid "get all values: key [value-regex]"
msgstr ""
-#: builtin/clone.c:959
-#, c-format
-msgid "destination path '%s' already exists and is not an empty directory."
+#: builtin/config.c:134
+msgid "get values for regexp: name-regex [value-regex]"
msgstr ""
-#: builtin/clone.c:969
-#, c-format
-msgid "working tree '%s' already exists."
+#: builtin/config.c:135
+msgid "get value specific for the URL: section[.var] URL"
msgstr ""
-#: builtin/clone.c:984 builtin/clone.c:1005 builtin/difftool.c:271
-#: builtin/worktree.c:247 builtin/worktree.c:277
-#, c-format
-msgid "could not create leading directories of '%s'"
+#: builtin/config.c:136
+msgid "replace all matching variables: name value [value_regex]"
msgstr ""
-#: builtin/clone.c:989
-#, c-format
-msgid "could not create work tree dir '%s'"
+#: builtin/config.c:137
+msgid "add a new variable: name value"
msgstr ""
-#: builtin/clone.c:1009
-#, c-format
-msgid "Cloning into bare repository '%s'...\n"
+#: builtin/config.c:138
+msgid "remove a variable: name [value-regex]"
msgstr ""
-#: builtin/clone.c:1011
-#, c-format
-msgid "Cloning into '%s'...\n"
+#: builtin/config.c:139
+msgid "remove all matches: name [value-regex]"
msgstr ""
-#: builtin/clone.c:1035
-msgid ""
-"clone --recursive is not compatible with both --reference and --reference-if-"
-"able"
+#: builtin/config.c:140
+msgid "rename section: old-name new-name"
msgstr ""
-#: builtin/clone.c:1096
-msgid "--depth is ignored in local clones; use file:// instead."
+#: builtin/config.c:141
+msgid "remove a section: name"
msgstr ""
-#: builtin/clone.c:1098
-msgid "--shallow-since is ignored in local clones; use file:// instead."
+#: builtin/config.c:142
+msgid "list all"
msgstr ""
-#: builtin/clone.c:1100
-msgid "--shallow-exclude is ignored in local clones; use file:// instead."
+#: builtin/config.c:143
+msgid "open an editor"
msgstr ""
-#: builtin/clone.c:1102
-msgid "--filter is ignored in local clones; use file:// instead."
+#: builtin/config.c:144
+msgid "find the color configured: slot [default]"
msgstr ""
-#: builtin/clone.c:1105
-msgid "source repository is shallow, ignoring --local"
+#: builtin/config.c:145
+msgid "find the color setting: slot [stdout-is-tty]"
msgstr ""
-#: builtin/clone.c:1110
-msgid "--local is ignored"
+#: builtin/config.c:146
+msgid "Type"
msgstr ""
-#: builtin/clone.c:1180 builtin/clone.c:1188
-#, c-format
-msgid "Remote branch %s not found in upstream %s"
+#: builtin/config.c:147
+msgid "value is given this type"
msgstr ""
-#: builtin/clone.c:1191
-msgid "You appear to have cloned an empty repository."
+#: builtin/config.c:148
+msgid "value is \"true\" or \"false\""
msgstr ""
-#: builtin/column.c:10
-msgid "git column [<options>]"
+#: builtin/config.c:149
+msgid "value is decimal number"
msgstr ""
-#: builtin/column.c:27
-msgid "lookup config vars"
+#: builtin/config.c:150
+msgid "value is --bool or --int"
msgstr ""
-#: builtin/column.c:28 builtin/column.c:29
-msgid "layout to use"
+#: builtin/config.c:151
+msgid "value is a path (file or directory name)"
msgstr ""
-#: builtin/column.c:30
-msgid "Maximum width"
+#: builtin/config.c:152
+msgid "value is an expiry date"
msgstr ""
-#: builtin/column.c:31
-msgid "Padding space on left border"
+#: builtin/config.c:153
+msgid "Other"
msgstr ""
-#: builtin/column.c:32
-msgid "Padding space on right border"
+#: builtin/config.c:154
+msgid "terminate values with NUL byte"
msgstr ""
-#: builtin/column.c:33
-msgid "Padding space between columns"
+#: builtin/config.c:155
+msgid "show variable names only"
msgstr ""
-#: builtin/column.c:51
-msgid "--command must be the first argument"
+#: builtin/config.c:156
+msgid "respect include directives on lookup"
msgstr ""
-#: builtin/commit.c:38
-msgid "git commit [<options>] [--] <pathspec>..."
+#: builtin/config.c:157
+msgid "show origin of config (file, standard input, blob, command line)"
msgstr ""
-#: builtin/commit.c:43
-msgid "git status [<options>] [--] <pathspec>..."
+#: builtin/config.c:158
+msgid "value"
msgstr ""
-#: 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"
+#: builtin/config.c:158
+msgid "with --get, use default value when missing entry"
msgstr ""
-#: 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"
-" git commit --allow-empty\n"
-"\n"
+#: builtin/config.c:172
+#, c-format
+msgid "wrong number of arguments, should be %d"
msgstr ""
-#: builtin/commit.c:60
-msgid "Otherwise, please use 'git reset'\n"
+#: builtin/config.c:174
+#, c-format
+msgid "wrong number of arguments, should be from %d to %d"
msgstr ""
-#: builtin/commit.c:63
-msgid ""
-"If you wish to skip this commit, use:\n"
-"\n"
-" git reset\n"
-"\n"
-"Then \"git cherry-pick --continue\" will resume cherry-picking\n"
-"the remaining commits.\n"
+#: builtin/config.c:308
+#, c-format
+msgid "invalid key pattern: %s"
msgstr ""
-#: builtin/commit.c:306
-msgid "failed to unpack HEAD tree object"
+#: builtin/config.c:344
+#, c-format
+msgid "failed to format default config value: %s"
msgstr ""
-#: builtin/commit.c:347
-msgid "unable to create temporary index"
+#: builtin/config.c:401
+#, c-format
+msgid "cannot parse color '%s'"
msgstr ""
-#: builtin/commit.c:353
-msgid "interactive add failed"
+#: builtin/config.c:443
+msgid "unable to parse default color value"
msgstr ""
-#: builtin/commit.c:366
-msgid "unable to update temporary index"
+#: builtin/config.c:496 builtin/config.c:742
+msgid "not in a git directory"
msgstr ""
-#: builtin/commit.c:368
-msgid "Failed to update main cache tree"
+#: builtin/config.c:499
+msgid "writing to stdin is not supported"
msgstr ""
-#: builtin/commit.c:393 builtin/commit.c:416 builtin/commit.c:462
-msgid "unable to write new_index file"
+#: builtin/config.c:502
+msgid "writing config blobs is not supported"
msgstr ""
-#: builtin/commit.c:445
-msgid "cannot do a partial commit during a merge."
+#: builtin/config.c:587
+#, c-format
+msgid ""
+"# This is Git's per-user configuration file.\n"
+"[user]\n"
+"# Please adapt and uncomment the following lines:\n"
+"#\tname = %s\n"
+"#\temail = %s\n"
msgstr ""
-#: builtin/commit.c:447
-msgid "cannot do a partial commit during a cherry-pick."
+#: builtin/config.c:611
+msgid "only one config file at a time"
msgstr ""
-#: builtin/commit.c:455
-msgid "cannot read the index"
+#: builtin/config.c:616
+msgid "--local can only be used inside a git repository"
msgstr ""
-#: builtin/commit.c:474
-msgid "unable to write temporary index file"
+#: builtin/config.c:619
+msgid "--blob can only be used inside a git repository"
msgstr ""
-#: builtin/commit.c:571
-#, c-format
-msgid "commit '%s' lacks author header"
+#: builtin/config.c:638
+msgid "$HOME not set"
msgstr ""
-#: builtin/commit.c:573
-#, c-format
-msgid "commit '%s' has malformed author line"
+#: builtin/config.c:658
+msgid ""
+"--worktree cannot be used with multiple working trees unless the config\n"
+"extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n"
+"section in \"git help worktree\" for details"
msgstr ""
-#: builtin/commit.c:592
-msgid "malformed --author parameter"
+#: builtin/config.c:688
+msgid "--get-color and variable type are incoherent"
msgstr ""
-#: builtin/commit.c:644
-msgid ""
-"unable to select a comment character that is not used\n"
-"in the current commit message"
+#: builtin/config.c:693
+msgid "only one action at a time"
msgstr ""
-#: builtin/commit.c:681 builtin/commit.c:714 builtin/commit.c:1042
-#, c-format
-msgid "could not lookup commit %s"
+#: builtin/config.c:706
+msgid "--name-only is only applicable to --list or --get-regexp"
msgstr ""
-#: builtin/commit.c:693 builtin/shortlog.c:317
-#, c-format
-msgid "(reading log message from standard input)\n"
+#: builtin/config.c:712
+msgid ""
+"--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
+"list"
msgstr ""
-#: builtin/commit.c:695
-msgid "could not read log from standard input"
+#: builtin/config.c:718
+msgid "--default is only applicable to --get"
msgstr ""
-#: builtin/commit.c:699
+#: builtin/config.c:731
#, c-format
-msgid "could not read log file '%s'"
+msgid "unable to read config file '%s'"
msgstr ""
-#: builtin/commit.c:728 builtin/commit.c:736
-msgid "could not read SQUASH_MSG"
+#: builtin/config.c:734
+msgid "error processing config file(s)"
msgstr ""
-#: builtin/commit.c:733
-msgid "could not read MERGE_MSG"
+#: builtin/config.c:744
+msgid "editing stdin is not supported"
msgstr ""
-#: builtin/commit.c:787
-msgid "could not write commit template"
+#: builtin/config.c:746
+msgid "editing blobs is not supported"
msgstr ""
-#: builtin/commit.c:805
+#: builtin/config.c:760
#, c-format
-msgid ""
-"\n"
-"It looks like you may be committing a merge.\n"
-"If this is not correct, please remove the file\n"
-"\t%s\n"
-"and try again.\n"
+msgid "cannot create configuration file %s"
msgstr ""
-#: builtin/commit.c:810
+#: builtin/config.c:773
#, c-format
msgid ""
-"\n"
-"It looks like you may be committing a cherry-pick.\n"
-"If this is not correct, please remove the file\n"
-"\t%s\n"
-"and try again.\n"
+"cannot overwrite multiple values with a single value\n"
+" Use a regexp, --add or --replace-all to change %s."
msgstr ""
-#: builtin/commit.c:823
+#: builtin/config.c:847 builtin/config.c:858
#, 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"
+msgid "no such section: %s"
msgstr ""
-#: builtin/commit.c:831
-#, c-format
-msgid ""
-"Please enter the commit message for your changes. Lines starting\n"
-"with '%c' will be kept; you may remove them yourself if you want to.\n"
-"An empty message aborts the commit.\n"
+#: builtin/count-objects.c:90
+msgid "git count-objects [-v] [-H | --human-readable]"
msgstr ""
-#: builtin/commit.c:848
-#, c-format
-msgid "%sAuthor: %.*s <%.*s>"
+#: builtin/count-objects.c:100
+msgid "print sizes in human readable format"
msgstr ""
-#: builtin/commit.c:856
-#, c-format
-msgid "%sDate: %s"
+#: builtin/describe.c:27
+msgid "git describe [<options>] [<commit-ish>...]"
msgstr ""
-#: builtin/commit.c:863
-#, c-format
-msgid "%sCommitter: %.*s <%.*s>"
+#: builtin/describe.c:28
+msgid "git describe [<options>] --dirty"
msgstr ""
-#: builtin/commit.c:880
-msgid "Cannot read index"
+#: builtin/describe.c:63
+msgid "head"
msgstr ""
-#: builtin/commit.c:946
-msgid "Error building trees"
+#: builtin/describe.c:63
+msgid "lightweight"
msgstr ""
-#: builtin/commit.c:960 builtin/tag.c:258
-#, c-format
-msgid "Please supply the message using either -m or -F option.\n"
+#: builtin/describe.c:63
+msgid "annotated"
msgstr ""
-#: builtin/commit.c:1004
+#: builtin/describe.c:273
#, c-format
-msgid "--author '%s' is not 'Name <email>' and matches no existing author"
+msgid "annotated tag %s not available"
msgstr ""
-#: builtin/commit.c:1018
+#: builtin/describe.c:277
#, c-format
-msgid "Invalid ignored mode '%s'"
+msgid "annotated tag %s has no embedded name"
msgstr ""
-#: builtin/commit.c:1032 builtin/commit.c:1269
+#: builtin/describe.c:279
#, c-format
-msgid "Invalid untracked files mode '%s'"
+msgid "tag '%s' is really '%s' here"
msgstr ""
-#: builtin/commit.c:1070
-msgid "--long and -z are incompatible"
+#: builtin/describe.c:323
+#, c-format
+msgid "no tag exactly matches '%s'"
msgstr ""
-#: builtin/commit.c:1103
-msgid "Using both --reset-author and --author does not make sense"
+#: builtin/describe.c:325
+#, c-format
+msgid "No exact match on refs or tags, searching to describe\n"
msgstr ""
-#: builtin/commit.c:1112
-msgid "You have nothing to amend."
+#: builtin/describe.c:379
+#, c-format
+msgid "finished search at %s\n"
msgstr ""
-#: builtin/commit.c:1115
-msgid "You are in the middle of a merge -- cannot amend."
+#: builtin/describe.c:405
+#, c-format
+msgid ""
+"No annotated tags can describe '%s'.\n"
+"However, there were unannotated tags: try --tags."
msgstr ""
-#: builtin/commit.c:1117
-msgid "You are in the middle of a cherry-pick -- cannot amend."
+#: builtin/describe.c:409
+#, c-format
+msgid ""
+"No tags can describe '%s'.\n"
+"Try --always, or create some tags."
msgstr ""
-#: builtin/commit.c:1120
-msgid "Options --squash and --fixup cannot be used together"
+#: builtin/describe.c:439
+#, c-format
+msgid "traversed %lu commits\n"
msgstr ""
-#: builtin/commit.c:1130
-msgid "Only one of -c/-C/-F/--fixup can be used."
+#: builtin/describe.c:442
+#, c-format
+msgid ""
+"more than %i tags found; listed %i most recent\n"
+"gave up search at %s\n"
msgstr ""
-#: builtin/commit.c:1132
-msgid "Option -m cannot be combined with -c/-C/-F."
+#: builtin/describe.c:510
+#, c-format
+msgid "describe %s\n"
msgstr ""
-#: builtin/commit.c:1140
-msgid "--reset-author can be used only with -C, -c or --amend."
+#: builtin/describe.c:513 builtin/log.c:516
+#, c-format
+msgid "Not a valid object name %s"
msgstr ""
-#: builtin/commit.c:1157
-msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
+#: builtin/describe.c:521
+#, c-format
+msgid "%s is neither a commit nor blob"
msgstr ""
-#: builtin/commit.c:1159
-msgid "No paths with --include/--only does not make sense."
+#: builtin/describe.c:535
+msgid "find the tag that comes after the commit"
msgstr ""
-#: builtin/commit.c:1173 builtin/tag.c:544
-#, c-format
-msgid "Invalid cleanup mode %s"
+#: builtin/describe.c:536
+msgid "debug search strategy on stderr"
msgstr ""
-#: builtin/commit.c:1178
-msgid "Paths with -a does not make sense."
+#: builtin/describe.c:537
+msgid "use any ref"
msgstr ""
-#: builtin/commit.c:1303 builtin/commit.c:1480
-msgid "show status concisely"
+#: builtin/describe.c:538
+msgid "use any tag, even unannotated"
msgstr ""
-#: builtin/commit.c:1305 builtin/commit.c:1482
-msgid "show branch information"
+#: builtin/describe.c:539
+msgid "always use long format"
msgstr ""
-#: builtin/commit.c:1307
-msgid "show stash information"
+#: builtin/describe.c:540
+msgid "only follow first parent"
msgstr ""
-#: builtin/commit.c:1309 builtin/commit.c:1484
-msgid "compute full ahead/behind values"
+#: builtin/describe.c:543
+msgid "only output exact matches"
msgstr ""
-#: builtin/commit.c:1311
-msgid "version"
+#: builtin/describe.c:545
+msgid "consider <n> most recent tags (default: 10)"
msgstr ""
-#: builtin/commit.c:1311 builtin/commit.c:1486 builtin/push.c:558
-#: builtin/worktree.c:591
-msgid "machine-readable output"
+#: builtin/describe.c:547
+msgid "only consider tags matching <pattern>"
msgstr ""
-#: builtin/commit.c:1314 builtin/commit.c:1488
-msgid "show status in long format (default)"
+#: builtin/describe.c:549
+msgid "do not consider tags matching <pattern>"
msgstr ""
-#: builtin/commit.c:1317 builtin/commit.c:1491
-msgid "terminate entries with NUL"
+#: builtin/describe.c:551 builtin/name-rev.c:424
+msgid "show abbreviated commit object as fallback"
msgstr ""
-#: builtin/commit.c:1319 builtin/commit.c:1323 builtin/commit.c:1494
-#: builtin/fast-export.c:1007 builtin/fast-export.c:1010 builtin/tag.c:398
-msgid "mode"
+#: builtin/describe.c:552 builtin/describe.c:555
+msgid "mark"
msgstr ""
-#: builtin/commit.c:1320 builtin/commit.c:1494
-msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
+#: builtin/describe.c:553
+msgid "append <mark> on dirty working tree (default: \"-dirty\")"
msgstr ""
-#: builtin/commit.c:1324
-msgid ""
-"show ignored files, optional modes: traditional, matching, no. (Default: "
-"traditional)"
+#: builtin/describe.c:556
+msgid "append <mark> on broken working tree (default: \"-broken\")"
msgstr ""
-#: builtin/commit.c:1326 parse-options.h:167
-msgid "when"
+#: builtin/describe.c:574
+msgid "--long is incompatible with --abbrev=0"
msgstr ""
-#: builtin/commit.c:1327
-msgid ""
-"ignore changes to submodules, optional when: all, dirty, untracked. "
-"(Default: all)"
+#: builtin/describe.c:603
+msgid "No names found, cannot describe anything."
msgstr ""
-#: builtin/commit.c:1329
-msgid "list untracked files in columns"
+#: builtin/describe.c:654
+msgid "--dirty is incompatible with commit-ishes"
msgstr ""
-#: builtin/commit.c:1330
-msgid "do not detect renames"
+#: builtin/describe.c:656
+msgid "--broken is incompatible with commit-ishes"
msgstr ""
-#: builtin/commit.c:1332
-msgid "detect renames, optionally set similarity index"
+#: builtin/diff.c:84
+#, c-format
+msgid "'%s': not a regular file or symlink"
msgstr ""
-#: builtin/commit.c:1352
-msgid "Unsupported combination of ignored and untracked-files arguments"
+#: builtin/diff.c:235
+#, c-format
+msgid "invalid option: %s"
msgstr ""
-#: builtin/commit.c:1450
-msgid "suppress summary after successful commit"
+#: builtin/diff.c:364
+msgid "Not a git repository"
msgstr ""
-#: builtin/commit.c:1451
-msgid "show diff in commit message template"
+#: builtin/diff.c:408
+#, c-format
+msgid "invalid object '%s' given."
msgstr ""
-#: builtin/commit.c:1453
-msgid "Commit message options"
+#: builtin/diff.c:417
+#, c-format
+msgid "more than two blobs given: '%s'"
msgstr ""
-#: builtin/commit.c:1454 builtin/merge.c:261 builtin/tag.c:395
-msgid "read message from file"
+#: builtin/diff.c:422
+#, c-format
+msgid "unhandled object '%s' given."
msgstr ""
-#: builtin/commit.c:1455
-msgid "author"
+#: builtin/difftool.c:31
+msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
msgstr ""
-#: builtin/commit.c:1455
-msgid "override author for commit"
+#: builtin/difftool.c:261
+#, c-format
+msgid "failed: %d"
msgstr ""
-#: builtin/commit.c:1456 builtin/gc.c:504
-msgid "date"
+#: builtin/difftool.c:303
+#, c-format
+msgid "could not read symlink %s"
msgstr ""
-#: builtin/commit.c:1456
-msgid "override date for commit"
+#: builtin/difftool.c:305
+#, c-format
+msgid "could not read symlink file %s"
msgstr ""
-#: builtin/commit.c:1457 builtin/merge.c:257 builtin/notes.c:404
-#: builtin/notes.c:567 builtin/tag.c:393
-msgid "message"
+#: builtin/difftool.c:313
+#, c-format
+msgid "could not read object %s for symlink %s"
msgstr ""
-#: builtin/commit.c:1457
-msgid "commit message"
+#: builtin/difftool.c:414
+msgid ""
+"combined diff formats('-c' and '--cc') are not supported in\n"
+"directory diff mode('-d' and '--dir-diff')."
msgstr ""
-#: builtin/commit.c:1458 builtin/commit.c:1459 builtin/commit.c:1460
-#: builtin/commit.c:1461 parse-options.h:270 ref-filter.h:92
-msgid "commit"
+#: builtin/difftool.c:634
+#, c-format
+msgid "both files modified: '%s' and '%s'."
msgstr ""
-#: builtin/commit.c:1458
-msgid "reuse and edit message from specified commit"
+#: builtin/difftool.c:636
+msgid "working tree file has been left."
msgstr ""
-#: builtin/commit.c:1459
-msgid "reuse message from specified commit"
+#: builtin/difftool.c:647
+#, c-format
+msgid "temporary files exist in '%s'."
msgstr ""
-#: builtin/commit.c:1460
-msgid "use autosquash formatted message to fixup specified commit"
+#: builtin/difftool.c:648
+msgid "you may want to cleanup or recover these."
msgstr ""
-#: builtin/commit.c:1461
-msgid "use autosquash formatted message to squash specified commit"
+#: builtin/difftool.c:697
+msgid "use `diff.guitool` instead of `diff.tool`"
msgstr ""
-#: builtin/commit.c:1462
-msgid "the commit is authored by me now (used with -C/-c/--amend)"
+#: builtin/difftool.c:699
+msgid "perform a full-directory diff"
msgstr ""
-#: 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:"
+#: builtin/difftool.c:701
+msgid "do not prompt before launching a diff tool"
msgstr ""
-#: builtin/commit.c:1464
-msgid "use specified template file"
+#: builtin/difftool.c:706
+msgid "use symlinks in dir-diff mode"
msgstr ""
-#: builtin/commit.c:1465
-msgid "force edit of commit"
+#: builtin/difftool.c:707
+msgid "tool"
msgstr ""
-#: builtin/commit.c:1466
-msgid "default"
+#: builtin/difftool.c:708
+msgid "use the specified diff tool"
msgstr ""
-#: builtin/commit.c:1466 builtin/tag.c:399
-msgid "how to strip spaces and #comments from message"
+#: builtin/difftool.c:710
+msgid "print a list of diff tools that may be used with `--tool`"
msgstr ""
-#: builtin/commit.c:1467
-msgid "include status in commit message template"
+#: builtin/difftool.c:713
+msgid ""
+"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
+"code"
msgstr ""
-#: builtin/commit.c:1469 builtin/merge.c:272 builtin/pull.c:184
-#: builtin/revert.c:114
-msgid "GPG sign commit"
+#: builtin/difftool.c:716
+msgid "specify a custom command for viewing diffs"
msgstr ""
-#: builtin/commit.c:1472
-msgid "Commit contents options"
+#: builtin/difftool.c:740
+msgid "no <tool> given for --tool=<tool>"
msgstr ""
-#: builtin/commit.c:1473
-msgid "commit all changed files"
+#: builtin/difftool.c:747
+msgid "no <cmd> given for --extcmd=<cmd>"
msgstr ""
-#: builtin/commit.c:1474
-msgid "add specified files to index for commit"
+#: builtin/fast-export.c:29
+msgid "git fast-export [rev-list-opts]"
msgstr ""
-#: builtin/commit.c:1475
-msgid "interactively add files"
+#: builtin/fast-export.c:1084
+msgid "show progress after <n> objects"
msgstr ""
-#: builtin/commit.c:1476
-msgid "interactively add changes"
+#: builtin/fast-export.c:1086
+msgid "select handling of signed tags"
msgstr ""
-#: builtin/commit.c:1477
-msgid "commit only specified files"
+#: builtin/fast-export.c:1089
+msgid "select handling of tags that tag filtered objects"
msgstr ""
-#: builtin/commit.c:1478
-msgid "bypass pre-commit and commit-msg hooks"
+#: builtin/fast-export.c:1092
+msgid "Dump marks to this file"
msgstr ""
-#: builtin/commit.c:1479
-msgid "show what would be committed"
+#: builtin/fast-export.c:1094
+msgid "Import marks from this file"
msgstr ""
-#: builtin/commit.c:1492
-msgid "amend previous commit"
+#: builtin/fast-export.c:1096
+msgid "Fake a tagger when tags lack one"
msgstr ""
-#: builtin/commit.c:1493
-msgid "bypass post-rewrite hook"
+#: builtin/fast-export.c:1098
+msgid "Output full tree for each commit"
msgstr ""
-#: builtin/commit.c:1498
-msgid "ok to record an empty change"
+#: builtin/fast-export.c:1100
+msgid "Use the done feature to terminate the stream"
msgstr ""
-#: builtin/commit.c:1500
-msgid "ok to record a change with an empty message"
+#: builtin/fast-export.c:1101
+msgid "Skip output of blob data"
msgstr ""
-#: builtin/commit.c:1573
-#, c-format
-msgid "Corrupt MERGE_HEAD file (%s)"
+#: builtin/fast-export.c:1102 builtin/log.c:1601
+msgid "refspec"
msgstr ""
-#: builtin/commit.c:1580
-msgid "could not read MERGE_MODE"
+#: builtin/fast-export.c:1103
+msgid "Apply refspec to exported refs"
msgstr ""
-#: builtin/commit.c:1599
-#, c-format
-msgid "could not read commit message: %s"
+#: builtin/fast-export.c:1104
+msgid "anonymize output"
msgstr ""
-#: builtin/commit.c:1610
-#, c-format
-msgid "Aborting commit due to empty commit message.\n"
+#: builtin/fast-export.c:1106
+msgid "Reference parents which are not in fast-export stream by object id"
msgstr ""
-#: builtin/commit.c:1615
-#, c-format
-msgid "Aborting commit; you did not edit the message.\n"
+#: builtin/fast-export.c:1108
+msgid "Show original object ids of blobs/commits"
msgstr ""
-#: builtin/commit.c:1650
-msgid ""
-"repository has been updated, but unable to write\n"
-"new_index file. Check that disk is not full and quota is\n"
-"not exceeded, and then \"git reset HEAD\" to recover."
+#: builtin/fetch.c:28
+msgid "git fetch [<options>] [<repository> [<refspec>...]]"
msgstr ""
-#: builtin/commit-graph.c:10
-msgid "git commit-graph [--object-dir <objdir>]"
+#: builtin/fetch.c:29
+msgid "git fetch [<options>] <group>"
msgstr ""
-#: builtin/commit-graph.c:11 builtin/commit-graph.c:23
-msgid "git commit-graph read [--object-dir <objdir>]"
+#: builtin/fetch.c:30
+msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
msgstr ""
-#: builtin/commit-graph.c:12 builtin/commit-graph.c:18
-msgid "git commit-graph verify [--object-dir <objdir>]"
+#: builtin/fetch.c:31
+msgid "git fetch --all [<options>]"
msgstr ""
-#: builtin/commit-graph.c:13 builtin/commit-graph.c:28
-msgid ""
-"git commit-graph write [--object-dir <objdir>] [--append] [--reachable|--"
-"stdin-packs|--stdin-commits]"
+#: builtin/fetch.c:115 builtin/pull.c:195
+msgid "fetch from all remotes"
msgstr ""
-#: 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"
+#: builtin/fetch.c:117 builtin/pull.c:198
+msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr ""
-#: 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"
+#: builtin/fetch.c:119 builtin/pull.c:201
+msgid "path to upload pack on remote end"
msgstr ""
-#: builtin/commit-graph.c:134
-msgid "start walk at all refs"
+#: builtin/fetch.c:120
+msgid "force overwrite of local reference"
msgstr ""
-#: builtin/commit-graph.c:136
-msgid "scan pack-indexes listed by stdin for commits"
+#: builtin/fetch.c:122
+msgid "fetch from multiple remotes"
msgstr ""
-#: builtin/commit-graph.c:138
-msgid "start walk at commits listed by stdin"
+#: builtin/fetch.c:124 builtin/pull.c:205
+msgid "fetch all tags and associated objects"
msgstr ""
-#: builtin/commit-graph.c:140
-msgid "include all commits already in the commit-graph file"
+#: builtin/fetch.c:126
+msgid "do not fetch all tags (--no-tags)"
msgstr ""
-#: builtin/commit-graph.c:149
-msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
+#: builtin/fetch.c:128
+msgid "number of submodules fetched in parallel"
msgstr ""
-#: builtin/config.c:10
-msgid "git config [<options>]"
+#: builtin/fetch.c:130 builtin/pull.c:208
+msgid "prune remote-tracking branches no longer on remote"
msgstr ""
-#: builtin/config.c:101
-#, c-format
-msgid "unrecognized --type argument, %s"
+#: builtin/fetch.c:132
+msgid "prune local tags no longer on remote and clobber changed tags"
msgstr ""
-#: builtin/config.c:113
-msgid "only one type at a time"
+#: builtin/fetch.c:133 builtin/fetch.c:156 builtin/pull.c:133
+msgid "on-demand"
msgstr ""
-#: builtin/config.c:122
-msgid "Config file location"
+#: builtin/fetch.c:134
+msgid "control recursive fetching of submodules"
msgstr ""
-#: builtin/config.c:123
-msgid "use global config file"
+#: builtin/fetch.c:138 builtin/pull.c:216
+msgid "keep downloaded pack"
msgstr ""
-#: builtin/config.c:124
-msgid "use system config file"
+#: builtin/fetch.c:140
+msgid "allow updating of HEAD ref"
msgstr ""
-#: builtin/config.c:125
-msgid "use repository config file"
+#: builtin/fetch.c:143 builtin/fetch.c:149 builtin/pull.c:219
+msgid "deepen history of shallow clone"
msgstr ""
-#: builtin/config.c:126
-msgid "use given config file"
+#: builtin/fetch.c:145
+msgid "deepen history of shallow repository based on time"
msgstr ""
-#: builtin/config.c:127
-msgid "blob-id"
+#: builtin/fetch.c:151 builtin/pull.c:222
+msgid "convert to a complete repository"
msgstr ""
-#: builtin/config.c:127
-msgid "read config from given blob object"
+#: builtin/fetch.c:154
+msgid "prepend this to submodule path output"
msgstr ""
-#: builtin/config.c:128
-msgid "Action"
+#: builtin/fetch.c:157
+msgid ""
+"default for recursive fetching of submodules (lower priority than config "
+"files)"
msgstr ""
-#: builtin/config.c:129
-msgid "get value: name [value-regex]"
+#: builtin/fetch.c:161 builtin/pull.c:225
+msgid "accept refs that update .git/shallow"
msgstr ""
-#: builtin/config.c:130
-msgid "get all values: key [value-regex]"
+#: builtin/fetch.c:162 builtin/pull.c:227
+msgid "refmap"
msgstr ""
-
-#: builtin/config.c:131
-msgid "get values for regexp: name-regex [value-regex]"
+
+#: builtin/fetch.c:163 builtin/pull.c:228
+msgid "specify fetch refmap"
msgstr ""
-#: builtin/config.c:132
-msgid "get value specific for the URL: section[.var] URL"
+#: builtin/fetch.c:164 builtin/ls-remote.c:77 builtin/push.c:585
+#: builtin/send-pack.c:172
+msgid "server-specific"
msgstr ""
-#: builtin/config.c:133
-msgid "replace all matching variables: name value [value_regex]"
+#: builtin/fetch.c:164 builtin/ls-remote.c:77 builtin/push.c:585
+#: builtin/send-pack.c:173
+msgid "option to transmit"
msgstr ""
-#: builtin/config.c:134
-msgid "add a new variable: name value"
+#: builtin/fetch.c:170
+msgid "report that we have only objects reachable from this object"
msgstr ""
-#: builtin/config.c:135
-msgid "remove a variable: name [value-regex]"
+#: builtin/fetch.c:469
+msgid "Couldn't find remote ref HEAD"
msgstr ""
-#: builtin/config.c:136
-msgid "remove all matches: name [value-regex]"
+#: builtin/fetch.c:608
+#, c-format
+msgid "configuration fetch.output contains invalid value %s"
msgstr ""
-#: builtin/config.c:137
-msgid "rename section: old-name new-name"
+#: builtin/fetch.c:705
+#, c-format
+msgid "object %s not found"
msgstr ""
-#: builtin/config.c:138
-msgid "remove a section: name"
+#: builtin/fetch.c:709
+msgid "[up to date]"
msgstr ""
-#: builtin/config.c:139
-msgid "list all"
+#: builtin/fetch.c:722 builtin/fetch.c:738 builtin/fetch.c:801
+msgid "[rejected]"
msgstr ""
-#: builtin/config.c:140
-msgid "open an editor"
+#: builtin/fetch.c:723
+msgid "can't fetch in current branch"
msgstr ""
-#: builtin/config.c:141
-msgid "find the color configured: slot [default]"
+#: builtin/fetch.c:733
+msgid "[tag update]"
msgstr ""
-#: builtin/config.c:142
-msgid "find the color setting: slot [stdout-is-tty]"
+#: builtin/fetch.c:734 builtin/fetch.c:771 builtin/fetch.c:784
+#: builtin/fetch.c:796
+msgid "unable to update local ref"
msgstr ""
-#: builtin/config.c:143
-msgid "Type"
+#: builtin/fetch.c:738
+msgid "would clobber existing tag"
msgstr ""
-#: builtin/config.c:144
-msgid "value is given this type"
+#: builtin/fetch.c:760
+msgid "[new tag]"
msgstr ""
-#: builtin/config.c:145
-msgid "value is \"true\" or \"false\""
+#: builtin/fetch.c:763
+msgid "[new branch]"
msgstr ""
-#: builtin/config.c:146
-msgid "value is decimal number"
+#: builtin/fetch.c:766
+msgid "[new ref]"
msgstr ""
-#: builtin/config.c:147
-msgid "value is --bool or --int"
+#: builtin/fetch.c:796
+msgid "forced update"
msgstr ""
-#: builtin/config.c:148
-msgid "value is a path (file or directory name)"
+#: builtin/fetch.c:801
+msgid "non-fast-forward"
msgstr ""
-#: builtin/config.c:149
-msgid "value is an expiry date"
+#: builtin/fetch.c:847
+#, c-format
+msgid "%s did not send all necessary objects\n"
msgstr ""
-#: builtin/config.c:150
-msgid "Other"
+#: builtin/fetch.c:868
+#, c-format
+msgid "reject %s because shallow roots are not allowed to be updated"
msgstr ""
-#: builtin/config.c:151
-msgid "terminate values with NUL byte"
+#: builtin/fetch.c:959 builtin/fetch.c:1081
+#, c-format
+msgid "From %.*s\n"
msgstr ""
-#: builtin/config.c:152
-msgid "show variable names only"
+#: builtin/fetch.c:970
+#, 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/config.c:153
-msgid "respect include directives on lookup"
+#: builtin/fetch.c:1051
+#, c-format
+msgid " (%s will become dangling)"
msgstr ""
-#: builtin/config.c:154
-msgid "show origin of config (file, standard input, blob, command line)"
+#: builtin/fetch.c:1052
+#, c-format
+msgid " (%s has become dangling)"
msgstr ""
-#: builtin/config.c:155
-msgid "value"
+#: builtin/fetch.c:1084
+msgid "[deleted]"
msgstr ""
-#: builtin/config.c:155
-msgid "with --get, use default value when missing entry"
+#: builtin/fetch.c:1085 builtin/remote.c:1036
+msgid "(none)"
msgstr ""
-#: builtin/config.c:168
+#: builtin/fetch.c:1108
#, c-format
-msgid "wrong number of arguments, should be %d"
+msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr ""
-#: builtin/config.c:170
+#: builtin/fetch.c:1127
#, c-format
-msgid "wrong number of arguments, should be from %d to %d"
+msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr ""
-#: builtin/config.c:304
+#: builtin/fetch.c:1130
#, c-format
-msgid "invalid key pattern: %s"
+msgid "Option \"%s\" is ignored for %s\n"
msgstr ""
-#: builtin/config.c:340
+#: builtin/fetch.c:1434
#, c-format
-msgid "failed to format default config value: %s"
+msgid "Fetching %s\n"
msgstr ""
-#: builtin/config.c:397
+#: builtin/fetch.c:1436 builtin/remote.c:100
#, c-format
-msgid "cannot parse color '%s'"
+msgid "Could not fetch %s"
msgstr ""
-#: builtin/config.c:439
-msgid "unable to parse default color value"
+#: builtin/fetch.c:1482
+msgid ""
+"--filter can only be used with the remote configured in extensions."
+"partialClone"
msgstr ""
-#: builtin/config.c:492 builtin/config.c:724
-msgid "not in a git directory"
+#: builtin/fetch.c:1506
+msgid ""
+"No remote repository specified. Please, specify either a URL or a\n"
+"remote name from which new revisions should be fetched."
msgstr ""
-#: builtin/config.c:495
-msgid "writing to stdin is not supported"
+#: builtin/fetch.c:1543
+msgid "You need to specify a tag name."
msgstr ""
-#: builtin/config.c:498
-msgid "writing config blobs is not supported"
+#: builtin/fetch.c:1592
+msgid "Negative depth in --deepen is not supported"
msgstr ""
-#: builtin/config.c:583
-#, c-format
-msgid ""
-"# This is Git's per-user configuration file.\n"
-"[user]\n"
-"# Please adapt and uncomment the following lines:\n"
-"#\tname = %s\n"
-"#\temail = %s\n"
+#: builtin/fetch.c:1594
+msgid "--deepen and --depth are mutually exclusive"
msgstr ""
-#: builtin/config.c:606
-msgid "only one config file at a time"
+#: builtin/fetch.c:1599
+msgid "--depth and --unshallow cannot be used together"
msgstr ""
-#: builtin/config.c:611
-msgid "--local can only be used inside a git repository"
+#: builtin/fetch.c:1601
+msgid "--unshallow on a complete repository does not make sense"
msgstr ""
-#: builtin/config.c:614
-msgid "--blob can only be used inside a git repository"
+#: builtin/fetch.c:1617
+msgid "fetch --all does not take a repository argument"
msgstr ""
-#: builtin/config.c:633
-msgid "$HOME not set"
+#: builtin/fetch.c:1619
+msgid "fetch --all does not make sense with refspecs"
msgstr ""
-#: builtin/config.c:670
-msgid "--get-color and variable type are incoherent"
+#: builtin/fetch.c:1628
+#, c-format
+msgid "No such remote or remote group: %s"
msgstr ""
-#: builtin/config.c:675
-msgid "only one action at a time"
+#: builtin/fetch.c:1635
+msgid "Fetching a group and specifying refspecs does not make sense"
msgstr ""
-#: builtin/config.c:688
-msgid "--name-only is only applicable to --list or --get-regexp"
+#: builtin/fetch.c:1651
+msgid ""
+"--filter can only be used with the remote configured in extensions."
+"partialclone"
msgstr ""
-#: builtin/config.c:694
+#: builtin/fmt-merge-msg.c:18
msgid ""
-"--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
-"list"
+"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
msgstr ""
-#: builtin/config.c:700
-msgid "--default is only applicable to --get"
+#: builtin/fmt-merge-msg.c:672
+msgid "populate log with at most <n> entries from shortlog"
msgstr ""
-#: builtin/config.c:713
-#, c-format
-msgid "unable to read config file '%s'"
+#: builtin/fmt-merge-msg.c:675
+msgid "alias for --log (deprecated)"
msgstr ""
-#: builtin/config.c:716
-msgid "error processing config file(s)"
+#: builtin/fmt-merge-msg.c:678
+msgid "text"
msgstr ""
-#: builtin/config.c:726
-msgid "editing stdin is not supported"
+#: builtin/fmt-merge-msg.c:679
+msgid "use <text> as start of message"
msgstr ""
-#: builtin/config.c:728
-msgid "editing blobs is not supported"
+#: builtin/fmt-merge-msg.c:680
+msgid "file to read from"
msgstr ""
-#: builtin/config.c:742
-#, c-format
-msgid "cannot create configuration file %s"
+#: builtin/for-each-ref.c:10
+msgid "git for-each-ref [<options>] [<pattern>]"
msgstr ""
-#: 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."
+#: builtin/for-each-ref.c:11
+msgid "git for-each-ref [--points-at <object>]"
msgstr ""
-#: builtin/config.c:829 builtin/config.c:840
-#, c-format
-msgid "no such section: %s"
+#: builtin/for-each-ref.c:12
+msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]"
msgstr ""
-#: builtin/count-objects.c:90
-msgid "git count-objects [-v] [-H | --human-readable]"
+#: builtin/for-each-ref.c:13
+msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
msgstr ""
-#: builtin/count-objects.c:100
-msgid "print sizes in human readable format"
+#: builtin/for-each-ref.c:28
+msgid "quote placeholders suitably for shells"
msgstr ""
-#: builtin/describe.c:26
-msgid "git describe [<options>] [<commit-ish>...]"
+#: builtin/for-each-ref.c:30
+msgid "quote placeholders suitably for perl"
msgstr ""
-#: builtin/describe.c:27
-msgid "git describe [<options>] --dirty"
+#: builtin/for-each-ref.c:32
+msgid "quote placeholders suitably for python"
msgstr ""
-#: builtin/describe.c:62
-msgid "head"
+#: builtin/for-each-ref.c:34
+msgid "quote placeholders suitably for Tcl"
msgstr ""
-#: builtin/describe.c:62
-msgid "lightweight"
+#: builtin/for-each-ref.c:37
+msgid "show only <n> matched refs"
msgstr ""
-#: builtin/describe.c:62
-msgid "annotated"
+#: builtin/for-each-ref.c:39 builtin/tag.c:424
+msgid "respect format colors"
msgstr ""
-#: builtin/describe.c:272
-#, c-format
-msgid "annotated tag %s not available"
+#: builtin/for-each-ref.c:43
+msgid "print only refs which points at the given object"
msgstr ""
-#: builtin/describe.c:276
-#, c-format
-msgid "annotated tag %s has no embedded name"
+#: builtin/for-each-ref.c:45
+msgid "print only refs that are merged"
msgstr ""
-#: builtin/describe.c:278
-#, c-format
-msgid "tag '%s' is really '%s' here"
+#: builtin/for-each-ref.c:46
+msgid "print only refs that are not merged"
+msgstr ""
+
+#: builtin/for-each-ref.c:47
+msgid "print only refs which contain the commit"
+msgstr ""
+
+#: builtin/for-each-ref.c:48
+msgid "print only refs which don't contain the commit"
+msgstr ""
+
+#: builtin/fsck.c:88 builtin/fsck.c:160 builtin/fsck.c:161
+msgid "unknown"
msgstr ""
-#: builtin/describe.c:322
+#. TRANSLATORS: e.g. error in tree 01bfda: <more explanation>
+#: builtin/fsck.c:120 builtin/fsck.c:136
#, c-format
-msgid "no tag exactly matches '%s'"
+msgid "error in %s %s: %s"
msgstr ""
-#: builtin/describe.c:324
+#. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation>
+#: builtin/fsck.c:131
#, c-format
-msgid "No exact match on refs or tags, searching to describe\n"
+msgid "warning in %s %s: %s"
msgstr ""
-#: builtin/describe.c:378
+#: builtin/fsck.c:157 builtin/fsck.c:159
#, c-format
-msgid "finished search at %s\n"
+msgid "broken link from %7s %s"
+msgstr ""
+
+#: builtin/fsck.c:168
+msgid "wrong object type in link"
msgstr ""
-#: builtin/describe.c:404
+#: builtin/fsck.c:184
#, c-format
msgid ""
-"No annotated tags can describe '%s'.\n"
-"However, there were unannotated tags: try --tags."
+"broken link from %7s %s\n"
+" to %7s %s"
msgstr ""
-#: builtin/describe.c:408
+#: builtin/fsck.c:253
#, c-format
-msgid ""
-"No tags can describe '%s'.\n"
-"Try --always, or create some tags."
+msgid "missing %s %s"
msgstr ""
-#: builtin/describe.c:438
+#: builtin/fsck.c:279
#, c-format
-msgid "traversed %lu commits\n"
+msgid "unreachable %s %s"
msgstr ""
-#: builtin/describe.c:441
+#: builtin/fsck.c:298
#, c-format
-msgid ""
-"more than %i tags found; listed %i most recent\n"
-"gave up search at %s\n"
+msgid "dangling %s %s"
+msgstr ""
+
+#: builtin/fsck.c:307
+msgid "could not create lost-found"
msgstr ""
-#: builtin/describe.c:509
+#: builtin/fsck.c:318
#, c-format
-msgid "describe %s\n"
+msgid "could not finish '%s'"
msgstr ""
-#: builtin/describe.c:512 builtin/log.c:508
+#: builtin/fsck.c:335
#, c-format
-msgid "Not a valid object name %s"
+msgid "Checking %s"
msgstr ""
-#: builtin/describe.c:520
+#: builtin/fsck.c:353
#, c-format
-msgid "%s is neither a commit nor blob"
+msgid "Checking connectivity (%d objects)"
msgstr ""
-#: builtin/describe.c:534
-msgid "find the tag that comes after the commit"
+#: builtin/fsck.c:372
+#, c-format
+msgid "Checking %s %s"
msgstr ""
-#: builtin/describe.c:535
-msgid "debug search strategy on stderr"
+#: builtin/fsck.c:376
+msgid "broken links"
msgstr ""
-#: builtin/describe.c:536
-msgid "use any ref"
+#: builtin/fsck.c:385
+#, c-format
+msgid "root %s"
msgstr ""
-#: builtin/describe.c:537
-msgid "use any tag, even unannotated"
+#: builtin/fsck.c:393
+#, c-format
+msgid "tagged %s %s (%s) in %s"
msgstr ""
-#: builtin/describe.c:538
-msgid "always use long format"
+#: builtin/fsck.c:422
+#, c-format
+msgid "%s: object corrupt or missing"
msgstr ""
-#: builtin/describe.c:539
-msgid "only follow first parent"
+#: builtin/fsck.c:447
+#, c-format
+msgid "%s: invalid reflog entry %s"
msgstr ""
-#: builtin/describe.c:542
-msgid "only output exact matches"
+#: builtin/fsck.c:461
+#, c-format
+msgid "Checking reflog %s->%s"
msgstr ""
-#: builtin/describe.c:544
-msgid "consider <n> most recent tags (default: 10)"
+#: builtin/fsck.c:495
+#, c-format
+msgid "%s: invalid sha1 pointer %s"
msgstr ""
-#: builtin/describe.c:546
-msgid "only consider tags matching <pattern>"
+#: builtin/fsck.c:502
+#, c-format
+msgid "%s: not a commit"
msgstr ""
-#: builtin/describe.c:548
-msgid "do not consider tags matching <pattern>"
+#: builtin/fsck.c:557
+msgid "notice: No default references"
msgstr ""
-#: builtin/describe.c:550 builtin/name-rev.c:424
-msgid "show abbreviated commit object as fallback"
+#: builtin/fsck.c:572
+#, c-format
+msgid "%s: object corrupt or missing: %s"
msgstr ""
-#: builtin/describe.c:551 builtin/describe.c:554
-msgid "mark"
+#: builtin/fsck.c:585
+#, c-format
+msgid "%s: object could not be parsed: %s"
msgstr ""
-#: builtin/describe.c:552
-msgid "append <mark> on dirty working tree (default: \"-dirty\")"
+#: builtin/fsck.c:605
+#, c-format
+msgid "bad sha1 file: %s"
msgstr ""
-#: builtin/describe.c:555
-msgid "append <mark> on broken working tree (default: \"-broken\")"
+#: builtin/fsck.c:620
+msgid "Checking object directory"
msgstr ""
-#: builtin/describe.c:573
-msgid "--long is incompatible with --abbrev=0"
+#: builtin/fsck.c:623
+msgid "Checking object directories"
msgstr ""
-#: builtin/describe.c:602
-msgid "No names found, cannot describe anything."
+#: builtin/fsck.c:638
+#, c-format
+msgid "Checking %s link"
msgstr ""
-#: builtin/describe.c:652
-msgid "--dirty is incompatible with commit-ishes"
+#: builtin/fsck.c:643 builtin/index-pack.c:833
+#, c-format
+msgid "invalid %s"
msgstr ""
-#: builtin/describe.c:654
-msgid "--broken is incompatible with commit-ishes"
+#: builtin/fsck.c:650
+#, c-format
+msgid "%s points to something strange (%s)"
msgstr ""
-#: builtin/diff.c:83
+#: builtin/fsck.c:656
#, c-format
-msgid "'%s': not a regular file or symlink"
+msgid "%s: detached HEAD points at nothing"
msgstr ""
-#: builtin/diff.c:234
+#: builtin/fsck.c:660
#, c-format
-msgid "invalid option: %s"
+msgid "notice: %s points to an unborn branch (%s)"
msgstr ""
-#: builtin/diff.c:363
-msgid "Not a git repository"
+#: builtin/fsck.c:672
+msgid "Checking cache tree"
msgstr ""
-#: builtin/diff.c:407
+#: builtin/fsck.c:677
#, c-format
-msgid "invalid object '%s' given."
+msgid "%s: invalid sha1 pointer in cache-tree"
msgstr ""
-#: builtin/diff.c:416
-#, c-format
-msgid "more than two blobs given: '%s'"
+#: builtin/fsck.c:688
+msgid "non-tree in cache-tree"
msgstr ""
-#: builtin/diff.c:421
-#, c-format
-msgid "unhandled object '%s' given."
+#: builtin/fsck.c:719
+msgid "git fsck [<options>] [<object>...]"
msgstr ""
-#: builtin/difftool.c:30
-msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
+#: builtin/fsck.c:725
+msgid "show unreachable objects"
msgstr ""
-#: builtin/difftool.c:260
-#, c-format
-msgid "failed: %d"
+#: builtin/fsck.c:726
+msgid "show dangling objects"
msgstr ""
-#: builtin/difftool.c:302
-#, c-format
-msgid "could not read symlink %s"
+#: builtin/fsck.c:727
+msgid "report tags"
msgstr ""
-#: builtin/difftool.c:304
-#, c-format
-msgid "could not read symlink file %s"
+#: builtin/fsck.c:728
+msgid "report root nodes"
msgstr ""
-#: builtin/difftool.c:312
-#, c-format
-msgid "could not read object %s for symlink %s"
+#: builtin/fsck.c:729
+msgid "make index objects head nodes"
msgstr ""
-#: builtin/difftool.c:413
-msgid ""
-"combined diff formats('-c' and '--cc') are not supported in\n"
-"directory diff mode('-d' and '--dir-diff')."
+#: builtin/fsck.c:730
+msgid "make reflogs head nodes (default)"
msgstr ""
-#: builtin/difftool.c:633
-#, c-format
-msgid "both files modified: '%s' and '%s'."
+#: builtin/fsck.c:731
+msgid "also consider packs and alternate objects"
msgstr ""
-#: builtin/difftool.c:635
-msgid "working tree file has been left."
+#: builtin/fsck.c:732
+msgid "check only connectivity"
msgstr ""
-#: builtin/difftool.c:646
-#, c-format
-msgid "temporary files exist in '%s'."
+#: builtin/fsck.c:733
+msgid "enable more strict checking"
msgstr ""
-#: builtin/difftool.c:647
-msgid "you may want to cleanup or recover these."
+#: builtin/fsck.c:735
+msgid "write dangling objects in .git/lost-found"
msgstr ""
-#: builtin/difftool.c:696
-msgid "use `diff.guitool` instead of `diff.tool`"
+#: builtin/fsck.c:736 builtin/prune.c:110
+msgid "show progress"
msgstr ""
-#: builtin/difftool.c:698
-msgid "perform a full-directory diff"
+#: builtin/fsck.c:737
+msgid "show verbose names for reachable objects"
msgstr ""
-#: builtin/difftool.c:700
-msgid "do not prompt before launching a diff tool"
+#: builtin/fsck.c:797
+msgid "Checking objects"
msgstr ""
-#: builtin/difftool.c:705
-msgid "use symlinks in dir-diff mode"
+#: builtin/fsck.c:825
+#, c-format
+msgid "%s: object missing"
msgstr ""
-#: builtin/difftool.c:706
-msgid "tool"
+#: builtin/fsck.c:837
+#, c-format
+msgid "invalid parameter: expected sha1, got '%s'"
msgstr ""
-#: builtin/difftool.c:707
-msgid "use the specified diff tool"
+#: builtin/gc.c:34
+msgid "git gc [<options>]"
msgstr ""
-#: builtin/difftool.c:709
-msgid "print a list of diff tools that may be used with `--tool`"
+#: builtin/gc.c:90
+#, c-format
+msgid "Failed to fstat %s: %s"
+msgstr ""
+
+#: builtin/gc.c:461 builtin/init-db.c:55
+#, c-format
+msgid "cannot stat '%s'"
+msgstr ""
+
+#: builtin/gc.c:470 builtin/notes.c:240 builtin/tag.c:510
+#, c-format
+msgid "cannot read '%s'"
msgstr ""
-#: builtin/difftool.c:712
+#: builtin/gc.c:477
+#, c-format
msgid ""
-"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
-"code"
+"The last gc run reported the following. Please correct the root cause\n"
+"and remove %s.\n"
+"Automatic cleanup will not be performed until the file is removed.\n"
+"\n"
+"%s"
msgstr ""
-#: builtin/difftool.c:715
-msgid "specify a custom command for viewing diffs"
+#: builtin/gc.c:519
+msgid "prune unreferenced objects"
msgstr ""
-#: builtin/difftool.c:739
-msgid "no <tool> given for --tool=<tool>"
+#: builtin/gc.c:521
+msgid "be more thorough (increased runtime)"
msgstr ""
-#: builtin/difftool.c:746
-msgid "no <cmd> given for --extcmd=<cmd>"
+#: builtin/gc.c:522
+msgid "enable auto-gc mode"
msgstr ""
-#: builtin/fast-export.c:29
-msgid "git fast-export [rev-list-opts]"
+#: builtin/gc.c:525
+msgid "force running gc even if there may be another gc running"
msgstr ""
-#: builtin/fast-export.c:1006
-msgid "show progress after <n> objects"
+#: builtin/gc.c:528
+msgid "repack all other packs except the largest pack"
msgstr ""
-#: builtin/fast-export.c:1008
-msgid "select handling of signed tags"
+#: builtin/gc.c:545
+#, c-format
+msgid "failed to parse gc.logexpiry value %s"
msgstr ""
-#: builtin/fast-export.c:1011
-msgid "select handling of tags that tag filtered objects"
+#: builtin/gc.c:556
+#, c-format
+msgid "failed to parse prune expiry value %s"
msgstr ""
-#: builtin/fast-export.c:1014
-msgid "Dump marks to this file"
+#: builtin/gc.c:576
+#, c-format
+msgid "Auto packing the repository in background for optimum performance.\n"
msgstr ""
-#: builtin/fast-export.c:1016
-msgid "Import marks from this file"
+#: builtin/gc.c:578
+#, c-format
+msgid "Auto packing the repository for optimum performance.\n"
msgstr ""
-#: builtin/fast-export.c:1018
-msgid "Fake a tagger when tags lack one"
+#: builtin/gc.c:579
+#, c-format
+msgid "See \"git help gc\" for manual housekeeping.\n"
msgstr ""
-#: builtin/fast-export.c:1020
-msgid "Output full tree for each commit"
+#: builtin/gc.c:619
+#, c-format
+msgid ""
+"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
msgstr ""
-#: builtin/fast-export.c:1022
-msgid "Use the done feature to terminate the stream"
+#: builtin/gc.c:672
+msgid ""
+"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr ""
-#: builtin/fast-export.c:1023
-msgid "Skip output of blob data"
+#: builtin/grep.c:29
+msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
msgstr ""
-#: builtin/fast-export.c:1024
-msgid "refspec"
+#: builtin/grep.c:225
+#, c-format
+msgid "grep: failed to create thread: %s"
msgstr ""
-#: builtin/fast-export.c:1025
-msgid "Apply refspec to exported refs"
+#: builtin/grep.c:279
+#, c-format
+msgid "invalid number of threads specified (%d) for %s"
msgstr ""
-#: builtin/fast-export.c:1026
-msgid "anonymize output"
+#. TRANSLATORS: %s is the configuration
+#. variable for tweaking threads, currently
+#. grep.threads
+#.
+#: builtin/grep.c:287 builtin/index-pack.c:1506 builtin/index-pack.c:1697
+#: builtin/pack-objects.c:2717
+#, c-format
+msgid "no threads support, ignoring %s"
msgstr ""
-#: builtin/fetch.c:27
-msgid "git fetch [<options>] [<repository> [<refspec>...]]"
+#: builtin/grep.c:466 builtin/grep.c:590 builtin/grep.c:631
+#, c-format
+msgid "unable to read tree (%s)"
msgstr ""
-#: builtin/fetch.c:28
-msgid "git fetch [<options>] <group>"
+#: builtin/grep.c:646
+#, c-format
+msgid "unable to grep from object of type %s"
msgstr ""
-#: builtin/fetch.c:29
-msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
+#: builtin/grep.c:712
+#, c-format
+msgid "switch `%c' expects a numerical value"
msgstr ""
-#: builtin/fetch.c:30
-msgid "git fetch --all [<options>]"
+#: builtin/grep.c:811
+msgid "search in index instead of in the work tree"
msgstr ""
-#: builtin/fetch.c:112 builtin/pull.c:193
-msgid "fetch from all remotes"
+#: builtin/grep.c:813
+msgid "find in contents not managed by git"
msgstr ""
-#: builtin/fetch.c:114 builtin/pull.c:196
-msgid "append to .git/FETCH_HEAD instead of overwriting"
+#: builtin/grep.c:815
+msgid "search in both tracked and untracked files"
msgstr ""
-#: builtin/fetch.c:116 builtin/pull.c:199
-msgid "path to upload pack on remote end"
+#: builtin/grep.c:817
+msgid "ignore files specified via '.gitignore'"
msgstr ""
-#: builtin/fetch.c:117 builtin/pull.c:201
-msgid "force overwrite of local branch"
+#: builtin/grep.c:819
+msgid "recursively search in each submodule"
msgstr ""
-#: builtin/fetch.c:119
-msgid "fetch from multiple remotes"
+#: builtin/grep.c:822
+msgid "show non-matching lines"
msgstr ""
-#: builtin/fetch.c:121 builtin/pull.c:203
-msgid "fetch all tags and associated objects"
+#: builtin/grep.c:824
+msgid "case insensitive matching"
msgstr ""
-#: builtin/fetch.c:123
-msgid "do not fetch all tags (--no-tags)"
+#: builtin/grep.c:826
+msgid "match patterns only at word boundaries"
msgstr ""
-#: builtin/fetch.c:125
-msgid "number of submodules fetched in parallel"
+#: builtin/grep.c:828
+msgid "process binary files as text"
msgstr ""
-#: builtin/fetch.c:127 builtin/pull.c:206
-msgid "prune remote-tracking branches no longer on remote"
+#: builtin/grep.c:830
+msgid "don't match patterns in binary files"
msgstr ""
-#: builtin/fetch.c:129
-msgid "prune local tags no longer on remote and clobber changed tags"
+#: builtin/grep.c:833
+msgid "process binary files with textconv filters"
msgstr ""
-#: builtin/fetch.c:130 builtin/fetch.c:153 builtin/pull.c:131
-msgid "on-demand"
+#: builtin/grep.c:835
+msgid "search in subdirectories (default)"
msgstr ""
-#: builtin/fetch.c:131
-msgid "control recursive fetching of submodules"
+#: builtin/grep.c:837
+msgid "descend at most <depth> levels"
msgstr ""
-#: builtin/fetch.c:135 builtin/pull.c:214
-msgid "keep downloaded pack"
+#: builtin/grep.c:841
+msgid "use extended POSIX regular expressions"
msgstr ""
-#: builtin/fetch.c:137
-msgid "allow updating of HEAD ref"
+#: builtin/grep.c:844
+msgid "use basic POSIX regular expressions (default)"
msgstr ""
-#: builtin/fetch.c:140 builtin/fetch.c:146 builtin/pull.c:217
-msgid "deepen history of shallow clone"
+#: builtin/grep.c:847
+msgid "interpret patterns as fixed strings"
msgstr ""
-#: builtin/fetch.c:142
-msgid "deepen history of shallow repository based on time"
+#: builtin/grep.c:850
+msgid "use Perl-compatible regular expressions"
msgstr ""
-#: builtin/fetch.c:148 builtin/pull.c:220
-msgid "convert to a complete repository"
+#: builtin/grep.c:853
+msgid "show line numbers"
msgstr ""
-#: builtin/fetch.c:151
-msgid "prepend this to submodule path output"
+#: builtin/grep.c:854
+msgid "show column number of first match"
msgstr ""
-#: builtin/fetch.c:154
-msgid ""
-"default for recursive fetching of submodules (lower priority than config "
-"files)"
+#: builtin/grep.c:855
+msgid "don't show filenames"
msgstr ""
-#: builtin/fetch.c:158 builtin/pull.c:223
-msgid "accept refs that update .git/shallow"
+#: builtin/grep.c:856
+msgid "show filenames"
msgstr ""
-#: builtin/fetch.c:159 builtin/pull.c:225
-msgid "refmap"
+#: builtin/grep.c:858
+msgid "show filenames relative to top directory"
msgstr ""
-#: builtin/fetch.c:160 builtin/pull.c:226
-msgid "specify fetch refmap"
+#: builtin/grep.c:860
+msgid "show only filenames instead of matching lines"
msgstr ""
-#: builtin/fetch.c:161 builtin/ls-remote.c:77 builtin/push.c:582
-#: builtin/send-pack.c:172
-msgid "server-specific"
+#: builtin/grep.c:862
+msgid "synonym for --files-with-matches"
msgstr ""
-#: builtin/fetch.c:161 builtin/ls-remote.c:77 builtin/push.c:582
-#: builtin/send-pack.c:173
-msgid "option to transmit"
+#: builtin/grep.c:865
+msgid "show only the names of files without match"
msgstr ""
-#: builtin/fetch.c:167
-msgid "report that we have only objects reachable from this object"
+#: builtin/grep.c:867
+msgid "print NUL after filenames"
msgstr ""
-#: builtin/fetch.c:418
-msgid "Couldn't find remote ref HEAD"
+#: builtin/grep.c:870
+msgid "show only matching parts of a line"
msgstr ""
-#: builtin/fetch.c:552
-#, c-format
-msgid "configuration fetch.output contains invalid value %s"
+#: builtin/grep.c:872
+msgid "show the number of matches instead of matching lines"
msgstr ""
-#: builtin/fetch.c:645
-#, c-format
-msgid "object %s not found"
+#: builtin/grep.c:873
+msgid "highlight matches"
msgstr ""
-#: builtin/fetch.c:649
-msgid "[up to date]"
+#: builtin/grep.c:875
+msgid "print empty line between matches from different files"
msgstr ""
-#: builtin/fetch.c:662 builtin/fetch.c:744
-msgid "[rejected]"
+#: builtin/grep.c:877
+msgid "show filename only once above matches from same file"
msgstr ""
-#: builtin/fetch.c:663
-msgid "can't fetch in current branch"
+#: builtin/grep.c:880
+msgid "show <n> context lines before and after matches"
msgstr ""
-#: builtin/fetch.c:672
-msgid "[tag update]"
+#: builtin/grep.c:883
+msgid "show <n> context lines before matches"
msgstr ""
-#: builtin/fetch.c:673 builtin/fetch.c:708 builtin/fetch.c:724
-#: builtin/fetch.c:739
-msgid "unable to update local ref"
+#: builtin/grep.c:885
+msgid "show <n> context lines after matches"
msgstr ""
-#: builtin/fetch.c:694
-msgid "[new tag]"
+#: builtin/grep.c:887
+msgid "use <n> worker threads"
msgstr ""
-#: builtin/fetch.c:697
-msgid "[new branch]"
+#: builtin/grep.c:888
+msgid "shortcut for -C NUM"
msgstr ""
-#: builtin/fetch.c:700
-msgid "[new ref]"
+#: builtin/grep.c:891
+msgid "show a line with the function name before matches"
msgstr ""
-#: builtin/fetch.c:739
-msgid "forced update"
+#: builtin/grep.c:893
+msgid "show the surrounding function"
msgstr ""
-#: builtin/fetch.c:744
-msgid "non-fast-forward"
+#: builtin/grep.c:896
+msgid "read patterns from file"
msgstr ""
-#: builtin/fetch.c:790
-#, c-format
-msgid "%s did not send all necessary objects\n"
+#: builtin/grep.c:898
+msgid "match <pattern>"
msgstr ""
-#: builtin/fetch.c:811
-#, c-format
-msgid "reject %s because shallow roots are not allowed to be updated"
+#: builtin/grep.c:900
+msgid "combine patterns specified with -e"
msgstr ""
-#: builtin/fetch.c:900 builtin/fetch.c:1011
-#, c-format
-msgid "From %.*s\n"
+#: builtin/grep.c:912
+msgid "indicate hit with exit status without output"
+msgstr ""
+
+#: builtin/grep.c:914
+msgid "show only matches from files that match all patterns"
+msgstr ""
+
+#: builtin/grep.c:916
+msgid "show parse tree for grep expression"
msgstr ""
-#: 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"
+#: builtin/grep.c:920
+msgid "pager"
msgstr ""
-#: builtin/fetch.c:981
-#, c-format
-msgid " (%s will become dangling)"
+#: builtin/grep.c:920
+msgid "show matching files in the pager"
msgstr ""
-#: builtin/fetch.c:982
-#, c-format
-msgid " (%s has become dangling)"
+#: builtin/grep.c:924
+msgid "allow calling of grep(1) (ignored by this build)"
msgstr ""
-#: builtin/fetch.c:1014
-msgid "[deleted]"
+#: builtin/grep.c:988
+msgid "no pattern given"
msgstr ""
-#: builtin/fetch.c:1015 builtin/remote.c:1035
-msgid "(none)"
+#: builtin/grep.c:1024
+msgid "--no-index or --untracked cannot be used with revs"
msgstr ""
-#: builtin/fetch.c:1038
+#: builtin/grep.c:1032
#, c-format
-msgid "Refusing to fetch into current branch %s of non-bare repository"
+msgid "unable to resolve revision: %s"
msgstr ""
-#: builtin/fetch.c:1057
-#, c-format
-msgid "Option \"%s\" value \"%s\" is not valid for %s"
+#: builtin/grep.c:1063
+msgid "invalid option combination, ignoring --threads"
msgstr ""
-#: builtin/fetch.c:1060
-#, c-format
-msgid "Option \"%s\" is ignored for %s\n"
+#: builtin/grep.c:1066 builtin/pack-objects.c:3400
+msgid "no threads support, ignoring --threads"
msgstr ""
-#: builtin/fetch.c:1339
+#: builtin/grep.c:1069 builtin/index-pack.c:1503 builtin/pack-objects.c:2714
#, c-format
-msgid "Fetching %s\n"
+msgid "invalid number of threads specified (%d)"
msgstr ""
-#: builtin/fetch.c:1341 builtin/remote.c:99
-#, c-format
-msgid "Could not fetch %s"
+#: builtin/grep.c:1092
+msgid "--open-files-in-pager only works on the worktree"
msgstr ""
-#: builtin/fetch.c:1387 builtin/fetch.c:1555
-msgid ""
-"--filter can only be used with the remote configured in core.partialClone"
+#: builtin/grep.c:1115
+msgid "option not supported with --recurse-submodules"
msgstr ""
-#: 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."
+#: builtin/grep.c:1121
+msgid "--cached or --untracked cannot be used with --no-index"
msgstr ""
-#: builtin/fetch.c:1447
-msgid "You need to specify a tag name."
+#: builtin/grep.c:1127
+msgid "--[no-]exclude-standard cannot be used for tracked contents"
msgstr ""
-#: builtin/fetch.c:1496
-msgid "Negative depth in --deepen is not supported"
+#: builtin/grep.c:1135
+msgid "both --cached and trees are given"
msgstr ""
-#: builtin/fetch.c:1498
-msgid "--deepen and --depth are mutually exclusive"
+#: builtin/hash-object.c:85
+msgid ""
+"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
+"[--] <file>..."
msgstr ""
-#: builtin/fetch.c:1503
-msgid "--depth and --unshallow cannot be used together"
+#: builtin/hash-object.c:86
+msgid "git hash-object --stdin-paths"
msgstr ""
-#: builtin/fetch.c:1505
-msgid "--unshallow on a complete repository does not make sense"
+#: builtin/hash-object.c:98
+msgid "type"
msgstr ""
-#: builtin/fetch.c:1521
-msgid "fetch --all does not take a repository argument"
+#: builtin/hash-object.c:98
+msgid "object type"
msgstr ""
-#: builtin/fetch.c:1523
-msgid "fetch --all does not make sense with refspecs"
+#: builtin/hash-object.c:99
+msgid "write the object into the object database"
msgstr ""
-#: builtin/fetch.c:1532
-#, c-format
-msgid "No such remote or remote group: %s"
+#: builtin/hash-object.c:101
+msgid "read the object from stdin"
msgstr ""
-#: builtin/fetch.c:1539
-msgid "Fetching a group and specifying refspecs does not make sense"
+#: builtin/hash-object.c:103
+msgid "store file as is without filters"
msgstr ""
-#: builtin/fmt-merge-msg.c:17
+#: builtin/hash-object.c:104
msgid ""
-"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
+"just hash any random garbage to create corrupt objects for debugging Git"
msgstr ""
-#: builtin/fmt-merge-msg.c:671
-msgid "populate log with at most <n> entries from shortlog"
+#: builtin/hash-object.c:105
+msgid "process file as it were from this path"
msgstr ""
-#: builtin/fmt-merge-msg.c:674
-msgid "alias for --log (deprecated)"
+#: builtin/help.c:46
+msgid "print all available commands"
msgstr ""
-#: builtin/fmt-merge-msg.c:677
-msgid "text"
+#: builtin/help.c:47
+msgid "exclude guides"
msgstr ""
-#: builtin/fmt-merge-msg.c:678
-msgid "use <text> as start of message"
+#: builtin/help.c:48
+msgid "print list of useful guides"
msgstr ""
-#: builtin/fmt-merge-msg.c:679
-msgid "file to read from"
+#: builtin/help.c:49
+msgid "print all configuration variable names"
msgstr ""
-#: builtin/for-each-ref.c:10
-msgid "git for-each-ref [<options>] [<pattern>]"
+#: builtin/help.c:51
+msgid "show man page"
msgstr ""
-#: builtin/for-each-ref.c:11
-msgid "git for-each-ref [--points-at <object>]"
+#: builtin/help.c:52
+msgid "show manual in web browser"
msgstr ""
-#: builtin/for-each-ref.c:12
-msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]"
+#: builtin/help.c:54
+msgid "show info page"
msgstr ""
-#: builtin/for-each-ref.c:13
-msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
+#: builtin/help.c:56
+msgid "print command description"
msgstr ""
-#: builtin/for-each-ref.c:28
-msgid "quote placeholders suitably for shells"
+#: builtin/help.c:61
+msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
msgstr ""
-#: builtin/for-each-ref.c:30
-msgid "quote placeholders suitably for perl"
+#: builtin/help.c:73
+#, c-format
+msgid "unrecognized help format '%s'"
msgstr ""
-#: builtin/for-each-ref.c:32
-msgid "quote placeholders suitably for python"
+#: builtin/help.c:100
+msgid "Failed to start emacsclient."
msgstr ""
-#: builtin/for-each-ref.c:34
-msgid "quote placeholders suitably for Tcl"
+#: builtin/help.c:113
+msgid "Failed to parse emacsclient version."
msgstr ""
-#: builtin/for-each-ref.c:37
-msgid "show only <n> matched refs"
+#: builtin/help.c:121
+#, c-format
+msgid "emacsclient version '%d' too old (< 22)."
msgstr ""
-#: builtin/for-each-ref.c:39 builtin/tag.c:422
-msgid "respect format colors"
+#: 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/for-each-ref.c:43
-msgid "print only refs which points at the given object"
+#: builtin/help.c:217
+#, c-format
+msgid ""
+"'%s': path for unsupported man viewer.\n"
+"Please consider using 'man.<tool>.cmd' instead."
msgstr ""
-#: builtin/for-each-ref.c:45
-msgid "print only refs that are merged"
+#: builtin/help.c:229
+#, c-format
+msgid ""
+"'%s': cmd for supported man viewer.\n"
+"Please consider using 'man.<tool>.path' instead."
msgstr ""
-#: builtin/for-each-ref.c:46
-msgid "print only refs that are not merged"
+#: builtin/help.c:346
+#, c-format
+msgid "'%s': unknown man viewer."
msgstr ""
-#: builtin/for-each-ref.c:47
-msgid "print only refs which contain the commit"
+#: builtin/help.c:363
+msgid "no man viewer handled the request"
msgstr ""
-#: builtin/for-each-ref.c:48
-msgid "print only refs which don't contain the commit"
+#: builtin/help.c:371
+msgid "no info viewer handled the request"
msgstr ""
-#: builtin/fsck.c:574
-msgid "Checking object directories"
+#: builtin/help.c:430 builtin/help.c:441 git.c:323
+#, c-format
+msgid "'%s' is aliased to '%s'"
msgstr ""
-#: builtin/fsck.c:666
-msgid "git fsck [<options>] [<object>...]"
+#: builtin/help.c:444 git.c:347
+#, c-format
+msgid "bad alias.%s string: %s"
msgstr ""
-#: builtin/fsck.c:672
-msgid "show unreachable objects"
+#: builtin/help.c:473 builtin/help.c:503
+#, c-format
+msgid "usage: %s%s"
msgstr ""
-#: builtin/fsck.c:673
-msgid "show dangling objects"
+#: builtin/help.c:487
+msgid "'git help config' for more information"
msgstr ""
-#: builtin/fsck.c:674
-msgid "report tags"
+#: builtin/index-pack.c:184
+#, c-format
+msgid "object type mismatch at %s"
msgstr ""
-#: builtin/fsck.c:675
-msgid "report root nodes"
+#: builtin/index-pack.c:204
+#, c-format
+msgid "did not receive expected object %s"
msgstr ""
-#: builtin/fsck.c:676
-msgid "make index objects head nodes"
+#: builtin/index-pack.c:207
+#, c-format
+msgid "object %s: expected type %s, found %s"
msgstr ""
-#: builtin/fsck.c:677
-msgid "make reflogs head nodes (default)"
-msgstr ""
+#: builtin/index-pack.c:249
+#, c-format
+msgid "cannot fill %d byte"
+msgid_plural "cannot fill %d bytes"
+msgstr[0] ""
+msgstr[1] ""
-#: builtin/fsck.c:678
-msgid "also consider packs and alternate objects"
+#: builtin/index-pack.c:259
+msgid "early EOF"
msgstr ""
-#: builtin/fsck.c:679
-msgid "check only connectivity"
+#: builtin/index-pack.c:260
+msgid "read error on input"
msgstr ""
-#: builtin/fsck.c:680
-msgid "enable more strict checking"
+#: builtin/index-pack.c:272
+msgid "used more bytes than were available"
msgstr ""
-#: builtin/fsck.c:682
-msgid "write dangling objects in .git/lost-found"
+#: builtin/index-pack.c:279 builtin/pack-objects.c:599
+msgid "pack too large for current definition of off_t"
msgstr ""
-#: builtin/fsck.c:683 builtin/prune.c:110
-msgid "show progress"
+#: builtin/index-pack.c:282 builtin/unpack-objects.c:94
+msgid "pack exceeds maximum allowed size"
msgstr ""
-#: builtin/fsck.c:684
-msgid "show verbose names for reachable objects"
+#: builtin/index-pack.c:297 builtin/repack.c:250
+#, c-format
+msgid "unable to create '%s'"
msgstr ""
-#: builtin/fsck.c:750
-msgid "Checking objects"
+#: builtin/index-pack.c:303
+#, c-format
+msgid "cannot open packfile '%s'"
msgstr ""
-#: builtin/gc.c:34
-msgid "git gc [<options>]"
+#: builtin/index-pack.c:317
+msgid "pack signature mismatch"
msgstr ""
-#: builtin/gc.c:90
+#: builtin/index-pack.c:319
#, c-format
-msgid "Failed to fstat %s: %s"
+msgid "pack version %<PRIu32> unsupported"
msgstr ""
-#: builtin/gc.c:455
+#: builtin/index-pack.c:337
#, c-format
-msgid "Can't stat %s"
+msgid "pack has bad object at offset %<PRIuMAX>: %s"
msgstr ""
-#: builtin/gc.c:464
+#: builtin/index-pack.c:457
#, c-format
-msgid ""
-"The last gc run reported the following. Please correct the root cause\n"
-"and remove %s.\n"
-"Automatic cleanup will not be performed until the file is removed.\n"
-"\n"
-"%s"
+msgid "inflate returned %d"
msgstr ""
-#: builtin/gc.c:505
-msgid "prune unreferenced objects"
+#: builtin/index-pack.c:506
+msgid "offset value overflow for delta base object"
msgstr ""
-#: builtin/gc.c:507
-msgid "be more thorough (increased runtime)"
+#: builtin/index-pack.c:514
+msgid "delta base offset is out of bound"
msgstr ""
-#: builtin/gc.c:508
-msgid "enable auto-gc mode"
+#: builtin/index-pack.c:522
+#, c-format
+msgid "unknown object type %d"
msgstr ""
-#: builtin/gc.c:511
-msgid "force running gc even if there may be another gc running"
+#: builtin/index-pack.c:553
+msgid "cannot pread pack file"
msgstr ""
-#: builtin/gc.c:514
-msgid "repack all other packs except the largest pack"
+#: builtin/index-pack.c:555
+#, c-format
+msgid "premature end of pack file, %<PRIuMAX> byte missing"
+msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/index-pack.c:581
+msgid "serious inflate inconsistency"
msgstr ""
-#: builtin/gc.c:531
+#: builtin/index-pack.c:726 builtin/index-pack.c:732 builtin/index-pack.c:755
+#: builtin/index-pack.c:794 builtin/index-pack.c:803
#, c-format
-msgid "failed to parse gc.logexpiry value %s"
+msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr ""
-#: builtin/gc.c:542
+#: builtin/index-pack.c:729 builtin/pack-objects.c:152
+#: builtin/pack-objects.c:212 builtin/pack-objects.c:306
#, c-format
-msgid "failed to parse prune expiry value %s"
+msgid "unable to read %s"
msgstr ""
-#: builtin/gc.c:562
+#: builtin/index-pack.c:792
#, c-format
-msgid "Auto packing the repository in background for optimum performance.\n"
+msgid "cannot read existing object info %s"
msgstr ""
-#: builtin/gc.c:564
+#: builtin/index-pack.c:800
#, c-format
-msgid "Auto packing the repository for optimum performance.\n"
+msgid "cannot read existing object %s"
msgstr ""
-#: builtin/gc.c:565
+#: builtin/index-pack.c:814
#, c-format
-msgid "See \"git help gc\" for manual housekeeping.\n"
+msgid "invalid blob object %s"
msgstr ""
-#: builtin/gc.c:601
+#: builtin/index-pack.c:817 builtin/index-pack.c:836
+msgid "fsck error in packed object"
+msgstr ""
+
+#: builtin/index-pack.c:838
#, c-format
-msgid ""
-"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
+msgid "Not all child objects of %s are reachable"
+msgstr ""
+
+#: builtin/index-pack.c:910 builtin/index-pack.c:941
+msgid "failed to apply delta"
+msgstr ""
+
+#: builtin/index-pack.c:1109
+msgid "Receiving objects"
+msgstr ""
+
+#: builtin/index-pack.c:1109
+msgid "Indexing objects"
+msgstr ""
+
+#: builtin/index-pack.c:1143
+msgid "pack is corrupted (SHA1 mismatch)"
+msgstr ""
+
+#: builtin/index-pack.c:1148
+msgid "cannot fstat packfile"
+msgstr ""
+
+#: builtin/index-pack.c:1151
+msgid "pack has junk at the end"
msgstr ""
-#: builtin/gc.c:652
-msgid ""
-"There are too many unreachable loose objects; run 'git prune' to remove them."
+#: builtin/index-pack.c:1163
+msgid "confusion beyond insanity in parse_pack_objects()"
msgstr ""
-#: builtin/grep.c:28
-msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
+#: builtin/index-pack.c:1186
+msgid "Resolving deltas"
msgstr ""
-#: builtin/grep.c:226
+#: builtin/index-pack.c:1196 builtin/pack-objects.c:2486
#, c-format
-msgid "grep: failed to create thread: %s"
+msgid "unable to create thread: %s"
msgstr ""
-#: builtin/grep.c:284
-#, c-format
-msgid "invalid number of threads specified (%d) for %s"
+#: builtin/index-pack.c:1237
+msgid "confusion beyond insanity"
msgstr ""
-#. TRANSLATORS: %s is the configuration
-#. variable for tweaking threads, currently
-#. grep.threads
-#.
-#: builtin/grep.c:293 builtin/index-pack.c:1536 builtin/index-pack.c:1728
-#: builtin/pack-objects.c:2636
+#: builtin/index-pack.c:1243
#, c-format
-msgid "no threads support, ignoring %s"
-msgstr ""
+msgid "completed with %d local object"
+msgid_plural "completed with %d local objects"
+msgstr[0] ""
+msgstr[1] ""
-#: builtin/grep.c:461 builtin/grep.c:582 builtin/grep.c:623
+#: builtin/index-pack.c:1255
#, c-format
-msgid "unable to read tree (%s)"
+msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr ""
-#: builtin/grep.c:638
+#: builtin/index-pack.c:1259
#, c-format
-msgid "unable to grep from object of type %s"
-msgstr ""
+msgid "pack has %d unresolved delta"
+msgid_plural "pack has %d unresolved deltas"
+msgstr[0] ""
+msgstr[1] ""
-#: builtin/grep.c:704
+#: builtin/index-pack.c:1283
#, c-format
-msgid "switch `%c' expects a numerical value"
+msgid "unable to deflate appended object (%d)"
msgstr ""
-#: builtin/grep.c:791
-msgid "search in index instead of in the work tree"
+#: builtin/index-pack.c:1360
+#, c-format
+msgid "local object %s is corrupt"
msgstr ""
-#: builtin/grep.c:793
-msgid "find in contents not managed by git"
+#: builtin/index-pack.c:1374
+#, c-format
+msgid "packfile name '%s' does not end with '.pack'"
msgstr ""
-#: builtin/grep.c:795
-msgid "search in both tracked and untracked files"
+#: builtin/index-pack.c:1399
+#, c-format
+msgid "cannot write %s file '%s'"
msgstr ""
-#: builtin/grep.c:797
-msgid "ignore files specified via '.gitignore'"
+#: builtin/index-pack.c:1407
+#, c-format
+msgid "cannot close written %s file '%s'"
msgstr ""
-#: builtin/grep.c:799
-msgid "recursively search in each submodule"
+#: builtin/index-pack.c:1431
+msgid "error while closing pack file"
msgstr ""
-#: builtin/grep.c:802
-msgid "show non-matching lines"
+#: builtin/index-pack.c:1445
+msgid "cannot store pack file"
msgstr ""
-#: builtin/grep.c:804
-msgid "case insensitive matching"
+#: builtin/index-pack.c:1453
+msgid "cannot store index file"
msgstr ""
-#: builtin/grep.c:806
-msgid "match patterns only at word boundaries"
+#: builtin/index-pack.c:1497 builtin/pack-objects.c:2725
+#, c-format
+msgid "bad pack.indexversion=%<PRIu32>"
msgstr ""
-#: builtin/grep.c:808
-msgid "process binary files as text"
+#: builtin/index-pack.c:1565
+#, c-format
+msgid "Cannot open existing pack file '%s'"
msgstr ""
-#: builtin/grep.c:810
-msgid "don't match patterns in binary files"
+#: builtin/index-pack.c:1567
+#, c-format
+msgid "Cannot open existing pack idx file for '%s'"
msgstr ""
-#: builtin/grep.c:813
-msgid "process binary files with textconv filters"
-msgstr ""
+#: builtin/index-pack.c:1615
+#, c-format
+msgid "non delta: %d object"
+msgid_plural "non delta: %d objects"
+msgstr[0] ""
+msgstr[1] ""
-#: builtin/grep.c:815
-msgid "descend at most <depth> levels"
-msgstr ""
+#: builtin/index-pack.c:1622
+#, c-format
+msgid "chain length = %d: %lu object"
+msgid_plural "chain length = %d: %lu objects"
+msgstr[0] ""
+msgstr[1] ""
-#: builtin/grep.c:819
-msgid "use extended POSIX regular expressions"
+#: builtin/index-pack.c:1659
+msgid "Cannot come back to cwd"
msgstr ""
-#: builtin/grep.c:822
-msgid "use basic POSIX regular expressions (default)"
+#: builtin/index-pack.c:1708 builtin/index-pack.c:1711
+#: builtin/index-pack.c:1727 builtin/index-pack.c:1731
+#, c-format
+msgid "bad %s"
msgstr ""
-#: builtin/grep.c:825
-msgid "interpret patterns as fixed strings"
+#: builtin/index-pack.c:1747
+msgid "--fix-thin cannot be used without --stdin"
msgstr ""
-#: builtin/grep.c:828
-msgid "use Perl-compatible regular expressions"
+#: builtin/index-pack.c:1749
+msgid "--stdin requires a git repository"
msgstr ""
-#: builtin/grep.c:831
-msgid "show line numbers"
+#: builtin/index-pack.c:1755
+msgid "--verify with no packfile name given"
msgstr ""
-#: builtin/grep.c:832
-msgid "show column number of first match"
+#: builtin/index-pack.c:1803 builtin/unpack-objects.c:580
+msgid "fsck error in pack objects"
msgstr ""
-#: builtin/grep.c:833
-msgid "don't show filenames"
+#: builtin/init-db.c:61
+#, c-format
+msgid "cannot stat template '%s'"
msgstr ""
-#: builtin/grep.c:834
-msgid "show filenames"
+#: builtin/init-db.c:66
+#, c-format
+msgid "cannot opendir '%s'"
msgstr ""
-#: builtin/grep.c:836
-msgid "show filenames relative to top directory"
+#: builtin/init-db.c:78
+#, c-format
+msgid "cannot readlink '%s'"
msgstr ""
-#: builtin/grep.c:838
-msgid "show only filenames instead of matching lines"
+#: builtin/init-db.c:80
+#, c-format
+msgid "cannot symlink '%s' '%s'"
msgstr ""
-#: builtin/grep.c:840
-msgid "synonym for --files-with-matches"
+#: builtin/init-db.c:86
+#, c-format
+msgid "cannot copy '%s' to '%s'"
msgstr ""
-#: builtin/grep.c:843
-msgid "show only the names of files without match"
+#: builtin/init-db.c:90
+#, c-format
+msgid "ignoring template %s"
msgstr ""
-#: builtin/grep.c:845
-msgid "print NUL after filenames"
+#: builtin/init-db.c:121
+#, c-format
+msgid "templates not found in %s"
msgstr ""
-#: builtin/grep.c:848
-msgid "show only matching parts of a line"
+#: builtin/init-db.c:136
+#, c-format
+msgid "not copying templates from '%s': %s"
msgstr ""
-#: builtin/grep.c:850
-msgid "show the number of matches instead of matching lines"
+#: builtin/init-db.c:329
+#, c-format
+msgid "unable to handle file type %d"
msgstr ""
-#: builtin/grep.c:851
-msgid "highlight matches"
+#: builtin/init-db.c:332
+#, c-format
+msgid "unable to move %s to %s"
msgstr ""
-#: builtin/grep.c:853
-msgid "print empty line between matches from different files"
+#: builtin/init-db.c:349 builtin/init-db.c:352
+#, c-format
+msgid "%s already exists"
msgstr ""
-#: builtin/grep.c:855
-msgid "show filename only once above matches from same file"
+#: builtin/init-db.c:405
+#, c-format
+msgid "Reinitialized existing shared Git repository in %s%s\n"
msgstr ""
-#: builtin/grep.c:858
-msgid "show <n> context lines before and after matches"
+#: builtin/init-db.c:406
+#, c-format
+msgid "Reinitialized existing Git repository in %s%s\n"
msgstr ""
-#: builtin/grep.c:861
-msgid "show <n> context lines before matches"
+#: builtin/init-db.c:410
+#, c-format
+msgid "Initialized empty shared Git repository in %s%s\n"
msgstr ""
-#: builtin/grep.c:863
-msgid "show <n> context lines after matches"
+#: builtin/init-db.c:411
+#, c-format
+msgid "Initialized empty Git repository in %s%s\n"
msgstr ""
-#: builtin/grep.c:865
-msgid "use <n> worker threads"
+#: builtin/init-db.c:460
+msgid ""
+"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
+"shared[=<permissions>]] [<directory>]"
msgstr ""
-#: builtin/grep.c:866
-msgid "shortcut for -C NUM"
+#: builtin/init-db.c:483
+msgid "permissions"
msgstr ""
-#: builtin/grep.c:869
-msgid "show a line with the function name before matches"
+#: builtin/init-db.c:484
+msgid "specify that the git repository is to be shared amongst several users"
msgstr ""
-#: builtin/grep.c:871
-msgid "show the surrounding function"
+#: builtin/init-db.c:518 builtin/init-db.c:523
+#, c-format
+msgid "cannot mkdir %s"
msgstr ""
-#: builtin/grep.c:874
-msgid "read patterns from file"
+#: builtin/init-db.c:527
+#, c-format
+msgid "cannot chdir to %s"
msgstr ""
-#: builtin/grep.c:876
-msgid "match <pattern>"
+#: builtin/init-db.c:548
+#, c-format
+msgid ""
+"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
+"dir=<directory>)"
msgstr ""
-#: builtin/grep.c:878
-msgid "combine patterns specified with -e"
+#: builtin/init-db.c:576
+#, c-format
+msgid "Cannot access work tree '%s'"
msgstr ""
-#: builtin/grep.c:890
-msgid "indicate hit with exit status without output"
+#: builtin/interpret-trailers.c:15
+msgid ""
+"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
+"<token>[(=|:)<value>])...] [<file>...]"
msgstr ""
-#: builtin/grep.c:892
-msgid "show only matches from files that match all patterns"
+#: builtin/interpret-trailers.c:94
+msgid "edit files in place"
msgstr ""
-#: builtin/grep.c:894
-msgid "show parse tree for grep expression"
+#: builtin/interpret-trailers.c:95
+msgid "trim empty trailers"
msgstr ""
-#: builtin/grep.c:898
-msgid "pager"
+#: builtin/interpret-trailers.c:98
+msgid "where to place the new trailer"
msgstr ""
-#: builtin/grep.c:898
-msgid "show matching files in the pager"
+#: builtin/interpret-trailers.c:100
+msgid "action if trailer already exists"
msgstr ""
-#: builtin/grep.c:902
-msgid "allow calling of grep(1) (ignored by this build)"
+#: builtin/interpret-trailers.c:102
+msgid "action if trailer is missing"
msgstr ""
-#: builtin/grep.c:966
-msgid "no pattern given"
+#: builtin/interpret-trailers.c:104
+msgid "output only the trailers"
msgstr ""
-#: builtin/grep.c:1002
-msgid "--no-index or --untracked cannot be used with revs"
+#: builtin/interpret-trailers.c:105
+msgid "do not apply config rules"
msgstr ""
-#: builtin/grep.c:1009
-#, c-format
-msgid "unable to resolve revision: %s"
+#: builtin/interpret-trailers.c:106
+msgid "join whitespace-continued values"
msgstr ""
-#: builtin/grep.c:1044 builtin/index-pack.c:1532 builtin/pack-objects.c:2632
-#, c-format
-msgid "invalid number of threads specified (%d)"
+#: builtin/interpret-trailers.c:107
+msgid "set parsing options"
msgstr ""
-#: builtin/grep.c:1049 builtin/pack-objects.c:3286
-msgid "no threads support, ignoring --threads"
+#: builtin/interpret-trailers.c:109
+msgid "do not treat --- specially"
msgstr ""
-#: builtin/grep.c:1073
-msgid "--open-files-in-pager only works on the worktree"
+#: builtin/interpret-trailers.c:110
+msgid "trailer"
msgstr ""
-#: builtin/grep.c:1096
-msgid "option not supported with --recurse-submodules"
+#: builtin/interpret-trailers.c:111
+msgid "trailer(s) to add"
msgstr ""
-#: builtin/grep.c:1102
-msgid "--cached or --untracked cannot be used with --no-index"
+#: builtin/interpret-trailers.c:120
+msgid "--trailer with --only-input does not make sense"
msgstr ""
-#: builtin/grep.c:1108
-msgid "--[no-]exclude-standard cannot be used for tracked contents"
+#: builtin/interpret-trailers.c:130
+msgid "no input file given for in-place editing"
msgstr ""
-#: builtin/grep.c:1116
-msgid "both --cached and trees are given"
+#: builtin/log.c:55
+msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
msgstr ""
-#: builtin/hash-object.c:84
-msgid ""
-"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
-"[--] <file>..."
+#: builtin/log.c:56
+msgid "git show [<options>] <object>..."
msgstr ""
-#: builtin/hash-object.c:85
-msgid "git hash-object --stdin-paths"
+#: builtin/log.c:100
+#, c-format
+msgid "invalid --decorate option: %s"
msgstr ""
-#: builtin/hash-object.c:97
-msgid "type"
+#: builtin/log.c:163
+msgid "suppress diff output"
msgstr ""
-#: builtin/hash-object.c:97
-msgid "object type"
+#: builtin/log.c:164
+msgid "show source"
msgstr ""
-#: builtin/hash-object.c:98
-msgid "write the object into the object database"
+#: builtin/log.c:165
+msgid "Use mail map file"
msgstr ""
-#: builtin/hash-object.c:100
-msgid "read the object from stdin"
+#: builtin/log.c:167
+msgid "only decorate refs that match <pattern>"
msgstr ""
-#: builtin/hash-object.c:102
-msgid "store file as is without filters"
+#: builtin/log.c:169
+msgid "do not decorate refs that match <pattern>"
msgstr ""
-#: builtin/hash-object.c:103
-msgid ""
-"just hash any random garbage to create corrupt objects for debugging Git"
+#: builtin/log.c:170
+msgid "decorate options"
msgstr ""
-#: builtin/hash-object.c:104
-msgid "process file as it were from this path"
+#: builtin/log.c:173
+msgid "Process line range n,m in file, counting from 1"
msgstr ""
-#: builtin/help.c:46
-msgid "print all available commands"
+#: builtin/log.c:271
+#, c-format
+msgid "Final output: %d %s\n"
+msgstr ""
+
+#: builtin/log.c:525
+#, c-format
+msgid "git show %s: bad file"
msgstr ""
-#: builtin/help.c:47
-msgid "exclude guides"
+#: builtin/log.c:540 builtin/log.c:634
+#, c-format
+msgid "Could not read object %s"
msgstr ""
-#: builtin/help.c:48
-msgid "print list of useful guides"
+#: builtin/log.c:659
+#, c-format
+msgid "Unknown type: %d"
msgstr ""
-#: builtin/help.c:49
-msgid "print all configuration variable names"
+#: builtin/log.c:780
+msgid "format.headers without value"
msgstr ""
-#: builtin/help.c:51
-msgid "show man page"
+#: builtin/log.c:881
+msgid "name of output directory is too long"
msgstr ""
-#: builtin/help.c:52
-msgid "show manual in web browser"
+#: builtin/log.c:897
+#, c-format
+msgid "Cannot open patch file %s"
msgstr ""
-#: builtin/help.c:54
-msgid "show info page"
+#: builtin/log.c:914
+msgid "Need exactly one range."
msgstr ""
-#: builtin/help.c:56
-msgid "print command description"
+#: builtin/log.c:924
+msgid "Not a range."
msgstr ""
-#: builtin/help.c:61
-msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
+#: builtin/log.c:1047
+msgid "Cover letter needs email format"
msgstr ""
-#: builtin/help.c:73
+#: builtin/log.c:1132
#, c-format
-msgid "unrecognized help format '%s'"
+msgid "insane in-reply-to: %s"
msgstr ""
-#: builtin/help.c:100
-msgid "Failed to start emacsclient."
+#: builtin/log.c:1159
+msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr ""
-#: builtin/help.c:113
-msgid "Failed to parse emacsclient version."
+#: builtin/log.c:1217
+msgid "Two output directories?"
msgstr ""
-#: builtin/help.c:121
+#: builtin/log.c:1324 builtin/log.c:2068 builtin/log.c:2070 builtin/log.c:2082
#, c-format
-msgid "emacsclient version '%d' too old (< 22)."
+msgid "Unknown commit %s"
msgstr ""
-#: builtin/help.c:139 builtin/help.c:161 builtin/help.c:171 builtin/help.c:179
+#: builtin/log.c:1334 builtin/notes.c:897 builtin/tag.c:526
#, c-format
-msgid "failed to exec '%s'"
+msgid "Failed to resolve '%s' as a valid ref."
msgstr ""
-#: builtin/help.c:217
-#, c-format
-msgid ""
-"'%s': path for unsupported man viewer.\n"
-"Please consider using 'man.<tool>.cmd' instead."
+#: builtin/log.c:1339
+msgid "Could not find exact merge base."
msgstr ""
-#: builtin/help.c:229
-#, c-format
+#: builtin/log.c:1343
msgid ""
-"'%s': cmd for supported man viewer.\n"
-"Please consider using 'man.<tool>.path' instead."
+"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/help.c:346
-#, c-format
-msgid "'%s': unknown man viewer."
+#: builtin/log.c:1363
+msgid "Failed to find exact merge base"
msgstr ""
-#: builtin/help.c:363
-msgid "no man viewer handled the request"
+#: builtin/log.c:1374
+msgid "base commit should be the ancestor of revision list"
msgstr ""
-#: builtin/help.c:371
-msgid "no info viewer handled the request"
+#: builtin/log.c:1378
+msgid "base commit shouldn't be in revision list"
msgstr ""
-#: builtin/help.c:418
-#, c-format
-msgid "'%s' is aliased to '%s'"
+#: builtin/log.c:1431
+msgid "cannot get patch id"
msgstr ""
-#: builtin/help.c:445 builtin/help.c:475
-#, c-format
-msgid "usage: %s%s"
+#: builtin/log.c:1483
+msgid "failed to infer range-diff ranges"
msgstr ""
-#: builtin/help.c:459
-msgid "'git help config' for more information"
+#: builtin/log.c:1528
+msgid "use [PATCH n/m] even with a single patch"
msgstr ""
-#: builtin/index-pack.c:208
-#, c-format
-msgid "object type mismatch at %s"
+#: builtin/log.c:1531
+msgid "use [PATCH] even with multiple patches"
msgstr ""
-#: builtin/index-pack.c:228
-#, c-format
-msgid "did not receive expected object %s"
+#: builtin/log.c:1535
+msgid "print patches to standard out"
msgstr ""
-#: builtin/index-pack.c:231
-#, c-format
-msgid "object %s: expected type %s, found %s"
+#: builtin/log.c:1537
+msgid "generate a cover letter"
msgstr ""
-#: builtin/index-pack.c:273
-#, c-format
-msgid "cannot fill %d byte"
-msgid_plural "cannot fill %d bytes"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/index-pack.c:283
-msgid "early EOF"
+#: builtin/log.c:1539
+msgid "use simple number sequence for output file names"
msgstr ""
-#: builtin/index-pack.c:284
-msgid "read error on input"
+#: builtin/log.c:1540
+msgid "sfx"
msgstr ""
-#: builtin/index-pack.c:296
-msgid "used more bytes than were available"
+#: builtin/log.c:1541
+msgid "use <sfx> instead of '.patch'"
msgstr ""
-#: builtin/index-pack.c:303 builtin/pack-objects.c:590
-msgid "pack too large for current definition of off_t"
+#: builtin/log.c:1543
+msgid "start numbering patches at <n> instead of 1"
msgstr ""
-#: builtin/index-pack.c:306 builtin/unpack-objects.c:94
-msgid "pack exceeds maximum allowed size"
+#: builtin/log.c:1545
+msgid "mark the series as Nth re-roll"
msgstr ""
-#: builtin/index-pack.c:321
-#, c-format
-msgid "unable to create '%s'"
+#: builtin/log.c:1547
+msgid "Use [RFC PATCH] instead of [PATCH]"
msgstr ""
-#: builtin/index-pack.c:327
-#, c-format
-msgid "cannot open packfile '%s'"
+#: builtin/log.c:1550
+msgid "Use [<prefix>] instead of [PATCH]"
msgstr ""
-#: builtin/index-pack.c:341
-msgid "pack signature mismatch"
+#: builtin/log.c:1553
+msgid "store resulting files in <dir>"
msgstr ""
-#: builtin/index-pack.c:343
-#, c-format
-msgid "pack version %<PRIu32> unsupported"
+#: builtin/log.c:1556
+msgid "don't strip/add [PATCH]"
msgstr ""
-#: builtin/index-pack.c:361
-#, c-format
-msgid "pack has bad object at offset %<PRIuMAX>: %s"
+#: builtin/log.c:1559
+msgid "don't output binary diffs"
msgstr ""
-#: builtin/index-pack.c:482
-#, c-format
-msgid "inflate returned %d"
+#: builtin/log.c:1561
+msgid "output all-zero hash in From header"
msgstr ""
-#: builtin/index-pack.c:531
-msgid "offset value overflow for delta base object"
+#: builtin/log.c:1563
+msgid "don't include a patch matching a commit upstream"
msgstr ""
-#: builtin/index-pack.c:539
-msgid "delta base offset is out of bound"
+#: builtin/log.c:1565
+msgid "show patch format instead of default (patch + stat)"
msgstr ""
-#: builtin/index-pack.c:547
-#, c-format
-msgid "unknown object type %d"
+#: builtin/log.c:1567
+msgid "Messaging"
msgstr ""
-#: builtin/index-pack.c:578
-msgid "cannot pread pack file"
+#: builtin/log.c:1568
+msgid "header"
msgstr ""
-#: builtin/index-pack.c:580
-#, c-format
-msgid "premature end of pack file, %<PRIuMAX> byte missing"
-msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/index-pack.c:606
-msgid "serious inflate inconsistency"
+#: builtin/log.c:1569
+msgid "add email header"
msgstr ""
-#: builtin/index-pack.c:751 builtin/index-pack.c:757 builtin/index-pack.c:780
-#: builtin/index-pack.c:819 builtin/index-pack.c:828
-#, c-format
-msgid "SHA1 COLLISION FOUND WITH %s !"
+#: builtin/log.c:1570 builtin/log.c:1572
+msgid "email"
msgstr ""
-#: 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"
+#: builtin/log.c:1570
+msgid "add To: header"
msgstr ""
-#: builtin/index-pack.c:817
-#, c-format
-msgid "cannot read existing object info %s"
+#: builtin/log.c:1572
+msgid "add Cc: header"
msgstr ""
-#: builtin/index-pack.c:825
-#, c-format
-msgid "cannot read existing object %s"
+#: builtin/log.c:1574
+msgid "ident"
msgstr ""
-#: builtin/index-pack.c:839
-#, c-format
-msgid "invalid blob object %s"
+#: builtin/log.c:1575
+msgid "set From address to <ident> (or committer ident if absent)"
msgstr ""
-#: builtin/index-pack.c:842 builtin/index-pack.c:861
-msgid "fsck error in packed object"
+#: builtin/log.c:1577
+msgid "message-id"
msgstr ""
-#: builtin/index-pack.c:858
-#, c-format
-msgid "invalid %s"
+#: builtin/log.c:1578
+msgid "make first mail a reply to <message-id>"
msgstr ""
-#: builtin/index-pack.c:863
-#, c-format
-msgid "Not all child objects of %s are reachable"
+#: builtin/log.c:1579 builtin/log.c:1582
+msgid "boundary"
msgstr ""
-#: builtin/index-pack.c:935 builtin/index-pack.c:966
-msgid "failed to apply delta"
+#: builtin/log.c:1580
+msgid "attach the patch"
msgstr ""
-#: builtin/index-pack.c:1136
-msgid "Receiving objects"
+#: builtin/log.c:1583
+msgid "inline the patch"
msgstr ""
-#: builtin/index-pack.c:1136
-msgid "Indexing objects"
+#: builtin/log.c:1587
+msgid "enable message threading, styles: shallow, deep"
msgstr ""
-#: builtin/index-pack.c:1170
-msgid "pack is corrupted (SHA1 mismatch)"
+#: builtin/log.c:1589
+msgid "signature"
msgstr ""
-#: builtin/index-pack.c:1175
-msgid "cannot fstat packfile"
+#: builtin/log.c:1590
+msgid "add a signature"
msgstr ""
-#: builtin/index-pack.c:1178
-msgid "pack has junk at the end"
+#: builtin/log.c:1591
+msgid "base-commit"
msgstr ""
-#: builtin/index-pack.c:1190
-msgid "confusion beyond insanity in parse_pack_objects()"
+#: builtin/log.c:1592
+msgid "add prerequisite tree info to the patch series"
msgstr ""
-#: builtin/index-pack.c:1213
-msgid "Resolving deltas"
+#: builtin/log.c:1594
+msgid "add a signature from a file"
msgstr ""
-#: builtin/index-pack.c:1224 builtin/pack-objects.c:2407
-#, c-format
-msgid "unable to create thread: %s"
+#: builtin/log.c:1595
+msgid "don't print the patch filenames"
msgstr ""
-#: builtin/index-pack.c:1266
-msgid "confusion beyond insanity"
+#: builtin/log.c:1597
+msgid "show progress while generating patches"
msgstr ""
-#: 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/log.c:1598
+msgid "rev"
+msgstr ""
-#: builtin/index-pack.c:1284
-#, c-format
-msgid "Unexpected tail checksum for %s (disk corruption?)"
+#: builtin/log.c:1599
+msgid "show changes against <rev> in cover letter or single patch"
msgstr ""
-#: 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/log.c:1602
+msgid "show changes against <refspec> in cover letter or single patch"
+msgstr ""
-#: builtin/index-pack.c:1312
-#, c-format
-msgid "unable to deflate appended object (%d)"
+#: builtin/log.c:1604
+msgid "percentage by which creation is weighted"
msgstr ""
-#: builtin/index-pack.c:1389
+#: builtin/log.c:1679
#, c-format
-msgid "local object %s is corrupt"
+msgid "invalid ident line: %s"
msgstr ""
-#: builtin/index-pack.c:1403
-#, c-format
-msgid "packfile name '%s' does not end with '.pack'"
+#: builtin/log.c:1694
+msgid "-n and -k are mutually exclusive"
msgstr ""
-#: builtin/index-pack.c:1428
-#, c-format
-msgid "cannot write %s file '%s'"
+#: builtin/log.c:1696
+msgid "--subject-prefix/--rfc and -k are mutually exclusive"
msgstr ""
-#: builtin/index-pack.c:1436
-#, c-format
-msgid "cannot close written %s file '%s'"
+#: builtin/log.c:1704
+msgid "--name-only does not make sense"
msgstr ""
-#: builtin/index-pack.c:1460
-msgid "error while closing pack file"
+#: builtin/log.c:1706
+msgid "--name-status does not make sense"
msgstr ""
-#: builtin/index-pack.c:1474
-msgid "cannot store pack file"
+#: builtin/log.c:1708
+msgid "--check does not make sense"
msgstr ""
-#: builtin/index-pack.c:1482
-msgid "cannot store index file"
+#: builtin/log.c:1740
+msgid "standard output, or directory, which one?"
msgstr ""
-#: builtin/index-pack.c:1526 builtin/pack-objects.c:2645
+#: builtin/log.c:1742
#, c-format
-msgid "bad pack.indexversion=%<PRIu32>"
+msgid "Could not create directory '%s'"
msgstr ""
-#: builtin/index-pack.c:1595
-#, c-format
-msgid "Cannot open existing pack file '%s'"
+#: builtin/log.c:1829
+msgid "--interdiff requires --cover-letter or single patch"
msgstr ""
-#: builtin/index-pack.c:1597
-#, c-format
-msgid "Cannot open existing pack idx file for '%s'"
+#: builtin/log.c:1833
+msgid "Interdiff:"
msgstr ""
-#: builtin/index-pack.c:1645
+#: builtin/log.c:1834
#, c-format
-msgid "non delta: %d object"
-msgid_plural "non delta: %d objects"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Interdiff against v%d:"
+msgstr ""
-#: 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/log.c:1840
+msgid "--creation-factor requires --range-diff"
+msgstr ""
-#: builtin/index-pack.c:1689
-msgid "Cannot come back to cwd"
+#: builtin/log.c:1844
+msgid "--range-diff requires --cover-letter or single patch"
+msgstr ""
+
+#: builtin/log.c:1852
+msgid "Range-diff:"
msgstr ""
-#: builtin/index-pack.c:1740 builtin/index-pack.c:1743
-#: builtin/index-pack.c:1759 builtin/index-pack.c:1763
+#: builtin/log.c:1853
#, c-format
-msgid "bad %s"
+msgid "Range-diff against v%d:"
msgstr ""
-#: builtin/index-pack.c:1779
-msgid "--fix-thin cannot be used without --stdin"
+#: builtin/log.c:1864
+#, c-format
+msgid "unable to read signature file '%s'"
msgstr ""
-#: builtin/index-pack.c:1781
-msgid "--stdin requires a git repository"
+#: builtin/log.c:1900
+msgid "Generating patches"
msgstr ""
-#: builtin/index-pack.c:1787
-msgid "--verify with no packfile name given"
+#: builtin/log.c:1944
+msgid "Failed to create output files"
msgstr ""
-#: builtin/index-pack.c:1837 builtin/unpack-objects.c:580
-msgid "fsck error in pack objects"
+#: builtin/log.c:2003
+msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr ""
-#: builtin/init-db.c:55
+#: builtin/log.c:2057
#, c-format
-msgid "cannot stat '%s'"
+msgid ""
+"Could not find a tracked remote branch, please specify <upstream> manually.\n"
msgstr ""
-#: builtin/init-db.c:61
-#, c-format
-msgid "cannot stat template '%s'"
+#: builtin/ls-files.c:470
+msgid "git ls-files [<options>] [<file>...]"
+msgstr ""
+
+#: builtin/ls-files.c:526
+msgid "identify the file status with tags"
msgstr ""
-#: builtin/init-db.c:66
-#, c-format
-msgid "cannot opendir '%s'"
+#: builtin/ls-files.c:528
+msgid "use lowercase letters for 'assume unchanged' files"
msgstr ""
-#: builtin/init-db.c:78
-#, c-format
-msgid "cannot readlink '%s'"
+#: builtin/ls-files.c:530
+msgid "use lowercase letters for 'fsmonitor clean' files"
msgstr ""
-#: builtin/init-db.c:80
-#, c-format
-msgid "cannot symlink '%s' '%s'"
+#: builtin/ls-files.c:532
+msgid "show cached files in the output (default)"
msgstr ""
-#: builtin/init-db.c:86
-#, c-format
-msgid "cannot copy '%s' to '%s'"
+#: builtin/ls-files.c:534
+msgid "show deleted files in the output"
msgstr ""
-#: builtin/init-db.c:90
-#, c-format
-msgid "ignoring template %s"
+#: builtin/ls-files.c:536
+msgid "show modified files in the output"
msgstr ""
-#: builtin/init-db.c:121
-#, c-format
-msgid "templates not found in %s"
+#: builtin/ls-files.c:538
+msgid "show other files in the output"
msgstr ""
-#: builtin/init-db.c:136
-#, c-format
-msgid "not copying templates from '%s': %s"
+#: builtin/ls-files.c:540
+msgid "show ignored files in the output"
msgstr ""
-#: builtin/init-db.c:329
-#, c-format
-msgid "unable to handle file type %d"
+#: builtin/ls-files.c:543
+msgid "show staged contents' object name in the output"
msgstr ""
-#: builtin/init-db.c:332
-#, c-format
-msgid "unable to move %s to %s"
+#: builtin/ls-files.c:545
+msgid "show files on the filesystem that need to be removed"
msgstr ""
-#: builtin/init-db.c:349 builtin/init-db.c:352
-#, c-format
-msgid "%s already exists"
+#: builtin/ls-files.c:547
+msgid "show 'other' directories' names only"
msgstr ""
-#: builtin/init-db.c:405
-#, c-format
-msgid "Reinitialized existing shared Git repository in %s%s\n"
+#: builtin/ls-files.c:549
+msgid "show line endings of files"
msgstr ""
-#: builtin/init-db.c:406
-#, c-format
-msgid "Reinitialized existing Git repository in %s%s\n"
+#: builtin/ls-files.c:551
+msgid "don't show empty directories"
msgstr ""
-#: builtin/init-db.c:410
-#, c-format
-msgid "Initialized empty shared Git repository in %s%s\n"
+#: builtin/ls-files.c:554
+msgid "show unmerged files in the output"
msgstr ""
-#: builtin/init-db.c:411
-#, c-format
-msgid "Initialized empty Git repository in %s%s\n"
+#: builtin/ls-files.c:556
+msgid "show resolve-undo information"
msgstr ""
-#: builtin/init-db.c:459
-msgid ""
-"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
-"shared[=<permissions>]] [<directory>]"
+#: builtin/ls-files.c:558
+msgid "skip files matching pattern"
msgstr ""
-#: builtin/init-db.c:482
-msgid "permissions"
+#: builtin/ls-files.c:561
+msgid "exclude patterns are read from <file>"
msgstr ""
-#: builtin/init-db.c:483
-msgid "specify that the git repository is to be shared amongst several users"
+#: builtin/ls-files.c:564
+msgid "read additional per-directory exclude patterns in <file>"
msgstr ""
-#: builtin/init-db.c:517 builtin/init-db.c:522
-#, c-format
-msgid "cannot mkdir %s"
+#: builtin/ls-files.c:566
+msgid "add the standard git exclusions"
msgstr ""
-#: builtin/init-db.c:526
-#, c-format
-msgid "cannot chdir to %s"
+#: builtin/ls-files.c:570
+msgid "make the output relative to the project top directory"
msgstr ""
-#: builtin/init-db.c:547
-#, c-format
-msgid ""
-"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
-"dir=<directory>)"
+#: builtin/ls-files.c:573
+msgid "recurse through submodules"
msgstr ""
-#: builtin/init-db.c:575
-#, c-format
-msgid "Cannot access work tree '%s'"
+#: builtin/ls-files.c:575
+msgid "if any <file> is not in the index, treat this as an error"
msgstr ""
-#: builtin/interpret-trailers.c:15
-msgid ""
-"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
-"<token>[(=|:)<value>])...] [<file>...]"
+#: builtin/ls-files.c:576
+msgid "tree-ish"
msgstr ""
-#: builtin/interpret-trailers.c:92
-msgid "edit files in place"
+#: builtin/ls-files.c:577
+msgid "pretend that paths removed since <tree-ish> are still present"
msgstr ""
-#: builtin/interpret-trailers.c:93
-msgid "trim empty trailers"
+#: builtin/ls-files.c:579
+msgid "show debugging data"
msgstr ""
-#: builtin/interpret-trailers.c:96
-msgid "where to place the new trailer"
+#: builtin/ls-remote.c:9
+msgid ""
+"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
+" [-q | --quiet] [--exit-code] [--get-url]\n"
+" [--symref] [<repository> [<refs>...]]"
msgstr ""
-#: builtin/interpret-trailers.c:98
-msgid "action if trailer already exists"
+#: builtin/ls-remote.c:59
+msgid "do not print remote URL"
msgstr ""
-#: builtin/interpret-trailers.c:100
-msgid "action if trailer is missing"
+#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1111
+msgid "exec"
msgstr ""
-#: builtin/interpret-trailers.c:102
-msgid "output only the trailers"
+#: builtin/ls-remote.c:61 builtin/ls-remote.c:63
+msgid "path of git-upload-pack on the remote host"
msgstr ""
-#: builtin/interpret-trailers.c:103
-msgid "do not apply config rules"
+#: builtin/ls-remote.c:65
+msgid "limit to tags"
msgstr ""
-#: builtin/interpret-trailers.c:104
-msgid "join whitespace-continued values"
+#: builtin/ls-remote.c:66
+msgid "limit to heads"
msgstr ""
-#: builtin/interpret-trailers.c:105
-msgid "set parsing options"
+#: builtin/ls-remote.c:67
+msgid "do not show peeled tags"
msgstr ""
-#: builtin/interpret-trailers.c:107
-msgid "trailer"
+#: builtin/ls-remote.c:69
+msgid "take url.<base>.insteadOf into account"
msgstr ""
-#: builtin/interpret-trailers.c:108
-msgid "trailer(s) to add"
+#: builtin/ls-remote.c:73
+msgid "exit with exit code 2 if no matching refs are found"
msgstr ""
-#: builtin/interpret-trailers.c:117
-msgid "--trailer with --only-input does not make sense"
+#: builtin/ls-remote.c:76
+msgid "show underlying ref in addition to the object pointed by it"
msgstr ""
-#: builtin/interpret-trailers.c:127
-msgid "no input file given for in-place editing"
+#: builtin/ls-tree.c:30
+msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
msgstr ""
-#: builtin/log.c:51
-msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
+#: builtin/ls-tree.c:128
+msgid "only show trees"
msgstr ""
-#: builtin/log.c:52
-msgid "git show [<options>] <object>..."
+#: builtin/ls-tree.c:130
+msgid "recurse into subtrees"
msgstr ""
-#: builtin/log.c:96
-#, c-format
-msgid "invalid --decorate option: %s"
+#: builtin/ls-tree.c:132
+msgid "show trees when recursing"
msgstr ""
-#: builtin/log.c:157
-msgid "suppress diff output"
+#: builtin/ls-tree.c:135
+msgid "terminate entries with NUL byte"
msgstr ""
-#: builtin/log.c:158
-msgid "show source"
+#: builtin/ls-tree.c:136
+msgid "include object size"
msgstr ""
-#: builtin/log.c:159
-msgid "Use mail map file"
+#: builtin/ls-tree.c:138 builtin/ls-tree.c:140
+msgid "list only filenames"
msgstr ""
-#: builtin/log.c:161
-msgid "only decorate refs that match <pattern>"
+#: builtin/ls-tree.c:143
+msgid "use full path names"
msgstr ""
-#: builtin/log.c:163
-msgid "do not decorate refs that match <pattern>"
+#: builtin/ls-tree.c:145
+msgid "list entire tree; not just current directory (implies --full-name)"
msgstr ""
-#: builtin/log.c:164
-msgid "decorate options"
+#: builtin/mailsplit.c:241
+#, c-format
+msgid "empty mbox: '%s'"
msgstr ""
-#: builtin/log.c:167
-msgid "Process line range n,m in file, counting from 1"
+#: builtin/merge.c:53
+msgid "git merge [<options>] [<commit>...]"
msgstr ""
-#: builtin/log.c:265
-#, c-format
-msgid "Final output: %d %s\n"
+#: builtin/merge.c:54
+msgid "git merge --abort"
msgstr ""
-#: builtin/log.c:516
-#, c-format
-msgid "git show %s: bad file"
+#: builtin/merge.c:55
+msgid "git merge --continue"
msgstr ""
-#: builtin/log.c:531 builtin/log.c:625
-#, c-format
-msgid "Could not read object %s"
+#: builtin/merge.c:112
+msgid "switch `m' requires a value"
msgstr ""
-#: builtin/log.c:649
+#: builtin/merge.c:132
#, c-format
-msgid "Unknown type: %d"
+msgid "option `%s' requires a value"
msgstr ""
-#: builtin/log.c:770
-msgid "format.headers without value"
+#: builtin/merge.c:178
+#, c-format
+msgid "Could not find merge strategy '%s'.\n"
msgstr ""
-#: builtin/log.c:871
-msgid "name of output directory is too long"
+#: builtin/merge.c:179
+#, c-format
+msgid "Available strategies are:"
msgstr ""
-#: builtin/log.c:887
+#: builtin/merge.c:184
#, c-format
-msgid "Cannot open patch file %s"
+msgid "Available custom strategies are:"
msgstr ""
-#: builtin/log.c:904
-msgid "Need exactly one range."
+#: builtin/merge.c:235 builtin/pull.c:144
+msgid "do not show a diffstat at the end of the merge"
msgstr ""
-#: builtin/log.c:914
-msgid "Not a range."
+#: builtin/merge.c:238 builtin/pull.c:147
+msgid "show a diffstat at the end of the merge"
msgstr ""
-#: builtin/log.c:1020
-msgid "Cover letter needs email format"
+#: builtin/merge.c:239 builtin/pull.c:150
+msgid "(synonym to --stat)"
msgstr ""
-#: builtin/log.c:1101
-#, c-format
-msgid "insane in-reply-to: %s"
+#: builtin/merge.c:241 builtin/pull.c:153
+msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr ""
-#: builtin/log.c:1128
-msgid "git format-patch [<options>] [<since> | <revision-range>]"
+#: builtin/merge.c:244 builtin/pull.c:159
+msgid "create a single commit instead of doing a merge"
msgstr ""
-#: builtin/log.c:1178
-msgid "Two output directories?"
+#: builtin/merge.c:246 builtin/pull.c:162
+msgid "perform a commit if the merge succeeds (default)"
msgstr ""
-#: builtin/log.c:1285 builtin/log.c:1945 builtin/log.c:1947 builtin/log.c:1959
-#, c-format
-msgid "Unknown commit %s"
+#: builtin/merge.c:248 builtin/pull.c:165
+msgid "edit message before committing"
msgstr ""
-#: builtin/log.c:1295 builtin/notes.c:889 builtin/tag.c:524
-#, c-format
-msgid "Failed to resolve '%s' as a valid ref."
+#: builtin/merge.c:249
+msgid "allow fast-forward (default)"
msgstr ""
-#: builtin/log.c:1300
-msgid "Could not find exact merge base."
+#: builtin/merge.c:251 builtin/pull.c:171
+msgid "abort if fast-forward is not possible"
msgstr ""
-#: 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."
+#: builtin/merge.c:255 builtin/pull.c:174
+msgid "verify that the named commit has a valid GPG signature"
msgstr ""
-#: builtin/log.c:1324
-msgid "Failed to find exact merge base"
+#: builtin/merge.c:256 builtin/notes.c:787 builtin/pull.c:178
+#: builtin/rebase.c:1124 builtin/rebase--interactive.c:188 builtin/revert.c:111
+msgid "strategy"
msgstr ""
-#: builtin/log.c:1335
-msgid "base commit should be the ancestor of revision list"
+#: builtin/merge.c:257 builtin/pull.c:179
+msgid "merge strategy to use"
msgstr ""
-#: builtin/log.c:1339
-msgid "base commit shouldn't be in revision list"
+#: builtin/merge.c:258 builtin/pull.c:182
+msgid "option=value"
msgstr ""
-#: builtin/log.c:1392
-msgid "cannot get patch id"
+#: builtin/merge.c:259 builtin/pull.c:183
+msgid "option for selected merge strategy"
msgstr ""
-#: builtin/log.c:1452
-msgid "use [PATCH n/m] even with a single patch"
+#: builtin/merge.c:261
+msgid "merge commit message (for a non-fast-forward merge)"
msgstr ""
-#: builtin/log.c:1455
-msgid "use [PATCH] even with multiple patches"
+#: builtin/merge.c:268
+msgid "abort the current in-progress merge"
msgstr ""
-#: builtin/log.c:1459
-msgid "print patches to standard out"
+#: builtin/merge.c:270
+msgid "continue the current in-progress merge"
msgstr ""
-#: builtin/log.c:1461
-msgid "generate a cover letter"
+#: builtin/merge.c:272 builtin/pull.c:190
+msgid "allow merging unrelated histories"
msgstr ""
-#: builtin/log.c:1463
-msgid "use simple number sequence for output file names"
+#: builtin/merge.c:278
+msgid "verify commit-msg hook"
msgstr ""
-#: builtin/log.c:1464
-msgid "sfx"
+#: builtin/merge.c:303
+msgid "could not run stash."
msgstr ""
-#: builtin/log.c:1465
-msgid "use <sfx> instead of '.patch'"
+#: builtin/merge.c:308
+msgid "stash failed"
msgstr ""
-#: builtin/log.c:1467
-msgid "start numbering patches at <n> instead of 1"
+#: builtin/merge.c:313
+#, c-format
+msgid "not a valid object: %s"
msgstr ""
-#: builtin/log.c:1469
-msgid "mark the series as Nth re-roll"
+#: builtin/merge.c:335 builtin/merge.c:352
+msgid "read-tree failed"
msgstr ""
-#: builtin/log.c:1471
-msgid "Use [RFC PATCH] instead of [PATCH]"
+#: builtin/merge.c:382
+msgid " (nothing to squash)"
msgstr ""
-#: builtin/log.c:1474
-msgid "Use [<prefix>] instead of [PATCH]"
+#: builtin/merge.c:393
+#, c-format
+msgid "Squash commit -- not updating HEAD\n"
msgstr ""
-#: builtin/log.c:1477
-msgid "store resulting files in <dir>"
+#: builtin/merge.c:443
+#, c-format
+msgid "No merge message -- not updating HEAD\n"
msgstr ""
-#: builtin/log.c:1480
-msgid "don't strip/add [PATCH]"
+#: builtin/merge.c:494
+#, c-format
+msgid "'%s' does not point to a commit"
msgstr ""
-#: builtin/log.c:1483
-msgid "don't output binary diffs"
+#: builtin/merge.c:581
+#, c-format
+msgid "Bad branch.%s.mergeoptions string: %s"
msgstr ""
-#: builtin/log.c:1485
-msgid "output all-zero hash in From header"
+#: builtin/merge.c:702
+msgid "Not handling anything other than two heads merge."
msgstr ""
-#: builtin/log.c:1487
-msgid "don't include a patch matching a commit upstream"
+#: builtin/merge.c:716
+#, c-format
+msgid "Unknown option for merge-recursive: -X%s"
msgstr ""
-#: builtin/log.c:1489
-msgid "show patch format instead of default (patch + stat)"
+#: builtin/merge.c:731
+#, c-format
+msgid "unable to write %s"
msgstr ""
-#: builtin/log.c:1491
-msgid "Messaging"
+#: builtin/merge.c:783
+#, c-format
+msgid "Could not read from '%s'"
msgstr ""
-#: builtin/log.c:1492
-msgid "header"
+#: builtin/merge.c:792
+#, c-format
+msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr ""
-#: builtin/log.c:1493
-msgid "add email header"
+#: builtin/merge.c:798
+#, c-format
+msgid ""
+"Please enter a commit message to explain why this merge is necessary,\n"
+"especially if it merges an updated upstream into a topic branch.\n"
+"\n"
+"Lines starting with '%c' will be ignored, and an empty message aborts\n"
+"the commit.\n"
msgstr ""
-#: builtin/log.c:1494 builtin/log.c:1496
-msgid "email"
+#: builtin/merge.c:834
+msgid "Empty commit message."
msgstr ""
-#: builtin/log.c:1494
-msgid "add To: header"
+#: builtin/merge.c:853
+#, c-format
+msgid "Wonderful.\n"
msgstr ""
-#: builtin/log.c:1496
-msgid "add Cc: header"
+#: builtin/merge.c:906
+#, c-format
+msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr ""
-#: builtin/log.c:1498
-msgid "ident"
+#: builtin/merge.c:945
+msgid "No current branch."
msgstr ""
-#: builtin/log.c:1499
-msgid "set From address to <ident> (or committer ident if absent)"
+#: builtin/merge.c:947
+msgid "No remote for the current branch."
msgstr ""
-#: builtin/log.c:1501
-msgid "message-id"
+#: builtin/merge.c:949
+msgid "No default upstream defined for the current branch."
msgstr ""
-#: builtin/log.c:1502
-msgid "make first mail a reply to <message-id>"
+#: builtin/merge.c:954
+#, c-format
+msgid "No remote-tracking branch for %s from %s"
msgstr ""
-#: builtin/log.c:1503 builtin/log.c:1506
-msgid "boundary"
+#: builtin/merge.c:1011
+#, c-format
+msgid "Bad value '%s' in environment '%s'"
msgstr ""
-#: builtin/log.c:1504
-msgid "attach the patch"
+#: builtin/merge.c:1114
+#, c-format
+msgid "not something we can merge in %s: %s"
msgstr ""
-#: builtin/log.c:1507
-msgid "inline the patch"
+#: builtin/merge.c:1148
+msgid "not something we can merge"
msgstr ""
-#: builtin/log.c:1511
-msgid "enable message threading, styles: shallow, deep"
+#: builtin/merge.c:1251
+msgid "--abort expects no arguments"
msgstr ""
-#: builtin/log.c:1513
-msgid "signature"
+#: builtin/merge.c:1255
+msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr ""
-#: builtin/log.c:1514
-msgid "add a signature"
+#: builtin/merge.c:1267
+msgid "--continue expects no arguments"
msgstr ""
-#: builtin/log.c:1515
-msgid "base-commit"
+#: builtin/merge.c:1271
+msgid "There is no merge in progress (MERGE_HEAD missing)."
msgstr ""
-#: builtin/log.c:1516
-msgid "add prerequisite tree info to the patch series"
+#: builtin/merge.c:1287
+msgid ""
+"You have not concluded your merge (MERGE_HEAD exists).\n"
+"Please, commit your changes before you merge."
msgstr ""
-#: builtin/log.c:1518
-msgid "add a signature from a file"
+#: builtin/merge.c:1294
+msgid ""
+"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
+"Please, commit your changes before you merge."
msgstr ""
-#: builtin/log.c:1519
-msgid "don't print the patch filenames"
+#: builtin/merge.c:1297
+msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr ""
-#: builtin/log.c:1521
-msgid "show progress while generating patches"
+#: builtin/merge.c:1306
+msgid "You cannot combine --squash with --no-ff."
msgstr ""
-#: builtin/log.c:1596
-#, c-format
-msgid "invalid ident line: %s"
+#: builtin/merge.c:1314
+msgid "No commit specified and merge.defaultToUpstream not set."
msgstr ""
-#: builtin/log.c:1611
-msgid "-n and -k are mutually exclusive"
+#: builtin/merge.c:1331
+msgid "Squash commit into empty head not supported yet"
msgstr ""
-#: builtin/log.c:1613
-msgid "--subject-prefix/--rfc and -k are mutually exclusive"
+#: builtin/merge.c:1333
+msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr ""
-#: builtin/log.c:1621
-msgid "--name-only does not make sense"
+#: builtin/merge.c:1338
+#, c-format
+msgid "%s - not something we can merge"
msgstr ""
-#: builtin/log.c:1623
-msgid "--name-status does not make sense"
+#: builtin/merge.c:1340
+msgid "Can merge only exactly one commit into empty head"
msgstr ""
-#: builtin/log.c:1625
-msgid "--check does not make sense"
+#: builtin/merge.c:1422
+msgid "refusing to merge unrelated histories"
msgstr ""
-#: builtin/log.c:1657
-msgid "standard output, or directory, which one?"
+#: builtin/merge.c:1431
+msgid "Already up to date."
msgstr ""
-#: builtin/log.c:1659
+#: builtin/merge.c:1441
#, c-format
-msgid "Could not create directory '%s'"
+msgid "Updating %s..%s\n"
msgstr ""
-#: builtin/log.c:1752
+#: builtin/merge.c:1483
#, c-format
-msgid "unable to read signature file '%s'"
+msgid "Trying really trivial in-index merge...\n"
msgstr ""
-#: builtin/log.c:1785
-msgid "Generating patches"
+#: builtin/merge.c:1490
+#, c-format
+msgid "Nope.\n"
msgstr ""
-#: builtin/log.c:1829
-msgid "Failed to create output files"
+#: builtin/merge.c:1515
+msgid "Already up to date. Yeeah!"
msgstr ""
-#: builtin/log.c:1880
-msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
+#: builtin/merge.c:1521
+msgid "Not possible to fast-forward, aborting."
msgstr ""
-#: builtin/log.c:1934
+#: builtin/merge.c:1544 builtin/merge.c:1623
#, c-format
-msgid ""
-"Could not find a tracked remote branch, please specify <upstream> manually.\n"
+msgid "Rewinding the tree to pristine...\n"
msgstr ""
-#: builtin/ls-files.c:469
-msgid "git ls-files [<options>] [<file>...]"
+#: builtin/merge.c:1548
+#, c-format
+msgid "Trying merge strategy %s...\n"
msgstr ""
-#: builtin/ls-files.c:518
-msgid "identify the file status with tags"
+#: builtin/merge.c:1614
+#, c-format
+msgid "No merge strategy handled the merge.\n"
msgstr ""
-#: builtin/ls-files.c:520
-msgid "use lowercase letters for 'assume unchanged' files"
+#: builtin/merge.c:1616
+#, c-format
+msgid "Merge with strategy %s failed.\n"
msgstr ""
-#: builtin/ls-files.c:522
-msgid "use lowercase letters for 'fsmonitor clean' files"
+#: builtin/merge.c:1625
+#, c-format
+msgid "Using the %s to prepare resolving by hand.\n"
msgstr ""
-#: builtin/ls-files.c:524
-msgid "show cached files in the output (default)"
+#: builtin/merge.c:1637
+#, c-format
+msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
-#: builtin/ls-files.c:526
-msgid "show deleted files in the output"
+#: builtin/merge-base.c:32
+msgid "git merge-base [-a | --all] <commit> <commit>..."
msgstr ""
-#: builtin/ls-files.c:528
-msgid "show modified files in the output"
+#: builtin/merge-base.c:33
+msgid "git merge-base [-a | --all] --octopus <commit>..."
msgstr ""
-#: builtin/ls-files.c:530
-msgid "show other files in the output"
+#: builtin/merge-base.c:34
+msgid "git merge-base --independent <commit>..."
msgstr ""
-#: builtin/ls-files.c:532
-msgid "show ignored files in the output"
+#: builtin/merge-base.c:35
+msgid "git merge-base --is-ancestor <commit> <commit>"
msgstr ""
-#: builtin/ls-files.c:535
-msgid "show staged contents' object name in the output"
+#: builtin/merge-base.c:36
+msgid "git merge-base --fork-point <ref> [<commit>]"
msgstr ""
-#: builtin/ls-files.c:537
-msgid "show files on the filesystem that need to be removed"
+#: builtin/merge-base.c:153
+msgid "output all common ancestors"
msgstr ""
-#: builtin/ls-files.c:539
-msgid "show 'other' directories' names only"
+#: builtin/merge-base.c:155
+msgid "find ancestors for a single n-way merge"
msgstr ""
-#: builtin/ls-files.c:541
-msgid "show line endings of files"
+#: builtin/merge-base.c:157
+msgid "list revs not reachable from others"
msgstr ""
-#: builtin/ls-files.c:543
-msgid "don't show empty directories"
+#: builtin/merge-base.c:159
+msgid "is the first one ancestor of the other?"
msgstr ""
-#: builtin/ls-files.c:546
-msgid "show unmerged files in the output"
+#: builtin/merge-base.c:161
+msgid "find where <commit> forked from reflog of <ref>"
msgstr ""
-#: builtin/ls-files.c:548
-msgid "show resolve-undo information"
+#: builtin/merge-file.c:9
+msgid ""
+"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
+"<orig-file> <file2>"
msgstr ""
-#: builtin/ls-files.c:550
-msgid "skip files matching pattern"
+#: builtin/merge-file.c:35
+msgid "send results to standard output"
msgstr ""
-#: builtin/ls-files.c:553
-msgid "exclude patterns are read from <file>"
+#: builtin/merge-file.c:36
+msgid "use a diff3 based merge"
msgstr ""
-#: builtin/ls-files.c:556
-msgid "read additional per-directory exclude patterns in <file>"
+#: builtin/merge-file.c:37
+msgid "for conflicts, use our version"
msgstr ""
-#: builtin/ls-files.c:558
-msgid "add the standard git exclusions"
+#: builtin/merge-file.c:39
+msgid "for conflicts, use their version"
msgstr ""
-#: builtin/ls-files.c:561
-msgid "make the output relative to the project top directory"
+#: builtin/merge-file.c:41
+msgid "for conflicts, use a union version"
msgstr ""
-#: builtin/ls-files.c:564
-msgid "recurse through submodules"
+#: builtin/merge-file.c:44
+msgid "for conflicts, use this marker size"
msgstr ""
-#: builtin/ls-files.c:566
-msgid "if any <file> is not in the index, treat this as an error"
+#: builtin/merge-file.c:45
+msgid "do not warn about conflicts"
msgstr ""
-#: builtin/ls-files.c:567
-msgid "tree-ish"
+#: builtin/merge-file.c:47
+msgid "set labels for file1/orig-file/file2"
msgstr ""
-#: builtin/ls-files.c:568
-msgid "pretend that paths removed since <tree-ish> are still present"
+#: builtin/merge-recursive.c:46
+#, c-format
+msgid "unknown option %s"
msgstr ""
-#: builtin/ls-files.c:570
-msgid "show debugging data"
+#: builtin/merge-recursive.c:52
+#, c-format
+msgid "could not parse object '%s'"
msgstr ""
-#: builtin/ls-remote.c:9
-msgid ""
-"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
-" [-q | --quiet] [--exit-code] [--get-url]\n"
-" [--symref] [<repository> [<refs>...]]"
-msgstr ""
+#: builtin/merge-recursive.c:56
+#, c-format
+msgid "cannot handle more than %d base. Ignoring %s."
+msgid_plural "cannot handle more than %d bases. Ignoring %s."
+msgstr[0] ""
+msgstr[1] ""
-#: builtin/ls-remote.c:59
-msgid "do not print remote URL"
+#: builtin/merge-recursive.c:64
+msgid "not handling anything other than two heads merge."
msgstr ""
-#: builtin/ls-remote.c:60 builtin/ls-remote.c:62
-msgid "exec"
+#: builtin/merge-recursive.c:70 builtin/merge-recursive.c:72
+#, c-format
+msgid "could not resolve ref '%s'"
msgstr ""
-#: builtin/ls-remote.c:61 builtin/ls-remote.c:63
-msgid "path of git-upload-pack on the remote host"
+#: builtin/merge-recursive.c:78
+#, c-format
+msgid "Merging %s with %s\n"
msgstr ""
-#: builtin/ls-remote.c:65
-msgid "limit to tags"
+#: builtin/mktree.c:66
+msgid "git mktree [-z] [--missing] [--batch]"
msgstr ""
-#: builtin/ls-remote.c:66
-msgid "limit to heads"
+#: builtin/mktree.c:154
+msgid "input is NUL terminated"
msgstr ""
-#: builtin/ls-remote.c:67
-msgid "do not show peeled tags"
+#: builtin/mktree.c:155 builtin/write-tree.c:26
+msgid "allow missing objects"
msgstr ""
-#: builtin/ls-remote.c:69
-msgid "take url.<base>.insteadOf into account"
+#: builtin/mktree.c:156
+msgid "allow creation of more than one tree"
msgstr ""
-#: builtin/ls-remote.c:73
-msgid "exit with exit code 2 if no matching refs are found"
+#: builtin/multi-pack-index.c:8
+msgid "git multi-pack-index [--object-dir=<dir>] (write|verify)"
msgstr ""
-#: builtin/ls-remote.c:76
-msgid "show underlying ref in addition to the object pointed by it"
+#: builtin/multi-pack-index.c:21
+msgid "object directory containing set of packfile and pack-index pairs"
msgstr ""
-#: builtin/ls-tree.c:30
-msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
+#: builtin/multi-pack-index.c:39
+msgid "too many arguments"
msgstr ""
-#: builtin/ls-tree.c:128
-msgid "only show trees"
+#: builtin/multi-pack-index.c:48
+#, c-format
+msgid "unrecognized verb: %s"
msgstr ""
-#: builtin/ls-tree.c:130
-msgid "recurse into subtrees"
+#: builtin/mv.c:18
+msgid "git mv [<options>] <source>... <destination>"
msgstr ""
-#: builtin/ls-tree.c:132
-msgid "show trees when recursing"
+#: builtin/mv.c:83
+#, c-format
+msgid "Directory %s is in index and no submodule?"
msgstr ""
-#: builtin/ls-tree.c:135
-msgid "terminate entries with NUL byte"
+#: builtin/mv.c:85
+msgid "Please stage your changes to .gitmodules or stash them to proceed"
msgstr ""
-#: builtin/ls-tree.c:136
-msgid "include object size"
+#: builtin/mv.c:103
+#, c-format
+msgid "%.*s is in index"
msgstr ""
-#: builtin/ls-tree.c:138 builtin/ls-tree.c:140
-msgid "list only filenames"
+#: builtin/mv.c:125
+msgid "force move/rename even if target exists"
msgstr ""
-#: builtin/ls-tree.c:143
-msgid "use full path names"
+#: builtin/mv.c:127
+msgid "skip move/rename errors"
msgstr ""
-
-#: builtin/ls-tree.c:145
-msgid "list entire tree; not just current directory (implies --full-name)"
+
+#: builtin/mv.c:169
+#, c-format
+msgid "destination '%s' is not a directory"
msgstr ""
-#: builtin/mailsplit.c:241
+#: builtin/mv.c:180
#, c-format
-msgid "empty mbox: '%s'"
+msgid "Checking rename of '%s' to '%s'\n"
msgstr ""
-#: builtin/merge.c:51
-msgid "git merge [<options>] [<commit>...]"
+#: builtin/mv.c:184
+msgid "bad source"
msgstr ""
-#: builtin/merge.c:52
-msgid "git merge --abort"
+#: builtin/mv.c:187
+msgid "can not move directory into itself"
msgstr ""
-#: builtin/merge.c:53
-msgid "git merge --continue"
+#: builtin/mv.c:190
+msgid "cannot move directory over file"
msgstr ""
-#: builtin/merge.c:110
-msgid "switch `m' requires a value"
+#: builtin/mv.c:199
+msgid "source directory is empty"
msgstr ""
-#: builtin/merge.c:176
-#, c-format
-msgid "Could not find merge strategy '%s'.\n"
+#: builtin/mv.c:224
+msgid "not under version control"
msgstr ""
-#: builtin/merge.c:177
-#, c-format
-msgid "Available strategies are:"
+#: builtin/mv.c:227
+msgid "destination exists"
msgstr ""
-#: builtin/merge.c:182
+#: builtin/mv.c:235
#, c-format
-msgid "Available custom strategies are:"
+msgid "overwriting '%s'"
msgstr ""
-#: builtin/merge.c:232 builtin/pull.c:142
-msgid "do not show a diffstat at the end of the merge"
+#: builtin/mv.c:238
+msgid "Cannot overwrite"
msgstr ""
-#: builtin/merge.c:235 builtin/pull.c:145
-msgid "show a diffstat at the end of the merge"
+#: builtin/mv.c:241
+msgid "multiple sources for the same target"
msgstr ""
-#: builtin/merge.c:236 builtin/pull.c:148
-msgid "(synonym to --stat)"
+#: builtin/mv.c:243
+msgid "destination directory does not exist"
msgstr ""
-#: builtin/merge.c:238 builtin/pull.c:151
-msgid "add (at most <n>) entries from shortlog to merge commit message"
+#: builtin/mv.c:250
+#, c-format
+msgid "%s, source=%s, destination=%s"
msgstr ""
-#: builtin/merge.c:241 builtin/pull.c:157
-msgid "create a single commit instead of doing a merge"
+#: builtin/mv.c:271
+#, c-format
+msgid "Renaming %s to %s\n"
msgstr ""
-#: builtin/merge.c:243 builtin/pull.c:160
-msgid "perform a commit if the merge succeeds (default)"
+#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:513
+#, c-format
+msgid "renaming '%s' failed"
msgstr ""
-#: builtin/merge.c:245 builtin/pull.c:163
-msgid "edit message before committing"
+#: builtin/name-rev.c:355
+msgid "git name-rev [<options>] <commit>..."
msgstr ""
-#: builtin/merge.c:246
-msgid "allow fast-forward (default)"
+#: builtin/name-rev.c:356
+msgid "git name-rev [<options>] --all"
msgstr ""
-#: builtin/merge.c:248 builtin/pull.c:169
-msgid "abort if fast-forward is not possible"
+#: builtin/name-rev.c:357
+msgid "git name-rev [<options>] --stdin"
msgstr ""
-#: builtin/merge.c:252 builtin/pull.c:172
-msgid "verify that the named commit has a valid GPG signature"
+#: builtin/name-rev.c:413
+msgid "print only names (no SHA-1)"
msgstr ""
-#: builtin/merge.c:253 builtin/notes.c:779 builtin/pull.c:176
-#: builtin/revert.c:110
-msgid "strategy"
+#: builtin/name-rev.c:414
+msgid "only use tags to name the commits"
msgstr ""
-#: builtin/merge.c:254 builtin/pull.c:177
-msgid "merge strategy to use"
+#: builtin/name-rev.c:416
+msgid "only use refs matching <pattern>"
msgstr ""
-#: builtin/merge.c:255 builtin/pull.c:180
-msgid "option=value"
+#: builtin/name-rev.c:418
+msgid "ignore refs matching <pattern>"
msgstr ""
-#: builtin/merge.c:256 builtin/pull.c:181
-msgid "option for selected merge strategy"
+#: builtin/name-rev.c:420
+msgid "list all commits reachable from all refs"
msgstr ""
-#: builtin/merge.c:258
-msgid "merge commit message (for a non-fast-forward merge)"
+#: builtin/name-rev.c:421
+msgid "read from stdin"
msgstr ""
-#: builtin/merge.c:265
-msgid "abort the current in-progress merge"
+#: builtin/name-rev.c:422
+msgid "allow to print `undefined` names (default)"
msgstr ""
-#: builtin/merge.c:267
-msgid "continue the current in-progress merge"
+#: builtin/name-rev.c:428
+msgid "dereference tags in the input (internal use)"
msgstr ""
-#: builtin/merge.c:269 builtin/pull.c:188
-msgid "allow merging unrelated histories"
+#: builtin/notes.c:28
+msgid "git notes [--ref <notes-ref>] [list [<object>]]"
msgstr ""
-#: builtin/merge.c:275
-msgid "verify commit-msg hook"
+#: builtin/notes.c:29
+msgid ""
+"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
+"| (-c | -C) <object>] [<object>]"
msgstr ""
-#: builtin/merge.c:300
-msgid "could not run stash."
+#: builtin/notes.c:30
+msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
msgstr ""
-#: builtin/merge.c:305
-msgid "stash failed"
+#: builtin/notes.c:31
+msgid ""
+"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
+"(-c | -C) <object>] [<object>]"
msgstr ""
-#: builtin/merge.c:310
-#, c-format
-msgid "not a valid object: %s"
+#: builtin/notes.c:32
+msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
msgstr ""
-#: builtin/merge.c:332 builtin/merge.c:349
-msgid "read-tree failed"
+#: builtin/notes.c:33
+msgid "git notes [--ref <notes-ref>] show [<object>]"
msgstr ""
-#: builtin/merge.c:379
-msgid " (nothing to squash)"
+#: builtin/notes.c:34
+msgid ""
+"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
msgstr ""
-#: builtin/merge.c:390
-#, c-format
-msgid "Squash commit -- not updating HEAD\n"
+#: builtin/notes.c:35
+msgid "git notes merge --commit [-v | -q]"
msgstr ""
-#: builtin/merge.c:440
-#, c-format
-msgid "No merge message -- not updating HEAD\n"
+#: builtin/notes.c:36
+msgid "git notes merge --abort [-v | -q]"
msgstr ""
-#: builtin/merge.c:491
-#, c-format
-msgid "'%s' does not point to a commit"
+#: builtin/notes.c:37
+msgid "git notes [--ref <notes-ref>] remove [<object>...]"
msgstr ""
-#: builtin/merge.c:578
-#, c-format
-msgid "Bad branch.%s.mergeoptions string: %s"
+#: builtin/notes.c:38
+msgid "git notes [--ref <notes-ref>] prune [-n] [-v]"
msgstr ""
-#: builtin/merge.c:699
-msgid "Not handling anything other than two heads merge."
+#: builtin/notes.c:39
+msgid "git notes [--ref <notes-ref>] get-ref"
msgstr ""
-#: builtin/merge.c:713
-#, c-format
-msgid "Unknown option for merge-recursive: -X%s"
+#: builtin/notes.c:44
+msgid "git notes [list [<object>]]"
msgstr ""
-#: builtin/merge.c:728
-#, c-format
-msgid "unable to write %s"
+#: builtin/notes.c:49
+msgid "git notes add [<options>] [<object>]"
msgstr ""
-#: builtin/merge.c:779
-#, c-format
-msgid "Could not read from '%s'"
+#: builtin/notes.c:54
+msgid "git notes copy [<options>] <from-object> <to-object>"
msgstr ""
-#: builtin/merge.c:788
-#, c-format
-msgid "Not committing merge; use 'git commit' to complete the merge.\n"
+#: builtin/notes.c:55
+msgid "git notes copy --stdin [<from-object> <to-object>]..."
msgstr ""
-#: builtin/merge.c:794
-#, c-format
-msgid ""
-"Please enter a commit message to explain why this merge is necessary,\n"
-"especially if it merges an updated upstream into a topic branch.\n"
-"\n"
-"Lines starting with '%c' will be ignored, and an empty message aborts\n"
-"the commit.\n"
+#: builtin/notes.c:60
+msgid "git notes append [<options>] [<object>]"
msgstr ""
-#: builtin/merge.c:830
-msgid "Empty commit message."
+#: builtin/notes.c:65
+msgid "git notes edit [<object>]"
msgstr ""
-#: builtin/merge.c:849
-#, c-format
-msgid "Wonderful.\n"
+#: builtin/notes.c:70
+msgid "git notes show [<object>]"
msgstr ""
-#: builtin/merge.c:902
-#, c-format
-msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
+#: builtin/notes.c:75
+msgid "git notes merge [<options>] <notes-ref>"
msgstr ""
-#: builtin/merge.c:941
-msgid "No current branch."
+#: builtin/notes.c:76
+msgid "git notes merge --commit [<options>]"
msgstr ""
-#: builtin/merge.c:943
-msgid "No remote for the current branch."
+#: builtin/notes.c:77
+msgid "git notes merge --abort [<options>]"
msgstr ""
-#: builtin/merge.c:945
-msgid "No default upstream defined for the current branch."
+#: builtin/notes.c:82
+msgid "git notes remove [<object>]"
msgstr ""
-#: builtin/merge.c:950
-#, c-format
-msgid "No remote-tracking branch for %s from %s"
+#: builtin/notes.c:87
+msgid "git notes prune [<options>]"
msgstr ""
-#: builtin/merge.c:1007
-#, c-format
-msgid "Bad value '%s' in environment '%s'"
+#: builtin/notes.c:92
+msgid "git notes get-ref"
msgstr ""
-#: builtin/merge.c:1110
-#, c-format
-msgid "not something we can merge in %s: %s"
+#: builtin/notes.c:97
+msgid "Write/edit the notes for the following object:"
msgstr ""
-#: builtin/merge.c:1144
-msgid "not something we can merge"
+#: builtin/notes.c:150
+#, c-format
+msgid "unable to start 'show' for object '%s'"
msgstr ""
-#: builtin/merge.c:1247
-msgid "--abort expects no arguments"
+#: builtin/notes.c:154
+msgid "could not read 'show' output"
msgstr ""
-#: builtin/merge.c:1251
-msgid "There is no merge to abort (MERGE_HEAD missing)."
+#: builtin/notes.c:162
+#, c-format
+msgid "failed to finish 'show' for object '%s'"
msgstr ""
-#: builtin/merge.c:1263
-msgid "--continue expects no arguments"
+#: builtin/notes.c:197
+msgid "please supply the note contents using either -m or -F option"
msgstr ""
-#: builtin/merge.c:1267
-msgid "There is no merge in progress (MERGE_HEAD missing)."
+#: builtin/notes.c:206
+msgid "unable to write note object"
msgstr ""
-#: builtin/merge.c:1283
-msgid ""
-"You have not concluded your merge (MERGE_HEAD exists).\n"
-"Please, commit your changes before you merge."
+#: builtin/notes.c:208
+#, c-format
+msgid "the note contents have been left in %s"
msgstr ""
-#: builtin/merge.c:1290
-msgid ""
-"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
-"Please, commit your changes before you merge."
+#: builtin/notes.c:242 builtin/tag.c:513
+#, c-format
+msgid "could not open or read '%s'"
msgstr ""
-#: builtin/merge.c:1293
-msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
+#: builtin/notes.c:263 builtin/notes.c:313 builtin/notes.c:315
+#: builtin/notes.c:383 builtin/notes.c:438 builtin/notes.c:526
+#: builtin/notes.c:531 builtin/notes.c:610 builtin/notes.c:672
+#, c-format
+msgid "failed to resolve '%s' as a valid ref."
msgstr ""
-#: builtin/merge.c:1302
-msgid "You cannot combine --squash with --no-ff."
+#: builtin/notes.c:265
+#, c-format
+msgid "failed to read object '%s'."
msgstr ""
-#: builtin/merge.c:1310
-msgid "No commit specified and merge.defaultToUpstream not set."
+#: builtin/notes.c:268
+#, c-format
+msgid "cannot read note data from non-blob object '%s'."
msgstr ""
-#: builtin/merge.c:1327
-msgid "Squash commit into empty head not supported yet"
+#: builtin/notes.c:309
+#, c-format
+msgid "malformed input line: '%s'."
msgstr ""
-#: builtin/merge.c:1329
-msgid "Non-fast-forward commit does not make sense into an empty head"
+#: builtin/notes.c:324
+#, c-format
+msgid "failed to copy notes from '%s' to '%s'"
msgstr ""
-#: builtin/merge.c:1334
+#. TRANSLATORS: the first %s will be replaced by a git
+#. notes command: 'add', 'merge', 'remove', etc.
+#.
+#: builtin/notes.c:356
#, c-format
-msgid "%s - not something we can merge"
+msgid "refusing to %s notes in %s (outside of refs/notes/)"
msgstr ""
-#: builtin/merge.c:1336
-msgid "Can merge only exactly one commit into empty head"
+#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:509
+#: builtin/notes.c:521 builtin/notes.c:598 builtin/notes.c:665
+#: builtin/notes.c:815 builtin/notes.c:963 builtin/notes.c:985
+msgid "too many parameters"
msgstr ""
-#: builtin/merge.c:1370
+#: builtin/notes.c:389 builtin/notes.c:678
#, c-format
-msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
+msgid "no note found for object %s."
msgstr ""
-#: builtin/merge.c:1373
-#, c-format
-msgid "Commit %s has a bad GPG signature allegedly by %s."
+#: builtin/notes.c:410 builtin/notes.c:576
+msgid "note contents as a string"
msgstr ""
-#: builtin/merge.c:1376
-#, c-format
-msgid "Commit %s does not have a GPG signature."
+#: builtin/notes.c:413 builtin/notes.c:579
+msgid "note contents in a file"
msgstr ""
-#: builtin/merge.c:1379
-#, c-format
-msgid "Commit %s has a good GPG signature by %s\n"
+#: builtin/notes.c:416 builtin/notes.c:582
+msgid "reuse and edit specified note object"
msgstr ""
-#: builtin/merge.c:1438
-msgid "refusing to merge unrelated histories"
+#: builtin/notes.c:419 builtin/notes.c:585
+msgid "reuse specified note object"
msgstr ""
-#: builtin/merge.c:1447
-msgid "Already up to date."
+#: builtin/notes.c:422 builtin/notes.c:588
+msgid "allow storing empty note"
msgstr ""
-#: builtin/merge.c:1457
-#, c-format
-msgid "Updating %s..%s\n"
+#: builtin/notes.c:423 builtin/notes.c:496
+msgid "replace existing notes"
msgstr ""
-#: builtin/merge.c:1498
+#: builtin/notes.c:448
#, c-format
-msgid "Trying really trivial in-index merge...\n"
+msgid ""
+"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
+"existing notes"
msgstr ""
-#: builtin/merge.c:1505
+#: builtin/notes.c:463 builtin/notes.c:544
#, c-format
-msgid "Nope.\n"
+msgid "Overwriting existing notes for object %s\n"
msgstr ""
-#: builtin/merge.c:1530
-msgid "Already up to date. Yeeah!"
+#: builtin/notes.c:475 builtin/notes.c:637 builtin/notes.c:902
+#, c-format
+msgid "Removing note for object %s\n"
msgstr ""
-#: builtin/merge.c:1536
-msgid "Not possible to fast-forward, aborting."
+#: builtin/notes.c:497
+msgid "read objects from stdin"
msgstr ""
-#: builtin/merge.c:1559 builtin/merge.c:1638
-#, c-format
-msgid "Rewinding the tree to pristine...\n"
+#: builtin/notes.c:499
+msgid "load rewriting config for <command> (implies --stdin)"
msgstr ""
-#: builtin/merge.c:1563
-#, c-format
-msgid "Trying merge strategy %s...\n"
+#: builtin/notes.c:517
+msgid "too few parameters"
msgstr ""
-#: builtin/merge.c:1629
+#: builtin/notes.c:538
#, c-format
-msgid "No merge strategy handled the merge.\n"
+msgid ""
+"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
+"existing notes"
msgstr ""
-#: builtin/merge.c:1631
+#: builtin/notes.c:550
#, c-format
-msgid "Merge with strategy %s failed.\n"
+msgid "missing notes on source object %s. Cannot copy."
msgstr ""
-#: builtin/merge.c:1640
+#: builtin/notes.c:603
#, c-format
-msgid "Using the %s to prepare resolving by hand.\n"
+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/merge.c:1652
-#, c-format
-msgid "Automatic merge went well; stopped before committing as requested\n"
+#: builtin/notes.c:698
+msgid "failed to delete ref NOTES_MERGE_PARTIAL"
msgstr ""
-#: builtin/merge-base.c:31
-msgid "git merge-base [-a | --all] <commit> <commit>..."
+#: builtin/notes.c:700
+msgid "failed to delete ref NOTES_MERGE_REF"
msgstr ""
-#: builtin/merge-base.c:32
-msgid "git merge-base [-a | --all] --octopus <commit>..."
+#: builtin/notes.c:702
+msgid "failed to remove 'git notes merge' worktree"
msgstr ""
-#: builtin/merge-base.c:33
-msgid "git merge-base --independent <commit>..."
+#: builtin/notes.c:722
+msgid "failed to read ref NOTES_MERGE_PARTIAL"
msgstr ""
-#: builtin/merge-base.c:34
-msgid "git merge-base --is-ancestor <commit> <commit>"
+#: builtin/notes.c:724
+msgid "could not find commit from NOTES_MERGE_PARTIAL."
msgstr ""
-#: builtin/merge-base.c:35
-msgid "git merge-base --fork-point <ref> [<commit>]"
+#: builtin/notes.c:726
+msgid "could not parse commit from NOTES_MERGE_PARTIAL."
msgstr ""
-#: builtin/merge-base.c:221
-msgid "output all common ancestors"
+#: builtin/notes.c:739
+msgid "failed to resolve NOTES_MERGE_REF"
msgstr ""
-#: builtin/merge-base.c:223
-msgid "find ancestors for a single n-way merge"
+#: builtin/notes.c:742
+msgid "failed to finalize notes merge"
msgstr ""
-#: builtin/merge-base.c:225
-msgid "list revs not reachable from others"
+#: builtin/notes.c:768
+#, c-format
+msgid "unknown notes merge strategy %s"
msgstr ""
-#: builtin/merge-base.c:227
-msgid "is the first one ancestor of the other?"
+#: builtin/notes.c:784
+msgid "General options"
msgstr ""
-#: builtin/merge-base.c:229
-msgid "find where <commit> forked from reflog of <ref>"
+#: builtin/notes.c:786
+msgid "Merge options"
msgstr ""
-#: builtin/merge-file.c:9
+#: builtin/notes.c:788
msgid ""
-"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
-"<orig-file> <file2>"
-msgstr ""
-
-#: builtin/merge-file.c:33
-msgid "send results to standard output"
+"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
+"cat_sort_uniq)"
msgstr ""
-#: builtin/merge-file.c:34
-msgid "use a diff3 based merge"
+#: builtin/notes.c:790
+msgid "Committing unmerged notes"
msgstr ""
-#: builtin/merge-file.c:35
-msgid "for conflicts, use our version"
+#: builtin/notes.c:792
+msgid "finalize notes merge by committing unmerged notes"
msgstr ""
-#: builtin/merge-file.c:37
-msgid "for conflicts, use their version"
+#: builtin/notes.c:794
+msgid "Aborting notes merge resolution"
msgstr ""
-#: builtin/merge-file.c:39
-msgid "for conflicts, use a union version"
+#: builtin/notes.c:796
+msgid "abort notes merge"
msgstr ""
-#: builtin/merge-file.c:42
-msgid "for conflicts, use this marker size"
+#: builtin/notes.c:807
+msgid "cannot mix --commit, --abort or -s/--strategy"
msgstr ""
-#: builtin/merge-file.c:43
-msgid "do not warn about conflicts"
+#: builtin/notes.c:812
+msgid "must specify a notes ref to merge"
msgstr ""
-#: builtin/merge-file.c:45
-msgid "set labels for file1/orig-file/file2"
+#: builtin/notes.c:836
+#, c-format
+msgid "unknown -s/--strategy: %s"
msgstr ""
-#: builtin/merge-recursive.c:45
+#: builtin/notes.c:873
#, c-format
-msgid "unknown option %s"
+msgid "a notes merge into %s is already in-progress at %s"
msgstr ""
-#: builtin/merge-recursive.c:51
+#: builtin/notes.c:876
#, c-format
-msgid "could not parse object '%s'"
+msgid "failed to store link to current notes ref (%s)"
msgstr ""
-#: builtin/merge-recursive.c:55
+#: builtin/notes.c:878
#, c-format
-msgid "cannot handle more than %d base. Ignoring %s."
-msgid_plural "cannot handle more than %d bases. Ignoring %s."
-msgstr[0] ""
-msgstr[1] ""
-
-#: builtin/merge-recursive.c:63
-msgid "not handling anything other than two heads merge."
+msgid ""
+"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
+"'git notes merge --commit', or abort the merge with 'git notes merge --"
+"abort'.\n"
msgstr ""
-#: builtin/merge-recursive.c:69 builtin/merge-recursive.c:71
+#: builtin/notes.c:900
#, c-format
-msgid "could not resolve ref '%s'"
+msgid "Object %s has no note\n"
msgstr ""
-#: builtin/merge-recursive.c:77
-#, c-format
-msgid "Merging %s with %s\n"
+#: builtin/notes.c:912
+msgid "attempt to remove non-existent note is not an error"
msgstr ""
-#: builtin/mktree.c:66
-msgid "git mktree [-z] [--missing] [--batch]"
+#: builtin/notes.c:915
+msgid "read object names from the standard input"
msgstr ""
-#: builtin/mktree.c:154
-msgid "input is NUL terminated"
+#: builtin/notes.c:954 builtin/prune.c:108 builtin/worktree.c:165
+msgid "do not remove, show only"
msgstr ""
-#: builtin/mktree.c:155 builtin/write-tree.c:25
-msgid "allow missing objects"
+#: builtin/notes.c:955
+msgid "report pruned notes"
msgstr ""
-#: builtin/mktree.c:156
-msgid "allow creation of more than one tree"
+#: builtin/notes.c:998
+msgid "notes-ref"
msgstr ""
-#: builtin/mv.c:17
-msgid "git mv [<options>] <source>... <destination>"
+#: builtin/notes.c:999
+msgid "use notes from <notes-ref>"
msgstr ""
-#: builtin/mv.c:82
+#: builtin/notes.c:1034
#, c-format
-msgid "Directory %s is in index and no submodule?"
+msgid "unknown subcommand: %s"
msgstr ""
-#: builtin/mv.c:84
-msgid "Please stage your changes to .gitmodules or stash them to proceed"
+#: builtin/pack-objects.c:51
+msgid ""
+"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
msgstr ""
-#: builtin/mv.c:102
-#, c-format
-msgid "%.*s is in index"
+#: builtin/pack-objects.c:52
+msgid ""
+"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
msgstr ""
-#: builtin/mv.c:124
-msgid "force move/rename even if target exists"
+#: builtin/pack-objects.c:423
+#, c-format
+msgid "bad packed object CRC for %s"
msgstr ""
-#: builtin/mv.c:126
-msgid "skip move/rename errors"
+#: builtin/pack-objects.c:434
+#, c-format
+msgid "corrupt packed object for %s"
msgstr ""
-#: builtin/mv.c:168
+#: builtin/pack-objects.c:565
#, c-format
-msgid "destination '%s' is not a directory"
+msgid "recursive delta detected for object %s"
msgstr ""
-#: builtin/mv.c:179
+#: builtin/pack-objects.c:776
#, c-format
-msgid "Checking rename of '%s' to '%s'\n"
+msgid "ordered %u objects, expected %<PRIu32>"
msgstr ""
-#: builtin/mv.c:183
-msgid "bad source"
+#: builtin/pack-objects.c:789
+#, c-format
+msgid "packfile is invalid: %s"
msgstr ""
-#: builtin/mv.c:186
-msgid "can not move directory into itself"
+#: builtin/pack-objects.c:793
+#, c-format
+msgid "unable to open packfile for reuse: %s"
msgstr ""
-#: builtin/mv.c:189
-msgid "cannot move directory over file"
+#: builtin/pack-objects.c:797
+msgid "unable to seek in reused packfile"
msgstr ""
-#: builtin/mv.c:198
-msgid "source directory is empty"
+#: builtin/pack-objects.c:808
+msgid "unable to read from reused packfile"
msgstr ""
-#: builtin/mv.c:223
-msgid "not under version control"
+#: builtin/pack-objects.c:836
+msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
msgstr ""
-#: builtin/mv.c:226
-msgid "destination exists"
+#: builtin/pack-objects.c:849
+msgid "Writing objects"
msgstr ""
-#: builtin/mv.c:234
+#: builtin/pack-objects.c:911 builtin/update-index.c:89
#, c-format
-msgid "overwriting '%s'"
-msgstr ""
-
-#: builtin/mv.c:237
-msgid "Cannot overwrite"
+msgid "failed to stat %s"
msgstr ""
-#: builtin/mv.c:240
-msgid "multiple sources for the same target"
+#: builtin/pack-objects.c:964
+#, c-format
+msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
msgstr ""
-#: builtin/mv.c:242
-msgid "destination directory does not exist"
+#: builtin/pack-objects.c:1158
+msgid "disabling bitmap writing, as some objects are not being packed"
msgstr ""
-#: builtin/mv.c:249
+#: builtin/pack-objects.c:1586
#, c-format
-msgid "%s, source=%s, destination=%s"
+msgid "delta base offset overflow in pack for %s"
msgstr ""
-#: builtin/mv.c:270
+#: builtin/pack-objects.c:1595
#, c-format
-msgid "Renaming %s to %s\n"
+msgid "delta base offset out of bound for %s"
msgstr ""
-#: builtin/mv.c:276 builtin/remote.c:716 builtin/repack.c:494
-#, c-format
-msgid "renaming '%s' failed"
+#: builtin/pack-objects.c:1864
+msgid "Counting objects"
msgstr ""
-#: builtin/name-rev.c:355
-msgid "git name-rev [<options>] <commit>..."
+#: builtin/pack-objects.c:1994
+#, c-format
+msgid "unable to get size of %s"
msgstr ""
-#: builtin/name-rev.c:356
-msgid "git name-rev [<options>] --all"
+#: builtin/pack-objects.c:2009
+#, c-format
+msgid "unable to parse object header of %s"
msgstr ""
-#: builtin/name-rev.c:357
-msgid "git name-rev [<options>] --stdin"
+#: builtin/pack-objects.c:2079 builtin/pack-objects.c:2095
+#: builtin/pack-objects.c:2105
+#, c-format
+msgid "object %s cannot be read"
msgstr ""
-#: builtin/name-rev.c:413
-msgid "print only names (no SHA-1)"
+#: builtin/pack-objects.c:2082 builtin/pack-objects.c:2109
+#, c-format
+msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
msgstr ""
-#: builtin/name-rev.c:414
-msgid "only use tags to name the commits"
+#: builtin/pack-objects.c:2119
+msgid "suboptimal pack - out of memory"
msgstr ""
-#: builtin/name-rev.c:416
-msgid "only use refs matching <pattern>"
+#: builtin/pack-objects.c:2445
+#, c-format
+msgid "Delta compression using up to %d threads"
msgstr ""
-#: builtin/name-rev.c:418
-msgid "ignore refs matching <pattern>"
+#: builtin/pack-objects.c:2577
+#, c-format
+msgid "unable to pack objects reachable from tag %s"
msgstr ""
-#: builtin/name-rev.c:420
-msgid "list all commits reachable from all refs"
+#: builtin/pack-objects.c:2664
+msgid "Compressing objects"
msgstr ""
-#: builtin/name-rev.c:421
-msgid "read from stdin"
+#: builtin/pack-objects.c:2670
+msgid "inconsistency with delta count"
msgstr ""
-#: builtin/name-rev.c:422
-msgid "allow to print `undefined` names (default)"
+#: builtin/pack-objects.c:2751
+#, c-format
+msgid ""
+"expected edge object ID, got garbage:\n"
+" %s"
msgstr ""
-#: builtin/name-rev.c:428
-msgid "dereference tags in the input (internal use)"
+#: builtin/pack-objects.c:2757
+#, c-format
+msgid ""
+"expected object ID, got garbage:\n"
+" %s"
msgstr ""
-#: builtin/notes.c:28
-msgid "git notes [--ref <notes-ref>] [list [<object>]]"
+#: builtin/pack-objects.c:2855
+msgid "invalid value for --missing"
msgstr ""
-#: builtin/notes.c:29
-msgid ""
-"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
-"| (-c | -C) <object>] [<object>]"
+#: builtin/pack-objects.c:2914 builtin/pack-objects.c:3022
+msgid "cannot open pack index"
msgstr ""
-#: builtin/notes.c:30
-msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
+#: builtin/pack-objects.c:2945
+#, c-format
+msgid "loose object at %s could not be examined"
msgstr ""
-#: builtin/notes.c:31
-msgid ""
-"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
-"(-c | -C) <object>] [<object>]"
+#: builtin/pack-objects.c:3030
+msgid "unable to force loose object"
msgstr ""
-#: builtin/notes.c:32
-msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
+#: builtin/pack-objects.c:3122
+#, c-format
+msgid "not a rev '%s'"
msgstr ""
-#: builtin/notes.c:33
-msgid "git notes [--ref <notes-ref>] show [<object>]"
+#: builtin/pack-objects.c:3125
+#, c-format
+msgid "bad revision '%s'"
msgstr ""
-#: builtin/notes.c:34
-msgid ""
-"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
+#: builtin/pack-objects.c:3150
+msgid "unable to add recent objects"
msgstr ""
-#: builtin/notes.c:35
-msgid "git notes merge --commit [-v | -q]"
+#: builtin/pack-objects.c:3203
+#, c-format
+msgid "unsupported index version %s"
msgstr ""
-#: builtin/notes.c:36
-msgid "git notes merge --abort [-v | -q]"
+#: builtin/pack-objects.c:3207
+#, c-format
+msgid "bad index version '%s'"
msgstr ""
-#: builtin/notes.c:37
-msgid "git notes [--ref <notes-ref>] remove [<object>...]"
+#: builtin/pack-objects.c:3237
+msgid "do not show progress meter"
msgstr ""
-#: builtin/notes.c:38
-msgid "git notes [--ref <notes-ref>] prune [-n] [-v]"
+#: builtin/pack-objects.c:3239
+msgid "show progress meter"
msgstr ""
-#: builtin/notes.c:39
-msgid "git notes [--ref <notes-ref>] get-ref"
+#: builtin/pack-objects.c:3241
+msgid "show progress meter during object writing phase"
msgstr ""
-#: builtin/notes.c:44
-msgid "git notes [list [<object>]]"
+#: builtin/pack-objects.c:3244
+msgid "similar to --all-progress when progress meter is shown"
msgstr ""
-#: builtin/notes.c:49
-msgid "git notes add [<options>] [<object>]"
+#: builtin/pack-objects.c:3245
+msgid "<version>[,<offset>]"
msgstr ""
-#: builtin/notes.c:54
-msgid "git notes copy [<options>] <from-object> <to-object>"
+#: builtin/pack-objects.c:3246
+msgid "write the pack index file in the specified idx format version"
msgstr ""
-#: builtin/notes.c:55
-msgid "git notes copy --stdin [<from-object> <to-object>]..."
+#: builtin/pack-objects.c:3249
+msgid "maximum size of each output pack file"
msgstr ""
-#: builtin/notes.c:60
-msgid "git notes append [<options>] [<object>]"
+#: builtin/pack-objects.c:3251
+msgid "ignore borrowed objects from alternate object store"
msgstr ""
-#: builtin/notes.c:65
-msgid "git notes edit [<object>]"
+#: builtin/pack-objects.c:3253
+msgid "ignore packed objects"
msgstr ""
-#: builtin/notes.c:70
-msgid "git notes show [<object>]"
+#: builtin/pack-objects.c:3255
+msgid "limit pack window by objects"
msgstr ""
-#: builtin/notes.c:75
-msgid "git notes merge [<options>] <notes-ref>"
+#: builtin/pack-objects.c:3257
+msgid "limit pack window by memory in addition to object limit"
msgstr ""
-#: builtin/notes.c:76
-msgid "git notes merge --commit [<options>]"
+#: builtin/pack-objects.c:3259
+msgid "maximum length of delta chain allowed in the resulting pack"
msgstr ""
-#: builtin/notes.c:77
-msgid "git notes merge --abort [<options>]"
+#: builtin/pack-objects.c:3261
+msgid "reuse existing deltas"
msgstr ""
-#: builtin/notes.c:82
-msgid "git notes remove [<object>]"
+#: builtin/pack-objects.c:3263
+msgid "reuse existing objects"
msgstr ""
-#: builtin/notes.c:87
-msgid "git notes prune [<options>]"
+#: builtin/pack-objects.c:3265
+msgid "use OFS_DELTA objects"
msgstr ""
-#: builtin/notes.c:92
-msgid "git notes get-ref"
+#: builtin/pack-objects.c:3267
+msgid "use threads when searching for best delta matches"
msgstr ""
-#: builtin/notes.c:97
-msgid "Write/edit the notes for the following object:"
+#: builtin/pack-objects.c:3269
+msgid "do not create an empty pack output"
msgstr ""
-#: builtin/notes.c:150
-#, c-format
-msgid "unable to start 'show' for object '%s'"
+#: builtin/pack-objects.c:3271
+msgid "read revision arguments from standard input"
msgstr ""
-#: builtin/notes.c:154
-msgid "could not read 'show' output"
+#: builtin/pack-objects.c:3273
+msgid "limit the objects to those that are not yet packed"
msgstr ""
-#: builtin/notes.c:162
-#, c-format
-msgid "failed to finish 'show' for object '%s'"
+#: builtin/pack-objects.c:3276
+msgid "include objects reachable from any reference"
msgstr ""
-#: builtin/notes.c:197
-msgid "please supply the note contents using either -m or -F option"
+#: builtin/pack-objects.c:3279
+msgid "include objects referred by reflog entries"
msgstr ""
-#: builtin/notes.c:206
-msgid "unable to write note object"
+#: builtin/pack-objects.c:3282
+msgid "include objects referred to by the index"
msgstr ""
-#: builtin/notes.c:208
-#, c-format
-msgid "the note contents have been left in %s"
+#: builtin/pack-objects.c:3285
+msgid "output pack to stdout"
msgstr ""
-#: builtin/notes.c:236 builtin/tag.c:508
-#, c-format
-msgid "cannot read '%s'"
+#: builtin/pack-objects.c:3287
+msgid "include tag objects that refer to objects to be packed"
msgstr ""
-#: builtin/notes.c:238 builtin/tag.c:511
-#, c-format
-msgid "could not open or read '%s'"
+#: builtin/pack-objects.c:3289
+msgid "keep unreachable objects"
msgstr ""
-#: 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."
+#: builtin/pack-objects.c:3291
+msgid "pack loose unreachable objects"
msgstr ""
-#: builtin/notes.c:260
-#, c-format
-msgid "failed to read object '%s'."
+#: builtin/pack-objects.c:3293
+msgid "unpack unreachable objects newer than <time>"
msgstr ""
-#: builtin/notes.c:264
-#, c-format
-msgid "cannot read note data from non-blob object '%s'."
+#: builtin/pack-objects.c:3296
+msgid "use the sparse reachability algorithm"
msgstr ""
-#: builtin/notes.c:304
-#, c-format
-msgid "malformed input line: '%s'."
+#: builtin/pack-objects.c:3298
+msgid "create thin packs"
msgstr ""
-#: builtin/notes.c:319
-#, c-format
-msgid "failed to copy notes from '%s' to '%s'"
+#: builtin/pack-objects.c:3300
+msgid "create packs suitable for shallow fetches"
msgstr ""
-#. TRANSLATORS: the first %s will be replaced by a git
-#. notes command: 'add', 'merge', 'remove', etc.
-#.
-#: builtin/notes.c:351
-#, c-format
-msgid "refusing to %s notes in %s (outside of refs/notes/)"
+#: builtin/pack-objects.c:3302
+msgid "ignore packs that have companion .keep file"
msgstr ""
-#: 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"
+#: builtin/pack-objects.c:3304
+msgid "ignore this pack"
msgstr ""
-#: builtin/notes.c:384 builtin/notes.c:670
-#, c-format
-msgid "no note found for object %s."
+#: builtin/pack-objects.c:3306
+msgid "pack compression level"
msgstr ""
-#: builtin/notes.c:405 builtin/notes.c:568
-msgid "note contents as a string"
+#: builtin/pack-objects.c:3308
+msgid "do not hide commits by grafts"
msgstr ""
-#: builtin/notes.c:408 builtin/notes.c:571
-msgid "note contents in a file"
+#: builtin/pack-objects.c:3310
+msgid "use a bitmap index if available to speed up counting objects"
msgstr ""
-#: builtin/notes.c:411 builtin/notes.c:574
-msgid "reuse and edit specified note object"
+#: builtin/pack-objects.c:3312
+msgid "write a bitmap index together with the pack index"
msgstr ""
-#: builtin/notes.c:414 builtin/notes.c:577
-msgid "reuse specified note object"
+#: builtin/pack-objects.c:3315
+msgid "handling for missing objects"
msgstr ""
-#: builtin/notes.c:417 builtin/notes.c:580
-msgid "allow storing empty note"
+#: builtin/pack-objects.c:3318
+msgid "do not pack objects in promisor packfiles"
msgstr ""
-#: builtin/notes.c:418 builtin/notes.c:489
-msgid "replace existing notes"
+#: builtin/pack-objects.c:3320
+msgid "respect islands during delta compression"
msgstr ""
-#: builtin/notes.c:443
+#: builtin/pack-objects.c:3345
#, c-format
-msgid ""
-"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
-"existing notes"
+msgid "delta chain depth %d is too deep, forcing %d"
msgstr ""
-#: builtin/notes.c:458 builtin/notes.c:537
+#: builtin/pack-objects.c:3350
#, c-format
-msgid "Overwriting existing notes for object %s\n"
+msgid "pack.deltaCacheLimit is too high, forcing %d"
msgstr ""
-#: builtin/notes.c:469 builtin/notes.c:629 builtin/notes.c:894
-#, c-format
-msgid "Removing note for object %s\n"
+#: builtin/pack-objects.c:3404
+msgid "--max-pack-size cannot be used to build a pack for transfer"
msgstr ""
-#: builtin/notes.c:490
-msgid "read objects from stdin"
+#: builtin/pack-objects.c:3406
+msgid "minimum pack size limit is 1 MiB"
msgstr ""
-#: builtin/notes.c:492
-msgid "load rewriting config for <command> (implies --stdin)"
+#: builtin/pack-objects.c:3411
+msgid "--thin cannot be used to build an indexable pack"
msgstr ""
-#: builtin/notes.c:510
-msgid "too few parameters"
+#: builtin/pack-objects.c:3414
+msgid "--keep-unreachable and --unpack-unreachable are incompatible"
msgstr ""
-#: builtin/notes.c:531
-#, c-format
-msgid ""
-"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
-"existing notes"
+#: builtin/pack-objects.c:3420
+msgid "cannot use --filter without --stdout"
msgstr ""
-#: builtin/notes.c:543
-#, c-format
-msgid "missing notes on source object %s. Cannot copy."
+#: builtin/pack-objects.c:3479
+msgid "Enumerating objects"
msgstr ""
-#: builtin/notes.c:595
+#: builtin/pack-objects.c:3498
#, 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"
+msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)"
msgstr ""
-#: builtin/notes.c:690
-msgid "failed to delete ref NOTES_MERGE_PARTIAL"
+#: builtin/pack-refs.c:7
+msgid "git pack-refs [<options>]"
msgstr ""
-#: builtin/notes.c:692
-msgid "failed to delete ref NOTES_MERGE_REF"
+#: builtin/pack-refs.c:15
+msgid "pack everything"
msgstr ""
-#: builtin/notes.c:694
-msgid "failed to remove 'git notes merge' worktree"
+#: builtin/pack-refs.c:16
+msgid "prune loose refs (default)"
msgstr ""
-#: builtin/notes.c:714
-msgid "failed to read ref NOTES_MERGE_PARTIAL"
+#: builtin/prune-packed.c:9
+msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
msgstr ""
-#: builtin/notes.c:716
-msgid "could not find commit from NOTES_MERGE_PARTIAL."
+#: builtin/prune-packed.c:42
+msgid "Removing duplicate objects"
msgstr ""
-#: builtin/notes.c:718
-msgid "could not parse commit from NOTES_MERGE_PARTIAL."
+#: builtin/prune.c:12
+msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
msgstr ""
-#: builtin/notes.c:731
-msgid "failed to resolve NOTES_MERGE_REF"
+#: builtin/prune.c:109
+msgid "report pruned objects"
msgstr ""
-#: builtin/notes.c:734
-msgid "failed to finalize notes merge"
+#: builtin/prune.c:112
+msgid "expire objects older than <time>"
+msgstr ""
+
+#: builtin/prune.c:114
+msgid "limit traversal to objects outside promisor packfiles"
+msgstr ""
+
+#: builtin/prune.c:128
+msgid "cannot prune in a precious-objects repo"
msgstr ""
-#: builtin/notes.c:760
+#: builtin/pull.c:61 builtin/pull.c:63
#, c-format
-msgid "unknown notes merge strategy %s"
+msgid "Invalid value for %s: %s"
msgstr ""
-#: builtin/notes.c:776
-msgid "General options"
+#: builtin/pull.c:83
+msgid "git pull [<options>] [<repository> [<refspec>...]]"
msgstr ""
-#: builtin/notes.c:778
-msgid "Merge options"
+#: builtin/pull.c:134
+msgid "control for recursive fetching of submodules"
msgstr ""
-#: builtin/notes.c:780
-msgid ""
-"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
-"cat_sort_uniq)"
+#: builtin/pull.c:138
+msgid "Options related to merging"
msgstr ""
-#: builtin/notes.c:782
-msgid "Committing unmerged notes"
+#: builtin/pull.c:141
+msgid "incorporate changes by rebasing rather than merging"
msgstr ""
-#: builtin/notes.c:784
-msgid "finalize notes merge by committing unmerged notes"
+#: builtin/pull.c:168 builtin/rebase--interactive.c:149 builtin/revert.c:123
+msgid "allow fast-forward"
msgstr ""
-#: builtin/notes.c:786
-msgid "Aborting notes merge resolution"
+#: builtin/pull.c:177
+msgid "automatically stash/stash pop before and after rebase"
msgstr ""
-#: builtin/notes.c:788
-msgid "abort notes merge"
+#: builtin/pull.c:193
+msgid "Options related to fetching"
msgstr ""
-#: builtin/notes.c:799
-msgid "cannot mix --commit, --abort or -s/--strategy"
+#: builtin/pull.c:203
+msgid "force overwrite of local branch"
msgstr ""
-#: builtin/notes.c:804
-msgid "must specify a notes ref to merge"
+#: builtin/pull.c:211
+msgid "number of submodules pulled in parallel"
msgstr ""
-#: builtin/notes.c:828
+#: builtin/pull.c:306
#, c-format
-msgid "unknown -s/--strategy: %s"
+msgid "Invalid value for pull.ff: %s"
msgstr ""
-#: builtin/notes.c:865
-#, c-format
-msgid "a notes merge into %s is already in-progress at %s"
+#: builtin/pull.c:422
+msgid ""
+"There is no candidate for rebasing against among the refs that you just "
+"fetched."
msgstr ""
-#: builtin/notes.c:868
-#, c-format
-msgid "failed to store link to current notes ref (%s)"
+#: builtin/pull.c:424
+msgid ""
+"There are no candidates for merging among the refs that you just fetched."
msgstr ""
-#: builtin/notes.c:870
-#, c-format
+#: builtin/pull.c:425
msgid ""
-"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
-"'git notes merge --commit', or abort the merge with 'git notes merge --"
-"abort'.\n"
+"Generally this means that you provided a wildcard refspec which had no\n"
+"matches on the remote end."
msgstr ""
-#: builtin/notes.c:892
+#: builtin/pull.c:428
#, c-format
-msgid "Object %s has no note\n"
+msgid ""
+"You asked to pull from the remote '%s', but did not specify\n"
+"a branch. Because this is not the default configured remote\n"
+"for your current branch, you must specify a branch on the command line."
msgstr ""
-#: builtin/notes.c:904
-msgid "attempt to remove non-existent note is not an error"
+#: builtin/pull.c:433 builtin/rebase.c:956 git-parse-remote.sh:73
+msgid "You are not currently on a branch."
msgstr ""
-#: builtin/notes.c:907
-msgid "read object names from the standard input"
+#: builtin/pull.c:435 builtin/pull.c:450 git-parse-remote.sh:79
+msgid "Please specify which branch you want to rebase against."
msgstr ""
-#: builtin/notes.c:945 builtin/prune.c:108 builtin/worktree.c:152
-msgid "do not remove, show only"
+#: builtin/pull.c:437 builtin/pull.c:452 git-parse-remote.sh:82
+msgid "Please specify which branch you want to merge with."
msgstr ""
-#: builtin/notes.c:946
-msgid "report pruned notes"
+#: builtin/pull.c:438 builtin/pull.c:453
+msgid "See git-pull(1) for details."
msgstr ""
-#: builtin/notes.c:988
-msgid "notes-ref"
+#: builtin/pull.c:440 builtin/pull.c:446 builtin/pull.c:455
+#: builtin/rebase.c:962 git-parse-remote.sh:64
+msgid "<remote>"
msgstr ""
-#: builtin/notes.c:989
-msgid "use notes from <notes-ref>"
+#: builtin/pull.c:440 builtin/pull.c:455 builtin/pull.c:460
+#: git-legacy-rebase.sh:564 git-parse-remote.sh:65
+msgid "<branch>"
msgstr ""
-#: builtin/notes.c:1024
-#, c-format
-msgid "unknown subcommand: %s"
+#: builtin/pull.c:448 builtin/rebase.c:954 git-parse-remote.sh:75
+msgid "There is no tracking information for the current branch."
msgstr ""
-#: builtin/pack-objects.c:48
+#: builtin/pull.c:457 git-parse-remote.sh:95
msgid ""
-"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
+"If you wish to set tracking information for this branch you can do so with:"
msgstr ""
-#: builtin/pack-objects.c:49
+#: builtin/pull.c:462
+#, c-format
msgid ""
-"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
+"Your configuration specifies to merge with the ref '%s'\n"
+"from the remote, but no such ref was fetched."
msgstr ""
-#: builtin/pack-objects.c:414
+#: builtin/pull.c:566
#, c-format
-msgid "bad packed object CRC for %s"
+msgid "unable to access commit %s"
msgstr ""
-#: builtin/pack-objects.c:425
-#, c-format
-msgid "corrupt packed object for %s"
+#: builtin/pull.c:844
+msgid "ignoring --verify-signatures for rebase"
msgstr ""
-#: builtin/pack-objects.c:556
-#, c-format
-msgid "recursive delta detected for object %s"
+#: builtin/pull.c:892
+msgid "--[no-]autostash option is only valid with --rebase."
msgstr ""
-#: builtin/pack-objects.c:756
-#, c-format
-msgid "ordered %u objects, expected %<PRIu32>"
+#: builtin/pull.c:900
+msgid "Updating an unborn branch with changes added to the index."
+msgstr ""
+
+#: builtin/pull.c:904
+msgid "pull with rebase"
+msgstr ""
+
+#: builtin/pull.c:905
+msgid "please commit or stash them."
msgstr ""
-#: builtin/pack-objects.c:769
+#: builtin/pull.c:930
#, c-format
-msgid "packfile is invalid: %s"
+msgid ""
+"fetch updated the current branch head.\n"
+"fast-forwarding your working tree from\n"
+"commit %s."
msgstr ""
-#: builtin/pack-objects.c:773
+#: builtin/pull.c:936
#, c-format
-msgid "unable to open packfile for reuse: %s"
+msgid ""
+"Cannot fast-forward your working tree.\n"
+"After making sure that you saved anything precious from\n"
+"$ git diff %s\n"
+"output, run\n"
+"$ git reset --hard\n"
+"to recover."
msgstr ""
-#: builtin/pack-objects.c:777
-msgid "unable to seek in reused packfile"
+#: builtin/pull.c:951
+msgid "Cannot merge multiple branches into empty head."
msgstr ""
-#: builtin/pack-objects.c:788
-msgid "unable to read from reused packfile"
+#: builtin/pull.c:955
+msgid "Cannot rebase onto multiple branches."
msgstr ""
-#: builtin/pack-objects.c:816
-msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
+#: builtin/pull.c:962
+msgid "cannot rebase with locally recorded submodule modifications"
msgstr ""
-#: builtin/pack-objects.c:829
-msgid "Writing objects"
+#: builtin/push.c:19
+msgid "git push [<options>] [<repository> [<refspec>...]]"
msgstr ""
-#: builtin/pack-objects.c:891 builtin/update-index.c:88
-#, c-format
-msgid "failed to stat %s"
+#: builtin/push.c:111
+msgid "tag shorthand without <tag>"
msgstr ""
-#: builtin/pack-objects.c:944
-#, c-format
-msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
+#: builtin/push.c:121
+msgid "--delete only accepts plain target ref names"
msgstr ""
-#: builtin/pack-objects.c:1112
-msgid "disabling bitmap writing, as some objects are not being packed"
+#: builtin/push.c:167
+msgid ""
+"\n"
+"To choose either option permanently, see push.default in 'git help config'."
msgstr ""
-#: builtin/pack-objects.c:1489
+#: builtin/push.c:170
#, c-format
-msgid "delta base offset overflow in pack for %s"
+msgid ""
+"The upstream branch of your current branch does not match\n"
+"the name of your current branch. To push to the upstream branch\n"
+"on the remote, use\n"
+"\n"
+" git push %s HEAD:%s\n"
+"\n"
+"To push to the branch of the same name on the remote, use\n"
+"\n"
+" git push %s HEAD\n"
+"%s"
msgstr ""
-#: builtin/pack-objects.c:1498
+#: builtin/push.c:185
#, c-format
-msgid "delta base offset out of bound for %s"
+msgid ""
+"You are not currently on a branch.\n"
+"To push the history leading to the current (detached HEAD)\n"
+"state now, use\n"
+"\n"
+" git push %s HEAD:<name-of-remote-branch>\n"
msgstr ""
-#: builtin/pack-objects.c:1771
-msgid "Counting objects"
+#: builtin/push.c:199
+#, c-format
+msgid ""
+"The current branch %s has no upstream branch.\n"
+"To push the current branch and set the remote as upstream, use\n"
+"\n"
+" git push --set-upstream %s %s\n"
msgstr ""
-#: builtin/pack-objects.c:1913
+#: builtin/push.c:207
#, c-format
-msgid "unable to get size of %s"
+msgid "The current branch %s has multiple upstream branches, refusing to push."
msgstr ""
-#: builtin/pack-objects.c:1928
+#: builtin/push.c:210
#, c-format
-msgid "unable to parse object header of %s"
+msgid ""
+"You are pushing to remote '%s', which is not the upstream of\n"
+"your current branch '%s', without telling me what to push\n"
+"to update which remote branch."
msgstr ""
-#: builtin/pack-objects.c:1995 builtin/pack-objects.c:2011
-#: builtin/pack-objects.c:2021
-#, c-format
-msgid "object %s cannot be read"
+#: builtin/push.c:269
+msgid ""
+"You didn't specify any refspecs to push, and push.default is \"nothing\"."
msgstr ""
-#: builtin/pack-objects.c:1998 builtin/pack-objects.c:2025
-#, c-format
-msgid "object %s inconsistent object length (%lu vs %lu)"
+#: builtin/push.c:276
+msgid ""
+"Updates were rejected because the tip of your current branch is behind\n"
+"its remote counterpart. Integrate the remote changes (e.g.\n"
+"'git pull ...') before pushing again.\n"
+"See the 'Note about fast-forwards' in 'git push --help' for details."
msgstr ""
-#: builtin/pack-objects.c:2035
-msgid "suboptimal pack - out of memory"
+#: builtin/push.c:282
+msgid ""
+"Updates were rejected because a pushed branch tip is behind its remote\n"
+"counterpart. Check out this branch and integrate the remote changes\n"
+"(e.g. 'git pull ...') before pushing again.\n"
+"See the 'Note about fast-forwards' in 'git push --help' for details."
msgstr ""
-#: builtin/pack-objects.c:2366
-#, c-format
-msgid "Delta compression using up to %d threads"
+#: builtin/push.c:288
+msgid ""
+"Updates were rejected because the remote contains work that you do\n"
+"not have locally. This is usually caused by another repository pushing\n"
+"to the same ref. You may want to first integrate the remote changes\n"
+"(e.g., 'git pull ...') before pushing again.\n"
+"See the 'Note about fast-forwards' in 'git push --help' for details."
msgstr ""
-#: builtin/pack-objects.c:2502
-#, c-format
-msgid "unable to pack objects reachable from tag %s"
+#: builtin/push.c:295
+msgid "Updates were rejected because the tag already exists in the remote."
msgstr ""
-#: builtin/pack-objects.c:2586
-msgid "Compressing objects"
+#: builtin/push.c:298
+msgid ""
+"You cannot update a remote ref that points at a non-commit object,\n"
+"or update a remote ref to make it point at a non-commit object,\n"
+"without using the '--force' option.\n"
msgstr ""
-#: builtin/pack-objects.c:2592
-msgid "inconsistency with delta count"
+#: builtin/push.c:359
+#, c-format
+msgid "Pushing to %s\n"
msgstr ""
-#: builtin/pack-objects.c:2671
+#: builtin/push.c:364
#, c-format
-msgid ""
-"expected edge object ID, got garbage:\n"
-" %s"
+msgid "failed to push some refs to '%s'"
msgstr ""
-#: builtin/pack-objects.c:2677
+#: builtin/push.c:398
#, c-format
+msgid "bad repository '%s'"
+msgstr ""
+
+#: builtin/push.c:399
msgid ""
-"expected object ID, got garbage:\n"
-" %s"
+"No configured push destination.\n"
+"Either specify the URL from the command-line or configure a remote "
+"repository using\n"
+"\n"
+" git remote add <name> <url>\n"
+"\n"
+"and then push using the remote name\n"
+"\n"
+" git push <name>\n"
msgstr ""
-#: builtin/pack-objects.c:2757
-msgid "invalid value for --missing"
+#: builtin/push.c:554
+msgid "repository"
msgstr ""
-#: builtin/pack-objects.c:2816 builtin/pack-objects.c:2924
-msgid "cannot open pack index"
+#: builtin/push.c:555 builtin/send-pack.c:164
+msgid "push all refs"
msgstr ""
-#: builtin/pack-objects.c:2847
-#, c-format
-msgid "loose object at %s could not be examined"
+#: builtin/push.c:556 builtin/send-pack.c:166
+msgid "mirror all refs"
msgstr ""
-#: builtin/pack-objects.c:2932
-msgid "unable to force loose object"
+#: builtin/push.c:558
+msgid "delete refs"
msgstr ""
-#: builtin/pack-objects.c:3019
-#, c-format
-msgid "not a rev '%s'"
+#: builtin/push.c:559
+msgid "push tags (can't be used with --all or --mirror)"
msgstr ""
-#: builtin/pack-objects.c:3022
-#, c-format
-msgid "bad revision '%s'"
+#: builtin/push.c:562 builtin/send-pack.c:167
+msgid "force updates"
msgstr ""
-#: builtin/pack-objects.c:3042
-msgid "unable to add recent objects"
+#: builtin/push.c:564 builtin/send-pack.c:181
+msgid "<refname>:<expect>"
msgstr ""
-#: builtin/pack-objects.c:3092
-#, c-format
-msgid "unsupported index version %s"
+#: builtin/push.c:565 builtin/send-pack.c:182
+msgid "require old value of ref to be at this value"
msgstr ""
-#: builtin/pack-objects.c:3096
-#, c-format
-msgid "bad index version '%s'"
+#: builtin/push.c:568
+msgid "control recursive pushing of submodules"
msgstr ""
-#: builtin/pack-objects.c:3127
-msgid "do not show progress meter"
+#: builtin/push.c:570 builtin/send-pack.c:175
+msgid "use thin pack"
msgstr ""
-#: builtin/pack-objects.c:3129
-msgid "show progress meter"
+#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:161
+#: builtin/send-pack.c:162
+msgid "receive pack program"
msgstr ""
-#: builtin/pack-objects.c:3131
-msgid "show progress meter during object writing phase"
+#: builtin/push.c:573
+msgid "set upstream for git pull/status"
msgstr ""
-#: builtin/pack-objects.c:3134
-msgid "similar to --all-progress when progress meter is shown"
+#: builtin/push.c:576
+msgid "prune locally removed refs"
msgstr ""
-#: builtin/pack-objects.c:3135
-msgid "<version>[,<offset>]"
+#: builtin/push.c:578
+msgid "bypass pre-push hook"
msgstr ""
-#: builtin/pack-objects.c:3136
-msgid "write the pack index file in the specified idx format version"
+#: builtin/push.c:579
+msgid "push missing but relevant tags"
msgstr ""
-#: builtin/pack-objects.c:3139
-msgid "maximum size of each output pack file"
+#: builtin/push.c:582 builtin/send-pack.c:169
+msgid "GPG sign the push"
msgstr ""
-#: builtin/pack-objects.c:3141
-msgid "ignore borrowed objects from alternate object store"
+#: builtin/push.c:584 builtin/send-pack.c:176
+msgid "request atomic transaction on remote side"
msgstr ""
-#: builtin/pack-objects.c:3143
-msgid "ignore packed objects"
+#: builtin/push.c:602
+msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr ""
-#: builtin/pack-objects.c:3145
-msgid "limit pack window by objects"
+#: builtin/push.c:604
+msgid "--delete doesn't make sense without any refs"
msgstr ""
-#: builtin/pack-objects.c:3147
-msgid "limit pack window by memory in addition to object limit"
+#: builtin/push.c:607
+msgid "--all and --tags are incompatible"
msgstr ""
-#: builtin/pack-objects.c:3149
-msgid "maximum length of delta chain allowed in the resulting pack"
+#: builtin/push.c:609
+msgid "--all can't be combined with refspecs"
msgstr ""
-#: builtin/pack-objects.c:3151
-msgid "reuse existing deltas"
+#: builtin/push.c:613
+msgid "--mirror and --tags are incompatible"
msgstr ""
-#: builtin/pack-objects.c:3153
-msgid "reuse existing objects"
+#: builtin/push.c:615
+msgid "--mirror can't be combined with refspecs"
msgstr ""
-#: builtin/pack-objects.c:3155
-msgid "use OFS_DELTA objects"
+#: builtin/push.c:618
+msgid "--all and --mirror are incompatible"
msgstr ""
-#: builtin/pack-objects.c:3157
-msgid "use threads when searching for best delta matches"
+#: builtin/push.c:637
+msgid "push options must not have new line characters"
msgstr ""
-#: builtin/pack-objects.c:3159
-msgid "do not create an empty pack output"
+#: builtin/range-diff.c:8
+msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>"
msgstr ""
-#: builtin/pack-objects.c:3161
-msgid "read revision arguments from standard input"
+#: builtin/range-diff.c:9
+msgid "git range-diff [<options>] <old-tip>...<new-tip>"
msgstr ""
-#: builtin/pack-objects.c:3163
-msgid "limit the objects to those that are not yet packed"
+#: builtin/range-diff.c:10
+msgid "git range-diff [<options>] <base> <old-tip> <new-tip>"
msgstr ""
-#: builtin/pack-objects.c:3166
-msgid "include objects reachable from any reference"
+#: builtin/range-diff.c:21
+msgid "Percentage by which creation is weighted"
msgstr ""
-#: builtin/pack-objects.c:3169
-msgid "include objects referred by reflog entries"
+#: builtin/range-diff.c:23
+msgid "use simple diff colors"
msgstr ""
-#: builtin/pack-objects.c:3172
-msgid "include objects referred to by the index"
+#: builtin/range-diff.c:61 builtin/range-diff.c:65
+#, c-format
+msgid "no .. in range: '%s'"
msgstr ""
-#: builtin/pack-objects.c:3175
-msgid "output pack to stdout"
+#: builtin/range-diff.c:75
+msgid "single arg format must be symmetric range"
msgstr ""
-#: builtin/pack-objects.c:3177
-msgid "include tag objects that refer to objects to be packed"
+#: builtin/range-diff.c:90
+msgid "need two commit ranges"
msgstr ""
-#: builtin/pack-objects.c:3179
-msgid "keep unreachable objects"
+#: builtin/read-tree.c:41
+msgid ""
+"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
+"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
+"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
msgstr ""
-#: builtin/pack-objects.c:3181
-msgid "pack loose unreachable objects"
+#: builtin/read-tree.c:124
+msgid "write resulting index to <file>"
msgstr ""
-#: builtin/pack-objects.c:3183
-msgid "unpack unreachable objects newer than <time>"
+#: builtin/read-tree.c:127
+msgid "only empty the index"
msgstr ""
-#: builtin/pack-objects.c:3186
-msgid "create thin packs"
+#: builtin/read-tree.c:129
+msgid "Merging"
msgstr ""
-#: builtin/pack-objects.c:3188
-msgid "create packs suitable for shallow fetches"
+#: builtin/read-tree.c:131
+msgid "perform a merge in addition to a read"
msgstr ""
-#: builtin/pack-objects.c:3190
-msgid "ignore packs that have companion .keep file"
+#: builtin/read-tree.c:133
+msgid "3-way merge if no file level merging required"
msgstr ""
-#: builtin/pack-objects.c:3192
-msgid "ignore this pack"
+#: builtin/read-tree.c:135
+msgid "3-way merge in presence of adds and removes"
msgstr ""
-#: builtin/pack-objects.c:3194
-msgid "pack compression level"
+#: builtin/read-tree.c:137
+msgid "same as -m, but discard unmerged entries"
msgstr ""
-#: builtin/pack-objects.c:3196
-msgid "do not hide commits by grafts"
+#: builtin/read-tree.c:138
+msgid "<subdirectory>/"
msgstr ""
-#: builtin/pack-objects.c:3198
-msgid "use a bitmap index if available to speed up counting objects"
+#: builtin/read-tree.c:139
+msgid "read the tree into the index under <subdirectory>/"
msgstr ""
-#: builtin/pack-objects.c:3200
-msgid "write a bitmap index together with the pack index"
+#: builtin/read-tree.c:142
+msgid "update working tree with merge result"
msgstr ""
-#: builtin/pack-objects.c:3203
-msgid "handling for missing objects"
+#: builtin/read-tree.c:144
+msgid "gitignore"
msgstr ""
-#: builtin/pack-objects.c:3206
-msgid "do not pack objects in promisor packfiles"
+#: builtin/read-tree.c:145
+msgid "allow explicitly ignored files to be overwritten"
msgstr ""
-#: builtin/pack-objects.c:3230
-#, c-format
-msgid "delta chain depth %d is too deep, forcing %d"
+#: builtin/read-tree.c:148
+msgid "don't check the working tree after merging"
msgstr ""
-#: builtin/pack-objects.c:3235
-#, c-format
-msgid "pack.deltaCacheLimit is too high, forcing %d"
+#: builtin/read-tree.c:149
+msgid "don't update the index or the work tree"
msgstr ""
-#: builtin/pack-objects.c:3291
-msgid "--max-pack-size cannot be used to build a pack for transfer"
+#: builtin/read-tree.c:151
+msgid "skip applying sparse checkout filter"
msgstr ""
-#: builtin/pack-objects.c:3293
-msgid "minimum pack size limit is 1 MiB"
+#: builtin/read-tree.c:153
+msgid "debug unpack-trees"
msgstr ""
-#: builtin/pack-objects.c:3298
-msgid "--thin cannot be used to build an indexable pack"
+#: builtin/rebase.c:30
+msgid ""
+"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] "
+"[<branch>]"
msgstr ""
-#: builtin/pack-objects.c:3301
-msgid "--keep-unreachable and --unpack-unreachable are incompatible"
+#: builtin/rebase.c:32
+msgid ""
+"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]"
msgstr ""
-#: builtin/pack-objects.c:3307
-msgid "cannot use --filter without --stdout"
+#: builtin/rebase.c:34
+msgid "git rebase --continue | --abort | --skip | --edit-todo"
msgstr ""
-#: builtin/pack-objects.c:3363
-msgid "Enumerating objects"
+#: builtin/rebase.c:121 builtin/rebase.c:1437
+#, c-format
+msgid "%s requires an interactive rebase"
msgstr ""
-#: builtin/pack-objects.c:3382
+#: builtin/rebase.c:173
#, c-format
-msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)"
+msgid "could not get 'onto': '%s'"
msgstr ""
-#: builtin/pack-refs.c:7
-msgid "git pack-refs [<options>]"
+#: builtin/rebase.c:188
+#, c-format
+msgid "invalid orig-head: '%s'"
msgstr ""
-#: builtin/pack-refs.c:15
-msgid "pack everything"
+#: builtin/rebase.c:213
+#, c-format
+msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
msgstr ""
-#: builtin/pack-refs.c:16
-msgid "prune loose refs (default)"
+#: builtin/rebase.c:289
+#, c-format
+msgid "Could not read '%s'"
msgstr ""
-#: builtin/prune-packed.c:9
-msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
+#: builtin/rebase.c:307
+#, c-format
+msgid "Cannot store %s"
msgstr ""
-#: builtin/prune-packed.c:42
-msgid "Removing duplicate objects"
+#: builtin/rebase.c:402
+msgid "could not determine HEAD revision"
msgstr ""
-#: builtin/prune.c:12
-msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
+#: builtin/rebase.c:522
+msgid ""
+"Resolve all conflicts manually, mark them as resolved with\n"
+"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
+"You can instead skip this commit: run \"git rebase --skip\".\n"
+"To abort and get back to the state before \"git rebase\", run \"git rebase --"
+"abort\"."
msgstr ""
-#: builtin/prune.c:109
-msgid "report pruned objects"
+#: builtin/rebase.c:603
+#, c-format
+msgid ""
+"\n"
+"git encountered an error while preparing the patches to replay\n"
+"these revisions:\n"
+"\n"
+" %s\n"
+"\n"
+"As a result, git cannot rebase them."
msgstr ""
-#: builtin/prune.c:112
-msgid "expire objects older than <time>"
+#: builtin/rebase.c:948
+#, c-format
+msgid ""
+"%s\n"
+"Please specify which branch you want to rebase against.\n"
+"See git-rebase(1) for details.\n"
+"\n"
+" git rebase '<branch>'\n"
+"\n"
msgstr ""
-#: builtin/prune.c:114
-msgid "limit traversal to objects outside promisor packfiles"
+#: builtin/rebase.c:964
+#, c-format
+msgid ""
+"If you wish to set tracking information for this branch you can do so with:\n"
+"\n"
+" git branch --set-upstream-to=%s/<branch> %s\n"
+"\n"
msgstr ""
-#: builtin/prune.c:128
-msgid "cannot prune in a precious-objects repo"
+#: builtin/rebase.c:994
+msgid "exec commands cannot contain newlines"
msgstr ""
-#: builtin/pull.c:59 builtin/pull.c:61
-#, c-format
-msgid "Invalid value for %s: %s"
+#: builtin/rebase.c:998
+msgid "empty exec command"
msgstr ""
-#: builtin/pull.c:81
-msgid "git pull [<options>] [<repository> [<refspec>...]]"
+#: builtin/rebase.c:1040
+msgid "rebase onto given branch instead of upstream"
msgstr ""
-#: builtin/pull.c:132
-msgid "control for recursive fetching of submodules"
+#: builtin/rebase.c:1042
+msgid "allow pre-rebase hook to run"
msgstr ""
-#: builtin/pull.c:136
-msgid "Options related to merging"
+#: builtin/rebase.c:1044
+msgid "be quiet. implies --no-stat"
msgstr ""
-#: builtin/pull.c:139
-msgid "incorporate changes by rebasing rather than merging"
+#: builtin/rebase.c:1047
+msgid "display a diffstat of what changed upstream"
msgstr ""
-#: builtin/pull.c:166 builtin/rebase--helper.c:23 builtin/revert.c:122
-msgid "allow fast-forward"
+#: builtin/rebase.c:1050
+msgid "do not show diffstat of what changed upstream"
msgstr ""
-#: builtin/pull.c:175
-msgid "automatically stash/stash pop before and after rebase"
+#: builtin/rebase.c:1053
+msgid "add a Signed-off-by: line to each commit"
msgstr ""
-#: builtin/pull.c:191
-msgid "Options related to fetching"
+#: builtin/rebase.c:1055 builtin/rebase.c:1059 builtin/rebase.c:1061
+msgid "passed to 'git am'"
msgstr ""
-#: builtin/pull.c:209
-msgid "number of submodules pulled in parallel"
+#: builtin/rebase.c:1063 builtin/rebase.c:1065
+msgid "passed to 'git apply'"
msgstr ""
-#: builtin/pull.c:304
-#, c-format
-msgid "Invalid value for pull.ff: %s"
+#: builtin/rebase.c:1067 builtin/rebase.c:1070
+msgid "cherry-pick all commits, even if unchanged"
msgstr ""
-#: builtin/pull.c:420
-msgid ""
-"There is no candidate for rebasing against among the refs that you just "
-"fetched."
+#: builtin/rebase.c:1072
+msgid "continue"
msgstr ""
-#: builtin/pull.c:422
-msgid ""
-"There are no candidates for merging among the refs that you just fetched."
+#: builtin/rebase.c:1075
+msgid "skip current patch and continue"
msgstr ""
-#: builtin/pull.c:423
-msgid ""
-"Generally this means that you provided a wildcard refspec which had no\n"
-"matches on the remote end."
+#: builtin/rebase.c:1077
+msgid "abort and check out the original branch"
msgstr ""
-#: builtin/pull.c:426
-#, c-format
-msgid ""
-"You asked to pull from the remote '%s', but did not specify\n"
-"a branch. Because this is not the default configured remote\n"
-"for your current branch, you must specify a branch on the command line."
+#: builtin/rebase.c:1080
+msgid "abort but keep HEAD where it is"
msgstr ""
-#: builtin/pull.c:431 git-parse-remote.sh:73
-msgid "You are not currently on a branch."
+#: builtin/rebase.c:1081
+msgid "edit the todo list during an interactive rebase"
msgstr ""
-#: builtin/pull.c:433 builtin/pull.c:448 git-parse-remote.sh:79
-msgid "Please specify which branch you want to rebase against."
+#: builtin/rebase.c:1084
+msgid "show the patch file being applied or merged"
msgstr ""
-#: builtin/pull.c:435 builtin/pull.c:450 git-parse-remote.sh:82
-msgid "Please specify which branch you want to merge with."
+#: builtin/rebase.c:1087
+msgid "use merging strategies to rebase"
msgstr ""
-#: builtin/pull.c:436 builtin/pull.c:451
-msgid "See git-pull(1) for details."
+#: builtin/rebase.c:1091
+msgid "let the user edit the list of commits to rebase"
msgstr ""
-#: builtin/pull.c:438 builtin/pull.c:444 builtin/pull.c:453
-#: git-parse-remote.sh:64
-msgid "<remote>"
+#: builtin/rebase.c:1095
+msgid "try to recreate merges instead of ignoring them"
msgstr ""
-#: builtin/pull.c:438 builtin/pull.c:453 builtin/pull.c:458 git-rebase.sh:576
-#: git-parse-remote.sh:65
-msgid "<branch>"
+#: builtin/rebase.c:1099
+msgid "allow rerere to update index with resolved conflict"
msgstr ""
-#: builtin/pull.c:446 git-parse-remote.sh:75
-msgid "There is no tracking information for the current branch."
+#: builtin/rebase.c:1102
+msgid "preserve empty commits during rebase"
msgstr ""
-#: builtin/pull.c:455 git-parse-remote.sh:95
-msgid ""
-"If you wish to set tracking information for this branch you can do so with:"
+#: builtin/rebase.c:1104
+msgid "move commits that begin with squash!/fixup! under -i"
msgstr ""
-#: builtin/pull.c:460
-#, c-format
-msgid ""
-"Your configuration specifies to merge with the ref '%s'\n"
-"from the remote, but no such ref was fetched."
+#: builtin/rebase.c:1110
+msgid "automatically stash/stash pop before and after"
msgstr ""
-#: builtin/pull.c:829
-msgid "ignoring --verify-signatures for rebase"
+#: builtin/rebase.c:1112
+msgid "add exec lines after each commit of the editable list"
msgstr ""
-#: builtin/pull.c:877
-msgid "--[no-]autostash option is only valid with --rebase."
+#: builtin/rebase.c:1116
+msgid "allow rebasing commits with empty messages"
msgstr ""
-#: builtin/pull.c:885
-msgid "Updating an unborn branch with changes added to the index."
+#: builtin/rebase.c:1119
+msgid "try to rebase merges instead of skipping them"
msgstr ""
-#: builtin/pull.c:888
-msgid "pull with rebase"
+#: builtin/rebase.c:1122
+msgid "use 'merge-base --fork-point' to refine upstream"
msgstr ""
-#: builtin/pull.c:889
-msgid "please commit or stash them."
+#: builtin/rebase.c:1124
+msgid "use the given merge strategy"
msgstr ""
-#: builtin/pull.c:914
-#, c-format
-msgid ""
-"fetch updated the current branch head.\n"
-"fast-forwarding your working tree from\n"
-"commit %s."
+#: builtin/rebase.c:1126 builtin/revert.c:112
+msgid "option"
msgstr ""
-#: builtin/pull.c:919
-#, c-format
-msgid ""
-"Cannot fast-forward your working tree.\n"
-"After making sure that you saved anything precious from\n"
-"$ git diff %s\n"
-"output, run\n"
-"$ git reset --hard\n"
-"to recover."
+#: builtin/rebase.c:1127
+msgid "pass the argument through to the merge strategy"
msgstr ""
-#: builtin/pull.c:934
-msgid "Cannot merge multiple branches into empty head."
+#: builtin/rebase.c:1130
+msgid "rebase all reachable commits up to the root(s)"
msgstr ""
-#: builtin/pull.c:938
-msgid "Cannot rebase onto multiple branches."
+#: builtin/rebase.c:1133 builtin/rebase--interactive.c:198
+msgid "automatically re-schedule any `exec` that fails"
msgstr ""
-#: builtin/pull.c:945
-msgid "cannot rebase with locally recorded submodule modifications"
+#: builtin/rebase.c:1149
+#, c-format
+msgid "could not exec %s"
msgstr ""
-#: builtin/push.c:19
-msgid "git push [<options>] [<repository> [<refspec>...]]"
+#: builtin/rebase.c:1167 git-legacy-rebase.sh:220
+msgid "It looks like 'git am' is in progress. Cannot rebase."
msgstr ""
-#: builtin/push.c:111
-msgid "tag shorthand without <tag>"
+#: builtin/rebase.c:1208 git-legacy-rebase.sh:406
+msgid "No rebase in progress?"
msgstr ""
-#: builtin/push.c:121
-msgid "--delete only accepts plain target ref names"
+#: builtin/rebase.c:1212 git-legacy-rebase.sh:417
+msgid "The --edit-todo action can only be used during interactive rebase."
msgstr ""
-#: builtin/push.c:165
-msgid ""
-"\n"
-"To choose either option permanently, see push.default in 'git help config'."
+#: builtin/rebase.c:1226 git-legacy-rebase.sh:424
+msgid "Cannot read HEAD"
msgstr ""
-#: builtin/push.c:168
-#, c-format
+#: builtin/rebase.c:1238 git-legacy-rebase.sh:427
msgid ""
-"The upstream branch of your current branch does not match\n"
-"the name of your current branch. To push to the upstream branch\n"
-"on the remote, use\n"
-"\n"
-" git push %s HEAD:%s\n"
-"\n"
-"To push to the branch of the same name on the remote, use\n"
-"\n"
-" git push %s %s\n"
-"%s"
+"You must edit all merge conflicts and then\n"
+"mark them as resolved using git add"
msgstr ""
-#: builtin/push.c:183
-#, c-format
-msgid ""
-"You are not currently on a branch.\n"
-"To push the history leading to the current (detached HEAD)\n"
-"state now, use\n"
-"\n"
-" git push %s HEAD:<name-of-remote-branch>\n"
+#: builtin/rebase.c:1257
+msgid "could not discard worktree changes"
msgstr ""
-#: builtin/push.c:197
+#: builtin/rebase.c:1276
#, c-format
-msgid ""
-"The current branch %s has no upstream branch.\n"
-"To push the current branch and set the remote as upstream, use\n"
-"\n"
-" git push --set-upstream %s %s\n"
+msgid "could not move back to %s"
msgstr ""
-#: builtin/push.c:205
+#: builtin/rebase.c:1287 builtin/rm.c:369
#, c-format
-msgid "The current branch %s has multiple upstream branches, refusing to push."
+msgid "could not remove '%s'"
msgstr ""
-#: builtin/push.c:208
+#: builtin/rebase.c:1313
#, c-format
msgid ""
-"You are pushing to remote '%s', which is not the upstream of\n"
-"your current branch '%s', without telling me what to push\n"
-"to update which remote branch."
+"It seems that there is already a %s directory, and\n"
+"I wonder if you are in the middle of another rebase. If that is the\n"
+"case, please try\n"
+"\t%s\n"
+"If that is not the case, please\n"
+"\t%s\n"
+"and run me again. I am stopping in case you still have something\n"
+"valuable there.\n"
msgstr ""
-#: builtin/push.c:267
-msgid ""
-"You didn't specify any refspecs to push, and push.default is \"nothing\"."
+#: builtin/rebase.c:1334
+msgid "switch `C' expects a numerical value"
msgstr ""
-#: builtin/push.c:274
-msgid ""
-"Updates were rejected because the tip of your current branch is behind\n"
-"its remote counterpart. Integrate the remote changes (e.g.\n"
-"'git pull ...') before pushing again.\n"
-"See the 'Note about fast-forwards' in 'git push --help' for details."
+#: builtin/rebase.c:1375
+#, c-format
+msgid "Unknown mode: %s"
msgstr ""
-#: builtin/push.c:280
-msgid ""
-"Updates were rejected because a pushed branch tip is behind its remote\n"
-"counterpart. Check out this branch and integrate the remote changes\n"
-"(e.g. 'git pull ...') before pushing again.\n"
-"See the 'Note about fast-forwards' in 'git push --help' for details."
+#: builtin/rebase.c:1397
+msgid "--strategy requires --merge or --interactive"
msgstr ""
-#: builtin/push.c:286
-msgid ""
-"Updates were rejected because the remote contains work that you do\n"
-"not have locally. This is usually caused by another repository pushing\n"
-"to the same ref. You may want to first integrate the remote changes\n"
-"(e.g., 'git pull ...') before pushing again.\n"
-"See the 'Note about fast-forwards' in 'git push --help' for details."
+#: builtin/rebase.c:1446
+msgid "cannot combine am options with either interactive or merge options"
msgstr ""
-#: builtin/push.c:293
-msgid "Updates were rejected because the tag already exists in the remote."
+#: builtin/rebase.c:1465
+msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
msgstr ""
-#: builtin/push.c:296
+#: builtin/rebase.c:1469 git-legacy-rebase.sh:544
msgid ""
-"You cannot update a remote ref that points at a non-commit object,\n"
-"or update a remote ref to make it point at a non-commit object,\n"
-"without using the '--force' option.\n"
+"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
msgstr ""
-#: builtin/push.c:357
-#, c-format
-msgid "Pushing to %s\n"
+#: builtin/rebase.c:1475
+msgid "cannot combine '--rebase-merges' with '--strategy-option'"
msgstr ""
-#: builtin/push.c:361
-#, c-format
-msgid "failed to push some refs to '%s'"
+#: builtin/rebase.c:1478
+msgid "cannot combine '--rebase-merges' with '--strategy'"
msgstr ""
-#: builtin/push.c:395
+#: builtin/rebase.c:1502
#, c-format
-msgid "bad repository '%s'"
-msgstr ""
-
-#: builtin/push.c:396
-msgid ""
-"No configured push destination.\n"
-"Either specify the URL from the command-line or configure a remote "
-"repository using\n"
-"\n"
-" git remote add <name> <url>\n"
-"\n"
-"and then push using the remote name\n"
-"\n"
-" git push <name>\n"
-msgstr ""
-
-#: builtin/push.c:551
-msgid "repository"
+msgid "invalid upstream '%s'"
msgstr ""
-#: builtin/push.c:552 builtin/send-pack.c:164
-msgid "push all refs"
+#: builtin/rebase.c:1508
+msgid "Could not create new root commit"
msgstr ""
-#: builtin/push.c:553 builtin/send-pack.c:166
-msgid "mirror all refs"
+#: builtin/rebase.c:1526
+#, c-format
+msgid "'%s': need exactly one merge base"
msgstr ""
-#: builtin/push.c:555
-msgid "delete refs"
+#: builtin/rebase.c:1533
+#, c-format
+msgid "Does not point to a valid commit '%s'"
msgstr ""
-#: builtin/push.c:556
-msgid "push tags (can't be used with --all or --mirror)"
+#: builtin/rebase.c:1558
+#, c-format
+msgid "fatal: no such branch/commit '%s'"
msgstr ""
-#: builtin/push.c:559 builtin/send-pack.c:167
-msgid "force updates"
+#: builtin/rebase.c:1566 builtin/submodule--helper.c:38
+#: builtin/submodule--helper.c:1934
+#, c-format
+msgid "No such ref: %s"
msgstr ""
-#: builtin/push.c:561 builtin/send-pack.c:181
-msgid "<refname>:<expect>"
+#: builtin/rebase.c:1578
+msgid "Could not resolve HEAD to a revision"
msgstr ""
-#: builtin/push.c:562 builtin/send-pack.c:182
-msgid "require old value of ref to be at this value"
+#: builtin/rebase.c:1619 git-legacy-rebase.sh:673
+msgid "Cannot autostash"
msgstr ""
-#: builtin/push.c:565
-msgid "control recursive pushing of submodules"
+#: builtin/rebase.c:1622
+#, c-format
+msgid "Unexpected stash response: '%s'"
msgstr ""
-#: builtin/push.c:567 builtin/send-pack.c:175
-msgid "use thin pack"
+#: builtin/rebase.c:1628
+#, c-format
+msgid "Could not create directory for '%s'"
msgstr ""
-#: builtin/push.c:568 builtin/push.c:569 builtin/send-pack.c:161
-#: builtin/send-pack.c:162
-msgid "receive pack program"
+#: builtin/rebase.c:1631
+#, c-format
+msgid "Created autostash: %s\n"
msgstr ""
-#: builtin/push.c:570
-msgid "set upstream for git pull/status"
+#: builtin/rebase.c:1634
+msgid "could not reset --hard"
msgstr ""
-#: builtin/push.c:573
-msgid "prune locally removed refs"
+#: builtin/rebase.c:1635 builtin/reset.c:114
+#, c-format
+msgid "HEAD is now at %s"
msgstr ""
-#: builtin/push.c:575
-msgid "bypass pre-push hook"
+#: builtin/rebase.c:1651 git-legacy-rebase.sh:682
+msgid "Please commit or stash them."
msgstr ""
-#: builtin/push.c:576
-msgid "push missing but relevant tags"
+#: builtin/rebase.c:1678
+#, c-format
+msgid "could not parse '%s'"
msgstr ""
-#: builtin/push.c:579 builtin/send-pack.c:169
-msgid "GPG sign the push"
+#: builtin/rebase.c:1691
+#, c-format
+msgid "could not switch to %s"
msgstr ""
-#: builtin/push.c:581 builtin/send-pack.c:176
-msgid "request atomic transaction on remote side"
+#: builtin/rebase.c:1702 git-legacy-rebase.sh:705
+#, sh-format
+msgid "HEAD is up to date."
msgstr ""
-#: builtin/push.c:599
-msgid "--delete is incompatible with --all, --mirror and --tags"
+#: builtin/rebase.c:1704
+#, c-format
+msgid "Current branch %s is up to date.\n"
msgstr ""
-#: builtin/push.c:601
-msgid "--delete doesn't make sense without any refs"
+#: builtin/rebase.c:1712 git-legacy-rebase.sh:715
+#, sh-format
+msgid "HEAD is up to date, rebase forced."
msgstr ""
-#: builtin/push.c:604
-msgid "--all and --tags are incompatible"
+#: builtin/rebase.c:1714
+#, c-format
+msgid "Current branch %s is up to date, rebase forced.\n"
msgstr ""
-#: builtin/push.c:606
-msgid "--all can't be combined with refspecs"
+#: builtin/rebase.c:1722 git-legacy-rebase.sh:215
+msgid "The pre-rebase hook refused to rebase."
msgstr ""
-#: builtin/push.c:610
-msgid "--mirror and --tags are incompatible"
+#: builtin/rebase.c:1729
+#, c-format
+msgid "Changes to %s:\n"
msgstr ""
-#: builtin/push.c:612
-msgid "--mirror can't be combined with refspecs"
+#: builtin/rebase.c:1732
+#, c-format
+msgid "Changes from %s to %s:\n"
msgstr ""
-#: builtin/push.c:615
-msgid "--all and --mirror are incompatible"
+#: builtin/rebase.c:1757
+#, c-format
+msgid "First, rewinding head to replay your work on top of it...\n"
msgstr ""
-#: builtin/push.c:634
-msgid "push options must not have new line characters"
+#: builtin/rebase.c:1765
+msgid "Could not detach HEAD"
msgstr ""
-#: builtin/range-diff.c:8
-msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>"
+#: builtin/rebase.c:1774
+#, c-format
+msgid "Fast-forwarded %s to %s.\n"
msgstr ""
-#: builtin/range-diff.c:9
-msgid "git range-diff [<options>] <old-tip>...<new-tip>"
+#: builtin/rebase--interactive.c:25
+msgid "no HEAD?"
msgstr ""
-#: builtin/range-diff.c:10
-msgid "git range-diff [<options>] <base> <old-tip> <new-tip>"
+#: builtin/rebase--interactive.c:52
+#, c-format
+msgid "could not create temporary %s"
msgstr ""
-#: builtin/range-diff.c:26
-msgid "Percentage by which creation is weighted"
+#: builtin/rebase--interactive.c:58
+msgid "could not mark as interactive"
msgstr ""
-#: builtin/range-diff.c:28
-msgid "use simple diff colors"
+#: builtin/rebase--interactive.c:102
+#, c-format
+msgid "could not open %s"
msgstr ""
-#: builtin/range-diff.c:75 builtin/range-diff.c:79
-#, c-format
-msgid "no .. in range: '%s'"
+#: builtin/rebase--interactive.c:115
+msgid "could not generate todo list"
msgstr ""
-#: builtin/range-diff.c:89
-msgid "single arg format must be symmetric range"
+#: builtin/rebase--interactive.c:131
+msgid "git rebase--interactive [<options>]"
msgstr ""
-#: builtin/range-diff.c:104
-msgid "need two commit ranges"
+#: builtin/rebase--interactive.c:150
+msgid "keep empty commits"
msgstr ""
-#: builtin/read-tree.c:40
-msgid ""
-"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
-"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
-"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
+#: builtin/rebase--interactive.c:152 builtin/revert.c:125
+msgid "allow commits with empty messages"
msgstr ""
-#: builtin/read-tree.c:120
-msgid "write resulting index to <file>"
+#: builtin/rebase--interactive.c:153
+msgid "rebase merge commits"
msgstr ""
-#: builtin/read-tree.c:123
-msgid "only empty the index"
+#: builtin/rebase--interactive.c:155
+msgid "keep original branch points of cousins"
msgstr ""
-#: builtin/read-tree.c:125
-msgid "Merging"
+#: builtin/rebase--interactive.c:157
+msgid "move commits that begin with squash!/fixup!"
msgstr ""
-#: builtin/read-tree.c:127
-msgid "perform a merge in addition to a read"
+#: builtin/rebase--interactive.c:158
+msgid "sign commits"
msgstr ""
-#: builtin/read-tree.c:129
-msgid "3-way merge if no file level merging required"
+#: builtin/rebase--interactive.c:160
+msgid "continue rebase"
msgstr ""
-#: builtin/read-tree.c:131
-msgid "3-way merge in presence of adds and removes"
+#: builtin/rebase--interactive.c:162
+msgid "skip commit"
msgstr ""
-#: builtin/read-tree.c:133
-msgid "same as -m, but discard unmerged entries"
+#: builtin/rebase--interactive.c:163
+msgid "edit the todo list"
msgstr ""
-#: builtin/read-tree.c:134
-msgid "<subdirectory>/"
+#: builtin/rebase--interactive.c:165
+msgid "show the current patch"
msgstr ""
-#: builtin/read-tree.c:135
-msgid "read the tree into the index under <subdirectory>/"
+#: builtin/rebase--interactive.c:168
+msgid "shorten commit ids in the todo list"
msgstr ""
-#: builtin/read-tree.c:138
-msgid "update working tree with merge result"
+#: builtin/rebase--interactive.c:170
+msgid "expand commit ids in the todo list"
msgstr ""
-#: builtin/read-tree.c:140
-msgid "gitignore"
+#: builtin/rebase--interactive.c:172
+msgid "check the todo list"
msgstr ""
-#: builtin/read-tree.c:141
-msgid "allow explicitly ignored files to be overwritten"
+#: builtin/rebase--interactive.c:174
+msgid "rearrange fixup/squash lines"
msgstr ""
-#: builtin/read-tree.c:144
-msgid "don't check the working tree after merging"
+#: builtin/rebase--interactive.c:176
+msgid "insert exec commands in todo list"
msgstr ""
-#: builtin/read-tree.c:145
-msgid "don't update the index or the work tree"
+#: builtin/rebase--interactive.c:177
+msgid "onto"
msgstr ""
-#: builtin/read-tree.c:147
-msgid "skip applying sparse checkout filter"
+#: builtin/rebase--interactive.c:179
+msgid "restrict-revision"
msgstr ""
-#: builtin/read-tree.c:149
-msgid "debug unpack-trees"
+#: builtin/rebase--interactive.c:179
+msgid "restrict revision"
msgstr ""
-#: builtin/rebase--helper.c:8
-msgid "git rebase--helper [<options>]"
+#: builtin/rebase--interactive.c:180
+msgid "squash-onto"
msgstr ""
-#: builtin/rebase--helper.c:24
-msgid "keep empty commits"
+#: builtin/rebase--interactive.c:181
+msgid "squash onto"
msgstr ""
-#: builtin/rebase--helper.c:26 builtin/revert.c:124
-msgid "allow commits with empty messages"
+#: builtin/rebase--interactive.c:183
+msgid "the upstream commit"
msgstr ""
-#: builtin/rebase--helper.c:27
-msgid "rebase merge commits"
+#: builtin/rebase--interactive.c:184
+msgid "head-name"
msgstr ""
-#: builtin/rebase--helper.c:29
-msgid "keep original branch points of cousins"
+#: builtin/rebase--interactive.c:184
+msgid "head name"
msgstr ""
-#: builtin/rebase--helper.c:30
-msgid "continue rebase"
+#: builtin/rebase--interactive.c:189
+msgid "rebase strategy"
msgstr ""
-#: builtin/rebase--helper.c:32
-msgid "abort rebase"
+#: builtin/rebase--interactive.c:190
+msgid "strategy-opts"
msgstr ""
-#: builtin/rebase--helper.c:35
-msgid "make rebase script"
+#: builtin/rebase--interactive.c:191
+msgid "strategy options"
msgstr ""
-#: builtin/rebase--helper.c:37
-msgid "shorten commit ids in the todo list"
+#: builtin/rebase--interactive.c:192
+msgid "switch-to"
msgstr ""
-#: builtin/rebase--helper.c:39
-msgid "expand commit ids in the todo list"
+#: builtin/rebase--interactive.c:193
+msgid "the branch or commit to checkout"
msgstr ""
-#: builtin/rebase--helper.c:41
-msgid "check the todo list"
+#: builtin/rebase--interactive.c:194
+msgid "onto-name"
msgstr ""
-#: builtin/rebase--helper.c:43
-msgid "skip unnecessary picks"
+#: builtin/rebase--interactive.c:194
+msgid "onto name"
msgstr ""
-#: builtin/rebase--helper.c:45
-msgid "rearrange fixup/squash lines"
+#: builtin/rebase--interactive.c:195
+msgid "cmd"
msgstr ""
-#: builtin/rebase--helper.c:47
-msgid "insert exec commands in todo list"
+#: builtin/rebase--interactive.c:195
+msgid "the command to run"
msgstr ""
-#: builtin/rebase--helper.c:68
+#: builtin/rebase--interactive.c:224
msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
msgstr ""
-#: builtin/receive-pack.c:32
+#: builtin/rebase--interactive.c:230
+msgid "a base commit must be provided with --upstream or --onto"
+msgstr ""
+
+#: builtin/receive-pack.c:33
msgid "git receive-pack <git-dir>"
msgstr ""
"To squelch this message, you can set it to 'refuse'."
msgstr ""
-#: builtin/receive-pack.c:1923
+#: builtin/receive-pack.c:1929
msgid "quiet"
msgstr ""
-#: builtin/receive-pack.c:1937
+#: builtin/receive-pack.c:1943
msgid "You must specify a directory."
msgstr ""
-#: builtin/reflog.c:536 builtin/reflog.c:541
+#: builtin/reflog.c:17
+msgid ""
+"git reflog expire [--expire=<time>] [--expire-unreachable=<time>] [--"
+"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] "
+"<refs>..."
+msgstr ""
+
+#: builtin/reflog.c:22
+msgid ""
+"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] "
+"<refs>..."
+msgstr ""
+
+#: builtin/reflog.c:25
+msgid "git reflog exists <ref>"
+msgstr ""
+
+#: builtin/reflog.c:567 builtin/reflog.c:572
#, c-format
msgid "'%s' is not a valid timestamp"
msgstr ""
-#: builtin/remote.c:15
-msgid "git remote [-v | --verbose]"
+#: builtin/reflog.c:605
+#, c-format
+msgid "Marking reachable objects..."
+msgstr ""
+
+#: builtin/reflog.c:643
+#, c-format
+msgid "%s points nowhere!"
+msgstr ""
+
+#: builtin/reflog.c:695
+msgid "no reflog specified to delete"
+msgstr ""
+
+#: builtin/reflog.c:704
+#, c-format
+msgid "not a reflog: %s"
+msgstr ""
+
+#: builtin/reflog.c:709
+#, c-format
+msgid "no reflog for '%s'"
+msgstr ""
+
+#: builtin/reflog.c:755
+#, c-format
+msgid "invalid ref format: %s"
+msgstr ""
+
+#: builtin/reflog.c:764
+msgid "git reflog [ show | expire | delete | exists ]"
msgstr ""
#: builtin/remote.c:16
+msgid "git remote [-v | --verbose]"
+msgstr ""
+
+#: builtin/remote.c:17
msgid ""
"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
"mirror=<fetch|push>] <name> <url>"
msgstr ""
-#: builtin/remote.c:17 builtin/remote.c:37
+#: builtin/remote.c:18 builtin/remote.c:38
msgid "git remote rename <old> <new>"
msgstr ""
-#: builtin/remote.c:18 builtin/remote.c:42
+#: builtin/remote.c:19 builtin/remote.c:43
msgid "git remote remove <name>"
msgstr ""
-#: builtin/remote.c:19 builtin/remote.c:47
+#: builtin/remote.c:20 builtin/remote.c:48
msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
msgstr ""
-#: builtin/remote.c:20
+#: builtin/remote.c:21
msgid "git remote [-v | --verbose] show [-n] <name>"
msgstr ""
-#: builtin/remote.c:21
+#: builtin/remote.c:22
msgid "git remote prune [-n | --dry-run] <name>"
msgstr ""
-#: builtin/remote.c:22
+#: builtin/remote.c:23
msgid ""
"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
msgstr ""
-#: builtin/remote.c:23
+#: builtin/remote.c:24
msgid "git remote set-branches [--add] <name> <branch>..."
msgstr ""
-#: builtin/remote.c:24 builtin/remote.c:73
+#: builtin/remote.c:25 builtin/remote.c:74
msgid "git remote get-url [--push] [--all] <name>"
msgstr ""
-#: builtin/remote.c:25 builtin/remote.c:78
+#: builtin/remote.c:26 builtin/remote.c:79
msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
msgstr ""
-#: builtin/remote.c:26 builtin/remote.c:79
+#: builtin/remote.c:27 builtin/remote.c:80
msgid "git remote set-url --add <name> <newurl>"
msgstr ""
-#: builtin/remote.c:27 builtin/remote.c:80
+#: builtin/remote.c:28 builtin/remote.c:81
msgid "git remote set-url --delete <name> <url>"
msgstr ""
-#: builtin/remote.c:32
+#: builtin/remote.c:33
msgid "git remote add [<options>] <name> <url>"
msgstr ""
-#: builtin/remote.c:52
+#: builtin/remote.c:53
msgid "git remote set-branches <name> <branch>..."
msgstr ""
-#: builtin/remote.c:53
+#: builtin/remote.c:54
msgid "git remote set-branches --add <name> <branch>..."
msgstr ""
-#: builtin/remote.c:58
+#: builtin/remote.c:59
msgid "git remote show [<options>] <name>"
msgstr ""
-#: builtin/remote.c:63
+#: builtin/remote.c:64
msgid "git remote prune [<options>] <name>"
msgstr ""
-#: builtin/remote.c:68
+#: builtin/remote.c:69
msgid "git remote update [<options>] [<group> | <remote>]..."
msgstr ""
-#: builtin/remote.c:97
+#: builtin/remote.c:98
#, c-format
msgid "Updating %s"
msgstr ""
-#: builtin/remote.c:129
+#: builtin/remote.c:130
msgid ""
"--mirror is dangerous and deprecated; please\n"
"\t use --mirror=fetch or --mirror=push instead"
msgstr ""
-#: builtin/remote.c:146
+#: builtin/remote.c:147
#, c-format
msgid "unknown mirror argument: %s"
msgstr ""
-#: builtin/remote.c:162
+#: builtin/remote.c:163
msgid "fetch the remote branches"
msgstr ""
-#: builtin/remote.c:164
+#: builtin/remote.c:165
msgid "import all tags and associated objects when fetching"
msgstr ""
-#: builtin/remote.c:167
+#: builtin/remote.c:168
msgid "or do not fetch any tag at all (--no-tags)"
msgstr ""
-#: builtin/remote.c:169
+#: builtin/remote.c:170
msgid "branch(es) to track"
msgstr ""
-#: builtin/remote.c:170
+#: builtin/remote.c:171
msgid "master branch"
msgstr ""
-#: builtin/remote.c:172
+#: builtin/remote.c:173
msgid "set up remote as a mirror to push to or fetch from"
msgstr ""
-#: builtin/remote.c:184
+#: builtin/remote.c:185
msgid "specifying a master branch makes no sense with --mirror"
msgstr ""
-#: builtin/remote.c:186
+#: builtin/remote.c:187
msgid "specifying branches to track makes sense only with fetch mirrors"
msgstr ""
-#: builtin/remote.c:193 builtin/remote.c:635
+#: builtin/remote.c:194 builtin/remote.c:636
#, c-format
msgid "remote %s already exists."
msgstr ""
-#: builtin/remote.c:197 builtin/remote.c:639
+#: builtin/remote.c:198 builtin/remote.c:640
#, c-format
msgid "'%s' is not a valid remote name"
msgstr ""
-#: builtin/remote.c:237
+#: builtin/remote.c:238
#, c-format
msgid "Could not setup master '%s'"
msgstr ""
-#: builtin/remote.c:343
+#: builtin/remote.c:344
#, c-format
msgid "Could not get fetch map for refspec %s"
msgstr ""
-#: builtin/remote.c:442 builtin/remote.c:450
+#: builtin/remote.c:443 builtin/remote.c:451
msgid "(matching)"
msgstr ""
-#: builtin/remote.c:454
+#: builtin/remote.c:455
msgid "(delete)"
msgstr ""
-#: builtin/remote.c:628 builtin/remote.c:764 builtin/remote.c:863
+#: builtin/remote.c:629 builtin/remote.c:765 builtin/remote.c:864
#, c-format
-msgid "No such remote: %s"
+msgid "No such remote: '%s'"
msgstr ""
-#: builtin/remote.c:645
+#: builtin/remote.c:646
#, c-format
msgid "Could not rename config section '%s' to '%s'"
msgstr ""
-#: builtin/remote.c:665
+#: builtin/remote.c:666
#, c-format
msgid ""
"Not updating non-default fetch refspec\n"
"\tPlease update the configuration manually if necessary."
msgstr ""
-#: builtin/remote.c:701
+#: builtin/remote.c:702
#, c-format
msgid "deleting '%s' failed"
msgstr ""
-#: builtin/remote.c:735
+#: builtin/remote.c:736
#, c-format
msgid "creating '%s' failed"
msgstr ""
-#: builtin/remote.c:801
+#: builtin/remote.c:802
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
msgstr[0] ""
msgstr[1] ""
-#: builtin/remote.c:815
+#: builtin/remote.c:816
#, c-format
msgid "Could not remove config section '%s'"
msgstr ""
-#: builtin/remote.c:916
+#: builtin/remote.c:917
#, c-format
msgid " new (next fetch will store in remotes/%s)"
msgstr ""
-#: builtin/remote.c:919
+#: builtin/remote.c:920
msgid " tracked"
msgstr ""
-#: builtin/remote.c:921
+#: builtin/remote.c:922
msgid " stale (use 'git remote prune' to remove)"
msgstr ""
-#: builtin/remote.c:923
+#: builtin/remote.c:924
msgid " ???"
msgstr ""
-#: builtin/remote.c:964
+#: builtin/remote.c:965
#, c-format
msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
msgstr ""
-#: builtin/remote.c:973
+#: builtin/remote.c:974
#, c-format
msgid "rebases interactively onto remote %s"
msgstr ""
-#: builtin/remote.c:975
+#: builtin/remote.c:976
#, c-format
msgid "rebases interactively (with merges) onto remote %s"
msgstr ""
-#: builtin/remote.c:978
+#: builtin/remote.c:979
#, c-format
msgid "rebases onto remote %s"
msgstr ""
-#: builtin/remote.c:982
+#: builtin/remote.c:983
#, c-format
msgid " merges with remote %s"
msgstr ""
-#: builtin/remote.c:985
+#: builtin/remote.c:986
#, c-format
msgid "merges with remote %s"
msgstr ""
-#: builtin/remote.c:988
+#: builtin/remote.c:989
#, c-format
msgid "%-*s and with remote %s\n"
msgstr ""
-#: builtin/remote.c:1031
+#: builtin/remote.c:1032
msgid "create"
msgstr ""
-#: builtin/remote.c:1034
+#: builtin/remote.c:1035
msgid "delete"
msgstr ""
-#: builtin/remote.c:1038
+#: builtin/remote.c:1039
msgid "up to date"
msgstr ""
-#: builtin/remote.c:1041
+#: builtin/remote.c:1042
msgid "fast-forwardable"
msgstr ""
-#: builtin/remote.c:1044
+#: builtin/remote.c:1045
msgid "local out of date"
msgstr ""
-#: builtin/remote.c:1051
+#: builtin/remote.c:1052
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr ""
-#: builtin/remote.c:1054
+#: builtin/remote.c:1055
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr ""
-#: builtin/remote.c:1058
+#: builtin/remote.c:1059
#, c-format
msgid " %-*s forces to %s"
msgstr ""
-#: builtin/remote.c:1061
+#: builtin/remote.c:1062
#, c-format
msgid " %-*s pushes to %s"
msgstr ""
-#: builtin/remote.c:1129
+#: builtin/remote.c:1130
msgid "do not query remotes"
msgstr ""
-#: builtin/remote.c:1156
+#: builtin/remote.c:1157
#, c-format
msgid "* remote %s"
msgstr ""
-#: builtin/remote.c:1157
+#: builtin/remote.c:1158
#, c-format
msgid " Fetch URL: %s"
msgstr ""
-#: builtin/remote.c:1158 builtin/remote.c:1174 builtin/remote.c:1313
+#: builtin/remote.c:1159 builtin/remote.c:1175 builtin/remote.c:1314
msgid "(no URL)"
msgstr ""
#. with the one in " Fetch URL: %s"
#. translation.
#.
-#: builtin/remote.c:1172 builtin/remote.c:1174
+#: builtin/remote.c:1173 builtin/remote.c:1175
#, c-format
msgid " Push URL: %s"
msgstr ""
-#: builtin/remote.c:1176 builtin/remote.c:1178 builtin/remote.c:1180
+#: builtin/remote.c:1177 builtin/remote.c:1179 builtin/remote.c:1181
#, c-format
msgid " HEAD branch: %s"
msgstr ""
-#: builtin/remote.c:1176
+#: builtin/remote.c:1177
msgid "(not queried)"
msgstr ""
-#: builtin/remote.c:1178
+#: builtin/remote.c:1179
msgid "(unknown)"
msgstr ""
-#: builtin/remote.c:1182
+#: builtin/remote.c:1183
#, c-format
msgid ""
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
msgstr ""
-#: builtin/remote.c:1194
+#: builtin/remote.c:1195
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
msgstr[0] ""
msgstr[1] ""
-#: builtin/remote.c:1197 builtin/remote.c:1223
+#: builtin/remote.c:1198 builtin/remote.c:1224
msgid " (status not queried)"
msgstr ""
-#: builtin/remote.c:1206
+#: builtin/remote.c:1207
msgid " Local branch configured for 'git pull':"
msgid_plural " Local branches configured for 'git pull':"
msgstr[0] ""
msgstr[1] ""
-#: builtin/remote.c:1214
+#: builtin/remote.c:1215
msgid " Local refs will be mirrored by 'git push'"
msgstr ""
-#: builtin/remote.c:1220
+#: builtin/remote.c:1221
#, c-format
msgid " Local ref configured for 'git push'%s:"
msgid_plural " Local refs configured for 'git push'%s:"
msgstr[0] ""
msgstr[1] ""
-#: builtin/remote.c:1241
+#: builtin/remote.c:1242
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr ""
-#: builtin/remote.c:1243
+#: builtin/remote.c:1244
msgid "delete refs/remotes/<name>/HEAD"
msgstr ""
-#: builtin/remote.c:1258
+#: builtin/remote.c:1259
msgid "Cannot determine remote HEAD"
msgstr ""
-#: builtin/remote.c:1260
+#: builtin/remote.c:1261
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr ""
-#: builtin/remote.c:1270
+#: builtin/remote.c:1271
#, c-format
msgid "Could not delete %s"
msgstr ""
-#: builtin/remote.c:1278
+#: builtin/remote.c:1279
#, c-format
msgid "Not a valid ref: %s"
msgstr ""
-#: builtin/remote.c:1280
+#: builtin/remote.c:1281
#, c-format
msgid "Could not setup %s"
msgstr ""
-#: builtin/remote.c:1298
+#: builtin/remote.c:1299
#, c-format
msgid " %s will become dangling!"
msgstr ""
-#: builtin/remote.c:1299
+#: builtin/remote.c:1300
#, c-format
msgid " %s has become dangling!"
msgstr ""
-#: builtin/remote.c:1309
+#: builtin/remote.c:1310
#, c-format
msgid "Pruning %s"
msgstr ""
-#: builtin/remote.c:1310
+#: builtin/remote.c:1311
#, c-format
msgid "URL: %s"
msgstr ""
-#: builtin/remote.c:1326
+#: builtin/remote.c:1327
#, c-format
msgid " * [would prune] %s"
msgstr ""
-#: builtin/remote.c:1329
+#: builtin/remote.c:1330
#, c-format
msgid " * [pruned] %s"
msgstr ""
-#: builtin/remote.c:1374
+#: builtin/remote.c:1375
msgid "prune remotes after fetching"
msgstr ""
-#: builtin/remote.c:1437 builtin/remote.c:1491 builtin/remote.c:1559
+#: builtin/remote.c:1438 builtin/remote.c:1492 builtin/remote.c:1560
#, c-format
msgid "No such remote '%s'"
msgstr ""
-#: builtin/remote.c:1453
+#: builtin/remote.c:1454
msgid "add branch"
msgstr ""
-#: builtin/remote.c:1460
+#: builtin/remote.c:1461
msgid "no remote specified"
msgstr ""
-#: builtin/remote.c:1477
+#: builtin/remote.c:1478
msgid "query push URLs rather than fetch URLs"
msgstr ""
-#: builtin/remote.c:1479
+#: builtin/remote.c:1480
msgid "return all URLs"
msgstr ""
-#: builtin/remote.c:1507
+#: builtin/remote.c:1508
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr ""
-#: builtin/remote.c:1533
+#: builtin/remote.c:1534
msgid "manipulate push URLs"
msgstr ""
-#: builtin/remote.c:1535
+#: builtin/remote.c:1536
msgid "add URL"
msgstr ""
-#: builtin/remote.c:1537
+#: builtin/remote.c:1538
msgid "delete URLs"
msgstr ""
-#: builtin/remote.c:1544
+#: builtin/remote.c:1545
msgid "--add --delete doesn't make sense"
msgstr ""
-#: builtin/remote.c:1583
+#: builtin/remote.c:1584
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr ""
-#: builtin/remote.c:1591
+#: builtin/remote.c:1592
#, c-format
msgid "No such URL found: %s"
msgstr ""
-#: builtin/remote.c:1593
+#: builtin/remote.c:1594
msgid "Will not delete all non-push URLs"
msgstr ""
-#: builtin/remote.c:1609
+#: builtin/remote.c:1610
msgid "be verbose; must be placed before a subcommand"
msgstr ""
-#: builtin/remote.c:1640
+#: builtin/remote.c:1641
#, c-format
msgid "Unknown subcommand: %s"
msgstr ""
-#: builtin/repack.c:20
+#: builtin/repack.c:22
msgid "git repack [<options>]"
msgstr ""
-#: builtin/repack.c:25
+#: builtin/repack.c:27
msgid ""
"Incremental repacks are incompatible with bitmap indexes. Use\n"
"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
msgstr ""
-#: builtin/repack.c:287
+#: builtin/repack.c:200
+msgid "could not start pack-objects to repack promisor objects"
+msgstr ""
+
+#: builtin/repack.c:239 builtin/repack.c:411
+msgid "repack: Expecting full hex object ID lines only from pack-objects."
+msgstr ""
+
+#: builtin/repack.c:256
+msgid "could not finish pack-objects to repack promisor objects"
+msgstr ""
+
+#: builtin/repack.c:294
msgid "pack everything in a single pack"
msgstr ""
-#: builtin/repack.c:289
+#: builtin/repack.c:296
msgid "same as -a, and turn unreachable objects loose"
msgstr ""
-#: builtin/repack.c:292
+#: builtin/repack.c:299
msgid "remove redundant packs, and run git-prune-packed"
msgstr ""
-#: builtin/repack.c:294
+#: builtin/repack.c:301
msgid "pass --no-reuse-delta to git-pack-objects"
msgstr ""
-#: builtin/repack.c:296
+#: builtin/repack.c:303
msgid "pass --no-reuse-object to git-pack-objects"
msgstr ""
-#: builtin/repack.c:298
+#: builtin/repack.c:305
msgid "do not run git-update-server-info"
msgstr ""
-#: builtin/repack.c:301
+#: builtin/repack.c:308
msgid "pass --local to git-pack-objects"
msgstr ""
-#: builtin/repack.c:303
+#: builtin/repack.c:310
msgid "write bitmap index"
msgstr ""
-#: builtin/repack.c:304
+#: builtin/repack.c:312
+msgid "pass --delta-islands to git-pack-objects"
+msgstr ""
+
+#: builtin/repack.c:313
msgid "approxidate"
msgstr ""
-#: builtin/repack.c:305
+#: builtin/repack.c:314
msgid "with -A, do not loosen objects older than this"
msgstr ""
-#: builtin/repack.c:307
+#: builtin/repack.c:316
msgid "with -a, repack unreachable objects"
msgstr ""
-#: builtin/repack.c:309
+#: builtin/repack.c:318
msgid "size of the window used for delta compression"
msgstr ""
-#: builtin/repack.c:310 builtin/repack.c:316
+#: builtin/repack.c:319 builtin/repack.c:325
msgid "bytes"
msgstr ""
-#: builtin/repack.c:311
+#: builtin/repack.c:320
msgid "same as the above, but limit memory size instead of entries count"
msgstr ""
-#: builtin/repack.c:313
+#: builtin/repack.c:322
msgid "limits the maximum delta depth"
msgstr ""
-#: builtin/repack.c:315
+#: builtin/repack.c:324
msgid "limits the maximum number of threads"
msgstr ""
-#: builtin/repack.c:317
+#: builtin/repack.c:326
msgid "maximum size of each packfile"
msgstr ""
-#: builtin/repack.c:319
+#: builtin/repack.c:328
msgid "repack objects in packs marked with .keep"
msgstr ""
-#: builtin/repack.c:321
+#: builtin/repack.c:330
msgid "do not repack this pack"
msgstr ""
-#: builtin/repack.c:331
+#: builtin/repack.c:340
msgid "cannot delete packs in a precious-objects repo"
msgstr ""
-#: builtin/repack.c:335
+#: builtin/repack.c:344
msgid "--keep-unreachable and -A are incompatible"
msgstr ""
-#: builtin/repack.c:510 builtin/worktree.c:140
+#: builtin/repack.c:420
+msgid "Nothing new to pack."
+msgstr ""
+
+#: builtin/repack.c:481
+#, c-format
+msgid ""
+"WARNING: Some packs in use have been renamed by\n"
+"WARNING: prefixing old- to their name, in order to\n"
+"WARNING: replace them with the new version of the\n"
+"WARNING: file. But the operation failed, and the\n"
+"WARNING: attempt to rename them back to their\n"
+"WARNING: original names also failed.\n"
+"WARNING: Please rename them in %s manually:\n"
+msgstr ""
+
+#: builtin/repack.c:529
#, c-format
msgid "failed to remove '%s'"
msgstr ""
msgid "git replace [--format=<format>] [-l [<pattern>]]"
msgstr ""
-#: builtin/replace.c:57 builtin/replace.c:203 builtin/replace.c:206
+#: builtin/replace.c:58 builtin/replace.c:203 builtin/replace.c:206
#, c-format
msgid "failed to resolve '%s' as a valid ref"
msgstr ""
msgid "new commit is the same as the old one: '%s'"
msgstr ""
-#: builtin/replace.c:514
+#: builtin/replace.c:515
#, c-format
msgid ""
"could not convert the following graft(s):\n"
"%s"
msgstr ""
-#: builtin/replace.c:535
+#: builtin/replace.c:536
msgid "list replace refs"
msgstr ""
-#: builtin/replace.c:536
+#: builtin/replace.c:537
msgid "delete replace refs"
msgstr ""
-#: builtin/replace.c:537
+#: builtin/replace.c:538
msgid "edit existing object"
msgstr ""
-#: builtin/replace.c:538
+#: builtin/replace.c:539
msgid "change a commit's parents"
msgstr ""
-#: builtin/replace.c:539
+#: builtin/replace.c:540
msgid "convert existing graft file"
msgstr ""
-#: builtin/replace.c:540
+#: builtin/replace.c:541
msgid "replace the ref if it exists"
msgstr ""
-#: builtin/replace.c:542
+#: builtin/replace.c:543
msgid "do not pretty-print contents for --edit"
msgstr ""
-#: builtin/replace.c:543
+#: builtin/replace.c:544
msgid "use this format"
msgstr ""
-#: builtin/replace.c:556
+#: builtin/replace.c:557
msgid "--format cannot be used when not listing"
msgstr ""
-#: builtin/replace.c:564
+#: builtin/replace.c:565
msgid "-f only makes sense when writing a replacement"
msgstr ""
-#: builtin/replace.c:568
+#: builtin/replace.c:569
msgid "--raw only makes sense with --edit"
msgstr ""
-#: builtin/replace.c:574
+#: builtin/replace.c:575
msgid "-d needs at least one argument"
msgstr ""
-#: builtin/replace.c:580
+#: builtin/replace.c:581
msgid "bad number of arguments"
msgstr ""
-#: builtin/replace.c:586
+#: builtin/replace.c:587
msgid "-e needs exactly one argument"
msgstr ""
-#: builtin/replace.c:592
+#: builtin/replace.c:593
msgid "-g needs at least one argument"
msgstr ""
-#: builtin/replace.c:598
+#: builtin/replace.c:599
msgid "--convert-graft-file takes no argument"
msgstr ""
-#: builtin/replace.c:604
+#: builtin/replace.c:605
msgid "only one pattern can be given with -l"
msgstr ""
msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
msgstr ""
-#: builtin/rerere.c:59
+#: builtin/rerere.c:60
msgid "register clean resolutions in index"
msgstr ""
-#: builtin/reset.c:29
+#: builtin/rerere.c:79
+msgid "'git rerere forget' without paths is deprecated"
+msgstr ""
+
+#: builtin/rerere.c:113
+#, c-format
+msgid "unable to generate diff for '%s'"
+msgstr ""
+
+#: builtin/reset.c:32
msgid ""
"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
msgstr ""
-#: builtin/reset.c:30
+#: builtin/reset.c:33
msgid "git reset [-q] [<tree-ish>] [--] <paths>..."
msgstr ""
-#: builtin/reset.c:31
+#: builtin/reset.c:34
msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
msgstr ""
-#: builtin/reset.c:37
+#: builtin/reset.c:40
msgid "mixed"
msgstr ""
-#: builtin/reset.c:37
+#: builtin/reset.c:40
msgid "soft"
msgstr ""
-#: builtin/reset.c:37
+#: builtin/reset.c:40
msgid "hard"
msgstr ""
-#: builtin/reset.c:37
+#: builtin/reset.c:40
msgid "merge"
msgstr ""
-#: builtin/reset.c:37
+#: builtin/reset.c:40
msgid "keep"
msgstr ""
-#: builtin/reset.c:78
+#: builtin/reset.c:81
msgid "You do not have a valid HEAD."
msgstr ""
-#: builtin/reset.c:80
+#: builtin/reset.c:83
msgid "Failed to find tree of HEAD."
msgstr ""
-#: builtin/reset.c:86
+#: builtin/reset.c:89
#, c-format
msgid "Failed to find tree of %s."
msgstr ""
-#: builtin/reset.c:111
-#, c-format
-msgid "HEAD is now at %s"
-msgstr ""
-
-#: builtin/reset.c:189
+#: builtin/reset.c:193
#, c-format
msgid "Cannot do a %s reset in the middle of a merge."
msgstr ""
-#: builtin/reset.c:289
+#: builtin/reset.c:293
msgid "be quiet, only report errors"
msgstr ""
-#: builtin/reset.c:291
+#: builtin/reset.c:295
msgid "reset HEAD and index"
msgstr ""
-#: builtin/reset.c:292
+#: builtin/reset.c:296
msgid "reset only HEAD"
msgstr ""
-#: builtin/reset.c:294 builtin/reset.c:296
+#: builtin/reset.c:298 builtin/reset.c:300
msgid "reset HEAD, index and working tree"
msgstr ""
-#: builtin/reset.c:298
+#: builtin/reset.c:302
msgid "reset HEAD but keep local changes"
msgstr ""
-#: builtin/reset.c:304
+#: builtin/reset.c:308
msgid "record only the fact that removed paths will be added later"
msgstr ""
-#: builtin/reset.c:321
+#: builtin/reset.c:326
#, c-format
msgid "Failed to resolve '%s' as a valid revision."
msgstr ""
-#: builtin/reset.c:329
+#: builtin/reset.c:334
#, c-format
msgid "Failed to resolve '%s' as a valid tree."
msgstr ""
-#: builtin/reset.c:338
+#: builtin/reset.c:343
msgid "--patch is incompatible with --{hard,mixed,soft}"
msgstr ""
-#: builtin/reset.c:347
+#: builtin/reset.c:352
msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
msgstr ""
-#: builtin/reset.c:349
+#: builtin/reset.c:354
#, c-format
msgid "Cannot do %s reset with paths."
msgstr ""
-#: builtin/reset.c:359
+#: builtin/reset.c:364
#, c-format
msgid "%s reset is not allowed in a bare repository"
msgstr ""
-#: builtin/reset.c:363
+#: builtin/reset.c:368
msgid "-N can only be used with --mixed"
msgstr ""
-#: builtin/reset.c:380
+#: builtin/reset.c:388
msgid "Unstaged changes after reset:"
msgstr ""
-#: builtin/reset.c:386
+#: builtin/reset.c:391
+#, c-format
+msgid ""
+"\n"
+"It took %.2f seconds to enumerate unstaged changes after reset. You can\n"
+"use '--quiet' to avoid this. Set the config setting reset.quiet to true\n"
+"to make this the default.\n"
+msgstr ""
+
+#: builtin/reset.c:401
#, c-format
msgid "Could not reset index file to revision '%s'."
msgstr ""
-#: builtin/reset.c:390
+#: builtin/reset.c:405
msgid "Could not write new index file."
msgstr ""
-#: builtin/rev-list.c:399
+#: builtin/rev-list.c:406
msgid "cannot combine --exclude-promisor-objects and --missing"
msgstr ""
-#: builtin/rev-list.c:457
+#: builtin/rev-list.c:464
msgid "object filtering requires --objects"
msgstr ""
-#: builtin/rev-list.c:460
+#: builtin/rev-list.c:467
#, c-format
msgid "invalid sparse value '%s'"
msgstr ""
-#: builtin/rev-list.c:501
+#: builtin/rev-list.c:508
msgid "rev-list does not support display of notes"
msgstr ""
-#: builtin/rev-list.c:504
+#: builtin/rev-list.c:511
msgid "cannot combine --use-bitmap-index with object filtering"
msgstr ""
-#: builtin/rev-parse.c:406
+#: builtin/rev-parse.c:408
msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
msgstr ""
-#: builtin/rev-parse.c:411
+#: builtin/rev-parse.c:413
msgid "keep the `--` passed as an arg"
msgstr ""
-#: builtin/rev-parse.c:413
+#: builtin/rev-parse.c:415
msgid "stop parsing after the first non-option argument"
msgstr ""
-#: builtin/rev-parse.c:416
+#: builtin/rev-parse.c:418
msgid "output in stuck long form"
msgstr ""
-#: builtin/rev-parse.c:549
+#: builtin/rev-parse.c:551
msgid ""
"git rev-parse --parseopt [<options>] -- [<args>...]\n"
" or: git rev-parse --sq-quote [<arg>...]\n"
msgid "git cherry-pick <subcommand>"
msgstr ""
-#: builtin/revert.c:91
+#: builtin/revert.c:72
+#, c-format
+msgid "option `%s' expects a number greater than zero"
+msgstr ""
+
+#: builtin/revert.c:92
#, c-format
msgid "%s: %s cannot be used with %s"
msgstr ""
-#: builtin/revert.c:100
+#: builtin/revert.c:101
msgid "end revert or cherry-pick sequence"
msgstr ""
-#: builtin/revert.c:101
+#: builtin/revert.c:102
msgid "resume revert or cherry-pick sequence"
msgstr ""
-#: builtin/revert.c:102
+#: builtin/revert.c:103
msgid "cancel revert or cherry-pick sequence"
msgstr ""
-#: builtin/revert.c:103
+#: builtin/revert.c:104
msgid "don't automatically commit"
msgstr ""
-#: builtin/revert.c:104
+#: builtin/revert.c:105
msgid "edit the commit message"
msgstr ""
-#: builtin/revert.c:107
+#: builtin/revert.c:108
msgid "parent-number"
msgstr ""
-#: builtin/revert.c:108
+#: builtin/revert.c:109
msgid "select mainline parent"
msgstr ""
-#: builtin/revert.c:110
-msgid "merge strategy"
-msgstr ""
-
#: builtin/revert.c:111
-msgid "option"
+msgid "merge strategy"
msgstr ""
-#: builtin/revert.c:112
+#: builtin/revert.c:113
msgid "option for merge strategy"
msgstr ""
-#: builtin/revert.c:121
+#: builtin/revert.c:122
msgid "append commit name"
msgstr ""
-#: builtin/revert.c:123
+#: builtin/revert.c:124
msgid "preserve initially empty commits"
msgstr ""
-#: builtin/revert.c:125
+#: builtin/revert.c:126
msgid "keep redundant, empty commits"
msgstr ""
-#: builtin/revert.c:219
+#: builtin/revert.c:220
msgid "revert failed"
msgstr ""
-#: builtin/revert.c:232
+#: builtin/revert.c:233
msgid "cherry-pick failed"
msgstr ""
-#: builtin/rm.c:18
+#: builtin/rm.c:19
msgid "git rm [<options>] [--] <file>..."
msgstr ""
-#: builtin/rm.c:206
+#: builtin/rm.c:207
msgid ""
"the following file has staged content different from both the\n"
"file and the HEAD:"
msgstr[0] ""
msgstr[1] ""
-#: builtin/rm.c:211
+#: builtin/rm.c:212
msgid ""
"\n"
"(use -f to force removal)"
msgstr ""
-#: builtin/rm.c:215
+#: builtin/rm.c:216
msgid "the following file has changes staged in the index:"
msgid_plural "the following files have changes staged in the index:"
msgstr[0] ""
msgstr[1] ""
-#: builtin/rm.c:219 builtin/rm.c:228
+#: builtin/rm.c:220 builtin/rm.c:229
msgid ""
"\n"
"(use --cached to keep the file, or -f to force removal)"
msgstr ""
-#: builtin/rm.c:225
+#: builtin/rm.c:226
msgid "the following file has local modifications:"
msgid_plural "the following files have local modifications:"
msgstr[0] ""
msgstr[1] ""
-#: builtin/rm.c:241
+#: builtin/rm.c:242
msgid "do not list removed files"
msgstr ""
-#: builtin/rm.c:242
+#: builtin/rm.c:243
msgid "only remove from the index"
msgstr ""
-#: builtin/rm.c:243
+#: builtin/rm.c:244
msgid "override the up-to-date check"
msgstr ""
-#: builtin/rm.c:244
+#: builtin/rm.c:245
msgid "allow recursive removal"
msgstr ""
-#: builtin/rm.c:246
+#: builtin/rm.c:247
msgid "exit with a zero status even if nothing matched"
msgstr ""
-#: builtin/rm.c:288
+#: builtin/rm.c:289
msgid "please stage your changes to .gitmodules or stash them to proceed"
msgstr ""
-#: builtin/rm.c:306
+#: builtin/rm.c:307
#, c-format
msgid "not removing '%s' recursively without -r"
msgstr ""
-#: builtin/rm.c:345
+#: builtin/rm.c:346
#, c-format
msgid "git rm: unable to remove %s"
msgstr ""
-#: builtin/rm.c:368
-#, c-format
-msgid "could not remove '%s'"
-msgstr ""
-
#: builtin/send-pack.c:20
msgid ""
"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
msgid "Linewrap output"
msgstr ""
-#: builtin/shortlog.c:299
+#: builtin/shortlog.c:301
msgid "too many arguments given outside repository"
msgstr ""
msgid "no matching refs with %s"
msgstr ""
-#: builtin/show-branch.c:645
+#: builtin/show-branch.c:646
msgid "show remote-tracking and local branches"
msgstr ""
-#: builtin/show-branch.c:647
+#: builtin/show-branch.c:648
msgid "show remote-tracking branches"
msgstr ""
-#: builtin/show-branch.c:649
+#: builtin/show-branch.c:650
msgid "color '*!+-' corresponding to the branch"
msgstr ""
-#: builtin/show-branch.c:651
+#: builtin/show-branch.c:652
msgid "show <n> more commits after the common ancestor"
msgstr ""
-#: builtin/show-branch.c:653
+#: builtin/show-branch.c:654
msgid "synonym to more=-1"
msgstr ""
-#: builtin/show-branch.c:654
+#: builtin/show-branch.c:655
msgid "suppress naming strings"
msgstr ""
-#: builtin/show-branch.c:656
+#: builtin/show-branch.c:657
msgid "include the current branch"
msgstr ""
-#: builtin/show-branch.c:658
+#: builtin/show-branch.c:659
msgid "name commits with their object names"
msgstr ""
-#: builtin/show-branch.c:660
+#: builtin/show-branch.c:661
msgid "show possible merge bases"
msgstr ""
-#: builtin/show-branch.c:662
+#: builtin/show-branch.c:663
msgid "show refs unreachable from any other ref"
msgstr ""
-#: builtin/show-branch.c:664
+#: builtin/show-branch.c:665
msgid "show commits in topological order"
msgstr ""
-#: builtin/show-branch.c:667
+#: builtin/show-branch.c:668
msgid "show only commits not on the first branch"
msgstr ""
-#: builtin/show-branch.c:669
+#: builtin/show-branch.c:670
msgid "show merges reachable from only one tip"
msgstr ""
-#: builtin/show-branch.c:671
+#: builtin/show-branch.c:672
msgid "topologically sort, maintaining date order where possible"
msgstr ""
-#: builtin/show-branch.c:674
+#: builtin/show-branch.c:675
msgid "<n>[,<base>]"
msgstr ""
-#: builtin/show-branch.c:675
+#: builtin/show-branch.c:676
msgid "show <n> most recent ref-log entries starting at base"
msgstr ""
-#: builtin/show-branch.c:711
+#: builtin/show-branch.c:712
msgid ""
"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
msgstr ""
-#: builtin/show-branch.c:735
+#: builtin/show-branch.c:736
msgid "no branches given, and HEAD is not valid"
msgstr ""
-#: builtin/show-branch.c:738
+#: builtin/show-branch.c:739
msgid "--reflog option needs one branch name"
msgstr ""
-#: builtin/show-branch.c:741
+#: builtin/show-branch.c:742
#, c-format
msgid "only %d entry can be shown at one time."
msgid_plural "only %d entries can be shown at one time."
msgstr[0] ""
msgstr[1] ""
-#: builtin/show-branch.c:745
+#: builtin/show-branch.c:746
#, c-format
msgid "no such ref %s"
msgstr ""
-#: builtin/show-branch.c:829
+#: builtin/show-branch.c:830
#, c-format
msgid "cannot handle more than %d rev."
msgid_plural "cannot handle more than %d revs."
msgstr[0] ""
msgstr[1] ""
-#: builtin/show-branch.c:833
+#: builtin/show-branch.c:834
#, c-format
msgid "'%s' is not a valid ref."
msgstr ""
-#: builtin/show-branch.c:836
+#: builtin/show-branch.c:837
#, c-format
msgid "cannot find commit %s (%s)"
msgstr ""
msgid "git show-ref --exclude-existing[=<pattern>]"
msgstr ""
-#: builtin/show-ref.c:160
+#: builtin/show-ref.c:161
msgid "only show tags (can be combined with heads)"
msgstr ""
-#: builtin/show-ref.c:161
+#: builtin/show-ref.c:162
msgid "only show heads (can be combined with tags)"
msgstr ""
-#: builtin/show-ref.c:162
+#: builtin/show-ref.c:163
msgid "stricter reference checking, requires exact ref path"
msgstr ""
-#: builtin/show-ref.c:165 builtin/show-ref.c:167
+#: builtin/show-ref.c:166 builtin/show-ref.c:168
msgid "show the HEAD reference, even if it would be filtered out"
msgstr ""
-#: builtin/show-ref.c:169
+#: builtin/show-ref.c:170
msgid "dereference tags into object IDs"
msgstr ""
-#: builtin/show-ref.c:171
+#: builtin/show-ref.c:172
msgid "only show SHA1 hash using <n> digits"
msgstr ""
-#: builtin/show-ref.c:175
+#: builtin/show-ref.c:176
msgid "do not print results to stdout (useful with --verify)"
msgstr ""
-#: builtin/show-ref.c:177
+#: builtin/show-ref.c:178
msgid "show refs from stdin that aren't in local repository"
msgstr ""
msgid "git stripspace [-c | --comment-lines]"
msgstr ""
-#: builtin/stripspace.c:36
+#: builtin/stripspace.c:37
msgid "skip and remove all lines starting with comment character"
msgstr ""
-#: builtin/stripspace.c:39
+#: builtin/stripspace.c:40
msgid "prepend comment character and space to each line"
msgstr ""
-#: 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:1842
+#: builtin/submodule--helper.c:45 builtin/submodule--helper.c:1943
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr ""
-#: builtin/submodule--helper.c:61
+#: builtin/submodule--helper.c:62
msgid "submodule--helper print-default-remote takes no arguments"
msgstr ""
-#: builtin/submodule--helper.c:99
+#: builtin/submodule--helper.c:100
#, c-format
msgid "cannot strip one component off url '%s'"
msgstr ""
-#: builtin/submodule--helper.c:407 builtin/submodule--helper.c:1356
+#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1367
msgid "alternative anchor for relative paths"
msgstr ""
-#: builtin/submodule--helper.c:412
+#: builtin/submodule--helper.c:413
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr ""
-#: builtin/submodule--helper.c:469 builtin/submodule--helper.c:606
-#: builtin/submodule--helper.c:629
+#: builtin/submodule--helper.c:470 builtin/submodule--helper.c:627
+#: builtin/submodule--helper.c:650
#, c-format
msgid "No url found for submodule path '%s' in .gitmodules"
msgstr ""
-#: builtin/submodule--helper.c:521
+#: builtin/submodule--helper.c:522
#, c-format
msgid "Entering '%s'\n"
msgstr ""
-#: builtin/submodule--helper.c:524
+#: builtin/submodule--helper.c:525
#, c-format
msgid ""
"run_command returned non-zero status for %s\n"
"."
msgstr ""
-#: builtin/submodule--helper.c:545
+#: builtin/submodule--helper.c:546
#, c-format
msgid ""
"run_command returned non-zero status while recursing in the nested "
"."
msgstr ""
-#: builtin/submodule--helper.c:561
+#: builtin/submodule--helper.c:562
msgid "Suppress output of entering each submodule command"
msgstr ""
-#: builtin/submodule--helper.c:563 builtin/submodule--helper.c:1040
+#: builtin/submodule--helper.c:564 builtin/submodule--helper.c:1049
msgid "Recurse into nested submodules"
msgstr ""
-#: builtin/submodule--helper.c:568
+#: builtin/submodule--helper.c:569
msgid "git submodule--helper foreach [--quiet] [--recursive] <command>"
msgstr ""
-#: builtin/submodule--helper.c:644
+#: builtin/submodule--helper.c:596
#, c-format
msgid ""
-"could not lookup configuration '%s'. Assuming this repository is its own "
+"could not look up configuration '%s'. Assuming this repository is its own "
"authoritative upstream."
msgstr ""
-#: builtin/submodule--helper.c:655
+#: builtin/submodule--helper.c:664
#, c-format
msgid "Failed to register url for submodule path '%s'"
msgstr ""
-#: builtin/submodule--helper.c:659
+#: builtin/submodule--helper.c:668
#, c-format
msgid "Submodule '%s' (%s) registered for path '%s'\n"
msgstr ""
-#: builtin/submodule--helper.c:669
+#: builtin/submodule--helper.c:678
#, c-format
msgid "warning: command update mode suggested for submodule '%s'\n"
msgstr ""
-#: builtin/submodule--helper.c:676
+#: builtin/submodule--helper.c:685
#, c-format
msgid "Failed to register update mode for submodule path '%s'"
msgstr ""
-#: builtin/submodule--helper.c:698
+#: builtin/submodule--helper.c:707
msgid "Suppress output for initializing a submodule"
msgstr ""
-#: builtin/submodule--helper.c:703
+#: builtin/submodule--helper.c:712
msgid "git submodule--helper init [<path>]"
msgstr ""
-#: builtin/submodule--helper.c:775 builtin/submodule--helper.c:901
+#: builtin/submodule--helper.c:784 builtin/submodule--helper.c:910
#, c-format
msgid "no submodule mapping found in .gitmodules for path '%s'"
msgstr ""
-#: builtin/submodule--helper.c:814
+#: builtin/submodule--helper.c:823
#, c-format
msgid "could not resolve HEAD ref inside the submodule '%s'"
msgstr ""
-#: builtin/submodule--helper.c:841 builtin/submodule--helper.c:1010
+#: builtin/submodule--helper.c:850 builtin/submodule--helper.c:1019
#, c-format
msgid "failed to recurse into submodule '%s'"
msgstr ""
-#: builtin/submodule--helper.c:865 builtin/submodule--helper.c:1176
+#: builtin/submodule--helper.c:874 builtin/submodule--helper.c:1185
msgid "Suppress submodule status output"
msgstr ""
-#: builtin/submodule--helper.c:866
+#: builtin/submodule--helper.c:875
msgid ""
"Use commit stored in the index instead of the one stored in the submodule "
"HEAD"
msgstr ""
-#: builtin/submodule--helper.c:867
+#: builtin/submodule--helper.c:876
msgid "recurse into nested submodules"
msgstr ""
-#: builtin/submodule--helper.c:872
+#: builtin/submodule--helper.c:881
msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
msgstr ""
-#: builtin/submodule--helper.c:896
+#: builtin/submodule--helper.c:905
msgid "git submodule--helper name <path>"
msgstr ""
-#: builtin/submodule--helper.c:960
+#: builtin/submodule--helper.c:969
#, c-format
msgid "Synchronizing submodule url for '%s'\n"
msgstr ""
-#: builtin/submodule--helper.c:966
+#: builtin/submodule--helper.c:975
#, c-format
msgid "failed to register url for submodule path '%s'"
msgstr ""
-#: builtin/submodule--helper.c:980
+#: builtin/submodule--helper.c:989
#, c-format
msgid "failed to get the default remote for submodule '%s'"
msgstr ""
-#: builtin/submodule--helper.c:991
+#: builtin/submodule--helper.c:1000
#, c-format
msgid "failed to update remote for submodule '%s'"
msgstr ""
-#: builtin/submodule--helper.c:1038
+#: builtin/submodule--helper.c:1047
msgid "Suppress output of synchronizing submodule url"
msgstr ""
-#: builtin/submodule--helper.c:1045
+#: builtin/submodule--helper.c:1054
msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
msgstr ""
-#: builtin/submodule--helper.c:1099
+#: builtin/submodule--helper.c:1108
#, c-format
msgid ""
"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
"really want to remove it including all of its history)"
msgstr ""
-#: builtin/submodule--helper.c:1111
+#: builtin/submodule--helper.c:1120
#, c-format
msgid ""
"Submodule work tree '%s' contains local modifications; use '-f' to discard "
"them"
msgstr ""
-#: builtin/submodule--helper.c:1119
+#: builtin/submodule--helper.c:1128
#, c-format
msgid "Cleared directory '%s'\n"
msgstr ""
-#: builtin/submodule--helper.c:1121
+#: builtin/submodule--helper.c:1130
#, c-format
msgid "Could not remove submodule work tree '%s'\n"
msgstr ""
-#: builtin/submodule--helper.c:1132
+#: builtin/submodule--helper.c:1141
#, c-format
msgid "could not create empty submodule directory %s"
msgstr ""
-#: builtin/submodule--helper.c:1148
+#: builtin/submodule--helper.c:1157
#, c-format
msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
msgstr ""
-#: builtin/submodule--helper.c:1177
+#: builtin/submodule--helper.c:1186
msgid "Remove submodule working trees even if they contain local changes"
msgstr ""
-#: builtin/submodule--helper.c:1178
+#: builtin/submodule--helper.c:1187
msgid "Unregister all submodules"
msgstr ""
-#: builtin/submodule--helper.c:1183
+#: builtin/submodule--helper.c:1192
msgid ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
msgstr ""
-#: builtin/submodule--helper.c:1197
+#: builtin/submodule--helper.c:1206
msgid "Use '--all' if you really want to deinitialize all submodules"
msgstr ""
-#: builtin/submodule--helper.c:1290 builtin/submodule--helper.c:1293
+#: builtin/submodule--helper.c:1301 builtin/submodule--helper.c:1304
#, c-format
msgid "submodule '%s' cannot add alternate: %s"
msgstr ""
-#: builtin/submodule--helper.c:1329
+#: builtin/submodule--helper.c:1340
#, c-format
msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
msgstr ""
-#: builtin/submodule--helper.c:1336
+#: builtin/submodule--helper.c:1347
#, c-format
msgid "Value '%s' for submodule.alternateLocation is not recognized"
msgstr ""
-#: builtin/submodule--helper.c:1359
+#: builtin/submodule--helper.c:1370
msgid "where the new submodule will be cloned to"
msgstr ""
-#: builtin/submodule--helper.c:1362
+#: builtin/submodule--helper.c:1373
msgid "name of the new submodule"
msgstr ""
-#: builtin/submodule--helper.c:1365
+#: builtin/submodule--helper.c:1376
msgid "url where to clone the submodule from"
msgstr ""
-#: builtin/submodule--helper.c:1373
+#: builtin/submodule--helper.c:1384
msgid "depth for shallow clones"
msgstr ""
-#: builtin/submodule--helper.c:1376 builtin/submodule--helper.c:1751
+#: builtin/submodule--helper.c:1387 builtin/submodule--helper.c:1872
msgid "force cloning progress"
msgstr ""
-#: builtin/submodule--helper.c:1381
+#: builtin/submodule--helper.c:1392
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
msgstr ""
-#: builtin/submodule--helper.c:1412
+#: builtin/submodule--helper.c:1423
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr ""
-#: builtin/submodule--helper.c:1426
+#: builtin/submodule--helper.c:1437
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr ""
-#: builtin/submodule--helper.c:1492
+#: builtin/submodule--helper.c:1473
+#, c-format
+msgid "Invalid update mode '%s' for submodule path '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:1477
+#, c-format
+msgid "Invalid update mode '%s' configured for submodule path '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:1570
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr ""
-#: builtin/submodule--helper.c:1496
+#: builtin/submodule--helper.c:1574
msgid "Maybe you want to use 'update --init'?"
msgstr ""
-#: builtin/submodule--helper.c:1525
+#: builtin/submodule--helper.c:1604
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr ""
-#: builtin/submodule--helper.c:1554
+#: builtin/submodule--helper.c:1633
#, c-format
msgid "Skipping submodule '%s'"
msgstr ""
-#: builtin/submodule--helper.c:1689
+#: builtin/submodule--helper.c:1777
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr ""
-#: builtin/submodule--helper.c:1700
+#: builtin/submodule--helper.c:1788
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
msgstr ""
-#: builtin/submodule--helper.c:1730 builtin/submodule--helper.c:1953
+#: builtin/submodule--helper.c:1851 builtin/submodule--helper.c:2093
msgid "path into the working tree"
msgstr ""
-#: builtin/submodule--helper.c:1733
+#: builtin/submodule--helper.c:1854
msgid "path into the working tree, across nested submodule boundaries"
msgstr ""
-#: builtin/submodule--helper.c:1737
+#: builtin/submodule--helper.c:1858
msgid "rebase, merge, checkout or none"
msgstr ""
-#: builtin/submodule--helper.c:1743
+#: builtin/submodule--helper.c:1864
msgid "Create a shallow clone truncated to the specified number of revisions"
msgstr ""
-#: builtin/submodule--helper.c:1746
+#: builtin/submodule--helper.c:1867
msgid "parallel jobs"
msgstr ""
-#: builtin/submodule--helper.c:1748
+#: builtin/submodule--helper.c:1869
msgid "whether the initial clone should follow the shallow recommendation"
msgstr ""
-#: builtin/submodule--helper.c:1749
+#: builtin/submodule--helper.c:1870
msgid "don't print cloning progress"
msgstr ""
-#: builtin/submodule--helper.c:1756
+#: builtin/submodule--helper.c:1877
msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
msgstr ""
-#: builtin/submodule--helper.c:1769
+#: builtin/submodule--helper.c:1890
msgid "bad value for update parameter"
msgstr ""
-#: builtin/submodule--helper.c:1837
+#: builtin/submodule--helper.c:1938
#, c-format
msgid ""
"Submodule (%s) branch configured to inherit branch from superproject, but "
"the superproject is not on any branch"
msgstr ""
-#: builtin/submodule--helper.c:1954
+#: builtin/submodule--helper.c:2061
+#, c-format
+msgid "could not get a repository handle for submodule '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:2094
msgid "recurse into submodules"
msgstr ""
-#: builtin/submodule--helper.c:1960
+#: builtin/submodule--helper.c:2100
msgid "git submodule--helper embed-git-dir [<path>...]"
msgstr ""
-#: builtin/submodule--helper.c:2071
+#: builtin/submodule--helper.c:2156
+msgid "check if it is safe to write to the .gitmodules file"
+msgstr ""
+
+#: builtin/submodule--helper.c:2161
+msgid "git submodule--helper config name [value]"
+msgstr ""
+
+#: builtin/submodule--helper.c:2162
+msgid "git submodule--helper config --check-writeable"
+msgstr ""
+
+#: builtin/submodule--helper.c:2179 git-submodule.sh:169
+#, sh-format
+msgid "please make sure that the .gitmodules file is in the working tree"
+msgstr ""
+
+#: builtin/submodule--helper.c:2229 git.c:413 git.c:658
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr ""
-#: builtin/submodule--helper.c:2077
+#: builtin/submodule--helper.c:2235
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr ""
msgid "The tag message has been left in %s\n"
msgstr ""
-#: builtin/tag.c:383
+#: builtin/tag.c:385
msgid "list tag names"
msgstr ""
-#: builtin/tag.c:385
+#: builtin/tag.c:387
msgid "print <n> lines of each tag message"
msgstr ""
-#: builtin/tag.c:387
+#: builtin/tag.c:389
msgid "delete tags"
msgstr ""
-#: builtin/tag.c:388
+#: builtin/tag.c:390
msgid "verify tags"
msgstr ""
-#: builtin/tag.c:390
+#: builtin/tag.c:392
msgid "Tag creation options"
msgstr ""
-#: builtin/tag.c:392
+#: builtin/tag.c:394
msgid "annotated tag, needs a message"
msgstr ""
-#: builtin/tag.c:394
+#: builtin/tag.c:396
msgid "tag message"
msgstr ""
-#: builtin/tag.c:396
+#: builtin/tag.c:398
msgid "force edit of tag message"
msgstr ""
-#: builtin/tag.c:397
+#: builtin/tag.c:399
msgid "annotated and GPG-signed tag"
msgstr ""
-#: builtin/tag.c:401
+#: builtin/tag.c:403
msgid "use another key to sign the tag"
msgstr ""
-#: builtin/tag.c:402
+#: builtin/tag.c:404
msgid "replace the tag if exists"
msgstr ""
-#: builtin/tag.c:403 builtin/update-ref.c:369
+#: builtin/tag.c:405 builtin/update-ref.c:369
msgid "create a reflog"
msgstr ""
-#: builtin/tag.c:405
+#: builtin/tag.c:407
msgid "Tag listing options"
msgstr ""
-#: builtin/tag.c:406
+#: builtin/tag.c:408
msgid "show tag list in columns"
msgstr ""
-#: builtin/tag.c:407 builtin/tag.c:409
+#: builtin/tag.c:409 builtin/tag.c:411
msgid "print only tags that contain the commit"
msgstr ""
-#: builtin/tag.c:408 builtin/tag.c:410
+#: builtin/tag.c:410 builtin/tag.c:412
msgid "print only tags that don't contain the commit"
msgstr ""
-#: builtin/tag.c:411
+#: builtin/tag.c:413
msgid "print only tags that are merged"
msgstr ""
-#: builtin/tag.c:412
+#: builtin/tag.c:414
msgid "print only tags that are not merged"
msgstr ""
-#: builtin/tag.c:417
+#: builtin/tag.c:419
msgid "print only tags of the object"
msgstr ""
-#: builtin/tag.c:461
+#: builtin/tag.c:463
msgid "--column and -n are incompatible"
msgstr ""
-#: builtin/tag.c:483
+#: builtin/tag.c:485
msgid "-n option is only allowed in list mode"
msgstr ""
-#: builtin/tag.c:485
+#: builtin/tag.c:487
msgid "--contains option is only allowed in list mode"
msgstr ""
-#: builtin/tag.c:487
+#: builtin/tag.c:489
msgid "--no-contains option is only allowed in list mode"
msgstr ""
-#: builtin/tag.c:489
+#: builtin/tag.c:491
msgid "--points-at option is only allowed in list mode"
msgstr ""
-#: builtin/tag.c:491
+#: builtin/tag.c:493
msgid "--merged and --no-merged options are only allowed in list mode"
msgstr ""
-#: builtin/tag.c:502
+#: builtin/tag.c:504
msgid "only one -F or -m option is allowed."
msgstr ""
-#: builtin/tag.c:521
+#: builtin/tag.c:523
msgid "too many params"
msgstr ""
-#: builtin/tag.c:527
+#: builtin/tag.c:529
#, c-format
msgid "'%s' is not a valid tag name."
msgstr ""
-#: builtin/tag.c:532
+#: builtin/tag.c:534
#, c-format
msgid "tag '%s' already exists"
msgstr ""
-#: builtin/tag.c:563
+#: builtin/tag.c:565
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr ""
msgid "Unpacking objects"
msgstr ""
-#: builtin/update-index.c:82
+#: builtin/update-index.c:83
#, c-format
msgid "failed to create directory %s"
msgstr ""
-#: builtin/update-index.c:98
+#: builtin/update-index.c:99
#, c-format
msgid "failed to create file %s"
msgstr ""
-#: builtin/update-index.c:106
+#: builtin/update-index.c:107
#, c-format
msgid "failed to delete file %s"
msgstr ""
-#: builtin/update-index.c:113 builtin/update-index.c:219
+#: builtin/update-index.c:114 builtin/update-index.c:220
#, c-format
msgid "failed to delete directory %s"
msgstr ""
-#: builtin/update-index.c:138
+#: builtin/update-index.c:139
#, c-format
msgid "Testing mtime in '%s' "
msgstr ""
-#: builtin/update-index.c:152
+#: builtin/update-index.c:153
msgid "directory stat info does not change after adding a new file"
msgstr ""
-#: builtin/update-index.c:165
+#: builtin/update-index.c:166
msgid "directory stat info does not change after adding a new directory"
msgstr ""
-#: builtin/update-index.c:178
+#: builtin/update-index.c:179
msgid "directory stat info changes after updating a file"
msgstr ""
-#: builtin/update-index.c:189
+#: builtin/update-index.c:190
msgid "directory stat info changes after adding a file inside subdirectory"
msgstr ""
-#: builtin/update-index.c:200
+#: builtin/update-index.c:201
msgid "directory stat info does not change after deleting a file"
msgstr ""
-#: builtin/update-index.c:213
+#: builtin/update-index.c:214
msgid "directory stat info does not change after deleting a directory"
msgstr ""
-#: builtin/update-index.c:220
+#: builtin/update-index.c:221
msgid " OK"
msgstr ""
-#: builtin/update-index.c:588
+#: builtin/update-index.c:589
msgid "git update-index [<options>] [--] [<file>...]"
msgstr ""
-#: builtin/update-index.c:944
+#: builtin/update-index.c:962
msgid "continue refresh even when index needs update"
msgstr ""
-#: builtin/update-index.c:947
+#: builtin/update-index.c:965
msgid "refresh: ignore submodules"
msgstr ""
-#: builtin/update-index.c:950
+#: builtin/update-index.c:968
msgid "do not ignore new files"
msgstr ""
-#: builtin/update-index.c:952
+#: builtin/update-index.c:970
msgid "let files replace directories and vice-versa"
msgstr ""
-#: builtin/update-index.c:954
+#: builtin/update-index.c:972
msgid "notice files missing from worktree"
msgstr ""
-#: builtin/update-index.c:956
+#: builtin/update-index.c:974
msgid "refresh even if index contains unmerged entries"
msgstr ""
-#: builtin/update-index.c:959
+#: builtin/update-index.c:977
msgid "refresh stat information"
msgstr ""
-#: builtin/update-index.c:963
+#: builtin/update-index.c:981
msgid "like --refresh, but ignore assume-unchanged setting"
msgstr ""
-#: builtin/update-index.c:967
+#: builtin/update-index.c:985
msgid "<mode>,<object>,<path>"
msgstr ""
-#: builtin/update-index.c:968
+#: builtin/update-index.c:986
msgid "add the specified entry to the index"
msgstr ""
-#: builtin/update-index.c:977
+#: builtin/update-index.c:995
msgid "mark files as \"not changing\""
msgstr ""
-#: builtin/update-index.c:980
+#: builtin/update-index.c:998
msgid "clear assumed-unchanged bit"
msgstr ""
-#: builtin/update-index.c:983
+#: builtin/update-index.c:1001
msgid "mark files as \"index-only\""
msgstr ""
-#: builtin/update-index.c:986
+#: builtin/update-index.c:1004
msgid "clear skip-worktree bit"
msgstr ""
-#: builtin/update-index.c:989
+#: builtin/update-index.c:1007
msgid "add to index only; do not add content to object database"
msgstr ""
-#: builtin/update-index.c:991
+#: builtin/update-index.c:1009
msgid "remove named paths even if present in worktree"
msgstr ""
-#: builtin/update-index.c:993
+#: builtin/update-index.c:1011
msgid "with --stdin: input lines are terminated by null bytes"
msgstr ""
-#: builtin/update-index.c:995
+#: builtin/update-index.c:1013
msgid "read list of paths to be updated from standard input"
msgstr ""
-#: builtin/update-index.c:999
+#: builtin/update-index.c:1017
msgid "add entries from standard input to the index"
msgstr ""
-#: builtin/update-index.c:1003
+#: builtin/update-index.c:1021
msgid "repopulate stages #2 and #3 for the listed paths"
msgstr ""
-#: builtin/update-index.c:1007
+#: builtin/update-index.c:1025
msgid "only update entries that differ from HEAD"
msgstr ""
-#: builtin/update-index.c:1011
+#: builtin/update-index.c:1029
msgid "ignore files missing from worktree"
msgstr ""
-#: builtin/update-index.c:1014
+#: builtin/update-index.c:1032
msgid "report actions to standard output"
msgstr ""
-#: builtin/update-index.c:1016
+#: builtin/update-index.c:1034
msgid "(for porcelains) forget saved unresolved conflicts"
msgstr ""
-#: builtin/update-index.c:1020
+#: builtin/update-index.c:1038
msgid "write index in this format"
msgstr ""
-#: builtin/update-index.c:1022
+#: builtin/update-index.c:1040
msgid "enable or disable split index"
msgstr ""
-#: builtin/update-index.c:1024
+#: builtin/update-index.c:1042
msgid "enable/disable untracked cache"
msgstr ""
-#: builtin/update-index.c:1026
+#: builtin/update-index.c:1044
msgid "test if the filesystem supports untracked cache"
msgstr ""
-#: builtin/update-index.c:1028
+#: builtin/update-index.c:1046
msgid "enable untracked cache without testing the filesystem"
msgstr ""
-#: builtin/update-index.c:1030
+#: builtin/update-index.c:1048
msgid "write out the index even if is not flagged as changed"
msgstr ""
-#: builtin/update-index.c:1032
+#: builtin/update-index.c:1050
msgid "enable or disable file system monitor"
msgstr ""
-#: builtin/update-index.c:1034
+#: builtin/update-index.c:1052
msgid "mark files as fsmonitor valid"
msgstr ""
-#: builtin/update-index.c:1037
+#: builtin/update-index.c:1055
msgid "clear fsmonitor valid bit"
msgstr ""
-#: builtin/update-index.c:1136
+#: builtin/update-index.c:1156
msgid ""
"core.splitIndex is set to false; remove or change it, if you really want to "
"enable split index"
msgstr ""
-#: builtin/update-index.c:1145
+#: builtin/update-index.c:1165
msgid ""
"core.splitIndex is set to true; remove or change it, if you really want to "
"disable split index"
msgstr ""
-#: builtin/update-index.c:1156
+#: builtin/update-index.c:1176
msgid ""
"core.untrackedCache is set to true; remove or change it, if you really want "
"to disable the untracked cache"
msgstr ""
-#: builtin/update-index.c:1160
+#: builtin/update-index.c:1180
msgid "Untracked cache disabled"
msgstr ""
-#: builtin/update-index.c:1168
+#: builtin/update-index.c:1188
msgid ""
"core.untrackedCache is set to false; remove or change it, if you really want "
"to enable the untracked cache"
msgstr ""
-#: builtin/update-index.c:1172
+#: builtin/update-index.c:1192
#, c-format
msgid "Untracked cache enabled for '%s'"
msgstr ""
-#: builtin/update-index.c:1180
+#: builtin/update-index.c:1200
msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
msgstr ""
-#: builtin/update-index.c:1184
+#: builtin/update-index.c:1204
msgid "fsmonitor enabled"
msgstr ""
-#: builtin/update-index.c:1187
+#: builtin/update-index.c:1207
msgid ""
"core.fsmonitor is set; remove it if you really want to disable fsmonitor"
msgstr ""
-#: builtin/update-index.c:1191
+#: builtin/update-index.c:1211
msgid "fsmonitor disabled"
msgstr ""
msgid "print tag contents"
msgstr ""
-#: builtin/worktree.c:17
+#: builtin/worktree.c:18
msgid "git worktree add [<options>] <path> [<commit-ish>]"
msgstr ""
-#: builtin/worktree.c:18
+#: builtin/worktree.c:19
msgid "git worktree list [<options>]"
msgstr ""
-#: builtin/worktree.c:19
+#: builtin/worktree.c:20
msgid "git worktree lock [<options>] <path>"
msgstr ""
-#: builtin/worktree.c:20
+#: builtin/worktree.c:21
msgid "git worktree move <worktree> <new-path>"
msgstr ""
-#: builtin/worktree.c:21
+#: builtin/worktree.c:22
msgid "git worktree prune [<options>]"
msgstr ""
-#: builtin/worktree.c:22
+#: builtin/worktree.c:23
msgid "git worktree remove [<options>] <worktree>"
msgstr ""
-#: builtin/worktree.c:23
+#: builtin/worktree.c:24
msgid "git worktree unlock <path>"
msgstr ""
-#: builtin/worktree.c:59
+#: builtin/worktree.c:61 builtin/worktree.c:888
+#, c-format
+msgid "failed to delete '%s'"
+msgstr ""
+
+#: builtin/worktree.c:80
#, c-format
msgid "Removing worktrees/%s: not a valid directory"
msgstr ""
-#: builtin/worktree.c:65
+#: builtin/worktree.c:86
#, c-format
msgid "Removing worktrees/%s: gitdir file does not exist"
msgstr ""
-#: builtin/worktree.c:70 builtin/worktree.c:79
+#: builtin/worktree.c:91 builtin/worktree.c:100
#, c-format
msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
msgstr ""
-#: builtin/worktree.c:89
+#: builtin/worktree.c:110
#, c-format
msgid ""
"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
"%<PRIuMAX>)"
msgstr ""
-#: builtin/worktree.c:97
+#: builtin/worktree.c:118
#, c-format
msgid "Removing worktrees/%s: invalid gitdir file"
msgstr ""
-#: builtin/worktree.c:106
+#: builtin/worktree.c:127
#, c-format
msgid "Removing worktrees/%s: gitdir file points to non-existent location"
msgstr ""
-#: builtin/worktree.c:153
+#: builtin/worktree.c:166
msgid "report pruned working trees"
msgstr ""
-#: builtin/worktree.c:155
+#: builtin/worktree.c:168
msgid "expire working trees older than <time>"
msgstr ""
-#: builtin/worktree.c:230
+#: builtin/worktree.c:235
#, c-format
msgid "'%s' already exists"
msgstr ""
-#: builtin/worktree.c:261
+#: builtin/worktree.c:252
+#, c-format
+msgid "unable to re-add worktree '%s'"
+msgstr ""
+
+#: builtin/worktree.c:257
+#, c-format
+msgid ""
+"'%s' is a missing but locked worktree;\n"
+"use 'add -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear"
+msgstr ""
+
+#: builtin/worktree.c:259
+#, c-format
+msgid ""
+"'%s' is a missing but already registered worktree;\n"
+"use 'add -f' to override, or 'prune' or 'remove' to clear"
+msgstr ""
+
+#: builtin/worktree.c:310
#, c-format
msgid "could not create directory of '%s'"
msgstr ""
-#: builtin/worktree.c:380 builtin/worktree.c:386
+#: builtin/worktree.c:429 builtin/worktree.c:435
#, c-format
msgid "Preparing worktree (new branch '%s')"
msgstr ""
-#: builtin/worktree.c:382
+#: builtin/worktree.c:431
#, c-format
msgid "Preparing worktree (resetting branch '%s'; was at %s)"
msgstr ""
-#: builtin/worktree.c:391
+#: builtin/worktree.c:440
#, c-format
msgid "Preparing worktree (checking out '%s')"
msgstr ""
-#: builtin/worktree.c:397
+#: builtin/worktree.c:446
#, c-format
msgid "Preparing worktree (detached HEAD %s)"
msgstr ""
-#: builtin/worktree.c:438
+#: builtin/worktree.c:487
msgid "checkout <branch> even if already checked out in other worktree"
msgstr ""
-#: builtin/worktree.c:441
+#: builtin/worktree.c:490
msgid "create a new branch"
msgstr ""
-#: builtin/worktree.c:443
+#: builtin/worktree.c:492
msgid "create or reset a branch"
msgstr ""
-#: builtin/worktree.c:445
+#: builtin/worktree.c:494
msgid "populate the new working tree"
msgstr ""
-#: builtin/worktree.c:446
+#: builtin/worktree.c:495
msgid "keep the new working tree locked"
msgstr ""
-#: builtin/worktree.c:449
+#: builtin/worktree.c:498
msgid "set up tracking mode (see git-branch(1))"
msgstr ""
-#: builtin/worktree.c:452
+#: builtin/worktree.c:501
msgid "try to match the new branch name with a remote-tracking branch"
msgstr ""
-#: builtin/worktree.c:460
+#: builtin/worktree.c:509
msgid "-b, -B, and --detach are mutually exclusive"
msgstr ""
-#: builtin/worktree.c:521
+#: builtin/worktree.c:570
msgid "--[no-]track can only be used if a new branch is created"
msgstr ""
-#: builtin/worktree.c:621
+#: builtin/worktree.c:670
msgid "reason for locking"
msgstr ""
-#: builtin/worktree.c:633 builtin/worktree.c:666 builtin/worktree.c:720
-#: builtin/worktree.c:860
+#: builtin/worktree.c:682 builtin/worktree.c:715 builtin/worktree.c:789
+#: builtin/worktree.c:916
#, c-format
msgid "'%s' is not a working tree"
msgstr ""
-#: builtin/worktree.c:635 builtin/worktree.c:668
+#: builtin/worktree.c:684 builtin/worktree.c:717
msgid "The main working tree cannot be locked or unlocked"
msgstr ""
-#: builtin/worktree.c:640
+#: builtin/worktree.c:689
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr ""
-#: builtin/worktree.c:642
+#: builtin/worktree.c:691
#, c-format
msgid "'%s' is already locked"
msgstr ""
-#: builtin/worktree.c:670
+#: builtin/worktree.c:719
#, c-format
msgid "'%s' is not locked"
msgstr ""
-#: builtin/worktree.c:695
+#: builtin/worktree.c:760
msgid "working trees containing submodules cannot be moved or removed"
msgstr ""
-#: builtin/worktree.c:722 builtin/worktree.c:862
+#: builtin/worktree.c:768
+msgid "force move even if worktree is dirty or locked"
+msgstr ""
+
+#: builtin/worktree.c:791 builtin/worktree.c:918
#, c-format
msgid "'%s' is a main working tree"
msgstr ""
-#: builtin/worktree.c:727
+#: builtin/worktree.c:796
#, c-format
msgid "could not figure out destination name from '%s'"
msgstr ""
-#: builtin/worktree.c:733
+#: builtin/worktree.c:802
#, c-format
msgid "target '%s' already exists"
msgstr ""
-#: builtin/worktree.c:740
+#: builtin/worktree.c:810
#, c-format
-msgid "cannot move a locked working tree, lock reason: %s"
+msgid ""
+"cannot move a locked working tree, lock reason: %s\n"
+"use 'move -f -f' to override or unlock first"
msgstr ""
-#: builtin/worktree.c:742
-msgid "cannot move a locked working tree"
+#: builtin/worktree.c:812
+msgid ""
+"cannot move a locked working tree;\n"
+"use 'move -f -f' to override or unlock first"
msgstr ""
-#: builtin/worktree.c:745
+#: builtin/worktree.c:815
#, c-format
msgid "validation failed, cannot move working tree: %s"
msgstr ""
-#: builtin/worktree.c:750
+#: builtin/worktree.c:820
#, c-format
msgid "failed to move '%s' to '%s'"
msgstr ""
-#: builtin/worktree.c:798
+#: builtin/worktree.c:868
#, c-format
msgid "failed to run 'git status' on '%s'"
msgstr ""
-#: builtin/worktree.c:802
+#: builtin/worktree.c:872
#, c-format
msgid "'%s' is dirty, use --force to delete it"
msgstr ""
-#: builtin/worktree.c:807
+#: builtin/worktree.c:877
#, c-format
msgid "failed to run 'git status' on '%s', code %d"
msgstr ""
-#: builtin/worktree.c:818 builtin/worktree.c:832
-#, c-format
-msgid "failed to delete '%s'"
-msgstr ""
-
-#: builtin/worktree.c:844
-msgid "force removing even if the worktree is dirty"
+#: builtin/worktree.c:900
+msgid "force removal even if worktree is dirty or locked"
msgstr ""
-#: builtin/worktree.c:866
+#: builtin/worktree.c:923
#, c-format
-msgid "cannot remove a locked working tree, lock reason: %s"
+msgid ""
+"cannot remove a locked working tree, lock reason: %s\n"
+"use 'remove -f -f' to override or unlock first"
msgstr ""
-#: builtin/worktree.c:868
-msgid "cannot remove a locked working tree"
+#: builtin/worktree.c:925
+msgid ""
+"cannot remove a locked working tree;\n"
+"use 'remove -f -f' to override or unlock first"
msgstr ""
-#: builtin/worktree.c:871
+#: builtin/worktree.c:928
#, c-format
msgid "validation failed, cannot remove working tree: %s"
msgstr ""
-#: builtin/write-tree.c:14
+#: builtin/write-tree.c:15
msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
msgstr ""
-#: builtin/write-tree.c:27
+#: builtin/write-tree.c:28
msgid "<prefix>/"
msgstr ""
-#: builtin/write-tree.c:28
+#: builtin/write-tree.c:29
msgid "write tree object for a subdirectory <prefix>"
msgstr ""
-#: builtin/write-tree.c:30
+#: builtin/write-tree.c:31
msgid "only useful for debugging"
msgstr ""
-#: credential-cache--daemon.c:222
+#: credential-cache--daemon.c:223
#, c-format
msgid ""
"The permissions on your socket directory are too loose; other\n"
"\tchmod 0700 %s"
msgstr ""
-#: credential-cache--daemon.c:271
+#: credential-cache--daemon.c:272
msgid "print debugging messages to stderr"
msgstr ""
+#: t/helper/test-reach.c:152
+#, c-format
+msgid "commit %s is not marked reachable"
+msgstr ""
+
+#: t/helper/test-reach.c:162
+msgid "too many commits marked reachable"
+msgstr ""
+
#: git.c:27
msgid ""
"git [--version] [--help] [-C <path>] [-c <name>=<value>]\n"
"to read about a specific subcommand or concept."
msgstr ""
-#: git.c:173
+#: git.c:174
#, c-format
msgid "no directory given for --git-dir\n"
msgstr ""
-#: git.c:187
+#: git.c:188
#, c-format
msgid "no namespace given for --namespace\n"
msgstr ""
-#: git.c:201
+#: git.c:202
#, c-format
msgid "no directory given for --work-tree\n"
msgstr ""
-#: git.c:215
+#: git.c:216
#, c-format
msgid "no prefix given for --super-prefix\n"
msgstr ""
-#: git.c:237
+#: git.c:238
#, c-format
msgid "-c expects a configuration string\n"
msgstr ""
-#: git.c:275
+#: git.c:276
#, c-format
msgid "no directory given for -C\n"
msgstr ""
-#: git.c:300
+#: git.c:301
#, c-format
msgid "unknown option: %s\n"
msgstr ""
+#: git.c:342
+#, c-format
+msgid "while expanding alias '%s': '%s'"
+msgstr ""
+
+#: git.c:351
+#, c-format
+msgid ""
+"alias '%s' changes environment variables.\n"
+"You can use '!git' in the alias to do this"
+msgstr ""
+
+#: git.c:359
+#, c-format
+msgid "empty alias for %s"
+msgstr ""
+
+#: git.c:362
+#, c-format
+msgid "recursive alias: %s"
+msgstr ""
+
+#: git.c:437
+msgid "write failure on standard output"
+msgstr ""
+
+#: git.c:439
+msgid "unknown write failure on standard output"
+msgstr ""
+
+#: git.c:441
+msgid "close failed on standard output"
+msgstr ""
+
+#: git.c:720
+#, c-format
+msgid "alias loop detected: expansion of '%s' does not terminate:%s"
+msgstr ""
+
#: git.c:770
#, c-format
+msgid "cannot handle %s as a builtin"
+msgstr ""
+
+#: git.c:783
+#, c-format
+msgid ""
+"usage: %s\n"
+"\n"
+msgstr ""
+
+#: git.c:803
+#, c-format
msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
msgstr ""
-#: git.c:782
+#: git.c:815
#, c-format
msgid "failed to run command '%s': %s\n"
msgstr ""
-#: http.c:348
+#: http.c:378
#, c-format
msgid "negative value for http.postbuffer; defaulting to %d"
msgstr ""
-#: http.c:369
+#: http.c:399
msgid "Delegation control is not supported with cURL < 7.22.0"
msgstr ""
-#: http.c:378
+#: http.c:408
msgid "Public key pinning not supported with cURL < 7.44.0"
msgstr ""
-#: http.c:1854
+#: http.c:876
+msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
+msgstr ""
+
+#: http.c:949
+msgid "Protocol restrictions not supported with cURL < 7.19.4"
+msgstr ""
+
+#: http.c:1085
+#, c-format
+msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
+msgstr ""
+
+#: http.c:1092
+#, c-format
+msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
+msgstr ""
+
+#: http.c:1096
+#, c-format
+msgid "Could not set SSL backend to '%s': already set"
+msgstr ""
+
+#: http.c:1959
#, c-format
msgid ""
"unable to update url base from redirection:\n"
" redirect: %s"
msgstr ""
-#: remote-curl.c:401
+#: remote-curl.c:455
#, c-format
msgid "redirecting to %s"
msgstr ""
-#: list-objects-filter-options.h:59
-msgid "args"
-msgstr ""
-
-#: list-objects-filter-options.h:60
-msgid "object filtering"
-msgstr ""
-
-#: parse-options.h:157
+#: parse-options.h:154
msgid "expiry-date"
msgstr ""
-#: parse-options.h:172
+#: parse-options.h:169
msgid "no-op (backward compatibility)"
msgstr ""
-#: parse-options.h:251
+#: parse-options.h:259
msgid "be more verbose"
msgstr ""
-#: parse-options.h:253
+#: parse-options.h:261
msgid "be more quiet"
msgstr ""
-#: parse-options.h:259
+#: parse-options.h:267
msgid "use <n> digits to display SHA-1s"
msgstr ""
msgstr ""
#: command-list.h:54
-msgid "Import an Arch repository into Git"
+msgid "Import a GNU Arch repository into Git"
msgstr ""
#: command-list.h:55
msgstr ""
#: command-list.h:74
-msgid "Write and verify Git commit graph files"
+msgid "Write and verify Git commit-graph files"
msgstr ""
#: command-list.h:75
msgstr ""
#: command-list.h:128
-msgid "Creates a tag object"
+msgid "Write and verify multi-pack-indexes"
msgstr ""
#: command-list.h:129
-msgid "Build a tree-object from ls-tree formatted text"
+msgid "Creates a tag object"
msgstr ""
#: command-list.h:130
-msgid "Move or rename a file, a directory, or a symlink"
+msgid "Build a tree-object from ls-tree formatted text"
msgstr ""
#: command-list.h:131
-msgid "Find symbolic names for given revs"
+msgid "Move or rename a file, a directory, or a symlink"
msgstr ""
#: command-list.h:132
-msgid "Add or inspect object notes"
+msgid "Find symbolic names for given revs"
msgstr ""
#: command-list.h:133
-msgid "Import from and submit to Perforce repositories"
+msgid "Add or inspect object notes"
msgstr ""
#: command-list.h:134
-msgid "Create a packed archive of objects"
+msgid "Import from and submit to Perforce repositories"
msgstr ""
#: command-list.h:135
-msgid "Find redundant pack files"
+msgid "Create a packed archive of objects"
msgstr ""
#: command-list.h:136
-msgid "Pack heads and tags for efficient repository access"
+msgid "Find redundant pack files"
msgstr ""
#: command-list.h:137
-msgid "Routines to help parsing remote repository access parameters"
+msgid "Pack heads and tags for efficient repository access"
msgstr ""
#: command-list.h:138
-msgid "Compute unique ID for a patch"
+msgid "Routines to help parsing remote repository access parameters"
msgstr ""
#: command-list.h:139
-msgid "Prune all unreachable objects from the object database"
+msgid "Compute unique ID for a patch"
msgstr ""
#: command-list.h:140
-msgid "Remove extra objects that are already in pack files"
+msgid "Prune all unreachable objects from the object database"
msgstr ""
#: command-list.h:141
-msgid "Fetch from and integrate with another repository or a local branch"
+msgid "Remove extra objects that are already in pack files"
msgstr ""
#: command-list.h:142
-msgid "Update remote refs along with associated objects"
+msgid "Fetch from and integrate with another repository or a local branch"
msgstr ""
#: command-list.h:143
-msgid "Applies a quilt patchset onto the current branch"
+msgid "Update remote refs along with associated objects"
msgstr ""
#: command-list.h:144
-msgid "Compare two commit ranges (e.g. two versions of a branch)"
+msgid "Applies a quilt patchset onto the current branch"
msgstr ""
#: command-list.h:145
-msgid "Reads tree information into the index"
+msgid "Compare two commit ranges (e.g. two versions of a branch)"
msgstr ""
#: command-list.h:146
-msgid "Reapply commits on top of another base tip"
+msgid "Reads tree information into the index"
msgstr ""
#: command-list.h:147
-msgid "Receive what is pushed into the repository"
+msgid "Reapply commits on top of another base tip"
msgstr ""
#: command-list.h:148
-msgid "Manage reflog information"
+msgid "Receive what is pushed into the repository"
msgstr ""
#: command-list.h:149
-msgid "Manage set of tracked repositories"
+msgid "Manage reflog information"
msgstr ""
#: command-list.h:150
-msgid "Pack unpacked objects in a repository"
+msgid "Manage set of tracked repositories"
msgstr ""
#: command-list.h:151
-msgid "Create, list, delete refs to replace objects"
+msgid "Pack unpacked objects in a repository"
msgstr ""
#: command-list.h:152
-msgid "Generates a summary of pending changes"
+msgid "Create, list, delete refs to replace objects"
msgstr ""
#: command-list.h:153
-msgid "Reuse recorded resolution of conflicted merges"
+msgid "Generates a summary of pending changes"
msgstr ""
#: command-list.h:154
-msgid "Reset current HEAD to the specified state"
+msgid "Reuse recorded resolution of conflicted merges"
msgstr ""
#: command-list.h:155
-msgid "Revert some existing commits"
+msgid "Reset current HEAD to the specified state"
msgstr ""
#: command-list.h:156
-msgid "Lists commit objects in reverse chronological order"
+msgid "Revert some existing commits"
msgstr ""
#: command-list.h:157
-msgid "Pick out and massage parameters"
+msgid "Lists commit objects in reverse chronological order"
msgstr ""
#: command-list.h:158
-msgid "Remove files from the working tree and from the index"
+msgid "Pick out and massage parameters"
msgstr ""
#: command-list.h:159
-msgid "Send a collection of patches as emails"
+msgid "Remove files from the working tree and from the index"
msgstr ""
#: command-list.h:160
-msgid "Push objects over Git protocol to another repository"
+msgid "Send a collection of patches as emails"
msgstr ""
#: command-list.h:161
-msgid "Restricted login shell for Git-only SSH access"
+msgid "Push objects over Git protocol to another repository"
msgstr ""
#: command-list.h:162
-msgid "Summarize 'git log' output"
+msgid "Restricted login shell for Git-only SSH access"
msgstr ""
#: command-list.h:163
-msgid "Show various types of objects"
+msgid "Summarize 'git log' output"
msgstr ""
#: command-list.h:164
-msgid "Show branches and their commits"
+msgid "Show various types of objects"
msgstr ""
#: command-list.h:165
-msgid "Show packed archive index"
+msgid "Show branches and their commits"
msgstr ""
#: command-list.h:166
-msgid "List references in a local repository"
+msgid "Show packed archive index"
msgstr ""
#: command-list.h:167
-msgid "Git's i18n setup code for shell scripts"
+msgid "List references in a local repository"
msgstr ""
#: command-list.h:168
-msgid "Common Git shell script setup code"
+msgid "Git's i18n setup code for shell scripts"
msgstr ""
#: command-list.h:169
-msgid "Stash the changes in a dirty working directory away"
+msgid "Common Git shell script setup code"
msgstr ""
#: command-list.h:170
-msgid "Add file contents to the staging area"
+msgid "Stash the changes in a dirty working directory away"
msgstr ""
#: command-list.h:171
-msgid "Show the working tree status"
+msgid "Add file contents to the staging area"
msgstr ""
#: command-list.h:172
-msgid "Remove unnecessary whitespace"
+msgid "Show the working tree status"
msgstr ""
#: command-list.h:173
-msgid "Initialize, update or inspect submodules"
+msgid "Remove unnecessary whitespace"
msgstr ""
#: command-list.h:174
-msgid "Bidirectional operation between a Subversion repository and Git"
+msgid "Initialize, update or inspect submodules"
msgstr ""
#: command-list.h:175
-msgid "Read, modify and delete symbolic refs"
+msgid "Bidirectional operation between a Subversion repository and Git"
msgstr ""
#: command-list.h:176
-msgid "Create, list, delete or verify a tag object signed with GPG"
+msgid "Read, modify and delete symbolic refs"
msgstr ""
#: command-list.h:177
-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:178
-msgid "Unpack objects from a packed archive"
+msgid "Creates a temporary file with a blob's contents"
msgstr ""
#: command-list.h:179
-msgid "Register file contents in the working tree to the index"
+msgid "Unpack objects from a packed archive"
msgstr ""
#: command-list.h:180
-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:181
-msgid "Update auxiliary info file to help dumb servers"
+msgid "Update the object name stored in a ref safely"
msgstr ""
#: command-list.h:182
-msgid "Send archive back to git-archive"
+msgid "Update auxiliary info file to help dumb servers"
msgstr ""
#: command-list.h:183
-msgid "Send objects packed back to git-fetch-pack"
+msgid "Send archive back to git-archive"
msgstr ""
#: command-list.h:184
-msgid "Show a Git logical variable"
+msgid "Send objects packed back to git-fetch-pack"
msgstr ""
#: command-list.h:185
-msgid "Check the GPG signature of commits"
+msgid "Show a Git logical variable"
msgstr ""
#: command-list.h:186
-msgid "Validate packed Git archive files"
+msgid "Check the GPG signature of commits"
msgstr ""
#: command-list.h:187
-msgid "Check the GPG signature of tags"
+msgid "Validate packed Git archive files"
msgstr ""
#: command-list.h:188
-msgid "Git web interface (web frontend to Git repositories)"
+msgid "Check the GPG signature of tags"
msgstr ""
#: command-list.h:189
-msgid "Show logs with difference each commit introduces"
+msgid "Git web interface (web frontend to Git repositories)"
msgstr ""
#: command-list.h:190
-msgid "Manage multiple working trees"
+msgid "Show logs with difference each commit introduces"
msgstr ""
#: command-list.h:191
-msgid "Create a tree object from the current index"
+msgid "Manage multiple working trees"
msgstr ""
#: command-list.h:192
-msgid "Defining attributes per path"
+msgid "Create a tree object from the current index"
msgstr ""
#: command-list.h:193
-msgid "Git command-line interface and conventions"
+msgid "Defining attributes per path"
msgstr ""
#: command-list.h:194
-msgid "A Git core tutorial for developers"
+msgid "Git command-line interface and conventions"
msgstr ""
#: command-list.h:195
-msgid "Git for CVS users"
+msgid "A Git core tutorial for developers"
msgstr ""
#: command-list.h:196
-msgid "Tweaking diff output"
+msgid "Git for CVS users"
msgstr ""
#: command-list.h:197
-msgid "A useful minimum set of commands for Everyday Git"
+msgid "Tweaking diff output"
msgstr ""
#: command-list.h:198
-msgid "A Git Glossary"
+msgid "A useful minimum set of commands for Everyday Git"
msgstr ""
#: command-list.h:199
-msgid "Hooks used by Git"
+msgid "A Git Glossary"
msgstr ""
#: command-list.h:200
+msgid "Hooks used by Git"
+msgstr ""
+
+#: command-list.h:201
msgid "Specifies intentionally untracked files to ignore"
msgstr ""
-#: command-list.h:201
+#: command-list.h:202
msgid "Defining submodule properties"
msgstr ""
-#: command-list.h:202
+#: command-list.h:203
msgid "Git namespaces"
msgstr ""
-#: command-list.h:203
+#: command-list.h:204
msgid "Git Repository Layout"
msgstr ""
-#: command-list.h:204
+#: command-list.h:205
msgid "Specifying revisions and ranges for Git"
msgstr ""
-#: command-list.h:205
+#: command-list.h:206
msgid "A tutorial introduction to Git: part two"
msgstr ""
-#: command-list.h:206
+#: command-list.h:207
msgid "A tutorial introduction to Git"
msgstr ""
-#: command-list.h:207
+#: command-list.h:208
msgid "An overview of recommended workflows with Git"
msgstr ""
-#: rerere.h:40
+#: list-objects-filter-options.h:63
+msgid "args"
+msgstr ""
+
+#: list-objects-filter-options.h:64
+msgid "object filtering"
+msgstr ""
+
+#: rerere.h:44
msgid "update the index with reused conflict resolution if possible"
msgstr ""
msgid "Do you want me to do it for you [Y/n]? "
msgstr ""
-#: git-bisect.sh:121
-#, sh-format
-msgid "unrecognised option: '$arg'"
-msgstr ""
-
-#: git-bisect.sh:125
-#, sh-format
-msgid "'$arg' does not appear to be a valid revision"
-msgstr ""
-
-#: git-bisect.sh:154
-msgid "Bad HEAD - I need a HEAD"
-msgstr ""
-
-#: git-bisect.sh:167
-#, sh-format
-msgid ""
-"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
-msgstr ""
-
-#: git-bisect.sh:177
-msgid "won't bisect on cg-seek'ed tree"
-msgstr ""
-
-#: git-bisect.sh:181
-msgid "Bad HEAD - strange symbolic ref"
-msgstr ""
-
-#: git-bisect.sh:233
-#, sh-format
-msgid "Bad bisect_write argument: $state"
-msgstr ""
-
-#: git-bisect.sh:246
+#: git-bisect.sh:101
#, sh-format
msgid "Bad rev input: $arg"
msgstr ""
-#: git-bisect.sh:265
+#: git-bisect.sh:121
#, sh-format
msgid "Bad rev input: $bisected_head"
msgstr ""
-#: git-bisect.sh:274
+#: git-bisect.sh:130
#, sh-format
msgid "Bad rev input: $rev"
msgstr ""
-#: git-bisect.sh:283
+#: git-bisect.sh:139
#, sh-format
msgid "'git bisect $TERM_BAD' can take only one argument."
msgstr ""
-#: git-bisect.sh:306
-#, sh-format
-msgid "Warning: bisecting only with a $TERM_BAD commit."
-msgstr ""
-
-#. TRANSLATORS: Make sure to include [Y] and [n] in your
-#. translation. The program will only accept English input
-#. at this point.
-#: git-bisect.sh:312
-msgid "Are you sure [Y/n]? "
-msgstr ""
-
-#: git-bisect.sh:324
-#, sh-format
-msgid ""
-"You need to give me at least one $bad_syn and one $good_syn revision.\n"
-"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
-msgstr ""
-
-#: git-bisect.sh:327
-#, sh-format
-msgid ""
-"You need to start by \"git bisect start\".\n"
-"You then need to give me at least one $good_syn and one $bad_syn revision.\n"
-"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
-msgstr ""
-
-#: git-bisect.sh:398 git-bisect.sh:512
-msgid "We are not bisecting."
-msgstr ""
-
-#: git-bisect.sh:405
-#, sh-format
-msgid "'$invalid' is not a valid commit"
-msgstr ""
-
-#: git-bisect.sh:414
-#, sh-format
-msgid ""
-"Could not check out original HEAD '$branch'.\n"
-"Try 'git bisect reset <commit>'."
-msgstr ""
-
-#: git-bisect.sh:422
+#: git-bisect.sh:209
msgid "No logfile given"
msgstr ""
-#: git-bisect.sh:423
+#: git-bisect.sh:210
#, sh-format
msgid "cannot read $file for replaying"
msgstr ""
-#: git-bisect.sh:444
+#: git-bisect.sh:232
msgid "?? what are you talking about?"
msgstr ""
-#: git-bisect.sh:453
+#: git-bisect.sh:241
msgid "bisect run failed: no command provided."
msgstr ""
-#: git-bisect.sh:458
+#: git-bisect.sh:246
#, sh-format
msgid "running $command"
msgstr ""
-#: git-bisect.sh:465
+#: git-bisect.sh:253
#, sh-format
msgid ""
"bisect run failed:\n"
"exit code $res from '$command' is < 0 or >= 128"
msgstr ""
-#: git-bisect.sh:491
+#: git-bisect.sh:279
msgid "bisect run cannot continue any more"
msgstr ""
-#: git-bisect.sh:497
+#: git-bisect.sh:285
#, sh-format
msgid ""
"bisect run failed:\n"
"'bisect_state $state' exited with error code $res"
msgstr ""
-#: git-bisect.sh:504
+#: git-bisect.sh:292
msgid "bisect run success"
msgstr ""
-#: git-bisect.sh:533
-#, sh-format
-msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect."
-msgstr ""
-
-#: git-bisect.sh:567
-msgid "no terms defined"
-msgstr ""
-
-#: git-bisect.sh:584
-#, sh-format
-msgid ""
-"invalid argument $arg for 'git bisect terms'.\n"
-"Supported options are: --term-good|--term-old and --term-bad|--term-new."
+#: git-bisect.sh:300
+msgid "We are not bisecting."
msgstr ""
#: git-merge-octopus.sh:46
msgid "Simple merge did not work, trying automatic merge."
msgstr ""
-#: git-rebase.sh:61
-msgid ""
-"Resolve all conflicts manually, mark them as resolved with\n"
-"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
-"You can instead skip this commit: run \"git rebase --skip\".\n"
-"To abort and get back to the state before \"git rebase\", run \"git rebase --"
-"abort\"."
-msgstr ""
-
-#: git-rebase.sh:173 git-rebase.sh:454
+#: git-legacy-rebase.sh:445
#, sh-format
msgid "Could not move back to $head_name"
msgstr ""
-#: git-rebase.sh:184
-msgid "Applied autostash."
-msgstr ""
-
-#: git-rebase.sh:187
-#, sh-format
-msgid "Cannot store $stash_sha1"
-msgstr ""
-
-#: git-rebase.sh:236
-msgid "The pre-rebase hook refused to rebase."
-msgstr ""
-
-#: git-rebase.sh:241
-msgid "It looks like 'git am' is in progress. Cannot rebase."
-msgstr ""
-
-#: git-rebase.sh:415
-msgid "No rebase in progress?"
-msgstr ""
-
-#: git-rebase.sh:426
-msgid "The --edit-todo action can only be used during interactive rebase."
-msgstr ""
-
-#: git-rebase.sh:433
-msgid "Cannot read HEAD"
-msgstr ""
-
-#: 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:480
+#: git-legacy-rebase.sh:471
#, sh-format
msgid ""
"It seems that there is already a $state_dir_base directory, and\n"
"valuable there."
msgstr ""
-#: git-rebase.sh:545
-msgid "error: cannot combine '--signoff' with '--preserve-merges'"
+#: git-legacy-rebase.sh:523
+msgid ""
+"fatal: cannot combine am options with either interactive or merge options"
+msgstr ""
+
+#: git-legacy-rebase.sh:530
+msgid "fatal: cannot combine '--signoff' with '--preserve-merges'"
msgstr ""
-#: git-rebase.sh:556
-msgid "error: cannot combine '--preserve_merges' with '--rebase-merges'"
+#: git-legacy-rebase.sh:541
+msgid "fatal: cannot combine '--preserve-merges' with '--rebase-merges'"
msgstr ""
-#: git-rebase.sh:562
-msgid "error: cannot combine '--rebase_merges' with '--strategy-option'"
+#: git-legacy-rebase.sh:550
+msgid "fatal: cannot combine '--rebase-merges' with '--strategy-option'"
msgstr ""
-#: git-rebase.sh:564
-msgid "error: cannot combine '--rebase_merges' with '--strategy'"
+#: git-legacy-rebase.sh:552
+msgid "fatal: cannot combine '--rebase-merges' with '--strategy'"
msgstr ""
-#: git-rebase.sh:590
+#: git-legacy-rebase.sh:578
#, sh-format
msgid "invalid upstream '$upstream_name'"
msgstr ""
-#: git-rebase.sh:614
+#: git-legacy-rebase.sh:602
#, sh-format
msgid "$onto_name: there are more than one merge bases"
msgstr ""
-#: git-rebase.sh:617 git-rebase.sh:621
+#: git-legacy-rebase.sh:605 git-legacy-rebase.sh:609
#, sh-format
msgid "$onto_name: there is no merge base"
msgstr ""
-#: git-rebase.sh:626
+#: git-legacy-rebase.sh:614
#, sh-format
msgid "Does not point to a valid commit: $onto_name"
msgstr ""
-#: git-rebase.sh:652
+#: git-legacy-rebase.sh:640
#, sh-format
msgid "fatal: no such branch/commit '$branch_name'"
msgstr ""
-#: git-rebase.sh:685
-msgid "Cannot autostash"
-msgstr ""
-
-#: git-rebase.sh:690
+#: git-legacy-rebase.sh:678
#, sh-format
msgid "Created autostash: $stash_abbrev"
msgstr ""
-#: git-rebase.sh:694
-msgid "Please commit or stash them."
-msgstr ""
-
-#: git-rebase.sh:717
-#, sh-format
-msgid "HEAD is up to date."
-msgstr ""
-
-#: git-rebase.sh:719
+#: git-legacy-rebase.sh:707
#, sh-format
msgid "Current branch $branch_name is up to date."
msgstr ""
-#: git-rebase.sh:727
+#: git-legacy-rebase.sh:717
#, sh-format
-msgid "HEAD is up to date, rebase forced."
+msgid "Current branch $branch_name is up to date, rebase forced."
msgstr ""
-#: git-rebase.sh:729
+#: git-legacy-rebase.sh:731
#, sh-format
-msgid "Current branch $branch_name is up to date, rebase forced."
+msgid "Changes to $onto:"
msgstr ""
-#: git-rebase.sh:741
+#: git-legacy-rebase.sh:733
#, sh-format
msgid "Changes from $mb to $onto:"
msgstr ""
-#: git-rebase.sh:750
-msgid "First, rewinding head to replay your work on top of it..."
-msgstr ""
-
-#: git-rebase.sh:760
+#: git-legacy-rebase.sh:743
#, sh-format
msgid "Fast-forwarded $branch_name to $onto_name."
msgstr ""
-#: git-stash.sh:61
+#: git-legacy-rebase.sh:757
+msgid "First, rewinding head to replay your work on top of it..."
+msgstr ""
+
+#: git-stash.sh:75
msgid "git stash clear with parameters is unimplemented"
msgstr ""
-#: git-stash.sh:108
+#: git-stash.sh:125
msgid "You do not have the initial commit yet"
msgstr ""
-#: git-stash.sh:123
+#: git-stash.sh:140
msgid "Cannot save the current index state"
msgstr ""
-#: git-stash.sh:138
+#: git-stash.sh:155
msgid "Cannot save the untracked files"
msgstr ""
-#: git-stash.sh:158 git-stash.sh:171
+#: git-stash.sh:175 git-stash.sh:188
msgid "Cannot save the current worktree state"
msgstr ""
-#: git-stash.sh:175
+#: git-stash.sh:192
msgid "No changes selected"
msgstr ""
-#: git-stash.sh:178
+#: git-stash.sh:195
msgid "Cannot remove temporary index (can't happen)"
msgstr ""
-#: git-stash.sh:191
+#: git-stash.sh:208
msgid "Cannot record working tree state"
msgstr ""
-#: git-stash.sh:229
+#: git-stash.sh:246
#, sh-format
msgid "Cannot update $ref_stash with $w_commit"
msgstr ""
-#: git-stash.sh:281
+#: git-stash.sh:298
#, sh-format
msgid "error: unknown option for 'stash push': $option"
msgstr ""
-#: git-stash.sh:295
+#: git-stash.sh:312
msgid "Can't use --patch and --include-untracked or --all at the same time"
msgstr ""
-#: git-stash.sh:303
+#: git-stash.sh:320
msgid "No local changes to save"
msgstr ""
-#: git-stash.sh:308
+#: git-stash.sh:325
msgid "Cannot initialize stash"
msgstr ""
-#: git-stash.sh:312
+#: git-stash.sh:329
msgid "Cannot save the current status"
msgstr ""
-#: git-stash.sh:313
+#: git-stash.sh:330
#, sh-format
msgid "Saved working directory and index state $stash_msg"
msgstr ""
-#: git-stash.sh:342
+#: git-stash.sh:359
msgid "Cannot remove worktree changes"
msgstr ""
-#: git-stash.sh:490
+#: git-stash.sh:507
#, sh-format
msgid "unknown option: $opt"
msgstr ""
-#: git-stash.sh:503
+#: git-stash.sh:520
msgid "No stash entries found."
msgstr ""
-#: git-stash.sh:510
+#: git-stash.sh:527
#, sh-format
msgid "Too many revisions specified: $REV"
msgstr ""
-#: git-stash.sh:525
+#: git-stash.sh:542
#, sh-format
msgid "$reference is not a valid reference"
msgstr ""
-#: git-stash.sh:553
+#: git-stash.sh:570
#, sh-format
msgid "'$args' is not a stash-like commit"
msgstr ""
-#: git-stash.sh:564
+#: git-stash.sh:581
#, sh-format
msgid "'$args' is not a stash reference"
msgstr ""
-#: git-stash.sh:572
+#: git-stash.sh:589
msgid "unable to refresh index"
msgstr ""
-#: git-stash.sh:576
+#: git-stash.sh:593
msgid "Cannot apply a stash in the middle of a merge"
msgstr ""
-#: git-stash.sh:584
+#: git-stash.sh:601
msgid "Conflicts in index. Try without --index."
msgstr ""
-#: git-stash.sh:586
+#: git-stash.sh:603
msgid "Could not save index tree"
msgstr ""
-#: git-stash.sh:595
+#: git-stash.sh:612
msgid "Could not restore untracked files from stash entry"
msgstr ""
-#: git-stash.sh:620
+#: git-stash.sh:637
msgid "Cannot unstage modified files"
msgstr ""
-#: git-stash.sh:635
+#: git-stash.sh:652
msgid "Index was not unstashed."
msgstr ""
-#: git-stash.sh:649
+#: git-stash.sh:666
msgid "The stash entry is kept in case you need it again."
msgstr ""
-#: git-stash.sh:658
+#: git-stash.sh:675
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr ""
-#: git-stash.sh:659
+#: git-stash.sh:676
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr ""
-#: git-stash.sh:667
+#: git-stash.sh:684
msgid "No branch name specified"
msgstr ""
-#: git-stash.sh:746
+#: git-stash.sh:763
msgid "(To restore them type \"git stash apply\")"
msgstr ""
-#: git-submodule.sh:188
+#: git-submodule.sh:198
msgid "Relative path can only be used from the toplevel of the working tree"
msgstr ""
-#: git-submodule.sh:198
+#: git-submodule.sh:208
#, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
msgstr ""
-#: git-submodule.sh:217
+#: git-submodule.sh:227
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr ""
-#: git-submodule.sh:220
+#: git-submodule.sh:230
#, sh-format
msgid "'$sm_path' already exists in the index and is not a submodule"
msgstr ""
-#: git-submodule.sh:226
+#: git-submodule.sh:236
#, sh-format
msgid ""
"The following path is ignored by one of your .gitignore files:\n"
"Use -f if you really want to add it."
msgstr ""
-#: git-submodule.sh:249
+#: git-submodule.sh:259
#, sh-format
msgid "Adding existing repo at '$sm_path' to the index"
msgstr ""
-#: git-submodule.sh:251
+#: git-submodule.sh:261
#, sh-format
msgid "'$sm_path' already exists and is not a valid git repo"
msgstr ""
-#: git-submodule.sh:259
+#: git-submodule.sh:269
#, sh-format
msgid "A git directory for '$sm_name' is found locally with remote(s):"
msgstr ""
-#: git-submodule.sh:261
+#: git-submodule.sh:271
#, sh-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from\n"
"option."
msgstr ""
-#: git-submodule.sh:267
+#: git-submodule.sh:277
#, sh-format
msgid "Reactivating local git directory for submodule '$sm_name'."
msgstr ""
-#: git-submodule.sh:279
+#: git-submodule.sh:289
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
msgstr ""
-#: git-submodule.sh:284
+#: git-submodule.sh:294
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr ""
-#: git-submodule.sh:293
+#: git-submodule.sh:303
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr ""
-#: git-submodule.sh:565
+#: git-submodule.sh:563
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:575
+#: git-submodule.sh:573
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr ""
-#: git-submodule.sh:580
+#: git-submodule.sh:578
#, sh-format
msgid ""
"Unable to find current ${remote_name}/${branch} revision in submodule path "
"'$sm_path'"
msgstr ""
-#: git-submodule.sh:603
+#: git-submodule.sh:596
#, sh-format
msgid "Unable to fetch in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:609
+#: git-submodule.sh:602
#, sh-format
msgid ""
"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
"Direct fetching of that commit failed."
msgstr ""
-#: git-submodule.sh:616
+#: git-submodule.sh:609
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:617
+#: git-submodule.sh:610
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr ""
-#: git-submodule.sh:621
+#: git-submodule.sh:614
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:622
+#: git-submodule.sh:615
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr ""
-#: git-submodule.sh:627
+#: git-submodule.sh:620
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:628
+#: git-submodule.sh:621
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr ""
-#: git-submodule.sh:633
+#: git-submodule.sh:626
#, sh-format
msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:634
+#: git-submodule.sh:627
#, sh-format
msgid "Submodule path '$displaypath': '$command $sha1'"
msgstr ""
-#: git-submodule.sh:665
+#: git-submodule.sh:658
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:761
+#: git-submodule.sh:754
msgid "The --cached option cannot be used with the --files option"
msgstr ""
-#: git-submodule.sh:813
+#: git-submodule.sh:806
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr ""
-#: git-submodule.sh:833
+#: git-submodule.sh:826
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr ""
-#: git-submodule.sh:836
+#: git-submodule.sh:829
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr ""
-#: git-submodule.sh:839
+#: git-submodule.sh:832
#, sh-format
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
msgstr ""
msgid "See git-${cmd}(1) for details."
msgstr ""
-#: git-rebase--interactive.sh:43
-msgid ""
-"\n"
-"Commands:\n"
-"p, pick <commit> = use commit\n"
-"r, reword <commit> = use commit, but edit the commit message\n"
-"e, edit <commit> = use commit, but stop for amending\n"
-"s, squash <commit> = use commit, but meld into previous commit\n"
-"f, fixup <commit> = like \"squash\", but discard this commit's log message\n"
-"x, exec <command> = run command (the rest of the line) using shell\n"
-"d, drop <commit> = remove commit\n"
-"l, label <label> = label current HEAD with a name\n"
-"t, reset <label> = reset HEAD to a label\n"
-"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
-". create a merge commit using the original merge commit's\n"
-". message (or the oneline, if no original merge commit was\n"
-". specified). Use -c <commit> to reword the commit message.\n"
-"\n"
-"These lines can be re-ordered; they are executed from top to bottom.\n"
-msgstr ""
-
-#: git-rebase--interactive.sh: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: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: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)"
msgid "Could not commit staged changes."
msgstr ""
-#: git-rebase--preserve-merges.sh:893
-msgid ""
-"\n"
-"However, if you remove everything, the rebase will be aborted.\n"
-"\n"
+#: git-rebase--preserve-merges.sh:824 git-rebase--preserve-merges.sh:910
+msgid "Could not execute editor"
+msgstr ""
+
+#: git-rebase--preserve-merges.sh:845
+#, sh-format
+msgid "Could not checkout $switch_to"
+msgstr ""
+
+#: git-rebase--preserve-merges.sh:852
+msgid "No HEAD?"
+msgstr ""
+
+#: git-rebase--preserve-merges.sh:853
+#, sh-format
+msgid "Could not create temporary $state_dir"
+msgstr ""
+
+#: git-rebase--preserve-merges.sh:856
+msgid "Could not mark as interactive"
msgstr ""
+#: 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--preserve-merges.sh:942 git-rebase--preserve-merges.sh:947
msgid "Could not init rewritten commits"
msgstr ""
msgid "invalid argument %s, expecting --"
msgstr ""
-#: git-send-email.perl:130
+#: git-send-email.perl:138
msgid "local zone differs from GMT by a non-minute interval\n"
msgstr ""
-#: git-send-email.perl:137 git-send-email.perl:143
+#: git-send-email.perl:145 git-send-email.perl:151
msgid "local time offset greater than or equal to 24 hours\n"
msgstr ""
-#: git-send-email.perl:211 git-send-email.perl:217
+#: git-send-email.perl:219 git-send-email.perl:225
msgid "the editor exited uncleanly, aborting everything"
msgstr ""
-#: git-send-email.perl:294
+#: git-send-email.perl:302
#, perl-format
msgid ""
"'%s' contains an intermediate version of the email you were composing.\n"
msgstr ""
-#: git-send-email.perl:299
+#: git-send-email.perl:307
#, perl-format
msgid "'%s.final' contains the composed email.\n"
msgstr ""
-#: git-send-email.perl:317
+#: git-send-email.perl:326
msgid "--dump-aliases incompatible with other options\n"
msgstr ""
-#: git-send-email.perl:383 git-send-email.perl:638
+#: git-send-email.perl:395 git-send-email.perl:650
msgid "Cannot run git format-patch from outside a repository\n"
msgstr ""
-#: git-send-email.perl:386
+#: git-send-email.perl:398
msgid ""
"`batch-size` and `relogin` must be specified together (via command-line or "
"configuration option)\n"
msgstr ""
-#: git-send-email.perl:456
+#: git-send-email.perl:468
#, perl-format
msgid "Unknown --suppress-cc field: '%s'\n"
msgstr ""
-#: git-send-email.perl:485
+#: git-send-email.perl:497
#, perl-format
msgid "Unknown --confirm setting: '%s'\n"
msgstr ""
-#: git-send-email.perl:513
+#: git-send-email.perl:525
#, perl-format
msgid "warning: sendmail alias with quotes is not supported: %s\n"
msgstr ""
-#: git-send-email.perl:515
+#: git-send-email.perl:527
#, perl-format
msgid "warning: `:include:` not supported: %s\n"
msgstr ""
-#: git-send-email.perl:517
+#: git-send-email.perl:529
#, perl-format
msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
msgstr ""
-#: git-send-email.perl:522
+#: git-send-email.perl:534
#, perl-format
msgid "warning: sendmail line is not recognized: %s\n"
msgstr ""
-#: git-send-email.perl:604
+#: git-send-email.perl:616
#, perl-format
msgid ""
"File '%s' exists but it could also be the range of commits\n"
" * Giving --format-patch option if you mean a range.\n"
msgstr ""
-#: git-send-email.perl:625
+#: git-send-email.perl:637
#, perl-format
msgid "Failed to opendir %s: %s"
msgstr ""
-#: git-send-email.perl:649
+#: git-send-email.perl:661
#, perl-format
msgid ""
"fatal: %s: %s\n"
"warning: no patches were sent\n"
msgstr ""
-#: git-send-email.perl:660
+#: git-send-email.perl:672
msgid ""
"\n"
"No patch files specified!\n"
"\n"
msgstr ""
-#: git-send-email.perl:673
+#: git-send-email.perl:685
#, perl-format
msgid "No subject line in %s?"
msgstr ""
-#: git-send-email.perl:683
+#: git-send-email.perl:695
#, perl-format
msgid "Failed to open for writing %s: %s"
msgstr ""
-#: git-send-email.perl:694
+#: git-send-email.perl:706
msgid ""
"Lines beginning in \"GIT:\" will be removed.\n"
"Consider including an overall diffstat or table of contents\n"
"Clear the body content if you don't wish to send a summary.\n"
msgstr ""
-#: git-send-email.perl:718
+#: git-send-email.perl:730
#, perl-format
msgid "Failed to open %s: %s"
msgstr ""
-#: git-send-email.perl:735
+#: git-send-email.perl:747
#, perl-format
msgid "Failed to open %s.final: %s"
msgstr ""
-#: git-send-email.perl:778
+#: git-send-email.perl:790
msgid "Summary email is empty, skipping it\n"
msgstr ""
#. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:813
+#: git-send-email.perl:825
#, perl-format
msgid "Are you sure you want to use <%s> [y/N]? "
msgstr ""
-#: git-send-email.perl:868
+#: git-send-email.perl:880
msgid ""
"The following files are 8bit, but do not declare a Content-Transfer-"
"Encoding.\n"
msgstr ""
-#: git-send-email.perl:873
+#: git-send-email.perl:885
msgid "Which 8bit encoding should I declare [UTF-8]? "
msgstr ""
-#: git-send-email.perl:881
+#: git-send-email.perl:893
#, perl-format
msgid ""
"Refusing to send because the patch\n"
"want to send.\n"
msgstr ""
-#: git-send-email.perl:900
+#: git-send-email.perl:912
msgid "To whom should the emails be sent (if anyone)?"
msgstr ""
-#: git-send-email.perl:918
+#: git-send-email.perl:930
#, perl-format
msgid "fatal: alias '%s' expands to itself\n"
msgstr ""
-#: git-send-email.perl:930
+#: git-send-email.perl:942
msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
msgstr ""
-#: git-send-email.perl:988 git-send-email.perl:996
+#: git-send-email.perl:1000 git-send-email.perl:1008
#, perl-format
msgid "error: unable to extract a valid address from: %s\n"
msgstr ""
#. TRANSLATORS: Make sure to include [q] [d] [e] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-send-email.perl:1000
+#: git-send-email.perl:1012
msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
msgstr ""
-#: git-send-email.perl:1317
+#: git-send-email.perl:1329
#, perl-format
msgid "CA path \"%s\" does not exist"
msgstr ""
-#: git-send-email.perl:1400
+#: git-send-email.perl:1412
msgid ""
" The Cc list above has been expanded by additional\n"
" addresses found in the patch commit message. By default\n"
#. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-send-email.perl:1415
+#: git-send-email.perl:1427
msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
msgstr ""
-#: git-send-email.perl:1418
+#: git-send-email.perl:1430
msgid "Send this email reply required"
msgstr ""
-#: git-send-email.perl:1446
+#: git-send-email.perl:1458
msgid "The required SMTP server is not properly defined."
msgstr ""
-#: git-send-email.perl:1493
+#: git-send-email.perl:1505
#, perl-format
msgid "Server does not support STARTTLS! %s"
msgstr ""
-#: git-send-email.perl:1498 git-send-email.perl:1502
+#: git-send-email.perl:1510 git-send-email.perl:1514
#, perl-format
msgid "STARTTLS failed! %s"
msgstr ""
-#: git-send-email.perl:1511
+#: git-send-email.perl:1523
msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
msgstr ""
-#: git-send-email.perl:1529
+#: git-send-email.perl:1541
#, perl-format
msgid "Failed to send %s\n"
msgstr ""
-#: git-send-email.perl:1532
+#: git-send-email.perl:1544
#, perl-format
msgid "Dry-Sent %s\n"
msgstr ""
-#: git-send-email.perl:1532
+#: git-send-email.perl:1544
#, perl-format
msgid "Sent %s\n"
msgstr ""
-#: git-send-email.perl:1534
+#: git-send-email.perl:1546
msgid "Dry-OK. Log says:\n"
msgstr ""
-#: git-send-email.perl:1534
+#: git-send-email.perl:1546
msgid "OK. Log says:\n"
msgstr ""
-#: git-send-email.perl:1546
+#: git-send-email.perl:1558
msgid "Result: "
msgstr ""
-#: git-send-email.perl:1549
+#: git-send-email.perl:1561
msgid "Result: OK\n"
msgstr ""
-#: git-send-email.perl:1567
+#: git-send-email.perl:1579
#, perl-format
msgid "can't open file %s"
msgstr ""
-#: git-send-email.perl:1614 git-send-email.perl:1634
+#: git-send-email.perl:1626 git-send-email.perl:1646
#, perl-format
msgid "(mbox) Adding cc: %s from line '%s'\n"
msgstr ""
-#: git-send-email.perl:1620
+#: git-send-email.perl:1632
#, perl-format
msgid "(mbox) Adding to: %s from line '%s'\n"
msgstr ""
-#: git-send-email.perl:1673
+#: git-send-email.perl:1685
#, perl-format
msgid "(non-mbox) Adding cc: %s from line '%s'\n"
msgstr ""
-#: git-send-email.perl:1698
+#: git-send-email.perl:1720
#, perl-format
msgid "(body) Adding cc: %s from line '%s'\n"
msgstr ""
-#: git-send-email.perl:1809
+#: git-send-email.perl:1831
#, perl-format
msgid "(%s) Could not execute '%s'"
msgstr ""
-#: git-send-email.perl:1816
+#: git-send-email.perl:1838
#, perl-format
msgid "(%s) Adding %s: %s from: '%s'\n"
msgstr ""
-#: git-send-email.perl:1820
+#: git-send-email.perl:1842
#, perl-format
msgid "(%s) failed to close pipe to '%s'"
msgstr ""
-#: git-send-email.perl:1850
+#: git-send-email.perl:1872
msgid "cannot send message as 7bit"
msgstr ""
-#: git-send-email.perl:1858
+#: git-send-email.perl:1880
msgid "invalid transfer encoding"
msgstr ""
-#: git-send-email.perl:1899 git-send-email.perl:1951 git-send-email.perl:1961
+#: git-send-email.perl:1921 git-send-email.perl:1973 git-send-email.perl:1983
#, perl-format
msgid "unable to open %s: %s\n"
msgstr ""
-#: git-send-email.perl:1902
+#: git-send-email.perl:1924
#, perl-format
msgid "%s: patch contains a line longer than 998 characters"
msgstr ""
-#: git-send-email.perl:1919
+#: git-send-email.perl:1941
#, perl-format
msgid "Skipping %s with backup suffix '%s'.\n"
msgstr ""
#. TRANSLATORS: please keep "[y|N]" as is.
-#: git-send-email.perl:1923
+#: git-send-email.perl:1945
#, perl-format
msgid "Do you really want to send %s? [y|N]: "
msgstr ""